Skip to content

Commit

Permalink
Merge pull request meshtastic#12 from sachaw/master
Browse files Browse the repository at this point in the history
Fix formatting
  • Loading branch information
geeksville authored Feb 22, 2021
2 parents 24f16ae + 5112ecc commit 96257b7
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 26 deletions.
3 changes: 3 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"recommendations": ["zxh404.vscode-proto3"]
}
56 changes: 30 additions & 26 deletions mesh.proto
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,14 @@ enum ErrorReason {

TIMEOUT = 3;

/* No suitable interface could be found for delivering this packet */
/*
* No suitable interface could be found for delivering this packet
*/
NO_INTERFACE = 4;

/* We reached the max retransmission count (typically for naive flood routing) */
/*
* We reached the max retransmission count (typically for naive flood routing)
*/
MAX_RETRANSMIT = 5;
}

Expand Down Expand Up @@ -816,9 +820,9 @@ message RadioConfig {
*/
bool debug_log_enabled = 101;

/**
How our location is shared with other nodes (or the local phone)
*/
/*
* How our location is shared with other nodes (or the local phone)
*/
LocationSharing location_share = 32;

/*
Expand Down Expand Up @@ -857,44 +861,44 @@ message RadioConfig {
*/
repeated uint32 ignore_incoming = 103;

/**
Preferences for the SerialPlugin
FIXME - Move this out of UserPreferences and into a section for plugin configuration.
*/
/*
* Preferences for the SerialPlugin
*
* FIXME - Move this out of UserPreferences and into a section for plugin configuration.
*/
bool serialplugin_enabled = 120;
bool serialplugin_echo = 121;
uint32 serialplugin_rxd = 122;
uint32 serialplugin_txd = 123;
uint32 serialplugin_timeout = 124;
uint32 serialplugin_mode = 125;

/**
Preferences for the ExternalNotificationPlugin
FIXME - Move this out of UserPreferences and into a section for plugin configuration.
*/
/*
* Preferences for the ExternalNotificationPlugin
*
* FIXME - Move this out of UserPreferences and into a section for plugin configuration.
*/
bool ext_notification_plugin_enabled = 126;
uint32 ext_notification_plugin_output_ms = 127;
uint32 ext_notification_plugin_output = 128;
bool ext_notification_plugin_active = 129;
bool ext_notification_plugin_alert_message = 130;
bool ext_notification_plugin_alert_bell = 131;

/**
Preferences for the RangeTestPlugin
FIXME - Move this out of UserPreferences and into a section for plugin configuration.
*/
/*
* Preferences for the RangeTestPlugin
*
* FIXME - Move this out of UserPreferences and into a section for plugin configuration.
*/
bool range_test_plugin_enabled = 132;
uint32 range_test_plugin_sender = 133;
bool range_test_plugin_save = 134;

/**
Preferences for the StoreForwardPlugin
FIXME - Move this out of UserPreferences and into a section for plugin configuration.
*/
/*
* Preferences for the StoreForwardPlugin
*
* FIXME - Move this out of UserPreferences and into a section for plugin configuration.
*/
bool store_forward_plugin_enabled = 136;
uint32 store_forward_plugin_records = 137;
}
Expand Down Expand Up @@ -979,7 +983,7 @@ message NodeInfo {
uint32 next_hop = 5;
}

/** Error codes for critical errors
/* Error codes for critical errors
*
* The device might report these fault codes on the screen. If you encounter a fault code, please
* post on the meshtastic.discourse.group and we'll try to help.
Expand Down

0 comments on commit 96257b7

Please sign in to comment.