Skip to content

Commit f5c9397

Browse files
committed
Update
Update core - Compiler changed -Core libraries updated -SDK updated Organize and arrange the libraries -All libraries separated in logical arrangement -Minor fixes and improvements
1 parent 48b122f commit f5c9397

File tree

2,979 files changed

+53823
-374148
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,979 files changed

+53823
-374148
lines changed

boards.txt

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
menu.UploadMode=Upload Mode
22
menu.UploadSpeed=Upload Speed
3+
menu.CDCOnBoot=USB CDC On Boot
34
menu.SerialMode=Serial Connected To
45
menu.CPUFreq=CPU Frequency
56
menu.FlashFreq=Flash Frequency
67
menu.FlashMode=Flash Mode
7-
menu.FlashSize=Flash Size
88
menu.PartitionScheme=Partition Scheme
9-
menu.DebugLevel=Core Debug Level
109
menu.PSRAM=PSRAM
10+
menu.DebugLevel=Core Debug Level
11+
menu.LoopCore=Arduino Runs On
12+
menu.EventsCore=Events Run On
13+
1114

1215
##############################################################
1316

@@ -16,6 +19,7 @@ dydk_mpv10.name=Deneyap Kart
1619
dydk_mpv10.upload.tool=esptool_py
1720
dydk_mpv10.upload.maximum_size=1310720
1821
dydk_mpv10.upload.maximum_data_size=327680
22+
dydk_mpv10.upload.wait_for_upload_port=true
1923
dydk_mpv10.upload.flags=
2024
dydk_mpv10.upload.extra_flags=
2125

@@ -167,10 +171,20 @@ dym_mpv10.build.boot=qio
167171
dym_mpv10.build.partitions=default
168172
dym_mpv10.build.defines=
169173

170-
dym_mpv10.menu.SerialMode.default=USB_CDC
171-
dym_mpv10.menu.SerialMode.default.build.serial=1
172-
dym_mpv10.menu.SerialMode.uart=UART0
173-
dym_mpv10.menu.SerialMode.uart.build.serial=0
174+
dym_mpv10.menu.CDCOnBoot.default=Enabled
175+
dym_mpv10.menu.CDCOnBoot.default.build.cdc_on_boot=1
176+
dym_mpv10.menu.CDCOnBoot.cdc=Disabled
177+
dym_mpv10.menu.CDCOnBoot.cdc.build.cdc_on_boot=0
178+
179+
dym_mpv10.menu.MSCOnBoot.default=Disabled
180+
dym_mpv10.menu.MSCOnBoot.default.build.msc_on_boot=0
181+
dym_mpv10.menu.MSCOnBoot.msc=Enabled
182+
dym_mpv10.menu.MSCOnBoot.msc.build.msc_on_boot=1
183+
184+
dym_mpv10.menu.DFUOnBoot.default=Disabled
185+
dym_mpv10.menu.DFUOnBoot.default.build.dfu_on_boot=0
186+
dym_mpv10.menu.DFUOnBoot.dfu=Enabled
187+
dym_mpv10.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
174188

175189
dym_mpv10.menu.PSRAM.disabled=Disabled
176190
dym_mpv10.menu.PSRAM.disabled.build.defines=

cores/esp32/Arduino.h

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,23 @@
9999
#define bit(b) (1UL << (b))
100100
#define _BV(b) (1UL << (b))
101101

102-
#define digitalPinToPort(pin) (((pin)>31)?1:0)
103-
#define digitalPinToBitMask(pin) (1UL << (((pin)>31)?((pin)-32):(pin)))
104102
#define digitalPinToTimer(pin) (0)
105103
#define analogInPinToBit(P) (P)
104+
#if SOC_GPIO_PIN_COUNT <= 32
105+
#define digitalPinToPort(pin) (0)
106+
#define digitalPinToBitMask(pin) (1UL << (pin))
107+
#define portOutputRegister(port) ((volatile uint32_t*)GPIO_OUT_REG)
108+
#define portInputRegister(port) ((volatile uint32_t*)GPIO_IN_REG)
109+
#define portModeRegister(port) ((volatile uint32_t*)GPIO_ENABLE_REG)
110+
#elif SOC_GPIO_PIN_COUNT <= 64
111+
#define digitalPinToPort(pin) (((pin)>31)?1:0)
112+
#define digitalPinToBitMask(pin) (1UL << (((pin)>31)?((pin)-32):(pin)))
106113
#define portOutputRegister(port) ((volatile uint32_t*)((port)?GPIO_OUT1_REG:GPIO_OUT_REG))
107114
#define portInputRegister(port) ((volatile uint32_t*)((port)?GPIO_IN1_REG:GPIO_IN_REG))
108115
#define portModeRegister(port) ((volatile uint32_t*)((port)?GPIO_ENABLE1_REG:GPIO_ENABLE_REG))
116+
#else
117+
#error SOC_GPIO_PIN_COUNT > 64 not implemented
118+
#endif
109119

110120
#define NOT_A_PIN -1
111121
#define NOT_A_PORT -1

cores/esp32/Esp.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,19 @@ extern "C" {
3535
#if CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4
3636
#include "esp32/rom/spi_flash.h"
3737
#include "soc/efuse_reg.h"
38+
#define ESP_FLASH_IMAGE_BASE 0x1000 // Flash offset containing flash size and spi mode
3839
#elif CONFIG_IDF_TARGET_ESP32S2
3940
#include "esp32s2/rom/spi_flash.h"
41+
#define ESP_FLASH_IMAGE_BASE 0x1000
4042
#elif CONFIG_IDF_TARGET_ESP32C3
4143
#include "esp32c3/rom/spi_flash.h"
44+
#define ESP_FLASH_IMAGE_BASE 0x0000 // Esp32c3 is located at 0x0000
4245
#else
4346
#error Target CONFIG_IDF_TARGET is not supported
4447
#endif
4548
#else // ESP32 Before IDF 4.0
4649
#include "rom/spi_flash.h"
50+
#define ESP_FLASH_IMAGE_BASE 0x1000
4751
#endif
4852

4953
/**
@@ -289,7 +293,7 @@ const char * EspClass::getSdkVersion(void)
289293
uint32_t EspClass::getFlashChipSize(void)
290294
{
291295
esp_image_header_t fhdr;
292-
if(flashRead(0x1000, (uint32_t*)&fhdr, sizeof(esp_image_header_t)) && fhdr.magic != ESP_IMAGE_HEADER_MAGIC) {
296+
if(flashRead(ESP_FLASH_IMAGE_BASE, (uint32_t*)&fhdr, sizeof(esp_image_header_t)) && fhdr.magic != ESP_IMAGE_HEADER_MAGIC) {
293297
return 0;
294298
}
295299
return magicFlashChipSize(fhdr.spi_size);
@@ -298,7 +302,7 @@ uint32_t EspClass::getFlashChipSize(void)
298302
uint32_t EspClass::getFlashChipSpeed(void)
299303
{
300304
esp_image_header_t fhdr;
301-
if(flashRead(0x1000, (uint32_t*)&fhdr, sizeof(esp_image_header_t)) && fhdr.magic != ESP_IMAGE_HEADER_MAGIC) {
305+
if(flashRead(ESP_FLASH_IMAGE_BASE, (uint32_t*)&fhdr, sizeof(esp_image_header_t)) && fhdr.magic != ESP_IMAGE_HEADER_MAGIC) {
302306
return 0;
303307
}
304308
return magicFlashChipSpeed(fhdr.spi_speed);
@@ -307,7 +311,7 @@ uint32_t EspClass::getFlashChipSpeed(void)
307311
FlashMode_t EspClass::getFlashChipMode(void)
308312
{
309313
esp_image_header_t fhdr;
310-
if(flashRead(0x1000, (uint32_t*)&fhdr, sizeof(esp_image_header_t)) && fhdr.magic != ESP_IMAGE_HEADER_MAGIC) {
314+
if(flashRead(ESP_FLASH_IMAGE_BASE, (uint32_t*)&fhdr, sizeof(esp_image_header_t)) && fhdr.magic != ESP_IMAGE_HEADER_MAGIC) {
311315
return FM_UNKNOWN;
312316
}
313317
return magicFlashChipMode(fhdr.spi_mode);

0 commit comments

Comments
 (0)