DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #908 from cyberman54/master

Browse Source 
sync dev with master
This commit is contained in:
Verkehrsrot 2022-11-02 16:05:22 +01:00 committed by GitHub
commit 7bb941a21a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/build.yml vendored
View File

@ -27,6 +27,7 @@ jobs:
# platformio-path: ~\AppData\Local\platformio\Cache # platformio-path: ~\AppData\Local\platformio\Cache
board: board:
[ [
generic.h,
ebox.h, ebox.h,
eboxtube.h, eboxtube.h,
ecopower.h, ecopower.h,

2
src/hal/generic.h
View File

@ -62,7 +62,7 @@
#define CFG_sx1276_radio 1 // select LoRa chip #define CFG_sx1276_radio 1 // select LoRa chip
//#define CFG_sx1272_radio 1 // select LoRa chip //#define CFG_sx1272_radio 1 // select LoRa chip
#define BOARD_HAS_PSRAM // use if board has external PSRAM //#define BOARD_HAS_PSRAM // use if board has external SPIRAM, note: this will reduce IRAM0 by 64KB for SPIRAM cache
#define DISABLE_BROWNOUT 1 // comment out if you want to keep brownout feature #define DISABLE_BROWNOUT 1 // comment out if you want to keep brownout feature
#define HAS_DISPLAY 1 #define HAS_DISPLAY 1

7
src/hal/m5fire.h
View File

@ -1,6 +1,7 @@
// clang-format off // clang-format off
// upload_speed 921600 // upload_speed 921600
// board m5stack-fire // board m5stack-core-esp32
// b0ard m5stack-fire -> does not compile due to IRAM0 shortage, because 64KB of 192KB used for caching external SPIRAM
// note use of GPIO16/17 // note use of GPIO16/17
// https://www.bjoerns-techblog.de/2019/03/m5stack-fire-eine-uebersicht/ // https://www.bjoerns-techblog.de/2019/03/m5stack-fire-eine-uebersicht/
@ -31,9 +32,7 @@
#define DISABLE_BROWNOUT 1 // comment out if you want to keep brownout feature #define DISABLE_BROWNOUT 1 // comment out if you want to keep brownout feature
#define HAS_LED NOT_A_PIN // no on board LED (?) #define HAS_LED NOT_A_PIN // no on board LED (?)
#define RGB_LED_COUNT 10 #define RGB_LED_COUNT 10 // M5fire has a stripe of 10 RGB Pixels
#define RGB_LED_COUNT 1 // we have 1 LED
#define HAS_RGB_LED FastLED.addLeds<SK6812, GPIO_NUM_15, GRB>(leds, RGB_LED_COUNT); #define HAS_RGB_LED FastLED.addLeds<SK6812, GPIO_NUM_15, GRB>(leds, RGB_LED_COUNT);
#define HAS_BUTTON (39) // on board button A #define HAS_BUTTON (39) // on board button A