From fe3a3525119f29201193268c29033e53023d94df Mon Sep 17 00:00:00 2001 From: Balazs Kelemen <10376327+prampec@users.noreply.github.com> Date: Sun, 16 Jan 2022 23:18:40 +0100 Subject: [PATCH] CannedMessagePlugin typo fix. --- src/mesh/generated/radioconfig.pb.h | 6 +++--- src/plugins/CannedMessagePlugin.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mesh/generated/radioconfig.pb.h b/src/mesh/generated/radioconfig.pb.h index 3e6eea360..035adb4af 100644 --- a/src/mesh/generated/radioconfig.pb.h +++ b/src/mesh/generated/radioconfig.pb.h @@ -176,7 +176,7 @@ typedef struct _RadioConfig_UserPreferences { InputEventChar rotary1_event_ccw; InputEventChar rotary1_event_press; bool canned_message_plugin_enabled; - char canned_message_plugin_allow_input_origin[16]; + char canned_message_plugin_allow_input_source[16]; char canned_message_plugin_messages[1024]; bool canned_message_plugin_send_bell; } RadioConfig_UserPreferences; @@ -310,7 +310,7 @@ extern "C" { #define RadioConfig_UserPreferences_rotary1_event_ccw_tag 165 #define RadioConfig_UserPreferences_rotary1_event_press_tag 166 #define RadioConfig_UserPreferences_canned_message_plugin_enabled_tag 170 -#define RadioConfig_UserPreferences_canned_message_plugin_allow_input_origin_tag 171 +#define RadioConfig_UserPreferences_canned_message_plugin_allow_input_source_tag 171 #define RadioConfig_UserPreferences_canned_message_plugin_messages_tag 172 #define RadioConfig_UserPreferences_canned_message_plugin_send_bell_tag 173 #define RadioConfig_preferences_tag 1 @@ -401,7 +401,7 @@ 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_press, 166) \ X(a, STATIC, SINGULAR, BOOL, canned_message_plugin_enabled, 170) \ -X(a, STATIC, SINGULAR, STRING, canned_message_plugin_allow_input_origin, 171) \ +X(a, STATIC, SINGULAR, STRING, canned_message_plugin_allow_input_source, 171) \ X(a, STATIC, SINGULAR, STRING, canned_message_plugin_messages, 172) \ X(a, STATIC, SINGULAR, BOOL, canned_message_plugin_send_bell, 173) #define RadioConfig_UserPreferences_CALLBACK NULL diff --git a/src/plugins/CannedMessagePlugin.cpp b/src/plugins/CannedMessagePlugin.cpp index ba3cb02c9..7a950e3b8 100644 --- a/src/plugins/CannedMessagePlugin.cpp +++ b/src/plugins/CannedMessagePlugin.cpp @@ -81,9 +81,9 @@ int CannedMessagePlugin::splitConfiguredMessages() int CannedMessagePlugin::handleInputEvent(const InputEvent *event) { if ( - (strlen(radioConfig.preferences.canned_message_plugin_allow_input_origin) > 0) && - (strcmp(radioConfig.preferences.canned_message_plugin_allow_input_origin, event->source) != 0) && - (strcmp(radioConfig.preferences.canned_message_plugin_allow_input_origin, "_any") != 0)) + (strlen(radioConfig.preferences.canned_message_plugin_allow_input_source) > 0) && + (strcmp(radioConfig.preferences.canned_message_plugin_allow_input_source, event->source) != 0) && + (strcmp(radioConfig.preferences.canned_message_plugin_allow_input_source, "_any") != 0)) { // Event source is not accepted. return 0;