From 271cee1061622d05d68c20141035e11062c7318f Mon Sep 17 00:00:00 2001 From: Zeynep Dicle Date: Mon, 7 Nov 2022 17:37:35 +0300 Subject: [PATCH] updated Deneyap boards pin_arduino.h files (#7338) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add new board (Deneyap Kart 1A) * Update pins_arduino.h * Add newly board (Deneyap Kart G) New Deneyap Family member, wearable development board * updated Deneyap boards pin_arduino.h files * Update boards.txt * Update pins_arduino.h * updated deneyap boards pins_arduino.h * updated Deneyap boards variants files * updated Deneyap boards pins_arduino.h Co-authored-by: Jan Procházka <90197375+P-R-O-C-H-Y@users.noreply.github.com> --- boards.txt | 15 ++++-- variants/deneyapkart/pins_arduino.h | 18 ++++--- variants/deneyapkart1A/pins_arduino.h | 13 +++-- variants/deneyapkartg/pins_arduino.h | 18 +++++-- variants/deneyapmini/pins_arduino.h | 78 ++++++++++++++------------- 5 files changed, 87 insertions(+), 55 deletions(-) diff --git a/boards.txt b/boards.txt index 3927181b6..2edd8d6ce 100644 --- a/boards.txt +++ b/boards.txt @@ -16361,7 +16361,7 @@ deneyapkart1A.menu.CPUFreq.80=80MHz (WiFi/BT) deneyapkart1A.menu.CPUFreq.80.build.f_cpu=80000000L deneyapkart1A.menu.CPUFreq.40=40MHz deneyapkart1A.menu.CPUFreq.40.build.f_cpu=40000000L -deneyapkart1A.menu.CPUFreq.20=20MHz +deneyapkart1A.menu.CPUFreq.20=20MHz deneyapkart1A.menu.CPUFreq.20.build.f_cpu=20000000L deneyapkart1A.menu.CPUFreq.10=10MHz deneyapkart1A.menu.CPUFreq.10.build.f_cpu=10000000L @@ -16448,7 +16448,7 @@ deneyapkartg.build.variant=deneyapkartg deneyapkartg.build.board=DYG deneyapkartg.build.bootloader_addr=0x0 -deneyapkartg.build.cdc_on_boot=1 +deneyapkartg.build.cdc_on_boot=0 deneyapkartg.build.f_cpu=160000000L deneyapkartg.build.flash_size=4MB deneyapkartg.build.flash_freq=80m @@ -16466,7 +16466,7 @@ deneyapkartg.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5 deneyapkartg.menu.PartitionScheme.default.build.partitions=default deneyapkartg.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS) deneyapkartg.menu.PartitionScheme.defaultffat.build.partitions=default_ffat -deneyapkartg.menu.PartitionScheme.default_8MB=8M Flash (3MB APP/1.5MB FAT) +deneyapkartg.menu.PartitionScheme.default_8MB=8M with spiffs (3MB APP/1.5MB SPIFFS) deneyapkartg.menu.PartitionScheme.default_8MB.build.partitions=default_8MB deneyapkartg.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336 deneyapkartg.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS) @@ -16489,10 +16489,10 @@ deneyapkartg.menu.PartitionScheme.huge_app.upload.maximum_size=3145728 deneyapkartg.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS) deneyapkartg.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs deneyapkartg.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 -deneyapkartg.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT) +deneyapkartg.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS) deneyapkartg.menu.PartitionScheme.fatflash.build.partitions=ffat deneyapkartg.menu.PartitionScheme.fatflash.upload.maximum_size=2097152 -deneyapkartg.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9MB FATFS) +deneyapkartg.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS) deneyapkartg.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB deneyapkartg.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728 deneyapkartg.menu.PartitionScheme.rainmaker=RainMaker @@ -16567,6 +16567,11 @@ deneyapkartg.menu.DebugLevel.debug.build.code_debug=4 deneyapkartg.menu.DebugLevel.verbose=Verbose deneyapkartg.menu.DebugLevel.verbose.build.code_debug=5 +deneyapkartg.menu.EraseFlash.none=Disabled +deneyapkartg.menu.EraseFlash.none.upload.erase_cmd= +deneyapkartg.menu.EraseFlash.all=Enabled +deneyapkartg.menu.EraseFlash.all.upload.erase_cmd=-e + ############################################################## esp32-trueverit-iot-driver.name=Trueverit ESP32 Universal IoT Driver diff --git a/variants/deneyapkart/pins_arduino.h b/variants/deneyapkart/pins_arduino.h index 3dd496843..e1ed685f3 100644 --- a/variants/deneyapkart/pins_arduino.h +++ b/variants/deneyapkart/pins_arduino.h @@ -11,6 +11,18 @@ #define digitalPinToInterrupt(p) (((p)<40)?(p):-1) #define digitalPinHasPWM(p) (p < 34) +static const uint8_t LEDR = 3; +static const uint8_t LEDG = 1; +static const uint8_t LEDB = 4; +static const uint8_t GPKEY = 0; + +#define BUILTIN_LED LEDB +#define LED_BUILTIN BUILTIN_LED // backward compatibility +//#define RGB_BUILTIN LED_BUILTIN + +#define KEY_BUILTIN GPKEY +#define BUILTIN_KEY KEY_BUILTIN + static const uint8_t TX = 1; static const uint8_t RX = 3; @@ -87,12 +99,6 @@ static const uint8_t CAMXC = 32; static const uint8_t CAMH = 39; static const uint8_t CAMV = 36; -static const uint8_t LEDR = 3; -static const uint8_t LEDG = 1; -static const uint8_t LEDB = 4; -static const uint8_t BUILTIN_KEY = 0; -static const uint8_t GPKEY = 0; - static const uint8_t PWM0 = 23; static const uint8_t PWM1 = 22; diff --git a/variants/deneyapkart1A/pins_arduino.h b/variants/deneyapkart1A/pins_arduino.h index b97a0f3a3..6e35c8ef9 100644 --- a/variants/deneyapkart1A/pins_arduino.h +++ b/variants/deneyapkart1A/pins_arduino.h @@ -11,6 +11,15 @@ #define digitalPinToInterrupt(p) (((p)<40)?(p):-1) #define digitalPinHasPWM(p) (p < 34) +static const uint8_t RGBLED = 13; +static const uint8_t GPKEY = 0; + +#define RGB_BUILTIN RGBLED +#define RGB_BRIGHTNESS 64 + +#define KEY_BUILTIN GPKEY +#define BUILTIN_KEY KEY_BUILTIN + static const uint8_t TX = 1; static const uint8_t RX = 3; @@ -87,10 +96,6 @@ static const uint8_t CAMXC = 32; static const uint8_t CAMH = 39; static const uint8_t CAMV = 36; -static const uint8_t RGBLED = 13; -static const uint8_t BUILTIN_KEY = 0; -static const uint8_t GPKEY = 0; - static const uint8_t PWM0 = 23; static const uint8_t PWM1 = 22; diff --git a/variants/deneyapkartg/pins_arduino.h b/variants/deneyapkartg/pins_arduino.h index d502e204d..e8aef7cd1 100644 --- a/variants/deneyapkartg/pins_arduino.h +++ b/variants/deneyapkartg/pins_arduino.h @@ -11,10 +11,17 @@ #define digitalPinToInterrupt(p) (((p) +#include "soc/soc_caps.h" #define EXTERNAL_NUM_INTERRUPTS 46 #define NUM_DIGITAL_PINS 48 @@ -11,7 +12,17 @@ #define digitalPinToInterrupt(p) (((p)<48)?(p):-1) #define digitalPinHasPWM(p) (p < 46) -static const uint8_t KEY_BUILTIN = 0; +static const uint8_t LEDR = 34; +static const uint8_t LEDG = 33; +static const uint8_t LEDB = 35; +static const uint8_t GPKEY = 0; + +#define KEY_BUILTIN GPKEY +#define BUILTIN_KEY KEY_BUILTIN + +#define BUILTIN_LED LEDB +#define LED_BUILTIN BUILTIN_LED // backward compatibility +//#define RGB_BUILTIN LED_BUILTIN static const uint8_t TX = 43; static const uint8_t RX = 44; @@ -24,43 +35,38 @@ static const uint8_t MOSI = 40; static const uint8_t MISO = 39; static const uint8_t SCK = 38; -static const uint8_t A0 = 1; -static const uint8_t A1 = 2; -static const uint8_t A2 = 3; -static const uint8_t A3 = 4; -static const uint8_t A4 = 5; -static const uint8_t A5 = 6; -static const uint8_t A6 = 7; -static const uint8_t A7 = 8; -static const uint8_t A8 = 9; -static const uint8_t A9 = 10; -static const uint8_t A10 = 11; -static const uint8_t A11 = 12; -static const uint8_t A12 = 13; -static const uint8_t A13 = 14; -static const uint8_t A14 = 15; -static const uint8_t A15 = 16; -static const uint8_t A16 = 17; -static const uint8_t A17 = 18; -static const uint8_t A18 = 19; -static const uint8_t A19 = 20; +static const uint8_t A0 = 8; +static const uint8_t A1 = 9; +static const uint8_t A2 = 10; +static const uint8_t A3 = 11; +static const uint8_t A4 = 12; +static const uint8_t A5 = 13; -static const uint8_t T1 = 1; -static const uint8_t T2 = 2; -static const uint8_t T3 = 3; -static const uint8_t T4 = 4; -static const uint8_t T5 = 5; -static const uint8_t T6 = 6; -static const uint8_t T7 = 7; -static const uint8_t T8 = 8; -static const uint8_t T9 = 9; -static const uint8_t T10 = 10; -static const uint8_t T11 = 11; -static const uint8_t T12 = 12; -static const uint8_t T13 = 13; -static const uint8_t T14 = 14; +static const uint8_t T1 = 8; +static const uint8_t T2 = 9; +static const uint8_t T3 = 10; +static const uint8_t T4 = 11; +static const uint8_t T5 = 12; +static const uint8_t T6 = 13; static const uint8_t DAC1 = 17; static const uint8_t DAC2 = 18; -#endif /* Pins_Arduino_h */ \ No newline at end of file +static const uint8_t D1 = 44; +static const uint8_t D2 = 43; +static const uint8_t D3 = 42; +static const uint8_t D4 = 40; +static const uint8_t D5 = 39; +static const uint8_t D6 = 38; +static const uint8_t D7 = 37; +static const uint8_t D8 = 36; +static const uint8_t D9 = 26; +static const uint8_t D10 = 21; +static const uint8_t D11 = 18; +static const uint8_t D12 = 17; +static const uint8_t D13 = 0; +static const uint8_t D14 = 35; +static const uint8_t D15 = 33; +static const uint8_t D16 = 34; + +#endif /* Pins_Arduino_h */ -- GitLab