From 8bbc39eb4946255412530bc9f139dc63a8367134 Mon Sep 17 00:00:00 2001 From: CornyjK Date: Mon, 18 Jun 2018 22:35:51 +0200 Subject: [PATCH 1/7] Initial support for ALKS variant --- boards.txt | 87 ++++++++++++++++++++++++++++++++++++ variants/alks/pins_arduino.h | 80 +++++++++++++++++++++++++++++++++ 2 files changed, 167 insertions(+) create mode 100644 variants/alks/pins_arduino.h diff --git a/boards.txt b/boards.txt index 74487600649..1d383db7119 100644 --- a/boards.txt +++ b/boards.txt @@ -1640,3 +1640,90 @@ CoreESP32.menu.UploadSpeed.460800.macosx=460800 CoreESP32.menu.UploadSpeed.460800.upload.speed=460800 CoreESP32.menu.UploadSpeed.512000.windows=512000 CoreESP32.menu.UploadSpeed.512000.upload.speed=512000 + +############################################################## + +esp32.name=ArduinoLearningKitStarter + +esp32.upload.tool=esptool +esp32.upload.maximum_size=1310720 +esp32.upload.maximum_data_size=294912 +esp32.upload.wait_for_upload_port=true + +esp32.serial.disableDTR=true +esp32.serial.disableRTS=true + +esp32.build.mcu=esp32 +esp32.build.core=esp32 +esp32.build.variant=alks +esp32.build.board=ALKS + +esp32.build.f_cpu=240000000L +esp32.build.flash_size=4MB +esp32.build.flash_freq=40m +esp32.build.flash_mode=dio +esp32.build.boot=dio +esp32.build.partitions=default + +esp32.menu.PartitionScheme.default=Default +esp32.menu.PartitionScheme.default.build.partitions=default +esp32.menu.PartitionScheme.minimal=Minimal (2MB FLASH) +esp32.menu.PartitionScheme.minimal.build.partitions=minimal +esp32.menu.PartitionScheme.no_ota=No OTA (Large APP) +esp32.menu.PartitionScheme.no_ota.build.partitions=no_ota +esp32.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 +esp32.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA) +esp32.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs +esp32.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 + +esp32.menu.FlashMode.qio=QIO +esp32.menu.FlashMode.qio.build.flash_mode=dio +esp32.menu.FlashMode.qio.build.boot=qio +esp32.menu.FlashMode.dio=DIO +esp32.menu.FlashMode.dio.build.flash_mode=dio +esp32.menu.FlashMode.dio.build.boot=dio +esp32.menu.FlashMode.qout=QOUT +esp32.menu.FlashMode.qout.build.flash_mode=dout +esp32.menu.FlashMode.qout.build.boot=qout +esp32.menu.FlashMode.dout=DOUT +esp32.menu.FlashMode.dout.build.flash_mode=dout +esp32.menu.FlashMode.dout.build.boot=dout + +esp32.menu.FlashFreq.80=80MHz +esp32.menu.FlashFreq.80.build.flash_freq=80m +esp32.menu.FlashFreq.40=40MHz +esp32.menu.FlashFreq.40.build.flash_freq=40m + +esp32.menu.FlashSize.4M=4MB (32Mb) +esp32.menu.FlashSize.4M.build.flash_size=4MB +esp32.menu.FlashSize.2M=2MB (16Mb) +esp32.menu.FlashSize.2M.build.flash_size=2MB +esp32.menu.FlashSize.2M.build.partitions=minimal + +esp32.menu.UploadSpeed.921600=921600 +esp32.menu.UploadSpeed.921600.upload.speed=921600 +esp32.menu.UploadSpeed.115200=115200 +esp32.menu.UploadSpeed.115200.upload.speed=115200 +esp32.menu.UploadSpeed.256000.windows=256000 +esp32.menu.UploadSpeed.256000.upload.speed=256000 +esp32.menu.UploadSpeed.230400.windows.upload.speed=256000 +esp32.menu.UploadSpeed.230400=230400 +esp32.menu.UploadSpeed.230400.upload.speed=230400 +esp32.menu.UploadSpeed.460800.linux=460800 +esp32.menu.UploadSpeed.460800.macosx=460800 +esp32.menu.UploadSpeed.460800.upload.speed=460800 +esp32.menu.UploadSpeed.512000.windows=512000 +esp32.menu.UploadSpeed.512000.upload.speed=512000 + +esp32.menu.DebugLevel.none=None +esp32.menu.DebugLevel.none.build.code_debug=0 +esp32.menu.DebugLevel.error=Error +esp32.menu.DebugLevel.error.build.code_debug=1 +esp32.menu.DebugLevel.warn=Warn +esp32.menu.DebugLevel.warn.build.code_debug=2 +esp32.menu.DebugLevel.info=Info +esp32.menu.DebugLevel.info.build.code_debug=3 +esp32.menu.DebugLevel.debug=Debug +esp32.menu.DebugLevel.debug.build.code_debug=4 +esp32.menu.DebugLevel.verbose=Verbose +esp32.menu.DebugLevel.verbose.build.code_debug=5 \ No newline at end of file diff --git a/variants/alks/pins_arduino.h b/variants/alks/pins_arduino.h new file mode 100644 index 00000000000..56d963855b4 --- /dev/null +++ b/variants/alks/pins_arduino.h @@ -0,0 +1,80 @@ +#ifndef Pins_Arduino_h +#define Pins_Arduino_h + +#include + +#define EXTERNAL_NUM_INTERRUPTS 16 +#define NUM_DIGITAL_PINS 40 +#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 D0 = 40; +static const uint8_t D1 = 41; +static const uint8_t D2 = 15; +static const uint8_t D3 = 2; +static const uint8_t D4 = 0; +static const uint8_t D5 = 4; +static const uint8_t D6 = 16; +static const uint8_t D7 = 17; +static const uint8_t D8 = 5; +static const uint8_t D9 = 18; +static const uint8_t D10 = 19; +static const uint8_t D11 = 21; +static const uint8_t D12 = 22; +static const uint8_t D13 = 23; + +static const uint8_t A0 = 32; +static const uint8_t A1 = 33; +static const uint8_t A2 = 25; +static const uint8_t A3 = 26; +static const uint8_t A4 = 27; +static const uint8_t A5 = 14; +static const uint8_t A6 = 12; +static const uint8_t A7 = 15; + +static const uint8_t L_R = 22; +static const uint8_t L_G = 17; +static const uint8_t L_Y = 23; +static const uint8_t L_B = 5; +static const uint8_t L_RGB_R = 4; +static const uint8_t L_RGB_G = 21; +static const uint8_t L_RGB_B = 16; + +static const uint8_t SW1 = 15; +static const uint8_t SW2 = 2; +static const uint8_t SW3 = 0; + +static const uint8_t POT1 = 32; +static const uint8_t POT2 = 33; + +static const uint8_t PIEZO1 = 19; +static const uint8_t PIEZO2 = 18; + +static const uint8_t PHOTO = 25; + +static const uint8_t DHT_PIN = 26; + +static const uint8_t S1 = 4; +static const uint8_t S2 = 16; +static const uint8_t S3 = 18; +static const uint8_t S4 = 19; +static const uint8_t S5 = 21; + +static const uint8_t SDA = 27; +static const uint8_t SCL = 14; + +static const uint8_t SS = 19; +static const uint8_t MOSI = 21; +static const uint8_t MISO = 22; +static const uint8_t SCK = 23; + +static const uint8_t DAC1 = 25; +static const uint8_t DAC2 = 26; + +#endif /* Pins_Arduino_h */ \ No newline at end of file From 87d57b3cd915e3584432430c78e5be36fce5077a Mon Sep 17 00:00:00 2001 From: CornyjK Date: Mon, 18 Jun 2018 22:48:53 +0200 Subject: [PATCH 2/7] Fix --- boards.txt | 168 ++++++++++---------- variants/{alks => alksesp32}/pins_arduino.h | 0 2 files changed, 84 insertions(+), 84 deletions(-) rename variants/{alks => alksesp32}/pins_arduino.h (100%) diff --git a/boards.txt b/boards.txt index 1d383db7119..0b418e061fd 100644 --- a/boards.txt +++ b/boards.txt @@ -1643,87 +1643,87 @@ CoreESP32.menu.UploadSpeed.512000.upload.speed=512000 ############################################################## -esp32.name=ArduinoLearningKitStarter - -esp32.upload.tool=esptool -esp32.upload.maximum_size=1310720 -esp32.upload.maximum_data_size=294912 -esp32.upload.wait_for_upload_port=true - -esp32.serial.disableDTR=true -esp32.serial.disableRTS=true - -esp32.build.mcu=esp32 -esp32.build.core=esp32 -esp32.build.variant=alks -esp32.build.board=ALKS - -esp32.build.f_cpu=240000000L -esp32.build.flash_size=4MB -esp32.build.flash_freq=40m -esp32.build.flash_mode=dio -esp32.build.boot=dio -esp32.build.partitions=default - -esp32.menu.PartitionScheme.default=Default -esp32.menu.PartitionScheme.default.build.partitions=default -esp32.menu.PartitionScheme.minimal=Minimal (2MB FLASH) -esp32.menu.PartitionScheme.minimal.build.partitions=minimal -esp32.menu.PartitionScheme.no_ota=No OTA (Large APP) -esp32.menu.PartitionScheme.no_ota.build.partitions=no_ota -esp32.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 -esp32.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA) -esp32.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs -esp32.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 - -esp32.menu.FlashMode.qio=QIO -esp32.menu.FlashMode.qio.build.flash_mode=dio -esp32.menu.FlashMode.qio.build.boot=qio -esp32.menu.FlashMode.dio=DIO -esp32.menu.FlashMode.dio.build.flash_mode=dio -esp32.menu.FlashMode.dio.build.boot=dio -esp32.menu.FlashMode.qout=QOUT -esp32.menu.FlashMode.qout.build.flash_mode=dout -esp32.menu.FlashMode.qout.build.boot=qout -esp32.menu.FlashMode.dout=DOUT -esp32.menu.FlashMode.dout.build.flash_mode=dout -esp32.menu.FlashMode.dout.build.boot=dout - -esp32.menu.FlashFreq.80=80MHz -esp32.menu.FlashFreq.80.build.flash_freq=80m -esp32.menu.FlashFreq.40=40MHz -esp32.menu.FlashFreq.40.build.flash_freq=40m - -esp32.menu.FlashSize.4M=4MB (32Mb) -esp32.menu.FlashSize.4M.build.flash_size=4MB -esp32.menu.FlashSize.2M=2MB (16Mb) -esp32.menu.FlashSize.2M.build.flash_size=2MB -esp32.menu.FlashSize.2M.build.partitions=minimal - -esp32.menu.UploadSpeed.921600=921600 -esp32.menu.UploadSpeed.921600.upload.speed=921600 -esp32.menu.UploadSpeed.115200=115200 -esp32.menu.UploadSpeed.115200.upload.speed=115200 -esp32.menu.UploadSpeed.256000.windows=256000 -esp32.menu.UploadSpeed.256000.upload.speed=256000 -esp32.menu.UploadSpeed.230400.windows.upload.speed=256000 -esp32.menu.UploadSpeed.230400=230400 -esp32.menu.UploadSpeed.230400.upload.speed=230400 -esp32.menu.UploadSpeed.460800.linux=460800 -esp32.menu.UploadSpeed.460800.macosx=460800 -esp32.menu.UploadSpeed.460800.upload.speed=460800 -esp32.menu.UploadSpeed.512000.windows=512000 -esp32.menu.UploadSpeed.512000.upload.speed=512000 - -esp32.menu.DebugLevel.none=None -esp32.menu.DebugLevel.none.build.code_debug=0 -esp32.menu.DebugLevel.error=Error -esp32.menu.DebugLevel.error.build.code_debug=1 -esp32.menu.DebugLevel.warn=Warn -esp32.menu.DebugLevel.warn.build.code_debug=2 -esp32.menu.DebugLevel.info=Info -esp32.menu.DebugLevel.info.build.code_debug=3 -esp32.menu.DebugLevel.debug=Debug -esp32.menu.DebugLevel.debug.build.code_debug=4 -esp32.menu.DebugLevel.verbose=Verbose -esp32.menu.DebugLevel.verbose.build.code_debug=5 \ No newline at end of file +alksesp32.name=ALKS ESP32 + +alksesp32.upload.tool=esptool +alksesp32.upload.maximum_size=1310720 +alksesp32.upload.maximum_data_size=294912 +alksesp32.upload.wait_for_upload_port=true + +alksesp32.serial.disableDTR=true +alksesp32.serial.disableRTS=true + +alksesp32.build.mcu=esp32 +alksesp32.build.core=esp32 +alksesp32.build.variant=alksesp32 +alksesp32.build.board=ALKS + +alksesp32.build.f_cpu=240000000L +alksesp32.build.flash_size=4MB +alksesp32.build.flash_freq=40m +alksesp32.build.flash_mode=dio +alksesp32.build.boot=dio +alksesp32.build.partitions=default + +alksesp32.menu.PartitionScheme.default=Default +alksesp32.menu.PartitionScheme.default.build.partitions=default +alksesp32.menu.PartitionScheme.minimal=Minimal (2MB FLASH) +alksesp32.menu.PartitionScheme.minimal.build.partitions=minimal +alksesp32.menu.PartitionScheme.no_ota=No OTA (Large APP) +alksesp32.menu.PartitionScheme.no_ota.build.partitions=no_ota +alksesp32.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 +alksesp32.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA) +alksesp32.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs +alksesp32.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 + +alksesp32.menu.FlashMode.qio=QIO +alksesp32.menu.FlashMode.qio.build.flash_mode=dio +alksesp32.menu.FlashMode.qio.build.boot=qio +alksesp32.menu.FlashMode.dio=DIO +alksesp32.menu.FlashMode.dio.build.flash_mode=dio +alksesp32.menu.FlashMode.dio.build.boot=dio +alksesp32.menu.FlashMode.qout=QOUT +alksesp32.menu.FlashMode.qout.build.flash_mode=dout +alksesp32.menu.FlashMode.qout.build.boot=qout +alksesp32.menu.FlashMode.dout=DOUT +alksesp32.menu.FlashMode.dout.build.flash_mode=dout +alksesp32.menu.FlashMode.dout.build.boot=dout + +alksesp32.menu.FlashFreq.80=80MHz +alksesp32.menu.FlashFreq.80.build.flash_freq=80m +alksesp32.menu.FlashFreq.40=40MHz +alksesp32.menu.FlashFreq.40.build.flash_freq=40m + +alksesp32.menu.FlashSize.4M=4MB (32Mb) +alksesp32.menu.FlashSize.4M.build.flash_size=4MB +alksesp32.menu.FlashSize.2M=2MB (16Mb) +alksesp32.menu.FlashSize.2M.build.flash_size=2MB +alksesp32.menu.FlashSize.2M.build.partitions=minimal + +alksesp32.menu.UploadSpeed.921600=921600 +alksesp32.menu.UploadSpeed.921600.upload.speed=921600 +alksesp32.menu.UploadSpeed.115200=115200 +alksesp32.menu.UploadSpeed.115200.upload.speed=115200 +alksesp32.menu.UploadSpeed.256000.windows=256000 +alksesp32.menu.UploadSpeed.256000.upload.speed=256000 +alksesp32.menu.UploadSpeed.230400.windows.upload.speed=256000 +alksesp32.menu.UploadSpeed.230400=230400 +alksesp32.menu.UploadSpeed.230400.upload.speed=230400 +alksesp32.menu.UploadSpeed.460800.linux=460800 +alksesp32.menu.UploadSpeed.460800.macosx=460800 +alksesp32.menu.UploadSpeed.460800.upload.speed=460800 +alksesp32.menu.UploadSpeed.512000.windows=512000 +alksesp32.menu.UploadSpeed.512000.upload.speed=512000 + +alksesp32.menu.DebugLevel.none=None +alksesp32.menu.DebugLevel.none.build.code_debug=0 +alksesp32.menu.DebugLevel.error=Error +alksesp32.menu.DebugLevel.error.build.code_debug=1 +alksesp32.menu.DebugLevel.warn=Warn +alksesp32.menu.DebugLevel.warn.build.code_debug=2 +alksesp32.menu.DebugLevel.info=Info +alksesp32.menu.DebugLevel.info.build.code_debug=3 +alksesp32.menu.DebugLevel.debug=Debug +alksesp32.menu.DebugLevel.debug.build.code_debug=4 +alksesp32.menu.DebugLevel.verbose=Verbose +alksesp32.menu.DebugLevel.verbose.build.code_debug=5 \ No newline at end of file diff --git a/variants/alks/pins_arduino.h b/variants/alksesp32/pins_arduino.h similarity index 100% rename from variants/alks/pins_arduino.h rename to variants/alksesp32/pins_arduino.h From a47935420df39a3a6aad6970a3f781f04b5e7dcb Mon Sep 17 00:00:00 2001 From: CornyjK Date: Mon, 18 Jun 2018 22:54:26 +0200 Subject: [PATCH 3/7] Add library hook --- variants/alksesp32/pins_arduino.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/variants/alksesp32/pins_arduino.h b/variants/alksesp32/pins_arduino.h index 56d963855b4..86c04053390 100644 --- a/variants/alksesp32/pins_arduino.h +++ b/variants/alksesp32/pins_arduino.h @@ -11,6 +11,8 @@ #define digitalPinToInterrupt(p) (((p)<40)?(p):-1) #define digitalPinHasPWM(p) (p < 34) +#define alksesp32 // for compability reasons with library + static const uint8_t TX = 1; static const uint8_t RX = 3; From afce32e3f60a50690a33d65c3399178b236f8d32 Mon Sep 17 00:00:00 2001 From: CornyjK Date: Sat, 23 Jun 2018 11:25:26 +0200 Subject: [PATCH 4/7] Improvement --- variants/alksesp32/pins_arduino.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variants/alksesp32/pins_arduino.h b/variants/alksesp32/pins_arduino.h index 86c04053390..71b50179fd0 100644 --- a/variants/alksesp32/pins_arduino.h +++ b/variants/alksesp32/pins_arduino.h @@ -11,7 +11,7 @@ #define digitalPinToInterrupt(p) (((p)<40)?(p):-1) #define digitalPinHasPWM(p) (p < 34) -#define alksesp32 // for compability reasons with library +#define ALKSESP32 // for compability reasons with library static const uint8_t TX = 1; static const uint8_t RX = 3; From 4591fd6d23bf85413fccf56744535b5f8f8755f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kry=C5=A1tof=20=C4=8Cern=C3=BD?= Date: Sat, 23 Jun 2018 12:51:49 +0200 Subject: [PATCH 5/7] Changed description for #define ALKSESP32 --- variants/alksesp32/pins_arduino.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/variants/alksesp32/pins_arduino.h b/variants/alksesp32/pins_arduino.h index 71b50179fd0..540669eca73 100644 --- a/variants/alksesp32/pins_arduino.h +++ b/variants/alksesp32/pins_arduino.h @@ -11,7 +11,7 @@ #define digitalPinToInterrupt(p) (((p)<40)?(p):-1) #define digitalPinHasPWM(p) (p < 34) -#define ALKSESP32 // for compability reasons with library +#define ALKSESP32 // tell library to not map pins again static const uint8_t TX = 1; static const uint8_t RX = 3; @@ -79,4 +79,4 @@ static const uint8_t SCK = 23; static const uint8_t DAC1 = 25; static const uint8_t DAC2 = 26; -#endif /* Pins_Arduino_h */ \ No newline at end of file +#endif /* Pins_Arduino_h */ From e872c037dfb0529616f2cec0aeab73a714f9680a Mon Sep 17 00:00:00 2001 From: CornyjK Date: Fri, 6 Jul 2018 20:59:55 +0200 Subject: [PATCH 6/7] Update --- boards.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/boards.txt b/boards.txt index 0b418e061fd..e65d5da4118 100644 --- a/boards.txt +++ b/boards.txt @@ -1647,7 +1647,7 @@ alksesp32.name=ALKS ESP32 alksesp32.upload.tool=esptool alksesp32.upload.maximum_size=1310720 -alksesp32.upload.maximum_data_size=294912 +alksesp32.upload.maximum_data_size=327680 alksesp32.upload.wait_for_upload_port=true alksesp32.serial.disableDTR=true @@ -1664,6 +1664,12 @@ alksesp32.build.flash_freq=40m alksesp32.build.flash_mode=dio alksesp32.build.boot=dio alksesp32.build.partitions=default +esp32.build.defines= + +alksesp32.menu.PSRAM.disabled=Disabled +alksesp32.menu.PSRAM.disabled.build.defines= +alksesp32.menu.PSRAM.enabled=Enabled +alksesp32.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue alksesp32.menu.PartitionScheme.default=Default alksesp32.menu.PartitionScheme.default.build.partitions=default From 0296fafa515fd46641d3c56042a6f14182de9aeb Mon Sep 17 00:00:00 2001 From: CornyjK Date: Sun, 15 Jul 2018 17:49:49 +0200 Subject: [PATCH 7/7] Typo fix --- boards.txt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/boards.txt b/boards.txt index e65d5da4118..d4f946387a3 100644 --- a/boards.txt +++ b/boards.txt @@ -1664,12 +1664,7 @@ alksesp32.build.flash_freq=40m alksesp32.build.flash_mode=dio alksesp32.build.boot=dio alksesp32.build.partitions=default -esp32.build.defines= - -alksesp32.menu.PSRAM.disabled=Disabled -alksesp32.menu.PSRAM.disabled.build.defines= -alksesp32.menu.PSRAM.enabled=Enabled -alksesp32.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue +alksesp32.build.defines= alksesp32.menu.PartitionScheme.default=Default alksesp32.menu.PartitionScheme.default.build.partitions=default