Skip to content

Commit

Permalink
Merge branch 'master' into release/v3.0.x
Browse files Browse the repository at this point in the history
  • Loading branch information
@me-no-dev
me-no-dev authored Nov 28, 2024
2 parents fd2e31a + 98da424 commit 5cb8b65
Show file tree
Hide file tree
Showing 4 changed files with 247 additions and 1 deletion.
173 changes: 173 additions & 0 deletions boards.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44374,6 +44374,179 @@ cezerio_dev_esp32c6.menu.ZigbeeMode.rcp.build.zigbee_libs=-lesp_zb_api_rcp -lesp

##############################################################

cezerio_mini_dev_esp32c6.name=cezerio mini dev ESP32C6

cezerio_mini_dev_esp32c6.bootloader.tool=esptool_py
cezerio_mini_dev_esp32c6.bootloader.tool.default=esptool_py

cezerio_mini_dev_esp32c6.upload.tool=esptool_py
cezerio_mini_dev_esp32c6.upload.tool.default=esptool_py
cezerio_mini_dev_esp32c6.upload.tool.network=esp_ota

cezerio_mini_dev_esp32c6.upload.maximum_size=1310720
cezerio_mini_dev_esp32c6.upload.maximum_data_size=327680
cezerio_mini_dev_esp32c6.upload.flags=
cezerio_mini_dev_esp32c6.upload.extra_flags=
cezerio_mini_dev_esp32c6.upload.use_1200bps_touch=false
cezerio_mini_dev_esp32c6.upload.wait_for_upload_port=false

cezerio_mini_dev_esp32c6.serial.disableDTR=false
cezerio_mini_dev_esp32c6.serial.disableRTS=false

cezerio_mini_dev_esp32c6.build.tarch=riscv32
cezerio_mini_dev_esp32c6.build.target=esp
cezerio_mini_dev_esp32c6.build.mcu=esp32c6
cezerio_mini_dev_esp32c6.build.core=esp32
cezerio_mini_dev_esp32c6.build.variant=cezerio_mini_dev_esp32c6
cezerio_mini_dev_esp32c6.build.board=CEZERIO_MINI_DEV_ESP32C6
cezerio_mini_dev_esp32c6.build.bootloader_addr=0x0

cezerio_mini_dev_esp32c6.build.cdc_on_boot=0
cezerio_mini_dev_esp32c6.build.f_cpu=160000000L
cezerio_mini_dev_esp32c6.build.flash_size=4MB
cezerio_mini_dev_esp32c6.build.flash_freq=80m
cezerio_mini_dev_esp32c6.build.flash_mode=qio
cezerio_mini_dev_esp32c6.build.boot=qio
cezerio_mini_dev_esp32c6.build.partitions=default
cezerio_mini_dev_esp32c6.build.defines=

## IDE 2.0 Seems to not update the value
cezerio_mini_dev_esp32c6.menu.JTAGAdapter.default=Disabled
cezerio_mini_dev_esp32c6.menu.JTAGAdapter.default.build.copy_jtag_files=0
cezerio_mini_dev_esp32c6.menu.JTAGAdapter.builtin=Integrated USB JTAG
cezerio_mini_dev_esp32c6.menu.JTAGAdapter.builtin.build.openocdscript=esp32c6-builtin.cfg
cezerio_mini_dev_esp32c6.menu.JTAGAdapter.builtin.build.copy_jtag_files=1
cezerio_mini_dev_esp32c6.menu.JTAGAdapter.external=FTDI Adapter
cezerio_mini_dev_esp32c6.menu.JTAGAdapter.external.build.openocdscript=esp32c6-ftdi.cfg
cezerio_mini_dev_esp32c6.menu.JTAGAdapter.external.build.copy_jtag_files=1
cezerio_mini_dev_esp32c6.menu.JTAGAdapter.bridge=ESP USB Bridge
cezerio_mini_dev_esp32c6.menu.JTAGAdapter.bridge.build.openocdscript=esp32c6-bridge.cfg
cezerio_mini_dev_esp32c6.menu.JTAGAdapter.bridge.build.copy_jtag_files=1

cezerio_mini_dev_esp32c6.menu.CDCOnBoot.default=Enabled
cezerio_mini_dev_esp32c6.menu.CDCOnBoot.default.build.cdc_on_boot=1
cezerio_mini_dev_esp32c6.menu.CDCOnBoot.cdc=Disabled
cezerio_mini_dev_esp32c6.menu.CDCOnBoot.cdc.build.cdc_on_boot=0

cezerio_mini_dev_esp32c6.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
cezerio_mini_dev_esp32c6.menu.PartitionScheme.default.build.partitions=default
cezerio_mini_dev_esp32c6.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
cezerio_mini_dev_esp32c6.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
cezerio_mini_dev_esp32c6.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
cezerio_mini_dev_esp32c6.menu.PartitionScheme.minimal.build.partitions=minimal
cezerio_mini_dev_esp32c6.menu.PartitionScheme.no_fs=No FS 4MB (2MB APP x2)
cezerio_mini_dev_esp32c6.menu.PartitionScheme.no_fs.build.partitions=no_fs
cezerio_mini_dev_esp32c6.menu.PartitionScheme.no_fs.upload.maximum_size=2031616
cezerio_mini_dev_esp32c6.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
cezerio_mini_dev_esp32c6.menu.PartitionScheme.no_ota.build.partitions=no_ota
cezerio_mini_dev_esp32c6.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
cezerio_mini_dev_esp32c6.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
cezerio_mini_dev_esp32c6.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
cezerio_mini_dev_esp32c6.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
cezerio_mini_dev_esp32c6.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
cezerio_mini_dev_esp32c6.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
cezerio_mini_dev_esp32c6.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
cezerio_mini_dev_esp32c6.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
cezerio_mini_dev_esp32c6.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
cezerio_mini_dev_esp32c6.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
cezerio_mini_dev_esp32c6.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
cezerio_mini_dev_esp32c6.menu.PartitionScheme.huge_app.build.partitions=huge_app
cezerio_mini_dev_esp32c6.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
cezerio_mini_dev_esp32c6.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
cezerio_mini_dev_esp32c6.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
cezerio_mini_dev_esp32c6.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
cezerio_mini_dev_esp32c6.menu.PartitionScheme.rainmaker=RainMaker 4MB
cezerio_mini_dev_esp32c6.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
cezerio_mini_dev_esp32c6.menu.PartitionScheme.rainmaker.upload.maximum_size=1966080
cezerio_mini_dev_esp32c6.menu.PartitionScheme.rainmaker_4MB=RainMaker 4MB No OTA
cezerio_mini_dev_esp32c6.menu.PartitionScheme.rainmaker_4MB.build.partitions=rainmaker_4MB_no_ota
cezerio_mini_dev_esp32c6.menu.PartitionScheme.rainmaker_4MB.upload.maximum_size=4038656
cezerio_mini_dev_esp32c6.menu.PartitionScheme.zigbee=Zigbee 4MB with spiffs
cezerio_mini_dev_esp32c6.menu.PartitionScheme.zigbee.build.partitions=zigbee
cezerio_mini_dev_esp32c6.menu.PartitionScheme.zigbee.upload.maximum_size=1310720
cezerio_mini_dev_esp32c6.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs
cezerio_mini_dev_esp32c6.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr
cezerio_mini_dev_esp32c6.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720
cezerio_mini_dev_esp32c6.menu.PartitionScheme.custom=Custom
cezerio_mini_dev_esp32c6.menu.PartitionScheme.custom.build.partitions=
cezerio_mini_dev_esp32c6.menu.PartitionScheme.custom.upload.maximum_size=16777216

cezerio_mini_dev_esp32c6.menu.CPUFreq.160=160MHz (WiFi)
cezerio_mini_dev_esp32c6.menu.CPUFreq.160.build.f_cpu=160000000L
cezerio_mini_dev_esp32c6.menu.CPUFreq.120=120MHz (WiFi)
cezerio_mini_dev_esp32c6.menu.CPUFreq.120.build.f_cpu=120000000L
cezerio_mini_dev_esp32c6.menu.CPUFreq.80=80MHz (WiFi)
cezerio_mini_dev_esp32c6.menu.CPUFreq.80.build.f_cpu=80000000L
cezerio_mini_dev_esp32c6.menu.CPUFreq.40=40MHz
cezerio_mini_dev_esp32c6.menu.CPUFreq.40.build.f_cpu=40000000L
cezerio_mini_dev_esp32c6.menu.CPUFreq.20=20MHz
cezerio_mini_dev_esp32c6.menu.CPUFreq.20.build.f_cpu=20000000L
cezerio_mini_dev_esp32c6.menu.CPUFreq.10=10MHz
cezerio_mini_dev_esp32c6.menu.CPUFreq.10.build.f_cpu=10000000L

cezerio_mini_dev_esp32c6.menu.FlashMode.qio=QIO
cezerio_mini_dev_esp32c6.menu.FlashMode.qio.build.flash_mode=dio
cezerio_mini_dev_esp32c6.menu.FlashMode.qio.build.boot=qio
cezerio_mini_dev_esp32c6.menu.FlashMode.dio=DIO
cezerio_mini_dev_esp32c6.menu.FlashMode.dio.build.flash_mode=dio
cezerio_mini_dev_esp32c6.menu.FlashMode.dio.build.boot=dio

cezerio_mini_dev_esp32c6.menu.FlashFreq.80=80MHz
cezerio_mini_dev_esp32c6.menu.FlashFreq.80.build.flash_freq=80m
cezerio_mini_dev_esp32c6.menu.FlashFreq.40=40MHz
cezerio_mini_dev_esp32c6.menu.FlashFreq.40.build.flash_freq=40m

cezerio_mini_dev_esp32c6.menu.FlashSize.4M=4MB (32Mb)
cezerio_mini_dev_esp32c6.menu.FlashSize.4M.build.flash_size=4MB

cezerio_mini_dev_esp32c6.menu.UploadSpeed.921600=921600
cezerio_mini_dev_esp32c6.menu.UploadSpeed.921600.upload.speed=921600
cezerio_mini_dev_esp32c6.menu.UploadSpeed.115200=115200
cezerio_mini_dev_esp32c6.menu.UploadSpeed.115200.upload.speed=115200
cezerio_mini_dev_esp32c6.menu.UploadSpeed.256000.windows=256000
cezerio_mini_dev_esp32c6.menu.UploadSpeed.256000.upload.speed=256000
cezerio_mini_dev_esp32c6.menu.UploadSpeed.230400.windows.upload.speed=256000
cezerio_mini_dev_esp32c6.menu.UploadSpeed.230400=230400
cezerio_mini_dev_esp32c6.menu.UploadSpeed.230400.upload.speed=230400
cezerio_mini_dev_esp32c6.menu.UploadSpeed.460800.linux=460800
cezerio_mini_dev_esp32c6.menu.UploadSpeed.460800.macosx=460800
cezerio_mini_dev_esp32c6.menu.UploadSpeed.460800.upload.speed=460800
cezerio_mini_dev_esp32c6.menu.UploadSpeed.512000.windows=512000
cezerio_mini_dev_esp32c6.menu.UploadSpeed.512000.upload.speed=512000

cezerio_mini_dev_esp32c6.menu.DebugLevel.none=None
cezerio_mini_dev_esp32c6.menu.DebugLevel.none.build.code_debug=0
cezerio_mini_dev_esp32c6.menu.DebugLevel.error=Error
cezerio_mini_dev_esp32c6.menu.DebugLevel.error.build.code_debug=1
cezerio_mini_dev_esp32c6.menu.DebugLevel.warn=Warn
cezerio_mini_dev_esp32c6.menu.DebugLevel.warn.build.code_debug=2
cezerio_mini_dev_esp32c6.menu.DebugLevel.info=Info
cezerio_mini_dev_esp32c6.menu.DebugLevel.info.build.code_debug=3
cezerio_mini_dev_esp32c6.menu.DebugLevel.debug=Debug
cezerio_mini_dev_esp32c6.menu.DebugLevel.debug.build.code_debug=4
cezerio_mini_dev_esp32c6.menu.DebugLevel.verbose=Verbose
cezerio_mini_dev_esp32c6.menu.DebugLevel.verbose.build.code_debug=5

cezerio_mini_dev_esp32c6.menu.EraseFlash.none=Disabled
cezerio_mini_dev_esp32c6.menu.EraseFlash.none.upload.erase_cmd=
cezerio_mini_dev_esp32c6.menu.EraseFlash.all=Enabled
cezerio_mini_dev_esp32c6.menu.EraseFlash.all.upload.erase_cmd=-e

cezerio_mini_dev_esp32c6.menu.ZigbeeMode.default=Disabled
cezerio_mini_dev_esp32c6.menu.ZigbeeMode.default.build.zigbee_mode=
cezerio_mini_dev_esp32c6.menu.ZigbeeMode.default.build.zigbee_libs=
cezerio_mini_dev_esp32c6.menu.ZigbeeMode.ed=Zigbee ED (end device)
cezerio_mini_dev_esp32c6.menu.ZigbeeMode.ed.build.zigbee_mode=-DZIGBEE_MODE_ED
cezerio_mini_dev_esp32c6.menu.ZigbeeMode.ed.build.zigbee_libs=-lesp_zb_api_ed -lesp_zb_cli_command -lzboss_stack.ed -lzboss_port
cezerio_mini_dev_esp32c6.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
cezerio_mini_dev_esp32c6.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
cezerio_mini_dev_esp32c6.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr -lzboss_port
cezerio_mini_dev_esp32c6.menu.ZigbeeMode.rcp=Zigbee RCP (radio co-processor)
cezerio_mini_dev_esp32c6.menu.ZigbeeMode.rcp.build.zigbee_mode=-DZIGBEE_MODE_RCP
cezerio_mini_dev_esp32c6.menu.ZigbeeMode.rcp.build.zigbee_libs=-lesp_zb_api_rcp -lesp_zb_cli_command -lzboss_stack.rcp -lzboss_port

##############################################################

waveshare_esp32_s3_lcd_185.name=Waveshare ESP32-S3-LCD-1.85
waveshare_esp32_s3_lcd_185.vid.0=0x303a
waveshare_esp32_s3_lcd_185.pid.0=0x8242
Expand Down
26 changes: 26 additions & 0 deletions libraries/AsyncUDP/keywords.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

AsyncUDP KEYWORD1
AsyncUDPPacket KEYWORD1
AsyncUDPMessage KEYWORD1

#######################################
# Methods and Functions (KEYWORD2)
Expand All @@ -19,6 +20,21 @@ listen KEYWORD2
listenMulticast KEYWORD2
close KEYWORD2
write KEYWORD2
space KEYWORD2
flush KEYWORD2
isBroadcast KEYWORD2
isMulticast KEYWORD2
isIPv6 KEYWORD2
interface KEYWORD2
localIPv6 KEYWORD2
remoteIPv6 KEYWORD2
remoteMac KEYWORD2
send KEYWORD2
peek KEYWORD2
available KEYWORD2
writeTo KEYWORD2
broadcastTo KEYWORD2
sendTo KEYWORD2
broadcast KEYWORD2
onPacket KEYWORD2
data KEYWORD2
Expand All @@ -27,7 +43,17 @@ localIP KEYWORD2
localPort KEYWORD2
remoteIP KEYWORD2
remotePort KEYWORD2
listenIP KEYWORD2
listenIPv6 KEYWORD2
lastErr KEYWORD2
_s_recv KEYWORD2

#######################################
# Constants (LITERAL1)
#######################################

TCPIP_ADAPTER_IF_STA LITERAL1
TCPIP_ADAPTER_IF_STA LITERAL1
TCPIP_ADAPTER_IF_AP LITERAL1
TCPIP_ADAPTER_IF_ETH LITERAL1
TCPIP_ADAPTER_IF_PPP LITERAL1
2 changes: 1 addition & 1 deletion libraries/Network/src/NetworkClient.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ uint8_t NetworkClient::connected() {
}
if (_connected) {
uint8_t dummy;
int res = recv(fd(), &dummy, 0, MSG_DONTWAIT);
int res = recv(fd(), &dummy, 1, MSG_DONTWAIT | MSG_PEEK);
// avoid unused var warning by gcc
(void)res;
// recv only sets errno if res is <= 0
Expand Down
47 changes: 47 additions & 0 deletions variants/cezerio_mini_dev_esp32c6/pins_arduino.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
#ifndef Pins_Arduino_h
#define Pins_Arduino_h

#include <stdint.h>
#include "soc/soc_caps.h"

#define USB_VID 0x303A
#define USB_PID 0x1001
#define USB_MANUFACTURER "RFtek Electronics"
#define USB_PRODUCT "cezerio mini dev ESP32C6"
#define USB_SERIAL ""

#define PIN_RGB_LED 20
// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN // allow testing #ifdef LED_BUILTIN
// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
#define RGB_BUILTIN LED_BUILTIN
#define RGBLED LED_BUILTIN
#define RGB_BRIGHTNESS 64

static const uint8_t BUT_BUILTIN = 9;
#define BUILTIN_BUT BUT_BUILTIN // backward compatibility
#define BUT_BUILTIN BUT_BUILTIN // allow testing #ifdef BUT_BUILTIN
#define BOOT BUT_BUILTIN

static const uint8_t TX = 7;
static const uint8_t RX = 14;

static const uint8_t SDA = 23;
static const uint8_t SCL = 22;

static const uint8_t MOSI = 19;
static const uint8_t MISO = 21;
static const uint8_t SCK = 18;
static const uint8_t SS = 17;

static const uint8_t A0 = 0;
static const uint8_t A1 = 1;
static const uint8_t A2 = 2;
static const uint8_t A3 = 3;
static const uint8_t A6 = 6;

static const uint8_t MATRIX = 4;

#endif /* Pins_Arduino_h */

0 comments on commit 5cb8b65

Please sign in to comment.