From a81172d1050272251818b9c1823a2b3cf5d5efa7 Mon Sep 17 00:00:00 2001 From: Tinyu <Tinyu.Zhao@gmail.com> Date: Tue, 9 Aug 2022 16:28:23 +0800 Subject: [PATCH 1/5] Create M5Station pins_arduino.h --- variants/m5stack_station/pins_arduino.h | 58 +++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 variants/m5stack_station/pins_arduino.h diff --git a/variants/m5stack_station/pins_arduino.h b/variants/m5stack_station/pins_arduino.h new file mode 100644 index 00000000000..5a84c6f8a04 --- /dev/null +++ b/variants/m5stack_station/pins_arduino.h @@ -0,0 +1,58 @@ +#ifndef Pins_Arduino_h +#define Pins_Arduino_h + +#include <stdint.h> + +#define EXTERNAL_NUM_INTERRUPTS 16 +#define NUM_DIGITAL_PINS 20 +#define NUM_ANALOG_INPUTS 16 + +#define analogInputToDigitalPin(p) (((p) < 20) ? (esp32_adc2gpio[(p)]) : -1) +#define digitalPinToInterrupt(p) (((p) < 40) ? (p) : -1) +#define digitalPinHasPWM(p) (p < 34) + +static const uint8_t TX = 1; +static const uint8_t RX = 3; + +static const uint8_t TXD1 14; +static const uint8_t RXD1 13; + +static const uint8_t TXD2 17; +static const uint8_t RXD2 16; + +static const uint8_t SDA = 32; +static const uint8_t SCL = 33; + +static const uint8_t SS = 5; +static const uint8_t MOSI = 23; +static const uint8_t MISO = -1; +static const uint8_t SCK = 18; + +static const uint8_t G1 = 1; +static const uint8_t G3 = 3; +static const uint8_t G4 = 4; +static const uint8_t G5 = 5; +static const uint8_t G13 = 13; +static const uint8_t G14 = 14; +static const uint8_t G16 = 16; +static const uint8_t G17 = 17; +static const uint8_t G18 = 18; +static const uint8_t G19 = 19; +static const uint8_t G23 = 23; +static const uint8_t G25 = 25; +static const uint8_t G26 = 26; +static const uint8_t G32 = 32; +static const uint8_t G33 = 33; +static const uint8_t G35 = 35; +static const uint8_t G36 = 36; +static const uint8_t G37 = 37; +static const uint8_t G38 = 38; +static const uint8_t G39 = 39; + +static const uint8_t DAC1 = 25; +static const uint8_t DAC2 = 26; + +static const uint8_t ADC1 = 35; +static const uint8_t ADC2 = 36; + +#endif /* Pins_Arduino_h */ From a1f3c6ca92700a195ea5e1081e1e1fd5a2008f13 Mon Sep 17 00:00:00 2001 From: Tinyu <Tinyu.Zhao@gmail.com> Date: Tue, 9 Aug 2022 17:01:39 +0800 Subject: [PATCH 2/5] Update pins_arduino.h --- variants/m5stack_station/pins_arduino.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/variants/m5stack_station/pins_arduino.h b/variants/m5stack_station/pins_arduino.h index 5a84c6f8a04..2cee4ee8b34 100644 --- a/variants/m5stack_station/pins_arduino.h +++ b/variants/m5stack_station/pins_arduino.h @@ -14,11 +14,11 @@ static const uint8_t TX = 1; static const uint8_t RX = 3; -static const uint8_t TXD1 14; -static const uint8_t RXD1 13; +static const uint8_t TXD1 = 14; +static const uint8_t RXD1 = 13; -static const uint8_t TXD2 17; -static const uint8_t RXD2 16; +static const uint8_t TXD2 = 17; +static const uint8_t RXD2 = 16; static const uint8_t SDA = 32; static const uint8_t SCL = 33; From 4a4ccbf8bc98104b036b749583bc4e0eb660d3d1 Mon Sep 17 00:00:00 2001 From: Tinyu <Tinyu.Zhao@gmail.com> Date: Wed, 10 Aug 2022 12:16:17 +0800 Subject: [PATCH 3/5] Update boards.txt --- boards.txt | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/boards.txt b/boards.txt index b5af18a0c9f..5e4dcf7f5cb 100644 --- a/boards.txt +++ b/boards.txt @@ -9895,6 +9895,91 @@ m5stack-fire.menu.DebugLevel.verbose.build.code_debug=5 ############################################################## +m5stack-station.name=M5Stack-Station + +m5stack-station.bootloader.tool=esptool_py +m5stack-station.bootloader.tool.default=esptool_py + +m5stack-station.upload.tool=esptool_py +m5stack-station.upload.tool.default=esptool_py +m5stack-station.upload.tool.network=esp_ota + +m5stack-core2.upload.maximum_size=6553600 +m5stack-core2.upload.maximum_data_size=4521984 +m5stack-station.upload.flags= +m5stack-station.upload.extra_flags= + +m5stack-station.serial.disableDTR=true +m5stack-station.serial.disableRTS=true + +m5stack-station.build.tarch=xtensa +m5stack-station.build.bootloader_addr=0x1000 +m5stack-station.build.target=esp32 +m5stack-station.build.mcu=esp32 +m5stack-station.build.core=esp32 +m5stack-station.build.variant=m5stack_station +m5stack-station.build.board=M5Stack_Station + +m5stack-station.build.f_cpu=240000000L +m5stack-station.build.flash_size=16MB +m5stack-station.build.flash_freq=80m +m5stack-station.build.flash_mode=dio +m5stack-station.build.boot=dio +m5stack-station.build.partitions=default_16MB +m5stack-station.build.defines= + +m5stack-station.menu.PartitionScheme.default=Default +m5stack-station.menu.PartitionScheme.default.build.partitions=default_16MB +m5stack-station.menu.PartitionScheme.no_ota=No OTA (Large APP) +m5stack-station.menu.PartitionScheme.no_ota.build.partitions=no_ota +m5stack-station.menu.PartitionScheme.no_ota.upload.maximum_size=6553600 +m5stack-station.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA) +m5stack-station.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs +m5stack-station.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 + +m5stack-station.menu.CPUFreq.240=240MHz (WiFi/BT) +m5stack-station.menu.CPUFreq.240.build.f_cpu=240000000L +m5stack-station.menu.CPUFreq.160=160MHz (WiFi/BT) +m5stack-station.menu.CPUFreq.160.build.f_cpu=160000000L +m5stack-station.menu.CPUFreq.80=80MHz (WiFi/BT) +m5stack-station.menu.CPUFreq.80.build.f_cpu=80000000L +m5stack-station.menu.CPUFreq.40=40MHz (40MHz XTAL) +m5stack-station.menu.CPUFreq.40.build.f_cpu=40000000L +m5stack-station.menu.CPUFreq.26=26MHz (26MHz XTAL) +m5stack-station.menu.CPUFreq.26.build.f_cpu=26000000L +m5stack-station.menu.CPUFreq.20=20MHz (40MHz XTAL) +m5stack-station.menu.CPUFreq.20.build.f_cpu=20000000L +m5stack-station.menu.CPUFreq.13=13MHz (26MHz XTAL) +m5stack-station.menu.CPUFreq.13.build.f_cpu=13000000L +m5stack-station.menu.CPUFreq.10=10MHz (40MHz XTAL) +m5stack-station.menu.CPUFreq.10.build.f_cpu=10000000L + +m5stack-station.menu.UploadSpeed.1500000=1500000 +m5stack-station.menu.UploadSpeed.1500000.upload.speed=1500000 +m5stack-station.menu.UploadSpeed.750000=750000 +m5stack-station.menu.UploadSpeed.750000.upload.speed=750000 +m5stack-station.menu.UploadSpeed.500000=500000 +m5stack-station.menu.UploadSpeed.500000.upload.speed=500000 +m5stack-station.menu.UploadSpeed.250000=250000 +m5stack-station.menu.UploadSpeed.250000.upload.speed=250000 +m5stack-station.menu.UploadSpeed.115200=115200 +m5stack-station.menu.UploadSpeed.115200.upload.speed=115200 + +m5stack-station.menu.DebugLevel.none=None +m5stack-station.menu.DebugLevel.none.build.code_debug=0 +m5stack-station.menu.DebugLevel.error=Error +m5stack-station.menu.DebugLevel.error.build.code_debug=1 +m5stack-station.menu.DebugLevel.warn=Warn +m5stack-station.menu.DebugLevel.warn.build.code_debug=2 +m5stack-station.menu.DebugLevel.info=Info +m5stack-station.menu.DebugLevel.info.build.code_debug=3 +m5stack-station.menu.DebugLevel.debug=Debug +m5stack-station.menu.DebugLevel.debug.build.code_debug=4 +m5stack-station.menu.DebugLevel.verbose=Verbose +m5stack-station.menu.DebugLevel.verbose.build.code_debug=5 + +############################################################## + m5stick-c.name=M5Stick-C m5stick-c.bootloader.tool=esptool_py From 2722070c1e3f146fd2249e8042ae3874c0ed99f8 Mon Sep 17 00:00:00 2001 From: Tinyu <Tinyu.Zhao@gmail.com> Date: Mon, 15 Aug 2022 19:20:55 +0800 Subject: [PATCH 4/5] add EraseFlash menu option --- boards.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/boards.txt b/boards.txt index 5e4dcf7f5cb..fcde37ea8bc 100644 --- a/boards.txt +++ b/boards.txt @@ -9978,6 +9978,11 @@ m5stack-station.menu.DebugLevel.debug.build.code_debug=4 m5stack-station.menu.DebugLevel.verbose=Verbose m5stack-station.menu.DebugLevel.verbose.build.code_debug=5 +m5stack-station.menu.EraseFlash.none=Disabled +m5stack-station.menu.EraseFlash.none.upload.erase_cmd= +m5stack-station.menu.EraseFlash.all=Enabled +m5stack-station.menu.EraseFlash.all.upload.erase_cmd=-e + ############################################################## m5stick-c.name=M5Stick-C From a0e7c8f411f1fd4a4fb30ed613daf3e25a6792a2 Mon Sep 17 00:00:00 2001 From: Tinyu <Tinyu.Zhao@gmail.com> Date: Mon, 15 Aug 2022 22:18:11 +0800 Subject: [PATCH 5/5] Update boards.txt --- boards.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boards.txt b/boards.txt index 6d8889c2cf9..de34e530f84 100644 --- a/boards.txt +++ b/boards.txt @@ -9925,8 +9925,8 @@ m5stack-station.upload.tool=esptool_py m5stack-station.upload.tool.default=esptool_py m5stack-station.upload.tool.network=esp_ota -m5stack-core2.upload.maximum_size=6553600 -m5stack-core2.upload.maximum_data_size=4521984 +m5stack-station.upload.maximum_size=6553600 +m5stack-station.upload.maximum_data_size=4521984 m5stack-station.upload.flags= m5stack-station.upload.extra_flags=