Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,15 @@
#include "../../ControllerStates/StandardHid_Keyboard_State.h"
#include "../PABotBase2_MessageProtocol.h"

#if _WIN32
#pragma pack(push, 1)
#define PABB_PACK
#elif __GNUC__
#define PABB_PACK __attribute__((packed))
#else
#define PABB_PACK
#endif

namespace PokemonAutomation{
namespace PABotBase2{



#define PABB2_MESSAGE_CMD_HID_KEYBOARD_STATE 0x82
struct PABB_PACK pabb2_Message_Command_HID_Keyboard_State : MessageHeader{
struct pabb2_Message_Command_HID_Keyboard_State : MessageHeader{
uint16_t milliseconds;
pabb_HID_Keyboard_State report;
};
Expand All @@ -38,9 +31,7 @@ struct PABB_PACK pabb2_Message_Command_HID_Keyboard_State : MessageHeader{



#if _WIN32
#pragma pack(pop)
#endif


#endif
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,7 @@
#include "../../ControllerStates/NintendoSwitch_OemController_State.h"
#include "../PABotBase2_MessageProtocol.h"

#if _WIN32
#pragma pack(push, 1)
#define PABB_PACK
#elif __GNUC__
#define PABB_PACK __attribute__((packed))
#else
#define PABB_PACK
#endif

namespace PokemonAutomation{
namespace PABotBase2{
Expand All @@ -33,7 +26,7 @@ struct PABB_NintendoSwitch_ControllerColors{

#define PABB2_MESSAGE_REQ_NS1_OEM_CONTROLLER_READ_SPI 0x91
#define PABB2_MESSAGE_REQ_NS1_OEM_CONTROLLER_WRITE_SPI 0x92
struct PABB_PACK Message_NS1_OemController_Spi : MessageHeader{
struct Message_NS1_OemController_Spi : MessageHeader{
uint32_t controller_type;
uint32_t address;
uint8_t bytes;
Expand All @@ -44,20 +37,20 @@ struct PABB_PACK Message_NS1_OemController_Spi : MessageHeader{
#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
struct PABB_PACK Message_Feedback_NS1_OemController_Rumble : MessageHeader{
struct Message_Feedback_NS1_OemController_Rumble : MessageHeader{
NintendoSwitch::OemController_RumbleState data;
};


#define PABB2_MESSAGE_CMD_NS1_OEM_CONTROLLER_BUTTONS 0x97
struct PABB_PACK Message_Command_NS1_OemController_Buttons : MessageHeader{
struct Message_Command_NS1_OemController_Buttons : MessageHeader{
uint16_t milliseconds;
NintendoSwitch::OemController_State0x30_Buttons buttons;
};


#define PABB2_MESSAGE_CMD_NS1_OEM_CONTROLLER_FULL_STATE 0x98
struct PABB_PACK Message_Command_NS1_OemController_FullState : MessageHeader{
struct Message_Command_NS1_OemController_FullState : MessageHeader{
uint16_t milliseconds;
NintendoSwitch::OemController_State0x30 state;
};
Expand All @@ -69,9 +62,7 @@ struct PABB_PACK Message_Command_NS1_OemController_FullState : MessageHeader{



#if _WIN32
#pragma pack(pop)
#endif


#endif
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,15 @@
#include "../../ControllerStates/NintendoSwitch_WiredController_State.h"
#include "../PABotBase2_MessageProtocol.h"

#if _WIN32
#pragma pack(push, 1)
#define PABB_PACK
#elif __GNUC__
#define PABB_PACK __attribute__((packed))
#else
#define PABB_PACK
#endif

namespace PokemonAutomation{
namespace PABotBase2{



#define PABB2_MESSAGE_CMD_NS_WIRED_CONTROLLER_STATE 0x90
struct PABB_PACK pabb2_Message_Command_NS_WiredController_State : MessageHeader{
struct pabb2_Message_Command_NS_WiredController_State : MessageHeader{
uint16_t milliseconds;
pabb_NintendoSwitch_WiredController_State report;
};
Expand All @@ -38,9 +31,7 @@ struct PABB_PACK pabb2_Message_Command_NS_WiredController_State : MessageHeader{



#if _WIN32
#pragma pack(pop)
#endif


#endif
15 changes: 3 additions & 12 deletions Common/PABotBase2/PABotBase2_MessageProtocol.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,22 @@

#include <stdint.h>

#if _WIN32
#pragma pack(push, 1)
#define PABB_PACK
#elif __GNUC__
#define PABB_PACK __attribute__((packed))
#else
#define PABB_PACK
#endif

namespace PokemonAutomation{
namespace PABotBase2{



#define PABB2_MESSAGE_PROTOCOL_VERSION 2026061804
#define PABB2_MESSAGE_PROTOCOL_VERSION 2026061806


struct PABB_PACK MessageHeader{
struct MessageHeader{
uint16_t message_bytes;
uint8_t opcode;
uint8_t id;
};
struct PABB_PACK Message_u32 : MessageHeader{
struct Message_u32 : MessageHeader{
uint32_t data;
};

Expand Down Expand Up @@ -74,9 +67,7 @@ struct PABB_PACK Message_u32 : MessageHeader{
}


#if _WIN32
#pragma pack(pop)
#endif


#endif
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,7 @@
#include <stdbool.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

namespace PokemonAutomation{
namespace PABotBase2{
Expand Down Expand Up @@ -47,14 +40,14 @@ namespace PABotBase2{

using SessionId = uint32_t;

struct PABB_PACK PacketHeader{
struct PacketHeader{
uint8_t magic_number;
uint8_t seqnum;
uint8_t packet_bytes;
uint8_t opcode;
};

struct PABB_PACK PacketHeader_u32 : PacketHeader{
struct PacketHeader_u32 : PacketHeader{
uint32_t data;
};

Expand Down Expand Up @@ -84,7 +77,7 @@ struct PABB_PACK PacketHeader_u32 : PacketHeader{
#define PABB2_CONNECTION_OPCODE_ASK_STREAM_DATA 0x12
#define PABB2_CONNECTION_OPCODE_RET_STREAM_DATA 0x52
#define PABB2_CONNECTION_OPCODE_ASK_STREAM_REQUEST 0x13 // Unused for now.
struct PABB_PACK PacketHeaderData : PacketHeader{
struct PacketHeaderData : PacketHeader{
uint16_t stream_offset;
};

Expand Down Expand Up @@ -117,8 +110,6 @@ struct PABB_PACK PacketHeaderData : PacketHeader{
}
}

#if _WIN32
#pragma pack(pop)
#endif

#endif
11 changes: 1 addition & 10 deletions Common/SerialPABotBase/SerialPABotBase_Messages_HID_Keyboard.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,7 @@
#include "../ControllerStates/StandardHid_Keyboard_State.h"
#include "SerialPABotBase_Protocol.h"

#if _WIN32
#pragma pack(push, 1)
#define PABB_PACK
#elif __GNUC__
#define PABB_PACK __attribute__((packed))
#else
#define PABB_PACK
#endif


#ifdef __cplusplus
Expand All @@ -30,7 +23,7 @@ typedef struct{
seqnum_t seqnum;
uint16_t milliseconds;
pabb_HID_Keyboard_State report;
} PABB_PACK pabb_Message_Command_HID_Keyboard_State;
} pabb_Message_Command_HID_Keyboard_State;



Expand All @@ -39,8 +32,6 @@ typedef struct{
#endif


#if _WIN32
#pragma pack(pop)
#endif

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,7 @@
#include "../ControllerStates/NintendoSwitch_OemController_State.h"
#include "SerialPABotBase_Protocol.h"

#if _WIN32
#pragma pack(push, 1)
#define PABB_PACK
#elif __GNUC__
#define PABB_PACK __attribute__((packed))
#else
#define PABB_PACK
#endif


#ifdef __cplusplus
Expand All @@ -40,7 +33,7 @@ typedef struct{
#define PABB_MSG_INFO_NS1_OEM_CONTROLLER_RUMBLE 0x30
typedef struct{
OemController_RumbleState rumble;
} PABB_PACK pabb_MsgInfo_NS1_OemController_Rumble;
} pabb_MsgInfo_NS1_OemController_Rumble;

#define PABB_MSG_INFO_NS1_OEM_CONTROLLER_USB_DISALLOWED 0x31

Expand All @@ -52,21 +45,21 @@ typedef struct{
uint32_t controller_type;
uint32_t address;
uint8_t bytes;
} PABB_PACK pabb_Message_NS1_OemController_ReadSpi;
} pabb_Message_NS1_OemController_ReadSpi;

#define PABB_MSG_REQUEST_NS1_OEM_CONTROLLER_WRITE_SPI 0x61
typedef struct{
seqnum_t seqnum;
uint32_t controller_type;
uint32_t address;
uint8_t bytes;
} PABB_PACK pabb_Message_NS1_OemController_WriteSpi;
} pabb_Message_NS1_OemController_WriteSpi;

#define PABB_MSG_REQUEST_NS1_OEM_CONTROLLER_PLAYER_LIGHTS 0x62
typedef struct{
seqnum_t seqnum;
uint32_t controller_type;
} PABB_PACK pabb_MsgInfo_NS1_OemController_PlayerLights;
} pabb_MsgInfo_NS1_OemController_PlayerLights;



Expand All @@ -75,15 +68,15 @@ typedef struct{
seqnum_t seqnum;
uint16_t milliseconds;
pabb_NintendoSwitch_OemController_State0x30_Buttons buttons;
} PABB_PACK pabb_Message_Command_NS1_OemController_Buttons;
} pabb_Message_Command_NS1_OemController_Buttons;


#define PABB_MSG_COMMAND_NS1_OEM_CONTROLLER_FULL_STATE 0xa1
typedef struct{
seqnum_t seqnum;
uint16_t milliseconds;
pabb_NintendoSwitch_OemController_State0x30 state;
} PABB_PACK pabb_Message_Command_NS1_OemController_FullState;
} pabb_Message_Command_NS1_OemController_FullState;



Expand All @@ -94,9 +87,7 @@ typedef struct{



#if _WIN32
#pragma pack(pop)
#endif


#endif
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,7 @@
#include "../ControllerStates/NintendoSwitch_WiredController_State.h"
#include "SerialPABotBase_Protocol.h"

#if _WIN32
#pragma pack(push, 1)
#define PABB_PACK
#elif __GNUC__
#define PABB_PACK __attribute__((packed))
#else
#define PABB_PACK
#endif


#ifdef __cplusplus
Expand All @@ -30,7 +23,7 @@ typedef struct{
seqnum_t seqnum;
uint16_t milliseconds;
pabb_NintendoSwitch_WiredController_State report;
} PABB_PACK pabb_Message_Command_NS_WiredController_State;
} pabb_Message_Command_NS_WiredController_State;



Expand All @@ -39,8 +32,6 @@ typedef struct{
#endif


#if _WIN32
#pragma pack(pop)
#endif

#endif
Loading
Loading