Add messages for PABotBase 2 message layer.

Mysticial · Mysticial · commit 62ff33de26b9 · 2026-03-16T13:05:47.000-07:00
diff --git a/Common/Cpp/StreamConnections/MockDevice.cpp b/Common/Cpp/StreamConnections/MockDevice.cpp
@@ -6,7 +6,7 @@
 
 #include <string.h>
 #include "Common/Cpp/Exceptions.h"
-#include "Common/PABotBase2/PABotBase2_ConnectionDebug.h"
+#include "Common/PABotBase2/ConnectionLayer/PABotBase2_ConnectionDebug.h"
 #include "MockDevice.h"
 
 //  REMOVE
diff --git a/Common/Cpp/StreamConnections/MockDevice.h b/Common/Cpp/StreamConnections/MockDevice.h
@@ -13,7 +13,7 @@
 #include "Common/Cpp/Concurrency/ConditionVariable.h"
 #include "Common/Cpp/Concurrency/AsyncTask.h"
 #include "Common/Cpp/Concurrency/ThreadPool.h"
-#include "Common/PABotBase2/PABotbase2_ReliableStreamConnection.h"
+#include "Common/PABotBase2/ConnectionLayer/PABotbase2_ReliableStreamConnection.h"
 
 namespace PokemonAutomation{
 
diff --git a/Common/Cpp/StreamConnections/PABotBase2_MessageDumper.h b/Common/Cpp/StreamConnections/PABotBase2_MessageDumper.h
@@ -8,7 +8,7 @@
 #define PokemonAutomation_PABotBase2_MessageDumper_H
 
 #include <string>
-#include "Common/PABotBase2/PABotBase2_Connection.h"
+#include "Common/PABotBase2/ConnectionLayer/PABotBase2_Connection.h"
 
 namespace PokemonAutomation{
 
diff --git a/Common/Cpp/StreamConnections/ReliableStreamConnection.cpp b/Common/Cpp/StreamConnections/ReliableStreamConnection.cpp
@@ -7,7 +7,7 @@
 #include "Common/CRC32/pabb_CRC32.h"
 //#include "Common/Cpp/PrettyPrint.h"
 //#include "Common/Cpp/Exceptions.h"
-#include "Common/PABotBase2/PABotBase2_ConnectionDebug.h"
+#include "Common/PABotBase2/ConnectionLayer/PABotBase2_ConnectionDebug.h"
 #include "Common/Cpp/StreamConnections/PABotBase2_MessageDumper.h"
 #include "ReliableStreamConnection.h"
 
diff --git a/Common/Cpp/StreamConnections/ReliableStreamConnection.h b/Common/Cpp/StreamConnections/ReliableStreamConnection.h
@@ -14,9 +14,9 @@
 #include "Common/Cpp/Concurrency/ConditionVariable.h"
 #include "Common/Cpp/Concurrency/AsyncTask.h"
 #include "Common/Cpp/Concurrency/ThreadPool.h"
-#include "Common/PABotBase2/PABotBase2_PacketSender.h"
-#include "Common/PABotBase2/PABotBase2_PacketParser.h"
-#include "Common/PABotBase2/PABotBase2_StreamCoalescer.h"
+#include "Common/PABotBase2/ConnectionLayer/PABotBase2_PacketSender.h"
+#include "Common/PABotBase2/ConnectionLayer/PABotBase2_PacketParser.h"
+#include "Common/PABotBase2/ConnectionLayer/PABotBase2_StreamCoalescer.h"
 #include "StreamConnection.h"
 
 namespace PokemonAutomation{
diff --git a/Common/PABotBase2/ConnectionLayer/PABotBase2_Connection.h b/Common/PABotBase2/ConnectionLayer/PABotBase2_Connection.h
@@ -4,8 +4,8 @@
  *
  */
 
-#ifndef PokemonAutomation_PABotBase2_ConnectionProtocol_H
-#define PokemonAutomation_PABotBase2_ConnectionProtocol_H
+#ifndef PokemonAutomation_PABotBase2_ConnectionLayer_ConnectionProtocol_H
+#define PokemonAutomation_PABotBase2_ConnectionLayer_ConnectionProtocol_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -25,7 +25,7 @@ extern "C" {
 
 
 #define PABB2_CONNECTION_MAGIC_NUMBER                   0x81
-#define PABB2_CONNECTION_PROTOCOL_VERSION               2023011700
+#define PABB2_CONNECTION_PROTOCOL_VERSION               2025011700
 
 
 //
diff --git a/Common/PABotBase2/ConnectionLayer/PABotBase2_ConnectionDebug.c b/Common/PABotBase2/ConnectionLayer/PABotBase2_ConnectionDebug.c
diff --git a/Common/PABotBase2/ConnectionLayer/PABotBase2_ConnectionDebug.h b/Common/PABotBase2/ConnectionLayer/PABotBase2_ConnectionDebug.h
@@ -4,8 +4,8 @@
  *
  */
 
-#ifndef PokemonAutomation_PABotBase2_ConnectionDebug_H
-#define PokemonAutomation_PABotBase2_ConnectionDebug_H
+#ifndef PokemonAutomation_PABotBase2_ConnectionLayer_ConnectionDebug_H
+#define PokemonAutomation_PABotBase2_ConnectionLayer_ConnectionDebug_H
 
 #include "PABotBase2_Connection.h"
 #include "PABotBase2_PacketSender.h"
diff --git a/Common/PABotBase2/ConnectionLayer/PABotBase2_PacketParser.c b/Common/PABotBase2/ConnectionLayer/PABotBase2_PacketParser.c
diff --git a/Common/PABotBase2/ConnectionLayer/PABotBase2_PacketParser.h b/Common/PABotBase2/ConnectionLayer/PABotBase2_PacketParser.h
@@ -4,8 +4,8 @@
  *
  */
 
-#ifndef PokemonAutomation_PABotBase2_PacketParser_H
-#define PokemonAutomation_PABotBase2_PacketParser_H
+#ifndef PokemonAutomation_PABotBase2_ConnectionLayer_PacketParser_H
+#define PokemonAutomation_PABotBase2_ConnectionLayer_PacketParser_H
 
 #include "PABotBase2_StreamInterface.h"
 #include "PABotBase2_Connection.h"
diff --git a/Common/PABotBase2/ConnectionLayer/PABotBase2_PacketSender.c b/Common/PABotBase2/ConnectionLayer/PABotBase2_PacketSender.c
diff --git a/Common/PABotBase2/ConnectionLayer/PABotBase2_PacketSender.h b/Common/PABotBase2/ConnectionLayer/PABotBase2_PacketSender.h
@@ -4,8 +4,8 @@
  *
  */
 
-#ifndef PokemonAutomation_PABotBase2_PacketSender_H
-#define PokemonAutomation_PABotBase2_PacketSender_H
+#ifndef PokemonAutomation_PABotBase2_ConnectionLayer_PacketSender_H
+#define PokemonAutomation_PABotBase2_ConnectionLayer_PacketSender_H
 
 #include "PABotBase2_StreamInterface.h"
 #include "PABotBase2_Connection.h"
diff --git a/Common/PABotBase2/ConnectionLayer/PABotBase2_StreamCoalescer.c b/Common/PABotBase2/ConnectionLayer/PABotBase2_StreamCoalescer.c
diff --git a/Common/PABotBase2/ConnectionLayer/PABotBase2_StreamCoalescer.h b/Common/PABotBase2/ConnectionLayer/PABotBase2_StreamCoalescer.h
@@ -4,8 +4,8 @@
  *
  */
 
-#ifndef PokemonAutomation_PABotBase2_StreamCoalescer_H
-#define PokemonAutomation_PABotBase2_StreamCoalescer_H
+#ifndef PokemonAutomation_PABotBase2_ConnectionLayer_StreamCoalescer_H
+#define PokemonAutomation_PABotBase2_ConnectionLayer_StreamCoalescer_H
 
 #include "PABotBase2_Connection.h"
 
diff --git a/Common/PABotBase2/ConnectionLayer/PABotBase2_StreamInterface.h b/Common/PABotBase2/ConnectionLayer/PABotBase2_StreamInterface.h
@@ -4,8 +4,8 @@
  *
  */
 
-#ifndef PokemonAutomation_PABotBase2_StreamInterface_H
-#define PokemonAutomation_PABotBase2_StreamInterface_H
+#ifndef PokemonAutomation_PABotBase2_ConnectionLayer_StreamInterface_H
+#define PokemonAutomation_PABotBase2_ConnectionLayer_StreamInterface_H
 
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/Common/PABotBase2/ConnectionLayer/PABotbase2_ReliableStreamConnection.c b/Common/PABotBase2/ConnectionLayer/PABotbase2_ReliableStreamConnection.c
diff --git a/Common/PABotBase2/ConnectionLayer/PABotbase2_ReliableStreamConnection.h b/Common/PABotBase2/ConnectionLayer/PABotbase2_ReliableStreamConnection.h
@@ -4,8 +4,8 @@
  *
  */
 
-#ifndef PokemonAutomation_PABotBase2_ReliableStreamConnection_H
-#define PokemonAutomation_PABotBase2_ReliableStreamConnection_H
+#ifndef PokemonAutomation_PABotBase2_ConnectionLayer_ReliableStreamConnection_H
+#define PokemonAutomation_PABotBase2_ConnectionLayer_ReliableStreamConnection_H
 
 #include "PABotBase2_StreamInterface.h"
 #include "PABotBase2_PacketSender.h"
diff --git a/Common/PABotBase2/DataLayer/PABotBase2_Controller_HID_Keyboard.h b/Common/PABotBase2/DataLayer/PABotBase2_Controller_HID_Keyboard.h
@@ -0,0 +1,47 @@
+/*  HID Keyboard
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PABotBase2_Controller_HID_Keyboard_H
+#define PokemonAutomation_PABotBase2_Controller_HID_Keyboard_H
+
+#include "../../ControllerStates/StandardHid_Keyboard_State.h"
+
+#if _WIN32
+#pragma pack(push, 1)
+#define PABB_PACK
+#elif __GNUC__
+#define PABB_PACK   __attribute__((packed))
+#else
+#define PABB_PACK
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
+#define PABB2_MESSAGE_CMD_HID_KEYBOARD_STATE            0x82
+typedef struct{
+    uint16_t milliseconds;
+    pabb_HID_Keyboard_State report;
+} PABB_PACK pabb2_Message_Command_HID_Keyboard_State;
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+
+#if _WIN32
+#pragma pack(pop)
+#endif
+
+
+#endif
diff --git a/Common/PABotBase2/DataLayer/PABotBase2_Controller_NS1_OemController.h b/Common/PABotBase2/DataLayer/PABotBase2_Controller_NS1_OemController.h
@@ -0,0 +1,69 @@
+/*  PABotBase2 NS1 OEM Controller
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PABotBase2_Controller_NS1_OemController_H
+#define PokemonAutomation_PABotBase2_Controller_NS1_OemController_H
+
+#include "../../ControllerStates/NintendoSwitch_OemController_State.h"
+
+#if _WIN32
+#pragma pack(push, 1)
+#define PABB_PACK
+#elif __GNUC__
+#define PABB_PACK   __attribute__((packed))
+#else
+#define PABB_PACK
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
+#define PABB_MSG_REQ_NS1_OEM_CONTROLLER_READ_SPI        0x91
+#define PABB_MSG_REQ_NS1_OEM_CONTROLLER_WRITE_SPI       0x92
+typedef struct{
+    uint32_t controller_type;
+    uint32_t address;
+    uint8_t bytes;
+} PABB_PACK pabb2_Message_NS1_OemController_Spi;
+
+
+#define PABB2_MESSAGE_REQ_NS1_OEM_CONTROLLER_PLAYER_LIGHTS      0x93
+#define PABB2_MESSAGE_INFO_NS1_OEM_CONTROLLER_PLAYER_LIGHTS     0x94
+#define PABB2_MESSAGE_INFO_NS1_OEM_CONTROLLER_USB_DISALLOWED    0x95
+#define PABB2_MESSAGE_INFO_NS1_OEM_CONTROLLER_RUMBLE            0x96
+
+
+#define PABB2_MESSAGE_CMD_NS1_OEM_CONTROLLER_BUTTONS            0x97
+typedef struct{
+    uint16_t milliseconds;
+    pabb_NintendoSwitch_OemController_State0x30_Buttons buttons;
+} PABB_PACK pabb2_Message_Command_NS1_OemController_Buttons;
+
+
+#define PABB2_MESSAGE_CMD_NS1_OEM_CONTROLLER_FULL_STATE         0x98
+typedef struct{
+    uint16_t milliseconds;
+    pabb_NintendoSwitch_OemController_State0x30 state;
+} PABB_PACK pabb2_Message_Command_NS1_OemController_FullState;
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+
+#if _WIN32
+#pragma pack(pop)
+#endif
+
+
+#endif
diff --git a/Common/PABotBase2/DataLayer/PABotBase2_Controller_NS_WiredController.h b/Common/PABotBase2/DataLayer/PABotBase2_Controller_NS_WiredController.h
@@ -0,0 +1,47 @@
+/*  PABotBase2 NS Wired Controller
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PABotBase2_Controller_NS_WiredController_H
+#define PokemonAutomation_PABotBase2_Controller_NS_WiredController_H
+
+#include "../../ControllerStates/NintendoSwitch_WiredController_State.h"
+
+#if _WIN32
+#pragma pack(push, 1)
+#define PABB_PACK
+#elif __GNUC__
+#define PABB_PACK   __attribute__((packed))
+#else
+#define PABB_PACK
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
+#define PABB2_MESSAGE_CMD_NS_WIRED_CONTROLLER_STATE     0x90
+typedef struct{
+    uint16_t milliseconds;
+    pabb_NintendoSwitch_WiredController_State report;
+} PABB_PACK pabb2_Message_Command_NS_WiredController_State;
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+
+#if _WIN32
+#pragma pack(pop)
+#endif
+
+
+#endif
diff --git a/Common/PABotBase2/DataLayer/PABotBase2_MessageProtocol.h b/Common/PABotBase2/DataLayer/PABotBase2_MessageProtocol.h
@@ -0,0 +1,96 @@
+/*  PABotBase2 Message Protocol
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PABotBase2_MessageProtocol_H
+#define PokemonAutomation_PABotBase2_MessageProtocol_H
+
+#include <stdint.h>
+
+#if _WIN32
+#pragma pack(push, 1)
+#define PABB_PACK
+#elif __GNUC__
+#define PABB_PACK   __attribute__((packed))
+#else
+#define PABB_PACK
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
+#define PABB2_MESSAGE_PROTOCOL_VERSION      2026031600
+
+
+#define PABB2_MESSAGE_OPCODE_INVALID            0x00
+
+
+typedef struct{
+    uint16_t message_bytes;
+    uint8_t opcode;
+    uint8_t id;
+} PABB_PACK pabb2_MessageHeader_Request;
+
+
+#define PABB2_MESSAGE_OPCODE_RET                0x10
+#define PABB2_MESSAGE_OPCODE_REQUEST_DROPPED    0x1f
+typedef struct{
+    uint16_t message_bytes;
+    uint8_t opcode;
+    uint8_t id;
+} PABB_PACK pabb2_Message_Response;
+
+
+#define PABB2_MESSAGE_OPCODE_RET_U32            0x11
+typedef struct{
+    uint16_t message_bytes;
+    uint8_t opcode;
+    uint8_t id;
+    uint32_t data;
+} PABB_PACK pabb2_Message_Response_u32;
+
+
+#define PABB2_MESSAGE_OPCODE_RET_DATA           0x12
+typedef struct{
+    uint16_t message_bytes;
+    uint8_t opcode;
+    uint8_t id;
+} PABB_PACK pabb2_Message_Response_Data;
+
+
+#define PABB2_MESSAGE_OPCODE_PROTOCOL_VERSION       0x20
+#define PABB2_MESSAGE_OPCODE_FIRMWARE_VERSION       0x21
+#define PABB2_MESSAGE_OPCODE_DEVICE_IDENTIFIER      0x22
+#define PABB2_MESSAGE_OPCODE_CONTROLLER_LIST        0x23
+#define PABB2_MESSAGE_OPCODE_CQ_CAPACITY            0x24
+
+#define PABB_MESSAGE_OPCODE_READ_CONTROLLER_MODE    0x30
+#define PABB_MESSAGE_OPCODE_CHANGE_CONTROLLER_MODE  0x31
+#define PABB_MESSAGE_OPCODE_RESET_TO_CONTROLLER     0x32
+#define PABB_MESSAGE_OPCODE_CONTROLLER_MAC_ADDRESS  0x33
+#define PABB_MESSAGE_OPCODE_PAIRED_MAC_ADDRESS      0x34
+
+#define PABB2_MESSAGE_OPCODE_CQ_CANCEL              0x40
+#define PABB2_MESSAGE_OPCODE_CQ_REPLACE_ON_NEXT     0x41
+#define PABB2_MESSAGE_OPCODE_CQ_COMMAND_FINISHED    0x42
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+
+#if _WIN32
+#pragma pack(pop)
+#endif
+
+
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp
diff --git a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@`
`4`	`4`	`*`
`5`	`5`	`*/`
`6`	`6`
`7`		`-#ifndef PokemonAutomation_PABotBase2_ConnectionDebug_H`
`8`		`-#define PokemonAutomation_PABotBase2_ConnectionDebug_H`
	`7`	`+#ifndef PokemonAutomation_PABotBase2_ConnectionLayer_ConnectionDebug_H`
	`8`	`+#define PokemonAutomation_PABotBase2_ConnectionLayer_ConnectionDebug_H`
`9`	`9`
`10`	`10`	`#include "PABotBase2_Connection.h"`
`11`	`11`	`#include "PABotBase2_PacketSender.h"`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@`
`4`	`4`	`*`
`5`	`5`	`*/`
`6`	`6`
`7`		`-#ifndef PokemonAutomation_PABotBase2_PacketParser_H`
`8`		`-#define PokemonAutomation_PABotBase2_PacketParser_H`
	`7`	`+#ifndef PokemonAutomation_PABotBase2_ConnectionLayer_PacketParser_H`
	`8`	`+#define PokemonAutomation_PABotBase2_ConnectionLayer_PacketParser_H`
`9`	`9`
`10`	`10`	`#include "PABotBase2_StreamInterface.h"`
`11`	`11`	`#include "PABotBase2_Connection.h"`