More cleanup + version number.

Author: Mysticial

SerialPrograms/Source/CommonFramework/Globals.cpp

@@ -25,8 +25,8 @@ namespace PokemonAutomation{
 
 const bool IS_BETA_VERSION = true;
 const int PROGRAM_VERSION_MAJOR = 0;
-const int PROGRAM_VERSION_MINOR = 56;
-const int PROGRAM_VERSION_PATCH = 6;
+const int PROGRAM_VERSION_MINOR = 57;
+const int PROGRAM_VERSION_PATCH = 1;
 
 const std::string PROGRAM_VERSION_BASE =
     "v" + std::to_string(PROGRAM_VERSION_MAJOR) +

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase.cpp

@@ -43,33 +43,6 @@ const std::map<uint32_t, std::set<pabb_ProgramID>>& SUPPORTED_VERSIONS(){
 
 
 
-
-std::string program_name(uint32_t id){
-    switch (id){
-    case PABB_PID_UNSPECIFIED:                  return "None";
-
-    //  Old (fat) PABotBase with scheduler.
-    case PABB_PID_PABOTBASE_12KB:               return "PABotBase-AVR8-12KB";
-    case PABB_PID_PABOTBASE_31KB:               return "PABotBase-AVR8-31KB";
-
-    //  New (slim) PABotBase.
-    case PABB_PID_PABOTBASE_ArduinoUnoR3:       return "PABotBase-UnoR3";
-    case PABB_PID_PABOTBASE_ArduinoLeonardo:    return "PABotBase-Leonardo";
-    case PABB_PID_PABOTBASE_ProMicro:           return "PABotBase-ProMicro";
-    case PABB_PID_PABOTBASE_Teensy2:            return "PABotBase-Teensy2.0";
-    case PABB_PID_PABOTBASE_TeensyPP2:          return "PABotBase-Teensy++2.0";
-
-    case PABB_PID_PABOTBASE_CH552:              return "PABotBase-CH552";
-
-    case PABB_PID_PABOTBASE_ESP32:              return "PABotBase-ESP32";
-    case PABB_PID_PABOTBASE_ESP32S3:            return "PABotBase-ESP32-S3";
-
-    case PABB_PID_PABOTBASE_PicoW_USB:          return "PABotBase-PicoW (USB)";
-    case PABB_PID_PABOTBASE_PicoW_UART:         return "PABotBase-PicoW (UART)";
-
-    default: return "Unknown ID";
-    }
-}
 ControllerType id_to_controller_type(uint32_t id){
     switch (id){
     case PABB_CID_NONE:

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase.h

@@ -11,6 +11,7 @@
 #include <string>
 #include <set>
 #include <map>
+#include "Common/SerialPABotBase/SerialPABotBase_Protocol_IDs.h"
 #include "Controllers/ControllerTypes.h"
 
 namespace PokemonAutomation{
@@ -25,7 +26,6 @@ const std::map<uint32_t, std::set<pabb_ProgramID>>& SUPPORTED_VERSIONS();
 
 
 
-std::string program_name(uint32_t id);
 ControllerType id_to_controller_type(uint32_t id);
 uint32_t controller_type_to_id(ControllerType controller_type);
 

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Connection.cpp

@@ -264,8 +264,17 @@ ControllerModeStatus SerialPABotBase_Connection::process_device(
     //  Queue Size
     process_queue_size();
 
-    //  Controller Type
-    ControllerType current_controller = get_controller_type(controllers);
+    //  Current Controller
+    ControllerType current_controller;
+    {
+        m_logger.log("Reading Controller Mode...");
+        uint32_t type_id = read_controller_mode(*m_botbase);
+        current_controller = id_to_controller_type(type_id);
+        m_logger.Logger::log("Reading Controller Mode... Mode = " + CONTROLLER_TYPE_STRINGS.get_string(current_controller));
+    }
+
+//    //  Controller Type
+//    ControllerType current_controller = get_controller_type(controllers);
 
     //  Run any post-connection actions specific to this program.
     ControllerModeStatus ret{current_controller, controllers};

SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase3_ProController.h

@@ -43,9 +43,7 @@ class ProController_SysbotBase3 final :
         return ControllerType::NintendoSwitch_WiredController;
     }
     virtual ControllerPerformanceClass performance_class() const override{
-        //  TODO: Change to SerialPABotBase_Wired when we prove it is stable.
         return ControllerPerformanceClass::SerialPABotBase_Wired;
-//        return ControllerPerformanceClass::SysbotBase;
     }
 
     virtual Milliseconds ticksize() const override{
@@ -55,10 +53,7 @@ class ProController_SysbotBase3 final :
         return Milliseconds(8);
     }
     virtual Milliseconds timing_variation() const override{
-        //  TODO: Verify it is actually this stable.
         return ConsoleSettings::instance().TIMING_OPTIONS.WIRED_MICROCONTROLLER;
-//        return ConsoleSettings::instance().TIMING_OPTIONS.SYSBOTBASE;
-//        return Milliseconds(8);
     }
     virtual bool atomic_multibutton() const override{
         return true;