Skip to content

Commit a990f65

Browse files
gonzabruscogonzabrusco
authored
Merge branch 'master' into serial_clk_select
2 parents ddc95d9 + de184bd commit a990f65

Some content is hidden

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

42 files changed

+1239
-434
lines changed

‎boards.txt

+170-5
Original file line numberDiff line numberDiff line change
@@ -6070,10 +6070,12 @@ twatchs3.menu.EraseFlash.none.upload.erase_cmd=
60706070
twatchs3.menu.EraseFlash.all=Enabled
60716071
twatchs3.menu.EraseFlash.all.upload.erase_cmd=-e
60726072

6073-
twatchs3.menu.Revision.Radio_SX1280=Radio-SX1280
6074-
twatchs3.menu.Revision.Radio_SX1280.build.board=LILYGO_LORA_SX1280
60756073
twatchs3.menu.Revision.Radio_SX1262=Radio-SX1262
60766074
twatchs3.menu.Revision.Radio_SX1262.build.board=LILYGO_LORA_SX1262
6075+
twatchs3.menu.Revision.Radio_SX1280=Radio-SX1280
6076+
twatchs3.menu.Revision.Radio_SX1280.build.board=LILYGO_LORA_SX1280
6077+
twatchs3.menu.Revision.Radio_CC1101=Radio-CC1101
6078+
twatchs3.menu.Revision.Radio_CC1101.build.board=LILYGO_LORA_CC1101
60776079

60786080
##############################################################
60796081

@@ -6166,12 +6168,12 @@ twatch_ultra.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
61666168
twatch_ultra.menu.UploadMode.cdc.upload.use_1200bps_touch=true
61676169
twatch_ultra.menu.UploadMode.cdc.upload.wait_for_upload_port=true
61686170

6169-
twatch_ultra.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
6170-
twatch_ultra.menu.PartitionScheme.fatflash.build.partitions=ffat
6171-
twatch_ultra.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
61726171
twatch_ultra.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
61736172
twatch_ultra.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
61746173
twatch_ultra.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
6174+
twatch_ultra.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
6175+
twatch_ultra.menu.PartitionScheme.fatflash.build.partitions=ffat
6176+
twatch_ultra.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
61756177
twatch_ultra.menu.PartitionScheme.rainmaker=RainMaker
61766178
twatch_ultra.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
61776179
twatch_ultra.menu.PartitionScheme.rainmaker.upload.maximum_size=1966080
@@ -6233,7 +6235,170 @@ twatch_ultra.menu.Revision.Radio_SX1280=Radio-SX1280
62336235
twatch_ultra.menu.Revision.Radio_SX1280.build.board=LILYGO_LORA_SX1280
62346236
twatch_ultra.menu.Revision.Radio_SX1262=Radio-SX1262
62356237
twatch_ultra.menu.Revision.Radio_SX1262.build.board=LILYGO_LORA_SX1262
6238+
twatch_ultra.menu.Revision.Radio_CC1101=Radio-CC1101
6239+
twatch_ultra.menu.Revision.Radio_CC1101.build.board=LILYGO_LORA_CC1101
6240+
6241+
6242+
##############################################################
6243+
6244+
tlora_pager.name=LilyGo-T-LoRa-Pager
6245+
6246+
tlora_pager.bootloader.tool=esptool_py
6247+
tlora_pager.bootloader.tool.default=esptool_py
6248+
6249+
tlora_pager.upload.tool=esptool_py
6250+
tlora_pager.upload.tool.default=esptool_py
6251+
tlora_pager.upload.tool.network=esp_ota
6252+
6253+
tlora_pager.upload.maximum_size=1310720
6254+
tlora_pager.upload.maximum_data_size=327680
6255+
tlora_pager.upload.flags=
6256+
tlora_pager.upload.extra_flags=
6257+
tlora_pager.upload.use_1200bps_touch=false
6258+
tlora_pager.upload.wait_for_upload_port=false
6259+
6260+
tlora_pager.serial.disableDTR=false
6261+
tlora_pager.serial.disableRTS=false
6262+
6263+
tlora_pager.build.tarch=xtensa
6264+
tlora_pager.build.bootloader_addr=0x0
6265+
tlora_pager.build.target=esp32s3
6266+
tlora_pager.build.mcu=esp32s3
6267+
tlora_pager.build.core=esp32
6268+
tlora_pager.build.variant=lilygo_tlora_pager
6269+
tlora_pager.build.board=T_LORA_PAGER
6270+
6271+
tlora_pager.build.usb_mode=1
6272+
tlora_pager.build.cdc_on_boot=1
6273+
tlora_pager.build.msc_on_boot=0
6274+
tlora_pager.build.dfu_on_boot=0
6275+
tlora_pager.build.f_cpu=240000000L
6276+
tlora_pager.build.flash_size=16MB
6277+
tlora_pager.build.flash_freq=80m
6278+
tlora_pager.build.flash_mode=dio
6279+
tlora_pager.build.boot=qio
6280+
tlora_pager.build.boot_freq=80m
6281+
tlora_pager.build.partitions=app3M_fat9M_16MB
6282+
tlora_pager.build.defines=-DBOARD_HAS_PSRAM -DARDUINO_T_LORA_PAGER
6283+
tlora_pager.build.loop_core=
6284+
tlora_pager.build.event_core=
6285+
tlora_pager.build.psram_type=qspi
6286+
tlora_pager.build.memory_type={build.boot}_{build.psram_type}
62366287

6288+
## IDE 2.0 Seems to not update the value
6289+
tlora_pager.menu.JTAGAdapter.default=Disabled
6290+
tlora_pager.menu.JTAGAdapter.default.build.copy_jtag_files=0
6291+
tlora_pager.menu.JTAGAdapter.builtin=Integrated USB JTAG
6292+
tlora_pager.menu.JTAGAdapter.builtin.build.openocdscript=esp32s3-builtin.cfg
6293+
tlora_pager.menu.JTAGAdapter.builtin.build.copy_jtag_files=1
6294+
6295+
tlora_pager.menu.LoopCore.1=Core 1
6296+
tlora_pager.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
6297+
tlora_pager.menu.LoopCore.0=Core 0
6298+
tlora_pager.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
6299+
6300+
tlora_pager.menu.EventsCore.1=Core 1
6301+
tlora_pager.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
6302+
tlora_pager.menu.EventsCore.0=Core 0
6303+
tlora_pager.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
6304+
6305+
tlora_pager.menu.USBMode.hwcdc=Hardware CDC and JTAG
6306+
tlora_pager.menu.USBMode.hwcdc.build.usb_mode=1
6307+
tlora_pager.menu.USBMode.default=USB-OTG (TinyUSB)
6308+
tlora_pager.menu.USBMode.default.build.usb_mode=0
6309+
6310+
tlora_pager.menu.CDCOnBoot.default=Enabled
6311+
tlora_pager.menu.CDCOnBoot.default.build.cdc_on_boot=1
6312+
tlora_pager.menu.CDCOnBoot.cdc=Disabled
6313+
tlora_pager.menu.CDCOnBoot.cdc.build.cdc_on_boot=0
6314+
6315+
tlora_pager.menu.MSCOnBoot.default=Disabled
6316+
tlora_pager.menu.MSCOnBoot.default.build.msc_on_boot=0
6317+
tlora_pager.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
6318+
tlora_pager.menu.MSCOnBoot.msc.build.msc_on_boot=1
6319+
6320+
tlora_pager.menu.DFUOnBoot.default=Disabled
6321+
tlora_pager.menu.DFUOnBoot.default.build.dfu_on_boot=0
6322+
tlora_pager.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
6323+
tlora_pager.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
6324+
6325+
tlora_pager.menu.UploadMode.default=UART0 / Hardware CDC
6326+
tlora_pager.menu.UploadMode.default.upload.use_1200bps_touch=false
6327+
tlora_pager.menu.UploadMode.default.upload.wait_for_upload_port=false
6328+
tlora_pager.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
6329+
tlora_pager.menu.UploadMode.cdc.upload.use_1200bps_touch=true
6330+
tlora_pager.menu.UploadMode.cdc.upload.wait_for_upload_port=true
6331+
6332+
tlora_pager.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
6333+
tlora_pager.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
6334+
tlora_pager.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
6335+
tlora_pager.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
6336+
tlora_pager.menu.PartitionScheme.fatflash.build.partitions=ffat
6337+
tlora_pager.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
6338+
tlora_pager.menu.PartitionScheme.rainmaker=RainMaker
6339+
tlora_pager.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
6340+
tlora_pager.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
6341+
tlora_pager.menu.PartitionScheme.esp_sr_16=ESP SR 16M (3MB APP/7MB SPIFFS/2.9MB MODEL)
6342+
tlora_pager.menu.PartitionScheme.esp_sr_16.upload.maximum_size=3145728
6343+
tlora_pager.menu.PartitionScheme.esp_sr_16.upload.extra_flags=0xD10000 {build.path}/srmodels.bin
6344+
tlora_pager.menu.PartitionScheme.esp_sr_16.build.partitions=esp_sr_16
6345+
tlora_pager.menu.PartitionScheme.custom=Custom
6346+
tlora_pager.menu.PartitionScheme.custom.build.partitions=
6347+
tlora_pager.menu.PartitionScheme.custom.upload.maximum_size=16777216
6348+
6349+
tlora_pager.menu.CPUFreq.240=240MHz (WiFi)
6350+
tlora_pager.menu.CPUFreq.240.build.f_cpu=240000000L
6351+
tlora_pager.menu.CPUFreq.160=160MHz (WiFi)
6352+
tlora_pager.menu.CPUFreq.160.build.f_cpu=160000000L
6353+
tlora_pager.menu.CPUFreq.80=80MHz (WiFi)
6354+
tlora_pager.menu.CPUFreq.80.build.f_cpu=80000000L
6355+
tlora_pager.menu.CPUFreq.40=40MHz
6356+
tlora_pager.menu.CPUFreq.40.build.f_cpu=40000000L
6357+
tlora_pager.menu.CPUFreq.20=20MHz
6358+
tlora_pager.menu.CPUFreq.20.build.f_cpu=20000000L
6359+
tlora_pager.menu.CPUFreq.10=10MHz
6360+
tlora_pager.menu.CPUFreq.10.build.f_cpu=10000000L
6361+
6362+
tlora_pager.menu.UploadSpeed.921600=921600
6363+
tlora_pager.menu.UploadSpeed.921600.upload.speed=921600
6364+
tlora_pager.menu.UploadSpeed.115200=115200
6365+
tlora_pager.menu.UploadSpeed.115200.upload.speed=115200
6366+
tlora_pager.menu.UploadSpeed.256000.windows=256000
6367+
tlora_pager.menu.UploadSpeed.256000.upload.speed=256000
6368+
tlora_pager.menu.UploadSpeed.230400.windows.upload.speed=256000
6369+
tlora_pager.menu.UploadSpeed.230400=230400
6370+
tlora_pager.menu.UploadSpeed.230400.upload.speed=230400
6371+
tlora_pager.menu.UploadSpeed.460800.linux=460800
6372+
tlora_pager.menu.UploadSpeed.460800.macosx=460800
6373+
tlora_pager.menu.UploadSpeed.460800.upload.speed=460800
6374+
tlora_pager.menu.UploadSpeed.512000.windows=512000
6375+
tlora_pager.menu.UploadSpeed.512000.upload.speed=512000
6376+
6377+
tlora_pager.menu.DebugLevel.none=None
6378+
tlora_pager.menu.DebugLevel.none.build.code_debug=0
6379+
tlora_pager.menu.DebugLevel.error=Error
6380+
tlora_pager.menu.DebugLevel.error.build.code_debug=1
6381+
tlora_pager.menu.DebugLevel.warn=Warn
6382+
tlora_pager.menu.DebugLevel.warn.build.code_debug=2
6383+
tlora_pager.menu.DebugLevel.info=Info
6384+
tlora_pager.menu.DebugLevel.info.build.code_debug=3
6385+
tlora_pager.menu.DebugLevel.debug=Debug
6386+
tlora_pager.menu.DebugLevel.debug.build.code_debug=4
6387+
tlora_pager.menu.DebugLevel.verbose=Verbose
6388+
tlora_pager.menu.DebugLevel.verbose.build.code_debug=5
6389+
6390+
tlora_pager.menu.EraseFlash.none=Disabled
6391+
tlora_pager.menu.EraseFlash.none.upload.erase_cmd=
6392+
tlora_pager.menu.EraseFlash.all=Enabled
6393+
tlora_pager.menu.EraseFlash.all.upload.erase_cmd=-e
6394+
6395+
6396+
tlora_pager.menu.Revision.Radio_SX1280=Radio-SX1280
6397+
tlora_pager.menu.Revision.Radio_SX1280.build.board=LILYGO_LORA_SX1280
6398+
tlora_pager.menu.Revision.Radio_SX1262=Radio-SX1262
6399+
tlora_pager.menu.Revision.Radio_SX1262.build.board=LILYGO_LORA_SX1262
6400+
tlora_pager.menu.Revision.Radio_CC1101=Radio-CC1101
6401+
tlora_pager.menu.Revision.Radio_CC1101.build.board=LILYGO_LORA_CC1101
62376402

62386403
##############################################################
62396404

‎libraries/RainMaker/examples/RMakerCustom/ci.json

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{
2+
"targets": {
3+
"esp32": false
4+
},
25
"fqbn_append": "PartitionScheme=rainmaker_4MB",
36
"requires": [
47
"CONFIG_ESP_RMAKER_WORK_QUEUE_TASK_STACK=[1-9][0-9]*"

‎libraries/RainMaker/examples/RMakerSwitch/ci.json

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{
2+
"targets": {
3+
"esp32": false
4+
},
25
"fqbn_append": "PartitionScheme=rainmaker_4MB",
36
"requires": [
47
"CONFIG_ESP_RMAKER_WORK_QUEUE_TASK_STACK=[1-9][0-9]*"

‎libraries/Zigbee/examples/Zigbee_Temp_Hum_Sensor_Sleepy/Zigbee_Temp_Hum_Sensor_Sleepy.ino

+5-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,11 @@ void loop() {
133133
// If key pressed for more than 10secs, factory reset Zigbee and reboot
134134
Serial.println("Resetting Zigbee to factory and rebooting in 1s.");
135135
delay(1000);
136-
Zigbee.factoryReset();
136+
// Optional set reset in factoryReset to false, to not restart device after erasing nvram, but set it to endless sleep manually instead
137+
Zigbee.factoryReset(false);
138+
Serial.println("Going to endless sleep, press RESET button or power off/on the device to wake up");
139+
esp_sleep_disable_wakeup_source(ESP_SLEEP_WAKEUP_TIMER);
140+
esp_deep_sleep_start();
137141
}
138142
}
139143
}

‎libraries/Zigbee/src/ZigbeeCore.cpp

+20-9
Original file line numberDiff line numberDiff line change
@@ -91,21 +91,26 @@ bool ZigbeeCore::begin(zigbee_role_t role, bool erase_nvs) {
9191
return started();
9292
}
9393

94-
void ZigbeeCore::addEndpoint(ZigbeeEP *ep) {
94+
bool ZigbeeCore::addEndpoint(ZigbeeEP *ep) {
9595
ep_objects.push_back(ep);
9696

9797
log_d("Endpoint: %d, Device ID: 0x%04x", ep->_endpoint, ep->_device_id);
9898
//Register clusters and ep_list to the ZigbeeCore class's ep_list
9999
if (ep->_ep_config.endpoint == 0 || ep->_cluster_list == nullptr) {
100100
log_e("Endpoint config or Cluster list is not initialized, EP not added to ZigbeeCore's EP list");
101-
return;
101+
return false;
102102
}
103-
103+
esp_err_t ret = ESP_OK;
104104
if (ep->_device_id == ESP_ZB_HA_HOME_GATEWAY_DEVICE_ID) {
105-
esp_zb_ep_list_add_gateway_ep(_zb_ep_list, ep->_cluster_list, ep->_ep_config);
105+
ret = esp_zb_ep_list_add_gateway_ep(_zb_ep_list, ep->_cluster_list, ep->_ep_config);
106106
} else {
107-
esp_zb_ep_list_add_ep(_zb_ep_list, ep->_cluster_list, ep->_ep_config);
107+
ret = esp_zb_ep_list_add_ep(_zb_ep_list, ep->_cluster_list, ep->_ep_config);
108+
}
109+
if (ret != ESP_OK) {
110+
log_e("Failed to add endpoint: 0x%x: %s", ret, esp_err_to_name(ret));
111+
return false;
108112
}
113+
return true;
109114
}
110115

111116
static void esp_zb_task(void *pvParameters) {
@@ -368,16 +373,22 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct) {
368373
case ESP_ZB_ZDO_SIGNAL_LEAVE: // End Device + Router
369374
// Device was removed from the network, factory reset the device
370375
if ((zigbee_role_t)Zigbee.getRole() != ZIGBEE_COORDINATOR) {
371-
Zigbee.factoryReset();
376+
Zigbee.factoryReset(true);
372377
}
373378
break;
374379
default: log_v("ZDO signal: %s (0x%x), status: %s", esp_zb_zdo_signal_to_string(sig_type), sig_type, esp_err_to_name(err_status)); break;
375380
}
376381
}
377382

378-
void ZigbeeCore::factoryReset() {
379-
log_v("Factory resetting Zigbee stack, device will reboot");
380-
esp_zb_factory_reset();
383+
void ZigbeeCore::factoryReset(bool restart) {
384+
if (restart) {
385+
log_v("Factory resetting Zigbee stack, device will reboot");
386+
esp_zb_factory_reset();
387+
} else {
388+
log_v("Factory resetting Zigbee NVRAM to factory default");
389+
log_w("The device will not reboot, to take effect please reboot the device manually");
390+
esp_zb_zcl_reset_nvram_to_factory_default();
391+
}
381392
}
382393

383394
void ZigbeeCore::scanCompleteCallback(esp_zb_zdp_status_t zdo_status, uint8_t count, esp_zb_network_descriptor_t *nwk_descriptor) {

‎libraries/Zigbee/src/ZigbeeCore.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ class ZigbeeCore {
129129
return _role;
130130
}
131131

132-
void addEndpoint(ZigbeeEP *ep);
132+
bool addEndpoint(ZigbeeEP *ep);
133133
//void removeEndpoint(ZigbeeEP *ep);
134134

135135
void setRadioConfig(esp_zb_radio_config_t config);
@@ -164,7 +164,7 @@ class ZigbeeCore {
164164
zigbee_scan_result_t *getScanResult();
165165
void scanDelete();
166166

167-
void factoryReset();
167+
void factoryReset(bool restart = true);
168168

169169
// Friend function declaration to allow access to private members
170170
friend void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct);

0 commit comments

Comments
 (0)