Skip to content

Commit dc6f719

Browse files
committed
Merge remote-tracking branch 'origin/dev' into theme-led
2 parents 5668619 + b1844f5 commit dc6f719

File tree

158 files changed

+5701
-2969
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+5701
-2969
lines changed

.github/workflows/PR_All_envs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
- { env: "m5stack-core4mb", family: "ESP32",}
2727
- { env: "m5stack-cores3", family: "ESP32-S3",}
2828
- { env: "esp32-s3-devkitc-1", family: "ESP32-S3",}
29+
- { env: "esp32-c5", family: "ESP32-C5",}
2930
- { env: "CYD-2432S028", family: "ESP32",}
3031
- { env: "CYD-2USB", family: "ESP32",}
3132
- { env: "CYD-2432W328C", family: "ESP32",}

.github/workflows/PR_check.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@ jobs:
4747
env: "LAUNCHER_CYD-2432S028",
4848
partitions: { bootloader_addr: "0x1000" },
4949
}
50+
- {
51+
name: "ESP32-C5",
52+
env: "esp32-c5",
53+
partitions: { bootloader_addr: "0x2000" },
54+
}
5055
steps:
5156
- uses: actions/checkout@v4
5257

.github/workflows/buil_parallel.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
- { env: "m5stack-core4mb", family: "ESP32",}
2828
- { env: "m5stack-cores3", family: "ESP32-S3",}
2929
- { env: "esp32-s3-devkitc-1", family: "ESP32-S3",}
30+
- { env: "esp32-c5", family: "ESP32-C5",}
3031
- { env: "CYD-2432S028", family: "ESP32",}
3132
- { env: "CYD-2USB", family: "ESP32",}
3233
- { env: "CYD-2432W328C", family: "ESP32",}

.vscode/settings.json

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,21 @@
7070
"*.tpp": "cpp",
7171
"condition_variable": "cpp",
7272
"mutex": "cpp",
73-
"thread": "cpp"
73+
"thread": "cpp",
74+
"bit": "cpp",
75+
"charconv": "cpp",
76+
"compare": "cpp",
77+
"concepts": "cpp",
78+
"netfwd": "cpp",
79+
"source_location": "cpp",
80+
"format": "cpp",
81+
"numbers": "cpp",
82+
"semaphore": "cpp",
83+
"span": "cpp",
84+
"stop_token": "cpp",
85+
"text_encoding": "cpp",
86+
"variant": "cpp",
87+
"usb_serial_jtag.h": "c"
7488
},
7589
"files.trimTrailingWhitespace": true,
7690
"files.insertFinalNewline": true,

2.0_road_path.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
the objective of 2.0 is changing the Framework to Arduino-ESP32 v3.+, to be able to program to ESP32-C5 chips
44

55
## Downsides
6-
- Incompatibility with WireGuard
7-
- Remove OpenHeystack (hard to use and not that usefull)
8-
- Remove DPWO (turn it into a Javascript thing)
6+
- [x] Remove OpenHeystack (hard to use and not that usefull)
7+
- [x] Remove DPWO (turn it into a Javascript thing)
98

109
## Enhancements
11-
- Using newer version of C++
12-
- Availability to program to ESP32-C5 (5ghz wifi chip)
10+
- [x] Using newer version of C++
11+
- [x] Availability to program to ESP32-C5 (5ghz wifi chip)
1312

1413
## Things to change on 2.0
1514
- [] InputHadler common codes, defined within #defines structures, not programmin functions to each device
@@ -20,7 +19,7 @@ the objective of 2.0 is changing the Framework to Arduino-ESP32 v3.+, to be able
2019
## Things to add on 2.0
2120

2221
### Wifi
23-
- [] Wifi 5Ghz support
22+
- [x] Wifi 5Ghz support
2423

2524
### BLE
2625
- [] Session hijacking

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ Also, [read our FAQ](https://github.com/pr3y/Bruce/wiki/FAQ)
5252
- [x] [RAW Sniffer](https://github.com/pr3y/Bruce/wiki/WiFi#raw-sniffer)
5353
- [x] [TCP Client](https://github.com/pr3y/Bruce/wiki/WiFi#tcp-client)
5454
- [x] [TCP Listener](https://github.com/pr3y/Bruce/wiki/WiFi#tcp-listener)
55-
- [x] [DPWO-ESP32](https://github.com/pr3y/Bruce/wiki/WiFi#dpwo-esp32)
5655
- [x] [Evil Portal](https://github.com/pr3y/Bruce/wiki/WiFi#evil-portal)
5756
- [x] [Scan Hosts](https://github.com/pr3y/Bruce/wiki/WiFi#evil-portal)
5857
- [x] [Wireguard Tunneling](https://github.com/pr3y/Bruce/wiki/WiFi#wireguard-tunneling)
@@ -174,7 +173,6 @@ Also, [read our FAQ](https://github.com/pr3y/Bruce/wiki/FAQ)
174173
- [x] Megalodon
175174
- [x] [BADUsb (New features, LittleFS and SDCard)](https://github.com/pr3y/Bruce/wiki/Others#badusb)
176175
- [x] USB Keyboard - Cardputer and T-Deck Only
177-
- [x] [Openhaystack](https://github.com/pr3y/Bruce/wiki/Others#openhaystack)
178176
- [x] [iButton](https://github.com/pr3y/Bruce/wiki/Others#ibutton)
179177
- [x] [LED Control](https://github.com/pr3y/Bruce/wiki/Others#led-control)
180178
</details>
@@ -228,7 +226,7 @@ Also, [read our FAQ](https://github.com/pr3y/Bruce/wiki/FAQ)
228226
² CYD have a LITE_VERSION version for Launcher Compatibility
229227
¹ Core, CYD and StickCs Bad-USB: [here](https://github.com/pr3y/Bruce/wiki/Others#badusb)
230228

231-
*LITE_VERSION*: TelNet, SSH, DPWO, WireGuard, ScanHosts, RawSniffer, Brucegotchi, BLEBacon, BLEScan, Interpreter and OpenHaystack are NOT available for M5Launcher Compatibility
229+
*LITE_VERSION*: TelNet, SSH, WireGuard, ScanHosts, RawSniffer, Brucegotchi, BLEBacon, BLEScan and Interpreter are NOT available for M5Launcher Compatibility
232230

233231

234232
## :sparkles: Why and how does it look?

boards/CYD-2432S028/CYD-2432S028.ini

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -182,12 +182,12 @@ build_flags =
182182

183183
[env:LAUNCHER_CYD-2USB]
184184
extends=env:CYD-2432S028
185+
board_build.partitions = custom_4Mb.csv
185186
build_flags =
186187
${env:CYD-2432S028.build_flags}
187-
-DCONFIG_ESP32_JTAG_SUPPORT_DISABLE=1
188-
-DTFT_INVERSION_ON
189-
-DLITE_VERSION=1
190-
-DDEVICE_NAME='"LAUNCHER_CYD-2USB"'
188+
${env_light.build_flags}
189+
lib_deps =
190+
${env_light.lib_deps}
191191

192192
[env:CYD-2432W328C]
193193
extends = CYD_base
@@ -204,11 +204,12 @@ build_flags =
204204

205205
[env:LAUNCHER_CYD-2432S028]
206206
extends=env:CYD-2432S028
207+
board_build.partitions = custom_4Mb.csv
207208
build_flags =
208209
${env:CYD-2432S028.build_flags}
209-
-DCONFIG_ESP32_JTAG_SUPPORT_DISABLE=1
210-
-DLITE_VERSION=1
211-
-DDEVICE_NAME='"LAUNCHER_CYD-2432S028"'
210+
${env_light.build_flags}
211+
lib_deps =
212+
${env_light.lib_deps}
212213

213214
[env:CYD-2432W328C_2] # commom to CYD-2432S024 Capacitive board
214215
extends = env:CYD-2432W328C
@@ -218,11 +219,12 @@ build_unflags =
218219

219220
[env:LAUNCHER_CYD-2432W328C]
220221
extends=env:CYD-2432W328C
222+
board_build.partitions = custom_4Mb.csv
221223
build_flags =
222224
${env:CYD-2432W328C.build_flags}
223-
-DCONFIG_ESP32_JTAG_SUPPORT_DISABLE=1
224-
-DLITE_VERSION=1
225-
-DDEVICE_NAME='"LAUNCHER_CYD-2432W328C"'
225+
${env_light.build_flags}
226+
lib_deps =
227+
${env_light.lib_deps}
226228

227229
[env:CYD-2432W328R-or-S024R]
228230
extends = CYD_base
@@ -244,9 +246,8 @@ extends = env:CYD-2432W328R-or-S024R
244246
board_build.partitions = custom_4Mb.csv
245247
build_flags =
246248
${env:CYD-2432W328R-or-S024R.build_flags}
247-
-DCORE_DEBUG_LEVEL=0
248-
-DCONFIG_ESP32_JTAG_SUPPORT_DISABLE=1
249-
-DLITE_VERSION=1
250-
-DDEVICE_NAME='"LAUNCHER_CYD-2432W328R-or-S024R"'
249+
${env_light.build_flags}
250+
lib_deps =
251+
${env_light.lib_deps}
251252

252253
################################# END OF CYD MODELS ####################################################

boards/CYD-2432S028/interface.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ void _post_setup_gpio() {
7979

8080
// Brightness control must be initialized after tft in this case @Pirata
8181
pinMode(TFT_BL, OUTPUT);
82-
ledcSetup(TFT_BRIGHT_CHANNEL, TFT_BRIGHT_FREQ, TFT_BRIGHT_Bits); // Channel 0, 10khz, 8bits
83-
ledcAttachPin(TFT_BL, TFT_BRIGHT_CHANNEL);
82+
ledcAttach(TFT_BL, TFT_BRIGHT_FREQ, TFT_BRIGHT_Bits);
8483
ledcWrite(TFT_BRIGHT_CHANNEL, 255);
8584
}
8685

boards/ESP-General/interface.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
** Location: main.cpp
77
** Description: initial setup for the device
88
***************************************************************************************/
9-
void _setup_gpio() {}
9+
void _setup_gpio() { bruceConfig.startupApp = "WebUI"; }
1010

1111
/***************************************************************************************
1212
** Function name: getBattery()

boards/ESP32-C5/ESP32-C5.ini

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
; PlatformIO Project Configuration File
2+
;
3+
; Build options: build flags, source filter
4+
; Upload options: custom upload port, speed and extra flags
5+
; Library options: dependencies, extra library storages
6+
; Advanced options: extra scripting
7+
;
8+
; Please visit documentation for the other options and examples
9+
; https://docs.platformio.org/page/projectconf.html
10+
11+
[env:esp32-c5]
12+
board = esp32-c5-devkitc-1
13+
board_build.partitions = custom_8Mb.csv
14+
extra_scripts =
15+
pre:patch-c5.py
16+
pre:pre_build_current_year.py
17+
post:build.py
18+
build_src_filter =${env.build_src_filter} +<../boards/ESP32-C5>
19+
build_flags =
20+
${env.build_flags}
21+
-Iboards/ESP32-C5
22+
-DDEVICE_NAME='"ESP32-C5"'
23+
-DARDUINO_USB_CDC_ON_BOOT=1
24+
-DARDUINO_USB_MODE=1
25+
-DCORE_DEBUG_LEVEL=1
26+
-DBAD_RX=4
27+
-DBAD_TX=5
28+
; grove pins
29+
; defaults from https://github.com/espressif/arduino-esp32/blob/master/variants/esp32s3/pins_arduino.h
30+
-DGROVE_SDA=0 ; default RF TX pin
31+
-DGROVE_SCL=1 ; default IR/RF RX pin
32+
;-DALLOW_ALL_GPIO_FOR_IR_RF=1 ; Set this option to make use of all GPIOs, from 1 to 44 to be chosen, except TFT and SD pins
33+
34+
; ir led pin
35+
-DIR_TX_PINS='{{"Grove W", GROVE_SCL}, {"Grove Y", GROVE_SDA}}'
36+
-DIR_RX_PINS='{{"Grove W", GROVE_SCL}, {"Grove Y", GROVE_SDA}}'
37+
-DLED=27
38+
-DLED_ON=HIGH
39+
-DLED_OFF=LOW
40+
41+
;Radio Frequency (one pin modules) pin setting
42+
-DRF_TX_PINS='{{"Grove W", GROVE_SCL}, {"Grove Y", GROVE_SDA}}'
43+
-DRF_RX_PINS='{{"Grove W", GROVE_SCL}, {"Grove Y", GROVE_SDA}}'
44+
45+
; sd card pins
46+
; suggested https://github.com/espressif/esp-idf/tree/master/examples/storage/sd_card/sdmmc
47+
-DSDCARD_CS=-1
48+
-DSDCARD_SCK=-1
49+
-DSDCARD_MISO=-1
50+
-DSDCARD_MOSI=-1
51+
52+
; tft vars
53+
-DROTATION=1
54+
-DBACKLIGHT=-1 ; tft backlight pin
55+
-DMINBRIGHT=160 ; unused?
56+
-DUSER_SETUP_LOADED=1 ; dont redefine pins
57+
-DILI9341_DRIVER=1 ; example only
58+
-DSMOOTH_FONT=1
59+
-DTFT_DISPON=0x29
60+
-DTFT_DISPOFF=0x28
61+
-DTFT_CS=-1
62+
-DTFT_DC=-1
63+
-DTFT_RST=-1
64+
-DTOUCH_CS=-1
65+
-DTFT_MOSI=-1
66+
-DTFT_SCLK=-1
67+
-DTFT_BL=-1
68+
; text sizes
69+
-DFP=1
70+
-DFM=2
71+
-DFG=3
72+
; ui control buttons
73+
;-DSEL_BTN=1
74+
;-DUP_BTN=2 ; also work as ESC
75+
;-DDW_BTN=3 ; also work as NEXT
76+
-DBTN_ALIAS='"OK"'
77+
78+
;FM Radio
79+
;-DFM_SI4713=1 ;Uncomment to activate FM Radio using Adafruit Si4713
80+
;Microphone
81+
;-DMIC_SPM1423=1 ; uncomment to enable Applicable for SPM1423 device
82+
;-DPIN_CLK=-1
83+
;-DI2S_SCLK_PIN=-1
84+
;-DI2S_DATA_PIN=-1
85+
;-DPIN_DATA=-1
86+
87+
;CC1101 SPI connection pins
88+
; best connection pins for higher speed https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/api-reference/peripherals/spi_master.html#gpio-matrix-and-io-mux
89+
-DUSE_CC1101_VIA_SPI
90+
-DCC1101_GDO0_PIN=-1
91+
-DCC1101_SS_PIN=SPI_SS_PIN
92+
-DCC1101_MOSI_PIN=SPI_MOSI_PIN
93+
-DCC1101_SCK_PIN=SPI_SCK_PIN
94+
-DCC1101_MISO_PIN=SPI_MISO_PIN
95+
;-DCC1101_GDO2_PIN=14 ; optional
96+
97+
; connections are the same as CC1101
98+
;-DUSE_NRF24_VIA_SPI
99+
;-DNRF24_CE_PIN=5
100+
;-DNRF24_SS_PIN=SPI_SS_PIN ; chip select
101+
;-DNRF24_MOSI_PIN=SPI_MOSI_PIN
102+
;-DNRF24_SCK_PIN=SPI_SCK_PIN
103+
;-DNRF24_MISO_PIN=SPI_MISO_PIN
104+
105+
-DSPI_SCK_PIN=-1
106+
-DSPI_MOSI_PIN=-1
107+
-DSPI_MISO_PIN=-1
108+
-DSPI_SS_PIN=-1
109+
110+
; connections are the same as W5500
111+
; -DUSE_W5500_VIA_SPI
112+
; -DW5500_SS_PIN=SPI_SS_PIN
113+
; -DW5500_MOSI_PIN=SPI_MOSI_PIN
114+
; -DW5500_SCK_PIN=SPI_SCK_PIN
115+
; -DW5500_MISO_PIN=SPI_MISO_PIN
116+
; -DW5500_INT_PIN=5

0 commit comments

Comments
 (0)