Skip to content

Commit 8506658

Browse files
committed
Protocol IDs
1 parent af30e97 commit 8506658

3 files changed

Lines changed: 9 additions & 16 deletions

File tree

Common/SerialPABotBase/SerialPABotBase_Protocol_IDs.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,10 @@ typedef uint8_t pabb_ProgramID;
3232
#define PABB_PID_PABOTBASE_ESP32S3 0x12
3333

3434
// Raspberry Pi
35-
#define PABB_PID_PABOTBASE_Pico1W_USB 0x20
36-
#define PABB_PID_PABOTBASE_Pico1W_UART 0x21
37-
#define PABB_PID_PABOTBASE_Pico2W_USB 0x22
38-
#define PABB_PID_PABOTBASE_Pico2W_UART 0x23
39-
#define PABB_PID_PABOTBASE_Pico1 0x24
40-
#define PABB_PID_PABOTBASE_Pico2 0x25
35+
#define PABB_PID_PABOTBASE_RP2040 0x20
36+
#define PABB_PID_PABOTBASE_RP2350 0x21
37+
#define PABB_PID_PABOTBASE_Pico1W 0x24
38+
#define PABB_PID_PABOTBASE_Pico2W 0x25
4139

4240

4341
//

SerialPrograms/Source/CommonFramework/Globals.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ namespace PokemonAutomation{
3939
#endif
4040

4141
#ifndef PA_VERSION_PATCH
42-
#define PA_VERSION_PATCH 11
42+
#define PA_VERSION_PATCH 13
4343
#endif
4444

4545
const bool IS_BETA_VERSION = PA_IS_BETA;

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase.cpp

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
#include "Common/Cpp/Exceptions.h"
88
#include "Common/SerialPABotBase/SerialPABotBase_Protocol_IDs.h"
9-
#include "CommonFramework/Globals.h"
109
#include "CommonFramework/GlobalSettingsPanel.h"
1110
#include "SerialPABotBase.h"
1211

@@ -26,12 +25,6 @@ const std::map<pabb_ProgramID, uint32_t>& SUPPORTED_DEVICES(){
2625
{PABB_PID_PABOTBASE_ProMicro, 2025090303},
2726
{PABB_PID_PABOTBASE_Teensy2, 2025090303},
2827
{PABB_PID_PABOTBASE_TeensyPP2, 2025090303},
29-
{PABB_PID_PABOTBASE_ESP32, 2025120815},
30-
{PABB_PID_PABOTBASE_ESP32S3, 2025120815},
31-
{PABB_PID_PABOTBASE_Pico1W_USB, 2025120815},
32-
{PABB_PID_PABOTBASE_Pico1W_UART, 2025120815},
33-
{PABB_PID_PABOTBASE_Pico2W_USB, 2025120815},
34-
{PABB_PID_PABOTBASE_Pico2W_UART, 2025120815},
3528
};
3629
return database;
3730
}
@@ -60,8 +53,10 @@ const std::map<pabb_ProgramID, uint32_t>& SUPPORTED_DEVICES2(){
6053
{PABB_PID_UNSPECIFIED, 2026052100},
6154
{PABB_PID_PABOTBASE_ESP32, 2026052100},
6255
{PABB_PID_PABOTBASE_ESP32S3, 2026052100},
63-
{PABB_PID_PABOTBASE_Pico1, 2026052100},
64-
{PABB_PID_PABOTBASE_Pico2, 2026052100},
56+
{PABB_PID_PABOTBASE_RP2040, 2026052100},
57+
{PABB_PID_PABOTBASE_RP2350, 2026052100},
58+
{PABB_PID_PABOTBASE_Pico1W, 2026052100},
59+
{PABB_PID_PABOTBASE_Pico2W, 2026052100},
6560
};
6661
return database;
6762
}

0 commit comments

Comments
 (0)