From d9530f32a66e29f64a602354a75ae30f05bfb3bc Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Tue, 15 Aug 2023 10:37:54 +0200 Subject: [PATCH 001/225] Sync dev with release v13.1 --- CHANGELOG.md | 25 ++++++++----- FIRMWARE.md | 2 +- README.md | 2 +- RELEASENOTES.md | 59 ++----------------------------- tasmota/include/tasmota_version.h | 2 +- 5 files changed, 23 insertions(+), 67 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68545e0d0..fd144f208 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,12 +3,27 @@ All notable changes to this project will be documented in this file. ## [Unreleased] - Development -## [13.0.0.4] +## [13.1.0.1] ### Added -- ESP32 prepare for Arduino Core v3 and esp-idf v5 (#19264) ### Breaking Changed +### Changed + +### Fixed + +### Removed + + +## [Released] - Development + +## [13.1.0] 20230815 +- Release Quentin + +## [13.0.0.4] 20230815 +### Added +- ESP32 prepare for Arduino Core v3 and esp-idf v5 (#19264) + ### Changed - Console height from default 318 pixels to viewport (#19241) - Shutter button hold behaviour with grouptopic (#19263) @@ -17,10 +32,6 @@ All notable changes to this project will be documented in this file. - HDC1080 detect device offline (#19298) - ADE7953 lowered no load threshold (#19302) -### Fixed - -### Removed - ## [13.0.0.3] 20230805 ### Added - Support for MAX17043 fuel-gauge systems Lipo batteries (#18788) @@ -93,8 +104,6 @@ All notable changes to this project will be documented in this file. ### Removed - Support for ESP32-C3 with chip rev below 3 (old development boards) -## [Released] - ## [13.0.0] 20230626 - Release Qasim diff --git a/FIRMWARE.md b/FIRMWARE.md index f1fe619d5..ab962399c 100644 --- a/FIRMWARE.md +++ b/FIRMWARE.md @@ -18,7 +18,7 @@ See [CHANGELOG.md](https://github.com/arendst/Tasmota/blob/development/tasmota/C ## Development -[![Dev Version](https://img.shields.io/badge/development%20version-v13.0.x.x-blue.svg)](https://github.com/arendst/Tasmota) +[![Dev Version](https://img.shields.io/badge/development%20version-v13.1.x.x-blue.svg)](https://github.com/arendst/Tasmota) [![Download Dev](https://img.shields.io/badge/download-development-yellow.svg)](http://ota.tasmota.com/tasmota/) [![Tasmota CI](https://github.com/arendst/Tasmota/workflows/Tasmota%20CI/badge.svg)](https://github.com/arendst/Tasmota/actions?query=workflow%3A%22Tasmota+CI%22) [![Tasmota ESP32 CI](https://github.com/arendst/Tasmota/workflows/Tasmota%20ESP32%20CI/badge.svg)](https://github.com/arendst/Tasmota/actions?query=workflow%3A%22Tasmota+ESP32+CI%22) diff --git a/README.md b/README.md index 94c86429e..14911249a 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Firmware binaries can be downloaded from http://ota.tasmota.com/tasmota/release/ ## Development -[![Dev Version](https://img.shields.io/badge/development%20version-v13.0.x.x-blue.svg)](https://github.com/arendst/Tasmota) +[![Dev Version](https://img.shields.io/badge/development%20version-v13.1.x.x-blue.svg)](https://github.com/arendst/Tasmota) [![Download Dev](https://img.shields.io/badge/download-development-yellow.svg)](http://ota.tasmota.com/tasmota/) [![Tasmota CI](https://github.com/arendst/Tasmota/actions/workflows/build_all_the_things.yml/badge.svg)](https://github.com/arendst/Tasmota/actions/workflows/build_all_the_things.yml) [![Build_development](https://github.com/arendst/Tasmota/actions/workflows/Tasmota_build_devel.yml/badge.svg)](https://github.com/arendst/Tasmota/actions/workflows/Tasmota_build_devel.yml) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 51d1483ec..9fc969ea7 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -75,7 +75,7 @@ Latest released binaries can be downloaded from - http://ota.tasmota.com/tasmota/release Historical binaries can be downloaded from -- http://ota.tasmota.com/tasmota/release-13.0.0 +- http://ota.tasmota.com/tasmota/release-13.1.0 The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmota.com/tasmota/release/tasmota.bin.gz`` @@ -100,7 +100,7 @@ Latest released binaries can be downloaded from - https://ota.tasmota.com/tasmota32/release Historical binaries can be downloaded from -- https://ota.tasmota.com/tasmota32/release-13.0.0 +- https://ota.tasmota.com/tasmota32/release-13.1.0 The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasmota.com/tasmota32/release/tasmota32.bin`` @@ -110,66 +110,13 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm [Complete list](BUILDS.md) of available feature and sensors. -## Changelog v13.0.0.4 +## Changelog v13.1.0.1 ### Added -- Command ``BrRestart`` to restart the Berry VM (experimental) [#19003](https://github.com/arendst/Tasmota/issues/19003) -- Command ``Delay -1`` to wait until next second [#18984](https://github.com/arendst/Tasmota/issues/18984) -- Command ``Restart 9`` to save all changes and go into deepsleep waiting for a reset [#19024](https://github.com/arendst/Tasmota/issues/19024) -- Support for MAX17043 fuel-gauge systems Lipo batteries [#18788](https://github.com/arendst/Tasmota/issues/18788) -- Support for multiple PCA9685 with extended functionality [#18805](https://github.com/arendst/Tasmota/issues/18805) -- Support for SGP41 TVOC/NOx Sensor [#18880](https://github.com/arendst/Tasmota/issues/18880) -- Support for DeepSleep battery level percentage [#19134](https://github.com/arendst/Tasmota/issues/19134) -- Zigbee decode Aqara 0000/FF01 attribute 03 as Temperature [#19210](https://github.com/arendst/Tasmota/issues/19210) -- ESP32 prepare for Arduino Core v3 and esp-idf v5 [#19264](https://github.com/arendst/Tasmota/issues/19264) -- Berry `getgbl` performance counter to `debug.counters()` [#19070](https://github.com/arendst/Tasmota/issues/19070) -- Berry `_class` can be used in `static var` initialization code [#19088](https://github.com/arendst/Tasmota/issues/19088) -- Berry `energy.update_total()` to call `EnergyUpdateTotal()` from energy driver [#19117](https://github.com/arendst/Tasmota/issues/19117) -- Berry `tasmota.loglevel()` and `tasmota.rtc_utc()` for faster performance [#19152](https://github.com/arendst/Tasmota/issues/19152) -- Berry metrics for memory allocation/deallocation/reallocation [#19150](https://github.com/arendst/Tasmota/issues/19150) -- Berry AES CCM decrypting in a single call to avoid any object allocation [#19153](https://github.com/arendst/Tasmota/issues/19153) -- Berry bytes `get` and `set` work for 3 bytes values [#19225](https://github.com/arendst/Tasmota/issues/19225) -- Partition Wizard is now able to convert to safeboot from Shelly partition layout [#19034](https://github.com/arendst/Tasmota/issues/19034) -- Matter option to disable bridge mode [#18992](https://github.com/arendst/Tasmota/issues/18992) -- Matter mini-profiler [#19075](https://github.com/arendst/Tasmota/issues/19075) -- Matter support for fabric_filtered request (for Google compatibility) [#19249](https://github.com/arendst/Tasmota/issues/19249) ### Breaking Changed -- Berry `bool( [] )` and `bool( {} )` now evaluate as `false` [#18986](https://github.com/arendst/Tasmota/issues/18986) -- Berry `import strict` now detects useless expression without side effects [#18997](https://github.com/arendst/Tasmota/issues/18997) ### Changed -- IRremoteESP8266 library from v2.8.5 to v2.8.6 -- ESP32 Framework (Arduino Core) from v2.0.10 to v2.0.11 -- ESP32 LVGL library from v8.3.7 to v8.3.8 (no functional change) -- Initial ``DisplayMode`` from 1 to 0 and ``DisplayDimmmer`` from 10% to 50% [#19138](https://github.com/arendst/Tasmota/issues/19138) -- Configuration backup and restore now supports ``.xdrvsetXXX`` files too [#18295](https://github.com/arendst/Tasmota/issues/18295) -- Reduced log level for TeleInfo [#19216](https://github.com/arendst/Tasmota/issues/19216) -- Console height from default 318 pixels to viewport [#19241](https://github.com/arendst/Tasmota/issues/19241) -- Shutter button hold behaviour with grouptopic [#19263](https://github.com/arendst/Tasmota/issues/19263) -- Thermostat improvements [#19279](https://github.com/arendst/Tasmota/issues/19279) -- PID controller improvements [#19285](https://github.com/arendst/Tasmota/issues/19285) -- HDC1080 detect device offline [#19298](https://github.com/arendst/Tasmota/issues/19298) -- ADE7953 lowered no load threshold [#19302](https://github.com/arendst/Tasmota/issues/19302) -- ESP32 shutter driver support up to 16 shutters [#18295](https://github.com/arendst/Tasmota/issues/18295) -- ESP32 autodetect flashsize and adjust filesystem [#19215](https://github.com/arendst/Tasmota/issues/19215) -- Berry extend `range(lower, upper, incr)` to arbitrary increment [#19120](https://github.com/arendst/Tasmota/issues/19120) -- Berry updated syntax highlighting plugin for VSCode [#19123](https://github.com/arendst/Tasmota/issues/19123) -- Berry `mqtt.publish` now distinguishes between `string` and `bytes` [#19196](https://github.com/arendst/Tasmota/issues/19196) -- Matter support for temperature in Fahrenheit (`SetOption8 1`) [#18987](https://github.com/arendst/Tasmota/issues/18987) -- Matter improve responsiveness [#19002](https://github.com/arendst/Tasmota/issues/19002) -- Matter improve latency for remote commands [#19072](https://github.com/arendst/Tasmota/issues/19072) -- Matter improve latency for single attribute reads and single commands [#19158](https://github.com/arendst/Tasmota/issues/19158) -- Matter increased polling frequency for local switches/occupancy [#19242](https://github.com/arendst/Tasmota/issues/19242) ### Fixed -- Berry Walrus Operator [#18982](https://github.com/arendst/Tasmota/issues/18982) -- MiElHVAC power commands regression from v12.4.0.1 [#18923](https://github.com/arendst/Tasmota/issues/18923) -- Zero cross dimmer minimum interrupt time [#19211](https://github.com/arendst/Tasmota/issues/19211) -- Fade would fail when the difference between start and target would be too small [#19248](https://github.com/arendst/Tasmota/issues/19248) -- Inverted shutter [#19243](https://github.com/arendst/Tasmota/issues/19243) -- ESP8266 SPI initialization for scripter, filesystem and MFRC522 [#19209](https://github.com/arendst/Tasmota/issues/19209) -- Matter support for large atribute responses [#19252](https://github.com/arendst/Tasmota/issues/19252) -- Matter auto-configuration Relay indices [#19255](https://github.com/arendst/Tasmota/issues/19255) ### Removed -- Support for ESP32-C3 with chip revision below 3 (old development boards) diff --git a/tasmota/include/tasmota_version.h b/tasmota/include/tasmota_version.h index 14d021c89..a5793dc77 100644 --- a/tasmota/include/tasmota_version.h +++ b/tasmota/include/tasmota_version.h @@ -20,6 +20,6 @@ #ifndef _TASMOTA_VERSION_H_ #define _TASMOTA_VERSION_H_ -const uint32_t VERSION = 0x0D000004; // 13.0.0.4 +const uint32_t VERSION = 0x0D010001; // 13.1.0.1 #endif // _TASMOTA_VERSION_H_ From 53819a146505caf3d89e3b6807aebeb61d37f5ba Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 15 Aug 2023 11:16:05 +0200 Subject: [PATCH 002/225] Update platformio_tasmota32.ini (#19313) --- platformio_tasmota32.ini | 42 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/platformio_tasmota32.ini b/platformio_tasmota32.ini index b150a58c9..6d0d273bd 100644 --- a/platformio_tasmota32.ini +++ b/platformio_tasmota32.ini @@ -42,28 +42,28 @@ extra_scripts = pre:pio-tools/add_c_flags.py post:pio-tools/post_esp32.py ${esp_defaults.extra_scripts} +[safeboot_flags] +lib_ignore = ESP Mail Client + IRremoteESP8266 + NeoPixelBus + OneWire + MFRC522 + universal display Library + ESP8266Audio + ESP8266SAM + FFat + Berry + Berry mapping to C + Berry Tasmota mapping + Berry int64 implementation for 32 bits architecture + Berry Matter protocol implementation + Micro-RTSP + re1.5 + DHT sensor library + ccronexpr + [core32] -platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.07.00/platform-espressif32.zip +platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.08.00/platform-espressif32.zip platform_packages = build_unflags = ${esp32_defaults.build_unflags} build_flags = ${esp32_defaults.build_flags} - -[safeboot_flags] -lib_ignore = ESP Mail Client - IRremoteESP8266 - NeoPixelBus - OneWire - MFRC522 - universal display Library - ESP8266Audio - ESP8266SAM - FFat - Berry - Berry mapping to C - Berry Tasmota mapping - Berry int64 implementation for 32 bits architecture - Berry Matter protocol implementation - Micro-RTSP - re1.5 - DHT sensor library - ccronexpr From aa097e9034cea4cf7aac171e842a06415767e165 Mon Sep 17 00:00:00 2001 From: Paul Blacknell Date: Wed, 16 Aug 2023 10:17:54 +0100 Subject: [PATCH 003/225] add: shutdown command for PID controller (#19318) --- tasmota/tasmota_xdrv_driver/xdrv_49_pid.ino | 31 +++++++++++++++++---- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/tasmota/tasmota_xdrv_driver/xdrv_49_pid.ino b/tasmota/tasmota_xdrv_driver/xdrv_49_pid.ino index 1826d56c2..72b57dc95 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_49_pid.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_49_pid.ino @@ -197,6 +197,7 @@ #define D_CMND_PID_SETMANUAL_POWER "ManualPower" #define D_CMND_PID_SETMAX_INTERVAL "MaxInterval" #define D_CMND_PID_SETUPDATE_SECS "UpdateSecs" +#define D_CMND_PID_SETSHUTDOWN "Shutdown" const char kPIDCommands[] PROGMEM = D_PRFX_PID "|" // Prefix D_CMND_PID_SETPV "|" @@ -209,7 +210,8 @@ const char kPIDCommands[] PROGMEM = D_PRFX_PID "|" // Prefix D_CMND_PID_SETAUTO "|" D_CMND_PID_SETMANUAL_POWER "|" D_CMND_PID_SETMAX_INTERVAL "|" - D_CMND_PID_SETUPDATE_SECS; + D_CMND_PID_SETUPDATE_SECS "|" + D_CMND_PID_SETSHUTDOWN; ; void (* const PIDCommand[])(void) PROGMEM = { @@ -223,7 +225,8 @@ void (* const PIDCommand[])(void) PROGMEM = { &CmndSetAuto, &CmndSetManualPower, &CmndSetMaxInterval, - &CmndSetUpdateSecs + &CmndSetUpdateSecs, + &CmndSetShutdown }; struct { @@ -233,6 +236,7 @@ struct { unsigned long last_pv_update_secs = 0; bool run_pid_now = false; // tells PID_Every_Second to run the pid algorithm long current_time_secs = 0; // a counter that counts seconds since initialisation + bool shutdown = false; // power commands will be ignored when true } Pid; void PIDInit() @@ -351,16 +355,20 @@ void CmndSetDSmooth(void) { void CmndSetAuto(void) { if (XdrvMailbox.payload >= 0) { - Pid.pid.setAuto(XdrvMailbox.payload); + if(!Pid.shutdown) { + Pid.pid.setAuto(XdrvMailbox.payload); + } } ResponseCmndNumber(Pid.pid.getAuto()); } void CmndSetManualPower(void) { if (XdrvMailbox.data_len > 0) { - Pid.pid.setManualPower(CharToFloat(XdrvMailbox.data)); + if(!Pid.shutdown) { + Pid.pid.setManualPower(CharToFloat(XdrvMailbox.data)); + } } - ResponseCmndFloat(Pid.pid.getManualPower(), 1); + ResponseCmndFloat(Pid.pid.getManualPower(), 2); } void CmndSetMaxInterval(void) { @@ -381,6 +389,18 @@ void CmndSetUpdateSecs(void) { ResponseCmndNumber(Pid.update_secs); } +void CmndSetShutdown(void) { + if (XdrvMailbox.payload >= 0) { + AddLog(LOG_LEVEL_INFO, PSTR("PID: Shutdown mode %s"), XdrvMailbox.payload>0 ? "activated" : "cleared"); + Pid.shutdown = (XdrvMailbox.payload>0); + if(Pid.shutdown) { + Pid.pid.setAuto(0); + Pid.pid.setManualPower(0.0); + } + } + ResponseCmndNumber(Pid.shutdown); +} + void PIDShowValues(void) { char str_buf[FLOATSZ]; char chr_buf; @@ -394,6 +414,7 @@ void PIDShowValues(void) { d_buf = Pid.pid.getSp(); dtostrfd(d_buf, 2, str_buf); ResponseAppend_P(PSTR("\"PidSp\":%s,"), str_buf); + ResponseAppend_P(PSTR("\"PidShutdown\":%d,"), Pid.shutdown); #if PID_REPORT_MORE_SETTINGS d_buf = Pid.pid.getPb(); From b8804cf2a8fc85b2235d18d4921121ce4c487722 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Thu, 17 Aug 2023 15:34:13 +0200 Subject: [PATCH 004/225] Add variables to rules Add variables ``%power<1..28>%`` and ``%switch<1..28>%`` to rules (#19331) --- CHANGELOG.md | 2 ++ RELEASENOTES.md | 2 ++ tasmota/tasmota_xdrv_driver/xdrv_10_rules.ino | 10 ++++++++++ 3 files changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd144f208..d9918dd56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file. ## [13.1.0.1] ### Added +- Commands to allow setting of timeprop parameters (#19310) +- Variables ``%power<1..28>%`` and ``%switch<1..28>%`` to rules (#19331) ### Breaking Changed diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 9fc969ea7..884d4baf9 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -112,6 +112,8 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm ## Changelog v13.1.0.1 ### Added +- Commands to allow setting of timeprop parameters [#19310](https://github.com/arendst/Tasmota/issues/19310) +- Variables ``%power<1..28>%`` and ``%switch<1..28>%`` to rules [#19331](https://github.com/arendst/Tasmota/issues/19331) ### Breaking Changed diff --git a/tasmota/tasmota_xdrv_driver/xdrv_10_rules.ino b/tasmota/tasmota_xdrv_driver/xdrv_10_rules.ino index 8fe9f2d50..945c9b8c2 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_10_rules.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_10_rules.ino @@ -793,6 +793,16 @@ bool RuleSetProcess(uint8_t rule_set, String &event_saved) snprintf_P(stemp, sizeof(stemp), PSTR("%%MEM%d%%"), i +1); RulesVarReplace(commands, stemp, SettingsText(SET_MEM1 +i)); } + for (uint32_t i = 0; i < TasmotaGlobal.devices_present; i++) { + snprintf_P(stemp, sizeof(stemp), PSTR("%%POWER%d%%"), i +1); + RulesVarReplace(commands, stemp, String(bitRead(TasmotaGlobal.power, i))); + } + for (uint32_t i = 0; i < MAX_SWITCHES_SET; i++) { + if (SwitchUsed(i)) { + snprintf_P(stemp, sizeof(stemp), PSTR("%%SWITCH%d%%"), i +1); + RulesVarReplace(commands, stemp, String(SwitchState(i))); + } + } RulesVarReplace(commands, F("%TIME%"), String(MinutesPastMidnight())); RulesVarReplace(commands, F("%UTCTIME%"), String(UtcTime())); RulesVarReplace(commands, F("%UPTIME%"), String(MinutesUptime())); From 2eaa0fcb67c0c7e24c883c625c74091c8d7fe8c8 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Thu, 17 Aug 2023 23:28:27 +0200 Subject: [PATCH 005/225] Update switch comments --- tasmota/tasmota_support/support_switch_v4.ino | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/tasmota/tasmota_support/support_switch_v4.ino b/tasmota/tasmota_support/support_switch_v4.ino index 40501a899..12392a5de 100644 --- a/tasmota/tasmota_support/support_switch_v4.ino +++ b/tasmota/tasmota_support/support_switch_v4.ino @@ -349,27 +349,27 @@ void SwitchHandler(void) { if (button != Switch.last_state[i]) { // This implies if ((PRESSED == button) then (NOT_PRESSED == Switch.last_state[i])) switch (switchmode) { - case TOGGLE: - case PUSHBUTTON_TOGGLE: + case TOGGLE: // SwitchMode 0 + case PUSHBUTTON_TOGGLE: // SwitchMode 7 switchflag = POWER_TOGGLE; // Toggle break; - case FOLLOW: + case FOLLOW: // SwitchMode 1 switchflag = button &1; // Follow wall switch state break; - case FOLLOW_INV: + case FOLLOW_INV: // SwitchMode 2 switchflag = ~button &1; // Follow inverted wall switch state break; - case PUSHBUTTON: + case PUSHBUTTON: // SwitchMode 3 if (PRESSED == button) { switchflag = POWER_TOGGLE; // Toggle with pushbutton to Gnd } break; - case PUSHBUTTON_INV: + case PUSHBUTTON_INV: // SwitchMode 4 if (NOT_PRESSED == button) { switchflag = POWER_TOGGLE; // Toggle with releasing pushbutton from Gnd } break; - case PUSHBUTTONHOLD: + case PUSHBUTTONHOLD: // SwitchMode 5 if (PRESSED == button) { Switch.hold_timer[i] = loops_per_second * Settings->param[P_HOLD_TIME] / 10; // Start timer on button press } @@ -378,7 +378,7 @@ void SwitchHandler(void) { switchflag = POWER_TOGGLE; // ...and Toggle } break; - case PUSHBUTTONHOLD_INV: + case PUSHBUTTONHOLD_INV: // SwitchMode 6 if (NOT_PRESSED == button) { Switch.hold_timer[i] = loops_per_second * Settings->param[P_HOLD_TIME] / 10; // Start timer on button press... } @@ -387,9 +387,9 @@ void SwitchHandler(void) { switchflag = POWER_TOGGLE; // ...and Toggle } break; - case TOGGLEMULTI: - case FOLLOWMULTI: - case FOLLOWMULTI_INV: + case TOGGLEMULTI: // SwitchMode 8 + case FOLLOWMULTI: // SwitchMode 9 + case FOLLOWMULTI_INV: // SwitchMode 10 if (Switch.hold_timer[i]) { Switch.hold_timer[i] = 0; SendKey(KEY_SWITCH, i +1, POWER_HOLD); // Execute command via MQTT @@ -398,7 +398,7 @@ void SwitchHandler(void) { Switch.hold_timer[i] = loops_per_second / 2; // 0.5 second multi press window } break; - case PUSHHOLDMULTI: + case PUSHHOLDMULTI: // SwitchMode 11 if (NOT_PRESSED == button) { if ((Switch.hold_timer[i] & SM_TIMER_MASK) != 0) { Switch.hold_timer[i] = ((Switch.hold_timer[i] & ~SM_TIMER_MASK) == SM_FIRST_PRESS) ? SM_SECOND_PRESS : 0; @@ -424,7 +424,7 @@ void SwitchHandler(void) { } Switch.hold_timer[i] = (Switch.hold_timer[i] & ~SM_TIMER_MASK) | loops_per_second * Settings->param[P_HOLD_TIME] / 10; break; - case PUSHHOLDMULTI_INV: + case PUSHHOLDMULTI_INV: // SwitchMode 12 if (PRESSED == button) { if ((Switch.hold_timer[i] & SM_TIMER_MASK) != 0) { Switch.hold_timer[i] = ((Switch.hold_timer[i] & ~SM_TIMER_MASK) == SM_FIRST_PRESS) ? SM_SECOND_PRESS : 0; @@ -450,18 +450,18 @@ void SwitchHandler(void) { } Switch.hold_timer[i] = (Switch.hold_timer[i] & ~SM_TIMER_MASK) | loops_per_second * Settings->param[P_HOLD_TIME] / 10; break; - case PUSHON: + case PUSHON: // SwitchMode 13 if (PRESSED == button) { switchflag = POWER_ON; // Power ON with pushbutton to Gnd } break; - case PUSHON_INV: + case PUSHON_INV: // SwitchMode 14 if (NOT_PRESSED == button) { switchflag = POWER_ON; // Power ON with releasing pushbutton from Gnd } break; - case PUSH_IGNORE: - case PUSH_IGNORE_INV: + case PUSH_IGNORE: // SwitchMode 15 + case PUSH_IGNORE_INV: // SwitchMode 16 Switch.last_state[i] = button; // Update switch state before publishing MqttPublishSensor(); break; @@ -469,14 +469,14 @@ void SwitchHandler(void) { Switch.last_state[i] = button; } if (switchflag <= POWER_TOGGLE) { - if (!Settings->flag5.mqtt_switches) { // SetOption114 (0) - Detach Switches from relays and enable MQTT action state for all the SwitchModes + if (!Settings->flag5.mqtt_switches) { // SetOption114 (0) - Detach Switches from relays and enable MQTT action state for all the SwitchModes if (!SendKey(KEY_SWITCH, i +1, switchflag)) { // Execute command via MQTT ExecuteCommandPower(i +1, switchflag, SRC_SWITCH); // Execute command internally (if i < TasmotaGlobal.devices_present) } } else { mqtt_action = switchflag; } } if ((mqtt_action != POWER_NONE) && Settings->flag5.mqtt_switches) { // SetOption114 (0) - Detach Switches from relays and enable MQTT action state for all the SwitchModes - if (!Settings->flag.hass_discovery) { // SetOption19 - Control Home Assistant automatic discovery (See SetOption59) + if (!Settings->flag.hass_discovery) { // SetOption19 - Control Home Assistant automatic discovery (See SetOption59) char mqtt_state_str[16]; char *mqtt_state = mqtt_state_str; if (mqtt_action <= 3) { From 7927c989c4655cdb5aa961b28d4c2981333714c8 Mon Sep 17 00:00:00 2001 From: stefanbode Date: Fri, 18 Aug 2023 09:02:17 +0200 Subject: [PATCH 006/225] fix shutterinvert (#19341) * fix shutterinvert * fix shutterinvert --- tasmota/tasmota_xdrv_driver/xdrv_27_esp32_shutter.ino | 5 +++-- tasmota/tasmota_xdrv_driver/xdrv_27_shutter.ino | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tasmota/tasmota_xdrv_driver/xdrv_27_esp32_shutter.ino b/tasmota/tasmota_xdrv_driver/xdrv_27_esp32_shutter.ino index 538e11fe4..c0383ccf9 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_27_esp32_shutter.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_27_esp32_shutter.ino @@ -1515,8 +1515,9 @@ void CmndShutterPosition(void) int8_t target_pos_percent = (XdrvMailbox.payload < 0) ? (XdrvMailbox.payload == -99 ? ShutterRealToPercentPosition(Shutter[index].real_position, index) : 0) : ((XdrvMailbox.payload > 100) ? 100 : XdrvMailbox.payload); target_pos_percent = ((Settings->shutter_options[index] & 1) && ((SRC_MQTT != TasmotaGlobal.last_source) - || (SRC_SERIAL != TasmotaGlobal.last_source) - || (SRC_WEBCOMMAND != TasmotaGlobal.last_source) + && (SRC_SERIAL != TasmotaGlobal.last_source) + && (SRC_WEBGUI != TasmotaGlobal.last_source) + && (SRC_WEBCOMMAND != TasmotaGlobal.last_source) )) ? 100 - target_pos_percent : target_pos_percent; if (XdrvMailbox.payload != -99) { diff --git a/tasmota/tasmota_xdrv_driver/xdrv_27_shutter.ino b/tasmota/tasmota_xdrv_driver/xdrv_27_shutter.ino index c5255c563..29ffe43f4 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_27_shutter.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_27_shutter.ino @@ -1340,8 +1340,9 @@ void CmndShutterPosition(void) int8_t target_pos_percent = (XdrvMailbox.payload < 0) ? (XdrvMailbox.payload == -99 ? ShutterRealToPercentPosition(Shutter[index].real_position, index) : 0) : ((XdrvMailbox.payload > 100) ? 100 : XdrvMailbox.payload); target_pos_percent = ((Settings->shutter_options[index] & 1) && ((SRC_MQTT != TasmotaGlobal.last_source) - || (SRC_SERIAL != TasmotaGlobal.last_source) - || (SRC_WEBCOMMAND != TasmotaGlobal.last_source) + && (SRC_SERIAL != TasmotaGlobal.last_source) + && (SRC_WEBGUI != TasmotaGlobal.last_source) + && (SRC_WEBCOMMAND != TasmotaGlobal.last_source) )) ? 100 - target_pos_percent : target_pos_percent; if (XdrvMailbox.payload != -99) { //target_pos_percent = (Settings->shutter_options[index] & 1) ? 100 - target_pos_percent : target_pos_percent; From e4eb919c939626a536fe9645ec2167657cbe1415 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Fri, 18 Aug 2023 11:22:06 +0200 Subject: [PATCH 007/225] Update changelogs --- CHANGELOG.md | 1 + RELEASENOTES.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9918dd56..ed5c8efd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ All notable changes to this project will be documented in this file. ### Changed ### Fixed +- Shutter invert (#19341) ### Removed diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 884d4baf9..f799d720b 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -120,5 +120,6 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm ### Changed ### Fixed +- Shutter invert [#19341](https://github.com/arendst/Tasmota/issues/19341) ### Removed From 5b3b2a7a62c8e8e50b1efb1e876ff7d642f3afcd Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Fri, 18 Aug 2023 11:34:01 +0200 Subject: [PATCH 008/225] Changed display invert setting Changed display invert setting after tasmota start in uDisplay driver (#19337) --- CHANGELOG.md | 1 + RELEASENOTES.md | 1 + tasmota/tasmota_xdsp_display/xdsp_17_universal.ino | 9 +++++++++ 3 files changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed5c8efd3..6cdca74c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file. ### Breaking Changed ### Changed +- Display invert setting after tasmota start in uDisplay driver (#19337) ### Fixed - Shutter invert (#19341) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index f799d720b..6507f4a0e 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -118,6 +118,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm ### Breaking Changed ### Changed +- Display invert setting after tasmota start in uDisplay driver [#19337](https://github.com/arendst/Tasmota/issues/19337) ### Fixed - Shutter invert [#19341](https://github.com/arendst/Tasmota/issues/19341) diff --git a/tasmota/tasmota_xdsp_display/xdsp_17_universal.ino b/tasmota/tasmota_xdsp_display/xdsp_17_universal.ino index 5482183eb..c0a1a377f 100644 --- a/tasmota/tasmota_xdsp_display/xdsp_17_universal.ino +++ b/tasmota/tasmota_xdsp_display/xdsp_17_universal.ino @@ -454,6 +454,15 @@ int8_t cs; Settings->display_width = renderer->width(); Settings->display_height = renderer->height(); + bool iniinv = Settings->display_options.invert; + cp = strstr(ddesc, ":n,"); + if (cp) { + cp+=3; + iniinv = strtol(cp, &cp, 10); + Settings->display_options.invert = iniinv; + } + renderer->invertDisplay(iniinv); + ApplyDisplayDimmer(); #ifdef SHOW_SPLASH From e4860efcdb4da3221c0cfd1da6b25141147253d1 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 19 Aug 2023 14:51:47 +0200 Subject: [PATCH 009/225] add platformio_tasmota_core3_env.ini to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 82c56687b..78c2cfe2f 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,7 @@ tasmota/tasmota.ino.cpp platformio_override.ini platformio_tasmota_cenv.ini platformio_tasmota_user_env.ini +platformio_tasmota_core3_env.ini lib/libesp32/berry/generate/* lib/libesp32/berry/berry From 0acd5335d52e24eb319eb029f3ea22b5d651b1c0 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Sun, 20 Aug 2023 17:49:21 +0200 Subject: [PATCH 010/225] Remove debug messages (#19365) --- lib/libesp32/rtsp/CRtspSession.cpp | 8 ++++---- lib/libesp32/rtsp/CStreamer.cpp | 12 ++++++------ lib/libesp32/rtsp/OV2640.cpp | 2 +- lib/libesp32/rtsp/OV2640Streamer.cpp | 4 ++-- lib/libesp32/rtsp/platglue-esp32.h | 10 +++++----- lib/libesp32/rtsp/platglue-posix.h | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lib/libesp32/rtsp/CRtspSession.cpp b/lib/libesp32/rtsp/CRtspSession.cpp index 7462e8f89..79e210d1e 100755 --- a/lib/libesp32/rtsp/CRtspSession.cpp +++ b/lib/libesp32/rtsp/CRtspSession.cpp @@ -5,7 +5,7 @@ CRtspSession::CRtspSession(SOCKET aRtspClient, CStreamer * aStreamer) : m_RtspClient(aRtspClient),m_Streamer(aStreamer) { - printf("Creating RTSP session\n"); +// printf("Creating RTSP session\n"); Init(); m_RtspSessionID = getRandom(); // create a session ID @@ -95,11 +95,11 @@ bool CRtspSession::ParseRtspRequest(char const * aRequest, unsigned aRequestSize } CmdName[i] = '\0'; if (!parseSucceeded) { - printf("failed to parse RTSP\n"); +// printf("failed to parse RTSP\n"); return false; } - printf("RTSP received %s\n", CmdName); +// printf("RTSP received %s\n", CmdName); // find out the command type if (strstr(CmdName,"OPTIONS") != nullptr) m_RtspCmdType = RTSP_OPTIONS; else @@ -400,7 +400,7 @@ bool CRtspSession::handleRequests(uint32_t readTimeoutMs) return true; } else if(res == 0) { - printf("client closed socket, exiting\n"); +// printf("client closed socket, exiting\n"); m_stopped = true; return true; } diff --git a/lib/libesp32/rtsp/CStreamer.cpp b/lib/libesp32/rtsp/CStreamer.cpp index af4519ec7..a9f638de9 100755 --- a/lib/libesp32/rtsp/CStreamer.cpp +++ b/lib/libesp32/rtsp/CStreamer.cpp @@ -6,7 +6,7 @@ CStreamer::CStreamer(SOCKET aClient, u_short width, u_short height) : m_Client(aClient) { - printf("Creating TSP streamer\n"); +// printf("Creating TSP streamer\n"); m_RtpServerPort = 0; m_RtcpServerPort = 0; m_RtpClientPort = 0; @@ -228,7 +228,7 @@ bool findJPEGheader(BufPtr *start, uint32_t *len, uint8_t marker) { while(bytes - *start < *len) { uint8_t framing = *bytes++; // better be 0xff if(framing != 0xff) { - printf("malformed jpeg, framing=%x\n", framing); +// printf("malformed jpeg, framing=%x\n", framing); return false; } uint8_t typecode = *bytes++; @@ -263,13 +263,13 @@ bool findJPEGheader(BufPtr *start, uint32_t *len, uint8_t marker) { break; } default: - printf("unexpected jpeg typecode 0x%x\n", typecode); +// printf("unexpected jpeg typecode 0x%x\n", typecode); break; } } } - printf("failed to find jpeg marker 0x%x", marker); +// printf("failed to find jpeg marker 0x%x", marker); return false; } @@ -309,7 +309,7 @@ bool decodeJPEGfile(BufPtr *start, uint32_t *len, BufPtr *qtable0, BufPtr *qtabl BufPtr quantstart = *start; uint32_t quantlen = *len; if(!findJPEGheader(&quantstart, &quantlen, 0xdb)) { - printf("error can't find quant table 0\n"); +// printf("error can't find quant table 0\n"); } else { // printf("found quant table %x\n", quantstart[2]); @@ -317,7 +317,7 @@ bool decodeJPEGfile(BufPtr *start, uint32_t *len, BufPtr *qtable0, BufPtr *qtabl *qtable0 = quantstart + 3; // 3 bytes of header skipped nextJpegBlock(&quantstart); if(!findJPEGheader(&quantstart, &quantlen, 0xdb)) { - printf("error can't find quant table 1\n"); +// printf("error can't find quant table 1\n"); } else { // printf("found quant table %x\n", quantstart[2]); diff --git a/lib/libesp32/rtsp/OV2640.cpp b/lib/libesp32/rtsp/OV2640.cpp index 9c1908b99..f8abe39f9 100755 --- a/lib/libesp32/rtsp/OV2640.cpp +++ b/lib/libesp32/rtsp/OV2640.cpp @@ -184,7 +184,7 @@ esp_err_t OV2640::init(camera_config_t config) esp_err_t err = esp_camera_init(&_cam_config); if (err != ESP_OK) { - printf("Camera probe failed with error 0x%x", err); +// printf("Camera probe failed with error 0x%x", err); return err; } // ESP_ERROR_CHECK(gpio_install_isr_service(0)); diff --git a/lib/libesp32/rtsp/OV2640Streamer.cpp b/lib/libesp32/rtsp/OV2640Streamer.cpp index 679594f48..43e92b647 100755 --- a/lib/libesp32/rtsp/OV2640Streamer.cpp +++ b/lib/libesp32/rtsp/OV2640Streamer.cpp @@ -6,7 +6,7 @@ OV2640Streamer::OV2640Streamer(SOCKET aClient, OV2640 &cam) : CStreamer(aClient, cam.getWidth(), cam.getHeight()), m_cam(cam) { - Serial.printf("Created streamer width=%d, height=%d\n", cam.getWidth(), cam.getHeight()); +// Serial.printf("Created streamer width=%d, height=%d\n", cam.getWidth(), cam.getHeight()); } void OV2640Streamer::streamImage(uint32_t curMsec) @@ -15,5 +15,5 @@ void OV2640Streamer::streamImage(uint32_t curMsec) BufPtr bytes = m_cam.getfb(); streamFrame(bytes, m_cam.getSize(), curMsec); - Serial.printf("get frame: %d\n",m_cam.getSize()); +// Serial.printf("get frame: %d\n",m_cam.getSize()); } diff --git a/lib/libesp32/rtsp/platglue-esp32.h b/lib/libesp32/rtsp/platglue-esp32.h index 8646904c9..1a71b3a90 100755 --- a/lib/libesp32/rtsp/platglue-esp32.h +++ b/lib/libesp32/rtsp/platglue-esp32.h @@ -22,7 +22,7 @@ typedef uint16_t IPPORT; // on linux use network byte order #define NULLSOCKET NULL inline void closesocket(SOCKET s) { - printf("closing TCP socket\n"); +// printf("closing TCP socket\n"); if(s) { s->stop(); @@ -38,7 +38,7 @@ inline void socketpeeraddr(SOCKET s, IPADDRESS *addr, IPPORT *port) { } inline void udpsocketclose(UDPSOCKET s) { - printf("closing UDP socket\n"); +// printf("closing UDP socket\n"); if(s) { s->stop(); delete s; @@ -50,7 +50,7 @@ inline UDPSOCKET udpsocketcreate(unsigned short portNum) UDPSOCKET s = new WiFiUDP(); if(!s->begin(portNum)) { - printf("Can't bind port %d\n", portNum); +// printf("Can't bind port %d\n", portNum); delete s; return NULL; } @@ -70,7 +70,7 @@ inline ssize_t udpsocketsend(UDPSOCKET sockfd, const void *buf, size_t len, sockfd->beginPacket(destaddr, destport); sockfd->write((const uint8_t *) buf, len); if(!sockfd->endPacket()) - printf("error sending udp packet\n"); +// printf("error sending udp packet\n"); return len; } @@ -83,7 +83,7 @@ inline ssize_t udpsocketsend(UDPSOCKET sockfd, const void *buf, size_t len, inline int socketread(SOCKET sock, char *buf, size_t buflen, int timeoutmsec) { if(!sock->connected()) { - printf("client has closed the socket\n"); +// printf("client has closed the socket\n"); return 0; } diff --git a/lib/libesp32/rtsp/platglue-posix.h b/lib/libesp32/rtsp/platglue-posix.h index 046258ef5..fd442731c 100755 --- a/lib/libesp32/rtsp/platglue-posix.h +++ b/lib/libesp32/rtsp/platglue-posix.h @@ -28,7 +28,7 @@ inline void socketpeeraddr(SOCKET s, IPADDRESS *addr, IPPORT *port) { sockaddr_in r; socklen_t len = sizeof(r); if(getpeername(s,(struct sockaddr*)&r,&len) < 0) { - printf("getpeername failed\n"); +// printf("getpeername failed\n"); *addr = 0; *port = 0; } @@ -54,7 +54,7 @@ inline UDPSOCKET udpsocketcreate(unsigned short portNum) int s = socket(AF_INET, SOCK_DGRAM, 0); addr.sin_port = htons(portNum); if (bind(s,(sockaddr*)&addr,sizeof(addr)) != 0) { - printf("Error, can't bind\n"); +// printf("Error, can't bind\n"); close(s); s = 0; } From eccfbc334ceb8627487f588c7d30fc4680b3637e Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Sun, 20 Aug 2023 18:27:34 +0200 Subject: [PATCH 011/225] Fix compile warning --- lib/libesp32/rtsp/platglue-esp32.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libesp32/rtsp/platglue-esp32.h b/lib/libesp32/rtsp/platglue-esp32.h index 1a71b3a90..0d921bb80 100755 --- a/lib/libesp32/rtsp/platglue-esp32.h +++ b/lib/libesp32/rtsp/platglue-esp32.h @@ -69,8 +69,9 @@ inline ssize_t udpsocketsend(UDPSOCKET sockfd, const void *buf, size_t len, { sockfd->beginPacket(destaddr, destport); sockfd->write((const uint8_t *) buf, len); - if(!sockfd->endPacket()) + if(!sockfd->endPacket()) { // printf("error sending udp packet\n"); + } return len; } From 0c3b5596301e0d579d5807797041c5f8328e0dda Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Mon, 21 Aug 2023 16:00:20 +0200 Subject: [PATCH 012/225] Phase 1 support C2/C6 --- tasmota/include/tasmota.h | 73 ++++---- tasmota/include/tasmota_globals.h | 8 +- tasmota/include/tasmota_template.h | 163 ++++++++++++++++-- tasmota/include/tasmota_types.h | 24 ++- tasmota/tasmota.ino | 9 +- tasmota/tasmota_support/settings.ino | 19 +- tasmota/tasmota_support/support.ino | 86 +++++---- tasmota/tasmota_support/support_command.ino | 14 +- .../support_crash_recorder.ino | 2 +- tasmota/tasmota_support/support_esp.ino | 18 +- tasmota/tasmota_support/support_rotary.ino | 2 +- tasmota/tasmota_support/support_tasmota.ino | 3 +- 12 files changed, 317 insertions(+), 104 deletions(-) diff --git a/tasmota/include/tasmota.h b/tasmota/include/tasmota.h index b37be129a..ba9645e9b 100644 --- a/tasmota/include/tasmota.h +++ b/tasmota/include/tasmota.h @@ -60,21 +60,18 @@ const uint8_t MAX_INTERLOCKS_SET = 14; // Max number of interlock groups (M const uint8_t MAX_SWITCHES_SET = 28; // Max number of switches const uint8_t MAX_LEDS = 4; // Max number of leds const uint8_t MAX_PWMS_LEGACY = 5; // Max number of PWM channels in first settings block - Legacy limit for ESP8266, but extended for ESP32 (see below) -#ifdef ESP32 - // Max number of PWM channels (total including extended) - ESP32 only - #if defined(CONFIG_IDF_TARGET_ESP32) - const uint8_t MAX_PWMS = 16; // ESP32: 16 ledc PWM channels in total - TODO for now - #elif defined(CONFIG_IDF_TARGET_ESP32S2) - const uint8_t MAX_PWMS = 8; // ESP32S2: 8 ledc PWM channels in total - #elif defined(CONFIG_IDF_TARGET_ESP32S3) - const uint8_t MAX_PWMS = 8; // ESP32S3: 8 ledc PWM channels in total - #elif defined(CONFIG_IDF_TARGET_ESP32C3) - const uint8_t MAX_PWMS = 6; // ESP32C3: 6 ledc PWM channels in total +#ifdef ESP32 // Max number of PWM channels (total including extended) - ESP32 only + #if CONFIG_IDF_TARGET_ESP32 + const uint8_t MAX_PWMS = 16; // ESP32: 16 ledc PWM channels in total - TODO for now + #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 + const uint8_t MAX_PWMS = 8; // ESP32S2/S3: 8 ledc PWM channels in total + #elif CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 + const uint8_t MAX_PWMS = 6; // ESP32C2/C3/C6: 6 ledc PWM channels in total #else - const uint8_t MAX_PWMS = 5; // Unknown - revert to 5 PWM max + const uint8_t MAX_PWMS = 5; // Unknown - revert to 5 PWM max #endif #else - const uint8_t MAX_PWMS = 5; // (not used on ESP8266) +const uint8_t MAX_PWMS = 5; // (not used on ESP8266) #endif const uint8_t MAX_COUNTERS = 4; // Max number of counter sensors const uint8_t MAX_TIMERS = 16; // Max number of Timers @@ -100,19 +97,17 @@ const uint16_t VL53LXX_MAX_SENSORS = 8; // Max number of VL53L0X sensors const uint8_t MAX_I2C = 2; // Max number of I2C controllers (ESP32 = 2) const uint8_t MAX_SPI = 2; // Max number of Hardware SPI controllers (ESP32 = 2) const uint8_t MAX_I2S = 2; // Max number of Hardware I2S controllers (ESP32 = 2) - -#if CONFIG_IDF_TARGET_ESP32 -const uint8_t MAX_RMT = 8; // Max number or RMT channels (ESP32 only) -#elif CONFIG_IDF_TARGET_ESP32S2 -const uint8_t MAX_RMT = 4; // Max number or RMT channels (ESP32S2 only) -#elif CONFIG_IDF_TARGET_ESP32S3 -const uint8_t MAX_RMT = 1; // Max number or RMT channels (ESP32S3 only) -#elif CONFIG_IDF_TARGET_ESP32C3 -const uint8_t MAX_RMT = 2; // Max number or RMT channels (ESP32C3 only) -#else -const uint8_t MAX_RMT = 0; // Max number or RMT channels (0 if unknown) -#endif - + #if CONFIG_IDF_TARGET_ESP32 + const uint8_t MAX_RMT = 8; // Max number or RMT channels (ESP32 only) + #elif CONFIG_IDF_TARGET_ESP32S2 + const uint8_t MAX_RMT = 4; // Max number or RMT channels (ESP32S2 only) + #elif CONFIG_IDF_TARGET_ESP32S3 + const uint8_t MAX_RMT = 1; // Max number or RMT channels (ESP32S3 only) + #elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 + const uint8_t MAX_RMT = 2; // Max number or RMT channels (ESP32C3 only) + #else + const uint8_t MAX_RMT = 0; // Max number or RMT channels (0 if unknown) + #endif #else const uint8_t MAX_I2C = 0; // Max number of I2C controllers (ESP8266 = 0, no choice) const uint8_t MAX_SPI = 0; // Max number of Hardware SPI controllers (ESP8266 = 0, no choice) @@ -138,11 +133,13 @@ const uint8_t MAX_ADCS = 1; // Max number of ESP8266 ADC pins const uint8_t MAX_SWITCHES_TXT = 8; // Max number of switches user text #endif // ESP8266 #ifdef ESP32 -#ifdef CONFIG_IDF_TARGET_ESP32C3 -const uint8_t MAX_ADCS = 5; // Max number of ESP32-C3 ADC pins (ADC2 pins are unusable with Wifi enabled) -#else // ESP32 -const uint8_t MAX_ADCS = 8; // Max number of ESP32 ADC pins (ADC2 pins are unusable with Wifi enabled) -#endif // ESP32C3 + #if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 + const uint8_t MAX_ADCS = 5; // Max number of ESP32-C3 ADC pins (ADC2 pins are unusable with Wifi enabled) + #elif CONFIG_IDF_TARGET_ESP32C6 + const uint8_t MAX_ADCS = 7; // Max number of ESP32 ADC pins (ADC2 pins are unusable with Wifi enabled) + #else // ESP32 + const uint8_t MAX_ADCS = 8; // Max number of ESP32 ADC pins (ADC2 pins are unusable with Wifi enabled) + #endif // ESP32C3 const uint8_t MAX_SWITCHES_TXT = 28; // Max number of switches user text #endif // ESP32 @@ -206,11 +203,11 @@ const uint16_t CMDSZ = 24; // Max number of characters in comma const uint16_t TOPSZ = 151; // Max number of characters in topic string #ifdef ESP8266 -#ifdef PIO_FRAMEWORK_ARDUINO_MMU_CACHE16_IRAM48_SECHEAP_SHARED -const uint16_t LOG_BUFFER_SIZE = 6096; // Max number of characters in logbuffer used by weblog, syslog and mqttlog -#else -const uint16_t LOG_BUFFER_SIZE = 4096; // Max number of characters in logbuffer used by weblog, syslog and mqttlog -#endif // PIO_FRAMEWORK_ARDUINO_MMU_CACHE16_IRAM48_SECHEAP_SHARED + #ifdef PIO_FRAMEWORK_ARDUINO_MMU_CACHE16_IRAM48_SECHEAP_SHARED + const uint16_t LOG_BUFFER_SIZE = 6096; // Max number of characters in logbuffer used by weblog, syslog and mqttlog + #else + const uint16_t LOG_BUFFER_SIZE = 4096; // Max number of characters in logbuffer used by weblog, syslog and mqttlog + #endif // PIO_FRAMEWORK_ARDUINO_MMU_CACHE16_IRAM48_SECHEAP_SHARED #else // Not ESP8266 const uint16_t LOG_BUFFER_SIZE = 6096; // Max number of characters in logbuffer used by weblog, syslog and mqttlog #endif // ESP8266 @@ -305,21 +302,21 @@ const uint32_t LOOP_SLEEP_DELAY = 50; // Lowest number of milliseconds to #define XPT2046_MAXY 3870 #ifdef ESP32 - #if defined(CONFIG_IDF_TARGET_ESP32S2) + #if CONFIG_IDF_TARGET_ESP32S2 #define MAX_TX_PWR_DBM_11b 195 #define MAX_TX_PWR_DBM_54g 150 #define MAX_TX_PWR_DBM_n 130 #define WIFI_SENSITIVITY_11b -880 #define WIFI_SENSITIVITY_54g -750 #define WIFI_SENSITIVITY_n -720 - #elif defined(CONFIG_IDF_TARGET_ESP32S3) + #elif CONFIG_IDF_TARGET_ESP32S3 #define MAX_TX_PWR_DBM_11b 210 #define MAX_TX_PWR_DBM_54g 190 #define MAX_TX_PWR_DBM_n 185 #define WIFI_SENSITIVITY_11b -880 #define WIFI_SENSITIVITY_54g -760 #define WIFI_SENSITIVITY_n -720 - #elif defined(CONFIG_IDF_TARGET_ESP32C3) + #elif CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 #define MAX_TX_PWR_DBM_11b 210 #define MAX_TX_PWR_DBM_54g 190 #define MAX_TX_PWR_DBM_n 185 diff --git a/tasmota/include/tasmota_globals.h b/tasmota/include/tasmota_globals.h index a6f964e77..3da0af66d 100644 --- a/tasmota/include/tasmota_globals.h +++ b/tasmota/include/tasmota_globals.h @@ -137,15 +137,15 @@ String EthernetMacAddress(void); \*-------------------------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------------------------*\ - * Start ESP32-C32 specific parameters - disable features not present in ESP32-C3 + * Start ESP32-C3/C6 specific parameters - disable features not present in ESP32-C3/C6 \*-------------------------------------------------------------------------------------------*/ -#if CONFIG_IDF_TARGET_ESP32C3 // ESP32-C3 +#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 // ESP32-C3/C6 //#ifdef USE_ETHERNET -//#undef USE_ETHERNET // ESP32-C3 does not support ethernet +//#undef USE_ETHERNET // ESP32-C3/C6 does not support ethernet //#endif -#endif // CONFIG_IDF_TARGET_ESP32C3 +#endif // CONFIG_IDF_TARGET_ESP32C3/C6 /*-------------------------------------------------------------------------------------------*\ * End ESP32-C3 specific parameters diff --git a/tasmota/include/tasmota_template.h b/tasmota/include/tasmota_template.h index 009934be7..d4bbc5264 100644 --- a/tasmota/include/tasmota_template.h +++ b/tasmota/include/tasmota_template.h @@ -1257,8 +1257,22 @@ typedef struct MYTMPLT8266 { } mytmplt8266; // 12 bytes #endif // ESP8266 + #ifdef ESP32 -#ifdef CONFIG_IDF_TARGET_ESP32C3 +#if CONFIG_IDF_TARGET_ESP32C2 + +/* **************************************** + * ESP32C2 + * ****************************************/ +#define MAX_GPIO_PIN 21 // Number of supported GPIO +#define MIN_FLASH_PINS 0 // Number of flash chip pins unusable for configuration (GPIO11 to 17) +#define MAX_USER_PINS 21 // MAX_GPIO_PIN - MIN_FLASH_PINS +#define WEMOS_MODULE 0 // Wemos module + +// 0 1 2 3 4 5 6 7 8 91011121314151617181920 +const char PINS_WEMOS[] PROGMEM = "AOAOAOAOAOIOIOIOIOIOIOFLFLFLFLFLFLFLIORXTX"; + +#elif CONFIG_IDF_TARGET_ESP32C3 /* **************************************** * ESP32C3 @@ -1271,7 +1285,20 @@ typedef struct MYTMPLT8266 { // 0 1 2 3 4 5 6 7 8 9101112131415161718192021 const char PINS_WEMOS[] PROGMEM = "AOAOAOAOAOAOIOIOIOIOIOFLFLFLFLFLFLFLIOIORXTX"; -#elif defined(CONFIG_IDF_TARGET_ESP32S2) +#elif CONFIG_IDF_TARGET_ESP32C6 + +/* **************************************** + * ESP32C6 + * ****************************************/ +#define MAX_GPIO_PIN 31 // Number of supported GPIO +#define MIN_FLASH_PINS 0 // Number of flash chip pins unusable for configuration (GPIO24 to 30) +#define MAX_USER_PINS 31 // MAX_GPIO_PIN - MIN_FLASH_PINS +#define WEMOS_MODULE 0 // Wemos module + +// 0 1 2 3 4 5 6 7 8 9101112131415161718192021222324252627282930 +const char PINS_WEMOS[] PROGMEM = "AOAOAOAOAOAOAOIOIOIOIOIOIOIOIOIOTXRXIOIOIOIOIOIOFLFLFLFLFLFLFL"; + +#elif CONFIG_IDF_TARGET_ESP32S2 /* **************************************** * ESP32S2 @@ -1284,7 +1311,7 @@ const char PINS_WEMOS[] PROGMEM = "AOAOAOAOAOAOIOIOIOIOIOFLFLFLFLFLFLFLIOIORXTX" // 0 1 2 3 4 5 6 7 8 910111213141516171819202122232425262728293031323334353637383940414243444546 const char PINS_WEMOS[] PROGMEM = "IOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOIO--------FLFLFLFLFLFLFLIOIOIOIOIOIOIOIOIOIOIOIOIOI "; -#elif defined(CONFIG_IDF_TARGET_ESP32S3) +#elif CONFIG_IDF_TARGET_ESP32S3 /* **************************************** * ESP32S3 * GPIOs 0..21 + 33..48 @@ -1300,7 +1327,7 @@ const char PINS_WEMOS[] PROGMEM = "IOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOIO- // 0 1 2 3 4 5 6 7 8 9101112131415161718192021222324252627282930313233343536373839404142434445464748 const char PINS_WEMOS[] PROGMEM = "IOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOIO--------FLFLFLFLFLFLFLIOIOIOIOIOIOIOIOIOIOIOIOIOIOIOIO"; -#else // not CONFIG_IDF_TARGET_ESP32C3 nor CONFIG_IDF_TARGET_ESP32S2 - ESP32 +#else // not CONFIG_IDF_TARGET_ESP32C2/C3/C6 nor CONFIG_IDF_TARGET_ESP32S2 - ESP32 /* **************************************** * ESP32 - including Pico @@ -1331,7 +1358,7 @@ const char PINS_WEMOS[] PROGMEM = "IOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOIO- // 0 1 2 3 4 5 6 7 8 9101112131415161718192021222324252627282930313233343536373839 const char PINS_WEMOS[] PROGMEM = "IOTXIORXIOIOFLFLFLFLFLFLIOIOIOIOIOIOIOIOIOIOIOIOIOIOIOIO--------AOAOIAIAIAIAIAIA"; -#endif // ESP32/S2/C3 selection +#endif // ESP32/S2/C2/C3/C6 selection #endif // ESP32 /********************************************************************************************\ @@ -2791,7 +2818,61 @@ const mytmplt8285 kModules8285[TMP_MAXMODULE_8266 - TMP_WEMOS] PROGMEM = { #endif // ESP8266 #ifdef ESP32 -#ifdef CONFIG_IDF_TARGET_ESP32C3 +#if CONFIG_IDF_TARGET_ESP32C2 +/********************************************************************************************\ + * ESP32-C2 Module templates +\********************************************************************************************/ + +#define USER_MODULE 255 + +// Supported hardware modules +enum SupportedModulesESP32C2 { + WEMOS, // not really correct, a placeholder for now + MAXMODULE }; + +// Default module settings +const uint8_t kModuleNiceList[] PROGMEM = { + WEMOS, +}; + +// !!! Update this list in the same order as kModuleNiceList !!! +const char kModuleNames[] PROGMEM = + "ESP32C2|" + ; + +// !!! Update this list in the same order as SupportedModulesESP32C2 !!! +const mytmplt kModules[] PROGMEM = { + { // Generic ESP32C2 device + AGPIO(GPIO_USER), // 0 IO GPIO0, ADC1_CH0, RTC + AGPIO(GPIO_USER), // 1 IO GPIO1, ADC1_CH1, RTC + AGPIO(GPIO_USER), // 2 IO GPIO2, ADC1_CH2, RTC + AGPIO(GPIO_USER), // 3 IO GPIO3, ADC1_CH3, RTC + AGPIO(GPIO_USER), // 4 IO GPIO4, ADC1_CH4, RTC + AGPIO(GPIO_USER), // 5 IO GPIO5, RTC + AGPIO(GPIO_USER), // 6 IO GPIO6, + AGPIO(GPIO_USER), // 7 IO GPIO7, + AGPIO(GPIO_USER), // 8 IO GPIO8, Strapping + AGPIO(GPIO_USER), // 9 IO GPIO9, Strapping + AGPIO(GPIO_USER), // 10 IO GPIO10 + 0, // 11 IO GPIO11, output power supply for flash + 0, // 12 IO GPIO12, SPIHD + 0, // 13 IO GPIO13, SPIWP + 0, // 14 IO GPIO14, SPICS0 + 0, // 15 IO GPIO15, SPICLK + 0, // 16 IO GPIO16, SPID + 0, // 17 IO GPIO17, SPIQ + AGPIO(GPIO_USER), // 18 IO GPIO18, + AGPIO(GPIO_USER), // 19 IO RXD0 GPIO19, U0RXD + AGPIO(GPIO_USER), // 20 IO TXD0 GPIO20, U0TXD + 0 // Flag + }, +}; + +/*********************************************************************************************\ + Known templates +\*********************************************************************************************/ + +#elif CONFIG_IDF_TARGET_ESP32C3 /********************************************************************************************\ * ESP32-C3 Module templates \********************************************************************************************/ @@ -2846,8 +2927,71 @@ const mytmplt kModules[] PROGMEM = { Known templates \*********************************************************************************************/ -#elif defined(CONFIG_IDF_TARGET_ESP32S2) +#elif CONFIG_IDF_TARGET_ESP32C6 +/********************************************************************************************\ + * ESP32-C6 Module templates +\********************************************************************************************/ +#define USER_MODULE 255 + +// Supported hardware modules +enum SupportedModulesESP32C6 { + WEMOS, // not really correct, a placeholder for now + MAXMODULE }; + +// Default module settings +const uint8_t kModuleNiceList[] PROGMEM = { + WEMOS, +}; + +// !!! Update this list in the same order as kModuleNiceList !!! +const char kModuleNames[] PROGMEM = + "ESP32C6|" + ; + +// !!! Update this list in the same order as SupportedModulesESP32C6 !!! +const mytmplt kModules[] PROGMEM = { + { // Generic ESP32C6 device + AGPIO(GPIO_USER), // 0 IO GPIO0, ADC1_CH0, LP_GPIO0 + AGPIO(GPIO_USER), // 1 IO GPIO1, ADC1_CH1, LP_GPIO1 + AGPIO(GPIO_USER), // 2 IO GPIO2, ADC1_CH2, LP_GPIO2 + AGPIO(GPIO_USER), // 3 IO GPIO3, ADC1_CH3, LP_GPIO3 + AGPIO(GPIO_USER), // 4 IO GPIO4, ADC1_CH4, LP_GPIO4, Strapping + AGPIO(GPIO_USER), // 5 IO GPIO5, ADC1_CH5, LP_GPIO5, Strapping + AGPIO(GPIO_USER), // 6 IO GPIO6, ADC1_CH6, LP_GPIO6 + AGPIO(GPIO_USER), // 7 IO GPIO7, LP_GPIO7 + AGPIO(GPIO_USER), // 8 IO GPIO8, Strapping + AGPIO(GPIO_USER), // 9 IO GPIO9, Strapping + AGPIO(GPIO_USER), // 10 IO GPIO10 (QFN40 only) + AGPIO(GPIO_USER), // 11 IO GPIO11 (QFN40 only) + AGPIO(GPIO_USER), // 12 IO GPIO12, USB-JTAG + AGPIO(GPIO_USER), // 13 IO GPIO13, USB-JTAG + AGPIO(GPIO_USER), // 14 IO GPIO14 (QFN32 only) + AGPIO(GPIO_USER), // 15 IO GPIO15, Strapping + AGPIO(GPIO_USER), // 16 IO TXD0 GPIO16, U0TXD + AGPIO(GPIO_USER), // 17 IO RXD0 GPIO17, U0RXD + AGPIO(GPIO_USER), // 18 IO GPIO18, SDIO_CMD + AGPIO(GPIO_USER), // 19 IO GPIO19, SDIO_CLK + AGPIO(GPIO_USER), // 20 IO GPIO20, SDIO_DATA0 + AGPIO(GPIO_USER), // 21 IO GPIO21, SDIO_DATA1 + AGPIO(GPIO_USER), // 22 IO GPIO22, SDIO_DATA2 + AGPIO(GPIO_USER), // 23 IO GPIO23, SDIO_DATA3 + 0, // 24 IO GPIO24, SPICS1, PSRAM + 0, // 25 IO GPIO25, SPIQ + 0, // 26 IO GPIO26, SPIWP + 0, // 27 IO GPIO27, SPIVDD + 0, // 28 IO GPIO28, SPIHD + 0, // 29 IO GPIO29, SPICLK + 0, // 30 IO GPIO30, SPID + 0 // Flag + }, +}; + +/*********************************************************************************************\ + Known templates +\*********************************************************************************************/ + +#elif CONFIG_IDF_TARGET_ESP32S2 /********************************************************************************************\ * ESP32-S2 Module templates \********************************************************************************************/ @@ -2927,8 +3071,7 @@ const mytmplt kModules[] PROGMEM = { Known templates \*********************************************************************************************/ -#elif defined(CONFIG_IDF_TARGET_ESP32S3) - +#elif CONFIG_IDF_TARGET_ESP32S3 /********************************************************************************************\ * ESP32-S3 Module templates \********************************************************************************************/ @@ -3010,7 +3153,7 @@ const mytmplt kModules[] PROGMEM = { Known templates \*********************************************************************************************/ -#else // not CONFIG_IDF_TARGET_ESP32C3 nor CONFIG_IDF_TARGET_ESP32S2 - ESP32 +#else // not CONFIG_IDF_TARGET_ESP32C2/C3/C6 nor CONFIG_IDF_TARGET_ESP32S2 - ESP32 /********************************************************************************************\ * ESP32 Module templates \********************************************************************************************/ diff --git a/tasmota/include/tasmota_types.h b/tasmota/include/tasmota_types.h index ef5fc44f4..b533a069d 100644 --- a/tasmota/include/tasmota_types.h +++ b/tasmota/include/tasmota_types.h @@ -602,32 +602,40 @@ typedef struct { // End of remapping, next is all other CPUs // ---------------------------------------- #else - myio my_gp; // 3AC 2x18 bytes (ESP8266) / 2x40 bytes (ESP32) / 2x22 bytes (ESP32-C3) / 2x47 bytes (ESP32-S2) + myio my_gp; // 3AC 2x18 bytes (ESP8266) / 2x40 bytes (ESP32) / 2x21 bytes (ESP32-C2) / 2x22 bytes (ESP32-C3) / 2x31 bytes (ESP32-C6) / 2x47 bytes (ESP32-S2) #ifdef ESP8266 uint16_t gpio16_converted; // 3D0 uint8_t free_esp8266_3D2[42]; // 3D2 #endif // ESP8266 #ifdef ESP32 -#ifdef CONFIG_IDF_TARGET_ESP32C3 + #if CONFIG_IDF_TARGET_ESP32C2 + uint8_t free_esp32c2_3D6[38]; // 3D6 - Due to smaller myio + #elif CONFIG_IDF_TARGET_ESP32C3 uint8_t free_esp32c3_3D8[36]; // 3D8 - Due to smaller myio -#endif // CONFIG_IDF_TARGET_ESP32C3 + #elif CONFIG_IDF_TARGET_ESP32C6 + uint8_t free_esp32c6_3EA[18]; // 3EA - Due to smaller myio + #endif // CONFIG_IDF_TARGET_ESP32C2/3/6 #endif // ESP32 - mytmplt user_template; // 3FC 2x15 bytes (ESP8266) / 2x37 bytes (ESP32) / 2x23 bytes (ESP32-C3) / 2x37 bytes (ESP32-S2) + mytmplt user_template; // 3FC 2x15 bytes (ESP8266) / 2x37 bytes (ESP32) / 2x22 bytes (ESP32-C2) / 2x23 bytes (ESP32-C3) / 2x32 bytes (ESP32-C6) / 2x37 bytes (ESP32-S2) #ifdef ESP8266 uint8_t free_esp8266_41A[55]; // 41A #endif // ESP8266 #ifdef ESP32 -#ifdef CONFIG_IDF_TARGET_ESP32C3 + #if CONFIG_IDF_TARGET_ESP32C2 + uint8_t free_esp32c2_428[30]; // 428 - Due to smaller mytmplt + #elif CONFIG_IDF_TARGET_ESP32C3 uint8_t free_esp32c3_42A[28]; // 42A - Due to smaller mytmplt -#endif // CONFIG_IDF_TARGET_ESP32C3 + #elif CONFIG_IDF_TARGET_ESP32C6 + uint8_t free_esp32c3_43C[10]; // 43C - Due to smaller mytmplt + #endif // CONFIG_IDF_TARGET_ESP32C2/3/6 uint8_t eth_type; // 446 uint8_t eth_clk_mode; // 447 uint8_t free_esp32_448[4]; // 448 -#ifdef CONFIG_IDF_TARGET_ESP32S2 + #ifdef CONFIG_IDF_TARGET_ESP32S2 uint8_t free_esp32s2_456[2]; // 456 - fix 32-bit offset for WebCamCfg -#endif + #endif WebCamCfg webcam_config; // 44C uint8_t eth_address; // 450 diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino index a74efb45f..fe07ff400 100644 --- a/tasmota/tasmota.ino +++ b/tasmota/tasmota.ino @@ -200,10 +200,11 @@ WiFiUDP PortUdp; // UDP Syslog and Alexa #ifdef ESP32 /* #if CONFIG_IDF_TARGET_ESP32C3 || // support USB via HWCDC using JTAG interface + CONFIG_IDF_TARGET_ESP32C6 || // support USB via HWCDC using JTAG interface CONFIG_IDF_TARGET_ESP32S2 || // support USB via USBCDC CONFIG_IDF_TARGET_ESP32S3 // support USB via HWCDC using JTAG interface or USBCDC */ -#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 +#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 //#if CONFIG_TINYUSB_CDC_ENABLED // This define is not recognized here so use USE_USB_CDC_CONSOLE #ifdef USE_USB_CDC_CONSOLE @@ -211,7 +212,7 @@ WiFiUDP PortUdp; // UDP Syslog and Alexa #if ARDUINO_USB_MODE //#warning **** TasConsole ARDUINO_USB_MODE **** -HWCDC TasConsole; // ESP32C3/S3 embedded USB using JTAG interface +HWCDC TasConsole; // ESP32C3/C6/S3 embedded USB using JTAG interface bool tasconsole_serial = false; //#warning **** TasConsole uses HWCDC **** #else // No ARDUINO_USB_MODE @@ -400,11 +401,11 @@ TSettings* Settings = nullptr; void setup(void) { #ifdef ESP32 +#ifdef CONFIG_IDF_TARGET_ESP32 #ifdef DISABLE_ESP32_BROWNOUT DisableBrownout(); // Workaround possible weak LDO resulting in brownout detection during Wifi connection #endif // DISABLE_ESP32_BROWNOUT -#ifdef CONFIG_IDF_TARGET_ESP32 // restore GPIO16/17 if no PSRAM is found #if ESP_IDF_VERSION_MAJOR < 5 // TODO for esp-idf 5 if (!FoundPSRAM()) { @@ -482,7 +483,7 @@ void setup(void) { Serial.println(); // Serial.setRxBufferSize(INPUT_BUFFER_SIZE); // Default is 256 chars #ifdef ESP32 -#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 +#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 #ifdef USE_USB_CDC_CONSOLE TasConsole.setRxBufferSize(INPUT_BUFFER_SIZE); // TasConsole.setTxBufferSize(INPUT_BUFFER_SIZE); diff --git a/tasmota/tasmota_support/settings.ino b/tasmota/tasmota_support/settings.ino index e6ac6e6b8..dc0c31f9b 100644 --- a/tasmota/tasmota_support/settings.ino +++ b/tasmota/tasmota_support/settings.ino @@ -536,13 +536,16 @@ bool SettingsConfigRestore(void) { valid_settings = (0 == settings_buffer[0xF36]); // Settings->config_version #endif // ESP8266 #ifdef ESP32 - -#ifdef CONFIG_IDF_TARGET_ESP32S3 +#if CONFIG_IDF_TARGET_ESP32S3 valid_settings = (2 == settings_buffer[0xF36]); // Settings->config_version ESP32S3 #elif CONFIG_IDF_TARGET_ESP32S2 valid_settings = (3 == settings_buffer[0xF36]); // Settings->config_version ESP32S2 #elif CONFIG_IDF_TARGET_ESP32C3 valid_settings = (4 == settings_buffer[0xF36]); // Settings->config_version ESP32C3 +#elif CONFIG_IDF_TARGET_ESP32C2 + valid_settings = (5 == settings_buffer[0xF36]); // Settings->config_version ESP32C2 +#elif CONFIG_IDF_TARGET_ESP32C6 + valid_settings = (6 == settings_buffer[0xF36]); // Settings->config_version ESP32C6 #else valid_settings = (1 == settings_buffer[0xF36]); // Settings->config_version ESP32 all other #endif // CONFIG_IDF_TARGET_ESP32S3 @@ -956,12 +959,16 @@ void SettingsDefaultSet2(void) { // Settings->config_version = 0; // ESP8266 (Has been 0 for long time) #endif // ESP8266 #ifdef ESP32 -#ifdef CONFIG_IDF_TARGET_ESP32S3 +#if CONFIG_IDF_TARGET_ESP32S3 Settings->config_version = 2; // ESP32S3 #elif CONFIG_IDF_TARGET_ESP32S2 Settings->config_version = 3; // ESP32S2 #elif CONFIG_IDF_TARGET_ESP32C3 Settings->config_version = 4; // ESP32C3 +#elif CONFIG_IDF_TARGET_ESP32C2 + Settings->config_version = 5; // ESP32C2 +#elif CONFIG_IDF_TARGET_ESP32C6 + Settings->config_version = 6; // ESP32C6 #else Settings->config_version = 1; // ESP32 #endif // CONFIG_IDF_TARGET_ESP32S3 @@ -1520,12 +1527,16 @@ void SettingsDelta(void) { Settings->config_version = 0; // ESP8266 (Has been 0 for long time) #endif // ESP8266 #ifdef ESP32 -#ifdef CONFIG_IDF_TARGET_ESP32S3 +#if CONFIG_IDF_TARGET_ESP32S3 Settings->config_version = 2; // ESP32S3 #elif CONFIG_IDF_TARGET_ESP32S2 Settings->config_version = 3; // ESP32S2 #elif CONFIG_IDF_TARGET_ESP32C3 Settings->config_version = 4; // ESP32C3 +#elif CONFIG_IDF_TARGET_ESP32C2 + Settings->config_version = 5; // ESP32C2 +#elif CONFIG_IDF_TARGET_ESP32C6 + Settings->config_version = 6; // ESP32C6 #else Settings->config_version = 1; // ESP32 #endif // CONFIG_IDF_TARGET_ESP32S3 diff --git a/tasmota/tasmota_support/support.ino b/tasmota/tasmota_support/support.ino index 55f8cfe46..fefd0549f 100755 --- a/tasmota/tasmota_support/support.ino +++ b/tasmota/tasmota_support/support.ino @@ -1588,6 +1588,7 @@ void TemplateGpios(myio *gp) // Expand template to physical GPIO array, j=phy_GPIO, i=template_GPIO uint32_t j = 0; for (uint32_t i = 0; i < nitems(Settings->user_template.gp.io); i++) { +/* #if defined(ESP32) && CONFIG_IDF_TARGET_ESP32C3 dest[i] = src[i]; #elif defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3) @@ -1602,6 +1603,24 @@ void TemplateGpios(myio *gp) dest[j] = src[i]; j++; #endif +*/ +#ifdef ESP8266 + if (6 == i) { j = 9; } + if (8 == i) { j = 12; } + dest[j] = src[i]; + j++; +#endif // ESP8266 +#ifdef ESP32 +#if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 + dest[i] = src[i]; +#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 + if (22 == i) { j = 33; } // skip 22-32 + dest[j] = src[i]; + j++; +#else // ESP32 + dest[Esp32TemplateToPhy[i]] = src[i]; +#endif // ESP32C2/C3/C6 and S2/S3 +#endif // ESP32 } // 11 85 00 85 85 00 00 00 00 00 00 00 15 38 85 00 00 81 @@ -1655,33 +1674,39 @@ void SetModuleType(void) #endif } -bool FlashPin(uint32_t pin) -{ -#if defined(ESP32) && CONFIG_IDF_TARGET_ESP32C3 - return (((pin > 10) && (pin < 12)) || ((pin > 13) && (pin < 18))); // ESP32C3 has GPIOs 11-17 reserved for Flash, with some boards GPIOs 12 13 are useable -#elif defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3) - return (pin > 21) && (pin < 33); // ESP32S2 skip 22-32 -#elif defined(CONFIG_IDF_TARGET_ESP32) - return (pin >= 28) && (pin <= 31); // ESP21 skip 28-31 -#else // ESP8266 +bool FlashPin(uint32_t pin) { +#ifdef ESP8266 return (((pin > 5) && (pin < 9)) || (11 == pin)); -#endif +#endif // ESP8266 +#ifdef ESP32 +#if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 + return (((pin > 10) && (pin < 12)) || ((pin > 13) && (pin < 18))); // ESP32C3 has GPIOs 11-17 reserved for Flash, with some boards GPIOs 12 13 are useable +#elif CONFIG_IDF_TARGET_ESP32C6 + return (pin > 23); // ESP32C6 flash pins 24-30 +#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 + return (pin > 21) && (pin < 33); // ESP32S2 skip 22-32 +#else + return (pin >= 28) && (pin <= 31); // ESP32 skip 28-31 +#endif // ESP32C2/C3/C6 and S2/S3 +#endif // ESP32 } -bool RedPin(uint32_t pin) // pin may be dangerous to change, display in RED in template console -{ -#if defined(ESP32) && CONFIG_IDF_TARGET_ESP32C3 - return (12==pin)||(13==pin); // ESP32C3: GPIOs 12 13 are usually used for Flash (mode QIO/QOUT) -#elif defined(CONFIG_IDF_TARGET_ESP32S2) - return false; // no red pin on ESP32S3 -#elif defined(CONFIG_IDF_TARGET_ESP32S3) - return (33<=pin) && (37>=pin); // ESP32S3: GPIOs 33..37 are usually used for PSRAM -#elif defined(CONFIG_IDF_TARGET_ESP32) // red pins are 6-11 for original ESP32, other models like PICO are not impacted if flash pins are condfigured +bool RedPin(uint32_t pin) { // Pin may be dangerous to change, display in RED in template console +#ifdef ESP8266 + return (9 == pin) || (10 == pin); +#endif // ESP8266 +#ifdef ESP32 +#if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 + return (12 == pin) || (13 == pin); // ESP32C3: GPIOs 12 13 are usually used for Flash (mode QIO/QOUT) +#elif CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S2 + return false; // No red pin on ESP32C6 and ESP32S3 +#elif CONFIG_IDF_TARGET_ESP32S3 + return (33 <= pin) && (37 >= pin); // ESP32S3: GPIOs 33..37 are usually used for PSRAM +#else // ESP32 red pins are 6-11 for original ESP32, other models like PICO are not impacted if flash pins are condfigured // PICO can also have 16/17/18/23 not available - return ((6<=pin) && (11>=pin)) || (16==pin) || (17==pin); // TODO adapt depending on the exact type of ESP32 -#else // ESP8266 - return (9==pin)||(10==pin); -#endif + return ((6 <= pin) && (11 >= pin)) || (16 == pin) || (17 == pin); // TODO adapt depending on the exact type of ESP32 +#endif // ESP32C2/C3/C6 and S2/S3 +#endif // ESP32 } uint32_t ValidPin(uint32_t pin, uint32_t gpio, uint8_t isTuya = false) { @@ -1689,11 +1714,15 @@ uint32_t ValidPin(uint32_t pin, uint32_t gpio, uint8_t isTuya = false) { return GPIO_NONE; // Disable flash pins GPIO6, GPIO7, GPIO8 and GPIO11 } -#if defined(CONFIG_IDF_TARGET_ESP32C3) +#if CONFIG_IDF_TARGET_ESP32C2 // ignore -#elif defined(CONFIG_IDF_TARGET_ESP32S2) +#elif CONFIG_IDF_TARGET_ESP32C3 // ignore -#elif defined(CONFIG_IDF_TARGET_ESP32) +#elif CONFIG_IDF_TARGET_ESP32C6 +// ignore +#elif CONFIG_IDF_TARGET_ESP32S2 +// ignore +#elif CONFIG_IDF_TARGET_ESP32 // ignore #else // not ESP32C3 and not ESP32S2 if (((WEMOS == Settings->module) || isTuya) && !Settings->flag3.user_esp8285_enable) { // SetOption51 - Enable ESP8285 user GPIO's @@ -2067,18 +2096,17 @@ void SetSerial(uint32_t baudrate, uint32_t serial_config) { void ClaimSerial(void) { #ifdef ESP32 -#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 +#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 #ifdef USE_USB_CDC_CONSOLE return; // USB console does not use serial #endif // USE_USB_CDC_CONSOLE -#endif // ESP32C3, S2 or S3 +#endif // ESP32C3/C6, S2 or S3 #endif // ESP32 TasmotaGlobal.serial_local = true; AddLog(LOG_LEVEL_INFO, PSTR("SNS: Hardware Serial")); SetSeriallog(LOG_LEVEL_NONE); TasmotaGlobal.baudrate = GetSerialBaudrate(); Settings->baudrate = TasmotaGlobal.baudrate / 300; - } void SerialSendRaw(char *codes) diff --git a/tasmota/tasmota_support/support_command.ino b/tasmota/tasmota_support/support_command.ino index d074df54e..9fb41fa3e 100644 --- a/tasmota/tasmota_support/support_command.ino +++ b/tasmota/tasmota_support/support_command.ino @@ -1846,11 +1846,19 @@ void CmndTemplate(void) SettingsUpdateText(SET_TEMPLATE_NAME, PSTR("Merged")); uint32_t j = 0; for (uint32_t i = 0; i < nitems(Settings->user_template.gp.io); i++) { -#if defined(ESP32) && CONFIG_IDF_TARGET_ESP32C3 -#else +#ifdef ESP8266 if (6 == i) { j = 9; } if (8 == i) { j = 12; } -#endif +#endif // ESP8266 +#ifdef ESP32 +#if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 + // No change +#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 +// if (22 == i) { j = 33; } // TODO 20230821 verify +#else // ESP32 +// if (28 == i) { j = 32; } // TODO 20230821 verify +#endif // Non plain ESP32 +#endif // ESP32 if (TasmotaGlobal.my_module.io[j] > GPIO_NONE) { Settings->user_template.gp.io[i] = TasmotaGlobal.my_module.io[j]; } diff --git a/tasmota/tasmota_support/support_crash_recorder.ino b/tasmota/tasmota_support/support_crash_recorder.ino index bf55869cd..4814c0552 100644 --- a/tasmota/tasmota_support/support_crash_recorder.ino +++ b/tasmota/tasmota_support/support_crash_recorder.ino @@ -256,7 +256,7 @@ void CrashDump(void) } ResponseJsonEnd(); } -#elif CONFIG_IDF_TARGET_ESP32C3 +#elif CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 extern "C" { // esp-idf 3.x diff --git a/tasmota/tasmota_support/support_esp.ino b/tasmota/tasmota_support/support_esp.ino index fb353bb65..615ee24ee 100644 --- a/tasmota/tasmota_support/support_esp.ino +++ b/tasmota/tasmota_support/support_esp.ino @@ -227,8 +227,12 @@ String GetCodeCores(void) { #define ESP32_ARCH "esp32s2" #elif CONFIG_IDF_TARGET_ESP32S3 #define ESP32_ARCH "esp32s3" +#elif CONFIG_IDF_TARGET_ESP32C2 + #define ESP32_ARCH "esp32c2" #elif CONFIG_IDF_TARGET_ESP32C3 #define ESP32_ARCH "esp32c3" +#elif CONFIG_IDF_TARGET_ESP32C6 + #define ESP32_ARCH "esp32c6" #else #define ESP32_ARCH "" #endif @@ -246,8 +250,12 @@ String GetCodeCores(void) { #include "esp32s2/rom/rtc.h" #elif CONFIG_IDF_TARGET_ESP32S3 // ESP32-S3 #include "esp32s3/rom/rtc.h" + #elif CONFIG_IDF_TARGET_ESP32C2 // ESP32-C2 + #include "esp32c2/rom/rtc.h" #elif CONFIG_IDF_TARGET_ESP32C3 // ESP32-C3 #include "esp32c3/rom/rtc.h" + #elif CONFIG_IDF_TARGET_ESP32C6 // ESP32-C6 + #include "esp32c6/rom/rtc.h" #else #error Target CONFIG_IDF_TARGET is not supported #endif @@ -422,9 +430,15 @@ extern "C" { #elif CONFIG_IDF_TARGET_ESP32S3 // ESP32-S3 #include "esp32s3/rom/spi_flash.h" #define ESP_FLASH_IMAGE_BASE 0x0000 // Esp32s3 is located at 0x0000 + #elif CONFIG_IDF_TARGET_ESP32C2 // ESP32-C2 + #include "esp32c2/rom/spi_flash.h" + #define ESP_FLASH_IMAGE_BASE 0x0000 // Esp32c2 is located at 0x0000 #elif CONFIG_IDF_TARGET_ESP32C3 // ESP32-C3 #include "esp32c3/rom/spi_flash.h" #define ESP_FLASH_IMAGE_BASE 0x0000 // Esp32c3 is located at 0x0000 + #elif CONFIG_IDF_TARGET_ESP32C6 // ESP32-C6 + #include "esp32c6/rom/spi_flash.h" + #define ESP_FLASH_IMAGE_BASE 0x0000 // Esp32c6 is located at 0x0000 #else #error Target CONFIG_IDF_TARGET is not supported #endif @@ -566,6 +580,7 @@ int32_t EspPartitionMmap(uint32_t action) { // ESP32 specific // +#ifdef CONFIG_IDF_TARGET_ESP32 #include "soc/soc.h" #include "soc/rtc_cntl_reg.h" @@ -573,6 +588,7 @@ void DisableBrownout(void) { // https://github.com/espressif/arduino-esp32/issues/863#issuecomment-347179737 WRITE_PERI_REG(RTC_CNTL_BROWN_OUT_REG, 0); // Disable brownout detector } +#endif // ESP32 // // ESP32 Alternatives @@ -739,7 +755,7 @@ extern "C" { // `psramFound()` can return true even if no PSRAM is actually installed // This new version also checks `esp_spiram_is_initialized` to know if the PSRAM is initialized bool FoundPSRAM(void) { -#if CONFIG_IDF_TARGET_ESP32C3 +#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 return psramFound(); #else #if ESP_IDF_VERSION_MAJOR >= 5 diff --git a/tasmota/tasmota_support/support_rotary.ino b/tasmota/tasmota_support/support_rotary.ino index e39913f73..1462f4093 100644 --- a/tasmota/tasmota_support/support_rotary.ino +++ b/tasmota/tasmota_support/support_rotary.ino @@ -106,7 +106,7 @@ bool RotaryButtonPressed(uint32_t button_index) { return false; } -void IRAM_ATTR RotaryIsrArgMiDesk(void *arg) { +static void IRAM_ATTR RotaryIsrArgMiDesk(void *arg) { tEncoder* encoder = static_cast(arg); // https://github.com/PaulStoffregen/Encoder/blob/master/Encoder.h diff --git a/tasmota/tasmota_support/support_tasmota.ino b/tasmota/tasmota_support/support_tasmota.ino index feb98c8a0..792c7dc83 100644 --- a/tasmota/tasmota_support/support_tasmota.ino +++ b/tasmota/tasmota_support/support_tasmota.ino @@ -201,7 +201,8 @@ void ZeroCrossMomentEnd(void) { #endif } -void IRAM_ATTR ZeroCrossIsr(void) { +void IRAM_ATTR ZeroCrossIsr(void); +void ZeroCrossIsr(void) { uint32_t time = micros(); TasmotaGlobal.zc_interval = ((int32_t) (time - TasmotaGlobal.zc_time)); TasmotaGlobal.zc_time = time; From 37a527696a040e7af0a3de1a3534f37ed93da7b6 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Mon, 21 Aug 2023 16:18:21 +0200 Subject: [PATCH 013/225] Phase 1 support C2/C6 --- .../xdrv_01_9_webserver.ino | 81 ++++++++++++------- 1 file changed, 50 insertions(+), 31 deletions(-) diff --git a/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino b/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino index 31339e392..50c959aac 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino @@ -139,28 +139,7 @@ const char HTTP_MODULE_TEMPLATE_REPLACE_NO_INDEX[] PROGMEM = #include "./html_uncompressed/HTTP_SCRIPT_TEMPLATE.h" #endif -#if defined(ESP32) && CONFIG_IDF_TARGET_ESP32C3 -const char HTTP_SCRIPT_TEMPLATE2[] PROGMEM = - "for(i=0;i<" STR(MAX_USER_PINS) ";i++){" - "sk(g[i],i);" // Set GPIO - "}"; -#elif defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3) -const char HTTP_SCRIPT_TEMPLATE2[] PROGMEM = - "j=0;" - "for(i=0;i<" STR(MAX_USER_PINS) ";i++){" // Skip 22-32 - "if(22==i){j=33;}" - "sk(g[i],j);" // Set GPIO - "j++;" - "}"; -#elif defined(CONFIG_IDF_TARGET_ESP32) -const char HTTP_SCRIPT_TEMPLATE2[] PROGMEM = - "j=0;" - "for(i=0;i<" STR(MAX_USER_PINS) ";i++){" // Skip 28-31 - "if(28==i){j=32;}" - "sk(g[i],j);" // Set GPIO - "j++;" - "}"; -#else // ESP8266 +#ifdef ESP8266 const char HTTP_SCRIPT_TEMPLATE2[] PROGMEM = "j=0;" "for(i=0;i<" STR(MAX_USER_PINS) ";i++){" // Supports 13 GPIOs @@ -169,7 +148,32 @@ const char HTTP_SCRIPT_TEMPLATE2[] PROGMEM = "sk(g[i],j);" // Set GPIO "j++;" "}"; -#endif +#endif // ESP8266 +#ifdef ESP32 +#if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 +const char HTTP_SCRIPT_TEMPLATE2[] PROGMEM = + "for(i=0;i<" STR(MAX_USER_PINS) ";i++){" + "sk(g[i],i);" // Set GPIO + "}"; +#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 +const char HTTP_SCRIPT_TEMPLATE2[] PROGMEM = + "j=0;" + "for(i=0;i<" STR(MAX_USER_PINS) ";i++){" // Skip 22-32 + "if(22==i){j=33;}" + "sk(g[i],j);" // Set GPIO + "j++;" + "}"; +#else // ESP32 +const char HTTP_SCRIPT_TEMPLATE2[] PROGMEM = + "j=0;" + "for(i=0;i<" STR(MAX_USER_PINS) ";i++){" // Skip 28-31 + "if(28==i){j=32;}" + "sk(g[i],j);" // Set GPIO + "j++;" + "}"; +#endif // Non plain ESP32 +#endif // ESP32 + const char HTTP_SCRIPT_TEMPLATE3[] PROGMEM = "\";" "sk(g[13]," STR(ADC0_PIN) ");"; // Set ADC0 @@ -1617,13 +1621,9 @@ void HandleTemplateConfiguration(void) { WSContentBegin(200, CT_PLAIN); WSContentSend_P(PSTR("%s}1"), AnyModuleName(module).c_str()); // NAME: Generic for (uint32_t i = 0; i < nitems(template_gp.io); i++) { // 17,148,29,149,7,255,255,255,138,255,139,255,255 -#if defined(ESP32) && CONFIG_IDF_TARGET_ESP32C3 - // ESP32C3 we always send all GPIOs, Flash are just hidden +#if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 + // ESP32C2/C3/C6 we always send all GPIOs, Flash are just hidden WSContentSend_P(PSTR("%s%d"), (i>0)?",":"", template_gp.io[i]); -#elif defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3) - if (!FlashPin(i)) { - WSContentSend_P(PSTR("%s%d"), (i>0)?",":"", template_gp.io[i]); - } #else if (!FlashPin(i)) { WSContentSend_P(PSTR("%s%d"), (i>0)?",":"", template_gp.io[i]); @@ -1669,8 +1669,8 @@ void HandleTemplateConfiguration(void) { "
")); WSContentSend_P(HTTP_TABLE100); for (uint32_t i = 0; i < MAX_GPIO_PIN; i++) { -#if defined(ESP32) && CONFIG_IDF_TARGET_ESP32C3 - // ESP32C3 all gpios are in the template, flash are hidden +#if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 + // ESP32C2/C3/C6 all gpios are in the template, flash are hidden bool hidden = FlashPin(i); WSContentSend_P(PSTR("" D_GPIO "%d"), hidden ? PSTR(" hidden") : "", @@ -1720,6 +1720,7 @@ void TemplateSaveSettings(void) { uint32_t j = 0; for (uint32_t i = 0; i < nitems(Settings->user_template.gp.io); i++) { +/* #if defined(ESP32) && CONFIG_IDF_TARGET_ESP32C3 snprintf_P(command, sizeof(command), PSTR("%s%s%d"), command, (i>0)?",":"", WebGetGpioArg(i)); #elif defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3) @@ -1734,6 +1735,24 @@ void TemplateSaveSettings(void) { snprintf_P(command, sizeof(command), PSTR("%s%s%d"), command, (i>0)?",":"", WebGetGpioArg(j)); j++; #endif +*/ +#ifdef ESP8266 + if (6 == i) { j = 9; } + if (8 == i) { j = 12; } + snprintf_P(command, sizeof(command), PSTR("%s%s%d"), command, (i>0)?",":"", WebGetGpioArg(j)); + j++; +#endif // ESP8266 +#ifdef ESP32 +#if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 + snprintf_P(command, sizeof(command), PSTR("%s%s%d"), command, (i>0)?",":"", WebGetGpioArg(i)); +#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 + if (22 == i) { j = 33; } // skip 22-32 + snprintf_P(command, sizeof(command), PSTR("%s%s%d"), command, (i>0)?",":"", WebGetGpioArg(j)); + j++; +#else // ESP32 + snprintf_P(command, sizeof(command), PSTR("%s%s%d"), command, (i>0)?",":"", WebGetGpioArg(Esp32TemplateToPhy[i])); +#endif // ESP32C2/C3/C6 and S2/S3 +#endif // ESP32 } uint32_t flag = 0; From dd877972bed558d31f9aa49397849308d2d181e4 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Mon, 21 Aug 2023 17:10:06 +0200 Subject: [PATCH 014/225] Phase 1 support C2/C6 --- .../xdrv_52_3_berry_gpio.ino | 48 +++++++++++++++++-- .../xdrv_52_3_berry_wire.ino | 2 +- tasmota/tasmota_xdrv_driver/xdrv_54_lvgl.ino | 4 +- .../tasmota_xdrv_driver/xdrv_79_esp32_ble.ino | 2 +- .../xdrv_85_esp32_ble_eq3_trv.ino | 2 +- tasmota/tasmota_xlgt_light/xlgt_02_my92x1.ino | 7 +++ .../tasmota_xnrg_energy/xnrg_23_ade7880.ino | 2 +- .../tasmota_xsns_sensor/xsns_01_counter.ino | 3 +- tasmota/tasmota_xsns_sensor/xsns_35_tx20.ino | 5 +- tasmota/tasmota_xsns_sensor/xsns_48_chirp.ino | 2 + .../xsns_52_esp32_ibeacon_ble.ino | 2 +- .../tasmota_xsns_sensor/xsns_62_esp32_mi.ino | 10 ++-- .../xsns_62_esp32_mi_ble.ino | 2 +- .../tasmota_xsns_sensor/xsns_67_as3935.ino | 4 +- tasmota/tasmota_xsns_sensor/xsns_74_lmt01.ino | 12 ++--- 15 files changed, 78 insertions(+), 29 deletions(-) diff --git a/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_gpio.ino b/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_gpio.ino index 3b616895e..a8815f798 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_gpio.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_gpio.ino @@ -24,8 +24,12 @@ #include "esp8266toEsp32.h" #if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32S2) +#if ESP_IDF_VERSION_MAJOR >= 5 +#include +#else #include #endif +#endif /*********************************************************************************************\ * Native functions mapped to Berry functions * @@ -60,8 +64,17 @@ extern "C" { // DAC #if defined(CONFIG_IDF_TARGET_ESP32) if (25 == pin || 26 == pin) { +#if ESP_IDF_VERSION_MAJOR >= 5 + dac_oneshot_handle_t channel_handle; + const dac_channel_t channel = (25 == pin) ? DAC_CHAN_0 : DAC_CHAN_1; + dac_oneshot_config_t channel_cfg = { + .chan_id = channel, + }; + esp_err_t err = dac_oneshot_new_channel(&channel_cfg, &channel_handle); +#else dac_channel_t channel = (25 == pin) ? DAC_CHANNEL_1 : DAC_CHANNEL_2; esp_err_t err = dac_output_enable(channel); +#endif if (err) { be_raisef(vm, "value_error", "Error: dac_output_enable(%i) -> %i", channel, err); } @@ -70,8 +83,17 @@ extern "C" { } #elif defined(CONFIG_IDF_TARGET_ESP32S2) if (17 == pin || 18 == pin) { +#if ESP_IDF_VERSION_MAJOR >= 5 + dac_oneshot_handle_t channel_handle; + const dac_channel_t channel = (17 == pin) ? DAC_CHAN_0 : DAC_CHAN_1; + dac_oneshot_config_t channel_cfg = { + .chan_id = channel, + }; + esp_err_t err = dac_oneshot_new_channel(&channel_cfg, &channel_handle); +#else dac_channel_t channel = (17 == pin) ? DAC_CHANNEL_1 : DAC_CHANNEL_2; esp_err_t err = dac_output_enable(channel); +#endif if (err) { be_raisef(vm, "value_error", "Error: dac_output_enable(%i) -> %i", channel, err); } @@ -129,8 +151,18 @@ extern "C" { uint32_t dac_value = changeUIntScale(mV, 0, 3300, 0, 255); // convert from 0..3300 ms to 0..255 #if defined(CONFIG_IDF_TARGET_ESP32) if (25 == pin || 26 == pin) { +#if ESP_IDF_VERSION_MAJOR >= 5 + dac_oneshot_handle_t channel_handle; + const dac_channel_t channel = (25 == pin) ? DAC_CHAN_0 : DAC_CHAN_1; + dac_oneshot_config_t channel_cfg = { + .chan_id = channel, + }; + esp_err_t err = dac_oneshot_new_channel(&channel_cfg, &channel_handle); +#else dac_channel_t channel = (25 == pin) ? DAC_CHANNEL_1 : DAC_CHANNEL_2; - esp_err_t err = dac_output_voltage(channel, dac_value); +// esp_err_t err = dac_output_voltage(channel, dac_value); + esp_err_t err = dac_output_enable(channel); +#endif if (err) { be_raisef(vm, "internal_error", "Error: esp_err_tdac_output_voltage(%i, %i) -> %i", channel, dac_value, err); } @@ -139,16 +171,24 @@ extern "C" { } #elif defined(CONFIG_IDF_TARGET_ESP32S2) if (17 == pin || 18 == pin) { +#if ESP_IDF_VERSION_MAJOR >= 5 + dac_oneshot_handle_t channel_handle; + const dac_channel_t channel = (17 == pin) ? DAC_CHAN_0 : DAC_CHAN_1; + dac_oneshot_config_t channel_cfg = { + .chan_id = channel, + }; + esp_err_t err = dac_oneshot_new_channel(&channel_cfg, &channel_handle); +#else dac_channel_t channel = (17 == pin) ? DAC_CHANNEL_1 : DAC_CHANNEL_2; - esp_err_t err = dac_output_voltage(channel, dac_value); +// esp_err_t err = dac_output_voltage(channel, dac_value); + esp_err_t err = dac_output_enable(channel); +#endif if (err) { be_raisef(vm, "internal_error", "Error: esp_err_tdac_output_voltage(%i, %i) -> %i", channel, dac_value, err); } } else { be_raise(vm, "value_error", "DAC only supported on GPIO17-18"); } -#elif defined(CONFIG_IDF_TARGET_ESP32C3) - be_raise(vm, "value_error", "DAC unsupported in this chip"); #else be_raise(vm, "value_error", "DAC unsupported in this chip"); #endif diff --git a/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_wire.ino b/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_wire.ino index c78f30960..1518ce518 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_wire.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_wire.ino @@ -96,7 +96,7 @@ extern "C" { TwoWire & myWire = getWire(vm); if (top == 2 && be_isint(vm, 2)) { // only 1 argument of type string accepted int32_t address = be_toint(vm, 2); - myWire.beginTransmission(address); + myWire.beginTransmission((int)address); be_return(vm); // Return } be_raise(vm, kTypeError, nullptr); diff --git a/tasmota/tasmota_xdrv_driver/xdrv_54_lvgl.ino b/tasmota/tasmota_xdrv_driver/xdrv_54_lvgl.ino index 26fa7bbcb..58293139b 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_54_lvgl.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_54_lvgl.ino @@ -382,8 +382,8 @@ void start_lvgl(const char * uconfig) { // By default set the display color to black and opacity to 100% lv_disp_set_bg_color(NULL, lv_color_from_uint32(USE_LVGL_BG_DEFAULT)); lv_disp_set_bg_opa(NULL, LV_OPA_COVER); - lv_obj_set_style_bg_color(lv_scr_act(), lv_color_from_uint32(USE_LVGL_BG_DEFAULT), LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_bg_opa(lv_scr_act(), LV_OPA_COVER, LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_bg_color(lv_scr_act(), lv_color_from_uint32(USE_LVGL_BG_DEFAULT), static_cast(LV_PART_MAIN) | static_cast(LV_STATE_DEFAULT)); + lv_obj_set_style_bg_opa(lv_scr_act(), LV_OPA_COVER, static_cast(LV_PART_MAIN) | static_cast(LV_STATE_DEFAULT)); #if LV_USE_LOG lv_log_register_print_cb(lvbe_debug); diff --git a/tasmota/tasmota_xdrv_driver/xdrv_79_esp32_ble.ino b/tasmota/tasmota_xdrv_driver/xdrv_79_esp32_ble.ino index 6f9089e1f..6a2e01cc7 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_79_esp32_ble.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_79_esp32_ble.ino @@ -32,7 +32,7 @@ #endif #ifdef ESP32 // ESP32 family only. Use define USE_HM10 for ESP8266 support -#if defined CONFIG_IDF_TARGET_ESP32 || defined CONFIG_IDF_TARGET_ESP32C3 || defined CONFIG_IDF_TARGET_ESP32S3 +#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S3 #ifdef USE_BLE_ESP32 /* diff --git a/tasmota/tasmota_xdrv_driver/xdrv_85_esp32_ble_eq3_trv.ino b/tasmota/tasmota_xdrv_driver/xdrv_85_esp32_ble_eq3_trv.ino index 860eb0038..3e170c2c3 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_85_esp32_ble_eq3_trv.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_85_esp32_ble_eq3_trv.ino @@ -132,7 +132,7 @@ print("".join(pin)) #define USE_EQ3_ESP32 #endif -#if defined CONFIG_IDF_TARGET_ESP32 || defined CONFIG_IDF_TARGET_ESP32C3 || defined CONFIG_IDF_TARGET_ESP32S3 +#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S3 #ifdef USE_EQ3_ESP32 #ifdef ESP32 // ESP32 only. Use define USE_HM10 for ESP8266 support #ifdef USE_BLE_ESP32 diff --git a/tasmota/tasmota_xlgt_light/xlgt_02_my92x1.ino b/tasmota/tasmota_xlgt_light/xlgt_02_my92x1.ino index ec72df8d8..9120f9397 100644 --- a/tasmota/tasmota_xlgt_light/xlgt_02_my92x1.ino +++ b/tasmota/tasmota_xlgt_light/xlgt_02_my92x1.ino @@ -31,9 +31,16 @@ struct MY92X1 { uint8_t model = 0; } My92x1; +#if ESP_IDF_VERSION_MAJOR >= 5 +#include "rom/ets_sys.h" +#ifndef os_delay_us +#define os_delay_us ets_delay_us +#endif //os_delay_us +#else extern "C" { void os_delay_us(unsigned int); } +#endif void LightDiPulse(uint8_t times) { diff --git a/tasmota/tasmota_xnrg_energy/xnrg_23_ade7880.ino b/tasmota/tasmota_xnrg_energy/xnrg_23_ade7880.ino index 08fb4a11f..ea6989994 100644 --- a/tasmota/tasmota_xnrg_energy/xnrg_23_ade7880.ino +++ b/tasmota/tasmota_xnrg_energy/xnrg_23_ade7880.ino @@ -545,7 +545,7 @@ void Ade7880Service0(void) { Ade7880.irq0_state = 0; } -void IRAM_ATTR Ade7880Isr0(void) { +static void IRAM_ATTR Ade7880Isr0(void) { // Poll sequence if (!Ade7880.irq0_state) { Ade7880.irq0_state = 1; diff --git a/tasmota/tasmota_xsns_sensor/xsns_01_counter.ino b/tasmota/tasmota_xsns_sensor/xsns_01_counter.ino index ba31983db..183fbb62c 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_01_counter.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_01_counter.ino @@ -47,7 +47,8 @@ struct COUNTER { } Counter; -void IRAM_ATTR CounterIsrArg(void *arg) { +void IRAM_ATTR CounterIsrArg(void *arg); +void CounterIsrArg(void *arg) { uint32_t index = *static_cast(arg); uint32_t time = micros(); diff --git a/tasmota/tasmota_xsns_sensor/xsns_35_tx20.ino b/tasmota/tasmota_xsns_sensor/xsns_35_tx20.ino index a128f2fe3..e1c012971 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_35_tx20.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_35_tx20.ino @@ -165,8 +165,7 @@ uint32_t tx2x_last_available = 0; uint32_t tx23_stage = 0; #endif // USE_TX23_WIND_SENSOR -void IRAM_ATTR TX2xStartRead(void) -{ +static void IRAM_ATTR TX2xStartRead(void) { /** * La Crosse TX20 Anemometer datagram every 2 seconds * 0-0 11011 0011 111010101111 0101 1100 000101010000 0-0 - Received pin data at 1200 uSec per bit @@ -279,9 +278,11 @@ void IRAM_ATTR TX2xStartRead(void) } #endif // USE_TX23_WIND_SENSOR +#ifdef ESP8266 // Must clear this bit in the interrupt register, // it gets set even when interrupts are disabled GPIO_REG_WRITE(GPIO_STATUS_W1TC_ADDRESS, 1 << Pin(GPIO_TX2X_TXD_BLACK)); +#endif } bool Tx2xAvailable(void) diff --git a/tasmota/tasmota_xsns_sensor/xsns_48_chirp.ino b/tasmota/tasmota_xsns_sensor/xsns_48_chirp.ino index 1782a59df..f7a47e8d4 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_48_chirp.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_48_chirp.ino @@ -152,7 +152,9 @@ void ChirpResetAll(void) { /********************************************************************************************/ void ChirpClockSet() { // set I2C for this slow sensor +#if ESP_IDF_VERSION_MAJOR < 5 // setClockStretchLimit was removed Wire.setClockStretchLimit(4000); +#endif Wire.setClock(50000); } diff --git a/tasmota/tasmota_xsns_sensor/xsns_52_esp32_ibeacon_ble.ino b/tasmota/tasmota_xsns_sensor/xsns_52_esp32_ibeacon_ble.ino index 9a96ea794..2e886af91 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_52_esp32_ibeacon_ble.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_52_esp32_ibeacon_ble.ino @@ -52,7 +52,7 @@ // for testing of BLE_ESP32, we remove xsns_52_ibeacon.ino completely, and instead add this modified xsns_52_ibeacon_BLE_ESP32.ino // in the future this may be more fine-grained, e.g. to allow hm17 for this, and BLE-ESP32 for other -#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3 +#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S3 #ifdef USE_BLE_ESP32 #define XSNS_52 52 diff --git a/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi.ino b/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi.ino index 7a8964c4d..47c68c8cc 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi.ino @@ -50,7 +50,7 @@ */ #ifndef USE_BLE_ESP32 #ifdef ESP32 // ESP32 only. Use define USE_HM10 for ESP8266 support -#if defined CONFIG_IDF_TARGET_ESP32 || defined CONFIG_IDF_TARGET_ESP32C3 || defined CONFIG_IDF_TARGET_ESP32S3 +#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S3 #ifdef USE_MI_ESP32 @@ -697,9 +697,7 @@ void MI32PreInit(void) { void MI32Init(void) { if (MI32.mode.init) { return; } - if (TasmotaGlobal.global_state.wifi_down && TasmotaGlobal.global_state.eth_down) { - if (!(WIFI_MANAGER == Wifi.config_type || WIFI_MANAGER_RESET_ONLY == Wifi.config_type)) return; - } + if (TasmotaGlobal.global_state.wifi_down && TasmotaGlobal.global_state.eth_down) { return; } if (!TasmotaGlobal.global_state.wifi_down) { TasmotaGlobal.wifi_stay_asleep = true; @@ -1294,7 +1292,7 @@ bool MI32StartConnectionTask(){ } void MI32ConnectionTask(void *pvParameters){ -#if !defined(CONFIG_IDF_TARGET_ESP32C3) //needs more testing ... +#if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C6) //needs more testing ... // NimBLEDevice::setOwnAddrType(BLE_OWN_ADDR_RANDOM,false); //seems to be important for i.e. xbox controller, hopefully not breaking other things // NimBLEDevice::setSecurityAuth(true, true, true); #endif //CONFIG_IDF_TARGET_ESP32C3 @@ -2671,4 +2669,4 @@ bool Xsns62(uint32_t function) #endif // USE_MI_ESP32 #endif // CONFIG_IDF_TARGET_ESP32 or CONFIG_IDF_TARGET_ESP32C3 #endif // ESP32 -#endif // USE_BLE_ESP32 +#endif // USE_BLE_ESP32 \ No newline at end of file diff --git a/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi_ble.ino b/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi_ble.ino index 6f5a9d124..56dcd8e16 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi_ble.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi_ble.ino @@ -71,7 +71,7 @@ #ifdef USE_BLE_ESP32 #ifdef ESP32 // ESP32 family only. Use define USE_HM10 for ESP8266 support -#if defined CONFIG_IDF_TARGET_ESP32 || defined CONFIG_IDF_TARGET_ESP32C3|| defined CONFIG_IDF_TARGET_ESP32S3 +#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S3 #ifdef USE_MI_ESP32 diff --git a/tasmota/tasmota_xsns_sensor/xsns_67_as3935.ino b/tasmota/tasmota_xsns_sensor/xsns_67_as3935.ino index 2ae4d49a9..ae0f68c74 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_67_as3935.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_67_as3935.ino @@ -150,7 +150,7 @@ struct { volatile uint32_t pulse = 0; } as3935_sensor; -void IRAM_ATTR AS3935Isr(void) { +static void IRAM_ATTR AS3935Isr(void) { as3935_sensor.detected = true; as3935_sensor.icount++; } @@ -176,7 +176,7 @@ void AS3935WriteRegister(uint8_t reg, uint8_t mask, uint8_t shift, uint8_t data) /********************************************************************************************/ // Autotune Caps -void IRAM_ATTR AS3935CountFreq(void) { +static void IRAM_ATTR AS3935CountFreq(void) { if (as3935_sensor.dispLCO) as3935_sensor.pulse++; } diff --git a/tasmota/tasmota_xsns_sensor/xsns_74_lmt01.ino b/tasmota/tasmota_xsns_sensor/xsns_74_lmt01.ino index edfa00d3b..daf02a1bc 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_74_lmt01.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_74_lmt01.ino @@ -32,6 +32,12 @@ bool lmt01_initialized = false; float lmt01_temperature = NAN; +volatile int lmt01_pulseCount = 0; + +static void IRAM_ATTR LMT01_countPulse(void) { + lmt01_pulseCount++; +} + void LMT01_Init(void) { if (PinUsed(GPIO_LMT01)) { pinMode(Pin(GPIO_LMT01), INPUT); @@ -40,12 +46,6 @@ void LMT01_Init(void) { } } -volatile int lmt01_pulseCount = 0; - -void IRAM_ATTR LMT01_countPulse(void) { - lmt01_pulseCount++; -} - void LMT01_GetTemperature(void) { int pulses = 0; pulses = LMT01_getPulses(); From dc68232f421aa1ba44ea446cd170847d491b1218 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Mon, 21 Aug 2023 17:32:54 +0200 Subject: [PATCH 015/225] Phase 1 support C2/C6 --- boards/esp32c2.json | 44 +++ boards/esp32c2_2M.json | 44 +++ boards/esp32c6.json | 2 +- boards/esp32c6cdc.json | 45 +++ include/esp32x_fixes.h | 18 ++ partitions/esp32_partition_app1245k_fs64k.csv | 6 + pio-tools/override_copy.py | 6 + platformio.ini | 1 + platformio_tasmota_core3_env_sample.ini | 259 ++++++++++++++++++ platformio_tasmota_env32.ini | 43 +-- 10 files changed, 425 insertions(+), 43 deletions(-) create mode 100644 boards/esp32c2.json create mode 100644 boards/esp32c2_2M.json create mode 100644 boards/esp32c6cdc.json create mode 100644 partitions/esp32_partition_app1245k_fs64k.csv create mode 100644 platformio_tasmota_core3_env_sample.ini diff --git a/boards/esp32c2.json b/boards/esp32c2.json new file mode 100644 index 000000000..563a3357c --- /dev/null +++ b/boards/esp32c2.json @@ -0,0 +1,44 @@ +{ + "build": { + "arduino":{ + "ldscript": "esp32c2_out.ld" + }, + "core": "esp32", + "extra_flags": "-DESP32_4M -DESP32C2", + "f_cpu": "120000000L", + "f_flash": "60000000L", + "flash_mode": "dio", + "mcu": "esp32c2", + "variant": "esp32c2", + "partitions": "partitions/esp32_partition_app2880k_fs320k.csv" + }, + "connectivity": [ + "wifi", + "bluetooth" + ], + "debug": { + "openocd_target": "esp32c2.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Espressif Generic ESP32-C2 = 4M Flash", + "upload": { + "arduino": { + "flash_extra_images": [ + [ + "0x10000", + "variants/tasmota/tasmota32c2-safeboot.bin" + ] + ] + }, + "flash_size": "4MB", + "maximum_ram_size": 278528, + "maximum_size": 4194304, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://docs.espressif.com/projects/espressif-esp-dev-kits/en/latest/esp32c6/esp32-c6-devkitc-1/index.html", + "vendor": "Espressif" + } diff --git a/boards/esp32c2_2M.json b/boards/esp32c2_2M.json new file mode 100644 index 000000000..36f16ffe3 --- /dev/null +++ b/boards/esp32c2_2M.json @@ -0,0 +1,44 @@ +{ + "build": { + "arduino":{ + "ldscript": "esp32c2_out.ld" + }, + "core": "esp32", + "extra_flags": "-DESP32_2M -DESP32C2", + "f_cpu": "120000000L", + "f_flash": "60000000L", + "flash_mode": "dio", + "mcu": "esp32c2", + "variant": "esp32c2", + "partitions": "partitions/esp32_partition_app1245k_fs64k.csv" + }, + "connectivity": [ + "wifi", + "bluetooth" + ], + "debug": { + "openocd_target": "esp32c2.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Espressif Generic ESP32-C2 = 2M Flash, Tasmota 1245kB Code/OTA, 64k FS", + "upload": { + "arduino": { + "flash_extra_images": [ + [ + "0x10000", + "variants/tasmota/tasmota32c2-safeboot.bin" + ] + ] + }, + "flash_size": "2MB", + "maximum_ram_size": 278528, + "maximum_size": 2097152, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://docs.espressif.com/projects/espressif-esp-dev-kits/en/latest/esp32c6/esp32-c6-devkitc-1/index.html", + "vendor": "Espressif" + } diff --git a/boards/esp32c6.json b/boards/esp32c6.json index 919bcfdfe..57dd9b8f4 100644 --- a/boards/esp32c6.json +++ b/boards/esp32c6.json @@ -7,7 +7,7 @@ "extra_flags": "-DESP32_4M -DESP32C6", "f_cpu": "160000000L", "f_flash": "80000000L", - "flash_mode": "dio", + "flash_mode": "qio", "mcu": "esp32c6", "variant": "esp32c6", "partitions": "partitions/esp32_partition_app2880k_fs320k.csv" diff --git a/boards/esp32c6cdc.json b/boards/esp32c6cdc.json new file mode 100644 index 000000000..17932b7a8 --- /dev/null +++ b/boards/esp32c6cdc.json @@ -0,0 +1,45 @@ +{ + "build": { + "arduino":{ + "ldscript": "esp32c6_out.ld" + }, + "core": "esp32", + "extra_flags": "-DARDUINO_USB_MODE=1 -DESP32_4M -DESP32C6 -DUSE_USB_CDC_CONSOLE", + "f_cpu": "160000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "mcu": "esp32c6", + "variant": "esp32c6", + "partitions": "partitions/esp32_partition_app2880k_fs320k.csv" + }, + "connectivity": [ + "wifi", + "bluetooth" + ], + "debug": { + "openocd_target": "esp32c6.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Espressif Generic ESP32-C6 >= 4M Flash, Tasmota 2880k Code/OTA, 320k FS", + "upload": { + "arduino": { + "flash_extra_images": [ + [ + "0x10000", + "variants/tasmota/tasmota32c6cdc-safeboot.bin" + ] + ] + }, + "flash_size": "4MB", + "maximum_ram_size": 327680, + "maximum_size": 4194304, + "require_upload_port": true, + "before_reset": "usb_reset", + "speed": 460800 + }, + "url": "https://docs.espressif.com/projects/espressif-esp-dev-kits/en/latest/esp32c6/esp32-c6-devkitc-1/index.html", + "vendor": "Espressif" + } diff --git a/include/esp32x_fixes.h b/include/esp32x_fixes.h index a9f963d42..13860477a 100644 --- a/include/esp32x_fixes.h +++ b/include/esp32x_fixes.h @@ -68,10 +68,28 @@ #define SPI_HOST SPI1_HOST #define HSPI_HOST SPI2_HOST #define VSPI_HOST SPI2_HOST /* No SPI3_host on C3 */ +#if ESP_IDF_VERSION_MAJOR < 5 // fix a bug in esp-idf 4.4 for esp32c3 #ifndef REG_SPI_BASE #define REG_SPI_BASE(i) (DR_REG_SPI1_BASE + (((i)>1) ? (((i)* 0x1000) + 0x20000) : (((~(i)) & 1)* 0x1000 ))) // SPI_MOSI_DLEN_REG is not defined anymore in esp32c3, instead use SPI_MS_DLEN_REG #define SPI_MOSI_DLEN_REG(x) SPI_MS_DLEN_REG(x) #endif // REG_SPI_BASE +#endif //ESP_IDF_VERSION_MAJOR < 5 + +#elif CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C6 +#define SPI_HOST SPI1_HOST +#define HSPI_HOST SPI1_HOST /* No SPI2_host on C2/C6 */ +#define VSPI_HOST SPI1_HOST /* No SPI3_host on C2/C6 */ +#define VSPI SPI +// #if ESP_IDF_VERSION_MAJOR < 5 +// // fix a bug in esp-idf 4.4 for esp32c3 +// #ifndef REG_SPI_BASE +// #define REG_SPI_BASE(i) (DR_REG_SPI1_BASE + (((i)>1) ? (((i)* 0x1000) + 0x20000) : (((~(i)) & 1)* 0x1000 ))) +// // SPI_MOSI_DLEN_REG is not defined anymore in esp32c3, instead use SPI_MS_DLEN_REG +#define SPI_MOSI_DLEN_REG(x) SPI_MS_DLEN_REG(x) +// #endif // REG_SPI_BASE +// #endif //ESP_IDF_VERSION_MAJOR < 5 + + #endif // TARGET diff --git a/partitions/esp32_partition_app1245k_fs64k.csv b/partitions/esp32_partition_app1245k_fs64k.csv new file mode 100644 index 000000000..587d7ccb0 --- /dev/null +++ b/partitions/esp32_partition_app1245k_fs64k.csv @@ -0,0 +1,6 @@ +# Name, Type, SubType, Offset, Size, Flags +nvs, data, nvs, 0x9000, 0x5000, +otadata, data, ota, 0xe000, 0x2000, +safeboot, app, factory, 0x10000, 0xB0000, +app0, app, ota_0, 0xC0000, 0x130000, +spiffs, data, spiffs, 0x1f0000,0x10000, diff --git a/pio-tools/override_copy.py b/pio-tools/override_copy.py index 7a45512a8..a52c62c85 100644 --- a/pio-tools/override_copy.py +++ b/pio-tools/override_copy.py @@ -25,3 +25,9 @@ if os.path.isfile("platformio_tasmota_cenv.ini"): print ("*** use provided platformio_tasmota_cenv.ini as planned ***") else: shutil.copy("platformio_tasmota_cenv_sample.ini", "platformio_tasmota_cenv.ini") + +# copy platformio_tasmota_core3_env_sample.ini to platformio_tasmota_core3_env.ini +if os.path.isfile("platformio_tasmota_core3_env.ini"): + print ("*** use provided platformio_tasmota_core3_env.ini as planned ***") +else: + shutil.copy("platformio_tasmota_core3_env_sample.ini", "platformio_tasmota_core3_env.ini") \ No newline at end of file diff --git a/platformio.ini b/platformio.ini index 83d80aa24..bd648897b 100644 --- a/platformio.ini +++ b/platformio.ini @@ -24,6 +24,7 @@ extra_configs = platformio_tasmota32.ini platformio_tasmota_env32.ini platformio_override.ini platformio_tasmota_cenv.ini + platformio_tasmota_core3_env.ini [common] platform = ${core.platform} diff --git a/platformio_tasmota_core3_env_sample.ini b/platformio_tasmota_core3_env_sample.ini new file mode 100644 index 000000000..ada11afac --- /dev/null +++ b/platformio_tasmota_core3_env_sample.ini @@ -0,0 +1,259 @@ +[platformio] +; *** Build/upload environments for ESP32 Arduino Core 3.0 + +; *** Uncomment the line below and one or more env to select version(s) +;default_envs = +; tasmota32-arduino30 +; tasmota32-odroid30 +; tasmota32s2-arduino30 +; tasmota32s3-arduino30 +; tasmota32c2-arduino30 +; tasmota32c3-arduino30 +; tasmota32c3cdc-arduino30 +; tasmota32c6-arduino30 +; tasmota32c6cdc-arduino30 +; tasmota32-safeboot +; tasmota32s2-safeboot +; tasmota32s3-safeboot +; tasmota32c2-safeboot +; tasmota32c3-safeboot +; tasmota32c3cdc-safeboot +; tasmota32c6-safeboot +; tasmota32c6cdc-safeboot + +[core32_30] +platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF5 +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1511/framework-arduinoespressif32-release_v5.1-90b05eff62.zip +build_unflags = ${core32.build_unflags} +build_flags = ${core32.build_flags} + +[core32_30_flags] +build_unflags = ${core32_30.build_unflags} + -DUSE_IPV6 +build_flags = ${core32_30.build_flags} +lib_extra_dirs = lib/lib_ssl, lib/lib_basic, lib/lib_i2c, lib/lib_div, lib/lib_display, lib/lib_rf, lib/libesp32, lib/libesp32_div, lib/libesp32_lvgl +lib_ignore = + HTTPUpdateServer + USB + SPIFFS + ESP32 Async UDP + NetBIOS + Preferences + BluetoothSerial + ArduinoOTA + ESP Mail Client + IRremoteESP8266 + ESP8266Audio + ESP8266SAM + ESP32-HomeKit + NimBLE-Arduino + +[env:arduino30] +framework = ${common.framework} +platform = ${core32_30.platform} +platform_packages = ${core32_30.platform_packages} +board_build.filesystem = ${common.board_build.filesystem} +custom_unpack_dir = ${common.custom_unpack_dir} +board = esp32 +monitor_speed = 115200 +upload_resetmethod = ${common.upload_resetmethod} +extra_scripts = ${esp32_defaults.extra_scripts} +build_unflags = ${core32_30_flags.build_unflags} +build_flags = ${core32_30_flags.build_flags} +lib_ldf_mode = ${common.lib_ldf_mode} +lib_compat_mode = ${common.lib_compat_mode} +lib_extra_dirs = ${core32_30_flags.lib_extra_dirs} +lib_ignore = ${core32_30_flags.lib_ignore} + + + +[env:tasmota32-arduino30] +extends = env:arduino30 +board = esp32 +build_unflags = ${env:arduino30.build_unflags} +build_flags = ${env:arduino30.build_flags} + -DFIRMWARE_ARDUINO30 + -DUSE_MI_HOMEKIT=0 ; 1 to enable; 0 to disable + -DUSE_MI_ESP32 +monitor_filters = esp32_exception_decoder +lib_ignore = ${env:arduino30.lib_ignore} + +[env:tasmota32-odroid30] +extends = env:arduino30 +board = esp32-fix +board_build.f_cpu = 240000000L +upload_port = /dev/cu.SLAB_USBtoUART +build_unflags = ${env:arduino30.build_unflags} +build_flags = ${env:arduino30.build_flags} + -DFIRMWARE_ARDUINO30 +monitor_filters = esp32_exception_decoder +lib_ignore = ${env:arduino30.lib_ignore} + +[env:tasmota32s2-arduino30] +extends = env:arduino30 +board = esp32s2 +build_unflags = ${env:arduino30.build_unflags} +build_flags = ${env:arduino30.build_flags} + -DFIRMWARE_ARDUINO30 +monitor_filters = esp32_exception_decoder +lib_ignore = ${env:arduino30.lib_ignore} + +[env:tasmota32s3-arduino30] +extends = env:arduino30 +board = esp32s3-qio_qspi +build_unflags = ${env:arduino30.build_unflags} +build_flags = ${env:arduino30.build_flags} + -DFIRMWARE_ARDUINO30 + -DUSE_MI_HOMEKIT=0 ; 1 to enable; 0 to disable + -DUSE_MI_ESP32 +monitor_filters = esp32_exception_decoder +lib_extra_dirs = lib/lib_ssl, lib/lib_basic, lib/lib_i2c, lib/lib_div, lib/lib_rf, lib/libesp32, lib/libesp32_div +lib_ignore = ${env:arduino30.lib_ignore} + universal display Library + +[env:tasmota32c2-arduino30] +extends = env:arduino30 +board = esp32c2 +build_unflags = ${env:arduino30.build_unflags} + -flto + -mtarget-align +build_flags = ${env:arduino30.build_flags} + -DFIRMWARE_ARDUINO30 + -DNO_NEOPIXEL + -DUSE_MI_HOMEKIT=0 ; 1 to enable; 0 to disable + -DUSE_MI_ESP32 + -fno-lto + -DOTA_URL='""' +monitor_filters = esp32_exception_decoder +lib_ignore = ${env:arduino30.lib_ignore} + NeoPixelBus + +[env:tasmota32c3-arduino30] +extends = env:arduino30 +board = esp32c3 +build_unflags = ${env:arduino30.build_unflags} + -flto + -mtarget-align +build_flags = ${env:arduino30.build_flags} + -DFIRMWARE_ARDUINO30 + -DUSE_MI_HOMEKIT=0 ; 1 to enable; 0 to disable + -DUSE_MI_ESP32 + -fno-lto +monitor_filters = esp32_exception_decoder +lib_ignore = ${env:arduino30.lib_ignore} + +[env:tasmota32c3cdc-arduino30] +extends = env:arduino30 +board = esp32c3cdc +build_unflags = ${env:arduino30.build_unflags} + -flto + -mtarget-align +build_flags = ${env:arduino30.build_flags} + -DFIRMWARE_ARDUINO30 + -fno-lto +monitor_filters = esp32_exception_decoder +lib_ignore = ${env:arduino30.lib_ignore} + +[env:tasmota32c6-arduino30] +extends = env:arduino30 +board = esp32c6 +build_unflags = ${env:arduino30.build_unflags} + -flto + -mtarget-align +build_flags = ${env:arduino30.build_flags} + -fno-lto + -DFIRMWARE_ARDUINO30 + -DUSE_MI_HOMEKIT=0 ; 1 to enable; 0 to disable + -DUSE_MI_ESP32 + -DOTA_URL='""' +monitor_filters = esp32_exception_decoder +lib_ignore = ${env:arduino30.lib_ignore} + +[env:tasmota32c6cdc-arduino30] +extends = env:arduino30 +board = esp32c6cdc +build_unflags = ${env:arduino30.build_unflags} + -flto + -mtarget-align +build_flags = ${env:arduino30.build_flags} + -fno-lto + -DFIRMWARE_ARDUINO30 + -DUSE_MI_HOMEKIT=0 ; 1 to enable; 0 to disable + -DUSE_MI_ESP32 + -DOTA_URL='""' +monitor_filters = esp32_exception_decoder +lib_ignore = ${env:arduino30.lib_ignore} + +[env:tasmota32-safeboot] +extends = env:tasmota32-arduino30 +build_unflags = ${env:tasmota32-arduino30.build_unflags} + -DFIRMWARE_ARDUINO30 +build_flags = ${env:tasmota32-arduino30.build_flags} + -DFIRMWARE_SAFEBOOT +lib_extra_dirs = lib/lib_ssl, lib/libesp32 +lib_ignore = ${safeboot_flags.lib_ignore} + +[env:tasmota32s2-safeboot] +extends = env:tasmota32s2-arduino30 +build_unflags = ${env:tasmota32s2-arduino30.build_unflags} + -DFIRMWARE_ARDUINO30 +build_flags = ${env:tasmota32s2-arduino30.build_flags} + -DFIRMWARE_SAFEBOOT +lib_extra_dirs = lib/lib_ssl, lib/libesp32 +lib_ignore = ${safeboot_flags.lib_ignore} + +[env:tasmota32s3-safeboot] +extends = env:tasmota32s3-arduino30 +build_unflags = ${env:tasmota32s3-arduino30.build_unflags} + -DFIRMWARE_ARDUINO30 +build_flags = ${env:tasmota32s3-arduino30.build_flags} + -DFIRMWARE_SAFEBOOT +lib_extra_dirs = lib/lib_ssl, lib/libesp32 +lib_ignore = ${safeboot_flags.lib_ignore} + +[env:tasmota32c2-safeboot] +extends = env:tasmota32c2-arduino30 +build_unflags = ${env:tasmota32c2-arduino30.build_unflags} + -DFIRMWARE_ARDUINO30 +build_flags = ${env:tasmota32c2-arduino30.build_flags} + -DFIRMWARE_SAFEBOOT +lib_extra_dirs = lib/lib_ssl, lib/libesp32 +lib_ignore = ${safeboot_flags.lib_ignore} + +[env:tasmota32c3-safeboot] +extends = env:tasmota32c3-arduino30 +build_unflags = ${env:tasmota32c3-arduino30.build_unflags} + -DFIRMWARE_ARDUINO30 +build_flags = ${env:tasmota32c3-arduino30.build_flags} + -DFIRMWARE_SAFEBOOT +lib_extra_dirs = lib/lib_ssl, lib/libesp32 +lib_ignore = ${safeboot_flags.lib_ignore} + +[env:tasmota32c3cdc-safeboot] +extends = env:tasmota32c3-arduino30 +board = esp32c3cdc +build_unflags = ${env:tasmota32c3-arduino30.build_unflags} + -DFIRMWARE_ARDUINO30 +build_flags = ${env:tasmota32c3-arduino30.build_flags} + -DFIRMWARE_SAFEBOOT +lib_extra_dirs = lib/lib_ssl, lib/libesp32 +lib_ignore = ${safeboot_flags.lib_ignore} + +[env:tasmota32c6-safeboot] +extends = env:tasmota32c6-arduino30 +build_unflags = ${env:tasmota32c6-arduino30.build_unflags} + -DFIRMWARE_ARDUINO30 +build_flags = ${env:tasmota32c6-arduino30.build_flags} + -DFIRMWARE_SAFEBOOT +lib_extra_dirs = lib/lib_ssl, lib/libesp32 +lib_ignore = ${safeboot_flags.lib_ignore} + +[env:tasmota32c6cdc-safeboot] +extends = env:tasmota32c6-arduino30 +board = esp32c6cdc +build_unflags = ${env:tasmota32c6-arduino30.build_unflags} + -DFIRMWARE_ARDUINO30 +build_flags = ${env:tasmota32c6-arduino30.build_flags} + -DFIRMWARE_SAFEBOOT +lib_extra_dirs = lib/lib_ssl, lib/libesp32 +lib_ignore = ${safeboot_flags.lib_ignore} \ No newline at end of file diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini index fe74871af..d596e2f45 100644 --- a/platformio_tasmota_env32.ini +++ b/platformio_tasmota_env32.ini @@ -15,7 +15,6 @@ lib_compat_mode = ${common.lib_compat_mode} lib_extra_dirs = ${common.lib_extra_dirs} lib/libesp32 lib/libesp32_lvgl - lib/libesp32_eink lib/libesp32_audio lib_ignore = HTTPUpdateServer @@ -26,7 +25,7 @@ lib_ignore = ESP32 Azure IoT Arduino ESP32 Async UDP ESP32 BLE Arduino -; SimpleBLE + SimpleBLE NetBIOS ESP32 Preferences @@ -39,46 +38,6 @@ lib_ignore = ; tasmota/berry/modules/Partition_Manager.tapp custom_files_upload = no_files -[env:tasmota32-arduino30] -platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF5 -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1457/framework-arduinoespressif32-release_v5.1-69cdc81680.zip -extends = env:tasmota32_base -board = esp32 -build_unflags = ${env:tasmota32_base.build_unflags} - -DUSE_IPV6 -build_flags = ${env:tasmota32_base.build_flags} - -DFIRMWARE_ARDUINO30 - -DOTA_URL='""' -lib_extra_dirs = lib/lib_ssl, lib/libesp32 -lib_ignore = - ESP Mail Client - IRremoteESP8266 - NeoPixelBus - MFRC522 - universal display Library - ESP8266Audio - ESP8266SAM - -[env:tasmota32c6-safeboot] -platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF5 -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1457/framework-arduinoespressif32-release_v5.1-69cdc81680.zip -extends = env:tasmota32_base -board = esp32c6 -build_unflags = ${env:tasmota32_base.build_unflags} - -DUSE_IPV6 -build_flags = ${env:tasmota32_base.build_flags} - -DFIRMWARE_SAFEBOOT - -DOTA_URL='""' -lib_extra_dirs = lib/lib_ssl, lib/libesp32 -lib_ignore = - ESP Mail Client - IRremoteESP8266 - NeoPixelBus - MFRC522 - universal display Library - ESP8266Audio - ESP8266SAM - [env:tasmota32-safeboot] extends = env:tasmota32_base build_flags = ${env:tasmota32_base.build_flags} From c9b5e5ab1f35139d9182fd77df8796b2b5dfd2bb Mon Sep 17 00:00:00 2001 From: btsimonh Date: Tue, 22 Aug 2023 07:24:05 +0100 Subject: [PATCH 016/225] Add new webcam driver over latest dev. (#19280) * Add new webcam driver over latest dev. To use the old one, define USE_WEBCAM_LAGACY * enable build without RTSP. check pin_pwdn before using it n 0x105!!! * more fixes around pwdn. Make wcresolution -1 set the resoltuion setting to 'disbale cam' value (15). * fix task stop - wait for debug to leave-> prevents guru. pin task to core 0. * split motion from other code. Add USE_WEBCAM_MOTION to control inclusion of motion code (big hit). Change from using USE_WEBCAM_LEGACY to USE_WEBCAM_V2 * logging minimisation - behind WEBCAM_DEV_DEBUG --- .../xdrv_81_esp32_webcam.ino | 4 + .../xdrv_81_esp32_webcam_task.ino | 3046 +++++++++++++++++ .../xdrv_81_esp32_webcam_task_motion.ino | 1244 +++++++ 3 files changed, 4294 insertions(+) create mode 100644 tasmota/tasmota_xdrv_driver/xdrv_81_esp32_webcam_task.ino create mode 100644 tasmota/tasmota_xdrv_driver/xdrv_81_esp32_webcam_task_motion.ino diff --git a/tasmota/tasmota_xdrv_driver/xdrv_81_esp32_webcam.ino b/tasmota/tasmota_xdrv_driver/xdrv_81_esp32_webcam.ino index ede2ecdbf..572dc65d2 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_81_esp32_webcam.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_81_esp32_webcam.ino @@ -19,6 +19,9 @@ #ifdef ESP32 #ifdef USE_WEBCAM +// defining USE_WEBCAM_V2 will use xdrv_81_esp32_webcam_task.ino instead. +#ifndef USE_WEBCAM_V2 + /*********************************************************************************************\ * ESP32 webcam based on example in Arduino-ESP32 library * @@ -1531,5 +1534,6 @@ bool Xdrv81(uint32_t function) { return result; } +#endif // USE_WEBCAM_LEGACY #endif // USE_WEBCAM #endif // ESP32 diff --git a/tasmota/tasmota_xdrv_driver/xdrv_81_esp32_webcam_task.ino b/tasmota/tasmota_xdrv_driver/xdrv_81_esp32_webcam_task.ino new file mode 100644 index 000000000..b1acfb724 --- /dev/null +++ b/tasmota/tasmota_xdrv_driver/xdrv_81_esp32_webcam_task.ino @@ -0,0 +1,3046 @@ +/* + xdrv_99_esp32_webcamberry.ino - ESP32 webcam support for Tasmota + + Copyright (C) 2021 Gerhard Mutz and Theo Arends + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifdef ESP32 +#ifdef USE_WEBCAM +// defining USE_WEBCAM_V2 will this file rather than xdrv_81_esp32_webcam.ino +#ifdef USE_WEBCAM_V2 + +#undef WEBCAM_DEV_DEBUG + +/*********************************************************************************************\ + * ESP32 webcam based on example in Arduino-ESP32 library + * + * Template as used on ESP32-CAM WiFi + bluetooth Camera Module Development Board ESP32 With Camera Module OV2640 Geekcreit for Arduino + * {"NAME":"AITHINKER CAM","GPIO":[4992,1,672,1,416,5088,1,1,1,6720,736,704,1,1,5089,5090,0,5091,5184,5152,0,5120,5024,5056,0,0,0,0,4928,1,5094,5095,5092,0,0,5093],"FLAG":0,"BASE":2} + * + * Supported commands: + * WcInterrupt = Control streaming, 0 = stop, 1 = start + * WcResolution = Set resolution (max framerates at wcclock=20) + * FPS quoted is (max, withonewebclient) at wcclock=20 on AIThinker esp32cam equivalent + * FPS is mostly limited by sending data to webclients & rtsp, not by the camera. + 0 = FRAMESIZE_96X96, // 96x96 (50fps, ~48fps) - at wcclock=30 (75, ~53) + 1 = FRAMESIZE_QQVGA, // 160x120 (50fps ~47fps) + 2 = FRAMESIZE_QCIF, // 176x144 (50fps ~47fps) + 3 = FRAMESIZE_HQVGA, // 240x176 (50fps ~37fps?) + 4 = FRAMESIZE_240X240, // 240x240 (50fps ~39fps) + 5 = FRAMESIZE_QVGA, // 320x240 (50fps ~35fps) + 6 = FRAMESIZE_CIF, // 400x296 (50fps ~31fps) + 7 = FRAMESIZE_HVGA, // 480x320 (25fps ~24fps) + 8 = FRAMESIZE_VGA, // 640x480 (25fps ~19fps) + 9 = FRAMESIZE_SVGA, // 800x600 (25fps ~15.5fps) + 10 = FRAMESIZE_XGA, // 1024x768 (12.5fps, ~10fps) + 11 = FRAMESIZE_HD, // 1280x720 (12.5fps, ~9fps) + 12 = FRAMESIZE_SXGA, // 1280x1024 (12.5fps, ~7.5fps) + 13 = FRAMESIZE_UXGA, // 1600x1200 (12.5fps, ~5fps) + // 3MP Sensors above this no yet supported with this driver + 14 = FRAMESIZE_FHD, // 1920x1080 + 15 = CAMERA DISABLED (from wcresolution -1) + + // not accessible + 15 = FRAMESIZE_P_HD, // 720x1280 + // our resolution variable is 4 bit, so we can;t use these. + 16 = FRAMESIZE_P_3MP, // 864x1536 + 17 = FRAMESIZE_QXGA, // 2048x1536 + // 5MP Sensors + 18 = FRAMESIZE_QHD, // 2560x1440 + 19 = FRAMESIZE_WQXGA, // 2560x1600 + 20 = FRAMESIZE_P_FHD, // 1080x1920 + 21 = FRAMESIZE_QSXGA, // 2560x1920 + 22 = FRAMESIZE_INVALID + +Framerate: I found that achievable streamed framerate is VERY dependent on wifi. +e.g. latest BT router, but with android screensharing with TV, and framerate for resolution 0 was scatty between 20 and 40fps!!!! +As soon as the screenshare ended, back to 53fps at 30mhz clock. + + * WcMirror = Mirror picture, 0 = no, 1 = yes + * WcFlip = Flip picture, 0 = no, 1 = yes + * WcSaturation = Set picture Saturation -2 ... +2 + * WcBrightness = Set picture Brightness -2 ... +2 + * WcContrast = Set picture Contrast -2 ... +2 + * WcSpecialEffekt = Set Special Picture Effect: 0 = off, 1 = , 2 = , 3 = , 4 = , 5 = , 6 = + * WcAWB = Auto White Balance, 0 = no, 1 = yes + * WcWBMode = White Balance Mode, 0 = auto, 1 = + * WcAWBGain = Auto White Balance Gain, 0 = no, 1 = yes + * WcAEC = Auto exposure control (Sensor), 0 = no, 1 = yes + * WcAECDSP = Auto exposure control (DSP), 0 = no, 1 = yes + * WcAECValue = Auto exposure control value, 0 ... 1024 + * WcAECLevel = Auto exposure control level, -2 ... +2 + * WcAGC = Auto gain control, 0 = no, 1 = yes + * WcAGCGain = Auto gain control gain, 0 .. 30 + * WcGainCeiling = Gain ceiling, 0 .. 6 (0 = x2, 1 = x4, 2 = x8, 3 = x16, 4 = x32, 5 = x64, 6 = x128) + * WcGammaCorrect = Auto Gamma Correct, 0 = no, 1 = yes + * WcLensCorrect = Auto Lens Correct, 0 = no, 1 = yes + * WcWPC = White Pixel Correct, 0 = no, 1 = yes + * WcDCW = Downscale, 0 = no, 1 = yes + * WcBPC = Black Pixel Correct, 0 = no, 1 = yes + * WcColorbar = Show Colorbar, 0 = no, 1 = yes + * WcFeature = Set extended Feature, 0 = off, 1 = reduce FPS, 2 = Nightmode + * WcStats = Show Statistics + * WcInit = Init Camera Interface + * WcRtsp = Control RTSP Server, 0=disable, 1=enable (forces restart) (if defined ENABLE_RTSPSERVER) + + * WcGetframeN = read a picture from camera and store in slot N - return {"addr":123456,"len":12345,"w":160,"h":120, "format":5} + * WcSavepicN = save a picture 1-4 after WcGetframe or WcSavepic0 to get frame 1 and save. argument is filename + * WcAppendpicN = append a picture 1-4 to a file after WcGetframe or WcSavepic0 to get frame 1 and save. argument is filename + * WcGetpistoreN = read buff, addr, len of a stored image, returns json (e.g. for berry) {"addr":123456,"len":12345,"w":160,"h":120, "format":5} + * if N==0 take a picture to 1 first. + * WcGetmotionpixelsN = (N=1..4) read addr, len, w, h as JSON {"addr":123456,"len":12345,"w":160,"h":120, "format":4} + * motion(1) + * difference(2) buffer - e.g for berry + * mask(3) + * background(4) + * e.g. could be used to read pixels, or change pixels from berry. + + * WcMenuvideoon = turn on video in main menu + * WcMenuvideooff = turn off video in main menu + + * WcSetOptionsNN = call WcSetOptions function with (index, payload). + * - can oprate many of the functions above, plus: + * WcSetoptions24 - e.g. WcSetoptions24 2 will give you only every 3rd frame + * WcSetoptions25 - espcam format + 1. 0->default->JPEG. 1:2BPP/RGB565, 2:2BPP/YUV422, 3:1.5BPP/YUV420, 4:1BPP/GRAYSCALE 5:JPEG/COMPRESSED 6:3BPP/RGB888 7:RAW 8:3BP2P/RGB444 9:3BP2P/RGB555 + * Maybe useful for tensorflow or similar? + * ***** I COULD NOT GET THIS TO WORK ON MY AiThinker style cam ****** + + * WcConvertFrameN - convert a wcgetframe in picstore from jpeg to (0=2BPP/RGB565, 3=1BPP/GRAYSCALE, 5=3BPP/RGB888), (0-3) + * converts in place, replacing the stored frame with the new format. Data can be retrieved using wcgetpicstoreN (e.g. for use in berry) + * will fail if it can't convert or allocate. + * + * WcPowerOff - power down camera. WcInit will bring it back up. + * WcSetPicture - SetPictureN (N=1-MAX_PICTORE) expects 'addr len format [width height] + * use to populate a frame in Wc.picstore from Berry. e.g. to put a JPEG mask there + * so you can then decode it, get it's address, get the address of the current mask, and + * copy data across. + * if sending JPEG (format=0|5), width and height are calculated on decode. + * if sending pixels (format=4(GRAY)|6(RGB)|1(RGB565)), width and height are required, and used to allocate. + * binary data is copied from addr. i.e. you can send the addr/len from Berry introspect bytes. + * ideas: could be used to set background image based on time of day. + +### Enable motion detection interval +WCsetMotiondetect +WCsetMotiondetect 2000 + +### disable motion detection +WCsetMotiondetect 0 + +### return overall normalised pixel difference. +WCsetMotiondetect -1 + +### return overall normalised brightness. +WCsetMotiondetect -2 + +### motion detect via jpeg frame size (% change) +Does not run motion detect frame scan! +(i.e. you can turn off WCsetMotiondetect 0 - and detect at 50fps) +WCsetMotiondetect2 +WCsetMotiondetect2 20 + +### Pixel diff value threshold +if set > 0, pixels with a difference > threshold will be counted +if a difference buffer is enabled, then pixels in it are raised to 255. +WCsetMotiondetect3 +WCsetMotiondetect3 10 + +### Pixels over threshold trigger +if the number of pixels changed (per 10000) is > limit, motion is triggered. +set 0 to disable. +WCsetMotiondetect4 +WCsetMotiondetect4 10 + +### set scale for motion detect image ref camera res +the number 0-7 = 1, 1/2, 1/4, 1/8, 1/16, 1/32, 1/64, 1/128 +values 0-3 use scaling on jpeg decode (fast). +values 4-7 add software scaling (not much performance gain, but some) +WCsetMotiondetect5 0-7 + +### enable difference buffer +enable/disable the difference buffer +WCsetMotiondetect6 0-1 + +### Set motion trigger threshold (accumulated pixels difference) +normalised value, try 1000... +WCsetMotiondetect7 0-nnnnn + + +Endpoints: +http://IP/motionlbuff.jpg - last motion buffer as jpeg (fully scaled) - if motion enabled, else 404 +http://IP/motionbuff.jpg - motion buffer as jpeg (only jpeg scaled) - if motion enabled, else 404 +http://IP/motiondiff.jpg - last difference buffer as jpeg (fully scaled) - if enabled, else 404 +http://IP/wc.jpg - cam picture +http://IP/wc.mjpeg - cam picture +http://IP/snapshot.jpg - cam picture + +http://IP:81/diff.mjpeg - motion or difference buffer stream as mjpeg (fully scaled, buf is motion if diff not enabled) - if enabled, else no data +http://IP:81/cam.mjpeg - cam stream. +http://IP:81/cam.jpg - cam stream. +http://IP:81/stream - cam stream. + + +Both webstream and RTSP can handle multiple clients. +Multiple clients will reduce the framerate. +Wifi use has a big effect on framerate. + + + * + * WcFeature Explanation + * See https://hobbylad.files.wordpress.com/2020/02/ov2640-camera-module-software-application-notes.pdf + * for more Information + * 0: Normal Operation + * 1: Reduced FPS: Set XCLK Divisor to 2. Reduces Framerate and also increases exposure time. This causes + * better low light performance. See above document, page 6 + * 2: Night Mode: Further increase exposure time and lower the Framerate depending on available light. + * See above Document, Page 8 + * + * Only boards with PSRAM should be used. + * To speed up cam processing cpu frequency should be better set to 240Mhz + * + * remarks for AI-THINKER + * GPIO0 zero must be disconnected from any wire after programming because this pin drives the cam clock and does + * not tolerate any capictive load + * the AITHINKER module does not have CAM_RESET - so if you get the camera into a bad state, power off restart is the only way out. + * flash led = gpio 4 + * red led = gpio 33 + * optional rtsp url: rtsp://xxx.xxx.xxx.xxx:8554/mjpeg/1 + * + * SH 2023-05-14 - added mutex for many webcam functions - this is to prevent multi-threaded access to the camera functions, which + * can case error 0x105 upon re-init. + * Errors 0x103 and 0xffffffff could indicate CAM_PWDN incorrect. + * Error 0x105 is likely caused by the camera not being powered long enough before init. + * + * I2C use: if USE_I2C is enabled, you can set GPIO26 to I2c_SDA/2 and GPIO27 to I2C_SCL/2, and then use the shared I2C bus 2. + * Then you can use cmd i2cscan2 to check for camera presence. + */ + +/*********************************************************************************************/ + +/*********************************************************************************************/ +/* +Berry usage: +if you turn on motion detect with "wcsetmotiondetect 1000" (number is ms between detect) +or it you turn on frame sending using "wcberryframes 1" +then berry will be called expecting to find a driver which has a method "webcam", e.g.: + +var piccount = 0 +class MyWebcamDriver + #- create a method for adding a button to the main menu -# + def webcam(cmd, idx, payload) + print("webcam "+cmd+" payload:"+payload) + if (cmd == "motion") + #split payload at space + var val = int(payload) + if (val > 1000) + piccount = piccount+1 + var tcmd = "wcsavepic0 /myfile" .. piccount .. ".jpg" + tasmota.cmd(tcmd) + print("webcam motion -> "+tcmd) + end + end + end +end + +This will be called with +"motion <" +and/or +"frame" + +New commands: +WcGetFrame or WcGetFrame - reads the next frame into slot n (1-4) +WcSavePic fname +WcAppendPic fname +(n is 0-4) - 0 will trigger a read of a picture now, +These will save or append a picture to a file. The picture must have been first read with WcGetFrame if n > 0 + + +*/ +/*********************************************************************************************/ + + + +#define XDRV_99 99 + +#include "cam_hal.h" +#include "esp_camera.h" +#include "sensor.h" +#include "fb_gfx.h" +#include "camera_pins.h" +#include "esp_jpg_decode.h" +//#include "img_converters.h" + +#ifdef USE_UFILESYS +extern FS *ufsp; +extern FS *ffsp; +#endif + +bool HttpCheckPriviledgedAccess(bool); +extern ESP8266WebServer *Webserver; + +SemaphoreHandle_t WebcamMutex = nullptr; + + + + +// these are the frame intervals at 20mhz +// empirically, they directly scale with frequency. +// for 30mhz, 50fps -> 75fps; for 15 mhz, 37.5fps, +// Q: what happens at 30 mains? +const int nativeIntervals20ms[] = { + 20, //0 = FRAMESIZE_96X96, // 96x96 (50fps, ~48fps) - at wcclock=30 (75, ~53) + 20, //1 = FRAMESIZE_QQVGA, // 160x120 (50fps ~47fps) + 20, //2 = FRAMESIZE_QCIF, // 176x144 (50fps ~47fps) + 20, //3 = FRAMESIZE_HQVGA, // 240x176 (50fps ~37fps?) + 20, //4 = FRAMESIZE_240X240, // 240x240 (50fps ~39fps) + 20, //5 = FRAMESIZE_QVGA, // 320x240 (50fps ~35fps) + 20, //6 = FRAMESIZE_CIF, // 400x296 (50fps ~31fps) + 20, //7 = FRAMESIZE_HVGA, // 480x320 (25fps ~24fps) + 40, //8 = FRAMESIZE_VGA, // 640x480 (25fps ~19fps) + 40, //9 = FRAMESIZE_SVGA, // 800x600 (25fps ~15.5fps) + 80, //10 = FRAMESIZE_XGA, // 1024x768 (12.5fps, ~10fps) + 80, //11 = FRAMESIZE_HD, // 1280x720 (12.5fps, ~9fps) + 80, //12 = FRAMESIZE_SXGA, // 1280x1024 (12.5fps, ~7.5fps) + 80, //13 = FRAMESIZE_UXGA, // 1600x1200 (12.5fps, ~5fps) +}; + + +// use mutex like: +// TasAutoMutex localmutex(&WebcamMutex, "somename", 200); +// in any function. Will wait for mutex to be clear, and auto-release when the function exits. + +#define BOUNDARY "e8b8c539-047d-4777-a985-fbba6edff11e" + +#ifndef MAX_PICSTORE +#define MAX_PICSTORE 4 +#endif + +// our basic picture store +// we use this both in wc_picstore and elsewhere +struct PICSTORE { + uint8_t * buff; /*!< Pointer to the pixel data */ + size_t len; /*!< Length of the buffer in bytes */ + uint16_t width; /*!< Width of the buffer in pixels */ + uint16_t height; /*!< Height of the buffer in pixels */ + int8_t format; /*!< Format of the pixel data */ + struct timeval timestamp; /*!< Timestamp since boot of the first DMA buffer of the frame */ + int allocatedLen; // -1 or 0 indicates failure to allocate +}; + +#ifdef ENABLE_RTSPSERVER + +#include +#include +#include +#include +#ifndef RTSP_FRAME_TIME +#define RTSP_FRAME_TIME 100 +#endif // RTSP_FRAME_TIME + +// RTSP streamer class +class localOV2640Streamer : public CStreamer { + BufPtr f_ptr; // temp pointer to frame buffer + int f_len; +public: + localOV2640Streamer(SOCKET aClient, int width, int height); + void setframe(BufPtr ptr, int len); + void clearframe(); + virtual void streamImage(uint32_t curMsec); +}; + +localOV2640Streamer::localOV2640Streamer(SOCKET aClient, int width, int height) : CStreamer(aClient, width, height) { + clearframe(); +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG,PSTR("CAM:RTSP w%d h%d"), width, height); +#endif +} +void localOV2640Streamer::setframe(BufPtr ptr, int len) { + f_ptr = ptr; + f_len = len; +} +void localOV2640Streamer::clearframe() { + f_ptr = nullptr; + f_len = 0; +} +void localOV2640Streamer::streamImage(uint32_t curMsec){ + if (!f_ptr) return; + streamFrame(f_ptr, f_len, curMsec); + //AddLog(LOG_LEVEL_DEBUG,PSTR("CAM: RTSP Stream Frame %d"), f_len); +} + +typedef struct tag_wc_rtspclient { + localOV2640Streamer * volatile camStreamer; + CRtspSession * volatile rtsp_session; + WiFiClient rtsp_client; + tag_wc_rtspclient * volatile p_next; +} wc_rtspclient; +#endif //ENABLE_RTSPSERVER + +typedef struct tag_wc_client { + WiFiClient client; + tag_wc_client *p_next; + uint8_t active; + uint8_t type; +} wc_client; + +struct { + uint32_t loopcounter; + uint32_t loopspersec; + + // status variables + uint8_t up = 0; + uint8_t psram = 0; // indicates if we found psram or not. Suspect always true for esp32cam modules + volatile uint16_t width; // last JPEG frame height received or 0 + volatile uint16_t height; // last JPEG frame height received or 0 + volatile uint32_t last_frame_len; // last JPEG frame length or 0 + volatile int8_t frame_processed; // set when a frame is finished processing + unsigned int lastCamError; // set to the last cam error, or 0 + volatile uint32_t camtimediff; // last camtime interval + volatile uint32_t frameIntervalsus; // expected cam interval in us + volatile uint16_t lenDiff; + volatile uint16_t lenDiffTriggered; + volatile uint8_t lenDiffTrigger; + + // control variables + volatile int8_t disable_cam; // set to 1 when TAS is busy doning something and has turned the camera off + volatile int8_t taskRunning; // 0 = not started, 1 = running, 2 = request stop + TaskHandle_t taskHandle; // the task handle + volatile int8_t taskGetFrame; // set to n to trigger capture of n frames to picstore + volatile int8_t taskTakePic; // set to n to trigger capture of n frames to picstore + uint8_t berryFrames; + volatile uint16_t lenDiffLimit; + volatile int32_t skipFrames; + /* camPixelFormat is format +1, i.e. + 0->4->PIXFORMAT_JPEG + 1->0->PIXFORMAT_RGB565, // 2BPP/RGB565 - valid? + 2->1->PIXFORMAT_YUV422, // 2BPP/YUV422 - valid? + 3->2->PIXFORMAT_YUV420, // 1.5BPP/YUV420 - invalid? + 4->3->PIXFORMAT_GRAYSCALE, // 1BPP/GRAYSCALE - valid? + 5->4->PIXFORMAT_JPEG, // JPEG/COMPRESSED - valid + 6->5->PIXFORMAT_RGB888, // 3BPP/RGB888 - invalid? + 7->6->PIXFORMAT_RAW, // RAW - invalid? + 8->7->PIXFORMAT_RGB444, // 3BP2P/RGB444 - invalid? + 9->8->>PIXFORMAT_RGB555, // 3BP2P/RGB555 - invalid? + */ + volatile uint8_t camPixelFormat; // + + // our (separate) webserver on port 81 + ESP8266WebServer *CamServer; + // pointer to the first http streaming client in a list of multiple clients, or nullptr + wc_client *client_p; + struct PICSTORE picstore[MAX_PICSTORE]; + uint8_t lastBnum; // the last picture index stored + struct PICSTORE snapshotStore; + +#ifdef ENABLE_RTSPSERVER + // TCP server on port 8554 + WiFiServer *rtspp; + // pointer to the first rtsp client in a list of multiple clients, or nullptr + wc_rtspclient * volatile rtspclient; + uint8_t rtsp_start; +#endif // ENABLE_RTSPSERVER +} Wc; + +struct { + uint32_t camcnt = 0; + uint32_t camfps = 0; + uint32_t maxfps = 0; + uint32_t camfail = 0; + uint32_t jpegfail = 0; + uint32_t clientfail = 0; + float avgFPS = 0.0; + uint16_t avgProcessingPerFrameMS; + uint16_t avgFrameMS; + uint32_t framesTotal; + uint32_t framesLost; + + uint8_t webclientcount; + uint8_t rtspclientcount; + + char name[7] = "Webcam"; +} WcStats; + + +// allocate a PICSTORE buffer. +// for PIXFORMAT_JPEG: +// set bpp_orsize to the size of the jpeg file +// width and height are unused +// for pixel based formats +// size is based on width*height*(bytes per pixel)+4 +// allocstyle: +// 0->always free & alloc +// 1->realloc only if not big enough +// 2->realloc only if not big enough, and copy data +#define WC_ALLOC_ALWAYS 0 +#define WC_REALLOC_IF_SMALLER 1 +#define WC_REALLOC_WITH_COPY 2 + +#define WC_USE_FAST_MEM 0x10 + +bool pic_alloc(struct PICSTORE *ps, int width, int height, int jpegsize, int format, int allocstyle){ + int len = 0; + bool res = false; + uint8_t* orgbuf = nullptr; + int orglen = 0; + + if (!ps){ +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_ERROR, PSTR("CAM: pic_alloc ps null")); +#endif + return false; + } + + switch(format){ + default: len = 0; break; + case PIXFORMAT_JPEG: len = jpegsize; break; + case PIXFORMAT_GRAYSCALE: len = width*height + 4; break; + case PIXFORMAT_RGB888: len = width*height*3 + 4; break; + case PIXFORMAT_RGB565: len = width*height*2 + 4; break; + } + + if (!len){ +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_ERROR, PSTR("CAM: pic_alloc invalid format or len 0")); +#endif + return false; + } + + switch(allocstyle & 0xf){ + case WC_ALLOC_ALWAYS: // just free & allocate, unless no change + if (len != ps->allocatedLen){ + ps->allocatedLen = -1; // force realloc + } + break; + case WC_REALLOC_IF_SMALLER: // allocate if buf not big enough + // will use ps->allocatedLen to check below + break; + case WC_REALLOC_WITH_COPY: // allocate and copy data if buf not big enough + orgbuf = ps->buff; + orglen = ps->allocatedLen; + break; + } + + if (ps->allocatedLen < len){ + free(ps->buff); + memset(ps, 0, sizeof(*ps)); + } + if (!ps->buff){ + if (len){ + if ((allocstyle & WC_USE_FAST_MEM) || !Wc.psram){ + ps->buff = (uint8_t *)malloc(len); + } else { + ps->buff = (uint8_t *)heap_caps_aligned_alloc(4, len, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT); + } + if (ps->buff) ps->allocatedLen = len; + if (orgbuf && orglen){ + memcpy(ps->buff, orgbuf, orglen); + } + } + } + if (ps->buff){ + ps->len = len; + // don't change if 0 in, as jpeg decode sets at start only + if (width) ps->width = width; + if (height) ps->height = height; + ps->format = format; + } + + if (ps->buff) res = true; + return res; +} + +// return true if pic had content. +bool pic_free(struct PICSTORE *ps){ + bool res = false; + if (ps){ + if (ps->buff){ + free(ps->buff); + res = true; + } + memset(ps, 0, sizeof(*ps)); + } + return res; +} + +bool pic_alloc_p(struct PICSTORE **pps, int width, int height, int jpegsize, int format, int allocstyle){ + if (!*pps){ + *pps = (struct PICSTORE *)malloc(sizeof(struct PICSTORE)); + memset(*pps, 0, sizeof(struct PICSTORE)); + } + if (*pps){ + return pic_alloc(*pps, width, height, jpegsize, format, allocstyle); + } + return false; +} +bool pic_free_p(struct PICSTORE **pps){ + bool res = false; + if (*pps){ + res = pic_free(*pps); + free(*pps); + *pps = nullptr; + } + return res; +} + + +bool wc_check_format(int format){ + switch(format){ + case PIXFORMAT_JPEG: return true; + case PIXFORMAT_GRAYSCALE: return true; +#ifdef WC_USE_RGB_DECODE + case PIXFORMAT_RGB888: return true; + case PIXFORMAT_RGB565: return true; +#endif + } + return false; +} + + + +#ifdef USE_WEBCAM_MOTION + +struct WC_Motion { + ///////////////////////////////////// + // configured by user + uint16_t motion_detect; // time between detections + uint32_t motion_trigger_limit; // last amount of difference measured (~100 for none, > ~1000 for motion?) + uint8_t scale; /*0=native, 1=/2, 2=/4, 3=/8*/ + uint8_t swscale; // skips pixels 0=native, 1=/2, 2=/4, 3=/8 - after scale + uint8_t enable_diffbuff; // enable create of a buffer containing the last difference image + uint8_t enable_backgroundbuff; + uint8_t capture_background; + + uint8_t pixelThreshold; + uint32_t pixel_trigger_limit; // pertenthousand changed pixels + + uint8_t enable_mask; // enable mask buffer + uint32_t auto_mask; // number of motion runs to run automask over + uint8_t auto_mask_pixel_threshold; // pixel change threshold to add pixel to mask + uint8_t auto_mask_pixel_expansion; // number of pixels atound the detected pixel to set in mask (square) + + //////////////////////////////////// + // variables used in detection + + // set to 0 each any time we restart (new last_motion_buffer), goes to after first processing + // set to -1 on malloc failure - will happen with larger frames + int8_t motion_state; + uint32_t motion_ltime; // time of last detect + uint32_t motion_trigger; // last amount of difference measured (~100 for none, > ~1000 for motion?) + uint32_t motion_brightness; // last frame brightness read (~15000) + + // jpeg is decoded (with scale) into here. + struct PICSTORE *frame; + // the others are both scale and swscale + // the last image - to compare against. + struct PICSTORE *last_motion; + // optional - the last difference. + struct PICSTORE *diff; + // optional - a mask to stop differences in set pixels triggering motion + struct PICSTORE *mask; + // Optional static background image - to compare against. + struct PICSTORE *background; + + int scaledwidth; + int scaledheight; + uint32_t changedPixelPertenthousand; + + uint32_t required_motion_buffer_len; // required frame buffer len - used to prevent continual reallocation after failure + + //////////////////////////////////// + // triggers picked up by wcloop() + volatile uint8_t motion_processed; // set to 1 each time it's processed. + volatile uint8_t motion_triggered; // motion was over trigger limit + + //////////////////////////////////// + // status/debug + int32_t last_duration; +}; + +extern WC_Motion wc_motion; +#endif + +/*********************************************************************************************/ +// functions to encode into a jpeg buffer. +// we keep ONE allocated buffer for this, and expand it if the jpeg does not fit. +// single expanding jpeg buffer for encode into +// call encode_reset() to maybe recover from failure to allocate. + +#define DEFAULT_INITIAL_JPEG_LEN 16384 + +// static store for taking pictures +struct PICSTORE OurOneJpeg = {0}; + +// static store for video. +// we only re-allocate if the jpeg is larger, to stop malloc churn. +struct PICSTORE VideoJpeg = {0}; + + + + + +/*********************************************************************************************/ + +// this is called from outside to prevent conflicts in the esp. +// specifically from +// xdrv_50_filesystem.ino - bool TfsSaveFile(const char *fname, const uint8_t *buf, uint32_t len) +// support_esp.ino - void NvmSave(const char *sNvsName, const char *sName, const void *pSettings, unsigned nSettingsLen) +void WcInterrupt(uint32_t state) { + TasAutoMutex localmutex(&WebcamMutex, "WcInterrupt", 20000); + // Stop camera ISR if active to fix TG1WDT_SYS_RESET + if (!Wc.up) { return; } + + if (state) { + // Re-enable interrupts + cam_start(); +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: cam_start()")); +#endif + Wc.disable_cam = 0; + } else { + // Stop interrupts + Wc.disable_cam = 1; + cam_stop(); +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: cam_stop()")); +#endif + } +} + + +// wait timeout_ms for the value to clear +// use to wait for task to do something +#define WC_WAIT_INTERVAL_MS 10 +bool WcWaitZero(volatile int8_t *val, int8_t initial, int timeout_ms){ + int loops = timeout_ms/WC_WAIT_INTERVAL_MS; + if (!loops) loops = 1; + *val = initial; + while(*val && loops--){ + vTaskDelay(WC_WAIT_INTERVAL_MS / portTICK_PERIOD_MS); + } + if (*val) return false; + return true; +} + +// TAS will disable us for short periods... +// this wait for TAS to re-enable it +void WcWaitEnable(){ + int timeout_ms = 1000; + int loops = timeout_ms/WC_WAIT_INTERVAL_MS; + if (!loops) loops = 1; + while(Wc.disable_cam && loops--){ + vTaskDelay(WC_WAIT_INTERVAL_MS / portTICK_PERIOD_MS); + } +} + +bool WcPinUsed(void) { + bool pin_used = true; + for (uint32_t i = 0; i < MAX_WEBCAM_DATA; i++) { + if (!PinUsed(GPIO_WEBCAM_DATA, i)) { + pin_used = false; + } +// if (i < MAX_WEBCAM_HSD) { +// if (!PinUsed(GPIO_WEBCAM_HSD, i)) { +// pin_used = false; +// } +// } + } + +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: i2c_enabled_2: %d"), TasmotaGlobal.i2c_enabled_2); +#endif + + if (!PinUsed(GPIO_WEBCAM_XCLK) || !PinUsed(GPIO_WEBCAM_PCLK) || + !PinUsed(GPIO_WEBCAM_VSYNC) || !PinUsed(GPIO_WEBCAM_HREF) || + ((!PinUsed(GPIO_WEBCAM_SIOD) || !PinUsed(GPIO_WEBCAM_SIOC)) && !TasmotaGlobal.i2c_enabled_2) // preferred option is to reuse and share I2Cbus 2 + ) { + pin_used = false; + } + return pin_used; +} + +void WcFeature(int32_t value) { + TasAutoMutex localmutex(&WebcamMutex, "WcFeature", 200); + sensor_t * wc_s = esp_camera_sensor_get(); + if (!wc_s) { return; } + + if (value != 1) { + // CLKRC: Set Clock Divider to 0 = fullspeed + wc_s->set_reg(wc_s, 0x111, 0x3f, 0x00); + vTaskDelay(200 / portTICK_PERIOD_MS); + } + if (value != 2) { + // Stop Nightmode + wc_s->set_reg(wc_s, 0x103, 0xff, 0x0a); // COM1: Reset dummy frames + wc_s->set_reg(wc_s, 0x10f, 0xff, 0x43); // Reserved Reg + wc_s->set_reg(wc_s, 0x10f, 0xff, 0x4b); // Reserved Reg + vTaskDelay(1000 / portTICK_PERIOD_MS); + wc_s->set_reg(wc_s, 0x10f, 0xff, 0x43); // Reserved Reg + } + + switch(value) { + case 1: + // Reduce FPS + // CLKRC: Set Clock Divider to 2 + wc_s->set_reg(wc_s, 0x111, 0x3f, 0x02); + break; + case 2: + // Start Nightmode + wc_s->set_reg(wc_s, 0x10f, 0xff, 0x4b); // Reserved Reg + wc_s->set_reg(wc_s, 0x103, 0xff, 0xcf); // COM1: Allow 7 dummy frames + break; + } +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: Feature: %d"), value); +#endif +} + +void WcApplySettings() { + TasAutoMutex localmutex(&WebcamMutex, "WcApplySettings", 200); + sensor_t * wc_s = esp_camera_sensor_get(); + if (!wc_s) { return; } + + wc_s->set_vflip(wc_s, Settings->webcam_config.flip); + wc_s->set_hmirror(wc_s, Settings->webcam_config.mirror); + + wc_s->set_brightness(wc_s, Settings->webcam_config.brightness - 2); + wc_s->set_saturation(wc_s, Settings->webcam_config.saturation - 2); + wc_s->set_contrast(wc_s, Settings->webcam_config.contrast - 2); + + wc_s->set_special_effect(wc_s, Settings->webcam_config2.special_effect); + + wc_s->set_whitebal(wc_s, Settings->webcam_config.awb); + wc_s->set_wb_mode(wc_s, Settings->webcam_config2.wb_mode); + wc_s->set_awb_gain(wc_s, Settings->webcam_config.awb_gain); + + wc_s->set_exposure_ctrl(wc_s, Settings->webcam_config.aec); + wc_s->set_aec_value(wc_s, Settings->webcam_config2.aec_value - 2); + wc_s->set_ae_level(wc_s, Settings->webcam_config2.ae_level); + wc_s->set_aec2(wc_s, Settings->webcam_config.aec2); + + wc_s->set_gain_ctrl(wc_s, Settings->webcam_config.agc); + wc_s->set_agc_gain(wc_s, Settings->webcam_config2.agc_gain); + wc_s->set_gainceiling(wc_s, (gainceiling_t)Settings->webcam_config2.gainceiling); + + wc_s->set_raw_gma(wc_s, Settings->webcam_config.raw_gma); + wc_s->set_lenc(wc_s, Settings->webcam_config.lenc); + wc_s->set_wpc(wc_s, Settings->webcam_config.wpc); + wc_s->set_dcw(wc_s, Settings->webcam_config.dcw); + wc_s->set_bpc(wc_s, Settings->webcam_config.bpc); + + WcFeature(Settings->webcam_config.feature); + + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: Settings updated")); +} + +void WcSetDefaults(uint32_t upgrade) { + if (!upgrade) { + Settings->webcam_config.flip = 0; + Settings->webcam_config.mirror = 0; + + Settings->webcam_config.saturation = 2; // = 0 + Settings->webcam_config.brightness = 2; // = 0 + Settings->webcam_config.contrast = 2; // = 0 + } + + Settings->webcam_config2.special_effect = 0; + Settings->webcam_config.colorbar = 0; + + Settings->webcam_config.awb = 1; // white balance + Settings->webcam_config2.wb_mode = 0; // white balance mode + Settings->webcam_config.awb_gain = 1; // white blance gain + + Settings->webcam_config.aec = 1; // autoexposure (sensor) + Settings->webcam_config.aec2 = 1; // autoexposure (dsp) + Settings->webcam_config2.ae_level = 2; // autoexposure level (-2 - +2, default 0) + Settings->webcam_config2.aec_value = 204; // manual exposure value + + Settings->webcam_config.agc = 1; // auto gain control + Settings->webcam_config2.agc_gain = 5; // manual gain control + Settings->webcam_config2.gainceiling = 0; // auto gain ceiling + + Settings->webcam_config.raw_gma = 1; // gamma correct + Settings->webcam_config.lenc = 1; // lens correction + Settings->webcam_config.wpc = 1; // white pixel correct + Settings->webcam_config.dcw = 1; // downsize en + Settings->webcam_config.bpc = 0; // black pixel correct? + + Settings->webcam_config.feature = 0; + + #ifdef USE_WEBCAM_MOTION + WcSetMotionDefaults(); + #endif + +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: Defaults set")); +#endif + if (Wc.up) { WcApplySettings(); } +} + +// deinit and power down camera +void WcCamOff() { + TasAutoMutex localmutex(&WebcamMutex, "WcCamOff", 30000); + // deinit camera + WcSetup(-1); + // kill any existing clients + WcEndStream(); +#ifdef ENABLE_RTSPSERVER + // kill any existing rtsp clients + WcEndRTSP(); +#endif + int pin_pwdn = -1; + if (PinUsed(GPIO_WEBCAM_PWDN)){ + pin_pwdn = Pin(GPIO_WEBCAM_PWDN); + } +/* else { + pin_pwdn = (gpio_num_t)Pin(PWDN_GPIO_NUM); + }*/ + if (pin_pwdn >= 0){ + gpio_config_t conf = { 0 }; + conf.pin_bit_mask = 1LL << pin_pwdn; + conf.mode = GPIO_MODE_OUTPUT; + gpio_config(&conf); + + // careful, logic is inverted compared to reset pin + gpio_set_level((gpio_num_t)pin_pwdn, 1); + vTaskDelay(10 / portTICK_PERIOD_MS); + } + Wc.lastCamError = 0x3; +} + +uint32_t WcSetup(int32_t fsiz) { + // we must stall until re-enabled + WcWaitEnable(); + + TasAutoMutex localmutex(&WebcamMutex, "WcSetup", 200); + +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: WcSetup")); +#endif + // if 15, make it -1, so disableing + if (fsiz >= FRAMESIZE_FHD) { fsiz = -1; } + + if (fsiz < 0) { + if (Wc.up){ + esp_camera_deinit(); + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: Deinit fsiz %d"), fsiz); + Wc.up = 0; + } + Wc.lastCamError = 0x1; + return 0; + } + + if (Wc.up) { + esp_camera_deinit(); +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: Deinit")); +#endif + //return Wc.up; + } + Wc.up = 0; + +//esp_log_level_set("*", ESP_LOG_VERBOSE); + + camera_config_t config; + + memset(&config, 0, sizeof(config)); + + if (WcPinUsed()) { + config.pin_d0 = Pin(GPIO_WEBCAM_DATA); // Y2_GPIO_NUM; + config.pin_d1 = Pin(GPIO_WEBCAM_DATA, 1); // Y3_GPIO_NUM; + config.pin_d2 = Pin(GPIO_WEBCAM_DATA, 2); // Y4_GPIO_NUM; + config.pin_d3 = Pin(GPIO_WEBCAM_DATA, 3); // Y5_GPIO_NUM; + config.pin_d4 = Pin(GPIO_WEBCAM_DATA, 4); // Y6_GPIO_NUM; + config.pin_d5 = Pin(GPIO_WEBCAM_DATA, 5); // Y7_GPIO_NUM; + config.pin_d6 = Pin(GPIO_WEBCAM_DATA, 6); // Y8_GPIO_NUM; + config.pin_d7 = Pin(GPIO_WEBCAM_DATA, 7); // Y9_GPIO_NUM; + config.pin_xclk = Pin(GPIO_WEBCAM_XCLK); // XCLK_GPIO_NUM; + config.pin_pclk = Pin(GPIO_WEBCAM_PCLK); // PCLK_GPIO_NUM; + config.pin_vsync = Pin(GPIO_WEBCAM_VSYNC); // VSYNC_GPIO_NUM; + config.pin_href = Pin(GPIO_WEBCAM_HREF); // HREF_GPIO_NUM; + config.pin_sccb_sda = Pin(GPIO_WEBCAM_SIOD); // SIOD_GPIO_NUM; - unset to use shared I2C bus 2 + config.pin_sccb_scl = Pin(GPIO_WEBCAM_SIOC); // SIOC_GPIO_NUM; + if(TasmotaGlobal.i2c_enabled_2){ // configure SIOD and SIOC as SDA,2 and SCL,2 + config.sccb_i2c_port = 1; // reuse initialized bus 2, can be shared now + if(config.pin_sccb_sda < 0){ // GPIO_WEBCAM_SIOD must not be set to really make it happen +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_INFO, PSTR("CAM: Use I2C bus2")); +#endif + } + } + config.pin_pwdn = Pin(GPIO_WEBCAM_PWDN); // PWDN_GPIO_NUM; + config.pin_reset = Pin(GPIO_WEBCAM_RESET); // RESET_GPIO_NUM; +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: Template pin config")); +#endif + } else if (Y2_GPIO_NUM != -1) { + // Modell is set in camera_pins.h + config.pin_d0 = Y2_GPIO_NUM; + config.pin_d1 = Y3_GPIO_NUM; + config.pin_d2 = Y4_GPIO_NUM; + config.pin_d3 = Y5_GPIO_NUM; + config.pin_d4 = Y6_GPIO_NUM; + config.pin_d5 = Y7_GPIO_NUM; + config.pin_d6 = Y8_GPIO_NUM; + config.pin_d7 = Y9_GPIO_NUM; + config.pin_xclk = XCLK_GPIO_NUM; + config.pin_pclk = PCLK_GPIO_NUM; + config.pin_vsync = VSYNC_GPIO_NUM; + config.pin_href = HREF_GPIO_NUM; + config.pin_sscb_sda = SIOD_GPIO_NUM; + config.pin_sscb_scl = SIOC_GPIO_NUM; + config.pin_pwdn = PWDN_GPIO_NUM; + config.pin_reset = RESET_GPIO_NUM; +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: Compile flag pin config")); +#endif + } else { + // no valid config found -> abort + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: No pin config")); + return 0; + } + + // always power cycle the camera + // this adds 400ms to start delay, but is worth it to solve random 0x105 + if (config.pin_pwdn >= 0){ + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: pwdn pin %d"), config.pin_pwdn); + // this is only done in driver first init + // so first run, we should configure as they do. + gpio_config_t conf = { 0 }; + conf.pin_bit_mask = 1LL << config.pin_pwdn; + conf.mode = GPIO_MODE_OUTPUT; + gpio_config(&conf); + + int power_delay = 200; + // if currently powered + if (!gpio_get_level((gpio_num_t)config.pin_pwdn)){ + // power off for 200ms + gpio_set_level((gpio_num_t)config.pin_pwdn, 1); + vTaskDelay(power_delay / portTICK_PERIOD_MS); + } + + // if camera currently powered off, power it up and wait for 200ms + // this is a trial to see if it reduces 0x105 + // - and it solves the 0x105 issue!!! + if (gpio_get_level((gpio_num_t)config.pin_pwdn)){ + gpio_set_level((gpio_num_t)config.pin_pwdn, 0); + vTaskDelay(power_delay / portTICK_PERIOD_MS); + } + } + +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, "CAM: get ledc channel"); +#endif + + int32_t ledc_channel = analogAttach(config.pin_xclk); + if (ledc_channel < 0) { +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_ERROR, "CAM: cannot allocated ledc channel, remove a PWM GPIO"); +#endif + } + config.ledc_channel = (ledc_channel_t) ledc_channel; +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG_MORE, "CAM: XCLK on GPIO %i using ledc channel %i", config.pin_xclk, config.ledc_channel); +#endif + config.ledc_timer = LEDC_TIMER_0; +// config.xclk_freq_hz = 20000000; + if (!Settings->webcam_clk) Settings->webcam_clk = 20; + config.xclk_freq_hz = Settings->webcam_clk * 1000000; + int pixFormat = PIXFORMAT_JPEG; +/* 2023-05-28 - AiThinker type cam module marked DM. + tried everything here, and it seems you cannot get anything other than JPEG. + even if it's set to another value at power on. + Maybe it will work with a different camera, or a board with a CAM_RESET line. +*/ + if (Wc.camPixelFormat) pixFormat = (Wc.camPixelFormat-1); + + config.pixel_format = (pixformat_t)pixFormat; + if (config.pixel_format != PIXFORMAT_JPEG){ +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_INFO, PSTR("CAM: Pixel format is %d, not JPEG"), config.pixel_format); +#endif + } + //; + //esp_log_level_set("*", ESP_LOG_INFO); + + // if PSRAM IC present, init with UXGA resolution and higher JPEG quality + // for larger pre-allocated frame buffer. + +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, "CAM: get psram"); +#endif + + Wc.psram = UsePSRAM(); + if (Wc.psram) { + config.frame_size = FRAMESIZE_UXGA; + config.jpeg_quality = 10; + config.fb_count = 2; +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: PSRAM found")); +#endif + } else { + config.frame_size = FRAMESIZE_VGA; + config.jpeg_quality = 12; + config.fb_count = 1; + config.fb_location = CAMERA_FB_IN_DRAM; + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: PSRAM not found")); + } + + + esp_err_t err; + // cannot hurt to retry... + for (int i = 0; i < 3; i++){ + err = esp_camera_init(&config); + if (err != ESP_OK) { + AddLog(LOG_LEVEL_INFO, PSTR("CAM: InitErr 0x%x try %d"), err, (i+1)); + esp_camera_deinit(); + if (err == 0x105 && (config.pin_pwdn >= 0)){ + // try a longer power off... and retry + // power off for 500ms + gpio_set_level((gpio_num_t)config.pin_pwdn, 1); + vTaskDelay(500 / portTICK_PERIOD_MS); + } + } else { + if (i){ + AddLog(LOG_LEVEL_INFO, PSTR("CAM: InitOK try %d"), (i+1)); + } + break; + } + } + + if (err != ESP_OK) { + AddLog(LOG_LEVEL_INFO, PSTR("CAM: InitErr 0x%x"), err); + Wc.lastCamError = err; + return 0; + } + +// AddLog(LOG_LEVEL_INFO, PSTR("CAM: heap check 2: %d"),ESP_getFreeHeap()); + + // drop down frame size for higher initial frame rate + sensor_t * wc_s = esp_camera_sensor_get(); + // seems config.frame_size has no effect? + // so this is where we set framesize.... + wc_s->set_framesize(wc_s, (framesize_t)fsiz); + + camera_fb_t *wc_fb = esp_camera_fb_get(); + if (!wc_fb) { + AddLog(LOG_LEVEL_INFO, PSTR("CAM: Init failed !frame on time")); + Wc.lastCamError = 2; + return 0; + } + Wc.width = wc_fb->width; + Wc.height = wc_fb->height; + esp_camera_fb_return(wc_fb); + + WcApplySettings(); + + camera_sensor_info_t *info = esp_camera_sensor_get_info(&wc_s->id); + + AddLog(LOG_LEVEL_INFO, PSTR("CAM: %s Initialized"), info->name); + Wc.up = 1; + if (Wc.psram) { Wc.up = 2; } + + Wc.frameIntervalsus = (uint32_t)(((float)nativeIntervals20ms[fsiz]/((float)Settings->webcam_clk/20.0))*1000.0); + WcStats.maxfps = (uint32_t)((float)1000000.0/(float)Wc.frameIntervalsus); + + Wc.lastCamError = ESP_OK; + return Wc.up; +} + +/*********************************************************************************************/ + +int32_t WcSetOptions(uint32_t sel, int32_t value) { + int32_t res = 0; + TasAutoMutex localmutex(&WebcamMutex, "WcSetOptions", 200); + + // don;t want sensor for this one. + switch (sel) { + case 24: + // frames to ignore between reads + if (value >= 0) { Wc.skipFrames = value; } + return value; + break; + case 25: + // pixelformat - native formats + 1, 0->jpeg + if (value >= 0) { Wc.camPixelFormat = value; } + if (Wc.up){ + WcSetup(Settings->webcam_config.resolution); + } + return value; + break; + } + + sensor_t *s = esp_camera_sensor_get(); + if (!s) { return -99; } + + switch (sel) { + case 0: + if (value >= 0) { s->set_framesize(s, (framesize_t)value); } + res = s->status.framesize; + Wc.width = 0; + Wc.height = 0; + Wc.last_frame_len = 0; + Wc.frameIntervalsus = (uint32_t)(((float)nativeIntervals20ms[value]/((float)Settings->webcam_clk/20.0))*1000.0); + WcStats.maxfps = (uint32_t)((float)1000000.0/(float)Wc.frameIntervalsus); + + // WcFeature is lost on resolution change + WcApplySettings(); + break; + case 1: + if (value >= 0) { s->set_special_effect(s, value); } + res = s->status.special_effect; + break; + case 2: + if (value >= 0) { s->set_vflip(s, value); } + res = s->status.vflip; + break; + case 3: + if (value >= 0) { s->set_hmirror(s, value); } + res = s->status.hmirror; + break; + case 4: + if (value >= -4) { s->set_contrast(s, value); } + res = s->status.contrast; + break; + case 5: + if (value >= -4) { s->set_brightness(s, value); } + res = s->status.brightness; + break; + case 6: + if (value >= -4) { s->set_saturation(s,value); } + res = s->status.saturation; + break; + case 7: + if (value >= 0) { s->set_whitebal(s, value); } + res = s->status.awb; + break; + case 8: + if (value >= 0) { s->set_wb_mode(s, value); } + res = s->status.wb_mode; + break; + case 9: + if (value >= 0) { s->set_awb_gain(s, value); } + res = s->status.awb_gain; + break; + case 10: + if (value >= 0) { s->set_exposure_ctrl(s, value); } + res = s->status.aec; + break; + case 11: + if (value >= 0) { s->set_aec_value(s, value); } + res = s->status.aec_value; + break; + case 12: + if (value >= 0) { s->set_ae_level(s, value); } + res = s->status.ae_level; + break; + case 13: + if (value >= 0) { s->set_aec2(s, value); } + res = s->status.aec2; + break; + case 14: + if (value >= 0) { s->set_gain_ctrl(s, value); } + res = s->status.agc; + break; + case 15: + if (value >= 0) { s->set_agc_gain(s, value); } + res = s->status.agc_gain; + break; + case 16: + if (value >= 0) { s->set_gainceiling(s, (gainceiling_t)value); } + res = s->status.gainceiling; + break; + case 17: + if (value >= 0) { s->set_raw_gma(s, value); } + res = s->status.raw_gma; + break; + case 18: + if (value >= 0) { s->set_lenc(s, value); } + res = s->status.lenc; + break; + case 19: + if (value >= 0) { s->set_wpc(s, value); } + res = s->status.wpc; + break; + case 20: + if (value >= 0) { s->set_dcw(s, value); } + res = s->status.dcw; + break; + case 21: + // blackpixelcontrol + if (value >= 0) { s->set_bpc(s, value); } + res = s->status.bpc; + break; + case 22: + if (value >= 0) { s->set_colorbar(s, value); } + res = s->status.colorbar; + break; + case 23: + if (value >= 0) { WcFeature(value); } + break; + } + + return res; +} + +// wait for a frame to be read, if thread is running +void WcWaitFrame(int maxtime_ms) { + if (!Wc.taskRunning) return; + // force a wait for a read + WcWaitZero(&Wc.taskTakePic, -1, maxtime_ms); +} + +uint32_t WcGetWidth(void) { + if (Wc.taskRunning){ + if (!Wc.width){ + WcWaitFrame(1000); + } + } + return Wc.width; +} + +uint32_t WcGetHeight(void) { + if (Wc.taskRunning){ + if (!Wc.width){ + WcWaitFrame(1000); + } + } + return Wc.width; +} + +/*********************************************************************************************/ + + +uint32_t WcGetPicstore(int32_t num, uint8_t **buff) { + if (num<0) { return MAX_PICSTORE; } + *buff = Wc.picstore[num].buff; + return Wc.picstore[num].len; +} +uint32_t WcGetPicstorePtr(int32_t num, struct PICSTORE **p) { + if (num < 0) { + *p = nullptr; + return MAX_PICSTORE; + } + if (num >= MAX_PICSTORE) { + *p = nullptr; + return MAX_PICSTORE; + } + *p = &Wc.picstore[num]; + return Wc.picstore[num].len; +} + + +uint32_t WcGetFrame(int32_t bnum) { + if (bnum < 0) { + if (bnum < -MAX_PICSTORE) { bnum=-1; } + bnum = -bnum; + // check before decrement + if (bnum == Wc.lastBnum){ + Wc.lastBnum = 0; + } + bnum--; + TasAutoMutex localmutex(&WebcamMutex, "WcGetFrame", 200); + if (Wc.picstore[bnum].buff) { free(Wc.picstore[bnum].buff); } + memset(&Wc.picstore[bnum], 0, sizeof(Wc.picstore[bnum])); + Wc.picstore[bnum].len = 0; + return 0; + } + + if (!bnum) { + // used to be used to trigger read a frame to get width/height + // can still get here via scripts + return 0; + } + + if (Wc.taskRunning){ + WcWaitZero(&Wc.taskGetFrame, bnum, 1000); + return Wc.picstore[bnum - 1].len; + } + return 0; +} + + + + +//////////////// Handle authentication ///////////////// + + +bool WebcamAuthenticate(void) +{ + if (strlen(SettingsText(SET_WEBPWD)) && (HTTP_MANAGER_RESET_ONLY != Web.state)) { + return Wc.CamServer->authenticate(WEB_USERNAME, SettingsText(SET_WEBPWD)); + } else { + return true; + } +} + +bool WebcamCheckPriviledgedAccess(bool autorequestauth = true) +{ + if(Settings->webcam_config2.auth == 0){ + return true; + } + if (autorequestauth && !WebcamAuthenticate()) { + Wc.CamServer->requestAuthentication(); + return false; + } + return true; +} + +/////////////////////////////////////////////////// + +void HandleImage(void) { + if (!HttpCheckPriviledgedAccess()) { return; } + + uint32_t bnum = Webserver->arg(F("p")).toInt(); + if ((bnum < 0) || (bnum > MAX_PICSTORE)) { bnum= 1; } + int format = (int)PIXFORMAT_JPEG; + + if (bnum){ + // no picture present at this index + if (!Wc.picstore[bnum-1].buff){ + Webserver->send(404,"",""); + return; + } + format = (int)Wc.picstore[bnum-1].format; + } + + String response = "HTTP/1.1 200 OK\r\n"; + response += "Content-disposition: inline; filename=cap."; + if(format == (int)PIXFORMAT_JPEG){ + response += "jpg\r\nContent-type: image/jpeg\r\n"; + } else { + response += "bin\r\nContent-type: image/x-tas-binary\r\n"; + } + response += "Content-Length: "; + char tmp[12]; + + if (!bnum) { + if (Wc.taskRunning == 1){ + WcWaitZero(&Wc.taskTakePic, 1, 1000); + TasAutoMutex localmutex(&WebcamMutex, "HandleImage", 200); + if (Wc.snapshotStore.len) { + response += itoa(Wc.snapshotStore.len, tmp, 10); + response += "\r\n\r\n"; + + WiFiClient client = Webserver->client(); + Webserver->sendContent(response); + client.write((char *)Wc.snapshotStore.buff, Wc.snapshotStore.len); + client.stop(); + pic_free(&Wc.snapshotStore); + } else { + Webserver->send(404,"",""); + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: No img #: %d"), bnum); + return; + } + } else { + Webserver->send(404,"",""); + return; + } + } else { + TasAutoMutex localmutex(&WebcamMutex, "HandleImage", 200); + bnum--; + if (!Wc.picstore[bnum].len) { + Webserver->send(404,"",""); + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: No img #: %d"), bnum); + return; + } + response += itoa(Wc.picstore[bnum].len, tmp, 10); + response += "\r\n\r\n"; + WiFiClient client = Webserver->client(); + Webserver->sendContent(response); + client.write((char *)Wc.picstore[bnum].buff, Wc.picstore[bnum].len); + client.stop(); + } + +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("CAM: Sending image #: %d"), bnum+1); +#endif +} + +void HandleImageAny(struct PICSTORE *ps){ + if (!HttpCheckPriviledgedAccess()) { return; } + + if (!ps || !ps->buff) { + AddLog(LOG_LEVEL_ERROR, PSTR("CAM: img pres")); + Webserver->send(404,"",""); + return; + } + // convert mono to rgb8 + + size_t _jpg_buf_len = 0; + uint8_t * _jpg_buf = NULL; + // use a malloc that we don't free to save memory creep + // it is re-mallcoed if the frame does not fit. + bool conv = false; + + // allocate a new picture every time to avoid holding up task thread by using OurOneJpeg + struct PICSTORE psout = {0}; + + if (ps->format != PIXFORMAT_JPEG) { +#ifdef USE_WEBCAM_MOTION + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: image will be encoded from %d"), ps->format); + + TasAutoMutex localmutex(&WebcamMutex, "HandleImagemotion", 2000); + // use a malloc that we don't free to save memory creep + // it is re-mallcoed if the frame does not fit. + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: %x %d %d %d"), ps->buff, ps->len, ps->width, ps->height); + conv = WcencodeToJpeg(ps->buff, ps->len, ps->width, ps->height, (int)ps->format, 80, &psout); + if (!conv) AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: image encode failed")); + + _jpg_buf_len = psout.len; + _jpg_buf = psout.buff; + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: encoded %X %d (%dx%d) -> %X %d (%d)"), + ps->buff, ps->len, ps->width, ps->height, + _jpg_buf, _jpg_buf_len, + psout.allocatedLen + ); +#endif + } else { + _jpg_buf_len = ps->len; + _jpg_buf = ps->buff; +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: already jpeg %X %d (%dx%d) (%d)"), + ps->buff, ps->len, ps->width, ps->height, + ps->allocatedLen + ); +#endif + } + + if (_jpg_buf_len){ + WiFiClient client = Webserver->client(); + String response = "HTTP/1.1 200 OK\r\n"; + response += "Content-disposition: inline; filename=cap.jpg\r\n"; + response += "Content-type: image/jpeg\r\n\r\n"; + Webserver->sendContent(response); + client.write((char *)_jpg_buf, _jpg_buf_len); + client.stop(); + if (conv){ + pic_free(&psout); + } + return; // don't send 500 + } + +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: image could not be encoded")); +#endif + if (conv){ + pic_free(&psout); + } + Webserver->send(500,"",""); + return; +} + + + +void HandleWebcamMjpeg(void) { + HandleWebcamMjpegFn(0); +} + +void HandleWebcamMjpegDiff(void) { + HandleWebcamMjpegFn(1); +} + +void HandleWebcamMjpegFn(int type) { + if(!WebcamCheckPriviledgedAccess()){ + Wc.CamServer->send(403,"",""); + return; + } + TasAutoMutex localmutex(&WebcamMutex, "HandleWebcamMjpeg", 200); + wc_client *client = new wc_client; + client->active = 1; + client->type = type; + client->p_next = Wc.client_p; + client->client = Wc.CamServer->client(); + Wc.client_p = client; +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: Create client")); +#endif +} + +void HandleWebcamRoot(void) { + if(!WebcamCheckPriviledgedAccess()){ + Wc.CamServer->send(403,"",""); + return; + } + //CamServer->redirect("http://" + String(ip) + ":81/cam.mjpeg"); + Wc.CamServer->sendHeader("Location", "/cam.mjpeg"); + Wc.CamServer->send(302, "", ""); +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: Root called")); +#endif +} + +/*********************************************************************************************/ + +uint32_t WcSetStreamserver(uint32_t flag) { + if (TasmotaGlobal.global_state.network_down) { + WcEndStream(); + return 0; + } + + if (flag) { + if (!Wc.CamServer) { + TasAutoMutex localmutex(&WebcamMutex, "HandleWebcamMjpeg", 20000); + Wc.CamServer = new ESP8266WebServer(81); + Wc.CamServer->on("/", HandleWebcamRoot); + Wc.CamServer->on("/diff.mjpeg", HandleWebcamMjpegDiff); + Wc.CamServer->on("/cam.mjpeg", HandleWebcamMjpeg); + Wc.CamServer->on("/cam.jpg", HandleWebcamMjpeg); + Wc.CamServer->on("/stream", HandleWebcamMjpeg); + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: Strm init")); + Wc.CamServer->begin(); + } + } else { + if (Wc.CamServer) { + TasAutoMutex localmutex(&WebcamMutex, "HandleWebcamMjpeg", 20000); + WcEndStream(); + Wc.CamServer->stop(); + delete Wc.CamServer; + Wc.CamServer = NULL; + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: Strm exit")); + } + } + return 0; +} + + +/*********************************************************************************************/ + +#define WEBCAM_CORE 0 + +static void WCOperationTask(void *pvParameters); +static void WCStartOperationTask(){ + if (Wc.taskRunning == 0){ +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG,PSTR("CAM: Start operations")); +#endif + + xTaskCreatePinnedToCore( + WCOperationTask, /* Function to implement the task */ + "WCOperationTask", /* Name of the task */ + 8192, /* Stack size in bytes */ + NULL, /* Task input parameter */ + 0, /* Priority of the task */ + &Wc.taskHandle, /* Task handle. */ +#ifdef CONFIG_FREERTOS_UNICORE + 0); /* Core where the task should run */ +#else + WEBCAM_CORE); /* Core where the task should run */ +#endif + // wait for task to start + int loops = 10; + while(!Wc.taskRunning && loops--){ + vTaskDelay(10/ portTICK_PERIOD_MS); + } + } +} + + +// this IS as task. +// used to disconnect webcam frame read from tas loop +static void WCOperationTask(void *pvParameters){ + unsigned long loopcount = 0; + +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG,PSTR("CAM: WCOperationTask: Start task")); +#endif + int framecount = 0; + unsigned long laststatmillis = millis(); + bool jpeg_converted = false; + uint32_t processing_total = 0; + uint64_t last_camtime = 0; + Wc.taskRunning = 1; + WcStats.framesTotal = 0; + WcStats.framesLost = 0; + + int32_t skipsWanted = Wc.skipFrames; + + + // we set to Wc.taskRunning 2 to stop the task + while (Wc.taskRunning == 1){ + loopcount++; + uint32_t thismillis = millis(); + uint32_t statdur = thismillis - laststatmillis; + + // storage and settings disable cam. + // we must stall until re-enabled + // it asserts the mutex whilst stopping the cam, so it can't stop it mid-processing + WcWaitEnable(); + // if camera is configured and working + { // closure for auto mutex + // note that this mutex can block the loop for a long time - + // e.g. if motion detect on a full big frame, up to a second + TasAutoMutex localmutex(&WebcamMutex, "WebcamMjpeg", 30000); + + // only do anything if cam us up, and cam has not remained stopped + if (Wc.up && !Wc.disable_cam) { + size_t _jpg_buf_len = 0; + uint8_t * _jpg_buf = NULL; + + // read a frame buffer pointer. this will block until a frame is available + camera_fb_t *wc_fb = esp_camera_fb_get(); + + if (!wc_fb) { + // add framecount so we show this right away if we were showing frames. + if (!(loopcount % 100) || (statdur > 5000) || framecount){ + AddLog(LOG_LEVEL_DEBUG,PSTR("CAM: Frame fail")), + laststatmillis = thismillis; + framecount = 0; + } + WcStats.camfail++; + // if camera up, but just can't get a frame right now + vTaskDelay(10/ portTICK_PERIOD_MS); + } else { + framecount++; + uint32_t now = millis(); + uint64_t camtime = wc_fb->timestamp.tv_sec; + camtime = camtime * 1000000; + camtime += wc_fb->timestamp.tv_usec; + + if (!skipsWanted) skipsWanted = Wc.skipFrames; + + if (last_camtime){ + uint32_t camdiff = camtime - last_camtime; + // this is an accurate indication of framerate, but also frame skip + Wc.camtimediff = camdiff; + int framesPassed = round(((float)camdiff)/(float)(Wc.frameIntervalsus)); + if (framesPassed){ + WcStats.framesTotal += framesPassed; + WcStats.framesLost += (framesPassed - 1); + if (skipsWanted > 0){ + skipsWanted -= (framesPassed - 1); + } + if (skipsWanted > 0) skipsWanted --; + } else { +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG,PSTR("CAM: Duplicate time in frame? diff %d intv %d"), camdiff, Wc.frameIntervalsus); +#endif + } + } + last_camtime = camtime; + + // every 100 frames or 5s + if (!(loopcount % 100) || (statdur > 5000)){ + float framespersec = ((float)framecount)/(((float)(thismillis - laststatmillis))/1000.0); + AddLog(LOG_LEVEL_DEBUG,PSTR("CAM: avFPS %f %s FS:%d(%d) f:%u s:%u"), + framespersec, + jpeg_converted?"raw":"jpg", + wc_fb->len, + Wc.lenDiff, + WcStats.framesTotal, + WcStats.framesLost + ); + WcStats.avgProcessingPerFrameMS = processing_total/framecount; + WcStats.avgFPS = framespersec; + WcStats.avgFrameMS = (uint8_t) (1000/framespersec); + processing_total = 0; + laststatmillis = thismillis; + framecount = 0; + } + + // we got a frame + Wc.width = wc_fb->width; + Wc.height = wc_fb->height; + WcStats.camcnt++; + + // if we want to process this frame. + // skipsWanted is the counter used for Wc.skipFrames use + if (skipsWanted <= 0) skipsWanted = 0; + if (!skipsWanted){ +#ifdef USE_WEBCAM_MOTION + int detectMotion = 0; + // if we want simple mootion detect, + if (wc_motion.motion_detect){ + if ((now - wc_motion.motion_ltime) > wc_motion.motion_detect) { + wc_motion.motion_ltime = now; + detectMotion = 1; + } + } +#endif + // if we need a frame for web stream or rtsp + if (Wc.client_p // pointer to first + #ifdef ENABLE_RTSPSERVER + || Wc.rtspclient // pointer to first + #endif + || Wc.taskGetFrame // get one frame - from scripts + || Wc.taskTakePic // get one frame - from scripts +#ifdef USE_WEBCAM_MOTION + || detectMotion +#endif + ) { + + // most cameras will supply as jpeg? it's what we ask for... + jpeg_converted = false; + bool free_jpeg = false; + /* 2023-05-28 - AiThinker type cam module marked DM. + Note: I tried everything to get pixels ina different form, but faiiled. + So this code has NEVER run for me in anger directly off cam data. + */ + + if (wc_fb->format != PIXFORMAT_JPEG) { +#ifdef USE_WEBCAM_MOTION + // note - don't free the jpeg, we re-use it. + jpeg_converted = WcencodeToJpeg(wc_fb->buf, wc_fb->len, wc_fb->width, wc_fb->height, (int)wc_fb->format, 80, &VideoJpeg); + _jpg_buf_len = VideoJpeg.len; + _jpg_buf = VideoJpeg.buff; + + // this function is incredibly expensive - always allocates 128kbytes + //jpeg_converted = frame2jpg(wc_fb, 80, &_jpg_buf, &_jpg_buf_len); + // free_jpeg = true; // if using frame2jpg, we must free +#endif + if (!jpeg_converted){ +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: JPEG compression failed")); +#endif + WcStats.jpegfail++; + } + } else { + _jpg_buf_len = wc_fb->len; + _jpg_buf = wc_fb->buf; + } + + if (_jpg_buf){ + int jpeg_len_diff = abs((int)Wc.last_frame_len - (int)_jpg_buf_len); + int jpeg_len_diff_percent = 100*jpeg_len_diff/_jpg_buf_len; + Wc.lenDiff = jpeg_len_diff_percent; + if (Wc.lenDiffLimit && (Wc.lenDiffLimit < jpeg_len_diff_percent)){ + Wc.lenDiffTrigger = 1; + Wc.lenDiffTriggered = jpeg_len_diff_percent; + } + + Wc.last_frame_len = _jpg_buf_len; + // we use -1 to just detect that Wc.width/height should have been set + if (Wc.taskTakePic){ + if (Wc.taskTakePic > 0){ + if (pic_alloc(&Wc.snapshotStore, 0, 0, _jpg_buf_len, PIXFORMAT_JPEG, 1)){ + memcpy(Wc.snapshotStore.buff, _jpg_buf, _jpg_buf_len); + } + } + Wc.taskTakePic = 0; + } + + // request to store the frame into picstore + if (Wc.taskGetFrame){ + int bnum = Wc.taskGetFrame; + if ((bnum < 1) || (bnum > MAX_PICSTORE)) { bnum = 1; } + bnum--; + if (Wc.picstore[bnum].buff) { free(Wc.picstore[bnum].buff); } + memset(&Wc.picstore[bnum], 0, sizeof(Wc.picstore[bnum])); + Wc.picstore[bnum].buff = (uint8_t *)heap_caps_aligned_alloc(4, _jpg_buf_len+4, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT); + if (Wc.picstore[bnum].buff) { + memcpy(Wc.picstore[bnum].buff, _jpg_buf, _jpg_buf_len); + Wc.picstore[bnum].len = _jpg_buf_len; + Wc.lastBnum = bnum + 1; + Wc.picstore[bnum].format = (int8_t)PIXFORMAT_JPEG; + Wc.picstore[bnum].width = Wc.width; + Wc.picstore[bnum].height = Wc.height; + +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: Got frame %d"), Wc.lastBnum); +#endif + } else { +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: Can't allocate picstore")); +#endif + } + Wc.taskGetFrame = 0; + } + +#ifdef USE_WEBCAM_MOTION + // if motion detect triggered by timer + if (detectMotion){ + WcDetectMotionFn(_jpg_buf, _jpg_buf_len); + } +#endif + // if http streaming is active, we will have one or more clients + wc_client *client = Wc.client_p; + // iterate over clients + uint8_t webclientcount = 0; +#ifdef USE_WEBCAM_MOTION + size_t diff_jpg_buf_len = 0; + uint8_t *diff_jpg_buf = NULL; +#endif + while(client){ + if (client->active){ + uint32_t client_start = millis(); + + if (!client->client.connected()){ +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: Client fail")); +#endif + client->active = 0; + WcStats.clientfail++; + } + if (1 == client->active) { + client->client.flush(); + client->client.setTimeout(3); +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: Start stream")); +#endif + client->client.print("HTTP/1.1 200 OK\r\n" + "Content-Type: multipart/x-mixed-replace;boundary=" BOUNDARY "\r\n" + "\r\n"); + client->active = 2; + } + + if (2 == client->active) { + int type = client->type; + uint8_t *src = _jpg_buf; + int len = _jpg_buf_len; + +#ifdef USE_WEBCAM_MOTION + // if this client wants motion images + if (type == 1){ + // if we already coded to jpeg for another client + if (diff_jpg_buf){ + src = diff_jpg_buf; + len = diff_jpg_buf_len; + } else { + src = nullptr; + // only for frames where motion is being detected, + // e.g. once per sec + if (detectMotion){ + struct PICSTORE *ps = nullptr; + // by default, we send the diff buffer if present + if (wc_motion.diff && wc_motion.diff->buff){ + ps = wc_motion.diff; + } + if (!ps){ + // else we send the motion buffer (mono of video, but slower) + if (wc_motion.last_motion && wc_motion.last_motion->buff){ + ps = wc_motion.last_motion; + } + } + if (ps){ + // use a malloc that we don't free to save memory creep + // it is re-mallcoed if the frame does not fit. + bool conv = WcencodeToJpeg(ps->buff, ps->len, ps->width, ps->height, (int)ps->format, 80, &OurOneJpeg); + + diff_jpg_buf_len = OurOneJpeg.len; + diff_jpg_buf = OurOneJpeg.buff; + + if (conv && diff_jpg_buf_len){ + src = diff_jpg_buf; + len = diff_jpg_buf_len; + } + } + } + } + } +#endif + + if (src){ + client->client.printf( + "--" BOUNDARY "\r\n" + "Content-Type: image/jpeg\r\n" + "Content-Length: %d\r\n" + "\r\n", static_cast(len)); + uint32_t tlen = client->client.write(src, len); + client->client.print("\r\n"); + } + } + uint32_t client_end = millis(); + // if it took more than 20s to send to the client, then kill it. + // this was observed on wifi rescan + if (client_end - client_start > 20000){ + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: Cl timeout on send")); + WcStats.clientfail++; + client->client.stop(); + client->active = 0; + } + } + client = client->p_next; + webclientcount++; + } + // if we allocates a jppeg image for motion, free now + // NO!!! This is now a long-lived buffer!!! + //if (diff_jpg_buf) free(diff_jpg_buf); + WcStats.webclientcount = webclientcount; + + #ifdef ENABLE_RTSPSERVER + // if rtsp is active, we will have one or more clients + volatile wc_rtspclient *rtspclient = Wc.rtspclient; + uint8_t rtspclientcount = 0; + while (rtspclient) { + if (rtspclient->camStreamer && rtspclient->rtsp_session){ + rtspclient->camStreamer->setframe(_jpg_buf, _jpg_buf_len); + rtspclient->rtsp_session->broadcastCurrentFrame(now); + rtspclient->camStreamer->clearframe(); + } + rtspclient = rtspclient->p_next; + rtspclientcount++; + } + WcStats.rtspclientcount = rtspclientcount; + #endif + + // free jpeg frame if we created it + if (free_jpeg) { free(_jpg_buf); } + + // could trigger info to berry every fraem, if configured + Wc.frame_processed = 1; + + uint32_t processingend = millis(); + uint32_t processingdur = processingend - now; + processing_total += processingdur; + } else { + Wc.last_frame_len = 0; + } + } + } + + // free resources and return frame buffer for re-use AFTER we have used the data + esp_camera_fb_return(wc_fb); + } + } else { + if (Wc.up){ + // if camera up, but just can't get a frame right now because + // else we may conflict with files or settings store, delay just a shorter time + vTaskDelay(10/ portTICK_PERIOD_MS); + } else { + // be sure to clear this if camera is not running, else we could wait forever + // when asking for a frame + Wc.taskGetFrame = 0; + // come around every 1/10s if not serving pictures + vTaskDelay(100/ portTICK_PERIOD_MS); + } + } + } + } + + // this log sometimes causes guru mediation error. Maybe because + // temp storage is removed before it is serviced? + AddLog(LOG_LEVEL_DEBUG,PSTR("CAM: Left task")); + Wc.taskRunning = 0; + + // wait 1/2 second for log to be done? + vTaskDelay(500/ portTICK_PERIOD_MS); + + vTaskDelete( NULL ); +} + +void WcRemoveDeadCients(){ + // iterate over clients removing dead ones + wc_client *client = Wc.client_p; + wc_client **prev = &Wc.client_p; + while(client){ + if (!client->active){ + // just in case... + TasAutoMutex localmutex(&WebcamMutex, "WcLoop", 200); + *prev = client->p_next; + client->client.stop(); + wc_client *next = client->p_next; + delete client; + client = next; + } else { + prev = &client->p_next; + client = client->p_next; + } + } +} + + +void WcLoop(void) { + Wc.loopcounter++; + { // closure for automutex + // we don't need one here + //TasAutoMutex localmutex(&WebcamMutex, "WcLoop", 200); + +#ifdef USE_WEBCAM_MOTION + // if wc_motion.motion_trigger > wc_motion.motion_triggerlimit + // set wc_motion.motion_triggerlimit low if you want every time it's processed + // NOTE: there is no 'retrigger hold off' time. + if (wc_motion.motion_triggered){ +#ifdef USE_BERRY + char t[80]; + snprintf(t, (size_t)39, "{\"val\":%d,\"bri\":%d,\"pix\":%d}", wc_motion.motion_trigger, wc_motion.motion_brightness, wc_motion.changedPixelPertenthousand); + callBerryEventDispatcher("webcam", "motion", 0, t, strlen(t)); +#endif +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: Motion Triggered")); +#endif + WcMotionLog(); + wc_motion.motion_triggered = 0; + } +#endif + if (Wc.lenDiffTrigger){ +#ifdef USE_BERRY + char t[40]; + snprintf(t, (size_t)39, "{\"diff\":%d}", Wc.lenDiffTriggered); + callBerryEventDispatcher("webcam", "framesizechange", 0, t, strlen(t)); +#endif +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: Framesize Change > %d = %d"), Wc.lenDiffLimit, Wc.lenDiffTriggered); +#endif + Wc.lenDiffTrigger = 0; +#ifdef USE_WEBCAM_MOTION + WcMotionLog(); +#endif + } + + if (Wc.frame_processed){ +#ifdef USE_BERRY + if (Wc.berryFrames){ + char t[80]; + snprintf(t, (size_t)39, "{\"len\":%d}", Wc.last_frame_len); + callBerryEventDispatcher("webcam", "frame", 0, t, strlen(t)); + } +#endif + Wc.frame_processed = 0; + } + } // end closure for automutex + + if (Wc.CamServer) { + // pretty sure this would be safe + //TasAutoMutex localmutex(&WebcamMutex, "WcLoop", 200); + Wc.CamServer->handleClient(); + WcRemoveDeadCients(); + } + +#ifdef ENABLE_RTSPSERVER + if (Settings->webcam_config.rtsp){ + if (!TasmotaGlobal.global_state.wifi_down) { + // pretty sure we don;t need the mutex here + TasAutoMutex localmutex(&WebcamMutex, "WcLoop2", 30000); + if (!Wc.rtspp) { + Wc.rtspp = new WiFiServer(8554); + Wc.rtspp->begin(); + AddLog(LOG_LEVEL_INFO, PSTR("CAM: RTSP init")); + } + + wc_rtspclient * volatile rtspclient = Wc.rtspclient; + wc_rtspclient * volatile * prev = &Wc.rtspclient; + uint8_t rtspclientcount = 0; + while (rtspclient) { + bool removed = false; + if (rtspclient->rtsp_session){ + rtspclient->rtsp_session->handleRequests(0); + // if a client has stopped, remove it. + if (rtspclient->rtsp_session->m_stopped){ + delete rtspclient->rtsp_session; + rtspclient->rtsp_session = nullptr; + delete rtspclient->camStreamer; + rtspclient->camStreamer = nullptr; + //rtspclient->rtsp_client.stop(); + *prev = rtspclient->p_next; + wc_rtspclient *next = rtspclient->p_next; + delete rtspclient; + rtspclient = next; + AddLog(LOG_LEVEL_INFO, PSTR("CAM: RTSP stop")); + removed = true; + } + } + if (!removed){ + rtspclientcount++; + prev = &rtspclient->p_next; + rtspclient = rtspclient->p_next; + } + } + WcStats.rtspclientcount = rtspclientcount; + + // accept new rtsp clients + WiFiClient rtsp_client = Wc.rtspp->accept(); + if (rtsp_client) { + wc_rtspclient *client = new wc_rtspclient; + client->p_next = Wc.rtspclient; + client->rtsp_client = rtsp_client; + client->camStreamer = new localOV2640Streamer(&client->rtsp_client, Wc.width, Wc.height); + client->rtsp_session = new CRtspSession(&client->rtsp_client, client->camStreamer); // our threads RTSP session and state + AddLog(LOG_LEVEL_INFO, PSTR("CAM: RTSP str")); + Wc.rtspclient = client; + WcStats.rtspclientcount++; + } + } else { + // rtsp not enabled + if (Wc.rtspp){ + // if running, stop cleanly. + // stop all clients + WcEndRTSP(); + delete Wc.rtspp; + Wc.rtspp = nullptr; + } + } + } +#endif // ENABLE_RTSPSERVER +} + +#ifdef ENABLE_RTSPSERVER + +// kill all rtsp clients +void WcEndRTSP(){ + // we should use a mutext here, in case we are currently sending + TasAutoMutex localmutex(&WebcamMutex, "WcEndRTSP", 2000); + wc_rtspclient * volatile rtspclient = Wc.rtspclient; + wc_rtspclient * volatile * prev = &Wc.rtspclient; + while (rtspclient) { + delete rtspclient->rtsp_session; + rtspclient->rtsp_session = nullptr; + delete rtspclient->camStreamer; + rtspclient->camStreamer = nullptr; + //rtspclient->rtsp_client.stop(); + wc_rtspclient *next = rtspclient->p_next; + delete rtspclient; + rtspclient = next; + AddLog(LOG_LEVEL_INFO, PSTR("CAM: RTSP stop")); + } + Wc.rtspclient = nullptr; + WcStats.rtspclientcount = 0; +} +#endif + +// kill all http streaming clients +void WcEndStream(){ + // we should use a mutext here, in case we are currently sending + TasAutoMutex localmutex(&WebcamMutex, "WcLoop2", 20000); + // if http streaming is active + wc_client *client = Wc.client_p; + // iterate over clients + while(client){ + client->active = 0; + if (client->client){ + client->client.stop(); + } + client = client->p_next; + } + WcRemoveDeadCients(); +} + + +void WcPicSetup(void) { + WebServer_on(PSTR("/wc.jpg"), HandleImage); + WebServer_on(PSTR("/wc.mjpeg"), HandleImage); + WebServer_on(PSTR("/snapshot.jpg"), HandleImage); +#ifdef USE_WEBCAM_MOTION + WebServer_on(PSTR("/motiondiff.jpg"), HandleImagemotiondiff); + WebServer_on(PSTR("/motionmask.jpg"), HandleImagemotionmask); + WebServer_on(PSTR("/motionbuff.jpg"), HandleImagemotionbuff); + WebServer_on(PSTR("/motionlbuff.jpg"), HandleImagemotionlbuff); + WebServer_on(PSTR("/motionbackgroundbuff.jpg"), HandleImagemotionbackgroundbuff); +#endif +} + + +const char HTTP_WEBCAM_MENUVIDEOCONTROL[] PROGMEM = "

"; + +void WcShowStream(void) { + // if streaming is enabled (1 or 2), start stream server + if (Settings->webcam_config.stream) { +// if (!Wc.CamServer || !Wc.up) { + if (!Wc.CamServer) { + WcSetStreamserver(Settings->webcam_config.stream); + } + } + + if (!Wc.CamServer){ + WSContentSend_P(PSTR("

Cam Server Not Running'

")); + WSContentSend_P(HTTP_WEBCAM_MENUVIDEOCONTROL, "wcstream2", "Turn On Streaming"); + } else { + if (!Wc.up){ + WSContentSend_P(PSTR("

Cam Not Running Err 0x%x

"), Wc.lastCamError); + WSContentSend_P(HTTP_WEBCAM_MENUVIDEOCONTROL, "wcinit", "Try WCINIT"); + } else { + if (Settings->webcam_config.spare15) { + WSContentSend_P(HTTP_WEBCAM_MENUVIDEOCONTROL, "wcmenuvideoon", "Turn On Video"); + } + } + } + + // spare15 is 'hide cam on menu' + if (!Settings->webcam_config.spare15 && Settings->webcam_config.stream && Wc.CamServer && Wc.up!=0) { + // Give the webcam webserver some time to prepare the stream - catch error in JS + WSContentSend_P(PSTR("

Webcam stream

"),(uint32_t)WiFi.localIP()); + WSContentSend_P(HTTP_WEBCAM_MENUVIDEOCONTROL, "wcmenuvideooff", "Turn Off Video"); + } +} + +void WcInit(void) { + // .data is in union with the rest of the settings, so + // this means 'i have no config' + if (!Settings->webcam_config.data) { + // set defaults... + Settings->webcam_config.stream = 1; + Settings->webcam_config.resolution = FRAMESIZE_QVGA; + WcSetDefaults(0); + } + // previous webcam driver had only a small subset of possible config vars + // in this case we have to only set the new variables to default values + if(!Settings->webcam_config2.upgraded) { + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: Upg settings")); + WcSetDefaults(1); + Settings->webcam_config2.upgraded = 1; + } +} + +/*********************************************************************************************\ + * Commands +\*********************************************************************************************/ + +#define D_PRFX_WEBCAM "WC" +#define D_CMND_WC_STREAM "Stream" +#define D_CMND_WC_RESOLUTION "Resolution" +#define D_CMND_WC_MIRROR "Mirror" +#define D_CMND_WC_FLIP "Flip" +#define D_CMND_WC_SATURATION "Saturation" +#define D_CMND_WC_BRIGHTNESS "Brightness" +#define D_CMND_WC_CONTRAST "Contrast" +#define D_CMND_WC_SPECIALEFFECT "SpecialEffect" + +#define D_CMND_WC_AWB "AWB" +#define D_CMND_WC_WB_MODE "WBMode" +#define D_CMND_WC_AWB_GAIN "AWBGain" + +#define D_CMND_WC_AEC "AEC" +#define D_CMND_WC_AEC_VALUE "AECValue" +#define D_CMND_WC_AE_LEVEL "AELevel" +#define D_CMND_WC_AEC2 "AECDSP" + +#define D_CMND_WC_AGC "AGC" +#define D_CMND_WC_AGC_GAIN "AGCGain" +#define D_CMND_WC_GAINCEILING "GainCeiling" + +#define D_CMND_WC_RAW_GMA "GammaCorrect" +#define D_CMND_WC_LENC "LensCorrect" + +#define D_CMND_WC_WPC "WPC" +#define D_CMND_WC_DCW "DCW" +#define D_CMND_WC_BPC "BPC" + +#define D_CMND_WC_COLORBAR "Colorbar" + +#define D_CMND_WC_FEATURE "Feature" +#define D_CMND_WC_SETDEFAULTS "SetDefaults" +#define D_CMND_WC_STATS "Stats" + +#define D_CMND_WC_INIT "Init" +#define D_CMND_RTSP "Rtsp" + +#define D_CMND_WC_AUTH "Auth" +#define D_CMND_WC_CLK "Clock" + +#define D_CMND_WC_STARTTASK "Starttask" +#define D_CMND_WC_STOPTASK "Stoptask" + +#define D_CMND_WC_MENUVIDEOOFF "Menuvideooff" +#define D_CMND_WC_MENUVIDEOON "Menuvideoon" + +// for testing to see what happens after cam_stop() +#define D_CMND_WC_INTERRUPT "Interrupt" + +// mainly for testing functions which could be used by scripts. +#define D_CMND_WC_SETMOTIONDETECT "Setmotiondetect" +#define D_CMND_WC_GETFRAME "Getframe" +#define D_CMND_WC_GETPICSTORE "Getpicstore" + +#define D_CMND_WC_BERRYFRAMES "Berryframes" + +#define D_CMND_WC_SAVEPIC "SavePic" +#define D_CMND_WC_APPENDPIC "AppendPic" + +#define D_CMND_WC_GETMOTIONPIXELS "GetMotionPixels" + +#define D_CMND_WC_SETOPTIONS "SetOptions" +#define D_CMND_WC_CONVERTFRAME "ConvertFrame" +#define D_CMND_WC_SETPICTURE "SetPicture" + +#define D_CMND_WC_POWEROFF "Poweroff" + +const char kWCCommands[] PROGMEM = D_PRFX_WEBCAM "|" // Prefix + "|" D_CMND_WC_STREAM "|" D_CMND_WC_RESOLUTION "|" D_CMND_WC_MIRROR "|" D_CMND_WC_FLIP "|" + D_CMND_WC_SATURATION "|" D_CMND_WC_BRIGHTNESS "|" D_CMND_WC_CONTRAST "|" D_CMND_WC_SPECIALEFFECT "|" + D_CMND_WC_AWB "|" D_CMND_WC_WB_MODE "|" D_CMND_WC_AWB_GAIN "|" D_CMND_WC_AEC "|" + D_CMND_WC_AEC_VALUE "|" D_CMND_WC_AE_LEVEL "|" D_CMND_WC_AEC2 "|" D_CMND_WC_AGC "|" + D_CMND_WC_AGC_GAIN "|" D_CMND_WC_GAINCEILING "|" D_CMND_WC_RAW_GMA "|" D_CMND_WC_LENC "|" + D_CMND_WC_WPC "|" D_CMND_WC_DCW "|" D_CMND_WC_BPC "|" D_CMND_WC_COLORBAR "|" D_CMND_WC_FEATURE "|" + D_CMND_WC_SETDEFAULTS "|" D_CMND_WC_STATS "|" D_CMND_WC_INIT "|" D_CMND_WC_AUTH "|" D_CMND_WC_CLK "|" + D_CMND_WC_STARTTASK "|" D_CMND_WC_STOPTASK "|" D_CMND_WC_MENUVIDEOOFF "|" D_CMND_WC_MENUVIDEOON "|" + D_CMND_WC_INTERRUPT "|" D_CMND_WC_GETFRAME "|" D_CMND_WC_GETPICSTORE "|" +#ifdef USE_WEBCAM_MOTION + D_CMND_WC_SETMOTIONDETECT "|" D_CMND_WC_GETMOTIONPIXELS "|" + D_CMND_WC_CONVERTFRAME "|" D_CMND_WC_SETPICTURE "|" +#endif + D_CMND_WC_BERRYFRAMES "|" D_CMND_WC_SAVEPIC "|" D_CMND_WC_APPENDPIC "|" + D_CMND_WC_SETOPTIONS "|" D_CMND_WC_POWEROFF + +#ifdef ENABLE_RTSPSERVER + "|" D_CMND_RTSP +#endif // ENABLE_RTSPSERVER + ; + +void (* const WCCommand[])(void) PROGMEM = { + &CmndWebcam, &CmndWebcamStream, &CmndWebcamResolution, &CmndWebcamMirror, &CmndWebcamFlip, + &CmndWebcamSaturation, &CmndWebcamBrightness, &CmndWebcamContrast, &CmndWebcamSpecialEffect, + &CmndWebcamAWB, &CmndWebcamWBMode, &CmndWebcamAWBGain, &CmndWebcamAEC, &CmndWebcamAECValue, + &CmndWebcamAELevel, &CmndWebcamAEC2, &CmndWebcamAGC, &CmndWebcamAGCGain, &CmndWebcamGainCeiling, + &CmndWebcamGammaCorrect, &CmndWebcamLensCorrect, &CmndWebcamWPC, &CmndWebcamDCW, &CmndWebcamBPC, + &CmndWebcamColorbar, &CmndWebcamFeature, &CmndWebcamSetDefaults, + &CmndWebcamStats, &CmndWebcamInit, &CmndWebcamAuth, &CmndWebcamClock, + &CmndWebcamStartTask, &CmndWebcamStopTask, &CmndWebcamMenuVideoOff, &CmndWebcamMenuVideoOn, + &CmndWebcamCamStartStop, &CmndWebcamGetFrame, &CmndWebcamGetPicStore, +#ifdef USE_WEBCAM_MOTION + &CmndWebcamSetMotionDetect, &CmndWebcamGetMotionPixels, + &CmndWebcamConvertFrame, &CmndWebcamSetPicture, +#endif + &CmndWebcamBerryFrames, + &CmdWebcamSavePic, &CmdWebcamAppendPic, + &CmndWebcamSetOptions, + &CmndWebcamPowerOff + +#ifdef ENABLE_RTSPSERVER + , &CmndWebRtsp +#endif // ENABLE_RTSPSERVER + }; + +// plain 'WC' gives config +void CmndWebcam(void) { + Response_P(PSTR("{\"" D_PRFX_WEBCAM "\":{\"" D_CMND_WC_STREAM "\":%d,\"" D_CMND_WC_RESOLUTION "\":%d,\"" D_CMND_WC_MIRROR "\":%d,\"" + D_CMND_WC_FLIP "\":%d,\"" + D_CMND_WC_SATURATION "\":%d,\"" D_CMND_WC_BRIGHTNESS "\":%d,\"" D_CMND_WC_CONTRAST "\":%d,\"" + D_CMND_WC_SPECIALEFFECT "\":%d,\"" D_CMND_WC_AWB "\":%d,\"" D_CMND_WC_WB_MODE "\":%d,\"" + D_CMND_WC_AWB_GAIN "\":%d,\"" D_CMND_WC_AEC "\":%d,\"" D_CMND_WC_AEC_VALUE "\":%d,\"" + D_CMND_WC_AE_LEVEL "\":%d,\"" D_CMND_WC_AEC2 "\":%d,\"" D_CMND_WC_AGC "\":%d,\"" + D_CMND_WC_AGC_GAIN "\":%d,\"" D_CMND_WC_GAINCEILING "\":%d,\"" D_CMND_WC_RAW_GMA "\":%d,\"" + D_CMND_WC_LENC "\":%d,\"" D_CMND_WC_WPC "\":%d,\"" D_CMND_WC_DCW "\":%d,\"" D_CMND_WC_BPC "\":%d,\"" + D_CMND_WC_COLORBAR "\":%d,\"" D_CMND_WC_FEATURE "\":%d,\"" D_CMND_WC_AUTH "\":%d,\"" D_CMND_WC_CLK "\":%d,\"" + D_CMND_WC_MENUVIDEOOFF "\":%d" +#ifdef ENABLE_RTSPSERVER + ",\"" D_CMND_RTSP "\":%d" +#endif // ENABLE_RTSPSERVER + "}}"), + Settings->webcam_config.stream, Settings->webcam_config.resolution, Settings->webcam_config.mirror, + Settings->webcam_config.flip, + Settings->webcam_config.saturation -2, Settings->webcam_config.brightness -2, Settings->webcam_config.contrast -2, + Settings->webcam_config2.special_effect, Settings->webcam_config.awb, Settings->webcam_config2.wb_mode, + Settings->webcam_config.awb_gain, Settings->webcam_config.aec, Settings->webcam_config2.aec_value, + Settings->webcam_config2.ae_level -2, Settings->webcam_config.aec2, Settings->webcam_config.agc, + Settings->webcam_config2.agc_gain, Settings->webcam_config2.gainceiling, Settings->webcam_config.raw_gma, + Settings->webcam_config.lenc, Settings->webcam_config.wpc, Settings->webcam_config.dcw, Settings->webcam_config.bpc, + Settings->webcam_config.colorbar, Settings->webcam_config.feature, Settings->webcam_config2.auth, + Settings->webcam_clk, Settings->webcam_config.spare15 +#ifdef ENABLE_RTSPSERVER + , Settings->webcam_config.rtsp +#endif // ENABLE_RTSPSERVER + ); +} + +// enable/disable informing Berry of frame arriving +void CmndWebcamBerryFrames(void) { + if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) { + Wc.berryFrames = XdrvMailbox.payload; + } + ResponseCmndStateText(Wc.berryFrames); +} + +void CmndWebcamPowerOff(void){ + WcCamOff(); + ResponseCmndDone(); +} + +void CmndWebcamSetOptions(void){ + int res = WcSetOptions(XdrvMailbox.index, XdrvMailbox.payload); + ResponseCmndNumber(res); +} + + +void CmndWebcamStartTask(void) { + if (Wc.taskRunning == 0){ + WCStartOperationTask(); + } + ResponseCmndDone(); +} + +void WcStopTask(void){ + if (Wc.taskRunning == 1){ + // set to 2, and wait until cleared + WcWaitZero(&Wc.taskRunning, 2, 20000); + if (Wc.taskHandle){ + // why does this cause a problem? + //vTaskDelete(Wc.taskHandle); + Wc.taskHandle = nullptr; + } + } +} + +void CmndWebcamStopTask(void) { + WcStopTask(); + ResponseCmndDone(); +} + + +// store a frame 1-4. If frame '0' is requested, stores a frame in '1' +void CmndWebcamGetFrame(void) { + // returns size + int bnum = 0; + if (XdrvMailbox.index){ + bnum = XdrvMailbox.index; + } else { + bnum = XdrvMailbox.payload; + } + if (bnum == 0) bnum = 1; + uint32_t res = WcGetFrame(bnum); + struct PICSTORE *p = nullptr; + res = WcGetPicstorePtr(bnum-1, &p); + char resp[100] = "0"; + if (p) { + snprintf_P(resp, sizeof(resp), PSTR("{\"buff\":%d,\"addr\":%d,\"len\":%d,\"w\":%d,\"h\":%d,\"format\":%d}"), + bnum, p->buff, p->len, p->width, p->height, p->format+1); + } else { + snprintf_P(resp, sizeof(resp), PSTR("{\"maxstore\":%d}"), + res); + } + Response_P(S_JSON_COMMAND_XVALUE, XdrvMailbox.command, resp); + +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: Getframe %d -> %d"), bnum, res); +#endif + ResponseCmndNumber((int)res); +} + +// get a stored frame. If frame '0' is requested, stores a frame in '1', and returns that +void CmndWebcamGetPicStore(void) { + // returns size + // use a dummy for buffer ptr + uint8_t *t = nullptr; + int bnum = XdrvMailbox.payload; + if (bnum == -99){ + bnum = XdrvMailbox.index; + } + if (bnum < 0 || bnum > MAX_PICSTORE) { + ResponseCmndError(); + return; + } + + // if given 0, then get frame 1 first, and use frame 1 (the first frame, index 0). + if (bnum == 0){ + bnum = 1; + uint32_t res = WcGetFrame(bnum); + } + //uint32_t res = WcGetPicstore(bnum-1, &t); + struct PICSTORE *p = nullptr; + uint32_t res = WcGetPicstorePtr(bnum-1, &p); +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: PicStore %d at 0x%x"), bnum, p); +#endif + char resp[100] = "0"; + if (p) { + snprintf_P(resp, sizeof(resp), PSTR("{\"buff\":%d,\"addr\":%d,\"len\":%d,\"w\":%d,\"h\":%d,\"format\":%d}"), + bnum, p->buff, p->len, p->width, p->height, p->format+1); + } else { + snprintf_P(resp, sizeof(resp), PSTR("{\"maxstore\":%d}"), + res); + } + Response_P(S_JSON_COMMAND_XVALUE, XdrvMailbox.command, resp); +} + +int WebcamSavePic(int append) { + // returns size + // use a dummy for buffer ptr + uint8_t *buf = nullptr; + int len = 0; + int bnum = XdrvMailbox.index; + if (bnum < 0){ +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: savePic bnum %d"), bnum); +#endif + return 0; + } + + if (0 == XdrvMailbox.data_len){ + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: Save Pic no fname")); + return 0; + } + + if (bnum == 0){ + // if bnum 0, get a picture now.... + // use the snapshot frame buffer + Wc.taskTakePic = 1; + int loops = 100; + while (Wc.taskTakePic && (loops--)){ + vTaskDelay(10/ portTICK_PERIOD_MS); + } + } + TasAutoMutex localmutex(&WebcamMutex, "SavePic", 2000); + if (bnum == 0){ + buf = Wc.snapshotStore.buff; + len = Wc.snapshotStore.len; +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: savePic snapshotstore %d"), len); +#endif + } else { + len = WcGetPicstore(bnum - 1, &buf); +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: savePic PicStore %d -> %d"), bnum, len); +#endif + } + if (len){ +#ifdef USE_UFILESYS + // ffsp should recognise /sd/ if sd card present + if (ffsp){ + File f = ffsp->open(XdrvMailbox.data, append?FS_FILE_APPEND:FS_FILE_WRITE); // + if (f){ + f.write(buf, len); + f.close(); +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: Save Pic %s"), XdrvMailbox.data); +#endif + if (bnum == 0){ + pic_free(&Wc.snapshotStore); + } + return 1; + } + } + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: Failed Save Pic %s"), XdrvMailbox.data); +#else + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: Failed Save Pic %s - no USE_UFILESYS"), XdrvMailbox.data); +#endif + if (bnum == 0){ + pic_free(&Wc.snapshotStore); + } + return 0; + } + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: Failed Save Pic inv index %d"), XdrvMailbox.payload); + return 0; +} +// "WCSAVEPIC1 /temp.jpg" "WCSAVEPIC2 /temp.jpg" +void CmdWebcamSavePic(){ + WebcamSavePic(0)? ResponseCmndDone(): ResponseCmndError(); +} +// "WCAPPENDPIC1 /temp.jpg" "WCAPPENDPIC2 /temp.jpg" +void CmdWebcamAppendPic(){ + WebcamSavePic(1)? ResponseCmndDone(): ResponseCmndError(); +} + +void CmndWebcamMenuVideoOff(void) { + Settings->webcam_config.spare15 = 1; + ResponseCmndStateText(Settings->webcam_config.spare15); +} + +void CmndWebcamMenuVideoOn(void) { + Settings->webcam_config.spare15 = 0; + ResponseCmndStateText(Settings->webcam_config.spare15); +} + +void CmndWebcamStream(void) { + if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) { + Settings->webcam_config.stream = XdrvMailbox.payload; + WcSetStreamserver(Settings->webcam_config.stream); + } else { + // we use this from a menu + if (XdrvMailbox.index == 2){ + Settings->webcam_config.stream = 1; + WcSetStreamserver(Settings->webcam_config.stream); + } + } + ResponseCmndStateText(Settings->webcam_config.stream); +} + +void CmndWebcamResolution(void) { + if ((XdrvMailbox.payload >= -1) && (XdrvMailbox.payload < FRAMESIZE_FHD)) { + int reinit = 0; + // if changinf from or to disabled, then force re-init. + if (Settings->webcam_config.resolution == 15 || XdrvMailbox.payload == -1){ + reinit = 1; + } + Settings->webcam_config.resolution = XdrvMailbox.payload; + if (reinit) { + WcSetup(Settings->webcam_config.resolution); + } else { + WcSetOptions(0, Settings->webcam_config.resolution); + } + } + ResponseCmndNumber(Settings->webcam_config.resolution); +} + +void CmndWebcamMirror(void) { + if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) { + Settings->webcam_config.mirror = XdrvMailbox.payload; + WcSetOptions(3, Settings->webcam_config.mirror); + } + ResponseCmndStateText(Settings->webcam_config.mirror); +} + +void CmndWebcamFlip(void) { + if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) { + Settings->webcam_config.flip = XdrvMailbox.payload; + WcSetOptions(2, Settings->webcam_config.flip); + } + ResponseCmndStateText(Settings->webcam_config.flip); +} + +void CmndWebcamSaturation(void) { + if ((XdrvMailbox.payload >= -2) && (XdrvMailbox.payload <= 2)) { + Settings->webcam_config.saturation = XdrvMailbox.payload +2; + WcSetOptions(6, Settings->webcam_config.saturation -2); + } + ResponseCmndNumber(Settings->webcam_config.saturation -2); +} + +void CmndWebcamBrightness(void) { + if ((XdrvMailbox.payload >= -2) && (XdrvMailbox.payload <= 2)) { + Settings->webcam_config.brightness = XdrvMailbox.payload +2; + WcSetOptions(5, Settings->webcam_config.brightness -2); + } + ResponseCmndNumber(Settings->webcam_config.brightness -2); +} + +void CmndWebcamContrast(void) { + if ((XdrvMailbox.payload >= -2) && (XdrvMailbox.payload <= 2)) { + Settings->webcam_config.contrast = XdrvMailbox.payload +2; + WcSetOptions(4, Settings->webcam_config.contrast -2); + } + ResponseCmndNumber(Settings->webcam_config.contrast -2); +} + +void CmndWebcamSpecialEffect(void) { + if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 6)) { + Settings->webcam_config2.special_effect = XdrvMailbox.payload; + WcSetOptions(1, Settings->webcam_config2.special_effect); + } + ResponseCmndNumber(Settings->webcam_config2.special_effect); +} + +void CmndWebcamAWB(void) { + if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) { + Settings->webcam_config.awb = XdrvMailbox.payload; + WcSetOptions(7, Settings->webcam_config.awb); + } + ResponseCmndStateText(Settings->webcam_config.awb); +} + +void CmndWebcamWBMode(void) { + if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 4)) { + Settings->webcam_config2.wb_mode = XdrvMailbox.payload; + WcSetOptions(8, Settings->webcam_config2.wb_mode); + } + ResponseCmndNumber(Settings->webcam_config2.wb_mode); +} + +void CmndWebcamAWBGain(void) { + if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) { + Settings->webcam_config.awb_gain = XdrvMailbox.payload; + WcSetOptions(9, Settings->webcam_config.awb_gain); + } + ResponseCmndStateText(Settings->webcam_config.awb_gain); +} + +void CmndWebcamAEC(void) { + if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) { + Settings->webcam_config.aec = XdrvMailbox.payload; + WcSetOptions(10, Settings->webcam_config.aec); + } + ResponseCmndStateText(Settings->webcam_config.aec); +} + +void CmndWebcamAECValue(void) { + if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1200)) { + Settings->webcam_config2.aec_value = XdrvMailbox.payload; + WcSetOptions(11, Settings->webcam_config2.aec_value); + } + ResponseCmndNumber(Settings->webcam_config2.aec_value); +} + +void CmndWebcamAELevel(void) { + if ((XdrvMailbox.payload >= -2) && (XdrvMailbox.payload <= 2)) { + Settings->webcam_config2.ae_level = XdrvMailbox.payload + 2; + WcSetOptions(12, Settings->webcam_config2.ae_level - 2); + } + ResponseCmndNumber(Settings->webcam_config2.ae_level - 2); +} + +void CmndWebcamAEC2(void) { + if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) { + Settings->webcam_config.aec2 = XdrvMailbox.payload; + WcSetOptions(13, Settings->webcam_config.aec2); + } + ResponseCmndStateText(Settings->webcam_config.aec2); +} + +void CmndWebcamAGC(void) { + if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) { + Settings->webcam_config.agc = XdrvMailbox.payload; + WcSetOptions(14, Settings->webcam_config.agc); + } + ResponseCmndStateText(Settings->webcam_config.agc); +} + +void CmndWebcamAGCGain(void) { + if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 30)) { + Settings->webcam_config2.agc_gain = XdrvMailbox.payload; + WcSetOptions(15, Settings->webcam_config2.agc_gain); + } + ResponseCmndNumber(Settings->webcam_config2.agc_gain); +} + +void CmndWebcamGainCeiling(void) { + if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 6)) { + Settings->webcam_config2.gainceiling = XdrvMailbox.payload; + WcSetOptions(16, Settings->webcam_config2.gainceiling); + } + ResponseCmndNumber(Settings->webcam_config2.gainceiling); +} + +void CmndWebcamGammaCorrect(void) { + if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) { + Settings->webcam_config.raw_gma = XdrvMailbox.payload; + WcSetOptions(17, Settings->webcam_config.raw_gma); + } + ResponseCmndStateText(Settings->webcam_config.raw_gma); +} + +void CmndWebcamLensCorrect(void) { + if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) { + Settings->webcam_config.lenc = XdrvMailbox.payload; + WcSetOptions(18, Settings->webcam_config.lenc); + } + ResponseCmndStateText(Settings->webcam_config.lenc); +} + +void CmndWebcamWPC(void) { + if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) { + Settings->webcam_config.wpc = XdrvMailbox.payload; + WcSetOptions(19, Settings->webcam_config.wpc); + } + ResponseCmndStateText(Settings->webcam_config.wpc); +} + +void CmndWebcamDCW(void) { + if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) { + Settings->webcam_config.dcw = XdrvMailbox.payload; + WcSetOptions(20, Settings->webcam_config.dcw); + } + ResponseCmndStateText(Settings->webcam_config.dcw); +} + +void CmndWebcamBPC(void) { + if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) { + Settings->webcam_config.bpc = XdrvMailbox.payload; + WcSetOptions(21, Settings->webcam_config.bpc); + } + ResponseCmndStateText(Settings->webcam_config.bpc); +} + +void CmndWebcamColorbar(void) { + if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) { + Settings->webcam_config.colorbar = XdrvMailbox.payload; + WcSetOptions(22, Settings->webcam_config.colorbar); + } + ResponseCmndStateText(Settings->webcam_config.colorbar); +} + +void CmndWebcamFeature(void) { + if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 2)) { + Settings->webcam_config.feature = XdrvMailbox.payload; + WcSetOptions(23, Settings->webcam_config.feature); + } + ResponseCmndNumber(Settings->webcam_config.feature); +} + +void CmndWebcamAuth(void){ + if((XdrvMailbox.payload >=0) && (XdrvMailbox.payload <= 1)){ + Settings->webcam_config2.auth = XdrvMailbox.payload; + } + ResponseCmndNumber(Settings->webcam_config2.auth); +} + +void CmndWebcamClock(void){ + if((XdrvMailbox.payload >= 10) && (XdrvMailbox.payload <= 200)){ + Settings->webcam_clk = XdrvMailbox.payload; + // if cam is up, must setup to apply + if (Wc.up){ + WcSetup(Settings->webcam_config.resolution); + } + } + ResponseCmndNumber(Settings->webcam_clk); +} + +void CmndWebcamCamStartStop(void){ + if((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)){ + WcInterrupt(XdrvMailbox.payload); + } + ResponseCmndNumber(XdrvMailbox.payload); +} + + +void CmndWebcamInit(void) { + WcSetup(Settings->webcam_config.resolution); + WcSetStreamserver(Settings->webcam_config.stream); + ResponseCmndDone(); +} + +void CmndWebcamSetDefaults(void) { + WcSetDefaults(0); + ResponseCmndDone(); +} + +#define D_WEBCAM_STATS_FPS "FPS" +#define D_WEBCAM_STATS_CAMFAIL "CamFail" +#define D_WEBCAM_STATS_JPEGFAIL "JpegFail" +#define D_WEBCAM_STATS_CLIENTFAIL "ClientFail" +#define D_WEBCAM_STATS_AVGFPS "AvgFPS" +#define D_WEBCAM_STATS_AVGPERIOD "AvgFPeriod" +#define D_WEBCAM_STATS_AVGPROC "AvgFProcessing" +#define D_WEBCAM_STATS_FRAMELEN "LastFrameBytes" +#define D_WEBCAM_STATS_WEBCLIENTS "WebClients" +#define D_WEBCAM_STATS_RTSPCLIENTS "RTSPClients" +#define D_WEBCAM_STATS_LASTCAMINTERVAL "CamInterval" +#define D_WEBCAM_STATS_CAMFRAMETIME "CamFrameTime" +#define D_WEBCAM_STATS_LOOPSPERSEC "LoopsPerSec" + +void CmndWebcamStats(void) { + Response_P(PSTR("{\"" D_PRFX_WEBCAM D_CMND_WC_STATS "\":{\"" D_WEBCAM_STATS_FPS "\":%d,\"" + D_WEBCAM_STATS_CAMFAIL "\":%d,\"" D_WEBCAM_STATS_JPEGFAIL "\":%d,\"" D_WEBCAM_STATS_CLIENTFAIL "\":%d,\"" + D_WEBCAM_STATS_AVGFPS "\":%f,\"" + D_WEBCAM_STATS_AVGPERIOD "\":%d,\"" + D_WEBCAM_STATS_AVGPROC "\":%d,\"" + D_WEBCAM_STATS_FRAMELEN "\":%d,\"" + D_WEBCAM_STATS_WEBCLIENTS "\":%d,\"" +#ifdef ENABLE_RTSPSERVER + D_WEBCAM_STATS_RTSPCLIENTS "\":%d,\"" +#endif + D_WEBCAM_STATS_LASTCAMINTERVAL "\":%d,\"" + D_WEBCAM_STATS_CAMFRAMETIME "\":%d,\"" + D_WEBCAM_STATS_LOOPSPERSEC "\":%d" + "}}"), + WcStats.camfps, WcStats.camfail, WcStats.jpegfail, WcStats.clientfail, + WcStats.avgFPS, WcStats.avgFrameMS, WcStats.avgProcessingPerFrameMS, + Wc.last_frame_len, + WcStats.webclientcount, +#ifdef ENABLE_RTSPSERVER + WcStats.rtspclientcount, +#endif + Wc.camtimediff, + Wc.frameIntervalsus, + Wc.loopspersec + ); +} + +#ifdef ENABLE_RTSPSERVER +void CmndWebRtsp(void) { + if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) { + if (Settings->webcam_config.rtsp != XdrvMailbox.payload){ + Settings->webcam_config.rtsp = XdrvMailbox.payload; + if (!Settings->webcam_config.rtsp){ + // existing sessions will get stopped, and the server deleted in the loop. + } + } + } + ResponseCmndStateText(Settings->webcam_config.rtsp); +} +#endif // ENABLE_RTSPSERVER + +void WcUpdateStats(void) { + WcStats.camfps = WcStats.camcnt; + WcStats.camcnt = 0; + + // relies on us getting here each second !!! + Wc.loopspersec = Wc.loopcounter; + Wc.loopcounter = 0; +} + +#ifndef D_WEBCAM_STATE +#define D_WEBCAM_STATE "State" +#define D_WEBCAM_POWEREDOFF "PowerOff" +#define D_WEBCAM_FRAMEFAIL "Frame Failed" +#define D_WEBCAM_HWFAIL "H/W fail" +#endif + +const char HTTP_WEBCAM_FPS[] PROGMEM = "{s}%s " D_FRAME_RATE "{m}%d/%d " D_UNIT_FPS "{e}"; +const char HTTP_WEBCAM_STATE[] PROGMEM = "{s}%s" D_WEBCAM_STATE "{m}%s - %X{e}"; + +void WcStatsShow(void) { +#ifdef USE_WEBSERVER + switch(Wc.lastCamError){ + case ESP_OK: WSContentSend_PD(HTTP_WEBCAM_FPS, WcStats.name, WcStats.camfps, WcStats.maxfps); break; + case 2: WSContentSend_PD(HTTP_WEBCAM_STATE, WcStats.name, D_WEBCAM_FRAMEFAIL, Wc.lastCamError); break; + case 3: WSContentSend_PD(HTTP_WEBCAM_STATE, WcStats.name, D_WEBCAM_POWEREDOFF, Wc.lastCamError); break; + default: WSContentSend_PD(HTTP_WEBCAM_STATE, WcStats.name, D_WEBCAM_HWFAIL, Wc.lastCamError); break; + } +#endif // USE_WEBSERVER +} + + +/*********************************************************************************************\ + * Interface +\*********************************************************************************************/ + +bool Xdrv99(uint32_t function) { + bool result = false; + + switch (function) { + case FUNC_LOOP: + // note: this will wait for a frame. + // and so slow down the whole of tas looping? + WcLoop(); + break; + case FUNC_WEB_ADD_HANDLER: + WcPicSetup(); + break; + case FUNC_WEB_ADD_MAIN_BUTTON: + WcShowStream(); + break; + case FUNC_EVERY_SECOND: + WcUpdateStats(); + break; + case FUNC_WEB_SENSOR: + WcStatsShow(); + break; + case FUNC_COMMAND: + result = DecodeCommand(kWCCommands, WCCommand); + break; + case FUNC_PRE_INIT: + memset(&Wc, 0, sizeof(Wc)); + //Wc.loopcounter = 0; +#ifdef USE_WEBCAM_MOTION + memset(&wc_motion, 0, sizeof(wc_motion)); + WcSetMotionDefaults(); +#endif + WcInit(); + break; + case FUNC_INIT: + // starts stream server if configured, and configured camera + WcSetup(Settings->webcam_config.resolution); + WcSetStreamserver(Settings->webcam_config.stream); + WCStartOperationTask(); + break; + case FUNC_SAVE_BEFORE_RESTART: { + // stop cam clock +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: FUNC_SAVE_BEFORE_RESTART")); +#endif + // stop our task. This seems to cause core mediation at this point. why? + WcStopTask(); +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: task stopped")); +#endif + // this stops the camera clock, and sets + // a boolean which prevents us starting it + WcInterrupt(0); + + if (Wc.up){ + // kill the camera driver, and power off camera + WcCamOff(); + } + WcSetStreamserver(0); + // give it a moment for any tasks to finish + vTaskDelay(100 / portTICK_PERIOD_MS); +#ifdef WEBCAM_DEV_DEBUG + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: FUNC_SAVE_BEFORE_RESTART after delay")); +#endif + } break; + + } + return result; +} + +#endif // !USE_WEBCAM_LEGACY +#endif // USE_WEBCAM +#endif // ESP32 diff --git a/tasmota/tasmota_xdrv_driver/xdrv_81_esp32_webcam_task_motion.ino b/tasmota/tasmota_xdrv_driver/xdrv_81_esp32_webcam_task_motion.ino new file mode 100644 index 000000000..8384a7485 --- /dev/null +++ b/tasmota/tasmota_xdrv_driver/xdrv_81_esp32_webcam_task_motion.ino @@ -0,0 +1,1244 @@ +/* + xdrv_99_esp32_webcamberry.ino - ESP32 webcam support for Tasmota + + Copyright (C) 2021 Gerhard Mutz and Theo Arends + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifdef ESP32 +#ifdef USE_WEBCAM +// defining USE_WEBCAM_V2 will use xdrv_81_esp32_webcam_task.ino rather than xdrv_81_esp32_webcam.ino +#ifdef USE_WEBCAM_V2 +// only applies to USE_WEBCAM_V2 +#ifdef USE_WEBCAM_MOTION + + +/*********************************************************************************************\ + * ESP32 webcam motion routines + * + * WcGetmotionpixelsN = (N=1..4) read addr, len, w, h as JSON {"addr":123456,"len":12345,"w":160,"h":120, "format":4} + * motion(1) + * difference(2) buffer - e.g for berry + * mask(3) + * background(4) + * e.g. could be used to read pixels, or change pixels from berry. + + * WcConvertFrameN - convert a wcgetframe in picstore from jpeg to (0=2BPP/RGB565, 3=1BPP/GRAYSCALE, 5=3BPP/RGB888), (0-3) + * converts in place, replacing the stored frame with the new format. Data can be retrieved using wcgetpicstoreN (e.g. for use in berry) + * will fail if it can't convert or allocate. + * + * WcSetPicture - SetPictureN (N=1-MAX_PICTORE) expects 'addr len format [width height] + * use to populate a frame in Wc.picstore from Berry. e.g. to put a JPEG mask there + * so you can then decode it, get it's address, get the address of the current mask, and + * copy data across. + * if sending JPEG (format=0|5), width and height are calculated on decode. + * if sending pixels (format=4(GRAY)|6(RGB)|1(RGB565)), width and height are required, and used to allocate. + * binary data is copied from addr. i.e. you can send the addr/len from Berry introspect bytes. + * ideas: could be used to set background image based on time of day. + +### Enable motion detection interval +WCsetMotiondetect +WCsetMotiondetect 2000 + +### disable motion detection +WCsetMotiondetect 0 + +### return overall normalised pixel difference. +WCsetMotiondetect -1 + +### return overall normalised brightness. +WCsetMotiondetect -2 + +### motion detect via jpeg frame size (% change) +Does not run motion detect frame scan! +(i.e. you can turn off WCsetMotiondetect 0 - and detect at 50fps) +WCsetMotiondetect2 +WCsetMotiondetect2 20 + +### Pixel diff value threshold +if set > 0, pixels with a difference > threshold will be counted +if a difference buffer is enabled, then pixels in it are raised to 255. +WCsetMotiondetect3 +WCsetMotiondetect3 10 + +### Pixels over threshold trigger +if the number of pixels changed (per 10000) is > limit, motion is triggered. +set 0 to disable. +WCsetMotiondetect4 +WCsetMotiondetect4 10 + +### set scale for motion detect image ref camera res +the number 0-7 = 1, 1/2, 1/4, 1/8, 1/16, 1/32, 1/64, 1/128 +values 0-3 use scaling on jpeg decode (fast). +values 4-7 add software scaling (not much performance gain, but some) +WCsetMotiondetect5 0-7 + +### enable difference buffer +enable/disable the difference buffer +WCsetMotiondetect6 0-1 + +### Set motion trigger threshold (accumulated pixels difference) +normalised value, try 1000... +WCsetMotiondetect7 0-nnnnn + + +Endpoints: +http://IP/motionlbuff.jpg - last motion buffer as jpeg (fully scaled) - if motion enabled, else 404 +http://IP/motionbuff.jpg - motion buffer as jpeg (only jpeg scaled) - if motion enabled, else 404 +http://IP/motiondiff.jpg - last difference buffer as jpeg (fully scaled) - if enabled, else 404 + +http://IP:81/diff.mjpeg - motion or difference buffer stream as mjpeg (fully scaled, buf is motion if diff not enabled) - if enabled, else no data + + */ + +/*********************************************************************************************/ + +/*********************************************************************************************/ +/* +Berry usage: +if you turn on motion detect with "wcsetmotiondetect 1000" (number is ms between detect) +or it you turn on frame sending using "wcberryframes 1" +then berry will be called expecting to find a driver which has a method "webcam", e.g.: + +var piccount = 0 +class MyWebcamDriver + #- create a method for adding a button to the main menu -# + def webcam(cmd, idx, payload) + print("webcam "+cmd+" payload:"+payload) + if (cmd == "motion") + #split payload at space + var val = int(payload) + if (val > 1000) + piccount = piccount+1 + var tcmd = "wcsavepic0 /myfile" .. piccount .. ".jpg" + tasmota.cmd(tcmd) + print("webcam motion -> "+tcmd) + end + end + end +end + +This will be called with +"motion <" +and/or +"frame" + +*/ +/*********************************************************************************************/ + +#include "cam_hal.h" +#include "esp_camera.h" +#include "sensor.h" +#include "fb_gfx.h" +#include "camera_pins.h" +#include "esp_jpg_decode.h" +//#include "img_converters.h" + +extern SemaphoreHandle_t WebcamMutex; + +// use mutex like: +// TasAutoMutex localmutex(&WebcamMutex, "somename", 200); +// in any function. Will wait for mutex to be clear, and auto-release when the function exits. + +/*********************************************************************************************/ +// functions to encode into a jpeg buffer. +// we keep ONE allocated buffer for this, and expand it if the jpeg does not fit. +// single expanding jpeg buffer for encode into +// call encode_reset() to maybe recover from failure to allocate. + +#define DEFAULT_INITIAL_JPEG_LEN 16384 + + +// this is a callback called from the fmt2jpg_cb in WcencodeToJpeg. +// it writes jpeg data to our buffer, and dynamically re-allocates the buffer +// if it's not large enough. +// the intent is to KEEP one buffer, which will hit some maximal size, and so +// avoid memory fragmentation, and be a little faster. +// ocb(oarg, index, data, len); +size_t WcJpegEncoderStore_jpg_out_cb(void * arg, size_t index, const void* data, size_t len){ + struct PICSTORE *p = (struct PICSTORE *)arg; + if (p->allocatedLen < 0){ + return 0; + } + if (!p->buff){ + pic_alloc(p, 0, 0, DEFAULT_INITIAL_JPEG_LEN, PIXFORMAT_JPEG, 0); + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: jpeg alloced %d->%d at %X"), 0, p->allocatedLen, p->buff); + if (!p->buff){ + return 0; + } + } + + if (index + len > p->allocatedLen){ + int oldlen = p->allocatedLen; + // re-allocate buffer with memcoy of data + pic_alloc(p, 0, 0, len + 2048, PIXFORMAT_JPEG, 2); + if (!p->buff){ + AddLog(LOG_LEVEL_ERROR, PSTR("CAM: jpeg alloc failed to get %d"), p->allocatedLen); + return 0; + } else { + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: jpeg re-alloced %d->%d at %X"), oldlen, p->allocatedLen, p->buff); + } + } + + if (p->buff + index + len > p->buff + p->allocatedLen ){ + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: jpeg overlen??? %d+%d > %d at %X"), index, len, p->allocatedLen); + return 0; + } + if (p->buff + index + len < p->buff ){ + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: jpeg -ve index??? %d+%d < %d at %X"), index, len, 0); + return 0; + } + + memcpy(p->buff + index, data, len); + // record len used + p->len = index+len; + return len; +} + +// a jpeg encode which uses the above callback. +// used in creating jpegs from motion buffers, +// and possibly later for video if we want to get raw frame data for speed +// when we primarily want to process pixels (e.g. tensorflow). +// dest is filled if it returns true. +// DO NOT FREE BUFFER. +bool WcencodeToJpeg(uint8_t *src, size_t srclen, int width, int height, int format, uint8_t quality, struct PICSTORE *dest){ + dest->format = (int)PIXFORMAT_JPEG; + bool converted = fmt2jpg_cb(src, srclen, width, height, (pixformat_t )format, quality, WcJpegEncoderStore_jpg_out_cb, (void *) dest); + return converted && dest->buff; +} + +void Wcencode_reset(struct PICSTORE *dest){ + pic_free(dest); +} +/*********************************************************************************************/ + + + + +/*********************************************************************************************/ + + +/*********************************************************************************************/ + + +/*********************************************************************************************/ + +WC_Motion wc_motion; + +void WcSetMotionDefaults(){ + wc_motion.motion_trigger_limit = 1000; // last amount of difference measured (~100 for none, > ~1000 for motion?) + wc_motion.scale = 3; + wc_motion.swscale = 0; +}; + +void HandleImagemotionmask(){ + HandleImageAny(wc_motion.mask); +} +void HandleImagemotiondiff(){ + HandleImageAny(wc_motion.diff); +} +void HandleImagemotionbuff(){ + HandleImageAny(wc_motion.frame); +} +void HandleImagemotionlbuff(){ + HandleImageAny(wc_motion.last_motion); +} +void HandleImagemotionbackgroundbuff(){ + HandleImageAny(wc_motion.background); +} + +uint32_t WcSetMotionDetect(int32_t value) { + if (value >= 0) { wc_motion.motion_detect = value; } + if (!wc_motion.motion_detect){ // if turning it off... + // don't free whilst buffer in use + TasAutoMutex localmutex(&WebcamMutex, "HandleImage", 200); + wc_motion.motion_state = 0; // prevent set of output to stop bad detect at start + pic_free_p(&wc_motion.frame); + pic_free_p(&wc_motion.last_motion); + pic_free_p(&wc_motion.diff); + pic_free_p(&wc_motion.mask); + pic_free_p(&wc_motion.background); + + wc_motion.motion_trigger = 0; + wc_motion.motion_brightness = 0; + } + + switch(value){ + case -1: + return wc_motion.motion_trigger; + case -2: + return wc_motion.motion_brightness; + case -20: + WcMotionLog(); + break; + } + return value; +} + +bool WcConvertFrame(int32_t bnum_i, int format, int scale) { + if ((bnum_i < 0) || bnum_i >= MAX_PICSTORE) return false; + if ((scale < 0) || scale > 3) return false; + struct PICSTORE *ps = &Wc.picstore[bnum_i]; + if (!ps->buff) return false; + // if jpeg decode + bool res = false; + if (ps->format == PIXFORMAT_JPEG && format != PIXFORMAT_JPEG) { + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: ConvertFrame from JPEG to %d"), format); + + struct PICSTORE psout = {0}; + res = convertJpegToPixels(ps->buff, ps->len, ps->width, ps->height, scale, format, &psout); + if (res) { + free(ps->buff); + memcpy(ps, &psout, sizeof(*ps)); + } else { + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: ConvertFrame failed %d,%d to %d at 1/%d"), ps->width, ps->height, format, (1< 16k required + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: ConvertFrame from %d to jpeg"), (int)ps->format); + res = WcencodeToJpeg(ps->buff, ps->len, ps->width, ps->height, (int)ps->format, 80, &psout); + if (res) { + free(ps->buff); + memcpy(ps, &psout, sizeof(*ps)); + } else { + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: ConvertFrame jpeg encode failed %d,%d from %d"), ps->width, ps->height, (int)ps->format); + } + } else { + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: ConvertFrame cannot convert to %d"), (int)format); + } + } + return res; +} + + + +void WcMotionLog(){ + AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("CAM: motion: w:%d h:%d scale:1/%d:1/%d ms:%u val:%d br: %d triggerpoint:%d, px10000:%d"), + (Wc.width/(1<input + index, len); + } + return len; +} + + +// output buffer and image width +// this is to write macroblocks to the output. +// x,y,w,h are the jpeg numbers +// we ASSUME that the data presented to us is RGB888 - even for decode of a mono jpeg? +static bool _mono_write(void * arg, uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint8_t *data) +{ + wc_rgb_jpg_decoder * jpeg = (wc_rgb_jpg_decoder *)arg; + // called with null to start and end write. + if(!data){ + if(x == 0 && y == 0){ + //write start + jpeg->width = w; + jpeg->height = h; + if (jpeg->poutput){ + pic_alloc(jpeg->poutput, jpeg->width, jpeg->height, 0, PIXFORMAT_GRAYSCALE, 1); + } + } else { + //write end + } + if (!jpeg->poutput || !jpeg->poutput->buff) + return false; + return true; + } + if (!jpeg->poutput || !jpeg->poutput->buff) + return false; + uint8_t *out = jpeg->poutput->buff + jpeg->data_offset; + uint8_t *o = out; + size_t djw = jpeg->width; // ouptut stride + size_t dl = x; // offset into output image data for x + + // first pixel in destination + o = out+(y*djw)+dl; + // data already points to first pixel in source + // and the start of the next line follows the end of the previous, + // so no need to take into account stride + + // loop over each pixel, get a grey value, and put it in the output + for(int iy = 0; iy < h; iy++) { + uint8_t *op = o; + for(int ix = 0; ix < w; ix++) { + int32_t gray = (*(data++) + *(data++) + *(data++)) / 3; + *(op++) = gray; + } + o += djw; // output stride + } + return true; +} + +#ifdef WC_USE_RGB_DECODE +//output buffer and image width +// from to_bmp.c - unfortunately thier version is static +static bool wc_rgb_write(void * arg, uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint8_t *data) +{ + wc_rgb_jpg_decoder * jpeg = (wc_rgb_jpg_decoder *)arg; + if(!data){ + if(x == 0 && y == 0){ + //write start + jpeg->width = w; + jpeg->height = h; + if (jpeg->poutput){ + pic_alloc(jpeg->poutput, jpeg->width, jpeg->height, 0, PIXFORMAT_RGB888, 1); + } + } else { + //write end + } + if (!jpeg->poutput || !jpeg->poutput->buff) + return false; + return true; + } + if (!jpeg->poutput || !jpeg->poutput->buff) + return false; + + size_t jw = jpeg->width*3; + size_t t = y * jw; + size_t b = t + (h * jw); + size_t l = x * 3; + uint8_t *out = jpeg->poutput->buff + jpeg->data_offset; + uint8_t *o = out; + size_t iy, ix; + + w = w * 3; + + for(iy=t; iywidth = w; + jpeg->height = h; + if (jpeg->poutput){ + pic_alloc(jpeg->poutput, jpeg->width, jpeg->height, 0, PIXFORMAT_RGB565, 1); + } + } else { + //write end + } + if (!jpeg->poutput || !jpeg->poutput->buff) + return false; + return true; + } + if (!jpeg->poutput || !jpeg->poutput->buff) + return false; + + // ###### TODO ##### + // I find this code highly suspect - copied from esp camdriver + // seems they copied the RGB888 and adapted? + size_t jw = jpeg->width*3; + size_t jw2 = jpeg->width*2; + size_t t = y * jw; + size_t t2 = y * jw2; + size_t b = t + (h * jw); + size_t l = x * 2; + uint8_t *out = jpeg->poutput->buff + jpeg->data_offset; + uint8_t *o = out; + size_t iy, iy2, ix, ix2; + + w = w * 3; + + for(iy=t, iy2=t2; iy> 3); + o[ix2+1] = c>>8; + o[ix2] = c&0xff; + } + data+=w; + } + return true; +} +#endif + +// converts to a monochrome pixel array - quite fast +bool wc_jpg2mono(const uint8_t *src, size_t src_len, struct PICSTORE * out, int scale) +{ + wc_rgb_jpg_decoder jpeg; + jpeg.width = 0; + jpeg.height = 0; + jpeg.input = src; + jpeg.poutput = out; + jpeg.data_offset = 0; + + if(esp_jpg_decode(src_len, (jpg_scale_t)scale, wc_jpg_read, _mono_write, (void*)&jpeg) != ESP_OK){ + return false; + } + return true; +} + + +#ifdef WC_USE_RGB_DECODE +// converts to a 3x8 bit pixel array +// from to_bmp.c - unfortunately thier version is static +bool wc_jpg2rgb888(const uint8_t *src, size_t src_len, struct PICSTORE * out, int scale) +{ + wc_rgb_jpg_decoder jpeg; + jpeg.width = 0; + jpeg.height = 0; + jpeg.input = src; + jpeg.poutput = out; + jpeg.data_offset = 0; + + if(esp_jpg_decode(src_len, (jpg_scale_t) scale, wc_jpg_read, wc_rgb_write, (void*)&jpeg) != ESP_OK){ + return false; + } + return true; +} +#endif + + +bool wc_jpg2rgb565(const uint8_t *src, size_t src_len, struct PICSTORE * out, int scale) +{ + wc_rgb_jpg_decoder jpeg; + jpeg.width = 0; + jpeg.height = 0; + jpeg.input = src; + jpeg.poutput = out; + jpeg.data_offset = 0; + + if(esp_jpg_decode(src_len, (jpg_scale_t) scale, wc_jpg_read, wc_rgb565_write, (void*)&jpeg) != ESP_OK){ + return false; + } + return true; +} + + +// general jpeg to pixel conversion +// may be used for gettign pixels for other processing, e.g. tensorflow. +// supports scaling (0-3 -> 1:1. 1:2, 1:4, 1:8) +// supports pixelformats GRAYSCALE, RGB565, RGB888 (see define) +// pass in a camera_fb_t * and a buffer will be allocated/re-allocated if ->len != size required +bool convertJpegToPixels(const uint8_t *src_buf, size_t src_len, int width, int height, int scale, int format, struct PICSTORE *out){ + int size = 0; + width = width / (1<buff; + uint8_t *pxmy = wc_motion.mask->buff; + uint8_t thresh = wc_motion.auto_mask_pixel_threshold; + int expansion = wc_motion.auto_mask_pixel_expansion; + int stride = scaledwidth; + for (int y = 0; y < scaledheight; y++){ + uint8_t *pxd = pxdy + y*stride; + for (int x = 0; x < scaledwidth; x++){ + uint8_t diff = *(pxd++); + if (diff > thresh){ + for (int ym = y-expansion; ym < y + expansion; ym++){ + if (ym < 0) continue; + if (ym >= scaledheight) break; + for (int xm = x-expansion; xm < x + expansion; xm++){ + if (xm < 0) continue; + if (xm >= scaledwidth) break; + uint8_t *pxm = pxmy + ym*stride + xm; + *pxm = 255; + } + } + } + } + } + +} + + +/*********************************************************************************************/ +// motion detect routine. +// Wc.width and Wc.height must be set +// buffer is passed in +// if it fails to allocate, it will TURN OFF detection +void WcDetectMotionFn(uint8_t *_jpg_buf, int _jpg_buf_len){ + int width = Wc.width/(1<len) { + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: motion buf size change now %d"), last_motion_buffer_len); + newbuffers = true; + } + } + + // if diff enable changed + if ((wc_motion.enable_diffbuff && !wc_motion.diff) || + (!wc_motion.enable_diffbuff && wc_motion.diff)){ + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: diff enable now %d"), wc_motion.enable_diffbuff); + newbuffers = true; + } + + if ((wc_motion.enable_backgroundbuff && !wc_motion.background) || + (!wc_motion.enable_backgroundbuff && wc_motion.background)){ + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: background enable now %d"), wc_motion.enable_backgroundbuff); + newbuffers = true; + } + + if ((wc_motion.enable_mask && !wc_motion.mask) || + (!wc_motion.enable_mask && wc_motion.mask)){ + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: mask enable now %d"), wc_motion.enable_mask); + newbuffers = true; + } + + // detect change in scale and swscale as well as frame size in + if (newbuffers){ + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: motion - realloc")); + // create and keep a frame buffers. + wc_motion.required_motion_buffer_len = last_motion_buffer_len; + wc_motion.motion_state = 0; // prevent set of output to stop bad detect at start + wc_motion.scaledwidth = scaledwidth; + wc_motion.scaledheight = scaledheight; + + // allocate or keep if len still correct + pic_alloc_p(&wc_motion.frame, width, height, 0, PIXFORMAT_GRAYSCALE, WC_ALLOC_ALWAYS); + if (!wc_motion.frame || !wc_motion.frame->allocatedLen) { + AddLog(LOG_LEVEL_ERROR, PSTR("CAM: motion: no allocate frame")); + pic_free_p(&wc_motion.frame); + } + pic_alloc_p(&wc_motion.last_motion, scaledwidth, scaledheight, 0, PIXFORMAT_GRAYSCALE, WC_ALLOC_ALWAYS); + if (!wc_motion.last_motion || !wc_motion.last_motion->allocatedLen) { + AddLog(LOG_LEVEL_ERROR, PSTR("CAM: motion: no allocate last_motion")); + pic_free_p(&wc_motion.last_motion); + } + if (wc_motion.enable_diffbuff){ + pic_alloc_p(&wc_motion.diff, scaledwidth, scaledheight, 0, PIXFORMAT_GRAYSCALE, WC_ALLOC_ALWAYS); + if (!wc_motion.diff || !wc_motion.diff->allocatedLen) { + AddLog(LOG_LEVEL_ERROR, PSTR("CAM: motion: no allocate diff")); + pic_free_p(&wc_motion.diff); + } + } else { + pic_free_p(&wc_motion.diff); + } + if (wc_motion.enable_backgroundbuff){ + pic_alloc_p(&wc_motion.background, scaledwidth, scaledheight, 0, PIXFORMAT_GRAYSCALE, WC_ALLOC_ALWAYS); + if (!wc_motion.background || !wc_motion.background->allocatedLen) { + AddLog(LOG_LEVEL_ERROR, PSTR("CAM: motion: no allocate background")); + pic_free_p(&wc_motion.background); + } + } else { + pic_free_p(&wc_motion.background); + } + if (wc_motion.enable_mask){ + pic_alloc_p(&wc_motion.mask, scaledwidth, scaledheight, 0, PIXFORMAT_GRAYSCALE, WC_ALLOC_ALWAYS); + if (!wc_motion.mask || !wc_motion.mask->allocatedLen) { + AddLog(LOG_LEVEL_ERROR, PSTR("CAM: motion: no allocate mask")); + pic_free_p(&wc_motion.mask); + } + } else { + pic_free_p(&wc_motion.mask); + } + } + + // every time, not just on allocation failure + if (!wc_motion.frame || !wc_motion.last_motion) { + // indicate failure + wc_motion.motion_trigger = 0; + wc_motion.motion_brightness = 0; + // and maybe signal via berry + wc_motion.motion_processed = 1; + return; + } + + // enable us to call with null just to allocate buffers + if (!_jpg_buf){ + return; + } + + uint32_t start = millis(); + + // both buffers are valid if we get here + bool jpegres; + + /*JPG_SCALE_NONE, JPG_SCALE_2X, JPG_SCALE_4X, JPG_SCALE_8X,*/ + int scale = wc_motion.scale; + // convert the input jpeg (full size) + // to a mono using jpeg decoder scaling to save memory + jpegres = wc_jpg2mono(_jpg_buf, _jpg_buf_len, wc_motion.frame, scale); + if (!jpegres){ + AddLog(LOG_LEVEL_ERROR, PSTR("CAM: motion: jpeg decode failure")); + wc_motion.motion_trigger = 0; + wc_motion.motion_brightness = 0; + // and maybe signal via berry + wc_motion.motion_processed = 1; + return; + } + + // setup pixel pointers + uint8_t *pxiy = wc_motion.frame->buff; + uint8_t *pxry = wc_motion.last_motion->buff; + + // optional difference buffer - may be nullptr unless enabled + uint8_t *pxdy = nullptr; + if (wc_motion.diff && wc_motion.diff->buff) pxdy = wc_motion.diff->buff; + // optional backkground buffer - may be nullptr unless enabled + uint8_t *pxby = nullptr; + if (wc_motion.background && wc_motion.background->buff) pxdy = wc_motion.background->buff; + // optional mask buffer - may be nullptr unless enabled + uint8_t *pxmy = nullptr; + if (wc_motion.mask && wc_motion.mask->buff) pxmy = wc_motion.mask->buff; + + // uint32 will handle up to 4096x4096x8bit + uint32_t accu = 0; + uint32_t bright = 0; + uint8_t thresh = wc_motion.pixelThreshold; + uint32_t changedPixelCount = 0; + + // for unscaled, a simple loop over total length, maybe marginally faster + if (wc_motion.frame->len == wc_motion.last_motion->len){ + uint8_t *pxi = pxiy; + uint8_t *pxr = pxry; + uint8_t *pxd = pxdy; // may be nullptr; + uint8_t *pxb = pxby; // may be nullptr; + uint8_t *pxm = pxmy; // may be nullptr; + for (int i = 0; i < wc_motion.frame->len; i++){ + // if we have a mask, and the mask pixel value > 20, then ignore this pixel + uint8_t gray = *pxi; + if (pxm && (*pxm > 20)) { + if (pxb) { + if (wc_motion.capture_background){ + *pxb = *pxi; + } + pxb++; + } + pxi++; + *(pxr++) = gray; // set background regardless + pxm++; + if (pxd) { + *(pxd++) = 0; // clear diff + } + } else { + uint8_t diff; + if (pxb){ + diff = abs((int)(*pxi) - (int)(*pxb)); + if (wc_motion.capture_background){ + *pxb = *pxi; + } + pxb++; + } else { + diff = abs((int)(*pxi) - (int)(*pxr)); + } + *(pxr++) = gray; + pxi++; + accu += diff; + // store difference image + // look at pixel threshold if configured + if (thresh && diff > thresh){ + changedPixelCount++; + if (pxd) diff = 255; + } + if (pxd) *(pxd++) = diff; + if (pxm) pxm++; + } + bright += gray; + } + } else { + uint32_t x, y; + // for softare scaled, a silightly more complex loop. + int xincrement = swscalex; + int yincrement = swscaley; + int stride = yincrement*width; + // sample half way down each scaled line, not at the top. + if (yincrement > 2){ + pxiy += stride*(yincrement/2); + } + for (y = 0; y < scaledheight; y++) { + uint8_t *pxi = pxiy + y*stride; + uint8_t *pxr = pxry + y*scaledwidth; + uint8_t *pxd = nullptr; + uint8_t *pxb = nullptr; + uint8_t *pxm = nullptr; + if (pxdy) pxd = pxdy + y*scaledwidth; + if (pxby) pxb = pxby + y*scaledwidth; + if (pxmy) pxm = pxmy + y*scaledwidth; + for (x = 0; x < scaledwidth;x ++) { + int32_t gray = *pxi; + if (pxm && (*pxm > 20)) { + if (pxb) { + if (wc_motion.capture_background){ + *pxb = gray; + } + pxb++; + } + pxi += xincrement; + *(pxr++) = gray; + pxm++; + if (pxd) *(pxd++) = 0; // clear diff + } else { + uint8_t diff; + if (pxb){ + diff = abs((int)(gray) - (int)(*pxb)); + if (wc_motion.capture_background){ + *pxb = gray; + } + pxb++; + } else { + diff = abs((int)(gray) - (int)(*pxr)); + } + *(pxr++) = gray; + pxi += xincrement; + accu += diff; + + // look at pixel threshold if configured + if (thresh && diff > thresh){ + changedPixelCount++; + if (pxd) diff = 255; + } + // store difference image + if (pxd) *(pxd++) = diff; + if (pxm) pxm++; + } + bright += gray; + } + } + } + + // we only capture background once when asked to by this flag + wc_motion.capture_background = 0; + + // when scaledpixelcount is < 100, float becomes necessary + float divider = (((float)scaledpixelcount) / 100.0); + + wc_motion.motion_brightness = (int)((float)bright / divider); + wc_motion.changedPixelPertenthousand = (int)((float)changedPixelCount / divider); + + if (wc_motion.motion_state){ + wc_motion.motion_trigger = (int)((float)accu / divider); + if (wc_motion.motion_trigger > wc_motion.motion_trigger_limit){ + wc_motion.motion_triggered = 1; + } + + if (wc_motion.pixel_trigger_limit && wc_motion.changedPixelPertenthousand > wc_motion.pixel_trigger_limit){ + wc_motion.motion_triggered = 1; + } + + } else { + // first run, + wc_motion.motion_state = 1; + wc_motion.motion_trigger = 0; + } + + // trigger Berry calling webcam.motion if it exists + wc_motion.motion_processed = 1; + + if (wc_motion.enable_mask && wc_motion.auto_mask > 0){ + WcAutoMask(); + wc_motion.auto_mask--; + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: motion: auto_mask %d"), wc_motion.auto_mask); + } + uint32_t end = millis(); + + wc_motion.last_duration = end - start; + WcMotionLog(); +} + +/*********************************************************************************************/ + + +// NOTE input format is esp format + 1, and 0 -> jpeg +// wcConvertFrame1-4 0 [0] - option arg scale 0-3 -> valid on jpeg decode only +void CmndWebcamConvertFrame(void){ + int bnum = XdrvMailbox.index; + // bnum is 1-4 + if ((bnum < 1) || (bnum > MAX_PICSTORE)){ + ResponseCmndError(); return; + } + int format = 0; + int scale = 0; + + if(XdrvMailbox.data_len){ + char tmp[20]; + strncpy(tmp, XdrvMailbox.data, 10); + char *arg = strtok(tmp, " "); + format = atoi(arg); + arg = strtok(nullptr, " "); + if (arg){ + scale = atoi(arg); + } + } + + // NOTE input format is esp format + 1, and 0 -> jpeg + if (!format){ + format = PIXFORMAT_JPEG; + } else { + format--; + } + if (!wc_check_format(format)){ + AddLog(LOG_LEVEL_ERROR, PSTR("CAM: Invalid format %d"), format+1); + ResponseCmndError(); return; + } + struct PICSTORE *ps = &Wc.picstore[bnum-1]; + if (!ps->buff){ + AddLog(LOG_LEVEL_ERROR, PSTR("CAM: No pic at %d"), bnum); + ResponseCmndError(); return; + } + if (ps->format != PIXFORMAT_JPEG && format != PIXFORMAT_JPEG){ + AddLog(LOG_LEVEL_ERROR, PSTR("CAM: ConvertFrame only go to or from JPEG")); + ResponseCmndError(); return; + } + + // takes INDEX into store + bool res = WcConvertFrame(bnum-1, format, scale); + res? ResponseCmndDone(): ResponseCmndError(); + return; +} + +// Allows Berry to send native address, len, format, optional width, height +// "addr len format [width height]" +// give it a bad address, and it WILL die. +void CmndWebcamSetPicture(void){ + int bnum = XdrvMailbox.index; + if (!XdrvMailbox.data_len || bnum < 1 || bnum > MAX_PICSTORE) { + ResponseCmndError(); + return; + } + struct PICSTORE *p = &Wc.picstore[bnum-1]; + + char tmp[100]; + strncpy(tmp, XdrvMailbox.data, 99); + // "addr len format [width height]" + // width/height if format not PIXFORMAT_JPEG=0/5 + // allowed formats + int format = 0; + uint32_t addr = 0; + int len = 0; + int height = 0; + int width = 0; + + int res = sscanf(tmp, "%u %d %d %d %d", + &addr, &len, &format, &height, &width); + + if (!format){ + format = PIXFORMAT_JPEG; + } else { + format--; + } + + if (res < 2){ + AddLog(LOG_LEVEL_ERROR, PSTR("CAM: SetPicture expects 'addr len format [width height]'")); + ResponseCmndError(); return; + } + if (!wc_check_format(format)){ + AddLog(LOG_LEVEL_ERROR, PSTR("CAM: Invalid format %d"), format+1); + ResponseCmndError(); return; + } + if (format != PIXFORMAT_JPEG && (!width || !height)){ + AddLog(LOG_LEVEL_ERROR, PSTR("CAM: SetPicture: format %d needs width and height"), format+1); + ResponseCmndError(); return; + } + + bool allocres = pic_alloc(p, width, height, len, format, 1); + if (!allocres){ + AddLog(LOG_LEVEL_ERROR, PSTR("CAM: SetPicture alloc failed")); + ResponseCmndError(); + return; + } + + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: SetPicture addr:%u len:%d format%d [width%d height%d]"), addr, len, format, width, height); + AddLog(LOG_LEVEL_DEBUG, PSTR("CAM: dest addr:%u len:%d/%d format%d [width%d height%d]"), p->buff, p->len, p->allocatedLen, p->format, p->width, p->height); + + // don't over copy if someone screws up height/width/size calc + // also, our buffer MAY have more space than required... + int copylen = (len < p->allocatedLen)?len:p->allocatedLen; + // copy Berry data. We can't free it, and Berry will + memcpy(p->buff, (void *)addr, copylen); + ResponseCmndDone(); + return; +} + + +// so that we can test scripting functions +void CmndWebcamSetMotionDetect(void) { + int res = 0; + // returns stuff if in is -ve? + switch(XdrvMailbox.index){ + case 1: + // original features + res = WcSetMotionDetect(XdrvMailbox.payload); + break; + case 2: + res = Wc.lenDiffLimit = XdrvMailbox.payload; + break; + case 3: + if (XdrvMailbox.payload >= 0 && XdrvMailbox.payload <= 255){ + wc_motion.pixelThreshold = XdrvMailbox.payload; + } + res = wc_motion.pixelThreshold; + break; + case 4: + if (XdrvMailbox.payload >= 0){ + wc_motion.pixel_trigger_limit = XdrvMailbox.payload; + } + res = wc_motion.pixel_trigger_limit; + break; + case 5: { + int scale = wc_motion.scale; + if (scale == 3) scale += wc_motion.swscale; + if (XdrvMailbox.payload >= 0 && XdrvMailbox.payload <= 7){ + scale = XdrvMailbox.payload; + if (scale < 0) scale = 0; + if (scale > 7) scale = 7; + if (scale <= 3){ + wc_motion.scale = scale; + wc_motion.swscale = 0; + } else { + wc_motion.scale = 3; + wc_motion.swscale = scale - 4; + } + } + res = scale; + } break; + case 6: // enable use of a difference frame - readable + if (XdrvMailbox.payload >= 0 && XdrvMailbox.payload <= 1){ + wc_motion.enable_diffbuff = XdrvMailbox.payload & 1; + } + res = wc_motion.enable_diffbuff; + break; + case 7: // ammount of changed picture (accumulated diff) + if (XdrvMailbox.payload >= 0){ + wc_motion.motion_trigger_limit = XdrvMailbox.payload; + } + res = wc_motion.motion_trigger_limit; + break; + case 8:{ // set mask feature. must be done AFTER setting resolution or scale... + int auto_mask_count = 1; + int auto_mask_pixel_threshold = 10; + int auto_mask_pixel_expansion = 4; + + if (0 == XdrvMailbox.data_len) { + res = wc_motion.enable_mask? 1:0; + break; + } else { + char tmp[40]; + strncpy(tmp, XdrvMailbox.data, 10); + char *p = tmp; + char *arg = strtok(tmp, " "); + auto_mask_count = atoi(arg); + arg = strtok(nullptr, " "); + if (arg){ + auto_mask_pixel_threshold = atoi(arg); + arg = strtok(nullptr, " "); + if (arg){ + auto_mask_pixel_expansion = atoi(arg); + } + } + } + + if (!auto_mask_count){ + wc_motion.enable_mask = 0; + res = 0; + break; + } + if (!wc_motion.enable_mask){ + TasAutoMutex localmutex(&WebcamMutex, "setMotionDetect", 30000); + // force buffer allocation/length calc + if (auto_mask_count > 1){ + wc_motion.enable_mask = 1; + wc_motion.enable_diffbuff = 1; // enable the diff buff, we use if for automask + } + // force buffer allocation now + WcDetectMotionFn(nullptr, 0); + } + + if (wc_motion.mask && wc_motion.mask->buff){ + memset(wc_motion.mask->buff, 0, wc_motion.mask->len); + if (XdrvMailbox.payload > 1){ + // if 2+, then represents count of motion detects to make mask from + wc_motion.auto_mask = auto_mask_count; + wc_motion.auto_mask_pixel_threshold = auto_mask_pixel_threshold; + wc_motion.auto_mask_pixel_expansion = auto_mask_pixel_expansion; + } + res = auto_mask_count; + } else { + AddLog(LOG_LEVEL_ERROR, PSTR("CAM: motion: unable to allocate mask buffer")); + res = 0; + } + } break; + case 9: // enable use of a background frame - readable + // and trigger capture of next wc_motion image into background + if (XdrvMailbox.payload >= 0 && XdrvMailbox.payload <= 1){ + wc_motion.enable_backgroundbuff = XdrvMailbox.payload & 1; + wc_motion.capture_background = 1; + } + res = wc_motion.enable_diffbuff; + break; + } + ResponseCmndNumber(res); +} + +// wcGetMotionPixels1-n [1-n] +// if optional second argument is given the picture is copied to that picstore. +// so making it easy to convert/save. +void CmndWebcamGetMotionPixels(void) { + // NOTE: the buffers returned here are static unless the frame size or scale changes. + // use with care + int width = Wc.width/(1< MAX_PICSTORE) { + ResponseCmndError(); + return; + } + } + + uint8_t *t = nullptr; + int len = 0; + int format = 0; + struct PICSTORE *p = nullptr; + switch (XdrvMailbox.index){ + case 1:{ + p = wc_motion.last_motion; + } break; + case 2:{ // optional diff buffer + p = wc_motion.diff; + } break; + case 3:{ // optional mask buffer + p = wc_motion.mask; + } break; + case 4:{ // optional background buffer + p = wc_motion.background; + } break; + } + + if (!p){ + ResponseCmndError(); + return; + } + + if (bnum > 1){ + bool res = pic_alloc(&Wc.picstore[bnum-1], p->width, p->height, 0, p->format, WC_ALLOC_ALWAYS); + if (res){ + memcpy(Wc.picstore[bnum-1].buff, p->buff, p->len); + p = &Wc.picstore[bnum-1]; + } else { + ResponseCmndError(); + return; + } + } + + char resp[100] = "0"; + snprintf_P(resp, sizeof(resp), PSTR("{\"buff\":%d,\"addr\":%d,\"len\":%d,\"w\":%d,\"h\":%d,\"format\":%d}"), + bnum, p->buff, p->len, p->width, p->height, p->format+1); + Response_P(S_JSON_COMMAND_XVALUE, XdrvMailbox.command, resp); +} + +#endif // !USE_WEBCAM_LEGACY +#endif // USE_WEBCAM_MOTION +#endif // USE_WEBCAM +#endif // ESP32 From ca14dc550744bbd6fbeb4e340ca9bfc71b063643 Mon Sep 17 00:00:00 2001 From: stefanbode Date: Tue, 22 Aug 2023 09:21:30 +0200 Subject: [PATCH 017/225] Shutter ESP32 fixes (#19362) * fix esp32 shutter * fix shutterinvert+shutterbutton --- .../xdrv_01_9_webserver.ino | 2 +- .../xdrv_27_esp32_shutter.ino | 20 +++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino b/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino index 50c959aac..af0cfa588 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino @@ -1271,7 +1271,7 @@ void HandleRoot(void) int32_t ShutterWebButton; if (ShutterWebButton = IsShutterWebButton(idx)) { WSContentSend_P(HTTP_DEVICE_CONTROL, 100 / cols, idx, - (set_button) ? SettingsText(SET_BUTTON1 + idx -1) : ((ShutterGetOptions(abs(ShutterWebButton)-1) & 2) /* is locked */ ? "-" : ((Settings->shutter_options[abs(ShutterWebButton)-1] & 8) /* invert web buttons */ ? ((ShutterWebButton>0) ? "▼" : "▲") : ((ShutterWebButton>0) ? "▲" : "▼"))), + (set_button) ? SettingsText(SET_BUTTON1 + idx -1) : ((ShutterGetOptions(abs(ShutterWebButton)-1) & 2) /* is locked */ ? "-" : ((ShutterGetOptions(abs(ShutterWebButton)-1) & 8) /* invert web buttons */ ? ((ShutterWebButton>0) ? "▼" : "▲") : ((ShutterWebButton>0) ? "▲" : "▼"))), ""); } else { #endif // USE_SHUTTER diff --git a/tasmota/tasmota_xdrv_driver/xdrv_27_esp32_shutter.ino b/tasmota/tasmota_xdrv_driver/xdrv_27_esp32_shutter.ino index c0383ccf9..7d88e10e4 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_27_esp32_shutter.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_27_esp32_shutter.ino @@ -698,9 +698,12 @@ void ShutterReportPosition(bool always, uint32_t index) ShutterLogPos(i); shutter_running++; } - if (i && index == MAX_SHUTTERS_ESP32) { ResponseAppend_P(PSTR(",")); } - ResponseAppend_P(JSON_SHUTTER_POS, i+1, ShutterRealToPercentPosition(Shutter[i].real_position, i), Shutter[i].direction, ShutterRealToPercentPosition(Shutter[i].target_position, i), Shutter[i].tilt_real_pos ); - } + if (i && index == MAX_SHUTTERS) { ResponseAppend_P(PSTR(",")); } + uint32_t position = ShutterRealToPercentPosition(Shutter[i].real_position, i); + uint32_t target = ShutterRealToPercentPosition(Shutter[i].target_position, i); + ResponseAppend_P(JSON_SHUTTER_POS, i+1, (ShutterSettings.shutter_options[i] & 1) ? 100-position : position, Shutter[i].direction,(ShutterSettings.shutter_options[i] & 1) ? 100-target : target, Shutter[i].tilt_real_pos ); + //ResponseAppend_P(JSON_SHUTTER_POS, i+1, position, Shutter[i].direction, target, Shutter[i].tilt_real_pos ); + } ResponseJsonEnd(); if (always || shutter_running) { MqttPublishPrefixTopicRulesProcess_P(RESULT_OR_STAT, PSTR(D_PRFX_SHUTTER)); // RulesProcess() now re-entry protected @@ -1319,7 +1322,7 @@ void ShutterToggle(bool dir) void ShutterShow(){ for (uint32_t i = 0; i < TasmotaGlobal.shutters_present; i++) { - WSContentSend_P(HTTP_MSG_SLIDER_SHUTTER, (Settings->shutter_options[i] & 1) ? D_OPEN : D_CLOSE,(Settings->shutter_options[i] & 1) ? D_CLOSE : D_OPEN, (Settings->shutter_options[i] & 1) ? (100 - ShutterRealToPercentPosition(-9999, i)) : ShutterRealToPercentPosition(-9999, i), i+1); + WSContentSend_P(HTTP_MSG_SLIDER_SHUTTER, (ShutterGetOptions(i) & 1) ? D_OPEN : D_CLOSE,(ShutterGetOptions(i) & 1) ? D_CLOSE : D_OPEN, (ShutterGetOptions(i) & 1) ? (100 - ShutterRealToPercentPosition(-9999, i)) : ShutterRealToPercentPosition(-9999, i), i+1); } } /*********************************************************************************************\ @@ -1515,9 +1518,8 @@ void CmndShutterPosition(void) int8_t target_pos_percent = (XdrvMailbox.payload < 0) ? (XdrvMailbox.payload == -99 ? ShutterRealToPercentPosition(Shutter[index].real_position, index) : 0) : ((XdrvMailbox.payload > 100) ? 100 : XdrvMailbox.payload); target_pos_percent = ((Settings->shutter_options[index] & 1) && ((SRC_MQTT != TasmotaGlobal.last_source) - && (SRC_SERIAL != TasmotaGlobal.last_source) - && (SRC_WEBGUI != TasmotaGlobal.last_source) - && (SRC_WEBCOMMAND != TasmotaGlobal.last_source) + || (SRC_SERIAL != TasmotaGlobal.last_source) + || (SRC_WEBCOMMAND != TasmotaGlobal.last_source) )) ? 100 - target_pos_percent : target_pos_percent; if (XdrvMailbox.payload != -99) { @@ -1875,14 +1877,16 @@ void CmndShutterButton(void) ShutterSettings.shutter_button[i].position[j] = {-1,-128,0}; } else { setting.enabled = true; - setting.shutter_number == XdrvMailbox.index-1; + setting.shutter_number = XdrvMailbox.index-1; ShutterSettings.shutter_button[button_index-1] = setting; + //AddLog(LOG_LEVEL_DEBUG, PSTR("SHT: ENABLE SHT:%d -> %d"),XdrvMailbox.index-1,ShutterSettings.shutter_button[button_index-1]); } } } char setting_chr[30*MAX_SHUTTER_KEYS] = "-", *setting_chr_ptr = setting_chr; for (uint32_t i=0 ; i < MAX_SHUTTERS_ESP32*2 ; i++) { setting = ShutterSettings.shutter_button[i]; + //AddLog(LOG_LEVEL_DEBUG, PSTR("SHT: Setting: SHT on BTN:%d, index:%d"),ShutterSettings.shutter_button[i].shutter_number,XdrvMailbox.index-1); if ((setting.enabled) && (ShutterSettings.shutter_button[i].shutter_number == XdrvMailbox.index-1)) { if (*setting_chr_ptr == 0) setting_chr_ptr += sprintf_P(setting_chr_ptr, PSTR("|")); From 701d33f645d70e46bb583e147aea120782d5e084 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Wed, 23 Aug 2023 13:02:13 +0200 Subject: [PATCH 018/225] Phase 2 support C2/C6 --- lib/lib_display/UDisplay/uDisplay.h | 2 +- .../rfid-1.4.7/src/MFRC522Extended.cpp | 4 +- .../Adafruit_TSL2591.cpp | 4 +- .../Joba_Tsl2561-2.0.10/src/Tsl2561.cpp | 8 +- lib/lib_i2c/Joba_Tsl2561-2.0.10/src/Tsl2561.h | 4 +- .../src/SensirionI2CCommunication.cpp | 20 +- .../src/SensirionI2CTxFrame.cpp | 6 +- .../Sensirion_Core/src/SensirionRxFrame.cpp | 12 +- .../src/SensirionShdlcCommunication.cpp | 18 +- .../src/SensirionShdlcTxFrame.cpp | 4 +- .../src/esp8266toEsp32.cpp | 16 +- .../src/esp8266toEsp32.h | 5 + .../HttpClientLight/src/TasUpdater.cpp | 4 + .../berry_mapping/src/be_class_wrapper.c | 2 +- .../ESP32-HomeKit/src/port/bignum.h | 2 +- .../ESP32-HomeKit/src/port/bignum_ESP32.c | 5 +- .../ESP32-HomeKit/src/port/bignum_ESP32_C3.c | 4 +- .../ESP32-HomeKit/src/port/bignum_ESP32_C3.h | 4 +- .../ESP32-HomeKit/src/port/bignum_impl.h | 4 +- .../ESP32-HomeKit/src/port/esp_bignum.c | 4 +- lib/libesp32_div/NimBLE-Arduino/library.json | 2 +- .../NimBLE-Arduino/src/NimBLEDevice.cpp | 2 +- .../NimBLE-Arduino/src/nimconfig.h | 2 +- .../.github/workflows/build.yml | 65 + lib/libesp32_div/esp-nimble-cpp/.gitignore | 1 + lib/libesp32_div/esp-nimble-cpp/CHANGELOG.md | 280 ++ .../esp-nimble-cpp/CMakeLists.txt | 64 + .../esp-nimble-cpp/CMakeLists.txt_idf3 | 56 + lib/libesp32_div/esp-nimble-cpp/Kconfig | 72 + lib/libesp32_div/esp-nimble-cpp/LICENSE | 203 ++ lib/libesp32_div/esp-nimble-cpp/README.md | 70 + lib/libesp32_div/esp-nimble-cpp/component.mk | 2 + .../docs/Bluetooth 5 features.md | 28 + lib/libesp32_div/esp-nimble-cpp/docs/Doxyfile | 2778 +++++++++++++++++ .../docs/Improvements_and_updates.md | 149 + .../esp-nimble-cpp/docs/Migration_guide.md | 432 +++ .../esp-nimble-cpp/docs/New_user_guide.md | 339 ++ .../esp-nimble-cpp/docs/Usage_tips.md | 41 + lib/libesp32_div/esp-nimble-cpp/docs/index.md | 58 + .../Advanced/NimBLE_Client/CMakeLists.txt | 7 + .../examples/Advanced/NimBLE_Client/Makefile | 3 + .../NimBLE_Client/main/CMakeLists.txt | 4 + .../Advanced/NimBLE_Client/main/component.mk | 4 + .../Advanced/NimBLE_Client/main/main.cpp | 370 +++ .../Advanced/NimBLE_Client/sdkconfig.defaults | 12 + .../Advanced/NimBLE_Server/CMakeLists.txt | 7 + .../examples/Advanced/NimBLE_Server/Makefile | 3 + .../NimBLE_Server/main/CMakeLists.txt | 4 + .../Advanced/NimBLE_Server/main/component.mk | 4 + .../Advanced/NimBLE_Server/main/main.cpp | 242 ++ .../Advanced/NimBLE_Server/sdkconfig.defaults | 12 + .../NimBLE_extended_client/CMakeLists.txt | 7 + .../NimBLE_extended_client/Makefile | 3 + .../main/CMakeLists.txt | 4 + .../NimBLE_extended_client/main/component.mk | 4 + .../NimBLE_extended_client/main/main.cpp | 163 + .../NimBLE_extended_client/sdkconfig.defaults | 13 + .../NimBLE_extended_server/CMakeLists.txt | 7 + .../NimBLE_extended_server/Makefile | 3 + .../main/CMakeLists.txt | 4 + .../NimBLE_extended_server/main/component.mk | 4 + .../NimBLE_extended_server/main/main.cpp | 139 + .../NimBLE_extended_server/sdkconfig.defaults | 13 + .../NimBLE_multi_advertiser/CMakeLists.txt | 7 + .../NimBLE_multi_advertiser/Makefile | 3 + .../main/CMakeLists.txt | 4 + .../NimBLE_multi_advertiser/main/component.mk | 4 + .../NimBLE_multi_advertiser/main/main.cpp | 170 + .../sdkconfig.defaults | 13 + .../NimBLE_active_passive_scan.ino | 48 + .../examples/basic/BLE_client/CMakeLists.txt | 7 + .../examples/basic/BLE_client/Makefile | 3 + .../basic/BLE_client/main/CMakeLists.txt | 4 + .../basic/BLE_client/main/component.mk | 4 + .../examples/basic/BLE_client/main/main.cpp | 203 ++ .../basic/BLE_client/sdkconfig.defaults | 12 + .../examples/basic/BLE_notify/CMakeLists.txt | 7 + .../examples/basic/BLE_notify/Makefile | 3 + .../basic/BLE_notify/main/CMakeLists.txt | 4 + .../basic/BLE_notify/main/component.mk | 4 + .../examples/basic/BLE_notify/main/main.cpp | 155 + .../basic/BLE_notify/sdkconfig.defaults | 12 + .../examples/basic/BLE_scan/CMakeLists.txt | 7 + .../examples/basic/BLE_scan/Makefile | 3 + .../basic/BLE_scan/main/CMakeLists.txt | 4 + .../examples/basic/BLE_scan/main/component.mk | 4 + .../examples/basic/BLE_scan/main/main.cpp | 52 + .../basic/BLE_scan/sdkconfig.defaults | 12 + .../examples/basic/BLE_server/CMakeLists.txt | 7 + .../examples/basic/BLE_server/Makefile | 3 + .../basic/BLE_server/main/CMakeLists.txt | 4 + .../basic/BLE_server/main/component.mk | 4 + .../examples/basic/BLE_server/main/main.cpp | 57 + .../basic/BLE_server/sdkconfig.defaults | 12 + .../examples/basic/BLE_uart/CMakeLists.txt | 7 + .../examples/basic/BLE_uart/Makefile | 3 + .../basic/BLE_uart/main/CMakeLists.txt | 4 + .../examples/basic/BLE_uart/main/component.mk | 4 + .../examples/basic/BLE_uart/main/main.cpp | 167 + .../basic/BLE_uart/sdkconfig.defaults | 12 + lib/libesp32_div/esp-nimble-cpp/library.json | 8 + .../esp-nimble-cpp/library.properties | 10 + .../esp-nimble-cpp/src/HIDKeyboardTypes.h | 402 +++ .../esp-nimble-cpp/src/HIDTypes.h | 91 + .../esp-nimble-cpp/src/NimBLE2904.cpp | 86 + .../esp-nimble-cpp/src/NimBLE2904.h | 83 + .../esp-nimble-cpp/src/NimBLEAddress.cpp | 197 ++ .../esp-nimble-cpp/src/NimBLEAddress.h | 62 + .../src/NimBLEAdvertisedDevice.cpp | 894 ++++++ .../src/NimBLEAdvertisedDevice.h | 181 ++ .../esp-nimble-cpp/src/NimBLEAdvertising.cpp | 1072 +++++++ .../esp-nimble-cpp/src/NimBLEAdvertising.h | 144 + .../esp-nimble-cpp/src/NimBLEAttValue.h | 447 +++ .../esp-nimble-cpp/src/NimBLEBeacon.cpp | 157 + .../esp-nimble-cpp/src/NimBLEBeacon.h | 51 + .../src/NimBLECharacteristic.cpp | 658 ++++ .../esp-nimble-cpp/src/NimBLECharacteristic.h | 213 ++ .../esp-nimble-cpp/src/NimBLEClient.cpp | 1277 ++++++++ .../esp-nimble-cpp/src/NimBLEClient.h | 167 + .../esp-nimble-cpp/src/NimBLEConnInfo.h | 58 + .../esp-nimble-cpp/src/NimBLEDescriptor.cpp | 307 ++ .../esp-nimble-cpp/src/NimBLEDescriptor.h | 120 + .../esp-nimble-cpp/src/NimBLEDevice.cpp | 1211 +++++++ .../esp-nimble-cpp/src/NimBLEDevice.h | 241 ++ .../esp-nimble-cpp/src/NimBLEEddystoneTLM.cpp | 227 ++ .../esp-nimble-cpp/src/NimBLEEddystoneTLM.h | 61 + .../esp-nimble-cpp/src/NimBLEEddystoneURL.cpp | 204 ++ .../esp-nimble-cpp/src/NimBLEEddystoneURL.h | 52 + .../src/NimBLEExtAdvertising.cpp | 870 ++++++ .../esp-nimble-cpp/src/NimBLEExtAdvertising.h | 152 + .../esp-nimble-cpp/src/NimBLEHIDDevice.cpp | 248 ++ .../esp-nimble-cpp/src/NimBLEHIDDevice.h | 86 + .../esp-nimble-cpp/src/NimBLELog.h | 80 + .../src/NimBLERemoteCharacteristic.cpp | 806 +++++ .../src/NimBLERemoteCharacteristic.h | 180 ++ .../src/NimBLERemoteDescriptor.cpp | 335 ++ .../src/NimBLERemoteDescriptor.h | 104 + .../src/NimBLERemoteService.cpp | 413 +++ .../esp-nimble-cpp/src/NimBLERemoteService.h | 85 + .../esp-nimble-cpp/src/NimBLEScan.cpp | 574 ++++ .../esp-nimble-cpp/src/NimBLEScan.h | 128 + .../esp-nimble-cpp/src/NimBLEServer.cpp | 868 +++++ .../esp-nimble-cpp/src/NimBLEServer.h | 176 ++ .../esp-nimble-cpp/src/NimBLEService.cpp | 437 +++ .../esp-nimble-cpp/src/NimBLEService.h | 87 + .../esp-nimble-cpp/src/NimBLEUUID.cpp | 360 +++ .../esp-nimble-cpp/src/NimBLEUUID.h | 64 + .../esp-nimble-cpp/src/NimBLEUtils.cpp | 518 +++ .../esp-nimble-cpp/src/NimBLEUtils.h | 51 + .../esp-nimble-cpp/src/nimconfig.h | 140 + .../esp-nimble-cpp/src/nimconfig_rename.h | 61 + .../lvgl/src/core/lv_obj_style.h | 2 +- tasmota/tasmota_support/support_esp.ino | 11 +- 153 files changed, 22293 insertions(+), 69 deletions(-) create mode 100644 lib/libesp32_div/esp-nimble-cpp/.github/workflows/build.yml create mode 100644 lib/libesp32_div/esp-nimble-cpp/.gitignore create mode 100644 lib/libesp32_div/esp-nimble-cpp/CHANGELOG.md create mode 100644 lib/libesp32_div/esp-nimble-cpp/CMakeLists.txt create mode 100644 lib/libesp32_div/esp-nimble-cpp/CMakeLists.txt_idf3 create mode 100644 lib/libesp32_div/esp-nimble-cpp/Kconfig create mode 100644 lib/libesp32_div/esp-nimble-cpp/LICENSE create mode 100644 lib/libesp32_div/esp-nimble-cpp/README.md create mode 100644 lib/libesp32_div/esp-nimble-cpp/component.mk create mode 100644 lib/libesp32_div/esp-nimble-cpp/docs/Bluetooth 5 features.md create mode 100644 lib/libesp32_div/esp-nimble-cpp/docs/Doxyfile create mode 100644 lib/libesp32_div/esp-nimble-cpp/docs/Improvements_and_updates.md create mode 100644 lib/libesp32_div/esp-nimble-cpp/docs/Migration_guide.md create mode 100644 lib/libesp32_div/esp-nimble-cpp/docs/New_user_guide.md create mode 100644 lib/libesp32_div/esp-nimble-cpp/docs/Usage_tips.md create mode 100644 lib/libesp32_div/esp-nimble-cpp/docs/index.md create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Advanced/NimBLE_Client/CMakeLists.txt create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Advanced/NimBLE_Client/Makefile create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Advanced/NimBLE_Client/main/CMakeLists.txt create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Advanced/NimBLE_Client/main/component.mk create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Advanced/NimBLE_Client/main/main.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Advanced/NimBLE_Client/sdkconfig.defaults create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Advanced/NimBLE_Server/CMakeLists.txt create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Advanced/NimBLE_Server/Makefile create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Advanced/NimBLE_Server/main/CMakeLists.txt create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Advanced/NimBLE_Server/main/component.mk create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Advanced/NimBLE_Server/main/main.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Advanced/NimBLE_Server/sdkconfig.defaults create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Bluetooth_5/NimBLE_extended_client/CMakeLists.txt create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Bluetooth_5/NimBLE_extended_client/Makefile create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Bluetooth_5/NimBLE_extended_client/main/CMakeLists.txt create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Bluetooth_5/NimBLE_extended_client/main/component.mk create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Bluetooth_5/NimBLE_extended_client/main/main.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Bluetooth_5/NimBLE_extended_client/sdkconfig.defaults create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Bluetooth_5/NimBLE_extended_server/CMakeLists.txt create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Bluetooth_5/NimBLE_extended_server/Makefile create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Bluetooth_5/NimBLE_extended_server/main/CMakeLists.txt create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Bluetooth_5/NimBLE_extended_server/main/component.mk create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Bluetooth_5/NimBLE_extended_server/main/main.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Bluetooth_5/NimBLE_extended_server/sdkconfig.defaults create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Bluetooth_5/NimBLE_multi_advertiser/CMakeLists.txt create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Bluetooth_5/NimBLE_multi_advertiser/Makefile create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Bluetooth_5/NimBLE_multi_advertiser/main/CMakeLists.txt create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Bluetooth_5/NimBLE_multi_advertiser/main/component.mk create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Bluetooth_5/NimBLE_multi_advertiser/main/main.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/Bluetooth_5/NimBLE_multi_advertiser/sdkconfig.defaults create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/NimBLE_active_passive_scan/NimBLE_active_passive_scan.ino create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_client/CMakeLists.txt create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_client/Makefile create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_client/main/CMakeLists.txt create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_client/main/component.mk create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_client/main/main.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_client/sdkconfig.defaults create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_notify/CMakeLists.txt create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_notify/Makefile create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_notify/main/CMakeLists.txt create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_notify/main/component.mk create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_notify/main/main.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_notify/sdkconfig.defaults create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_scan/CMakeLists.txt create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_scan/Makefile create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_scan/main/CMakeLists.txt create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_scan/main/component.mk create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_scan/main/main.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_scan/sdkconfig.defaults create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_server/CMakeLists.txt create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_server/Makefile create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_server/main/CMakeLists.txt create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_server/main/component.mk create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_server/main/main.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_server/sdkconfig.defaults create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_uart/CMakeLists.txt create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_uart/Makefile create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_uart/main/CMakeLists.txt create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_uart/main/component.mk create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_uart/main/main.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/examples/basic/BLE_uart/sdkconfig.defaults create mode 100644 lib/libesp32_div/esp-nimble-cpp/library.json create mode 100644 lib/libesp32_div/esp-nimble-cpp/library.properties create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/HIDKeyboardTypes.h create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/HIDTypes.h create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLE2904.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLE2904.h create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEAddress.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEAddress.h create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEAdvertisedDevice.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEAdvertisedDevice.h create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEAdvertising.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEAdvertising.h create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEAttValue.h create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEBeacon.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEBeacon.h create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLECharacteristic.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLECharacteristic.h create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEClient.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEClient.h create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEConnInfo.h create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEDescriptor.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEDescriptor.h create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEDevice.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEDevice.h create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEEddystoneTLM.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEEddystoneTLM.h create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEEddystoneURL.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEEddystoneURL.h create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEExtAdvertising.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEExtAdvertising.h create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEHIDDevice.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEHIDDevice.h create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLELog.h create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLERemoteCharacteristic.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLERemoteCharacteristic.h create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLERemoteDescriptor.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLERemoteDescriptor.h create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLERemoteService.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLERemoteService.h create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEScan.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEScan.h create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEServer.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEServer.h create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEService.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEService.h create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEUUID.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEUUID.h create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEUtils.cpp create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/NimBLEUtils.h create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/nimconfig.h create mode 100644 lib/libesp32_div/esp-nimble-cpp/src/nimconfig_rename.h diff --git a/lib/lib_display/UDisplay/uDisplay.h b/lib/lib_display/UDisplay/uDisplay.h index 2f11044f1..7ea6e57e6 100755 --- a/lib/lib_display/UDisplay/uDisplay.h +++ b/lib/lib_display/UDisplay/uDisplay.h @@ -89,7 +89,7 @@ enum uColorType { uCOLOR_BW, uCOLOR_COLOR }; #undef GPIO_CLR #undef GPIO_SET_SLOW #undef GPIO_CLR_SLOW -#if CONFIG_IDF_TARGET_ESP32C3 +#if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 #define GPIO_CLR(A) GPIO.out_w1tc.val = (1 << A) #define GPIO_SET(A) GPIO.out_w1ts.val = (1 << A) #else // plain ESP32 diff --git a/lib/lib_div/rfid-1.4.7/src/MFRC522Extended.cpp b/lib/lib_div/rfid-1.4.7/src/MFRC522Extended.cpp index da603ab77..fcf030f9b 100644 --- a/lib/lib_div/rfid-1.4.7/src/MFRC522Extended.cpp +++ b/lib/lib_div/rfid-1.4.7/src/MFRC522Extended.cpp @@ -821,7 +821,7 @@ MFRC522::StatusCode MFRC522Extended::TCL_Transceive(TagInfo *tag, byte *sendData // Swap block number on success tag->blockNumber = !tag->blockNumber; - if (backData && (backLen > 0)) { + if (backData && (backLen != 0)) { if (*backLen < in.inf.size) return STATUS_NO_ROOM; @@ -844,7 +844,7 @@ MFRC522::StatusCode MFRC522Extended::TCL_Transceive(TagInfo *tag, byte *sendData if (result != STATUS_OK) return result; - if (backData && (backLen > 0)) { + if (backData && (backLen != 0)) { if ((*backLen + ackDataSize) > totalBackLen) return STATUS_NO_ROOM; diff --git a/lib/lib_i2c/Adafruit_TSL2591_Library/Adafruit_TSL2591.cpp b/lib/lib_i2c/Adafruit_TSL2591_Library/Adafruit_TSL2591.cpp index 1cd9a9de3..57a0a67a9 100644 --- a/lib/lib_i2c/Adafruit_TSL2591_Library/Adafruit_TSL2591.cpp +++ b/lib/lib_i2c/Adafruit_TSL2591_Library/Adafruit_TSL2591.cpp @@ -214,7 +214,7 @@ void Adafruit_TSL2591::setGain(tsl2591Gain_t gain) enable(); _gain = gain; - write8(TSL2591_COMMAND_BIT | TSL2591_REGISTER_CONTROL, _integration | _gain); + write8(TSL2591_COMMAND_BIT | TSL2591_REGISTER_CONTROL, static_cast(_integration) | static_cast(_gain)); disable(); } @@ -245,7 +245,7 @@ void Adafruit_TSL2591::setTiming(tsl2591IntegrationTime_t integration) enable(); _integration = integration; - write8(TSL2591_COMMAND_BIT | TSL2591_REGISTER_CONTROL, _integration | _gain); + write8(TSL2591_COMMAND_BIT | TSL2591_REGISTER_CONTROL, static_cast(_integration) | static_cast(_gain)); disable(); } diff --git a/lib/lib_i2c/Joba_Tsl2561-2.0.10/src/Tsl2561.cpp b/lib/lib_i2c/Joba_Tsl2561-2.0.10/src/Tsl2561.cpp index f0e324eb8..a44a9cd32 100644 --- a/lib/lib_i2c/Joba_Tsl2561-2.0.10/src/Tsl2561.cpp +++ b/lib/lib_i2c/Joba_Tsl2561-2.0.10/src/Tsl2561.cpp @@ -47,7 +47,7 @@ bool Tsl2561::begin() { bool Tsl2561::readByte( register_t reg, uint8_t &val ) { _wire.beginTransmission(_addr); - _wire.write(reg | CONTROL_CMD); + _wire.write(reg | static_cast(CONTROL_CMD)); if( (_status = static_cast(_wire.endTransmission(false))) == ERR_OK ) { if( _wire.requestFrom(_addr, 1) == 1 ) { val = static_cast(_wire.read()); @@ -61,7 +61,7 @@ bool Tsl2561::readByte( register_t reg, uint8_t &val ) { bool Tsl2561::readWord( register_t reg, uint16_t &val ) { _wire.beginTransmission(_addr); - _wire.write(reg | CONTROL_CMD); + _wire.write(reg | static_cast(CONTROL_CMD)); if( (_status = static_cast(_wire.endTransmission(false))) == ERR_OK ) { if( _wire.requestFrom(_addr, 2) == 2 ) { val = static_cast(_wire.read()) & 0xff; @@ -76,7 +76,7 @@ bool Tsl2561::readWord( register_t reg, uint16_t &val ) { bool Tsl2561::writeByte( register_t reg, uint8_t val ) { _wire.beginTransmission(_addr); - _wire.write(reg | CONTROL_CMD); + _wire.write(reg | static_cast(CONTROL_CMD)); _wire.write(val); return (_status = static_cast(_wire.endTransmission())) == ERR_OK; } @@ -118,7 +118,7 @@ bool Tsl2561::off() { } bool Tsl2561::setSensitivity( bool gain, exposure_t exposure ) { - return writeByte(REG_TIMING, (gain ? GAIN_ON : GAIN_OFF) | exposure); + return writeByte(REG_TIMING, (gain ? GAIN_ON : GAIN_OFF) | static_cast(exposure)); } bool Tsl2561::getSensitivity( bool &gain, exposure_t &exposure ) diff --git a/lib/lib_i2c/Joba_Tsl2561-2.0.10/src/Tsl2561.h b/lib/lib_i2c/Joba_Tsl2561-2.0.10/src/Tsl2561.h index 147db2a77..84f86ee27 100644 --- a/lib/lib_i2c/Joba_Tsl2561-2.0.10/src/Tsl2561.h +++ b/lib/lib_i2c/Joba_Tsl2561-2.0.10/src/Tsl2561.h @@ -42,7 +42,7 @@ public: ADDR_VDD = 0b1001001 } address_t; - typedef enum { + typedef enum : uint8_t { REG_CONTROL, // Control of basic functions REG_TIMING, // Integration time/gain control REG_THRESHLOWLOW, // Low byte of low interrupt threshold @@ -61,7 +61,7 @@ public: REG_DATA1HIGH // High byte of ADC channel 1 } register_t; - enum { + enum : uint8_t{ CONTROL_CMD = 0b10000000, CONTROL_CLEAR = 0b01000000, CONTROL_WORD = 0b00100000, // SPI only? diff --git a/lib/lib_i2c/Sensirion_Core/src/SensirionI2CCommunication.cpp b/lib/lib_i2c/Sensirion_Core/src/SensirionI2CCommunication.cpp index 2d8b7acab..b95502c47 100644 --- a/lib/lib_i2c/Sensirion_Core/src/SensirionI2CCommunication.cpp +++ b/lib/lib_i2c/Sensirion_Core/src/SensirionI2CCommunication.cpp @@ -52,7 +52,7 @@ uint16_t SensirionI2CCommunication::sendFrame(uint8_t address, size_t writtenBytes = i2cBus.write(frame._buffer, frame._index); uint8_t i2c_error = i2cBus.endTransmission(); if (writtenBytes != frame._index) { - return WriteError | I2cOtherError; + return static_cast(WriteError) | static_cast(I2cOtherError); } // translate Arduino errors, see // https://www.arduino.cc/en/Reference/WireEndTransmission @@ -60,13 +60,13 @@ uint16_t SensirionI2CCommunication::sendFrame(uint8_t address, case 0: return NoError; case 1: - return WriteError | InternalBufferSizeError; + return static_cast(WriteError) | static_cast(InternalBufferSizeError); case 2: - return WriteError | I2cAddressNack; + return static_cast(WriteError) | static_cast(I2cAddressNack); case 3: - return WriteError | I2cDataNack; + return static_cast(WriteError) | static_cast(I2cDataNack); default: - return WriteError | I2cOtherError; + return static_cast(WriteError) | static_cast(I2cOtherError); } } @@ -89,19 +89,19 @@ uint16_t SensirionI2CCommunication::receiveFrame(uint8_t address, #endif if (numBytes % 3) { - return ReadError | WrongNumberBytesError; + return static_cast(ReadError) | static_cast(WrongNumberBytesError); } if ((numBytes / 3) * 2 > frame._bufferSize) { - return ReadError | BufferSizeError; + return static_cast(ReadError) | static_cast(BufferSizeError); } if (numBytes > sizeBuffer) { - return ReadError | InternalBufferSizeError; + return static_cast(ReadError) | static_cast(InternalBufferSizeError); } readAmount = i2cBus.requestFrom(address, static_cast(numBytes), static_cast(true)); if (numBytes != readAmount) { - return ReadError | NotEnoughDataError; + return static_cast(ReadError) | static_cast(NotEnoughDataError); } do { frame._buffer[i++] = i2cBus.read(); @@ -110,7 +110,7 @@ uint16_t SensirionI2CCommunication::receiveFrame(uint8_t address, uint8_t expectedCRC = generateCRC(&frame._buffer[i - 2], 2, poly); if (actualCRC != expectedCRC) { clearRxBuffer(i2cBus); - return ReadError | CRCError; + return static_cast(ReadError) | static_cast(CRCError); } readAmount -= 3; } while (readAmount > 0); diff --git a/lib/lib_i2c/Sensirion_Core/src/SensirionI2CTxFrame.cpp b/lib/lib_i2c/Sensirion_Core/src/SensirionI2CTxFrame.cpp index 67999f86c..301fafaf5 100644 --- a/lib/lib_i2c/Sensirion_Core/src/SensirionI2CTxFrame.cpp +++ b/lib/lib_i2c/Sensirion_Core/src/SensirionI2CTxFrame.cpp @@ -68,7 +68,7 @@ SensirionI2CTxFrame SensirionI2CTxFrame::createWithUInt16Command( uint16_t SensirionI2CTxFrame::addCommand(uint16_t command) { if (_bufferSize < 2) { - return TxFrameError | BufferSizeError; + return static_cast(TxFrameError) | static_cast(BufferSizeError); } _buffer[0] = static_cast((command & 0xFF00) >> 8); _buffer[1] = static_cast((command & 0x00FF) >> 0); @@ -130,12 +130,12 @@ uint16_t SensirionI2CTxFrame::addBytes(const uint8_t data[], uint16_t SensirionI2CTxFrame::_addByte(uint8_t data) { if (_bufferSize <= _index) { - return TxFrameError | BufferSizeError; + return static_cast(TxFrameError) | static_cast(BufferSizeError); } _buffer[_index++] = data; if ((_index - _numCommandBytes) % 3 == 2) { if (_bufferSize <= _index) { - return TxFrameError | BufferSizeError; + return static_cast(TxFrameError) | static_cast(BufferSizeError); } uint8_t crc = generateCRC(&_buffer[_index - 2], 2, _polynomial_type); _buffer[_index++] = crc; diff --git a/lib/lib_i2c/Sensirion_Core/src/SensirionRxFrame.cpp b/lib/lib_i2c/Sensirion_Core/src/SensirionRxFrame.cpp index c653c250d..e89a0b86b 100644 --- a/lib/lib_i2c/Sensirion_Core/src/SensirionRxFrame.cpp +++ b/lib/lib_i2c/Sensirion_Core/src/SensirionRxFrame.cpp @@ -42,7 +42,7 @@ SensirionRxFrame::SensirionRxFrame(uint8_t buffer[], size_t bufferSize) uint16_t SensirionRxFrame::getUInt32(uint32_t& data) { if (_numBytes < 4) { - return RxFrameError | NoDataError; + return static_cast(RxFrameError) | static_cast(NoDataError); } data = static_cast(_buffer[_index++]) << 24; data |= static_cast(_buffer[_index++]) << 16; @@ -61,7 +61,7 @@ uint16_t SensirionRxFrame::getInt32(int32_t& data) { uint16_t SensirionRxFrame::getUInt16(uint16_t& data) { if (_numBytes < 2) { - return RxFrameError | NoDataError; + return static_cast(RxFrameError) | static_cast(NoDataError); } data = static_cast(_buffer[_index++]) << 8; data |= static_cast(_buffer[_index++]); @@ -78,7 +78,7 @@ uint16_t SensirionRxFrame::getInt16(int16_t& data) { uint16_t SensirionRxFrame::getUInt8(uint8_t& data) { if (_numBytes < 1) { - return RxFrameError | NoDataError; + return static_cast(RxFrameError) | static_cast(NoDataError); } data = _buffer[_index++]; _numBytes -= 1; @@ -87,7 +87,7 @@ uint16_t SensirionRxFrame::getUInt8(uint8_t& data) { uint16_t SensirionRxFrame::getInt8(int8_t& data) { if (_numBytes < 1) { - return RxFrameError | NoDataError; + return static_cast(RxFrameError) | static_cast(NoDataError); } data = static_cast(_buffer[_index++]); _numBytes -= 1; @@ -96,7 +96,7 @@ uint16_t SensirionRxFrame::getInt8(int8_t& data) { uint16_t SensirionRxFrame::getBool(bool& data) { if (_numBytes < 1) { - return RxFrameError | NoDataError; + return static_cast(RxFrameError) | static_cast(NoDataError); } data = static_cast(_buffer[_index++]); _numBytes -= 1; @@ -115,7 +115,7 @@ uint16_t SensirionRxFrame::getFloat(float& data) { uint16_t SensirionRxFrame::getBytes(uint8_t data[], size_t maxBytes) { if (_numBytes < 1) { - return RxFrameError | NoDataError; + return static_cast(RxFrameError) | static_cast(NoDataError); } size_t readAmount = maxBytes; if (_numBytes < maxBytes) { diff --git a/lib/lib_i2c/Sensirion_Core/src/SensirionShdlcCommunication.cpp b/lib/lib_i2c/Sensirion_Core/src/SensirionShdlcCommunication.cpp index 300546ee8..ce9155e50 100644 --- a/lib/lib_i2c/Sensirion_Core/src/SensirionShdlcCommunication.cpp +++ b/lib/lib_i2c/Sensirion_Core/src/SensirionShdlcCommunication.cpp @@ -42,7 +42,7 @@ static uint16_t readByte(uint8_t& data, Stream& serial, unsigned long startTime, unsigned long timeoutMicros) { do { if (micros() - startTime > timeoutMicros) { - return ReadError | TimeoutError; + return static_cast(ReadError) | static_cast(TimeoutError); } } while (!serial.available()); data = serial.read(); @@ -70,7 +70,7 @@ uint16_t SensirionShdlcCommunication::sendFrame(SensirionShdlcTxFrame& frame, Stream& serial) { size_t writtenBytes = serial.write(&frame._buffer[0], frame._index); if (writtenBytes != frame._index) { - return WriteError | SerialWriteError; + return static_cast(WriteError) | static_cast(SerialWriteError); } return NoError; } @@ -83,7 +83,7 @@ uint16_t SensirionShdlcCommunication::receiveFrame( uint8_t current = 0; if (frame._numBytes) { - return ReadError | NonemptyFrameError; + return static_cast(ReadError) | static_cast(NonemptyFrameError); } // Wait for start byte and ignore all other bytes in case a partial frame @@ -121,7 +121,7 @@ uint16_t SensirionShdlcCommunication::receiveFrame( frame._address + frame._command + frame._state + dataLength; if (dataLength > frame._bufferSize) { - return RxFrameError | BufferSizeError; + return static_cast(RxFrameError) | static_cast(BufferSizeError); } size_t i = 0; @@ -142,7 +142,7 @@ uint16_t SensirionShdlcCommunication::receiveFrame( return error; } if (expectedChecksum != actualChecksum) { - return ReadError | ChecksumError; + return static_cast(ReadError) | static_cast(ChecksumError); } uint8_t stop; @@ -151,10 +151,10 @@ uint16_t SensirionShdlcCommunication::receiveFrame( return error; } if (stop != 0x7e) { - return ReadError | StopByteError; + return static_cast(ReadError) | static_cast(StopByteError); } if (frame._state & 0x7F) { - return ExecutionError | frame._state; + return static_cast(ExecutionError) | frame._state; } frame._dataLength = dataLength; frame._numBytes = dataLength; @@ -175,10 +175,10 @@ uint16_t SensirionShdlcCommunication::sendAndReceiveFrame( return error; } if (rxFrame.getCommand() != txFrame.getCommand()) { - return RxFrameError | RxCommandError; + return static_cast(RxFrameError) | static_cast(RxCommandError); } if (rxFrame.getAddress() != txFrame.getAddress()) { - return RxFrameError | RxAddressError; + return static_cast(RxFrameError) | static_cast(RxAddressError); } return NoError; } diff --git a/lib/lib_i2c/Sensirion_Core/src/SensirionShdlcTxFrame.cpp b/lib/lib_i2c/Sensirion_Core/src/SensirionShdlcTxFrame.cpp index fc8c4c994..9efc5d824 100644 --- a/lib/lib_i2c/Sensirion_Core/src/SensirionShdlcTxFrame.cpp +++ b/lib/lib_i2c/Sensirion_Core/src/SensirionShdlcTxFrame.cpp @@ -53,7 +53,7 @@ uint16_t SensirionShdlcTxFrame::finish(void) { return error; } if (_index + 1 > _bufferSize) { - return TxFrameError | BufferSizeError; + return static_cast(TxFrameError) | BufferSizeError; } _buffer[_index++] = 0x7e; _isFinished = true; @@ -84,7 +84,7 @@ uint16_t SensirionShdlcTxFrame::addInt16(int16_t data) { uint16_t SensirionShdlcTxFrame::addUInt8(uint8_t data) { if (_index + 2 > _bufferSize) { - return TxFrameError | BufferSizeError; + return static_cast(TxFrameError) | BufferSizeError; } switch (data) { case 0x11: diff --git a/lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.cpp b/lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.cpp index c886a666d..d31aaed2b 100644 --- a/lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.cpp +++ b/lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.cpp @@ -48,16 +48,14 @@ enum LoggingLevels {LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_D // replicated from `tasmota.h` -#if defined(CONFIG_IDF_TARGET_ESP32) - const uint8_t MAX_PWMS = 16; // ESP32: 16 ledc PWM channels in total - TODO for now -#elif defined(CONFIG_IDF_TARGET_ESP32S2) - const uint8_t MAX_PWMS = 8; // ESP32S2: 8 ledc PWM channels in total -#elif defined(CONFIG_IDF_TARGET_ESP32S3) - const uint8_t MAX_PWMS = 8; // ESP32S2: 8 ledc PWM channels in total -#elif defined(CONFIG_IDF_TARGET_ESP32C3) - const uint8_t MAX_PWMS = 6; // ESP32C3: 6 ledc PWM channels in total +#if CONFIG_IDF_TARGET_ESP32 +const uint8_t MAX_PWMS = 16; // ESP32: 16 ledc PWM channels in total - TODO for now +#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 +const uint8_t MAX_PWMS = 8; // ESP32S2/S3: 8 ledc PWM channels in total +#elif CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 +const uint8_t MAX_PWMS = 6; // ESP32C2/C3/C6: 6 ledc PWM channels in total #else - const uint8_t MAX_PWMS = 5; // Unknown - revert to 5 PWM max +const uint8_t MAX_PWMS = 5; // Unknown - revert to 5 PWM max #endif // current configuration of timers: frequency and resolution diff --git a/lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.h b/lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.h index 07bc9c2d5..8cae8d499 100644 --- a/lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.h +++ b/lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.h @@ -126,7 +126,12 @@ uint32_t analogGetTimerFrequency(uint8_t timer); #define ESPhttpUpdate httpUpdate +#if ESP_IDF_VERSION_MAJOR >= 5 +#include "rom/ets_sys.h" +#else #define os_delay_us ets_delay_us +#endif + // Serial minimal type to hold the config typedef int SerConfu8; //typedef int SerialConfig; // Will be replaced enum in esp32_hal-uart.h (#7926) diff --git a/lib/libesp32/HttpClientLight/src/TasUpdater.cpp b/lib/libesp32/HttpClientLight/src/TasUpdater.cpp index e359ff96f..d69463515 100644 --- a/lib/libesp32/HttpClientLight/src/TasUpdater.cpp +++ b/lib/libesp32/HttpClientLight/src/TasUpdater.cpp @@ -1,6 +1,10 @@ #include "TasUpdate.h" #include "Arduino.h" +#if ESP_IDF_VERSION_MAJOR >= 5 +#include "spi_flash_mmap.h" +#else #include "esp_spi_flash.h" +#endif #include "esp_ota_ops.h" #include "esp_image_format.h" diff --git a/lib/libesp32/berry_mapping/src/be_class_wrapper.c b/lib/libesp32/berry_mapping/src/be_class_wrapper.c index 71c29eff9..94cbb9f51 100644 --- a/lib/libesp32/berry_mapping/src/be_class_wrapper.c +++ b/lib/libesp32/berry_mapping/src/be_class_wrapper.c @@ -360,7 +360,7 @@ int be_check_arg_type(bvm *vm, int arg_start, int argc, const char * arg_type, i } } // berry_log_C(">> be_call_c_func arg %i, type %s", i, arg_type_check ? type_short_name : ""); - p[p_idx] = be_convert_single_elt(vm, i + arg_start, arg_type_check ? type_short_name : NULL, &buf_len); + p[p_idx] = be_convert_single_elt(vm, i + arg_start, arg_type_check ? type_short_name : NULL, (int*)&buf_len); // berry_log_C("< ret[%i]=%i", p_idx, p[p_idx]); p_idx++; diff --git a/lib/libesp32_div/ESP32-HomeKit/src/port/bignum.h b/lib/libesp32_div/ESP32-HomeKit/src/port/bignum.h index 158c22cb1..51394c66f 100644 --- a/lib/libesp32_div/ESP32-HomeKit/src/port/bignum.h +++ b/lib/libesp32_div/ESP32-HomeKit/src/port/bignum.h @@ -15,6 +15,6 @@ #if CONFIG_IDF_TARGET_ESP32 #include "bignum_ESP32.h" -#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3 +#elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S3 #include "bignum_ESP32_C3.h" #endif diff --git a/lib/libesp32_div/ESP32-HomeKit/src/port/bignum_ESP32.c b/lib/libesp32_div/ESP32-HomeKit/src/port/bignum_ESP32.c index d21b44a80..9e7158fe6 100644 --- a/lib/libesp32_div/ESP32-HomeKit/src/port/bignum_ESP32.c +++ b/lib/libesp32_div/ESP32-HomeKit/src/port/bignum_ESP32.c @@ -38,7 +38,10 @@ #include #if CONFIG_IDF_TARGET_ESP32C3 #include "esp32c3/dport_access.h" -#endif +#endif +#if CONFIG_IDF_TARGET_ESP32C6 +#include "esp32c6/dport_access.h" +#endif #if CONFIG_IDF_TARGET_ESP32S3 #include "esp32s3/dport_access.h" #endif diff --git a/lib/libesp32_div/ESP32-HomeKit/src/port/bignum_ESP32_C3.c b/lib/libesp32_div/ESP32-HomeKit/src/port/bignum_ESP32_C3.c index 1c579005f..5cd600d69 100644 --- a/lib/libesp32_div/ESP32-HomeKit/src/port/bignum_ESP32_C3.c +++ b/lib/libesp32_div/ESP32-HomeKit/src/port/bignum_ESP32_C3.c @@ -21,7 +21,7 @@ * */ -#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3 +#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S3 #if __has_include("esp_idf_version.h") #include "esp_idf_version.h" #endif @@ -105,4 +105,4 @@ static inline void wait_op_complete(void) REG_WRITE(RSA_CLEAR_INTERRUPT_REG, 1); } -#endif //CONFIG_IDF_TARGET_ESP32C3 +#endif // CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S3 diff --git a/lib/libesp32_div/ESP32-HomeKit/src/port/bignum_ESP32_C3.h b/lib/libesp32_div/ESP32-HomeKit/src/port/bignum_ESP32_C3.h index e664dd779..dd87e0463 100644 --- a/lib/libesp32_div/ESP32-HomeKit/src/port/bignum_ESP32_C3.h +++ b/lib/libesp32_div/ESP32-HomeKit/src/port/bignum_ESP32_C3.h @@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3 +#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S3 #pragma once #include_next "mbedtls/bignum.h" @@ -84,4 +84,4 @@ void esp_mpi_mul_mpi_hw_op(const mbedtls_mpi *X, const mbedtls_mpi *Y, size_t nu //#endif // CONFIG_MBEDTLS_HARDWARE_MPI -#endif //CONFIG_IDF_TARGET_ESP32C3 +#endif // CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6|| CONFIG_IDF_TARGET_ESP32S3 diff --git a/lib/libesp32_div/ESP32-HomeKit/src/port/bignum_impl.h b/lib/libesp32_div/ESP32-HomeKit/src/port/bignum_impl.h index 1b1fa8e56..bf98c0074 100644 --- a/lib/libesp32_div/ESP32-HomeKit/src/port/bignum_impl.h +++ b/lib/libesp32_div/ESP32-HomeKit/src/port/bignum_impl.h @@ -89,7 +89,7 @@ void esp_mpi_exp_mpi_mod_hw_op(const mbedtls_mpi *X, const mbedtls_mpi *Y, const #endif //CONFIG_IDF_TARGET_ESP32 #endif //ESP_MPI_USE_MONT_EXP -#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3 +#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S3 void esp_mpi_exp_mpi_mod_hw_op(const mbedtls_mpi *X, const mbedtls_mpi *Y, const mbedtls_mpi *M, const mbedtls_mpi *Rinv, mbedtls_mpi_uint Mprime, size_t num_words); extern int esp_mpi_exp_mod( mbedtls_mpi *Z, const mbedtls_mpi *X, const mbedtls_mpi *Y, const mbedtls_mpi *M, mbedtls_mpi *_Rinv ); extern size_t esp_mpi_hardware_words(size_t words); @@ -97,6 +97,6 @@ extern void esp_mpi_enable_hardware_hw_op( void ); extern void esp_mpi_disable_hardware_hw_op( void ); extern void esp_mpi_read_result_hw_op(mbedtls_mpi *Z, size_t z_words); extern void esp_mpi_mult_mpi_failover_mod_mult_hw_op(const mbedtls_mpi *X, const mbedtls_mpi *Y, size_t num_words); -#endif //CONFIG_IDF_TARGET_ESP32C3 +#endif // CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S3 #endif diff --git a/lib/libesp32_div/ESP32-HomeKit/src/port/esp_bignum.c b/lib/libesp32_div/ESP32-HomeKit/src/port/esp_bignum.c index 5b8e124ce..0dbc34314 100644 --- a/lib/libesp32_div/ESP32-HomeKit/src/port/esp_bignum.c +++ b/lib/libesp32_div/ESP32-HomeKit/src/port/esp_bignum.c @@ -79,7 +79,7 @@ static inline size_t bits_to_words(size_t bits) /* Return the number of words actually used to represent an mpi number. */ -#if defined(MBEDTLS_MPI_EXP_MOD_ALT) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3) +#if defined(MBEDTLS_MPI_EXP_MOD_ALT) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C6) || defined(CONFIG_IDF_TARGET_ESP32S3) static size_t mpi_words(const mbedtls_mpi *mpi) { for (size_t i = mpi->n; i > 0; i--) { @@ -369,7 +369,7 @@ cleanup: #endif /* MBEDTLS_MPI_EXP_MOD_ALT */ -#if CONFIG_IDF_TARGET_ESP32C3 +#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 int esp_mpi_exp_mod( mbedtls_mpi *Z, const mbedtls_mpi *X, const mbedtls_mpi *Y, const mbedtls_mpi *M, mbedtls_mpi *_Rinv ) { int ret = 0; diff --git a/lib/libesp32_div/NimBLE-Arduino/library.json b/lib/libesp32_div/NimBLE-Arduino/library.json index 348f77d3d..1f55748d6 100644 --- a/lib/libesp32_div/NimBLE-Arduino/library.json +++ b/lib/libesp32_div/NimBLE-Arduino/library.json @@ -2,7 +2,7 @@ "name": "NimBLE-Arduino", "keywords": "esp32, bluetooth", "description": "Bluetooth low energy (BLE) library for arduino-esp32 based on NimBLE", - "version": "1.4.0", + "version": "1.4.1", "frameworks": "arduino", "platforms": "espressif32" } diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEDevice.cpp b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEDevice.cpp index 43ba21909..d2553b0e8 100644 --- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEDevice.cpp +++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEDevice.cpp @@ -867,7 +867,7 @@ void NimBLEDevice::init(const std::string &deviceName) { esp_bt_controller_mem_release(ESP_BT_MODE_CLASSIC_BT); esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); -#if defined (CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3) +#if defined (CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C6) || defined(CONFIG_IDF_TARGET_ESP32S3) bt_cfg.bluetooth_mode = ESP_BT_MODE_BLE; #else bt_cfg.mode = ESP_BT_MODE_BLE; diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimconfig.h b/lib/libesp32_div/NimBLE-Arduino/src/nimconfig.h index 8214e1d9b..945ce042c 100644 --- a/lib/libesp32_div/NimBLE-Arduino/src/nimconfig.h +++ b/lib/libesp32_div/NimBLE-Arduino/src/nimconfig.h @@ -284,7 +284,7 @@ #define CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE 2 #endif -#if !defined(CONFIG_IDF_TARGET_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3) +#if !defined(CONFIG_IDF_TARGET_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C6) && !defined(CONFIG_IDF_TARGET_ESP32S3) #define CONFIG_IDF_TARGET_ESP32 1 #endif diff --git a/lib/libesp32_div/esp-nimble-cpp/.github/workflows/build.yml b/lib/libesp32_div/esp-nimble-cpp/.github/workflows/build.yml new file mode 100644 index 000000000..f256daaff --- /dev/null +++ b/lib/libesp32_div/esp-nimble-cpp/.github/workflows/build.yml @@ -0,0 +1,65 @@ +name: Build + +on: + workflow_dispatch: # Start a workflow + pull_request: + push: + +jobs: + build-esp-idf-component: + name: Build with ESP-IDF ${{ matrix.idf_ver }} for ${{ matrix.idf_target }} + runs-on: ubuntu-latest + strategy: + matrix: + # The version names here correspond to the versions of espressif/idf Docker image. + # See https://hub.docker.com/r/espressif/idf/tags and + # https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/tools/idf-docker-image.html + # for details. + idf_ver: ["release-v4.4", "release-v5.1"] + idf_target: ["esp32", "esp32s3", "esp32c2", "esp32c3", "esp32c6"] + example: + - Advanced/NimBLE_Client + - Advanced/NimBLE_Server + - basic/BLE_client + - basic/BLE_notify + - basic/BLE_scan + - basic/BLE_server + - basic/BLE_uart + - Bluetooth_5/NimBLE_extended_client + - Bluetooth_5/NimBLE_extended_server + - Bluetooth_5/NimBLE_multi_advertiser + exclude: + - idf_target: "esp32" + example: Bluetooth_5/NimBLE_extended_client + - idf_target: "esp32" + example: Bluetooth_5/NimBLE_extended_server + - idf_target: "esp32" + example: Bluetooth_5/NimBLE_multi_advertiser + - idf_ver: release-v4.4 + idf_target: "esp32c2" + - idf_ver: release-v4.4 + idf_target: "esp32c6" + + container: espressif/idf:${{ matrix.idf_ver }} + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + path: components/esp-nimble-cpp + - name: Build examples + env: + IDF_TARGET: ${{ matrix.idf_target }} + shell: bash + run: | + . ${IDF_PATH}/export.sh + cp -r components/esp-nimble-cpp/examples/* . + idf.py -C ${{ matrix.example }} -DEXTRA_COMPONENT_DIRS=$PWD/components build + + build_docs: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Doxygen Action + uses: mattnotmitt/doxygen-action@v1.9.5 + with: + working-directory: 'docs/' diff --git a/lib/libesp32_div/esp-nimble-cpp/.gitignore b/lib/libesp32_div/esp-nimble-cpp/.gitignore new file mode 100644 index 000000000..343d1f417 --- /dev/null +++ b/lib/libesp32_div/esp-nimble-cpp/.gitignore @@ -0,0 +1 @@ +docs/doxydocs \ No newline at end of file diff --git a/lib/libesp32_div/esp-nimble-cpp/CHANGELOG.md b/lib/libesp32_div/esp-nimble-cpp/CHANGELOG.md new file mode 100644 index 000000000..f8b6e42cb --- /dev/null +++ b/lib/libesp32_div/esp-nimble-cpp/CHANGELOG.md @@ -0,0 +1,280 @@ +# Changelog + +All notable changes to this project will be documented in this file. +## [Unreleased] + +### Changed +- NimBLESecurity class removed. + +### Added +- `NimBLEDevice::setDeviceName` to change the device name after initialization. +- `NimBLEHIDDevice::batteryLevel` returns the HID device battery level characteristic. + +## [1.4.0] - 2022-07-31 + +### Fixed +- Fixed missing data from long notification values. +- Fixed NimbleCharacteristicCallbacks::onRead not being called when a non-long read command is received. +- Prevent a potential crash when retrieving characteristics from a service if the result was successful but no characteristics found. +- logs/typos. + +### Changed +- AD flags are no longer set in the advertisements of non-connectable beacons, freeing up 3 bytes of advertisement room. +- Save resources when retrieving descriptors if the characteristic handle is the same as the end handle (no descriptors). +- Subscribing to characteristic notifications/indications will now always use write with response, as per BLE specifications. +- `NimBLEClient::discoverAttributes` now returns a bool value to indicate success/failure. +- Scan result callbacks are no longer called when the scan response data is updated in order to reduce duplicates. + +### Added +- Preliminary support for non-esp devices, NRF51 and NRF52 devices supported with [n-able arduino core](https://github.com/h2zero/n-able-Arduino) +- Alias added for `NimBLEServerCallbacks::onMTUChange` to `onMtuChanged` in order to support porting code from original library. +- `NimBLEAttValue` Class added to reduce and control RAM footprint of characteristic/descriptor values and support conversions from Arduino Strings and many other data types. +- Bluetooth 5 extended advertising support for capable devices. CODED Phy, 2M Phy, extended advertising data, and multi-advertising are supported, periodic advertising will be implemented in the future. + +## [1.3.3] - 2022-02-15 + +### Changed +- If attribute retrieval fails with a "not found" try again with the 16 bit version if a 128 bit base uuid is used. + +### Fixed +- Memory leak when deleting client instance. +- IDf version check for data length extension. +- Memory leak when server services changed. +- Compiler warnings for non-esp32 devices. + +## [1.3.2] - 2022-01-15 + +### Fixed +- Initialize advertising complete callback in NimBLEAdvertising constructor. +- Clear client disconnect timer in constructor before initializing. +- Fix missing data when reading large values. +- Fix missing data in notifications when using a large MTU size and more than 270 bytes of data are sent. +- Workaround fix added for cases when the task notification value is not cleared, causing various functions that should block not to block. + +### Added +- `NimBLEClient::getLastError` : Gets the error code of the last function call that produces a return code from the stack. +- `NimBLECharacteristic::notify` : Overload method to send notifications/indications with custom values. +- Added conditional checks for ESP32 specific functions/values to support use of the library on non-esp32 devices. +- Added an alias to use the callback name from the original library `onMtuChanged`. +- `NimBLEClient::setDataLen` and `NimBLEServer::setDataLen`: Data length extension support (IDF version >= 4.3.2 only) +- Config option to set logging level for esp-nimble-cpp + +### Changed +- Critical section calls now use the NimBLE API instead of FreeRTOS directly. This removes the need for a `portMUX_TYPE` variable in the class definitions. +- Removed unnecessary variables in `NimBLEService` and changed the constructor no no longer accept `numHandles` and `inst_id` parameters. + +## [1.3.1] - 2021-08-04 + +### Fixed +- Corrected a compiler/linker error when an application or a library uses bluetooth classic due to the redefinition of `btInUse`. + +## [1.3.0] - 2021-08-02 + +### Added +- `NimBLECharacteristic::removeDescriptor`: Dynamically remove a descriptor from a characterisic. Takes effect after all connections are closed and sends a service changed indication. +- `NimBLEService::removeCharacteristic`: Dynamically remove a characteristic from a service. Takes effect after all connections are closed and sends a service changed indication +- `NimBLEServerCallbacks::onMTUChange`: This is callback is called when the MTU is updated after connection with a client. +- ESP32C3 support + +- Whitelist API: + - `NimBLEDevice::whiteListAdd`: Add a device to the whitelist. + - `NimBLEDevice::whiteListRemove`: Remove a device from the whitelist. + - `NimBLEDevice::onWhiteList`: Check if the device is on the whitelist. + - `NimBLEDevice::getWhiteListCount`: Gets the size of the whitelist + - `NimBLEDevice::getWhiteListAddress`: Get the address of a device on the whitelist by index value. + +- Bond management API: + - `NimBLEDevice::getNumBonds`: Gets the number of bonds stored. + - `NimBLEDevice::isBonded`: Checks if the device is bonded. + - `NimBLEDevice::deleteAllBonds`: Deletes all bonds. + - `NimBLEDevice::getBondedAddress`: Gets the address of a bonded device by the index value. + +- `NimBLECharacteristic::getCallbacks` to retrieve the current callback handler. +- Connection Information class: `NimBLEConnInfo`. +- `NimBLEScan::clearDuplicateCache`: This can be used to reset the cache of advertised devices so they will be immediately discovered again. + +### Changed +- FreeRTOS files have been removed as they are not used by the library. +- Services, characteristics and descriptors can now be created statically and added after. +- Excess logging and some asserts removed. +- Use ESP_LOGx macros to enable using local log level filtering. + +### Fixed +- `NimBLECharacteristicCallbacks::onSubscribe` Is now called after the connection is added to the vector. +- Corrected bonding failure when reinitializing the BLE stack. +- Writing to a characterisic with a std::string value now correctly writes values with null characters. +- Retrieving remote descriptors now uses the characterisic end handle correctly. +- Missing data in long writes to remote descriptors. +- Hanging on task notification when sending an indication from the characteristic callback. +- BLE controller memory could be released when using Arduino as a component. +- Complile errors with NimBLE release 1.3.0. + +## [1.2.0] - 2021-02-08 + +### Added +- `NimBLECharacteristic::getDescriptorByHandle`: Return the BLE Descriptor for the given handle. + +- `NimBLEDescriptor::getStringValue`: Get the value of this descriptor as a string. + +- `NimBLEServer::getServiceByHandle`: Get a service by its handle. + +- `NimBLEService::getCharacteristicByHandle`: Get a pointer to the characteristic object with the specified handle. + +- `NimBLEService::getCharacteristics`: Get the vector containing pointers to each characteristic associated with this service. +Overloads to get a vector containing pointers to all the characteristics in a service with the UUID. (supports multiple same UUID's in a service) + - `NimBLEService::getCharacteristics(const char *uuid)` + - `NimBLEService::getCharacteristics(const NimBLEUUID &uuid)` + +- `NimBLEAdvertisementData` New methods: + - `NimBLEAdvertisementData::addTxPower`: Adds transmission power to the advertisement. + - `NimBLEAdvertisementData::setPreferredParams`: Adds connection parameters to the advertisement. + - `NimBLEAdvertisementData::setURI`: Adds URI data to the advertisement. + +- `NimBLEAdvertising` New methods: + - `NimBLEAdvertising::setName`: Set the name advertised. + - `NimBLEAdvertising::setManufacturerData`: Adds manufacturer data to the advertisement. + - `NimBLEAdvertising::setURI`: Adds URI data to the advertisement. + - `NimBLEAdvertising::setServiceData`: Adds service data to the advertisement. + - `NimBLEAdvertising::addTxPower`: Adds transmission power to the advertisement. + - `NimBLEAdvertising::reset`: Stops the current advertising and resets the advertising data to the default values. + +- `NimBLEDevice::setScanFilterMode`: Set the controller duplicate filter mode for filtering scanned devices. + +- `NimBLEDevice::setScanDuplicateCacheSize`: Sets the number of advertisements filtered before the cache is reset. + +- `NimBLEScan::setMaxResults`: This allows for setting a maximum number of advertised devices stored in the results vector. + +- `NimBLEAdvertisedDevice` New data retrieval methods added: + - `haveAdvInterval/getAdvInterval`: checks if the interval is advertised / gets the advertisement interval value. + + - `haveConnParams/getMinInterval/getMaxInterval`: checks if the parameters are advertised / get min value / get max value. + + - `haveURI/getURI`: checks if a URI is advertised / gets the URI data. + + - `haveTargetAddress/getTargetAddressCount/getTargetAddress(index)`: checks if a target address is present / gets a count of the addresses targeted / gets the address of the target at index. + +### Changed +- `nimconfig.h` (Arduino) is now easier to use. + +- `NimBLEServer::getServiceByUUID` Now takes an extra parameter of instanceID to support multiple services with the same UUID. + +- `NimBLEService::getCharacteristic` Now takes an extra parameter of instanceID to support multiple characteristics with the same UUID. + +- `NimBLEAdvertising` Transmission power is no longer advertised by default and can be added to the advertisement by calling `NimBLEAdvertising::addTxPower` + +- `NimBLEAdvertising` Custom scan response data can now be used without custom advertisment. + +- `NimBLEScan` Now uses the controller duplicate filter. + +- `NimBLEAdvertisedDevice` Has been refactored to store the complete advertisement payload and no longer parses the data from each advertisement. +Instead the data will be parsed on-demand when the user application asks for specific data. + +### Fixed +- `NimBLEHIDDevice` Characteristics now use encryption, this resolves an issue with communicating with devices requiring encryption for HID devices. + + +## [1.1.0] - 2021-01-20 + +### Added +- `NimBLEDevice::setOwnAddrType` added to enable the use of random and random-resolvable addresses, by asukiaaa + +- New examples for securing and authenticating client/server connections, by mblasee. + +- `NimBLEAdvertising::SetMinPreferred` and `NimBLEAdvertising::SetMinPreferred` re-added. + +- Conditional checks added for command line config options in `nimconfig.h` to support custom configuration in platformio. + +- `NimBLEClient::setValue` Now takes an extra bool parameter `response` to enable the use of write with response (default = false). + +- `NimBLEClient::getCharacteristic(uint16_t handle)` Enabling the use of the characteristic handle to be used to find +the NimBLERemoteCharacteristic object. + +- `NimBLEHIDDevice` class added by wakwak-koba. + +- `NimBLEServerCallbacks::onDisconnect` overloaded callback added to provide a ble_gap_conn_desc parameter for the application +to obtain information about the disconnected client. + +- Conditional checks in `nimconfig.h` for command line defined macros to support platformio config settings. + +### Changed +- `NimBLEAdvertising::start` now returns a bool value to indicate success/failure. + +- Some asserts were removed in `NimBLEAdvertising::start` and replaced with better return code handling and logging. + +- If a host reset event occurs, scanning and advertising will now only be restarted if their previous duration was indefinite. + +- `NimBLERemoteCharacteristic::subscribe` and `NimBLERemoteCharacteristic::registerForNotify` will now set the callback +regardless of the existance of the CCCD and return true unless the descriptor write operation failed. + +- Advertising tx power level is now sent in the advertisement packet instead of scan response. + +- `NimBLEScan` When the scan ends the scan stopped flag is now set before calling the scan complete callback (if used) +this allows the starting of a new scan from the callback function. + +### Fixed +- Sometimes `NimBLEClient::connect` would hang on the task block if no event arrived to unblock. +A time limit has been added to timeout appropriately. + +- When getting descriptors for a characterisic the end handle of the service was used as a proxy for the characteristic end +handle. This would be rejected by some devices and has been changed to use the next characteristic handle as the end when possible. + +- An exception could occur when deleting a client instance if a notification arrived while the attribute vectors were being +deleted. A flag has been added to prevent this. + +- An exception could occur after a host reset event when the host re-synced if the tasks that were stopped during the event did +not finish processing. A yield has been added after re-syncing to allow tasks to finish before proceeding. + +- Occasionally the controller would fail to send a disconnected event causing the client to indicate it is connected +and would be unable to reconnect. A timer has been added to reset the host/controller if it expires. + +- Occasionally the call to start scanning would get stuck in a loop on BLE_HS_EBUSY, this loop has been removed. + +- 16bit and 32bit UUID's in some cases were not discovered or compared correctly if the device +advertised them as 16/32bit but resolved them to 128bits. Both are now checked. + +- `FreeRTOS` compile errors resolved in latest Ardruino core and IDF v3.3. + +- Multiple instances of `time()` called inside critical sections caused sporadic crashes, these have been moved out of critical regions. + +- Advertisement type now correctly set when using non-connectable (advertiser only) mode. + +- Advertising payload length correction, now accounts for appearance. + +- (Arduino) Ensure controller mode is set to BLE Only. + + +## [1.0.2] - 2020-09-13 + +### Changed + +- `NimBLEAdvertising::start` Now takes 2 optional parameters, the first is the duration to advertise for (in seconds), the second is a +callback that is invoked when advertsing ends and takes a pointer to a `NimBLEAdvertising` object (similar to the `NimBLEScan::start` API). + +- (Arduino) Maximum BLE connections can now be altered by only changing the value of `CONFIG_BT_NIMBLE_MAX_CONNECTIONS` in `nimconfig.h`. +Any changes to the controller max connection settings in `sdkconfig.h` will now have no effect when using this library. + +- (Arduino) Revert the previous change to fix the advertising start delay. Instead a replacement fix that routes all BLE controller commands from +a task running on core 0 (same as the controller) has been implemented. This improves response times and reliability for all BLE functions. + + +## [1.0.1] - 2020-09-02 + +### Added + +- Empty `NimBLEAddress` constructor: `NimBLEAddress()` produces an address of 00:00:00:00:00:00 type 0. +- Documentation of the difference of NimBLEAddress::getNative vs the original bluedroid library. + +### Changed + +- notify_callback typedef is now defined as std::function to enable the use of std::bind to call a class member function. + +### Fixed + +- Fix advertising start delay when first called. + + +## [1.0.0] - 2020-08-22 + +First stable release. + +All the original library functionality is complete and many extras added with full documentation. diff --git a/lib/libesp32_div/esp-nimble-cpp/CMakeLists.txt b/lib/libesp32_div/esp-nimble-cpp/CMakeLists.txt new file mode 100644 index 000000000..90c22bd19 --- /dev/null +++ b/lib/libesp32_div/esp-nimble-cpp/CMakeLists.txt @@ -0,0 +1,64 @@ +# The following lines of boilerplate have to be in your project's +# CMakeLists in this exact order for cmake to work correctly +cmake_minimum_required(VERSION 3.5) + +idf_build_get_property(__hack_component_targets __COMPONENT_TARGETS) + +if("esp-nimble-component" IN_LIST BUILD_COMPONENTS OR "__esp-nimble-component" IN_LIST __hack_component_targets) + list(APPEND ESP_NIMBLE_PRIV_REQUIRES + esp-nimble-component + ) +elseif("nimble" IN_LIST BUILD_COMPONENTS OR "__nimble" IN_LIST __hack_component_targets) + list(APPEND ESP_NIMBLE_PRIV_REQUIRES + nimble + ) +endif() + +if("arduino" IN_LIST BUILD_COMPONENTS OR __hack_component_targets MATCHES "__idf_arduino") + list(APPEND ESP_NIMBLE_PRIV_REQUIRES + arduino + ) +elseif("framework-arduinoespressif32" IN_LIST BUILD_COMPONENTS OR __hack_component_targets MATCHES "___idf_framework-arduinoespressif32") + list(APPEND ESP_NIMBLE_PRIV_REQUIRES + framework-arduinoespressif32 + ) +endif() + +idf_component_register( + REQUIRED_IDF_TARGETS + "esp32" + "esp32s3" + "esp32c2" + "esp32c3" + "esp32c6" + INCLUDE_DIRS + "src" + SRCS + "src/NimBLE2904.cpp" + "src/NimBLEAddress.cpp" + "src/NimBLEAdvertisedDevice.cpp" + "src/NimBLEAdvertising.cpp" + "src/NimBLEBeacon.cpp" + "src/NimBLECharacteristic.cpp" + "src/NimBLEClient.cpp" + "src/NimBLEDescriptor.cpp" + "src/NimBLEDevice.cpp" + "src/NimBLEEddystoneTLM.cpp" + "src/NimBLEEddystoneURL.cpp" + "src/NimBLEExtAdvertising.cpp" + "src/NimBLEHIDDevice.cpp" + "src/NimBLERemoteCharacteristic.cpp" + "src/NimBLERemoteDescriptor.cpp" + "src/NimBLERemoteService.cpp" + "src/NimBLEScan.cpp" + "src/NimBLEServer.cpp" + "src/NimBLEService.cpp" + "src/NimBLEUtils.cpp" + "src/NimBLEUUID.cpp" + REQUIRES + bt + nvs_flash + PRIV_REQUIRES + ${ESP_NIMBLE_PRIV_REQUIRES} +) + diff --git a/lib/libesp32_div/esp-nimble-cpp/CMakeLists.txt_idf3 b/lib/libesp32_div/esp-nimble-cpp/CMakeLists.txt_idf3 new file mode 100644 index 000000000..c548f9021 --- /dev/null +++ b/lib/libesp32_div/esp-nimble-cpp/CMakeLists.txt_idf3 @@ -0,0 +1,56 @@ +# The following lines of boilerplate have to be in your project's +# CMakeLists in this exact order for cmake to work correctly +cmake_minimum_required(VERSION 3.5) + +set(SUPPORTED_TARGETS esp32) + +set(COMPONENT_SRCS + "src/NimBLE2904.cpp" + "src/NimBLEAddress.cpp" + "src/NimBLEAdvertisedDevice.cpp" + "src/NimBLEAdvertising.cpp" + "src/NimBLEBeacon.cpp" + "src/NimBLECharacteristic.cpp" + "src/NimBLEClient.cpp" + "src/NimBLEDescriptor.cpp" + "src/NimBLEDevice.cpp" + "src/NimBLEEddystoneTLM.cpp" + "src/NimBLEEddystoneURL.cpp" + "src/NimBLEHIDDevice.cpp" + "src/NimBLERemoteCharacteristic.cpp" + "src/NimBLERemoteDescriptor.cpp" + "src/NimBLERemoteService.cpp" + "src/NimBLEScan.cpp" + "src/NimBLESecurity.cpp" + "src/NimBLEServer.cpp" + "src/NimBLEService.cpp" + "src/NimBLEUtils.cpp" + "src/NimBLEUUID.cpp" +) + +set(COMPONENT_ADD_INCLUDEDIRS + src +) + +set(COMPONENT_PRIV_REQUIRES + nvs_flash + bt +) + +if(COMPONENTS MATCHES "esp-nimble-component") + list(APPEND COMPONENT_PRIV_REQUIRES + esp-nimble-component + ) +elseif(COMPONENTS MATCHES "nimble") + list(APPEND COMPONENT_PRIV_REQUIRES + nimble + ) +endif() + +if(COMPONENTS MATCHES "arduino") + list(APPEND COMPONENT_PRIV_REQUIRES + arduino + ) +endif() + +register_component() diff --git a/lib/libesp32_div/esp-nimble-cpp/Kconfig b/lib/libesp32_div/esp-nimble-cpp/Kconfig new file mode 100644 index 000000000..730f8cd96 --- /dev/null +++ b/lib/libesp32_div/esp-nimble-cpp/Kconfig @@ -0,0 +1,72 @@ +menu "ESP-NimBLE-CPP configuration" + +choice NIMBLE_CPP_LOG_LEVEL + prompt "NimBLE CPP log verbosity" + default NIMBLE_CPP_LOG_LEVEL_NONE + help + Select NimBLE CPP log verbosity level. + + config NIMBLE_CPP_LOG_LEVEL_NONE + bool "No logs" + config NIMBLE_CPP_LOG_LEVEL_ERROR + bool "Error logs" + config NIMBLE_CPP_LOG_LEVEL_WARNING + bool "Warning logs" + config NIMBLE_CPP_LOG_LEVEL_INFO + bool "Info logs" + config NIMBLE_CPP_LOG_LEVEL_DEBUG + bool "Debug logs" +endchoice #NIMBLE_CPP_LOG_LEVEL + +config NIMBLE_CPP_LOG_LEVEL + int + default 0 if NIMBLE_CPP_LOG_LEVEL_NONE + default 1 if NIMBLE_CPP_LOG_LEVEL_ERROR + default 2 if NIMBLE_CPP_LOG_LEVEL_WARNING + default 3 if NIMBLE_CPP_LOG_LEVEL_INFO + default 4 if NIMBLE_CPP_LOG_LEVEL_DEBUG + +config NIMBLE_CPP_ENABLE_RETURN_CODE_TEXT + bool "Show NimBLE return codes as text in debug log." + default "n" + help + Enabling this option will display return code values as text + messages in the debug log. This will use approximately 8kB + of flash memory. + +config NIMBLE_CPP_ENABLE_GAP_EVENT_CODE_TEXT + bool "Show NimBLE gap events as text in debug log." + default "n" + help + Enabling this option will display gap event codes as text + messages in the debug log. This will use approximately 1kB + of flash memory. + +config NIMBLE_CPP_ENABLE_ADVERTISEMENT_TYPE_TEXT + bool "Show advertisment types as text in debug log." + default "n" + help + Enabling this option will display advertisment types recieved + while scanning as text messages in the debug log. + This will use approximately 250 bytes of flash memory. + +config NIMBLE_CPP_ATT_VALUE_TIMESTAMP_ENABLED + bool "Enable timestamps to be stored with attribute values." + default "n" + help + Enabling this option will store the timestamp when an attribute value is updated. + This allows for checking the last update time using getTimeStamp() + or getValue(time_t*). If disabled, the timestamp returned from these functions will be 0. + Disabling timestamps will reduce the memory used for each value. + +config NIMBLE_CPP_ATT_VALUE_INIT_LENGTH + int "Initial attribute value size (bytes) for empty values." + range 1 512 + default 20 + help + Sets the default allocation size (bytes) for each attribute if not specified + when the constructor is called. This is also the size used when a remote + characteristic or descriptor is constructed before a value is read/notifed. + Increasing this will reduce reallocations but increase memory footprint. + +endmenu diff --git a/lib/libesp32_div/esp-nimble-cpp/LICENSE b/lib/libesp32_div/esp-nimble-cpp/LICENSE new file mode 100644 index 000000000..ff162769f --- /dev/null +++ b/lib/libesp32_div/esp-nimble-cpp/LICENSE @@ -0,0 +1,203 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {2020} {Ryan Powell} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + This product partly derives from esp32-snippets; Copyright 2017 Neil Kolban. \ No newline at end of file diff --git a/lib/libesp32_div/esp-nimble-cpp/README.md b/lib/libesp32_div/esp-nimble-cpp/README.md new file mode 100644 index 000000000..7f37effad --- /dev/null +++ b/lib/libesp32_div/esp-nimble-cpp/README.md @@ -0,0 +1,70 @@ +[Latest release ![Release Version](https://img.shields.io/github/release/h2zero/esp-nimble-cpp.svg?style=plastic) +![Release Date](https://img.shields.io/github/release-date/h2zero/esp-nimble-cpp.svg?style=plastic)](https://github.com/h2zero/esp-nimble-cpp/releases/latest/) + +Need help? Have questions or suggestions? Join the [![Gitter](https://badges.gitter.im/NimBLE-Arduino/community.svg)](https://gitter.im/NimBLE-Arduino/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) +
+ +# esp-nimble-cpp + +NimBLE CPP library for use with ESP32 that attempts to maintain compatibility with the [nkolban cpp_uitls BLE API](https://github.com/nkolban/esp32-snippets/tree/master/cpp_utils). + +**An Arduino version of this library, including NimBLE, can be [found here.](https://github.com/h2zero/NimBLE-Arduino)** + +This library **significantly** reduces resource usage and improves performance for ESP32 BLE applications as compared +with the bluedroid based library. The goal is to maintain, as much as reasonable, compatibility with the original +library but refactored to use the NimBLE stack. In addition, this library will be more actively developed and maintained +to provide improved capabilites and stability over the original. + +**Testing shows a nearly 50% reduction in flash use and approx. 100kB less ram consumed vs the original!** +*Your results may vary* +
+ +# What is NimBLE? +NimBLE is a completely open source Bluetooth Low Energy stack produced by [Apache](https://github.com/apache/mynewt-nimble). +It is more suited to resource constrained devices than bluedroid and has now been ported to the ESP32 by Espressif. +
+ +# Installation + +### ESP-IDF v4.0+ +Download as .zip and extract or clone into the components folder in your esp-idf project. + +Run menuconfig, go to `Component config->Bluetooth` enable Bluetooth and in `Bluetooth host` NimBLE. +Configure settings in `NimBLE Options`. +`#include "NimBLEDevice.h"` in main.cpp. +Call `NimBLEDevice::init("");` in `app_main`. +
+ +### ESP-IDF v3.2 & v3.3 +The NimBLE component does not come with these versions of IDF (now included in 3.3.2 and above). +A backport that works in these versions has been created and is [available here](https://github.com/h2zero/esp-nimble-component). +Download or clone that repo into your project/components folder and run menuconfig. +Configure settings in `main menu -> NimBLE Options`. + +`#include "NimBLEDevice.h"` in main.cpp. +Call `NimBLEDevice::init("");` in `app_main`. +
+ +# Using +This library is intended to be compatible with the original ESP32 BLE functions and types with minor changes. + +If you have not used the original Bluedroid library please refer to the [New user guide](docs/New_user_guide.md). + +If you are familiar with the original library, see: [The migration guide](docs/Migration_guide.md) for details about breaking changes and migration. + +Also see [Improvements_and_updates](docs/Improvements_and_updates.md) for information about non-breaking changes. + +[Full API documentation and class list can be found here.](https://h2zero.github.io/esp-nimble-cpp/) +
+ +## Using with Arduino as an IDF component and CMake +When using this library along with Arduino and compiling with *CMake* you must add `add_compile_definitions(ARDUINO_ARCH_ESP32=1)` +in your project/CMakeLists.txt after the line `include($ENV{IDF_PATH}/tools/cmake/project.cmake)` to prevent Arduino from releasing BLE memory. +
+ +# Acknowledgments +* [nkolban](https://github.com/nkolban) and [chegewara](https://github.com/chegewara) for the [original esp32 BLE library](https://github.com/nkolban/esp32-snippets/tree/master/cpp_utils) this project was derived from. +* [beegee-tokyo](https://github.com/beegee-tokyo) for contributing your time to test/debug and contributing the beacon examples. +* [Jeroen88](https://github.com/Jeroen88) for the amazing help debugging and improving the client code. +
+ diff --git a/lib/libesp32_div/esp-nimble-cpp/component.mk b/lib/libesp32_div/esp-nimble-cpp/component.mk new file mode 100644 index 000000000..563436815 --- /dev/null +++ b/lib/libesp32_div/esp-nimble-cpp/component.mk @@ -0,0 +1,2 @@ +COMPONENT_ADD_INCLUDEDIRS := src +COMPONENT_SRCDIRS := src \ No newline at end of file diff --git a/lib/libesp32_div/esp-nimble-cpp/docs/Bluetooth 5 features.md b/lib/libesp32_div/esp-nimble-cpp/docs/Bluetooth 5 features.md new file mode 100644 index 000000000..3737b0d7e --- /dev/null +++ b/lib/libesp32_div/esp-nimble-cpp/docs/Bluetooth 5 features.md @@ -0,0 +1,28 @@ +# Bluetooth 5.x features + +## About extended advertising +Extended advertising allows for much more capability and flexibility. + +* Allows for 251 bytes of advertisement data and up to 1650 bytes when chained (configuration dependant) vs 31. + +* New PHY's (physical layers) that allow for faster data rate (2M PHY) or long range/slower data rates (CODED PHY) as well as the original 1M PHY. + +* New periodic advertising, allowing the scanning device to sync with the advertisements of a beacon. This allows for the scanning device to sleep or perform other tasks before the next expected advertisement is sent, preserving cpu cycles and power (To be implemented). +
+ +## Enabling extended advertising +Extended advertising is supported when enabled with the config option `CONFIG_BT_NIMBLE_EXT_ADV` set to a value of 1. This is done in menuconfig under `Component config > Bluetooth > NimBLE options > Enable extended advertising`, or set in `nimconfig.h` for Arduino, or in `build_flags` in PlatformIO. + +When enabled the following will occur: +* `NimBLEScan::start` method will scan on both the 1M PHY and the coded PHY standards automatically. + +* `NimBLEClient::connect` will use the primary PHY the device is listening on, unless specified (see below). + +* `NimBLEClient::setConnectPhy` becomes available to specify the PHY's to connect with (default is all). + +* `NimBLEAdvertising` is no longer available for use and is replaced by `NimBLEExtAdvertising`. `NimBLEDevice::getAdvertising` will now return an instance of `NimBLEExtAdvertising`. + +* `NimBLEAdvertisementData` is no longer available for use and is replaced by `NimBLEExtAdvertisement`. This new class is where everything about the advertisement is configured, including the advertisement intervals and advertisement ended callback. + + + diff --git a/lib/libesp32_div/esp-nimble-cpp/docs/Doxyfile b/lib/libesp32_div/esp-nimble-cpp/docs/Doxyfile new file mode 100644 index 000000000..c67e49f5a --- /dev/null +++ b/lib/libesp32_div/esp-nimble-cpp/docs/Doxyfile @@ -0,0 +1,2778 @@ +# Doxyfile 1.9.5 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project. +# +# All text after a double hash (##) is considered a comment and is placed in +# front of the TAG it is preceding. +# +# All text after a single hash (#) is considered a comment and will be ignored. +# The format is: +# TAG = value [value, ...] +# For lists, items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (\" \"). +# +# Note: +# +# Use doxygen to compare the used configuration file with the template +# configuration file: +# doxygen -x [configFile] +# Use doxygen to compare the used configuration file with the template +# configuration file without replacing the environment variables or CMake type +# replacement variables: +# doxygen -x_noenv [configFile] + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the configuration +# file that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. +# The default value is: UTF-8. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by +# double-quotes, unless you are using Doxywizard) that should identify the +# project for which the documentation is generated. This name is used in the +# title of most generated pages and in a few other places. +# The default value is: My Project. + +PROJECT_NAME = esp-nimble-cpp + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. This +# could be handy for archiving the generated documentation or if some version +# control system is used. + +PROJECT_NUMBER = 1.4.1 + +# Using the PROJECT_BRIEF tag one can provide an optional one line description +# for a project that appears at the top of each page and should give viewer a +# quick idea about the purpose of the project. Keep the description short. + +PROJECT_BRIEF = + +# With the PROJECT_LOGO tag one can specify a logo or an icon that is included +# in the documentation. The maximum height of the logo should not exceed 55 +# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy +# the logo to the output directory. + +PROJECT_LOGO = + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path +# into which the generated documentation will be written. If a relative path is +# entered, it will be relative to the location where doxygen was started. If +# left blank the current directory will be used. + +OUTPUT_DIRECTORY = doxydocs + +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 +# sub-directories (in 2 levels) under the output directory of each output format +# and will distribute the generated files over these directories. Enabling this +# option can be useful when feeding doxygen a huge amount of source files, where +# putting all generated files in the same directory would otherwise causes +# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to +# control the number of sub-directories. +# The default value is: NO. + +CREATE_SUBDIRS = NO + +# Controls the number of sub-directories that will be created when +# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every +# level increment doubles the number of directories, resulting in 4096 +# directories at level 8 which is the default and also the maximum value. The +# sub-directories are organized in 2 levels, the first level always has a fixed +# numer of 16 directories. +# Minimum value: 0, maximum value: 8, default value: 8. +# This tag requires that the tag CREATE_SUBDIRS is set to YES. + +CREATE_SUBDIRS_LEVEL = 8 + +# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII +# characters to appear in the names of generated files. If set to NO, non-ASCII +# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode +# U+3044. +# The default value is: NO. + +ALLOW_UNICODE_NAMES = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian, +# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English +# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek, +# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with +# English messages), Korean, Korean-en (Korean with English messages), Latvian, +# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, +# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, +# Swedish, Turkish, Ukrainian and Vietnamese. +# The default value is: English. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member +# descriptions after the members that are listed in the file and class +# documentation (similar to Javadoc). Set to NO to disable this. +# The default value is: YES. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief +# description of a member or function before the detailed description +# +# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. +# The default value is: YES. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator that is +# used to form the text in various listings. Each string in this list, if found +# as the leading text of the brief description, will be stripped from the text +# and the result, after processing the whole list, is used as the annotated +# text. Otherwise, the brief description is used as-is. If left blank, the +# following values are used ($name is automatically replaced with the name of +# the entity):The $name class, The $name widget, The $name file, is, provides, +# specifies, contains, represents, a, an and the. + +ABBREVIATE_BRIEF = "The $name class" \ + "The $name widget" \ + "The $name file" \ + is \ + provides \ + specifies \ + contains \ + represents \ + a \ + an \ + the + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# doxygen will generate a detailed section even if there is only a brief +# description. +# The default value is: NO. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. +# The default value is: NO. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path +# before files name in the file list and in the header files. If set to NO the +# shortest path that makes the file name unique will be used +# The default value is: YES. + +FULL_PATH_NAMES = YES + +# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path. +# Stripping is only done if one of the specified strings matches the left-hand +# part of the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the path to +# strip. +# +# Note that you can specify absolute paths here, but also relative paths, which +# will be relative from the directory where doxygen is started. +# This tag requires that the tag FULL_PATH_NAMES is set to YES. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the +# path mentioned in the documentation of a class, which tells the reader which +# header file to include in order to use a class. If left blank only the name of +# the header file containing the class definition is used. Otherwise one should +# specify the list of include paths that are normally passed to the compiler +# using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but +# less readable) file names. This can be useful is your file systems doesn't +# support long names like on DOS, Mac, or CD-ROM. +# The default value is: NO. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the +# first line (until the first dot) of a Javadoc-style comment as the brief +# description. If set to NO, the Javadoc-style will behave just like regular Qt- +# style comments (thus requiring an explicit @brief command for a brief +# description.) +# The default value is: NO. + +JAVADOC_AUTOBRIEF = NO + +# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line +# such as +# /*************** +# as being the beginning of a Javadoc-style comment "banner". If set to NO, the +# Javadoc-style will behave just like regular comments and it will not be +# interpreted by doxygen. +# The default value is: NO. + +JAVADOC_BANNER = NO + +# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first +# line (until the first dot) of a Qt-style comment as the brief description. If +# set to NO, the Qt-style will behave just like regular Qt-style comments (thus +# requiring an explicit \brief command for a brief description.) +# The default value is: NO. + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a +# multi-line C++ special comment block (i.e. a block of //! or /// comments) as +# a brief description. This used to be the default behavior. The new default is +# to treat a multi-line C++ comment block as a detailed description. Set this +# tag to YES if you prefer the old behavior instead. +# +# Note that setting this tag to YES also means that rational rose comments are +# not recognized any more. +# The default value is: NO. + +MULTILINE_CPP_IS_BRIEF = NO + +# By default Python docstrings are displayed as preformatted text and doxygen's +# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the +# doxygen's special commands can be used and the contents of the docstring +# documentation blocks is shown as doxygen documentation. +# The default value is: YES. + +PYTHON_DOCSTRING = YES + +# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the +# documentation from any documented member that it re-implements. +# The default value is: YES. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new +# page for each member. If set to NO, the documentation of a member will be part +# of the file/class/namespace that contains it. +# The default value is: NO. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen +# uses this value to replace tabs by spaces in code fragments. +# Minimum value: 1, maximum value: 16, default value: 4. + +TAB_SIZE = 4 + +# This tag can be used to specify a number of aliases that act as commands in +# the documentation. An alias has the form: +# name=value +# For example adding +# "sideeffect=@par Side Effects:^^" +# will allow you to put the command \sideeffect (or @sideeffect) in the +# documentation, which will result in a user-defined paragraph with heading +# "Side Effects:". Note that you cannot put \n's in the value part of an alias +# to insert newlines (in the resulting output). You can put ^^ in the value part +# of an alias to insert a newline as if a physical newline was in the original +# file. When you need a literal { or } or , in the value part of an alias you +# have to escape them by means of a backslash (\), this can lead to conflicts +# with the commands \{ and \} for these it is advised to use the version @{ and +# @} or use a double escape (\\{ and \\}) + +ALIASES = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources +# only. Doxygen will then generate output that is more tailored for C. For +# instance, some of the names that are used will be different. The list of all +# members will be omitted, etc. +# The default value is: NO. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or +# Python sources only. Doxygen will then generate output that is more tailored +# for that language. For instance, namespaces will be presented as packages, +# qualified scopes will look different, etc. +# The default value is: NO. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources. Doxygen will then generate output that is tailored for Fortran. +# The default value is: NO. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for VHDL. +# The default value is: NO. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice +# sources only. Doxygen will then generate output that is more tailored for that +# language. For instance, namespaces will be presented as modules, types will be +# separated into more groups, etc. +# The default value is: NO. + +OPTIMIZE_OUTPUT_SLICE = NO + +# Doxygen selects the parser to use depending on the extension of the files it +# parses. With this tag you can assign which parser to use for a given +# extension. Doxygen has a built-in mapping, but you can override or extend it +# using this tag. The format is ext=language, where ext is a file extension, and +# language is one of the parsers supported by doxygen: IDL, Java, JavaScript, +# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice, +# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran: +# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser +# tries to guess whether the code is fixed or free formatted code, this is the +# default for Fortran type files). For instance to make doxygen treat .inc files +# as Fortran files (default is PHP), and .f files as C (default is Fortran), +# use: inc=Fortran f=C. +# +# Note: For files without extension you can use no_extension as a placeholder. +# +# Note that for custom extensions you also need to set FILE_PATTERNS otherwise +# the files are not read by doxygen. When specifying no_extension you should add +# * to the FILE_PATTERNS. +# +# Note see also the list of default file extension mappings. + +EXTENSION_MAPPING = + +# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments +# according to the Markdown format, which allows for more readable +# documentation. See https://daringfireball.net/projects/markdown/ for details. +# The output of markdown processing is further processed by doxygen, so you can +# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in +# case of backward compatibilities issues. +# The default value is: YES. + +MARKDOWN_SUPPORT = YES + +# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up +# to that level are automatically included in the table of contents, even if +# they do not have an id attribute. +# Note: This feature currently applies only to Markdown headings. +# Minimum value: 0, maximum value: 99, default value: 5. +# This tag requires that the tag MARKDOWN_SUPPORT is set to YES. + +TOC_INCLUDE_HEADINGS = 5 + +# When enabled doxygen tries to link words that correspond to documented +# classes, or namespaces to their corresponding documentation. Such a link can +# be prevented in individual cases by putting a % sign in front of the word or +# globally by setting AUTOLINK_SUPPORT to NO. +# The default value is: YES. + +AUTOLINK_SUPPORT = YES + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should set this +# tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); +# versus func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. +# The default value is: NO. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. +# The default value is: NO. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip (see: +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen +# will parse them like normal C++ but will assume all classes use public instead +# of private inheritance when no explicit protection keyword is present. +# The default value is: NO. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate +# getter and setter methods for a property. Setting this option to YES will make +# doxygen to replace the get and set methods by a property in the documentation. +# This will only work if the methods are indeed getting or setting a simple +# type. If this is not the case, or you want to show the methods anyway, you +# should set this option to NO. +# The default value is: YES. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. +# The default value is: NO. + +DISTRIBUTE_GROUP_DOC = NO + +# If one adds a struct or class to a group and this option is enabled, then also +# any nested class or struct is added to the same group. By default this option +# is disabled and one has to add nested compounds explicitly via \ingroup. +# The default value is: NO. + +GROUP_NESTED_COMPOUNDS = NO + +# Set the SUBGROUPING tag to YES to allow class member groups of the same type +# (for instance a group of public functions) to be put as a subgroup of that +# type (e.g. under the Public Functions section). Set it to NO to prevent +# subgrouping. Alternatively, this can be done per class using the +# \nosubgrouping command. +# The default value is: YES. + +SUBGROUPING = YES + +# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions +# are shown inside the group in which they are included (e.g. using \ingroup) +# instead of on a separate page (for HTML and Man pages) or section (for LaTeX +# and RTF). +# +# Note that this feature does not work in combination with +# SEPARATE_MEMBER_PAGES. +# The default value is: NO. + +INLINE_GROUPED_CLASSES = NO + +# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions +# with only public data fields or simple typedef fields will be shown inline in +# the documentation of the scope in which they are defined (i.e. file, +# namespace, or group documentation), provided this scope is documented. If set +# to NO, structs, classes, and unions are shown on a separate page (for HTML and +# Man pages) or section (for LaTeX and RTF). +# The default value is: NO. + +INLINE_SIMPLE_STRUCTS = NO + +# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or +# enum is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically be +# useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. +# The default value is: NO. + +TYPEDEF_HIDES_STRUCT = NO + +# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This +# cache is used to resolve symbols given their name and scope. Since this can be +# an expensive process and often the same symbol appears multiple times in the +# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small +# doxygen will become slower. If the cache is too large, memory is wasted. The +# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range +# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536 +# symbols. At the end of a run doxygen will report the cache usage and suggest +# the optimal cache size from a speed point of view. +# Minimum value: 0, maximum value: 9, default value: 0. + +LOOKUP_CACHE_SIZE = 0 + +# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use +# during processing. When set to 0 doxygen will based this on the number of +# cores available in the system. You can set it explicitly to a value larger +# than 0 to get more control over the balance between CPU load and processing +# speed. At this moment only the input processing can be done using multiple +# threads. Since this is still an experimental feature the default is set to 1, +# which effectively disables parallel processing. Please report any issues you +# encounter. Generating dot graphs in parallel is controlled by the +# DOT_NUM_THREADS setting. +# Minimum value: 0, maximum value: 32, default value: 1. + +NUM_PROC_THREADS = 1 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in +# documentation are documented, even if no documentation was available. Private +# class members and static file members will be hidden unless the +# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES. +# Note: This will also disable the warnings about undocumented members that are +# normally produced when WARNINGS is set to YES. +# The default value is: NO. + +EXTRACT_ALL = NO + +# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will +# be included in the documentation. +# The default value is: NO. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual +# methods of a class will be included in the documentation. +# The default value is: NO. + +EXTRACT_PRIV_VIRTUAL = NO + +# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal +# scope will be included in the documentation. +# The default value is: NO. + +EXTRACT_PACKAGE = NO + +# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be +# included in the documentation. +# The default value is: NO. + +EXTRACT_STATIC = NO + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined +# locally in source files will be included in the documentation. If set to NO, +# only classes defined in header files are included. Does not have any effect +# for Java sources. +# The default value is: YES. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. If set to YES, local methods, +# which are defined in the implementation section but not in the interface are +# included in the documentation. If set to NO, only methods in the interface are +# included. +# The default value is: NO. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base name of +# the file that contains the anonymous namespace. By default anonymous namespace +# are hidden. +# The default value is: NO. + +EXTRACT_ANON_NSPACES = NO + +# If this flag is set to YES, the name of an unnamed parameter in a declaration +# will be determined by the corresponding definition. By default unnamed +# parameters remain unnamed in the output. +# The default value is: YES. + +RESOLVE_UNNAMED_PARAMS = YES + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all +# undocumented members inside documented classes or files. If set to NO these +# members will be included in the various overviews, but no documentation +# section is generated. This option has no effect if EXTRACT_ALL is enabled. +# The default value is: NO. + +HIDE_UNDOC_MEMBERS = YES + +# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. If set +# to NO, these classes will be included in the various overviews. This option +# has no effect if EXTRACT_ALL is enabled. +# The default value is: NO. + +HIDE_UNDOC_CLASSES = YES + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend +# declarations. If set to NO, these declarations will be included in the +# documentation. +# The default value is: NO. + +HIDE_FRIEND_COMPOUNDS = YES + +# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any +# documentation blocks found inside the body of a function. If set to NO, these +# blocks will be appended to the function's detailed documentation block. +# The default value is: NO. + +HIDE_IN_BODY_DOCS = YES + +# The INTERNAL_DOCS tag determines if documentation that is typed after a +# \internal command is included. If the tag is set to NO then the documentation +# will be excluded. Set it to YES to include the internal documentation. +# The default value is: NO. + +INTERNAL_DOCS = NO + +# With the correct setting of option CASE_SENSE_NAMES doxygen will better be +# able to match the capabilities of the underlying filesystem. In case the +# filesystem is case sensitive (i.e. it supports files in the same directory +# whose names only differ in casing), the option must be set to YES to properly +# deal with such files in case they appear in the input. For filesystems that +# are not case sensitive the option should be set to NO to properly deal with +# output files written for symbols that only differ in casing, such as for two +# classes, one named CLASS and the other named Class, and to also support +# references to files without having to specify the exact matching casing. On +# Windows (including Cygwin) and MacOS, users should typically set this option +# to NO, whereas on Linux or other Unix flavors it should typically be set to +# YES. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. + +CASE_SENSE_NAMES = NO + +# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with +# their full class and namespace scopes in the documentation. If set to YES, the +# scope will be hidden. +# The default value is: NO. + +HIDE_SCOPE_NAMES = NO + +# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will +# append additional text to a page's title, such as Class Reference. If set to +# YES the compound reference will be hidden. +# The default value is: NO. + +HIDE_COMPOUND_REFERENCE= NO + +# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class +# will show which file needs to be included to use the class. +# The default value is: YES. + +SHOW_HEADERFILE = YES + +# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of +# the files that are included by a file in the documentation of that file. +# The default value is: YES. + +SHOW_INCLUDE_FILES = NO + +# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each +# grouped member an include statement to the documentation, telling the reader +# which file to include in order to use the member. +# The default value is: NO. + +SHOW_GROUPED_MEMB_INC = NO + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include +# files with double quotes in the documentation rather than with sharp brackets. +# The default value is: NO. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the +# documentation for inline members. +# The default value is: YES. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the +# (detailed) documentation of file and class members alphabetically by member +# name. If set to NO, the members will appear in declaration order. +# The default value is: YES. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief +# descriptions of file, namespace and class members alphabetically by member +# name. If set to NO, the members will appear in declaration order. Note that +# this will also influence the order of the classes in the class list. +# The default value is: NO. + +SORT_BRIEF_DOCS = NO + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the +# (brief and detailed) documentation of class members so that constructors and +# destructors are listed first. If set to NO the constructors will appear in the +# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS. +# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief +# member documentation. +# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting +# detailed member documentation. +# The default value is: NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy +# of group names into alphabetical order. If set to NO the group names will +# appear in their defined order. +# The default value is: NO. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by +# fully-qualified names, including namespaces. If set to NO, the class list will +# be sorted only by class name, not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the alphabetical +# list. +# The default value is: NO. + +SORT_BY_SCOPE_NAME = NO + +# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper +# type resolution of all parameters of a function it will reject a match between +# the prototype and the implementation of a member function even if there is +# only one candidate or it is obvious which candidate to choose by doing a +# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still +# accept a match between prototype and implementation in such cases. +# The default value is: NO. + +STRICT_PROTO_MATCHING = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo +# list. This list is created by putting \todo commands in the documentation. +# The default value is: YES. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test +# list. This list is created by putting \test commands in the documentation. +# The default value is: YES. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug +# list. This list is created by putting \bug commands in the documentation. +# The default value is: YES. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO) +# the deprecated list. This list is created by putting \deprecated commands in +# the documentation. +# The default value is: YES. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional documentation +# sections, marked by \if ... \endif and \cond +# ... \endcond blocks. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the +# initial value of a variable or macro / define can have for it to appear in the +# documentation. If the initializer consists of more lines than specified here +# it will be hidden. Use a value of 0 to hide initializers completely. The +# appearance of the value of individual variables and macros / defines can be +# controlled using \showinitializer or \hideinitializer command in the +# documentation regardless of this setting. +# Minimum value: 0, maximum value: 10000, default value: 30. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at +# the bottom of the documentation of classes and structs. If set to YES, the +# list will mention the files that were used to generate the documentation. +# The default value is: YES. + +SHOW_USED_FILES = NO + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This +# will remove the Files entry from the Quick Index and from the Folder Tree View +# (if specified). +# The default value is: YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces +# page. This will remove the Namespaces entry from the Quick Index and from the +# Folder Tree View (if specified). +# The default value is: YES. + +SHOW_NAMESPACES = NO + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command command input-file, where command is the value of the +# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided +# by doxygen. Whatever the program writes to standard output is used as the file +# version. For an example see the documentation. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed +# by doxygen. The layout file controls the global structure of the generated +# output files in an output format independent way. To create the layout file +# that represents doxygen's defaults, run doxygen with the -l option. You can +# optionally specify a file name after the option, if omitted DoxygenLayout.xml +# will be used as the name of the layout file. See also section "Changing the +# layout of pages" for information. +# +# Note that if you run doxygen from a directory containing a file called +# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE +# tag is left empty. + +LAYOUT_FILE = + +# The CITE_BIB_FILES tag can be used to specify one or more bib files containing +# the reference definitions. This must be a list of .bib files. The .bib +# extension is automatically appended if omitted. This requires the bibtex tool +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. +# For LaTeX the style of the bibliography can be controlled using +# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the +# search path. See also \cite for info how to create references. + +CITE_BIB_FILES = + +#--------------------------------------------------------------------------- +# Configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated to +# standard output by doxygen. If QUIET is set to YES this implies that the +# messages are off. +# The default value is: NO. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES +# this implies that the warnings are on. +# +# Tip: Turn warnings on while writing the documentation. +# The default value is: YES. + +WARNINGS = YES + +# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate +# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: YES. + +WARN_IF_UNDOCUMENTED = YES + +# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as documenting some parameters in +# a documented function twice, or documenting parameters that don't exist or +# using markup commands wrongly. +# The default value is: YES. + +WARN_IF_DOC_ERROR = YES + +# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete +# function parameter documentation. If set to NO, doxygen will accept that some +# parameters have no documentation without warning. +# The default value is: YES. + +WARN_IF_INCOMPLETE_DOC = YES + +# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that +# are documented, but have no documentation for their parameters or return +# value. If set to NO, doxygen will only warn about wrong parameter +# documentation, but not about the absence of documentation. If EXTRACT_ALL is +# set to YES then this flag will automatically be disabled. See also +# WARN_IF_INCOMPLETE_DOC +# The default value is: NO. + +WARN_NO_PARAMDOC = NO + +# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when +# a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS +# then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but +# at the end of the doxygen process doxygen will return with a non-zero status. +# Possible values are: NO, YES and FAIL_ON_WARNINGS. +# The default value is: NO. + +WARN_AS_ERROR = YES + +# The WARN_FORMAT tag determines the format of the warning messages that doxygen +# can produce. The string should contain the $file, $line, and $text tags, which +# will be replaced by the file and line number from which the warning originated +# and the warning text. Optionally the format may contain $version, which will +# be replaced by the version of the file (if it could be obtained via +# FILE_VERSION_FILTER) +# See also: WARN_LINE_FORMAT +# The default value is: $file:$line: $text. + +WARN_FORMAT = "$file:$line: $text" + +# In the $text part of the WARN_FORMAT command it is possible that a reference +# to a more specific place is given. To make it easier to jump to this place +# (outside of doxygen) the user can define a custom "cut" / "paste" string. +# Example: +# WARN_LINE_FORMAT = "'vi $file +$line'" +# See also: WARN_FORMAT +# The default value is: at line $line of file $file. + +WARN_LINE_FORMAT = "at line $line of file $file" + +# The WARN_LOGFILE tag can be used to specify a file to which warning and error +# messages should be written. If left blank the output is written to standard +# error (stderr). In case the file specified cannot be opened for writing the +# warning and error messages are written to standard error. When as file - is +# specified the warning and error messages are written to standard output +# (stdout). + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# Configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag is used to specify the files and/or directories that contain +# documented source files. You may enter file names like myfile.cpp or +# directories like /usr/src/myproject. Separate the files or directories with +# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING +# Note: If this tag is empty the current directory is searched. + +INPUT = ../CHANGELOG.md \ + . \ + ../src + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses +# libiconv (or the iconv built into libc) for the transcoding. See the libiconv +# documentation (see: +# https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING +# The default value is: UTF-8. + +INPUT_ENCODING = UTF-8 + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and +# *.h) to filter out the source-files in the directories. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# read by doxygen. +# +# Note the list of default checked file patterns might differ from the list of +# default file extension mappings. +# +# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp, +# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, +# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, +# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C +# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, +# *.vhdl, *.ucf, *.qsf and *.ice. + +FILE_PATTERNS = *.c \ + *.cc \ + *.cxx \ + *.cpp \ + *.c++ \ + *.java \ + *.ii \ + *.ixx \ + *.ipp \ + *.i++ \ + *.inl \ + *.idl \ + *.ddl \ + *.odl \ + *.h \ + *.hh \ + *.hxx \ + *.hpp \ + *.h++ \ + *.cs \ + *.d \ + *.php \ + *.php4 \ + *.php5 \ + *.phtml \ + *.inc \ + *.m \ + *.markdown \ + *.md \ + *.mm \ + *.dox \ + *.doc \ + *.txt \ + *.py \ + *.pyw \ + *.f90 \ + *.f95 \ + *.f03 \ + *.f08 \ + *.f18 \ + *.f \ + *.for \ + *.vhd \ + *.vhdl \ + *.ucf \ + *.qsf \ + *.ice + +# The RECURSIVE tag can be used to specify whether or not subdirectories should +# be searched for input files as well. +# The default value is: NO. + +RECURSIVE = YES + +# The EXCLUDE tag can be used to specify files and/or directories that should be +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. +# +# Note that relative paths are relative to the directory from which doxygen is +# run. + +EXCLUDE = ../src/nimconfig_rename.h + +# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or +# directories that are symbolic links (a Unix file system feature) are excluded +# from the input. +# The default value is: NO. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories for example use the pattern */test/* + +EXCLUDE_PATTERNS = + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# ANamespace::AClass, ANamespace::*Test +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories use the pattern */test/* + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or directories +# that contain example code fragments that are included (see the \include +# command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and +# *.h) to filter out the source-files in the directories. If left blank all +# files are included. + +EXAMPLE_PATTERNS = * + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude commands +# irrespective of the value of the RECURSIVE tag. +# The default value is: NO. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or directories +# that contain images that are to be included in the documentation (see the +# \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command: +# +# +# +# where is the value of the INPUT_FILTER tag, and is the +# name of an input file. Doxygen will then use the output that the filter +# program writes to standard output. If FILTER_PATTERNS is specified, this tag +# will be ignored. +# +# Note that the filter must not add or remove lines; it is applied before the +# code is scanned, but not when the output code is generated. If lines are added +# or removed, the anchors will not be placed correctly. +# +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# properly processed by doxygen. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: pattern=filter +# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how +# filters are used. If the FILTER_PATTERNS tag is empty or if none of the +# patterns match the file name, INPUT_FILTER is applied. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# properly processed by doxygen. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will also be used to filter the input files that are used for +# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES). +# The default value is: NO. + +FILTER_SOURCE_FILES = NO + +# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file +# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and +# it is also possible to disable source filtering for a specific pattern using +# *.ext= (so without naming a filter). +# This tag requires that the tag FILTER_SOURCE_FILES is set to YES. + +FILTER_SOURCE_PATTERNS = + +# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that +# is part of the input, its contents will be placed on the main page +# (index.html). This can be useful if you have a project on for instance GitHub +# and want to reuse the introduction page also for the doxygen output. + +USE_MDFILE_AS_MAINPAGE = index.md + +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + +#--------------------------------------------------------------------------- +# Configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will be +# generated. Documented entities will be cross-referenced with these sources. +# +# Note: To get rid of all source code in the generated output, make sure that +# also VERBATIM_HEADERS is set to NO. +# The default value is: NO. + +SOURCE_BROWSER = NO + +# Setting the INLINE_SOURCES tag to YES will include the body of functions, +# classes and enums directly into the documentation. +# The default value is: NO. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any +# special comment blocks from generated source code fragments. Normal C, C++ and +# Fortran comments will always remain visible. +# The default value is: YES. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES then for each documented +# entity all documented functions referencing it will be listed. +# The default value is: NO. + +REFERENCED_BY_RELATION = NO + +# If the REFERENCES_RELATION tag is set to YES then for each documented function +# all documented entities called/used by that function will be listed. +# The default value is: NO. + +REFERENCES_RELATION = NO + +# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set +# to YES then the hyperlinks from functions in REFERENCES_RELATION and +# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will +# link to the documentation. +# The default value is: YES. + +REFERENCES_LINK_SOURCE = YES + +# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the +# source code will show a tooltip with additional information such as prototype, +# brief description and links to the definition and documentation. Since this +# will make the HTML file larger and loading of large files a bit slower, you +# can opt to disable this feature. +# The default value is: YES. +# This tag requires that the tag SOURCE_BROWSER is set to YES. + +SOURCE_TOOLTIPS = YES + +# If the USE_HTAGS tag is set to YES then the references to source code will +# point to the HTML generated by the htags(1) tool instead of doxygen built-in +# source browser. The htags tool is part of GNU's global source tagging system +# (see https://www.gnu.org/software/global/global.html). You will need version +# 4.8.6 or higher. +# +# To use it do the following: +# - Install the latest version of global +# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file +# - Make sure the INPUT points to the root of the source tree +# - Run doxygen as normal +# +# Doxygen will invoke htags (and that will in turn invoke gtags), so these +# tools must be available from the command line (i.e. in the search path). +# +# The result: instead of the source browser generated by doxygen, the links to +# source code will now point to the output of htags. +# The default value is: NO. +# This tag requires that the tag SOURCE_BROWSER is set to YES. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a +# verbatim copy of the header file for each class for which an include is +# specified. Set to NO to disable this. +# See also: Section \class. +# The default value is: YES. + +VERBATIM_HEADERS = YES + +# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the +# clang parser (see: +# http://clang.llvm.org/) for more accurate parsing at the cost of reduced +# performance. This can be particularly helpful with template rich C++ code for +# which doxygen's built-in parser lacks the necessary type information. +# Note: The availability of this option depends on whether or not doxygen was +# generated with the -Duse_libclang=ON option for CMake. +# The default value is: NO. + +CLANG_ASSISTED_PARSING = NO + +# If the CLANG_ASSISTED_PARSING tag is set to YES and the CLANG_ADD_INC_PATHS +# tag is set to YES then doxygen will add the directory of each input to the +# include path. +# The default value is: YES. +# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES. + +CLANG_ADD_INC_PATHS = YES + +# If clang assisted parsing is enabled you can provide the compiler with command +# line options that you would normally use when invoking the compiler. Note that +# the include paths will already be set by doxygen for the files and directories +# specified with INPUT and INCLUDE_PATH. +# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES. + +CLANG_OPTIONS = + +# If clang assisted parsing is enabled you can provide the clang parser with the +# path to the directory containing a file called compile_commands.json. This +# file is the compilation database (see: +# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) containing the +# options used when the source files were built. This is equivalent to +# specifying the -p option to a clang tool, such as clang-check. These options +# will then be passed to the parser. Any options specified with CLANG_OPTIONS +# will be added as well. +# Note: The availability of this option depends on whether or not doxygen was +# generated with the -Duse_libclang=ON option for CMake. + +CLANG_DATABASE_PATH = + +#--------------------------------------------------------------------------- +# Configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all +# compounds will be generated. Enable this if the project contains a lot of +# classes, structs, unions or interfaces. +# The default value is: YES. + +ALPHABETICAL_INDEX = YES + +# In case all classes in a project start with a common prefix, all classes will +# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag +# can be used to specify a prefix (or a list of prefixes) that should be ignored +# while generating the index headers. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output +# The default value is: YES. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: html. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_OUTPUT = html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each +# generated HTML page (for example: .htm, .php, .asp). +# The default value is: .html. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a user-defined HTML header file for +# each generated HTML page. If the tag is left blank doxygen will generate a +# standard header. +# +# To get valid HTML the header file that includes any scripts and style sheets +# that doxygen needs, which is dependent on the configuration options used (e.g. +# the setting GENERATE_TREEVIEW). It is highly recommended to start with a +# default header using +# doxygen -w html new_header.html new_footer.html new_stylesheet.css +# YourConfigFile +# and then modify the file new_header.html. See also section "Doxygen usage" +# for information on how to generate the default header that doxygen normally +# uses. +# Note: The header is subject to change so you typically have to regenerate the +# default header when upgrading to a newer version of doxygen. For a description +# of the possible markers and block names see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each +# generated HTML page. If the tag is left blank doxygen will generate a standard +# footer. See HTML_HEADER for more information on how to generate a default +# footer and what special commands can be used inside the footer. See also +# section "Doxygen usage" for information on how to generate the default footer +# that doxygen normally uses. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style +# sheet that is used by each HTML page. It can be used to fine-tune the look of +# the HTML output. If left blank doxygen will generate a default style sheet. +# See also section "Doxygen usage" for information on how to generate the style +# sheet that doxygen normally uses. +# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as +# it is more robust and this tag (HTML_STYLESHEET) will in the future become +# obsolete. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_STYLESHEET = + +# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined +# cascading style sheets that are included after the standard style sheets +# created by doxygen. Using this option one can overrule certain style aspects. +# This is preferred over using HTML_STYLESHEET since it does not replace the +# standard style sheet and is therefore more robust against future updates. +# Doxygen will copy the style sheet files to the output directory. +# Note: The order of the extra style sheet files is of importance (e.g. the last +# style sheet in the list overrules the setting of the previous ones in the +# list). For an example see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_EXTRA_STYLESHEET = + +# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or +# other source files which should be copied to the HTML output directory. Note +# that these files will be copied to the base HTML output directory. Use the +# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these +# files. In the HTML_STYLESHEET file, use the file name only. Also note that the +# files will be copied as-is; there are no commands or markers available. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_EXTRA_FILES = + +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. Default setting AUTO_LIGHT +# enables light output unless the user preference is dark output. Other options +# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to +# default to dark mode unless the user prefers light mode, and TOGGLE to let the +# user toggle between dark and light mode via a button. +# Possible values are: LIGHT Always generate light output., DARK Always generate +# dark output., AUTO_LIGHT Automatically set the mode according to the user +# preference, use light mode if no preference is set (the default)., AUTO_DARK +# Automatically set the mode according to the user preference, use dark mode if +# no preference is set. and TOGGLE Allow to user to switch between light and +# dark mode via a button.. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen +# will adjust the colors in the style sheet and background images according to +# this color. Hue is specified as an angle on a color-wheel, see +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value +# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 +# purple, and 360 is red again. +# Minimum value: 0, maximum value: 359, default value: 220. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_HUE = 220 + +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors +# in the HTML output. For a value of 0 the output will use gray-scales only. A +# value of 255 will produce the most vivid colors. +# Minimum value: 0, maximum value: 255, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_SAT = 100 + +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the +# luminance component of the colors in the HTML output. Values below 100 +# gradually make the output lighter, whereas values above 100 make the output +# darker. The value divided by 100 is the actual gamma applied, so 80 represents +# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not +# change the gamma. +# Minimum value: 40, maximum value: 240, default value: 80. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_GAMMA = 80 + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting this +# to YES can help to show when doxygen was last run and thus if the +# documentation is up to date. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_TIMESTAMP = NO + +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via JavaScript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have JavaScript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_SECTIONS = NO + +# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries +# shown in the various tree structured indices initially; the user can expand +# and collapse entries dynamically later on. Doxygen will expand the tree to +# such a level that at most the specified number of entries are visible (unless +# a fully collapsed tree already exceeds this amount). So setting the number of +# entries 1 will produce a full collapsed tree by default. 0 is a special value +# representing an infinite number of entries and will result in a full expanded +# tree by default. +# Minimum value: 0, maximum value: 9999, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_INDEX_NUM_ENTRIES = 100 + +# If the GENERATE_DOCSET tag is set to YES, additional index files will be +# generated that can be used as input for Apple's Xcode 3 integrated development +# environment (see: +# https://developer.apple.com/xcode/), introduced with OSX 10.5 (Leopard). To +# create a documentation set, doxygen will generate a Makefile in the HTML +# output directory. Running make will produce the docset in that directory and +# running make install will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at +# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy +# genXcode/_index.html for more information. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_DOCSET = NO + +# This tag determines the name of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# The default value is: Doxygen generated docs. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# This tag determines the URL of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDURL = + +# This tag specifies a string that should uniquely identify the documentation +# set bundle. This should be a reverse domain-name style string, e.g. +# com.mycompany.MyDocSet. Doxygen will append .docset to the name. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify +# the documentation publisher. This should be a reverse domain-name style +# string, e.g. com.mycompany.MyDocSet.documentation. +# The default value is: org.doxygen.Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_PUBLISHER_ID = org.doxygen.Publisher + +# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. +# The default value is: Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_PUBLISHER_NAME = Publisher + +# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three +# additional HTML index files: index.hhp, index.hhc, and index.hhk. The +# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop +# on Windows. In the beginning of 2021 Microsoft took the original page, with +# a.o. the download links, offline the HTML help workshop was already many years +# in maintenance mode). You can download the HTML help workshop from the web +# archives at Installation executable (see: +# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo +# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe). +# +# The HTML Help Workshop contains a compiler that can convert all HTML output +# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML +# files are now used as the Windows 98 help format, and will replace the old +# Windows help format (.hlp) on all Windows platforms in the future. Compressed +# HTML files also contain an index, a table of contents, and you can search for +# words in the documentation. The HTML workshop also contains a viewer for +# compressed HTML files. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_HTMLHELP = NO + +# The CHM_FILE tag can be used to specify the file name of the resulting .chm +# file. You can add a path in front of the file if the result should not be +# written to the html output directory. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +CHM_FILE = + +# The HHC_LOCATION tag can be used to specify the location (absolute path +# including file name) of the HTML help compiler (hhc.exe). If non-empty, +# doxygen will try to run the HTML help compiler on the generated index.hhp. +# The file has to be specified with full path. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +HHC_LOCATION = + +# The GENERATE_CHI flag controls if a separate .chi index file is generated +# (YES) or that it should be included in the main .chm file (NO). +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +GENERATE_CHI = NO + +# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc) +# and project file content. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +CHM_INDEX_ENCODING = + +# The BINARY_TOC flag controls whether a binary table of contents is generated +# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it +# enables the Previous and Next buttons. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members to +# the table of contents of the HTML help documentation and to the tree view. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +TOC_EXPAND = NO + +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that +# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help +# (.qch) of the generated HTML documentation. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify +# the file name of the resulting .qch file. The path specified is relative to +# the HTML output folder. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help +# Project output. For more information please see Qt Help Project / Namespace +# (see: +# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace). +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_NAMESPACE = org.doxygen.Project + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt +# Help Project output. For more information please see Qt Help Project / Virtual +# Folders (see: +# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-folders). +# The default value is: doc. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_VIRTUAL_FOLDER = doc + +# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom +# filter to add. For more information please see Qt Help Project / Custom +# Filters (see: +# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see Qt Help Project / Custom +# Filters (see: +# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this +# project's filter section matches. Qt Help Project / Filter Attributes (see: +# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_SECT_FILTER_ATTRS = + +# The QHG_LOCATION tag can be used to specify the location (absolute path +# including file name) of Qt's qhelpgenerator. If non-empty doxygen will try to +# run qhelpgenerator on the generated .qhp file. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHG_LOCATION = + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be +# generated, together with the HTML files, they form an Eclipse help plugin. To +# install this plugin and make it available under the help contents menu in +# Eclipse, the contents of the directory containing the HTML and XML files needs +# to be copied into the plugins directory of eclipse. The name of the directory +# within the plugins directory should be the same as the ECLIPSE_DOC_ID value. +# After copying Eclipse needs to be restarted before the help appears. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the Eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have this +# name. Each documentation set should have its own identifier. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# If you want full control over the layout of the generated HTML pages it might +# be necessary to disable the index and replace it with your own. The +# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top +# of each HTML page. A value of NO enables the index and the value YES disables +# it. Since the tabs in the index contain the same information as the navigation +# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +DISABLE_INDEX = NO + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. If the tag +# value is set to YES, a side panel will be generated containing a tree-like +# index structure (just like the one that is generated for HTML Help). For this +# to work a browser that supports JavaScript, DHTML, CSS and frames is required +# (i.e. any modern browser). Windows users are probably better off using the +# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can +# further fine tune the look of the index (see "Fine-tuning the output"). As an +# example, the default style sheet generated by doxygen has an example that +# shows how to put an image at the root of the tree instead of the PROJECT_NAME. +# Since the tree basically has the same information as the tab index, you could +# consider setting DISABLE_INDEX to YES when enabling this option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_TREEVIEW = YES + +# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the +# FULL_SIDEBAR option determines if the side bar is limited to only the treeview +# area (value NO) or if it should extend to the full height of the window (value +# YES). Setting this to YES gives a layout similar to +# https://docs.readthedocs.io with more room for contents, but less room for the +# project logo, title, and description. If either GENERATE_TREEVIEW or +# DISABLE_INDEX is set to NO, this option has no effect. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +FULL_SIDEBAR = NO + +# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that +# doxygen will group on one line in the generated HTML documentation. +# +# Note that a value of 0 will completely suppress the enum values from appearing +# in the overview section. +# Minimum value: 0, maximum value: 20, default value: 4. +# This tag requires that the tag GENERATE_HTML is set to YES. + +ENUM_VALUES_PER_LINE = 4 + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used +# to set the initial width (in pixels) of the frame in which the tree is shown. +# Minimum value: 0, maximum value: 1500, default value: 250. +# This tag requires that the tag GENERATE_HTML is set to YES. + +TREEVIEW_WIDTH = 250 + +# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to +# external symbols imported via tag files in a separate window. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +EXT_LINKS_IN_WINDOW = NO + +# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email +# addresses. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +OBFUSCATE_EMAILS = YES + +# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg +# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see +# https://inkscape.org) to generate formulas as SVG images instead of PNGs for +# the HTML output. These images will generally look nicer at scaled resolutions. +# Possible values are: png (the default) and svg (looks nicer but requires the +# pdf2svg or inkscape tool). +# The default value is: png. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_FORMULA_FORMAT = png + +# Use this tag to change the font size of LaTeX formulas included as images in +# the HTML documentation. When you change the font size after a successful +# doxygen run you need to manually remove any form_*.png images from the HTML +# output directory to force them to be regenerated. +# Minimum value: 8, maximum value: 50, default value: 10. +# This tag requires that the tag GENERATE_HTML is set to YES. + +FORMULA_FONTSIZE = 10 + +# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands +# to create new LaTeX commands to be used in formulas as building blocks. See +# the section "Including formulas" for details. + +FORMULA_MACROFILE = + +# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see +# https://www.mathjax.org) which uses client side JavaScript for the rendering +# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX +# installed or if you want to formulas look prettier in the HTML output. When +# enabled you may also need to install MathJax separately and configure the path +# to it using the MATHJAX_RELPATH option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +USE_MATHJAX = NO + +# With MATHJAX_VERSION it is possible to specify the MathJax version to be used. +# Note that the different versions of MathJax have different requirements with +# regards to the different settings, so it is possible that also other MathJax +# settings have to be changed when switching between the different MathJax +# versions. +# Possible values are: MathJax_2 and MathJax_3. +# The default value is: MathJax_2. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_VERSION = MathJax_2 + +# When MathJax is enabled you can set the default output format to be used for +# the MathJax output. For more details about the output format see MathJax +# version 2 (see: +# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3 +# (see: +# http://docs.mathjax.org/en/latest/web/components/output.html). +# Possible values are: HTML-CSS (which is slower, but has the best +# compatibility. This is the name for Mathjax version 2, for MathJax version 3 +# this will be translated into chtml), NativeMML (i.e. MathML. Only supported +# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This +# is the name for Mathjax version 3, for MathJax version 2 this will be +# translated into HTML-CSS) and SVG. +# The default value is: HTML-CSS. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_FORMAT = HTML-CSS + +# When MathJax is enabled you need to specify the location relative to the HTML +# output directory using the MATHJAX_RELPATH option. The destination directory +# should contain the MathJax.js script. For instance, if the mathjax directory +# is located at the same level as the HTML output directory, then +# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax +# Content Delivery Network so you can quickly see the result without installing +# MathJax. However, it is strongly recommended to install a local copy of +# MathJax from https://www.mathjax.org before deployment. The default value is: +# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2 +# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3 +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_RELPATH = https://cdn.jsdelivr.net/npm/mathjax@2 + +# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax +# extension names that should be enabled during MathJax rendering. For example +# for MathJax version 2 (see https://docs.mathjax.org/en/v2.7-latest/tex.html +# #tex-and-latex-extensions): +# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols +# For example for MathJax version 3 (see +# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html): +# MATHJAX_EXTENSIONS = ams +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_EXTENSIONS = + +# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces +# of code that will be used on startup of the MathJax code. See the MathJax site +# (see: +# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details. For an +# example see the documentation. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_CODEFILE = + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box for +# the HTML output. The underlying search engine uses javascript and DHTML and +# should work on any modern browser. Note that when using HTML help +# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) +# there is already a search function so this one should typically be disabled. +# For large projects the javascript based search engine can be slow, then +# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to +# search using the keyboard; to jump to the search box use + S +# (what the is depends on the OS and browser, but it is typically +# , /