Merge remote-tracking branch 'origin/master' into dev1.2

# Conflicts:
#	mesh.proto
This commit is contained in:
Kevin Hester 2021-02-22 11:14:29 +08:00
commit 46319a0f53
3 changed files with 40 additions and 26 deletions

3
.vscode/extensions.json vendored Normal file
View file

@ -0,0 +1,3 @@
{
"recommendations": ["zxh404.vscode-proto3"]
}

View file

@ -146,10 +146,14 @@ message Routing {
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;
}
@ -831,9 +835,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;
/*
@ -872,11 +876,11 @@ 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;
@ -884,11 +888,11 @@ message RadioConfig {
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;
@ -896,20 +900,20 @@ message RadioConfig {
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;
}
@ -989,7 +993,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.

View file

@ -119,6 +119,13 @@ enum PortNum {
*/
RANGE_TEST_APP = 66;
/*
* Provides a format to send and receive environmental data from the Meshtastic network.
*
* Maintained by Charles Crossan (crossan007) : crossan007@gmail.com
*/
ENVIRONMENTAL_MEASUREMENT_APP = 67;
/*
* Private applications should use portnums >= 256.
* To simplify initial development and testing you can use "PRIVATE_APP"