Static init doesn't work through a library.

Author: Mysticial

SerialPrograms/Source/Controllers/SerialPABotBase/Connection/MessageConverter.cpp

@@ -14,6 +14,10 @@
 #include "Controllers/SerialPABotBase/Connection/BotBaseMessage.h"
 #include "MessageConverter.h"
 
+#include "Controllers/SerialPABotBase/SerialPABotBase_Routines_HID_Keyboard.h"
+#include "Controllers/SerialPABotBase/SerialPABotBase_Routines_NS2_WiredController.h"
+#include "Controllers/SerialPABotBase/SerialPABotBase_Routines_NS1_WirelessControllers.h"
+
 namespace PokemonAutomation{
 
 
@@ -481,17 +485,27 @@ int register_message_converters_custom_info(){
 }
 
 
-int init_MessageLogger =
-    register_message_converters_framework_errors() +
-    register_message_converters_framework_acks() +
-    register_message_converters_framework_requests() +
+
+const std::map<uint8_t, MessageConverter>& make_MESSAGE_MAP(){
+    register_message_converters_framework_errors();
+    register_message_converters_framework_acks();
+    register_message_converters_framework_requests();
     register_message_converters_custom_info();
 
+    SerialPABotBase::register_message_converters_HID_Keyboard();
+    SerialPABotBase::register_message_converters_NS2_WiredController();
+    SerialPABotBase::register_message_converters_NS1_WirelessControllers();
+
+    return converter_map();
+}
+
+
 
 std::string message_to_string(const BotBaseMessage& message){
-    const std::map<uint8_t, MessageConverter>& converters = converter_map();
-    auto iter = converters.find(message.type);
-    if (iter == converters.end()){
+    static const std::map<uint8_t, MessageConverter>& CONVERTER_MAP = make_MESSAGE_MAP();
+
+    auto iter = CONVERTER_MAP.find(message.type);
+    if (iter == CONVERTER_MAP.end()){
         std::ostringstream ss;
         ss << "Unknown Message Type " << (unsigned)message.type << ": length = " << message.body.size();
         return ss.str();

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_HID_Keyboard.cpp

@@ -14,7 +14,7 @@ namespace SerialPABotBase{
 
 
 
-int register_message_converters_HID_Keyboard(){
+void register_message_converters_HID_Keyboard(){
     register_message_converter(
         PABB_MSG_COMMAND_HID_KEYBOARD_STATE,
         [](const std::string& body){
@@ -45,9 +45,7 @@ int register_message_converters_HID_Keyboard(){
             return ss.str();
         }
     );
-    return 0;
 }
-int init_PushButtonFramework = register_message_converters_HID_Keyboard();
 
 
 

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_HID_Keyboard.h

@@ -14,6 +14,9 @@ namespace PokemonAutomation{
 namespace SerialPABotBase{
 
 
+void register_message_converters_HID_Keyboard();
+
+
 class DeviceRequest_HID_Keyboard_StateMs : public BotBaseRequest{
 public:
     pabb_Message_Command_HID_Keyboard_State params;

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS1_WirelessControllers.cpp

@@ -15,7 +15,7 @@ namespace SerialPABotBase{
 
 
 
-int register_message_converters_NS1_WirelessControllers(){
+void register_message_converters_NS1_WirelessControllers(){
     register_message_converter(
         PABB_MSG_REQUEST_STATUS,
         [](const std::string& body){
@@ -99,9 +99,7 @@ int register_message_converters_NS1_WirelessControllers(){
             return ss.str();
         }
     );
-    return 0;
 }
-int init_Messages_ESP32 = register_message_converters_NS1_WirelessControllers();
 
 
 

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS1_WirelessControllers.h

@@ -16,6 +16,7 @@ namespace PokemonAutomation{
 namespace SerialPABotBase{
 
 
+void register_message_converters_NS1_WirelessControllers();
 
 
 class MessageControllerReadSpi : public BotBaseRequest{

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS2_WiredController.cpp

@@ -15,7 +15,7 @@ namespace SerialPABotBase{
 
 
 
-int register_message_converters_NS2_WiredController(){
+void register_message_converters_NS2_WiredController(){
     register_message_converter(
         PABB_MSG_COMMAND_NS2_WIRED_CONTROLLER_STATE,
         [](const std::string& body){
@@ -46,9 +46,7 @@ int register_message_converters_NS2_WiredController(){
             return ss.str();
         }
     );
-    return 0;
 }
-int init_NS2_WiredController = register_message_converters_NS2_WiredController();
 
 
 

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS2_WiredController.h

@@ -14,6 +14,10 @@ namespace PokemonAutomation{
 namespace SerialPABotBase{
 
 
+void register_message_converters_NS2_WiredController();
+
+
+
 class DeviceRequest_NS2_WiredController_ControllerStateMs : public BotBaseRequest{
 public:
     pabb_Message_Command_NS2_WiredController_State params;