pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-24 17:32:18 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

CannedMessagePlugin typo fix.

Browse Source
This commit is contained in:
Balazs Kelemen 2022-01-16 23:18:40 +01:00
parent b53f4214bc
commit fe3a352511
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,7 +176,7 @@ typedef struct _RadioConfig_UserPreferences {
InputEventChar rotary1_event_ccw; InputEventChar rotary1_event_ccw;
InputEventChar rotary1_event_press; InputEventChar rotary1_event_press;
bool canned_message_plugin_enabled; 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]; char canned_message_plugin_messages[1024];
bool canned_message_plugin_send_bell; bool canned_message_plugin_send_bell;
} RadioConfig_UserPreferences; } RadioConfig_UserPreferences;
@ -310,7 +310,7 @@ extern "C" {
#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_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_messages_tag 172
#define RadioConfig_UserPreferences_canned_message_plugin_send_bell_tag 173 #define RadioConfig_UserPreferences_canned_message_plugin_send_bell_tag 173
#define RadioConfig_preferences_tag 1 #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_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_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, STRING, canned_message_plugin_messages, 172) \
X(a, STATIC, SINGULAR, BOOL, canned_message_plugin_send_bell, 173) X(a, STATIC, SINGULAR, BOOL, canned_message_plugin_send_bell, 173)
#define RadioConfig_UserPreferences_CALLBACK NULL #define RadioConfig_UserPreferences_CALLBACK NULL

6
src/plugins/CannedMessagePlugin.cpp
View File

@ -81,9 +81,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_origin) > 0) && (strlen(radioConfig.preferences.canned_message_plugin_allow_input_source) > 0) &&
(strcmp(radioConfig.preferences.canned_message_plugin_allow_input_origin, event->source) != 0) && (strcmp(radioConfig.preferences.canned_message_plugin_allow_input_source, event->source) != 0) &&
(strcmp(radioConfig.preferences.canned_message_plugin_allow_input_origin, "_any") != 0)) (strcmp(radioConfig.preferences.canned_message_plugin_allow_input_source, "_any") != 0))
{ {
// Event source is not accepted. // Event source is not accepted.
return 0; return 0;