misc.

Author: Mysticial

Common/Cpp/ListenerSet.h

@@ -9,7 +9,6 @@
 
 #include <map>
 #include <atomic>
-#include <mutex>
 #include "Common/Cpp/Concurrency/SpinLock.h"
 
 //#include <iostream>

Common/Microcontroller/MessageProtocol.h

@@ -266,6 +266,11 @@ typedef struct{
     uint32_t data;
 } PABB_PACK pabb_MsgAckRequestI32;
 
+#define PABB_MSG_ACK_REQUEST_DATA               0x1f
+typedef struct{
+    seqnum_t seqnum;
+} PABB_PACK pabb_MsgAckRequestData;
+
 ////////////////////////////////////////////////////////////////////////////////
 //  Custom Info
 

Common/NintendoSwitch/NintendoSwitch_Protocol_ESP32.h

@@ -66,12 +66,14 @@ typedef struct{
 #endif
 
 
-#define PABB_MSG_ESP32_SET_COLORS           0x62
+
+#define PABB_MSG_ESP32_GET_COLORS           0x64
+#define PABB_MSG_ESP32_SET_COLORS           0x65
 typedef struct{
     seqnum_t seqnum;
     uint32_t controller_type;
     ControllerColors colors;
-} PABB_PACK pabb_esp32_set_colors;
+} PABB_PACK pabb_esp32_colors;
 
 
 #define PABB_MSG_ESP32_CONTROLLER_STATE_BUTTONS     0xa0

SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.cpp

@@ -112,7 +112,9 @@ void MultiSwitchProgramSession::run_program_instance(MultiSwitchProgramEnvironme
         }
     }catch (...){
         for (size_t c = 0; c < consoles; c++){
-            env.consoles[c].controller().cancel_all_commands();
+            try{
+                env.consoles[c].controller().cancel_all_commands();
+            }catch (...){}
         }
         m_scope.store(nullptr, std::memory_order_release);
         throw;

SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.cpp

@@ -86,7 +86,9 @@ void SingleSwitchProgramSession::run_program_instance(SingleSwitchProgramEnviron
         ControllerContext<AbstractController> context(scope, env.console.controller());
         context.wait_for_all_requests();
     }catch (...){
-        env.console.controller().cancel_all_commands();
+        try{
+            env.console.controller().cancel_all_commands();
+        }catch (...){}
         m_scope.store(nullptr, std::memory_order_release);
         throw;
     }