More SBB3 support.

Author: Mysticial

SerialPrograms/Source/ML/Programs/ML_LabelImages.cpp

@@ -73,7 +73,7 @@ void DrawnBoundingBox::on_mouse_release(double, double){
 
     const size_t source_width = m_program.source_image_width;
     const size_t source_height = m_program.source_image_height;
-    
+
     const int box_x = int(m_program.X * source_width + 0.5);
     const int box_y = int(m_program.Y * source_height + 0.5);
     const int box_width = int(m_program.WIDTH * source_width + 0.5);

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

@@ -36,10 +36,10 @@ ProController_SysbotBase3::~ProController_SysbotBase3(){
 
 const ControllerFeatures& ProController_SysbotBase3::controller_features() const{
     static const ControllerFeatures features{
-//        ControllerFeature::TickPrecise,   //  TODO: Prove it is tick precise.
+        ControllerFeature::TickPrecise,   //  TODO: Prove it is tick precise.
         ControllerFeature::TimingFlexibleMilliseconds,
         ControllerFeature::NintendoSwitch_ProController,
-//        ControllerFeature::NintendoSwitch_DateSkip,   //  TODO: Prove this works
+        ControllerFeature::NintendoSwitch_DateSkip,   //  TODO: Prove this works
     };
     return features;
 }
@@ -90,9 +90,9 @@ void ProController_SysbotBase3::wait_for_all(const Cancellable* cancellable){
     }
 }
 
-void ProController_SysbotBase3::on_receive_data(const void* data, size_t bytes){
+
+void ProController_SysbotBase3::on_message(const std::string& message){
     const std::string TOKEN = "cqCommandFinished";
-    std::string message((const char*)data, bytes);
     auto pos = message.find(TOKEN);
     if (pos == std::string::npos){
         return;
@@ -165,7 +165,7 @@ void ProController_SysbotBase3::push_state(const Cancellable* cancellable, WallD
     if (m_buttons[14].is_busy()) nx_button |= (uint64_t)1 << 13;    //  Up
     if (m_buttons[15].is_busy()) nx_button |= (uint64_t)1 << 14;    //  Right
     if (m_buttons[16].is_busy()) nx_button |= (uint64_t)1 << 15;    //  Down
-    if (m_buttons[17].is_busy()) nx_button |= (uint64_t)1 << 16;    //  Left
+    if (m_buttons[17].is_busy()) nx_button |= (uint64_t)1 << 12;    //  Left
 #if 0   //  Don't exist on pro controller.
     if (m_buttons[18].is_busy()) nx_button |= (uint64_t)1 << 24;    //  Left SL
     if (m_buttons[19].is_busy()) nx_button |= (uint64_t)1 << 25;    //  Left SR
@@ -179,7 +179,7 @@ void ProController_SysbotBase3::push_state(const Cancellable* cancellable, WallD
         if (split_dpad.up)    nx_button |= (uint64_t)1 << 13;
         if (split_dpad.right) nx_button |= (uint64_t)1 << 14;
         if (split_dpad.down)  nx_button |= (uint64_t)1 << 15;
-        if (split_dpad.left)  nx_button |= (uint64_t)1 << 16;
+        if (split_dpad.left)  nx_button |= (uint64_t)1 << 12;
     }
 
     int16_t left_x = 0;
@@ -228,6 +228,7 @@ void ProController_SysbotBase3::push_state(const Cancellable* cancellable, WallD
     message.resize(64);
     command.write_to_hex(message.data());
     message = "cqControllerState " + message + "\r\n";
+
     m_connection.write_data(message);
 
     if (GlobalSettings::instance().LOG_EVERYTHING){

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

@@ -9,7 +9,7 @@
 #define PokemonAutomation_NintendoSwitch_ProController_SysbotBase3_H
 
 #include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.h"
+//#include "NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.h"
 #include "NintendoSwitch/Controllers/NintendoSwitch_ProController.h"
 #include "NintendoSwitch/Controllers/NintendoSwitch_ControllerWithScheduler.h"
 #include "SysbotBase_Connection.h"
@@ -22,12 +22,12 @@ namespace NintendoSwitch{
 class ProController_SysbotBase3 final :
     public ProController,
     public ControllerWithScheduler,
-    private ClientSocket::Listener
+    private SysbotBase::TcpSysbotBase_Connection::Listener
 {
 public:
     using ContextType = ProControllerContext;
 
-    static constexpr size_t QUEUE_SIZE = 16;
+    static constexpr size_t QUEUE_SIZE = 128;
 
 
 public:
@@ -45,7 +45,8 @@ class ProController_SysbotBase3 final :
     virtual const ControllerFeatures& controller_features() const override;
     virtual ControllerPerformanceClass performance_class() const override{
         //  TODO: Change to SerialPABotBase_Wired_125Hz when we prove it is stable.
-        return ControllerPerformanceClass::SysbotBase;
+        return ControllerPerformanceClass::SerialPABotBase_Wired_125Hz;
+//        return ControllerPerformanceClass::SysbotBase;
     }
 
     virtual Milliseconds ticksize() const override{
@@ -218,7 +219,7 @@ class ProController_SysbotBase3 final :
 
 
 private:
-    virtual void on_receive_data(const void* data, size_t bytes) override;
+    virtual void on_message(const std::string& message) override;
     virtual void push_state(const Cancellable* cancellable, WallDuration duration) override;
 
 

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

@@ -7,6 +7,7 @@
 #ifndef PokemonAutomation_Controllers_SysbotBase_Connection_H
 #define PokemonAutomation_Controllers_SysbotBase_Connection_H
 
+#include <deque>
 #include <mutex>
 #include <condition_variable>
 #include <thread>
@@ -23,6 +24,10 @@ namespace SysbotBase{
 
 class TcpSysbotBase_Connection : public ControllerConnection, private ClientSocket::Listener{
 public:
+    struct Listener{
+        virtual void on_message(const std::string& message) = 0;
+    };
+
     void add_listener(Listener& listener){
         m_listeners.add(listener);
     }
@@ -50,6 +55,9 @@ class TcpSysbotBase_Connection : public ControllerConnection, private ClientSock
     virtual void on_connect_finished(const std::string& error_message) override;
     virtual void on_receive_data(const void* data, size_t bytes) override;
 
+    void process_message(const std::string& message);
+    void set_mode(const std::string& sbb_version);
+
 private:
     Logger& m_logger;
     ClientSocket m_socket;
@@ -59,6 +67,7 @@ class TcpSysbotBase_Connection : public ControllerConnection, private ClientSock
     std::string m_connecting_message;
 //    std::string m_version;
     WallClock m_last_receive;
+    std::deque<char> m_receive_buffer;
 
     SpinLock m_send_lock;
     std::mutex m_lock;