From e17ab3be585ae5eb92df7e814b995cbf05620b04 Mon Sep 17 00:00:00 2001 From: free-x Date: Sat, 26 Aug 2023 15:51:53 +0200 Subject: [PATCH 1/6] add atoms3 with canunit env --- lib/hardware/GwHardware.h | 23 +++++++++++++++++++++-- platformio.ini | 13 ++++++++++++- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/lib/hardware/GwHardware.h b/lib/hardware/GwHardware.h index 8b6dd9f3..11e16baa 100644 --- a/lib/hardware/GwHardware.h +++ b/lib/hardware/GwHardware.h @@ -50,14 +50,33 @@ //led handling //if we define GWLED_FASTNET the arduino fastnet lib is used #define GWLED_FASTLED -#define GWLED_TYPE SK6812 +#define GWLED_TYPE WS2812 //color schema for fastled #define GWLED_SCHEMA GRB -#define GWLED_PIN GPIO_NUM_27 +#define GWLED_PIN GPIO_NUM_35 //brightness 0...255 #define GWLED_BRIGHTNESS 64 #endif +#ifdef BOARD_M5ATOMS3_CANUNIT +#define ESP32_CAN_TX_PIN GPIO_NUM_26 +#define ESP32_CAN_RX_PIN GPIO_NUM_32 +#define GWBUTTON_PIN GPIO_NUM_41 +#define GWBUTTON_ACTIVE LOW +//if GWBUTTON_PULLUPDOWN we enable a pulup/pulldown +#define GWBUTTON_PULLUPDOWN +//led handling +//if we define GWLED_FASTNET the arduino fastnet lib is used +//#define GWLED_FASTLED +//#define GWLED_TYPE SK6812 +//color schema for fastled +#define GWLED_SCHEMA GRB +#define GWLED_PIN GPIO_NUM_35 +//brightness 0...255 +//#define GWLED_BRIGHTNESS 64 +#endif + + #ifdef BOARD_M5ATOM_RS232_CANUNIT #define ESP32_CAN_TX_PIN GPIO_NUM_26 #define ESP32_CAN_RX_PIN GPIO_NUM_32 diff --git a/platformio.ini b/platformio.ini index 57045edd..e01cad66 100644 --- a/platformio.ini +++ b/platformio.ini @@ -27,7 +27,8 @@ lib_deps = ttlappalainen/NMEA0183 @ 1.7.1 ArduinoJson @ 6.18.5 ottowinter/ESPAsyncWebServer-esphome@2.0.1 - fastled/FastLED @ 3.4.0 + #fastled/FastLED @ 3.4.0 + fastled/FastLED @ 3.6.0 board_build.embed_files = lib/generated/index.html.gz lib/generated/index.js.gz @@ -62,6 +63,16 @@ build_flags = upload_port = /dev/esp32 upload_protocol = esptool +[env:m5stack-atoms3-canunit] +board = m5stack-atoms3 +lib_deps = ${env.lib_deps} +build_flags = + -D BOARD_M5ATOMS3_CANUNIT + ${env.build_flags} +upload_port = /dev/esp32 +upload_protocol = esptool + + [env:m5stack-atom-rs232-canunit] board = m5stack-atom lib_deps = ${env.lib_deps} From 5a8b30235c51bd37063dd0a5c218ee65d851f272 Mon Sep 17 00:00:00 2001 From: free-x Date: Sat, 26 Aug 2023 16:05:04 +0200 Subject: [PATCH 2/6] adjust Grove GPIO for atoms3 --- lib/hardware/GwHardware.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/hardware/GwHardware.h b/lib/hardware/GwHardware.h index 11e16baa..ed774c87 100644 --- a/lib/hardware/GwHardware.h +++ b/lib/hardware/GwHardware.h @@ -59,8 +59,8 @@ #endif #ifdef BOARD_M5ATOMS3_CANUNIT -#define ESP32_CAN_TX_PIN GPIO_NUM_26 -#define ESP32_CAN_RX_PIN GPIO_NUM_32 +#define ESP32_CAN_TX_PIN GPIO_NUM_2 +#define ESP32_CAN_RX_PIN GPIO_NUM_1 #define GWBUTTON_PIN GPIO_NUM_41 #define GWBUTTON_ACTIVE LOW //if GWBUTTON_PULLUPDOWN we enable a pulup/pulldown From 74f4937844ce9223edadde5f6eb204256ea3a8be Mon Sep 17 00:00:00 2001 From: free-x Date: Sat, 26 Aug 2023 16:17:21 +0200 Subject: [PATCH 3/6] clean up atom/atoms3 --- lib/hardware/GwHardware.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/hardware/GwHardware.h b/lib/hardware/GwHardware.h index ed774c87..df9929df 100644 --- a/lib/hardware/GwHardware.h +++ b/lib/hardware/GwHardware.h @@ -40,6 +40,7 @@ //brightness 0...255 #define GWLED_BRIGHTNESS 64 #endif + #ifdef BOARD_M5ATOM_CANUNIT #define ESP32_CAN_TX_PIN GPIO_NUM_26 #define ESP32_CAN_RX_PIN GPIO_NUM_32 @@ -50,10 +51,10 @@ //led handling //if we define GWLED_FASTNET the arduino fastnet lib is used #define GWLED_FASTLED -#define GWLED_TYPE WS2812 +#define GWLED_TYPE SK6812 //color schema for fastled #define GWLED_SCHEMA GRB -#define GWLED_PIN GPIO_NUM_35 +#define GWLED_PIN GPIO_NUM_27 //brightness 0...255 #define GWLED_BRIGHTNESS 64 #endif @@ -67,13 +68,13 @@ #define GWBUTTON_PULLUPDOWN //led handling //if we define GWLED_FASTNET the arduino fastnet lib is used -//#define GWLED_FASTLED -//#define GWLED_TYPE SK6812 +#define GWLED_FASTLED +#define GWLED_TYPE WS2812 //color schema for fastled #define GWLED_SCHEMA GRB #define GWLED_PIN GPIO_NUM_35 //brightness 0...255 -//#define GWLED_BRIGHTNESS 64 +#define GWLED_BRIGHTNESS 64 #endif From 5bdcd0f8a9ae024a7d790f539cd0532f7789b4ff Mon Sep 17 00:00:00 2001 From: free-x Date: Sun, 27 Aug 2023 10:18:56 +0200 Subject: [PATCH 4/6] Add dokumentation about AtomS3 --- doc/Hardware.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/Hardware.md b/doc/Hardware.md index 988c8d63..07d76940 100644 --- a/doc/Hardware.md +++ b/doc/Hardware.md @@ -78,6 +78,13 @@ Can be used e.g. as an NMEA2000 Adapter for a laptop running e.g. OpenCPN with t ![OpenCPN on Laptop via USB and MFD on Android via WiFi](in_action1.jpg) ![OpenCPN on Laptop via USB and AvNav on Android via WiFi](in_action2.jpg) +M5 Stack AtomS3Lite Canunit (experimental since dev20230826) +--------------------- +* Hardware: [M5_ATOMS3 Lite](http://docs.m5stack.com/en/core/AtomS3%20Lite) + [CAN Unit](http://docs.m5stack.com/en/unit/can) +* Prebuild Binary: m5stack-atoms3-canunit-all.bin +* Build Define: BOARD_M5ATOMS3_CANUNIT +* Power: Via USB + M5 Stick C Canunit ------------------ * Hardware: [M5_StickC+](http://docs.m5stack.com/en/core/m5stickc_plus) + [CAN Unit](http://docs.m5stack.com/en/unit/can) From 9fa55c1edfc85b49379c98cc9f92d95ff2365299 Mon Sep 17 00:00:00 2001 From: free-x Date: Tue, 29 Aug 2023 16:04:06 +0200 Subject: [PATCH 5/6] fixes for atom s3 lite --- platformio.ini | 2 +- tools/99-usb-serial.rules | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index e01cad66..c9d3290e 100644 --- a/platformio.ini +++ b/platformio.ini @@ -69,7 +69,7 @@ lib_deps = ${env.lib_deps} build_flags = -D BOARD_M5ATOMS3_CANUNIT ${env.build_flags} -upload_port = /dev/esp32 +upload_port = /dev/esp32s3 upload_protocol = esptool diff --git a/tools/99-usb-serial.rules b/tools/99-usb-serial.rules index f1f75734..f7fe7fba 100644 --- a/tools/99-usb-serial.rules +++ b/tools/99-usb-serial.rules @@ -1 +1,3 @@ SUBSYSTEM=="tty", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6001", SYMLINK+="esp32" +SUBSYSTEM=="tty", ATTRS{idVendor}=="303a", ATTRS{idProduct}=="1001", SYMLINK+="esp32s3" + From 9178499e48f9ca46d7bc4825fd6a495e93f3fc40 Mon Sep 17 00:00:00 2001 From: free-x Date: Tue, 29 Aug 2023 16:07:19 +0200 Subject: [PATCH 6/6] sync build.os ci with release --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf2c4086..25628754 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04] + os: [ubuntu-latest] runs-on: ${{ matrix.os }} steps: