Skip to content

Commit 58feb52

Browse files
committed
Pull ESP32 messages out to shared header.
1 parent 557493c commit 58feb52

File tree

8 files changed

+131
-361
lines changed

8 files changed

+131
-361
lines changed
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
/* ESP32 Commands
2+
*
3+
* From: https://github.com/PokemonAutomation/Arduino-Source
4+
*
5+
*/
6+
7+
#ifndef PokemonAutomation_NintendoSwitch_ESP32_H
8+
#define PokemonAutomation_NintendoSwitch_ESP32_H
9+
10+
#include "Common/Microcontroller/MessageProtocol.h"
11+
12+
#if _WIN32
13+
#pragma pack(push, 1)
14+
#define PABB_PACK
15+
#else
16+
#define PABB_PACK __attribute__((packed))
17+
#endif
18+
19+
20+
#ifdef __cplusplus
21+
namespace PokemonAutomation{
22+
namespace NintendoSwitch{
23+
#endif
24+
25+
26+
typedef struct{
27+
uint8_t report_id;
28+
uint8_t timer;
29+
uint8_t byte2;
30+
uint8_t button3;
31+
uint8_t button4;
32+
uint8_t button5;
33+
uint8_t leftstick_x_lo;
34+
uint8_t leftstick_x_hi;
35+
uint8_t leftstick_y;
36+
uint8_t rightstick_x_lo;
37+
uint8_t rightstick_x_hi;
38+
uint8_t rightstick_y;
39+
uint8_t vibrator;
40+
uint8_t gyro[49 - 13];
41+
} PABB_PACK ESP32Report0x30;
42+
43+
#define PABB_MSG_ESP32_REPORT 0x9e
44+
typedef struct{
45+
seqnum_t seqnum;
46+
uint8_t ticks;
47+
ESP32Report0x30 report;
48+
} PABB_PACK pabb_esp32_report30;
49+
50+
51+
52+
53+
#ifdef __cplusplus
54+
}
55+
}
56+
#endif
57+
58+
59+
60+
#if _WIN32
61+
#pragma pack(pop)
62+
#endif
63+
64+
65+
#endif

Common/NintendoSwitch/NintendoSwitch_Protocol_Superscalar.h

Lines changed: 0 additions & 118 deletions
This file was deleted.

SerialPrograms/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,8 @@ file(GLOB MAIN_SOURCES
187187
../Common/Microcontroller/DeviceRoutines.h
188188
../Common/Microcontroller/MessageProtocol.h
189189
../Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h
190+
../Common/NintendoSwitch/NintendoSwitch_Protocol_ESP32.h
190191
../Common/NintendoSwitch/NintendoSwitch_Protocol_PushButtons.h
191-
../Common/NintendoSwitch/NintendoSwitch_Protocol_Superscalar.h
192192
../Common/NintendoSwitch/NintendoSwitch_SlotDatabase.h
193193
../Common/PokemonSwSh/PokemonProgramIDs.h
194194
../Common/PokemonSwSh/PokemonSwSh_FossilTable.h
@@ -824,7 +824,6 @@ file(GLOB MAIN_SOURCES
824824
Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h
825825
Source/NintendoSwitch/Commands/NintendoSwitch_Messages_Device.h
826826
Source/NintendoSwitch/Commands/NintendoSwitch_Messages_PushButtons.h
827-
Source/NintendoSwitch/Commands/NintendoSwitch_Messages_Superscalar.h
828827
Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.cpp
829828
Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.h
830829
Source/NintendoSwitch/Controllers/NintendoSwitch_ProController.cpp

SerialPrograms/SerialPrograms.pro

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,7 +1224,6 @@ HEADERS += \
12241224
../Common/Microcontroller/MessageProtocol.h \
12251225
../Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h \
12261226
../Common/NintendoSwitch/NintendoSwitch_Protocol_PushButtons.h \
1227-
../Common/NintendoSwitch/NintendoSwitch_Protocol_Superscalar.h \
12281227
../Common/NintendoSwitch/NintendoSwitch_SlotDatabase.h \
12291228
../Common/PokemonSwSh/PokemonProgramIDs.h \
12301229
../Common/PokemonSwSh/PokemonSwSh_FossilTable.h \
@@ -1573,7 +1572,6 @@ HEADERS += \
15731572
Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h \
15741573
Source/NintendoSwitch/Commands/NintendoSwitch_Messages_Device.h \
15751574
Source/NintendoSwitch/Commands/NintendoSwitch_Messages_PushButtons.h \
1576-
Source/NintendoSwitch/Commands/NintendoSwitch_Messages_Superscalar.h \
15771575
Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.h \
15781576
Source/NintendoSwitch/Controllers/NintendoSwitch_ProController.h \
15791577
Source/NintendoSwitch/Controllers/NintendoSwitch_ProControllerWithScheduler.h \

SerialPrograms/Source/Integrations/ProgramTracker.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,12 @@
88
#include "CommonFramework/ImageTypes/ImageRGB32.h"
99
#include "CommonFramework/VideoPipeline/VideoFeed.h"
1010
#include "Controllers/ControllerSession.h"
11-
#include "Controllers/SerialPABotBase/SerialPABotBase_Connection.h"
1211
#include "NintendoSwitch/Controllers/NintendoSwitch_ProController.h"
13-
#include "NintendoSwitch/Commands/NintendoSwitch_Messages_Superscalar.h"
1412
#include "ProgramTracker.h"
1513

16-
#include <iostream>
17-
using std::cout;
18-
using std::endl;
14+
//#include <iostream>
15+
//using std::cout;
16+
//using std::endl;
1917

2018
namespace PokemonAutomation{
2119

0 commit comments

Comments
 (0)