From 4b930b23166de6ac45ac9ab641f9517e5957624c Mon Sep 17 00:00:00 2001 From: Dogus Cendek <55203951+DogushC@users.noreply.github.com> Date: Mon, 20 Feb 2023 17:29:03 +0300 Subject: [PATCH] Updated pins_arduino.h and board.txt of Deneyap Development Boards (#7854) * Updated Pins of Devkits Deleted soc_caps.h library and related commands at Deneyap Kart 1A v2, Deneyap Kart 1A, Deneyap Mini and Deneyap Mini v2. Added TX1 and RX1 pins and updated LED pin definition at all Devkits. Added BOOT (BT) pins at Deneyap Kart, Deneyap Kart 1A, Deneyap Mini and Deneyap Kart G. Changed D0 and D1 pin numbers at Deneyap Kart G. Changed D12, D13, D14, D15, PWM0 and PWM1 pin numbers at Deneyap Kart 1A v2. Added A8, T0, T1, T2, T3, T4, T5, T6, T7, T8, D16, D17, D18, D19, PWM2, PWM3, PWM4 and BAT pin numbers at Deneyap Kart 1A v2. Changed A2, A3, A4 (T0) and A5 (T1) pin numbers at Deneyap Kart and Deneyap Kart 1A. Renamed DA2 (DAC2) pin as DA0 (DAC0) and changed DAC1 and DAC2 pin numbers at Deneyap Mini and Deneyap Mini v2. * Updated board.txt of all Devkits Updated board.txt of all Devkits --- boards.txt | 412 +++++++++++++++--------- variants/deneyapkart/pins_arduino.h | 61 ++-- variants/deneyapkart1A/pins_arduino.h | 60 ++-- variants/deneyapkart1Av2/pins_arduino.h | 103 +++--- variants/deneyapkartg/pins_arduino.h | 32 +- variants/deneyapmini/pins_arduino.h | 65 ++-- variants/deneyapminiv2/pins_arduino.h | 61 ++-- 7 files changed, 484 insertions(+), 310 deletions(-) diff --git a/boards.txt b/boards.txt index 3800d6fe3..a2f8f8ed8 100644 --- a/boards.txt +++ b/boards.txt @@ -17136,7 +17136,6 @@ deneyapkart.upload.tool.network=esp_ota deneyapkart.upload.maximum_size=1310720 deneyapkart.upload.maximum_data_size=327680 -deneyapkart.upload.wait_for_upload_port=true deneyapkart.upload.flags= deneyapkart.upload.extra_flags= @@ -17153,12 +17152,30 @@ deneyapkart.build.board=DYDK deneyapkart.build.f_cpu=240000000L deneyapkart.build.flash_size=4MB -deneyapkart.build.flash_freq=40m +deneyapkart.build.flash_freq=80m deneyapkart.build.flash_mode=dio -deneyapkart.build.boot=dio +deneyapkart.build.boot=qio deneyapkart.build.partitions=default -deneyapkart.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -mfix-esp32-psram-cache-strategy=memw -deneyapkart.build.extra_libs= +deneyapkart.build.defines= +deneyapkart.build.loop_core= +deneyapkart.build.event_core= + +## IDE 2.0 Seems to not update the value +deneyapkart.menu.JTAGAdapter.default=Disabled +deneyapkart.menu.JTAGAdapter.default.build.copy_jtag_files=0 +deneyapkart.menu.JTAGAdapter.external=FTDI Adapter +deneyapkart.menu.JTAGAdapter.external.build.openocdscript=esp32-wrover-kit-3.3v.cfg +deneyapkart.menu.JTAGAdapter.external.build.copy_jtag_files=1 +deneyapkart.menu.JTAGAdapter.bridge=ESP USB Bridge +deneyapkart.menu.JTAGAdapter.bridge.build.openocdscript=esp32-bridge.cfg +deneyapkart.menu.JTAGAdapter.bridge.build.copy_jtag_files=1 + +deneyapkart.menu.PSRAM.enabled=Enabled +deneyapkart.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -mfix-esp32-psram-cache-strategy=memw +deneyapkart.menu.PSRAM.enabled.build.extra_libs= +deneyapkart.menu.PSRAM.disabled=Disabled +deneyapkart.menu.PSRAM.disabled.build.defines= +deneyapkart.menu.PSRAM.disabled.build.extra_libs= deneyapkart.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS) deneyapkart.menu.PartitionScheme.default.build.partitions=default @@ -17166,6 +17183,7 @@ deneyapkart.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1. deneyapkart.menu.PartitionScheme.defaultffat.build.partitions=default_ffat deneyapkart.menu.PartitionScheme.default_8MB=8M with spiffs (3MB APP/1.5MB SPIFFS) deneyapkart.menu.PartitionScheme.default_8MB.build.partitions=default_8MB +deneyapkart.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336 deneyapkart.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS) deneyapkart.menu.PartitionScheme.minimal.build.partitions=minimal deneyapkart.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS) @@ -17188,6 +17206,8 @@ deneyapkart.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs deneyapkart.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 deneyapkart.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS) deneyapkart.menu.PartitionScheme.fatflash.build.partitions=ffat +deneyapkart.menu.PartitionScheme.fatflash.upload.maximum_size=2097152 +deneyapkart.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS) deneyapkart.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB deneyapkart.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728 deneyapkart.menu.PartitionScheme.rainmaker=RainMaker @@ -17200,11 +17220,15 @@ deneyapkart.menu.CPUFreq.160=160MHz (WiFi/BT) deneyapkart.menu.CPUFreq.160.build.f_cpu=160000000L deneyapkart.menu.CPUFreq.80=80MHz (WiFi/BT) deneyapkart.menu.CPUFreq.80.build.f_cpu=80000000L -deneyapkart.menu.CPUFreq.40=40MHz +deneyapkart.menu.CPUFreq.40=40MHz (40MHz XTAL) deneyapkart.menu.CPUFreq.40.build.f_cpu=40000000L -deneyapkart.menu.CPUFreq.20=20MHz +deneyapkart.menu.CPUFreq.26=26MHz (26MHz XTAL) +deneyapkart.menu.CPUFreq.26.build.f_cpu=26000000L +deneyapkart.menu.CPUFreq.20=20MHz (40MHz XTAL) deneyapkart.menu.CPUFreq.20.build.f_cpu=20000000L -deneyapkart.menu.CPUFreq.10=10MHz +deneyapkart.menu.CPUFreq.13=13MHz (26MHz XTAL) +deneyapkart.menu.CPUFreq.13.build.f_cpu=13000000L +deneyapkart.menu.CPUFreq.10=10MHz (40MHz XTAL) deneyapkart.menu.CPUFreq.10.build.f_cpu=10000000L deneyapkart.menu.FlashMode.qio=QIO @@ -17225,6 +17249,17 @@ deneyapkart.menu.FlashFreq.80.build.flash_freq=80m deneyapkart.menu.FlashFreq.40=40MHz deneyapkart.menu.FlashFreq.40.build.flash_freq=40m +deneyapkart.menu.FlashSize.4M=4MB (32Mb) +deneyapkart.menu.FlashSize.4M.build.flash_size=4MB +deneyapkart.menu.FlashSize.8M=8MB (64Mb) +deneyapkart.menu.FlashSize.8M.build.flash_size=8MB +deneyapkart.menu.FlashSize.8M.build.partitions=default_8MB +deneyapkart.menu.FlashSize.2M=2MB (16Mb) +deneyapkart.menu.FlashSize.2M.build.flash_size=2MB +deneyapkart.menu.FlashSize.2M.build.partitions=minimal +deneyapkart.menu.FlashSize.16M=16MB (128Mb) +deneyapkart.menu.FlashSize.16M.build.flash_size=16MB + deneyapkart.menu.UploadSpeed.921600=921600 deneyapkart.menu.UploadSpeed.921600.upload.speed=921600 deneyapkart.menu.UploadSpeed.115200=115200 @@ -17240,6 +17275,16 @@ deneyapkart.menu.UploadSpeed.460800.upload.speed=460800 deneyapkart.menu.UploadSpeed.512000.windows=512000 deneyapkart.menu.UploadSpeed.512000.upload.speed=512000 +deneyapkart.menu.LoopCore.1=Core 1 +deneyapkart.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1 +deneyapkart.menu.LoopCore.0=Core 0 +deneyapkart.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0 + +deneyapkart.menu.EventsCore.1=Core 1 +deneyapkart.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1 +deneyapkart.menu.EventsCore.0=Core 0 +deneyapkart.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0 + deneyapkart.menu.DebugLevel.none=None deneyapkart.menu.DebugLevel.none.build.code_debug=0 deneyapkart.menu.DebugLevel.error=Error @@ -17271,7 +17316,6 @@ deneyapkart1A.upload.tool.network=esp_ota deneyapkart1A.upload.maximum_size=1310720 deneyapkart1A.upload.maximum_data_size=327680 -deneyapkart1A.upload.wait_for_upload_port=true deneyapkart1A.upload.flags= deneyapkart1A.upload.extra_flags= @@ -17288,12 +17332,30 @@ deneyapkart1A.build.board=DYDK1A deneyapkart1A.build.f_cpu=240000000L deneyapkart1A.build.flash_size=4MB -deneyapkart1A.build.flash_freq=40m +deneyapkart1A.build.flash_freq=80m deneyapkart1A.build.flash_mode=dio -deneyapkart1A.build.boot=dio +deneyapkart1A.build.boot=qio deneyapkart1A.build.partitions=default -deneyapkart1A.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -mfix-esp32-psram-cache-strategy=memw -deneyapkart1A.build.extra_libs= +deneyapkart1A.build.defines= +deneyapkart1A.build.loop_core= +deneyapkart1A.build.event_core= + +## IDE 2.0 Seems to not update the value +deneyapkart1A.menu.JTAGAdapter.default=Disabled +deneyapkart1A.menu.JTAGAdapter.default.build.copy_jtag_files=0 +deneyapkart1A.menu.JTAGAdapter.external=FTDI Adapter +deneyapkart1A.menu.JTAGAdapter.external.build.openocdscript=esp32-wrover-kit-3.3v.cfg +deneyapkart1A.menu.JTAGAdapter.external.build.copy_jtag_files=1 +deneyapkart1A.menu.JTAGAdapter.bridge=ESP USB Bridge +deneyapkart1A.menu.JTAGAdapter.bridge.build.openocdscript=esp32-bridge.cfg +deneyapkart1A.menu.JTAGAdapter.bridge.build.copy_jtag_files=1 + +deneyapkart1A.menu.PSRAM.enabled=Enabled +deneyapkart1A.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -mfix-esp32-psram-cache-strategy=memw +deneyapkart1A.menu.PSRAM.enabled.build.extra_libs= +deneyapkart1A.menu.PSRAM.disabled=Disabled +deneyapkart1A.menu.PSRAM.disabled.build.defines= +deneyapkart1A.menu.PSRAM.disabled.build.extra_libs= deneyapkart1A.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS) deneyapkart1A.menu.PartitionScheme.default.build.partitions=default @@ -17338,11 +17400,15 @@ deneyapkart1A.menu.CPUFreq.160=160MHz (WiFi/BT) deneyapkart1A.menu.CPUFreq.160.build.f_cpu=160000000L deneyapkart1A.menu.CPUFreq.80=80MHz (WiFi/BT) deneyapkart1A.menu.CPUFreq.80.build.f_cpu=80000000L -deneyapkart1A.menu.CPUFreq.40=40MHz +deneyapkart1A.menu.CPUFreq.40=40MHz (40MHz XTAL) deneyapkart1A.menu.CPUFreq.40.build.f_cpu=40000000L -deneyapkart1A.menu.CPUFreq.20=20MHz +deneyapkart1A.menu.CPUFreq.26=26MHz (26MHz XTAL) +deneyapkart1A.menu.CPUFreq.26.build.f_cpu=26000000L +deneyapkart1A.menu.CPUFreq.20=20MHz (40MHz XTAL) deneyapkart1A.menu.CPUFreq.20.build.f_cpu=20000000L -deneyapkart1A.menu.CPUFreq.10=10MHz +deneyapkart1A.menu.CPUFreq.13=13MHz (26MHz XTAL) +deneyapkart1A.menu.CPUFreq.13.build.f_cpu=13000000L +deneyapkart1A.menu.CPUFreq.10=10MHz (40MHz XTAL) deneyapkart1A.menu.CPUFreq.10.build.f_cpu=10000000L deneyapkart1A.menu.FlashMode.qio=QIO @@ -17363,6 +17429,17 @@ deneyapkart1A.menu.FlashFreq.80.build.flash_freq=80m deneyapkart1A.menu.FlashFreq.40=40MHz deneyapkart1A.menu.FlashFreq.40.build.flash_freq=40m +deneyapkart1A.menu.FlashSize.4M=4MB (32Mb) +deneyapkart1A.menu.FlashSize.4M.build.flash_size=4MB +deneyapkart1A.menu.FlashSize.8M=8MB (64Mb) +deneyapkart1A.menu.FlashSize.8M.build.flash_size=8MB +deneyapkart1A.menu.FlashSize.8M.build.partitions=default_8MB +deneyapkart1A.menu.FlashSize.2M=2MB (16Mb) +deneyapkart1A.menu.FlashSize.2M.build.flash_size=2MB +deneyapkart1A.menu.FlashSize.2M.build.partitions=minimal +deneyapkart1A.menu.FlashSize.16M=16MB (128Mb) +deneyapkart1A.menu.FlashSize.16M.build.flash_size=16MB + deneyapkart1A.menu.UploadSpeed.921600=921600 deneyapkart1A.menu.UploadSpeed.921600.upload.speed=921600 deneyapkart1A.menu.UploadSpeed.115200=115200 @@ -17378,6 +17455,16 @@ deneyapkart1A.menu.UploadSpeed.460800.upload.speed=460800 deneyapkart1A.menu.UploadSpeed.512000.windows=512000 deneyapkart1A.menu.UploadSpeed.512000.upload.speed=512000 +deneyapkart1A.menu.LoopCore.1=Core 1 +deneyapkart1A.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1 +deneyapkart1A.menu.LoopCore.0=Core 0 +deneyapkart1A.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0 + +deneyapkart1A.menu.EventsCore.1=Core 1 +deneyapkart1A.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1 +deneyapkart1A.menu.EventsCore.0=Core 0 +deneyapkart1A.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0 + deneyapkart1A.menu.DebugLevel.none=None deneyapkart1A.menu.DebugLevel.none.build.code_debug=0 deneyapkart1A.menu.DebugLevel.error=Error @@ -17400,7 +17487,7 @@ deneyapkart1A.menu.EraseFlash.all.upload.erase_cmd=-e deneyapkart1Av2.name=Deneyap Kart 1A v2 -deneyapkart1Av2.vid.0=0x303A +deneyapkart1Av2.vid.0=0x303a deneyapkart1Av2.pid.0=0x8147 deneyapkart1Av2.bootloader.tool=esptool_py @@ -17439,12 +17526,81 @@ deneyapkart1Av2.build.flash_mode=dio deneyapkart1Av2.build.boot=qio deneyapkart1Av2.build.boot_freq=80m deneyapkart1Av2.build.partitions=default -deneyapkart1Av2.build.defines= +deneyapkart1Av2.build.defines=-DBOARD_HAS_PSRAM deneyapkart1Av2.build.loop_core= deneyapkart1Av2.build.event_core= -deneyapkart1Av2.build.psram_type=qspi +deneyapkart1Av2.build.psram_type=opi deneyapkart1Av2.build.memory_type={build.boot}_{build.psram_type} +## IDE 2.0 Seems to not update the value +deneyapkart1Av2.menu.JTAGAdapter.default=Disabled +deneyapkart1Av2.menu.JTAGAdapter.default.build.copy_jtag_files=0 +deneyapkart1Av2.menu.JTAGAdapter.builtin=Integrated USB JTAG +deneyapkart1Av2.menu.JTAGAdapter.builtin.build.openocdscript=esp32s3-builtin.cfg +deneyapkart1Av2.menu.JTAGAdapter.builtin.build.copy_jtag_files=1 +deneyapkart1Av2.menu.JTAGAdapter.external=FTDI Adapter +deneyapkart1Av2.menu.JTAGAdapter.external.build.openocdscript=esp32s3-ftdi.cfg +deneyapkart1Av2.menu.JTAGAdapter.external.build.copy_jtag_files=1 +deneyapkart1Av2.menu.JTAGAdapter.bridge=ESP USB Bridge +deneyapkart1Av2.menu.JTAGAdapter.bridge.build.openocdscript=esp32s3-bridge.cfg +deneyapkart1Av2.menu.JTAGAdapter.bridge.build.copy_jtag_files=1 + +deneyapkart1Av2.menu.PSRAM.opi=OPI PSRAM +deneyapkart1Av2.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM +deneyapkart1Av2.menu.PSRAM.opi.build.psram_type=opi +deneyapkart1Av2.menu.PSRAM.disabled=Disabled +deneyapkart1Av2.menu.PSRAM.disabled.build.defines= +deneyapkart1Av2.menu.PSRAM.disabled.build.psram_type=qspi +deneyapkart1Av2.menu.PSRAM.enabled=QSPI PSRAM +deneyapkart1Av2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM +deneyapkart1Av2.menu.PSRAM.enabled.build.psram_type=qspi + +deneyapkart1Av2.menu.FlashMode.qio=QIO 80MHz +deneyapkart1Av2.menu.FlashMode.qio.build.flash_mode=dio +deneyapkart1Av2.menu.FlashMode.qio.build.boot=qio +deneyapkart1Av2.menu.FlashMode.qio.build.boot_freq=80m +deneyapkart1Av2.menu.FlashMode.qio.build.flash_freq=80m +deneyapkart1Av2.menu.FlashMode.qio120=QIO 120MHz +deneyapkart1Av2.menu.FlashMode.qio120.build.flash_mode=dio +deneyapkart1Av2.menu.FlashMode.qio120.build.boot=qio +deneyapkart1Av2.menu.FlashMode.qio120.build.boot_freq=120m +deneyapkart1Av2.menu.FlashMode.qio120.build.flash_freq=80m +deneyapkart1Av2.menu.FlashMode.dio=DIO 80MHz +deneyapkart1Av2.menu.FlashMode.dio.build.flash_mode=dio +deneyapkart1Av2.menu.FlashMode.dio.build.boot=dio +deneyapkart1Av2.menu.FlashMode.dio.build.boot_freq=80m +deneyapkart1Av2.menu.FlashMode.dio.build.flash_freq=80m +deneyapkart1Av2.menu.FlashMode.opi=OPI 80MHz +deneyapkart1Av2.menu.FlashMode.opi.build.flash_mode=dout +deneyapkart1Av2.menu.FlashMode.opi.build.boot=opi +deneyapkart1Av2.menu.FlashMode.opi.build.boot_freq=80m +deneyapkart1Av2.menu.FlashMode.opi.build.flash_freq=80m + +deneyapkart1Av2.menu.FlashSize.4M=4MB (32Mb) +deneyapkart1Av2.menu.FlashSize.4M.build.flash_size=4MB +deneyapkart1Av2.menu.FlashSize.8M=8MB (64Mb) +deneyapkart1Av2.menu.FlashSize.8M.build.flash_size=8MB +deneyapkart1Av2.menu.FlashSize.8M.build.partitions=default_8MB +deneyapkart1Av2.menu.FlashSize.16M=16MB (128Mb) +deneyapkart1Av2.menu.FlashSize.16M.build.flash_size=16MB +#deneyapkart1Av2.menu.FlashSize.32M=32MB (256Mb) +#deneyapkart1Av2.menu.FlashSize.32M.build.flash_size=32MB + +deneyapkart1Av2.menu.LoopCore.1=Core 1 +deneyapkart1Av2.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1 +deneyapkart1Av2.menu.LoopCore.0=Core 0 +deneyapkart1Av2.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0 + +deneyapkart1Av2.menu.EventsCore.1=Core 1 +deneyapkart1Av2.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1 +deneyapkart1Av2.menu.EventsCore.0=Core 0 +deneyapkart1Av2.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0 + +deneyapkart1Av2.menu.USBMode.hwcdc=Hardware CDC and JTAG +deneyapkart1Av2.menu.USBMode.hwcdc.build.usb_mode=1 +deneyapkart1Av2.menu.USBMode.default=USB-OTG (TinyUSB) +deneyapkart1Av2.menu.USBMode.default.build.usb_mode=0 + deneyapkart1Av2.menu.CDCOnBoot.cdc=Enabled deneyapkart1Av2.menu.CDCOnBoot.cdc.build.cdc_on_boot=1 deneyapkart1Av2.menu.CDCOnBoot.default=Disabled @@ -17460,15 +17616,12 @@ deneyapkart1Av2.menu.DFUOnBoot.default.build.dfu_on_boot=0 deneyapkart1Av2.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode) deneyapkart1Av2.menu.DFUOnBoot.dfu.build.dfu_on_boot=1 -deneyapkart1Av2.menu.PSRAM.disabled=Disabled -deneyapkart1Av2.menu.PSRAM.disabled.build.defines= -deneyapkart1Av2.menu.PSRAM.disabled.build.psram_type=qspi -deneyapkart1Av2.menu.PSRAM.enabled=QSPI PSRAM -deneyapkart1Av2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -deneyapkart1Av2.menu.PSRAM.enabled.build.psram_type=qspi -deneyapkart1Av2.menu.PSRAM.opi=OPI PSRAM -deneyapkart1Av2.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM -deneyapkart1Av2.menu.PSRAM.opi.build.psram_type=opi +deneyapkart1Av2.menu.UploadMode.default=UART0 / Hardware CDC +deneyapkart1Av2.menu.UploadMode.default.upload.use_1200bps_touch=false +deneyapkart1Av2.menu.UploadMode.default.upload.wait_for_upload_port=false +deneyapkart1Av2.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB) +deneyapkart1Av2.menu.UploadMode.cdc.upload.use_1200bps_touch=true +deneyapkart1Av2.menu.UploadMode.cdc.upload.wait_for_upload_port=true deneyapkart1Av2.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS) deneyapkart1Av2.menu.PartitionScheme.default.build.partitions=default @@ -17520,46 +17673,6 @@ deneyapkart1Av2.menu.CPUFreq.20.build.f_cpu=20000000L deneyapkart1Av2.menu.CPUFreq.10=10MHz deneyapkart1Av2.menu.CPUFreq.10.build.f_cpu=10000000L -deneyapkart1Av2.menu.FlashMode.qio=QIO 80MHz -deneyapkart1Av2.menu.FlashMode.qio.build.flash_mode=dio -deneyapkart1Av2.menu.FlashMode.qio.build.boot=qio -deneyapkart1Av2.menu.FlashMode.qio.build.boot_freq=80m -deneyapkart1Av2.menu.FlashMode.qio.build.flash_freq=80m -deneyapkart1Av2.menu.FlashMode.qio120=QIO 120MHz -deneyapkart1Av2.menu.FlashMode.qio120.build.flash_mode=dio -deneyapkart1Av2.menu.FlashMode.qio120.build.boot=qio -deneyapkart1Av2.menu.FlashMode.qio120.build.boot_freq=120m -deneyapkart1Av2.menu.FlashMode.qio120.build.flash_freq=80m -deneyapkart1Av2.menu.FlashMode.dio=DIO 80MHz -deneyapkart1Av2.menu.FlashMode.dio.build.flash_mode=dio -deneyapkart1Av2.menu.FlashMode.dio.build.boot=dio -deneyapkart1Av2.menu.FlashMode.dio.build.boot_freq=80m -deneyapkart1Av2.menu.FlashMode.dio.build.flash_freq=80m -deneyapkart1Av2.menu.FlashMode.opi=OPI 80MHz -deneyapkart1Av2.menu.FlashMode.opi.build.flash_mode=dout -deneyapkart1Av2.menu.FlashMode.opi.build.boot=opi -deneyapkart1Av2.menu.FlashMode.opi.build.boot_freq=80m -deneyapkart1Av2.menu.FlashMode.opi.build.flash_freq=80m - -deneyapkart1Av2.menu.FlashSize.4M=4MB (32Mb) -deneyapkart1Av2.menu.FlashSize.4M.build.flash_size=4MB -deneyapkart1Av2.menu.FlashSize.8M=8MB (64Mb) -deneyapkart1Av2.menu.FlashSize.8M.build.flash_size=8MB -deneyapkart1Av2.menu.FlashSize.8M.build.partitions=default_8MB -deneyapkart1Av2.menu.FlashSize.16M=16MB (128Mb) -deneyapkart1Av2.menu.FlashSize.16M.build.flash_size=16MB -deneyapkart1Av2.menu.FlashSize.32M=32MB (256Mb) -deneyapkart1Av2.menu.FlashSize.32M.build.flash_size=32MB - -deneyapkart1Av2.menu.UploadMode.default=Internal USB -deneyapkart1Av2.menu.UploadMode.default.upload.use_1200bps_touch=true -deneyapkart1Av2.menu.UploadMode.default.upload.wait_for_upload_port=true -deneyapkart1Av2.menu.UploadMode.default.upload.mode=default_reset -deneyapkart1Av2.menu.UploadMode.cdc=UART0 -deneyapkart1Av2.menu.UploadMode.cdc.upload.use_1200bps_touch=false -deneyapkart1Av2.menu.UploadMode.cdc.upload.wait_for_upload_port=false -deneyapkart1Av2.menu.UploadMode.cdc.upload.mode=default_reset - deneyapkart1Av2.menu.UploadSpeed.921600=921600 deneyapkart1Av2.menu.UploadSpeed.921600.upload.speed=921600 deneyapkart1Av2.menu.UploadSpeed.115200=115200 @@ -17575,21 +17688,6 @@ deneyapkart1Av2.menu.UploadSpeed.460800.upload.speed=460800 deneyapkart1Av2.menu.UploadSpeed.512000.windows=512000 deneyapkart1Av2.menu.UploadSpeed.512000.upload.speed=512000 -deneyapkart1Av2.menu.LoopCore.1=Core 1 -deneyapkart1Av2.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1 -deneyapkart1Av2.menu.LoopCore.0=Core 0 -deneyapkart1Av2.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0 - -deneyapkart1Av2.menu.EventsCore.1=Core 1 -deneyapkart1Av2.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1 -deneyapkart1Av2.menu.EventsCore.0=Core 0 -deneyapkart1Av2.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0 - -deneyapkart1Av2.menu.USBMode.default=USB-OTG (TinyUSB) -deneyapkart1Av2.menu.USBMode.default.build.usb_mode=0 -deneyapkart1Av2.menu.USBMode.hwcdc=Hardware CDC and JTAG -deneyapkart1Av2.menu.USBMode.hwcdc.build.usb_mode=1 - deneyapkart1Av2.menu.DebugLevel.none=None deneyapkart1Av2.menu.DebugLevel.none.build.code_debug=0 deneyapkart1Av2.menu.DebugLevel.error=Error @@ -17612,7 +17710,7 @@ deneyapkart1Av2.menu.EraseFlash.all.upload.erase_cmd=-e deneyapmini.name=Deneyap Mini -deneyapmini.vid.0=0x303A +deneyapmini.vid.0=0x303a deneyapmini.pid.0=0x8141 deneyapmini.bootloader.tool=esptool_py @@ -17626,8 +17724,8 @@ deneyapmini.upload.maximum_size=1310720 deneyapmini.upload.maximum_data_size=327680 deneyapmini.upload.flags= deneyapmini.upload.extra_flags= -deneyapmini.upload.use_1200bps_touch=true -deneyapmini.upload.wait_for_upload_port=true +deneyapmini.upload.use_1200bps_touch=false +deneyapmini.upload.wait_for_upload_port=false deneyapmini.serial.disableDTR=false deneyapmini.serial.disableRTS=false @@ -17646,15 +17744,25 @@ deneyapmini.build.dfu_on_boot=0 deneyapmini.build.f_cpu=240000000L deneyapmini.build.flash_size=4MB deneyapmini.build.flash_freq=80m -deneyapmini.build.flash_mode=qio +deneyapmini.build.flash_mode=dio deneyapmini.build.boot=qio deneyapmini.build.partitions=default deneyapmini.build.defines= -deneyapmini.menu.CDCOnBoot.default=Enabled -deneyapmini.menu.CDCOnBoot.default.build.cdc_on_boot=1 -deneyapmini.menu.CDCOnBoot.cdc=Disabled -deneyapmini.menu.CDCOnBoot.cdc.build.cdc_on_boot=0 +## IDE 2.0 Seems to not update the value +deneyapmini.menu.JTAGAdapter.default=Disabled +deneyapmini.menu.JTAGAdapter.default.build.copy_jtag_files=0 +deneyapmini.menu.JTAGAdapter.external=FTDI Adapter +deneyapmini.menu.JTAGAdapter.external.build.openocdscript=esp32s2-kaluga-1.cfg +deneyapmini.menu.JTAGAdapter.external.build.copy_jtag_files=1 +deneyapmini.menu.JTAGAdapter.bridge=ESP USB Bridge +deneyapmini.menu.JTAGAdapter.bridge.build.openocdscript=esp32s2-bridge.cfg +deneyapmini.menu.JTAGAdapter.bridge.build.copy_jtag_files=1 + +deneyapmini.menu.CDCOnBoot.cdc=Enabled +deneyapmini.menu.CDCOnBoot.cdc.build.cdc_on_boot=1 +deneyapmini.menu.CDCOnBoot.default=Disabled +deneyapmini.menu.CDCOnBoot.default.build.cdc_on_boot=0 deneyapmini.menu.MSCOnBoot.default=Disabled deneyapmini.menu.MSCOnBoot.default.build.msc_on_boot=0 @@ -17666,6 +17774,13 @@ deneyapmini.menu.DFUOnBoot.default.build.dfu_on_boot=0 deneyapmini.menu.DFUOnBoot.dfu=Enabled deneyapmini.menu.DFUOnBoot.dfu.build.dfu_on_boot=1 +deneyapmini.menu.UploadMode.cdc=Internal USB +deneyapmini.menu.UploadMode.cdc.upload.use_1200bps_touch=true +deneyapmini.menu.UploadMode.cdc.upload.wait_for_upload_port=true +deneyapmini.menu.UploadMode.default=UART0 +deneyapmini.menu.UploadMode.default.upload.use_1200bps_touch=false +deneyapmini.menu.UploadMode.default.upload.wait_for_upload_port=false + deneyapmini.menu.PSRAM.disabled=Disabled deneyapmini.menu.PSRAM.disabled.build.defines= deneyapmini.menu.PSRAM.enabled=Enabled @@ -17750,15 +17865,6 @@ deneyapmini.menu.FlashSize.2M.build.partitions=minimal deneyapmini.menu.FlashSize.16M=16MB (128Mb) deneyapmini.menu.FlashSize.16M.build.flash_size=16MB -deneyapmini.menu.UploadMode.default=Internal USB -deneyapmini.menu.UploadMode.default.upload.use_1200bps_touch=true -deneyapmini.menu.UploadMode.default.upload.wait_for_upload_port=true -deneyapmini.menu.UploadMode.default.upload.mode=default_reset -deneyapmini.menu.UploadMode.cdc=UART0 -deneyapmini.menu.UploadMode.cdc.upload.use_1200bps_touch=false -deneyapmini.menu.UploadMode.cdc.upload.wait_for_upload_port=false -deneyapmini.menu.UploadMode.cdc.upload.mode=default_reset - deneyapmini.menu.UploadSpeed.921600=921600 deneyapmini.menu.UploadSpeed.921600.upload.speed=921600 deneyapmini.menu.UploadSpeed.115200=115200 @@ -17796,7 +17902,7 @@ deneyapmini.menu.EraseFlash.all.upload.erase_cmd=-e deneyapminiv2.name=Deneyap Mini v2 -deneyapminiv2.vid.0=0x303A +deneyapminiv2.vid.0=0x303a deneyapminiv2.pid.0=0x8144 deneyapminiv2.bootloader.tool=esptool_py @@ -17830,15 +17936,25 @@ deneyapminiv2.build.dfu_on_boot=0 deneyapminiv2.build.f_cpu=240000000L deneyapminiv2.build.flash_size=4MB deneyapminiv2.build.flash_freq=80m -deneyapminiv2.build.flash_mode=qio +deneyapminiv2.build.flash_mode=dio deneyapminiv2.build.boot=qio deneyapminiv2.build.partitions=default -deneyapminiv2.build.defines= +deneyapminiv2.build.defines=-DBOARD_HAS_PSRAM -deneyapminiv2.menu.CDCOnBoot.default=Enabled -deneyapminiv2.menu.CDCOnBoot.default.build.cdc_on_boot=1 -deneyapminiv2.menu.CDCOnBoot.cdc=Disabled -deneyapminiv2.menu.CDCOnBoot.cdc.build.cdc_on_boot=0 +## IDE 2.0 Seems to not update the value +deneyapminiv2.menu.JTAGAdapter.default=Disabled +deneyapminiv2.menu.JTAGAdapter.default.build.copy_jtag_files=0 +deneyapminiv2.menu.JTAGAdapter.external=FTDI Adapter +deneyapminiv2.menu.JTAGAdapter.external.build.openocdscript=esp32s2-kaluga-1.cfg +deneyapminiv2.menu.JTAGAdapter.external.build.copy_jtag_files=1 +deneyapminiv2.menu.JTAGAdapter.bridge=ESP USB Bridge +deneyapminiv2.menu.JTAGAdapter.bridge.build.openocdscript=esp32s2-bridge.cfg +deneyapminiv2.menu.JTAGAdapter.bridge.build.copy_jtag_files=1 + +deneyapminiv2.menu.CDCOnBoot.cdc=Enabled +deneyapminiv2.menu.CDCOnBoot.cdc.build.cdc_on_boot=1 +deneyapminiv2.menu.CDCOnBoot.default=Disabled +deneyapminiv2.menu.CDCOnBoot.default.build.cdc_on_boot=0 deneyapminiv2.menu.MSCOnBoot.default=Disabled deneyapminiv2.menu.MSCOnBoot.default.build.msc_on_boot=0 @@ -17850,15 +17966,17 @@ deneyapminiv2.menu.DFUOnBoot.default.build.dfu_on_boot=0 deneyapminiv2.menu.DFUOnBoot.dfu=Enabled deneyapminiv2.menu.DFUOnBoot.dfu.build.dfu_on_boot=1 -deneyapminiv2.menu.PSRAM.enabled=QSPI PSRAM +deneyapminiv2.menu.UploadMode.cdc=Internal USB +deneyapminiv2.menu.UploadMode.cdc.upload.use_1200bps_touch=true +deneyapminiv2.menu.UploadMode.cdc.upload.wait_for_upload_port=true +deneyapminiv2.menu.UploadMode.default=UART0 +deneyapminiv2.menu.UploadMode.default.upload.use_1200bps_touch=false +deneyapminiv2.menu.UploadMode.default.upload.wait_for_upload_port=false + +deneyapminiv2.menu.PSRAM.enabled=Enabled deneyapminiv2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -deneyapminiv2.menu.PSRAM.enabled.build.psram_type=qspi deneyapminiv2.menu.PSRAM.disabled=Disabled deneyapminiv2.menu.PSRAM.disabled.build.defines= -deneyapminiv2.menu.PSRAM.disabled.build.psram_type=qspi -deneyapminiv2.menu.PSRAM.opi=OPI PSRAM -deneyapminiv2.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM -deneyapminiv2.menu.PSRAM.opi.build.psram_type=opi deneyapminiv2.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS) deneyapminiv2.menu.PartitionScheme.default.build.partitions=default @@ -17910,26 +18028,18 @@ deneyapminiv2.menu.CPUFreq.20.build.f_cpu=20000000L deneyapminiv2.menu.CPUFreq.10=10MHz deneyapminiv2.menu.CPUFreq.10.build.f_cpu=10000000L -deneyapminiv2.menu.FlashMode.qio=QIO 80MHz +deneyapminiv2.menu.FlashMode.qio=QIO deneyapminiv2.menu.FlashMode.qio.build.flash_mode=dio deneyapminiv2.menu.FlashMode.qio.build.boot=qio -deneyapminiv2.menu.FlashMode.qio.build.boot_freq=80m -deneyapminiv2.menu.FlashMode.qio.build.flash_freq=80m -deneyapminiv2.menu.FlashMode.qio120=QIO 120MHz -deneyapminiv2.menu.FlashMode.qio120.build.flash_mode=dio -deneyapminiv2.menu.FlashMode.qio120.build.boot=qio -deneyapminiv2.menu.FlashMode.qio120.build.boot_freq=120m -deneyapminiv2.menu.FlashMode.qio120.build.flash_freq=80m -deneyapminiv2.menu.FlashMode.dio=DIO 80MHz +deneyapminiv2.menu.FlashMode.dio=DIO deneyapminiv2.menu.FlashMode.dio.build.flash_mode=dio deneyapminiv2.menu.FlashMode.dio.build.boot=dio -deneyapminiv2.menu.FlashMode.dio.build.boot_freq=80m -deneyapminiv2.menu.FlashMode.dio.build.flash_freq=80m -deneyapminiv2.menu.FlashMode.opi=OPI 80MHz -deneyapminiv2.menu.FlashMode.opi.build.flash_mode=dout -deneyapminiv2.menu.FlashMode.opi.build.boot=opi -deneyapminiv2.menu.FlashMode.opi.build.boot_freq=80m -deneyapminiv2.menu.FlashMode.opi.build.flash_freq=80m +deneyapminiv2.menu.FlashMode.qout=QOUT +deneyapminiv2.menu.FlashMode.qout.build.flash_mode=dout +deneyapminiv2.menu.FlashMode.qout.build.boot=qout +deneyapminiv2.menu.FlashMode.dout=DOUT +deneyapminiv2.menu.FlashMode.dout.build.flash_mode=dout +deneyapminiv2.menu.FlashMode.dout.build.boot=dout deneyapminiv2.menu.FlashFreq.80=80MHz deneyapminiv2.menu.FlashFreq.80.build.flash_freq=80m @@ -17938,15 +18048,14 @@ deneyapminiv2.menu.FlashFreq.40.build.flash_freq=40m deneyapminiv2.menu.FlashSize.4M=4MB (32Mb) deneyapminiv2.menu.FlashSize.4M.build.flash_size=4MB - -deneyapminiv2.menu.UploadMode.default=Internal USB -deneyapminiv2.menu.UploadMode.default.upload.use_1200bps_touch=true -deneyapminiv2.menu.UploadMode.default.upload.wait_for_upload_port=true -deneyapminiv2.menu.UploadMode.default.upload.mode=default_reset -deneyapminiv2.menu.UploadMode.cdc=UART0 -deneyapminiv2.menu.UploadMode.cdc.upload.use_1200bps_touch=false -deneyapminiv2.menu.UploadMode.cdc.upload.wait_for_upload_port=false -deneyapminiv2.menu.UploadMode.cdc.upload.mode=default_reset +deneyapminiv2.menu.FlashSize.8M=8MB (64Mb) +deneyapminiv2.menu.FlashSize.8M.build.flash_size=8MB +deneyapminiv2.menu.FlashSize.8M.build.partitions=default_8MB +deneyapminiv2.menu.FlashSize.2M=2MB (16Mb) +deneyapminiv2.menu.FlashSize.2M.build.flash_size=2MB +deneyapminiv2.menu.FlashSize.2M.build.partitions=minimal +deneyapminiv2.menu.FlashSize.16M=16MB (128Mb) +deneyapminiv2.menu.FlashSize.16M.build.flash_size=16MB deneyapminiv2.menu.UploadSpeed.921600=921600 deneyapminiv2.menu.UploadSpeed.921600.upload.speed=921600 @@ -17979,13 +18088,13 @@ deneyapminiv2.menu.DebugLevel.verbose.build.code_debug=5 deneyapminiv2.menu.EraseFlash.none=Disabled deneyapminiv2.menu.EraseFlash.none.upload.erase_cmd= deneyapminiv2.menu.EraseFlash.all=Enabled -deneyapminiv2.menu.EraseFlash.all.upload.erase_cmd=- +deneyapminiv2.menu.EraseFlash.all.upload.erase_cmd=-e ############################################################## -deneyapkartg.name=Deneyap Kart G +deneyapkartg.name=Deneyap Kart G -deneyapkartg.vid.0=0x303A +deneyapkartg.vid.0=0x303a deneyapkartg.pid.0=0x814A deneyapkartg.bootloader.tool=esptool_py @@ -18002,8 +18111,8 @@ deneyapkartg.upload.extra_flags= deneyapkartg.upload.use_1200bps_touch=false deneyapkartg.upload.wait_for_upload_port=false -deneyapkartg.serial.disableDTR=true -deneyapkartg.serial.disableRTS=true +deneyapkartg.serial.disableDTR=false +deneyapkartg.serial.disableRTS=false deneyapkartg.build.tarch=riscv32 deneyapkartg.build.target=esp @@ -18017,11 +18126,24 @@ deneyapkartg.build.cdc_on_boot=1 deneyapkartg.build.f_cpu=160000000L deneyapkartg.build.flash_size=4MB deneyapkartg.build.flash_freq=80m -deneyapkartg.build.flash_mode=qio +deneyapkartg.build.flash_mode=dio deneyapkartg.build.boot=qio deneyapkartg.build.partitions=default deneyapkartg.build.defines= +## IDE 2.0 Seems to not update the value +deneyapkartg.menu.JTAGAdapter.default=Disabled +deneyapkartg.menu.JTAGAdapter.default.build.copy_jtag_files=0 +deneyapkartg.menu.JTAGAdapter.builtin=Integrated USB JTAG +deneyapkartg.menu.JTAGAdapter.builtin.build.openocdscript=esp32c3-builtin.cfg +deneyapkartg.menu.JTAGAdapter.builtin.build.copy_jtag_files=1 +deneyapkartg.menu.JTAGAdapter.external=FTDI Adapter +deneyapkartg.menu.JTAGAdapter.external.build.openocdscript=esp32c3-ftdi.cfg +deneyapkartg.menu.JTAGAdapter.external.build.copy_jtag_files=1 +deneyapkartg.menu.JTAGAdapter.bridge=ESP USB Bridge +deneyapkartg.menu.JTAGAdapter.bridge.build.openocdscript=esp32c3-bridge.cfg +deneyapkartg.menu.JTAGAdapter.bridge.build.copy_jtag_files=1 + deneyapkartg.menu.CDCOnBoot.cdc=Enabled deneyapkartg.menu.CDCOnBoot.cdc.build.cdc_on_boot=1 deneyapkartg.menu.CDCOnBoot.default=Disabled @@ -21382,7 +21504,7 @@ roboheart_hercules.menu.CPUFreq.80=80MHz (WiFi/BT) roboheart_hercules.menu.CPUFreq.80.build.f_cpu=80000000L roboheart_hercules.menu.CPUFreq.40=40MHz roboheart_hercules.menu.CPUFreq.40.build.f_cpu=40000000L -roboheart_hercules.menu.CPUFreq.20=20MHz +roboheart_hercules.menu.CPUFreq.20=20MHz roboheart_hercules.menu.CPUFreq.20.build.f_cpu=20000000L roboheart_hercules.menu.CPUFreq.10=10MHz roboheart_hercules.menu.CPUFreq.10.build.f_cpu=10000000L diff --git a/variants/deneyapkart/pins_arduino.h b/variants/deneyapkart/pins_arduino.h index 4c672e8dd..51951d319 100644 --- a/variants/deneyapkart/pins_arduino.h +++ b/variants/deneyapkart/pins_arduino.h @@ -11,53 +11,56 @@ #define digitalPinToInterrupt(p) (((p)<40)?(p):-1) #define digitalPinHasPWM(p) (p < 34) -#define LEDR 3 -#define LEDG 1 -#define LEDB 4 - -#define BUILTIN_LED LEDB -#define LED_BUILTIN LEDB // backward compatibility -//#define RGB_BUILTIN LED_BUILTIN - -static const uint8_t GPKEY = 0; +static const uint8_t LED_BUILTIN = 4; +#define BUILTIN_LED LED_BUILTIN +#define LED_BUILTIN LED_BUILTIN +#define LEDB LED_BUILTIN +#define LEDR 3 +#define LEDG 1 +#define LEDB 4 + +static const uint8_t GPKEY = 0; #define KEY_BUILTIN GPKEY #define BUILTIN_KEY GPKEY +#define BOOT GPKEY static const uint8_t TX = 1; static const uint8_t RX = 3; +#define TX1 TX +#define RX1 RX static const uint8_t SDA = 4; static const uint8_t SCL = 15; -static const uint8_t SS = 21; +static const uint8_t SS = 21; static const uint8_t MOSI = 5; static const uint8_t MISO = 18; -static const uint8_t SCK = 19; +static const uint8_t SCK = 19; static const uint8_t A0 = 36; static const uint8_t A1 = 39; -static const uint8_t A2 = 32; -static const uint8_t A3 = 33; -static const uint8_t A4 = 34; -static const uint8_t A5 = 35; +static const uint8_t A2 = 34; +static const uint8_t A3 = 35; +static const uint8_t A4 = 32; +static const uint8_t A5 = 33; -static const uint8_t T0 = 34; -static const uint8_t T1 = 35; +static const uint8_t T0 = 32; +static const uint8_t T1 = 33; static const uint8_t T2 = 27; static const uint8_t T3 = 14; static const uint8_t T4 = 12; -static const uint8_t T5 = 13; - -static const uint8_t D0 = 23; -static const uint8_t D1 = 22; -static const uint8_t D2 = 1; -static const uint8_t D3 = 3; -static const uint8_t D4 = 21; -static const uint8_t D5 = 19; -static const uint8_t D6 = 18; -static const uint8_t D7 = 5; -static const uint8_t D8 = 0; -static const uint8_t D9 = 2; +static const uint8_t T5 = 13; + +static const uint8_t D0 = 23; +static const uint8_t D1 = 22; +static const uint8_t D2 = 1; +static const uint8_t D3 = 3; +static const uint8_t D4 = 21; +static const uint8_t D5 = 19; +static const uint8_t D6 = 18; +static const uint8_t D7 = 5; +static const uint8_t D8 = 0; +static const uint8_t D9 = 2; static const uint8_t D10 = 4; static const uint8_t D11 = 15; static const uint8_t D12 = 13; diff --git a/variants/deneyapkart1A/pins_arduino.h b/variants/deneyapkart1A/pins_arduino.h index 9196bd9fc..7f71dd445 100644 --- a/variants/deneyapkart1A/pins_arduino.h +++ b/variants/deneyapkart1A/pins_arduino.h @@ -2,62 +2,64 @@ #define Pins_Arduino_h #include -#include "soc/soc_caps.h" #define EXTERNAL_NUM_INTERRUPTS 16 #define NUM_DIGITAL_PINS 40 #define NUM_ANALOG_INPUTS 16 -static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+13; -#define BUILTIN_LED LED_BUILTIN // backward compatibility -#define LED_BUILTIN LED_BUILTIN -#define RGB_BUILTIN LED_BUILTIN -#define RGBLED LED_BUILTIN -#define RGB_BRIGHTNESS 64 - #define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1) #define digitalPinToInterrupt(p) (((p)<40)?(p):-1) #define digitalPinHasPWM(p) (p < 34) -static const uint8_t GPKEY = 0; +static const uint8_t LED_BUILTIN = 13; +#define BUILTIN_LED LED_BUILTIN +#define LED_BUILTIN LED_BUILTIN +#define RGB_BUILTIN LED_BUILTIN +#define RGBLED LED_BUILTIN +#define RGB_BRIGHTNESS 64 + +static const uint8_t GPKEY = 0; #define KEY_BUILTIN GPKEY #define BUILTIN_KEY GPKEY +#define BOOT GPKEY static const uint8_t TX = 1; static const uint8_t RX = 3; +#define TX1 TX +#define RX1 RX static const uint8_t SDA = 4; static const uint8_t SCL = 15; -static const uint8_t SS = 21; +static const uint8_t SS = 21; static const uint8_t MOSI = 5; static const uint8_t MISO = 18; -static const uint8_t SCK = 19; +static const uint8_t SCK = 19; static const uint8_t A0 = 36; static const uint8_t A1 = 39; -static const uint8_t A2 = 32; -static const uint8_t A3 = 33; -static const uint8_t A4 = 34; -static const uint8_t A5 = 35; +static const uint8_t A2 = 34; +static const uint8_t A3 = 35; +static const uint8_t A4 = 32; +static const uint8_t A5 = 33; -static const uint8_t T0 = 34; -static const uint8_t T1 = 35; +static const uint8_t T0 = 32; +static const uint8_t T1 = 33; static const uint8_t T2 = 27; static const uint8_t T3 = 14; static const uint8_t T4 = 12; -static const uint8_t T5 = 13; - -static const uint8_t D0 = 23; -static const uint8_t D1 = 22; -static const uint8_t D2 = 1; -static const uint8_t D3 = 3; -static const uint8_t D4 = 21; -static const uint8_t D5 = 19; -static const uint8_t D6 = 18; -static const uint8_t D7 = 5; -static const uint8_t D8 = 0; -static const uint8_t D9 = 2; +static const uint8_t T5 = 13; + +static const uint8_t D0 = 23; +static const uint8_t D1 = 22; +static const uint8_t D2 = 1; +static const uint8_t D3 = 3; +static const uint8_t D4 = 21; +static const uint8_t D5 = 19; +static const uint8_t D6 = 18; +static const uint8_t D7 = 5; +static const uint8_t D8 = 0; +static const uint8_t D9 = 2; static const uint8_t D10 = 4; static const uint8_t D11 = 15; static const uint8_t D12 = 13; diff --git a/variants/deneyapkart1Av2/pins_arduino.h b/variants/deneyapkart1Av2/pins_arduino.h index 153a5b324..9c0ab3df9 100644 --- a/variants/deneyapkart1Av2/pins_arduino.h +++ b/variants/deneyapkart1Av2/pins_arduino.h @@ -2,7 +2,6 @@ #define Pins_Arduino_h #include -#include "soc/soc_caps.h" #define USB_VID 0x303A #define USB_PID 0x8147 @@ -14,60 +13,80 @@ #define NUM_DIGITAL_PINS 48 #define NUM_ANALOG_INPUTS 20 -static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+48; -#define BUILTIN_LED LED_BUILTIN // backward compatibility -#define LED_BUILTIN LED_BUILTIN -#define RGB_BUILTIN LED_BUILTIN -#define RGBLED LED_BUILTIN -#define RGB_BRIGHTNESS 64 - #define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1) #define digitalPinToInterrupt(p) (((p)<48)?(p):-1) #define digitalPinHasPWM(p) (p < 46) -static const uint8_t GPKEY = 0; +static const uint8_t LED_BUILTIN = 48; +#define BUILTIN_LED LED_BUILTIN +#define LED_BUILTIN LED_BUILTIN +#define RGB_BUILTIN LED_BUILTIN +#define RGBLED LED_BUILTIN +#define RGB_BRIGHTNESS 64 + +static const uint8_t GPKEY = 0; #define KEY_BUILTIN GPKEY #define BUILTIN_KEY GPKEY -static const uint8_t TX = 43; -static const uint8_t RX = 44; +static const uint8_t TX = 43; +static const uint8_t RX = 44; +#define TX1 TX +#define RX1 RX -static const uint8_t SDA = 47; -static const uint8_t SCL = 21; +static const uint8_t SDA = 47; +static const uint8_t SCL = 21; static const uint8_t SS = 42; static const uint8_t MOSI = 39; static const uint8_t MISO = 40; static const uint8_t SCK = 41; -static const uint8_t A0 = 4; -static const uint8_t A1 = 5; -static const uint8_t A2 = 6; -static const uint8_t A3 = 7; -static const uint8_t A4 = 15; -static const uint8_t A5 = 16; -static const uint8_t A6 = 17; -static const uint8_t A7 = 18; - -static const uint8_t D0 = 1; -static const uint8_t D1 = 2; -static const uint8_t D2 = 43; -static const uint8_t D3 = 44; -static const uint8_t D4 = 42; -static const uint8_t D5 = 41; -static const uint8_t D6 = 40; -static const uint8_t D7 = 39; -static const uint8_t D8 = 38; -static const uint8_t D9 = 48; -static const uint8_t D10 = 47; -static const uint8_t D11 = 21; -static const uint8_t D12 = 0; -static const uint8_t D13 = 10; -static const uint8_t D14 = 3; -static const uint8_t D15 = 8; - -static const uint8_t PWM0 = 1; -static const uint8_t PWM1 = 2; +static const uint8_t A0 = 4; +static const uint8_t A1 = 5; +static const uint8_t A2 = 6; +static const uint8_t A3 = 7; +static const uint8_t A4 = 15; +static const uint8_t A5 = 16; +static const uint8_t A6 = 17; +static const uint8_t A7 = 18; +static const uint8_t A8 = 9; + +static const uint8_t T0 = 4; +static const uint8_t T1 = 5; +static const uint8_t T2 = 6; +static const uint8_t T3 = 7; +static const uint8_t T4 = 8; +static const uint8_t T5 = 3; +static const uint8_t T6 = 10; +static const uint8_t T7 = 1; +static const uint8_t T8 = 2; + +static const uint8_t D0 = 1; +static const uint8_t D1 = 2; +static const uint8_t D2 = 43; +static const uint8_t D3 = 44; +static const uint8_t D4 = 42; +static const uint8_t D5 = 41; +static const uint8_t D6 = 40; +static const uint8_t D7 = 39; +static const uint8_t D8 = 38; +static const uint8_t D9 = 48; +static const uint8_t D10 = 47; +static const uint8_t D11 = 21; +static const uint8_t D12 = 10; +static const uint8_t D13 = 3; +static const uint8_t D14 = 8; +static const uint8_t D15 = 0; +static const uint8_t D16 = 13; +static const uint8_t D17 = 12; +static const uint8_t D18 = 11; +static const uint8_t D19 = 14; + +static const uint8_t PWM0 = 15; +static const uint8_t PWM1 = 16; +static const uint8_t PWM2 = 17; +static const uint8_t PWM3 = 18; +static const uint8_t PWM4 = 38; static const uint8_t CAMSD = 4; static const uint8_t CAMSC = 5; @@ -89,4 +108,6 @@ static const uint8_t SDMO = 12; static const uint8_t SDCS = 11; static const uint8_t SDCK = 13; +static const uint8_t BAT = 9; + #endif /* Pins_Arduino_h */ diff --git a/variants/deneyapkartg/pins_arduino.h b/variants/deneyapkartg/pins_arduino.h index c0b30f3dc..1fa08d089 100644 --- a/variants/deneyapkartg/pins_arduino.h +++ b/variants/deneyapkartg/pins_arduino.h @@ -2,7 +2,6 @@ #define Pins_Arduino_h #include -#include "soc/soc_caps.h" #define USB_VID 0x303A #define USB_PID 0x814A @@ -14,31 +13,34 @@ #define NUM_DIGITAL_PINS 22 #define NUM_ANALOG_INPUTS 6 -static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+10; -#define BUILTIN_LED LED_BUILTIN // backward compatibility -#define LED_BUILTIN LED_BUILTIN -#define RGB_BUILTIN LED_BUILTIN -#define RGBLED LED_BUILTIN -#define RGB_BRIGHTNESS 64 - #define analogInputToDigitalPin(p) (((p) -#include "soc/soc_caps.h" #define USB_VID 0x303A #define USB_PID 0x8144 @@ -14,31 +13,33 @@ #define NUM_DIGITAL_PINS 48 #define NUM_ANALOG_INPUTS 20 -static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+33; -#define BUILTIN_LED LED_BUILTIN // backward compatibility -#define LED_BUILTIN LED_BUILTIN -#define RGB_BUILTIN LED_BUILTIN -#define RGBLED LED_BUILTIN -#define RGB_BRIGHTNESS 64 - #define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1) #define digitalPinToInterrupt(p) (((p)<48)?(p):-1) #define digitalPinHasPWM(p) (p < 46) -static const uint8_t GPKEY = 0; +static const uint8_t LED_BUILTIN = 33; +#define BUILTIN_LED LED_BUILTIN +#define LED_BUILTIN LED_BUILTIN +#define RGB_BUILTIN LED_BUILTIN +#define RGBLED LED_BUILTIN +#define RGB_BRIGHTNESS 64 + +static const uint8_t GPKEY = 0; #define KEY_BUILTIN GPKEY #define BUILTIN_KEY GPKEY static const uint8_t TX = 43; static const uint8_t RX = 44; +#define TX1 TX +#define RX1 RX static const uint8_t SDA = 36; static const uint8_t SCL = 37; -static const uint8_t SS = 21; -static const uint8_t MOSI = 40; -static const uint8_t MISO = 39; -static const uint8_t SCK = 38; +static const uint8_t SS = 21; +static const uint8_t MOSI = 40; +static const uint8_t MISO = 39; +static const uint8_t SCK = 38; static const uint8_t A0 = 7; static const uint8_t A1 = 8; @@ -57,16 +58,16 @@ static const uint8_t T4 = 11; static const uint8_t T5 = 12; static const uint8_t T6 = 13; -static const uint8_t D0 = 44; -static const uint8_t D1 = 43; -static const uint8_t D2 = 42; -static const uint8_t D3 = 41; -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 D0 = 44; +static const uint8_t D1 = 43; +static const uint8_t D2 = 42; +static const uint8_t D3 = 41; +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; @@ -76,7 +77,17 @@ static const uint8_t D14 = 33; static const uint8_t PWM0 = 42; static const uint8_t PWM1 = 41; -static const uint8_t DAC1 = 17; -static const uint8_t DAC2 = 18; +static const uint8_t DAC0 = 17; +static const uint8_t DAC1 = 18; + +#define SD SDA +#define SC SCL + +#define MO MOSI +#define MI MISO +#define MC SCK + +#define DA0 DAC0 +#define DA1 DAC1 #endif /* Pins_Arduino_h */ -- GitLab