Use shorter button report. Change default color generation algorithm.

Author: Mysticial

ClientSource/Libraries/MessageConverter.cpp

@@ -197,7 +197,7 @@ int register_message_converters_framework_acks(){
             static const char HEX_DIGITS[] = "0123456789abcdef";
             for (size_t c = sizeof(seqnum_t); c < body.size(); c++){
                 uint8_t byte = body[c];
-                ss << " " << HEX_DIGITS[(byte >> 4)] << " " << HEX_DIGITS[byte & 15];
+                ss << " " << HEX_DIGITS[(byte >> 4)] << HEX_DIGITS[byte & 15];
             }
             return ss.str();
         }

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_ESP32.cpp

@@ -53,6 +53,38 @@ int register_message_converters_ESP32(){
             return ss.str();
         }
     );
+    register_message_converter(
+        PABB_MSG_ESP32_CONTROLLER_STATE_BUTTONS,
+        [](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 << "PABB_MSG_ESP32_CONTROLLER_STATE_BUTTONS() - ";
+            if (body.size() != sizeof(pabb_Message_ESP32_CommandButtonState)){ ss << "(invalid size)" << std::endl; return ss.str(); }
+            const auto* params = (const pabb_Message_ESP32_CommandButtonState*)body.c_str();
+            ss << "seqnum = " << (uint64_t)params->seqnum;
+            ss << ", milliseconds = " << params->milliseconds;
+            return ss.str();
+        }
+    );
+    register_message_converter(
+        PABB_MSG_ESP32_CONTROLLER_STATE_FULL,
+        [](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 << "PABB_MSG_ESP32_CONTROLLER_STATE_FULL() - ";
+            if (body.size() != sizeof(pabb_Message_ESP32_CommandFullState)){ ss << "(invalid size)" << std::endl; return ss.str(); }
+            const auto* params = (const pabb_Message_ESP32_CommandFullState*)body.c_str();
+            ss << "seqnum = " << (uint64_t)params->seqnum;
+            ss << ", milliseconds = " << params->milliseconds;
+            return ss.str();
+        }
+    );
     register_message_converter(
         PABB_MSG_ESP32_REPORT,
         [](const std::string& body){

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_ESP32.h

@@ -86,19 +86,37 @@ class MessageControllerSetColors : public BotBaseRequest{
         return BotBaseMessage(PABB_MSG_ESP32_REQUEST_SET_COLORS, params);
     }
 };
-class MessageControllerState : public BotBaseRequest{
+class MessageControllerStateButtons : public BotBaseRequest{
 public:
-    pabb_esp32_report30 params;
-    MessageControllerState(uint8_t ticks, bool active, NintendoSwitch_ESP32Report0x30 report)
+    pabb_Message_ESP32_CommandButtonState params;
+    MessageControllerStateButtons(uint16_t milliseconds, const NintendoSwitch_ButtonState& state)
         : BotBaseRequest(true)
     {
         params.seqnum = 0;
-        params.ticks = ticks;
-        params.active = active;
-        params.report = report;
+        params.milliseconds = milliseconds;
+        params.buttons = state;
     }
     virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_ESP32_REPORT, params);
+        return BotBaseMessage(PABB_MSG_ESP32_CONTROLLER_STATE_BUTTONS, params);
+    }
+};
+class MessageControllerStateFull : public BotBaseRequest{
+public:
+    pabb_Message_ESP32_CommandFullState params;
+    MessageControllerStateFull(
+        uint16_t milliseconds,
+        const NintendoSwitch_ButtonState& buttons,
+        const NintendoSwitch_GyroState& gyro
+    )
+        : BotBaseRequest(true)
+    {
+        params.seqnum = 0;
+        params.milliseconds = milliseconds;
+        params.buttons = buttons;
+        params.gyro = gyro;
+    }
+    virtual BotBaseMessage message() const override{
+        return BotBaseMessage(PABB_MSG_ESP32_CONTROLLER_STATE_FULL, params);
     }
 };
 

SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.cpp

@@ -16,6 +16,17 @@ namespace PokemonAutomation{
 namespace NintendoSwitch{
 
 
+uint32_t average_colors(uint32_t x, uint32_t y){
+    //  Average the two button colors.
+    uint32_t red = ((x >> 16) & 0xff) + ((y >> 16) & 0xff);
+    uint32_t green = ((x >> 8) & 0xff) + ((y >> 8) & 0xff);
+    uint32_t blue = ((x >> 0) & 0xff) + ((y >> 0) & 0xff);
+    red /= 2;
+    green /= 2;
+    blue /= 2;
+    return (red << 16) | (green << 8) | (blue << 0);
+}
+
 
 struct OfficialJoyconColors{
     std::string name;
@@ -31,18 +42,8 @@ struct OfficialJoyconColors{
             //  Set the grips to the joycon colors.
             profile.left_grip = left_body;
             profile.right_grip = right_body;
-
-            //  Average the two button colors.
-            uint32_t red = ((left_buttons >> 16) & 0xff) + ((right_buttons >> 16) & 0xff);
-            uint32_t green = ((left_buttons >> 8) & 0xff) + ((right_buttons >> 8) & 0xff);
-            uint32_t blue = ((left_buttons >> 0) & 0xff) + ((right_buttons >> 0) & 0xff);
-            red /= 2;
-            green /= 2;
-            blue /= 2;
-            profile.button_color = (red << 16) | (green << 8) | (blue << 0);
-
-            //  Pick something for the controller body.
-            profile.body_color = 0xd0d0d0;
+            profile.body_color = average_colors(left_buttons, right_buttons);
+            profile.button_color = average_colors(left_body, right_body);
             break;
         }
         case ControllerType::NintendoSwitch_LeftJoycon:

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

@@ -65,11 +65,9 @@ void SerialPABotBase_WirelessController::stop(){
 
 void SerialPABotBase_WirelessController::issue_report(
     const Cancellable* cancellable,
-    const SerialPABotBase::NintendoSwitch_ESP32Report0x30& report,
+    const SerialPABotBase::NintendoSwitch_ButtonState& buttons,
     WallDuration duration
 ){
-    bool is_active = this->is_active();
-
     //  Release the state lock since we are no longer touching state.
     //  This loop can block indefinitely if the command queue is full.
     ReverseLockGuard<std::mutex> lg(m_state_lock);
@@ -80,7 +78,7 @@ void SerialPABotBase_WirelessController::issue_report(
         Milliseconds current_ms = std::min(time_left, 255 * 15ms);
         uint8_t current_ticks = (uint8_t)milliseconds_to_ticks_15ms(current_ms.count());
         m_serial->issue_request(
-            SerialPABotBase::MessageControllerState(current_ticks, is_active, report),
+            SerialPABotBase::MessageControllerStateButtons(current_ticks * 15, buttons),
             cancellable
         );
         time_left -= current_ms;

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

@@ -75,7 +75,7 @@ class SerialPABotBase_WirelessController : public SerialPABotBase_Controller{
 
     void issue_report(
         const Cancellable* cancellable,
-        const SerialPABotBase::NintendoSwitch_ESP32Report0x30& report,
+        const SerialPABotBase::NintendoSwitch_ButtonState& buttons,
         WallDuration duration
     );
 

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

@@ -129,17 +129,13 @@ void SerialPABotBase_WirelessJoycon::issue_mash_button(
 void SerialPABotBase_WirelessJoycon::push_state_left_joycon(const Cancellable* cancellable, WallDuration duration){
     //  https://github.com/dekuNukem/Nintendo_Switch_Reverse_Engineering/blob/master/bluetooth_hid_notes.md
 
-    SerialPABotBase::NintendoSwitch_ESP32Report0x30 report{
-        .report_id = 0x30,
-        .timer = 0,     //  Populate on controller.
-        .byte2 = 0x9d,  //  Full + Charging : Joycon
+    SerialPABotBase::NintendoSwitch_ButtonState report{
         .button3 = 0,
         .button4 = 0,
         .button5 = 0,
         .left_joystick = {0x00, 0x08, 0x80},
         .right_joystick = {0x00, 0x08, 0x80},
         .vibrator = 0x00,
-        .gyro = {},
     };
 
     for (size_t c = 0; c < TOTAL_BUTTONS; c++){
@@ -193,17 +189,13 @@ void SerialPABotBase_WirelessJoycon::push_state_left_joycon(const Cancellable* c
 void SerialPABotBase_WirelessJoycon::push_state_right_joycon(const Cancellable* cancellable, WallDuration duration){
     //  https://github.com/dekuNukem/Nintendo_Switch_Reverse_Engineering/blob/master/bluetooth_hid_notes.md
 
-    SerialPABotBase::NintendoSwitch_ESP32Report0x30 report{
-        .report_id = 0x30,
-        .timer = 0,     //  Populate on controller.
-        .byte2 = 0x9d,  //  Full + Charging : Joycon
+    SerialPABotBase::NintendoSwitch_ButtonState report{
         .button3 = 0,
         .button4 = 0,
         .button5 = 0,
         .left_joystick = {0x00, 0x08, 0x80},
         .right_joystick = {0x00, 0x08, 0x80},
         .vibrator = 0x00,
-        .gyro = {},
     };
 
     for (size_t c = 0; c < TOTAL_BUTTONS; c++){

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

@@ -36,17 +36,13 @@ SerialPABotBase_WirelessProController::~SerialPABotBase_WirelessProController(){
 void SerialPABotBase_WirelessProController::push_state(const Cancellable* cancellable, WallDuration duration){
     //  https://github.com/dekuNukem/Nintendo_Switch_Reverse_Engineering/blob/master/bluetooth_hid_notes.md
 
-    SerialPABotBase::NintendoSwitch_ESP32Report0x30 report{
-        .report_id = 0x30,
-        .timer = 0,     //  Populate on controller.
-        .byte2 = 0x99,  //  Full + charging : Pro controller + USB powered
+    SerialPABotBase::NintendoSwitch_ButtonState report{
         .button3 = 0,
         .button4 = 0,
         .button5 = 0,
         .left_joystick = {0x00, 0x08, 0x80},
         .right_joystick = {0x00, 0x08, 0x80},
         .vibrator = 0x00,
-        .gyro = {},
     };
 
 

SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.cpp

@@ -37,13 +37,13 @@ WattFarmer_Descriptor::WattFarmer_Descriptor()
 
 WattFarmer::WattFarmer()
     : GRIP_MENU_WAIT0(
-        "<b>Exit Grip Menu Delay:</b> "
+        "<b>Exit Grip Menu Delay:</b><br>"
         "Wait this long after leaving the grip menu to allow for the Switch to reestablish local connection.",
         LockMode::LOCK_WHILE_RUNNING,
         "5000 ms"
     )
     , EXIT_DEN_WAIT(
-        "<b>Exit Den Wait Time:</b> "
+        "<b>Exit Den Wait Time:</b><br>"
         "Wait this long after backing out of the den before date skipping.",
         LockMode::LOCK_WHILE_RUNNING,
         "1720 ms"
@@ -62,6 +62,7 @@ WattFarmer::WattFarmer()
         &NOTIFICATION_PROGRAM_FINISH,
     })
 {
+    PA_ADD_OPTION(GRIP_MENU_WAIT0);
     PA_ADD_OPTION(START_LOCATION);
     PA_ADD_OPTION(EXIT_DEN_WAIT);
     PA_ADD_OPTION(SKIPS);