Rename

Author: Mysticial

…se/SerialPABotBase_Messages_NS_Generic.h …PABotBase_Messages_NS1_WiredController.hCommon/SerialPABotBase/SerialPABotBase_Messages_NS_Generic.h renamed to Common/SerialPABotBase/SerialPABotBase_Messages_NS1_WiredController.h Common/SerialPABotBase/SerialPABotBase_Messages_NS_Generic.h renamed to Common/SerialPABotBase/SerialPABotBase_Messages_NS1_WiredController.h

@@ -1,11 +1,11 @@
-/*  SerialPABotBase Messages (Nintendo Switch Generic Wired Controller)
+/*  SerialPABotBase Messages (Nintendo Switch 1 Wired Controller)
  *
  *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#ifndef PokemonAutomation_SerialPABotBase_Messages_NS_Generic_H
-#define PokemonAutomation_SerialPABotBase_Messages_NS_Generic_H
+#ifndef PokemonAutomation_SerialPABotBase_Messages_NS1_WiredController_H
+#define PokemonAutomation_SerialPABotBase_Messages_NS1_WiredController_H
 
 #include "SerialPABotBase_Protocol.h"
 
@@ -25,23 +25,21 @@ namespace SerialPABotBase{
 #endif
 
 
-#define PABB_MSG_NS_GENERIC_CONTROLLER_STATE_MS     0x90
+#define PABB_MSG_REPORT_NS1_WIRED_CONTROLLER    0x90
 typedef struct{
     uint8_t buttons0;
     uint8_t buttons1;
-//    uint8_t buttons2;
-//    uint8_t buttons3;
     uint8_t dpad;
     uint8_t left_joystick_x;
     uint8_t left_joystick_y;
     uint8_t right_joystick_x;
     uint8_t right_joystick_y;
-} pabb_ControllerReport_NS_Generic_Controller;
+} pabb_Report_NS1_WiredController;
 typedef struct{
     seqnum_t seqnum;
     uint16_t milliseconds;
-    pabb_ControllerReport_NS_Generic_Controller report;
-} PABB_PACK pabb_Message_NS_Generic_ControllerStateMs;
+    pabb_Report_NS1_WiredController report;
+} PABB_PACK pabb_Message_Report_NS1_WiredController;
 
 
 

SerialPrograms/CMakeLists.txt

@@ -280,7 +280,7 @@ file(GLOB MAIN_SOURCES
     ../Common/Qt/WidgetStackFixedAspectRatio.cpp
     ../Common/Qt/WidgetStackFixedAspectRatio.h
     ../Common/SerialPABotBase/SerialPABotBase_Messages_ESP32.h
-    ../Common/SerialPABotBase/SerialPABotBase_Messages_NS_Generic.h
+    ../Common/SerialPABotBase/SerialPABotBase_Messages_NS1_WiredController.h
     ../Common/SerialPABotBase/SerialPABotBase_Protocol.h
     ../Common/SerialPABotBase/SerialPABotBase_Protocol_IDs.h
     ../IconResource/IconResource.rc
@@ -693,8 +693,8 @@ file(GLOB MAIN_SOURCES
     Source/Controllers/SerialPABotBase/SerialPABotBase_PostConnectActions.h
     Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_ESP32.cpp
     Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_ESP32.h
-    Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS_Generic.cpp
-    Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS_Generic.h
+    Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS1_WiredController.cpp
+    Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS1_WiredController.h
     Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_Protocol.cpp
     Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_Protocol.h
     Source/Controllers/SerialPABotBase/SerialPABotBase_SelectorWidget.h
@@ -939,8 +939,8 @@ file(GLOB MAIN_SOURCES
     Source/NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.h
     Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_Controller.cpp
     Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_Controller.h
-    Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_PokkenController.cpp
-    Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_PokkenController.h
+    Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WiredController.cpp
+    Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WiredController.h
     Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessController.cpp
     Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessController.h
     Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessJoycon.cpp
@@ -2609,14 +2609,11 @@ else() # macOS and Linux
     endif()
 
     if (APPLE)
-        ###################################################
-        # Compiler flag change history:
-        # Removed -Wno-c11-extensions since we no long have following error:
+        # Add -Wno-c11-extensions to avoid clang gives
         # /usr/local/Cellar/opencv/4.5.5_3/include/opencv4/opencv2/core/mat.inl.hpp:2116:9: error: '_Atomic' is a C11 extension
         # when compiling OpenCV
-        ###################################################
-        # Use https://clang.llvm.org/docs/DiagnosticsReference.html to query Clang warnings
-        target_compile_options(SerialPrograms PRIVATE -Wall -Wextra -Wpedantic -Werror -Wshorten-64-to-32 -Wtautological-constant-in-range-compare -Wsequence-point)
+        # target_compile_options(SerialPrograms PRIVATE -Wall -Wextra -Wpedantic -Werror -Wno-c11-extensions)
+        target_compile_options(SerialPrograms PRIVATE -Wall -Wextra -Wpedantic -Werror -Wshorten-64-to-32)
     else()
         # Assume GCC
         target_compile_options(SerialPrograms PRIVATE -Wall -Wextra -Wpedantic -Werror -fno-strict-aliasing)

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Descriptor.cpp

@@ -10,7 +10,7 @@
 #include "SerialPABotBase_Descriptor.h"
 #include "SerialPABotBase_SelectorWidget.h"
 
-#include "NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_PokkenController.h"
+#include "NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WiredController.h"
 #include "NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessProController.h"
 #include "NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessJoycon.h"
 
@@ -71,7 +71,7 @@ std::unique_ptr<AbstractController> SerialPABotBase_Descriptor::make_controller(
     switch (controller_type){
     case ControllerType::NintendoSwitch_WiredProController:
         return std::unique_ptr<AbstractController>(
-            new PokemonAutomation::NintendoSwitch::SerialPABotBase_PokkenController(
+            new PokemonAutomation::NintendoSwitch::SerialPABotBase_WiredController(
                 logger,
                 static_cast<SerialPABotBase_Connection&>(connection)
             )

…/SerialPABotBase_Routines_NS_Generic.cpp …BotBase_Routines_NS1_WiredController.cppSerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS_Generic.cpp renamed to SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS1_WiredController.cpp SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS_Generic.cpp renamed to SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS1_WiredController.cpp

@@ -17,16 +17,16 @@ namespace SerialPABotBase{
 
 int register_message_converters_push_button_framework(){
     register_message_converter(
-        PABB_MSG_NS_GENERIC_CONTROLLER_STATE_MS,
+        PABB_MSG_REPORT_NS1_WIRED_CONTROLLER,
         [](const std::string& body){
             //  Disable this by default since it's very spammy.
             if (!GlobalSettings::instance().LOG_EVERYTHING){
                 return std::string();
             }
             std::ostringstream ss;
-            ss << "controller_state_ms() - ";
-            if (body.size() != sizeof(pabb_Message_NS_Generic_ControllerStateMs)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_Message_NS_Generic_ControllerStateMs*)body.c_str();
+            ss << "PABB_MSG_REPORT_NS1_WIRED_CONTROLLER: ";
+            if (body.size() != sizeof(pabb_Message_Report_NS1_WiredController)){ ss << "(invalid size)" << std::endl; return ss.str(); }
+            const auto* params = (const pabb_Message_Report_NS1_WiredController*)body.c_str();
             ss << "seqnum = " << (uint64_t)params->seqnum;
 
             uint16_t buttons = params->report.buttons0;

…se/SerialPABotBase_Routines_NS_Generic.h …PABotBase_Routines_NS1_WiredController.hSerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS_Generic.h renamed to SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS1_WiredController.h SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS_Generic.h renamed to SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS1_WiredController.h

@@ -1,23 +1,23 @@
-/*  SerialPABotBase (Nintendo Switch Generic Wired Controller)
+/*  SerialPABotBase (Nintendo Switch 1 Wired Controller)
  *
  *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#ifndef PokemonAutomation_SerialPABotBase_NS_Generic_H
-#define PokemonAutomation_SerialPABotBase_NS_Generic_H
+#ifndef PokemonAutomation_SerialPABotBase_NS1_WiredController_H
+#define PokemonAutomation_SerialPABotBase_NS1_WiredController_H
 
-#include "Common/SerialPABotBase/SerialPABotBase_Messages_NS_Generic.h"
+#include "Common/SerialPABotBase/SerialPABotBase_Messages_NS1_WiredController.h"
 #include "ClientSource/Connection/BotBaseMessage.h"
 
 namespace PokemonAutomation{
 namespace SerialPABotBase{
 
 
-class DeviceRequest_NS_Generic_ControllerStateMs : public BotBaseRequest{
+class DeviceRequest_NS1_WiredController_ControllerStateMs : public BotBaseRequest{
 public:
-    pabb_Message_NS_Generic_ControllerStateMs params;
-    DeviceRequest_NS_Generic_ControllerStateMs(
+    pabb_Message_Report_NS1_WiredController params;
+    DeviceRequest_NS1_WiredController_ControllerStateMs(
         uint16_t milliseconds,
         uint16_t buttons,
         uint8_t dpad,
@@ -45,7 +45,7 @@ class DeviceRequest_NS_Generic_ControllerStateMs : public BotBaseRequest{
         params.report.right_joystick_y = right_joystick_y;
     }
     virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_NS_GENERIC_CONTROLLER_STATE_MS, params);
+        return BotBaseMessage(PABB_MSG_REPORT_NS1_WIRED_CONTROLLER, params);
     }
 };
 

…tch_SerialPABotBase_PokkenController.cpp …itch_SerialPABotBase_WiredController.cppSerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_PokkenController.cpp renamed to SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WiredController.cpp SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_PokkenController.cpp renamed to SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WiredController.cpp

@@ -1,4 +1,4 @@
-/*  SerialPABotBase: Pokken Controller
+/*  SerialPABotBase: Wired Controller (Switch 1)
  *
  *  From: https://github.com/PokemonAutomation/
  *
@@ -7,12 +7,11 @@
 #include "Common/Cpp/PrettyPrint.h"
 #include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/Concurrency/ReverseLockGuard.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "Common/SerialPABotBase/SerialPABotBase_Protocol_IDs.h"
+//#include "Common/SerialPABotBase/SerialPABotBase_Protocol_IDs.h"
 #include "CommonFramework/Options/Environment/ThemeSelectorOption.h"
 #include "Controllers/SerialPABotBase/SerialPABotBase_Routines_Protocol.h"
-#include "Controllers/SerialPABotBase/SerialPABotBase_Routines_NS_Generic.h"
-#include "NintendoSwitch_SerialPABotBase_PokkenController.h"
+#include "Controllers/SerialPABotBase/SerialPABotBase_Routines_NS1_WiredController.h"
+#include "NintendoSwitch_SerialPABotBase_WiredController.h"
 
 //#include <iostream>
 //using std::cout;
@@ -26,7 +25,7 @@ using namespace std::chrono_literals;
 
 
 
-SerialPABotBase_PokkenController::SerialPABotBase_PokkenController(
+SerialPABotBase_WiredController::SerialPABotBase_WiredController(
     Logger& logger,
     SerialPABotBase::SerialPABotBase_Connection& connection
 )
@@ -37,13 +36,13 @@ SerialPABotBase_PokkenController::SerialPABotBase_PokkenController(
         connection
     )
     , m_stopping(false)
-    , m_status_thread(&SerialPABotBase_PokkenController::status_thread, this)
+    , m_status_thread(&SerialPABotBase_WiredController::status_thread, this)
 {}
-SerialPABotBase_PokkenController::~SerialPABotBase_PokkenController(){
+SerialPABotBase_WiredController::~SerialPABotBase_WiredController(){
     stop();
     m_status_thread.join();
 }
-void SerialPABotBase_PokkenController::stop(){
+void SerialPABotBase_WiredController::stop(){
     if (m_stopping.exchange(true)){
         return;
     }
@@ -62,7 +61,7 @@ void SerialPABotBase_PokkenController::stop(){
 
 
 
-void SerialPABotBase_PokkenController::push_state(const Cancellable* cancellable, WallDuration duration){
+void SerialPABotBase_WiredController::push_state(const Cancellable* cancellable, WallDuration duration){
     //  Must be called inside "m_state_lock".
 
     if (!is_ready()){
@@ -192,7 +191,7 @@ void SerialPABotBase_PokkenController::push_state(const Cancellable* cancellable
     while (time_left > Milliseconds::zero()){
         Milliseconds current = std::min(time_left, 65535ms);
         m_serial->issue_request(
-            SerialPABotBase::DeviceRequest_NS_Generic_ControllerStateMs(
+            SerialPABotBase::DeviceRequest_NS1_WiredController_ControllerStateMs(
                 (uint16_t)current.count(),
                 buttons,
                 dpad,
@@ -231,69 +230,8 @@ class ExtendedLengthCounter{
 };
 
 
-#if 0
-class TickRateTracker{
-public:
-    TickRateTracker(double expected_ticks_per_second)
-        : m_expected_ticks_per_second(expected_ticks_per_second)
-//        , m_history(10)
-    {}
-
-
-    double push_ticks(uint64_t ticks){
-        WallClock now = current_time();
-
-//        if (m_history.full()){
-//            m_history.pop_front();
-//        }
-
-        if (ticks <= m_last_ticks){
-            m_last_push = WallClock::min();
-            m_last_ticks = 0;
-            m_consecutive_off = 0;
-        }
-
-        double ticks_per_second = 0;
-
-        if (m_last_push != WallClock::min()){
-            uint64_t elapsed_ticks = ticks - m_last_ticks;
-            double elapsed_seconds = std::chrono::duration_cast<std::chrono::microseconds>(now - m_last_push).count() * 0.000001;
-            ticks_per_second = elapsed_ticks / elapsed_seconds;
-//            m_history.push_back(ticks_per_second);
-
-            double rate_error = std::abs(ticks_per_second - m_expected_ticks_per_second) / m_expected_ticks_per_second;
-            if (rate_error > 0.1){
-                m_consecutive_off++;
-            }else{
-                m_consecutive_off = 0;
-            }
-
-        }
-
-        m_last_push = now;
-        m_last_ticks = ticks;
-
-        return ticks_per_second;
-    }
-
-    size_t consecutive_off_readings() const{
-        return m_consecutive_off;
-    }
-
-
-private:
-    double m_expected_ticks_per_second;
-    WallClock m_last_push = WallClock::min();
-    uint64_t m_last_ticks = 0;
-
-    size_t m_consecutive_off = 0;
-
-//    CircularBuffer<double> m_history;
-};
-#endif
-
 
-void SerialPABotBase_PokkenController::status_thread(){
+void SerialPABotBase_WiredController::status_thread(){
     constexpr std::chrono::milliseconds PERIOD(1000);
     std::atomic<WallClock> last_ack(current_time());
 

…witch_SerialPABotBase_PokkenController.h …Switch_SerialPABotBase_WiredController.hSerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_PokkenController.h renamed to SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WiredController.h SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_PokkenController.h renamed to SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WiredController.h

@@ -1,11 +1,11 @@
-/*  SerialPABotBase: Pokken Controller
+/*  SerialPABotBase: Wired Controller (Switch 1)
  *
  *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#ifndef PokemonAutomation_NintendoSwitch_SerialPABotBase_PokkenController_H
-#define PokemonAutomation_NintendoSwitch_SerialPABotBase_PokkenController_H
+#ifndef PokemonAutomation_NintendoSwitch_SerialPABotBase_WiredControllerNS1_H
+#define PokemonAutomation_NintendoSwitch_SerialPABotBase_WiredControllerNS1_H
 
 #include "Controllers/ControllerCapability.h"
 #include "NintendoSwitch/NintendoSwitch_Settings.h"
@@ -16,7 +16,7 @@ namespace PokemonAutomation{
 namespace NintendoSwitch{
 
 
-class SerialPABotBase_PokkenController final :
+class SerialPABotBase_WiredController final :
     public ProController,
     public SerialPABotBase_Controller
 {
@@ -25,11 +25,11 @@ class SerialPABotBase_PokkenController final :
 
 
 public:
-    SerialPABotBase_PokkenController(
+    SerialPABotBase_WiredController(
         Logger& logger,
         SerialPABotBase::SerialPABotBase_Connection& connection
     );
-    ~SerialPABotBase_PokkenController();
+    ~SerialPABotBase_WiredController();
     void stop();
 
     virtual Logger& logger() override{

SerialPrograms/Source/Tests/NintendoSwitch_Tests.cpp

@@ -10,7 +10,7 @@
 #include "CommonFramework/ImageTypes/ImageRGB32.h"
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
 #include "CommonFramework/Recording/StreamHistorySession.h"
-#include "NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_PokkenController.h"
+#include "NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WiredController.h"
 #include "NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.h"
 #include "NintendoSwitch_Tests.h"
 #include "TestUtils.h"
@@ -29,7 +29,7 @@ int test_NintendoSwitch_UpdatePopupDetector(const ImageViewRGB32& image, bool ta
     auto& logger = global_logger_command_line();
     DummyBotBase botbase(logger);
     SerialPABotBase::SerialPABotBase_Connection connection(logger, nullptr, {});
-    SerialPABotBase_PokkenController controller(logger, connection);
+    SerialPABotBase_WiredController controller(logger, connection);
     DummyVideoFeed video_feed;
     DummyVideoOverlay video_overlay;
     DummyAudioFeed audio_feed;

SerialPrograms/Source/Tests/PokemonLA_Tests.cpp

@@ -12,7 +12,7 @@
 #include "CommonFramework/ImageTools/ImageBoxes.h"
 #include "CommonFramework/Recording/StreamHistorySession.h"
 #include "Controllers/ControllerCapability.h"
-#include "NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_PokkenController.h"
+#include "NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WiredController.h"
 #include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
 #include "PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h"
 #include "PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.h"
@@ -493,7 +493,7 @@ int test_pokemonLA_shinySoundDetector(const std::vector<AudioSpectrum>& spectrum
     auto& logger = global_logger_command_line();
     DummyBotBase botbase(logger);
     SerialPABotBase::SerialPABotBase_Connection connection(logger, nullptr, {});
-    SerialPABotBase_PokkenController controller(logger, connection);
+    SerialPABotBase_WiredController controller(logger, connection);
     DummyVideoFeed video_feed;
     DummyVideoOverlay video_overlay;
     DummyAudioFeed audio_feed;

SerialPrograms/Source/Tests/PokemonLZA_Tests.cpp

@@ -11,7 +11,6 @@
 #include "CommonFramework/ImageTools/ImageBoxes.h"
 #include "CommonFramework/Recording/StreamHistorySession.h"
 #include "Controllers/ControllerCapability.h"
-#include "NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_PokkenController.h"
 #include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
 #include "PokemonLZA/Inference/PokemonLZA_DialogDetector.h" 
 #include <QFileInfo>
@@ -46,4 +45,4 @@ int test_pokemonZLA_NormalDialogBoxDetector(const ImageViewRGB32& image, bool ta
 }
 
 
-} 
+}