Use SPI read/write instead of colors directly.

Author: Mysticial

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Connection.cpp

@@ -249,7 +249,12 @@ ControllerModeStatus SerialPABotBase_Connection::read_device_specs(
             }
 
             m_botbase->issue_request_and_wait(
-                MessageControllerSetColors(desired_controller, colors),
+                MessageControllerWriteSpi(
+                    desired_controller,
+                    0x00006050, sizeof(NintendoSwitch_ControllerColors),
+                    &colors
+                ),
+//                MessageControllerSetColors(desired_controller, colors),
                 nullptr
             );
         }

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_ESP32.cpp

@@ -5,6 +5,7 @@
  */
 
 #include <sstream>
+#include "Common/Cpp/PrettyPrint.h"
 #include "Common/SerialPABotBase/SerialPABotBase_Messages_ESP32.h"
 #include "ClientSource/Libraries/MessageConverter.h"
 #include "CommonFramework/GlobalSettingsPanel.h"
@@ -30,6 +31,35 @@ int register_message_converters_ESP32(){
             return ss.str();
         }
     );
+    register_message_converter(
+        PABB_MSG_ESP32_REQUEST_READ_SPI,
+        [](const std::string& body){
+            std::ostringstream ss;
+            ss << "PABB_MSG_ESP32_REQUEST_READ_SPI() - ";
+            if (body.size() != sizeof(pabb_Message_ESP32_ReadSpi)){ ss << "(invalid size)" << std::endl; return ss.str(); }
+            const auto* params = (const pabb_Message_ESP32_ReadSpi*)body.c_str();
+            ss << "seqnum = " << params->seqnum;
+            ss << ", controller = " << params->controller_type;
+            ss << ", address = 0x" << tostr_hex(params->address);
+            ss << ", bytes = " << (size_t)params->bytes;
+            return ss.str();
+        }
+    );
+    register_message_converter(
+        PABB_MSG_ESP32_REQUEST_WRITE_SPI,
+        [](const std::string& body){
+            std::ostringstream ss;
+            ss << "PABB_MSG_ESP32_REQUEST_WRITE_SPI() - ";
+            if (body.size() <= sizeof(pabb_Message_ESP32_WriteSpi)){ ss << "(invalid size)" << std::endl; return ss.str(); }
+            const auto* params = (const pabb_Message_ESP32_WriteSpi*)body.c_str();
+            ss << "seqnum = " << params->seqnum;
+            ss << ", controller = " << params->controller_type;
+            ss << ", address = 0x" << tostr_hex(params->address);
+            ss << ", bytes = " << (size_t)params->bytes;
+            return ss.str();
+        }
+    );
+#if 0
     register_message_converter(
         PABB_MSG_ESP32_REQUEST_GET_COLORS,
         [](const std::string& body){
@@ -53,6 +83,7 @@ int register_message_converters_ESP32(){
             return ss.str();
         }
     );
+#endif
     register_message_converter(
         PABB_MSG_ESP32_CONTROLLER_STATE_BUTTONS,
         [](const std::string& body){
@@ -85,6 +116,7 @@ int register_message_converters_ESP32(){
             return ss.str();
         }
     );
+#if 0
     register_message_converter(
         PABB_MSG_ESP32_REPORT,
         [](const std::string& body){
@@ -102,6 +134,7 @@ int register_message_converters_ESP32(){
             return ss.str();
         }
     );
+#endif
     return 0;
 }
 int init_Messages_ESP32 = register_message_converters_ESP32();

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_ESP32.h

@@ -30,6 +30,70 @@ class MessageControllerStatus : public BotBaseRequest{
         return BotBaseMessage(PABB_MSG_ESP32_REQUEST_STATUS, params);
     }
 };
+class MessageControllerReadSpi : public BotBaseRequest{
+public:
+    pabb_Message_ESP32_ReadSpi params;
+    MessageControllerReadSpi(ControllerType controller_type, uint32_t address, uint8_t bytes)
+        : BotBaseRequest(false)
+    {
+        uint32_t controller_id = PABB_CID_NONE;
+        switch (controller_type){
+        case ControllerType::NintendoSwitch_WirelessProController:
+            controller_id = PABB_CID_NINTENDO_SWITCH_WIRELESS_PRO_CONTROLLER;
+            break;
+        case ControllerType::NintendoSwitch_LeftJoycon:
+            controller_id = PABB_CID_NINTENDO_SWITCH_LEFT_JOYCON;
+            break;
+        case ControllerType::NintendoSwitch_RightJoycon:
+            controller_id = PABB_CID_NINTENDO_SWITCH_RIGHT_JOYCON;
+            break;
+        default:;
+        }
+        params.seqnum = 0;
+        params.controller_type = controller_id;
+        params.address = address;
+        params.bytes = bytes;
+    }
+    virtual BotBaseMessage message() const override{
+        return BotBaseMessage(PABB_MSG_ESP32_REQUEST_READ_SPI, params);
+    }
+};
+class MessageControllerWriteSpi : public BotBaseRequest{
+public:
+    std::string data;
+    MessageControllerWriteSpi(
+        ControllerType controller_type,
+        uint32_t address, uint8_t bytes,
+        const void* p_data
+    )
+        : BotBaseRequest(false)
+    {
+        uint32_t controller_id = PABB_CID_NONE;
+        switch (controller_type){
+        case ControllerType::NintendoSwitch_WirelessProController:
+            controller_id = PABB_CID_NINTENDO_SWITCH_WIRELESS_PRO_CONTROLLER;
+            break;
+        case ControllerType::NintendoSwitch_LeftJoycon:
+            controller_id = PABB_CID_NINTENDO_SWITCH_LEFT_JOYCON;
+            break;
+        case ControllerType::NintendoSwitch_RightJoycon:
+            controller_id = PABB_CID_NINTENDO_SWITCH_RIGHT_JOYCON;
+            break;
+        default:;
+        }
+        pabb_Message_ESP32_WriteSpi params;
+        params.seqnum = 0;
+        params.controller_type = controller_id;
+        params.address = address;
+        params.bytes = bytes;
+        data = std::string((char*)&params, sizeof(params));
+        data += std::string((const char*)p_data, bytes);
+    }
+    virtual BotBaseMessage message() const override{
+        return BotBaseMessage(PABB_MSG_ESP32_REQUEST_WRITE_SPI, data);
+    }
+};
+#if 0
 class MessageControllerGetColors : public BotBaseRequest{
 public:
     pabb_Message_ESP32_GetColors params;
@@ -86,6 +150,7 @@ class MessageControllerSetColors : public BotBaseRequest{
         return BotBaseMessage(PABB_MSG_ESP32_REQUEST_SET_COLORS, params);
     }
 };
+#endif
 class MessageControllerStateButtons : public BotBaseRequest{
 public:
     pabb_Message_ESP32_CommandButtonState params;

SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessController.cpp

@@ -117,12 +117,17 @@ void SerialPABotBase_WirelessController::status_thread(){
 #if 1
     try{
         m_logger.log("Reading Controller Colors...");
+
+        using ControllerColors = SerialPABotBase::NintendoSwitch_ControllerColors;
+
         BotBaseMessage response = m_serial->issue_request_and_wait(
-            SerialPABotBase::MessageControllerGetColors(m_controller_type),
+            SerialPABotBase::MessageControllerReadSpi(
+                m_controller_type,
+                0x00006050, sizeof(ControllerColors)
+            ),
             &m_scope
         );
 
-        using ControllerColors = SerialPABotBase::NintendoSwitch_ControllerColors;
         ControllerColors colors{};
         if (response.body.size() == sizeof(seqnum_t) + sizeof(ControllerColors)){
             memcpy(&colors, response.body.data() + sizeof(seqnum_t), sizeof(ControllerColors));

SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessController.h

@@ -34,7 +34,7 @@ class SerialPABotBase_WirelessController : public SerialPABotBase_Controller{
 
 public:
     Milliseconds ticksize() const{
-        return Milliseconds(15);
+        return Milliseconds(0);
     }
     Milliseconds cooldown() const{
         return Milliseconds(15);