pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-16 18:12:07 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #1250 from mc-hamster/router

Browse Source 
Update _plugin_ in radioconfig to _module_
This commit is contained in:
Jm Casler 2022-02-27 00:52:58 -08:00 committed by GitHub
commit dee577cb5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 154 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/graphics/Screen.cpp
View File

@ -262,8 +262,8 @@ static void drawCriticalFaultFrame(OLEDDisplay *display, OLEDDisplayUiState *sta
// Ignore messages orginating from phone (from the current node 0x0) unless range test or store and forward module are enabled // Ignore messages orginating from phone (from the current node 0x0) unless range test or store and forward module are enabled
static bool shouldDrawMessage(const MeshPacket *packet) static bool shouldDrawMessage(const MeshPacket *packet)
{ {
return packet->from != 0 && !radioConfig.preferences.range_test_plugin_enabled && return packet->from != 0 && !radioConfig.preferences.range_test_module_enabled &&
!radioConfig.preferences.store_forward_plugin_enabled; !radioConfig.preferences.store_forward_module_enabled;
} }
/// Draw the last text message we received /// Draw the last text message we received

144
src/mesh/generated/radioconfig.pb.h
View File

@ -141,24 +141,24 @@ typedef struct _RadioConfig_UserPreferences {
bool debug_log_enabled; bool debug_log_enabled;
pb_size_t ignore_incoming_count; pb_size_t ignore_incoming_count;
uint32_t ignore_incoming[3]; uint32_t ignore_incoming[3];
bool serialplugin_enabled; bool serialmodule_enabled;
bool serialplugin_echo; bool serialmodule_echo;
uint32_t serialplugin_rxd; uint32_t serialmodule_rxd;
uint32_t serialplugin_txd; uint32_t serialmodule_txd;
uint32_t serialplugin_timeout; uint32_t serialmodule_timeout;
uint32_t serialplugin_mode; uint32_t serialmodule_mode;
bool ext_notification_plugin_enabled; bool ext_notification_module_enabled;
uint32_t ext_notification_plugin_output_ms; uint32_t ext_notification_module_output_ms;
uint32_t ext_notification_plugin_output; uint32_t ext_notification_module_output;
bool ext_notification_plugin_active; bool ext_notification_module_active;
bool ext_notification_plugin_alert_message; bool ext_notification_module_alert_message;
bool ext_notification_plugin_alert_bell; bool ext_notification_module_alert_bell;
bool range_test_plugin_enabled; bool range_test_module_enabled;
uint32_t range_test_plugin_sender; uint32_t range_test_module_sender;
bool range_test_plugin_save; bool range_test_module_save;
uint32_t store_forward_plugin_records; uint32_t store_forward_module_records;
uint32_t store_forward_plugin_history_return_max; uint32_t store_forward_module_history_return_max;
uint32_t store_forward_plugin_history_return_window; uint32_t store_forward_module_history_return_window;
bool telemetry_module_measurement_enabled; bool telemetry_module_measurement_enabled;
bool telemetry_module_screen_enabled; bool telemetry_module_screen_enabled;
uint32_t telemetry_module_read_error_count_threshold; uint32_t telemetry_module_read_error_count_threshold;
@ -167,8 +167,8 @@ typedef struct _RadioConfig_UserPreferences {
bool telemetry_module_display_farenheit; bool telemetry_module_display_farenheit;
RadioConfig_UserPreferences_TelemetrySensorType telemetry_module_sensor_type; RadioConfig_UserPreferences_TelemetrySensorType telemetry_module_sensor_type;
uint32_t telemetry_module_sensor_pin; uint32_t telemetry_module_sensor_pin;
bool store_forward_plugin_enabled; bool store_forward_module_enabled;
bool store_forward_plugin_heartbeat; bool store_forward_module_heartbeat;
uint32_t position_flags; uint32_t position_flags;
bool is_always_powered; bool is_always_powered;
uint32_t auto_screen_carousel_secs; uint32_t auto_screen_carousel_secs;
@ -185,12 +185,12 @@ typedef struct _RadioConfig_UserPreferences {
InputEventChar rotary1_event_cw; InputEventChar rotary1_event_cw;
InputEventChar rotary1_event_ccw; InputEventChar rotary1_event_ccw;
InputEventChar rotary1_event_press; InputEventChar rotary1_event_press;
bool canned_message_plugin_enabled; bool canned_message_module_enabled;
char canned_message_plugin_allow_input_source[16]; char canned_message_module_allow_input_source[16];
bool canned_message_plugin_send_bell; bool canned_message_module_send_bell;
bool mqtt_encryption_enabled; bool mqtt_encryption_enabled;
float adc_multiplier_override; float adc_multiplier_override;
uint32_t serialplugin_baud; uint32_t serialmodule_baud;
} RadioConfig_UserPreferences; } RadioConfig_UserPreferences;
typedef struct _RadioConfig { typedef struct _RadioConfig {
@ -277,24 +277,24 @@ extern "C" {
#define RadioConfig_UserPreferences_factory_reset_tag 100 #define RadioConfig_UserPreferences_factory_reset_tag 100
#define RadioConfig_UserPreferences_debug_log_enabled_tag 101 #define RadioConfig_UserPreferences_debug_log_enabled_tag 101
#define RadioConfig_UserPreferences_ignore_incoming_tag 103 #define RadioConfig_UserPreferences_ignore_incoming_tag 103
#define RadioConfig_UserPreferences_serialplugin_enabled_tag 120 #define RadioConfig_UserPreferences_serialmodule_enabled_tag 120
#define RadioConfig_UserPreferences_serialplugin_echo_tag 121 #define RadioConfig_UserPreferences_serialmodule_echo_tag 121
#define RadioConfig_UserPreferences_serialplugin_rxd_tag 122 #define RadioConfig_UserPreferences_serialmodule_rxd_tag 122
#define RadioConfig_UserPreferences_serialplugin_txd_tag 123 #define RadioConfig_UserPreferences_serialmodule_txd_tag 123
#define RadioConfig_UserPreferences_serialplugin_timeout_tag 124 #define RadioConfig_UserPreferences_serialmodule_timeout_tag 124
#define RadioConfig_UserPreferences_serialplugin_mode_tag 125 #define RadioConfig_UserPreferences_serialmodule_mode_tag 125
#define RadioConfig_UserPreferences_ext_notification_plugin_enabled_tag 126 #define RadioConfig_UserPreferences_ext_notification_module_enabled_tag 126
#define RadioConfig_UserPreferences_ext_notification_plugin_output_ms_tag 127 #define RadioConfig_UserPreferences_ext_notification_module_output_ms_tag 127
#define RadioConfig_UserPreferences_ext_notification_plugin_output_tag 128 #define RadioConfig_UserPreferences_ext_notification_module_output_tag 128
#define RadioConfig_UserPreferences_ext_notification_plugin_active_tag 129 #define RadioConfig_UserPreferences_ext_notification_module_active_tag 129
#define RadioConfig_UserPreferences_ext_notification_plugin_alert_message_tag 130 #define RadioConfig_UserPreferences_ext_notification_module_alert_message_tag 130
#define RadioConfig_UserPreferences_ext_notification_plugin_alert_bell_tag 131 #define RadioConfig_UserPreferences_ext_notification_module_alert_bell_tag 131
#define RadioConfig_UserPreferences_range_test_plugin_enabled_tag 132 #define RadioConfig_UserPreferences_range_test_module_enabled_tag 132
#define RadioConfig_UserPreferences_range_test_plugin_sender_tag 133 #define RadioConfig_UserPreferences_range_test_module_sender_tag 133
#define RadioConfig_UserPreferences_range_test_plugin_save_tag 134 #define RadioConfig_UserPreferences_range_test_module_save_tag 134
#define RadioConfig_UserPreferences_store_forward_plugin_records_tag 137 #define RadioConfig_UserPreferences_store_forward_module_records_tag 137
#define RadioConfig_UserPreferences_store_forward_plugin_history_return_max_tag 138 #define RadioConfig_UserPreferences_store_forward_module_history_return_max_tag 138
#define RadioConfig_UserPreferences_store_forward_plugin_history_return_window_tag 139 #define RadioConfig_UserPreferences_store_forward_module_history_return_window_tag 139
#define RadioConfig_UserPreferences_telemetry_module_measurement_enabled_tag 140 #define RadioConfig_UserPreferences_telemetry_module_measurement_enabled_tag 140
#define RadioConfig_UserPreferences_telemetry_module_screen_enabled_tag 141 #define RadioConfig_UserPreferences_telemetry_module_screen_enabled_tag 141
#define RadioConfig_UserPreferences_telemetry_module_read_error_count_threshold_tag 142 #define RadioConfig_UserPreferences_telemetry_module_read_error_count_threshold_tag 142
@ -303,8 +303,8 @@ extern "C" {
#define RadioConfig_UserPreferences_telemetry_module_display_farenheit_tag 145 #define RadioConfig_UserPreferences_telemetry_module_display_farenheit_tag 145
#define RadioConfig_UserPreferences_telemetry_module_sensor_type_tag 146 #define RadioConfig_UserPreferences_telemetry_module_sensor_type_tag 146
#define RadioConfig_UserPreferences_telemetry_module_sensor_pin_tag 147 #define RadioConfig_UserPreferences_telemetry_module_sensor_pin_tag 147
#define RadioConfig_UserPreferences_store_forward_plugin_enabled_tag 148 #define RadioConfig_UserPreferences_store_forward_module_enabled_tag 148
#define RadioConfig_UserPreferences_store_forward_plugin_heartbeat_tag 149 #define RadioConfig_UserPreferences_store_forward_module_heartbeat_tag 149
#define RadioConfig_UserPreferences_position_flags_tag 150 #define RadioConfig_UserPreferences_position_flags_tag 150
#define RadioConfig_UserPreferences_is_always_powered_tag 151 #define RadioConfig_UserPreferences_is_always_powered_tag 151
#define RadioConfig_UserPreferences_auto_screen_carousel_secs_tag 152 #define RadioConfig_UserPreferences_auto_screen_carousel_secs_tag 152
@ -321,12 +321,12 @@ extern "C" {
#define RadioConfig_UserPreferences_rotary1_event_cw_tag 164 #define RadioConfig_UserPreferences_rotary1_event_cw_tag 164
#define RadioConfig_UserPreferences_rotary1_event_ccw_tag 165 #define RadioConfig_UserPreferences_rotary1_event_ccw_tag 165
#define RadioConfig_UserPreferences_rotary1_event_press_tag 166 #define RadioConfig_UserPreferences_rotary1_event_press_tag 166
#define RadioConfig_UserPreferences_canned_message_plugin_enabled_tag 170 #define RadioConfig_UserPreferences_canned_message_module_enabled_tag 170
#define RadioConfig_UserPreferences_canned_message_plugin_allow_input_source_tag 171 #define RadioConfig_UserPreferences_canned_message_module_allow_input_source_tag 171
#define RadioConfig_UserPreferences_canned_message_plugin_send_bell_tag 173 #define RadioConfig_UserPreferences_canned_message_module_send_bell_tag 173
#define RadioConfig_UserPreferences_mqtt_encryption_enabled_tag 174 #define RadioConfig_UserPreferences_mqtt_encryption_enabled_tag 174
#define RadioConfig_UserPreferences_adc_multiplier_override_tag 175 #define RadioConfig_UserPreferences_adc_multiplier_override_tag 175
#define RadioConfig_UserPreferences_serialplugin_baud_tag 176 #define RadioConfig_UserPreferences_serialmodule_baud_tag 176
#define RadioConfig_preferences_tag 1 #define RadioConfig_preferences_tag 1
/* Struct field encoding specification for nanopb */ /* Struct field encoding specification for nanopb */
@ -370,24 +370,24 @@ X(a, STATIC, SINGULAR, UINT32, gps_max_dop, 46) \
X(a, STATIC, SINGULAR, BOOL, factory_reset, 100) \ X(a, STATIC, SINGULAR, BOOL, factory_reset, 100) \
X(a, STATIC, SINGULAR, BOOL, debug_log_enabled, 101) \ X(a, STATIC, SINGULAR, BOOL, debug_log_enabled, 101) \
X(a, STATIC, REPEATED, UINT32, ignore_incoming, 103) \ X(a, STATIC, REPEATED, UINT32, ignore_incoming, 103) \
X(a, STATIC, SINGULAR, BOOL, serialplugin_enabled, 120) \ X(a, STATIC, SINGULAR, BOOL, serialmodule_enabled, 120) \
X(a, STATIC, SINGULAR, BOOL, serialplugin_echo, 121) \ X(a, STATIC, SINGULAR, BOOL, serialmodule_echo, 121) \
X(a, STATIC, SINGULAR, UINT32, serialplugin_rxd, 122) \ X(a, STATIC, SINGULAR, UINT32, serialmodule_rxd, 122) \
X(a, STATIC, SINGULAR, UINT32, serialplugin_txd, 123) \ X(a, STATIC, SINGULAR, UINT32, serialmodule_txd, 123) \
X(a, STATIC, SINGULAR, UINT32, serialplugin_timeout, 124) \ X(a, STATIC, SINGULAR, UINT32, serialmodule_timeout, 124) \
X(a, STATIC, SINGULAR, UINT32, serialplugin_mode, 125) \ X(a, STATIC, SINGULAR, UINT32, serialmodule_mode, 125) \
X(a, STATIC, SINGULAR, BOOL, ext_notification_plugin_enabled, 126) \ X(a, STATIC, SINGULAR, BOOL, ext_notification_module_enabled, 126) \
X(a, STATIC, SINGULAR, UINT32, ext_notification_plugin_output_ms, 127) \ X(a, STATIC, SINGULAR, UINT32, ext_notification_module_output_ms, 127) \
X(a, STATIC, SINGULAR, UINT32, ext_notification_plugin_output, 128) \ X(a, STATIC, SINGULAR, UINT32, ext_notification_module_output, 128) \
X(a, STATIC, SINGULAR, BOOL, ext_notification_plugin_active, 129) \ X(a, STATIC, SINGULAR, BOOL, ext_notification_module_active, 129) \
X(a, STATIC, SINGULAR, BOOL, ext_notification_plugin_alert_message, 130) \ X(a, STATIC, SINGULAR, BOOL, ext_notification_module_alert_message, 130) \
X(a, STATIC, SINGULAR, BOOL, ext_notification_plugin_alert_bell, 131) \ X(a, STATIC, SINGULAR, BOOL, ext_notification_module_alert_bell, 131) \
X(a, STATIC, SINGULAR, BOOL, range_test_plugin_enabled, 132) \ X(a, STATIC, SINGULAR, BOOL, range_test_module_enabled, 132) \
X(a, STATIC, SINGULAR, UINT32, range_test_plugin_sender, 133) \ X(a, STATIC, SINGULAR, UINT32, range_test_module_sender, 133) \
X(a, STATIC, SINGULAR, BOOL, range_test_plugin_save, 134) \ X(a, STATIC, SINGULAR, BOOL, range_test_module_save, 134) \
X(a, STATIC, SINGULAR, UINT32, store_forward_plugin_records, 137) \ X(a, STATIC, SINGULAR, UINT32, store_forward_module_records, 137) \
X(a, STATIC, SINGULAR, UINT32, store_forward_plugin_history_return_max, 138) \ X(a, STATIC, SINGULAR, UINT32, store_forward_module_history_return_max, 138) \
X(a, STATIC, SINGULAR, UINT32, store_forward_plugin_history_return_window, 139) \ X(a, STATIC, SINGULAR, UINT32, store_forward_module_history_return_window, 139) \
X(a, STATIC, SINGULAR, BOOL, telemetry_module_measurement_enabled, 140) \ X(a, STATIC, SINGULAR, BOOL, telemetry_module_measurement_enabled, 140) \
X(a, STATIC, SINGULAR, BOOL, telemetry_module_screen_enabled, 141) \ X(a, STATIC, SINGULAR, BOOL, telemetry_module_screen_enabled, 141) \
X(a, STATIC, SINGULAR, UINT32, telemetry_module_read_error_count_threshold, 142) \ X(a, STATIC, SINGULAR, UINT32, telemetry_module_read_error_count_threshold, 142) \
@ -396,8 +396,8 @@ X(a, STATIC, SINGULAR, UINT32, telemetry_module_recovery_interval, 144) \
X(a, STATIC, SINGULAR, BOOL, telemetry_module_display_farenheit, 145) \ X(a, STATIC, SINGULAR, BOOL, telemetry_module_display_farenheit, 145) \
X(a, STATIC, SINGULAR, UENUM, telemetry_module_sensor_type, 146) \ X(a, STATIC, SINGULAR, UENUM, telemetry_module_sensor_type, 146) \
X(a, STATIC, SINGULAR, UINT32, telemetry_module_sensor_pin, 147) \ X(a, STATIC, SINGULAR, UINT32, telemetry_module_sensor_pin, 147) \
X(a, STATIC, SINGULAR, BOOL, store_forward_plugin_enabled, 148) \ X(a, STATIC, SINGULAR, BOOL, store_forward_module_enabled, 148) \
X(a, STATIC, SINGULAR, BOOL, store_forward_plugin_heartbeat, 149) \ X(a, STATIC, SINGULAR, BOOL, store_forward_module_heartbeat, 149) \
X(a, STATIC, SINGULAR, UINT32, position_flags, 150) \ X(a, STATIC, SINGULAR, UINT32, position_flags, 150) \
X(a, STATIC, SINGULAR, BOOL, is_always_powered, 151) \ X(a, STATIC, SINGULAR, BOOL, is_always_powered, 151) \
X(a, STATIC, SINGULAR, UINT32, auto_screen_carousel_secs, 152) \ X(a, STATIC, SINGULAR, UINT32, auto_screen_carousel_secs, 152) \
@ -414,12 +414,12 @@ X(a, STATIC, SINGULAR, UINT32, rotary1_pin_press, 163) \
X(a, STATIC, SINGULAR, UENUM, rotary1_event_cw, 164) \ X(a, STATIC, SINGULAR, UENUM, rotary1_event_cw, 164) \
X(a, STATIC, SINGULAR, UENUM, rotary1_event_ccw, 165) \ X(a, STATIC, SINGULAR, UENUM, rotary1_event_ccw, 165) \
X(a, STATIC, SINGULAR, UENUM, rotary1_event_press, 166) \ X(a, STATIC, SINGULAR, UENUM, rotary1_event_press, 166) \
X(a, STATIC, SINGULAR, BOOL, canned_message_plugin_enabled, 170) \ X(a, STATIC, SINGULAR, BOOL, canned_message_module_enabled, 170) \
X(a, STATIC, SINGULAR, STRING, canned_message_plugin_allow_input_source, 171) \ X(a, STATIC, SINGULAR, STRING, canned_message_module_allow_input_source, 171) \
X(a, STATIC, SINGULAR, BOOL, canned_message_plugin_send_bell, 173) \ X(a, STATIC, SINGULAR, BOOL, canned_message_module_send_bell, 173) \
X(a, STATIC, SINGULAR, BOOL, mqtt_encryption_enabled, 174) \ X(a, STATIC, SINGULAR, BOOL, mqtt_encryption_enabled, 174) \
X(a, STATIC, SINGULAR, FLOAT, adc_multiplier_override, 175) \ X(a, STATIC, SINGULAR, FLOAT, adc_multiplier_override, 175) \
X(a, STATIC, SINGULAR, UINT32, serialplugin_baud, 176) X(a, STATIC, SINGULAR, UINT32, serialmodule_baud, 176)
#define RadioConfig_UserPreferences_CALLBACK NULL #define RadioConfig_UserPreferences_CALLBACK NULL
#define RadioConfig_UserPreferences_DEFAULT NULL #define RadioConfig_UserPreferences_DEFAULT NULL

14
src/modules/CannedMessageModule.cpp
View File

@ -26,7 +26,7 @@ CannedMessagePlugin::CannedMessagePlugin()
: SinglePortPlugin("canned", PortNum_TEXT_MESSAGE_APP), : SinglePortPlugin("canned", PortNum_TEXT_MESSAGE_APP),
concurrency::OSThread("CannedMessagePlugin") concurrency::OSThread("CannedMessagePlugin")
{ {
if (radioConfig.preferences.canned_message_plugin_enabled) if (radioConfig.preferences.canned_message_module_enabled)
{ {
this->loadProtoForPlugin(); this->loadProtoForPlugin();
if(this->splitConfiguredMessages() <= 0) if(this->splitConfiguredMessages() <= 0)
@ -113,9 +113,9 @@ int CannedMessagePlugin::splitConfiguredMessages()
int CannedMessagePlugin::handleInputEvent(const InputEvent *event) int CannedMessagePlugin::handleInputEvent(const InputEvent *event)
{ {
if ( if (
(strlen(radioConfig.preferences.canned_message_plugin_allow_input_source) > 0) && (strlen(radioConfig.preferences.canned_message_module_allow_input_source) > 0) &&
(strcmp(radioConfig.preferences.canned_message_plugin_allow_input_source, event->source) != 0) && (strcmp(radioConfig.preferences.canned_message_module_allow_input_source, event->source) != 0) &&
(strcmp(radioConfig.preferences.canned_message_plugin_allow_input_source, "_any") != 0)) (strcmp(radioConfig.preferences.canned_message_module_allow_input_source, "_any") != 0))
{ {
// Event source is not accepted. // Event source is not accepted.
// Event only accepted if source matches the configured one, or // Event only accepted if source matches the configured one, or
@ -162,7 +162,7 @@ void CannedMessagePlugin::sendText(NodeNum dest,
p->want_ack = true; p->want_ack = true;
p->decoded.payload.size = strlen(message); p->decoded.payload.size = strlen(message);
memcpy(p->decoded.payload.bytes, message, p->decoded.payload.size); memcpy(p->decoded.payload.bytes, message, p->decoded.payload.size);
if (radioConfig.preferences.canned_message_plugin_send_bell) if (radioConfig.preferences.canned_message_module_send_bell)
{ {
p->decoded.payload.bytes[p->decoded.payload.size-1] = 7; // Bell character p->decoded.payload.bytes[p->decoded.payload.size-1] = 7; // Bell character
p->decoded.payload.bytes[p->decoded.payload.size] = '\0'; // Bell character p->decoded.payload.bytes[p->decoded.payload.size] = '\0'; // Bell character
@ -177,7 +177,7 @@ void CannedMessagePlugin::sendText(NodeNum dest,
int32_t CannedMessagePlugin::runOnce() int32_t CannedMessagePlugin::runOnce()
{ {
if ((!radioConfig.preferences.canned_message_plugin_enabled) if ((!radioConfig.preferences.canned_message_module_enabled)
|| (this->runState == CANNED_MESSAGE_RUN_STATE_DISABLED) || (this->runState == CANNED_MESSAGE_RUN_STATE_DISABLED)
|| (this->runState == CANNED_MESSAGE_RUN_STATE_INACTIVE)) || (this->runState == CANNED_MESSAGE_RUN_STATE_INACTIVE))
{ {
@ -259,7 +259,7 @@ const char* CannedMessagePlugin::getNextMessage()
} }
bool CannedMessagePlugin::shouldDraw() bool CannedMessagePlugin::shouldDraw()
{ {
if (!radioConfig.preferences.canned_message_plugin_enabled) if (!radioConfig.preferences.canned_message_module_enabled)
{ {
return false; return false;
} }

58
src/modules/ExternalNotificationModule.cpp
View File

@ -19,26 +19,26 @@
Quick reference: Quick reference:
radioConfig.preferences.ext_notification_plugin_enabled radioConfig.preferences.ext_notification_module_enabled
0 = Disabled (Default) 0 = Disabled (Default)
1 = Enabled 1 = Enabled
radioConfig.preferences.ext_notification_plugin_active radioConfig.preferences.ext_notification_module_active
0 = Active Low (Default) 0 = Active Low (Default)
1 = Active High 1 = Active High
radioConfig.preferences.ext_notification_plugin_alert_message radioConfig.preferences.ext_notification_module_alert_message
0 = Disabled (Default) 0 = Disabled (Default)
1 = Alert when a text message comes 1 = Alert when a text message comes
radioConfig.preferences.ext_notification_plugin_alert_bell radioConfig.preferences.ext_notification_module_alert_bell
0 = Disabled (Default) 0 = Disabled (Default)
1 = Alert when the bell character is received 1 = Alert when the bell character is received
radioConfig.preferences.ext_notification_plugin_output radioConfig.preferences.ext_notification_module_output
GPIO of the output. (Default = 13) GPIO of the output. (Default = 13)
radioConfig.preferences.ext_notification_plugin_output_ms radioConfig.preferences.ext_notification_module_output_ms
Amount of time in ms for the alert. Default is 1000. Amount of time in ms for the alert. Default is 1000.
*/ */
@ -59,19 +59,19 @@ int32_t ExternalNotificationPlugin::runOnce()
without having to configure it from the PythonAPI or WebUI. without having to configure it from the PythonAPI or WebUI.
*/ */
// radioConfig.preferences.ext_notification_plugin_enabled = 1; // radioConfig.preferences.ext_notification_module_enabled = 1;
// radioConfig.preferences.ext_notification_plugin_alert_message = 1; // radioConfig.preferences.ext_notification_module_alert_message = 1;
// radioConfig.preferences.ext_notification_plugin_active = 1; // radioConfig.preferences.ext_notification_module_active = 1;
// radioConfig.preferences.ext_notification_plugin_alert_bell = 1; // radioConfig.preferences.ext_notification_module_alert_bell = 1;
// radioConfig.preferences.ext_notification_plugin_output_ms = 1000; // radioConfig.preferences.ext_notification_module_output_ms = 1000;
// radioConfig.preferences.ext_notification_plugin_output = 13; // radioConfig.preferences.ext_notification_module_output = 13;
if (externalCurrentState) { if (externalCurrentState) {
// If the output is turned on, turn it back off after the given period of time. // If the output is turned on, turn it back off after the given period of time.
if (externalTurnedOn + (radioConfig.preferences.ext_notification_plugin_output_ms if (externalTurnedOn + (radioConfig.preferences.ext_notification_module_output_ms
? radioConfig.preferences.ext_notification_plugin_output_ms ? radioConfig.preferences.ext_notification_module_output_ms
: EXT_NOTIFICATION_PLUGIN_OUTPUT_MS) < : EXT_NOTIFICATION_PLUGIN_OUTPUT_MS) <
millis()) { millis()) {
DEBUG_MSG("Turning off external notification\n"); DEBUG_MSG("Turning off external notification\n");
@ -88,9 +88,9 @@ void ExternalNotificationPlugin::setExternalOn()
externalCurrentState = 1; externalCurrentState = 1;
externalTurnedOn = millis(); externalTurnedOn = millis();
digitalWrite((radioConfig.preferences.ext_notification_plugin_output ? radioConfig.preferences.ext_notification_plugin_output digitalWrite((radioConfig.preferences.ext_notification_module_output ? radioConfig.preferences.ext_notification_module_output
: EXT_NOTIFICATION_PLUGIN_OUTPUT), : EXT_NOTIFICATION_PLUGIN_OUTPUT),
(radioConfig.preferences.ext_notification_plugin_active ? true : false)); (radioConfig.preferences.ext_notification_module_active ? true : false));
#endif #endif
} }
@ -99,9 +99,9 @@ void ExternalNotificationPlugin::setExternalOff()
#ifdef EXT_NOTIFY_OUT #ifdef EXT_NOTIFY_OUT
externalCurrentState = 0; externalCurrentState = 0;
digitalWrite((radioConfig.preferences.ext_notification_plugin_output ? radioConfig.preferences.ext_notification_plugin_output digitalWrite((radioConfig.preferences.ext_notification_module_output ? radioConfig.preferences.ext_notification_module_output
: EXT_NOTIFICATION_PLUGIN_OUTPUT), : EXT_NOTIFICATION_PLUGIN_OUTPUT),
(radioConfig.preferences.ext_notification_plugin_active ? false : true)); (radioConfig.preferences.ext_notification_module_active ? false : true));
#endif #endif
} }
@ -122,20 +122,20 @@ ExternalNotificationPlugin::ExternalNotificationPlugin()
without having to configure it from the PythonAPI or WebUI. without having to configure it from the PythonAPI or WebUI.
*/ */
// radioConfig.preferences.ext_notification_plugin_enabled = 1; // radioConfig.preferences.ext_notification_module_enabled = 1;
// radioConfig.preferences.ext_notification_plugin_alert_message = 1; // radioConfig.preferences.ext_notification_module_alert_message = 1;
// radioConfig.preferences.ext_notification_plugin_active = 1; // radioConfig.preferences.ext_notification_module_active = 1;
// radioConfig.preferences.ext_notification_plugin_alert_bell = 1; // radioConfig.preferences.ext_notification_module_alert_bell = 1;
// radioConfig.preferences.ext_notification_plugin_output_ms = 1000; // radioConfig.preferences.ext_notification_module_output_ms = 1000;
// radioConfig.preferences.ext_notification_plugin_output = 13; // radioConfig.preferences.ext_notification_module_output = 13;
if (radioConfig.preferences.ext_notification_plugin_enabled) { if (radioConfig.preferences.ext_notification_module_enabled) {
DEBUG_MSG("Initializing External Notification Plugin\n"); DEBUG_MSG("Initializing External Notification Plugin\n");
// Set the direction of a pin // Set the direction of a pin
pinMode((radioConfig.preferences.ext_notification_plugin_output ? radioConfig.preferences.ext_notification_plugin_output pinMode((radioConfig.preferences.ext_notification_module_output ? radioConfig.preferences.ext_notification_module_output
: EXT_NOTIFICATION_PLUGIN_OUTPUT), : EXT_NOTIFICATION_PLUGIN_OUTPUT),
OUTPUT); OUTPUT);
@ -154,13 +154,13 @@ ProcessMessage ExternalNotificationPlugin::handleReceived(const MeshPacket &mp)
#ifndef NO_ESP32 #ifndef NO_ESP32
#ifdef EXT_NOTIFY_OUT #ifdef EXT_NOTIFY_OUT
if (radioConfig.preferences.ext_notification_plugin_enabled) { if (radioConfig.preferences.ext_notification_module_enabled) {
if (getFrom(&mp) != nodeDB.getNodeNum()) { if (getFrom(&mp) != nodeDB.getNodeNum()) {
// TODO: This may be a problem if messages are sent in unicide, but I'm not sure if it will. // TODO: This may be a problem if messages are sent in unicide, but I'm not sure if it will.
// Need to know if and how this could be a problem. // Need to know if and how this could be a problem.
if (radioConfig.preferences.ext_notification_plugin_alert_bell) { if (radioConfig.preferences.ext_notification_module_alert_bell) {
auto &p = mp.decoded; auto &p = mp.decoded;
DEBUG_MSG("externalNotificationPlugin - Notification Bell\n"); DEBUG_MSG("externalNotificationPlugin - Notification Bell\n");
for (int i = 0; i < p.payload.size; i++) { for (int i = 0; i < p.payload.size; i++) {
@ -170,7 +170,7 @@ ProcessMessage ExternalNotificationPlugin::handleReceived(const MeshPacket &mp)
} }
} }
if (radioConfig.preferences.ext_notification_plugin_alert_message) { if (radioConfig.preferences.ext_notification_module_alert_message) {
DEBUG_MSG("externalNotificationPlugin - Notification Plugin\n"); DEBUG_MSG("externalNotificationPlugin - Notification Plugin\n");
setExternalOn(); setExternalOn();
} }

22
src/modules/esp32/RangeTestPlugin.cpp
View File

@ -36,33 +36,33 @@ int32_t RangeTestPlugin::runOnce()
without having to configure it from the PythonAPI or WebUI. without having to configure it from the PythonAPI or WebUI.
*/ */
// radioConfig.preferences.range_test_plugin_enabled = 1; // radioConfig.preferences.range_test_module_enabled = 1;
// radioConfig.preferences.range_test_plugin_sender = 45; // radioConfig.preferences.range_test_module_sender = 45;
// radioConfig.preferences.range_test_plugin_save = 1; // radioConfig.preferences.range_test_module_save = 1;
// Fixed position is useful when testing indoors. // Fixed position is useful when testing indoors.
// radioConfig.preferences.fixed_position = 1; // radioConfig.preferences.fixed_position = 1;
uint32_t senderHeartbeat = radioConfig.preferences.range_test_plugin_sender * 1000; uint32_t senderHeartbeat = radioConfig.preferences.range_test_module_sender * 1000;
if (radioConfig.preferences.range_test_plugin_enabled) { if (radioConfig.preferences.range_test_module_enabled) {
if (firstTime) { if (firstTime) {
rangeTestPluginRadio = new RangeTestPluginRadio(); rangeTestPluginRadio = new RangeTestPluginRadio();
firstTime = 0; firstTime = 0;
if (radioConfig.preferences.range_test_plugin_sender) { if (radioConfig.preferences.range_test_module_sender) {
DEBUG_MSG("Initializing Range Test Plugin -- Sender\n"); DEBUG_MSG("Initializing Range Test Module -- Sender\n");
return (5000); // Sending first message 5 seconds after initilization. return (5000); // Sending first message 5 seconds after initilization.
} else { } else {
DEBUG_MSG("Initializing Range Test Plugin -- Receiver\n"); DEBUG_MSG("Initializing Range Test Module -- Receiver\n");
return (500); return (500);
} }
} else { } else {
if (radioConfig.preferences.range_test_plugin_sender) { if (radioConfig.preferences.range_test_module_sender) {
// If sender // If sender
DEBUG_MSG("Range Test Plugin - Sending heartbeat every %d ms\n", (senderHeartbeat)); DEBUG_MSG("Range Test Plugin - Sending heartbeat every %d ms\n", (senderHeartbeat));
@ -131,7 +131,7 @@ ProcessMessage RangeTestPluginRadio::handleReceived(const MeshPacket &mp)
{ {
#ifndef NO_ESP32 #ifndef NO_ESP32
if (radioConfig.preferences.range_test_plugin_enabled) { if (radioConfig.preferences.range_test_module_enabled) {
/* /*
auto &p = mp.decoded; auto &p = mp.decoded;
@ -141,7 +141,7 @@ ProcessMessage RangeTestPluginRadio::handleReceived(const MeshPacket &mp)
if (getFrom(&mp) != nodeDB.getNodeNum()) { if (getFrom(&mp) != nodeDB.getNodeNum()) {
if (radioConfig.preferences.range_test_plugin_save) { if (radioConfig.preferences.range_test_module_save) {
appendFile(mp); appendFile(mp);
} }

40
src/modules/esp32/SerialPlugin.cpp
View File

@ -21,17 +21,17 @@
Basic Usage: Basic Usage:
1) Enable the module by setting serialplugin_enabled to 1. 1) Enable the module by setting serialplugin_enabled to 1.
2) Set the pins (serialplugin_rxd / serialplugin_rxd) for your preferred RX and TX GPIO pins. 2) Set the pins (serialmodule_rxd / serialmodule_rxd) for your preferred RX and TX GPIO pins.
On tbeam, recommend to use: On tbeam, recommend to use:
RXD 35 RXD 35
TXD 15 TXD 15
3) Set serialplugin_timeout to the amount of time to wait before we consider 3) Set serialmodule_timeout to the amount of time to wait before we consider
your packet as "done". your packet as "done".
4) (Optional) In SerialPlugin.h set the port to PortNum_TEXT_MESSAGE_APP if you want to 4) (Optional) In SerialPlugin.h set the port to PortNum_TEXT_MESSAGE_APP if you want to
send messages to/from the general text message channel. send messages to/from the general text message channel.
5) Connect to your device over the serial interface at 38400 8N1. 5) Connect to your device over the serial interface at 38400 8N1.
6) Send a packet up to 240 bytes in length. This will get relayed over the mesh network. 6) Send a packet up to 240 bytes in length. This will get relayed over the mesh network.
7) (Optional) Set serialplugin_echo to 1 and any message you send out will be echoed back 7) (Optional) Set serialmodule_echo to 1 and any message you send out will be echoed back
to your device. to your device.
TODO (in this order): TODO (in this order):
@ -72,34 +72,34 @@ int32_t SerialPlugin::runOnce()
#ifndef NO_ESP32 #ifndef NO_ESP32
/* /*
Uncomment the preferences below if you want to use the plugin Uncomment the preferences below if you want to use the module
without having to configure it from the PythonAPI or WebUI. without having to configure it from the PythonAPI or WebUI.
*/ */
// radioConfig.preferences.serialplugin_enabled = 1; // radioConfig.preferences.serialmodule_enabled = 1;
// radioConfig.preferences.serialplugin_rxd = 35; // radioConfig.preferences.serialmodule_rxd = 35;
// radioConfig.preferences.serialplugin_txd = 15; // radioConfig.preferences.serialmodule_txd = 15;
// radioConfig.preferences.serialplugin_timeout = 1000; // radioConfig.preferences.serialmodule_timeout = 1000;
// radioConfig.preferences.serialplugin_echo = 1; // radioConfig.preferences.serialmodule_echo = 1;
if (radioConfig.preferences.serialplugin_enabled) { if (radioConfig.preferences.serialmodule_enabled) {
if (firstTime) { if (firstTime) {
// Interface with the serial peripheral from in here. // Interface with the serial peripheral from in here.
DEBUG_MSG("Initializing serial peripheral interface\n"); DEBUG_MSG("Initializing serial peripheral interface\n");
if (radioConfig.preferences.serialplugin_rxd && radioConfig.preferences.serialplugin_txd) { if (radioConfig.preferences.serialmodule_rxd && radioConfig.preferences.serialmodule_txd) {
Serial2.begin(SERIALPLUGIN_BAUD, SERIAL_8N1, radioConfig.preferences.serialplugin_rxd, Serial2.begin(SERIALPLUGIN_BAUD, SERIAL_8N1, radioConfig.preferences.serialmodule_rxd,
radioConfig.preferences.serialplugin_txd); radioConfig.preferences.serialmodule_txd);
} else { } else {
Serial2.begin(SERIALPLUGIN_BAUD, SERIAL_8N1, RXD2, TXD2); Serial2.begin(SERIALPLUGIN_BAUD, SERIAL_8N1, RXD2, TXD2);
} }
if (radioConfig.preferences.serialplugin_timeout) { if (radioConfig.preferences.serialmodule_timeout) {
Serial2.setTimeout( Serial2.setTimeout(
radioConfig.preferences.serialplugin_timeout); // Number of MS to wait to set the timeout for the string. radioConfig.preferences.serialmodule_timeout); // Number of MS to wait to set the timeout for the string.
} else { } else {
Serial2.setTimeout(SERIALPLUGIN_TIMEOUT); // Number of MS to wait to set the timeout for the string. Serial2.setTimeout(SERIALPLUGIN_TIMEOUT); // Number of MS to wait to set the timeout for the string.
@ -161,7 +161,7 @@ ProcessMessage SerialPluginRadio::handleReceived(const MeshPacket &mp)
{ {
#ifndef NO_ESP32 #ifndef NO_ESP32
if (radioConfig.preferences.serialplugin_enabled) { if (radioConfig.preferences.serialmodule_enabled) {
auto &p = mp.decoded; auto &p = mp.decoded;
// DEBUG_MSG("Received text msg self=0x%0x, from=0x%0x, to=0x%0x, id=%d, msg=%.*s\n", // DEBUG_MSG("Received text msg self=0x%0x, from=0x%0x, to=0x%0x, id=%d, msg=%.*s\n",
@ -170,10 +170,10 @@ ProcessMessage SerialPluginRadio::handleReceived(const MeshPacket &mp)
if (getFrom(&mp) == nodeDB.getNodeNum()) { if (getFrom(&mp) == nodeDB.getNodeNum()) {
/* /*
* If radioConfig.preferences.serialplugin_echo is true, then echo the packets that are sent out back to the TX * If radioConfig.preferences.serialmodule_echo is true, then echo the packets that are sent out back to the TX
* of the serial interface. * of the serial interface.
*/ */
if (radioConfig.preferences.serialplugin_echo) { if (radioConfig.preferences.serialmodule_echo) {
// For some reason, we get the packet back twice when we send out of the radio. // For some reason, we get the packet back twice when we send out of the radio.
// TODO: need to find out why. // TODO: need to find out why.
@ -187,12 +187,12 @@ ProcessMessage SerialPluginRadio::handleReceived(const MeshPacket &mp)
} else { } else {
if (radioConfig.preferences.serialplugin_mode == 0 || radioConfig.preferences.serialplugin_mode == 1) { if (radioConfig.preferences.serialmodule_mode == 0 || radioConfig.preferences.serialmodule_mode == 1) {
// DEBUG_MSG("* * Message came from the mesh\n"); // DEBUG_MSG("* * Message came from the mesh\n");
// Serial2.println("* * Message came from the mesh"); // Serial2.println("* * Message came from the mesh");
Serial2.printf("%s", p.payload.bytes); Serial2.printf("%s", p.payload.bytes);
} else if (radioConfig.preferences.serialplugin_mode == 10) { } else if (radioConfig.preferences.serialmodule_mode == 10) {
/* /*
@jobionekabnoi @jobionekabnoi
Add code here to handle what gets sent out to the serial interface. Add code here to handle what gets sent out to the serial interface.

26
src/modules/esp32/StoreForwardPlugin.cpp
View File

@ -19,7 +19,7 @@ int32_t StoreForwardPlugin::runOnce()
#ifndef NO_ESP32 #ifndef NO_ESP32
if (radioConfig.preferences.store_forward_plugin_enabled) { if (radioConfig.preferences.store_forward_module_enabled) {
if (radioConfig.preferences.is_router) { if (radioConfig.preferences.is_router) {
@ -243,7 +243,7 @@ void StoreForwardPlugin::sendMessage(NodeNum dest, char *str)
ProcessMessage StoreForwardPlugin::handleReceived(const MeshPacket &mp) ProcessMessage StoreForwardPlugin::handleReceived(const MeshPacket &mp)
{ {
#ifndef NO_ESP32 #ifndef NO_ESP32
if (radioConfig.preferences.store_forward_plugin_enabled) { if (radioConfig.preferences.store_forward_module_enabled) {
DEBUG_MSG("--- S&F Received something\n"); DEBUG_MSG("--- S&F Received something\n");
@ -295,7 +295,7 @@ ProcessMessage StoreForwardPlugin::handleReceived(const MeshPacket &mp)
ProcessMessage StoreForwardPlugin::handleReceivedProtobuf(const MeshPacket &mp, StoreAndForward *p) ProcessMessage StoreForwardPlugin::handleReceivedProtobuf(const MeshPacket &mp, StoreAndForward *p)
{ {
if (!radioConfig.preferences.store_forward_plugin_enabled) { if (!radioConfig.preferences.store_forward_module_enabled) {
// If this module is not enabled in any capacity, don't handle the packet, and allow other modules to consume // If this module is not enabled in any capacity, don't handle the packet, and allow other modules to consume
return ProcessMessage::CONTINUE; return ProcessMessage::CONTINUE;
} }
@ -391,12 +391,12 @@ StoreForwardPlugin::StoreForwardPlugin()
without having to configure it from the PythonAPI or WebUI. without having to configure it from the PythonAPI or WebUI.
*/ */
radioConfig.preferences.store_forward_plugin_enabled = 1; radioConfig.preferences.store_forward_module_enabled = 1;
radioConfig.preferences.is_router = 1; radioConfig.preferences.is_router = 1;
radioConfig.preferences.is_always_powered = 1; radioConfig.preferences.is_always_powered = 1;
} }
if (radioConfig.preferences.store_forward_plugin_enabled) { if (radioConfig.preferences.store_forward_module_enabled) {
// Router // Router
if (radioConfig.preferences.is_router) { if (radioConfig.preferences.is_router) {
@ -407,20 +407,20 @@ StoreForwardPlugin::StoreForwardPlugin()
// Do the startup here // Do the startup here
// Maximum number of records to return. // Maximum number of records to return.
if (radioConfig.preferences.store_forward_plugin_history_return_max) if (radioConfig.preferences.store_forward_module_history_return_max)
this->historyReturnMax = radioConfig.preferences.store_forward_plugin_history_return_max; this->historyReturnMax = radioConfig.preferences.store_forward_module_history_return_max;
// Maximum time window for records to return (in minutes) // Maximum time window for records to return (in minutes)
if (radioConfig.preferences.store_forward_plugin_history_return_window) if (radioConfig.preferences.store_forward_module_history_return_window)
this->historyReturnWindow = radioConfig.preferences.store_forward_plugin_history_return_window; this->historyReturnWindow = radioConfig.preferences.store_forward_module_history_return_window;
// Maximum number of records to store in memory // Maximum number of records to store in memory
if (radioConfig.preferences.store_forward_plugin_records) if (radioConfig.preferences.store_forward_module_records)
this->records = radioConfig.preferences.store_forward_plugin_records; this->records = radioConfig.preferences.store_forward_module_records;
// Maximum number of records to store in memory // Maximum number of records to store in memory
if (radioConfig.preferences.store_forward_plugin_heartbeat) if (radioConfig.preferences.store_forward_module_heartbeat)
this->heartbeat = radioConfig.preferences.store_forward_plugin_heartbeat; this->heartbeat = radioConfig.preferences.store_forward_module_heartbeat;
// Popupate PSRAM with our data structures. // Popupate PSRAM with our data structures.
this->populatePSRAM(); this->populatePSRAM();