From ec64ef2cc4a5cc786d22e8740323a8a5b3e11434 Mon Sep 17 00:00:00 2001 From: volca Date: Thu, 27 Oct 2016 20:14:51 +0800 Subject: [PATCH 1/5] Add from original Arduino.h --- cores/esp32/Arduino.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cores/esp32/Arduino.h b/cores/esp32/Arduino.h index 4489fbdb09d..5375d695bf4 100644 --- a/cores/esp32/Arduino.h +++ b/cores/esp32/Arduino.h @@ -145,6 +145,12 @@ typedef unsigned int word; #define _min(a,b) ((a)<(b)?(a):(b)) #define _max(a,b) ((a)>(b)?(a):(b)) +// WMath prototypes +long random(long); +long random(long, long); +void randomSeed(unsigned long); +long map(long, long, long, long, long); + #include "pins_arduino.h" #endif /* _ESP32_CORE_ARDUINO_H_ */ From c67bef8c977c752e18425d854ec6d1dca89e3de2 Mon Sep 17 00:00:00 2001 From: volca Date: Thu, 3 Nov 2016 17:28:49 +0800 Subject: [PATCH 2/5] Add board "ESPea32" --- boards.txt | 41 +++++++++++++++++++++++ package/package_esp32_index.template.json | 3 ++ variants/espea32/pins_arduino.h | 22 ++++++++++++ 3 files changed, 66 insertions(+) create mode 100644 variants/espea32/pins_arduino.h diff --git a/boards.txt b/boards.txt index 2346810518d..ac0fbf6b0ac 100644 --- a/boards.txt +++ b/boards.txt @@ -120,3 +120,44 @@ nano32.menu.UploadSpeed.460800.macosx=460800 nano32.menu.UploadSpeed.460800.upload.speed=460800 nano32.menu.UploadSpeed.512000.windows=512000 nano32.menu.UploadSpeed.512000.upload.speed=512000 + +############################################################## +espea32.name=ESPea32 + +espea32.upload.tool=esptool +espea32.upload.maximum_size=1044464 +espea32.upload.maximum_data_size=294912 +espea32.upload.wait_for_upload_port=true + +espea32.serial.disableDTR=true +espea32.serial.disableRTS=true + +espea32.build.mcu=esp32 +espea32.build.core=esp32 +espea32.build.variant=espea32 +espea32.build.board=ESPea32 + +espea32.build.f_cpu=160000000L +espea32.build.flash_mode=dio +espea32.build.flash_size=4MB + +espea32.menu.FlashFreq.80=80MHz +espea32.menu.FlashFreq.80.build.flash_freq=80m +espea32.menu.FlashFreq.40=40MHz +espea32.menu.FlashFreq.40.build.flash_freq=40m + +espea32.menu.UploadSpeed.921600=921600 +espea32.menu.UploadSpeed.921600.upload.speed=921600 +espea32.menu.UploadSpeed.115200=115200 +espea32.menu.UploadSpeed.115200.upload.speed=115200 +espea32.menu.UploadSpeed.256000.windows=256000 +espea32.menu.UploadSpeed.256000.upload.speed=256000 +espea32.menu.UploadSpeed.230400.windows.upload.speed=256000 +espea32.menu.UploadSpeed.230400=230400 +espea32.menu.UploadSpeed.230400.upload.speed=230400 +espea32.menu.UploadSpeed.460800.linux=460800 +espea32.menu.UploadSpeed.460800.macosx=460800 +espea32.menu.UploadSpeed.460800.upload.speed=460800 +espea32.menu.UploadSpeed.512000.windows=512000 +espea32.menu.UploadSpeed.512000.upload.speed=512000 + diff --git a/package/package_esp32_index.template.json b/package/package_esp32_index.template.json index bc9f4057b71..fa9a9d6c732 100644 --- a/package/package_esp32_index.template.json +++ b/package/package_esp32_index.template.json @@ -24,6 +24,9 @@ "boards": [ { "name": "ESP32 Dev Module" + }, + { + "name": "ESPea32" } ], "toolsDependencies": [ diff --git a/variants/espea32/pins_arduino.h b/variants/espea32/pins_arduino.h new file mode 100644 index 00000000000..540211eb4e2 --- /dev/null +++ b/variants/espea32/pins_arduino.h @@ -0,0 +1,22 @@ +#ifndef Pins_Arduino_h +#define Pins_Arduino_h + +#define EXTERNAL_NUM_INTERRUPTS 16 +#define NUM_DIGITAL_PINS 40 +#define NUM_ANALOG_INPUTS 18 + +#define analogInputToDigitalPin(p) +#define digitalPinToInterrupt(p) (((p)<40)?(p):-1) +#define digitalPinHasPWM(p) (p < 34) + +#define LED_BUILTIN 5 + +static const uint8_t SDA = 21; +static const uint8_t SCL = 22; + +static const uint8_t SS = 2; +static const uint8_t MOSI = 23; +static const uint8_t MISO = 19; +static const uint8_t SCK = 18; + +#endif /* Pins_Arduino_h */ From ae26fbe5623332c7a85089557c731b617f05c5ec Mon Sep 17 00:00:00 2001 From: volca Date: Thu, 3 Nov 2016 17:31:44 +0800 Subject: [PATCH 3/5] cleanup --- variants/espea32/pins_arduino.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variants/espea32/pins_arduino.h b/variants/espea32/pins_arduino.h index 540211eb4e2..fb6a7998781 100644 --- a/variants/espea32/pins_arduino.h +++ b/variants/espea32/pins_arduino.h @@ -9,7 +9,7 @@ #define digitalPinToInterrupt(p) (((p)<40)?(p):-1) #define digitalPinHasPWM(p) (p < 34) -#define LED_BUILTIN 5 +#define LED_BUILTIN 5 static const uint8_t SDA = 21; static const uint8_t SCL = 22; From 3389e5ac3525fbe27006b708625008d0b8d24acb Mon Sep 17 00:00:00 2001 From: volca Date: Tue, 8 Nov 2016 20:58:54 +0800 Subject: [PATCH 4/5] cleanup --- package/package_esp32_index.template.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/package_esp32_index.template.json b/package/package_esp32_index.template.json index e13ab3b114b..afc7c6bdb0a 100644 --- a/package/package_esp32_index.template.json +++ b/package/package_esp32_index.template.json @@ -27,9 +27,6 @@ }, { "name": "WEMOS LoLin32" - }, - { - "name": "ESPea32" } ], "toolsDependencies": [ From 811645271118a2c6f7f4fad8914376f6bc0b3a6a Mon Sep 17 00:00:00 2001 From: volca Date: Wed, 9 Nov 2016 07:32:42 +0800 Subject: [PATCH 5/5] Change SS to 5 --- variants/espea32/pins_arduino.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variants/espea32/pins_arduino.h b/variants/espea32/pins_arduino.h index fb6a7998781..ab545e8e6ad 100644 --- a/variants/espea32/pins_arduino.h +++ b/variants/espea32/pins_arduino.h @@ -14,7 +14,7 @@ static const uint8_t SDA = 21; static const uint8_t SCL = 22; -static const uint8_t SS = 2; +static const uint8_t SS = 5; static const uint8_t MOSI = 23; static const uint8_t MISO = 19; static const uint8_t SCK = 18;