Skip to content

Commit 136b1aa

Browse files
committed
Latest backwards incompatible firmware.
1 parent 27e2447 commit 136b1aa

File tree

3 files changed

+21
-24
lines changed

3 files changed

+21
-24
lines changed

Common/SerialPABotBase/SerialPABotBase_Protocol_IDs.h

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ typedef uint8_t pabb_ProgramID;
1717

1818
#define PABB_PID_UNSPECIFIED 0x00
1919

20-
// Old AVR8
21-
#define PABB_PID_PABOTBASE_12KB 0x08
22-
#define PABB_PID_PABOTBASE_31KB 0x09
23-
2420
// New AVR8
2521
#define PABB_PID_PABOTBASE_ArduinoUnoR3 0x01
2622
#define PABB_PID_PABOTBASE_ArduinoLeonardo 0x02
@@ -53,20 +49,21 @@ typedef uint32_t pabb_ControllerID;
5349
#define PABB_CID_StandardHid_Keyboard 0x0100
5450

5551
#define PABB_CID_NintendoSwitch_WiredController 0x1000
56-
#define PABB_CID_NintendoSwitch_WiredProController 0x1001
57-
#define PABB_CID_NintendoSwitch_WiredLeftJoycon 0x1005
58-
#define PABB_CID_NintendoSwitch_WiredRightJoycon 0x1006
59-
#define PABB_CID_NintendoSwitch_WirelessProController 0x1002
60-
#define PABB_CID_NintendoSwitch_WirelessLeftJoycon 0x1003
61-
#define PABB_CID_NintendoSwitch_WirelessRightJoycon 0x1004
62-
6352
#define PABB_CID_NintendoSwitch2_WiredController 0x1010
64-
#define PABB_CID_NintendoSwitch2_WiredProController 0x1011
65-
#define PABB_CID_NintendoSwitch2_WiredLeftJoycon 0x1015
66-
#define PABB_CID_NintendoSwitch2_WiredRightJoycon 0x1016
67-
#define PABB_CID_NintendoSwitch2_WirelessProController 0x1012
68-
#define PABB_CID_NintendoSwitch2_WirelessLeftJoycon 0x1013
69-
#define PABB_CID_NintendoSwitch2_WirelessRightJoycon 0x1014
53+
54+
#define PABB_CID_NintendoSwitch_WiredProController 0x1100
55+
#define PABB_CID_NintendoSwitch_WiredLeftJoycon 0x1101
56+
#define PABB_CID_NintendoSwitch_WiredRightJoycon 0x1102
57+
#define PABB_CID_NintendoSwitch_WirelessProController 0x1180
58+
#define PABB_CID_NintendoSwitch_WirelessLeftJoycon 0x1181
59+
#define PABB_CID_NintendoSwitch_WirelessRightJoycon 0x1182
60+
61+
#define PABB_CID_NintendoSwitch2_WiredProController 0x1200
62+
#define PABB_CID_NintendoSwitch2_WiredLeftJoycon 0x1201
63+
#define PABB_CID_NintendoSwitch2_WiredRightJoycon 0x1202
64+
#define PABB_CID_NintendoSwitch2_WirelessProController 0x1280
65+
#define PABB_CID_NintendoSwitch2_WirelessLeftJoycon 0x1281
66+
#define PABB_CID_NintendoSwitch2_WirelessRightJoycon 0x1282
7067

7168

7269
#endif

SerialPrograms/Source/CommonFramework/Globals.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace PokemonAutomation{
2626
const bool IS_BETA_VERSION = true;
2727
const int PROGRAM_VERSION_MAJOR = 0;
2828
const int PROGRAM_VERSION_MINOR = 60;
29-
const int PROGRAM_VERSION_PATCH = 4;
29+
const int PROGRAM_VERSION_PATCH = 5;
3030

3131
const std::string PROGRAM_VERSION_BASE =
3232
"v" + std::to_string(PROGRAM_VERSION_MAJOR) +

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ const std::map<pabb_ProgramID, uint32_t>& SUPPORTED_DEVICES(){
2323
{PABB_PID_PABOTBASE_ProMicro, 2025090303},
2424
{PABB_PID_PABOTBASE_Teensy2, 2025090303},
2525
{PABB_PID_PABOTBASE_TeensyPP2, 2025090303},
26-
{PABB_PID_PABOTBASE_ESP32, 2025092305},
27-
{PABB_PID_PABOTBASE_ESP32S3, 2025090304},
28-
{PABB_PID_PABOTBASE_Pico1W_USB, 2025090410},
29-
{PABB_PID_PABOTBASE_Pico1W_UART, 2025090410},
30-
{PABB_PID_PABOTBASE_Pico2W_USB, 2025090410},
31-
{PABB_PID_PABOTBASE_Pico2W_UART, 2025090410},
26+
{PABB_PID_PABOTBASE_ESP32, 2025120800},
27+
{PABB_PID_PABOTBASE_ESP32S3, 2025120800},
28+
{PABB_PID_PABOTBASE_Pico1W_USB, 2025120800},
29+
{PABB_PID_PABOTBASE_Pico1W_UART, 2025120800},
30+
{PABB_PID_PABOTBASE_Pico2W_USB, 2025120800},
31+
{PABB_PID_PABOTBASE_Pico2W_UART, 2025120800},
3232
};
3333
return database;
3434
}

0 commit comments

Comments
 (0)