From 1a52202d3bc4a0dd9702597b528d5dbb86d0f192 Mon Sep 17 00:00:00 2001 From: ketri-kjy Date: Wed, 27 Jan 2021 08:40:26 +0900 Subject: [PATCH 01/11] etboard pinmap upload --- variants/ET_Board/pins_arduino.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 variants/ET_Board/pins_arduino.h diff --git a/variants/ET_Board/pins_arduino.h b/variants/ET_Board/pins_arduino.h new file mode 100644 index 00000000000..1da17e726e4 --- /dev/null +++ b/variants/ET_Board/pins_arduino.h @@ -0,0 +1,20 @@ +// #include "pinmap.h" + +#define A0 36 // Potentiometer +#define A1 39 // CDS +#define A2 32 // temp +#define A3 33 // InPut +#define A4 34 // InPut +#define A5 35 // InPut +#define A6 25 // InPut +#define A7 26 // InPut + + +#define D2 27 // LED_Red +#define D3 14 // LED_Blue +#define D4 12 // LED_Green +#define D5 13 // LED_Yellow +#define D6 15 // BUTTON_Red +#define D7 16 // BUTTON_Blue +#define D8 17 // BUTTON_Green +#define D9 4 // BUTTON_Yellow \ No newline at end of file From a76a6342ac9bd3718ec28fc85c39d5e11d05c575 Mon Sep 17 00:00:00 2001 From: ketri2484 Date: Wed, 3 Feb 2021 12:17:34 +0900 Subject: [PATCH 02/11] boards.txt --- boards.txt | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/boards.txt b/boards.txt index c209235bb3b..74fc09a780f 100644 --- a/boards.txt +++ b/boards.txt @@ -5854,3 +5854,69 @@ healthypi4.menu.DebugLevel.debug=Debug healthypi4.menu.DebugLevel.debug.build.code_debug=4 healthypi4.menu.DebugLevel.verbose=Verbose healthypi4.menu.DebugLevel.verbose.build.code_debug=5 + +############################################################## + + +etboard.name=ET-Board + +etboard.upload.tool=esptool_py +etboard.upload.maximum_size=1310720 +etboard.upload.maximum_data_size=327680 +etboard.upload.wait_for_upload_port=true + +etboard.serial.disableDTR=true +etboard.serial.disableRTS=true + +etboard.build.mcu=esp32 +etboard.build.core=esp32 +etboard.build.variant=ETboard +etboard.build.board=ETboard +etboard.build.f_cpu=240000000L +etboard.build.flash_mode=dio +etboard.build.flash_size=4MB +etboard.build.boot=dio +etboard.build.partitions=default +etboard.build.defines= + +etboard.menu.PartitionScheme.default=Default +etboard.menu.PartitionScheme.default.build.partitions=default +etboard.menu.PartitionScheme.no_ota=No OTA (Large APP) +etboard.menu.PartitionScheme.no_ota.build.partitions=no_ota +etboard.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 +etboard.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA) +etboard.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs +etboard.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 + +etboard.menu.FlashFreq.80=80MHz +etboard.menu.FlashFreq.80.build.flash_freq=80m +etboard.menu.FlashFreq.40=40MHz +etboard.menu.FlashFreq.40.build.flash_freq=40m + +etboard.menu.UploadSpeed.921600=921600 +etboard.menu.UploadSpeed.921600.upload.speed=921600 +etboard.menu.UploadSpeed.115200=115200 +etboard.menu.UploadSpeed.115200.upload.speed=115200 +etboard.menu.UploadSpeed.256000.windows=256000 +etboard.menu.UploadSpeed.256000.upload.speed=256000 +etboard.menu.UploadSpeed.230400.windows.upload.speed=256000 +etboard.menu.UploadSpeed.230400=230400 +etboard.menu.UploadSpeed.230400.upload.speed=230400 +etboard.menu.UploadSpeed.460800.linux=460800 +etboard.menu.UploadSpeed.460800.macosx=460800 +etboard.menu.UploadSpeed.460800.upload.speed=460800 +etboard.menu.UploadSpeed.512000.windows=512000 +etboard.menu.UploadSpeed.512000.upload.speed=512000 + +etboard.menu.DebugLevel.none=None +etboard.menu.DebugLevel.none.build.code_debug=0 +etboard.menu.DebugLevel.error=Error +etboard.menu.DebugLevel.error.build.code_debug=1 +etboard.menu.DebugLevel.warn=Warn +etboard.menu.DebugLevel.warn.build.code_debug=2 +etboard.menu.DebugLevel.info=Info +etboard.menu.DebugLevel.info.build.code_debug=3 +etboard.menu.DebugLevel.debug=Debug +etboard.menu.DebugLevel.debug.build.code_debug=4 +etboard.menu.DebugLevel.verbose=Verbose +etboard.menu.DebugLevel.verbose.build.code_debug=5 \ No newline at end of file From bc9e9d99eb51afd03ab6028fe4f04ab0fea06bed Mon Sep 17 00:00:00 2001 From: ketri2484 Date: Wed, 3 Feb 2021 12:20:09 +0900 Subject: [PATCH 03/11] boards.txt --- boards.txt | 124 ++++++++++++++++++++++++++--------------------------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/boards.txt b/boards.txt index 74fc09a780f..ac8fa4bc864 100644 --- a/boards.txt +++ b/boards.txt @@ -5858,65 +5858,65 @@ healthypi4.menu.DebugLevel.verbose.build.code_debug=5 ############################################################## -etboard.name=ET-Board - -etboard.upload.tool=esptool_py -etboard.upload.maximum_size=1310720 -etboard.upload.maximum_data_size=327680 -etboard.upload.wait_for_upload_port=true - -etboard.serial.disableDTR=true -etboard.serial.disableRTS=true - -etboard.build.mcu=esp32 -etboard.build.core=esp32 -etboard.build.variant=ETboard -etboard.build.board=ETboard -etboard.build.f_cpu=240000000L -etboard.build.flash_mode=dio -etboard.build.flash_size=4MB -etboard.build.boot=dio -etboard.build.partitions=default -etboard.build.defines= - -etboard.menu.PartitionScheme.default=Default -etboard.menu.PartitionScheme.default.build.partitions=default -etboard.menu.PartitionScheme.no_ota=No OTA (Large APP) -etboard.menu.PartitionScheme.no_ota.build.partitions=no_ota -etboard.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 -etboard.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA) -etboard.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs -etboard.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 - -etboard.menu.FlashFreq.80=80MHz -etboard.menu.FlashFreq.80.build.flash_freq=80m -etboard.menu.FlashFreq.40=40MHz -etboard.menu.FlashFreq.40.build.flash_freq=40m - -etboard.menu.UploadSpeed.921600=921600 -etboard.menu.UploadSpeed.921600.upload.speed=921600 -etboard.menu.UploadSpeed.115200=115200 -etboard.menu.UploadSpeed.115200.upload.speed=115200 -etboard.menu.UploadSpeed.256000.windows=256000 -etboard.menu.UploadSpeed.256000.upload.speed=256000 -etboard.menu.UploadSpeed.230400.windows.upload.speed=256000 -etboard.menu.UploadSpeed.230400=230400 -etboard.menu.UploadSpeed.230400.upload.speed=230400 -etboard.menu.UploadSpeed.460800.linux=460800 -etboard.menu.UploadSpeed.460800.macosx=460800 -etboard.menu.UploadSpeed.460800.upload.speed=460800 -etboard.menu.UploadSpeed.512000.windows=512000 -etboard.menu.UploadSpeed.512000.upload.speed=512000 - -etboard.menu.DebugLevel.none=None -etboard.menu.DebugLevel.none.build.code_debug=0 -etboard.menu.DebugLevel.error=Error -etboard.menu.DebugLevel.error.build.code_debug=1 -etboard.menu.DebugLevel.warn=Warn -etboard.menu.DebugLevel.warn.build.code_debug=2 -etboard.menu.DebugLevel.info=Info -etboard.menu.DebugLevel.info.build.code_debug=3 -etboard.menu.DebugLevel.debug=Debug -etboard.menu.DebugLevel.debug.build.code_debug=4 -etboard.menu.DebugLevel.verbose=Verbose -etboard.menu.DebugLevel.verbose.build.code_debug=5 \ No newline at end of file +ET-Board.name=ET-Board + +ET-Board.upload.tool=esptool_py +ET-Board.upload.maximum_size=1310720 +ET-Board.upload.maximum_data_size=327680 +ET-Board.upload.wait_for_upload_port=true + +ET-Board.serial.disableDTR=true +ET-Board.serial.disableRTS=true + +ET-Board.build.mcu=esp32 +ET-Board.build.core=esp32 +ET-Board.build.variant=ET-Board +ET-Board.build.board=ET-Board +ET-Board.build.f_cpu=240000000L +ET-Board.build.flash_mode=dio +ET-Board.build.flash_size=4MB +ET-Board.build.boot=dio +ET-Board.build.partitions=default +ET-Board.build.defines= + +ET-Board.menu.PartitionScheme.default=Default +ET-Board.menu.PartitionScheme.default.build.partitions=default +ET-Board.menu.PartitionScheme.no_ota=No OTA (Large APP) +ET-Board.menu.PartitionScheme.no_ota.build.partitions=no_ota +ET-Board.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 +ET-Board.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA) +ET-Board.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs +ET-Board.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 + +ET-Board.menu.FlashFreq.80=80MHz +ET-Board.menu.FlashFreq.80.build.flash_freq=80m +ET-Board.menu.FlashFreq.40=40MHz +ET-Board.menu.FlashFreq.40.build.flash_freq=40m + +ET-Board.menu.UploadSpeed.921600=921600 +ET-Board.menu.UploadSpeed.921600.upload.speed=921600 +ET-Board.menu.UploadSpeed.115200=115200 +ET-Board.menu.UploadSpeed.115200.upload.speed=115200 +ET-Board.menu.UploadSpeed.256000.windows=256000 +ET-Board.menu.UploadSpeed.256000.upload.speed=256000 +ET-Board.menu.UploadSpeed.230400.windows.upload.speed=256000 +ET-Board.menu.UploadSpeed.230400=230400 +ET-Board.menu.UploadSpeed.230400.upload.speed=230400 +ET-Board.menu.UploadSpeed.460800.linux=460800 +ET-Board.menu.UploadSpeed.460800.macosx=460800 +ET-Board.menu.UploadSpeed.460800.upload.speed=460800 +ET-Board.menu.UploadSpeed.512000.windows=512000 +ET-Board.menu.UploadSpeed.512000.upload.speed=512000 + +ET-Board.menu.DebugLevel.none=None +ET-Board.menu.DebugLevel.none.build.code_debug=0 +ET-Board.menu.DebugLevel.error=Error +ET-Board.menu.DebugLevel.error.build.code_debug=1 +ET-Board.menu.DebugLevel.warn=Warn +ET-Board.menu.DebugLevel.warn.build.code_debug=2 +ET-Board.menu.DebugLevel.info=Info +ET-Board.menu.DebugLevel.info.build.code_debug=3 +ET-Board.menu.DebugLevel.debug=Debug +ET-Board.menu.DebugLevel.debug.build.code_debug=4 +ET-Board.menu.DebugLevel.verbose=Verbose +ET-Board.menu.DebugLevel.verbose.build.code_debug=5 \ No newline at end of file From a76092e0bb5762450d3c002b431317e7e6675bc2 Mon Sep 17 00:00:00 2001 From: ketri2484 Date: Thu, 18 Feb 2021 13:13:45 +0900 Subject: [PATCH 04/11] pins_arduino.h --- variants/ET_Board/pins_arduino.h | 67 ++++++++++++++++++++++---------- 1 file changed, 47 insertions(+), 20 deletions(-) diff --git a/variants/ET_Board/pins_arduino.h b/variants/ET_Board/pins_arduino.h index 1da17e726e4..15959459e02 100644 --- a/variants/ET_Board/pins_arduino.h +++ b/variants/ET_Board/pins_arduino.h @@ -1,20 +1,47 @@ -// #include "pinmap.h" - -#define A0 36 // Potentiometer -#define A1 39 // CDS -#define A2 32 // temp -#define A3 33 // InPut -#define A4 34 // InPut -#define A5 35 // InPut -#define A6 25 // InPut -#define A7 26 // InPut - - -#define D2 27 // LED_Red -#define D3 14 // LED_Blue -#define D4 12 // LED_Green -#define D5 13 // LED_Yellow -#define D6 15 // BUTTON_Red -#define D7 16 // BUTTON_Blue -#define D8 17 // BUTTON_Green -#define D9 4 // BUTTON_Yellow \ No newline at end of file +#ifndef Pins_Arduino_h +#define Pins_Arduino_h + +#include + +#define EXTERNAL_NUM_INTERRUPTS 16 +#define NUM_DIGITAL_PINS 40 +#define NUM_ANALOG_INPUTS 7 + +#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 = 34; +static const uint8_t RX = 35; + +static const uint8_t SDA = 33; +static const uint8_t SCL = 36; + +static const uint8_t SS = 29; +static const uint8_t MOSI = 37; +static const uint8_t MISO = 31; +static const uint8_t SCK = 30; + +static const uint8_t A0 36 // BUILTIN_Potentiometer +static const uint8_t A1 39 // BUILTIN_CDS +static const uint8_t A2 32 // BUILTIN_temperature +static const uint8_t A3 33 // Analog Input +static const uint8_t A4 34 // Analog Input +static const uint8_t A5 35 // Analog Input +static const uint8_t A6 25 // Analog Input +static const uint8_t A7 26 // Analog Input + + +static const uint8_t D2 27 // BUILTIN_LED_Red +static const uint8_t D3 14 // BUILTIN_LED_Blue +static const uint8_t D4 12 // BUILTIN_LED_Green +static const uint8_t D5 13 // BUILTIN_LED_Yellow +static const uint8_t D6 15 // BUILTIN_BUTTON_Red +static const uint8_t D7 16 // BUILTIN_BUTTON_Blue +static const uint8_t D8 17 // BUILTIN_BUTTON_Green +static const uint8_t D9 4 // BUILTIN_BUTTON_Yellow + +static const uint8_t DAC1 = 25; +static const uint8_t DAC2 = 26; + +#endif /* Pins_Arduino_h */ \ No newline at end of file From b3d65b496994b927f3b130d315c3a47f018157fe Mon Sep 17 00:00:00 2001 From: ketri2484 Date: Tue, 23 Feb 2021 12:35:39 +0900 Subject: [PATCH 05/11] modify pinsarduino.h --- variants/ET_Board/pins_arduino.h | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/variants/ET_Board/pins_arduino.h b/variants/ET_Board/pins_arduino.h index 15959459e02..d3a106d3042 100644 --- a/variants/ET_Board/pins_arduino.h +++ b/variants/ET_Board/pins_arduino.h @@ -22,24 +22,24 @@ static const uint8_t MOSI = 37; static const uint8_t MISO = 31; static const uint8_t SCK = 30; -static const uint8_t A0 36 // BUILTIN_Potentiometer -static const uint8_t A1 39 // BUILTIN_CDS -static const uint8_t A2 32 // BUILTIN_temperature -static const uint8_t A3 33 // Analog Input -static const uint8_t A4 34 // Analog Input -static const uint8_t A5 35 // Analog Input -static const uint8_t A6 25 // Analog Input -static const uint8_t A7 26 // Analog Input - - -static const uint8_t D2 27 // BUILTIN_LED_Red -static const uint8_t D3 14 // BUILTIN_LED_Blue -static const uint8_t D4 12 // BUILTIN_LED_Green -static const uint8_t D5 13 // BUILTIN_LED_Yellow -static const uint8_t D6 15 // BUILTIN_BUTTON_Red -static const uint8_t D7 16 // BUILTIN_BUTTON_Blue -static const uint8_t D8 17 // BUILTIN_BUTTON_Green -static const uint8_t D9 4 // BUILTIN_BUTTON_Yellow +static const uint8_t A0 = 36 // BUILTIN_Potentiometer +static const uint8_t A1 = 39 // BUILTIN_CDS +static const uint8_t A2 = 32 // BUILTIN_temperature +static const uint8_t A3 = 33 // Analog Input +static const uint8_t A4 = 34 // Analog Input +static const uint8_t A5 = 35 // Analog Input +static const uint8_t A6 = 25 // Analog Input +static const uint8_t A7 = 26 // Analog Input + + +static const uint8_t D2 = 27 // BUILTIN_LED_Red +static const uint8_t D3 = 14 // BUILTIN_LED_Blue +static const uint8_t D4 = 12 // BUILTIN_LED_Green +static const uint8_t D5 = 13 // BUILTIN_LED_Yellow +static const uint8_t D6 = 15 // BUILTIN_BUTTON_Red +static const uint8_t D7 = 16 // BUILTIN_BUTTON_Blue +static const uint8_t D8 = 17 // BUILTIN_BUTTON_Green +static const uint8_t D9 = 4 // BUILTIN_BUTTON_Yellow static const uint8_t DAC1 = 25; static const uint8_t DAC2 = 26; From 257aed0c26e38a60c71848bf3828ebd832a143f2 Mon Sep 17 00:00:00 2001 From: ketri2484 Date: Tue, 23 Feb 2021 12:48:26 +0900 Subject: [PATCH 06/11] modify pins_arduino.h --- variants/ET_Board/pins_arduino.h | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/variants/ET_Board/pins_arduino.h b/variants/ET_Board/pins_arduino.h index d3a106d3042..b0de5272fc5 100644 --- a/variants/ET_Board/pins_arduino.h +++ b/variants/ET_Board/pins_arduino.h @@ -22,24 +22,24 @@ static const uint8_t MOSI = 37; static const uint8_t MISO = 31; static const uint8_t SCK = 30; -static const uint8_t A0 = 36 // BUILTIN_Potentiometer -static const uint8_t A1 = 39 // BUILTIN_CDS -static const uint8_t A2 = 32 // BUILTIN_temperature -static const uint8_t A3 = 33 // Analog Input -static const uint8_t A4 = 34 // Analog Input -static const uint8_t A5 = 35 // Analog Input -static const uint8_t A6 = 25 // Analog Input -static const uint8_t A7 = 26 // Analog Input - - -static const uint8_t D2 = 27 // BUILTIN_LED_Red -static const uint8_t D3 = 14 // BUILTIN_LED_Blue -static const uint8_t D4 = 12 // BUILTIN_LED_Green -static const uint8_t D5 = 13 // BUILTIN_LED_Yellow -static const uint8_t D6 = 15 // BUILTIN_BUTTON_Red -static const uint8_t D7 = 16 // BUILTIN_BUTTON_Blue -static const uint8_t D8 = 17 // BUILTIN_BUTTON_Green -static const uint8_t D9 = 4 // BUILTIN_BUTTON_Yellow +static const uint8_t A0 = 36; // BUILTIN_Potentiometer +static const uint8_t A1 = 39; // BUILTIN_CDS +static const uint8_t A2 = 32; // BUILTIN_temperature +static const uint8_t A3 = 33; // Analog Input +static const uint8_t A4 = 34; // Analog Input +static const uint8_t A5 = 35; // Analog Input +static const uint8_t A6 = 25; // Analog Input +static const uint8_t A7 = 26; // Analog Input + + +static const uint8_t D2 = 27; // BUILTIN_LED_Red +static const uint8_t D3 = 14; // BUILTIN_LED_Blue +static const uint8_t D4 = 12; // BUILTIN_LED_Green +static const uint8_t D5 = 13; // BUILTIN_LED_Yellow +static const uint8_t D6 = 15; // BUILTIN_BUTTON_Red +static const uint8_t D7 = 16; // BUILTIN_BUTTON_Blue +static const uint8_t D8 = 17; // BUILTIN_BUTTON_Green +static const uint8_t D9 = 4; // BUILTIN_BUTTON_Yellow static const uint8_t DAC1 = 25; static const uint8_t DAC2 = 26; From de58099e8f6baee76696cd44c8a7c5475598377a Mon Sep 17 00:00:00 2001 From: ketri2484 Date: Tue, 23 Feb 2021 13:19:40 +0900 Subject: [PATCH 07/11] change board name --- boards.txt | 124 +++++++++--------- variants/{ET_Board => etboard}/pins_arduino.h | 0 2 files changed, 62 insertions(+), 62 deletions(-) rename variants/{ET_Board => etboard}/pins_arduino.h (100%) diff --git a/boards.txt b/boards.txt index ac8fa4bc864..684cfc963f7 100644 --- a/boards.txt +++ b/boards.txt @@ -5858,65 +5858,65 @@ healthypi4.menu.DebugLevel.verbose.build.code_debug=5 ############################################################## -ET-Board.name=ET-Board - -ET-Board.upload.tool=esptool_py -ET-Board.upload.maximum_size=1310720 -ET-Board.upload.maximum_data_size=327680 -ET-Board.upload.wait_for_upload_port=true - -ET-Board.serial.disableDTR=true -ET-Board.serial.disableRTS=true - -ET-Board.build.mcu=esp32 -ET-Board.build.core=esp32 -ET-Board.build.variant=ET-Board -ET-Board.build.board=ET-Board -ET-Board.build.f_cpu=240000000L -ET-Board.build.flash_mode=dio -ET-Board.build.flash_size=4MB -ET-Board.build.boot=dio -ET-Board.build.partitions=default -ET-Board.build.defines= - -ET-Board.menu.PartitionScheme.default=Default -ET-Board.menu.PartitionScheme.default.build.partitions=default -ET-Board.menu.PartitionScheme.no_ota=No OTA (Large APP) -ET-Board.menu.PartitionScheme.no_ota.build.partitions=no_ota -ET-Board.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 -ET-Board.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA) -ET-Board.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs -ET-Board.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 - -ET-Board.menu.FlashFreq.80=80MHz -ET-Board.menu.FlashFreq.80.build.flash_freq=80m -ET-Board.menu.FlashFreq.40=40MHz -ET-Board.menu.FlashFreq.40.build.flash_freq=40m - -ET-Board.menu.UploadSpeed.921600=921600 -ET-Board.menu.UploadSpeed.921600.upload.speed=921600 -ET-Board.menu.UploadSpeed.115200=115200 -ET-Board.menu.UploadSpeed.115200.upload.speed=115200 -ET-Board.menu.UploadSpeed.256000.windows=256000 -ET-Board.menu.UploadSpeed.256000.upload.speed=256000 -ET-Board.menu.UploadSpeed.230400.windows.upload.speed=256000 -ET-Board.menu.UploadSpeed.230400=230400 -ET-Board.menu.UploadSpeed.230400.upload.speed=230400 -ET-Board.menu.UploadSpeed.460800.linux=460800 -ET-Board.menu.UploadSpeed.460800.macosx=460800 -ET-Board.menu.UploadSpeed.460800.upload.speed=460800 -ET-Board.menu.UploadSpeed.512000.windows=512000 -ET-Board.menu.UploadSpeed.512000.upload.speed=512000 - -ET-Board.menu.DebugLevel.none=None -ET-Board.menu.DebugLevel.none.build.code_debug=0 -ET-Board.menu.DebugLevel.error=Error -ET-Board.menu.DebugLevel.error.build.code_debug=1 -ET-Board.menu.DebugLevel.warn=Warn -ET-Board.menu.DebugLevel.warn.build.code_debug=2 -ET-Board.menu.DebugLevel.info=Info -ET-Board.menu.DebugLevel.info.build.code_debug=3 -ET-Board.menu.DebugLevel.debug=Debug -ET-Board.menu.DebugLevel.debug.build.code_debug=4 -ET-Board.menu.DebugLevel.verbose=Verbose -ET-Board.menu.DebugLevel.verbose.build.code_debug=5 \ No newline at end of file +etboard.name=etboard + +etboard.upload.tool=esptool_py +etboard.upload.maximum_size=1310720 +etboard.upload.maximum_data_size=327680 +etboard.upload.wait_for_upload_port=true + +etboard.serial.disableDTR=true +etboard.serial.disableRTS=true + +etboard.build.mcu=esp32 +etboard.build.core=esp32 +etboard.build.variant=etboard +etboard.build.board=etboard +etboard.build.f_cpu=240000000L +etboard.build.flash_mode=dio +etboard.build.flash_size=4MB +etboard.build.boot=dio +etboard.build.partitions=default +etboard.build.defines= + +etboard.menu.PartitionScheme.default=Default +etboard.menu.PartitionScheme.default.build.partitions=default +etboard.menu.PartitionScheme.no_ota=No OTA (Large APP) +etboard.menu.PartitionScheme.no_ota.build.partitions=no_ota +etboard.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 +etboard.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA) +etboard.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs +etboard.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 + +etboard.menu.FlashFreq.80=80MHz +etboard.menu.FlashFreq.80.build.flash_freq=80m +etboard.menu.FlashFreq.40=40MHz +etboard.menu.FlashFreq.40.build.flash_freq=40m + +etboard.menu.UploadSpeed.921600=921600 +etboard.menu.UploadSpeed.921600.upload.speed=921600 +etboard.menu.UploadSpeed.115200=115200 +etboard.menu.UploadSpeed.115200.upload.speed=115200 +etboard.menu.UploadSpeed.256000.windows=256000 +etboard.menu.UploadSpeed.256000.upload.speed=256000 +etboard.menu.UploadSpeed.230400.windows.upload.speed=256000 +etboard.menu.UploadSpeed.230400=230400 +etboard.menu.UploadSpeed.230400.upload.speed=230400 +etboard.menu.UploadSpeed.460800.linux=460800 +etboard.menu.UploadSpeed.460800.macosx=460800 +etboard.menu.UploadSpeed.460800.upload.speed=460800 +etboard.menu.UploadSpeed.512000.windows=512000 +etboard.menu.UploadSpeed.512000.upload.speed=512000 + +etboard.menu.DebugLevel.none=None +etboard.menu.DebugLevel.none.build.code_debug=0 +etboard.menu.DebugLevel.error=Error +etboard.menu.DebugLevel.error.build.code_debug=1 +etboard.menu.DebugLevel.warn=Warn +etboard.menu.DebugLevel.warn.build.code_debug=2 +etboard.menu.DebugLevel.info=Info +etboard.menu.DebugLevel.info.build.code_debug=3 +etboard.menu.DebugLevel.debug=Debug +etboard.menu.DebugLevel.debug.build.code_debug=4 +etboard.menu.DebugLevel.verbose=Verbose +etboard.menu.DebugLevel.verbose.build.code_debug=5 \ No newline at end of file diff --git a/variants/ET_Board/pins_arduino.h b/variants/etboard/pins_arduino.h similarity index 100% rename from variants/ET_Board/pins_arduino.h rename to variants/etboard/pins_arduino.h From 195da01525112cf18481ba492a884624f8838e32 Mon Sep 17 00:00:00 2001 From: ketri2484 Date: Tue, 23 Feb 2021 13:38:08 +0900 Subject: [PATCH 08/11] changed board name --- boards.txt | 124 ++++++++++++++++++++++++++--------------------------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/boards.txt b/boards.txt index 684cfc963f7..2c94049131f 100644 --- a/boards.txt +++ b/boards.txt @@ -5858,65 +5858,65 @@ healthypi4.menu.DebugLevel.verbose.build.code_debug=5 ############################################################## -etboard.name=etboard - -etboard.upload.tool=esptool_py -etboard.upload.maximum_size=1310720 -etboard.upload.maximum_data_size=327680 -etboard.upload.wait_for_upload_port=true - -etboard.serial.disableDTR=true -etboard.serial.disableRTS=true - -etboard.build.mcu=esp32 -etboard.build.core=esp32 -etboard.build.variant=etboard -etboard.build.board=etboard -etboard.build.f_cpu=240000000L -etboard.build.flash_mode=dio -etboard.build.flash_size=4MB -etboard.build.boot=dio -etboard.build.partitions=default -etboard.build.defines= - -etboard.menu.PartitionScheme.default=Default -etboard.menu.PartitionScheme.default.build.partitions=default -etboard.menu.PartitionScheme.no_ota=No OTA (Large APP) -etboard.menu.PartitionScheme.no_ota.build.partitions=no_ota -etboard.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 -etboard.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA) -etboard.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs -etboard.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 - -etboard.menu.FlashFreq.80=80MHz -etboard.menu.FlashFreq.80.build.flash_freq=80m -etboard.menu.FlashFreq.40=40MHz -etboard.menu.FlashFreq.40.build.flash_freq=40m - -etboard.menu.UploadSpeed.921600=921600 -etboard.menu.UploadSpeed.921600.upload.speed=921600 -etboard.menu.UploadSpeed.115200=115200 -etboard.menu.UploadSpeed.115200.upload.speed=115200 -etboard.menu.UploadSpeed.256000.windows=256000 -etboard.menu.UploadSpeed.256000.upload.speed=256000 -etboard.menu.UploadSpeed.230400.windows.upload.speed=256000 -etboard.menu.UploadSpeed.230400=230400 -etboard.menu.UploadSpeed.230400.upload.speed=230400 -etboard.menu.UploadSpeed.460800.linux=460800 -etboard.menu.UploadSpeed.460800.macosx=460800 -etboard.menu.UploadSpeed.460800.upload.speed=460800 -etboard.menu.UploadSpeed.512000.windows=512000 -etboard.menu.UploadSpeed.512000.upload.speed=512000 - -etboard.menu.DebugLevel.none=None -etboard.menu.DebugLevel.none.build.code_debug=0 -etboard.menu.DebugLevel.error=Error -etboard.menu.DebugLevel.error.build.code_debug=1 -etboard.menu.DebugLevel.warn=Warn -etboard.menu.DebugLevel.warn.build.code_debug=2 -etboard.menu.DebugLevel.info=Info -etboard.menu.DebugLevel.info.build.code_debug=3 -etboard.menu.DebugLevel.debug=Debug -etboard.menu.DebugLevel.debug.build.code_debug=4 -etboard.menu.DebugLevel.verbose=Verbose -etboard.menu.DebugLevel.verbose.build.code_debug=5 \ No newline at end of file +ETBoard.name=ETBoard + +ETBoard.upload.tool=esptool_py +ETBoard.upload.maximum_size=1310720 +ETBoard.upload.maximum_data_size=327680 +ETBoard.upload.wait_for_upload_port=true + +ETBoard.serial.disableDTR=true +ETBoard.serial.disableRTS=true + +ETBoard.build.mcu=esp32 +ETBoard.build.core=esp32 +ETBoard.build.variant=ETBoard +ETBoard.build.board=ETBoard +ETBoard.build.f_cpu=240000000L +ETBoard.build.flash_mode=dio +ETBoard.build.flash_size=4MB +ETBoard.build.boot=dio +ETBoard.build.partitions=default +ETBoard.build.defines= + +ETBoard.menu.PartitionScheme.default=Default +ETBoard.menu.PartitionScheme.default.build.partitions=default +ETBoard.menu.PartitionScheme.no_ota=No OTA (Large APP) +ETBoard.menu.PartitionScheme.no_ota.build.partitions=no_ota +ETBoard.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 +ETBoard.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA) +ETBoard.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs +ETBoard.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 + +ETBoard.menu.FlashFreq.80=80MHz +ETBoard.menu.FlashFreq.80.build.flash_freq=80m +ETBoard.menu.FlashFreq.40=40MHz +ETBoard.menu.FlashFreq.40.build.flash_freq=40m + +ETBoard.menu.UploadSpeed.921600=921600 +ETBoard.menu.UploadSpeed.921600.upload.speed=921600 +ETBoard.menu.UploadSpeed.115200=115200 +ETBoard.menu.UploadSpeed.115200.upload.speed=115200 +ETBoard.menu.UploadSpeed.256000.windows=256000 +ETBoard.menu.UploadSpeed.256000.upload.speed=256000 +ETBoard.menu.UploadSpeed.230400.windows.upload.speed=256000 +ETBoard.menu.UploadSpeed.230400=230400 +ETBoard.menu.UploadSpeed.230400.upload.speed=230400 +ETBoard.menu.UploadSpeed.460800.linux=460800 +ETBoard.menu.UploadSpeed.460800.macosx=460800 +ETBoard.menu.UploadSpeed.460800.upload.speed=460800 +ETBoard.menu.UploadSpeed.512000.windows=512000 +ETBoard.menu.UploadSpeed.512000.upload.speed=512000 + +ETBoard.menu.DebugLevel.none=None +ETBoard.menu.DebugLevel.none.build.code_debug=0 +ETBoard.menu.DebugLevel.error=Error +ETBoard.menu.DebugLevel.error.build.code_debug=1 +ETBoard.menu.DebugLevel.warn=Warn +ETBoard.menu.DebugLevel.warn.build.code_debug=2 +ETBoard.menu.DebugLevel.info=Info +ETBoard.menu.DebugLevel.info.build.code_debug=3 +ETBoard.menu.DebugLevel.debug=Debug +ETBoard.menu.DebugLevel.debug.build.code_debug=4 +ETBoard.menu.DebugLevel.verbose=Verbose +ETBoard.menu.DebugLevel.verbose.build.code_debug=5 \ No newline at end of file From db5433b91e23848a72aa7f65f2cedcf90226d9d1 Mon Sep 17 00:00:00 2001 From: ketri2484 Date: Tue, 23 Feb 2021 13:41:14 +0900 Subject: [PATCH 09/11] changed board name --- variants/etboard/tmp.h | 47 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 variants/etboard/tmp.h diff --git a/variants/etboard/tmp.h b/variants/etboard/tmp.h new file mode 100644 index 00000000000..b0de5272fc5 --- /dev/null +++ b/variants/etboard/tmp.h @@ -0,0 +1,47 @@ +#ifndef Pins_Arduino_h +#define Pins_Arduino_h + +#include + +#define EXTERNAL_NUM_INTERRUPTS 16 +#define NUM_DIGITAL_PINS 40 +#define NUM_ANALOG_INPUTS 7 + +#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 = 34; +static const uint8_t RX = 35; + +static const uint8_t SDA = 33; +static const uint8_t SCL = 36; + +static const uint8_t SS = 29; +static const uint8_t MOSI = 37; +static const uint8_t MISO = 31; +static const uint8_t SCK = 30; + +static const uint8_t A0 = 36; // BUILTIN_Potentiometer +static const uint8_t A1 = 39; // BUILTIN_CDS +static const uint8_t A2 = 32; // BUILTIN_temperature +static const uint8_t A3 = 33; // Analog Input +static const uint8_t A4 = 34; // Analog Input +static const uint8_t A5 = 35; // Analog Input +static const uint8_t A6 = 25; // Analog Input +static const uint8_t A7 = 26; // Analog Input + + +static const uint8_t D2 = 27; // BUILTIN_LED_Red +static const uint8_t D3 = 14; // BUILTIN_LED_Blue +static const uint8_t D4 = 12; // BUILTIN_LED_Green +static const uint8_t D5 = 13; // BUILTIN_LED_Yellow +static const uint8_t D6 = 15; // BUILTIN_BUTTON_Red +static const uint8_t D7 = 16; // BUILTIN_BUTTON_Blue +static const uint8_t D8 = 17; // BUILTIN_BUTTON_Green +static const uint8_t D9 = 4; // BUILTIN_BUTTON_Yellow + +static const uint8_t DAC1 = 25; +static const uint8_t DAC2 = 26; + +#endif /* Pins_Arduino_h */ \ No newline at end of file From eb626bab383f1687ea3b377e4bb81af5b729314c Mon Sep 17 00:00:00 2001 From: ketri2484 Date: Tue, 23 Feb 2021 13:43:44 +0900 Subject: [PATCH 10/11] changed board name --- variants/etboard/pins_arduino.h | 47 --------------------------------- variants/etboard/tmp.h | 47 --------------------------------- 2 files changed, 94 deletions(-) delete mode 100644 variants/etboard/pins_arduino.h delete mode 100644 variants/etboard/tmp.h diff --git a/variants/etboard/pins_arduino.h b/variants/etboard/pins_arduino.h deleted file mode 100644 index b0de5272fc5..00000000000 --- a/variants/etboard/pins_arduino.h +++ /dev/null @@ -1,47 +0,0 @@ -#ifndef Pins_Arduino_h -#define Pins_Arduino_h - -#include - -#define EXTERNAL_NUM_INTERRUPTS 16 -#define NUM_DIGITAL_PINS 40 -#define NUM_ANALOG_INPUTS 7 - -#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 = 34; -static const uint8_t RX = 35; - -static const uint8_t SDA = 33; -static const uint8_t SCL = 36; - -static const uint8_t SS = 29; -static const uint8_t MOSI = 37; -static const uint8_t MISO = 31; -static const uint8_t SCK = 30; - -static const uint8_t A0 = 36; // BUILTIN_Potentiometer -static const uint8_t A1 = 39; // BUILTIN_CDS -static const uint8_t A2 = 32; // BUILTIN_temperature -static const uint8_t A3 = 33; // Analog Input -static const uint8_t A4 = 34; // Analog Input -static const uint8_t A5 = 35; // Analog Input -static const uint8_t A6 = 25; // Analog Input -static const uint8_t A7 = 26; // Analog Input - - -static const uint8_t D2 = 27; // BUILTIN_LED_Red -static const uint8_t D3 = 14; // BUILTIN_LED_Blue -static const uint8_t D4 = 12; // BUILTIN_LED_Green -static const uint8_t D5 = 13; // BUILTIN_LED_Yellow -static const uint8_t D6 = 15; // BUILTIN_BUTTON_Red -static const uint8_t D7 = 16; // BUILTIN_BUTTON_Blue -static const uint8_t D8 = 17; // BUILTIN_BUTTON_Green -static const uint8_t D9 = 4; // BUILTIN_BUTTON_Yellow - -static const uint8_t DAC1 = 25; -static const uint8_t DAC2 = 26; - -#endif /* Pins_Arduino_h */ \ No newline at end of file diff --git a/variants/etboard/tmp.h b/variants/etboard/tmp.h deleted file mode 100644 index b0de5272fc5..00000000000 --- a/variants/etboard/tmp.h +++ /dev/null @@ -1,47 +0,0 @@ -#ifndef Pins_Arduino_h -#define Pins_Arduino_h - -#include - -#define EXTERNAL_NUM_INTERRUPTS 16 -#define NUM_DIGITAL_PINS 40 -#define NUM_ANALOG_INPUTS 7 - -#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 = 34; -static const uint8_t RX = 35; - -static const uint8_t SDA = 33; -static const uint8_t SCL = 36; - -static const uint8_t SS = 29; -static const uint8_t MOSI = 37; -static const uint8_t MISO = 31; -static const uint8_t SCK = 30; - -static const uint8_t A0 = 36; // BUILTIN_Potentiometer -static const uint8_t A1 = 39; // BUILTIN_CDS -static const uint8_t A2 = 32; // BUILTIN_temperature -static const uint8_t A3 = 33; // Analog Input -static const uint8_t A4 = 34; // Analog Input -static const uint8_t A5 = 35; // Analog Input -static const uint8_t A6 = 25; // Analog Input -static const uint8_t A7 = 26; // Analog Input - - -static const uint8_t D2 = 27; // BUILTIN_LED_Red -static const uint8_t D3 = 14; // BUILTIN_LED_Blue -static const uint8_t D4 = 12; // BUILTIN_LED_Green -static const uint8_t D5 = 13; // BUILTIN_LED_Yellow -static const uint8_t D6 = 15; // BUILTIN_BUTTON_Red -static const uint8_t D7 = 16; // BUILTIN_BUTTON_Blue -static const uint8_t D8 = 17; // BUILTIN_BUTTON_Green -static const uint8_t D9 = 4; // BUILTIN_BUTTON_Yellow - -static const uint8_t DAC1 = 25; -static const uint8_t DAC2 = 26; - -#endif /* Pins_Arduino_h */ \ No newline at end of file From ac5c9923aed16280e0fe38927e745f7d5c295860 Mon Sep 17 00:00:00 2001 From: ketri2484 Date: Tue, 23 Feb 2021 13:44:29 +0900 Subject: [PATCH 11/11] changed board name --- variants/ETBoard/pins_arduino.h | 47 +++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 variants/ETBoard/pins_arduino.h diff --git a/variants/ETBoard/pins_arduino.h b/variants/ETBoard/pins_arduino.h new file mode 100644 index 00000000000..b0de5272fc5 --- /dev/null +++ b/variants/ETBoard/pins_arduino.h @@ -0,0 +1,47 @@ +#ifndef Pins_Arduino_h +#define Pins_Arduino_h + +#include + +#define EXTERNAL_NUM_INTERRUPTS 16 +#define NUM_DIGITAL_PINS 40 +#define NUM_ANALOG_INPUTS 7 + +#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 = 34; +static const uint8_t RX = 35; + +static const uint8_t SDA = 33; +static const uint8_t SCL = 36; + +static const uint8_t SS = 29; +static const uint8_t MOSI = 37; +static const uint8_t MISO = 31; +static const uint8_t SCK = 30; + +static const uint8_t A0 = 36; // BUILTIN_Potentiometer +static const uint8_t A1 = 39; // BUILTIN_CDS +static const uint8_t A2 = 32; // BUILTIN_temperature +static const uint8_t A3 = 33; // Analog Input +static const uint8_t A4 = 34; // Analog Input +static const uint8_t A5 = 35; // Analog Input +static const uint8_t A6 = 25; // Analog Input +static const uint8_t A7 = 26; // Analog Input + + +static const uint8_t D2 = 27; // BUILTIN_LED_Red +static const uint8_t D3 = 14; // BUILTIN_LED_Blue +static const uint8_t D4 = 12; // BUILTIN_LED_Green +static const uint8_t D5 = 13; // BUILTIN_LED_Yellow +static const uint8_t D6 = 15; // BUILTIN_BUTTON_Red +static const uint8_t D7 = 16; // BUILTIN_BUTTON_Blue +static const uint8_t D8 = 17; // BUILTIN_BUTTON_Green +static const uint8_t D9 = 4; // BUILTIN_BUTTON_Yellow + +static const uint8_t DAC1 = 25; +static const uint8_t DAC2 = 26; + +#endif /* Pins_Arduino_h */ \ No newline at end of file