Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Global] Minor All-Around Cleanup #571

Closed
wants to merge 135 commits into from
Closed
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
135 commits
Select commit Hold shift + click to select a range
1d09214
Header Guards - First Round
rouing Dec 17, 2024
0820bf6
Testing
rouing Dec 18, 2024
1c0aa5d
Revert "Testing"
rouing Dec 18, 2024
09a9b18
Revert "Header Guards - First Round"
rouing Dec 18, 2024
d1b6991
Reapply "Header Guards - First Round"
rouing Dec 18, 2024
3ea71d2
More Cleanup
rouing Dec 18, 2024
e4d9cf0
automated building of firmware
rouing Dec 18, 2024
b44433c
readded phy rf calibration partition
rouing Dec 18, 2024
7a12d23
Looks like we were missing the ieee80211 sanity check symbol weakenin…
rouing Dec 18, 2024
3f9fafa
Automatic creation of image for s3 mcu
rouing Dec 18, 2024
393e655
Automated build - Automatic chip detection
rouing Dec 18, 2024
54c48de
Oops
rouing Dec 18, 2024
8c45ad9
Removed custom platform
rouing Dec 18, 2024
0a59631
patch
rouing Dec 18, 2024
ddd71aa
fix
rouing Dec 18, 2024
9802d20
include the first board config file.
rouing Dec 19, 2024
2a14510
now set it up to be used
rouing Dec 19, 2024
145d428
better board definitions + 2
rouing Dec 19, 2024
f37e64f
Remove the interface header and put it in include
rouing Dec 19, 2024
ec4fb35
scripts built into pio now
rouing Dec 19, 2024
37936ca
include datasheets
rouing Dec 19, 2024
ba4bc53
missed some
rouing Dec 19, 2024
447a690
Restructure the ports. Port dir is removed now
rouing Dec 19, 2024
037655c
fix patch
rouing Dec 19, 2024
9fa5bf0
board changes
rouing Dec 19, 2024
fc829db
letstryagain
rouing Dec 19, 2024
b8cf3b6
More
rouing Dec 19, 2024
2362962
ops
rouing Dec 19, 2024
c6ed299
fix
rouing Dec 19, 2024
c8638b5
fixes
rouing Dec 19, 2024
dba57bb
Fixes
rouing Dec 19, 2024
f1a5e6b
Actions cleanup
rouing Dec 19, 2024
ab4a163
Fixes?
rouing Dec 19, 2024
291ee1d
hmm
rouing Dec 19, 2024
17326ba
hmm
rouing Dec 19, 2024
ea1a654
is it really the platform?
rouing Dec 19, 2024
c951ed1
It was version e
rouing Dec 19, 2024
1dff8b8
things
rouing Dec 19, 2024
2e69cb0
oops
rouing Dec 19, 2024
27be417
oopsx2
rouing Dec 19, 2024
89fd0e9
Moar
rouing Dec 19, 2024
45d0a00
.
rouing Dec 19, 2024
ec357ba
Create PR_All_envs.yml
bmorcelli Dec 19, 2024
f137472
fix?
rouing Dec 19, 2024
9da46c7
fixed t-embed
rouing Dec 19, 2024
115de84
Merge branch 'dev-cleanup' of https://github.com/rouing/Bruce into de…
rouing Dec 19, 2024
65b26a4
FIXED
rouing Dec 19, 2024
460fba4
.
rouing Dec 19, 2024
d0afefd
Fixes
rouing Dec 19, 2024
643a144
more
rouing Dec 19, 2024
b5a431e
moar
rouing Dec 19, 2024
706ea4c
again
rouing Dec 19, 2024
50d0781
Atualizar o platformio.ini
bmorcelli Dec 19, 2024
5021f09
there we go
rouing Dec 19, 2024
0abc553
ditch WIDHT/HEIGHT hope I got them all
rouing Dec 19, 2024
066d810
Header Guards - First Round
rouing Dec 17, 2024
435d8ef
Testing
rouing Dec 18, 2024
9563196
Revert "Testing"
rouing Dec 18, 2024
0ec13de
Revert "Header Guards - First Round"
rouing Dec 18, 2024
2db40bd
Reapply "Header Guards - First Round"
rouing Dec 18, 2024
2b39e04
More Cleanup
rouing Dec 18, 2024
8771213
automated building of firmware
rouing Dec 18, 2024
27946c9
readded phy rf calibration partition
rouing Dec 18, 2024
5502a37
Looks like we were missing the ieee80211 sanity check symbol weakenin…
rouing Dec 18, 2024
ce6d64f
Automatic creation of image for s3 mcu
rouing Dec 18, 2024
37775a2
Automated build - Automatic chip detection
rouing Dec 18, 2024
b32e031
Oops
rouing Dec 18, 2024
1f6b547
Removed custom platform
rouing Dec 18, 2024
cb3504e
patch
rouing Dec 18, 2024
4d8d1bf
fix
rouing Dec 18, 2024
77fc19d
include the first board config file.
rouing Dec 19, 2024
94901fa
now set it up to be used
rouing Dec 19, 2024
9167793
better board definitions + 2
rouing Dec 19, 2024
1563734
Remove the interface header and put it in include
rouing Dec 19, 2024
44b1655
scripts built into pio now
rouing Dec 19, 2024
79e4700
include datasheets
rouing Dec 19, 2024
f2b383b
missed some
rouing Dec 19, 2024
4b51c7c
Restructure the ports. Port dir is removed now
rouing Dec 19, 2024
0214ae9
fix patch
rouing Dec 19, 2024
ce1aa3c
board changes
rouing Dec 19, 2024
28b57a3
letstryagain
rouing Dec 19, 2024
df279b8
More
rouing Dec 19, 2024
44ba602
ops
rouing Dec 19, 2024
9e68a69
fix
rouing Dec 19, 2024
be456fa
fixes
rouing Dec 19, 2024
0407c43
Fixes
rouing Dec 19, 2024
fa83391
Actions cleanup
rouing Dec 19, 2024
eed62b9
Fixes?
rouing Dec 19, 2024
3a14afd
hmm
rouing Dec 19, 2024
4ef50c6
hmm
rouing Dec 19, 2024
328d1f4
is it really the platform?
rouing Dec 19, 2024
8d149d8
It was version e
rouing Dec 19, 2024
f1b2e9f
fixed t-embed
rouing Dec 19, 2024
1ec4402
things
rouing Dec 19, 2024
83cc755
oops
rouing Dec 19, 2024
4d6f856
oopsx2
rouing Dec 19, 2024
cf7b94a
Moar
rouing Dec 19, 2024
cec7bcb
.
rouing Dec 19, 2024
94f21f7
fix?
rouing Dec 19, 2024
485369c
FIXED
rouing Dec 19, 2024
e723a67
.
rouing Dec 19, 2024
b7ffbba
Fixes
rouing Dec 19, 2024
91c31ef
more
rouing Dec 19, 2024
bd99bd8
moar
rouing Dec 19, 2024
641d07d
again
rouing Dec 19, 2024
597c2c3
there we go
rouing Dec 19, 2024
ddf58d4
ditch WIDHT/HEIGHT hope I got them all
rouing Dec 19, 2024
6fb9cde
Merge branch 'dev-cleanup' of https://github.com/rouing/Bruce into de…
rouing Dec 19, 2024
18e8cf6
fixes
rouing Dec 20, 2024
a6d4008
fix
rouing Dec 20, 2024
72475b6
Add datasheets
rouing Dec 20, 2024
f9dca0f
hmm
rouing Dec 20, 2024
a7cb210
fix
rouing Dec 20, 2024
62b75b7
more fix
rouing Dec 20, 2024
601c815
again
rouing Dec 20, 2024
95b06c0
Almost there
rouing Dec 20, 2024
6d13708
Globals restructure
rouing Dec 20, 2024
4f0e286
Proper defines for a board
rouing Dec 20, 2024
96a174d
Globals header is now global
rouing Dec 20, 2024
00ffce2
globals location
rouing Dec 20, 2024
f9e307e
.
rouing Dec 20, 2024
4ac6c9a
.
rouing Dec 20, 2024
2363310
backToMenu() reloaction to utils
rouing Dec 20, 2024
58629fb
Fixes
rouing Dec 20, 2024
61fb24a
.
rouing Dec 20, 2024
992b97e
Fixed the T-Embed
rouing Dec 20, 2024
b98af75
missed a comma
rouing Dec 20, 2024
b84060f
final touch up for build merge script
rouing Dec 20, 2024
df62af4
Width and Height swap
rouing Dec 20, 2024
6b06351
Revert "Width and Height swap"
rouing Dec 21, 2024
a6b301b
Revert "final touch up for build merge script"
rouing Dec 21, 2024
048b26f
Ok now we fixed the TFT H/W Definitions
rouing Dec 21, 2024
b506e89
final touches
rouing Dec 21, 2024
0f6d0f3
fix headless
rouing Dec 21, 2024
4ad3ea5
analogWrite (oops)
rouing Dec 22, 2024
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
39 changes: 39 additions & 0 deletions .github/workflows/buil_parallel.yml
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not needed.

Patch is being applied directly here:

platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.4/platform-espressif32.zip

Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,45 @@
- name: Install PlatformIO Core
run: |
pip install platformio
platformio update

pio pkg install -p espressif32 -t toolchain-xtensa32

esp32_file="$HOME/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/lib/libnet80211.a"
esp32s3_file="$HOME/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32s3/lib/libnet80211.a"

esp32_file_temp="$HOME/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/lib/libnet80211_temp.a"
esp32s3_file_temp="$HOME/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32s3/lib/libnet80211_temp.a"

# Definir caminhos para as ferramentas objcopy
toolchain_esp32="$HOME/.platformio/packages/toolchain-xtensa-esp32/xtensa-esp32-elf/bin/objcopy"
toolchain_esp32s3="$HOME/.platformio/packages/toolchain-xtensa-esp32s3/xtensa-esp32s3-elf/bin/objcopy"

# Verificar se os arquivos existem antes de executar os comandos
if [[ -f "$esp32_file" && -f "$esp32s3_file" ]]; then
# Execute objcopy commands for ESP32
$toolchain_esp32 --weaken-symbol=ieee80211_raw_frame_sanity_check "$esp32_file" "$esp32_file_temp"

# Rename the original file to .old
mv "$esp32_file" "${esp32_file}.old"

# Rename the _temp to original
mv "$esp32_file_temp" "$esp32_file"

# Execute objcopy commands for ESP32-S3
$toolchain_esp32s3 --weaken-symbol=ieee80211_raw_frame_sanity_check "$esp32s3_file" "$esp32s3_file_temp"

# Rename the original file to .old
mv "$esp32s3_file" "${esp32s3_file}.old"

# Rename the _temp to original
mv "$esp32s3_file_temp" "$esp32s3_file"

echo "Done."
else
echo "One or more specified files were not found."
exit 1
fi

if [[ "${{ github.ref_type }}" == "tag" ]]; then
version=${{ github.ref_name }}
Expand Down
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,18 +204,18 @@ Also, [read our FAQ](https://github.com/pr3y/Bruce/wiki/FAQ)
</details>

## Specific functions per Device, the ones not mentioned here are available to all.
| Device | CC1101 | NRF24 | Interpreter | FMRadio | PN532 | Mic_SPM1423 | BadUSB | RGB Led | Speaker | LITE_MODE |
| --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- |
| Cardputer | :ok: | :ok: | :ok: | :ok: | :ok: | :ok: | :ok: | :ok: | NS4168 | :x: |
| StickCPlus2 | :ok: | :ok: | :ok: | :ok: | :ok: | :ok: | :ok:¹ | :x: | Tone | :x: |
| StickCPlus 1.1 | :ok: | :ok: | :x: | :ok: | :ok: | :ok: | :ok:¹ | :x: | Tone | :x:² |
| Core | :x: | :x: | :x: | :x: | :x: | :ok: | :ok:¹ | :x: | Tone | :x: |
| Core2 | :x: | :x: | :x: | :x: | :x: | :ok: | :ok:¹ | :x: | :x: | :x: |
| CoreSe/SE | :x: | :x: | :ok: | :x: | :x: | :x: | :ok: | :x: | :x: | :x: |
| CYD-2432S028 | :ok: | :ok: | :ok: | :x: | :ok: | :x: | :ok:¹ | :x: | :x: | :x:² |
| Lilygo T-Embed CC1101 | :ok: | :x: | :ok: | :x: | :ok: | :ok: | :ok: | :x: | :x: | :x: |
| Lilygo T-Embed | :x: | :x: | :ok: | :x: | :ok: | :ok: | :ok: | :x: | :x: | :x: |
| Lilygo T-Deck (and pro) | :x: | :x: | :ok: | :x: | :x: | :x: | :ok: | :x: | :x: | :x: |
| Device | CC1101 | NRF24 | Interpreter | FMRadio | PN532 | Mic_SPM1423 | BadUSB | RGB Led | Speaker | LITE_MODE |
| --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- |
| Cardputer | :ok: | :ok: | :ok: | :ok: | :ok: | :ok: | :ok: | :ok: | NS4168 | :x: |
| StickCPlus2 | :ok: | :ok: | :ok: | :ok: | :ok: | :ok: | :ok:¹ | :x: | Tone | :x: |
| StickCPlus 1.1 | :ok: | :ok: | :x: | :ok: | :ok: | :ok: | :ok:¹ | :x: | Tone | :x:² |
| Core | :x: | :x: | :x: | :x: | :x: | :ok: | :ok:¹ | :x: | Tone | :x: |
| Core2 | :x: | :x: | :x: | :x: | :x: | :ok: | :ok:¹ | :x: | :x: | :x: |
| CoreSe/SE | :x: | :x: | :ok: | :x: | :x: | :x: | :ok: | :x: | :x: | :x: |
| CYD-2432S028 | :ok: | :ok: | :ok: | :x: | :ok: | :x: | :ok:¹ | :x: | :x: | :x:² |
| Lilygo T-Embed CC1101 | :ok: | :x: | :ok: | :x: | :ok: | :ok: | :ok: | :x: | MAX98357A | :x: |
| Lilygo T-Embed | :x: | :x: | :ok: | :x: | :ok: | :ok: | :ok: | :x: | :x: | :x: |
| Lilygo T-Deck (and pro) | :x: | :x: | :ok: | :x: | :x: | :x: | :ok: | :x: | :x: | :x: |

² CYD and StickCPlus 1.1 have a LITE_VERSION version for Launcher Compatibility
¹ Core, CYD and StickCs Bad-USB: [here](https://github.com/pr3y/Bruce/wiki/Others#badusb)
Expand Down
7 changes: 7 additions & 0 deletions build.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Import("env")

env.AddCustomTarget(
"build-firmware",
["$BUILD_DIR/bootloader.bin","$BUILD_DIR/partitions.bin","$BUILD_DIR/firmware.bin"],
'pio pkg exec -p "tool-esptoolpy" -- esptool.py --chip esp32s3 merge_bin --output Bruce3_T-Embed_CC1101.bin 0x0 ${BUILD_DIR}\\bootloader.bin 0x8000 ${BUILD_DIR}\partitions.bin 0x10000 ${BUILD_DIR}\\firmware.bin'
)
3 changes: 2 additions & 1 deletion custom_16Mb.csv
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Name, Type, SubType, Offset, Size, Flags
nvs, data, nvs, 0x9000, 0x6000,
app0, app, ota_0, 0x10000, 0x470000,
phy_init, data, phy, 0xf000, 0x1000,
app0, app, factory, 0x10000, 0x470000,
spiffs, data, spiffs, 0x480000, 0xB70000,
coredump, data, coredump, 0xFF0000, 0x10000,
2 changes: 2 additions & 0 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ build_flags =
;-DRF_MODULE_GDO2=RADIOLIB_NC ; CC1101 pin GDO2
;-DRF_MODULE_INIT_STATUS=true

extra_scripts = build.py

lib_deps =
WireGuard-ESP32
IRremoteESP8266
Expand Down
4 changes: 2 additions & 2 deletions ports/lilygo-t-embed-cc1101/interface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ void _setup_gpio() {
#ifdef T_EMBED_1101
// T-Embed CC1101 has a antenna circuit optimized to each frequency band, controlled by SW0 and SW1
//Set antenna frequency settings
pinMode(BOARD_LORA_SW1, OUTPUT);
pinMode(BOARD_LORA_SW0, OUTPUT);
pinMode(CC1101_SW1_PIN, OUTPUT);
pinMode(CC1101_SW0_PIN, OUTPUT);

// Chip Select CC1101 to HIGH State
pinMode(CC1101_SS_PIN, OUTPUT);
Expand Down
Loading
Loading