misc. fix

Author: Mysticial

SerialPrograms/Source/Controllers/SerialPABotBase/Messages/SerialPABotBase_MessageWrappers_BaseProtocol_Misc.h

@@ -110,6 +110,7 @@ class MessageType_ReadMacAddress : public BotBaseMessageType{
         Params params;
         memcpy(&params, body.data(), sizeof(params));
         ret += ": seqnum = " + std::to_string(params.seqnum);
+        ret += ", mode = " + std::to_string(params.mode);
         return ret;
     }
 };
@@ -119,6 +120,7 @@ class DeviceRequest_read_mac_address : public BotBaseRequest{
     DeviceRequest_read_mac_address(uint32_t mode)
         : BotBaseRequest(false)
     {
+        params.seqnum = 0;
         params.mode = mode;
     }
     virtual BotBaseMessage message() const override{

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

@@ -128,6 +128,19 @@ void SerialPABotBase_OemController::set_info(){
                 response.body.data() + sizeof(seqnum_t),
                 sizeof(controller_mac_address)
             );
+
+            std::string str = "Controller MAC Address: ";
+
+            static const char HEX_DIGITS[] = "0123456789abcdef";
+            for (size_t c = 0; c < 6; c++){
+                uint8_t byte = controller_mac_address[c];
+                str += " ";
+                str += HEX_DIGITS[(byte >> 4)];
+                str += HEX_DIGITS[byte & 15];
+            }
+
+            m_logger.log(str);
+
         }else{
             m_logger.log(
                 "Invalid response size to PABB_MSG_ESP32_REQUEST_READ_SPI: body = " + std::to_string(response.body.size()),

SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_CommandRow.cpp

@@ -213,7 +213,11 @@ void CommandRow::set_focus(bool focused){
 
         AbstractController* controller = m_controller.controller();
         if (controller != nullptr && allow_controller_input()){
-            controller->cancel_all_commands();
+            try{
+                controller->cancel_all_commands();
+            }catch (InvalidConnectionStateException&){
+            }catch (OperationCancelledException&){
+            }
         }
     }
     if (m_last_known_focus == focused){