diff --git a/src/input/RotaryEncoderInterruptImpl1.cpp b/src/input/RotaryEncoderInterruptImpl1.cpp index e0e904a0d..74d318084 100644 --- a/src/input/RotaryEncoderInterruptImpl1.cpp +++ b/src/input/RotaryEncoderInterruptImpl1.cpp @@ -27,7 +27,7 @@ void RotaryEncoderInterruptImpl1::init() char eventPressed = static_cast(radioConfig.preferences.rotary1_event_press); - //radioConfig.preferences.ext_notification_plugin_output + //radioConfig.preferences.ext_notification_module_output RotaryEncoderInterruptBase::init( pinA, pinB, pinPress, eventCw, eventCcw, eventPressed, diff --git a/src/mesh/generated/admin.pb.h b/src/mesh/generated/admin.pb.h index 1a065f7f2..fc9a20d56 100644 --- a/src/mesh/generated/admin.pb.h +++ b/src/mesh/generated/admin.pb.h @@ -29,18 +29,18 @@ typedef struct _AdminMessage { bool confirm_set_radio; bool exit_simulator; int32_t reboot_seconds; - bool get_canned_message_plugin_part1_request; - char get_canned_message_plugin_part1_response[201]; - bool get_canned_message_plugin_part2_request; - char get_canned_message_plugin_part2_response[201]; - bool get_canned_message_plugin_part3_request; - char get_canned_message_plugin_part3_response[201]; - bool get_canned_message_plugin_part4_request; - char get_canned_message_plugin_part4_response[201]; - char set_canned_message_plugin_part1[201]; - char set_canned_message_plugin_part2[201]; - char set_canned_message_plugin_part3[201]; - char set_canned_message_plugin_part4[201]; + bool get_canned_message_module_part1_request; + char get_canned_message_module_part1_response[201]; + bool get_canned_message_module_part2_request; + char get_canned_message_module_part2_response[201]; + bool get_canned_message_module_part3_request; + char get_canned_message_module_part3_response[201]; + bool get_canned_message_module_part4_request; + char get_canned_message_module_part4_response[201]; + char set_canned_message_module_part1[201]; + char set_canned_message_module_part2[201]; + char set_canned_message_module_part3[201]; + char set_canned_message_module_part4[201]; int32_t shutdown_seconds; }; } AdminMessage; @@ -68,18 +68,18 @@ extern "C" { #define AdminMessage_confirm_set_radio_tag 33 #define AdminMessage_exit_simulator_tag 34 #define AdminMessage_reboot_seconds_tag 35 -#define AdminMessage_get_canned_message_plugin_part1_request_tag 36 -#define AdminMessage_get_canned_message_plugin_part1_response_tag 37 -#define AdminMessage_get_canned_message_plugin_part2_request_tag 38 -#define AdminMessage_get_canned_message_plugin_part2_response_tag 39 -#define AdminMessage_get_canned_message_plugin_part3_request_tag 40 -#define AdminMessage_get_canned_message_plugin_part3_response_tag 41 -#define AdminMessage_get_canned_message_plugin_part4_request_tag 42 -#define AdminMessage_get_canned_message_plugin_part4_response_tag 43 -#define AdminMessage_set_canned_message_plugin_part1_tag 44 -#define AdminMessage_set_canned_message_plugin_part2_tag 45 -#define AdminMessage_set_canned_message_plugin_part3_tag 46 -#define AdminMessage_set_canned_message_plugin_part4_tag 47 +#define AdminMessage_get_canned_message_module_part1_request_tag 36 +#define AdminMessage_get_canned_message_module_part1_response_tag 37 +#define AdminMessage_get_canned_message_module_part2_request_tag 38 +#define AdminMessage_get_canned_message_module_part2_response_tag 39 +#define AdminMessage_get_canned_message_module_part3_request_tag 40 +#define AdminMessage_get_canned_message_module_part3_response_tag 41 +#define AdminMessage_get_canned_message_module_part4_request_tag 42 +#define AdminMessage_get_canned_message_module_part4_response_tag 43 +#define AdminMessage_set_canned_message_module_part1_tag 44 +#define AdminMessage_set_canned_message_module_part2_tag 45 +#define AdminMessage_set_canned_message_module_part3_tag 46 +#define AdminMessage_set_canned_message_module_part4_tag 47 #define AdminMessage_shutdown_seconds_tag 51 /* Struct field encoding specification for nanopb */ @@ -97,18 +97,18 @@ X(a, STATIC, ONEOF, BOOL, (variant,confirm_set_channel,confirm_set_chan X(a, STATIC, ONEOF, BOOL, (variant,confirm_set_radio,confirm_set_radio), 33) \ X(a, STATIC, ONEOF, BOOL, (variant,exit_simulator,exit_simulator), 34) \ X(a, STATIC, ONEOF, INT32, (variant,reboot_seconds,reboot_seconds), 35) \ -X(a, STATIC, ONEOF, BOOL, (variant,get_canned_message_plugin_part1_request,get_canned_message_plugin_part1_request), 36) \ -X(a, STATIC, ONEOF, STRING, (variant,get_canned_message_plugin_part1_response,get_canned_message_plugin_part1_response), 37) \ -X(a, STATIC, ONEOF, BOOL, (variant,get_canned_message_plugin_part2_request,get_canned_message_plugin_part2_request), 38) \ -X(a, STATIC, ONEOF, STRING, (variant,get_canned_message_plugin_part2_response,get_canned_message_plugin_part2_response), 39) \ -X(a, STATIC, ONEOF, BOOL, (variant,get_canned_message_plugin_part3_request,get_canned_message_plugin_part3_request), 40) \ -X(a, STATIC, ONEOF, STRING, (variant,get_canned_message_plugin_part3_response,get_canned_message_plugin_part3_response), 41) \ -X(a, STATIC, ONEOF, BOOL, (variant,get_canned_message_plugin_part4_request,get_canned_message_plugin_part4_request), 42) \ -X(a, STATIC, ONEOF, STRING, (variant,get_canned_message_plugin_part4_response,get_canned_message_plugin_part4_response), 43) \ -X(a, STATIC, ONEOF, STRING, (variant,set_canned_message_plugin_part1,set_canned_message_plugin_part1), 44) \ -X(a, STATIC, ONEOF, STRING, (variant,set_canned_message_plugin_part2,set_canned_message_plugin_part2), 45) \ -X(a, STATIC, ONEOF, STRING, (variant,set_canned_message_plugin_part3,set_canned_message_plugin_part3), 46) \ -X(a, STATIC, ONEOF, STRING, (variant,set_canned_message_plugin_part4,set_canned_message_plugin_part4), 47) \ +X(a, STATIC, ONEOF, BOOL, (variant,get_canned_message_module_part1_request,get_canned_message_module_part1_request), 36) \ +X(a, STATIC, ONEOF, STRING, (variant,get_canned_message_module_part1_response,get_canned_message_module_part1_response), 37) \ +X(a, STATIC, ONEOF, BOOL, (variant,get_canned_message_module_part2_request,get_canned_message_module_part2_request), 38) \ +X(a, STATIC, ONEOF, STRING, (variant,get_canned_message_module_part2_response,get_canned_message_module_part2_response), 39) \ +X(a, STATIC, ONEOF, BOOL, (variant,get_canned_message_module_part3_request,get_canned_message_module_part3_request), 40) \ +X(a, STATIC, ONEOF, STRING, (variant,get_canned_message_module_part3_response,get_canned_message_module_part3_response), 41) \ +X(a, STATIC, ONEOF, BOOL, (variant,get_canned_message_module_part4_request,get_canned_message_module_part4_request), 42) \ +X(a, STATIC, ONEOF, STRING, (variant,get_canned_message_module_part4_response,get_canned_message_module_part4_response), 43) \ +X(a, STATIC, ONEOF, STRING, (variant,set_canned_message_module_part1,set_canned_message_module_part1), 44) \ +X(a, STATIC, ONEOF, STRING, (variant,set_canned_message_module_part2,set_canned_message_module_part2), 45) \ +X(a, STATIC, ONEOF, STRING, (variant,set_canned_message_module_part3,set_canned_message_module_part3), 46) \ +X(a, STATIC, ONEOF, STRING, (variant,set_canned_message_module_part4,set_canned_message_module_part4), 47) \ X(a, STATIC, ONEOF, INT32, (variant,shutdown_seconds,shutdown_seconds), 51) #define AdminMessage_CALLBACK NULL #define AdminMessage_DEFAULT NULL diff --git a/src/mesh/generated/cannedmessages.pb.c b/src/mesh/generated/cannedmessages.pb.c index e36eff981..e50dc685c 100644 --- a/src/mesh/generated/cannedmessages.pb.c +++ b/src/mesh/generated/cannedmessages.pb.c @@ -6,7 +6,7 @@ #error Regenerate this file with the current version of nanopb generator. #endif -PB_BIND(CannedMessagePluginConfig, CannedMessagePluginConfig, 2) +PB_BIND(CannedMessageModuleConfig, CannedMessageModuleConfig, 2) diff --git a/src/mesh/generated/cannedmessages.pb.h b/src/mesh/generated/cannedmessages.pb.h index ec8a42123..c6d6c86ff 100644 --- a/src/mesh/generated/cannedmessages.pb.h +++ b/src/mesh/generated/cannedmessages.pb.h @@ -10,12 +10,12 @@ #endif /* Struct definitions */ -typedef struct _CannedMessagePluginConfig { +typedef struct _CannedMessageModuleConfig { char messagesPart1[201]; char messagesPart2[201]; char messagesPart3[201]; char messagesPart4[201]; -} CannedMessagePluginConfig; +} CannedMessageModuleConfig; #ifdef __cplusplus @@ -23,31 +23,31 @@ extern "C" { #endif /* Initializer values for message structs */ -#define CannedMessagePluginConfig_init_default {"", "", "", ""} -#define CannedMessagePluginConfig_init_zero {"", "", "", ""} +#define CannedMessageModuleConfig_init_default {"", "", "", ""} +#define CannedMessageModuleConfig_init_zero {"", "", "", ""} /* Field tags (for use in manual encoding/decoding) */ -#define CannedMessagePluginConfig_messagesPart1_tag 11 -#define CannedMessagePluginConfig_messagesPart2_tag 12 -#define CannedMessagePluginConfig_messagesPart3_tag 13 -#define CannedMessagePluginConfig_messagesPart4_tag 14 +#define CannedMessageModuleConfig_messagesPart1_tag 11 +#define CannedMessageModuleConfig_messagesPart2_tag 12 +#define CannedMessageModuleConfig_messagesPart3_tag 13 +#define CannedMessageModuleConfig_messagesPart4_tag 14 /* Struct field encoding specification for nanopb */ -#define CannedMessagePluginConfig_FIELDLIST(X, a) \ +#define CannedMessageModuleConfig_FIELDLIST(X, a) \ X(a, STATIC, SINGULAR, STRING, messagesPart1, 11) \ X(a, STATIC, SINGULAR, STRING, messagesPart2, 12) \ X(a, STATIC, SINGULAR, STRING, messagesPart3, 13) \ X(a, STATIC, SINGULAR, STRING, messagesPart4, 14) -#define CannedMessagePluginConfig_CALLBACK NULL -#define CannedMessagePluginConfig_DEFAULT NULL +#define CannedMessageModuleConfig_CALLBACK NULL +#define CannedMessageModuleConfig_DEFAULT NULL -extern const pb_msgdesc_t CannedMessagePluginConfig_msg; +extern const pb_msgdesc_t CannedMessageModuleConfig_msg; /* Defines for backwards compatibility with code written before nanopb-0.4.0 */ -#define CannedMessagePluginConfig_fields &CannedMessagePluginConfig_msg +#define CannedMessageModuleConfig_fields &CannedMessageModuleConfig_msg /* Maximum encoded size of messages (where known) */ -#define CannedMessagePluginConfig_size 812 +#define CannedMessageModuleConfig_size 812 #ifdef __cplusplus } /* extern "C" */ diff --git a/src/modules/CannedMessageModule.cpp b/src/modules/CannedMessageModule.cpp index 0289e06c3..c1467c5b1 100644 --- a/src/modules/CannedMessageModule.cpp +++ b/src/modules/CannedMessageModule.cpp @@ -14,7 +14,7 @@ static const char *cannedMessagesConfigFile = "/prefs/cannedConf.proto"; -CannedMessagePluginConfig cannedMessagePluginConfig; +CannedMessageModuleConfig cannedMessageModuleConfig; CannedMessagePlugin *cannedMessagePlugin; @@ -56,16 +56,16 @@ int CannedMessagePlugin::splitConfiguredMessages() // collect all the message parts strcpy( this->messageStore, - cannedMessagePluginConfig.messagesPart1); + cannedMessageModuleConfig.messagesPart1); strcat( this->messageStore, - cannedMessagePluginConfig.messagesPart2); + cannedMessageModuleConfig.messagesPart2); strcat( this->messageStore, - cannedMessagePluginConfig.messagesPart3); + cannedMessageModuleConfig.messagesPart3); strcat( this->messageStore, - cannedMessagePluginConfig.messagesPart4); + cannedMessageModuleConfig.messagesPart4); // The first message points to the beginning of the store. this->messages[messageIndex++] = @@ -315,7 +315,7 @@ void CannedMessagePlugin::drawFrame( void CannedMessagePlugin::loadProtoForPlugin() { - if (!loadProto(cannedMessagesConfigFile, CannedMessagePluginConfig_size, sizeof(cannedMessagesConfigFile), CannedMessagePluginConfig_fields, &cannedMessagePluginConfig)) { + if (!loadProto(cannedMessagesConfigFile, CannedMessageModuleConfig_size, sizeof(cannedMessagesConfigFile), CannedMessageModuleConfig_fields, &cannedMessageModuleConfig)) { installDefaultCannedMessagePluginConfig(); } } @@ -334,7 +334,7 @@ bool CannedMessagePlugin::saveProtoForPlugin() FS.mkdir("/prefs"); #endif - okay &= saveProto(cannedMessagesConfigFile, CannedMessagePluginConfig_size, sizeof(CannedMessagePluginConfig), CannedMessagePluginConfig_fields, &cannedMessagePluginConfig); + okay &= saveProto(cannedMessagesConfigFile, CannedMessageModuleConfig_size, sizeof(CannedMessageModuleConfig), CannedMessageModuleConfig_fields, &cannedMessageModuleConfig); return okay; } @@ -344,10 +344,10 @@ bool CannedMessagePlugin::saveProtoForPlugin() */ void CannedMessagePlugin::installDefaultCannedMessagePluginConfig() { - memset(cannedMessagePluginConfig.messagesPart1, 0, sizeof(cannedMessagePluginConfig.messagesPart1)); - memset(cannedMessagePluginConfig.messagesPart2, 0, sizeof(cannedMessagePluginConfig.messagesPart2)); - memset(cannedMessagePluginConfig.messagesPart3, 0, sizeof(cannedMessagePluginConfig.messagesPart3)); - memset(cannedMessagePluginConfig.messagesPart4, 0, sizeof(cannedMessagePluginConfig.messagesPart4)); + memset(cannedMessageModuleConfig.messagesPart1, 0, sizeof(cannedMessageModuleConfig.messagesPart1)); + memset(cannedMessageModuleConfig.messagesPart2, 0, sizeof(cannedMessageModuleConfig.messagesPart2)); + memset(cannedMessageModuleConfig.messagesPart3, 0, sizeof(cannedMessageModuleConfig.messagesPart3)); + memset(cannedMessageModuleConfig.messagesPart4, 0, sizeof(cannedMessageModuleConfig.messagesPart4)); } /** @@ -365,55 +365,55 @@ AdminMessageHandleResult CannedMessagePlugin::handleAdminMessageForPlugin( AdminMessageHandleResult result; switch (request->which_variant) { - case AdminMessage_get_canned_message_plugin_part1_request_tag: + case AdminMessage_get_canned_message_module_part1_request_tag: DEBUG_MSG("Client is getting radio canned message part1\n"); this->handleGetCannedMessagePluginPart1(mp, response); result = AdminMessageHandleResult::HANDLED_WITH_RESPONSE; break; - case AdminMessage_get_canned_message_plugin_part2_request_tag: + case AdminMessage_get_canned_message_module_part2_request_tag: DEBUG_MSG("Client is getting radio canned message part2\n"); this->handleGetCannedMessagePluginPart2(mp, response); result = AdminMessageHandleResult::HANDLED_WITH_RESPONSE; break; - case AdminMessage_get_canned_message_plugin_part3_request_tag: + case AdminMessage_get_canned_message_module_part3_request_tag: DEBUG_MSG("Client is getting radio canned message part3\n"); this->handleGetCannedMessagePluginPart3(mp, response); result = AdminMessageHandleResult::HANDLED_WITH_RESPONSE; break; - case AdminMessage_get_canned_message_plugin_part4_request_tag: + case AdminMessage_get_canned_message_module_part4_request_tag: DEBUG_MSG("Client is getting radio canned message part4\n"); this->handleGetCannedMessagePluginPart4(mp, response); result = AdminMessageHandleResult::HANDLED_WITH_RESPONSE; break; - case AdminMessage_set_canned_message_plugin_part1_tag: + case AdminMessage_set_canned_message_module_part1_tag: DEBUG_MSG("Client is setting radio canned message part 1\n"); this->handleSetCannedMessagePluginPart1( - request->set_canned_message_plugin_part1); + request->set_canned_message_module_part1); result = AdminMessageHandleResult::HANDLED; break; - case AdminMessage_set_canned_message_plugin_part2_tag: + case AdminMessage_set_canned_message_module_part2_tag: DEBUG_MSG("Client is setting radio canned message part 2\n"); this->handleSetCannedMessagePluginPart2( - request->set_canned_message_plugin_part2); + request->set_canned_message_module_part2); result = AdminMessageHandleResult::HANDLED; break; - case AdminMessage_set_canned_message_plugin_part3_tag: + case AdminMessage_set_canned_message_module_part3_tag: DEBUG_MSG("Client is setting radio canned message part 3\n"); this->handleSetCannedMessagePluginPart3( - request->set_canned_message_plugin_part3); + request->set_canned_message_module_part3); result = AdminMessageHandleResult::HANDLED; break; - case AdminMessage_set_canned_message_plugin_part4_tag: + case AdminMessage_set_canned_message_module_part4_tag: DEBUG_MSG("Client is setting radio canned message part 4\n"); this->handleSetCannedMessagePluginPart4( - request->set_canned_message_plugin_part4); + request->set_canned_message_module_part4); result = AdminMessageHandleResult::HANDLED; break; @@ -430,10 +430,10 @@ void CannedMessagePlugin::handleGetCannedMessagePluginPart1( DEBUG_MSG("*** handleGetCannedMessagePluginPart1\n"); assert(req.decoded.want_response); - response->which_variant = AdminMessage_get_canned_message_plugin_part1_response_tag; + response->which_variant = AdminMessage_get_canned_message_module_part1_response_tag; strcpy( - response->get_canned_message_plugin_part1_response, - cannedMessagePluginConfig.messagesPart1); + response->get_canned_message_module_part1_response, + cannedMessageModuleConfig.messagesPart1); } void CannedMessagePlugin::handleGetCannedMessagePluginPart2( @@ -442,10 +442,10 @@ void CannedMessagePlugin::handleGetCannedMessagePluginPart2( DEBUG_MSG("*** handleGetCannedMessagePluginPart2\n"); assert(req.decoded.want_response); - response->which_variant = AdminMessage_get_canned_message_plugin_part2_response_tag; + response->which_variant = AdminMessage_get_canned_message_module_part2_response_tag; strcpy( - response->get_canned_message_plugin_part2_response, - cannedMessagePluginConfig.messagesPart2); + response->get_canned_message_module_part2_response, + cannedMessageModuleConfig.messagesPart2); } void CannedMessagePlugin::handleGetCannedMessagePluginPart3( @@ -454,10 +454,10 @@ void CannedMessagePlugin::handleGetCannedMessagePluginPart3( DEBUG_MSG("*** handleGetCannedMessagePluginPart3\n"); assert(req.decoded.want_response); - response->which_variant = AdminMessage_get_canned_message_plugin_part3_response_tag; + response->which_variant = AdminMessage_get_canned_message_module_part3_response_tag; strcpy( - response->get_canned_message_plugin_part3_response, - cannedMessagePluginConfig.messagesPart3); + response->get_canned_message_module_part3_response, + cannedMessageModuleConfig.messagesPart3); } void CannedMessagePlugin::handleGetCannedMessagePluginPart4( @@ -466,10 +466,10 @@ void CannedMessagePlugin::handleGetCannedMessagePluginPart4( DEBUG_MSG("*** handleGetCannedMessagePluginPart4\n"); assert(req.decoded.want_response); - response->which_variant = AdminMessage_get_canned_message_plugin_part4_response_tag; + response->which_variant = AdminMessage_get_canned_message_module_part4_response_tag; strcpy( - response->get_canned_message_plugin_part4_response, - cannedMessagePluginConfig.messagesPart4); + response->get_canned_message_module_part4_response, + cannedMessageModuleConfig.messagesPart4); } void CannedMessagePlugin::handleSetCannedMessagePluginPart1(const char *from_msg) @@ -478,8 +478,8 @@ void CannedMessagePlugin::handleSetCannedMessagePluginPart1(const char *from_msg if (*from_msg) { - changed |= strcmp(cannedMessagePluginConfig.messagesPart1, from_msg); - strcpy(cannedMessagePluginConfig.messagesPart1, from_msg); + changed |= strcmp(cannedMessageModuleConfig.messagesPart1, from_msg); + strcpy(cannedMessageModuleConfig.messagesPart1, from_msg); DEBUG_MSG("*** from_msg.text:%s\n", from_msg); } @@ -495,8 +495,8 @@ void CannedMessagePlugin::handleSetCannedMessagePluginPart2(const char *from_msg if (*from_msg) { - changed |= strcmp(cannedMessagePluginConfig.messagesPart2, from_msg); - strcpy(cannedMessagePluginConfig.messagesPart2, from_msg); + changed |= strcmp(cannedMessageModuleConfig.messagesPart2, from_msg); + strcpy(cannedMessageModuleConfig.messagesPart2, from_msg); } if (changed) @@ -511,8 +511,8 @@ void CannedMessagePlugin::handleSetCannedMessagePluginPart3(const char *from_msg if (*from_msg) { - changed |= strcmp(cannedMessagePluginConfig.messagesPart3, from_msg); - strcpy(cannedMessagePluginConfig.messagesPart3, from_msg); + changed |= strcmp(cannedMessageModuleConfig.messagesPart3, from_msg); + strcpy(cannedMessageModuleConfig.messagesPart3, from_msg); } if (changed) @@ -527,8 +527,8 @@ void CannedMessagePlugin::handleSetCannedMessagePluginPart4(const char *from_msg if (*from_msg) { - changed |= strcmp(cannedMessagePluginConfig.messagesPart4, from_msg); - strcpy(cannedMessagePluginConfig.messagesPart4, from_msg); + changed |= strcmp(cannedMessageModuleConfig.messagesPart4, from_msg); + strcpy(cannedMessageModuleConfig.messagesPart4, from_msg); } if (changed)