Skip to content

Commit

Permalink
Merge pull request #18 from bmorcelli/main
Browse files Browse the repository at this point in the history
BLE, Screen an Actions
  • Loading branch information
pr3y authored May 17, 2024
2 parents a5bfbd5 + f3d2269 commit 8d88890
Show file tree
Hide file tree
Showing 17 changed files with 516 additions and 633 deletions.
12 changes: 10 additions & 2 deletions .github/workflows/buil_parallel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@
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"
esp32s3_file="$HOME/.platformio/packages/framework-arduinoespressif32@3.20014.231204/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"
esp32s3_file_temp="$HOME/.platformio/packages/framework-arduinoespressif32@3.20014.231204/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"
Expand Down Expand Up @@ -134,3 +134,11 @@
path: Bruce_*.bin
retention-days: 5
if-no-files-found: error

- name: Upload elf ${{ matrix.board.name }}
uses: actions/upload-artifact@v4
with:
name: Bruce_${{ matrix.board.env }}_${{ github.run_number }}_elfs
path: .pio/build/${{ matrix.board.env }}/firmware.*
retention-days: 5
if-no-files-found: error
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ jobs:
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"
esp32s3_file="$HOME/.platformio/packages/framework-arduinoespressif32@3.20014.231204/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"
esp32s3_file_temp="$HOME/.platformio/packages/framework-arduinoespressif32@3.20014.231204/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"
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@


# List of Functionalities
- [ ] Boot Screen
- [x] Boot Screen
- [ ] Code Organization

## WiFi
Expand Down Expand Up @@ -45,7 +45,7 @@
## RF
- [ ] Scan/Copy (New)
- [ ] Replay
- [ ] Spectrum (New)
- [x] Spectrum (New)

## RFID
- [x] Read and Write
Expand All @@ -56,7 +56,7 @@
- [x] SD Card Mngr (New)
- [ ] WebUI (New)
- [x] Server Structure
- [ ] Html
- [x] Html
- [x] SDCard Mngr
- [ ] Spiffs Mngr
- [x] Megalodon (New)
Expand Down
8 changes: 4 additions & 4 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ lib_deps =
Time
LibSSH-ESP32
PCA9554
h2zero/NimBLE-Arduino @ ^1.4.1

[env:m5stack-cplus2]
platform = espressif32
Expand All @@ -55,7 +54,7 @@ build_flags =
-DWIDTH=240
-DHEIGHT=135
-DBACKLIGHT=27
-DMINBRIGHT=80
-DMINBRIGHT=160

-DLED=19
-DLED_ON=HIGH
Expand Down Expand Up @@ -157,6 +156,7 @@ lib_deps =

[env:m5stack-cardputer]
platform = espressif32
platform_packages[email protected]
board = m5stack-stamps3
framework = arduino
board_build.partitions = custom_8Mb.csv
Expand All @@ -174,7 +174,7 @@ build_flags =
-DWIDTH=240
-DHEIGHT=135
-DBACKLIGHT=38
-DMINBRIGHT=80
-DMINBRIGHT=160
-DMAX_MENU_SIZE=5

-DFP=1
Expand Down Expand Up @@ -287,7 +287,7 @@ build_flags =
-DLED_ON=HIGH
-DLED_OFF=LOW
-DBACKLIGHT=38
-DMINBRIGHT=80
-DMINBRIGHT=160
-DMAX_MENU_SIZE=5
-DUSER_SETUP_LOADED=1
-DST7789_2_DRIVER=1
Expand Down
172 changes: 76 additions & 96 deletions src/ble_spam.cpp

Large diffs are not rendered by default.

5 changes: 1 addition & 4 deletions src/ble_spam.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
#include <NimBLEDevice.h>
//#include <BLEDevice.h>

void aj_adv_setup();
#include <BLEDevice.h>

void aj_adv(int ble_choice);

Loading

0 comments on commit 8d88890

Please sign in to comment.