From ea63c5e4801c15dc93050cf94dde34355a8281e2 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Sun, 7 Nov 2021 17:56:28 +0300 Subject: [PATCH 001/402] fix opentherm --- tasmota/xsns_69_opentherm.ino | 20 ++++++++++++++++-- tasmota/xsns_69_opentherm_protocol.ino | 29 ++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/tasmota/xsns_69_opentherm.ino b/tasmota/xsns_69_opentherm.ino index cfcc0384d..c94e61b59 100644 --- a/tasmota/xsns_69_opentherm.ino +++ b/tasmota/xsns_69_opentherm.ino @@ -16,6 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +#define USE_OPENTHERM #ifdef USE_OPENTHERM @@ -467,8 +468,11 @@ uint8_t sns_opentherm_read_flags(char *data, uint32_t len) // flag value, however, this command does not update the settings. #define D_CMND_SET_HOT_WATER_ENABLED "dhw" +// BLOR - Reset boiler +#define D_CMND_BLLOR "blor" + const char kOpenThermCommands[] PROGMEM = D_PRFX_OTHERM "|" D_CMND_OTHERM_BOILER_SETPOINT "|" D_CMND_OTHERM_DHW_SETPOINT - "|" D_CMND_OTHERM_SAVE_SETTINGS "|" D_CMND_OTHERM_FLAGS "|" D_CMND_SET_CENTRAL_HEATING_ENABLED "|" D_CMND_SET_HOT_WATER_ENABLED; + "|" D_CMND_OTHERM_SAVE_SETTINGS "|" D_CMND_OTHERM_FLAGS "|" D_CMND_SET_CENTRAL_HEATING_ENABLED "|" D_CMND_SET_HOT_WATER_ENABLED "|" D_CMND_BLLOR; void (*const OpenThermCommands[])(void) PROGMEM = { &sns_opentherm_boiler_setpoint_cmd, @@ -476,7 +480,8 @@ void (*const OpenThermCommands[])(void) PROGMEM = { &sns_opentherm_save_settings_cmd, &sns_opentherm_flags_cmd, &sns_opentherm_set_central_heating_cmd, - &sns_opentherm_set_hot_water_cmd}; + &sns_opentherm_set_hot_water_cmd, + &sns_opentherm_blor_cmd,}; void sns_opentherm_cmd(void) { } void sns_opentherm_boiler_setpoint_cmd(void) @@ -550,6 +555,17 @@ void sns_opentherm_set_hot_water_cmd(void) ResponseCmndNumber(sns_ot_boiler_status.m_enableHotWater ? 1 : 0); } +void sns_opentherm_blor_cmd(void) +{ + bool query = strlen(XdrvMailbox.data) == 0; + bool retval = false; + if (!query) + { + if (atoi(XdrvMailbox.data)) retval = sns_opentherm_call_blor(); + } + ResponseCmndNumber(retval); +} + /*********************************************************************************************\ * Interface \*********************************************************************************************/ diff --git a/tasmota/xsns_69_opentherm_protocol.ino b/tasmota/xsns_69_opentherm_protocol.ino index bc821640a..a86648849 100644 --- a/tasmota/xsns_69_opentherm_protocol.ino +++ b/tasmota/xsns_69_opentherm_protocol.ino @@ -16,6 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +#define USE_OPENTHERM #ifdef USE_OPENTHERM @@ -243,6 +244,14 @@ OpenThermCommand sns_opentherm_commands[] = { .m_ot_make_request = sns_opentherm_get_generic_u16, .m_ot_parse_response = sns_opentherm_parse_generic_u16, .m_ot_appent_telemetry = sns_opentherm_tele_generic_u16}, + {// Boiler Lock-out Reset command + .m_command_name = "BLOR", + .m_command_code = (uint8_t)OpenThermMessageID::Command, + .m_flags = {.notSupported = 1}, + .m_results = {{.m_u8 = 0}, {.m_u8 = 0}}, + .m_ot_make_request = sns_opentherm_send_blor, + .m_ot_parse_response = sns_opentherm_parse_generic_u16, + .m_ot_appent_telemetry = sns_opentherm_tele_u8_u8}, }; /////////////////////////////////// Process Slave Status Flags & Control ////////////////////////////////////////////////// @@ -431,6 +440,26 @@ void sns_opentherm_tele_oem_diag(struct OpenThermCommandT *self) ResponseAppend_P(PSTR("%d"), (int)self->m_results[0].m_u16); } +/////////////////////////////////// Boiler Boiler Lock-out Reset ////////////////////////////////////////////////// +unsigned long sns_opentherm_send_blor(struct OpenThermCommandT *self, struct OT_BOILER_STATUS_T *status) +{ + AddLog(LOG_LEVEL_ERROR, PSTR("[OTH]: Boiler Boiler Lock-out Reset")); + + self->m_flags.notSupported = true; // Disable future calls of this command + + unsigned int data = 1; //1 : “BLOR”= Boiler Lock-out Reset command + return OpenTherm::buildRequest(OpenThermMessageType::WRITE_DATA, OpenThermMessageID::Command, data); +} +bool sns_opentherm_call_blor() +{ + /* + OpenThermCommandT *cmd = &sns_opentherm_commands[sns_opentherm_current_command-1]; + if (strcmp(cmd->m_command_name, "BLOR")) return false; + cmd->m_flags.notSupported = false; + return true; + */ +} + /////////////////////////////////// Generic Single Float ///////////////////////////////////////////////// unsigned long sns_opentherm_get_generic_float(struct OpenThermCommandT *self, struct OT_BOILER_STATUS_T *) { From f6211a416bc0d1b1a30f5f2d0c593a4ee9ccbbc2 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Sun, 7 Nov 2021 17:59:03 +0300 Subject: [PATCH 002/402] fix opentherm --- tasmota/xlgt_01_ws2812.ino | 99 +++++++++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 1 deletion(-) diff --git a/tasmota/xlgt_01_ws2812.ino b/tasmota/xlgt_01_ws2812.ino index a7e7c9927..465aba427 100644 --- a/tasmota/xlgt_01_ws2812.ino +++ b/tasmota/xlgt_01_ws2812.ino @@ -17,6 +17,11 @@ along with this program. If not, see . */ +#ifndef FIRMWARE_MINIMAL +#define USE_LIGHT +#define USE_WS2812 +#endif + #ifdef USE_LIGHT #ifdef USE_WS2812 /*********************************************************************************************\ @@ -37,7 +42,7 @@ #define XLGT_01 1 -const uint8_t WS2812_SCHEMES = 8; // Number of WS2812 schemes +const uint8_t WS2812_SCHEMES = 10; // Number of WS2812 schemes const char kWs2812Commands[] PROGMEM = "|" // No prefix D_CMND_LED "|" D_CMND_PIXELS "|" D_CMND_ROTATION "|" D_CMND_WIDTH ; @@ -289,6 +294,93 @@ void Ws2812Clock(void) Ws2812StripShow(); } +#define pow2(x) ((x)*(x)) +#define pow3(x) ((x)*pow2(x)) +#define pow4(x) (pow2(x)*pow2(x)) + +void Ws2812RunningStrip(int scheme) +{ +#if (USE_WS2812_CTYPE > NEO_3LED) + RgbwColor c; + c.W = 0; +#else + RgbColor c(Settings->light_dimmer); +#endif + + static uint32_t timer_counter = 0; + static uint32_t last_timer_counter = timer_counter; + if (Settings->light_rotation%2) timer_counter--; + else timer_counter++; + + uint32_t width = Settings->ws_width[WS_MINUTE]?Settings->ws_width[WS_MINUTE]:1; + uint32_t repeat = 1;//kWsRepeat[Settings->light_width]; // number of scheme.count per ledcount + uint32_t range = (uint32_t)ceil((float)Settings->light_pixels / (float)repeat); + uint32_t speed = Settings->light_speed; //((Settings->light_speed * 2) -1) * (STATES / 10); // + static uint32_t offset = 0; + + if (scheme==WS2812_SCHEMES-1) { + if (timer_counter/speed!=last_timer_counter/speed) { + offset = random(range); + last_timer_counter = timer_counter; + } + } else { + offset = speed > 0 ? timer_counter / speed : 0; + } + + //WsColor oldColor, currentColor; + //Ws2812GradientColor(schemenr, &oldColor, range, gradRange, offset); + //currentColor = oldColor; + int power = Settings->ws_width[WS_SECOND]; + int max_input = pow(width, power); + float dimmer = 100 / (float)Settings->light_dimmer; + + uint32_t target = offset % Settings->light_pixels; + + for (uint32_t i = 0; i < Settings->light_pixels; i++) { + int delta = targetlight_color[0] / pow(delta+1, power); + float fmyGrn = Settings->light_color[1] / pow(delta+1, power); + float fmyBlu = Settings->light_color[2] / pow(delta+1, power); + /* + float fmyRed = (float)wsmap(max_input-pow(delta+1, power), 0, max_input, 0, Settings->light_color[0]); + float fmyGrn = (float)wsmap(max_input-pow(delta+1, power), 0, max_input, 0, Settings->light_color[1]); + float fmyBlu = (float)wsmap(max_input-pow(delta+1, power), 0, max_input, 0, Settings->light_color[2]); + */ + + c.R = (uint8_t)fmyRed/dimmer; + c.G = (uint8_t)fmyGrn/dimmer; + c.B = (uint8_t)fmyBlu/dimmer; + } + else { + c.R = 0 ; + c.G = 0 ; + c.B = 0 ; + } + + if (Settings->light_width==2) { + c.R = Settings->light_color[0]/dimmer - c.R; + c.G = Settings->light_color[1]/dimmer - c.G; + c.B = Settings->light_color[2]/dimmer - c.B; + } else if (Settings->ws_width[WS_MINUTE]==3) { + c.R = max(100 - c.R,0); + c.G = max(100 - c.G,0); + c.B = max(100 - c.B,0); + } + + strip->SetPixelColor(i, c); +/* + // Blend old and current color based on time for smooth movement. + c.R = wsmap(Light.strip_timer_counter % speed, 0, speed, oldColor.red, currentColor.red); + c.G = wsmap(Light.strip_timer_counter % speed, 0, speed, oldColor.green, currentColor.green); + c.B = wsmap(Light.strip_timer_counter % speed, 0, speed, oldColor.blue, currentColor.blue); + strip->SetPixelColor(i, c); + oldColor = currentColor; + */ + } + Ws2812StripShow(); +} + void Ws2812GradientColor(uint32_t schemenr, struct WsColor* mColor, uint32_t range, uint32_t gradRange, uint32_t i) { /* @@ -495,6 +587,11 @@ void Ws2812ShowScheme(void) Ws2812.show_next = 0; } break; + case WS2812_SCHEMES-2: // Running strip + case WS2812_SCHEMES-1: // Running strip + Ws2812RunningStrip(scheme); + Ws2812.show_next = 1; + break; default: if (1 == Settings->light_fade) { Ws2812Gradient(scheme -1); From e5d176f6f42b7dcaaa587d69092b12a18e8ffe68 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 19 Nov 2021 11:45:07 +0100 Subject: [PATCH 003/402] init first LED --- tasmota/xdsp_19_max7219_matrix.ino | 275 +++++++++++++++++++++++++++++ 1 file changed, 275 insertions(+) create mode 100644 tasmota/xdsp_19_max7219_matrix.ino diff --git a/tasmota/xdsp_19_max7219_matrix.ino b/tasmota/xdsp_19_max7219_matrix.ino new file mode 100644 index 000000000..97c20f00b --- /dev/null +++ b/tasmota/xdsp_19_max7219_matrix.ino @@ -0,0 +1,275 @@ +/* + xdsp_19_max7219_matrix.ino.ino - Support for MAX7219 based dot matrix displays for Tasmota + + Copyright (C) 2021 Michael Beuss + + 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 USE_DISPLAY +#ifdef USE_DISPLAY_MAX7219_MATRIX +/*********************************************************************************************\ + This driver enables the display of ascii text on MAX7219 based LED dot matrix modules. + + Connect the MAX7219 display module's pins to any free GPIOs of the ESP8266 or ESP32 module + and assign the pins as follows from Tasmota's GUI: + + DIN hardware pin --> "MAX7219 DIN" + CS hardware pin --> "MAX7219 CS" + CLK hardware pin --> "MAX7219 CLK" + + Once the GPIO configuration is saved and the ESP8266/ESP32 module restarts, + set the Display Model to 19 and Display Mode to 0 + using the command "Backlog DisplayModel 15 ; DisplayMode 0" + + If your display is a TM1637 with 6 digits, set Display Width to the number of digits your + display has, using the command "DisplayWidth 6". + + After the ESP8266/ESP32 module restarts again, turn ON the display with the command "Power 1" + + Now, the following "Display" commands can be used: + + + DisplayClear + + Clears the display, command: "DisplayClear" + + + DisplayNumber num [,position {0-(Settings->display_width-1))} [,leading_zeros {0|1} [,length {1 to Settings->display_width}]]] + + Clears and then displays number without decimal. command e.g., "DisplayNumber 1234" + Control 'leading zeros', 'length' and 'position' with "DisplayNumber 1234, , , " + 'leading zeros' can be 1 or 0 (default), 'length' can be 1 to Settings->display_width, 'position' can be 0 (left-most) to Settings->display_width (right-most). + See function description below for more details. + + DisplayNumberNC num [,position {0-(Settings->display_width-1))} [,leading_zeros {0|1} [,length {1 to Settings->display_width}]]] + + Display integer number as above, but without clearing first. e.g., "DisplayNumberNC 1234". Usage is same as above. + + + + DisplayFloat num [,position {0-(Settings->display_width-1)} [,precision {0-Settings->display_width} [,length {1 to Settings->display_width}]]] + + Clears and then displays float (with decimal point) command e.g., "DisplayFloat 12.34" + See function description below for more details. + + + + DisplayFloatNC num [,position {0-(Settings->display_width-1)} [,precision {0-Settings->display_width} [,length {1 to Settings->display_width}]]] + + Displays float (with decimal point) as above, but without clearing first. command e.g., "DisplayFloatNC 12.34" + See function description below for more details. + + + + DisplayRaw position {0-(Settings->display_width-1)},length {1 to Settings->display_width}, num1 [, num2[, num3[, num4[, ...upto Settings->display_width numbers]]]]] + + Takes upto Settings->display_width comma-separated integers (0-255) and displays raw segments. Each number represents a + 7-segment digit. Each 8-bit number represents individual segments of a digit. + For example, the command "DisplayRaw 0, 4, 255, 255, 255, 255" would display "[8.8.8.8.]" + + + + DisplayText text [, position {0-(Settings->display_width-1)} [,length {1 to Settings->display_width}]] + + Clears and then displays basic text. command e.g., "DisplayText ajith vasudevan" + Control 'length' and 'position' with "DisplayText , , " + 'length' can be 1 to Settings->display_width, 'position' can be 0 (left-most) to Settings->display_width-1 (right-most) + A caret(^) symbol in the text input is dispayed as the degrees(°) symbol. This is useful for displaying Temperature! + For example, the command "DisplayText 22.5^" will display "22.5°". + + + DisplayTextNC text [, position {0-Settings->display_width-1} [,length {1 to Settings->display_width}]] + + Clears first, then displays text. Usage is same as above. + + + + DisplayScrollText text [, num_loops] + + Displays scrolling text indefinitely, until another Display- command (other than DisplayScrollText + or DisplayScrollDelay is issued). Optionally, stop scrolling after num_loops iterations. + + + + DisplayScrollDelay delay {0-15} // default = 4 + + Sets the speed of text scroll. Smaller delay = faster scrolling. + + + + DisplayLevel num {0-100} + + Display a horizontal bar graph (0-100) command e.g., "DisplayLevel 50" will display [|||| ] + + + + DisplayClock 1|2|0 + + Displays a clock. + Commands "DisplayClock 1" // 12 hr format + "DisplayClock 2" // 24 hr format + "DisplayClock 0" // turn off clock + + +In addition, setting DisplayMode to 1 shows the time, setting it to 2 shows the date +and setting it to 3 alternates between time and date. + + + +\*********************************************************************************************/ + +#define XDSP_19 19 +#define CMD_MAX_LEN 55 + + +#include + +LedControl *max7219_Matrix; +bool max2791Matrix_init_done = false; +byte modulesPerRow = 4; + + +bool MAX7291Matrix_init(void) +{ + if (!PinUsed(GPIO_MAX7219DIN) || !PinUsed(GPIO_MAX7219CLK) || !PinUsed(GPIO_MAX7219CS)) + { + AddLog(LOG_LEVEL_INFO, PSTR("DSP: MAX7291Matrix_init GPIO pins missing DIN, CLK or CS")); + return false; // ensure necessariy pins are configurated + } + + Settings->display_model = XDSP_19; + Settings->display_cols[0] = Settings->display_width; + Settings->display_height = 1; + Settings->display_rows = Settings->display_height; + max7219_Matrix = new LedControl(Pin(GPIO_MAX7219DIN), Pin(GPIO_MAX7219CLK), Pin(GPIO_MAX7219CS), modulesPerRow); + MAX7291Matrix_On(true); + MAX7291Matrix_Clear(); + MAX7291Matrix_Dim(); + AddLog(LOG_LEVEL_INFO, PSTR("DSP: MAX7291Matrix_init")); + max2791Matrix_init_done = true; + + max7219_Matrix->setLed(0, 3, 3, true); + AddLog(LOG_LEVEL_INFO, PSTR("DSP: setLed 3,3")); + return true; +} + +bool MAX7291Matrix_On( bool on ) +{ + for (int addr = 0; addr < modulesPerRow; addr++) + { + max7219_Matrix->shutdown (addr, !on); // false: on, true: off + } + AddLog(LOG_LEVEL_INFO, PSTR("MTX: On %d"), on); + return true; + +} + +bool MAX7291Matrix_Dim(void) +{ + int dim = GetDisplayDimmer16(); + for (int addr = 0; addr < modulesPerRow; addr++) + { + max7219_Matrix->setIntensity(addr, dim); // 1..15 + } + AddLog(LOG_LEVEL_INFO, PSTR("DSP: Dim %d"), dim); + return true; +} + +// /*********************************************************************************************\ +// * Clears the display +// * Command: DisplayClear +// \*********************************************************************************************/ +bool MAX7291Matrix_Clear(void) +{ + for(int addr=0; addrclearDisplay(addr); + } + AddLog(LOG_LEVEL_INFO, PSTR("DSP: Clear")); + return true; +} + +// /*********************************************************************************************\ +// * Clears the display +// * Command: DisplayText +// \*********************************************************************************************/ +bool MAX7291Matrix_Text() +{ + char sString[CMD_MAX_LEN + 1]; + subStr(sString, XdrvMailbox.data, ",", 1); + MAX7291Matrix_Clear; + AddLog(LOG_LEVEL_DEBUG, PSTR("MTX: sString %s"), sString); + + // test + uint8_t length = strlen(sString); + //if(length > modulesPerRow) + length = modulesPerRow; + + for(int addr = 0; addrsetLed(addr, 0, 1, true); + AddLog(LOG_LEVEL_DEBUG, PSTR("MTX: setLed() %d, 0, 1)"), addr); + } + + return true; +} + +bool Xdsp19(uint8_t function) +{ + bool result = false; + + + if (FUNC_DISPLAY_INIT_DRIVER == function) + { + result = MAX7291Matrix_init(); + } + else{ + //if (max2791Matrix_init_done && (XDSP_19 == Settings->display_model)) { + switch (function) { + case FUNC_DISPLAY_MODEL: + result = true; + break; + case FUNC_DISPLAY_CLEAR: + result = MAX7291Matrix_Clear(); + break; + case FUNC_DISPLAY_DIM: + result = MAX7291Matrix_Dim(); + break; + case FUNC_DISPLAY_SEVENSEG_TEXT: + case FUNC_DISPLAY_SEVENSEG_TEXTNC: + case FUNC_DISPLAY_NUMBER: + case FUNC_DISPLAY_NUMBERNC: + case FUNC_DISPLAY_FLOAT: + case FUNC_DISPLAY_FLOATNC: + case FUNC_DISPLAY_RAW: + case FUNC_DISPLAY_LEVEL: + case FUNC_DISPLAY_SCROLLTEXT: + case FUNC_DISPLAY_CLOCK: + case FUNC_DISPLAY_DRAW_STRING: + result = MAX7291Matrix_Text(); + break; + case FUNC_DISPLAY_EVERY_50_MSECOND: + case FUNC_DISPLAY_EVERY_SECOND: + // ignore + return false; + default: + result = false; + } + } + return result; +} + + + +#endif // USE_DISPLAY_MAX7219_MATRIX +#endif // USE_DISPLAY From b3dd33f2488184076eceadaffabaca24f8fd8dd5 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 19 Nov 2021 11:47:00 +0100 Subject: [PATCH 004/402] first init --- tasmota/tasmota_template.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h index 0de887e9c..e3f3256fc 100644 --- a/tasmota/tasmota_template.h +++ b/tasmota/tasmota_template.h @@ -520,6 +520,15 @@ const uint16_t kGpioNiceList[] PROGMEM = { AGPIO(GPIO_SSD1331_CS), AGPIO(GPIO_SSD1331_DC), #endif // USE_DISPLAY_SSD1331 + +#ifdef USE_DISPLAY_MAX7219_MATRIX + #undef USE_DISPLAY_MAX7219 + #undef USE_DISPLAY_TM1637 + AGPIO(GPIO_MAX7219CLK), + AGPIO(GPIO_MAX7219DIN), + AGPIO(GPIO_MAX7219CS), +#endif // USE_DISPLAY_MAX7219_MATRIX + #ifdef USE_DISPLAY_TM1637 AGPIO(GPIO_TM1637CLK), AGPIO(GPIO_TM1637DIO), From 532e5069468f6aff76cf9d8dd2140bdb60b6fab8 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 20 Nov 2021 17:28:38 +0100 Subject: [PATCH 005/402] use LedMatrix 1234 --- lib/lib_display/LedControl/src/LedMatrix.cpp | 186 +++++++++++++++++++ lib/lib_display/LedControl/src/LedMatrix.h | 124 +++++++++++++ tasmota/xdsp_19_max7219_matrix.ino | 152 +++++++-------- 3 files changed, 373 insertions(+), 89 deletions(-) create mode 100644 lib/lib_display/LedControl/src/LedMatrix.cpp create mode 100644 lib/lib_display/LedControl/src/LedMatrix.h diff --git a/lib/lib_display/LedControl/src/LedMatrix.cpp b/lib/lib_display/LedControl/src/LedMatrix.cpp new file mode 100644 index 000000000..427ae8c52 --- /dev/null +++ b/lib/lib_display/LedControl/src/LedMatrix.cpp @@ -0,0 +1,186 @@ +/* + * LedMatrix.h - Extends the Library LedControl for multiple LED dot matrix modules, based on MAX7219/MAX7221 + * Copyright (c) 2021 Michael Beuss + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * This permission notice shall be included in all copies or + * substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +#include "LedMatrix.h" + +// public +LedMatrix::LedMatrix(int dataPin, int clkPin, int csPin, unsigned int colums, unsigned int rows) +{ + if (colums * rows > MATRIX_MAX_MODULES) + { + // dimension exeeds maximum buffer size + if (colums >= MATRIX_MAX_MODULES) + { + colums = MATRIX_MAX_MODULES; + rows = 1; + } + else + { + rows = MATRIX_MAX_MODULES / colums; + } + } + + modulesPerRow = colums; + modulesPerCol = rows; + width = colums * 8; + height = rows * 8; + modules = colums * rows; + moduleOrientation = ORIENTATION_UPSIDE_DOWN; + ledControl = new LedControl(dataPin, clkPin, csPin, modules); + shutdown(false); // false: on, true: off + clear(); + setIntensity(7); +} + +bool LedMatrix::clear(void) +{ + for (int i = 0; i < MATRIX_BUFFER_SIZE; i++) + { + buffer[i] = 0; + } + for (int addr = 0; addr < modules; addr++) + { + ledControl->clearDisplay(addr); + } + return true; +} + +bool LedMatrix::setIntensity(byte dim) +{ + for (int addr = 0; addr < modules; addr++) + { + ledControl->setIntensity(addr, dim); // 1..15 + } + return true; +} + +bool LedMatrix::setOrientation(ModuleOrientation orientation) +{ + moduleOrientation = orientation; + return true; +} + +bool LedMatrix::setPixel(int x, int y, bool on) +{ + if (x >= width || y >= height) + return false; + + int modul_col = x / 8; // x pos divided by 8 is the index of the modul to the right + int buffer_pos = modul_col + y * width / 8; + byte buffer_byte = 8 >> (x % 8); + if (on) + { + buffer[buffer_pos] |= buffer_byte; // set bit + } + else + { + buffer[buffer_pos] &= ~buffer_byte; // reset bit + } + refreshByteOfBuffer(buffer_pos); + return true; +} + +void LedMatrix::test() +{ + const static byte testMatrix[] PROGMEM = { + B00000010, B00111100, B00111100, B00001000, + B00000110, B01000010, B01000010, B00010000, + B00001010, B00000010, B00000010, B00100000, + B00000010, B00000100, B00001100, B01000100, + B00000010, B00011000, B00000010, B01111110, + B00000010, B00100000, B01000010, B00000100, + B00000000, B11111110, B00111100, B00000100, + B00000000, B00000000, B00000000, B00000000, + }; + for (int i = 0; i < 32; i++) + { + buffer[i] = testMatrix[i]; + } + refresh(); +} + +// private +bool LedMatrix::shutdown(bool b) +{ + for (int addr = 0; addr < modules; addr++) + { + ledControl->shutdown(addr, b); // b: false: on, true: off + } + return true; +} + +void LedMatrix::refresh() +{ + for (int i = 0; i < modulesPerRow * height; i++) + { + refreshByteOfBuffer(i); + } +} + +void LedMatrix::refreshByteOfBuffer(int i) +{ + int line = i / modulesPerRow; + int addr = line / 8 + i % modulesPerRow; + byte b = buffer[i]; + if (moduleOrientation == ORIENTATION_NORMAL || moduleOrientation == ORIENTATION_UPSIDE_DOWN) + { + int rowOfAddr = 0; + if (moduleOrientation == ORIENTATION_NORMAL) + { + rowOfAddr = line % 8; // ORIENTATION_NORMAL + } + else + { + rowOfAddr = 7 - line % 8; // ORIENTATION_UPSIDE_DOWN + b = revereBitorder(b); + } + ledControl->setRow(addr, rowOfAddr, b); + } + else + { + // ORIENTATION_TURN_RIGHT or ORIENTATION_TURN_LEFT + int colOfAddr = 0; + if (moduleOrientation == ORIENTATION_TURN_LEFT) + { + colOfAddr = line % 8; // ORIENTATION_TURN_LEFT + } + else + { + colOfAddr = 7 - line % 8; // ORIENTATION_TURN_RIGHT + b = revereBitorder(b); + } + ledControl->setColumn(addr, colOfAddr, b); + } +} + +byte LedMatrix::revereBitorder (byte b) +{ + const static byte lookup[] PROGMEM = { + 0x0, 0x8, 0x4, 0xc, 0x2, 0xa, 0x6, 0xe, + 0x1, 0x9, 0x5, 0xd, 0x3, 0xb, 0x7, 0xf, + }; + return (lookup[b & 0b1111] << 4) | lookup[b >> 4]; +} diff --git a/lib/lib_display/LedControl/src/LedMatrix.h b/lib/lib_display/LedControl/src/LedMatrix.h new file mode 100644 index 000000000..f439e5d05 --- /dev/null +++ b/lib/lib_display/LedControl/src/LedMatrix.h @@ -0,0 +1,124 @@ +/* + * LedMatrix.h - Extends the Library LedControl for multiple LED dot matrix modules, based on MAX7219/MAX7221 + * Copyright (c) 2021 Michael Beuss + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * This permission notice shall be included in all copies or + * substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifndef LedMatrix_h +#define LedMatrix_h + +#include + +#define MATRIX_MAX_MODULES 32 +#define MATRIX_BUFFER_SIZE MATRIX_MAX_MODULES * 8 // 8 bytes per modul. One byte represents 8 LEDs. + + +/** + * @brief LedMatric controls multiple 8x8 LED dot matrx modules. + * All modules in rows and clolums together build a common matrix. + * + */ +class LedMatrix +{ + public: + enum ModuleOrientation // orientation of 8x8 LED dot matrix mdules (first module is top left) + { + ORIENTATION_NORMAL, // first pixel is on top left, no turn is necessary + ORIENTATION_TURN_RIGHT, // first pixel is on bottom left, for correction it has to turn 90° right + ORIENTATION_UPSIDE_DOWN, // first pixel is on bottom right, fpr correction it has to turn 180° + ORIENTATION_TURN_LEFT, // first pixel is on top right, for correction is has to turn 90° left. + }; + + private: + unsigned int modulesPerRow; + unsigned int modulesPerCol; + unsigned int width; // matrix width [pixel] + unsigned int height; // matrix height [pixel] + unsigned int modules; // number of 8x8 mudules + ModuleOrientation moduleOrientation; + byte buffer[MATRIX_BUFFER_SIZE]; + LedControl* ledControl; + + + public: + /** + * @brief Construct a new Led Matrix object + * + * @param colums of 8x8 LED dot matrix modules + * @param rows of 8x8 LED dot matrix modules + */ + LedMatrix(int dataPin, int clkPin, int csPin, unsigned int colums, unsigned int rows); + + /** + * @brief Set all LEDs off. + * + */ + bool clear(void); + + /** + * @brief Set the brightness of the display + * + * @param dim 0..15 + */ + bool setIntensity(byte dim); + + /** + * @brief Switches the display on or off + * + * @param on true: on false: off + */ + void power( bool on ); + + /** + * @brief Set the orientation of the 8x8 LED dot matrix module + * + * @param orientation + */ + bool setOrientation(ModuleOrientation orientation); + + /** + * @brief Set the Pixel object + * + * @param x horizontal position from left + * @param y vertical position from top + * @param on true: on, false: off + */ + bool setPixel( int x, int y, bool on); + void test(); + + private: + bool shutdown(bool b); + + /** + * @brief sends the changed content of the buffer to the display + * + */ + void refresh(); + + void refreshByteOfBuffer( int i); + + byte revereBitorder (byte b); + +}; + +#endif //LedMatrix_h \ No newline at end of file diff --git a/tasmota/xdsp_19_max7219_matrix.ino b/tasmota/xdsp_19_max7219_matrix.ino index 97c20f00b..da3177f59 100644 --- a/tasmota/xdsp_19_max7219_matrix.ino +++ b/tasmota/xdsp_19_max7219_matrix.ino @@ -133,70 +133,45 @@ and setting it to 3 alternates between time and date. #define XDSP_19 19 #define CMD_MAX_LEN 55 +#include -#include - -LedControl *max7219_Matrix; +LedMatrix *max7219_Matrix; bool max2791Matrix_init_done = false; byte modulesPerRow = 4; - +byte modulesPerCol = 1; bool MAX7291Matrix_init(void) { if (!PinUsed(GPIO_MAX7219DIN) || !PinUsed(GPIO_MAX7219CLK) || !PinUsed(GPIO_MAX7219CS)) { - AddLog(LOG_LEVEL_INFO, PSTR("DSP: MAX7291Matrix_init GPIO pins missing DIN, CLK or CS")); + AddLog(LOG_LEVEL_INFO, PSTR("DSP: MAX7291Matrix_init GPIO pins missing DIN:%d, CLK:%d, CS:%d"), Pin(GPIO_MAX7219DIN), Pin(GPIO_MAX7219CLK), Pin(GPIO_MAX7219CS) ); return false; // ensure necessariy pins are configurated } Settings->display_model = XDSP_19; + if (Settings->display_width) // [pixel] + { + modulesPerRow = (Settings->display_width - 1) / 8 + 1; + } + Settings->display_width = 8 * modulesPerRow; Settings->display_cols[0] = Settings->display_width; - Settings->display_height = 1; + if (Settings->display_height) // [pixel] + { + modulesPerCol = (Settings->display_height - 1) / 8 + 1; + } + Settings->display_height = 8 * modulesPerCol; Settings->display_rows = Settings->display_height; - max7219_Matrix = new LedControl(Pin(GPIO_MAX7219DIN), Pin(GPIO_MAX7219CLK), Pin(GPIO_MAX7219CS), modulesPerRow); - MAX7291Matrix_On(true); - MAX7291Matrix_Clear(); - MAX7291Matrix_Dim(); - AddLog(LOG_LEVEL_INFO, PSTR("DSP: MAX7291Matrix_init")); + Settings->display_cols[1] = Settings->display_height; + max7219_Matrix = new LedMatrix(Pin(GPIO_MAX7219DIN), Pin(GPIO_MAX7219CLK), Pin(GPIO_MAX7219CS), modulesPerRow, modulesPerCol); + int intensity = GetDisplayDimmer16(); // 0..15 + max7219_Matrix->setIntensity(intensity); + int orientation = Settings->display_rotate; + max7219_Matrix->setOrientation((LedMatrix::ModuleOrientation)orientation ); + AddLog(LOG_LEVEL_INFO, PSTR("DSP: MAX7291Matrix_init %dx%d modules, orientation: %d, intensity: %d"), modulesPerRow , modulesPerCol, orientation, intensity); max2791Matrix_init_done = true; - max7219_Matrix->setLed(0, 3, 3, true); - AddLog(LOG_LEVEL_INFO, PSTR("DSP: setLed 3,3")); - return true; -} - -bool MAX7291Matrix_On( bool on ) -{ - for (int addr = 0; addr < modulesPerRow; addr++) - { - max7219_Matrix->shutdown (addr, !on); // false: on, true: off - } - AddLog(LOG_LEVEL_INFO, PSTR("MTX: On %d"), on); - return true; - -} - -bool MAX7291Matrix_Dim(void) -{ - int dim = GetDisplayDimmer16(); - for (int addr = 0; addr < modulesPerRow; addr++) - { - max7219_Matrix->setIntensity(addr, dim); // 1..15 - } - AddLog(LOG_LEVEL_INFO, PSTR("DSP: Dim %d"), dim); - return true; -} - -// /*********************************************************************************************\ -// * Clears the display -// * Command: DisplayClear -// \*********************************************************************************************/ -bool MAX7291Matrix_Clear(void) -{ - for(int addr=0; addrclearDisplay(addr); - } - AddLog(LOG_LEVEL_INFO, PSTR("DSP: Clear")); + max7219_Matrix->test(); + AddLog(LOG_LEVEL_INFO, PSTR("DSP: display test")); return true; } @@ -208,17 +183,18 @@ bool MAX7291Matrix_Text() { char sString[CMD_MAX_LEN + 1]; subStr(sString, XdrvMailbox.data, ",", 1); - MAX7291Matrix_Clear; + max7219_Matrix->clear(); AddLog(LOG_LEVEL_DEBUG, PSTR("MTX: sString %s"), sString); // test uint8_t length = strlen(sString); - //if(length > modulesPerRow) - length = modulesPerRow; + //if(length > modulesPerRow) + length = modulesPerRow; - for(int addr = 0; addrsetLed(addr, 0, 1, true); - AddLog(LOG_LEVEL_DEBUG, PSTR("MTX: setLed() %d, 0, 1)"), addr); + for (int addr = 0; addr < length; addr++) + { + max7219_Matrix->setPixel(addr, addr, true); + AddLog(LOG_LEVEL_DEBUG, PSTR("MTX: setPixel() %d, %d)"), addr, addr); } return true; @@ -226,50 +202,48 @@ bool MAX7291Matrix_Text() bool Xdsp19(uint8_t function) { - bool result = false; - + bool result = false; if (FUNC_DISPLAY_INIT_DRIVER == function) { result = MAX7291Matrix_init(); } - else{ - //if (max2791Matrix_init_done && (XDSP_19 == Settings->display_model)) { - switch (function) { - case FUNC_DISPLAY_MODEL: - result = true; - break; - case FUNC_DISPLAY_CLEAR: - result = MAX7291Matrix_Clear(); - break; - case FUNC_DISPLAY_DIM: - result = MAX7291Matrix_Dim(); - break; - case FUNC_DISPLAY_SEVENSEG_TEXT: - case FUNC_DISPLAY_SEVENSEG_TEXTNC: - case FUNC_DISPLAY_NUMBER: - case FUNC_DISPLAY_NUMBERNC: - case FUNC_DISPLAY_FLOAT: - case FUNC_DISPLAY_FLOATNC: - case FUNC_DISPLAY_RAW: - case FUNC_DISPLAY_LEVEL: - case FUNC_DISPLAY_SCROLLTEXT: - case FUNC_DISPLAY_CLOCK: - case FUNC_DISPLAY_DRAW_STRING: - result = MAX7291Matrix_Text(); - break; - case FUNC_DISPLAY_EVERY_50_MSECOND: - case FUNC_DISPLAY_EVERY_SECOND: - // ignore - return false; - default: - result = false; + else if (max7219_Matrix && (XDSP_19 == Settings->display_model)) + { + switch (function) + { + case FUNC_DISPLAY_MODEL: + result = true; + break; + case FUNC_DISPLAY_CLEAR: + result = max7219_Matrix->clear(); + break; + case FUNC_DISPLAY_DIM: + result = max7219_Matrix->setIntensity(GetDisplayDimmer16()); + break; + case FUNC_DISPLAY_SEVENSEG_TEXT: + case FUNC_DISPLAY_SEVENSEG_TEXTNC: + case FUNC_DISPLAY_NUMBER: + case FUNC_DISPLAY_NUMBERNC: + case FUNC_DISPLAY_FLOAT: + case FUNC_DISPLAY_FLOATNC: + case FUNC_DISPLAY_RAW: + case FUNC_DISPLAY_LEVEL: + case FUNC_DISPLAY_SCROLLTEXT: + case FUNC_DISPLAY_CLOCK: + case FUNC_DISPLAY_DRAW_STRING: + result = MAX7291Matrix_Text(); + break; + case FUNC_DISPLAY_EVERY_50_MSECOND: + case FUNC_DISPLAY_EVERY_SECOND: + // ignore + return false; + default: + result = false; } } return result; } - - #endif // USE_DISPLAY_MAX7219_MATRIX #endif // USE_DISPLAY From 917777d2c50deda43c19c1671c38527b882820bc Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 23 Nov 2021 14:46:19 +0100 Subject: [PATCH 006/402] first scroll --- lib/lib_display/LedControl/src/LedMatrix.cpp | 144 +++++++++- lib/lib_display/LedControl/src/LedMatrix.h | 55 +++- .../LedControl/src/font_5x8_horizontal_MSB.h | 264 ++++++++++++++++++ .../LedControl/src/font_6x8_horizontal_MSB.h | 264 ++++++++++++++++++ tasmota/xdsp_19_max7219_matrix.ino | 36 +-- 5 files changed, 716 insertions(+), 47 deletions(-) create mode 100644 lib/lib_display/LedControl/src/font_5x8_horizontal_MSB.h create mode 100644 lib/lib_display/LedControl/src/font_6x8_horizontal_MSB.h diff --git a/lib/lib_display/LedControl/src/LedMatrix.cpp b/lib/lib_display/LedControl/src/LedMatrix.cpp index 427ae8c52..19ac0dcb2 100644 --- a/lib/lib_display/LedControl/src/LedMatrix.cpp +++ b/lib/lib_display/LedControl/src/LedMatrix.cpp @@ -25,6 +25,7 @@ */ #include "LedMatrix.h" +#include "font_6x8_horizontal_MSB.h" // public LedMatrix::LedMatrix(int dataPin, int clkPin, int csPin, unsigned int colums, unsigned int rows) @@ -45,22 +46,116 @@ LedMatrix::LedMatrix(int dataPin, int clkPin, int csPin, unsigned int colums, un modulesPerRow = colums; modulesPerCol = rows; - width = colums * 8; - height = rows * 8; + displayWidth = colums * 8; + displayHeight = rows * 8; modules = colums * rows; moduleOrientation = ORIENTATION_UPSIDE_DOWN; ledControl = new LedControl(dataPin, clkPin, csPin, modules); + textBuf[0] = 0; + textWidth = 0; + textPosX = 0; + textPosY = 0; + appendTextBuf[0] = 0; + setScrollAppendText(" "); shutdown(false); // false: on, true: off clear(); setIntensity(7); } +bool LedMatrix::drawText( const char *str) +{ + strncpy(textBuf, str, TEXT_BUFFER_SIZE -1); + textPosX = 0; + textPosY = 0; + textWidth = strlen(textBuf) * charWidth; + if(textWidth < displayWidth) + { + textPosX = (displayWidth - textWidth) / 2; // center + } + else + { + // The text ist longer than the display width. Scrolling is needed. + // Append a space between end of text and the beginning of the repeting text. + appendSpace(); + } + clear(); + drawTextAt(textBuf, textPosX, textPosY); + refresh(); // refresh display with new string content + return true; +} + +bool LedMatrix::drawTextAt( const char *str, const int x, const int y ) +{ + // draw character by character + unsigned int len = strlen(str); + int xPos = x; + for (unsigned int i = 0; i < len; i++) + { + drawCharAt(str[i], xPos, y); + xPos += charWidth; + } + return true; +} + +bool LedMatrix::scrollText() +{ + if(textWidth < displayWidth) return false; // do not scroll when text fits into the display + + textPosX--; + if(textPosX + textWidth < 0) + { + textPosX = 0; // start from the beginning after text scrolled out of display; + } + drawTextAt(textBuf, textPosX, textPosY); + + int startOfRepeatingTextPos = textPosX + textWidth; + if(startOfRepeatingTextPos < displayWidth) + { + // Draw repeating text. + drawTextAt(textBuf, startOfRepeatingTextPos, textPosY); + } + refresh(); + return true; +} + +bool LedMatrix::drawCharAt( char c, const int x, const int y) +{ + // ignore when the character position is not visible on the display + bool visible = ( + x > 0 - (int)charWidth && x < (int)displayWidth && + y > 0 - (int)charHeight && y < (int)displayHeight + ); + if (!visible) return false; + + // ignore the leading bits above charWidth of the font definition + static const byte charOffset = 8 - charWidth; + + for (byte charY = 0; charY < charHeight; charY++) + { + char pixelRow = (font[c][charY]) << charOffset; // skip the first bits when the character width is smaller than 8 pixel + for (byte charX = 0; charX < charWidth; charX++) + { + bool pixel = (pixelRow & 0x80); // pixel=true when upper bit is set + setPixel(x + charX, y + charY, pixel); + pixelRow = pixelRow << 1; // next pixel + } + } + return true; +} + +bool LedMatrix::clearDisplay(void) +{ + textBuf[0] = 0; + memset(textBuf, 0, TEXT_BUFFER_SIZE); + textWidth = 0; + clear(); + return true; +} + + bool LedMatrix::clear(void) { - for (int i = 0; i < MATRIX_BUFFER_SIZE; i++) - { - buffer[i] = 0; - } + memset(buffer, 0, MATRIX_BUFFER_SIZE); for (int addr = 0; addr < modules; addr++) { ledControl->clearDisplay(addr); @@ -83,14 +178,20 @@ bool LedMatrix::setOrientation(ModuleOrientation orientation) return true; } -bool LedMatrix::setPixel(int x, int y, bool on) +bool LedMatrix::setScrollAppendText(const char* append ) { - if (x >= width || y >= height) + strncpy(appendTextBuf, append, TEXT_APPEND_BUFFER_SIZE -1); + return (strlen(append) < TEXT_APPEND_BUFFER_SIZE); +} + +bool LedMatrix::setPixel(const int x, const int y, bool on) +{ + if (x >= displayWidth || y >= displayHeight) return false; int modul_col = x / 8; // x pos divided by 8 is the index of the modul to the right - int buffer_pos = modul_col + y * width / 8; - byte buffer_byte = 8 >> (x % 8); + int buffer_pos = modul_col + y * modulesPerRow; + byte buffer_byte = 0x80 >> (x % 8); if (on) { buffer[buffer_pos] |= buffer_byte; // set bit @@ -99,12 +200,12 @@ bool LedMatrix::setPixel(int x, int y, bool on) { buffer[buffer_pos] &= ~buffer_byte; // reset bit } - refreshByteOfBuffer(buffer_pos); return true; } void LedMatrix::test() { + /* const static byte testMatrix[] PROGMEM = { B00000010, B00111100, B00111100, B00001000, B00000110, B01000010, B01000010, B00010000, @@ -112,7 +213,7 @@ void LedMatrix::test() B00000010, B00000100, B00001100, B01000100, B00000010, B00011000, B00000010, B01111110, B00000010, B00100000, B01000010, B00000100, - B00000000, B11111110, B00111100, B00000100, + B00000000, B01111110, B00111100, B00000100, B00000000, B00000000, B00000000, B00000000, }; for (int i = 0; i < 32; i++) @@ -120,6 +221,17 @@ void LedMatrix::test() buffer[i] = testMatrix[i]; } refresh(); + */ + drawText("1234567890"); + delay(1000); + for( int i=0; i<320; i++) + { + delay(50); + scrollText(); + } + //drawCharAt(0x31, 1, 0); + //setPixel(1,30); + //refresh(); } // private @@ -134,7 +246,7 @@ bool LedMatrix::shutdown(bool b) void LedMatrix::refresh() { - for (int i = 0; i < modulesPerRow * height; i++) + for (int i = 0; i < modulesPerRow * displayHeight; i++) { refreshByteOfBuffer(i); } @@ -184,3 +296,9 @@ byte LedMatrix::revereBitorder (byte b) }; return (lookup[b & 0b1111] << 4) | lookup[b >> 4]; } + +void LedMatrix::appendSpace() +{ + strncat(textBuf, appendTextBuf, TEXT_BUFFER_SIZE -1); + textWidth = strlen(textBuf) * charWidth; +} diff --git a/lib/lib_display/LedControl/src/LedMatrix.h b/lib/lib_display/LedControl/src/LedMatrix.h index f439e5d05..586a06146 100644 --- a/lib/lib_display/LedControl/src/LedMatrix.h +++ b/lib/lib_display/LedControl/src/LedMatrix.h @@ -31,6 +31,8 @@ #define MATRIX_MAX_MODULES 32 #define MATRIX_BUFFER_SIZE MATRIX_MAX_MODULES * 8 // 8 bytes per modul. One byte represents 8 LEDs. +#define TEXT_BUFFER_SIZE 256 +#define TEXT_APPEND_BUFFER_SIZE 16 /** @@ -52,12 +54,19 @@ class LedMatrix private: unsigned int modulesPerRow; unsigned int modulesPerCol; - unsigned int width; // matrix width [pixel] - unsigned int height; // matrix height [pixel] + unsigned int displayWidth; // matrix width [pixel] + unsigned int displayHeight; // matrix height [pixel] unsigned int modules; // number of 8x8 mudules ModuleOrientation moduleOrientation; byte buffer[MATRIX_BUFFER_SIZE]; LedControl* ledControl; + const unsigned int charWidth = 6; + const unsigned int charHeight = 8; + char textBuf[TEXT_BUFFER_SIZE]; + char appendTextBuf[TEXT_APPEND_BUFFER_SIZE]; + unsigned int textWidth; // width of text [pixel] + int textPosX; // horizontal pixel position of scrolling text + int textPosY; // vertical pixelposition of scrolling text; public: @@ -73,7 +82,7 @@ class LedMatrix * @brief Set all LEDs off. * */ - bool clear(void); + bool clearDisplay(void); /** * @brief Set the brightness of the display @@ -82,6 +91,13 @@ class LedMatrix */ bool setIntensity(byte dim); + /** + * @brief Set the a pending string to the scrolling text to set a distance to te repeating text. Usually some spaces. + * + * @param append text to append to the scrolling text before repeating. + */ + bool setScrollAppendText(const char* append ); + /** * @brief Switches the display on or off * @@ -96,6 +112,32 @@ class LedMatrix */ bool setOrientation(ModuleOrientation orientation); + /** + * @brief draw a string to the display. + * When the text fits into the size of the display, it will be shown in the center. + * When the text is longer than than the display width, it can be scrolled per pixel with function scrollText(). + * + * @param str string to display + */ + bool drawText( const char *str ); + + /** + * @brief dwaws a character string to the display. The position (x,y) is used for the upper left pixtel of the text. + * Existing text before the x position will not be cleared. + * + * @param str string to display + * @param x horizantal pixel position to start with string (default 0) + * @param y vertical pixel position for the top position of the string (default 0) + */ + bool drawTextAt( const char *str, const int x, const int y ); + + /** + * @brief Scroll the current teext one picel to the left. + * Repeat with from start when end of text reached. + * + */ + bool scrollText(); + /** * @brief Set the Pixel object * @@ -103,11 +145,14 @@ class LedMatrix * @param y vertical position from top * @param on true: on, false: off */ - bool setPixel( int x, int y, bool on); + bool setPixel( const int x, const int y, bool on=true); void test(); private: + bool drawCharAt( char c, int x, int y ); + bool shutdown(bool b); + bool clear(void); /** * @brief sends the changed content of the buffer to the display @@ -119,6 +164,8 @@ class LedMatrix byte revereBitorder (byte b); + void appendSpace(); + }; #endif //LedMatrix_h \ No newline at end of file diff --git a/lib/lib_display/LedControl/src/font_5x8_horizontal_MSB.h b/lib/lib_display/LedControl/src/font_5x8_horizontal_MSB.h new file mode 100644 index 000000000..56df774a4 --- /dev/null +++ b/lib/lib_display/LedControl/src/font_5x8_horizontal_MSB.h @@ -0,0 +1,264 @@ +// 5x8 ascii font +#ifndef font_5x8_horizontal_MSB_h +#define font_5x8_horizontal_MSB_h + +const char font[256][8]={ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x00 +{0x0E,0x11,0x1B,0x11,0x1F,0x0E,0x00,0x00}, // 0x01 +{0x0E,0x15,0x1F,0x11,0x1F,0x0E,0x00,0x00}, // 0x02 +{0x0A,0x1F,0x1F,0x1F,0x0E,0x04,0x00,0x00}, // 0x03 +{0x04,0x04,0x0E,0x1F,0x0E,0x04,0x04,0x00}, // 0x04 +{0x04,0x0E,0x04,0x1F,0x15,0x04,0x0E,0x00}, // 0x05 +{0x04,0x0E,0x1F,0x1F,0x15,0x04,0x0E,0x00}, // 0x06 +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x07 +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x08 +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x09 +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x0A +{0x03,0x03,0x0E,0x11,0x11,0x11,0x0E,0x00}, // 0x0B +{0x0E,0x11,0x11,0x11,0x0E,0x04,0x0E,0x04}, // 0x0C +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x0D +{0x03,0x0F,0x09,0x09,0x0B,0x1B,0x18,0x00}, // 0x0E +{0x00,0x15,0x0E,0x1B,0x0E,0x15,0x00,0x00}, // 0x0F +{0x00,0x10,0x1C,0x1F,0x1C,0x10,0x00,0x00}, // 0x10 +{0x00,0x01,0x07,0x1F,0x07,0x01,0x00,0x00}, // 0x11 +{0x04,0x0E,0x04,0x04,0x04,0x0E,0x04,0x00}, // 0x12 +{0x00,0x0A,0x0A,0x0A,0x00,0x0A,0x00,0x00}, // 0x13 +{0x0E,0x1A,0x1A,0x0A,0x0A,0x0A,0x0A,0x00}, // 0x14 +{0x06,0x08,0x04,0x0A,0x04,0x02,0x0C,0x00}, // 0x15 +{0x00,0x00,0x00,0x0F,0x0F,0x00,0x00,0x00}, // 0x16 +{0x04,0x0E,0x04,0x0E,0x04,0x00,0x0E,0x00}, // 0x17 +{0x04,0x0E,0x04,0x04,0x04,0x04,0x04,0x00}, // 0x18 +{0x04,0x04,0x04,0x04,0x04,0x0E,0x04,0x00}, // 0x19 +{0x00,0x00,0x02,0x0F,0x02,0x00,0x00,0x00}, // 0x1A +{0x00,0x00,0x04,0x0F,0x04,0x00,0x00,0x00}, // 0x1B +{0x00,0x00,0x08,0x08,0x08,0x0F,0x00,0x00}, // 0x1C +{0x00,0x00,0x0A,0x1F,0x0A,0x00,0x00,0x00}, // 0x1D +{0x00,0x04,0x04,0x0E,0x0E,0x1F,0x00,0x00}, // 0x1E +{0x00,0x1F,0x0E,0x0E,0x04,0x04,0x00,0x00}, // 0x1F +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x20 +{0x04,0x04,0x04,0x04,0x00,0x04,0x00,0x00}, // 0x21 +{0x0A,0x0A,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x22 +{0x00,0x05,0x1F,0x0A,0x1F,0x14,0x00,0x00}, // 0x23 +{0x04,0x0E,0x0C,0x04,0x06,0x0E,0x04,0x00}, // 0x24 +{0x09,0x15,0x0E,0x0E,0x15,0x12,0x00,0x00}, // 0x25 +{0x04,0x0A,0x0C,0x15,0x12,0x0D,0x00,0x00}, // 0x26 +{0x04,0x04,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x27 +{0x03,0x04,0x08,0x08,0x08,0x04,0x03,0x00}, // 0x28 +{0x18,0x04,0x02,0x02,0x02,0x04,0x18,0x00}, // 0x29 +{0x04,0x0A,0x04,0x0A,0x00,0x00,0x00,0x00}, // 0x2A +{0x00,0x00,0x00,0x04,0x0E,0x04,0x00,0x00}, // 0x2B +{0x00,0x00,0x00,0x00,0x00,0x04,0x04,0x08}, // 0x2C +{0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x00}, // 0x2D +{0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x00}, // 0x2E +{0x01,0x02,0x02,0x04,0x04,0x08,0x08,0x00}, // 0x2F +{0x06,0x09,0x09,0x09,0x09,0x06,0x00,0x00}, // 0x30 +{0x04,0x0C,0x04,0x04,0x04,0x0E,0x00,0x00}, // 0x31 +{0x0C,0x02,0x02,0x04,0x08,0x0E,0x00,0x00}, // 0x32 +{0x0C,0x02,0x0C,0x02,0x02,0x0C,0x00,0x00}, // 0x33 +{0x02,0x06,0x0A,0x0F,0x02,0x02,0x00,0x00}, // 0x34 +{0x0E,0x08,0x0C,0x02,0x02,0x0C,0x00,0x00}, // 0x35 +{0x06,0x08,0x0E,0x09,0x09,0x06,0x00,0x00}, // 0x36 +{0x0F,0x01,0x02,0x04,0x04,0x04,0x00,0x00}, // 0x37 +{0x06,0x09,0x06,0x09,0x09,0x06,0x00,0x00}, // 0x38 +{0x06,0x09,0x09,0x07,0x01,0x06,0x00,0x00}, // 0x39 +{0x00,0x00,0x04,0x00,0x00,0x04,0x00,0x00}, // 0x3A +{0x00,0x00,0x04,0x00,0x00,0x04,0x04,0x08}, // 0x3B +{0x00,0x01,0x02,0x0C,0x02,0x01,0x00,0x00}, // 0x3C +{0x00,0x00,0x0F,0x00,0x0F,0x00,0x00,0x00}, // 0x3D +{0x00,0x08,0x04,0x03,0x04,0x08,0x00,0x00}, // 0x3E +{0x0E,0x01,0x02,0x04,0x00,0x04,0x00,0x00}, // 0x3F +{0x06,0x09,0x13,0x15,0x17,0x10,0x0F,0x00}, // 0x40 +{0x00,0x04,0x0A,0x0A,0x1F,0x11,0x00,0x00}, // 0x41 +{0x00,0x0E,0x0A,0x0C,0x0A,0x0E,0x00,0x00}, // 0x42 +{0x00,0x07,0x08,0x08,0x08,0x07,0x00,0x00}, // 0x43 +{0x00,0x0E,0x09,0x09,0x09,0x0E,0x00,0x00}, // 0x44 +{0x00,0x0E,0x08,0x0E,0x08,0x0E,0x00,0x00}, // 0x45 +{0x00,0x0E,0x08,0x0E,0x08,0x08,0x00,0x00}, // 0x46 +{0x00,0x07,0x08,0x0B,0x09,0x07,0x00,0x00}, // 0x47 +{0x00,0x09,0x09,0x0F,0x09,0x09,0x00,0x00}, // 0x48 +{0x00,0x0E,0x04,0x04,0x04,0x0E,0x00,0x00}, // 0x49 +{0x00,0x0E,0x02,0x02,0x02,0x0C,0x00,0x00}, // 0x4A +{0x00,0x09,0x0A,0x0C,0x0A,0x09,0x00,0x00}, // 0x4B +{0x00,0x08,0x08,0x08,0x08,0x0F,0x00,0x00}, // 0x4C +{0x00,0x11,0x1B,0x15,0x15,0x11,0x00,0x00}, // 0x4D +{0x00,0x09,0x0D,0x0B,0x09,0x09,0x00,0x00}, // 0x4E +{0x00,0x0E,0x11,0x11,0x11,0x0E,0x00,0x00}, // 0x4F +{0x00,0x0E,0x09,0x0E,0x08,0x08,0x00,0x00}, // 0x50 +{0x00,0x0E,0x11,0x11,0x11,0x0E,0x02,0x01}, // 0x51 +{0x00,0x0C,0x0A,0x0C,0x0A,0x09,0x00,0x00}, // 0x52 +{0x00,0x06,0x08,0x04,0x02,0x0C,0x00,0x00}, // 0x53 +{0x00,0x1F,0x04,0x04,0x04,0x04,0x00,0x00}, // 0x54 +{0x00,0x09,0x09,0x09,0x09,0x06,0x00,0x00}, // 0x55 +{0x00,0x09,0x09,0x09,0x06,0x06,0x00,0x00}, // 0x56 +{0x00,0x11,0x15,0x15,0x0A,0x0A,0x00,0x00}, // 0x57 +{0x00,0x11,0x0A,0x04,0x0A,0x11,0x00,0x00}, // 0x58 +{0x00,0x11,0x0A,0x04,0x04,0x04,0x00,0x00}, // 0x59 +{0x00,0x0F,0x01,0x06,0x08,0x0F,0x00,0x00}, // 0x5A +{0x06,0x04,0x04,0x04,0x04,0x04,0x06,0x00}, // 0x5B +{0x10,0x08,0x08,0x04,0x04,0x02,0x02,0x00}, // 0x5C +{0x0C,0x04,0x04,0x04,0x04,0x04,0x0C,0x00}, // 0x5D +{0x04,0x0A,0x0A,0x11,0x11,0x00,0x00,0x00}, // 0x5E +{0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x00}, // 0x5F +{0x08,0x04,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x60 +{0x00,0x00,0x0C,0x02,0x0E,0x0F,0x00,0x00}, // 0x61 +{0x08,0x08,0x0E,0x09,0x09,0x0E,0x00,0x00}, // 0x62 +{0x00,0x00,0x06,0x08,0x08,0x06,0x00,0x00}, // 0x63 +{0x02,0x02,0x0E,0x12,0x12,0x0E,0x00,0x00}, // 0x64 +{0x00,0x00,0x04,0x0E,0x08,0x06,0x00,0x00}, // 0x65 +{0x03,0x04,0x0F,0x04,0x04,0x04,0x00,0x00}, // 0x66 +{0x00,0x00,0x07,0x09,0x0F,0x01,0x0E,0x00}, // 0x67 +{0x08,0x08,0x0A,0x0D,0x09,0x09,0x00,0x00}, // 0x68 +{0x04,0x00,0x0C,0x04,0x04,0x04,0x00,0x00}, // 0x69 +{0x02,0x00,0x0E,0x02,0x02,0x02,0x0C,0x00}, // 0x6A +{0x08,0x08,0x0A,0x0C,0x0A,0x09,0x00,0x00}, // 0x6B +{0x0C,0x04,0x04,0x04,0x04,0x04,0x00,0x00}, // 0x6C +{0x00,0x00,0x15,0x1F,0x15,0x15,0x00,0x00}, // 0x6D +{0x00,0x00,0x0A,0x0D,0x09,0x09,0x00,0x00}, // 0x6E +{0x00,0x00,0x06,0x09,0x09,0x06,0x00,0x00}, // 0x6F +{0x00,0x00,0x0E,0x09,0x09,0x0E,0x08,0x00}, // 0x70 +{0x00,0x00,0x0E,0x12,0x12,0x0E,0x02,0x00}, // 0x71 +{0x00,0x00,0x0A,0x0C,0x08,0x08,0x00,0x00}, // 0x72 +{0x00,0x00,0x06,0x0C,0x02,0x0C,0x00,0x00}, // 0x73 +{0x00,0x04,0x0F,0x04,0x04,0x02,0x00,0x00}, // 0x74 +{0x00,0x00,0x09,0x09,0x0B,0x05,0x00,0x00}, // 0x75 +{0x00,0x00,0x09,0x09,0x06,0x06,0x00,0x00}, // 0x76 +{0x00,0x00,0x15,0x15,0x0E,0x0A,0x00,0x00}, // 0x77 +{0x00,0x00,0x09,0x06,0x06,0x09,0x00,0x00}, // 0x78 +{0x00,0x00,0x09,0x09,0x06,0x06,0x1C,0x00}, // 0x79 +{0x00,0x00,0x0E,0x06,0x08,0x0E,0x00,0x00}, // 0x7A +{0x02,0x04,0x04,0x08,0x04,0x04,0x02,0x00}, // 0x7B +{0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x00}, // 0x7C +{0x08,0x04,0x04,0x02,0x04,0x04,0x08,0x00}, // 0x7D +{0x00,0x00,0x00,0x0D,0x12,0x00,0x00,0x00}, // 0x7E +{0x00,0x04,0x0A,0x0A,0x0A,0x0E,0x00,0x00}, // 0x7F +{0x00,0x07,0x08,0x08,0x08,0x07,0x02,0x04}, // 0x80 +{0x09,0x00,0x09,0x09,0x0B,0x05,0x00,0x00}, // 0x81 +{0x01,0x02,0x04,0x0E,0x08,0x06,0x00,0x00}, // 0x82 +{0x06,0x09,0x0C,0x02,0x0E,0x0F,0x00,0x00}, // 0x83 +{0x0A,0x00,0x0C,0x02,0x0E,0x0F,0x00,0x00}, // 0x84 +{0x10,0x08,0x0C,0x02,0x0E,0x0F,0x00,0x00}, // 0x85 +{0x04,0x0A,0x0C,0x02,0x0E,0x0F,0x00,0x00}, // 0x86 +{0x00,0x00,0x06,0x08,0x08,0x06,0x02,0x04}, // 0x87 +{0x06,0x09,0x04,0x0E,0x08,0x06,0x00,0x00}, // 0x88 +{0x0A,0x00,0x04,0x0E,0x08,0x06,0x00,0x00}, // 0x89 +{0x10,0x08,0x04,0x0E,0x08,0x06,0x00,0x00}, // 0x8A +{0x0A,0x00,0x0C,0x04,0x04,0x04,0x00,0x00}, // 0x8B +{0x06,0x09,0x0C,0x04,0x04,0x04,0x00,0x00}, // 0x8C +{0x10,0x08,0x0C,0x04,0x04,0x04,0x00,0x00}, // 0x8D +{0x0A,0x04,0x0A,0x0A,0x1F,0x11,0x00,0x00}, // 0x8E +{0x04,0x0A,0x04,0x0A,0x1F,0x11,0x00,0x00}, // 0x8F +{0x01,0x0E,0x08,0x0E,0x08,0x0E,0x00,0x00}, // 0x90 +{0x00,0x00,0x1A,0x07,0x1C,0x13,0x00,0x00}, // 0x91 +{0x00,0x07,0x0A,0x0B,0x1E,0x13,0x00,0x00}, // 0x92 +{0x0C,0x12,0x06,0x09,0x09,0x06,0x00,0x00}, // 0x93 +{0x09,0x00,0x06,0x09,0x09,0x06,0x00,0x00}, // 0x94 +{0x10,0x08,0x06,0x09,0x09,0x06,0x00,0x00}, // 0x95 +{0x0C,0x12,0x09,0x09,0x0B,0x05,0x00,0x00}, // 0x96 +{0x08,0x04,0x09,0x09,0x0B,0x05,0x00,0x00}, // 0x97 +{0x09,0x00,0x09,0x09,0x06,0x06,0x1C,0x00}, // 0x98 +{0x11,0x0E,0x11,0x11,0x11,0x0E,0x00,0x00}, // 0x99 +{0x12,0x09,0x09,0x09,0x09,0x06,0x00,0x00}, // 0x9A +{0x00,0x01,0x06,0x0B,0x0D,0x06,0x08,0x00}, // 0x9B +{0x00,0x04,0x08,0x0C,0x18,0x0E,0x00,0x00}, // 0x9C +{0x01,0x0E,0x13,0x15,0x19,0x0E,0x10,0x00}, // 0x9D +{0x00,0x00,0x09,0x06,0x06,0x09,0x00,0x00}, // 0x9E +{0x02,0x04,0x04,0x0E,0x04,0x04,0x08,0x00}, // 0x9F +{0x01,0x02,0x0C,0x02,0x0E,0x0F,0x00,0x00}, // 0xA0 +{0x01,0x02,0x0C,0x04,0x04,0x04,0x00,0x00}, // 0xA1 +{0x01,0x02,0x06,0x09,0x09,0x06,0x00,0x00}, // 0xA2 +{0x01,0x02,0x09,0x09,0x0B,0x05,0x00,0x00}, // 0xA3 +{0x0F,0x00,0x0A,0x0D,0x09,0x09,0x00,0x00}, // 0xA4 +{0x1F,0x09,0x0D,0x0B,0x09,0x09,0x00,0x00}, // 0xA5 +{0x0C,0x02,0x0E,0x0A,0x0E,0x00,0x00,0x00}, // 0xA6 +{0x04,0x0A,0x0A,0x0A,0x04,0x00,0x00,0x00}, // 0xA7 +{0x00,0x04,0x00,0x04,0x04,0x02,0x0C,0x00}, // 0xA8 +{0x0E,0x17,0x17,0x15,0x17,0x0E,0x00,0x00}, // 0xA9 +{0x00,0x00,0x00,0x0E,0x02,0x02,0x00,0x00}, // 0xAA +{0x19,0x0A,0x0F,0x05,0x0A,0x13,0x00,0x00}, // 0xAB +{0x19,0x0A,0x0A,0x05,0x0B,0x11,0x00,0x00}, // 0xAC +{0x00,0x00,0x04,0x00,0x04,0x04,0x04,0x00}, // 0xAD +{0x00,0x05,0x0A,0x14,0x0A,0x05,0x00,0x00}, // 0xAE +{0x00,0x14,0x0A,0x05,0x0A,0x14,0x00,0x00}, // 0xAF +{0x15,0x00,0x15,0x00,0x15,0x00,0x15,0x00}, // 0xB0 +{0x15,0x0A,0x15,0x0A,0x15,0x0A,0x15,0x0A}, // 0xB1 +{0x1F,0x15,0x1F,0x15,0x1F,0x15,0x1F,0x15}, // 0xB2 +{0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04}, // 0xB3 +{0x04,0x04,0x04,0x1C,0x04,0x04,0x04,0x04}, // 0xB4 +{0x02,0x04,0x0A,0x0A,0x1F,0x11,0x00,0x00}, // 0xB5 +{0x06,0x09,0x04,0x0A,0x1F,0x11,0x00,0x00}, // 0xB6 +{0x08,0x04,0x0A,0x0A,0x1F,0x11,0x00,0x00}, // 0xB7 +{0x0E,0x11,0x17,0x15,0x17,0x11,0x0E,0x00}, // 0xB8 +{0x0A,0x0A,0x1A,0x02,0x1A,0x0A,0x0A,0x0A}, // 0xB9 +{0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A}, // 0xBA +{0x00,0x00,0x1E,0x02,0x1A,0x0A,0x0A,0x0A}, // 0xBB +{0x0A,0x0A,0x1A,0x02,0x1E,0x00,0x00,0x00}, // 0xBC +{0x00,0x04,0x0E,0x08,0x0E,0x04,0x00,0x00}, // 0xBD +{0x00,0x11,0x0A,0x04,0x0E,0x04,0x00,0x00}, // 0xBE +{0x00,0x00,0x00,0x1C,0x04,0x04,0x04,0x04}, // 0xBF +{0x04,0x04,0x04,0x07,0x00,0x00,0x00,0x00}, // 0xC0 +{0x04,0x04,0x04,0x1F,0x00,0x00,0x00,0x00}, // 0xC1 +{0x00,0x00,0x00,0x1F,0x04,0x04,0x04,0x04}, // 0xC2 +{0x04,0x04,0x04,0x07,0x04,0x04,0x04,0x04}, // 0xC3 +{0x00,0x00,0x00,0x1F,0x00,0x00,0x00,0x00}, // 0xC4 +{0x04,0x04,0x04,0x1F,0x04,0x04,0x04,0x04}, // 0xC5 +{0x0D,0x12,0x0C,0x02,0x0E,0x0F,0x00,0x00}, // 0xC6 +{0x0D,0x12,0x04,0x0A,0x1F,0x11,0x00,0x00}, // 0xC7 +{0x0A,0x0A,0x0B,0x08,0x0F,0x00,0x00,0x00}, // 0xC8 +{0x00,0x00,0x0F,0x08,0x0B,0x0A,0x0A,0x0A}, // 0xC9 +{0x0A,0x0A,0x1B,0x00,0x1F,0x00,0x00,0x00}, // 0xCA +{0x00,0x00,0x1F,0x00,0x1B,0x0A,0x0A,0x0A}, // 0xCB +{0x0A,0x0A,0x0B,0x08,0x0B,0x0A,0x0A,0x0A}, // 0xCC +{0x00,0x00,0x1F,0x00,0x1F,0x00,0x00,0x00}, // 0xCD +{0x0A,0x0A,0x1B,0x00,0x1B,0x0A,0x0A,0x0A}, // 0xCE +{0x00,0x11,0x0E,0x0A,0x0E,0x11,0x00,0x00}, // 0xCF +{0x1E,0x04,0x0E,0x12,0x12,0x0C,0x00,0x00}, // 0xD0 +{0x00,0x0E,0x09,0x1D,0x09,0x0E,0x00,0x00}, // 0xD1 +{0x0E,0x0E,0x08,0x0E,0x08,0x0E,0x00,0x00}, // 0xD2 +{0x11,0x0E,0x08,0x0E,0x08,0x0E,0x00,0x00}, // 0xD3 +{0x10,0x0E,0x08,0x0E,0x08,0x0E,0x00,0x00}, // 0xD4 +{0x00,0x00,0x0C,0x04,0x04,0x04,0x00,0x00}, // 0xD5 +{0x01,0x0E,0x04,0x04,0x04,0x0E,0x00,0x00}, // 0xD6 +{0x0E,0x0E,0x04,0x04,0x04,0x0E,0x00,0x00}, // 0xD7 +{0x11,0x0E,0x04,0x04,0x04,0x0E,0x00,0x00}, // 0xD8 +{0x04,0x04,0x04,0x1C,0x00,0x00,0x00,0x00}, // 0xD9 +{0x00,0x00,0x00,0x07,0x04,0x04,0x04,0x04}, // 0xDA +{0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F}, // 0xDB +{0x00,0x00,0x00,0x00,0x1F,0x1F,0x1F,0x1F}, // 0xDC +{0x04,0x04,0x04,0x00,0x00,0x04,0x04,0x04}, // 0xDD +{0x10,0x0E,0x04,0x04,0x04,0x0E,0x00,0x00}, // 0xDE +{0x1F,0x1F,0x1F,0x1F,0x00,0x00,0x00,0x00}, // 0xDF +{0x01,0x0E,0x11,0x11,0x11,0x0E,0x00,0x00}, // 0xE0 +{0x04,0x0A,0x0A,0x0A,0x09,0x0A,0x00,0x00}, // 0xE1 +{0x0E,0x0E,0x11,0x11,0x11,0x0E,0x00,0x00}, // 0xE2 +{0x10,0x0E,0x11,0x11,0x11,0x0E,0x00,0x00}, // 0xE3 +{0x0D,0x12,0x06,0x09,0x09,0x06,0x00,0x00}, // 0xE4 +{0x1E,0x0E,0x11,0x11,0x11,0x0E,0x00,0x00}, // 0xE5 +{0x00,0x00,0x09,0x09,0x0B,0x0D,0x08,0x00}, // 0xE6 +{0x08,0x08,0x0E,0x09,0x09,0x0E,0x08,0x00}, // 0xE7 +{0x00,0x08,0x0E,0x09,0x0E,0x08,0x00,0x00}, // 0xE8 +{0x01,0x12,0x12,0x12,0x12,0x0C,0x00,0x00}, // 0xE9 +{0x0F,0x09,0x09,0x09,0x09,0x06,0x00,0x00}, // 0xEA +{0x10,0x09,0x09,0x09,0x09,0x06,0x00,0x00}, // 0xEB +{0x01,0x02,0x09,0x09,0x06,0x06,0x18,0x00}, // 0xEC +{0x02,0x15,0x0A,0x04,0x04,0x04,0x00,0x00}, // 0xED +{0x1F,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0xEE +{0x02,0x04,0x00,0x00,0x00,0x00,0x00,0x00}, // 0xEF +{0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x00}, // 0xF0 +{0x00,0x00,0x04,0x0E,0x04,0x0E,0x00,0x00}, // 0xF1 +{0x00,0x00,0x00,0x00,0x00,0x1F,0x00,0x1F}, // 0xF2 +{0x19,0x1A,0x0A,0x1D,0x0B,0x11,0x00,0x00}, // 0xF3 +{0x0E,0x1A,0x1A,0x0A,0x0A,0x0A,0x0A,0x00}, // 0xF4 +{0x06,0x08,0x04,0x0A,0x04,0x02,0x0C,0x00}, // 0xF5 +{0x00,0x04,0x00,0x0E,0x00,0x04,0x00,0x00}, // 0xF6 +{0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x08}, // 0xF7 +{0x06,0x09,0x09,0x06,0x00,0x00,0x00,0x00}, // 0xF8 +{0x0A,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0xF9 +{0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x00}, // 0xFA +{0x0C,0x04,0x04,0x04,0x0E,0x00,0x00,0x00}, // 0xFB +{0x0C,0x02,0x0C,0x02,0x0C,0x00,0x00,0x00}, // 0xFC +{0x0C,0x02,0x04,0x08,0x0E,0x00,0x00,0x00}, // 0xFD +{0x00,0x00,0x0F,0x0F,0x0F,0x0F,0x00,0x00}, // 0xFE +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00} // 0xFF +}; + +#endif // font_5x8_horizontal_MSB_h \ No newline at end of file diff --git a/lib/lib_display/LedControl/src/font_6x8_horizontal_MSB.h b/lib/lib_display/LedControl/src/font_6x8_horizontal_MSB.h new file mode 100644 index 000000000..cc3a323cc --- /dev/null +++ b/lib/lib_display/LedControl/src/font_6x8_horizontal_MSB.h @@ -0,0 +1,264 @@ +// 6x8 ascii font +#ifndef font_6x8_horizontal_MSB_h +#define font_6x8_horizontal_MSB_h + +const char font[256][8]={ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x00 +{0x0E,0x11,0x1B,0x11,0x15,0x11,0x0E,0x00}, // 0x01 +{0x0E,0x1F,0x15,0x1F,0x11,0x1F,0x0E,0x00}, // 0x02 +{0x00,0x0A,0x1F,0x1F,0x1F,0x0E,0x04,0x00}, // 0x03 +{0x00,0x04,0x0E,0x1F,0x1F,0x0E,0x04,0x00}, // 0x04 +{0x04,0x0E,0x0E,0x04,0x1F,0x1F,0x04,0x00}, // 0x05 +{0x00,0x04,0x0E,0x1F,0x1F,0x04,0x0E,0x00}, // 0x06 +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x07 +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x08 +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x09 +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x0A +{0x00,0x07,0x03,0x0D,0x12,0x12,0x0C,0x00}, // 0x0B +{0x0E,0x11,0x11,0x0E,0x04,0x0E,0x04,0x00}, // 0x0C +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x0D +{0x03,0x0D,0x0B,0x0D,0x0B,0x1B,0x18,0x00}, // 0x0E +{0x00,0x15,0x0E,0x1B,0x0E,0x15,0x00,0x00}, // 0x0F +{0x08,0x0C,0x0E,0x0F,0x0E,0x0C,0x08,0x00}, // 0x10 +{0x02,0x06,0x0E,0x1E,0x0E,0x06,0x02,0x00}, // 0x11 +{0x04,0x0E,0x1F,0x04,0x1F,0x0E,0x04,0x00}, // 0x12 +{0x0A,0x0A,0x0A,0x0A,0x0A,0x00,0x0A,0x00}, // 0x13 +{0x0F,0x15,0x15,0x0D,0x05,0x05,0x05,0x00}, // 0x14 +{0x0E,0x11,0x0C,0x0A,0x06,0x11,0x0E,0x00}, // 0x15 +{0x00,0x00,0x00,0x00,0x00,0x1E,0x1E,0x00}, // 0x16 +{0x04,0x0E,0x1F,0x04,0x1F,0x0E,0x04,0x0E}, // 0x17 +{0x04,0x0E,0x1F,0x04,0x04,0x04,0x04,0x00}, // 0x18 +{0x04,0x04,0x04,0x04,0x1F,0x0E,0x04,0x00}, // 0x19 +{0x00,0x04,0x06,0x1F,0x06,0x04,0x00,0x00}, // 0x1A +{0x00,0x04,0x0C,0x1F,0x0C,0x04,0x00,0x00}, // 0x1B +{0x00,0x00,0x00,0x10,0x10,0x10,0x1F,0x00}, // 0x1C +{0x00,0x0A,0x0A,0x1F,0x0A,0x0A,0x00,0x00}, // 0x1D +{0x04,0x04,0x0E,0x0E,0x1F,0x1F,0x00,0x00}, // 0x1E +{0x1F,0x1F,0x0E,0x0E,0x04,0x04,0x00,0x00}, // 0x1F +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x20 +{0x04,0x0E,0x0E,0x04,0x04,0x00,0x04,0x00}, // 0x21 +{0x1B,0x1B,0x12,0x00,0x00,0x00,0x00,0x00}, // 0x22 +{0x00,0x0A,0x1F,0x0A,0x0A,0x1F,0x0A,0x00}, // 0x23 +{0x08,0x0E,0x10,0x0C,0x02,0x1C,0x04,0x00}, // 0x24 +{0x19,0x19,0x02,0x04,0x08,0x13,0x13,0x00}, // 0x25 +{0x08,0x14,0x14,0x08,0x15,0x12,0x0D,0x00}, // 0x26 +{0x0C,0x0C,0x08,0x00,0x00,0x00,0x00,0x00}, // 0x27 +{0x04,0x08,0x08,0x08,0x08,0x08,0x04,0x00}, // 0x28 +{0x08,0x04,0x04,0x04,0x04,0x04,0x08,0x00}, // 0x29 +{0x00,0x0A,0x0E,0x1F,0x0E,0x0A,0x00,0x00}, // 0x2A +{0x00,0x04,0x04,0x1F,0x04,0x04,0x00,0x00}, // 0x2B +{0x00,0x00,0x00,0x00,0x00,0x0C,0x0C,0x08}, // 0x2C +{0x00,0x00,0x00,0x1F,0x00,0x00,0x00,0x00}, // 0x2D +{0x00,0x00,0x00,0x00,0x00,0x0C,0x0C,0x00}, // 0x2E +{0x00,0x01,0x02,0x04,0x08,0x10,0x00,0x00}, // 0x2F +{0x0E,0x11,0x13,0x15,0x19,0x11,0x0E,0x00}, // 0x30 +{0x04,0x0C,0x04,0x04,0x04,0x04,0x0E,0x00}, // 0x31 +{0x0E,0x11,0x01,0x06,0x08,0x10,0x1F,0x00}, // 0x32 +{0x0E,0x11,0x01,0x0E,0x01,0x11,0x0E,0x00}, // 0x33 +{0x02,0x06,0x0A,0x12,0x1F,0x02,0x02,0x00}, // 0x34 +{0x1F,0x10,0x10,0x1E,0x01,0x11,0x0E,0x00}, // 0x35 +{0x06,0x08,0x10,0x1E,0x11,0x11,0x0E,0x00}, // 0x36 +{0x1F,0x01,0x02,0x04,0x08,0x08,0x08,0x00}, // 0x37 +{0x0E,0x11,0x11,0x0E,0x11,0x11,0x0E,0x00}, // 0x38 +{0x0E,0x11,0x11,0x0F,0x01,0x02,0x0C,0x00}, // 0x39 +{0x00,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00}, // 0x3A +{0x00,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x08}, // 0x3B +{0x02,0x04,0x08,0x10,0x08,0x04,0x02,0x00}, // 0x3C +{0x00,0x00,0x1F,0x00,0x00,0x1F,0x00,0x00}, // 0x3D +{0x08,0x04,0x02,0x01,0x02,0x04,0x08,0x00}, // 0x3E +{0x0E,0x11,0x01,0x06,0x04,0x00,0x04,0x00}, // 0x3F +{0x0E,0x11,0x17,0x15,0x17,0x10,0x0E,0x00}, // 0x40 +{0x0E,0x11,0x11,0x11,0x1F,0x11,0x11,0x00}, // 0x41 +{0x1E,0x11,0x11,0x1E,0x11,0x11,0x1E,0x00}, // 0x42 +{0x0E,0x11,0x10,0x10,0x10,0x11,0x0E,0x00}, // 0x43 +{0x1E,0x11,0x11,0x11,0x11,0x11,0x1E,0x00}, // 0x44 +{0x1F,0x10,0x10,0x1E,0x10,0x10,0x1F,0x00}, // 0x45 +{0x1F,0x10,0x10,0x1E,0x10,0x10,0x10,0x00}, // 0x46 +{0x0E,0x11,0x10,0x17,0x11,0x11,0x0F,0x00}, // 0x47 +{0x11,0x11,0x11,0x1F,0x11,0x11,0x11,0x00}, // 0x48 +{0x0E,0x04,0x04,0x04,0x04,0x04,0x0E,0x00}, // 0x49 +{0x01,0x01,0x01,0x01,0x11,0x11,0x0E,0x00}, // 0x4A +{0x11,0x12,0x14,0x18,0x14,0x12,0x11,0x00}, // 0x4B +{0x10,0x10,0x10,0x10,0x10,0x10,0x1F,0x00}, // 0x4C +{0x11,0x1B,0x15,0x11,0x11,0x11,0x11,0x00}, // 0x4D +{0x11,0x19,0x15,0x13,0x11,0x11,0x11,0x00}, // 0x4E +{0x0E,0x11,0x11,0x11,0x11,0x11,0x0E,0x00}, // 0x4F +{0x1E,0x11,0x11,0x1E,0x10,0x10,0x10,0x00}, // 0x50 +{0x0E,0x11,0x11,0x11,0x15,0x12,0x0D,0x00}, // 0x51 +{0x1E,0x11,0x11,0x1E,0x12,0x11,0x11,0x00}, // 0x52 +{0x0E,0x11,0x10,0x0E,0x01,0x11,0x0E,0x00}, // 0x53 +{0x1F,0x04,0x04,0x04,0x04,0x04,0x04,0x00}, // 0x54 +{0x11,0x11,0x11,0x11,0x11,0x11,0x0E,0x00}, // 0x55 +{0x11,0x11,0x11,0x11,0x11,0x0A,0x04,0x00}, // 0x56 +{0x11,0x11,0x15,0x15,0x15,0x15,0x0A,0x00}, // 0x57 +{0x11,0x11,0x0A,0x04,0x0A,0x11,0x11,0x00}, // 0x58 +{0x11,0x11,0x11,0x0A,0x04,0x04,0x04,0x00}, // 0x59 +{0x1E,0x02,0x04,0x08,0x10,0x10,0x1E,0x00}, // 0x5A +{0x0E,0x08,0x08,0x08,0x08,0x08,0x0E,0x00}, // 0x5B +{0x00,0x10,0x08,0x04,0x02,0x01,0x00,0x00}, // 0x5C +{0x0E,0x02,0x02,0x02,0x02,0x02,0x0E,0x00}, // 0x5D +{0x04,0x0A,0x11,0x00,0x00,0x00,0x00,0x00}, // 0x5E +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F}, // 0x5F +{0x0C,0x0C,0x04,0x00,0x00,0x00,0x00,0x00}, // 0x60 +{0x00,0x00,0x0E,0x01,0x0F,0x11,0x0F,0x00}, // 0x61 +{0x10,0x10,0x1E,0x11,0x11,0x11,0x1E,0x00}, // 0x62 +{0x00,0x00,0x0E,0x11,0x10,0x11,0x0E,0x00}, // 0x63 +{0x01,0x01,0x0F,0x11,0x11,0x11,0x0F,0x00}, // 0x64 +{0x00,0x00,0x0E,0x11,0x1E,0x10,0x0E,0x00}, // 0x65 +{0x06,0x08,0x08,0x1E,0x08,0x08,0x08,0x00}, // 0x66 +{0x00,0x00,0x0F,0x11,0x11,0x0F,0x01,0x0E}, // 0x67 +{0x10,0x10,0x1C,0x12,0x12,0x12,0x12,0x00}, // 0x68 +{0x04,0x00,0x04,0x04,0x04,0x04,0x06,0x00}, // 0x69 +{0x02,0x00,0x06,0x02,0x02,0x02,0x12,0x0C}, // 0x6A +{0x10,0x10,0x12,0x14,0x18,0x14,0x12,0x00}, // 0x6B +{0x04,0x04,0x04,0x04,0x04,0x04,0x06,0x00}, // 0x6C +{0x00,0x00,0x1A,0x15,0x15,0x11,0x11,0x00}, // 0x6D +{0x00,0x00,0x1C,0x12,0x12,0x12,0x12,0x00}, // 0x6E +{0x00,0x00,0x0E,0x11,0x11,0x11,0x0E,0x00}, // 0x6F +{0x00,0x00,0x1E,0x11,0x11,0x11,0x1E,0x10}, // 0x70 +{0x00,0x00,0x0F,0x11,0x11,0x11,0x0F,0x01}, // 0x71 +{0x00,0x00,0x16,0x09,0x08,0x08,0x1C,0x00}, // 0x72 +{0x00,0x00,0x0E,0x10,0x0E,0x01,0x0E,0x00}, // 0x73 +{0x00,0x08,0x1E,0x08,0x08,0x0A,0x04,0x00}, // 0x74 +{0x00,0x00,0x12,0x12,0x12,0x16,0x0A,0x00}, // 0x75 +{0x00,0x00,0x11,0x11,0x11,0x0A,0x04,0x00}, // 0x76 +{0x00,0x00,0x11,0x11,0x15,0x1F,0x0A,0x00}, // 0x77 +{0x00,0x00,0x12,0x12,0x0C,0x12,0x12,0x00}, // 0x78 +{0x00,0x00,0x12,0x12,0x12,0x0E,0x04,0x18}, // 0x79 +{0x00,0x00,0x1E,0x02,0x0C,0x10,0x1E,0x00}, // 0x7A +{0x06,0x08,0x08,0x18,0x08,0x08,0x06,0x00}, // 0x7B +{0x04,0x04,0x04,0x00,0x04,0x04,0x04,0x00}, // 0x7C +{0x0C,0x02,0x02,0x03,0x02,0x02,0x0C,0x00}, // 0x7D +{0x0A,0x14,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x7E +{0x04,0x0E,0x1B,0x11,0x11,0x1F,0x00,0x00}, // 0x7F +{0x0E,0x11,0x10,0x10,0x11,0x0E,0x04,0x0C}, // 0x80 +{0x12,0x00,0x12,0x12,0x12,0x16,0x0A,0x00}, // 0x81 +{0x03,0x00,0x0E,0x11,0x1E,0x10,0x0E,0x00}, // 0x82 +{0x0E,0x00,0x0E,0x01,0x0F,0x11,0x0F,0x00}, // 0x83 +{0x0A,0x00,0x0E,0x01,0x0F,0x11,0x0F,0x00}, // 0x84 +{0x0C,0x00,0x0E,0x01,0x0F,0x11,0x0F,0x00}, // 0x85 +{0x0E,0x0A,0x0E,0x01,0x0F,0x11,0x0F,0x00}, // 0x86 +{0x00,0x0E,0x11,0x10,0x11,0x0E,0x04,0x0C}, // 0x87 +{0x0E,0x00,0x0E,0x11,0x1E,0x10,0x0E,0x00}, // 0x88 +{0x0A,0x00,0x0E,0x11,0x1E,0x10,0x0E,0x00}, // 0x89 +{0x0C,0x00,0x0E,0x11,0x1E,0x10,0x0E,0x00}, // 0x8A +{0x0A,0x00,0x04,0x04,0x04,0x04,0x06,0x00}, // 0x8B +{0x0E,0x00,0x04,0x04,0x04,0x04,0x06,0x00}, // 0x8C +{0x08,0x00,0x04,0x04,0x04,0x04,0x06,0x00}, // 0x8D +{0x0A,0x00,0x04,0x0A,0x11,0x1F,0x11,0x00}, // 0x8E +{0x0E,0x0A,0x0E,0x1B,0x11,0x1F,0x11,0x00}, // 0x8F +{0x03,0x00,0x1F,0x10,0x1E,0x10,0x1F,0x00}, // 0x90 +{0x00,0x00,0x1E,0x05,0x1F,0x14,0x0F,0x00}, // 0x91 +{0x0F,0x14,0x14,0x1F,0x14,0x14,0x17,0x00}, // 0x92 +{0x0E,0x00,0x0C,0x12,0x12,0x12,0x0C,0x00}, // 0x93 +{0x0A,0x00,0x0C,0x12,0x12,0x12,0x0C,0x00}, // 0x94 +{0x18,0x00,0x0C,0x12,0x12,0x12,0x0C,0x00}, // 0x95 +{0x0E,0x00,0x12,0x12,0x12,0x16,0x0A,0x00}, // 0x96 +{0x18,0x00,0x12,0x12,0x12,0x16,0x0A,0x00}, // 0x97 +{0x0A,0x00,0x12,0x12,0x12,0x0E,0x04,0x18}, // 0x98 +{0x12,0x0C,0x12,0x12,0x12,0x12,0x0C,0x00}, // 0x99 +{0x0A,0x00,0x12,0x12,0x12,0x12,0x0C,0x00}, // 0x9A +{0x00,0x00,0x01,0x0E,0x16,0x1A,0x1C,0x20}, // 0x9B +{0x06,0x09,0x08,0x1E,0x08,0x09,0x17,0x00}, // 0x9C +{0x0F,0x13,0x15,0x15,0x15,0x19,0x1E,0x00}, // 0x9D +{0x00,0x11,0x0A,0x04,0x0A,0x11,0x00,0x00}, // 0x9E +{0x02,0x05,0x04,0x0E,0x04,0x04,0x14,0x08}, // 0x9F +{0x06,0x00,0x0E,0x01,0x0F,0x11,0x0F,0x00}, // 0xA0 +{0x06,0x00,0x04,0x04,0x04,0x04,0x06,0x00}, // 0xA1 +{0x06,0x00,0x0C,0x12,0x12,0x12,0x0C,0x00}, // 0xA2 +{0x06,0x00,0x12,0x12,0x12,0x16,0x0A,0x00}, // 0xA3 +{0x0A,0x14,0x00,0x1C,0x12,0x12,0x12,0x00}, // 0xA4 +{0x0A,0x14,0x00,0x12,0x1A,0x16,0x12,0x00}, // 0xA5 +{0x0E,0x01,0x0F,0x11,0x0F,0x00,0x0F,0x00}, // 0xA6 +{0x0C,0x12,0x12,0x12,0x0C,0x00,0x1E,0x00}, // 0xA7 +{0x04,0x00,0x04,0x0C,0x10,0x11,0x0E,0x00}, // 0xA8 +{0x1E,0x25,0x2B,0x2D,0x2B,0x21,0x1E,0x00}, // 0xA9 +{0x00,0x00,0x3F,0x01,0x01,0x00,0x00,0x00}, // 0xAA +{0x10,0x12,0x14,0x0E,0x11,0x02,0x07,0x00}, // 0xAB +{0x10,0x12,0x14,0x0B,0x15,0x07,0x01,0x00}, // 0xAC +{0x04,0x00,0x04,0x04,0x0E,0x0E,0x04,0x00}, // 0xAD +{0x00,0x00,0x09,0x12,0x09,0x00,0x00,0x00}, // 0xAE +{0x00,0x00,0x12,0x09,0x12,0x00,0x00,0x00}, // 0xAF +{0x15,0x00,0x2A,0x00,0x15,0x00,0x2A,0x00}, // 0xB0 +{0x15,0x2A,0x15,0x2A,0x15,0x2A,0x15,0x2A}, // 0xB1 +{0x2A,0x3F,0x15,0x3F,0x2A,0x3F,0x15,0x3F}, // 0xB2 +{0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04}, // 0xB3 +{0x04,0x04,0x04,0x3C,0x04,0x04,0x04,0x04}, // 0xB4 +{0x06,0x00,0x04,0x0A,0x11,0x1F,0x11,0x00}, // 0xB5 +{0x0E,0x00,0x04,0x0A,0x11,0x1F,0x11,0x00}, // 0xB6 +{0x0C,0x00,0x04,0x0A,0x11,0x1F,0x11,0x00}, // 0xB7 +{0x1E,0x21,0x2D,0x29,0x2D,0x21,0x1E,0x00}, // 0xB8 +{0x14,0x34,0x04,0x34,0x14,0x14,0x14,0x14}, // 0xB9 +{0x14,0x14,0x14,0x14,0x14,0x14,0x14,0x14}, // 0xBA +{0x00,0x3C,0x04,0x34,0x14,0x14,0x14,0x14}, // 0xBB +{0x14,0x34,0x04,0x3C,0x00,0x00,0x00,0x00}, // 0xBC +{0x00,0x04,0x0E,0x10,0x10,0x0E,0x04,0x00}, // 0xBD +{0x11,0x0A,0x04,0x1F,0x04,0x1F,0x04,0x00}, // 0xBE +{0x00,0x00,0x00,0x3C,0x04,0x04,0x04,0x04}, // 0xBF +{0x04,0x04,0x04,0x07,0x00,0x00,0x00,0x00}, // 0xC0 +{0x04,0x04,0x04,0x3F,0x00,0x00,0x00,0x00}, // 0xC1 +{0x00,0x00,0x00,0x3F,0x04,0x04,0x04,0x04}, // 0xC2 +{0x04,0x04,0x04,0x07,0x04,0x04,0x04,0x04}, // 0xC3 +{0x00,0x00,0x00,0x3F,0x00,0x00,0x00,0x00}, // 0xC4 +{0x04,0x04,0x04,0x3F,0x04,0x04,0x04,0x04}, // 0xC5 +{0x05,0x0A,0x0E,0x01,0x0F,0x11,0x0F,0x00}, // 0xC6 +{0x05,0x0A,0x04,0x0A,0x11,0x1F,0x11,0x00}, // 0xC7 +{0x14,0x17,0x10,0x1F,0x00,0x00,0x00,0x00}, // 0xC8 +{0x00,0x1F,0x10,0x17,0x14,0x14,0x14,0x14}, // 0xC9 +{0x14,0x37,0x00,0x3F,0x00,0x00,0x00,0x00}, // 0xCA +{0x00,0x3F,0x00,0x37,0x14,0x14,0x14,0x14}, // 0xCB +{0x14,0x17,0x10,0x17,0x14,0x14,0x14,0x14}, // 0xCC +{0x00,0x3F,0x00,0x3F,0x00,0x00,0x00,0x00}, // 0xCD +{0x14,0x37,0x00,0x37,0x14,0x14,0x14,0x14}, // 0xCE +{0x11,0x0E,0x11,0x11,0x11,0x0E,0x11,0x00}, // 0xCF +{0x0C,0x10,0x08,0x04,0x0E,0x12,0x0C,0x00}, // 0xD0 +{0x0E,0x09,0x09,0x1D,0x09,0x09,0x0E,0x00}, // 0xD1 +{0x0E,0x00,0x1F,0x10,0x1E,0x10,0x1F,0x00}, // 0xD2 +{0x0A,0x00,0x1F,0x10,0x1E,0x10,0x1F,0x00}, // 0xD3 +{0x0C,0x00,0x1F,0x10,0x1E,0x10,0x1F,0x00}, // 0xD4 +{0x04,0x04,0x04,0x00,0x00,0x00,0x00,0x00}, // 0xD5 +{0x06,0x00,0x0E,0x04,0x04,0x04,0x0E,0x00}, // 0xD6 +{0x0E,0x00,0x0E,0x04,0x04,0x04,0x0E,0x00}, // 0xD7 +{0x0A,0x00,0x0E,0x04,0x04,0x04,0x0E,0x00}, // 0xD8 +{0x04,0x04,0x04,0x3C,0x00,0x00,0x00,0x00}, // 0xD9 +{0x00,0x00,0x00,0x07,0x04,0x04,0x04,0x04}, // 0xDA +{0x3F,0x3F,0x3F,0x3F,0x3F,0x3F,0x3F,0x3F}, // 0xDB +{0x00,0x00,0x00,0x00,0x3F,0x3F,0x3F,0x3F}, // 0xDC +{0x04,0x04,0x04,0x00,0x04,0x04,0x04,0x00}, // 0xDD +{0x0C,0x00,0x0E,0x04,0x04,0x04,0x0E,0x00}, // 0xDE +{0x3F,0x3F,0x3F,0x3F,0x00,0x00,0x00,0x00}, // 0xDF +{0x06,0x0C,0x12,0x12,0x12,0x12,0x0C,0x00}, // 0xE0 +{0x00,0x1C,0x12,0x1C,0x12,0x12,0x1C,0x10}, // 0xE1 +{0x0E,0x0C,0x12,0x12,0x12,0x12,0x0C,0x00}, // 0xE2 +{0x18,0x0C,0x12,0x12,0x12,0x12,0x0C,0x00}, // 0xE3 +{0x0A,0x14,0x00,0x0C,0x12,0x12,0x0C,0x00}, // 0xE4 +{0x0A,0x14,0x0C,0x12,0x12,0x12,0x0C,0x00}, // 0xE5 +{0x00,0x00,0x12,0x12,0x12,0x1C,0x10,0x10}, // 0xE6 +{0x00,0x18,0x10,0x1C,0x12,0x1C,0x10,0x18}, // 0xE7 +{0x18,0x10,0x1C,0x12,0x12,0x1C,0x10,0x18}, // 0xE8 +{0x06,0x00,0x12,0x12,0x12,0x12,0x0C,0x00}, // 0xE9 +{0x0E,0x00,0x12,0x12,0x12,0x12,0x0C,0x00}, // 0xEA +{0x18,0x00,0x12,0x12,0x12,0x12,0x0C,0x00}, // 0xEB +{0x06,0x00,0x12,0x12,0x12,0x0E,0x04,0x18}, // 0xEC +{0x06,0x00,0x11,0x0A,0x04,0x04,0x04,0x00}, // 0xED +{0x00,0x0E,0x00,0x00,0x00,0x00,0x00,0x00}, // 0xEE +{0x0C,0x0C,0x08,0x00,0x00,0x00,0x00,0x00}, // 0xEF +{0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x00}, // 0xF0 +{0x00,0x04,0x0E,0x04,0x00,0x0E,0x00,0x00}, // 0xF1 +{0x00,0x00,0x1F,0x00,0x00,0x1F,0x00,0x00}, // 0xF2 +{0x30,0x1A,0x34,0x0B,0x15,0x07,0x01,0x00}, // 0xF3 +{0x0F,0x15,0x15,0x0D,0x05,0x05,0x05,0x00}, // 0xF4 +{0x0E,0x11,0x0C,0x0A,0x06,0x11,0x0E,0x00}, // 0xF5 +{0x00,0x04,0x00,0x1F,0x00,0x04,0x00,0x00}, // 0xF6 +{0x00,0x00,0x00,0x0E,0x06,0x00,0x00,0x00}, // 0xF7 +{0x0C,0x12,0x12,0x0C,0x00,0x00,0x00,0x00}, // 0xF8 +{0x00,0x00,0x00,0x0A,0x00,0x00,0x00,0x00}, // 0xF9 +{0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x00}, // 0xFA +{0x08,0x18,0x08,0x08,0x00,0x00,0x00,0x00}, // 0xFB +{0x1C,0x08,0x0C,0x18,0x00,0x00,0x00,0x00}, // 0xFC +{0x18,0x04,0x08,0x1C,0x00,0x00,0x00,0x00}, // 0xFD +{0x00,0x00,0x1E,0x1E,0x1E,0x1E,0x00,0x00}, // 0xFE +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00} // 0xFF +}; + +#endif \ No newline at end of file diff --git a/tasmota/xdsp_19_max7219_matrix.ino b/tasmota/xdsp_19_max7219_matrix.ino index da3177f59..bbd0a069d 100644 --- a/tasmota/xdsp_19_max7219_matrix.ino +++ b/tasmota/xdsp_19_max7219_matrix.ino @@ -175,31 +175,6 @@ bool MAX7291Matrix_init(void) return true; } -// /*********************************************************************************************\ -// * Clears the display -// * Command: DisplayText -// \*********************************************************************************************/ -bool MAX7291Matrix_Text() -{ - char sString[CMD_MAX_LEN + 1]; - subStr(sString, XdrvMailbox.data, ",", 1); - max7219_Matrix->clear(); - AddLog(LOG_LEVEL_DEBUG, PSTR("MTX: sString %s"), sString); - - // test - uint8_t length = strlen(sString); - //if(length > modulesPerRow) - length = modulesPerRow; - - for (int addr = 0; addr < length; addr++) - { - max7219_Matrix->setPixel(addr, addr, true); - AddLog(LOG_LEVEL_DEBUG, PSTR("MTX: setPixel() %d, %d)"), addr, addr); - } - - return true; -} - bool Xdsp19(uint8_t function) { bool result = false; @@ -216,7 +191,7 @@ bool Xdsp19(uint8_t function) result = true; break; case FUNC_DISPLAY_CLEAR: - result = max7219_Matrix->clear(); + result = max7219_Matrix->clearDisplay(); break; case FUNC_DISPLAY_DIM: result = max7219_Matrix->setIntensity(GetDisplayDimmer16()); @@ -232,12 +207,13 @@ bool Xdsp19(uint8_t function) case FUNC_DISPLAY_SCROLLTEXT: case FUNC_DISPLAY_CLOCK: case FUNC_DISPLAY_DRAW_STRING: - result = MAX7291Matrix_Text(); + result = max7219_Matrix->drawText(dsp_str); + break; + case FUNC_DISPLAY_EVERY_SECOND: + //result = max7219_Matrix->scrollText(); break; case FUNC_DISPLAY_EVERY_50_MSECOND: - case FUNC_DISPLAY_EVERY_SECOND: - // ignore - return false; + result = max7219_Matrix->scrollText(); default: result = false; } From c4a4bb0ff8ed1cae90237587cbcae0ba091295b8 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 23 Nov 2021 23:08:05 +0100 Subject: [PATCH 007/402] scroll works --- lib/lib_display/LedControl/src/LedMatrix.cpp | 11 +- lib/lib_display/LedControl/src/LedMatrix.h | 6 +- tasmota/tasmota_template.h | 1 + tasmota/xdsp_19_max7219_matrix.ino | 110 +++++++++++++++---- 4 files changed, 102 insertions(+), 26 deletions(-) diff --git a/lib/lib_display/LedControl/src/LedMatrix.cpp b/lib/lib_display/LedControl/src/LedMatrix.cpp index 19ac0dcb2..80ded02e2 100644 --- a/lib/lib_display/LedControl/src/LedMatrix.cpp +++ b/lib/lib_display/LedControl/src/LedMatrix.cpp @@ -62,6 +62,11 @@ LedMatrix::LedMatrix(int dataPin, int clkPin, int csPin, unsigned int colums, un setIntensity(7); } +void LedMatrix::power(bool on) +{ + shutdown(!on); // shut down on power off +} + bool LedMatrix::drawText( const char *str) { strncpy(textBuf, str, TEXT_BUFFER_SIZE -1); @@ -70,6 +75,7 @@ bool LedMatrix::drawText( const char *str) textWidth = strlen(textBuf) * charWidth; if(textWidth < displayWidth) { + clear(); textPosX = (displayWidth - textWidth) / 2; // center } else @@ -78,7 +84,6 @@ bool LedMatrix::drawText( const char *str) // Append a space between end of text and the beginning of the repeting text. appendSpace(); } - clear(); drawTextAt(textBuf, textPosX, textPosY); refresh(); // refresh display with new string content return true; @@ -102,7 +107,7 @@ bool LedMatrix::scrollText() if(textWidth < displayWidth) return false; // do not scroll when text fits into the display textPosX--; - if(textPosX + textWidth < 0) + if(textPosX + textWidth < (int)0) { textPosX = 0; // start from the beginning after text scrolled out of display; } @@ -255,7 +260,7 @@ void LedMatrix::refresh() void LedMatrix::refreshByteOfBuffer(int i) { int line = i / modulesPerRow; - int addr = line / 8 + i % modulesPerRow; + int addr = (line / 8) * modulesPerRow + i % modulesPerRow; byte b = buffer[i]; if (moduleOrientation == ORIENTATION_NORMAL || moduleOrientation == ORIENTATION_UPSIDE_DOWN) { diff --git a/lib/lib_display/LedControl/src/LedMatrix.h b/lib/lib_display/LedControl/src/LedMatrix.h index 586a06146..1d251030b 100644 --- a/lib/lib_display/LedControl/src/LedMatrix.h +++ b/lib/lib_display/LedControl/src/LedMatrix.h @@ -60,11 +60,11 @@ class LedMatrix ModuleOrientation moduleOrientation; byte buffer[MATRIX_BUFFER_SIZE]; LedControl* ledControl; - const unsigned int charWidth = 6; - const unsigned int charHeight = 8; + const int charWidth = 6; + const int charHeight = 8; char textBuf[TEXT_BUFFER_SIZE]; char appendTextBuf[TEXT_APPEND_BUFFER_SIZE]; - unsigned int textWidth; // width of text [pixel] + int textWidth; // width of text [pixel] int textPosX; // horizontal pixel position of scrolling text int textPosY; // vertical pixelposition of scrolling text; diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h index e3f3256fc..13fdf23e4 100644 --- a/tasmota/tasmota_template.h +++ b/tasmota/tasmota_template.h @@ -524,6 +524,7 @@ const uint16_t kGpioNiceList[] PROGMEM = { #ifdef USE_DISPLAY_MAX7219_MATRIX #undef USE_DISPLAY_MAX7219 #undef USE_DISPLAY_TM1637 + #define USE_DISPLAY_MODES1TO5 AGPIO(GPIO_MAX7219CLK), AGPIO(GPIO_MAX7219DIN), AGPIO(GPIO_MAX7219CS), diff --git a/tasmota/xdsp_19_max7219_matrix.ino b/tasmota/xdsp_19_max7219_matrix.ino index bbd0a069d..ec82420e2 100644 --- a/tasmota/xdsp_19_max7219_matrix.ino +++ b/tasmota/xdsp_19_max7219_matrix.ino @@ -131,16 +131,22 @@ and setting it to 3 alternates between time and date. \*********************************************************************************************/ #define XDSP_19 19 -#define CMD_MAX_LEN 55 +#include #include -LedMatrix *max7219_Matrix; -bool max2791Matrix_init_done = false; -byte modulesPerRow = 4; -byte modulesPerCol = 1; +LedMatrix *max7219_Matrix = nullptr; +bool max2791Matrix_initDriver_done = false; +struct +{ + byte modulesPerRow = 4; + byte modulesPerCol = 1; + bool show_clock = false; + const char* timeFormat; -bool MAX7291Matrix_init(void) +} LedMatrix_settings; + +bool MAX7291Matrix_initDriver(void) { if (!PinUsed(GPIO_MAX7219DIN) || !PinUsed(GPIO_MAX7219CLK) || !PinUsed(GPIO_MAX7219CS)) { @@ -151,27 +157,79 @@ bool MAX7291Matrix_init(void) Settings->display_model = XDSP_19; if (Settings->display_width) // [pixel] { - modulesPerRow = (Settings->display_width - 1) / 8 + 1; + LedMatrix_settings.modulesPerRow = (Settings->display_width - 1) / 8 + 1; } - Settings->display_width = 8 * modulesPerRow; + Settings->display_width = 8 * LedMatrix_settings.modulesPerRow; Settings->display_cols[0] = Settings->display_width; if (Settings->display_height) // [pixel] { - modulesPerCol = (Settings->display_height - 1) / 8 + 1; + LedMatrix_settings.modulesPerCol = (Settings->display_height - 1) / 8 + 1; } - Settings->display_height = 8 * modulesPerCol; + Settings->display_height = 8 * LedMatrix_settings. modulesPerCol; Settings->display_rows = Settings->display_height; Settings->display_cols[1] = Settings->display_height; - max7219_Matrix = new LedMatrix(Pin(GPIO_MAX7219DIN), Pin(GPIO_MAX7219CLK), Pin(GPIO_MAX7219CS), modulesPerRow, modulesPerCol); + max7219_Matrix = new LedMatrix(Pin(GPIO_MAX7219DIN), Pin(GPIO_MAX7219CLK), Pin(GPIO_MAX7219CS), LedMatrix_settings.modulesPerRow, LedMatrix_settings.modulesPerCol); + max2791Matrix_initDriver_done = true; + + return MAX7291Matrix_init(); +} + +bool MAX7291Matrix_init(void) +{ int intensity = GetDisplayDimmer16(); // 0..15 max7219_Matrix->setIntensity(intensity); int orientation = Settings->display_rotate; max7219_Matrix->setOrientation((LedMatrix::ModuleOrientation)orientation ); - AddLog(LOG_LEVEL_INFO, PSTR("DSP: MAX7291Matrix_init %dx%d modules, orientation: %d, intensity: %d"), modulesPerRow , modulesPerCol, orientation, intensity); - max2791Matrix_init_done = true; + AddLog(LOG_LEVEL_INFO, PSTR("MTX: MAX7291Matrix_init %dx%d modules, orientation: %d, intensity: %d"), LedMatrix_settings.modulesPerRow , LedMatrix_settings.modulesPerCol, orientation, intensity); - max7219_Matrix->test(); - AddLog(LOG_LEVEL_INFO, PSTR("DSP: display test")); + //max7219_Matrix->test(); + AddLog(LOG_LEVEL_INFO, PSTR("MTX: display test")); + return true; +} + +bool MAX7291Matrix_clock(void) +{ + LedMatrix_settings.show_clock = XdrvMailbox.payload; + if (ArgC() == 0) + XdrvMailbox.payload = 1; + if (XdrvMailbox.payload > 1) + { + LedMatrix_settings.timeFormat = "%H:%M"; + if(LedMatrix_settings.modulesPerRow > 6) + { + LedMatrix_settings.timeFormat = "%H:%M:%S"; + } + XdrvMailbox.payload = 2; + } + else + { + LedMatrix_settings.timeFormat = "%I:%M"; + if(LedMatrix_settings.modulesPerRow > 6) + { + LedMatrix_settings.timeFormat = "%I:%M:%S"; + } + XdrvMailbox.payload = 1; + } + + AddLog(LOG_LEVEL_DEBUG, PSTR("MTX: LedMatrix_settings.show_clock %d, timeFormat %s"), LedMatrix_settings.show_clock, LedMatrix_settings.timeFormat); + + //max7219_Matrix->clearDisplay(); + MAX7291Matrix_showTime(); + return true; +} + +bool MAX7291Matrix_showTime() +{ + time_t rawtime; + struct tm *timeinfo; + char timeStr[10]; + + time(&rawtime); + timeinfo = localtime(&rawtime); + strftime(timeStr, 10, LedMatrix_settings.timeFormat, timeinfo); + //AddLog(LOG_LEVEL_DEBUG, PSTR("MTX: showTime:%s"), timeStr); + + max7219_Matrix->drawText(timeStr); return true; } @@ -179,14 +237,20 @@ bool Xdsp19(uint8_t function) { bool result = false; - if (FUNC_DISPLAY_INIT_DRIVER == function) + if (FUNC_DISPLAY_INIT_DRIVER == function && !max2791Matrix_initDriver_done ) { - result = MAX7291Matrix_init(); + result = MAX7291Matrix_initDriver(); } - else if (max7219_Matrix && (XDSP_19 == Settings->display_model)) + else if (max2791Matrix_initDriver_done && max7219_Matrix && (XDSP_19 == Settings->display_model)) { switch (function) { + case FUNC_DISPLAY_INIT: + result = MAX7291Matrix_init(); + break; + case FUNC_DISPLAY_POWER: + max7219_Matrix->power(disp_power!=0); + break; case FUNC_DISPLAY_MODEL: result = true; break; @@ -196,6 +260,9 @@ bool Xdsp19(uint8_t function) case FUNC_DISPLAY_DIM: result = max7219_Matrix->setIntensity(GetDisplayDimmer16()); break; + case FUNC_DISPLAY_CLOCK: + result = MAX7291Matrix_clock(); + break; case FUNC_DISPLAY_SEVENSEG_TEXT: case FUNC_DISPLAY_SEVENSEG_TEXTNC: case FUNC_DISPLAY_NUMBER: @@ -205,12 +272,15 @@ bool Xdsp19(uint8_t function) case FUNC_DISPLAY_RAW: case FUNC_DISPLAY_LEVEL: case FUNC_DISPLAY_SCROLLTEXT: - case FUNC_DISPLAY_CLOCK: case FUNC_DISPLAY_DRAW_STRING: result = max7219_Matrix->drawText(dsp_str); break; case FUNC_DISPLAY_EVERY_SECOND: - //result = max7219_Matrix->scrollText(); + if (LedMatrix_settings.show_clock) + { + result = MAX7291Matrix_showTime(); + } + break; case FUNC_DISPLAY_EVERY_50_MSECOND: result = max7219_Matrix->scrollText(); From f2f6eba00989f03a403f5652d93746ab24adfd9d Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 24 Nov 2021 17:24:40 +0100 Subject: [PATCH 008/402] ready for ESP32 --- lib/lib_display/LedControl/src/LedMatrix.cpp | 119 +++----- lib/lib_display/LedControl/src/LedMatrix.h | 208 +++++++------- .../LedControl/src/font_5x8_horizontal_MSB.h | 3 + .../LedControl/src/font_6x8_horizontal_MSB.h | 3 + .../src/font_8x8_horizontal_latin_MSB.h | 265 ++++++++++++++++++ tasmota/tasmota_template.h | 1 - tasmota/xdsp_19_max7219_matrix.ino | 201 +++++++------ 7 files changed, 515 insertions(+), 285 deletions(-) create mode 100644 lib/lib_display/LedControl/src/font_8x8_horizontal_latin_MSB.h diff --git a/lib/lib_display/LedControl/src/LedMatrix.cpp b/lib/lib_display/LedControl/src/LedMatrix.cpp index 80ded02e2..b4fb8c260 100644 --- a/lib/lib_display/LedControl/src/LedMatrix.cpp +++ b/lib/lib_display/LedControl/src/LedMatrix.cpp @@ -1,5 +1,5 @@ /* - * LedMatrix.h - Extends the Library LedControl for multiple LED dot matrix modules, based on MAX7219/MAX7221 + * LedMatrix.h - Extends the Library LedControl for multiple 8x8 LED dot matrix modules, based on MAX7219/MAX7221 * Copyright (c) 2021 Michael Beuss * * Permission is hereby granted, free of charge, to any person @@ -25,7 +25,9 @@ */ #include "LedMatrix.h" +//#include "font_5x8_horizontal_MSB.h" #include "font_6x8_horizontal_MSB.h" +//#include "font_8x8_horizontal_latin_MSB.h" // public LedMatrix::LedMatrix(int dataPin, int clkPin, int csPin, unsigned int colums, unsigned int rows) @@ -44,13 +46,15 @@ LedMatrix::LedMatrix(int dataPin, int clkPin, int csPin, unsigned int colums, un } } + charWidth = font_char_width; // defined in header file of font + charHeight = font_char_height; // defined in header file of font modulesPerRow = colums; modulesPerCol = rows; displayWidth = colums * 8; displayHeight = rows * 8; modules = colums * rows; - moduleOrientation = ORIENTATION_UPSIDE_DOWN; - ledControl = new LedControl(dataPin, clkPin, csPin, modules); + moduleOrientation = ORIENTATION_UPSIDE_DOWN; // use setOrientation() to turn it + ledControl = new LedControl(dataPin, clkPin, csPin, modules); // initializes all connected LED matrix modules textBuf[0] = 0; textWidth = 0; textPosX = 0; @@ -62,11 +66,6 @@ LedMatrix::LedMatrix(int dataPin, int clkPin, int csPin, unsigned int colums, un setIntensity(7); } -void LedMatrix::power(bool on) -{ - shutdown(!on); // shut down on power off -} - bool LedMatrix::drawText( const char *str) { strncpy(textBuf, str, TEXT_BUFFER_SIZE -1); @@ -75,6 +74,7 @@ bool LedMatrix::drawText( const char *str) textWidth = strlen(textBuf) * charWidth; if(textWidth < displayWidth) { + // text fits into the display, place it into the center clear(); textPosX = (displayWidth - textWidth) / 2; // center } @@ -85,7 +85,7 @@ bool LedMatrix::drawText( const char *str) appendSpace(); } drawTextAt(textBuf, textPosX, textPosY); - refresh(); // refresh display with new string content + refresh(); // refresh display with the new drawed string content return true; } @@ -116,36 +116,16 @@ bool LedMatrix::scrollText() int startOfRepeatingTextPos = textPosX + textWidth; if(startOfRepeatingTextPos < displayWidth) { - // Draw repeating text. + // draw repeating text drawTextAt(textBuf, startOfRepeatingTextPos, textPosY); } refresh(); return true; } -bool LedMatrix::drawCharAt( char c, const int x, const int y) +void LedMatrix::power(bool on) { - // ignore when the character position is not visible on the display - bool visible = ( - x > 0 - (int)charWidth && x < (int)displayWidth && - y > 0 - (int)charHeight && y < (int)displayHeight - ); - if (!visible) return false; - - // ignore the leading bits above charWidth of the font definition - static const byte charOffset = 8 - charWidth; - - for (byte charY = 0; charY < charHeight; charY++) - { - char pixelRow = (font[c][charY]) << charOffset; // skip the first bits when the character width is smaller than 8 pixel - for (byte charX = 0; charX < charWidth; charX++) - { - bool pixel = (pixelRow & 0x80); // pixel=true when upper bit is set - setPixel(x + charX, y + charY, pixel); - pixelRow = pixelRow << 1; // next pixel - } - } - return true; + shutdown(!on); // power(false) shuts down the display with shutdown(true) } bool LedMatrix::clearDisplay(void) @@ -157,17 +137,6 @@ bool LedMatrix::clearDisplay(void) return true; } - -bool LedMatrix::clear(void) -{ - memset(buffer, 0, MATRIX_BUFFER_SIZE); - for (int addr = 0; addr < modules; addr++) - { - ledControl->clearDisplay(addr); - } - return true; -} - bool LedMatrix::setIntensity(byte dim) { for (int addr = 0; addr < modules; addr++) @@ -208,38 +177,40 @@ bool LedMatrix::setPixel(const int x, const int y, bool on) return true; } -void LedMatrix::test() +void LedMatrix::refresh() { - /* - const static byte testMatrix[] PROGMEM = { - B00000010, B00111100, B00111100, B00001000, - B00000110, B01000010, B01000010, B00010000, - B00001010, B00000010, B00000010, B00100000, - B00000010, B00000100, B00001100, B01000100, - B00000010, B00011000, B00000010, B01111110, - B00000010, B00100000, B01000010, B00000100, - B00000000, B01111110, B00111100, B00000100, - B00000000, B00000000, B00000000, B00000000, - }; - for (int i = 0; i < 32; i++) + for (int i = 0; i < modulesPerRow * displayHeight; i++) { - buffer[i] = testMatrix[i]; + refreshByteOfBuffer(i); } - refresh(); - */ - drawText("1234567890"); - delay(1000); - for( int i=0; i<320; i++) - { - delay(50); - scrollText(); - } - //drawCharAt(0x31, 1, 0); - //setPixel(1,30); - //refresh(); } -// private +// private functions +bool LedMatrix::drawCharAt( char c, const int x, const int y) +{ + // ignore when the character position is not visible on the display + bool visible = ( + x > 0 - (int)charWidth && x < (int)displayWidth && + y > 0 - (int)charHeight && y < (int)displayHeight + ); + if (!visible) return false; + + // ignore the leading bits above charWidth of the font definition + static const byte charOffset = 8 - charWidth; + + for (byte charY = 0; charY < charHeight; charY++) + { + char pixelRow = (font[c][charY]) << charOffset; // skip the first bits when the character width is smaller than 8 pixel + for (byte charX = 0; charX < charWidth; charX++) + { + bool pixel = (pixelRow & 0x80); // pixel=true when upper bit is set + setPixel(x + charX, y + charY, pixel); + pixelRow = pixelRow << 1; // next pixel + } + } + return true; +} + bool LedMatrix::shutdown(bool b) { for (int addr = 0; addr < modules; addr++) @@ -249,12 +220,14 @@ bool LedMatrix::shutdown(bool b) return true; } -void LedMatrix::refresh() +bool LedMatrix::clear(void) { - for (int i = 0; i < modulesPerRow * displayHeight; i++) + memset(buffer, 0, MATRIX_BUFFER_SIZE); + for (int addr = 0; addr < modules; addr++) { - refreshByteOfBuffer(i); + ledControl->clearDisplay(addr); } + return true; } void LedMatrix::refreshByteOfBuffer(int i) diff --git a/lib/lib_display/LedControl/src/LedMatrix.h b/lib/lib_display/LedControl/src/LedMatrix.h index 1d251030b..efb50b8e3 100644 --- a/lib/lib_display/LedControl/src/LedMatrix.h +++ b/lib/lib_display/LedControl/src/LedMatrix.h @@ -1,5 +1,5 @@ /* - * LedMatrix.h - Extends the Library LedControl for multiple LED dot matrix modules, based on MAX7219/MAX7221 + * LedMatrix.h - Extends the Library LedControl for multiple 8x8 LED dot matrix modules, based on MAX7219/MAX7221 * Copyright (c) 2021 Michael Beuss * * Permission is hereby granted, free of charge, to any person @@ -29,21 +29,21 @@ #include -#define MATRIX_MAX_MODULES 32 +#define MATRIX_MAX_MODULES 32 // maximum number of modules that can be used #define MATRIX_BUFFER_SIZE MATRIX_MAX_MODULES * 8 // 8 bytes per modul. One byte represents 8 LEDs. -#define TEXT_BUFFER_SIZE 256 -#define TEXT_APPEND_BUFFER_SIZE 16 +#define TEXT_BUFFER_SIZE 256 // maximum text length that can be scrolled +#define TEXT_APPEND_BUFFER_SIZE 16 // used for characters that are appended to the scroll text, before it repeats /** * @brief LedMatric controls multiple 8x8 LED dot matrx modules. - * All modules in rows and clolums together build a common matrix. + * All modules in rows and clolums together build a common display pixel matrix. * */ class LedMatrix { public: - enum ModuleOrientation // orientation of 8x8 LED dot matrix mdules (first module is top left) + enum ModuleOrientation // orientation of 8x8 LED dot matrix mdules (first module starts at top left) { ORIENTATION_NORMAL, // first pixel is on top left, no turn is necessary ORIENTATION_TURN_RIGHT, // first pixel is on bottom left, for correction it has to turn 90° right @@ -51,6 +51,100 @@ class LedMatrix ORIENTATION_TURN_LEFT, // first pixel is on top right, for correction is has to turn 90° left. }; + public: + /** + * @brief Construct a new LED Matrix object + * + * @param colums of 8x8 LED dot matrix modules + * @param rows of 8x8 LED dot matrix modules + */ + LedMatrix(int dataPin, int clkPin, int csPin, unsigned int colums, unsigned int rows); + + /** + * @brief Draws a string to the display. + * When the text fits into the display, it will be shown in the center. + * When the text is longer than than the display width, it can be scrolled per pixel with function scrollText(). + * + * @param str string to display + */ + bool drawText( const char *str ); + + /** + * @brief Dwaws a character string to a defined display position. The position (x,y) is used for the upper left pixel of the text. + * Existing text before the x position will not be cleared. Use refresh() after all text parts are drawed. + * + * @param str string to display + * @param x horizantal pixel position to start with string (0 is most left) + * @param y vertical pixel position for the top position of the string (0 is top) + */ + bool drawTextAt( const char *str, const int x, const int y ); + + /** + * @brief Scroll the current text one pixel to the left. + * Repeat with from start when end of text reached. This function can be called every 50 ms to get a propper scroll speed. + * + */ + bool scrollText(); + + /** + * @brief switches the display on or off + * + * @param on true: on false: off + */ + + void power( bool on ); + + /** + * @brief cleares the display and text buffer + * + */ + bool clearDisplay(void); + + /** + * @brief Set the brightness of the display + * + * @param dim 0..15 (0: dark .. 15: light) + */ + bool setIntensity(byte dim); + + /** + * @brief Set the orientation of the 8x8 LED dot matrix module + * + * @param orientation + */ + bool setOrientation(ModuleOrientation orientation); + + /** + * @brief Set ap pixel at a defined position. + * After all Pixels are set, call refresh() to send it to the display. + * + * @param x horizontal position from left + * @param y vertical position from top + * @param on true: on, false: off + */ + + /** + * @brief Set the a pending string to the scrolling text to set a distance to the repeating text. Usually some spaces are used. + * + * @param append text to append to the scrolling text before repeating. + */ + bool setScrollAppendText(const char* append ); + + bool setPixel( const int x, const int y, bool on=true); + /** + * @brief sends the changed content of the buffer to the display + * + */ + void refresh(); + + private: + bool drawCharAt( char c, int x, int y ); // Draws a character to a defined position + bool shutdown(bool b); // shutdown(true) switches the display off. Text and pixels can be set while it is off. shutdown(false) switches the display on. + bool clear(void); // clears the display content + void refreshByteOfBuffer( int i); // sends one byte of the buffer to the display. This updates an 8 pixel row of one matrix module. + byte revereBitorder(byte b); // returnes the byte in the reverse bit order. + void appendSpace(); // appends characters to the end of the text to get a distance to the repeating scroll text + private: unsigned int modulesPerRow; unsigned int modulesPerCol; @@ -60,112 +154,14 @@ class LedMatrix ModuleOrientation moduleOrientation; byte buffer[MATRIX_BUFFER_SIZE]; LedControl* ledControl; - const int charWidth = 6; - const int charHeight = 8; + int charWidth; + int charHeight; char textBuf[TEXT_BUFFER_SIZE]; char appendTextBuf[TEXT_APPEND_BUFFER_SIZE]; int textWidth; // width of text [pixel] int textPosX; // horizontal pixel position of scrolling text int textPosY; // vertical pixelposition of scrolling text; - - public: - /** - * @brief Construct a new Led Matrix object - * - * @param colums of 8x8 LED dot matrix modules - * @param rows of 8x8 LED dot matrix modules - */ - LedMatrix(int dataPin, int clkPin, int csPin, unsigned int colums, unsigned int rows); - - /** - * @brief Set all LEDs off. - * - */ - bool clearDisplay(void); - - /** - * @brief Set the brightness of the display - * - * @param dim 0..15 - */ - bool setIntensity(byte dim); - - /** - * @brief Set the a pending string to the scrolling text to set a distance to te repeating text. Usually some spaces. - * - * @param append text to append to the scrolling text before repeating. - */ - bool setScrollAppendText(const char* append ); - - /** - * @brief Switches the display on or off - * - * @param on true: on false: off - */ - void power( bool on ); - - /** - * @brief Set the orientation of the 8x8 LED dot matrix module - * - * @param orientation - */ - bool setOrientation(ModuleOrientation orientation); - - /** - * @brief draw a string to the display. - * When the text fits into the size of the display, it will be shown in the center. - * When the text is longer than than the display width, it can be scrolled per pixel with function scrollText(). - * - * @param str string to display - */ - bool drawText( const char *str ); - - /** - * @brief dwaws a character string to the display. The position (x,y) is used for the upper left pixtel of the text. - * Existing text before the x position will not be cleared. - * - * @param str string to display - * @param x horizantal pixel position to start with string (default 0) - * @param y vertical pixel position for the top position of the string (default 0) - */ - bool drawTextAt( const char *str, const int x, const int y ); - - /** - * @brief Scroll the current teext one picel to the left. - * Repeat with from start when end of text reached. - * - */ - bool scrollText(); - - /** - * @brief Set the Pixel object - * - * @param x horizontal position from left - * @param y vertical position from top - * @param on true: on, false: off - */ - bool setPixel( const int x, const int y, bool on=true); - void test(); - - private: - bool drawCharAt( char c, int x, int y ); - - bool shutdown(bool b); - bool clear(void); - - /** - * @brief sends the changed content of the buffer to the display - * - */ - void refresh(); - - void refreshByteOfBuffer( int i); - - byte revereBitorder (byte b); - - void appendSpace(); - }; #endif //LedMatrix_h \ No newline at end of file diff --git a/lib/lib_display/LedControl/src/font_5x8_horizontal_MSB.h b/lib/lib_display/LedControl/src/font_5x8_horizontal_MSB.h index 56df774a4..da3becc4e 100644 --- a/lib/lib_display/LedControl/src/font_5x8_horizontal_MSB.h +++ b/lib/lib_display/LedControl/src/font_5x8_horizontal_MSB.h @@ -2,6 +2,9 @@ #ifndef font_5x8_horizontal_MSB_h #define font_5x8_horizontal_MSB_h +const unsigned int font_char_width = 5; +const unsigned int font_char_height = 8; + const char font[256][8]={ {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x00 {0x0E,0x11,0x1B,0x11,0x1F,0x0E,0x00,0x00}, // 0x01 diff --git a/lib/lib_display/LedControl/src/font_6x8_horizontal_MSB.h b/lib/lib_display/LedControl/src/font_6x8_horizontal_MSB.h index cc3a323cc..e5c522cd4 100644 --- a/lib/lib_display/LedControl/src/font_6x8_horizontal_MSB.h +++ b/lib/lib_display/LedControl/src/font_6x8_horizontal_MSB.h @@ -2,6 +2,9 @@ #ifndef font_6x8_horizontal_MSB_h #define font_6x8_horizontal_MSB_h +const unsigned int font_char_width = 6; +const unsigned int font_char_height = 8; + const char font[256][8]={ {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x00 {0x0E,0x11,0x1B,0x11,0x15,0x11,0x0E,0x00}, // 0x01 diff --git a/lib/lib_display/LedControl/src/font_8x8_horizontal_latin_MSB.h b/lib/lib_display/LedControl/src/font_8x8_horizontal_latin_MSB.h new file mode 100644 index 000000000..e1a8af7ae --- /dev/null +++ b/lib/lib_display/LedControl/src/font_8x8_horizontal_latin_MSB.h @@ -0,0 +1,265 @@ +#ifndef font_8x8_horizontal_latin_MSB_h +#define font_8x8_horizontal_latin_MSB_h + +const unsigned int font_char_width = 8; +const unsigned int font_char_height = 8; + +const char font[256][8]={ +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x00 +{0x0E,0x11,0x1B,0x11,0x15,0x11,0x0E,0x00}, // 0x01 +{0x0E,0x1F,0x15,0x1F,0x11,0x1F,0x0E,0x00}, // 0x02 +{0x00,0x0A,0x1F,0x1F,0x1F,0x0E,0x04,0x00}, // 0x03 +{0x00,0x04,0x0E,0x1F,0x1F,0x0E,0x04,0x00}, // 0x04 +{0x04,0x0E,0x0E,0x04,0x1F,0x1F,0x04,0x00}, // 0x05 +{0x00,0x04,0x0E,0x1F,0x1F,0x04,0x0E,0x00}, // 0x06 +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x07 +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x08 +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x09 +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x0A +{0x00,0x07,0x03,0x0D,0x12,0x12,0x0C,0x00}, // 0x0B +{0x0E,0x11,0x11,0x0E,0x04,0x0E,0x04,0x00}, // 0x0C +{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x0D +{0x03,0x0D,0x0B,0x0D,0x0B,0x1B,0x18,0x00}, // 0x0E +{0x00,0x15,0x0E,0x1B,0x0E,0x15,0x00,0x00}, // 0x0F +{0x08,0x0C,0x0E,0x0F,0x0E,0x0C,0x08,0x00}, // 0x10 +{0x02,0x06,0x0E,0x1E,0x0E,0x06,0x02,0x00}, // 0x11 +{0x04,0x0E,0x1F,0x04,0x1F,0x0E,0x04,0x00}, // 0x12 +{0x0A,0x0A,0x0A,0x0A,0x0A,0x00,0x0A,0x00}, // 0x13 +{0x0F,0x15,0x15,0x0D,0x05,0x05,0x05,0x00}, // 0x14 +{0x0E,0x11,0x0C,0x0A,0x06,0x11,0x0E,0x00}, // 0x15 +{0x00,0x00,0x00,0x00,0x00,0x1E,0x1E,0x00}, // 0x16 +{0x04,0x0E,0x1F,0x04,0x1F,0x0E,0x04,0x0E}, // 0x17 +{0x04,0x0E,0x1F,0x04,0x04,0x04,0x04,0x00}, // 0x18 +{0x04,0x04,0x04,0x04,0x1F,0x0E,0x04,0x00}, // 0x19 +{0x00,0x04,0x06,0x1F,0x06,0x04,0x00,0x00}, // 0x1A +{0x00,0x04,0x0C,0x1F,0x0C,0x04,0x00,0x00}, // 0x1B +{0x00,0x00,0x00,0x10,0x10,0x10,0x1F,0x00}, // 0x1C +{0x00,0x0A,0x0A,0x1F,0x0A,0x0A,0x00,0x00}, // 0x1D +{0x04,0x04,0x0E,0x0E,0x1F,0x1F,0x00,0x00}, // 0x1E +{0x1F,0x1F,0x0E,0x0E,0x04,0x04,0x00,0x00}, // 0x1F + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0020 (space) + { 0x18, 0x3C, 0x3C, 0x18, 0x18, 0x00, 0x18, 0x00}, // U+0021 (!) + { 0x36, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0022 (") + { 0x36, 0x36, 0x7F, 0x36, 0x7F, 0x36, 0x36, 0x00}, // U+0023 (#) + { 0x0C, 0x3E, 0x03, 0x1E, 0x30, 0x1F, 0x0C, 0x00}, // U+0024 ($) + { 0x00, 0x63, 0x33, 0x18, 0x0C, 0x66, 0x63, 0x00}, // U+0025 (%) + { 0x1C, 0x36, 0x1C, 0x6E, 0x3B, 0x33, 0x6E, 0x00}, // U+0026 (&) + { 0x06, 0x06, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0027 (') + { 0x18, 0x0C, 0x06, 0x06, 0x06, 0x0C, 0x18, 0x00}, // U+0028 (() + { 0x06, 0x0C, 0x18, 0x18, 0x18, 0x0C, 0x06, 0x00}, // U+0029 ()) + { 0x00, 0x66, 0x3C, 0xFF, 0x3C, 0x66, 0x00, 0x00}, // U+002A (*) + { 0x00, 0x0C, 0x0C, 0x3F, 0x0C, 0x0C, 0x00, 0x00}, // U+002B (+) + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x0C, 0x06}, // U+002C (,) + { 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00}, // U+002D (-) + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x0C, 0x00}, // U+002E (.) + { 0x60, 0x30, 0x18, 0x0C, 0x06, 0x03, 0x01, 0x00}, // U+002F (/) + { 0x3E, 0x63, 0x73, 0x7B, 0x6F, 0x67, 0x3E, 0x00}, // U+0030 (0) + { 0x0C, 0x0E, 0x0C, 0x0C, 0x0C, 0x0C, 0x3F, 0x00}, // U+0031 (1) + { 0x1E, 0x33, 0x30, 0x1C, 0x06, 0x33, 0x3F, 0x00}, // U+0032 (2) + { 0x1E, 0x33, 0x30, 0x1C, 0x30, 0x33, 0x1E, 0x00}, // U+0033 (3) + { 0x38, 0x3C, 0x36, 0x33, 0x7F, 0x30, 0x78, 0x00}, // U+0034 (4) + { 0x3F, 0x03, 0x1F, 0x30, 0x30, 0x33, 0x1E, 0x00}, // U+0035 (5) + { 0x1C, 0x06, 0x03, 0x1F, 0x33, 0x33, 0x1E, 0x00}, // U+0036 (6) + { 0x3F, 0x33, 0x30, 0x18, 0x0C, 0x0C, 0x0C, 0x00}, // U+0037 (7) + { 0x1E, 0x33, 0x33, 0x1E, 0x33, 0x33, 0x1E, 0x00}, // U+0038 (8) + { 0x1E, 0x33, 0x33, 0x3E, 0x30, 0x18, 0x0E, 0x00}, // U+0039 (9) + { 0x00, 0x0C, 0x0C, 0x00, 0x00, 0x0C, 0x0C, 0x00}, // U+003A (:) + { 0x00, 0x0C, 0x0C, 0x00, 0x00, 0x0C, 0x0C, 0x06}, // U+003B (;) + { 0x18, 0x0C, 0x06, 0x03, 0x06, 0x0C, 0x18, 0x00}, // U+003C (<) + { 0x00, 0x00, 0x3F, 0x00, 0x00, 0x3F, 0x00, 0x00}, // U+003D (=) + { 0x06, 0x0C, 0x18, 0x30, 0x18, 0x0C, 0x06, 0x00}, // U+003E (>) + { 0x1E, 0x33, 0x30, 0x18, 0x0C, 0x00, 0x0C, 0x00}, // U+003F (?) + { 0x3E, 0x63, 0x7B, 0x7B, 0x7B, 0x03, 0x1E, 0x00}, // U+0040 (@) + { 0x0C, 0x1E, 0x33, 0x33, 0x3F, 0x33, 0x33, 0x00}, // U+0041 (A) + { 0x3F, 0x66, 0x66, 0x3E, 0x66, 0x66, 0x3F, 0x00}, // U+0042 (B) + { 0x3C, 0x66, 0x03, 0x03, 0x03, 0x66, 0x3C, 0x00}, // U+0043 (C) + { 0x1F, 0x36, 0x66, 0x66, 0x66, 0x36, 0x1F, 0x00}, // U+0044 (D) + { 0x7F, 0x46, 0x16, 0x1E, 0x16, 0x46, 0x7F, 0x00}, // U+0045 (E) + { 0x7F, 0x46, 0x16, 0x1E, 0x16, 0x06, 0x0F, 0x00}, // U+0046 (F) + { 0x3C, 0x66, 0x03, 0x03, 0x73, 0x66, 0x7C, 0x00}, // U+0047 (G) + { 0x33, 0x33, 0x33, 0x3F, 0x33, 0x33, 0x33, 0x00}, // U+0048 (H) + { 0x1E, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x1E, 0x00}, // U+0049 (I) + { 0x78, 0x30, 0x30, 0x30, 0x33, 0x33, 0x1E, 0x00}, // U+004A (J) + { 0x67, 0x66, 0x36, 0x1E, 0x36, 0x66, 0x67, 0x00}, // U+004B (K) + { 0x0F, 0x06, 0x06, 0x06, 0x46, 0x66, 0x7F, 0x00}, // U+004C (L) + { 0x63, 0x77, 0x7F, 0x7F, 0x6B, 0x63, 0x63, 0x00}, // U+004D (M) + { 0x63, 0x67, 0x6F, 0x7B, 0x73, 0x63, 0x63, 0x00}, // U+004E (N) + { 0x1C, 0x36, 0x63, 0x63, 0x63, 0x36, 0x1C, 0x00}, // U+004F (O) + { 0x3F, 0x66, 0x66, 0x3E, 0x06, 0x06, 0x0F, 0x00}, // U+0050 (P) + { 0x1E, 0x33, 0x33, 0x33, 0x3B, 0x1E, 0x38, 0x00}, // U+0051 (Q) + { 0x3F, 0x66, 0x66, 0x3E, 0x36, 0x66, 0x67, 0x00}, // U+0052 (R) + { 0x1E, 0x33, 0x07, 0x0E, 0x38, 0x33, 0x1E, 0x00}, // U+0053 (S) + { 0x3F, 0x2D, 0x0C, 0x0C, 0x0C, 0x0C, 0x1E, 0x00}, // U+0054 (T) + { 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x3F, 0x00}, // U+0055 (U) + { 0x33, 0x33, 0x33, 0x33, 0x33, 0x1E, 0x0C, 0x00}, // U+0056 (V) + { 0x63, 0x63, 0x63, 0x6B, 0x7F, 0x77, 0x63, 0x00}, // U+0057 (W) + { 0x63, 0x63, 0x36, 0x1C, 0x1C, 0x36, 0x63, 0x00}, // U+0058 (X) + { 0x33, 0x33, 0x33, 0x1E, 0x0C, 0x0C, 0x1E, 0x00}, // U+0059 (Y) + { 0x7F, 0x63, 0x31, 0x18, 0x4C, 0x66, 0x7F, 0x00}, // U+005A (Z) + { 0x1E, 0x06, 0x06, 0x06, 0x06, 0x06, 0x1E, 0x00}, // U+005B ([) + { 0x03, 0x06, 0x0C, 0x18, 0x30, 0x60, 0x40, 0x00}, // U+005C (\) + { 0x1E, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1E, 0x00}, // U+005D (]) + { 0x08, 0x1C, 0x36, 0x63, 0x00, 0x00, 0x00, 0x00}, // U+005E (^) + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF}, // U+005F (_) + { 0x0C, 0x0C, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0060 (`) + { 0x00, 0x00, 0x1E, 0x30, 0x3E, 0x33, 0x6E, 0x00}, // U+0061 (a) + { 0x07, 0x06, 0x06, 0x3E, 0x66, 0x66, 0x3B, 0x00}, // U+0062 (b) + { 0x00, 0x00, 0x1E, 0x33, 0x03, 0x33, 0x1E, 0x00}, // U+0063 (c) + { 0x38, 0x30, 0x30, 0x3e, 0x33, 0x33, 0x6E, 0x00}, // U+0064 (d) + { 0x00, 0x00, 0x1E, 0x33, 0x3f, 0x03, 0x1E, 0x00}, // U+0065 (e) + { 0x1C, 0x36, 0x06, 0x0f, 0x06, 0x06, 0x0F, 0x00}, // U+0066 (f) + { 0x00, 0x00, 0x6E, 0x33, 0x33, 0x3E, 0x30, 0x1F}, // U+0067 (g) + { 0x07, 0x06, 0x36, 0x6E, 0x66, 0x66, 0x67, 0x00}, // U+0068 (h) + { 0x0C, 0x00, 0x0E, 0x0C, 0x0C, 0x0C, 0x1E, 0x00}, // U+0069 (i) + { 0x30, 0x00, 0x30, 0x30, 0x30, 0x33, 0x33, 0x1E}, // U+006A (j) + { 0x07, 0x06, 0x66, 0x36, 0x1E, 0x36, 0x67, 0x00}, // U+006B (k) + { 0x0E, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x1E, 0x00}, // U+006C (l) + { 0x00, 0x00, 0x33, 0x7F, 0x7F, 0x6B, 0x63, 0x00}, // U+006D (m) + { 0x00, 0x00, 0x1F, 0x33, 0x33, 0x33, 0x33, 0x00}, // U+006E (n) + { 0x00, 0x00, 0x1E, 0x33, 0x33, 0x33, 0x1E, 0x00}, // U+006F (o) + { 0x00, 0x00, 0x3B, 0x66, 0x66, 0x3E, 0x06, 0x0F}, // U+0070 (p) + { 0x00, 0x00, 0x6E, 0x33, 0x33, 0x3E, 0x30, 0x78}, // U+0071 (q) + { 0x00, 0x00, 0x3B, 0x6E, 0x66, 0x06, 0x0F, 0x00}, // U+0072 (r) + { 0x00, 0x00, 0x3E, 0x03, 0x1E, 0x30, 0x1F, 0x00}, // U+0073 (s) + { 0x08, 0x0C, 0x3E, 0x0C, 0x0C, 0x2C, 0x18, 0x00}, // U+0074 (t) + { 0x00, 0x00, 0x33, 0x33, 0x33, 0x33, 0x6E, 0x00}, // U+0075 (u) + { 0x00, 0x00, 0x33, 0x33, 0x33, 0x1E, 0x0C, 0x00}, // U+0076 (v) + { 0x00, 0x00, 0x63, 0x6B, 0x7F, 0x7F, 0x36, 0x00}, // U+0077 (w) + { 0x00, 0x00, 0x63, 0x36, 0x1C, 0x36, 0x63, 0x00}, // U+0078 (x) + { 0x00, 0x00, 0x33, 0x33, 0x33, 0x3E, 0x30, 0x1F}, // U+0079 (y) + { 0x00, 0x00, 0x3F, 0x19, 0x0C, 0x26, 0x3F, 0x00}, // U+007A (z) + { 0x38, 0x0C, 0x0C, 0x07, 0x0C, 0x0C, 0x38, 0x00}, // U+007B ({) + { 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x00}, // U+007C (|) + { 0x07, 0x0C, 0x0C, 0x38, 0x0C, 0x0C, 0x07, 0x00}, // U+007D (}) + { 0x6E, 0x3B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+007E (~) + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+007F{0x0E,0x11,0x10,0x10,0x11,0x0E,0x04,0x0C}, // 0x80 +{0x12,0x00,0x12,0x12,0x12,0x16,0x0A,0x00}, // 0x81 +{0x03,0x00,0x0E,0x11,0x1E,0x10,0x0E,0x00}, // 0x82 +{0x0E,0x00,0x0E,0x01,0x0F,0x11,0x0F,0x00}, // 0x83 +{0x0A,0x00,0x0E,0x01,0x0F,0x11,0x0F,0x00}, // 0x84 +{0x0C,0x00,0x0E,0x01,0x0F,0x11,0x0F,0x00}, // 0x85 +{0x0E,0x0A,0x0E,0x01,0x0F,0x11,0x0F,0x00}, // 0x86 +{0x00,0x0E,0x11,0x10,0x11,0x0E,0x04,0x0C}, // 0x87 +{0x0E,0x00,0x0E,0x11,0x1E,0x10,0x0E,0x00}, // 0x88 +{0x0A,0x00,0x0E,0x11,0x1E,0x10,0x0E,0x00}, // 0x89 +{0x0C,0x00,0x0E,0x11,0x1E,0x10,0x0E,0x00}, // 0x8A +{0x0A,0x00,0x04,0x04,0x04,0x04,0x06,0x00}, // 0x8B +{0x0E,0x00,0x04,0x04,0x04,0x04,0x06,0x00}, // 0x8C +{0x08,0x00,0x04,0x04,0x04,0x04,0x06,0x00}, // 0x8D +{0x0A,0x00,0x04,0x0A,0x11,0x1F,0x11,0x00}, // 0x8E +{0x0E,0x0A,0x0E,0x1B,0x11,0x1F,0x11,0x00}, // 0x8F +{0x03,0x00,0x1F,0x10,0x1E,0x10,0x1F,0x00}, // 0x90 +{0x00,0x00,0x1E,0x05,0x1F,0x14,0x0F,0x00}, // 0x91 +{0x0F,0x14,0x14,0x1F,0x14,0x14,0x17,0x00}, // 0x92 +{0x0E,0x00,0x0C,0x12,0x12,0x12,0x0C,0x00}, // 0x93 +{0x0A,0x00,0x0C,0x12,0x12,0x12,0x0C,0x00}, // 0x94 +{0x18,0x00,0x0C,0x12,0x12,0x12,0x0C,0x00}, // 0x95 +{0x0E,0x00,0x12,0x12,0x12,0x16,0x0A,0x00}, // 0x96 +{0x18,0x00,0x12,0x12,0x12,0x16,0x0A,0x00}, // 0x97 +{0x0A,0x00,0x12,0x12,0x12,0x0E,0x04,0x18}, // 0x98 +{0x12,0x0C,0x12,0x12,0x12,0x12,0x0C,0x00}, // 0x99 +{0x0A,0x00,0x12,0x12,0x12,0x12,0x0C,0x00}, // 0x9A +{0x00,0x00,0x01,0x0E,0x16,0x1A,0x1C,0x20}, // 0x9B +{0x06,0x09,0x08,0x1E,0x08,0x09,0x17,0x00}, // 0x9C +{0x0F,0x13,0x15,0x15,0x15,0x19,0x1E,0x00}, // 0x9D +{0x00,0x11,0x0A,0x04,0x0A,0x11,0x00,0x00}, // 0x9E +{0x02,0x05,0x04,0x0E,0x04,0x04,0x14,0x08}, // 0x9F + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+00A0 (no break space) + { 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x18, 0x00}, // U+00A1 (inverted !) + { 0x18, 0x18, 0x7E, 0x03, 0x03, 0x7E, 0x18, 0x18}, // U+00A2 (dollarcents) + { 0x1C, 0x36, 0x26, 0x0F, 0x06, 0x67, 0x3F, 0x00}, // U+00A3 (pound sterling) + { 0x00, 0x00, 0x63, 0x3E, 0x36, 0x3E, 0x63, 0x00}, // U+00A4 (currency mark) + { 0x33, 0x33, 0x1E, 0x3F, 0x0C, 0x3F, 0x0C, 0x0C}, // U+00A5 (yen) + { 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x00}, // U+00A6 (broken pipe) + { 0x7C, 0xC6, 0x1C, 0x36, 0x36, 0x1C, 0x33, 0x1E}, // U+00A7 (paragraph) + { 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+00A8 (diaeresis) + { 0x3C, 0x42, 0x99, 0x85, 0x85, 0x99, 0x42, 0x3C}, // U+00A9 (copyright symbol) + { 0x3C, 0x36, 0x36, 0x7C, 0x00, 0x00, 0x00, 0x00}, // U+00AA (superscript a) + { 0x00, 0xCC, 0x66, 0x33, 0x66, 0xCC, 0x00, 0x00}, // U+00AB (<<) + { 0x00, 0x00, 0x00, 0x3F, 0x30, 0x30, 0x00, 0x00}, // U+00AC (gun pointing left) + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+00AD (soft hyphen) + { 0x3C, 0x42, 0x9D, 0xA5, 0x9D, 0xA5, 0x42, 0x3C}, // U+00AE (registered symbol) + { 0x7E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+00AF (macron) + { 0x1C, 0x36, 0x36, 0x1C, 0x00, 0x00, 0x00, 0x00}, // U+00B0 (degree) + { 0x18, 0x18, 0x7E, 0x18, 0x18, 0x00, 0x7E, 0x00}, // U+00B1 (plusminus) + { 0x1C, 0x30, 0x18, 0x0C, 0x3C, 0x00, 0x00, 0x00}, // U+00B2 (superscript 2) + { 0x1C, 0x30, 0x18, 0x30, 0x1C, 0x00, 0x00, 0x00}, // U+00B2 (superscript 3) + { 0x18, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+00B2 (aigu) + { 0x00, 0x00, 0x66, 0x66, 0x66, 0x3E, 0x06, 0x03}, // U+00B5 (mu) + { 0xFE, 0xDB, 0xDB, 0xDE, 0xD8, 0xD8, 0xD8, 0x00}, // U+00B6 (pilcrow) + { 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00}, // U+00B7 (central dot) + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x1E}, // U+00B8 (cedille) + { 0x08, 0x0C, 0x08, 0x1C, 0x00, 0x00, 0x00, 0x00}, // U+00B9 (superscript 1) + { 0x1C, 0x36, 0x36, 0x1C, 0x00, 0x00, 0x00, 0x00}, // U+00BA (superscript 0) + { 0x00, 0x33, 0x66, 0xCC, 0x66, 0x33, 0x00, 0x00}, // U+00BB (>>) + { 0xC3, 0x63, 0x33, 0xBD, 0xEC, 0xF6, 0xF3, 0x03}, // U+00BC (1/4) + { 0xC3, 0x63, 0x33, 0x7B, 0xCC, 0x66, 0x33, 0xF0}, // U+00BD (1/2) + { 0x03, 0xC4, 0x63, 0xB4, 0xDB, 0xAC, 0xE6, 0x80}, // U+00BE (3/4) + { 0x0C, 0x00, 0x0C, 0x06, 0x03, 0x33, 0x1E, 0x00}, // U+00BF (inverted ?) + { 0x07, 0x00, 0x1C, 0x36, 0x63, 0x7F, 0x63, 0x00}, // U+00C0 (A grave) + { 0x70, 0x00, 0x1C, 0x36, 0x63, 0x7F, 0x63, 0x00}, // U+00C1 (A aigu) + { 0x1C, 0x36, 0x00, 0x3E, 0x63, 0x7F, 0x63, 0x00}, // U+00C2 (A circumflex) + { 0x6E, 0x3B, 0x00, 0x3E, 0x63, 0x7F, 0x63, 0x00}, // U+00C3 (A ~) + { 0x63, 0x1C, 0x36, 0x63, 0x7F, 0x63, 0x63, 0x00}, // U+00C4 (A umlaut) + { 0x0C, 0x0C, 0x00, 0x1E, 0x33, 0x3F, 0x33, 0x00}, // U+00C5 (A ring) + { 0x7C, 0x36, 0x33, 0x7F, 0x33, 0x33, 0x73, 0x00}, // U+00C6 (AE) + { 0x1E, 0x33, 0x03, 0x33, 0x1E, 0x18, 0x30, 0x1E}, // U+00C7 (C cedille) + { 0x07, 0x00, 0x3F, 0x06, 0x1E, 0x06, 0x3F, 0x00}, // U+00C8 (E grave) + { 0x38, 0x00, 0x3F, 0x06, 0x1E, 0x06, 0x3F, 0x00}, // U+00C9 (E aigu) + { 0x0C, 0x12, 0x3F, 0x06, 0x1E, 0x06, 0x3F, 0x00}, // U+00CA (E circumflex) + { 0x36, 0x00, 0x3F, 0x06, 0x1E, 0x06, 0x3F, 0x00}, // U+00CB (E umlaut) + { 0x07, 0x00, 0x1E, 0x0C, 0x0C, 0x0C, 0x1E, 0x00}, // U+00CC (I grave) + { 0x38, 0x00, 0x1E, 0x0C, 0x0C, 0x0C, 0x1E, 0x00}, // U+00CD (I aigu) + { 0x0C, 0x12, 0x00, 0x1E, 0x0C, 0x0C, 0x1E, 0x00}, // U+00CE (I circumflex) + { 0x33, 0x00, 0x1E, 0x0C, 0x0C, 0x0C, 0x1E, 0x00}, // U+00CF (I umlaut) + { 0x3F, 0x66, 0x6F, 0x6F, 0x66, 0x66, 0x3F, 0x00}, // U+00D0 (Eth) + { 0x3F, 0x00, 0x33, 0x37, 0x3F, 0x3B, 0x33, 0x00}, // U+00D1 (N ~) + { 0x0E, 0x00, 0x18, 0x3C, 0x66, 0x3C, 0x18, 0x00}, // U+00D2 (O grave) + { 0x70, 0x00, 0x18, 0x3C, 0x66, 0x3C, 0x18, 0x00}, // U+00D3 (O aigu) + { 0x3C, 0x66, 0x18, 0x3C, 0x66, 0x3C, 0x18, 0x00}, // U+00D4 (O circumflex) + { 0x6E, 0x3B, 0x00, 0x3E, 0x63, 0x63, 0x3E, 0x00}, // U+00D5 (O ~) + { 0xC3, 0x18, 0x3C, 0x66, 0x66, 0x3C, 0x18, 0x00}, // U+00D6 (O umlaut) + { 0x00, 0x36, 0x1C, 0x08, 0x1C, 0x36, 0x00, 0x00}, // U+00D7 (multiplicative x) + { 0x5C, 0x36, 0x73, 0x7B, 0x6F, 0x36, 0x1D, 0x00}, // U+00D8 (O stroke) + { 0x0E, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3C, 0x00}, // U+00D9 (U grave) + { 0x70, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3C, 0x00}, // U+00DA (U aigu) + { 0x3C, 0x66, 0x00, 0x66, 0x66, 0x66, 0x3C, 0x00}, // U+00DB (U circumflex) + { 0x33, 0x00, 0x33, 0x33, 0x33, 0x33, 0x1E, 0x00}, // U+00DC (U umlaut) + { 0x70, 0x00, 0x66, 0x66, 0x3C, 0x18, 0x18, 0x00}, // U+00DD (Y aigu) + { 0x0F, 0x06, 0x3E, 0x66, 0x66, 0x3E, 0x06, 0x0F}, // U+00DE (Thorn) + { 0x00, 0x1E, 0x33, 0x1F, 0x33, 0x1F, 0x03, 0x03}, // U+00DF (beta) + { 0x07, 0x00, 0x1E, 0x30, 0x3E, 0x33, 0x7E, 0x00}, // U+00E0 (a grave) + { 0x38, 0x00, 0x1E, 0x30, 0x3E, 0x33, 0x7E, 0x00}, // U+00E1 (a aigu) + { 0x7E, 0xC3, 0x3C, 0x60, 0x7C, 0x66, 0xFC, 0x00}, // U+00E2 (a circumflex) + { 0x6E, 0x3B, 0x1E, 0x30, 0x3E, 0x33, 0x7E, 0x00}, // U+00E3 (a ~) + { 0x33, 0x00, 0x1E, 0x30, 0x3E, 0x33, 0x7E, 0x00}, // U+00E4 (a umlaut) + { 0x0C, 0x0C, 0x1E, 0x30, 0x3E, 0x33, 0x7E, 0x00}, // U+00E5 (a ring) + { 0x00, 0x00, 0xFE, 0x30, 0xFE, 0x33, 0xFE, 0x00}, // U+00E6 (ae) + { 0x00, 0x00, 0x1E, 0x03, 0x03, 0x1E, 0x30, 0x1C}, // U+00E7 (c cedille) + { 0x07, 0x00, 0x1E, 0x33, 0x3F, 0x03, 0x1E, 0x00}, // U+00E8 (e grave) + { 0x38, 0x00, 0x1E, 0x33, 0x3F, 0x03, 0x1E, 0x00}, // U+00E9 (e aigu) + { 0x7E, 0xC3, 0x3C, 0x66, 0x7E, 0x06, 0x3C, 0x00}, // U+00EA (e circumflex) + { 0x33, 0x00, 0x1E, 0x33, 0x3F, 0x03, 0x1E, 0x00}, // U+00EB (e umlaut) + { 0x07, 0x00, 0x0E, 0x0C, 0x0C, 0x0C, 0x1E, 0x00}, // U+00EC (i grave) + { 0x1C, 0x00, 0x0E, 0x0C, 0x0C, 0x0C, 0x1E, 0x00}, // U+00ED (i augu) + { 0x3E, 0x63, 0x1C, 0x18, 0x18, 0x18, 0x3C, 0x00}, // U+00EE (i circumflex) + { 0x33, 0x00, 0x0E, 0x0C, 0x0C, 0x0C, 0x1E, 0x00}, // U+00EF (i umlaut) + { 0x1B, 0x0E, 0x1B, 0x30, 0x3E, 0x33, 0x1E, 0x00}, // U+00F0 (eth) + { 0x00, 0x1F, 0x00, 0x1F, 0x33, 0x33, 0x33, 0x00}, // U+00F1 (n ~) + { 0x00, 0x07, 0x00, 0x1E, 0x33, 0x33, 0x1E, 0x00}, // U+00F2 (o grave) + { 0x00, 0x38, 0x00, 0x1E, 0x33, 0x33, 0x1E, 0x00}, // U+00F3 (o aigu) + { 0x1E, 0x33, 0x00, 0x1E, 0x33, 0x33, 0x1E, 0x00}, // U+00F4 (o circumflex) + { 0x6E, 0x3B, 0x00, 0x1E, 0x33, 0x33, 0x1E, 0x00}, // U+00F5 (o ~) + { 0x00, 0x33, 0x00, 0x1E, 0x33, 0x33, 0x1E, 0x00}, // U+00F6 (o umlaut) + { 0x18, 0x18, 0x00, 0x7E, 0x00, 0x18, 0x18, 0x00}, // U+00F7 (division) + { 0x00, 0x60, 0x3C, 0x76, 0x7E, 0x6E, 0x3C, 0x06}, // U+00F8 (o stroke) + { 0x00, 0x07, 0x00, 0x33, 0x33, 0x33, 0x7E, 0x00}, // U+00F9 (u grave) + { 0x00, 0x38, 0x00, 0x33, 0x33, 0x33, 0x7E, 0x00}, // U+00FA (u aigu) + { 0x1E, 0x33, 0x00, 0x33, 0x33, 0x33, 0x7E, 0x00}, // U+00FB (u circumflex) + { 0x00, 0x33, 0x00, 0x33, 0x33, 0x33, 0x7E, 0x00}, // U+00FC (u umlaut) + { 0x00, 0x38, 0x00, 0x33, 0x33, 0x3E, 0x30, 0x1F}, // U+00FD (y aigu) + { 0x00, 0x00, 0x06, 0x3E, 0x66, 0x3E, 0x06, 0x00}, // U+00FE (thorn) + { 0x00, 0x33, 0x00, 0x33, 0x33, 0x3E, 0x30, 0x1F} // U+00FF (y umlaut) +}; + +#endif \ No newline at end of file diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h index 13fdf23e4..e3f3256fc 100644 --- a/tasmota/tasmota_template.h +++ b/tasmota/tasmota_template.h @@ -524,7 +524,6 @@ const uint16_t kGpioNiceList[] PROGMEM = { #ifdef USE_DISPLAY_MAX7219_MATRIX #undef USE_DISPLAY_MAX7219 #undef USE_DISPLAY_TM1637 - #define USE_DISPLAY_MODES1TO5 AGPIO(GPIO_MAX7219CLK), AGPIO(GPIO_MAX7219DIN), AGPIO(GPIO_MAX7219CS), diff --git a/tasmota/xdsp_19_max7219_matrix.ino b/tasmota/xdsp_19_max7219_matrix.ino index ec82420e2..3ec3ac332 100644 --- a/tasmota/xdsp_19_max7219_matrix.ino +++ b/tasmota/xdsp_19_max7219_matrix.ino @@ -1,5 +1,5 @@ /* - xdsp_19_max7219_matrix.ino.ino - Support for MAX7219 based dot matrix displays for Tasmota + xdsp_19_max7219_matrix.ino.ino - Support for MAX7219 based 8x8 dot matrix displays for Tasmota Copyright (C) 2021 Michael Beuss @@ -20,111 +20,63 @@ #ifdef USE_DISPLAY #ifdef USE_DISPLAY_MAX7219_MATRIX /*********************************************************************************************\ - This driver enables the display of ascii text on MAX7219 based LED dot matrix modules. + This driver enables the display of ascii text on MAX7219 based 8x8 LED dot matrix modules (1088AS). - Connect the MAX7219 display module's pins to any free GPIOs of the ESP8266 or ESP32 module - and assign the pins as follows from Tasmota's GUI: + Connect the MAX7219 display module's pins to any free GPIOs of the ESP8266 or ESP32 module. + VCC should be 5V. Depending on the number of used modules and the brightness, the used current can be more than 500 mA. + + Connect the 5 outgoing pins (VCC, GND, DI, CS, CLK) of the first module to the next one. + With this you can connect up to 32 modules. + To extend the display hieght, multiple rows are supported. Each module row starts from left to right. + + Assign the pins as follows from Tasmota's GUI: DIN hardware pin --> "MAX7219 DIN" CS hardware pin --> "MAX7219 CS" CLK hardware pin --> "MAX7219 CLK" + Once the GPIO configuration is saved and the ESP8266/ESP32 module restarts, set the Display Model to 19 and Display Mode to 0 - using the command "Backlog DisplayModel 15 ; DisplayMode 0" - If your display is a TM1637 with 6 digits, set Display Width to the number of digits your - display has, using the command "DisplayWidth 6". + Depending on order oth the wired 8x8 matrix modules you have got a display of size pixel_width x pixel_height. + The size has to be set with the commands "DisplayWidth " and "DisplayHeight " After the ESP8266/ESP32 module restarts again, turn ON the display with the command "Power 1" + Now, the following "Display" commands can be used: + DisplayText text + Sends the text to the display. + If the text fits into the display, it is shown in the center. + Otherwise it scrolls to the left and repeats as long it is cleared or new "DisplayText" overwrites it. + + DisplayDimmer [0..100] + Sets the intensity of the display. + + Power [ON|OFF] + Sitches the display on or off. When "off", the display buffer is not cleared and will be shown again when after "Power ON". + Other display commands are still active when off. DisplayClear + Clears the display - Clears the display, command: "DisplayClear" + DisplayScrollDelay [0..15] // default = 0 + Sets the speed of text scroll. Smaller delay = faster scrolling. + The maximum scroll speed is 50ms per pixel on DisplayScrollDelay 0. + DisplayWidth [8..256] + Sets the pixel width of the display (8x number of modules in a row) - DisplayNumber num [,position {0-(Settings->display_width-1))} [,leading_zeros {0|1} [,length {1 to Settings->display_width}]]] + DisplayHeight [8..256] + Sets the pixel height of the display (8x number of module rows) - Clears and then displays number without decimal. command e.g., "DisplayNumber 1234" - Control 'leading zeros', 'length' and 'position' with "DisplayNumber 1234, , , " - 'leading zeros' can be 1 or 0 (default), 'length' can be 1 to Settings->display_width, 'position' can be 0 (left-most) to Settings->display_width (right-most). - See function description below for more details. - - DisplayNumberNC num [,position {0-(Settings->display_width-1))} [,leading_zeros {0|1} [,length {1 to Settings->display_width}]]] - - Display integer number as above, but without clearing first. e.g., "DisplayNumberNC 1234". Usage is same as above. - - - - DisplayFloat num [,position {0-(Settings->display_width-1)} [,precision {0-Settings->display_width} [,length {1 to Settings->display_width}]]] - - Clears and then displays float (with decimal point) command e.g., "DisplayFloat 12.34" - See function description below for more details. - - - - DisplayFloatNC num [,position {0-(Settings->display_width-1)} [,precision {0-Settings->display_width} [,length {1 to Settings->display_width}]]] - - Displays float (with decimal point) as above, but without clearing first. command e.g., "DisplayFloatNC 12.34" - See function description below for more details. - - - - DisplayRaw position {0-(Settings->display_width-1)},length {1 to Settings->display_width}, num1 [, num2[, num3[, num4[, ...upto Settings->display_width numbers]]]]] - - Takes upto Settings->display_width comma-separated integers (0-255) and displays raw segments. Each number represents a - 7-segment digit. Each 8-bit number represents individual segments of a digit. - For example, the command "DisplayRaw 0, 4, 255, 255, 255, 255" would display "[8.8.8.8.]" - - - - DisplayText text [, position {0-(Settings->display_width-1)} [,length {1 to Settings->display_width}]] - - Clears and then displays basic text. command e.g., "DisplayText ajith vasudevan" - Control 'length' and 'position' with "DisplayText , , " - 'length' can be 1 to Settings->display_width, 'position' can be 0 (left-most) to Settings->display_width-1 (right-most) - A caret(^) symbol in the text input is dispayed as the degrees(°) symbol. This is useful for displaying Temperature! - For example, the command "DisplayText 22.5^" will display "22.5°". - - - DisplayTextNC text [, position {0-Settings->display_width-1} [,length {1 to Settings->display_width}]] - - Clears first, then displays text. Usage is same as above. - - - - DisplayScrollText text [, num_loops] - - Displays scrolling text indefinitely, until another Display- command (other than DisplayScrollText - or DisplayScrollDelay is issued). Optionally, stop scrolling after num_loops iterations. - - - - DisplayScrollDelay delay {0-15} // default = 4 - - Sets the speed of text scroll. Smaller delay = faster scrolling. - - - - DisplayLevel num {0-100} - - Display a horizontal bar graph (0-100) command e.g., "DisplayLevel 50" will display [|||| ] - - - - DisplayClock 1|2|0 - - Displays a clock. - Commands "DisplayClock 1" // 12 hr format - "DisplayClock 2" // 24 hr format - "DisplayClock 0" // turn off clock - - -In addition, setting DisplayMode to 1 shows the time, setting it to 2 shows the date -and setting it to 3 alternates between time and date. + DisplayClock [0|1|2] + Displays a clock. + Commands "DisplayClock 1" // 12 hr format + "DisplayClock 2" // 24 hr format + "DisplayClock 0" // turn off clock @@ -132,20 +84,26 @@ and setting it to 3 alternates between time and date. #define XDSP_19 19 -#include #include +#ifdef USE_DISPLAY_MODES1TO5 +#include +#endif + LedMatrix *max7219_Matrix = nullptr; bool max2791Matrix_initDriver_done = false; struct { byte modulesPerRow = 4; byte modulesPerCol = 1; + byte scroll_delay = 0; + byte scroll_iteration = 0; bool show_clock = false; - const char* timeFormat; + const char *timeFormat; } LedMatrix_settings; +// FUNC_DISPLAY_INIT_DRIVER bool MAX7291Matrix_initDriver(void) { if (!PinUsed(GPIO_MAX7219DIN) || !PinUsed(GPIO_MAX7219CLK) || !PinUsed(GPIO_MAX7219CS)) @@ -174,6 +132,7 @@ bool MAX7291Matrix_initDriver(void) return MAX7291Matrix_init(); } +// FUNC_DISPLAY_INIT bool MAX7291Matrix_init(void) { int intensity = GetDisplayDimmer16(); // 0..15 @@ -187,6 +146,39 @@ bool MAX7291Matrix_init(void) return true; } +// FUNC_DISPLAY_SCROLLDELAY +bool MAX7291Matrix_scrollDelay(void) +{ + if (ArgC() == 0) + { + XdrvMailbox.payload = LedMatrix_settings.scroll_delay; + return true; + } + if (LedMatrix_settings.scroll_delay < 0) + LedMatrix_settings.scroll_delay = 0; + LedMatrix_settings.scroll_delay = XdrvMailbox.payload; + return true; +} + +// FUNC_DISPLAY_EVERY_50_MSECOND +bool MAX7291Matrix_scrollText(void) +{ + // This function is called every 50 ms. + // scroll_delay defines the number of cycles to be ignored until the display scrolls by one pixel to the left. + // e.g. scrall_delay = 4 causes a scroll each 200 ms. + LedMatrix_settings.scroll_iteration++; + if (LedMatrix_settings.scroll_delay) + LedMatrix_settings.scroll_iteration = LedMatrix_settings.scroll_iteration % LedMatrix_settings.scroll_delay; + else + LedMatrix_settings.scroll_iteration = 0; + if (LedMatrix_settings.scroll_iteration) + return false; + + return max7219_Matrix->scrollText(); +} + +#ifdef USE_DISPLAY_MODES1TO5 +// FUNC_DISPLAY_CLOCK bool MAX7291Matrix_clock(void) { LedMatrix_settings.show_clock = XdrvMailbox.payload; @@ -213,11 +205,11 @@ bool MAX7291Matrix_clock(void) AddLog(LOG_LEVEL_DEBUG, PSTR("MTX: LedMatrix_settings.show_clock %d, timeFormat %s"), LedMatrix_settings.show_clock, LedMatrix_settings.timeFormat); - //max7219_Matrix->clearDisplay(); MAX7291Matrix_showTime(); return true; } +// FUNC_DISPLAY_EVERY_SECOND bool MAX7291Matrix_showTime() { time_t rawtime; @@ -227,11 +219,12 @@ bool MAX7291Matrix_showTime() time(&rawtime); timeinfo = localtime(&rawtime); strftime(timeStr, 10, LedMatrix_settings.timeFormat, timeinfo); - //AddLog(LOG_LEVEL_DEBUG, PSTR("MTX: showTime:%s"), timeStr); max7219_Matrix->drawText(timeStr); return true; } +#endif // USE_DISPLAY_MODES1TO5 + bool Xdsp19(uint8_t function) { @@ -260,30 +253,28 @@ bool Xdsp19(uint8_t function) case FUNC_DISPLAY_DIM: result = max7219_Matrix->setIntensity(GetDisplayDimmer16()); break; - case FUNC_DISPLAY_CLOCK: - result = MAX7291Matrix_clock(); - break; - case FUNC_DISPLAY_SEVENSEG_TEXT: - case FUNC_DISPLAY_SEVENSEG_TEXTNC: - case FUNC_DISPLAY_NUMBER: - case FUNC_DISPLAY_NUMBERNC: - case FUNC_DISPLAY_FLOAT: - case FUNC_DISPLAY_FLOATNC: - case FUNC_DISPLAY_RAW: - case FUNC_DISPLAY_LEVEL: - case FUNC_DISPLAY_SCROLLTEXT: case FUNC_DISPLAY_DRAW_STRING: result = max7219_Matrix->drawText(dsp_str); break; + case FUNC_DISPLAY_SCROLLDELAY: + result = MAX7291Matrix_scrollDelay(); + break; + case FUNC_DISPLAY_EVERY_50_MSECOND: + result = MAX7291Matrix_scrollText(); + break; + +#ifdef USE_DISPLAY_MODES1TO5 + case FUNC_DISPLAY_CLOCK: + result = MAX7291Matrix_clock(); + break; case FUNC_DISPLAY_EVERY_SECOND: if (LedMatrix_settings.show_clock) { result = MAX7291Matrix_showTime(); } - break; - case FUNC_DISPLAY_EVERY_50_MSECOND: - result = max7219_Matrix->scrollText(); +#endif // USE_DISPLAY_MODES1TO5 + default: result = false; } From 71f1c1775fc44f20d535c572ead9efe94f50eeda Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Sun, 7 Nov 2021 17:56:28 +0300 Subject: [PATCH 009/402] fix opentherm --- tasmota/xsns_69_opentherm.ino | 20 ++++++++++++++++-- tasmota/xsns_69_opentherm_protocol.ino | 29 ++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/tasmota/xsns_69_opentherm.ino b/tasmota/xsns_69_opentherm.ino index cfcc0384d..c94e61b59 100644 --- a/tasmota/xsns_69_opentherm.ino +++ b/tasmota/xsns_69_opentherm.ino @@ -16,6 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +#define USE_OPENTHERM #ifdef USE_OPENTHERM @@ -467,8 +468,11 @@ uint8_t sns_opentherm_read_flags(char *data, uint32_t len) // flag value, however, this command does not update the settings. #define D_CMND_SET_HOT_WATER_ENABLED "dhw" +// BLOR - Reset boiler +#define D_CMND_BLLOR "blor" + const char kOpenThermCommands[] PROGMEM = D_PRFX_OTHERM "|" D_CMND_OTHERM_BOILER_SETPOINT "|" D_CMND_OTHERM_DHW_SETPOINT - "|" D_CMND_OTHERM_SAVE_SETTINGS "|" D_CMND_OTHERM_FLAGS "|" D_CMND_SET_CENTRAL_HEATING_ENABLED "|" D_CMND_SET_HOT_WATER_ENABLED; + "|" D_CMND_OTHERM_SAVE_SETTINGS "|" D_CMND_OTHERM_FLAGS "|" D_CMND_SET_CENTRAL_HEATING_ENABLED "|" D_CMND_SET_HOT_WATER_ENABLED "|" D_CMND_BLLOR; void (*const OpenThermCommands[])(void) PROGMEM = { &sns_opentherm_boiler_setpoint_cmd, @@ -476,7 +480,8 @@ void (*const OpenThermCommands[])(void) PROGMEM = { &sns_opentherm_save_settings_cmd, &sns_opentherm_flags_cmd, &sns_opentherm_set_central_heating_cmd, - &sns_opentherm_set_hot_water_cmd}; + &sns_opentherm_set_hot_water_cmd, + &sns_opentherm_blor_cmd,}; void sns_opentherm_cmd(void) { } void sns_opentherm_boiler_setpoint_cmd(void) @@ -550,6 +555,17 @@ void sns_opentherm_set_hot_water_cmd(void) ResponseCmndNumber(sns_ot_boiler_status.m_enableHotWater ? 1 : 0); } +void sns_opentherm_blor_cmd(void) +{ + bool query = strlen(XdrvMailbox.data) == 0; + bool retval = false; + if (!query) + { + if (atoi(XdrvMailbox.data)) retval = sns_opentherm_call_blor(); + } + ResponseCmndNumber(retval); +} + /*********************************************************************************************\ * Interface \*********************************************************************************************/ diff --git a/tasmota/xsns_69_opentherm_protocol.ino b/tasmota/xsns_69_opentherm_protocol.ino index bc821640a..a86648849 100644 --- a/tasmota/xsns_69_opentherm_protocol.ino +++ b/tasmota/xsns_69_opentherm_protocol.ino @@ -16,6 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +#define USE_OPENTHERM #ifdef USE_OPENTHERM @@ -243,6 +244,14 @@ OpenThermCommand sns_opentherm_commands[] = { .m_ot_make_request = sns_opentherm_get_generic_u16, .m_ot_parse_response = sns_opentherm_parse_generic_u16, .m_ot_appent_telemetry = sns_opentherm_tele_generic_u16}, + {// Boiler Lock-out Reset command + .m_command_name = "BLOR", + .m_command_code = (uint8_t)OpenThermMessageID::Command, + .m_flags = {.notSupported = 1}, + .m_results = {{.m_u8 = 0}, {.m_u8 = 0}}, + .m_ot_make_request = sns_opentherm_send_blor, + .m_ot_parse_response = sns_opentherm_parse_generic_u16, + .m_ot_appent_telemetry = sns_opentherm_tele_u8_u8}, }; /////////////////////////////////// Process Slave Status Flags & Control ////////////////////////////////////////////////// @@ -431,6 +440,26 @@ void sns_opentherm_tele_oem_diag(struct OpenThermCommandT *self) ResponseAppend_P(PSTR("%d"), (int)self->m_results[0].m_u16); } +/////////////////////////////////// Boiler Boiler Lock-out Reset ////////////////////////////////////////////////// +unsigned long sns_opentherm_send_blor(struct OpenThermCommandT *self, struct OT_BOILER_STATUS_T *status) +{ + AddLog(LOG_LEVEL_ERROR, PSTR("[OTH]: Boiler Boiler Lock-out Reset")); + + self->m_flags.notSupported = true; // Disable future calls of this command + + unsigned int data = 1; //1 : “BLOR”= Boiler Lock-out Reset command + return OpenTherm::buildRequest(OpenThermMessageType::WRITE_DATA, OpenThermMessageID::Command, data); +} +bool sns_opentherm_call_blor() +{ + /* + OpenThermCommandT *cmd = &sns_opentherm_commands[sns_opentherm_current_command-1]; + if (strcmp(cmd->m_command_name, "BLOR")) return false; + cmd->m_flags.notSupported = false; + return true; + */ +} + /////////////////////////////////// Generic Single Float ///////////////////////////////////////////////// unsigned long sns_opentherm_get_generic_float(struct OpenThermCommandT *self, struct OT_BOILER_STATUS_T *) { From af14b4943525264c27ea0e4eada391b83352c4bb Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Sun, 28 Nov 2021 18:44:10 +0300 Subject: [PATCH 010/402] merge conflict --- tasmota/xlgt_01_ws2812.ino | 99 +++++++++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 1 deletion(-) diff --git a/tasmota/xlgt_01_ws2812.ino b/tasmota/xlgt_01_ws2812.ino index 3a9e396f3..f2c8b0610 100644 --- a/tasmota/xlgt_01_ws2812.ino +++ b/tasmota/xlgt_01_ws2812.ino @@ -17,6 +17,11 @@ along with this program. If not, see . */ +#ifndef FIRMWARE_MINIMAL +#define USE_LIGHT +#define USE_WS2812 +#endif + #ifdef USE_LIGHT #ifdef USE_WS2812 /*********************************************************************************************\ @@ -37,7 +42,7 @@ #define XLGT_01 1 -const uint8_t WS2812_SCHEMES = 9; // Number of WS2812 schemes +const uint8_t WS2812_SCHEMES = 10; // Number of WS2812 schemes const char kWs2812Commands[] PROGMEM = "|" // No prefix D_CMND_LED "|" D_CMND_PIXELS "|" D_CMND_ROTATION "|" D_CMND_WIDTH "|" D_CMND_STEPPIXELS ; @@ -291,6 +296,93 @@ void Ws2812Clock(void) Ws2812StripShow(); } +#define pow2(x) ((x)*(x)) +#define pow3(x) ((x)*pow2(x)) +#define pow4(x) (pow2(x)*pow2(x)) + +void Ws2812RunningStrip(int scheme) +{ +#if (USE_WS2812_CTYPE > NEO_3LED) + RgbwColor c; + c.W = 0; +#else + RgbColor c(Settings->light_dimmer); +#endif + + static uint32_t timer_counter = 0; + static uint32_t last_timer_counter = timer_counter; + if (Settings->light_rotation%2) timer_counter--; + else timer_counter++; + + uint32_t width = Settings->ws_width[WS_MINUTE]?Settings->ws_width[WS_MINUTE]:1; + uint32_t repeat = 1;//kWsRepeat[Settings->light_width]; // number of scheme.count per ledcount + uint32_t range = (uint32_t)ceil((float)Settings->light_pixels / (float)repeat); + uint32_t speed = Settings->light_speed; //((Settings->light_speed * 2) -1) * (STATES / 10); // + static uint32_t offset = 0; + + if (scheme==WS2812_SCHEMES-1) { + if (timer_counter/speed!=last_timer_counter/speed) { + offset = random(range); + last_timer_counter = timer_counter; + } + } else { + offset = speed > 0 ? timer_counter / speed : 0; + } + + //WsColor oldColor, currentColor; + //Ws2812GradientColor(schemenr, &oldColor, range, gradRange, offset); + //currentColor = oldColor; + int power = Settings->ws_width[WS_SECOND]; + int max_input = pow(width, power); + float dimmer = 100 / (float)Settings->light_dimmer; + + uint32_t target = offset % Settings->light_pixels; + + for (uint32_t i = 0; i < Settings->light_pixels; i++) { + int delta = targetlight_color[0] / pow(delta+1, power); + float fmyGrn = Settings->light_color[1] / pow(delta+1, power); + float fmyBlu = Settings->light_color[2] / pow(delta+1, power); + /* + float fmyRed = (float)wsmap(max_input-pow(delta+1, power), 0, max_input, 0, Settings->light_color[0]); + float fmyGrn = (float)wsmap(max_input-pow(delta+1, power), 0, max_input, 0, Settings->light_color[1]); + float fmyBlu = (float)wsmap(max_input-pow(delta+1, power), 0, max_input, 0, Settings->light_color[2]); + */ + + c.R = (uint8_t)fmyRed/dimmer; + c.G = (uint8_t)fmyGrn/dimmer; + c.B = (uint8_t)fmyBlu/dimmer; + } + else { + c.R = 0 ; + c.G = 0 ; + c.B = 0 ; + } + + if (Settings->light_width==2) { + c.R = Settings->light_color[0]/dimmer - c.R; + c.G = Settings->light_color[1]/dimmer - c.G; + c.B = Settings->light_color[2]/dimmer - c.B; + } else if (Settings->ws_width[WS_MINUTE]==3) { + c.R = max(100 - c.R,0); + c.G = max(100 - c.G,0); + c.B = max(100 - c.B,0); + } + + strip->SetPixelColor(i, c); +/* + // Blend old and current color based on time for smooth movement. + c.R = wsmap(Light.strip_timer_counter % speed, 0, speed, oldColor.red, currentColor.red); + c.G = wsmap(Light.strip_timer_counter % speed, 0, speed, oldColor.green, currentColor.green); + c.B = wsmap(Light.strip_timer_counter % speed, 0, speed, oldColor.blue, currentColor.blue); + strip->SetPixelColor(i, c); + oldColor = currentColor; + */ + } + Ws2812StripShow(); +} + void Ws2812GradientColor(uint32_t schemenr, struct WsColor* mColor, uint32_t range, uint32_t gradRange, uint32_t i) { /* @@ -588,6 +680,11 @@ void Ws2812ShowScheme(void) Ws2812.show_next = 0; } break; + case WS2812_SCHEMES-2: // Running strip + case WS2812_SCHEMES-1: // Running strip + Ws2812RunningStrip(scheme); + Ws2812.show_next = 1; + break; default: if(Settings->light_step_pixels > 0){ Ws2812Steps(scheme -1); From 5b3266e7ca90dfdbe750a6be746b14f6de24f884 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 29 Nov 2021 15:27:55 +0100 Subject: [PATCH 011/402] Support for more than 8 matrix devices --- lib/lib_display/LedControl/src/LedControl.cpp | 37 ++- lib/lib_display/LedControl/src/LedControl.h | 20 +- lib/lib_display/LedControl/src/LedMatrix.cpp | 24 +- lib/lib_display/LedControl/src/LedMatrix.h | 13 +- .../LedControl/src/font_5x8_horizontal_MSB.h | 267 ------------------ .../src/font_8x8_horizontal_latin_MSB.h | 265 ----------------- tasmota/xdsp_19_max7219_matrix.ino | 89 ++++-- 7 files changed, 129 insertions(+), 586 deletions(-) delete mode 100644 lib/lib_display/LedControl/src/font_5x8_horizontal_MSB.h delete mode 100644 lib/lib_display/LedControl/src/font_8x8_horizontal_latin_MSB.h diff --git a/lib/lib_display/LedControl/src/LedControl.cpp b/lib/lib_display/LedControl/src/LedControl.cpp index e43211fd8..11e7a2908 100644 --- a/lib/lib_display/LedControl/src/LedControl.cpp +++ b/lib/lib_display/LedControl/src/LedControl.cpp @@ -47,16 +47,16 @@ LedControl::LedControl(int dataPin, int clkPin, int csPin, int numDevices) { SPI_MOSI=dataPin; SPI_CLK=clkPin; SPI_CS=csPin; - if(numDevices<=0 || numDevices>8 ) - numDevices=8; - maxDevices=numDevices; + if (numDevices <= 0 || numDevices > MAX72XX_MAX_DEVICES) + numDevices = MAX72XX_MAX_DEVICES; + maxDevices = numDevices; pinMode(SPI_MOSI,OUTPUT); pinMode(SPI_CLK,OUTPUT); pinMode(SPI_CS,OUTPUT); digitalWrite(SPI_CS,HIGH); SPI_MOSI=dataPin; - for(int i=0;i<64;i++) - status[i]=0x00; + for (int i = 0; i < 8 * MAX72XX_MAX_DEVICES; i++) + status[i] = 0x00; for(int i=0;i 7) + return; + for (int addr = 0; addr < maxDevices; addr++) + status[addr * 8 + row] = value[addr]; + spiTransferLong(row + 1, value); +} + void LedControl::setColumn(int addr, int col, byte value) { byte val; @@ -195,7 +204,7 @@ void LedControl::spiTransfer(int addr, volatile byte opcode, volatile byte data) int maxbytes=maxDevices*2; for(int i=0;i 0; i--) + shiftOut(SPI_MOSI, SPI_CLK, MSBFIRST, spidata[i - 1]); + //latch the data onto the display + digitalWrite(SPI_CS, HIGH); +} diff --git a/lib/lib_display/LedControl/src/LedControl.h b/lib/lib_display/LedControl/src/LedControl.h index f8180d07d..31fed9ffe 100644 --- a/lib/lib_display/LedControl/src/LedControl.h +++ b/lib/lib_display/LedControl/src/LedControl.h @@ -35,6 +35,10 @@ #include #endif +#ifndef MAX72XX_MAX_DEVICES +#define MAX72XX_MAX_DEVICES 32 // maximum number of devices based on MXA7219/MAX7221 +#endif + /* * Segments to be switched on for characters and digits on * 7-Segment Displays @@ -61,12 +65,14 @@ const static byte charTable [] PROGMEM = { class LedControl { private : /* The array for shifting the data to the devices */ - byte spidata[16]; - /* Send out a single command to the device */ + byte spidata[2 * MAX72XX_MAX_DEVICES]; + /* Send out a single command to one device */ void spiTransfer(int addr, byte opcode, byte data); + /* Send out a command with the same opcode to all devices */ + void spiTransferLong(byte opcode, const byte* data); /* We keep track of the led-status for all 8 devices in this array */ - byte status[64]; + byte status[8 * MAX72XX_MAX_DEVICES]; /* Data is shifted out of this pin*/ int SPI_MOSI; /* The clock is signaled on this pin */ @@ -149,6 +155,14 @@ class LedControl { */ void setRow(int addr, int row, byte value); + /** + * @brief Set data for the same row of all devices + * + * @param row [0..8] + * @param value array of bytes, one for each device + */ + void setRowLong(int row, byte* value); + /* * Set all 8 Led's in a column to a new state * Params: diff --git a/lib/lib_display/LedControl/src/LedMatrix.cpp b/lib/lib_display/LedControl/src/LedMatrix.cpp index b4fb8c260..1579e0852 100644 --- a/lib/lib_display/LedControl/src/LedMatrix.cpp +++ b/lib/lib_display/LedControl/src/LedMatrix.cpp @@ -32,17 +32,17 @@ // public LedMatrix::LedMatrix(int dataPin, int clkPin, int csPin, unsigned int colums, unsigned int rows) { - if (colums * rows > MATRIX_MAX_MODULES) + if (colums * rows > MAX72XX_MAX_DEVICES) { // dimension exeeds maximum buffer size - if (colums >= MATRIX_MAX_MODULES) + if (colums >= MAX72XX_MAX_DEVICES) { - colums = MATRIX_MAX_MODULES; + colums = MAX72XX_MAX_DEVICES; rows = 1; } else { - rows = MATRIX_MAX_MODULES / colums; + rows = MAX72XX_MAX_DEVICES / colums; } } @@ -66,7 +66,7 @@ LedMatrix::LedMatrix(int dataPin, int clkPin, int csPin, unsigned int colums, un setIntensity(7); } -bool LedMatrix::drawText( const char *str) +bool LedMatrix::drawText( const char *str, bool clearBefore) { strncpy(textBuf, str, TEXT_BUFFER_SIZE -1); textPosX = 0; @@ -75,7 +75,7 @@ bool LedMatrix::drawText( const char *str) if(textWidth < displayWidth) { // text fits into the display, place it into the center - clear(); + if(clearBefore) clear(); textPosX = (displayWidth - textWidth) / 2; // center } else @@ -146,9 +146,13 @@ bool LedMatrix::setIntensity(byte dim) return true; } -bool LedMatrix::setOrientation(ModuleOrientation orientation) +bool LedMatrix::setOrientation(LedMatrix::ModuleOrientation orientation) { - moduleOrientation = orientation; + if(moduleOrientation != orientation) + { + moduleOrientation = orientation; + refresh(); + } return true; } @@ -268,9 +272,9 @@ void LedMatrix::refreshByteOfBuffer(int i) byte LedMatrix::revereBitorder (byte b) { - const static byte lookup[] PROGMEM = { + static const byte lookup[16] = { 0x0, 0x8, 0x4, 0xc, 0x2, 0xa, 0x6, 0xe, - 0x1, 0x9, 0x5, 0xd, 0x3, 0xb, 0x7, 0xf, + 0x1, 0x9, 0x5, 0xd, 0x3, 0xb, 0x7, 0xf }; return (lookup[b & 0b1111] << 4) | lookup[b >> 4]; } diff --git a/lib/lib_display/LedControl/src/LedMatrix.h b/lib/lib_display/LedControl/src/LedMatrix.h index efb50b8e3..b369173d0 100644 --- a/lib/lib_display/LedControl/src/LedMatrix.h +++ b/lib/lib_display/LedControl/src/LedMatrix.h @@ -29,8 +29,7 @@ #include -#define MATRIX_MAX_MODULES 32 // maximum number of modules that can be used -#define MATRIX_BUFFER_SIZE MATRIX_MAX_MODULES * 8 // 8 bytes per modul. One byte represents 8 LEDs. +#define MATRIX_BUFFER_SIZE MAX72XX_MAX_DEVICES * 8 // 8 bytes per modul. One byte represents 8 LEDs. #define TEXT_BUFFER_SIZE 256 // maximum text length that can be scrolled #define TEXT_APPEND_BUFFER_SIZE 16 // used for characters that are appended to the scroll text, before it repeats @@ -66,12 +65,14 @@ class LedMatrix * When the text is longer than than the display width, it can be scrolled per pixel with function scrollText(). * * @param str string to display + * @param clearBefore true (default) clears old display content before, false: do not clear display before */ - bool drawText( const char *str ); + bool drawText( const char *str, bool clearBefore = true ); /** * @brief Dwaws a character string to a defined display position. The position (x,y) is used for the upper left pixel of the text. - * Existing text before the x position will not be cleared. Use refresh() after all text parts are drawed. + * Existing content outside the drawing text area will not be cleared. But you can use clearDisplay() before. + * Use refresh() after all text parts are drawed. * * @param str string to display * @param x horizantal pixel position to start with string (0 is most left) @@ -112,7 +113,7 @@ class LedMatrix * * @param orientation */ - bool setOrientation(ModuleOrientation orientation); + bool setOrientation(LedMatrix::ModuleOrientation orientation); /** * @brief Set ap pixel at a defined position. @@ -151,7 +152,7 @@ class LedMatrix unsigned int displayWidth; // matrix width [pixel] unsigned int displayHeight; // matrix height [pixel] unsigned int modules; // number of 8x8 mudules - ModuleOrientation moduleOrientation; + uint8_t moduleOrientation; byte buffer[MATRIX_BUFFER_SIZE]; LedControl* ledControl; int charWidth; diff --git a/lib/lib_display/LedControl/src/font_5x8_horizontal_MSB.h b/lib/lib_display/LedControl/src/font_5x8_horizontal_MSB.h deleted file mode 100644 index da3becc4e..000000000 --- a/lib/lib_display/LedControl/src/font_5x8_horizontal_MSB.h +++ /dev/null @@ -1,267 +0,0 @@ -// 5x8 ascii font -#ifndef font_5x8_horizontal_MSB_h -#define font_5x8_horizontal_MSB_h - -const unsigned int font_char_width = 5; -const unsigned int font_char_height = 8; - -const char font[256][8]={ -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x00 -{0x0E,0x11,0x1B,0x11,0x1F,0x0E,0x00,0x00}, // 0x01 -{0x0E,0x15,0x1F,0x11,0x1F,0x0E,0x00,0x00}, // 0x02 -{0x0A,0x1F,0x1F,0x1F,0x0E,0x04,0x00,0x00}, // 0x03 -{0x04,0x04,0x0E,0x1F,0x0E,0x04,0x04,0x00}, // 0x04 -{0x04,0x0E,0x04,0x1F,0x15,0x04,0x0E,0x00}, // 0x05 -{0x04,0x0E,0x1F,0x1F,0x15,0x04,0x0E,0x00}, // 0x06 -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x07 -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x08 -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x09 -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x0A -{0x03,0x03,0x0E,0x11,0x11,0x11,0x0E,0x00}, // 0x0B -{0x0E,0x11,0x11,0x11,0x0E,0x04,0x0E,0x04}, // 0x0C -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x0D -{0x03,0x0F,0x09,0x09,0x0B,0x1B,0x18,0x00}, // 0x0E -{0x00,0x15,0x0E,0x1B,0x0E,0x15,0x00,0x00}, // 0x0F -{0x00,0x10,0x1C,0x1F,0x1C,0x10,0x00,0x00}, // 0x10 -{0x00,0x01,0x07,0x1F,0x07,0x01,0x00,0x00}, // 0x11 -{0x04,0x0E,0x04,0x04,0x04,0x0E,0x04,0x00}, // 0x12 -{0x00,0x0A,0x0A,0x0A,0x00,0x0A,0x00,0x00}, // 0x13 -{0x0E,0x1A,0x1A,0x0A,0x0A,0x0A,0x0A,0x00}, // 0x14 -{0x06,0x08,0x04,0x0A,0x04,0x02,0x0C,0x00}, // 0x15 -{0x00,0x00,0x00,0x0F,0x0F,0x00,0x00,0x00}, // 0x16 -{0x04,0x0E,0x04,0x0E,0x04,0x00,0x0E,0x00}, // 0x17 -{0x04,0x0E,0x04,0x04,0x04,0x04,0x04,0x00}, // 0x18 -{0x04,0x04,0x04,0x04,0x04,0x0E,0x04,0x00}, // 0x19 -{0x00,0x00,0x02,0x0F,0x02,0x00,0x00,0x00}, // 0x1A -{0x00,0x00,0x04,0x0F,0x04,0x00,0x00,0x00}, // 0x1B -{0x00,0x00,0x08,0x08,0x08,0x0F,0x00,0x00}, // 0x1C -{0x00,0x00,0x0A,0x1F,0x0A,0x00,0x00,0x00}, // 0x1D -{0x00,0x04,0x04,0x0E,0x0E,0x1F,0x00,0x00}, // 0x1E -{0x00,0x1F,0x0E,0x0E,0x04,0x04,0x00,0x00}, // 0x1F -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x20 -{0x04,0x04,0x04,0x04,0x00,0x04,0x00,0x00}, // 0x21 -{0x0A,0x0A,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x22 -{0x00,0x05,0x1F,0x0A,0x1F,0x14,0x00,0x00}, // 0x23 -{0x04,0x0E,0x0C,0x04,0x06,0x0E,0x04,0x00}, // 0x24 -{0x09,0x15,0x0E,0x0E,0x15,0x12,0x00,0x00}, // 0x25 -{0x04,0x0A,0x0C,0x15,0x12,0x0D,0x00,0x00}, // 0x26 -{0x04,0x04,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x27 -{0x03,0x04,0x08,0x08,0x08,0x04,0x03,0x00}, // 0x28 -{0x18,0x04,0x02,0x02,0x02,0x04,0x18,0x00}, // 0x29 -{0x04,0x0A,0x04,0x0A,0x00,0x00,0x00,0x00}, // 0x2A -{0x00,0x00,0x00,0x04,0x0E,0x04,0x00,0x00}, // 0x2B -{0x00,0x00,0x00,0x00,0x00,0x04,0x04,0x08}, // 0x2C -{0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x00}, // 0x2D -{0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x00}, // 0x2E -{0x01,0x02,0x02,0x04,0x04,0x08,0x08,0x00}, // 0x2F -{0x06,0x09,0x09,0x09,0x09,0x06,0x00,0x00}, // 0x30 -{0x04,0x0C,0x04,0x04,0x04,0x0E,0x00,0x00}, // 0x31 -{0x0C,0x02,0x02,0x04,0x08,0x0E,0x00,0x00}, // 0x32 -{0x0C,0x02,0x0C,0x02,0x02,0x0C,0x00,0x00}, // 0x33 -{0x02,0x06,0x0A,0x0F,0x02,0x02,0x00,0x00}, // 0x34 -{0x0E,0x08,0x0C,0x02,0x02,0x0C,0x00,0x00}, // 0x35 -{0x06,0x08,0x0E,0x09,0x09,0x06,0x00,0x00}, // 0x36 -{0x0F,0x01,0x02,0x04,0x04,0x04,0x00,0x00}, // 0x37 -{0x06,0x09,0x06,0x09,0x09,0x06,0x00,0x00}, // 0x38 -{0x06,0x09,0x09,0x07,0x01,0x06,0x00,0x00}, // 0x39 -{0x00,0x00,0x04,0x00,0x00,0x04,0x00,0x00}, // 0x3A -{0x00,0x00,0x04,0x00,0x00,0x04,0x04,0x08}, // 0x3B -{0x00,0x01,0x02,0x0C,0x02,0x01,0x00,0x00}, // 0x3C -{0x00,0x00,0x0F,0x00,0x0F,0x00,0x00,0x00}, // 0x3D -{0x00,0x08,0x04,0x03,0x04,0x08,0x00,0x00}, // 0x3E -{0x0E,0x01,0x02,0x04,0x00,0x04,0x00,0x00}, // 0x3F -{0x06,0x09,0x13,0x15,0x17,0x10,0x0F,0x00}, // 0x40 -{0x00,0x04,0x0A,0x0A,0x1F,0x11,0x00,0x00}, // 0x41 -{0x00,0x0E,0x0A,0x0C,0x0A,0x0E,0x00,0x00}, // 0x42 -{0x00,0x07,0x08,0x08,0x08,0x07,0x00,0x00}, // 0x43 -{0x00,0x0E,0x09,0x09,0x09,0x0E,0x00,0x00}, // 0x44 -{0x00,0x0E,0x08,0x0E,0x08,0x0E,0x00,0x00}, // 0x45 -{0x00,0x0E,0x08,0x0E,0x08,0x08,0x00,0x00}, // 0x46 -{0x00,0x07,0x08,0x0B,0x09,0x07,0x00,0x00}, // 0x47 -{0x00,0x09,0x09,0x0F,0x09,0x09,0x00,0x00}, // 0x48 -{0x00,0x0E,0x04,0x04,0x04,0x0E,0x00,0x00}, // 0x49 -{0x00,0x0E,0x02,0x02,0x02,0x0C,0x00,0x00}, // 0x4A -{0x00,0x09,0x0A,0x0C,0x0A,0x09,0x00,0x00}, // 0x4B -{0x00,0x08,0x08,0x08,0x08,0x0F,0x00,0x00}, // 0x4C -{0x00,0x11,0x1B,0x15,0x15,0x11,0x00,0x00}, // 0x4D -{0x00,0x09,0x0D,0x0B,0x09,0x09,0x00,0x00}, // 0x4E -{0x00,0x0E,0x11,0x11,0x11,0x0E,0x00,0x00}, // 0x4F -{0x00,0x0E,0x09,0x0E,0x08,0x08,0x00,0x00}, // 0x50 -{0x00,0x0E,0x11,0x11,0x11,0x0E,0x02,0x01}, // 0x51 -{0x00,0x0C,0x0A,0x0C,0x0A,0x09,0x00,0x00}, // 0x52 -{0x00,0x06,0x08,0x04,0x02,0x0C,0x00,0x00}, // 0x53 -{0x00,0x1F,0x04,0x04,0x04,0x04,0x00,0x00}, // 0x54 -{0x00,0x09,0x09,0x09,0x09,0x06,0x00,0x00}, // 0x55 -{0x00,0x09,0x09,0x09,0x06,0x06,0x00,0x00}, // 0x56 -{0x00,0x11,0x15,0x15,0x0A,0x0A,0x00,0x00}, // 0x57 -{0x00,0x11,0x0A,0x04,0x0A,0x11,0x00,0x00}, // 0x58 -{0x00,0x11,0x0A,0x04,0x04,0x04,0x00,0x00}, // 0x59 -{0x00,0x0F,0x01,0x06,0x08,0x0F,0x00,0x00}, // 0x5A -{0x06,0x04,0x04,0x04,0x04,0x04,0x06,0x00}, // 0x5B -{0x10,0x08,0x08,0x04,0x04,0x02,0x02,0x00}, // 0x5C -{0x0C,0x04,0x04,0x04,0x04,0x04,0x0C,0x00}, // 0x5D -{0x04,0x0A,0x0A,0x11,0x11,0x00,0x00,0x00}, // 0x5E -{0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x00}, // 0x5F -{0x08,0x04,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x60 -{0x00,0x00,0x0C,0x02,0x0E,0x0F,0x00,0x00}, // 0x61 -{0x08,0x08,0x0E,0x09,0x09,0x0E,0x00,0x00}, // 0x62 -{0x00,0x00,0x06,0x08,0x08,0x06,0x00,0x00}, // 0x63 -{0x02,0x02,0x0E,0x12,0x12,0x0E,0x00,0x00}, // 0x64 -{0x00,0x00,0x04,0x0E,0x08,0x06,0x00,0x00}, // 0x65 -{0x03,0x04,0x0F,0x04,0x04,0x04,0x00,0x00}, // 0x66 -{0x00,0x00,0x07,0x09,0x0F,0x01,0x0E,0x00}, // 0x67 -{0x08,0x08,0x0A,0x0D,0x09,0x09,0x00,0x00}, // 0x68 -{0x04,0x00,0x0C,0x04,0x04,0x04,0x00,0x00}, // 0x69 -{0x02,0x00,0x0E,0x02,0x02,0x02,0x0C,0x00}, // 0x6A -{0x08,0x08,0x0A,0x0C,0x0A,0x09,0x00,0x00}, // 0x6B -{0x0C,0x04,0x04,0x04,0x04,0x04,0x00,0x00}, // 0x6C -{0x00,0x00,0x15,0x1F,0x15,0x15,0x00,0x00}, // 0x6D -{0x00,0x00,0x0A,0x0D,0x09,0x09,0x00,0x00}, // 0x6E -{0x00,0x00,0x06,0x09,0x09,0x06,0x00,0x00}, // 0x6F -{0x00,0x00,0x0E,0x09,0x09,0x0E,0x08,0x00}, // 0x70 -{0x00,0x00,0x0E,0x12,0x12,0x0E,0x02,0x00}, // 0x71 -{0x00,0x00,0x0A,0x0C,0x08,0x08,0x00,0x00}, // 0x72 -{0x00,0x00,0x06,0x0C,0x02,0x0C,0x00,0x00}, // 0x73 -{0x00,0x04,0x0F,0x04,0x04,0x02,0x00,0x00}, // 0x74 -{0x00,0x00,0x09,0x09,0x0B,0x05,0x00,0x00}, // 0x75 -{0x00,0x00,0x09,0x09,0x06,0x06,0x00,0x00}, // 0x76 -{0x00,0x00,0x15,0x15,0x0E,0x0A,0x00,0x00}, // 0x77 -{0x00,0x00,0x09,0x06,0x06,0x09,0x00,0x00}, // 0x78 -{0x00,0x00,0x09,0x09,0x06,0x06,0x1C,0x00}, // 0x79 -{0x00,0x00,0x0E,0x06,0x08,0x0E,0x00,0x00}, // 0x7A -{0x02,0x04,0x04,0x08,0x04,0x04,0x02,0x00}, // 0x7B -{0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x00}, // 0x7C -{0x08,0x04,0x04,0x02,0x04,0x04,0x08,0x00}, // 0x7D -{0x00,0x00,0x00,0x0D,0x12,0x00,0x00,0x00}, // 0x7E -{0x00,0x04,0x0A,0x0A,0x0A,0x0E,0x00,0x00}, // 0x7F -{0x00,0x07,0x08,0x08,0x08,0x07,0x02,0x04}, // 0x80 -{0x09,0x00,0x09,0x09,0x0B,0x05,0x00,0x00}, // 0x81 -{0x01,0x02,0x04,0x0E,0x08,0x06,0x00,0x00}, // 0x82 -{0x06,0x09,0x0C,0x02,0x0E,0x0F,0x00,0x00}, // 0x83 -{0x0A,0x00,0x0C,0x02,0x0E,0x0F,0x00,0x00}, // 0x84 -{0x10,0x08,0x0C,0x02,0x0E,0x0F,0x00,0x00}, // 0x85 -{0x04,0x0A,0x0C,0x02,0x0E,0x0F,0x00,0x00}, // 0x86 -{0x00,0x00,0x06,0x08,0x08,0x06,0x02,0x04}, // 0x87 -{0x06,0x09,0x04,0x0E,0x08,0x06,0x00,0x00}, // 0x88 -{0x0A,0x00,0x04,0x0E,0x08,0x06,0x00,0x00}, // 0x89 -{0x10,0x08,0x04,0x0E,0x08,0x06,0x00,0x00}, // 0x8A -{0x0A,0x00,0x0C,0x04,0x04,0x04,0x00,0x00}, // 0x8B -{0x06,0x09,0x0C,0x04,0x04,0x04,0x00,0x00}, // 0x8C -{0x10,0x08,0x0C,0x04,0x04,0x04,0x00,0x00}, // 0x8D -{0x0A,0x04,0x0A,0x0A,0x1F,0x11,0x00,0x00}, // 0x8E -{0x04,0x0A,0x04,0x0A,0x1F,0x11,0x00,0x00}, // 0x8F -{0x01,0x0E,0x08,0x0E,0x08,0x0E,0x00,0x00}, // 0x90 -{0x00,0x00,0x1A,0x07,0x1C,0x13,0x00,0x00}, // 0x91 -{0x00,0x07,0x0A,0x0B,0x1E,0x13,0x00,0x00}, // 0x92 -{0x0C,0x12,0x06,0x09,0x09,0x06,0x00,0x00}, // 0x93 -{0x09,0x00,0x06,0x09,0x09,0x06,0x00,0x00}, // 0x94 -{0x10,0x08,0x06,0x09,0x09,0x06,0x00,0x00}, // 0x95 -{0x0C,0x12,0x09,0x09,0x0B,0x05,0x00,0x00}, // 0x96 -{0x08,0x04,0x09,0x09,0x0B,0x05,0x00,0x00}, // 0x97 -{0x09,0x00,0x09,0x09,0x06,0x06,0x1C,0x00}, // 0x98 -{0x11,0x0E,0x11,0x11,0x11,0x0E,0x00,0x00}, // 0x99 -{0x12,0x09,0x09,0x09,0x09,0x06,0x00,0x00}, // 0x9A -{0x00,0x01,0x06,0x0B,0x0D,0x06,0x08,0x00}, // 0x9B -{0x00,0x04,0x08,0x0C,0x18,0x0E,0x00,0x00}, // 0x9C -{0x01,0x0E,0x13,0x15,0x19,0x0E,0x10,0x00}, // 0x9D -{0x00,0x00,0x09,0x06,0x06,0x09,0x00,0x00}, // 0x9E -{0x02,0x04,0x04,0x0E,0x04,0x04,0x08,0x00}, // 0x9F -{0x01,0x02,0x0C,0x02,0x0E,0x0F,0x00,0x00}, // 0xA0 -{0x01,0x02,0x0C,0x04,0x04,0x04,0x00,0x00}, // 0xA1 -{0x01,0x02,0x06,0x09,0x09,0x06,0x00,0x00}, // 0xA2 -{0x01,0x02,0x09,0x09,0x0B,0x05,0x00,0x00}, // 0xA3 -{0x0F,0x00,0x0A,0x0D,0x09,0x09,0x00,0x00}, // 0xA4 -{0x1F,0x09,0x0D,0x0B,0x09,0x09,0x00,0x00}, // 0xA5 -{0x0C,0x02,0x0E,0x0A,0x0E,0x00,0x00,0x00}, // 0xA6 -{0x04,0x0A,0x0A,0x0A,0x04,0x00,0x00,0x00}, // 0xA7 -{0x00,0x04,0x00,0x04,0x04,0x02,0x0C,0x00}, // 0xA8 -{0x0E,0x17,0x17,0x15,0x17,0x0E,0x00,0x00}, // 0xA9 -{0x00,0x00,0x00,0x0E,0x02,0x02,0x00,0x00}, // 0xAA -{0x19,0x0A,0x0F,0x05,0x0A,0x13,0x00,0x00}, // 0xAB -{0x19,0x0A,0x0A,0x05,0x0B,0x11,0x00,0x00}, // 0xAC -{0x00,0x00,0x04,0x00,0x04,0x04,0x04,0x00}, // 0xAD -{0x00,0x05,0x0A,0x14,0x0A,0x05,0x00,0x00}, // 0xAE -{0x00,0x14,0x0A,0x05,0x0A,0x14,0x00,0x00}, // 0xAF -{0x15,0x00,0x15,0x00,0x15,0x00,0x15,0x00}, // 0xB0 -{0x15,0x0A,0x15,0x0A,0x15,0x0A,0x15,0x0A}, // 0xB1 -{0x1F,0x15,0x1F,0x15,0x1F,0x15,0x1F,0x15}, // 0xB2 -{0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04}, // 0xB3 -{0x04,0x04,0x04,0x1C,0x04,0x04,0x04,0x04}, // 0xB4 -{0x02,0x04,0x0A,0x0A,0x1F,0x11,0x00,0x00}, // 0xB5 -{0x06,0x09,0x04,0x0A,0x1F,0x11,0x00,0x00}, // 0xB6 -{0x08,0x04,0x0A,0x0A,0x1F,0x11,0x00,0x00}, // 0xB7 -{0x0E,0x11,0x17,0x15,0x17,0x11,0x0E,0x00}, // 0xB8 -{0x0A,0x0A,0x1A,0x02,0x1A,0x0A,0x0A,0x0A}, // 0xB9 -{0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A}, // 0xBA -{0x00,0x00,0x1E,0x02,0x1A,0x0A,0x0A,0x0A}, // 0xBB -{0x0A,0x0A,0x1A,0x02,0x1E,0x00,0x00,0x00}, // 0xBC -{0x00,0x04,0x0E,0x08,0x0E,0x04,0x00,0x00}, // 0xBD -{0x00,0x11,0x0A,0x04,0x0E,0x04,0x00,0x00}, // 0xBE -{0x00,0x00,0x00,0x1C,0x04,0x04,0x04,0x04}, // 0xBF -{0x04,0x04,0x04,0x07,0x00,0x00,0x00,0x00}, // 0xC0 -{0x04,0x04,0x04,0x1F,0x00,0x00,0x00,0x00}, // 0xC1 -{0x00,0x00,0x00,0x1F,0x04,0x04,0x04,0x04}, // 0xC2 -{0x04,0x04,0x04,0x07,0x04,0x04,0x04,0x04}, // 0xC3 -{0x00,0x00,0x00,0x1F,0x00,0x00,0x00,0x00}, // 0xC4 -{0x04,0x04,0x04,0x1F,0x04,0x04,0x04,0x04}, // 0xC5 -{0x0D,0x12,0x0C,0x02,0x0E,0x0F,0x00,0x00}, // 0xC6 -{0x0D,0x12,0x04,0x0A,0x1F,0x11,0x00,0x00}, // 0xC7 -{0x0A,0x0A,0x0B,0x08,0x0F,0x00,0x00,0x00}, // 0xC8 -{0x00,0x00,0x0F,0x08,0x0B,0x0A,0x0A,0x0A}, // 0xC9 -{0x0A,0x0A,0x1B,0x00,0x1F,0x00,0x00,0x00}, // 0xCA -{0x00,0x00,0x1F,0x00,0x1B,0x0A,0x0A,0x0A}, // 0xCB -{0x0A,0x0A,0x0B,0x08,0x0B,0x0A,0x0A,0x0A}, // 0xCC -{0x00,0x00,0x1F,0x00,0x1F,0x00,0x00,0x00}, // 0xCD -{0x0A,0x0A,0x1B,0x00,0x1B,0x0A,0x0A,0x0A}, // 0xCE -{0x00,0x11,0x0E,0x0A,0x0E,0x11,0x00,0x00}, // 0xCF -{0x1E,0x04,0x0E,0x12,0x12,0x0C,0x00,0x00}, // 0xD0 -{0x00,0x0E,0x09,0x1D,0x09,0x0E,0x00,0x00}, // 0xD1 -{0x0E,0x0E,0x08,0x0E,0x08,0x0E,0x00,0x00}, // 0xD2 -{0x11,0x0E,0x08,0x0E,0x08,0x0E,0x00,0x00}, // 0xD3 -{0x10,0x0E,0x08,0x0E,0x08,0x0E,0x00,0x00}, // 0xD4 -{0x00,0x00,0x0C,0x04,0x04,0x04,0x00,0x00}, // 0xD5 -{0x01,0x0E,0x04,0x04,0x04,0x0E,0x00,0x00}, // 0xD6 -{0x0E,0x0E,0x04,0x04,0x04,0x0E,0x00,0x00}, // 0xD7 -{0x11,0x0E,0x04,0x04,0x04,0x0E,0x00,0x00}, // 0xD8 -{0x04,0x04,0x04,0x1C,0x00,0x00,0x00,0x00}, // 0xD9 -{0x00,0x00,0x00,0x07,0x04,0x04,0x04,0x04}, // 0xDA -{0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F}, // 0xDB -{0x00,0x00,0x00,0x00,0x1F,0x1F,0x1F,0x1F}, // 0xDC -{0x04,0x04,0x04,0x00,0x00,0x04,0x04,0x04}, // 0xDD -{0x10,0x0E,0x04,0x04,0x04,0x0E,0x00,0x00}, // 0xDE -{0x1F,0x1F,0x1F,0x1F,0x00,0x00,0x00,0x00}, // 0xDF -{0x01,0x0E,0x11,0x11,0x11,0x0E,0x00,0x00}, // 0xE0 -{0x04,0x0A,0x0A,0x0A,0x09,0x0A,0x00,0x00}, // 0xE1 -{0x0E,0x0E,0x11,0x11,0x11,0x0E,0x00,0x00}, // 0xE2 -{0x10,0x0E,0x11,0x11,0x11,0x0E,0x00,0x00}, // 0xE3 -{0x0D,0x12,0x06,0x09,0x09,0x06,0x00,0x00}, // 0xE4 -{0x1E,0x0E,0x11,0x11,0x11,0x0E,0x00,0x00}, // 0xE5 -{0x00,0x00,0x09,0x09,0x0B,0x0D,0x08,0x00}, // 0xE6 -{0x08,0x08,0x0E,0x09,0x09,0x0E,0x08,0x00}, // 0xE7 -{0x00,0x08,0x0E,0x09,0x0E,0x08,0x00,0x00}, // 0xE8 -{0x01,0x12,0x12,0x12,0x12,0x0C,0x00,0x00}, // 0xE9 -{0x0F,0x09,0x09,0x09,0x09,0x06,0x00,0x00}, // 0xEA -{0x10,0x09,0x09,0x09,0x09,0x06,0x00,0x00}, // 0xEB -{0x01,0x02,0x09,0x09,0x06,0x06,0x18,0x00}, // 0xEC -{0x02,0x15,0x0A,0x04,0x04,0x04,0x00,0x00}, // 0xED -{0x1F,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0xEE -{0x02,0x04,0x00,0x00,0x00,0x00,0x00,0x00}, // 0xEF -{0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x00}, // 0xF0 -{0x00,0x00,0x04,0x0E,0x04,0x0E,0x00,0x00}, // 0xF1 -{0x00,0x00,0x00,0x00,0x00,0x1F,0x00,0x1F}, // 0xF2 -{0x19,0x1A,0x0A,0x1D,0x0B,0x11,0x00,0x00}, // 0xF3 -{0x0E,0x1A,0x1A,0x0A,0x0A,0x0A,0x0A,0x00}, // 0xF4 -{0x06,0x08,0x04,0x0A,0x04,0x02,0x0C,0x00}, // 0xF5 -{0x00,0x04,0x00,0x0E,0x00,0x04,0x00,0x00}, // 0xF6 -{0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x08}, // 0xF7 -{0x06,0x09,0x09,0x06,0x00,0x00,0x00,0x00}, // 0xF8 -{0x0A,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0xF9 -{0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x00}, // 0xFA -{0x0C,0x04,0x04,0x04,0x0E,0x00,0x00,0x00}, // 0xFB -{0x0C,0x02,0x0C,0x02,0x0C,0x00,0x00,0x00}, // 0xFC -{0x0C,0x02,0x04,0x08,0x0E,0x00,0x00,0x00}, // 0xFD -{0x00,0x00,0x0F,0x0F,0x0F,0x0F,0x00,0x00}, // 0xFE -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00} // 0xFF -}; - -#endif // font_5x8_horizontal_MSB_h \ No newline at end of file diff --git a/lib/lib_display/LedControl/src/font_8x8_horizontal_latin_MSB.h b/lib/lib_display/LedControl/src/font_8x8_horizontal_latin_MSB.h deleted file mode 100644 index e1a8af7ae..000000000 --- a/lib/lib_display/LedControl/src/font_8x8_horizontal_latin_MSB.h +++ /dev/null @@ -1,265 +0,0 @@ -#ifndef font_8x8_horizontal_latin_MSB_h -#define font_8x8_horizontal_latin_MSB_h - -const unsigned int font_char_width = 8; -const unsigned int font_char_height = 8; - -const char font[256][8]={ -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x00 -{0x0E,0x11,0x1B,0x11,0x15,0x11,0x0E,0x00}, // 0x01 -{0x0E,0x1F,0x15,0x1F,0x11,0x1F,0x0E,0x00}, // 0x02 -{0x00,0x0A,0x1F,0x1F,0x1F,0x0E,0x04,0x00}, // 0x03 -{0x00,0x04,0x0E,0x1F,0x1F,0x0E,0x04,0x00}, // 0x04 -{0x04,0x0E,0x0E,0x04,0x1F,0x1F,0x04,0x00}, // 0x05 -{0x00,0x04,0x0E,0x1F,0x1F,0x04,0x0E,0x00}, // 0x06 -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x07 -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x08 -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x09 -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x0A -{0x00,0x07,0x03,0x0D,0x12,0x12,0x0C,0x00}, // 0x0B -{0x0E,0x11,0x11,0x0E,0x04,0x0E,0x04,0x00}, // 0x0C -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x0D -{0x03,0x0D,0x0B,0x0D,0x0B,0x1B,0x18,0x00}, // 0x0E -{0x00,0x15,0x0E,0x1B,0x0E,0x15,0x00,0x00}, // 0x0F -{0x08,0x0C,0x0E,0x0F,0x0E,0x0C,0x08,0x00}, // 0x10 -{0x02,0x06,0x0E,0x1E,0x0E,0x06,0x02,0x00}, // 0x11 -{0x04,0x0E,0x1F,0x04,0x1F,0x0E,0x04,0x00}, // 0x12 -{0x0A,0x0A,0x0A,0x0A,0x0A,0x00,0x0A,0x00}, // 0x13 -{0x0F,0x15,0x15,0x0D,0x05,0x05,0x05,0x00}, // 0x14 -{0x0E,0x11,0x0C,0x0A,0x06,0x11,0x0E,0x00}, // 0x15 -{0x00,0x00,0x00,0x00,0x00,0x1E,0x1E,0x00}, // 0x16 -{0x04,0x0E,0x1F,0x04,0x1F,0x0E,0x04,0x0E}, // 0x17 -{0x04,0x0E,0x1F,0x04,0x04,0x04,0x04,0x00}, // 0x18 -{0x04,0x04,0x04,0x04,0x1F,0x0E,0x04,0x00}, // 0x19 -{0x00,0x04,0x06,0x1F,0x06,0x04,0x00,0x00}, // 0x1A -{0x00,0x04,0x0C,0x1F,0x0C,0x04,0x00,0x00}, // 0x1B -{0x00,0x00,0x00,0x10,0x10,0x10,0x1F,0x00}, // 0x1C -{0x00,0x0A,0x0A,0x1F,0x0A,0x0A,0x00,0x00}, // 0x1D -{0x04,0x04,0x0E,0x0E,0x1F,0x1F,0x00,0x00}, // 0x1E -{0x1F,0x1F,0x0E,0x0E,0x04,0x04,0x00,0x00}, // 0x1F - { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0020 (space) - { 0x18, 0x3C, 0x3C, 0x18, 0x18, 0x00, 0x18, 0x00}, // U+0021 (!) - { 0x36, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0022 (") - { 0x36, 0x36, 0x7F, 0x36, 0x7F, 0x36, 0x36, 0x00}, // U+0023 (#) - { 0x0C, 0x3E, 0x03, 0x1E, 0x30, 0x1F, 0x0C, 0x00}, // U+0024 ($) - { 0x00, 0x63, 0x33, 0x18, 0x0C, 0x66, 0x63, 0x00}, // U+0025 (%) - { 0x1C, 0x36, 0x1C, 0x6E, 0x3B, 0x33, 0x6E, 0x00}, // U+0026 (&) - { 0x06, 0x06, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0027 (') - { 0x18, 0x0C, 0x06, 0x06, 0x06, 0x0C, 0x18, 0x00}, // U+0028 (() - { 0x06, 0x0C, 0x18, 0x18, 0x18, 0x0C, 0x06, 0x00}, // U+0029 ()) - { 0x00, 0x66, 0x3C, 0xFF, 0x3C, 0x66, 0x00, 0x00}, // U+002A (*) - { 0x00, 0x0C, 0x0C, 0x3F, 0x0C, 0x0C, 0x00, 0x00}, // U+002B (+) - { 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x0C, 0x06}, // U+002C (,) - { 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00}, // U+002D (-) - { 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x0C, 0x00}, // U+002E (.) - { 0x60, 0x30, 0x18, 0x0C, 0x06, 0x03, 0x01, 0x00}, // U+002F (/) - { 0x3E, 0x63, 0x73, 0x7B, 0x6F, 0x67, 0x3E, 0x00}, // U+0030 (0) - { 0x0C, 0x0E, 0x0C, 0x0C, 0x0C, 0x0C, 0x3F, 0x00}, // U+0031 (1) - { 0x1E, 0x33, 0x30, 0x1C, 0x06, 0x33, 0x3F, 0x00}, // U+0032 (2) - { 0x1E, 0x33, 0x30, 0x1C, 0x30, 0x33, 0x1E, 0x00}, // U+0033 (3) - { 0x38, 0x3C, 0x36, 0x33, 0x7F, 0x30, 0x78, 0x00}, // U+0034 (4) - { 0x3F, 0x03, 0x1F, 0x30, 0x30, 0x33, 0x1E, 0x00}, // U+0035 (5) - { 0x1C, 0x06, 0x03, 0x1F, 0x33, 0x33, 0x1E, 0x00}, // U+0036 (6) - { 0x3F, 0x33, 0x30, 0x18, 0x0C, 0x0C, 0x0C, 0x00}, // U+0037 (7) - { 0x1E, 0x33, 0x33, 0x1E, 0x33, 0x33, 0x1E, 0x00}, // U+0038 (8) - { 0x1E, 0x33, 0x33, 0x3E, 0x30, 0x18, 0x0E, 0x00}, // U+0039 (9) - { 0x00, 0x0C, 0x0C, 0x00, 0x00, 0x0C, 0x0C, 0x00}, // U+003A (:) - { 0x00, 0x0C, 0x0C, 0x00, 0x00, 0x0C, 0x0C, 0x06}, // U+003B (;) - { 0x18, 0x0C, 0x06, 0x03, 0x06, 0x0C, 0x18, 0x00}, // U+003C (<) - { 0x00, 0x00, 0x3F, 0x00, 0x00, 0x3F, 0x00, 0x00}, // U+003D (=) - { 0x06, 0x0C, 0x18, 0x30, 0x18, 0x0C, 0x06, 0x00}, // U+003E (>) - { 0x1E, 0x33, 0x30, 0x18, 0x0C, 0x00, 0x0C, 0x00}, // U+003F (?) - { 0x3E, 0x63, 0x7B, 0x7B, 0x7B, 0x03, 0x1E, 0x00}, // U+0040 (@) - { 0x0C, 0x1E, 0x33, 0x33, 0x3F, 0x33, 0x33, 0x00}, // U+0041 (A) - { 0x3F, 0x66, 0x66, 0x3E, 0x66, 0x66, 0x3F, 0x00}, // U+0042 (B) - { 0x3C, 0x66, 0x03, 0x03, 0x03, 0x66, 0x3C, 0x00}, // U+0043 (C) - { 0x1F, 0x36, 0x66, 0x66, 0x66, 0x36, 0x1F, 0x00}, // U+0044 (D) - { 0x7F, 0x46, 0x16, 0x1E, 0x16, 0x46, 0x7F, 0x00}, // U+0045 (E) - { 0x7F, 0x46, 0x16, 0x1E, 0x16, 0x06, 0x0F, 0x00}, // U+0046 (F) - { 0x3C, 0x66, 0x03, 0x03, 0x73, 0x66, 0x7C, 0x00}, // U+0047 (G) - { 0x33, 0x33, 0x33, 0x3F, 0x33, 0x33, 0x33, 0x00}, // U+0048 (H) - { 0x1E, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x1E, 0x00}, // U+0049 (I) - { 0x78, 0x30, 0x30, 0x30, 0x33, 0x33, 0x1E, 0x00}, // U+004A (J) - { 0x67, 0x66, 0x36, 0x1E, 0x36, 0x66, 0x67, 0x00}, // U+004B (K) - { 0x0F, 0x06, 0x06, 0x06, 0x46, 0x66, 0x7F, 0x00}, // U+004C (L) - { 0x63, 0x77, 0x7F, 0x7F, 0x6B, 0x63, 0x63, 0x00}, // U+004D (M) - { 0x63, 0x67, 0x6F, 0x7B, 0x73, 0x63, 0x63, 0x00}, // U+004E (N) - { 0x1C, 0x36, 0x63, 0x63, 0x63, 0x36, 0x1C, 0x00}, // U+004F (O) - { 0x3F, 0x66, 0x66, 0x3E, 0x06, 0x06, 0x0F, 0x00}, // U+0050 (P) - { 0x1E, 0x33, 0x33, 0x33, 0x3B, 0x1E, 0x38, 0x00}, // U+0051 (Q) - { 0x3F, 0x66, 0x66, 0x3E, 0x36, 0x66, 0x67, 0x00}, // U+0052 (R) - { 0x1E, 0x33, 0x07, 0x0E, 0x38, 0x33, 0x1E, 0x00}, // U+0053 (S) - { 0x3F, 0x2D, 0x0C, 0x0C, 0x0C, 0x0C, 0x1E, 0x00}, // U+0054 (T) - { 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x3F, 0x00}, // U+0055 (U) - { 0x33, 0x33, 0x33, 0x33, 0x33, 0x1E, 0x0C, 0x00}, // U+0056 (V) - { 0x63, 0x63, 0x63, 0x6B, 0x7F, 0x77, 0x63, 0x00}, // U+0057 (W) - { 0x63, 0x63, 0x36, 0x1C, 0x1C, 0x36, 0x63, 0x00}, // U+0058 (X) - { 0x33, 0x33, 0x33, 0x1E, 0x0C, 0x0C, 0x1E, 0x00}, // U+0059 (Y) - { 0x7F, 0x63, 0x31, 0x18, 0x4C, 0x66, 0x7F, 0x00}, // U+005A (Z) - { 0x1E, 0x06, 0x06, 0x06, 0x06, 0x06, 0x1E, 0x00}, // U+005B ([) - { 0x03, 0x06, 0x0C, 0x18, 0x30, 0x60, 0x40, 0x00}, // U+005C (\) - { 0x1E, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1E, 0x00}, // U+005D (]) - { 0x08, 0x1C, 0x36, 0x63, 0x00, 0x00, 0x00, 0x00}, // U+005E (^) - { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF}, // U+005F (_) - { 0x0C, 0x0C, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0060 (`) - { 0x00, 0x00, 0x1E, 0x30, 0x3E, 0x33, 0x6E, 0x00}, // U+0061 (a) - { 0x07, 0x06, 0x06, 0x3E, 0x66, 0x66, 0x3B, 0x00}, // U+0062 (b) - { 0x00, 0x00, 0x1E, 0x33, 0x03, 0x33, 0x1E, 0x00}, // U+0063 (c) - { 0x38, 0x30, 0x30, 0x3e, 0x33, 0x33, 0x6E, 0x00}, // U+0064 (d) - { 0x00, 0x00, 0x1E, 0x33, 0x3f, 0x03, 0x1E, 0x00}, // U+0065 (e) - { 0x1C, 0x36, 0x06, 0x0f, 0x06, 0x06, 0x0F, 0x00}, // U+0066 (f) - { 0x00, 0x00, 0x6E, 0x33, 0x33, 0x3E, 0x30, 0x1F}, // U+0067 (g) - { 0x07, 0x06, 0x36, 0x6E, 0x66, 0x66, 0x67, 0x00}, // U+0068 (h) - { 0x0C, 0x00, 0x0E, 0x0C, 0x0C, 0x0C, 0x1E, 0x00}, // U+0069 (i) - { 0x30, 0x00, 0x30, 0x30, 0x30, 0x33, 0x33, 0x1E}, // U+006A (j) - { 0x07, 0x06, 0x66, 0x36, 0x1E, 0x36, 0x67, 0x00}, // U+006B (k) - { 0x0E, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x1E, 0x00}, // U+006C (l) - { 0x00, 0x00, 0x33, 0x7F, 0x7F, 0x6B, 0x63, 0x00}, // U+006D (m) - { 0x00, 0x00, 0x1F, 0x33, 0x33, 0x33, 0x33, 0x00}, // U+006E (n) - { 0x00, 0x00, 0x1E, 0x33, 0x33, 0x33, 0x1E, 0x00}, // U+006F (o) - { 0x00, 0x00, 0x3B, 0x66, 0x66, 0x3E, 0x06, 0x0F}, // U+0070 (p) - { 0x00, 0x00, 0x6E, 0x33, 0x33, 0x3E, 0x30, 0x78}, // U+0071 (q) - { 0x00, 0x00, 0x3B, 0x6E, 0x66, 0x06, 0x0F, 0x00}, // U+0072 (r) - { 0x00, 0x00, 0x3E, 0x03, 0x1E, 0x30, 0x1F, 0x00}, // U+0073 (s) - { 0x08, 0x0C, 0x3E, 0x0C, 0x0C, 0x2C, 0x18, 0x00}, // U+0074 (t) - { 0x00, 0x00, 0x33, 0x33, 0x33, 0x33, 0x6E, 0x00}, // U+0075 (u) - { 0x00, 0x00, 0x33, 0x33, 0x33, 0x1E, 0x0C, 0x00}, // U+0076 (v) - { 0x00, 0x00, 0x63, 0x6B, 0x7F, 0x7F, 0x36, 0x00}, // U+0077 (w) - { 0x00, 0x00, 0x63, 0x36, 0x1C, 0x36, 0x63, 0x00}, // U+0078 (x) - { 0x00, 0x00, 0x33, 0x33, 0x33, 0x3E, 0x30, 0x1F}, // U+0079 (y) - { 0x00, 0x00, 0x3F, 0x19, 0x0C, 0x26, 0x3F, 0x00}, // U+007A (z) - { 0x38, 0x0C, 0x0C, 0x07, 0x0C, 0x0C, 0x38, 0x00}, // U+007B ({) - { 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x00}, // U+007C (|) - { 0x07, 0x0C, 0x0C, 0x38, 0x0C, 0x0C, 0x07, 0x00}, // U+007D (}) - { 0x6E, 0x3B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+007E (~) - { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+007F{0x0E,0x11,0x10,0x10,0x11,0x0E,0x04,0x0C}, // 0x80 -{0x12,0x00,0x12,0x12,0x12,0x16,0x0A,0x00}, // 0x81 -{0x03,0x00,0x0E,0x11,0x1E,0x10,0x0E,0x00}, // 0x82 -{0x0E,0x00,0x0E,0x01,0x0F,0x11,0x0F,0x00}, // 0x83 -{0x0A,0x00,0x0E,0x01,0x0F,0x11,0x0F,0x00}, // 0x84 -{0x0C,0x00,0x0E,0x01,0x0F,0x11,0x0F,0x00}, // 0x85 -{0x0E,0x0A,0x0E,0x01,0x0F,0x11,0x0F,0x00}, // 0x86 -{0x00,0x0E,0x11,0x10,0x11,0x0E,0x04,0x0C}, // 0x87 -{0x0E,0x00,0x0E,0x11,0x1E,0x10,0x0E,0x00}, // 0x88 -{0x0A,0x00,0x0E,0x11,0x1E,0x10,0x0E,0x00}, // 0x89 -{0x0C,0x00,0x0E,0x11,0x1E,0x10,0x0E,0x00}, // 0x8A -{0x0A,0x00,0x04,0x04,0x04,0x04,0x06,0x00}, // 0x8B -{0x0E,0x00,0x04,0x04,0x04,0x04,0x06,0x00}, // 0x8C -{0x08,0x00,0x04,0x04,0x04,0x04,0x06,0x00}, // 0x8D -{0x0A,0x00,0x04,0x0A,0x11,0x1F,0x11,0x00}, // 0x8E -{0x0E,0x0A,0x0E,0x1B,0x11,0x1F,0x11,0x00}, // 0x8F -{0x03,0x00,0x1F,0x10,0x1E,0x10,0x1F,0x00}, // 0x90 -{0x00,0x00,0x1E,0x05,0x1F,0x14,0x0F,0x00}, // 0x91 -{0x0F,0x14,0x14,0x1F,0x14,0x14,0x17,0x00}, // 0x92 -{0x0E,0x00,0x0C,0x12,0x12,0x12,0x0C,0x00}, // 0x93 -{0x0A,0x00,0x0C,0x12,0x12,0x12,0x0C,0x00}, // 0x94 -{0x18,0x00,0x0C,0x12,0x12,0x12,0x0C,0x00}, // 0x95 -{0x0E,0x00,0x12,0x12,0x12,0x16,0x0A,0x00}, // 0x96 -{0x18,0x00,0x12,0x12,0x12,0x16,0x0A,0x00}, // 0x97 -{0x0A,0x00,0x12,0x12,0x12,0x0E,0x04,0x18}, // 0x98 -{0x12,0x0C,0x12,0x12,0x12,0x12,0x0C,0x00}, // 0x99 -{0x0A,0x00,0x12,0x12,0x12,0x12,0x0C,0x00}, // 0x9A -{0x00,0x00,0x01,0x0E,0x16,0x1A,0x1C,0x20}, // 0x9B -{0x06,0x09,0x08,0x1E,0x08,0x09,0x17,0x00}, // 0x9C -{0x0F,0x13,0x15,0x15,0x15,0x19,0x1E,0x00}, // 0x9D -{0x00,0x11,0x0A,0x04,0x0A,0x11,0x00,0x00}, // 0x9E -{0x02,0x05,0x04,0x0E,0x04,0x04,0x14,0x08}, // 0x9F - { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+00A0 (no break space) - { 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x18, 0x00}, // U+00A1 (inverted !) - { 0x18, 0x18, 0x7E, 0x03, 0x03, 0x7E, 0x18, 0x18}, // U+00A2 (dollarcents) - { 0x1C, 0x36, 0x26, 0x0F, 0x06, 0x67, 0x3F, 0x00}, // U+00A3 (pound sterling) - { 0x00, 0x00, 0x63, 0x3E, 0x36, 0x3E, 0x63, 0x00}, // U+00A4 (currency mark) - { 0x33, 0x33, 0x1E, 0x3F, 0x0C, 0x3F, 0x0C, 0x0C}, // U+00A5 (yen) - { 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x00}, // U+00A6 (broken pipe) - { 0x7C, 0xC6, 0x1C, 0x36, 0x36, 0x1C, 0x33, 0x1E}, // U+00A7 (paragraph) - { 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+00A8 (diaeresis) - { 0x3C, 0x42, 0x99, 0x85, 0x85, 0x99, 0x42, 0x3C}, // U+00A9 (copyright symbol) - { 0x3C, 0x36, 0x36, 0x7C, 0x00, 0x00, 0x00, 0x00}, // U+00AA (superscript a) - { 0x00, 0xCC, 0x66, 0x33, 0x66, 0xCC, 0x00, 0x00}, // U+00AB (<<) - { 0x00, 0x00, 0x00, 0x3F, 0x30, 0x30, 0x00, 0x00}, // U+00AC (gun pointing left) - { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+00AD (soft hyphen) - { 0x3C, 0x42, 0x9D, 0xA5, 0x9D, 0xA5, 0x42, 0x3C}, // U+00AE (registered symbol) - { 0x7E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+00AF (macron) - { 0x1C, 0x36, 0x36, 0x1C, 0x00, 0x00, 0x00, 0x00}, // U+00B0 (degree) - { 0x18, 0x18, 0x7E, 0x18, 0x18, 0x00, 0x7E, 0x00}, // U+00B1 (plusminus) - { 0x1C, 0x30, 0x18, 0x0C, 0x3C, 0x00, 0x00, 0x00}, // U+00B2 (superscript 2) - { 0x1C, 0x30, 0x18, 0x30, 0x1C, 0x00, 0x00, 0x00}, // U+00B2 (superscript 3) - { 0x18, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+00B2 (aigu) - { 0x00, 0x00, 0x66, 0x66, 0x66, 0x3E, 0x06, 0x03}, // U+00B5 (mu) - { 0xFE, 0xDB, 0xDB, 0xDE, 0xD8, 0xD8, 0xD8, 0x00}, // U+00B6 (pilcrow) - { 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00}, // U+00B7 (central dot) - { 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x1E}, // U+00B8 (cedille) - { 0x08, 0x0C, 0x08, 0x1C, 0x00, 0x00, 0x00, 0x00}, // U+00B9 (superscript 1) - { 0x1C, 0x36, 0x36, 0x1C, 0x00, 0x00, 0x00, 0x00}, // U+00BA (superscript 0) - { 0x00, 0x33, 0x66, 0xCC, 0x66, 0x33, 0x00, 0x00}, // U+00BB (>>) - { 0xC3, 0x63, 0x33, 0xBD, 0xEC, 0xF6, 0xF3, 0x03}, // U+00BC (1/4) - { 0xC3, 0x63, 0x33, 0x7B, 0xCC, 0x66, 0x33, 0xF0}, // U+00BD (1/2) - { 0x03, 0xC4, 0x63, 0xB4, 0xDB, 0xAC, 0xE6, 0x80}, // U+00BE (3/4) - { 0x0C, 0x00, 0x0C, 0x06, 0x03, 0x33, 0x1E, 0x00}, // U+00BF (inverted ?) - { 0x07, 0x00, 0x1C, 0x36, 0x63, 0x7F, 0x63, 0x00}, // U+00C0 (A grave) - { 0x70, 0x00, 0x1C, 0x36, 0x63, 0x7F, 0x63, 0x00}, // U+00C1 (A aigu) - { 0x1C, 0x36, 0x00, 0x3E, 0x63, 0x7F, 0x63, 0x00}, // U+00C2 (A circumflex) - { 0x6E, 0x3B, 0x00, 0x3E, 0x63, 0x7F, 0x63, 0x00}, // U+00C3 (A ~) - { 0x63, 0x1C, 0x36, 0x63, 0x7F, 0x63, 0x63, 0x00}, // U+00C4 (A umlaut) - { 0x0C, 0x0C, 0x00, 0x1E, 0x33, 0x3F, 0x33, 0x00}, // U+00C5 (A ring) - { 0x7C, 0x36, 0x33, 0x7F, 0x33, 0x33, 0x73, 0x00}, // U+00C6 (AE) - { 0x1E, 0x33, 0x03, 0x33, 0x1E, 0x18, 0x30, 0x1E}, // U+00C7 (C cedille) - { 0x07, 0x00, 0x3F, 0x06, 0x1E, 0x06, 0x3F, 0x00}, // U+00C8 (E grave) - { 0x38, 0x00, 0x3F, 0x06, 0x1E, 0x06, 0x3F, 0x00}, // U+00C9 (E aigu) - { 0x0C, 0x12, 0x3F, 0x06, 0x1E, 0x06, 0x3F, 0x00}, // U+00CA (E circumflex) - { 0x36, 0x00, 0x3F, 0x06, 0x1E, 0x06, 0x3F, 0x00}, // U+00CB (E umlaut) - { 0x07, 0x00, 0x1E, 0x0C, 0x0C, 0x0C, 0x1E, 0x00}, // U+00CC (I grave) - { 0x38, 0x00, 0x1E, 0x0C, 0x0C, 0x0C, 0x1E, 0x00}, // U+00CD (I aigu) - { 0x0C, 0x12, 0x00, 0x1E, 0x0C, 0x0C, 0x1E, 0x00}, // U+00CE (I circumflex) - { 0x33, 0x00, 0x1E, 0x0C, 0x0C, 0x0C, 0x1E, 0x00}, // U+00CF (I umlaut) - { 0x3F, 0x66, 0x6F, 0x6F, 0x66, 0x66, 0x3F, 0x00}, // U+00D0 (Eth) - { 0x3F, 0x00, 0x33, 0x37, 0x3F, 0x3B, 0x33, 0x00}, // U+00D1 (N ~) - { 0x0E, 0x00, 0x18, 0x3C, 0x66, 0x3C, 0x18, 0x00}, // U+00D2 (O grave) - { 0x70, 0x00, 0x18, 0x3C, 0x66, 0x3C, 0x18, 0x00}, // U+00D3 (O aigu) - { 0x3C, 0x66, 0x18, 0x3C, 0x66, 0x3C, 0x18, 0x00}, // U+00D4 (O circumflex) - { 0x6E, 0x3B, 0x00, 0x3E, 0x63, 0x63, 0x3E, 0x00}, // U+00D5 (O ~) - { 0xC3, 0x18, 0x3C, 0x66, 0x66, 0x3C, 0x18, 0x00}, // U+00D6 (O umlaut) - { 0x00, 0x36, 0x1C, 0x08, 0x1C, 0x36, 0x00, 0x00}, // U+00D7 (multiplicative x) - { 0x5C, 0x36, 0x73, 0x7B, 0x6F, 0x36, 0x1D, 0x00}, // U+00D8 (O stroke) - { 0x0E, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3C, 0x00}, // U+00D9 (U grave) - { 0x70, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3C, 0x00}, // U+00DA (U aigu) - { 0x3C, 0x66, 0x00, 0x66, 0x66, 0x66, 0x3C, 0x00}, // U+00DB (U circumflex) - { 0x33, 0x00, 0x33, 0x33, 0x33, 0x33, 0x1E, 0x00}, // U+00DC (U umlaut) - { 0x70, 0x00, 0x66, 0x66, 0x3C, 0x18, 0x18, 0x00}, // U+00DD (Y aigu) - { 0x0F, 0x06, 0x3E, 0x66, 0x66, 0x3E, 0x06, 0x0F}, // U+00DE (Thorn) - { 0x00, 0x1E, 0x33, 0x1F, 0x33, 0x1F, 0x03, 0x03}, // U+00DF (beta) - { 0x07, 0x00, 0x1E, 0x30, 0x3E, 0x33, 0x7E, 0x00}, // U+00E0 (a grave) - { 0x38, 0x00, 0x1E, 0x30, 0x3E, 0x33, 0x7E, 0x00}, // U+00E1 (a aigu) - { 0x7E, 0xC3, 0x3C, 0x60, 0x7C, 0x66, 0xFC, 0x00}, // U+00E2 (a circumflex) - { 0x6E, 0x3B, 0x1E, 0x30, 0x3E, 0x33, 0x7E, 0x00}, // U+00E3 (a ~) - { 0x33, 0x00, 0x1E, 0x30, 0x3E, 0x33, 0x7E, 0x00}, // U+00E4 (a umlaut) - { 0x0C, 0x0C, 0x1E, 0x30, 0x3E, 0x33, 0x7E, 0x00}, // U+00E5 (a ring) - { 0x00, 0x00, 0xFE, 0x30, 0xFE, 0x33, 0xFE, 0x00}, // U+00E6 (ae) - { 0x00, 0x00, 0x1E, 0x03, 0x03, 0x1E, 0x30, 0x1C}, // U+00E7 (c cedille) - { 0x07, 0x00, 0x1E, 0x33, 0x3F, 0x03, 0x1E, 0x00}, // U+00E8 (e grave) - { 0x38, 0x00, 0x1E, 0x33, 0x3F, 0x03, 0x1E, 0x00}, // U+00E9 (e aigu) - { 0x7E, 0xC3, 0x3C, 0x66, 0x7E, 0x06, 0x3C, 0x00}, // U+00EA (e circumflex) - { 0x33, 0x00, 0x1E, 0x33, 0x3F, 0x03, 0x1E, 0x00}, // U+00EB (e umlaut) - { 0x07, 0x00, 0x0E, 0x0C, 0x0C, 0x0C, 0x1E, 0x00}, // U+00EC (i grave) - { 0x1C, 0x00, 0x0E, 0x0C, 0x0C, 0x0C, 0x1E, 0x00}, // U+00ED (i augu) - { 0x3E, 0x63, 0x1C, 0x18, 0x18, 0x18, 0x3C, 0x00}, // U+00EE (i circumflex) - { 0x33, 0x00, 0x0E, 0x0C, 0x0C, 0x0C, 0x1E, 0x00}, // U+00EF (i umlaut) - { 0x1B, 0x0E, 0x1B, 0x30, 0x3E, 0x33, 0x1E, 0x00}, // U+00F0 (eth) - { 0x00, 0x1F, 0x00, 0x1F, 0x33, 0x33, 0x33, 0x00}, // U+00F1 (n ~) - { 0x00, 0x07, 0x00, 0x1E, 0x33, 0x33, 0x1E, 0x00}, // U+00F2 (o grave) - { 0x00, 0x38, 0x00, 0x1E, 0x33, 0x33, 0x1E, 0x00}, // U+00F3 (o aigu) - { 0x1E, 0x33, 0x00, 0x1E, 0x33, 0x33, 0x1E, 0x00}, // U+00F4 (o circumflex) - { 0x6E, 0x3B, 0x00, 0x1E, 0x33, 0x33, 0x1E, 0x00}, // U+00F5 (o ~) - { 0x00, 0x33, 0x00, 0x1E, 0x33, 0x33, 0x1E, 0x00}, // U+00F6 (o umlaut) - { 0x18, 0x18, 0x00, 0x7E, 0x00, 0x18, 0x18, 0x00}, // U+00F7 (division) - { 0x00, 0x60, 0x3C, 0x76, 0x7E, 0x6E, 0x3C, 0x06}, // U+00F8 (o stroke) - { 0x00, 0x07, 0x00, 0x33, 0x33, 0x33, 0x7E, 0x00}, // U+00F9 (u grave) - { 0x00, 0x38, 0x00, 0x33, 0x33, 0x33, 0x7E, 0x00}, // U+00FA (u aigu) - { 0x1E, 0x33, 0x00, 0x33, 0x33, 0x33, 0x7E, 0x00}, // U+00FB (u circumflex) - { 0x00, 0x33, 0x00, 0x33, 0x33, 0x33, 0x7E, 0x00}, // U+00FC (u umlaut) - { 0x00, 0x38, 0x00, 0x33, 0x33, 0x3E, 0x30, 0x1F}, // U+00FD (y aigu) - { 0x00, 0x00, 0x06, 0x3E, 0x66, 0x3E, 0x06, 0x00}, // U+00FE (thorn) - { 0x00, 0x33, 0x00, 0x33, 0x33, 0x3E, 0x30, 0x1F} // U+00FF (y umlaut) -}; - -#endif \ No newline at end of file diff --git a/tasmota/xdsp_19_max7219_matrix.ino b/tasmota/xdsp_19_max7219_matrix.ino index 3ec3ac332..82a4a24bb 100644 --- a/tasmota/xdsp_19_max7219_matrix.ino +++ b/tasmota/xdsp_19_max7219_matrix.ino @@ -113,22 +113,31 @@ bool MAX7291Matrix_initDriver(void) } Settings->display_model = XDSP_19; + renderer = nullptr; // renderer not yet used if (Settings->display_width) // [pixel] { LedMatrix_settings.modulesPerRow = (Settings->display_width - 1) / 8 + 1; } Settings->display_width = 8 * LedMatrix_settings.modulesPerRow; - Settings->display_cols[0] = Settings->display_width; + Settings->display_cols[0] = LedMatrix_settings.modulesPerRow; if (Settings->display_height) // [pixel] { LedMatrix_settings.modulesPerCol = (Settings->display_height - 1) / 8 + 1; } - Settings->display_height = 8 * LedMatrix_settings. modulesPerCol; - Settings->display_rows = Settings->display_height; - Settings->display_cols[1] = Settings->display_height; + Settings->display_height = 8 * LedMatrix_settings.modulesPerCol; + Settings->display_rows = LedMatrix_settings.modulesPerCol; + Settings->display_cols[1] = LedMatrix_settings.modulesPerCol; max7219_Matrix = new LedMatrix(Pin(GPIO_MAX7219DIN), Pin(GPIO_MAX7219CLK), Pin(GPIO_MAX7219CS), LedMatrix_settings.modulesPerRow, LedMatrix_settings.modulesPerCol); + if( LedMatrix_settings.show_clock == 0) + { + Settings->display_mode = 0; // text mode + } + else{ + Settings->display_mode = 1; // clock mode + } max2791Matrix_initDriver_done = true; + AddLog(LOG_LEVEL_INFO, PSTR("MTX: MAX7291Matrix_initDriver DIN:%d CLK:%d CS:%d size(%dx%d)"), Pin(GPIO_MAX7219DIN), Pin(GPIO_MAX7219CLK), Pin(GPIO_MAX7219CS), LedMatrix_settings.modulesPerRow, LedMatrix_settings.modulesPerCol); return MAX7291Matrix_init(); } @@ -137,12 +146,17 @@ bool MAX7291Matrix_init(void) { int intensity = GetDisplayDimmer16(); // 0..15 max7219_Matrix->setIntensity(intensity); - int orientation = Settings->display_rotate; - max7219_Matrix->setOrientation((LedMatrix::ModuleOrientation)orientation ); - AddLog(LOG_LEVEL_INFO, PSTR("MTX: MAX7291Matrix_init %dx%d modules, orientation: %d, intensity: %d"), LedMatrix_settings.modulesPerRow , LedMatrix_settings.modulesPerCol, orientation, intensity); - - //max7219_Matrix->test(); - AddLog(LOG_LEVEL_INFO, PSTR("MTX: display test")); + if(Settings->display_rotate <= 3) + { + max7219_Matrix->setOrientation((LedMatrix::ModuleOrientation)Settings->display_rotate ); + } + else + { + // default for most 32x8 modules + Settings->display_rotate = LedMatrix::ORIENTATION_UPSIDE_DOWN; + max7219_Matrix->setOrientation( LedMatrix::ORIENTATION_UPSIDE_DOWN ); + } + AddLog(LOG_LEVEL_INFO, PSTR("MTX: MAX7291Matrix_init orientation: %d, intensity: %d"), Settings->display_rotate, intensity); return true; } @@ -183,28 +197,38 @@ bool MAX7291Matrix_clock(void) { LedMatrix_settings.show_clock = XdrvMailbox.payload; if (ArgC() == 0) - XdrvMailbox.payload = 1; - if (XdrvMailbox.payload > 1) - { - LedMatrix_settings.timeFormat = "%H:%M"; - if(LedMatrix_settings.modulesPerRow > 6) - { - LedMatrix_settings.timeFormat = "%H:%M:%S"; - } XdrvMailbox.payload = 2; - } - else - { - LedMatrix_settings.timeFormat = "%I:%M"; - if(LedMatrix_settings.modulesPerRow > 6) + switch(XdrvMailbox.payload) { - LedMatrix_settings.timeFormat = "%I:%M:%S"; + case 0: + // no clock, switch to text mode + Settings->display_mode = 0; + return true; + case 1: + // 12 h clock + LedMatrix_settings.timeFormat = "%I:%M"; + if(LedMatrix_settings.modulesPerRow > 6) + { + LedMatrix_settings.timeFormat = "%I:%M:%S"; + } + Settings->display_mode = 1; + break; + case 2: + // 24 h clock + LedMatrix_settings.timeFormat = "%H:%M"; + if(LedMatrix_settings.modulesPerRow > 6) + { + LedMatrix_settings.timeFormat = "%H:%M:%S"; + } + Settings->display_mode = 1; + break; + default: + return false; } - XdrvMailbox.payload = 1; - } AddLog(LOG_LEVEL_DEBUG, PSTR("MTX: LedMatrix_settings.show_clock %d, timeFormat %s"), LedMatrix_settings.show_clock, LedMatrix_settings.timeFormat); + max7219_Matrix->clearDisplay(); MAX7291Matrix_showTime(); return true; } @@ -220,7 +244,7 @@ bool MAX7291Matrix_showTime() timeinfo = localtime(&rawtime); strftime(timeStr, 10, LedMatrix_settings.timeFormat, timeinfo); - max7219_Matrix->drawText(timeStr); + max7219_Matrix->drawText(timeStr, false); // false: do not clear desplay on update to prevent flicker return true; } #endif // USE_DISPLAY_MODES1TO5 @@ -254,7 +278,16 @@ bool Xdsp19(uint8_t function) result = max7219_Matrix->setIntensity(GetDisplayDimmer16()); break; case FUNC_DISPLAY_DRAW_STRING: - result = max7219_Matrix->drawText(dsp_str); + case FUNC_DISPLAY_SCROLLTEXT: + case FUNC_DISPLAY_SEVENSEG_TEXT: + Settings->display_mode = 0; // text mode + LedMatrix_settings.show_clock = 0; // disable clock mode + result = max7219_Matrix->drawText(XdrvMailbox.data, true); // true: clears display before drawing text + break; + case FUNC_DISPLAY_SEVENSEG_TEXTNC: + Settings->display_mode = 0; // text mode + LedMatrix_settings.show_clock = 0; // disable clock mode + result = max7219_Matrix->drawText(XdrvMailbox.data, false); // false: does not clear display before drawing text break; case FUNC_DISPLAY_SCROLLDELAY: result = MAX7291Matrix_scrollDelay(); From 09974f8873fa1ffdb8eeb19f4568e6dec31b7ed1 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 30 Nov 2021 14:18:26 +0100 Subject: [PATCH 012/402] Command for all Modules at once --- lib/lib_display/LedControl/src/LedControl.cpp | 67 ++++++++++++++----- lib/lib_display/LedControl/src/LedControl.h | 9 ++- lib/lib_display/LedControl/src/LedMatrix.cpp | 56 +++++++++++++--- lib/lib_display/LedControl/src/LedMatrix.h | 1 + 4 files changed, 104 insertions(+), 29 deletions(-) diff --git a/lib/lib_display/LedControl/src/LedControl.cpp b/lib/lib_display/LedControl/src/LedControl.cpp index 11e7a2908..baaa3802c 100644 --- a/lib/lib_display/LedControl/src/LedControl.cpp +++ b/lib/lib_display/LedControl/src/LedControl.cpp @@ -55,18 +55,20 @@ LedControl::LedControl(int dataPin, int clkPin, int csPin, int numDevices) { pinMode(SPI_CS,OUTPUT); digitalWrite(SPI_CS,HIGH); SPI_MOSI=dataPin; - for (int i = 0; i < 8 * MAX72XX_MAX_DEVICES; i++) - status[i] = 0x00; - for(int i=0;i=maxDevices) return; @@ -89,6 +96,13 @@ void LedControl::setScanLimit(int addr, int limit) { spiTransfer(addr, OP_SCANLIMIT,limit); } +void LedControl::setScanLimit_allDevices(int limit) { + if(limit <0 || limit>8) return; + + memset(deviceDataBuff, (byte)limit, maxDevices); + spiTransfer_allDevices(OP_SCANLIMIT,deviceDataBuff); +} + void LedControl::setIntensity(int addr, int intensity) { if(addr<0 || addr>=maxDevices) return; @@ -96,6 +110,15 @@ void LedControl::setIntensity(int addr, int intensity) { spiTransfer(addr, OP_INTENSITY,intensity); } +void LedControl::setIntensity_allDevices(int intensity) +{ + if (intensity < 0 | intensity > 15) + return; + + memset(deviceDataBuff, (byte)intensity, maxDevices); + spiTransfer_allDevices(OP_INTENSITY, deviceDataBuff); +} + void LedControl::clearDisplay(int addr) { int offset; @@ -108,6 +131,16 @@ void LedControl::clearDisplay(int addr) { } } +void LedControl::clearDisplay_allDevices() +{ + memset(status, (byte)0, 8 * maxDevices); + memset(deviceDataBuff, (byte)0, maxDevices); + for (int row = 0; row < 8; row++) + { + spiTransfer_allDevices(row + 1, deviceDataBuff); + } +} + void LedControl::setLed(int addr, int row, int column, boolean state) { int offset; byte val=0x00; @@ -138,13 +171,13 @@ void LedControl::setRow(int addr, int row, byte value) { spiTransfer(addr, row+1,status[offset+row]); } -void LedControl::setRowLong(int row, byte *value) +void LedControl::setRow_allDevices(int row, byte *value) { if (row < 0 || row > 7) return; for (int addr = 0; addr < maxDevices; addr++) status[addr * 8 + row] = value[addr]; - spiTransferLong(row + 1, value); + spiTransfer_allDevices(row + 1, value); } void LedControl::setColumn(int addr, int col, byte value) { @@ -217,7 +250,7 @@ void LedControl::spiTransfer(int addr, volatile byte opcode, volatile byte data) digitalWrite(SPI_CS,HIGH); } -void LedControl::spiTransferLong(byte opcode, const byte* data) { +void LedControl::spiTransfer_allDevices(byte opcode, const byte* data) { //Create an array with the data to shift out for (int addr = 0; addr < maxDevices; addr++) { @@ -227,8 +260,8 @@ void LedControl::spiTransferLong(byte opcode, const byte* data) { //enable the line digitalWrite(SPI_CS, LOW); //Now shift out the data - for (int i = maxDevices * 2; i > 0; i--) - shiftOut(SPI_MOSI, SPI_CLK, MSBFIRST, spidata[i - 1]); + for (int i = maxDevices * 2 -1; i >= 0; i--) + shiftOut(SPI_MOSI, SPI_CLK, MSBFIRST, spidata[i]); //latch the data onto the display digitalWrite(SPI_CS, HIGH); } diff --git a/lib/lib_display/LedControl/src/LedControl.h b/lib/lib_display/LedControl/src/LedControl.h index 31fed9ffe..4fc7523df 100644 --- a/lib/lib_display/LedControl/src/LedControl.h +++ b/lib/lib_display/LedControl/src/LedControl.h @@ -69,10 +69,11 @@ class LedControl { /* Send out a single command to one device */ void spiTransfer(int addr, byte opcode, byte data); /* Send out a command with the same opcode to all devices */ - void spiTransferLong(byte opcode, const byte* data); + void spiTransfer_allDevices(byte opcode, const byte* data); /* We keep track of the led-status for all 8 devices in this array */ byte status[8 * MAX72XX_MAX_DEVICES]; + byte deviceDataBuff[MAX72XX_MAX_DEVICES]; /* Data is shifted out of this pin*/ int SPI_MOSI; /* The clock is signaled on this pin */ @@ -108,6 +109,7 @@ class LedControl { * for normal operation. */ void shutdown(int addr, bool status); + void shutdown_allDevices( bool status); /* * Set the number of digits (or rows) to be displayed. @@ -118,6 +120,7 @@ class LedControl { * limit number of digits to be displayed (1..8) */ void setScanLimit(int addr, int limit); + void setScanLimit_allDevices(int limit); /* * Set the brightness of the display. @@ -126,6 +129,7 @@ class LedControl { * intensity the brightness of the display. (0..15) */ void setIntensity(int addr, int intensity); + void setIntensity_allDevices(int intensity); /* * Switch all Leds on the display off. @@ -133,6 +137,7 @@ class LedControl { * addr address of the display to control */ void clearDisplay(int addr); + void clearDisplay_allDevices(); /* * Set the status of a single Led. @@ -161,7 +166,7 @@ class LedControl { * @param row [0..8] * @param value array of bytes, one for each device */ - void setRowLong(int row, byte* value); + void setRow_allDevices(int row, byte* value); /* * Set all 8 Led's in a column to a new state diff --git a/lib/lib_display/LedControl/src/LedMatrix.cpp b/lib/lib_display/LedControl/src/LedMatrix.cpp index 1579e0852..59882cd15 100644 --- a/lib/lib_display/LedControl/src/LedMatrix.cpp +++ b/lib/lib_display/LedControl/src/LedMatrix.cpp @@ -139,10 +139,7 @@ bool LedMatrix::clearDisplay(void) bool LedMatrix::setIntensity(byte dim) { - for (int addr = 0; addr < modules; addr++) - { - ledControl->setIntensity(addr, dim); // 1..15 - } + ledControl->setIntensity_allDevices(dim); // 1..15 return true; } @@ -183,9 +180,51 @@ bool LedMatrix::setPixel(const int x, const int y, bool on) void LedMatrix::refresh() { - for (int i = 0; i < modulesPerRow * displayHeight; i++) + int col = 0; + int pixelRow = 0; + int bufPos = 0; + int deviceRow = 0; + for(int ledRow = 7; ledRow >= 0; ledRow--) // refresh from buttom to top { - refreshByteOfBuffer(i); + for( int addr = 0; addr < modules; addr++) + { + switch(moduleOrientation) + { + case ORIENTATION_NORMAL: + col = addr % modulesPerRow; + pixelRow = (addr / modulesPerRow) * 8 + ledRow; + bufPos = pixelRow * modulesPerRow + col; + deviceDataBuff[addr] = buffer[bufPos]; + deviceRow = ledRow; + break; + case ORIENTATION_UPSIDE_DOWN: + col = addr % modulesPerRow; + pixelRow = (addr / modulesPerRow) * 8 + deviceRow; + bufPos = pixelRow * modulesPerRow + col; + deviceDataBuff[addr] = revereBitorder(buffer[bufPos]); // mirror + deviceRow = 7 - ledRow; // upside down + break; + } + if(moduleOrientation == ORIENTATION_NORMAL || moduleOrientation == ORIENTATION_UPSIDE_DOWN) + { + col = addr % modulesPerRow; + pixelRow = (addr / modulesPerRow) * 8 + ledRow; + bufPos = pixelRow * modulesPerRow + col; + if(moduleOrientation == ORIENTATION_NORMAL) + { + // ORIENTATION_NORMAL + deviceDataBuff[addr] = buffer[bufPos]; + deviceRow = ledRow; + } + else + { + // ORIENTATION_UPSIDE_DOWN + deviceDataBuff[addr] = revereBitorder(buffer[bufPos]); // mirror + deviceRow = 7 - ledRow; // upside down + } + } + } + ledControl->setRow_allDevices(deviceRow, deviceDataBuff); // upside down } } @@ -227,10 +266,7 @@ bool LedMatrix::shutdown(bool b) bool LedMatrix::clear(void) { memset(buffer, 0, MATRIX_BUFFER_SIZE); - for (int addr = 0; addr < modules; addr++) - { - ledControl->clearDisplay(addr); - } + ledControl->clearDisplay_allDevices(); return true; } diff --git a/lib/lib_display/LedControl/src/LedMatrix.h b/lib/lib_display/LedControl/src/LedMatrix.h index b369173d0..9fee69a5f 100644 --- a/lib/lib_display/LedControl/src/LedMatrix.h +++ b/lib/lib_display/LedControl/src/LedMatrix.h @@ -154,6 +154,7 @@ class LedMatrix unsigned int modules; // number of 8x8 mudules uint8_t moduleOrientation; byte buffer[MATRIX_BUFFER_SIZE]; + byte deviceDataBuff[MAX72XX_MAX_DEVICES]; LedControl* ledControl; int charWidth; int charHeight; From 306ed0d2dd8040f7f56eaba24a9ea3cf8b0925cc Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 3 Dec 2021 16:50:55 +0100 Subject: [PATCH 013/402] max7219 dot matrix ready for pull request --- lib/lib_display/LedControl/src/LedControl.cpp | 82 ++------- lib/lib_display/LedControl/src/LedControl.h | 25 +-- lib/lib_display/LedControl/src/LedMatrix.cpp | 173 +++++++++--------- lib/lib_display/LedControl/src/LedMatrix.h | 59 ++++-- tasmota/xdsp_19_max7219_matrix.ino | 20 +- 5 files changed, 162 insertions(+), 197 deletions(-) diff --git a/lib/lib_display/LedControl/src/LedControl.cpp b/lib/lib_display/LedControl/src/LedControl.cpp index baaa3802c..5807aa6af 100644 --- a/lib/lib_display/LedControl/src/LedControl.cpp +++ b/lib/lib_display/LedControl/src/LedControl.cpp @@ -47,28 +47,26 @@ LedControl::LedControl(int dataPin, int clkPin, int csPin, int numDevices) { SPI_MOSI=dataPin; SPI_CLK=clkPin; SPI_CS=csPin; - if (numDevices <= 0 || numDevices > MAX72XX_MAX_DEVICES) - numDevices = MAX72XX_MAX_DEVICES; + if(numDevices<=0 || numDevices>8 ) + numDevices=8; maxDevices = numDevices; pinMode(SPI_MOSI,OUTPUT); pinMode(SPI_CLK,OUTPUT); pinMode(SPI_CS,OUTPUT); digitalWrite(SPI_CS,HIGH); SPI_MOSI=dataPin; - - memset(status, (byte)0, 8 * MAX72XX_MAX_DEVICES); - memset(deviceDataBuff, (byte)0, MAX72XX_MAX_DEVICES); - - // display test - spiTransfer_allDevices(OP_DISPLAYTEST, deviceDataBuff); + for(int i=0;i<64;i++) + status[i]=0x00; + for(int i=0;i=maxDevices) return; @@ -96,13 +89,6 @@ void LedControl::setScanLimit(int addr, int limit) { spiTransfer(addr, OP_SCANLIMIT,limit); } -void LedControl::setScanLimit_allDevices(int limit) { - if(limit <0 || limit>8) return; - - memset(deviceDataBuff, (byte)limit, maxDevices); - spiTransfer_allDevices(OP_SCANLIMIT,deviceDataBuff); -} - void LedControl::setIntensity(int addr, int intensity) { if(addr<0 || addr>=maxDevices) return; @@ -110,15 +96,6 @@ void LedControl::setIntensity(int addr, int intensity) { spiTransfer(addr, OP_INTENSITY,intensity); } -void LedControl::setIntensity_allDevices(int intensity) -{ - if (intensity < 0 | intensity > 15) - return; - - memset(deviceDataBuff, (byte)intensity, maxDevices); - spiTransfer_allDevices(OP_INTENSITY, deviceDataBuff); -} - void LedControl::clearDisplay(int addr) { int offset; @@ -131,16 +108,6 @@ void LedControl::clearDisplay(int addr) { } } -void LedControl::clearDisplay_allDevices() -{ - memset(status, (byte)0, 8 * maxDevices); - memset(deviceDataBuff, (byte)0, maxDevices); - for (int row = 0; row < 8; row++) - { - spiTransfer_allDevices(row + 1, deviceDataBuff); - } -} - void LedControl::setLed(int addr, int row, int column, boolean state) { int offset; byte val=0x00; @@ -171,15 +138,6 @@ void LedControl::setRow(int addr, int row, byte value) { spiTransfer(addr, row+1,status[offset+row]); } -void LedControl::setRow_allDevices(int row, byte *value) -{ - if (row < 0 || row > 7) - return; - for (int addr = 0; addr < maxDevices; addr++) - status[addr * 8 + row] = value[addr]; - spiTransfer_allDevices(row + 1, value); -} - void LedControl::setColumn(int addr, int col, byte value) { byte val; @@ -237,7 +195,7 @@ void LedControl::spiTransfer(int addr, volatile byte opcode, volatile byte data) int maxbytes=maxDevices*2; for(int i=0;i= 0; i--) - shiftOut(SPI_MOSI, SPI_CLK, MSBFIRST, spidata[i]); - //latch the data onto the display - digitalWrite(SPI_CS, HIGH); -} + diff --git a/lib/lib_display/LedControl/src/LedControl.h b/lib/lib_display/LedControl/src/LedControl.h index 4fc7523df..f8180d07d 100644 --- a/lib/lib_display/LedControl/src/LedControl.h +++ b/lib/lib_display/LedControl/src/LedControl.h @@ -35,10 +35,6 @@ #include #endif -#ifndef MAX72XX_MAX_DEVICES -#define MAX72XX_MAX_DEVICES 32 // maximum number of devices based on MXA7219/MAX7221 -#endif - /* * Segments to be switched on for characters and digits on * 7-Segment Displays @@ -65,15 +61,12 @@ const static byte charTable [] PROGMEM = { class LedControl { private : /* The array for shifting the data to the devices */ - byte spidata[2 * MAX72XX_MAX_DEVICES]; - /* Send out a single command to one device */ + byte spidata[16]; + /* Send out a single command to the device */ void spiTransfer(int addr, byte opcode, byte data); - /* Send out a command with the same opcode to all devices */ - void spiTransfer_allDevices(byte opcode, const byte* data); /* We keep track of the led-status for all 8 devices in this array */ - byte status[8 * MAX72XX_MAX_DEVICES]; - byte deviceDataBuff[MAX72XX_MAX_DEVICES]; + byte status[64]; /* Data is shifted out of this pin*/ int SPI_MOSI; /* The clock is signaled on this pin */ @@ -109,7 +102,6 @@ class LedControl { * for normal operation. */ void shutdown(int addr, bool status); - void shutdown_allDevices( bool status); /* * Set the number of digits (or rows) to be displayed. @@ -120,7 +112,6 @@ class LedControl { * limit number of digits to be displayed (1..8) */ void setScanLimit(int addr, int limit); - void setScanLimit_allDevices(int limit); /* * Set the brightness of the display. @@ -129,7 +120,6 @@ class LedControl { * intensity the brightness of the display. (0..15) */ void setIntensity(int addr, int intensity); - void setIntensity_allDevices(int intensity); /* * Switch all Leds on the display off. @@ -137,7 +127,6 @@ class LedControl { * addr address of the display to control */ void clearDisplay(int addr); - void clearDisplay_allDevices(); /* * Set the status of a single Led. @@ -160,14 +149,6 @@ class LedControl { */ void setRow(int addr, int row, byte value); - /** - * @brief Set data for the same row of all devices - * - * @param row [0..8] - * @param value array of bytes, one for each device - */ - void setRow_allDevices(int row, byte* value); - /* * Set all 8 Led's in a column to a new state * Params: diff --git a/lib/lib_display/LedControl/src/LedMatrix.cpp b/lib/lib_display/LedControl/src/LedMatrix.cpp index 59882cd15..929a09418 100644 --- a/lib/lib_display/LedControl/src/LedMatrix.cpp +++ b/lib/lib_display/LedControl/src/LedMatrix.cpp @@ -1,5 +1,5 @@ /* - * LedMatrix.h - Extends the Library LedControl for multiple 8x8 LED dot matrix modules, based on MAX7219/MAX7221 + * LedMatrix.h - Extends the Library LedControl for multiple 8x8 LED dot matrix maxDevices, based on MAX7219/MAX7221 * Copyright (c) 2021 Michael Beuss * * Permission is hereby granted, free of charge, to any person @@ -29,7 +29,26 @@ #include "font_6x8_horizontal_MSB.h" //#include "font_8x8_horizontal_latin_MSB.h" -// public +//the opcodes for the MAX7221 and MAX7219 +#define OP_NOOP 0 +#define OP_DIGIT0 1 +#define OP_DIGIT1 2 +#define OP_DIGIT2 3 +#define OP_DIGIT3 4 +#define OP_DIGIT4 5 +#define OP_DIGIT5 6 +#define OP_DIGIT6 7 +#define OP_DIGIT7 8 +#define OP_DECODEMODE 9 +#define OP_INTENSITY 10 +#define OP_SCANLIMIT 11 +#define OP_SHUTDOWN 12 +#define OP_DISPLAYTEST 15 + +// test +#include "LedControl.h" +LedControl* ledControl = nullptr; +// end text LedMatrix::LedMatrix(int dataPin, int clkPin, int csPin, unsigned int colums, unsigned int rows) { if (colums * rows > MAX72XX_MAX_DEVICES) @@ -52,22 +71,36 @@ LedMatrix::LedMatrix(int dataPin, int clkPin, int csPin, unsigned int colums, un modulesPerCol = rows; displayWidth = colums * 8; displayHeight = rows * 8; - modules = colums * rows; + maxDevices = colums * rows; moduleOrientation = ORIENTATION_UPSIDE_DOWN; // use setOrientation() to turn it - ledControl = new LedControl(dataPin, clkPin, csPin, modules); // initializes all connected LED matrix modules textBuf[0] = 0; textWidth = 0; textPosX = 0; textPosY = 0; appendTextBuf[0] = 0; setScrollAppendText(" "); - shutdown(false); // false: on, true: off - clear(); - setIntensity(7); + + // initialize all connected MAX7219/MAX7221 devices + SPI_MOSI = dataPin; + SPI_CLK = clkPin; + SPI_CS = csPin; + pinMode(SPI_MOSI, OUTPUT); + pinMode(SPI_CLK, OUTPUT); + pinMode(SPI_CS, OUTPUT); + SPI_MOSI = dataPin; + + //spiTransfer_value(OP_DISPLAYTEST, 0); // display test + spiTransfer_value(OP_SCANLIMIT, 7); // scanlimit is set to max on startup + spiTransfer_value(OP_DECODEMODE, 0); // decode is done in source + clearDisplay(); + //spiTransfer_value(OP_SHUTDOWN, 0); //we go into shutdown-mode (LEDs off) on startup + setIntensity(7); // initialize with the half of the maximum intensity [0..15] + power(true); // power on; } bool LedMatrix::drawText( const char *str, bool clearBefore) { + if(clearBefore) clearDisplay(); strncpy(textBuf, str, TEXT_BUFFER_SIZE -1); textPosX = 0; textPosY = 0; @@ -75,7 +108,6 @@ bool LedMatrix::drawText( const char *str, bool clearBefore) if(textWidth < displayWidth) { // text fits into the display, place it into the center - if(clearBefore) clear(); textPosX = (displayWidth - textWidth) / 2; // center } else @@ -125,21 +157,29 @@ bool LedMatrix::scrollText() void LedMatrix::power(bool on) { - shutdown(!on); // power(false) shuts down the display with shutdown(true) + byte value = 0; // 0: shutdown + if(on) value = 1; // 1: power on + spiTransfer_value(OP_SHUTDOWN, value); // power(false) shuts down the display } bool LedMatrix::clearDisplay(void) { - textBuf[0] = 0; memset(textBuf, 0, TEXT_BUFFER_SIZE); textWidth = 0; - clear(); + memset(buffer, 0, MATRIX_BUFFER_SIZE); + for (int row = 0; row < 8; row++) + { + spiTransfer_value(row + 1, 0); + } return true; } -bool LedMatrix::setIntensity(byte dim) +bool LedMatrix::setIntensity(byte intensity) { - ledControl->setIntensity_allDevices(dim); // 1..15 + if (intensity < 0 || intensity > 15) + return false; + + spiTransfer_value(OP_INTENSITY, intensity); return true; } @@ -186,25 +226,8 @@ void LedMatrix::refresh() int deviceRow = 0; for(int ledRow = 7; ledRow >= 0; ledRow--) // refresh from buttom to top { - for( int addr = 0; addr < modules; addr++) + for( int addr = 0; addr < maxDevices; addr++) { - switch(moduleOrientation) - { - case ORIENTATION_NORMAL: - col = addr % modulesPerRow; - pixelRow = (addr / modulesPerRow) * 8 + ledRow; - bufPos = pixelRow * modulesPerRow + col; - deviceDataBuff[addr] = buffer[bufPos]; - deviceRow = ledRow; - break; - case ORIENTATION_UPSIDE_DOWN: - col = addr % modulesPerRow; - pixelRow = (addr / modulesPerRow) * 8 + deviceRow; - bufPos = pixelRow * modulesPerRow + col; - deviceDataBuff[addr] = revereBitorder(buffer[bufPos]); // mirror - deviceRow = 7 - ledRow; // upside down - break; - } if(moduleOrientation == ORIENTATION_NORMAL || moduleOrientation == ORIENTATION_UPSIDE_DOWN) { col = addr % modulesPerRow; @@ -224,7 +247,7 @@ void LedMatrix::refresh() } } } - ledControl->setRow_allDevices(deviceRow, deviceDataBuff); // upside down + setRow_allDevices(deviceRow, deviceDataBuff); } } @@ -254,58 +277,6 @@ bool LedMatrix::drawCharAt( char c, const int x, const int y) return true; } -bool LedMatrix::shutdown(bool b) -{ - for (int addr = 0; addr < modules; addr++) - { - ledControl->shutdown(addr, b); // b: false: on, true: off - } - return true; -} - -bool LedMatrix::clear(void) -{ - memset(buffer, 0, MATRIX_BUFFER_SIZE); - ledControl->clearDisplay_allDevices(); - return true; -} - -void LedMatrix::refreshByteOfBuffer(int i) -{ - int line = i / modulesPerRow; - int addr = (line / 8) * modulesPerRow + i % modulesPerRow; - byte b = buffer[i]; - if (moduleOrientation == ORIENTATION_NORMAL || moduleOrientation == ORIENTATION_UPSIDE_DOWN) - { - int rowOfAddr = 0; - if (moduleOrientation == ORIENTATION_NORMAL) - { - rowOfAddr = line % 8; // ORIENTATION_NORMAL - } - else - { - rowOfAddr = 7 - line % 8; // ORIENTATION_UPSIDE_DOWN - b = revereBitorder(b); - } - ledControl->setRow(addr, rowOfAddr, b); - } - else - { - // ORIENTATION_TURN_RIGHT or ORIENTATION_TURN_LEFT - int colOfAddr = 0; - if (moduleOrientation == ORIENTATION_TURN_LEFT) - { - colOfAddr = line % 8; // ORIENTATION_TURN_LEFT - } - else - { - colOfAddr = 7 - line % 8; // ORIENTATION_TURN_RIGHT - b = revereBitorder(b); - } - ledControl->setColumn(addr, colOfAddr, b); - } -} - byte LedMatrix::revereBitorder (byte b) { static const byte lookup[16] = { @@ -320,3 +291,37 @@ void LedMatrix::appendSpace() strncat(textBuf, appendTextBuf, TEXT_BUFFER_SIZE -1); textWidth = strlen(textBuf) * charWidth; } + +void LedMatrix::setRow_allDevices(int row, byte *data) +{ + if (row < 0 || row > 7) + return; + spiTransfer_array(row + 1, data); +} + +void LedMatrix::spiTransfer_array(byte opcode, const byte* data) { + // create an array with the data to shift out + for (int addr = 0; addr < maxDevices; addr++) + { + spidata[addr * 2 + 1] = opcode; + spidata[addr * 2] = data[addr]; + } + // enable the line + digitalWrite(SPI_CS, LOW); + // shift out the data + for (int i = maxDevices * 2 -1; i >= 0; i--) + { + shiftOut(SPI_MOSI, SPI_CLK, MSBFIRST, spidata[i]); + } + // latch the data onto the display + digitalWrite(SPI_CS, HIGH); +} + +void LedMatrix::spiTransfer_value(byte opcode, byte value) +{ + memset(deviceDataBuff, (byte)value, maxDevices); + spiTransfer_array(opcode, deviceDataBuff); +} + + + diff --git a/lib/lib_display/LedControl/src/LedMatrix.h b/lib/lib_display/LedControl/src/LedMatrix.h index 9fee69a5f..aec15d052 100644 --- a/lib/lib_display/LedControl/src/LedMatrix.h +++ b/lib/lib_display/LedControl/src/LedMatrix.h @@ -1,5 +1,5 @@ /* - * LedMatrix.h - Extends the Library LedControl for multiple 8x8 LED dot matrix modules, based on MAX7219/MAX7221 + * LedMatrix.h - Extends the Library LedControl for multiple 8x8 LED dot matrix devices, based on MAX7219/MAX7221 * Copyright (c) 2021 Michael Beuss * * Permission is hereby granted, free of charge, to any person @@ -27,16 +27,27 @@ #ifndef LedMatrix_h #define LedMatrix_h -#include +#include + +#if (ARDUINO >= 100) +#include +#else +#include +#endif + +#ifndef MAX72XX_MAX_DEVICES +#define MAX72XX_MAX_DEVICES 32 // maximum number of devices based on MXA7219/MAX7221 +#endif #define MATRIX_BUFFER_SIZE MAX72XX_MAX_DEVICES * 8 // 8 bytes per modul. One byte represents 8 LEDs. #define TEXT_BUFFER_SIZE 256 // maximum text length that can be scrolled #define TEXT_APPEND_BUFFER_SIZE 16 // used for characters that are appended to the scroll text, before it repeats +#define SPI_BUFFER_SIZE MAX72XX_MAX_DEVICES * 2 // buffer size fort shifting commands to all devices (2 bytes each) /** - * @brief LedMatric controls multiple 8x8 LED dot matrx modules. - * All modules in rows and clolums together build a common display pixel matrix. + * @brief LedMatrix controls multiple 8x8 LED dot matrx devices. + * All devices in rows and clolums together build a common display pixel matrix. * */ class LedMatrix @@ -54,8 +65,8 @@ class LedMatrix /** * @brief Construct a new LED Matrix object * - * @param colums of 8x8 LED dot matrix modules - * @param rows of 8x8 LED dot matrix modules + * @param colums of 8x8 LED dot matrix devices + * @param rows of 8x8 LED dot matrix devices */ LedMatrix(int dataPin, int clkPin, int csPin, unsigned int colums, unsigned int rows); @@ -139,23 +150,48 @@ class LedMatrix void refresh(); private: + bool drawCharAt( char c, int x, int y ); // Draws a character to a defined position - bool shutdown(bool b); // shutdown(true) switches the display off. Text and pixels can be set while it is off. shutdown(false) switches the display on. - bool clear(void); // clears the display content - void refreshByteOfBuffer( int i); // sends one byte of the buffer to the display. This updates an 8 pixel row of one matrix module. byte revereBitorder(byte b); // returnes the byte in the reverse bit order. void appendSpace(); // appends characters to the end of the text to get a distance to the repeating scroll text + // device contrl MAX7219/MAX7221 + /** + * @brief Set data for the same row of all devices + * + * @param row [0..8] + * @param value array of bytes, one for each device + */ + void setRow_allDevices(int row, byte* value); + + /* Send out a command with the same opcode to all devices */ + /** + * @brief sends opcode with specific data values to each device + * + * @param opcode + * @param data array of byte values (data[0] is the value for the first device) + */ + void spiTransfer_array(byte opcode, const byte* data); + + /** + * @brief sends opcode with same value to all devices + */ + void spiTransfer_value(byte opcode, byte value); + + private: + int SPI_MOSI; // Data is shifted out of this pin + int SPI_CLK; // The clock is signaled on this pin + int SPI_CS; // This one is driven LOW for chip selectzion + unsigned int modulesPerRow; unsigned int modulesPerCol; unsigned int displayWidth; // matrix width [pixel] unsigned int displayHeight; // matrix height [pixel] - unsigned int modules; // number of 8x8 mudules + int maxDevices; // number of used 8x8 devices uint8_t moduleOrientation; byte buffer[MATRIX_BUFFER_SIZE]; byte deviceDataBuff[MAX72XX_MAX_DEVICES]; - LedControl* ledControl; int charWidth; int charHeight; char textBuf[TEXT_BUFFER_SIZE]; @@ -163,6 +199,7 @@ class LedMatrix int textWidth; // width of text [pixel] int textPosX; // horizontal pixel position of scrolling text int textPosY; // vertical pixelposition of scrolling text; + byte spidata[SPI_BUFFER_SIZE]; // The array for shifting the data to the devices }; diff --git a/tasmota/xdsp_19_max7219_matrix.ino b/tasmota/xdsp_19_max7219_matrix.ino index 82a4a24bb..ecf500670 100644 --- a/tasmota/xdsp_19_max7219_matrix.ino +++ b/tasmota/xdsp_19_max7219_matrix.ino @@ -128,13 +128,6 @@ bool MAX7291Matrix_initDriver(void) Settings->display_rows = LedMatrix_settings.modulesPerCol; Settings->display_cols[1] = LedMatrix_settings.modulesPerCol; max7219_Matrix = new LedMatrix(Pin(GPIO_MAX7219DIN), Pin(GPIO_MAX7219CLK), Pin(GPIO_MAX7219CS), LedMatrix_settings.modulesPerRow, LedMatrix_settings.modulesPerCol); - if( LedMatrix_settings.show_clock == 0) - { - Settings->display_mode = 0; // text mode - } - else{ - Settings->display_mode = 1; // clock mode - } max2791Matrix_initDriver_done = true; AddLog(LOG_LEVEL_INFO, PSTR("MTX: MAX7291Matrix_initDriver DIN:%d CLK:%d CS:%d size(%dx%d)"), Pin(GPIO_MAX7219DIN), Pin(GPIO_MAX7219CLK), Pin(GPIO_MAX7219CS), LedMatrix_settings.modulesPerRow, LedMatrix_settings.modulesPerCol); @@ -144,8 +137,13 @@ bool MAX7291Matrix_initDriver(void) // FUNC_DISPLAY_INIT bool MAX7291Matrix_init(void) { + Settings->display_mode = 0; // text mode + LedMatrix_settings.show_clock = 0; // no clock + int intensity = GetDisplayDimmer16(); // 0..15 max7219_Matrix->setIntensity(intensity); + + max7219_Matrix->power(true); // power on if(Settings->display_rotate <= 3) { max7219_Matrix->setOrientation((LedMatrix::ModuleOrientation)Settings->display_rotate ); @@ -223,6 +221,8 @@ bool MAX7291Matrix_clock(void) Settings->display_mode = 1; break; default: + //LedMatrix_settings.timeFormat = XdrvMailbox.payload; + //Settings->display_mode = 1; return false; } @@ -280,13 +280,11 @@ bool Xdsp19(uint8_t function) case FUNC_DISPLAY_DRAW_STRING: case FUNC_DISPLAY_SCROLLTEXT: case FUNC_DISPLAY_SEVENSEG_TEXT: - Settings->display_mode = 0; // text mode - LedMatrix_settings.show_clock = 0; // disable clock mode + if(Settings->display_mode != 0) MAX7291Matrix_init(); result = max7219_Matrix->drawText(XdrvMailbox.data, true); // true: clears display before drawing text break; case FUNC_DISPLAY_SEVENSEG_TEXTNC: - Settings->display_mode = 0; // text mode - LedMatrix_settings.show_clock = 0; // disable clock mode + if(Settings->display_mode != 0) MAX7291Matrix_init(); result = max7219_Matrix->drawText(XdrvMailbox.data, false); // false: does not clear display before drawing text break; case FUNC_DISPLAY_SCROLLDELAY: From 3bb71f154d91f51487897c3dfaa120768253d080 Mon Sep 17 00:00:00 2001 From: Jeroen Vermeulen - MageHost Date: Sat, 11 Dec 2021 19:34:17 +0100 Subject: [PATCH 014/402] Fix for #14006. Without USE_UFILESYS you can't draw picture buttons. --- .../Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_GFX.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_GFX.cpp b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_GFX.cpp index 5e88150cc..398dba0df 100644 --- a/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_GFX.cpp +++ b/lib/lib_display/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_GFX.cpp @@ -1610,10 +1610,12 @@ void Adafruit_GFX_Button::drawButton(boolean inverted) { text = _fillcolor; } + #if defined USE_UFILESYS if (_label[0]=='/') { draw_picture(_label, _x1, _y1, _w, _h, outline, inverted); _gfx->drawRect(_x1, _y1, _w, _h, text); } else { + #endif uint8_t r = min(_w, _h) / 4; // Corner radius _gfx->fillRoundRect(_x1, _y1, _w, _h, r, fill); _gfx->drawRoundRect(_x1, _y1, _w, _h, r, outline); @@ -1622,7 +1624,9 @@ void Adafruit_GFX_Button::drawButton(boolean inverted) { _gfx->setTextColor(text); _gfx->setTextSize(_textsize_x, _textsize_y); _gfx->print(_label); + #if defined USE_UFILESYS } + #endif } /**************************************************************************/ From 45aeaede9ac9d37bb5b3d5696bd41d5b35052e50 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Sun, 12 Dec 2021 08:59:52 +0300 Subject: [PATCH 015/402] Add blor command + bug fixes --- tasmota/xsns_69_opentherm.ino | 2 -- tasmota/xsns_69_opentherm_protocol.ino | 18 +++++++++--------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/tasmota/xsns_69_opentherm.ino b/tasmota/xsns_69_opentherm.ino index c94e61b59..38c1ae2c9 100644 --- a/tasmota/xsns_69_opentherm.ino +++ b/tasmota/xsns_69_opentherm.ino @@ -16,8 +16,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#define USE_OPENTHERM - #ifdef USE_OPENTHERM #define XSNS_69 69 diff --git a/tasmota/xsns_69_opentherm_protocol.ino b/tasmota/xsns_69_opentherm_protocol.ino index a86648849..68430d94a 100644 --- a/tasmota/xsns_69_opentherm_protocol.ino +++ b/tasmota/xsns_69_opentherm_protocol.ino @@ -16,8 +16,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#define USE_OPENTHERM - #ifdef USE_OPENTHERM #include "OpenTherm.h" @@ -33,6 +31,7 @@ typedef union { uint8_t notSupported : 1; // If set, boiler does not support this command uint8_t supported : 1; // Set if at least one response were successfull uint8_t retryCount : 2; // Retry counter before notSupported flag being set + uint8_t manual : 1; // Only manual call }; } OpenThermParamFlags; @@ -247,7 +246,7 @@ OpenThermCommand sns_opentherm_commands[] = { {// Boiler Lock-out Reset command .m_command_name = "BLOR", .m_command_code = (uint8_t)OpenThermMessageID::Command, - .m_flags = {.notSupported = 1}, + .m_flags = {.manual = 1}, .m_results = {{.m_u8 = 0}, {.m_u8 = 0}}, .m_ot_make_request = sns_opentherm_send_blor, .m_ot_parse_response = sns_opentherm_parse_generic_u16, @@ -443,21 +442,21 @@ void sns_opentherm_tele_oem_diag(struct OpenThermCommandT *self) /////////////////////////////////// Boiler Boiler Lock-out Reset ////////////////////////////////////////////////// unsigned long sns_opentherm_send_blor(struct OpenThermCommandT *self, struct OT_BOILER_STATUS_T *status) { - AddLog(LOG_LEVEL_ERROR, PSTR("[OTH]: Boiler Boiler Lock-out Reset")); + AddLog(LOG_LEVEL_ERROR, PSTR("[OTH]: Call Boiler Lock-out Reset")); self->m_flags.notSupported = true; // Disable future calls of this command unsigned int data = 1; //1 : “BLOR”= Boiler Lock-out Reset command - return OpenTherm::buildRequest(OpenThermMessageType::WRITE_DATA, OpenThermMessageID::Command, data); + data <<= 8; + return OpenTherm::buildRequest(OpenThermMessageType::OPTH_WRITE_DATA, OpenThermMessageID::Command, data); } + bool sns_opentherm_call_blor() { - /* - OpenThermCommandT *cmd = &sns_opentherm_commands[sns_opentherm_current_command-1]; + OpenThermCommandT *cmd = &sns_opentherm_commands[(sizeof(sns_opentherm_commands) / sizeof(OpenThermCommand))-1]; if (strcmp(cmd->m_command_name, "BLOR")) return false; cmd->m_flags.notSupported = false; return true; - */ } /////////////////////////////////// Generic Single Float ///////////////////////////////////////////////// @@ -597,7 +596,8 @@ void sns_opentherm_protocol_reset() for (int i = 0; i < SNS_OT_COMMANDS_COUNT; ++i) { struct OpenThermCommandT *cmd = &sns_opentherm_commands[i]; - cmd->m_flags.m_flags = 0; + cmd->m_flags.notSupported = cmd->m_flags.manual; + cmd->m_flags.retryCount = 0; memset(cmd->m_results, 0, sizeof(OpenThermCommandT::m_results)); } } From 801c0cf90f892fd2fa5403ad2c55260b36431767 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 12 Dec 2021 17:09:20 +0100 Subject: [PATCH 016/402] Use matrix for compile --- .github/workflows/Tasmota_build_devel.yml | 1370 +-------------------- 1 file changed, 60 insertions(+), 1310 deletions(-) diff --git a/.github/workflows/Tasmota_build_devel.yml b/.github/workflows/Tasmota_build_devel.yml index fe3f995d1..bf22b6313 100644 --- a/.github/workflows/Tasmota_build_devel.yml +++ b/.github/workflows/Tasmota_build_devel.yml @@ -9,1318 +9,68 @@ on: - '**.md' # Do no build if *.md files changes jobs: - - tasmota: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-minimal: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-minimal - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-lite: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-lite - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-knx: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-knx - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-sensors: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-sensors - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-display: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-display - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-ir: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-ir - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-zbbridge: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-zbbridge - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-zigbee: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-zigbee - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-AF: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-AF - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-BG: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-BG - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-BR: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-BR - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-CN: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-CN - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-CZ: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-CZ - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-DE: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-DE - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-ES: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-ES - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-FR: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-FR - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-FY: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-FY - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-GR: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-GR - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-HE: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-HE - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-HU: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-HU - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-IT: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-IT - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-KO: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-KO - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-NL: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-NL - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-PL: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-PL - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-PT: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-PT - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-RO: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-RO - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-RU: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-RU - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-SE: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-SE - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-SK: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-SK - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-TR: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-TR - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-TW: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-TW - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-UK: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-UK - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-VN: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-VN - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32 - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32solo1: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32solo1 - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-webcam: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-webcam - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-odroidgo: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-odroidgo - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-core2: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-core2 - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-bluetooth: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-bluetooth - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-display: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-display - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-lvgl: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-lvgl - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-ir: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-ir - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - tasmota32c3: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32c3 - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - tasmota32-AF: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-AF - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-BG: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-BG - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-BR: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-BR - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-CN: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-CN - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-CZ: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-CZ - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-DE: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-DE - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-ES: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-ES - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-FR: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-FR - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-FY: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-FY - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-GR: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-GR - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-HE: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-HE - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-HU: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-HU - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-IT: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-IT - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-KO: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-KO - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-NL: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-NL - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-PL: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-PL - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-PT: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-PT - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-RO: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-RO - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-RU: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-RU - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-SE: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-SE - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-SK: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-SK - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-TR: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-TR - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-TW: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-TW - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-UK: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-UK - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-VN: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-VN - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - + base-images: + runs-on: ubuntu-latest + continue-on-error: true + strategy: + matrix: + variant: + - tasmota + - tasmota-minimal + - tasmota-display + - tasmota-ir + - tasmota-knx + - tasmota-lite + - tasmota-sensors + - tasmota-zbbridge + - tasmota-zigbee + - tasmota32 + - tasmota32-webcam + - tasmota32-bluetooth + - tasmota32-core2 + - tasmota32-display + - tasmota32-ir + - tasmota32-lvgl + - tasmota32-odroidgo + - tasmota32c3 + - tasmota32solo1 + steps: + - uses: actions/checkout@v2 + - name: Set up Python + uses: actions/setup-python@v1 + - name: Install dependencies + run: | + pip install -U platformio + - name: Run PlatformIO + run: platformio run -e ${{ matrix.variant }} + - uses: actions/upload-artifact@v2 + with: + name: firmware + path: ./build_output + + language-images: + runs-on: ubuntu-latest + continue-on-error: true + strategy: + matrix: + variant: [ tasmota, tasmota32 ] + language: [ AF, BG, BR, CN, CZ, DE, ES, FR, FY, GR, HE, HU, IT, KO, NL, PL, PT, RO, RU, SE, SK, TR, TW, UK, VN ] + steps: + - uses: actions/checkout@v2 + - name: Set up Python + uses: actions/setup-python@v1 + - name: Install dependencies + run: | + pip install -U platformio + - name: Run PlatformIO + run: platformio run -e ${{ matrix.variant }}-${{ matrix.language }} + - uses: actions/upload-artifact@v2 + with: + name: firmware + path: ./build_output Upload: - needs: [tasmota-VN, tasmota32-VN, tasmota32-TW, tasmota32-TR] + needs: [base-images, language-images] runs-on: ubuntu-latest continue-on-error: true steps: From 9ff3755798be1372d19803ad48614d0cdae75085 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 12 Dec 2021 17:15:43 +0100 Subject: [PATCH 017/402] Use matrix to build --- .github/workflows/Tasmota_build_master.yml | 1371 +------------------- 1 file changed, 61 insertions(+), 1310 deletions(-) diff --git a/.github/workflows/Tasmota_build_master.yml b/.github/workflows/Tasmota_build_master.yml index 4639fde5e..41661c136 100644 --- a/.github/workflows/Tasmota_build_master.yml +++ b/.github/workflows/Tasmota_build_master.yml @@ -5,1320 +5,71 @@ on: branches: master paths-ignore: - '.github/**' # Ignore changes towards the .github directory + - '**.md' # Do no build if *.md files changes jobs: - - tasmota: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-minimal: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-minimal - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-lite: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-lite - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-knx: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-knx - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-sensors: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-sensors - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-display: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-display - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-ir: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-ir - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-zbbridge: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-zbbridge - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-zigbee: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-zigbee - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-AF: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-AF - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-BG: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-BG - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-BR: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-BR - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-CN: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-CN - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-CZ: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-CZ - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-DE: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-DE - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-ES: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-ES - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-FR: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-FR - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-FY: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-FY - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-GR: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-GR - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-HE: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-HE - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-HU: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-HU - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-IT: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-IT - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-KO: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-KO - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-NL: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-NL - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-PL: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-PL - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-PT: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-PT - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-RO: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-RO - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-RU: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-RU - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-SE: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-SE - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-SK: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-SK - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-TR: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-TR - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-TW: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-TW - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-UK: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-UK - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota-VN: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota-VN - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32 - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32solo1: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32solo1 - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-webcam: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-webcam - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-odroidgo: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-odroidgo - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-core2: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-core2 - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-bluetooth: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-bluetooth - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-display: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-display - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-lvgl: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-lvgl - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-ir: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-ir - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - tasmota32c3: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32c3 - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - tasmota32-AF: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-AF - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-BG: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-BG - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-BR: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-BR - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-CN: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-CN - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-CZ: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-CZ - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-DE: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-DE - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-ES: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-ES - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-FR: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-FR - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-FY: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-FY - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-GR: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-GR - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-HE: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-HE - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-HU: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-HU - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-IT: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-IT - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-KO: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-KO - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-NL: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-NL - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-PL: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-PL - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-PT: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-PT - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-RO: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-RO - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-RU: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-RU - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-SE: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-SE - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-SK: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-SK - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-TR: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-TR - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-TW: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-TW - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-UK: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-UK - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - - - tasmota32-VN: - runs-on: ubuntu-latest - continue-on-error: true - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - - name: Install dependencies - run: | - pip install -U platformio - - name: Run PlatformIO - run: | - platformio run -e tasmota32-VN - - uses: actions/upload-artifact@v2 - with: - name: firmware - path: ./build_output - + base-images: + runs-on: ubuntu-latest + continue-on-error: true + strategy: + matrix: + variant: + - tasmota + - tasmota-minimal + - tasmota-display + - tasmota-ir + - tasmota-knx + - tasmota-lite + - tasmota-sensors + - tasmota-zbbridge + - tasmota-zigbee + - tasmota32 + - tasmota32-webcam + - tasmota32-bluetooth + - tasmota32-core2 + - tasmota32-display + - tasmota32-ir + - tasmota32-lvgl + - tasmota32-odroidgo + - tasmota32c3 + - tasmota32solo1 + steps: + - uses: actions/checkout@v2 + - name: Set up Python + uses: actions/setup-python@v1 + - name: Install dependencies + run: | + pip install -U platformio + - name: Run PlatformIO + run: platformio run -e ${{ matrix.variant }} + - uses: actions/upload-artifact@v2 + with: + name: firmware + path: ./build_output + + language-images: + runs-on: ubuntu-latest + continue-on-error: true + strategy: + matrix: + variant: [ tasmota, tasmota32 ] + language: [ AF, BG, BR, CN, CZ, DE, ES, FR, FY, GR, HE, HU, IT, KO, NL, PL, PT, RO, RU, SE, SK, TR, TW, UK, VN ] + steps: + - uses: actions/checkout@v2 + - name: Set up Python + uses: actions/setup-python@v1 + - name: Install dependencies + run: | + pip install -U platformio + - name: Run PlatformIO + run: platformio run -e ${{ matrix.variant }}-${{ matrix.language }} + - uses: actions/upload-artifact@v2 + with: + name: firmware + path: ./build_output Upload: - needs: [tasmota-VN, tasmota32-VN, tasmota32-TW, tasmota32-TR] + needs: [base-images, language-images] runs-on: ubuntu-latest continue-on-error: true steps: From 806d87b3a9288cfa964905e117abdd50d7f18c20 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 12 Dec 2021 17:20:16 +0100 Subject: [PATCH 018/402] run github build only in repo arendst --- .github/workflows/Tasmota_build_devel.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/Tasmota_build_devel.yml b/.github/workflows/Tasmota_build_devel.yml index bf22b6313..ac908be23 100644 --- a/.github/workflows/Tasmota_build_devel.yml +++ b/.github/workflows/Tasmota_build_devel.yml @@ -11,6 +11,7 @@ on: jobs: base-images: runs-on: ubuntu-latest + if: github.repository == 'arendst/Tasmota' continue-on-error: true strategy: matrix: @@ -50,6 +51,7 @@ jobs: language-images: runs-on: ubuntu-latest + if: github.repository == 'arendst/Tasmota' continue-on-error: true strategy: matrix: From 58499b18dbd1ef30532c9d63fdb58d48416abd78 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 12 Dec 2021 17:21:31 +0100 Subject: [PATCH 019/402] build firmware only in repo arendst --- .github/workflows/Tasmota_build_master.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/Tasmota_build_master.yml b/.github/workflows/Tasmota_build_master.yml index 41661c136..9ae940bef 100644 --- a/.github/workflows/Tasmota_build_master.yml +++ b/.github/workflows/Tasmota_build_master.yml @@ -10,6 +10,7 @@ on: jobs: base-images: runs-on: ubuntu-latest + if: github.repository == 'arendst/Tasmota' continue-on-error: true strategy: matrix: @@ -49,6 +50,7 @@ jobs: language-images: runs-on: ubuntu-latest + if: github.repository == 'arendst/Tasmota' continue-on-error: true strategy: matrix: From 21cda658d66f255887787eba526eb39ad5216cf3 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 12 Dec 2021 17:22:37 +0100 Subject: [PATCH 020/402] CI only in arendst repo --- .github/workflows/build_all_the_things.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build_all_the_things.yml b/.github/workflows/build_all_the_things.yml index 2ffca53b7..cb41ae85e 100644 --- a/.github/workflows/build_all_the_things.yml +++ b/.github/workflows/build_all_the_things.yml @@ -18,6 +18,7 @@ on: jobs: base-images: runs-on: ubuntu-latest + if: github.repository == 'arendst/Tasmota' strategy: matrix: variant: @@ -59,6 +60,7 @@ jobs: language-images: runs-on: ubuntu-latest + if: github.repository == 'arendst/Tasmota' strategy: matrix: variant: [ tasmota ] From fa7b0302a7c42fdf1e76bdfb39605f0071e02b78 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Sun, 12 Dec 2021 18:04:46 +0100 Subject: [PATCH 021/402] Trying to solve ESP32-webcam timeouts Trying to solve ESP32-webcam timeouts on Settings save by adding delays in between file write chunks and diabling NVS writes when stream is active. (#13882) --- tasmota/settings.ino | 2 +- tasmota/support_esp.ino | 51 +++++++++++++++++++------------- tasmota/xdrv_50_filesystem.ino | 18 ++++++++++- tasmota/xdrv_81_esp32_webcam.ino | 4 +++ 4 files changed, 53 insertions(+), 22 deletions(-) diff --git a/tasmota/settings.ino b/tasmota/settings.ino index 31dd8a87c..5dfc21424 100644 --- a/tasmota/settings.ino +++ b/tasmota/settings.ino @@ -694,7 +694,7 @@ void SettingsLoad(void) { if (source) { settings_location = 1; if (Settings->cfg_holder == (uint16_t)CFG_HOLDER) { - AddLog(LOG_LEVEL_NONE, PSTR(D_LOG_CONFIG "Loaded from %s, " D_COUNT " %lu"), (source)?"File":"Nvm", Settings->save_flag); + AddLog(LOG_LEVEL_NONE, PSTR(D_LOG_CONFIG "Loaded from %s, " D_COUNT " %lu"), (2 == source)?"File":"NVS", Settings->save_flag); } } #endif // ESP32 diff --git a/tasmota/support_esp.ino b/tasmota/support_esp.ino index 93abe9daa..81b6ee6f6 100644 --- a/tasmota/support_esp.ino +++ b/tasmota/support_esp.ino @@ -137,34 +137,43 @@ String GetDeviceHardware(void) { #include -void NvmLoad(const char *sNvsName, const char *sName, void *pSettings, unsigned nSettingsLen) { - nvs_handle handle; - noInterrupts(); - nvs_open(sNvsName, NVS_READONLY, &handle); +bool NvmLoad(const char *sNvsName, const char *sName, void *pSettings, unsigned nSettingsLen) { + nvs_handle_t handle; +// noInterrupts(); + esp_err_t result = nvs_open(sNvsName, NVS_READONLY, &handle); + if (result != ESP_OK) { + AddLog(LOG_LEVEL_DEBUG, PSTR("NVS: Error %d"), result); + return false; + } size_t size = nSettingsLen; nvs_get_blob(handle, sName, pSettings, &size); nvs_close(handle); - interrupts(); +// interrupts(); + return true; } void NvmSave(const char *sNvsName, const char *sName, const void *pSettings, unsigned nSettingsLen) { - nvs_handle handle; - noInterrupts(); - nvs_open(sNvsName, NVS_READWRITE, &handle); + nvs_handle_t handle; +// noInterrupts(); + esp_err_t result = nvs_open(sNvsName, NVS_READWRITE, &handle); + if (result != ESP_OK) { + AddLog(LOG_LEVEL_DEBUG, PSTR("NVS: Error %d"), result); + return; + } nvs_set_blob(handle, sName, pSettings, nSettingsLen); nvs_commit(handle); nvs_close(handle); - interrupts(); +// interrupts(); } int32_t NvmErase(const char *sNvsName) { - nvs_handle handle; - noInterrupts(); + nvs_handle_t handle; +// noInterrupts(); int32_t result = nvs_open(sNvsName, NVS_READWRITE, &handle); if (ESP_OK == result) { result = nvs_erase_all(handle); } if (ESP_OK == result) { result = nvs_commit(handle); } nvs_close(handle); - interrupts(); +// interrupts(); return result; } @@ -208,23 +217,25 @@ void SettingsErase(uint8_t type) { } uint32_t SettingsRead(void *data, size_t size) { - uint32_t source = 1; -#ifdef USE_UFILESYS - if (!TfsLoadFile(TASM_FILE_SETTINGS, (uint8_t*)data, size)) { -#endif - source = 0; - NvmLoad("main", "Settings", data, size); #ifdef USE_UFILESYS + if (TfsLoadFile(TASM_FILE_SETTINGS, (uint8_t*)data, size)) { + return 2; } #endif - return source; + if (NvmLoad("main", "Settings", data, size)) { + return 1; + }; + return 0; } void SettingsWrite(const void *pSettings, unsigned nSettingsLen) { #ifdef USE_UFILESYS TfsSaveFile(TASM_FILE_SETTINGS, (const uint8_t*)pSettings, nSettingsLen); #endif - NvmSave("main", "Settings", pSettings, nSettingsLen); +#ifdef USE_WEBCAM + if (!WcStreamActive()) +#endif + NvmSave("main", "Settings", pSettings, nSettingsLen); } void QPCRead(void *pSettings, unsigned nSettingsLen) { diff --git a/tasmota/xdrv_50_filesystem.ino b/tasmota/xdrv_50_filesystem.ino index 8a0ed1d16..7150fbd85 100644 --- a/tasmota/xdrv_50_filesystem.ino +++ b/tasmota/xdrv_50_filesystem.ino @@ -294,7 +294,23 @@ bool TfsSaveFile(const char *fname, const uint8_t *buf, uint32_t len) { return false; } - file.write(buf, len); +// This will timeout on ESP32-webcam +// file.write(buf, len); + + uint32_t count = len / 512; + uint32_t chunk = len / count; + for (uint32_t i = 0; i < count; i++) { + file.write(buf + (i * chunk), chunk); + // do actually wait a little to allow ESP32 tasks to tick + // fixes task timeout in ESP32Solo1 style unicore code and webcam. + delay(10); + OsWatchLoop(); + } + uint32_t left = len % count; + if (left) { + file.write(buf + (count * chunk), left); + } + file.close(); return true; } diff --git a/tasmota/xdrv_81_esp32_webcam.ino b/tasmota/xdrv_81_esp32_webcam.ino index dca8ec936..273885049 100644 --- a/tasmota/xdrv_81_esp32_webcam.ino +++ b/tasmota/xdrv_81_esp32_webcam.ino @@ -876,6 +876,10 @@ void WcStreamControl() { WcSetup(Settings->webcam_config.resolution); } +bool WcStreamActive(void) { + return (Wc.stream_active); +} + /*********************************************************************************************/ From 78c7d1a1fe52abc4444fda0766f36b481b33c202 Mon Sep 17 00:00:00 2001 From: tony-fav <42725386+tony-fav@users.noreply.github.com> Date: Sun, 12 Dec 2021 12:23:49 -0500 Subject: [PATCH 022/402] DDP schemes for Light and WS2812 --- tasmota/xdrv_04_light.ino | 73 ++++++++++++++++++++++++++++++++++++++ tasmota/xlgt_01_ws2812.ino | 68 ++++++++++++++++++++++++++++++++++- 2 files changed, 140 insertions(+), 1 deletion(-) diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino index b05386f4a..f5504d5f6 100644 --- a/tasmota/xdrv_04_light.ino +++ b/tasmota/xdrv_04_light.ino @@ -124,7 +124,11 @@ #define XDRV_04 4 // #define DEBUG_LIGHT +#ifdef USE_NETWORK_LIGHT_SCHEMES +enum LightSchemes { LS_POWER, LS_WAKEUP, LS_CYCLEUP, LS_CYCLEDN, LS_RANDOM, LS_DDP, LS_MAX }; +#else enum LightSchemes { LS_POWER, LS_WAKEUP, LS_CYCLEUP, LS_CYCLEDN, LS_RANDOM, LS_MAX }; +#endif const uint8_t LIGHT_COLOR_SIZE = 25; // Char array scolor size @@ -280,6 +284,11 @@ static uint32_t min3(uint32_t a, uint32_t b, uint32_t c) { return (a < b && a < c) ? a : (b < c) ? b : c; } +#ifdef USE_NETWORK_LIGHT_SCHEMES +WiFiUDP ddp_udp; +uint8_t ddp_udp_up = 0; +#endif + // // LightStateClass // This class is an abstraction of the current light state. @@ -1615,6 +1624,51 @@ void LightCycleColor(int8_t direction) light_controller.calcLevels(Light.new_color); } +#ifdef USE_NETWORK_LIGHT_SCHEMES +void LightListenDDP() +{ + // Light channels gets completely controlled over DDP. So, we don't really check other settings. + // To enter this scheme, we are already assured the light is at least RGB + static uint8_t ddp_color[5] = { 0, 0, 0, 0, 0 }; + + // Can't be trying to initialize UDP too early. + if (TasmotaGlobal.restart_flag || TasmotaGlobal.global_state.network_down) { + light_state.setChannels(ddp_color); + light_controller.calcLevels(Light.new_color); + return; + } + + // Start DDP listener, if fail, just set last ddp_color + if (!ddp_udp_up) { + if (!ddp_udp.begin(4048)) { + light_state.setChannels(ddp_color); + light_controller.calcLevels(Light.new_color); + return; + } + ddp_udp_up = 1; + AddLog(LOG_LEVEL_DEBUG_MORE, "DDP: UDP Listener Started: Normal Scheme"); + } + + // Get the DDP payload over UDP + std::vector payload; + while (uint16_t packet_size = ddp_udp.parsePacket()) { + payload.resize(packet_size); + if (!ddp_udp.read(&payload[0], payload.size())) { + continue; + } + } + + // No verification checks performed against packet besides length + if (payload.size() > 12) { + ddp_color[0] = payload[10]; + ddp_color[1] = payload[11]; + ddp_color[2] = payload[12]; + } + light_state.setChannels(ddp_color); + light_controller.calcLevels(Light.new_color); +} +#endif + void LightSetPower(void) { // Light.power = XdrvMailbox.index; @@ -1690,7 +1744,21 @@ void LightAnimate(void) if (Settings->light_scheme >= LS_MAX) { power_off = true; } +#ifdef USE_NETWORK_LIGHT_SCHEMES + if (ddp_udp_up) { + ddp_udp.stop(); + ddp_udp_up = 0; + AddLog(LOG_LEVEL_DEBUG_MORE, "DDP: UDP Stopped: Power Off"); + } +#endif } else { +#ifdef USE_NETWORK_LIGHT_SCHEMES + if ((Settings->light_scheme < LS_MAX) && (Settings->light_scheme != LS_DDP) && (ddp_udp_up)) { + ddp_udp.stop(); + ddp_udp_up = 0; + AddLog(LOG_LEVEL_DEBUG_MORE, "DDP: UDP Stopped: Normal Scheme not DDP"); + } +#endif switch (Settings->light_scheme) { case LS_POWER: light_controller.calcLevels(Light.new_color); @@ -1743,6 +1811,11 @@ void LightAnimate(void) Light.new_color[2] = changeUIntScale(Light.new_color[2], 0, 255, 0, Settings->light_color[2]); } break; +#ifdef USE_NETWORK_LIGHT_SCHEMES + case LS_DDP: + LightListenDDP(); + break; +#endif default: XlgtCall(FUNC_SET_SCHEME); } diff --git a/tasmota/xlgt_01_ws2812.ino b/tasmota/xlgt_01_ws2812.ino index 3a9e396f3..715851e4c 100644 --- a/tasmota/xlgt_01_ws2812.ino +++ b/tasmota/xlgt_01_ws2812.ino @@ -37,7 +37,11 @@ #define XLGT_01 1 +#ifdef USE_NETWORK_LIGHT_SCHEMES +const uint8_t WS2812_SCHEMES = 10; // Number of WS2812 schemes +#else const uint8_t WS2812_SCHEMES = 9; // Number of WS2812 schemes +#endif const char kWs2812Commands[] PROGMEM = "|" // No prefix D_CMND_LED "|" D_CMND_PIXELS "|" D_CMND_ROTATION "|" D_CMND_WIDTH "|" D_CMND_STEPPIXELS ; @@ -167,7 +171,12 @@ WsColor kwanzaa[3] = { 255,0,0, 0,0,0, 0,255,0 }; WsColor kRainbow[7] = { 255,0,0, 255,128,0, 255,255,0, 0,255,0, 0,0,255, 128,0,255, 255,0,255 }; WsColor kFire[3] = { 255,0,0, 255,102,0, 255,192,0 }; WsColor kStairs[2] = { 0,0,0, 255,255,255 }; + +#ifdef USE_NETWORK_LIGHT_SCHEMES +ColorScheme kSchemes[WS2812_SCHEMES -2] = { // Skip clock scheme and DDP scheme +#else ColorScheme kSchemes[WS2812_SCHEMES -1] = { // Skip clock scheme +#endif kIncandescent, 2, kRgb, 3, kChristmas, 2, @@ -492,6 +501,51 @@ void Ws2812Steps(uint32_t schemenr) { Ws2812StripShow(); } +#ifdef USE_NETWORK_LIGHT_SCHEMES +void Ws2812DDP(void) +{ +#if (USE_WS2812_CTYPE > NEO_3LED) + RgbwColor c; + c.W = 0; +#else + RgbColor c; +#endif + c.R = 0; + c.G = 0; + c.B = 0; + + // Can't be trying to initialize UDP too early. + if (TasmotaGlobal.restart_flag || TasmotaGlobal.global_state.network_down) return; + + // Start DDP listener, if fail, just set last ddp_color + if (!ddp_udp_up) { + if (!ddp_udp.begin(4048)) return; + ddp_udp_up = 1; + AddLog(LOG_LEVEL_DEBUG_MORE, "DDP: UDP Listener Started: WS2812 Scheme"); + } + + // Get the DDP payload over UDP + std::vector payload; + while (uint16_t packet_size = ddp_udp.parsePacket()) { + payload.resize(packet_size); + if (!ddp_udp.read(&payload[0], payload.size())) { + continue; + } + } + + // No verification checks performed against packet besides length + if (payload.size() > (9+3*Settings->light_pixels)) { + for (uint32_t i = 0; i < Settings->light_pixels; i++) { + c.R = payload[10+3*i]; + c.G = payload[11+3*i]; + c.B = payload[12+3*i]; + strip->SetPixelColor(i, c); + } + Ws2812StripShow(); + } +} +#endif + void Ws2812Clear(void) { strip->ClearTo(0); @@ -580,7 +634,14 @@ bool Ws2812SetChannels(void) void Ws2812ShowScheme(void) { uint32_t scheme = Settings->light_scheme - Ws2812.scheme_offset; - + +#ifdef USE_NETWORK_LIGHT_SCHEMES + if ((scheme != 9) && (ddp_udp_up)) { + ddp_udp.stop(); + ddp_udp_up = 0; + AddLog(LOG_LEVEL_DEBUG_MORE, "DDP: UDP Stopped: WS2812 Scheme not DDP"); + } +#endif switch (scheme) { case 0: // Clock if ((1 == TasmotaGlobal.state_250mS) || (Ws2812.show_next)) { @@ -588,6 +649,11 @@ void Ws2812ShowScheme(void) Ws2812.show_next = 0; } break; +#ifdef USE_NETWORK_LIGHT_SCHEMES + case 9: + Ws2812DDP(); + break; +#endif default: if(Settings->light_step_pixels > 0){ Ws2812Steps(scheme -1); From eb5d23131459aa3523dcc920a2e81be310323155 Mon Sep 17 00:00:00 2001 From: Barbudor Date: Sun, 12 Dec 2021 18:46:52 +0100 Subject: [PATCH 023/402] remove topic must differ from mqttclient --- tasmota/xdrv_02_9_mqtt.ino | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tasmota/xdrv_02_9_mqtt.ino b/tasmota/xdrv_02_9_mqtt.ino index a1a763b47..38f6bcd88 100644 --- a/tasmota/xdrv_02_9_mqtt.ino +++ b/tasmota/xdrv_02_9_mqtt.ino @@ -1405,7 +1405,6 @@ void CmndMqttClient(void) { void CmndFullTopic(void) { if (XdrvMailbox.data_len > 0) { MakeValidMqtt(1, XdrvMailbox.data); - if (!strcmp(XdrvMailbox.data, TasmotaGlobal.mqtt_client)) { SetShortcutDefault(); } char stemp1[TOPSZ]; strlcpy(stemp1, (SC_DEFAULT == Shortcut()) ? MQTT_FULLTOPIC : XdrvMailbox.data, sizeof(stemp1)); if (strcmp(stemp1, SettingsText(SET_MQTT_FULLTOPIC))) { @@ -1460,7 +1459,10 @@ void CmndGroupTopic(void) { if (XdrvMailbox.data_len > 0) { uint32_t settings_text_index = (1 == XdrvMailbox.index) ? SET_MQTT_GRP_TOPIC : SET_MQTT_GRP_TOPIC2 + XdrvMailbox.index - 2; MakeValidMqtt(0, XdrvMailbox.data); - if (!strcmp(XdrvMailbox.data, TasmotaGlobal.mqtt_client)) { SetShortcutDefault(); } + if (!strcmp(XdrvMailbox.data, TasmotaGlobal.mqtt_topic)) { + AddLog(LOG_LEVEL_INFO, PSTR("MQT: Error: GroupTopic must differ from Topic")); + SetShortcutDefault(); + } SettingsUpdateText(settings_text_index, (SC_CLEAR == Shortcut()) ? "" : (SC_DEFAULT == Shortcut()) ? PSTR(MQTT_GRPTOPIC) : XdrvMailbox.data); // Eliminate duplicates, have at least one and fill from index 1 @@ -1507,7 +1509,6 @@ void CmndGroupTopic(void) { void CmndTopic(void) { if (!XdrvMailbox.grpflg && (XdrvMailbox.data_len > 0)) { MakeValidMqtt(0, XdrvMailbox.data); - if (!strcmp(XdrvMailbox.data, TasmotaGlobal.mqtt_client)) { SetShortcutDefault(); } char stemp1[TOPSZ]; strlcpy(stemp1, (SC_DEFAULT == Shortcut()) ? MQTT_TOPIC : XdrvMailbox.data, sizeof(stemp1)); if (strcmp(stemp1, SettingsText(SET_MQTT_TOPIC))) { @@ -1523,7 +1524,6 @@ void CmndTopic(void) { void CmndButtonTopic(void) { if (!XdrvMailbox.grpflg && (XdrvMailbox.data_len > 0)) { MakeValidMqtt(0, XdrvMailbox.data); - if (!strcmp(XdrvMailbox.data, TasmotaGlobal.mqtt_client)) { SetShortcutDefault(); } switch (Shortcut()) { case SC_CLEAR: SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, ""); break; case SC_DEFAULT: SettingsUpdateText(SET_MQTT_BUTTON_TOPIC, TasmotaGlobal.mqtt_topic); break; @@ -1537,7 +1537,6 @@ void CmndButtonTopic(void) { void CmndSwitchTopic(void) { if (!XdrvMailbox.grpflg && (XdrvMailbox.data_len > 0)) { MakeValidMqtt(0, XdrvMailbox.data); - if (!strcmp(XdrvMailbox.data, TasmotaGlobal.mqtt_client)) { SetShortcutDefault(); } switch (Shortcut()) { case SC_CLEAR: SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, ""); break; case SC_DEFAULT: SettingsUpdateText(SET_MQTT_SWITCH_TOPIC, TasmotaGlobal.mqtt_topic); break; From b4e9468bbbfd905e8539c0aca178d92002227c3f Mon Sep 17 00:00:00 2001 From: Stephan Hadinger Date: Sun, 12 Dec 2021 18:56:11 +0100 Subject: [PATCH 024/402] Berry mapping step 1 --- lib/libesp32/Berry/default/be_modtab.c | 8 + lib/libesp32/Berry/default/be_tasmotalib.c | 105 +- lib/libesp32/Berry/default/berry_conf.h | 10 +- .../Berry/default/embedded/Tasmota.be | 24 +- lib/libesp32/Berry/gen.sh | 2 + lib/libesp32/Berry/generate/be_const_strtab.h | 6 +- .../Berry/generate/be_const_strtab_def.h | 1805 ++++++++--------- .../generate/be_fixed_be_class_tasmota.h | 155 +- lib/libesp32/Berry/generate/be_fixed_cb.h | 18 + lib/libesp32/Berry/src/be_exec.c | 5 +- lib/libesp32/Berry/src/be_gc.c | 10 +- lib/libesp32/Berry/src/be_vm.c | 6 +- lib/libesp32/Berry/src/be_vm.h | 2 - lib/libesp32/Berry/src/berry.h | 1 + lib/libesp32/berry_mapping/library.json | 17 + lib/libesp32/berry_mapping/src/be_cb_module.c | 171 ++ lib/libesp32/berry_mapping/src/be_mapping.h | 10 + tasmota/xdrv_52_0_berry_struct.ino | 1 + tasmota/xdrv_52_1_berry_native.ino | 114 +- tasmota/xdrv_52_3_berry_tasmota.ino | 38 +- tasmota/xdrv_52_9_berry.ino | 94 +- 21 files changed, 1267 insertions(+), 1335 deletions(-) create mode 100755 lib/libesp32/Berry/gen.sh create mode 100644 lib/libesp32/Berry/generate/be_fixed_cb.h create mode 100644 lib/libesp32/berry_mapping/library.json create mode 100644 lib/libesp32/berry_mapping/src/be_cb_module.c create mode 100644 lib/libesp32/berry_mapping/src/be_mapping.h diff --git a/lib/libesp32/Berry/default/be_modtab.c b/lib/libesp32/Berry/default/be_modtab.c index 47db8b24e..934400bbb 100644 --- a/lib/libesp32/Berry/default/be_modtab.c +++ b/lib/libesp32/Berry/default/be_modtab.c @@ -23,6 +23,10 @@ be_extern_native_module(solidify); be_extern_native_module(introspect); be_extern_native_module(strict); +/* Berry extensions */ +#include "be_mapping.h" +be_extern_native_module(cb); + /* Tasmota specific */ be_extern_native_module(python_compat); be_extern_native_module(re); @@ -85,6 +89,10 @@ BERRY_LOCAL const bntvmodule* const be_module_table[] = { #if BE_USE_STRICT_MODULE &be_native_module(strict), #endif + + /* Berry extensions */ + &be_native_module(cb), + /* user-defined modules register start */ &be_native_module(python_compat), diff --git a/lib/libesp32/Berry/default/be_tasmotalib.c b/lib/libesp32/Berry/default/be_tasmotalib.c index e117bae70..6539b0de3 100644 --- a/lib/libesp32/Berry/default/be_tasmotalib.c +++ b/lib/libesp32/Berry/default/be_tasmotalib.c @@ -16,7 +16,6 @@ extern int l_arch(bvm *vm); extern int l_publish(bvm *vm); extern int l_publish_result(bvm *vm); extern int l_cmd(bvm *vm); -extern int l_get_cb(bvm *vm); extern int l_getoption(bvm *vm); extern int l_millis(bvm *vm); extern int l_timereached(bvm *vm); @@ -384,7 +383,7 @@ be_local_closure(Tasmota_try_rule, /* name */ ********************************************************************/ be_local_closure(Tasmota_gen_cb, /* name */ be_nested_proto( - 7, /* nstack */ + 6, /* nstack */ 2, /* argc */ 0, /* varg */ 0, /* has upvals */ @@ -392,52 +391,18 @@ be_local_closure(Tasmota_gen_cb, /* name */ 0, /* has sup protos */ NULL, /* no sub protos */ 1, /* has constants */ - ( &(const bvalue[ 7]) { /* constants */ - /* K0 */ be_nested_str(_cb), - /* K1 */ be_const_int(0), - /* K2 */ be_nested_str(find), - /* K3 */ be_nested_str(_get_cb), - /* K4 */ be_nested_str(stop_iteration), - /* K5 */ be_nested_str(internal_error), - /* K6 */ be_nested_str(No_X20callback_X20available), + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(cb), + /* K1 */ be_nested_str(gen_cb), }), &be_const_str_gen_cb, &be_const_str_solidified, - ( &(const binstruction[34]) { /* code */ - 0x88080100, // 0000 GETMBR R2 R0 K0 - 0x4C0C0000, // 0001 LDNIL R3 - 0x1C080403, // 0002 EQ R2 R2 R3 - 0x780A0002, // 0003 JMPF R2 #0007 - 0x60080013, // 0004 GETGBL R2 G19 - 0x7C080000, // 0005 CALL R2 0 - 0x90020002, // 0006 SETMBR R0 K0 R2 - 0x60080010, // 0007 GETGBL R2 G16 - 0x540E0012, // 0008 LDINT R3 19 - 0x400E0203, // 0009 CONNECT R3 K1 R3 - 0x7C080200, // 000A CALL R2 1 - 0xA8020010, // 000B EXBLK 0 #001D - 0x5C0C0400, // 000C MOVE R3 R2 - 0x7C0C0000, // 000D CALL R3 0 - 0x88100100, // 000E GETMBR R4 R0 K0 - 0x8C100902, // 000F GETMET R4 R4 K2 - 0x5C180600, // 0010 MOVE R6 R3 - 0x7C100400, // 0011 CALL R4 2 - 0x4C140000, // 0012 LDNIL R5 - 0x1C100805, // 0013 EQ R4 R4 R5 - 0x78120006, // 0014 JMPF R4 #001C - 0x88100100, // 0015 GETMBR R4 R0 K0 - 0x98100601, // 0016 SETIDX R4 R3 R1 - 0x8C100103, // 0017 GETMET R4 R0 K3 - 0x5C180600, // 0018 MOVE R6 R3 - 0x7C100400, // 0019 CALL R4 2 - 0xA8040001, // 001A EXBLK 1 1 - 0x80040800, // 001B RET 1 R4 - 0x7001FFEE, // 001C JMP #000C - 0x58080004, // 001D LDCONST R2 K4 - 0xAC080200, // 001E CATCH R2 1 0 - 0xB0080000, // 001F RAISE 2 R0 R0 - 0xB0060B06, // 0020 RAISE 1 K5 K6 - 0x80000000, // 0021 RET 0 + ( &(const binstruction[ 5]) { /* code */ + 0xA40A0000, // 0000 IMPORT R2 K0 + 0x8C0C0501, // 0001 GETMET R3 R2 K1 + 0x5C140200, // 0002 MOVE R5 R1 + 0x7C0C0400, // 0003 CALL R3 2 + 0x80040600, // 0004 RET 1 R3 }) ) ); @@ -1605,53 +1570,6 @@ be_local_closure(Tasmota_exec_rules, /* name */ /*******************************************************************/ -/******************************************************************** -** Solidified function: cb_dispatch -********************************************************************/ -be_local_closure(Tasmota_cb_dispatch, /* name */ - be_nested_proto( - 12, /* nstack */ - 6, /* argc */ - 0, /* varg */ - 0, /* has upvals */ - NULL, /* no upvals */ - 0, /* has sup protos */ - NULL, /* no sub protos */ - 1, /* has constants */ - ( &(const bvalue[ 3]) { /* constants */ - /* K0 */ be_nested_str(_cb), - /* K1 */ be_const_int(0), - /* K2 */ be_nested_str(find), - }), - &be_const_str_cb_dispatch, - &be_const_str_solidified, - ( &(const binstruction[20]) { /* code */ - 0x88180100, // 0000 GETMBR R6 R0 K0 - 0x4C1C0000, // 0001 LDNIL R7 - 0x1C180C07, // 0002 EQ R6 R6 R7 - 0x781A0000, // 0003 JMPF R6 #0005 - 0x80060200, // 0004 RET 1 K1 - 0x88180100, // 0005 GETMBR R6 R0 K0 - 0x8C180D02, // 0006 GETMET R6 R6 K2 - 0x5C200200, // 0007 MOVE R8 R1 - 0x7C180400, // 0008 CALL R6 2 - 0x4C1C0000, // 0009 LDNIL R7 - 0x201C0C07, // 000A NE R7 R6 R7 - 0x781E0006, // 000B JMPF R7 #0013 - 0x5C1C0C00, // 000C MOVE R7 R6 - 0x5C200400, // 000D MOVE R8 R2 - 0x5C240600, // 000E MOVE R9 R3 - 0x5C280800, // 000F MOVE R10 R4 - 0x5C2C0A00, // 0010 MOVE R11 R5 - 0x7C1C0800, // 0011 CALL R7 4 - 0x80040E00, // 0012 RET 1 R7 - 0x80060200, // 0013 RET 1 K1 - }) - ) -); -/*******************************************************************/ - - /******************************************************************** ** Solidified function: hs2rgb ********************************************************************/ @@ -2072,7 +1990,6 @@ class be_class_tasmota (scope: global, name: Tasmota) { _timers, var _ccmd, var _drivers, var - _cb, var wire1, var wire2, var global, var @@ -2094,7 +2011,6 @@ class be_class_tasmota (scope: global, name: Tasmota) { publish, func(l_publish) publish_result, func(l_publish_result) _cmd, func(l_cmd) - _get_cb, func(l_get_cb) get_option, func(l_getoption) millis, func(l_millis) time_reached, func(l_timereached) @@ -2155,7 +2071,6 @@ class be_class_tasmota (scope: global, name: Tasmota) { hs2rgb, closure(Tasmota_hs2rgb_closure) - cb_dispatch, closure(Tasmota_cb_dispatch_closure) gen_cb, closure(Tasmota_gen_cb_closure) get_light, closure(Tasmota_get_light_closure) diff --git a/lib/libesp32/Berry/default/berry_conf.h b/lib/libesp32/Berry/default/berry_conf.h index d2284ac31..607a9c612 100644 --- a/lib/libesp32/Berry/default/berry_conf.h +++ b/lib/libesp32/Berry/default/berry_conf.h @@ -65,20 +65,14 @@ **/ #define BE_DEBUG_VAR_INFO 0 -/* Macro: BE_USE_OBSERVABILITY_HOOK - * Use the obshook function to report low-level actions. - * Default: 0 - **/ -#define BE_USE_OBSERVABILITY_HOOK 1 - -/* Macro: BE_USE_OBSERVABILITY_HOOK +/* Macro: BE_USE_PERF_COUNTERS * Use the obshook function to report low-level actions. * Default: 0 **/ #define BE_USE_PERF_COUNTERS 1 /* Macro: BE_VM_OBSERVABILITY_SAMPLING - * If BE_USE_OBSERVABILITY_HOOK == 1 and BE_USE_PERF_COUNTERS == 1 + * If BE_USE_PERF_COUNTERS == 1 * then the observability hook is called regularly in the VM loop * allowing to stop infinite loops or too-long running code. * The value is a power of 2. diff --git a/lib/libesp32/Berry/default/embedded/Tasmota.be b/lib/libesp32/Berry/default/embedded/Tasmota.be index 3305d57ff..22752a47d 100644 --- a/lib/libesp32/Berry/default/embedded/Tasmota.be +++ b/lib/libesp32/Berry/default/embedded/Tasmota.be @@ -21,7 +21,6 @@ class Tasmota var _timers var _ccmd var _drivers - var _cb var wire1 var wire2 var cmd_res # store the command result, nil if disables, true if capture enabled, contains return value @@ -520,28 +519,11 @@ class Tasmota end end - - #- dispatch callback number n, with parameters v0,v1,v2,v3 -# - def cb_dispatch(n,v0,v1,v2,v3) - if self._cb == nil return 0 end - var f = self._cb.find(n) - if f != nil - return f(v0,v1,v2,v3) - end - return 0 - end - #- generate a new C callback and record the associated Berry closure -# def gen_cb(f) - if self._cb == nil self._cb = {} end # create map if not already initialized - for i:0..19 - if self._cb.find(i) == nil - #- free slot -# - self._cb[i] = f - return self._get_cb(i) - end - end - raise "internal_error", "No callback available" + # DEPRECATED + import cb + return cb.gen_cb(f) end #- convert hue/sat to rgb -# diff --git a/lib/libesp32/Berry/gen.sh b/lib/libesp32/Berry/gen.sh new file mode 100755 index 000000000..303a62c95 --- /dev/null +++ b/lib/libesp32/Berry/gen.sh @@ -0,0 +1,2 @@ +#!/bin/bash +python3 tools/pycoc/main.py -o generate src default ../berry_mapping/src -c default/berry_conf.h diff --git a/lib/libesp32/Berry/generate/be_const_strtab.h b/lib/libesp32/Berry/generate/be_const_strtab.h index 9692c8508..50198eb8f 100644 --- a/lib/libesp32/Berry/generate/be_const_strtab.h +++ b/lib/libesp32/Berry/generate/be_const_strtab.h @@ -48,7 +48,6 @@ extern const bcstring be_const_str_I2C_X3A; extern const bcstring be_const_str_LVG_X3A_X20call_X20to_X20unsupported_X20callback; extern const bcstring be_const_str_Leds; extern const bcstring be_const_str_MD5; -extern const bcstring be_const_str_No_X20callback_X20available; extern const bcstring be_const_str_None; extern const bcstring be_const_str_OPTION_A; extern const bcstring be_const_str_OneWire; @@ -175,7 +174,6 @@ extern const bcstring be_const_str__archive; extern const bcstring be_const_str__available; extern const bcstring be_const_str__begin_transmission; extern const bcstring be_const_str__buffer; -extern const bcstring be_const_str__cb; extern const bcstring be_const_str__ccmd; extern const bcstring be_const_str__class; extern const bcstring be_const_str__cmd; @@ -187,7 +185,6 @@ extern const bcstring be_const_str__end_transmission; extern const bcstring be_const_str__energy; extern const bcstring be_const_str__error; extern const bcstring be_const_str__filename; -extern const bcstring be_const_str__get_cb; extern const bcstring be_const_str__global_addr; extern const bcstring be_const_str__global_def; extern const bcstring be_const_str__lvgl; @@ -250,7 +247,7 @@ extern const bcstring be_const_str_call; extern const bcstring be_const_str_call_native; extern const bcstring be_const_str_calldepth; extern const bcstring be_const_str_can_show; -extern const bcstring be_const_str_cb_dispatch; +extern const bcstring be_const_str_cb; extern const bcstring be_const_str_cb_do_nothing; extern const bcstring be_const_str_cb_event_closure; extern const bcstring be_const_str_cb_obj; @@ -384,6 +381,7 @@ extern const bcstring be_const_str_get_bat_power; extern const bcstring be_const_str_get_bat_voltage; extern const bcstring be_const_str_get_battery_chargin_status; extern const bcstring be_const_str_get_bri; +extern const bcstring be_const_str_get_cb_list; extern const bcstring be_const_str_get_coords; extern const bcstring be_const_str_get_current_module_name; extern const bcstring be_const_str_get_current_module_path; diff --git a/lib/libesp32/Berry/generate/be_const_strtab_def.h b/lib/libesp32/Berry/generate/be_const_strtab_def.h index 44676a35e..4c195c96b 100644 --- a/lib/libesp32/Berry/generate/be_const_strtab_def.h +++ b/lib/libesp32/Berry/generate/be_const_strtab_def.h @@ -1,636 +1,634 @@ -be_define_const_str(, "", 2166136261u, 0, 0, &be_const_str_True); -be_define_const_str(_X0A, "\n", 252472541u, 0, 1, &be_const_str_i2c_enabled); -be_define_const_str(_X20, " ", 621580159u, 0, 1, &be_const_str_add_cmd); -be_define_const_str(_X21_X3D, "!=", 2428715011u, 0, 2, &be_const_str__X23autoexec_X2Ebe); -be_define_const_str(_X21_X3D_X3D, "!==", 559817114u, 0, 3, &be_const_str__X2Ew); -be_define_const_str(_X23, "#", 638357778u, 0, 1, &be_const_str_No_X20callback_X20available); -be_define_const_str(_X23autoexec_X2Ebat, "#autoexec.bat", 3382890497u, 0, 13, NULL); -be_define_const_str(_X23autoexec_X2Ebe, "#autoexec.be", 1181757091u, 0, 12, &be_const_str_assert); -be_define_const_str(_X23display_X2Eini, "#display.ini", 182218220u, 0, 12, &be_const_str_code); -be_define_const_str(_X23init_X2Ebat, "#init.bat", 3297595077u, 0, 9, &be_const_str__X2502d_X25s_X2502d); -be_define_const_str(_X23preinit_X2Ebe, "#preinit.be", 687035716u, 0, 11, &be_const_str__timers); -be_define_const_str(_X2502d_X25s_X2502d, "%02d%s%02d", 1587999717u, 0, 10, &be_const_str__X3D_X3C_X3E_X21); -be_define_const_str(_X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d, "%04d-%02d-%02dT%02d:%02d:%02d", 3425528601u, 0, 29, &be_const_str_get_object_from_ptr); -be_define_const_str(_X25s_X2Eautoconf, "%s.autoconf", 3560383524u, 0, 11, &be_const_str_RES_OK); -be_define_const_str(_X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B, "<Error: apply new or remove>", 2855507949u, 0, 34, &be_const_str_hs2rgb); -be_define_const_str(_X26lt_X3BNone_X26gt_X3B, "<None>", 2602165498u, 0, 12, &be_const_str__X2Fac); -be_define_const_str(_X28_X29, "()", 685372826u, 0, 2, NULL); -be_define_const_str(_X2B, "+", 772578730u, 0, 1, &be_const_str_lower); -be_define_const_str(_X2C, ",", 688690635u, 0, 1, &be_const_str_SERIAL_7O1); -be_define_const_str(_X2D_X2D_X3A_X2D_X2D, "--:--", 1370615441u, 0, 5, &be_const_str__X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E); -be_define_const_str(_X2E, ".", 722245873u, 0, 1, &be_const_str_search); -be_define_const_str(_X2E_X2E, "..", 2748622605u, 0, 2, &be_const_str__debug_present); -be_define_const_str(_X2Eautoconf, ".autoconf", 2524679088u, 0, 9, &be_const_str_false); -be_define_const_str(_X2Ebe, ".be", 1325797348u, 0, 3, &be_const_str_Tasmota); -be_define_const_str(_X2Ebec, ".bec", 3985273221u, 0, 4, &be_const_str_CFG_X3A_X20downloading_X20_X27_X25s_X27); -be_define_const_str(_X2Elen, ".len", 850842136u, 0, 4, &be_const_str__X3Cselect_X20name_X3D_X27zip_X27_X3E); -be_define_const_str(_X2Ep, ".p", 1171526419u, 0, 2, NULL); -be_define_const_str(_X2Ep1, ".p1", 249175686u, 0, 3, &be_const_str__t); -be_define_const_str(_X2Ep2, ".p2", 232398067u, 0, 3, &be_const_str_BRY_X3A_X20could_X20not_X20save_X20compiled_X20file_X20_X25s_X20_X28_X25s_X29); -be_define_const_str(_X2Esize, ".size", 1965188224u, 0, 5, &be_const_str_is_first_time); -be_define_const_str(_X2Etapp, ".tapp", 1363391594u, 0, 5, &be_const_str__X7B); -be_define_const_str(_X2Ew, ".w", 1255414514u, 0, 2, &be_const_str_clear); -be_define_const_str(_X2F, "/", 705468254u, 0, 1, &be_const_str_SERIAL_7O2); -be_define_const_str(_X2F_X2Eautoconf, "/.autoconf", 2212074393u, 0, 10, &be_const_str_CFG_X3A_X20exception_X20_X27_X25s_X27_X20_X2D_X20_X27_X25s_X27); -be_define_const_str(_X2F_X3Frst_X3D, "/?rst=", 580074707u, 0, 6, &be_const_str_SERIAL_7N2); -be_define_const_str(_X2Fac, "/ac", 3904651978u, 0, 3, &be_const_str_WS2812); -be_define_const_str(_X3A, ":", 1057798253u, 0, 1, &be_const_str_AudioFileSourceFS); -be_define_const_str(_X3C, "<", 957132539u, 0, 1, &be_const_str_digital_write); -be_define_const_str(_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "

", 3546571739u, 0, 11, &be_const_str_LVG_X3A_X20call_X20to_X20unsupported_X20callback); -be_define_const_str(_X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "

", 1863865923u, 0, 16, &be_const_str_rule); -be_define_const_str(_X3C_X3D, "<=", 2499223986u, 0, 2, &be_const_str_set_chg_current); -be_define_const_str(_X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, "", 3147934216u, 0, 82, &be_const_str_find_op); -be_define_const_str(_X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, "", 1205771629u, 0, 72, NULL); -be_define_const_str(_X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, "
", 842307168u, 0, 77, &be_const_str_get_current_module_path); -be_define_const_str(_X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29, "Choose a device configuration:
", 1336654704u, 0, 49, &be_const_str_delay); -be_define_const_str(_X3Clambda_X3E, "", 607256038u, 0, 8, &be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20); -be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Current auto-configuration", 4212500780u, 0, 82, &be_const_str_CFG_X3A_X20could_X20not_X20run_X20_X25s_X20_X28_X25s_X20_X2D_X20_X25s_X29); -be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Select new auto-configuration", 1926223891u, 0, 80, &be_const_str_CFG_X3A_X20multiple_X20autoconf_X20files_X20found_X2C_X20aborting_X20_X28_X27_X25s_X27_X20_X2B_X20_X27_X25s_X27_X29); -be_define_const_str(_X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E, "", 510303524u, 0, 30, &be_const_str_write); -be_define_const_str(_X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E, "", 3994619755u, 0, 54, &be_const_str_None); -be_define_const_str(_X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E, "

Exception:
'%s'
%s

", 4252565082u, 0, 59, &be_const_str_classof); -be_define_const_str(_X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "

", 2052843416u, 0, 25, &be_const_str_button_pressed); +be_define_const_str(, "", 2166136261u, 0, 0, NULL); +be_define_const_str(_X0A, "\n", 252472541u, 0, 1, &be_const_str_Unknown_X20command); +be_define_const_str(_X20, " ", 621580159u, 0, 1, &be_const_str_geti); +be_define_const_str(_X21_X3D, "!=", 2428715011u, 0, 2, &be_const_str_asstring); +be_define_const_str(_X21_X3D_X3D, "!==", 559817114u, 0, 3, &be_const_str_type); +be_define_const_str(_X23, "#", 638357778u, 0, 1, &be_const_str_CFG_X3A_X20no_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found); +be_define_const_str(_X23autoexec_X2Ebat, "#autoexec.bat", 3382890497u, 0, 13, &be_const_str_arg_size); +be_define_const_str(_X23autoexec_X2Ebe, "#autoexec.be", 1181757091u, 0, 12, &be_const_str_file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27); +be_define_const_str(_X23display_X2Eini, "#display.ini", 182218220u, 0, 12, &be_const_str___lower__); +be_define_const_str(_X23init_X2Ebat, "#init.bat", 3297595077u, 0, 9, &be_const_str_SERIAL_7O2); +be_define_const_str(_X23preinit_X2Ebe, "#preinit.be", 687035716u, 0, 11, &be_const_str_SERIAL_8O2); +be_define_const_str(_X2502d_X25s_X2502d, "%02d%s%02d", 1587999717u, 0, 10, &be_const_str_yield); +be_define_const_str(_X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d, "%04d-%02d-%02dT%02d:%02d:%02d", 3425528601u, 0, 29, &be_const_str__global_def); +be_define_const_str(_X25s_X2Eautoconf, "%s.autoconf", 3560383524u, 0, 11, &be_const_str_every_second); +be_define_const_str(_X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B, "<Error: apply new or remove>", 2855507949u, 0, 34, &be_const_str_add_driver); +be_define_const_str(_X26lt_X3BNone_X26gt_X3B, "<None>", 2602165498u, 0, 12, &be_const_str_rand); +be_define_const_str(_X28_X29, "()", 685372826u, 0, 2, &be_const_str__X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29); +be_define_const_str(_X2B, "+", 772578730u, 0, 1, &be_const_str_gpio); +be_define_const_str(_X2C, ",", 688690635u, 0, 1, &be_const_str_add_cmd); +be_define_const_str(_X2D_X2D_X3A_X2D_X2D, "--:--", 1370615441u, 0, 5, &be_const_str_AudioOutputI2S); +be_define_const_str(_X2E, ".", 722245873u, 0, 1, NULL); +be_define_const_str(_X2E_X2E, "..", 2748622605u, 0, 2, &be_const_str__X2Ep2); +be_define_const_str(_X2Eautoconf, ".autoconf", 2524679088u, 0, 9, NULL); +be_define_const_str(_X2Ebe, ".be", 1325797348u, 0, 3, &be_const_str_sinh); +be_define_const_str(_X2Ebec, ".bec", 3985273221u, 0, 4, &be_const_str__debug_present); +be_define_const_str(_X2Elen, ".len", 850842136u, 0, 4, NULL); +be_define_const_str(_X2Ep, ".p", 1171526419u, 0, 2, &be_const_str_COLOR_WHITE); +be_define_const_str(_X2Ep1, ".p1", 249175686u, 0, 3, &be_const_str_sin); +be_define_const_str(_X2Ep2, ".p2", 232398067u, 0, 3, &be_const_str_json_fdump_map); +be_define_const_str(_X2Esize, ".size", 1965188224u, 0, 5, &be_const_str__X2Fac); +be_define_const_str(_X2Etapp, ".tapp", 1363391594u, 0, 5, NULL); +be_define_const_str(_X2Ew, ".w", 1255414514u, 0, 2, &be_const_str_member); +be_define_const_str(_X2F, "/", 705468254u, 0, 1, &be_const_str_None); +be_define_const_str(_X2F_X2Eautoconf, "/.autoconf", 2212074393u, 0, 10, &be_const_str_set_dc_voltage); +be_define_const_str(_X2F_X3Frst_X3D, "/?rst=", 580074707u, 0, 6, &be_const_str_AES_GCM); +be_define_const_str(_X2Fac, "/ac", 3904651978u, 0, 3, &be_const_str_get_current_module_path); +be_define_const_str(_X3A, ":", 1057798253u, 0, 1, &be_const_str_json_fdump); +be_define_const_str(_X3C, "<", 957132539u, 0, 1, NULL); +be_define_const_str(_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "

", 3546571739u, 0, 11, &be_const_str_atan); +be_define_const_str(_X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "

", 1863865923u, 0, 16, NULL); +be_define_const_str(_X3C_X3D, "<=", 2499223986u, 0, 2, &be_const_str_HTTP_POST); +be_define_const_str(_X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, "", 3147934216u, 0, 82, &be_const_str_Wire); +be_define_const_str(_X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, "", 1205771629u, 0, 72, &be_const_str_color); +be_define_const_str(_X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, "
", 842307168u, 0, 77, &be_const_str_set_power); +be_define_const_str(_X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29, "Choose a device configuration:
", 1336654704u, 0, 49, &be_const_str_bus); +be_define_const_str(_X3Clambda_X3E, "", 607256038u, 0, 8, &be_const_str_point); +be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Current auto-configuration", 4212500780u, 0, 82, &be_const_str_get_warning_level); +be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Select new auto-configuration", 1926223891u, 0, 80, &be_const_str_get_vbus_current); +be_define_const_str(_X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E, "", 510303524u, 0, 30, &be_const_str_cb_event_closure); +be_define_const_str(_X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E, "", 3994619755u, 0, 54, NULL); +be_define_const_str(_X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E, "

Exception:
'%s'
%s

", 4252565082u, 0, 59, &be_const_str_arg); +be_define_const_str(_X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "

", 2052843416u, 0, 25, &be_const_str_area); be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "

", 452285201u, 0, 120, NULL); -be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, "

 (This feature requires an internet connection)

", 2719266486u, 0, 74, NULL); -be_define_const_str(_X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E, "

Current configuration:

%s

", 4115655761u, 0, 46, &be_const_str_exec_tele); -be_define_const_str(_X3Cselect_X20name_X3D_X27zip_X27_X3E, "", 4247924536u, 0, 19, &be_const_str_find_key_i); +be_define_const_str(_X3D, "=", 940354920u, 0, 1, &be_const_str_listdir); +be_define_const_str(_X3D_X3C_X3E_X21, "=<>!", 2664470277u, 0, 4, &be_const_str_shared_key); +be_define_const_str(_X3D_X3D, "==", 2431966415u, 0, 2, &be_const_str_json_append); +be_define_const_str(_X3E, ">", 990687777u, 0, 1, &be_const_str_battery_present); +be_define_const_str(_X3E_X3D, ">=", 284975636u, 0, 2, &be_const_str_get_style_pad_right); +be_define_const_str(_X3F, "?", 973910158u, 0, 1, &be_const_str_redirect); +be_define_const_str(AES_GCM, "AES_GCM", 3832208678u, 0, 7, &be_const_str_clear_to); +be_define_const_str(AXP192, "AXP192", 757230128u, 0, 6, &be_const_str_BRY_X3A_X20could_X20not_X20save_X20compiled_X20file_X20_X25s_X20_X28_X25s_X29); +be_define_const_str(Animate_X20pc_X20is_X20out_X20of_X20range, "Animate pc is out of range", 1854929421u, 0, 26, &be_const_str_detected_X20on_X20bus); +be_define_const_str(AudioFileSource, "AudioFileSource", 2959980058u, 0, 15, &be_const_str_a); +be_define_const_str(AudioFileSourceFS, "AudioFileSourceFS", 1839147653u, 0, 17, &be_const_str_ip); +be_define_const_str(AudioGenerator, "AudioGenerator", 1839297342u, 0, 14, NULL); +be_define_const_str(AudioGeneratorMP3, "AudioGeneratorMP3", 2199818488u, 0, 17, &be_const_str_remove_cmd); +be_define_const_str(AudioGeneratorWAV, "AudioGeneratorWAV", 2746509368u, 0, 17, &be_const_str_SERIAL_7E1); +be_define_const_str(AudioOutput, "AudioOutput", 3257792048u, 0, 11, &be_const_str_wire); be_define_const_str(AudioOutputI2S, "AudioOutputI2S", 638031784u, 0, 14, NULL); -be_define_const_str(Auto_X2Dconfiguration, "Auto-configuration", 1665006109u, 0, 18, NULL); -be_define_const_str(BRY_X3A_X20ERROR_X2C_X20bad_X20json_X3A_X20, "BRY: ERROR, bad json: ", 2715135809u, 0, 22, &be_const_str_fromptr); -be_define_const_str(BRY_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s, "BRY: Exception> '%s' - %s", 2246990964u, 0, 25, &be_const_str_SERIAL_6N2); -be_define_const_str(BRY_X3A_X20could_X20not_X20save_X20compiled_X20file_X20_X25s_X20_X28_X25s_X29, "BRY: could not save compiled file %s (%s)", 736659787u, 0, 41, NULL); -be_define_const_str(BRY_X3A_X20failed_X20to_X20load_X20_persist_X2Ejson, "BRY: failed to load _persist.json", 2991913445u, 0, 33, &be_const_str_set_time); -be_define_const_str(BUTTON_CONFIGURATION, "BUTTON_CONFIGURATION", 70820856u, 0, 20, &be_const_str_files); -be_define_const_str(CFG_X3A_X20_X27init_X2Ebat_X27_X20done_X2C_X20restarting, "CFG: 'init.bat' done, restarting", 1569670677u, 0, 32, &be_const_str_push_path); -be_define_const_str(CFG_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s, "CFG: Exception> '%s' - %s", 1228874553u, 0, 25, &be_const_str_CFG_X3A_X20removed_X20file_X20_X27_X25s_X27); -be_define_const_str(CFG_X3A_X20could_X20not_X20run_X20_X25s_X20_X28_X25s_X20_X2D_X20_X25s_X29, "CFG: could not run %s (%s - %s)", 1428829580u, 0, 31, &be_const_str_COLOR_BLACK); -be_define_const_str(CFG_X3A_X20downloading_X20_X27_X25s_X27, "CFG: downloading '%s'", 589480701u, 0, 21, &be_const_str_floor); -be_define_const_str(CFG_X3A_X20exception_X20_X27_X25s_X27_X20_X2D_X20_X27_X25s_X27, "CFG: exception '%s' - '%s'", 4095407913u, 0, 26, &be_const_str_get_option); -be_define_const_str(CFG_X3A_X20loaded_X20_X20, "CFG: loaded ", 3710273538u, 0, 13, &be_const_str_delete_all_configs); -be_define_const_str(CFG_X3A_X20loaded_X20_X27_X25s_X27, "CFG: loaded '%s'", 1699028828u, 0, 16, NULL); -be_define_const_str(CFG_X3A_X20loading_X20, "CFG: loading ", 4010361503u, 0, 13, NULL); -be_define_const_str(CFG_X3A_X20loading_X20_X27_X25s_X27, "CFG: loading '%s'", 2285306097u, 0, 17, &be_const_str_SK6812_GRBW); -be_define_const_str(CFG_X3A_X20multiple_X20autoconf_X20files_X20found_X2C_X20aborting_X20_X28_X27_X25s_X27_X20_X2B_X20_X27_X25s_X27_X29, "CFG: multiple autoconf files found, aborting ('%s' + '%s')", 197663371u, 0, 58, NULL); -be_define_const_str(CFG_X3A_X20no_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found, "CFG: no '*.autoconf' file found", 127493957u, 0, 31, &be_const_str_get_free_heap); -be_define_const_str(CFG_X3A_X20ran_X20_X20, "CFG: ran ", 3579570472u, 0, 10, &be_const_str_contains); -be_define_const_str(CFG_X3A_X20removed_X20file_X20_X27_X25s_X27, "CFG: removed file '%s'", 2048602473u, 0, 22, &be_const_str_SERIAL_8E2); -be_define_const_str(CFG_X3A_X20removing_X20autoconf_X20files, "CFG: removing autoconf files", 4014704970u, 0, 28, &be_const_str_get_bat_charge_current); -be_define_const_str(CFG_X3A_X20removing_X20first_X20time_X20marker, "CFG: removing first time marker", 2125556683u, 0, 31, &be_const_str__lvgl); -be_define_const_str(CFG_X3A_X20return_code_X3D_X25i, "CFG: return_code=%i", 2059897320u, 0, 19, &be_const_str_OPTION_A); -be_define_const_str(CFG_X3A_X20running_X20, "CFG: running ", 2478334534u, 0, 13, NULL); -be_define_const_str(CFG_X3A_X20skipping_X20_X27display_X2Eini_X27_X20because_X20already_X20present_X20in_X20file_X2Dsystem, "CFG: skipping 'display.ini' because already present in file-system", 3965549264u, 0, 66, NULL); -be_define_const_str(COLOR_BLACK, "COLOR_BLACK", 264427940u, 0, 11, NULL); -be_define_const_str(COLOR_WHITE, "COLOR_WHITE", 2536871270u, 0, 11, &be_const_str__energy); -be_define_const_str(EC_C25519, "EC_C25519", 95492591u, 0, 9, &be_const_str_gc); -be_define_const_str(EVENT_DRAW_MAIN, "EVENT_DRAW_MAIN", 1955620614u, 0, 15, &be_const_str_SERIAL_5E2); -be_define_const_str(EVENT_DRAW_PART_BEGIN, "EVENT_DRAW_PART_BEGIN", 3391865024u, 0, 21, &be_const_str_available); -be_define_const_str(EVENT_DRAW_PART_END, "EVENT_DRAW_PART_END", 3301625292u, 0, 19, &be_const_str_chars_in_string); -be_define_const_str(False, "False", 2541049336u, 0, 5, &be_const_str_set_style_line_color); -be_define_const_str(GET, "GET", 2531704439u, 0, 3, &be_const_str_onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20change_X20the_X20current_X20configuration_X20and_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E); -be_define_const_str(HTTP_GET, "HTTP_GET", 1722467738u, 0, 8, &be_const_str_I2C_Driver); -be_define_const_str(HTTP_POST, "HTTP_POST", 1999554144u, 0, 9, &be_const_str_imin); -be_define_const_str(I2C_X3A, "I2C:", 813483371u, 0, 4, &be_const_str_read24); -be_define_const_str(I2C_Driver, "I2C_Driver", 1714501658u, 0, 10, &be_const_str_addr); -be_define_const_str(LVG_X3A_X20call_X20to_X20unsupported_X20callback, "LVG: call to unsupported callback", 504176819u, 0, 33, &be_const_str_cb_dispatch); -be_define_const_str(Leds, "Leds", 2709245275u, 0, 4, &be_const_str_arg_name); +be_define_const_str(Auto_X2Dconfiguration, "Auto-configuration", 1665006109u, 0, 18, &be_const_str_Tasmota); +be_define_const_str(BRY_X3A_X20ERROR_X2C_X20bad_X20json_X3A_X20, "BRY: ERROR, bad json: ", 2715135809u, 0, 22, &be_const_str_I2C_X3A); +be_define_const_str(BRY_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s, "BRY: Exception> '%s' - %s", 2246990964u, 0, 25, NULL); +be_define_const_str(BRY_X3A_X20could_X20not_X20save_X20compiled_X20file_X20_X25s_X20_X28_X25s_X29, "BRY: could not save compiled file %s (%s)", 736659787u, 0, 41, &be_const_str_bri); +be_define_const_str(BRY_X3A_X20failed_X20to_X20load_X20_persist_X2Ejson, "BRY: failed to load _persist.json", 2991913445u, 0, 33, &be_const_str_target); +be_define_const_str(BUTTON_CONFIGURATION, "BUTTON_CONFIGURATION", 70820856u, 0, 20, &be_const_str_SERIAL_5O1); +be_define_const_str(CFG_X3A_X20_X27init_X2Ebat_X27_X20done_X2C_X20restarting, "CFG: 'init.bat' done, restarting", 1569670677u, 0, 32, &be_const_str_delay); +be_define_const_str(CFG_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s, "CFG: Exception> '%s' - %s", 1228874553u, 0, 25, &be_const_str__p); +be_define_const_str(CFG_X3A_X20could_X20not_X20run_X20_X25s_X20_X28_X25s_X20_X2D_X20_X25s_X29, "CFG: could not run %s (%s - %s)", 1428829580u, 0, 31, &be_const_str_arg_X20must_X20be_X20a_X20subclass_X20of_X20lv_obj); +be_define_const_str(CFG_X3A_X20downloading_X20_X27_X25s_X27, "CFG: downloading '%s'", 589480701u, 0, 21, &be_const_str_add_header); +be_define_const_str(CFG_X3A_X20exception_X20_X27_X25s_X27_X20_X2D_X20_X27_X25s_X27, "CFG: exception '%s' - '%s'", 4095407913u, 0, 26, &be_const_str_Tele); +be_define_const_str(CFG_X3A_X20loaded_X20_X20, "CFG: loaded ", 3710273538u, 0, 13, NULL); +be_define_const_str(CFG_X3A_X20loaded_X20_X27_X25s_X27, "CFG: loaded '%s'", 1699028828u, 0, 16, &be_const_str_fromb64); +be_define_const_str(CFG_X3A_X20loading_X20, "CFG: loading ", 4010361503u, 0, 13, &be_const_str_floor); +be_define_const_str(CFG_X3A_X20loading_X20_X27_X25s_X27, "CFG: loading '%s'", 2285306097u, 0, 17, &be_const_str_Timer); +be_define_const_str(CFG_X3A_X20multiple_X20autoconf_X20files_X20found_X2C_X20aborting_X20_X28_X27_X25s_X27_X20_X2B_X20_X27_X25s_X27_X29, "CFG: multiple autoconf files found, aborting ('%s' + '%s')", 197663371u, 0, 58, &be_const_str_content_stop); +be_define_const_str(CFG_X3A_X20no_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found, "CFG: no '*.autoconf' file found", 127493957u, 0, 31, &be_const_str_byte); +be_define_const_str(CFG_X3A_X20ran_X20_X20, "CFG: ran ", 3579570472u, 0, 10, &be_const_str_draw_line_dsc_init); +be_define_const_str(CFG_X3A_X20removed_X20file_X20_X27_X25s_X27, "CFG: removed file '%s'", 2048602473u, 0, 22, &be_const_str_pixel_size); +be_define_const_str(CFG_X3A_X20removing_X20autoconf_X20files, "CFG: removing autoconf files", 4014704970u, 0, 28, &be_const_str_issubclass); +be_define_const_str(CFG_X3A_X20removing_X20first_X20time_X20marker, "CFG: removing first time marker", 2125556683u, 0, 31, NULL); +be_define_const_str(CFG_X3A_X20return_code_X3D_X25i, "CFG: return_code=%i", 2059897320u, 0, 19, &be_const_str_get_option); +be_define_const_str(CFG_X3A_X20running_X20, "CFG: running ", 2478334534u, 0, 13, &be_const_str_get_vbus_voltage); +be_define_const_str(CFG_X3A_X20skipping_X20_X27display_X2Eini_X27_X20because_X20already_X20present_X20in_X20file_X2Dsystem, "CFG: skipping 'display.ini' because already present in file-system", 3965549264u, 0, 66, &be_const_str_create_custom_widget); +be_define_const_str(COLOR_BLACK, "COLOR_BLACK", 264427940u, 0, 11, &be_const_str_SERIAL_6N2); +be_define_const_str(COLOR_WHITE, "COLOR_WHITE", 2536871270u, 0, 11, &be_const_str_wd); +be_define_const_str(EC_C25519, "EC_C25519", 95492591u, 0, 9, &be_const_str__filename); +be_define_const_str(EVENT_DRAW_MAIN, "EVENT_DRAW_MAIN", 1955620614u, 0, 15, &be_const_str_from_to); +be_define_const_str(EVENT_DRAW_PART_BEGIN, "EVENT_DRAW_PART_BEGIN", 3391865024u, 0, 21, NULL); +be_define_const_str(EVENT_DRAW_PART_END, "EVENT_DRAW_PART_END", 3301625292u, 0, 19, &be_const_str_set_pixel_color); +be_define_const_str(False, "False", 2541049336u, 0, 5, &be_const_str_get_style_line_color); +be_define_const_str(GET, "GET", 2531704439u, 0, 3, &be_const_str_SERIAL_5N1); +be_define_const_str(HTTP_GET, "HTTP_GET", 1722467738u, 0, 8, &be_const_str_dac_voltage); +be_define_const_str(HTTP_POST, "HTTP_POST", 1999554144u, 0, 9, &be_const_str_widget_event_impl); +be_define_const_str(I2C_X3A, "I2C:", 813483371u, 0, 4, &be_const_str_WS2812); +be_define_const_str(I2C_Driver, "I2C_Driver", 1714501658u, 0, 10, &be_const_str_SERIAL_5O2); +be_define_const_str(LVG_X3A_X20call_X20to_X20unsupported_X20callback, "LVG: call to unsupported callback", 504176819u, 0, 33, &be_const_str__end_transmission); +be_define_const_str(Leds, "Leds", 2709245275u, 0, 4, &be_const_str_display_X2Eini); be_define_const_str(MD5, "MD5", 1935726387u, 0, 3, NULL); -be_define_const_str(No_X20callback_X20available, "No callback available", 633786138u, 0, 21, &be_const_str_gpio); -be_define_const_str(None, "None", 810547195u, 0, 4, &be_const_str_SERIAL_5E1); -be_define_const_str(OPTION_A, "OPTION_A", 1133299440u, 0, 8, &be_const_str_init_draw_line_dsc); -be_define_const_str(OneWire, "OneWire", 2298990722u, 0, 7, &be_const_str_Timer); -be_define_const_str(PART_MAIN, "PART_MAIN", 2473491508u, 0, 9, &be_const_str_STATE_DEFAULT); -be_define_const_str(POST, "POST", 1929554311u, 0, 4, NULL); +be_define_const_str(None, "None", 810547195u, 0, 4, &be_const_str_day); +be_define_const_str(OPTION_A, "OPTION_A", 1133299440u, 0, 8, &be_const_str_isnan); +be_define_const_str(OneWire, "OneWire", 2298990722u, 0, 7, &be_const_str_is_first_time); +be_define_const_str(PART_MAIN, "PART_MAIN", 2473491508u, 0, 9, &be_const_str__ccmd); +be_define_const_str(POST, "POST", 1929554311u, 0, 4, &be_const_str_getbits); be_define_const_str(Parameter_X20error, "Parameter error", 3840042038u, 0, 15, NULL); -be_define_const_str(RES_OK, "RES_OK", 1233817284u, 0, 6, &be_const_str_bri); -be_define_const_str(Restart_X201, "Restart 1", 3504455855u, 0, 9, &be_const_str_min); -be_define_const_str(SERIAL_5E1, "SERIAL_5E1", 1163775235u, 0, 10, &be_const_str_zero); -be_define_const_str(SERIAL_5E2, "SERIAL_5E2", 1180552854u, 0, 10, &be_const_str_lv_obj_class); -be_define_const_str(SERIAL_5N1, "SERIAL_5N1", 3313031680u, 0, 10, &be_const_str_ins_ramp); -be_define_const_str(SERIAL_5N2, "SERIAL_5N2", 3363364537u, 0, 10, NULL); -be_define_const_str(SERIAL_5O1, "SERIAL_5O1", 3782657917u, 0, 10, &be_const_str_flush); -be_define_const_str(SERIAL_5O2, "SERIAL_5O2", 3732325060u, 0, 10, NULL); +be_define_const_str(RES_OK, "RES_OK", 1233817284u, 0, 6, &be_const_str_k); +be_define_const_str(Restart_X201, "Restart 1", 3504455855u, 0, 9, &be_const_str_year); +be_define_const_str(SERIAL_5E1, "SERIAL_5E1", 1163775235u, 0, 10, &be_const_str_SERIAL_8N1); +be_define_const_str(SERIAL_5E2, "SERIAL_5E2", 1180552854u, 0, 10, &be_const_str_SERIAL_8N2); +be_define_const_str(SERIAL_5N1, "SERIAL_5N1", 3313031680u, 0, 10, NULL); +be_define_const_str(SERIAL_5N2, "SERIAL_5N2", 3363364537u, 0, 10, &be_const_str_read_sensors); +be_define_const_str(SERIAL_5O1, "SERIAL_5O1", 3782657917u, 0, 10, &be_const_str_return); +be_define_const_str(SERIAL_5O2, "SERIAL_5O2", 3732325060u, 0, 10, &be_const_str__t); be_define_const_str(SERIAL_6E1, "SERIAL_6E1", 334249486u, 0, 10, NULL); -be_define_const_str(SERIAL_6E2, "SERIAL_6E2", 317471867u, 0, 10, NULL); -be_define_const_str(SERIAL_6N1, "SERIAL_6N1", 198895701u, 0, 10, &be_const_str_char); -be_define_const_str(SERIAL_6N2, "SERIAL_6N2", 148562844u, 0, 10, &be_const_str_matrix); -be_define_const_str(SERIAL_6O1, "SERIAL_6O1", 266153272u, 0, 10, &be_const_str_atleast1); -be_define_const_str(SERIAL_6O2, "SERIAL_6O2", 316486129u, 0, 10, &be_const_str_content_send); -be_define_const_str(SERIAL_7E1, "SERIAL_7E1", 147718061u, 0, 10, &be_const_str_stop_iteration); -be_define_const_str(SERIAL_7E2, "SERIAL_7E2", 97385204u, 0, 10, &be_const_str_copy); -be_define_const_str(SERIAL_7N1, "SERIAL_7N1", 1891060246u, 0, 10, NULL); -be_define_const_str(SERIAL_7N2, "SERIAL_7N2", 1874282627u, 0, 10, &be_const_str_elif); -be_define_const_str(SERIAL_7O1, "SERIAL_7O1", 1823802675u, 0, 10, &be_const_str_init); -be_define_const_str(SERIAL_7O2, "SERIAL_7O2", 1840580294u, 0, 10, &be_const_str_global); -be_define_const_str(SERIAL_8E1, "SERIAL_8E1", 2371121616u, 0, 10, &be_const_str_scan); -be_define_const_str(SERIAL_8E2, "SERIAL_8E2", 2421454473u, 0, 10, &be_const_str_deregister_obj); -be_define_const_str(SERIAL_8N1, "SERIAL_8N1", 2369297235u, 0, 10, &be_const_str_resp_cmnd_done); -be_define_const_str(SERIAL_8N2, "SERIAL_8N2", 2386074854u, 0, 10, &be_const_str_sys); -be_define_const_str(SERIAL_8O1, "SERIAL_8O1", 289122742u, 0, 10, &be_const_str_get_vbus_current); -be_define_const_str(SERIAL_8O2, "SERIAL_8O2", 272345123u, 0, 10, &be_const_str_gamma10); -be_define_const_str(SK6812_GRBW, "SK6812_GRBW", 81157857u, 0, 11, NULL); -be_define_const_str(STATE_DEFAULT, "STATE_DEFAULT", 712406428u, 0, 13, &be_const_str_classname); -be_define_const_str(TAP_X3A_X20found_X20Tasmota_X20App_X20_X27_X25s_X27, "TAP: found Tasmota App '%s'", 2643152398u, 0, 27, NULL); -be_define_const_str(Tasmota, "Tasmota", 4047617668u, 0, 7, &be_const_str_top); -be_define_const_str(Tele, "Tele", 1329980653u, 0, 4, &be_const_str_exists); -be_define_const_str(Timer, "Timer", 3948127682u, 0, 5, &be_const_str_del); -be_define_const_str(True, "True", 3453902341u, 0, 4, &be_const_str_real); -be_define_const_str(Unknown_X20command, "Unknown command", 1830905432u, 0, 15, &be_const_str_get_percentage); -be_define_const_str(WS2812, "WS2812", 3539741218u, 0, 6, &be_const_str_finish); -be_define_const_str(WS2812_GRB, "WS2812_GRB", 1736405692u, 0, 10, &be_const_str_tasmota); -be_define_const_str(Wire, "Wire", 1938276536u, 0, 4, &be_const_str__begin_transmission); -be_define_const_str(_X5B, "[", 3725336506u, 0, 1, NULL); -be_define_const_str(_X5D, "]", 3624670792u, 0, 1, NULL); -be_define_const_str(_, "_", 3658226030u, 0, 1, NULL); -be_define_const_str(__iterator__, "__iterator__", 3884039703u, 0, 12, &be_const_str_pixel_count); -be_define_const_str(__lower__, "__lower__", 123855590u, 0, 9, &be_const_str_pin_mode); -be_define_const_str(__upper__, "__upper__", 3612202883u, 0, 9, &be_const_str_engine); -be_define_const_str(_anonymous_, "_anonymous_", 1957281476u, 0, 11, &be_const_str_get_light); -be_define_const_str(_archive, "_archive", 4004559404u, 0, 8, &be_const_str_cosh); -be_define_const_str(_available, "_available", 1306196581u, 0, 10, &be_const_str_is_running); -be_define_const_str(_begin_transmission, "_begin_transmission", 2779461176u, 0, 19, &be_const_str_lv_event_cb); -be_define_const_str(_buffer, "_buffer", 2044888568u, 0, 7, &be_const_str_every_50ms); -be_define_const_str(_cb, "_cb", 4043300367u, 0, 3, NULL); -be_define_const_str(_ccmd, "_ccmd", 2163421413u, 0, 5, &be_const_str_animators); -be_define_const_str(_class, "_class", 2732146350u, 0, 6, &be_const_str__X7Bs_X7DVBus_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D); -be_define_const_str(_cmd, "_cmd", 3419822142u, 0, 4, NULL); -be_define_const_str(_debug_present, "_debug_present", 4063411725u, 0, 14, &be_const_str_call_native); +be_define_const_str(SERIAL_6E2, "SERIAL_6E2", 317471867u, 0, 10, &be_const_str_digital_write); +be_define_const_str(SERIAL_6N1, "SERIAL_6N1", 198895701u, 0, 10, &be_const_str__X5D); +be_define_const_str(SERIAL_6N2, "SERIAL_6N2", 148562844u, 0, 10, &be_const_str__settings_def); +be_define_const_str(SERIAL_6O1, "SERIAL_6O1", 266153272u, 0, 10, &be_const_str_couldn_X27t_X20not_X20initialize_X20noepixelbus); +be_define_const_str(SERIAL_6O2, "SERIAL_6O2", 316486129u, 0, 10, &be_const_str_deregister_obj); +be_define_const_str(SERIAL_7E1, "SERIAL_7E1", 147718061u, 0, 10, &be_const_str_call); +be_define_const_str(SERIAL_7E2, "SERIAL_7E2", 97385204u, 0, 10, &be_const_str_global); +be_define_const_str(SERIAL_7N1, "SERIAL_7N1", 1891060246u, 0, 10, &be_const_str_encrypt); +be_define_const_str(SERIAL_7N2, "SERIAL_7N2", 1874282627u, 0, 10, &be_const_str_alternate); +be_define_const_str(SERIAL_7O1, "SERIAL_7O1", 1823802675u, 0, 10, NULL); +be_define_const_str(SERIAL_7O2, "SERIAL_7O2", 1840580294u, 0, 10, &be_const_str_arch); +be_define_const_str(SERIAL_8E1, "SERIAL_8E1", 2371121616u, 0, 10, &be_const_str__available); +be_define_const_str(SERIAL_8E2, "SERIAL_8E2", 2421454473u, 0, 10, NULL); +be_define_const_str(SERIAL_8N1, "SERIAL_8N1", 2369297235u, 0, 10, &be_const_str_imin); +be_define_const_str(SERIAL_8N2, "SERIAL_8N2", 2386074854u, 0, 10, &be_const_str_gen_cb); +be_define_const_str(SERIAL_8O1, "SERIAL_8O1", 289122742u, 0, 10, &be_const_str_return_X20code_X3D_X25i); +be_define_const_str(SERIAL_8O2, "SERIAL_8O2", 272345123u, 0, 10, &be_const_str_tag); +be_define_const_str(SK6812_GRBW, "SK6812_GRBW", 81157857u, 0, 11, &be_const_str_item); +be_define_const_str(STATE_DEFAULT, "STATE_DEFAULT", 712406428u, 0, 13, &be_const_str_pop); +be_define_const_str(TAP_X3A_X20found_X20Tasmota_X20App_X20_X27_X25s_X27, "TAP: found Tasmota App '%s'", 2643152398u, 0, 27, &be_const_str_closure); +be_define_const_str(Tasmota, "Tasmota", 4047617668u, 0, 7, &be_const_str_dump); +be_define_const_str(Tele, "Tele", 1329980653u, 0, 4, &be_const_str_f); +be_define_const_str(Timer, "Timer", 3948127682u, 0, 5, &be_const_str_check_privileged_access); +be_define_const_str(True, "True", 3453902341u, 0, 4, &be_const_str_hs2rgb); +be_define_const_str(Unknown_X20command, "Unknown command", 1830905432u, 0, 15, &be_const_str_map); +be_define_const_str(WS2812, "WS2812", 3539741218u, 0, 6, NULL); +be_define_const_str(WS2812_GRB, "WS2812_GRB", 1736405692u, 0, 10, NULL); +be_define_const_str(Wire, "Wire", 1938276536u, 0, 4, NULL); +be_define_const_str(_X5B, "[", 3725336506u, 0, 1, &be_const_str_get_object_from_ptr); +be_define_const_str(_X5D, "]", 3624670792u, 0, 1, &be_const_str_x1); +be_define_const_str(_, "_", 3658226030u, 0, 1, &be_const_str_widget_struct_by_class); +be_define_const_str(__iterator__, "__iterator__", 3884039703u, 0, 12, &be_const_str_asin); +be_define_const_str(__lower__, "__lower__", 123855590u, 0, 9, &be_const_str_public_key); +be_define_const_str(__upper__, "__upper__", 3612202883u, 0, 9, &be_const_str_class_init_obj); +be_define_const_str(_anonymous_, "_anonymous_", 1957281476u, 0, 11, &be_const_str_matrix); +be_define_const_str(_archive, "_archive", 4004559404u, 0, 8, &be_const_str_isrunning); +be_define_const_str(_available, "_available", 1306196581u, 0, 10, &be_const_str_setitem); +be_define_const_str(_begin_transmission, "_begin_transmission", 2779461176u, 0, 19, NULL); +be_define_const_str(_buffer, "_buffer", 2044888568u, 0, 7, &be_const_str_seti); +be_define_const_str(_ccmd, "_ccmd", 2163421413u, 0, 5, &be_const_str_enabled); +be_define_const_str(_class, "_class", 2732146350u, 0, 6, &be_const_str__dirty); +be_define_const_str(_cmd, "_cmd", 3419822142u, 0, 4, &be_const_str_nan); +be_define_const_str(_debug_present, "_debug_present", 4063411725u, 0, 14, NULL); be_define_const_str(_def, "_def", 1985022181u, 0, 4, NULL); -be_define_const_str(_dirty, "_dirty", 283846766u, 0, 6, &be_const_str_get_coords); -be_define_const_str(_drivers, "_drivers", 3260328985u, 0, 8, &be_const_str__write); -be_define_const_str(_end_transmission, "_end_transmission", 3237480400u, 0, 17, NULL); -be_define_const_str(_energy, "_energy", 535372070u, 0, 7, &be_const_str_quality); -be_define_const_str(_error, "_error", 1132109656u, 0, 6, &be_const_str__ptr); -be_define_const_str(_filename, "_filename", 1430813195u, 0, 9, &be_const_str_set_text); -be_define_const_str(_get_cb, "_get_cb", 1448849122u, 0, 7, &be_const_str_find); -be_define_const_str(_global_addr, "_global_addr", 533766721u, 0, 12, &be_const_str_display_X2Eini); -be_define_const_str(_global_def, "_global_def", 646007001u, 0, 11, &be_const_str_get_warning_level); -be_define_const_str(_lvgl, "_lvgl", 2689219483u, 0, 5, &be_const_str_get_height); -be_define_const_str(_p, "_p", 1594591802u, 0, 2, &be_const_str_format); -be_define_const_str(_persist_X2Ejson, "_persist.json", 2008425138u, 0, 13, &be_const_str_value); -be_define_const_str(_ptr, "_ptr", 306235816u, 0, 4, &be_const_str_rtc); -be_define_const_str(_read, "_read", 346717030u, 0, 5, &be_const_str_is_dirty); -be_define_const_str(_request_from, "_request_from", 3965148604u, 0, 13, NULL); +be_define_const_str(_dirty, "_dirty", 283846766u, 0, 6, &be_const_str_content_start); +be_define_const_str(_drivers, "_drivers", 3260328985u, 0, 8, &be_const_str_del); +be_define_const_str(_end_transmission, "_end_transmission", 3237480400u, 0, 17, &be_const_str_math); +be_define_const_str(_energy, "_energy", 535372070u, 0, 7, &be_const_str_reduce); +be_define_const_str(_error, "_error", 1132109656u, 0, 6, NULL); +be_define_const_str(_filename, "_filename", 1430813195u, 0, 9, NULL); +be_define_const_str(_global_addr, "_global_addr", 533766721u, 0, 12, &be_const_str_add_rule); +be_define_const_str(_global_def, "_global_def", 646007001u, 0, 11, &be_const_str_destructor_cb); +be_define_const_str(_lvgl, "_lvgl", 2689219483u, 0, 5, NULL); +be_define_const_str(_p, "_p", 1594591802u, 0, 2, &be_const_str_scan); +be_define_const_str(_persist_X2Ejson, "_persist.json", 2008425138u, 0, 13, NULL); +be_define_const_str(_ptr, "_ptr", 306235816u, 0, 4, NULL); +be_define_const_str(_read, "_read", 346717030u, 0, 5, &be_const_str_calldepth); +be_define_const_str(_request_from, "_request_from", 3965148604u, 0, 13, &be_const_str_set_x); be_define_const_str(_rules, "_rules", 4266217105u, 0, 6, NULL); -be_define_const_str(_settings_def, "_settings_def", 3775560307u, 0, 13, &be_const_str_set); -be_define_const_str(_settings_ptr, "_settings_ptr", 1825772182u, 0, 13, &be_const_str_remove_cmd); -be_define_const_str(_t, "_t", 1527481326u, 0, 2, &be_const_str_draw_line_dsc_init); -be_define_const_str(_timers, "_timers", 2600100916u, 0, 7, &be_const_str_eth); -be_define_const_str(_write, "_write", 2215462825u, 0, 6, &be_const_str_v); -be_define_const_str(a, "a", 3826002220u, 0, 1, &be_const_str_add); -be_define_const_str(abs, "abs", 709362235u, 0, 3, &be_const_str_get_aps_voltage); -be_define_const_str(acos, "acos", 1006755615u, 0, 4, &be_const_str_lv); -be_define_const_str(add, "add", 993596020u, 0, 3, &be_const_str_bytes); -be_define_const_str(add_anim, "add_anim", 3980662668u, 0, 8, NULL); -be_define_const_str(add_cmd, "add_cmd", 3361630879u, 0, 7, &be_const_str_arg_X20must_X20be_X20a_X20subclass_X20of_X20lv_obj); -be_define_const_str(add_driver, "add_driver", 1654458371u, 0, 10, NULL); -be_define_const_str(add_header, "add_header", 927130612u, 0, 10, &be_const_str_couldn_X27t_X20not_X20initialize_X20noepixelbus); -be_define_const_str(add_rule, "add_rule", 596540743u, 0, 8, &be_const_str_resp_cmnd_error); -be_define_const_str(addr, "addr", 1087856498u, 0, 4, &be_const_str_battery_present); -be_define_const_str(allocated, "allocated", 429986098u, 0, 9, &be_const_str_create_custom_widget); -be_define_const_str(alternate, "alternate", 1140253277u, 0, 9, &be_const_str_out_X20of_X20range); -be_define_const_str(animate, "animate", 3885786800u, 0, 7, &be_const_str_set_ldo_voltage); -be_define_const_str(animators, "animators", 279858213u, 0, 9, &be_const_str_read_bytes); -be_define_const_str(arch, "arch", 2952804297u, 0, 4, &be_const_str_arg_size); -be_define_const_str(area, "area", 2601460036u, 0, 4, &be_const_str_draw_arc); -be_define_const_str(arg, "arg", 1047474471u, 0, 3, &be_const_str_page_autoconf_mgr); -be_define_const_str(arg_X20must_X20be_X20a_X20subclass_X20of_X20lv_obj, "arg must be a subclass of lv_obj", 1641882079u, 0, 32, &be_const_str_create_segment); -be_define_const_str(arg_name, "arg_name", 1345046155u, 0, 8, &be_const_str_has); +be_define_const_str(_settings_def, "_settings_def", 3775560307u, 0, 13, &be_const_str_offseta); +be_define_const_str(_settings_ptr, "_settings_ptr", 1825772182u, 0, 13, &be_const_str_event_send); +be_define_const_str(_t, "_t", 1527481326u, 0, 2, &be_const_str_resolvecmnd); +be_define_const_str(_timers, "_timers", 2600100916u, 0, 7, &be_const_str_add); +be_define_const_str(_write, "_write", 2215462825u, 0, 6, &be_const_str_read12); +be_define_const_str(a, "a", 3826002220u, 0, 1, &be_const_str_get_string); +be_define_const_str(abs, "abs", 709362235u, 0, 3, NULL); +be_define_const_str(acos, "acos", 1006755615u, 0, 4, &be_const_str_def); +be_define_const_str(add, "add", 993596020u, 0, 3, &be_const_str_zero); +be_define_const_str(add_anim, "add_anim", 3980662668u, 0, 8, &be_const_str_content_flush); +be_define_const_str(add_cmd, "add_cmd", 3361630879u, 0, 7, NULL); +be_define_const_str(add_driver, "add_driver", 1654458371u, 0, 10, &be_const_str_atan2); +be_define_const_str(add_header, "add_header", 927130612u, 0, 10, &be_const_str_set_percentage); +be_define_const_str(add_rule, "add_rule", 596540743u, 0, 8, &be_const_str_call_native); +be_define_const_str(addr, "addr", 1087856498u, 0, 4, &be_const_str_create_matrix); +be_define_const_str(allocated, "allocated", 429986098u, 0, 9, &be_const_str_toptr); +be_define_const_str(alternate, "alternate", 1140253277u, 0, 9, NULL); +be_define_const_str(animate, "animate", 3885786800u, 0, 7, &be_const_str_function); +be_define_const_str(animators, "animators", 279858213u, 0, 9, &be_const_str_traceback); +be_define_const_str(arch, "arch", 2952804297u, 0, 4, NULL); +be_define_const_str(area, "area", 2601460036u, 0, 4, &be_const_str_find); +be_define_const_str(arg, "arg", 1047474471u, 0, 3, NULL); +be_define_const_str(arg_X20must_X20be_X20a_X20subclass_X20of_X20lv_obj, "arg must be a subclass of lv_obj", 1641882079u, 0, 32, &be_const_str_as); +be_define_const_str(arg_name, "arg_name", 1345046155u, 0, 8, &be_const_str_widget_height_def); be_define_const_str(arg_size, "arg_size", 3310243257u, 0, 8, NULL); be_define_const_str(as, "as", 1579491469u, 67, 2, NULL); -be_define_const_str(asin, "asin", 4272848550u, 0, 4, &be_const_str_destructor_cb); -be_define_const_str(assert, "assert", 2774883451u, 0, 6, &be_const_str_member); -be_define_const_str(asstring, "asstring", 1298225088u, 0, 8, &be_const_str_invalidate); -be_define_const_str(atan, "atan", 108579519u, 0, 4, &be_const_str_fromb64); -be_define_const_str(atan2, "atan2", 3173440503u, 0, 5, &be_const_str_millis); -be_define_const_str(atleast1, "atleast1", 1956331672u, 0, 8, &be_const_str_connected); -be_define_const_str(attrdump, "attrdump", 1521571304u, 0, 8, &be_const_str_counters); -be_define_const_str(autoexec, "autoexec", 3676861891u, 0, 8, NULL); -be_define_const_str(autorun, "autorun", 1447527407u, 0, 7, &be_const_str_return); -be_define_const_str(available, "available", 1727918744u, 0, 9, &be_const_str_fromstring); -be_define_const_str(b, "b", 3876335077u, 0, 1, &be_const_str_display); -be_define_const_str(back_forth, "back_forth", 2665042062u, 0, 10, &be_const_str_dac_voltage); -be_define_const_str(base_class, "base_class", 1107737279u, 0, 10, NULL); -be_define_const_str(battery_present, "battery_present", 3588397058u, 0, 15, &be_const_str_run_bat); -be_define_const_str(begin, "begin", 1748273790u, 0, 5, &be_const_str_gamma8); -be_define_const_str(bool, "bool", 3365180733u, 0, 4, &be_const_str_set_power); +be_define_const_str(asin, "asin", 4272848550u, 0, 4, &be_const_str_get_current_module_name); +be_define_const_str(assert, "assert", 2774883451u, 0, 6, &be_const_str_display); +be_define_const_str(asstring, "asstring", 1298225088u, 0, 8, &be_const_str_get_temp); +be_define_const_str(atan, "atan", 108579519u, 0, 4, &be_const_str_publish); +be_define_const_str(atan2, "atan2", 3173440503u, 0, 5, &be_const_str_json_fdump_list); +be_define_const_str(atleast1, "atleast1", 1956331672u, 0, 8, &be_const_str_exp); +be_define_const_str(attrdump, "attrdump", 1521571304u, 0, 8, &be_const_str_cb_do_nothing); +be_define_const_str(autoexec, "autoexec", 3676861891u, 0, 8, &be_const_str_cmd_res); +be_define_const_str(autorun, "autorun", 1447527407u, 0, 7, &be_const_str_log); +be_define_const_str(available, "available", 1727918744u, 0, 9, NULL); +be_define_const_str(b, "b", 3876335077u, 0, 1, &be_const_str_get_bri); +be_define_const_str(back_forth, "back_forth", 2665042062u, 0, 10, &be_const_str_debug); +be_define_const_str(base_class, "base_class", 1107737279u, 0, 10, &be_const_str_is_running); +be_define_const_str(battery_present, "battery_present", 3588397058u, 0, 15, NULL); +be_define_const_str(begin, "begin", 1748273790u, 0, 5, &be_const_str_char); +be_define_const_str(bool, "bool", 3365180733u, 0, 4, &be_const_str_log10); be_define_const_str(break, "break", 3378807160u, 58, 5, NULL); -be_define_const_str(bri, "bri", 2112284244u, 0, 3, &be_const_str_cos); -be_define_const_str(bus, "bus", 1607822841u, 0, 3, &be_const_str_get_vbus_voltage); -be_define_const_str(button_pressed, "button_pressed", 1694209616u, 0, 14, &be_const_str_insert); -be_define_const_str(byte, "byte", 1683620383u, 0, 4, NULL); -be_define_const_str(bytes, "bytes", 1706151940u, 0, 5, NULL); -be_define_const_str(c, "c", 3859557458u, 0, 1, &be_const_str_decrypt); -be_define_const_str(call, "call", 3018949801u, 0, 4, NULL); -be_define_const_str(call_native, "call_native", 1389147405u, 0, 11, &be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_manifest_X2Ejson); -be_define_const_str(calldepth, "calldepth", 3122364302u, 0, 9, &be_const_str_event_send); -be_define_const_str(can_show, "can_show", 960091187u, 0, 8, &be_const_str_ctypes_bytes_dyn); -be_define_const_str(cb_dispatch, "cb_dispatch", 1741510499u, 0, 11, &be_const_str_set_bri); -be_define_const_str(cb_do_nothing, "cb_do_nothing", 1488730702u, 0, 13, NULL); -be_define_const_str(cb_event_closure, "cb_event_closure", 3828267325u, 0, 16, NULL); -be_define_const_str(cb_obj, "cb_obj", 1195696482u, 0, 6, &be_const_str_rotate); -be_define_const_str(ceil, "ceil", 1659167240u, 0, 4, &be_const_str_set_width); -be_define_const_str(char, "char", 2823553821u, 0, 4, NULL); -be_define_const_str(chars_in_string, "chars_in_string", 3148785132u, 0, 15, &be_const_str_kv); -be_define_const_str(check_privileged_access, "check_privileged_access", 3692933968u, 0, 23, &be_const_str_group_def); +be_define_const_str(bri, "bri", 2112284244u, 0, 3, &be_const_str_set_style_pad_right); +be_define_const_str(bus, "bus", 1607822841u, 0, 3, &be_const_str_minute); +be_define_const_str(button_pressed, "button_pressed", 1694209616u, 0, 14, &be_const_str_editable); +be_define_const_str(byte, "byte", 1683620383u, 0, 4, &be_const_str_set_timeouts); +be_define_const_str(bytes, "bytes", 1706151940u, 0, 5, &be_const_str_read); +be_define_const_str(c, "c", 3859557458u, 0, 1, &be_const_str_state); +be_define_const_str(call, "call", 3018949801u, 0, 4, &be_const_str_get_coords); +be_define_const_str(call_native, "call_native", 1389147405u, 0, 11, &be_const_str_read8); +be_define_const_str(calldepth, "calldepth", 3122364302u, 0, 9, &be_const_str__X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D); +be_define_const_str(can_show, "can_show", 960091187u, 0, 8, &be_const_str_month); +be_define_const_str(cb, "cb", 1428787088u, 0, 2, &be_const_str_get_bat_voltage); +be_define_const_str(cb_do_nothing, "cb_do_nothing", 1488730702u, 0, 13, &be_const_str_contains); +be_define_const_str(cb_event_closure, "cb_event_closure", 3828267325u, 0, 16, &be_const_str_onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20change_X20the_X20current_X20configuration_X20and_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E); +be_define_const_str(cb_obj, "cb_obj", 1195696482u, 0, 6, NULL); +be_define_const_str(ceil, "ceil", 1659167240u, 0, 4, NULL); +be_define_const_str(char, "char", 2823553821u, 0, 4, &be_const_str_every_50ms); +be_define_const_str(chars_in_string, "chars_in_string", 3148785132u, 0, 15, &be_const_str_draw_line_dsc); +be_define_const_str(check_privileged_access, "check_privileged_access", 3692933968u, 0, 23, &be_const_str_solidified); be_define_const_str(class, "class", 2872970239u, 57, 5, NULL); -be_define_const_str(class_init_obj, "class_init_obj", 178410604u, 0, 14, &be_const_str_set_useragent); +be_define_const_str(class_init_obj, "class_init_obj", 178410604u, 0, 14, NULL); be_define_const_str(classname, "classname", 1998589948u, 0, 9, NULL); -be_define_const_str(classof, "classof", 1796577762u, 0, 7, NULL); +be_define_const_str(classof, "classof", 1796577762u, 0, 7, &be_const_str_gamma); be_define_const_str(clear, "clear", 1550717474u, 0, 5, NULL); -be_define_const_str(clear_first_time, "clear_first_time", 632769909u, 0, 16, &be_const_str_read); -be_define_const_str(clear_to, "clear_to", 3528002130u, 0, 8, &be_const_str_geti); -be_define_const_str(close, "close", 667630371u, 0, 5, &be_const_str_depower); -be_define_const_str(closure, "closure", 1548407746u, 0, 7, &be_const_str_param); -be_define_const_str(cmd, "cmd", 4136785899u, 0, 3, &be_const_str_input); +be_define_const_str(clear_first_time, "clear_first_time", 632769909u, 0, 16, &be_const_str_get_power); +be_define_const_str(clear_to, "clear_to", 3528002130u, 0, 8, &be_const_str_tanh); +be_define_const_str(close, "close", 667630371u, 0, 5, &be_const_str_write_bit); +be_define_const_str(closure, "closure", 1548407746u, 0, 7, &be_const_str_cmd); +be_define_const_str(cmd, "cmd", 4136785899u, 0, 3, &be_const_str_get_switch); be_define_const_str(cmd_res, "cmd_res", 921166762u, 0, 7, NULL); -be_define_const_str(code, "code", 4180765940u, 0, 4, &be_const_str_null_cb); -be_define_const_str(codedump, "codedump", 1786337906u, 0, 8, NULL); -be_define_const_str(collect, "collect", 2399039025u, 0, 7, &be_const_str_json_fdump_any); -be_define_const_str(color, "color", 1031692888u, 0, 5, &be_const_str_has_arg); -be_define_const_str(compile, "compile", 1000265118u, 0, 7, NULL); -be_define_const_str(compress, "compress", 2818084237u, 0, 8, NULL); -be_define_const_str(concat, "concat", 4124019837u, 0, 6, NULL); -be_define_const_str(connect, "connect", 2866859257u, 0, 7, NULL); -be_define_const_str(connected, "connected", 1424938192u, 0, 9, &be_const_str_debug); -be_define_const_str(connection_error, "connection_error", 1358926260u, 0, 16, &be_const_str_json_fdump); -be_define_const_str(constructor_cb, "constructor_cb", 2489105297u, 0, 14, &be_const_str_minute); +be_define_const_str(code, "code", 4180765940u, 0, 4, &be_const_str_group_def); +be_define_const_str(codedump, "codedump", 1786337906u, 0, 8, &be_const_str_members); +be_define_const_str(collect, "collect", 2399039025u, 0, 7, &be_const_str_file); +be_define_const_str(color, "color", 1031692888u, 0, 5, &be_const_str_get_width); +be_define_const_str(compile, "compile", 1000265118u, 0, 7, &be_const_str_ctypes_bytes); +be_define_const_str(compress, "compress", 2818084237u, 0, 8, &be_const_str_find_op); +be_define_const_str(concat, "concat", 4124019837u, 0, 6, &be_const_str_widget_dtor_impl); +be_define_const_str(connect, "connect", 2866859257u, 0, 7, &be_const_str_stop); +be_define_const_str(connected, "connected", 1424938192u, 0, 9, &be_const_str_obj_event_base); +be_define_const_str(connection_error, "connection_error", 1358926260u, 0, 16, &be_const_str_wifi); +be_define_const_str(constructor_cb, "constructor_cb", 2489105297u, 0, 14, &be_const_str_round_start); be_define_const_str(contains, "contains", 1825239352u, 0, 8, &be_const_str_deinit); -be_define_const_str(content_button, "content_button", 1956476087u, 0, 14, &be_const_str_pixels_buffer); -be_define_const_str(content_flush, "content_flush", 214922475u, 0, 13, &be_const_str_leds); -be_define_const_str(content_send, "content_send", 1673733649u, 0, 12, &be_const_str_load); -be_define_const_str(content_send_style, "content_send_style", 1087907647u, 0, 18, &be_const_str_read8); -be_define_const_str(content_start, "content_start", 2937509069u, 0, 13, &be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_X2F_X25s_X2Eautoconf); -be_define_const_str(content_stop, "content_stop", 658554751u, 0, 12, NULL); +be_define_const_str(content_button, "content_button", 1956476087u, 0, 14, &be_const_str_write); +be_define_const_str(content_flush, "content_flush", 214922475u, 0, 13, NULL); +be_define_const_str(content_send, "content_send", 1673733649u, 0, 12, NULL); +be_define_const_str(content_send_style, "content_send_style", 1087907647u, 0, 18, &be_const_str_is_dirty); +be_define_const_str(content_start, "content_start", 2937509069u, 0, 13, NULL); +be_define_const_str(content_stop, "content_stop", 658554751u, 0, 12, &be_const_str_line_dsc); be_define_const_str(continue, "continue", 2977070660u, 59, 8, NULL); -be_define_const_str(copy, "copy", 3848464964u, 0, 4, &be_const_str_json_append); -be_define_const_str(cos, "cos", 4220379804u, 0, 3, &be_const_str_count); -be_define_const_str(cosh, "cosh", 4099687964u, 0, 4, &be_const_str_set_percentage); +be_define_const_str(copy, "copy", 3848464964u, 0, 4, &be_const_str_rad); +be_define_const_str(cos, "cos", 4220379804u, 0, 3, &be_const_str_start); +be_define_const_str(cosh, "cosh", 4099687964u, 0, 4, &be_const_str_h); be_define_const_str(couldn_X27t_X20not_X20initialize_X20noepixelbus, "couldn't not initialize noepixelbus", 2536490812u, 0, 35, NULL); -be_define_const_str(count, "count", 967958004u, 0, 5, &be_const_str_every_100ms); -be_define_const_str(counters, "counters", 4095866864u, 0, 8, &be_const_str_on); -be_define_const_str(create_custom_widget, "create_custom_widget", 1140594778u, 0, 20, &be_const_str_instance); -be_define_const_str(create_matrix, "create_matrix", 3528185923u, 0, 13, &be_const_str_dirty); -be_define_const_str(create_segment, "create_segment", 3863522719u, 0, 14, &be_const_str_exec_cmd); -be_define_const_str(ctor, "ctor", 375399343u, 0, 4, &be_const_str_tcpclient); +be_define_const_str(count, "count", 967958004u, 0, 5, &be_const_str_web_add_console_button); +be_define_const_str(counters, "counters", 4095866864u, 0, 8, &be_const_str_save); +be_define_const_str(create_custom_widget, "create_custom_widget", 1140594778u, 0, 20, &be_const_str_quality); +be_define_const_str(create_matrix, "create_matrix", 3528185923u, 0, 13, &be_const_str_y1); +be_define_const_str(create_segment, "create_segment", 3863522719u, 0, 14, &be_const_str_open); +be_define_const_str(ctor, "ctor", 375399343u, 0, 4, &be_const_str_push); be_define_const_str(ctypes_bytes, "ctypes_bytes", 3879019703u, 0, 12, NULL); -be_define_const_str(ctypes_bytes_dyn, "ctypes_bytes_dyn", 915205307u, 0, 16, &be_const_str_time_dump); -be_define_const_str(dac_voltage, "dac_voltage", 1552257222u, 0, 11, &be_const_str_reverse_gamma10); -be_define_const_str(day, "day", 3830391293u, 0, 3, &be_const_str_duration); -be_define_const_str(debug, "debug", 1483009432u, 0, 5, &be_const_str_str); -be_define_const_str(decompress, "decompress", 2887031650u, 0, 10, &be_const_str_imax); -be_define_const_str(decrypt, "decrypt", 2886974618u, 0, 7, &be_const_str_onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E); +be_define_const_str(ctypes_bytes_dyn, "ctypes_bytes_dyn", 915205307u, 0, 16, &be_const_str_reapply); +be_define_const_str(dac_voltage, "dac_voltage", 1552257222u, 0, 11, &be_const_str_time_reached); +be_define_const_str(day, "day", 3830391293u, 0, 3, &be_const_str_every_100ms); +be_define_const_str(debug, "debug", 1483009432u, 0, 5, &be_const_str_exec_rules); +be_define_const_str(decompress, "decompress", 2887031650u, 0, 10, NULL); +be_define_const_str(decrypt, "decrypt", 2886974618u, 0, 7, NULL); be_define_const_str(def, "def", 3310976652u, 55, 3, NULL); -be_define_const_str(deg, "deg", 3327754271u, 0, 3, &be_const_str_set_y); -be_define_const_str(deinit, "deinit", 2345559592u, 0, 6, &be_const_str_tan); -be_define_const_str(del, "del", 3478752842u, 0, 3, &be_const_str_range); -be_define_const_str(delay, "delay", 1322381784u, 0, 5, &be_const_str_shared_key); -be_define_const_str(delete_all_configs, "delete_all_configs", 2382067578u, 0, 18, &be_const_str_get_bat_voltage); -be_define_const_str(depower, "depower", 3563819571u, 0, 7, &be_const_str_get_battery_chargin_status); -be_define_const_str(deregister_obj, "deregister_obj", 3909966993u, 0, 14, &be_const_str_strip); -be_define_const_str(destructor_cb, "destructor_cb", 1930283190u, 0, 13, &be_const_str_state); -be_define_const_str(detect, "detect", 8884370u, 0, 6, &be_const_str_hex); -be_define_const_str(detected_X20on_X20bus, "detected on bus", 1432002650u, 0, 15, &be_const_str_nan); +be_define_const_str(deg, "deg", 3327754271u, 0, 3, NULL); +be_define_const_str(deinit, "deinit", 2345559592u, 0, 6, NULL); +be_define_const_str(del, "del", 3478752842u, 0, 3, NULL); +be_define_const_str(delay, "delay", 1322381784u, 0, 5, &be_const_str_run_deferred); +be_define_const_str(delete_all_configs, "delete_all_configs", 2382067578u, 0, 18, &be_const_str_wire1); +be_define_const_str(depower, "depower", 3563819571u, 0, 7, &be_const_str_get_bat_charge_current); +be_define_const_str(deregister_obj, "deregister_obj", 3909966993u, 0, 14, &be_const_str_get_alternate); +be_define_const_str(destructor_cb, "destructor_cb", 1930283190u, 0, 13, &be_const_str_p2); +be_define_const_str(detect, "detect", 8884370u, 0, 6, NULL); +be_define_const_str(detected_X20on_X20bus, "detected on bus", 1432002650u, 0, 15, &be_const_str_run); be_define_const_str(digital_read, "digital_read", 3585496928u, 0, 12, NULL); -be_define_const_str(digital_write, "digital_write", 3435877979u, 0, 13, &be_const_str_set_style_text_font); -be_define_const_str(dirty, "dirty", 2667581083u, 0, 5, NULL); -be_define_const_str(display, "display", 1164572437u, 0, 7, NULL); -be_define_const_str(display_X2Eini, "display.ini", 2646174001u, 0, 11, &be_const_str_function); +be_define_const_str(digital_write, "digital_write", 3435877979u, 0, 13, &be_const_str_gamma8); +be_define_const_str(dirty, "dirty", 2667581083u, 0, 5, &be_const_str_pop_path); +be_define_const_str(display, "display", 1164572437u, 0, 7, &be_const_str_finish); +be_define_const_str(display_X2Eini, "display.ini", 2646174001u, 0, 11, NULL); be_define_const_str(do, "do", 1646057492u, 65, 2, NULL); -be_define_const_str(draw_arc, "draw_arc", 1828251676u, 0, 8, &be_const_str_io_error); -be_define_const_str(draw_line, "draw_line", 1634465686u, 0, 9, &be_const_str_item); -be_define_const_str(draw_line_dsc, "draw_line_dsc", 4220676203u, 0, 13, &be_const_str_energy_struct); +be_define_const_str(draw_arc, "draw_arc", 1828251676u, 0, 8, &be_const_str_hour); +be_define_const_str(draw_line, "draw_line", 1634465686u, 0, 9, NULL); +be_define_const_str(draw_line_dsc, "draw_line_dsc", 4220676203u, 0, 13, &be_const_str_widget_instance_size); be_define_const_str(draw_line_dsc_init, "draw_line_dsc_init", 3866693646u, 0, 18, NULL); -be_define_const_str(due, "due", 3895530293u, 0, 3, &be_const_str_pow); +be_define_const_str(due, "due", 3895530293u, 0, 3, NULL); be_define_const_str(dump, "dump", 3663001223u, 0, 4, NULL); -be_define_const_str(duration, "duration", 799079693u, 0, 8, &be_const_str_time_reached); -be_define_const_str(editable, "editable", 60532369u, 0, 8, &be_const_str_resize); +be_define_const_str(duration, "duration", 799079693u, 0, 8, &be_const_str_rotate); +be_define_const_str(editable, "editable", 60532369u, 0, 8, &be_const_str_kv); be_define_const_str(elif, "elif", 3232090307u, 51, 4, NULL); be_define_const_str(else, "else", 3183434736u, 52, 4, NULL); -be_define_const_str(enabled, "enabled", 49525662u, 0, 7, &be_const_str_widget_width_def); -be_define_const_str(encrypt, "encrypt", 2194327650u, 0, 7, &be_const_str_introspect); -be_define_const_str(end, "end", 1787721130u, 56, 3, NULL); +be_define_const_str(enabled, "enabled", 49525662u, 0, 7, &be_const_str_write_file); +be_define_const_str(encrypt, "encrypt", 2194327650u, 0, 7, &be_const_str_static); +be_define_const_str(end, "end", 1787721130u, 56, 3, &be_const_str_try); be_define_const_str(energy_struct, "energy_struct", 1655792843u, 0, 13, NULL); -be_define_const_str(engine, "engine", 3993360443u, 0, 6, &be_const_str_obj_event_base); -be_define_const_str(erase, "erase", 1010949589u, 0, 5, &be_const_str_lv_obj); -be_define_const_str(escape, "escape", 2652972038u, 0, 6, &be_const_str_path); -be_define_const_str(eth, "eth", 2191266556u, 0, 3, &be_const_str_set_pixel_color); -be_define_const_str(event, "event", 4264611999u, 0, 5, &be_const_str_issubclass); -be_define_const_str(event_cb, "event_cb", 3128698017u, 0, 8, &be_const_str_get_power); -be_define_const_str(event_send, "event_send", 598925582u, 0, 10, &be_const_str_lvgl_event_dispatch); -be_define_const_str(every_100ms, "every_100ms", 1546407804u, 0, 11, &be_const_str_web_send_decimal); -be_define_const_str(every_50ms, "every_50ms", 2383884008u, 0, 10, &be_const_str_length_X20in_X20bits_X20must_X20be_X20between_X200_X20and_X2032); -be_define_const_str(every_second, "every_second", 2075451465u, 0, 12, &be_const_str_serial); +be_define_const_str(engine, "engine", 3993360443u, 0, 6, &be_const_str_widget_destructor); +be_define_const_str(erase, "erase", 1010949589u, 0, 5, &be_const_str_tolower); +be_define_const_str(escape, "escape", 2652972038u, 0, 6, &be_const_str_hex); +be_define_const_str(eth, "eth", 2191266556u, 0, 3, NULL); +be_define_const_str(event, "event", 4264611999u, 0, 5, &be_const_str_set_width); +be_define_const_str(event_cb, "event_cb", 3128698017u, 0, 8, &be_const_str_height_def); +be_define_const_str(event_send, "event_send", 598925582u, 0, 10, &be_const_str_gamma10); +be_define_const_str(every_100ms, "every_100ms", 1546407804u, 0, 11, NULL); +be_define_const_str(every_50ms, "every_50ms", 2383884008u, 0, 10, &be_const_str_page_autoconf_mgr); +be_define_const_str(every_second, "every_second", 2075451465u, 0, 12, &be_const_str_list); be_define_const_str(except, "except", 950914032u, 69, 6, NULL); -be_define_const_str(exec_cmd, "exec_cmd", 493567399u, 0, 8, &be_const_str__X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D); -be_define_const_str(exec_rules, "exec_rules", 1445221092u, 0, 10, &be_const_str_write8); -be_define_const_str(exec_tele, "exec_tele", 1020751601u, 0, 9, NULL); -be_define_const_str(exists, "exists", 1002329533u, 0, 6, &be_const_str_get_bat_power); -be_define_const_str(exp, "exp", 1923516200u, 0, 3, &be_const_str_listdir); -be_define_const_str(f, "f", 3809224601u, 0, 1, NULL); +be_define_const_str(exec_cmd, "exec_cmd", 493567399u, 0, 8, &be_const_str_light); +be_define_const_str(exec_rules, "exec_rules", 1445221092u, 0, 10, &be_const_str_reverse); +be_define_const_str(exec_tele, "exec_tele", 1020751601u, 0, 9, &be_const_str_has); +be_define_const_str(exists, "exists", 1002329533u, 0, 6, &be_const_str_setbits); +be_define_const_str(exp, "exp", 1923516200u, 0, 3, &be_const_str_tasmota); +be_define_const_str(f, "f", 3809224601u, 0, 1, &be_const_str_input); be_define_const_str(false, "false", 184981848u, 62, 5, NULL); be_define_const_str(file, "file", 2867484483u, 0, 4, NULL); -be_define_const_str(file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27, "file extension is not '.be' or '.bec'", 3095719639u, 0, 37, &be_const_str_hour); -be_define_const_str(files, "files", 1055342736u, 0, 5, &be_const_str_page_autoconf_ctl); +be_define_const_str(file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27, "file extension is not '.be' or '.bec'", 3095719639u, 0, 37, NULL); +be_define_const_str(files, "files", 1055342736u, 0, 5, &be_const_str_param); be_define_const_str(find, "find", 3186656602u, 0, 4, NULL); -be_define_const_str(find_key_i, "find_key_i", 850136726u, 0, 10, &be_const_str_w); +be_define_const_str(find_key_i, "find_key_i", 850136726u, 0, 10, &be_const_str_pin); be_define_const_str(find_op, "find_op", 3766713376u, 0, 7, NULL); -be_define_const_str(finish, "finish", 1494643858u, 0, 6, &be_const_str_isinstance); -be_define_const_str(floor, "floor", 3102149661u, 0, 5, &be_const_str_get_style_bg_color); +be_define_const_str(finish, "finish", 1494643858u, 0, 6, NULL); +be_define_const_str(floor, "floor", 3102149661u, 0, 5, &be_const_str_local); be_define_const_str(flush, "flush", 3002334877u, 0, 5, NULL); be_define_const_str(for, "for", 2901640080u, 54, 3, NULL); -be_define_const_str(format, "format", 3114108242u, 0, 6, &be_const_str_pi); -be_define_const_str(from_to, "from_to", 21625507u, 0, 7, &be_const_str_static); +be_define_const_str(format, "format", 3114108242u, 0, 6, &be_const_str_memory); +be_define_const_str(from_to, "from_to", 21625507u, 0, 7, &be_const_str_load); be_define_const_str(fromb64, "fromb64", 2717019639u, 0, 7, NULL); -be_define_const_str(fromptr, "fromptr", 666189689u, 0, 7, &be_const_str_set_style_bg_color); -be_define_const_str(fromstring, "fromstring", 610302344u, 0, 10, &be_const_str_publish); -be_define_const_str(function, "function", 2664841801u, 0, 8, NULL); -be_define_const_str(gamma, "gamma", 3492353034u, 0, 5, &be_const_str_isnan); -be_define_const_str(gamma10, "gamma10", 3472052483u, 0, 7, NULL); -be_define_const_str(gamma8, "gamma8", 3802843830u, 0, 6, &be_const_str_memory); -be_define_const_str(gc, "gc", 1042313471u, 0, 2, &be_const_str_tasmota_X2Eset_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eset_X28_X29); +be_define_const_str(fromptr, "fromptr", 666189689u, 0, 7, NULL); +be_define_const_str(fromstring, "fromstring", 610302344u, 0, 10, &be_const_str_get_input_power_status); +be_define_const_str(function, "function", 2664841801u, 0, 8, &be_const_str_tostring); +be_define_const_str(gamma, "gamma", 3492353034u, 0, 5, &be_const_str_widget_struct_default); +be_define_const_str(gamma10, "gamma10", 3472052483u, 0, 7, &be_const_str_get_free_heap); +be_define_const_str(gamma8, "gamma8", 3802843830u, 0, 6, &be_const_str_resp_cmnd); +be_define_const_str(gc, "gc", 1042313471u, 0, 2, NULL); be_define_const_str(gen_cb, "gen_cb", 3245227551u, 0, 6, NULL); -be_define_const_str(get, "get", 1410115415u, 0, 3, NULL); -be_define_const_str(get_alternate, "get_alternate", 1450148894u, 0, 13, &be_const_str_scale_uint); +be_define_const_str(get, "get", 1410115415u, 0, 3, &be_const_str__X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_XB0C_X7Be_X7D); +be_define_const_str(get_alternate, "get_alternate", 1450148894u, 0, 13, NULL); be_define_const_str(get_aps_voltage, "get_aps_voltage", 2293036435u, 0, 15, NULL); -be_define_const_str(get_bat_charge_current, "get_bat_charge_current", 1385293050u, 0, 22, &be_const_str_read12); +be_define_const_str(get_bat_charge_current, "get_bat_charge_current", 1385293050u, 0, 22, &be_const_str_pi); be_define_const_str(get_bat_current, "get_bat_current", 1912106073u, 0, 15, NULL); -be_define_const_str(get_bat_power, "get_bat_power", 3067374853u, 0, 13, &be_const_str_json_fdump_list); -be_define_const_str(get_bat_voltage, "get_bat_voltage", 706676538u, 0, 15, &be_const_str_save_before_restart); -be_define_const_str(get_battery_chargin_status, "get_battery_chargin_status", 2233241571u, 0, 26, &be_const_str_split); -be_define_const_str(get_bri, "get_bri", 2041809895u, 0, 7, &be_const_str_math); -be_define_const_str(get_coords, "get_coords", 1044089006u, 0, 10, &be_const_str_get_temp); -be_define_const_str(get_current_module_name, "get_current_module_name", 2379270740u, 0, 23, &be_const_str_get_width); +be_define_const_str(get_bat_power, "get_bat_power", 3067374853u, 0, 13, &be_const_str_ins_time); +be_define_const_str(get_bat_voltage, "get_bat_voltage", 706676538u, 0, 15, NULL); +be_define_const_str(get_battery_chargin_status, "get_battery_chargin_status", 2233241571u, 0, 26, NULL); +be_define_const_str(get_bri, "get_bri", 2041809895u, 0, 7, &be_const_str_page_autoconf_ctl); +be_define_const_str(get_cb_list, "get_cb_list", 1605319182u, 0, 11, &be_const_str_offset); +be_define_const_str(get_coords, "get_coords", 1044089006u, 0, 10, &be_const_str_upper); +be_define_const_str(get_current_module_name, "get_current_module_name", 2379270740u, 0, 23, NULL); be_define_const_str(get_current_module_path, "get_current_module_path", 3206673408u, 0, 23, NULL); -be_define_const_str(get_free_heap, "get_free_heap", 625069757u, 0, 13, &be_const_str_push); -be_define_const_str(get_height, "get_height", 3571755523u, 0, 10, &be_const_str_ins_goto); -be_define_const_str(get_input_power_status, "get_input_power_status", 4102829177u, 0, 22, NULL); -be_define_const_str(get_light, "get_light", 381930476u, 0, 9, &be_const_str_setitem); -be_define_const_str(get_object_from_ptr, "get_object_from_ptr", 2345019201u, 0, 19, &be_const_str_log); +be_define_const_str(get_free_heap, "get_free_heap", 625069757u, 0, 13, &be_const_str_no_X20GPIO_X20specified_X20for_X20neopixelbus); +be_define_const_str(get_height, "get_height", 3571755523u, 0, 10, &be_const_str_obj_class_create_obj); +be_define_const_str(get_input_power_status, "get_input_power_status", 4102829177u, 0, 22, &be_const_str_get_style_bg_color); +be_define_const_str(get_light, "get_light", 381930476u, 0, 9, &be_const_str_unknown_X20instruction); +be_define_const_str(get_object_from_ptr, "get_object_from_ptr", 2345019201u, 0, 19, NULL); be_define_const_str(get_option, "get_option", 2123730033u, 0, 10, NULL); be_define_const_str(get_percentage, "get_percentage", 2880483992u, 0, 14, NULL); be_define_const_str(get_pixel_color, "get_pixel_color", 337490048u, 0, 15, NULL); -be_define_const_str(get_power, "get_power", 3009799377u, 0, 9, &be_const_str_open); -be_define_const_str(get_size, "get_size", 2803644713u, 0, 8, NULL); -be_define_const_str(get_string, "get_string", 4195847969u, 0, 10, NULL); -be_define_const_str(get_style_bg_color, "get_style_bg_color", 964794381u, 0, 18, &be_const_str_r); -be_define_const_str(get_style_line_color, "get_style_line_color", 805371932u, 0, 20, &be_const_str_time_str); +be_define_const_str(get_power, "get_power", 3009799377u, 0, 9, NULL); +be_define_const_str(get_size, "get_size", 2803644713u, 0, 8, &be_const_str_tomap); +be_define_const_str(get_string, "get_string", 4195847969u, 0, 10, &be_const_str_remove_driver); +be_define_const_str(get_style_bg_color, "get_style_bg_color", 964794381u, 0, 18, &be_const_str_number); +be_define_const_str(get_style_line_color, "get_style_line_color", 805371932u, 0, 20, &be_const_str_ins_ramp); be_define_const_str(get_style_pad_right, "get_style_pad_right", 3150287466u, 0, 19, NULL); -be_define_const_str(get_switch, "get_switch", 164821028u, 0, 10, &be_const_str_isrunning); -be_define_const_str(get_tasmota, "get_tasmota", 334356779u, 0, 11, &be_const_str_getbits); +be_define_const_str(get_switch, "get_switch", 164821028u, 0, 10, &be_const_str_set_y); +be_define_const_str(get_tasmota, "get_tasmota", 334356779u, 0, 11, &be_const_str_imax); be_define_const_str(get_temp, "get_temp", 3370919486u, 0, 8, NULL); -be_define_const_str(get_vbus_current, "get_vbus_current", 1205347942u, 0, 16, &be_const_str_while); -be_define_const_str(get_vbus_voltage, "get_vbus_voltage", 2398210401u, 0, 16, &be_const_str_return_X20code_X3D_X25i); -be_define_const_str(get_warning_level, "get_warning_level", 1737834441u, 0, 17, &be_const_str_map); -be_define_const_str(get_width, "get_width", 3293417300u, 0, 9, NULL); -be_define_const_str(getbits, "getbits", 3094168979u, 0, 7, &be_const_str_tag); -be_define_const_str(geti, "geti", 2381006490u, 0, 4, &be_const_str_k); -be_define_const_str(global, "global", 503252654u, 0, 6, &be_const_str_widget_constructor); -be_define_const_str(gpio, "gpio", 2638155258u, 0, 4, &be_const_str_line_dsc); -be_define_const_str(group_def, "group_def", 1524213328u, 0, 9, &be_const_str_web_send); -be_define_const_str(h, "h", 3977000791u, 0, 1, &be_const_str_value_error); -be_define_const_str(has, "has", 3988721635u, 0, 3, NULL); -be_define_const_str(has_arg, "has_arg", 424878688u, 0, 7, &be_const_str_rad); -be_define_const_str(height_def, "height_def", 2348238838u, 0, 10, &be_const_str_wire2); -be_define_const_str(hex, "hex", 4273249610u, 0, 3, &be_const_str_register_obj); -be_define_const_str(hour, "hour", 3053661199u, 0, 4, &be_const_str_widget_ctor_impl); -be_define_const_str(hs2rgb, "hs2rgb", 1040816349u, 0, 6, NULL); -be_define_const_str(https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_X2F_X25s_X2Eautoconf, "https://raw.githubusercontent.com/tasmota/autoconf/main/%s/%s.autoconf", 2743526309u, 0, 70, NULL); -be_define_const_str(https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_manifest_X2Ejson, "https://raw.githubusercontent.com/tasmota/autoconf/main/%s_manifest.json", 3657552045u, 0, 72, NULL); -be_define_const_str(i2c_enabled, "i2c_enabled", 218388101u, 0, 11, &be_const_str_keys); -be_define_const_str(id, "id", 926444256u, 0, 2, &be_const_str_print); +be_define_const_str(get_vbus_current, "get_vbus_current", 1205347942u, 0, 16, &be_const_str_tele); +be_define_const_str(get_vbus_voltage, "get_vbus_voltage", 2398210401u, 0, 16, &be_const_str_toupper); +be_define_const_str(get_warning_level, "get_warning_level", 1737834441u, 0, 17, NULL); +be_define_const_str(get_width, "get_width", 3293417300u, 0, 9, &be_const_str_readbytes); +be_define_const_str(getbits, "getbits", 3094168979u, 0, 7, &be_const_str_has_arg); +be_define_const_str(geti, "geti", 2381006490u, 0, 4, NULL); +be_define_const_str(global, "global", 503252654u, 0, 6, NULL); +be_define_const_str(gpio, "gpio", 2638155258u, 0, 4, &be_const_str_strptime); +be_define_const_str(group_def, "group_def", 1524213328u, 0, 9, NULL); +be_define_const_str(h, "h", 3977000791u, 0, 1, &be_const_str_init); +be_define_const_str(has, "has", 3988721635u, 0, 3, &be_const_str_pow); +be_define_const_str(has_arg, "has_arg", 424878688u, 0, 7, &be_const_str__X7D); +be_define_const_str(height_def, "height_def", 2348238838u, 0, 10, &be_const_str_set_height); +be_define_const_str(hex, "hex", 4273249610u, 0, 3, &be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_manifest_X2Ejson); +be_define_const_str(hour, "hour", 3053661199u, 0, 4, &be_const_str_pixel_count); +be_define_const_str(hs2rgb, "hs2rgb", 1040816349u, 0, 6, &be_const_str_path); +be_define_const_str(https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_X2F_X25s_X2Eautoconf, "https://raw.githubusercontent.com/tasmota/autoconf/main/%s/%s.autoconf", 2743526309u, 0, 70, &be_const_str_pc_abs); +be_define_const_str(https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_manifest_X2Ejson, "https://raw.githubusercontent.com/tasmota/autoconf/main/%s_manifest.json", 3657552045u, 0, 72, &be_const_str_int); +be_define_const_str(i2c_enabled, "i2c_enabled", 218388101u, 0, 11, NULL); +be_define_const_str(id, "id", 926444256u, 0, 2, &be_const_str_x); be_define_const_str(if, "if", 959999494u, 50, 2, NULL); -be_define_const_str(imax, "imax", 3084515410u, 0, 4, NULL); -be_define_const_str(imin, "imin", 2714127864u, 0, 4, &be_const_str_members); +be_define_const_str(imax, "imax", 3084515410u, 0, 4, &be_const_str_resize); +be_define_const_str(imin, "imin", 2714127864u, 0, 4, NULL); be_define_const_str(import, "import", 288002260u, 66, 6, NULL); -be_define_const_str(init, "init", 380752755u, 0, 4, NULL); -be_define_const_str(init_draw_line_dsc, "init_draw_line_dsc", 2507936040u, 0, 18, &be_const_str_pop); -be_define_const_str(input, "input", 4191711099u, 0, 5, &be_const_str_json); +be_define_const_str(init, "init", 380752755u, 0, 4, &be_const_str_pc_rel); +be_define_const_str(init_draw_line_dsc, "init_draw_line_dsc", 2507936040u, 0, 18, NULL); +be_define_const_str(input, "input", 4191711099u, 0, 5, &be_const_str_reset); be_define_const_str(ins_goto, "ins_goto", 1342843963u, 0, 8, NULL); -be_define_const_str(ins_ramp, "ins_ramp", 1068049360u, 0, 8, &be_const_str_wire_scan); -be_define_const_str(ins_time, "ins_time", 2980245553u, 0, 8, &be_const_str_target_search); -be_define_const_str(insert, "insert", 3332609576u, 0, 6, NULL); -be_define_const_str(instance, "instance", 193386898u, 0, 8, NULL); +be_define_const_str(ins_ramp, "ins_ramp", 1068049360u, 0, 8, &be_const_str_stop_iteration); +be_define_const_str(ins_time, "ins_time", 2980245553u, 0, 8, NULL); +be_define_const_str(insert, "insert", 3332609576u, 0, 6, &be_const_str_lvgl_event_dispatch); +be_define_const_str(instance, "instance", 193386898u, 0, 8, &be_const_str_set_matrix_pixel_color); be_define_const_str(instance_size, "instance_size", 4280269518u, 0, 13, NULL); -be_define_const_str(int, "int", 2515107422u, 0, 3, NULL); -be_define_const_str(internal_error, "internal_error", 2519158169u, 0, 14, &be_const_str_offseta); -be_define_const_str(introspect, "introspect", 164638290u, 0, 10, &be_const_str_widget_dtor_impl); -be_define_const_str(invalidate, "invalidate", 2649734928u, 0, 10, &be_const_str_no_X20GPIO_X20specified_X20for_X20neopixelbus); -be_define_const_str(io_error, "io_error", 1970281036u, 0, 8, &be_const_str_readbytes); -be_define_const_str(ip, "ip", 1261996636u, 0, 2, &be_const_str_super); -be_define_const_str(is_dirty, "is_dirty", 418034110u, 0, 8, &be_const_str_rand); -be_define_const_str(is_first_time, "is_first_time", 275242384u, 0, 13, &be_const_str_local); -be_define_const_str(is_running, "is_running", 2226847261u, 0, 10, &be_const_str_reverse); -be_define_const_str(isinstance, "isinstance", 3669352738u, 0, 10, NULL); -be_define_const_str(isnan, "isnan", 2981347434u, 0, 5, NULL); -be_define_const_str(isrunning, "isrunning", 1688182268u, 0, 9, &be_const_str_refr_size); -be_define_const_str(issubclass, "issubclass", 4078395519u, 0, 10, NULL); -be_define_const_str(item, "item", 2671260646u, 0, 4, &be_const_str_widget_editable); -be_define_const_str(iter, "iter", 3124256359u, 0, 4, &be_const_str_class); +be_define_const_str(int, "int", 2515107422u, 0, 3, &be_const_str_set_style_text_font); +be_define_const_str(internal_error, "internal_error", 2519158169u, 0, 14, &be_const_str_width_def); +be_define_const_str(introspect, "introspect", 164638290u, 0, 10, &be_const_str_preinit); +be_define_const_str(invalidate, "invalidate", 2649734928u, 0, 10, NULL); +be_define_const_str(io_error, "io_error", 1970281036u, 0, 8, NULL); +be_define_const_str(ip, "ip", 1261996636u, 0, 2, NULL); +be_define_const_str(is_dirty, "is_dirty", 418034110u, 0, 8, &be_const_str_on); +be_define_const_str(is_first_time, "is_first_time", 275242384u, 0, 13, &be_const_str_persist); +be_define_const_str(is_running, "is_running", 2226847261u, 0, 10, &be_const_str__X7B_X7D); +be_define_const_str(isinstance, "isinstance", 3669352738u, 0, 10, &be_const_str_last_modified); +be_define_const_str(isnan, "isnan", 2981347434u, 0, 5, &be_const_str_iter); +be_define_const_str(isrunning, "isrunning", 1688182268u, 0, 9, NULL); +be_define_const_str(issubclass, "issubclass", 4078395519u, 0, 10, &be_const_str_setmember); +be_define_const_str(item, "item", 2671260646u, 0, 4, &be_const_str_json_fdump_any); +be_define_const_str(iter, "iter", 3124256359u, 0, 4, &be_const_str_name); be_define_const_str(json, "json", 916562499u, 0, 4, NULL); -be_define_const_str(json_append, "json_append", 3002019284u, 0, 11, NULL); -be_define_const_str(json_fdump, "json_fdump", 1694216580u, 0, 10, &be_const_str_nil); -be_define_const_str(json_fdump_any, "json_fdump_any", 3348629385u, 0, 14, &be_const_str_pixel_size); -be_define_const_str(json_fdump_list, "json_fdump_list", 3903879853u, 0, 15, &be_const_str_json_fdump_map); -be_define_const_str(json_fdump_map, "json_fdump_map", 4091954653u, 0, 14, &be_const_str_select); -be_define_const_str(k, "k", 3993778410u, 0, 1, &be_const_str_set_auth); -be_define_const_str(keys, "keys", 4182378701u, 0, 4, NULL); -be_define_const_str(kv, "kv", 1497177492u, 0, 2, &be_const_str_persist_X2E_p_X20is_X20not_X20a_X20map); +be_define_const_str(json_append, "json_append", 3002019284u, 0, 11, &be_const_str_import); +be_define_const_str(json_fdump, "json_fdump", 1694216580u, 0, 10, NULL); +be_define_const_str(json_fdump_any, "json_fdump_any", 3348629385u, 0, 14, NULL); +be_define_const_str(json_fdump_list, "json_fdump_list", 3903879853u, 0, 15, &be_const_str_millis); +be_define_const_str(json_fdump_map, "json_fdump_map", 4091954653u, 0, 14, &be_const_str_save_before_restart); +be_define_const_str(k, "k", 3993778410u, 0, 1, &be_const_str_keys); +be_define_const_str(keys, "keys", 4182378701u, 0, 4, &be_const_str_min); +be_define_const_str(kv, "kv", 1497177492u, 0, 2, NULL); be_define_const_str(last_modified, "last_modified", 772177145u, 0, 13, NULL); -be_define_const_str(leds, "leds", 558858555u, 0, 4, &be_const_str__X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D); -be_define_const_str(length_X20in_X20bits_X20must_X20be_X20between_X200_X20and_X2032, "length in bits must be between 0 and 32", 2584509128u, 0, 39, &be_const_str_lv_event); +be_define_const_str(leds, "leds", 558858555u, 0, 4, &be_const_str_elif); +be_define_const_str(length_X20in_X20bits_X20must_X20be_X20between_X200_X20and_X2032, "length in bits must be between 0 and 32", 2584509128u, 0, 39, &be_const_str_false); be_define_const_str(light, "light", 3801947695u, 0, 5, NULL); -be_define_const_str(line_dsc, "line_dsc", 4094490978u, 0, 8, &be_const_str_offset); +be_define_const_str(line_dsc, "line_dsc", 4094490978u, 0, 8, &be_const_str_print); be_define_const_str(list, "list", 217798785u, 0, 4, NULL); be_define_const_str(listdir, "listdir", 2005220720u, 0, 7, NULL); be_define_const_str(load, "load", 3859241449u, 0, 4, NULL); -be_define_const_str(load_templates, "load_templates", 3513870133u, 0, 14, NULL); -be_define_const_str(local, "local", 2621662984u, 0, 5, &be_const_str_round_start); -be_define_const_str(log, "log", 1062293841u, 0, 3, &be_const_str_read_sensors); -be_define_const_str(log10, "log10", 2346846000u, 0, 5, NULL); -be_define_const_str(loop, "loop", 3723446379u, 0, 4, NULL); -be_define_const_str(lower, "lower", 3038577850u, 0, 5, &be_const_str_end); -be_define_const_str(lv, "lv", 1529997255u, 0, 2, &be_const_str_x); -be_define_const_str(lv_event, "lv_event", 2434089968u, 0, 8, &be_const_str_remove_rule); -be_define_const_str(lv_event_cb, "lv_event_cb", 2480731016u, 0, 11, &be_const_str_run_deferred); -be_define_const_str(lv_obj, "lv_obj", 4257833149u, 0, 6, &be_const_str_traceback); +be_define_const_str(load_templates, "load_templates", 3513870133u, 0, 14, &be_const_str_set_bri); +be_define_const_str(local, "local", 2621662984u, 0, 5, NULL); +be_define_const_str(log, "log", 1062293841u, 0, 3, &be_const_str_the_X20second_X20argument_X20is_X20not_X20a_X20function); +be_define_const_str(log10, "log10", 2346846000u, 0, 5, &be_const_str_web_add_handler); +be_define_const_str(loop, "loop", 3723446379u, 0, 4, &be_const_str_continue); +be_define_const_str(lower, "lower", 3038577850u, 0, 5, &be_const_str_push_path); +be_define_const_str(lv, "lv", 1529997255u, 0, 2, NULL); +be_define_const_str(lv_event, "lv_event", 2434089968u, 0, 8, &be_const_str_set_timer); +be_define_const_str(lv_event_cb, "lv_event_cb", 2480731016u, 0, 11, &be_const_str_try_rule); +be_define_const_str(lv_obj, "lv_obj", 4257833149u, 0, 6, NULL); be_define_const_str(lv_obj_class, "lv_obj_class", 4039656294u, 0, 12, NULL); -be_define_const_str(lvgl_event_dispatch, "lvgl_event_dispatch", 2104396622u, 0, 19, &be_const_str_set_matrix_pixel_color); -be_define_const_str(map, "map", 3751997361u, 0, 3, &be_const_str_redirect); -be_define_const_str(math, "math", 4001929615u, 0, 4, NULL); -be_define_const_str(matrix, "matrix", 365099244u, 0, 6, NULL); -be_define_const_str(member, "member", 719708611u, 0, 6, NULL); -be_define_const_str(members, "members", 937576464u, 0, 7, &be_const_str_target); -be_define_const_str(memory, "memory", 2229924270u, 0, 6, &be_const_str_resp_cmnd_str); -be_define_const_str(millis, "millis", 1214679063u, 0, 6, NULL); -be_define_const_str(min, "min", 3381609815u, 0, 3, &be_const_str_widget_cb); +be_define_const_str(lvgl_event_dispatch, "lvgl_event_dispatch", 2104396622u, 0, 19, &be_const_str_rule); +be_define_const_str(map, "map", 3751997361u, 0, 3, NULL); +be_define_const_str(math, "math", 4001929615u, 0, 4, &be_const_str_widget_event_cb); +be_define_const_str(matrix, "matrix", 365099244u, 0, 6, &be_const_str_pixels_buffer); +be_define_const_str(member, "member", 719708611u, 0, 6, &be_const_str_web_add_management_button); +be_define_const_str(members, "members", 937576464u, 0, 7, &be_const_str_remove_rule); +be_define_const_str(memory, "memory", 2229924270u, 0, 6, NULL); +be_define_const_str(millis, "millis", 1214679063u, 0, 6, &be_const_str_module); +be_define_const_str(min, "min", 3381609815u, 0, 3, NULL); be_define_const_str(minute, "minute", 954666857u, 0, 6, NULL); -be_define_const_str(module, "module", 3617558685u, 0, 6, &be_const_str_percentage); -be_define_const_str(month, "month", 3598321157u, 0, 5, NULL); +be_define_const_str(module, "module", 3617558685u, 0, 6, &be_const_str_setrange); +be_define_const_str(month, "month", 3598321157u, 0, 5, &be_const_str_web_send); be_define_const_str(name, "name", 2369371622u, 0, 4, NULL); -be_define_const_str(nan, "nan", 797905850u, 0, 3, NULL); +be_define_const_str(nan, "nan", 797905850u, 0, 3, &be_const_str_size); be_define_const_str(nil, "nil", 228849900u, 63, 3, NULL); -be_define_const_str(no_X20GPIO_X20specified_X20for_X20neopixelbus, "no GPIO specified for neopixelbus", 42078528u, 0, 33, &be_const_str_number); -be_define_const_str(null_cb, "null_cb", 2333536460u, 0, 7, &be_const_str_public_key); -be_define_const_str(number, "number", 467038368u, 0, 6, NULL); -be_define_const_str(obj_class_create_obj, "obj_class_create_obj", 3304390632u, 0, 20, &be_const_str_write_bytes); +be_define_const_str(no_X20GPIO_X20specified_X20for_X20neopixelbus, "no GPIO specified for neopixelbus", 42078528u, 0, 33, NULL); +be_define_const_str(null_cb, "null_cb", 2333536460u, 0, 7, NULL); +be_define_const_str(number, "number", 467038368u, 0, 6, &be_const_str_range); +be_define_const_str(obj_class_create_obj, "obj_class_create_obj", 3304390632u, 0, 20, NULL); be_define_const_str(obj_event_base, "obj_event_base", 1624064363u, 0, 14, NULL); -be_define_const_str(offset, "offset", 348705738u, 0, 6, &be_const_str_sec); +be_define_const_str(offset, "offset", 348705738u, 0, 6, &be_const_str_web_add_button); be_define_const_str(offseta, "offseta", 1663383089u, 0, 7, NULL); -be_define_const_str(on, "on", 1630810064u, 0, 2, NULL); -be_define_const_str(onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E, "onsubmit='return confirm(\"This will cause a restart.\");'>", 232646018u, 0, 57, NULL); -be_define_const_str(onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20change_X20the_X20current_X20configuration_X20and_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E, "onsubmit='return confirm(\"This will change the current configuration and cause a restart.\");'>", 3792412559u, 0, 94, &be_const_str_sqrt); -be_define_const_str(open, "open", 3546203337u, 0, 4, NULL); +be_define_const_str(on, "on", 1630810064u, 0, 2, &be_const_str_webclient); +be_define_const_str(onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E, "onsubmit='return confirm(\"This will cause a restart.\");'>", 232646018u, 0, 57, &be_const_str_wire2); +be_define_const_str(onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20change_X20the_X20current_X20configuration_X20and_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E, "onsubmit='return confirm(\"This will change the current configuration and cause a restart.\");'>", 3792412559u, 0, 94, &be_const_str_srand); +be_define_const_str(open, "open", 3546203337u, 0, 4, &be_const_str_search); be_define_const_str(out_X20of_X20range, "out of range", 2236631477u, 0, 12, NULL); -be_define_const_str(p1, "p1", 2689521274u, 0, 2, &be_const_str_widget_event_cb); -be_define_const_str(p2, "p2", 2672743655u, 0, 2, NULL); -be_define_const_str(page_autoconf_ctl, "page_autoconf_ctl", 2453381496u, 0, 17, &be_const_str_pc_rel); -be_define_const_str(page_autoconf_mgr, "page_autoconf_mgr", 3643937031u, 0, 17, &be_const_str_reduce); -be_define_const_str(param, "param", 1309554226u, 0, 5, &be_const_str_set_dcdc_enable); -be_define_const_str(path, "path", 2223459638u, 0, 4, &be_const_str_pop_path); -be_define_const_str(pc, "pc", 1313756516u, 0, 2, &be_const_str_zip); -be_define_const_str(pc_abs, "pc_abs", 920256495u, 0, 6, NULL); -be_define_const_str(pc_rel, "pc_rel", 991921176u, 0, 6, NULL); -be_define_const_str(percentage, "percentage", 2538831285u, 0, 10, &be_const_str_web_add_config_button); +be_define_const_str(p1, "p1", 2689521274u, 0, 2, NULL); +be_define_const_str(p2, "p2", 2672743655u, 0, 2, &be_const_str_set_alternate); +be_define_const_str(page_autoconf_ctl, "page_autoconf_ctl", 2453381496u, 0, 17, NULL); +be_define_const_str(page_autoconf_mgr, "page_autoconf_mgr", 3643937031u, 0, 17, &be_const_str_write8); +be_define_const_str(param, "param", 1309554226u, 0, 5, &be_const_str_resp_cmnd_error); +be_define_const_str(path, "path", 2223459638u, 0, 4, &be_const_str_real); +be_define_const_str(pc, "pc", 1313756516u, 0, 2, &be_const_str_nil); +be_define_const_str(pc_abs, "pc_abs", 920256495u, 0, 6, &be_const_str_set); +be_define_const_str(pc_rel, "pc_rel", 991921176u, 0, 6, &be_const_str_web_add_config_button); +be_define_const_str(percentage, "percentage", 2538831285u, 0, 10, &be_const_str_tcpclient); be_define_const_str(persist, "persist", 3917083779u, 0, 7, NULL); -be_define_const_str(persist_X2E_p_X20is_X20not_X20a_X20map, "persist._p is not a map", 1176528732u, 0, 23, &be_const_str_publish_result); -be_define_const_str(pi, "pi", 1213090802u, 0, 2, &be_const_str_set_alternate); -be_define_const_str(pin, "pin", 1866532500u, 0, 3, &be_const_str_running); -be_define_const_str(pin_mode, "pin_mode", 3258314030u, 0, 8, &be_const_str_set_first_time); -be_define_const_str(pin_used, "pin_used", 4033854612u, 0, 8, &be_const_str_reapply); +be_define_const_str(persist_X2E_p_X20is_X20not_X20a_X20map, "persist._p is not a map", 1176528732u, 0, 23, NULL); +be_define_const_str(pi, "pi", 1213090802u, 0, 2, NULL); +be_define_const_str(pin, "pin", 1866532500u, 0, 3, NULL); +be_define_const_str(pin_mode, "pin_mode", 3258314030u, 0, 8, &be_const_str_set_ldo_voltage); +be_define_const_str(pin_used, "pin_used", 4033854612u, 0, 8, &be_const_str_set_auth); be_define_const_str(pixel_count, "pixel_count", 2439130743u, 0, 11, NULL); be_define_const_str(pixel_size, "pixel_size", 2209135785u, 0, 10, NULL); be_define_const_str(pixels_buffer, "pixels_buffer", 1229555807u, 0, 13, NULL); -be_define_const_str(point, "point", 414084241u, 0, 5, &be_const_str_setmember); -be_define_const_str(pop, "pop", 1362321360u, 0, 3, NULL); +be_define_const_str(point, "point", 414084241u, 0, 5, NULL); +be_define_const_str(pop, "pop", 1362321360u, 0, 3, &be_const_str_resp_cmnd_failed); be_define_const_str(pop_path, "pop_path", 2403243998u, 0, 8, NULL); -be_define_const_str(pow, "pow", 1479764693u, 0, 3, NULL); -be_define_const_str(preinit, "preinit", 2722007100u, 0, 7, NULL); -be_define_const_str(print, "print", 372738696u, 0, 5, &be_const_str_else); -be_define_const_str(public_key, "public_key", 4169142980u, 0, 10, &be_const_str_continue); -be_define_const_str(publish, "publish", 264247304u, 0, 7, &be_const_str_web_add_main_button); -be_define_const_str(publish_result, "publish_result", 2013351252u, 0, 14, &be_const_str_set_x); -be_define_const_str(push, "push", 2272264157u, 0, 4, &be_const_str_stop); +be_define_const_str(pow, "pow", 1479764693u, 0, 3, &be_const_str_seg7_font); +be_define_const_str(preinit, "preinit", 2722007100u, 0, 7, &be_const_str_widget_ctor_cb); +be_define_const_str(print, "print", 372738696u, 0, 5, NULL); +be_define_const_str(public_key, "public_key", 4169142980u, 0, 10, &be_const_str_read32); +be_define_const_str(publish, "publish", 264247304u, 0, 7, NULL); +be_define_const_str(publish_result, "publish_result", 2013351252u, 0, 14, &be_const_str_skip); +be_define_const_str(push, "push", 2272264157u, 0, 4, &be_const_str_width); be_define_const_str(push_path, "push_path", 1155254157u, 0, 9, NULL); -be_define_const_str(quality, "quality", 2597670950u, 0, 7, NULL); -be_define_const_str(r, "r", 4144776981u, 0, 1, &be_const_str_tele); -be_define_const_str(rad, "rad", 1358899048u, 0, 3, NULL); +be_define_const_str(quality, "quality", 2597670950u, 0, 7, &be_const_str_else); +be_define_const_str(r, "r", 4144776981u, 0, 1, &be_const_str_set_light); +be_define_const_str(rad, "rad", 1358899048u, 0, 3, &be_const_str_set_ldo_enable); be_define_const_str(raise, "raise", 1593437475u, 70, 5, NULL); be_define_const_str(rand, "rand", 2711325910u, 0, 4, NULL); -be_define_const_str(range, "range", 4208725202u, 0, 5, &be_const_str_web_add_handler); +be_define_const_str(range, "range", 4208725202u, 0, 5, &be_const_str_reverse_gamma10); be_define_const_str(read, "read", 3470762949u, 0, 4, NULL); be_define_const_str(read12, "read12", 4291076970u, 0, 6, NULL); -be_define_const_str(read13, "read13", 12887293u, 0, 6, &be_const_str_set_timer); +be_define_const_str(read13, "read13", 12887293u, 0, 6, NULL); be_define_const_str(read24, "read24", 1808533811u, 0, 6, NULL); -be_define_const_str(read32, "read32", 1741276240u, 0, 6, &be_const_str_break); -be_define_const_str(read8, "read8", 2802788167u, 0, 5, &be_const_str_readline); -be_define_const_str(read_bytes, "read_bytes", 3576733173u, 0, 10, &be_const_str_type); -be_define_const_str(read_sensors, "read_sensors", 892689201u, 0, 12, NULL); -be_define_const_str(readbytes, "readbytes", 2716426756u, 0, 9, &be_const_str_show); -be_define_const_str(readline, "readline", 1212709927u, 0, 8, &be_const_str_solidified); -be_define_const_str(real, "real", 3604983901u, 0, 4, &be_const_str__X7B_X7D); +be_define_const_str(read32, "read32", 1741276240u, 0, 6, NULL); +be_define_const_str(read8, "read8", 2802788167u, 0, 5, NULL); +be_define_const_str(read_bytes, "read_bytes", 3576733173u, 0, 10, NULL); +be_define_const_str(read_sensors, "read_sensors", 892689201u, 0, 12, &be_const_str_round_end); +be_define_const_str(readbytes, "readbytes", 2716426756u, 0, 9, NULL); +be_define_const_str(readline, "readline", 1212709927u, 0, 8, NULL); +be_define_const_str(real, "real", 3604983901u, 0, 4, NULL); be_define_const_str(reapply, "reapply", 3778939332u, 0, 7, NULL); -be_define_const_str(redirect, "redirect", 389758641u, 0, 8, NULL); -be_define_const_str(reduce, "reduce", 2002030311u, 0, 6, NULL); -be_define_const_str(refr_size, "refr_size", 1958144468u, 0, 9, NULL); -be_define_const_str(register_obj, "register_obj", 3982614770u, 0, 12, NULL); +be_define_const_str(redirect, "redirect", 389758641u, 0, 8, &be_const_str_rtc); +be_define_const_str(reduce, "reduce", 2002030311u, 0, 6, &be_const_str_sec); +be_define_const_str(refr_size, "refr_size", 1958144468u, 0, 9, &be_const_str_target_search); +be_define_const_str(register_obj, "register_obj", 3982614770u, 0, 12, &be_const_str_sys); be_define_const_str(remove, "remove", 3683784189u, 0, 6, NULL); be_define_const_str(remove_cmd, "remove_cmd", 3832315702u, 0, 10, NULL); -be_define_const_str(remove_driver, "remove_driver", 1030243768u, 0, 13, &be_const_str_string); -be_define_const_str(remove_rule, "remove_rule", 3456211328u, 0, 11, NULL); +be_define_const_str(remove_driver, "remove_driver", 1030243768u, 0, 13, &be_const_str_tasmota_X2Eget_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eget_X28_X29); +be_define_const_str(remove_rule, "remove_rule", 3456211328u, 0, 11, &be_const_str_except); be_define_const_str(remove_timer, "remove_timer", 4141472215u, 0, 12, NULL); be_define_const_str(reset, "reset", 1695364032u, 0, 5, NULL); -be_define_const_str(reset_search, "reset_search", 1350414305u, 0, 12, &be_const_str_widget_destructor); +be_define_const_str(reset_search, "reset_search", 1350414305u, 0, 12, NULL); be_define_const_str(resize, "resize", 3514612129u, 0, 6, NULL); be_define_const_str(resolvecmnd, "resolvecmnd", 993361485u, 0, 11, NULL); -be_define_const_str(resp_cmnd, "resp_cmnd", 2869459626u, 0, 9, &be_const_str_web_add_management_button); -be_define_const_str(resp_cmnd_done, "resp_cmnd_done", 2601874875u, 0, 14, &be_const_str_raise); +be_define_const_str(resp_cmnd, "resp_cmnd", 2869459626u, 0, 9, &be_const_str_widget_editable); +be_define_const_str(resp_cmnd_done, "resp_cmnd_done", 2601874875u, 0, 14, NULL); be_define_const_str(resp_cmnd_error, "resp_cmnd_error", 2404088863u, 0, 15, NULL); -be_define_const_str(resp_cmnd_failed, "resp_cmnd_failed", 2136281562u, 0, 16, NULL); +be_define_const_str(resp_cmnd_failed, "resp_cmnd_failed", 2136281562u, 0, 16, &be_const_str_set_chg_current); be_define_const_str(resp_cmnd_str, "resp_cmnd_str", 737845590u, 0, 13, NULL); -be_define_const_str(response_append, "response_append", 450346371u, 0, 15, NULL); +be_define_const_str(response_append, "response_append", 450346371u, 0, 15, &be_const_str_set_first_time); be_define_const_str(return, "return", 2246981567u, 60, 6, NULL); -be_define_const_str(return_X20code_X3D_X25i, "return code=%i", 2127454401u, 0, 14, &be_const_str_set_ldo_enable); -be_define_const_str(reverse, "reverse", 558918661u, 0, 7, &be_const_str_sin); -be_define_const_str(reverse_gamma10, "reverse_gamma10", 739112262u, 0, 15, &be_const_str_to_gamma); +be_define_const_str(return_X20code_X3D_X25i, "return code=%i", 2127454401u, 0, 14, NULL); +be_define_const_str(reverse, "reverse", 558918661u, 0, 7, NULL); +be_define_const_str(reverse_gamma10, "reverse_gamma10", 739112262u, 0, 15, NULL); be_define_const_str(rotate, "rotate", 2784296202u, 0, 6, NULL); -be_define_const_str(round_end, "round_end", 985288225u, 0, 9, NULL); -be_define_const_str(round_start, "round_start", 2949484384u, 0, 11, &be_const_str_wire); -be_define_const_str(rtc, "rtc", 1070575216u, 0, 3, &be_const_str_settings); -be_define_const_str(rule, "rule", 4230889683u, 0, 4, NULL); -be_define_const_str(run, "run", 718098122u, 0, 3, NULL); -be_define_const_str(run_bat, "run_bat", 2536903298u, 0, 7, NULL); +be_define_const_str(round_end, "round_end", 985288225u, 0, 9, &be_const_str_strftime); +be_define_const_str(round_start, "round_start", 2949484384u, 0, 11, &be_const_str_sqrt); +be_define_const_str(rtc, "rtc", 1070575216u, 0, 3, NULL); +be_define_const_str(rule, "rule", 4230889683u, 0, 4, &be_const_str_settings); +be_define_const_str(run, "run", 718098122u, 0, 3, &be_const_str_set_style_line_color); +be_define_const_str(run_bat, "run_bat", 2536903298u, 0, 7, &be_const_str_valuer_error); be_define_const_str(run_deferred, "run_deferred", 371594696u, 0, 12, NULL); -be_define_const_str(running, "running", 343848780u, 0, 7, NULL); -be_define_const_str(save, "save", 3439296072u, 0, 4, &be_const_str_tanh); +be_define_const_str(running, "running", 343848780u, 0, 7, &be_const_str_string); +be_define_const_str(save, "save", 3439296072u, 0, 4, NULL); be_define_const_str(save_before_restart, "save_before_restart", 1253239338u, 0, 19, NULL); -be_define_const_str(scale_uint, "scale_uint", 3090811094u, 0, 10, &be_const_str_set_style_pad_right); -be_define_const_str(scan, "scan", 3974641896u, 0, 4, &be_const_str_set_dc_voltage); +be_define_const_str(scale_uint, "scale_uint", 3090811094u, 0, 10, &be_const_str_widget_group_def); +be_define_const_str(scan, "scan", 3974641896u, 0, 4, NULL); be_define_const_str(search, "search", 2150836393u, 0, 6, NULL); be_define_const_str(sec, "sec", 3139892658u, 0, 3, NULL); -be_define_const_str(seg7_font, "seg7_font", 4099690689u, 0, 9, NULL); +be_define_const_str(seg7_font, "seg7_font", 4099690689u, 0, 9, &be_const_str_set_useragent); be_define_const_str(select, "select", 297952813u, 0, 6, NULL); -be_define_const_str(serial, "serial", 3687697785u, 0, 6, &be_const_str_url_encode); +be_define_const_str(serial, "serial", 3687697785u, 0, 6, NULL); be_define_const_str(set, "set", 3324446467u, 0, 3, NULL); -be_define_const_str(set_alternate, "set_alternate", 1709680562u, 0, 13, &be_const_str_widget_struct_by_class); -be_define_const_str(set_auth, "set_auth", 1057170930u, 0, 8, NULL); -be_define_const_str(set_bri, "set_bri", 2789118779u, 0, 7, &be_const_str_wire1); +be_define_const_str(set_alternate, "set_alternate", 1709680562u, 0, 13, &be_const_str_widget_event); +be_define_const_str(set_auth, "set_auth", 1057170930u, 0, 8, &be_const_str_update); +be_define_const_str(set_bri, "set_bri", 2789118779u, 0, 7, &be_const_str_str); be_define_const_str(set_chg_current, "set_chg_current", 336304386u, 0, 15, NULL); -be_define_const_str(set_dc_voltage, "set_dc_voltage", 2181981936u, 0, 14, &be_const_str_toupper); -be_define_const_str(set_dcdc_enable, "set_dcdc_enable", 1594690786u, 0, 15, &be_const_str_tomap); -be_define_const_str(set_first_time, "set_first_time", 3111247550u, 0, 14, NULL); -be_define_const_str(set_height, "set_height", 1080207399u, 0, 10, &be_const_str_width_def); +be_define_const_str(set_dc_voltage, "set_dc_voltage", 2181981936u, 0, 14, NULL); +be_define_const_str(set_dcdc_enable, "set_dcdc_enable", 1594690786u, 0, 15, &be_const_str_class); +be_define_const_str(set_first_time, "set_first_time", 3111247550u, 0, 14, &be_const_str_tan); +be_define_const_str(set_height, "set_height", 1080207399u, 0, 10, NULL); be_define_const_str(set_ldo_enable, "set_ldo_enable", 2916502041u, 0, 14, NULL); -be_define_const_str(set_ldo_voltage, "set_ldo_voltage", 4090501160u, 0, 15, &be_const_str_tob64); -be_define_const_str(set_light, "set_light", 3176076152u, 0, 9, &be_const_str_setrange); +be_define_const_str(set_ldo_voltage, "set_ldo_voltage", 4090501160u, 0, 15, NULL); +be_define_const_str(set_light, "set_light", 3176076152u, 0, 9, NULL); be_define_const_str(set_matrix_pixel_color, "set_matrix_pixel_color", 1197149462u, 0, 22, NULL); -be_define_const_str(set_percentage, "set_percentage", 2952022724u, 0, 14, NULL); +be_define_const_str(set_percentage, "set_percentage", 2952022724u, 0, 14, &be_const_str__X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D); be_define_const_str(set_pixel_color, "set_pixel_color", 1275248356u, 0, 15, NULL); -be_define_const_str(set_power, "set_power", 549820893u, 0, 9, &be_const_str_widget_height_def); +be_define_const_str(set_power, "set_power", 549820893u, 0, 9, &be_const_str_v); be_define_const_str(set_style_bg_color, "set_style_bg_color", 1689513089u, 0, 18, NULL); be_define_const_str(set_style_line_color, "set_style_line_color", 3665238976u, 0, 20, NULL); be_define_const_str(set_style_pad_right, "set_style_pad_right", 3314069054u, 0, 19, NULL); -be_define_const_str(set_style_text_font, "set_style_text_font", 1028590019u, 0, 19, NULL); +be_define_const_str(set_style_text_font, "set_style_text_font", 1028590019u, 0, 19, &be_const_str_widget_ctor_impl); be_define_const_str(set_text, "set_text", 1849641155u, 0, 8, NULL); -be_define_const_str(set_time, "set_time", 900236405u, 0, 8, NULL); -be_define_const_str(set_timeouts, "set_timeouts", 3732850900u, 0, 12, &be_const_str_import); -be_define_const_str(set_timer, "set_timer", 2135414533u, 0, 9, NULL); +be_define_const_str(set_time, "set_time", 900236405u, 0, 8, &be_const_str_if); +be_define_const_str(set_timeouts, "set_timeouts", 3732850900u, 0, 12, NULL); +be_define_const_str(set_timer, "set_timer", 2135414533u, 0, 9, &be_const_str_for); be_define_const_str(set_useragent, "set_useragent", 612237244u, 0, 13, NULL); -be_define_const_str(set_width, "set_width", 484671920u, 0, 9, &be_const_str__X7D); -be_define_const_str(set_x, "set_x", 1849400772u, 0, 5, &be_const_str_def); -be_define_const_str(set_y, "set_y", 1866178391u, 0, 5, NULL); -be_define_const_str(setbits, "setbits", 2762408167u, 0, 7, NULL); +be_define_const_str(set_width, "set_width", 484671920u, 0, 9, NULL); +be_define_const_str(set_x, "set_x", 1849400772u, 0, 5, &be_const_str_var); +be_define_const_str(set_y, "set_y", 1866178391u, 0, 5, &be_const_str_raise); +be_define_const_str(setbits, "setbits", 2762408167u, 0, 7, &be_const_str_super); be_define_const_str(seti, "seti", 1500556254u, 0, 4, NULL); be_define_const_str(setitem, "setitem", 1554834596u, 0, 7, NULL); -be_define_const_str(setmember, "setmember", 1432909441u, 0, 9, &be_const_str_strptime); +be_define_const_str(setmember, "setmember", 1432909441u, 0, 9, NULL); be_define_const_str(setrange, "setrange", 3794019032u, 0, 8, NULL); be_define_const_str(settings, "settings", 1745255176u, 0, 8, NULL); -be_define_const_str(shared_key, "shared_key", 2200833624u, 0, 10, &be_const_str_wifi); -be_define_const_str(show, "show", 2840060476u, 0, 4, &be_const_str_y); -be_define_const_str(sin, "sin", 3761252941u, 0, 3, NULL); -be_define_const_str(sinh, "sinh", 282220607u, 0, 4, &be_const_str_tasmota_X2Eget_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eget_X28_X29); -be_define_const_str(size, "size", 597743964u, 0, 4, NULL); -be_define_const_str(skip, "skip", 1097563074u, 0, 4, NULL); +be_define_const_str(shared_key, "shared_key", 2200833624u, 0, 10, NULL); +be_define_const_str(show, "show", 2840060476u, 0, 4, NULL); +be_define_const_str(sin, "sin", 3761252941u, 0, 3, &be_const_str_widget_constructor); +be_define_const_str(sinh, "sinh", 282220607u, 0, 4, NULL); +be_define_const_str(size, "size", 597743964u, 0, 4, &be_const_str_top); +be_define_const_str(skip, "skip", 1097563074u, 0, 4, &be_const_str_tr); be_define_const_str(solidified, "solidified", 3257553487u, 0, 10, NULL); -be_define_const_str(split, "split", 2276994531u, 0, 5, &be_const_str_strftime); -be_define_const_str(sqrt, "sqrt", 2112764879u, 0, 4, NULL); +be_define_const_str(split, "split", 2276994531u, 0, 5, &be_const_str__X7Bs_X7DVBus_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D); +be_define_const_str(sqrt, "sqrt", 2112764879u, 0, 4, &be_const_str_widget_cb); be_define_const_str(srand, "srand", 465518633u, 0, 5, NULL); be_define_const_str(start, "start", 1697318111u, 0, 5, NULL); be_define_const_str(state, "state", 2016490230u, 0, 5, NULL); @@ -641,43 +639,43 @@ be_define_const_str(str, "str", 3259748752u, 0, 3, NULL); be_define_const_str(strftime, "strftime", 187738851u, 0, 8, NULL); be_define_const_str(string, "string", 398550328u, 0, 6, NULL); be_define_const_str(strip, "strip", 4246411473u, 0, 5, NULL); -be_define_const_str(strptime, "strptime", 1277910361u, 0, 8, &be_const_str_unknown_X20instruction); -be_define_const_str(super, "super", 4152230356u, 0, 5, &be_const_str_year); +be_define_const_str(strptime, "strptime", 1277910361u, 0, 8, &be_const_str_wire_scan); +be_define_const_str(super, "super", 4152230356u, 0, 5, NULL); be_define_const_str(sys, "sys", 3277365014u, 0, 3, NULL); -be_define_const_str(tag, "tag", 2516003219u, 0, 3, &be_const_str_widget_instance_size); +be_define_const_str(tag, "tag", 2516003219u, 0, 3, NULL); be_define_const_str(tan, "tan", 2633446552u, 0, 3, NULL); -be_define_const_str(tanh, "tanh", 153638352u, 0, 4, NULL); -be_define_const_str(target, "target", 845187144u, 0, 6, NULL); -be_define_const_str(target_search, "target_search", 1947846553u, 0, 13, NULL); -be_define_const_str(tasmota, "tasmota", 424643812u, 0, 7, NULL); -be_define_const_str(tasmota_X2Eget_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eget_X28_X29, "tasmota.get_light() is deprecated, use light.get()", 3525753647u, 0, 50, NULL); +be_define_const_str(tanh, "tanh", 153638352u, 0, 4, &be_const_str__X7B); +be_define_const_str(target, "target", 845187144u, 0, 6, &be_const_str_widget_width_def); +be_define_const_str(target_search, "target_search", 1947846553u, 0, 13, &be_const_str_url_encode); +be_define_const_str(tasmota, "tasmota", 424643812u, 0, 7, &be_const_str_value_error); +be_define_const_str(tasmota_X2Eget_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eget_X28_X29, "tasmota.get_light() is deprecated, use light.get()", 3525753647u, 0, 50, &be_const_str_while); be_define_const_str(tasmota_X2Eset_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eset_X28_X29, "tasmota.set_light() is deprecated, use light.set()", 2124937871u, 0, 50, NULL); be_define_const_str(tcpclient, "tcpclient", 3828797983u, 0, 9, NULL); -be_define_const_str(tele, "tele", 3474458061u, 0, 4, NULL); +be_define_const_str(tele, "tele", 3474458061u, 0, 4, &be_const_str_time_dump); be_define_const_str(the_X20second_X20argument_X20is_X20not_X20a_X20function, "the second argument is not a function", 3954574469u, 0, 37, NULL); be_define_const_str(time_dump, "time_dump", 3330410747u, 0, 9, NULL); -be_define_const_str(time_reached, "time_reached", 2075136773u, 0, 12, NULL); -be_define_const_str(time_str, "time_str", 2613827612u, 0, 8, &be_const_str__X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_XB0C_X7Be_X7D); -be_define_const_str(to_gamma, "to_gamma", 1597139862u, 0, 8, NULL); +be_define_const_str(time_reached, "time_reached", 2075136773u, 0, 12, &be_const_str__X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D); +be_define_const_str(time_str, "time_str", 2613827612u, 0, 8, NULL); +be_define_const_str(to_gamma, "to_gamma", 1597139862u, 0, 8, &be_const_str_value); be_define_const_str(tob64, "tob64", 373777640u, 0, 5, NULL); be_define_const_str(tolower, "tolower", 1042520049u, 0, 7, NULL); be_define_const_str(tomap, "tomap", 612167626u, 0, 5, NULL); be_define_const_str(top, "top", 2802900028u, 0, 3, NULL); be_define_const_str(toptr, "toptr", 3379847454u, 0, 5, NULL); be_define_const_str(tostring, "tostring", 2299708645u, 0, 8, NULL); -be_define_const_str(toupper, "toupper", 3691983576u, 0, 7, NULL); +be_define_const_str(toupper, "toupper", 3691983576u, 0, 7, &be_const_str_webserver); be_define_const_str(tr, "tr", 1195724803u, 0, 2, NULL); -be_define_const_str(traceback, "traceback", 3385188109u, 0, 9, &be_const_str_as); +be_define_const_str(traceback, "traceback", 3385188109u, 0, 9, NULL); be_define_const_str(true, "true", 1303515621u, 61, 4, NULL); be_define_const_str(try, "try", 2887626766u, 68, 3, NULL); -be_define_const_str(try_rule, "try_rule", 1986449405u, 0, 8, &be_const_str_widget_dtor_cb); +be_define_const_str(try_rule, "try_rule", 1986449405u, 0, 8, NULL); be_define_const_str(type, "type", 1361572173u, 0, 4, NULL); -be_define_const_str(unknown_X20instruction, "unknown instruction", 1093911841u, 0, 19, &be_const_str_widget_event_impl); +be_define_const_str(unknown_X20instruction, "unknown instruction", 1093911841u, 0, 19, NULL); be_define_const_str(update, "update", 672109684u, 0, 6, NULL); be_define_const_str(upper, "upper", 176974407u, 0, 5, NULL); be_define_const_str(url_encode, "url_encode", 528392145u, 0, 10, NULL); -be_define_const_str(v, "v", 4077666505u, 0, 1, &be_const_str_valuer_error); -be_define_const_str(value, "value", 1113510858u, 0, 5, &be_const_str_web_add_button); +be_define_const_str(v, "v", 4077666505u, 0, 1, NULL); +be_define_const_str(value, "value", 1113510858u, 0, 5, NULL); be_define_const_str(value_error, "value_error", 773297791u, 0, 11, NULL); be_define_const_str(valuer_error, "valuer_error", 2567947105u, 0, 12, NULL); be_define_const_str(var, "var", 2317739966u, 64, 3, NULL); @@ -688,21 +686,21 @@ be_define_const_str(web_add_config_button, "web_add_config_button", 639674325u, be_define_const_str(web_add_console_button, "web_add_console_button", 3481436192u, 0, 22, NULL); be_define_const_str(web_add_handler, "web_add_handler", 3990174962u, 0, 15, NULL); be_define_const_str(web_add_main_button, "web_add_main_button", 3960367664u, 0, 19, NULL); -be_define_const_str(web_add_management_button, "web_add_management_button", 2738877186u, 0, 25, &be_const_str_webclient); +be_define_const_str(web_add_management_button, "web_add_management_button", 2738877186u, 0, 25, &be_const_str_do); be_define_const_str(web_send, "web_send", 2989941448u, 0, 8, NULL); be_define_const_str(web_send_decimal, "web_send_decimal", 1407210204u, 0, 16, NULL); -be_define_const_str(web_sensor, "web_sensor", 2900096972u, 0, 10, &be_const_str_do); +be_define_const_str(web_sensor, "web_sensor", 2900096972u, 0, 10, &be_const_str_write_gpio); be_define_const_str(webclient, "webclient", 4076389146u, 0, 9, NULL); be_define_const_str(webserver, "webserver", 1572454038u, 0, 9, NULL); be_define_const_str(while, "while", 231090382u, 53, 5, NULL); -be_define_const_str(widget_cb, "widget_cb", 2763583055u, 0, 9, &be_const_str_width); -be_define_const_str(widget_constructor, "widget_constructor", 2543785934u, 0, 18, &be_const_str_yield); -be_define_const_str(widget_ctor_cb, "widget_ctor_cb", 876007560u, 0, 14, &be_const_str_for); -be_define_const_str(widget_ctor_impl, "widget_ctor_impl", 194252479u, 0, 16, &be_const_str_write_file); +be_define_const_str(widget_cb, "widget_cb", 2763583055u, 0, 9, NULL); +be_define_const_str(widget_constructor, "widget_constructor", 2543785934u, 0, 18, NULL); +be_define_const_str(widget_ctor_cb, "widget_ctor_cb", 876007560u, 0, 14, NULL); +be_define_const_str(widget_ctor_impl, "widget_ctor_impl", 194252479u, 0, 16, NULL); be_define_const_str(widget_destructor, "widget_destructor", 4207388345u, 0, 17, NULL); be_define_const_str(widget_dtor_cb, "widget_dtor_cb", 3151545845u, 0, 14, NULL); be_define_const_str(widget_dtor_impl, "widget_dtor_impl", 520430610u, 0, 16, NULL); -be_define_const_str(widget_editable, "widget_editable", 3821793286u, 0, 15, &be_const_str_try); +be_define_const_str(widget_editable, "widget_editable", 3821793286u, 0, 15, NULL); be_define_const_str(widget_event, "widget_event", 1951408186u, 0, 12, NULL); be_define_const_str(widget_event_cb, "widget_event_cb", 1508466754u, 0, 15, NULL); be_define_const_str(widget_event_impl, "widget_event_impl", 2178430561u, 0, 17, NULL); @@ -716,15 +714,15 @@ be_define_const_str(width, "width", 2508680735u, 0, 5, NULL); be_define_const_str(width_def, "width_def", 1143717879u, 0, 9, NULL); be_define_const_str(wifi, "wifi", 120087624u, 0, 4, NULL); be_define_const_str(wire, "wire", 4082753944u, 0, 4, NULL); -be_define_const_str(wire1, "wire1", 3212721419u, 0, 5, NULL); +be_define_const_str(wire1, "wire1", 3212721419u, 0, 5, &be_const_str_true); be_define_const_str(wire2, "wire2", 3229499038u, 0, 5, NULL); be_define_const_str(wire_scan, "wire_scan", 2671275880u, 0, 9, NULL); be_define_const_str(write, "write", 3190202204u, 0, 5, NULL); be_define_const_str(write8, "write8", 3133991532u, 0, 6, NULL); be_define_const_str(write_bit, "write_bit", 2660990436u, 0, 9, NULL); -be_define_const_str(write_bytes, "write_bytes", 1227543792u, 0, 11, &be_const_str_except); +be_define_const_str(write_bytes, "write_bytes", 1227543792u, 0, 11, NULL); be_define_const_str(write_file, "write_file", 3177658879u, 0, 10, NULL); -be_define_const_str(write_gpio, "write_gpio", 2267940334u, 0, 10, &be_const_str_if); +be_define_const_str(write_gpio, "write_gpio", 2267940334u, 0, 10, NULL); be_define_const_str(x, "x", 4245442695u, 0, 1, NULL); be_define_const_str(x1, "x1", 274927234u, 0, 2, NULL); be_define_const_str(y, "y", 4228665076u, 0, 1, NULL); @@ -732,7 +730,7 @@ be_define_const_str(y1, "y1", 2355101727u, 0, 2, NULL); be_define_const_str(year, "year", 2927578396u, 0, 4, NULL); be_define_const_str(yield, "yield", 1821831854u, 0, 5, NULL); be_define_const_str(zero, "zero", 2339366755u, 0, 4, NULL); -be_define_const_str(zip, "zip", 2877453236u, 0, 3, &be_const_str__X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D); +be_define_const_str(zip, "zip", 2877453236u, 0, 3, NULL); be_define_const_str(_X7B, "{", 4262220314u, 0, 1, NULL); be_define_const_str(_X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D, "{s}Batt Current{m}%.1f mA{e}", 866537156u, 0, 28, NULL); be_define_const_str(_X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D, "{s}Batt Voltage{m}%.3f V{e}", 3184308199u, 0, 27, NULL); @@ -743,370 +741,369 @@ be_define_const_str(_X7B_X7D, "{}", 1415952421u, 0, 2, NULL); be_define_const_str(_X7D, "}", 4161554600u, 0, 1, NULL); static const bstring* const m_string_table[] = { - (const bstring *)&be_const_str__X3D, - (const bstring *)&be_const_str_point, - (const bstring *)&be_const_str_run, + (const bstring *)&be_const_str__X3E_X3D, + (const bstring *)&be_const_str_run_bat, NULL, - (const bstring *)&be_const_str_class_init_obj, - (const bstring *)&be_const_str_try_rule, - (const bstring *)&be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dzip_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, - (const bstring *)&be_const_str_setbits, - (const bstring *)&be_const_str_AXP192, - (const bstring *)&be_const_str_tolower, - (const bstring *)&be_const_str__X2B, - (const bstring *)&be_const_str_I2C_X3A, - (const bstring *)&be_const_str_exec_rules, - (const bstring *)&be_const_str_read13, - (const bstring *)&be_const_str__X2F, - (const bstring *)&be_const_str_pc_abs, - (const bstring *)&be_const_str__error, - (const bstring *)&be_const_str__X23autoexec_X2Ebat, - (const bstring *)&be_const_str__X23, - (const bstring *)&be_const_str__X2Ep, - (const bstring *)&be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, + NULL, + (const bstring *)&be_const_str_io_error, + (const bstring *)&be_const_str_depower, + (const bstring *)&be_const_str_SERIAL_6O1, + (const bstring *)&be_const_str_STATE_DEFAULT, (const bstring *)&be_const_str_SERIAL_6N1, - (const bstring *)&be_const_str_cb_do_nothing, - (const bstring *)&be_const_str_CFG_X3A_X20loading_X20, - (const bstring *)&be_const_str_HTTP_POST, - (const bstring *)&be_const_str__rules, + (const bstring *)&be_const_str_Auto_X2Dconfiguration, + (const bstring *)&be_const_str_decrypt, + (const bstring *)&be_const_str_insert, NULL, + (const bstring *)&be_const_str__X3D, + (const bstring *)&be_const_str_write_bytes, NULL, - NULL, - (const bstring *)&be_const_str_the_X20second_X20argument_X20is_X20not_X20a_X20function, - (const bstring *)&be_const_str_begin, - (const bstring *)&be_const_str_POST, - (const bstring *)&be_const_str_web_add_console_button, - (const bstring *)&be_const_str__X2F_X2Eautoconf, - NULL, - (const bstring *)&be_const_str__filename, - (const bstring *)&be_const_str_write_bit, - (const bstring *)&be_const_str_SERIAL_5O1, - (const bstring *)&be_const_str_AES_GCM, - (const bstring *)&be_const_str_set_height, - (const bstring *)&be_const_str__end_transmission, - (const bstring *)&be_const_str__X2D_X2D_X3A_X2D_X2D, - (const bstring *)&be_const_str_cb_obj, - (const bstring *)&be_const_str_CFG_X3A_X20removing_X20first_X20time_X20marker, - (const bstring *)&be_const_str__archive, - (const bstring *)&be_const_str_module, - (const bstring *)&be_const_str_SERIAL_7N1, - (const bstring *)&be_const_str_sinh, - (const bstring *)&be_const_str__X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, - (const bstring *)&be_const_str_SERIAL_6O2, - (const bstring *)&be_const_str_detected_X20on_X20bus, - (const bstring *)&be_const_str_response_append, - (const bstring *)&be_const_str_WS2812_GRB, - (const bstring *)&be_const_str__X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29, - (const bstring *)&be_const_str_toptr, - (const bstring *)&be_const_str_get_bri, - NULL, - (const bstring *)&be_const_str_arch, - NULL, - (const bstring *)&be_const_str__X3C_X2Fform_X3E_X3C_X2Fp_X3E, - (const bstring *)&be_const_str_connection_error, - (const bstring *)&be_const_str_, - (const bstring *)&be_const_str_calldepth, - (const bstring *)&be_const_str___iterator__, - (const bstring *)&be_const_str__X2Esize, - (const bstring *)&be_const_str_widget_group_def, - (const bstring *)&be_const_str_resp_cmnd, - (const bstring *)&be_const_str__X2Ep2, - (const bstring *)&be_const_str_get_switch, - (const bstring *)&be_const_str_clear_first_time, - NULL, + (const bstring *)&be_const_str_running, + (const bstring *)&be_const_str_onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E, + (const bstring *)&be_const_str_read_bytes, + (const bstring *)&be_const_str_draw_arc, + (const bstring *)&be_const_str__X20, + (const bstring *)&be_const_str_event, + (const bstring *)&be_const_str_SERIAL_5E2, + (const bstring *)&be_const_str_SERIAL_6E1, + (const bstring *)&be_const_str_leds, + (const bstring *)&be_const_str__lvgl, + (const bstring *)&be_const_str_zip, (const bstring *)&be_const_str_EC_C25519, - (const bstring *)&be_const_str_save, - NULL, - NULL, - (const bstring *)&be_const_str_SERIAL_8N1, - (const bstring *)&be_const_str_ip, - (const bstring *)&be_const_str_alternate, - (const bstring *)&be_const_str_compile, - (const bstring *)&be_const_str_file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27, - (const bstring *)&be_const_str_animate, - (const bstring *)&be_const_str__X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d, - NULL, - (const bstring *)&be_const_str_SERIAL_8O2, - (const bstring *)&be_const_str__X25s_X2Eautoconf, - NULL, - (const bstring *)&be_const_str__dirty, - (const bstring *)&be_const_str_y1, - (const bstring *)&be_const_str_remove_driver, - (const bstring *)&be_const_str_get_string, - (const bstring *)&be_const_str_CFG_X3A_X20removing_X20autoconf_X20files, - (const bstring *)&be_const_str_autoexec, - (const bstring *)&be_const_str_get_style_line_color, - (const bstring *)&be_const_str_bool, - (const bstring *)&be_const_str_write_gpio, - (const bstring *)&be_const_str__X3D_X3D, - (const bstring *)&be_const_str_id, - (const bstring *)&be_const_str_SERIAL_5N2, - NULL, - (const bstring *)&be_const_str_persist, - (const bstring *)&be_const_str_set_timeouts, - NULL, - (const bstring *)&be_const_str_AudioGenerator, - (const bstring *)&be_const_str_byte, - (const bstring *)&be_const_str_EVENT_DRAW_PART_BEGIN, - (const bstring *)&be_const_str_collect, - (const bstring *)&be_const_str_widget_event, - (const bstring *)&be_const_str_SERIAL_6E2, - (const bstring *)&be_const_str_add_anim, - (const bstring *)&be_const_str_erase, - (const bstring *)&be_const_str___lower__, - (const bstring *)&be_const_str_arg, - (const bstring *)&be_const_str_CFG_X3A_X20ran_X20_X20, - (const bstring *)&be_const_str_srand, - (const bstring *)&be_const_str_skip, - (const bstring *)&be_const_str_Leds, - NULL, - (const bstring *)&be_const_str__X23init_X2Ebat, - (const bstring *)&be_const_str__X3Clambda_X3E, - (const bstring *)&be_const_str_GET, - (const bstring *)&be_const_str_widget_ctor_cb, - (const bstring *)&be_const_str__global_addr, - (const bstring *)&be_const_str_OneWire, + (const bstring *)&be_const_str_COLOR_BLACK, + (const bstring *)&be_const_str_readline, (const bstring *)&be_const_str__X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E, - (const bstring *)&be_const_str_update, NULL, - NULL, - NULL, - (const bstring *)&be_const_str_AudioOutput, - NULL, - (const bstring *)&be_const_str_decompress, - NULL, - (const bstring *)&be_const_str_EVENT_DRAW_PART_END, (const bstring *)&be_const_str_load_templates, - (const bstring *)&be_const_str_get_alternate, - (const bstring *)&be_const_str_acos, - (const bstring *)&be_const_str__X2Elen, - (const bstring *)&be_const_str_constructor_cb, - (const bstring *)&be_const_str_CFG_X3A_X20loaded_X20_X20, + (const bstring *)&be_const_str_get, + (const bstring *)&be_const_str_POST, + (const bstring *)&be_const_str___iterator__, + (const bstring *)&be_const_str_AudioGeneratorMP3, + (const bstring *)&be_const_str__energy, + (const bstring *)&be_const_str__rules, + (const bstring *)&be_const_str_break, + (const bstring *)&be_const_str__X2F_X2Eautoconf, + (const bstring *)&be_const_str_content_button, + (const bstring *)&be_const_str_copy, + (const bstring *)&be_const_str_get_aps_voltage, + (const bstring *)&be_const_str_AXP192, + (const bstring *)&be_const_str_select, + (const bstring *)&be_const_str_autoexec, + (const bstring *)&be_const_str__X0A, + (const bstring *)&be_const_str_available, NULL, - (const bstring *)&be_const_str_get_current_module_name, - (const bstring *)&be_const_str__X2Ebec, - (const bstring *)&be_const_str__settings_ptr, - (const bstring *)&be_const_str_dump, + (const bstring *)&be_const_str__X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B, + (const bstring *)&be_const_str_gc, + (const bstring *)&be_const_str_CFG_X3A_X20loading_X20_X27_X25s_X27, + (const bstring *)&be_const_str__X21_X3D_X3D, + (const bstring *)&be_const_str_split, + (const bstring *)&be_const_str_lower, + (const bstring *)&be_const_str__X3Clabel_X3EChoose_X20a_X20device_X20configuration_X3A_X3C_X2Flabel_X3E_X3Cbr_X3E, + (const bstring *)&be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, + (const bstring *)&be_const_str_base_class, + (const bstring *)&be_const_str_connected, + (const bstring *)&be_const_str_instance, + NULL, + (const bstring *)&be_const_str__X2Etapp, + (const bstring *)&be_const_str__X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E, + (const bstring *)&be_const_str_attrdump, + (const bstring *)&be_const_str_EVENT_DRAW_MAIN, + (const bstring *)&be_const_str__request_from, + (const bstring *)&be_const_str__X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E, + (const bstring *)&be_const_str_acos, + (const bstring *)&be_const_str_get_light, + (const bstring *)&be_const_str_resp_cmnd_str, + NULL, + (const bstring *)&be_const_str_CFG_X3A_X20removing_X20autoconf_X20files, + NULL, + (const bstring *)&be_const_str_w, + (const bstring *)&be_const_str_draw_line, + NULL, + (const bstring *)&be_const_str_strip, + (const bstring *)&be_const_str_format, + (const bstring *)&be_const_str_Leds, + (const bstring *)&be_const_str_exec_tele, + (const bstring *)&be_const_str_chars_in_string, + (const bstring *)&be_const_str_CFG_X3A_X20skipping_X20_X27display_X2Eini_X27_X20because_X20already_X20present_X20in_X20file_X2Dsystem, + NULL, + (const bstring *)&be_const_str_widget_dtor_cb, + (const bstring *)&be_const_str_invalidate, + (const bstring *)&be_const_str__X3A, + NULL, + (const bstring *)&be_const_str_out_X20of_X20range, + NULL, + (const bstring *)&be_const_str_lv_event_cb, + (const bstring *)&be_const_str_LVG_X3A_X20call_X20to_X20unsupported_X20callback, + (const bstring *)&be_const_str_escape, + (const bstring *)&be_const_str_event_cb, + (const bstring *)&be_const_str_init_draw_line_dsc, + NULL, + (const bstring *)&be_const_str_isinstance, + (const bstring *)&be_const_str_exists, + (const bstring *)&be_const_str_HTTP_GET, + (const bstring *)&be_const_str_clear_first_time, + (const bstring *)&be_const_str__X2Eautoconf, + (const bstring *)&be_const_str_clear, + (const bstring *)&be_const_str__X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E, + (const bstring *)&be_const_str_SERIAL_7N1, + (const bstring *)&be_const_str_get_percentage, + (const bstring *)&be_const_str_SERIAL_7O1, + (const bstring *)&be_const_str_remove, + (const bstring *)&be_const_str_set_time, + (const bstring *)&be_const_str_get_size, + (const bstring *)&be_const_str_remove_timer, + (const bstring *)&be_const_str__X23autoexec_X2Ebat, + (const bstring *)&be_const_str__X2D_X2D_X3A_X2D_X2D, + (const bstring *)&be_const_str_due, + (const bstring *)&be_const_str__X2C, + (const bstring *)&be_const_str_instance_size, + (const bstring *)&be_const_str_Animate_X20pc_X20is_X20out_X20of_X20range, + (const bstring *)&be_const_str_cb, + (const bstring *)&be_const_str_resp_cmnd_done, + NULL, + (const bstring *)&be_const_str_energy_struct, NULL, (const bstring *)&be_const_str__drivers, + (const bstring *)&be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dzip_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, + (const bstring *)&be_const_str_tob64, + (const bstring *)&be_const_str__X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, + (const bstring *)&be_const_str_CFG_X3A_X20multiple_X20autoconf_X20files_X20found_X2C_X20aborting_X20_X28_X27_X25s_X27_X20_X2B_X20_X27_X25s_X27_X29, + (const bstring *)&be_const_str__X3C, + (const bstring *)&be_const_str_y, + (const bstring *)&be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, + (const bstring *)&be_const_str_files, + (const bstring *)&be_const_str__X2Ew, + (const bstring *)&be_const_str_assert, + (const bstring *)&be_const_str_bytes, + (const bstring *)&be_const_str__X23, + (const bstring *)&be_const_str_abs, + (const bstring *)&be_const_str__X2E_X2E, + (const bstring *)&be_const_str__global_addr, + (const bstring *)&be_const_str_connect, + (const bstring *)&be_const_str__settings_ptr, + NULL, + (const bstring *)&be_const_str_CFG_X3A_X20ran_X20_X20, + (const bstring *)&be_const_str_BRY_X3A_X20ERROR_X2C_X20bad_X20json_X3A_X20, + NULL, + (const bstring *)&be_const_str__X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d, + (const bstring *)&be_const_str_i2c_enabled, + (const bstring *)&be_const_str_ctypes_bytes_dyn, + (const bstring *)&be_const_str_CFG_X3A_X20loading_X20, + NULL, + NULL, + (const bstring *)&be_const_str_refr_size, + (const bstring *)&be_const_str_content_send_style, + NULL, + NULL, + (const bstring *)&be_const_str_begin, + (const bstring *)&be_const_str_c, + (const bstring *)&be_const_str_ins_goto, + (const bstring *)&be_const_str__buffer, + (const bstring *)&be_const_str_concat, + (const bstring *)&be_const_str_percentage, + NULL, + (const bstring *)&be_const_str_SERIAL_5N2, + NULL, + NULL, + (const bstring *)&be_const_str_SK6812_GRBW, + (const bstring *)&be_const_str__X3Cp_X3E_X3Csmall_X3E_X26nbsp_X3B_X28This_X20feature_X20requires_X20an_X20internet_X20connection_X29_X3C_X2Fsmall_X3E_X3C_X2Fp_X3E, + (const bstring *)&be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, + NULL, + NULL, + (const bstring *)&be_const_str_lv_obj, + (const bstring *)&be_const_str___upper__, + (const bstring *)&be_const_str_Restart_X201, + NULL, + (const bstring *)&be_const_str_introspect, + (const bstring *)&be_const_str__X23autoexec_X2Ebe, + (const bstring *)&be_const_str_CFG_X3A_X20exception_X20_X27_X25s_X27_X20_X2D_X20_X27_X25s_X27, + (const bstring *)&be_const_str_bool, + (const bstring *)&be_const_str_PART_MAIN, + (const bstring *)&be_const_str_back_forth, + (const bstring *)&be_const_str_lv_obj_class, + (const bstring *)&be_const_str_TAP_X3A_X20found_X20Tasmota_X20App_X20_X27_X25s_X27, + (const bstring *)&be_const_str_GET, + (const bstring *)&be_const_str_deg, (const bstring *)&be_const_str__X28_X29, NULL, - (const bstring *)&be_const_str__X2Ebe, - (const bstring *)&be_const_str_content_start, - (const bstring *)&be_const_str__class, - (const bstring *)&be_const_str_h, - (const bstring *)&be_const_str_Unknown_X20command, - (const bstring *)&be_const_str_CFG_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s, - (const bstring *)&be_const_str_p1, - NULL, - NULL, - (const bstring *)&be_const_str_b, - (const bstring *)&be_const_str_Parameter_X20error, - (const bstring *)&be_const_str_event, - (const bstring *)&be_const_str_read32, - (const bstring *)&be_const_str_f, - (const bstring *)&be_const_str_resp_cmnd_failed, - (const bstring *)&be_const_str_create_matrix, - (const bstring *)&be_const_str_SERIAL_7E2, - (const bstring *)&be_const_str_resolvecmnd, - (const bstring *)&be_const_str_draw_line, - (const bstring *)&be_const_str_autorun, - (const bstring *)&be_const_str__X2Eautoconf, - (const bstring *)&be_const_str_editable, - NULL, - NULL, - NULL, - (const bstring *)&be_const_str__X3A, - (const bstring *)&be_const_str_EVENT_DRAW_MAIN, - (const bstring *)&be_const_str_remove_timer, - (const bstring *)&be_const_str_Wire, - (const bstring *)&be_const_str__X3E, - (const bstring *)&be_const_str__X26lt_X3BNone_X26gt_X3B, - (const bstring *)&be_const_str__X3C, - (const bstring *)&be_const_str_pin, - (const bstring *)&be_const_str__def, - (const bstring *)&be_const_str_int, - (const bstring *)&be_const_str_atan2, - (const bstring *)&be_const_str_AudioOutputI2S, - (const bstring *)&be_const_str_last_modified, - (const bstring *)&be_const_str_get_style_pad_right, - (const bstring *)&be_const_str__settings_def, - (const bstring *)&be_const_str_CFG_X3A_X20loaded_X20_X27_X25s_X27, - (const bstring *)&be_const_str__X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B, - NULL, - (const bstring *)&be_const_str_start, - (const bstring *)&be_const_str_reset, - (const bstring *)&be_const_str__X2E, - (const bstring *)&be_const_str__X21_X3D_X3D, - (const bstring *)&be_const_str__X2C, (const bstring *)&be_const_str__X23preinit_X2Ebe, - (const bstring *)&be_const_str_month, - (const bstring *)&be_const_str_instance_size, - (const bstring *)&be_const_str__X20, - (const bstring *)&be_const_str_exp, - (const bstring *)&be_const_str_bus, - (const bstring *)&be_const_str_cmd_res, - (const bstring *)&be_const_str_draw_line_dsc, - (const bstring *)&be_const_str_BRY_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s, - (const bstring *)&be_const_str_tostring, - (const bstring *)&be_const_str_var, - (const bstring *)&be_const_str_upper, - (const bstring *)&be_const_str_color, - (const bstring *)&be_const_str_internal_error, - (const bstring *)&be_const_str_encrypt, - (const bstring *)&be_const_str__X21_X3D, - NULL, - NULL, - (const bstring *)&be_const_str_CFG_X3A_X20running_X20, - (const bstring *)&be_const_str_Restart_X201, - (const bstring *)&be_const_str_BUTTON_CONFIGURATION, - NULL, - (const bstring *)&be_const_str_HTTP_GET, - (const bstring *)&be_const_str_loop, - (const bstring *)&be_const_str_SERIAL_5O2, - (const bstring *)&be_const_str__X0A, - (const bstring *)&be_const_str_back_forth, - (const bstring *)&be_const_str_add_rule, - (const bstring *)&be_const_str_CFG_X3A_X20skipping_X20_X27display_X2Eini_X27_X20because_X20already_X20present_X20in_X20file_X2Dsystem, - (const bstring *)&be_const_str_list, - (const bstring *)&be_const_str_closure, - (const bstring *)&be_const_str__X2F_X3Frst_X3D, - NULL, - (const bstring *)&be_const_str__X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, - (const bstring *)&be_const_str_COLOR_WHITE, - NULL, - (const bstring *)&be_const_str_SERIAL_6O1, - (const bstring *)&be_const_str_widget_struct_default, - (const bstring *)&be_const_str_gamma, - (const bstring *)&be_const_str_abs, - (const bstring *)&be_const_str_pc, - (const bstring *)&be_const_str_concat, - (const bstring *)&be_const_str_height_def, - NULL, - (const bstring *)&be_const_str_log10, - (const bstring *)&be_const_str_call, - (const bstring *)&be_const_str__p, - (const bstring *)&be_const_str_file, - (const bstring *)&be_const_str__request_from, - (const bstring *)&be_const_str_BRY_X3A_X20failed_X20to_X20load_X20_persist_X2Ejson, - (const bstring *)&be_const_str__X2Ep1, - (const bstring *)&be_const_str_content_send_style, - (const bstring *)&be_const_str_AudioGeneratorWAV, - (const bstring *)&be_const_str_seg7_font, - NULL, - (const bstring *)&be_const_str_add_driver, - (const bstring *)&be_const_str_pin_used, - (const bstring *)&be_const_str_Tele, - (const bstring *)&be_const_str_SERIAL_8N2, - NULL, - (const bstring *)&be_const_str__X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, - (const bstring *)&be_const_str_get_input_power_status, - (const bstring *)&be_const_str__persist_X2Ejson, - NULL, - (const bstring *)&be_const_str__X23display_X2Eini, - (const bstring *)&be_const_str_Animate_X20pc_X20is_X20out_X20of_X20range, - (const bstring *)&be_const_str_SERIAL_8O1, - (const bstring *)&be_const_str_ctypes_bytes, - (const bstring *)&be_const_str__X3Clabel_X3EChoose_X20a_X20device_X20configuration_X3A_X3C_X2Flabel_X3E_X3Cbr_X3E, - (const bstring *)&be_const_str_round_end, - (const bstring *)&be_const_str_codedump, - (const bstring *)&be_const_str_MD5, - (const bstring *)&be_const_str_PART_MAIN, - NULL, - (const bstring *)&be_const_str_asin, - (const bstring *)&be_const_str_content_stop, - (const bstring *)&be_const_str_set_light, - (const bstring *)&be_const_str_get_bat_current, - (const bstring *)&be_const_str_x1, - NULL, - NULL, - (const bstring *)&be_const_str_compress, - (const bstring *)&be_const_str_escape, - (const bstring *)&be_const_str_atan, - (const bstring *)&be_const_str_SERIAL_5N1, - (const bstring *)&be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, - (const bstring *)&be_const_str__X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E, - (const bstring *)&be_const_str_tr, - (const bstring *)&be_const_str__X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E, - (const bstring *)&be_const_str__X2E_X2E, - (const bstring *)&be_const_str_SERIAL_6E1, - (const bstring *)&be_const_str_content_button, - (const bstring *)&be_const_str_asstring, - NULL, - (const bstring *)&be_const_str_detect, - (const bstring *)&be_const_str_close, - (const bstring *)&be_const_str_add_header, - (const bstring *)&be_const_str_day, - (const bstring *)&be_const_str_seti, - (const bstring *)&be_const_str_light, - (const bstring *)&be_const_str__X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E, - (const bstring *)&be_const_str_event_cb, - (const bstring *)&be_const_str_AudioFileSource, - (const bstring *)&be_const_str_get_tasmota, - (const bstring *)&be_const_str_preinit, - (const bstring *)&be_const_str__available, - (const bstring *)&be_const_str_name, - NULL, - NULL, - (const bstring *)&be_const_str_reset_search, - (const bstring *)&be_const_str__X3C_X3D, - (const bstring *)&be_const_str_from_to, - NULL, - (const bstring *)&be_const_str_remove, - (const bstring *)&be_const_str__read, - (const bstring *)&be_const_str_deg, - (const bstring *)&be_const_str_obj_class_create_obj, - (const bstring *)&be_const_str_ins_time, - (const bstring *)&be_const_str__X2Etapp, - (const bstring *)&be_const_str_content_flush, - (const bstring *)&be_const_str_area, - (const bstring *)&be_const_str_CFG_X3A_X20no_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found, - (const bstring *)&be_const_str_webserver, - (const bstring *)&be_const_str_iter, - (const bstring *)&be_const_str_ceil, - (const bstring *)&be_const_str__global_def, - (const bstring *)&be_const_str__get_cb, - (const bstring *)&be_const_str___upper__, - (const bstring *)&be_const_str_size, - (const bstring *)&be_const_str_cb_event_closure, - (const bstring *)&be_const_str_find_key_i, - (const bstring *)&be_const_str__cb, - (const bstring *)&be_const_str_AudioGeneratorMP3, - (const bstring *)&be_const_str_BRY_X3A_X20ERROR_X2C_X20bad_X20json_X3A_X20, - (const bstring *)&be_const_str_clear_to, - (const bstring *)&be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, - (const bstring *)&be_const_str_web_sensor, - (const bstring *)&be_const_str__ccmd, - NULL, - (const bstring *)&be_const_str_p2, - (const bstring *)&be_const_str_SERIAL_8E1, - (const bstring *)&be_const_str_connect, - (const bstring *)&be_const_str_c, - (const bstring *)&be_const_str_cmd, - (const bstring *)&be_const_str_a, - (const bstring *)&be_const_str_SERIAL_7E1, - (const bstring *)&be_const_str__cmd, - (const bstring *)&be_const_str_ctor, - (const bstring *)&be_const_str_attrdump, - (const bstring *)&be_const_str_every_second, - (const bstring *)&be_const_str__X5B, - (const bstring *)&be_const_str_can_show, - NULL, - (const bstring *)&be_const_str_Auto_X2Dconfiguration, - (const bstring *)&be_const_str__, - (const bstring *)&be_const_str_gen_cb, - (const bstring *)&be_const_str__X5D, - (const bstring *)&be_const_str_get_size, + (const bstring *)&be_const_str__class, NULL, + (const bstring *)&be_const_str__X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, + (const bstring *)&be_const_str_CFG_X3A_X20downloading_X20_X27_X25s_X27, (const bstring *)&be_const_str__X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E, - (const bstring *)&be_const_str__X3E_X3D, + (const bstring *)&be_const_str_fromstring, + (const bstring *)&be_const_str_SERIAL_8E2, NULL, + (const bstring *)&be_const_str__anonymous_, + (const bstring *)&be_const_str__X2502d_X25s_X2502d, + (const bstring *)&be_const_str_CFG_X3A_X20return_code_X3D_X25i, + (const bstring *)&be_const_str_web_sensor, + (const bstring *)&be_const_str_detect, + (const bstring *)&be_const_str_exec_cmd, + (const bstring *)&be_const_str_to_gamma, + (const bstring *)&be_const_str__ptr, + (const bstring *)&be_const_str_null_cb, + (const bstring *)&be_const_str_eth, + (const bstring *)&be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_X2F_X25s_X2Eautoconf, + (const bstring *)&be_const_str_erase, + (const bstring *)&be_const_str__archive, + (const bstring *)&be_const_str_CFG_X3A_X20removed_X20file_X20_X27_X25s_X27, + (const bstring *)&be_const_str_code, + (const bstring *)&be_const_str_BUTTON_CONFIGURATION, + (const bstring *)&be_const_str_web_send_decimal, + (const bstring *)&be_const_str_fromptr, + (const bstring *)&be_const_str_SERIAL_8E1, + NULL, + (const bstring *)&be_const_str_set_style_bg_color, + (const bstring *)&be_const_str_end, + (const bstring *)&be_const_str__read, + (const bstring *)&be_const_str_cos, + (const bstring *)&be_const_str_codedump, + (const bstring *)&be_const_str__X23init_X2Ebat, + (const bstring *)&be_const_str_get_battery_chargin_status, + (const bstring *)&be_const_str__X2Ebec, + (const bstring *)&be_const_str_set_dcdc_enable, + NULL, + (const bstring *)&be_const_str_ctor, + (const bstring *)&be_const_str_digital_read, + (const bstring *)&be_const_str_close, + (const bstring *)&be_const_str__X2F, + (const bstring *)&be_const_str_cosh, + (const bstring *)&be_const_str_I2C_Driver, + (const bstring *)&be_const_str_read24, + (const bstring *)&be_const_str__write, + (const bstring *)&be_const_str__X23display_X2Eini, + (const bstring *)&be_const_str_get_bat_power, + (const bstring *)&be_const_str_pin_mode, + (const bstring *)&be_const_str__, + (const bstring *)&be_const_str_scale_uint, + (const bstring *)&be_const_str_WS2812_GRB, + (const bstring *)&be_const_str_AudioOutput, + (const bstring *)&be_const_str_animate, (const bstring *)&be_const_str__X3F, - (const bstring *)&be_const_str_base_class + (const bstring *)&be_const_str_id, + (const bstring *)&be_const_str_arg_name, + (const bstring *)&be_const_str_internal_error, + (const bstring *)&be_const_str_serial, + NULL, + NULL, + (const bstring *)&be_const_str_CFG_X3A_X20could_X20not_X20run_X20_X25s_X20_X28_X25s_X20_X2D_X20_X25s_X29, + (const bstring *)&be_const_str__begin_transmission, + (const bstring *)&be_const_str__X2Ep1, + (const bstring *)&be_const_str_engine, + (const bstring *)&be_const_str__def, + (const bstring *)&be_const_str_get_pixel_color, + (const bstring *)&be_const_str__X3C_X3D, + (const bstring *)&be_const_str_CFG_X3A_X20removing_X20first_X20time_X20marker, + (const bstring *)&be_const_str__X3D_X3D, + (const bstring *)&be_const_str_can_show, + (const bstring *)&be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, + (const bstring *)&be_const_str_response_append, + (const bstring *)&be_const_str_CFG_X3A_X20_X27init_X2Ebat_X27_X20done_X2C_X20restarting, + (const bstring *)&be_const_str_content_send, + (const bstring *)&be_const_str_create_segment, + (const bstring *)&be_const_str_duration, + (const bstring *)&be_const_str_get_height, + (const bstring *)&be_const_str_delete_all_configs, + (const bstring *)&be_const_str_reset_search, + (const bstring *)&be_const_str_BRY_X3A_X20failed_X20to_X20load_X20_persist_X2Ejson, + (const bstring *)&be_const_str_, + (const bstring *)&be_const_str_b, + (const bstring *)&be_const_str_SERIAL_5E1, + (const bstring *)&be_const_str_SERIAL_6E2, + (const bstring *)&be_const_str_read13, + (const bstring *)&be_const_str_BRY_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s, + (const bstring *)&be_const_str_publish_result, + (const bstring *)&be_const_str_get_bat_current, + NULL, + (const bstring *)&be_const_str_ceil, + (const bstring *)&be_const_str_autorun, + (const bstring *)&be_const_str_length_X20in_X20bits_X20must_X20be_X20between_X200_X20and_X2032, + (const bstring *)&be_const_str_set_text, + (const bstring *)&be_const_str__X3D_X3C_X3E_X21, + (const bstring *)&be_const_str_r, + (const bstring *)&be_const_str_CFG_X3A_X20loaded_X20_X20, + (const bstring *)&be_const_str__X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E, + (const bstring *)&be_const_str__X2Ep, + (const bstring *)&be_const_str__error, + (const bstring *)&be_const_str_lv, + (const bstring *)&be_const_str_flush, + (const bstring *)&be_const_str_AudioFileSource, + (const bstring *)&be_const_str_web_add_main_button, + (const bstring *)&be_const_str__X2Elen, + (const bstring *)&be_const_str_persist_X2E_p_X20is_X20not_X20a_X20map, + (const bstring *)&be_const_str_compile, + (const bstring *)&be_const_str_CFG_X3A_X20running_X20, + (const bstring *)&be_const_str_compress, + NULL, + (const bstring *)&be_const_str_pin_used, + (const bstring *)&be_const_str__X2Ebe, + (const bstring *)&be_const_str_SERIAL_8O1, + (const bstring *)&be_const_str_CFG_X3A_X20loaded_X20_X27_X25s_X27, + (const bstring *)&be_const_str_EVENT_DRAW_PART_END, + NULL, + NULL, + (const bstring *)&be_const_str_button_pressed, + (const bstring *)&be_const_str_atleast1, + (const bstring *)&be_const_str_add_anim, + (const bstring *)&be_const_str_count, + (const bstring *)&be_const_str__X25s_X2Eautoconf, + (const bstring *)&be_const_str_False, + (const bstring *)&be_const_str_time_str, + (const bstring *)&be_const_str__X26lt_X3BNone_X26gt_X3B, + (const bstring *)&be_const_str_allocated, + NULL, + (const bstring *)&be_const_str_cb_obj, + (const bstring *)&be_const_str__X21_X3D, + (const bstring *)&be_const_str__X3Cselect_X20name_X3D_X27zip_X27_X3E, + (const bstring *)&be_const_str_OneWire, + (const bstring *)&be_const_str_classof, + (const bstring *)&be_const_str_json, + (const bstring *)&be_const_str_True, + (const bstring *)&be_const_str__X2B, + (const bstring *)&be_const_str_decompress, + (const bstring *)&be_const_str_CFG_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s, + (const bstring *)&be_const_str_lv_event, + (const bstring *)&be_const_str_counters, + (const bstring *)&be_const_str_pc, + (const bstring *)&be_const_str__X2Esize, + NULL, + (const bstring *)&be_const_str__X5B, + (const bstring *)&be_const_str__X3C_X2Fform_X3E_X3C_X2Fp_X3E, + (const bstring *)&be_const_str_connection_error, + (const bstring *)&be_const_str_classname, + (const bstring *)&be_const_str_AudioGeneratorWAV, + (const bstring *)&be_const_str_AudioGenerator, + (const bstring *)&be_const_str_Parameter_X20error, + (const bstring *)&be_const_str_get_tasmota, + (const bstring *)&be_const_str_loop, + (const bstring *)&be_const_str__timers, + (const bstring *)&be_const_str_constructor_cb, + (const bstring *)&be_const_str_addr, + (const bstring *)&be_const_str__X2E, + (const bstring *)&be_const_str_RES_OK, + NULL, + (const bstring *)&be_const_str_OPTION_A, + NULL, + (const bstring *)&be_const_str_collect, + (const bstring *)&be_const_str_SERIAL_6O2, + (const bstring *)&be_const_str_AudioFileSourceFS, + (const bstring *)&be_const_str_show, + (const bstring *)&be_const_str__cmd, + (const bstring *)&be_const_str_SERIAL_7N2, + (const bstring *)&be_const_str_dirty, + (const bstring *)&be_const_str_SERIAL_7E2, + (const bstring *)&be_const_str__X3E, + (const bstring *)&be_const_str__X2F_X3Frst_X3D, + (const bstring *)&be_const_str__X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, + (const bstring *)&be_const_str_EVENT_DRAW_PART_BEGIN, + (const bstring *)&be_const_str__persist_X2Ejson, + (const bstring *)&be_const_str_tasmota_X2Eset_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eset_X28_X29, + (const bstring *)&be_const_str__X3Clambda_X3E }; static const struct bconststrtab m_const_string_table = { - .size = 360, - .count = 743, + .size = 359, + .count = 741, .table = m_string_table }; diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_tasmota.h b/lib/libesp32/Berry/generate/be_fixed_be_class_tasmota.h index dc2abcca8..05c140fe0 100644 --- a/lib/libesp32/Berry/generate/be_fixed_be_class_tasmota.h +++ b/lib/libesp32/Berry/generate/be_fixed_be_class_tasmota.h @@ -1,96 +1,93 @@ #include "be_constobj.h" static be_define_const_map_slots(be_class_tasmota_map) { - { be_const_key(gc, -1), be_const_closure(Tasmota_gc_closure) }, - { be_const_key(read_sensors, 7), be_const_func(l_read_sensors) }, - { be_const_key(_get_cb, -1), be_const_func(l_get_cb) }, - { be_const_key(response_append, 50), be_const_func(l_respAppend) }, - { be_const_key(try_rule, 74), be_const_closure(Tasmota_try_rule_closure) }, - { be_const_key(eth, -1), be_const_func(l_eth) }, - { be_const_key(find_key_i, -1), be_const_closure(Tasmota_find_key_i_closure) }, - { be_const_key(exec_tele, 73), be_const_closure(Tasmota_exec_tele_closure) }, - { be_const_key(remove_driver, 28), be_const_closure(Tasmota_remove_driver_closure) }, - { be_const_key(load, -1), be_const_closure(Tasmota_load_closure) }, - { be_const_key(_settings_ptr, -1), be_const_comptr(&Settings) }, - { be_const_key(cmd_res, -1), be_const_var(0) }, - { be_const_key(time_str, 43), be_const_closure(Tasmota_time_str_closure) }, - { be_const_key(set_power, -1), be_const_func(l_setpower) }, - { be_const_key(yield, 20), be_const_func(l_yield) }, - { be_const_key(set_light, -1), be_const_closure(Tasmota_set_light_closure) }, - { be_const_key(find_op, 32), be_const_closure(Tasmota_find_op_closure) }, - { be_const_key(get_power, -1), be_const_func(l_getpower) }, - { be_const_key(add_rule, -1), be_const_closure(Tasmota_add_rule_closure) }, - { be_const_key(cb_dispatch, -1), be_const_closure(Tasmota_cb_dispatch_closure) }, - { be_const_key(global, -1), be_const_var(1) }, - { be_const_key(i2c_enabled, -1), be_const_func(l_i2cenabled) }, - { be_const_key(remove_cmd, 10), be_const_closure(Tasmota_remove_cmd_closure) }, - { be_const_key(millis, 18), be_const_func(l_millis) }, - { be_const_key(publish, 69), be_const_func(l_publish) }, - { be_const_key(_drivers, -1), be_const_var(2) }, - { be_const_key(resp_cmnd, -1), be_const_func(l_respCmnd) }, - { be_const_key(time_dump, -1), be_const_func(l_time_dump) }, - { be_const_key(web_send, -1), be_const_func(l_webSend) }, - { be_const_key(hs2rgb, -1), be_const_closure(Tasmota_hs2rgb_closure) }, - { be_const_key(memory, -1), be_const_func(l_memory) }, - { be_const_key(gen_cb, 0), be_const_closure(Tasmota_gen_cb_closure) }, - { be_const_key(rtc, -1), be_const_func(l_rtc) }, - { be_const_key(get_option, -1), be_const_func(l_getoption) }, - { be_const_key(add_cmd, -1), be_const_closure(Tasmota_add_cmd_closure) }, - { be_const_key(init, -1), be_const_closure(Tasmota_init_closure) }, - { be_const_key(_timers, -1), be_const_var(3) }, - { be_const_key(_global_addr, -1), be_const_comptr(&TasmotaGlobal) }, - { be_const_key(wd, -1), be_const_var(4) }, - { be_const_key(exec_cmd, -1), be_const_closure(Tasmota_exec_cmd_closure) }, - { be_const_key(wire_scan, -1), be_const_closure(Tasmota_wire_scan_closure) }, - { be_const_key(_global_def, 61), be_const_comptr(&be_tasmota_global_struct) }, - { be_const_key(resp_cmnd_failed, 11), be_const_func(l_respCmndFailed) }, - { be_const_key(chars_in_string, -1), be_const_closure(Tasmota_chars_in_string_closure) }, - { be_const_key(web_send_decimal, -1), be_const_func(l_webSendDecimal) }, - { be_const_key(_debug_present, 4), be_const_var(5) }, - { be_const_key(cmd, -1), be_const_closure(Tasmota_cmd_closure) }, - { be_const_key(_cb, -1), be_const_var(6) }, - { be_const_key(remove_rule, -1), be_const_closure(Tasmota_remove_rule_closure) }, { be_const_key(run_deferred, -1), be_const_closure(Tasmota_run_deferred_closure) }, - { be_const_key(strftime, -1), be_const_func(l_strftime) }, - { be_const_key(add_driver, 3), be_const_closure(Tasmota_add_driver_closure) }, - { be_const_key(kv, 60), be_const_closure(Tasmota_kv_closure) }, - { be_const_key(set_timer, 58), be_const_closure(Tasmota_set_timer_closure) }, - { be_const_key(scale_uint, -1), be_const_func(l_scaleuint) }, - { be_const_key(remove_timer, -1), be_const_closure(Tasmota_remove_timer_closure) }, - { be_const_key(settings, 49), be_const_var(7) }, - { be_const_key(arch, -1), be_const_func(l_arch) }, - { be_const_key(_ccmd, 64), be_const_var(8) }, - { be_const_key(wire1, 46), be_const_var(9) }, - { be_const_key(exec_rules, 66), be_const_closure(Tasmota_exec_rules_closure) }, - { be_const_key(strptime, -1), be_const_func(l_strptime) }, - { be_const_key(_cmd, -1), be_const_func(l_cmd) }, - { be_const_key(resp_cmnd_error, -1), be_const_func(l_respCmndError) }, - { be_const_key(time_reached, -1), be_const_func(l_timereached) }, - { be_const_key(_rules, -1), be_const_var(10) }, - { be_const_key(publish_result, -1), be_const_func(l_publish_result) }, - { be_const_key(_settings_def, -1), be_const_comptr(&be_tasmota_settings_struct) }, - { be_const_key(get_switch, -1), be_const_func(l_getswitch) }, - { be_const_key(delay, 71), be_const_func(l_delay) }, + { be_const_key(publish, -1), be_const_func(l_publish) }, + { be_const_key(try_rule, 5), be_const_closure(Tasmota_try_rule_closure) }, + { be_const_key(_settings_ptr, -1), be_const_comptr(&Settings) }, + { be_const_key(get_free_heap, 47), be_const_func(l_getFreeHeap) }, + { be_const_key(eth, 56), be_const_func(l_eth) }, + { be_const_key(set_power, -1), be_const_func(l_setpower) }, + { be_const_key(exec_rules, -1), be_const_closure(Tasmota_exec_rules_closure) }, + { be_const_key(i2c_enabled, -1), be_const_func(l_i2cenabled) }, + { be_const_key(chars_in_string, 55), be_const_closure(Tasmota_chars_in_string_closure) }, + { be_const_key(hs2rgb, -1), be_const_closure(Tasmota_hs2rgb_closure) }, + { be_const_key(time_str, 0), be_const_closure(Tasmota_time_str_closure) }, + { be_const_key(set_light, -1), be_const_closure(Tasmota_set_light_closure) }, + { be_const_key(response_append, 1), be_const_func(l_respAppend) }, + { be_const_key(gen_cb, -1), be_const_closure(Tasmota_gen_cb_closure) }, + { be_const_key(remove_driver, 50), be_const_closure(Tasmota_remove_driver_closure) }, + { be_const_key(event, -1), be_const_closure(Tasmota_event_closure) }, + { be_const_key(exec_cmd, 2), be_const_closure(Tasmota_exec_cmd_closure) }, + { be_const_key(rtc, 12), be_const_func(l_rtc) }, + { be_const_key(read_sensors, -1), be_const_func(l_read_sensors) }, { be_const_key(resp_cmnd_str, -1), be_const_func(l_respCmndStr) }, - { be_const_key(wifi, -1), be_const_func(l_wifi) }, - { be_const_key(save, 15), be_const_func(l_save) }, - { be_const_key(log, 37), be_const_func(l_logInfo) }, + { be_const_key(set_timer, -1), be_const_closure(Tasmota_set_timer_closure) }, + { be_const_key(resp_cmnd_error, -1), be_const_func(l_respCmndError) }, + { be_const_key(exec_tele, -1), be_const_closure(Tasmota_exec_tele_closure) }, + { be_const_key(_global_def, -1), be_const_comptr(&be_tasmota_global_struct) }, + { be_const_key(cmd_res, -1), be_const_var(0) }, + { be_const_key(_global_addr, -1), be_const_comptr(&TasmotaGlobal) }, + { be_const_key(add_driver, 14), be_const_closure(Tasmota_add_driver_closure) }, + { be_const_key(_timers, -1), be_const_var(1) }, + { be_const_key(add_rule, -1), be_const_closure(Tasmota_add_rule_closure) }, + { be_const_key(resp_cmnd_failed, -1), be_const_func(l_respCmndFailed) }, + { be_const_key(remove_rule, 9), be_const_closure(Tasmota_remove_rule_closure) }, + { be_const_key(web_send, 16), be_const_func(l_webSend) }, + { be_const_key(resp_cmnd, -1), be_const_func(l_respCmnd) }, + { be_const_key(remove_timer, 10), be_const_closure(Tasmota_remove_timer_closure) }, + { be_const_key(memory, 52), be_const_func(l_memory) }, + { be_const_key(global, 71), be_const_var(2) }, + { be_const_key(find_op, -1), be_const_closure(Tasmota_find_op_closure) }, + { be_const_key(yield, 60), be_const_func(l_yield) }, { be_const_key(resolvecmnd, -1), be_const_func(l_resolveCmnd) }, - { be_const_key(resp_cmnd_done, -1), be_const_func(l_respCmndDone) }, - { be_const_key(get_light, 5), be_const_closure(Tasmota_get_light_closure) }, - { be_const_key(get_free_heap, -1), be_const_func(l_getFreeHeap) }, - { be_const_key(wire2, -1), be_const_var(11) }, - { be_const_key(event, 34), be_const_closure(Tasmota_event_closure) }, + { be_const_key(get_option, -1), be_const_func(l_getoption) }, + { be_const_key(kv, 43), be_const_closure(Tasmota_kv_closure) }, + { be_const_key(wire_scan, -1), be_const_closure(Tasmota_wire_scan_closure) }, + { be_const_key(wifi, 37), be_const_func(l_wifi) }, + { be_const_key(_cmd, -1), be_const_func(l_cmd) }, + { be_const_key(gc, -1), be_const_closure(Tasmota_gc_closure) }, + { be_const_key(get_power, -1), be_const_func(l_getpower) }, + { be_const_key(get_light, -1), be_const_closure(Tasmota_get_light_closure) }, + { be_const_key(time_dump, -1), be_const_func(l_time_dump) }, + { be_const_key(settings, -1), be_const_var(3) }, + { be_const_key(cmd, 62), be_const_closure(Tasmota_cmd_closure) }, + { be_const_key(load, -1), be_const_closure(Tasmota_load_closure) }, + { be_const_key(strptime, -1), be_const_func(l_strptime) }, + { be_const_key(_ccmd, -1), be_const_var(4) }, + { be_const_key(find_key_i, 25), be_const_closure(Tasmota_find_key_i_closure) }, + { be_const_key(delay, -1), be_const_func(l_delay) }, + { be_const_key(time_reached, -1), be_const_func(l_timereached) }, + { be_const_key(_settings_def, -1), be_const_comptr(&be_tasmota_settings_struct) }, + { be_const_key(save, 36), be_const_func(l_save) }, + { be_const_key(millis, -1), be_const_func(l_millis) }, + { be_const_key(wire2, -1), be_const_var(5) }, + { be_const_key(wire1, 72), be_const_var(6) }, + { be_const_key(web_send_decimal, -1), be_const_func(l_webSendDecimal) }, + { be_const_key(scale_uint, 51), be_const_func(l_scaleuint) }, + { be_const_key(get_switch, -1), be_const_func(l_getswitch) }, + { be_const_key(_debug_present, -1), be_const_var(7) }, + { be_const_key(publish_result, -1), be_const_func(l_publish_result) }, + { be_const_key(_drivers, -1), be_const_var(8) }, + { be_const_key(add_cmd, -1), be_const_closure(Tasmota_add_cmd_closure) }, + { be_const_key(strftime, -1), be_const_func(l_strftime) }, + { be_const_key(log, -1), be_const_func(l_logInfo) }, + { be_const_key(arch, -1), be_const_func(l_arch) }, + { be_const_key(resp_cmnd_done, 74), be_const_func(l_respCmndDone) }, + { be_const_key(_rules, 38), be_const_var(9) }, + { be_const_key(remove_cmd, -1), be_const_closure(Tasmota_remove_cmd_closure) }, + { be_const_key(init, -1), be_const_closure(Tasmota_init_closure) }, + { be_const_key(wd, 53), be_const_var(10) }, }; static be_define_const_map( be_class_tasmota_map, - 80 + 77 ); BE_EXPORT_VARIABLE be_define_const_class( be_class_tasmota, - 12, + 11, NULL, Tasmota ); diff --git a/lib/libesp32/Berry/generate/be_fixed_cb.h b/lib/libesp32/Berry/generate/be_fixed_cb.h new file mode 100644 index 000000000..ef458f363 --- /dev/null +++ b/lib/libesp32/Berry/generate/be_fixed_cb.h @@ -0,0 +1,18 @@ +#include "be_constobj.h" + +static be_define_const_map_slots(m_libcb_map) { + { be_const_key(get_cb_list, -1), be_const_func(be_cb_get_cb_list) }, + { be_const_key(gen_cb, -1), be_const_func(be_cb_gen_cb) }, +}; + +static be_define_const_map( + m_libcb_map, + 2 +); + +static be_define_const_module( + m_libcb, + "cb" +); + +BE_EXPORT_VARIABLE be_define_const_native_module(cb); diff --git a/lib/libesp32/Berry/src/be_exec.c b/lib/libesp32/Berry/src/be_exec.c index 7b741e4ff..14dbe903c 100644 --- a/lib/libesp32/Berry/src/be_exec.c +++ b/lib/libesp32/Berry/src/be_exec.c @@ -393,10 +393,7 @@ void be_stack_expansion(bvm *vm, int n) stack_resize(vm, size + 1); be_raise(vm, "runtime_error", STACK_OVER_MSG(BE_STACK_TOTAL_MAX)); } -#if BE_USE_OBSERVABILITY_HOOK - if (vm->obshook != NULL) - (*vm->obshook)(vm, BE_OBS_STACK_RESIZE_START, size * sizeof(bvalue), (size + n) * sizeof(bvalue)); -#endif + if (vm->obshook != NULL) (*vm->obshook)(vm, BE_OBS_STACK_RESIZE_START, size * sizeof(bvalue), (size + n) * sizeof(bvalue)); stack_resize(vm, size + n); } diff --git a/lib/libesp32/Berry/src/be_gc.c b/lib/libesp32/Berry/src/be_gc.c index b3cf7ab98..8d19affb1 100644 --- a/lib/libesp32/Berry/src/be_gc.c +++ b/lib/libesp32/Berry/src/be_gc.c @@ -544,10 +544,7 @@ void be_gc_collect(bvm *vm) vm->counter_gc_kept = 0; vm->counter_gc_freed = 0; #endif -#if BE_USE_OBSERVABILITY_HOOK - if (vm->obshook != NULL) - (*vm->obshook)(vm, BE_OBS_GC_START, vm->gc.usage); -#endif + if (vm->obshook != NULL) (*vm->obshook)(vm, BE_OBS_GC_START, vm->gc.usage); /* step 1: set root-set reference objects to unscanned */ premark_internal(vm); /* object internal the VM */ premark_global(vm); /* global objects */ @@ -564,8 +561,5 @@ void be_gc_collect(bvm *vm) reset_fixedlist(vm); /* step 5: calculate the next GC threshold */ vm->gc.threshold = next_threshold(vm->gc); -#if BE_USE_OBSERVABILITY_HOOK - if (vm->obshook != NULL) - (*vm->obshook)(vm, BE_OBS_GC_END, vm->gc.usage, vm->counter_gc_kept, vm->counter_gc_freed); -#endif + if (vm->obshook != NULL) (*vm->obshook)(vm, BE_OBS_GC_END, vm->gc.usage, vm->counter_gc_kept, vm->counter_gc_freed); } diff --git a/lib/libesp32/Berry/src/be_vm.c b/lib/libesp32/Berry/src/be_vm.c index 26c15a1a3..96329e898 100644 --- a/lib/libesp32/Berry/src/be_vm.c +++ b/lib/libesp32/Berry/src/be_vm.c @@ -55,7 +55,7 @@ #define COUNTER_HOOK() #endif -#if BE_USE_PERF_COUNTERS && BE_USE_OBSERVABILITY_HOOK +#if BE_USE_PERF_COUNTERS #define VM_HEARTBEAT() \ if ((vm->counter_ins & ((1<<(BE_VM_OBSERVABILITY_SAMPLING - 1))-1) ) == 0) { /* call every 2^BE_VM_OBSERVABILITY_SAMPLING instructions */ \ if (vm->obshook != NULL) \ @@ -461,9 +461,7 @@ BERRY_API bvm* be_vm_new(void) be_gc_setpause(vm, 1); be_loadlibs(vm); vm->compopt = 0; -#if BE_USE_OBSERVABILITY_HOOK vm->obshook = NULL; -#endif #if BE_USE_PERF_COUNTERS vm->counter_ins = 0; vm->counter_enter = 0; @@ -1269,7 +1267,5 @@ BERRY_API void be_set_obs_hook(bvm *vm, bobshook hook) (void)vm; /* avoid comiler warning */ (void)hook; /* avoid comiler warning */ -#if BE_USE_OBSERVABILITY_HOOK vm->obshook = hook; -#endif } diff --git a/lib/libesp32/Berry/src/be_vm.h b/lib/libesp32/Berry/src/be_vm.h index 4d98c590f..19d745a7c 100644 --- a/lib/libesp32/Berry/src/be_vm.h +++ b/lib/libesp32/Berry/src/be_vm.h @@ -101,9 +101,7 @@ struct bvm { blist *registry; /* registry list */ struct bgc gc; bbyte compopt; /* compilation options */ -#if BE_USE_OBSERVABILITY_HOOK bobshook obshook; -#endif #if BE_USE_PERF_COUNTERS uint32_t counter_ins; /* instructions counter */ uint32_t counter_enter; /* counter for times the VM was entered */ diff --git a/lib/libesp32/Berry/src/berry.h b/lib/libesp32/Berry/src/berry.h index e69a3bbe8..68f1efd4d 100644 --- a/lib/libesp32/Berry/src/berry.h +++ b/lib/libesp32/Berry/src/berry.h @@ -402,6 +402,7 @@ typedef void(*bntvhook)(bvm *vm, bhookinfo *info); typedef void(*bobshook)(bvm *vm, int event, ...); enum beobshookevents { + BE_OBS_PCALL_ERROR, /* called when be_callp() returned an error, most likely an exception */ BE_OBS_GC_START, /* start of GC, arg = allocated size */ BE_OBS_GC_END, /* end of GC, arg = allocated size */ BE_OBS_VM_HEARTBEAT, /* VM heartbeat called every million instructions */ diff --git a/lib/libesp32/berry_mapping/library.json b/lib/libesp32/berry_mapping/library.json new file mode 100644 index 000000000..6bcf119fa --- /dev/null +++ b/lib/libesp32/berry_mapping/library.json @@ -0,0 +1,17 @@ +{ + "name": "Berry mapping to C", + "version": "1.0", + "description": "Mapping to C functions", + "license": "MIT", + "homepage": "https://github.com/arendst/Tasmota", + "frameworks": "*", + "platforms": "*", + "authors": + { + "name": "Stephan Hadinger", + "maintainer": true + }, + "build": { + "flags": [ "-I$PROJECT_DIR/include" ] + } + } \ No newline at end of file diff --git a/lib/libesp32/berry_mapping/src/be_cb_module.c b/lib/libesp32/berry_mapping/src/be_cb_module.c new file mode 100644 index 000000000..191fe240d --- /dev/null +++ b/lib/libesp32/berry_mapping/src/be_cb_module.c @@ -0,0 +1,171 @@ +/******************************************************************** + * Callback module + * + * To use: `import cb` + * + *******************************************************************/ +#include "be_constobj.h" + +#include "be_mapping.h" +#include "be_gc.h" +#include "be_exec.h" +#include "be_vm.h" + +/*********************************************************************************************\ + * Callback structures + * + * We allow 4 parameters, or 3 if method (first arg is `self`) + * This could be extended if needed +\*********************************************************************************************/ +typedef int32_t (*berry_callback_t)(int32_t v0, int32_t v1, int32_t v2, int32_t v3); +static int32_t call_berry_cb(int32_t num, int32_t v0, int32_t v1, int32_t v2, int32_t v3); + +#define BERRY_CB(n) int32_t berry_cb_##n(int32_t v0, int32_t v1, int32_t v2, int32_t v3) { return call_berry_cb(n, v0, v1, v2, v3); } +// list the callbacks +BERRY_CB(0); +BERRY_CB(1); +BERRY_CB(2); +BERRY_CB(3); +BERRY_CB(4); +BERRY_CB(5); +BERRY_CB(6); +BERRY_CB(7); +BERRY_CB(8); +BERRY_CB(9); +BERRY_CB(10); +BERRY_CB(11); +BERRY_CB(12); +BERRY_CB(13); +BERRY_CB(14); +BERRY_CB(15); +BERRY_CB(16); +BERRY_CB(17); +BERRY_CB(18); +BERRY_CB(19); + +// array of callbacks +static const berry_callback_t berry_callback_array[BE_MAX_CB] = { + berry_cb_0, + berry_cb_1, + berry_cb_2, + berry_cb_3, + berry_cb_4, + berry_cb_5, + berry_cb_6, + berry_cb_7, + berry_cb_8, + berry_cb_9, + berry_cb_10, + berry_cb_11, + berry_cb_12, + berry_cb_13, + berry_cb_14, + berry_cb_15, + berry_cb_16, + berry_cb_17, + berry_cb_18, + berry_cb_19, +}; + +typedef struct be_callback_hook { + bvm *vm; + bgcobject *f; +} be_callback_hook; + +static be_callback_hook be_cb_hooks[BE_MAX_CB] = {0}; + +/*********************************************************************************************\ + * `gen_cb`: Generate a new callback + * + * arg1: function (or closure) +\*********************************************************************************************/ +static int32_t be_cb_gen_cb(bvm *vm) { + int32_t top = be_top(vm); + if (top >= 1 && be_isfunction(vm, 1)) { + // find first available slot + int32_t slot; + for (slot = 0; slot < BE_MAX_CB; slot++) { + if (be_cb_hooks[slot].f == NULL) break; + } + bvalue *v = be_indexof(vm, 1); + if (slot < BE_MAX_CB) { + // found a free slot + bgcobject * f = v->v.gc; + // mark the function as non-gc + be_gc_fix_set(vm, f, btrue); + // record pointers + be_cb_hooks[slot].vm = vm; + be_cb_hooks[slot].f = f; + be_pushcomptr(vm, (void*) berry_callback_array[slot]); + be_return(vm); + } else { + be_raise(vm, "internal_error", "no more callbacks available, increase BE_MAX_CB"); + } + } + be_raise(vm, "value_error", "arg must be a function"); +} + +/*********************************************************************************************\ + * `get_cb_list`: Return the list of callbacks for this vm + * +\*********************************************************************************************/ +static int32_t be_cb_get_cb_list(bvm *vm) { + be_newobject(vm, "list"); + int32_t i; + for (uint32_t i=0; i < BE_MAX_CB; i++) { + if (be_cb_hooks[i].vm) { + if (vm == be_cb_hooks[i].vm) { // make sure it corresponds to this vm + be_pushcomptr(vm, be_cb_hooks[i].f); + be_data_push(vm, -2); + be_pop(vm, 1); + } + } else { + break; + } + } + be_pop(vm, 1); + be_return(vm); +} + +/*********************************************************************************************\ + * Callback structures + * + * We allow 4 parameters, or 3 if method (first arg is `self`) + * This could be extended if needed +\*********************************************************************************************/ +static int32_t call_berry_cb(int32_t num, int32_t v0, int32_t v1, int32_t v2, int32_t v3) { + // call berry cb dispatcher + int32_t ret = 0; + // retrieve vm and function + if (num < 0 || num >= BE_MAX_CB || be_cb_hooks[num].vm == NULL) return 0; // invalid call, avoid a crash + + bvm * vm = be_cb_hooks[num].vm; + bgcobject * f = be_cb_hooks[num].f; + + // push function (don't check type) + bvalue *top = be_incrtop(vm); + var_setobj(top, f->type, f); + // push args + be_pushint(vm, v0); + be_pushint(vm, v1); + be_pushint(vm, v2); + be_pushint(vm, v3); + + ret = be_pcall(vm, 4); // 4 arguments + if (ret != 0) { + if (vm->obshook != NULL) (*vm->obshook)(vm, BE_OBS_PCALL_ERROR); + be_pop(vm, be_top(vm)); // clear Berry stack + return 0; + } + ret = be_toint(vm, -5); + be_pop(vm, 5); // remove result + return ret; +} + +/* @const_object_info_begin +module cb (scope: global) { + gen_cb, func(be_cb_gen_cb) + get_cb_list, func(be_cb_get_cb_list) +} +@const_object_info_end */ +#include "../../Berry/generate/be_fixed_cb.h" diff --git a/lib/libesp32/berry_mapping/src/be_mapping.h b/lib/libesp32/berry_mapping/src/be_mapping.h new file mode 100644 index 000000000..850cd08c0 --- /dev/null +++ b/lib/libesp32/berry_mapping/src/be_mapping.h @@ -0,0 +1,10 @@ + + +#ifndef __BE_MAPPING__ +#define __BE_MAPPING__ + +// include this header to force compilation fo this module + +#define BE_MAX_CB 20 // max number of callbacks, each callback requires a distinct address + +#endif // __BE_MAPPING__ diff --git a/tasmota/xdrv_52_0_berry_struct.ino b/tasmota/xdrv_52_0_berry_struct.ino index fe09b3c84..760358ab0 100644 --- a/tasmota/xdrv_52_0_berry_struct.ino +++ b/tasmota/xdrv_52_0_berry_struct.ino @@ -23,6 +23,7 @@ #include #include +#include "be_mapping.h" #include "re1.5.h" /*********************************************************************************************\ diff --git a/tasmota/xdrv_52_1_berry_native.ino b/tasmota/xdrv_52_1_berry_native.ino index 970d26c48..98757b730 100644 --- a/tasmota/xdrv_52_1_berry_native.ino +++ b/tasmota/xdrv_52_1_berry_native.ino @@ -45,8 +45,11 @@ extern "C" { * Responds to virtual constants \*********************************************************************************************/ extern "C" { - // Clear all elements on the stack - void be_pop_all(bvm *vm) { + #include "be_vm.h" + // Call error handler and pop all from stack + void be_error_pop_all(bvm *vm); + void be_error_pop_all(bvm *vm) { + if (vm->obshook != NULL) (*vm->obshook)(vm, BE_OBS_PCALL_ERROR); be_pop(vm, be_top(vm)); // clear Berry stack } @@ -267,113 +270,6 @@ extern "C" { * Warning, the following expect all parameters to be 32 bits wide \*********************************************************************************************/ -extern "C" { - - /*********************************************************************************************\ - * Callback structures - * - * We allow 4 parameters, or 3 if method (first arg is `self`) - * This could be extended if needed - \*********************************************************************************************/ - typedef int32_t (*berry_callback_t)(int32_t v0, int32_t v1, int32_t v2, int32_t v3); - - extern void BerryDumpErrorAndClear(bvm *vm, bool berry_console); - - /*********************************************************************************************\ - * Callback structures - * - * We allow 4 parameters, or 3 if method (first arg is `self`) - * This could be extended if needed - \*********************************************************************************************/ - int32_t call_berry_cb(int32_t num, int32_t v0, int32_t v1, int32_t v2, int32_t v3) { - // call berry cb dispatcher - int32_t ret = 0; - // get the 'tasmota' object (global) and call 'cb_dispatch' - be_getglobal(berry.vm, PSTR("tasmota")); - if (!be_isnil(berry.vm, -1)) { - be_getmethod(berry.vm, -1, PSTR("cb_dispatch")); - - if (!be_isnil(berry.vm, -1)) { - be_pushvalue(berry.vm, -2); // add instance as first arg - // push all args as ints (may be revised) - be_pushint(berry.vm, num); - be_pushint(berry.vm, v0); - be_pushint(berry.vm, v1); - be_pushint(berry.vm, v2); - be_pushint(berry.vm, v3); - - ret = be_pcall(berry.vm, 6); // 5 arguments - if (ret != 0) { - BerryDumpErrorAndClear(berry.vm, false); // log in Tasmota console only - be_pop_all(berry.vm); // clear Berry stack - return 0; - } - be_pop(berry.vm, 6); - - if (be_isint(berry.vm, -1) || be_isnil(berry.vm, -1)) { // sanity check - if (be_isint(berry.vm, -1)) { - ret = be_toint(berry.vm, -1); - } - // All good, we can proceed - be_pop(berry.vm, 2); // remove tasmota instance and result - return ret; - } - } - be_pop(berry.vm, 1); - } - be_pop(berry.vm, 1); - AddLog(LOG_LEVEL_ERROR, PSTR(D_LOG_BERRY "can't call 'tasmota.cb_dispatch'")); - return 0; - } - - #define BERRY_CB(n) int32_t berry_cb_##n(int32_t v0, int32_t v1, int32_t v2, int32_t v3) { return call_berry_cb(n, v0, v1, v2, v3); } - // list the callbacks - BERRY_CB(0); - BERRY_CB(1); - BERRY_CB(2); - BERRY_CB(3); - BERRY_CB(4); - BERRY_CB(5); - BERRY_CB(6); - BERRY_CB(7); - BERRY_CB(8); - BERRY_CB(9); - BERRY_CB(10); - BERRY_CB(11); - BERRY_CB(12); - BERRY_CB(13); - BERRY_CB(14); - BERRY_CB(15); - BERRY_CB(16); - BERRY_CB(17); - BERRY_CB(18); - BERRY_CB(19); - - // array of callbacks - berry_callback_t berry_callback_array[] { - berry_cb_0, - berry_cb_1, - berry_cb_2, - berry_cb_3, - berry_cb_4, - berry_cb_5, - berry_cb_6, - berry_cb_7, - berry_cb_8, - berry_cb_9, - berry_cb_10, - berry_cb_11, - berry_cb_12, - berry_cb_13, - berry_cb_14, - berry_cb_15, - berry_cb_16, - berry_cb_17, - berry_cb_18, - berry_cb_19, - }; -} - /*********************************************************************************************\ * Automatically parse Berry stack and call the C function accordingly * diff --git a/tasmota/xdrv_52_3_berry_tasmota.ino b/tasmota/xdrv_52_3_berry_tasmota.ino index cfc847e7a..a9d0ad734 100644 --- a/tasmota/xdrv_52_3_berry_tasmota.ino +++ b/tasmota/xdrv_52_3_berry_tasmota.ino @@ -26,25 +26,25 @@ const uint32_t BERRY_MAX_LOGS = 16; // max number of print output recorded when outside of REPL, used to avoid infinite grow of logs const uint32_t BERRY_MAX_REPL_LOGS = 1024; // max number of print output recorded when inside REPL -/*********************************************************************************************\ - * Return C callback from index - * -\*********************************************************************************************/ -extern "C" { - int32_t l_get_cb(struct bvm *vm); - int32_t l_get_cb(struct bvm *vm) { - int32_t argc = be_top(vm); // Get the number of arguments - if (argc >= 2 && be_isint(vm, 2)) { - int32_t idx = be_toint(vm, 2); - if (idx >= 0 && idx < ARRAY_SIZE(berry_callback_array)) { - const berry_callback_t c_ptr = berry_callback_array[idx]; - be_pushcomptr(vm, (void*) c_ptr); - be_return(vm); - } - } - be_raise(vm, kTypeError, nullptr); - } -} +// /*********************************************************************************************\ +// * Return C callback from index +// * +// \*********************************************************************************************/ +// extern "C" { +// extern int32_t be_cb__get_cb(struct bvm *vm); +// int32_t be_cb__get_cb(struct bvm *vm) { +// int32_t argc = be_top(vm); // Get the number of arguments +// if (argc >= 2 && be_isint(vm, 2)) { +// int32_t idx = be_toint(vm, 2); +// if (idx >= 0 && idx < ARRAY_SIZE(berry_callback_array)) { +// const berry_callback_t c_ptr = berry_callback_array[idx]; +// be_pushcomptr(vm, (void*) c_ptr); +// be_return(vm); +// } +// } +// be_raise(vm, kTypeError, nullptr); +// } +// } /*********************************************************************************************\ * Native functions mapped to Berry functions diff --git a/tasmota/xdrv_52_9_berry.ino b/tasmota/xdrv_52_9_berry.ino index 84a4f698c..b48281fde 100644 --- a/tasmota/xdrv_52_9_berry.ino +++ b/tasmota/xdrv_52_9_berry.ino @@ -110,24 +110,6 @@ size_t callBerryGC(void) { return callBerryEventDispatcher(PSTR("gc"), nullptr, 0, nullptr); } -void BerryDumpErrorAndClear(bvm *vm, bool berry_console); -void BerryDumpErrorAndClear(bvm *vm, bool berry_console) { - int32_t top = be_top(vm); - // check if we have two strings for an Exception - if (top >= 2 && be_isstring(vm, -1) && be_isstring(vm, -2)) { - if (berry_console) { - berry_log_C(PSTR(D_LOG_BERRY "Exception> '%s' - %s"), be_tostring(berry.vm, -2), be_tostring(berry.vm, -1)); - be_tracestack(vm); - top = be_top(vm); // update top after dump - } else { - AddLog(LOG_LEVEL_ERROR, PSTR(D_LOG_BERRY "Exception> '%s' - %s"), be_tostring(berry.vm, -2), be_tostring(berry.vm, -1)); - be_tracestack(vm); - } - } else { - be_dumpstack(vm); - } -} - // void callBerryMqttData(void) { // AddLog(LOG_LEVEL_INFO, D_LOG_BERRY "callBerryMqttData"); // if (nullptr == berry.vm) { return; } @@ -150,53 +132,6 @@ void BerryDumpErrorAndClear(bvm *vm, bool berry_console) { // checkBeTop(); // } -/* -// Call a method of a global object, with n args -// Before: stack must containt n args -// After: stack contains return value or nil if something wrong (args removes) -// returns true is successful, false if object or method not found -bool callMethodObjectWithArgs(const char * objname, const char * method, size_t argc) { - if (nullptr == berry.vm) { return false; } - int32_t top = be_top(berry.vm); - // stacks contains n x arg - be_getglobal(berry.vm, objname); - // stacks contains n x arg + object - if (!be_isnil(berry.vm, -1)) { - be_getmethod(berry.vm, -1, method); - // stacks contains n x arg + object + method - if (!be_isnil(berry.vm, -1)) { - // reshuffle the entire stack since we want: method + object + n x arg - be_pushvalue(berry.vm, -1); // add instance as first arg - // stacks contains n x arg + object + method + method - be_pushvalue(berry.vm, -3); // add instance as first arg - // stacks contains n x arg + object + method + method + object - // now move args 2 slots up to make room for method and object - for (uint32_t i = 1; i <= argc; i++) { - be_moveto(berry.vm, -4 - i, -2 - i); - } - // stacks contains free + free + n x arg + method + object - be_moveto(berry.vm, -2, -4 - argc); - be_moveto(berry.vm, -1, -3 - argc); - // stacks contains method + object + n x arg + method + object - be_pop(berry.vm, 2); - // stacks contains method + object + n x arg - be_pcall(berry.vm, argc + 1); - // stacks contains return_val + object + n x arg - be_pop(berry.vm, argc + 1); - // stacks contains return_val - return true; - } - be_pop(berry.vm, 1); // remove method - // stacks contains n x arg + object - } - // stacks contains n x arg + object - be_pop(berry.vm, argc + 1); // clear stack - be_pushnil(berry.vm); // put nil object - return false; -} -*/ - - // call the event dispatcher from Tasmota object // if data_len is non-zero, the event is also sent as raw `bytes()` object because the string may lose data int32_t callBerryEventDispatcher(const char *type, const char *cmd, int32_t idx, const char *payload, uint32_t data_len) { @@ -224,8 +159,7 @@ int32_t callBerryEventDispatcher(const char *type, const char *cmd, int32_t idx, } BrTimeoutReset(); if (ret != 0) { - BerryDumpErrorAndClear(vm, false); // log in Tasmota console only - be_pop_all(berry.vm); // clear Berry stack + be_error_pop_all(berry.vm); // clear Berry stack return ret; } be_pop(vm, 5); @@ -252,6 +186,17 @@ void BerryObservability(bvm *vm, int event...) { static uint32_t gc_time = 0; switch (event) { + case BE_OBS_PCALL_ERROR: // error after be_pcall + { + int32_t top = be_top(vm); + // check if we have two strings for an Exception + if (top >= 2 && be_isstring(vm, -1) && be_isstring(vm, -2)) { + berry_log_C(PSTR(D_LOG_BERRY "Exception> '%s' - %s"), be_tostring(berry.vm, -2), be_tostring(berry.vm, -1)); + be_tracestack(vm); + } else { + be_dumpstack(vm); + } + } case BE_OBS_GC_START: { gc_time = millis(); @@ -331,21 +276,18 @@ void BerryInit(void) { ret_code1 = be_loadstring(berry.vm, berry_prog); if (ret_code1 != 0) { - BerryDumpErrorAndClear(berry.vm, false); - be_pop_all(berry.vm); // clear Berry stack + be_error_pop_all(berry.vm); // clear Berry stack break; } // AddLog(LOG_LEVEL_DEBUG, PSTR(D_LOG_BERRY "Berry code loaded, RAM used=%u"), be_gc_memcount(berry.vm)); ret_code2 = be_pcall(berry.vm, 0); if (ret_code1 != 0) { - BerryDumpErrorAndClear(berry.vm, false); - be_pop_all(berry.vm); // clear Berry stack + be_error_pop_all(berry.vm); // clear Berry stack break; } // AddLog(LOG_LEVEL_DEBUG, PSTR(D_LOG_BERRY "Berry code ran, RAM used=%u"), be_gc_memcount(berry.vm)); if (be_top(berry.vm) > 1) { - BerryDumpErrorAndClear(berry.vm, false); - be_pop_all(berry.vm); // clear Berry stack + be_error_pop_all(berry.vm); // clear Berry stack } else { be_pop(berry.vm, 1); } @@ -389,8 +331,7 @@ void BrLoad(const char * script_name) { BrTimeoutStart(); if (be_pcall(berry.vm, 1) != 0) { - BerryDumpErrorAndClear(berry.vm, false); - be_pop_all(berry.vm); // clear Berry stack + be_error_pop_all(berry.vm); // clear Berry stack return; } BrTimeoutReset(); @@ -495,8 +436,7 @@ void BrREPLRun(char * cmd) { } } if (BE_EXCEPTION == ret_code) { - BerryDumpErrorAndClear(berry.vm, true); - be_pop_all(berry.vm); // clear Berry stack + be_error_pop_all(berry.vm); // clear Berry stack // be_dumpstack(berry.vm); // char exception_s[120]; // ext_snprintf_P(exception_s, sizeof(exception_s), PSTR("%s: %s"), be_tostring(berry.vm, -2), be_tostring(berry.vm, -1)); From 47deea04cec5d85093c3b68310bacccaa6e82357 Mon Sep 17 00:00:00 2001 From: Stephan Hadinger Date: Sun, 12 Dec 2021 19:58:14 +0100 Subject: [PATCH 025/402] Berry fix exceptions --- lib/libesp32/Berry/src/be_vm.c | 6 ++++++ lib/libesp32/Berry/tests/exceptions.be | 7 +++++++ 2 files changed, 13 insertions(+) create mode 100644 lib/libesp32/Berry/tests/exceptions.be diff --git a/lib/libesp32/Berry/src/be_vm.c b/lib/libesp32/Berry/src/be_vm.c index 26c15a1a3..25fd2ff2e 100644 --- a/lib/libesp32/Berry/src/be_vm.c +++ b/lib/libesp32/Berry/src/be_vm.c @@ -1062,7 +1062,13 @@ newframe: /* a new call frame */ if (!IGET_RA(ins)) { be_except_block_setup(vm); if (be_setjmp(vm->errjmp->b)) { + bvalue *top = vm->top; + bvalue e1 = top[0]; + bvalue e2 = top[1]; be_except_block_resume(vm); + top = vm->top; + top[0] = e1; + top[1] = e2; goto newframe; } reg = vm->reg; diff --git a/lib/libesp32/Berry/tests/exceptions.be b/lib/libesp32/Berry/tests/exceptions.be new file mode 100644 index 000000000..dc2ad54e4 --- /dev/null +++ b/lib/libesp32/Berry/tests/exceptions.be @@ -0,0 +1,7 @@ + +try + for k: 0..1 assert({'a':1}.contains('b'), 'failure') end +except .. as e,m + assert(e == "assert_failed") + assert(m == "failure") +end From b2024abaac6d15b4c3e58d000e42314dfc541b68 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 12 Dec 2021 23:34:56 +0100 Subject: [PATCH 026/402] safe guard using branch --- .github/workflows/Tasmota_build_devel.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/Tasmota_build_devel.yml b/.github/workflows/Tasmota_build_devel.yml index ac908be23..2bfc5d806 100644 --- a/.github/workflows/Tasmota_build_devel.yml +++ b/.github/workflows/Tasmota_build_devel.yml @@ -37,6 +37,8 @@ jobs: - tasmota32solo1 steps: - uses: actions/checkout@v2 + with: + ref: development - name: Set up Python uses: actions/setup-python@v1 - name: Install dependencies @@ -59,6 +61,8 @@ jobs: language: [ AF, BG, BR, CN, CZ, DE, ES, FR, FY, GR, HE, HU, IT, KO, NL, PL, PT, RO, RU, SE, SK, TR, TW, UK, VN ] steps: - uses: actions/checkout@v2 + with: + ref: development - name: Set up Python uses: actions/setup-python@v1 - name: Install dependencies From 161c97892baa8ef80962a8eee16b71c35bd3af74 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 12 Dec 2021 23:36:46 +0100 Subject: [PATCH 027/402] safe guard using branch master --- .github/workflows/Tasmota_build_master.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/Tasmota_build_master.yml b/.github/workflows/Tasmota_build_master.yml index 9ae940bef..9ca6e1f6c 100644 --- a/.github/workflows/Tasmota_build_master.yml +++ b/.github/workflows/Tasmota_build_master.yml @@ -36,6 +36,8 @@ jobs: - tasmota32solo1 steps: - uses: actions/checkout@v2 + with: + ref: master - name: Set up Python uses: actions/setup-python@v1 - name: Install dependencies @@ -58,6 +60,8 @@ jobs: language: [ AF, BG, BR, CN, CZ, DE, ES, FR, FY, GR, HE, HU, IT, KO, NL, PL, PT, RO, RU, SE, SK, TR, TW, UK, VN ] steps: - uses: actions/checkout@v2 + with: + ref: master - name: Set up Python uses: actions/setup-python@v1 - name: Install dependencies From 637f456e00c7d06b1d15c130868729bebf7352dc Mon Sep 17 00:00:00 2001 From: Charles Date: Mon, 13 Dec 2021 12:18:47 +0100 Subject: [PATCH 028/402] Fix some calculation --- tasmota/xnrg_15_teleinfo.ino | 55 ++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/tasmota/xnrg_15_teleinfo.ino b/tasmota/xnrg_15_teleinfo.ino index 37b16084f..4c19a1f16 100755 --- a/tasmota/xnrg_15_teleinfo.ino +++ b/tasmota/xnrg_15_teleinfo.ino @@ -327,62 +327,61 @@ void DataCallback(struct _ValueList * me, uint8_t flags) else if ( ilabel == LABEL_HCHC || ilabel == LABEL_HCHP || ilabel == LABEL_BASE) { char value[32]; - uint32_t hc = 0; - uint32_t hp = 0; - uint32_t total = 0; + long hc = 0; + long hp = 0; + long total = 0; // Base, un seul index if (ilabel == LABEL_BASE) { - total = atoi(me->value); - AddLog(LOG_LEVEL_DEBUG, PSTR("TIC: Base:%u"), total); + total = atol(me->value); + AddLog(LOG_LEVEL_DEBUG, PSTR("TIC: Base:%ld"), total); // Heures creuses/pleines calculer total } else { // Heures creuses get heures pleines if (ilabel == LABEL_HCHC) { - hc = atoi(me->value); + hc = atol(me->value); if ( getValueFromLabelIndex(LABEL_HCHP, value) ) { - hp = atoi(value); + hp = atol(value) ; } // Heures pleines, get heures creuses } else if (ilabel == LABEL_HCHP) { - hp = atoi(me->value); + hp = atol(me->value); if ( getValueFromLabelIndex(LABEL_HCHC, value) ) { - hc = atoi(value); + hc = atol(value) ; } } - total = hc + hp; - AddLog(LOG_LEVEL_DEBUG, PSTR("TIC: HC:%u HP:%u Total:%u"), hc, hp, total); + if (hc>0 && hp>0) { + total = hc + hp; + } + AddLog(LOG_LEVEL_DEBUG, PSTR("TIC: HC:%ld HP:%ld Total:%ld"), hc, hp, total); } - Energy.import_active[0] = total/1000.0f; - EnergyUpdateTotal(); - AddLog (LOG_LEVEL_INFO, PSTR ("TIC: Total counter updated to %u Wh"), total); + AddLog (LOG_LEVEL_INFO, PSTR ("TIC: Total counter updated to %ld Wh"), total); + if (total>0) { + Energy.import_active[0] = (float)total/1000.0f; + EnergyUpdateTotal(); + AddLog (LOG_LEVEL_DEBUG_MORE, PSTR ("TIC: import_active[0]=%.3fKWh"), Energy.import_active[0] ); + } } - // Wh total index (standard) + // Wh total index (all contract) else if ( ilabel == LABEL_EAST) { - uint32_t total = atoi(me->value); - if (contrat != CONTRAT_BAS) { - Energy.import_active[0] = total/1000.0f; - EnergyUpdateTotal(); - AddLog(LOG_LEVEL_DEBUG, PSTR("TIC: Total:%uWh"), total); - } + long total = atol(me->value); + Energy.import_active[0] = (float)total/1000.0f; + EnergyUpdateTotal(); + AddLog(LOG_LEVEL_DEBUG, PSTR("TIC: Total:%ldWh"), total); } // Wh indexes (standard) else if ( ilabel == LABEL_EASF01) { - if (contrat == CONTRAT_BAS) { - Energy.import_active[0] = atoi(me->value)/1000.0f; - EnergyUpdateTotal(); - } - AddLog(LOG_LEVEL_DEBUG, PSTR("TIC: HC:%u"), atoi(me->value)); + AddLog(LOG_LEVEL_DEBUG, PSTR("TIC: HC:%ld"), atol(me->value)); } else if ( ilabel == LABEL_EASF02) { - AddLog(LOG_LEVEL_DEBUG, PSTR("TIC: HP:%u"), atoi(me->value)); + AddLog(LOG_LEVEL_DEBUG, PSTR("TIC: HP:%ld"), atol(me->value)); } // Contract subscribed (legacy) @@ -504,7 +503,7 @@ bool ResponseAppendTInfo(char sep, bool all) if (!isNumber) { ResponseAppend_P( PSTR("\"%s\""), me->value ); } else { - ResponseAppend_P( PSTR("%d"), atoi(me->value)); + ResponseAppend_P( PSTR("%ld"), atol(me->value)); } // Now JSON separator is needed From 2841734465e4f7dcbc9f850757db0e0cda10391f Mon Sep 17 00:00:00 2001 From: Stephan Hadinger Date: Mon, 13 Dec 2021 19:19:32 +0100 Subject: [PATCH 029/402] Berry remove conversion from comptr to int --- lib/libesp32/Berry/default/be_lvgl_glob_lib.c | 90 +++++++++---------- .../Berry/default/embedded/lvgl_glob.be | 7 +- lib/libesp32/Berry/src/be_baselib.c | 2 - tasmota/xdrv_52_1_berry_native.ino | 4 +- tasmota/xdrv_52_3_berry_lvgl.ino | 2 +- 5 files changed, 48 insertions(+), 57 deletions(-) diff --git a/lib/libesp32/Berry/default/be_lvgl_glob_lib.c b/lib/libesp32/Berry/default/be_lvgl_glob_lib.c index 01bd4ed1d..06827fc0e 100644 --- a/lib/libesp32/Berry/default/be_lvgl_glob_lib.c +++ b/lib/libesp32/Berry/default/be_lvgl_glob_lib.c @@ -69,7 +69,7 @@ be_local_closure(LVGL_glob_widget_event_impl, /* name */ }), &be_const_str_widget_event_impl, &be_const_str_solidified, - ( &(const binstruction[30]) { /* code */ + ( &(const binstruction[28]) { /* code */ 0xA40E0000, // 0000 IMPORT R3 K0 0xB8120200, // 0001 GETNGBL R4 K1 0x8C100902, // 0002 GETMET R4 R4 K2 @@ -81,25 +81,23 @@ be_local_closure(LVGL_glob_widget_event_impl, /* name */ 0x7C140400, // 0008 CALL R5 2 0x88180B04, // 0009 GETMBR R6 R5 K4 0x8C1C0105, // 000A GETMET R7 R0 K5 - 0x60240009, // 000B GETGBL R9 G9 - 0x5C280C00, // 000C MOVE R10 R6 - 0x7C240200, // 000D CALL R9 1 - 0x7C1C0400, // 000E CALL R7 2 - 0x60200004, // 000F GETGBL R8 G4 - 0x5C240E00, // 0010 MOVE R9 R7 - 0x7C200200, // 0011 CALL R8 1 - 0x1C201106, // 0012 EQ R8 R8 K6 - 0x78220008, // 0013 JMPF R8 #001D - 0x8C200707, // 0014 GETMET R8 R3 K7 - 0x5C280E00, // 0015 MOVE R10 R7 - 0x582C0008, // 0016 LDCONST R11 K8 - 0x7C200600, // 0017 CALL R8 3 - 0x78220003, // 0018 JMPF R8 #001D - 0x8C200F08, // 0019 GETMET R8 R7 K8 - 0x5C280800, // 001A MOVE R10 R4 - 0x5C2C0A00, // 001B MOVE R11 R5 - 0x7C200600, // 001C CALL R8 3 - 0x80000000, // 001D RET 0 + 0x5C240C00, // 000B MOVE R9 R6 + 0x7C1C0400, // 000C CALL R7 2 + 0x60200004, // 000D GETGBL R8 G4 + 0x5C240E00, // 000E MOVE R9 R7 + 0x7C200200, // 000F CALL R8 1 + 0x1C201106, // 0010 EQ R8 R8 K6 + 0x78220008, // 0011 JMPF R8 #001B + 0x8C200707, // 0012 GETMET R8 R3 K7 + 0x5C280E00, // 0013 MOVE R10 R7 + 0x582C0008, // 0014 LDCONST R11 K8 + 0x7C200600, // 0015 CALL R8 3 + 0x78220003, // 0016 JMPF R8 #001B + 0x8C200F08, // 0017 GETMET R8 R7 K8 + 0x5C280800, // 0018 MOVE R10 R4 + 0x5C2C0A00, // 0019 MOVE R11 R5 + 0x7C200600, // 001A CALL R8 3 + 0x80000000, // 001B RET 0 }) ) ); @@ -130,7 +128,7 @@ be_local_closure(LVGL_glob_lvgl_event_dispatch, /* name */ }), &be_const_str_lvgl_event_dispatch, &be_const_str_solidified, - ( &(const binstruction[20]) { /* code */ + ( &(const binstruction[18]) { /* code */ 0xA40A0000, // 0000 IMPORT R2 K0 0xB80E0200, // 0001 GETNGBL R3 K1 0x8C0C0702, // 0002 GETMET R3 R3 K2 @@ -138,19 +136,17 @@ be_local_closure(LVGL_glob_lvgl_event_dispatch, /* name */ 0x5C1C0200, // 0004 MOVE R7 R1 0x7C140400, // 0005 CALL R5 2 0x7C0C0400, // 0006 CALL R3 2 - 0x60100009, // 0007 GETGBL R4 G9 - 0x88140704, // 0008 GETMBR R5 R3 K4 - 0x7C100200, // 0009 CALL R4 1 - 0x88140105, // 000A GETMBR R5 R0 K5 - 0x94140A04, // 000B GETIDX R5 R5 R4 - 0x8C180106, // 000C GETMET R6 R0 K6 - 0x5C200800, // 000D MOVE R8 R4 - 0x7C180400, // 000E CALL R6 2 - 0x5C1C0A00, // 000F MOVE R7 R5 - 0x5C200C00, // 0010 MOVE R8 R6 - 0x5C240600, // 0011 MOVE R9 R3 - 0x7C1C0400, // 0012 CALL R7 2 - 0x80000000, // 0013 RET 0 + 0x88100704, // 0007 GETMBR R4 R3 K4 + 0x88140105, // 0008 GETMBR R5 R0 K5 + 0x94140A04, // 0009 GETIDX R5 R5 R4 + 0x8C180106, // 000A GETMET R6 R0 K6 + 0x5C200800, // 000B MOVE R8 R4 + 0x7C180400, // 000C CALL R6 2 + 0x5C1C0A00, // 000D MOVE R7 R5 + 0x5C200C00, // 000E MOVE R8 R6 + 0x5C240600, // 000F MOVE R9 R3 + 0x7C1C0400, // 0010 CALL R7 2 + 0x80000000, // 0011 RET 0 }) ) ); @@ -229,7 +225,7 @@ be_local_closure(LVGL_glob_register_obj, /* name */ }), &be_const_str_register_obj, &be_const_str_solidified, - ( &(const binstruction[13]) { /* code */ + ( &(const binstruction[11]) { /* code */ 0x88080100, // 0000 GETMBR R2 R0 K0 0x4C0C0000, // 0001 LDNIL R3 0x1C080403, // 0002 EQ R2 R2 R3 @@ -237,12 +233,10 @@ be_local_closure(LVGL_glob_register_obj, /* name */ 0x60080013, // 0004 GETGBL R2 G19 0x7C080000, // 0005 CALL R2 0 0x90020002, // 0006 SETMBR R0 K0 R2 - 0x60080009, // 0007 GETGBL R2 G9 - 0x880C0301, // 0008 GETMBR R3 R1 K1 - 0x7C080200, // 0009 CALL R2 1 - 0x880C0100, // 000A GETMBR R3 R0 K0 - 0x980C0401, // 000B SETIDX R3 R2 R1 - 0x80000000, // 000C RET 0 + 0x88080301, // 0007 GETMBR R2 R1 K1 + 0x880C0100, // 0008 GETMBR R3 R0 K0 + 0x980C0401, // 0009 SETIDX R3 R2 R1 + 0x80000000, // 000A RET 0 }) ) ); @@ -798,23 +792,23 @@ be_local_class(LVGL_glob, NULL, be_nested_map(20, ( (struct bmapnode*) &(const bmapnode[]) { - { be_const_key(widget_ctor_cb, 9), be_const_var(4) }, + { be_const_key(widget_ctor_cb, 8), be_const_var(4) }, { be_const_key(get_object_from_ptr, 4), be_const_closure(LVGL_glob_get_object_from_ptr_closure) }, { be_const_key(cb_obj, 7), be_const_var(0) }, { be_const_key(widget_struct_by_class, -1), be_const_var(8) }, { be_const_key(widget_event_impl, -1), be_const_closure(LVGL_glob_widget_event_impl_closure) }, { be_const_key(widget_dtor_cb, 6), be_const_var(5) }, { be_const_key(cb_event_closure, -1), be_const_var(1) }, - { be_const_key(lvgl_event_dispatch, 16), be_const_closure(LVGL_glob_lvgl_event_dispatch_closure) }, - { be_const_key(widget_dtor_impl, -1), be_const_closure(LVGL_glob_widget_dtor_impl_closure) }, + { be_const_key(cb_do_nothing, 16), be_const_static_closure(LVGL_glob__anonymous__closure) }, { be_const_key(null_cb, -1), be_const_var(3) }, - { be_const_key(register_obj, 8), be_const_closure(LVGL_glob_register_obj_closure) }, + { be_const_key(register_obj, -1), be_const_closure(LVGL_glob_register_obj_closure) }, + { be_const_key(widget_dtor_impl, 9), be_const_closure(LVGL_glob_widget_dtor_impl_closure) }, { be_const_key(gen_cb, -1), be_const_closure(LVGL_glob_gen_cb_closure) }, - { be_const_key(widget_struct_default, -1), be_const_var(7) }, - { be_const_key(deregister_obj, 12), be_const_closure(LVGL_glob_deregister_obj_closure) }, + { be_const_key(deregister_obj, -1), be_const_closure(LVGL_glob_deregister_obj_closure) }, + { be_const_key(widget_struct_default, 12), be_const_var(7) }, { be_const_key(widget_event_cb, -1), be_const_var(6) }, { be_const_key(widget_cb, -1), be_const_closure(LVGL_glob_widget_cb_closure) }, - { be_const_key(cb_do_nothing, 3), be_const_closure(LVGL_glob__anonymous__closure) }, + { be_const_key(lvgl_event_dispatch, 3), be_const_closure(LVGL_glob_lvgl_event_dispatch_closure) }, { be_const_key(event_cb, -1), be_const_var(2) }, { be_const_key(create_custom_widget, -1), be_const_closure(LVGL_glob_create_custom_widget_closure) }, { be_const_key(widget_ctor_impl, -1), be_const_closure(LVGL_glob_widget_ctor_impl_closure) }, diff --git a/lib/libesp32/Berry/default/embedded/lvgl_glob.be b/lib/libesp32/Berry/default/embedded/lvgl_glob.be index f7f6b8e84..04250ff54 100644 --- a/lib/libesp32/Berry/default/embedded/lvgl_glob.be +++ b/lib/libesp32/Berry/default/embedded/lvgl_glob.be @@ -23,8 +23,7 @@ class LVGL_glob #- register an lv.lv_* object in the mapping -# def register_obj(obj) if self.cb_obj == nil self.cb_obj = {} end - var native_ptr = int(obj._p) - self.cb_obj[native_ptr] = obj + self.cb_obj[obj._p] = obj end def get_object_from_ptr(ptr) @@ -38,7 +37,7 @@ class LVGL_glob var event = lv.lv_event(introspect.toptr(event_ptr)) - var target = int(event.target) + var target = event.target var f = self.cb_event_closure[target] var obj = self.get_object_from_ptr(target) #print('>> lvgl_event_dispatch', f, obj, event) @@ -87,7 +86,7 @@ class LVGL_glob var cl = lv.lv_obj_class(cl_ptr) var event = lv.lv_event(e_ptr) var obj_ptr = event.target - var obj = self.get_object_from_ptr(int(obj_ptr)) + var obj = self.get_object_from_ptr(obj_ptr) if type(obj) == 'instance' && introspect.get(obj, 'widget_event') obj.widget_event(cl, event) end diff --git a/lib/libesp32/Berry/src/be_baselib.c b/lib/libesp32/Berry/src/be_baselib.c index 6e92b47be..98f96b48e 100644 --- a/lib/libesp32/Berry/src/be_baselib.c +++ b/lib/libesp32/Berry/src/be_baselib.c @@ -233,8 +233,6 @@ static int l_int(bvm *vm) be_pushvalue(vm, 1); } else if (be_isbool(vm, 1)) { be_pushint(vm, be_tobool(vm, 1) ? 1 : 0); - } else if (be_iscomptr(vm, 1)) { - be_pushint(vm, (int) be_tocomptr(vm, 1)); } else { be_return_nil(vm); } diff --git a/tasmota/xdrv_52_1_berry_native.ino b/tasmota/xdrv_52_1_berry_native.ino index 98757b730..2bf1f152e 100644 --- a/tasmota/xdrv_52_1_berry_native.ino +++ b/tasmota/xdrv_52_1_berry_native.ino @@ -312,7 +312,7 @@ extern "C" { // read a single value at stack position idx, convert to int. // if object instance, get `_p` member and convert it recursively -int32_t be_convert_single_elt(bvm *vm, int32_t idx, const char * arg_type = nullptr, int32_t lv_obj_cb = 0) { +int32_t be_convert_single_elt(bvm *vm, int32_t idx, const char * arg_type = nullptr, void * lv_obj_cb = nullptr) { int32_t ret = 0; char provided_type = 0; idx = be_absindex(vm, idx); // make sure we have an absolute index @@ -332,7 +332,7 @@ int32_t be_convert_single_elt(bvm *vm, int32_t idx, const char * arg_type = null be_pushstring(vm, arg_type); be_pushvalue(vm, idx); be_pushvalue(vm, 1); - be_pushint(vm, lv_obj_cb); + be_pushcomptr(vm, lv_obj_cb); be_call(vm, 5); const void * func = be_tocomptr(vm, -6); be_pop(vm, 6); diff --git a/tasmota/xdrv_52_3_berry_lvgl.ino b/tasmota/xdrv_52_3_berry_lvgl.ino index 39e7737ed..f0cba617a 100644 --- a/tasmota/xdrv_52_3_berry_lvgl.ino +++ b/tasmota/xdrv_52_3_berry_lvgl.ino @@ -162,7 +162,7 @@ void be_check_arg_type(bvm *vm, int32_t arg_start, int32_t argc, const char * ar } } // AddLog(LOG_LEVEL_INFO, ">> be_call_c_func arg %i, type %s", i, arg_type_check ? type_short_name : ""); - p[i] = be_convert_single_elt(vm, i + arg_start, arg_type_check ? type_short_name : nullptr, p[0]); + p[i] = be_convert_single_elt(vm, i + arg_start, arg_type_check ? type_short_name : nullptr, (void*) p[0]); } // check if we are missing arguments From 63b9c6460358b285c7e2de1dd3c0b873a24b7e3d Mon Sep 17 00:00:00 2001 From: Stephan Hadinger Date: Mon, 13 Dec 2021 19:33:16 +0100 Subject: [PATCH 030/402] Fix warning --- lib/libesp32/Berry/src/be_byteslib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libesp32/Berry/src/be_byteslib.c b/lib/libesp32/Berry/src/be_byteslib.c index 0c3085faa..82f4ab2be 100644 --- a/lib/libesp32/Berry/src/be_byteslib.c +++ b/lib/libesp32/Berry/src/be_byteslib.c @@ -246,7 +246,7 @@ static unsigned int decode_base64(unsigned char input[], unsigned char output[]) static void buf_set_len(buf_impl* attr, const size_t len) { uint16_t old_len = attr->len; - attr->len = ((int32_t)len <= attr->size) ? len : attr->size; + attr->len = ((int32_t)len <= attr->size) ? (int32_t)len : attr->size; if (old_len < attr->len) { memset((void*) &attr->bufptr[old_len], 0, attr->len - old_len); } From 560e76948524978e69a78236bc8859e063c4f68c Mon Sep 17 00:00:00 2001 From: Stephan Hadinger Date: Tue, 14 Dec 2021 09:37:15 +0100 Subject: [PATCH 031/402] Rename Berry to berry --- lib/libesp32/berry/LICENSE | 21 + lib/libesp32/berry/Makefile | 105 + lib/libesp32/berry/README.md | 163 ++ lib/libesp32/berry/berry-logo.png | Bin 0 -> 11325 bytes lib/libesp32/berry/default/be_animate_lib.c | 712 ++++++ lib/libesp32/berry/default/be_autoconf_lib.c | 1394 +++++++++++ lib/libesp32/berry/default/be_crypto_lib.c | 56 + lib/libesp32/berry/default/be_ctypes.c | 494 ++++ lib/libesp32/berry/default/be_display_lib.c | 29 + lib/libesp32/berry/default/be_driverlib.c | 153 ++ .../default/be_energy_ctypes_definitions.c | 117 + lib/libesp32/berry/default/be_energylib.c | 186 ++ lib/libesp32/berry/default/be_flash_lib.c | 21 + lib/libesp32/berry/default/be_gpio_lib.c | 34 + .../berry/default/be_i2c_axp192_lib.c | 899 +++++++ lib/libesp32/berry/default/be_i2c_driverlib.c | 425 ++++ lib/libesp32/berry/default/be_i2s_audio_lib.c | 113 + .../berry/default/be_leds_animator_lib.c | 381 +++ lib/libesp32/berry/default/be_leds_lib.c | 1815 ++++++++++++++ lib/libesp32/berry/default/be_leds_ntv_lib.c | 50 + lib/libesp32/berry/default/be_light_lib.c | 28 + .../berry/default/be_lvgl_clock_icon_lib.c | 313 +++ .../default/be_lvgl_ctypes_definitions.c | 531 +++++ lib/libesp32/berry/default/be_lvgl_glob_lib.c | 826 +++++++ lib/libesp32/berry/default/be_lvgl_module.c | 692 ++++++ .../berry/default/be_lvgl_signal_arcs_lib.c | 434 ++++ .../berry/default/be_lvgl_signal_bars_lib.c | 392 ++++ .../berry/default/be_lvgl_widgets_lib.c | 1564 +++++++++++++ .../default/be_lvgl_wifi_arcs_icon_lib.c | 140 ++ .../berry/default/be_lvgl_wifi_arcs_lib.c | 167 ++ .../default/be_lvgl_wifi_bars_icon_lib.c | 136 ++ .../berry/default/be_lvgl_wifi_bars_lib.c | 167 ++ lib/libesp32/berry/default/be_md5_lib.c | 30 + lib/libesp32/berry/default/be_modtab.c | 230 ++ lib/libesp32/berry/default/be_onewire_lib.c | 57 + .../berry/default/be_path_tasmota_lib.c | 70 + lib/libesp32/berry/default/be_persist_lib.c | 703 ++++++ lib/libesp32/berry/default/be_port.cpp | 574 +++++ lib/libesp32/berry/default/be_python_compat.c | 58 + lib/libesp32/berry/default/be_re_lib.c | 254 ++ lib/libesp32/berry/default/be_serial_lib.c | 66 + lib/libesp32/berry/default/be_tapp_lib.c | 168 ++ lib/libesp32/berry/default/be_tasmotalib.c | 2079 +++++++++++++++++ lib/libesp32/berry/default/be_tcpclient_lib.c | 48 + lib/libesp32/berry/default/be_timer_class.c | 110 + lib/libesp32/berry/default/be_unishox_lib.c | 28 + lib/libesp32/berry/default/be_webclient_lib.c | 57 + lib/libesp32/berry/default/be_webserver_lib.c | 55 + lib/libesp32/berry/default/be_wirelib.c | 151 ++ lib/libesp32/berry/default/berry_conf.h | 247 ++ .../berry/default/embedded/Animate.be | 189 ++ lib/libesp32/berry/default/embedded/Driver.be | 29 + .../berry/default/embedded/Tasmota.be | 577 +++++ lib/libesp32/berry/default/embedded/Wire.be | 25 + .../berry/default/embedded/autoconf.be | 389 +++ .../berry/default/embedded/i2c_axp192.be | 176 ++ .../berry/default/embedded/i2c_driver.be | 104 + lib/libesp32/berry/default/embedded/leds.be | 338 +++ .../berry/default/embedded/leds_animator.be | 70 + .../berry/default/embedded/lv_clock_icon.be | 54 + .../berry/default/embedded/lv_signal_arcs.be | 133 ++ .../berry/default/embedded/lv_signal_bars.be | 118 + .../berry/default/embedded/lvgl_glob.be | 256 ++ .../berry/default/embedded/openhasp.be | 764 ++++++ .../default/embedded/openhasp/demo-all.jsonl | 61 + .../default/embedded/openhasp/demo1.jsonl | 23 + .../default/embedded/openhasp/demo2.jsonl | 35 + .../default/embedded/openhasp/demo3.jsonl | 4 + .../berry/default/embedded/persist.be | 161 ++ lib/libesp32/berry/default/embedded/tapp.be | 35 + .../berry/default/embedded/test_crypto.be | 30 + lib/libesp32/berry/default/static_block.hpp | 80 + lib/libesp32/berry/examples/anon_func.be | 20 + lib/libesp32/berry/examples/bigloop.be | 15 + lib/libesp32/berry/examples/bintree.be | 60 + lib/libesp32/berry/examples/calcpi.be | 16 + lib/libesp32/berry/examples/exception.be | 12 + lib/libesp32/berry/examples/fib_rec.be | 12 + lib/libesp32/berry/examples/guess_number.be | 26 + lib/libesp32/berry/examples/json.be | 4 + lib/libesp32/berry/examples/lambda.be | 8 + lib/libesp32/berry/examples/listdir.be | 16 + lib/libesp32/berry/examples/qsort.be | 42 + lib/libesp32/berry/examples/repl.be | 61 + lib/libesp32/berry/examples/string.be | 32 + lib/libesp32/berry/examples/strmod.be | 7 + lib/libesp32/berry/gen.sh | 2 + lib/libesp32/berry/generate/be_const_strtab.h | 741 ++++++ .../berry/generate/be_const_strtab_def.h | 1109 +++++++++ .../generate/be_fixed_be_class_aes_gcm.h | 22 + .../be_fixed_be_class_audio_file_source.h | 17 + .../be_fixed_be_class_audio_file_source_fs.h | 18 + .../be_fixed_be_class_audio_generator.h | 17 + .../be_fixed_be_class_audio_generator_mp3.h | 22 + .../be_fixed_be_class_audio_generator_wav.h | 22 + .../generate/be_fixed_be_class_audio_output.h | 17 + .../be_fixed_be_class_audio_output_i2s.h | 19 + .../berry/generate/be_fixed_be_class_bytes.h | 44 + .../berry/generate/be_fixed_be_class_ctypes.h | 22 + .../generate/be_fixed_be_class_ctypes_dyn.h | 18 + .../generate/be_fixed_be_class_ec_c25519.h | 18 + .../berry/generate/be_fixed_be_class_list.h | 38 + .../berry/generate/be_fixed_be_class_map.h | 30 + .../berry/generate/be_fixed_be_class_md5.h | 20 + .../berry/generate/be_fixed_be_class_range.h | 24 + .../generate/be_fixed_be_class_tasmota.h | 93 + .../be_fixed_be_class_tasmota_onewire.h | 28 + .../be_fixed_be_class_tasmota_serial.h | 47 + .../generate/be_fixed_be_class_tasmota_wire.h | 31 + .../generate/be_fixed_be_class_tcpclient.h | 26 + .../generate/be_fixed_be_class_webclient.h | 32 + lib/libesp32/berry/generate/be_fixed_cb.h | 18 + lib/libesp32/berry/generate/be_fixed_debug.h | 22 + lib/libesp32/berry/generate/be_fixed_flash.h | 19 + lib/libesp32/berry/generate/be_fixed_gc.h | 18 + lib/libesp32/berry/generate/be_fixed_global.h | 19 + lib/libesp32/berry/generate/be_fixed_gpio.h | 23 + .../berry/generate/be_fixed_introspect.h | 21 + lib/libesp32/berry/generate/be_fixed_json.h | 18 + lib/libesp32/berry/generate/be_fixed_light.h | 21 + .../berry/generate/be_fixed_m_builtin.h | 66 + lib/libesp32/berry/generate/be_fixed_math.h | 43 + lib/libesp32/berry/generate/be_fixed_os.h | 2 + lib/libesp32/berry/generate/be_fixed_path.h | 2 + .../berry/generate/be_fixed_solidify.h | 17 + lib/libesp32/berry/generate/be_fixed_strict.h | 17 + lib/libesp32/berry/generate/be_fixed_string.h | 27 + lib/libesp32/berry/generate/be_fixed_sys.h | 17 + .../berry/generate/be_fixed_tasmota_path.h | 20 + lib/libesp32/berry/generate/be_fixed_time.h | 2 + .../berry/generate/be_fixed_webserver.h | 31 + lib/libesp32/berry/include/be_ctypes.h | 89 + lib/libesp32/berry/include/be_lvgl.h | 40 + lib/libesp32/berry/library.json | 30 + lib/libesp32/berry/src/be_api.c | 1173 ++++++++++ lib/libesp32/berry/src/be_baselib.c | 520 +++++ lib/libesp32/berry/src/be_bytecode.c | 590 +++++ lib/libesp32/berry/src/be_bytecode.h | 17 + lib/libesp32/berry/src/be_byteslib.c | 1447 ++++++++++++ lib/libesp32/berry/src/be_class.c | 360 +++ lib/libesp32/berry/src/be_class.h | 68 + lib/libesp32/berry/src/be_code.c | 930 ++++++++ lib/libesp32/berry/src/be_code.h | 43 + lib/libesp32/berry/src/be_constobj.h | 384 +++ lib/libesp32/berry/src/be_debug.c | 402 ++++ lib/libesp32/berry/src/be_debug.h | 28 + lib/libesp32/berry/src/be_debuglib.c | 215 ++ lib/libesp32/berry/src/be_decoder.h | 74 + lib/libesp32/berry/src/be_exec.c | 497 ++++ lib/libesp32/berry/src/be_exec.h | 62 + lib/libesp32/berry/src/be_filelib.c | 224 ++ lib/libesp32/berry/src/be_func.c | 181 ++ lib/libesp32/berry/src/be_func.h | 27 + lib/libesp32/berry/src/be_gc.c | 565 +++++ lib/libesp32/berry/src/be_gc.h | 80 + lib/libesp32/berry/src/be_gclib.c | 47 + lib/libesp32/berry/src/be_globallib.c | 86 + lib/libesp32/berry/src/be_introspectlib.c | 157 ++ lib/libesp32/berry/src/be_jsonlib.c | 448 ++++ lib/libesp32/berry/src/be_lexer.c | 621 +++++ lib/libesp32/berry/src/be_lexer.h | 138 ++ lib/libesp32/berry/src/be_libs.c | 29 + lib/libesp32/berry/src/be_libs.h | 15 + lib/libesp32/berry/src/be_list.c | 207 ++ lib/libesp32/berry/src/be_list.h | 39 + lib/libesp32/berry/src/be_listlib.c | 546 +++++ lib/libesp32/berry/src/be_map.c | 352 +++ lib/libesp32/berry/src/be_map.h | 61 + lib/libesp32/berry/src/be_maplib.c | 313 +++ lib/libesp32/berry/src/be_mathlib.c | 351 +++ lib/libesp32/berry/src/be_mem.c | 79 + lib/libesp32/berry/src/be_mem.h | 29 + lib/libesp32/berry/src/be_module.c | 467 ++++ lib/libesp32/berry/src/be_module.h | 42 + lib/libesp32/berry/src/be_object.c | 73 + lib/libesp32/berry/src/be_object.h | 254 ++ lib/libesp32/berry/src/be_opcodes.h | 57 + lib/libesp32/berry/src/be_oslib.c | 271 +++ lib/libesp32/berry/src/be_parser.c | 1743 ++++++++++++++ lib/libesp32/berry/src/be_parser.h | 89 + lib/libesp32/berry/src/be_rangelib.c | 123 + lib/libesp32/berry/src/be_repl.c | 106 + lib/libesp32/berry/src/be_repl.h | 26 + lib/libesp32/berry/src/be_solidifylib.c | 517 ++++ lib/libesp32/berry/src/be_strictlib.c | 40 + lib/libesp32/berry/src/be_string.c | 302 +++ lib/libesp32/berry/src/be_string.h | 57 + lib/libesp32/berry/src/be_strlib.c | 876 +++++++ lib/libesp32/berry/src/be_strlib.h | 32 + lib/libesp32/berry/src/be_sys.h | 48 + lib/libesp32/berry/src/be_syslib.c | 36 + lib/libesp32/berry/src/be_timelib.c | 71 + lib/libesp32/berry/src/be_var.c | 142 ++ lib/libesp32/berry/src/be_var.h | 31 + lib/libesp32/berry/src/be_vector.c | 153 ++ lib/libesp32/berry/src/be_vector.h | 43 + lib/libesp32/berry/src/be_vm.c | 1277 ++++++++++ lib/libesp32/berry/src/be_vm.h | 135 ++ lib/libesp32/berry/src/berry.h | 586 +++++ lib/libesp32/berry/src/berry_conf.h | 1 + lib/libesp32/berry/testall.be | 44 + lib/libesp32/berry/tests/assignment.be | 34 + lib/libesp32/berry/tests/bool.be | 39 + lib/libesp32/berry/tests/bytes.be | 185 ++ lib/libesp32/berry/tests/bytes_b64.be | 15 + lib/libesp32/berry/tests/bytes_fixed.be | 67 + lib/libesp32/berry/tests/checkspace.be | 35 + lib/libesp32/berry/tests/class.be | 47 + lib/libesp32/berry/tests/class_const.be | 122 + lib/libesp32/berry/tests/closure.be | 13 + lib/libesp32/berry/tests/compiler.be | 28 + lib/libesp32/berry/tests/compound.be | 19 + lib/libesp32/berry/tests/cond_expr.be | 10 + lib/libesp32/berry/tests/debug.be | 4 + lib/libesp32/berry/tests/exceptions.be | 7 + lib/libesp32/berry/tests/for.be | 44 + lib/libesp32/berry/tests/function.be | 12 + lib/libesp32/berry/tests/global.be | 52 + lib/libesp32/berry/tests/introspect.be | 28 + lib/libesp32/berry/tests/json.be | 53 + lib/libesp32/berry/tests/lexer.be | 62 + lib/libesp32/berry/tests/lexergc.be | 12 + lib/libesp32/berry/tests/list.be | 140 ++ lib/libesp32/berry/tests/member_indirect.be | 75 + lib/libesp32/berry/tests/os.be | 51 + lib/libesp32/berry/tests/overload.be | 14 + lib/libesp32/berry/tests/relop.be | 40 + lib/libesp32/berry/tests/string.be | 41 + lib/libesp32/berry/tests/subobject.be | 29 + lib/libesp32/berry/tests/suffix.be | 28 + lib/libesp32/berry/tests/super_auto.be | 132 ++ lib/libesp32/berry/tests/super_leveled.be | 43 + lib/libesp32/berry/tests/vararg.be | 14 + lib/libesp32/berry/tests/virtual_methods.be | 66 + lib/libesp32/berry/tests/virtual_methods2.be | 28 + lib/libesp32/berry/tools/coc/.gitignore | 1 + lib/libesp32/berry/tools/coc/Makefile | 26 + lib/libesp32/berry/tools/coc/REEADME.md | 3 + .../berry/tools/coc/block_builder.cpp | 197 ++ lib/libesp32/berry/tools/coc/block_builder.h | 49 + lib/libesp32/berry/tools/coc/coc_parser.cpp | 190 ++ lib/libesp32/berry/tools/coc/coc_parser.h | 46 + lib/libesp32/berry/tools/coc/coc_string.cpp | 48 + lib/libesp32/berry/tools/coc/coc_string.h | 18 + lib/libesp32/berry/tools/coc/hash_map.cpp | 161 ++ lib/libesp32/berry/tools/coc/hash_map.h | 47 + lib/libesp32/berry/tools/coc/macro_table.cpp | 59 + lib/libesp32/berry/tools/coc/macro_table.h | 30 + lib/libesp32/berry/tools/coc/main.cpp | 141 ++ lib/libesp32/berry/tools/coc/main.h | 45 + lib/libesp32/berry/tools/coc/object_block.h | 26 + lib/libesp32/berry/tools/coc/str_build.cpp | 129 + lib/libesp32/berry/tools/coc/str_build.h | 39 + .../berry/tools/grammar/berry.bytecode | 92 + lib/libesp32/berry/tools/grammar/berry.ebnf | 45 + .../berry/tools/grammar/const_obj.ebnf | 11 + lib/libesp32/berry/tools/grammar/json.ebnf | 5 + .../vscode/skiars.berry-0.1.0/.vsixmanifest | 34 + .../vscode/skiars.berry-0.1.0/CHANGELOG.md | 7 + .../vscode/skiars.berry-0.1.0/README.md | 0 .../berry-configuration.json | 32 + .../vscode/skiars.berry-0.1.0/berry-icon.png | Bin 0 -> 5429 bytes .../vscode/skiars.berry-0.1.0/package.json | 52 + .../skiars.berry-0.1.0/syntaxes/berry.json | 109 + .../skiars.berry-0.1.0/syntaxes/bytecode.json | 58 + .../berry/tools/pycoc/block_builder.py | 152 ++ lib/libesp32/berry/tools/pycoc/coc_parser.py | 146 ++ lib/libesp32/berry/tools/pycoc/coc_string.py | 40 + .../berry/tools/pycoc/coc_string_test.py | 18 + lib/libesp32/berry/tools/pycoc/hash_map.py | 162 ++ lib/libesp32/berry/tools/pycoc/macro_table.py | 50 + lib/libesp32/berry/tools/pycoc/main.py | 64 + lib/libesp32/berry/tools/pycoc/str_build.py | 123 + lib/libesp32/berry_mapping/src/be_cb_module.c | 2 +- 274 files changed, 47676 insertions(+), 1 deletion(-) create mode 100644 lib/libesp32/berry/LICENSE create mode 100644 lib/libesp32/berry/Makefile create mode 100644 lib/libesp32/berry/README.md create mode 100644 lib/libesp32/berry/berry-logo.png create mode 100644 lib/libesp32/berry/default/be_animate_lib.c create mode 100644 lib/libesp32/berry/default/be_autoconf_lib.c create mode 100644 lib/libesp32/berry/default/be_crypto_lib.c create mode 100644 lib/libesp32/berry/default/be_ctypes.c create mode 100644 lib/libesp32/berry/default/be_display_lib.c create mode 100644 lib/libesp32/berry/default/be_driverlib.c create mode 100644 lib/libesp32/berry/default/be_energy_ctypes_definitions.c create mode 100644 lib/libesp32/berry/default/be_energylib.c create mode 100644 lib/libesp32/berry/default/be_flash_lib.c create mode 100644 lib/libesp32/berry/default/be_gpio_lib.c create mode 100644 lib/libesp32/berry/default/be_i2c_axp192_lib.c create mode 100644 lib/libesp32/berry/default/be_i2c_driverlib.c create mode 100644 lib/libesp32/berry/default/be_i2s_audio_lib.c create mode 100644 lib/libesp32/berry/default/be_leds_animator_lib.c create mode 100644 lib/libesp32/berry/default/be_leds_lib.c create mode 100644 lib/libesp32/berry/default/be_leds_ntv_lib.c create mode 100644 lib/libesp32/berry/default/be_light_lib.c create mode 100644 lib/libesp32/berry/default/be_lvgl_clock_icon_lib.c create mode 100644 lib/libesp32/berry/default/be_lvgl_ctypes_definitions.c create mode 100644 lib/libesp32/berry/default/be_lvgl_glob_lib.c create mode 100644 lib/libesp32/berry/default/be_lvgl_module.c create mode 100644 lib/libesp32/berry/default/be_lvgl_signal_arcs_lib.c create mode 100644 lib/libesp32/berry/default/be_lvgl_signal_bars_lib.c create mode 100644 lib/libesp32/berry/default/be_lvgl_widgets_lib.c create mode 100644 lib/libesp32/berry/default/be_lvgl_wifi_arcs_icon_lib.c create mode 100644 lib/libesp32/berry/default/be_lvgl_wifi_arcs_lib.c create mode 100644 lib/libesp32/berry/default/be_lvgl_wifi_bars_icon_lib.c create mode 100644 lib/libesp32/berry/default/be_lvgl_wifi_bars_lib.c create mode 100644 lib/libesp32/berry/default/be_md5_lib.c create mode 100644 lib/libesp32/berry/default/be_modtab.c create mode 100644 lib/libesp32/berry/default/be_onewire_lib.c create mode 100644 lib/libesp32/berry/default/be_path_tasmota_lib.c create mode 100644 lib/libesp32/berry/default/be_persist_lib.c create mode 100644 lib/libesp32/berry/default/be_port.cpp create mode 100644 lib/libesp32/berry/default/be_python_compat.c create mode 100644 lib/libesp32/berry/default/be_re_lib.c create mode 100644 lib/libesp32/berry/default/be_serial_lib.c create mode 100644 lib/libesp32/berry/default/be_tapp_lib.c create mode 100644 lib/libesp32/berry/default/be_tasmotalib.c create mode 100644 lib/libesp32/berry/default/be_tcpclient_lib.c create mode 100644 lib/libesp32/berry/default/be_timer_class.c create mode 100644 lib/libesp32/berry/default/be_unishox_lib.c create mode 100644 lib/libesp32/berry/default/be_webclient_lib.c create mode 100644 lib/libesp32/berry/default/be_webserver_lib.c create mode 100644 lib/libesp32/berry/default/be_wirelib.c create mode 100644 lib/libesp32/berry/default/berry_conf.h create mode 100644 lib/libesp32/berry/default/embedded/Animate.be create mode 100644 lib/libesp32/berry/default/embedded/Driver.be create mode 100644 lib/libesp32/berry/default/embedded/Tasmota.be create mode 100644 lib/libesp32/berry/default/embedded/Wire.be create mode 100644 lib/libesp32/berry/default/embedded/autoconf.be create mode 100644 lib/libesp32/berry/default/embedded/i2c_axp192.be create mode 100644 lib/libesp32/berry/default/embedded/i2c_driver.be create mode 100644 lib/libesp32/berry/default/embedded/leds.be create mode 100644 lib/libesp32/berry/default/embedded/leds_animator.be create mode 100644 lib/libesp32/berry/default/embedded/lv_clock_icon.be create mode 100644 lib/libesp32/berry/default/embedded/lv_signal_arcs.be create mode 100644 lib/libesp32/berry/default/embedded/lv_signal_bars.be create mode 100644 lib/libesp32/berry/default/embedded/lvgl_glob.be create mode 100644 lib/libesp32/berry/default/embedded/openhasp.be create mode 100644 lib/libesp32/berry/default/embedded/openhasp/demo-all.jsonl create mode 100644 lib/libesp32/berry/default/embedded/openhasp/demo1.jsonl create mode 100644 lib/libesp32/berry/default/embedded/openhasp/demo2.jsonl create mode 100644 lib/libesp32/berry/default/embedded/openhasp/demo3.jsonl create mode 100644 lib/libesp32/berry/default/embedded/persist.be create mode 100644 lib/libesp32/berry/default/embedded/tapp.be create mode 100644 lib/libesp32/berry/default/embedded/test_crypto.be create mode 100644 lib/libesp32/berry/default/static_block.hpp create mode 100644 lib/libesp32/berry/examples/anon_func.be create mode 100644 lib/libesp32/berry/examples/bigloop.be create mode 100644 lib/libesp32/berry/examples/bintree.be create mode 100644 lib/libesp32/berry/examples/calcpi.be create mode 100644 lib/libesp32/berry/examples/exception.be create mode 100644 lib/libesp32/berry/examples/fib_rec.be create mode 100644 lib/libesp32/berry/examples/guess_number.be create mode 100644 lib/libesp32/berry/examples/json.be create mode 100644 lib/libesp32/berry/examples/lambda.be create mode 100644 lib/libesp32/berry/examples/listdir.be create mode 100644 lib/libesp32/berry/examples/qsort.be create mode 100644 lib/libesp32/berry/examples/repl.be create mode 100644 lib/libesp32/berry/examples/string.be create mode 100644 lib/libesp32/berry/examples/strmod.be create mode 100755 lib/libesp32/berry/gen.sh create mode 100644 lib/libesp32/berry/generate/be_const_strtab.h create mode 100644 lib/libesp32/berry/generate/be_const_strtab_def.h create mode 100644 lib/libesp32/berry/generate/be_fixed_be_class_aes_gcm.h create mode 100644 lib/libesp32/berry/generate/be_fixed_be_class_audio_file_source.h create mode 100644 lib/libesp32/berry/generate/be_fixed_be_class_audio_file_source_fs.h create mode 100644 lib/libesp32/berry/generate/be_fixed_be_class_audio_generator.h create mode 100644 lib/libesp32/berry/generate/be_fixed_be_class_audio_generator_mp3.h create mode 100644 lib/libesp32/berry/generate/be_fixed_be_class_audio_generator_wav.h create mode 100644 lib/libesp32/berry/generate/be_fixed_be_class_audio_output.h create mode 100644 lib/libesp32/berry/generate/be_fixed_be_class_audio_output_i2s.h create mode 100644 lib/libesp32/berry/generate/be_fixed_be_class_bytes.h create mode 100644 lib/libesp32/berry/generate/be_fixed_be_class_ctypes.h create mode 100644 lib/libesp32/berry/generate/be_fixed_be_class_ctypes_dyn.h create mode 100644 lib/libesp32/berry/generate/be_fixed_be_class_ec_c25519.h create mode 100644 lib/libesp32/berry/generate/be_fixed_be_class_list.h create mode 100644 lib/libesp32/berry/generate/be_fixed_be_class_map.h create mode 100644 lib/libesp32/berry/generate/be_fixed_be_class_md5.h create mode 100644 lib/libesp32/berry/generate/be_fixed_be_class_range.h create mode 100644 lib/libesp32/berry/generate/be_fixed_be_class_tasmota.h create mode 100644 lib/libesp32/berry/generate/be_fixed_be_class_tasmota_onewire.h create mode 100644 lib/libesp32/berry/generate/be_fixed_be_class_tasmota_serial.h create mode 100644 lib/libesp32/berry/generate/be_fixed_be_class_tasmota_wire.h create mode 100644 lib/libesp32/berry/generate/be_fixed_be_class_tcpclient.h create mode 100644 lib/libesp32/berry/generate/be_fixed_be_class_webclient.h create mode 100644 lib/libesp32/berry/generate/be_fixed_cb.h create mode 100644 lib/libesp32/berry/generate/be_fixed_debug.h create mode 100644 lib/libesp32/berry/generate/be_fixed_flash.h create mode 100644 lib/libesp32/berry/generate/be_fixed_gc.h create mode 100644 lib/libesp32/berry/generate/be_fixed_global.h create mode 100644 lib/libesp32/berry/generate/be_fixed_gpio.h create mode 100644 lib/libesp32/berry/generate/be_fixed_introspect.h create mode 100644 lib/libesp32/berry/generate/be_fixed_json.h create mode 100644 lib/libesp32/berry/generate/be_fixed_light.h create mode 100644 lib/libesp32/berry/generate/be_fixed_m_builtin.h create mode 100644 lib/libesp32/berry/generate/be_fixed_math.h create mode 100644 lib/libesp32/berry/generate/be_fixed_os.h create mode 100644 lib/libesp32/berry/generate/be_fixed_path.h create mode 100644 lib/libesp32/berry/generate/be_fixed_solidify.h create mode 100644 lib/libesp32/berry/generate/be_fixed_strict.h create mode 100644 lib/libesp32/berry/generate/be_fixed_string.h create mode 100644 lib/libesp32/berry/generate/be_fixed_sys.h create mode 100644 lib/libesp32/berry/generate/be_fixed_tasmota_path.h create mode 100644 lib/libesp32/berry/generate/be_fixed_time.h create mode 100644 lib/libesp32/berry/generate/be_fixed_webserver.h create mode 100644 lib/libesp32/berry/include/be_ctypes.h create mode 100644 lib/libesp32/berry/include/be_lvgl.h create mode 100644 lib/libesp32/berry/library.json create mode 100644 lib/libesp32/berry/src/be_api.c create mode 100644 lib/libesp32/berry/src/be_baselib.c create mode 100644 lib/libesp32/berry/src/be_bytecode.c create mode 100644 lib/libesp32/berry/src/be_bytecode.h create mode 100644 lib/libesp32/berry/src/be_byteslib.c create mode 100644 lib/libesp32/berry/src/be_class.c create mode 100644 lib/libesp32/berry/src/be_class.h create mode 100644 lib/libesp32/berry/src/be_code.c create mode 100644 lib/libesp32/berry/src/be_code.h create mode 100644 lib/libesp32/berry/src/be_constobj.h create mode 100644 lib/libesp32/berry/src/be_debug.c create mode 100644 lib/libesp32/berry/src/be_debug.h create mode 100644 lib/libesp32/berry/src/be_debuglib.c create mode 100644 lib/libesp32/berry/src/be_decoder.h create mode 100644 lib/libesp32/berry/src/be_exec.c create mode 100644 lib/libesp32/berry/src/be_exec.h create mode 100644 lib/libesp32/berry/src/be_filelib.c create mode 100644 lib/libesp32/berry/src/be_func.c create mode 100644 lib/libesp32/berry/src/be_func.h create mode 100644 lib/libesp32/berry/src/be_gc.c create mode 100644 lib/libesp32/berry/src/be_gc.h create mode 100644 lib/libesp32/berry/src/be_gclib.c create mode 100644 lib/libesp32/berry/src/be_globallib.c create mode 100644 lib/libesp32/berry/src/be_introspectlib.c create mode 100644 lib/libesp32/berry/src/be_jsonlib.c create mode 100644 lib/libesp32/berry/src/be_lexer.c create mode 100644 lib/libesp32/berry/src/be_lexer.h create mode 100644 lib/libesp32/berry/src/be_libs.c create mode 100644 lib/libesp32/berry/src/be_libs.h create mode 100644 lib/libesp32/berry/src/be_list.c create mode 100644 lib/libesp32/berry/src/be_list.h create mode 100644 lib/libesp32/berry/src/be_listlib.c create mode 100644 lib/libesp32/berry/src/be_map.c create mode 100644 lib/libesp32/berry/src/be_map.h create mode 100644 lib/libesp32/berry/src/be_maplib.c create mode 100644 lib/libesp32/berry/src/be_mathlib.c create mode 100644 lib/libesp32/berry/src/be_mem.c create mode 100644 lib/libesp32/berry/src/be_mem.h create mode 100644 lib/libesp32/berry/src/be_module.c create mode 100644 lib/libesp32/berry/src/be_module.h create mode 100644 lib/libesp32/berry/src/be_object.c create mode 100644 lib/libesp32/berry/src/be_object.h create mode 100644 lib/libesp32/berry/src/be_opcodes.h create mode 100644 lib/libesp32/berry/src/be_oslib.c create mode 100644 lib/libesp32/berry/src/be_parser.c create mode 100644 lib/libesp32/berry/src/be_parser.h create mode 100644 lib/libesp32/berry/src/be_rangelib.c create mode 100644 lib/libesp32/berry/src/be_repl.c create mode 100644 lib/libesp32/berry/src/be_repl.h create mode 100644 lib/libesp32/berry/src/be_solidifylib.c create mode 100644 lib/libesp32/berry/src/be_strictlib.c create mode 100644 lib/libesp32/berry/src/be_string.c create mode 100644 lib/libesp32/berry/src/be_string.h create mode 100644 lib/libesp32/berry/src/be_strlib.c create mode 100644 lib/libesp32/berry/src/be_strlib.h create mode 100644 lib/libesp32/berry/src/be_sys.h create mode 100644 lib/libesp32/berry/src/be_syslib.c create mode 100644 lib/libesp32/berry/src/be_timelib.c create mode 100644 lib/libesp32/berry/src/be_var.c create mode 100644 lib/libesp32/berry/src/be_var.h create mode 100644 lib/libesp32/berry/src/be_vector.c create mode 100644 lib/libesp32/berry/src/be_vector.h create mode 100644 lib/libesp32/berry/src/be_vm.c create mode 100644 lib/libesp32/berry/src/be_vm.h create mode 100644 lib/libesp32/berry/src/berry.h create mode 100644 lib/libesp32/berry/src/berry_conf.h create mode 100755 lib/libesp32/berry/testall.be create mode 100644 lib/libesp32/berry/tests/assignment.be create mode 100644 lib/libesp32/berry/tests/bool.be create mode 100644 lib/libesp32/berry/tests/bytes.be create mode 100644 lib/libesp32/berry/tests/bytes_b64.be create mode 100644 lib/libesp32/berry/tests/bytes_fixed.be create mode 100644 lib/libesp32/berry/tests/checkspace.be create mode 100644 lib/libesp32/berry/tests/class.be create mode 100644 lib/libesp32/berry/tests/class_const.be create mode 100644 lib/libesp32/berry/tests/closure.be create mode 100644 lib/libesp32/berry/tests/compiler.be create mode 100644 lib/libesp32/berry/tests/compound.be create mode 100644 lib/libesp32/berry/tests/cond_expr.be create mode 100644 lib/libesp32/berry/tests/debug.be create mode 100644 lib/libesp32/berry/tests/exceptions.be create mode 100644 lib/libesp32/berry/tests/for.be create mode 100644 lib/libesp32/berry/tests/function.be create mode 100644 lib/libesp32/berry/tests/global.be create mode 100644 lib/libesp32/berry/tests/introspect.be create mode 100644 lib/libesp32/berry/tests/json.be create mode 100644 lib/libesp32/berry/tests/lexer.be create mode 100644 lib/libesp32/berry/tests/lexergc.be create mode 100644 lib/libesp32/berry/tests/list.be create mode 100644 lib/libesp32/berry/tests/member_indirect.be create mode 100644 lib/libesp32/berry/tests/os.be create mode 100644 lib/libesp32/berry/tests/overload.be create mode 100644 lib/libesp32/berry/tests/relop.be create mode 100644 lib/libesp32/berry/tests/string.be create mode 100644 lib/libesp32/berry/tests/subobject.be create mode 100644 lib/libesp32/berry/tests/suffix.be create mode 100644 lib/libesp32/berry/tests/super_auto.be create mode 100644 lib/libesp32/berry/tests/super_leveled.be create mode 100644 lib/libesp32/berry/tests/vararg.be create mode 100644 lib/libesp32/berry/tests/virtual_methods.be create mode 100644 lib/libesp32/berry/tests/virtual_methods2.be create mode 100644 lib/libesp32/berry/tools/coc/.gitignore create mode 100644 lib/libesp32/berry/tools/coc/Makefile create mode 100644 lib/libesp32/berry/tools/coc/REEADME.md create mode 100755 lib/libesp32/berry/tools/coc/block_builder.cpp create mode 100755 lib/libesp32/berry/tools/coc/block_builder.h create mode 100644 lib/libesp32/berry/tools/coc/coc_parser.cpp create mode 100644 lib/libesp32/berry/tools/coc/coc_parser.h create mode 100644 lib/libesp32/berry/tools/coc/coc_string.cpp create mode 100644 lib/libesp32/berry/tools/coc/coc_string.h create mode 100755 lib/libesp32/berry/tools/coc/hash_map.cpp create mode 100755 lib/libesp32/berry/tools/coc/hash_map.h create mode 100644 lib/libesp32/berry/tools/coc/macro_table.cpp create mode 100644 lib/libesp32/berry/tools/coc/macro_table.h create mode 100755 lib/libesp32/berry/tools/coc/main.cpp create mode 100644 lib/libesp32/berry/tools/coc/main.h create mode 100644 lib/libesp32/berry/tools/coc/object_block.h create mode 100644 lib/libesp32/berry/tools/coc/str_build.cpp create mode 100644 lib/libesp32/berry/tools/coc/str_build.h create mode 100755 lib/libesp32/berry/tools/grammar/berry.bytecode create mode 100644 lib/libesp32/berry/tools/grammar/berry.ebnf create mode 100755 lib/libesp32/berry/tools/grammar/const_obj.ebnf create mode 100644 lib/libesp32/berry/tools/grammar/json.ebnf create mode 100755 lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/.vsixmanifest create mode 100755 lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/CHANGELOG.md create mode 100755 lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/README.md create mode 100755 lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/berry-configuration.json create mode 100644 lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/berry-icon.png create mode 100755 lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/package.json create mode 100755 lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/syntaxes/berry.json create mode 100755 lib/libesp32/berry/tools/plugins/vscode/skiars.berry-0.1.0/syntaxes/bytecode.json create mode 100644 lib/libesp32/berry/tools/pycoc/block_builder.py create mode 100644 lib/libesp32/berry/tools/pycoc/coc_parser.py create mode 100644 lib/libesp32/berry/tools/pycoc/coc_string.py create mode 100644 lib/libesp32/berry/tools/pycoc/coc_string_test.py create mode 100644 lib/libesp32/berry/tools/pycoc/hash_map.py create mode 100644 lib/libesp32/berry/tools/pycoc/macro_table.py create mode 100644 lib/libesp32/berry/tools/pycoc/main.py create mode 100644 lib/libesp32/berry/tools/pycoc/str_build.py diff --git a/lib/libesp32/berry/LICENSE b/lib/libesp32/berry/LICENSE new file mode 100644 index 000000000..609969272 --- /dev/null +++ b/lib/libesp32/berry/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2018-2020 Guan Wenliang + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/lib/libesp32/berry/Makefile b/lib/libesp32/berry/Makefile new file mode 100644 index 000000000..f9d61125d --- /dev/null +++ b/lib/libesp32/berry/Makefile @@ -0,0 +1,105 @@ +CFLAGS = -Wall -Wextra -std=c99 -pedantic-errors -O2 +LIBS = -lm +TARGET = berry +CC ?= gcc +MKDIR = mkdir +LFLAGS = + +INCPATH = src default +SRCPATH = src default +GENERATE = generate +CONFIG = default/berry_conf.h +COC = tools/coc/coc +PY = python3 +PYCOC = tools/pycoc/main.py +CONST_TAB = $(GENERATE)/be_const_strtab.h +MAKE_COC = $(MAKE) -C tools/coc + +ifeq ($(OS), Windows_NT) # Windows + CFLAGS += -Wno-format # for "%I64d" warning + LFLAGS += -Wl,--out-implib,berry.lib # export symbols lib for dll linked + TARGET := $(TARGET).exe + COC := $(COC).exe + PY := $(PY).exe +else + CFLAGS += -DUSE_READLINE_LIB + LIBS += -lreadline -ldl + OS := $(shell uname) + ifeq ($(OS), Linux) + LFLAGS += -Wl,--export-dynamic + endif +endif + +ifneq ($(V), 1) + Q=@ + MSG=@echo + MAKE_COC += -s Q=$(Q) +else + MSG=@true +endif + +ifeq ($(TEST), 1) + CFLAGS += -fprofile-arcs -ftest-coverage + LFLAGS += -fprofile-arcs -ftest-coverage +endif + +SRCS = $(foreach dir, $(SRCPATH), $(wildcard $(dir)/*.c)) +OBJS = $(patsubst %.c, %.o, $(SRCS)) +DEPS = $(patsubst %.c, %.d, $(SRCS)) +INCFLAGS = $(foreach dir, $(INCPATH), -I"$(dir)") + +.PHONY : clean + +all: $(TARGET) + +debug: CFLAGS += -O0 -g -DBE_DEBUG +debug: all + +test: CFLAGS += --coverage +test: LFLAGS += --coverage +test: all + $(MSG) [Run Testcases...] + $(Q) ./testall.be + $(Q) $(RM) */*.gcno */*.gcda + +$(TARGET): $(OBJS) + $(MSG) [Linking...] + $(Q) $(CC) $(OBJS) $(LFLAGS) $(LIBS) -o $@ + $(MSG) done + +$(OBJS): %.o: %.c + $(MSG) [Compile] $< + $(Q) $(CC) -MM $(CFLAGS) $(INCFLAGS) -MT"$*.d" -MT"$(<:.c=.o)" $< > $*.d + $(Q) $(CC) $(CFLAGS) $(INCFLAGS) -c $< -o $@ + +sinclude $(DEPS) + +$(OBJS): $(CONST_TAB) + +$(CONST_TAB): $(COC) $(GENERATE) $(SRCS) $(CONFIG) + $(MSG) [Prebuild] generate resources + $(Q) $(COC) -i $(SRCPATH) -c $(CONFIG) -o $(GENERATE) + +$(GENERATE): + $(Q) $(MKDIR) $(GENERATE) + +$(COC): + $(MSG) [Make] coc + $(Q) $(MAKE_COC) + +install: + cp $(TARGET) /usr/local/bin + +uninstall: + $(RM) /usr/local/bin/$(TARGET) + +prebuild: $(COC) $(GENERATE) + $(MSG) [Prebuild] generate resources + $(Q) $(PY) $(PYCOC) -o $(GENERATE) $(SRCPATH) -c $(CONFIG) + $(MSG) done + +clean: + $(MSG) [Clean...] + $(Q) $(RM) $(OBJS) $(DEPS) $(GENERATE)/* berry.lib + $(Q) $(MAKE_COC) clean + $(MSG) done diff --git a/lib/libesp32/berry/README.md b/lib/libesp32/berry/README.md new file mode 100644 index 000000000..6d02dcd38 --- /dev/null +++ b/lib/libesp32/berry/README.md @@ -0,0 +1,163 @@ +

+

+ Berry +

+

The Berry Script Language.

+

+ +## Introduction + +Berry is a ultra-lightweight dynamically typed embedded scripting language. It is designed for lower-performance embedded devices. The Berry interpreter-core's code size is less than 40KiB and can run on less than 4KiB heap (on ARM Cortex M4 CPU, Thumb ISA and ARMCC compiler). + +The interpreter of Berry include a one-pass compiler and register-based VM, all the code is written in ANSI C99. In Berry not every type is a class object. Some simple value types, such as int, real, boolean and string are not class object, but list, map and range are class object. This is a consideration about performance. +Register-based VM is the same meaning as above. + +Berry has the following advantages: + +* Lightweight: A well-optimized interpreter with very little resources. Ideal for use in microprocessors. +* Fast: optimized one-pass bytecode compiler and register-based virtual machine. +* Powerful: supports imperative programming, object-oriented programming, functional programming. +* Flexible: Berry is a dynamic type script, and it's intended for embedding in applications. It can provide good dynamic scalability for the host system. +* Simple: simple and natural syntax, support garbage collection, and easy to use FFI (foreign function interface). +* RAM saving: With compile-time object construction, most of the constant objects are stored in read-only code data segments, so the RAM usage of the interpreter is very low when it starts. + +## Documents + +LaTeX documents repository: [https://github.com/Skiars/berry_doc](https://github.com/Skiars/berry_doc) + +Short Manual: [berry_short_manual.pdf](https://github.com/Skiars/berry_doc/releases/download/latest/berry_short_manual.pdf). + +Reference Manual: [berry_rm_en_us.pdf](https://github.com/Skiars/berry_doc/releases/download/latest/berry_rm_en_us.pdf), [berry_rm_zh_cn.pdf](https://github.com/Skiars/berry_doc/releases/download/latest/berry_rm_zh_cn.pdf). + +Berry's EBNF grammar definition: [tools/grammar/berry.ebnf](./tools/grammar/berry.ebnf) + +## Features + +* Base Type + * Nil: `nil` + * Boolean: `true` and `false` + * Numerical: Integer (`int`) and Real (`real`) + * String: Single quotation-mark string and double quotation-mark string + * Class: Instance template, read only + * Instance: Object constructed by class + * Module: Read-write key-value pair table + * List: Ordered container, like `[1, 2, 3]` + * Map: Hash Map container, like `{ 'a': 1, 2: 3, 'map': {} }` + * Range: include a lower and a upper integer value, like `0..5` +* Operator and Expression + * Assign operator: `=`, `+=`, `-=`, `*=`, `/=`, `%=`, `&=`, `|=`, `^=`, `<<=`, `>>=` + * Relational operator: `<`, `<=`, `==`, `!=`, `>`, `>=` + * Logic operator: `&&`, `||`, `!` + * Arithmetic operator: `+`, `-`, `*`, `/`, `%` + * Bitwise operator: `&`, `|`, `~`, `^`, `<<`, `>>` + * Field operator: `.` + * Subscript operator: `[]` + * Connect string operator: `+` + * Conditional operator: `? :` + * Brackets: `()` +* Control Structure + * Conditional statement: `if-else` + * Iteration statement: `while` and `for` + * Jump statement: `break` and `continue` +* Function + * Local variable and block scope + * Return statement + * Nested functions definition + * Closure based on Upvalue + * Anonymous function + * Lambda expression +* Class + * Inheritance (only public single inheritance) + * Method and Operator Overload + * Constructor method + * Destructive method +* Module Management + * Built-in module that takes almost no RAM + * Extension module support: script module, bytecode file module and shared library (like *.so, *.dll) module +* GC (Garbage collection) + * Mark-Sweep GC +* Exceptional Handling + * Throw any exception value using the `raise` statement + * Multiple catch mode +* Bytecode file support + * Export function to bytecode file + * Load the bytecode file and execute + +## Build and Run + +1. Install the readline library (Windows does not need): + + ``` bash + sudo apt install libreadline-dev # Ubuntu + brew install readline # MacOS + ``` + +2. Build (The default compiler is GCC): + + ``` + make + ``` + +3. Run: + + ``` bash + ./berry # Bash or PowerShell + berry # Windows CMD + ``` + +4. Install (Only Unix-like): + + ``` bash + make install + ``` + +## Editor pulgins + +[Visual Studio Code](https://code.visualstudio.com/) pulgin are in this directory: [./tools/pulgins/vscode](./tools/pulgins/vscode). + +## Examples + +After compiling successfully, use the `berry` command with no parameters to enter the REPL environment: +``` +Berry 0.0.1 (build in Dec 24 2018, 18:12:49) +[GCC 8.2.0] on Linux (default) +> +``` + +Now enter this code: + +``` lua +print("Hello world!") +``` + +You will see this output: + +``` +Hello world! +``` + +You can copy this code to the REPL: + +``` ruby +def fib(x) + if x <= 1 + return x + end + return fib(x - 1) + fib(x - 2) +end +fib(10) +``` + +This example code will output the result `55` and you can save the above code to a plain text file (eg test.be) and run this command: + +``` bash +./berry test.be +``` + +This will also get the correct output. + +## License + +Berry is free software distributed under the [MIT license](./LICENSE). + +The Berry interpreter partly referred to [Lua](http://www.lua.org/)'s design. View Lua's license here: http://www.lua.org/license.html. diff --git a/lib/libesp32/berry/berry-logo.png b/lib/libesp32/berry/berry-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..1eb41908963a04e02ea5aa91d264903b1c0895e2 GIT binary patch literal 11325 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 literal 0 HcmV?d00001 diff --git a/lib/libesp32/berry/default/be_animate_lib.c b/lib/libesp32/berry/default/be_animate_lib.c new file mode 100644 index 000000000..398f87b66 --- /dev/null +++ b/lib/libesp32/berry/default/be_animate_lib.c @@ -0,0 +1,712 @@ +/******************************************************************** + * Berry module `animate` + * + * To use: `import animate` + * + *******************************************************************/ +#include "be_constobj.h" + +/******************************************************************** +** Solidified function: init +********************************************************************/ +be_local_closure(Animate_rotate_init, /* name */ + be_nested_proto( + 12, /* nstack */ + 5, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 8]) { /* constants */ + /* K0 */ be_nested_str(init), + /* K1 */ be_nested_str(closure), + /* K2 */ be_nested_str(code), + /* K3 */ be_nested_str(push), + /* K4 */ be_nested_str(animate), + /* K5 */ be_nested_str(ins_ramp), + /* K6 */ be_nested_str(ins_goto), + /* K7 */ be_const_int(0), + }), + &be_const_str_init, + &be_const_str_solidified, + ( &(const binstruction[25]) { /* code */ + 0x60140003, // 0000 GETGBL R5 G3 + 0x5C180000, // 0001 MOVE R6 R0 + 0x7C140200, // 0002 CALL R5 1 + 0x8C140B00, // 0003 GETMET R5 R5 K0 + 0x7C140200, // 0004 CALL R5 1 + 0x90020201, // 0005 SETMBR R0 K1 R1 + 0x88140102, // 0006 GETMBR R5 R0 K2 + 0x8C140B03, // 0007 GETMET R5 R5 K3 + 0xB81E0800, // 0008 GETNGBL R7 K4 + 0x8C1C0F05, // 0009 GETMET R7 R7 K5 + 0x5C240400, // 000A MOVE R9 R2 + 0x5C280600, // 000B MOVE R10 R3 + 0x5C2C0800, // 000C MOVE R11 R4 + 0x7C1C0800, // 000D CALL R7 4 + 0x7C140400, // 000E CALL R5 2 + 0x88140102, // 000F GETMBR R5 R0 K2 + 0x8C140B03, // 0010 GETMET R5 R5 K3 + 0xB81E0800, // 0011 GETNGBL R7 K4 + 0x8C1C0F06, // 0012 GETMET R7 R7 K6 + 0x58240007, // 0013 LDCONST R9 K7 + 0x58280007, // 0014 LDCONST R10 K7 + 0x582C0007, // 0015 LDCONST R11 K7 + 0x7C1C0800, // 0016 CALL R7 4 + 0x7C140400, // 0017 CALL R5 2 + 0x80000000, // 0018 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified class: Animate_rotate +********************************************************************/ +extern const bclass be_class_Animate_engine; +be_local_class(Animate_rotate, + 0, + &be_class_Animate_engine, + be_nested_map(1, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(init, -1), be_const_closure(Animate_rotate_init_closure) }, + })), + be_str_literal("Animate_rotate") +); + +/******************************************************************** +** Solidified function: init +********************************************************************/ +be_local_closure(Animate_from_to_init, /* name */ + be_nested_proto( + 12, /* nstack */ + 5, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 6]) { /* constants */ + /* K0 */ be_nested_str(init), + /* K1 */ be_nested_str(closure), + /* K2 */ be_nested_str(code), + /* K3 */ be_nested_str(push), + /* K4 */ be_nested_str(animate), + /* K5 */ be_nested_str(ins_ramp), + }), + &be_const_str_init, + &be_const_str_solidified, + ( &(const binstruction[16]) { /* code */ + 0x60140003, // 0000 GETGBL R5 G3 + 0x5C180000, // 0001 MOVE R6 R0 + 0x7C140200, // 0002 CALL R5 1 + 0x8C140B00, // 0003 GETMET R5 R5 K0 + 0x7C140200, // 0004 CALL R5 1 + 0x90020201, // 0005 SETMBR R0 K1 R1 + 0x88140102, // 0006 GETMBR R5 R0 K2 + 0x8C140B03, // 0007 GETMET R5 R5 K3 + 0xB81E0800, // 0008 GETNGBL R7 K4 + 0x8C1C0F05, // 0009 GETMET R7 R7 K5 + 0x5C240400, // 000A MOVE R9 R2 + 0x5C280600, // 000B MOVE R10 R3 + 0x5C2C0800, // 000C MOVE R11 R4 + 0x7C1C0800, // 000D CALL R7 4 + 0x7C140400, // 000E CALL R5 2 + 0x80000000, // 000F RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified class: Animate_from_to +********************************************************************/ +extern const bclass be_class_Animate_engine; +be_local_class(Animate_from_to, + 0, + &be_class_Animate_engine, + be_nested_map(1, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(init, -1), be_const_closure(Animate_from_to_init_closure) }, + })), + be_str_literal("Animate_from_to") +); + +/******************************************************************** +** Solidified function: init +********************************************************************/ +be_local_closure(Animate_back_forth_init, /* name */ + be_nested_proto( + 12, /* nstack */ + 5, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 9]) { /* constants */ + /* K0 */ be_nested_str(init), + /* K1 */ be_nested_str(closure), + /* K2 */ be_nested_str(code), + /* K3 */ be_nested_str(push), + /* K4 */ be_nested_str(animate), + /* K5 */ be_nested_str(ins_ramp), + /* K6 */ be_const_int(2), + /* K7 */ be_nested_str(ins_goto), + /* K8 */ be_const_int(0), + }), + &be_const_str_init, + &be_const_str_solidified, + ( &(const binstruction[34]) { /* code */ + 0x60140003, // 0000 GETGBL R5 G3 + 0x5C180000, // 0001 MOVE R6 R0 + 0x7C140200, // 0002 CALL R5 1 + 0x8C140B00, // 0003 GETMET R5 R5 K0 + 0x7C140200, // 0004 CALL R5 1 + 0x90020201, // 0005 SETMBR R0 K1 R1 + 0x88140102, // 0006 GETMBR R5 R0 K2 + 0x8C140B03, // 0007 GETMET R5 R5 K3 + 0xB81E0800, // 0008 GETNGBL R7 K4 + 0x8C1C0F05, // 0009 GETMET R7 R7 K5 + 0x5C240400, // 000A MOVE R9 R2 + 0x5C280600, // 000B MOVE R10 R3 + 0x0C2C0906, // 000C DIV R11 R4 K6 + 0x7C1C0800, // 000D CALL R7 4 + 0x7C140400, // 000E CALL R5 2 + 0x88140102, // 000F GETMBR R5 R0 K2 + 0x8C140B03, // 0010 GETMET R5 R5 K3 + 0xB81E0800, // 0011 GETNGBL R7 K4 + 0x8C1C0F05, // 0012 GETMET R7 R7 K5 + 0x5C240600, // 0013 MOVE R9 R3 + 0x5C280400, // 0014 MOVE R10 R2 + 0x0C2C0906, // 0015 DIV R11 R4 K6 + 0x7C1C0800, // 0016 CALL R7 4 + 0x7C140400, // 0017 CALL R5 2 + 0x88140102, // 0018 GETMBR R5 R0 K2 + 0x8C140B03, // 0019 GETMET R5 R5 K3 + 0xB81E0800, // 001A GETNGBL R7 K4 + 0x8C1C0F07, // 001B GETMET R7 R7 K7 + 0x58240008, // 001C LDCONST R9 K8 + 0x58280008, // 001D LDCONST R10 K8 + 0x582C0008, // 001E LDCONST R11 K8 + 0x7C1C0800, // 001F CALL R7 4 + 0x7C140400, // 0020 CALL R5 2 + 0x80000000, // 0021 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified class: Animate_back_forth +********************************************************************/ +extern const bclass be_class_Animate_engine; +be_local_class(Animate_back_forth, + 0, + &be_class_Animate_engine, + be_nested_map(1, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(init, -1), be_const_closure(Animate_back_forth_init_closure) }, + })), + be_str_literal("Animate_back_forth") +); + +/******************************************************************** +** Solidified function: init +********************************************************************/ +be_local_closure(Animate_ins_goto_init, /* name */ + be_nested_proto( + 4, /* nstack */ + 4, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(pc_rel), + /* K1 */ be_nested_str(pc_abs), + /* K2 */ be_nested_str(duration), + }), + &be_const_str_init, + &be_const_str_solidified, + ( &(const binstruction[ 4]) { /* code */ + 0x90020001, // 0000 SETMBR R0 K0 R1 + 0x90020202, // 0001 SETMBR R0 K1 R2 + 0x90020403, // 0002 SETMBR R0 K2 R3 + 0x80000000, // 0003 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified class: Animate_ins_goto +********************************************************************/ +be_local_class(Animate_ins_goto, + 3, + NULL, + be_nested_map(4, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(pc_rel, -1), be_const_var(0) }, + { be_const_key(duration, -1), be_const_var(2) }, + { be_const_key(pc_abs, -1), be_const_var(1) }, + { be_const_key(init, 2), be_const_closure(Animate_ins_goto_init_closure) }, + })), + be_str_literal("Animate_ins_goto") +); + +/******************************************************************** +** Solidified function: init +********************************************************************/ +be_local_closure(Animate_ins_ramp_init, /* name */ + be_nested_proto( + 4, /* nstack */ + 4, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(a), + /* K1 */ be_nested_str(b), + /* K2 */ be_nested_str(duration), + }), + &be_const_str_init, + &be_const_str_solidified, + ( &(const binstruction[ 4]) { /* code */ + 0x90020001, // 0000 SETMBR R0 K0 R1 + 0x90020202, // 0001 SETMBR R0 K1 R2 + 0x90020403, // 0002 SETMBR R0 K2 R3 + 0x80000000, // 0003 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified class: Animate_ins_ramp +********************************************************************/ +be_local_class(Animate_ins_ramp, + 3, + NULL, + be_nested_map(4, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(a, -1), be_const_var(0) }, + { be_const_key(b, 2), be_const_var(1) }, + { be_const_key(duration, -1), be_const_var(2) }, + { be_const_key(init, -1), be_const_closure(Animate_ins_ramp_init_closure) }, + })), + be_str_literal("Animate_ins_ramp") +); + +/******************************************************************** +** Solidified function: run +********************************************************************/ +be_local_closure(Animate_engine_run, /* name */ + be_nested_proto( + 6, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 6]) { /* constants */ + /* K0 */ be_nested_str(tasmota), + /* K1 */ be_nested_str(millis), + /* K2 */ be_nested_str(value), + /* K3 */ be_nested_str(ins_time), + /* K4 */ be_nested_str(running), + /* K5 */ be_nested_str(add_driver), + }), + &be_const_str_run, + &be_const_str_solidified, + ( &(const binstruction[19]) { /* code */ + 0x4C0C0000, // 0000 LDNIL R3 + 0x1C0C0203, // 0001 EQ R3 R1 R3 + 0x780E0003, // 0002 JMPF R3 #0007 + 0xB80E0000, // 0003 GETNGBL R3 K0 + 0x8C0C0701, // 0004 GETMET R3 R3 K1 + 0x7C0C0200, // 0005 CALL R3 1 + 0x5C040600, // 0006 MOVE R1 R3 + 0x4C0C0000, // 0007 LDNIL R3 + 0x200C0403, // 0008 NE R3 R2 R3 + 0x780E0000, // 0009 JMPF R3 #000B + 0x90020402, // 000A SETMBR R0 K2 R2 + 0x90020601, // 000B SETMBR R0 K3 R1 + 0x500C0200, // 000C LDBOOL R3 1 0 + 0x90020803, // 000D SETMBR R0 K4 R3 + 0xB80E0000, // 000E GETNGBL R3 K0 + 0x8C0C0705, // 000F GETMET R3 R3 K5 + 0x5C140000, // 0010 MOVE R5 R0 + 0x7C0C0400, // 0011 CALL R3 2 + 0x80000000, // 0012 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: init +********************************************************************/ +be_local_closure(Animate_engine_init, /* name */ + be_nested_proto( + 2, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 5]) { /* constants */ + /* K0 */ be_nested_str(code), + /* K1 */ be_nested_str(pc), + /* K2 */ be_const_int(0), + /* K3 */ be_nested_str(ins_time), + /* K4 */ be_nested_str(running), + }), + &be_const_str_init, + &be_const_str_solidified, + ( &(const binstruction[ 8]) { /* code */ + 0x60040012, // 0000 GETGBL R1 G18 + 0x7C040000, // 0001 CALL R1 0 + 0x90020001, // 0002 SETMBR R0 K0 R1 + 0x90020302, // 0003 SETMBR R0 K1 K2 + 0x90020702, // 0004 SETMBR R0 K3 K2 + 0x50040000, // 0005 LDBOOL R1 0 0 + 0x90020801, // 0006 SETMBR R0 K4 R1 + 0x80000000, // 0007 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: autorun +********************************************************************/ +be_local_closure(Animate_engine_autorun, /* name */ + be_nested_proto( + 7, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(run), + /* K1 */ be_nested_str(tasmota), + /* K2 */ be_nested_str(add_driver), + }), + &be_const_str_autorun, + &be_const_str_solidified, + ( &(const binstruction[ 9]) { /* code */ + 0x8C0C0100, // 0000 GETMET R3 R0 K0 + 0x5C140200, // 0001 MOVE R5 R1 + 0x5C180400, // 0002 MOVE R6 R2 + 0x7C0C0600, // 0003 CALL R3 3 + 0xB80E0200, // 0004 GETNGBL R3 K1 + 0x8C0C0702, // 0005 GETMET R3 R3 K2 + 0x5C140000, // 0006 MOVE R5 R0 + 0x7C0C0400, // 0007 CALL R3 2 + 0x80000000, // 0008 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: stop +********************************************************************/ +be_local_closure(Animate_engine_stop, /* name */ + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(running), + /* K1 */ be_nested_str(tasmota), + /* K2 */ be_nested_str(remove_driver), + }), + &be_const_str_stop, + &be_const_str_solidified, + ( &(const binstruction[ 7]) { /* code */ + 0x50040000, // 0000 LDBOOL R1 0 0 + 0x90020001, // 0001 SETMBR R0 K0 R1 + 0xB8060200, // 0002 GETNGBL R1 K1 + 0x8C040302, // 0003 GETMET R1 R1 K2 + 0x5C0C0000, // 0004 MOVE R3 R0 + 0x7C040400, // 0005 CALL R1 2 + 0x80000000, // 0006 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: is_running +********************************************************************/ +be_local_closure(Animate_engine_is_running, /* name */ + be_nested_proto( + 2, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_str(running), + }), + &be_const_str_is_running, + &be_const_str_solidified, + ( &(const binstruction[ 2]) { /* code */ + 0x88040100, // 0000 GETMBR R1 R0 K0 + 0x80040200, // 0001 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: every_50ms +********************************************************************/ +be_local_closure(Animate_engine_every_50ms, /* name */ + be_nested_proto( + 3, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_str(animate), + }), + &be_const_str_every_50ms, + &be_const_str_solidified, + ( &(const binstruction[ 3]) { /* code */ + 0x8C040100, // 0000 GETMET R1 R0 K0 + 0x7C040200, // 0001 CALL R1 1 + 0x80000000, // 0002 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: animate +********************************************************************/ +be_local_closure(Animate_engine_animate, /* name */ + be_nested_proto( + 12, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[22]) { /* constants */ + /* K0 */ be_nested_str(running), + /* K1 */ be_nested_str(tasmota), + /* K2 */ be_nested_str(millis), + /* K3 */ be_nested_str(ins_time), + /* K4 */ be_nested_str(pc), + /* K5 */ be_nested_str(code), + /* K6 */ be_const_int(0), + /* K7 */ be_nested_str(internal_error), + /* K8 */ be_nested_str(Animate_X20pc_X20is_X20out_X20of_X20range), + /* K9 */ be_nested_str(animate), + /* K10 */ be_nested_str(ins_ramp), + /* K11 */ be_nested_str(closure), + /* K12 */ be_nested_str(duration), + /* K13 */ be_nested_str(value), + /* K14 */ be_nested_str(scale_uint), + /* K15 */ be_nested_str(a), + /* K16 */ be_nested_str(b), + /* K17 */ be_const_int(1), + /* K18 */ be_nested_str(ins_goto), + /* K19 */ be_nested_str(pc_rel), + /* K20 */ be_nested_str(pc_abs), + /* K21 */ be_nested_str(unknown_X20instruction), + }), + &be_const_str_animate, + &be_const_str_solidified, + ( &(const binstruction[99]) { /* code */ + 0x88080100, // 0000 GETMBR R2 R0 K0 + 0x740A0000, // 0001 JMPT R2 #0003 + 0x80000400, // 0002 RET 0 + 0x4C080000, // 0003 LDNIL R2 + 0x1C080202, // 0004 EQ R2 R1 R2 + 0x780A0003, // 0005 JMPF R2 #000A + 0xB80A0200, // 0006 GETNGBL R2 K1 + 0x8C080502, // 0007 GETMET R2 R2 K2 + 0x7C080200, // 0008 CALL R2 1 + 0x5C040400, // 0009 MOVE R1 R2 + 0x50080200, // 000A LDBOOL R2 1 0 + 0x780A0054, // 000B JMPF R2 #0061 + 0x88080103, // 000C GETMBR R2 R0 K3 + 0x04080202, // 000D SUB R2 R1 R2 + 0x880C0104, // 000E GETMBR R3 R0 K4 + 0x6010000C, // 000F GETGBL R4 G12 + 0x88140105, // 0010 GETMBR R5 R0 K5 + 0x7C100200, // 0011 CALL R4 1 + 0x280C0604, // 0012 GE R3 R3 R4 + 0x780E0002, // 0013 JMPF R3 #0017 + 0x500C0000, // 0014 LDBOOL R3 0 0 + 0x90020003, // 0015 SETMBR R0 K0 R3 + 0x70020049, // 0016 JMP #0061 + 0x880C0104, // 0017 GETMBR R3 R0 K4 + 0x140C0706, // 0018 LT R3 R3 K6 + 0x780E0000, // 0019 JMPF R3 #001B + 0xB0060F08, // 001A RAISE 1 K7 K8 + 0x880C0104, // 001B GETMBR R3 R0 K4 + 0x88100105, // 001C GETMBR R4 R0 K5 + 0x940C0803, // 001D GETIDX R3 R4 R3 + 0x6014000F, // 001E GETGBL R5 G15 + 0x5C180600, // 001F MOVE R6 R3 + 0xB81E1200, // 0020 GETNGBL R7 K9 + 0x881C0F0A, // 0021 GETMBR R7 R7 K10 + 0x7C140400, // 0022 CALL R5 2 + 0x78160020, // 0023 JMPF R5 #0045 + 0x8810010B, // 0024 GETMBR R4 R0 K11 + 0x8814070C, // 0025 GETMBR R5 R3 K12 + 0x14140405, // 0026 LT R5 R2 R5 + 0x7816000E, // 0027 JMPF R5 #0037 + 0xB8160200, // 0028 GETNGBL R5 K1 + 0x8C140B0E, // 0029 GETMET R5 R5 K14 + 0x5C1C0400, // 002A MOVE R7 R2 + 0x58200006, // 002B LDCONST R8 K6 + 0x8824070C, // 002C GETMBR R9 R3 K12 + 0x8828070F, // 002D GETMBR R10 R3 K15 + 0x882C0710, // 002E GETMBR R11 R3 K16 + 0x7C140C00, // 002F CALL R5 6 + 0x90021A05, // 0030 SETMBR R0 K13 R5 + 0x78120002, // 0031 JMPF R4 #0035 + 0x5C140800, // 0032 MOVE R5 R4 + 0x8818010D, // 0033 GETMBR R6 R0 K13 + 0x7C140200, // 0034 CALL R5 1 + 0x7002002A, // 0035 JMP #0061 + 0x7002000C, // 0036 JMP #0044 + 0x88140710, // 0037 GETMBR R5 R3 K16 + 0x90021A05, // 0038 SETMBR R0 K13 R5 + 0x78120002, // 0039 JMPF R4 #003D + 0x5C140800, // 003A MOVE R5 R4 + 0x8818010D, // 003B GETMBR R6 R0 K13 + 0x7C140200, // 003C CALL R5 1 + 0x88140104, // 003D GETMBR R5 R0 K4 + 0x00140B11, // 003E ADD R5 R5 K17 + 0x90020805, // 003F SETMBR R0 K4 R5 + 0x8814070C, // 0040 GETMBR R5 R3 K12 + 0x04140405, // 0041 SUB R5 R2 R5 + 0x04140205, // 0042 SUB R5 R1 R5 + 0x90020605, // 0043 SETMBR R0 K3 R5 + 0x7002001A, // 0044 JMP #0060 + 0x6010000F, // 0045 GETGBL R4 G15 + 0x5C140600, // 0046 MOVE R5 R3 + 0xB81A1200, // 0047 GETNGBL R6 K9 + 0x88180D12, // 0048 GETMBR R6 R6 K18 + 0x7C100400, // 0049 CALL R4 2 + 0x78120013, // 004A JMPF R4 #005F + 0x8810070C, // 004B GETMBR R4 R3 K12 + 0x14100404, // 004C LT R4 R2 R4 + 0x78120001, // 004D JMPF R4 #0050 + 0x70020011, // 004E JMP #0061 + 0x7002000D, // 004F JMP #005E + 0x88100713, // 0050 GETMBR R4 R3 K19 + 0x20100906, // 0051 NE R4 R4 K6 + 0x78120004, // 0052 JMPF R4 #0058 + 0x88100104, // 0053 GETMBR R4 R0 K4 + 0x88140713, // 0054 GETMBR R5 R3 K19 + 0x00100805, // 0055 ADD R4 R4 R5 + 0x90020804, // 0056 SETMBR R0 K4 R4 + 0x70020001, // 0057 JMP #005A + 0x88100714, // 0058 GETMBR R4 R3 K20 + 0x90020804, // 0059 SETMBR R0 K4 R4 + 0x8810070C, // 005A GETMBR R4 R3 K12 + 0x04100404, // 005B SUB R4 R2 R4 + 0x04100204, // 005C SUB R4 R1 R4 + 0x90020604, // 005D SETMBR R0 K3 R4 + 0x70020000, // 005E JMP #0060 + 0xB0060F15, // 005F RAISE 1 K7 K21 + 0x7001FFA8, // 0060 JMP #000A + 0x8808010D, // 0061 GETMBR R2 R0 K13 + 0x80040400, // 0062 RET 1 R2 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified class: Animate_engine +********************************************************************/ +be_local_class(Animate_engine, + 6, + NULL, + be_nested_map(13, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(code, -1), be_const_var(0) }, + { be_const_key(run, 4), be_const_closure(Animate_engine_run_closure) }, + { be_const_key(running, 8), be_const_var(4) }, + { be_const_key(init, -1), be_const_closure(Animate_engine_init_closure) }, + { be_const_key(autorun, -1), be_const_closure(Animate_engine_autorun_closure) }, + { be_const_key(value, -1), be_const_var(5) }, + { be_const_key(stop, 3), be_const_closure(Animate_engine_stop_closure) }, + { be_const_key(pc, -1), be_const_var(2) }, + { be_const_key(is_running, 11), be_const_closure(Animate_engine_is_running_closure) }, + { be_const_key(every_50ms, 10), be_const_closure(Animate_engine_every_50ms_closure) }, + { be_const_key(animate, -1), be_const_closure(Animate_engine_animate_closure) }, + { be_const_key(closure, -1), be_const_var(1) }, + { be_const_key(ins_time, 9), be_const_var(3) }, + })), + be_str_literal("Animate_engine") +); + +/******************************************************************** +** Solidified module: animate +********************************************************************/ +be_local_module(animate, + "animate", + be_nested_map(6, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(rotate, 2), be_const_class(be_class_Animate_rotate) }, + { be_const_key(from_to, 3), be_const_class(be_class_Animate_from_to) }, + { be_const_key(back_forth, -1), be_const_class(be_class_Animate_back_forth) }, + { be_const_key(ins_goto, -1), be_const_class(be_class_Animate_ins_goto) }, + { be_const_key(ins_ramp, -1), be_const_class(be_class_Animate_ins_ramp) }, + { be_const_key(engine, -1), be_const_class(be_class_Animate_engine) }, + })) +); +BE_EXPORT_VARIABLE be_define_const_native_module(animate); +/********************************************************************/ diff --git a/lib/libesp32/berry/default/be_autoconf_lib.c b/lib/libesp32/berry/default/be_autoconf_lib.c new file mode 100644 index 000000000..da41707c7 --- /dev/null +++ b/lib/libesp32/berry/default/be_autoconf_lib.c @@ -0,0 +1,1394 @@ +/******************************************************************** + * Tasmota lib + * + * To use: `import autoconf` + * + *******************************************************************/ +#include "be_constobj.h" + + +/******************************************************************** +** Solidified function: page_autoconf_ctl +********************************************************************/ +be_local_closure(Autoconf_page_autoconf_ctl, /* name */ + be_nested_proto( + 13, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[41]) { /* constants */ + /* K0 */ be_nested_str(webserver), + /* K1 */ be_nested_str(string), + /* K2 */ be_nested_str(path), + /* K3 */ be_nested_str(check_privileged_access), + /* K4 */ be_nested_str(has_arg), + /* K5 */ be_nested_str(reapply), + /* K6 */ be_nested_str(tasmota), + /* K7 */ be_nested_str(log), + /* K8 */ be_nested_str(CFG_X3A_X20removing_X20first_X20time_X20marker), + /* K9 */ be_const_int(2), + /* K10 */ be_nested_str(clear_first_time), + /* K11 */ be_nested_str(redirect), + /* K12 */ be_nested_str(_X2F_X3Frst_X3D), + /* K13 */ be_nested_str(zip), + /* K14 */ be_nested_str(CFG_X3A_X20removing_X20autoconf_X20files), + /* K15 */ be_nested_str(delete_all_configs), + /* K16 */ be_nested_str(arg), + /* K17 */ be_nested_str(reset), + /* K18 */ be_nested_str(format), + /* K19 */ be_nested_str(https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_X2F_X25s_X2Eautoconf), + /* K20 */ be_nested_str(arch), + /* K21 */ be_nested_str(CFG_X3A_X20downloading_X20_X27_X25s_X27), + /* K22 */ be_nested_str(_X25s_X2Eautoconf), + /* K23 */ be_nested_str(webclient), + /* K24 */ be_nested_str(begin), + /* K25 */ be_nested_str(GET), + /* K26 */ be_nested_str(return_X20code_X3D_X25i), + /* K27 */ be_nested_str(connection_error), + /* K28 */ be_nested_str(write_file), + /* K29 */ be_nested_str(close), + /* K30 */ be_nested_str(value_error), + /* K31 */ be_nested_str(Unknown_X20command), + /* K32 */ be_nested_str(CFG_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s), + /* K33 */ be_nested_str(content_start), + /* K34 */ be_nested_str(Parameter_X20error), + /* K35 */ be_nested_str(content_send_style), + /* K36 */ be_nested_str(content_send), + /* K37 */ be_nested_str(_X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E), + /* K38 */ be_nested_str(content_button), + /* K39 */ be_nested_str(BUTTON_CONFIGURATION), + /* K40 */ be_nested_str(content_stop), + }), + &be_const_str_page_autoconf_ctl, + &be_const_str_solidified, + ( &(const binstruction[117]) { /* code */ + 0xA4060000, // 0000 IMPORT R1 K0 + 0xA40A0200, // 0001 IMPORT R2 K1 + 0xA40E0400, // 0002 IMPORT R3 K2 + 0x8C100303, // 0003 GETMET R4 R1 K3 + 0x7C100200, // 0004 CALL R4 1 + 0x74120001, // 0005 JMPT R4 #0008 + 0x4C100000, // 0006 LDNIL R4 + 0x80040800, // 0007 RET 1 R4 + 0xA802004E, // 0008 EXBLK 0 #0058 + 0x8C100304, // 0009 GETMET R4 R1 K4 + 0x58180005, // 000A LDCONST R6 K5 + 0x7C100400, // 000B CALL R4 2 + 0x7812000A, // 000C JMPF R4 #0018 + 0xB8120C00, // 000D GETNGBL R4 K6 + 0x8C100907, // 000E GETMET R4 R4 K7 + 0x58180008, // 000F LDCONST R6 K8 + 0x581C0009, // 0010 LDCONST R7 K9 + 0x7C100600, // 0011 CALL R4 3 + 0x8C10010A, // 0012 GETMET R4 R0 K10 + 0x7C100200, // 0013 CALL R4 1 + 0x8C10030B, // 0014 GETMET R4 R1 K11 + 0x5818000C, // 0015 LDCONST R6 K12 + 0x7C100400, // 0016 CALL R4 2 + 0x7002003D, // 0017 JMP #0056 + 0x8C100304, // 0018 GETMET R4 R1 K4 + 0x5818000D, // 0019 LDCONST R6 K13 + 0x7C100400, // 001A CALL R4 2 + 0x78120038, // 001B JMPF R4 #0055 + 0xB8120C00, // 001C GETNGBL R4 K6 + 0x8C100907, // 001D GETMET R4 R4 K7 + 0x5818000E, // 001E LDCONST R6 K14 + 0x581C0009, // 001F LDCONST R7 K9 + 0x7C100600, // 0020 CALL R4 3 + 0x8C10010F, // 0021 GETMET R4 R0 K15 + 0x7C100200, // 0022 CALL R4 1 + 0x8C100310, // 0023 GETMET R4 R1 K16 + 0x5818000D, // 0024 LDCONST R6 K13 + 0x7C100400, // 0025 CALL R4 2 + 0x20140911, // 0026 NE R5 R4 K17 + 0x78160026, // 0027 JMPF R5 #004F + 0x8C140512, // 0028 GETMET R5 R2 K18 + 0x581C0013, // 0029 LDCONST R7 K19 + 0xB8220C00, // 002A GETNGBL R8 K6 + 0x8C201114, // 002B GETMET R8 R8 K20 + 0x7C200200, // 002C CALL R8 1 + 0x5C240800, // 002D MOVE R9 R4 + 0x7C140800, // 002E CALL R5 4 + 0xB81A0C00, // 002F GETNGBL R6 K6 + 0x8C180D07, // 0030 GETMET R6 R6 K7 + 0x8C200512, // 0031 GETMET R8 R2 K18 + 0x58280015, // 0032 LDCONST R10 K21 + 0x5C2C0A00, // 0033 MOVE R11 R5 + 0x7C200600, // 0034 CALL R8 3 + 0x58240009, // 0035 LDCONST R9 K9 + 0x7C180600, // 0036 CALL R6 3 + 0x8C180512, // 0037 GETMET R6 R2 K18 + 0x58200016, // 0038 LDCONST R8 K22 + 0x5C240800, // 0039 MOVE R9 R4 + 0x7C180600, // 003A CALL R6 3 + 0xB81E2E00, // 003B GETNGBL R7 K23 + 0x7C1C0000, // 003C CALL R7 0 + 0x8C200F18, // 003D GETMET R8 R7 K24 + 0x5C280A00, // 003E MOVE R10 R5 + 0x7C200400, // 003F CALL R8 2 + 0x8C200F19, // 0040 GETMET R8 R7 K25 + 0x7C200200, // 0041 CALL R8 1 + 0x542600C7, // 0042 LDINT R9 200 + 0x20241009, // 0043 NE R9 R8 R9 + 0x78260004, // 0044 JMPF R9 #004A + 0x8C240512, // 0045 GETMET R9 R2 K18 + 0x582C001A, // 0046 LDCONST R11 K26 + 0x5C301000, // 0047 MOVE R12 R8 + 0x7C240600, // 0048 CALL R9 3 + 0xB0063609, // 0049 RAISE 1 K27 R9 + 0x8C240F1C, // 004A GETMET R9 R7 K28 + 0x5C2C0C00, // 004B MOVE R11 R6 + 0x7C240400, // 004C CALL R9 2 + 0x8C240F1D, // 004D GETMET R9 R7 K29 + 0x7C240200, // 004E CALL R9 1 + 0x8C14010A, // 004F GETMET R5 R0 K10 + 0x7C140200, // 0050 CALL R5 1 + 0x8C14030B, // 0051 GETMET R5 R1 K11 + 0x581C000C, // 0052 LDCONST R7 K12 + 0x7C140400, // 0053 CALL R5 2 + 0x70020000, // 0054 JMP #0056 + 0xB0063D1F, // 0055 RAISE 1 K30 K31 + 0xA8040001, // 0056 EXBLK 1 1 + 0x7002001B, // 0057 JMP #0074 + 0xAC100002, // 0058 CATCH R4 0 2 + 0x70020018, // 0059 JMP #0073 + 0x60180001, // 005A GETGBL R6 G1 + 0x8C1C0512, // 005B GETMET R7 R2 K18 + 0x58240020, // 005C LDCONST R9 K32 + 0x5C280800, // 005D MOVE R10 R4 + 0x5C2C0A00, // 005E MOVE R11 R5 + 0x7C1C0800, // 005F CALL R7 4 + 0x7C180200, // 0060 CALL R6 1 + 0x8C180321, // 0061 GETMET R6 R1 K33 + 0x58200022, // 0062 LDCONST R8 K34 + 0x7C180400, // 0063 CALL R6 2 + 0x8C180323, // 0064 GETMET R6 R1 K35 + 0x7C180200, // 0065 CALL R6 1 + 0x8C180324, // 0066 GETMET R6 R1 K36 + 0x8C200512, // 0067 GETMET R8 R2 K18 + 0x58280025, // 0068 LDCONST R10 K37 + 0x5C2C0800, // 0069 MOVE R11 R4 + 0x5C300A00, // 006A MOVE R12 R5 + 0x7C200800, // 006B CALL R8 4 + 0x7C180400, // 006C CALL R6 2 + 0x8C180326, // 006D GETMET R6 R1 K38 + 0x88200327, // 006E GETMBR R8 R1 K39 + 0x7C180400, // 006F CALL R6 2 + 0x8C180328, // 0070 GETMET R6 R1 K40 + 0x7C180200, // 0071 CALL R6 1 + 0x70020000, // 0072 JMP #0074 + 0xB0080000, // 0073 RAISE 2 R0 R0 + 0x80000000, // 0074 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: autoexec +********************************************************************/ +be_local_closure(Autoconf_autoexec, /* name */ + be_nested_proto( + 9, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[32]) { /* constants */ + /* K0 */ be_nested_str(_archive), + /* K1 */ be_nested_str(path), + /* K2 */ be_nested_str(_X23init_X2Ebat), + /* K3 */ be_nested_str(is_first_time), + /* K4 */ be_nested_str(exists), + /* K5 */ be_nested_str(set_first_time), + /* K6 */ be_nested_str(run_bat), + /* K7 */ be_nested_str(tasmota), + /* K8 */ be_nested_str(log), + /* K9 */ be_nested_str(CFG_X3A_X20_X27init_X2Ebat_X27_X20done_X2C_X20restarting), + /* K10 */ be_const_int(2), + /* K11 */ be_nested_str(cmd), + /* K12 */ be_nested_str(Restart_X201), + /* K13 */ be_nested_str(_X23display_X2Eini), + /* K14 */ be_nested_str(gpio), + /* K15 */ be_nested_str(pin_used), + /* K16 */ be_nested_str(OPTION_A), + /* K17 */ be_nested_str(display_X2Eini), + /* K18 */ be_nested_str(CFG_X3A_X20skipping_X20_X27display_X2Eini_X27_X20because_X20already_X20present_X20in_X20file_X2Dsystem), + /* K19 */ be_nested_str(display), + /* K20 */ be_nested_str(r), + /* K21 */ be_nested_str(read), + /* K22 */ be_nested_str(close), + /* K23 */ be_nested_str(start), + /* K24 */ be_nested_str(_X23autoexec_X2Ebat), + /* K25 */ be_nested_str(CFG_X3A_X20running_X20), + /* K26 */ be_const_int(3), + /* K27 */ be_nested_str(CFG_X3A_X20ran_X20_X20), + /* K28 */ be_nested_str(_X23autoexec_X2Ebe), + /* K29 */ be_nested_str(CFG_X3A_X20loading_X20), + /* K30 */ be_nested_str(load), + /* K31 */ be_nested_str(CFG_X3A_X20loaded_X20_X20), + }), + &be_const_str_autoexec, + &be_const_str_solidified, + ( &(const binstruction[107]) { /* code */ + 0x88040100, // 0000 GETMBR R1 R0 K0 + 0x4C080000, // 0001 LDNIL R2 + 0x1C040202, // 0002 EQ R1 R1 R2 + 0x78060000, // 0003 JMPF R1 #0005 + 0x80000200, // 0004 RET 0 + 0xA4060200, // 0005 IMPORT R1 K1 + 0x88080100, // 0006 GETMBR R2 R0 K0 + 0x00080502, // 0007 ADD R2 R2 K2 + 0x8C0C0103, // 0008 GETMET R3 R0 K3 + 0x7C0C0200, // 0009 CALL R3 1 + 0x780E0012, // 000A JMPF R3 #001E + 0x8C0C0304, // 000B GETMET R3 R1 K4 + 0x5C140400, // 000C MOVE R5 R2 + 0x7C0C0400, // 000D CALL R3 2 + 0x780E000E, // 000E JMPF R3 #001E + 0x8C0C0105, // 000F GETMET R3 R0 K5 + 0x7C0C0200, // 0010 CALL R3 1 + 0x8C0C0106, // 0011 GETMET R3 R0 K6 + 0x5C140400, // 0012 MOVE R5 R2 + 0x7C0C0400, // 0013 CALL R3 2 + 0xB80E0E00, // 0014 GETNGBL R3 K7 + 0x8C0C0708, // 0015 GETMET R3 R3 K8 + 0x58140009, // 0016 LDCONST R5 K9 + 0x5818000A, // 0017 LDCONST R6 K10 + 0x7C0C0600, // 0018 CALL R3 3 + 0xB80E0E00, // 0019 GETNGBL R3 K7 + 0x8C0C070B, // 001A GETMET R3 R3 K11 + 0x5814000C, // 001B LDCONST R5 K12 + 0x7C0C0400, // 001C CALL R3 2 + 0x80000600, // 001D RET 0 + 0x880C0100, // 001E GETMBR R3 R0 K0 + 0x000C070D, // 001F ADD R3 R3 K13 + 0x5C080600, // 0020 MOVE R2 R3 + 0xB80E1C00, // 0021 GETNGBL R3 K14 + 0x8C0C070F, // 0022 GETMET R3 R3 K15 + 0xB8161C00, // 0023 GETNGBL R5 K14 + 0x88140B10, // 0024 GETMBR R5 R5 K16 + 0x5818000A, // 0025 LDCONST R6 K10 + 0x7C0C0600, // 0026 CALL R3 3 + 0x780E0019, // 0027 JMPF R3 #0042 + 0x8C0C0304, // 0028 GETMET R3 R1 K4 + 0x5C140400, // 0029 MOVE R5 R2 + 0x7C0C0400, // 002A CALL R3 2 + 0x780E0015, // 002B JMPF R3 #0042 + 0x8C0C0304, // 002C GETMET R3 R1 K4 + 0x58140011, // 002D LDCONST R5 K17 + 0x7C0C0400, // 002E CALL R3 2 + 0x780E0005, // 002F JMPF R3 #0036 + 0xB80E0E00, // 0030 GETNGBL R3 K7 + 0x8C0C0708, // 0031 GETMET R3 R3 K8 + 0x58140012, // 0032 LDCONST R5 K18 + 0x5818000A, // 0033 LDCONST R6 K10 + 0x7C0C0600, // 0034 CALL R3 3 + 0x7002000B, // 0035 JMP #0042 + 0xA40E2600, // 0036 IMPORT R3 K19 + 0x60100011, // 0037 GETGBL R4 G17 + 0x5C140400, // 0038 MOVE R5 R2 + 0x58180014, // 0039 LDCONST R6 K20 + 0x7C100400, // 003A CALL R4 2 + 0x8C140915, // 003B GETMET R5 R4 K21 + 0x7C140200, // 003C CALL R5 1 + 0x8C180916, // 003D GETMET R6 R4 K22 + 0x7C180200, // 003E CALL R6 1 + 0x8C180717, // 003F GETMET R6 R3 K23 + 0x5C200A00, // 0040 MOVE R8 R5 + 0x7C180400, // 0041 CALL R6 2 + 0x880C0100, // 0042 GETMBR R3 R0 K0 + 0x000C0718, // 0043 ADD R3 R3 K24 + 0x5C080600, // 0044 MOVE R2 R3 + 0x8C0C0304, // 0045 GETMET R3 R1 K4 + 0x5C140400, // 0046 MOVE R5 R2 + 0x7C0C0400, // 0047 CALL R3 2 + 0x780E000C, // 0048 JMPF R3 #0056 + 0xB80E0E00, // 0049 GETNGBL R3 K7 + 0x8C0C0708, // 004A GETMET R3 R3 K8 + 0x00163202, // 004B ADD R5 K25 R2 + 0x5818001A, // 004C LDCONST R6 K26 + 0x7C0C0600, // 004D CALL R3 3 + 0x8C0C0106, // 004E GETMET R3 R0 K6 + 0x5C140400, // 004F MOVE R5 R2 + 0x7C0C0400, // 0050 CALL R3 2 + 0xB80E0E00, // 0051 GETNGBL R3 K7 + 0x8C0C0708, // 0052 GETMET R3 R3 K8 + 0x00163602, // 0053 ADD R5 K27 R2 + 0x5818001A, // 0054 LDCONST R6 K26 + 0x7C0C0600, // 0055 CALL R3 3 + 0x880C0100, // 0056 GETMBR R3 R0 K0 + 0x000C071C, // 0057 ADD R3 R3 K28 + 0x5C080600, // 0058 MOVE R2 R3 + 0x8C0C0304, // 0059 GETMET R3 R1 K4 + 0x5C140400, // 005A MOVE R5 R2 + 0x7C0C0400, // 005B CALL R3 2 + 0x780E000C, // 005C JMPF R3 #006A + 0xB80E0E00, // 005D GETNGBL R3 K7 + 0x8C0C0708, // 005E GETMET R3 R3 K8 + 0x00163A02, // 005F ADD R5 K29 R2 + 0x5818001A, // 0060 LDCONST R6 K26 + 0x7C0C0600, // 0061 CALL R3 3 + 0xB80E3C00, // 0062 GETNGBL R3 K30 + 0x5C100400, // 0063 MOVE R4 R2 + 0x7C0C0200, // 0064 CALL R3 1 + 0xB80E0E00, // 0065 GETNGBL R3 K7 + 0x8C0C0708, // 0066 GETMET R3 R3 K8 + 0x00163E02, // 0067 ADD R5 K31 R2 + 0x5818001A, // 0068 LDCONST R6 K26 + 0x7C0C0600, // 0069 CALL R3 3 + 0x80000000, // 006A RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: run_bat +********************************************************************/ +be_local_closure(Autoconf_run_bat, /* name */ + be_nested_proto( + 13, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[10]) { /* constants */ + /* K0 */ be_nested_str(string), + /* K1 */ be_nested_str(r), + /* K2 */ be_nested_str(readline), + /* K3 */ be_const_int(0), + /* K4 */ be_nested_str(_X0A), + /* K5 */ be_nested_str(tasmota), + /* K6 */ be_nested_str(cmd), + /* K7 */ be_nested_str(close), + /* K8 */ be_nested_str(format), + /* K9 */ be_nested_str(CFG_X3A_X20could_X20not_X20run_X20_X25s_X20_X28_X25s_X20_X2D_X20_X25s_X29), + }), + &be_const_str_run_bat, + &be_const_str_solidified, + ( &(const binstruction[54]) { /* code */ + 0xA40A0000, // 0000 IMPORT R2 K0 + 0x4C0C0000, // 0001 LDNIL R3 + 0xA8020023, // 0002 EXBLK 0 #0027 + 0x60100011, // 0003 GETGBL R4 G17 + 0x5C140200, // 0004 MOVE R5 R1 + 0x58180001, // 0005 LDCONST R6 K1 + 0x7C100400, // 0006 CALL R4 2 + 0x5C0C0800, // 0007 MOVE R3 R4 + 0x50100200, // 0008 LDBOOL R4 1 0 + 0x78120018, // 0009 JMPF R4 #0023 + 0x8C100702, // 000A GETMET R4 R3 K2 + 0x7C100200, // 000B CALL R4 1 + 0x6014000C, // 000C GETGBL R5 G12 + 0x5C180800, // 000D MOVE R6 R4 + 0x7C140200, // 000E CALL R5 1 + 0x1C140B03, // 000F EQ R5 R5 K3 + 0x78160000, // 0010 JMPF R5 #0012 + 0x70020010, // 0011 JMP #0023 + 0x5415FFFE, // 0012 LDINT R5 -1 + 0x94140805, // 0013 GETIDX R5 R4 R5 + 0x1C140B04, // 0014 EQ R5 R5 K4 + 0x78160002, // 0015 JMPF R5 #0019 + 0x5415FFFD, // 0016 LDINT R5 -2 + 0x40160605, // 0017 CONNECT R5 K3 R5 + 0x94100805, // 0018 GETIDX R4 R4 R5 + 0x6014000C, // 0019 GETGBL R5 G12 + 0x5C180800, // 001A MOVE R6 R4 + 0x7C140200, // 001B CALL R5 1 + 0x24140B03, // 001C GT R5 R5 K3 + 0x78160003, // 001D JMPF R5 #0022 + 0xB8160A00, // 001E GETNGBL R5 K5 + 0x8C140B06, // 001F GETMET R5 R5 K6 + 0x5C1C0800, // 0020 MOVE R7 R4 + 0x7C140400, // 0021 CALL R5 2 + 0x7001FFE4, // 0022 JMP #0008 + 0x8C100707, // 0023 GETMET R4 R3 K7 + 0x7C100200, // 0024 CALL R4 1 + 0xA8040001, // 0025 EXBLK 1 1 + 0x7002000D, // 0026 JMP #0035 + 0xAC100002, // 0027 CATCH R4 0 2 + 0x7002000A, // 0028 JMP #0034 + 0x60180001, // 0029 GETGBL R6 G1 + 0x8C1C0508, // 002A GETMET R7 R2 K8 + 0x58240009, // 002B LDCONST R9 K9 + 0x5C280200, // 002C MOVE R10 R1 + 0x5C2C0800, // 002D MOVE R11 R4 + 0x5C300A00, // 002E MOVE R12 R5 + 0x7C1C0A00, // 002F CALL R7 5 + 0x7C180200, // 0030 CALL R6 1 + 0x8C180707, // 0031 GETMET R6 R3 K7 + 0x7C180200, // 0032 CALL R6 1 + 0x70020000, // 0033 JMP #0035 + 0xB0080000, // 0034 RAISE 2 R0 R0 + 0x80000000, // 0035 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: page_autoconf_mgr +********************************************************************/ +be_local_closure(Autoconf_page_autoconf_mgr, /* name */ + be_nested_proto( + 19, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[39]) { /* constants */ + /* K0 */ be_nested_str(webserver), + /* K1 */ be_nested_str(string), + /* K2 */ be_nested_str(check_privileged_access), + /* K3 */ be_nested_str(content_start), + /* K4 */ be_nested_str(Auto_X2Dconfiguration), + /* K5 */ be_nested_str(content_send_style), + /* K6 */ be_nested_str(content_send), + /* K7 */ be_nested_str(_X3Cp_X3E_X3Csmall_X3E_X26nbsp_X3B_X28This_X20feature_X20requires_X20an_X20internet_X20connection_X29_X3C_X2Fsmall_X3E_X3C_X2Fp_X3E), + /* K8 */ be_nested_str(get_current_module_path), + /* K9 */ be_nested_str(tr), + /* K10 */ be_nested_str(get_current_module_name), + /* K11 */ be_nested_str(_), + /* K12 */ be_nested_str(_X20), + /* K13 */ be_nested_str(_error), + /* K14 */ be_nested_str(_X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B), + /* K15 */ be_nested_str(_X26lt_X3BNone_X26gt_X3B), + /* K16 */ be_nested_str(_X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E), + /* K17 */ be_nested_str(format), + /* K18 */ be_nested_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E), + /* K19 */ be_nested_str(_X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E), + /* K20 */ be_nested_str(_X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20), + /* K21 */ be_nested_str(onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E), + /* K22 */ be_nested_str(_X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E), + /* K23 */ be_nested_str(_X3C_X2Fform_X3E_X3C_X2Fp_X3E), + /* K24 */ be_nested_str(_X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E), + /* K25 */ be_nested_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E), + /* K26 */ be_nested_str(_X3Cp_X3E_X3Cform_X20id_X3Dzip_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20), + /* K27 */ be_nested_str(onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20change_X20the_X20current_X20configuration_X20and_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E), + /* K28 */ be_nested_str(_X3Clabel_X3EChoose_X20a_X20device_X20configuration_X3A_X3C_X2Flabel_X3E_X3Cbr_X3E), + /* K29 */ be_nested_str(_X3Cselect_X20name_X3D_X27zip_X27_X3E), + /* K30 */ be_nested_str(load_templates), + /* K31 */ be_nested_str(_X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E), + /* K32 */ be_nested_str(_X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E), + /* K33 */ be_nested_str(stop_iteration), + /* K34 */ be_nested_str(_X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E), + /* K35 */ be_nested_str(_X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E), + /* K36 */ be_nested_str(content_button), + /* K37 */ be_nested_str(BUTTON_CONFIGURATION), + /* K38 */ be_nested_str(content_stop), + }), + &be_const_str_page_autoconf_mgr, + &be_const_str_solidified, + ( &(const binstruction[124]) { /* code */ + 0xA4060000, // 0000 IMPORT R1 K0 + 0xA40A0200, // 0001 IMPORT R2 K1 + 0x8C0C0302, // 0002 GETMET R3 R1 K2 + 0x7C0C0200, // 0003 CALL R3 1 + 0x740E0001, // 0004 JMPT R3 #0007 + 0x4C0C0000, // 0005 LDNIL R3 + 0x80040600, // 0006 RET 1 R3 + 0x8C0C0303, // 0007 GETMET R3 R1 K3 + 0x58140004, // 0008 LDCONST R5 K4 + 0x7C0C0400, // 0009 CALL R3 2 + 0x8C0C0305, // 000A GETMET R3 R1 K5 + 0x7C0C0200, // 000B CALL R3 1 + 0x8C0C0306, // 000C GETMET R3 R1 K6 + 0x58140007, // 000D LDCONST R5 K7 + 0x7C0C0400, // 000E CALL R3 2 + 0x8C0C0108, // 000F GETMET R3 R0 K8 + 0x7C0C0200, // 0010 CALL R3 1 + 0x780E0006, // 0011 JMPF R3 #0019 + 0x8C100509, // 0012 GETMET R4 R2 K9 + 0x8C18010A, // 0013 GETMET R6 R0 K10 + 0x7C180200, // 0014 CALL R6 1 + 0x581C000B, // 0015 LDCONST R7 K11 + 0x5820000C, // 0016 LDCONST R8 K12 + 0x7C100800, // 0017 CALL R4 4 + 0x70020004, // 0018 JMP #001E + 0x8810010D, // 0019 GETMBR R4 R0 K13 + 0x78120001, // 001A JMPF R4 #001D + 0x5810000E, // 001B LDCONST R4 K14 + 0x70020000, // 001C JMP #001E + 0x5810000F, // 001D LDCONST R4 K15 + 0x8C140306, // 001E GETMET R5 R1 K6 + 0x581C0010, // 001F LDCONST R7 K16 + 0x7C140400, // 0020 CALL R5 2 + 0x8C140306, // 0021 GETMET R5 R1 K6 + 0x8C1C0511, // 0022 GETMET R7 R2 K17 + 0x58240012, // 0023 LDCONST R9 K18 + 0x7C1C0400, // 0024 CALL R7 2 + 0x7C140400, // 0025 CALL R5 2 + 0x8C140306, // 0026 GETMET R5 R1 K6 + 0x8C1C0511, // 0027 GETMET R7 R2 K17 + 0x58240013, // 0028 LDCONST R9 K19 + 0x5C280800, // 0029 MOVE R10 R4 + 0x7C1C0600, // 002A CALL R7 3 + 0x7C140400, // 002B CALL R5 2 + 0x780E000B, // 002C JMPF R3 #0039 + 0x8C140306, // 002D GETMET R5 R1 K6 + 0x581C0014, // 002E LDCONST R7 K20 + 0x7C140400, // 002F CALL R5 2 + 0x8C140306, // 0030 GETMET R5 R1 K6 + 0x581C0015, // 0031 LDCONST R7 K21 + 0x7C140400, // 0032 CALL R5 2 + 0x8C140306, // 0033 GETMET R5 R1 K6 + 0x581C0016, // 0034 LDCONST R7 K22 + 0x7C140400, // 0035 CALL R5 2 + 0x8C140306, // 0036 GETMET R5 R1 K6 + 0x581C0017, // 0037 LDCONST R7 K23 + 0x7C140400, // 0038 CALL R5 2 + 0x8C140306, // 0039 GETMET R5 R1 K6 + 0x581C0018, // 003A LDCONST R7 K24 + 0x7C140400, // 003B CALL R5 2 + 0x8C140306, // 003C GETMET R5 R1 K6 + 0x581C0010, // 003D LDCONST R7 K16 + 0x7C140400, // 003E CALL R5 2 + 0x8C140306, // 003F GETMET R5 R1 K6 + 0x8C1C0511, // 0040 GETMET R7 R2 K17 + 0x58240019, // 0041 LDCONST R9 K25 + 0x7C1C0400, // 0042 CALL R7 2 + 0x7C140400, // 0043 CALL R5 2 + 0x8C140306, // 0044 GETMET R5 R1 K6 + 0x581C001A, // 0045 LDCONST R7 K26 + 0x7C140400, // 0046 CALL R5 2 + 0x8C140306, // 0047 GETMET R5 R1 K6 + 0x581C001B, // 0048 LDCONST R7 K27 + 0x7C140400, // 0049 CALL R5 2 + 0x8C140306, // 004A GETMET R5 R1 K6 + 0x581C001C, // 004B LDCONST R7 K28 + 0x7C140400, // 004C CALL R5 2 + 0x8C140306, // 004D GETMET R5 R1 K6 + 0x581C001D, // 004E LDCONST R7 K29 + 0x7C140400, // 004F CALL R5 2 + 0x8C14011E, // 0050 GETMET R5 R0 K30 + 0x7C140200, // 0051 CALL R5 1 + 0x8C180306, // 0052 GETMET R6 R1 K6 + 0x5820001F, // 0053 LDCONST R8 K31 + 0x7C180400, // 0054 CALL R6 2 + 0x60180010, // 0055 GETGBL R6 G16 + 0x5C1C0A00, // 0056 MOVE R7 R5 + 0x7C180200, // 0057 CALL R6 1 + 0xA802000D, // 0058 EXBLK 0 #0067 + 0x5C1C0C00, // 0059 MOVE R7 R6 + 0x7C1C0000, // 005A CALL R7 0 + 0x8C200306, // 005B GETMET R8 R1 K6 + 0x8C280511, // 005C GETMET R10 R2 K17 + 0x58300020, // 005D LDCONST R12 K32 + 0x5C340E00, // 005E MOVE R13 R7 + 0x8C380509, // 005F GETMET R14 R2 K9 + 0x5C400E00, // 0060 MOVE R16 R7 + 0x5844000B, // 0061 LDCONST R17 K11 + 0x5848000C, // 0062 LDCONST R18 K12 + 0x7C380800, // 0063 CALL R14 4 + 0x7C280800, // 0064 CALL R10 4 + 0x7C200400, // 0065 CALL R8 2 + 0x7001FFF1, // 0066 JMP #0059 + 0x58180021, // 0067 LDCONST R6 K33 + 0xAC180200, // 0068 CATCH R6 1 0 + 0xB0080000, // 0069 RAISE 2 R0 R0 + 0x8C180306, // 006A GETMET R6 R1 K6 + 0x58200022, // 006B LDCONST R8 K34 + 0x7C180400, // 006C CALL R6 2 + 0x8C180306, // 006D GETMET R6 R1 K6 + 0x58200023, // 006E LDCONST R8 K35 + 0x7C180400, // 006F CALL R6 2 + 0x8C180306, // 0070 GETMET R6 R1 K6 + 0x58200017, // 0071 LDCONST R8 K23 + 0x7C180400, // 0072 CALL R6 2 + 0x8C180306, // 0073 GETMET R6 R1 K6 + 0x58200018, // 0074 LDCONST R8 K24 + 0x7C180400, // 0075 CALL R6 2 + 0x8C180324, // 0076 GETMET R6 R1 K36 + 0x88200325, // 0077 GETMBR R8 R1 K37 + 0x7C180400, // 0078 CALL R6 2 + 0x8C180326, // 0079 GETMET R6 R1 K38 + 0x7C180200, // 007A CALL R6 1 + 0x80000000, // 007B RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: get_current_module_name +********************************************************************/ +be_local_closure(Autoconf_get_current_module_name, /* name */ + be_nested_proto( + 3, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(_archive), + /* K1 */ be_const_int(0), + }), + &be_const_str_get_current_module_name, + &be_const_str_solidified, + ( &(const binstruction[ 5]) { /* code */ + 0x5405FFF5, // 0000 LDINT R1 -10 + 0x40060201, // 0001 CONNECT R1 K1 R1 + 0x88080100, // 0002 GETMBR R2 R0 K0 + 0x94040401, // 0003 GETIDX R1 R2 R1 + 0x80040200, // 0004 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: delete_all_configs +********************************************************************/ +be_local_closure(Autoconf_delete_all_configs, /* name */ + be_nested_proto( + 10, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 9]) { /* constants */ + /* K0 */ be_nested_str(path), + /* K1 */ be_nested_str(string), + /* K2 */ be_nested_str(listdir), + /* K3 */ be_nested_str(_X2F), + /* K4 */ be_nested_str(find), + /* K5 */ be_nested_str(_X2Eautoconf), + /* K6 */ be_const_int(0), + /* K7 */ be_nested_str(remove), + /* K8 */ be_nested_str(stop_iteration), + }), + &be_const_str_delete_all_configs, + &be_const_str_solidified, + ( &(const binstruction[25]) { /* code */ + 0xA4060000, // 0000 IMPORT R1 K0 + 0xA40A0200, // 0001 IMPORT R2 K1 + 0x8C0C0302, // 0002 GETMET R3 R1 K2 + 0x58140003, // 0003 LDCONST R5 K3 + 0x7C0C0400, // 0004 CALL R3 2 + 0x60100010, // 0005 GETGBL R4 G16 + 0x5C140600, // 0006 MOVE R5 R3 + 0x7C100200, // 0007 CALL R4 1 + 0xA802000B, // 0008 EXBLK 0 #0015 + 0x5C140800, // 0009 MOVE R5 R4 + 0x7C140000, // 000A CALL R5 0 + 0x8C180504, // 000B GETMET R6 R2 K4 + 0x5C200A00, // 000C MOVE R8 R5 + 0x58240005, // 000D LDCONST R9 K5 + 0x7C180600, // 000E CALL R6 3 + 0x24180D06, // 000F GT R6 R6 K6 + 0x781A0002, // 0010 JMPF R6 #0014 + 0x8C180307, // 0011 GETMET R6 R1 K7 + 0x5C200A00, // 0012 MOVE R8 R5 + 0x7C180400, // 0013 CALL R6 2 + 0x7001FFF3, // 0014 JMP #0009 + 0x58100008, // 0015 LDCONST R4 K8 + 0xAC100200, // 0016 CATCH R4 1 0 + 0xB0080000, // 0017 RAISE 2 R0 R0 + 0x80000000, // 0018 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: set_first_time +********************************************************************/ +be_local_closure(Autoconf_set_first_time, /* name */ + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(_X2F_X2Eautoconf), + /* K1 */ be_nested_str(w), + /* K2 */ be_nested_str(close), + }), + &be_const_str_set_first_time, + &be_const_str_solidified, + ( &(const binstruction[ 7]) { /* code */ + 0x60040011, // 0000 GETGBL R1 G17 + 0x58080000, // 0001 LDCONST R2 K0 + 0x580C0001, // 0002 LDCONST R3 K1 + 0x7C040400, // 0003 CALL R1 2 + 0x8C080302, // 0004 GETMET R2 R1 K2 + 0x7C080200, // 0005 CALL R2 1 + 0x80000000, // 0006 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: load_templates +********************************************************************/ +be_local_closure(Autoconf_load_templates, /* name */ + be_nested_proto( + 15, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[21]) { /* constants */ + /* K0 */ be_nested_str(string), + /* K1 */ be_nested_str(json), + /* K2 */ be_nested_str(format), + /* K3 */ be_nested_str(https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_manifest_X2Ejson), + /* K4 */ be_nested_str(tasmota), + /* K5 */ be_nested_str(arch), + /* K6 */ be_nested_str(log), + /* K7 */ be_nested_str(CFG_X3A_X20loading_X20_X27_X25s_X27), + /* K8 */ be_const_int(3), + /* K9 */ be_nested_str(webclient), + /* K10 */ be_nested_str(begin), + /* K11 */ be_nested_str(GET), + /* K12 */ be_nested_str(CFG_X3A_X20return_code_X3D_X25i), + /* K13 */ be_const_int(2), + /* K14 */ be_nested_str(get_string), + /* K15 */ be_nested_str(close), + /* K16 */ be_nested_str(load), + /* K17 */ be_nested_str(CFG_X3A_X20loaded_X20_X27_X25s_X27), + /* K18 */ be_nested_str(find), + /* K19 */ be_nested_str(files), + /* K20 */ be_nested_str(CFG_X3A_X20exception_X20_X27_X25s_X27_X20_X2D_X20_X27_X25s_X27), + }), + &be_const_str_load_templates, + &be_const_str_solidified, + ( &(const binstruction[86]) { /* code */ + 0xA4060000, // 0000 IMPORT R1 K0 + 0xA40A0200, // 0001 IMPORT R2 K1 + 0xA8020042, // 0002 EXBLK 0 #0046 + 0x8C0C0302, // 0003 GETMET R3 R1 K2 + 0x58140003, // 0004 LDCONST R5 K3 + 0xB81A0800, // 0005 GETNGBL R6 K4 + 0x8C180D05, // 0006 GETMET R6 R6 K5 + 0x7C180200, // 0007 CALL R6 1 + 0x7C0C0600, // 0008 CALL R3 3 + 0xB8120800, // 0009 GETNGBL R4 K4 + 0x8C100906, // 000A GETMET R4 R4 K6 + 0x8C180302, // 000B GETMET R6 R1 K2 + 0x58200007, // 000C LDCONST R8 K7 + 0x5C240600, // 000D MOVE R9 R3 + 0x7C180600, // 000E CALL R6 3 + 0x581C0008, // 000F LDCONST R7 K8 + 0x7C100600, // 0010 CALL R4 3 + 0xB8121200, // 0011 GETNGBL R4 K9 + 0x7C100000, // 0012 CALL R4 0 + 0x8C14090A, // 0013 GETMET R5 R4 K10 + 0x5C1C0600, // 0014 MOVE R7 R3 + 0x7C140400, // 0015 CALL R5 2 + 0x8C14090B, // 0016 GETMET R5 R4 K11 + 0x7C140200, // 0017 CALL R5 1 + 0x541A00C7, // 0018 LDINT R6 200 + 0x20180A06, // 0019 NE R6 R5 R6 + 0x781A000A, // 001A JMPF R6 #0026 + 0xB81A0800, // 001B GETNGBL R6 K4 + 0x8C180D06, // 001C GETMET R6 R6 K6 + 0x8C200302, // 001D GETMET R8 R1 K2 + 0x5828000C, // 001E LDCONST R10 K12 + 0x5C2C0A00, // 001F MOVE R11 R5 + 0x7C200600, // 0020 CALL R8 3 + 0x5824000D, // 0021 LDCONST R9 K13 + 0x7C180600, // 0022 CALL R6 3 + 0x4C180000, // 0023 LDNIL R6 + 0xA8040001, // 0024 EXBLK 1 1 + 0x80040C00, // 0025 RET 1 R6 + 0x8C18090E, // 0026 GETMET R6 R4 K14 + 0x7C180200, // 0027 CALL R6 1 + 0x8C1C090F, // 0028 GETMET R7 R4 K15 + 0x7C1C0200, // 0029 CALL R7 1 + 0x8C1C0510, // 002A GETMET R7 R2 K16 + 0x5C240C00, // 002B MOVE R9 R6 + 0x7C1C0400, // 002C CALL R7 2 + 0xB8220800, // 002D GETNGBL R8 K4 + 0x8C201106, // 002E GETMET R8 R8 K6 + 0x8C280302, // 002F GETMET R10 R1 K2 + 0x58300011, // 0030 LDCONST R12 K17 + 0x60340008, // 0031 GETGBL R13 G8 + 0x5C380E00, // 0032 MOVE R14 R7 + 0x7C340200, // 0033 CALL R13 1 + 0x7C280600, // 0034 CALL R10 3 + 0x582C0008, // 0035 LDCONST R11 K8 + 0x7C200600, // 0036 CALL R8 3 + 0x8C200F12, // 0037 GETMET R8 R7 K18 + 0x58280013, // 0038 LDCONST R10 K19 + 0x7C200400, // 0039 CALL R8 2 + 0x6024000F, // 003A GETGBL R9 G15 + 0x5C281000, // 003B MOVE R10 R8 + 0x602C0012, // 003C GETGBL R11 G18 + 0x7C240400, // 003D CALL R9 2 + 0x78260001, // 003E JMPF R9 #0041 + 0xA8040001, // 003F EXBLK 1 1 + 0x80041000, // 0040 RET 1 R8 + 0x4C240000, // 0041 LDNIL R9 + 0xA8040001, // 0042 EXBLK 1 1 + 0x80041200, // 0043 RET 1 R9 + 0xA8040001, // 0044 EXBLK 1 1 + 0x7002000E, // 0045 JMP #0055 + 0xAC0C0002, // 0046 CATCH R3 0 2 + 0x7002000B, // 0047 JMP #0054 + 0xB8160800, // 0048 GETNGBL R5 K4 + 0x8C140B06, // 0049 GETMET R5 R5 K6 + 0x8C1C0302, // 004A GETMET R7 R1 K2 + 0x58240014, // 004B LDCONST R9 K20 + 0x5C280600, // 004C MOVE R10 R3 + 0x5C2C0800, // 004D MOVE R11 R4 + 0x7C1C0800, // 004E CALL R7 4 + 0x5820000D, // 004F LDCONST R8 K13 + 0x7C140600, // 0050 CALL R5 3 + 0x4C140000, // 0051 LDNIL R5 + 0x80040A00, // 0052 RET 1 R5 + 0x70020000, // 0053 JMP #0055 + 0xB0080000, // 0054 RAISE 2 R0 R0 + 0x80000000, // 0055 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: web_add_config_button +********************************************************************/ +be_local_closure(Autoconf_web_add_config_button, /* name */ + be_nested_proto( + 5, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(webserver), + /* K1 */ be_nested_str(content_send), + /* K2 */ be_nested_str(_X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E), + }), + &be_const_str_web_add_config_button, + &be_const_str_solidified, + ( &(const binstruction[ 5]) { /* code */ + 0xA4060000, // 0000 IMPORT R1 K0 + 0x8C080301, // 0001 GETMET R2 R1 K1 + 0x58100002, // 0002 LDCONST R4 K2 + 0x7C080400, // 0003 CALL R2 2 + 0x80000000, // 0004 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: is_first_time +********************************************************************/ +be_local_closure(Autoconf_is_first_time, /* name */ + be_nested_proto( + 5, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(path), + /* K1 */ be_nested_str(exists), + /* K2 */ be_nested_str(_X2F_X2Eautoconf), + }), + &be_const_str_is_first_time, + &be_const_str_solidified, + ( &(const binstruction[ 8]) { /* code */ + 0xA4060000, // 0000 IMPORT R1 K0 + 0x8C080301, // 0001 GETMET R2 R1 K1 + 0x58100002, // 0002 LDCONST R4 K2 + 0x7C080400, // 0003 CALL R2 2 + 0x780A0000, // 0004 JMPF R2 #0006 + 0x50080001, // 0005 LDBOOL R2 0 1 + 0x50080200, // 0006 LDBOOL R2 1 0 + 0x80040400, // 0007 RET 1 R2 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: init +********************************************************************/ +be_local_closure(Autoconf_init, /* name */ + be_nested_proto( + 12, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[17]) { /* constants */ + /* K0 */ be_nested_str(path), + /* K1 */ be_nested_str(string), + /* K2 */ be_nested_str(listdir), + /* K3 */ be_nested_str(_X2F), + /* K4 */ be_nested_str(tasmota), + /* K5 */ be_nested_str(add_driver), + /* K6 */ be_const_int(0), + /* K7 */ be_nested_str(find), + /* K8 */ be_nested_str(_X2Eautoconf), + /* K9 */ be_nested_str(format), + /* K10 */ be_nested_str(CFG_X3A_X20multiple_X20autoconf_X20files_X20found_X2C_X20aborting_X20_X28_X27_X25s_X27_X20_X2B_X20_X27_X25s_X27_X29), + /* K11 */ be_nested_str(_error), + /* K12 */ be_const_int(1), + /* K13 */ be_nested_str(log), + /* K14 */ be_nested_str(CFG_X3A_X20no_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found), + /* K15 */ be_const_int(2), + /* K16 */ be_nested_str(_archive), + }), + &be_const_str_init, + &be_const_str_solidified, + ( &(const binstruction[51]) { /* code */ + 0xA4060000, // 0000 IMPORT R1 K0 + 0xA40A0200, // 0001 IMPORT R2 K1 + 0x8C0C0302, // 0002 GETMET R3 R1 K2 + 0x58140003, // 0003 LDCONST R5 K3 + 0x7C0C0400, // 0004 CALL R3 2 + 0x4C100000, // 0005 LDNIL R4 + 0xB8160800, // 0006 GETNGBL R5 K4 + 0x8C140B05, // 0007 GETMET R5 R5 K5 + 0x5C1C0000, // 0008 MOVE R7 R0 + 0x7C140400, // 0009 CALL R5 2 + 0x58140006, // 000A LDCONST R5 K6 + 0x6018000C, // 000B GETGBL R6 G12 + 0x5C1C0600, // 000C MOVE R7 R3 + 0x7C180200, // 000D CALL R6 1 + 0x14180A06, // 000E LT R6 R5 R6 + 0x781A0016, // 000F JMPF R6 #0027 + 0x8C180507, // 0010 GETMET R6 R2 K7 + 0x94200605, // 0011 GETIDX R8 R3 R5 + 0x58240008, // 0012 LDCONST R9 K8 + 0x7C180600, // 0013 CALL R6 3 + 0x24180D06, // 0014 GT R6 R6 K6 + 0x781A000E, // 0015 JMPF R6 #0025 + 0x4C180000, // 0016 LDNIL R6 + 0x20180806, // 0017 NE R6 R4 R6 + 0x781A000A, // 0018 JMPF R6 #0024 + 0x60180001, // 0019 GETGBL R6 G1 + 0x8C1C0509, // 001A GETMET R7 R2 K9 + 0x5824000A, // 001B LDCONST R9 K10 + 0x5C280800, // 001C MOVE R10 R4 + 0x942C0605, // 001D GETIDX R11 R3 R5 + 0x7C1C0800, // 001E CALL R7 4 + 0x7C180200, // 001F CALL R6 1 + 0x50180200, // 0020 LDBOOL R6 1 0 + 0x90021606, // 0021 SETMBR R0 K11 R6 + 0x4C180000, // 0022 LDNIL R6 + 0x80040C00, // 0023 RET 1 R6 + 0x94100605, // 0024 GETIDX R4 R3 R5 + 0x00140B0C, // 0025 ADD R5 R5 K12 + 0x7001FFE3, // 0026 JMP #000B + 0x4C180000, // 0027 LDNIL R6 + 0x1C180806, // 0028 EQ R6 R4 R6 + 0x781A0006, // 0029 JMPF R6 #0031 + 0xB81A0800, // 002A GETNGBL R6 K4 + 0x8C180D0D, // 002B GETMET R6 R6 K13 + 0x5820000E, // 002C LDCONST R8 K14 + 0x5824000F, // 002D LDCONST R9 K15 + 0x7C180600, // 002E CALL R6 3 + 0x4C180000, // 002F LDNIL R6 + 0x80040C00, // 0030 RET 1 R6 + 0x90022004, // 0031 SETMBR R0 K16 R4 + 0x80000000, // 0032 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: preinit +********************************************************************/ +be_local_closure(Autoconf_preinit, /* name */ + be_nested_proto( + 7, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[10]) { /* constants */ + /* K0 */ be_nested_str(_archive), + /* K1 */ be_nested_str(path), + /* K2 */ be_nested_str(_X23preinit_X2Ebe), + /* K3 */ be_nested_str(exists), + /* K4 */ be_nested_str(tasmota), + /* K5 */ be_nested_str(log), + /* K6 */ be_nested_str(CFG_X3A_X20loading_X20), + /* K7 */ be_const_int(3), + /* K8 */ be_nested_str(load), + /* K9 */ be_nested_str(CFG_X3A_X20loaded_X20_X20), + }), + &be_const_str_preinit, + &be_const_str_solidified, + ( &(const binstruction[26]) { /* code */ + 0x88040100, // 0000 GETMBR R1 R0 K0 + 0x4C080000, // 0001 LDNIL R2 + 0x1C040202, // 0002 EQ R1 R1 R2 + 0x78060000, // 0003 JMPF R1 #0005 + 0x80000200, // 0004 RET 0 + 0xA4060200, // 0005 IMPORT R1 K1 + 0x88080100, // 0006 GETMBR R2 R0 K0 + 0x00080502, // 0007 ADD R2 R2 K2 + 0x8C0C0303, // 0008 GETMET R3 R1 K3 + 0x5C140400, // 0009 MOVE R5 R2 + 0x7C0C0400, // 000A CALL R3 2 + 0x780E000C, // 000B JMPF R3 #0019 + 0xB80E0800, // 000C GETNGBL R3 K4 + 0x8C0C0705, // 000D GETMET R3 R3 K5 + 0x00160C02, // 000E ADD R5 K6 R2 + 0x58180007, // 000F LDCONST R6 K7 + 0x7C0C0600, // 0010 CALL R3 3 + 0xB80E1000, // 0011 GETNGBL R3 K8 + 0x5C100400, // 0012 MOVE R4 R2 + 0x7C0C0200, // 0013 CALL R3 1 + 0xB80E0800, // 0014 GETNGBL R3 K4 + 0x8C0C0705, // 0015 GETMET R3 R3 K5 + 0x00161202, // 0016 ADD R5 K9 R2 + 0x58180007, // 0017 LDCONST R6 K7 + 0x7C0C0600, // 0018 CALL R3 3 + 0x80000000, // 0019 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: reset +********************************************************************/ +be_local_closure(Autoconf_reset, /* name */ + be_nested_proto( + 12, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[13]) { /* constants */ + /* K0 */ be_nested_str(path), + /* K1 */ be_nested_str(string), + /* K2 */ be_nested_str(listdir), + /* K3 */ be_nested_str(_X2F), + /* K4 */ be_const_int(0), + /* K5 */ be_nested_str(find), + /* K6 */ be_nested_str(_X2Eautoconf), + /* K7 */ be_nested_str(remove), + /* K8 */ be_nested_str(format), + /* K9 */ be_nested_str(CFG_X3A_X20removed_X20file_X20_X27_X25s_X27), + /* K10 */ be_const_int(1), + /* K11 */ be_nested_str(_archive), + /* K12 */ be_nested_str(_error), + }), + &be_const_str_reset, + &be_const_str_solidified, + ( &(const binstruction[35]) { /* code */ + 0xA4060000, // 0000 IMPORT R1 K0 + 0xA40A0200, // 0001 IMPORT R2 K1 + 0x8C0C0302, // 0002 GETMET R3 R1 K2 + 0x58140003, // 0003 LDCONST R5 K3 + 0x7C0C0400, // 0004 CALL R3 2 + 0x4C100000, // 0005 LDNIL R4 + 0x58140004, // 0006 LDCONST R5 K4 + 0x6018000C, // 0007 GETGBL R6 G12 + 0x5C1C0600, // 0008 MOVE R7 R3 + 0x7C180200, // 0009 CALL R6 1 + 0x14180A06, // 000A LT R6 R5 R6 + 0x781A0011, // 000B JMPF R6 #001E + 0x94180605, // 000C GETIDX R6 R3 R5 + 0x8C1C0505, // 000D GETMET R7 R2 K5 + 0x5C240C00, // 000E MOVE R9 R6 + 0x58280006, // 000F LDCONST R10 K6 + 0x7C1C0600, // 0010 CALL R7 3 + 0x241C0F04, // 0011 GT R7 R7 K4 + 0x781E0008, // 0012 JMPF R7 #001C + 0x8C1C0307, // 0013 GETMET R7 R1 K7 + 0x5C240C00, // 0014 MOVE R9 R6 + 0x7C1C0400, // 0015 CALL R7 2 + 0x601C0001, // 0016 GETGBL R7 G1 + 0x8C200508, // 0017 GETMET R8 R2 K8 + 0x58280009, // 0018 LDCONST R10 K9 + 0x5C2C0C00, // 0019 MOVE R11 R6 + 0x7C200600, // 001A CALL R8 3 + 0x7C1C0200, // 001B CALL R7 1 + 0x00140B0A, // 001C ADD R5 R5 K10 + 0x7001FFE8, // 001D JMP #0007 + 0x4C180000, // 001E LDNIL R6 + 0x90021606, // 001F SETMBR R0 K11 R6 + 0x4C180000, // 0020 LDNIL R6 + 0x90021806, // 0021 SETMBR R0 K12 R6 + 0x80000000, // 0022 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: web_add_handler +********************************************************************/ +be_local_closure(Autoconf_web_add_handler, /* name */ + be_nested_proto( + 7, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 1, /* has sup protos */ + ( &(const struct bproto*[ 2]) { + be_nested_proto( + 2, /* nstack */ + 0, /* argc */ + 0, /* varg */ + 1, /* has upvals */ + ( &(const bupvaldesc[ 1]) { /* upvals */ + be_local_const_upval(1, 0), + }), + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_str(page_autoconf_mgr), + }), + &be_const_str__X3Clambda_X3E, + &be_const_str_solidified, + ( &(const binstruction[ 4]) { /* code */ + 0x68000000, // 0000 GETUPV R0 U0 + 0x8C000100, // 0001 GETMET R0 R0 K0 + 0x7C000200, // 0002 CALL R0 1 + 0x80040000, // 0003 RET 1 R0 + }) + ), + be_nested_proto( + 2, /* nstack */ + 0, /* argc */ + 0, /* varg */ + 1, /* has upvals */ + ( &(const bupvaldesc[ 1]) { /* upvals */ + be_local_const_upval(1, 0), + }), + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_str(page_autoconf_ctl), + }), + &be_const_str__X3Clambda_X3E, + &be_const_str_solidified, + ( &(const binstruction[ 4]) { /* code */ + 0x68000000, // 0000 GETUPV R0 U0 + 0x8C000100, // 0001 GETMET R0 R0 K0 + 0x7C000200, // 0002 CALL R0 1 + 0x80040000, // 0003 RET 1 R0 + }) + ), + }), + 1, /* has constants */ + ( &(const bvalue[ 5]) { /* constants */ + /* K0 */ be_nested_str(webserver), + /* K1 */ be_nested_str(on), + /* K2 */ be_nested_str(_X2Fac), + /* K3 */ be_nested_str(HTTP_GET), + /* K4 */ be_nested_str(HTTP_POST), + }), + &be_const_str_web_add_handler, + &be_const_str_solidified, + ( &(const binstruction[13]) { /* code */ + 0xA4060000, // 0000 IMPORT R1 K0 + 0x8C080301, // 0001 GETMET R2 R1 K1 + 0x58100002, // 0002 LDCONST R4 K2 + 0x84140000, // 0003 CLOSURE R5 P0 + 0x88180303, // 0004 GETMBR R6 R1 K3 + 0x7C080800, // 0005 CALL R2 4 + 0x8C080301, // 0006 GETMET R2 R1 K1 + 0x58100002, // 0007 LDCONST R4 K2 + 0x84140001, // 0008 CLOSURE R5 P1 + 0x88180304, // 0009 GETMBR R6 R1 K4 + 0x7C080800, // 000A CALL R2 4 + 0xA0000000, // 000B CLOSE R0 + 0x80000000, // 000C RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: clear_first_time +********************************************************************/ +be_local_closure(Autoconf_clear_first_time, /* name */ + be_nested_proto( + 5, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(path), + /* K1 */ be_nested_str(remove), + /* K2 */ be_nested_str(_X2F_X2Eautoconf), + }), + &be_const_str_clear_first_time, + &be_const_str_solidified, + ( &(const binstruction[ 5]) { /* code */ + 0xA4060000, // 0000 IMPORT R1 K0 + 0x8C080301, // 0001 GETMET R2 R1 K1 + 0x58100002, // 0002 LDCONST R4 K2 + 0x7C080400, // 0003 CALL R2 2 + 0x80000000, // 0004 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: get_current_module_path +********************************************************************/ +be_local_closure(Autoconf_get_current_module_path, /* name */ + be_nested_proto( + 2, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_str(_archive), + }), + &be_const_str_get_current_module_path, + &be_const_str_solidified, + ( &(const binstruction[ 2]) { /* code */ + 0x88040100, // 0000 GETMBR R1 R0 K0 + 0x80040200, // 0001 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified class: Autoconf +********************************************************************/ +be_local_class(Autoconf, + 2, + NULL, + be_nested_map(18, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(page_autoconf_ctl, -1), be_const_closure(Autoconf_page_autoconf_ctl_closure) }, + { be_const_key(autoexec, -1), be_const_closure(Autoconf_autoexec_closure) }, + { be_const_key(run_bat, 17), be_const_closure(Autoconf_run_bat_closure) }, + { be_const_key(page_autoconf_mgr, -1), be_const_closure(Autoconf_page_autoconf_mgr_closure) }, + { be_const_key(get_current_module_path, 13), be_const_closure(Autoconf_get_current_module_path_closure) }, + { be_const_key(preinit, -1), be_const_closure(Autoconf_preinit_closure) }, + { be_const_key(clear_first_time, -1), be_const_closure(Autoconf_clear_first_time_closure) }, + { be_const_key(load_templates, -1), be_const_closure(Autoconf_load_templates_closure) }, + { be_const_key(_archive, -1), be_const_var(0) }, + { be_const_key(web_add_config_button, -1), be_const_closure(Autoconf_web_add_config_button_closure) }, + { be_const_key(is_first_time, -1), be_const_closure(Autoconf_is_first_time_closure) }, + { be_const_key(web_add_handler, -1), be_const_closure(Autoconf_web_add_handler_closure) }, + { be_const_key(delete_all_configs, 4), be_const_closure(Autoconf_delete_all_configs_closure) }, + { be_const_key(reset, 5), be_const_closure(Autoconf_reset_closure) }, + { be_const_key(get_current_module_name, 11), be_const_closure(Autoconf_get_current_module_name_closure) }, + { be_const_key(init, 6), be_const_closure(Autoconf_init_closure) }, + { be_const_key(_error, -1), be_const_var(1) }, + { be_const_key(set_first_time, -1), be_const_closure(Autoconf_set_first_time_closure) }, + })), + be_str_literal("Autoconf") +); + +/******************************************************************** +** Solidified function: _anonymous_ +********************************************************************/ +be_local_closure(_anonymous_, /* name */ + be_nested_proto( + 3, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_const_class(be_class_Autoconf), + }), + &be_const_str__anonymous_, + &be_const_str_solidified, + ( &(const binstruction[ 5]) { /* code */ + 0x58040000, // 0000 LDCONST R1 K0 + 0xB4000000, // 0001 CLASS K0 + 0x5C080200, // 0002 MOVE R2 R1 + 0x7C080000, // 0003 CALL R2 0 + 0x80040400, // 0004 RET 1 R2 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified module: autoconf +********************************************************************/ +be_local_module(autoconf, + "autoconf", + be_nested_map(1, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(init, -1), be_const_closure(_anonymous__closure) }, + })) +); +BE_EXPORT_VARIABLE be_define_const_native_module(autoconf); +/********************************************************************/ diff --git a/lib/libesp32/berry/default/be_crypto_lib.c b/lib/libesp32/berry/default/be_crypto_lib.c new file mode 100644 index 000000000..04a10b28e --- /dev/null +++ b/lib/libesp32/berry/default/be_crypto_lib.c @@ -0,0 +1,56 @@ +/******************************************************************** + * Berry module `webserver` + * + * To use: `import webserver` + * + * Allows to respond to HTTP request + *******************************************************************/ +#include "be_constobj.h" + +#ifdef USE_ALEXA_AVS + +extern int m_aes_gcm_init(bvm *vm); +extern int m_aes_gcm_encryt(bvm *vm); +extern int m_aes_gcm_decryt(bvm *vm); +extern int m_aes_gcm_tag(bvm *vm); + +extern int m_ec_c25519_pubkey(bvm *vm); +extern int m_ec_c25519_sharedkey(bvm *vm); + +#include "../generate/be_fixed_be_class_aes_gcm.h" +#include "../generate/be_fixed_be_class_ec_c25519.h" + +void be_load_crypto_lib(bvm *vm) { + // insert the class GCM in module AES + be_newmodule(vm); + be_setname(vm, -1, "crypto"); + be_setglobal(vm, "crypto"); + + be_pushntvclass(vm, &be_class_aes_gcm); + be_setmember(vm, -2, "AES_GCM"); + be_pop(vm, 1); + + be_pushntvclass(vm, &be_class_ec_c25519); + be_setmember(vm, -2, "EC_C25519"); + be_pop(vm, 2); +} +/* @const_object_info_begin + +class be_class_aes_gcm (scope: global, name: AES_GCM) { + .p1, var + .p2, var + + init, func(m_aes_gcm_init) + encrypt, func(m_aes_gcm_encryt) + decrypt, func(m_aes_gcm_decryt) + tag, func(m_aes_gcm_tag) +} + +class be_class_ec_c25519 (scope: global, name: EC_C25519) { + public_key, func(m_ec_c25519_pubkey) + shared_key, func(m_ec_c25519_sharedkey) +} + +@const_object_info_end */ + +#endif // USE_ALEXA_AVS diff --git a/lib/libesp32/berry/default/be_ctypes.c b/lib/libesp32/berry/default/be_ctypes.c new file mode 100644 index 000000000..18e655d8b --- /dev/null +++ b/lib/libesp32/berry/default/be_ctypes.c @@ -0,0 +1,494 @@ +/******************************************************************** + * Tasmota ctypes mapping + *******************************************************************/ +#include "be_constobj.h" +#include + +extern __attribute__((noreturn)) void be_raisef(bvm *vm, const char *except, const char *msg, ...); + +// binary search within an array of sorted strings +// the first 4 bytes are a pointer to a string +// returns 0..total_elements-1 or -1 if not found + +int32_t bin_search_ctypes(const char * needle, const void * table, size_t elt_size, size_t total_elements) { + int32_t low = 0; + int32_t high = total_elements - 1; + int32_t mid = (low + high) / 2; + // start a dissect + while (low <= high) { + const char * elt = *(const char **) ( ((uint8_t*)table) + mid * elt_size ); + int32_t comp = strcmp(needle, elt); + if (comp < 0) { + high = mid - 1; + } else if (comp > 0) { + low = mid + 1; + } else { + break; + } + mid = (low + high) / 2; + } + if (low <= high) { + return mid; + } else { + return -1; + } +} + +enum { + ctypes_i32 = 14, + ctypes_i16 = 12, + ctypes_i8 = 11, + ctypes_u32 = 4, + ctypes_u16 = 2, + ctypes_u8 = 1, + + // big endian + ctypes_be_i32 = -14, + ctypes_be_i16 = -12, + ctypes_be_i8 = -11, + ctypes_be_u32 = -4, + ctypes_be_u16 = -2, + ctypes_be_u8 = -1, + + // floating point + ctypes_float = 5, + ctypes_double = 10, + + // pointer + ctypes_ptr32 = 9, + ctypes_ptr64 = -9, + + ctypes_bf = 0, //bif-field +}; + +typedef struct be_ctypes_structure_item_t { + const char * name; + uint16_t offset_bytes; + uint8_t offset_bits : 3; + uint8_t len_bits : 5; + int8_t type : 5; + uint8_t mapping : 3; +} be_ctypes_structure_item_t; + +typedef struct be_ctypes_structure_t { + uint16_t size_bytes; /* size in bytes */ + uint16_t size_elt; /* number of elements */ + const char **instance_mapping; /* array of instance class names for automatic instanciation of class */ + const be_ctypes_structure_item_t * items; +} be_ctypes_structure_t; + +typedef struct be_ctypes_class_t { + const char * name; + const be_ctypes_structure_t * definitions; +} be_ctypes_class_t; + +typedef struct be_ctypes_classes_t { + uint16_t size; + const char **instance_mapping; /* array of instance class names for automatic instanciation of class */ + const be_ctypes_class_t * classes; +} be_ctypes_classes_t; + +// const be_ctypes_class_t * g_ctypes_classes = NULL; + +// +// Constructor for ctypes structure +// +// If no arg: allocate a bytes() structure of the right size, filled with zeroes +// Arg1 is instance self +// If arg 2 is int or comptr (and not null): create a mapped bytes buffer to read/write at a specific location (can be copied if need a snapshot) +// If arg 2 is a bytes object, consider it's comptr and map the buffer (it's basically casting). WARNING no size check is done so you can easily corrupt memory +int be_ctypes_init(bvm *vm) { + int argc = be_top(vm); + void * src_data = NULL; + if (argc > 1 && (be_isint(vm, 2) || be_iscomptr(vm, 2) || be_isbytes(vm, 2))) { + if (be_iscomptr(vm, 2)) { + src_data = be_tocomptr(vm, 2); + } else if (be_isbytes(vm, 2)) { + be_getmember(vm, 2, ".p"); + src_data = be_tocomptr(vm, -1); + be_pop(vm, 1); + } else { + src_data = (void*) be_toint(vm, 2); + } + } + + // look for class definition + be_getmember(vm, 1, "_def"); // static class comptr + const be_ctypes_structure_t *definitions; + definitions = (const be_ctypes_structure_t *) be_tocomptr(vm, -1); + be_pop(vm, 1); + + // call super(self, bytes) + be_getglobal(vm, "super"); // push super function + be_pushvalue(vm, 1); // push self instance + be_getglobal(vm, "bytes"); // push bytes class + be_call(vm, 2); + be_pop(vm, 2); + // berry_log_C("be_ctypes_init> super found %p", be_toint(vm, -1)); + + // call bytes.init(self) + be_getmember(vm, -1, "init"); + be_pushvalue(vm, -2); + if (src_data) { be_pushcomptr(vm, src_data); } // if mapped, push address + be_pushint(vm, definitions ? -definitions->size_bytes : 0); // negative size signals a fixed size + be_call(vm, src_data ? 3 : 2); // call with 2 or 3 arguments depending on provided address + be_pop(vm, src_data ? 4 : 3); + // super(self, bytes) still on top of stack + + be_pop(vm, 1); + + be_return(vm); +} + +// +// copy ctypes_bytes, with same class and same content +// +int be_ctypes_copy(bvm *vm) { + size_t len; + const void * src = be_tobytes(vm, 1, &len); + be_classof(vm, 1); + // stack: 1/self + class_object + be_call(vm, 0); // call empty constructor to build empty resizable copy + // stack: 1/ self + new_empty_instance + + // source object (self) + be_getmember(vm, 1, ".p"); + const void* src_buf = be_tocomptr(vm, -1); + be_pop(vm, 1); + + be_getmember(vm, 1, ".len"); + int32_t src_len = be_toint(vm, -1); + be_pop(vm, 1); + + // dest object + be_getmember(vm, -1, ".p"); + const void* dst_buf = be_tocomptr(vm, -1); + be_pop(vm, 1); + + be_getmember(vm, -1, ".len"); + int32_t dst_len = be_toint(vm, -1); + be_pop(vm, 1); + + if (src_len != dst_len) { + be_raisef(vm, "internal_error", "new object has wrong size %i (should be %i)", dst_len, src_len); + } + + // copy bytes + memmove((void*)dst_buf, src_buf, src_len); + + be_return(vm); +} + +// get an attribute from a ctypes structure +// arg1: ctypes instance +// arg2: name of the argument +// The class has a `_def` static class attribute with the C low-level mapping definition +int be_ctypes_member(bvm *vm) { + int argc = be_top(vm); + be_getmember(vm, 1, "_def"); + const be_ctypes_structure_t *definitions; + definitions = (const be_ctypes_structure_t *) be_tocomptr(vm, -1); + be_pop(vm, 1); + const char *name = be_tostring(vm, 2); + + // look for member + int32_t member_idx = bin_search_ctypes(name, &definitions->items[0], sizeof(be_ctypes_structure_item_t), definitions->size_elt); + if (member_idx >= 0) { + const be_ctypes_structure_item_t *member = &definitions->items[member_idx]; + // berry_log_C("member found bytes=%i, bits=%i, len_bits=%i, type=%i", member->offset_bytes, member->offset_bits, member->len_bits, member->type); + + // dispatch according to types + if (ctypes_bf == member->type) { + // bitfield + be_getmember(vm, 1, "getbits"); + be_pushvalue(vm, 1); // self + be_pushint(vm, member->offset_bytes * 8 + member->offset_bits); + be_pushint(vm, member->len_bits); + be_call(vm, 3); + be_pop(vm, 3); + // int result at top of stack + } else if (ctypes_float == member->type) { + // Note: double not supported (no need identified) + // get raw int32_t + be_getmember(vm, 1, "geti"); // self.get or self.geti + be_pushvalue(vm, 1); // push self + be_pushint(vm, member->offset_bytes); + be_pushint(vm, 4); // size is 4 bytes + be_call(vm, 3); + be_pop(vm, 3); + // get int and convert to float + int32_t val = be_toint(vm, -1); + be_pop(vm, 1); + float *fval = (float*) &val; // type wizardry + be_pushreal(vm, *fval); + } else if (ctypes_ptr32 == member->type) { + be_getmember(vm, 1, "geti"); // self.get or self.geti + be_pushvalue(vm, 1); // push self + be_pushint(vm, member->offset_bytes); + be_pushint(vm, 4); // size is 4 bytes TODO 32 bits only supported here + be_call(vm, 3); + be_pop(vm, 3); + // convert to ptr + int32_t val = be_toint(vm, -1); + be_pop(vm, 1); + be_pushcomptr(vm, (void*) val); + } else { + // general int support + int size = member->type; // eventually 1/2/4, positive if little endian, negative if big endian + int sign = bfalse; // signed int + if (size >= ctypes_i8) { + size -= ctypes_i8 - 1; + sign = btrue; + } + if (size <= ctypes_be_i8) { + size += ctypes_be_i8 - 1; + sign = btrue; + } + // get + be_getmember(vm, 1, sign ? "geti" : "get"); // self.get or self.geti + be_pushvalue(vm, 1); // push self + be_pushint(vm, member->offset_bytes); + be_pushint(vm, size); + be_call(vm, 3); + be_pop(vm, 3); + // int result at top of stack + } + // the int result is at top of the stack + // check if we need an instance mapping + if (member->mapping > 0 && definitions->instance_mapping) { + const char * mapping_name = definitions->instance_mapping[member->mapping - 1]; + if (mapping_name) { + be_getglobal(vm, mapping_name); // stack: class + be_pushvalue(vm, -2); // stack: class, value + be_pushint(vm, -1); // stack; class, value, -1 + be_call(vm, 2); // call constructor with 2 parameters + be_pop(vm, 2); // leave new instance on top of stack + } + } + be_return(vm); + } + + be_return_nil(vm); +} + +// setmember takes 3 arguments: +// 1: self (subclass of bytes()) +// 2: name of member +// 3: value +int be_ctypes_setmember(bvm *vm) { + int argc = be_top(vm); + + // If the value is an instance, we call 'toint()' and replace the value + if (be_isinstance(vm, 3)) { + + be_getmember(vm, 3, "toint"); + if (!be_isnil(vm, -1)) { + be_pushvalue(vm, 3); + be_call(vm, 1); + be_pop(vm, 1); + be_moveto(vm, -1, 3); + } else { + be_raise(vm, "value_error", "Value is an instance without 'toint()' method"); + } + be_pop(vm, 1); + } + + // If the value is a pointer, replace with an int of same value (works only on 32 bits CPU) + if (be_iscomptr(vm, 3)) { + void * v = be_tocomptr(vm, 3); + be_pushint(vm, (int32_t) v); + be_moveto(vm, -1, 3); + be_pop(vm, 1); + } + + be_getmember(vm, 1, "_def"); + const be_ctypes_structure_t *definitions; + definitions = (const be_ctypes_structure_t *) be_tocomptr(vm, -1); + be_pop(vm, 1); + const char *name = be_tostring(vm, 2); + + // look for member + int32_t member_idx = bin_search_ctypes(name, &definitions->items[0], sizeof(be_ctypes_structure_item_t), definitions->size_elt); + if (member_idx >= 0) { + const be_ctypes_structure_item_t *member = &definitions->items[member_idx]; + // berry_log_C("member found bytes=%i, bits=%i, len_bits=%i, type=%i", member->offset_bytes, member->offset_bits, member->len_bits, member->type); + + // dispatch according to types + if (ctypes_bf == member->type) { + // bitfield + be_getmember(vm, 1, "setbits"); + be_pushvalue(vm, 1); // self + be_pushint(vm, member->offset_bytes * 8 + member->offset_bits); + be_pushint(vm, member->len_bits); + be_pushvalue(vm, 3); // val + be_call(vm, 4); + be_pop(vm, 5); + be_return_nil(vm); + } else if (ctypes_float == member->type) { + // Note: double not supported (no need identified) + float val = be_toreal(vm, 3); + int32_t *ival = (int32_t*) &val; + // set + be_getmember(vm, 1, "seti"); + be_pushvalue(vm, 1); // push self + be_pushint(vm, member->offset_bytes); + be_pushint(vm, *ival); + be_pushint(vm, 4); // size is 4 bytes + be_call(vm, 4); + be_pop(vm, 5); + be_return_nil(vm); + } else if (ctypes_ptr32 == member->type) { + // Note: 64 bits pointer not supported + int32_t ptr; + if (be_iscomptr(vm, 3)) { + ptr = (int32_t) be_tocomptr(vm, 3); + } else { + ptr = be_toint(vm, 3); + } + // set + be_getmember(vm, 1, "seti"); + be_pushvalue(vm, 1); // push self + be_pushint(vm, member->offset_bytes); + be_pushint(vm, ptr); + be_pushint(vm, 4); // size is 4 bytes - 64 bits not suppported + be_call(vm, 4); + be_pop(vm, 5); + be_return_nil(vm); + } else { + // general int support + int size = member->type; // eventually 1/2/4, positive if little endian, negative if big endian + int sign = bfalse; // signed int + if (size >= ctypes_i8) { + size -= ctypes_i8 - 1; + sign = btrue; + } + if (size <= ctypes_be_i8) { + size += ctypes_be_i8 - 1; + sign = btrue; + } + // set + be_getmember(vm, 1, sign ? "seti" : "set"); // self.get or self.geti + be_pushvalue(vm, 1); // push self + be_pushint(vm, member->offset_bytes); + be_pushvalue(vm, 3); // val + be_pushint(vm, size); + be_call(vm, 4); + be_pop(vm, 5); + be_return_nil(vm); + } + } else { + be_raisef(vm, "attribute_error", "class '%s' cannot assign to attribute '%s'", + be_classname(vm, 1), be_tostring(vm, 2)); + } +} + +// +// tomap, create a map instance containing all values decoded +// +int be_ctypes_tomap(bvm *vm) { + // don't need argc + be_getmember(vm, 1, "_def"); + const be_ctypes_structure_t *definitions; + definitions = (const be_ctypes_structure_t *) be_tocomptr(vm, -1); + be_pop(vm, 1); + + // create empty map + be_newobject(vm, "map"); + + for (uint32_t i = 0; i < definitions->size_elt; i++) { + const be_ctypes_structure_item_t * item = &definitions->items[i]; + + be_pushstring(vm, item->name); // stack: map - key + + be_getmember(vm, 1, "member"); + be_pushvalue(vm, 1); + be_pushstring(vm, item->name); + be_call(vm, 2); + be_pop(vm, 2); // stack: map - key - value + + be_data_insert(vm, -3); + be_pop(vm, 2); // stack: map + } + + be_pop(vm, 1); // remove map struct, to leave map instance + be_return(vm); +} + +// +// Constructor for ctypes_dyn structure +// +// Arg1 is instance self +// Arg2 is int or comptr (and not null): create a mapped bytes buffer to read/write at a specific location +// Arg3 is int or comptr (and not null): the binary definition of the struct (dynamic and not fixed as static member) +int be_ctypes_dyn_init(bvm *vm) { + int argc = be_top(vm); + void * src_data = NULL; + const be_ctypes_structure_t * definitions = NULL; + if (argc > 2 && (be_isint(vm, 2) || be_iscomptr(vm, 2)) && (be_isint(vm, 3) || be_iscomptr(vm, 3))) { + if (be_iscomptr(vm, 2)) { + src_data = be_tocomptr(vm, 2); + } else { + src_data = (void*) be_toint(vm, 2); + } + if (be_iscomptr(vm, 3)) { + definitions = (const be_ctypes_structure_t *) be_tocomptr(vm, 3); + } else { + definitions = (const be_ctypes_structure_t *) be_toint(vm, 3); + } + } + if (!src_data || !definitions) { + be_raise(vm, "value_error", "'address' and 'definition' cannot be null"); + } + + // store definition in member variable + be_pushcomptr(vm, (void*) definitions); + be_setmember(vm, 1, "_def"); // static class comptr + be_pop(vm, 1); + + // call bytes.init(self) + be_getbuiltin(vm, "bytes"); // shortcut `ctypes` init and call directly bytes.init() + be_getmember(vm, -1, "init"); + be_pushvalue(vm, 1); + be_pushcomptr(vm, src_data); + be_pushint(vm, -definitions->size_bytes); // negative size signals a fixed size + be_call(vm, 3); // call with 2 or 3 arguments depending on provided address + be_pop(vm, 4); + // super(self, bytes) still on top of stack + + be_pop(vm, 1); + + be_return(vm); +} + +BE_EXPORT_VARIABLE extern const bclass be_class_bytes; + +#include "../generate/be_fixed_be_class_ctypes.h" +#include "../generate/be_fixed_be_class_ctypes_dyn.h" + +void be_load_ctypes_lib(bvm *vm) { + be_pushntvclass(vm, &be_class_ctypes); + be_setglobal(vm, "ctypes_bytes"); + be_pop(vm, 1); + be_pushntvclass(vm, &be_class_ctypes_dyn); + be_setglobal(vm, "ctypes_bytes_dyn"); + be_pop(vm, 1); +} + +/* @const_object_info_begin +class be_class_ctypes (scope: global, name: ctypes_bytes, super: be_class_bytes) { + _def, nil() + copy, func(be_ctypes_copy) + init, func(be_ctypes_init) + member, func(be_ctypes_member) + setmember, func(be_ctypes_setmember) + + tomap, func(be_ctypes_tomap) +} +@const_object_info_end */ + +/* @const_object_info_begin +class be_class_ctypes_dyn (scope: global, name: ctypes_bytes_dyn, super: be_class_ctypes) { + _def, var + init, func(be_ctypes_dyn_init) +} +@const_object_info_end */ diff --git a/lib/libesp32/berry/default/be_display_lib.c b/lib/libesp32/berry/default/be_display_lib.c new file mode 100644 index 000000000..3943396fc --- /dev/null +++ b/lib/libesp32/berry/default/be_display_lib.c @@ -0,0 +1,29 @@ +/******************************************************************** + * Tasmota lib + * + * To use: `import display` + * + * Initialize Universal Display driver + *******************************************************************/ +#include "be_constobj.h" + +#ifdef USE_DISPLAY + +// Tasmota specific + +extern int be_ntv_display_start(bvm *vm); + +/******************************************************************** +** Solidified module: display +********************************************************************/ +be_local_module(display, + "display", + be_nested_map(1, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(start, -1), be_const_func(be_ntv_display_start) }, + })) +); +BE_EXPORT_VARIABLE be_define_const_native_module(display); +/********************************************************************/ + +#endif // USE_DISPLAY \ No newline at end of file diff --git a/lib/libesp32/berry/default/be_driverlib.c b/lib/libesp32/berry/default/be_driverlib.c new file mode 100644 index 000000000..45a611382 --- /dev/null +++ b/lib/libesp32/berry/default/be_driverlib.c @@ -0,0 +1,153 @@ +/******************************************************************** + * Tasmota lib + * + * To use: `d = Driver()` + * + *******************************************************************/ +#include "be_constobj.h" + +/******************************************************************** +** Solidified function: init +********************************************************************/ +be_local_closure(Driver_init, /* name */ + be_nested_proto( + 1, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 0, /* has constants */ + NULL, /* no const */ + &be_const_str_init, + &be_const_str_solidified, + ( &(const binstruction[ 1]) { /* code */ + 0x80000000, // 0000 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: get_tasmota +********************************************************************/ +be_local_closure(Driver_get_tasmota, /* name */ + be_nested_proto( + 2, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_str(tasmota), + }), + &be_const_str_get_tasmota, + &be_const_str_solidified, + ( &(const binstruction[ 2]) { /* code */ + 0xB8060000, // 0000 GETNGBL R1 K0 + 0x80040200, // 0001 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: add_cmd +********************************************************************/ +be_local_closure(Driver_add_cmd, /* name */ + be_nested_proto( + 7, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 1, /* has sup protos */ + ( &(const struct bproto*[ 1]) { + be_nested_proto( + 10, /* nstack */ + 4, /* argc */ + 0, /* varg */ + 1, /* has upvals */ + ( &(const bupvaldesc[ 2]) { /* upvals */ + be_local_const_upval(1, 2), + be_local_const_upval(1, 0), + }), + 0, /* has sup protos */ + NULL, /* no sub protos */ + 0, /* has constants */ + NULL, /* no const */ + &be_const_str__X3Clambda_X3E, + &be_const_str_solidified, + ( &(const binstruction[ 8]) { /* code */ + 0x68100000, // 0000 GETUPV R4 U0 + 0x68140001, // 0001 GETUPV R5 U1 + 0x5C180000, // 0002 MOVE R6 R0 + 0x5C1C0200, // 0003 MOVE R7 R1 + 0x5C200400, // 0004 MOVE R8 R2 + 0x5C240600, // 0005 MOVE R9 R3 + 0x7C100A00, // 0006 CALL R4 5 + 0x80040800, // 0007 RET 1 R4 + }) + ), + }), + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(tasmota), + /* K1 */ be_nested_str(add_cmd), + }), + &be_const_str_add_cmd, + &be_const_str_solidified, + ( &(const binstruction[ 7]) { /* code */ + 0xB80E0000, // 0000 GETNGBL R3 K0 + 0x8C0C0701, // 0001 GETMET R3 R3 K1 + 0x5C140200, // 0002 MOVE R5 R1 + 0x84180000, // 0003 CLOSURE R6 P0 + 0x7C0C0600, // 0004 CALL R3 3 + 0xA0000000, // 0005 CLOSE R0 + 0x80000000, // 0006 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified class: Driver +********************************************************************/ +be_local_class(Driver, + 13, + NULL, + be_nested_map(16, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(web_add_main_button, 14), be_const_var(4) }, + { be_const_key(web_add_console_button, -1), be_const_var(7) }, + { be_const_key(web_add_management_button, 8), be_const_var(5) }, + { be_const_key(init, -1), be_const_closure(Driver_init_closure) }, + { be_const_key(json_append, -1), be_const_var(10) }, + { be_const_key(web_add_config_button, 7), be_const_var(6) }, + { be_const_key(every_100ms, -1), be_const_var(1) }, + { be_const_key(display, -1), be_const_var(12) }, + { be_const_key(web_add_button, 13), be_const_var(3) }, + { be_const_key(every_second, -1), be_const_var(0) }, + { be_const_key(save_before_restart, -1), be_const_var(8) }, + { be_const_key(get_tasmota, -1), be_const_closure(Driver_get_tasmota_closure) }, + { be_const_key(web_sensor, 6), be_const_var(9) }, + { be_const_key(web_add_handler, -1), be_const_var(2) }, + { be_const_key(button_pressed, 1), be_const_var(11) }, + { be_const_key(add_cmd, -1), be_const_closure(Driver_add_cmd_closure) }, + })), + be_str_literal("Driver") +); +/*******************************************************************/ + +void be_load_Driver_class(bvm *vm) { + be_pushntvclass(vm, &be_class_Driver); + be_setglobal(vm, "Driver"); + be_pop(vm, 1); +} diff --git a/lib/libesp32/berry/default/be_energy_ctypes_definitions.c b/lib/libesp32/berry/default/be_energy_ctypes_definitions.c new file mode 100644 index 000000000..86f84ef64 --- /dev/null +++ b/lib/libesp32/berry/default/be_energy_ctypes_definitions.c @@ -0,0 +1,117 @@ +/******************************************************************** + * Tasmota LVGL ctypes mapping + *******************************************************************/ +#include "be_ctypes.h" + +#ifdef USE_ENERGY_SENSOR + +/******************************************************************** + * Generated code, don't edit + *******************************************************************/ + +static const char * be_ctypes_instance_mappings[]; /* forward definition */ + +const be_ctypes_structure_t be_energy_struct = { + 250, /* size in bytes */ + 85, /* number of elements */ + be_ctypes_instance_mappings, + (const be_ctypes_structure_item_t[85]) { + { "active_power", 24, 0, 0, ctypes_float, 0 }, + { "active_power_2", 28, 0, 0, ctypes_float, 0 }, + { "active_power_3", 32, 0, 0, ctypes_float, 0 }, + { "apparent_power", 36, 0, 0, ctypes_float, 0 }, + { "apparent_power_2", 40, 0, 0, ctypes_float, 0 }, + { "apparent_power_3", 44, 0, 0, ctypes_float, 0 }, + { "command_code", 205, 0, 0, ctypes_u8, 0 }, + { "current", 12, 0, 0, ctypes_float, 0 }, + { "current_2", 16, 0, 0, ctypes_float, 0 }, + { "current_3", 20, 0, 0, ctypes_float, 0 }, + { "current_available", 215, 0, 0, ctypes_u8, 0 }, + { "daily", 120, 0, 0, ctypes_float, 0 }, + { "daily_2", 124, 0, 0, ctypes_float, 0 }, + { "daily_3", 128, 0, 0, ctypes_float, 0 }, + { "daily_sum", 144, 0, 0, ctypes_float, 0 }, + { "data_valid", 206, 0, 0, ctypes_u8, 0 }, + { "data_valid_2", 207, 0, 0, ctypes_u8, 0 }, + { "data_valid_3", 208, 0, 0, ctypes_u8, 0 }, + { "export_active", 96, 0, 0, ctypes_float, 0 }, + { "export_active_2", 100, 0, 0, ctypes_float, 0 }, + { "export_active_3", 104, 0, 0, ctypes_float, 0 }, + { "fifth_second", 204, 0, 0, ctypes_u8, 0 }, + { "frequency", 72, 0, 0, ctypes_float, 0 }, + { "frequency_2", 76, 0, 0, ctypes_float, 0 }, + { "frequency_3", 80, 0, 0, ctypes_float, 0 }, + { "frequency_common", 211, 0, 0, ctypes_u8, 0 }, + { "import_active", 84, 0, 0, ctypes_float, 0 }, + { "import_active_2", 88, 0, 0, ctypes_float, 0 }, + { "import_active_3", 92, 0, 0, ctypes_float, 0 }, + { "max_current_flag", 242, 0, 0, ctypes_u8, 0 }, + { "max_energy_state", 249, 0, 0, ctypes_u8, 0 }, + { "max_power_flag", 238, 0, 0, ctypes_u8, 0 }, + { "max_voltage_flag", 240, 0, 0, ctypes_u8, 0 }, + { "min_current_flag", 241, 0, 0, ctypes_u8, 0 }, + { "min_power_flag", 237, 0, 0, ctypes_u8, 0 }, + { "min_voltage_flag", 239, 0, 0, ctypes_u8, 0 }, + { "mplh_counter", 244, 0, 0, ctypes_u16, 0 }, + { "mplr_counter", 248, 0, 0, ctypes_u8, 0 }, + { "mplw_counter", 246, 0, 0, ctypes_u16, 0 }, + { "period", 192, 0, 0, ctypes_u32, 0 }, + { "period_2", 196, 0, 0, ctypes_u32, 0 }, + { "period_3", 200, 0, 0, ctypes_u32, 0 }, + { "phase_count", 209, 0, 0, ctypes_u8, 0 }, + { "power_factor", 60, 0, 0, ctypes_float, 0 }, + { "power_factor_2", 64, 0, 0, ctypes_float, 0 }, + { "power_factor_3", 68, 0, 0, ctypes_float, 0 }, + { "power_history_0", 218, 0, 0, ctypes_u16, 0 }, + { "power_history_0_2", 220, 0, 0, ctypes_u16, 0 }, + { "power_history_0_3", 222, 0, 0, ctypes_u16, 0 }, + { "power_history_1", 224, 0, 0, ctypes_u16, 0 }, + { "power_history_1_2", 226, 0, 0, ctypes_u16, 0 }, + { "power_history_1_3", 228, 0, 0, ctypes_u16, 0 }, + { "power_history_2", 230, 0, 0, ctypes_u16, 0 }, + { "power_history_2_2", 232, 0, 0, ctypes_u16, 0 }, + { "power_history_2_3", 234, 0, 0, ctypes_u16, 0 }, + { "power_on", 217, 0, 0, ctypes_u8, 0 }, + { "power_steady_counter", 236, 0, 0, ctypes_u8, 0 }, + { "reactive_power", 48, 0, 0, ctypes_float, 0 }, + { "reactive_power_2", 52, 0, 0, ctypes_float, 0 }, + { "reactive_power_3", 56, 0, 0, ctypes_float, 0 }, + { "start_energy", 108, 0, 0, ctypes_float, 0 }, + { "start_energy_2", 112, 0, 0, ctypes_float, 0 }, + { "start_energy_3", 116, 0, 0, ctypes_float, 0 }, + { "today_delta_kwh", 156, 0, 0, ctypes_u32, 0 }, + { "today_delta_kwh_2", 160, 0, 0, ctypes_u32, 0 }, + { "today_delta_kwh_3", 164, 0, 0, ctypes_u32, 0 }, + { "today_kwh", 180, 0, 0, ctypes_u32, 0 }, + { "today_kwh_2", 184, 0, 0, ctypes_u32, 0 }, + { "today_kwh_3", 188, 0, 0, ctypes_u32, 0 }, + { "today_offset_init_kwh", 213, 0, 0, ctypes_u8, 0 }, + { "today_offset_kwh", 168, 0, 0, ctypes_u32, 0 }, + { "today_offset_kwh_2", 172, 0, 0, ctypes_u32, 0 }, + { "today_offset_kwh_3", 176, 0, 0, ctypes_u32, 0 }, + { "total", 132, 0, 0, ctypes_float, 0 }, + { "total_2", 136, 0, 0, ctypes_float, 0 }, + { "total_3", 140, 0, 0, ctypes_float, 0 }, + { "total_sum", 148, 0, 0, ctypes_float, 0 }, + { "type_dc", 216, 0, 0, ctypes_u8, 0 }, + { "use_overtemp", 212, 0, 0, ctypes_u8, 0 }, + { "voltage", 0, 0, 0, ctypes_float, 0 }, + { "voltage_2", 4, 0, 0, ctypes_float, 0 }, + { "voltage_3", 8, 0, 0, ctypes_float, 0 }, + { "voltage_available", 214, 0, 0, ctypes_u8, 0 }, + { "voltage_common", 210, 0, 0, ctypes_u8, 0 }, + { "yesterday_sum", 152, 0, 0, ctypes_float, 0 }, +}}; + +static const char * be_ctypes_instance_mappings[] = { + NULL +}; + +static be_define_ctypes_class(energy_struct, &be_energy_struct, &be_class_ctypes, "energy_struct"); + +void be_load_ctypes_energy_definitions_lib(bvm *vm) { + ctypes_register_class(vm, &be_class_energy_struct, &be_energy_struct); +} +/********************************************************************/ + +#endif // USE_ENERGY_SENSOR \ No newline at end of file diff --git a/lib/libesp32/berry/default/be_energylib.c b/lib/libesp32/berry/default/be_energylib.c new file mode 100644 index 000000000..cbdddbfca --- /dev/null +++ b/lib/libesp32/berry/default/be_energylib.c @@ -0,0 +1,186 @@ +/******************************************************************** + * Tasmota lib + * + * To use: `import power` + * + * read power values + *******************************************************************/ +#include "be_constobj.h" + +#ifdef USE_ENERGY_SENSOR + +extern struct ENERGY Energy; +/* + +_energy = nil # avoid compilation error +energy = module("energy") +energy._ptr = nil + +def init(m) + import global + global._energy = energy_struct(m._ptr) + return m +end +energy.init = init + +def read() + return _energy.tomap() +end +energy.read = read + +def member(k) + return _energy.(k) +end +energy.member = member + +def setmember(k, v) + _energy.(k) = v +end +energy.setmember = setmember + +import solidify +solidify.dump(energy) +*/ + + +/******************************************************************** +** Solidified function: member +********************************************************************/ +be_local_closure(energy_member, /* name */ + be_nested_proto( + 2, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_str(_energy), + }), + &be_const_str_member, + &be_const_str_solidified, + ( &(const binstruction[ 3]) { /* code */ + 0xB8060000, // 0000 GETNGBL R1 K0 + 0x88040200, // 0001 GETMBR R1 R1 R0 + 0x80040200, // 0002 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: setmember +********************************************************************/ +be_local_closure(energy_setmember, /* name */ + be_nested_proto( + 3, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_str(_energy), + }), + &be_const_str_setmember, + &be_const_str_solidified, + ( &(const binstruction[ 3]) { /* code */ + 0xB80A0000, // 0000 GETNGBL R2 K0 + 0x90080001, // 0001 SETMBR R2 R0 R1 + 0x80000000, // 0002 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: read +********************************************************************/ +be_local_closure(energy_read, /* name */ + be_nested_proto( + 2, /* nstack */ + 0, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(_energy), + /* K1 */ be_nested_str(tomap), + }), + &be_const_str_read, + &be_const_str_solidified, + ( &(const binstruction[ 4]) { /* code */ + 0xB8020000, // 0000 GETNGBL R0 K0 + 0x8C000101, // 0001 GETMET R0 R0 K1 + 0x7C000200, // 0002 CALL R0 1 + 0x80040000, // 0003 RET 1 R0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: init +********************************************************************/ +be_local_closure(energy_init, /* name */ + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 4]) { /* constants */ + /* K0 */ be_nested_str(global), + /* K1 */ be_nested_str(_energy), + /* K2 */ be_nested_str(energy_struct), + /* K3 */ be_nested_str(_ptr), + }), + &be_const_str_init, + &be_const_str_solidified, + ( &(const binstruction[ 6]) { /* code */ + 0xA4060000, // 0000 IMPORT R1 K0 + 0xB80A0400, // 0001 GETNGBL R2 K2 + 0x880C0103, // 0002 GETMBR R3 R0 K3 + 0x7C080200, // 0003 CALL R2 1 + 0x90060202, // 0004 SETMBR R1 K1 R2 + 0x80040000, // 0005 RET 1 R0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified module: energy +********************************************************************/ +be_local_module(energy, + "energy", + be_nested_map(5, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(init, -1), be_const_closure(energy_init_closure) }, + { be_const_key(member, 2), be_const_closure(energy_member_closure) }, + { be_const_key(_ptr, 3), be_const_comptr(&Energy) }, + { be_const_key(setmember, -1), be_const_closure(energy_setmember_closure) }, + { be_const_key(read, -1), be_const_closure(energy_read_closure) }, + })) +); +BE_EXPORT_VARIABLE be_define_const_native_module(energy); +/********************************************************************/ + + +// { be_const_key(_ptr, 3), be_const_comptr(&Energy) }, /* patch */ + +#endif // USE_ENERGY_SENSOR \ No newline at end of file diff --git a/lib/libesp32/berry/default/be_flash_lib.c b/lib/libesp32/berry/default/be_flash_lib.c new file mode 100644 index 000000000..539805d5d --- /dev/null +++ b/lib/libesp32/berry/default/be_flash_lib.c @@ -0,0 +1,21 @@ +/******************************************************************** + * Berry module `webserver` + * + * To use: `import webserver` + * + * Allows to respond to HTTP request + *******************************************************************/ +#include "be_constobj.h" + +extern int p_flash_read(bvm *vm); +extern int p_flash_write(bvm *vm); +extern int p_flash_erase(bvm *vm); + +/* @const_object_info_begin +module flash (scope: global) { + read, func(p_flash_read) + write, func(p_flash_write) + erase, func(p_flash_erase) +} +@const_object_info_end */ +#include "../generate/be_fixed_flash.h" diff --git a/lib/libesp32/berry/default/be_gpio_lib.c b/lib/libesp32/berry/default/be_gpio_lib.c new file mode 100644 index 000000000..3f0b2b3ed --- /dev/null +++ b/lib/libesp32/berry/default/be_gpio_lib.c @@ -0,0 +1,34 @@ +/******************************************************************** + * Tasmota lib + * + * To use: `import power` + * + * read power values + *******************************************************************/ +#include "be_constobj.h" + +// Tasmota specific + +extern int gp_member(bvm *vm); +extern int gp_pin_mode(bvm *vm); +extern int gp_digital_write(bvm *vm); +extern int gp_digital_read(bvm *vm); +extern int gp_dac_voltage(bvm *vm); + +extern int gp_pin_used(bvm *vm); +extern int gp_pin(bvm *vm); + +/* @const_object_info_begin +module gpio (scope: global) { + member, func(gp_member) + + pin_mode, func(gp_pin_mode) + digital_write, func(gp_digital_write) + digital_read, func(gp_digital_read) + dac_voltage, func(gp_dac_voltage) + + pin_used, func(gp_pin_used) + pin, func(gp_pin) +} +@const_object_info_end */ +#include "../generate/be_fixed_gpio.h" diff --git a/lib/libesp32/berry/default/be_i2c_axp192_lib.c b/lib/libesp32/berry/default/be_i2c_axp192_lib.c new file mode 100644 index 000000000..4f9f02307 --- /dev/null +++ b/lib/libesp32/berry/default/be_i2c_axp192_lib.c @@ -0,0 +1,899 @@ +/******************************************************************** + * Tasmota LVGL lv_signal_bars widget + *******************************************************************/ +#include "be_constobj.h" + +/******************************************************************** +** Solidified function: get_warning_level +********************************************************************/ +be_local_closure(AXP192_get_warning_level, /* name */ + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(read12), + /* K1 */ be_const_int(1), + }), + &be_const_str_get_warning_level, + &be_const_str_solidified, + ( &(const binstruction[ 5]) { /* code */ + 0x8C040100, // 0000 GETMET R1 R0 K0 + 0x540E0046, // 0001 LDINT R3 71 + 0x7C040400, // 0002 CALL R1 2 + 0x2C040301, // 0003 AND R1 R1 K1 + 0x80040200, // 0004 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: get_vbus_current +********************************************************************/ +be_local_closure(AXP192_get_vbus_current, /* name */ + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(read12), + /* K1 */ be_const_real_hex(0x3EC00000), + }), + &be_const_str_get_vbus_current, + &be_const_str_solidified, + ( &(const binstruction[ 5]) { /* code */ + 0x8C040100, // 0000 GETMET R1 R0 K0 + 0x540E005B, // 0001 LDINT R3 92 + 0x7C040400, // 0002 CALL R1 2 + 0x08040301, // 0003 MUL R1 R1 K1 + 0x80040200, // 0004 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: set_chg_current +********************************************************************/ +be_local_closure(AXP192_set_chg_current, /* name */ + be_nested_proto( + 8, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(write8), + /* K1 */ be_nested_str(read8), + }), + &be_const_str_set_chg_current, + &be_const_str_solidified, + ( &(const binstruction[12]) { /* code */ + 0x8C080100, // 0000 GETMET R2 R0 K0 + 0x54120032, // 0001 LDINT R4 51 + 0x8C140101, // 0002 GETMET R5 R0 K1 + 0x541E0032, // 0003 LDINT R7 51 + 0x7C140400, // 0004 CALL R5 2 + 0x541A00EF, // 0005 LDINT R6 240 + 0x2C140A06, // 0006 AND R5 R5 R6 + 0x541A000E, // 0007 LDINT R6 15 + 0x2C180206, // 0008 AND R6 R1 R6 + 0x30140A06, // 0009 OR R5 R5 R6 + 0x7C080600, // 000A CALL R2 3 + 0x80000000, // 000B RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: get_bat_current +********************************************************************/ +be_local_closure(AXP192_get_bat_current, /* name */ + be_nested_proto( + 5, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(read13), + /* K1 */ be_const_real_hex(0x3F000000), + }), + &be_const_str_get_bat_current, + &be_const_str_solidified, + ( &(const binstruction[ 9]) { /* code */ + 0x8C040100, // 0000 GETMET R1 R0 K0 + 0x540E0079, // 0001 LDINT R3 122 + 0x7C040400, // 0002 CALL R1 2 + 0x8C080100, // 0003 GETMET R2 R0 K0 + 0x5412007B, // 0004 LDINT R4 124 + 0x7C080400, // 0005 CALL R2 2 + 0x04040202, // 0006 SUB R1 R1 R2 + 0x08040301, // 0007 MUL R1 R1 K1 + 0x80040200, // 0008 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: get_bat_power +********************************************************************/ +be_local_closure(AXP192_get_bat_power, /* name */ + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(read24), + /* K1 */ be_const_real_hex(0x3A102DE1), + }), + &be_const_str_get_bat_power, + &be_const_str_solidified, + ( &(const binstruction[ 5]) { /* code */ + 0x8C040100, // 0000 GETMET R1 R0 K0 + 0x540E006F, // 0001 LDINT R3 112 + 0x7C040400, // 0002 CALL R1 2 + 0x08040301, // 0003 MUL R1 R1 K1 + 0x80040200, // 0004 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: json_append +********************************************************************/ +be_local_closure(AXP192_json_append, /* name */ + be_nested_proto( + 2, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_str(wire), + }), + &be_const_str_json_append, + &be_const_str_solidified, + ( &(const binstruction[ 5]) { /* code */ + 0x88040100, // 0000 GETMBR R1 R0 K0 + 0x74060001, // 0001 JMPT R1 #0004 + 0x4C040000, // 0002 LDNIL R1 + 0x80040200, // 0003 RET 1 R1 + 0x80000000, // 0004 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: get_vbus_voltage +********************************************************************/ +be_local_closure(AXP192_get_vbus_voltage, /* name */ + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(read12), + /* K1 */ be_const_real_hex(0x3ADED28A), + }), + &be_const_str_get_vbus_voltage, + &be_const_str_solidified, + ( &(const binstruction[ 5]) { /* code */ + 0x8C040100, // 0000 GETMET R1 R0 K0 + 0x540E0059, // 0001 LDINT R3 90 + 0x7C040400, // 0002 CALL R1 2 + 0x08040301, // 0003 MUL R1 R1 K1 + 0x80040200, // 0004 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: get_temp +********************************************************************/ +be_local_closure(AXP192_get_temp, /* name */ + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(read12), + /* K1 */ be_const_real_hex(0x3DCCCCCD), + /* K2 */ be_const_real_hex(0x4310B333), + }), + &be_const_str_get_temp, + &be_const_str_solidified, + ( &(const binstruction[ 6]) { /* code */ + 0x8C040100, // 0000 GETMET R1 R0 K0 + 0x540E005D, // 0001 LDINT R3 94 + 0x7C040400, // 0002 CALL R1 2 + 0x08040301, // 0003 MUL R1 R1 K1 + 0x04040302, // 0004 SUB R1 R1 K2 + 0x80040200, // 0005 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: battery_present +********************************************************************/ +be_local_closure(AXP192_battery_present, /* name */ + be_nested_proto( + 6, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 4]) { /* constants */ + /* K0 */ be_nested_str(wire), + /* K1 */ be_nested_str(read), + /* K2 */ be_nested_str(addr), + /* K3 */ be_const_int(1), + }), + &be_const_str_battery_present, + &be_const_str_solidified, + ( &(const binstruction[15]) { /* code */ + 0x88040100, // 0000 GETMBR R1 R0 K0 + 0x8C040301, // 0001 GETMET R1 R1 K1 + 0x880C0102, // 0002 GETMBR R3 R0 K2 + 0x58100003, // 0003 LDCONST R4 K3 + 0x58140003, // 0004 LDCONST R5 K3 + 0x7C040800, // 0005 CALL R1 4 + 0x540A001F, // 0006 LDINT R2 32 + 0x2C040202, // 0007 AND R1 R1 R2 + 0x78060002, // 0008 JMPF R1 #000C + 0x50040200, // 0009 LDBOOL R1 1 0 + 0x80040200, // 000A RET 1 R1 + 0x70020001, // 000B JMP #000E + 0x50040000, // 000C LDBOOL R1 0 0 + 0x80040200, // 000D RET 1 R1 + 0x80000000, // 000E RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: get_aps_voltage +********************************************************************/ +be_local_closure(AXP192_get_aps_voltage, /* name */ + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(read12), + /* K1 */ be_const_real_hex(0x3AB78035), + }), + &be_const_str_get_aps_voltage, + &be_const_str_solidified, + ( &(const binstruction[ 5]) { /* code */ + 0x8C040100, // 0000 GETMET R1 R0 K0 + 0x540E007D, // 0001 LDINT R3 126 + 0x7C040400, // 0002 CALL R1 2 + 0x08040301, // 0003 MUL R1 R1 K1 + 0x80040200, // 0004 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: set_dcdc_enable +********************************************************************/ +be_local_closure(AXP192_set_dcdc_enable, /* name */ + be_nested_proto( + 8, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 5]) { /* constants */ + /* K0 */ be_const_int(1), + /* K1 */ be_nested_str(write_bit), + /* K2 */ be_const_int(0), + /* K3 */ be_const_int(2), + /* K4 */ be_const_int(3), + }), + &be_const_str_set_dcdc_enable, + &be_const_str_solidified, + ( &(const binstruction[22]) { /* code */ + 0x1C0C0300, // 0000 EQ R3 R1 K0 + 0x780E0004, // 0001 JMPF R3 #0007 + 0x8C0C0101, // 0002 GETMET R3 R0 K1 + 0x54160011, // 0003 LDINT R5 18 + 0x58180002, // 0004 LDCONST R6 K2 + 0x5C1C0400, // 0005 MOVE R7 R2 + 0x7C0C0800, // 0006 CALL R3 4 + 0x1C0C0303, // 0007 EQ R3 R1 K3 + 0x780E0004, // 0008 JMPF R3 #000E + 0x8C0C0101, // 0009 GETMET R3 R0 K1 + 0x54160011, // 000A LDINT R5 18 + 0x541A0003, // 000B LDINT R6 4 + 0x5C1C0400, // 000C MOVE R7 R2 + 0x7C0C0800, // 000D CALL R3 4 + 0x1C0C0304, // 000E EQ R3 R1 K4 + 0x780E0004, // 000F JMPF R3 #0015 + 0x8C0C0101, // 0010 GETMET R3 R0 K1 + 0x54160011, // 0011 LDINT R5 18 + 0x58180000, // 0012 LDCONST R6 K0 + 0x5C1C0400, // 0013 MOVE R7 R2 + 0x7C0C0800, // 0014 CALL R3 4 + 0x80000000, // 0015 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: set_ldo_voltage +********************************************************************/ +be_local_closure(AXP192_set_ldo_voltage, /* name */ + be_nested_proto( + 9, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 4]) { /* constants */ + /* K0 */ be_const_int(2), + /* K1 */ be_nested_str(write8), + /* K2 */ be_nested_str(read8), + /* K3 */ be_const_int(3), + }), + &be_const_str_set_ldo_voltage, + &be_const_str_solidified, + ( &(const binstruction[39]) { /* code */ + 0x540E0CE3, // 0000 LDINT R3 3300 + 0x240C0403, // 0001 GT R3 R2 R3 + 0x780E0001, // 0002 JMPF R3 #0005 + 0x540A000E, // 0003 LDINT R2 15 + 0x70020004, // 0004 JMP #000A + 0x540E0063, // 0005 LDINT R3 100 + 0x0C0C0403, // 0006 DIV R3 R2 R3 + 0x54120011, // 0007 LDINT R4 18 + 0x040C0604, // 0008 SUB R3 R3 R4 + 0x5C080600, // 0009 MOVE R2 R3 + 0x1C0C0300, // 000A EQ R3 R1 K0 + 0x780E000C, // 000B JMPF R3 #0019 + 0x8C0C0101, // 000C GETMET R3 R0 K1 + 0x54160027, // 000D LDINT R5 40 + 0x8C180102, // 000E GETMET R6 R0 K2 + 0x54220027, // 000F LDINT R8 40 + 0x7C180400, // 0010 CALL R6 2 + 0x541E000E, // 0011 LDINT R7 15 + 0x2C180C07, // 0012 AND R6 R6 R7 + 0x541E000E, // 0013 LDINT R7 15 + 0x2C1C0407, // 0014 AND R7 R2 R7 + 0x54220003, // 0015 LDINT R8 4 + 0x381C0E08, // 0016 SHL R7 R7 R8 + 0x30180C07, // 0017 OR R6 R6 R7 + 0x7C0C0600, // 0018 CALL R3 3 + 0x1C0C0303, // 0019 EQ R3 R1 K3 + 0x780E000A, // 001A JMPF R3 #0026 + 0x8C0C0101, // 001B GETMET R3 R0 K1 + 0x54160027, // 001C LDINT R5 40 + 0x8C180102, // 001D GETMET R6 R0 K2 + 0x54220027, // 001E LDINT R8 40 + 0x7C180400, // 001F CALL R6 2 + 0x541E00EF, // 0020 LDINT R7 240 + 0x2C180C07, // 0021 AND R6 R6 R7 + 0x541E000E, // 0022 LDINT R7 15 + 0x2C1C0407, // 0023 AND R7 R2 R7 + 0x30180C07, // 0024 OR R6 R6 R7 + 0x7C0C0600, // 0025 CALL R3 3 + 0x80000000, // 0026 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: init +********************************************************************/ +be_local_closure(AXP192_init, /* name */ + be_nested_proto( + 5, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(I2C_Driver), + /* K1 */ be_nested_str(init), + /* K2 */ be_nested_str(AXP192), + }), + &be_const_str_init, + &be_const_str_solidified, + ( &(const binstruction[ 9]) { /* code */ + 0x60040003, // 0000 GETGBL R1 G3 + 0x5C080000, // 0001 MOVE R2 R0 + 0xB80E0000, // 0002 GETNGBL R3 K0 + 0x7C040400, // 0003 CALL R1 2 + 0x8C040301, // 0004 GETMET R1 R1 K1 + 0x580C0002, // 0005 LDCONST R3 K2 + 0x54120033, // 0006 LDINT R4 52 + 0x7C040600, // 0007 CALL R1 3 + 0x80000000, // 0008 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: get_bat_voltage +********************************************************************/ +be_local_closure(AXP192_get_bat_voltage, /* name */ + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(read12), + /* K1 */ be_const_real_hex(0x3A902DE0), + }), + &be_const_str_get_bat_voltage, + &be_const_str_solidified, + ( &(const binstruction[ 5]) { /* code */ + 0x8C040100, // 0000 GETMET R1 R0 K0 + 0x540E0077, // 0001 LDINT R3 120 + 0x7C040400, // 0002 CALL R1 2 + 0x08040301, // 0003 MUL R1 R1 K1 + 0x80040200, // 0004 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: set_ldo_enable +********************************************************************/ +be_local_closure(AXP192_set_ldo_enable, /* name */ + be_nested_proto( + 8, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_const_int(2), + /* K1 */ be_nested_str(write_bit), + /* K2 */ be_const_int(3), + }), + &be_const_str_set_ldo_enable, + &be_const_str_solidified, + ( &(const binstruction[15]) { /* code */ + 0x1C0C0300, // 0000 EQ R3 R1 K0 + 0x780E0004, // 0001 JMPF R3 #0007 + 0x8C0C0101, // 0002 GETMET R3 R0 K1 + 0x54160011, // 0003 LDINT R5 18 + 0x58180000, // 0004 LDCONST R6 K0 + 0x5C1C0400, // 0005 MOVE R7 R2 + 0x7C0C0800, // 0006 CALL R3 4 + 0x1C0C0302, // 0007 EQ R3 R1 K2 + 0x780E0004, // 0008 JMPF R3 #000E + 0x8C0C0101, // 0009 GETMET R3 R0 K1 + 0x54160011, // 000A LDINT R5 18 + 0x58180002, // 000B LDCONST R6 K2 + 0x5C1C0400, // 000C MOVE R7 R2 + 0x7C0C0800, // 000D CALL R3 4 + 0x80000000, // 000E RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: set_dc_voltage +********************************************************************/ +be_local_closure(AXP192_set_dc_voltage, /* name */ + be_nested_proto( + 11, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 6]) { /* constants */ + /* K0 */ be_const_int(1), + /* K1 */ be_const_int(3), + /* K2 */ be_const_int(0), + /* K3 */ be_const_int(2), + /* K4 */ be_nested_str(write8), + /* K5 */ be_nested_str(read8), + }), + &be_const_str_set_dc_voltage, + &be_const_str_solidified, + ( &(const binstruction[48]) { /* code */ + 0x140C0300, // 0000 LT R3 R1 K0 + 0x740E0001, // 0001 JMPT R3 #0004 + 0x240C0301, // 0002 GT R3 R1 K1 + 0x780E0000, // 0003 JMPF R3 #0005 + 0x80000600, // 0004 RET 0 + 0x4C0C0000, // 0005 LDNIL R3 + 0x541202BB, // 0006 LDINT R4 700 + 0x14100404, // 0007 LT R4 R2 R4 + 0x78120001, // 0008 JMPF R4 #000B + 0x580C0002, // 0009 LDCONST R3 K2 + 0x70020010, // 000A JMP #001C + 0x54120DAB, // 000B LDINT R4 3500 + 0x24100404, // 000C GT R4 R2 R4 + 0x78120001, // 000D JMPF R4 #0010 + 0x540E006F, // 000E LDINT R3 112 + 0x7002000B, // 000F JMP #001C + 0x1C100303, // 0010 EQ R4 R1 K3 + 0x78120004, // 0011 JMPF R4 #0017 + 0x541208E2, // 0012 LDINT R4 2275 + 0x24100404, // 0013 GT R4 R2 R4 + 0x78120001, // 0014 JMPF R4 #0017 + 0x540E003E, // 0015 LDINT R3 63 + 0x70020004, // 0016 JMP #001C + 0x541202BB, // 0017 LDINT R4 700 + 0x04100404, // 0018 SUB R4 R2 R4 + 0x54160018, // 0019 LDINT R5 25 + 0x0C100805, // 001A DIV R4 R4 R5 + 0x5C0C0800, // 001B MOVE R3 R4 + 0x54120025, // 001C LDINT R4 38 + 0x1C140301, // 001D EQ R5 R1 K1 + 0x78160001, // 001E JMPF R5 #0021 + 0x54120026, // 001F LDINT R4 39 + 0x70020002, // 0020 JMP #0024 + 0x1C140303, // 0021 EQ R5 R1 K3 + 0x78160000, // 0022 JMPF R5 #0024 + 0x54120022, // 0023 LDINT R4 35 + 0x8C140104, // 0024 GETMET R5 R0 K4 + 0x5C1C0800, // 0025 MOVE R7 R4 + 0x8C200105, // 0026 GETMET R8 R0 K5 + 0x5C280800, // 0027 MOVE R10 R4 + 0x7C200400, // 0028 CALL R8 2 + 0x5426007F, // 0029 LDINT R9 128 + 0x2C201009, // 002A AND R8 R8 R9 + 0x5426007E, // 002B LDINT R9 127 + 0x2C240609, // 002C AND R9 R3 R9 + 0x30201009, // 002D OR R8 R8 R9 + 0x7C140600, // 002E CALL R5 3 + 0x80000000, // 002F RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: write_gpio +********************************************************************/ +be_local_closure(AXP192_write_gpio, /* name */ + be_nested_proto( + 8, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 4]) { /* constants */ + /* K0 */ be_const_int(0), + /* K1 */ be_const_int(2), + /* K2 */ be_nested_str(write_bit), + /* K3 */ be_const_int(3), + }), + &be_const_str_write_gpio, + &be_const_str_solidified, + ( &(const binstruction[21]) { /* code */ + 0x280C0300, // 0000 GE R3 R1 K0 + 0x780E0007, // 0001 JMPF R3 #000A + 0x180C0301, // 0002 LE R3 R1 K1 + 0x780E0005, // 0003 JMPF R3 #000A + 0x8C0C0102, // 0004 GETMET R3 R0 K2 + 0x54160093, // 0005 LDINT R5 148 + 0x5C180200, // 0006 MOVE R6 R1 + 0x5C1C0400, // 0007 MOVE R7 R2 + 0x7C0C0800, // 0008 CALL R3 4 + 0x70020009, // 0009 JMP #0014 + 0x280C0303, // 000A GE R3 R1 K3 + 0x780E0007, // 000B JMPF R3 #0014 + 0x540E0003, // 000C LDINT R3 4 + 0x180C0203, // 000D LE R3 R1 R3 + 0x780E0004, // 000E JMPF R3 #0014 + 0x8C0C0102, // 000F GETMET R3 R0 K2 + 0x54160095, // 0010 LDINT R5 150 + 0x04180303, // 0011 SUB R6 R1 K3 + 0x5C1C0400, // 0012 MOVE R7 R2 + 0x7C0C0800, // 0013 CALL R3 4 + 0x80000000, // 0014 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: web_sensor +********************************************************************/ +be_local_closure(AXP192_web_sensor, /* name */ + be_nested_proto( + 11, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[14]) { /* constants */ + /* K0 */ be_nested_str(wire), + /* K1 */ be_nested_str(string), + /* K2 */ be_nested_str(format), + /* K3 */ be_nested_str(_X7Bs_X7DVBus_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D), + /* K4 */ be_nested_str(_X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D), + /* K5 */ be_nested_str(_X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D), + /* K6 */ be_nested_str(_X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D), + /* K7 */ be_nested_str(_X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_XB0C_X7Be_X7D), + /* K8 */ be_nested_str(get_vbus_voltage), + /* K9 */ be_nested_str(get_bat_voltage), + /* K10 */ be_nested_str(get_bat_current), + /* K11 */ be_nested_str(get_temp), + /* K12 */ be_nested_str(tasmota), + /* K13 */ be_nested_str(web_send_decimal), + }), + &be_const_str_web_sensor, + &be_const_str_solidified, + ( &(const binstruction[26]) { /* code */ + 0x88040100, // 0000 GETMBR R1 R0 K0 + 0x74060001, // 0001 JMPT R1 #0004 + 0x4C040000, // 0002 LDNIL R1 + 0x80040200, // 0003 RET 1 R1 + 0xA4060200, // 0004 IMPORT R1 K1 + 0x8C080302, // 0005 GETMET R2 R1 K2 + 0x40120704, // 0006 CONNECT R4 K3 K4 + 0x40100905, // 0007 CONNECT R4 R4 K5 + 0x40100906, // 0008 CONNECT R4 R4 K6 + 0x40100907, // 0009 CONNECT R4 R4 K7 + 0x8C140108, // 000A GETMET R5 R0 K8 + 0x7C140200, // 000B CALL R5 1 + 0x8C180108, // 000C GETMET R6 R0 K8 + 0x7C180200, // 000D CALL R6 1 + 0x8C1C0109, // 000E GETMET R7 R0 K9 + 0x7C1C0200, // 000F CALL R7 1 + 0x8C20010A, // 0010 GETMET R8 R0 K10 + 0x7C200200, // 0011 CALL R8 1 + 0x8C24010B, // 0012 GETMET R9 R0 K11 + 0x7C240200, // 0013 CALL R9 1 + 0x7C080E00, // 0014 CALL R2 7 + 0xB80E1800, // 0015 GETNGBL R3 K12 + 0x8C0C070D, // 0016 GETMET R3 R3 K13 + 0x5C140400, // 0017 MOVE R5 R2 + 0x7C0C0400, // 0018 CALL R3 2 + 0x80000000, // 0019 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: get_bat_charge_current +********************************************************************/ +be_local_closure(AXP192_get_bat_charge_current, /* name */ + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(read13), + /* K1 */ be_const_real_hex(0x3F000000), + }), + &be_const_str_get_bat_charge_current, + &be_const_str_solidified, + ( &(const binstruction[ 5]) { /* code */ + 0x8C040100, // 0000 GETMET R1 R0 K0 + 0x540E0079, // 0001 LDINT R3 122 + 0x7C040400, // 0002 CALL R1 2 + 0x08040301, // 0003 MUL R1 R1 K1 + 0x80040200, // 0004 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: get_battery_chargin_status +********************************************************************/ +be_local_closure(AXP192_get_battery_chargin_status, /* name */ + be_nested_proto( + 6, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 4]) { /* constants */ + /* K0 */ be_nested_str(wire), + /* K1 */ be_nested_str(read), + /* K2 */ be_nested_str(addr), + /* K3 */ be_const_int(1), + }), + &be_const_str_get_battery_chargin_status, + &be_const_str_solidified, + ( &(const binstruction[ 7]) { /* code */ + 0x88040100, // 0000 GETMBR R1 R0 K0 + 0x8C040301, // 0001 GETMET R1 R1 K1 + 0x880C0102, // 0002 GETMBR R3 R0 K2 + 0x58100003, // 0003 LDCONST R4 K3 + 0x58140003, // 0004 LDCONST R5 K3 + 0x7C040800, // 0005 CALL R1 4 + 0x80040200, // 0006 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: get_input_power_status +********************************************************************/ +be_local_closure(AXP192_get_input_power_status, /* name */ + be_nested_proto( + 6, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 5]) { /* constants */ + /* K0 */ be_nested_str(wire), + /* K1 */ be_nested_str(read), + /* K2 */ be_nested_str(addr), + /* K3 */ be_const_int(0), + /* K4 */ be_const_int(1), + }), + &be_const_str_get_input_power_status, + &be_const_str_solidified, + ( &(const binstruction[ 7]) { /* code */ + 0x88040100, // 0000 GETMBR R1 R0 K0 + 0x8C040301, // 0001 GETMET R1 R1 K1 + 0x880C0102, // 0002 GETMBR R3 R0 K2 + 0x58100003, // 0003 LDCONST R4 K3 + 0x58140004, // 0004 LDCONST R5 K4 + 0x7C040800, // 0005 CALL R1 4 + 0x80040200, // 0006 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified class: AXP192 +********************************************************************/ +extern const bclass be_class_I2C_Driver; +be_local_class(AXP192, + 0, + &be_class_I2C_Driver, + be_nested_map(21, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(get_warning_level, -1), be_const_closure(AXP192_get_warning_level_closure) }, + { be_const_key(get_vbus_current, -1), be_const_closure(AXP192_get_vbus_current_closure) }, + { be_const_key(get_aps_voltage, -1), be_const_closure(AXP192_get_aps_voltage_closure) }, + { be_const_key(get_bat_current, -1), be_const_closure(AXP192_get_bat_current_closure) }, + { be_const_key(get_bat_power, 2), be_const_closure(AXP192_get_bat_power_closure) }, + { be_const_key(json_append, -1), be_const_closure(AXP192_json_append_closure) }, + { be_const_key(get_vbus_voltage, -1), be_const_closure(AXP192_get_vbus_voltage_closure) }, + { be_const_key(get_battery_chargin_status, 9), be_const_closure(AXP192_get_battery_chargin_status_closure) }, + { be_const_key(battery_present, -1), be_const_closure(AXP192_battery_present_closure) }, + { be_const_key(get_bat_charge_current, 14), be_const_closure(AXP192_get_bat_charge_current_closure) }, + { be_const_key(set_dcdc_enable, -1), be_const_closure(AXP192_set_dcdc_enable_closure) }, + { be_const_key(get_temp, 19), be_const_closure(AXP192_get_temp_closure) }, + { be_const_key(set_chg_current, 13), be_const_closure(AXP192_set_chg_current_closure) }, + { be_const_key(set_ldo_enable, 18), be_const_closure(AXP192_set_ldo_enable_closure) }, + { be_const_key(set_dc_voltage, -1), be_const_closure(AXP192_set_dc_voltage_closure) }, + { be_const_key(get_bat_voltage, 7), be_const_closure(AXP192_get_bat_voltage_closure) }, + { be_const_key(write_gpio, -1), be_const_closure(AXP192_write_gpio_closure) }, + { be_const_key(web_sensor, -1), be_const_closure(AXP192_web_sensor_closure) }, + { be_const_key(init, -1), be_const_closure(AXP192_init_closure) }, + { be_const_key(set_ldo_voltage, -1), be_const_closure(AXP192_set_ldo_voltage_closure) }, + { be_const_key(get_input_power_status, -1), be_const_closure(AXP192_get_input_power_status_closure) }, + })), + be_str_literal("AXP192") +); +/*******************************************************************/ + +void be_load_AXP192_class(bvm *vm) { + be_pushntvclass(vm, &be_class_AXP192); + be_setglobal(vm, "AXP192"); + be_pop(vm, 1); +} diff --git a/lib/libesp32/berry/default/be_i2c_driverlib.c b/lib/libesp32/berry/default/be_i2c_driverlib.c new file mode 100644 index 000000000..45f829e19 --- /dev/null +++ b/lib/libesp32/berry/default/be_i2c_driverlib.c @@ -0,0 +1,425 @@ +/******************************************************************** + * Tasmota I2C_Driver class + * + * To use: `d = I2C_Driver(addr, name)` + * where: + * addr: I2C address of the device + * name: name of the I2C chip for logging + * + *******************************************************************/ +#include "be_constobj.h" + +/******************************************************************** +** Solidified function: read32 +********************************************************************/ +be_local_closure(I2C_Driver_read32, /* name */ + be_nested_proto( + 7, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 7]) { /* constants */ + /* K0 */ be_nested_str(wire), + /* K1 */ be_nested_str(read_bytes), + /* K2 */ be_nested_str(addr), + /* K3 */ be_const_int(0), + /* K4 */ be_const_int(1), + /* K5 */ be_const_int(2), + /* K6 */ be_const_int(3), + }), + &be_const_str_read32, + &be_const_str_solidified, + ( &(const binstruction[20]) { /* code */ + 0x88080100, // 0000 GETMBR R2 R0 K0 + 0x8C080501, // 0001 GETMET R2 R2 K1 + 0x88100102, // 0002 GETMBR R4 R0 K2 + 0x5C140200, // 0003 MOVE R5 R1 + 0x541A0003, // 0004 LDINT R6 4 + 0x7C080800, // 0005 CALL R2 4 + 0x940C0503, // 0006 GETIDX R3 R2 K3 + 0x54120017, // 0007 LDINT R4 24 + 0x380C0604, // 0008 SHL R3 R3 R4 + 0x94100504, // 0009 GETIDX R4 R2 K4 + 0x5416000F, // 000A LDINT R5 16 + 0x38100805, // 000B SHL R4 R4 R5 + 0x000C0604, // 000C ADD R3 R3 R4 + 0x94100505, // 000D GETIDX R4 R2 K5 + 0x54160007, // 000E LDINT R5 8 + 0x38100805, // 000F SHL R4 R4 R5 + 0x000C0604, // 0010 ADD R3 R3 R4 + 0x94100506, // 0011 GETIDX R4 R2 K6 + 0x000C0604, // 0012 ADD R3 R3 R4 + 0x80040600, // 0013 RET 1 R3 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: write8 +********************************************************************/ +be_local_closure(I2C_Driver_write8, /* name */ + be_nested_proto( + 9, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 4]) { /* constants */ + /* K0 */ be_nested_str(wire), + /* K1 */ be_nested_str(write), + /* K2 */ be_nested_str(addr), + /* K3 */ be_const_int(1), + }), + &be_const_str_write8, + &be_const_str_solidified, + ( &(const binstruction[ 8]) { /* code */ + 0x880C0100, // 0000 GETMBR R3 R0 K0 + 0x8C0C0701, // 0001 GETMET R3 R3 K1 + 0x88140102, // 0002 GETMBR R5 R0 K2 + 0x5C180200, // 0003 MOVE R6 R1 + 0x5C1C0400, // 0004 MOVE R7 R2 + 0x58200003, // 0005 LDCONST R8 K3 + 0x7C0C0A00, // 0006 CALL R3 5 + 0x80040600, // 0007 RET 1 R3 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: read12 +********************************************************************/ +be_local_closure(I2C_Driver_read12, /* name */ + be_nested_proto( + 7, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 6]) { /* constants */ + /* K0 */ be_nested_str(wire), + /* K1 */ be_nested_str(read_bytes), + /* K2 */ be_nested_str(addr), + /* K3 */ be_const_int(2), + /* K4 */ be_const_int(0), + /* K5 */ be_const_int(1), + }), + &be_const_str_read12, + &be_const_str_solidified, + ( &(const binstruction[12]) { /* code */ + 0x88080100, // 0000 GETMBR R2 R0 K0 + 0x8C080501, // 0001 GETMET R2 R2 K1 + 0x88100102, // 0002 GETMBR R4 R0 K2 + 0x5C140200, // 0003 MOVE R5 R1 + 0x58180003, // 0004 LDCONST R6 K3 + 0x7C080800, // 0005 CALL R2 4 + 0x940C0504, // 0006 GETIDX R3 R2 K4 + 0x54120003, // 0007 LDINT R4 4 + 0x380C0604, // 0008 SHL R3 R3 R4 + 0x94100505, // 0009 GETIDX R4 R2 K5 + 0x000C0604, // 000A ADD R3 R3 R4 + 0x80040600, // 000B RET 1 R3 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: write_bit +********************************************************************/ +be_local_closure(I2C_Driver_write_bit, /* name */ + be_nested_proto( + 11, /* nstack */ + 4, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 4]) { /* constants */ + /* K0 */ be_const_int(0), + /* K1 */ be_const_int(1), + /* K2 */ be_nested_str(write8), + /* K3 */ be_nested_str(read8), + }), + &be_const_str_write_bit, + &be_const_str_solidified, + ( &(const binstruction[26]) { /* code */ + 0x14100500, // 0000 LT R4 R2 K0 + 0x74120002, // 0001 JMPT R4 #0005 + 0x54120006, // 0002 LDINT R4 7 + 0x24100404, // 0003 GT R4 R2 R4 + 0x78120000, // 0004 JMPF R4 #0006 + 0x80000800, // 0005 RET 0 + 0x38120202, // 0006 SHL R4 K1 R2 + 0x780E0007, // 0007 JMPF R3 #0010 + 0x8C140102, // 0008 GETMET R5 R0 K2 + 0x5C1C0200, // 0009 MOVE R7 R1 + 0x8C200103, // 000A GETMET R8 R0 K3 + 0x5C280200, // 000B MOVE R10 R1 + 0x7C200400, // 000C CALL R8 2 + 0x30201004, // 000D OR R8 R8 R4 + 0x7C140600, // 000E CALL R5 3 + 0x70020008, // 000F JMP #0019 + 0x8C140102, // 0010 GETMET R5 R0 K2 + 0x5C1C0200, // 0011 MOVE R7 R1 + 0x8C200103, // 0012 GETMET R8 R0 K3 + 0x5C280200, // 0013 MOVE R10 R1 + 0x7C200400, // 0014 CALL R8 2 + 0x542600FE, // 0015 LDINT R9 255 + 0x04241204, // 0016 SUB R9 R9 R4 + 0x2C201009, // 0017 AND R8 R8 R9 + 0x7C140600, // 0018 CALL R5 3 + 0x80000000, // 0019 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: read24 +********************************************************************/ +be_local_closure(I2C_Driver_read24, /* name */ + be_nested_proto( + 7, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 7]) { /* constants */ + /* K0 */ be_nested_str(wire), + /* K1 */ be_nested_str(read_bytes), + /* K2 */ be_nested_str(addr), + /* K3 */ be_const_int(3), + /* K4 */ be_const_int(0), + /* K5 */ be_const_int(1), + /* K6 */ be_const_int(2), + }), + &be_const_str_read24, + &be_const_str_solidified, + ( &(const binstruction[16]) { /* code */ + 0x88080100, // 0000 GETMBR R2 R0 K0 + 0x8C080501, // 0001 GETMET R2 R2 K1 + 0x88100102, // 0002 GETMBR R4 R0 K2 + 0x5C140200, // 0003 MOVE R5 R1 + 0x58180003, // 0004 LDCONST R6 K3 + 0x7C080800, // 0005 CALL R2 4 + 0x940C0504, // 0006 GETIDX R3 R2 K4 + 0x5412000F, // 0007 LDINT R4 16 + 0x380C0604, // 0008 SHL R3 R3 R4 + 0x94100505, // 0009 GETIDX R4 R2 K5 + 0x54160007, // 000A LDINT R5 8 + 0x38100805, // 000B SHL R4 R4 R5 + 0x000C0604, // 000C ADD R3 R3 R4 + 0x94100506, // 000D GETIDX R4 R2 K6 + 0x000C0604, // 000E ADD R3 R3 R4 + 0x80040600, // 000F RET 1 R3 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: read8 +********************************************************************/ +be_local_closure(I2C_Driver_read8, /* name */ + be_nested_proto( + 7, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 4]) { /* constants */ + /* K0 */ be_nested_str(wire), + /* K1 */ be_nested_str(read), + /* K2 */ be_nested_str(addr), + /* K3 */ be_const_int(1), + }), + &be_const_str_read8, + &be_const_str_solidified, + ( &(const binstruction[ 7]) { /* code */ + 0x88080100, // 0000 GETMBR R2 R0 K0 + 0x8C080501, // 0001 GETMET R2 R2 K1 + 0x88100102, // 0002 GETMBR R4 R0 K2 + 0x5C140200, // 0003 MOVE R5 R1 + 0x58180003, // 0004 LDCONST R6 K3 + 0x7C080800, // 0005 CALL R2 4 + 0x80040400, // 0006 RET 1 R2 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: init +********************************************************************/ +be_local_closure(I2C_Driver_init, /* name */ + be_nested_proto( + 10, /* nstack */ + 4, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[10]) { /* constants */ + /* K0 */ be_nested_str(get_tasmota), + /* K1 */ be_nested_str(i2c_enabled), + /* K2 */ be_nested_str(addr), + /* K3 */ be_nested_str(wire), + /* K4 */ be_nested_str(wire_scan), + /* K5 */ be_nested_str(function), + /* K6 */ be_nested_str(name), + /* K7 */ be_nested_str(I2C_X3A), + /* K8 */ be_nested_str(detected_X20on_X20bus), + /* K9 */ be_nested_str(bus), + }), + &be_const_str_init, + &be_const_str_solidified, + ( &(const binstruction[44]) { /* code */ + 0x8C100100, // 0000 GETMET R4 R0 K0 + 0x7C100200, // 0001 CALL R4 1 + 0x4C140000, // 0002 LDNIL R5 + 0x20140605, // 0003 NE R5 R3 R5 + 0x78160004, // 0004 JMPF R5 #000A + 0x8C140901, // 0005 GETMET R5 R4 K1 + 0x5C1C0600, // 0006 MOVE R7 R3 + 0x7C140400, // 0007 CALL R5 2 + 0x74160000, // 0008 JMPT R5 #000A + 0x80000A00, // 0009 RET 0 + 0x90020402, // 000A SETMBR R0 K2 R2 + 0x8C140904, // 000B GETMET R5 R4 K4 + 0x881C0102, // 000C GETMBR R7 R0 K2 + 0x7C140400, // 000D CALL R5 2 + 0x90020605, // 000E SETMBR R0 K3 R5 + 0x88140103, // 000F GETMBR R5 R0 K3 + 0x78160019, // 0010 JMPF R5 #002B + 0x60140004, // 0011 GETGBL R5 G4 + 0x5C180200, // 0012 MOVE R6 R1 + 0x7C140200, // 0013 CALL R5 1 + 0x1C140B05, // 0014 EQ R5 R5 K5 + 0x78160004, // 0015 JMPF R5 #001B + 0x5C140200, // 0016 MOVE R5 R1 + 0x5C180000, // 0017 MOVE R6 R0 + 0x7C140200, // 0018 CALL R5 1 + 0x90020C05, // 0019 SETMBR R0 K6 R5 + 0x70020000, // 001A JMP #001C + 0x90020C01, // 001B SETMBR R0 K6 R1 + 0x88140106, // 001C GETMBR R5 R0 K6 + 0x4C180000, // 001D LDNIL R6 + 0x1C140A06, // 001E EQ R5 R5 R6 + 0x78160001, // 001F JMPF R5 #0022 + 0x4C140000, // 0020 LDNIL R5 + 0x90020605, // 0021 SETMBR R0 K3 R5 + 0x88140103, // 0022 GETMBR R5 R0 K3 + 0x78160006, // 0023 JMPF R5 #002B + 0x60140001, // 0024 GETGBL R5 G1 + 0x58180007, // 0025 LDCONST R6 K7 + 0x881C0106, // 0026 GETMBR R7 R0 K6 + 0x58200008, // 0027 LDCONST R8 K8 + 0x88240103, // 0028 GETMBR R9 R0 K3 + 0x88241309, // 0029 GETMBR R9 R9 K9 + 0x7C140800, // 002A CALL R5 4 + 0x80000000, // 002B RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: read13 +********************************************************************/ +be_local_closure(I2C_Driver_read13, /* name */ + be_nested_proto( + 7, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 6]) { /* constants */ + /* K0 */ be_nested_str(wire), + /* K1 */ be_nested_str(read_bytes), + /* K2 */ be_nested_str(addr), + /* K3 */ be_const_int(2), + /* K4 */ be_const_int(0), + /* K5 */ be_const_int(1), + }), + &be_const_str_read13, + &be_const_str_solidified, + ( &(const binstruction[12]) { /* code */ + 0x88080100, // 0000 GETMBR R2 R0 K0 + 0x8C080501, // 0001 GETMET R2 R2 K1 + 0x88100102, // 0002 GETMBR R4 R0 K2 + 0x5C140200, // 0003 MOVE R5 R1 + 0x58180003, // 0004 LDCONST R6 K3 + 0x7C080800, // 0005 CALL R2 4 + 0x940C0504, // 0006 GETIDX R3 R2 K4 + 0x54120004, // 0007 LDINT R4 5 + 0x380C0604, // 0008 SHL R3 R3 R4 + 0x94100505, // 0009 GETIDX R4 R2 K5 + 0x000C0604, // 000A ADD R3 R3 R4 + 0x80040600, // 000B RET 1 R3 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified class: I2C_Driver +********************************************************************/ +be_local_class(I2C_Driver, + 3, + NULL, + be_nested_map(11, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(read32, -1), be_const_closure(I2C_Driver_read32_closure) }, + { be_const_key(write8, 6), be_const_closure(I2C_Driver_write8_closure) }, + { be_const_key(name, -1), be_const_var(2) }, + { be_const_key(addr, 8), be_const_var(1) }, + { be_const_key(read12, -1), be_const_closure(I2C_Driver_read12_closure) }, + { be_const_key(wire, 10), be_const_var(0) }, + { be_const_key(read13, -1), be_const_closure(I2C_Driver_read13_closure) }, + { be_const_key(read24, -1), be_const_closure(I2C_Driver_read24_closure) }, + { be_const_key(read8, -1), be_const_closure(I2C_Driver_read8_closure) }, + { be_const_key(init, -1), be_const_closure(I2C_Driver_init_closure) }, + { be_const_key(write_bit, -1), be_const_closure(I2C_Driver_write_bit_closure) }, + })), + be_str_literal("I2C_Driver") +); +/*******************************************************************/ + +void be_load_I2C_Driver_class(bvm *vm) { + be_pushntvclass(vm, &be_class_I2C_Driver); + be_setglobal(vm, "I2C_Driver"); + be_pop(vm, 1); +} diff --git a/lib/libesp32/berry/default/be_i2s_audio_lib.c b/lib/libesp32/berry/default/be_i2s_audio_lib.c new file mode 100644 index 000000000..ef8720b23 --- /dev/null +++ b/lib/libesp32/berry/default/be_i2s_audio_lib.c @@ -0,0 +1,113 @@ +/******************************************************************** + * Tasmota I2S audio classes + * + * + *******************************************************************/ +#include "be_constobj.h" + +#ifdef USE_I2S +#ifdef USE_I2S_AUDIO_BERRY + +extern int i2s_output_i2s_init(bvm *vm); +extern int i2s_output_i2s_deinit(bvm *vm); +extern int i2s_output_i2s_stop(bvm *vm); + +extern int i2s_generator_wav_init(bvm *vm); +extern int i2s_generator_wav_deinit(bvm *vm); +extern int i2s_generator_wav_begin(bvm *vm); +extern int i2s_generator_wav_loop(bvm *vm); +extern int i2s_generator_wav_stop(bvm *vm); +extern int i2s_generator_wav_isrunning(bvm *vm); + +extern int i2s_generator_mp3_init(bvm *vm); +extern int i2s_generator_mp3_deinit(bvm *vm); +extern int i2s_generator_mp3_begin(bvm *vm); +extern int i2s_generator_mp3_loop(bvm *vm); +extern int i2s_generator_mp3_stop(bvm *vm); +extern int i2s_generator_mp3_isrunning(bvm *vm); + +#ifdef USE_UFILESYS +extern int i2s_file_source_fs_init(bvm *vm); +extern int i2s_file_source_fs_deinit(bvm *vm); +#endif // USE_UFILESYS + + +#include "../generate/be_fixed_be_class_audio_output.h" +#include "../generate/be_fixed_be_class_audio_output_i2s.h" +#include "../generate/be_fixed_be_class_audio_generator.h" +#include "../generate/be_fixed_be_class_audio_generator_wav.h" +#include "../generate/be_fixed_be_class_audio_generator_mp3.h" +#include "../generate/be_fixed_be_class_audio_file_source.h" +#include "../generate/be_fixed_be_class_audio_file_source_fs.h" + +void be_load_driver_audio_lib(bvm *vm) { + be_pushntvclass(vm, &be_class_audio_output); + be_setglobal(vm, "AudioOutput"); + be_pop(vm, 1); + + be_pushntvclass(vm, &be_class_audio_output_i2s); + be_setglobal(vm, "AudioOutputI2S"); + be_pop(vm, 1); + + be_pushntvclass(vm, &be_class_audio_generator_wav); + be_setglobal(vm, "AudioGeneratorWAV"); + be_pop(vm, 1); + + be_pushntvclass(vm, &be_class_audio_generator_mp3); + be_setglobal(vm, "AudioGeneratorMP3"); + be_pop(vm, 1); + +#ifdef USE_UFILESYS + be_pushntvclass(vm, &be_class_audio_file_source_fs); + be_setglobal(vm, "AudioFileSourceFS"); + be_pop(vm, 1); +#endif // USE_UFILESYS +} + +/* @const_object_info_begin + +class be_class_audio_output (scope: global, name: AudioOutput) { + .p, var +} + +class be_class_audio_generator (scope: global, name: AudioGenerator) { + .p, var +} + +class be_class_audio_file_source (scope: global, name: AudioFileSource) { + .p, var +} + +class be_class_audio_output_i2s (scope: global, name: AudioOutputI2S, super: be_class_audio_output) { + init, func(i2s_output_i2s_init) + deinit, func(i2s_output_i2s_deinit) + stop, func(i2s_output_i2s_stop) +} + +class be_class_audio_generator_wav (scope: global, name: AudioGeneratorWAV, super: be_class_audio_generator) { + init, func(i2s_generator_wav_init) + deinit, func(i2s_generator_wav_deinit) + begin, func(i2s_generator_wav_begin) + loop, func(i2s_generator_wav_loop) + stop, func(i2s_generator_wav_stop) + isrunning, func(i2s_generator_wav_isrunning) +} + +class be_class_audio_generator_mp3 (scope: global, name: AudioGeneratorMP3, super: be_class_audio_generator) { + init, func(i2s_generator_mp3_init) + deinit, func(i2s_generator_mp3_deinit) + begin, func(i2s_generator_mp3_begin) + loop, func(i2s_generator_mp3_loop) + stop, func(i2s_generator_mp3_stop) + isrunning, func(i2s_generator_mp3_isrunning) +} + +class be_class_audio_file_source_fs (scope: global, name: AudioFileSourceFS, super: be_class_audio_file_source) { + init, func(i2s_file_source_fs_init) + deinit, func(i2s_file_source_fs_deinit) +} + +@const_object_info_end */ + +#endif // USE_I2S_AUDIO_BERRY +#endif // USE_I2S \ No newline at end of file diff --git a/lib/libesp32/berry/default/be_leds_animator_lib.c b/lib/libesp32/berry/default/be_leds_animator_lib.c new file mode 100644 index 000000000..bd82193b9 --- /dev/null +++ b/lib/libesp32/berry/default/be_leds_animator_lib.c @@ -0,0 +1,381 @@ +/******************************************************************** + * Berry class `Leds_animator` + * + *******************************************************************/ +#include "be_constobj.h" + +#ifdef USE_WS2812 + +/******************************************************************** +** Solidified function: init +********************************************************************/ +be_local_closure(Leds_animator_init, /* name */ + be_nested_proto( + 5, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 8]) { /* constants */ + /* K0 */ be_nested_str(strip), + /* K1 */ be_nested_str(bri), + /* K2 */ be_nested_str(running), + /* K3 */ be_nested_str(pixel_count), + /* K4 */ be_nested_str(animators), + /* K5 */ be_nested_str(clear), + /* K6 */ be_nested_str(tasmota), + /* K7 */ be_nested_str(add_driver), + }), + &be_const_str_init, + &be_const_str_solidified, + ( &(const binstruction[18]) { /* code */ + 0x90020001, // 0000 SETMBR R0 K0 R1 + 0x540A0031, // 0001 LDINT R2 50 + 0x90020202, // 0002 SETMBR R0 K1 R2 + 0x50080000, // 0003 LDBOOL R2 0 0 + 0x90020402, // 0004 SETMBR R0 K2 R2 + 0x8C080303, // 0005 GETMET R2 R1 K3 + 0x7C080200, // 0006 CALL R2 1 + 0x90020602, // 0007 SETMBR R0 K3 R2 + 0x60080012, // 0008 GETGBL R2 G18 + 0x7C080000, // 0009 CALL R2 0 + 0x90020802, // 000A SETMBR R0 K4 R2 + 0x8C080105, // 000B GETMET R2 R0 K5 + 0x7C080200, // 000C CALL R2 1 + 0xB80A0C00, // 000D GETNGBL R2 K6 + 0x8C080507, // 000E GETMET R2 R2 K7 + 0x5C100000, // 000F MOVE R4 R0 + 0x7C080400, // 0010 CALL R2 2 + 0x80000000, // 0011 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: set_bri +********************************************************************/ +be_local_closure(Leds_animator_set_bri, /* name */ + be_nested_proto( + 2, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_str(bri), + }), + &be_const_str_set_bri, + &be_const_str_solidified, + ( &(const binstruction[ 2]) { /* code */ + 0x90020001, // 0000 SETMBR R0 K0 R1 + 0x80000000, // 0001 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: stop +********************************************************************/ +be_local_closure(Leds_animator_stop, /* name */ + be_nested_proto( + 2, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_str(running), + }), + &be_const_str_stop, + &be_const_str_solidified, + ( &(const binstruction[ 3]) { /* code */ + 0x50040000, // 0000 LDBOOL R1 0 0 + 0x90020001, // 0001 SETMBR R0 K0 R1 + 0x80000000, // 0002 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: animate +********************************************************************/ +be_local_closure(Leds_animator_animate, /* name */ + be_nested_proto( + 1, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 0, /* has constants */ + NULL, /* no const */ + &be_const_str_animate, + &be_const_str_solidified, + ( &(const binstruction[ 1]) { /* code */ + 0x80000000, // 0000 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: remove +********************************************************************/ +be_local_closure(Leds_animator_remove, /* name */ + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(tasmota), + /* K1 */ be_nested_str(remove_driver), + }), + &be_const_str_remove, + &be_const_str_solidified, + ( &(const binstruction[ 5]) { /* code */ + 0xB8060000, // 0000 GETNGBL R1 K0 + 0x8C040301, // 0001 GETMET R1 R1 K1 + 0x5C0C0000, // 0002 MOVE R3 R0 + 0x7C040400, // 0003 CALL R1 2 + 0x80000000, // 0004 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: every_50ms +********************************************************************/ +be_local_closure(Leds_animator_every_50ms, /* name */ + be_nested_proto( + 6, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 7]) { /* constants */ + /* K0 */ be_nested_str(running), + /* K1 */ be_const_int(0), + /* K2 */ be_nested_str(animators), + /* K3 */ be_nested_str(is_running), + /* K4 */ be_nested_str(animate), + /* K5 */ be_const_int(1), + /* K6 */ be_nested_str(remove), + }), + &be_const_str_every_50ms, + &be_const_str_solidified, + ( &(const binstruction[25]) { /* code */ + 0x88040100, // 0000 GETMBR R1 R0 K0 + 0x78060015, // 0001 JMPF R1 #0018 + 0x58040001, // 0002 LDCONST R1 K1 + 0x6008000C, // 0003 GETGBL R2 G12 + 0x880C0102, // 0004 GETMBR R3 R0 K2 + 0x7C080200, // 0005 CALL R2 1 + 0x14080202, // 0006 LT R2 R1 R2 + 0x780A000D, // 0007 JMPF R2 #0016 + 0x88080102, // 0008 GETMBR R2 R0 K2 + 0x94080401, // 0009 GETIDX R2 R2 R1 + 0x8C0C0503, // 000A GETMET R3 R2 K3 + 0x7C0C0200, // 000B CALL R3 1 + 0x780E0003, // 000C JMPF R3 #0011 + 0x8C0C0504, // 000D GETMET R3 R2 K4 + 0x7C0C0200, // 000E CALL R3 1 + 0x00040305, // 000F ADD R1 R1 K5 + 0x70020003, // 0010 JMP #0015 + 0x880C0102, // 0011 GETMBR R3 R0 K2 + 0x8C0C0706, // 0012 GETMET R3 R3 K6 + 0x5C140200, // 0013 MOVE R5 R1 + 0x7C0C0400, // 0014 CALL R3 2 + 0x7001FFEC, // 0015 JMP #0003 + 0x8C080104, // 0016 GETMET R2 R0 K4 + 0x7C080200, // 0017 CALL R2 1 + 0x80000000, // 0018 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: get_bri +********************************************************************/ +be_local_closure(Leds_animator_get_bri, /* name */ + be_nested_proto( + 3, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_str(bri), + }), + &be_const_str_get_bri, + &be_const_str_solidified, + ( &(const binstruction[ 2]) { /* code */ + 0x88080100, // 0000 GETMBR R2 R0 K0 + 0x80040400, // 0001 RET 1 R2 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: start +********************************************************************/ +be_local_closure(Leds_animator_start, /* name */ + be_nested_proto( + 2, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_str(running), + }), + &be_const_str_start, + &be_const_str_solidified, + ( &(const binstruction[ 3]) { /* code */ + 0x50040200, // 0000 LDBOOL R1 1 0 + 0x90020001, // 0001 SETMBR R0 K0 R1 + 0x80000000, // 0002 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: add_anim +********************************************************************/ +be_local_closure(Leds_animator_add_anim, /* name */ + be_nested_proto( + 5, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(animators), + /* K1 */ be_nested_str(push), + /* K2 */ be_nested_str(run), + }), + &be_const_str_add_anim, + &be_const_str_solidified, + ( &(const binstruction[ 7]) { /* code */ + 0x88080100, // 0000 GETMBR R2 R0 K0 + 0x8C080501, // 0001 GETMET R2 R2 K1 + 0x5C100200, // 0002 MOVE R4 R1 + 0x7C080400, // 0003 CALL R2 2 + 0x8C080302, // 0004 GETMET R2 R1 K2 + 0x7C080200, // 0005 CALL R2 1 + 0x80000000, // 0006 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: clear +********************************************************************/ +be_local_closure(Leds_animator_clear, /* name */ + be_nested_proto( + 3, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(stop), + /* K1 */ be_nested_str(strip), + /* K2 */ be_nested_str(clear), + }), + &be_const_str_clear, + &be_const_str_solidified, + ( &(const binstruction[ 6]) { /* code */ + 0x8C040100, // 0000 GETMET R1 R0 K0 + 0x7C040200, // 0001 CALL R1 1 + 0x88040101, // 0002 GETMBR R1 R0 K1 + 0x8C040302, // 0003 GETMET R1 R1 K2 + 0x7C040200, // 0004 CALL R1 1 + 0x80000000, // 0005 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified class: Leds_animator +********************************************************************/ +be_local_class(Leds_animator, + 5, + NULL, + be_nested_map(15, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(init, 12), be_const_closure(Leds_animator_init_closure) }, + { be_const_key(clear, -1), be_const_closure(Leds_animator_clear_closure) }, + { be_const_key(stop, -1), be_const_closure(Leds_animator_stop_closure) }, + { be_const_key(strip, 4), be_const_var(0) }, + { be_const_key(pixel_count, 6), be_const_var(1) }, + { be_const_key(animate, -1), be_const_closure(Leds_animator_animate_closure) }, + { be_const_key(add_anim, 13), be_const_closure(Leds_animator_add_anim_closure) }, + { be_const_key(bri, -1), be_const_var(2) }, + { be_const_key(every_50ms, -1), be_const_closure(Leds_animator_every_50ms_closure) }, + { be_const_key(remove, 7), be_const_closure(Leds_animator_remove_closure) }, + { be_const_key(get_bri, -1), be_const_closure(Leds_animator_get_bri_closure) }, + { be_const_key(start, -1), be_const_closure(Leds_animator_start_closure) }, + { be_const_key(running, -1), be_const_var(3) }, + { be_const_key(animators, -1), be_const_var(4) }, + { be_const_key(set_bri, 1), be_const_closure(Leds_animator_set_bri_closure) }, + })), + be_str_literal("Leds_animator") +); +/*******************************************************************/ + +void be_load_Leds_animator_class(bvm *vm) { + be_pushntvclass(vm, &be_class_Leds_animator); + be_setglobal(vm, "Leds_animator"); + be_pop(vm, 1); +} + +#endif // USE_WS2812 diff --git a/lib/libesp32/berry/default/be_leds_lib.c b/lib/libesp32/berry/default/be_leds_lib.c new file mode 100644 index 000000000..58b0a991e --- /dev/null +++ b/lib/libesp32/berry/default/be_leds_lib.c @@ -0,0 +1,1815 @@ +/******************************************************************** + * Berry class `Leds` + * + *******************************************************************/ +#include "be_constobj.h" + +#ifdef USE_WS2812 + +/******************************************************************** +** Solidified function: pixel_count +********************************************************************/ +be_local_closure(Leds_matrix_pixel_count, /* name */ + be_nested_proto( + 3, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(w), + /* K1 */ be_nested_str(h), + }), + &be_const_str_pixel_count, + &be_const_str_solidified, + ( &(const binstruction[ 4]) { /* code */ + 0x88040100, // 0000 GETMBR R1 R0 K0 + 0x88080101, // 0001 GETMBR R2 R0 K1 + 0x08040202, // 0002 MUL R1 R1 R2 + 0x80040200, // 0003 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: set_alternate +********************************************************************/ +be_local_closure(Leds_matrix_set_alternate, /* name */ + be_nested_proto( + 2, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_str(alternate), + }), + &be_const_str_set_alternate, + &be_const_str_solidified, + ( &(const binstruction[ 2]) { /* code */ + 0x90020001, // 0000 SETMBR R0 K0 R1 + 0x80000000, // 0001 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: pixel_size +********************************************************************/ +be_local_closure(Leds_matrix_pixel_size, /* name */ + be_nested_proto( + 3, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(strip), + /* K1 */ be_nested_str(pixel_size), + }), + &be_const_str_pixel_size, + &be_const_str_solidified, + ( &(const binstruction[ 4]) { /* code */ + 0x88040100, // 0000 GETMBR R1 R0 K0 + 0x8C040301, // 0001 GETMET R1 R1 K1 + 0x7C040200, // 0002 CALL R1 1 + 0x80040200, // 0003 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: set_pixel_color +********************************************************************/ +be_local_closure(Leds_matrix_set_pixel_color, /* name */ + be_nested_proto( + 9, /* nstack */ + 4, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(strip), + /* K1 */ be_nested_str(set_pixel_color), + /* K2 */ be_nested_str(offset), + }), + &be_const_str_set_pixel_color, + &be_const_str_solidified, + ( &(const binstruction[ 8]) { /* code */ + 0x88100100, // 0000 GETMBR R4 R0 K0 + 0x8C100901, // 0001 GETMET R4 R4 K1 + 0x88180102, // 0002 GETMBR R6 R0 K2 + 0x00180206, // 0003 ADD R6 R1 R6 + 0x5C1C0400, // 0004 MOVE R7 R2 + 0x5C200600, // 0005 MOVE R8 R3 + 0x7C100800, // 0006 CALL R4 4 + 0x80000000, // 0007 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: set_matrix_pixel_color +********************************************************************/ +be_local_closure(Leds_matrix_set_matrix_pixel_color, /* name */ + be_nested_proto( + 10, /* nstack */ + 5, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 8]) { /* constants */ + /* K0 */ be_nested_str(alternate), + /* K1 */ be_const_int(2), + /* K2 */ be_nested_str(strip), + /* K3 */ be_nested_str(set_pixel_color), + /* K4 */ be_nested_str(w), + /* K5 */ be_nested_str(h), + /* K6 */ be_const_int(1), + /* K7 */ be_nested_str(offset), + }), + &be_const_str_set_matrix_pixel_color, + &be_const_str_solidified, + ( &(const binstruction[29]) { /* code */ + 0x88140100, // 0000 GETMBR R5 R0 K0 + 0x7816000F, // 0001 JMPF R5 #0012 + 0x10140301, // 0002 MOD R5 R1 K1 + 0x7816000D, // 0003 JMPF R5 #0012 + 0x88140102, // 0004 GETMBR R5 R0 K2 + 0x8C140B03, // 0005 GETMET R5 R5 K3 + 0x881C0104, // 0006 GETMBR R7 R0 K4 + 0x081C0207, // 0007 MUL R7 R1 R7 + 0x88200105, // 0008 GETMBR R8 R0 K5 + 0x001C0E08, // 0009 ADD R7 R7 R8 + 0x041C0E02, // 000A SUB R7 R7 R2 + 0x041C0F06, // 000B SUB R7 R7 K6 + 0x88200107, // 000C GETMBR R8 R0 K7 + 0x001C0E08, // 000D ADD R7 R7 R8 + 0x5C200600, // 000E MOVE R8 R3 + 0x5C240800, // 000F MOVE R9 R4 + 0x7C140800, // 0010 CALL R5 4 + 0x70020009, // 0011 JMP #001C + 0x88140102, // 0012 GETMBR R5 R0 K2 + 0x8C140B03, // 0013 GETMET R5 R5 K3 + 0x881C0104, // 0014 GETMBR R7 R0 K4 + 0x081C0207, // 0015 MUL R7 R1 R7 + 0x001C0E02, // 0016 ADD R7 R7 R2 + 0x88200107, // 0017 GETMBR R8 R0 K7 + 0x001C0E08, // 0018 ADD R7 R7 R8 + 0x5C200600, // 0019 MOVE R8 R3 + 0x5C240800, // 001A MOVE R9 R4 + 0x7C140800, // 001B CALL R5 4 + 0x80000000, // 001C RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: show +********************************************************************/ +be_local_closure(Leds_matrix_show, /* name */ + be_nested_proto( + 4, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 7]) { /* constants */ + /* K0 */ be_nested_str(offset), + /* K1 */ be_const_int(0), + /* K2 */ be_nested_str(w), + /* K3 */ be_nested_str(h), + /* K4 */ be_nested_str(strip), + /* K5 */ be_nested_str(leds), + /* K6 */ be_nested_str(show), + }), + &be_const_str_show, + &be_const_str_solidified, + ( &(const binstruction[18]) { /* code */ + 0x60080017, // 0000 GETGBL R2 G23 + 0x5C0C0200, // 0001 MOVE R3 R1 + 0x7C080200, // 0002 CALL R2 1 + 0x740A0009, // 0003 JMPT R2 #000E + 0x88080100, // 0004 GETMBR R2 R0 K0 + 0x1C080501, // 0005 EQ R2 R2 K1 + 0x780A0009, // 0006 JMPF R2 #0011 + 0x88080102, // 0007 GETMBR R2 R0 K2 + 0x880C0103, // 0008 GETMBR R3 R0 K3 + 0x08080403, // 0009 MUL R2 R2 R3 + 0x880C0104, // 000A GETMBR R3 R0 K4 + 0x880C0705, // 000B GETMBR R3 R3 K5 + 0x1C080403, // 000C EQ R2 R2 R3 + 0x780A0002, // 000D JMPF R2 #0011 + 0x88080104, // 000E GETMBR R2 R0 K4 + 0x8C080506, // 000F GETMET R2 R2 K6 + 0x7C080200, // 0010 CALL R2 1 + 0x80000000, // 0011 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: is_dirty +********************************************************************/ +be_local_closure(Leds_matrix_is_dirty, /* name */ + be_nested_proto( + 3, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(strip), + /* K1 */ be_nested_str(is_dirty), + }), + &be_const_str_is_dirty, + &be_const_str_solidified, + ( &(const binstruction[ 4]) { /* code */ + 0x88040100, // 0000 GETMBR R1 R0 K0 + 0x8C040301, // 0001 GETMET R1 R1 K1 + 0x7C040200, // 0002 CALL R1 1 + 0x80040200, // 0003 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: clear_to +********************************************************************/ +be_local_closure(Leds_matrix_clear_to, /* name */ + be_nested_proto( + 9, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 7]) { /* constants */ + /* K0 */ be_const_int(0), + /* K1 */ be_nested_str(w), + /* K2 */ be_nested_str(h), + /* K3 */ be_nested_str(strip), + /* K4 */ be_nested_str(set_pixel_color), + /* K5 */ be_nested_str(offset), + /* K6 */ be_const_int(1), + }), + &be_const_str_clear_to, + &be_const_str_solidified, + ( &(const binstruction[16]) { /* code */ + 0x580C0000, // 0000 LDCONST R3 K0 + 0x88100101, // 0001 GETMBR R4 R0 K1 + 0x88140102, // 0002 GETMBR R5 R0 K2 + 0x08100805, // 0003 MUL R4 R4 R5 + 0x14100604, // 0004 LT R4 R3 R4 + 0x78120008, // 0005 JMPF R4 #000F + 0x88100103, // 0006 GETMBR R4 R0 K3 + 0x8C100904, // 0007 GETMET R4 R4 K4 + 0x88180105, // 0008 GETMBR R6 R0 K5 + 0x00180606, // 0009 ADD R6 R3 R6 + 0x5C1C0200, // 000A MOVE R7 R1 + 0x5C200400, // 000B MOVE R8 R2 + 0x7C100800, // 000C CALL R4 4 + 0x000C0706, // 000D ADD R3 R3 K6 + 0x7001FFF1, // 000E JMP #0001 + 0x80000000, // 000F RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: clear +********************************************************************/ +be_local_closure(Leds_matrix_clear, /* name */ + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(clear_to), + /* K1 */ be_const_int(0), + /* K2 */ be_nested_str(show), + }), + &be_const_str_clear, + &be_const_str_solidified, + ( &(const binstruction[ 6]) { /* code */ + 0x8C040100, // 0000 GETMET R1 R0 K0 + 0x580C0001, // 0001 LDCONST R3 K1 + 0x7C040400, // 0002 CALL R1 2 + 0x8C040102, // 0003 GETMET R1 R0 K2 + 0x7C040200, // 0004 CALL R1 1 + 0x80000000, // 0005 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: pixels_buffer +********************************************************************/ +be_local_closure(Leds_matrix_pixels_buffer, /* name */ + be_nested_proto( + 2, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 0, /* has constants */ + NULL, /* no const */ + &be_const_str_pixels_buffer, + &be_const_str_solidified, + ( &(const binstruction[ 2]) { /* code */ + 0x4C040000, // 0000 LDNIL R1 + 0x80040200, // 0001 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: init +********************************************************************/ +be_local_closure(Leds_matrix_init, /* name */ + be_nested_proto( + 6, /* nstack */ + 5, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 5]) { /* constants */ + /* K0 */ be_nested_str(strip), + /* K1 */ be_nested_str(offset), + /* K2 */ be_nested_str(h), + /* K3 */ be_nested_str(w), + /* K4 */ be_nested_str(alternate), + }), + &be_const_str_init, + &be_const_str_solidified, + ( &(const binstruction[ 7]) { /* code */ + 0x90020001, // 0000 SETMBR R0 K0 R1 + 0x90020204, // 0001 SETMBR R0 K1 R4 + 0x90020403, // 0002 SETMBR R0 K2 R3 + 0x90020602, // 0003 SETMBR R0 K3 R2 + 0x50140000, // 0004 LDBOOL R5 0 0 + 0x90020805, // 0005 SETMBR R0 K4 R5 + 0x80000000, // 0006 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: dirty +********************************************************************/ +be_local_closure(Leds_matrix_dirty, /* name */ + be_nested_proto( + 3, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(strip), + /* K1 */ be_nested_str(dirty), + }), + &be_const_str_dirty, + &be_const_str_solidified, + ( &(const binstruction[ 4]) { /* code */ + 0x88040100, // 0000 GETMBR R1 R0 K0 + 0x8C040301, // 0001 GETMET R1 R1 K1 + 0x7C040200, // 0002 CALL R1 1 + 0x80000000, // 0003 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: get_pixel_color +********************************************************************/ +be_local_closure(Leds_matrix_get_pixel_color, /* name */ + be_nested_proto( + 5, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(strip), + /* K1 */ be_nested_str(get_pixel_color), + /* K2 */ be_nested_str(offseta), + }), + &be_const_str_get_pixel_color, + &be_const_str_solidified, + ( &(const binstruction[ 6]) { /* code */ + 0x88080100, // 0000 GETMBR R2 R0 K0 + 0x8C080501, // 0001 GETMET R2 R2 K1 + 0x88100102, // 0002 GETMBR R4 R0 K2 + 0x00100204, // 0003 ADD R4 R1 R4 + 0x7C080400, // 0004 CALL R2 2 + 0x80040400, // 0005 RET 1 R2 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: get_alternate +********************************************************************/ +be_local_closure(Leds_matrix_get_alternate, /* name */ + be_nested_proto( + 2, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_str(alternate), + }), + &be_const_str_get_alternate, + &be_const_str_solidified, + ( &(const binstruction[ 2]) { /* code */ + 0x88040100, // 0000 GETMBR R1 R0 K0 + 0x80040200, // 0001 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: begin +********************************************************************/ +be_local_closure(Leds_matrix_begin, /* name */ + be_nested_proto( + 1, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 0, /* has constants */ + NULL, /* no const */ + &be_const_str_begin, + &be_const_str_solidified, + ( &(const binstruction[ 1]) { /* code */ + 0x80000000, // 0000 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: can_show +********************************************************************/ +be_local_closure(Leds_matrix_can_show, /* name */ + be_nested_proto( + 3, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(strip), + /* K1 */ be_nested_str(can_show), + }), + &be_const_str_can_show, + &be_const_str_solidified, + ( &(const binstruction[ 4]) { /* code */ + 0x88040100, // 0000 GETMBR R1 R0 K0 + 0x8C040301, // 0001 GETMET R1 R1 K1 + 0x7C040200, // 0002 CALL R1 1 + 0x80040200, // 0003 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified class: Leds_matrix +********************************************************************/ +be_local_class(Leds_matrix, + 5, + NULL, + be_nested_map(21, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(pixel_count, -1), be_const_closure(Leds_matrix_pixel_count_closure) }, + { be_const_key(h, 6), be_const_var(2) }, + { be_const_key(set_alternate, 7), be_const_closure(Leds_matrix_set_alternate_closure) }, + { be_const_key(pixel_size, 16), be_const_closure(Leds_matrix_pixel_size_closure) }, + { be_const_key(set_pixel_color, 19), be_const_closure(Leds_matrix_set_pixel_color_closure) }, + { be_const_key(set_matrix_pixel_color, 10), be_const_closure(Leds_matrix_set_matrix_pixel_color_closure) }, + { be_const_key(show, -1), be_const_closure(Leds_matrix_show_closure) }, + { be_const_key(alternate, -1), be_const_var(4) }, + { be_const_key(strip, -1), be_const_var(0) }, + { be_const_key(clear_to, -1), be_const_closure(Leds_matrix_clear_to_closure) }, + { be_const_key(w, 15), be_const_var(3) }, + { be_const_key(pixels_buffer, -1), be_const_closure(Leds_matrix_pixels_buffer_closure) }, + { be_const_key(init, -1), be_const_closure(Leds_matrix_init_closure) }, + { be_const_key(dirty, -1), be_const_closure(Leds_matrix_dirty_closure) }, + { be_const_key(get_pixel_color, -1), be_const_closure(Leds_matrix_get_pixel_color_closure) }, + { be_const_key(get_alternate, 17), be_const_closure(Leds_matrix_get_alternate_closure) }, + { be_const_key(offset, 8), be_const_var(1) }, + { be_const_key(clear, -1), be_const_closure(Leds_matrix_clear_closure) }, + { be_const_key(begin, -1), be_const_closure(Leds_matrix_begin_closure) }, + { be_const_key(is_dirty, -1), be_const_closure(Leds_matrix_is_dirty_closure) }, + { be_const_key(can_show, -1), be_const_closure(Leds_matrix_can_show_closure) }, + })), + be_str_literal("Leds_matrix") +); + +/******************************************************************** +** Solidified function: create_matrix +********************************************************************/ +be_local_closure(Leds_create_matrix, /* name */ + be_nested_proto( + 10, /* nstack */ + 4, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 5]) { /* constants */ + /* K0 */ be_const_int(0), + /* K1 */ be_nested_str(leds), + /* K2 */ be_nested_str(value_error), + /* K3 */ be_nested_str(out_X20of_X20range), + /* K4 */ be_const_class(be_class_Leds_matrix), + }), + &be_const_str_create_matrix, + &be_const_str_solidified, + ( &(const binstruction[37]) { /* code */ + 0x60100009, // 0000 GETGBL R4 G9 + 0x5C140600, // 0001 MOVE R5 R3 + 0x7C100200, // 0002 CALL R4 1 + 0x5C0C0800, // 0003 MOVE R3 R4 + 0x60100009, // 0004 GETGBL R4 G9 + 0x5C140200, // 0005 MOVE R5 R1 + 0x7C100200, // 0006 CALL R4 1 + 0x5C040800, // 0007 MOVE R1 R4 + 0x60100009, // 0008 GETGBL R4 G9 + 0x5C140400, // 0009 MOVE R5 R2 + 0x7C100200, // 000A CALL R4 1 + 0x5C080800, // 000B MOVE R2 R4 + 0x4C100000, // 000C LDNIL R4 + 0x1C100604, // 000D EQ R4 R3 R4 + 0x78120000, // 000E JMPF R4 #0010 + 0x580C0000, // 000F LDCONST R3 K0 + 0x08100202, // 0010 MUL R4 R1 R2 + 0x00100803, // 0011 ADD R4 R4 R3 + 0x88140101, // 0012 GETMBR R5 R0 K1 + 0x24100805, // 0013 GT R4 R4 R5 + 0x74120005, // 0014 JMPT R4 #001B + 0x14100500, // 0015 LT R4 R2 K0 + 0x74120003, // 0016 JMPT R4 #001B + 0x14100300, // 0017 LT R4 R1 K0 + 0x74120001, // 0018 JMPT R4 #001B + 0x14100700, // 0019 LT R4 R3 K0 + 0x78120000, // 001A JMPF R4 #001C + 0xB0060503, // 001B RAISE 1 K2 K3 + 0x58100004, // 001C LDCONST R4 K4 + 0xB4000004, // 001D CLASS K4 + 0x5C140800, // 001E MOVE R5 R4 + 0x5C180000, // 001F MOVE R6 R0 + 0x5C1C0200, // 0020 MOVE R7 R1 + 0x5C200400, // 0021 MOVE R8 R2 + 0x5C240600, // 0022 MOVE R9 R3 + 0x7C140800, // 0023 CALL R5 4 + 0x80040A00, // 0024 RET 1 R5 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: begin +********************************************************************/ +be_local_closure(Leds_begin, /* name */ + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(call_native), + /* K1 */ be_const_int(1), + }), + &be_const_str_begin, + &be_const_str_solidified, + ( &(const binstruction[ 4]) { /* code */ + 0x8C040100, // 0000 GETMET R1 R0 K0 + 0x580C0001, // 0001 LDCONST R3 K1 + 0x7C040400, // 0002 CALL R1 2 + 0x80000000, // 0003 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: to_gamma +********************************************************************/ +be_local_closure(Leds_to_gamma, /* name */ + be_nested_proto( + 12, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 7]) { /* constants */ + /* K0 */ be_nested_str(tasmota), + /* K1 */ be_nested_str(scale_uint), + /* K2 */ be_const_int(0), + /* K3 */ be_const_int(16711680), + /* K4 */ be_nested_str(gamma), + /* K5 */ be_nested_str(light), + /* K6 */ be_nested_str(gamma8), + }), + &be_const_str_to_gamma, + &be_const_str_solidified, + ( &(const binstruction[67]) { /* code */ + 0x4C0C0000, // 0000 LDNIL R3 + 0x200C0403, // 0001 NE R3 R2 R3 + 0x780E0001, // 0002 JMPF R3 #0005 + 0x5C0C0400, // 0003 MOVE R3 R2 + 0x70020000, // 0004 JMP #0006 + 0x540E0063, // 0005 LDINT R3 100 + 0x5C080600, // 0006 MOVE R2 R3 + 0xB80E0000, // 0007 GETNGBL R3 K0 + 0x8C0C0701, // 0008 GETMET R3 R3 K1 + 0x5C140400, // 0009 MOVE R5 R2 + 0x58180002, // 000A LDCONST R6 K2 + 0x541E0063, // 000B LDINT R7 100 + 0x58200002, // 000C LDCONST R8 K2 + 0x2C240303, // 000D AND R9 R1 K3 + 0x542A000F, // 000E LDINT R10 16 + 0x3C24120A, // 000F SHR R9 R9 R10 + 0x7C0C0C00, // 0010 CALL R3 6 + 0xB8120000, // 0011 GETNGBL R4 K0 + 0x8C100901, // 0012 GETMET R4 R4 K1 + 0x5C180400, // 0013 MOVE R6 R2 + 0x581C0002, // 0014 LDCONST R7 K2 + 0x54220063, // 0015 LDINT R8 100 + 0x58240002, // 0016 LDCONST R9 K2 + 0x542AFEFF, // 0017 LDINT R10 65280 + 0x2C28020A, // 0018 AND R10 R1 R10 + 0x542E0007, // 0019 LDINT R11 8 + 0x3C28140B, // 001A SHR R10 R10 R11 + 0x7C100C00, // 001B CALL R4 6 + 0xB8160000, // 001C GETNGBL R5 K0 + 0x8C140B01, // 001D GETMET R5 R5 K1 + 0x5C1C0400, // 001E MOVE R7 R2 + 0x58200002, // 001F LDCONST R8 K2 + 0x54260063, // 0020 LDINT R9 100 + 0x58280002, // 0021 LDCONST R10 K2 + 0x542E00FE, // 0022 LDINT R11 255 + 0x2C2C020B, // 0023 AND R11 R1 R11 + 0x7C140C00, // 0024 CALL R5 6 + 0x88180104, // 0025 GETMBR R6 R0 K4 + 0x781A0013, // 0026 JMPF R6 #003B + 0xB81A0A00, // 0027 GETNGBL R6 K5 + 0x8C180D06, // 0028 GETMET R6 R6 K6 + 0x5C200600, // 0029 MOVE R8 R3 + 0x7C180400, // 002A CALL R6 2 + 0x541E000F, // 002B LDINT R7 16 + 0x38180C07, // 002C SHL R6 R6 R7 + 0xB81E0A00, // 002D GETNGBL R7 K5 + 0x8C1C0F06, // 002E GETMET R7 R7 K6 + 0x5C240800, // 002F MOVE R9 R4 + 0x7C1C0400, // 0030 CALL R7 2 + 0x54220007, // 0031 LDINT R8 8 + 0x381C0E08, // 0032 SHL R7 R7 R8 + 0x30180C07, // 0033 OR R6 R6 R7 + 0xB81E0A00, // 0034 GETNGBL R7 K5 + 0x8C1C0F06, // 0035 GETMET R7 R7 K6 + 0x5C240A00, // 0036 MOVE R9 R5 + 0x7C1C0400, // 0037 CALL R7 2 + 0x30180C07, // 0038 OR R6 R6 R7 + 0x80040C00, // 0039 RET 1 R6 + 0x70020006, // 003A JMP #0042 + 0x541A000F, // 003B LDINT R6 16 + 0x38180606, // 003C SHL R6 R3 R6 + 0x541E0007, // 003D LDINT R7 8 + 0x381C0807, // 003E SHL R7 R4 R7 + 0x30180C07, // 003F OR R6 R6 R7 + 0x30180C05, // 0040 OR R6 R6 R5 + 0x80040C00, // 0041 RET 1 R6 + 0x80000000, // 0042 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: pixel_count +********************************************************************/ +be_local_closure(Leds_pixel_count, /* name */ + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_str(call_native), + }), + &be_const_str_pixel_count, + &be_const_str_solidified, + ( &(const binstruction[ 4]) { /* code */ + 0x8C040100, // 0000 GETMET R1 R0 K0 + 0x540E0007, // 0001 LDINT R3 8 + 0x7C040400, // 0002 CALL R1 2 + 0x80040200, // 0003 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: matrix +********************************************************************/ +be_local_closure(Leds_matrix, /* name */ + be_nested_proto( + 10, /* nstack */ + 4, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(Leds), + /* K1 */ be_nested_str(create_matrix), + /* K2 */ be_const_int(0), + }), + &be_const_str_matrix, + &be_const_str_solidified, + ( &(const binstruction[11]) { /* code */ + 0xB8120000, // 0000 GETNGBL R4 K0 + 0x08140001, // 0001 MUL R5 R0 R1 + 0x5C180400, // 0002 MOVE R6 R2 + 0x5C1C0600, // 0003 MOVE R7 R3 + 0x7C100600, // 0004 CALL R4 3 + 0x8C140901, // 0005 GETMET R5 R4 K1 + 0x5C1C0000, // 0006 MOVE R7 R0 + 0x5C200200, // 0007 MOVE R8 R1 + 0x58240002, // 0008 LDCONST R9 K2 + 0x7C140800, // 0009 CALL R5 4 + 0x80040A00, // 000A RET 1 R5 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: pixel_size +********************************************************************/ +be_local_closure(Leds_pixel_size, /* name */ + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_str(call_native), + }), + &be_const_str_pixel_size, + &be_const_str_solidified, + ( &(const binstruction[ 4]) { /* code */ + 0x8C040100, // 0000 GETMET R1 R0 K0 + 0x540E0006, // 0001 LDINT R3 7 + 0x7C040400, // 0002 CALL R1 2 + 0x80040200, // 0003 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: pixels_buffer +********************************************************************/ +be_local_closure(Leds_pixels_buffer, /* name */ + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_str(call_native), + }), + &be_const_str_pixels_buffer, + &be_const_str_solidified, + ( &(const binstruction[ 4]) { /* code */ + 0x8C040100, // 0000 GETMET R1 R0 K0 + 0x540E0005, // 0001 LDINT R3 6 + 0x7C040400, // 0002 CALL R1 2 + 0x80040200, // 0003 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: get_pixel_color +********************************************************************/ +be_local_closure(Leds_get_pixel_color, /* name */ + be_nested_proto( + 6, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_str(call_native), + }), + &be_const_str_get_pixel_color, + &be_const_str_solidified, + ( &(const binstruction[ 5]) { /* code */ + 0x8C080100, // 0000 GETMET R2 R0 K0 + 0x5412000A, // 0001 LDINT R4 11 + 0x5C140200, // 0002 MOVE R5 R1 + 0x7C080600, // 0003 CALL R2 3 + 0x80040400, // 0004 RET 1 R2 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: set_pixel_color +********************************************************************/ +be_local_closure(Leds_set_pixel_color, /* name */ + be_nested_proto( + 12, /* nstack */ + 4, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(call_native), + /* K1 */ be_nested_str(to_gamma), + }), + &be_const_str_set_pixel_color, + &be_const_str_solidified, + ( &(const binstruction[ 9]) { /* code */ + 0x8C100100, // 0000 GETMET R4 R0 K0 + 0x541A0009, // 0001 LDINT R6 10 + 0x5C1C0200, // 0002 MOVE R7 R1 + 0x8C200101, // 0003 GETMET R8 R0 K1 + 0x5C280400, // 0004 MOVE R10 R2 + 0x5C2C0600, // 0005 MOVE R11 R3 + 0x7C200600, // 0006 CALL R8 3 + 0x7C100800, // 0007 CALL R4 4 + 0x80000000, // 0008 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: is_dirty +********************************************************************/ +be_local_closure(Leds_is_dirty, /* name */ + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_str(call_native), + }), + &be_const_str_is_dirty, + &be_const_str_solidified, + ( &(const binstruction[ 4]) { /* code */ + 0x8C040100, // 0000 GETMET R1 R0 K0 + 0x540E0003, // 0001 LDINT R3 4 + 0x7C040400, // 0002 CALL R1 2 + 0x80040200, // 0003 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: init +********************************************************************/ +be_local_closure(Leds_init, /* name */ + be_nested_proto( + 11, /* nstack */ + 5, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[12]) { /* constants */ + /* K0 */ be_nested_str(gamma), + /* K1 */ be_nested_str(leds), + /* K2 */ be_nested_str(pin), + /* K3 */ be_nested_str(WS2812), + /* K4 */ be_const_int(0), + /* K5 */ be_nested_str(valuer_error), + /* K6 */ be_nested_str(no_X20GPIO_X20specified_X20for_X20neopixelbus), + /* K7 */ be_nested_str(ctor), + /* K8 */ be_nested_str(_p), + /* K9 */ be_nested_str(internal_error), + /* K10 */ be_nested_str(couldn_X27t_X20not_X20initialize_X20noepixelbus), + /* K11 */ be_nested_str(begin), + }), + &be_const_str_init, + &be_const_str_solidified, + ( &(const binstruction[36]) { /* code */ + 0x50140200, // 0000 LDBOOL R5 1 0 + 0x90020005, // 0001 SETMBR R0 K0 R5 + 0x60140009, // 0002 GETGBL R5 G9 + 0x5C180200, // 0003 MOVE R6 R1 + 0x7C140200, // 0004 CALL R5 1 + 0x90020205, // 0005 SETMBR R0 K1 R5 + 0x4C140000, // 0006 LDNIL R5 + 0x1C140405, // 0007 EQ R5 R2 R5 + 0x78160008, // 0008 JMPF R5 #0012 + 0x8C140502, // 0009 GETMET R5 R2 K2 + 0x881C0503, // 000A GETMBR R7 R2 K3 + 0x7C140400, // 000B CALL R5 2 + 0x28140B04, // 000C GE R5 R5 K4 + 0x78160003, // 000D JMPF R5 #0012 + 0x8C140502, // 000E GETMET R5 R2 K2 + 0x881C0503, // 000F GETMBR R7 R2 K3 + 0x7C140400, // 0010 CALL R5 2 + 0x5C080A00, // 0011 MOVE R2 R5 + 0x4C140000, // 0012 LDNIL R5 + 0x1C140405, // 0013 EQ R5 R2 R5 + 0x78160000, // 0014 JMPF R5 #0016 + 0xB0060B06, // 0015 RAISE 1 K5 K6 + 0x8C140107, // 0016 GETMET R5 R0 K7 + 0x881C0101, // 0017 GETMBR R7 R0 K1 + 0x5C200400, // 0018 MOVE R8 R2 + 0x5C240600, // 0019 MOVE R9 R3 + 0x5C280800, // 001A MOVE R10 R4 + 0x7C140A00, // 001B CALL R5 5 + 0x88140108, // 001C GETMBR R5 R0 K8 + 0x4C180000, // 001D LDNIL R6 + 0x1C140A06, // 001E EQ R5 R5 R6 + 0x78160000, // 001F JMPF R5 #0021 + 0xB006130A, // 0020 RAISE 1 K9 K10 + 0x8C14010B, // 0021 GETMET R5 R0 K11 + 0x7C140200, // 0022 CALL R5 1 + 0x80000000, // 0023 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: clear_to +********************************************************************/ +be_local_closure(Leds_clear_to, /* name */ + be_nested_proto( + 10, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(call_native), + /* K1 */ be_nested_str(to_gamma), + }), + &be_const_str_clear_to, + &be_const_str_solidified, + ( &(const binstruction[ 8]) { /* code */ + 0x8C0C0100, // 0000 GETMET R3 R0 K0 + 0x54160008, // 0001 LDINT R5 9 + 0x8C180101, // 0002 GETMET R6 R0 K1 + 0x5C200200, // 0003 MOVE R8 R1 + 0x5C240400, // 0004 MOVE R9 R2 + 0x7C180600, // 0005 CALL R6 3 + 0x7C0C0600, // 0006 CALL R3 3 + 0x80000000, // 0007 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: can_show +********************************************************************/ +be_local_closure(Leds_can_show, /* name */ + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(call_native), + /* K1 */ be_const_int(3), + }), + &be_const_str_can_show, + &be_const_str_solidified, + ( &(const binstruction[ 4]) { /* code */ + 0x8C040100, // 0000 GETMET R1 R0 K0 + 0x580C0001, // 0001 LDCONST R3 K1 + 0x7C040400, // 0002 CALL R1 2 + 0x80040200, // 0003 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: clear +********************************************************************/ +be_local_closure(Leds_clear, /* name */ + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(clear_to), + /* K1 */ be_const_int(0), + /* K2 */ be_nested_str(show), + }), + &be_const_str_clear, + &be_const_str_solidified, + ( &(const binstruction[ 6]) { /* code */ + 0x8C040100, // 0000 GETMET R1 R0 K0 + 0x580C0001, // 0001 LDCONST R3 K1 + 0x7C040400, // 0002 CALL R1 2 + 0x8C040102, // 0003 GETMET R1 R0 K2 + 0x7C040200, // 0004 CALL R1 1 + 0x80000000, // 0005 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: show +********************************************************************/ +be_local_closure(Leds_show, /* name */ + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(call_native), + /* K1 */ be_const_int(2), + }), + &be_const_str_show, + &be_const_str_solidified, + ( &(const binstruction[ 4]) { /* code */ + 0x8C040100, // 0000 GETMET R1 R0 K0 + 0x580C0001, // 0001 LDCONST R3 K1 + 0x7C040400, // 0002 CALL R1 2 + 0x80000000, // 0003 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: ctor +********************************************************************/ +be_local_closure(Leds_ctor, /* name */ + be_nested_proto( + 10, /* nstack */ + 4, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(call_native), + /* K1 */ be_const_int(0), + }), + &be_const_str_ctor, + &be_const_str_solidified, + ( &(const binstruction[16]) { /* code */ + 0x4C100000, // 0000 LDNIL R4 + 0x1C100604, // 0001 EQ R4 R3 R4 + 0x78120005, // 0002 JMPF R4 #0009 + 0x8C100100, // 0003 GETMET R4 R0 K0 + 0x58180001, // 0004 LDCONST R6 K1 + 0x5C1C0200, // 0005 MOVE R7 R1 + 0x5C200400, // 0006 MOVE R8 R2 + 0x7C100800, // 0007 CALL R4 4 + 0x70020005, // 0008 JMP #000F + 0x8C100100, // 0009 GETMET R4 R0 K0 + 0x58180001, // 000A LDCONST R6 K1 + 0x5C1C0200, // 000B MOVE R7 R1 + 0x5C200400, // 000C MOVE R8 R2 + 0x5C240600, // 000D MOVE R9 R3 + 0x7C100A00, // 000E CALL R4 5 + 0x80000000, // 000F RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: dirty +********************************************************************/ +be_local_closure(Leds_dirty, /* name */ + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_str(call_native), + }), + &be_const_str_dirty, + &be_const_str_solidified, + ( &(const binstruction[ 4]) { /* code */ + 0x8C040100, // 0000 GETMET R1 R0 K0 + 0x540E0004, // 0001 LDINT R3 5 + 0x7C040400, // 0002 CALL R1 2 + 0x80000000, // 0003 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: get_pixel_color +********************************************************************/ +be_local_closure(Leds_segment_get_pixel_color, /* name */ + be_nested_proto( + 5, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(strip), + /* K1 */ be_nested_str(get_pixel_color), + /* K2 */ be_nested_str(offseta), + }), + &be_const_str_get_pixel_color, + &be_const_str_solidified, + ( &(const binstruction[ 6]) { /* code */ + 0x88080100, // 0000 GETMBR R2 R0 K0 + 0x8C080501, // 0001 GETMET R2 R2 K1 + 0x88100102, // 0002 GETMBR R4 R0 K2 + 0x00100204, // 0003 ADD R4 R1 R4 + 0x7C080400, // 0004 CALL R2 2 + 0x80040400, // 0005 RET 1 R2 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: clear_to +********************************************************************/ +be_local_closure(Leds_segment_clear_to, /* name */ + be_nested_proto( + 9, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 6]) { /* constants */ + /* K0 */ be_const_int(0), + /* K1 */ be_nested_str(leds), + /* K2 */ be_nested_str(strip), + /* K3 */ be_nested_str(set_pixel_color), + /* K4 */ be_nested_str(offset), + /* K5 */ be_const_int(1), + }), + &be_const_str_clear_to, + &be_const_str_solidified, + ( &(const binstruction[14]) { /* code */ + 0x580C0000, // 0000 LDCONST R3 K0 + 0x88100101, // 0001 GETMBR R4 R0 K1 + 0x14100604, // 0002 LT R4 R3 R4 + 0x78120008, // 0003 JMPF R4 #000D + 0x88100102, // 0004 GETMBR R4 R0 K2 + 0x8C100903, // 0005 GETMET R4 R4 K3 + 0x88180104, // 0006 GETMBR R6 R0 K4 + 0x00180606, // 0007 ADD R6 R3 R6 + 0x5C1C0200, // 0008 MOVE R7 R1 + 0x5C200400, // 0009 MOVE R8 R2 + 0x7C100800, // 000A CALL R4 4 + 0x000C0705, // 000B ADD R3 R3 K5 + 0x7001FFF3, // 000C JMP #0001 + 0x80000000, // 000D RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: can_show +********************************************************************/ +be_local_closure(Leds_segment_can_show, /* name */ + be_nested_proto( + 3, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(strip), + /* K1 */ be_nested_str(can_show), + }), + &be_const_str_can_show, + &be_const_str_solidified, + ( &(const binstruction[ 4]) { /* code */ + 0x88040100, // 0000 GETMBR R1 R0 K0 + 0x8C040301, // 0001 GETMET R1 R1 K1 + 0x7C040200, // 0002 CALL R1 1 + 0x80040200, // 0003 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: set_pixel_color +********************************************************************/ +be_local_closure(Leds_segment_set_pixel_color, /* name */ + be_nested_proto( + 9, /* nstack */ + 4, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(strip), + /* K1 */ be_nested_str(set_pixel_color), + /* K2 */ be_nested_str(offset), + }), + &be_const_str_set_pixel_color, + &be_const_str_solidified, + ( &(const binstruction[ 8]) { /* code */ + 0x88100100, // 0000 GETMBR R4 R0 K0 + 0x8C100901, // 0001 GETMET R4 R4 K1 + 0x88180102, // 0002 GETMBR R6 R0 K2 + 0x00180206, // 0003 ADD R6 R1 R6 + 0x5C1C0400, // 0004 MOVE R7 R2 + 0x5C200600, // 0005 MOVE R8 R3 + 0x7C100800, // 0006 CALL R4 4 + 0x80000000, // 0007 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: clear +********************************************************************/ +be_local_closure(Leds_segment_clear, /* name */ + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(clear_to), + /* K1 */ be_const_int(0), + /* K2 */ be_nested_str(show), + }), + &be_const_str_clear, + &be_const_str_solidified, + ( &(const binstruction[ 6]) { /* code */ + 0x8C040100, // 0000 GETMET R1 R0 K0 + 0x580C0001, // 0001 LDCONST R3 K1 + 0x7C040400, // 0002 CALL R1 2 + 0x8C040102, // 0003 GETMET R1 R0 K2 + 0x7C040200, // 0004 CALL R1 1 + 0x80000000, // 0005 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: begin +********************************************************************/ +be_local_closure(Leds_segment_begin, /* name */ + be_nested_proto( + 1, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 0, /* has constants */ + NULL, /* no const */ + &be_const_str_begin, + &be_const_str_solidified, + ( &(const binstruction[ 1]) { /* code */ + 0x80000000, // 0000 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: pixel_count +********************************************************************/ +be_local_closure(Leds_segment_pixel_count, /* name */ + be_nested_proto( + 2, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_str(leds), + }), + &be_const_str_pixel_count, + &be_const_str_solidified, + ( &(const binstruction[ 2]) { /* code */ + 0x88040100, // 0000 GETMBR R1 R0 K0 + 0x80040200, // 0001 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: init +********************************************************************/ +be_local_closure(Leds_segment_init, /* name */ + be_nested_proto( + 6, /* nstack */ + 4, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(strip), + /* K1 */ be_nested_str(offset), + /* K2 */ be_nested_str(leds), + }), + &be_const_str_init, + &be_const_str_solidified, + ( &(const binstruction[10]) { /* code */ + 0x90020001, // 0000 SETMBR R0 K0 R1 + 0x60100009, // 0001 GETGBL R4 G9 + 0x5C140400, // 0002 MOVE R5 R2 + 0x7C100200, // 0003 CALL R4 1 + 0x90020204, // 0004 SETMBR R0 K1 R4 + 0x60100009, // 0005 GETGBL R4 G9 + 0x5C140600, // 0006 MOVE R5 R3 + 0x7C100200, // 0007 CALL R4 1 + 0x90020404, // 0008 SETMBR R0 K2 R4 + 0x80000000, // 0009 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: pixel_size +********************************************************************/ +be_local_closure(Leds_segment_pixel_size, /* name */ + be_nested_proto( + 3, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(strip), + /* K1 */ be_nested_str(pixel_size), + }), + &be_const_str_pixel_size, + &be_const_str_solidified, + ( &(const binstruction[ 4]) { /* code */ + 0x88040100, // 0000 GETMBR R1 R0 K0 + 0x8C040301, // 0001 GETMET R1 R1 K1 + 0x7C040200, // 0002 CALL R1 1 + 0x80040200, // 0003 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: dirty +********************************************************************/ +be_local_closure(Leds_segment_dirty, /* name */ + be_nested_proto( + 3, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(strip), + /* K1 */ be_nested_str(dirty), + }), + &be_const_str_dirty, + &be_const_str_solidified, + ( &(const binstruction[ 4]) { /* code */ + 0x88040100, // 0000 GETMBR R1 R0 K0 + 0x8C040301, // 0001 GETMET R1 R1 K1 + 0x7C040200, // 0002 CALL R1 1 + 0x80000000, // 0003 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: show +********************************************************************/ +be_local_closure(Leds_segment_show, /* name */ + be_nested_proto( + 4, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 5]) { /* constants */ + /* K0 */ be_nested_str(offset), + /* K1 */ be_const_int(0), + /* K2 */ be_nested_str(leds), + /* K3 */ be_nested_str(strip), + /* K4 */ be_nested_str(show), + }), + &be_const_str_show, + &be_const_str_solidified, + ( &(const binstruction[16]) { /* code */ + 0x60080017, // 0000 GETGBL R2 G23 + 0x5C0C0200, // 0001 MOVE R3 R1 + 0x7C080200, // 0002 CALL R2 1 + 0x740A0007, // 0003 JMPT R2 #000C + 0x88080100, // 0004 GETMBR R2 R0 K0 + 0x1C080501, // 0005 EQ R2 R2 K1 + 0x780A0007, // 0006 JMPF R2 #000F + 0x88080102, // 0007 GETMBR R2 R0 K2 + 0x880C0103, // 0008 GETMBR R3 R0 K3 + 0x880C0702, // 0009 GETMBR R3 R3 K2 + 0x1C080403, // 000A EQ R2 R2 R3 + 0x780A0002, // 000B JMPF R2 #000F + 0x88080103, // 000C GETMBR R2 R0 K3 + 0x8C080504, // 000D GETMET R2 R2 K4 + 0x7C080200, // 000E CALL R2 1 + 0x80000000, // 000F RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: is_dirty +********************************************************************/ +be_local_closure(Leds_segment_is_dirty, /* name */ + be_nested_proto( + 3, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(strip), + /* K1 */ be_nested_str(is_dirty), + }), + &be_const_str_is_dirty, + &be_const_str_solidified, + ( &(const binstruction[ 4]) { /* code */ + 0x88040100, // 0000 GETMBR R1 R0 K0 + 0x8C040301, // 0001 GETMET R1 R1 K1 + 0x7C040200, // 0002 CALL R1 1 + 0x80040200, // 0003 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: pixels_buffer +********************************************************************/ +be_local_closure(Leds_segment_pixels_buffer, /* name */ + be_nested_proto( + 2, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 0, /* has constants */ + NULL, /* no const */ + &be_const_str_pixels_buffer, + &be_const_str_solidified, + ( &(const binstruction[ 2]) { /* code */ + 0x4C040000, // 0000 LDNIL R1 + 0x80040200, // 0001 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified class: Leds_segment +********************************************************************/ +be_local_class(Leds_segment, + 3, + NULL, + be_nested_map(16, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(get_pixel_color, -1), be_const_closure(Leds_segment_get_pixel_color_closure) }, + { be_const_key(strip, -1), be_const_var(0) }, + { be_const_key(clear_to, 5), be_const_closure(Leds_segment_clear_to_closure) }, + { be_const_key(can_show, 13), be_const_closure(Leds_segment_can_show_closure) }, + { be_const_key(set_pixel_color, -1), be_const_closure(Leds_segment_set_pixel_color_closure) }, + { be_const_key(clear, -1), be_const_closure(Leds_segment_clear_closure) }, + { be_const_key(is_dirty, -1), be_const_closure(Leds_segment_is_dirty_closure) }, + { be_const_key(pixel_count, -1), be_const_closure(Leds_segment_pixel_count_closure) }, + { be_const_key(leds, -1), be_const_var(2) }, + { be_const_key(pixel_size, -1), be_const_closure(Leds_segment_pixel_size_closure) }, + { be_const_key(offset, -1), be_const_var(1) }, + { be_const_key(dirty, 8), be_const_closure(Leds_segment_dirty_closure) }, + { be_const_key(show, -1), be_const_closure(Leds_segment_show_closure) }, + { be_const_key(init, -1), be_const_closure(Leds_segment_init_closure) }, + { be_const_key(begin, 6), be_const_closure(Leds_segment_begin_closure) }, + { be_const_key(pixels_buffer, -1), be_const_closure(Leds_segment_pixels_buffer_closure) }, + })), + be_str_literal("Leds_segment") +); + +/******************************************************************** +** Solidified function: create_segment +********************************************************************/ +be_local_closure(Leds_create_segment, /* name */ + be_nested_proto( + 8, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 5]) { /* constants */ + /* K0 */ be_nested_str(leds), + /* K1 */ be_const_int(0), + /* K2 */ be_nested_str(value_error), + /* K3 */ be_nested_str(out_X20of_X20range), + /* K4 */ be_const_class(be_class_Leds_segment), + }), + &be_const_str_create_segment, + &be_const_str_solidified, + ( &(const binstruction[23]) { /* code */ + 0x600C0009, // 0000 GETGBL R3 G9 + 0x5C100200, // 0001 MOVE R4 R1 + 0x7C0C0200, // 0002 CALL R3 1 + 0x60100009, // 0003 GETGBL R4 G9 + 0x5C140400, // 0004 MOVE R5 R2 + 0x7C100200, // 0005 CALL R4 1 + 0x000C0604, // 0006 ADD R3 R3 R4 + 0x88100100, // 0007 GETMBR R4 R0 K0 + 0x240C0604, // 0008 GT R3 R3 R4 + 0x740E0003, // 0009 JMPT R3 #000E + 0x140C0301, // 000A LT R3 R1 K1 + 0x740E0001, // 000B JMPT R3 #000E + 0x140C0501, // 000C LT R3 R2 K1 + 0x780E0000, // 000D JMPF R3 #000F + 0xB0060503, // 000E RAISE 1 K2 K3 + 0x580C0004, // 000F LDCONST R3 K4 + 0xB4000004, // 0010 CLASS K4 + 0x5C100600, // 0011 MOVE R4 R3 + 0x5C140000, // 0012 MOVE R5 R0 + 0x5C180200, // 0013 MOVE R6 R1 + 0x5C1C0400, // 0014 MOVE R7 R2 + 0x7C100600, // 0015 CALL R4 3 + 0x80040800, // 0016 RET 1 R4 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified class: Leds +********************************************************************/ +extern const bclass be_class_Leds_ntv; +be_local_class(Leds, + 2, + &be_class_Leds_ntv, + be_nested_map(20, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(pixel_count, -1), be_const_closure(Leds_pixel_count_closure) }, + { be_const_key(dirty, 6), be_const_closure(Leds_dirty_closure) }, + { be_const_key(to_gamma, -1), be_const_closure(Leds_to_gamma_closure) }, + { be_const_key(create_matrix, 1), be_const_closure(Leds_create_matrix_closure) }, + { be_const_key(matrix, -1), be_const_static_closure(Leds_matrix_closure) }, + { be_const_key(pixel_size, -1), be_const_closure(Leds_pixel_size_closure) }, + { be_const_key(ctor, 0), be_const_closure(Leds_ctor_closure) }, + { be_const_key(pixels_buffer, 13), be_const_closure(Leds_pixels_buffer_closure) }, + { be_const_key(get_pixel_color, -1), be_const_closure(Leds_get_pixel_color_closure) }, + { be_const_key(show, -1), be_const_closure(Leds_show_closure) }, + { be_const_key(begin, 17), be_const_closure(Leds_begin_closure) }, + { be_const_key(leds, -1), be_const_var(1) }, + { be_const_key(clear, -1), be_const_closure(Leds_clear_closure) }, + { be_const_key(can_show, -1), be_const_closure(Leds_can_show_closure) }, + { be_const_key(gamma, 12), be_const_var(0) }, + { be_const_key(init, 11), be_const_closure(Leds_init_closure) }, + { be_const_key(set_pixel_color, 9), be_const_closure(Leds_set_pixel_color_closure) }, + { be_const_key(clear_to, 18), be_const_closure(Leds_clear_to_closure) }, + { be_const_key(is_dirty, -1), be_const_closure(Leds_is_dirty_closure) }, + { be_const_key(create_segment, -1), be_const_closure(Leds_create_segment_closure) }, + })), + be_str_literal("Leds") +); +/*******************************************************************/ + +void be_load_Leds_class(bvm *vm) { + be_pushntvclass(vm, &be_class_Leds); + be_setglobal(vm, "Leds"); + be_pop(vm, 1); +} + +#endif // USE_WS2812 diff --git a/lib/libesp32/berry/default/be_leds_ntv_lib.c b/lib/libesp32/berry/default/be_leds_ntv_lib.c new file mode 100644 index 000000000..4d5b07bb6 --- /dev/null +++ b/lib/libesp32/berry/default/be_leds_ntv_lib.c @@ -0,0 +1,50 @@ +/******************************************************************** + * Berry class `neopixelbus_ntv` + * + *******************************************************************/ +/* + +class Leds_ntv + var _p # pointer to internal object of type `NeoPixelBus(uint16_t countPixels, uint8_t pin)` + var _t # type of led strip + static WS2812_GRB = 1 + static SK6812_GRBW = 2 + + # skeleton for native call + def call_native() end +end + +*/ +#include "be_constobj.h" + +#ifdef USE_WS2812 + +extern int be_neopixelbus_call_native(bvm *vm); + + +/******************************************************************** +** Solidified class: Leds_ntv +********************************************************************/ +be_local_class(Leds_ntv, + 2, + NULL, + be_nested_map(5, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(call_native, -1), be_const_func(be_neopixelbus_call_native) }, + { be_const_key(_t, -1), be_const_var(1) }, + { be_const_key(_p, 3), be_const_var(0) }, + { be_const_key(SK6812_GRBW, 4), be_const_int(2) }, + { be_const_key(WS2812_GRB, -1), be_const_int(1) }, + })), + be_str_literal("Leds_ntv") +); +/*******************************************************************/ + +void be_load_Leds_ntv_class(bvm *vm) { + be_pushntvclass(vm, &be_class_Leds_ntv); + be_setglobal(vm, "Leds_ntv"); + be_pop(vm, 1); +} + +// be_const_func(be_neopixelbus_call_native) +#endif // USE_WS2812 diff --git a/lib/libesp32/berry/default/be_light_lib.c b/lib/libesp32/berry/default/be_light_lib.c new file mode 100644 index 000000000..6d020eca8 --- /dev/null +++ b/lib/libesp32/berry/default/be_light_lib.c @@ -0,0 +1,28 @@ +/******************************************************************** + * Tasmota lib + * + * To use: `import tasmota` + *******************************************************************/ +#include "be_constobj.h" + +#ifdef USE_LIGHT +extern int l_getlight(bvm *vm); +extern int l_setlight(bvm *vm); + +extern int l_gamma8(bvm *vm); +extern int l_gamma10(bvm *vm); +extern int l_rev_gamma10(bvm *vm); + +/* @const_object_info_begin +module light (scope: global) { + get, func(l_getlight) + set, func(l_setlight) + + gamma8, func(l_gamma8) + gamma10, func(l_gamma10) + reverse_gamma10, func(l_rev_gamma10) +} +@const_object_info_end */ +#include "../generate/be_fixed_light.h" + +#endif // USE_LIGHT \ No newline at end of file diff --git a/lib/libesp32/berry/default/be_lvgl_clock_icon_lib.c b/lib/libesp32/berry/default/be_lvgl_clock_icon_lib.c new file mode 100644 index 000000000..c9cf7f207 --- /dev/null +++ b/lib/libesp32/berry/default/be_lvgl_clock_icon_lib.c @@ -0,0 +1,313 @@ +/******************************************************************** + * Tasmota LVGL lv_signal_bars widget + *******************************************************************/ +#include "be_constobj.h" + +#ifdef USE_LVGL + +#include "lvgl.h" + +/******************************************************************** +** Solidified function: set_time +********************************************************************/ +be_local_closure(lv_clock_icon_set_time, /* name */ + be_nested_proto( + 11, /* nstack */ + 4, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[10]) { /* constants */ + /* K0 */ be_nested_str(string), + /* K1 */ be_nested_str(hour), + /* K2 */ be_nested_str(minute), + /* K3 */ be_nested_str(sec), + /* K4 */ be_nested_str(format), + /* K5 */ be_nested_str(_X2502d_X25s_X2502d), + /* K6 */ be_const_int(2), + /* K7 */ be_nested_str(_X3A), + /* K8 */ be_nested_str(_X20), + /* K9 */ be_nested_str(set_text), + }), + &be_const_str_set_time, + &be_const_str_solidified, + ( &(const binstruction[27]) { /* code */ + 0xA4120000, // 0000 IMPORT R4 K0 + 0x88140101, // 0001 GETMBR R5 R0 K1 + 0x20140205, // 0002 NE R5 R1 R5 + 0x74160005, // 0003 JMPT R5 #000A + 0x88140102, // 0004 GETMBR R5 R0 K2 + 0x20140405, // 0005 NE R5 R2 R5 + 0x74160002, // 0006 JMPT R5 #000A + 0x88140103, // 0007 GETMBR R5 R0 K3 + 0x20140605, // 0008 NE R5 R3 R5 + 0x7816000F, // 0009 JMPF R5 #001A + 0x8C140904, // 000A GETMET R5 R4 K4 + 0x581C0005, // 000B LDCONST R7 K5 + 0x5C200200, // 000C MOVE R8 R1 + 0x10240706, // 000D MOD R9 R3 K6 + 0x78260001, // 000E JMPF R9 #0011 + 0x58240007, // 000F LDCONST R9 K7 + 0x70020000, // 0010 JMP #0012 + 0x58240008, // 0011 LDCONST R9 K8 + 0x5C280400, // 0012 MOVE R10 R2 + 0x7C140A00, // 0013 CALL R5 5 + 0x90020201, // 0014 SETMBR R0 K1 R1 + 0x90020402, // 0015 SETMBR R0 K2 R2 + 0x90020603, // 0016 SETMBR R0 K3 R3 + 0x8C180109, // 0017 GETMET R6 R0 K9 + 0x5C200A00, // 0018 MOVE R8 R5 + 0x7C180400, // 0019 CALL R6 2 + 0x80000000, // 001A RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: every_second +********************************************************************/ +be_local_closure(lv_clock_icon_every_second, /* name */ + be_nested_proto( + 7, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 9]) { /* constants */ + /* K0 */ be_nested_str(tasmota), + /* K1 */ be_nested_str(time_dump), + /* K2 */ be_nested_str(rtc), + /* K3 */ be_nested_str(local), + /* K4 */ be_nested_str(year), + /* K5 */ be_nested_str(set_time), + /* K6 */ be_nested_str(hour), + /* K7 */ be_nested_str(min), + /* K8 */ be_nested_str(sec), + }), + &be_const_str_every_second, + &be_const_str_solidified, + ( &(const binstruction[17]) { /* code */ + 0xB8060000, // 0000 GETNGBL R1 K0 + 0x8C040301, // 0001 GETMET R1 R1 K1 + 0xB80E0000, // 0002 GETNGBL R3 K0 + 0x8C0C0702, // 0003 GETMET R3 R3 K2 + 0x7C0C0200, // 0004 CALL R3 1 + 0x940C0703, // 0005 GETIDX R3 R3 K3 + 0x7C040400, // 0006 CALL R1 2 + 0x94080304, // 0007 GETIDX R2 R1 K4 + 0x540E07B1, // 0008 LDINT R3 1970 + 0x20080403, // 0009 NE R2 R2 R3 + 0x780A0004, // 000A JMPF R2 #0010 + 0x8C080105, // 000B GETMET R2 R0 K5 + 0x94100306, // 000C GETIDX R4 R1 K6 + 0x94140307, // 000D GETIDX R5 R1 K7 + 0x94180308, // 000E GETIDX R6 R1 K8 + 0x7C080800, // 000F CALL R2 4 + 0x80000000, // 0010 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: init +********************************************************************/ +be_local_closure(lv_clock_icon_init, /* name */ + be_nested_proto( + 11, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[22]) { /* constants */ + /* K0 */ be_nested_str(init), + /* K1 */ be_nested_str(lv), + /* K2 */ be_nested_str(seg7_font), + /* K3 */ be_nested_str(set_style_text_font), + /* K4 */ be_nested_str(PART_MAIN), + /* K5 */ be_nested_str(STATE_DEFAULT), + /* K6 */ be_nested_str(get_height), + /* K7 */ be_nested_str(set_text), + /* K8 */ be_nested_str(_X2D_X2D_X3A_X2D_X2D), + /* K9 */ be_nested_str(refr_size), + /* K10 */ be_nested_str(get_width), + /* K11 */ be_nested_str(set_y), + /* K12 */ be_const_int(2), + /* K13 */ be_nested_str(get_style_pad_right), + /* K14 */ be_nested_str(set_x), + /* K15 */ be_const_int(3), + /* K16 */ be_nested_str(set_style_pad_right), + /* K17 */ be_nested_str(set_style_bg_color), + /* K18 */ be_nested_str(color), + /* K19 */ be_nested_str(COLOR_BLACK), + /* K20 */ be_nested_str(tasmota), + /* K21 */ be_nested_str(add_driver), + }), + &be_const_str_init, + &be_const_str_solidified, + ( &(const binstruction[82]) { /* code */ + 0x60080003, // 0000 GETGBL R2 G3 + 0x5C0C0000, // 0001 MOVE R3 R0 + 0x7C080200, // 0002 CALL R2 1 + 0x8C080500, // 0003 GETMET R2 R2 K0 + 0x5C100200, // 0004 MOVE R4 R1 + 0x7C080400, // 0005 CALL R2 2 + 0xB80A0200, // 0006 GETNGBL R2 K1 + 0x8C080502, // 0007 GETMET R2 R2 K2 + 0x5412000F, // 0008 LDINT R4 16 + 0x7C080400, // 0009 CALL R2 2 + 0x4C0C0000, // 000A LDNIL R3 + 0x200C0403, // 000B NE R3 R2 R3 + 0x780E0007, // 000C JMPF R3 #0015 + 0x8C0C0103, // 000D GETMET R3 R0 K3 + 0x5C140400, // 000E MOVE R5 R2 + 0xB81A0200, // 000F GETNGBL R6 K1 + 0x88180D04, // 0010 GETMBR R6 R6 K4 + 0xB81E0200, // 0011 GETNGBL R7 K1 + 0x881C0F05, // 0012 GETMBR R7 R7 K5 + 0x30180C07, // 0013 OR R6 R6 R7 + 0x7C0C0600, // 0014 CALL R3 3 + 0x4C0C0000, // 0015 LDNIL R3 + 0x200C0203, // 0016 NE R3 R1 R3 + 0x780E0034, // 0017 JMPF R3 #004D + 0x8C0C0306, // 0018 GETMET R3 R1 K6 + 0x7C0C0200, // 0019 CALL R3 1 + 0x8C100107, // 001A GETMET R4 R0 K7 + 0x58180008, // 001B LDCONST R6 K8 + 0x7C100400, // 001C CALL R4 2 + 0x8C100109, // 001D GETMET R4 R0 K9 + 0x7C100200, // 001E CALL R4 1 + 0x8C10010A, // 001F GETMET R4 R0 K10 + 0x7C100200, // 0020 CALL R4 1 + 0x8C14010B, // 0021 GETMET R5 R0 K11 + 0x8C1C0306, // 0022 GETMET R7 R1 K6 + 0x7C1C0200, // 0023 CALL R7 1 + 0x8C200106, // 0024 GETMET R8 R0 K6 + 0x7C200200, // 0025 CALL R8 1 + 0x041C0E08, // 0026 SUB R7 R7 R8 + 0x0C1C0F0C, // 0027 DIV R7 R7 K12 + 0x7C140400, // 0028 CALL R5 2 + 0x8C14030D, // 0029 GETMET R5 R1 K13 + 0xB81E0200, // 002A GETNGBL R7 K1 + 0x881C0F04, // 002B GETMBR R7 R7 K4 + 0xB8220200, // 002C GETNGBL R8 K1 + 0x88201105, // 002D GETMBR R8 R8 K5 + 0x301C0E08, // 002E OR R7 R7 R8 + 0x7C140400, // 002F CALL R5 2 + 0x8C18010E, // 0030 GETMET R6 R0 K14 + 0x8C20030A, // 0031 GETMET R8 R1 K10 + 0x7C200200, // 0032 CALL R8 1 + 0x04201004, // 0033 SUB R8 R8 R4 + 0x04201005, // 0034 SUB R8 R8 R5 + 0x0420110F, // 0035 SUB R8 R8 K15 + 0x7C180400, // 0036 CALL R6 2 + 0x8C180310, // 0037 GETMET R6 R1 K16 + 0x00200A04, // 0038 ADD R8 R5 R4 + 0x54260005, // 0039 LDINT R9 6 + 0x00201009, // 003A ADD R8 R8 R9 + 0xB8260200, // 003B GETNGBL R9 K1 + 0x88241304, // 003C GETMBR R9 R9 K4 + 0xB82A0200, // 003D GETNGBL R10 K1 + 0x88281505, // 003E GETMBR R10 R10 K5 + 0x3024120A, // 003F OR R9 R9 R10 + 0x7C180600, // 0040 CALL R6 3 + 0x8C180111, // 0041 GETMET R6 R0 K17 + 0xB8220200, // 0042 GETNGBL R8 K1 + 0x8C201112, // 0043 GETMET R8 R8 K18 + 0xB82A0200, // 0044 GETNGBL R10 K1 + 0x88281513, // 0045 GETMBR R10 R10 K19 + 0x7C200400, // 0046 CALL R8 2 + 0xB8260200, // 0047 GETNGBL R9 K1 + 0x88241304, // 0048 GETMBR R9 R9 K4 + 0xB82A0200, // 0049 GETNGBL R10 K1 + 0x88281505, // 004A GETMBR R10 R10 K5 + 0x3024120A, // 004B OR R9 R9 R10 + 0x7C180600, // 004C CALL R6 3 + 0xB80E2800, // 004D GETNGBL R3 K20 + 0x8C0C0715, // 004E GETMET R3 R3 K21 + 0x5C140000, // 004F MOVE R5 R0 + 0x7C0C0400, // 0050 CALL R3 2 + 0x80000000, // 0051 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: del +********************************************************************/ +be_local_closure(lv_clock_icon_del, /* name */ + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(del), + /* K1 */ be_nested_str(tasmota), + /* K2 */ be_nested_str(remove_driver), + }), + &be_const_str_del, + &be_const_str_solidified, + ( &(const binstruction[10]) { /* code */ + 0x60040003, // 0000 GETGBL R1 G3 + 0x5C080000, // 0001 MOVE R2 R0 + 0x7C040200, // 0002 CALL R1 1 + 0x8C040300, // 0003 GETMET R1 R1 K0 + 0x7C040200, // 0004 CALL R1 1 + 0xB8060200, // 0005 GETNGBL R1 K1 + 0x8C040302, // 0006 GETMET R1 R1 K2 + 0x5C0C0000, // 0007 MOVE R3 R0 + 0x7C040400, // 0008 CALL R1 2 + 0x80000000, // 0009 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified class: lv_clock_icon +********************************************************************/ +extern const bclass be_class_lv_label; +be_local_class(lv_clock_icon, + 3, + &be_class_lv_label, + be_nested_map(7, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(sec, -1), be_const_var(2) }, + { be_const_key(hour, -1), be_const_var(0) }, + { be_const_key(set_time, 6), be_const_closure(lv_clock_icon_set_time_closure) }, + { be_const_key(every_second, -1), be_const_closure(lv_clock_icon_every_second_closure) }, + { be_const_key(minute, -1), be_const_var(1) }, + { be_const_key(init, 2), be_const_closure(lv_clock_icon_init_closure) }, + { be_const_key(del, -1), be_const_closure(lv_clock_icon_del_closure) }, + })), + be_str_literal("lv_clock_icon") +); +/*******************************************************************/ + +void be_load_lv_clock_icon_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_clock_icon); + be_setglobal(vm, "lv_clock_icon"); + be_pop(vm, 1); +} + +#endif // USE_LVGL \ No newline at end of file diff --git a/lib/libesp32/berry/default/be_lvgl_ctypes_definitions.c b/lib/libesp32/berry/default/be_lvgl_ctypes_definitions.c new file mode 100644 index 000000000..bb1ffb65c --- /dev/null +++ b/lib/libesp32/berry/default/be_lvgl_ctypes_definitions.c @@ -0,0 +1,531 @@ +/******************************************************************** + * Tasmota LVGL ctypes mapping + *******************************************************************/ +#include "be_ctypes.h" + +#ifdef USE_LVGL + +#include "lvgl.h" +#include "be_lvgl.h" + +/******************************************************************** + * Generated code, don't edit + *******************************************************************/ + +static const char * be_ctypes_instance_mappings[]; /* forward definition */ + +const be_ctypes_structure_t be_lv_point = { + 4, /* size in bytes */ + 2, /* number of elements */ + be_ctypes_instance_mappings, + (const be_ctypes_structure_item_t[2]) { + { "x", 0, 0, 0, ctypes_i16, 0 }, + { "y", 2, 0, 0, ctypes_i16, 0 }, +}}; + +const be_ctypes_structure_t be_lv_area = { + 8, /* size in bytes */ + 4, /* number of elements */ + be_ctypes_instance_mappings, + (const be_ctypes_structure_item_t[4]) { + { "x1", 0, 0, 0, ctypes_i16, 0 }, + { "x2", 4, 0, 0, ctypes_i16, 0 }, + { "y1", 2, 0, 0, ctypes_i16, 0 }, + { "y2", 6, 0, 0, ctypes_i16, 0 }, +}}; + +const be_ctypes_structure_t be_lv_draw_rect_dsc = { + 51, /* size in bytes */ + 29, /* number of elements */ + be_ctypes_instance_mappings, + (const be_ctypes_structure_item_t[29]) { + { "bg_color", 4, 0, 0, ctypes_u16, 1 }, + { "bg_grad_color", 6, 0, 0, ctypes_u16, 1 }, + { "bg_grad_color_stop", 9, 0, 0, ctypes_u8, 0 }, + { "bg_grad_dir", 11, 0, 3, ctypes_bf, 0 }, + { "bg_img_opa", 22, 0, 0, ctypes_u8, 0 }, + { "bg_img_recolor", 20, 0, 0, ctypes_u16, 1 }, + { "bg_img_recolor_opa", 23, 0, 0, ctypes_u8, 0 }, + { "bg_img_src", 12, 0, 0, ctypes_ptr32, 0 }, + { "bg_img_symbol_font", 16, 0, 0, ctypes_ptr32, 0 }, + { "bg_img_tiled", 24, 0, 0, ctypes_u8, 0 }, + { "bg_main_color_stop", 8, 0, 0, ctypes_u8, 0 }, + { "bg_opa", 10, 0, 0, ctypes_u8, 0 }, + { "blend_mode", 2, 0, 0, ctypes_u8, 0 }, + { "border_color", 26, 0, 0, ctypes_u16, 1 }, + { "border_opa", 30, 0, 0, ctypes_u8, 0 }, + { "border_post", 31, 0, 1, ctypes_bf, 0 }, + { "border_side", 31, 1, 5, ctypes_bf, 0 }, + { "border_width", 28, 0, 0, ctypes_i16, 0 }, + { "outline_color", 32, 0, 0, ctypes_u16, 1 }, + { "outline_opa", 38, 0, 0, ctypes_u8, 0 }, + { "outline_pad", 36, 0, 0, ctypes_i16, 0 }, + { "outline_width", 34, 0, 0, ctypes_i16, 0 }, + { "radius", 0, 0, 0, ctypes_i16, 0 }, + { "shadow_color", 40, 0, 0, ctypes_u16, 1 }, + { "shadow_ofs_x", 44, 0, 0, ctypes_i16, 0 }, + { "shadow_ofs_y", 46, 0, 0, ctypes_i16, 0 }, + { "shadow_opa", 50, 0, 0, ctypes_u8, 0 }, + { "shadow_spread", 48, 0, 0, ctypes_i16, 0 }, + { "shadow_width", 42, 0, 0, ctypes_i16, 0 }, +}}; + +const be_ctypes_structure_t be_lv_draw_line_dsc = { + 10, /* size in bytes */ + 9, /* number of elements */ + be_ctypes_instance_mappings, + (const be_ctypes_structure_item_t[9]) { + { "blend_mode", 9, 0, 2, ctypes_bf, 0 }, + { "color", 0, 0, 0, ctypes_u16, 1 }, + { "dash_gap", 6, 0, 0, ctypes_i16, 0 }, + { "dash_width", 4, 0, 0, ctypes_i16, 0 }, + { "opa", 8, 0, 0, ctypes_u8, 0 }, + { "raw_end", 9, 4, 1, ctypes_bf, 0 }, + { "round_end", 9, 3, 1, ctypes_bf, 0 }, + { "round_start", 9, 2, 1, ctypes_bf, 0 }, + { "width", 2, 0, 0, ctypes_i16, 0 }, +}}; + +const be_ctypes_structure_t be_lv_draw_img_dsc = { + 21, /* size in bytes */ + 10, /* number of elements */ + be_ctypes_instance_mappings, + (const be_ctypes_structure_item_t[10]) { + { "angle", 0, 0, 0, ctypes_u16, 0 }, + { "antialias", 20, 0, 1, ctypes_bf, 0 }, + { "blend_mode", 12, 0, 4, ctypes_bf, 0 }, + { "frame_id", 16, 0, 0, ctypes_i32, 0 }, + { "opa", 11, 0, 0, ctypes_u8, 0 }, + { "pivot_x", 4, 0, 0, ctypes_i16, 0 }, + { "pivot_y", 6, 0, 0, ctypes_i16, 0 }, + { "recolor", 8, 0, 0, ctypes_u16, 1 }, + { "recolor_opa", 10, 0, 0, ctypes_u8, 0 }, + { "zoom", 2, 0, 0, ctypes_u16, 0 }, +}}; + +const be_ctypes_structure_t be_lv_draw_mask_common_dsc = { + 5, /* size in bytes */ + 2, /* number of elements */ + be_ctypes_instance_mappings, + (const be_ctypes_structure_item_t[2]) { + { "cb", 0, 0, 0, ctypes_ptr32, 0 }, + { "type", 4, 0, 0, ctypes_u8, 0 }, +}}; + +const be_ctypes_structure_t be_lv_draw_mask_line_param_cfg = { + 9, /* size in bytes */ + 5, /* number of elements */ + be_ctypes_instance_mappings, + (const be_ctypes_structure_item_t[5]) { + { "p1_x", 0, 0, 0, ctypes_i16, 0 }, + { "p1_y", 2, 0, 0, ctypes_i16, 0 }, + { "p2_x", 4, 0, 0, ctypes_i16, 0 }, + { "p2_y", 6, 0, 0, ctypes_i16, 0 }, + { "side", 8, 0, 2, ctypes_bf, 0 }, +}}; + +const be_ctypes_structure_t be_lv_draw_mask_line_param = { + 41, /* size in bytes */ + 15, /* number of elements */ + be_ctypes_instance_mappings, + (const be_ctypes_structure_item_t[15]) { + { "cfg_p1_x", 8, 0, 0, ctypes_i16, 0 }, + { "cfg_p1_y", 10, 0, 0, ctypes_i16, 0 }, + { "cfg_p2_x", 12, 0, 0, ctypes_i16, 0 }, + { "cfg_p2_y", 14, 0, 0, ctypes_i16, 0 }, + { "cfg_side", 16, 0, 2, ctypes_bf, 0 }, + { "dsc_cb", 0, 0, 0, ctypes_ptr32, 0 }, + { "dsc_type", 4, 0, 0, ctypes_u8, 0 }, + { "flat", 40, 0, 1, ctypes_bf, 0 }, + { "inv", 40, 1, 1, ctypes_bf, 0 }, + { "origo_x", 20, 0, 0, ctypes_i16, 0 }, + { "origo_y", 22, 0, 0, ctypes_i16, 0 }, + { "spx", 36, 0, 0, ctypes_i32, 0 }, + { "steep", 32, 0, 0, ctypes_i32, 0 }, + { "xy_steep", 24, 0, 0, ctypes_i32, 0 }, + { "yx_steep", 28, 0, 0, ctypes_i32, 0 }, +}}; + +const be_ctypes_structure_t be_lv_draw_mask_angle_param_cfg = { + 8, /* size in bytes */ + 4, /* number of elements */ + be_ctypes_instance_mappings, + (const be_ctypes_structure_item_t[4]) { + { "end_angle", 6, 0, 0, ctypes_i16, 0 }, + { "start_angle", 4, 0, 0, ctypes_i16, 0 }, + { "vertex_p_x", 0, 0, 0, ctypes_i16, 0 }, + { "vertex_p_y", 2, 0, 0, ctypes_i16, 0 }, +}}; + +const be_ctypes_structure_t be_lv_draw_mask_angle_param = { + 104, /* size in bytes */ + 37, /* number of elements */ + be_ctypes_instance_mappings, + (const be_ctypes_structure_item_t[37]) { + { "cfg_end_angle", 14, 0, 0, ctypes_i16, 0 }, + { "cfg_start_angle", 12, 0, 0, ctypes_i16, 0 }, + { "cfg_vertex_p_x", 8, 0, 0, ctypes_i16, 0 }, + { "cfg_vertex_p_y", 10, 0, 0, ctypes_i16, 0 }, + { "delta_deg", 102, 0, 0, ctypes_u16, 0 }, + { "dsc_cb", 0, 0, 0, ctypes_ptr32, 0 }, + { "dsc_type", 4, 0, 0, ctypes_u8, 0 }, + { "end_line_cfg_p1_x", 68, 0, 0, ctypes_i16, 0 }, + { "end_line_cfg_p1_y", 70, 0, 0, ctypes_i16, 0 }, + { "end_line_cfg_p2_x", 72, 0, 0, ctypes_i16, 0 }, + { "end_line_cfg_p2_y", 74, 0, 0, ctypes_i16, 0 }, + { "end_line_cfg_side", 76, 0, 2, ctypes_bf, 0 }, + { "end_line_dsc_cb", 60, 0, 0, ctypes_ptr32, 0 }, + { "end_line_dsc_type", 64, 0, 0, ctypes_u8, 0 }, + { "end_line_flat", 100, 0, 1, ctypes_bf, 0 }, + { "end_line_inv", 100, 1, 1, ctypes_bf, 0 }, + { "end_line_origo_x", 80, 0, 0, ctypes_i16, 0 }, + { "end_line_origo_y", 82, 0, 0, ctypes_i16, 0 }, + { "end_line_spx", 96, 0, 0, ctypes_i32, 0 }, + { "end_line_steep", 92, 0, 0, ctypes_i32, 0 }, + { "end_line_xy_steep", 84, 0, 0, ctypes_i32, 0 }, + { "end_line_yx_steep", 88, 0, 0, ctypes_i32, 0 }, + { "start_line_cfg_p1_x", 24, 0, 0, ctypes_i16, 0 }, + { "start_line_cfg_p1_y", 26, 0, 0, ctypes_i16, 0 }, + { "start_line_cfg_p2_x", 28, 0, 0, ctypes_i16, 0 }, + { "start_line_cfg_p2_y", 30, 0, 0, ctypes_i16, 0 }, + { "start_line_cfg_side", 32, 0, 2, ctypes_bf, 0 }, + { "start_line_dsc_cb", 16, 0, 0, ctypes_ptr32, 0 }, + { "start_line_dsc_type", 20, 0, 0, ctypes_u8, 0 }, + { "start_line_flat", 56, 0, 1, ctypes_bf, 0 }, + { "start_line_inv", 56, 1, 1, ctypes_bf, 0 }, + { "start_line_origo_x", 36, 0, 0, ctypes_i16, 0 }, + { "start_line_origo_y", 38, 0, 0, ctypes_i16, 0 }, + { "start_line_spx", 52, 0, 0, ctypes_i32, 0 }, + { "start_line_steep", 48, 0, 0, ctypes_i32, 0 }, + { "start_line_xy_steep", 40, 0, 0, ctypes_i32, 0 }, + { "start_line_yx_steep", 44, 0, 0, ctypes_i32, 0 }, +}}; + +const be_ctypes_structure_t be_lv_draw_mask_radius_param_cfg = { + 11, /* size in bytes */ + 6, /* number of elements */ + be_ctypes_instance_mappings, + (const be_ctypes_structure_item_t[6]) { + { "outer", 10, 0, 1, ctypes_bf, 0 }, + { "radius", 8, 0, 0, ctypes_i16, 0 }, + { "rect_x1", 0, 0, 0, ctypes_i16, 0 }, + { "rect_x2", 4, 0, 0, ctypes_i16, 0 }, + { "rect_y1", 2, 0, 0, ctypes_i16, 0 }, + { "rect_y2", 6, 0, 0, ctypes_i16, 0 }, +}}; + +const be_ctypes_structure_t be_lv_sqrt_res = { + 4, /* size in bytes */ + 2, /* number of elements */ + be_ctypes_instance_mappings, + (const be_ctypes_structure_item_t[2]) { + { "f", 2, 0, 0, ctypes_u16, 0 }, + { "i", 0, 0, 0, ctypes_u16, 0 }, +}}; + +const be_ctypes_structure_t be_lv_draw_mask_radius_param = { + 28, /* size in bytes */ + 11, /* number of elements */ + be_ctypes_instance_mappings, + (const be_ctypes_structure_item_t[11]) { + { "cfg_outer", 18, 0, 1, ctypes_bf, 0 }, + { "cfg_radius", 16, 0, 0, ctypes_i16, 0 }, + { "cfg_rect_x1", 8, 0, 0, ctypes_i16, 0 }, + { "cfg_rect_x2", 12, 0, 0, ctypes_i16, 0 }, + { "cfg_rect_y1", 10, 0, 0, ctypes_i16, 0 }, + { "cfg_rect_y2", 14, 0, 0, ctypes_i16, 0 }, + { "dsc_cb", 0, 0, 0, ctypes_ptr32, 0 }, + { "dsc_type", 4, 0, 0, ctypes_u8, 0 }, + { "y_prev", 20, 0, 0, ctypes_i32, 0 }, + { "y_prev_x_f", 26, 0, 0, ctypes_u16, 0 }, + { "y_prev_x_i", 24, 0, 0, ctypes_u16, 0 }, +}}; + +const be_ctypes_structure_t be_lv_draw_mask_fade_param_cfg = { + 14, /* size in bytes */ + 8, /* number of elements */ + be_ctypes_instance_mappings, + (const be_ctypes_structure_item_t[8]) { + { "coords_x1", 0, 0, 0, ctypes_i16, 0 }, + { "coords_x2", 4, 0, 0, ctypes_i16, 0 }, + { "coords_y1", 2, 0, 0, ctypes_i16, 0 }, + { "coords_y2", 6, 0, 0, ctypes_i16, 0 }, + { "opa_bottom", 13, 0, 0, ctypes_u8, 0 }, + { "opa_top", 12, 0, 0, ctypes_u8, 0 }, + { "y_bottom", 10, 0, 0, ctypes_i16, 0 }, + { "y_top", 8, 0, 0, ctypes_i16, 0 }, +}}; + +const be_ctypes_structure_t be_lv_draw_mask_fade_param = { + 22, /* size in bytes */ + 10, /* number of elements */ + be_ctypes_instance_mappings, + (const be_ctypes_structure_item_t[10]) { + { "cfg_coords_x1", 8, 0, 0, ctypes_i16, 0 }, + { "cfg_coords_x2", 12, 0, 0, ctypes_i16, 0 }, + { "cfg_coords_y1", 10, 0, 0, ctypes_i16, 0 }, + { "cfg_coords_y2", 14, 0, 0, ctypes_i16, 0 }, + { "cfg_opa_bottom", 21, 0, 0, ctypes_u8, 0 }, + { "cfg_opa_top", 20, 0, 0, ctypes_u8, 0 }, + { "cfg_y_bottom", 18, 0, 0, ctypes_i16, 0 }, + { "cfg_y_top", 16, 0, 0, ctypes_i16, 0 }, + { "dsc_cb", 0, 0, 0, ctypes_ptr32, 0 }, + { "dsc_type", 4, 0, 0, ctypes_u8, 0 }, +}}; + +const be_ctypes_structure_t be_lv_draw_mask_map_param_cfg = { + 12, /* size in bytes */ + 5, /* number of elements */ + be_ctypes_instance_mappings, + (const be_ctypes_structure_item_t[5]) { + { "coords_x1", 0, 0, 0, ctypes_i16, 0 }, + { "coords_x2", 4, 0, 0, ctypes_i16, 0 }, + { "coords_y1", 2, 0, 0, ctypes_i16, 0 }, + { "coords_y2", 6, 0, 0, ctypes_i16, 0 }, + { "map", 8, 0, 0, ctypes_ptr32, 0 }, +}}; + +const be_ctypes_structure_t be_lv_draw_mask_map_param = { + 20, /* size in bytes */ + 7, /* number of elements */ + be_ctypes_instance_mappings, + (const be_ctypes_structure_item_t[7]) { + { "cfg_coords_x1", 8, 0, 0, ctypes_i16, 0 }, + { "cfg_coords_x2", 12, 0, 0, ctypes_i16, 0 }, + { "cfg_coords_y1", 10, 0, 0, ctypes_i16, 0 }, + { "cfg_coords_y2", 14, 0, 0, ctypes_i16, 0 }, + { "cfg_map", 16, 0, 0, ctypes_ptr32, 0 }, + { "dsc_cb", 0, 0, 0, ctypes_ptr32, 0 }, + { "dsc_type", 4, 0, 0, ctypes_u8, 0 }, +}}; + +const be_ctypes_structure_t be_lv_draw_mask_saved = { + 8, /* size in bytes */ + 2, /* number of elements */ + be_ctypes_instance_mappings, + (const be_ctypes_structure_item_t[2]) { + { "custom_id", 4, 0, 0, ctypes_ptr32, 0 }, + { "param", 0, 0, 0, ctypes_ptr32, 0 }, +}}; + +const be_ctypes_structure_t be_lv_meter_scale = { + 34, /* size in bytes */ + 15, /* number of elements */ + be_ctypes_instance_mappings, + (const be_ctypes_structure_item_t[15]) { + { "angle_range", 30, 0, 0, ctypes_u16, 0 }, + { "label_color", 18, 0, 0, ctypes_i16, 0 }, + { "label_gap", 16, 0, 0, ctypes_i16, 0 }, + { "max", 24, 0, 0, ctypes_i32, 0 }, + { "min", 20, 0, 0, ctypes_i32, 0 }, + { "r_mod", 28, 0, 0, ctypes_i16, 0 }, + { "rotation", 32, 0, 0, ctypes_i16, 0 }, + { "tick_cnt", 2, 0, 0, ctypes_u16, 0 }, + { "tick_color", 0, 0, 0, ctypes_u16, 1 }, + { "tick_length", 4, 0, 0, ctypes_u16, 0 }, + { "tick_major_color", 8, 0, 0, ctypes_u16, 1 }, + { "tick_major_length", 12, 0, 0, ctypes_u16, 0 }, + { "tick_major_nth", 10, 0, 0, ctypes_u16, 0 }, + { "tick_major_width", 14, 0, 0, ctypes_u16, 0 }, + { "tick_width", 6, 0, 0, ctypes_u16, 0 }, +}}; + +const be_ctypes_structure_t be_lv_meter_indicator = { + 16, /* size in bytes */ + 5, /* number of elements */ + be_ctypes_instance_mappings, + (const be_ctypes_structure_item_t[5]) { + { "end_value", 12, 0, 0, ctypes_i32, 0 }, + { "opa", 5, 0, 0, ctypes_u8, 0 }, + { "scale", 0, 0, 0, ctypes_ptr32, 0 }, + { "start_value", 8, 0, 0, ctypes_i32, 0 }, + { "type", 4, 0, 0, ctypes_u8, 0 }, +}}; + +const be_ctypes_structure_t be_lv_meter_indicator_needle_img = { + 24, /* size in bytes */ + 8, /* number of elements */ + be_ctypes_instance_mappings, + (const be_ctypes_structure_item_t[8]) { + { "end_value", 12, 0, 0, ctypes_i32, 0 }, + { "opa", 5, 0, 0, ctypes_u8, 0 }, + { "pivot_x", 20, 0, 0, ctypes_i16, 0 }, + { "pivot_y", 22, 0, 0, ctypes_i16, 0 }, + { "scale", 0, 0, 0, ctypes_ptr32, 0 }, + { "src", 16, 0, 0, ctypes_ptr32, 0 }, + { "start_value", 8, 0, 0, ctypes_i32, 0 }, + { "type", 4, 0, 0, ctypes_u8, 0 }, +}}; + +const be_ctypes_structure_t be_lv_meter_indicator_needle_line = { + 22, /* size in bytes */ + 8, /* number of elements */ + be_ctypes_instance_mappings, + (const be_ctypes_structure_item_t[8]) { + { "color", 20, 0, 0, ctypes_u16, 1 }, + { "end_value", 12, 0, 0, ctypes_i32, 0 }, + { "opa", 5, 0, 0, ctypes_u8, 0 }, + { "r_mod", 18, 0, 0, ctypes_i16, 0 }, + { "scale", 0, 0, 0, ctypes_ptr32, 0 }, + { "start_value", 8, 0, 0, ctypes_i32, 0 }, + { "type", 4, 0, 0, ctypes_u8, 0 }, + { "width", 16, 0, 0, ctypes_u16, 0 }, +}}; + +const be_ctypes_structure_t be_lv_meter_indicator_arc = { + 28, /* size in bytes */ + 9, /* number of elements */ + be_ctypes_instance_mappings, + (const be_ctypes_structure_item_t[9]) { + { "color", 24, 0, 0, ctypes_u16, 1 }, + { "end_value", 12, 0, 0, ctypes_i32, 0 }, + { "opa", 5, 0, 0, ctypes_u8, 0 }, + { "r_mod", 26, 0, 0, ctypes_i16, 0 }, + { "scale", 0, 0, 0, ctypes_ptr32, 0 }, + { "src", 20, 0, 0, ctypes_ptr32, 0 }, + { "start_value", 8, 0, 0, ctypes_i32, 0 }, + { "type", 4, 0, 0, ctypes_u8, 0 }, + { "width", 16, 0, 0, ctypes_u16, 0 }, +}}; + +const be_ctypes_structure_t be_lv_meter_indicator_scale_lines = { + 23, /* size in bytes */ + 9, /* number of elements */ + be_ctypes_instance_mappings, + (const be_ctypes_structure_item_t[9]) { + { "color_end", 20, 0, 0, ctypes_u16, 1 }, + { "color_start", 18, 0, 0, ctypes_u16, 1 }, + { "end_value", 12, 0, 0, ctypes_i32, 0 }, + { "local_grad", 22, 0, 1, ctypes_bf, 0 }, + { "opa", 5, 0, 0, ctypes_u8, 0 }, + { "scale", 0, 0, 0, ctypes_ptr32, 0 }, + { "start_value", 8, 0, 0, ctypes_i32, 0 }, + { "type", 4, 0, 0, ctypes_u8, 0 }, + { "width_mod", 16, 0, 0, ctypes_i16, 0 }, +}}; + +const be_ctypes_structure_t be_lv_obj_class = { + 27, /* size in bytes */ + 10, /* number of elements */ + be_ctypes_instance_mappings, + (const be_ctypes_structure_item_t[10]) { + { "base_class", 0, 0, 0, ctypes_ptr32, 0 }, + { "constructor_cb", 4, 0, 0, ctypes_ptr32, 0 }, + { "destructor_cb", 8, 0, 0, ctypes_ptr32, 0 }, + { "editable", 24, 0, 2, ctypes_bf, 0 }, + { "event_cb", 16, 0, 0, ctypes_ptr32, 0 }, + { "group_def", 24, 2, 2, ctypes_bf, 0 }, + { "height_def", 22, 0, 0, ctypes_i16, 0 }, + { "instance_size", 24, 4, 16, ctypes_bf, 0 }, + { "user_data", 12, 0, 0, ctypes_ptr32, 0 }, + { "width_def", 20, 0, 0, ctypes_i16, 0 }, +}}; + +const be_ctypes_structure_t be_lv_event = { + 25, /* size in bytes */ + 7, /* number of elements */ + be_ctypes_instance_mappings, + (const be_ctypes_structure_item_t[7]) { + { "code", 8, 0, 0, ctypes_i32, 0 }, + { "current_target", 4, 0, 0, ctypes_ptr32, 0 }, + { "deleted", 24, 0, 1, ctypes_bf, 0 }, + { "param", 16, 0, 0, ctypes_ptr32, 0 }, + { "prev", 20, 0, 0, ctypes_ptr32, 0 }, + { "target", 0, 0, 0, ctypes_ptr32, 0 }, + { "user_data", 12, 0, 0, ctypes_ptr32, 0 }, +}}; + +static const char * be_ctypes_instance_mappings[] = { + "lv_color", + NULL +}; + +static be_define_ctypes_class(lv_area, &be_lv_area, &be_class_ctypes, "lv_area"); +static be_define_ctypes_class(lv_draw_img_dsc, &be_lv_draw_img_dsc, &be_class_ctypes, "lv_draw_img_dsc"); +static be_define_ctypes_class(lv_draw_line_dsc, &be_lv_draw_line_dsc, &be_class_ctypes, "lv_draw_line_dsc"); +static be_define_ctypes_class(lv_draw_mask_angle_param, &be_lv_draw_mask_angle_param, &be_class_ctypes, "lv_draw_mask_angle_param"); +static be_define_ctypes_class(lv_draw_mask_angle_param_cfg, &be_lv_draw_mask_angle_param_cfg, &be_class_ctypes, "lv_draw_mask_angle_param_cfg"); +static be_define_ctypes_class(lv_draw_mask_common_dsc, &be_lv_draw_mask_common_dsc, &be_class_ctypes, "lv_draw_mask_common_dsc"); +static be_define_ctypes_class(lv_draw_mask_fade_param, &be_lv_draw_mask_fade_param, &be_class_ctypes, "lv_draw_mask_fade_param"); +static be_define_ctypes_class(lv_draw_mask_fade_param_cfg, &be_lv_draw_mask_fade_param_cfg, &be_class_ctypes, "lv_draw_mask_fade_param_cfg"); +static be_define_ctypes_class(lv_draw_mask_line_param, &be_lv_draw_mask_line_param, &be_class_ctypes, "lv_draw_mask_line_param"); +static be_define_ctypes_class(lv_draw_mask_line_param_cfg, &be_lv_draw_mask_line_param_cfg, &be_class_ctypes, "lv_draw_mask_line_param_cfg"); +static be_define_ctypes_class(lv_draw_mask_map_param, &be_lv_draw_mask_map_param, &be_class_ctypes, "lv_draw_mask_map_param"); +static be_define_ctypes_class(lv_draw_mask_map_param_cfg, &be_lv_draw_mask_map_param_cfg, &be_class_ctypes, "lv_draw_mask_map_param_cfg"); +static be_define_ctypes_class(lv_draw_mask_radius_param, &be_lv_draw_mask_radius_param, &be_class_ctypes, "lv_draw_mask_radius_param"); +static be_define_ctypes_class(lv_draw_mask_radius_param_cfg, &be_lv_draw_mask_radius_param_cfg, &be_class_ctypes, "lv_draw_mask_radius_param_cfg"); +static be_define_ctypes_class(lv_draw_mask_saved, &be_lv_draw_mask_saved, &be_class_ctypes, "lv_draw_mask_saved"); +static be_define_ctypes_class(lv_draw_rect_dsc, &be_lv_draw_rect_dsc, &be_class_ctypes, "lv_draw_rect_dsc"); +static be_define_ctypes_class(lv_event, &be_lv_event, &be_class_ctypes, "lv_event"); +static be_define_ctypes_class(lv_meter_indicator, &be_lv_meter_indicator, &be_class_ctypes, "lv_meter_indicator"); +static be_define_ctypes_class(lv_meter_indicator_arc, &be_lv_meter_indicator_arc, &be_class_ctypes, "lv_meter_indicator_arc"); +static be_define_ctypes_class(lv_meter_indicator_needle_img, &be_lv_meter_indicator_needle_img, &be_class_ctypes, "lv_meter_indicator_needle_img"); +static be_define_ctypes_class(lv_meter_indicator_needle_line, &be_lv_meter_indicator_needle_line, &be_class_ctypes, "lv_meter_indicator_needle_line"); +static be_define_ctypes_class(lv_meter_indicator_scale_lines, &be_lv_meter_indicator_scale_lines, &be_class_ctypes, "lv_meter_indicator_scale_lines"); +static be_define_ctypes_class(lv_meter_scale, &be_lv_meter_scale, &be_class_ctypes, "lv_meter_scale"); +static be_define_ctypes_class(lv_obj_class, &be_lv_obj_class, &be_class_ctypes, "lv_obj_class"); +static be_define_ctypes_class(lv_point, &be_lv_point, &be_class_ctypes, "lv_point"); +static be_define_ctypes_class(lv_sqrt_res, &be_lv_sqrt_res, &be_class_ctypes, "lv_sqrt_res"); + +void be_load_ctypes_lvgl_definitions_lib(bvm *vm) { + ctypes_register_class(vm, &be_class_lv_area, &be_lv_area); + ctypes_register_class(vm, &be_class_lv_draw_img_dsc, &be_lv_draw_img_dsc); + ctypes_register_class(vm, &be_class_lv_draw_line_dsc, &be_lv_draw_line_dsc); + ctypes_register_class(vm, &be_class_lv_draw_mask_angle_param, &be_lv_draw_mask_angle_param); + ctypes_register_class(vm, &be_class_lv_draw_mask_angle_param_cfg, &be_lv_draw_mask_angle_param_cfg); + ctypes_register_class(vm, &be_class_lv_draw_mask_common_dsc, &be_lv_draw_mask_common_dsc); + ctypes_register_class(vm, &be_class_lv_draw_mask_fade_param, &be_lv_draw_mask_fade_param); + ctypes_register_class(vm, &be_class_lv_draw_mask_fade_param_cfg, &be_lv_draw_mask_fade_param_cfg); + ctypes_register_class(vm, &be_class_lv_draw_mask_line_param, &be_lv_draw_mask_line_param); + ctypes_register_class(vm, &be_class_lv_draw_mask_line_param_cfg, &be_lv_draw_mask_line_param_cfg); + ctypes_register_class(vm, &be_class_lv_draw_mask_map_param, &be_lv_draw_mask_map_param); + ctypes_register_class(vm, &be_class_lv_draw_mask_map_param_cfg, &be_lv_draw_mask_map_param_cfg); + ctypes_register_class(vm, &be_class_lv_draw_mask_radius_param, &be_lv_draw_mask_radius_param); + ctypes_register_class(vm, &be_class_lv_draw_mask_radius_param_cfg, &be_lv_draw_mask_radius_param_cfg); + ctypes_register_class(vm, &be_class_lv_draw_mask_saved, &be_lv_draw_mask_saved); + ctypes_register_class(vm, &be_class_lv_draw_rect_dsc, &be_lv_draw_rect_dsc); + ctypes_register_class(vm, &be_class_lv_event, &be_lv_event); + ctypes_register_class(vm, &be_class_lv_meter_indicator, &be_lv_meter_indicator); + ctypes_register_class(vm, &be_class_lv_meter_indicator_arc, &be_lv_meter_indicator_arc); + ctypes_register_class(vm, &be_class_lv_meter_indicator_needle_img, &be_lv_meter_indicator_needle_img); + ctypes_register_class(vm, &be_class_lv_meter_indicator_needle_line, &be_lv_meter_indicator_needle_line); + ctypes_register_class(vm, &be_class_lv_meter_indicator_scale_lines, &be_lv_meter_indicator_scale_lines); + ctypes_register_class(vm, &be_class_lv_meter_scale, &be_lv_meter_scale); + ctypes_register_class(vm, &be_class_lv_obj_class, &be_lv_obj_class); + ctypes_register_class(vm, &be_class_lv_point, &be_lv_point); + ctypes_register_class(vm, &be_class_lv_sqrt_res, &be_lv_sqrt_res); +} + +be_ctypes_class_by_name_t be_ctypes_lvgl_classes[] = { + { "lv_area", &be_class_lv_area }, + { "lv_draw_img_dsc", &be_class_lv_draw_img_dsc }, + { "lv_draw_line_dsc", &be_class_lv_draw_line_dsc }, + { "lv_draw_mask_angle_param", &be_class_lv_draw_mask_angle_param }, + { "lv_draw_mask_angle_param_cfg", &be_class_lv_draw_mask_angle_param_cfg }, + { "lv_draw_mask_common_dsc", &be_class_lv_draw_mask_common_dsc }, + { "lv_draw_mask_fade_param", &be_class_lv_draw_mask_fade_param }, + { "lv_draw_mask_fade_param_cfg", &be_class_lv_draw_mask_fade_param_cfg }, + { "lv_draw_mask_line_param", &be_class_lv_draw_mask_line_param }, + { "lv_draw_mask_line_param_cfg", &be_class_lv_draw_mask_line_param_cfg }, + { "lv_draw_mask_map_param", &be_class_lv_draw_mask_map_param }, + { "lv_draw_mask_map_param_cfg", &be_class_lv_draw_mask_map_param_cfg }, + { "lv_draw_mask_radius_param", &be_class_lv_draw_mask_radius_param }, + { "lv_draw_mask_radius_param_cfg", &be_class_lv_draw_mask_radius_param_cfg }, + { "lv_draw_mask_saved", &be_class_lv_draw_mask_saved }, + { "lv_draw_rect_dsc", &be_class_lv_draw_rect_dsc }, + { "lv_event", &be_class_lv_event }, + { "lv_meter_indicator", &be_class_lv_meter_indicator }, + { "lv_meter_indicator_arc", &be_class_lv_meter_indicator_arc }, + { "lv_meter_indicator_needle_img", &be_class_lv_meter_indicator_needle_img }, + { "lv_meter_indicator_needle_line", &be_class_lv_meter_indicator_needle_line }, + { "lv_meter_indicator_scale_lines", &be_class_lv_meter_indicator_scale_lines }, + { "lv_meter_scale", &be_class_lv_meter_scale }, + { "lv_obj_class", &be_class_lv_obj_class }, + { "lv_point", &be_class_lv_point }, + { "lv_sqrt_res", &be_class_lv_sqrt_res }, +}; +const size_t be_ctypes_lvgl_classes_size = sizeof(be_ctypes_lvgl_classes)/sizeof(be_ctypes_lvgl_classes[0]); + +/********************************************************************/ + +#endif // USE_LVGL \ No newline at end of file diff --git a/lib/libesp32/berry/default/be_lvgl_glob_lib.c b/lib/libesp32/berry/default/be_lvgl_glob_lib.c new file mode 100644 index 000000000..06827fc0e --- /dev/null +++ b/lib/libesp32/berry/default/be_lvgl_glob_lib.c @@ -0,0 +1,826 @@ +/******************************************************************** + * Tasmota LVGL lv_signal_bars widget + *******************************************************************/ +#include "be_constobj.h" + +#ifdef USE_LVGL + +#include "lvgl.h" + +/******************************************************************** +** Solidified function: get_object_from_ptr +********************************************************************/ +be_local_closure(LVGL_glob_get_object_from_ptr, /* name */ + be_nested_proto( + 5, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(cb_obj), + /* K1 */ be_nested_str(find), + }), + &be_const_str_get_object_from_ptr, + &be_const_str_solidified, + ( &(const binstruction[10]) { /* code */ + 0x88080100, // 0000 GETMBR R2 R0 K0 + 0x4C0C0000, // 0001 LDNIL R3 + 0x20080403, // 0002 NE R2 R2 R3 + 0x780A0004, // 0003 JMPF R2 #0009 + 0x88080100, // 0004 GETMBR R2 R0 K0 + 0x8C080501, // 0005 GETMET R2 R2 K1 + 0x5C100200, // 0006 MOVE R4 R1 + 0x7C080400, // 0007 CALL R2 2 + 0x80040400, // 0008 RET 1 R2 + 0x80000000, // 0009 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: widget_event_impl +********************************************************************/ +be_local_closure(LVGL_glob_widget_event_impl, /* name */ + be_nested_proto( + 12, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 9]) { /* constants */ + /* K0 */ be_nested_str(introspect), + /* K1 */ be_nested_str(lv), + /* K2 */ be_nested_str(lv_obj_class), + /* K3 */ be_nested_str(lv_event), + /* K4 */ be_nested_str(target), + /* K5 */ be_nested_str(get_object_from_ptr), + /* K6 */ be_nested_str(instance), + /* K7 */ be_nested_str(get), + /* K8 */ be_nested_str(widget_event), + }), + &be_const_str_widget_event_impl, + &be_const_str_solidified, + ( &(const binstruction[28]) { /* code */ + 0xA40E0000, // 0000 IMPORT R3 K0 + 0xB8120200, // 0001 GETNGBL R4 K1 + 0x8C100902, // 0002 GETMET R4 R4 K2 + 0x5C180200, // 0003 MOVE R6 R1 + 0x7C100400, // 0004 CALL R4 2 + 0xB8160200, // 0005 GETNGBL R5 K1 + 0x8C140B03, // 0006 GETMET R5 R5 K3 + 0x5C1C0400, // 0007 MOVE R7 R2 + 0x7C140400, // 0008 CALL R5 2 + 0x88180B04, // 0009 GETMBR R6 R5 K4 + 0x8C1C0105, // 000A GETMET R7 R0 K5 + 0x5C240C00, // 000B MOVE R9 R6 + 0x7C1C0400, // 000C CALL R7 2 + 0x60200004, // 000D GETGBL R8 G4 + 0x5C240E00, // 000E MOVE R9 R7 + 0x7C200200, // 000F CALL R8 1 + 0x1C201106, // 0010 EQ R8 R8 K6 + 0x78220008, // 0011 JMPF R8 #001B + 0x8C200707, // 0012 GETMET R8 R3 K7 + 0x5C280E00, // 0013 MOVE R10 R7 + 0x582C0008, // 0014 LDCONST R11 K8 + 0x7C200600, // 0015 CALL R8 3 + 0x78220003, // 0016 JMPF R8 #001B + 0x8C200F08, // 0017 GETMET R8 R7 K8 + 0x5C280800, // 0018 MOVE R10 R4 + 0x5C2C0A00, // 0019 MOVE R11 R5 + 0x7C200600, // 001A CALL R8 3 + 0x80000000, // 001B RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: lvgl_event_dispatch +********************************************************************/ +be_local_closure(LVGL_glob_lvgl_event_dispatch, /* name */ + be_nested_proto( + 10, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 7]) { /* constants */ + /* K0 */ be_nested_str(introspect), + /* K1 */ be_nested_str(lv), + /* K2 */ be_nested_str(lv_event), + /* K3 */ be_nested_str(toptr), + /* K4 */ be_nested_str(target), + /* K5 */ be_nested_str(cb_event_closure), + /* K6 */ be_nested_str(get_object_from_ptr), + }), + &be_const_str_lvgl_event_dispatch, + &be_const_str_solidified, + ( &(const binstruction[18]) { /* code */ + 0xA40A0000, // 0000 IMPORT R2 K0 + 0xB80E0200, // 0001 GETNGBL R3 K1 + 0x8C0C0702, // 0002 GETMET R3 R3 K2 + 0x8C140503, // 0003 GETMET R5 R2 K3 + 0x5C1C0200, // 0004 MOVE R7 R1 + 0x7C140400, // 0005 CALL R5 2 + 0x7C0C0400, // 0006 CALL R3 2 + 0x88100704, // 0007 GETMBR R4 R3 K4 + 0x88140105, // 0008 GETMBR R5 R0 K5 + 0x94140A04, // 0009 GETIDX R5 R5 R4 + 0x8C180106, // 000A GETMET R6 R0 K6 + 0x5C200800, // 000B MOVE R8 R4 + 0x7C180400, // 000C CALL R6 2 + 0x5C1C0A00, // 000D MOVE R7 R5 + 0x5C200C00, // 000E MOVE R8 R6 + 0x5C240600, // 000F MOVE R9 R3 + 0x7C1C0400, // 0010 CALL R7 2 + 0x80000000, // 0011 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: widget_dtor_impl +********************************************************************/ +be_local_closure(LVGL_glob_widget_dtor_impl, /* name */ + be_nested_proto( + 10, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 7]) { /* constants */ + /* K0 */ be_nested_str(introspect), + /* K1 */ be_nested_str(lv), + /* K2 */ be_nested_str(lv_obj_class), + /* K3 */ be_nested_str(get_object_from_ptr), + /* K4 */ be_nested_str(instance), + /* K5 */ be_nested_str(get), + /* K6 */ be_nested_str(widget_destructor), + }), + &be_const_str_widget_dtor_impl, + &be_const_str_solidified, + ( &(const binstruction[22]) { /* code */ + 0xA40E0000, // 0000 IMPORT R3 K0 + 0xB8120200, // 0001 GETNGBL R4 K1 + 0x8C100902, // 0002 GETMET R4 R4 K2 + 0x5C180200, // 0003 MOVE R6 R1 + 0x7C100400, // 0004 CALL R4 2 + 0x8C140103, // 0005 GETMET R5 R0 K3 + 0x5C1C0400, // 0006 MOVE R7 R2 + 0x7C140400, // 0007 CALL R5 2 + 0x60180004, // 0008 GETGBL R6 G4 + 0x5C1C0A00, // 0009 MOVE R7 R5 + 0x7C180200, // 000A CALL R6 1 + 0x1C180D04, // 000B EQ R6 R6 K4 + 0x781A0007, // 000C JMPF R6 #0015 + 0x8C180705, // 000D GETMET R6 R3 K5 + 0x5C200A00, // 000E MOVE R8 R5 + 0x58240006, // 000F LDCONST R9 K6 + 0x7C180600, // 0010 CALL R6 3 + 0x781A0002, // 0011 JMPF R6 #0015 + 0x8C180B06, // 0012 GETMET R6 R5 K6 + 0x5C200800, // 0013 MOVE R8 R4 + 0x7C180400, // 0014 CALL R6 2 + 0x80000000, // 0015 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: register_obj +********************************************************************/ +be_local_closure(LVGL_glob_register_obj, /* name */ + be_nested_proto( + 4, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(cb_obj), + /* K1 */ be_nested_str(_p), + }), + &be_const_str_register_obj, + &be_const_str_solidified, + ( &(const binstruction[11]) { /* code */ + 0x88080100, // 0000 GETMBR R2 R0 K0 + 0x4C0C0000, // 0001 LDNIL R3 + 0x1C080403, // 0002 EQ R2 R2 R3 + 0x780A0002, // 0003 JMPF R2 #0007 + 0x60080013, // 0004 GETGBL R2 G19 + 0x7C080000, // 0005 CALL R2 0 + 0x90020002, // 0006 SETMBR R0 K0 R2 + 0x88080301, // 0007 GETMBR R2 R1 K1 + 0x880C0100, // 0008 GETMBR R3 R0 K0 + 0x980C0401, // 0009 SETIDX R3 R2 R1 + 0x80000000, // 000A RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: gen_cb +********************************************************************/ +be_local_closure(LVGL_glob_gen_cb, /* name */ + be_nested_proto( + 8, /* nstack */ + 5, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 1, /* has sup protos */ + ( &(const struct bproto*[ 1]) { + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 1, /* has upvals */ + ( &(const bupvaldesc[ 1]) { /* upvals */ + be_local_const_upval(1, 0), + }), + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_str(lvgl_event_dispatch), + }), + &be_const_str__X3Clambda_X3E, + &be_const_str_solidified, + ( &(const binstruction[ 5]) { /* code */ + 0x68040000, // 0000 GETUPV R1 U0 + 0x8C040300, // 0001 GETMET R1 R1 K0 + 0x5C0C0000, // 0002 MOVE R3 R0 + 0x7C040400, // 0003 CALL R1 2 + 0x80040200, // 0004 RET 1 R1 + }) + ), + }), + 1, /* has constants */ + ( &(const bvalue[ 8]) { /* constants */ + /* K0 */ be_nested_str(lv_event_cb), + /* K1 */ be_nested_str(cb_event_closure), + /* K2 */ be_nested_str(event_cb), + /* K3 */ be_nested_str(tasmota), + /* K4 */ be_nested_str(gen_cb), + /* K5 */ be_nested_str(register_obj), + /* K6 */ be_nested_str(null_cb), + /* K7 */ be_nested_str(cb_do_nothing), + }), + &be_const_str_gen_cb, + &be_const_str_solidified, + ( &(const binstruction[41]) { /* code */ + 0x1C140300, // 0000 EQ R5 R1 K0 + 0x78160018, // 0001 JMPF R5 #001B + 0x88140101, // 0002 GETMBR R5 R0 K1 + 0x4C180000, // 0003 LDNIL R6 + 0x1C140A06, // 0004 EQ R5 R5 R6 + 0x78160002, // 0005 JMPF R5 #0009 + 0x60140013, // 0006 GETGBL R5 G19 + 0x7C140000, // 0007 CALL R5 0 + 0x90020205, // 0008 SETMBR R0 K1 R5 + 0x88140102, // 0009 GETMBR R5 R0 K2 + 0x4C180000, // 000A LDNIL R6 + 0x1C140A06, // 000B EQ R5 R5 R6 + 0x78160004, // 000C JMPF R5 #0012 + 0xB8160600, // 000D GETNGBL R5 K3 + 0x8C140B04, // 000E GETMET R5 R5 K4 + 0x841C0000, // 000F CLOSURE R7 P0 + 0x7C140400, // 0010 CALL R5 2 + 0x90020405, // 0011 SETMBR R0 K2 R5 + 0x8C140105, // 0012 GETMET R5 R0 K5 + 0x5C1C0600, // 0013 MOVE R7 R3 + 0x7C140400, // 0014 CALL R5 2 + 0x88140101, // 0015 GETMBR R5 R0 K1 + 0x98140802, // 0016 SETIDX R5 R4 R2 + 0x88140102, // 0017 GETMBR R5 R0 K2 + 0xA0000000, // 0018 CLOSE R0 + 0x80040A00, // 0019 RET 1 R5 + 0x7002000B, // 001A JMP #0027 + 0x88140106, // 001B GETMBR R5 R0 K6 + 0x4C180000, // 001C LDNIL R6 + 0x1C140A06, // 001D EQ R5 R5 R6 + 0x78160004, // 001E JMPF R5 #0024 + 0xB8160600, // 001F GETNGBL R5 K3 + 0x8C140B04, // 0020 GETMET R5 R5 K4 + 0x881C0107, // 0021 GETMBR R7 R0 K7 + 0x7C140400, // 0022 CALL R5 2 + 0x90020C05, // 0023 SETMBR R0 K6 R5 + 0x88140106, // 0024 GETMBR R5 R0 K6 + 0xA0000000, // 0025 CLOSE R0 + 0x80040A00, // 0026 RET 1 R5 + 0xA0000000, // 0027 CLOSE R0 + 0x80000000, // 0028 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: deregister_obj +********************************************************************/ +be_local_closure(LVGL_glob_deregister_obj, /* name */ + be_nested_proto( + 5, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(cb_obj), + /* K1 */ be_nested_str(remove), + /* K2 */ be_nested_str(cb_event_closure), + }), + &be_const_str_deregister_obj, + &be_const_str_solidified, + ( &(const binstruction[17]) { /* code */ + 0x88080100, // 0000 GETMBR R2 R0 K0 + 0x4C0C0000, // 0001 LDNIL R3 + 0x20080403, // 0002 NE R2 R2 R3 + 0x780A0003, // 0003 JMPF R2 #0008 + 0x88080100, // 0004 GETMBR R2 R0 K0 + 0x8C080501, // 0005 GETMET R2 R2 K1 + 0x5C100200, // 0006 MOVE R4 R1 + 0x7C080400, // 0007 CALL R2 2 + 0x88080102, // 0008 GETMBR R2 R0 K2 + 0x4C0C0000, // 0009 LDNIL R3 + 0x20080403, // 000A NE R2 R2 R3 + 0x780A0003, // 000B JMPF R2 #0010 + 0x88080102, // 000C GETMBR R2 R0 K2 + 0x8C080501, // 000D GETMET R2 R2 K1 + 0x5C100200, // 000E MOVE R4 R1 + 0x7C080400, // 000F CALL R2 2 + 0x80000000, // 0010 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: widget_cb +********************************************************************/ +be_local_closure(LVGL_glob_widget_cb, /* name */ + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 1, /* has sup protos */ + ( &(const struct bproto*[ 3]) { + be_nested_proto( + 6, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 1, /* has upvals */ + ( &(const bupvaldesc[ 1]) { /* upvals */ + be_local_const_upval(1, 0), + }), + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_str(widget_ctor_impl), + }), + &be_const_str__X3Clambda_X3E, + &be_const_str_solidified, + ( &(const binstruction[ 6]) { /* code */ + 0x68080000, // 0000 GETUPV R2 U0 + 0x8C080500, // 0001 GETMET R2 R2 K0 + 0x5C100000, // 0002 MOVE R4 R0 + 0x5C140200, // 0003 MOVE R5 R1 + 0x7C080600, // 0004 CALL R2 3 + 0x80040400, // 0005 RET 1 R2 + }) + ), + be_nested_proto( + 6, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 1, /* has upvals */ + ( &(const bupvaldesc[ 1]) { /* upvals */ + be_local_const_upval(1, 0), + }), + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_str(widget_dtor_impl), + }), + &be_const_str__X3Clambda_X3E, + &be_const_str_solidified, + ( &(const binstruction[ 6]) { /* code */ + 0x68080000, // 0000 GETUPV R2 U0 + 0x8C080500, // 0001 GETMET R2 R2 K0 + 0x5C100000, // 0002 MOVE R4 R0 + 0x5C140200, // 0003 MOVE R5 R1 + 0x7C080600, // 0004 CALL R2 3 + 0x80040400, // 0005 RET 1 R2 + }) + ), + be_nested_proto( + 6, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 1, /* has upvals */ + ( &(const bupvaldesc[ 1]) { /* upvals */ + be_local_const_upval(1, 0), + }), + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_str(widget_event_impl), + }), + &be_const_str__X3Clambda_X3E, + &be_const_str_solidified, + ( &(const binstruction[ 6]) { /* code */ + 0x68080000, // 0000 GETUPV R2 U0 + 0x8C080500, // 0001 GETMET R2 R2 K0 + 0x5C100000, // 0002 MOVE R4 R0 + 0x5C140200, // 0003 MOVE R5 R1 + 0x7C080600, // 0004 CALL R2 3 + 0x80040400, // 0005 RET 1 R2 + }) + ), + }), + 1, /* has constants */ + ( &(const bvalue[15]) { /* constants */ + /* K0 */ be_nested_str(widget_ctor_cb), + /* K1 */ be_nested_str(tasmota), + /* K2 */ be_nested_str(gen_cb), + /* K3 */ be_nested_str(widget_dtor_cb), + /* K4 */ be_nested_str(widget_event_cb), + /* K5 */ be_nested_str(widget_struct_default), + /* K6 */ be_nested_str(lv), + /* K7 */ be_nested_str(lv_obj_class), + /* K8 */ be_nested_str(lv_obj), + /* K9 */ be_nested_str(_class), + /* K10 */ be_nested_str(copy), + /* K11 */ be_nested_str(base_class), + /* K12 */ be_nested_str(constructor_cb), + /* K13 */ be_nested_str(destructor_cb), + /* K14 */ be_nested_str(event_cb), + }), + &be_const_str_widget_cb, + &be_const_str_solidified, + ( &(const binstruction[56]) { /* code */ + 0x88040100, // 0000 GETMBR R1 R0 K0 + 0x4C080000, // 0001 LDNIL R2 + 0x1C040202, // 0002 EQ R1 R1 R2 + 0x78060004, // 0003 JMPF R1 #0009 + 0xB8060200, // 0004 GETNGBL R1 K1 + 0x8C040302, // 0005 GETMET R1 R1 K2 + 0x840C0000, // 0006 CLOSURE R3 P0 + 0x7C040400, // 0007 CALL R1 2 + 0x90020001, // 0008 SETMBR R0 K0 R1 + 0x88040103, // 0009 GETMBR R1 R0 K3 + 0x4C080000, // 000A LDNIL R2 + 0x1C040202, // 000B EQ R1 R1 R2 + 0x78060004, // 000C JMPF R1 #0012 + 0xB8060200, // 000D GETNGBL R1 K1 + 0x8C040302, // 000E GETMET R1 R1 K2 + 0x840C0001, // 000F CLOSURE R3 P1 + 0x7C040400, // 0010 CALL R1 2 + 0x90020601, // 0011 SETMBR R0 K3 R1 + 0x88040104, // 0012 GETMBR R1 R0 K4 + 0x4C080000, // 0013 LDNIL R2 + 0x1C040202, // 0014 EQ R1 R1 R2 + 0x78060004, // 0015 JMPF R1 #001B + 0xB8060200, // 0016 GETNGBL R1 K1 + 0x8C040302, // 0017 GETMET R1 R1 K2 + 0x840C0002, // 0018 CLOSURE R3 P2 + 0x7C040400, // 0019 CALL R1 2 + 0x90020801, // 001A SETMBR R0 K4 R1 + 0x88040105, // 001B GETMBR R1 R0 K5 + 0x4C080000, // 001C LDNIL R2 + 0x1C040202, // 001D EQ R1 R1 R2 + 0x78060016, // 001E JMPF R1 #0036 + 0xB8060C00, // 001F GETNGBL R1 K6 + 0x8C040307, // 0020 GETMET R1 R1 K7 + 0xB80E0C00, // 0021 GETNGBL R3 K6 + 0x880C0708, // 0022 GETMBR R3 R3 K8 + 0x880C0709, // 0023 GETMBR R3 R3 K9 + 0x7C040400, // 0024 CALL R1 2 + 0x8C04030A, // 0025 GETMET R1 R1 K10 + 0x7C040200, // 0026 CALL R1 1 + 0x90020A01, // 0027 SETMBR R0 K5 R1 + 0x88040105, // 0028 GETMBR R1 R0 K5 + 0xB80A0C00, // 0029 GETNGBL R2 K6 + 0x88080508, // 002A GETMBR R2 R2 K8 + 0x88080509, // 002B GETMBR R2 R2 K9 + 0x90061602, // 002C SETMBR R1 K11 R2 + 0x88040105, // 002D GETMBR R1 R0 K5 + 0x88080100, // 002E GETMBR R2 R0 K0 + 0x90061802, // 002F SETMBR R1 K12 R2 + 0x88040105, // 0030 GETMBR R1 R0 K5 + 0x88080103, // 0031 GETMBR R2 R0 K3 + 0x90061A02, // 0032 SETMBR R1 K13 R2 + 0x88040105, // 0033 GETMBR R1 R0 K5 + 0x88080104, // 0034 GETMBR R2 R0 K4 + 0x90061C02, // 0035 SETMBR R1 K14 R2 + 0xA0000000, // 0036 CLOSE R0 + 0x80000000, // 0037 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: _anonymous_ +********************************************************************/ +be_local_closure(LVGL_glob__anonymous_, /* name */ + be_nested_proto( + 2, /* nstack */ + 0, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_str(LVG_X3A_X20call_X20to_X20unsupported_X20callback), + }), + &be_const_str__anonymous_, + &be_const_str_solidified, + ( &(const binstruction[ 4]) { /* code */ + 0x60000001, // 0000 GETGBL R0 G1 + 0x58040000, // 0001 LDCONST R1 K0 + 0x7C000200, // 0002 CALL R0 1 + 0x80000000, // 0003 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: create_custom_widget +********************************************************************/ +be_local_closure(LVGL_glob_create_custom_widget, /* name */ + be_nested_proto( + 10, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[27]) { /* constants */ + /* K0 */ be_nested_str(introspect), + /* K1 */ be_nested_str(lv), + /* K2 */ be_nested_str(lv_obj), + /* K3 */ be_nested_str(value_error), + /* K4 */ be_nested_str(arg_X20must_X20be_X20a_X20subclass_X20of_X20lv_obj), + /* K5 */ be_nested_str(widget_struct_by_class), + /* K6 */ be_nested_str(find), + /* K7 */ be_nested_str(widget_cb), + /* K8 */ be_nested_str(widget_struct_default), + /* K9 */ be_nested_str(copy), + /* K10 */ be_nested_str(base_class), + /* K11 */ be_nested_str(_class), + /* K12 */ be_nested_str(get), + /* K13 */ be_nested_str(widget_width_def), + /* K14 */ be_nested_str(width_def), + /* K15 */ be_nested_str(widget_height_def), + /* K16 */ be_nested_str(height_def), + /* K17 */ be_nested_str(widget_editable), + /* K18 */ be_nested_str(editable), + /* K19 */ be_nested_str(widget_group_def), + /* K20 */ be_nested_str(group_def), + /* K21 */ be_nested_str(widget_instance_size), + /* K22 */ be_nested_str(instance_size), + /* K23 */ be_nested_str(obj_class_create_obj), + /* K24 */ be_nested_str(_p), + /* K25 */ be_nested_str(register_obj), + /* K26 */ be_nested_str(class_init_obj), + }), + &be_const_str_create_custom_widget, + &be_const_str_solidified, + ( &(const binstruction[86]) { /* code */ + 0xA40E0000, // 0000 IMPORT R3 K0 + 0x6010000F, // 0001 GETGBL R4 G15 + 0x5C140200, // 0002 MOVE R5 R1 + 0xB81A0200, // 0003 GETNGBL R6 K1 + 0x88180D02, // 0004 GETMBR R6 R6 K2 + 0x7C100400, // 0005 CALL R4 2 + 0x74120000, // 0006 JMPT R4 #0008 + 0xB0060704, // 0007 RAISE 1 K3 K4 + 0x88100105, // 0008 GETMBR R4 R0 K5 + 0x4C140000, // 0009 LDNIL R5 + 0x1C100805, // 000A EQ R4 R4 R5 + 0x78120002, // 000B JMPF R4 #000F + 0x60100013, // 000C GETGBL R4 G19 + 0x7C100000, // 000D CALL R4 0 + 0x90020A04, // 000E SETMBR R0 K5 R4 + 0x60100005, // 000F GETGBL R4 G5 + 0x5C140200, // 0010 MOVE R5 R1 + 0x7C100200, // 0011 CALL R4 1 + 0x88140105, // 0012 GETMBR R5 R0 K5 + 0x8C140B06, // 0013 GETMET R5 R5 K6 + 0x5C1C0800, // 0014 MOVE R7 R4 + 0x7C140400, // 0015 CALL R5 2 + 0x4C180000, // 0016 LDNIL R6 + 0x1C180A06, // 0017 EQ R6 R5 R6 + 0x781A002F, // 0018 JMPF R6 #0049 + 0x8C180107, // 0019 GETMET R6 R0 K7 + 0x7C180200, // 001A CALL R6 1 + 0x88180108, // 001B GETMBR R6 R0 K8 + 0x8C180D09, // 001C GETMET R6 R6 K9 + 0x7C180200, // 001D CALL R6 1 + 0x5C140C00, // 001E MOVE R5 R6 + 0x60180003, // 001F GETGBL R6 G3 + 0x5C1C0200, // 0020 MOVE R7 R1 + 0x7C180200, // 0021 CALL R6 1 + 0x88180D0B, // 0022 GETMBR R6 R6 K11 + 0x90161406, // 0023 SETMBR R5 K10 R6 + 0x8C18070C, // 0024 GETMET R6 R3 K12 + 0x5C200200, // 0025 MOVE R8 R1 + 0x5824000D, // 0026 LDCONST R9 K13 + 0x7C180600, // 0027 CALL R6 3 + 0x781A0001, // 0028 JMPF R6 #002B + 0x8818030D, // 0029 GETMBR R6 R1 K13 + 0x90161C06, // 002A SETMBR R5 K14 R6 + 0x8C18070C, // 002B GETMET R6 R3 K12 + 0x5C200200, // 002C MOVE R8 R1 + 0x5824000F, // 002D LDCONST R9 K15 + 0x7C180600, // 002E CALL R6 3 + 0x781A0001, // 002F JMPF R6 #0032 + 0x8818030F, // 0030 GETMBR R6 R1 K15 + 0x90162006, // 0031 SETMBR R5 K16 R6 + 0x8C18070C, // 0032 GETMET R6 R3 K12 + 0x5C200200, // 0033 MOVE R8 R1 + 0x58240011, // 0034 LDCONST R9 K17 + 0x7C180600, // 0035 CALL R6 3 + 0x781A0001, // 0036 JMPF R6 #0039 + 0x88180311, // 0037 GETMBR R6 R1 K17 + 0x90162406, // 0038 SETMBR R5 K18 R6 + 0x8C18070C, // 0039 GETMET R6 R3 K12 + 0x5C200200, // 003A MOVE R8 R1 + 0x58240013, // 003B LDCONST R9 K19 + 0x7C180600, // 003C CALL R6 3 + 0x781A0001, // 003D JMPF R6 #0040 + 0x88180313, // 003E GETMBR R6 R1 K19 + 0x90162806, // 003F SETMBR R5 K20 R6 + 0x8C18070C, // 0040 GETMET R6 R3 K12 + 0x5C200200, // 0041 MOVE R8 R1 + 0x58240015, // 0042 LDCONST R9 K21 + 0x7C180600, // 0043 CALL R6 3 + 0x781A0001, // 0044 JMPF R6 #0047 + 0x88180315, // 0045 GETMBR R6 R1 K21 + 0x90162C06, // 0046 SETMBR R5 K22 R6 + 0x88180105, // 0047 GETMBR R6 R0 K5 + 0x98180805, // 0048 SETIDX R6 R4 R5 + 0xB81A0200, // 0049 GETNGBL R6 K1 + 0x8C180D17, // 004A GETMET R6 R6 K23 + 0x5C200A00, // 004B MOVE R8 R5 + 0x5C240400, // 004C MOVE R9 R2 + 0x7C180600, // 004D CALL R6 3 + 0x881C0D18, // 004E GETMBR R7 R6 K24 + 0x90063007, // 004F SETMBR R1 K24 R7 + 0x8C1C0119, // 0050 GETMET R7 R0 K25 + 0x5C240200, // 0051 MOVE R9 R1 + 0x7C1C0400, // 0052 CALL R7 2 + 0x8C1C031A, // 0053 GETMET R7 R1 K26 + 0x7C1C0200, // 0054 CALL R7 1 + 0x80000000, // 0055 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: widget_ctor_impl +********************************************************************/ +be_local_closure(LVGL_glob_widget_ctor_impl, /* name */ + be_nested_proto( + 10, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 9]) { /* constants */ + /* K0 */ be_nested_str(introspect), + /* K1 */ be_nested_str(lv), + /* K2 */ be_nested_str(lv_obj_class), + /* K3 */ be_nested_str(get_object_from_ptr), + /* K4 */ be_nested_str(cb_obj), + /* K5 */ be_nested_str(find), + /* K6 */ be_nested_str(instance), + /* K7 */ be_nested_str(get), + /* K8 */ be_nested_str(widget_constructor), + }), + &be_const_str_widget_ctor_impl, + &be_const_str_solidified, + ( &(const binstruction[29]) { /* code */ + 0xA40E0000, // 0000 IMPORT R3 K0 + 0xB8120200, // 0001 GETNGBL R4 K1 + 0x8C100902, // 0002 GETMET R4 R4 K2 + 0x5C180200, // 0003 MOVE R6 R1 + 0x7C100400, // 0004 CALL R4 2 + 0x8C140103, // 0005 GETMET R5 R0 K3 + 0x5C1C0400, // 0006 MOVE R7 R2 + 0x7C140400, // 0007 CALL R5 2 + 0x88180104, // 0008 GETMBR R6 R0 K4 + 0x8C180D05, // 0009 GETMET R6 R6 K5 + 0x5C200A00, // 000A MOVE R8 R5 + 0x7C180400, // 000B CALL R6 2 + 0x781A0001, // 000C JMPF R6 #000F + 0x88180104, // 000D GETMBR R6 R0 K4 + 0x94140C05, // 000E GETIDX R5 R6 R5 + 0x60180004, // 000F GETGBL R6 G4 + 0x5C1C0A00, // 0010 MOVE R7 R5 + 0x7C180200, // 0011 CALL R6 1 + 0x1C180D06, // 0012 EQ R6 R6 K6 + 0x781A0007, // 0013 JMPF R6 #001C + 0x8C180707, // 0014 GETMET R6 R3 K7 + 0x5C200A00, // 0015 MOVE R8 R5 + 0x58240008, // 0016 LDCONST R9 K8 + 0x7C180600, // 0017 CALL R6 3 + 0x781A0002, // 0018 JMPF R6 #001C + 0x8C180B08, // 0019 GETMET R6 R5 K8 + 0x5C200800, // 001A MOVE R8 R4 + 0x7C180400, // 001B CALL R6 2 + 0x80000000, // 001C RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified class: LVGL_glob +********************************************************************/ +be_local_class(LVGL_glob, + 9, + NULL, + be_nested_map(20, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(widget_ctor_cb, 8), be_const_var(4) }, + { be_const_key(get_object_from_ptr, 4), be_const_closure(LVGL_glob_get_object_from_ptr_closure) }, + { be_const_key(cb_obj, 7), be_const_var(0) }, + { be_const_key(widget_struct_by_class, -1), be_const_var(8) }, + { be_const_key(widget_event_impl, -1), be_const_closure(LVGL_glob_widget_event_impl_closure) }, + { be_const_key(widget_dtor_cb, 6), be_const_var(5) }, + { be_const_key(cb_event_closure, -1), be_const_var(1) }, + { be_const_key(cb_do_nothing, 16), be_const_static_closure(LVGL_glob__anonymous__closure) }, + { be_const_key(null_cb, -1), be_const_var(3) }, + { be_const_key(register_obj, -1), be_const_closure(LVGL_glob_register_obj_closure) }, + { be_const_key(widget_dtor_impl, 9), be_const_closure(LVGL_glob_widget_dtor_impl_closure) }, + { be_const_key(gen_cb, -1), be_const_closure(LVGL_glob_gen_cb_closure) }, + { be_const_key(deregister_obj, -1), be_const_closure(LVGL_glob_deregister_obj_closure) }, + { be_const_key(widget_struct_default, 12), be_const_var(7) }, + { be_const_key(widget_event_cb, -1), be_const_var(6) }, + { be_const_key(widget_cb, -1), be_const_closure(LVGL_glob_widget_cb_closure) }, + { be_const_key(lvgl_event_dispatch, 3), be_const_closure(LVGL_glob_lvgl_event_dispatch_closure) }, + { be_const_key(event_cb, -1), be_const_var(2) }, + { be_const_key(create_custom_widget, -1), be_const_closure(LVGL_glob_create_custom_widget_closure) }, + { be_const_key(widget_ctor_impl, -1), be_const_closure(LVGL_glob_widget_ctor_impl_closure) }, + })), + be_str_literal("LVGL_glob") +); +/*******************************************************************/ + +void be_load_LVGL_glob_class(bvm *vm) { + be_pushntvclass(vm, &be_class_LVGL_glob); + be_setglobal(vm, "LVGL_glob"); + be_pop(vm, 1); +} + +#endif // USE_LVGL \ No newline at end of file diff --git a/lib/libesp32/berry/default/be_lvgl_module.c b/lib/libesp32/berry/default/be_lvgl_module.c new file mode 100644 index 000000000..890efd2ff --- /dev/null +++ b/lib/libesp32/berry/default/be_lvgl_module.c @@ -0,0 +1,692 @@ +/******************************************************************** + * Generated code, don't edit + *******************************************************************/ +/******************************************************************** + * LVGL Module + *******************************************************************/ +#include "be_constobj.h" + +#ifdef USE_LVGL + +#include "lvgl.h" +#include "be_lvgl.h" +#include "lv_theme_openhasp.h" + +extern int lv0_member(bvm *vm); // resolve virtual members + +extern int lv0_start(bvm *vm); + +extern int lv0_register_button_encoder(bvm *vm); // add buttons with encoder logic + +extern int lv0_load_montserrat_font(bvm *vm); +extern int lv0_load_seg7_font(bvm *vm); +extern int lv0_load_robotocondensed_latin1_font(bvm *vm); +extern int lv0_load_font(bvm *vm); +extern int lv0_load_freetype_font(bvm *vm); + +extern int lv0_screenshot(bvm *vm); + +static int lv_get_hor_res(void) { + return lv_disp_get_hor_res(lv_disp_get_default()); +} +static int lv_get_ver_res(void) { + return lv_disp_get_ver_res(lv_disp_get_default()); +} + +/* `lv` methods */ +const lvbe_call_c_t lv_func[] = { + + { "clamp_height", (void*) &lv_clamp_height, "i", "iiii" }, + { "clamp_width", (void*) &lv_clamp_width, "i", "iiii" }, + { "color_mix", (void*) &lv_color_mix, "lv.lv_color", "(lv.lv_color)(lv.lv_color)i" }, + { "dpx", (void*) &lv_dpx, "i", "i" }, + { "draw_arc", (void*) &lv_draw_arc, "", "iiiii(lv.lv_area)(lv.lv_draw_arc_dsc)" }, + { "draw_arc_dsc_init", (void*) &lv_draw_arc_dsc_init, "", "(lv.lv_draw_arc_dsc)" }, + { "draw_arc_get_area", (void*) &lv_draw_arc_get_area, "", "iiiiiib(lv.lv_area)" }, + { "draw_img", (void*) &lv_draw_img, "", "(lv.lv_area)(lv.lv_area).(lv.lv_draw_img_dsc)" }, + { "draw_img_dsc_init", (void*) &lv_draw_img_dsc_init, "", "(lv.lv_draw_img_dsc)" }, + { "draw_label", (void*) &lv_draw_label, "", "(lv.lv_area)(lv.lv_area)(lv.lv_draw_label_dsc)s(lv.lv_draw_label_hint)" }, + { "draw_label_dsc_init", (void*) &lv_draw_label_dsc_init, "", "(lv.lv_draw_label_dsc)" }, + { "draw_letter", (void*) &lv_draw_letter, "", "(lv.lv_point)(lv.lv_area)(lv.lv_font)i(lv.lv_color)ii" }, + { "draw_line", (void*) &lv_draw_line, "", "(lv.lv_point)(lv.lv_point)(lv.lv_area)(lv.lv_draw_line_dsc)" }, + { "draw_line_dsc_init", (void*) &lv_draw_line_dsc_init, "", "(lv.lv_draw_line_dsc)" }, + { "draw_mask_add", (void*) &lv_draw_mask_add, "i", ".." }, + { "draw_mask_angle_init", (void*) &lv_draw_mask_angle_init, "", "(lv.lv_draw_mask_angle_param)iiii" }, + { "draw_mask_fade_init", (void*) &lv_draw_mask_fade_init, "", "(lv.lv_draw_mask_fade_param)(lv.lv_area)iiii" }, + { "draw_mask_get_cnt", (void*) &lv_draw_mask_get_cnt, "i", "" }, + { "draw_mask_line_angle_init", (void*) &lv_draw_mask_line_angle_init, "", "(lv.lv_draw_mask_line_param)iiii" }, + { "draw_mask_line_points_init", (void*) &lv_draw_mask_line_points_init, "", "(lv.lv_draw_mask_line_param)iiiii" }, + { "draw_mask_map_init", (void*) &lv_draw_mask_map_init, "", "(lv.lv_draw_mask_map_param)(lv.lv_area)(lv.lv_opa)" }, + { "draw_mask_radius_init", (void*) &lv_draw_mask_radius_init, "", "(lv.lv_draw_mask_radius_param)(lv.lv_area)ib" }, + { "draw_mask_remove_custom", (void*) &lv_draw_mask_remove_custom, ".", "." }, + { "draw_mask_remove_id", (void*) &lv_draw_mask_remove_id, ".", "i" }, + { "draw_polygon", (void*) &lv_draw_polygon, "", "ii(lv.lv_area)(lv.lv_draw_rect_dsc)" }, + { "draw_rect", (void*) &lv_draw_rect, "", "(lv.lv_area)(lv.lv_area)(lv.lv_draw_rect_dsc)" }, + { "draw_rect_dsc_init", (void*) &lv_draw_rect_dsc_init, "", "(lv.lv_draw_rect_dsc)" }, + { "draw_triangle", (void*) &lv_draw_triangle, "", "i(lv.lv_area)(lv.lv_draw_rect_dsc)" }, + { "event_register_id", (void*) &lv_event_register_id, "i", "" }, + { "event_send", (void*) &lv_event_send, "i", "(lv.lv_obj)i." }, + { "event_set_cover_res", (void*) &lv_event_set_cover_res, "", "(lv.lv_event)(lv.lv_cover_res)" }, + { "event_set_ext_draw_size", (void*) &lv_event_set_ext_draw_size, "", "(lv.lv_event)i" }, + { "get_hor_res", (void*) &lv_get_hor_res, "i", "" }, + { "get_ver_res", (void*) &lv_get_ver_res, "i", "" }, + { "group_get_default", (void*) &lv_group_get_default, "lv.lv_group", "" }, + { "img_src_get_type", (void*) &lv_img_src_get_type, "i", "." }, + { "indev_get_act", (void*) &lv_indev_get_act, "lv.lv_indev", "" }, + { "indev_get_obj_act", (void*) &lv_indev_get_obj_act, "lv.lv_obj", "" }, + { "indev_read_timer_cb", (void*) &lv_indev_read_timer_cb, "", "(lv.lv_timer)" }, + { "layer_sys", (void*) &lv_layer_sys, "lv.lv_obj", "" }, + { "layer_top", (void*) &lv_layer_top, "lv.lv_obj", "" }, + { "layout_register", (void*) &lv_layout_register, "i", "^lv_layout_update_cb^." }, + { "obj_class_create_obj", (void*) &lv_obj_class_create_obj, "lv.lv_obj", "(lv._lv_obj_class)(lv.lv_obj)" }, + { "obj_del_anim_ready_cb", (void*) &lv_obj_del_anim_ready_cb, "", "(lv.lv_anim)" }, + { "obj_draw_dsc_init", (void*) &lv_obj_draw_dsc_init, "", "(lv.lv_obj_draw_part_dsc)(lv.lv_area)" }, + { "obj_enable_style_refresh", (void*) &lv_obj_enable_style_refresh, "", "b" }, + { "obj_event_base", (void*) &lv_obj_event_base, "i", "(lv.lv_obj_class)(lv.lv_event)" }, + { "obj_report_style_change", (void*) &lv_obj_report_style_change, "", "(lv.lv_style)" }, + { "obj_style_get_selector_part", (void*) &lv_obj_style_get_selector_part, "i", "i" }, + { "obj_style_get_selector_state", (void*) &lv_obj_style_get_selector_state, "i", "i" }, + { "refr_now", (void*) &lv_refr_now, "", "(lv.lv_disp)" }, + { "scr_act", (void*) &lv_scr_act, "lv.lv_obj", "" }, + { "scr_load", (void*) &lv_scr_load, "", "(lv.lv_obj)" }, + { "scr_load_anim", (void*) &lv_scr_load_anim, "", "(lv.lv_obj)iiib" }, + { "theme_apply", (void*) &lv_theme_apply, "", "(lv.lv_obj)" }, + { "theme_default_init", (void*) &lv_theme_default_init, "lv.lv_theme", "(lv.lv_disp)(lv.lv_color)(lv.lv_color)b(lv.lv_font)" }, + { "theme_default_is_inited", (void*) &lv_theme_default_is_inited, "b", "" }, + { "theme_get_color_primary", (void*) &lv_theme_get_color_primary, "lv.lv_color", "(lv.lv_obj)" }, + { "theme_get_color_secondary", (void*) &lv_theme_get_color_secondary, "lv.lv_color", "(lv.lv_obj)" }, + { "theme_get_font_large", (void*) &lv_theme_get_font_large, "lv.lv_font", "(lv.lv_obj)" }, + { "theme_get_font_normal", (void*) &lv_theme_get_font_normal, "lv.lv_font", "(lv.lv_obj)" }, + { "theme_get_font_small", (void*) &lv_theme_get_font_small, "lv.lv_font", "(lv.lv_obj)" }, + { "theme_get_from_obj", (void*) &lv_theme_get_from_obj, "lv.lv_theme", "(lv.lv_obj)" }, + { "theme_mono_init", (void*) &lv_theme_mono_init, "lv.lv_theme", "(lv.lv_disp)b(lv.lv_font)" }, + { "theme_openhasp_init", (void*) &lv_theme_openhasp_init, "lv.lv_theme", "(lv.lv_disp)(lv.lv_color)(lv.lv_color)b(lv.lv_font)" }, + { "theme_openhasp_is_inited", (void*) &lv_theme_openhasp_is_inited, "b", "" }, + { "theme_set_apply_cb", (void*) &lv_theme_set_apply_cb, "", "(lv.lv_theme)^lv_theme_apply_cb^" }, + { "theme_set_parent", (void*) &lv_theme_set_parent, "", "(lv.lv_theme)(lv.lv_theme)" }, + +}; +const size_t lv_func_size = sizeof(lv_func) / sizeof(lv_func[0]); + + + + +typedef struct be_constint_t { + const char * name; + int32_t value; +} be_constint_t; + +const be_constint_t lv0_constants[] = { + + { "ALIGN_BOTTOM_LEFT", LV_ALIGN_BOTTOM_LEFT }, + { "ALIGN_BOTTOM_MID", LV_ALIGN_BOTTOM_MID }, + { "ALIGN_BOTTOM_RIGHT", LV_ALIGN_BOTTOM_RIGHT }, + { "ALIGN_CENTER", LV_ALIGN_CENTER }, + { "ALIGN_DEFAULT", LV_ALIGN_DEFAULT }, + { "ALIGN_LEFT_MID", LV_ALIGN_LEFT_MID }, + { "ALIGN_OUT_BOTTOM_LEFT", LV_ALIGN_OUT_BOTTOM_LEFT }, + { "ALIGN_OUT_BOTTOM_MID", LV_ALIGN_OUT_BOTTOM_MID }, + { "ALIGN_OUT_BOTTOM_RIGHT", LV_ALIGN_OUT_BOTTOM_RIGHT }, + { "ALIGN_OUT_LEFT_BOTTOM", LV_ALIGN_OUT_LEFT_BOTTOM }, + { "ALIGN_OUT_LEFT_MID", LV_ALIGN_OUT_LEFT_MID }, + { "ALIGN_OUT_LEFT_TOP", LV_ALIGN_OUT_LEFT_TOP }, + { "ALIGN_OUT_RIGHT_BOTTOM", LV_ALIGN_OUT_RIGHT_BOTTOM }, + { "ALIGN_OUT_RIGHT_MID", LV_ALIGN_OUT_RIGHT_MID }, + { "ALIGN_OUT_RIGHT_TOP", LV_ALIGN_OUT_RIGHT_TOP }, + { "ALIGN_OUT_TOP_LEFT", LV_ALIGN_OUT_TOP_LEFT }, + { "ALIGN_OUT_TOP_MID", LV_ALIGN_OUT_TOP_MID }, + { "ALIGN_OUT_TOP_RIGHT", LV_ALIGN_OUT_TOP_RIGHT }, + { "ALIGN_RIGHT_MID", LV_ALIGN_RIGHT_MID }, + { "ALIGN_TOP_LEFT", LV_ALIGN_TOP_LEFT }, + { "ALIGN_TOP_MID", LV_ALIGN_TOP_MID }, + { "ALIGN_TOP_RIGHT", LV_ALIGN_TOP_RIGHT }, + { "ANIM_IMG_PART_MAIN", LV_ANIM_IMG_PART_MAIN }, + { "ANIM_OFF", LV_ANIM_OFF }, + { "ANIM_ON", LV_ANIM_ON }, + { "ARC_MODE_NORMAL", LV_ARC_MODE_NORMAL }, + { "ARC_MODE_REVERSE", LV_ARC_MODE_REVERSE }, + { "ARC_MODE_SYMMETRICAL", LV_ARC_MODE_SYMMETRICAL }, + { "BAR_MODE_NORMAL", LV_BAR_MODE_NORMAL }, + { "BAR_MODE_RANGE", LV_BAR_MODE_RANGE }, + { "BAR_MODE_SYMMETRICAL", LV_BAR_MODE_SYMMETRICAL }, + { "BASE_DIR_AUTO", LV_BASE_DIR_AUTO }, + { "BASE_DIR_LTR", LV_BASE_DIR_LTR }, + { "BASE_DIR_NEUTRAL", LV_BASE_DIR_NEUTRAL }, + { "BASE_DIR_RTL", LV_BASE_DIR_RTL }, + { "BASE_DIR_WEAK", LV_BASE_DIR_WEAK }, + { "BLEND_MODE_ADDITIVE", LV_BLEND_MODE_ADDITIVE }, + { "BLEND_MODE_NORMAL", LV_BLEND_MODE_NORMAL }, + { "BLEND_MODE_SUBTRACTIVE", LV_BLEND_MODE_SUBTRACTIVE }, + { "BORDER_SIDE_BOTTOM", LV_BORDER_SIDE_BOTTOM }, + { "BORDER_SIDE_FULL", LV_BORDER_SIDE_FULL }, + { "BORDER_SIDE_INTERNAL", LV_BORDER_SIDE_INTERNAL }, + { "BORDER_SIDE_LEFT", LV_BORDER_SIDE_LEFT }, + { "BORDER_SIDE_NONE", LV_BORDER_SIDE_NONE }, + { "BORDER_SIDE_RIGHT", LV_BORDER_SIDE_RIGHT }, + { "BORDER_SIDE_TOP", LV_BORDER_SIDE_TOP }, + { "BTNMATRIX_CTRL_CHECKABLE", LV_BTNMATRIX_CTRL_CHECKABLE }, + { "BTNMATRIX_CTRL_CHECKED", LV_BTNMATRIX_CTRL_CHECKED }, + { "BTNMATRIX_CTRL_CLICK_TRIG", LV_BTNMATRIX_CTRL_CLICK_TRIG }, + { "BTNMATRIX_CTRL_CUSTOM_1", LV_BTNMATRIX_CTRL_CUSTOM_1 }, + { "BTNMATRIX_CTRL_CUSTOM_2", LV_BTNMATRIX_CTRL_CUSTOM_2 }, + { "BTNMATRIX_CTRL_DISABLED", LV_BTNMATRIX_CTRL_DISABLED }, + { "BTNMATRIX_CTRL_HIDDEN", LV_BTNMATRIX_CTRL_HIDDEN }, + { "BTNMATRIX_CTRL_NO_REPEAT", LV_BTNMATRIX_CTRL_NO_REPEAT }, + { "BTNMATRIX_CTRL_RECOLOR", LV_BTNMATRIX_CTRL_RECOLOR }, + { "CHART_AXIS_PRIMARY_X", LV_CHART_AXIS_PRIMARY_X }, + { "CHART_AXIS_PRIMARY_Y", LV_CHART_AXIS_PRIMARY_Y }, + { "CHART_AXIS_SECONDARY_X", LV_CHART_AXIS_SECONDARY_X }, + { "CHART_AXIS_SECONDARY_Y", LV_CHART_AXIS_SECONDARY_Y }, + { "CHART_TYPE_BAR", LV_CHART_TYPE_BAR }, + { "CHART_TYPE_LINE", LV_CHART_TYPE_LINE }, + { "CHART_TYPE_NONE", LV_CHART_TYPE_NONE }, + { "CHART_TYPE_SCATTER", LV_CHART_TYPE_SCATTER }, + { "CHART_UPDATE_MODE_CIRCULAR", LV_CHART_UPDATE_MODE_CIRCULAR }, + { "CHART_UPDATE_MODE_SHIFT", LV_CHART_UPDATE_MODE_SHIFT }, + { "COLORWHEEL_MODE_HUE", LV_COLORWHEEL_MODE_HUE }, + { "COLORWHEEL_MODE_SATURATION", LV_COLORWHEEL_MODE_SATURATION }, + { "COLORWHEEL_MODE_VALUE", LV_COLORWHEEL_MODE_VALUE }, + { "COLOR_AQUA", (int32_t) 0x00FFFF }, + { "COLOR_BLACK", (int32_t) 0x000000 }, + { "COLOR_BLUE", (int32_t) 0x0000FF }, + { "COLOR_CYAN", (int32_t) 0x00FFFF }, + { "COLOR_GRAY", (int32_t) 0x808080 }, + { "COLOR_GREEN", (int32_t) 0x008000 }, + { "COLOR_LIME", (int32_t) 0x00FF00 }, + { "COLOR_MAGENTA", (int32_t) 0xFF00FF }, + { "COLOR_MAROON", (int32_t) 0x800000 }, + { "COLOR_NAVY", (int32_t) 0x000080 }, + { "COLOR_OLIVE", (int32_t) 0x808000 }, + { "COLOR_PURPLE", (int32_t) 0x800080 }, + { "COLOR_RED", (int32_t) 0xFF0000 }, + { "COLOR_SILVER", (int32_t) 0xC0C0C0 }, + { "COLOR_TEAL", (int32_t) 0x008080 }, + { "COLOR_WHITE", (int32_t) 0xFFFFFF }, + { "COLOR_YELLOW", (int32_t) 0xFFFF00 }, + { "COVER_RES_COVER", LV_COVER_RES_COVER }, + { "COVER_RES_MASKED", LV_COVER_RES_MASKED }, + { "COVER_RES_NOT_COVER", LV_COVER_RES_NOT_COVER }, + { "DIR_ALL", LV_DIR_ALL }, + { "DIR_BOTTOM", LV_DIR_BOTTOM }, + { "DIR_HOR", LV_DIR_HOR }, + { "DIR_LEFT", LV_DIR_LEFT }, + { "DIR_NONE", LV_DIR_NONE }, + { "DIR_RIGHT", LV_DIR_RIGHT }, + { "DIR_TOP", LV_DIR_TOP }, + { "DIR_VER", LV_DIR_VER }, + { "DISP_ROT_180", LV_DISP_ROT_180 }, + { "DISP_ROT_270", LV_DISP_ROT_270 }, + { "DISP_ROT_90", LV_DISP_ROT_90 }, + { "DISP_ROT_NONE", LV_DISP_ROT_NONE }, + { "DRAW_MASK_LINE_SIDE_BOTTOM", LV_DRAW_MASK_LINE_SIDE_BOTTOM }, + { "DRAW_MASK_LINE_SIDE_LEFT", LV_DRAW_MASK_LINE_SIDE_LEFT }, + { "DRAW_MASK_LINE_SIDE_RIGHT", LV_DRAW_MASK_LINE_SIDE_RIGHT }, + { "DRAW_MASK_LINE_SIDE_TOP", LV_DRAW_MASK_LINE_SIDE_TOP }, + { "DRAW_MASK_RES_CHANGED", LV_DRAW_MASK_RES_CHANGED }, + { "DRAW_MASK_RES_FULL_COVER", LV_DRAW_MASK_RES_FULL_COVER }, + { "DRAW_MASK_RES_TRANSP", LV_DRAW_MASK_RES_TRANSP }, + { "DRAW_MASK_RES_UNKNOWN", LV_DRAW_MASK_RES_UNKNOWN }, + { "DRAW_MASK_TYPE_ANGLE", LV_DRAW_MASK_TYPE_ANGLE }, + { "DRAW_MASK_TYPE_FADE", LV_DRAW_MASK_TYPE_FADE }, + { "DRAW_MASK_TYPE_LINE", LV_DRAW_MASK_TYPE_LINE }, + { "DRAW_MASK_TYPE_MAP", LV_DRAW_MASK_TYPE_MAP }, + { "DRAW_MASK_TYPE_RADIUS", LV_DRAW_MASK_TYPE_RADIUS }, + { "EVENT_ALL", LV_EVENT_ALL }, + { "EVENT_CANCEL", LV_EVENT_CANCEL }, + { "EVENT_CHILD_CHANGED", LV_EVENT_CHILD_CHANGED }, + { "EVENT_CLICKED", LV_EVENT_CLICKED }, + { "EVENT_COVER_CHECK", LV_EVENT_COVER_CHECK }, + { "EVENT_DEFOCUSED", LV_EVENT_DEFOCUSED }, + { "EVENT_DELETE", LV_EVENT_DELETE }, + { "EVENT_DRAW_MAIN", LV_EVENT_DRAW_MAIN }, + { "EVENT_DRAW_MAIN_BEGIN", LV_EVENT_DRAW_MAIN_BEGIN }, + { "EVENT_DRAW_MAIN_END", LV_EVENT_DRAW_MAIN_END }, + { "EVENT_DRAW_PART_BEGIN", LV_EVENT_DRAW_PART_BEGIN }, + { "EVENT_DRAW_PART_END", LV_EVENT_DRAW_PART_END }, + { "EVENT_DRAW_POST", LV_EVENT_DRAW_POST }, + { "EVENT_DRAW_POST_BEGIN", LV_EVENT_DRAW_POST_BEGIN }, + { "EVENT_DRAW_POST_END", LV_EVENT_DRAW_POST_END }, + { "EVENT_FOCUSED", LV_EVENT_FOCUSED }, + { "EVENT_GESTURE", LV_EVENT_GESTURE }, + { "EVENT_GET_SELF_SIZE", LV_EVENT_GET_SELF_SIZE }, + { "EVENT_HIT_TEST", LV_EVENT_HIT_TEST }, + { "EVENT_INSERT", LV_EVENT_INSERT }, + { "EVENT_KEY", LV_EVENT_KEY }, + { "EVENT_LAYOUT_CHANGED", LV_EVENT_LAYOUT_CHANGED }, + { "EVENT_LEAVE", LV_EVENT_LEAVE }, + { "EVENT_LONG_PRESSED", LV_EVENT_LONG_PRESSED }, + { "EVENT_LONG_PRESSED_REPEAT", LV_EVENT_LONG_PRESSED_REPEAT }, + { "EVENT_PRESSED", LV_EVENT_PRESSED }, + { "EVENT_PRESSING", LV_EVENT_PRESSING }, + { "EVENT_PRESS_LOST", LV_EVENT_PRESS_LOST }, + { "EVENT_READY", LV_EVENT_READY }, + { "EVENT_REFRESH", LV_EVENT_REFRESH }, + { "EVENT_REFR_EXT_DRAW_SIZE", LV_EVENT_REFR_EXT_DRAW_SIZE }, + { "EVENT_RELEASED", LV_EVENT_RELEASED }, + { "EVENT_SCROLL", LV_EVENT_SCROLL }, + { "EVENT_SCROLL_BEGIN", LV_EVENT_SCROLL_BEGIN }, + { "EVENT_SCROLL_END", LV_EVENT_SCROLL_END }, + { "EVENT_SHORT_CLICKED", LV_EVENT_SHORT_CLICKED }, + { "EVENT_SIZE_CHANGED", LV_EVENT_SIZE_CHANGED }, + { "EVENT_STYLE_CHANGED", LV_EVENT_STYLE_CHANGED }, + { "EVENT_VALUE_CHANGED", LV_EVENT_VALUE_CHANGED }, + { "FLEX_ALIGN_CENTER", LV_FLEX_ALIGN_CENTER }, + { "FLEX_ALIGN_END", LV_FLEX_ALIGN_END }, + { "FLEX_ALIGN_SPACE_AROUND", LV_FLEX_ALIGN_SPACE_AROUND }, + { "FLEX_ALIGN_SPACE_BETWEEN", LV_FLEX_ALIGN_SPACE_BETWEEN }, + { "FLEX_ALIGN_SPACE_EVENLY", LV_FLEX_ALIGN_SPACE_EVENLY }, + { "FLEX_ALIGN_START", LV_FLEX_ALIGN_START }, + { "FLEX_FLOW_COLUMN", LV_FLEX_FLOW_COLUMN }, + { "FLEX_FLOW_COLUMN_REVERSE", LV_FLEX_FLOW_COLUMN_REVERSE }, + { "FLEX_FLOW_COLUMN_WRAP", LV_FLEX_FLOW_COLUMN_WRAP }, + { "FLEX_FLOW_COLUMN_WRAP_REVERSE", LV_FLEX_FLOW_COLUMN_WRAP_REVERSE }, + { "FLEX_FLOW_ROW", LV_FLEX_FLOW_ROW }, + { "FLEX_FLOW_ROW_REVERSE", LV_FLEX_FLOW_ROW_REVERSE }, + { "FLEX_FLOW_ROW_WRAP", LV_FLEX_FLOW_ROW_WRAP }, + { "FLEX_FLOW_ROW_WRAP_REVERSE", LV_FLEX_FLOW_ROW_WRAP_REVERSE }, + { "FS_MODE_RD", LV_FS_MODE_RD }, + { "FS_MODE_WR", LV_FS_MODE_WR }, + { "FS_RES_BUSY", LV_FS_RES_BUSY }, + { "FS_RES_DENIED", LV_FS_RES_DENIED }, + { "FS_RES_FS_ERR", LV_FS_RES_FS_ERR }, + { "FS_RES_FULL", LV_FS_RES_FULL }, + { "FS_RES_HW_ERR", LV_FS_RES_HW_ERR }, + { "FS_RES_INV_PARAM", LV_FS_RES_INV_PARAM }, + { "FS_RES_LOCKED", LV_FS_RES_LOCKED }, + { "FS_RES_NOT_EX", LV_FS_RES_NOT_EX }, + { "FS_RES_NOT_IMP", LV_FS_RES_NOT_IMP }, + { "FS_RES_OK", LV_FS_RES_OK }, + { "FS_RES_OUT_OF_MEM", LV_FS_RES_OUT_OF_MEM }, + { "FS_RES_TOUT", LV_FS_RES_TOUT }, + { "FS_RES_UNKNOWN", LV_FS_RES_UNKNOWN }, + { "FS_SEEK_CUR", LV_FS_SEEK_CUR }, + { "FS_SEEK_END", LV_FS_SEEK_END }, + { "FS_SEEK_SET", LV_FS_SEEK_SET }, + { "GRAD_DIR_HOR", LV_GRAD_DIR_HOR }, + { "GRAD_DIR_NONE", LV_GRAD_DIR_NONE }, + { "GRAD_DIR_VER", LV_GRAD_DIR_VER }, + { "GRID_ALIGN_CENTER", LV_GRID_ALIGN_CENTER }, + { "GRID_ALIGN_END", LV_GRID_ALIGN_END }, + { "GRID_ALIGN_SPACE_AROUND", LV_GRID_ALIGN_SPACE_AROUND }, + { "GRID_ALIGN_SPACE_BETWEEN", LV_GRID_ALIGN_SPACE_BETWEEN }, + { "GRID_ALIGN_SPACE_EVENLY", LV_GRID_ALIGN_SPACE_EVENLY }, + { "GRID_ALIGN_START", LV_GRID_ALIGN_START }, + { "GRID_ALIGN_STRETCH", LV_GRID_ALIGN_STRETCH }, + { "GROUP_REFOCUS_POLICY_NEXT", LV_GROUP_REFOCUS_POLICY_NEXT }, + { "GROUP_REFOCUS_POLICY_PREV", LV_GROUP_REFOCUS_POLICY_PREV }, + { "IMGBTN_STATE_CHECKED_DISABLED", LV_IMGBTN_STATE_CHECKED_DISABLED }, + { "IMGBTN_STATE_CHECKED_PRESSED", LV_IMGBTN_STATE_CHECKED_PRESSED }, + { "IMGBTN_STATE_CHECKED_RELEASED", LV_IMGBTN_STATE_CHECKED_RELEASED }, + { "IMGBTN_STATE_DISABLED", LV_IMGBTN_STATE_DISABLED }, + { "IMGBTN_STATE_PRESSED", LV_IMGBTN_STATE_PRESSED }, + { "IMGBTN_STATE_RELEASED", LV_IMGBTN_STATE_RELEASED }, + { "IMG_CF_ALPHA_1BIT", LV_IMG_CF_ALPHA_1BIT }, + { "IMG_CF_ALPHA_2BIT", LV_IMG_CF_ALPHA_2BIT }, + { "IMG_CF_ALPHA_4BIT", LV_IMG_CF_ALPHA_4BIT }, + { "IMG_CF_ALPHA_8BIT", LV_IMG_CF_ALPHA_8BIT }, + { "IMG_CF_INDEXED_1BIT", LV_IMG_CF_INDEXED_1BIT }, + { "IMG_CF_INDEXED_2BIT", LV_IMG_CF_INDEXED_2BIT }, + { "IMG_CF_INDEXED_4BIT", LV_IMG_CF_INDEXED_4BIT }, + { "IMG_CF_INDEXED_8BIT", LV_IMG_CF_INDEXED_8BIT }, + { "IMG_CF_RAW", LV_IMG_CF_RAW }, + { "IMG_CF_RAW_ALPHA", LV_IMG_CF_RAW_ALPHA }, + { "IMG_CF_RAW_CHROMA_KEYED", LV_IMG_CF_RAW_CHROMA_KEYED }, + { "IMG_CF_TRUE_COLOR", LV_IMG_CF_TRUE_COLOR }, + { "IMG_CF_TRUE_COLOR_ALPHA", LV_IMG_CF_TRUE_COLOR_ALPHA }, + { "IMG_CF_TRUE_COLOR_CHROMA_KEYED", LV_IMG_CF_TRUE_COLOR_CHROMA_KEYED }, + { "IMG_CF_UNKNOWN", LV_IMG_CF_UNKNOWN }, + { "IMG_SRC_FILE", LV_IMG_SRC_FILE }, + { "IMG_SRC_SYMBOL", LV_IMG_SRC_SYMBOL }, + { "IMG_SRC_UNKNOWN", LV_IMG_SRC_UNKNOWN }, + { "IMG_SRC_VARIABLE", LV_IMG_SRC_VARIABLE }, + { "INDEV_STATE_PRESSED", LV_INDEV_STATE_PRESSED }, + { "INDEV_STATE_RELEASED", LV_INDEV_STATE_RELEASED }, + { "INDEV_TYPE_BUTTON", LV_INDEV_TYPE_BUTTON }, + { "INDEV_TYPE_ENCODER", LV_INDEV_TYPE_ENCODER }, + { "INDEV_TYPE_KEYPAD", LV_INDEV_TYPE_KEYPAD }, + { "INDEV_TYPE_NONE", LV_INDEV_TYPE_NONE }, + { "INDEV_TYPE_POINTER", LV_INDEV_TYPE_POINTER }, + { "KEY_BACKSPACE", LV_KEY_BACKSPACE }, + { "KEY_DEL", LV_KEY_DEL }, + { "KEY_DOWN", LV_KEY_DOWN }, + { "KEY_END", LV_KEY_END }, + { "KEY_ENTER", LV_KEY_ENTER }, + { "KEY_ESC", LV_KEY_ESC }, + { "KEY_HOME", LV_KEY_HOME }, + { "KEY_LEFT", LV_KEY_LEFT }, + { "KEY_NEXT", LV_KEY_NEXT }, + { "KEY_PREV", LV_KEY_PREV }, + { "KEY_RIGHT", LV_KEY_RIGHT }, + { "KEY_UP", LV_KEY_UP }, + { "LABEL_LONG_CLIP", LV_LABEL_LONG_CLIP }, + { "LABEL_LONG_DOT", LV_LABEL_LONG_DOT }, + { "LABEL_LONG_SCROLL", LV_LABEL_LONG_SCROLL }, + { "LABEL_LONG_SCROLL_CIRCULAR", LV_LABEL_LONG_SCROLL_CIRCULAR }, + { "LABEL_LONG_WRAP", LV_LABEL_LONG_WRAP }, + { "METER_INDICATOR_TYPE_ARC", LV_METER_INDICATOR_TYPE_ARC }, + { "METER_INDICATOR_TYPE_NEEDLE_IMG", LV_METER_INDICATOR_TYPE_NEEDLE_IMG }, + { "METER_INDICATOR_TYPE_NEEDLE_LINE", LV_METER_INDICATOR_TYPE_NEEDLE_LINE }, + { "METER_INDICATOR_TYPE_SCALE_LINES", LV_METER_INDICATOR_TYPE_SCALE_LINES }, + { "OBJ_CLASS_EDITABLE_FALSE", LV_OBJ_CLASS_EDITABLE_FALSE }, + { "OBJ_CLASS_EDITABLE_INHERIT", LV_OBJ_CLASS_EDITABLE_INHERIT }, + { "OBJ_CLASS_EDITABLE_TRUE", LV_OBJ_CLASS_EDITABLE_TRUE }, + { "OBJ_CLASS_GROUP_DEF_FALSE", LV_OBJ_CLASS_GROUP_DEF_FALSE }, + { "OBJ_CLASS_GROUP_DEF_INHERIT", LV_OBJ_CLASS_GROUP_DEF_INHERIT }, + { "OBJ_CLASS_GROUP_DEF_TRUE", LV_OBJ_CLASS_GROUP_DEF_TRUE }, + { "OBJ_FLAG_ADV_HITTEST", LV_OBJ_FLAG_ADV_HITTEST }, + { "OBJ_FLAG_CHECKABLE", LV_OBJ_FLAG_CHECKABLE }, + { "OBJ_FLAG_CLICKABLE", LV_OBJ_FLAG_CLICKABLE }, + { "OBJ_FLAG_CLICK_FOCUSABLE", LV_OBJ_FLAG_CLICK_FOCUSABLE }, + { "OBJ_FLAG_EVENT_BUBBLE", LV_OBJ_FLAG_EVENT_BUBBLE }, + { "OBJ_FLAG_FLOATING", LV_OBJ_FLAG_FLOATING }, + { "OBJ_FLAG_GESTURE_BUBBLE", LV_OBJ_FLAG_GESTURE_BUBBLE }, + { "OBJ_FLAG_HIDDEN", LV_OBJ_FLAG_HIDDEN }, + { "OBJ_FLAG_IGNORE_LAYOUT", LV_OBJ_FLAG_IGNORE_LAYOUT }, + { "OBJ_FLAG_LAYOUT_1", LV_OBJ_FLAG_LAYOUT_1 }, + { "OBJ_FLAG_LAYOUT_2", LV_OBJ_FLAG_LAYOUT_2 }, + { "OBJ_FLAG_PRESS_LOCK", LV_OBJ_FLAG_PRESS_LOCK }, + { "OBJ_FLAG_SCROLLABLE", LV_OBJ_FLAG_SCROLLABLE }, + { "OBJ_FLAG_SCROLL_CHAIN", LV_OBJ_FLAG_SCROLL_CHAIN }, + { "OBJ_FLAG_SCROLL_ELASTIC", LV_OBJ_FLAG_SCROLL_ELASTIC }, + { "OBJ_FLAG_SCROLL_MOMENTUM", LV_OBJ_FLAG_SCROLL_MOMENTUM }, + { "OBJ_FLAG_SCROLL_ONE", LV_OBJ_FLAG_SCROLL_ONE }, + { "OBJ_FLAG_SCROLL_ON_FOCUS", LV_OBJ_FLAG_SCROLL_ON_FOCUS }, + { "OBJ_FLAG_SNAPABLE", LV_OBJ_FLAG_SNAPABLE }, + { "OBJ_FLAG_USER_1", LV_OBJ_FLAG_USER_1 }, + { "OBJ_FLAG_USER_2", LV_OBJ_FLAG_USER_2 }, + { "OBJ_FLAG_USER_3", LV_OBJ_FLAG_USER_3 }, + { "OBJ_FLAG_USER_4", LV_OBJ_FLAG_USER_4 }, + { "OBJ_FLAG_WIDGET_1", LV_OBJ_FLAG_WIDGET_1 }, + { "OBJ_FLAG_WIDGET_2", LV_OBJ_FLAG_WIDGET_2 }, + { "OBJ_TREE_WALK_END", LV_OBJ_TREE_WALK_END }, + { "OBJ_TREE_WALK_NEXT", LV_OBJ_TREE_WALK_NEXT }, + { "OBJ_TREE_WALK_SKIP_CHILDREN", LV_OBJ_TREE_WALK_SKIP_CHILDREN }, + { "OPA_0", LV_OPA_0 }, + { "OPA_10", LV_OPA_10 }, + { "OPA_100", LV_OPA_100 }, + { "OPA_20", LV_OPA_20 }, + { "OPA_30", LV_OPA_30 }, + { "OPA_40", LV_OPA_40 }, + { "OPA_50", LV_OPA_50 }, + { "OPA_60", LV_OPA_60 }, + { "OPA_70", LV_OPA_70 }, + { "OPA_80", LV_OPA_80 }, + { "OPA_90", LV_OPA_90 }, + { "OPA_COVER", LV_OPA_COVER }, + { "OPA_TRANSP", LV_OPA_TRANSP }, + { "PALETTE_AMBER", LV_PALETTE_AMBER }, + { "PALETTE_BLUE", LV_PALETTE_BLUE }, + { "PALETTE_BLUE_GREY", LV_PALETTE_BLUE_GREY }, + { "PALETTE_BROWN", LV_PALETTE_BROWN }, + { "PALETTE_CYAN", LV_PALETTE_CYAN }, + { "PALETTE_DEEP_ORANGE", LV_PALETTE_DEEP_ORANGE }, + { "PALETTE_DEEP_PURPLE", LV_PALETTE_DEEP_PURPLE }, + { "PALETTE_GREEN", LV_PALETTE_GREEN }, + { "PALETTE_GREY", LV_PALETTE_GREY }, + { "PALETTE_INDIGO", LV_PALETTE_INDIGO }, + { "PALETTE_LIGHT_BLUE", LV_PALETTE_LIGHT_BLUE }, + { "PALETTE_LIGHT_GREEN", LV_PALETTE_LIGHT_GREEN }, + { "PALETTE_LIME", LV_PALETTE_LIME }, + { "PALETTE_NONE", LV_PALETTE_NONE }, + { "PALETTE_ORANGE", LV_PALETTE_ORANGE }, + { "PALETTE_PINK", LV_PALETTE_PINK }, + { "PALETTE_PURPLE", LV_PALETTE_PURPLE }, + { "PALETTE_RED", LV_PALETTE_RED }, + { "PALETTE_TEAL", LV_PALETTE_TEAL }, + { "PALETTE_YELLOW", LV_PALETTE_YELLOW }, + { "PART_ANY", LV_PART_ANY }, + { "PART_CURSOR", LV_PART_CURSOR }, + { "PART_CUSTOM_FIRST", LV_PART_CUSTOM_FIRST }, + { "PART_INDICATOR", LV_PART_INDICATOR }, + { "PART_ITEMS", LV_PART_ITEMS }, + { "PART_KNOB", LV_PART_KNOB }, + { "PART_MAIN", LV_PART_MAIN }, + { "PART_SCROLLBAR", LV_PART_SCROLLBAR }, + { "PART_SELECTED", LV_PART_SELECTED }, + { "PART_TEXTAREA_PLACEHOLDER", LV_PART_TEXTAREA_PLACEHOLDER }, + { "PART_TICKS", LV_PART_TICKS }, + { "RADIUS_CIRCLE", LV_RADIUS_CIRCLE }, + { "RES_INV", LV_RES_INV }, + { "RES_OK", LV_RES_OK }, + { "ROLLER_MODE_INFINITE", LV_ROLLER_MODE_INFINITE }, + { "ROLLER_MODE_NORMAL", LV_ROLLER_MODE_NORMAL }, + { "SCROLLBAR_MODE_ACTIVE", LV_SCROLLBAR_MODE_ACTIVE }, + { "SCROLLBAR_MODE_AUTO", LV_SCROLLBAR_MODE_AUTO }, + { "SCROLLBAR_MODE_OFF", LV_SCROLLBAR_MODE_OFF }, + { "SCROLLBAR_MODE_ON", LV_SCROLLBAR_MODE_ON }, + { "SCROLL_SNAP_CENTER", LV_SCROLL_SNAP_CENTER }, + { "SCROLL_SNAP_END", LV_SCROLL_SNAP_END }, + { "SCROLL_SNAP_NONE", LV_SCROLL_SNAP_NONE }, + { "SCROLL_SNAP_START", LV_SCROLL_SNAP_START }, + { "SCR_LOAD_ANIM_FADE_ON", LV_SCR_LOAD_ANIM_FADE_ON }, + { "SCR_LOAD_ANIM_MOVE_BOTTOM", LV_SCR_LOAD_ANIM_MOVE_BOTTOM }, + { "SCR_LOAD_ANIM_MOVE_LEFT", LV_SCR_LOAD_ANIM_MOVE_LEFT }, + { "SCR_LOAD_ANIM_MOVE_RIGHT", LV_SCR_LOAD_ANIM_MOVE_RIGHT }, + { "SCR_LOAD_ANIM_MOVE_TOP", LV_SCR_LOAD_ANIM_MOVE_TOP }, + { "SCR_LOAD_ANIM_NONE", LV_SCR_LOAD_ANIM_NONE }, + { "SCR_LOAD_ANIM_OVER_BOTTOM", LV_SCR_LOAD_ANIM_OVER_BOTTOM }, + { "SCR_LOAD_ANIM_OVER_LEFT", LV_SCR_LOAD_ANIM_OVER_LEFT }, + { "SCR_LOAD_ANIM_OVER_RIGHT", LV_SCR_LOAD_ANIM_OVER_RIGHT }, + { "SCR_LOAD_ANIM_OVER_TOP", LV_SCR_LOAD_ANIM_OVER_TOP }, + { "SIZE_CONTENT", LV_SIZE_CONTENT }, + { "SLIDER_MODE_NORMAL", LV_SLIDER_MODE_NORMAL }, + { "SLIDER_MODE_RANGE", LV_SLIDER_MODE_RANGE }, + { "SLIDER_MODE_SYMMETRICAL", LV_SLIDER_MODE_SYMMETRICAL }, + { "SPAN_MODE_BREAK", LV_SPAN_MODE_BREAK }, + { "SPAN_MODE_EXPAND", LV_SPAN_MODE_EXPAND }, + { "SPAN_MODE_FIXED", LV_SPAN_MODE_FIXED }, + { "SPAN_OVERFLOW_CLIP", LV_SPAN_OVERFLOW_CLIP }, + { "SPAN_OVERFLOW_ELLIPSIS", LV_SPAN_OVERFLOW_ELLIPSIS }, + { "STATE_ANY", LV_STATE_ANY }, + { "STATE_CHECKED", LV_STATE_CHECKED }, + { "STATE_DEFAULT", LV_STATE_DEFAULT }, + { "STATE_DISABLED", LV_STATE_DISABLED }, + { "STATE_EDITED", LV_STATE_EDITED }, + { "STATE_FOCUSED", LV_STATE_FOCUSED }, + { "STATE_FOCUS_KEY", LV_STATE_FOCUS_KEY }, + { "STATE_HOVERED", LV_STATE_HOVERED }, + { "STATE_PRESSED", LV_STATE_PRESSED }, + { "STATE_SCROLLED", LV_STATE_SCROLLED }, + { "STATE_USER_1", LV_STATE_USER_1 }, + { "STATE_USER_2", LV_STATE_USER_2 }, + { "STATE_USER_3", LV_STATE_USER_3 }, + { "STATE_USER_4", LV_STATE_USER_4 }, + { "STYLE_ALIGN", LV_STYLE_ALIGN }, + { "STYLE_ANIM_SPEED", LV_STYLE_ANIM_SPEED }, + { "STYLE_ANIM_TIME", LV_STYLE_ANIM_TIME }, + { "STYLE_ARC_COLOR", LV_STYLE_ARC_COLOR }, + { "STYLE_ARC_COLOR_FILTERED", LV_STYLE_ARC_COLOR_FILTERED }, + { "STYLE_ARC_IMG_SRC", LV_STYLE_ARC_IMG_SRC }, + { "STYLE_ARC_OPA", LV_STYLE_ARC_OPA }, + { "STYLE_ARC_ROUNDED", LV_STYLE_ARC_ROUNDED }, + { "STYLE_ARC_WIDTH", LV_STYLE_ARC_WIDTH }, + { "STYLE_BASE_DIR", LV_STYLE_BASE_DIR }, + { "STYLE_BG_COLOR", LV_STYLE_BG_COLOR }, + { "STYLE_BG_COLOR_FILTERED", LV_STYLE_BG_COLOR_FILTERED }, + { "STYLE_BG_GRAD_COLOR", LV_STYLE_BG_GRAD_COLOR }, + { "STYLE_BG_GRAD_COLOR_FILTERED", LV_STYLE_BG_GRAD_COLOR_FILTERED }, + { "STYLE_BG_GRAD_DIR", LV_STYLE_BG_GRAD_DIR }, + { "STYLE_BG_GRAD_STOP", LV_STYLE_BG_GRAD_STOP }, + { "STYLE_BG_IMG_OPA", LV_STYLE_BG_IMG_OPA }, + { "STYLE_BG_IMG_RECOLOR", LV_STYLE_BG_IMG_RECOLOR }, + { "STYLE_BG_IMG_RECOLOR_FILTERED", LV_STYLE_BG_IMG_RECOLOR_FILTERED }, + { "STYLE_BG_IMG_RECOLOR_OPA", LV_STYLE_BG_IMG_RECOLOR_OPA }, + { "STYLE_BG_IMG_SRC", LV_STYLE_BG_IMG_SRC }, + { "STYLE_BG_IMG_TILED", LV_STYLE_BG_IMG_TILED }, + { "STYLE_BG_MAIN_STOP", LV_STYLE_BG_MAIN_STOP }, + { "STYLE_BG_OPA", LV_STYLE_BG_OPA }, + { "STYLE_BLEND_MODE", LV_STYLE_BLEND_MODE }, + { "STYLE_BORDER_COLOR", LV_STYLE_BORDER_COLOR }, + { "STYLE_BORDER_COLOR_FILTERED", LV_STYLE_BORDER_COLOR_FILTERED }, + { "STYLE_BORDER_OPA", LV_STYLE_BORDER_OPA }, + { "STYLE_BORDER_POST", LV_STYLE_BORDER_POST }, + { "STYLE_BORDER_SIDE", LV_STYLE_BORDER_SIDE }, + { "STYLE_BORDER_WIDTH", LV_STYLE_BORDER_WIDTH }, + { "STYLE_CLIP_CORNER", LV_STYLE_CLIP_CORNER }, + { "STYLE_COLOR_FILTER_DSC", LV_STYLE_COLOR_FILTER_DSC }, + { "STYLE_COLOR_FILTER_OPA", LV_STYLE_COLOR_FILTER_OPA }, + { "STYLE_HEIGHT", LV_STYLE_HEIGHT }, + { "STYLE_IMG_OPA", LV_STYLE_IMG_OPA }, + { "STYLE_IMG_RECOLOR", LV_STYLE_IMG_RECOLOR }, + { "STYLE_IMG_RECOLOR_FILTERED", LV_STYLE_IMG_RECOLOR_FILTERED }, + { "STYLE_IMG_RECOLOR_OPA", LV_STYLE_IMG_RECOLOR_OPA }, + { "STYLE_LAYOUT", LV_STYLE_LAYOUT }, + { "STYLE_LINE_COLOR", LV_STYLE_LINE_COLOR }, + { "STYLE_LINE_COLOR_FILTERED", LV_STYLE_LINE_COLOR_FILTERED }, + { "STYLE_LINE_DASH_GAP", LV_STYLE_LINE_DASH_GAP }, + { "STYLE_LINE_DASH_WIDTH", LV_STYLE_LINE_DASH_WIDTH }, + { "STYLE_LINE_OPA", LV_STYLE_LINE_OPA }, + { "STYLE_LINE_ROUNDED", LV_STYLE_LINE_ROUNDED }, + { "STYLE_LINE_WIDTH", LV_STYLE_LINE_WIDTH }, + { "STYLE_MAX_HEIGHT", LV_STYLE_MAX_HEIGHT }, + { "STYLE_MAX_WIDTH", LV_STYLE_MAX_WIDTH }, + { "STYLE_MIN_HEIGHT", LV_STYLE_MIN_HEIGHT }, + { "STYLE_MIN_WIDTH", LV_STYLE_MIN_WIDTH }, + { "STYLE_OPA", LV_STYLE_OPA }, + { "STYLE_OUTLINE_COLOR", LV_STYLE_OUTLINE_COLOR }, + { "STYLE_OUTLINE_COLOR_FILTERED", LV_STYLE_OUTLINE_COLOR_FILTERED }, + { "STYLE_OUTLINE_OPA", LV_STYLE_OUTLINE_OPA }, + { "STYLE_OUTLINE_PAD", LV_STYLE_OUTLINE_PAD }, + { "STYLE_OUTLINE_WIDTH", LV_STYLE_OUTLINE_WIDTH }, + { "STYLE_PAD_BOTTOM", LV_STYLE_PAD_BOTTOM }, + { "STYLE_PAD_COLUMN", LV_STYLE_PAD_COLUMN }, + { "STYLE_PAD_LEFT", LV_STYLE_PAD_LEFT }, + { "STYLE_PAD_RIGHT", LV_STYLE_PAD_RIGHT }, + { "STYLE_PAD_ROW", LV_STYLE_PAD_ROW }, + { "STYLE_PAD_TOP", LV_STYLE_PAD_TOP }, + { "STYLE_PROP_ANY", LV_STYLE_PROP_ANY }, + { "STYLE_PROP_INV", LV_STYLE_PROP_INV }, + { "STYLE_RADIUS", LV_STYLE_RADIUS }, + { "STYLE_SHADOW_COLOR", LV_STYLE_SHADOW_COLOR }, + { "STYLE_SHADOW_COLOR_FILTERED", LV_STYLE_SHADOW_COLOR_FILTERED }, + { "STYLE_SHADOW_OFS_X", LV_STYLE_SHADOW_OFS_X }, + { "STYLE_SHADOW_OFS_Y", LV_STYLE_SHADOW_OFS_Y }, + { "STYLE_SHADOW_OPA", LV_STYLE_SHADOW_OPA }, + { "STYLE_SHADOW_SPREAD", LV_STYLE_SHADOW_SPREAD }, + { "STYLE_SHADOW_WIDTH", LV_STYLE_SHADOW_WIDTH }, + { "STYLE_TEXT_ALIGN", LV_STYLE_TEXT_ALIGN }, + { "STYLE_TEXT_COLOR", LV_STYLE_TEXT_COLOR }, + { "STYLE_TEXT_COLOR_FILTERED", LV_STYLE_TEXT_COLOR_FILTERED }, + { "STYLE_TEXT_DECOR", LV_STYLE_TEXT_DECOR }, + { "STYLE_TEXT_FONT", LV_STYLE_TEXT_FONT }, + { "STYLE_TEXT_LETTER_SPACE", LV_STYLE_TEXT_LETTER_SPACE }, + { "STYLE_TEXT_LINE_SPACE", LV_STYLE_TEXT_LINE_SPACE }, + { "STYLE_TEXT_OPA", LV_STYLE_TEXT_OPA }, + { "STYLE_TRANSFORM_ANGLE", LV_STYLE_TRANSFORM_ANGLE }, + { "STYLE_TRANSFORM_HEIGHT", LV_STYLE_TRANSFORM_HEIGHT }, + { "STYLE_TRANSFORM_WIDTH", LV_STYLE_TRANSFORM_WIDTH }, + { "STYLE_TRANSFORM_ZOOM", LV_STYLE_TRANSFORM_ZOOM }, + { "STYLE_TRANSITION", LV_STYLE_TRANSITION }, + { "STYLE_TRANSLATE_X", LV_STYLE_TRANSLATE_X }, + { "STYLE_TRANSLATE_Y", LV_STYLE_TRANSLATE_Y }, + { "STYLE_WIDTH", LV_STYLE_WIDTH }, + { "STYLE_X", LV_STYLE_X }, + { "STYLE_Y", LV_STYLE_Y }, + { "$SYMBOL_AUDIO", (int32_t) "\xef\x80\x81" }, + { "$SYMBOL_BACKSPACE", (int32_t) "\xef\x95\x9A" }, + { "$SYMBOL_BATTERY_1", (int32_t) "\xef\x89\x83" }, + { "$SYMBOL_BATTERY_2", (int32_t) "\xef\x89\x82" }, + { "$SYMBOL_BATTERY_3", (int32_t) "\xef\x89\x81" }, + { "$SYMBOL_BATTERY_EMPTY", (int32_t) "\xef\x89\x84" }, + { "$SYMBOL_BATTERY_FULL", (int32_t) "\xef\x89\x80" }, + { "$SYMBOL_BELL", (int32_t) "\xef\x83\xb3" }, + { "$SYMBOL_BLUETOOTH", (int32_t) "\xef\x8a\x93" }, + { "$SYMBOL_BULLET", (int32_t) "\xE2\x80\xA2" }, + { "$SYMBOL_CALL", (int32_t) "\xef\x82\x95" }, + { "$SYMBOL_CHARGE", (int32_t) "\xef\x83\xa7" }, + { "$SYMBOL_CLOSE", (int32_t) "\xef\x80\x8d" }, + { "$SYMBOL_COPY", (int32_t) "\xef\x83\x85" }, + { "$SYMBOL_CUT", (int32_t) "\xef\x83\x84" }, + { "$SYMBOL_DIRECTORY", (int32_t) "\xef\x81\xbb" }, + { "$SYMBOL_DOWN", (int32_t) "\xef\x81\xb8" }, + { "$SYMBOL_DOWNLOAD", (int32_t) "\xef\x80\x99" }, + { "$SYMBOL_DRIVE", (int32_t) "\xef\x80\x9c" }, + { "$SYMBOL_DUMMY", (int32_t) "\xEF\xA3\xBF" }, + { "$SYMBOL_EDIT", (int32_t) "\xef\x8C\x84" }, + { "$SYMBOL_EJECT", (int32_t) "\xef\x81\x92" }, + { "$SYMBOL_EYE_CLOSE", (int32_t) "\xef\x81\xb0" }, + { "$SYMBOL_EYE_OPEN", (int32_t) "\xef\x81\xae" }, + { "$SYMBOL_FILE", (int32_t) "\xef\x85\x9b" }, + { "$SYMBOL_GPS", (int32_t) "\xef\x84\xa4" }, + { "$SYMBOL_HOME", (int32_t) "\xef\x80\x95" }, + { "$SYMBOL_IMAGE", (int32_t) "\xef\x80\xbe" }, + { "$SYMBOL_KEYBOARD", (int32_t) "\xef\x84\x9c" }, + { "$SYMBOL_LEFT", (int32_t) "\xef\x81\x93" }, + { "$SYMBOL_LIST", (int32_t) "\xef\x80\x8b" }, + { "$SYMBOL_LOOP", (int32_t) "\xef\x81\xb9" }, + { "$SYMBOL_MINUS", (int32_t) "\xef\x81\xa8" }, + { "$SYMBOL_MUTE", (int32_t) "\xef\x80\xa6" }, + { "$SYMBOL_NEW_LINE", (int32_t) "\xef\xA2\xA2" }, + { "$SYMBOL_NEXT", (int32_t) "\xef\x81\x91" }, + { "$SYMBOL_OK", (int32_t) "\xef\x80\x8c" }, + { "$SYMBOL_PASTE", (int32_t) "\xef\x83\xAA" }, + { "$SYMBOL_PAUSE", (int32_t) "\xef\x81\x8c" }, + { "$SYMBOL_PLAY", (int32_t) "\xef\x81\x8b" }, + { "$SYMBOL_PLUS", (int32_t) "\xef\x81\xa7" }, + { "$SYMBOL_POWER", (int32_t) "\xef\x80\x91" }, + { "$SYMBOL_PREV", (int32_t) "\xef\x81\x88" }, + { "$SYMBOL_REFRESH", (int32_t) "\xef\x80\xa1" }, + { "$SYMBOL_RIGHT", (int32_t) "\xef\x81\x94" }, + { "$SYMBOL_SAVE", (int32_t) "\xef\x83\x87" }, + { "$SYMBOL_SD_CARD", (int32_t) "\xef\x9F\x82" }, + { "$SYMBOL_SETTINGS", (int32_t) "\xef\x80\x93" }, + { "$SYMBOL_SHUFFLE", (int32_t) "\xef\x81\xb4" }, + { "$SYMBOL_STOP", (int32_t) "\xef\x81\x8d" }, + { "$SYMBOL_TRASH", (int32_t) "\xef\x8B\xAD" }, + { "$SYMBOL_UP", (int32_t) "\xef\x81\xb7" }, + { "$SYMBOL_UPLOAD", (int32_t) "\xef\x82\x93" }, + { "$SYMBOL_USB", (int32_t) "\xef\x8a\x87" }, + { "$SYMBOL_VIDEO", (int32_t) "\xef\x80\x88" }, + { "$SYMBOL_VOLUME_MAX", (int32_t) "\xef\x80\xa8" }, + { "$SYMBOL_VOLUME_MID", (int32_t) "\xef\x80\xa7" }, + { "$SYMBOL_WARNING", (int32_t) "\xef\x81\xb1" }, + { "$SYMBOL_WIFI", (int32_t) "\xef\x87\xab" }, + { "TABLE_CELL_CTRL_CUSTOM_1", LV_TABLE_CELL_CTRL_CUSTOM_1 }, + { "TABLE_CELL_CTRL_CUSTOM_2", LV_TABLE_CELL_CTRL_CUSTOM_2 }, + { "TABLE_CELL_CTRL_CUSTOM_3", LV_TABLE_CELL_CTRL_CUSTOM_3 }, + { "TABLE_CELL_CTRL_CUSTOM_4", LV_TABLE_CELL_CTRL_CUSTOM_4 }, + { "TABLE_CELL_CTRL_MERGE_RIGHT", LV_TABLE_CELL_CTRL_MERGE_RIGHT }, + { "TABLE_CELL_CTRL_TEXT_CROP", LV_TABLE_CELL_CTRL_TEXT_CROP }, + { "TEXTAREA_CURSOR_LAST", LV_TEXTAREA_CURSOR_LAST }, + { "TEXT_ALIGN_AUTO", LV_TEXT_ALIGN_AUTO }, + { "TEXT_ALIGN_CENTER", LV_TEXT_ALIGN_CENTER }, + { "TEXT_ALIGN_LEFT", LV_TEXT_ALIGN_LEFT }, + { "TEXT_ALIGN_RIGHT", LV_TEXT_ALIGN_RIGHT }, + { "TEXT_CMD_STATE_IN", LV_TEXT_CMD_STATE_IN }, + { "TEXT_CMD_STATE_PAR", LV_TEXT_CMD_STATE_PAR }, + { "TEXT_CMD_STATE_WAIT", LV_TEXT_CMD_STATE_WAIT }, + { "TEXT_DECOR_NONE", LV_TEXT_DECOR_NONE }, + { "TEXT_DECOR_STRIKETHROUGH", LV_TEXT_DECOR_STRIKETHROUGH }, + { "TEXT_DECOR_UNDERLINE", LV_TEXT_DECOR_UNDERLINE }, + { "TEXT_FLAG_EXPAND", LV_TEXT_FLAG_EXPAND }, + { "TEXT_FLAG_FIT", LV_TEXT_FLAG_FIT }, + { "TEXT_FLAG_NONE", LV_TEXT_FLAG_NONE }, + { "TEXT_FLAG_RECOLOR", LV_TEXT_FLAG_RECOLOR }, + { "&font_montserrat", (int32_t) &lv0_load_montserrat_font }, + { "&font_robotocondensed_latin1", (int32_t) &lv0_load_robotocondensed_latin1_font }, + { "&font_seg7", (int32_t) &lv0_load_seg7_font }, + { "&load_font", (int32_t) &lv0_load_font }, + { "&load_freetype_font", (int32_t) &lv0_load_freetype_font }, + { "&montserrat_font", (int32_t) &lv0_load_montserrat_font }, + { "®ister_button_encoder", (int32_t) &lv0_register_button_encoder }, + { "&screenshot", (int32_t) &lv0_screenshot }, + { "&seg7_font", (int32_t) &lv0_load_seg7_font }, + +}; + +const size_t lv0_constants_size = sizeof(lv0_constants)/sizeof(lv0_constants[0]); + +/* generated */ +be_local_module(lv, + "lv", + be_nested_map(2, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("member", 719708611, 6, -1), be_const_func(lv0_member) }, + { be_nested_key("start", 1697318111, 5, 0), be_const_func(lv0_start) }, + })) +); +BE_EXPORT_VARIABLE be_define_const_native_module(lv); + +#endif // USE_LVGL + +/********************************************************************/ diff --git a/lib/libesp32/berry/default/be_lvgl_signal_arcs_lib.c b/lib/libesp32/berry/default/be_lvgl_signal_arcs_lib.c new file mode 100644 index 000000000..a127cddd9 --- /dev/null +++ b/lib/libesp32/berry/default/be_lvgl_signal_arcs_lib.c @@ -0,0 +1,434 @@ +/******************************************************************** + * Tasmota LVGL lv_signal_bars widget + *******************************************************************/ +#include "be_constobj.h" + +#ifdef USE_LVGL + +#include "lvgl.h" + +/******************************************************************** +** Solidified function: set_percentage +********************************************************************/ +be_local_closure(lv_signal_arcs_set_percentage, /* name */ + be_nested_proto( + 5, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(percentage), + /* K1 */ be_const_int(0), + /* K2 */ be_nested_str(invalidate), + }), + &be_const_str_set_percentage, + &be_const_str_solidified, + ( &(const binstruction[18]) { /* code */ + 0x88080100, // 0000 GETMBR R2 R0 K0 + 0x540E0018, // 0001 LDINT R3 25 + 0x0C080403, // 0002 DIV R2 R2 R3 + 0x540E0063, // 0003 LDINT R3 100 + 0x240C0203, // 0004 GT R3 R1 R3 + 0x780E0000, // 0005 JMPF R3 #0007 + 0x54060063, // 0006 LDINT R1 100 + 0x140C0301, // 0007 LT R3 R1 K1 + 0x780E0000, // 0008 JMPF R3 #000A + 0x58040001, // 0009 LDCONST R1 K1 + 0x90020001, // 000A SETMBR R0 K0 R1 + 0x540E0018, // 000B LDINT R3 25 + 0x0C0C0203, // 000C DIV R3 R1 R3 + 0x200C0403, // 000D NE R3 R2 R3 + 0x780E0001, // 000E JMPF R3 #0011 + 0x8C0C0102, // 000F GETMET R3 R0 K2 + 0x7C0C0200, // 0010 CALL R3 1 + 0x80000000, // 0011 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: init +********************************************************************/ +be_local_closure(lv_signal_arcs_init, /* name */ + be_nested_proto( + 6, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[10]) { /* constants */ + /* K0 */ be_nested_str(_lvgl), + /* K1 */ be_nested_str(create_custom_widget), + /* K2 */ be_nested_str(percentage), + /* K3 */ be_nested_str(p1), + /* K4 */ be_nested_str(lv), + /* K5 */ be_nested_str(point), + /* K6 */ be_nested_str(p2), + /* K7 */ be_nested_str(area), + /* K8 */ be_nested_str(line_dsc), + /* K9 */ be_nested_str(draw_line_dsc), + }), + &be_const_str_init, + &be_const_str_solidified, + ( &(const binstruction[24]) { /* code */ + 0xB80A0000, // 0000 GETNGBL R2 K0 + 0x8C080501, // 0001 GETMET R2 R2 K1 + 0x5C100000, // 0002 MOVE R4 R0 + 0x5C140200, // 0003 MOVE R5 R1 + 0x7C080600, // 0004 CALL R2 3 + 0x540A0063, // 0005 LDINT R2 100 + 0x90020402, // 0006 SETMBR R0 K2 R2 + 0xB80A0800, // 0007 GETNGBL R2 K4 + 0x8C080505, // 0008 GETMET R2 R2 K5 + 0x7C080200, // 0009 CALL R2 1 + 0x90020602, // 000A SETMBR R0 K3 R2 + 0xB80A0800, // 000B GETNGBL R2 K4 + 0x8C080505, // 000C GETMET R2 R2 K5 + 0x7C080200, // 000D CALL R2 1 + 0x90020C02, // 000E SETMBR R0 K6 R2 + 0xB80A0800, // 000F GETNGBL R2 K4 + 0x8C080507, // 0010 GETMET R2 R2 K7 + 0x7C080200, // 0011 CALL R2 1 + 0x90020E02, // 0012 SETMBR R0 K7 R2 + 0xB80A0800, // 0013 GETNGBL R2 K4 + 0x8C080509, // 0014 GETMET R2 R2 K9 + 0x7C080200, // 0015 CALL R2 1 + 0x90021002, // 0016 SETMBR R0 K8 R2 + 0x80000000, // 0017 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: widget_event +********************************************************************/ +be_local_closure(lv_signal_arcs_widget_event, /* name */ + be_nested_proto( + 28, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 1, /* has sup protos */ + ( &(const struct bproto*[ 1]) { + be_nested_proto( + 2, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_const_int(1), + }), + &be_const_str_atleast1, + &be_const_str_solidified, + ( &(const binstruction[ 6]) { /* code */ + 0x28040100, // 0000 GE R1 R0 K0 + 0x78060001, // 0001 JMPF R1 #0004 + 0x80040000, // 0002 RET 1 R0 + 0x70020000, // 0003 JMP #0005 + 0x80060000, // 0004 RET 1 K0 + 0x80000000, // 0005 RET 0 + }) + ), + }), + 1, /* has constants */ + ( &(const bvalue[35]) { /* constants */ + /* K0 */ be_nested_str(lv), + /* K1 */ be_nested_str(obj_event_base), + /* K2 */ be_nested_str(RES_OK), + /* K3 */ be_nested_str(code), + /* K4 */ be_nested_str(math), + /* K5 */ be_nested_str(get_height), + /* K6 */ be_nested_str(get_width), + /* K7 */ be_const_int(2), + /* K8 */ be_const_int(3), + /* K9 */ be_nested_str(EVENT_DRAW_MAIN), + /* K10 */ be_nested_str(area), + /* K11 */ be_nested_str(param), + /* K12 */ be_nested_str(get_coords), + /* K13 */ be_nested_str(x1), + /* K14 */ be_nested_str(y1), + /* K15 */ be_nested_str(draw_line_dsc_init), + /* K16 */ be_nested_str(line_dsc), + /* K17 */ be_nested_str(init_draw_line_dsc), + /* K18 */ be_nested_str(PART_MAIN), + /* K19 */ be_nested_str(round_start), + /* K20 */ be_const_int(1), + /* K21 */ be_nested_str(round_end), + /* K22 */ be_nested_str(width), + /* K23 */ be_nested_str(get_style_line_color), + /* K24 */ be_nested_str(STATE_DEFAULT), + /* K25 */ be_nested_str(get_style_bg_color), + /* K26 */ be_nested_str(deg), + /* K27 */ be_nested_str(acos), + /* K28 */ be_nested_str(p1), + /* K29 */ be_nested_str(x), + /* K30 */ be_nested_str(y), + /* K31 */ be_nested_str(color), + /* K32 */ be_nested_str(percentage), + /* K33 */ be_nested_str(draw_arc), + /* K34 */ be_const_int(0), + }), + &be_const_str_widget_event, + &be_const_str_solidified, + ( &(const binstruction[182]) { /* code */ + 0xB80E0000, // 0000 GETNGBL R3 K0 + 0x8C0C0701, // 0001 GETMET R3 R3 K1 + 0x5C140200, // 0002 MOVE R5 R1 + 0x5C180400, // 0003 MOVE R6 R2 + 0x7C0C0600, // 0004 CALL R3 3 + 0xB8120000, // 0005 GETNGBL R4 K0 + 0x88100902, // 0006 GETMBR R4 R4 K2 + 0x200C0604, // 0007 NE R3 R3 R4 + 0x780E0000, // 0008 JMPF R3 #000A + 0x80000600, // 0009 RET 0 + 0x880C0503, // 000A GETMBR R3 R2 K3 + 0xA4120800, // 000B IMPORT R4 K4 + 0x84140000, // 000C CLOSURE R5 P0 + 0x8C180105, // 000D GETMET R6 R0 K5 + 0x7C180200, // 000E CALL R6 1 + 0x8C1C0106, // 000F GETMET R7 R0 K6 + 0x7C1C0200, // 0010 CALL R7 1 + 0x5C200A00, // 0011 MOVE R8 R5 + 0x54260007, // 0012 LDINT R9 8 + 0x0C240C09, // 0013 DIV R9 R6 R9 + 0x7C200200, // 0014 CALL R8 1 + 0x5C240A00, // 0015 MOVE R9 R5 + 0x08281107, // 0016 MUL R10 R8 K7 + 0x04280C0A, // 0017 SUB R10 R6 R10 + 0x0C281508, // 0018 DIV R10 R10 K8 + 0x7C240200, // 0019 CALL R9 1 + 0x0C281307, // 001A DIV R10 R9 K7 + 0xB82E0000, // 001B GETNGBL R11 K0 + 0x882C1709, // 001C GETMBR R11 R11 K9 + 0x1C2C060B, // 001D EQ R11 R3 R11 + 0x782E0095, // 001E JMPF R11 #00B5 + 0xB82E0000, // 001F GETNGBL R11 K0 + 0x8C2C170A, // 0020 GETMET R11 R11 K10 + 0x8834050B, // 0021 GETMBR R13 R2 K11 + 0x7C2C0400, // 0022 CALL R11 2 + 0x8C30010C, // 0023 GETMET R12 R0 K12 + 0x8838010A, // 0024 GETMBR R14 R0 K10 + 0x7C300400, // 0025 CALL R12 2 + 0x8830010A, // 0026 GETMBR R12 R0 K10 + 0x8830190D, // 0027 GETMBR R12 R12 K13 + 0x8834010A, // 0028 GETMBR R13 R0 K10 + 0x88341B0E, // 0029 GETMBR R13 R13 K14 + 0xB83A0000, // 002A GETNGBL R14 K0 + 0x8C381D0F, // 002B GETMET R14 R14 K15 + 0x88400110, // 002C GETMBR R16 R0 K16 + 0x7C380400, // 002D CALL R14 2 + 0x8C380111, // 002E GETMET R14 R0 K17 + 0xB8420000, // 002F GETNGBL R16 K0 + 0x88402112, // 0030 GETMBR R16 R16 K18 + 0x88440110, // 0031 GETMBR R17 R0 K16 + 0x7C380600, // 0032 CALL R14 3 + 0x88380110, // 0033 GETMBR R14 R0 K16 + 0x903A2714, // 0034 SETMBR R14 K19 K20 + 0x88380110, // 0035 GETMBR R14 R0 K16 + 0x903A2B14, // 0036 SETMBR R14 K21 K20 + 0x88380110, // 0037 GETMBR R14 R0 K16 + 0x083C1308, // 0038 MUL R15 R9 K8 + 0x003C1F14, // 0039 ADD R15 R15 K20 + 0x54420003, // 003A LDINT R16 4 + 0x0C3C1E10, // 003B DIV R15 R15 R16 + 0x903A2C0F, // 003C SETMBR R14 K22 R15 + 0x8C380117, // 003D GETMET R14 R0 K23 + 0xB8420000, // 003E GETNGBL R16 K0 + 0x88402112, // 003F GETMBR R16 R16 K18 + 0xB8460000, // 0040 GETNGBL R17 K0 + 0x88442318, // 0041 GETMBR R17 R17 K24 + 0x30402011, // 0042 OR R16 R16 R17 + 0x7C380400, // 0043 CALL R14 2 + 0x8C3C0119, // 0044 GETMET R15 R0 K25 + 0xB8460000, // 0045 GETNGBL R17 K0 + 0x88442312, // 0046 GETMBR R17 R17 K18 + 0xB84A0000, // 0047 GETNGBL R18 K0 + 0x88482518, // 0048 GETMBR R18 R18 K24 + 0x30442212, // 0049 OR R17 R17 R18 + 0x7C3C0400, // 004A CALL R15 2 + 0x04400C09, // 004B SUB R16 R6 R9 + 0x0C440F07, // 004C DIV R17 R7 K7 + 0x0444220A, // 004D SUB R17 R17 R10 + 0x60480009, // 004E GETGBL R18 G9 + 0x544E0059, // 004F LDINT R19 90 + 0x8C50091A, // 0050 GETMET R20 R4 K26 + 0x8C58091B, // 0051 GETMET R22 R4 K27 + 0x6060000A, // 0052 GETGBL R24 G10 + 0x5C642200, // 0053 MOVE R25 R17 + 0x7C600200, // 0054 CALL R24 1 + 0x6064000A, // 0055 GETGBL R25 G10 + 0x5C682000, // 0056 MOVE R26 R16 + 0x7C640200, // 0057 CALL R25 1 + 0x0C603019, // 0058 DIV R24 R24 R25 + 0x7C580400, // 0059 CALL R22 2 + 0x7C500400, // 005A CALL R20 2 + 0x044C2614, // 005B SUB R19 R19 R20 + 0x7C480200, // 005C CALL R18 1 + 0x544E002C, // 005D LDINT R19 45 + 0x244C2413, // 005E GT R19 R18 R19 + 0x784E0000, // 005F JMPF R19 #0061 + 0x544A002C, // 0060 LDINT R18 45 + 0x884C011C, // 0061 GETMBR R19 R0 K28 + 0x0C500F07, // 0062 DIV R20 R7 K7 + 0x00501814, // 0063 ADD R20 R12 R20 + 0x904E3A14, // 0064 SETMBR R19 K29 R20 + 0x884C011C, // 0065 GETMBR R19 R0 K28 + 0x00501A06, // 0066 ADD R20 R13 R6 + 0x04502914, // 0067 SUB R20 R20 K20 + 0x0450280A, // 0068 SUB R20 R20 R10 + 0x904E3C14, // 0069 SETMBR R19 K30 R20 + 0x884C0110, // 006A GETMBR R19 R0 K16 + 0x88500120, // 006B GETMBR R20 R0 K32 + 0x54560018, // 006C LDINT R21 25 + 0x28502815, // 006D GE R20 R20 R21 + 0x78520001, // 006E JMPF R20 #0071 + 0x5C501C00, // 006F MOVE R20 R14 + 0x70020000, // 0070 JMP #0072 + 0x5C501E00, // 0071 MOVE R20 R15 + 0x904E3E14, // 0072 SETMBR R19 K31 R20 + 0xB84E0000, // 0073 GETNGBL R19 K0 + 0x8C4C2721, // 0074 GETMET R19 R19 K33 + 0x8854011C, // 0075 GETMBR R21 R0 K28 + 0x88542B1D, // 0076 GETMBR R21 R21 K29 + 0x8858011C, // 0077 GETMBR R22 R0 K28 + 0x88582D1E, // 0078 GETMBR R22 R22 K30 + 0x005C1208, // 0079 ADD R23 R9 R8 + 0x085E4417, // 007A MUL R23 K34 R23 + 0x005C2E0A, // 007B ADD R23 R23 R10 + 0x58600022, // 007C LDCONST R24 K34 + 0x54660167, // 007D LDINT R25 360 + 0x5C681600, // 007E MOVE R26 R11 + 0x886C0110, // 007F GETMBR R27 R0 K16 + 0x7C4C1000, // 0080 CALL R19 8 + 0x884C0110, // 0081 GETMBR R19 R0 K16 + 0x88500120, // 0082 GETMBR R20 R0 K32 + 0x54560031, // 0083 LDINT R21 50 + 0x28502815, // 0084 GE R20 R20 R21 + 0x78520001, // 0085 JMPF R20 #0088 + 0x5C501C00, // 0086 MOVE R20 R14 + 0x70020000, // 0087 JMP #0089 + 0x5C501E00, // 0088 MOVE R20 R15 + 0x904E3E14, // 0089 SETMBR R19 K31 R20 + 0xB84E0000, // 008A GETNGBL R19 K0 + 0x8C4C2721, // 008B GETMET R19 R19 K33 + 0x8854011C, // 008C GETMBR R21 R0 K28 + 0x88542B1D, // 008D GETMBR R21 R21 K29 + 0x8858011C, // 008E GETMBR R22 R0 K28 + 0x88582D1E, // 008F GETMBR R22 R22 K30 + 0x005C1208, // 0090 ADD R23 R9 R8 + 0x085E2817, // 0091 MUL R23 K20 R23 + 0x005C2E0A, // 0092 ADD R23 R23 R10 + 0x045C2F14, // 0093 SUB R23 R23 K20 + 0x5462010D, // 0094 LDINT R24 270 + 0x04603012, // 0095 SUB R24 R24 R18 + 0x5466010D, // 0096 LDINT R25 270 + 0x00643212, // 0097 ADD R25 R25 R18 + 0x5C681600, // 0098 MOVE R26 R11 + 0x886C0110, // 0099 GETMBR R27 R0 K16 + 0x7C4C1000, // 009A CALL R19 8 + 0x884C0110, // 009B GETMBR R19 R0 K16 + 0x88500120, // 009C GETMBR R20 R0 K32 + 0x5456004A, // 009D LDINT R21 75 + 0x28502815, // 009E GE R20 R20 R21 + 0x78520001, // 009F JMPF R20 #00A2 + 0x5C501C00, // 00A0 MOVE R20 R14 + 0x70020000, // 00A1 JMP #00A3 + 0x5C501E00, // 00A2 MOVE R20 R15 + 0x904E3E14, // 00A3 SETMBR R19 K31 R20 + 0xB84E0000, // 00A4 GETNGBL R19 K0 + 0x8C4C2721, // 00A5 GETMET R19 R19 K33 + 0x8854011C, // 00A6 GETMBR R21 R0 K28 + 0x88542B1D, // 00A7 GETMBR R21 R21 K29 + 0x8858011C, // 00A8 GETMBR R22 R0 K28 + 0x88582D1E, // 00A9 GETMBR R22 R22 K30 + 0x005C1208, // 00AA ADD R23 R9 R8 + 0x085E0E17, // 00AB MUL R23 K7 R23 + 0x005C2E0A, // 00AC ADD R23 R23 R10 + 0x045C2F07, // 00AD SUB R23 R23 K7 + 0x5462010D, // 00AE LDINT R24 270 + 0x04603012, // 00AF SUB R24 R24 R18 + 0x5466010D, // 00B0 LDINT R25 270 + 0x00643212, // 00B1 ADD R25 R25 R18 + 0x5C681600, // 00B2 MOVE R26 R11 + 0x886C0110, // 00B3 GETMBR R27 R0 K16 + 0x7C4C1000, // 00B4 CALL R19 8 + 0x80000000, // 00B5 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: get_percentage +********************************************************************/ +be_local_closure(lv_signal_arcs_get_percentage, /* name */ + be_nested_proto( + 2, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_str(percentage), + }), + &be_const_str_get_percentage, + &be_const_str_solidified, + ( &(const binstruction[ 2]) { /* code */ + 0x88040100, // 0000 GETMBR R1 R0 K0 + 0x80040200, // 0001 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified class: lv_signal_arcs +********************************************************************/ +extern const bclass be_class_lv_obj; +be_local_class(lv_signal_arcs, + 5, + &be_class_lv_obj, + be_nested_map(9, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(percentage, 4), be_const_var(0) }, + { be_const_key(p1, 3), be_const_var(1) }, + { be_const_key(p2, -1), be_const_var(2) }, + { be_const_key(area, -1), be_const_var(3) }, + { be_const_key(line_dsc, -1), be_const_var(4) }, + { be_const_key(set_percentage, -1), be_const_closure(lv_signal_arcs_set_percentage_closure) }, + { be_const_key(init, -1), be_const_closure(lv_signal_arcs_init_closure) }, + { be_const_key(widget_event, -1), be_const_closure(lv_signal_arcs_widget_event_closure) }, + { be_const_key(get_percentage, 5), be_const_closure(lv_signal_arcs_get_percentage_closure) }, + })), + be_str_literal("lv_signal_arcs") +); +/*******************************************************************/ + +void be_load_lv_signal_arcs_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_signal_arcs); + be_setglobal(vm, "lv_signal_arcs"); + be_pop(vm, 1); +} + +#endif // USE_LVGL \ No newline at end of file diff --git a/lib/libesp32/berry/default/be_lvgl_signal_bars_lib.c b/lib/libesp32/berry/default/be_lvgl_signal_bars_lib.c new file mode 100644 index 000000000..18452ae34 --- /dev/null +++ b/lib/libesp32/berry/default/be_lvgl_signal_bars_lib.c @@ -0,0 +1,392 @@ +/******************************************************************** + * Tasmota LVGL lv_signal_bars widget + *******************************************************************/ +#include "be_constobj.h" + +#ifdef USE_LVGL + +#include "lvgl.h" + +/******************************************************************** +** Solidified function: set_percentage +********************************************************************/ +be_local_closure(lv_signal_bars_set_percentage, /* name */ + be_nested_proto( + 5, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(percentage), + /* K1 */ be_const_int(0), + /* K2 */ be_nested_str(invalidate), + }), + &be_const_str_set_percentage, + &be_const_str_solidified, + ( &(const binstruction[18]) { /* code */ + 0x88080100, // 0000 GETMBR R2 R0 K0 + 0x540E0013, // 0001 LDINT R3 20 + 0x0C080403, // 0002 DIV R2 R2 R3 + 0x540E0063, // 0003 LDINT R3 100 + 0x240C0203, // 0004 GT R3 R1 R3 + 0x780E0000, // 0005 JMPF R3 #0007 + 0x54060063, // 0006 LDINT R1 100 + 0x140C0301, // 0007 LT R3 R1 K1 + 0x780E0000, // 0008 JMPF R3 #000A + 0x58040001, // 0009 LDCONST R1 K1 + 0x90020001, // 000A SETMBR R0 K0 R1 + 0x540E0013, // 000B LDINT R3 20 + 0x0C0C0203, // 000C DIV R3 R1 R3 + 0x200C0403, // 000D NE R3 R2 R3 + 0x780E0001, // 000E JMPF R3 #0011 + 0x8C0C0102, // 000F GETMET R3 R0 K2 + 0x7C0C0200, // 0010 CALL R3 1 + 0x80000000, // 0011 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: init +********************************************************************/ +be_local_closure(lv_signal_bars_init, /* name */ + be_nested_proto( + 6, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[10]) { /* constants */ + /* K0 */ be_nested_str(_lvgl), + /* K1 */ be_nested_str(create_custom_widget), + /* K2 */ be_nested_str(percentage), + /* K3 */ be_nested_str(p1), + /* K4 */ be_nested_str(lv), + /* K5 */ be_nested_str(point), + /* K6 */ be_nested_str(p2), + /* K7 */ be_nested_str(area), + /* K8 */ be_nested_str(line_dsc), + /* K9 */ be_nested_str(draw_line_dsc), + }), + &be_const_str_init, + &be_const_str_solidified, + ( &(const binstruction[24]) { /* code */ + 0xB80A0000, // 0000 GETNGBL R2 K0 + 0x8C080501, // 0001 GETMET R2 R2 K1 + 0x5C100000, // 0002 MOVE R4 R0 + 0x5C140200, // 0003 MOVE R5 R1 + 0x7C080600, // 0004 CALL R2 3 + 0x540A0063, // 0005 LDINT R2 100 + 0x90020402, // 0006 SETMBR R0 K2 R2 + 0xB80A0800, // 0007 GETNGBL R2 K4 + 0x8C080505, // 0008 GETMET R2 R2 K5 + 0x7C080200, // 0009 CALL R2 1 + 0x90020602, // 000A SETMBR R0 K3 R2 + 0xB80A0800, // 000B GETNGBL R2 K4 + 0x8C080505, // 000C GETMET R2 R2 K5 + 0x7C080200, // 000D CALL R2 1 + 0x90020C02, // 000E SETMBR R0 K6 R2 + 0xB80A0800, // 000F GETNGBL R2 K4 + 0x8C080507, // 0010 GETMET R2 R2 K7 + 0x7C080200, // 0011 CALL R2 1 + 0x90020E02, // 0012 SETMBR R0 K7 R2 + 0xB80A0800, // 0013 GETNGBL R2 K4 + 0x8C080509, // 0014 GETMET R2 R2 K9 + 0x7C080200, // 0015 CALL R2 1 + 0x90021002, // 0016 SETMBR R0 K8 R2 + 0x80000000, // 0017 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: widget_event +********************************************************************/ +be_local_closure(lv_signal_bars_widget_event, /* name */ + be_nested_proto( + 23, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 1, /* has sup protos */ + ( &(const struct bproto*[ 1]) { + be_nested_proto( + 2, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_const_int(1), + }), + &be_const_str_atleast1, + &be_const_str_solidified, + ( &(const binstruction[ 6]) { /* code */ + 0x28040100, // 0000 GE R1 R0 K0 + 0x78060001, // 0001 JMPF R1 #0004 + 0x80040000, // 0002 RET 1 R0 + 0x70020000, // 0003 JMP #0005 + 0x80060000, // 0004 RET 1 K0 + 0x80000000, // 0005 RET 0 + }) + ), + }), + 1, /* has constants */ + ( &(const bvalue[37]) { /* constants */ + /* K0 */ be_nested_str(lv), + /* K1 */ be_nested_str(obj_event_base), + /* K2 */ be_nested_str(RES_OK), + /* K3 */ be_nested_str(code), + /* K4 */ be_nested_str(get_height), + /* K5 */ be_nested_str(get_width), + /* K6 */ be_const_int(3), + /* K7 */ be_const_int(2), + /* K8 */ be_nested_str(EVENT_DRAW_MAIN), + /* K9 */ be_nested_str(area), + /* K10 */ be_nested_str(param), + /* K11 */ be_nested_str(get_coords), + /* K12 */ be_nested_str(x1), + /* K13 */ be_nested_str(y1), + /* K14 */ be_nested_str(draw_line_dsc_init), + /* K15 */ be_nested_str(line_dsc), + /* K16 */ be_nested_str(init_draw_line_dsc), + /* K17 */ be_nested_str(PART_MAIN), + /* K18 */ be_nested_str(round_start), + /* K19 */ be_const_int(1), + /* K20 */ be_nested_str(round_end), + /* K21 */ be_nested_str(width), + /* K22 */ be_nested_str(get_style_line_color), + /* K23 */ be_nested_str(STATE_DEFAULT), + /* K24 */ be_nested_str(get_style_bg_color), + /* K25 */ be_nested_str(event_send), + /* K26 */ be_nested_str(EVENT_DRAW_PART_BEGIN), + /* K27 */ be_const_int(0), + /* K28 */ be_nested_str(color), + /* K29 */ be_nested_str(percentage), + /* K30 */ be_nested_str(p1), + /* K31 */ be_nested_str(y), + /* K32 */ be_nested_str(x), + /* K33 */ be_nested_str(p2), + /* K34 */ be_nested_str(draw_line), + /* K35 */ be_nested_str(stop_iteration), + /* K36 */ be_nested_str(EVENT_DRAW_PART_END), + }), + &be_const_str_widget_event, + &be_const_str_solidified, + ( &(const binstruction[138]) { /* code */ + 0xB80E0000, // 0000 GETNGBL R3 K0 + 0x8C0C0701, // 0001 GETMET R3 R3 K1 + 0x5C140200, // 0002 MOVE R5 R1 + 0x5C180400, // 0003 MOVE R6 R2 + 0x7C0C0600, // 0004 CALL R3 3 + 0xB8120000, // 0005 GETNGBL R4 K0 + 0x88100902, // 0006 GETMBR R4 R4 K2 + 0x200C0604, // 0007 NE R3 R3 R4 + 0x780E0000, // 0008 JMPF R3 #000A + 0x80000600, // 0009 RET 0 + 0x880C0503, // 000A GETMBR R3 R2 K3 + 0x84100000, // 000B CLOSURE R4 P0 + 0x8C140104, // 000C GETMET R5 R0 K4 + 0x7C140200, // 000D CALL R5 1 + 0x8C180105, // 000E GETMET R6 R0 K5 + 0x7C180200, // 000F CALL R6 1 + 0x5C1C0800, // 0010 MOVE R7 R4 + 0x5422000E, // 0011 LDINT R8 15 + 0x0C200C08, // 0012 DIV R8 R6 R8 + 0x7C1C0200, // 0013 CALL R7 1 + 0x5C200800, // 0014 MOVE R8 R4 + 0x08240F06, // 0015 MUL R9 R7 K6 + 0x04240C09, // 0016 SUB R9 R6 R9 + 0x542A0003, // 0017 LDINT R10 4 + 0x0C24120A, // 0018 DIV R9 R9 R10 + 0x7C200200, // 0019 CALL R8 1 + 0x0C241107, // 001A DIV R9 R8 K7 + 0xB82A0000, // 001B GETNGBL R10 K0 + 0x88281508, // 001C GETMBR R10 R10 K8 + 0x1C28060A, // 001D EQ R10 R3 R10 + 0x782A0069, // 001E JMPF R10 #0089 + 0xB82A0000, // 001F GETNGBL R10 K0 + 0x8C281509, // 0020 GETMET R10 R10 K9 + 0x8830050A, // 0021 GETMBR R12 R2 K10 + 0x7C280400, // 0022 CALL R10 2 + 0x8C2C010B, // 0023 GETMET R11 R0 K11 + 0x88340109, // 0024 GETMBR R13 R0 K9 + 0x7C2C0400, // 0025 CALL R11 2 + 0x882C0109, // 0026 GETMBR R11 R0 K9 + 0x882C170C, // 0027 GETMBR R11 R11 K12 + 0x88300109, // 0028 GETMBR R12 R0 K9 + 0x8830190D, // 0029 GETMBR R12 R12 K13 + 0xB8360000, // 002A GETNGBL R13 K0 + 0x8C341B0E, // 002B GETMET R13 R13 K14 + 0x883C010F, // 002C GETMBR R15 R0 K15 + 0x7C340400, // 002D CALL R13 2 + 0x8C340110, // 002E GETMET R13 R0 K16 + 0xB83E0000, // 002F GETNGBL R15 K0 + 0x883C1F11, // 0030 GETMBR R15 R15 K17 + 0x8840010F, // 0031 GETMBR R16 R0 K15 + 0x7C340600, // 0032 CALL R13 3 + 0x8834010F, // 0033 GETMBR R13 R0 K15 + 0x90362513, // 0034 SETMBR R13 K18 K19 + 0x8834010F, // 0035 GETMBR R13 R0 K15 + 0x90362913, // 0036 SETMBR R13 K20 K19 + 0x8834010F, // 0037 GETMBR R13 R0 K15 + 0x90362A08, // 0038 SETMBR R13 K21 R8 + 0x8C340116, // 0039 GETMET R13 R0 K22 + 0xB83E0000, // 003A GETNGBL R15 K0 + 0x883C1F11, // 003B GETMBR R15 R15 K17 + 0xB8420000, // 003C GETNGBL R16 K0 + 0x88402117, // 003D GETMBR R16 R16 K23 + 0x303C1E10, // 003E OR R15 R15 R16 + 0x7C340400, // 003F CALL R13 2 + 0x8C380118, // 0040 GETMET R14 R0 K24 + 0xB8420000, // 0041 GETNGBL R16 K0 + 0x88402111, // 0042 GETMBR R16 R16 K17 + 0xB8460000, // 0043 GETNGBL R17 K0 + 0x88442317, // 0044 GETMBR R17 R17 K23 + 0x30402011, // 0045 OR R16 R16 R17 + 0x7C380400, // 0046 CALL R14 2 + 0xB83E0000, // 0047 GETNGBL R15 K0 + 0x8C3C1F19, // 0048 GETMET R15 R15 K25 + 0x5C440000, // 0049 MOVE R17 R0 + 0xB84A0000, // 004A GETNGBL R18 K0 + 0x8848251A, // 004B GETMBR R18 R18 K26 + 0x884C010F, // 004C GETMBR R19 R0 K15 + 0x7C3C0800, // 004D CALL R15 4 + 0x603C0010, // 004E GETGBL R15 G16 + 0x40423706, // 004F CONNECT R16 K27 K6 + 0x7C3C0200, // 0050 CALL R15 1 + 0xA802002C, // 0051 EXBLK 0 #007F + 0x5C401E00, // 0052 MOVE R16 R15 + 0x7C400000, // 0053 CALL R16 0 + 0x8844010F, // 0054 GETMBR R17 R0 K15 + 0x8848011D, // 0055 GETMBR R18 R0 K29 + 0x004C2113, // 0056 ADD R19 R16 K19 + 0x54520013, // 0057 LDINT R20 20 + 0x084C2614, // 0058 MUL R19 R19 R20 + 0x28482413, // 0059 GE R18 R18 R19 + 0x784A0001, // 005A JMPF R18 #005D + 0x5C481A00, // 005B MOVE R18 R13 + 0x70020000, // 005C JMP #005E + 0x5C481C00, // 005D MOVE R18 R14 + 0x90463812, // 005E SETMBR R17 K28 R18 + 0x8844011E, // 005F GETMBR R17 R0 K30 + 0x00481805, // 0060 ADD R18 R12 R5 + 0x04482513, // 0061 SUB R18 R18 K19 + 0x04482409, // 0062 SUB R18 R18 R9 + 0x90463E12, // 0063 SETMBR R17 K31 R18 + 0x8844011E, // 0064 GETMBR R17 R0 K30 + 0x00481007, // 0065 ADD R18 R8 R7 + 0x08482012, // 0066 MUL R18 R16 R18 + 0x00481612, // 0067 ADD R18 R11 R18 + 0x00482409, // 0068 ADD R18 R18 R9 + 0x90464012, // 0069 SETMBR R17 K32 R18 + 0x88440121, // 006A GETMBR R17 R0 K33 + 0x044A0C10, // 006B SUB R18 K6 R16 + 0x044C0A08, // 006C SUB R19 R5 R8 + 0x08482413, // 006D MUL R18 R18 R19 + 0x544E0003, // 006E LDINT R19 4 + 0x0C482413, // 006F DIV R18 R18 R19 + 0x00481812, // 0070 ADD R18 R12 R18 + 0x00482409, // 0071 ADD R18 R18 R9 + 0x90463E12, // 0072 SETMBR R17 K31 R18 + 0x88440121, // 0073 GETMBR R17 R0 K33 + 0x8848011E, // 0074 GETMBR R18 R0 K30 + 0x88482520, // 0075 GETMBR R18 R18 K32 + 0x90464012, // 0076 SETMBR R17 K32 R18 + 0xB8460000, // 0077 GETNGBL R17 K0 + 0x8C442322, // 0078 GETMET R17 R17 K34 + 0x884C011E, // 0079 GETMBR R19 R0 K30 + 0x88500121, // 007A GETMBR R20 R0 K33 + 0x5C541400, // 007B MOVE R21 R10 + 0x8858010F, // 007C GETMBR R22 R0 K15 + 0x7C440A00, // 007D CALL R17 5 + 0x7001FFD2, // 007E JMP #0052 + 0x583C0023, // 007F LDCONST R15 K35 + 0xAC3C0200, // 0080 CATCH R15 1 0 + 0xB0080000, // 0081 RAISE 2 R0 R0 + 0xB83E0000, // 0082 GETNGBL R15 K0 + 0x8C3C1F19, // 0083 GETMET R15 R15 K25 + 0x5C440000, // 0084 MOVE R17 R0 + 0xB84A0000, // 0085 GETNGBL R18 K0 + 0x88482524, // 0086 GETMBR R18 R18 K36 + 0x884C010F, // 0087 GETMBR R19 R0 K15 + 0x7C3C0800, // 0088 CALL R15 4 + 0x80000000, // 0089 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: get_percentage +********************************************************************/ +be_local_closure(lv_signal_bars_get_percentage, /* name */ + be_nested_proto( + 2, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_nested_str(percentage), + }), + &be_const_str_get_percentage, + &be_const_str_solidified, + ( &(const binstruction[ 2]) { /* code */ + 0x88040100, // 0000 GETMBR R1 R0 K0 + 0x80040200, // 0001 RET 1 R1 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified class: lv_signal_bars +********************************************************************/ +extern const bclass be_class_lv_obj; +be_local_class(lv_signal_bars, + 5, + &be_class_lv_obj, + be_nested_map(9, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(percentage, 4), be_const_var(0) }, + { be_const_key(p1, 3), be_const_var(1) }, + { be_const_key(p2, -1), be_const_var(2) }, + { be_const_key(area, -1), be_const_var(3) }, + { be_const_key(line_dsc, -1), be_const_var(4) }, + { be_const_key(set_percentage, -1), be_const_closure(lv_signal_bars_set_percentage_closure) }, + { be_const_key(init, -1), be_const_closure(lv_signal_bars_init_closure) }, + { be_const_key(widget_event, -1), be_const_closure(lv_signal_bars_widget_event_closure) }, + { be_const_key(get_percentage, 5), be_const_closure(lv_signal_bars_get_percentage_closure) }, + })), + be_str_literal("lv_signal_bars") +); +/*******************************************************************/ + +void be_load_lv_signal_bars_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_signal_bars); + be_setglobal(vm, "lv_signal_bars"); + be_pop(vm, 1); +} + +#endif // USE_LVGL \ No newline at end of file diff --git a/lib/libesp32/berry/default/be_lvgl_widgets_lib.c b/lib/libesp32/berry/default/be_lvgl_widgets_lib.c new file mode 100644 index 000000000..68950d144 --- /dev/null +++ b/lib/libesp32/berry/default/be_lvgl_widgets_lib.c @@ -0,0 +1,1564 @@ + +/******************************************************************** + * Generated code, don't edit + *******************************************************************/ + + /******************************************************************** + * Tasmota LVGL classes for widgets + *******************************************************************/ +#include "be_constobj.h" + +#ifdef USE_LVGL + +#include "lvgl.h" + +extern int lv0_init(bvm *vm); + +extern int lco_init(bvm *vm); // generic function +extern int lco_tostring(bvm *vm); // generic function +extern int lco_toint(bvm *vm); // generic function + +extern int lvx_member(bvm *vm); +extern int lvx_tostring(bvm *vm); // generic function + +extern int lvs_init(bvm *vm); +extern int lvs_tostring(bvm *vm); + +BE_EXPORT_VARIABLE extern const bclass be_class_lv_obj; + +extern int lvbe_font_create(bvm *vm); +extern int lvbe_theme_create(bvm *vm); + + +/* `lv_style` external functions definitions */ +extern int lvbe_style_set_width(bvm *vm); +extern int lvbe_style_set_min_width(bvm *vm); +extern int lvbe_style_set_max_width(bvm *vm); +extern int lvbe_style_set_height(bvm *vm); +extern int lvbe_style_set_min_height(bvm *vm); +extern int lvbe_style_set_max_height(bvm *vm); +extern int lvbe_style_set_x(bvm *vm); +extern int lvbe_style_set_y(bvm *vm); +extern int lvbe_style_set_align(bvm *vm); +extern int lvbe_style_set_transform_width(bvm *vm); +extern int lvbe_style_set_transform_height(bvm *vm); +extern int lvbe_style_set_translate_x(bvm *vm); +extern int lvbe_style_set_translate_y(bvm *vm); +extern int lvbe_style_set_transform_zoom(bvm *vm); +extern int lvbe_style_set_transform_angle(bvm *vm); +extern int lvbe_style_set_pad_top(bvm *vm); +extern int lvbe_style_set_pad_bottom(bvm *vm); +extern int lvbe_style_set_pad_left(bvm *vm); +extern int lvbe_style_set_pad_right(bvm *vm); +extern int lvbe_style_set_pad_row(bvm *vm); +extern int lvbe_style_set_pad_column(bvm *vm); +extern int lvbe_style_set_radius(bvm *vm); +extern int lvbe_style_set_clip_corner(bvm *vm); +extern int lvbe_style_set_opa(bvm *vm); +extern int lvbe_style_set_color_filter_dsc(bvm *vm); +extern int lvbe_style_set_color_filter_opa(bvm *vm); +extern int lvbe_style_set_anim_time(bvm *vm); +extern int lvbe_style_set_anim_speed(bvm *vm); +extern int lvbe_style_set_transition(bvm *vm); +extern int lvbe_style_set_blend_mode(bvm *vm); +extern int lvbe_style_set_layout(bvm *vm); +extern int lvbe_style_set_base_dir(bvm *vm); +extern int lvbe_style_set_bg_color(bvm *vm); +extern int lvbe_style_set_bg_color_filtered(bvm *vm); +extern int lvbe_style_set_bg_opa(bvm *vm); +extern int lvbe_style_set_bg_grad_color(bvm *vm); +extern int lvbe_style_set_bg_grad_color_filtered(bvm *vm); +extern int lvbe_style_set_bg_grad_dir(bvm *vm); +extern int lvbe_style_set_bg_main_stop(bvm *vm); +extern int lvbe_style_set_bg_grad_stop(bvm *vm); +extern int lvbe_style_set_bg_img_src(bvm *vm); +extern int lvbe_style_set_bg_img_opa(bvm *vm); +extern int lvbe_style_set_bg_img_recolor(bvm *vm); +extern int lvbe_style_set_bg_img_recolor_filtered(bvm *vm); +extern int lvbe_style_set_bg_img_recolor_opa(bvm *vm); +extern int lvbe_style_set_bg_img_tiled(bvm *vm); +extern int lvbe_style_set_border_color(bvm *vm); +extern int lvbe_style_set_border_color_filtered(bvm *vm); +extern int lvbe_style_set_border_opa(bvm *vm); +extern int lvbe_style_set_border_width(bvm *vm); +extern int lvbe_style_set_border_side(bvm *vm); +extern int lvbe_style_set_border_post(bvm *vm); +extern int lvbe_style_set_text_color(bvm *vm); +extern int lvbe_style_set_text_color_filtered(bvm *vm); +extern int lvbe_style_set_text_opa(bvm *vm); +extern int lvbe_style_set_text_font(bvm *vm); +extern int lvbe_style_set_text_letter_space(bvm *vm); +extern int lvbe_style_set_text_line_space(bvm *vm); +extern int lvbe_style_set_text_decor(bvm *vm); +extern int lvbe_style_set_text_align(bvm *vm); +extern int lvbe_style_set_img_opa(bvm *vm); +extern int lvbe_style_set_img_recolor(bvm *vm); +extern int lvbe_style_set_img_recolor_filtered(bvm *vm); +extern int lvbe_style_set_img_recolor_opa(bvm *vm); +extern int lvbe_style_set_outline_width(bvm *vm); +extern int lvbe_style_set_outline_color(bvm *vm); +extern int lvbe_style_set_outline_color_filtered(bvm *vm); +extern int lvbe_style_set_outline_opa(bvm *vm); +extern int lvbe_style_set_outline_pad(bvm *vm); +extern int lvbe_style_set_shadow_width(bvm *vm); +extern int lvbe_style_set_shadow_ofs_x(bvm *vm); +extern int lvbe_style_set_shadow_ofs_y(bvm *vm); +extern int lvbe_style_set_shadow_spread(bvm *vm); +extern int lvbe_style_set_shadow_color(bvm *vm); +extern int lvbe_style_set_shadow_color_filtered(bvm *vm); +extern int lvbe_style_set_shadow_opa(bvm *vm); +extern int lvbe_style_set_line_width(bvm *vm); +extern int lvbe_style_set_line_dash_width(bvm *vm); +extern int lvbe_style_set_line_dash_gap(bvm *vm); +extern int lvbe_style_set_line_rounded(bvm *vm); +extern int lvbe_style_set_line_color(bvm *vm); +extern int lvbe_style_set_line_color_filtered(bvm *vm); +extern int lvbe_style_set_line_opa(bvm *vm); +extern int lvbe_style_set_arc_width(bvm *vm); +extern int lvbe_style_set_arc_rounded(bvm *vm); +extern int lvbe_style_set_arc_color(bvm *vm); +extern int lvbe_style_set_arc_color_filtered(bvm *vm); +extern int lvbe_style_set_arc_opa(bvm *vm); +extern int lvbe_style_set_arc_img_src(bvm *vm); + +/* `lv_font` external functions definitions */ + +/* `lv_color` external functions definitions */ + +/* `lv_theme` external functions definitions */ + +/* `lv_img` external functions definitions */ +extern int lvbe_img_set_tasmota_logo(bvm *vm); +extern int lvbe_img_create(bvm *vm); +extern int lvbe_img_set_src(bvm *vm); +extern int lvbe_img_set_offset_x(bvm *vm); +extern int lvbe_img_set_offset_y(bvm *vm); +extern int lvbe_img_set_angle(bvm *vm); +extern int lvbe_img_set_pivot(bvm *vm); +extern int lvbe_img_set_zoom(bvm *vm); +extern int lvbe_img_set_antialias(bvm *vm); +extern int lvbe_img_get_src(bvm *vm); +extern int lvbe_img_get_offset_x(bvm *vm); +extern int lvbe_img_get_offset_y(bvm *vm); +extern int lvbe_img_get_angle(bvm *vm); +extern int lvbe_img_get_pivot(bvm *vm); +extern int lvbe_img_get_zoom(bvm *vm); +extern int lvbe_img_get_antialias(bvm *vm); + +/* `lv_disp` external functions definitions */ +extern int lvbe_disp_get_scr_act(bvm *vm); +extern int lvbe_disp_get_scr_prev(bvm *vm); +extern int lvbe_disp_load_scr(bvm *vm); +extern int lvbe_disp_get_layer_top(bvm *vm); +extern int lvbe_disp_get_layer_sys(bvm *vm); +extern int lvbe_disp_set_theme(bvm *vm); +extern int lvbe_disp_get_theme(bvm *vm); +extern int lvbe_disp_set_bg_color(bvm *vm); +extern int lvbe_disp_set_bg_image(bvm *vm); +extern int lvbe_disp_set_bg_opa(bvm *vm); +extern int lvbe_disp_get_inactive_time(bvm *vm); +extern int lvbe_disp_trig_activity(bvm *vm); +extern int lvbe_disp_clean_dcache(bvm *vm); +extern int lvbe_disp_dpx(bvm *vm); + +/* `lv_obj` external functions definitions */ +extern int lvbe_obj_add_event_cb(bvm *vm); +extern int lvbe_obj_remove_event_cb(bvm *vm); +extern int lvbe_obj_remove_event_dsc(bvm *vm); +extern int lvbe_obj_create(bvm *vm); +extern int lvbe_obj_add_flag(bvm *vm); +extern int lvbe_obj_clear_flag(bvm *vm); +extern int lvbe_obj_add_state(bvm *vm); +extern int lvbe_obj_clear_state(bvm *vm); +extern int lvbe_obj_set_user_data(bvm *vm); +extern int lvbe_obj_has_flag(bvm *vm); +extern int lvbe_obj_has_flag_any(bvm *vm); +extern int lvbe_obj_get_state(bvm *vm); +extern int lvbe_obj_has_state(bvm *vm); +extern int lvbe_obj_get_group(bvm *vm); +extern int lvbe_obj_get_user_data(bvm *vm); +extern int lvbe_obj_allocate_spec_attr(bvm *vm); +extern int lvbe_obj_check_type(bvm *vm); +extern int lvbe_obj_has_class(bvm *vm); +extern int lvbe_obj_get_class(bvm *vm); +extern int lvbe_obj_is_valid(bvm *vm); +extern int lvbe_obj_dpx(bvm *vm); +extern int lvbe_obj_class_init_obj(bvm *vm); +extern int lvbe_obj_is_editable(bvm *vm); +extern int lvbe_obj_is_group_def(bvm *vm); +extern int lvbe_obj_init_draw_rect_dsc(bvm *vm); +extern int lvbe_obj_init_draw_label_dsc(bvm *vm); +extern int lvbe_obj_init_draw_img_dsc(bvm *vm); +extern int lvbe_obj_init_draw_line_dsc(bvm *vm); +extern int lvbe_obj_init_draw_arc_dsc(bvm *vm); +extern int lvbe_obj_calculate_ext_draw_size(bvm *vm); +extern int lvbe_obj_refresh_ext_draw_size(bvm *vm); +extern int lvbe_obj_set_pos(bvm *vm); +extern int lvbe_obj_set_x(bvm *vm); +extern int lvbe_obj_set_y(bvm *vm); +extern int lvbe_obj_set_size(bvm *vm); +extern int lvbe_obj_refr_size(bvm *vm); +extern int lvbe_obj_set_width(bvm *vm); +extern int lvbe_obj_set_height(bvm *vm); +extern int lvbe_obj_set_content_width(bvm *vm); +extern int lvbe_obj_set_content_height(bvm *vm); +extern int lvbe_obj_set_layout(bvm *vm); +extern int lvbe_obj_is_layout_positioned(bvm *vm); +extern int lvbe_obj_mark_layout_as_dirty(bvm *vm); +extern int lvbe_obj_update_layout(bvm *vm); +extern int lvbe_obj_set_align(bvm *vm); +extern int lvbe_obj_align(bvm *vm); +extern int lvbe_obj_align_to(bvm *vm); +extern int lvbe_obj_center(bvm *vm); +extern int lvbe_obj_get_coords(bvm *vm); +extern int lvbe_obj_get_x(bvm *vm); +extern int lvbe_obj_get_x2(bvm *vm); +extern int lvbe_obj_get_y(bvm *vm); +extern int lvbe_obj_get_y2(bvm *vm); +extern int lvbe_obj_get_width(bvm *vm); +extern int lvbe_obj_get_height(bvm *vm); +extern int lvbe_obj_get_content_width(bvm *vm); +extern int lvbe_obj_get_content_height(bvm *vm); +extern int lvbe_obj_get_content_coords(bvm *vm); +extern int lvbe_obj_get_self_width(bvm *vm); +extern int lvbe_obj_get_self_height(bvm *vm); +extern int lvbe_obj_refresh_self_size(bvm *vm); +extern int lvbe_obj_refr_pos(bvm *vm); +extern int lvbe_obj_move_to(bvm *vm); +extern int lvbe_obj_move_children_by(bvm *vm); +extern int lvbe_obj_invalidate_area(bvm *vm); +extern int lvbe_obj_invalidate(bvm *vm); +extern int lvbe_obj_area_is_visible(bvm *vm); +extern int lvbe_obj_is_visible(bvm *vm); +extern int lvbe_obj_set_ext_click_area(bvm *vm); +extern int lvbe_obj_get_click_area(bvm *vm); +extern int lvbe_obj_hit_test(bvm *vm); +extern int lvbe_obj_set_scrollbar_mode(bvm *vm); +extern int lvbe_obj_set_scroll_dir(bvm *vm); +extern int lvbe_obj_set_scroll_snap_x(bvm *vm); +extern int lvbe_obj_set_scroll_snap_y(bvm *vm); +extern int lvbe_obj_get_scrollbar_mode(bvm *vm); +extern int lvbe_obj_get_scroll_dir(bvm *vm); +extern int lvbe_obj_get_scroll_snap_x(bvm *vm); +extern int lvbe_obj_get_scroll_snap_y(bvm *vm); +extern int lvbe_obj_get_scroll_x(bvm *vm); +extern int lvbe_obj_get_scroll_y(bvm *vm); +extern int lvbe_obj_get_scroll_top(bvm *vm); +extern int lvbe_obj_get_scroll_bottom(bvm *vm); +extern int lvbe_obj_get_scroll_left(bvm *vm); +extern int lvbe_obj_get_scroll_right(bvm *vm); +extern int lvbe_obj_get_scroll_end(bvm *vm); +extern int lvbe_obj_scroll_by(bvm *vm); +extern int lvbe_obj_scroll_to(bvm *vm); +extern int lvbe_obj_scroll_to_x(bvm *vm); +extern int lvbe_obj_scroll_to_y(bvm *vm); +extern int lvbe_obj_scroll_to_view(bvm *vm); +extern int lvbe_obj_scroll_to_view_recursive(bvm *vm); +extern int lvbe_obj_is_scrolling(bvm *vm); +extern int lvbe_obj_update_snap(bvm *vm); +extern int lvbe_obj_get_scrollbar_area(bvm *vm); +extern int lvbe_obj_scrollbar_invalidate(bvm *vm); +extern int lvbe_obj_readjust_scroll(bvm *vm); +extern int lvbe_obj_add_style(bvm *vm); +extern int lvbe_obj_remove_style(bvm *vm); +extern int lvbe_obj_remove_style_all(bvm *vm); +extern int lvbe_obj_refresh_style(bvm *vm); +extern int lvbe_obj_get_style_prop(bvm *vm); +extern int lvbe_obj_set_local_style_prop(bvm *vm); +extern int lvbe_obj_get_local_style_prop(bvm *vm); +extern int lvbe_obj_remove_local_style_prop(bvm *vm); +extern int lvbe_obj_fade_in(bvm *vm); +extern int lvbe_obj_fade_out(bvm *vm); +extern int lvbe_obj_set_style_pad_all(bvm *vm); +extern int lvbe_obj_set_style_pad_hor(bvm *vm); +extern int lvbe_obj_set_style_pad_ver(bvm *vm); +extern int lvbe_obj_set_style_pad_gap(bvm *vm); +extern int lvbe_obj_set_style_size(bvm *vm); +extern int lvbe_obj_get_style_width(bvm *vm); +extern int lvbe_obj_get_style_min_width(bvm *vm); +extern int lvbe_obj_get_style_max_width(bvm *vm); +extern int lvbe_obj_get_style_height(bvm *vm); +extern int lvbe_obj_get_style_min_height(bvm *vm); +extern int lvbe_obj_get_style_max_height(bvm *vm); +extern int lvbe_obj_get_style_x(bvm *vm); +extern int lvbe_obj_get_style_y(bvm *vm); +extern int lvbe_obj_get_style_align(bvm *vm); +extern int lvbe_obj_get_style_transform_width(bvm *vm); +extern int lvbe_obj_get_style_transform_height(bvm *vm); +extern int lvbe_obj_get_style_translate_x(bvm *vm); +extern int lvbe_obj_get_style_translate_y(bvm *vm); +extern int lvbe_obj_get_style_transform_zoom(bvm *vm); +extern int lvbe_obj_get_style_transform_angle(bvm *vm); +extern int lvbe_obj_get_style_pad_top(bvm *vm); +extern int lvbe_obj_get_style_pad_bottom(bvm *vm); +extern int lvbe_obj_get_style_pad_left(bvm *vm); +extern int lvbe_obj_get_style_pad_right(bvm *vm); +extern int lvbe_obj_get_style_pad_row(bvm *vm); +extern int lvbe_obj_get_style_pad_column(bvm *vm); +extern int lvbe_obj_get_style_radius(bvm *vm); +extern int lvbe_obj_get_style_clip_corner(bvm *vm); +extern int lvbe_obj_get_style_opa(bvm *vm); +extern int lvbe_obj_get_style_color_filter_opa(bvm *vm); +extern int lvbe_obj_get_style_anim_time(bvm *vm); +extern int lvbe_obj_get_style_anim_speed(bvm *vm); +extern int lvbe_obj_get_style_blend_mode(bvm *vm); +extern int lvbe_obj_get_style_layout(bvm *vm); +extern int lvbe_obj_get_style_base_dir(bvm *vm); +extern int lvbe_obj_get_style_bg_color(bvm *vm); +extern int lvbe_obj_get_style_bg_color_filtered(bvm *vm); +extern int lvbe_obj_get_style_bg_opa(bvm *vm); +extern int lvbe_obj_get_style_bg_grad_color(bvm *vm); +extern int lvbe_obj_get_style_bg_grad_color_filtered(bvm *vm); +extern int lvbe_obj_get_style_bg_grad_dir(bvm *vm); +extern int lvbe_obj_get_style_bg_main_stop(bvm *vm); +extern int lvbe_obj_get_style_bg_grad_stop(bvm *vm); +extern int lvbe_obj_get_style_bg_img_src(bvm *vm); +extern int lvbe_obj_get_style_bg_img_opa(bvm *vm); +extern int lvbe_obj_get_style_bg_img_recolor(bvm *vm); +extern int lvbe_obj_get_style_bg_img_recolor_filtered(bvm *vm); +extern int lvbe_obj_get_style_bg_img_recolor_opa(bvm *vm); +extern int lvbe_obj_get_style_bg_img_tiled(bvm *vm); +extern int lvbe_obj_get_style_border_color(bvm *vm); +extern int lvbe_obj_get_style_border_color_filtered(bvm *vm); +extern int lvbe_obj_get_style_border_opa(bvm *vm); +extern int lvbe_obj_get_style_border_width(bvm *vm); +extern int lvbe_obj_get_style_border_side(bvm *vm); +extern int lvbe_obj_get_style_border_post(bvm *vm); +extern int lvbe_obj_get_style_text_color(bvm *vm); +extern int lvbe_obj_get_style_text_color_filtered(bvm *vm); +extern int lvbe_obj_get_style_text_opa(bvm *vm); +extern int lvbe_obj_get_style_text_font(bvm *vm); +extern int lvbe_obj_get_style_text_letter_space(bvm *vm); +extern int lvbe_obj_get_style_text_line_space(bvm *vm); +extern int lvbe_obj_get_style_text_decor(bvm *vm); +extern int lvbe_obj_get_style_text_align(bvm *vm); +extern int lvbe_obj_get_style_img_opa(bvm *vm); +extern int lvbe_obj_get_style_img_recolor(bvm *vm); +extern int lvbe_obj_get_style_img_recolor_filtered(bvm *vm); +extern int lvbe_obj_get_style_img_recolor_opa(bvm *vm); +extern int lvbe_obj_get_style_outline_width(bvm *vm); +extern int lvbe_obj_get_style_outline_color(bvm *vm); +extern int lvbe_obj_get_style_outline_color_filtered(bvm *vm); +extern int lvbe_obj_get_style_outline_opa(bvm *vm); +extern int lvbe_obj_get_style_outline_pad(bvm *vm); +extern int lvbe_obj_get_style_shadow_width(bvm *vm); +extern int lvbe_obj_get_style_shadow_ofs_x(bvm *vm); +extern int lvbe_obj_get_style_shadow_ofs_y(bvm *vm); +extern int lvbe_obj_get_style_shadow_spread(bvm *vm); +extern int lvbe_obj_get_style_shadow_color(bvm *vm); +extern int lvbe_obj_get_style_shadow_color_filtered(bvm *vm); +extern int lvbe_obj_get_style_shadow_opa(bvm *vm); +extern int lvbe_obj_get_style_line_width(bvm *vm); +extern int lvbe_obj_get_style_line_dash_width(bvm *vm); +extern int lvbe_obj_get_style_line_dash_gap(bvm *vm); +extern int lvbe_obj_get_style_line_rounded(bvm *vm); +extern int lvbe_obj_get_style_line_color(bvm *vm); +extern int lvbe_obj_get_style_line_color_filtered(bvm *vm); +extern int lvbe_obj_get_style_line_opa(bvm *vm); +extern int lvbe_obj_get_style_arc_width(bvm *vm); +extern int lvbe_obj_get_style_arc_rounded(bvm *vm); +extern int lvbe_obj_get_style_arc_color(bvm *vm); +extern int lvbe_obj_get_style_arc_color_filtered(bvm *vm); +extern int lvbe_obj_get_style_arc_opa(bvm *vm); +extern int lvbe_obj_get_style_arc_img_src(bvm *vm); +extern int lvbe_obj_set_style_width(bvm *vm); +extern int lvbe_obj_set_style_min_width(bvm *vm); +extern int lvbe_obj_set_style_max_width(bvm *vm); +extern int lvbe_obj_set_style_height(bvm *vm); +extern int lvbe_obj_set_style_min_height(bvm *vm); +extern int lvbe_obj_set_style_max_height(bvm *vm); +extern int lvbe_obj_set_style_x(bvm *vm); +extern int lvbe_obj_set_style_y(bvm *vm); +extern int lvbe_obj_set_style_align(bvm *vm); +extern int lvbe_obj_set_style_transform_width(bvm *vm); +extern int lvbe_obj_set_style_transform_height(bvm *vm); +extern int lvbe_obj_set_style_translate_x(bvm *vm); +extern int lvbe_obj_set_style_translate_y(bvm *vm); +extern int lvbe_obj_set_style_transform_zoom(bvm *vm); +extern int lvbe_obj_set_style_transform_angle(bvm *vm); +extern int lvbe_obj_set_style_pad_top(bvm *vm); +extern int lvbe_obj_set_style_pad_bottom(bvm *vm); +extern int lvbe_obj_set_style_pad_left(bvm *vm); +extern int lvbe_obj_set_style_pad_right(bvm *vm); +extern int lvbe_obj_set_style_pad_row(bvm *vm); +extern int lvbe_obj_set_style_pad_column(bvm *vm); +extern int lvbe_obj_set_style_radius(bvm *vm); +extern int lvbe_obj_set_style_clip_corner(bvm *vm); +extern int lvbe_obj_set_style_opa(bvm *vm); +extern int lvbe_obj_set_style_color_filter_dsc(bvm *vm); +extern int lvbe_obj_set_style_color_filter_opa(bvm *vm); +extern int lvbe_obj_set_style_anim_time(bvm *vm); +extern int lvbe_obj_set_style_anim_speed(bvm *vm); +extern int lvbe_obj_set_style_transition(bvm *vm); +extern int lvbe_obj_set_style_blend_mode(bvm *vm); +extern int lvbe_obj_set_style_layout(bvm *vm); +extern int lvbe_obj_set_style_base_dir(bvm *vm); +extern int lvbe_obj_set_style_bg_color(bvm *vm); +extern int lvbe_obj_set_style_bg_color_filtered(bvm *vm); +extern int lvbe_obj_set_style_bg_opa(bvm *vm); +extern int lvbe_obj_set_style_bg_grad_color(bvm *vm); +extern int lvbe_obj_set_style_bg_grad_color_filtered(bvm *vm); +extern int lvbe_obj_set_style_bg_grad_dir(bvm *vm); +extern int lvbe_obj_set_style_bg_main_stop(bvm *vm); +extern int lvbe_obj_set_style_bg_grad_stop(bvm *vm); +extern int lvbe_obj_set_style_bg_img_src(bvm *vm); +extern int lvbe_obj_set_style_bg_img_opa(bvm *vm); +extern int lvbe_obj_set_style_bg_img_recolor(bvm *vm); +extern int lvbe_obj_set_style_bg_img_recolor_filtered(bvm *vm); +extern int lvbe_obj_set_style_bg_img_recolor_opa(bvm *vm); +extern int lvbe_obj_set_style_bg_img_tiled(bvm *vm); +extern int lvbe_obj_set_style_border_color(bvm *vm); +extern int lvbe_obj_set_style_border_color_filtered(bvm *vm); +extern int lvbe_obj_set_style_border_opa(bvm *vm); +extern int lvbe_obj_set_style_border_width(bvm *vm); +extern int lvbe_obj_set_style_border_side(bvm *vm); +extern int lvbe_obj_set_style_border_post(bvm *vm); +extern int lvbe_obj_set_style_text_color(bvm *vm); +extern int lvbe_obj_set_style_text_color_filtered(bvm *vm); +extern int lvbe_obj_set_style_text_opa(bvm *vm); +extern int lvbe_obj_set_style_text_font(bvm *vm); +extern int lvbe_obj_set_style_text_letter_space(bvm *vm); +extern int lvbe_obj_set_style_text_line_space(bvm *vm); +extern int lvbe_obj_set_style_text_decor(bvm *vm); +extern int lvbe_obj_set_style_text_align(bvm *vm); +extern int lvbe_obj_set_style_img_opa(bvm *vm); +extern int lvbe_obj_set_style_img_recolor(bvm *vm); +extern int lvbe_obj_set_style_img_recolor_filtered(bvm *vm); +extern int lvbe_obj_set_style_img_recolor_opa(bvm *vm); +extern int lvbe_obj_set_style_outline_width(bvm *vm); +extern int lvbe_obj_set_style_outline_color(bvm *vm); +extern int lvbe_obj_set_style_outline_color_filtered(bvm *vm); +extern int lvbe_obj_set_style_outline_opa(bvm *vm); +extern int lvbe_obj_set_style_outline_pad(bvm *vm); +extern int lvbe_obj_set_style_shadow_width(bvm *vm); +extern int lvbe_obj_set_style_shadow_ofs_x(bvm *vm); +extern int lvbe_obj_set_style_shadow_ofs_y(bvm *vm); +extern int lvbe_obj_set_style_shadow_spread(bvm *vm); +extern int lvbe_obj_set_style_shadow_color(bvm *vm); +extern int lvbe_obj_set_style_shadow_color_filtered(bvm *vm); +extern int lvbe_obj_set_style_shadow_opa(bvm *vm); +extern int lvbe_obj_set_style_line_width(bvm *vm); +extern int lvbe_obj_set_style_line_dash_width(bvm *vm); +extern int lvbe_obj_set_style_line_dash_gap(bvm *vm); +extern int lvbe_obj_set_style_line_rounded(bvm *vm); +extern int lvbe_obj_set_style_line_color(bvm *vm); +extern int lvbe_obj_set_style_line_color_filtered(bvm *vm); +extern int lvbe_obj_set_style_line_opa(bvm *vm); +extern int lvbe_obj_set_style_arc_width(bvm *vm); +extern int lvbe_obj_set_style_arc_rounded(bvm *vm); +extern int lvbe_obj_set_style_arc_color(bvm *vm); +extern int lvbe_obj_set_style_arc_color_filtered(bvm *vm); +extern int lvbe_obj_set_style_arc_opa(bvm *vm); +extern int lvbe_obj_set_style_arc_img_src(bvm *vm); +extern int lvbe_obj_del(bvm *vm); +extern int lvbe_obj_clean(bvm *vm); +extern int lvbe_obj_del_async(bvm *vm); +extern int lvbe_obj_set_parent(bvm *vm); +extern int lvbe_obj_move_foreground(bvm *vm); +extern int lvbe_obj_move_background(bvm *vm); +extern int lvbe_obj_get_screen(bvm *vm); +extern int lvbe_obj_get_disp(bvm *vm); +extern int lvbe_obj_get_parent(bvm *vm); +extern int lvbe_obj_get_child(bvm *vm); +extern int lvbe_obj_get_child_cnt(bvm *vm); +extern int lvbe_obj_get_child_id(bvm *vm); +extern int lvbe_obj_tree_walk(bvm *vm); + +/* `lv_group` external functions definitions */ +extern int lvbe_group_create(bvm *vm); +extern int lvbe_group_del(bvm *vm); +extern int lvbe_group_set_default(bvm *vm); +extern int lvbe_group_add_obj(bvm *vm); +extern int lvbe_group_remove_obj(bvm *vm); +extern int lvbe_group_remove_all_objs(bvm *vm); +extern int lvbe_group_focus_obj(bvm *vm); +extern int lvbe_group_focus_next(bvm *vm); +extern int lvbe_group_focus_prev(bvm *vm); +extern int lvbe_group_focus_freeze(bvm *vm); +extern int lvbe_group_send_data(bvm *vm); +extern int lvbe_group_set_focus_cb(bvm *vm); +extern int lvbe_group_set_refocus_policy(bvm *vm); +extern int lvbe_group_set_editing(bvm *vm); +extern int lvbe_group_set_wrap(bvm *vm); +extern int lvbe_group_get_focused(bvm *vm); +extern int lvbe_group_get_focus_cb(bvm *vm); +extern int lvbe_group_get_editing(bvm *vm); +extern int lvbe_group_get_wrap(bvm *vm); +extern int lvbe_group_get_obj_count(bvm *vm); + +/* `lv_indev` external functions definitions */ +extern int lvbe_indev_enable(bvm *vm); +extern int lvbe_indev_get_type(bvm *vm); +extern int lvbe_indev_reset(bvm *vm); +extern int lvbe_indev_reset_long_press(bvm *vm); +extern int lvbe_indev_set_cursor(bvm *vm); +extern int lvbe_indev_set_group(bvm *vm); +extern int lvbe_indev_set_button_points(bvm *vm); +extern int lvbe_indev_get_point(bvm *vm); +extern int lvbe_indev_get_gesture_dir(bvm *vm); +extern int lvbe_indev_get_key(bvm *vm); +extern int lvbe_indev_get_scroll_dir(bvm *vm); +extern int lvbe_indev_get_scroll_obj(bvm *vm); +extern int lvbe_indev_get_vect(bvm *vm); +extern int lvbe_indev_wait_release(bvm *vm); +extern int lvbe_indev_search_obj(bvm *vm); + +/* `lv_chart` external functions definitions */ +extern int lvbe_chart_create(bvm *vm); +extern int lvbe_chart_set_type(bvm *vm); +extern int lvbe_chart_set_point_count(bvm *vm); +extern int lvbe_chart_set_range(bvm *vm); +extern int lvbe_chart_set_update_mode(bvm *vm); +extern int lvbe_chart_set_div_line_count(bvm *vm); +extern int lvbe_chart_set_zoom_x(bvm *vm); +extern int lvbe_chart_set_zoom_y(bvm *vm); +extern int lvbe_chart_get_zoom_x(bvm *vm); +extern int lvbe_chart_get_zoom_y(bvm *vm); +extern int lvbe_chart_set_axis_tick(bvm *vm); +extern int lvbe_chart_get_type(bvm *vm); +extern int lvbe_chart_get_point_count(bvm *vm); +extern int lvbe_chart_get_x_start_point(bvm *vm); +extern int lvbe_chart_get_point_pos_by_id(bvm *vm); +extern int lvbe_chart_refresh(bvm *vm); +extern int lvbe_chart_remove_series(bvm *vm); +extern int lvbe_chart_hide_series(bvm *vm); +extern int lvbe_chart_set_series_color(bvm *vm); +extern int lvbe_chart_set_x_start_point(bvm *vm); +extern int lvbe_chart_set_cursor_pos(bvm *vm); +extern int lvbe_chart_set_cursor_point(bvm *vm); +extern int lvbe_chart_get_cursor_point(bvm *vm); +extern int lvbe_chart_set_all_value(bvm *vm); +extern int lvbe_chart_set_next_value(bvm *vm); +extern int lvbe_chart_set_next_value2(bvm *vm); +extern int lvbe_chart_set_value_by_id(bvm *vm); +extern int lvbe_chart_set_value_by_id2(bvm *vm); +extern int lvbe_chart_set_ext_y_array(bvm *vm); +extern int lvbe_chart_set_ext_x_array(bvm *vm); +extern int lvbe_chart_get_pressed_point(bvm *vm); + +/* `lv_colorwheel` external functions definitions */ +extern int lvbe_colorwheel_create(bvm *vm); +extern int lvbe_colorwheel_set_hsv(bvm *vm); +extern int lvbe_colorwheel_set_rgb(bvm *vm); +extern int lvbe_colorwheel_set_mode(bvm *vm); +extern int lvbe_colorwheel_set_mode_fixed(bvm *vm); +extern int lvbe_colorwheel_get_hsv(bvm *vm); +extern int lvbe_colorwheel_get_rgb(bvm *vm); +extern int lvbe_colorwheel_get_color_mode(bvm *vm); +extern int lvbe_colorwheel_get_color_mode_fixed(bvm *vm); + +/* `lv_imgbtn` external functions definitions */ +extern int lvbe_imgbtn_create(bvm *vm); +extern int lvbe_imgbtn_set_src(bvm *vm); + +/* `lv_led` external functions definitions */ +extern int lvbe_led_create(bvm *vm); +extern int lvbe_led_set_color(bvm *vm); +extern int lvbe_led_set_brightness(bvm *vm); +extern int lvbe_led_on(bvm *vm); +extern int lvbe_led_off(bvm *vm); +extern int lvbe_led_toggle(bvm *vm); +extern int lvbe_led_get_brightness(bvm *vm); + +/* `lv_meter` external functions definitions */ +extern int lvbe_meter_create(bvm *vm); +extern int lvbe_meter_add_scale(bvm *vm); +extern int lvbe_meter_set_scale_ticks(bvm *vm); +extern int lvbe_meter_set_scale_major_ticks(bvm *vm); +extern int lvbe_meter_set_scale_range(bvm *vm); +extern int lvbe_meter_add_needle_line(bvm *vm); +extern int lvbe_meter_add_needle_img(bvm *vm); +extern int lvbe_meter_add_arc(bvm *vm); +extern int lvbe_meter_add_scale_lines(bvm *vm); +extern int lvbe_meter_set_indicator_value(bvm *vm); +extern int lvbe_meter_set_indicator_start_value(bvm *vm); +extern int lvbe_meter_set_indicator_end_value(bvm *vm); + +/* `lv_msgbox` external functions definitions */ +extern int lvbe_msgbox_create(bvm *vm); +extern int lvbe_msgbox_get_title(bvm *vm); +extern int lvbe_msgbox_get_close_btn(bvm *vm); +extern int lvbe_msgbox_get_text(bvm *vm); +extern int lvbe_msgbox_get_btns(bvm *vm); +extern int lvbe_msgbox_get_active_btn_text(bvm *vm); +extern int lvbe_msgbox_close(bvm *vm); + +/* `lv_spinbox` external functions definitions */ +extern int lvbe_spinbox_create(bvm *vm); +extern int lvbe_spinbox_set_value(bvm *vm); +extern int lvbe_spinbox_set_rollover(bvm *vm); +extern int lvbe_spinbox_set_digit_format(bvm *vm); +extern int lvbe_spinbox_set_step(bvm *vm); +extern int lvbe_spinbox_set_range(bvm *vm); +extern int lvbe_spinbox_get_rollover(bvm *vm); +extern int lvbe_spinbox_get_value(bvm *vm); +extern int lvbe_spinbox_get_step(bvm *vm); +extern int lvbe_spinbox_step_next(bvm *vm); +extern int lvbe_spinbox_step_prev(bvm *vm); +extern int lvbe_spinbox_increment(bvm *vm); +extern int lvbe_spinbox_decrement(bvm *vm); + +/* `lv_spinner` external functions definitions */ +extern int lvbe_spinner_create(bvm *vm); + +/* `lv_arc` external functions definitions */ +extern int lvbe_arc_create(bvm *vm); +extern int lvbe_arc_set_start_angle(bvm *vm); +extern int lvbe_arc_set_end_angle(bvm *vm); +extern int lvbe_arc_set_angles(bvm *vm); +extern int lvbe_arc_set_bg_start_angle(bvm *vm); +extern int lvbe_arc_set_bg_end_angle(bvm *vm); +extern int lvbe_arc_set_bg_angles(bvm *vm); +extern int lvbe_arc_set_rotation(bvm *vm); +extern int lvbe_arc_set_mode(bvm *vm); +extern int lvbe_arc_set_value(bvm *vm); +extern int lvbe_arc_set_range(bvm *vm); +extern int lvbe_arc_set_change_rate(bvm *vm); +extern int lvbe_arc_get_angle_start(bvm *vm); +extern int lvbe_arc_get_angle_end(bvm *vm); +extern int lvbe_arc_get_bg_angle_start(bvm *vm); +extern int lvbe_arc_get_bg_angle_end(bvm *vm); +extern int lvbe_arc_get_value(bvm *vm); +extern int lvbe_arc_get_min_value(bvm *vm); +extern int lvbe_arc_get_max_value(bvm *vm); +extern int lvbe_arc_get_mode(bvm *vm); + +/* `lv_bar` external functions definitions */ +extern int lvbe_bar_create(bvm *vm); +extern int lvbe_bar_set_value(bvm *vm); +extern int lvbe_bar_set_start_value(bvm *vm); +extern int lvbe_bar_set_range(bvm *vm); +extern int lvbe_bar_set_mode(bvm *vm); +extern int lvbe_bar_get_value(bvm *vm); +extern int lvbe_bar_get_start_value(bvm *vm); +extern int lvbe_bar_get_min_value(bvm *vm); +extern int lvbe_bar_get_max_value(bvm *vm); +extern int lvbe_bar_get_mode(bvm *vm); + +/* `lv_btn` external functions definitions */ +extern int lvbe_btn_create(bvm *vm); + +/* `lv_btnmatrix` external functions definitions */ +extern int lvbe_btnmatrix_create(bvm *vm); +extern int lvbe_btnmatrix_set_map(bvm *vm); +extern int lvbe_btnmatrix_set_ctrl_map(bvm *vm); +extern int lvbe_btnmatrix_set_selected_btn(bvm *vm); +extern int lvbe_btnmatrix_set_btn_ctrl(bvm *vm); +extern int lvbe_btnmatrix_clear_btn_ctrl(bvm *vm); +extern int lvbe_btnmatrix_set_btn_ctrl_all(bvm *vm); +extern int lvbe_btnmatrix_clear_btn_ctrl_all(bvm *vm); +extern int lvbe_btnmatrix_set_btn_width(bvm *vm); +extern int lvbe_btnmatrix_set_one_checked(bvm *vm); +extern int lvbe_btnmatrix_get_selected_btn(bvm *vm); +extern int lvbe_btnmatrix_get_btn_text(bvm *vm); +extern int lvbe_btnmatrix_has_btn_ctrl(bvm *vm); +extern int lvbe_btnmatrix_get_one_checked(bvm *vm); + +/* `lv_canvas` external functions definitions */ +extern int lvbe_canvas_create(bvm *vm); +extern int lvbe_canvas_set_buffer(bvm *vm); +extern int lvbe_canvas_set_px(bvm *vm); +extern int lvbe_canvas_set_palette(bvm *vm); +extern int lvbe_canvas_get_px(bvm *vm); +extern int lvbe_canvas_copy_buf(bvm *vm); +extern int lvbe_canvas_transform(bvm *vm); +extern int lvbe_canvas_blur_hor(bvm *vm); +extern int lvbe_canvas_blur_ver(bvm *vm); +extern int lvbe_canvas_fill_bg(bvm *vm); +extern int lvbe_canvas_draw_rect(bvm *vm); +extern int lvbe_canvas_draw_text(bvm *vm); +extern int lvbe_canvas_draw_img(bvm *vm); +extern int lvbe_canvas_draw_line(bvm *vm); +extern int lvbe_canvas_draw_polygon(bvm *vm); +extern int lvbe_canvas_draw_arc(bvm *vm); + +/* `lv_checkbox` external functions definitions */ +extern int lvbe_checkbox_create(bvm *vm); +extern int lvbe_checkbox_set_text(bvm *vm); +extern int lvbe_checkbox_set_text_static(bvm *vm); +extern int lvbe_checkbox_get_text(bvm *vm); + +/* `lv_dropdown` external functions definitions */ +extern int lvbe_dropdown_create(bvm *vm); +extern int lvbe_dropdown_set_text(bvm *vm); +extern int lvbe_dropdown_set_options(bvm *vm); +extern int lvbe_dropdown_set_options_static(bvm *vm); +extern int lvbe_dropdown_add_option(bvm *vm); +extern int lvbe_dropdown_clear_options(bvm *vm); +extern int lvbe_dropdown_set_selected(bvm *vm); +extern int lvbe_dropdown_set_dir(bvm *vm); +extern int lvbe_dropdown_set_symbol(bvm *vm); +extern int lvbe_dropdown_set_selected_highlight(bvm *vm); +extern int lvbe_dropdown_get_list(bvm *vm); +extern int lvbe_dropdown_get_text(bvm *vm); +extern int lvbe_dropdown_get_options(bvm *vm); +extern int lvbe_dropdown_get_selected(bvm *vm); +extern int lvbe_dropdown_get_option_cnt(bvm *vm); +extern int lvbe_dropdown_get_selected_str(bvm *vm); +extern int lvbe_dropdown_get_symbol(bvm *vm); +extern int lvbe_dropdown_get_selected_highlight(bvm *vm); +extern int lvbe_dropdown_get_dir(bvm *vm); +extern int lvbe_dropdown_open(bvm *vm); +extern int lvbe_dropdown_close(bvm *vm); + +/* `lv_label` external functions definitions */ +extern int lvbe_label_create(bvm *vm); +extern int lvbe_label_set_text(bvm *vm); +extern int lvbe_label_set_text_fmt(bvm *vm); +extern int lvbe_label_set_text_static(bvm *vm); +extern int lvbe_label_set_long_mode(bvm *vm); +extern int lvbe_label_set_recolor(bvm *vm); +extern int lvbe_label_set_text_sel_start(bvm *vm); +extern int lvbe_label_set_text_sel_end(bvm *vm); +extern int lvbe_label_get_text(bvm *vm); +extern int lvbe_label_get_long_mode(bvm *vm); +extern int lvbe_label_get_recolor(bvm *vm); +extern int lvbe_label_get_letter_pos(bvm *vm); +extern int lvbe_label_get_letter_on(bvm *vm); +extern int lvbe_label_is_char_under_pos(bvm *vm); +extern int lvbe_label_get_text_selection_start(bvm *vm); +extern int lvbe_label_get_text_selection_end(bvm *vm); +extern int lvbe_label_ins_text(bvm *vm); +extern int lvbe_label_cut_text(bvm *vm); + +/* `lv_line` external functions definitions */ +extern int lvbe_line_create(bvm *vm); +extern int lvbe_line_set_points(bvm *vm); +extern int lvbe_line_set_y_invert(bvm *vm); +extern int lvbe_line_get_y_invert(bvm *vm); + +/* `lv_roller` external functions definitions */ +extern int lvbe_roller_create(bvm *vm); +extern int lvbe_roller_set_options(bvm *vm); +extern int lvbe_roller_set_selected(bvm *vm); +extern int lvbe_roller_set_visible_row_count(bvm *vm); +extern int lvbe_roller_get_selected(bvm *vm); +extern int lvbe_roller_get_selected_str(bvm *vm); +extern int lvbe_roller_get_options(bvm *vm); +extern int lvbe_roller_get_option_cnt(bvm *vm); + +/* `lv_slider` external functions definitions */ +extern int lvbe_slider_create(bvm *vm); +extern int lvbe_slider_set_value(bvm *vm); +extern int lvbe_slider_set_left_value(bvm *vm); +extern int lvbe_slider_set_range(bvm *vm); +extern int lvbe_slider_set_mode(bvm *vm); +extern int lvbe_slider_get_value(bvm *vm); +extern int lvbe_slider_get_left_value(bvm *vm); +extern int lvbe_slider_get_min_value(bvm *vm); +extern int lvbe_slider_get_max_value(bvm *vm); +extern int lvbe_slider_is_dragged(bvm *vm); +extern int lvbe_slider_get_mode(bvm *vm); + +/* `lv_switch` external functions definitions */ +extern int lvbe_switch_create(bvm *vm); + +/* `lv_table` external functions definitions */ +extern int lvbe_table_create(bvm *vm); +extern int lvbe_table_set_cell_value(bvm *vm); +extern int lvbe_table_set_cell_value_fmt(bvm *vm); +extern int lvbe_table_set_row_cnt(bvm *vm); +extern int lvbe_table_set_col_cnt(bvm *vm); +extern int lvbe_table_set_col_width(bvm *vm); +extern int lvbe_table_add_cell_ctrl(bvm *vm); +extern int lvbe_table_clear_cell_ctrl(bvm *vm); +extern int lvbe_table_get_cell_value(bvm *vm); +extern int lvbe_table_get_row_cnt(bvm *vm); +extern int lvbe_table_get_col_cnt(bvm *vm); +extern int lvbe_table_get_col_width(bvm *vm); +extern int lvbe_table_has_cell_ctrl(bvm *vm); +extern int lvbe_table_get_selected_cell(bvm *vm); + +/* `lv_textarea` external functions definitions */ +extern int lvbe_textarea_create(bvm *vm); +extern int lvbe_textarea_add_char(bvm *vm); +extern int lvbe_textarea_add_text(bvm *vm); +extern int lvbe_textarea_del_char(bvm *vm); +extern int lvbe_textarea_del_char_forward(bvm *vm); +extern int lvbe_textarea_set_text(bvm *vm); +extern int lvbe_textarea_set_placeholder_text(bvm *vm); +extern int lvbe_textarea_set_cursor_pos(bvm *vm); +extern int lvbe_textarea_set_cursor_click_pos(bvm *vm); +extern int lvbe_textarea_set_password_mode(bvm *vm); +extern int lvbe_textarea_set_one_line(bvm *vm); +extern int lvbe_textarea_set_accepted_chars(bvm *vm); +extern int lvbe_textarea_set_max_length(bvm *vm); +extern int lvbe_textarea_set_insert_replace(bvm *vm); +extern int lvbe_textarea_set_text_selection(bvm *vm); +extern int lvbe_textarea_set_password_show_time(bvm *vm); +extern int lvbe_textarea_set_align(bvm *vm); +extern int lvbe_textarea_get_text(bvm *vm); +extern int lvbe_textarea_get_placeholder_text(bvm *vm); +extern int lvbe_textarea_get_label(bvm *vm); +extern int lvbe_textarea_get_cursor_pos(bvm *vm); +extern int lvbe_textarea_get_cursor_click_pos(bvm *vm); +extern int lvbe_textarea_get_password_mode(bvm *vm); +extern int lvbe_textarea_get_one_line(bvm *vm); +extern int lvbe_textarea_get_accepted_chars(bvm *vm); +extern int lvbe_textarea_get_max_length(bvm *vm); +extern int lvbe_textarea_text_is_selected(bvm *vm); +extern int lvbe_textarea_get_text_selection(bvm *vm); +extern int lvbe_textarea_get_password_show_time(bvm *vm); +extern int lvbe_textarea_clear_selection(bvm *vm); +extern int lvbe_textarea_cursor_right(bvm *vm); +extern int lvbe_textarea_cursor_left(bvm *vm); +extern int lvbe_textarea_cursor_down(bvm *vm); +extern int lvbe_textarea_cursor_up(bvm *vm); + +extern int be_ntv_lv_style_init(bvm *vm); +extern int be_ntv_lv_font_init(bvm *vm); +extern int be_ntv_lv_color_init(bvm *vm); +extern int be_ntv_lv_theme_init(bvm *vm); +extern int be_ntv_lv_img_init(bvm *vm); +extern int be_ntv_lv_disp_init(bvm *vm); +extern int be_ntv_lv_obj_init(bvm *vm); +extern int be_ntv_lv_group_init(bvm *vm); +extern int be_ntv_lv_indev_init(bvm *vm); +extern int be_ntv_lv_chart_init(bvm *vm); +extern int be_ntv_lv_colorwheel_init(bvm *vm); +extern int be_ntv_lv_imgbtn_init(bvm *vm); +extern int be_ntv_lv_led_init(bvm *vm); +extern int be_ntv_lv_meter_init(bvm *vm); +extern int be_ntv_lv_msgbox_init(bvm *vm); +extern int be_ntv_lv_spinbox_init(bvm *vm); +extern int be_ntv_lv_spinner_init(bvm *vm); +extern int be_ntv_lv_arc_init(bvm *vm); +extern int be_ntv_lv_bar_init(bvm *vm); +extern int be_ntv_lv_btn_init(bvm *vm); +extern int be_ntv_lv_btnmatrix_init(bvm *vm); +extern int be_ntv_lv_canvas_init(bvm *vm); +extern int be_ntv_lv_checkbox_init(bvm *vm); +extern int be_ntv_lv_dropdown_init(bvm *vm); +extern int be_ntv_lv_label_init(bvm *vm); +extern int be_ntv_lv_line_init(bvm *vm); +extern int be_ntv_lv_roller_init(bvm *vm); +extern int be_ntv_lv_slider_init(bvm *vm); +extern int be_ntv_lv_switch_init(bvm *vm); +extern int be_ntv_lv_table_init(bvm *vm); +extern int be_ntv_lv_textarea_init(bvm *vm); + +extern const bclass be_class_lv_arc; +extern const bclass be_class_lv_bar; +extern const bclass be_class_lv_btn; +extern const bclass be_class_lv_btnmatrix; +extern const bclass be_class_lv_canvas; +extern const bclass be_class_lv_chart; +extern const bclass be_class_lv_checkbox; +extern const bclass be_class_lv_color; +extern const bclass be_class_lv_colorwheel; +extern const bclass be_class_lv_disp; +extern const bclass be_class_lv_dropdown; +extern const bclass be_class_lv_font; +extern const bclass be_class_lv_group; +extern const bclass be_class_lv_img; +extern const bclass be_class_lv_imgbtn; +extern const bclass be_class_lv_indev; +extern const bclass be_class_lv_label; +extern const bclass be_class_lv_led; +extern const bclass be_class_lv_line; +extern const bclass be_class_lv_meter; +extern const bclass be_class_lv_msgbox; +extern const bclass be_class_lv_obj; +extern const bclass be_class_lv_roller; +extern const bclass be_class_lv_slider; +extern const bclass be_class_lv_spinbox; +extern const bclass be_class_lv_spinner; +extern const bclass be_class_lv_style; +extern const bclass be_class_lv_switch; +extern const bclass be_class_lv_table; +extern const bclass be_class_lv_textarea; +extern const bclass be_class_lv_theme; + + +/******************************************************************** +** Solidified class: lv_style +********************************************************************/ +be_local_class(lv_style, + 1, + NULL, + be_nested_map(4, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("init", 380752755, 4, -1), be_const_func(lvs_init) }, + { be_nested_key("tostring", -1995258651, 8, -1), be_const_func(lvs_tostring) }, + { be_nested_key("_p", 1594591802, 2, -1), be_const_var(0) }, + { be_nested_key("member", 719708611, 6, 0), be_const_func(lvx_member) }, + })), + (be_nested_const_str("lv_style", -143355747, 8)) +); +/*******************************************************************/ + +/******************************************************************** +** Solidified class: lv_obj +********************************************************************/ +be_local_class(lv_obj, + 1, + NULL, + be_nested_map(5, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("tostring", -1995258651, 8, 3), be_const_func(lvx_tostring) }, + { be_nested_key("member", 719708611, 6, -1), be_const_func(lvx_member) }, + { be_nested_key("_p", 1594591802, 2, -1), be_const_var(0) }, + { be_nested_key("init", 380752755, 4, 4), be_const_func(be_ntv_lv_obj_init) }, + { be_nested_key("_class", -1562820946, 6, -1), be_const_comptr(&lv_obj_class) }, + })), + (be_nested_const_str("lv_obj", -37134147, 6)) +); +/*******************************************************************/ + +/******************************************************************** +** Solidified class: lv_group +********************************************************************/ +be_local_class(lv_group, + 1, + NULL, + be_nested_map(4, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("init", 380752755, 4, -1), be_const_func(be_ntv_lv_group_init) }, + { be_nested_key("tostring", -1995258651, 8, -1), be_const_func(lvx_tostring) }, + { be_nested_key("_p", 1594591802, 2, -1), be_const_var(0) }, + { be_nested_key("member", 719708611, 6, 0), be_const_func(lvx_member) }, + })), + (be_nested_const_str("lv_group", -442928277, 8)) +); +/*******************************************************************/ + +/******************************************************************** +** Solidified class: lv_indev +********************************************************************/ +be_local_class(lv_indev, + 1, + NULL, + be_nested_map(4, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("init", 380752755, 4, -1), be_const_func(lv0_init) }, + { be_nested_key("tostring", -1995258651, 8, -1), be_const_func(lvx_tostring) }, + { be_nested_key("_p", 1594591802, 2, -1), be_const_var(0) }, + { be_nested_key("member", 719708611, 6, 0), be_const_func(lvx_member) }, + })), + (be_nested_const_str("lv_indev", 225602374, 8)) +); +/*******************************************************************/ + +/******************************************************************** +** Solidified class: lv_disp +********************************************************************/ +be_local_class(lv_disp, + 1, + NULL, + be_nested_map(4, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("init", 380752755, 4, -1), be_const_func(lv0_init) }, + { be_nested_key("tostring", -1995258651, 8, -1), be_const_func(lvx_tostring) }, + { be_nested_key("_p", 1594591802, 2, -1), be_const_var(0) }, + { be_nested_key("member", 719708611, 6, 0), be_const_func(lvx_member) }, + })), + (be_nested_const_str("lv_disp", 609712084, 8)) +); +/*******************************************************************/ + +/******************************************************************** +** Solidified class: lv_font +********************************************************************/ +be_local_class(lv_font, + 1, + NULL, + be_nested_map(3, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("init", 380752755, 4, -1), be_const_func(lvbe_font_create) }, + { be_nested_key("tostring", -1995258651, 8, -1), be_const_func(lvx_tostring) }, + { be_nested_key("_p", 1594591802, 2, -1), be_const_var(0) }, + })), + (be_nested_const_str("lv_font", 1550958453, 7)) +); +/*******************************************************************/ + +/******************************************************************** +** Solidified class: lv_theme +********************************************************************/ +be_local_class(lv_theme, + 1, + NULL, + be_nested_map(3, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("init", 380752755, 4, -1), be_const_func(lvbe_theme_create) }, + { be_nested_key("tostring", -1995258651, 8, -1), be_const_func(lvx_tostring) }, + { be_nested_key("_p", 1594591802, 2, -1), be_const_var(0) }, + })), + (be_nested_const_str("lv_theme", 1550958453, 7)) +); +/*******************************************************************/ + +/******************************************************************** +** Solidified class: lv_color +********************************************************************/ +be_local_class(lv_color, + 1, + NULL, + be_nested_map(4, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("toint", -681784387, 5, -1), be_const_func(lco_toint) }, + { be_nested_key("tostring", -1995258651, 8, 0), be_const_func(lco_tostring) }, + { be_nested_key("_p", 1594591802, 2, -1), be_const_var(0) }, + { be_nested_key("init", 380752755, 4, -1), be_const_func(lco_init) }, + })), + (be_nested_const_str("lv_color", 1419148319, 8)) +); +/*******************************************************************/ + +void be_load_lv_style_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_style); + be_setglobal(vm, "lv_style"); + be_pop(vm, 1); +} + +void be_load_lv_font_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_font); + be_setglobal(vm, "lv_font"); + be_pop(vm, 1); +} + +void be_load_lv_color_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_color); + be_setglobal(vm, "lv_color"); + be_pop(vm, 1); +} + +void be_load_lv_theme_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_theme); + be_setglobal(vm, "lv_theme"); + be_pop(vm, 1); +} + +/******************************************************************** +** Solidified class: lv_img +********************************************************************/ +extern const bclass be_class_lv_obj; +be_local_class(lv_img, + 0, + &be_class_lv_obj, + be_nested_map(2, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("_class", -1562820946, 6, -1), be_const_comptr(&lv_img_class) }, + { be_nested_key("init", 380752755, 4, -1), be_const_func(be_ntv_lv_img_init) }, + })), + (be_nested_const_str("lv_img", 1612829968, 6)) +); +/*******************************************************************/ + +void be_load_lv_img_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_img); + be_setglobal(vm, "lv_img"); + be_pop(vm, 1); +} + +void be_load_lv_disp_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_disp); + be_setglobal(vm, "lv_disp"); + be_pop(vm, 1); +} + +void be_load_lv_obj_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_obj); + be_setglobal(vm, "lv_obj"); + be_pop(vm, 1); +} + +void be_load_lv_group_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_group); + be_setglobal(vm, "lv_group"); + be_pop(vm, 1); +} + +void be_load_lv_indev_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_indev); + be_setglobal(vm, "lv_indev"); + be_pop(vm, 1); +} + +/******************************************************************** +** Solidified class: lv_chart +********************************************************************/ +extern const bclass be_class_lv_obj; +be_local_class(lv_chart, + 0, + &be_class_lv_obj, + be_nested_map(2, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("_class", -1562820946, 6, -1), be_const_comptr(&lv_chart_class) }, + { be_nested_key("init", 380752755, 4, -1), be_const_func(be_ntv_lv_chart_init) }, + })), + (be_nested_const_str("lv_chart", 1612829968, 6)) +); +/*******************************************************************/ + +void be_load_lv_chart_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_chart); + be_setglobal(vm, "lv_chart"); + be_pop(vm, 1); +} + +/******************************************************************** +** Solidified class: lv_colorwheel +********************************************************************/ +extern const bclass be_class_lv_obj; +be_local_class(lv_colorwheel, + 0, + &be_class_lv_obj, + be_nested_map(2, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("_class", -1562820946, 6, -1), be_const_comptr(&lv_colorwheel_class) }, + { be_nested_key("init", 380752755, 4, -1), be_const_func(be_ntv_lv_colorwheel_init) }, + })), + (be_nested_const_str("lv_colorwheel", 1612829968, 6)) +); +/*******************************************************************/ + +void be_load_lv_colorwheel_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_colorwheel); + be_setglobal(vm, "lv_colorwheel"); + be_pop(vm, 1); +} + +/******************************************************************** +** Solidified class: lv_imgbtn +********************************************************************/ +extern const bclass be_class_lv_obj; +be_local_class(lv_imgbtn, + 0, + &be_class_lv_obj, + be_nested_map(2, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("_class", -1562820946, 6, -1), be_const_comptr(&lv_imgbtn_class) }, + { be_nested_key("init", 380752755, 4, -1), be_const_func(be_ntv_lv_imgbtn_init) }, + })), + (be_nested_const_str("lv_imgbtn", 1612829968, 6)) +); +/*******************************************************************/ + +void be_load_lv_imgbtn_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_imgbtn); + be_setglobal(vm, "lv_imgbtn"); + be_pop(vm, 1); +} + +/******************************************************************** +** Solidified class: lv_led +********************************************************************/ +extern const bclass be_class_lv_obj; +be_local_class(lv_led, + 0, + &be_class_lv_obj, + be_nested_map(2, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("_class", -1562820946, 6, -1), be_const_comptr(&lv_led_class) }, + { be_nested_key("init", 380752755, 4, -1), be_const_func(be_ntv_lv_led_init) }, + })), + (be_nested_const_str("lv_led", 1612829968, 6)) +); +/*******************************************************************/ + +void be_load_lv_led_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_led); + be_setglobal(vm, "lv_led"); + be_pop(vm, 1); +} + +/******************************************************************** +** Solidified class: lv_meter +********************************************************************/ +extern const bclass be_class_lv_obj; +be_local_class(lv_meter, + 0, + &be_class_lv_obj, + be_nested_map(2, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("_class", -1562820946, 6, -1), be_const_comptr(&lv_meter_class) }, + { be_nested_key("init", 380752755, 4, -1), be_const_func(be_ntv_lv_meter_init) }, + })), + (be_nested_const_str("lv_meter", 1612829968, 6)) +); +/*******************************************************************/ + +void be_load_lv_meter_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_meter); + be_setglobal(vm, "lv_meter"); + be_pop(vm, 1); +} + +/******************************************************************** +** Solidified class: lv_msgbox +********************************************************************/ +extern const bclass be_class_lv_obj; +be_local_class(lv_msgbox, + 0, + &be_class_lv_obj, + be_nested_map(2, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("_class", -1562820946, 6, -1), be_const_comptr(&lv_msgbox_class) }, + { be_nested_key("init", 380752755, 4, -1), be_const_func(be_ntv_lv_msgbox_init) }, + })), + (be_nested_const_str("lv_msgbox", 1612829968, 6)) +); +/*******************************************************************/ + +void be_load_lv_msgbox_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_msgbox); + be_setglobal(vm, "lv_msgbox"); + be_pop(vm, 1); +} + +/******************************************************************** +** Solidified class: lv_spinbox +********************************************************************/ +extern const bclass be_class_lv_obj; +be_local_class(lv_spinbox, + 0, + &be_class_lv_textarea, + be_nested_map(2, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("_class", -1562820946, 6, -1), be_const_comptr(&lv_spinbox_class) }, + { be_nested_key("init", 380752755, 4, -1), be_const_func(be_ntv_lv_spinbox_init) }, + })), + (be_nested_const_str("lv_spinbox", 1612829968, 6)) +); +/*******************************************************************/ + +void be_load_lv_spinbox_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_spinbox); + be_setglobal(vm, "lv_spinbox"); + be_pop(vm, 1); +} + +/******************************************************************** +** Solidified class: lv_spinner +********************************************************************/ +extern const bclass be_class_lv_obj; +be_local_class(lv_spinner, + 0, + &be_class_lv_arc, + be_nested_map(2, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("_class", -1562820946, 6, -1), be_const_comptr(&lv_spinner_class) }, + { be_nested_key("init", 380752755, 4, -1), be_const_func(be_ntv_lv_spinner_init) }, + })), + (be_nested_const_str("lv_spinner", 1612829968, 6)) +); +/*******************************************************************/ + +void be_load_lv_spinner_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_spinner); + be_setglobal(vm, "lv_spinner"); + be_pop(vm, 1); +} + +/******************************************************************** +** Solidified class: lv_arc +********************************************************************/ +extern const bclass be_class_lv_obj; +be_local_class(lv_arc, + 0, + &be_class_lv_obj, + be_nested_map(2, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("_class", -1562820946, 6, -1), be_const_comptr(&lv_arc_class) }, + { be_nested_key("init", 380752755, 4, -1), be_const_func(be_ntv_lv_arc_init) }, + })), + (be_nested_const_str("lv_arc", 1612829968, 6)) +); +/*******************************************************************/ + +void be_load_lv_arc_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_arc); + be_setglobal(vm, "lv_arc"); + be_pop(vm, 1); +} + +/******************************************************************** +** Solidified class: lv_bar +********************************************************************/ +extern const bclass be_class_lv_obj; +be_local_class(lv_bar, + 0, + &be_class_lv_obj, + be_nested_map(2, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("_class", -1562820946, 6, -1), be_const_comptr(&lv_bar_class) }, + { be_nested_key("init", 380752755, 4, -1), be_const_func(be_ntv_lv_bar_init) }, + })), + (be_nested_const_str("lv_bar", 1612829968, 6)) +); +/*******************************************************************/ + +void be_load_lv_bar_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_bar); + be_setglobal(vm, "lv_bar"); + be_pop(vm, 1); +} + +/******************************************************************** +** Solidified class: lv_btn +********************************************************************/ +extern const bclass be_class_lv_obj; +be_local_class(lv_btn, + 0, + &be_class_lv_obj, + be_nested_map(2, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("_class", -1562820946, 6, -1), be_const_comptr(&lv_btn_class) }, + { be_nested_key("init", 380752755, 4, -1), be_const_func(be_ntv_lv_btn_init) }, + })), + (be_nested_const_str("lv_btn", 1612829968, 6)) +); +/*******************************************************************/ + +void be_load_lv_btn_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_btn); + be_setglobal(vm, "lv_btn"); + be_pop(vm, 1); +} + +/******************************************************************** +** Solidified class: lv_btnmatrix +********************************************************************/ +extern const bclass be_class_lv_obj; +be_local_class(lv_btnmatrix, + 0, + &be_class_lv_obj, + be_nested_map(2, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("_class", -1562820946, 6, -1), be_const_comptr(&lv_btnmatrix_class) }, + { be_nested_key("init", 380752755, 4, -1), be_const_func(be_ntv_lv_btnmatrix_init) }, + })), + (be_nested_const_str("lv_btnmatrix", 1612829968, 6)) +); +/*******************************************************************/ + +void be_load_lv_btnmatrix_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_btnmatrix); + be_setglobal(vm, "lv_btnmatrix"); + be_pop(vm, 1); +} + +/******************************************************************** +** Solidified class: lv_canvas +********************************************************************/ +extern const bclass be_class_lv_obj; +be_local_class(lv_canvas, + 0, + &be_class_lv_img, + be_nested_map(2, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("_class", -1562820946, 6, -1), be_const_comptr(&lv_canvas_class) }, + { be_nested_key("init", 380752755, 4, -1), be_const_func(be_ntv_lv_canvas_init) }, + })), + (be_nested_const_str("lv_canvas", 1612829968, 6)) +); +/*******************************************************************/ + +void be_load_lv_canvas_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_canvas); + be_setglobal(vm, "lv_canvas"); + be_pop(vm, 1); +} + +/******************************************************************** +** Solidified class: lv_checkbox +********************************************************************/ +extern const bclass be_class_lv_obj; +be_local_class(lv_checkbox, + 0, + &be_class_lv_obj, + be_nested_map(2, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("_class", -1562820946, 6, -1), be_const_comptr(&lv_checkbox_class) }, + { be_nested_key("init", 380752755, 4, -1), be_const_func(be_ntv_lv_checkbox_init) }, + })), + (be_nested_const_str("lv_checkbox", 1612829968, 6)) +); +/*******************************************************************/ + +void be_load_lv_checkbox_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_checkbox); + be_setglobal(vm, "lv_checkbox"); + be_pop(vm, 1); +} + +/******************************************************************** +** Solidified class: lv_dropdown +********************************************************************/ +extern const bclass be_class_lv_obj; +be_local_class(lv_dropdown, + 0, + &be_class_lv_obj, + be_nested_map(2, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("_class", -1562820946, 6, -1), be_const_comptr(&lv_dropdown_class) }, + { be_nested_key("init", 380752755, 4, -1), be_const_func(be_ntv_lv_dropdown_init) }, + })), + (be_nested_const_str("lv_dropdown", 1612829968, 6)) +); +/*******************************************************************/ + +void be_load_lv_dropdown_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_dropdown); + be_setglobal(vm, "lv_dropdown"); + be_pop(vm, 1); +} + +/******************************************************************** +** Solidified class: lv_label +********************************************************************/ +extern const bclass be_class_lv_obj; +be_local_class(lv_label, + 0, + &be_class_lv_obj, + be_nested_map(2, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("_class", -1562820946, 6, -1), be_const_comptr(&lv_label_class) }, + { be_nested_key("init", 380752755, 4, -1), be_const_func(be_ntv_lv_label_init) }, + })), + (be_nested_const_str("lv_label", 1612829968, 6)) +); +/*******************************************************************/ + +void be_load_lv_label_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_label); + be_setglobal(vm, "lv_label"); + be_pop(vm, 1); +} + +/******************************************************************** +** Solidified class: lv_line +********************************************************************/ +extern const bclass be_class_lv_obj; +be_local_class(lv_line, + 0, + &be_class_lv_obj, + be_nested_map(2, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("_class", -1562820946, 6, -1), be_const_comptr(&lv_line_class) }, + { be_nested_key("init", 380752755, 4, -1), be_const_func(be_ntv_lv_line_init) }, + })), + (be_nested_const_str("lv_line", 1612829968, 6)) +); +/*******************************************************************/ + +void be_load_lv_line_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_line); + be_setglobal(vm, "lv_line"); + be_pop(vm, 1); +} + +/******************************************************************** +** Solidified class: lv_roller +********************************************************************/ +extern const bclass be_class_lv_obj; +be_local_class(lv_roller, + 0, + &be_class_lv_obj, + be_nested_map(2, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("_class", -1562820946, 6, -1), be_const_comptr(&lv_roller_class) }, + { be_nested_key("init", 380752755, 4, -1), be_const_func(be_ntv_lv_roller_init) }, + })), + (be_nested_const_str("lv_roller", 1612829968, 6)) +); +/*******************************************************************/ + +void be_load_lv_roller_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_roller); + be_setglobal(vm, "lv_roller"); + be_pop(vm, 1); +} + +/******************************************************************** +** Solidified class: lv_slider +********************************************************************/ +extern const bclass be_class_lv_obj; +be_local_class(lv_slider, + 0, + &be_class_lv_obj, + be_nested_map(2, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("_class", -1562820946, 6, -1), be_const_comptr(&lv_slider_class) }, + { be_nested_key("init", 380752755, 4, -1), be_const_func(be_ntv_lv_slider_init) }, + })), + (be_nested_const_str("lv_slider", 1612829968, 6)) +); +/*******************************************************************/ + +void be_load_lv_slider_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_slider); + be_setglobal(vm, "lv_slider"); + be_pop(vm, 1); +} + +/******************************************************************** +** Solidified class: lv_switch +********************************************************************/ +extern const bclass be_class_lv_obj; +be_local_class(lv_switch, + 0, + &be_class_lv_obj, + be_nested_map(2, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("_class", -1562820946, 6, -1), be_const_comptr(&lv_switch_class) }, + { be_nested_key("init", 380752755, 4, -1), be_const_func(be_ntv_lv_switch_init) }, + })), + (be_nested_const_str("lv_switch", 1612829968, 6)) +); +/*******************************************************************/ + +void be_load_lv_switch_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_switch); + be_setglobal(vm, "lv_switch"); + be_pop(vm, 1); +} + +/******************************************************************** +** Solidified class: lv_table +********************************************************************/ +extern const bclass be_class_lv_obj; +be_local_class(lv_table, + 0, + &be_class_lv_obj, + be_nested_map(2, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("_class", -1562820946, 6, -1), be_const_comptr(&lv_table_class) }, + { be_nested_key("init", 380752755, 4, -1), be_const_func(be_ntv_lv_table_init) }, + })), + (be_nested_const_str("lv_table", 1612829968, 6)) +); +/*******************************************************************/ + +void be_load_lv_table_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_table); + be_setglobal(vm, "lv_table"); + be_pop(vm, 1); +} + +/******************************************************************** +** Solidified class: lv_textarea +********************************************************************/ +extern const bclass be_class_lv_obj; +be_local_class(lv_textarea, + 0, + &be_class_lv_obj, + be_nested_map(2, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("_class", -1562820946, 6, -1), be_const_comptr(&lv_textarea_class) }, + { be_nested_key("init", 380752755, 4, -1), be_const_func(be_ntv_lv_textarea_init) }, + })), + (be_nested_const_str("lv_textarea", 1612829968, 6)) +); +/*******************************************************************/ + +void be_load_lv_textarea_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_textarea); + be_setglobal(vm, "lv_textarea"); + be_pop(vm, 1); +} + + +#endif // USE_LVGL + diff --git a/lib/libesp32/berry/default/be_lvgl_wifi_arcs_icon_lib.c b/lib/libesp32/berry/default/be_lvgl_wifi_arcs_icon_lib.c new file mode 100644 index 000000000..d8fe9ce08 --- /dev/null +++ b/lib/libesp32/berry/default/be_lvgl_wifi_arcs_icon_lib.c @@ -0,0 +1,140 @@ +/******************************************************************** + * Tasmota LVGL lv_signal_bars widget + *******************************************************************/ +#include "be_constobj.h" + +#ifdef USE_LVGL + +#include "lvgl.h" + +/******************************************************************** +** Solidified function: init +********************************************************************/ +be_local_closure(lv_wifi_arcs_icon_init, /* name */ + be_nested_proto( + 10, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[18]) { /* constants */ + /* K0 */ be_nested_str(init), + /* K1 */ be_nested_str(set_style_line_color), + /* K2 */ be_nested_str(lv), + /* K3 */ be_nested_str(color), + /* K4 */ be_nested_str(COLOR_WHITE), + /* K5 */ be_nested_str(PART_MAIN), + /* K6 */ be_nested_str(STATE_DEFAULT), + /* K7 */ be_nested_str(set_style_bg_color), + /* K8 */ be_nested_str(COLOR_BLACK), + /* K9 */ be_nested_str(get_height), + /* K10 */ be_nested_str(get_style_pad_right), + /* K11 */ be_nested_str(set_height), + /* K12 */ be_const_int(3), + /* K13 */ be_nested_str(set_width), + /* K14 */ be_nested_str(set_x), + /* K15 */ be_nested_str(get_width), + /* K16 */ be_nested_str(set_style_pad_right), + /* K17 */ be_const_int(1), + }), + &be_const_str_init, + &be_const_str_solidified, + ( &(const binstruction[67]) { /* code */ + 0x60080003, // 0000 GETGBL R2 G3 + 0x5C0C0000, // 0001 MOVE R3 R0 + 0x7C080200, // 0002 CALL R2 1 + 0x8C080500, // 0003 GETMET R2 R2 K0 + 0x5C100200, // 0004 MOVE R4 R1 + 0x7C080400, // 0005 CALL R2 2 + 0x8C080101, // 0006 GETMET R2 R0 K1 + 0xB8120400, // 0007 GETNGBL R4 K2 + 0x8C100903, // 0008 GETMET R4 R4 K3 + 0xB81A0400, // 0009 GETNGBL R6 K2 + 0x88180D04, // 000A GETMBR R6 R6 K4 + 0x7C100400, // 000B CALL R4 2 + 0xB8160400, // 000C GETNGBL R5 K2 + 0x88140B05, // 000D GETMBR R5 R5 K5 + 0xB81A0400, // 000E GETNGBL R6 K2 + 0x88180D06, // 000F GETMBR R6 R6 K6 + 0x30140A06, // 0010 OR R5 R5 R6 + 0x7C080600, // 0011 CALL R2 3 + 0x8C080107, // 0012 GETMET R2 R0 K7 + 0xB8120400, // 0013 GETNGBL R4 K2 + 0x8C100903, // 0014 GETMET R4 R4 K3 + 0xB81A0400, // 0015 GETNGBL R6 K2 + 0x88180D08, // 0016 GETMBR R6 R6 K8 + 0x7C100400, // 0017 CALL R4 2 + 0xB8160400, // 0018 GETNGBL R5 K2 + 0x88140B05, // 0019 GETMBR R5 R5 K5 + 0xB81A0400, // 001A GETNGBL R6 K2 + 0x88180D06, // 001B GETMBR R6 R6 K6 + 0x30140A06, // 001C OR R5 R5 R6 + 0x7C080600, // 001D CALL R2 3 + 0x4C080000, // 001E LDNIL R2 + 0x20080202, // 001F NE R2 R1 R2 + 0x780A0020, // 0020 JMPF R2 #0042 + 0x8C080309, // 0021 GETMET R2 R1 K9 + 0x7C080200, // 0022 CALL R2 1 + 0x8C0C030A, // 0023 GETMET R3 R1 K10 + 0xB8160400, // 0024 GETNGBL R5 K2 + 0x88140B05, // 0025 GETMBR R5 R5 K5 + 0xB81A0400, // 0026 GETNGBL R6 K2 + 0x88180D06, // 0027 GETMBR R6 R6 K6 + 0x30140A06, // 0028 OR R5 R5 R6 + 0x7C0C0400, // 0029 CALL R3 2 + 0x8C10010B, // 002A GETMET R4 R0 K11 + 0x5C180400, // 002B MOVE R6 R2 + 0x7C100400, // 002C CALL R4 2 + 0x54120003, // 002D LDINT R4 4 + 0x08100404, // 002E MUL R4 R2 R4 + 0x0C10090C, // 002F DIV R4 R4 K12 + 0x8C14010D, // 0030 GETMET R5 R0 K13 + 0x5C1C0800, // 0031 MOVE R7 R4 + 0x7C140400, // 0032 CALL R5 2 + 0x8C14010E, // 0033 GETMET R5 R0 K14 + 0x8C1C030F, // 0034 GETMET R7 R1 K15 + 0x7C1C0200, // 0035 CALL R7 1 + 0x041C0E04, // 0036 SUB R7 R7 R4 + 0x041C0E03, // 0037 SUB R7 R7 R3 + 0x7C140400, // 0038 CALL R5 2 + 0x8C140310, // 0039 GETMET R5 R1 K16 + 0x001C0604, // 003A ADD R7 R3 R4 + 0x001C0F11, // 003B ADD R7 R7 K17 + 0xB8220400, // 003C GETNGBL R8 K2 + 0x88201105, // 003D GETMBR R8 R8 K5 + 0xB8260400, // 003E GETNGBL R9 K2 + 0x88241306, // 003F GETMBR R9 R9 K6 + 0x30201009, // 0040 OR R8 R8 R9 + 0x7C140600, // 0041 CALL R5 3 + 0x80000000, // 0042 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified class: lv_wifi_arcs_icon +********************************************************************/ +extern const bclass be_class_lv_wifi_arcs; +be_local_class(lv_wifi_arcs_icon, + 0, + &be_class_lv_wifi_arcs, + be_nested_map(1, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(init, -1), be_const_closure(lv_wifi_arcs_icon_init_closure) }, + })), + be_str_literal("lv_wifi_arcs_icon") +); +/*******************************************************************/ + +void be_load_lv_wifi_arcs_icon_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_wifi_arcs_icon); + be_setglobal(vm, "lv_wifi_arcs_icon"); + be_pop(vm, 1); +} + +#endif // USE_LVGL \ No newline at end of file diff --git a/lib/libesp32/berry/default/be_lvgl_wifi_arcs_lib.c b/lib/libesp32/berry/default/be_lvgl_wifi_arcs_lib.c new file mode 100644 index 000000000..57cbf18a9 --- /dev/null +++ b/lib/libesp32/berry/default/be_lvgl_wifi_arcs_lib.c @@ -0,0 +1,167 @@ +/******************************************************************** + * Tasmota LVGL lv_signal_bars widget + *******************************************************************/ +#include "be_constobj.h" + +#ifdef USE_LVGL + +#include "lvgl.h" + +/******************************************************************** +** Solidified function: every_second +********************************************************************/ +be_local_closure(lv_wifi_arcs_every_second, /* name */ + be_nested_proto( + 7, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 7]) { /* constants */ + /* K0 */ be_nested_str(tasmota), + /* K1 */ be_nested_str(wifi), + /* K2 */ be_nested_str(find), + /* K3 */ be_nested_str(quality), + /* K4 */ be_nested_str(ip), + /* K5 */ be_nested_str(set_percentage), + /* K6 */ be_const_int(0), + }), + &be_const_str_every_second, + &be_const_str_solidified, + ( &(const binstruction[23]) { /* code */ + 0xB8060000, // 0000 GETNGBL R1 K0 + 0x8C040301, // 0001 GETMET R1 R1 K1 + 0x7C040200, // 0002 CALL R1 1 + 0x8C080302, // 0003 GETMET R2 R1 K2 + 0x58100003, // 0004 LDCONST R4 K3 + 0x7C080400, // 0005 CALL R2 2 + 0x8C0C0302, // 0006 GETMET R3 R1 K2 + 0x58140004, // 0007 LDCONST R5 K4 + 0x7C0C0400, // 0008 CALL R3 2 + 0x4C100000, // 0009 LDNIL R4 + 0x1C100604, // 000A EQ R4 R3 R4 + 0x78120003, // 000B JMPF R4 #0010 + 0x8C100105, // 000C GETMET R4 R0 K5 + 0x58180006, // 000D LDCONST R6 K6 + 0x7C100400, // 000E CALL R4 2 + 0x70020005, // 000F JMP #0016 + 0x4C100000, // 0010 LDNIL R4 + 0x20100404, // 0011 NE R4 R2 R4 + 0x78120002, // 0012 JMPF R4 #0016 + 0x8C100105, // 0013 GETMET R4 R0 K5 + 0x5C180400, // 0014 MOVE R6 R2 + 0x7C100400, // 0015 CALL R4 2 + 0x80000000, // 0016 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: init +********************************************************************/ +be_local_closure(lv_wifi_arcs_init, /* name */ + be_nested_proto( + 5, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 5]) { /* constants */ + /* K0 */ be_nested_str(init), + /* K1 */ be_nested_str(tasmota), + /* K2 */ be_nested_str(add_driver), + /* K3 */ be_nested_str(set_percentage), + /* K4 */ be_const_int(0), + }), + &be_const_str_init, + &be_const_str_solidified, + ( &(const binstruction[14]) { /* code */ + 0x60080003, // 0000 GETGBL R2 G3 + 0x5C0C0000, // 0001 MOVE R3 R0 + 0x7C080200, // 0002 CALL R2 1 + 0x8C080500, // 0003 GETMET R2 R2 K0 + 0x5C100200, // 0004 MOVE R4 R1 + 0x7C080400, // 0005 CALL R2 2 + 0xB80A0200, // 0006 GETNGBL R2 K1 + 0x8C080502, // 0007 GETMET R2 R2 K2 + 0x5C100000, // 0008 MOVE R4 R0 + 0x7C080400, // 0009 CALL R2 2 + 0x8C080103, // 000A GETMET R2 R0 K3 + 0x58100004, // 000B LDCONST R4 K4 + 0x7C080400, // 000C CALL R2 2 + 0x80000000, // 000D RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: del +********************************************************************/ +be_local_closure(lv_wifi_arcs_del, /* name */ + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(del), + /* K1 */ be_nested_str(tasmota), + /* K2 */ be_nested_str(remove_driver), + }), + &be_const_str_del, + &be_const_str_solidified, + ( &(const binstruction[10]) { /* code */ + 0x60040003, // 0000 GETGBL R1 G3 + 0x5C080000, // 0001 MOVE R2 R0 + 0x7C040200, // 0002 CALL R1 1 + 0x8C040300, // 0003 GETMET R1 R1 K0 + 0x7C040200, // 0004 CALL R1 1 + 0xB8060200, // 0005 GETNGBL R1 K1 + 0x8C040302, // 0006 GETMET R1 R1 K2 + 0x5C0C0000, // 0007 MOVE R3 R0 + 0x7C040400, // 0008 CALL R1 2 + 0x80000000, // 0009 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified class: lv_wifi_arcs +********************************************************************/ +extern const bclass be_class_lv_signal_arcs; +be_local_class(lv_wifi_arcs, + 0, + &be_class_lv_signal_arcs, + be_nested_map(3, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(every_second, 1), be_const_closure(lv_wifi_arcs_every_second_closure) }, + { be_const_key(init, -1), be_const_closure(lv_wifi_arcs_init_closure) }, + { be_const_key(del, -1), be_const_closure(lv_wifi_arcs_del_closure) }, + })), + be_str_literal("lv_wifi_arcs") +); +/*******************************************************************/ + +void be_load_lv_wifi_arcs_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_wifi_arcs); + be_setglobal(vm, "lv_wifi_arcs"); + be_pop(vm, 1); +} + +#endif // USE_LVGL \ No newline at end of file diff --git a/lib/libesp32/berry/default/be_lvgl_wifi_bars_icon_lib.c b/lib/libesp32/berry/default/be_lvgl_wifi_bars_icon_lib.c new file mode 100644 index 000000000..a1cf693e5 --- /dev/null +++ b/lib/libesp32/berry/default/be_lvgl_wifi_bars_icon_lib.c @@ -0,0 +1,136 @@ +/******************************************************************** + * Tasmota LVGL lv_signal_bars widget + *******************************************************************/ +#include "be_constobj.h" + +#ifdef USE_LVGL + +#include "lvgl.h" + +/******************************************************************** +** Solidified function: init +********************************************************************/ +be_local_closure(lv_wifi_bars_icon_init, /* name */ + be_nested_proto( + 9, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[17]) { /* constants */ + /* K0 */ be_nested_str(init), + /* K1 */ be_nested_str(set_style_line_color), + /* K2 */ be_nested_str(lv), + /* K3 */ be_nested_str(color), + /* K4 */ be_nested_str(COLOR_WHITE), + /* K5 */ be_nested_str(PART_MAIN), + /* K6 */ be_nested_str(STATE_DEFAULT), + /* K7 */ be_nested_str(set_style_bg_color), + /* K8 */ be_nested_str(COLOR_BLACK), + /* K9 */ be_nested_str(get_height), + /* K10 */ be_nested_str(get_style_pad_right), + /* K11 */ be_nested_str(set_height), + /* K12 */ be_nested_str(set_width), + /* K13 */ be_nested_str(set_x), + /* K14 */ be_nested_str(get_width), + /* K15 */ be_nested_str(set_style_pad_right), + /* K16 */ be_const_int(1), + }), + &be_const_str_init, + &be_const_str_solidified, + ( &(const binstruction[64]) { /* code */ + 0x60080003, // 0000 GETGBL R2 G3 + 0x5C0C0000, // 0001 MOVE R3 R0 + 0x7C080200, // 0002 CALL R2 1 + 0x8C080500, // 0003 GETMET R2 R2 K0 + 0x5C100200, // 0004 MOVE R4 R1 + 0x7C080400, // 0005 CALL R2 2 + 0x8C080101, // 0006 GETMET R2 R0 K1 + 0xB8120400, // 0007 GETNGBL R4 K2 + 0x8C100903, // 0008 GETMET R4 R4 K3 + 0xB81A0400, // 0009 GETNGBL R6 K2 + 0x88180D04, // 000A GETMBR R6 R6 K4 + 0x7C100400, // 000B CALL R4 2 + 0xB8160400, // 000C GETNGBL R5 K2 + 0x88140B05, // 000D GETMBR R5 R5 K5 + 0xB81A0400, // 000E GETNGBL R6 K2 + 0x88180D06, // 000F GETMBR R6 R6 K6 + 0x30140A06, // 0010 OR R5 R5 R6 + 0x7C080600, // 0011 CALL R2 3 + 0x8C080107, // 0012 GETMET R2 R0 K7 + 0xB8120400, // 0013 GETNGBL R4 K2 + 0x8C100903, // 0014 GETMET R4 R4 K3 + 0xB81A0400, // 0015 GETNGBL R6 K2 + 0x88180D08, // 0016 GETMBR R6 R6 K8 + 0x7C100400, // 0017 CALL R4 2 + 0xB8160400, // 0018 GETNGBL R5 K2 + 0x88140B05, // 0019 GETMBR R5 R5 K5 + 0xB81A0400, // 001A GETNGBL R6 K2 + 0x88180D06, // 001B GETMBR R6 R6 K6 + 0x30140A06, // 001C OR R5 R5 R6 + 0x7C080600, // 001D CALL R2 3 + 0x4C080000, // 001E LDNIL R2 + 0x20080202, // 001F NE R2 R1 R2 + 0x780A001D, // 0020 JMPF R2 #003F + 0x8C080309, // 0021 GETMET R2 R1 K9 + 0x7C080200, // 0022 CALL R2 1 + 0x8C0C030A, // 0023 GETMET R3 R1 K10 + 0xB8160400, // 0024 GETNGBL R5 K2 + 0x88140B05, // 0025 GETMBR R5 R5 K5 + 0xB81A0400, // 0026 GETNGBL R6 K2 + 0x88180D06, // 0027 GETMBR R6 R6 K6 + 0x30140A06, // 0028 OR R5 R5 R6 + 0x7C0C0400, // 0029 CALL R3 2 + 0x8C10010B, // 002A GETMET R4 R0 K11 + 0x5C180400, // 002B MOVE R6 R2 + 0x7C100400, // 002C CALL R4 2 + 0x8C10010C, // 002D GETMET R4 R0 K12 + 0x5C180400, // 002E MOVE R6 R2 + 0x7C100400, // 002F CALL R4 2 + 0x8C10010D, // 0030 GETMET R4 R0 K13 + 0x8C18030E, // 0031 GETMET R6 R1 K14 + 0x7C180200, // 0032 CALL R6 1 + 0x04180C02, // 0033 SUB R6 R6 R2 + 0x04180C03, // 0034 SUB R6 R6 R3 + 0x7C100400, // 0035 CALL R4 2 + 0x8C10030F, // 0036 GETMET R4 R1 K15 + 0x00180602, // 0037 ADD R6 R3 R2 + 0x00180D10, // 0038 ADD R6 R6 K16 + 0xB81E0400, // 0039 GETNGBL R7 K2 + 0x881C0F05, // 003A GETMBR R7 R7 K5 + 0xB8220400, // 003B GETNGBL R8 K2 + 0x88201106, // 003C GETMBR R8 R8 K6 + 0x301C0E08, // 003D OR R7 R7 R8 + 0x7C100600, // 003E CALL R4 3 + 0x80000000, // 003F RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified class: lv_wifi_bars_icon +********************************************************************/ +extern const bclass be_class_lv_wifi_bars; +be_local_class(lv_wifi_bars_icon, + 0, + &be_class_lv_wifi_bars, + be_nested_map(1, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(init, -1), be_const_closure(lv_wifi_bars_icon_init_closure) }, + })), + be_str_literal("lv_wifi_bars_icon") +); +/*******************************************************************/ + +void be_load_lv_wifi_bars_icon_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_wifi_bars_icon); + be_setglobal(vm, "lv_wifi_bars_icon"); + be_pop(vm, 1); +} + +#endif // USE_LVGL \ No newline at end of file diff --git a/lib/libesp32/berry/default/be_lvgl_wifi_bars_lib.c b/lib/libesp32/berry/default/be_lvgl_wifi_bars_lib.c new file mode 100644 index 000000000..c61cb2bb3 --- /dev/null +++ b/lib/libesp32/berry/default/be_lvgl_wifi_bars_lib.c @@ -0,0 +1,167 @@ +/******************************************************************** + * Tasmota LVGL lv_signal_bars widget + *******************************************************************/ +#include "be_constobj.h" + +#ifdef USE_LVGL + +#include "lvgl.h" + +/******************************************************************** +** Solidified function: every_second +********************************************************************/ +be_local_closure(lv_wifi_bars_every_second, /* name */ + be_nested_proto( + 7, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 7]) { /* constants */ + /* K0 */ be_nested_str(tasmota), + /* K1 */ be_nested_str(wifi), + /* K2 */ be_nested_str(find), + /* K3 */ be_nested_str(quality), + /* K4 */ be_nested_str(ip), + /* K5 */ be_nested_str(set_percentage), + /* K6 */ be_const_int(0), + }), + &be_const_str_every_second, + &be_const_str_solidified, + ( &(const binstruction[23]) { /* code */ + 0xB8060000, // 0000 GETNGBL R1 K0 + 0x8C040301, // 0001 GETMET R1 R1 K1 + 0x7C040200, // 0002 CALL R1 1 + 0x8C080302, // 0003 GETMET R2 R1 K2 + 0x58100003, // 0004 LDCONST R4 K3 + 0x7C080400, // 0005 CALL R2 2 + 0x8C0C0302, // 0006 GETMET R3 R1 K2 + 0x58140004, // 0007 LDCONST R5 K4 + 0x7C0C0400, // 0008 CALL R3 2 + 0x4C100000, // 0009 LDNIL R4 + 0x1C100604, // 000A EQ R4 R3 R4 + 0x78120003, // 000B JMPF R4 #0010 + 0x8C100105, // 000C GETMET R4 R0 K5 + 0x58180006, // 000D LDCONST R6 K6 + 0x7C100400, // 000E CALL R4 2 + 0x70020005, // 000F JMP #0016 + 0x4C100000, // 0010 LDNIL R4 + 0x20100404, // 0011 NE R4 R2 R4 + 0x78120002, // 0012 JMPF R4 #0016 + 0x8C100105, // 0013 GETMET R4 R0 K5 + 0x5C180400, // 0014 MOVE R6 R2 + 0x7C100400, // 0015 CALL R4 2 + 0x80000000, // 0016 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: init +********************************************************************/ +be_local_closure(lv_wifi_bars_init, /* name */ + be_nested_proto( + 5, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 5]) { /* constants */ + /* K0 */ be_nested_str(init), + /* K1 */ be_nested_str(tasmota), + /* K2 */ be_nested_str(add_driver), + /* K3 */ be_nested_str(set_percentage), + /* K4 */ be_const_int(0), + }), + &be_const_str_init, + &be_const_str_solidified, + ( &(const binstruction[14]) { /* code */ + 0x60080003, // 0000 GETGBL R2 G3 + 0x5C0C0000, // 0001 MOVE R3 R0 + 0x7C080200, // 0002 CALL R2 1 + 0x8C080500, // 0003 GETMET R2 R2 K0 + 0x5C100200, // 0004 MOVE R4 R1 + 0x7C080400, // 0005 CALL R2 2 + 0xB80A0200, // 0006 GETNGBL R2 K1 + 0x8C080502, // 0007 GETMET R2 R2 K2 + 0x5C100000, // 0008 MOVE R4 R0 + 0x7C080400, // 0009 CALL R2 2 + 0x8C080103, // 000A GETMET R2 R0 K3 + 0x58100004, // 000B LDCONST R4 K4 + 0x7C080400, // 000C CALL R2 2 + 0x80000000, // 000D RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: del +********************************************************************/ +be_local_closure(lv_wifi_bars_del, /* name */ + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(del), + /* K1 */ be_nested_str(tasmota), + /* K2 */ be_nested_str(remove_driver), + }), + &be_const_str_del, + &be_const_str_solidified, + ( &(const binstruction[10]) { /* code */ + 0x60040003, // 0000 GETGBL R1 G3 + 0x5C080000, // 0001 MOVE R2 R0 + 0x7C040200, // 0002 CALL R1 1 + 0x8C040300, // 0003 GETMET R1 R1 K0 + 0x7C040200, // 0004 CALL R1 1 + 0xB8060200, // 0005 GETNGBL R1 K1 + 0x8C040302, // 0006 GETMET R1 R1 K2 + 0x5C0C0000, // 0007 MOVE R3 R0 + 0x7C040400, // 0008 CALL R1 2 + 0x80000000, // 0009 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified class: lv_wifi_bars +********************************************************************/ +extern const bclass be_class_lv_signal_bars; +be_local_class(lv_wifi_bars, + 0, + &be_class_lv_signal_bars, + be_nested_map(3, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(every_second, 1), be_const_closure(lv_wifi_bars_every_second_closure) }, + { be_const_key(init, -1), be_const_closure(lv_wifi_bars_init_closure) }, + { be_const_key(del, -1), be_const_closure(lv_wifi_bars_del_closure) }, + })), + be_str_literal("lv_wifi_bars") +); +/*******************************************************************/ + +void be_load_lv_wifi_bars_class(bvm *vm) { + be_pushntvclass(vm, &be_class_lv_wifi_bars); + be_setglobal(vm, "lv_wifi_bars"); + be_pop(vm, 1); +} + +#endif // USE_LVGL \ No newline at end of file diff --git a/lib/libesp32/berry/default/be_md5_lib.c b/lib/libesp32/berry/default/be_md5_lib.c new file mode 100644 index 000000000..2c8dfd77b --- /dev/null +++ b/lib/libesp32/berry/default/be_md5_lib.c @@ -0,0 +1,30 @@ +/******************************************************************** + * Berry module `webserver` + * + * To use: `import webserver` + * + * Allows to respond to HTTP request + *******************************************************************/ +#include "be_constobj.h" + +extern int m_md5_init(bvm *vm); +extern int m_md5_update(bvm *vm); +extern int m_md5_finish(bvm *vm); + +#include "../generate/be_fixed_be_class_md5.h" + +void be_load_md5_lib(bvm *vm) { + be_pushntvclass(vm, &be_class_md5); + be_setglobal(vm, "MD5"); + be_pop(vm, 1); +} +/* @const_object_info_begin + +class be_class_md5 (scope: global, name: MD5) { + .p, var + + init, func(m_md5_init) + update, func(m_md5_update) + finish, func(m_md5_finish) +} +@const_object_info_end */ diff --git a/lib/libesp32/berry/default/be_modtab.c b/lib/libesp32/berry/default/be_modtab.c new file mode 100644 index 000000000..934400bbb --- /dev/null +++ b/lib/libesp32/berry/default/be_modtab.c @@ -0,0 +1,230 @@ +/******************************************************************** +** Copyright (c) 2018-2020 Guan Wenliang +** This file is part of the Berry default interpreter. +** skiars@qq.com, https://github.com/Skiars/berry +** See Copyright Notice in the LICENSE file or at +** https://github.com/Skiars/berry/blob/master/LICENSE +********************************************************************/ +#include "berry.h" + +/* this file contains the declaration of the module table. */ + +/* default modules declare */ +be_extern_native_module(string); +be_extern_native_module(json); +be_extern_native_module(math); +be_extern_native_module(time); +be_extern_native_module(os); +be_extern_native_module(global); +be_extern_native_module(sys); +be_extern_native_module(debug); +be_extern_native_module(gc); +be_extern_native_module(solidify); +be_extern_native_module(introspect); +be_extern_native_module(strict); + +/* Berry extensions */ +#include "be_mapping.h" +be_extern_native_module(cb); + +/* Tasmota specific */ +be_extern_native_module(python_compat); +be_extern_native_module(re); +be_extern_native_module(persist); +be_extern_native_module(autoconf); +be_extern_native_module(tapp); +be_extern_native_module(light); +be_extern_native_module(gpio); +be_extern_native_module(display); +be_extern_native_module(energy); +be_extern_native_module(webserver); +be_extern_native_module(flash); +be_extern_native_module(path); +be_extern_native_module(unishox); +be_extern_native_module(animate); +#ifdef USE_LVGL +be_extern_native_module(lv); +#endif // USE_LVGL + +/* user-defined modules declare start */ + +/* user-defined modules declare end */ + +/* module list declaration */ +BERRY_LOCAL const bntvmodule* const be_module_table[] = { +/* default modules register */ +#if BE_USE_STRING_MODULE + &be_native_module(string), +#endif +#if BE_USE_JSON_MODULE + &be_native_module(json), +#endif +#if BE_USE_MATH_MODULE + &be_native_module(math), +#endif +#if BE_USE_TIME_MODULE + &be_native_module(time), +#endif +#if BE_USE_OS_MODULE + &be_native_module(os), +#endif +#if BE_USE_GLOBAL_MODULE + &be_native_module(global), +#endif +#if BE_USE_SYS_MODULE + &be_native_module(sys), +#endif +#if BE_USE_DEBUG_MODULE + &be_native_module(debug), +#endif +#if BE_USE_GC_MODULE + &be_native_module(gc), +#endif +#if BE_USE_SOLIDIFY_MODULE + &be_native_module(solidify), +#endif +#if BE_USE_INTROSPECT_MODULE + &be_native_module(introspect), +#endif +#if BE_USE_STRICT_MODULE + &be_native_module(strict), +#endif + + /* Berry extensions */ + &be_native_module(cb), + + /* user-defined modules register start */ + + &be_native_module(python_compat), + &be_native_module(re), + &be_native_module(path), + &be_native_module(persist), +#ifdef USE_AUTOCONF + &be_native_module(autoconf), +#endif // USE_AUTOCONF + &be_native_module(tapp), + &be_native_module(gpio), +#ifdef USE_DISPLAY + &be_native_module(display), +#endif // USE_DISPLAY +#ifdef USE_LIGHT + &be_native_module(light), +#endif + +#ifdef USE_UNISHOX_COMPRESSION + &be_native_module(unishox), +#endif // USE_UNISHOX_COMPRESSION + &be_native_module(animate), + +#ifdef USE_LVGL + &be_native_module(lv), +#endif // USE_LVGL +#ifdef USE_ENERGY_SENSOR + &be_native_module(energy), +#endif // USE_ENERGY_SENSOR +#ifdef USE_WEBSERVER + &be_native_module(webserver), +#endif // USE_WEBSERVER + &be_native_module(flash), + + + /* user-defined modules register end */ + NULL /* do not remove */ +}; + +#ifdef ESP32 +extern void be_load_tasmota_ntvlib(bvm *vm); +extern void be_load_wirelib(bvm *vm); +extern void be_load_onewirelib(bvm *vm); +extern void be_load_serial_lib(bvm *vm); +extern void be_load_Driver_class(bvm *vm); +extern void be_load_Timer_class(bvm *vm); +extern void be_load_I2C_Driver_class(bvm *vm); +extern void be_load_AXP192_class(bvm *vm); +extern void be_load_md5_lib(bvm *vm); +extern void be_load_webclient_lib(bvm *vm); +extern void be_load_tcpclient_lib(bvm *vm); +extern void be_load_crypto_lib(bvm *vm); +extern void be_load_Leds_ntv_class(bvm *vm); +extern void be_load_Leds_class(bvm *vm); +extern void be_load_Leds_animator_class(bvm *vm); + +extern void be_load_ctypes_lib(bvm *vm); +extern void be_load_ctypes_energy_definitions_lib(bvm *vm); + +#ifdef USE_I2S_AUDIO_BERRY +extern void be_load_driver_audio_lib(bvm *vm); +#endif + +#ifdef USE_LVGL +extern void be_load_lv_color_class(bvm *vm); +extern void be_load_lv_font_class(bvm *vm); +extern void be_load_LVGL_glob_class(bvm *vm); +// custom widgets +extern void be_load_lv_signal_bars_class(bvm *vm); +extern void be_load_lv_wifi_bars_class(bvm *vm); +extern void be_load_lv_wifi_bars_icon_class(bvm *vm); +extern void be_load_lv_signal_arcs_class(bvm *vm); +extern void be_load_lv_wifi_arcs_class(bvm *vm); +extern void be_load_lv_wifi_arcs_icon_class(bvm *vm); +extern void be_load_lv_clock_icon_class(bvm *vm); +#endif// USE_LVGL + +/* this code loads the native class definitions */ +BERRY_API void be_load_custom_libs(bvm *vm) +{ + (void)vm; /* prevent a compiler warning */ + + /* add here custom libs */ +#if !BE_USE_PRECOMPILED_OBJECT + /* be_load_xxxlib(vm); */ +#endif + be_load_Timer_class(vm); + be_load_tasmota_ntvlib(vm); + be_load_Driver_class(vm); + be_load_md5_lib(vm); + be_load_serial_lib(vm); + be_load_ctypes_lib(vm); +#ifdef USE_ALEXA_AVS + be_load_crypto_lib(vm); +#endif +#ifdef USE_I2C + be_load_wirelib(vm); + be_load_I2C_Driver_class(vm); + be_load_AXP192_class(vm); +#endif // USE_I2C +#ifdef USE_ENERGY_SENSOR + be_load_ctypes_energy_definitions_lib(vm); +#endif // USE_ENERGY_SENSOR +#ifdef USE_WEBCLIENT + be_load_webclient_lib(vm); + be_load_tcpclient_lib(vm); +#endif // USE_WEBCLIENT +#if defined(USE_ONEWIRE) || defined(USE_DS18x20) + be_load_onewirelib(vm); +#endif +#ifdef USE_WS2812 + be_load_Leds_ntv_class(vm); + be_load_Leds_class(vm); + be_load_Leds_animator_class(vm); +#endif // USE_WS2812 +#ifdef USE_I2S_AUDIO_BERRY + be_load_driver_audio_lib(vm); +#endif +#ifdef USE_LVGL + // LVGL + be_load_lv_color_class(vm); + be_load_lv_font_class(vm); + + be_load_LVGL_glob_class(vm); + // custom widgets + be_load_lv_signal_bars_class(vm); + be_load_lv_wifi_bars_class(vm); + be_load_lv_wifi_bars_icon_class(vm); + be_load_lv_signal_arcs_class(vm); + be_load_lv_wifi_arcs_class(vm); + be_load_lv_wifi_arcs_icon_class(vm); + be_load_lv_clock_icon_class(vm); +#endif // USE_LVGL +} +#endif diff --git a/lib/libesp32/berry/default/be_onewire_lib.c b/lib/libesp32/berry/default/be_onewire_lib.c new file mode 100644 index 000000000..838e6ccf9 --- /dev/null +++ b/lib/libesp32/berry/default/be_onewire_lib.c @@ -0,0 +1,57 @@ +/******************************************************************** + * Tasmota lib + * + * To use: `import wire` + * + * 2 wire communication - I2C + *******************************************************************/ +#include "be_constobj.h" + +#if defined(USE_ONEWIRE) || defined(USE_DS18x20) + +extern int b_onewire_init(bvm *vm); +extern int b_onewire_deinit(bvm *vm); + +extern int b_onewire_reset(bvm *vm); +extern int b_onewire_select(bvm *vm); +extern int b_onewire_skip(bvm *vm); +extern int b_onewire_depower(bvm *vm); + +extern int b_onewire_write(bvm *vm); +extern int b_onewire_read(bvm *vm); + +extern int b_onewire_reset_search(bvm *vm); +extern int b_onewire_target_search(bvm *vm); +extern int b_onewire_search(bvm *vm); + +#include "../generate/be_fixed_be_class_tasmota_onewire.h" + +void be_load_onewirelib(bvm *vm) { + be_pushntvclass(vm, &be_class_tasmota_onewire); + be_setglobal(vm, "OneWire"); + be_pop(vm, 1); +} + +/* @const_object_info_begin + +class be_class_tasmota_onewire (scope: global, name: OneWire) { + .p, var + + init, func(b_onewire_init) + deinit, func(b_onewire_deinit) + + reset, func(b_onewire_reset) + select, func(b_onewire_select) + skip, func(b_onewire_skip) + depower, func(b_onewire_depower) + + write, func(b_onewire_write) + read, func(b_onewire_read) + + reset_search, func(b_onewire_reset_search) + target_search, func(b_onewire_target_search) + search, func(b_onewire_search) +} +@const_object_info_end */ + +#endif // defined(USE_ONEWIRE) || defined(USE_DS18x20) diff --git a/lib/libesp32/berry/default/be_path_tasmota_lib.c b/lib/libesp32/berry/default/be_path_tasmota_lib.c new file mode 100644 index 000000000..81711a053 --- /dev/null +++ b/lib/libesp32/berry/default/be_path_tasmota_lib.c @@ -0,0 +1,70 @@ +/******************************************************************** +** Copyright (c) 2018-2020 Guan Wenliang +** This file is part of the Berry default interpreter. +** skiars@qq.com, https://github.com/Skiars/berry +** See Copyright Notice in the LICENSE file or at +** https://github.com/Skiars/berry/blob/master/LICENSE +********************************************************************/ + +/******************************************************************** + * Berry module `path` + * + * Minimal version of `import path` + * + *******************************************************************/ +#include "be_object.h" +#include "be_strlib.h" +#include "be_mem.h" +#include "be_sys.h" +#include + +extern int m_path_listdir(bvm *vm); + +static int m_path_exists(bvm *vm) +{ + const char *path = NULL; + if (be_top(vm) >= 1 && be_isstring(vm, 1)) { + path = be_tostring(vm, 1); + be_pushbool(vm, be_isexist(path)); + } else { + be_pushbool(vm, bfalse); + } + be_return(vm); +} +extern time_t be_last_modified(void *hfile); + +static int m_path_last_modified(bvm *vm) +{ + if (be_top(vm) >= 1 && be_isstring(vm, 1)) { + const char *path = be_tostring(vm, 1); + void * f = be_fopen(path, "r"); + if (f) { + be_pushint(vm, be_last_modified(f)); + be_fclose(f); + be_return(vm); + } + } + be_return_nil(vm); +} + +static int m_path_remove(bvm *vm) +{ + const char *path = NULL; + if (be_top(vm) >= 1 && be_isstring(vm, 1)) { + path = be_tostring(vm, 1); + be_pushbool(vm, be_unlink(path)); + } else { + be_pushbool(vm, bfalse); + } + be_return(vm); +} + +/* @const_object_info_begin +module path (scope: global, file: tasmota_path) { + exists, func(m_path_exists) + last_modified, func(m_path_last_modified) + listdir, func(m_path_listdir) + remove, func(m_path_remove) +} +@const_object_info_end */ +#include "../generate/be_fixed_tasmota_path.h" diff --git a/lib/libesp32/berry/default/be_persist_lib.c b/lib/libesp32/berry/default/be_persist_lib.c new file mode 100644 index 000000000..0581081c7 --- /dev/null +++ b/lib/libesp32/berry/default/be_persist_lib.c @@ -0,0 +1,703 @@ +/******************************************************************** + * Tasmota lib + * + * To use: `import power` + * + * read power values + *******************************************************************/ +#include "be_constobj.h" + +/******************************************************************** +** Solidified function: json_fdump_map +********************************************************************/ +be_local_closure(Persist_json_fdump_map, /* name */ + be_nested_proto( + 13, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[10]) { /* constants */ + /* K0 */ be_nested_str(json), + /* K1 */ be_nested_str(write), + /* K2 */ be_nested_str(_X7B), + /* K3 */ be_nested_str(keys), + /* K4 */ be_nested_str(dump), + /* K5 */ be_nested_str(_X3A), + /* K6 */ be_nested_str(json_fdump_any), + /* K7 */ be_nested_str(_X2C), + /* K8 */ be_nested_str(stop_iteration), + /* K9 */ be_nested_str(_X7D), + }), + &be_const_str_json_fdump_map, + &be_const_str_solidified, + ( &(const binstruction[41]) { /* code */ + 0xA40E0000, // 0000 IMPORT R3 K0 + 0x8C100301, // 0001 GETMET R4 R1 K1 + 0x58180002, // 0002 LDCONST R6 K2 + 0x7C100400, // 0003 CALL R4 2 + 0x4C100000, // 0004 LDNIL R4 + 0x60140010, // 0005 GETGBL R5 G16 + 0x8C180503, // 0006 GETMET R6 R2 K3 + 0x7C180200, // 0007 CALL R6 1 + 0x7C140200, // 0008 CALL R5 1 + 0xA8020017, // 0009 EXBLK 0 #0022 + 0x5C180A00, // 000A MOVE R6 R5 + 0x7C180000, // 000B CALL R6 0 + 0x4C1C0000, // 000C LDNIL R7 + 0x201C0807, // 000D NE R7 R4 R7 + 0x781E0002, // 000E JMPF R7 #0012 + 0x8C1C0301, // 000F GETMET R7 R1 K1 + 0x5C240800, // 0010 MOVE R9 R4 + 0x7C1C0400, // 0011 CALL R7 2 + 0x8C1C0301, // 0012 GETMET R7 R1 K1 + 0x8C240704, // 0013 GETMET R9 R3 K4 + 0x602C0008, // 0014 GETGBL R11 G8 + 0x5C300C00, // 0015 MOVE R12 R6 + 0x7C2C0200, // 0016 CALL R11 1 + 0x7C240400, // 0017 CALL R9 2 + 0x7C1C0400, // 0018 CALL R7 2 + 0x8C1C0301, // 0019 GETMET R7 R1 K1 + 0x58240005, // 001A LDCONST R9 K5 + 0x7C1C0400, // 001B CALL R7 2 + 0x8C1C0106, // 001C GETMET R7 R0 K6 + 0x5C240200, // 001D MOVE R9 R1 + 0x94280406, // 001E GETIDX R10 R2 R6 + 0x7C1C0600, // 001F CALL R7 3 + 0x58100007, // 0020 LDCONST R4 K7 + 0x7001FFE7, // 0021 JMP #000A + 0x58140008, // 0022 LDCONST R5 K8 + 0xAC140200, // 0023 CATCH R5 1 0 + 0xB0080000, // 0024 RAISE 2 R0 R0 + 0x8C140301, // 0025 GETMET R5 R1 K1 + 0x581C0009, // 0026 LDCONST R7 K9 + 0x7C140400, // 0027 CALL R5 2 + 0x80000000, // 0028 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: setmember +********************************************************************/ +be_local_closure(Persist_setmember, /* name */ + be_nested_proto( + 4, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(_p), + /* K1 */ be_nested_str(_dirty), + }), + &be_const_str_setmember, + &be_const_str_solidified, + ( &(const binstruction[ 5]) { /* code */ + 0x880C0100, // 0000 GETMBR R3 R0 K0 + 0x980C0202, // 0001 SETIDX R3 R1 R2 + 0x500C0200, // 0002 LDBOOL R3 1 0 + 0x90020203, // 0003 SETMBR R0 K1 R3 + 0x80000000, // 0004 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: zero +********************************************************************/ +be_local_closure(Persist_zero, /* name */ + be_nested_proto( + 2, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(_p), + /* K1 */ be_nested_str(_dirty), + }), + &be_const_str_zero, + &be_const_str_solidified, + ( &(const binstruction[ 6]) { /* code */ + 0x60040013, // 0000 GETGBL R1 G19 + 0x7C040000, // 0001 CALL R1 0 + 0x90020001, // 0002 SETMBR R0 K0 R1 + 0x50040200, // 0003 LDBOOL R1 1 0 + 0x90020201, // 0004 SETMBR R0 K1 R1 + 0x80000000, // 0005 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: member +********************************************************************/ +be_local_closure(Persist_member, /* name */ + be_nested_proto( + 5, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(_p), + /* K1 */ be_nested_str(find), + }), + &be_const_str_member, + &be_const_str_solidified, + ( &(const binstruction[ 5]) { /* code */ + 0x88080100, // 0000 GETMBR R2 R0 K0 + 0x8C080501, // 0001 GETMET R2 R2 K1 + 0x5C100200, // 0002 MOVE R4 R1 + 0x7C080400, // 0003 CALL R2 2 + 0x80040400, // 0004 RET 1 R2 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: json_fdump +********************************************************************/ +be_local_closure(Persist_json_fdump, /* name */ + be_nested_proto( + 7, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 5]) { /* constants */ + /* K0 */ be_nested_str(json), + /* K1 */ be_nested_str(_p), + /* K2 */ be_nested_str(json_fdump_map), + /* K3 */ be_nested_str(internal_error), + /* K4 */ be_nested_str(persist_X2E_p_X20is_X20not_X20a_X20map), + }), + &be_const_str_json_fdump, + &be_const_str_solidified, + ( &(const binstruction[13]) { /* code */ + 0xA40A0000, // 0000 IMPORT R2 K0 + 0x600C000F, // 0001 GETGBL R3 G15 + 0x88100101, // 0002 GETMBR R4 R0 K1 + 0x60140013, // 0003 GETGBL R5 G19 + 0x7C0C0400, // 0004 CALL R3 2 + 0x780E0004, // 0005 JMPF R3 #000B + 0x8C0C0102, // 0006 GETMET R3 R0 K2 + 0x5C140200, // 0007 MOVE R5 R1 + 0x88180101, // 0008 GETMBR R6 R0 K1 + 0x7C0C0600, // 0009 CALL R3 3 + 0x70020000, // 000A JMP #000C + 0xB0060704, // 000B RAISE 1 K3 K4 + 0x80000000, // 000C RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: remove +********************************************************************/ +be_local_closure(Persist_remove, /* name */ + be_nested_proto( + 5, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(_p), + /* K1 */ be_nested_str(remove), + /* K2 */ be_nested_str(_dirty), + }), + &be_const_str_remove, + &be_const_str_solidified, + ( &(const binstruction[ 7]) { /* code */ + 0x88080100, // 0000 GETMBR R2 R0 K0 + 0x8C080501, // 0001 GETMET R2 R2 K1 + 0x5C100200, // 0002 MOVE R4 R1 + 0x7C080400, // 0003 CALL R2 2 + 0x50080200, // 0004 LDBOOL R2 1 0 + 0x90020402, // 0005 SETMBR R0 K2 R2 + 0x80000000, // 0006 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: json_fdump_any +********************************************************************/ +be_local_closure(Persist_json_fdump_any, /* name */ + be_nested_proto( + 9, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 5]) { /* constants */ + /* K0 */ be_nested_str(json), + /* K1 */ be_nested_str(json_fdump_map), + /* K2 */ be_nested_str(json_fdump_list), + /* K3 */ be_nested_str(write), + /* K4 */ be_nested_str(dump), + }), + &be_const_str_json_fdump_any, + &be_const_str_solidified, + ( &(const binstruction[27]) { /* code */ + 0xA40E0000, // 0000 IMPORT R3 K0 + 0x6010000F, // 0001 GETGBL R4 G15 + 0x5C140400, // 0002 MOVE R5 R2 + 0x60180013, // 0003 GETGBL R6 G19 + 0x7C100400, // 0004 CALL R4 2 + 0x78120004, // 0005 JMPF R4 #000B + 0x8C100101, // 0006 GETMET R4 R0 K1 + 0x5C180200, // 0007 MOVE R6 R1 + 0x5C1C0400, // 0008 MOVE R7 R2 + 0x7C100600, // 0009 CALL R4 3 + 0x7002000E, // 000A JMP #001A + 0x6010000F, // 000B GETGBL R4 G15 + 0x5C140400, // 000C MOVE R5 R2 + 0x60180012, // 000D GETGBL R6 G18 + 0x7C100400, // 000E CALL R4 2 + 0x78120004, // 000F JMPF R4 #0015 + 0x8C100102, // 0010 GETMET R4 R0 K2 + 0x5C180200, // 0011 MOVE R6 R1 + 0x5C1C0400, // 0012 MOVE R7 R2 + 0x7C100600, // 0013 CALL R4 3 + 0x70020004, // 0014 JMP #001A + 0x8C100303, // 0015 GETMET R4 R1 K3 + 0x8C180704, // 0016 GETMET R6 R3 K4 + 0x5C200400, // 0017 MOVE R8 R2 + 0x7C180400, // 0018 CALL R6 2 + 0x7C100400, // 0019 CALL R4 2 + 0x80000000, // 001A RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: save +********************************************************************/ +be_local_closure(Persist_save, /* name */ + be_nested_proto( + 7, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 7]) { /* constants */ + /* K0 */ be_nested_str(_filename), + /* K1 */ be_nested_str(w), + /* K2 */ be_nested_str(json_fdump), + /* K3 */ be_nested_str(close), + /* K4 */ be_nested_str(write), + /* K5 */ be_nested_str(_X7B_X7D), + /* K6 */ be_nested_str(_dirty), + }), + &be_const_str_save, + &be_const_str_solidified, + ( &(const binstruction[37]) { /* code */ + 0x4C040000, // 0000 LDNIL R1 + 0xA802000B, // 0001 EXBLK 0 #000E + 0x60080011, // 0002 GETGBL R2 G17 + 0x880C0100, // 0003 GETMBR R3 R0 K0 + 0x58100001, // 0004 LDCONST R4 K1 + 0x7C080400, // 0005 CALL R2 2 + 0x5C040400, // 0006 MOVE R1 R2 + 0x8C080102, // 0007 GETMET R2 R0 K2 + 0x5C100200, // 0008 MOVE R4 R1 + 0x7C080400, // 0009 CALL R2 2 + 0x8C080303, // 000A GETMET R2 R1 K3 + 0x7C080200, // 000B CALL R2 1 + 0xA8040001, // 000C EXBLK 1 1 + 0x70020013, // 000D JMP #0022 + 0xAC080002, // 000E CATCH R2 0 2 + 0x70020010, // 000F JMP #0021 + 0x4C100000, // 0010 LDNIL R4 + 0x20100204, // 0011 NE R4 R1 R4 + 0x78120001, // 0012 JMPF R4 #0015 + 0x8C100303, // 0013 GETMET R4 R1 K3 + 0x7C100200, // 0014 CALL R4 1 + 0x60100011, // 0015 GETGBL R4 G17 + 0x88140100, // 0016 GETMBR R5 R0 K0 + 0x58180001, // 0017 LDCONST R6 K1 + 0x7C100400, // 0018 CALL R4 2 + 0x5C040800, // 0019 MOVE R1 R4 + 0x8C100304, // 001A GETMET R4 R1 K4 + 0x58180005, // 001B LDCONST R6 K5 + 0x7C100400, // 001C CALL R4 2 + 0x8C100303, // 001D GETMET R4 R1 K3 + 0x7C100200, // 001E CALL R4 1 + 0xB0040403, // 001F RAISE 1 R2 R3 + 0x70020000, // 0020 JMP #0022 + 0xB0080000, // 0021 RAISE 2 R0 R0 + 0x50080000, // 0022 LDBOOL R2 0 0 + 0x90020C02, // 0023 SETMBR R0 K6 R2 + 0x80000000, // 0024 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: load +********************************************************************/ +be_local_closure(Persist_load, /* name */ + be_nested_proto( + 9, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[12]) { /* constants */ + /* K0 */ be_nested_str(json), + /* K1 */ be_nested_str(path), + /* K2 */ be_nested_str(exists), + /* K3 */ be_nested_str(_filename), + /* K4 */ be_nested_str(r), + /* K5 */ be_nested_str(load), + /* K6 */ be_nested_str(read), + /* K7 */ be_nested_str(close), + /* K8 */ be_nested_str(_p), + /* K9 */ be_nested_str(BRY_X3A_X20failed_X20to_X20load_X20_persist_X2Ejson), + /* K10 */ be_nested_str(_dirty), + /* K11 */ be_nested_str(save), + }), + &be_const_str_load, + &be_const_str_solidified, + ( &(const binstruction[49]) { /* code */ + 0xA4060000, // 0000 IMPORT R1 K0 + 0xA40A0200, // 0001 IMPORT R2 K1 + 0x4C0C0000, // 0002 LDNIL R3 + 0x4C100000, // 0003 LDNIL R4 + 0x8C140502, // 0004 GETMET R5 R2 K2 + 0x881C0103, // 0005 GETMBR R7 R0 K3 + 0x7C140400, // 0006 CALL R5 2 + 0x78160025, // 0007 JMPF R5 #002E + 0xA802000D, // 0008 EXBLK 0 #0017 + 0x60140011, // 0009 GETGBL R5 G17 + 0x88180103, // 000A GETMBR R6 R0 K3 + 0x581C0004, // 000B LDCONST R7 K4 + 0x7C140400, // 000C CALL R5 2 + 0x5C0C0A00, // 000D MOVE R3 R5 + 0x8C140305, // 000E GETMET R5 R1 K5 + 0x8C1C0706, // 000F GETMET R7 R3 K6 + 0x7C1C0200, // 0010 CALL R7 1 + 0x7C140400, // 0011 CALL R5 2 + 0x5C100A00, // 0012 MOVE R4 R5 + 0x8C140707, // 0013 GETMET R5 R3 K7 + 0x7C140200, // 0014 CALL R5 1 + 0xA8040001, // 0015 EXBLK 1 1 + 0x70020009, // 0016 JMP #0021 + 0xAC140002, // 0017 CATCH R5 0 2 + 0x70020006, // 0018 JMP #0020 + 0x4C1C0000, // 0019 LDNIL R7 + 0x201C0607, // 001A NE R7 R3 R7 + 0x781E0001, // 001B JMPF R7 #001E + 0x8C1C0707, // 001C GETMET R7 R3 K7 + 0x7C1C0200, // 001D CALL R7 1 + 0xB0040A06, // 001E RAISE 1 R5 R6 + 0x70020000, // 001F JMP #0021 + 0xB0080000, // 0020 RAISE 2 R0 R0 + 0x6014000F, // 0021 GETGBL R5 G15 + 0x5C180800, // 0022 MOVE R6 R4 + 0x601C0013, // 0023 GETGBL R7 G19 + 0x7C140400, // 0024 CALL R5 2 + 0x78160001, // 0025 JMPF R5 #0028 + 0x90021004, // 0026 SETMBR R0 K8 R4 + 0x70020002, // 0027 JMP #002B + 0x60140001, // 0028 GETGBL R5 G1 + 0x58180009, // 0029 LDCONST R6 K9 + 0x7C140200, // 002A CALL R5 1 + 0x50140000, // 002B LDBOOL R5 0 0 + 0x90021405, // 002C SETMBR R0 K10 R5 + 0x70020001, // 002D JMP #0030 + 0x8C14010B, // 002E GETMET R5 R0 K11 + 0x7C140200, // 002F CALL R5 1 + 0x80000000, // 0030 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: find +********************************************************************/ +be_local_closure(Persist_find, /* name */ + be_nested_proto( + 7, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(_p), + /* K1 */ be_nested_str(find), + }), + &be_const_str_find, + &be_const_str_solidified, + ( &(const binstruction[ 6]) { /* code */ + 0x880C0100, // 0000 GETMBR R3 R0 K0 + 0x8C0C0701, // 0001 GETMET R3 R3 K1 + 0x5C140200, // 0002 MOVE R5 R1 + 0x5C180400, // 0003 MOVE R6 R2 + 0x7C0C0600, // 0004 CALL R3 3 + 0x80040600, // 0005 RET 1 R3 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: init +********************************************************************/ +be_local_closure(Persist_init, /* name */ + be_nested_proto( + 6, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 6]) { /* constants */ + /* K0 */ be_nested_str(_filename), + /* K1 */ be_nested_str(_persist_X2Ejson), + /* K2 */ be_nested_str(_p), + /* K3 */ be_nested_str(copy), + /* K4 */ be_nested_str(load), + /* K5 */ be_nested_str(_dirty), + }), + &be_const_str_init, + &be_const_str_solidified, + ( &(const binstruction[20]) { /* code */ + 0x90020101, // 0000 SETMBR R0 K0 K1 + 0x6008000F, // 0001 GETGBL R2 G15 + 0x5C0C0200, // 0002 MOVE R3 R1 + 0x60100013, // 0003 GETGBL R4 G19 + 0x7C080400, // 0004 CALL R2 2 + 0x780A0003, // 0005 JMPF R2 #000A + 0x8C080303, // 0006 GETMET R2 R1 K3 + 0x7C080200, // 0007 CALL R2 1 + 0x90020402, // 0008 SETMBR R0 K2 R2 + 0x70020002, // 0009 JMP #000D + 0x60080013, // 000A GETGBL R2 G19 + 0x7C080000, // 000B CALL R2 0 + 0x90020402, // 000C SETMBR R0 K2 R2 + 0x8C080104, // 000D GETMET R2 R0 K4 + 0x88100102, // 000E GETMBR R4 R0 K2 + 0x88140100, // 000F GETMBR R5 R0 K0 + 0x7C080600, // 0010 CALL R2 3 + 0x50080000, // 0011 LDBOOL R2 0 0 + 0x90020A02, // 0012 SETMBR R0 K5 R2 + 0x80000000, // 0013 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: json_fdump_list +********************************************************************/ +be_local_closure(Persist_json_fdump_list, /* name */ + be_nested_proto( + 9, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 8]) { /* constants */ + /* K0 */ be_nested_str(json), + /* K1 */ be_nested_str(write), + /* K2 */ be_nested_str(_X5B), + /* K3 */ be_const_int(0), + /* K4 */ be_nested_str(_X2C), + /* K5 */ be_nested_str(json_fdump_any), + /* K6 */ be_const_int(1), + /* K7 */ be_nested_str(_X5D), + }), + &be_const_str_json_fdump_list, + &be_const_str_solidified, + ( &(const binstruction[25]) { /* code */ + 0xA40E0000, // 0000 IMPORT R3 K0 + 0x8C100301, // 0001 GETMET R4 R1 K1 + 0x58180002, // 0002 LDCONST R6 K2 + 0x7C100400, // 0003 CALL R4 2 + 0x58100003, // 0004 LDCONST R4 K3 + 0x6014000C, // 0005 GETGBL R5 G12 + 0x5C180400, // 0006 MOVE R6 R2 + 0x7C140200, // 0007 CALL R5 1 + 0x14140805, // 0008 LT R5 R4 R5 + 0x7816000A, // 0009 JMPF R5 #0015 + 0x24140903, // 000A GT R5 R4 K3 + 0x78160002, // 000B JMPF R5 #000F + 0x8C140301, // 000C GETMET R5 R1 K1 + 0x581C0004, // 000D LDCONST R7 K4 + 0x7C140400, // 000E CALL R5 2 + 0x8C140105, // 000F GETMET R5 R0 K5 + 0x5C1C0200, // 0010 MOVE R7 R1 + 0x94200404, // 0011 GETIDX R8 R2 R4 + 0x7C140600, // 0012 CALL R5 3 + 0x00100906, // 0013 ADD R4 R4 K6 + 0x7001FFEF, // 0014 JMP #0005 + 0x8C140301, // 0015 GETMET R5 R1 K1 + 0x581C0007, // 0016 LDCONST R7 K7 + 0x7C140400, // 0017 CALL R5 2 + 0x80000000, // 0018 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: has +********************************************************************/ +be_local_closure(Persist_has, /* name */ + be_nested_proto( + 5, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(_p), + /* K1 */ be_nested_str(has), + }), + &be_const_str_has, + &be_const_str_solidified, + ( &(const binstruction[ 5]) { /* code */ + 0x88080100, // 0000 GETMBR R2 R0 K0 + 0x8C080501, // 0001 GETMET R2 R2 K1 + 0x5C100200, // 0002 MOVE R4 R1 + 0x7C080400, // 0003 CALL R2 2 + 0x80040400, // 0004 RET 1 R2 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified class: Persist +********************************************************************/ +be_local_class(Persist, + 3, + NULL, + be_nested_map(16, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(has, 6), be_const_closure(Persist_has_closure) }, + { be_const_key(setmember, -1), be_const_closure(Persist_setmember_closure) }, + { be_const_key(remove, -1), be_const_closure(Persist_remove_closure) }, + { be_const_key(zero, 0), be_const_closure(Persist_zero_closure) }, + { be_const_key(json_fdump, -1), be_const_closure(Persist_json_fdump_closure) }, + { be_const_key(json_fdump_list, 2), be_const_closure(Persist_json_fdump_list_closure) }, + { be_const_key(init, 15), be_const_closure(Persist_init_closure) }, + { be_const_key(find, -1), be_const_closure(Persist_find_closure) }, + { be_const_key(save, -1), be_const_closure(Persist_save_closure) }, + { be_const_key(json_fdump_any, 12), be_const_closure(Persist_json_fdump_any_closure) }, + { be_const_key(_p, 7), be_const_var(1) }, + { be_const_key(_filename, -1), be_const_var(0) }, + { be_const_key(load, -1), be_const_closure(Persist_load_closure) }, + { be_const_key(json_fdump_map, 5), be_const_closure(Persist_json_fdump_map_closure) }, + { be_const_key(_dirty, -1), be_const_var(2) }, + { be_const_key(member, -1), be_const_closure(Persist_member_closure) }, + })), + be_str_literal("Persist") +); + +/******************************************************************** +** Solidified function: _anonymous_ +********************************************************************/ +be_local_closure(persist__anonymous_, /* name */ + be_nested_proto( + 3, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_const_class(be_class_Persist), + }), + &be_const_str__anonymous_, + &be_const_str_solidified, + ( &(const binstruction[ 5]) { /* code */ + 0x58040000, // 0000 LDCONST R1 K0 + 0xB4000000, // 0001 CLASS K0 + 0x5C080200, // 0002 MOVE R2 R1 + 0x7C080000, // 0003 CALL R2 0 + 0x80040400, // 0004 RET 1 R2 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified module: persist +********************************************************************/ +be_local_module(persist, + "persist", + be_nested_map(1, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(init, -1), be_const_closure(persist__anonymous__closure) }, + })) +); +BE_EXPORT_VARIABLE be_define_const_native_module(persist); +/********************************************************************/ diff --git a/lib/libesp32/berry/default/be_port.cpp b/lib/libesp32/berry/default/be_port.cpp new file mode 100644 index 000000000..5da10f47e --- /dev/null +++ b/lib/libesp32/berry/default/be_port.cpp @@ -0,0 +1,574 @@ +/******************************************************************** +** Copyright (c) 2018-2020 Guan Wenliang +** This file is part of the Berry default interpreter. +** skiars@qq.com, https://github.com/Skiars/berry +** See Copyright Notice in the LICENSE file or at +** https://github.com/Skiars/berry/blob/master/LICENSE +********************************************************************/ +#include "berry.h" +#include "be_mem.h" +#include "be_sys.h" +// #include +#include +#include + +// from https://github.com/eyalroz/cpp-static-block +#include "static_block.hpp" + +// Local pointer for file managment +#ifdef USE_UFILESYS + #include + #include "ZipReadFS.h" + extern FS *ffsp; + FS zip_ufsp(ZipReadFSImplPtr(new ZipReadFSImpl(&ffsp))); +#endif // USE_UFILESYS + +/* this file contains configuration for the file system. */ + +/* standard input and output */ +extern "C" { + int strncmp_PP(const char * str1P, const char * str2P, size_t size) + { + int result = 0; + + while (size > 0) + { + char ch1 = pgm_read_byte(str1P++); + char ch2 = pgm_read_byte(str2P++); + result = ch1 - ch2; + if (result != 0 || ch2 == '\0') + { + break; + } + + size--; + } + + return result; + } + + // + char * strchr_P(const char *s, int c) { + do { + if (pgm_read_byte(s) == c) { + return (char*)s; + } + } while (pgm_read_byte(s++)); + return (0); + } +} + +// We need to create a local buffer, since we might mess up mqtt_data +#ifndef BERRY_LOGSZ +#define BERRY_LOGSZ 700 +#endif + +static char * log_berry_buffer = nullptr; +static_block { + log_berry_buffer = (char*) malloc(BERRY_LOGSZ); + if (log_berry_buffer) log_berry_buffer[0] = 0; +} +extern void berry_log(const char * berry_buf); + +BERRY_API void be_writebuffer(const char *buffer, size_t length) +{ + if (!log_berry_buffer) return; + if (buffer == nullptr || length == 0) { return; } + uint32_t idx = 0; + while (idx < length) { + int32_t cr_pos = -1; + // find next occurence of '\n' or '\r' + for (uint32_t i = idx; i < length; i++) { + if ((pgm_read_byte(&buffer[i]) == '\n') || (pgm_read_byte(&buffer[i]) == '\r')) { + cr_pos = i; + break; + } + } + uint32_t chars_to_append = (cr_pos >= 0) ? cr_pos - idx : length - idx; // note cr_pos < length + snprintf(log_berry_buffer, BERRY_LOGSZ, "%s%.*s", log_berry_buffer, chars_to_append, &buffer[idx]); // append at most `length` chars + if (cr_pos >= 0) { + // flush + berry_log(log_berry_buffer); + log_berry_buffer[0] = 0; // clear string + } + idx += chars_to_append + 1; // skip '\n' + } + // Serial.write(buffer, length); + // be_fwrite(stdout, buffer, length); +} + + +extern "C" { + int m_path_listdir(bvm *vm) + { + if (be_top(vm) >= 1 && be_isstring(vm, 1)) { + const char *path = be_tostring(vm, 1); + be_newobject(vm, "list"); + + File dir = ffsp->open(path, "r"); + if (dir) { + dir.rewindDirectory(); + while (1) { + File entry = dir.openNextFile(); + if (!entry) { + break; + } + const char * fn = entry.name(); + if (strcmp(fn, ".") && strcmp(fn, "..")) { + be_pushstring(vm, fn); + be_data_push(vm, -2); + be_pop(vm, 1); + } + + } + } + be_pop(vm, 1); + be_return(vm); + + } + be_return_nil(vm); + } +} + +BERRY_API char* be_readstring(char *buffer, size_t size) +{ + return be_fgets(stdin, buffer, (int)size); +} + +/* use the standard library implementation file API. */ + +void* be_fopen(const char *filename, const char *modes) +{ +#ifdef USE_UFILESYS + if (filename != nullptr && modes != nullptr) { + char fname2[strlen(filename) + 2]; + if (filename[0] == '/') { + strcpy(fname2, filename); // copy unchanged + } else { + fname2[0] = '/'; + strcpy(fname2 + 1, filename); // prepend with '/' + } + // Serial.printf("be_fopen filename=%s, modes=%s\n", filename, modes); + File f = zip_ufsp.open(fname2, modes); // returns an object, not a pointer + if (f) { + File * f_ptr = new File(f); // copy to dynamic object + *f_ptr = f; // TODO is this necessary? + return f_ptr; + } + } +#endif // USE_UFILESYS + return nullptr; + // return fopen(filename, modes); +} + +// Tasmota specific, get the underlying Arduino File +File * be_get_arduino_file(void *hfile) +{ +#ifdef USE_UFILESYS + if (hfile != nullptr) { + File * f_ptr = (File*) hfile; + return f_ptr; + } +#endif // USE_UFILESYS + return nullptr; + // return fopen(filename, modes); +} + +int be_fclose(void *hfile) +{ +#ifdef USE_UFILESYS + // Serial.printf("be_fclose\n"); + if (hfile != nullptr) { + File * f_ptr = (File*) hfile; + f_ptr->close(); + delete f_ptr; + return 0; + } +#endif // USE_UFILESYS + return -1; + // return fclose(hfile); +} + +size_t be_fwrite(void *hfile, const void *buffer, size_t length) +{ +#ifdef USE_UFILESYS + // Serial.printf("be_fwrite %d\n", length); + if (hfile != nullptr && buffer != nullptr) { + File * f_ptr = (File*) hfile; + return f_ptr->write((const uint8_t*) buffer, length); + } +#endif // USE_UFILESYS + return 0; + // return fwrite(buffer, 1, length, hfile); +} + +size_t be_fread(void *hfile, void *buffer, size_t length) +{ +#ifdef USE_UFILESYS + // Serial.printf("be_fread %d\n", length); + if (hfile != nullptr && buffer != nullptr) { + File * f_ptr = (File*) hfile; + int32_t ret = f_ptr->read((uint8_t*) buffer, length); + if (ret >= 0) { + // Serial.printf("be_fread ret = %d\n", ret); + return ret; + } + } +#endif // USE_UFILESYS + return 0; + // return fread(buffer, 1, length, hfile); +} + +char* be_fgets(void *hfile, void *buffer, int size) +{ +#ifdef USE_UFILESYS + if (size <= 2) { return nullptr; } // can't work if size is 2 or less + // Serial.printf("be_fgets size=%d hfile=%p buf=%p\n", size, hfile, buffer); + uint8_t * buf = (uint8_t*) buffer; + if (hfile != nullptr && buffer != nullptr && size > 0) { + File * f_ptr = (File*) hfile; + int ret = f_ptr->readBytesUntil('\n', buf, size - 2); + // Serial.printf("be_fgets ret=%d\n", ret); + if (ret >= 0) { + buf[ret] = 0; // add string terminator + if (ret > 0 && ret < size - 2) { + buf[ret] = '\n'; + buf[ret+1] = 0; + } + return (char*) buffer; + } + } +#endif // USE_UFILESYS + return nullptr; + // return fgets(buffer, size, hfile); +} + +int be_fseek(void *hfile, long offset) +{ +#ifdef USE_UFILESYS + // Serial.printf("be_fseek %d\n", offset); + if (hfile != nullptr) { + File * f_ptr = (File*) hfile; + if (f_ptr->seek(offset)) { + return 0; // success + } + } +#endif // USE_UFILESYS + return -1; + // return fseek(hfile, offset, SEEK_SET); +} + +long int be_ftell(void *hfile) +{ +#ifdef USE_UFILESYS + // Serial.printf("be_ftell\n"); + if (hfile != nullptr) { + File * f_ptr = (File*) hfile; + return f_ptr->position(); + } +#endif // USE_UFILESYS + return 0; + // return ftell(hfile); +} + +long int be_fflush(void *hfile) +{ +#ifdef USE_UFILESYS + // Serial.printf("be_fflush\n"); + if (hfile != nullptr) { + File * f_ptr = (File*) hfile; + f_ptr->flush(); + } +#endif // USE_UFILESYS + return 0; + // return fflush(hfile); +} + +size_t be_fsize(void *hfile) +{ +#ifdef USE_UFILESYS + // Serial.printf("be_fsize\n"); + if (hfile != nullptr) { + File * f_ptr = (File*) hfile; + return f_ptr->size(); + } + // long int size, offset = be_ftell(hfile); + // fseek(hfile, 0L, SEEK_END); + // size = ftell(hfile); + // fseek(hfile, offset, SEEK_SET); + // return size; +#endif // USE_UFILESYS + return 0; +} + +extern "C" time_t be_last_modified(void *hfile) +{ +#ifdef USE_UFILESYS + if (hfile != nullptr) { + File * f_ptr = (File*) hfile; + return f_ptr->getLastWrite(); + } +#endif // USE_UFILESYS + return 0; +} + +int be_isexist(const char *filename) +{ +#ifdef USE_UFILESYS + char fname2[strlen(filename) + 2]; + if (filename[0] == '/') { + strcpy(fname2, filename); // copy unchanged + } else { + fname2[0] = '/'; + strcpy(fname2 + 1, filename); // prepend with '/' + } + return zip_ufsp.exists(fname2); +#endif // USE_UFILESYS + return 0; +} + +int be_unlink(const char *filename) +{ +#ifdef USE_UFILESYS + char fname2[strlen(filename) + 2]; + if (filename[0] == '/') { + strcpy(fname2, filename); // copy unchanged + } else { + fname2[0] = '/'; + strcpy(fname2 + 1, filename); // prepend with '/' + } + return zip_ufsp.remove(fname2); +#endif // USE_UFILESYS + return 0; +} + +#if BE_USE_FILE_SYSTEM +#if defined(USE_FATFS) /* FatFs */ + +int be_isdir(const char *path) +{ + FILINFO fno; + FRESULT fr = f_stat(path, &fno); + return fr == FR_OK && fno.fattrib & AM_DIR; +} + +int be_isfile(const char *path) +{ + FILINFO fno; + FRESULT fr = f_stat(path, &fno); + return fr == FR_OK && !(fno.fattrib & AM_DIR); +} + +int be_isexist(const char *path) +{ + FILINFO fno; + return f_stat(path, &fno) == FR_OK; +} + +char* be_getcwd(char *buf, size_t size) +{ + FRESULT fr = f_getcwd(buf, (UINT)size); + return fr == FR_OK ? buf : NULL; +} + +int be_chdir(const char *path) +{ + return f_chdir(path); +} + +int be_mkdir(const char *path) +{ + return f_mkdir(path); +} + +int be_unlink(const char *filename) +{ + return f_unlink(filename); +} + +int be_dirfirst(bdirinfo *info, const char *path) +{ + info->dir = be_os_malloc(sizeof(DIR)); + info->file = be_os_malloc(sizeof(FILINFO)); + if (info->dir && info->file) { + FRESULT fr = f_opendir(info->dir, path); + return fr == FR_OK ? be_dirnext(info) : 1; + } + be_os_free(info->dir); + be_os_free(info->file); + info->dir = NULL; + info->file = NULL; + return 1; +} + +int be_dirnext(bdirinfo *info) +{ + FRESULT fr = f_readdir(info->dir, info->file); + info->name = ((FILINFO *)info->file)->fname; + return fr != FR_OK || *info->name == '\0'; +} + +int be_dirclose(bdirinfo *info) +{ + if (info->dir) { + int res = f_closedir(info->dir) != FR_OK; + be_os_free(info->dir); + be_os_free(info->file); + return res; + } + return 1; +} + +#elif defined(_MSC_VER) /* MSVC*/ + +#include +#include +#include + +int be_isdir(const char *path) +{ + DWORD type = GetFileAttributes(path); + return type != INVALID_FILE_ATTRIBUTES + && (type & FILE_ATTRIBUTE_DIRECTORY) != 0; +} + +int be_isfile(const char *path) +{ + DWORD type = GetFileAttributes(path); + return type != INVALID_FILE_ATTRIBUTES + && (type & FILE_ATTRIBUTE_DIRECTORY) == 0; +} + +int be_isexist(const char *path) +{ + return GetFileAttributes(path) != INVALID_FILE_ATTRIBUTES; +} + +char* be_getcwd(char *buf, size_t size) +{ + return _getcwd(buf, (int)size); +} + +int be_chdir(const char *path) +{ + return _chdir(path); +} + +int be_mkdir(const char *path) +{ + return _mkdir(path); +} + +int be_unlink(const char *filename) +{ + return remove(filename); +} + +int be_dirfirst(bdirinfo *info, const char *path) +{ + char *buf = be_os_malloc(strlen(path) + 3); + info->file = be_os_malloc(sizeof(struct _finddata_t)); + info->dir = NULL; + if (buf && info->file) { + struct _finddata_t *cfile = info->file; + strcat(strcpy(buf, path), "/*"); + info->dir = (void *)_findfirst(buf, cfile); + info->name = cfile->name; + be_os_free(buf); + return (intptr_t)info->dir == -1; + } + be_os_free(buf); + return 1; +} + +int be_dirnext(bdirinfo *info) +{ + struct _finddata_t *cfile = info->file; + int res = _findnext((intptr_t)info->dir, cfile) != 0; + info->name = cfile->name; + return res; +} + +int be_dirclose(bdirinfo *info) +{ + be_os_free(info->file); + return _findclose((intptr_t)info->dir) != 0; +} + +#else /* must be POSIX */ + +#include +#include +#include + +int be_isdir(const char *path) +{ + struct stat path_stat; + int res = stat(path, &path_stat); + return res == 0 && S_ISDIR(path_stat.st_mode); +} + +int be_isfile(const char *path) +{ + struct stat path_stat; + int res = stat(path, &path_stat); + return res == 0 && !S_ISDIR(path_stat.st_mode); +} + +int be_isexist(const char *path) +{ + struct stat path_stat; + return stat(path, &path_stat) == 0; +} + +char* be_getcwd(char *buf, size_t size) +{ + return getcwd(buf, size); +} + +int be_chdir(const char *path) +{ + return chdir(path); +} + +int be_mkdir(const char *path) +{ +#ifdef _WIN32 + return mkdir(path); +#else + return mkdir(path, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH); +#endif +} + +int be_unlink(const char *filename) +{ + return remove(filename); +} + +int be_dirfirst(bdirinfo *info, const char *path) +{ + info->dir = opendir(path); + if (info->dir) { + return be_dirnext(info); + } + return 1; +} + +int be_dirnext(bdirinfo *info) +{ + struct dirent *file; + info->file = file = readdir(info->dir); + if (file) { + info->name = file->d_name; + return 0; + } + return 1; +} + +int be_dirclose(bdirinfo *info) +{ + return closedir(info->dir) != 0; +} + +#endif /* POSIX */ +#endif /* BE_USE_OS_MODULE || BE_USE_FILE_SYSTEM */ diff --git a/lib/libesp32/berry/default/be_python_compat.c b/lib/libesp32/berry/default/be_python_compat.c new file mode 100644 index 000000000..5b3ec64d0 --- /dev/null +++ b/lib/libesp32/berry/default/be_python_compat.c @@ -0,0 +1,58 @@ +/******************************************************************** + * Berry python compatibility module + * + * `import python_compat` + *******************************************************************/ +#include "be_constobj.h" + +/******************************************************************** +** Solidified function: _anonymous_ +********************************************************************/ +be_local_closure(python_compat__anonymous_, /* name */ + be_nested_proto( + 3, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 5]) { /* constants */ + /* K0 */ be_nested_str(global), + /* K1 */ be_nested_str(True), + /* K2 */ be_nested_str(False), + /* K3 */ be_nested_str(None), + /* K4 */ be_nested_str(b), + }), + &be_const_str__anonymous_, + &be_const_str_solidified, + ( &(const binstruction[10]) { /* code */ + 0xA4060000, // 0000 IMPORT R1 K0 + 0x50080200, // 0001 LDBOOL R2 1 0 + 0x90060202, // 0002 SETMBR R1 K1 R2 + 0x50080000, // 0003 LDBOOL R2 0 0 + 0x90060402, // 0004 SETMBR R1 K2 R2 + 0x4C080000, // 0005 LDNIL R2 + 0x90060602, // 0006 SETMBR R1 K3 R2 + 0x60080015, // 0007 GETGBL R2 G21 + 0x90060802, // 0008 SETMBR R1 K4 R2 + 0x80040000, // 0009 RET 1 R0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified module: python_compat +********************************************************************/ +be_local_module(python_compat, + "python_compat", + be_nested_map(1, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(init, -1), be_const_closure(python_compat__anonymous__closure) }, + })) +); +BE_EXPORT_VARIABLE be_define_const_native_module(python_compat); +/********************************************************************/ diff --git a/lib/libesp32/berry/default/be_re_lib.c b/lib/libesp32/berry/default/be_re_lib.c new file mode 100644 index 000000000..bc28c0e67 --- /dev/null +++ b/lib/libesp32/berry/default/be_re_lib.c @@ -0,0 +1,254 @@ +/******************************************************************** + * Tasmota lib + * + * To use: `import re` + * + * Regex using re1.5 + *******************************************************************/ +#include "be_constobj.h" +#include "be_mem.h" +#include "re1.5.h" + +/******************************************************************** +# Berry skeleton for `re` module +# + +class re_pattern + var _p # comobj containing the compiled bytecode for the pattern + + def search() end + def match() end + def split() end +end + +re = module("re") + +re.compile = def (regex_str) end # native +re.match = def (regex_str, str) end # native +re.search = def (regex_str, str) end # native +re.split = def (regex_str, str) end # native + + +*******************************************************************/ + +extern const bclass be_class_re_pattern; + +int be_free_comobj(bvm* vm) { + int argc = be_top(vm); + if (argc > 0) { + void * obj = be_tocomptr(vm, 1); + if (obj != NULL) { be_os_free(obj); } + } + be_return_nil(vm); +} + +// Native functions be_const_func() +// Berry: `re.compile(pattern:string) -> instance(be_pattern)` +int be_re_compile(bvm *vm) { + int32_t argc = be_top(vm); // Get the number of arguments + if (argc >= 1 && be_isstring(vm, 1)) { + const char * regex_str = be_tostring(vm, 1); + int sz = re1_5_sizecode(regex_str); + if (sz < 0) { + be_raise(vm, "internal_error", "error in regex"); + } + + ByteProg *code = be_os_malloc(sizeof(ByteProg) + sz); + int ret = re1_5_compilecode(code, regex_str); + if (ret != 0) { + be_raise(vm, "internal_error", "error in regex"); + } + be_pushntvclass(vm, &be_class_re_pattern); + be_call(vm, 0); + be_newcomobj(vm, code, &be_free_comobj); + be_setmember(vm, -2, "_p"); + be_pop(vm, 1); + be_return(vm); + } + be_raise(vm, "type_error", NULL); +} + + +int be_re_match_search_run(bvm *vm, ByteProg *code, const char *hay, bbool is_anchored) { + Subject subj = {hay, hay + strlen(hay)}; + + int sub_els = (code->sub + 1) * 2; + const char *sub[sub_els]; + + if (!re1_5_recursiveloopprog(code, &subj, sub, sub_els, is_anchored)) { + be_return_nil(vm); // no match + } + + be_newobject(vm, "list"); + int k; + for(k = sub_els; k > 0; k--) + if(sub[k-1]) + break; + for (int i = 0; i < k; i += 2) { + be_pushnstring(vm, sub[i], sub[i+1] - sub[i]); + be_data_push(vm, -2); + be_pop(vm, 1); + } + be_pop(vm, 1); // remove list + be_return(vm); // return list object +} + +int be_re_match_search(bvm *vm, bbool is_anchored) { + int32_t argc = be_top(vm); // Get the number of arguments + if (argc >= 2 && be_isstring(vm, 1) && be_isstring(vm, 2)) { + const char * regex_str = be_tostring(vm, 1); + const char * hay = be_tostring(vm, 2); + int sz = re1_5_sizecode(regex_str); + if (sz < 0) { + be_raise(vm, "internal_error", "error in regex"); + } + + ByteProg *code = be_os_malloc(sizeof(ByteProg) + sz); + int ret = re1_5_compilecode(code, regex_str); + if (ret != 0) { + be_raise(vm, "internal_error", "error in regex"); + } + return be_re_match_search_run(vm, code, hay, is_anchored); + } + be_raise(vm, "type_error", NULL); +} + +// Berry: `re.match(value:int | s:string) -> nil` +int be_re_match(bvm *vm) { + return be_re_match_search(vm, btrue); +} +// Berry: `re.search(value:int | s:string) -> nil` +int be_re_search(bvm *vm) { + return be_re_match_search(vm, bfalse); +} + +// Berry: `re_pattern.search(s:string) -> list(string)` +int re_pattern_search(bvm *vm) { + int32_t argc = be_top(vm); // Get the number of arguments + if (argc >= 2 && be_isstring(vm, 2)) { + const char * hay = be_tostring(vm, 2); + be_getmember(vm, 1, "_p"); + ByteProg * code = (ByteProg*) be_tocomptr(vm, -1); + return be_re_match_search_run(vm, code, hay, bfalse); + } + be_raise(vm, "type_error", NULL); +} + +// Berry: `re_pattern.match(s:string) -> list(string)` +int re_pattern_match(bvm *vm) { + int32_t argc = be_top(vm); // Get the number of arguments + if (argc >= 2 && be_isstring(vm, 2)) { + const char * hay = be_tostring(vm, 2); + be_getmember(vm, 1, "_p"); + ByteProg * code = (ByteProg*) be_tocomptr(vm, -1); + return be_re_match_search_run(vm, code, hay, btrue); + } + be_raise(vm, "type_error", NULL); +} + + +int re_pattern_split_run(bvm *vm, ByteProg *code, const char *hay, int split_limit) { + Subject subj = {hay, hay + strlen(hay)}; + + int sub_els = (code->sub + 1) * 2; + const char *sub[sub_els]; + + be_newobject(vm, "list"); + while (1) { + if (split_limit == 0 || !re1_5_recursiveloopprog(code, &subj, sub, sub_els, bfalse)) { + be_pushnstring(vm, subj.begin, subj.end - subj.begin); + be_data_push(vm, -2); + be_pop(vm, 1); + break; + } + + if (sub[0] == NULL || sub[1] == NULL || sub[0] == sub[1]) { + be_raise(vm, "internal_error", "can't match"); + } + be_pushnstring(vm, subj.begin, sub[0] - subj.begin); + be_data_push(vm, -2); + be_pop(vm, 1); + subj.begin = sub[1]; + split_limit--; + } + be_pop(vm, 1); // remove list + be_return(vm); // return list object +} + +// Berry: `re_pattern.split(s:string [, split_limit:int]) -> list(string)` +int re_pattern_split(bvm *vm) { + int32_t argc = be_top(vm); // Get the number of arguments + if (argc >= 2 && be_isstring(vm, 2)) { + int split_limit = -1; + if (argc >= 3) { + split_limit = be_toint(vm, 3); + } + const char * hay = be_tostring(vm, 2); + be_getmember(vm, 1, "_p"); + ByteProg * code = (ByteProg*) be_tocomptr(vm, -1); + + return re_pattern_split_run(vm, code, hay, split_limit); + } + be_raise(vm, "type_error", NULL); +} + +// Berry: `re.split(pattern:string, s:string [, split_limit:int]) -> list(string)` +int be_re_split(bvm *vm) { + int32_t argc = be_top(vm); // Get the number of arguments + if (argc >= 2 && be_isstring(vm, 1) && be_isstring(vm, 2)) { + const char * regex_str = be_tostring(vm, 1); + const char * hay = be_tostring(vm, 2); + int split_limit = -1; + if (argc >= 3) { + split_limit = be_toint(vm, 3); + } + int sz = re1_5_sizecode(regex_str); + if (sz < 0) { + be_raise(vm, "internal_error", "error in regex"); + } + + ByteProg *code = be_os_malloc(sizeof(ByteProg) + sz); + int ret = re1_5_compilecode(code, regex_str); + if (ret != 0) { + be_raise(vm, "internal_error", "error in regex"); + } + return re_pattern_split_run(vm, code, hay, split_limit); + } + be_raise(vm, "type_error", NULL); +} + +/******************************************************************** +** Solidified module: re +********************************************************************/ +be_local_module(re, + "re", + be_nested_map(4, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("compile", 1000265118, 7, -1), be_const_func(be_re_compile) }, + { be_nested_key("search", -2144130903, 6, -1), be_const_func(be_re_search) }, + { be_nested_key("match", 2116038550, 5, 0), be_const_func(be_re_match) }, + { be_nested_key("split", -2017972765, 5, -1), be_const_func(be_re_split) }, + })) +); +BE_EXPORT_VARIABLE be_define_const_native_module(re); +/********************************************************************/ + +// =================================================================== + +/******************************************************************** +** Solidified class: re_pattern +********************************************************************/ +be_local_class(re_pattern, + 1, + NULL, + be_nested_map(4, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_nested_key("_p", 1594591802, 2, -1), be_const_var(0) }, + { be_nested_key("search", -2144130903, 6, -1), be_const_func(re_pattern_search) }, + { be_nested_key("match", 2116038550, 5, 0), be_const_func(re_pattern_match) }, + { be_nested_key("split", -2017972765, 5, -1), be_const_func(re_pattern_split) }, + })), + (be_nested_const_str("re_pattern", 2041968961, 10)) +); +/*******************************************************************/ + diff --git a/lib/libesp32/berry/default/be_serial_lib.c b/lib/libesp32/berry/default/be_serial_lib.c new file mode 100644 index 000000000..4f1c4b577 --- /dev/null +++ b/lib/libesp32/berry/default/be_serial_lib.c @@ -0,0 +1,66 @@ +/******************************************************************** + * Tasmota lib + * + * To use: `import wire` + * + * 2 wire communication - I2C + *******************************************************************/ +#include "be_constobj.h" + +#include "esp32-hal.h" + +extern int b_serial_init(bvm *vm); +extern int b_serial_deinit(bvm *vm); + +extern int b_serial_write(bvm *vm); +extern int b_serial_read(bvm *vm); +extern int b_serial_available(bvm *vm); +extern int b_serial_flush(bvm *vm); + +#include "../generate/be_fixed_be_class_tasmota_serial.h" + +void be_load_serial_lib(bvm *vm) { + be_pushntvclass(vm, &be_class_tasmota_serial); + be_setglobal(vm, "serial"); + be_pop(vm, 1); +} + +/* @const_object_info_begin + +class be_class_tasmota_serial (scope: global, name: serial) { + .p, var + + SERIAL_5N1, int(SERIAL_5N1) + SERIAL_6N1, int(SERIAL_6N1) + SERIAL_7N1, int(SERIAL_7N1) + SERIAL_8N1, int(SERIAL_8N1) + SERIAL_5N2, int(SERIAL_5N2) + SERIAL_6N2, int(SERIAL_6N2) + SERIAL_7N2, int(SERIAL_7N2) + SERIAL_8N2, int(SERIAL_8N2) + SERIAL_5E1, int(SERIAL_5E1) + SERIAL_6E1, int(SERIAL_6E1) + SERIAL_7E1, int(SERIAL_7E1) + SERIAL_8E1, int(SERIAL_8E1) + SERIAL_5E2, int(SERIAL_5E2) + SERIAL_6E2, int(SERIAL_6E2) + SERIAL_7E2, int(SERIAL_7E2) + SERIAL_8E2, int(SERIAL_8E2) + SERIAL_5O1, int(SERIAL_5O1) + SERIAL_6O1, int(SERIAL_6O1) + SERIAL_7O1, int(SERIAL_7O1) + SERIAL_8O1, int(SERIAL_8O1) + SERIAL_5O2, int(SERIAL_5O2) + SERIAL_6O2, int(SERIAL_6O2) + SERIAL_7O2, int(SERIAL_7O2) + SERIAL_8O2, int(SERIAL_8O2) + + init, func(b_serial_init) + deinit, func(b_serial_deinit) + + write, func(b_serial_write) + read, func(b_serial_read) + available, func(b_serial_available) + flush, func(b_serial_flush) +} +@const_object_info_end */ diff --git a/lib/libesp32/berry/default/be_tapp_lib.c b/lib/libesp32/berry/default/be_tapp_lib.c new file mode 100644 index 000000000..1a312d110 --- /dev/null +++ b/lib/libesp32/berry/default/be_tapp_lib.c @@ -0,0 +1,168 @@ +/******************************************************************** + * Tasmota App manager + * + * To use: `import tapp` + * + *******************************************************************/ +#include "be_constobj.h" + +/******************************************************************** +** Solidified function: init +********************************************************************/ +be_local_closure(Tapp_init, /* name */ + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(tasmota), + /* K1 */ be_nested_str(add_driver), + }), + &be_const_str_init, + &be_const_str_solidified, + ( &(const binstruction[ 5]) { /* code */ + 0xB8060000, // 0000 GETNGBL R1 K0 + 0x8C040301, // 0001 GETMET R1 R1 K1 + 0x5C0C0000, // 0002 MOVE R3 R0 + 0x7C040400, // 0003 CALL R1 2 + 0x80000000, // 0004 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: autoexec +********************************************************************/ +be_local_closure(Tapp_autoexec, /* name */ + be_nested_proto( + 12, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[15]) { /* constants */ + /* K0 */ be_nested_str(path), + /* K1 */ be_nested_str(string), + /* K2 */ be_nested_str(listdir), + /* K3 */ be_nested_str(_X2F), + /* K4 */ be_nested_str(find), + /* K5 */ be_nested_str(_X2Etapp), + /* K6 */ be_const_int(0), + /* K7 */ be_nested_str(tasmota), + /* K8 */ be_nested_str(log), + /* K9 */ be_nested_str(format), + /* K10 */ be_nested_str(TAP_X3A_X20found_X20Tasmota_X20App_X20_X27_X25s_X27), + /* K11 */ be_const_int(2), + /* K12 */ be_nested_str(load), + /* K13 */ be_nested_str(_X23autoexec_X2Ebe), + /* K14 */ be_nested_str(stop_iteration), + }), + &be_const_str_autoexec, + &be_const_str_solidified, + ( &(const binstruction[34]) { /* code */ + 0xA4060000, // 0000 IMPORT R1 K0 + 0xA40A0200, // 0001 IMPORT R2 K1 + 0x8C0C0302, // 0002 GETMET R3 R1 K2 + 0x58140003, // 0003 LDCONST R5 K3 + 0x7C0C0400, // 0004 CALL R3 2 + 0x60100010, // 0005 GETGBL R4 G16 + 0x5C140600, // 0006 MOVE R5 R3 + 0x7C100200, // 0007 CALL R4 1 + 0xA8020014, // 0008 EXBLK 0 #001E + 0x5C140800, // 0009 MOVE R5 R4 + 0x7C140000, // 000A CALL R5 0 + 0x8C180504, // 000B GETMET R6 R2 K4 + 0x5C200A00, // 000C MOVE R8 R5 + 0x58240005, // 000D LDCONST R9 K5 + 0x7C180600, // 000E CALL R6 3 + 0x24180D06, // 000F GT R6 R6 K6 + 0x781A000B, // 0010 JMPF R6 #001D + 0xB81A0E00, // 0011 GETNGBL R6 K7 + 0x8C180D08, // 0012 GETMET R6 R6 K8 + 0x8C200509, // 0013 GETMET R8 R2 K9 + 0x5828000A, // 0014 LDCONST R10 K10 + 0x5C2C0A00, // 0015 MOVE R11 R5 + 0x7C200600, // 0016 CALL R8 3 + 0x5824000B, // 0017 LDCONST R9 K11 + 0x7C180600, // 0018 CALL R6 3 + 0xB81A0E00, // 0019 GETNGBL R6 K7 + 0x8C180D0C, // 001A GETMET R6 R6 K12 + 0x00200B0D, // 001B ADD R8 R5 K13 + 0x7C180400, // 001C CALL R6 2 + 0x7001FFEA, // 001D JMP #0009 + 0x5810000E, // 001E LDCONST R4 K14 + 0xAC100200, // 001F CATCH R4 1 0 + 0xB0080000, // 0020 RAISE 2 R0 R0 + 0x80000000, // 0021 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified class: Tapp +********************************************************************/ +be_local_class(Tapp, + 0, + NULL, + be_nested_map(2, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(autoexec, -1), be_const_closure(Tapp_autoexec_closure) }, + { be_const_key(init, 0), be_const_closure(Tapp_init_closure) }, + })), + be_str_literal("Tapp") +); + +/******************************************************************** +** Solidified function: _anonymous_ +********************************************************************/ +be_local_closure(tapp__anonymous_, /* name */ + be_nested_proto( + 3, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_const_class(be_class_Tapp), + }), + &be_const_str__anonymous_, + &be_const_str_solidified, + ( &(const binstruction[ 5]) { /* code */ + 0x58040000, // 0000 LDCONST R1 K0 + 0xB4000000, // 0001 CLASS K0 + 0x5C080200, // 0002 MOVE R2 R1 + 0x7C080000, // 0003 CALL R2 0 + 0x80040400, // 0004 RET 1 R2 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified module: tapp +********************************************************************/ +be_local_module(tapp, + "tapp", + be_nested_map(1, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(init, -1), be_const_closure(tapp__anonymous__closure) }, + })) +); +BE_EXPORT_VARIABLE be_define_const_native_module(tapp); +/********************************************************************/ diff --git a/lib/libesp32/berry/default/be_tasmotalib.c b/lib/libesp32/berry/default/be_tasmotalib.c new file mode 100644 index 000000000..6539b0de3 --- /dev/null +++ b/lib/libesp32/berry/default/be_tasmotalib.c @@ -0,0 +1,2079 @@ +/******************************************************************** + * Tasmota lib + * + * To use: `import tasmota` + *******************************************************************/ +#include "be_constobj.h" + +struct dummy_struct {}; // we need a struct name but don't need any meaningful content, we just take the address +extern struct TasmotaGlobal_t TasmotaGlobal; +extern struct TSettings * Settings; +extern struct dummy_struct be_tasmota_global_struct; +extern struct dummy_struct be_tasmota_settings_struct; + +extern int l_getFreeHeap(bvm *vm); +extern int l_arch(bvm *vm); +extern int l_publish(bvm *vm); +extern int l_publish_result(bvm *vm); +extern int l_cmd(bvm *vm); +extern int l_getoption(bvm *vm); +extern int l_millis(bvm *vm); +extern int l_timereached(bvm *vm); +extern int l_rtc(bvm *vm); +extern int l_time_dump(bvm *vm); +extern int l_strftime(bvm *vm); +extern int l_strptime(bvm *vm); +extern int l_memory(bvm *vm); +extern int l_wifi(bvm *vm); +extern int l_eth(bvm *vm); +extern int l_yield(bvm *vm); +extern int l_delay(bvm *vm); +extern int l_scaleuint(bvm *vm); +extern int l_logInfo(bvm *vm); +extern int l_save(bvm *vm); + +extern int l_read_sensors(bvm *vm); + +extern int l_respCmnd(bvm *vm); +extern int l_respCmndStr(bvm *vm); +extern int l_respCmndDone(bvm *vm); +extern int l_respCmndError(bvm *vm); +extern int l_respCmndFailed(bvm *vm); +extern int l_resolveCmnd(bvm *vm); + +extern int l_respAppend(bvm *vm); +extern int l_webSend(bvm *vm); +extern int l_webSendDecimal(bvm *vm); + +extern int l_getlight(bvm *vm); +extern int l_setlight(bvm *vm); +extern int l_getpower(bvm *vm); +extern int l_setpower(bvm *vm); +extern int l_getswitch(bvm *vm); + +extern int l_i2cenabled(bvm *vm); + + +/******************************************************************** +** Solidified function: add_driver +********************************************************************/ +be_local_closure(Tasmota_add_driver, /* name */ + be_nested_proto( + 5, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(_drivers), + /* K1 */ be_nested_str(push), + }), + &be_const_str_add_driver, + &be_const_str_solidified, + ( &(const binstruction[12]) { /* code */ + 0x88080100, // 0000 GETMBR R2 R0 K0 + 0x780A0004, // 0001 JMPF R2 #0007 + 0x88080100, // 0002 GETMBR R2 R0 K0 + 0x8C080501, // 0003 GETMET R2 R2 K1 + 0x5C100200, // 0004 MOVE R4 R1 + 0x7C080400, // 0005 CALL R2 2 + 0x70020003, // 0006 JMP #000B + 0x60080012, // 0007 GETGBL R2 G18 + 0x7C080000, // 0008 CALL R2 0 + 0x400C0401, // 0009 CONNECT R3 R2 R1 + 0x90020002, // 000A SETMBR R0 K0 R2 + 0x80000000, // 000B RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: gc +********************************************************************/ +be_local_closure(Tasmota_gc, /* name */ + be_nested_proto( + 4, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(gc), + /* K1 */ be_nested_str(collect), + /* K2 */ be_nested_str(allocated), + }), + &be_const_str_gc, + &be_const_str_solidified, + ( &(const binstruction[ 6]) { /* code */ + 0xA4060000, // 0000 IMPORT R1 K0 + 0x8C080301, // 0001 GETMET R2 R1 K1 + 0x7C080200, // 0002 CALL R2 1 + 0x8C080302, // 0003 GETMET R2 R1 K2 + 0x7C080200, // 0004 CALL R2 1 + 0x80040400, // 0005 RET 1 R2 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: find_op +********************************************************************/ +be_local_closure(Tasmota_find_op, /* name */ + be_nested_proto( + 13, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 6]) { /* constants */ + /* K0 */ be_nested_str(string), + /* K1 */ be_nested_str(_X3D_X3C_X3E_X21), + /* K2 */ be_nested_str(chars_in_string), + /* K3 */ be_const_int(0), + /* K4 */ be_nested_str(split), + /* K5 */ be_const_int(1), + }), + &be_const_str_find_op, + &be_const_str_solidified, + ( &(const binstruction[42]) { /* code */ + 0xA40A0000, // 0000 IMPORT R2 K0 + 0x580C0001, // 0001 LDCONST R3 K1 + 0x8C100102, // 0002 GETMET R4 R0 K2 + 0x5C180200, // 0003 MOVE R6 R1 + 0x5C1C0600, // 0004 MOVE R7 R3 + 0x7C100600, // 0005 CALL R4 3 + 0x28140903, // 0006 GE R5 R4 K3 + 0x78160019, // 0007 JMPF R5 #0022 + 0x8C140504, // 0008 GETMET R5 R2 K4 + 0x5C1C0200, // 0009 MOVE R7 R1 + 0x5C200800, // 000A MOVE R8 R4 + 0x7C140600, // 000B CALL R5 3 + 0x94180B03, // 000C GETIDX R6 R5 K3 + 0x941C0B05, // 000D GETIDX R7 R5 K5 + 0x8C200102, // 000E GETMET R8 R0 K2 + 0x5C280E00, // 000F MOVE R10 R7 + 0x5C2C0600, // 0010 MOVE R11 R3 + 0x50300200, // 0011 LDBOOL R12 1 0 + 0x7C200800, // 0012 CALL R8 4 + 0x5C101000, // 0013 MOVE R4 R8 + 0x28200903, // 0014 GE R8 R4 K3 + 0x7822000B, // 0015 JMPF R8 #0022 + 0x8C200504, // 0016 GETMET R8 R2 K4 + 0x5C280E00, // 0017 MOVE R10 R7 + 0x5C2C0800, // 0018 MOVE R11 R4 + 0x7C200600, // 0019 CALL R8 3 + 0x94241103, // 001A GETIDX R9 R8 K3 + 0x94281105, // 001B GETIDX R10 R8 K5 + 0x602C0012, // 001C GETGBL R11 G18 + 0x7C2C0000, // 001D CALL R11 0 + 0x40301606, // 001E CONNECT R12 R11 R6 + 0x40301609, // 001F CONNECT R12 R11 R9 + 0x4030160A, // 0020 CONNECT R12 R11 R10 + 0x80041600, // 0021 RET 1 R11 + 0x60140012, // 0022 GETGBL R5 G18 + 0x7C140000, // 0023 CALL R5 0 + 0x40180A01, // 0024 CONNECT R6 R5 R1 + 0x4C180000, // 0025 LDNIL R6 + 0x40180A06, // 0026 CONNECT R6 R5 R6 + 0x4C180000, // 0027 LDNIL R6 + 0x40180A06, // 0028 CONNECT R6 R5 R6 + 0x80040A00, // 0029 RET 1 R5 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: try_rule +********************************************************************/ +be_local_closure(Tasmota_try_rule, /* name */ + be_nested_proto( + 15, /* nstack */ + 4, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[16]) { /* constants */ + /* K0 */ be_nested_str(string), + /* K1 */ be_nested_str(find_op), + /* K2 */ be_nested_str(split), + /* K3 */ be_const_int(0), + /* K4 */ be_nested_str(_X23), + /* K5 */ be_nested_str(find_key_i), + /* K6 */ be_const_int(1), + /* K7 */ be_const_int(2), + /* K8 */ be_nested_str(_X3D_X3D), + /* K9 */ be_nested_str(_X21_X3D_X3D), + /* K10 */ be_nested_str(_X3D), + /* K11 */ be_nested_str(_X21_X3D), + /* K12 */ be_nested_str(_X3E), + /* K13 */ be_nested_str(_X3E_X3D), + /* K14 */ be_nested_str(_X3C), + /* K15 */ be_nested_str(_X3C_X3D), + }), + &be_const_str_try_rule, + &be_const_str_solidified, + ( &(const binstruction[141]) { /* code */ + 0xA4120000, // 0000 IMPORT R4 K0 + 0x8C140101, // 0001 GETMET R5 R0 K1 + 0x5C1C0400, // 0002 MOVE R7 R2 + 0x7C140400, // 0003 CALL R5 2 + 0x5C180200, // 0004 MOVE R6 R1 + 0x8C1C0902, // 0005 GETMET R7 R4 K2 + 0x94240B03, // 0006 GETIDX R9 R5 K3 + 0x58280004, // 0007 LDCONST R10 K4 + 0x7C1C0600, // 0008 CALL R7 3 + 0x58200003, // 0009 LDCONST R8 K3 + 0x6024000C, // 000A GETGBL R9 G12 + 0x5C280E00, // 000B MOVE R10 R7 + 0x7C240200, // 000C CALL R9 1 + 0x14241009, // 000D LT R9 R8 R9 + 0x7826000C, // 000E JMPF R9 #001C + 0x94240E08, // 000F GETIDX R9 R7 R8 + 0x8C280105, // 0010 GETMET R10 R0 K5 + 0x5C300C00, // 0011 MOVE R12 R6 + 0x5C341200, // 0012 MOVE R13 R9 + 0x7C280600, // 0013 CALL R10 3 + 0x4C2C0000, // 0014 LDNIL R11 + 0x1C2C140B, // 0015 EQ R11 R10 R11 + 0x782E0001, // 0016 JMPF R11 #0019 + 0x502C0000, // 0017 LDBOOL R11 0 0 + 0x80041600, // 0018 RET 1 R11 + 0x94180C0A, // 0019 GETIDX R6 R6 R10 + 0x00201106, // 001A ADD R8 R8 K6 + 0x7001FFED, // 001B JMP #000A + 0x94240B06, // 001C GETIDX R9 R5 K6 + 0x94280B07, // 001D GETIDX R10 R5 K7 + 0x78260066, // 001E JMPF R9 #0086 + 0x1C2C1308, // 001F EQ R11 R9 K8 + 0x782E000A, // 0020 JMPF R11 #002C + 0x602C0008, // 0021 GETGBL R11 G8 + 0x5C300C00, // 0022 MOVE R12 R6 + 0x7C2C0200, // 0023 CALL R11 1 + 0x60300008, // 0024 GETGBL R12 G8 + 0x5C341400, // 0025 MOVE R13 R10 + 0x7C300200, // 0026 CALL R12 1 + 0x202C160C, // 0027 NE R11 R11 R12 + 0x782E0001, // 0028 JMPF R11 #002B + 0x502C0000, // 0029 LDBOOL R11 0 0 + 0x80041600, // 002A RET 1 R11 + 0x70020059, // 002B JMP #0086 + 0x1C2C1309, // 002C EQ R11 R9 K9 + 0x782E000A, // 002D JMPF R11 #0039 + 0x602C0008, // 002E GETGBL R11 G8 + 0x5C300C00, // 002F MOVE R12 R6 + 0x7C2C0200, // 0030 CALL R11 1 + 0x60300008, // 0031 GETGBL R12 G8 + 0x5C341400, // 0032 MOVE R13 R10 + 0x7C300200, // 0033 CALL R12 1 + 0x1C2C160C, // 0034 EQ R11 R11 R12 + 0x782E0001, // 0035 JMPF R11 #0038 + 0x502C0000, // 0036 LDBOOL R11 0 0 + 0x80041600, // 0037 RET 1 R11 + 0x7002004C, // 0038 JMP #0086 + 0x1C2C130A, // 0039 EQ R11 R9 K10 + 0x782E000A, // 003A JMPF R11 #0046 + 0x602C000A, // 003B GETGBL R11 G10 + 0x5C300C00, // 003C MOVE R12 R6 + 0x7C2C0200, // 003D CALL R11 1 + 0x6030000A, // 003E GETGBL R12 G10 + 0x5C341400, // 003F MOVE R13 R10 + 0x7C300200, // 0040 CALL R12 1 + 0x202C160C, // 0041 NE R11 R11 R12 + 0x782E0001, // 0042 JMPF R11 #0045 + 0x502C0000, // 0043 LDBOOL R11 0 0 + 0x80041600, // 0044 RET 1 R11 + 0x7002003F, // 0045 JMP #0086 + 0x1C2C130B, // 0046 EQ R11 R9 K11 + 0x782E000A, // 0047 JMPF R11 #0053 + 0x602C000A, // 0048 GETGBL R11 G10 + 0x5C300C00, // 0049 MOVE R12 R6 + 0x7C2C0200, // 004A CALL R11 1 + 0x6030000A, // 004B GETGBL R12 G10 + 0x5C341400, // 004C MOVE R13 R10 + 0x7C300200, // 004D CALL R12 1 + 0x1C2C160C, // 004E EQ R11 R11 R12 + 0x782E0001, // 004F JMPF R11 #0052 + 0x502C0000, // 0050 LDBOOL R11 0 0 + 0x80041600, // 0051 RET 1 R11 + 0x70020032, // 0052 JMP #0086 + 0x1C2C130C, // 0053 EQ R11 R9 K12 + 0x782E000A, // 0054 JMPF R11 #0060 + 0x602C000A, // 0055 GETGBL R11 G10 + 0x5C300C00, // 0056 MOVE R12 R6 + 0x7C2C0200, // 0057 CALL R11 1 + 0x6030000A, // 0058 GETGBL R12 G10 + 0x5C341400, // 0059 MOVE R13 R10 + 0x7C300200, // 005A CALL R12 1 + 0x182C160C, // 005B LE R11 R11 R12 + 0x782E0001, // 005C JMPF R11 #005F + 0x502C0000, // 005D LDBOOL R11 0 0 + 0x80041600, // 005E RET 1 R11 + 0x70020025, // 005F JMP #0086 + 0x1C2C130D, // 0060 EQ R11 R9 K13 + 0x782E000A, // 0061 JMPF R11 #006D + 0x602C000A, // 0062 GETGBL R11 G10 + 0x5C300C00, // 0063 MOVE R12 R6 + 0x7C2C0200, // 0064 CALL R11 1 + 0x6030000A, // 0065 GETGBL R12 G10 + 0x5C341400, // 0066 MOVE R13 R10 + 0x7C300200, // 0067 CALL R12 1 + 0x142C160C, // 0068 LT R11 R11 R12 + 0x782E0001, // 0069 JMPF R11 #006C + 0x502C0000, // 006A LDBOOL R11 0 0 + 0x80041600, // 006B RET 1 R11 + 0x70020018, // 006C JMP #0086 + 0x1C2C130E, // 006D EQ R11 R9 K14 + 0x782E000A, // 006E JMPF R11 #007A + 0x602C000A, // 006F GETGBL R11 G10 + 0x5C300C00, // 0070 MOVE R12 R6 + 0x7C2C0200, // 0071 CALL R11 1 + 0x6030000A, // 0072 GETGBL R12 G10 + 0x5C341400, // 0073 MOVE R13 R10 + 0x7C300200, // 0074 CALL R12 1 + 0x282C160C, // 0075 GE R11 R11 R12 + 0x782E0001, // 0076 JMPF R11 #0079 + 0x502C0000, // 0077 LDBOOL R11 0 0 + 0x80041600, // 0078 RET 1 R11 + 0x7002000B, // 0079 JMP #0086 + 0x1C2C130F, // 007A EQ R11 R9 K15 + 0x782E0009, // 007B JMPF R11 #0086 + 0x602C000A, // 007C GETGBL R11 G10 + 0x5C300C00, // 007D MOVE R12 R6 + 0x7C2C0200, // 007E CALL R11 1 + 0x6030000A, // 007F GETGBL R12 G10 + 0x5C341400, // 0080 MOVE R13 R10 + 0x7C300200, // 0081 CALL R12 1 + 0x242C160C, // 0082 GT R11 R11 R12 + 0x782E0001, // 0083 JMPF R11 #0086 + 0x502C0000, // 0084 LDBOOL R11 0 0 + 0x80041600, // 0085 RET 1 R11 + 0x5C2C0600, // 0086 MOVE R11 R3 + 0x5C300C00, // 0087 MOVE R12 R6 + 0x94340B03, // 0088 GETIDX R13 R5 K3 + 0x5C380200, // 0089 MOVE R14 R1 + 0x7C2C0600, // 008A CALL R11 3 + 0x502C0200, // 008B LDBOOL R11 1 0 + 0x80041600, // 008C RET 1 R11 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: gen_cb +********************************************************************/ +be_local_closure(Tasmota_gen_cb, /* name */ + be_nested_proto( + 6, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(cb), + /* K1 */ be_nested_str(gen_cb), + }), + &be_const_str_gen_cb, + &be_const_str_solidified, + ( &(const binstruction[ 5]) { /* code */ + 0xA40A0000, // 0000 IMPORT R2 K0 + 0x8C0C0501, // 0001 GETMET R3 R2 K1 + 0x5C140200, // 0002 MOVE R5 R1 + 0x7C0C0400, // 0003 CALL R3 2 + 0x80040600, // 0004 RET 1 R3 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: set_light +********************************************************************/ +be_local_closure(Tasmota_set_light, /* name */ + be_nested_proto( + 8, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(tasmota_X2Eset_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eset_X28_X29), + /* K1 */ be_nested_str(light), + /* K2 */ be_nested_str(set), + }), + &be_const_str_set_light, + &be_const_str_solidified, + ( &(const binstruction[18]) { /* code */ + 0x600C0001, // 0000 GETGBL R3 G1 + 0x58100000, // 0001 LDCONST R4 K0 + 0x7C0C0200, // 0002 CALL R3 1 + 0xA40E0200, // 0003 IMPORT R3 K1 + 0x4C100000, // 0004 LDNIL R4 + 0x20100404, // 0005 NE R4 R2 R4 + 0x78120005, // 0006 JMPF R4 #000D + 0x8C100702, // 0007 GETMET R4 R3 K2 + 0x5C180200, // 0008 MOVE R6 R1 + 0x5C1C0400, // 0009 MOVE R7 R2 + 0x7C100600, // 000A CALL R4 3 + 0x80040800, // 000B RET 1 R4 + 0x70020003, // 000C JMP #0011 + 0x8C100702, // 000D GETMET R4 R3 K2 + 0x5C180200, // 000E MOVE R6 R1 + 0x7C100400, // 000F CALL R4 2 + 0x80040800, // 0010 RET 1 R4 + 0x80000000, // 0011 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: exec_tele +********************************************************************/ +be_local_closure(Tasmota_exec_tele, /* name */ + be_nested_proto( + 12, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[12]) { /* constants */ + /* K0 */ be_nested_str(_rules), + /* K1 */ be_nested_str(json), + /* K2 */ be_nested_str(load), + /* K3 */ be_nested_str(log), + /* K4 */ be_nested_str(BRY_X3A_X20ERROR_X2C_X20bad_X20json_X3A_X20), + /* K5 */ be_const_int(3), + /* K6 */ be_nested_str(Tele), + /* K7 */ be_const_int(0), + /* K8 */ be_nested_str(try_rule), + /* K9 */ be_nested_str(k), + /* K10 */ be_nested_str(v), + /* K11 */ be_const_int(1), + }), + &be_const_str_exec_tele, + &be_const_str_solidified, + ( &(const binstruction[41]) { /* code */ + 0x88080100, // 0000 GETMBR R2 R0 K0 + 0x780A0024, // 0001 JMPF R2 #0027 + 0xA40A0200, // 0002 IMPORT R2 K1 + 0x8C0C0502, // 0003 GETMET R3 R2 K2 + 0x5C140200, // 0004 MOVE R5 R1 + 0x7C0C0400, // 0005 CALL R3 2 + 0x50100000, // 0006 LDBOOL R4 0 0 + 0x4C140000, // 0007 LDNIL R5 + 0x1C140605, // 0008 EQ R5 R3 R5 + 0x78160004, // 0009 JMPF R5 #000F + 0x8C140103, // 000A GETMET R5 R0 K3 + 0x001E0801, // 000B ADD R7 K4 R1 + 0x58200005, // 000C LDCONST R8 K5 + 0x7C140600, // 000D CALL R5 3 + 0x5C0C0200, // 000E MOVE R3 R1 + 0x60140013, // 000F GETGBL R5 G19 + 0x7C140000, // 0010 CALL R5 0 + 0x98160C03, // 0011 SETIDX R5 K6 R3 + 0x5C0C0A00, // 0012 MOVE R3 R5 + 0x58140007, // 0013 LDCONST R5 K7 + 0x6018000C, // 0014 GETGBL R6 G12 + 0x881C0100, // 0015 GETMBR R7 R0 K0 + 0x7C180200, // 0016 CALL R6 1 + 0x14180A06, // 0017 LT R6 R5 R6 + 0x781A000C, // 0018 JMPF R6 #0026 + 0x88180100, // 0019 GETMBR R6 R0 K0 + 0x94180C05, // 001A GETIDX R6 R6 R5 + 0x8C1C0108, // 001B GETMET R7 R0 K8 + 0x5C240600, // 001C MOVE R9 R3 + 0x88280D09, // 001D GETMBR R10 R6 K9 + 0x882C0D0A, // 001E GETMBR R11 R6 K10 + 0x7C1C0800, // 001F CALL R7 4 + 0x741E0001, // 0020 JMPT R7 #0023 + 0x74120000, // 0021 JMPT R4 #0023 + 0x50100001, // 0022 LDBOOL R4 0 1 + 0x50100200, // 0023 LDBOOL R4 1 0 + 0x00140B0B, // 0024 ADD R5 R5 K11 + 0x7001FFED, // 0025 JMP #0014 + 0x80040800, // 0026 RET 1 R4 + 0x50080000, // 0027 LDBOOL R2 0 0 + 0x80040400, // 0028 RET 1 R2 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: run_deferred +********************************************************************/ +be_local_closure(Tasmota_run_deferred, /* name */ + be_nested_proto( + 6, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 8]) { /* constants */ + /* K0 */ be_nested_str(_timers), + /* K1 */ be_const_int(0), + /* K2 */ be_nested_str(size), + /* K3 */ be_nested_str(time_reached), + /* K4 */ be_nested_str(due), + /* K5 */ be_nested_str(f), + /* K6 */ be_nested_str(remove), + /* K7 */ be_const_int(1), + }), + &be_const_str_run_deferred, + &be_const_str_solidified, + ( &(const binstruction[27]) { /* code */ + 0x88040100, // 0000 GETMBR R1 R0 K0 + 0x78060017, // 0001 JMPF R1 #001A + 0x58040001, // 0002 LDCONST R1 K1 + 0x88080100, // 0003 GETMBR R2 R0 K0 + 0x8C080502, // 0004 GETMET R2 R2 K2 + 0x7C080200, // 0005 CALL R2 1 + 0x14080202, // 0006 LT R2 R1 R2 + 0x780A0011, // 0007 JMPF R2 #001A + 0x8C080103, // 0008 GETMET R2 R0 K3 + 0x88100100, // 0009 GETMBR R4 R0 K0 + 0x94100801, // 000A GETIDX R4 R4 R1 + 0x88100904, // 000B GETMBR R4 R4 K4 + 0x7C080400, // 000C CALL R2 2 + 0x780A0009, // 000D JMPF R2 #0018 + 0x88080100, // 000E GETMBR R2 R0 K0 + 0x94080401, // 000F GETIDX R2 R2 R1 + 0x88080505, // 0010 GETMBR R2 R2 K5 + 0x880C0100, // 0011 GETMBR R3 R0 K0 + 0x8C0C0706, // 0012 GETMET R3 R3 K6 + 0x5C140200, // 0013 MOVE R5 R1 + 0x7C0C0400, // 0014 CALL R3 2 + 0x5C0C0400, // 0015 MOVE R3 R2 + 0x7C0C0000, // 0016 CALL R3 0 + 0x70020000, // 0017 JMP #0019 + 0x00040307, // 0018 ADD R1 R1 K7 + 0x7001FFE8, // 0019 JMP #0003 + 0x80000000, // 001A RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: remove_driver +********************************************************************/ +be_local_closure(Tasmota_remove_driver, /* name */ + be_nested_proto( + 6, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(_drivers), + /* K1 */ be_nested_str(find), + /* K2 */ be_nested_str(pop), + }), + &be_const_str_remove_driver, + &be_const_str_solidified, + ( &(const binstruction[14]) { /* code */ + 0x88080100, // 0000 GETMBR R2 R0 K0 + 0x780A000A, // 0001 JMPF R2 #000D + 0x88080100, // 0002 GETMBR R2 R0 K0 + 0x8C080501, // 0003 GETMET R2 R2 K1 + 0x5C100200, // 0004 MOVE R4 R1 + 0x7C080400, // 0005 CALL R2 2 + 0x4C0C0000, // 0006 LDNIL R3 + 0x200C0403, // 0007 NE R3 R2 R3 + 0x780E0003, // 0008 JMPF R3 #000D + 0x880C0100, // 0009 GETMBR R3 R0 K0 + 0x8C0C0702, // 000A GETMET R3 R3 K2 + 0x5C140400, // 000B MOVE R5 R2 + 0x7C0C0400, // 000C CALL R3 2 + 0x80000000, // 000D RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: event +********************************************************************/ +be_local_closure(Tasmota_event, /* name */ + be_nested_proto( + 20, /* nstack */ + 6, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[23]) { /* constants */ + /* K0 */ be_nested_str(introspect), + /* K1 */ be_nested_str(string), + /* K2 */ be_nested_str(every_50ms), + /* K3 */ be_nested_str(run_deferred), + /* K4 */ be_nested_str(cmd), + /* K5 */ be_nested_str(exec_cmd), + /* K6 */ be_nested_str(tele), + /* K7 */ be_nested_str(exec_tele), + /* K8 */ be_nested_str(rule), + /* K9 */ be_nested_str(exec_rules), + /* K10 */ be_nested_str(gc), + /* K11 */ be_nested_str(_drivers), + /* K12 */ be_const_int(0), + /* K13 */ be_nested_str(get), + /* K14 */ be_nested_str(function), + /* K15 */ be_nested_str(format), + /* K16 */ be_nested_str(BRY_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s), + /* K17 */ be_nested_str(debug), + /* K18 */ be_nested_str(traceback), + /* K19 */ be_const_int(1), + /* K20 */ be_nested_str(save_before_restart), + /* K21 */ be_nested_str(persist), + /* K22 */ be_nested_str(save), + }), + &be_const_str_event, + &be_const_str_solidified, + ( &(const binstruction[91]) { /* code */ + 0xA41A0000, // 0000 IMPORT R6 K0 + 0xA41E0200, // 0001 IMPORT R7 K1 + 0x1C200302, // 0002 EQ R8 R1 K2 + 0x78220001, // 0003 JMPF R8 #0006 + 0x8C200103, // 0004 GETMET R8 R0 K3 + 0x7C200200, // 0005 CALL R8 1 + 0x50200000, // 0006 LDBOOL R8 0 0 + 0x1C240304, // 0007 EQ R9 R1 K4 + 0x78260006, // 0008 JMPF R9 #0010 + 0x8C240105, // 0009 GETMET R9 R0 K5 + 0x5C2C0400, // 000A MOVE R11 R2 + 0x5C300600, // 000B MOVE R12 R3 + 0x5C340800, // 000C MOVE R13 R4 + 0x7C240800, // 000D CALL R9 4 + 0x80041200, // 000E RET 1 R9 + 0x70020044, // 000F JMP #0055 + 0x1C240306, // 0010 EQ R9 R1 K6 + 0x78260004, // 0011 JMPF R9 #0017 + 0x8C240107, // 0012 GETMET R9 R0 K7 + 0x5C2C0800, // 0013 MOVE R11 R4 + 0x7C240400, // 0014 CALL R9 2 + 0x80041200, // 0015 RET 1 R9 + 0x7002003D, // 0016 JMP #0055 + 0x1C240308, // 0017 EQ R9 R1 K8 + 0x78260004, // 0018 JMPF R9 #001E + 0x8C240109, // 0019 GETMET R9 R0 K9 + 0x5C2C0800, // 001A MOVE R11 R4 + 0x7C240400, // 001B CALL R9 2 + 0x80041200, // 001C RET 1 R9 + 0x70020036, // 001D JMP #0055 + 0x1C24030A, // 001E EQ R9 R1 K10 + 0x78260003, // 001F JMPF R9 #0024 + 0x8C24010A, // 0020 GETMET R9 R0 K10 + 0x7C240200, // 0021 CALL R9 1 + 0x80041200, // 0022 RET 1 R9 + 0x70020030, // 0023 JMP #0055 + 0x8824010B, // 0024 GETMBR R9 R0 K11 + 0x7826002E, // 0025 JMPF R9 #0055 + 0x5824000C, // 0026 LDCONST R9 K12 + 0x6028000C, // 0027 GETGBL R10 G12 + 0x882C010B, // 0028 GETMBR R11 R0 K11 + 0x7C280200, // 0029 CALL R10 1 + 0x1428120A, // 002A LT R10 R9 R10 + 0x782A0028, // 002B JMPF R10 #0055 + 0x8828010B, // 002C GETMBR R10 R0 K11 + 0x94281409, // 002D GETIDX R10 R10 R9 + 0x8C2C0D0D, // 002E GETMET R11 R6 K13 + 0x5C341400, // 002F MOVE R13 R10 + 0x5C380200, // 0030 MOVE R14 R1 + 0x7C2C0600, // 0031 CALL R11 3 + 0x60300004, // 0032 GETGBL R12 G4 + 0x5C341600, // 0033 MOVE R13 R11 + 0x7C300200, // 0034 CALL R12 1 + 0x1C30190E, // 0035 EQ R12 R12 K14 + 0x7832001B, // 0036 JMPF R12 #0053 + 0xA802000C, // 0037 EXBLK 0 #0045 + 0x5C301600, // 0038 MOVE R12 R11 + 0x5C341400, // 0039 MOVE R13 R10 + 0x5C380400, // 003A MOVE R14 R2 + 0x5C3C0600, // 003B MOVE R15 R3 + 0x5C400800, // 003C MOVE R16 R4 + 0x5C440A00, // 003D MOVE R17 R5 + 0x7C300A00, // 003E CALL R12 5 + 0x5C201800, // 003F MOVE R8 R12 + 0x78220001, // 0040 JMPF R8 #0043 + 0xA8040001, // 0041 EXBLK 1 1 + 0x70020011, // 0042 JMP #0055 + 0xA8040001, // 0043 EXBLK 1 1 + 0x7002000D, // 0044 JMP #0053 + 0xAC300002, // 0045 CATCH R12 0 2 + 0x7002000A, // 0046 JMP #0052 + 0x60380001, // 0047 GETGBL R14 G1 + 0x8C3C0F0F, // 0048 GETMET R15 R7 K15 + 0x58440010, // 0049 LDCONST R17 K16 + 0x5C481800, // 004A MOVE R18 R12 + 0x5C4C1A00, // 004B MOVE R19 R13 + 0x7C3C0800, // 004C CALL R15 4 + 0x7C380200, // 004D CALL R14 1 + 0xA43A2200, // 004E IMPORT R14 K17 + 0x8C3C1D12, // 004F GETMET R15 R14 K18 + 0x7C3C0200, // 0050 CALL R15 1 + 0x70020000, // 0051 JMP #0053 + 0xB0080000, // 0052 RAISE 2 R0 R0 + 0x00241313, // 0053 ADD R9 R9 K19 + 0x7001FFD1, // 0054 JMP #0027 + 0x1C240314, // 0055 EQ R9 R1 K20 + 0x78260002, // 0056 JMPF R9 #005A + 0xA4262A00, // 0057 IMPORT R9 K21 + 0x8C281316, // 0058 GETMET R10 R9 K22 + 0x7C280200, // 0059 CALL R10 1 + 0x80041000, // 005A RET 1 R8 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: find_key_i +********************************************************************/ +be_local_closure(Tasmota_find_key_i, /* name */ + be_nested_proto( + 10, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 5]) { /* constants */ + /* K0 */ be_nested_str(string), + /* K1 */ be_nested_str(toupper), + /* K2 */ be_nested_str(keys), + /* K3 */ be_nested_str(_X3F), + /* K4 */ be_nested_str(stop_iteration), + }), + &be_const_str_find_key_i, + &be_const_str_solidified, + ( &(const binstruction[30]) { /* code */ + 0xA40E0000, // 0000 IMPORT R3 K0 + 0x8C100701, // 0001 GETMET R4 R3 K1 + 0x5C180400, // 0002 MOVE R6 R2 + 0x7C100400, // 0003 CALL R4 2 + 0x6014000F, // 0004 GETGBL R5 G15 + 0x5C180200, // 0005 MOVE R6 R1 + 0x601C0013, // 0006 GETGBL R7 G19 + 0x7C140400, // 0007 CALL R5 2 + 0x78160013, // 0008 JMPF R5 #001D + 0x60140010, // 0009 GETGBL R5 G16 + 0x8C180302, // 000A GETMET R6 R1 K2 + 0x7C180200, // 000B CALL R6 1 + 0x7C140200, // 000C CALL R5 1 + 0xA802000B, // 000D EXBLK 0 #001A + 0x5C180A00, // 000E MOVE R6 R5 + 0x7C180000, // 000F CALL R6 0 + 0x8C1C0701, // 0010 GETMET R7 R3 K1 + 0x5C240C00, // 0011 MOVE R9 R6 + 0x7C1C0400, // 0012 CALL R7 2 + 0x1C1C0E04, // 0013 EQ R7 R7 R4 + 0x741E0001, // 0014 JMPT R7 #0017 + 0x1C1C0503, // 0015 EQ R7 R2 K3 + 0x781E0001, // 0016 JMPF R7 #0019 + 0xA8040001, // 0017 EXBLK 1 1 + 0x80040C00, // 0018 RET 1 R6 + 0x7001FFF3, // 0019 JMP #000E + 0x58140004, // 001A LDCONST R5 K4 + 0xAC140200, // 001B CATCH R5 1 0 + 0xB0080000, // 001C RAISE 2 R0 R0 + 0x80000000, // 001D RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: wire_scan +********************************************************************/ +be_local_closure(Tasmota_wire_scan, /* name */ + be_nested_proto( + 6, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 5]) { /* constants */ + /* K0 */ be_nested_str(i2c_enabled), + /* K1 */ be_nested_str(wire1), + /* K2 */ be_nested_str(enabled), + /* K3 */ be_nested_str(detect), + /* K4 */ be_nested_str(wire2), + }), + &be_const_str_wire_scan, + &be_const_str_solidified, + ( &(const binstruction[33]) { /* code */ + 0x4C0C0000, // 0000 LDNIL R3 + 0x200C0403, // 0001 NE R3 R2 R3 + 0x780E0005, // 0002 JMPF R3 #0009 + 0x8C0C0100, // 0003 GETMET R3 R0 K0 + 0x5C140400, // 0004 MOVE R5 R2 + 0x7C0C0400, // 0005 CALL R3 2 + 0x740E0001, // 0006 JMPT R3 #0009 + 0x4C0C0000, // 0007 LDNIL R3 + 0x80040600, // 0008 RET 1 R3 + 0x880C0101, // 0009 GETMBR R3 R0 K1 + 0x8C0C0702, // 000A GETMET R3 R3 K2 + 0x7C0C0200, // 000B CALL R3 1 + 0x780E0006, // 000C JMPF R3 #0014 + 0x880C0101, // 000D GETMBR R3 R0 K1 + 0x8C0C0703, // 000E GETMET R3 R3 K3 + 0x5C140200, // 000F MOVE R5 R1 + 0x7C0C0400, // 0010 CALL R3 2 + 0x780E0001, // 0011 JMPF R3 #0014 + 0x880C0101, // 0012 GETMBR R3 R0 K1 + 0x80040600, // 0013 RET 1 R3 + 0x880C0104, // 0014 GETMBR R3 R0 K4 + 0x8C0C0702, // 0015 GETMET R3 R3 K2 + 0x7C0C0200, // 0016 CALL R3 1 + 0x780E0006, // 0017 JMPF R3 #001F + 0x880C0104, // 0018 GETMBR R3 R0 K4 + 0x8C0C0703, // 0019 GETMET R3 R3 K3 + 0x5C140200, // 001A MOVE R5 R1 + 0x7C0C0400, // 001B CALL R3 2 + 0x780E0001, // 001C JMPF R3 #001F + 0x880C0104, // 001D GETMBR R3 R0 K4 + 0x80040600, // 001E RET 1 R3 + 0x4C0C0000, // 001F LDNIL R3 + 0x80040600, // 0020 RET 1 R3 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: init +********************************************************************/ +be_local_closure(Tasmota_init, /* name */ + be_nested_proto( + 7, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[15]) { /* constants */ + /* K0 */ be_nested_str(global), + /* K1 */ be_nested_str(ctypes_bytes_dyn), + /* K2 */ be_nested_str(_global_addr), + /* K3 */ be_nested_str(_global_def), + /* K4 */ be_nested_str(introspect), + /* K5 */ be_nested_str(_settings_ptr), + /* K6 */ be_nested_str(get), + /* K7 */ be_const_int(0), + /* K8 */ be_nested_str(settings), + /* K9 */ be_nested_str(toptr), + /* K10 */ be_nested_str(_settings_def), + /* K11 */ be_nested_str(wd), + /* K12 */ be_nested_str(), + /* K13 */ be_nested_str(_debug_present), + /* K14 */ be_nested_str(debug), + }), + &be_const_str_init, + &be_const_str_solidified, + ( &(const binstruction[36]) { /* code */ + 0xB8060200, // 0000 GETNGBL R1 K1 + 0x88080102, // 0001 GETMBR R2 R0 K2 + 0x880C0103, // 0002 GETMBR R3 R0 K3 + 0x7C040400, // 0003 CALL R1 2 + 0x90020001, // 0004 SETMBR R0 K0 R1 + 0xA4060800, // 0005 IMPORT R1 K4 + 0x60080015, // 0006 GETGBL R2 G21 + 0x880C0105, // 0007 GETMBR R3 R0 K5 + 0x54120003, // 0008 LDINT R4 4 + 0x7C080400, // 0009 CALL R2 2 + 0x8C080506, // 000A GETMET R2 R2 K6 + 0x58100007, // 000B LDCONST R4 K7 + 0x54160003, // 000C LDINT R5 4 + 0x7C080600, // 000D CALL R2 3 + 0x780A0006, // 000E JMPF R2 #0016 + 0xB80E0200, // 000F GETNGBL R3 K1 + 0x8C100309, // 0010 GETMET R4 R1 K9 + 0x5C180400, // 0011 MOVE R6 R2 + 0x7C100400, // 0012 CALL R4 2 + 0x8814010A, // 0013 GETMBR R5 R0 K10 + 0x7C0C0400, // 0014 CALL R3 2 + 0x90021003, // 0015 SETMBR R0 K8 R3 + 0x9002170C, // 0016 SETMBR R0 K11 K12 + 0x500C0000, // 0017 LDBOOL R3 0 0 + 0x90021A03, // 0018 SETMBR R0 K13 R3 + 0xA8020004, // 0019 EXBLK 0 #001F + 0xA40E1C00, // 001A IMPORT R3 K14 + 0x50100200, // 001B LDBOOL R4 1 0 + 0x90021A04, // 001C SETMBR R0 K13 R4 + 0xA8040001, // 001D EXBLK 1 1 + 0x70020003, // 001E JMP #0023 + 0xAC0C0000, // 001F CATCH R3 0 0 + 0x70020000, // 0020 JMP #0022 + 0x70020000, // 0021 JMP #0023 + 0xB0080000, // 0022 RAISE 2 R0 R0 + 0x80000000, // 0023 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: time_str +********************************************************************/ +be_local_closure(Tasmota_time_str, /* name */ + be_nested_proto( + 13, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[10]) { /* constants */ + /* K0 */ be_nested_str(string), + /* K1 */ be_nested_str(time_dump), + /* K2 */ be_nested_str(format), + /* K3 */ be_nested_str(_X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d), + /* K4 */ be_nested_str(year), + /* K5 */ be_nested_str(month), + /* K6 */ be_nested_str(day), + /* K7 */ be_nested_str(hour), + /* K8 */ be_nested_str(min), + /* K9 */ be_nested_str(sec), + }), + &be_const_str_time_str, + &be_const_str_solidified, + ( &(const binstruction[14]) { /* code */ + 0xA40A0000, // 0000 IMPORT R2 K0 + 0x8C0C0101, // 0001 GETMET R3 R0 K1 + 0x5C140200, // 0002 MOVE R5 R1 + 0x7C0C0400, // 0003 CALL R3 2 + 0x8C100502, // 0004 GETMET R4 R2 K2 + 0x58180003, // 0005 LDCONST R6 K3 + 0x941C0704, // 0006 GETIDX R7 R3 K4 + 0x94200705, // 0007 GETIDX R8 R3 K5 + 0x94240706, // 0008 GETIDX R9 R3 K6 + 0x94280707, // 0009 GETIDX R10 R3 K7 + 0x942C0708, // 000A GETIDX R11 R3 K8 + 0x94300709, // 000B GETIDX R12 R3 K9 + 0x7C101000, // 000C CALL R4 8 + 0x80040800, // 000D RET 1 R4 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: remove_rule +********************************************************************/ +be_local_closure(Tasmota_remove_rule, /* name */ + be_nested_proto( + 6, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 5]) { /* constants */ + /* K0 */ be_nested_str(_rules), + /* K1 */ be_const_int(0), + /* K2 */ be_nested_str(k), + /* K3 */ be_nested_str(remove), + /* K4 */ be_const_int(1), + }), + &be_const_str_remove_rule, + &be_const_str_solidified, + ( &(const binstruction[21]) { /* code */ + 0x88080100, // 0000 GETMBR R2 R0 K0 + 0x780A0011, // 0001 JMPF R2 #0014 + 0x58080001, // 0002 LDCONST R2 K1 + 0x600C000C, // 0003 GETGBL R3 G12 + 0x88100100, // 0004 GETMBR R4 R0 K0 + 0x7C0C0200, // 0005 CALL R3 1 + 0x140C0403, // 0006 LT R3 R2 R3 + 0x780E000B, // 0007 JMPF R3 #0014 + 0x880C0100, // 0008 GETMBR R3 R0 K0 + 0x940C0602, // 0009 GETIDX R3 R3 R2 + 0x880C0702, // 000A GETMBR R3 R3 K2 + 0x1C0C0601, // 000B EQ R3 R3 R1 + 0x780E0004, // 000C JMPF R3 #0012 + 0x880C0100, // 000D GETMBR R3 R0 K0 + 0x8C0C0703, // 000E GETMET R3 R3 K3 + 0x5C140400, // 000F MOVE R5 R2 + 0x7C0C0400, // 0010 CALL R3 2 + 0x70020000, // 0011 JMP #0013 + 0x00080504, // 0012 ADD R2 R2 K4 + 0x7001FFEE, // 0013 JMP #0003 + 0x80000000, // 0014 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: load +********************************************************************/ +be_local_closure(Tasmota_load, /* name */ + be_nested_proto( + 21, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 1, /* has sup protos */ + ( &(const struct bproto*[ 2]) { + be_nested_proto( + 6, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 4]) { /* constants */ + /* K0 */ be_nested_str(sys), + /* K1 */ be_nested_str(path), + /* K2 */ be_nested_str(find), + /* K3 */ be_nested_str(push), + }), + &be_const_str_push_path, + &be_const_str_solidified, + ( &(const binstruction[13]) { /* code */ + 0xA4060000, // 0000 IMPORT R1 K0 + 0x8C080301, // 0001 GETMET R2 R1 K1 + 0x7C080200, // 0002 CALL R2 1 + 0x8C0C0502, // 0003 GETMET R3 R2 K2 + 0x5C140000, // 0004 MOVE R5 R0 + 0x7C0C0400, // 0005 CALL R3 2 + 0x4C100000, // 0006 LDNIL R4 + 0x1C0C0604, // 0007 EQ R3 R3 R4 + 0x780E0002, // 0008 JMPF R3 #000C + 0x8C0C0503, // 0009 GETMET R3 R2 K3 + 0x5C140000, // 000A MOVE R5 R0 + 0x7C0C0400, // 000B CALL R3 2 + 0x80000000, // 000C RET 0 + }) + ), + be_nested_proto( + 7, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 4]) { /* constants */ + /* K0 */ be_nested_str(sys), + /* K1 */ be_nested_str(path), + /* K2 */ be_nested_str(find), + /* K3 */ be_nested_str(remove), + }), + &be_const_str_pop_path, + &be_const_str_solidified, + ( &(const binstruction[13]) { /* code */ + 0xA4060000, // 0000 IMPORT R1 K0 + 0x8C080301, // 0001 GETMET R2 R1 K1 + 0x7C080200, // 0002 CALL R2 1 + 0x8C0C0502, // 0003 GETMET R3 R2 K2 + 0x5C140000, // 0004 MOVE R5 R0 + 0x7C0C0400, // 0005 CALL R3 2 + 0x4C100000, // 0006 LDNIL R4 + 0x20100604, // 0007 NE R4 R3 R4 + 0x78120002, // 0008 JMPF R4 #000C + 0x8C100503, // 0009 GETMET R4 R2 K3 + 0x5C180600, // 000A MOVE R6 R3 + 0x7C100400, // 000B CALL R4 2 + 0x80000000, // 000C RET 0 + }) + ), + }), + 1, /* has constants */ + ( &(const bvalue[21]) { /* constants */ + /* K0 */ be_nested_str(string), + /* K1 */ be_nested_str(path), + /* K2 */ be_const_int(0), + /* K3 */ be_nested_str(_X2F), + /* K4 */ be_nested_str(split), + /* K5 */ be_nested_str(_X23), + /* K6 */ be_const_int(1), + /* K7 */ be_nested_str(find), + /* K8 */ be_nested_str(_X2E), + /* K9 */ be_nested_str(_X2Ebe), + /* K10 */ be_nested_str(_X2Ebec), + /* K11 */ be_nested_str(io_error), + /* K12 */ be_nested_str(file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27), + /* K13 */ be_nested_str(last_modified), + /* K14 */ be_nested_str(c), + /* K15 */ be_nested_str(wd), + /* K16 */ be_nested_str(), + /* K17 */ be_nested_str(file), + /* K18 */ be_nested_str(save), + /* K19 */ be_nested_str(format), + /* K20 */ be_nested_str(BRY_X3A_X20could_X20not_X20save_X20compiled_X20file_X20_X25s_X20_X28_X25s_X29), + }), + &be_const_str_load, + &be_const_str_solidified, + ( &(const binstruction[121]) { /* code */ + 0x84080000, // 0000 CLOSURE R2 P0 + 0x840C0001, // 0001 CLOSURE R3 P1 + 0xA4120000, // 0002 IMPORT R4 K0 + 0xA4160200, // 0003 IMPORT R5 K1 + 0x6018000C, // 0004 GETGBL R6 G12 + 0x5C1C0200, // 0005 MOVE R7 R1 + 0x7C180200, // 0006 CALL R6 1 + 0x1C180D02, // 0007 EQ R6 R6 K2 + 0x781A0001, // 0008 JMPF R6 #000B + 0x50180000, // 0009 LDBOOL R6 0 0 + 0x80040C00, // 000A RET 1 R6 + 0x94180302, // 000B GETIDX R6 R1 K2 + 0x20180D03, // 000C NE R6 R6 K3 + 0x781A0000, // 000D JMPF R6 #000F + 0x00060601, // 000E ADD R1 K3 R1 + 0x8C180904, // 000F GETMET R6 R4 K4 + 0x5C200200, // 0010 MOVE R8 R1 + 0x58240005, // 0011 LDCONST R9 K5 + 0x7C180600, // 0012 CALL R6 3 + 0x941C0D02, // 0013 GETIDX R7 R6 K2 + 0x5421FFFE, // 0014 LDINT R8 -1 + 0x94200C08, // 0015 GETIDX R8 R6 R8 + 0x6024000C, // 0016 GETGBL R9 G12 + 0x5C280C00, // 0017 MOVE R10 R6 + 0x7C240200, // 0018 CALL R9 1 + 0x24241306, // 0019 GT R9 R9 K6 + 0x8C280907, // 001A GETMET R10 R4 K7 + 0x5C301000, // 001B MOVE R12 R8 + 0x58340008, // 001C LDCONST R13 K8 + 0x7C280600, // 001D CALL R10 3 + 0x14281502, // 001E LT R10 R10 K2 + 0x782A0001, // 001F JMPF R10 #0022 + 0x00040309, // 0020 ADD R1 R1 K9 + 0x00201109, // 0021 ADD R8 R8 K9 + 0x5429FFFC, // 0022 LDINT R10 -3 + 0x542DFFFE, // 0023 LDINT R11 -1 + 0x4028140B, // 0024 CONNECT R10 R10 R11 + 0x9428100A, // 0025 GETIDX R10 R8 R10 + 0x1C281509, // 0026 EQ R10 R10 K9 + 0x542DFFFB, // 0027 LDINT R11 -4 + 0x5431FFFE, // 0028 LDINT R12 -1 + 0x402C160C, // 0029 CONNECT R11 R11 R12 + 0x942C100B, // 002A GETIDX R11 R8 R11 + 0x1C2C170A, // 002B EQ R11 R11 K10 + 0x5C301400, // 002C MOVE R12 R10 + 0x74320002, // 002D JMPT R12 #0031 + 0x5C301600, // 002E MOVE R12 R11 + 0x74320000, // 002F JMPT R12 #0031 + 0xB006170C, // 0030 RAISE 1 K11 K12 + 0x8C300B0D, // 0031 GETMET R12 R5 K13 + 0x5C380E00, // 0032 MOVE R14 R7 + 0x7C300400, // 0033 CALL R12 2 + 0x782E0005, // 0034 JMPF R11 #003B + 0x4C340000, // 0035 LDNIL R13 + 0x1C34180D, // 0036 EQ R13 R12 R13 + 0x78360001, // 0037 JMPF R13 #003A + 0x50340000, // 0038 LDBOOL R13 0 0 + 0x80041A00, // 0039 RET 1 R13 + 0x70020013, // 003A JMP #004F + 0x8C340B0D, // 003B GETMET R13 R5 K13 + 0x003C030E, // 003C ADD R15 R1 K14 + 0x7C340400, // 003D CALL R13 2 + 0x4C380000, // 003E LDNIL R14 + 0x1C38180E, // 003F EQ R14 R12 R14 + 0x783A0004, // 0040 JMPF R14 #0046 + 0x4C380000, // 0041 LDNIL R14 + 0x1C381A0E, // 0042 EQ R14 R13 R14 + 0x783A0001, // 0043 JMPF R14 #0046 + 0x50380000, // 0044 LDBOOL R14 0 0 + 0x80041C00, // 0045 RET 1 R14 + 0x4C380000, // 0046 LDNIL R14 + 0x20381A0E, // 0047 NE R14 R13 R14 + 0x783A0005, // 0048 JMPF R14 #004F + 0x4C380000, // 0049 LDNIL R14 + 0x1C38180E, // 004A EQ R14 R12 R14 + 0x743A0001, // 004B JMPT R14 #004E + 0x28381A0C, // 004C GE R14 R13 R12 + 0x783A0000, // 004D JMPF R14 #004F + 0x502C0200, // 004E LDBOOL R11 1 0 + 0x78260005, // 004F JMPF R9 #0056 + 0x00340F05, // 0050 ADD R13 R7 K5 + 0x90021E0D, // 0051 SETMBR R0 K15 R13 + 0x5C340400, // 0052 MOVE R13 R2 + 0x8838010F, // 0053 GETMBR R14 R0 K15 + 0x7C340200, // 0054 CALL R13 1 + 0x70020000, // 0055 JMP #0057 + 0x90021F10, // 0056 SETMBR R0 K15 K16 + 0x6034000D, // 0057 GETGBL R13 G13 + 0x5C380200, // 0058 MOVE R14 R1 + 0x583C0011, // 0059 LDCONST R15 K17 + 0x7C340400, // 005A CALL R13 2 + 0x5C381600, // 005B MOVE R14 R11 + 0x743A0013, // 005C JMPT R14 #0071 + 0x5C381200, // 005D MOVE R14 R9 + 0x743A0011, // 005E JMPT R14 #0071 + 0xA8020005, // 005F EXBLK 0 #0066 + 0x8C380112, // 0060 GETMET R14 R0 K18 + 0x0040030E, // 0061 ADD R16 R1 K14 + 0x5C441A00, // 0062 MOVE R17 R13 + 0x7C380600, // 0063 CALL R14 3 + 0xA8040001, // 0064 EXBLK 1 1 + 0x7002000A, // 0065 JMP #0071 + 0xAC380001, // 0066 CATCH R14 0 1 + 0x70020007, // 0067 JMP #0070 + 0x603C0001, // 0068 GETGBL R15 G1 + 0x8C400913, // 0069 GETMET R16 R4 K19 + 0x58480014, // 006A LDCONST R18 K20 + 0x004C030E, // 006B ADD R19 R1 K14 + 0x5C501C00, // 006C MOVE R20 R14 + 0x7C400800, // 006D CALL R16 4 + 0x7C3C0200, // 006E CALL R15 1 + 0x70020000, // 006F JMP #0071 + 0xB0080000, // 0070 RAISE 2 R0 R0 + 0x5C381A00, // 0071 MOVE R14 R13 + 0x7C380000, // 0072 CALL R14 0 + 0x78260002, // 0073 JMPF R9 #0077 + 0x5C380600, // 0074 MOVE R14 R3 + 0x003C0F05, // 0075 ADD R15 R7 K5 + 0x7C380200, // 0076 CALL R14 1 + 0x50380200, // 0077 LDBOOL R14 1 0 + 0x80041C00, // 0078 RET 1 R14 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: chars_in_string +********************************************************************/ +be_local_closure(Tasmota_chars_in_string, /* name */ + be_nested_proto( + 10, /* nstack */ + 4, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_const_int(0), + /* K1 */ be_const_int(1), + }), + &be_const_str_chars_in_string, + &be_const_str_solidified, + ( &(const binstruction[31]) { /* code */ + 0x780E0001, // 0000 JMPF R3 #0003 + 0x50100200, // 0001 LDBOOL R4 1 0 + 0x70020000, // 0002 JMP #0004 + 0x50100000, // 0003 LDBOOL R4 0 0 + 0x58140000, // 0004 LDCONST R5 K0 + 0x6018000C, // 0005 GETGBL R6 G12 + 0x5C1C0200, // 0006 MOVE R7 R1 + 0x7C180200, // 0007 CALL R6 1 + 0x14180A06, // 0008 LT R6 R5 R6 + 0x781A0012, // 0009 JMPF R6 #001D + 0x50180000, // 000A LDBOOL R6 0 0 + 0x581C0000, // 000B LDCONST R7 K0 + 0x6020000C, // 000C GETGBL R8 G12 + 0x5C240400, // 000D MOVE R9 R2 + 0x7C200200, // 000E CALL R8 1 + 0x14200E08, // 000F LT R8 R7 R8 + 0x78220006, // 0010 JMPF R8 #0018 + 0x94200205, // 0011 GETIDX R8 R1 R5 + 0x94240407, // 0012 GETIDX R9 R2 R7 + 0x1C201009, // 0013 EQ R8 R8 R9 + 0x78220000, // 0014 JMPF R8 #0016 + 0x50180200, // 0015 LDBOOL R6 1 0 + 0x001C0F01, // 0016 ADD R7 R7 K1 + 0x7001FFF3, // 0017 JMP #000C + 0x20200806, // 0018 NE R8 R4 R6 + 0x78220000, // 0019 JMPF R8 #001B + 0x80040A00, // 001A RET 1 R5 + 0x00140B01, // 001B ADD R5 R5 K1 + 0x7001FFE7, // 001C JMP #0005 + 0x5419FFFE, // 001D LDINT R6 -1 + 0x80040C00, // 001E RET 1 R6 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: cmd +********************************************************************/ +be_local_closure(Tasmota_cmd, /* name */ + be_nested_proto( + 5, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(cmd_res), + /* K1 */ be_nested_str(_cmd), + }), + &be_const_str_cmd, + &be_const_str_solidified, + ( &(const binstruction[14]) { /* code */ + 0x50080200, // 0000 LDBOOL R2 1 0 + 0x90020002, // 0001 SETMBR R0 K0 R2 + 0x8C080101, // 0002 GETMET R2 R0 K1 + 0x5C100200, // 0003 MOVE R4 R1 + 0x7C080400, // 0004 CALL R2 2 + 0x4C080000, // 0005 LDNIL R2 + 0x880C0100, // 0006 GETMBR R3 R0 K0 + 0x50100200, // 0007 LDBOOL R4 1 0 + 0x200C0604, // 0008 NE R3 R3 R4 + 0x780E0000, // 0009 JMPF R3 #000B + 0x88080100, // 000A GETMBR R2 R0 K0 + 0x4C0C0000, // 000B LDNIL R3 + 0x90020003, // 000C SETMBR R0 K0 R3 + 0x80040400, // 000D RET 1 R2 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: add_cmd +********************************************************************/ +be_local_closure(Tasmota_add_cmd, /* name */ + be_nested_proto( + 5, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 4]) { /* constants */ + /* K0 */ be_nested_str(_ccmd), + /* K1 */ be_nested_str(function), + /* K2 */ be_nested_str(value_error), + /* K3 */ be_nested_str(the_X20second_X20argument_X20is_X20not_X20a_X20function), + }), + &be_const_str_add_cmd, + &be_const_str_solidified, + ( &(const binstruction[15]) { /* code */ + 0x880C0100, // 0000 GETMBR R3 R0 K0 + 0x740E0002, // 0001 JMPT R3 #0005 + 0x600C0013, // 0002 GETGBL R3 G19 + 0x7C0C0000, // 0003 CALL R3 0 + 0x90020003, // 0004 SETMBR R0 K0 R3 + 0x600C0004, // 0005 GETGBL R3 G4 + 0x5C100400, // 0006 MOVE R4 R2 + 0x7C0C0200, // 0007 CALL R3 1 + 0x1C0C0701, // 0008 EQ R3 R3 K1 + 0x780E0002, // 0009 JMPF R3 #000D + 0x880C0100, // 000A GETMBR R3 R0 K0 + 0x980C0202, // 000B SETIDX R3 R1 R2 + 0x70020000, // 000C JMP #000E + 0xB0060503, // 000D RAISE 1 K2 K3 + 0x80000000, // 000E RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: add_rule +********************************************************************/ +be_local_closure(Tasmota_add_rule, /* name */ + be_nested_proto( + 9, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 6]) { /* constants */ + /* K0 */ be_nested_str(_rules), + /* K1 */ be_nested_str(function), + /* K2 */ be_nested_str(push), + /* K3 */ be_nested_str(kv), + /* K4 */ be_nested_str(value_error), + /* K5 */ be_nested_str(the_X20second_X20argument_X20is_X20not_X20a_X20function), + }), + &be_const_str_add_rule, + &be_const_str_solidified, + ( &(const binstruction[20]) { /* code */ + 0x880C0100, // 0000 GETMBR R3 R0 K0 + 0x740E0002, // 0001 JMPT R3 #0005 + 0x600C0012, // 0002 GETGBL R3 G18 + 0x7C0C0000, // 0003 CALL R3 0 + 0x90020003, // 0004 SETMBR R0 K0 R3 + 0x600C0004, // 0005 GETGBL R3 G4 + 0x5C100400, // 0006 MOVE R4 R2 + 0x7C0C0200, // 0007 CALL R3 1 + 0x1C0C0701, // 0008 EQ R3 R3 K1 + 0x780E0007, // 0009 JMPF R3 #0012 + 0x880C0100, // 000A GETMBR R3 R0 K0 + 0x8C0C0702, // 000B GETMET R3 R3 K2 + 0x8C140103, // 000C GETMET R5 R0 K3 + 0x5C1C0200, // 000D MOVE R7 R1 + 0x5C200400, // 000E MOVE R8 R2 + 0x7C140600, // 000F CALL R5 3 + 0x7C0C0400, // 0010 CALL R3 2 + 0x70020000, // 0011 JMP #0013 + 0xB0060905, // 0012 RAISE 1 K4 K5 + 0x80000000, // 0013 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: exec_rules +********************************************************************/ +be_local_closure(Tasmota_exec_rules, /* name */ + be_nested_proto( + 12, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[12]) { /* constants */ + /* K0 */ be_nested_str(_rules), + /* K1 */ be_nested_str(cmd_res), + /* K2 */ be_nested_str(json), + /* K3 */ be_nested_str(load), + /* K4 */ be_nested_str(log), + /* K5 */ be_nested_str(BRY_X3A_X20ERROR_X2C_X20bad_X20json_X3A_X20), + /* K6 */ be_const_int(3), + /* K7 */ be_const_int(0), + /* K8 */ be_nested_str(try_rule), + /* K9 */ be_nested_str(k), + /* K10 */ be_nested_str(v), + /* K11 */ be_const_int(1), + }), + &be_const_str_exec_rules, + &be_const_str_solidified, + ( &(const binstruction[48]) { /* code */ + 0x88080100, // 0000 GETMBR R2 R0 K0 + 0x740A0003, // 0001 JMPT R2 #0006 + 0x88080101, // 0002 GETMBR R2 R0 K1 + 0x4C0C0000, // 0003 LDNIL R3 + 0x20080403, // 0004 NE R2 R2 R3 + 0x780A0027, // 0005 JMPF R2 #002E + 0xA40A0400, // 0006 IMPORT R2 K2 + 0x8C0C0503, // 0007 GETMET R3 R2 K3 + 0x5C140200, // 0008 MOVE R5 R1 + 0x7C0C0400, // 0009 CALL R3 2 + 0x50100000, // 000A LDBOOL R4 0 0 + 0x4C140000, // 000B LDNIL R5 + 0x1C140605, // 000C EQ R5 R3 R5 + 0x78160004, // 000D JMPF R5 #0013 + 0x8C140104, // 000E GETMET R5 R0 K4 + 0x001E0A01, // 000F ADD R7 K5 R1 + 0x58200006, // 0010 LDCONST R8 K6 + 0x7C140600, // 0011 CALL R5 3 + 0x5C0C0200, // 0012 MOVE R3 R1 + 0x88140101, // 0013 GETMBR R5 R0 K1 + 0x4C180000, // 0014 LDNIL R6 + 0x20140A06, // 0015 NE R5 R5 R6 + 0x78160000, // 0016 JMPF R5 #0018 + 0x90020203, // 0017 SETMBR R0 K1 R3 + 0x88140100, // 0018 GETMBR R5 R0 K0 + 0x78160012, // 0019 JMPF R5 #002D + 0x58140007, // 001A LDCONST R5 K7 + 0x6018000C, // 001B GETGBL R6 G12 + 0x881C0100, // 001C GETMBR R7 R0 K0 + 0x7C180200, // 001D CALL R6 1 + 0x14180A06, // 001E LT R6 R5 R6 + 0x781A000C, // 001F JMPF R6 #002D + 0x88180100, // 0020 GETMBR R6 R0 K0 + 0x94180C05, // 0021 GETIDX R6 R6 R5 + 0x8C1C0108, // 0022 GETMET R7 R0 K8 + 0x5C240600, // 0023 MOVE R9 R3 + 0x88280D09, // 0024 GETMBR R10 R6 K9 + 0x882C0D0A, // 0025 GETMBR R11 R6 K10 + 0x7C1C0800, // 0026 CALL R7 4 + 0x741E0001, // 0027 JMPT R7 #002A + 0x74120000, // 0028 JMPT R4 #002A + 0x50100001, // 0029 LDBOOL R4 0 1 + 0x50100200, // 002A LDBOOL R4 1 0 + 0x00140B0B, // 002B ADD R5 R5 K11 + 0x7001FFED, // 002C JMP #001B + 0x80040800, // 002D RET 1 R4 + 0x50080000, // 002E LDBOOL R2 0 0 + 0x80040400, // 002F RET 1 R2 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: hs2rgb +********************************************************************/ +be_local_closure(Tasmota_hs2rgb, /* name */ + be_nested_proto( + 17, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 6]) { /* constants */ + /* K0 */ be_const_int(0), + /* K1 */ be_nested_str(tasmota), + /* K2 */ be_nested_str(scale_uint), + /* K3 */ be_const_int(1), + /* K4 */ be_const_int(2), + /* K5 */ be_const_int(3), + }), + &be_const_str_hs2rgb, + &be_const_str_solidified, + ( &(const binstruction[68]) { /* code */ + 0x4C0C0000, // 0000 LDNIL R3 + 0x1C0C0403, // 0001 EQ R3 R2 R3 + 0x780E0000, // 0002 JMPF R3 #0004 + 0x540A00FE, // 0003 LDINT R2 255 + 0x540E00FE, // 0004 LDINT R3 255 + 0x541200FE, // 0005 LDINT R4 255 + 0x541600FE, // 0006 LDINT R5 255 + 0x541A0167, // 0007 LDINT R6 360 + 0x10040206, // 0008 MOD R1 R1 R6 + 0x24180500, // 0009 GT R6 R2 K0 + 0x781A0031, // 000A JMPF R6 #003D + 0x541A003B, // 000B LDINT R6 60 + 0x0C180206, // 000C DIV R6 R1 R6 + 0x541E003B, // 000D LDINT R7 60 + 0x101C0207, // 000E MOD R7 R1 R7 + 0x542200FE, // 000F LDINT R8 255 + 0x04201002, // 0010 SUB R8 R8 R2 + 0xB8260200, // 0011 GETNGBL R9 K1 + 0x8C241302, // 0012 GETMET R9 R9 K2 + 0x5C2C0E00, // 0013 MOVE R11 R7 + 0x58300000, // 0014 LDCONST R12 K0 + 0x5436003B, // 0015 LDINT R13 60 + 0x543A00FE, // 0016 LDINT R14 255 + 0x5C3C1000, // 0017 MOVE R15 R8 + 0x7C240C00, // 0018 CALL R9 6 + 0xB82A0200, // 0019 GETNGBL R10 K1 + 0x8C281502, // 001A GETMET R10 R10 K2 + 0x5C300E00, // 001B MOVE R12 R7 + 0x58340000, // 001C LDCONST R13 K0 + 0x543A003B, // 001D LDINT R14 60 + 0x5C3C1000, // 001E MOVE R15 R8 + 0x544200FE, // 001F LDINT R16 255 + 0x7C280C00, // 0020 CALL R10 6 + 0x1C2C0D00, // 0021 EQ R11 R6 K0 + 0x782E0002, // 0022 JMPF R11 #0026 + 0x5C141400, // 0023 MOVE R5 R10 + 0x5C101000, // 0024 MOVE R4 R8 + 0x70020016, // 0025 JMP #003D + 0x1C2C0D03, // 0026 EQ R11 R6 K3 + 0x782E0002, // 0027 JMPF R11 #002B + 0x5C0C1200, // 0028 MOVE R3 R9 + 0x5C101000, // 0029 MOVE R4 R8 + 0x70020011, // 002A JMP #003D + 0x1C2C0D04, // 002B EQ R11 R6 K4 + 0x782E0002, // 002C JMPF R11 #0030 + 0x5C0C1000, // 002D MOVE R3 R8 + 0x5C101400, // 002E MOVE R4 R10 + 0x7002000C, // 002F JMP #003D + 0x1C2C0D05, // 0030 EQ R11 R6 K5 + 0x782E0002, // 0031 JMPF R11 #0035 + 0x5C0C1000, // 0032 MOVE R3 R8 + 0x5C141200, // 0033 MOVE R5 R9 + 0x70020007, // 0034 JMP #003D + 0x542E0003, // 0035 LDINT R11 4 + 0x1C2C0C0B, // 0036 EQ R11 R6 R11 + 0x782E0002, // 0037 JMPF R11 #003B + 0x5C0C1400, // 0038 MOVE R3 R10 + 0x5C141000, // 0039 MOVE R5 R8 + 0x70020001, // 003A JMP #003D + 0x5C141000, // 003B MOVE R5 R8 + 0x5C101200, // 003C MOVE R4 R9 + 0x541A000F, // 003D LDINT R6 16 + 0x38180606, // 003E SHL R6 R3 R6 + 0x541E0007, // 003F LDINT R7 8 + 0x381C0A07, // 0040 SHL R7 R5 R7 + 0x30180C07, // 0041 OR R6 R6 R7 + 0x30180C04, // 0042 OR R6 R6 R4 + 0x80040C00, // 0043 RET 1 R6 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: init +********************************************************************/ +be_local_closure(KV_init, /* name */ + be_nested_proto( + 3, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(k), + /* K1 */ be_nested_str(v), + }), + &be_const_str_init, + &be_const_str_solidified, + ( &(const binstruction[ 3]) { /* code */ + 0x90020001, // 0000 SETMBR R0 K0 R1 + 0x90020202, // 0001 SETMBR R0 K1 R2 + 0x80000000, // 0002 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified class: KV +********************************************************************/ +be_local_class(KV, + 2, + NULL, + be_nested_map(3, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(k, 2), be_const_var(0) }, + { be_const_key(v, -1), be_const_var(1) }, + { be_const_key(init, -1), be_const_closure(KV_init_closure) }, + })), + be_str_literal("KV") +); + +/******************************************************************** +** Solidified function: kv +********************************************************************/ +be_local_closure(Tasmota_kv, /* name */ + be_nested_proto( + 7, /* nstack */ + 3, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 1]) { /* constants */ + /* K0 */ be_const_class(be_class_KV), + }), + &be_const_str_kv, + &be_const_str_solidified, + ( &(const binstruction[ 7]) { /* code */ + 0x580C0000, // 0000 LDCONST R3 K0 + 0xB4000000, // 0001 CLASS K0 + 0x5C100600, // 0002 MOVE R4 R3 + 0x5C140200, // 0003 MOVE R5 R1 + 0x5C180400, // 0004 MOVE R6 R2 + 0x7C100400, // 0005 CALL R4 2 + 0x80040800, // 0006 RET 1 R4 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: remove_cmd +********************************************************************/ +be_local_closure(Tasmota_remove_cmd, /* name */ + be_nested_proto( + 5, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 2]) { /* constants */ + /* K0 */ be_nested_str(_ccmd), + /* K1 */ be_nested_str(remove), + }), + &be_const_str_remove_cmd, + &be_const_str_solidified, + ( &(const binstruction[ 7]) { /* code */ + 0x88080100, // 0000 GETMBR R2 R0 K0 + 0x780A0003, // 0001 JMPF R2 #0006 + 0x88080100, // 0002 GETMBR R2 R0 K0 + 0x8C080501, // 0003 GETMET R2 R2 K1 + 0x5C100200, // 0004 MOVE R4 R1 + 0x7C080400, // 0005 CALL R2 2 + 0x80000000, // 0006 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: set_timer +********************************************************************/ +be_local_closure(Tasmota_set_timer, /* name */ + be_nested_proto( + 10, /* nstack */ + 4, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 4]) { /* constants */ + /* K0 */ be_nested_str(_timers), + /* K1 */ be_nested_str(push), + /* K2 */ be_nested_str(Timer), + /* K3 */ be_nested_str(millis), + }), + &be_const_str_set_timer, + &be_const_str_solidified, + ( &(const binstruction[16]) { /* code */ + 0x88100100, // 0000 GETMBR R4 R0 K0 + 0x74120002, // 0001 JMPT R4 #0005 + 0x60100012, // 0002 GETGBL R4 G18 + 0x7C100000, // 0003 CALL R4 0 + 0x90020004, // 0004 SETMBR R0 K0 R4 + 0x88100100, // 0005 GETMBR R4 R0 K0 + 0x8C100901, // 0006 GETMET R4 R4 K1 + 0xB81A0400, // 0007 GETNGBL R6 K2 + 0x8C1C0103, // 0008 GETMET R7 R0 K3 + 0x5C240200, // 0009 MOVE R9 R1 + 0x7C1C0400, // 000A CALL R7 2 + 0x5C200400, // 000B MOVE R8 R2 + 0x5C240600, // 000C MOVE R9 R3 + 0x7C180600, // 000D CALL R6 3 + 0x7C100400, // 000E CALL R4 2 + 0x80000000, // 000F RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: remove_timer +********************************************************************/ +be_local_closure(Tasmota_remove_timer, /* name */ + be_nested_proto( + 6, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 7]) { /* constants */ + /* K0 */ be_nested_str(tasmota), + /* K1 */ be_nested_str(_timers), + /* K2 */ be_const_int(0), + /* K3 */ be_nested_str(size), + /* K4 */ be_nested_str(id), + /* K5 */ be_nested_str(remove), + /* K6 */ be_const_int(1), + }), + &be_const_str_remove_timer, + &be_const_str_solidified, + ( &(const binstruction[23]) { /* code */ + 0xB80A0000, // 0000 GETNGBL R2 K0 + 0x88080501, // 0001 GETMBR R2 R2 K1 + 0x780A0012, // 0002 JMPF R2 #0016 + 0x58080002, // 0003 LDCONST R2 K2 + 0xB80E0000, // 0004 GETNGBL R3 K0 + 0x880C0701, // 0005 GETMBR R3 R3 K1 + 0x8C0C0703, // 0006 GETMET R3 R3 K3 + 0x7C0C0200, // 0007 CALL R3 1 + 0x140C0403, // 0008 LT R3 R2 R3 + 0x780E000B, // 0009 JMPF R3 #0016 + 0x880C0101, // 000A GETMBR R3 R0 K1 + 0x940C0602, // 000B GETIDX R3 R3 R2 + 0x880C0704, // 000C GETMBR R3 R3 K4 + 0x1C0C0601, // 000D EQ R3 R3 R1 + 0x780E0004, // 000E JMPF R3 #0014 + 0x880C0101, // 000F GETMBR R3 R0 K1 + 0x8C0C0705, // 0010 GETMET R3 R3 K5 + 0x5C140400, // 0011 MOVE R5 R2 + 0x7C0C0400, // 0012 CALL R3 2 + 0x70020000, // 0013 JMP #0015 + 0x00080506, // 0014 ADD R2 R2 K6 + 0x7001FFED, // 0015 JMP #0004 + 0x80000000, // 0016 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: exec_cmd +********************************************************************/ +be_local_closure(Tasmota_exec_cmd, /* name */ + be_nested_proto( + 12, /* nstack */ + 4, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 5]) { /* constants */ + /* K0 */ be_nested_str(_ccmd), + /* K1 */ be_nested_str(json), + /* K2 */ be_nested_str(load), + /* K3 */ be_nested_str(find_key_i), + /* K4 */ be_nested_str(resolvecmnd), + }), + &be_const_str_exec_cmd, + &be_const_str_solidified, + ( &(const binstruction[27]) { /* code */ + 0x88100100, // 0000 GETMBR R4 R0 K0 + 0x78120016, // 0001 JMPF R4 #0019 + 0xA4120200, // 0002 IMPORT R4 K1 + 0x8C140902, // 0003 GETMET R5 R4 K2 + 0x5C1C0600, // 0004 MOVE R7 R3 + 0x7C140400, // 0005 CALL R5 2 + 0x8C180103, // 0006 GETMET R6 R0 K3 + 0x88200100, // 0007 GETMBR R8 R0 K0 + 0x5C240200, // 0008 MOVE R9 R1 + 0x7C180600, // 0009 CALL R6 3 + 0x4C1C0000, // 000A LDNIL R7 + 0x201C0C07, // 000B NE R7 R6 R7 + 0x781E000B, // 000C JMPF R7 #0019 + 0x8C1C0104, // 000D GETMET R7 R0 K4 + 0x5C240C00, // 000E MOVE R9 R6 + 0x7C1C0400, // 000F CALL R7 2 + 0x881C0100, // 0010 GETMBR R7 R0 K0 + 0x941C0E06, // 0011 GETIDX R7 R7 R6 + 0x5C200C00, // 0012 MOVE R8 R6 + 0x5C240400, // 0013 MOVE R9 R2 + 0x5C280600, // 0014 MOVE R10 R3 + 0x5C2C0A00, // 0015 MOVE R11 R5 + 0x7C1C0800, // 0016 CALL R7 4 + 0x501C0200, // 0017 LDBOOL R7 1 0 + 0x80040E00, // 0018 RET 1 R7 + 0x50100000, // 0019 LDBOOL R4 0 0 + 0x80040800, // 001A RET 1 R4 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: get_light +********************************************************************/ +be_local_closure(Tasmota_get_light, /* name */ + be_nested_proto( + 6, /* nstack */ + 2, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(tasmota_X2Eget_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eget_X28_X29), + /* K1 */ be_nested_str(light), + /* K2 */ be_nested_str(get), + }), + &be_const_str_get_light, + &be_const_str_solidified, + ( &(const binstruction[16]) { /* code */ + 0x60080001, // 0000 GETGBL R2 G1 + 0x580C0000, // 0001 LDCONST R3 K0 + 0x7C080200, // 0002 CALL R2 1 + 0xA40A0200, // 0003 IMPORT R2 K1 + 0x4C0C0000, // 0004 LDNIL R3 + 0x200C0203, // 0005 NE R3 R1 R3 + 0x780E0004, // 0006 JMPF R3 #000C + 0x8C0C0502, // 0007 GETMET R3 R2 K2 + 0x5C140200, // 0008 MOVE R5 R1 + 0x7C0C0400, // 0009 CALL R3 2 + 0x80040600, // 000A RET 1 R3 + 0x70020002, // 000B JMP #000F + 0x8C0C0502, // 000C GETMET R3 R2 K2 + 0x7C0C0200, // 000D CALL R3 1 + 0x80040600, // 000E RET 1 R3 + 0x80000000, // 000F RET 0 + }) + ) +); +/*******************************************************************/ + +#include "../generate/be_fixed_be_class_tasmota.h" + + +// Class definition +void be_load_tasmota_ntvlib(bvm *vm) +{ + be_pushntvclass(vm, &be_class_tasmota); + be_setglobal(vm, "Tasmota"); + be_pop(vm, 1); +} + +/* @const_object_info_begin +class be_class_tasmota (scope: global, name: Tasmota) { + _rules, var + _timers, var + _ccmd, var + _drivers, var + wire1, var + wire2, var + global, var + settings, var + cmd_res, var + wd, var + _debug_present, var + + _global_def, comptr(&be_tasmota_global_struct) + _settings_def, comptr(&be_tasmota_settings_struct) + _global_addr, comptr(&TasmotaGlobal) + _settings_ptr, comptr(&Settings) + + init, closure(Tasmota_init_closure) + kv, closure(Tasmota_kv_closure) + + get_free_heap, func(l_getFreeHeap) + arch, func(l_arch) + publish, func(l_publish) + publish_result, func(l_publish_result) + _cmd, func(l_cmd) + get_option, func(l_getoption) + millis, func(l_millis) + time_reached, func(l_timereached) + rtc, func(l_rtc) + time_dump, func(l_time_dump) + strftime, func(l_strftime) + strptime, func(l_strptime) + memory, func(l_memory) + wifi, func(l_wifi) + eth, func(l_eth) + yield, func(l_yield) + delay, func(l_delay) + scale_uint, func(l_scaleuint) + log, func(l_logInfo) + save, func(l_save) + + read_sensors, func(l_read_sensors) + + resp_cmnd, func(l_respCmnd) + resp_cmnd_str, func(l_respCmndStr) + resp_cmnd_done, func(l_respCmndDone) + resp_cmnd_error, func(l_respCmndError) + resp_cmnd_failed, func(l_respCmndFailed) + resolvecmnd, func(l_resolveCmnd) + + response_append, func(l_respAppend) + web_send, func(l_webSend) + web_send_decimal, func(l_webSendDecimal) + + get_power, func(l_getpower) + set_power, func(l_setpower) + get_switch, func(l_getswitch) + + i2c_enabled, func(l_i2cenabled) + + cmd, closure(Tasmota_cmd_closure) + chars_in_string, closure(Tasmota_chars_in_string_closure) + find_key_i, closure(Tasmota_find_key_i_closure) + find_op, closure(Tasmota_find_op_closure) + add_rule, closure(Tasmota_add_rule_closure) + remove_rule, closure(Tasmota_remove_rule_closure) + try_rule, closure(Tasmota_try_rule_closure) + exec_rules, closure(Tasmota_exec_rules_closure) + exec_tele, closure(Tasmota_exec_tele_closure) + set_timer, closure(Tasmota_set_timer_closure) + run_deferred, closure(Tasmota_run_deferred_closure) + remove_timer, closure(Tasmota_remove_timer_closure) + add_cmd, closure(Tasmota_add_cmd_closure) + remove_cmd, closure(Tasmota_remove_cmd_closure) + exec_cmd, closure(Tasmota_exec_cmd_closure) + gc, closure(Tasmota_gc_closure) + event, closure(Tasmota_event_closure) + add_driver, closure(Tasmota_add_driver_closure) + remove_driver, closure(Tasmota_remove_driver_closure) + load, closure(Tasmota_load_closure) + wire_scan, closure(Tasmota_wire_scan_closure) + time_str, closure(Tasmota_time_str_closure) + + hs2rgb, closure(Tasmota_hs2rgb_closure) + + gen_cb, closure(Tasmota_gen_cb_closure) + + get_light, closure(Tasmota_get_light_closure) + set_light, closure(Tasmota_set_light_closure) +} +@const_object_info_end */ diff --git a/lib/libesp32/berry/default/be_tcpclient_lib.c b/lib/libesp32/berry/default/be_tcpclient_lib.c new file mode 100644 index 000000000..b39db458e --- /dev/null +++ b/lib/libesp32/berry/default/be_tcpclient_lib.c @@ -0,0 +1,48 @@ +/******************************************************************** + * Webclient mapped to Arduino framework + * + * To use: `d = webclient()` + * + *******************************************************************/ +#include "be_constobj.h" + +#ifdef USE_WEBCLIENT + +extern int wc_tcp_init(bvm *vm); +extern int wc_tcp_deinit(bvm *vm); + +extern int wc_tcp_connect(bvm *vm); +extern int wc_tcp_connected(bvm *vm); +extern int wc_tcp_close(bvm *vm); +extern int wc_tcp_available(bvm *vm); + +extern int wc_tcp_write(bvm *vm); +extern int wc_tcp_read(bvm *vm); +extern int wc_tcp_readbytes(bvm *vm); + +#include "../generate/be_fixed_be_class_tcpclient.h" + +void be_load_tcpclient_lib(bvm *vm) { + be_pushntvclass(vm, &be_class_tcpclient); + be_setglobal(vm, "tcpclient"); + be_pop(vm, 1); +} +/* @const_object_info_begin + +class be_class_tcpclient (scope: global, name: tcpclient) { + .w, var + init, func(wc_tcp_init) + deinit, func(wc_tcp_deinit) + + connect, func(wc_tcp_connect) + connected, func(wc_tcp_connected) + close, func(wc_tcp_close) + available, func(wc_tcp_available) + + write, func(wc_tcp_write) + read, func(wc_tcp_read) + readbytes, func(wc_tcp_readbytes) +} +@const_object_info_end */ + +#endif // USE_WEBCLIENT diff --git a/lib/libesp32/berry/default/be_timer_class.c b/lib/libesp32/berry/default/be_timer_class.c new file mode 100644 index 000000000..6664e408e --- /dev/null +++ b/lib/libesp32/berry/default/be_timer_class.c @@ -0,0 +1,110 @@ +/******************************************************************** + * Tasmota lib + * + * class Timer + *******************************************************************/ +#include "be_constobj.h" + +/******************************************************************** +** Solidified function: tostring +********************************************************************/ +be_local_closure(Timer_tostring, /* name */ + be_nested_proto( + 10, /* nstack */ + 1, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 6]) { /* constants */ + /* K0 */ be_nested_str(string), + /* K1 */ be_nested_str(format), + /* K2 */ be_nested_str(_X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29), + /* K3 */ be_nested_str(due), + /* K4 */ be_nested_str(f), + /* K5 */ be_nested_str(id), + }), + &be_const_str_tostring, + &be_const_str_solidified, + ( &(const binstruction[19]) { /* code */ + 0xA4060000, // 0000 IMPORT R1 K0 + 0x8C080301, // 0001 GETMET R2 R1 K1 + 0x58100002, // 0002 LDCONST R4 K2 + 0x60140008, // 0003 GETGBL R5 G8 + 0x60180006, // 0004 GETGBL R6 G6 + 0x5C1C0000, // 0005 MOVE R7 R0 + 0x7C180200, // 0006 CALL R6 1 + 0x7C140200, // 0007 CALL R5 1 + 0x60180008, // 0008 GETGBL R6 G8 + 0x881C0103, // 0009 GETMBR R7 R0 K3 + 0x7C180200, // 000A CALL R6 1 + 0x601C0008, // 000B GETGBL R7 G8 + 0x88200104, // 000C GETMBR R8 R0 K4 + 0x7C1C0200, // 000D CALL R7 1 + 0x60200008, // 000E GETGBL R8 G8 + 0x88240105, // 000F GETMBR R9 R0 K5 + 0x7C200200, // 0010 CALL R8 1 + 0x7C080C00, // 0011 CALL R2 6 + 0x80040400, // 0012 RET 1 R2 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: init +********************************************************************/ +be_local_closure(Timer_init, /* name */ + be_nested_proto( + 4, /* nstack */ + 4, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(due), + /* K1 */ be_nested_str(f), + /* K2 */ be_nested_str(id), + }), + &be_const_str_init, + &be_const_str_solidified, + ( &(const binstruction[ 4]) { /* code */ + 0x90020001, // 0000 SETMBR R0 K0 R1 + 0x90020202, // 0001 SETMBR R0 K1 R2 + 0x90020403, // 0002 SETMBR R0 K2 R3 + 0x80000000, // 0003 RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified class: Timer +********************************************************************/ +be_local_class(Timer, + 3, + NULL, + be_nested_map(5, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(tostring, 4), be_const_closure(Timer_tostring_closure) }, + { be_const_key(id, 2), be_const_var(2) }, + { be_const_key(f, -1), be_const_var(1) }, + { be_const_key(due, -1), be_const_var(0) }, + { be_const_key(init, -1), be_const_closure(Timer_init_closure) }, + })), + be_str_literal("Timer") +); +/*******************************************************************/ + +void be_load_Timer_class(bvm *vm) { + be_pushntvclass(vm, &be_class_Timer); + be_setglobal(vm, "Timer"); + be_pop(vm, 1); +} diff --git a/lib/libesp32/berry/default/be_unishox_lib.c b/lib/libesp32/berry/default/be_unishox_lib.c new file mode 100644 index 000000000..971f4c9e0 --- /dev/null +++ b/lib/libesp32/berry/default/be_unishox_lib.c @@ -0,0 +1,28 @@ +/******************************************************************** + * Berry module `unishox` + * + * To use: `import unishox` + * + * Allows to respond to HTTP request + *******************************************************************/ +#include "be_constobj.h" + +#ifdef USE_UNISHOX_COMPRESSION + +extern int be_ntv_unishox_decompress(bvm *vm); +extern int be_ntv_unishox_compress(bvm *vm); + +/******************************************************************** +** Solidified module: unishox +********************************************************************/ +be_local_module(unishox, + "unishox", + be_nested_map(2, + ( (struct bmapnode*) &(const bmapnode[]) { + { be_const_key(decompress, -1), be_const_func(be_ntv_unishox_decompress) }, + { be_const_key(compress, -1), be_const_func(be_ntv_unishox_compress) }, + })) +); +BE_EXPORT_VARIABLE be_define_const_native_module(unishox); + +#endif // USE_UNISHOX_COMPRESSION diff --git a/lib/libesp32/berry/default/be_webclient_lib.c b/lib/libesp32/berry/default/be_webclient_lib.c new file mode 100644 index 000000000..0e4b66e90 --- /dev/null +++ b/lib/libesp32/berry/default/be_webclient_lib.c @@ -0,0 +1,57 @@ +/******************************************************************** + * Webclient mapped to Arduino framework + * + * To use: `d = webclient()` + * + *******************************************************************/ +#include "be_constobj.h" + +#ifdef USE_WEBCLIENT + +extern int wc_init(bvm *vm); +extern int wc_deinit(bvm *vm); +extern int wc_urlencode(bvm *vm); +extern int wc_begin(bvm *vm); +extern int wc_set_timeouts(bvm *vm); +extern int wc_set_useragent(bvm *vm); +extern int wc_set_auth(bvm *vm); +extern int wc_connected(bvm *vm); +extern int wc_close(bvm *vm); +extern int wc_addheader(bvm *vm); +extern int wc_GET(bvm *vm); +extern int wc_POST(bvm *vm); +extern int wc_getstring(bvm *vm); +extern int wc_writefile(bvm *vm); +extern int wc_getsize(bvm *vm); + +#include "../generate/be_fixed_be_class_webclient.h" + +void be_load_webclient_lib(bvm *vm) { + be_pushntvclass(vm, &be_class_webclient); + be_setglobal(vm, "webclient"); + be_pop(vm, 1); +} +/* @const_object_info_begin + +class be_class_webclient (scope: global, name: webclient) { + .p, var + .w, var + init, func(wc_init) + deinit, func(wc_deinit) + url_encode, func(wc_urlencode) + + begin, func(wc_begin) + set_timeouts, func(wc_set_timeouts) + set_useragent, func(wc_set_useragent) + set_auth, func(wc_set_auth) + close, func(wc_close) + add_header, func(wc_addheader) + GET, func(wc_GET) + POST, func(wc_POST) + get_string, func(wc_getstring) + write_file, func(wc_writefile) + get_size, func(wc_getsize) +} +@const_object_info_end */ + +#endif // USE_WEBCLIENT diff --git a/lib/libesp32/berry/default/be_webserver_lib.c b/lib/libesp32/berry/default/be_webserver_lib.c new file mode 100644 index 000000000..0f3e45d05 --- /dev/null +++ b/lib/libesp32/berry/default/be_webserver_lib.c @@ -0,0 +1,55 @@ +/******************************************************************** + * Berry module `webserver` + * + * To use: `import webserver` + * + * Allows to respond to HTTP request + *******************************************************************/ +#include "be_constobj.h" + +#ifdef USE_WEBSERVER + +extern int w_webserver_member(bvm *vm); +extern int w_webserver_on(bvm *vm); +extern int w_webserver_state(bvm *vm); + +extern int w_webserver_check_privileged_access(bvm *vm); +extern int w_webserver_redirect(bvm *vm); +extern int w_webserver_content_start(bvm *vm); +extern int w_webserver_content_send(bvm *vm); +extern int w_webserver_content_send_style(bvm *vm); +extern int w_webserver_content_flush(bvm *vm); +extern int w_webserver_content_stop(bvm *vm); +extern int w_webserver_content_button(bvm *vm); + +extern int w_webserver_argsize(bvm *vm); +extern int w_webserver_arg(bvm *vm); +extern int w_webserver_arg_name(bvm *vm); +extern int w_webserver_has_arg(bvm *vm); + + +/* @const_object_info_begin +module webserver (scope: global) { + member, func(w_webserver_member) + + on, func(w_webserver_on) + state, func(w_webserver_state) + + check_privileged_access, func(w_webserver_check_privileged_access) + redirect, func(w_webserver_redirect) + content_send, func(w_webserver_content_send) + content_send_style, func(w_webserver_content_send_style) + content_flush, func(w_webserver_content_flush) + content_start, func(w_webserver_content_start) + content_stop, func(w_webserver_content_stop) + content_button, func(w_webserver_content_button) + + arg_size, func(w_webserver_argsize) + arg, func(w_webserver_arg) + arg_name, func(w_webserver_arg_name) + has_arg, func(w_webserver_has_arg) +} +@const_object_info_end */ +#include "../generate/be_fixed_webserver.h" + +#endif // USE_WEBSERVER diff --git a/lib/libesp32/berry/default/be_wirelib.c b/lib/libesp32/berry/default/be_wirelib.c new file mode 100644 index 000000000..38f345553 --- /dev/null +++ b/lib/libesp32/berry/default/be_wirelib.c @@ -0,0 +1,151 @@ +/******************************************************************** + * Tasmota lib + * + * To use: `import wire` + * + * 2 wire communication - I2C + *******************************************************************/ +#include "be_constobj.h" + +#ifdef USE_I2C + +extern int b_wire_init(bvm *vm); + +extern int b_wire_begintransmission(bvm *vm); +extern int b_wire_endtransmission(bvm *vm); +extern int b_wire_requestfrom(bvm *vm); +extern int b_wire_available(bvm *vm); +extern int b_wire_write(bvm *vm); +extern int b_wire_read(bvm *vm); + +extern int b_wire_scan(bvm *vm); + +extern int b_wire_validwrite(bvm *vm); +extern int b_wire_validread(bvm *vm); +extern int b_wire_detect(bvm *vm); +extern int b_wire_enabled(bvm *vm); + +/******************************************************************** +** Solidified function: write_bytes +********************************************************************/ +be_local_closure(write_bytes, /* name */ + be_nested_proto( + 7, /* nstack */ + 4, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 3]) { /* constants */ + /* K0 */ be_nested_str(_begin_transmission), + /* K1 */ be_nested_str(_write), + /* K2 */ be_nested_str(_end_transmission), + }), + &be_const_str_write_bytes, + &be_const_str_solidified, + ( &(const binstruction[12]) { /* code */ + 0x8C100100, // 0000 GETMET R4 R0 K0 + 0x5C180200, // 0001 MOVE R6 R1 + 0x7C100400, // 0002 CALL R4 2 + 0x8C100101, // 0003 GETMET R4 R0 K1 + 0x5C180400, // 0004 MOVE R6 R2 + 0x7C100400, // 0005 CALL R4 2 + 0x8C100101, // 0006 GETMET R4 R0 K1 + 0x5C180600, // 0007 MOVE R6 R3 + 0x7C100400, // 0008 CALL R4 2 + 0x8C100102, // 0009 GETMET R4 R0 K2 + 0x7C100200, // 000A CALL R4 1 + 0x80000000, // 000B RET 0 + }) + ) +); +/*******************************************************************/ + + +/******************************************************************** +** Solidified function: read_bytes +********************************************************************/ +be_local_closure(read_bytes, /* name */ + be_nested_proto( + 8, /* nstack */ + 4, /* argc */ + 0, /* varg */ + 0, /* has upvals */ + NULL, /* no upvals */ + 0, /* has sup protos */ + NULL, /* no sub protos */ + 1, /* has constants */ + ( &(const bvalue[ 6]) { /* constants */ + /* K0 */ be_nested_str(_begin_transmission), + /* K1 */ be_nested_str(_write), + /* K2 */ be_nested_str(_end_transmission), + /* K3 */ be_nested_str(_request_from), + /* K4 */ be_nested_str(_available), + /* K5 */ be_nested_str(_read), + }), + &be_const_str_read_bytes, + &be_const_str_solidified, + ( &(const binstruction[24]) { /* code */ + 0x8C100100, // 0000 GETMET R4 R0 K0 + 0x5C180200, // 0001 MOVE R6 R1 + 0x7C100400, // 0002 CALL R4 2 + 0x8C100101, // 0003 GETMET R4 R0 K1 + 0x5C180400, // 0004 MOVE R6 R2 + 0x7C100400, // 0005 CALL R4 2 + 0x8C100102, // 0006 GETMET R4 R0 K2 + 0x50180000, // 0007 LDBOOL R6 0 0 + 0x7C100400, // 0008 CALL R4 2 + 0x8C100103, // 0009 GETMET R4 R0 K3 + 0x5C180200, // 000A MOVE R6 R1 + 0x5C1C0600, // 000B MOVE R7 R3 + 0x7C100600, // 000C CALL R4 3 + 0x60100015, // 000D GETGBL R4 G21 + 0x5C140600, // 000E MOVE R5 R3 + 0x7C100200, // 000F CALL R4 1 + 0x8C140104, // 0010 GETMET R5 R0 K4 + 0x7C140200, // 0011 CALL R5 1 + 0x78160003, // 0012 JMPF R5 #0017 + 0x8C140105, // 0013 GETMET R5 R0 K5 + 0x7C140200, // 0014 CALL R5 1 + 0x40140805, // 0015 CONNECT R5 R4 R5 + 0x7001FFF8, // 0016 JMP #0010 + 0x80040800, // 0017 RET 1 R4 + }) + ) +); +/*******************************************************************/ + + +#include "../generate/be_fixed_be_class_tasmota_wire.h" + +void be_load_wirelib(bvm *vm) { + be_pushntvclass(vm, &be_class_tasmota_wire); + be_setglobal(vm, "Wire"); + be_pop(vm, 1); +} +/* @const_object_info_begin + +class be_class_tasmota_wire (scope: global, name: Wire) { + bus, var + + init, func(b_wire_init) + _begin_transmission, func(b_wire_begintransmission) + _end_transmission, func(b_wire_endtransmission) + _request_from, func(b_wire_requestfrom) + _available, func(b_wire_available) + _write, func(b_wire_write) + _read, func(b_wire_read) + scan, func(b_wire_scan) + write, func(b_wire_validwrite) + read, func(b_wire_validread) + detect, func(b_wire_detect) + enabled, func(b_wire_enabled) + + read_bytes, closure(read_bytes_closure) + write_bytes, closure(write_bytes_closure) +} +@const_object_info_end */ + +#endif // USE_I2C \ No newline at end of file diff --git a/lib/libesp32/berry/default/berry_conf.h b/lib/libesp32/berry/default/berry_conf.h new file mode 100644 index 000000000..607a9c612 --- /dev/null +++ b/lib/libesp32/berry/default/berry_conf.h @@ -0,0 +1,247 @@ +/******************************************************************** +** Copyright (c) 2018-2020 Guan Wenliang +** This file is part of the Berry default interpreter. +** skiars@qq.com, https://github.com/Skiars/berry +** See Copyright Notice in the LICENSE file or at +** https://github.com/Skiars/berry/blob/master/LICENSE +********************************************************************/ +#ifndef BERRY_CONF_H +#define BERRY_CONF_H + +#include + +#ifdef COMPILE_BERRY_LIB + #include "my_user_config.h" + #include "tasmota_configurations.h" +#endif + +/* Macro: BE_DEBUG + * Berry interpreter debug switch. + * Default: 0 + **/ +#ifndef BE_DEBUG +#define BE_DEBUG 0 +#endif + +/* Macro: BE_LONGLONG_INT + * Select integer length. + * If the value is 0, use an integer of type int, use a long + * integer type when the value is 1, and use a long long integer + * type when the value is 2. + * Default: 2 + */ +#define BE_INTGER_TYPE 1 // use long int = uint32_t + +/* Macro: BE_USE_SINGLE_FLOAT + * Select floating point precision. + * Use double-precision floating-point numbers when the value + * is 0 (default), otherwise use single-precision floating-point + * numbers. + * Default: 0 + **/ +#define BE_USE_SINGLE_FLOAT 1 // use `float` not `double` + +/* Macro: BE_USE_PRECOMPILED_OBJECT + * Use precompiled objects to avoid creating these objects at + * runtime. Enable this macro can greatly optimize RAM usage. + * Default: 1 + **/ +#define BE_USE_PRECOMPILED_OBJECT 1 + +/* Macro: BE_DEBUG_RUNTIME_INFO + * Set runtime error debugging information. + * 0: unable to output source file and line number at runtime. + * 1: output source file and line number information at runtime. + * 2: the information use uint16_t type (save space). + * Default: 1 + **/ +#define BE_DEBUG_RUNTIME_INFO 0 + +/* Macro: BE_DEBUG_VAR_INFO + * Set variable debugging tracking information. + * 0: disable variable debugging tracking information at runtime. + * 1: enable variable debugging tracking information at runtime. + * Default: 1 + **/ +#define BE_DEBUG_VAR_INFO 0 + +/* Macro: BE_USE_PERF_COUNTERS + * Use the obshook function to report low-level actions. + * Default: 0 + **/ +#define BE_USE_PERF_COUNTERS 1 + +/* Macro: BE_VM_OBSERVABILITY_SAMPLING + * If BE_USE_PERF_COUNTERS == 1 + * then the observability hook is called regularly in the VM loop + * allowing to stop infinite loops or too-long running code. + * The value is a power of 2. + * Default: 20 - which translates to 2^20 or ~1 million instructions + **/ +#define BE_VM_OBSERVABILITY_SAMPLING 20 + +/* Macro: BE_STACK_TOTAL_MAX + * Set the maximum total stack size. + * Default: 20000 + **/ +#define BE_STACK_TOTAL_MAX 8000 + +/* Macro: BE_STACK_FREE_MIN + * Set the minimum free count of the stack. The stack idles will + * be checked when a function is called, and the stack will be + * expanded if the number of free is less than BE_STACK_FREE_MIN. + * Default: 10 + **/ +#define BE_STACK_FREE_MIN 20 + +/* Macro: BE_STACK_START + * Set the starting size of the stack at VM creation. + * Default: 50 + **/ +#define BE_STACK_START 100 + +/* Macro: BE_CONST_SEARCH_SIZE + * Constants in function are limited to 255. However the compiler + * will look for a maximum of pre-existing constants to avoid + * performance degradation. This may cause the number of constants + * to be higher than required. + * Increase is you need to solidify functions. + * Default: 50 + **/ +#define BE_CONST_SEARCH_SIZE 150 + +/* Macro: BE_STACK_FREE_MIN + * The short string will hold the hash value when the value is + * true. It may be faster but requires more RAM. + * Default: 0 + **/ +#define BE_USE_STR_HASH_CACHE 0 + +/* Macro: BE_USE_FILE_SYSTEM + * The file system interface will be used when this macro is true + * or when using the OS module. Otherwise the file system interface + * will not be used. + * Default: 0 + **/ +#define BE_USE_FILE_SYSTEM 0 + +/* Macro: BE_USE_SCRIPT_COMPILER + * Enable compiler when BE_USE_SCRIPT_COMPILER is not 0, otherwise + * disable the compiler. + * Default: 1 + **/ +#define BE_USE_SCRIPT_COMPILER 1 + +/* Macro: BE_USE_BYTECODE_SAVER + * Enable save bytecode to file when BE_USE_BYTECODE_SAVER is not 0, + * otherwise disable the feature. + * Default: 1 + **/ +#define BE_USE_BYTECODE_SAVER 1 + +/* Macro: BE_USE_BYTECODE_LOADER + * Enable load bytecode from file when BE_USE_BYTECODE_LOADER is not 0, + * otherwise disable the feature. + * Default: 1 + **/ +#define BE_USE_BYTECODE_LOADER 1 + +/* Macro: BE_USE_SHARED_LIB + * Enable shared library when BE_USE_SHARED_LIB is not 0, + * otherwise disable the feature. + * Default: 1 + **/ +#define BE_USE_SHARED_LIB 0 + +/* Macro: BE_USE_OVERLOAD_HASH + * Allows instances to overload hash methods for use in the + * built-in Map class. Disable this feature to crop the code + * size. + * Default: 1 + **/ +#define BE_USE_OVERLOAD_HASH 1 + +/* Macro: BE_USE_DEBUG_HOOK + * Berry debug hook switch. + * Default: 0 + **/ +#define BE_USE_DEBUG_HOOK 0 + +/* Macro: BE_USE_DEBUG_GC + * Enable GC debug mode. This causes an actual gc after each + * allocation. It's much slower and should not be used + * in production code. + * Default: 0 + **/ +#define BE_USE_DEBUG_GC 0 + +/* Macro: BE_USE_XXX_MODULE + * These macros control whether the related module is compiled. + * When they are true, they will enable related modules. At this + * point you can use the import statement to import the module. + * They will not compile related modules when they are false. + **/ +#define BE_USE_STRING_MODULE 1 +#define BE_USE_JSON_MODULE 1 +#define BE_USE_MATH_MODULE 1 +#define BE_USE_TIME_MODULE 0 +#define BE_USE_OS_MODULE 0 +#define BE_USE_GLOBAL_MODULE 1 +#define BE_USE_SYS_MODULE 1 +#define BE_USE_DEBUG_MODULE 0 +#define BE_USE_GC_MODULE 1 +#define BE_USE_SOLIDIFY_MODULE 0 +#define BE_USE_INTROSPECT_MODULE 1 +#define BE_USE_STRICT_MODULE 1 + +#ifdef USE_BERRY_DEBUG + #undef BE_USE_DEBUG_MODULE + #undef BE_USE_SOLIDIFY_MODULE + #define BE_USE_DEBUG_MODULE 1 + #define BE_USE_SOLIDIFY_MODULE 1 +#endif // USE_BERRY_DEBUG + +/* Macro: BE_EXPLICIT_XXX + * If these macros are defined, the corresponding function will + * use the version defined by these macros. These macro definitions + * are not required. + * The default is to use the functions in the standard library. + **/ +#ifdef USE_BERRY_PSRAM +#ifdef __cplusplus +extern "C" { +#endif + extern void *berry_malloc(size_t size); + extern void berry_free(void *ptr); + extern void *berry_realloc(void *ptr, size_t size); +#ifdef __cplusplus +} +#endif + #define BE_EXPLICIT_MALLOC berry_malloc + #define BE_EXPLICIT_FREE berry_free + #define BE_EXPLICIT_REALLOC berry_realloc +#else + #define BE_EXPLICIT_MALLOC malloc + #define BE_EXPLICIT_FREE free + #define BE_EXPLICIT_REALLOC realloc +#endif // USE_BERRY_PSRAM + +#define BE_EXPLICIT_ABORT abort +#define BE_EXPLICIT_EXIT exit +// #define BE_EXPLICIT_MALLOC malloc +// #define BE_EXPLICIT_FREE free +// #define BE_EXPLICIT_REALLOC realloc + +/* Macro: be_assert + * Berry debug assertion. Only enabled when BE_DEBUG is active. + * Default: use the assert() function of the standard library. + **/ +#define be_assert(expr) assert(expr) + +/* Tasmota debug specific */ +#ifdef USE_BERRY_DEBUG + #undef BE_DEBUG_RUNTIME_INFO + #define BE_DEBUG_RUNTIME_INFO 2 /* record line information in 16 bits */ +#endif // USE_BERRY_DEBUG + +#endif diff --git a/lib/libesp32/berry/default/embedded/Animate.be b/lib/libesp32/berry/default/embedded/Animate.be new file mode 100644 index 000000000..279fd39ed --- /dev/null +++ b/lib/libesp32/berry/default/embedded/Animate.be @@ -0,0 +1,189 @@ +# +# class Animate +# +# Animation framework +# + +animate = module("animate") + +# state-machine: from val a to b +class Animate_ins_ramp + var a # starting value + var b # end value + var duration # duration in milliseconds + + def init(a,b,duration) + self.a = a + self.b = b + self.duration = duration + end +end +animate.ins_ramp = Animate_ins_ramp + +# state-machine: pause and goto +class Animate_ins_goto + var pc_rel # relative PC, -1 previous instruction, 1 next instruction, 0 means see pc_abs + var pc_abs # absolute PC, only if pc_rel == 0, address if next instruction + var duration # pause in milliseconds before goto, -1 means infinite (state-machine can be changed externally) + + def init(pc_rel, pc_abs, duration) + self.pc_rel = pc_rel + self.pc_abs = pc_abs + self.duration = duration + end +end +animate.ins_goto = Animate_ins_goto + +class Animate_engine + var code # array of state-machine instructions + var closure # closure to call with the new value + var pc # program-counter + var ins_time # absolute time when the current instruction started + var running # is the animation running? allows fast return + var value # current value + + def init() + self.code = [] + self.pc = 0 # start at instruction 0 + self.ins_time = 0 + self.running = false # not running by default + # + end + + # run but needs external calls to `animate()` + # cur_time:int (opt) current timestamp in ms, defaults to `tasmota.millis()` + # val:int (opt) starting value, default to `nil` + def run(cur_time, val) + if cur_time == nil cur_time = tasmota.millis() end + if (val != nil) self.value = val end + self.ins_time = cur_time + + self.running = true + tasmota.add_driver(self) + end + + # runs autonomously in the Tasmota event loop + def autorun(cur_time, val) + self.run(cur_time, val) + tasmota.add_driver(self) + end + + def stop() + self.running = false + tasmota.remove_driver(self) + end + + def is_running() + return self.running + end + + def every_50ms() + self.animate() + end + + def animate(cur_time) # time in milliseconds, optional, defaults to `tasmota.millis()` + if !self.running return end + if cur_time == nil cur_time = tasmota.millis() end + # run through instructions + while true + var sub_index = cur_time - self.ins_time # time since the beginning of current instruction + # + # make sure PC is valid + if self.pc >= size(self.code) + self.running = false + break + end + # + if self.pc < 0 raise "internal_error", "Animate pc is out of range" end + var ins = self.code[self.pc] + + # Instruction Ramp + if isinstance(ins, animate.ins_ramp) + var f = self.closure # assign to a local variable to not call a method + if sub_index < ins.duration + # we're still in the ramp + self.value = tasmota.scale_uint(sub_index, 0, ins.duration, ins.a, ins.b) + # call closure + if f f(self.value) end # call closure, need try? TODO + break + else + self.value = ins.b + if f f(self.value) end # set to last value + self.pc += 1 # next instruction + self.ins_time = cur_time - (sub_index - ins.duration) + end + + # Instruction Goto + elif isinstance(ins, animate.ins_goto) + if sub_index < ins.duration + break + else + if ins.pc_rel != 0 + self.pc += ins.pc_rel + else + self.pc = ins.pc_abs + end + self.ins_time = cur_time - (sub_index - ins.duration) + end + + # Invalid + else + raise "internal_error", "unknown instruction" + end + end + return self.value + + end +end +animate.engine = Animate_engine + +class Animate_from_to : Animate_engine + + def init(closure, from, to, duration) + super(self).init() + self.closure = closure + self.code.push(animate.ins_ramp(from, to, duration)) + end + +end +animate.from_to = Animate_from_to + +#- +a=Animate_from_to(nil, 0, 100, 5000) +a.autorun() +-# + +class Animate_rotate : Animate_engine + + def init(closure, from, to, duration) + super(self).init() + self.closure = closure + self.code.push(animate.ins_ramp(from, to, duration)) + self.code.push(animate.ins_goto(0, 0, 0)) # goto abs pc = 0 without any pause + end + +end +animate.rotate = Animate_rotate + +#- +a=Animate_rotate(nil, 0, 100, 5000) +a.autorun() +-# + +class Animate_back_forth : Animate_engine + + def init(closure, from, to, duration) + super(self).init() + self.closure = closure + self.code.push(animate.ins_ramp(from, to, duration / 2)) + self.code.push(animate.ins_ramp(to, from, duration / 2)) + self.code.push(animate.ins_goto(0, 0, 0)) # goto abs pc = 0 without any pause + end + +end +animate.back_forth = Animate_back_forth + +#- +a=Animate_back_forth(nil, 0, 100, 5000) +a.autorun() +-# diff --git a/lib/libesp32/berry/default/embedded/Driver.be b/lib/libesp32/berry/default/embedded/Driver.be new file mode 100644 index 000000000..d0782f024 --- /dev/null +++ b/lib/libesp32/berry/default/embedded/Driver.be @@ -0,0 +1,29 @@ +#- Native code used for testing and code solidification -# +#- Do not use it -# + +class Driver + var every_second + var every_100ms + var web_add_handler + var web_add_button + var web_add_main_button + var web_add_management_button + var web_add_config_button + var web_add_console_button + var save_before_restart + var web_sensor + var json_append + var button_pressed + var display + + def init() + end + + def get_tasmota() + return tasmota + end + + def add_cmd(c, f) + tasmota.add_cmd(c, / cmd, idx, payload, payload_json -> f(self, cmd, idx, payload, payload_json)) + end +end diff --git a/lib/libesp32/berry/default/embedded/Tasmota.be b/lib/libesp32/berry/default/embedded/Tasmota.be new file mode 100644 index 000000000..22752a47d --- /dev/null +++ b/lib/libesp32/berry/default/embedded/Tasmota.be @@ -0,0 +1,577 @@ +#- Native code used for testing and code solidification -# +#- Do not use it -# + +class Timer + var due, f, id + def init(due, f, id) + self.due = due + self.f = f + self.id = id + end + def tostring() + import string + return string.format(" closure + # Classs KV has two members k and v + def kv(k, v) + class KV + var k, v + def init(k,v) + self.k = k + self.v = v + end + end + + return KV(k, v) + end + + # add `chars_in_string(s:string,c:string) -> int`` + # looks for any char in c, and return the position of the first char + # or -1 if not found + # inv is optional and inverses the behavior, i.e. look for chars not in the list + def chars_in_string(s,c,inv) + var inverted = inv ? true : false + var i = 0 + while i < size(s) + # for i:0..size(s)-1 + var found = false + var j = 0 + while j < size(c) + # for j:0..size(c)-1 + if s[i] == c[j] found = true end + j += 1 + end + if inverted != found return i end + i += 1 + end + return -1 + end + + # find a key in map, case insensitive, return actual key or nil if not found + def find_key_i(m,keyi) + import string + var keyu = string.toupper(keyi) + if isinstance(m, map) + for k:m.keys() + if string.toupper(k)==keyu || keyi=='?' + return k + end + end + end + end + + + # split the item when there is an operator, returns a list of (left,op,right) + # ex: "Dimmer>50" -> ["Dimmer",tasmota_gt,"50"] + def find_op(item) + import string + var op_chars = '=<>!' + var pos = self.chars_in_string(item, op_chars) + if pos >= 0 + var op_split = string.split(item,pos) + var op_left = op_split[0] + var op_rest = op_split[1] + pos = self.chars_in_string(op_rest, op_chars, true) + if pos >= 0 + var op_split2 = string.split(op_rest,pos) + var op_middle = op_split2[0] + var op_right = op_split2[1] + return [op_left,op_middle,op_right] + end + end + return [item, nil, nil] + end + + # Rules + def add_rule(pat,f) + if !self._rules + self._rules=[] + end + if type(f) == 'function' + self._rules.push(self.kv(pat, f)) + else + raise 'value_error', 'the second argument is not a function' + end + end + + def remove_rule(pat) + if self._rules + var i = 0 + while i < size(self._rules) + if self._rules[i].k == pat + self._rules.remove(i) #- don't increment i since we removed the object -# + else + i += 1 + end + end + end + end + + # Rules trigger if match. return true if match, false if not + def try_rule(event, rule, f) + import string + var rl_list = self.find_op(rule) + var sub_event = event + var rl = string.split(rl_list[0],'#') + var i = 0 + while i < size(rl) + # for it:rl + var it = rl[i] + var found=self.find_key_i(sub_event,it) + if found == nil return false end + sub_event = sub_event[found] + i += 1 + end + var op=rl_list[1] + var op2=rl_list[2] + if op + if op=='==' + if str(sub_event) != str(op2) return false end + elif op=='!==' + if str(sub_event) == str(op2) return false end + elif op=='=' + if real(sub_event) != real(op2) return false end + elif op=='!=' + if real(sub_event) == real(op2) return false end + elif op=='>' + if real(sub_event) <= real(op2) return false end + elif op=='>=' + if real(sub_event) < real(op2) return false end + elif op=='<' + if real(sub_event) >= real(op2) return false end + elif op=='<=' + if real(sub_event) > real(op2) return false end + end + end + f(sub_event, rl_list[0], event) + return true + end + + # Run rules, i.e. check each individual rule + # Returns true if at least one rule matched, false if none + def exec_rules(ev_json) + if self._rules || self.cmd_res != nil # if there is a rule handler, or we record rule results + import json + var ev = json.load(ev_json) # returns nil if invalid JSON + var ret = false + if ev == nil + self.log('BRY: ERROR, bad json: '+ev_json, 3) + ev = ev_json # revert to string + end + # record the rule payload for tasmota.cmd() + if self.cmd_res != nil + self.cmd_res = ev + end + # try all rule handlers + if self._rules + var i = 0 + while i < size(self._rules) + var kv = self._rules[i] + ret = self.try_rule(ev,kv.k,kv.v) || ret #- call should be first to avoid evaluation shortcut if ret is already true -# + i += 1 + end + end + return ret + end + return false + end + + # Run tele rules + def exec_tele(ev_json) + if self._rules + import json + var ev = json.load(ev_json) # returns nil if invalid JSON + var ret = false + if ev == nil + self.log('BRY: ERROR, bad json: '+ev_json, 3) + ev = ev_json # revert to string + end + # insert tele prefix + ev = { "Tele": ev } + + var i = 0 + while i < size(self._rules) + var kv = self._rules[i] + ret = self.try_rule(ev,kv.k,kv.v) || ret #- call should be first to avoid evaluation shortcut -# + i += 1 + end + return ret + end + return false + end + + def set_timer(delay,f,id) + if !self._timers self._timers=[] end + self._timers.push(Timer(self.millis(delay),f,id)) + end + + # run every 50ms tick + def run_deferred() + if self._timers + var i=0 + while i wire1 or wire2 or nil + # scan for the first occurrence of the addr, starting with bus1 then bus2 + # optional: skip if index is disabled via I2CEnable + def wire_scan(addr,idx) + # skip if the I2C index is disabled + if idx != nil && !self.i2c_enabled(idx) return nil end + if self.wire1.enabled() && self.wire1.detect(addr) return self.wire1 end + if self.wire2.enabled() && self.wire2.detect(addr) return self.wire2 end + return nil + end + + def time_str(time) + import string + var tm = self.time_dump(time) + return string.format("%04d-%02d-%02dT%02d:%02d:%02d", tm['year'], tm['month'], tm['day'], tm['hour'], tm['min'], tm['sec']) + end + + def load(f) + # embedded functions + # puth_path: adds the current archive to sys.path + def push_path(p) + import sys + var path = sys.path() + if path.find(p) == nil # append only if it's not already there + path.push(p) + end + end + # pop_path: removes the path + def pop_path(p) + import sys + var path = sys.path() + var idx = path.find(p) + if idx != nil + path.remove(idx) + end + end + + import string + import path + + # fail if empty string + if size(f) == 0 return false end + # Ex: f = 'app.zip#autoexec' + + # add leading '/' if absent + if f[0] != '/' f = '/' + f end + # Ex: f = '/app.zip#autoexec' + + var f_items = string.split(f, '#') + var f_prefix = f_items[0] + var f_suffix = f_items[-1] # last token + var f_archive = size(f_items) > 1 # is the file in an archive + + # if no dot, add the default '.be' extension + if string.find(f_suffix, '.') < 0 # does the final file has a '.' + f += ".be" + f_suffix += ".be" + end + # Ex: f = '/app.zip#autoexec.be' + + # if the filename has no '.' append '.be' + var suffix_be = f_suffix[-3..-1] == '.be' + var suffix_bec = f_suffix[-4..-1] == '.bec' + # Ex: f = '/app.zip#autoexec.be', f_suffix = 'autoexec.be', suffix_be = true, suffix_bec = false + + # check that the file ends with '.be' of '.bec' + if !suffix_be && !suffix_bec + raise "io_error", "file extension is not '.be' or '.bec'" + end + + var f_time = path.last_modified(f_prefix) + + if suffix_bec + if f_time == nil return false end # file does not exist + # f is the right file, continue + else + var f_time_bc = path.last_modified(f + "c") # timestamp for bytecode + if f_time == nil && f_time_bc == nil return false end + if f_time_bc != nil && (f_time == nil || f_time_bc >= f_time) + # bytecode exists and is more recent than berry source, use bytecode + ##### temporarily disable loading from bec file + # f = f + "c" # use bytecode name + suffix_bec = true + end + end + + # recall the working directory + if f_archive + self.wd = f_prefix + "#" + push_path(self.wd) + else + self.wd = "" + end + + var c = compile(f, 'file') + # save the compiled bytecode + if !suffix_bec && !f_archive + try + self.save(f + 'c', c) + except .. as e + print(string.format('BRY: could not save compiled file %s (%s)',f+'c',e)) + end + end + # call the compiled code + c() + # call successfuls + + # remove path prefix + if f_archive + pop_path(f_prefix + "#") + end + + return true + end + + def event(event_type, cmd, idx, payload, raw) + import introspect + import string + if event_type=='every_50ms' self.run_deferred() end #- first run deferred events -# + + var done = false + if event_type=='cmd' return self.exec_cmd(cmd, idx, payload) + elif event_type=='tele' return self.exec_tele(payload) + elif event_type=='rule' return self.exec_rules(payload) + elif event_type=='gc' return self.gc() + elif self._drivers + var i = 0 + while i < size(self._drivers) + #for d:self._drivers + var d = self._drivers[i] + var f = introspect.get(d, event_type) # try to match a function or method with the same name + if type(f) == 'function' + try + done = f(d, cmd, idx, payload, raw) + if done break end + except .. as e,m + print(string.format("BRY: Exception> '%s' - %s", e, m)) + if self._debug_present + import debug + debug.traceback() + end + end + end + i += 1 + end + end + + # save persist + if event_type=='save_before_restart' + import persist + persist.save() + end + + return done + end + + def add_driver(d) + if self._drivers + self._drivers.push(d) + else + self._drivers = [d] + end + end + + def remove_driver(d) + if self._drivers + var idx = self._drivers.find(d) + if idx != nil + self._drivers.pop(idx) + end + end + end + + # cmd high-level function + def cmd(command) + self.cmd_res = true # signal buffer capture + + self._cmd(command) + + var ret = nil + if self.cmd_res != true # unchanged + ret = self.cmd_res + end + self.cmd_res = nil # clear buffer + + return ret + end + + # set_light and get_light deprecetaion + def get_light(l) + print('tasmota.get_light() is deprecated, use light.get()') + import light + if l != nil + return light.get(l) + else + return light.get() + end + end + def set_light(v,l) + print('tasmota.set_light() is deprecated, use light.set()') + import light + if l != nil + return light.set(v,l) + else + return light.set(v) + end + end + + #- generate a new C callback and record the associated Berry closure -# + def gen_cb(f) + # DEPRECATED + import cb + return cb.gen_cb(f) + end + + #- convert hue/sat to rgb -# + #- hue:int in range 0..359 -# + #- sat:int (optional) in range 0..255 -# + #- returns int: 0xRRGGBB -# + def hs2rgb(hue,sat) + if sat == nil sat = 255 end + var r = 255 # default to white + var b = 255 + var g = 255 + # we take brightness at 100%, brightness should be set separately + hue = hue % 360 # normalize to 0..359 + + if sat > 0 + var i = hue / 60 # quadrant 0..5 + var f = hue % 60 # 0..59 + var p = 255 - sat + var q = tasmota.scale_uint(f, 0, 60, 255, p) # 0..59 + var t = tasmota.scale_uint(f, 0, 60, p, 255) + + if i == 0 + # r = 255 + g = t + b = p + elif i == 1 + r = q + # g = 255 + b = p + elif i == 2 + r = p + #g = 255 + b = t + elif i == 3 + r = p + g = q + #b = 255 + elif i == 4 + r = t + g = p + #b = 255 + else + #r = 255 + g = p + b = q + end + end + + return (r << 16) | (g << 8) | b + end +end diff --git a/lib/libesp32/berry/default/embedded/Wire.be b/lib/libesp32/berry/default/embedded/Wire.be new file mode 100644 index 000000000..a5e28ddd8 --- /dev/null +++ b/lib/libesp32/berry/default/embedded/Wire.be @@ -0,0 +1,25 @@ +#- Native code used for testing and code solidification -# +#- Do not use it -# + +class Wire + var bus + + def read_bytes(addr,reg,size) + self._begin_transmission(addr) + self._write(reg) + self._end_transmission(false) + self._request_from(addr,size) + var ret=bytes(size) + while (self._available()) + ret..self._read() + end + return ret + end + + def write_bytes(addr,reg,b) + self._begin_transmission(addr) + self._write(reg) + self._write(b) + self._end_transmission() + end +end diff --git a/lib/libesp32/berry/default/embedded/autoconf.be b/lib/libesp32/berry/default/embedded/autoconf.be new file mode 100644 index 000000000..8489c7447 --- /dev/null +++ b/lib/libesp32/berry/default/embedded/autoconf.be @@ -0,0 +1,389 @@ +#- autocong module for Berry -# +#- -# +#- To solidify: -# +#- + # load only persis_module and persist_module.init + import autoconf + solidify.dump(autoconf_module) + # copy and paste into `be_autoconf_lib.c` +-# +#- + +# For external compile: + +display = module("display") +self = nil +tasmota = nil +def load() end + +-# + +var autoconf_module = module("autoconf") + +autoconf_module.init = def (m) + + class Autoconf + var _archive + var _error + + def init() + import path + import string + + var dir = path.listdir("/") + var entry + tasmota.add_driver(self) + + var i = 0 + while i < size(dir) + if string.find(dir[i], ".autoconf") > 0 # does the file contain '*.autoconf', >0 to skip `.autoconf` + if entry != nil + # we have multiple configuration files, not allowed + print(string.format("CFG: multiple autoconf files found, aborting ('%s' + '%s')", entry, dir[i])) + self._error = true + return nil + end + entry = dir[i] + end + i += 1 + end + + if entry == nil + tasmota.log("CFG: no '*.autoconf' file found", 2) + return nil + end + + self._archive = entry + end + + + # #################################################################################################### + # Manage first time marker + # #################################################################################################### + def is_first_time() + import path + return !path.exists("/.autoconf") + end + def set_first_time() + var f = open("/.autoconf", "w") + f.close() + end + def clear_first_time() + import path + path.remove("/.autoconf") + end + + # #################################################################################################### + # Delete all autoconfig files present + # #################################################################################################### + def delete_all_configs() + import path + import string + var dir = path.listdir("/") + + for d:dir + if string.find(d, ".autoconf") > 0 # does the file contain '*.autoconf' + path.remove(d) + end + end + end + + # #################################################################################################### + # Get current module + # contains the name of the archive without leading `/`, ex: `M5Stack_Fire.autoconf` + # or `nil` if none + # #################################################################################################### + def get_current_module_path() + return self._archive + end + def get_current_module_name() + return self._archive[0..-10] + end + + # #################################################################################################### + # Load templates from Github + # #################################################################################################### + def load_templates() + import string + import json + try + var url = string.format("https://raw.githubusercontent.com/tasmota/autoconf/main/%s_manifest.json", tasmota.arch()) + tasmota.log(string.format("CFG: loading '%s'", url), 3) + # load the template + var cl = webclient() + cl.begin(url) + var r = cl.GET() + if r != 200 + tasmota.log(string.format("CFG: return_code=%i", r), 2) + return nil + end + var s = cl.get_string() + cl.close() + # convert to json + var j = json.load(s) + tasmota.log(string.format("CFG: loaded '%s'", str(j)), 3) + + var t = j.find("files") + if isinstance(t, list) + return t + end + + return nil + except .. as e, m + tasmota.log(string.format("CFG: exception '%s' - '%s'", e, m), 2) + return nil + end + end + + # #################################################################################################### + # Init web handlers + # #################################################################################################### + # Displays a "Autocong" button on the configuration page + def web_add_config_button() + import webserver + webserver.content_send("

") + end + + + # This HTTP GET manager controls which web controls are displayed + def page_autoconf_mgr() + import webserver + import string + if !webserver.check_privileged_access() return nil end + + webserver.content_start('Auto-configuration') + webserver.content_send_style() + webserver.content_send("

 (This feature requires an internet connection)

") + + var cur_module = self.get_current_module_path() + var cur_module_display = cur_module ? string.tr(self.get_current_module_name(), "_", " ") : self._error ? "<Error: apply new or remove>" : "<None>" + + webserver.content_send("
") + webserver.content_send(string.format(" Current auto-configuration")) + webserver.content_send(string.format("

Current configuration:

%s

", cur_module_display)) + + if cur_module + # add button to reapply template + webserver.content_send("

") + webserver.content_send("") + webserver.content_send("

") + end + webserver.content_send("

") + + webserver.content_send("
") + webserver.content_send(string.format(" Select new auto-configuration")) + + webserver.content_send("

") + webserver.content_send("
") + webserver.content_send("

") + + webserver.content_send("") + # webserver.content_send(string.format("", ota_num)) + webserver.content_send("

") + + + webserver.content_send("

") + webserver.content_button(webserver.BUTTON_CONFIGURATION) + webserver.content_stop() + end + + # #################################################################################################### + # Web controller + # + # Applies the changes and restart + # #################################################################################################### + # This HTTP POST manager handles the submitted web form data + def page_autoconf_ctl() + import webserver + import string + import path + if !webserver.check_privileged_access() return nil end + + try + if webserver.has_arg("reapply") + tasmota.log("CFG: removing first time marker", 2); + # print("CFG: removing first time marker") + self.clear_first_time() + #- and force restart -# + webserver.redirect("/?rst=") + + elif webserver.has_arg("zip") + # remove any remaining autoconf file + tasmota.log("CFG: removing autoconf files", 2); + # print("CFG: removing autoconf files") + self.delete_all_configs() + + # get the name of the configuration file + var arch_name = webserver.arg("zip") + + if arch_name != "reset" + var url = string.format("https://raw.githubusercontent.com/tasmota/autoconf/main/%s/%s.autoconf", tasmota.arch(), arch_name) + tasmota.log(string.format("CFG: downloading '%s'", url), 2); + + var local_file = string.format("%s.autoconf", arch_name) + + # download file and write directly to file system + var cl = webclient() + cl.begin(url) + var r = cl.GET() + if r != 200 raise "connection_error", string.format("return code=%i", r) end + cl.write_file(local_file) + cl.close() + end + + # remove marker to reapply template + self.clear_first_time() + + #- and force restart -# + webserver.redirect("/?rst=") + else + raise "value_error", "Unknown command" + end + except .. as e, m + print(string.format("CFG: Exception> '%s' - %s", e, m)) + #- display error page -# + webserver.content_start("Parameter error") #- title of the web page -# + webserver.content_send_style() #- send standard Tasmota styles -# + + webserver.content_send(string.format("

Exception:
'%s'
%s

", e, m)) + + webserver.content_button(webserver.BUTTON_CONFIGURATION) #- button back to management page -# + webserver.content_stop() #- end of web page -# + end + end + + # Add HTTP POST and GET handlers + def web_add_handler() + import webserver + webserver.on('/ac', / -> self.page_autoconf_mgr(), webserver.HTTP_GET) + webserver.on('/ac', / -> self.page_autoconf_ctl(), webserver.HTTP_POST) + end + + + # reset the configuration information (but don't restart) + # i.e. remove any autoconf file + def reset() + import path + import string + + var dir = path.listdir("/") + var entry + + var i = 0 + while i < size(dir) + var fname = dir[i] + if string.find(fname, ".autoconf") > 0 # does the file contain '*.autoconf' + path.remove(fname) + print(string.format("CFG: removed file '%s'", fname)) + end + i += 1 + end + + self._archive = nil + self._error = nil + end + + # called by the synthetic event `preinit` + def preinit() + if self._archive == nil return end + # try to launch `preinit.be` + import path + + var fname = self._archive + '#preinit.be' + if path.exists(fname) + tasmota.log("CFG: loading "+fname, 3) + load(fname) + tasmota.log("CFG: loaded "+fname, 3) + end + end + + def run_bat(fname) # read a '*.bat' file and run each command + import string + var f + try + f = open(fname, "r") # open file in read-only mode, it is expected to exist + while true + var line = f.readline() # read each line, can contain a terminal '\n', empty if end of file + if size(line) == 0 break end # end of file + + if line[-1] == "\n" line = line[0..-2] end # remove any trailing '\n' + if size(line) > 0 + tasmota.cmd(line) # run the command + end + end + f.close() # close, we don't expect exception with read-only, could be added later though + except .. as e, m + print(string.format('CFG: could not run %s (%s - %s)', fname, e, m)) + f.close() + end + end + + # called by the synthetic event `autoexec` + def autoexec() + if self._archive == nil return end + # try to launch `preinit.be` + import path + + # Step 1. if first run, only apply `init.bat` + var fname = self._archive + '#init.bat' + if self.is_first_time() && path.exists(fname) + # create the '.autoconf' file to avoid running it again, even if it crashed + self.set_first_time() + + # if path.exists(fname) # we know it exists from initial test + self.run_bat(fname) + tasmota.log("CFG: 'init.bat' done, restarting", 2) + tasmota.cmd("Restart 1") + return # if init was run, force a restart anyways and don't run the remaining code + # end + end + + # Step 2. if 'display.ini' is present, launch Universal Display + fname = self._archive + '#display.ini' + if gpio.pin_used(gpio.OPTION_A, 2) && path.exists(fname) + if path.exists("display.ini") + tasmota.log("CFG: skipping 'display.ini' because already present in file-system", 2) + else + import display + var f = open(fname,"r") + var desc = f.read() + f.close() + display.start(desc) + end + end + + # Step 3. if 'autoexec.bat' is present, run it + fname = self._archive + '#autoexec.bat' + if path.exists(fname) + tasmota.log("CFG: running "+fname, 3) + self.run_bat(fname) + tasmota.log("CFG: ran "+fname, 3) + end + + # Step 4. if 'autoexec.be' is present, load it + fname = self._archive + '#autoexec.be' + if path.exists(fname) + tasmota.log("CFG: loading "+fname, 3) + load(fname) + tasmota.log("CFG: loaded "+fname, 3) + end + end + end + + return Autoconf() # return an instance of this class +end + +aa = autoconf_module.init(autoconf_module) +import webserver +webserver.on('/ac2', / -> aa.page_autoconf_mgr(), webserver.HTTP_GET) +return autoconf_module diff --git a/lib/libesp32/berry/default/embedded/i2c_axp192.be b/lib/libesp32/berry/default/embedded/i2c_axp192.be new file mode 100644 index 000000000..3d958334f --- /dev/null +++ b/lib/libesp32/berry/default/embedded/i2c_axp192.be @@ -0,0 +1,176 @@ +#------------------------------------------------------------- + - Generic driver for AXP192 - solidified + -------------------------------------------------------------# +class AXP192 : I2C_Driver + def init() + super(self, I2C_Driver).init("AXP192", 0x34) + end + + # Return True = Battery Exist + def battery_present() + if self.wire.read(self.addr, 0x01, 1) & 0x20 return true + else return false + end + end + + # Input Power Status ??? + def get_input_power_status() + return self.wire.read(self.addr, 0x00, 1) + end + + # Battery Charging Status + def get_battery_chargin_status() + return self.wire.read(self.addr, 0x01, 1) + end + + # AXP chip temperature in °C + def get_temp() + return self.read12(0x5E) * 0.1 - 144.7 + end + + def get_bat_power() + return self.read24(0x70) * 0.00055 + end + + def get_bat_voltage() + return self.read12(0x78) * 0.0011 + end + def get_bat_current() + return (self.read13(0x7A) - self.read13(0x7C)) * 0.5 + end + def get_bat_charge_current() + return self.read13(0x7A) * 0.5 + end + def get_aps_voltage() + return self.read12(0x7E) * 0.0014 + end + def get_vbus_voltage() + return self.read12(0x5A) * 0.0017 + end + def get_vbus_current() + return self.read12(0x5C) * 0.375 + end + + # set LDO voltage + # ldo: 2/3 + # voltage: (mV) 1800mV - 3300mV in 100mV steps + def set_ldo_voltage(ldo, voltage) + if voltage > 3300 voltage = 15 + else voltage = (voltage / 100) - 18 + end + + if ldo == 2 + self.write8(0x28, self.read8(0x28) & 0x0F | ((voltage & 0x0F) << 4)) + end + if ldo == 3 + self.write8(0x28, self.read8(0x28) & 0xF0 | (voltage & 0x0F)) + end + end + + # set DCDC enable, 1/2/3 + def set_dcdc_enable(dcdc, state) + if dcdc == 1 self.write_bit(0x12, 0, state) end + if dcdc == 2 self.write_bit(0x12, 4, state) end + if dcdc == 3 self.write_bit(0x12, 1, state) end + end + + # set LDO enable, 2/3 (LDO 1 is always on) + def set_ldo_enable(ldo, state) + if ldo == 2 self.write_bit(0x12, 2, state) end + if ldo == 3 self.write_bit(0x12, 3, state) end + end + + # set GPIO output state 0/1/2 and 3/4 + def write_gpio(gpio, state) + if gpio >= 0 && gpio <= 2 + self.write_bit(0x94, gpio, state) + elif gpio >= 3 && gpio <= 4 + self.write_bit(0x96, gpio - 3, state) + end + end + + # Set voltage on DC-DC1/2/3 + # dcdc: 1/2/3 (warning some C libs start at 0) + # voltage: + def set_dc_voltage(dcdc, voltage) + if dcdc < 1 || dcdc > 3 return end + var v + if voltage < 700 v = 0 + elif voltage > 3500 v = 112 + elif dcdc == 2 && voltage > 2275 v = 63 # dcdc2 is limited to 2.275V + else v = (voltage - 700) / 25 + end + + var addr = 0x26 + if dcdc == 3 addr = 0x27 + elif dcdc == 2 addr = 0x23 + end + + self.write8(addr, self.read8(addr) & 0x80 | (v & 0x7F)) + end + + # Set charging current + # 100mA = 0 + # 190mA = 1 + # 280mA = 2 + # 360mA = 3 + # 450mA = 4 + # 550mA = 5 + # 630mA = 6 + # 700mA = 7 + # 780mA = 8 + # 880mA = 9 + # 960mA = 10 + # 1000mA = 11 + # 1080mA = 12 + # 1160mA = 13 + # 1240mA = 14 + # 1320mA = 15 + def set_chg_current(current_code) + self.write8(0x33, self.read8(0x33) & 0xF0 | (current_code & 0x0F)) + end + + # // Low Volt Level 1, when APS Volt Output < 3.4496 V + # // Low Volt Level 2, when APS Volt Output < 3.3992 V, then this flag is SET (0x01) + # // Flag will reset once battery volt is charged above Low Volt Level 1 + # // Note: now AXP192 have the Shutdown Voltage of 3.0V (B100) Def in REG 31H + def get_warning_level() + return self.read12(0x47) & 1 + end + + #- trigger a read every second -# + # def every_second() + # if !self.wire return nil end #- exit if not initialized -# + # end + + #- display sensor value in the web UI -# + def web_sensor() + if !self.wire return nil end #- exit if not initialized -# + import string + var msg = string.format( + "{s}VBus Voltage{m}%.3f V{e}".. + "{s}VBus Current{m}%.1f mA{e}".. + "{s}Batt Voltage{m}%.3f V{e}".. + "{s}Batt Current{m}%.1f mA{e}".. + #"{s}Batt Power{m}%.3f{e}".. + "{s}Temp AXP{m}%.1f °C{e}", + self.get_vbus_voltage(), self.get_vbus_voltage(), + self.get_bat_voltage(), self.get_bat_current(), + #self.get_bat_power(), + self.get_temp() + ) + tasmota.web_send_decimal(msg) + end + + #- add sensor value to teleperiod -# + def json_append() + if !self.wire return nil end #- exit if not initialized -# + # import string + # var ax = int(self.accel[0] * 1000) + # var ay = int(self.accel[1] * 1000) + # var az = int(self.accel[2] * 1000) + # var msg = string.format(",\"MPU6886\":{\"AX\":%i,\"AY\":%i,\"AZ\":%i,\"GX\":%i,\"GY\":%i,\"GZ\":%i}", + # ax, ay, az, self.gyro[0], self.gyro[1], self.gyro[2]) + # tasmota.response_append(msg) + end +end diff --git a/lib/libesp32/berry/default/embedded/i2c_driver.be b/lib/libesp32/berry/default/embedded/i2c_driver.be new file mode 100644 index 000000000..a66afa5ad --- /dev/null +++ b/lib/libesp32/berry/default/embedded/i2c_driver.be @@ -0,0 +1,104 @@ +#------------------------------------------------------------- + - IMPORTANT + - THIS CLASS IS ALREADY BAKED IN TASMOTA + - + - It is here for debugging and documentation purpose only + -------------------------------------------------------------# + +#------------------------------------------------------------- + - I2C_Driver class to simplify development of I2C drivers + - + - I2C_Driver(name, addr [, i2c_index]) -> nil + - name: name of I2C device for logging, or function to detect the model + - addr: I2C address of device, will probe all I2C buses for it + - i2c_index: (optional) check is the device is not disabled + -------------------------------------------------------------# + +class I2C_Driver + var wire #- wire object to reach the device, if nil then the module is not initialized -# + var addr #- I2C address of the device -# + var name #- model namme of the device, cannot be nil -# + + #- Init and look for device + - Input: + - name_or_detect : name of the device (if string) + or function to detect the precise model(if function) + the function is passed a single argument `self` + and must return a string, or `nil` if the device is invalid + - addr : I2C address of device (int 0..255) + - i2c_index : Tasmota I2C index, see `I2CDEVICES.md` (int) + --# + def init(name_or_detect, addr, i2c_index) + var tasmota = self.get_tasmota() #- retrieve the 'tasmota' singleton -# + + #- check if the i2c index is disabled by Tasmota configuration -# + if i2c_index != nil && !tasmota.i2c_enabled(i2c_index) return end + + self.addr = addr #- address for AXP192 -# + self.wire = tasmota.wire_scan(self.addr) #- get the right I2C bus -# + + if self.wire + #- find name of device, can be a string or a method -# + if type(name_or_detect) == 'function' + self.name = name_or_detect(self) + else + self.name = name_or_detect + end + #- if name is invalid, it means we can't detect device, abort -# + if self.name == nil self.wire = nil end + + if self.wire + print("I2C:", self.name, "detected on bus", self.wire.bus) + end + end + end + + #- write register with 8 bits value -# + def write8(reg, val) + return self.wire.write(self.addr, reg, val, 1) + end + + # Set or clear a specific bit in a register + # write_bit(reg:int, bit:int, state:bool) -> nil + # reg: I2C register number (0..255) + # bit: bit of I2C register to change (0..7) + # state: boolean value to write to specified bit + def write_bit(reg, bit, state) + if bit < 0 || bit > 7 return end + var mark = 1 << bit + if state self.write8(reg, self.read8(reg) | mark) + else self.write8(reg, self.read8(reg) & (0xFF - mark)) + end + end + + # read 8 bits + def read8(reg) + return self.wire.read(self.addr, reg, 1) + end + # read 12 bits + def read12(reg) + var buf = self.wire.read_bytes(self.addr, reg, 2) + return (buf[0] << 4) + buf[1] + end + # read 13 bits + def read13(reg) + var buf = self.wire.read_bytes(self.addr, reg, 2) + return (buf[0] << 5) + buf[1] + end + # read 24 bits + def read24(reg) + var buf = self.wire.read_bytes(self.addr, reg, 3) + return (buf[0] << 16) + (buf[1] << 8) + buf[2] + end + # read 32 bits + def read32(reg) + var buf = self.wire.read_bytes(self.addr, reg, 4) + return (buf[0] << 24) + (buf[1] << 16) + (buf[2] << 8) + buf[3] + end +end + +#- Example + +d = I2C_Driver("MPU", 0x68, 58) + +-# \ No newline at end of file diff --git a/lib/libesp32/berry/default/embedded/leds.be b/lib/libesp32/berry/default/embedded/leds.be new file mode 100644 index 000000000..11a0489af --- /dev/null +++ b/lib/libesp32/berry/default/embedded/leds.be @@ -0,0 +1,338 @@ +# class Leds +# +# for adressable leds like NoePixel + + +# Native commands +# 00 : ctor (leds:int, gpio:int) -> void +# 01 : begin void -> void +# 02 : show void -> void +# 03 : CanShow void -> bool +# 04 : IsDirty void -> bool +# 05 : Dirty void -> void +# 06 : Pixels void -> bytes() (mapped to the buffer) +# 07 : PixelSize void -> int +# 08 : PixelCount void -> int +# 09 : ClearTo (color:??) -> void +# 10 : SetPixelColor (idx:int, color:??) -> void +# 11 : GetPixelColor (idx:int) -> color:?? +# 20 : RotateLeft (rot:int [, first:int, last:int]) -> void +# 21 : RotateRight (rot:int [, first:int, last:int]) -> void +# 22 : ShiftLeft (rot:int [, first:int, last:int]) -> void +# 23 : ShiftRight (rot:int [, first:int, last:int]) -> void + + +class Leds : Leds_ntv + var gamma # if true, apply gamma (true is default) + var leds # number of leds + # leds:int = number of leds of the strip + # gpio:int (optional) = GPIO for NeoPixel. If not specified, takes the WS2812 gpio + # type:int (optional) = Type of LED, defaults to WS2812 RGB + # rmt:int (optional) = RMT hardware channel to use, leave default unless you have a good reason + def init(leds, gpio, type, rmt) # rmt is optional + self.gamma = true # gamma is enabled by default, it should be disabled explicitly if needed + self.leds = int(leds) + + if gpio == nil && gpio.pin(gpio.WS2812) >= 0 + gpio = gpio.pin(gpio.WS2812) + end + + # if no GPIO, abort + if gpio == nil + raise "valuer_error", "no GPIO specified for neopixelbus" + end + + # initialize the structure + self.ctor(self.leds, gpio, type, rmt) + + if self._p == nil raise "internal_error", "couldn't not initialize noepixelbus" end + + # call begin + self.begin() + + end + + def clear() + self.clear_to(0x000000) + self.show() + end + + def ctor(leds, gpio, rmt) + if rmt == nil + self.call_native(0, leds, gpio) + else + self.call_native(0, leds, gpio, rmt) + end + end + def begin() + self.call_native(1) + end + def show() + self.call_native(2) + end + def can_show() + return self.call_native(3) + end + def is_dirty() + return self.call_native(4) + end + def dirty() + self.call_native(5) + end + def pixels_buffer() + return self.call_native(6) + end + def pixel_size() + return self.call_native(7) + end + def pixel_count() + return self.call_native(8) + end + def clear_to(col, bri) + self.call_native(9, self.to_gamma(col, bri)) + end + def set_pixel_color(idx, col, bri) + self.call_native(10, idx, self.to_gamma(col, bri)) + end + def get_pixel_color(idx) + return self.call_native(11, idx) + end + # def rotate_left(rot, first, last) + # self.call_native(20, rot, first, last) + # end + # def rotate_right(rot, first, last) + # self.call_native(21, rot, first, last) + # end + # def shift_left(rot, first, last) + # self.call_native(22, rot, first, last) + # end + # def shift_right(rot, first, last) + # self.call_native(22, rot, first, last) + # end + + # apply gamma and bri + def to_gamma(rgbw, bri) + bri = (bri != nil) ? bri : 100 + var r = tasmota.scale_uint(bri, 0, 100, 0, (rgbw & 0xFF0000) >> 16) + var g = tasmota.scale_uint(bri, 0, 100, 0, (rgbw & 0x00FF00) >> 8) + var b = tasmota.scale_uint(bri, 0, 100, 0, (rgbw & 0x0000FF)) + if self.gamma + return light.gamma8(r) << 16 | + light.gamma8(g) << 8 | + light.gamma8(b) + else + return r << 16 | + g << 8 | + b + end + end + + # `segment` + # create a new `strip` object that maps a part of the current strip + def create_segment(offset, leds) + if int(offset) + int(leds) > self.leds || offset < 0 || leds < 0 + raise "value_error", "out of range" + end + + # inner class + class Leds_segment + var strip + var offset, leds + + def init(strip, offset, leds) + self.strip = strip + self.offset = int(offset) + self.leds = int(leds) + end + + def clear() + self.clear_to(0x000000) + self.show() + end + + def begin() + # do nothing, already being handled by physical strip + end + def show(force) + # don't trigger on segment, you will need to trigger on full strip instead + if bool(force) || (self.offset == 0 && self.leds == self.strip.leds) + self.strip.show() + end + end + def can_show() + return self.strip.can_show() + end + def is_dirty() + return self.strip.is_dirty() + end + def dirty() + self.strip.dirty() + end + def pixels_buffer() + return nil + end + def pixel_size() + return self.strip.pixel_size() + end + def pixel_count() + return self.leds + end + def clear_to(col, bri) + var i = 0 + while i < self.leds + self.strip.set_pixel_color(i + self.offset, col, bri) + i += 1 + end + end + def set_pixel_color(idx, col, bri) + self.strip.set_pixel_color(idx + self.offset, col, bri) + end + def get_pixel_color(idx) + return self.strip.get_pixel_color(idx + self.offseta) + end + end + + return Leds_segment(self, offset, leds) + + end + + def create_matrix(w, h, offset) + offset = int(offset) + w = int(w) + h = int(h) + if offset == nil offset = 0 end + if w * h + offset > self.leds || h < 0 || w < 0 || offset < 0 + raise "value_error", "out of range" + end + + # inner class + class Leds_matrix + var strip + var offset + var h, w + var alternate # are rows in alternate mode (even/odd are reversed) + + def init(strip, w, h, offset) + self.strip = strip + self.offset = offset + self.h = h + self.w = w + self.alternate = false + end + + def clear() + self.clear_to(0x000000) + self.show() + end + + def begin() + # do nothing, already being handled by physical strip + end + def show(force) + # don't trigger on segment, you will need to trigger on full strip instead + if bool(force) || (self.offset == 0 && self.w * self.h == self.strip.leds) + self.strip.show() + end + end + def can_show() + return self.strip.can_show() + end + def is_dirty() + return self.strip.is_dirty() + end + def dirty() + self.strip.dirty() + end + def pixels_buffer() + return nil + end + def pixel_size() + return self.strip.pixel_size() + end + def pixel_count() + return self.w * self.h + end + def clear_to(col, bri) + var i = 0 + while i < self.w * self.h + self.strip.set_pixel_color(i + self.offset, col, bri) + i += 1 + end + end + def set_pixel_color(idx, col, bri) + self.strip.set_pixel_color(idx + self.offset, col, bri) + end + def get_pixel_color(idx) + return self.strip.get_pixel_color(idx + self.offseta) + end + + # Leds_matrix specific + def set_alternate(alt) + self.alternate = alt + end + def get_alternate() + return self.alternate + end + + def set_matrix_pixel_color(x, y, col, bri) + if self.alternate && x % 2 + # reversed line + self.strip.set_pixel_color(x * self.w + self.h - y - 1 + self.offset, col, bri) + else + self.strip.set_pixel_color(x * self.w + y + self.offset, col, bri) + end + end + end + + return Leds_matrix(self, w, h, offset) + + end + + static def matrix(w, h, gpio, rmt) + var strip = Leds(w * h, gpio, rmt) + var matrix = strip.create_matrix(w, h, 0) + return matrix + end +end + + +#- + +var s = Leds(25, gpio.pin(gpio.WS2812, 1)) +s.clear_to(0x300000) +s.show() +i = 0 + +def anim() + s.clear_to(0x300000) + s.set_pixel_color(i, 0x004000) + s.show() + i = (i + 1) % 25 + tasmota.set_timer(200, anim) +end +anim() + +-# + +#- + +var s = Leds_matrix(5, 5, gpio.pin(gpio.WS2812, 1)) +s.set_alternate(true) +s.clear_to(0x300000) +s.show() +x = 0 +y = 0 + +def anim() + s.clear_to(0x300000) + s.set_matrix_pixel_color(x, y, 0x004000) + s.show() + y = (y + 1) % 5 + if y == 0 + x = (x + 1) % 5 + end + tasmota.set_timer(200, anim) +end +anim() + +-# diff --git a/lib/libesp32/berry/default/embedded/leds_animator.be b/lib/libesp32/berry/default/embedded/leds_animator.be new file mode 100644 index 000000000..1ed25b491 --- /dev/null +++ b/lib/libesp32/berry/default/embedded/leds_animator.be @@ -0,0 +1,70 @@ +# class Leds_animator + +class Leds_animator + var strip # neopixelbus object + var pixel_count # number of pixels in the strip + var bri # brightness of the animation, 0..100, default 50 + var running # is the animation running + var animators # animators list + + def init(strip) + self.strip = strip + self.bri = 50 # percentage of brightness 0..100 + self.running = false + self.pixel_count = strip.pixel_count() + self.animators = [] + # + self.clear() # clear all leds first + # + tasmota.add_driver(self) + end + + def add_anim(anim) + self.animators.push(anim) + anim.run() # start the animator + end + + def clear() + self.stop() + self.strip.clear() + end + def start() + self.running = true + end + def stop() + self.running = false + end + + def set_bri(bri) + self.bri = bri + end + def get_bri(bri) + return self.bri + end + + def every_50ms() + if self.running + # run animators first + var i = 0 + while i < size(self.animators) + var anim = self.animators[i] + if anim.is_running() + anim.animate() + i += 1 + else + self.animators.remove(i) # remove any finished animator + end + end + # tirgger animate and display + self.animate() + end + end + + def animate() + # placeholder - do nothing by default + end + + def remove() + tasmota.remove_driver(self) + end +end diff --git a/lib/libesp32/berry/default/embedded/lv_clock_icon.be b/lib/libesp32/berry/default/embedded/lv_clock_icon.be new file mode 100644 index 000000000..f5d19ca11 --- /dev/null +++ b/lib/libesp32/berry/default/embedded/lv_clock_icon.be @@ -0,0 +1,54 @@ +#- LVGL lv_clock_icon + - +--# + +class lv_clock_icon: lv.label + var hour, minute, sec + + def init(parent) + super(self).init(parent) + var f_s7_16 = lv.seg7_font(16) + if f_s7_16 != nil self.set_style_text_font(f_s7_16, lv.PART_MAIN | lv.STATE_DEFAULT) end + + if parent != nil + var parent_height = parent.get_height() + + self.set_text("--:--") + self.refr_size() + var w = self.get_width() + self.set_y((parent.get_height() - self.get_height()) / 2) # center vertically + + var pad_right = parent.get_style_pad_right(lv.PART_MAIN | lv.STATE_DEFAULT) + self.set_x(parent.get_width() - w - pad_right - 3) + parent.set_style_pad_right(pad_right + w + 6, lv.PART_MAIN | lv.STATE_DEFAULT) + + self.set_style_bg_color(lv.color(lv.COLOR_BLACK), lv.PART_MAIN | lv.STATE_DEFAULT) + end + + tasmota.add_driver(self) + end + + def set_time(hour, minute, sec) + import string + if hour != self.hour || minute != self.minute || sec != self.sec + var txt = string.format("%02d%s%02d", hour, sec % 2 ? ":" : " ", minute) + self.hour = hour + self.minute = minute + self.sec = sec + #if txt[0] == '0' txt = '!' .. string.split(txt,1)[1] end # replace first char with '!' + self.set_text(txt) + end + end + + def every_second() + var now = tasmota.time_dump(tasmota.rtc()['local']) + if now['year'] != 1970 + self.set_time(now['hour'], now['min'], now['sec']) + end + end + + def del() + super(self).del() + tasmota.remove_driver(self) + end +end \ No newline at end of file diff --git a/lib/libesp32/berry/default/embedded/lv_signal_arcs.be b/lib/libesp32/berry/default/embedded/lv_signal_arcs.be new file mode 100644 index 000000000..7dd924e90 --- /dev/null +++ b/lib/libesp32/berry/default/embedded/lv_signal_arcs.be @@ -0,0 +1,133 @@ +#- LVGL lv_signal_bars and lv_wifi_bars + - +--# + +class lv_signal_arcs : lv.obj + var percentage # value to display, range 0..100 + var p1, p2, area, line_dsc # instances of objects kept to avoid re-instanciating at each call + + def init(parent) + # init custom widget (don't call super constructor) + _lvgl.create_custom_widget(self, parent) + # own values + self.percentage = 100 + # pre-allocate buffers + self.p1 = lv.point() + self.p2 = lv.point() + self.area = lv.area() + self.line_dsc = lv.draw_line_dsc() + end + + def widget_event(cl, event) + # Call the ancestor's event handler + if lv.obj_event_base(cl, event) != lv.RES_OK return end + var code = event.code + + import math + def atleast1(x) if x >= 1 return x else return 1 end end + # the model is that we have 4 bars and inter-bar (1/4 of width) + var height = self.get_height() + var width = self.get_width() + + var inter_bar = atleast1(height / 8) + var bar = atleast1((height - inter_bar * 2) / 3) + var bar_offset = bar / 2 + #print("inter_bar", inter_bar, "bar", bar, "bar_offset", bar_offset) + + if code == lv.EVENT_DRAW_MAIN + var clip_area = lv.area(event.param) + + # get coordinates of object + self.get_coords(self.area) + var x_ofs = self.area.x1 + var y_ofs = self.area.y1 + + lv.draw_line_dsc_init(self.line_dsc) # initialize lv.draw_line_dsc structure + self.init_draw_line_dsc(lv.PART_MAIN, self.line_dsc) # copy the current values + + self.line_dsc.round_start = 1 + self.line_dsc.round_end = 1 + self.line_dsc.width = (bar * 3 + 1) / 4 + var on_color = self.get_style_line_color(lv.PART_MAIN | lv.STATE_DEFAULT) + var off_color = self.get_style_bg_color(lv.PART_MAIN | lv.STATE_DEFAULT) + + # initial calculation, but does not take into account bounding box + # var angle = int(math.deg(math.atan2(width / 2, height))) + + # better calculation + var hypotenuse = height - bar # center if at bar/2 from bottom and circle stops at bar/2 from top + var adjacent = width / 2 - bar_offset # stop at bar_offset from side + var angle = int(90 - math.deg(math.acos(real(adjacent) / real(hypotenuse)))) + if (angle > 45) angle = 45 end + + # print("hypotenuse",hypotenuse,"adjacent",adjacent,"angle",angle) + self.p1.x = x_ofs + width / 2 + self.p1.y = y_ofs + height - 1 - bar_offset + + self.line_dsc.color = self.percentage >= 25 ? on_color : off_color + lv.draw_arc(self.p1.x, self.p1.y, 0 * (bar + inter_bar) + bar_offset, 0, 360, clip_area, self.line_dsc) + self.line_dsc.color = self.percentage >= 50 ? on_color : off_color + lv.draw_arc(self.p1.x, self.p1.y, 1 * (bar + inter_bar) + bar_offset - 1, 270 - angle, 270 + angle, clip_area, self.line_dsc) + self.line_dsc.color = self.percentage >= 75 ? on_color : off_color + lv.draw_arc(self.p1.x, self.p1.y, 2 * (bar + inter_bar) + bar_offset - 2, 270 - angle, 270 + angle, clip_area, self.line_dsc) + + #elif mode == lv.DESIGN_DRAW_POST # commented since we don't want a frame around this object + # self.ancestor_design.call(self, clip_area, mode) + end + end + + def set_percentage(v) + var old_bars = self.percentage / 25 + if v > 100 v = 100 end + if v < 0 v = 0 end + self.percentage = v + if old_bars != v / 25 + self.invalidate() # be frugal and avoid updating the widget if it's not needed + end + end + + def get_percentage() + return self.percentage + end +end + +class lv_wifi_arcs: lv_signal_arcs + def init(parent) + super(self).init(parent) + tasmota.add_driver(self) + self.set_percentage(0) # we generally start with 0, meaning not connected + end + + def every_second() + var wifi = tasmota.wifi() + var quality = wifi.find("quality") + var ip = wifi.find("ip") + if ip == nil + self.set_percentage(0) + elif quality != nil + self.set_percentage(quality) + end + end + + def del() + super(self).del() + tasmota.remove_driver(self) + end +end + +class lv_wifi_arcs_icon: lv_wifi_arcs + def init(parent) + super(self).init(parent) + self.set_style_line_color(lv.color(lv.COLOR_WHITE), lv.PART_MAIN | lv.STATE_DEFAULT) + self.set_style_bg_color(lv.color(lv.COLOR_BLACK), lv.PART_MAIN | lv.STATE_DEFAULT) + if parent != nil + var parent_height = parent.get_height() + var pad_right = parent.get_style_pad_right(lv.PART_MAIN | lv.STATE_DEFAULT) + self.set_height(parent_height) + var w = (parent_height*4)/3 + self.set_width(w) # 130% + self.set_x(parent.get_width() - w - pad_right) + parent.set_style_pad_right(pad_right + w + 1, lv.PART_MAIN | lv.STATE_DEFAULT) + end + end +end \ No newline at end of file diff --git a/lib/libesp32/berry/default/embedded/lv_signal_bars.be b/lib/libesp32/berry/default/embedded/lv_signal_bars.be new file mode 100644 index 000000000..f548457b9 --- /dev/null +++ b/lib/libesp32/berry/default/embedded/lv_signal_bars.be @@ -0,0 +1,118 @@ +#- LVGL lv_signal_bars and lv_wifi_bars + - +--# + +class lv_signal_bars : lv.obj + var percentage # value to display, range 0..100 + var p1, p2, area, line_dsc # instances of objects kept to avoid re-instanciating at each call + + def init(parent) + # init custom widget (don't call super constructor) + _lvgl.create_custom_widget(self, parent) + # own values + self.percentage = 100 + # pre-allocate buffers + self.p1 = lv.point() + self.p2 = lv.point() + self.area = lv.area() + self.line_dsc = lv.draw_line_dsc() + end + + def widget_event(cl, event) + # Call the ancestor's event handler + if lv.obj_event_base(cl, event) != lv.RES_OK return end + var code = event.code + + def atleast1(x) if x >= 1 return x else return 1 end end + # the model is that we have 4 bars and inter-bar (1/4 of width) + var height = self.get_height() + var width = self.get_width() + + var inter_bar = atleast1(width / 15) + var bar = atleast1((width - inter_bar * 3) / 4) + var bar_offset = bar / 2 + + if code == lv.EVENT_DRAW_MAIN + var clip_area = lv.area(event.param) + + # get coordinates of object + self.get_coords(self.area) + var x_ofs = self.area.x1 + var y_ofs = self.area.y1 + + lv.draw_line_dsc_init(self.line_dsc) # initialize lv_draw_line_dsc structure + self.init_draw_line_dsc(lv.PART_MAIN, self.line_dsc) # copy the current values + + self.line_dsc.round_start = 1 + self.line_dsc.round_end = 1 + self.line_dsc.width = bar + var on_color = self.get_style_line_color(lv.PART_MAIN | lv.STATE_DEFAULT) + var off_color = self.get_style_bg_color(lv.PART_MAIN | lv.STATE_DEFAULT) + + lv.event_send(self, lv.EVENT_DRAW_PART_BEGIN, self.line_dsc) + for i:0..3 # 4 bars + self.line_dsc.color = self.percentage >= (i+1)*20 ? on_color : off_color + self.p1.y = y_ofs + height - 1 - bar_offset + self.p1.x = x_ofs + i * (bar + inter_bar) + bar_offset + self.p2.y = y_ofs + ((3 - i) * (height - bar)) / 4 + bar_offset + self.p2.x = self.p1.x + lv.draw_line(self.p1, self.p2, clip_area, self.line_dsc) + end + lv.event_send(self, lv.EVENT_DRAW_PART_END, self.line_dsc) + end + end + + def set_percentage(v) + var old_bars = self.percentage / 20 + if v > 100 v = 100 end + if v < 0 v = 0 end + self.percentage = v + if old_bars != v / 20 + self.invalidate() # be frugal and avoid updating the widget if it's not needed + end + end + + def get_percentage() + return self.percentage + end +end + +class lv_wifi_bars: lv_signal_bars + def init(parent) + super(self).init(parent) + tasmota.add_driver(self) + self.set_percentage(0) # we generally start with 0, meaning not connected + end + + def every_second() + var wifi = tasmota.wifi() + var quality = wifi.find("quality") + var ip = wifi.find("ip") + if ip == nil + self.set_percentage(0) + elif quality != nil + self.set_percentage(quality) + end + end + + def del() + super(self).del() + tasmota.remove_driver(self) + end +end + +class lv_wifi_bars_icon: lv_wifi_bars + def init(parent) + super(self).init(parent) + self.set_style_line_color(lv.color(lv.COLOR_WHITE), lv.PART_MAIN | lv.STATE_DEFAULT) + self.set_style_bg_color(lv.color(lv.COLOR_BLACK), lv.PART_MAIN | lv.STATE_DEFAULT) + if parent != nil + var parent_height = parent.get_height() + var pad_right = parent.get_style_pad_right(lv.PART_MAIN | lv.STATE_DEFAULT) + self.set_height(parent_height) + self.set_width(parent_height) + self.set_x(parent.get_width() - parent_height - pad_right) + parent.set_style_pad_right(pad_right + parent_height + 1, lv.PART_MAIN | lv.STATE_DEFAULT) + end + end +end diff --git a/lib/libesp32/berry/default/embedded/lvgl_glob.be b/lib/libesp32/berry/default/embedded/lvgl_glob.be new file mode 100644 index 000000000..04250ff54 --- /dev/null +++ b/lib/libesp32/berry/default/embedded/lvgl_glob.be @@ -0,0 +1,256 @@ +#- embedded class for LVGL globals -# + +#- This class stores all globals used by LVGL and cannot be stored in the solidified module -# +#- this limits the globals to a single value '_lvgl' -# +class LVGL_glob + # all variables are lazily initialized to reduce the memory pressure. Until they are used, they consume zero memory + var cb_obj # map between a native C pointer (as int) and the corresponding lv.lv_* berry object, also helps marking the objects as non-gc-able + var cb_event_closure # mapping for event closures per LVGL native pointer (int) + var event_cb # native callback for lv.lv_event + + #- below are native callbacks mapped to a closure to a method of this instance -# + var null_cb # cb called if type is not supported + var widget_ctor_cb + var widget_dtor_cb + var widget_event_cb + + var widget_struct_default + var widget_struct_by_class + + #- this is the fallback callback, if the event is unknown or unsupported -# + static cb_do_nothing = def() print("LVG: call to unsupported callback") end + + #- register an lv.lv_* object in the mapping -# + def register_obj(obj) + if self.cb_obj == nil self.cb_obj = {} end + self.cb_obj[obj._p] = obj + end + + def get_object_from_ptr(ptr) + if self.cb_obj != nil + return self.cb_obj.find(ptr) # raise an exception if something is wrong + end + end + + def lvgl_event_dispatch(event_ptr) + import introspect + + var event = lv.lv_event(introspect.toptr(event_ptr)) + + var target = event.target + var f = self.cb_event_closure[target] + var obj = self.get_object_from_ptr(target) + #print('>> lvgl_event_dispatch', f, obj, event) + f(obj, event) + end + + def gen_cb(name, f, obj, ptr) + #print('>> gen_cb', name, obj, ptr) + # record the object, whatever the callback + + if name == "lv_event_cb" + if self.cb_event_closure == nil self.cb_event_closure = {} end + if self.event_cb == nil self.event_cb = tasmota.gen_cb(/ event_ptr -> self.lvgl_event_dispatch(event_ptr)) end # encapsulate 'self' in closure + + self.register_obj(obj) + self.cb_event_closure[ptr] = f + return self.event_cb + # elif name == "" + else + if self.null_cb == nil self.null_cb = tasmota.gen_cb(self.cb_do_nothing) end + return self.null_cb + end + end + + def widget_ctor_impl(cl_ptr, obj_ptr) + import introspect + var cl = lv.lv_obj_class(cl_ptr) + var obj = self.get_object_from_ptr(obj_ptr) + if self.cb_obj.find(obj) obj = self.cb_obj[obj] end + # print("widget_ctor_impl", cl, obj) + if type(obj) == 'instance' && introspect.get(obj, 'widget_constructor') + obj.widget_constructor(cl) + end + end + def widget_dtor_impl(cl_ptr, obj_ptr) + import introspect + var cl = lv.lv_obj_class(cl_ptr) + var obj = self.get_object_from_ptr(obj_ptr) + # print("widget_dtor_impl", cl, obj) + if type(obj) == 'instance' && introspect.get(obj, 'widget_destructor') + obj.widget_destructor(cl) + end + end + def widget_event_impl(cl_ptr, e_ptr) + import introspect + var cl = lv.lv_obj_class(cl_ptr) + var event = lv.lv_event(e_ptr) + var obj_ptr = event.target + var obj = self.get_object_from_ptr(obj_ptr) + if type(obj) == 'instance' && introspect.get(obj, 'widget_event') + obj.widget_event(cl, event) + end + # print("widget_event_impl", cl, obj_ptr, obj, event) + end + + + def widget_cb() + if self.widget_ctor_cb == nil self.widget_ctor_cb = tasmota.gen_cb(/ cl, obj -> self.widget_ctor_impl(cl, obj)) end + if self.widget_dtor_cb == nil self.widget_dtor_cb = tasmota.gen_cb(/ cl, obj -> self.widget_dtor_impl(cl, obj)) end + if self.widget_event_cb == nil self.widget_event_cb = tasmota.gen_cb(/ cl, e -> self.widget_event_impl(cl, e)) end + + if self.widget_struct_default == nil + self.widget_struct_default = lv.lv_obj_class(lv.lv_obj._class).copy() + self.widget_struct_default.base_class = lv.lv_obj._class # by default, inherit from base class `lv_obj`, this can be overriden + self.widget_struct_default.constructor_cb = self.widget_ctor_cb # set the berry cb dispatchers + self.widget_struct_default.destructor_cb = self.widget_dtor_cb + self.widget_struct_default.event_cb = self.widget_event_cb + end + end + + #- deregister_obj all information linked to a specific LVGL native object (int) -# + def deregister_obj(obj) + if self.cb_obj != nil self.cb_obj.remove(obj) end + if self.cb_event_closure != nil self.cb_event_closure.remove(obj) end + end + + #- initialize a custom widget -# + #- arg must be a subclass of lv.lv_obj -# + def create_custom_widget(obj, parent) + import introspect + + if !isinstance(obj, lv.lv_obj) raise "value_error", "arg must be a subclass of lv_obj" end + if self.widget_struct_by_class == nil self.widget_struct_by_class = {} end + + var obj_classname = classname(obj) + var obj_class_struct = self.widget_struct_by_class.find(obj_classname) + # print("classname=",obj_classname,"_class",super(obj)._class) + #- not already built, create a new one for this class -# + if obj_class_struct == nil + self.widget_cb() # set up all structures + obj_class_struct = self.widget_struct_default.copy() # get a copy of the structure with pre-defined callbacks + obj_class_struct.base_class = super(obj)._class + if introspect.get(obj, 'widget_width_def') obj_class_struct.width_def = obj.widget_width_def end + if introspect.get(obj, 'widget_height_def') obj_class_struct.height_def = obj.widget_height_def end + if introspect.get(obj, 'widget_editable') obj_class_struct.editable = obj.widget_editable end + if introspect.get(obj, 'widget_group_def') obj_class_struct.group_def = obj.widget_group_def end + if introspect.get(obj, 'widget_instance_size') obj_class_struct.instance_size = obj.widget_instance_size end + + #- keep a copy of the structure to avoid GC and reuse if needed -# + self.widget_struct_by_class[obj_classname] = obj_class_struct + end + + var lv_obj_ptr = lv.obj_class_create_obj(obj_class_struct, parent) + obj._p = lv_obj_ptr._p + self.register_obj(obj) + obj.class_init_obj() + end +end + +_lvgl = LVGL_glob() + +# class lv_custom_widget : lv.lv_obj +# # static widget_width_def +# # static widget_height_def +# # static widget_editable +# # static widget_group_def +# # static widget_instance_size +# # +# var percentage # value to display, range 0..100 +# var p1, p2, area, line_dsc # instances of objects kept to avoid re-instanciating at each call + +# def init(parent) +# _lvgl.create_custom_widget(self, parent) +# # own values +# self.percentage = 100 +# # pre-allocate buffers +# self.p1 = lv.lv_point() +# self.p2 = lv.lv_point() +# self.area = lv.lv_area() +# self.line_dsc = lv.lv_draw_line_dsc() +# end + +# # def widget_constructor(cl) +# # print("widget_constructor", cl) +# # end + +# # def widget_destructor(cl) +# # print("widget_destructor", cl) +# # end + +# def widget_event(cl, event) +# var res = lv.obj_event_base(cl, event) +# if res != lv.RES_OK return end + +# def atleast1(x) if x >= 1 return x else return 1 end end +# # the model is that we have 4 bars and inter-bar (1/4 of width) +# var height = self.get_height() +# var width = self.get_width() + +# var inter_bar = atleast1(width / 15) +# var bar = atleast1((width - inter_bar * 3) / 4) +# var bar_offset = bar / 2 + +# var code = event.code +# if code == lv.EVENT_DRAW_MAIN +# var clip_area = lv.lv_area(event.param) +# print("widget_event DRAW", clip_area.tomap()) +# # lv.event_send(self, lv.EVENT_DRAW_MAIN, clip_area) + +# # get coordinates of object +# self.get_coords(self.area) +# var x_ofs = self.area.x1 +# var y_ofs = self.area.y1 + +# lv.draw_line_dsc_init(self.line_dsc) # initialize lv.lv_draw_line_dsc structure +# self.init_draw_line_dsc(lv.PART_MAIN, self.line_dsc) + +# self.line_dsc.round_start = 1 +# self.line_dsc.round_end = 1 +# self.line_dsc.width = bar + +# var on_color = self.get_style_line_color(lv.PART_MAIN | lv.STATE_DEFAULT) +# var off_color = self.get_style_bg_color(lv.PART_MAIN | lv.STATE_DEFAULT) + +# lv.event_send(self, lv.EVENT_DRAW_PART_BEGIN, self.line_dsc) +# for i:0..3 # 4 bars +# self.line_dsc.color = self.percentage >= (i+1)*20 ? on_color : off_color +# self.p1.y = y_ofs + height - 1 - bar_offset +# self.p1.x = x_ofs + i * (bar + inter_bar) + bar_offset +# self.p2.y = y_ofs + ((3 - i) * (height - bar)) / 4 + bar_offset +# self.p2.x = self.p1.x +# lv.draw_line(self.p1, self.p2, clip_area, self.line_dsc) +# end +# lv.event_send(self, lv.EVENT_DRAW_PART_END, self.line_dsc) + +# end +# end + +# def set_percentage(v) +# var old_bars = self.percentage / 5 +# if v > 100 v = 100 end +# if v < 0 v = 0 end +# self.percentage = v +# if old_bars != v / 5 +# self.invalidate() # be frugal and avoid updating the widget if it's not needed +# end +# end + +# def get_percentage() +# return self.percentage +# end +# end + +# ########## ########## ########## ########## ########## ########## ########## ########## + +# lv.start() + +# hres = lv.get_hor_res() # should be 320 +# vres = lv.get_ver_res() # should be 240 + +# scr = lv.scr_act() # default screean object +# f20 = lv.montserrat_font(20) # load embedded Montserrat 20 + +# scr.set_style_bg_color(lv.lv_color(0x0000A0), lv.PART_MAIN | lv.STATE_DEFAULT) + +# w = lv_custom_widget(scr) \ No newline at end of file diff --git a/lib/libesp32/berry/default/embedded/openhasp.be b/lib/libesp32/berry/default/embedded/openhasp.be new file mode 100644 index 000000000..4232a605b --- /dev/null +++ b/lib/libesp32/berry/default/embedded/openhasp.be @@ -0,0 +1,764 @@ +import string +import json + +# lv.start() +# scr = lv.scr_act() # default screean object +# scr.set_style_bg_color(lv.color(0x0000A0), lv.PART_MAIN | lv.STATE_DEFAULT) + +lv.start() + +hres = lv.get_hor_res() # should be 320 +vres = lv.get_ver_res() # should be 240 + +scr = lv.scr_act() # default screean object +#f20 = lv.montserrat_font(20) # load embedded Montserrat 20 +r20 = lv.font_robotocondensed_latin1(20) +r16 = lv.font_robotocondensed_latin1(16) + +th2 = lv.theme_openhasp_init(0, lv.color(0xFF00FF), lv.color(0x303030), false, r16) +scr.get_disp().set_theme(th2) +# TODO +scr.set_style_bg_color(lv.color(lv.COLOR_WHITE),0) + +# apply theme to layer_top, but keep it transparent +lv.theme_apply(lv.layer_top()) +lv.layer_top().set_style_bg_opa(0,0) + + +# takes an attribute name and responds if it needs color conversion +def is_color_attribute(t) + import string + t = str(t) + # contains `color` but does not contain `color_` + return (string.find(t, "color") >= 0) && (string.find(t, "color_") < 0) +end + +# parse hex string +def parse_hex(s) + import string + s = string.toupper(s) # turn to uppercase + var val = 0 + for i:0..size(s)-1 + var c = s[i] + # var c_int = string.byte(c) + if c == "#" continue end # skip '#' prefix if any + if c == "x" || c == "X" continue end # skip 'x' or 'X' + + if c >= "A" && c <= "F" + val = (val << 4) | string.byte(c) - 55 + elif c >= "0" && c <= "9" + val = (val << 4) | string.byte(c) - 48 + end + end + return val +end + +def parse_color(s) + s = str(s) + if s[0] == '#' + return lv.color(parse_hex(s)) + else + import string + import introspect + var col_name = "COLOR_" + string.toupper(s) + var col_try = introspect.get(lv, col_name) + if col_try != nil + return lv.color(col_try) + end + end + # fail safe with black color + return lv.color(0x000000) +end + +#- ------------------------------------------------------------ + Class `lvh_obj` encapsulating `lv_obj`` + + Provide a mapping for virtual members + Stores the associated page and object id + + Adds specific virtual members used by OpenHASP +- ------------------------------------------------------------ -# +class lvh_obj + # _lv_class refers to the lvgl class encapsulated, and is overriden by subclasses + static _lv_class = lv.obj + static _lv_part2_selector # selector for secondary part (like knob of arc) + + # attributes to ignore when set at object level (they are managed by page) + static _attr_ignore = [ + "id", + "obj", + "page", + "comment", + "parentid", + "auto_size", # TODO not sure it's still needed in LVGL8 + ] + #- mapping from OpenHASP attribute to LVGL attribute -# + #- if mapping is null, we use set_X and get_X from our own class -# + static _attr_map = { + "x": "x", + "y": "y", + "w": "width", + "h": "height", + # arc + "asjustable": nil, + "mode": nil, + "start_angle": "bg_start_angle", + "start_angle1": "start_angle", + "end_angle": "bg_end_angle", + "end_angle1": "end_angle", + "radius": "style_radius", + "border_side": "style_border_side", + "bg_opa": "style_bg_opa", + "border_width": "style_border_width", + "line_width": nil, # depebds on class + "line_width1": nil, # depebds on class + "action": nil, # store the action in self._action + "hidden": nil, # apply to self + "enabled": nil, # apply to self + "click": nil, # synonym to enabled + "toggle": nil, + "bg_color": "style_bg_color", + "bg_grad_color": "style_bg_grad_color", + "type": nil, + # below automatically create a sub-label + "text": nil, # apply to self + "value_str": nil, # synonym to 'text' + "align": nil, + "text_font": nil, + "value_font": nil, # synonym to text_font + "text_color": nil, + "value_color": nil, # synonym to text_color + "value_ofs_x": nil, + "value_ofs_y": nil, + # + "min": nil, + "max": nil, + "val": "value", + "rotation": "rotation", + # img + "src": "src", + "image_recolor": "style_img_recolor", + "image_recolor_opa": "style_img_recolor_opa", + # spinner + "angle": nil, + "speed": nil, + # padding of knob + "pad_top2": nil, + "pad_bottom2": nil, + "pad_left2": nil, + "pad_right2": nil, + "pad_all2": nil, + "radius2": nil, + } + + var _lv_obj # native lvgl object + var _lv_label # sub-label if exists + var _action # action for OpenHASP + + # init + # - create the LVGL encapsulated object + # arg1: parent object + # arg2: json line object + def init(parent, jline) + var obj_class = self._lv_class # need to assign to a var to distinguish from method call + self._lv_obj = obj_class(parent) # instanciate LVGL object + self.post_init() + end + + # post-init, to be overriden + def post_init() + end + + # get LVGL encapsulated object + def get_obj() + return self._lv_obj + end + + def set_action(t) + self._action = str(t) + end + def get_action() + return self._action() + end + + def set_line_width(t) + self._lv_obj.set_style_line_width(int(t), lv.PART_MAIN | lv.STATE_DEFAULT) + end + def get_line_width() + return self._lv_obj.get_style_line_width(lv.PART_MAIN | lv.STATE_DEFAULT) + end + + #- ------------------------------------------------------------ + Mapping of synthetic attributes + - text + - hidden + - enabled + - ------------------------------------------------------------ -# + #- `hidden` attributes mapped to OBJ_FLAG_HIDDEN -# + def set_hidden(h) + if h + self._lv_obj.add_flag(lv.OBJ_FLAG_HIDDEN) + else + self._lv_obj.clear_flag(lv.OBJ_FLAG_HIDDEN) + end + end + + def get_hidden() + return self._lv_obj.has_flag(lv.OBJ_FLAG_HIDDEN) + end + + #- `enabled` attributes mapped to OBJ_FLAG_CLICKABLE -# + def set_enabled(h) + if h + self._lv_obj.add_flag(lv.OBJ_FLAG_CLICKABLE) + else + self._lv_obj.clear_flag(lv.OBJ_FLAG_CLICKABLE) + end + end + + def get_enabled() + return self._lv_obj.has_flag(lv.OBJ_FLAG_CLICKABLE) + end + # click is synonym to enabled + def set_click(t) self.set_enabled(t) end + def get_click() return self.get_enabled() end + + #- `toggle` attributes mapped to STATE_CHECKED -# + def set_toggle(t) + if t == "TRUE" t = true end + if t == "FALSE" t = false end + if t + self._lv_obj.add_state(lv.STATE_CHECKED) + else + self._lv_obj.clear_state(lv.STATE_CHECKED) + end + end + + def get_toggle() + return self._lv_obj.has_state(lv.STATE_CHECKED) + end + + def set_adjustable(t) + if t + self._lv_obj.add_flag(lv.OBJ_FLAG_CLICKABLE) + else + self._lv_obj.clear_flag(lv.OBJ_FLAG_CLICKABLE) + end + end + def get_adjustable() + return self._lv_obj.has_flag(lv.OBJ_FLAG_CLICKABLE) + end + + #- set_text: create a `lv_label` sub object to the current object -# + #- (default case, may be overriden by object that directly take text) -# + def check_label() + if self._lv_label == nil + self._lv_label = lv.label(self.get_obj()) + self._lv_label.set_align(lv.ALIGN_CENTER); + end + end + + def set_text(t) + self.check_label() + self._lv_label.set_text(str(t)) + end + def set_value_str(t) self.set_text(t) end + + def get_text() + if self._lv_label == nil return nil end + return self._lv_label.get_text() + end + def get_value_str() return self.get_text() end + + def set_align(t) + var align + self.check_label() + if t == 0 || t == "left" + align = lv.TEXT_ALIGN_LEFT + elif t == 1 || t == "center" + align = lv.TEXT_ALIGN_CENTER + elif t == 2 || t == "right" + align = lv.TEXT_ALIGN_RIGHT + end + self._lv_label.set_style_text_align(align, lv.PART_MAIN | lv.STATE_DEFAULT) + end + + def get_align() + if self._lv_label == nil return nil end + var align self._lv_label.get_style_text_align(lv.PART_MAIN | lv.STATE_DEFAULT) + if align == lv.TEXT_ALIGN_LEFT + return "left" + elif align == lv.TEXT_ALIGN_CENTER + return "center" + elif align == lv.TEXT_ALIGN_RIGHT + return "right" + else + return nil + end + end + + def set_text_font(t) + self.check_label() + var f = lv.font_robotocondensed_latin1(int(t)) + if f != nil + self._lv_label.set_style_text_font(f, lv.PART_MAIN | lv.STATE_DEFAULT) + else + print("HSP: Unsupported font size: robotocondensed-latin1", t) + end + end + def get_text_font() + end + def set_value_font(t) self.set_text_font(t) end + def get_value_font() return self.get_text_font() end + + def set_text_color(t) + self.check_label() + self._lv_label.set_style_text_color(parse_color(t), lv.PART_MAIN | lv.STATE_DEFAULT) + end + def get_text_color() + return self._text_color + end + def set_value_color(t) self.set_text_color(t) end + def get_value_color() return self.get_value_color() end + + def set_value_ofs_x(t) + self.check_label() + self._lv_label.set_x(int(t)) + end + def get_value_ofs_x() + return self._lv_label.get_x() + end + def set_value_ofs_y(t) + self.check_label() + self._lv_label.set_y(int(t)) + end + def get_value_ofs_y() + return self._lv_label.get_y() + end + + # secondary element + def set_pad_top2(t) + if self._lv_part2_selector != nil + self._lv_obj.set_style_pad_top(int(t), self._lv_part2_selector | lv.STATE_DEFAULT) + end + end + def set_pad_bottom2(t) + if self._lv_part2_selector != nil + self._lv_obj.set_style_pad_bottom(int(t), self._lv_part2_selector | lv.STATE_DEFAULT) + end + end + def set_pad_left2(t) + if self._lv_part2_selector != nil + self._lv_obj.set_style_pad_left(int(t), self._lv_part2_selector | lv.STATE_DEFAULT) + end + end + def set_pad_right2(t) + if self._lv_part2_selector != nil + self._lv_obj.set_style_pad_right(int(t), self._lv_part2_selector | lv.STATE_DEFAULT) + end + end + def set_pad_all2(t) + if self._lv_part2_selector != nil + self._lv_obj.set_style_pad_all(int(t), self._lv_part2_selector | lv.STATE_DEFAULT) + end + end + + def get_pad_top() + if self._lv_part2_selector != nil + return self._lv_obj.get_style_pad_top(self._lv_part2_selector | lv.STATE_DEFAULT) + end + end + def get_pad_bottomo() + if self._lv_part2_selector != nil + return self._lv_obj.get_style_pad_bottom(self._lv_part2_selector | lv.STATE_DEFAULT) + end + end + def get_pad_left() + if self._lv_part2_selector != nil + return self._lv_obj.get_style_pad_left(self._lv_part2_selector | lv.STATE_DEFAULT) + end + end + def get_pad_right() + if self._lv_part2_selector != nil + return self._lv_obj.get_style_pad_right(self._lv_part2_selector | lv.STATE_DEFAULT) + end + end + def get_pad_all() + end + + def set_radius2(t) + if self._lv_part2_selector != nil + self._lv_obj.set_style_radius(int(t), self._lv_part2_selector | lv.STATE_DEFAULT) + end + end + def get_radius2() + if self._lv_part2_selector != nil + return self._lv_obj.get_style_radius(self._lv_part2_selector | lv.STATE_DEFAULT) + end + end + + #- ------------------------------------------------------------ + Mapping of virtual attributes + - ------------------------------------------------------------ -# + def member(k) + # tostring is a special case, we shouldn't raise an exception for it + if k == 'tostring' return nil end + # + if self._attr_map.has(k) + import introspect + var kv = self._attr_map[k] + if kv + var f = introspect.get(self._lv_obj, "get_" + kv) + if type(f) == 'function' + return f(self._lv_obj) + end + else + # call self method + var f = introspect.get(self, "get_" + k) + if type(f) == 'function' + return f(self, k) + end + end + end + raise "value_error", "unknown attribute " + str(k) + end + + def setmember(k, v) + import string + # print(">> setmember", k, v) + # print(">>", classname(self), self._attr_map) + if self._attr_ignore.find(k) != nil + return + elif self._attr_map.has(k) + import introspect + var kv = self._attr_map[k] + if kv + var f = introspect.get(self._lv_obj, "set_" + kv) + # if the attribute contains 'color', convert to lv_color + if type(kv) == 'string' && is_color_attribute(kv) + v = parse_color(v) + end + # print("f=", f, v, kv, self._lv_obj, self) + if type(f) == 'function' + if string.find(kv, "style_") == 0 + # style function need a selector as second parameter + f(self._lv_obj, v, lv.PART_MAIN | lv.STATE_DEFAULT) + else + f(self._lv_obj, v) + end + return + else + print("HSP: Could not find function set_"+kv) + end + else + # call self method + var f = introspect.get(self, "set_" + k) + # print("f==",f) + if type(f) == 'function' + f(self, v) + return + end + end + + else + print("HSP: unknown attribute:", k) + end + # silently ignore if the attribute name is not supported + end +end + +#- ------------------------------------------------------------ + Other widgets +- ------------------------------------------------------------ -# + +#- ------------------------------------------------------------ + label +#- ------------------------------------------------------------# +class lvh_label : lvh_obj + static _lv_class = lv.label + # label do not need a sub-label + def post_init() + self._lv_label = self._lv_obj + end +end + +#- ------------------------------------------------------------ + arc +#- ------------------------------------------------------------# +class lvh_arc : lvh_obj + static _lv_class = lv.arc + static _lv_part2_selector = lv.PART_KNOB + + # line_width converts to arc_width + def set_line_width(t) + self._lv_obj.set_style_arc_width(int(t), lv.PART_MAIN | lv.STATE_DEFAULT) + end + def get_line_width() + return self._lv_obj.get_arc_line_width(lv.PART_MAIN | lv.STATE_DEFAULT) + end + def set_line_width1(t) + self._lv_obj.set_style_arc_width(int(t), lv.PART_INDICATOR | lv.STATE_DEFAULT) + end + def get_line_width1() + return self._lv_obj.get_arc_line_width(lv.PART_INDICATOR | lv.STATE_DEFAULT) + end + + def set_min(t) + self._lv_obj.set_range(int(t), self.get_max()) + end + def set_max(t) + self._lv_obj.set_range(self.get_min(), int(t)) + end + def get_min() + return self._lv_obj.get_min_value() + end + def get_max() + return self._lv_obj.get_max_value() + end + def set_type(t) + var mode + if t == 0 mode = lv.ARC_MODE_NORMAL + elif t == 1 mode = lv.ARC_MODE_REVERSE + elif t == 2 mode = lv.ARC_MODE_SYMMETRICAL + end + if mode != nil + self._lv_obj.set_mode(mode) + end + end + def get_type() + return self._lv_obj.get_mode() + end + # mode + def set_mode(t) + var mode + if mode == "expand" self._lv_obj.set_width(lv.SIZE_CONTENT) + elif mode == "break" mode = lv.LABEL_LONG_WRAP + elif mode == "dots" mode = lv.LABEL_LONG_DOT + elif mode == "scroll" mode = lv.LABEL_LONG_SCROLL + elif mode == "loop" mode = lv.LABEL_LONG_SCROLL_CIRCULAR + elif mode == "crop" mode = lv.LABEL_LONG_CLIP + end + if mode != nil + self._lv_obj.lv_label_set_long_mode(mode) + end + end + def get_mode() + end + +end + +#- ------------------------------------------------------------ + switch +#- ------------------------------------------------------------# +class lvh_switch : lvh_obj + static _lv_class = lv.switch + static _lv_part2_selector = lv.PART_KNOB +end + +#- ------------------------------------------------------------ + spinner +#- ------------------------------------------------------------# +class lvh_spinner : lvh_arc + static _lv_class = lv.spinner + + # init + # - create the LVGL encapsulated object + # arg1: parent object + # arg2: json line object + def init(parent, jline) + var angle = jline.find("angle", 60) + var speed = jline.find("speed", 1000) + self._lv_obj = lv.spinner(parent, speed, angle) + self.post_init() + end + + # ignore attributes, spinner can't be changed once created + def set_angle(t) end + def get_angle() end + def set_speed(t) end + def get_speed() end +end + +#- creat sub-classes of lvh_obj and map the LVGL class in static '_lv_class' attribute -# +class lvh_bar : lvh_obj static _lv_class = lv.bar end +class lvh_btn : lvh_obj static _lv_class = lv.btn end +class lvh_btnmatrix : lvh_obj static _lv_class = lv.btnmatrix end +class lvh_checkbox : lvh_obj static _lv_class = lv.checkbox end +class lvh_dropdown : lvh_obj static _lv_class = lv.dropdown end +class lvh_img : lvh_obj static _lv_class = lv.img end +class lvh_line : lvh_obj static _lv_class = lv.line end +class lvh_roller : lvh_obj static _lv_class = lv.roller end +class lvh_slider : lvh_obj static _lv_class = lv.slider end +class lvh_textarea : lvh_obj static _lv_class = lv.textarea end + +#- ---------------------------------------------------------------------------- + Class `lvh_page` encapsulating `lv_obj` as screen (created with lv.obj(0)) +- ----------------------------------------------------------------------------- -# +# ex of transition: lv.scr_load_anim(scr, lv.SCR_LOAD_ANIM_MOVE_RIGHT, 500, 0, false) +class lvh_page + var _obj_id # (map) of objects by id numbers + var _page_id # (int) id number of the page + var _lv_scr # (lv_obj) lvgl screen object + + #- init(page_number) -# + def init(page_number) + import global + + # if no parameter, default to page #1 + if page_number == nil page_number = 1 end + + self._page_id = page_number # remember our page_number + self._obj_id = {} # init list of objects + if page_number == 1 + self._lv_scr = lv.scr_act() # default screen + elif page_number == 0 + self._lv_scr = lv.layer_top() # top layer, visible over all screens + else + self._lv_scr = lv.obj(0) # allocate a new screen + # self._lv_scr.set_style_bg_color(lv.color(0x000000), lv.PART_MAIN | lv.STATE_DEFAULT) # set black background + self._lv_scr.set_style_bg_color(lv.color(0xFFFFFF), lv.PART_MAIN | lv.STATE_DEFAULT) # set white background + end + + # create a global for this page of form p, ex p1 + var glob_name = string.format("p%i", self._page_id) + global.(glob_name) = self + end + + #- retrieve lvgl screen object for this page -# + def get_scr() + return self._lv_scr + end + + #- add an object to this page -# + def set_obj(id, o) + self._obj_id[id] = o + end + def get_obj(id) + return self._obj_id.find(id) + end + + #- return id of this page -# + def id() + return self._page_id + end + + #- show this page, with animation -# + def show(anim, duration) + # ignore if there is no screen, like for id 0 + if self._lv_scr == nil return nil end + # ignore if the screen is already active + if self._lv_scr._p == lv.scr_act()._p return end # do nothing + + # default animation is lv.SCR_LOAD_ANIM_MOVE_RIGHT + if anim == nil anim = lv.SCR_LOAD_ANIM_MOVE_RIGHT end + # default duration of 500ms + if duration == nil duration = 500 end + + # load new screen with anumation, no delay, 500ms transition time, no auto-delete + lv.scr_load_anim(self._lv_scr, lv.SCR_LOAD_ANIM_MOVE_RIGHT, duration, 0, false) + end +end + +#- pages -# +var lvh_page_cur = lvh_page(1) +var lvh_pages = { 1: lvh_page_cur } # always create page #1 + +f = open("pages.jsonl","r") +var jsonl = string.split(f.read(), "\n") +f.close() + +#- ------------------------------------------------------------ + Parse page information + + Create a new page object if required + Change the active page +- ------------------------------------------------------------ -# +def parse_page(jline) + if jline.has("page") && type(jline["page"]) == 'int' + var page = int(jline["page"]) + # does the page already exist? + if lvh_pages.has(page) + # yes, just change the current page + lvh_page_cur = lvh_pages[page] + else + # no, create a new page + lvh_page_cur = lvh_page(page) + lvh_pages[page] = lvh_page_cur + end + end +end + +#- ------------------------------------------------------------ + Parse single object + +- ------------------------------------------------------------ -# +def parse_obj(jline, page) + import global + import introspect + + # line must contain 'obj' and 'id', otherwise it is ignored + if jline.has("obj") && jline.has("id") && type(jline["id"]) == 'int' + # 'obj_id' must be between 1 and 254 + var obj_id = int(jline["id"]) + if obj_id < 1 || obj_id > 254 + raise "value error", "invalid id " + str(obj_id) + end + + # extract openhasp class, prefix with `lvh_`. Ex: `btn` becomes `lvh_btn` + var obj_type = jline["obj"] + + # extract parent + var parent + var parent_id = int(jline.find("parentid")) + if parent_id != nil + var parent_obj = lvh_page_cur.get_obj(parent_id) + if parent_obj != nil + parent = parent_obj._lv_obj + end + end + if parent == nil + parent = page.get_scr() + end + + # check if a class with the requested name exists + var obj_class = introspect.get(global, "lvh_" + obj_type) + if obj_class == nil + raise "value error", "cannot find object of type " + str(obj_type) + end + + # instanciate the object, passing the lvgl screen as paren object + var obj = obj_class(parent, jline) + + # add object to page object + lvh_page_cur.set_obj(obj_id, obj) + # set attributes + # try every attribute, if not supported it is silently ignored + for k:jline.keys() + # introspect.set(obj, k, jline[k]) + obj.(k) = jline[k] + end + + # create a global variable for this object of form pb, ex p1b2 + var glob_name = string.format("p%ib%i", lvh_page_cur.id(), obj_id) + global.(glob_name) = obj + end +end + +# ex: +# {'page': 1, 'h': 50, 'obj': 'label', 'hidden': false, 'text': 'Hello', 'x': 5, 'id': 1, 'enabled': true, 'y': 5, 'w': 50} +# {"page":1,"id":2,"obj":"btn","x":5,"y":90,"h":90,"w":50,"text":"World","enabled":false,"hidden":false} + +#- ------------------------------------------------------------ + Parse jsonl file line by line + +- ------------------------------------------------------------ -# +tasmota.yield() +for j:jsonl + var jline = json.load(j) + + # parse page first + if type(jline) == 'instance' + parse_page(jline) + parse_obj(jline, lvh_page_cur) + end +end diff --git a/lib/libesp32/berry/default/embedded/openhasp/demo-all.jsonl b/lib/libesp32/berry/default/embedded/openhasp/demo-all.jsonl new file mode 100644 index 000000000..76d3ed810 --- /dev/null +++ b/lib/libesp32/berry/default/embedded/openhasp/demo-all.jsonl @@ -0,0 +1,61 @@ +{"page":1,"comment":"---------- Page 1 ----------"} +{"page":1,"id":0,"bg_color":"#FFFFFF","bg_grad_color":"#FFFFFF","text_color":"#000000","radius":0,"border_side":0} +{"page":1,"id":1,"obj":"btn","x":0,"y":0,"w":240,"h":30,"text":"LIVING ROOM","value_font":24,"bg_color":"#2C3E50","bg_grad_color":"#2C3E50","text_color":"#FFFFFF","radius":0,"border_side":0} + +{"page":1,"id":2,"obj":"arc","x":20,"y":65,"w":80,"h":100,"max":40,"border_side":0,"type":0,"rotation":0,"start_angle":180,"end_angle":0,"start_angle1":180,"value_font":12,"value_ofs_x":0,"value_ofs_y":-14,"bg_opa":0,"text":"21.2°C","min":-20,"max":50,"val":21} + +{"page":1,"id":3,"obj":"arc","x":140,"y":65,"w":80,"h":100,"max":100,"border_side":0,"type":0,"start_angle":180,"end_angle":0,"start_angle1":180,"value_font":12,"value_color":"#000000","value_ofs_x":0,"value_ofs_y":-14,"bg_opa":0,"text":"44%","val":44} + +{"page":1,"id":4,"obj":"label","x":0,"y":120,"w":240,"h":20,"text":"CO2 levels: 1483 ppm","radius":0,"border_side":0,"align":1} +{"page":1,"id":5,"obj":"label","x":2,"y":35,"w":140,"text":"Temperature","align":1} +{"page":1,"id":6,"obj":"label","x":140,"y":35,"w":95,"text":"Humidity","align":1} +{"page":1,"id":7,"obj":"btn","x":0,"y":160,"w":240,"h":20,"text":"LIGHTS","bg_color":"#F1C40F","text_color":"#FFFFFF","radius":0,"border_side":0} +{"page":1,"id":8,"obj":"label","x":20,"y":190,"w":140,"h":20,"text":"Ceiling Light"} +{"page":1,"id":9,"obj":"switch","x":160,"y":190,"w":40,"h":20,"toggle":"TRUE"} +{"page":1,"id":10,"obj":"label","x":20,"y":215,"w":140,"h":20,"text":"Wall Light"} +{"page":1,"id":11,"obj":"switch","x":160,"y":215,"w":40,"h":20,"toggle":"TRUE"} +{"page":1,"id":12,"obj":"label","x":20,"y":240,"w":200,"h":20,"text":"Ambient Light"} +{"page":1,"id":13,"obj":"slider","x":30,"y":265,"w":200,"h":10} + +{"page":2,"comment":"---------- Page 2 ----------"} +{"page":2,"id":1,"obj":"btn","x":0,"y":0,"w":240,"h":30,"text":"ENTITIES","value_font":24,"bg_color":"#2C3E50","text_color":"#FFFFFF","radius":0,"border_side":0,"click":0} +{"page":2,"id":2,"obj":"obj","x":5,"y":35,"w":230,"h":250,"click":0} + +{"page":2,"id":11,"obj":"label","x":8,"y":33,"w":35,"h":35,"text":"\uE004","align":1,"text_font":32,"text_color":"black"} +{"page":2,"id":12,"obj":"label","x":48,"y":43,"w":130,"h":30,"text":"Presence override","align":0,"text_font":16,"text_color":"black"} +{"page":2,"id":13,"obj":"switch","x":177,"y":40,"w":50,"h":25,"radius":25,"radius2":15} + +{"page":2,"id":21,"obj":"label","x":8,"y":69,"w":35,"h":35,"text":"\uF020","align":1,"text_font":32,"text_color":"black"} +{"page":2,"id":22,"obj":"label","x":48,"y":79,"w":130,"h":30,"text":"Front door light","align":0,"text_font":16,"text_color":"black"} +{"page":2,"id":23,"obj":"switch","x":177,"y":74,"w":50,"h":25,"radius":25,"radius2":15} + +{"page":2,"id":31,"obj":"label","x":8,"y":103,"w":35,"h":35,"text":"\uF054","align":1,"text_font":32,"text_color":"black"} +{"page":2,"id":32,"obj":"label","x":48,"y":113,"w":130,"h":30,"text":"Back yard lights","align":0,"text_font":16,"text_color":"black"} +{"page":2,"id":33,"obj":"switch","x":177,"y":110,"w":50,"h":25,"radius":25,"radius2":15} + +{"page":2,"id":41,"obj":"label","x":8,"y":138,"w":35,"h":35,"text":"\uEA7A","align":1,"text_font":32,"text_color":"black"} +{"page":2,"id":42,"obj":"label","x":48,"y":148,"w":130,"h":30,"text":"Trash service","align":0,"text_font":16,"text_color":"black"} +{"page":2,"id":43,"obj":"label","x":97,"y":148,"w":130,"h":30,"text":"in 6 days","align":2,"text_color":"black"} + +{"page":2,"id":51,"obj":"label","x":8,"y":173,"w":35,"h":35,"text":"\uF39D","align":1,"text_font":32,"text_color":"black"} +{"page":2,"id":52,"obj":"label","x":48,"y":183,"w":130,"h":30,"text":"Selective trash","align":0,"text_font":16,"text_color":"black"} +{"page":2,"id":53,"obj":"label","x":97,"y":183,"w":130,"h":30,"text":"in 10 days","align":2,"text_color":"black"} + +{"page":2,"id":61,"obj":"label","x":8,"y":208,"w":35,"h":35,"text":"\uE32A","align":1,"text_font":32,"text_color":"black"} +{"page":2,"id":62,"obj":"label","x":48,"y":218,"w":130,"h":30,"text":"Green energy active","align":0,"text_font":16,"text_color":"black"} +{"page":2,"id":63,"obj":"label","x":97,"y":218,"w":130,"h":30,"text":"Yes :)","align":2,"text_color":"black"} + +{"page":2,"id":71,"obj":"label","x":8,"y":243,"w":35,"h":35,"text":"\uE957","align":1,"text_font":32,"text_color":"black"} +{"page":2,"id":72,"obj":"label","x":48,"y":253,"w":130,"h":30,"text":"Air quality","align":0,"text_font":16,"text_color":"black"} +{"page":2,"id":73,"obj":"label","x":97,"y":253,"w":130,"h":30,"text":"OK (29.58 µg/m³)","align":2,"text_color":"black"} + +{"page":3,"comment":"---------- Page 3 ----------"} +{"page":3,"id":1,"obj":"btn","x":0,"y":0,"w":240,"h":30,"text":"FAN STATUS","text_font":16,"bg_color":"#2C3E50","text_color":"#FFFFFF","radius":0,"border_side":0,"click":0} + +{"page":3,"id":11,"obj":"img","src":"A:/noun_Fan_35097_140.png","auto_size":1,"w":140,"h":140,"x":50,"y":75,"image_recolor":"lime","image_recolor_opa":150} +{"page":3,"id":12,"obj":"spinner","parentid":11,"x":7,"y":6,"w":126,"h":126,"bg_opa":0,"border_width":0,"line_width":7,"line_width1":7,"type":2,"angle":120,"speed":1000,"value_str":3,"value_font":24} + +{"page":0,"comment":"---------- All pages ----------"} +{"page":0,"id":11,"obj":"btn","action":"prev","x":0,"y":290,"w":79,"h":32,"bg_color":"#34495E","text":"\uE141","text_color":"#CCCCCC","radius":0,"border_side":0,"text_font":32} +{"page":0,"id":12,"obj":"btn","action":"back","x":80,"y":290,"w":80,"h":32,"bg_color":"#34495E","text":"\uE2DC","text_color":"#CCCCCC","radius":0,"border_side":0,"text_font":24} +{"page":0,"id":13,"obj":"btn","action":"next","x":161,"y":290,"w":79,"h":32,"bg_color":"#34495E","text":"\uE142","text_color":"#CCCCCC","radius":0,"border_side":0,"text_font":32} diff --git a/lib/libesp32/berry/default/embedded/openhasp/demo1.jsonl b/lib/libesp32/berry/default/embedded/openhasp/demo1.jsonl new file mode 100644 index 000000000..684e0d324 --- /dev/null +++ b/lib/libesp32/berry/default/embedded/openhasp/demo1.jsonl @@ -0,0 +1,23 @@ +{"page":1,"comment":"---------- Page 1 ----------"} +{"page":1,"id":0,"bg_color":"#FFFFFF","bg_grad_color":"#FFFFFF","text_color":"#000000","radius":0,"border_side":0} +{"page":1,"id":1,"obj":"btn","x":0,"y":0,"w":240,"h":30,"text":"LIVING ROOM","value_font":22,"bg_color":"#2C3E50","bg_grad_color":"#2C3E50","text_color":"#FFFFFF","radius":0,"border_side":0} + +{"page":1,"id":2,"obj":"arc","x":20,"y":65,"w":80,"h":100,"max":40,"border_side":0,"type":0,"rotation":0,"start_angle":180,"end_angle":0,"start_angle1":180,"value_font":12,"value_ofs_x":0,"value_ofs_y":-14,"bg_opa":0,"text":"21.2°C","min":-20,"max":50,"val":21} + +{"page":1,"id":3,"obj":"arc","x":140,"y":65,"w":80,"h":100,"max":100,"border_side":0,"type":0,"start_angle":180,"end_angle":0,"start_angle1":180,"value_font":12,"value_color":"#000000","value_ofs_x":0,"value_ofs_y":-14,"bg_opa":0,"text":"44%","val":44} + +{"page":1,"id":4,"obj":"label","x":0,"y":120,"w":240,"h":20,"text":"CO2 levels: 1483 ppm","radius":0,"border_side":0,"align":1} +{"page":1,"id":5,"obj":"label","x":2,"y":35,"w":140,"text":"Temperature","align":1} +{"page":1,"id":6,"obj":"label","x":140,"y":35,"w":95,"text":"Humidity","align":1} +{"page":1,"id":7,"obj":"btn","x":0,"y":160,"w":240,"h":20,"text":"LIGHTS","bg_color":"#F1C40F","text_color":"#FFFFFF","radius":0,"border_side":0} +{"page":1,"id":8,"obj":"label","x":20,"y":190,"w":140,"h":20,"text":"Ceiling Light"} +{"page":1,"id":9,"obj":"switch","x":160,"y":190,"w":40,"h":20,"toggle":"TRUE"} +{"page":1,"id":10,"obj":"label","x":20,"y":215,"w":140,"h":20,"text":"Wall Light"} +{"page":1,"id":11,"obj":"switch","x":160,"y":215,"w":40,"h":20,"toggle":"TRUE"} +{"page":1,"id":12,"obj":"label","x":20,"y":240,"w":200,"h":20,"text":"Ambient Light"} +{"page":1,"id":13,"obj":"slider","x":30,"y":265,"w":200,"h":10} + +{"page":0,"comment":"---------- All pages ----------"} +{"page":0,"id":11,"obj":"btn","action":"prev","x":0,"y":290,"w":79,"h":32,"bg_color":"#34495E","text":"\uE141","text_color":"#CCCCCC","radius":0,"border_side":0,"text_font":32} +{"page":0,"id":12,"obj":"btn","action":"back","x":80,"y":290,"w":80,"h":32,"bg_color":"#34495E","text":"\uE2DC","text_color":"#CCCCCC","radius":0,"border_side":0,"text_font":24} +{"page":0,"id":13,"obj":"btn","action":"next","x":161,"y":290,"w":79,"h":32,"bg_color":"#34495E","text":"\uE142","text_color":"#CCCCCC","radius":0,"border_side":0,"text_font":32} diff --git a/lib/libesp32/berry/default/embedded/openhasp/demo2.jsonl b/lib/libesp32/berry/default/embedded/openhasp/demo2.jsonl new file mode 100644 index 000000000..b1d6efc34 --- /dev/null +++ b/lib/libesp32/berry/default/embedded/openhasp/demo2.jsonl @@ -0,0 +1,35 @@ +{"page":1,"id":1,"obj":"btn","x":0,"y":0,"w":240,"h":30,"text":"ENTITIES","value_font":22,"bg_color":"#2C3E50","text_color":"#FFFFFF","radius":0,"border_side":0,"click":0} +{"page":1,"id":2,"obj":"obj","x":5,"y":35,"w":230,"h":250,"click":0} + +{"page":1,"id":11,"obj":"label","x":8,"y":33,"w":35,"h":35,"text":"\uE004","align":1,"text_font":32,"text_color":"black"} +{"page":1,"id":12,"obj":"label","x":48,"y":43,"w":130,"h":30,"text":"Presence override","align":0,"text_font":16,"text_color":"black"} +{"page":1,"id":13,"obj":"switch","x":177,"y":40,"w":50,"h":25,"radius":25,"radius2":15} + +{"page":1,"id":21,"obj":"label","x":8,"y":69,"w":35,"h":35,"text":"\uF020","align":1,"text_font":32,"text_color":"black"} +{"page":1,"id":22,"obj":"label","x":48,"y":79,"w":130,"h":30,"text":"Front door light","align":0,"text_font":16,"text_color":"black"} +{"page":1,"id":23,"obj":"switch","x":177,"y":74,"w":50,"h":25,"radius":25,"radius2":15} + +{"page":1,"id":31,"obj":"label","x":8,"y":103,"w":35,"h":35,"text":"\uF054","align":1,"text_font":32,"text_color":"black"} +{"page":1,"id":32,"obj":"label","x":48,"y":113,"w":130,"h":30,"text":"Back yard lights","align":0,"text_font":16,"text_color":"black"} +{"page":1,"id":33,"obj":"switch","x":177,"y":110,"w":50,"h":25,"radius":25,"radius2":15} + +{"page":1,"id":41,"obj":"label","x":8,"y":138,"w":35,"h":35,"text":"\uEA7A","align":1,"text_font":32,"text_color":"black"} +{"page":1,"id":42,"obj":"label","x":48,"y":148,"w":130,"h":30,"text":"Trash service","align":0,"text_font":16,"text_color":"black"} +{"page":1,"id":43,"obj":"label","x":97,"y":148,"w":130,"h":30,"text":"in 6 days","align":2,"text_color":"black"} + +{"page":1,"id":51,"obj":"label","x":8,"y":173,"w":35,"h":35,"text":"\uF39D","align":1,"text_font":32,"text_color":"black"} +{"page":1,"id":52,"obj":"label","x":48,"y":183,"w":130,"h":30,"text":"Selective trash","align":0,"text_font":16,"text_color":"black"} +{"page":1,"id":53,"obj":"label","x":97,"y":183,"w":130,"h":30,"text":"in 10 days","align":2,"text_color":"black"} + +{"page":1,"id":61,"obj":"label","x":8,"y":208,"w":35,"h":35,"text":"\uE32A","align":1,"text_font":32,"text_color":"black"} +{"page":1,"id":62,"obj":"label","x":48,"y":218,"w":130,"h":30,"text":"Green energy active","align":0,"text_font":16,"text_color":"black"} +{"page":1,"id":63,"obj":"label","x":97,"y":218,"w":130,"h":30,"text":"Yes :)","align":2,"text_color":"black"} + +{"page":1,"id":71,"obj":"label","x":8,"y":243,"w":35,"h":35,"text":"\uE957","align":1,"text_font":32,"text_color":"black"} +{"page":1,"id":72,"obj":"label","x":48,"y":253,"w":130,"h":30,"text":"Air quality","align":0,"text_font":16,"text_color":"black"} +{"page":1,"id":73,"obj":"label","x":97,"y":253,"w":130,"h":30,"text":"OK (29.58 µg/m³)","align":2,"text_color":"black"} + +{"page":0,"comment":"---------- All pages ----------"} +{"page":0,"id":11,"obj":"btn","action":"prev","x":0,"y":290,"w":79,"h":32,"bg_color":"#34495E","text":"\uE141","text_color":"#CCCCCC","radius":0,"border_side":0,"text_font":32} +{"page":0,"id":12,"obj":"btn","action":"back","x":80,"y":290,"w":80,"h":32,"bg_color":"#34495E","text":"\uE2DC","text_color":"#CCCCCC","radius":0,"border_side":0,"text_font":24} +{"page":0,"id":13,"obj":"btn","action":"next","x":161,"y":290,"w":79,"h":32,"bg_color":"#34495E","text":"\uE142","text_color":"#CCCCCC","radius":0,"border_side":0,"text_font":32} diff --git a/lib/libesp32/berry/default/embedded/openhasp/demo3.jsonl b/lib/libesp32/berry/default/embedded/openhasp/demo3.jsonl new file mode 100644 index 000000000..f8b952f81 --- /dev/null +++ b/lib/libesp32/berry/default/embedded/openhasp/demo3.jsonl @@ -0,0 +1,4 @@ +{"page":1,"id":1,"obj":"btn","x":0,"y":0,"w":240,"h":30,"text":"FAN STATUS","text_font":16,"bg_color":"#2C3E50","text_color":"#FFFFFF","radius":0,"border_side":0,"click":0} + +{"page":1,"id":11,"obj":"img","src":"A:/noun_Fan_35097_140.png","auto_size":1,"w":140,"h":140,"x":50,"y":75,"image_recolor":"lime","image_recolor_opa":150} +{"page":1,"id":12,"obj":"spinner","parentid":11,"x":7,"y":6,"w":126,"h":126,"bg_opa":0,"border_width":0,"line_width":7,"line_width1":7,"type":2,"angle":120,"speed":1000,"value_str":3,"value_font":24} \ No newline at end of file diff --git a/lib/libesp32/berry/default/embedded/persist.be b/lib/libesp32/berry/default/embedded/persist.be new file mode 100644 index 000000000..164a1dd7b --- /dev/null +++ b/lib/libesp32/berry/default/embedded/persist.be @@ -0,0 +1,161 @@ +#- persistance module for Berry -# +#- -# +#- To solidify: -# +#- + # load only persis_module and persist_module.init + import solidify + solidify.dump(persist_module.init) + # copy and paste into `be_persist_lib.c` +-# +var persist_module = module("persist") + +persist_module.init = def (m) + + class Persist + var _filename + var _p + var _dirty + + #- persist can be initialized with pre-existing values. The map is not copied so any change will be reflected -# + def init(m) + # print("Persist init") + self._filename = '_persist.json' + if isinstance(m,map) + self._p = m.copy() # need to copy instead? + else + self._p = {} + end + self.load(self._p, self._filename) + self._dirty = false + # print("Persist init") + end + + #- virtual member getter, if a key does not exists return `nil`-# + def member(key) + return self._p.find(key) + end + + #- virtual member setter -# + def setmember(key, value) + self._p[key] = value + self._dirty = true + end + + #- clear all entries -# + def zero() + self._p = {} + self._dirty = true + end + + def remove(k) + self._p.remove(k) + self._dirty = true + end + + def has(k) + return self._p.has(k) + end + + def find(k, d) + return self._p.find(k, d) + end + + def load() + import json + import path + var f # file object + var val # values loaded from json + + if path.exists(self._filename) + try + f = open(self._filename, "r") + val = json.load(f.read()) + f.close() + except .. as e, m + if f != nil f.close() end + raise e, m + end + if isinstance(val, map) + self._p = val # sucess + else + print("BRY: failed to load _persist.json") + end + self._dirty = false + else + self.save() + end + + # print("Loading") + end + + def save() + var f # file object + try + f = open(self._filename, "w") + self.json_fdump(f) + f.close() + except .. as e, m + if f != nil f.close() end + f = open(self._filename, "w") + f.write('{}') # fallback write empty map + f.close() + raise e, m + end + self._dirty = false + # print("Saving") + end + + def json_fdump_any(f, v) + import json + if isinstance(v, map) + self.json_fdump_map(f, v) + elif isinstance(v, list)v + self.json_fdump_list(f, v) + else + f.write(json.dump(v)) + end + end + + def json_fdump_map(f, v) + import json + f.write('{') + var sep = nil + for k:v.keys() + if sep != nil f.write(sep) end + + f.write(json.dump(str(k))) + f.write(':') + self.json_fdump_any(f, v[k]) + + sep = "," + end + f.write('}') + end + + def json_fdump_list(f, v) + import json + f.write('[') + var i = 0 + while i < size(v) + if i > 0 f.write(',') end + self.json_fdump_any(f, v[i]) + i += 1 + end + f.write(']') + end + + def json_fdump(f) + import json + if isinstance(self._p, map) + self.json_fdump_map(f, self._p) + else + raise "internal_error", "persist._p is not a map" + end + end + end + + + return Persist() # return an instance of this class +end + +return persist_module diff --git a/lib/libesp32/berry/default/embedded/tapp.be b/lib/libesp32/berry/default/embedded/tapp.be new file mode 100644 index 000000000..30aa1f740 --- /dev/null +++ b/lib/libesp32/berry/default/embedded/tapp.be @@ -0,0 +1,35 @@ +#- Tasmota apps module for Berry -# +#- -# + +var tapp_module = module("tapp") + +tapp_module.init = def (m) + + class Tapp + + def init() + tasmota.add_driver(self) + end + + def autoexec() + import path + import string + + var dir = path.listdir("/") + + for d: dir + if string.find(d, ".tapp") > 0 + tasmota.log(string.format("TAP: found Tasmota App '%s'", d), 2) + tasmota.load(d + "#autoexec.be") + end + end + end + end + + return Tapp() # return an instance of this class +end + +# aa = autoconf_module.init(autoconf_module) +# import webserver +# webserver.on('/ac2', / -> aa.page_autoconf_mgr(), webserver.HTTP_GET) +return tapp_module diff --git a/lib/libesp32/berry/default/embedded/test_crypto.be b/lib/libesp32/berry/default/embedded/test_crypto.be new file mode 100644 index 000000000..f2edbfee5 --- /dev/null +++ b/lib/libesp32/berry/default/embedded/test_crypto.be @@ -0,0 +1,30 @@ +ec = crypto.EC_C25519() + +# Alice +sk_A = bytes('77076d0a7318a57d3c16c17251b26645df4c2f87ebc0992ab177fba51db92c2a') +pk_A = ec.public_key(sk_A) +assert(pk_A == bytes('8520f0098930a754748b7ddcb43ef75a0dbf3a0d26381af4eba4a98eaa9b4e6a')) + +# Bob +sk_B = bytes('5dab087e624a8a4b79e17f8b83800ee66f3bb1292618b6fd1c2f8b27ff88e0eb') +pk_B = ec.public_key(sk_B) +assert(pk_B == bytes('de9edb7d7b7dc1b4d35b61c2ece435373f8343c85b78674dadfc7e146f882b4f')) + +psk = ec.shared_key(sk_A, pk_B) +assert(psk == bytes('4a5d9d5ba4ce2de1728e3bf480350f25e07e21c947d19e3376f09b3c1e161742')) +psk2 = ec.shared_key(sk_B, pk_A) +assert(psk2 == bytes('4a5d9d5ba4ce2de1728e3bf480350f25e07e21c947d19e3376f09b3c1e161742')) + +#- test vectors from RFC77748 + + Alice's private key, a: + 77076d0a7318a57d3c16c17251b26645df4c2f87ebc0992ab177fba51db92c2a + Alice's public key, X25519(a, 9): + 8520f0098930a754748b7ddcb43ef75a0dbf3a0d26381af4eba4a98eaa9b4e6a + Bob's private key, b: + 5dab087e624a8a4b79e17f8b83800ee66f3bb1292618b6fd1c2f8b27ff88e0eb + Bob's public key, X25519(b, 9): + de9edb7d7b7dc1b4d35b61c2ece435373f8343c85b78674dadfc7e146f882b4f + Their shared secret, K: + 4a5d9d5ba4ce2de1728e3bf480350f25e07e21c947d19e3376f09b3c1e161742 +-# diff --git a/lib/libesp32/berry/default/static_block.hpp b/lib/libesp32/berry/default/static_block.hpp new file mode 100644 index 000000000..152dda130 --- /dev/null +++ b/lib/libesp32/berry/default/static_block.hpp @@ -0,0 +1,80 @@ +/** + * static_block.hpp + * + * An implementation of a Java-style static block, in C++ (and potentially a + * GCC/clang extension to avoid warnings). Almost, but not quite, valid C. + * Partially inspired by Andrei Alexandrescu's Scope Guard and + * discussions on stackoverflow.com + * + * By Eyal Rozenberg + * + * Licensed under the Apache License v2.0: + * http://www.apache.org/licenses/LICENSE-2.0 + * + */ +#pragma once +#ifndef STATIC_BLOCK_HPP_ +#define STATIC_BLOCK_HPP_ + +#ifndef CONCATENATE +#define CONCATENATE(s1, s2) s1##s2 +#define EXPAND_THEN_CONCATENATE(s1, s2) CONCATENATE(s1, s2) +#endif /* CONCATENATE */ + +#ifndef UNIQUE_IDENTIFIER +/** + * This macro expands into a different identifier in every expansion. + * Note that you _can_ clash with an invocation of UNIQUE_IDENTIFIER + * by manually using the same identifier elsewhere; or by carefully + * choosing another prefix etc. + */ +#ifdef __COUNTER__ +#define UNIQUE_IDENTIFIER(prefix) EXPAND_THEN_CONCATENATE(prefix, __COUNTER__) +#else +#define UNIQUE_IDENTIFIER(prefix) EXPAND_THEN_CONCATENATE(prefix, __LINE__) +#endif /* COUNTER */ +#else +#endif /* UNIQUE_IDENTIFIER */ + +/** + * Following is a mechanism for executing code statically. + * + * @note Caveats: + * - Your static block must be surround by curly braces. + * - No need for a semicolon after the block (but it won't hurt). + * - Do not put static blocks in files, as it might get compiled multiple + * times ane execute multiple times. + * - A static_block can only be used in file scope - not within any other block etc. + * - Templated static blocks will probably not work. Avoid them. + * - No other funny business, this is fragile. + * - This does not having any threading issues (AFAICT) - as it has no static + * initialization order issue. Of course, you have to _keep_ it safe with + * your static code. + * - Execution of the code is guaranteed to occur before main() executes, + * but the relative order of statics being initialized is unknown/unclear. So, + * do not call any method of an instance of a class which you expect to have been + * constructed; it may not have been. Instead, you can use a static getInstance() method + * (look this idiom up on the web, it's safe). + * - Variables defined within the static block are not global; they will + * go out of scope as soon as its execution concludes. + * + * Usage example: + * + * static_block { + * do_stuff(); + * std::cout << "in the static block!\n"; + * } + * + */ +#define static_block STATIC_BLOCK_IMPL1(UNIQUE_IDENTIFIER(_static_block_)) + +#define STATIC_BLOCK_IMPL1(prefix) \ + STATIC_BLOCK_IMPL2(CONCATENATE(prefix,_fn),CONCATENATE(prefix,_var)) + +#define STATIC_BLOCK_IMPL2(function_name,var_name) \ +static void function_name(); \ +static int var_name __attribute((unused)) = (function_name(), 0) ; \ +static void function_name() + + +#endif // STATIC_BLOCK_HPP_ diff --git a/lib/libesp32/berry/examples/anon_func.be b/lib/libesp32/berry/examples/anon_func.be new file mode 100644 index 000000000..78854ce64 --- /dev/null +++ b/lib/libesp32/berry/examples/anon_func.be @@ -0,0 +1,20 @@ +# anonymous function and closure +def count(x) + var arr = [] + for i : 0 .. x + arr.push( + def (n) # loop variable cannot be used directly as free variable + return def () + return n * n + end + end (i) # define and call anonymous function + ) + end + return arr +end + +for xx : count(6) + print(xx()) # 0, 1, 4 ... n * n +end + +return count diff --git a/lib/libesp32/berry/examples/bigloop.be b/lib/libesp32/berry/examples/bigloop.be new file mode 100644 index 000000000..a3a77768b --- /dev/null +++ b/lib/libesp32/berry/examples/bigloop.be @@ -0,0 +1,15 @@ +import time + +c = time.clock() +do + i = 0 + while i < 100000000 + i += 1 + end +end +print('while iteration 100000000 times', time.clock() - c, 's') + +c = time.clock() +for i : 1 .. 100000000 +end +print('for iteration 100000000 times', time.clock() - c, 's') diff --git a/lib/libesp32/berry/examples/bintree.be b/lib/libesp32/berry/examples/bintree.be new file mode 100644 index 000000000..81936f8a0 --- /dev/null +++ b/lib/libesp32/berry/examples/bintree.be @@ -0,0 +1,60 @@ +# Reference from https://github.com/BerryMathDevelopmentTeam/BerryMath/blob/master/testscript/BinaryTree.bm + +class node + var v, l, r + def init(v, l, r) + self.v = v + self.l = l + self.r = r + end + def insert(v) + if v < self.v + if self.l + self.l.insert(v) + else + self.l = node(v) + end + else + if self.r + self.r.insert(v) + else + self.r = node (v) + end + end + end + def sort(l) + if (self.l) self.l.sort(l) end + l.push(self.v) + if (self.r) self.r.sort(l) end + end +end + +class btree + var root + def insert(v) + if self.root + self.root.insert(v) + else + self.root = node(v) + end + end + def sort() + var l = [] + if self.root + self.root.sort(l) + end + return l + end +end + +var tree = btree() +tree.insert(-100) +tree.insert(5); +tree.insert(3); +tree.insert(9); +tree.insert(10); +tree.insert(10000000); +tree.insert(1); +tree.insert(-1); +tree.insert(-10); +print(tree.sort()); diff --git a/lib/libesp32/berry/examples/calcpi.be b/lib/libesp32/berry/examples/calcpi.be new file mode 100644 index 000000000..053f87875 --- /dev/null +++ b/lib/libesp32/berry/examples/calcpi.be @@ -0,0 +1,16 @@ +def cpi(n) + i = 2 + pi = 3 + while i <= n + term = 4.0 / (i * (i + 1) * (i + 2)) + if i % 4 + pi = pi + term + else + pi = pi - term + end + i = i + 2 + end + return pi +end + +print("pi =", cpi(100)) diff --git a/lib/libesp32/berry/examples/exception.be b/lib/libesp32/berry/examples/exception.be new file mode 100644 index 000000000..3a3098dce --- /dev/null +++ b/lib/libesp32/berry/examples/exception.be @@ -0,0 +1,12 @@ +import debug + +def test_func() + try + compile('def +() end')() + except .. as e, v + print('catch execption:', str(e) + ' >>>\n ' + str(v)) + debug.traceback() + end +end + +test_func() diff --git a/lib/libesp32/berry/examples/fib_rec.be b/lib/libesp32/berry/examples/fib_rec.be new file mode 100644 index 000000000..31ed3817b --- /dev/null +++ b/lib/libesp32/berry/examples/fib_rec.be @@ -0,0 +1,12 @@ +import time + +def fib(x) + if x <= 2 + return 1 + end + return fib(x - 1) + fib(x - 2) +end + +c = time.clock() +print("fib:", fib(38)) # minimum stack size: 78!! +print("time:", time.clock() - c, 's') diff --git a/lib/libesp32/berry/examples/guess_number.be b/lib/libesp32/berry/examples/guess_number.be new file mode 100644 index 000000000..6cbd07e7c --- /dev/null +++ b/lib/libesp32/berry/examples/guess_number.be @@ -0,0 +1,26 @@ +import time +import math + +math.srand(time.time()) +res = math.rand() % 100 +max_test = 7 +test = -1 +idx = 1 +print('Guess a number between 0 and 99. You have', max_test, 'chances.') +while test != res && idx <= max_test + test = number(input(str(idx) + ': enter the number you guessed: ')) + if type(test) != 'int' + print('This is not an integer. Continue!') + continue + elif test > res + print('This number is too large.') + elif test < res + print('This number is too small.') + end + idx = idx + 1 +end +if test == res + print('You win!') +else + print('You failed, the correct answer is', res) +end diff --git a/lib/libesp32/berry/examples/json.be b/lib/libesp32/berry/examples/json.be new file mode 100644 index 000000000..d98dff8bb --- /dev/null +++ b/lib/libesp32/berry/examples/json.be @@ -0,0 +1,4 @@ +import json +print(json.load('{"key": "value"}')) +print(json.dump({'test key': nil})) +print(json.dump({'key1': nil, 45: true}, 'format')) diff --git a/lib/libesp32/berry/examples/lambda.be b/lib/libesp32/berry/examples/lambda.be new file mode 100644 index 000000000..1d0b709bb --- /dev/null +++ b/lib/libesp32/berry/examples/lambda.be @@ -0,0 +1,8 @@ +# simple lambda example +print((/a b c-> a * b + c)(2, 3, 4)) + +# Y-Combinator and factorial functions +Y = /f-> (/x-> f(/n-> x(x)(n)))(/x-> f(/n-> x(x)(n))) +F = /f-> /x-> x ? f(x - 1) * x : 1 +fact = Y(F) +print('fact(10) == ' .. fact(10)) diff --git a/lib/libesp32/berry/examples/listdir.be b/lib/libesp32/berry/examples/listdir.be new file mode 100644 index 000000000..2dd880118 --- /dev/null +++ b/lib/libesp32/berry/examples/listdir.be @@ -0,0 +1,16 @@ +import os + +def scandir(path) + print('path: ' + path) + for name : os.listdir(path) + var fullname = os.path.join(path, name) + if os.path.isfile(fullname) + print('file: ' + fullname) + else + print('path: ' + fullname) + scandir(fullname) + end + end +end + +scandir('.') diff --git a/lib/libesp32/berry/examples/qsort.be b/lib/libesp32/berry/examples/qsort.be new file mode 100644 index 000000000..b09b65672 --- /dev/null +++ b/lib/libesp32/berry/examples/qsort.be @@ -0,0 +1,42 @@ +def qsort(data) + # do once sort + def once(left, right) + var pivot = data[left] # use the 0th value as the pivot + while left < right # check if sort is complete + # put the value less than the pivot to the left + while left < right && data[right] >= pivot + right -= 1 # skip values greater than pivot + end + data[left] = data[right] + # put the value greater than the pivot on the right + while left < right && data[left] <= pivot + left += 1 # skip values less than pivot + end + data[right] = data[left] + end + # now we have the index of the pivot, store it + data[left] = pivot + return left # return the index of the pivot + end + # recursive quick sort algorithm + def _sort(left, right) + if left < right # executed when the array is not empty + var index = once(left, right) # get index of pivot for divide and conquer + _sort(left, index - 1) # sort the data on the left + _sort(index + 1, right) # sort the data on the right + end + end + # start quick sort + _sort(0, data.size() - 1) + return data +end + +import time, math +math.srand(time.time()) # sse system time as a random seed +data = [] +# put 20 random numbers into the array +for i : 1 .. 20 + data.push(math.rand() % 100) +end +# sort and print +print(qsort(data)) diff --git a/lib/libesp32/berry/examples/repl.be b/lib/libesp32/berry/examples/repl.be new file mode 100644 index 000000000..aac26b0a1 --- /dev/null +++ b/lib/libesp32/berry/examples/repl.be @@ -0,0 +1,61 @@ +do + def ismult(msg) + import string + return string.split(msg, -5)[1] == '\'EOS\'' + end + + def multline(src, msg) + if !ismult(msg) + print('syntax_error: ' + msg) + return + end + while true + try + src += '\n' + input('>> ') + return compile(src) + except 'syntax_error' as e, m + if !ismult(m) + print('syntax_error: ' + m) + return + end + end + end + end + + def parse() + var fun, src = input('> ') + try + fun = compile('return (' + src + ')') + except 'syntax_error' as e, m + try + fun = compile(src) + except 'syntax_error' as e, m + fun = multline(src, m) + end + end + return fun + end + + def run(fun) + try + var res = fun() + if res print(res) end + except .. as e, m + import debug + print(e .. ': ' .. m) + debug.traceback() + end + end + + def repl() + while true + var fun = parse() + if fun != nil + run(fun) + end + end + end + + print("Berry Berry REPL!") + repl() +end diff --git a/lib/libesp32/berry/examples/string.be b/lib/libesp32/berry/examples/string.be new file mode 100644 index 000000000..299834e21 --- /dev/null +++ b/lib/libesp32/berry/examples/string.be @@ -0,0 +1,32 @@ +s = "This is a long string test. 0123456789 abcdefg ABCDEFG" +print(s) + +a = .5 +print(a) + +import string as s + +print(s.hex(0x45678ABCD, 16)) + +def bin(x, num) + assert(type(x) == 'int', 'the type of \'x\' must be integer') + # test the 'x' bits + var bits = 1 + for i : 0 .. 62 + if x & (1 << 63 - i) + bits = 64 - i + break + end + end + if type(num) == 'int' && num > 0 && num <= 64 + bits = bits < num ? num : bits + end + var result = '' + bits -= 1 + for i : 0 .. bits + result += x & (1 << (bits - i)) ? '1' : '0' + end + return result +end + +print(bin(33)) diff --git a/lib/libesp32/berry/examples/strmod.be b/lib/libesp32/berry/examples/strmod.be new file mode 100644 index 000000000..8660f5b4e --- /dev/null +++ b/lib/libesp32/berry/examples/strmod.be @@ -0,0 +1,7 @@ +import string + +print(string.format('%.3d', 12)) +print(string.format('%.3f', 12)) +print(string.format('%20.7f', 14.5)) +print(string.format('-- %-40s ---', 'this is a string format test')) +print(string.format('-- %40s ---', 'this is a string format test')) diff --git a/lib/libesp32/berry/gen.sh b/lib/libesp32/berry/gen.sh new file mode 100755 index 000000000..303a62c95 --- /dev/null +++ b/lib/libesp32/berry/gen.sh @@ -0,0 +1,2 @@ +#!/bin/bash +python3 tools/pycoc/main.py -o generate src default ../berry_mapping/src -c default/berry_conf.h diff --git a/lib/libesp32/berry/generate/be_const_strtab.h b/lib/libesp32/berry/generate/be_const_strtab.h new file mode 100644 index 000000000..50198eb8f --- /dev/null +++ b/lib/libesp32/berry/generate/be_const_strtab.h @@ -0,0 +1,741 @@ +extern const bcstring be_const_str_; +extern const bcstring be_const_str_AES_GCM; +extern const bcstring be_const_str_AXP192; +extern const bcstring be_const_str_Animate_X20pc_X20is_X20out_X20of_X20range; +extern const bcstring be_const_str_AudioFileSource; +extern const bcstring be_const_str_AudioFileSourceFS; +extern const bcstring be_const_str_AudioGenerator; +extern const bcstring be_const_str_AudioGeneratorMP3; +extern const bcstring be_const_str_AudioGeneratorWAV; +extern const bcstring be_const_str_AudioOutput; +extern const bcstring be_const_str_AudioOutputI2S; +extern const bcstring be_const_str_Auto_X2Dconfiguration; +extern const bcstring be_const_str_BRY_X3A_X20ERROR_X2C_X20bad_X20json_X3A_X20; +extern const bcstring be_const_str_BRY_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s; +extern const bcstring be_const_str_BRY_X3A_X20could_X20not_X20save_X20compiled_X20file_X20_X25s_X20_X28_X25s_X29; +extern const bcstring be_const_str_BRY_X3A_X20failed_X20to_X20load_X20_persist_X2Ejson; +extern const bcstring be_const_str_BUTTON_CONFIGURATION; +extern const bcstring be_const_str_CFG_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s; +extern const bcstring be_const_str_CFG_X3A_X20_X27init_X2Ebat_X27_X20done_X2C_X20restarting; +extern const bcstring be_const_str_CFG_X3A_X20could_X20not_X20run_X20_X25s_X20_X28_X25s_X20_X2D_X20_X25s_X29; +extern const bcstring be_const_str_CFG_X3A_X20downloading_X20_X27_X25s_X27; +extern const bcstring be_const_str_CFG_X3A_X20exception_X20_X27_X25s_X27_X20_X2D_X20_X27_X25s_X27; +extern const bcstring be_const_str_CFG_X3A_X20loaded_X20_X20; +extern const bcstring be_const_str_CFG_X3A_X20loaded_X20_X27_X25s_X27; +extern const bcstring be_const_str_CFG_X3A_X20loading_X20; +extern const bcstring be_const_str_CFG_X3A_X20loading_X20_X27_X25s_X27; +extern const bcstring be_const_str_CFG_X3A_X20multiple_X20autoconf_X20files_X20found_X2C_X20aborting_X20_X28_X27_X25s_X27_X20_X2B_X20_X27_X25s_X27_X29; +extern const bcstring be_const_str_CFG_X3A_X20no_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found; +extern const bcstring be_const_str_CFG_X3A_X20ran_X20_X20; +extern const bcstring be_const_str_CFG_X3A_X20removed_X20file_X20_X27_X25s_X27; +extern const bcstring be_const_str_CFG_X3A_X20removing_X20autoconf_X20files; +extern const bcstring be_const_str_CFG_X3A_X20removing_X20first_X20time_X20marker; +extern const bcstring be_const_str_CFG_X3A_X20return_code_X3D_X25i; +extern const bcstring be_const_str_CFG_X3A_X20running_X20; +extern const bcstring be_const_str_CFG_X3A_X20skipping_X20_X27display_X2Eini_X27_X20because_X20already_X20present_X20in_X20file_X2Dsystem; +extern const bcstring be_const_str_COLOR_BLACK; +extern const bcstring be_const_str_COLOR_WHITE; +extern const bcstring be_const_str_EC_C25519; +extern const bcstring be_const_str_EVENT_DRAW_MAIN; +extern const bcstring be_const_str_EVENT_DRAW_PART_BEGIN; +extern const bcstring be_const_str_EVENT_DRAW_PART_END; +extern const bcstring be_const_str_False; +extern const bcstring be_const_str_GET; +extern const bcstring be_const_str_HTTP_GET; +extern const bcstring be_const_str_HTTP_POST; +extern const bcstring be_const_str_I2C_Driver; +extern const bcstring be_const_str_I2C_X3A; +extern const bcstring be_const_str_LVG_X3A_X20call_X20to_X20unsupported_X20callback; +extern const bcstring be_const_str_Leds; +extern const bcstring be_const_str_MD5; +extern const bcstring be_const_str_None; +extern const bcstring be_const_str_OPTION_A; +extern const bcstring be_const_str_OneWire; +extern const bcstring be_const_str_PART_MAIN; +extern const bcstring be_const_str_POST; +extern const bcstring be_const_str_Parameter_X20error; +extern const bcstring be_const_str_RES_OK; +extern const bcstring be_const_str_Restart_X201; +extern const bcstring be_const_str_SERIAL_5E1; +extern const bcstring be_const_str_SERIAL_5E2; +extern const bcstring be_const_str_SERIAL_5N1; +extern const bcstring be_const_str_SERIAL_5N2; +extern const bcstring be_const_str_SERIAL_5O1; +extern const bcstring be_const_str_SERIAL_5O2; +extern const bcstring be_const_str_SERIAL_6E1; +extern const bcstring be_const_str_SERIAL_6E2; +extern const bcstring be_const_str_SERIAL_6N1; +extern const bcstring be_const_str_SERIAL_6N2; +extern const bcstring be_const_str_SERIAL_6O1; +extern const bcstring be_const_str_SERIAL_6O2; +extern const bcstring be_const_str_SERIAL_7E1; +extern const bcstring be_const_str_SERIAL_7E2; +extern const bcstring be_const_str_SERIAL_7N1; +extern const bcstring be_const_str_SERIAL_7N2; +extern const bcstring be_const_str_SERIAL_7O1; +extern const bcstring be_const_str_SERIAL_7O2; +extern const bcstring be_const_str_SERIAL_8E1; +extern const bcstring be_const_str_SERIAL_8E2; +extern const bcstring be_const_str_SERIAL_8N1; +extern const bcstring be_const_str_SERIAL_8N2; +extern const bcstring be_const_str_SERIAL_8O1; +extern const bcstring be_const_str_SERIAL_8O2; +extern const bcstring be_const_str_SK6812_GRBW; +extern const bcstring be_const_str_STATE_DEFAULT; +extern const bcstring be_const_str_TAP_X3A_X20found_X20Tasmota_X20App_X20_X27_X25s_X27; +extern const bcstring be_const_str_Tasmota; +extern const bcstring be_const_str_Tele; +extern const bcstring be_const_str_Timer; +extern const bcstring be_const_str_True; +extern const bcstring be_const_str_Unknown_X20command; +extern const bcstring be_const_str_WS2812; +extern const bcstring be_const_str_WS2812_GRB; +extern const bcstring be_const_str_Wire; +extern const bcstring be_const_str__; +extern const bcstring be_const_str__X0A; +extern const bcstring be_const_str__X20; +extern const bcstring be_const_str__X21_X3D; +extern const bcstring be_const_str__X21_X3D_X3D; +extern const bcstring be_const_str__X23; +extern const bcstring be_const_str__X23autoexec_X2Ebat; +extern const bcstring be_const_str__X23autoexec_X2Ebe; +extern const bcstring be_const_str__X23display_X2Eini; +extern const bcstring be_const_str__X23init_X2Ebat; +extern const bcstring be_const_str__X23preinit_X2Ebe; +extern const bcstring be_const_str__X2502d_X25s_X2502d; +extern const bcstring be_const_str__X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d; +extern const bcstring be_const_str__X25s_X2Eautoconf; +extern const bcstring be_const_str__X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B; +extern const bcstring be_const_str__X26lt_X3BNone_X26gt_X3B; +extern const bcstring be_const_str__X28_X29; +extern const bcstring be_const_str__X2B; +extern const bcstring be_const_str__X2C; +extern const bcstring be_const_str__X2D_X2D_X3A_X2D_X2D; +extern const bcstring be_const_str__X2E; +extern const bcstring be_const_str__X2E_X2E; +extern const bcstring be_const_str__X2Eautoconf; +extern const bcstring be_const_str__X2Ebe; +extern const bcstring be_const_str__X2Ebec; +extern const bcstring be_const_str__X2Elen; +extern const bcstring be_const_str__X2Ep; +extern const bcstring be_const_str__X2Ep1; +extern const bcstring be_const_str__X2Ep2; +extern const bcstring be_const_str__X2Esize; +extern const bcstring be_const_str__X2Etapp; +extern const bcstring be_const_str__X2Ew; +extern const bcstring be_const_str__X2F; +extern const bcstring be_const_str__X2F_X2Eautoconf; +extern const bcstring be_const_str__X2F_X3Frst_X3D; +extern const bcstring be_const_str__X2Fac; +extern const bcstring be_const_str__X3A; +extern const bcstring be_const_str__X3C; +extern const bcstring be_const_str__X3C_X2Fform_X3E_X3C_X2Fp_X3E; +extern const bcstring be_const_str__X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E; +extern const bcstring be_const_str__X3C_X3D; +extern const bcstring be_const_str__X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E; +extern const bcstring be_const_str__X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E; +extern const bcstring be_const_str__X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E; +extern const bcstring be_const_str__X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29; +extern const bcstring be_const_str__X3Clabel_X3EChoose_X20a_X20device_X20configuration_X3A_X3C_X2Flabel_X3E_X3Cbr_X3E; +extern const bcstring be_const_str__X3Clambda_X3E; +extern const bcstring be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E; +extern const bcstring be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E; +extern const bcstring be_const_str__X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E; +extern const bcstring be_const_str__X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E; +extern const bcstring be_const_str__X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E; +extern const bcstring be_const_str__X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E; +extern const bcstring be_const_str__X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E; +extern const bcstring be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E; +extern const bcstring be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20; +extern const bcstring be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dzip_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20; +extern const bcstring be_const_str__X3Cp_X3E_X3Csmall_X3E_X26nbsp_X3B_X28This_X20feature_X20requires_X20an_X20internet_X20connection_X29_X3C_X2Fsmall_X3E_X3C_X2Fp_X3E; +extern const bcstring be_const_str__X3Cselect_X20name_X3D_X27zip_X27_X3E; +extern const bcstring be_const_str__X3D; +extern const bcstring be_const_str__X3D_X3C_X3E_X21; +extern const bcstring be_const_str__X3D_X3D; +extern const bcstring be_const_str__X3E; +extern const bcstring be_const_str__X3E_X3D; +extern const bcstring be_const_str__X3F; +extern const bcstring be_const_str__X5B; +extern const bcstring be_const_str__X5D; +extern const bcstring be_const_str__X7B; +extern const bcstring be_const_str__X7B_X7D; +extern const bcstring be_const_str__X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D; +extern const bcstring be_const_str__X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D; +extern const bcstring be_const_str__X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_XB0C_X7Be_X7D; +extern const bcstring be_const_str__X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D; +extern const bcstring be_const_str__X7Bs_X7DVBus_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D; +extern const bcstring be_const_str__X7D; +extern const bcstring be_const_str___iterator__; +extern const bcstring be_const_str___lower__; +extern const bcstring be_const_str___upper__; +extern const bcstring be_const_str__anonymous_; +extern const bcstring be_const_str__archive; +extern const bcstring be_const_str__available; +extern const bcstring be_const_str__begin_transmission; +extern const bcstring be_const_str__buffer; +extern const bcstring be_const_str__ccmd; +extern const bcstring be_const_str__class; +extern const bcstring be_const_str__cmd; +extern const bcstring be_const_str__debug_present; +extern const bcstring be_const_str__def; +extern const bcstring be_const_str__dirty; +extern const bcstring be_const_str__drivers; +extern const bcstring be_const_str__end_transmission; +extern const bcstring be_const_str__energy; +extern const bcstring be_const_str__error; +extern const bcstring be_const_str__filename; +extern const bcstring be_const_str__global_addr; +extern const bcstring be_const_str__global_def; +extern const bcstring be_const_str__lvgl; +extern const bcstring be_const_str__p; +extern const bcstring be_const_str__persist_X2Ejson; +extern const bcstring be_const_str__ptr; +extern const bcstring be_const_str__read; +extern const bcstring be_const_str__request_from; +extern const bcstring be_const_str__rules; +extern const bcstring be_const_str__settings_def; +extern const bcstring be_const_str__settings_ptr; +extern const bcstring be_const_str__t; +extern const bcstring be_const_str__timers; +extern const bcstring be_const_str__write; +extern const bcstring be_const_str_a; +extern const bcstring be_const_str_abs; +extern const bcstring be_const_str_acos; +extern const bcstring be_const_str_add; +extern const bcstring be_const_str_add_anim; +extern const bcstring be_const_str_add_cmd; +extern const bcstring be_const_str_add_driver; +extern const bcstring be_const_str_add_header; +extern const bcstring be_const_str_add_rule; +extern const bcstring be_const_str_addr; +extern const bcstring be_const_str_allocated; +extern const bcstring be_const_str_alternate; +extern const bcstring be_const_str_animate; +extern const bcstring be_const_str_animators; +extern const bcstring be_const_str_arch; +extern const bcstring be_const_str_area; +extern const bcstring be_const_str_arg; +extern const bcstring be_const_str_arg_X20must_X20be_X20a_X20subclass_X20of_X20lv_obj; +extern const bcstring be_const_str_arg_name; +extern const bcstring be_const_str_arg_size; +extern const bcstring be_const_str_as; +extern const bcstring be_const_str_asin; +extern const bcstring be_const_str_assert; +extern const bcstring be_const_str_asstring; +extern const bcstring be_const_str_atan; +extern const bcstring be_const_str_atan2; +extern const bcstring be_const_str_atleast1; +extern const bcstring be_const_str_attrdump; +extern const bcstring be_const_str_autoexec; +extern const bcstring be_const_str_autorun; +extern const bcstring be_const_str_available; +extern const bcstring be_const_str_b; +extern const bcstring be_const_str_back_forth; +extern const bcstring be_const_str_base_class; +extern const bcstring be_const_str_battery_present; +extern const bcstring be_const_str_begin; +extern const bcstring be_const_str_bool; +extern const bcstring be_const_str_break; +extern const bcstring be_const_str_bri; +extern const bcstring be_const_str_bus; +extern const bcstring be_const_str_button_pressed; +extern const bcstring be_const_str_byte; +extern const bcstring be_const_str_bytes; +extern const bcstring be_const_str_c; +extern const bcstring be_const_str_call; +extern const bcstring be_const_str_call_native; +extern const bcstring be_const_str_calldepth; +extern const bcstring be_const_str_can_show; +extern const bcstring be_const_str_cb; +extern const bcstring be_const_str_cb_do_nothing; +extern const bcstring be_const_str_cb_event_closure; +extern const bcstring be_const_str_cb_obj; +extern const bcstring be_const_str_ceil; +extern const bcstring be_const_str_char; +extern const bcstring be_const_str_chars_in_string; +extern const bcstring be_const_str_check_privileged_access; +extern const bcstring be_const_str_class; +extern const bcstring be_const_str_class_init_obj; +extern const bcstring be_const_str_classname; +extern const bcstring be_const_str_classof; +extern const bcstring be_const_str_clear; +extern const bcstring be_const_str_clear_first_time; +extern const bcstring be_const_str_clear_to; +extern const bcstring be_const_str_close; +extern const bcstring be_const_str_closure; +extern const bcstring be_const_str_cmd; +extern const bcstring be_const_str_cmd_res; +extern const bcstring be_const_str_code; +extern const bcstring be_const_str_codedump; +extern const bcstring be_const_str_collect; +extern const bcstring be_const_str_color; +extern const bcstring be_const_str_compile; +extern const bcstring be_const_str_compress; +extern const bcstring be_const_str_concat; +extern const bcstring be_const_str_connect; +extern const bcstring be_const_str_connected; +extern const bcstring be_const_str_connection_error; +extern const bcstring be_const_str_constructor_cb; +extern const bcstring be_const_str_contains; +extern const bcstring be_const_str_content_button; +extern const bcstring be_const_str_content_flush; +extern const bcstring be_const_str_content_send; +extern const bcstring be_const_str_content_send_style; +extern const bcstring be_const_str_content_start; +extern const bcstring be_const_str_content_stop; +extern const bcstring be_const_str_continue; +extern const bcstring be_const_str_copy; +extern const bcstring be_const_str_cos; +extern const bcstring be_const_str_cosh; +extern const bcstring be_const_str_couldn_X27t_X20not_X20initialize_X20noepixelbus; +extern const bcstring be_const_str_count; +extern const bcstring be_const_str_counters; +extern const bcstring be_const_str_create_custom_widget; +extern const bcstring be_const_str_create_matrix; +extern const bcstring be_const_str_create_segment; +extern const bcstring be_const_str_ctor; +extern const bcstring be_const_str_ctypes_bytes; +extern const bcstring be_const_str_ctypes_bytes_dyn; +extern const bcstring be_const_str_dac_voltage; +extern const bcstring be_const_str_day; +extern const bcstring be_const_str_debug; +extern const bcstring be_const_str_decompress; +extern const bcstring be_const_str_decrypt; +extern const bcstring be_const_str_def; +extern const bcstring be_const_str_deg; +extern const bcstring be_const_str_deinit; +extern const bcstring be_const_str_del; +extern const bcstring be_const_str_delay; +extern const bcstring be_const_str_delete_all_configs; +extern const bcstring be_const_str_depower; +extern const bcstring be_const_str_deregister_obj; +extern const bcstring be_const_str_destructor_cb; +extern const bcstring be_const_str_detect; +extern const bcstring be_const_str_detected_X20on_X20bus; +extern const bcstring be_const_str_digital_read; +extern const bcstring be_const_str_digital_write; +extern const bcstring be_const_str_dirty; +extern const bcstring be_const_str_display; +extern const bcstring be_const_str_display_X2Eini; +extern const bcstring be_const_str_do; +extern const bcstring be_const_str_draw_arc; +extern const bcstring be_const_str_draw_line; +extern const bcstring be_const_str_draw_line_dsc; +extern const bcstring be_const_str_draw_line_dsc_init; +extern const bcstring be_const_str_due; +extern const bcstring be_const_str_dump; +extern const bcstring be_const_str_duration; +extern const bcstring be_const_str_editable; +extern const bcstring be_const_str_elif; +extern const bcstring be_const_str_else; +extern const bcstring be_const_str_enabled; +extern const bcstring be_const_str_encrypt; +extern const bcstring be_const_str_end; +extern const bcstring be_const_str_energy_struct; +extern const bcstring be_const_str_engine; +extern const bcstring be_const_str_erase; +extern const bcstring be_const_str_escape; +extern const bcstring be_const_str_eth; +extern const bcstring be_const_str_event; +extern const bcstring be_const_str_event_cb; +extern const bcstring be_const_str_event_send; +extern const bcstring be_const_str_every_100ms; +extern const bcstring be_const_str_every_50ms; +extern const bcstring be_const_str_every_second; +extern const bcstring be_const_str_except; +extern const bcstring be_const_str_exec_cmd; +extern const bcstring be_const_str_exec_rules; +extern const bcstring be_const_str_exec_tele; +extern const bcstring be_const_str_exists; +extern const bcstring be_const_str_exp; +extern const bcstring be_const_str_f; +extern const bcstring be_const_str_false; +extern const bcstring be_const_str_file; +extern const bcstring be_const_str_file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27; +extern const bcstring be_const_str_files; +extern const bcstring be_const_str_find; +extern const bcstring be_const_str_find_key_i; +extern const bcstring be_const_str_find_op; +extern const bcstring be_const_str_finish; +extern const bcstring be_const_str_floor; +extern const bcstring be_const_str_flush; +extern const bcstring be_const_str_for; +extern const bcstring be_const_str_format; +extern const bcstring be_const_str_from_to; +extern const bcstring be_const_str_fromb64; +extern const bcstring be_const_str_fromptr; +extern const bcstring be_const_str_fromstring; +extern const bcstring be_const_str_function; +extern const bcstring be_const_str_gamma; +extern const bcstring be_const_str_gamma10; +extern const bcstring be_const_str_gamma8; +extern const bcstring be_const_str_gc; +extern const bcstring be_const_str_gen_cb; +extern const bcstring be_const_str_get; +extern const bcstring be_const_str_get_alternate; +extern const bcstring be_const_str_get_aps_voltage; +extern const bcstring be_const_str_get_bat_charge_current; +extern const bcstring be_const_str_get_bat_current; +extern const bcstring be_const_str_get_bat_power; +extern const bcstring be_const_str_get_bat_voltage; +extern const bcstring be_const_str_get_battery_chargin_status; +extern const bcstring be_const_str_get_bri; +extern const bcstring be_const_str_get_cb_list; +extern const bcstring be_const_str_get_coords; +extern const bcstring be_const_str_get_current_module_name; +extern const bcstring be_const_str_get_current_module_path; +extern const bcstring be_const_str_get_free_heap; +extern const bcstring be_const_str_get_height; +extern const bcstring be_const_str_get_input_power_status; +extern const bcstring be_const_str_get_light; +extern const bcstring be_const_str_get_object_from_ptr; +extern const bcstring be_const_str_get_option; +extern const bcstring be_const_str_get_percentage; +extern const bcstring be_const_str_get_pixel_color; +extern const bcstring be_const_str_get_power; +extern const bcstring be_const_str_get_size; +extern const bcstring be_const_str_get_string; +extern const bcstring be_const_str_get_style_bg_color; +extern const bcstring be_const_str_get_style_line_color; +extern const bcstring be_const_str_get_style_pad_right; +extern const bcstring be_const_str_get_switch; +extern const bcstring be_const_str_get_tasmota; +extern const bcstring be_const_str_get_temp; +extern const bcstring be_const_str_get_vbus_current; +extern const bcstring be_const_str_get_vbus_voltage; +extern const bcstring be_const_str_get_warning_level; +extern const bcstring be_const_str_get_width; +extern const bcstring be_const_str_getbits; +extern const bcstring be_const_str_geti; +extern const bcstring be_const_str_global; +extern const bcstring be_const_str_gpio; +extern const bcstring be_const_str_group_def; +extern const bcstring be_const_str_h; +extern const bcstring be_const_str_has; +extern const bcstring be_const_str_has_arg; +extern const bcstring be_const_str_height_def; +extern const bcstring be_const_str_hex; +extern const bcstring be_const_str_hour; +extern const bcstring be_const_str_hs2rgb; +extern const bcstring be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_X2F_X25s_X2Eautoconf; +extern const bcstring be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_manifest_X2Ejson; +extern const bcstring be_const_str_i2c_enabled; +extern const bcstring be_const_str_id; +extern const bcstring be_const_str_if; +extern const bcstring be_const_str_imax; +extern const bcstring be_const_str_imin; +extern const bcstring be_const_str_import; +extern const bcstring be_const_str_init; +extern const bcstring be_const_str_init_draw_line_dsc; +extern const bcstring be_const_str_input; +extern const bcstring be_const_str_ins_goto; +extern const bcstring be_const_str_ins_ramp; +extern const bcstring be_const_str_ins_time; +extern const bcstring be_const_str_insert; +extern const bcstring be_const_str_instance; +extern const bcstring be_const_str_instance_size; +extern const bcstring be_const_str_int; +extern const bcstring be_const_str_internal_error; +extern const bcstring be_const_str_introspect; +extern const bcstring be_const_str_invalidate; +extern const bcstring be_const_str_io_error; +extern const bcstring be_const_str_ip; +extern const bcstring be_const_str_is_dirty; +extern const bcstring be_const_str_is_first_time; +extern const bcstring be_const_str_is_running; +extern const bcstring be_const_str_isinstance; +extern const bcstring be_const_str_isnan; +extern const bcstring be_const_str_isrunning; +extern const bcstring be_const_str_issubclass; +extern const bcstring be_const_str_item; +extern const bcstring be_const_str_iter; +extern const bcstring be_const_str_json; +extern const bcstring be_const_str_json_append; +extern const bcstring be_const_str_json_fdump; +extern const bcstring be_const_str_json_fdump_any; +extern const bcstring be_const_str_json_fdump_list; +extern const bcstring be_const_str_json_fdump_map; +extern const bcstring be_const_str_k; +extern const bcstring be_const_str_keys; +extern const bcstring be_const_str_kv; +extern const bcstring be_const_str_last_modified; +extern const bcstring be_const_str_leds; +extern const bcstring be_const_str_length_X20in_X20bits_X20must_X20be_X20between_X200_X20and_X2032; +extern const bcstring be_const_str_light; +extern const bcstring be_const_str_line_dsc; +extern const bcstring be_const_str_list; +extern const bcstring be_const_str_listdir; +extern const bcstring be_const_str_load; +extern const bcstring be_const_str_load_templates; +extern const bcstring be_const_str_local; +extern const bcstring be_const_str_log; +extern const bcstring be_const_str_log10; +extern const bcstring be_const_str_loop; +extern const bcstring be_const_str_lower; +extern const bcstring be_const_str_lv; +extern const bcstring be_const_str_lv_event; +extern const bcstring be_const_str_lv_event_cb; +extern const bcstring be_const_str_lv_obj; +extern const bcstring be_const_str_lv_obj_class; +extern const bcstring be_const_str_lvgl_event_dispatch; +extern const bcstring be_const_str_map; +extern const bcstring be_const_str_math; +extern const bcstring be_const_str_matrix; +extern const bcstring be_const_str_member; +extern const bcstring be_const_str_members; +extern const bcstring be_const_str_memory; +extern const bcstring be_const_str_millis; +extern const bcstring be_const_str_min; +extern const bcstring be_const_str_minute; +extern const bcstring be_const_str_module; +extern const bcstring be_const_str_month; +extern const bcstring be_const_str_name; +extern const bcstring be_const_str_nan; +extern const bcstring be_const_str_nil; +extern const bcstring be_const_str_no_X20GPIO_X20specified_X20for_X20neopixelbus; +extern const bcstring be_const_str_null_cb; +extern const bcstring be_const_str_number; +extern const bcstring be_const_str_obj_class_create_obj; +extern const bcstring be_const_str_obj_event_base; +extern const bcstring be_const_str_offset; +extern const bcstring be_const_str_offseta; +extern const bcstring be_const_str_on; +extern const bcstring be_const_str_onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E; +extern const bcstring be_const_str_onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20change_X20the_X20current_X20configuration_X20and_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E; +extern const bcstring be_const_str_open; +extern const bcstring be_const_str_out_X20of_X20range; +extern const bcstring be_const_str_p1; +extern const bcstring be_const_str_p2; +extern const bcstring be_const_str_page_autoconf_ctl; +extern const bcstring be_const_str_page_autoconf_mgr; +extern const bcstring be_const_str_param; +extern const bcstring be_const_str_path; +extern const bcstring be_const_str_pc; +extern const bcstring be_const_str_pc_abs; +extern const bcstring be_const_str_pc_rel; +extern const bcstring be_const_str_percentage; +extern const bcstring be_const_str_persist; +extern const bcstring be_const_str_persist_X2E_p_X20is_X20not_X20a_X20map; +extern const bcstring be_const_str_pi; +extern const bcstring be_const_str_pin; +extern const bcstring be_const_str_pin_mode; +extern const bcstring be_const_str_pin_used; +extern const bcstring be_const_str_pixel_count; +extern const bcstring be_const_str_pixel_size; +extern const bcstring be_const_str_pixels_buffer; +extern const bcstring be_const_str_point; +extern const bcstring be_const_str_pop; +extern const bcstring be_const_str_pop_path; +extern const bcstring be_const_str_pow; +extern const bcstring be_const_str_preinit; +extern const bcstring be_const_str_print; +extern const bcstring be_const_str_public_key; +extern const bcstring be_const_str_publish; +extern const bcstring be_const_str_publish_result; +extern const bcstring be_const_str_push; +extern const bcstring be_const_str_push_path; +extern const bcstring be_const_str_quality; +extern const bcstring be_const_str_r; +extern const bcstring be_const_str_rad; +extern const bcstring be_const_str_raise; +extern const bcstring be_const_str_rand; +extern const bcstring be_const_str_range; +extern const bcstring be_const_str_read; +extern const bcstring be_const_str_read12; +extern const bcstring be_const_str_read13; +extern const bcstring be_const_str_read24; +extern const bcstring be_const_str_read32; +extern const bcstring be_const_str_read8; +extern const bcstring be_const_str_read_bytes; +extern const bcstring be_const_str_read_sensors; +extern const bcstring be_const_str_readbytes; +extern const bcstring be_const_str_readline; +extern const bcstring be_const_str_real; +extern const bcstring be_const_str_reapply; +extern const bcstring be_const_str_redirect; +extern const bcstring be_const_str_reduce; +extern const bcstring be_const_str_refr_size; +extern const bcstring be_const_str_register_obj; +extern const bcstring be_const_str_remove; +extern const bcstring be_const_str_remove_cmd; +extern const bcstring be_const_str_remove_driver; +extern const bcstring be_const_str_remove_rule; +extern const bcstring be_const_str_remove_timer; +extern const bcstring be_const_str_reset; +extern const bcstring be_const_str_reset_search; +extern const bcstring be_const_str_resize; +extern const bcstring be_const_str_resolvecmnd; +extern const bcstring be_const_str_resp_cmnd; +extern const bcstring be_const_str_resp_cmnd_done; +extern const bcstring be_const_str_resp_cmnd_error; +extern const bcstring be_const_str_resp_cmnd_failed; +extern const bcstring be_const_str_resp_cmnd_str; +extern const bcstring be_const_str_response_append; +extern const bcstring be_const_str_return; +extern const bcstring be_const_str_return_X20code_X3D_X25i; +extern const bcstring be_const_str_reverse; +extern const bcstring be_const_str_reverse_gamma10; +extern const bcstring be_const_str_rotate; +extern const bcstring be_const_str_round_end; +extern const bcstring be_const_str_round_start; +extern const bcstring be_const_str_rtc; +extern const bcstring be_const_str_rule; +extern const bcstring be_const_str_run; +extern const bcstring be_const_str_run_bat; +extern const bcstring be_const_str_run_deferred; +extern const bcstring be_const_str_running; +extern const bcstring be_const_str_save; +extern const bcstring be_const_str_save_before_restart; +extern const bcstring be_const_str_scale_uint; +extern const bcstring be_const_str_scan; +extern const bcstring be_const_str_search; +extern const bcstring be_const_str_sec; +extern const bcstring be_const_str_seg7_font; +extern const bcstring be_const_str_select; +extern const bcstring be_const_str_serial; +extern const bcstring be_const_str_set; +extern const bcstring be_const_str_set_alternate; +extern const bcstring be_const_str_set_auth; +extern const bcstring be_const_str_set_bri; +extern const bcstring be_const_str_set_chg_current; +extern const bcstring be_const_str_set_dc_voltage; +extern const bcstring be_const_str_set_dcdc_enable; +extern const bcstring be_const_str_set_first_time; +extern const bcstring be_const_str_set_height; +extern const bcstring be_const_str_set_ldo_enable; +extern const bcstring be_const_str_set_ldo_voltage; +extern const bcstring be_const_str_set_light; +extern const bcstring be_const_str_set_matrix_pixel_color; +extern const bcstring be_const_str_set_percentage; +extern const bcstring be_const_str_set_pixel_color; +extern const bcstring be_const_str_set_power; +extern const bcstring be_const_str_set_style_bg_color; +extern const bcstring be_const_str_set_style_line_color; +extern const bcstring be_const_str_set_style_pad_right; +extern const bcstring be_const_str_set_style_text_font; +extern const bcstring be_const_str_set_text; +extern const bcstring be_const_str_set_time; +extern const bcstring be_const_str_set_timeouts; +extern const bcstring be_const_str_set_timer; +extern const bcstring be_const_str_set_useragent; +extern const bcstring be_const_str_set_width; +extern const bcstring be_const_str_set_x; +extern const bcstring be_const_str_set_y; +extern const bcstring be_const_str_setbits; +extern const bcstring be_const_str_seti; +extern const bcstring be_const_str_setitem; +extern const bcstring be_const_str_setmember; +extern const bcstring be_const_str_setrange; +extern const bcstring be_const_str_settings; +extern const bcstring be_const_str_shared_key; +extern const bcstring be_const_str_show; +extern const bcstring be_const_str_sin; +extern const bcstring be_const_str_sinh; +extern const bcstring be_const_str_size; +extern const bcstring be_const_str_skip; +extern const bcstring be_const_str_solidified; +extern const bcstring be_const_str_split; +extern const bcstring be_const_str_sqrt; +extern const bcstring be_const_str_srand; +extern const bcstring be_const_str_start; +extern const bcstring be_const_str_state; +extern const bcstring be_const_str_static; +extern const bcstring be_const_str_stop; +extern const bcstring be_const_str_stop_iteration; +extern const bcstring be_const_str_str; +extern const bcstring be_const_str_strftime; +extern const bcstring be_const_str_string; +extern const bcstring be_const_str_strip; +extern const bcstring be_const_str_strptime; +extern const bcstring be_const_str_super; +extern const bcstring be_const_str_sys; +extern const bcstring be_const_str_tag; +extern const bcstring be_const_str_tan; +extern const bcstring be_const_str_tanh; +extern const bcstring be_const_str_target; +extern const bcstring be_const_str_target_search; +extern const bcstring be_const_str_tasmota; +extern const bcstring be_const_str_tasmota_X2Eget_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eget_X28_X29; +extern const bcstring be_const_str_tasmota_X2Eset_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eset_X28_X29; +extern const bcstring be_const_str_tcpclient; +extern const bcstring be_const_str_tele; +extern const bcstring be_const_str_the_X20second_X20argument_X20is_X20not_X20a_X20function; +extern const bcstring be_const_str_time_dump; +extern const bcstring be_const_str_time_reached; +extern const bcstring be_const_str_time_str; +extern const bcstring be_const_str_to_gamma; +extern const bcstring be_const_str_tob64; +extern const bcstring be_const_str_tolower; +extern const bcstring be_const_str_tomap; +extern const bcstring be_const_str_top; +extern const bcstring be_const_str_toptr; +extern const bcstring be_const_str_tostring; +extern const bcstring be_const_str_toupper; +extern const bcstring be_const_str_tr; +extern const bcstring be_const_str_traceback; +extern const bcstring be_const_str_true; +extern const bcstring be_const_str_try; +extern const bcstring be_const_str_try_rule; +extern const bcstring be_const_str_type; +extern const bcstring be_const_str_unknown_X20instruction; +extern const bcstring be_const_str_update; +extern const bcstring be_const_str_upper; +extern const bcstring be_const_str_url_encode; +extern const bcstring be_const_str_v; +extern const bcstring be_const_str_value; +extern const bcstring be_const_str_value_error; +extern const bcstring be_const_str_valuer_error; +extern const bcstring be_const_str_var; +extern const bcstring be_const_str_w; +extern const bcstring be_const_str_wd; +extern const bcstring be_const_str_web_add_button; +extern const bcstring be_const_str_web_add_config_button; +extern const bcstring be_const_str_web_add_console_button; +extern const bcstring be_const_str_web_add_handler; +extern const bcstring be_const_str_web_add_main_button; +extern const bcstring be_const_str_web_add_management_button; +extern const bcstring be_const_str_web_send; +extern const bcstring be_const_str_web_send_decimal; +extern const bcstring be_const_str_web_sensor; +extern const bcstring be_const_str_webclient; +extern const bcstring be_const_str_webserver; +extern const bcstring be_const_str_while; +extern const bcstring be_const_str_widget_cb; +extern const bcstring be_const_str_widget_constructor; +extern const bcstring be_const_str_widget_ctor_cb; +extern const bcstring be_const_str_widget_ctor_impl; +extern const bcstring be_const_str_widget_destructor; +extern const bcstring be_const_str_widget_dtor_cb; +extern const bcstring be_const_str_widget_dtor_impl; +extern const bcstring be_const_str_widget_editable; +extern const bcstring be_const_str_widget_event; +extern const bcstring be_const_str_widget_event_cb; +extern const bcstring be_const_str_widget_event_impl; +extern const bcstring be_const_str_widget_group_def; +extern const bcstring be_const_str_widget_height_def; +extern const bcstring be_const_str_widget_instance_size; +extern const bcstring be_const_str_widget_struct_by_class; +extern const bcstring be_const_str_widget_struct_default; +extern const bcstring be_const_str_widget_width_def; +extern const bcstring be_const_str_width; +extern const bcstring be_const_str_width_def; +extern const bcstring be_const_str_wifi; +extern const bcstring be_const_str_wire; +extern const bcstring be_const_str_wire1; +extern const bcstring be_const_str_wire2; +extern const bcstring be_const_str_wire_scan; +extern const bcstring be_const_str_write; +extern const bcstring be_const_str_write8; +extern const bcstring be_const_str_write_bit; +extern const bcstring be_const_str_write_bytes; +extern const bcstring be_const_str_write_file; +extern const bcstring be_const_str_write_gpio; +extern const bcstring be_const_str_x; +extern const bcstring be_const_str_x1; +extern const bcstring be_const_str_y; +extern const bcstring be_const_str_y1; +extern const bcstring be_const_str_year; +extern const bcstring be_const_str_yield; +extern const bcstring be_const_str_zero; +extern const bcstring be_const_str_zip; diff --git a/lib/libesp32/berry/generate/be_const_strtab_def.h b/lib/libesp32/berry/generate/be_const_strtab_def.h new file mode 100644 index 000000000..4c195c96b --- /dev/null +++ b/lib/libesp32/berry/generate/be_const_strtab_def.h @@ -0,0 +1,1109 @@ +be_define_const_str(, "", 2166136261u, 0, 0, NULL); +be_define_const_str(_X0A, "\n", 252472541u, 0, 1, &be_const_str_Unknown_X20command); +be_define_const_str(_X20, " ", 621580159u, 0, 1, &be_const_str_geti); +be_define_const_str(_X21_X3D, "!=", 2428715011u, 0, 2, &be_const_str_asstring); +be_define_const_str(_X21_X3D_X3D, "!==", 559817114u, 0, 3, &be_const_str_type); +be_define_const_str(_X23, "#", 638357778u, 0, 1, &be_const_str_CFG_X3A_X20no_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found); +be_define_const_str(_X23autoexec_X2Ebat, "#autoexec.bat", 3382890497u, 0, 13, &be_const_str_arg_size); +be_define_const_str(_X23autoexec_X2Ebe, "#autoexec.be", 1181757091u, 0, 12, &be_const_str_file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27); +be_define_const_str(_X23display_X2Eini, "#display.ini", 182218220u, 0, 12, &be_const_str___lower__); +be_define_const_str(_X23init_X2Ebat, "#init.bat", 3297595077u, 0, 9, &be_const_str_SERIAL_7O2); +be_define_const_str(_X23preinit_X2Ebe, "#preinit.be", 687035716u, 0, 11, &be_const_str_SERIAL_8O2); +be_define_const_str(_X2502d_X25s_X2502d, "%02d%s%02d", 1587999717u, 0, 10, &be_const_str_yield); +be_define_const_str(_X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d, "%04d-%02d-%02dT%02d:%02d:%02d", 3425528601u, 0, 29, &be_const_str__global_def); +be_define_const_str(_X25s_X2Eautoconf, "%s.autoconf", 3560383524u, 0, 11, &be_const_str_every_second); +be_define_const_str(_X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B, "<Error: apply new or remove>", 2855507949u, 0, 34, &be_const_str_add_driver); +be_define_const_str(_X26lt_X3BNone_X26gt_X3B, "<None>", 2602165498u, 0, 12, &be_const_str_rand); +be_define_const_str(_X28_X29, "()", 685372826u, 0, 2, &be_const_str__X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29); +be_define_const_str(_X2B, "+", 772578730u, 0, 1, &be_const_str_gpio); +be_define_const_str(_X2C, ",", 688690635u, 0, 1, &be_const_str_add_cmd); +be_define_const_str(_X2D_X2D_X3A_X2D_X2D, "--:--", 1370615441u, 0, 5, &be_const_str_AudioOutputI2S); +be_define_const_str(_X2E, ".", 722245873u, 0, 1, NULL); +be_define_const_str(_X2E_X2E, "..", 2748622605u, 0, 2, &be_const_str__X2Ep2); +be_define_const_str(_X2Eautoconf, ".autoconf", 2524679088u, 0, 9, NULL); +be_define_const_str(_X2Ebe, ".be", 1325797348u, 0, 3, &be_const_str_sinh); +be_define_const_str(_X2Ebec, ".bec", 3985273221u, 0, 4, &be_const_str__debug_present); +be_define_const_str(_X2Elen, ".len", 850842136u, 0, 4, NULL); +be_define_const_str(_X2Ep, ".p", 1171526419u, 0, 2, &be_const_str_COLOR_WHITE); +be_define_const_str(_X2Ep1, ".p1", 249175686u, 0, 3, &be_const_str_sin); +be_define_const_str(_X2Ep2, ".p2", 232398067u, 0, 3, &be_const_str_json_fdump_map); +be_define_const_str(_X2Esize, ".size", 1965188224u, 0, 5, &be_const_str__X2Fac); +be_define_const_str(_X2Etapp, ".tapp", 1363391594u, 0, 5, NULL); +be_define_const_str(_X2Ew, ".w", 1255414514u, 0, 2, &be_const_str_member); +be_define_const_str(_X2F, "/", 705468254u, 0, 1, &be_const_str_None); +be_define_const_str(_X2F_X2Eautoconf, "/.autoconf", 2212074393u, 0, 10, &be_const_str_set_dc_voltage); +be_define_const_str(_X2F_X3Frst_X3D, "/?rst=", 580074707u, 0, 6, &be_const_str_AES_GCM); +be_define_const_str(_X2Fac, "/ac", 3904651978u, 0, 3, &be_const_str_get_current_module_path); +be_define_const_str(_X3A, ":", 1057798253u, 0, 1, &be_const_str_json_fdump); +be_define_const_str(_X3C, "<", 957132539u, 0, 1, NULL); +be_define_const_str(_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "

", 3546571739u, 0, 11, &be_const_str_atan); +be_define_const_str(_X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "

", 1863865923u, 0, 16, NULL); +be_define_const_str(_X3C_X3D, "<=", 2499223986u, 0, 2, &be_const_str_HTTP_POST); +be_define_const_str(_X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, "", 3147934216u, 0, 82, &be_const_str_Wire); +be_define_const_str(_X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, "", 1205771629u, 0, 72, &be_const_str_color); +be_define_const_str(_X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, "
", 842307168u, 0, 77, &be_const_str_set_power); +be_define_const_str(_X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29, "Choose a device configuration:
", 1336654704u, 0, 49, &be_const_str_bus); +be_define_const_str(_X3Clambda_X3E, "", 607256038u, 0, 8, &be_const_str_point); +be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Current auto-configuration", 4212500780u, 0, 82, &be_const_str_get_warning_level); +be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Select new auto-configuration", 1926223891u, 0, 80, &be_const_str_get_vbus_current); +be_define_const_str(_X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E, "", 510303524u, 0, 30, &be_const_str_cb_event_closure); +be_define_const_str(_X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E, "", 3994619755u, 0, 54, NULL); +be_define_const_str(_X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E, "

Exception:
'%s'
%s

", 4252565082u, 0, 59, &be_const_str_arg); +be_define_const_str(_X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "

", 2052843416u, 0, 25, &be_const_str_area); +be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "

", 452285201u, 0, 120, NULL); +be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, "

 (This feature requires an internet connection)

", 2719266486u, 0, 74, &be_const_str_register_obj); +be_define_const_str(_X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E, "

Current configuration:

%s

", 4115655761u, 0, 46, &be_const_str_get_cb_list); +be_define_const_str(_X3Cselect_X20name_X3D_X27zip_X27_X3E, "") - - var templates = self.load_templates() - webserver.content_send("") - for t:templates - webserver.content_send(string.format("", t, string.tr(t, "_", " "))) - end - - webserver.content_send("

") - - webserver.content_send("") - # webserver.content_send(string.format("", ota_num)) - webserver.content_send("

") - - - webserver.content_send("

") - webserver.content_button(webserver.BUTTON_CONFIGURATION) - webserver.content_stop() - end - - # #################################################################################################### - # Web controller - # - # Applies the changes and restart - # #################################################################################################### - # This HTTP POST manager handles the submitted web form data - def page_autoconf_ctl() - import webserver - import string - import path - if !webserver.check_privileged_access() return nil end - - try - if webserver.has_arg("reapply") - tasmota.log("CFG: removing first time marker", 2); - # print("CFG: removing first time marker") - self.clear_first_time() - #- and force restart -# - webserver.redirect("/?rst=") - - elif webserver.has_arg("zip") - # remove any remaining autoconf file - tasmota.log("CFG: removing autoconf files", 2); - # print("CFG: removing autoconf files") - self.delete_all_configs() - - # get the name of the configuration file - var arch_name = webserver.arg("zip") - - if arch_name != "reset" - var url = string.format("https://raw.githubusercontent.com/tasmota/autoconf/main/%s/%s.autoconf", tasmota.arch(), arch_name) - tasmota.log(string.format("CFG: downloading '%s'", url), 2); - - var local_file = string.format("%s.autoconf", arch_name) - - # download file and write directly to file system - var cl = webclient() - cl.begin(url) - var r = cl.GET() - if r != 200 raise "connection_error", string.format("return code=%i", r) end - cl.write_file(local_file) - cl.close() - end - - # remove marker to reapply template - self.clear_first_time() - - #- and force restart -# - webserver.redirect("/?rst=") - else - raise "value_error", "Unknown command" - end - except .. as e, m - print(string.format("CFG: Exception> '%s' - %s", e, m)) - #- display error page -# - webserver.content_start("Parameter error") #- title of the web page -# - webserver.content_send_style() #- send standard Tasmota styles -# - - webserver.content_send(string.format("

Exception:
'%s'
%s

", e, m)) - - webserver.content_button(webserver.BUTTON_CONFIGURATION) #- button back to management page -# - webserver.content_stop() #- end of web page -# - end - end - - # Add HTTP POST and GET handlers - def web_add_handler() - import webserver - webserver.on('/ac', / -> self.page_autoconf_mgr(), webserver.HTTP_GET) - webserver.on('/ac', / -> self.page_autoconf_ctl(), webserver.HTTP_POST) - end - - - # reset the configuration information (but don't restart) - # i.e. remove any autoconf file - def reset() - import path - import string - - var dir = path.listdir("/") - var entry - - var i = 0 - while i < size(dir) - var fname = dir[i] - if string.find(fname, ".autoconf") > 0 # does the file contain '*.autoconf' - path.remove(fname) - print(string.format("CFG: removed file '%s'", fname)) - end - i += 1 - end - - self._archive = nil - self._error = nil - end - - # called by the synthetic event `preinit` - def preinit() - if self._archive == nil return end - # try to launch `preinit.be` - import path - - var fname = self._archive + '#preinit.be' - if path.exists(fname) - tasmota.log("CFG: loading "+fname, 3) - load(fname) - tasmota.log("CFG: loaded "+fname, 3) - end - end - - def run_bat(fname) # read a '*.bat' file and run each command - import string - var f - try - f = open(fname, "r") # open file in read-only mode, it is expected to exist - while true - var line = f.readline() # read each line, can contain a terminal '\n', empty if end of file - if size(line) == 0 break end # end of file - - if line[-1] == "\n" line = line[0..-2] end # remove any trailing '\n' - if size(line) > 0 - tasmota.cmd(line) # run the command - end - end - f.close() # close, we don't expect exception with read-only, could be added later though - except .. as e, m - print(string.format('CFG: could not run %s (%s - %s)', fname, e, m)) - f.close() - end - end - - # called by the synthetic event `autoexec` - def autoexec() - if self._archive == nil return end - # try to launch `preinit.be` - import path - - # Step 1. if first run, only apply `init.bat` - var fname = self._archive + '#init.bat' - if self.is_first_time() && path.exists(fname) - # create the '.autoconf' file to avoid running it again, even if it crashed - self.set_first_time() - - # if path.exists(fname) # we know it exists from initial test - self.run_bat(fname) - tasmota.log("CFG: 'init.bat' done, restarting", 2) - tasmota.cmd("Restart 1") - return # if init was run, force a restart anyways and don't run the remaining code - # end - end - - # Step 2. if 'display.ini' is present, launch Universal Display - fname = self._archive + '#display.ini' - if gpio.pin_used(gpio.OPTION_A, 2) && path.exists(fname) - if path.exists("display.ini") - tasmota.log("CFG: skipping 'display.ini' because already present in file-system", 2) - else - import display - var f = open(fname,"r") - var desc = f.read() - f.close() - display.start(desc) - end - end - - # Step 3. if 'autoexec.bat' is present, run it - fname = self._archive + '#autoexec.bat' - if path.exists(fname) - tasmota.log("CFG: running "+fname, 3) - self.run_bat(fname) - tasmota.log("CFG: ran "+fname, 3) - end - - # Step 4. if 'autoexec.be' is present, load it - fname = self._archive + '#autoexec.be' - if path.exists(fname) - tasmota.log("CFG: loading "+fname, 3) - load(fname) - tasmota.log("CFG: loaded "+fname, 3) - end - end - end - - return Autoconf() # return an instance of this class -end - -aa = autoconf_module.init(autoconf_module) -import webserver -webserver.on('/ac2', / -> aa.page_autoconf_mgr(), webserver.HTTP_GET) -return autoconf_module diff --git a/lib/libesp32/berry/default/embedded/i2c_axp192.be b/lib/libesp32/berry/default/embedded/i2c_axp192.be deleted file mode 100644 index 3d958334f..000000000 --- a/lib/libesp32/berry/default/embedded/i2c_axp192.be +++ /dev/null @@ -1,176 +0,0 @@ -#------------------------------------------------------------- - - Generic driver for AXP192 - solidified - -------------------------------------------------------------# -class AXP192 : I2C_Driver - def init() - super(self, I2C_Driver).init("AXP192", 0x34) - end - - # Return True = Battery Exist - def battery_present() - if self.wire.read(self.addr, 0x01, 1) & 0x20 return true - else return false - end - end - - # Input Power Status ??? - def get_input_power_status() - return self.wire.read(self.addr, 0x00, 1) - end - - # Battery Charging Status - def get_battery_chargin_status() - return self.wire.read(self.addr, 0x01, 1) - end - - # AXP chip temperature in °C - def get_temp() - return self.read12(0x5E) * 0.1 - 144.7 - end - - def get_bat_power() - return self.read24(0x70) * 0.00055 - end - - def get_bat_voltage() - return self.read12(0x78) * 0.0011 - end - def get_bat_current() - return (self.read13(0x7A) - self.read13(0x7C)) * 0.5 - end - def get_bat_charge_current() - return self.read13(0x7A) * 0.5 - end - def get_aps_voltage() - return self.read12(0x7E) * 0.0014 - end - def get_vbus_voltage() - return self.read12(0x5A) * 0.0017 - end - def get_vbus_current() - return self.read12(0x5C) * 0.375 - end - - # set LDO voltage - # ldo: 2/3 - # voltage: (mV) 1800mV - 3300mV in 100mV steps - def set_ldo_voltage(ldo, voltage) - if voltage > 3300 voltage = 15 - else voltage = (voltage / 100) - 18 - end - - if ldo == 2 - self.write8(0x28, self.read8(0x28) & 0x0F | ((voltage & 0x0F) << 4)) - end - if ldo == 3 - self.write8(0x28, self.read8(0x28) & 0xF0 | (voltage & 0x0F)) - end - end - - # set DCDC enable, 1/2/3 - def set_dcdc_enable(dcdc, state) - if dcdc == 1 self.write_bit(0x12, 0, state) end - if dcdc == 2 self.write_bit(0x12, 4, state) end - if dcdc == 3 self.write_bit(0x12, 1, state) end - end - - # set LDO enable, 2/3 (LDO 1 is always on) - def set_ldo_enable(ldo, state) - if ldo == 2 self.write_bit(0x12, 2, state) end - if ldo == 3 self.write_bit(0x12, 3, state) end - end - - # set GPIO output state 0/1/2 and 3/4 - def write_gpio(gpio, state) - if gpio >= 0 && gpio <= 2 - self.write_bit(0x94, gpio, state) - elif gpio >= 3 && gpio <= 4 - self.write_bit(0x96, gpio - 3, state) - end - end - - # Set voltage on DC-DC1/2/3 - # dcdc: 1/2/3 (warning some C libs start at 0) - # voltage: - def set_dc_voltage(dcdc, voltage) - if dcdc < 1 || dcdc > 3 return end - var v - if voltage < 700 v = 0 - elif voltage > 3500 v = 112 - elif dcdc == 2 && voltage > 2275 v = 63 # dcdc2 is limited to 2.275V - else v = (voltage - 700) / 25 - end - - var addr = 0x26 - if dcdc == 3 addr = 0x27 - elif dcdc == 2 addr = 0x23 - end - - self.write8(addr, self.read8(addr) & 0x80 | (v & 0x7F)) - end - - # Set charging current - # 100mA = 0 - # 190mA = 1 - # 280mA = 2 - # 360mA = 3 - # 450mA = 4 - # 550mA = 5 - # 630mA = 6 - # 700mA = 7 - # 780mA = 8 - # 880mA = 9 - # 960mA = 10 - # 1000mA = 11 - # 1080mA = 12 - # 1160mA = 13 - # 1240mA = 14 - # 1320mA = 15 - def set_chg_current(current_code) - self.write8(0x33, self.read8(0x33) & 0xF0 | (current_code & 0x0F)) - end - - # // Low Volt Level 1, when APS Volt Output < 3.4496 V - # // Low Volt Level 2, when APS Volt Output < 3.3992 V, then this flag is SET (0x01) - # // Flag will reset once battery volt is charged above Low Volt Level 1 - # // Note: now AXP192 have the Shutdown Voltage of 3.0V (B100) Def in REG 31H - def get_warning_level() - return self.read12(0x47) & 1 - end - - #- trigger a read every second -# - # def every_second() - # if !self.wire return nil end #- exit if not initialized -# - # end - - #- display sensor value in the web UI -# - def web_sensor() - if !self.wire return nil end #- exit if not initialized -# - import string - var msg = string.format( - "{s}VBus Voltage{m}%.3f V{e}".. - "{s}VBus Current{m}%.1f mA{e}".. - "{s}Batt Voltage{m}%.3f V{e}".. - "{s}Batt Current{m}%.1f mA{e}".. - #"{s}Batt Power{m}%.3f{e}".. - "{s}Temp AXP{m}%.1f °C{e}", - self.get_vbus_voltage(), self.get_vbus_voltage(), - self.get_bat_voltage(), self.get_bat_current(), - #self.get_bat_power(), - self.get_temp() - ) - tasmota.web_send_decimal(msg) - end - - #- add sensor value to teleperiod -# - def json_append() - if !self.wire return nil end #- exit if not initialized -# - # import string - # var ax = int(self.accel[0] * 1000) - # var ay = int(self.accel[1] * 1000) - # var az = int(self.accel[2] * 1000) - # var msg = string.format(",\"MPU6886\":{\"AX\":%i,\"AY\":%i,\"AZ\":%i,\"GX\":%i,\"GY\":%i,\"GZ\":%i}", - # ax, ay, az, self.gyro[0], self.gyro[1], self.gyro[2]) - # tasmota.response_append(msg) - end -end diff --git a/lib/libesp32/berry/default/embedded/i2c_driver.be b/lib/libesp32/berry/default/embedded/i2c_driver.be deleted file mode 100644 index a66afa5ad..000000000 --- a/lib/libesp32/berry/default/embedded/i2c_driver.be +++ /dev/null @@ -1,104 +0,0 @@ -#------------------------------------------------------------- - - IMPORTANT - - THIS CLASS IS ALREADY BAKED IN TASMOTA - - - - It is here for debugging and documentation purpose only - -------------------------------------------------------------# - -#------------------------------------------------------------- - - I2C_Driver class to simplify development of I2C drivers - - - - I2C_Driver(name, addr [, i2c_index]) -> nil - - name: name of I2C device for logging, or function to detect the model - - addr: I2C address of device, will probe all I2C buses for it - - i2c_index: (optional) check is the device is not disabled - -------------------------------------------------------------# - -class I2C_Driver - var wire #- wire object to reach the device, if nil then the module is not initialized -# - var addr #- I2C address of the device -# - var name #- model namme of the device, cannot be nil -# - - #- Init and look for device - - Input: - - name_or_detect : name of the device (if string) - or function to detect the precise model(if function) - the function is passed a single argument `self` - and must return a string, or `nil` if the device is invalid - - addr : I2C address of device (int 0..255) - - i2c_index : Tasmota I2C index, see `I2CDEVICES.md` (int) - --# - def init(name_or_detect, addr, i2c_index) - var tasmota = self.get_tasmota() #- retrieve the 'tasmota' singleton -# - - #- check if the i2c index is disabled by Tasmota configuration -# - if i2c_index != nil && !tasmota.i2c_enabled(i2c_index) return end - - self.addr = addr #- address for AXP192 -# - self.wire = tasmota.wire_scan(self.addr) #- get the right I2C bus -# - - if self.wire - #- find name of device, can be a string or a method -# - if type(name_or_detect) == 'function' - self.name = name_or_detect(self) - else - self.name = name_or_detect - end - #- if name is invalid, it means we can't detect device, abort -# - if self.name == nil self.wire = nil end - - if self.wire - print("I2C:", self.name, "detected on bus", self.wire.bus) - end - end - end - - #- write register with 8 bits value -# - def write8(reg, val) - return self.wire.write(self.addr, reg, val, 1) - end - - # Set or clear a specific bit in a register - # write_bit(reg:int, bit:int, state:bool) -> nil - # reg: I2C register number (0..255) - # bit: bit of I2C register to change (0..7) - # state: boolean value to write to specified bit - def write_bit(reg, bit, state) - if bit < 0 || bit > 7 return end - var mark = 1 << bit - if state self.write8(reg, self.read8(reg) | mark) - else self.write8(reg, self.read8(reg) & (0xFF - mark)) - end - end - - # read 8 bits - def read8(reg) - return self.wire.read(self.addr, reg, 1) - end - # read 12 bits - def read12(reg) - var buf = self.wire.read_bytes(self.addr, reg, 2) - return (buf[0] << 4) + buf[1] - end - # read 13 bits - def read13(reg) - var buf = self.wire.read_bytes(self.addr, reg, 2) - return (buf[0] << 5) + buf[1] - end - # read 24 bits - def read24(reg) - var buf = self.wire.read_bytes(self.addr, reg, 3) - return (buf[0] << 16) + (buf[1] << 8) + buf[2] - end - # read 32 bits - def read32(reg) - var buf = self.wire.read_bytes(self.addr, reg, 4) - return (buf[0] << 24) + (buf[1] << 16) + (buf[2] << 8) + buf[3] - end -end - -#- Example - -d = I2C_Driver("MPU", 0x68, 58) - --# \ No newline at end of file diff --git a/lib/libesp32/berry/default/embedded/leds.be b/lib/libesp32/berry/default/embedded/leds.be deleted file mode 100644 index 11a0489af..000000000 --- a/lib/libesp32/berry/default/embedded/leds.be +++ /dev/null @@ -1,338 +0,0 @@ -# class Leds -# -# for adressable leds like NoePixel - - -# Native commands -# 00 : ctor (leds:int, gpio:int) -> void -# 01 : begin void -> void -# 02 : show void -> void -# 03 : CanShow void -> bool -# 04 : IsDirty void -> bool -# 05 : Dirty void -> void -# 06 : Pixels void -> bytes() (mapped to the buffer) -# 07 : PixelSize void -> int -# 08 : PixelCount void -> int -# 09 : ClearTo (color:??) -> void -# 10 : SetPixelColor (idx:int, color:??) -> void -# 11 : GetPixelColor (idx:int) -> color:?? -# 20 : RotateLeft (rot:int [, first:int, last:int]) -> void -# 21 : RotateRight (rot:int [, first:int, last:int]) -> void -# 22 : ShiftLeft (rot:int [, first:int, last:int]) -> void -# 23 : ShiftRight (rot:int [, first:int, last:int]) -> void - - -class Leds : Leds_ntv - var gamma # if true, apply gamma (true is default) - var leds # number of leds - # leds:int = number of leds of the strip - # gpio:int (optional) = GPIO for NeoPixel. If not specified, takes the WS2812 gpio - # type:int (optional) = Type of LED, defaults to WS2812 RGB - # rmt:int (optional) = RMT hardware channel to use, leave default unless you have a good reason - def init(leds, gpio, type, rmt) # rmt is optional - self.gamma = true # gamma is enabled by default, it should be disabled explicitly if needed - self.leds = int(leds) - - if gpio == nil && gpio.pin(gpio.WS2812) >= 0 - gpio = gpio.pin(gpio.WS2812) - end - - # if no GPIO, abort - if gpio == nil - raise "valuer_error", "no GPIO specified for neopixelbus" - end - - # initialize the structure - self.ctor(self.leds, gpio, type, rmt) - - if self._p == nil raise "internal_error", "couldn't not initialize noepixelbus" end - - # call begin - self.begin() - - end - - def clear() - self.clear_to(0x000000) - self.show() - end - - def ctor(leds, gpio, rmt) - if rmt == nil - self.call_native(0, leds, gpio) - else - self.call_native(0, leds, gpio, rmt) - end - end - def begin() - self.call_native(1) - end - def show() - self.call_native(2) - end - def can_show() - return self.call_native(3) - end - def is_dirty() - return self.call_native(4) - end - def dirty() - self.call_native(5) - end - def pixels_buffer() - return self.call_native(6) - end - def pixel_size() - return self.call_native(7) - end - def pixel_count() - return self.call_native(8) - end - def clear_to(col, bri) - self.call_native(9, self.to_gamma(col, bri)) - end - def set_pixel_color(idx, col, bri) - self.call_native(10, idx, self.to_gamma(col, bri)) - end - def get_pixel_color(idx) - return self.call_native(11, idx) - end - # def rotate_left(rot, first, last) - # self.call_native(20, rot, first, last) - # end - # def rotate_right(rot, first, last) - # self.call_native(21, rot, first, last) - # end - # def shift_left(rot, first, last) - # self.call_native(22, rot, first, last) - # end - # def shift_right(rot, first, last) - # self.call_native(22, rot, first, last) - # end - - # apply gamma and bri - def to_gamma(rgbw, bri) - bri = (bri != nil) ? bri : 100 - var r = tasmota.scale_uint(bri, 0, 100, 0, (rgbw & 0xFF0000) >> 16) - var g = tasmota.scale_uint(bri, 0, 100, 0, (rgbw & 0x00FF00) >> 8) - var b = tasmota.scale_uint(bri, 0, 100, 0, (rgbw & 0x0000FF)) - if self.gamma - return light.gamma8(r) << 16 | - light.gamma8(g) << 8 | - light.gamma8(b) - else - return r << 16 | - g << 8 | - b - end - end - - # `segment` - # create a new `strip` object that maps a part of the current strip - def create_segment(offset, leds) - if int(offset) + int(leds) > self.leds || offset < 0 || leds < 0 - raise "value_error", "out of range" - end - - # inner class - class Leds_segment - var strip - var offset, leds - - def init(strip, offset, leds) - self.strip = strip - self.offset = int(offset) - self.leds = int(leds) - end - - def clear() - self.clear_to(0x000000) - self.show() - end - - def begin() - # do nothing, already being handled by physical strip - end - def show(force) - # don't trigger on segment, you will need to trigger on full strip instead - if bool(force) || (self.offset == 0 && self.leds == self.strip.leds) - self.strip.show() - end - end - def can_show() - return self.strip.can_show() - end - def is_dirty() - return self.strip.is_dirty() - end - def dirty() - self.strip.dirty() - end - def pixels_buffer() - return nil - end - def pixel_size() - return self.strip.pixel_size() - end - def pixel_count() - return self.leds - end - def clear_to(col, bri) - var i = 0 - while i < self.leds - self.strip.set_pixel_color(i + self.offset, col, bri) - i += 1 - end - end - def set_pixel_color(idx, col, bri) - self.strip.set_pixel_color(idx + self.offset, col, bri) - end - def get_pixel_color(idx) - return self.strip.get_pixel_color(idx + self.offseta) - end - end - - return Leds_segment(self, offset, leds) - - end - - def create_matrix(w, h, offset) - offset = int(offset) - w = int(w) - h = int(h) - if offset == nil offset = 0 end - if w * h + offset > self.leds || h < 0 || w < 0 || offset < 0 - raise "value_error", "out of range" - end - - # inner class - class Leds_matrix - var strip - var offset - var h, w - var alternate # are rows in alternate mode (even/odd are reversed) - - def init(strip, w, h, offset) - self.strip = strip - self.offset = offset - self.h = h - self.w = w - self.alternate = false - end - - def clear() - self.clear_to(0x000000) - self.show() - end - - def begin() - # do nothing, already being handled by physical strip - end - def show(force) - # don't trigger on segment, you will need to trigger on full strip instead - if bool(force) || (self.offset == 0 && self.w * self.h == self.strip.leds) - self.strip.show() - end - end - def can_show() - return self.strip.can_show() - end - def is_dirty() - return self.strip.is_dirty() - end - def dirty() - self.strip.dirty() - end - def pixels_buffer() - return nil - end - def pixel_size() - return self.strip.pixel_size() - end - def pixel_count() - return self.w * self.h - end - def clear_to(col, bri) - var i = 0 - while i < self.w * self.h - self.strip.set_pixel_color(i + self.offset, col, bri) - i += 1 - end - end - def set_pixel_color(idx, col, bri) - self.strip.set_pixel_color(idx + self.offset, col, bri) - end - def get_pixel_color(idx) - return self.strip.get_pixel_color(idx + self.offseta) - end - - # Leds_matrix specific - def set_alternate(alt) - self.alternate = alt - end - def get_alternate() - return self.alternate - end - - def set_matrix_pixel_color(x, y, col, bri) - if self.alternate && x % 2 - # reversed line - self.strip.set_pixel_color(x * self.w + self.h - y - 1 + self.offset, col, bri) - else - self.strip.set_pixel_color(x * self.w + y + self.offset, col, bri) - end - end - end - - return Leds_matrix(self, w, h, offset) - - end - - static def matrix(w, h, gpio, rmt) - var strip = Leds(w * h, gpio, rmt) - var matrix = strip.create_matrix(w, h, 0) - return matrix - end -end - - -#- - -var s = Leds(25, gpio.pin(gpio.WS2812, 1)) -s.clear_to(0x300000) -s.show() -i = 0 - -def anim() - s.clear_to(0x300000) - s.set_pixel_color(i, 0x004000) - s.show() - i = (i + 1) % 25 - tasmota.set_timer(200, anim) -end -anim() - --# - -#- - -var s = Leds_matrix(5, 5, gpio.pin(gpio.WS2812, 1)) -s.set_alternate(true) -s.clear_to(0x300000) -s.show() -x = 0 -y = 0 - -def anim() - s.clear_to(0x300000) - s.set_matrix_pixel_color(x, y, 0x004000) - s.show() - y = (y + 1) % 5 - if y == 0 - x = (x + 1) % 5 - end - tasmota.set_timer(200, anim) -end -anim() - --# diff --git a/lib/libesp32/berry/default/embedded/leds_animator.be b/lib/libesp32/berry/default/embedded/leds_animator.be deleted file mode 100644 index 1ed25b491..000000000 --- a/lib/libesp32/berry/default/embedded/leds_animator.be +++ /dev/null @@ -1,70 +0,0 @@ -# class Leds_animator - -class Leds_animator - var strip # neopixelbus object - var pixel_count # number of pixels in the strip - var bri # brightness of the animation, 0..100, default 50 - var running # is the animation running - var animators # animators list - - def init(strip) - self.strip = strip - self.bri = 50 # percentage of brightness 0..100 - self.running = false - self.pixel_count = strip.pixel_count() - self.animators = [] - # - self.clear() # clear all leds first - # - tasmota.add_driver(self) - end - - def add_anim(anim) - self.animators.push(anim) - anim.run() # start the animator - end - - def clear() - self.stop() - self.strip.clear() - end - def start() - self.running = true - end - def stop() - self.running = false - end - - def set_bri(bri) - self.bri = bri - end - def get_bri(bri) - return self.bri - end - - def every_50ms() - if self.running - # run animators first - var i = 0 - while i < size(self.animators) - var anim = self.animators[i] - if anim.is_running() - anim.animate() - i += 1 - else - self.animators.remove(i) # remove any finished animator - end - end - # tirgger animate and display - self.animate() - end - end - - def animate() - # placeholder - do nothing by default - end - - def remove() - tasmota.remove_driver(self) - end -end diff --git a/lib/libesp32/berry/default/embedded/lv_clock_icon.be b/lib/libesp32/berry/default/embedded/lv_clock_icon.be deleted file mode 100644 index f5d19ca11..000000000 --- a/lib/libesp32/berry/default/embedded/lv_clock_icon.be +++ /dev/null @@ -1,54 +0,0 @@ -#- LVGL lv_clock_icon - - ---# - -class lv_clock_icon: lv.label - var hour, minute, sec - - def init(parent) - super(self).init(parent) - var f_s7_16 = lv.seg7_font(16) - if f_s7_16 != nil self.set_style_text_font(f_s7_16, lv.PART_MAIN | lv.STATE_DEFAULT) end - - if parent != nil - var parent_height = parent.get_height() - - self.set_text("--:--") - self.refr_size() - var w = self.get_width() - self.set_y((parent.get_height() - self.get_height()) / 2) # center vertically - - var pad_right = parent.get_style_pad_right(lv.PART_MAIN | lv.STATE_DEFAULT) - self.set_x(parent.get_width() - w - pad_right - 3) - parent.set_style_pad_right(pad_right + w + 6, lv.PART_MAIN | lv.STATE_DEFAULT) - - self.set_style_bg_color(lv.color(lv.COLOR_BLACK), lv.PART_MAIN | lv.STATE_DEFAULT) - end - - tasmota.add_driver(self) - end - - def set_time(hour, minute, sec) - import string - if hour != self.hour || minute != self.minute || sec != self.sec - var txt = string.format("%02d%s%02d", hour, sec % 2 ? ":" : " ", minute) - self.hour = hour - self.minute = minute - self.sec = sec - #if txt[0] == '0' txt = '!' .. string.split(txt,1)[1] end # replace first char with '!' - self.set_text(txt) - end - end - - def every_second() - var now = tasmota.time_dump(tasmota.rtc()['local']) - if now['year'] != 1970 - self.set_time(now['hour'], now['min'], now['sec']) - end - end - - def del() - super(self).del() - tasmota.remove_driver(self) - end -end \ No newline at end of file diff --git a/lib/libesp32/berry/default/embedded/lv_signal_arcs.be b/lib/libesp32/berry/default/embedded/lv_signal_arcs.be deleted file mode 100644 index 7dd924e90..000000000 --- a/lib/libesp32/berry/default/embedded/lv_signal_arcs.be +++ /dev/null @@ -1,133 +0,0 @@ -#- LVGL lv_signal_bars and lv_wifi_bars - - ---# - -class lv_signal_arcs : lv.obj - var percentage # value to display, range 0..100 - var p1, p2, area, line_dsc # instances of objects kept to avoid re-instanciating at each call - - def init(parent) - # init custom widget (don't call super constructor) - _lvgl.create_custom_widget(self, parent) - # own values - self.percentage = 100 - # pre-allocate buffers - self.p1 = lv.point() - self.p2 = lv.point() - self.area = lv.area() - self.line_dsc = lv.draw_line_dsc() - end - - def widget_event(cl, event) - # Call the ancestor's event handler - if lv.obj_event_base(cl, event) != lv.RES_OK return end - var code = event.code - - import math - def atleast1(x) if x >= 1 return x else return 1 end end - # the model is that we have 4 bars and inter-bar (1/4 of width) - var height = self.get_height() - var width = self.get_width() - - var inter_bar = atleast1(height / 8) - var bar = atleast1((height - inter_bar * 2) / 3) - var bar_offset = bar / 2 - #print("inter_bar", inter_bar, "bar", bar, "bar_offset", bar_offset) - - if code == lv.EVENT_DRAW_MAIN - var clip_area = lv.area(event.param) - - # get coordinates of object - self.get_coords(self.area) - var x_ofs = self.area.x1 - var y_ofs = self.area.y1 - - lv.draw_line_dsc_init(self.line_dsc) # initialize lv.draw_line_dsc structure - self.init_draw_line_dsc(lv.PART_MAIN, self.line_dsc) # copy the current values - - self.line_dsc.round_start = 1 - self.line_dsc.round_end = 1 - self.line_dsc.width = (bar * 3 + 1) / 4 - var on_color = self.get_style_line_color(lv.PART_MAIN | lv.STATE_DEFAULT) - var off_color = self.get_style_bg_color(lv.PART_MAIN | lv.STATE_DEFAULT) - - # initial calculation, but does not take into account bounding box - # var angle = int(math.deg(math.atan2(width / 2, height))) - - # better calculation - var hypotenuse = height - bar # center if at bar/2 from bottom and circle stops at bar/2 from top - var adjacent = width / 2 - bar_offset # stop at bar_offset from side - var angle = int(90 - math.deg(math.acos(real(adjacent) / real(hypotenuse)))) - if (angle > 45) angle = 45 end - - # print("hypotenuse",hypotenuse,"adjacent",adjacent,"angle",angle) - self.p1.x = x_ofs + width / 2 - self.p1.y = y_ofs + height - 1 - bar_offset - - self.line_dsc.color = self.percentage >= 25 ? on_color : off_color - lv.draw_arc(self.p1.x, self.p1.y, 0 * (bar + inter_bar) + bar_offset, 0, 360, clip_area, self.line_dsc) - self.line_dsc.color = self.percentage >= 50 ? on_color : off_color - lv.draw_arc(self.p1.x, self.p1.y, 1 * (bar + inter_bar) + bar_offset - 1, 270 - angle, 270 + angle, clip_area, self.line_dsc) - self.line_dsc.color = self.percentage >= 75 ? on_color : off_color - lv.draw_arc(self.p1.x, self.p1.y, 2 * (bar + inter_bar) + bar_offset - 2, 270 - angle, 270 + angle, clip_area, self.line_dsc) - - #elif mode == lv.DESIGN_DRAW_POST # commented since we don't want a frame around this object - # self.ancestor_design.call(self, clip_area, mode) - end - end - - def set_percentage(v) - var old_bars = self.percentage / 25 - if v > 100 v = 100 end - if v < 0 v = 0 end - self.percentage = v - if old_bars != v / 25 - self.invalidate() # be frugal and avoid updating the widget if it's not needed - end - end - - def get_percentage() - return self.percentage - end -end - -class lv_wifi_arcs: lv_signal_arcs - def init(parent) - super(self).init(parent) - tasmota.add_driver(self) - self.set_percentage(0) # we generally start with 0, meaning not connected - end - - def every_second() - var wifi = tasmota.wifi() - var quality = wifi.find("quality") - var ip = wifi.find("ip") - if ip == nil - self.set_percentage(0) - elif quality != nil - self.set_percentage(quality) - end - end - - def del() - super(self).del() - tasmota.remove_driver(self) - end -end - -class lv_wifi_arcs_icon: lv_wifi_arcs - def init(parent) - super(self).init(parent) - self.set_style_line_color(lv.color(lv.COLOR_WHITE), lv.PART_MAIN | lv.STATE_DEFAULT) - self.set_style_bg_color(lv.color(lv.COLOR_BLACK), lv.PART_MAIN | lv.STATE_DEFAULT) - if parent != nil - var parent_height = parent.get_height() - var pad_right = parent.get_style_pad_right(lv.PART_MAIN | lv.STATE_DEFAULT) - self.set_height(parent_height) - var w = (parent_height*4)/3 - self.set_width(w) # 130% - self.set_x(parent.get_width() - w - pad_right) - parent.set_style_pad_right(pad_right + w + 1, lv.PART_MAIN | lv.STATE_DEFAULT) - end - end -end \ No newline at end of file diff --git a/lib/libesp32/berry/default/embedded/lv_signal_bars.be b/lib/libesp32/berry/default/embedded/lv_signal_bars.be deleted file mode 100644 index f548457b9..000000000 --- a/lib/libesp32/berry/default/embedded/lv_signal_bars.be +++ /dev/null @@ -1,118 +0,0 @@ -#- LVGL lv_signal_bars and lv_wifi_bars - - ---# - -class lv_signal_bars : lv.obj - var percentage # value to display, range 0..100 - var p1, p2, area, line_dsc # instances of objects kept to avoid re-instanciating at each call - - def init(parent) - # init custom widget (don't call super constructor) - _lvgl.create_custom_widget(self, parent) - # own values - self.percentage = 100 - # pre-allocate buffers - self.p1 = lv.point() - self.p2 = lv.point() - self.area = lv.area() - self.line_dsc = lv.draw_line_dsc() - end - - def widget_event(cl, event) - # Call the ancestor's event handler - if lv.obj_event_base(cl, event) != lv.RES_OK return end - var code = event.code - - def atleast1(x) if x >= 1 return x else return 1 end end - # the model is that we have 4 bars and inter-bar (1/4 of width) - var height = self.get_height() - var width = self.get_width() - - var inter_bar = atleast1(width / 15) - var bar = atleast1((width - inter_bar * 3) / 4) - var bar_offset = bar / 2 - - if code == lv.EVENT_DRAW_MAIN - var clip_area = lv.area(event.param) - - # get coordinates of object - self.get_coords(self.area) - var x_ofs = self.area.x1 - var y_ofs = self.area.y1 - - lv.draw_line_dsc_init(self.line_dsc) # initialize lv_draw_line_dsc structure - self.init_draw_line_dsc(lv.PART_MAIN, self.line_dsc) # copy the current values - - self.line_dsc.round_start = 1 - self.line_dsc.round_end = 1 - self.line_dsc.width = bar - var on_color = self.get_style_line_color(lv.PART_MAIN | lv.STATE_DEFAULT) - var off_color = self.get_style_bg_color(lv.PART_MAIN | lv.STATE_DEFAULT) - - lv.event_send(self, lv.EVENT_DRAW_PART_BEGIN, self.line_dsc) - for i:0..3 # 4 bars - self.line_dsc.color = self.percentage >= (i+1)*20 ? on_color : off_color - self.p1.y = y_ofs + height - 1 - bar_offset - self.p1.x = x_ofs + i * (bar + inter_bar) + bar_offset - self.p2.y = y_ofs + ((3 - i) * (height - bar)) / 4 + bar_offset - self.p2.x = self.p1.x - lv.draw_line(self.p1, self.p2, clip_area, self.line_dsc) - end - lv.event_send(self, lv.EVENT_DRAW_PART_END, self.line_dsc) - end - end - - def set_percentage(v) - var old_bars = self.percentage / 20 - if v > 100 v = 100 end - if v < 0 v = 0 end - self.percentage = v - if old_bars != v / 20 - self.invalidate() # be frugal and avoid updating the widget if it's not needed - end - end - - def get_percentage() - return self.percentage - end -end - -class lv_wifi_bars: lv_signal_bars - def init(parent) - super(self).init(parent) - tasmota.add_driver(self) - self.set_percentage(0) # we generally start with 0, meaning not connected - end - - def every_second() - var wifi = tasmota.wifi() - var quality = wifi.find("quality") - var ip = wifi.find("ip") - if ip == nil - self.set_percentage(0) - elif quality != nil - self.set_percentage(quality) - end - end - - def del() - super(self).del() - tasmota.remove_driver(self) - end -end - -class lv_wifi_bars_icon: lv_wifi_bars - def init(parent) - super(self).init(parent) - self.set_style_line_color(lv.color(lv.COLOR_WHITE), lv.PART_MAIN | lv.STATE_DEFAULT) - self.set_style_bg_color(lv.color(lv.COLOR_BLACK), lv.PART_MAIN | lv.STATE_DEFAULT) - if parent != nil - var parent_height = parent.get_height() - var pad_right = parent.get_style_pad_right(lv.PART_MAIN | lv.STATE_DEFAULT) - self.set_height(parent_height) - self.set_width(parent_height) - self.set_x(parent.get_width() - parent_height - pad_right) - parent.set_style_pad_right(pad_right + parent_height + 1, lv.PART_MAIN | lv.STATE_DEFAULT) - end - end -end diff --git a/lib/libesp32/berry/default/embedded/lvgl_glob.be b/lib/libesp32/berry/default/embedded/lvgl_glob.be deleted file mode 100644 index 04250ff54..000000000 --- a/lib/libesp32/berry/default/embedded/lvgl_glob.be +++ /dev/null @@ -1,256 +0,0 @@ -#- embedded class for LVGL globals -# - -#- This class stores all globals used by LVGL and cannot be stored in the solidified module -# -#- this limits the globals to a single value '_lvgl' -# -class LVGL_glob - # all variables are lazily initialized to reduce the memory pressure. Until they are used, they consume zero memory - var cb_obj # map between a native C pointer (as int) and the corresponding lv.lv_* berry object, also helps marking the objects as non-gc-able - var cb_event_closure # mapping for event closures per LVGL native pointer (int) - var event_cb # native callback for lv.lv_event - - #- below are native callbacks mapped to a closure to a method of this instance -# - var null_cb # cb called if type is not supported - var widget_ctor_cb - var widget_dtor_cb - var widget_event_cb - - var widget_struct_default - var widget_struct_by_class - - #- this is the fallback callback, if the event is unknown or unsupported -# - static cb_do_nothing = def() print("LVG: call to unsupported callback") end - - #- register an lv.lv_* object in the mapping -# - def register_obj(obj) - if self.cb_obj == nil self.cb_obj = {} end - self.cb_obj[obj._p] = obj - end - - def get_object_from_ptr(ptr) - if self.cb_obj != nil - return self.cb_obj.find(ptr) # raise an exception if something is wrong - end - end - - def lvgl_event_dispatch(event_ptr) - import introspect - - var event = lv.lv_event(introspect.toptr(event_ptr)) - - var target = event.target - var f = self.cb_event_closure[target] - var obj = self.get_object_from_ptr(target) - #print('>> lvgl_event_dispatch', f, obj, event) - f(obj, event) - end - - def gen_cb(name, f, obj, ptr) - #print('>> gen_cb', name, obj, ptr) - # record the object, whatever the callback - - if name == "lv_event_cb" - if self.cb_event_closure == nil self.cb_event_closure = {} end - if self.event_cb == nil self.event_cb = tasmota.gen_cb(/ event_ptr -> self.lvgl_event_dispatch(event_ptr)) end # encapsulate 'self' in closure - - self.register_obj(obj) - self.cb_event_closure[ptr] = f - return self.event_cb - # elif name == "" - else - if self.null_cb == nil self.null_cb = tasmota.gen_cb(self.cb_do_nothing) end - return self.null_cb - end - end - - def widget_ctor_impl(cl_ptr, obj_ptr) - import introspect - var cl = lv.lv_obj_class(cl_ptr) - var obj = self.get_object_from_ptr(obj_ptr) - if self.cb_obj.find(obj) obj = self.cb_obj[obj] end - # print("widget_ctor_impl", cl, obj) - if type(obj) == 'instance' && introspect.get(obj, 'widget_constructor') - obj.widget_constructor(cl) - end - end - def widget_dtor_impl(cl_ptr, obj_ptr) - import introspect - var cl = lv.lv_obj_class(cl_ptr) - var obj = self.get_object_from_ptr(obj_ptr) - # print("widget_dtor_impl", cl, obj) - if type(obj) == 'instance' && introspect.get(obj, 'widget_destructor') - obj.widget_destructor(cl) - end - end - def widget_event_impl(cl_ptr, e_ptr) - import introspect - var cl = lv.lv_obj_class(cl_ptr) - var event = lv.lv_event(e_ptr) - var obj_ptr = event.target - var obj = self.get_object_from_ptr(obj_ptr) - if type(obj) == 'instance' && introspect.get(obj, 'widget_event') - obj.widget_event(cl, event) - end - # print("widget_event_impl", cl, obj_ptr, obj, event) - end - - - def widget_cb() - if self.widget_ctor_cb == nil self.widget_ctor_cb = tasmota.gen_cb(/ cl, obj -> self.widget_ctor_impl(cl, obj)) end - if self.widget_dtor_cb == nil self.widget_dtor_cb = tasmota.gen_cb(/ cl, obj -> self.widget_dtor_impl(cl, obj)) end - if self.widget_event_cb == nil self.widget_event_cb = tasmota.gen_cb(/ cl, e -> self.widget_event_impl(cl, e)) end - - if self.widget_struct_default == nil - self.widget_struct_default = lv.lv_obj_class(lv.lv_obj._class).copy() - self.widget_struct_default.base_class = lv.lv_obj._class # by default, inherit from base class `lv_obj`, this can be overriden - self.widget_struct_default.constructor_cb = self.widget_ctor_cb # set the berry cb dispatchers - self.widget_struct_default.destructor_cb = self.widget_dtor_cb - self.widget_struct_default.event_cb = self.widget_event_cb - end - end - - #- deregister_obj all information linked to a specific LVGL native object (int) -# - def deregister_obj(obj) - if self.cb_obj != nil self.cb_obj.remove(obj) end - if self.cb_event_closure != nil self.cb_event_closure.remove(obj) end - end - - #- initialize a custom widget -# - #- arg must be a subclass of lv.lv_obj -# - def create_custom_widget(obj, parent) - import introspect - - if !isinstance(obj, lv.lv_obj) raise "value_error", "arg must be a subclass of lv_obj" end - if self.widget_struct_by_class == nil self.widget_struct_by_class = {} end - - var obj_classname = classname(obj) - var obj_class_struct = self.widget_struct_by_class.find(obj_classname) - # print("classname=",obj_classname,"_class",super(obj)._class) - #- not already built, create a new one for this class -# - if obj_class_struct == nil - self.widget_cb() # set up all structures - obj_class_struct = self.widget_struct_default.copy() # get a copy of the structure with pre-defined callbacks - obj_class_struct.base_class = super(obj)._class - if introspect.get(obj, 'widget_width_def') obj_class_struct.width_def = obj.widget_width_def end - if introspect.get(obj, 'widget_height_def') obj_class_struct.height_def = obj.widget_height_def end - if introspect.get(obj, 'widget_editable') obj_class_struct.editable = obj.widget_editable end - if introspect.get(obj, 'widget_group_def') obj_class_struct.group_def = obj.widget_group_def end - if introspect.get(obj, 'widget_instance_size') obj_class_struct.instance_size = obj.widget_instance_size end - - #- keep a copy of the structure to avoid GC and reuse if needed -# - self.widget_struct_by_class[obj_classname] = obj_class_struct - end - - var lv_obj_ptr = lv.obj_class_create_obj(obj_class_struct, parent) - obj._p = lv_obj_ptr._p - self.register_obj(obj) - obj.class_init_obj() - end -end - -_lvgl = LVGL_glob() - -# class lv_custom_widget : lv.lv_obj -# # static widget_width_def -# # static widget_height_def -# # static widget_editable -# # static widget_group_def -# # static widget_instance_size -# # -# var percentage # value to display, range 0..100 -# var p1, p2, area, line_dsc # instances of objects kept to avoid re-instanciating at each call - -# def init(parent) -# _lvgl.create_custom_widget(self, parent) -# # own values -# self.percentage = 100 -# # pre-allocate buffers -# self.p1 = lv.lv_point() -# self.p2 = lv.lv_point() -# self.area = lv.lv_area() -# self.line_dsc = lv.lv_draw_line_dsc() -# end - -# # def widget_constructor(cl) -# # print("widget_constructor", cl) -# # end - -# # def widget_destructor(cl) -# # print("widget_destructor", cl) -# # end - -# def widget_event(cl, event) -# var res = lv.obj_event_base(cl, event) -# if res != lv.RES_OK return end - -# def atleast1(x) if x >= 1 return x else return 1 end end -# # the model is that we have 4 bars and inter-bar (1/4 of width) -# var height = self.get_height() -# var width = self.get_width() - -# var inter_bar = atleast1(width / 15) -# var bar = atleast1((width - inter_bar * 3) / 4) -# var bar_offset = bar / 2 - -# var code = event.code -# if code == lv.EVENT_DRAW_MAIN -# var clip_area = lv.lv_area(event.param) -# print("widget_event DRAW", clip_area.tomap()) -# # lv.event_send(self, lv.EVENT_DRAW_MAIN, clip_area) - -# # get coordinates of object -# self.get_coords(self.area) -# var x_ofs = self.area.x1 -# var y_ofs = self.area.y1 - -# lv.draw_line_dsc_init(self.line_dsc) # initialize lv.lv_draw_line_dsc structure -# self.init_draw_line_dsc(lv.PART_MAIN, self.line_dsc) - -# self.line_dsc.round_start = 1 -# self.line_dsc.round_end = 1 -# self.line_dsc.width = bar - -# var on_color = self.get_style_line_color(lv.PART_MAIN | lv.STATE_DEFAULT) -# var off_color = self.get_style_bg_color(lv.PART_MAIN | lv.STATE_DEFAULT) - -# lv.event_send(self, lv.EVENT_DRAW_PART_BEGIN, self.line_dsc) -# for i:0..3 # 4 bars -# self.line_dsc.color = self.percentage >= (i+1)*20 ? on_color : off_color -# self.p1.y = y_ofs + height - 1 - bar_offset -# self.p1.x = x_ofs + i * (bar + inter_bar) + bar_offset -# self.p2.y = y_ofs + ((3 - i) * (height - bar)) / 4 + bar_offset -# self.p2.x = self.p1.x -# lv.draw_line(self.p1, self.p2, clip_area, self.line_dsc) -# end -# lv.event_send(self, lv.EVENT_DRAW_PART_END, self.line_dsc) - -# end -# end - -# def set_percentage(v) -# var old_bars = self.percentage / 5 -# if v > 100 v = 100 end -# if v < 0 v = 0 end -# self.percentage = v -# if old_bars != v / 5 -# self.invalidate() # be frugal and avoid updating the widget if it's not needed -# end -# end - -# def get_percentage() -# return self.percentage -# end -# end - -# ########## ########## ########## ########## ########## ########## ########## ########## - -# lv.start() - -# hres = lv.get_hor_res() # should be 320 -# vres = lv.get_ver_res() # should be 240 - -# scr = lv.scr_act() # default screean object -# f20 = lv.montserrat_font(20) # load embedded Montserrat 20 - -# scr.set_style_bg_color(lv.lv_color(0x0000A0), lv.PART_MAIN | lv.STATE_DEFAULT) - -# w = lv_custom_widget(scr) \ No newline at end of file diff --git a/lib/libesp32/berry/default/embedded/openhasp.be b/lib/libesp32/berry/default/embedded/openhasp.be deleted file mode 100644 index 4232a605b..000000000 --- a/lib/libesp32/berry/default/embedded/openhasp.be +++ /dev/null @@ -1,764 +0,0 @@ -import string -import json - -# lv.start() -# scr = lv.scr_act() # default screean object -# scr.set_style_bg_color(lv.color(0x0000A0), lv.PART_MAIN | lv.STATE_DEFAULT) - -lv.start() - -hres = lv.get_hor_res() # should be 320 -vres = lv.get_ver_res() # should be 240 - -scr = lv.scr_act() # default screean object -#f20 = lv.montserrat_font(20) # load embedded Montserrat 20 -r20 = lv.font_robotocondensed_latin1(20) -r16 = lv.font_robotocondensed_latin1(16) - -th2 = lv.theme_openhasp_init(0, lv.color(0xFF00FF), lv.color(0x303030), false, r16) -scr.get_disp().set_theme(th2) -# TODO -scr.set_style_bg_color(lv.color(lv.COLOR_WHITE),0) - -# apply theme to layer_top, but keep it transparent -lv.theme_apply(lv.layer_top()) -lv.layer_top().set_style_bg_opa(0,0) - - -# takes an attribute name and responds if it needs color conversion -def is_color_attribute(t) - import string - t = str(t) - # contains `color` but does not contain `color_` - return (string.find(t, "color") >= 0) && (string.find(t, "color_") < 0) -end - -# parse hex string -def parse_hex(s) - import string - s = string.toupper(s) # turn to uppercase - var val = 0 - for i:0..size(s)-1 - var c = s[i] - # var c_int = string.byte(c) - if c == "#" continue end # skip '#' prefix if any - if c == "x" || c == "X" continue end # skip 'x' or 'X' - - if c >= "A" && c <= "F" - val = (val << 4) | string.byte(c) - 55 - elif c >= "0" && c <= "9" - val = (val << 4) | string.byte(c) - 48 - end - end - return val -end - -def parse_color(s) - s = str(s) - if s[0] == '#' - return lv.color(parse_hex(s)) - else - import string - import introspect - var col_name = "COLOR_" + string.toupper(s) - var col_try = introspect.get(lv, col_name) - if col_try != nil - return lv.color(col_try) - end - end - # fail safe with black color - return lv.color(0x000000) -end - -#- ------------------------------------------------------------ - Class `lvh_obj` encapsulating `lv_obj`` - - Provide a mapping for virtual members - Stores the associated page and object id - - Adds specific virtual members used by OpenHASP -- ------------------------------------------------------------ -# -class lvh_obj - # _lv_class refers to the lvgl class encapsulated, and is overriden by subclasses - static _lv_class = lv.obj - static _lv_part2_selector # selector for secondary part (like knob of arc) - - # attributes to ignore when set at object level (they are managed by page) - static _attr_ignore = [ - "id", - "obj", - "page", - "comment", - "parentid", - "auto_size", # TODO not sure it's still needed in LVGL8 - ] - #- mapping from OpenHASP attribute to LVGL attribute -# - #- if mapping is null, we use set_X and get_X from our own class -# - static _attr_map = { - "x": "x", - "y": "y", - "w": "width", - "h": "height", - # arc - "asjustable": nil, - "mode": nil, - "start_angle": "bg_start_angle", - "start_angle1": "start_angle", - "end_angle": "bg_end_angle", - "end_angle1": "end_angle", - "radius": "style_radius", - "border_side": "style_border_side", - "bg_opa": "style_bg_opa", - "border_width": "style_border_width", - "line_width": nil, # depebds on class - "line_width1": nil, # depebds on class - "action": nil, # store the action in self._action - "hidden": nil, # apply to self - "enabled": nil, # apply to self - "click": nil, # synonym to enabled - "toggle": nil, - "bg_color": "style_bg_color", - "bg_grad_color": "style_bg_grad_color", - "type": nil, - # below automatically create a sub-label - "text": nil, # apply to self - "value_str": nil, # synonym to 'text' - "align": nil, - "text_font": nil, - "value_font": nil, # synonym to text_font - "text_color": nil, - "value_color": nil, # synonym to text_color - "value_ofs_x": nil, - "value_ofs_y": nil, - # - "min": nil, - "max": nil, - "val": "value", - "rotation": "rotation", - # img - "src": "src", - "image_recolor": "style_img_recolor", - "image_recolor_opa": "style_img_recolor_opa", - # spinner - "angle": nil, - "speed": nil, - # padding of knob - "pad_top2": nil, - "pad_bottom2": nil, - "pad_left2": nil, - "pad_right2": nil, - "pad_all2": nil, - "radius2": nil, - } - - var _lv_obj # native lvgl object - var _lv_label # sub-label if exists - var _action # action for OpenHASP - - # init - # - create the LVGL encapsulated object - # arg1: parent object - # arg2: json line object - def init(parent, jline) - var obj_class = self._lv_class # need to assign to a var to distinguish from method call - self._lv_obj = obj_class(parent) # instanciate LVGL object - self.post_init() - end - - # post-init, to be overriden - def post_init() - end - - # get LVGL encapsulated object - def get_obj() - return self._lv_obj - end - - def set_action(t) - self._action = str(t) - end - def get_action() - return self._action() - end - - def set_line_width(t) - self._lv_obj.set_style_line_width(int(t), lv.PART_MAIN | lv.STATE_DEFAULT) - end - def get_line_width() - return self._lv_obj.get_style_line_width(lv.PART_MAIN | lv.STATE_DEFAULT) - end - - #- ------------------------------------------------------------ - Mapping of synthetic attributes - - text - - hidden - - enabled - - ------------------------------------------------------------ -# - #- `hidden` attributes mapped to OBJ_FLAG_HIDDEN -# - def set_hidden(h) - if h - self._lv_obj.add_flag(lv.OBJ_FLAG_HIDDEN) - else - self._lv_obj.clear_flag(lv.OBJ_FLAG_HIDDEN) - end - end - - def get_hidden() - return self._lv_obj.has_flag(lv.OBJ_FLAG_HIDDEN) - end - - #- `enabled` attributes mapped to OBJ_FLAG_CLICKABLE -# - def set_enabled(h) - if h - self._lv_obj.add_flag(lv.OBJ_FLAG_CLICKABLE) - else - self._lv_obj.clear_flag(lv.OBJ_FLAG_CLICKABLE) - end - end - - def get_enabled() - return self._lv_obj.has_flag(lv.OBJ_FLAG_CLICKABLE) - end - # click is synonym to enabled - def set_click(t) self.set_enabled(t) end - def get_click() return self.get_enabled() end - - #- `toggle` attributes mapped to STATE_CHECKED -# - def set_toggle(t) - if t == "TRUE" t = true end - if t == "FALSE" t = false end - if t - self._lv_obj.add_state(lv.STATE_CHECKED) - else - self._lv_obj.clear_state(lv.STATE_CHECKED) - end - end - - def get_toggle() - return self._lv_obj.has_state(lv.STATE_CHECKED) - end - - def set_adjustable(t) - if t - self._lv_obj.add_flag(lv.OBJ_FLAG_CLICKABLE) - else - self._lv_obj.clear_flag(lv.OBJ_FLAG_CLICKABLE) - end - end - def get_adjustable() - return self._lv_obj.has_flag(lv.OBJ_FLAG_CLICKABLE) - end - - #- set_text: create a `lv_label` sub object to the current object -# - #- (default case, may be overriden by object that directly take text) -# - def check_label() - if self._lv_label == nil - self._lv_label = lv.label(self.get_obj()) - self._lv_label.set_align(lv.ALIGN_CENTER); - end - end - - def set_text(t) - self.check_label() - self._lv_label.set_text(str(t)) - end - def set_value_str(t) self.set_text(t) end - - def get_text() - if self._lv_label == nil return nil end - return self._lv_label.get_text() - end - def get_value_str() return self.get_text() end - - def set_align(t) - var align - self.check_label() - if t == 0 || t == "left" - align = lv.TEXT_ALIGN_LEFT - elif t == 1 || t == "center" - align = lv.TEXT_ALIGN_CENTER - elif t == 2 || t == "right" - align = lv.TEXT_ALIGN_RIGHT - end - self._lv_label.set_style_text_align(align, lv.PART_MAIN | lv.STATE_DEFAULT) - end - - def get_align() - if self._lv_label == nil return nil end - var align self._lv_label.get_style_text_align(lv.PART_MAIN | lv.STATE_DEFAULT) - if align == lv.TEXT_ALIGN_LEFT - return "left" - elif align == lv.TEXT_ALIGN_CENTER - return "center" - elif align == lv.TEXT_ALIGN_RIGHT - return "right" - else - return nil - end - end - - def set_text_font(t) - self.check_label() - var f = lv.font_robotocondensed_latin1(int(t)) - if f != nil - self._lv_label.set_style_text_font(f, lv.PART_MAIN | lv.STATE_DEFAULT) - else - print("HSP: Unsupported font size: robotocondensed-latin1", t) - end - end - def get_text_font() - end - def set_value_font(t) self.set_text_font(t) end - def get_value_font() return self.get_text_font() end - - def set_text_color(t) - self.check_label() - self._lv_label.set_style_text_color(parse_color(t), lv.PART_MAIN | lv.STATE_DEFAULT) - end - def get_text_color() - return self._text_color - end - def set_value_color(t) self.set_text_color(t) end - def get_value_color() return self.get_value_color() end - - def set_value_ofs_x(t) - self.check_label() - self._lv_label.set_x(int(t)) - end - def get_value_ofs_x() - return self._lv_label.get_x() - end - def set_value_ofs_y(t) - self.check_label() - self._lv_label.set_y(int(t)) - end - def get_value_ofs_y() - return self._lv_label.get_y() - end - - # secondary element - def set_pad_top2(t) - if self._lv_part2_selector != nil - self._lv_obj.set_style_pad_top(int(t), self._lv_part2_selector | lv.STATE_DEFAULT) - end - end - def set_pad_bottom2(t) - if self._lv_part2_selector != nil - self._lv_obj.set_style_pad_bottom(int(t), self._lv_part2_selector | lv.STATE_DEFAULT) - end - end - def set_pad_left2(t) - if self._lv_part2_selector != nil - self._lv_obj.set_style_pad_left(int(t), self._lv_part2_selector | lv.STATE_DEFAULT) - end - end - def set_pad_right2(t) - if self._lv_part2_selector != nil - self._lv_obj.set_style_pad_right(int(t), self._lv_part2_selector | lv.STATE_DEFAULT) - end - end - def set_pad_all2(t) - if self._lv_part2_selector != nil - self._lv_obj.set_style_pad_all(int(t), self._lv_part2_selector | lv.STATE_DEFAULT) - end - end - - def get_pad_top() - if self._lv_part2_selector != nil - return self._lv_obj.get_style_pad_top(self._lv_part2_selector | lv.STATE_DEFAULT) - end - end - def get_pad_bottomo() - if self._lv_part2_selector != nil - return self._lv_obj.get_style_pad_bottom(self._lv_part2_selector | lv.STATE_DEFAULT) - end - end - def get_pad_left() - if self._lv_part2_selector != nil - return self._lv_obj.get_style_pad_left(self._lv_part2_selector | lv.STATE_DEFAULT) - end - end - def get_pad_right() - if self._lv_part2_selector != nil - return self._lv_obj.get_style_pad_right(self._lv_part2_selector | lv.STATE_DEFAULT) - end - end - def get_pad_all() - end - - def set_radius2(t) - if self._lv_part2_selector != nil - self._lv_obj.set_style_radius(int(t), self._lv_part2_selector | lv.STATE_DEFAULT) - end - end - def get_radius2() - if self._lv_part2_selector != nil - return self._lv_obj.get_style_radius(self._lv_part2_selector | lv.STATE_DEFAULT) - end - end - - #- ------------------------------------------------------------ - Mapping of virtual attributes - - ------------------------------------------------------------ -# - def member(k) - # tostring is a special case, we shouldn't raise an exception for it - if k == 'tostring' return nil end - # - if self._attr_map.has(k) - import introspect - var kv = self._attr_map[k] - if kv - var f = introspect.get(self._lv_obj, "get_" + kv) - if type(f) == 'function' - return f(self._lv_obj) - end - else - # call self method - var f = introspect.get(self, "get_" + k) - if type(f) == 'function' - return f(self, k) - end - end - end - raise "value_error", "unknown attribute " + str(k) - end - - def setmember(k, v) - import string - # print(">> setmember", k, v) - # print(">>", classname(self), self._attr_map) - if self._attr_ignore.find(k) != nil - return - elif self._attr_map.has(k) - import introspect - var kv = self._attr_map[k] - if kv - var f = introspect.get(self._lv_obj, "set_" + kv) - # if the attribute contains 'color', convert to lv_color - if type(kv) == 'string' && is_color_attribute(kv) - v = parse_color(v) - end - # print("f=", f, v, kv, self._lv_obj, self) - if type(f) == 'function' - if string.find(kv, "style_") == 0 - # style function need a selector as second parameter - f(self._lv_obj, v, lv.PART_MAIN | lv.STATE_DEFAULT) - else - f(self._lv_obj, v) - end - return - else - print("HSP: Could not find function set_"+kv) - end - else - # call self method - var f = introspect.get(self, "set_" + k) - # print("f==",f) - if type(f) == 'function' - f(self, v) - return - end - end - - else - print("HSP: unknown attribute:", k) - end - # silently ignore if the attribute name is not supported - end -end - -#- ------------------------------------------------------------ - Other widgets -- ------------------------------------------------------------ -# - -#- ------------------------------------------------------------ - label -#- ------------------------------------------------------------# -class lvh_label : lvh_obj - static _lv_class = lv.label - # label do not need a sub-label - def post_init() - self._lv_label = self._lv_obj - end -end - -#- ------------------------------------------------------------ - arc -#- ------------------------------------------------------------# -class lvh_arc : lvh_obj - static _lv_class = lv.arc - static _lv_part2_selector = lv.PART_KNOB - - # line_width converts to arc_width - def set_line_width(t) - self._lv_obj.set_style_arc_width(int(t), lv.PART_MAIN | lv.STATE_DEFAULT) - end - def get_line_width() - return self._lv_obj.get_arc_line_width(lv.PART_MAIN | lv.STATE_DEFAULT) - end - def set_line_width1(t) - self._lv_obj.set_style_arc_width(int(t), lv.PART_INDICATOR | lv.STATE_DEFAULT) - end - def get_line_width1() - return self._lv_obj.get_arc_line_width(lv.PART_INDICATOR | lv.STATE_DEFAULT) - end - - def set_min(t) - self._lv_obj.set_range(int(t), self.get_max()) - end - def set_max(t) - self._lv_obj.set_range(self.get_min(), int(t)) - end - def get_min() - return self._lv_obj.get_min_value() - end - def get_max() - return self._lv_obj.get_max_value() - end - def set_type(t) - var mode - if t == 0 mode = lv.ARC_MODE_NORMAL - elif t == 1 mode = lv.ARC_MODE_REVERSE - elif t == 2 mode = lv.ARC_MODE_SYMMETRICAL - end - if mode != nil - self._lv_obj.set_mode(mode) - end - end - def get_type() - return self._lv_obj.get_mode() - end - # mode - def set_mode(t) - var mode - if mode == "expand" self._lv_obj.set_width(lv.SIZE_CONTENT) - elif mode == "break" mode = lv.LABEL_LONG_WRAP - elif mode == "dots" mode = lv.LABEL_LONG_DOT - elif mode == "scroll" mode = lv.LABEL_LONG_SCROLL - elif mode == "loop" mode = lv.LABEL_LONG_SCROLL_CIRCULAR - elif mode == "crop" mode = lv.LABEL_LONG_CLIP - end - if mode != nil - self._lv_obj.lv_label_set_long_mode(mode) - end - end - def get_mode() - end - -end - -#- ------------------------------------------------------------ - switch -#- ------------------------------------------------------------# -class lvh_switch : lvh_obj - static _lv_class = lv.switch - static _lv_part2_selector = lv.PART_KNOB -end - -#- ------------------------------------------------------------ - spinner -#- ------------------------------------------------------------# -class lvh_spinner : lvh_arc - static _lv_class = lv.spinner - - # init - # - create the LVGL encapsulated object - # arg1: parent object - # arg2: json line object - def init(parent, jline) - var angle = jline.find("angle", 60) - var speed = jline.find("speed", 1000) - self._lv_obj = lv.spinner(parent, speed, angle) - self.post_init() - end - - # ignore attributes, spinner can't be changed once created - def set_angle(t) end - def get_angle() end - def set_speed(t) end - def get_speed() end -end - -#- creat sub-classes of lvh_obj and map the LVGL class in static '_lv_class' attribute -# -class lvh_bar : lvh_obj static _lv_class = lv.bar end -class lvh_btn : lvh_obj static _lv_class = lv.btn end -class lvh_btnmatrix : lvh_obj static _lv_class = lv.btnmatrix end -class lvh_checkbox : lvh_obj static _lv_class = lv.checkbox end -class lvh_dropdown : lvh_obj static _lv_class = lv.dropdown end -class lvh_img : lvh_obj static _lv_class = lv.img end -class lvh_line : lvh_obj static _lv_class = lv.line end -class lvh_roller : lvh_obj static _lv_class = lv.roller end -class lvh_slider : lvh_obj static _lv_class = lv.slider end -class lvh_textarea : lvh_obj static _lv_class = lv.textarea end - -#- ---------------------------------------------------------------------------- - Class `lvh_page` encapsulating `lv_obj` as screen (created with lv.obj(0)) -- ----------------------------------------------------------------------------- -# -# ex of transition: lv.scr_load_anim(scr, lv.SCR_LOAD_ANIM_MOVE_RIGHT, 500, 0, false) -class lvh_page - var _obj_id # (map) of objects by id numbers - var _page_id # (int) id number of the page - var _lv_scr # (lv_obj) lvgl screen object - - #- init(page_number) -# - def init(page_number) - import global - - # if no parameter, default to page #1 - if page_number == nil page_number = 1 end - - self._page_id = page_number # remember our page_number - self._obj_id = {} # init list of objects - if page_number == 1 - self._lv_scr = lv.scr_act() # default screen - elif page_number == 0 - self._lv_scr = lv.layer_top() # top layer, visible over all screens - else - self._lv_scr = lv.obj(0) # allocate a new screen - # self._lv_scr.set_style_bg_color(lv.color(0x000000), lv.PART_MAIN | lv.STATE_DEFAULT) # set black background - self._lv_scr.set_style_bg_color(lv.color(0xFFFFFF), lv.PART_MAIN | lv.STATE_DEFAULT) # set white background - end - - # create a global for this page of form p, ex p1 - var glob_name = string.format("p%i", self._page_id) - global.(glob_name) = self - end - - #- retrieve lvgl screen object for this page -# - def get_scr() - return self._lv_scr - end - - #- add an object to this page -# - def set_obj(id, o) - self._obj_id[id] = o - end - def get_obj(id) - return self._obj_id.find(id) - end - - #- return id of this page -# - def id() - return self._page_id - end - - #- show this page, with animation -# - def show(anim, duration) - # ignore if there is no screen, like for id 0 - if self._lv_scr == nil return nil end - # ignore if the screen is already active - if self._lv_scr._p == lv.scr_act()._p return end # do nothing - - # default animation is lv.SCR_LOAD_ANIM_MOVE_RIGHT - if anim == nil anim = lv.SCR_LOAD_ANIM_MOVE_RIGHT end - # default duration of 500ms - if duration == nil duration = 500 end - - # load new screen with anumation, no delay, 500ms transition time, no auto-delete - lv.scr_load_anim(self._lv_scr, lv.SCR_LOAD_ANIM_MOVE_RIGHT, duration, 0, false) - end -end - -#- pages -# -var lvh_page_cur = lvh_page(1) -var lvh_pages = { 1: lvh_page_cur } # always create page #1 - -f = open("pages.jsonl","r") -var jsonl = string.split(f.read(), "\n") -f.close() - -#- ------------------------------------------------------------ - Parse page information - - Create a new page object if required - Change the active page -- ------------------------------------------------------------ -# -def parse_page(jline) - if jline.has("page") && type(jline["page"]) == 'int' - var page = int(jline["page"]) - # does the page already exist? - if lvh_pages.has(page) - # yes, just change the current page - lvh_page_cur = lvh_pages[page] - else - # no, create a new page - lvh_page_cur = lvh_page(page) - lvh_pages[page] = lvh_page_cur - end - end -end - -#- ------------------------------------------------------------ - Parse single object - -- ------------------------------------------------------------ -# -def parse_obj(jline, page) - import global - import introspect - - # line must contain 'obj' and 'id', otherwise it is ignored - if jline.has("obj") && jline.has("id") && type(jline["id"]) == 'int' - # 'obj_id' must be between 1 and 254 - var obj_id = int(jline["id"]) - if obj_id < 1 || obj_id > 254 - raise "value error", "invalid id " + str(obj_id) - end - - # extract openhasp class, prefix with `lvh_`. Ex: `btn` becomes `lvh_btn` - var obj_type = jline["obj"] - - # extract parent - var parent - var parent_id = int(jline.find("parentid")) - if parent_id != nil - var parent_obj = lvh_page_cur.get_obj(parent_id) - if parent_obj != nil - parent = parent_obj._lv_obj - end - end - if parent == nil - parent = page.get_scr() - end - - # check if a class with the requested name exists - var obj_class = introspect.get(global, "lvh_" + obj_type) - if obj_class == nil - raise "value error", "cannot find object of type " + str(obj_type) - end - - # instanciate the object, passing the lvgl screen as paren object - var obj = obj_class(parent, jline) - - # add object to page object - lvh_page_cur.set_obj(obj_id, obj) - # set attributes - # try every attribute, if not supported it is silently ignored - for k:jline.keys() - # introspect.set(obj, k, jline[k]) - obj.(k) = jline[k] - end - - # create a global variable for this object of form pb, ex p1b2 - var glob_name = string.format("p%ib%i", lvh_page_cur.id(), obj_id) - global.(glob_name) = obj - end -end - -# ex: -# {'page': 1, 'h': 50, 'obj': 'label', 'hidden': false, 'text': 'Hello', 'x': 5, 'id': 1, 'enabled': true, 'y': 5, 'w': 50} -# {"page":1,"id":2,"obj":"btn","x":5,"y":90,"h":90,"w":50,"text":"World","enabled":false,"hidden":false} - -#- ------------------------------------------------------------ - Parse jsonl file line by line - -- ------------------------------------------------------------ -# -tasmota.yield() -for j:jsonl - var jline = json.load(j) - - # parse page first - if type(jline) == 'instance' - parse_page(jline) - parse_obj(jline, lvh_page_cur) - end -end diff --git a/lib/libesp32/berry/default/embedded/openhasp/demo-all.jsonl b/lib/libesp32/berry/default/embedded/openhasp/demo-all.jsonl deleted file mode 100644 index 76d3ed810..000000000 --- a/lib/libesp32/berry/default/embedded/openhasp/demo-all.jsonl +++ /dev/null @@ -1,61 +0,0 @@ -{"page":1,"comment":"---------- Page 1 ----------"} -{"page":1,"id":0,"bg_color":"#FFFFFF","bg_grad_color":"#FFFFFF","text_color":"#000000","radius":0,"border_side":0} -{"page":1,"id":1,"obj":"btn","x":0,"y":0,"w":240,"h":30,"text":"LIVING ROOM","value_font":24,"bg_color":"#2C3E50","bg_grad_color":"#2C3E50","text_color":"#FFFFFF","radius":0,"border_side":0} - -{"page":1,"id":2,"obj":"arc","x":20,"y":65,"w":80,"h":100,"max":40,"border_side":0,"type":0,"rotation":0,"start_angle":180,"end_angle":0,"start_angle1":180,"value_font":12,"value_ofs_x":0,"value_ofs_y":-14,"bg_opa":0,"text":"21.2°C","min":-20,"max":50,"val":21} - -{"page":1,"id":3,"obj":"arc","x":140,"y":65,"w":80,"h":100,"max":100,"border_side":0,"type":0,"start_angle":180,"end_angle":0,"start_angle1":180,"value_font":12,"value_color":"#000000","value_ofs_x":0,"value_ofs_y":-14,"bg_opa":0,"text":"44%","val":44} - -{"page":1,"id":4,"obj":"label","x":0,"y":120,"w":240,"h":20,"text":"CO2 levels: 1483 ppm","radius":0,"border_side":0,"align":1} -{"page":1,"id":5,"obj":"label","x":2,"y":35,"w":140,"text":"Temperature","align":1} -{"page":1,"id":6,"obj":"label","x":140,"y":35,"w":95,"text":"Humidity","align":1} -{"page":1,"id":7,"obj":"btn","x":0,"y":160,"w":240,"h":20,"text":"LIGHTS","bg_color":"#F1C40F","text_color":"#FFFFFF","radius":0,"border_side":0} -{"page":1,"id":8,"obj":"label","x":20,"y":190,"w":140,"h":20,"text":"Ceiling Light"} -{"page":1,"id":9,"obj":"switch","x":160,"y":190,"w":40,"h":20,"toggle":"TRUE"} -{"page":1,"id":10,"obj":"label","x":20,"y":215,"w":140,"h":20,"text":"Wall Light"} -{"page":1,"id":11,"obj":"switch","x":160,"y":215,"w":40,"h":20,"toggle":"TRUE"} -{"page":1,"id":12,"obj":"label","x":20,"y":240,"w":200,"h":20,"text":"Ambient Light"} -{"page":1,"id":13,"obj":"slider","x":30,"y":265,"w":200,"h":10} - -{"page":2,"comment":"---------- Page 2 ----------"} -{"page":2,"id":1,"obj":"btn","x":0,"y":0,"w":240,"h":30,"text":"ENTITIES","value_font":24,"bg_color":"#2C3E50","text_color":"#FFFFFF","radius":0,"border_side":0,"click":0} -{"page":2,"id":2,"obj":"obj","x":5,"y":35,"w":230,"h":250,"click":0} - -{"page":2,"id":11,"obj":"label","x":8,"y":33,"w":35,"h":35,"text":"\uE004","align":1,"text_font":32,"text_color":"black"} -{"page":2,"id":12,"obj":"label","x":48,"y":43,"w":130,"h":30,"text":"Presence override","align":0,"text_font":16,"text_color":"black"} -{"page":2,"id":13,"obj":"switch","x":177,"y":40,"w":50,"h":25,"radius":25,"radius2":15} - -{"page":2,"id":21,"obj":"label","x":8,"y":69,"w":35,"h":35,"text":"\uF020","align":1,"text_font":32,"text_color":"black"} -{"page":2,"id":22,"obj":"label","x":48,"y":79,"w":130,"h":30,"text":"Front door light","align":0,"text_font":16,"text_color":"black"} -{"page":2,"id":23,"obj":"switch","x":177,"y":74,"w":50,"h":25,"radius":25,"radius2":15} - -{"page":2,"id":31,"obj":"label","x":8,"y":103,"w":35,"h":35,"text":"\uF054","align":1,"text_font":32,"text_color":"black"} -{"page":2,"id":32,"obj":"label","x":48,"y":113,"w":130,"h":30,"text":"Back yard lights","align":0,"text_font":16,"text_color":"black"} -{"page":2,"id":33,"obj":"switch","x":177,"y":110,"w":50,"h":25,"radius":25,"radius2":15} - -{"page":2,"id":41,"obj":"label","x":8,"y":138,"w":35,"h":35,"text":"\uEA7A","align":1,"text_font":32,"text_color":"black"} -{"page":2,"id":42,"obj":"label","x":48,"y":148,"w":130,"h":30,"text":"Trash service","align":0,"text_font":16,"text_color":"black"} -{"page":2,"id":43,"obj":"label","x":97,"y":148,"w":130,"h":30,"text":"in 6 days","align":2,"text_color":"black"} - -{"page":2,"id":51,"obj":"label","x":8,"y":173,"w":35,"h":35,"text":"\uF39D","align":1,"text_font":32,"text_color":"black"} -{"page":2,"id":52,"obj":"label","x":48,"y":183,"w":130,"h":30,"text":"Selective trash","align":0,"text_font":16,"text_color":"black"} -{"page":2,"id":53,"obj":"label","x":97,"y":183,"w":130,"h":30,"text":"in 10 days","align":2,"text_color":"black"} - -{"page":2,"id":61,"obj":"label","x":8,"y":208,"w":35,"h":35,"text":"\uE32A","align":1,"text_font":32,"text_color":"black"} -{"page":2,"id":62,"obj":"label","x":48,"y":218,"w":130,"h":30,"text":"Green energy active","align":0,"text_font":16,"text_color":"black"} -{"page":2,"id":63,"obj":"label","x":97,"y":218,"w":130,"h":30,"text":"Yes :)","align":2,"text_color":"black"} - -{"page":2,"id":71,"obj":"label","x":8,"y":243,"w":35,"h":35,"text":"\uE957","align":1,"text_font":32,"text_color":"black"} -{"page":2,"id":72,"obj":"label","x":48,"y":253,"w":130,"h":30,"text":"Air quality","align":0,"text_font":16,"text_color":"black"} -{"page":2,"id":73,"obj":"label","x":97,"y":253,"w":130,"h":30,"text":"OK (29.58 µg/m³)","align":2,"text_color":"black"} - -{"page":3,"comment":"---------- Page 3 ----------"} -{"page":3,"id":1,"obj":"btn","x":0,"y":0,"w":240,"h":30,"text":"FAN STATUS","text_font":16,"bg_color":"#2C3E50","text_color":"#FFFFFF","radius":0,"border_side":0,"click":0} - -{"page":3,"id":11,"obj":"img","src":"A:/noun_Fan_35097_140.png","auto_size":1,"w":140,"h":140,"x":50,"y":75,"image_recolor":"lime","image_recolor_opa":150} -{"page":3,"id":12,"obj":"spinner","parentid":11,"x":7,"y":6,"w":126,"h":126,"bg_opa":0,"border_width":0,"line_width":7,"line_width1":7,"type":2,"angle":120,"speed":1000,"value_str":3,"value_font":24} - -{"page":0,"comment":"---------- All pages ----------"} -{"page":0,"id":11,"obj":"btn","action":"prev","x":0,"y":290,"w":79,"h":32,"bg_color":"#34495E","text":"\uE141","text_color":"#CCCCCC","radius":0,"border_side":0,"text_font":32} -{"page":0,"id":12,"obj":"btn","action":"back","x":80,"y":290,"w":80,"h":32,"bg_color":"#34495E","text":"\uE2DC","text_color":"#CCCCCC","radius":0,"border_side":0,"text_font":24} -{"page":0,"id":13,"obj":"btn","action":"next","x":161,"y":290,"w":79,"h":32,"bg_color":"#34495E","text":"\uE142","text_color":"#CCCCCC","radius":0,"border_side":0,"text_font":32} diff --git a/lib/libesp32/berry/default/embedded/openhasp/demo1.jsonl b/lib/libesp32/berry/default/embedded/openhasp/demo1.jsonl deleted file mode 100644 index 684e0d324..000000000 --- a/lib/libesp32/berry/default/embedded/openhasp/demo1.jsonl +++ /dev/null @@ -1,23 +0,0 @@ -{"page":1,"comment":"---------- Page 1 ----------"} -{"page":1,"id":0,"bg_color":"#FFFFFF","bg_grad_color":"#FFFFFF","text_color":"#000000","radius":0,"border_side":0} -{"page":1,"id":1,"obj":"btn","x":0,"y":0,"w":240,"h":30,"text":"LIVING ROOM","value_font":22,"bg_color":"#2C3E50","bg_grad_color":"#2C3E50","text_color":"#FFFFFF","radius":0,"border_side":0} - -{"page":1,"id":2,"obj":"arc","x":20,"y":65,"w":80,"h":100,"max":40,"border_side":0,"type":0,"rotation":0,"start_angle":180,"end_angle":0,"start_angle1":180,"value_font":12,"value_ofs_x":0,"value_ofs_y":-14,"bg_opa":0,"text":"21.2°C","min":-20,"max":50,"val":21} - -{"page":1,"id":3,"obj":"arc","x":140,"y":65,"w":80,"h":100,"max":100,"border_side":0,"type":0,"start_angle":180,"end_angle":0,"start_angle1":180,"value_font":12,"value_color":"#000000","value_ofs_x":0,"value_ofs_y":-14,"bg_opa":0,"text":"44%","val":44} - -{"page":1,"id":4,"obj":"label","x":0,"y":120,"w":240,"h":20,"text":"CO2 levels: 1483 ppm","radius":0,"border_side":0,"align":1} -{"page":1,"id":5,"obj":"label","x":2,"y":35,"w":140,"text":"Temperature","align":1} -{"page":1,"id":6,"obj":"label","x":140,"y":35,"w":95,"text":"Humidity","align":1} -{"page":1,"id":7,"obj":"btn","x":0,"y":160,"w":240,"h":20,"text":"LIGHTS","bg_color":"#F1C40F","text_color":"#FFFFFF","radius":0,"border_side":0} -{"page":1,"id":8,"obj":"label","x":20,"y":190,"w":140,"h":20,"text":"Ceiling Light"} -{"page":1,"id":9,"obj":"switch","x":160,"y":190,"w":40,"h":20,"toggle":"TRUE"} -{"page":1,"id":10,"obj":"label","x":20,"y":215,"w":140,"h":20,"text":"Wall Light"} -{"page":1,"id":11,"obj":"switch","x":160,"y":215,"w":40,"h":20,"toggle":"TRUE"} -{"page":1,"id":12,"obj":"label","x":20,"y":240,"w":200,"h":20,"text":"Ambient Light"} -{"page":1,"id":13,"obj":"slider","x":30,"y":265,"w":200,"h":10} - -{"page":0,"comment":"---------- All pages ----------"} -{"page":0,"id":11,"obj":"btn","action":"prev","x":0,"y":290,"w":79,"h":32,"bg_color":"#34495E","text":"\uE141","text_color":"#CCCCCC","radius":0,"border_side":0,"text_font":32} -{"page":0,"id":12,"obj":"btn","action":"back","x":80,"y":290,"w":80,"h":32,"bg_color":"#34495E","text":"\uE2DC","text_color":"#CCCCCC","radius":0,"border_side":0,"text_font":24} -{"page":0,"id":13,"obj":"btn","action":"next","x":161,"y":290,"w":79,"h":32,"bg_color":"#34495E","text":"\uE142","text_color":"#CCCCCC","radius":0,"border_side":0,"text_font":32} diff --git a/lib/libesp32/berry/default/embedded/openhasp/demo2.jsonl b/lib/libesp32/berry/default/embedded/openhasp/demo2.jsonl deleted file mode 100644 index b1d6efc34..000000000 --- a/lib/libesp32/berry/default/embedded/openhasp/demo2.jsonl +++ /dev/null @@ -1,35 +0,0 @@ -{"page":1,"id":1,"obj":"btn","x":0,"y":0,"w":240,"h":30,"text":"ENTITIES","value_font":22,"bg_color":"#2C3E50","text_color":"#FFFFFF","radius":0,"border_side":0,"click":0} -{"page":1,"id":2,"obj":"obj","x":5,"y":35,"w":230,"h":250,"click":0} - -{"page":1,"id":11,"obj":"label","x":8,"y":33,"w":35,"h":35,"text":"\uE004","align":1,"text_font":32,"text_color":"black"} -{"page":1,"id":12,"obj":"label","x":48,"y":43,"w":130,"h":30,"text":"Presence override","align":0,"text_font":16,"text_color":"black"} -{"page":1,"id":13,"obj":"switch","x":177,"y":40,"w":50,"h":25,"radius":25,"radius2":15} - -{"page":1,"id":21,"obj":"label","x":8,"y":69,"w":35,"h":35,"text":"\uF020","align":1,"text_font":32,"text_color":"black"} -{"page":1,"id":22,"obj":"label","x":48,"y":79,"w":130,"h":30,"text":"Front door light","align":0,"text_font":16,"text_color":"black"} -{"page":1,"id":23,"obj":"switch","x":177,"y":74,"w":50,"h":25,"radius":25,"radius2":15} - -{"page":1,"id":31,"obj":"label","x":8,"y":103,"w":35,"h":35,"text":"\uF054","align":1,"text_font":32,"text_color":"black"} -{"page":1,"id":32,"obj":"label","x":48,"y":113,"w":130,"h":30,"text":"Back yard lights","align":0,"text_font":16,"text_color":"black"} -{"page":1,"id":33,"obj":"switch","x":177,"y":110,"w":50,"h":25,"radius":25,"radius2":15} - -{"page":1,"id":41,"obj":"label","x":8,"y":138,"w":35,"h":35,"text":"\uEA7A","align":1,"text_font":32,"text_color":"black"} -{"page":1,"id":42,"obj":"label","x":48,"y":148,"w":130,"h":30,"text":"Trash service","align":0,"text_font":16,"text_color":"black"} -{"page":1,"id":43,"obj":"label","x":97,"y":148,"w":130,"h":30,"text":"in 6 days","align":2,"text_color":"black"} - -{"page":1,"id":51,"obj":"label","x":8,"y":173,"w":35,"h":35,"text":"\uF39D","align":1,"text_font":32,"text_color":"black"} -{"page":1,"id":52,"obj":"label","x":48,"y":183,"w":130,"h":30,"text":"Selective trash","align":0,"text_font":16,"text_color":"black"} -{"page":1,"id":53,"obj":"label","x":97,"y":183,"w":130,"h":30,"text":"in 10 days","align":2,"text_color":"black"} - -{"page":1,"id":61,"obj":"label","x":8,"y":208,"w":35,"h":35,"text":"\uE32A","align":1,"text_font":32,"text_color":"black"} -{"page":1,"id":62,"obj":"label","x":48,"y":218,"w":130,"h":30,"text":"Green energy active","align":0,"text_font":16,"text_color":"black"} -{"page":1,"id":63,"obj":"label","x":97,"y":218,"w":130,"h":30,"text":"Yes :)","align":2,"text_color":"black"} - -{"page":1,"id":71,"obj":"label","x":8,"y":243,"w":35,"h":35,"text":"\uE957","align":1,"text_font":32,"text_color":"black"} -{"page":1,"id":72,"obj":"label","x":48,"y":253,"w":130,"h":30,"text":"Air quality","align":0,"text_font":16,"text_color":"black"} -{"page":1,"id":73,"obj":"label","x":97,"y":253,"w":130,"h":30,"text":"OK (29.58 µg/m³)","align":2,"text_color":"black"} - -{"page":0,"comment":"---------- All pages ----------"} -{"page":0,"id":11,"obj":"btn","action":"prev","x":0,"y":290,"w":79,"h":32,"bg_color":"#34495E","text":"\uE141","text_color":"#CCCCCC","radius":0,"border_side":0,"text_font":32} -{"page":0,"id":12,"obj":"btn","action":"back","x":80,"y":290,"w":80,"h":32,"bg_color":"#34495E","text":"\uE2DC","text_color":"#CCCCCC","radius":0,"border_side":0,"text_font":24} -{"page":0,"id":13,"obj":"btn","action":"next","x":161,"y":290,"w":79,"h":32,"bg_color":"#34495E","text":"\uE142","text_color":"#CCCCCC","radius":0,"border_side":0,"text_font":32} diff --git a/lib/libesp32/berry/default/embedded/openhasp/demo3.jsonl b/lib/libesp32/berry/default/embedded/openhasp/demo3.jsonl deleted file mode 100644 index f8b952f81..000000000 --- a/lib/libesp32/berry/default/embedded/openhasp/demo3.jsonl +++ /dev/null @@ -1,4 +0,0 @@ -{"page":1,"id":1,"obj":"btn","x":0,"y":0,"w":240,"h":30,"text":"FAN STATUS","text_font":16,"bg_color":"#2C3E50","text_color":"#FFFFFF","radius":0,"border_side":0,"click":0} - -{"page":1,"id":11,"obj":"img","src":"A:/noun_Fan_35097_140.png","auto_size":1,"w":140,"h":140,"x":50,"y":75,"image_recolor":"lime","image_recolor_opa":150} -{"page":1,"id":12,"obj":"spinner","parentid":11,"x":7,"y":6,"w":126,"h":126,"bg_opa":0,"border_width":0,"line_width":7,"line_width1":7,"type":2,"angle":120,"speed":1000,"value_str":3,"value_font":24} \ No newline at end of file diff --git a/lib/libesp32/berry/default/embedded/persist.be b/lib/libesp32/berry/default/embedded/persist.be deleted file mode 100644 index 164a1dd7b..000000000 --- a/lib/libesp32/berry/default/embedded/persist.be +++ /dev/null @@ -1,161 +0,0 @@ -#- persistance module for Berry -# -#- -# -#- To solidify: -# -#- - # load only persis_module and persist_module.init - import solidify - solidify.dump(persist_module.init) - # copy and paste into `be_persist_lib.c` --# -var persist_module = module("persist") - -persist_module.init = def (m) - - class Persist - var _filename - var _p - var _dirty - - #- persist can be initialized with pre-existing values. The map is not copied so any change will be reflected -# - def init(m) - # print("Persist init") - self._filename = '_persist.json' - if isinstance(m,map) - self._p = m.copy() # need to copy instead? - else - self._p = {} - end - self.load(self._p, self._filename) - self._dirty = false - # print("Persist init") - end - - #- virtual member getter, if a key does not exists return `nil`-# - def member(key) - return self._p.find(key) - end - - #- virtual member setter -# - def setmember(key, value) - self._p[key] = value - self._dirty = true - end - - #- clear all entries -# - def zero() - self._p = {} - self._dirty = true - end - - def remove(k) - self._p.remove(k) - self._dirty = true - end - - def has(k) - return self._p.has(k) - end - - def find(k, d) - return self._p.find(k, d) - end - - def load() - import json - import path - var f # file object - var val # values loaded from json - - if path.exists(self._filename) - try - f = open(self._filename, "r") - val = json.load(f.read()) - f.close() - except .. as e, m - if f != nil f.close() end - raise e, m - end - if isinstance(val, map) - self._p = val # sucess - else - print("BRY: failed to load _persist.json") - end - self._dirty = false - else - self.save() - end - - # print("Loading") - end - - def save() - var f # file object - try - f = open(self._filename, "w") - self.json_fdump(f) - f.close() - except .. as e, m - if f != nil f.close() end - f = open(self._filename, "w") - f.write('{}') # fallback write empty map - f.close() - raise e, m - end - self._dirty = false - # print("Saving") - end - - def json_fdump_any(f, v) - import json - if isinstance(v, map) - self.json_fdump_map(f, v) - elif isinstance(v, list)v - self.json_fdump_list(f, v) - else - f.write(json.dump(v)) - end - end - - def json_fdump_map(f, v) - import json - f.write('{') - var sep = nil - for k:v.keys() - if sep != nil f.write(sep) end - - f.write(json.dump(str(k))) - f.write(':') - self.json_fdump_any(f, v[k]) - - sep = "," - end - f.write('}') - end - - def json_fdump_list(f, v) - import json - f.write('[') - var i = 0 - while i < size(v) - if i > 0 f.write(',') end - self.json_fdump_any(f, v[i]) - i += 1 - end - f.write(']') - end - - def json_fdump(f) - import json - if isinstance(self._p, map) - self.json_fdump_map(f, self._p) - else - raise "internal_error", "persist._p is not a map" - end - end - end - - - return Persist() # return an instance of this class -end - -return persist_module diff --git a/lib/libesp32/berry/default/embedded/tapp.be b/lib/libesp32/berry/default/embedded/tapp.be deleted file mode 100644 index 30aa1f740..000000000 --- a/lib/libesp32/berry/default/embedded/tapp.be +++ /dev/null @@ -1,35 +0,0 @@ -#- Tasmota apps module for Berry -# -#- -# - -var tapp_module = module("tapp") - -tapp_module.init = def (m) - - class Tapp - - def init() - tasmota.add_driver(self) - end - - def autoexec() - import path - import string - - var dir = path.listdir("/") - - for d: dir - if string.find(d, ".tapp") > 0 - tasmota.log(string.format("TAP: found Tasmota App '%s'", d), 2) - tasmota.load(d + "#autoexec.be") - end - end - end - end - - return Tapp() # return an instance of this class -end - -# aa = autoconf_module.init(autoconf_module) -# import webserver -# webserver.on('/ac2', / -> aa.page_autoconf_mgr(), webserver.HTTP_GET) -return tapp_module diff --git a/lib/libesp32/berry/default/embedded/test_crypto.be b/lib/libesp32/berry/default/embedded/test_crypto.be deleted file mode 100644 index f2edbfee5..000000000 --- a/lib/libesp32/berry/default/embedded/test_crypto.be +++ /dev/null @@ -1,30 +0,0 @@ -ec = crypto.EC_C25519() - -# Alice -sk_A = bytes('77076d0a7318a57d3c16c17251b26645df4c2f87ebc0992ab177fba51db92c2a') -pk_A = ec.public_key(sk_A) -assert(pk_A == bytes('8520f0098930a754748b7ddcb43ef75a0dbf3a0d26381af4eba4a98eaa9b4e6a')) - -# Bob -sk_B = bytes('5dab087e624a8a4b79e17f8b83800ee66f3bb1292618b6fd1c2f8b27ff88e0eb') -pk_B = ec.public_key(sk_B) -assert(pk_B == bytes('de9edb7d7b7dc1b4d35b61c2ece435373f8343c85b78674dadfc7e146f882b4f')) - -psk = ec.shared_key(sk_A, pk_B) -assert(psk == bytes('4a5d9d5ba4ce2de1728e3bf480350f25e07e21c947d19e3376f09b3c1e161742')) -psk2 = ec.shared_key(sk_B, pk_A) -assert(psk2 == bytes('4a5d9d5ba4ce2de1728e3bf480350f25e07e21c947d19e3376f09b3c1e161742')) - -#- test vectors from RFC77748 - - Alice's private key, a: - 77076d0a7318a57d3c16c17251b26645df4c2f87ebc0992ab177fba51db92c2a - Alice's public key, X25519(a, 9): - 8520f0098930a754748b7ddcb43ef75a0dbf3a0d26381af4eba4a98eaa9b4e6a - Bob's private key, b: - 5dab087e624a8a4b79e17f8b83800ee66f3bb1292618b6fd1c2f8b27ff88e0eb - Bob's public key, X25519(b, 9): - de9edb7d7b7dc1b4d35b61c2ece435373f8343c85b78674dadfc7e146f882b4f - Their shared secret, K: - 4a5d9d5ba4ce2de1728e3bf480350f25e07e21c947d19e3376f09b3c1e161742 --# diff --git a/lib/libesp32/berry/default/static_block.hpp b/lib/libesp32/berry/default/static_block.hpp deleted file mode 100644 index 152dda130..000000000 --- a/lib/libesp32/berry/default/static_block.hpp +++ /dev/null @@ -1,80 +0,0 @@ -/** - * static_block.hpp - * - * An implementation of a Java-style static block, in C++ (and potentially a - * GCC/clang extension to avoid warnings). Almost, but not quite, valid C. - * Partially inspired by Andrei Alexandrescu's Scope Guard and - * discussions on stackoverflow.com - * - * By Eyal Rozenberg - * - * Licensed under the Apache License v2.0: - * http://www.apache.org/licenses/LICENSE-2.0 - * - */ -#pragma once -#ifndef STATIC_BLOCK_HPP_ -#define STATIC_BLOCK_HPP_ - -#ifndef CONCATENATE -#define CONCATENATE(s1, s2) s1##s2 -#define EXPAND_THEN_CONCATENATE(s1, s2) CONCATENATE(s1, s2) -#endif /* CONCATENATE */ - -#ifndef UNIQUE_IDENTIFIER -/** - * This macro expands into a different identifier in every expansion. - * Note that you _can_ clash with an invocation of UNIQUE_IDENTIFIER - * by manually using the same identifier elsewhere; or by carefully - * choosing another prefix etc. - */ -#ifdef __COUNTER__ -#define UNIQUE_IDENTIFIER(prefix) EXPAND_THEN_CONCATENATE(prefix, __COUNTER__) -#else -#define UNIQUE_IDENTIFIER(prefix) EXPAND_THEN_CONCATENATE(prefix, __LINE__) -#endif /* COUNTER */ -#else -#endif /* UNIQUE_IDENTIFIER */ - -/** - * Following is a mechanism for executing code statically. - * - * @note Caveats: - * - Your static block must be surround by curly braces. - * - No need for a semicolon after the block (but it won't hurt). - * - Do not put static blocks in files, as it might get compiled multiple - * times ane execute multiple times. - * - A static_block can only be used in file scope - not within any other block etc. - * - Templated static blocks will probably not work. Avoid them. - * - No other funny business, this is fragile. - * - This does not having any threading issues (AFAICT) - as it has no static - * initialization order issue. Of course, you have to _keep_ it safe with - * your static code. - * - Execution of the code is guaranteed to occur before main() executes, - * but the relative order of statics being initialized is unknown/unclear. So, - * do not call any method of an instance of a class which you expect to have been - * constructed; it may not have been. Instead, you can use a static getInstance() method - * (look this idiom up on the web, it's safe). - * - Variables defined within the static block are not global; they will - * go out of scope as soon as its execution concludes. - * - * Usage example: - * - * static_block { - * do_stuff(); - * std::cout << "in the static block!\n"; - * } - * - */ -#define static_block STATIC_BLOCK_IMPL1(UNIQUE_IDENTIFIER(_static_block_)) - -#define STATIC_BLOCK_IMPL1(prefix) \ - STATIC_BLOCK_IMPL2(CONCATENATE(prefix,_fn),CONCATENATE(prefix,_var)) - -#define STATIC_BLOCK_IMPL2(function_name,var_name) \ -static void function_name(); \ -static int var_name __attribute((unused)) = (function_name(), 0) ; \ -static void function_name() - - -#endif // STATIC_BLOCK_HPP_ diff --git a/lib/libesp32/berry/examples/anon_func.be b/lib/libesp32/berry/examples/anon_func.be deleted file mode 100644 index 78854ce64..000000000 --- a/lib/libesp32/berry/examples/anon_func.be +++ /dev/null @@ -1,20 +0,0 @@ -# anonymous function and closure -def count(x) - var arr = [] - for i : 0 .. x - arr.push( - def (n) # loop variable cannot be used directly as free variable - return def () - return n * n - end - end (i) # define and call anonymous function - ) - end - return arr -end - -for xx : count(6) - print(xx()) # 0, 1, 4 ... n * n -end - -return count diff --git a/lib/libesp32/berry/examples/bigloop.be b/lib/libesp32/berry/examples/bigloop.be deleted file mode 100644 index a3a77768b..000000000 --- a/lib/libesp32/berry/examples/bigloop.be +++ /dev/null @@ -1,15 +0,0 @@ -import time - -c = time.clock() -do - i = 0 - while i < 100000000 - i += 1 - end -end -print('while iteration 100000000 times', time.clock() - c, 's') - -c = time.clock() -for i : 1 .. 100000000 -end -print('for iteration 100000000 times', time.clock() - c, 's') diff --git a/lib/libesp32/berry/examples/bintree.be b/lib/libesp32/berry/examples/bintree.be deleted file mode 100644 index 81936f8a0..000000000 --- a/lib/libesp32/berry/examples/bintree.be +++ /dev/null @@ -1,60 +0,0 @@ -# Reference from https://github.com/BerryMathDevelopmentTeam/BerryMath/blob/master/testscript/BinaryTree.bm - -class node - var v, l, r - def init(v, l, r) - self.v = v - self.l = l - self.r = r - end - def insert(v) - if v < self.v - if self.l - self.l.insert(v) - else - self.l = node(v) - end - else - if self.r - self.r.insert(v) - else - self.r = node (v) - end - end - end - def sort(l) - if (self.l) self.l.sort(l) end - l.push(self.v) - if (self.r) self.r.sort(l) end - end -end - -class btree - var root - def insert(v) - if self.root - self.root.insert(v) - else - self.root = node(v) - end - end - def sort() - var l = [] - if self.root - self.root.sort(l) - end - return l - end -end - -var tree = btree() -tree.insert(-100) -tree.insert(5); -tree.insert(3); -tree.insert(9); -tree.insert(10); -tree.insert(10000000); -tree.insert(1); -tree.insert(-1); -tree.insert(-10); -print(tree.sort()); diff --git a/lib/libesp32/berry/examples/calcpi.be b/lib/libesp32/berry/examples/calcpi.be deleted file mode 100644 index 053f87875..000000000 --- a/lib/libesp32/berry/examples/calcpi.be +++ /dev/null @@ -1,16 +0,0 @@ -def cpi(n) - i = 2 - pi = 3 - while i <= n - term = 4.0 / (i * (i + 1) * (i + 2)) - if i % 4 - pi = pi + term - else - pi = pi - term - end - i = i + 2 - end - return pi -end - -print("pi =", cpi(100)) diff --git a/lib/libesp32/berry/examples/exception.be b/lib/libesp32/berry/examples/exception.be deleted file mode 100644 index 3a3098dce..000000000 --- a/lib/libesp32/berry/examples/exception.be +++ /dev/null @@ -1,12 +0,0 @@ -import debug - -def test_func() - try - compile('def +() end')() - except .. as e, v - print('catch execption:', str(e) + ' >>>\n ' + str(v)) - debug.traceback() - end -end - -test_func() diff --git a/lib/libesp32/berry/examples/fib_rec.be b/lib/libesp32/berry/examples/fib_rec.be deleted file mode 100644 index 31ed3817b..000000000 --- a/lib/libesp32/berry/examples/fib_rec.be +++ /dev/null @@ -1,12 +0,0 @@ -import time - -def fib(x) - if x <= 2 - return 1 - end - return fib(x - 1) + fib(x - 2) -end - -c = time.clock() -print("fib:", fib(38)) # minimum stack size: 78!! -print("time:", time.clock() - c, 's') diff --git a/lib/libesp32/berry/examples/guess_number.be b/lib/libesp32/berry/examples/guess_number.be deleted file mode 100644 index 6cbd07e7c..000000000 --- a/lib/libesp32/berry/examples/guess_number.be +++ /dev/null @@ -1,26 +0,0 @@ -import time -import math - -math.srand(time.time()) -res = math.rand() % 100 -max_test = 7 -test = -1 -idx = 1 -print('Guess a number between 0 and 99. You have', max_test, 'chances.') -while test != res && idx <= max_test - test = number(input(str(idx) + ': enter the number you guessed: ')) - if type(test) != 'int' - print('This is not an integer. Continue!') - continue - elif test > res - print('This number is too large.') - elif test < res - print('This number is too small.') - end - idx = idx + 1 -end -if test == res - print('You win!') -else - print('You failed, the correct answer is', res) -end diff --git a/lib/libesp32/berry/examples/json.be b/lib/libesp32/berry/examples/json.be deleted file mode 100644 index d98dff8bb..000000000 --- a/lib/libesp32/berry/examples/json.be +++ /dev/null @@ -1,4 +0,0 @@ -import json -print(json.load('{"key": "value"}')) -print(json.dump({'test key': nil})) -print(json.dump({'key1': nil, 45: true}, 'format')) diff --git a/lib/libesp32/berry/examples/lambda.be b/lib/libesp32/berry/examples/lambda.be deleted file mode 100644 index 1d0b709bb..000000000 --- a/lib/libesp32/berry/examples/lambda.be +++ /dev/null @@ -1,8 +0,0 @@ -# simple lambda example -print((/a b c-> a * b + c)(2, 3, 4)) - -# Y-Combinator and factorial functions -Y = /f-> (/x-> f(/n-> x(x)(n)))(/x-> f(/n-> x(x)(n))) -F = /f-> /x-> x ? f(x - 1) * x : 1 -fact = Y(F) -print('fact(10) == ' .. fact(10)) diff --git a/lib/libesp32/berry/examples/listdir.be b/lib/libesp32/berry/examples/listdir.be deleted file mode 100644 index 2dd880118..000000000 --- a/lib/libesp32/berry/examples/listdir.be +++ /dev/null @@ -1,16 +0,0 @@ -import os - -def scandir(path) - print('path: ' + path) - for name : os.listdir(path) - var fullname = os.path.join(path, name) - if os.path.isfile(fullname) - print('file: ' + fullname) - else - print('path: ' + fullname) - scandir(fullname) - end - end -end - -scandir('.') diff --git a/lib/libesp32/berry/examples/qsort.be b/lib/libesp32/berry/examples/qsort.be deleted file mode 100644 index b09b65672..000000000 --- a/lib/libesp32/berry/examples/qsort.be +++ /dev/null @@ -1,42 +0,0 @@ -def qsort(data) - # do once sort - def once(left, right) - var pivot = data[left] # use the 0th value as the pivot - while left < right # check if sort is complete - # put the value less than the pivot to the left - while left < right && data[right] >= pivot - right -= 1 # skip values greater than pivot - end - data[left] = data[right] - # put the value greater than the pivot on the right - while left < right && data[left] <= pivot - left += 1 # skip values less than pivot - end - data[right] = data[left] - end - # now we have the index of the pivot, store it - data[left] = pivot - return left # return the index of the pivot - end - # recursive quick sort algorithm - def _sort(left, right) - if left < right # executed when the array is not empty - var index = once(left, right) # get index of pivot for divide and conquer - _sort(left, index - 1) # sort the data on the left - _sort(index + 1, right) # sort the data on the right - end - end - # start quick sort - _sort(0, data.size() - 1) - return data -end - -import time, math -math.srand(time.time()) # sse system time as a random seed -data = [] -# put 20 random numbers into the array -for i : 1 .. 20 - data.push(math.rand() % 100) -end -# sort and print -print(qsort(data)) diff --git a/lib/libesp32/berry/examples/repl.be b/lib/libesp32/berry/examples/repl.be deleted file mode 100644 index aac26b0a1..000000000 --- a/lib/libesp32/berry/examples/repl.be +++ /dev/null @@ -1,61 +0,0 @@ -do - def ismult(msg) - import string - return string.split(msg, -5)[1] == '\'EOS\'' - end - - def multline(src, msg) - if !ismult(msg) - print('syntax_error: ' + msg) - return - end - while true - try - src += '\n' + input('>> ') - return compile(src) - except 'syntax_error' as e, m - if !ismult(m) - print('syntax_error: ' + m) - return - end - end - end - end - - def parse() - var fun, src = input('> ') - try - fun = compile('return (' + src + ')') - except 'syntax_error' as e, m - try - fun = compile(src) - except 'syntax_error' as e, m - fun = multline(src, m) - end - end - return fun - end - - def run(fun) - try - var res = fun() - if res print(res) end - except .. as e, m - import debug - print(e .. ': ' .. m) - debug.traceback() - end - end - - def repl() - while true - var fun = parse() - if fun != nil - run(fun) - end - end - end - - print("Berry Berry REPL!") - repl() -end diff --git a/lib/libesp32/berry/examples/string.be b/lib/libesp32/berry/examples/string.be deleted file mode 100644 index 299834e21..000000000 --- a/lib/libesp32/berry/examples/string.be +++ /dev/null @@ -1,32 +0,0 @@ -s = "This is a long string test. 0123456789 abcdefg ABCDEFG" -print(s) - -a = .5 -print(a) - -import string as s - -print(s.hex(0x45678ABCD, 16)) - -def bin(x, num) - assert(type(x) == 'int', 'the type of \'x\' must be integer') - # test the 'x' bits - var bits = 1 - for i : 0 .. 62 - if x & (1 << 63 - i) - bits = 64 - i - break - end - end - if type(num) == 'int' && num > 0 && num <= 64 - bits = bits < num ? num : bits - end - var result = '' - bits -= 1 - for i : 0 .. bits - result += x & (1 << (bits - i)) ? '1' : '0' - end - return result -end - -print(bin(33)) diff --git a/lib/libesp32/berry/examples/strmod.be b/lib/libesp32/berry/examples/strmod.be deleted file mode 100644 index 8660f5b4e..000000000 --- a/lib/libesp32/berry/examples/strmod.be +++ /dev/null @@ -1,7 +0,0 @@ -import string - -print(string.format('%.3d', 12)) -print(string.format('%.3f', 12)) -print(string.format('%20.7f', 14.5)) -print(string.format('-- %-40s ---', 'this is a string format test')) -print(string.format('-- %40s ---', 'this is a string format test')) diff --git a/lib/libesp32/berry/gen.sh b/lib/libesp32/berry/gen.sh deleted file mode 100755 index 303a62c95..000000000 --- a/lib/libesp32/berry/gen.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -python3 tools/pycoc/main.py -o generate src default ../berry_mapping/src -c default/berry_conf.h diff --git a/lib/libesp32/berry/generate/be_const_strtab.h b/lib/libesp32/berry/generate/be_const_strtab.h deleted file mode 100644 index 50198eb8f..000000000 --- a/lib/libesp32/berry/generate/be_const_strtab.h +++ /dev/null @@ -1,741 +0,0 @@ -extern const bcstring be_const_str_; -extern const bcstring be_const_str_AES_GCM; -extern const bcstring be_const_str_AXP192; -extern const bcstring be_const_str_Animate_X20pc_X20is_X20out_X20of_X20range; -extern const bcstring be_const_str_AudioFileSource; -extern const bcstring be_const_str_AudioFileSourceFS; -extern const bcstring be_const_str_AudioGenerator; -extern const bcstring be_const_str_AudioGeneratorMP3; -extern const bcstring be_const_str_AudioGeneratorWAV; -extern const bcstring be_const_str_AudioOutput; -extern const bcstring be_const_str_AudioOutputI2S; -extern const bcstring be_const_str_Auto_X2Dconfiguration; -extern const bcstring be_const_str_BRY_X3A_X20ERROR_X2C_X20bad_X20json_X3A_X20; -extern const bcstring be_const_str_BRY_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s; -extern const bcstring be_const_str_BRY_X3A_X20could_X20not_X20save_X20compiled_X20file_X20_X25s_X20_X28_X25s_X29; -extern const bcstring be_const_str_BRY_X3A_X20failed_X20to_X20load_X20_persist_X2Ejson; -extern const bcstring be_const_str_BUTTON_CONFIGURATION; -extern const bcstring be_const_str_CFG_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s; -extern const bcstring be_const_str_CFG_X3A_X20_X27init_X2Ebat_X27_X20done_X2C_X20restarting; -extern const bcstring be_const_str_CFG_X3A_X20could_X20not_X20run_X20_X25s_X20_X28_X25s_X20_X2D_X20_X25s_X29; -extern const bcstring be_const_str_CFG_X3A_X20downloading_X20_X27_X25s_X27; -extern const bcstring be_const_str_CFG_X3A_X20exception_X20_X27_X25s_X27_X20_X2D_X20_X27_X25s_X27; -extern const bcstring be_const_str_CFG_X3A_X20loaded_X20_X20; -extern const bcstring be_const_str_CFG_X3A_X20loaded_X20_X27_X25s_X27; -extern const bcstring be_const_str_CFG_X3A_X20loading_X20; -extern const bcstring be_const_str_CFG_X3A_X20loading_X20_X27_X25s_X27; -extern const bcstring be_const_str_CFG_X3A_X20multiple_X20autoconf_X20files_X20found_X2C_X20aborting_X20_X28_X27_X25s_X27_X20_X2B_X20_X27_X25s_X27_X29; -extern const bcstring be_const_str_CFG_X3A_X20no_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found; -extern const bcstring be_const_str_CFG_X3A_X20ran_X20_X20; -extern const bcstring be_const_str_CFG_X3A_X20removed_X20file_X20_X27_X25s_X27; -extern const bcstring be_const_str_CFG_X3A_X20removing_X20autoconf_X20files; -extern const bcstring be_const_str_CFG_X3A_X20removing_X20first_X20time_X20marker; -extern const bcstring be_const_str_CFG_X3A_X20return_code_X3D_X25i; -extern const bcstring be_const_str_CFG_X3A_X20running_X20; -extern const bcstring be_const_str_CFG_X3A_X20skipping_X20_X27display_X2Eini_X27_X20because_X20already_X20present_X20in_X20file_X2Dsystem; -extern const bcstring be_const_str_COLOR_BLACK; -extern const bcstring be_const_str_COLOR_WHITE; -extern const bcstring be_const_str_EC_C25519; -extern const bcstring be_const_str_EVENT_DRAW_MAIN; -extern const bcstring be_const_str_EVENT_DRAW_PART_BEGIN; -extern const bcstring be_const_str_EVENT_DRAW_PART_END; -extern const bcstring be_const_str_False; -extern const bcstring be_const_str_GET; -extern const bcstring be_const_str_HTTP_GET; -extern const bcstring be_const_str_HTTP_POST; -extern const bcstring be_const_str_I2C_Driver; -extern const bcstring be_const_str_I2C_X3A; -extern const bcstring be_const_str_LVG_X3A_X20call_X20to_X20unsupported_X20callback; -extern const bcstring be_const_str_Leds; -extern const bcstring be_const_str_MD5; -extern const bcstring be_const_str_None; -extern const bcstring be_const_str_OPTION_A; -extern const bcstring be_const_str_OneWire; -extern const bcstring be_const_str_PART_MAIN; -extern const bcstring be_const_str_POST; -extern const bcstring be_const_str_Parameter_X20error; -extern const bcstring be_const_str_RES_OK; -extern const bcstring be_const_str_Restart_X201; -extern const bcstring be_const_str_SERIAL_5E1; -extern const bcstring be_const_str_SERIAL_5E2; -extern const bcstring be_const_str_SERIAL_5N1; -extern const bcstring be_const_str_SERIAL_5N2; -extern const bcstring be_const_str_SERIAL_5O1; -extern const bcstring be_const_str_SERIAL_5O2; -extern const bcstring be_const_str_SERIAL_6E1; -extern const bcstring be_const_str_SERIAL_6E2; -extern const bcstring be_const_str_SERIAL_6N1; -extern const bcstring be_const_str_SERIAL_6N2; -extern const bcstring be_const_str_SERIAL_6O1; -extern const bcstring be_const_str_SERIAL_6O2; -extern const bcstring be_const_str_SERIAL_7E1; -extern const bcstring be_const_str_SERIAL_7E2; -extern const bcstring be_const_str_SERIAL_7N1; -extern const bcstring be_const_str_SERIAL_7N2; -extern const bcstring be_const_str_SERIAL_7O1; -extern const bcstring be_const_str_SERIAL_7O2; -extern const bcstring be_const_str_SERIAL_8E1; -extern const bcstring be_const_str_SERIAL_8E2; -extern const bcstring be_const_str_SERIAL_8N1; -extern const bcstring be_const_str_SERIAL_8N2; -extern const bcstring be_const_str_SERIAL_8O1; -extern const bcstring be_const_str_SERIAL_8O2; -extern const bcstring be_const_str_SK6812_GRBW; -extern const bcstring be_const_str_STATE_DEFAULT; -extern const bcstring be_const_str_TAP_X3A_X20found_X20Tasmota_X20App_X20_X27_X25s_X27; -extern const bcstring be_const_str_Tasmota; -extern const bcstring be_const_str_Tele; -extern const bcstring be_const_str_Timer; -extern const bcstring be_const_str_True; -extern const bcstring be_const_str_Unknown_X20command; -extern const bcstring be_const_str_WS2812; -extern const bcstring be_const_str_WS2812_GRB; -extern const bcstring be_const_str_Wire; -extern const bcstring be_const_str__; -extern const bcstring be_const_str__X0A; -extern const bcstring be_const_str__X20; -extern const bcstring be_const_str__X21_X3D; -extern const bcstring be_const_str__X21_X3D_X3D; -extern const bcstring be_const_str__X23; -extern const bcstring be_const_str__X23autoexec_X2Ebat; -extern const bcstring be_const_str__X23autoexec_X2Ebe; -extern const bcstring be_const_str__X23display_X2Eini; -extern const bcstring be_const_str__X23init_X2Ebat; -extern const bcstring be_const_str__X23preinit_X2Ebe; -extern const bcstring be_const_str__X2502d_X25s_X2502d; -extern const bcstring be_const_str__X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d; -extern const bcstring be_const_str__X25s_X2Eautoconf; -extern const bcstring be_const_str__X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B; -extern const bcstring be_const_str__X26lt_X3BNone_X26gt_X3B; -extern const bcstring be_const_str__X28_X29; -extern const bcstring be_const_str__X2B; -extern const bcstring be_const_str__X2C; -extern const bcstring be_const_str__X2D_X2D_X3A_X2D_X2D; -extern const bcstring be_const_str__X2E; -extern const bcstring be_const_str__X2E_X2E; -extern const bcstring be_const_str__X2Eautoconf; -extern const bcstring be_const_str__X2Ebe; -extern const bcstring be_const_str__X2Ebec; -extern const bcstring be_const_str__X2Elen; -extern const bcstring be_const_str__X2Ep; -extern const bcstring be_const_str__X2Ep1; -extern const bcstring be_const_str__X2Ep2; -extern const bcstring be_const_str__X2Esize; -extern const bcstring be_const_str__X2Etapp; -extern const bcstring be_const_str__X2Ew; -extern const bcstring be_const_str__X2F; -extern const bcstring be_const_str__X2F_X2Eautoconf; -extern const bcstring be_const_str__X2F_X3Frst_X3D; -extern const bcstring be_const_str__X2Fac; -extern const bcstring be_const_str__X3A; -extern const bcstring be_const_str__X3C; -extern const bcstring be_const_str__X3C_X2Fform_X3E_X3C_X2Fp_X3E; -extern const bcstring be_const_str__X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E; -extern const bcstring be_const_str__X3C_X3D; -extern const bcstring be_const_str__X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E; -extern const bcstring be_const_str__X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E; -extern const bcstring be_const_str__X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E; -extern const bcstring be_const_str__X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29; -extern const bcstring be_const_str__X3Clabel_X3EChoose_X20a_X20device_X20configuration_X3A_X3C_X2Flabel_X3E_X3Cbr_X3E; -extern const bcstring be_const_str__X3Clambda_X3E; -extern const bcstring be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E; -extern const bcstring be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E; -extern const bcstring be_const_str__X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E; -extern const bcstring be_const_str__X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E; -extern const bcstring be_const_str__X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E; -extern const bcstring be_const_str__X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E; -extern const bcstring be_const_str__X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E; -extern const bcstring be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E; -extern const bcstring be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20; -extern const bcstring be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dzip_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20; -extern const bcstring be_const_str__X3Cp_X3E_X3Csmall_X3E_X26nbsp_X3B_X28This_X20feature_X20requires_X20an_X20internet_X20connection_X29_X3C_X2Fsmall_X3E_X3C_X2Fp_X3E; -extern const bcstring be_const_str__X3Cselect_X20name_X3D_X27zip_X27_X3E; -extern const bcstring be_const_str__X3D; -extern const bcstring be_const_str__X3D_X3C_X3E_X21; -extern const bcstring be_const_str__X3D_X3D; -extern const bcstring be_const_str__X3E; -extern const bcstring be_const_str__X3E_X3D; -extern const bcstring be_const_str__X3F; -extern const bcstring be_const_str__X5B; -extern const bcstring be_const_str__X5D; -extern const bcstring be_const_str__X7B; -extern const bcstring be_const_str__X7B_X7D; -extern const bcstring be_const_str__X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D; -extern const bcstring be_const_str__X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D; -extern const bcstring be_const_str__X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_XB0C_X7Be_X7D; -extern const bcstring be_const_str__X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D; -extern const bcstring be_const_str__X7Bs_X7DVBus_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D; -extern const bcstring be_const_str__X7D; -extern const bcstring be_const_str___iterator__; -extern const bcstring be_const_str___lower__; -extern const bcstring be_const_str___upper__; -extern const bcstring be_const_str__anonymous_; -extern const bcstring be_const_str__archive; -extern const bcstring be_const_str__available; -extern const bcstring be_const_str__begin_transmission; -extern const bcstring be_const_str__buffer; -extern const bcstring be_const_str__ccmd; -extern const bcstring be_const_str__class; -extern const bcstring be_const_str__cmd; -extern const bcstring be_const_str__debug_present; -extern const bcstring be_const_str__def; -extern const bcstring be_const_str__dirty; -extern const bcstring be_const_str__drivers; -extern const bcstring be_const_str__end_transmission; -extern const bcstring be_const_str__energy; -extern const bcstring be_const_str__error; -extern const bcstring be_const_str__filename; -extern const bcstring be_const_str__global_addr; -extern const bcstring be_const_str__global_def; -extern const bcstring be_const_str__lvgl; -extern const bcstring be_const_str__p; -extern const bcstring be_const_str__persist_X2Ejson; -extern const bcstring be_const_str__ptr; -extern const bcstring be_const_str__read; -extern const bcstring be_const_str__request_from; -extern const bcstring be_const_str__rules; -extern const bcstring be_const_str__settings_def; -extern const bcstring be_const_str__settings_ptr; -extern const bcstring be_const_str__t; -extern const bcstring be_const_str__timers; -extern const bcstring be_const_str__write; -extern const bcstring be_const_str_a; -extern const bcstring be_const_str_abs; -extern const bcstring be_const_str_acos; -extern const bcstring be_const_str_add; -extern const bcstring be_const_str_add_anim; -extern const bcstring be_const_str_add_cmd; -extern const bcstring be_const_str_add_driver; -extern const bcstring be_const_str_add_header; -extern const bcstring be_const_str_add_rule; -extern const bcstring be_const_str_addr; -extern const bcstring be_const_str_allocated; -extern const bcstring be_const_str_alternate; -extern const bcstring be_const_str_animate; -extern const bcstring be_const_str_animators; -extern const bcstring be_const_str_arch; -extern const bcstring be_const_str_area; -extern const bcstring be_const_str_arg; -extern const bcstring be_const_str_arg_X20must_X20be_X20a_X20subclass_X20of_X20lv_obj; -extern const bcstring be_const_str_arg_name; -extern const bcstring be_const_str_arg_size; -extern const bcstring be_const_str_as; -extern const bcstring be_const_str_asin; -extern const bcstring be_const_str_assert; -extern const bcstring be_const_str_asstring; -extern const bcstring be_const_str_atan; -extern const bcstring be_const_str_atan2; -extern const bcstring be_const_str_atleast1; -extern const bcstring be_const_str_attrdump; -extern const bcstring be_const_str_autoexec; -extern const bcstring be_const_str_autorun; -extern const bcstring be_const_str_available; -extern const bcstring be_const_str_b; -extern const bcstring be_const_str_back_forth; -extern const bcstring be_const_str_base_class; -extern const bcstring be_const_str_battery_present; -extern const bcstring be_const_str_begin; -extern const bcstring be_const_str_bool; -extern const bcstring be_const_str_break; -extern const bcstring be_const_str_bri; -extern const bcstring be_const_str_bus; -extern const bcstring be_const_str_button_pressed; -extern const bcstring be_const_str_byte; -extern const bcstring be_const_str_bytes; -extern const bcstring be_const_str_c; -extern const bcstring be_const_str_call; -extern const bcstring be_const_str_call_native; -extern const bcstring be_const_str_calldepth; -extern const bcstring be_const_str_can_show; -extern const bcstring be_const_str_cb; -extern const bcstring be_const_str_cb_do_nothing; -extern const bcstring be_const_str_cb_event_closure; -extern const bcstring be_const_str_cb_obj; -extern const bcstring be_const_str_ceil; -extern const bcstring be_const_str_char; -extern const bcstring be_const_str_chars_in_string; -extern const bcstring be_const_str_check_privileged_access; -extern const bcstring be_const_str_class; -extern const bcstring be_const_str_class_init_obj; -extern const bcstring be_const_str_classname; -extern const bcstring be_const_str_classof; -extern const bcstring be_const_str_clear; -extern const bcstring be_const_str_clear_first_time; -extern const bcstring be_const_str_clear_to; -extern const bcstring be_const_str_close; -extern const bcstring be_const_str_closure; -extern const bcstring be_const_str_cmd; -extern const bcstring be_const_str_cmd_res; -extern const bcstring be_const_str_code; -extern const bcstring be_const_str_codedump; -extern const bcstring be_const_str_collect; -extern const bcstring be_const_str_color; -extern const bcstring be_const_str_compile; -extern const bcstring be_const_str_compress; -extern const bcstring be_const_str_concat; -extern const bcstring be_const_str_connect; -extern const bcstring be_const_str_connected; -extern const bcstring be_const_str_connection_error; -extern const bcstring be_const_str_constructor_cb; -extern const bcstring be_const_str_contains; -extern const bcstring be_const_str_content_button; -extern const bcstring be_const_str_content_flush; -extern const bcstring be_const_str_content_send; -extern const bcstring be_const_str_content_send_style; -extern const bcstring be_const_str_content_start; -extern const bcstring be_const_str_content_stop; -extern const bcstring be_const_str_continue; -extern const bcstring be_const_str_copy; -extern const bcstring be_const_str_cos; -extern const bcstring be_const_str_cosh; -extern const bcstring be_const_str_couldn_X27t_X20not_X20initialize_X20noepixelbus; -extern const bcstring be_const_str_count; -extern const bcstring be_const_str_counters; -extern const bcstring be_const_str_create_custom_widget; -extern const bcstring be_const_str_create_matrix; -extern const bcstring be_const_str_create_segment; -extern const bcstring be_const_str_ctor; -extern const bcstring be_const_str_ctypes_bytes; -extern const bcstring be_const_str_ctypes_bytes_dyn; -extern const bcstring be_const_str_dac_voltage; -extern const bcstring be_const_str_day; -extern const bcstring be_const_str_debug; -extern const bcstring be_const_str_decompress; -extern const bcstring be_const_str_decrypt; -extern const bcstring be_const_str_def; -extern const bcstring be_const_str_deg; -extern const bcstring be_const_str_deinit; -extern const bcstring be_const_str_del; -extern const bcstring be_const_str_delay; -extern const bcstring be_const_str_delete_all_configs; -extern const bcstring be_const_str_depower; -extern const bcstring be_const_str_deregister_obj; -extern const bcstring be_const_str_destructor_cb; -extern const bcstring be_const_str_detect; -extern const bcstring be_const_str_detected_X20on_X20bus; -extern const bcstring be_const_str_digital_read; -extern const bcstring be_const_str_digital_write; -extern const bcstring be_const_str_dirty; -extern const bcstring be_const_str_display; -extern const bcstring be_const_str_display_X2Eini; -extern const bcstring be_const_str_do; -extern const bcstring be_const_str_draw_arc; -extern const bcstring be_const_str_draw_line; -extern const bcstring be_const_str_draw_line_dsc; -extern const bcstring be_const_str_draw_line_dsc_init; -extern const bcstring be_const_str_due; -extern const bcstring be_const_str_dump; -extern const bcstring be_const_str_duration; -extern const bcstring be_const_str_editable; -extern const bcstring be_const_str_elif; -extern const bcstring be_const_str_else; -extern const bcstring be_const_str_enabled; -extern const bcstring be_const_str_encrypt; -extern const bcstring be_const_str_end; -extern const bcstring be_const_str_energy_struct; -extern const bcstring be_const_str_engine; -extern const bcstring be_const_str_erase; -extern const bcstring be_const_str_escape; -extern const bcstring be_const_str_eth; -extern const bcstring be_const_str_event; -extern const bcstring be_const_str_event_cb; -extern const bcstring be_const_str_event_send; -extern const bcstring be_const_str_every_100ms; -extern const bcstring be_const_str_every_50ms; -extern const bcstring be_const_str_every_second; -extern const bcstring be_const_str_except; -extern const bcstring be_const_str_exec_cmd; -extern const bcstring be_const_str_exec_rules; -extern const bcstring be_const_str_exec_tele; -extern const bcstring be_const_str_exists; -extern const bcstring be_const_str_exp; -extern const bcstring be_const_str_f; -extern const bcstring be_const_str_false; -extern const bcstring be_const_str_file; -extern const bcstring be_const_str_file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27; -extern const bcstring be_const_str_files; -extern const bcstring be_const_str_find; -extern const bcstring be_const_str_find_key_i; -extern const bcstring be_const_str_find_op; -extern const bcstring be_const_str_finish; -extern const bcstring be_const_str_floor; -extern const bcstring be_const_str_flush; -extern const bcstring be_const_str_for; -extern const bcstring be_const_str_format; -extern const bcstring be_const_str_from_to; -extern const bcstring be_const_str_fromb64; -extern const bcstring be_const_str_fromptr; -extern const bcstring be_const_str_fromstring; -extern const bcstring be_const_str_function; -extern const bcstring be_const_str_gamma; -extern const bcstring be_const_str_gamma10; -extern const bcstring be_const_str_gamma8; -extern const bcstring be_const_str_gc; -extern const bcstring be_const_str_gen_cb; -extern const bcstring be_const_str_get; -extern const bcstring be_const_str_get_alternate; -extern const bcstring be_const_str_get_aps_voltage; -extern const bcstring be_const_str_get_bat_charge_current; -extern const bcstring be_const_str_get_bat_current; -extern const bcstring be_const_str_get_bat_power; -extern const bcstring be_const_str_get_bat_voltage; -extern const bcstring be_const_str_get_battery_chargin_status; -extern const bcstring be_const_str_get_bri; -extern const bcstring be_const_str_get_cb_list; -extern const bcstring be_const_str_get_coords; -extern const bcstring be_const_str_get_current_module_name; -extern const bcstring be_const_str_get_current_module_path; -extern const bcstring be_const_str_get_free_heap; -extern const bcstring be_const_str_get_height; -extern const bcstring be_const_str_get_input_power_status; -extern const bcstring be_const_str_get_light; -extern const bcstring be_const_str_get_object_from_ptr; -extern const bcstring be_const_str_get_option; -extern const bcstring be_const_str_get_percentage; -extern const bcstring be_const_str_get_pixel_color; -extern const bcstring be_const_str_get_power; -extern const bcstring be_const_str_get_size; -extern const bcstring be_const_str_get_string; -extern const bcstring be_const_str_get_style_bg_color; -extern const bcstring be_const_str_get_style_line_color; -extern const bcstring be_const_str_get_style_pad_right; -extern const bcstring be_const_str_get_switch; -extern const bcstring be_const_str_get_tasmota; -extern const bcstring be_const_str_get_temp; -extern const bcstring be_const_str_get_vbus_current; -extern const bcstring be_const_str_get_vbus_voltage; -extern const bcstring be_const_str_get_warning_level; -extern const bcstring be_const_str_get_width; -extern const bcstring be_const_str_getbits; -extern const bcstring be_const_str_geti; -extern const bcstring be_const_str_global; -extern const bcstring be_const_str_gpio; -extern const bcstring be_const_str_group_def; -extern const bcstring be_const_str_h; -extern const bcstring be_const_str_has; -extern const bcstring be_const_str_has_arg; -extern const bcstring be_const_str_height_def; -extern const bcstring be_const_str_hex; -extern const bcstring be_const_str_hour; -extern const bcstring be_const_str_hs2rgb; -extern const bcstring be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_X2F_X25s_X2Eautoconf; -extern const bcstring be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_manifest_X2Ejson; -extern const bcstring be_const_str_i2c_enabled; -extern const bcstring be_const_str_id; -extern const bcstring be_const_str_if; -extern const bcstring be_const_str_imax; -extern const bcstring be_const_str_imin; -extern const bcstring be_const_str_import; -extern const bcstring be_const_str_init; -extern const bcstring be_const_str_init_draw_line_dsc; -extern const bcstring be_const_str_input; -extern const bcstring be_const_str_ins_goto; -extern const bcstring be_const_str_ins_ramp; -extern const bcstring be_const_str_ins_time; -extern const bcstring be_const_str_insert; -extern const bcstring be_const_str_instance; -extern const bcstring be_const_str_instance_size; -extern const bcstring be_const_str_int; -extern const bcstring be_const_str_internal_error; -extern const bcstring be_const_str_introspect; -extern const bcstring be_const_str_invalidate; -extern const bcstring be_const_str_io_error; -extern const bcstring be_const_str_ip; -extern const bcstring be_const_str_is_dirty; -extern const bcstring be_const_str_is_first_time; -extern const bcstring be_const_str_is_running; -extern const bcstring be_const_str_isinstance; -extern const bcstring be_const_str_isnan; -extern const bcstring be_const_str_isrunning; -extern const bcstring be_const_str_issubclass; -extern const bcstring be_const_str_item; -extern const bcstring be_const_str_iter; -extern const bcstring be_const_str_json; -extern const bcstring be_const_str_json_append; -extern const bcstring be_const_str_json_fdump; -extern const bcstring be_const_str_json_fdump_any; -extern const bcstring be_const_str_json_fdump_list; -extern const bcstring be_const_str_json_fdump_map; -extern const bcstring be_const_str_k; -extern const bcstring be_const_str_keys; -extern const bcstring be_const_str_kv; -extern const bcstring be_const_str_last_modified; -extern const bcstring be_const_str_leds; -extern const bcstring be_const_str_length_X20in_X20bits_X20must_X20be_X20between_X200_X20and_X2032; -extern const bcstring be_const_str_light; -extern const bcstring be_const_str_line_dsc; -extern const bcstring be_const_str_list; -extern const bcstring be_const_str_listdir; -extern const bcstring be_const_str_load; -extern const bcstring be_const_str_load_templates; -extern const bcstring be_const_str_local; -extern const bcstring be_const_str_log; -extern const bcstring be_const_str_log10; -extern const bcstring be_const_str_loop; -extern const bcstring be_const_str_lower; -extern const bcstring be_const_str_lv; -extern const bcstring be_const_str_lv_event; -extern const bcstring be_const_str_lv_event_cb; -extern const bcstring be_const_str_lv_obj; -extern const bcstring be_const_str_lv_obj_class; -extern const bcstring be_const_str_lvgl_event_dispatch; -extern const bcstring be_const_str_map; -extern const bcstring be_const_str_math; -extern const bcstring be_const_str_matrix; -extern const bcstring be_const_str_member; -extern const bcstring be_const_str_members; -extern const bcstring be_const_str_memory; -extern const bcstring be_const_str_millis; -extern const bcstring be_const_str_min; -extern const bcstring be_const_str_minute; -extern const bcstring be_const_str_module; -extern const bcstring be_const_str_month; -extern const bcstring be_const_str_name; -extern const bcstring be_const_str_nan; -extern const bcstring be_const_str_nil; -extern const bcstring be_const_str_no_X20GPIO_X20specified_X20for_X20neopixelbus; -extern const bcstring be_const_str_null_cb; -extern const bcstring be_const_str_number; -extern const bcstring be_const_str_obj_class_create_obj; -extern const bcstring be_const_str_obj_event_base; -extern const bcstring be_const_str_offset; -extern const bcstring be_const_str_offseta; -extern const bcstring be_const_str_on; -extern const bcstring be_const_str_onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E; -extern const bcstring be_const_str_onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20change_X20the_X20current_X20configuration_X20and_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E; -extern const bcstring be_const_str_open; -extern const bcstring be_const_str_out_X20of_X20range; -extern const bcstring be_const_str_p1; -extern const bcstring be_const_str_p2; -extern const bcstring be_const_str_page_autoconf_ctl; -extern const bcstring be_const_str_page_autoconf_mgr; -extern const bcstring be_const_str_param; -extern const bcstring be_const_str_path; -extern const bcstring be_const_str_pc; -extern const bcstring be_const_str_pc_abs; -extern const bcstring be_const_str_pc_rel; -extern const bcstring be_const_str_percentage; -extern const bcstring be_const_str_persist; -extern const bcstring be_const_str_persist_X2E_p_X20is_X20not_X20a_X20map; -extern const bcstring be_const_str_pi; -extern const bcstring be_const_str_pin; -extern const bcstring be_const_str_pin_mode; -extern const bcstring be_const_str_pin_used; -extern const bcstring be_const_str_pixel_count; -extern const bcstring be_const_str_pixel_size; -extern const bcstring be_const_str_pixels_buffer; -extern const bcstring be_const_str_point; -extern const bcstring be_const_str_pop; -extern const bcstring be_const_str_pop_path; -extern const bcstring be_const_str_pow; -extern const bcstring be_const_str_preinit; -extern const bcstring be_const_str_print; -extern const bcstring be_const_str_public_key; -extern const bcstring be_const_str_publish; -extern const bcstring be_const_str_publish_result; -extern const bcstring be_const_str_push; -extern const bcstring be_const_str_push_path; -extern const bcstring be_const_str_quality; -extern const bcstring be_const_str_r; -extern const bcstring be_const_str_rad; -extern const bcstring be_const_str_raise; -extern const bcstring be_const_str_rand; -extern const bcstring be_const_str_range; -extern const bcstring be_const_str_read; -extern const bcstring be_const_str_read12; -extern const bcstring be_const_str_read13; -extern const bcstring be_const_str_read24; -extern const bcstring be_const_str_read32; -extern const bcstring be_const_str_read8; -extern const bcstring be_const_str_read_bytes; -extern const bcstring be_const_str_read_sensors; -extern const bcstring be_const_str_readbytes; -extern const bcstring be_const_str_readline; -extern const bcstring be_const_str_real; -extern const bcstring be_const_str_reapply; -extern const bcstring be_const_str_redirect; -extern const bcstring be_const_str_reduce; -extern const bcstring be_const_str_refr_size; -extern const bcstring be_const_str_register_obj; -extern const bcstring be_const_str_remove; -extern const bcstring be_const_str_remove_cmd; -extern const bcstring be_const_str_remove_driver; -extern const bcstring be_const_str_remove_rule; -extern const bcstring be_const_str_remove_timer; -extern const bcstring be_const_str_reset; -extern const bcstring be_const_str_reset_search; -extern const bcstring be_const_str_resize; -extern const bcstring be_const_str_resolvecmnd; -extern const bcstring be_const_str_resp_cmnd; -extern const bcstring be_const_str_resp_cmnd_done; -extern const bcstring be_const_str_resp_cmnd_error; -extern const bcstring be_const_str_resp_cmnd_failed; -extern const bcstring be_const_str_resp_cmnd_str; -extern const bcstring be_const_str_response_append; -extern const bcstring be_const_str_return; -extern const bcstring be_const_str_return_X20code_X3D_X25i; -extern const bcstring be_const_str_reverse; -extern const bcstring be_const_str_reverse_gamma10; -extern const bcstring be_const_str_rotate; -extern const bcstring be_const_str_round_end; -extern const bcstring be_const_str_round_start; -extern const bcstring be_const_str_rtc; -extern const bcstring be_const_str_rule; -extern const bcstring be_const_str_run; -extern const bcstring be_const_str_run_bat; -extern const bcstring be_const_str_run_deferred; -extern const bcstring be_const_str_running; -extern const bcstring be_const_str_save; -extern const bcstring be_const_str_save_before_restart; -extern const bcstring be_const_str_scale_uint; -extern const bcstring be_const_str_scan; -extern const bcstring be_const_str_search; -extern const bcstring be_const_str_sec; -extern const bcstring be_const_str_seg7_font; -extern const bcstring be_const_str_select; -extern const bcstring be_const_str_serial; -extern const bcstring be_const_str_set; -extern const bcstring be_const_str_set_alternate; -extern const bcstring be_const_str_set_auth; -extern const bcstring be_const_str_set_bri; -extern const bcstring be_const_str_set_chg_current; -extern const bcstring be_const_str_set_dc_voltage; -extern const bcstring be_const_str_set_dcdc_enable; -extern const bcstring be_const_str_set_first_time; -extern const bcstring be_const_str_set_height; -extern const bcstring be_const_str_set_ldo_enable; -extern const bcstring be_const_str_set_ldo_voltage; -extern const bcstring be_const_str_set_light; -extern const bcstring be_const_str_set_matrix_pixel_color; -extern const bcstring be_const_str_set_percentage; -extern const bcstring be_const_str_set_pixel_color; -extern const bcstring be_const_str_set_power; -extern const bcstring be_const_str_set_style_bg_color; -extern const bcstring be_const_str_set_style_line_color; -extern const bcstring be_const_str_set_style_pad_right; -extern const bcstring be_const_str_set_style_text_font; -extern const bcstring be_const_str_set_text; -extern const bcstring be_const_str_set_time; -extern const bcstring be_const_str_set_timeouts; -extern const bcstring be_const_str_set_timer; -extern const bcstring be_const_str_set_useragent; -extern const bcstring be_const_str_set_width; -extern const bcstring be_const_str_set_x; -extern const bcstring be_const_str_set_y; -extern const bcstring be_const_str_setbits; -extern const bcstring be_const_str_seti; -extern const bcstring be_const_str_setitem; -extern const bcstring be_const_str_setmember; -extern const bcstring be_const_str_setrange; -extern const bcstring be_const_str_settings; -extern const bcstring be_const_str_shared_key; -extern const bcstring be_const_str_show; -extern const bcstring be_const_str_sin; -extern const bcstring be_const_str_sinh; -extern const bcstring be_const_str_size; -extern const bcstring be_const_str_skip; -extern const bcstring be_const_str_solidified; -extern const bcstring be_const_str_split; -extern const bcstring be_const_str_sqrt; -extern const bcstring be_const_str_srand; -extern const bcstring be_const_str_start; -extern const bcstring be_const_str_state; -extern const bcstring be_const_str_static; -extern const bcstring be_const_str_stop; -extern const bcstring be_const_str_stop_iteration; -extern const bcstring be_const_str_str; -extern const bcstring be_const_str_strftime; -extern const bcstring be_const_str_string; -extern const bcstring be_const_str_strip; -extern const bcstring be_const_str_strptime; -extern const bcstring be_const_str_super; -extern const bcstring be_const_str_sys; -extern const bcstring be_const_str_tag; -extern const bcstring be_const_str_tan; -extern const bcstring be_const_str_tanh; -extern const bcstring be_const_str_target; -extern const bcstring be_const_str_target_search; -extern const bcstring be_const_str_tasmota; -extern const bcstring be_const_str_tasmota_X2Eget_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eget_X28_X29; -extern const bcstring be_const_str_tasmota_X2Eset_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eset_X28_X29; -extern const bcstring be_const_str_tcpclient; -extern const bcstring be_const_str_tele; -extern const bcstring be_const_str_the_X20second_X20argument_X20is_X20not_X20a_X20function; -extern const bcstring be_const_str_time_dump; -extern const bcstring be_const_str_time_reached; -extern const bcstring be_const_str_time_str; -extern const bcstring be_const_str_to_gamma; -extern const bcstring be_const_str_tob64; -extern const bcstring be_const_str_tolower; -extern const bcstring be_const_str_tomap; -extern const bcstring be_const_str_top; -extern const bcstring be_const_str_toptr; -extern const bcstring be_const_str_tostring; -extern const bcstring be_const_str_toupper; -extern const bcstring be_const_str_tr; -extern const bcstring be_const_str_traceback; -extern const bcstring be_const_str_true; -extern const bcstring be_const_str_try; -extern const bcstring be_const_str_try_rule; -extern const bcstring be_const_str_type; -extern const bcstring be_const_str_unknown_X20instruction; -extern const bcstring be_const_str_update; -extern const bcstring be_const_str_upper; -extern const bcstring be_const_str_url_encode; -extern const bcstring be_const_str_v; -extern const bcstring be_const_str_value; -extern const bcstring be_const_str_value_error; -extern const bcstring be_const_str_valuer_error; -extern const bcstring be_const_str_var; -extern const bcstring be_const_str_w; -extern const bcstring be_const_str_wd; -extern const bcstring be_const_str_web_add_button; -extern const bcstring be_const_str_web_add_config_button; -extern const bcstring be_const_str_web_add_console_button; -extern const bcstring be_const_str_web_add_handler; -extern const bcstring be_const_str_web_add_main_button; -extern const bcstring be_const_str_web_add_management_button; -extern const bcstring be_const_str_web_send; -extern const bcstring be_const_str_web_send_decimal; -extern const bcstring be_const_str_web_sensor; -extern const bcstring be_const_str_webclient; -extern const bcstring be_const_str_webserver; -extern const bcstring be_const_str_while; -extern const bcstring be_const_str_widget_cb; -extern const bcstring be_const_str_widget_constructor; -extern const bcstring be_const_str_widget_ctor_cb; -extern const bcstring be_const_str_widget_ctor_impl; -extern const bcstring be_const_str_widget_destructor; -extern const bcstring be_const_str_widget_dtor_cb; -extern const bcstring be_const_str_widget_dtor_impl; -extern const bcstring be_const_str_widget_editable; -extern const bcstring be_const_str_widget_event; -extern const bcstring be_const_str_widget_event_cb; -extern const bcstring be_const_str_widget_event_impl; -extern const bcstring be_const_str_widget_group_def; -extern const bcstring be_const_str_widget_height_def; -extern const bcstring be_const_str_widget_instance_size; -extern const bcstring be_const_str_widget_struct_by_class; -extern const bcstring be_const_str_widget_struct_default; -extern const bcstring be_const_str_widget_width_def; -extern const bcstring be_const_str_width; -extern const bcstring be_const_str_width_def; -extern const bcstring be_const_str_wifi; -extern const bcstring be_const_str_wire; -extern const bcstring be_const_str_wire1; -extern const bcstring be_const_str_wire2; -extern const bcstring be_const_str_wire_scan; -extern const bcstring be_const_str_write; -extern const bcstring be_const_str_write8; -extern const bcstring be_const_str_write_bit; -extern const bcstring be_const_str_write_bytes; -extern const bcstring be_const_str_write_file; -extern const bcstring be_const_str_write_gpio; -extern const bcstring be_const_str_x; -extern const bcstring be_const_str_x1; -extern const bcstring be_const_str_y; -extern const bcstring be_const_str_y1; -extern const bcstring be_const_str_year; -extern const bcstring be_const_str_yield; -extern const bcstring be_const_str_zero; -extern const bcstring be_const_str_zip; diff --git a/lib/libesp32/berry/generate/be_const_strtab_def.h b/lib/libesp32/berry/generate/be_const_strtab_def.h deleted file mode 100644 index 4c195c96b..000000000 --- a/lib/libesp32/berry/generate/be_const_strtab_def.h +++ /dev/null @@ -1,1109 +0,0 @@ -be_define_const_str(, "", 2166136261u, 0, 0, NULL); -be_define_const_str(_X0A, "\n", 252472541u, 0, 1, &be_const_str_Unknown_X20command); -be_define_const_str(_X20, " ", 621580159u, 0, 1, &be_const_str_geti); -be_define_const_str(_X21_X3D, "!=", 2428715011u, 0, 2, &be_const_str_asstring); -be_define_const_str(_X21_X3D_X3D, "!==", 559817114u, 0, 3, &be_const_str_type); -be_define_const_str(_X23, "#", 638357778u, 0, 1, &be_const_str_CFG_X3A_X20no_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found); -be_define_const_str(_X23autoexec_X2Ebat, "#autoexec.bat", 3382890497u, 0, 13, &be_const_str_arg_size); -be_define_const_str(_X23autoexec_X2Ebe, "#autoexec.be", 1181757091u, 0, 12, &be_const_str_file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27); -be_define_const_str(_X23display_X2Eini, "#display.ini", 182218220u, 0, 12, &be_const_str___lower__); -be_define_const_str(_X23init_X2Ebat, "#init.bat", 3297595077u, 0, 9, &be_const_str_SERIAL_7O2); -be_define_const_str(_X23preinit_X2Ebe, "#preinit.be", 687035716u, 0, 11, &be_const_str_SERIAL_8O2); -be_define_const_str(_X2502d_X25s_X2502d, "%02d%s%02d", 1587999717u, 0, 10, &be_const_str_yield); -be_define_const_str(_X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d, "%04d-%02d-%02dT%02d:%02d:%02d", 3425528601u, 0, 29, &be_const_str__global_def); -be_define_const_str(_X25s_X2Eautoconf, "%s.autoconf", 3560383524u, 0, 11, &be_const_str_every_second); -be_define_const_str(_X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B, "<Error: apply new or remove>", 2855507949u, 0, 34, &be_const_str_add_driver); -be_define_const_str(_X26lt_X3BNone_X26gt_X3B, "<None>", 2602165498u, 0, 12, &be_const_str_rand); -be_define_const_str(_X28_X29, "()", 685372826u, 0, 2, &be_const_str__X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29); -be_define_const_str(_X2B, "+", 772578730u, 0, 1, &be_const_str_gpio); -be_define_const_str(_X2C, ",", 688690635u, 0, 1, &be_const_str_add_cmd); -be_define_const_str(_X2D_X2D_X3A_X2D_X2D, "--:--", 1370615441u, 0, 5, &be_const_str_AudioOutputI2S); -be_define_const_str(_X2E, ".", 722245873u, 0, 1, NULL); -be_define_const_str(_X2E_X2E, "..", 2748622605u, 0, 2, &be_const_str__X2Ep2); -be_define_const_str(_X2Eautoconf, ".autoconf", 2524679088u, 0, 9, NULL); -be_define_const_str(_X2Ebe, ".be", 1325797348u, 0, 3, &be_const_str_sinh); -be_define_const_str(_X2Ebec, ".bec", 3985273221u, 0, 4, &be_const_str__debug_present); -be_define_const_str(_X2Elen, ".len", 850842136u, 0, 4, NULL); -be_define_const_str(_X2Ep, ".p", 1171526419u, 0, 2, &be_const_str_COLOR_WHITE); -be_define_const_str(_X2Ep1, ".p1", 249175686u, 0, 3, &be_const_str_sin); -be_define_const_str(_X2Ep2, ".p2", 232398067u, 0, 3, &be_const_str_json_fdump_map); -be_define_const_str(_X2Esize, ".size", 1965188224u, 0, 5, &be_const_str__X2Fac); -be_define_const_str(_X2Etapp, ".tapp", 1363391594u, 0, 5, NULL); -be_define_const_str(_X2Ew, ".w", 1255414514u, 0, 2, &be_const_str_member); -be_define_const_str(_X2F, "/", 705468254u, 0, 1, &be_const_str_None); -be_define_const_str(_X2F_X2Eautoconf, "/.autoconf", 2212074393u, 0, 10, &be_const_str_set_dc_voltage); -be_define_const_str(_X2F_X3Frst_X3D, "/?rst=", 580074707u, 0, 6, &be_const_str_AES_GCM); -be_define_const_str(_X2Fac, "/ac", 3904651978u, 0, 3, &be_const_str_get_current_module_path); -be_define_const_str(_X3A, ":", 1057798253u, 0, 1, &be_const_str_json_fdump); -be_define_const_str(_X3C, "<", 957132539u, 0, 1, NULL); -be_define_const_str(_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "

", 3546571739u, 0, 11, &be_const_str_atan); -be_define_const_str(_X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "

", 1863865923u, 0, 16, NULL); -be_define_const_str(_X3C_X3D, "<=", 2499223986u, 0, 2, &be_const_str_HTTP_POST); -be_define_const_str(_X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, "", 3147934216u, 0, 82, &be_const_str_Wire); -be_define_const_str(_X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, "", 1205771629u, 0, 72, &be_const_str_color); -be_define_const_str(_X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, "
", 842307168u, 0, 77, &be_const_str_set_power); -be_define_const_str(_X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29, "Choose a device configuration:
", 1336654704u, 0, 49, &be_const_str_bus); -be_define_const_str(_X3Clambda_X3E, "", 607256038u, 0, 8, &be_const_str_point); -be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Current auto-configuration", 4212500780u, 0, 82, &be_const_str_get_warning_level); -be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Select new auto-configuration", 1926223891u, 0, 80, &be_const_str_get_vbus_current); -be_define_const_str(_X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E, "", 510303524u, 0, 30, &be_const_str_cb_event_closure); -be_define_const_str(_X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E, "", 3994619755u, 0, 54, NULL); -be_define_const_str(_X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E, "

Exception:
'%s'
%s

", 4252565082u, 0, 59, &be_const_str_arg); -be_define_const_str(_X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "

", 2052843416u, 0, 25, &be_const_str_area); -be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "

", 452285201u, 0, 120, NULL); -be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, "

 (This feature requires an internet connection)

", 2719266486u, 0, 74, &be_const_str_register_obj); -be_define_const_str(_X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E, "

Current configuration:

%s

", 4115655761u, 0, 46, &be_const_str_get_cb_list); -be_define_const_str(_X3Cselect_X20name_X3D_X27zip_X27_X3E, ""; const char SCRIPT_MSG_PULLDOWNa[] PROGMEM = - "
"; const char SCRIPT_MSG_PULLDOWNb[] PROGMEM = ""; const char SCRIPT_MSG_PULLDOWNc[] PROGMEM = @@ -7255,6 +7431,10 @@ const char SCRIPT_MSG_PULLDOWNc[] PROGMEM = const char SCRIPT_MSG_TEXTINP[] PROGMEM = "
"; +const char SCRIPT_MSG_TEXTINP_U[] PROGMEM = + "
"; + + const char SCRIPT_MSG_NUMINP[] PROGMEM = "
"; @@ -7502,6 +7682,21 @@ void ScriptWebShow(char mc) { optflg = 0; } // check for input elements + // prescan for html tags + /* + restart: + //if (*lp == 0 || *lp == SCRIPT_EOL) + if (*lin == '<') { + char *cp = strchr(lin, '>'); + if (cp) { + char svd = *(cp + 1); + *(cp + 1) = 0; + WSContentSend_PD("%s", lin); + *(cp + 1) = svd; + lin = cp + 1; + } + }*/ + if (!strncmp(lin, "sl(", 3)) { // insert slider sl(min max var left mid right) char *lp = lin; @@ -7576,6 +7771,28 @@ void ScriptWebShow(char mc) { while (*lp) { SCRIPT_SKIP_SPACES lp = GetStringArgument(lp, OPER_EQU, pulabel, 0); + if (index == 1 && pulabel[0] == '#') { + // number range + char *cp = &pulabel[1]; + uint8_t from = strtol(cp, &cp, 10); + uint8_t to = from; + if (*cp == '-') { + cp++; + to = strtol(cp, &cp, 10); + } + for (uint32_t cnt = from; cnt <= to; cnt++) { + sprintf(pulabel, "%d", cnt); + if (val == index) { + cp = (char*)"selected"; + } else { + cp = (char*)""; + } + WSContentSend_PD(SCRIPT_MSG_PULLDOWNb, cp, index, pulabel); + index++; + } + break; + } + char *cp; if (val == index) { cp = (char*)"selected"; @@ -7654,11 +7871,26 @@ void ScriptWebShow(char mc) { SCRIPT_SKIP_SPACES char label[SCRIPT_MAXSSIZE]; lp = GetStringArgument(lp, OPER_EQU, label, 0); - char vname[16]; ScriptGetVarname(vname, slp, sizeof(vname)); - - WSContentSend_PD(SCRIPT_MSG_TEXTINP, label, str, vname); + SCRIPT_SKIP_SPACES + if (*lp != ')') { + char type[SCRIPT_MAXSSIZE]; + lp = GetStringArgument(lp, OPER_EQU, type, 0); + SCRIPT_SKIP_SPACES + // also requires min max values + char min[SCRIPT_MAXSSIZE]; + lp = GetStringArgument(lp, OPER_EQU, min, 0); + SCRIPT_SKIP_SPACES + char max[SCRIPT_MAXSSIZE]; + lp = GetStringArgument(lp, OPER_EQU, max, 0); + SCRIPT_SKIP_SPACES + WSContentSend_PD(SCRIPT_MSG_TEXTINP_U, label, type, str, min, max, vname); + } else { + WSContentSend_PD(SCRIPT_MSG_TEXTINP, label, str, vname); + } + lp++; + //goto restart; } else if (!strncmp(lin, "nm(", 3)) { char *lp = lin; @@ -8210,11 +8442,17 @@ int32_t url2file(uint8_t fref, char *url) { WiFiClient http_client; HTTPClient http; int32_t httpCode = 0; - char hbuff[128]; - strcpy(hbuff, "http://"); - strcat(hbuff, url); - http.begin(http_client, UrlEncode(hbuff)); - httpCode = http.GET(); + String weburl = "http://"+UrlEncode(url); + for (uint32_t retry = 0; retry < 15; retry++) { + http.begin(http_client, weburl); + httpCode = http.GET(); + if (httpCode > 0) { + break; + } + } + if (httpCode < 0) { + AddLog(LOG_LEVEL_INFO,PSTR("HTTP error %d = %s"), httpCode, http.errorToString(httpCode).c_str()); + } if (httpCode == HTTP_CODE_OK || httpCode == HTTP_CODE_MOVED_PERMANENTLY) { WiFiClient *stream = http.getStreamPtr(); int32_t len = http.getSize(); From c152838e25e7535ac0baf14fbef601308738d7ca Mon Sep 17 00:00:00 2001 From: Stephan Hadinger Date: Wed, 15 Dec 2021 23:32:49 +0100 Subject: [PATCH 049/402] Berry yet another fix 2 --- lib/libesp32/berry/generate/be_const_strtab.h | 1 - .../berry/generate/be_const_strtab_def.h | 1804 ++++++++--------- .../berry/generate/be_fixed_be_class_map.h | 24 +- lib/libesp32/berry/src/be_byteslib.c | 138 +- lib/libesp32/berry/src/be_constobj.h | 16 - lib/libesp32/berry/src/be_gc.c | 4 + lib/libesp32/berry/src/be_maplib.c | 60 - lib/libesp32/berry/src/be_solidifylib.c | 30 +- 8 files changed, 1005 insertions(+), 1072 deletions(-) diff --git a/lib/libesp32/berry/generate/be_const_strtab.h b/lib/libesp32/berry/generate/be_const_strtab.h index 50198eb8f..0635eefc5 100644 --- a/lib/libesp32/berry/generate/be_const_strtab.h +++ b/lib/libesp32/berry/generate/be_const_strtab.h @@ -554,7 +554,6 @@ extern const bcstring be_const_str_readline; extern const bcstring be_const_str_real; extern const bcstring be_const_str_reapply; extern const bcstring be_const_str_redirect; -extern const bcstring be_const_str_reduce; extern const bcstring be_const_str_refr_size; extern const bcstring be_const_str_register_obj; extern const bcstring be_const_str_remove; diff --git a/lib/libesp32/berry/generate/be_const_strtab_def.h b/lib/libesp32/berry/generate/be_const_strtab_def.h index 4c195c96b..9cfcd09bc 100644 --- a/lib/libesp32/berry/generate/be_const_strtab_def.h +++ b/lib/libesp32/berry/generate/be_const_strtab_def.h @@ -1,696 +1,695 @@ -be_define_const_str(, "", 2166136261u, 0, 0, NULL); -be_define_const_str(_X0A, "\n", 252472541u, 0, 1, &be_const_str_Unknown_X20command); -be_define_const_str(_X20, " ", 621580159u, 0, 1, &be_const_str_geti); -be_define_const_str(_X21_X3D, "!=", 2428715011u, 0, 2, &be_const_str_asstring); -be_define_const_str(_X21_X3D_X3D, "!==", 559817114u, 0, 3, &be_const_str_type); -be_define_const_str(_X23, "#", 638357778u, 0, 1, &be_const_str_CFG_X3A_X20no_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found); -be_define_const_str(_X23autoexec_X2Ebat, "#autoexec.bat", 3382890497u, 0, 13, &be_const_str_arg_size); -be_define_const_str(_X23autoexec_X2Ebe, "#autoexec.be", 1181757091u, 0, 12, &be_const_str_file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27); -be_define_const_str(_X23display_X2Eini, "#display.ini", 182218220u, 0, 12, &be_const_str___lower__); -be_define_const_str(_X23init_X2Ebat, "#init.bat", 3297595077u, 0, 9, &be_const_str_SERIAL_7O2); -be_define_const_str(_X23preinit_X2Ebe, "#preinit.be", 687035716u, 0, 11, &be_const_str_SERIAL_8O2); -be_define_const_str(_X2502d_X25s_X2502d, "%02d%s%02d", 1587999717u, 0, 10, &be_const_str_yield); -be_define_const_str(_X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d, "%04d-%02d-%02dT%02d:%02d:%02d", 3425528601u, 0, 29, &be_const_str__global_def); -be_define_const_str(_X25s_X2Eautoconf, "%s.autoconf", 3560383524u, 0, 11, &be_const_str_every_second); -be_define_const_str(_X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B, "<Error: apply new or remove>", 2855507949u, 0, 34, &be_const_str_add_driver); -be_define_const_str(_X26lt_X3BNone_X26gt_X3B, "<None>", 2602165498u, 0, 12, &be_const_str_rand); -be_define_const_str(_X28_X29, "()", 685372826u, 0, 2, &be_const_str__X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29); -be_define_const_str(_X2B, "+", 772578730u, 0, 1, &be_const_str_gpio); -be_define_const_str(_X2C, ",", 688690635u, 0, 1, &be_const_str_add_cmd); -be_define_const_str(_X2D_X2D_X3A_X2D_X2D, "--:--", 1370615441u, 0, 5, &be_const_str_AudioOutputI2S); -be_define_const_str(_X2E, ".", 722245873u, 0, 1, NULL); -be_define_const_str(_X2E_X2E, "..", 2748622605u, 0, 2, &be_const_str__X2Ep2); +be_define_const_str(, "", 2166136261u, 0, 0, &be_const_str_AudioFileSourceFS); +be_define_const_str(_X0A, "\n", 252472541u, 0, 1, &be_const_str_file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27); +be_define_const_str(_X20, " ", 621580159u, 0, 1, &be_const_str_gen_cb); +be_define_const_str(_X21_X3D, "!=", 2428715011u, 0, 2, &be_const_str__X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E); +be_define_const_str(_X21_X3D_X3D, "!==", 559817114u, 0, 3, &be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E); +be_define_const_str(_X23, "#", 638357778u, 0, 1, &be_const_str_refr_size); +be_define_const_str(_X23autoexec_X2Ebat, "#autoexec.bat", 3382890497u, 0, 13, &be_const_str_get_option); +be_define_const_str(_X23autoexec_X2Ebe, "#autoexec.be", 1181757091u, 0, 12, &be_const_str_every_second); +be_define_const_str(_X23display_X2Eini, "#display.ini", 182218220u, 0, 12, &be_const_str__X3Cp_X3E_X3Csmall_X3E_X26nbsp_X3B_X28This_X20feature_X20requires_X20an_X20internet_X20connection_X29_X3C_X2Fsmall_X3E_X3C_X2Fp_X3E); +be_define_const_str(_X23init_X2Ebat, "#init.bat", 3297595077u, 0, 9, &be_const_str_real); +be_define_const_str(_X23preinit_X2Ebe, "#preinit.be", 687035716u, 0, 11, &be_const_str_publish_result); +be_define_const_str(_X2502d_X25s_X2502d, "%02d%s%02d", 1587999717u, 0, 10, &be_const_str_last_modified); +be_define_const_str(_X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d, "%04d-%02d-%02dT%02d:%02d:%02d", 3425528601u, 0, 29, &be_const_str__write); +be_define_const_str(_X25s_X2Eautoconf, "%s.autoconf", 3560383524u, 0, 11, &be_const_str_format); +be_define_const_str(_X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B, "<Error: apply new or remove>", 2855507949u, 0, 34, &be_const_str___upper__); +be_define_const_str(_X26lt_X3BNone_X26gt_X3B, "<None>", 2602165498u, 0, 12, &be_const_str_SERIAL_7E2); +be_define_const_str(_X28_X29, "()", 685372826u, 0, 2, &be_const_str_get_alternate); +be_define_const_str(_X2B, "+", 772578730u, 0, 1, &be_const_str_area); +be_define_const_str(_X2C, ",", 688690635u, 0, 1, NULL); +be_define_const_str(_X2D_X2D_X3A_X2D_X2D, "--:--", 1370615441u, 0, 5, &be_const_str__X2F_X2Eautoconf); +be_define_const_str(_X2E, ".", 722245873u, 0, 1, &be_const_str__ccmd); +be_define_const_str(_X2E_X2E, "..", 2748622605u, 0, 2, NULL); be_define_const_str(_X2Eautoconf, ".autoconf", 2524679088u, 0, 9, NULL); -be_define_const_str(_X2Ebe, ".be", 1325797348u, 0, 3, &be_const_str_sinh); -be_define_const_str(_X2Ebec, ".bec", 3985273221u, 0, 4, &be_const_str__debug_present); -be_define_const_str(_X2Elen, ".len", 850842136u, 0, 4, NULL); -be_define_const_str(_X2Ep, ".p", 1171526419u, 0, 2, &be_const_str_COLOR_WHITE); -be_define_const_str(_X2Ep1, ".p1", 249175686u, 0, 3, &be_const_str_sin); -be_define_const_str(_X2Ep2, ".p2", 232398067u, 0, 3, &be_const_str_json_fdump_map); -be_define_const_str(_X2Esize, ".size", 1965188224u, 0, 5, &be_const_str__X2Fac); -be_define_const_str(_X2Etapp, ".tapp", 1363391594u, 0, 5, NULL); -be_define_const_str(_X2Ew, ".w", 1255414514u, 0, 2, &be_const_str_member); -be_define_const_str(_X2F, "/", 705468254u, 0, 1, &be_const_str_None); -be_define_const_str(_X2F_X2Eautoconf, "/.autoconf", 2212074393u, 0, 10, &be_const_str_set_dc_voltage); -be_define_const_str(_X2F_X3Frst_X3D, "/?rst=", 580074707u, 0, 6, &be_const_str_AES_GCM); -be_define_const_str(_X2Fac, "/ac", 3904651978u, 0, 3, &be_const_str_get_current_module_path); -be_define_const_str(_X3A, ":", 1057798253u, 0, 1, &be_const_str_json_fdump); -be_define_const_str(_X3C, "<", 957132539u, 0, 1, NULL); -be_define_const_str(_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "

", 3546571739u, 0, 11, &be_const_str_atan); +be_define_const_str(_X2Ebe, ".be", 1325797348u, 0, 3, &be_const_str_digital_read); +be_define_const_str(_X2Ebec, ".bec", 3985273221u, 0, 4, &be_const_str_CFG_X3A_X20loading_X20); +be_define_const_str(_X2Elen, ".len", 850842136u, 0, 4, &be_const_str_SERIAL_6N2); +be_define_const_str(_X2Ep, ".p", 1171526419u, 0, 2, &be_const_str_arg_name); +be_define_const_str(_X2Ep1, ".p1", 249175686u, 0, 3, &be_const_str_battery_present); +be_define_const_str(_X2Ep2, ".p2", 232398067u, 0, 3, &be_const_str_b); +be_define_const_str(_X2Esize, ".size", 1965188224u, 0, 5, &be_const_str_CFG_X3A_X20loaded_X20_X27_X25s_X27); +be_define_const_str(_X2Etapp, ".tapp", 1363391594u, 0, 5, &be_const_str_Parameter_X20error); +be_define_const_str(_X2Ew, ".w", 1255414514u, 0, 2, &be_const_str_running); +be_define_const_str(_X2F, "/", 705468254u, 0, 1, &be_const_str__class); +be_define_const_str(_X2F_X2Eautoconf, "/.autoconf", 2212074393u, 0, 10, &be_const_str_connect); +be_define_const_str(_X2F_X3Frst_X3D, "/?rst=", 580074707u, 0, 6, &be_const_str_content_stop); +be_define_const_str(_X2Fac, "/ac", 3904651978u, 0, 3, &be_const_str_ins_ramp); +be_define_const_str(_X3A, ":", 1057798253u, 0, 1, &be_const_str_get_string); +be_define_const_str(_X3C, "<", 957132539u, 0, 1, &be_const_str_set_bri); +be_define_const_str(_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "

", 3546571739u, 0, 11, &be_const_str_remove); be_define_const_str(_X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "

", 1863865923u, 0, 16, NULL); -be_define_const_str(_X3C_X3D, "<=", 2499223986u, 0, 2, &be_const_str_HTTP_POST); -be_define_const_str(_X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, "", 3147934216u, 0, 82, &be_const_str_Wire); -be_define_const_str(_X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, "", 1205771629u, 0, 72, &be_const_str_color); -be_define_const_str(_X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, "
", 842307168u, 0, 77, &be_const_str_set_power); -be_define_const_str(_X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29, "Choose a device configuration:
", 1336654704u, 0, 49, &be_const_str_bus); -be_define_const_str(_X3Clambda_X3E, "", 607256038u, 0, 8, &be_const_str_point); -be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Current auto-configuration", 4212500780u, 0, 82, &be_const_str_get_warning_level); -be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Select new auto-configuration", 1926223891u, 0, 80, &be_const_str_get_vbus_current); -be_define_const_str(_X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E, "", 510303524u, 0, 30, &be_const_str_cb_event_closure); -be_define_const_str(_X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E, "", 3994619755u, 0, 54, NULL); -be_define_const_str(_X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E, "

Exception:
'%s'
%s

", 4252565082u, 0, 59, &be_const_str_arg); -be_define_const_str(_X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "

", 2052843416u, 0, 25, &be_const_str_area); -be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "

", 452285201u, 0, 120, NULL); -be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, "

 (This feature requires an internet connection)

", 2719266486u, 0, 74, &be_const_str_register_obj); -be_define_const_str(_X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E, "

Current configuration:

%s

", 4115655761u, 0, 46, &be_const_str_get_cb_list); -be_define_const_str(_X3Cselect_X20name_X3D_X27zip_X27_X3E, "", 4247924536u, 0, 19, &be_const_str_RES_OK); +be_define_const_str(_X3D, "=", 940354920u, 0, 1, &be_const_str_AudioFileSource); +be_define_const_str(_X3D_X3C_X3E_X21, "=<>!", 2664470277u, 0, 4, &be_const_str_ctypes_bytes_dyn); +be_define_const_str(_X3D_X3D, "==", 2431966415u, 0, 2, &be_const_str_CFG_X3A_X20removed_X20file_X20_X27_X25s_X27); +be_define_const_str(_X3E, ">", 990687777u, 0, 1, NULL); +be_define_const_str(_X3E_X3D, ">=", 284975636u, 0, 2, NULL); +be_define_const_str(_X3F, "?", 973910158u, 0, 1, &be_const_str_SERIAL_5N1); +be_define_const_str(AES_GCM, "AES_GCM", 3832208678u, 0, 7, &be_const_str_cmd_res); +be_define_const_str(AXP192, "AXP192", 757230128u, 0, 6, &be_const_str_shared_key); +be_define_const_str(Animate_X20pc_X20is_X20out_X20of_X20range, "Animate pc is out of range", 1854929421u, 0, 26, &be_const_str_add_driver); +be_define_const_str(AudioFileSource, "AudioFileSource", 2959980058u, 0, 15, &be_const_str__timers); +be_define_const_str(AudioFileSourceFS, "AudioFileSourceFS", 1839147653u, 0, 17, &be_const_str_MD5); +be_define_const_str(AudioGenerator, "AudioGenerator", 1839297342u, 0, 14, &be_const_str_BRY_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s); +be_define_const_str(AudioGeneratorMP3, "AudioGeneratorMP3", 2199818488u, 0, 17, NULL); +be_define_const_str(AudioGeneratorWAV, "AudioGeneratorWAV", 2746509368u, 0, 17, &be_const_str_add); +be_define_const_str(AudioOutput, "AudioOutput", 3257792048u, 0, 11, &be_const_str_no_X20GPIO_X20specified_X20for_X20neopixelbus); +be_define_const_str(AudioOutputI2S, "AudioOutputI2S", 638031784u, 0, 14, &be_const_str_codedump); +be_define_const_str(Auto_X2Dconfiguration, "Auto-configuration", 1665006109u, 0, 18, &be_const_str_fromptr); +be_define_const_str(BRY_X3A_X20ERROR_X2C_X20bad_X20json_X3A_X20, "BRY: ERROR, bad json: ", 2715135809u, 0, 22, &be_const_str_hs2rgb); +be_define_const_str(BRY_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s, "BRY: Exception> '%s' - %s", 2246990964u, 0, 25, &be_const_str_animate); +be_define_const_str(BRY_X3A_X20could_X20not_X20save_X20compiled_X20file_X20_X25s_X20_X28_X25s_X29, "BRY: could not save compiled file %s (%s)", 736659787u, 0, 41, &be_const_str_True); +be_define_const_str(BRY_X3A_X20failed_X20to_X20load_X20_persist_X2Ejson, "BRY: failed to load _persist.json", 2991913445u, 0, 33, NULL); +be_define_const_str(BUTTON_CONFIGURATION, "BUTTON_CONFIGURATION", 70820856u, 0, 20, &be_const_str_tob64); +be_define_const_str(CFG_X3A_X20_X27init_X2Ebat_X27_X20done_X2C_X20restarting, "CFG: 'init.bat' done, restarting", 1569670677u, 0, 32, &be_const_str_get_object_from_ptr); +be_define_const_str(CFG_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s, "CFG: Exception> '%s' - %s", 1228874553u, 0, 25, &be_const_str_concat); +be_define_const_str(CFG_X3A_X20could_X20not_X20run_X20_X25s_X20_X28_X25s_X20_X2D_X20_X25s_X29, "CFG: could not run %s (%s - %s)", 1428829580u, 0, 31, NULL); +be_define_const_str(CFG_X3A_X20downloading_X20_X27_X25s_X27, "CFG: downloading '%s'", 589480701u, 0, 21, &be_const_str_LVG_X3A_X20call_X20to_X20unsupported_X20callback); +be_define_const_str(CFG_X3A_X20exception_X20_X27_X25s_X27_X20_X2D_X20_X27_X25s_X27, "CFG: exception '%s' - '%s'", 4095407913u, 0, 26, &be_const_str_get_free_heap); +be_define_const_str(CFG_X3A_X20loaded_X20_X20, "CFG: loaded ", 3710273538u, 0, 13, &be_const_str_rtc); +be_define_const_str(CFG_X3A_X20loaded_X20_X27_X25s_X27, "CFG: loaded '%s'", 1699028828u, 0, 16, NULL); +be_define_const_str(CFG_X3A_X20loading_X20, "CFG: loading ", 4010361503u, 0, 13, &be_const_str_set_height); +be_define_const_str(CFG_X3A_X20loading_X20_X27_X25s_X27, "CFG: loading '%s'", 2285306097u, 0, 17, &be_const_str_SERIAL_6N1); +be_define_const_str(CFG_X3A_X20multiple_X20autoconf_X20files_X20found_X2C_X20aborting_X20_X28_X27_X25s_X27_X20_X2B_X20_X27_X25s_X27_X29, "CFG: multiple autoconf files found, aborting ('%s' + '%s')", 197663371u, 0, 58, NULL); +be_define_const_str(CFG_X3A_X20no_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found, "CFG: no '*.autoconf' file found", 127493957u, 0, 31, &be_const_str_get_style_bg_color); +be_define_const_str(CFG_X3A_X20ran_X20_X20, "CFG: ran ", 3579570472u, 0, 10, &be_const_str_resp_cmnd_str); +be_define_const_str(CFG_X3A_X20removed_X20file_X20_X27_X25s_X27, "CFG: removed file '%s'", 2048602473u, 0, 22, &be_const_str_millis); +be_define_const_str(CFG_X3A_X20removing_X20autoconf_X20files, "CFG: removing autoconf files", 4014704970u, 0, 28, &be_const_str__anonymous_); +be_define_const_str(CFG_X3A_X20removing_X20first_X20time_X20marker, "CFG: removing first time marker", 2125556683u, 0, 31, &be_const_str_onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20change_X20the_X20current_X20configuration_X20and_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E); +be_define_const_str(CFG_X3A_X20return_code_X3D_X25i, "CFG: return_code=%i", 2059897320u, 0, 19, &be_const_str_group_def); +be_define_const_str(CFG_X3A_X20running_X20, "CFG: running ", 2478334534u, 0, 13, NULL); +be_define_const_str(CFG_X3A_X20skipping_X20_X27display_X2Eini_X27_X20because_X20already_X20present_X20in_X20file_X2Dsystem, "CFG: skipping 'display.ini' because already present in file-system", 3965549264u, 0, 66, NULL); +be_define_const_str(COLOR_BLACK, "COLOR_BLACK", 264427940u, 0, 11, &be_const_str_set_percentage); +be_define_const_str(COLOR_WHITE, "COLOR_WHITE", 2536871270u, 0, 11, NULL); +be_define_const_str(EC_C25519, "EC_C25519", 95492591u, 0, 9, &be_const_str__debug_present); +be_define_const_str(EVENT_DRAW_MAIN, "EVENT_DRAW_MAIN", 1955620614u, 0, 15, NULL); +be_define_const_str(EVENT_DRAW_PART_BEGIN, "EVENT_DRAW_PART_BEGIN", 3391865024u, 0, 21, &be_const_str__ptr); +be_define_const_str(EVENT_DRAW_PART_END, "EVENT_DRAW_PART_END", 3301625292u, 0, 19, NULL); +be_define_const_str(False, "False", 2541049336u, 0, 5, &be_const_str_attrdump); +be_define_const_str(GET, "GET", 2531704439u, 0, 3, &be_const_str_content_flush); +be_define_const_str(HTTP_GET, "HTTP_GET", 1722467738u, 0, 8, &be_const_str_rad); +be_define_const_str(HTTP_POST, "HTTP_POST", 1999554144u, 0, 9, NULL); +be_define_const_str(I2C_X3A, "I2C:", 813483371u, 0, 4, &be_const_str_push_path); +be_define_const_str(I2C_Driver, "I2C_Driver", 1714501658u, 0, 10, NULL); +be_define_const_str(LVG_X3A_X20call_X20to_X20unsupported_X20callback, "LVG: call to unsupported callback", 504176819u, 0, 33, NULL); +be_define_const_str(Leds, "Leds", 2709245275u, 0, 4, &be_const_str_byte); +be_define_const_str(MD5, "MD5", 1935726387u, 0, 3, &be_const_str_atan2); +be_define_const_str(None, "None", 810547195u, 0, 4, &be_const_str_SERIAL_8E2); +be_define_const_str(OPTION_A, "OPTION_A", 1133299440u, 0, 8, &be_const_str_SERIAL_6O1); +be_define_const_str(OneWire, "OneWire", 2298990722u, 0, 7, &be_const_str_get_cb_list); +be_define_const_str(PART_MAIN, "PART_MAIN", 2473491508u, 0, 9, NULL); +be_define_const_str(POST, "POST", 1929554311u, 0, 4, &be_const_str_deregister_obj); +be_define_const_str(Parameter_X20error, "Parameter error", 3840042038u, 0, 15, &be_const_str_connection_error); +be_define_const_str(RES_OK, "RES_OK", 1233817284u, 0, 6, &be_const_str_SERIAL_5O2); +be_define_const_str(Restart_X201, "Restart 1", 3504455855u, 0, 9, NULL); +be_define_const_str(SERIAL_5E1, "SERIAL_5E1", 1163775235u, 0, 10, &be_const_str_get_size); +be_define_const_str(SERIAL_5E2, "SERIAL_5E2", 1180552854u, 0, 10, &be_const_str_available); +be_define_const_str(SERIAL_5N1, "SERIAL_5N1", 3313031680u, 0, 10, &be_const_str_deinit); +be_define_const_str(SERIAL_5N2, "SERIAL_5N2", 3363364537u, 0, 10, &be_const_str_zero); +be_define_const_str(SERIAL_5O1, "SERIAL_5O1", 3782657917u, 0, 10, &be_const_str_SERIAL_8O2); +be_define_const_str(SERIAL_5O2, "SERIAL_5O2", 3732325060u, 0, 10, &be_const_str_calldepth); +be_define_const_str(SERIAL_6E1, "SERIAL_6E1", 334249486u, 0, 10, &be_const_str_public_key); +be_define_const_str(SERIAL_6E2, "SERIAL_6E2", 317471867u, 0, 10, &be_const_str_SK6812_GRBW); +be_define_const_str(SERIAL_6N1, "SERIAL_6N1", 198895701u, 0, 10, &be_const_str_push); +be_define_const_str(SERIAL_6N2, "SERIAL_6N2", 148562844u, 0, 10, &be_const_str_check_privileged_access); +be_define_const_str(SERIAL_6O1, "SERIAL_6O1", 266153272u, 0, 10, &be_const_str__X5B); +be_define_const_str(SERIAL_6O2, "SERIAL_6O2", 316486129u, 0, 10, &be_const_str_widget_instance_size); +be_define_const_str(SERIAL_7E1, "SERIAL_7E1", 147718061u, 0, 10, NULL); +be_define_const_str(SERIAL_7E2, "SERIAL_7E2", 97385204u, 0, 10, &be_const_str__energy); +be_define_const_str(SERIAL_7N1, "SERIAL_7N1", 1891060246u, 0, 10, &be_const_str__X7D); +be_define_const_str(SERIAL_7N2, "SERIAL_7N2", 1874282627u, 0, 10, &be_const_str_draw_line_dsc); be_define_const_str(SERIAL_7O1, "SERIAL_7O1", 1823802675u, 0, 10, NULL); -be_define_const_str(SERIAL_7O2, "SERIAL_7O2", 1840580294u, 0, 10, &be_const_str_arch); -be_define_const_str(SERIAL_8E1, "SERIAL_8E1", 2371121616u, 0, 10, &be_const_str__available); -be_define_const_str(SERIAL_8E2, "SERIAL_8E2", 2421454473u, 0, 10, NULL); -be_define_const_str(SERIAL_8N1, "SERIAL_8N1", 2369297235u, 0, 10, &be_const_str_imin); -be_define_const_str(SERIAL_8N2, "SERIAL_8N2", 2386074854u, 0, 10, &be_const_str_gen_cb); -be_define_const_str(SERIAL_8O1, "SERIAL_8O1", 289122742u, 0, 10, &be_const_str_return_X20code_X3D_X25i); -be_define_const_str(SERIAL_8O2, "SERIAL_8O2", 272345123u, 0, 10, &be_const_str_tag); -be_define_const_str(SK6812_GRBW, "SK6812_GRBW", 81157857u, 0, 11, &be_const_str_item); -be_define_const_str(STATE_DEFAULT, "STATE_DEFAULT", 712406428u, 0, 13, &be_const_str_pop); -be_define_const_str(TAP_X3A_X20found_X20Tasmota_X20App_X20_X27_X25s_X27, "TAP: found Tasmota App '%s'", 2643152398u, 0, 27, &be_const_str_closure); -be_define_const_str(Tasmota, "Tasmota", 4047617668u, 0, 7, &be_const_str_dump); -be_define_const_str(Tele, "Tele", 1329980653u, 0, 4, &be_const_str_f); -be_define_const_str(Timer, "Timer", 3948127682u, 0, 5, &be_const_str_check_privileged_access); -be_define_const_str(True, "True", 3453902341u, 0, 4, &be_const_str_hs2rgb); -be_define_const_str(Unknown_X20command, "Unknown command", 1830905432u, 0, 15, &be_const_str_map); -be_define_const_str(WS2812, "WS2812", 3539741218u, 0, 6, NULL); +be_define_const_str(SERIAL_7O2, "SERIAL_7O2", 1840580294u, 0, 10, &be_const_str_SERIAL_8E1); +be_define_const_str(SERIAL_8E1, "SERIAL_8E1", 2371121616u, 0, 10, &be_const_str_files); +be_define_const_str(SERIAL_8E2, "SERIAL_8E2", 2421454473u, 0, 10, &be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_X2F_X25s_X2Eautoconf); +be_define_const_str(SERIAL_8N1, "SERIAL_8N1", 2369297235u, 0, 10, &be_const_str_load_templates); +be_define_const_str(SERIAL_8N2, "SERIAL_8N2", 2386074854u, 0, 10, NULL); +be_define_const_str(SERIAL_8O1, "SERIAL_8O1", 289122742u, 0, 10, &be_const_str_exec_rules); +be_define_const_str(SERIAL_8O2, "SERIAL_8O2", 272345123u, 0, 10, &be_const_str_ctypes_bytes); +be_define_const_str(SK6812_GRBW, "SK6812_GRBW", 81157857u, 0, 11, &be_const_str_add_rule); +be_define_const_str(STATE_DEFAULT, "STATE_DEFAULT", 712406428u, 0, 13, &be_const_str__request_from); +be_define_const_str(TAP_X3A_X20found_X20Tasmota_X20App_X20_X27_X25s_X27, "TAP: found Tasmota App '%s'", 2643152398u, 0, 27, &be_const_str_draw_arc); +be_define_const_str(Tasmota, "Tasmota", 4047617668u, 0, 7, NULL); +be_define_const_str(Tele, "Tele", 1329980653u, 0, 4, &be_const_str_abs); +be_define_const_str(Timer, "Timer", 3948127682u, 0, 5, &be_const_str__t); +be_define_const_str(True, "True", 3453902341u, 0, 4, &be_const_str__filename); +be_define_const_str(Unknown_X20command, "Unknown command", 1830905432u, 0, 15, &be_const_str_var); +be_define_const_str(WS2812, "WS2812", 3539741218u, 0, 6, &be_const_str_addr); be_define_const_str(WS2812_GRB, "WS2812_GRB", 1736405692u, 0, 10, NULL); -be_define_const_str(Wire, "Wire", 1938276536u, 0, 4, NULL); -be_define_const_str(_X5B, "[", 3725336506u, 0, 1, &be_const_str_get_object_from_ptr); -be_define_const_str(_X5D, "]", 3624670792u, 0, 1, &be_const_str_x1); -be_define_const_str(_, "_", 3658226030u, 0, 1, &be_const_str_widget_struct_by_class); -be_define_const_str(__iterator__, "__iterator__", 3884039703u, 0, 12, &be_const_str_asin); -be_define_const_str(__lower__, "__lower__", 123855590u, 0, 9, &be_const_str_public_key); -be_define_const_str(__upper__, "__upper__", 3612202883u, 0, 9, &be_const_str_class_init_obj); -be_define_const_str(_anonymous_, "_anonymous_", 1957281476u, 0, 11, &be_const_str_matrix); -be_define_const_str(_archive, "_archive", 4004559404u, 0, 8, &be_const_str_isrunning); -be_define_const_str(_available, "_available", 1306196581u, 0, 10, &be_const_str_setitem); -be_define_const_str(_begin_transmission, "_begin_transmission", 2779461176u, 0, 19, NULL); -be_define_const_str(_buffer, "_buffer", 2044888568u, 0, 7, &be_const_str_seti); -be_define_const_str(_ccmd, "_ccmd", 2163421413u, 0, 5, &be_const_str_enabled); -be_define_const_str(_class, "_class", 2732146350u, 0, 6, &be_const_str__dirty); -be_define_const_str(_cmd, "_cmd", 3419822142u, 0, 4, &be_const_str_nan); +be_define_const_str(Wire, "Wire", 1938276536u, 0, 4, &be_const_str_get_style_line_color); +be_define_const_str(_X5B, "[", 3725336506u, 0, 1, &be_const_str_counters); +be_define_const_str(_X5D, "]", 3624670792u, 0, 1, &be_const_str_imin); +be_define_const_str(_, "_", 3658226030u, 0, 1, &be_const_str_add_anim); +be_define_const_str(__iterator__, "__iterator__", 3884039703u, 0, 12, &be_const_str_open); +be_define_const_str(__lower__, "__lower__", 123855590u, 0, 9, &be_const_str__X7B); +be_define_const_str(__upper__, "__upper__", 3612202883u, 0, 9, NULL); +be_define_const_str(_anonymous_, "_anonymous_", 1957281476u, 0, 11, &be_const_str_get_vbus_current); +be_define_const_str(_archive, "_archive", 4004559404u, 0, 8, NULL); +be_define_const_str(_available, "_available", 1306196581u, 0, 10, &be_const_str_persist); +be_define_const_str(_begin_transmission, "_begin_transmission", 2779461176u, 0, 19, &be_const_str_kv); +be_define_const_str(_buffer, "_buffer", 2044888568u, 0, 7, &be_const_str_draw_line_dsc_init); +be_define_const_str(_ccmd, "_ccmd", 2163421413u, 0, 5, &be_const_str_read); +be_define_const_str(_class, "_class", 2732146350u, 0, 6, &be_const_str_webserver); +be_define_const_str(_cmd, "_cmd", 3419822142u, 0, 4, &be_const_str_super); be_define_const_str(_debug_present, "_debug_present", 4063411725u, 0, 14, NULL); -be_define_const_str(_def, "_def", 1985022181u, 0, 4, NULL); -be_define_const_str(_dirty, "_dirty", 283846766u, 0, 6, &be_const_str_content_start); -be_define_const_str(_drivers, "_drivers", 3260328985u, 0, 8, &be_const_str_del); -be_define_const_str(_end_transmission, "_end_transmission", 3237480400u, 0, 17, &be_const_str_math); -be_define_const_str(_energy, "_energy", 535372070u, 0, 7, &be_const_str_reduce); -be_define_const_str(_error, "_error", 1132109656u, 0, 6, NULL); -be_define_const_str(_filename, "_filename", 1430813195u, 0, 9, NULL); -be_define_const_str(_global_addr, "_global_addr", 533766721u, 0, 12, &be_const_str_add_rule); -be_define_const_str(_global_def, "_global_def", 646007001u, 0, 11, &be_const_str_destructor_cb); +be_define_const_str(_def, "_def", 1985022181u, 0, 4, &be_const_str_arch); +be_define_const_str(_dirty, "_dirty", 283846766u, 0, 6, &be_const_str_asstring); +be_define_const_str(_drivers, "_drivers", 3260328985u, 0, 8, NULL); +be_define_const_str(_end_transmission, "_end_transmission", 3237480400u, 0, 17, &be_const_str_begin); +be_define_const_str(_energy, "_energy", 535372070u, 0, 7, &be_const_str_color); +be_define_const_str(_error, "_error", 1132109656u, 0, 6, &be_const_str_is_first_time); +be_define_const_str(_filename, "_filename", 1430813195u, 0, 9, &be_const_str_create_segment); +be_define_const_str(_global_addr, "_global_addr", 533766721u, 0, 12, &be_const_str_list); +be_define_const_str(_global_def, "_global_def", 646007001u, 0, 11, &be_const_str_editable); be_define_const_str(_lvgl, "_lvgl", 2689219483u, 0, 5, NULL); -be_define_const_str(_p, "_p", 1594591802u, 0, 2, &be_const_str_scan); +be_define_const_str(_p, "_p", 1594591802u, 0, 2, &be_const_str_is_dirty); be_define_const_str(_persist_X2Ejson, "_persist.json", 2008425138u, 0, 13, NULL); -be_define_const_str(_ptr, "_ptr", 306235816u, 0, 4, NULL); -be_define_const_str(_read, "_read", 346717030u, 0, 5, &be_const_str_calldepth); -be_define_const_str(_request_from, "_request_from", 3965148604u, 0, 13, &be_const_str_set_x); -be_define_const_str(_rules, "_rules", 4266217105u, 0, 6, NULL); -be_define_const_str(_settings_def, "_settings_def", 3775560307u, 0, 13, &be_const_str_offseta); -be_define_const_str(_settings_ptr, "_settings_ptr", 1825772182u, 0, 13, &be_const_str_event_send); -be_define_const_str(_t, "_t", 1527481326u, 0, 2, &be_const_str_resolvecmnd); -be_define_const_str(_timers, "_timers", 2600100916u, 0, 7, &be_const_str_add); -be_define_const_str(_write, "_write", 2215462825u, 0, 6, &be_const_str_read12); -be_define_const_str(a, "a", 3826002220u, 0, 1, &be_const_str_get_string); -be_define_const_str(abs, "abs", 709362235u, 0, 3, NULL); -be_define_const_str(acos, "acos", 1006755615u, 0, 4, &be_const_str_def); -be_define_const_str(add, "add", 993596020u, 0, 3, &be_const_str_zero); -be_define_const_str(add_anim, "add_anim", 3980662668u, 0, 8, &be_const_str_content_flush); +be_define_const_str(_ptr, "_ptr", 306235816u, 0, 4, &be_const_str_cb_obj); +be_define_const_str(_read, "_read", 346717030u, 0, 5, NULL); +be_define_const_str(_request_from, "_request_from", 3965148604u, 0, 13, NULL); +be_define_const_str(_rules, "_rules", 4266217105u, 0, 6, &be_const_str_map); +be_define_const_str(_settings_def, "_settings_def", 3775560307u, 0, 13, NULL); +be_define_const_str(_settings_ptr, "_settings_ptr", 1825772182u, 0, 13, &be_const_str_insert); +be_define_const_str(_t, "_t", 1527481326u, 0, 2, &be_const_str_k); +be_define_const_str(_timers, "_timers", 2600100916u, 0, 7, &be_const_str_reset); +be_define_const_str(_write, "_write", 2215462825u, 0, 6, &be_const_str_autorun); +be_define_const_str(a, "a", 3826002220u, 0, 1, NULL); +be_define_const_str(abs, "abs", 709362235u, 0, 3, &be_const_str_h); +be_define_const_str(acos, "acos", 1006755615u, 0, 4, &be_const_str_digital_write); +be_define_const_str(add, "add", 993596020u, 0, 3, &be_const_str_every_50ms); +be_define_const_str(add_anim, "add_anim", 3980662668u, 0, 8, &be_const_str_remove_cmd); be_define_const_str(add_cmd, "add_cmd", 3361630879u, 0, 7, NULL); -be_define_const_str(add_driver, "add_driver", 1654458371u, 0, 10, &be_const_str_atan2); -be_define_const_str(add_header, "add_header", 927130612u, 0, 10, &be_const_str_set_percentage); -be_define_const_str(add_rule, "add_rule", 596540743u, 0, 8, &be_const_str_call_native); -be_define_const_str(addr, "addr", 1087856498u, 0, 4, &be_const_str_create_matrix); -be_define_const_str(allocated, "allocated", 429986098u, 0, 9, &be_const_str_toptr); -be_define_const_str(alternate, "alternate", 1140253277u, 0, 9, NULL); -be_define_const_str(animate, "animate", 3885786800u, 0, 7, &be_const_str_function); -be_define_const_str(animators, "animators", 279858213u, 0, 9, &be_const_str_traceback); -be_define_const_str(arch, "arch", 2952804297u, 0, 4, NULL); -be_define_const_str(area, "area", 2601460036u, 0, 4, &be_const_str_find); -be_define_const_str(arg, "arg", 1047474471u, 0, 3, NULL); -be_define_const_str(arg_X20must_X20be_X20a_X20subclass_X20of_X20lv_obj, "arg must be a subclass of lv_obj", 1641882079u, 0, 32, &be_const_str_as); -be_define_const_str(arg_name, "arg_name", 1345046155u, 0, 8, &be_const_str_widget_height_def); -be_define_const_str(arg_size, "arg_size", 3310243257u, 0, 8, NULL); +be_define_const_str(add_driver, "add_driver", 1654458371u, 0, 10, NULL); +be_define_const_str(add_header, "add_header", 927130612u, 0, 10, &be_const_str_io_error); +be_define_const_str(add_rule, "add_rule", 596540743u, 0, 8, NULL); +be_define_const_str(addr, "addr", 1087856498u, 0, 4, &be_const_str_closure); +be_define_const_str(allocated, "allocated", 429986098u, 0, 9, &be_const_str_classname); +be_define_const_str(alternate, "alternate", 1140253277u, 0, 9, &be_const_str_day); +be_define_const_str(animate, "animate", 3885786800u, 0, 7, &be_const_str_gamma); +be_define_const_str(animators, "animators", 279858213u, 0, 9, NULL); +be_define_const_str(arch, "arch", 2952804297u, 0, 4, &be_const_str_get_input_power_status); +be_define_const_str(area, "area", 2601460036u, 0, 4, &be_const_str_asin); +be_define_const_str(arg, "arg", 1047474471u, 0, 3, &be_const_str_math); +be_define_const_str(arg_X20must_X20be_X20a_X20subclass_X20of_X20lv_obj, "arg must be a subclass of lv_obj", 1641882079u, 0, 32, &be_const_str_ins_goto); +be_define_const_str(arg_name, "arg_name", 1345046155u, 0, 8, &be_const_str_exists); +be_define_const_str(arg_size, "arg_size", 3310243257u, 0, 8, &be_const_str_has); be_define_const_str(as, "as", 1579491469u, 67, 2, NULL); -be_define_const_str(asin, "asin", 4272848550u, 0, 4, &be_const_str_get_current_module_name); -be_define_const_str(assert, "assert", 2774883451u, 0, 6, &be_const_str_display); -be_define_const_str(asstring, "asstring", 1298225088u, 0, 8, &be_const_str_get_temp); -be_define_const_str(atan, "atan", 108579519u, 0, 4, &be_const_str_publish); -be_define_const_str(atan2, "atan2", 3173440503u, 0, 5, &be_const_str_json_fdump_list); -be_define_const_str(atleast1, "atleast1", 1956331672u, 0, 8, &be_const_str_exp); -be_define_const_str(attrdump, "attrdump", 1521571304u, 0, 8, &be_const_str_cb_do_nothing); -be_define_const_str(autoexec, "autoexec", 3676861891u, 0, 8, &be_const_str_cmd_res); -be_define_const_str(autorun, "autorun", 1447527407u, 0, 7, &be_const_str_log); -be_define_const_str(available, "available", 1727918744u, 0, 9, NULL); -be_define_const_str(b, "b", 3876335077u, 0, 1, &be_const_str_get_bri); -be_define_const_str(back_forth, "back_forth", 2665042062u, 0, 10, &be_const_str_debug); -be_define_const_str(base_class, "base_class", 1107737279u, 0, 10, &be_const_str_is_running); -be_define_const_str(battery_present, "battery_present", 3588397058u, 0, 15, NULL); -be_define_const_str(begin, "begin", 1748273790u, 0, 5, &be_const_str_char); -be_define_const_str(bool, "bool", 3365180733u, 0, 4, &be_const_str_log10); +be_define_const_str(asin, "asin", 4272848550u, 0, 4, NULL); +be_define_const_str(assert, "assert", 2774883451u, 0, 6, &be_const_str_constructor_cb); +be_define_const_str(asstring, "asstring", 1298225088u, 0, 8, &be_const_str_pop_path); +be_define_const_str(atan, "atan", 108579519u, 0, 4, &be_const_str_is_running); +be_define_const_str(atan2, "atan2", 3173440503u, 0, 5, &be_const_str_get_battery_chargin_status); +be_define_const_str(atleast1, "atleast1", 1956331672u, 0, 8, &be_const_str_draw_line); +be_define_const_str(attrdump, "attrdump", 1521571304u, 0, 8, NULL); +be_define_const_str(autoexec, "autoexec", 3676861891u, 0, 8, &be_const_str_create_matrix); +be_define_const_str(autorun, "autorun", 1447527407u, 0, 7, &be_const_str_tasmota_X2Eset_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eset_X28_X29); +be_define_const_str(available, "available", 1727918744u, 0, 9, &be_const_str_get_percentage); +be_define_const_str(b, "b", 3876335077u, 0, 1, NULL); +be_define_const_str(back_forth, "back_forth", 2665042062u, 0, 10, NULL); +be_define_const_str(base_class, "base_class", 1107737279u, 0, 10, &be_const_str_loop); +be_define_const_str(battery_present, "battery_present", 3588397058u, 0, 15, &be_const_str_wire_scan); +be_define_const_str(begin, "begin", 1748273790u, 0, 5, &be_const_str_write); +be_define_const_str(bool, "bool", 3365180733u, 0, 4, &be_const_str_duration); be_define_const_str(break, "break", 3378807160u, 58, 5, NULL); -be_define_const_str(bri, "bri", 2112284244u, 0, 3, &be_const_str_set_style_pad_right); -be_define_const_str(bus, "bus", 1607822841u, 0, 3, &be_const_str_minute); -be_define_const_str(button_pressed, "button_pressed", 1694209616u, 0, 14, &be_const_str_editable); -be_define_const_str(byte, "byte", 1683620383u, 0, 4, &be_const_str_set_timeouts); -be_define_const_str(bytes, "bytes", 1706151940u, 0, 5, &be_const_str_read); -be_define_const_str(c, "c", 3859557458u, 0, 1, &be_const_str_state); -be_define_const_str(call, "call", 3018949801u, 0, 4, &be_const_str_get_coords); -be_define_const_str(call_native, "call_native", 1389147405u, 0, 11, &be_const_str_read8); -be_define_const_str(calldepth, "calldepth", 3122364302u, 0, 9, &be_const_str__X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D); -be_define_const_str(can_show, "can_show", 960091187u, 0, 8, &be_const_str_month); -be_define_const_str(cb, "cb", 1428787088u, 0, 2, &be_const_str_get_bat_voltage); -be_define_const_str(cb_do_nothing, "cb_do_nothing", 1488730702u, 0, 13, &be_const_str_contains); -be_define_const_str(cb_event_closure, "cb_event_closure", 3828267325u, 0, 16, &be_const_str_onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20change_X20the_X20current_X20configuration_X20and_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E); -be_define_const_str(cb_obj, "cb_obj", 1195696482u, 0, 6, NULL); -be_define_const_str(ceil, "ceil", 1659167240u, 0, 4, NULL); -be_define_const_str(char, "char", 2823553821u, 0, 4, &be_const_str_every_50ms); -be_define_const_str(chars_in_string, "chars_in_string", 3148785132u, 0, 15, &be_const_str_draw_line_dsc); -be_define_const_str(check_privileged_access, "check_privileged_access", 3692933968u, 0, 23, &be_const_str_solidified); +be_define_const_str(bri, "bri", 2112284244u, 0, 3, NULL); +be_define_const_str(bus, "bus", 1607822841u, 0, 3, &be_const_str_issubclass); +be_define_const_str(button_pressed, "button_pressed", 1694209616u, 0, 14, &be_const_str_set_light); +be_define_const_str(byte, "byte", 1683620383u, 0, 4, &be_const_str_log); +be_define_const_str(bytes, "bytes", 1706151940u, 0, 5, &be_const_str_pc_rel); +be_define_const_str(c, "c", 3859557458u, 0, 1, &be_const_str_log10); +be_define_const_str(call, "call", 3018949801u, 0, 4, &be_const_str_energy_struct); +be_define_const_str(call_native, "call_native", 1389147405u, 0, 11, &be_const_str_strptime); +be_define_const_str(calldepth, "calldepth", 3122364302u, 0, 9, NULL); +be_define_const_str(can_show, "can_show", 960091187u, 0, 8, &be_const_str_out_X20of_X20range); +be_define_const_str(cb, "cb", 1428787088u, 0, 2, NULL); +be_define_const_str(cb_do_nothing, "cb_do_nothing", 1488730702u, 0, 13, &be_const_str_range); +be_define_const_str(cb_event_closure, "cb_event_closure", 3828267325u, 0, 16, &be_const_str_get_warning_level); +be_define_const_str(cb_obj, "cb_obj", 1195696482u, 0, 6, &be_const_str_count); +be_define_const_str(ceil, "ceil", 1659167240u, 0, 4, &be_const_str_height_def); +be_define_const_str(char, "char", 2823553821u, 0, 4, NULL); +be_define_const_str(chars_in_string, "chars_in_string", 3148785132u, 0, 15, &be_const_str_listdir); +be_define_const_str(check_privileged_access, "check_privileged_access", 3692933968u, 0, 23, &be_const_str_run_deferred); be_define_const_str(class, "class", 2872970239u, 57, 5, NULL); -be_define_const_str(class_init_obj, "class_init_obj", 178410604u, 0, 14, NULL); -be_define_const_str(classname, "classname", 1998589948u, 0, 9, NULL); -be_define_const_str(classof, "classof", 1796577762u, 0, 7, &be_const_str_gamma); +be_define_const_str(class_init_obj, "class_init_obj", 178410604u, 0, 14, &be_const_str_compile); +be_define_const_str(classname, "classname", 1998589948u, 0, 9, &be_const_str_destructor_cb); +be_define_const_str(classof, "classof", 1796577762u, 0, 7, &be_const_str_line_dsc); be_define_const_str(clear, "clear", 1550717474u, 0, 5, NULL); -be_define_const_str(clear_first_time, "clear_first_time", 632769909u, 0, 16, &be_const_str_get_power); -be_define_const_str(clear_to, "clear_to", 3528002130u, 0, 8, &be_const_str_tanh); -be_define_const_str(close, "close", 667630371u, 0, 5, &be_const_str_write_bit); -be_define_const_str(closure, "closure", 1548407746u, 0, 7, &be_const_str_cmd); -be_define_const_str(cmd, "cmd", 4136785899u, 0, 3, &be_const_str_get_switch); +be_define_const_str(clear_first_time, "clear_first_time", 632769909u, 0, 16, &be_const_str_url_encode); +be_define_const_str(clear_to, "clear_to", 3528002130u, 0, 8, &be_const_str_try); +be_define_const_str(close, "close", 667630371u, 0, 5, &be_const_str_set_style_bg_color); +be_define_const_str(closure, "closure", 1548407746u, 0, 7, &be_const_str_eth); +be_define_const_str(cmd, "cmd", 4136785899u, 0, 3, &be_const_str_get); be_define_const_str(cmd_res, "cmd_res", 921166762u, 0, 7, NULL); -be_define_const_str(code, "code", 4180765940u, 0, 4, &be_const_str_group_def); -be_define_const_str(codedump, "codedump", 1786337906u, 0, 8, &be_const_str_members); -be_define_const_str(collect, "collect", 2399039025u, 0, 7, &be_const_str_file); -be_define_const_str(color, "color", 1031692888u, 0, 5, &be_const_str_get_width); -be_define_const_str(compile, "compile", 1000265118u, 0, 7, &be_const_str_ctypes_bytes); -be_define_const_str(compress, "compress", 2818084237u, 0, 8, &be_const_str_find_op); -be_define_const_str(concat, "concat", 4124019837u, 0, 6, &be_const_str_widget_dtor_impl); -be_define_const_str(connect, "connect", 2866859257u, 0, 7, &be_const_str_stop); -be_define_const_str(connected, "connected", 1424938192u, 0, 9, &be_const_str_obj_event_base); -be_define_const_str(connection_error, "connection_error", 1358926260u, 0, 16, &be_const_str_wifi); -be_define_const_str(constructor_cb, "constructor_cb", 2489105297u, 0, 14, &be_const_str_round_start); -be_define_const_str(contains, "contains", 1825239352u, 0, 8, &be_const_str_deinit); -be_define_const_str(content_button, "content_button", 1956476087u, 0, 14, &be_const_str_write); -be_define_const_str(content_flush, "content_flush", 214922475u, 0, 13, NULL); +be_define_const_str(code, "code", 4180765940u, 0, 4, &be_const_str_fromstring); +be_define_const_str(codedump, "codedump", 1786337906u, 0, 8, &be_const_str_top); +be_define_const_str(collect, "collect", 2399039025u, 0, 7, &be_const_str_json_fdump_list); +be_define_const_str(color, "color", 1031692888u, 0, 5, &be_const_str_del); +be_define_const_str(compile, "compile", 1000265118u, 0, 7, &be_const_str_skip); +be_define_const_str(compress, "compress", 2818084237u, 0, 8, &be_const_str_width_def); +be_define_const_str(concat, "concat", 4124019837u, 0, 6, &be_const_str_get_tasmota); +be_define_const_str(connect, "connect", 2866859257u, 0, 7, &be_const_str_resolvecmnd); +be_define_const_str(connected, "connected", 1424938192u, 0, 9, &be_const_str_exp); +be_define_const_str(connection_error, "connection_error", 1358926260u, 0, 16, &be_const_str_tanh); +be_define_const_str(constructor_cb, "constructor_cb", 2489105297u, 0, 14, NULL); +be_define_const_str(contains, "contains", 1825239352u, 0, 8, &be_const_str_set_x); +be_define_const_str(content_button, "content_button", 1956476087u, 0, 14, NULL); +be_define_const_str(content_flush, "content_flush", 214922475u, 0, 13, &be_const_str_engine); be_define_const_str(content_send, "content_send", 1673733649u, 0, 12, NULL); -be_define_const_str(content_send_style, "content_send_style", 1087907647u, 0, 18, &be_const_str_is_dirty); -be_define_const_str(content_start, "content_start", 2937509069u, 0, 13, NULL); -be_define_const_str(content_stop, "content_stop", 658554751u, 0, 12, &be_const_str_line_dsc); -be_define_const_str(continue, "continue", 2977070660u, 59, 8, NULL); -be_define_const_str(copy, "copy", 3848464964u, 0, 4, &be_const_str_rad); -be_define_const_str(cos, "cos", 4220379804u, 0, 3, &be_const_str_start); -be_define_const_str(cosh, "cosh", 4099687964u, 0, 4, &be_const_str_h); -be_define_const_str(couldn_X27t_X20not_X20initialize_X20noepixelbus, "couldn't not initialize noepixelbus", 2536490812u, 0, 35, NULL); -be_define_const_str(count, "count", 967958004u, 0, 5, &be_const_str_web_add_console_button); -be_define_const_str(counters, "counters", 4095866864u, 0, 8, &be_const_str_save); -be_define_const_str(create_custom_widget, "create_custom_widget", 1140594778u, 0, 20, &be_const_str_quality); -be_define_const_str(create_matrix, "create_matrix", 3528185923u, 0, 13, &be_const_str_y1); -be_define_const_str(create_segment, "create_segment", 3863522719u, 0, 14, &be_const_str_open); -be_define_const_str(ctor, "ctor", 375399343u, 0, 4, &be_const_str_push); -be_define_const_str(ctypes_bytes, "ctypes_bytes", 3879019703u, 0, 12, NULL); -be_define_const_str(ctypes_bytes_dyn, "ctypes_bytes_dyn", 915205307u, 0, 16, &be_const_str_reapply); -be_define_const_str(dac_voltage, "dac_voltage", 1552257222u, 0, 11, &be_const_str_time_reached); -be_define_const_str(day, "day", 3830391293u, 0, 3, &be_const_str_every_100ms); -be_define_const_str(debug, "debug", 1483009432u, 0, 5, &be_const_str_exec_rules); -be_define_const_str(decompress, "decompress", 2887031650u, 0, 10, NULL); -be_define_const_str(decrypt, "decrypt", 2886974618u, 0, 7, NULL); +be_define_const_str(content_send_style, "content_send_style", 1087907647u, 0, 18, &be_const_str_tolower); +be_define_const_str(content_start, "content_start", 2937509069u, 0, 13, &be_const_str_get_bri); +be_define_const_str(content_stop, "content_stop", 658554751u, 0, 12, &be_const_str_widget_destructor); +be_define_const_str(continue, "continue", 2977070660u, 59, 8, &be_const_str_if); +be_define_const_str(copy, "copy", 3848464964u, 0, 4, &be_const_str_def); +be_define_const_str(cos, "cos", 4220379804u, 0, 3, &be_const_str_detected_X20on_X20bus); +be_define_const_str(cosh, "cosh", 4099687964u, 0, 4, NULL); +be_define_const_str(couldn_X27t_X20not_X20initialize_X20noepixelbus, "couldn't not initialize noepixelbus", 2536490812u, 0, 35, &be_const_str_delay); +be_define_const_str(count, "count", 967958004u, 0, 5, NULL); +be_define_const_str(counters, "counters", 4095866864u, 0, 8, &be_const_str_set_ldo_voltage); +be_define_const_str(create_custom_widget, "create_custom_widget", 1140594778u, 0, 20, &be_const_str_get_switch); +be_define_const_str(create_matrix, "create_matrix", 3528185923u, 0, 13, NULL); +be_define_const_str(create_segment, "create_segment", 3863522719u, 0, 14, &be_const_str_v); +be_define_const_str(ctor, "ctor", 375399343u, 0, 4, &be_const_str_floor); +be_define_const_str(ctypes_bytes, "ctypes_bytes", 3879019703u, 0, 12, &be_const_str_widget_event_impl); +be_define_const_str(ctypes_bytes_dyn, "ctypes_bytes_dyn", 915205307u, 0, 16, &be_const_str_set_text); +be_define_const_str(dac_voltage, "dac_voltage", 1552257222u, 0, 11, &be_const_str_set_alternate); +be_define_const_str(day, "day", 3830391293u, 0, 3, &be_const_str_event); +be_define_const_str(debug, "debug", 1483009432u, 0, 5, &be_const_str_number); +be_define_const_str(decompress, "decompress", 2887031650u, 0, 10, &be_const_str_get_temp); +be_define_const_str(decrypt, "decrypt", 2886974618u, 0, 7, &be_const_str_set_matrix_pixel_color); be_define_const_str(def, "def", 3310976652u, 55, 3, NULL); -be_define_const_str(deg, "deg", 3327754271u, 0, 3, NULL); -be_define_const_str(deinit, "deinit", 2345559592u, 0, 6, NULL); +be_define_const_str(deg, "deg", 3327754271u, 0, 3, &be_const_str_dump); +be_define_const_str(deinit, "deinit", 2345559592u, 0, 6, &be_const_str_tomap); be_define_const_str(del, "del", 3478752842u, 0, 3, NULL); -be_define_const_str(delay, "delay", 1322381784u, 0, 5, &be_const_str_run_deferred); -be_define_const_str(delete_all_configs, "delete_all_configs", 2382067578u, 0, 18, &be_const_str_wire1); -be_define_const_str(depower, "depower", 3563819571u, 0, 7, &be_const_str_get_bat_charge_current); -be_define_const_str(deregister_obj, "deregister_obj", 3909966993u, 0, 14, &be_const_str_get_alternate); -be_define_const_str(destructor_cb, "destructor_cb", 1930283190u, 0, 13, &be_const_str_p2); -be_define_const_str(detect, "detect", 8884370u, 0, 6, NULL); -be_define_const_str(detected_X20on_X20bus, "detected on bus", 1432002650u, 0, 15, &be_const_str_run); -be_define_const_str(digital_read, "digital_read", 3585496928u, 0, 12, NULL); -be_define_const_str(digital_write, "digital_write", 3435877979u, 0, 13, &be_const_str_gamma8); -be_define_const_str(dirty, "dirty", 2667581083u, 0, 5, &be_const_str_pop_path); -be_define_const_str(display, "display", 1164572437u, 0, 7, &be_const_str_finish); +be_define_const_str(delay, "delay", 1322381784u, 0, 5, &be_const_str_instance); +be_define_const_str(delete_all_configs, "delete_all_configs", 2382067578u, 0, 18, NULL); +be_define_const_str(depower, "depower", 3563819571u, 0, 7, &be_const_str_flush); +be_define_const_str(deregister_obj, "deregister_obj", 3909966993u, 0, 14, NULL); +be_define_const_str(destructor_cb, "destructor_cb", 1930283190u, 0, 13, &be_const_str_event_send); +be_define_const_str(detect, "detect", 8884370u, 0, 6, &be_const_str_run); +be_define_const_str(detected_X20on_X20bus, "detected on bus", 1432002650u, 0, 15, NULL); +be_define_const_str(digital_read, "digital_read", 3585496928u, 0, 12, &be_const_str_json_fdump); +be_define_const_str(digital_write, "digital_write", 3435877979u, 0, 13, NULL); +be_define_const_str(dirty, "dirty", 2667581083u, 0, 5, NULL); +be_define_const_str(display, "display", 1164572437u, 0, 7, &be_const_str_obj_event_base); be_define_const_str(display_X2Eini, "display.ini", 2646174001u, 0, 11, NULL); be_define_const_str(do, "do", 1646057492u, 65, 2, NULL); -be_define_const_str(draw_arc, "draw_arc", 1828251676u, 0, 8, &be_const_str_hour); -be_define_const_str(draw_line, "draw_line", 1634465686u, 0, 9, NULL); -be_define_const_str(draw_line_dsc, "draw_line_dsc", 4220676203u, 0, 13, &be_const_str_widget_instance_size); -be_define_const_str(draw_line_dsc_init, "draw_line_dsc_init", 3866693646u, 0, 18, NULL); -be_define_const_str(due, "due", 3895530293u, 0, 3, NULL); +be_define_const_str(draw_arc, "draw_arc", 1828251676u, 0, 8, &be_const_str_p1); +be_define_const_str(draw_line, "draw_line", 1634465686u, 0, 9, &be_const_str_set_dc_voltage); +be_define_const_str(draw_line_dsc, "draw_line_dsc", 4220676203u, 0, 13, &be_const_str_fromb64); +be_define_const_str(draw_line_dsc_init, "draw_line_dsc_init", 3866693646u, 0, 18, &be_const_str_length_X20in_X20bits_X20must_X20be_X20between_X200_X20and_X2032); +be_define_const_str(due, "due", 3895530293u, 0, 3, &be_const_str_erase); be_define_const_str(dump, "dump", 3663001223u, 0, 4, NULL); -be_define_const_str(duration, "duration", 799079693u, 0, 8, &be_const_str_rotate); -be_define_const_str(editable, "editable", 60532369u, 0, 8, &be_const_str_kv); +be_define_const_str(duration, "duration", 799079693u, 0, 8, &be_const_str_f); +be_define_const_str(editable, "editable", 60532369u, 0, 8, &be_const_str_get_power); be_define_const_str(elif, "elif", 3232090307u, 51, 4, NULL); be_define_const_str(else, "else", 3183434736u, 52, 4, NULL); -be_define_const_str(enabled, "enabled", 49525662u, 0, 7, &be_const_str_write_file); -be_define_const_str(encrypt, "encrypt", 2194327650u, 0, 7, &be_const_str_static); -be_define_const_str(end, "end", 1787721130u, 56, 3, &be_const_str_try); +be_define_const_str(enabled, "enabled", 49525662u, 0, 7, &be_const_str_pin_mode); +be_define_const_str(encrypt, "encrypt", 2194327650u, 0, 7, &be_const_str_finish); +be_define_const_str(end, "end", 1787721130u, 56, 3, NULL); be_define_const_str(energy_struct, "energy_struct", 1655792843u, 0, 13, NULL); -be_define_const_str(engine, "engine", 3993360443u, 0, 6, &be_const_str_widget_destructor); -be_define_const_str(erase, "erase", 1010949589u, 0, 5, &be_const_str_tolower); -be_define_const_str(escape, "escape", 2652972038u, 0, 6, &be_const_str_hex); -be_define_const_str(eth, "eth", 2191266556u, 0, 3, NULL); -be_define_const_str(event, "event", 4264611999u, 0, 5, &be_const_str_set_width); -be_define_const_str(event_cb, "event_cb", 3128698017u, 0, 8, &be_const_str_height_def); -be_define_const_str(event_send, "event_send", 598925582u, 0, 10, &be_const_str_gamma10); -be_define_const_str(every_100ms, "every_100ms", 1546407804u, 0, 11, NULL); -be_define_const_str(every_50ms, "every_50ms", 2383884008u, 0, 10, &be_const_str_page_autoconf_mgr); -be_define_const_str(every_second, "every_second", 2075451465u, 0, 12, &be_const_str_list); +be_define_const_str(engine, "engine", 3993360443u, 0, 6, &be_const_str_getbits); +be_define_const_str(erase, "erase", 1010949589u, 0, 5, &be_const_str_class); +be_define_const_str(escape, "escape", 2652972038u, 0, 6, NULL); +be_define_const_str(eth, "eth", 2191266556u, 0, 3, &be_const_str_widget_constructor); +be_define_const_str(event, "event", 4264611999u, 0, 5, &be_const_str_resp_cmnd_error); +be_define_const_str(event_cb, "event_cb", 3128698017u, 0, 8, NULL); +be_define_const_str(event_send, "event_send", 598925582u, 0, 10, &be_const_str_name); +be_define_const_str(every_100ms, "every_100ms", 1546407804u, 0, 11, &be_const_str_zip); +be_define_const_str(every_50ms, "every_50ms", 2383884008u, 0, 10, &be_const_str_size); +be_define_const_str(every_second, "every_second", 2075451465u, 0, 12, NULL); be_define_const_str(except, "except", 950914032u, 69, 6, NULL); -be_define_const_str(exec_cmd, "exec_cmd", 493567399u, 0, 8, &be_const_str_light); -be_define_const_str(exec_rules, "exec_rules", 1445221092u, 0, 10, &be_const_str_reverse); -be_define_const_str(exec_tele, "exec_tele", 1020751601u, 0, 9, &be_const_str_has); -be_define_const_str(exists, "exists", 1002329533u, 0, 6, &be_const_str_setbits); -be_define_const_str(exp, "exp", 1923516200u, 0, 3, &be_const_str_tasmota); -be_define_const_str(f, "f", 3809224601u, 0, 1, &be_const_str_input); +be_define_const_str(exec_cmd, "exec_cmd", 493567399u, 0, 8, &be_const_str_hour); +be_define_const_str(exec_rules, "exec_rules", 1445221092u, 0, 10, &be_const_str_find); +be_define_const_str(exec_tele, "exec_tele", 1020751601u, 0, 9, &be_const_str_widget_height_def); +be_define_const_str(exists, "exists", 1002329533u, 0, 6, &be_const_str_tostring); +be_define_const_str(exp, "exp", 1923516200u, 0, 3, NULL); +be_define_const_str(f, "f", 3809224601u, 0, 1, &be_const_str_function); be_define_const_str(false, "false", 184981848u, 62, 5, NULL); be_define_const_str(file, "file", 2867484483u, 0, 4, NULL); -be_define_const_str(file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27, "file extension is not '.be' or '.bec'", 3095719639u, 0, 37, NULL); -be_define_const_str(files, "files", 1055342736u, 0, 5, &be_const_str_param); -be_define_const_str(find, "find", 3186656602u, 0, 4, NULL); -be_define_const_str(find_key_i, "find_key_i", 850136726u, 0, 10, &be_const_str_pin); -be_define_const_str(find_op, "find_op", 3766713376u, 0, 7, NULL); +be_define_const_str(file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27, "file extension is not '.be' or '.bec'", 3095719639u, 0, 37, &be_const_str_strip); +be_define_const_str(files, "files", 1055342736u, 0, 5, &be_const_str_get_coords); +be_define_const_str(find, "find", 3186656602u, 0, 4, &be_const_str_hex); +be_define_const_str(find_key_i, "find_key_i", 850136726u, 0, 10, NULL); +be_define_const_str(find_op, "find_op", 3766713376u, 0, 7, &be_const_str_memory); be_define_const_str(finish, "finish", 1494643858u, 0, 6, NULL); -be_define_const_str(floor, "floor", 3102149661u, 0, 5, &be_const_str_local); +be_define_const_str(floor, "floor", 3102149661u, 0, 5, NULL); be_define_const_str(flush, "flush", 3002334877u, 0, 5, NULL); be_define_const_str(for, "for", 2901640080u, 54, 3, NULL); -be_define_const_str(format, "format", 3114108242u, 0, 6, &be_const_str_memory); -be_define_const_str(from_to, "from_to", 21625507u, 0, 7, &be_const_str_load); -be_define_const_str(fromb64, "fromb64", 2717019639u, 0, 7, NULL); +be_define_const_str(format, "format", 3114108242u, 0, 6, &be_const_str_offset); +be_define_const_str(from_to, "from_to", 21625507u, 0, 7, &be_const_str_json); +be_define_const_str(fromb64, "fromb64", 2717019639u, 0, 7, &be_const_str_r); be_define_const_str(fromptr, "fromptr", 666189689u, 0, 7, NULL); -be_define_const_str(fromstring, "fromstring", 610302344u, 0, 10, &be_const_str_get_input_power_status); -be_define_const_str(function, "function", 2664841801u, 0, 8, &be_const_str_tostring); -be_define_const_str(gamma, "gamma", 3492353034u, 0, 5, &be_const_str_widget_struct_default); -be_define_const_str(gamma10, "gamma10", 3472052483u, 0, 7, &be_const_str_get_free_heap); -be_define_const_str(gamma8, "gamma8", 3802843830u, 0, 6, &be_const_str_resp_cmnd); -be_define_const_str(gc, "gc", 1042313471u, 0, 2, NULL); -be_define_const_str(gen_cb, "gen_cb", 3245227551u, 0, 6, NULL); -be_define_const_str(get, "get", 1410115415u, 0, 3, &be_const_str__X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_XB0C_X7Be_X7D); -be_define_const_str(get_alternate, "get_alternate", 1450148894u, 0, 13, NULL); -be_define_const_str(get_aps_voltage, "get_aps_voltage", 2293036435u, 0, 15, NULL); -be_define_const_str(get_bat_charge_current, "get_bat_charge_current", 1385293050u, 0, 22, &be_const_str_pi); -be_define_const_str(get_bat_current, "get_bat_current", 1912106073u, 0, 15, NULL); -be_define_const_str(get_bat_power, "get_bat_power", 3067374853u, 0, 13, &be_const_str_ins_time); +be_define_const_str(fromstring, "fromstring", 610302344u, 0, 10, NULL); +be_define_const_str(function, "function", 2664841801u, 0, 8, &be_const_str_get_bat_power); +be_define_const_str(gamma, "gamma", 3492353034u, 0, 5, &be_const_str_string); +be_define_const_str(gamma10, "gamma10", 3472052483u, 0, 7, NULL); +be_define_const_str(gamma8, "gamma8", 3802843830u, 0, 6, &be_const_str_else); +be_define_const_str(gc, "gc", 1042313471u, 0, 2, &be_const_str_remove_timer); +be_define_const_str(gen_cb, "gen_cb", 3245227551u, 0, 6, &be_const_str_pixels_buffer); +be_define_const_str(get, "get", 1410115415u, 0, 3, &be_const_str_sqrt); +be_define_const_str(get_alternate, "get_alternate", 1450148894u, 0, 13, &be_const_str_readbytes); +be_define_const_str(get_aps_voltage, "get_aps_voltage", 2293036435u, 0, 15, &be_const_str_traceback); +be_define_const_str(get_bat_charge_current, "get_bat_charge_current", 1385293050u, 0, 22, &be_const_str_get_style_pad_right); +be_define_const_str(get_bat_current, "get_bat_current", 1912106073u, 0, 15, &be_const_str_leds); +be_define_const_str(get_bat_power, "get_bat_power", 3067374853u, 0, 13, &be_const_str_init); be_define_const_str(get_bat_voltage, "get_bat_voltage", 706676538u, 0, 15, NULL); be_define_const_str(get_battery_chargin_status, "get_battery_chargin_status", 2233241571u, 0, 26, NULL); -be_define_const_str(get_bri, "get_bri", 2041809895u, 0, 7, &be_const_str_page_autoconf_ctl); -be_define_const_str(get_cb_list, "get_cb_list", 1605319182u, 0, 11, &be_const_str_offset); -be_define_const_str(get_coords, "get_coords", 1044089006u, 0, 10, &be_const_str_upper); -be_define_const_str(get_current_module_name, "get_current_module_name", 2379270740u, 0, 23, NULL); -be_define_const_str(get_current_module_path, "get_current_module_path", 3206673408u, 0, 23, NULL); -be_define_const_str(get_free_heap, "get_free_heap", 625069757u, 0, 13, &be_const_str_no_X20GPIO_X20specified_X20for_X20neopixelbus); -be_define_const_str(get_height, "get_height", 3571755523u, 0, 10, &be_const_str_obj_class_create_obj); -be_define_const_str(get_input_power_status, "get_input_power_status", 4102829177u, 0, 22, &be_const_str_get_style_bg_color); -be_define_const_str(get_light, "get_light", 381930476u, 0, 9, &be_const_str_unknown_X20instruction); -be_define_const_str(get_object_from_ptr, "get_object_from_ptr", 2345019201u, 0, 19, NULL); +be_define_const_str(get_bri, "get_bri", 2041809895u, 0, 7, NULL); +be_define_const_str(get_cb_list, "get_cb_list", 1605319182u, 0, 11, &be_const_str_pi); +be_define_const_str(get_coords, "get_coords", 1044089006u, 0, 10, NULL); +be_define_const_str(get_current_module_name, "get_current_module_name", 2379270740u, 0, 23, &be_const_str_isinstance); +be_define_const_str(get_current_module_path, "get_current_module_path", 3206673408u, 0, 23, &be_const_str_matrix); +be_define_const_str(get_free_heap, "get_free_heap", 625069757u, 0, 13, NULL); +be_define_const_str(get_height, "get_height", 3571755523u, 0, 10, &be_const_str_get_vbus_voltage); +be_define_const_str(get_input_power_status, "get_input_power_status", 4102829177u, 0, 22, &be_const_str_value_error); +be_define_const_str(get_light, "get_light", 381930476u, 0, 9, NULL); +be_define_const_str(get_object_from_ptr, "get_object_from_ptr", 2345019201u, 0, 19, &be_const_str__X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D); be_define_const_str(get_option, "get_option", 2123730033u, 0, 10, NULL); -be_define_const_str(get_percentage, "get_percentage", 2880483992u, 0, 14, NULL); +be_define_const_str(get_percentage, "get_percentage", 2880483992u, 0, 14, &be_const_str_global); be_define_const_str(get_pixel_color, "get_pixel_color", 337490048u, 0, 15, NULL); -be_define_const_str(get_power, "get_power", 3009799377u, 0, 9, NULL); -be_define_const_str(get_size, "get_size", 2803644713u, 0, 8, &be_const_str_tomap); -be_define_const_str(get_string, "get_string", 4195847969u, 0, 10, &be_const_str_remove_driver); -be_define_const_str(get_style_bg_color, "get_style_bg_color", 964794381u, 0, 18, &be_const_str_number); -be_define_const_str(get_style_line_color, "get_style_line_color", 805371932u, 0, 20, &be_const_str_ins_ramp); +be_define_const_str(get_power, "get_power", 3009799377u, 0, 9, &be_const_str_set_time); +be_define_const_str(get_size, "get_size", 2803644713u, 0, 8, NULL); +be_define_const_str(get_string, "get_string", 4195847969u, 0, 10, NULL); +be_define_const_str(get_style_bg_color, "get_style_bg_color", 964794381u, 0, 18, NULL); +be_define_const_str(get_style_line_color, "get_style_line_color", 805371932u, 0, 20, &be_const_str_ip); be_define_const_str(get_style_pad_right, "get_style_pad_right", 3150287466u, 0, 19, NULL); -be_define_const_str(get_switch, "get_switch", 164821028u, 0, 10, &be_const_str_set_y); -be_define_const_str(get_tasmota, "get_tasmota", 334356779u, 0, 11, &be_const_str_imax); +be_define_const_str(get_switch, "get_switch", 164821028u, 0, 10, &be_const_str_init_draw_line_dsc); +be_define_const_str(get_tasmota, "get_tasmota", 334356779u, 0, 11, NULL); be_define_const_str(get_temp, "get_temp", 3370919486u, 0, 8, NULL); -be_define_const_str(get_vbus_current, "get_vbus_current", 1205347942u, 0, 16, &be_const_str_tele); -be_define_const_str(get_vbus_voltage, "get_vbus_voltage", 2398210401u, 0, 16, &be_const_str_toupper); +be_define_const_str(get_vbus_current, "get_vbus_current", 1205347942u, 0, 16, &be_const_str_rotate); +be_define_const_str(get_vbus_voltage, "get_vbus_voltage", 2398210401u, 0, 16, NULL); be_define_const_str(get_warning_level, "get_warning_level", 1737834441u, 0, 17, NULL); -be_define_const_str(get_width, "get_width", 3293417300u, 0, 9, &be_const_str_readbytes); -be_define_const_str(getbits, "getbits", 3094168979u, 0, 7, &be_const_str_has_arg); -be_define_const_str(geti, "geti", 2381006490u, 0, 4, NULL); -be_define_const_str(global, "global", 503252654u, 0, 6, NULL); -be_define_const_str(gpio, "gpio", 2638155258u, 0, 4, &be_const_str_strptime); -be_define_const_str(group_def, "group_def", 1524213328u, 0, 9, NULL); -be_define_const_str(h, "h", 3977000791u, 0, 1, &be_const_str_init); -be_define_const_str(has, "has", 3988721635u, 0, 3, &be_const_str_pow); -be_define_const_str(has_arg, "has_arg", 424878688u, 0, 7, &be_const_str__X7D); -be_define_const_str(height_def, "height_def", 2348238838u, 0, 10, &be_const_str_set_height); -be_define_const_str(hex, "hex", 4273249610u, 0, 3, &be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_manifest_X2Ejson); -be_define_const_str(hour, "hour", 3053661199u, 0, 4, &be_const_str_pixel_count); -be_define_const_str(hs2rgb, "hs2rgb", 1040816349u, 0, 6, &be_const_str_path); -be_define_const_str(https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_X2F_X25s_X2Eautoconf, "https://raw.githubusercontent.com/tasmota/autoconf/main/%s/%s.autoconf", 2743526309u, 0, 70, &be_const_str_pc_abs); -be_define_const_str(https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_manifest_X2Ejson, "https://raw.githubusercontent.com/tasmota/autoconf/main/%s_manifest.json", 3657552045u, 0, 72, &be_const_str_int); -be_define_const_str(i2c_enabled, "i2c_enabled", 218388101u, 0, 11, NULL); -be_define_const_str(id, "id", 926444256u, 0, 2, &be_const_str_x); +be_define_const_str(get_width, "get_width", 3293417300u, 0, 9, &be_const_str_scan); +be_define_const_str(getbits, "getbits", 3094168979u, 0, 7, NULL); +be_define_const_str(geti, "geti", 2381006490u, 0, 4, &be_const_str_id); +be_define_const_str(global, "global", 503252654u, 0, 6, &be_const_str_members); +be_define_const_str(gpio, "gpio", 2638155258u, 0, 4, NULL); +be_define_const_str(group_def, "group_def", 1524213328u, 0, 9, &be_const_str_isnan); +be_define_const_str(h, "h", 3977000791u, 0, 1, &be_const_str_response_append); +be_define_const_str(has, "has", 3988721635u, 0, 3, NULL); +be_define_const_str(has_arg, "has_arg", 424878688u, 0, 7, NULL); +be_define_const_str(height_def, "height_def", 2348238838u, 0, 10, NULL); +be_define_const_str(hex, "hex", 4273249610u, 0, 3, &be_const_str_set_auth); +be_define_const_str(hour, "hour", 3053661199u, 0, 4, &be_const_str_search); +be_define_const_str(hs2rgb, "hs2rgb", 1040816349u, 0, 6, NULL); +be_define_const_str(https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_X2F_X25s_X2Eautoconf, "https://raw.githubusercontent.com/tasmota/autoconf/main/%s/%s.autoconf", 2743526309u, 0, 70, &be_const_str_reverse); +be_define_const_str(https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_manifest_X2Ejson, "https://raw.githubusercontent.com/tasmota/autoconf/main/%s_manifest.json", 3657552045u, 0, 72, &be_const_str_return); +be_define_const_str(i2c_enabled, "i2c_enabled", 218388101u, 0, 11, &be_const_str_light); +be_define_const_str(id, "id", 926444256u, 0, 2, &be_const_str_web_add_handler); be_define_const_str(if, "if", 959999494u, 50, 2, NULL); -be_define_const_str(imax, "imax", 3084515410u, 0, 4, &be_const_str_resize); +be_define_const_str(imax, "imax", 3084515410u, 0, 4, &be_const_str_continue); be_define_const_str(imin, "imin", 2714127864u, 0, 4, NULL); be_define_const_str(import, "import", 288002260u, 66, 6, NULL); -be_define_const_str(init, "init", 380752755u, 0, 4, &be_const_str_pc_rel); -be_define_const_str(init_draw_line_dsc, "init_draw_line_dsc", 2507936040u, 0, 18, NULL); -be_define_const_str(input, "input", 4191711099u, 0, 5, &be_const_str_reset); -be_define_const_str(ins_goto, "ins_goto", 1342843963u, 0, 8, NULL); -be_define_const_str(ins_ramp, "ins_ramp", 1068049360u, 0, 8, &be_const_str_stop_iteration); -be_define_const_str(ins_time, "ins_time", 2980245553u, 0, 8, NULL); -be_define_const_str(insert, "insert", 3332609576u, 0, 6, &be_const_str_lvgl_event_dispatch); -be_define_const_str(instance, "instance", 193386898u, 0, 8, &be_const_str_set_matrix_pixel_color); -be_define_const_str(instance_size, "instance_size", 4280269518u, 0, 13, NULL); -be_define_const_str(int, "int", 2515107422u, 0, 3, &be_const_str_set_style_text_font); -be_define_const_str(internal_error, "internal_error", 2519158169u, 0, 14, &be_const_str_width_def); -be_define_const_str(introspect, "introspect", 164638290u, 0, 10, &be_const_str_preinit); -be_define_const_str(invalidate, "invalidate", 2649734928u, 0, 10, NULL); -be_define_const_str(io_error, "io_error", 1970281036u, 0, 8, NULL); -be_define_const_str(ip, "ip", 1261996636u, 0, 2, NULL); -be_define_const_str(is_dirty, "is_dirty", 418034110u, 0, 8, &be_const_str_on); -be_define_const_str(is_first_time, "is_first_time", 275242384u, 0, 13, &be_const_str_persist); -be_define_const_str(is_running, "is_running", 2226847261u, 0, 10, &be_const_str__X7B_X7D); -be_define_const_str(isinstance, "isinstance", 3669352738u, 0, 10, &be_const_str_last_modified); -be_define_const_str(isnan, "isnan", 2981347434u, 0, 5, &be_const_str_iter); -be_define_const_str(isrunning, "isrunning", 1688182268u, 0, 9, NULL); -be_define_const_str(issubclass, "issubclass", 4078395519u, 0, 10, &be_const_str_setmember); -be_define_const_str(item, "item", 2671260646u, 0, 4, &be_const_str_json_fdump_any); -be_define_const_str(iter, "iter", 3124256359u, 0, 4, &be_const_str_name); -be_define_const_str(json, "json", 916562499u, 0, 4, NULL); -be_define_const_str(json_append, "json_append", 3002019284u, 0, 11, &be_const_str_import); +be_define_const_str(init, "init", 380752755u, 0, 4, &be_const_str_stop_iteration); +be_define_const_str(init_draw_line_dsc, "init_draw_line_dsc", 2507936040u, 0, 18, &be_const_str_pin); +be_define_const_str(input, "input", 4191711099u, 0, 5, NULL); +be_define_const_str(ins_goto, "ins_goto", 1342843963u, 0, 8, &be_const_str_web_add_config_button); +be_define_const_str(ins_ramp, "ins_ramp", 1068049360u, 0, 8, &be_const_str_web_add_console_button); +be_define_const_str(ins_time, "ins_time", 2980245553u, 0, 8, &be_const_str_member); +be_define_const_str(insert, "insert", 3332609576u, 0, 6, NULL); +be_define_const_str(instance, "instance", 193386898u, 0, 8, &be_const_str_write_gpio); +be_define_const_str(instance_size, "instance_size", 4280269518u, 0, 13, &be_const_str_persist_X2E_p_X20is_X20not_X20a_X20map); +be_define_const_str(int, "int", 2515107422u, 0, 3, &be_const_str_json_append); +be_define_const_str(internal_error, "internal_error", 2519158169u, 0, 14, NULL); +be_define_const_str(introspect, "introspect", 164638290u, 0, 10, &be_const_str_widget_ctor_cb); +be_define_const_str(invalidate, "invalidate", 2649734928u, 0, 10, &be_const_str_onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E); +be_define_const_str(io_error, "io_error", 1970281036u, 0, 8, &be_const_str_pin_used); +be_define_const_str(ip, "ip", 1261996636u, 0, 2, &be_const_str_null_cb); +be_define_const_str(is_dirty, "is_dirty", 418034110u, 0, 8, &be_const_str_w); +be_define_const_str(is_first_time, "is_first_time", 275242384u, 0, 13, NULL); +be_define_const_str(is_running, "is_running", 2226847261u, 0, 10, &be_const_str_round_end); +be_define_const_str(isinstance, "isinstance", 3669352738u, 0, 10, NULL); +be_define_const_str(isnan, "isnan", 2981347434u, 0, 5, &be_const_str_lv_obj_class); +be_define_const_str(isrunning, "isrunning", 1688182268u, 0, 9, &be_const_str_pop); +be_define_const_str(issubclass, "issubclass", 4078395519u, 0, 10, &be_const_str_read_sensors); +be_define_const_str(item, "item", 2671260646u, 0, 4, &be_const_str_seti); +be_define_const_str(iter, "iter", 3124256359u, 0, 4, &be_const_str_keys); +be_define_const_str(json, "json", 916562499u, 0, 4, &be_const_str_y1); +be_define_const_str(json_append, "json_append", 3002019284u, 0, 11, &be_const_str_set_chg_current); be_define_const_str(json_fdump, "json_fdump", 1694216580u, 0, 10, NULL); -be_define_const_str(json_fdump_any, "json_fdump_any", 3348629385u, 0, 14, NULL); -be_define_const_str(json_fdump_list, "json_fdump_list", 3903879853u, 0, 15, &be_const_str_millis); -be_define_const_str(json_fdump_map, "json_fdump_map", 4091954653u, 0, 14, &be_const_str_save_before_restart); -be_define_const_str(k, "k", 3993778410u, 0, 1, &be_const_str_keys); -be_define_const_str(keys, "keys", 4182378701u, 0, 4, &be_const_str_min); -be_define_const_str(kv, "kv", 1497177492u, 0, 2, NULL); -be_define_const_str(last_modified, "last_modified", 772177145u, 0, 13, NULL); -be_define_const_str(leds, "leds", 558858555u, 0, 4, &be_const_str_elif); -be_define_const_str(length_X20in_X20bits_X20must_X20be_X20between_X200_X20and_X2032, "length in bits must be between 0 and 32", 2584509128u, 0, 39, &be_const_str_false); +be_define_const_str(json_fdump_any, "json_fdump_any", 3348629385u, 0, 14, &be_const_str_pixel_count); +be_define_const_str(json_fdump_list, "json_fdump_list", 3903879853u, 0, 15, NULL); +be_define_const_str(json_fdump_map, "json_fdump_map", 4091954653u, 0, 14, &be_const_str_pow); +be_define_const_str(k, "k", 3993778410u, 0, 1, &be_const_str_set_first_time); +be_define_const_str(keys, "keys", 4182378701u, 0, 4, NULL); +be_define_const_str(kv, "kv", 1497177492u, 0, 2, &be_const_str_wire2); +be_define_const_str(last_modified, "last_modified", 772177145u, 0, 13, &be_const_str_p2); +be_define_const_str(leds, "leds", 558858555u, 0, 4, &be_const_str_month); +be_define_const_str(length_X20in_X20bits_X20must_X20be_X20between_X200_X20and_X2032, "length in bits must be between 0 and 32", 2584509128u, 0, 39, &be_const_str_widget_editable); be_define_const_str(light, "light", 3801947695u, 0, 5, NULL); -be_define_const_str(line_dsc, "line_dsc", 4094490978u, 0, 8, &be_const_str_print); +be_define_const_str(line_dsc, "line_dsc", 4094490978u, 0, 8, NULL); be_define_const_str(list, "list", 217798785u, 0, 4, NULL); -be_define_const_str(listdir, "listdir", 2005220720u, 0, 7, NULL); +be_define_const_str(listdir, "listdir", 2005220720u, 0, 7, &be_const_str_round_start); be_define_const_str(load, "load", 3859241449u, 0, 4, NULL); -be_define_const_str(load_templates, "load_templates", 3513870133u, 0, 14, &be_const_str_set_bri); -be_define_const_str(local, "local", 2621662984u, 0, 5, NULL); -be_define_const_str(log, "log", 1062293841u, 0, 3, &be_const_str_the_X20second_X20argument_X20is_X20not_X20a_X20function); -be_define_const_str(log10, "log10", 2346846000u, 0, 5, &be_const_str_web_add_handler); -be_define_const_str(loop, "loop", 3723446379u, 0, 4, &be_const_str_continue); -be_define_const_str(lower, "lower", 3038577850u, 0, 5, &be_const_str_push_path); -be_define_const_str(lv, "lv", 1529997255u, 0, 2, NULL); -be_define_const_str(lv_event, "lv_event", 2434089968u, 0, 8, &be_const_str_set_timer); -be_define_const_str(lv_event_cb, "lv_event_cb", 2480731016u, 0, 11, &be_const_str_try_rule); -be_define_const_str(lv_obj, "lv_obj", 4257833149u, 0, 6, NULL); -be_define_const_str(lv_obj_class, "lv_obj_class", 4039656294u, 0, 12, NULL); -be_define_const_str(lvgl_event_dispatch, "lvgl_event_dispatch", 2104396622u, 0, 19, &be_const_str_rule); +be_define_const_str(load_templates, "load_templates", 3513870133u, 0, 14, NULL); +be_define_const_str(local, "local", 2621662984u, 0, 5, &be_const_str_publish); +be_define_const_str(log, "log", 1062293841u, 0, 3, NULL); +be_define_const_str(log10, "log10", 2346846000u, 0, 5, &be_const_str_web_send); +be_define_const_str(loop, "loop", 3723446379u, 0, 4, NULL); +be_define_const_str(lower, "lower", 3038577850u, 0, 5, &be_const_str_wire); +be_define_const_str(lv, "lv", 1529997255u, 0, 2, &be_const_str_pixel_size); +be_define_const_str(lv_event, "lv_event", 2434089968u, 0, 8, NULL); +be_define_const_str(lv_event_cb, "lv_event_cb", 2480731016u, 0, 11, &be_const_str_set_pixel_color); +be_define_const_str(lv_obj, "lv_obj", 4257833149u, 0, 6, &be_const_str_widget_dtor_cb); +be_define_const_str(lv_obj_class, "lv_obj_class", 4039656294u, 0, 12, &be_const_str_set_style_pad_right); +be_define_const_str(lvgl_event_dispatch, "lvgl_event_dispatch", 2104396622u, 0, 19, &be_const_str_widget_event); be_define_const_str(map, "map", 3751997361u, 0, 3, NULL); -be_define_const_str(math, "math", 4001929615u, 0, 4, &be_const_str_widget_event_cb); -be_define_const_str(matrix, "matrix", 365099244u, 0, 6, &be_const_str_pixels_buffer); -be_define_const_str(member, "member", 719708611u, 0, 6, &be_const_str_web_add_management_button); -be_define_const_str(members, "members", 937576464u, 0, 7, &be_const_str_remove_rule); +be_define_const_str(math, "math", 4001929615u, 0, 4, &be_const_str_as); +be_define_const_str(matrix, "matrix", 365099244u, 0, 6, &be_const_str_nan); +be_define_const_str(member, "member", 719708611u, 0, 6, NULL); +be_define_const_str(members, "members", 937576464u, 0, 7, NULL); be_define_const_str(memory, "memory", 2229924270u, 0, 6, NULL); -be_define_const_str(millis, "millis", 1214679063u, 0, 6, &be_const_str_module); +be_define_const_str(millis, "millis", 1214679063u, 0, 6, NULL); be_define_const_str(min, "min", 3381609815u, 0, 3, NULL); -be_define_const_str(minute, "minute", 954666857u, 0, 6, NULL); -be_define_const_str(module, "module", 3617558685u, 0, 6, &be_const_str_setrange); -be_define_const_str(month, "month", 3598321157u, 0, 5, &be_const_str_web_send); +be_define_const_str(minute, "minute", 954666857u, 0, 6, &be_const_str_strftime); +be_define_const_str(module, "module", 3617558685u, 0, 6, NULL); +be_define_const_str(month, "month", 3598321157u, 0, 5, &be_const_str_solidified); be_define_const_str(name, "name", 2369371622u, 0, 4, NULL); -be_define_const_str(nan, "nan", 797905850u, 0, 3, &be_const_str_size); +be_define_const_str(nan, "nan", 797905850u, 0, 3, &be_const_str_wifi); be_define_const_str(nil, "nil", 228849900u, 63, 3, NULL); -be_define_const_str(no_X20GPIO_X20specified_X20for_X20neopixelbus, "no GPIO specified for neopixelbus", 42078528u, 0, 33, NULL); -be_define_const_str(null_cb, "null_cb", 2333536460u, 0, 7, NULL); -be_define_const_str(number, "number", 467038368u, 0, 6, &be_const_str_range); +be_define_const_str(no_X20GPIO_X20specified_X20for_X20neopixelbus, "no GPIO specified for neopixelbus", 42078528u, 0, 33, &be_const_str_preinit); +be_define_const_str(null_cb, "null_cb", 2333536460u, 0, 7, &be_const_str_save); +be_define_const_str(number, "number", 467038368u, 0, 6, &be_const_str_time_str); be_define_const_str(obj_class_create_obj, "obj_class_create_obj", 3304390632u, 0, 20, NULL); be_define_const_str(obj_event_base, "obj_event_base", 1624064363u, 0, 14, NULL); -be_define_const_str(offset, "offset", 348705738u, 0, 6, &be_const_str_web_add_button); -be_define_const_str(offseta, "offseta", 1663383089u, 0, 7, NULL); -be_define_const_str(on, "on", 1630810064u, 0, 2, &be_const_str_webclient); -be_define_const_str(onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E, "onsubmit='return confirm(\"This will cause a restart.\");'>", 232646018u, 0, 57, &be_const_str_wire2); -be_define_const_str(onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20change_X20the_X20current_X20configuration_X20and_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E, "onsubmit='return confirm(\"This will change the current configuration and cause a restart.\");'>", 3792412559u, 0, 94, &be_const_str_srand); -be_define_const_str(open, "open", 3546203337u, 0, 4, &be_const_str_search); +be_define_const_str(offset, "offset", 348705738u, 0, 6, &be_const_str_on); +be_define_const_str(offseta, "offseta", 1663383089u, 0, 7, &be_const_str_set_style_text_font); +be_define_const_str(on, "on", 1630810064u, 0, 2, NULL); +be_define_const_str(onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E, "onsubmit='return confirm(\"This will cause a restart.\");'>", 232646018u, 0, 57, NULL); +be_define_const_str(onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20change_X20the_X20current_X20configuration_X20and_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E, "onsubmit='return confirm(\"This will change the current configuration and cause a restart.\");'>", 3792412559u, 0, 94, NULL); +be_define_const_str(open, "open", 3546203337u, 0, 4, &be_const_str_resp_cmnd_done); be_define_const_str(out_X20of_X20range, "out of range", 2236631477u, 0, 12, NULL); be_define_const_str(p1, "p1", 2689521274u, 0, 2, NULL); -be_define_const_str(p2, "p2", 2672743655u, 0, 2, &be_const_str_set_alternate); -be_define_const_str(page_autoconf_ctl, "page_autoconf_ctl", 2453381496u, 0, 17, NULL); -be_define_const_str(page_autoconf_mgr, "page_autoconf_mgr", 3643937031u, 0, 17, &be_const_str_write8); -be_define_const_str(param, "param", 1309554226u, 0, 5, &be_const_str_resp_cmnd_error); -be_define_const_str(path, "path", 2223459638u, 0, 4, &be_const_str_real); -be_define_const_str(pc, "pc", 1313756516u, 0, 2, &be_const_str_nil); -be_define_const_str(pc_abs, "pc_abs", 920256495u, 0, 6, &be_const_str_set); -be_define_const_str(pc_rel, "pc_rel", 991921176u, 0, 6, &be_const_str_web_add_config_button); -be_define_const_str(percentage, "percentage", 2538831285u, 0, 10, &be_const_str_tcpclient); -be_define_const_str(persist, "persist", 3917083779u, 0, 7, NULL); -be_define_const_str(persist_X2E_p_X20is_X20not_X20a_X20map, "persist._p is not a map", 1176528732u, 0, 23, NULL); -be_define_const_str(pi, "pi", 1213090802u, 0, 2, NULL); -be_define_const_str(pin, "pin", 1866532500u, 0, 3, NULL); -be_define_const_str(pin_mode, "pin_mode", 3258314030u, 0, 8, &be_const_str_set_ldo_voltage); -be_define_const_str(pin_used, "pin_used", 4033854612u, 0, 8, &be_const_str_set_auth); +be_define_const_str(p2, "p2", 2672743655u, 0, 2, &be_const_str_the_X20second_X20argument_X20is_X20not_X20a_X20function); +be_define_const_str(page_autoconf_ctl, "page_autoconf_ctl", 2453381496u, 0, 17, &be_const_str_pc); +be_define_const_str(page_autoconf_mgr, "page_autoconf_mgr", 3643937031u, 0, 17, &be_const_str_return_X20code_X3D_X25i); +be_define_const_str(param, "param", 1309554226u, 0, 5, &be_const_str_set_style_line_color); +be_define_const_str(path, "path", 2223459638u, 0, 4, &be_const_str_read32); +be_define_const_str(pc, "pc", 1313756516u, 0, 2, NULL); +be_define_const_str(pc_abs, "pc_abs", 920256495u, 0, 6, NULL); +be_define_const_str(pc_rel, "pc_rel", 991921176u, 0, 6, &be_const_str_print); +be_define_const_str(percentage, "percentage", 2538831285u, 0, 10, NULL); +be_define_const_str(persist, "persist", 3917083779u, 0, 7, &be_const_str_serial); +be_define_const_str(persist_X2E_p_X20is_X20not_X20a_X20map, "persist._p is not a map", 1176528732u, 0, 23, &be_const_str_quality); +be_define_const_str(pi, "pi", 1213090802u, 0, 2, &be_const_str_yield); +be_define_const_str(pin, "pin", 1866532500u, 0, 3, &be_const_str_resp_cmnd_failed); +be_define_const_str(pin_mode, "pin_mode", 3258314030u, 0, 8, NULL); +be_define_const_str(pin_used, "pin_used", 4033854612u, 0, 8, NULL); be_define_const_str(pixel_count, "pixel_count", 2439130743u, 0, 11, NULL); be_define_const_str(pixel_size, "pixel_size", 2209135785u, 0, 10, NULL); -be_define_const_str(pixels_buffer, "pixels_buffer", 1229555807u, 0, 13, NULL); +be_define_const_str(pixels_buffer, "pixels_buffer", 1229555807u, 0, 13, &be_const_str_select); be_define_const_str(point, "point", 414084241u, 0, 5, NULL); -be_define_const_str(pop, "pop", 1362321360u, 0, 3, &be_const_str_resp_cmnd_failed); -be_define_const_str(pop_path, "pop_path", 2403243998u, 0, 8, NULL); -be_define_const_str(pow, "pow", 1479764693u, 0, 3, &be_const_str_seg7_font); -be_define_const_str(preinit, "preinit", 2722007100u, 0, 7, &be_const_str_widget_ctor_cb); -be_define_const_str(print, "print", 372738696u, 0, 5, NULL); -be_define_const_str(public_key, "public_key", 4169142980u, 0, 10, &be_const_str_read32); +be_define_const_str(pop, "pop", 1362321360u, 0, 3, NULL); +be_define_const_str(pop_path, "pop_path", 2403243998u, 0, 8, &be_const_str_rand); +be_define_const_str(pow, "pow", 1479764693u, 0, 3, &be_const_str_setbits); +be_define_const_str(preinit, "preinit", 2722007100u, 0, 7, &be_const_str_widget_dtor_impl); +be_define_const_str(print, "print", 372738696u, 0, 5, &be_const_str_save_before_restart); +be_define_const_str(public_key, "public_key", 4169142980u, 0, 10, NULL); be_define_const_str(publish, "publish", 264247304u, 0, 7, NULL); -be_define_const_str(publish_result, "publish_result", 2013351252u, 0, 14, &be_const_str_skip); -be_define_const_str(push, "push", 2272264157u, 0, 4, &be_const_str_width); -be_define_const_str(push_path, "push_path", 1155254157u, 0, 9, NULL); -be_define_const_str(quality, "quality", 2597670950u, 0, 7, &be_const_str_else); -be_define_const_str(r, "r", 4144776981u, 0, 1, &be_const_str_set_light); -be_define_const_str(rad, "rad", 1358899048u, 0, 3, &be_const_str_set_ldo_enable); +be_define_const_str(publish_result, "publish_result", 2013351252u, 0, 14, &be_const_str_set_width); +be_define_const_str(push, "push", 2272264157u, 0, 4, NULL); +be_define_const_str(push_path, "push_path", 1155254157u, 0, 9, &be_const_str_split); +be_define_const_str(quality, "quality", 2597670950u, 0, 7, NULL); +be_define_const_str(r, "r", 4144776981u, 0, 1, NULL); +be_define_const_str(rad, "rad", 1358899048u, 0, 3, &be_const_str_setitem); be_define_const_str(raise, "raise", 1593437475u, 70, 5, NULL); -be_define_const_str(rand, "rand", 2711325910u, 0, 4, NULL); -be_define_const_str(range, "range", 4208725202u, 0, 5, &be_const_str_reverse_gamma10); +be_define_const_str(rand, "rand", 2711325910u, 0, 4, &be_const_str_run_bat); +be_define_const_str(range, "range", 4208725202u, 0, 5, NULL); be_define_const_str(read, "read", 3470762949u, 0, 4, NULL); be_define_const_str(read12, "read12", 4291076970u, 0, 6, NULL); be_define_const_str(read13, "read13", 12887293u, 0, 6, NULL); be_define_const_str(read24, "read24", 1808533811u, 0, 6, NULL); be_define_const_str(read32, "read32", 1741276240u, 0, 6, NULL); -be_define_const_str(read8, "read8", 2802788167u, 0, 5, NULL); +be_define_const_str(read8, "read8", 2802788167u, 0, 5, &be_const_str_type); be_define_const_str(read_bytes, "read_bytes", 3576733173u, 0, 10, NULL); -be_define_const_str(read_sensors, "read_sensors", 892689201u, 0, 12, &be_const_str_round_end); +be_define_const_str(read_sensors, "read_sensors", 892689201u, 0, 12, NULL); be_define_const_str(readbytes, "readbytes", 2716426756u, 0, 9, NULL); be_define_const_str(readline, "readline", 1212709927u, 0, 8, NULL); -be_define_const_str(real, "real", 3604983901u, 0, 4, NULL); -be_define_const_str(reapply, "reapply", 3778939332u, 0, 7, NULL); -be_define_const_str(redirect, "redirect", 389758641u, 0, 8, &be_const_str_rtc); -be_define_const_str(reduce, "reduce", 2002030311u, 0, 6, &be_const_str_sec); -be_define_const_str(refr_size, "refr_size", 1958144468u, 0, 9, &be_const_str_target_search); -be_define_const_str(register_obj, "register_obj", 3982614770u, 0, 12, &be_const_str_sys); -be_define_const_str(remove, "remove", 3683784189u, 0, 6, NULL); +be_define_const_str(real, "real", 3604983901u, 0, 4, &be_const_str_tcpclient); +be_define_const_str(reapply, "reapply", 3778939332u, 0, 7, &be_const_str_settings); +be_define_const_str(redirect, "redirect", 389758641u, 0, 8, NULL); +be_define_const_str(refr_size, "refr_size", 1958144468u, 0, 9, &be_const_str_toupper); +be_define_const_str(register_obj, "register_obj", 3982614770u, 0, 12, NULL); +be_define_const_str(remove, "remove", 3683784189u, 0, 6, &be_const_str_seg7_font); be_define_const_str(remove_cmd, "remove_cmd", 3832315702u, 0, 10, NULL); -be_define_const_str(remove_driver, "remove_driver", 1030243768u, 0, 13, &be_const_str_tasmota_X2Eget_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eget_X28_X29); -be_define_const_str(remove_rule, "remove_rule", 3456211328u, 0, 11, &be_const_str_except); +be_define_const_str(remove_driver, "remove_driver", 1030243768u, 0, 13, &be_const_str_for); +be_define_const_str(remove_rule, "remove_rule", 3456211328u, 0, 11, &be_const_str_import); be_define_const_str(remove_timer, "remove_timer", 4141472215u, 0, 12, NULL); be_define_const_str(reset, "reset", 1695364032u, 0, 5, NULL); be_define_const_str(reset_search, "reset_search", 1350414305u, 0, 12, NULL); -be_define_const_str(resize, "resize", 3514612129u, 0, 6, NULL); +be_define_const_str(resize, "resize", 3514612129u, 0, 6, &be_const_str_set); be_define_const_str(resolvecmnd, "resolvecmnd", 993361485u, 0, 11, NULL); -be_define_const_str(resp_cmnd, "resp_cmnd", 2869459626u, 0, 9, &be_const_str_widget_editable); +be_define_const_str(resp_cmnd, "resp_cmnd", 2869459626u, 0, 9, &be_const_str_update); be_define_const_str(resp_cmnd_done, "resp_cmnd_done", 2601874875u, 0, 14, NULL); be_define_const_str(resp_cmnd_error, "resp_cmnd_error", 2404088863u, 0, 15, NULL); -be_define_const_str(resp_cmnd_failed, "resp_cmnd_failed", 2136281562u, 0, 16, &be_const_str_set_chg_current); +be_define_const_str(resp_cmnd_failed, "resp_cmnd_failed", 2136281562u, 0, 16, &be_const_str_web_add_management_button); be_define_const_str(resp_cmnd_str, "resp_cmnd_str", 737845590u, 0, 13, NULL); -be_define_const_str(response_append, "response_append", 450346371u, 0, 15, &be_const_str_set_first_time); +be_define_const_str(response_append, "response_append", 450346371u, 0, 15, NULL); be_define_const_str(return, "return", 2246981567u, 60, 6, NULL); be_define_const_str(return_X20code_X3D_X25i, "return code=%i", 2127454401u, 0, 14, NULL); be_define_const_str(reverse, "reverse", 558918661u, 0, 7, NULL); be_define_const_str(reverse_gamma10, "reverse_gamma10", 739112262u, 0, 15, NULL); be_define_const_str(rotate, "rotate", 2784296202u, 0, 6, NULL); -be_define_const_str(round_end, "round_end", 985288225u, 0, 9, &be_const_str_strftime); -be_define_const_str(round_start, "round_start", 2949484384u, 0, 11, &be_const_str_sqrt); -be_define_const_str(rtc, "rtc", 1070575216u, 0, 3, NULL); -be_define_const_str(rule, "rule", 4230889683u, 0, 4, &be_const_str_settings); -be_define_const_str(run, "run", 718098122u, 0, 3, &be_const_str_set_style_line_color); -be_define_const_str(run_bat, "run_bat", 2536903298u, 0, 7, &be_const_str_valuer_error); +be_define_const_str(round_end, "round_end", 985288225u, 0, 9, &be_const_str_set_ldo_enable); +be_define_const_str(round_start, "round_start", 2949484384u, 0, 11, NULL); +be_define_const_str(rtc, "rtc", 1070575216u, 0, 3, &be_const_str_web_add_button); +be_define_const_str(rule, "rule", 4230889683u, 0, 4, &be_const_str_valuer_error); +be_define_const_str(run, "run", 718098122u, 0, 3, &be_const_str_toptr); +be_define_const_str(run_bat, "run_bat", 2536903298u, 0, 7, NULL); be_define_const_str(run_deferred, "run_deferred", 371594696u, 0, 12, NULL); -be_define_const_str(running, "running", 343848780u, 0, 7, &be_const_str_string); +be_define_const_str(running, "running", 343848780u, 0, 7, NULL); be_define_const_str(save, "save", 3439296072u, 0, 4, NULL); -be_define_const_str(save_before_restart, "save_before_restart", 1253239338u, 0, 19, NULL); -be_define_const_str(scale_uint, "scale_uint", 3090811094u, 0, 10, &be_const_str_widget_group_def); +be_define_const_str(save_before_restart, "save_before_restart", 1253239338u, 0, 19, &be_const_str_scale_uint); +be_define_const_str(scale_uint, "scale_uint", 3090811094u, 0, 10, &be_const_str__X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_XB0C_X7Be_X7D); be_define_const_str(scan, "scan", 3974641896u, 0, 4, NULL); be_define_const_str(search, "search", 2150836393u, 0, 6, NULL); be_define_const_str(sec, "sec", 3139892658u, 0, 3, NULL); -be_define_const_str(seg7_font, "seg7_font", 4099690689u, 0, 9, &be_const_str_set_useragent); -be_define_const_str(select, "select", 297952813u, 0, 6, NULL); -be_define_const_str(serial, "serial", 3687697785u, 0, 6, NULL); -be_define_const_str(set, "set", 3324446467u, 0, 3, NULL); -be_define_const_str(set_alternate, "set_alternate", 1709680562u, 0, 13, &be_const_str_widget_event); -be_define_const_str(set_auth, "set_auth", 1057170930u, 0, 8, &be_const_str_update); -be_define_const_str(set_bri, "set_bri", 2789118779u, 0, 7, &be_const_str_str); +be_define_const_str(seg7_font, "seg7_font", 4099690689u, 0, 9, NULL); +be_define_const_str(select, "select", 297952813u, 0, 6, &be_const_str_static); +be_define_const_str(serial, "serial", 3687697785u, 0, 6, &be_const_str_set_y); +be_define_const_str(set, "set", 3324446467u, 0, 3, &be_const_str_time_dump); +be_define_const_str(set_alternate, "set_alternate", 1709680562u, 0, 13, NULL); +be_define_const_str(set_auth, "set_auth", 1057170930u, 0, 8, NULL); +be_define_const_str(set_bri, "set_bri", 2789118779u, 0, 7, NULL); be_define_const_str(set_chg_current, "set_chg_current", 336304386u, 0, 15, NULL); be_define_const_str(set_dc_voltage, "set_dc_voltage", 2181981936u, 0, 14, NULL); -be_define_const_str(set_dcdc_enable, "set_dcdc_enable", 1594690786u, 0, 15, &be_const_str_class); -be_define_const_str(set_first_time, "set_first_time", 3111247550u, 0, 14, &be_const_str_tan); +be_define_const_str(set_dcdc_enable, "set_dcdc_enable", 1594690786u, 0, 15, NULL); +be_define_const_str(set_first_time, "set_first_time", 3111247550u, 0, 14, NULL); be_define_const_str(set_height, "set_height", 1080207399u, 0, 10, NULL); be_define_const_str(set_ldo_enable, "set_ldo_enable", 2916502041u, 0, 14, NULL); be_define_const_str(set_ldo_voltage, "set_ldo_voltage", 4090501160u, 0, 15, NULL); be_define_const_str(set_light, "set_light", 3176076152u, 0, 9, NULL); be_define_const_str(set_matrix_pixel_color, "set_matrix_pixel_color", 1197149462u, 0, 22, NULL); -be_define_const_str(set_percentage, "set_percentage", 2952022724u, 0, 14, &be_const_str__X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D); +be_define_const_str(set_percentage, "set_percentage", 2952022724u, 0, 14, &be_const_str_to_gamma); be_define_const_str(set_pixel_color, "set_pixel_color", 1275248356u, 0, 15, NULL); -be_define_const_str(set_power, "set_power", 549820893u, 0, 9, &be_const_str_v); +be_define_const_str(set_power, "set_power", 549820893u, 0, 9, NULL); be_define_const_str(set_style_bg_color, "set_style_bg_color", 1689513089u, 0, 18, NULL); be_define_const_str(set_style_line_color, "set_style_line_color", 3665238976u, 0, 20, NULL); be_define_const_str(set_style_pad_right, "set_style_pad_right", 3314069054u, 0, 19, NULL); -be_define_const_str(set_style_text_font, "set_style_text_font", 1028590019u, 0, 19, &be_const_str_widget_ctor_impl); +be_define_const_str(set_style_text_font, "set_style_text_font", 1028590019u, 0, 19, &be_const_str_x); be_define_const_str(set_text, "set_text", 1849641155u, 0, 8, NULL); -be_define_const_str(set_time, "set_time", 900236405u, 0, 8, &be_const_str_if); -be_define_const_str(set_timeouts, "set_timeouts", 3732850900u, 0, 12, NULL); -be_define_const_str(set_timer, "set_timer", 2135414533u, 0, 9, &be_const_str_for); -be_define_const_str(set_useragent, "set_useragent", 612237244u, 0, 13, NULL); -be_define_const_str(set_width, "set_width", 484671920u, 0, 9, NULL); -be_define_const_str(set_x, "set_x", 1849400772u, 0, 5, &be_const_str_var); -be_define_const_str(set_y, "set_y", 1866178391u, 0, 5, &be_const_str_raise); -be_define_const_str(setbits, "setbits", 2762408167u, 0, 7, &be_const_str_super); +be_define_const_str(set_time, "set_time", 900236405u, 0, 8, NULL); +be_define_const_str(set_timeouts, "set_timeouts", 3732850900u, 0, 12, &be_const_str_show); +be_define_const_str(set_timer, "set_timer", 2135414533u, 0, 9, NULL); +be_define_const_str(set_useragent, "set_useragent", 612237244u, 0, 13, &be_const_str_tasmota); +be_define_const_str(set_width, "set_width", 484671920u, 0, 9, &be_const_str_write_bit); +be_define_const_str(set_x, "set_x", 1849400772u, 0, 5, &be_const_str_target); +be_define_const_str(set_y, "set_y", 1866178391u, 0, 5, NULL); +be_define_const_str(setbits, "setbits", 2762408167u, 0, 7, NULL); be_define_const_str(seti, "seti", 1500556254u, 0, 4, NULL); be_define_const_str(setitem, "setitem", 1554834596u, 0, 7, NULL); -be_define_const_str(setmember, "setmember", 1432909441u, 0, 9, NULL); -be_define_const_str(setrange, "setrange", 3794019032u, 0, 8, NULL); +be_define_const_str(setmember, "setmember", 1432909441u, 0, 9, &be_const_str_stop); +be_define_const_str(setrange, "setrange", 3794019032u, 0, 8, &be_const_str_value); be_define_const_str(settings, "settings", 1745255176u, 0, 8, NULL); -be_define_const_str(shared_key, "shared_key", 2200833624u, 0, 10, NULL); +be_define_const_str(shared_key, "shared_key", 2200833624u, 0, 10, &be_const_str_tan); be_define_const_str(show, "show", 2840060476u, 0, 4, NULL); -be_define_const_str(sin, "sin", 3761252941u, 0, 3, &be_const_str_widget_constructor); +be_define_const_str(sin, "sin", 3761252941u, 0, 3, NULL); be_define_const_str(sinh, "sinh", 282220607u, 0, 4, NULL); -be_define_const_str(size, "size", 597743964u, 0, 4, &be_const_str_top); -be_define_const_str(skip, "skip", 1097563074u, 0, 4, &be_const_str_tr); -be_define_const_str(solidified, "solidified", 3257553487u, 0, 10, NULL); -be_define_const_str(split, "split", 2276994531u, 0, 5, &be_const_str__X7Bs_X7DVBus_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D); -be_define_const_str(sqrt, "sqrt", 2112764879u, 0, 4, &be_const_str_widget_cb); +be_define_const_str(size, "size", 597743964u, 0, 4, &be_const_str_sys); +be_define_const_str(skip, "skip", 1097563074u, 0, 4, NULL); +be_define_const_str(solidified, "solidified", 3257553487u, 0, 10, &be_const_str_tr); +be_define_const_str(split, "split", 2276994531u, 0, 5, &be_const_str_upper); +be_define_const_str(sqrt, "sqrt", 2112764879u, 0, 4, &be_const_str_tasmota_X2Eget_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eget_X28_X29); be_define_const_str(srand, "srand", 465518633u, 0, 5, NULL); be_define_const_str(start, "start", 1697318111u, 0, 5, NULL); -be_define_const_str(state, "state", 2016490230u, 0, 5, NULL); +be_define_const_str(state, "state", 2016490230u, 0, 5, &be_const_str_write_bytes); be_define_const_str(static, "static", 3532702267u, 71, 6, NULL); be_define_const_str(stop, "stop", 3411225317u, 0, 4, NULL); be_define_const_str(stop_iteration, "stop_iteration", 4173793901u, 0, 14, NULL); -be_define_const_str(str, "str", 3259748752u, 0, 3, NULL); +be_define_const_str(str, "str", 3259748752u, 0, 3, &be_const_str_end); be_define_const_str(strftime, "strftime", 187738851u, 0, 8, NULL); -be_define_const_str(string, "string", 398550328u, 0, 6, NULL); +be_define_const_str(string, "string", 398550328u, 0, 6, &be_const_str_false); be_define_const_str(strip, "strip", 4246411473u, 0, 5, NULL); -be_define_const_str(strptime, "strptime", 1277910361u, 0, 8, &be_const_str_wire_scan); +be_define_const_str(strptime, "strptime", 1277910361u, 0, 8, NULL); be_define_const_str(super, "super", 4152230356u, 0, 5, NULL); be_define_const_str(sys, "sys", 3277365014u, 0, 3, NULL); be_define_const_str(tag, "tag", 2516003219u, 0, 3, NULL); -be_define_const_str(tan, "tan", 2633446552u, 0, 3, NULL); -be_define_const_str(tanh, "tanh", 153638352u, 0, 4, &be_const_str__X7B); -be_define_const_str(target, "target", 845187144u, 0, 6, &be_const_str_widget_width_def); -be_define_const_str(target_search, "target_search", 1947846553u, 0, 13, &be_const_str_url_encode); -be_define_const_str(tasmota, "tasmota", 424643812u, 0, 7, &be_const_str_value_error); -be_define_const_str(tasmota_X2Eget_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eget_X28_X29, "tasmota.get_light() is deprecated, use light.get()", 3525753647u, 0, 50, &be_const_str_while); +be_define_const_str(tan, "tan", 2633446552u, 0, 3, &be_const_str_do); +be_define_const_str(tanh, "tanh", 153638352u, 0, 4, NULL); +be_define_const_str(target, "target", 845187144u, 0, 6, NULL); +be_define_const_str(target_search, "target_search", 1947846553u, 0, 13, NULL); +be_define_const_str(tasmota, "tasmota", 424643812u, 0, 7, NULL); +be_define_const_str(tasmota_X2Eget_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eget_X28_X29, "tasmota.get_light() is deprecated, use light.get()", 3525753647u, 0, 50, NULL); be_define_const_str(tasmota_X2Eset_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eset_X28_X29, "tasmota.set_light() is deprecated, use light.set()", 2124937871u, 0, 50, NULL); -be_define_const_str(tcpclient, "tcpclient", 3828797983u, 0, 9, NULL); -be_define_const_str(tele, "tele", 3474458061u, 0, 4, &be_const_str_time_dump); +be_define_const_str(tcpclient, "tcpclient", 3828797983u, 0, 9, &be_const_str_time_reached); +be_define_const_str(tele, "tele", 3474458061u, 0, 4, NULL); be_define_const_str(the_X20second_X20argument_X20is_X20not_X20a_X20function, "the second argument is not a function", 3954574469u, 0, 37, NULL); be_define_const_str(time_dump, "time_dump", 3330410747u, 0, 9, NULL); -be_define_const_str(time_reached, "time_reached", 2075136773u, 0, 12, &be_const_str__X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D); -be_define_const_str(time_str, "time_str", 2613827612u, 0, 8, NULL); -be_define_const_str(to_gamma, "to_gamma", 1597139862u, 0, 8, &be_const_str_value); -be_define_const_str(tob64, "tob64", 373777640u, 0, 5, NULL); -be_define_const_str(tolower, "tolower", 1042520049u, 0, 7, NULL); +be_define_const_str(time_reached, "time_reached", 2075136773u, 0, 12, NULL); +be_define_const_str(time_str, "time_str", 2613827612u, 0, 8, &be_const_str_wd); +be_define_const_str(to_gamma, "to_gamma", 1597139862u, 0, 8, &be_const_str_web_sensor); +be_define_const_str(tob64, "tob64", 373777640u, 0, 5, &be_const_str_y); +be_define_const_str(tolower, "tolower", 1042520049u, 0, 7, &be_const_str_wire1); be_define_const_str(tomap, "tomap", 612167626u, 0, 5, NULL); be_define_const_str(top, "top", 2802900028u, 0, 3, NULL); be_define_const_str(toptr, "toptr", 3379847454u, 0, 5, NULL); be_define_const_str(tostring, "tostring", 2299708645u, 0, 8, NULL); -be_define_const_str(toupper, "toupper", 3691983576u, 0, 7, &be_const_str_webserver); +be_define_const_str(toupper, "toupper", 3691983576u, 0, 7, &be_const_str_widget_event_cb); be_define_const_str(tr, "tr", 1195724803u, 0, 2, NULL); be_define_const_str(traceback, "traceback", 3385188109u, 0, 9, NULL); be_define_const_str(true, "true", 1303515621u, 61, 4, NULL); be_define_const_str(try, "try", 2887626766u, 68, 3, NULL); be_define_const_str(try_rule, "try_rule", 1986449405u, 0, 8, NULL); be_define_const_str(type, "type", 1361572173u, 0, 4, NULL); -be_define_const_str(unknown_X20instruction, "unknown instruction", 1093911841u, 0, 19, NULL); +be_define_const_str(unknown_X20instruction, "unknown instruction", 1093911841u, 0, 19, &be_const_str_raise); be_define_const_str(update, "update", 672109684u, 0, 6, NULL); be_define_const_str(upper, "upper", 176974407u, 0, 5, NULL); be_define_const_str(url_encode, "url_encode", 528392145u, 0, 10, NULL); -be_define_const_str(v, "v", 4077666505u, 0, 1, NULL); +be_define_const_str(v, "v", 4077666505u, 0, 1, &be_const_str_widget_struct_default); be_define_const_str(value, "value", 1113510858u, 0, 5, NULL); be_define_const_str(value_error, "value_error", 773297791u, 0, 11, NULL); be_define_const_str(valuer_error, "valuer_error", 2567947105u, 0, 12, NULL); be_define_const_str(var, "var", 2317739966u, 64, 3, NULL); -be_define_const_str(w, "w", 4060888886u, 0, 1, NULL); -be_define_const_str(wd, "wd", 1531424278u, 0, 2, NULL); +be_define_const_str(w, "w", 4060888886u, 0, 1, &be_const_str__X7Bs_X7DVBus_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D); +be_define_const_str(wd, "wd", 1531424278u, 0, 2, &be_const_str_except); be_define_const_str(web_add_button, "web_add_button", 3537875058u, 0, 14, NULL); be_define_const_str(web_add_config_button, "web_add_config_button", 639674325u, 0, 21, NULL); be_define_const_str(web_add_console_button, "web_add_console_button", 3481436192u, 0, 22, NULL); be_define_const_str(web_add_handler, "web_add_handler", 3990174962u, 0, 15, NULL); be_define_const_str(web_add_main_button, "web_add_main_button", 3960367664u, 0, 19, NULL); -be_define_const_str(web_add_management_button, "web_add_management_button", 2738877186u, 0, 25, &be_const_str_do); +be_define_const_str(web_add_management_button, "web_add_management_button", 2738877186u, 0, 25, NULL); be_define_const_str(web_send, "web_send", 2989941448u, 0, 8, NULL); be_define_const_str(web_send_decimal, "web_send_decimal", 1407210204u, 0, 16, NULL); -be_define_const_str(web_sensor, "web_sensor", 2900096972u, 0, 10, &be_const_str_write_gpio); -be_define_const_str(webclient, "webclient", 4076389146u, 0, 9, NULL); +be_define_const_str(web_sensor, "web_sensor", 2900096972u, 0, 10, &be_const_str_nil); +be_define_const_str(webclient, "webclient", 4076389146u, 0, 9, &be_const_str_while); be_define_const_str(webserver, "webserver", 1572454038u, 0, 9, NULL); be_define_const_str(while, "while", 231090382u, 53, 5, NULL); be_define_const_str(widget_cb, "widget_cb", 2763583055u, 0, 9, NULL); @@ -702,19 +701,19 @@ be_define_const_str(widget_dtor_cb, "widget_dtor_cb", 3151545845u, 0, 14, NULL); be_define_const_str(widget_dtor_impl, "widget_dtor_impl", 520430610u, 0, 16, NULL); be_define_const_str(widget_editable, "widget_editable", 3821793286u, 0, 15, NULL); be_define_const_str(widget_event, "widget_event", 1951408186u, 0, 12, NULL); -be_define_const_str(widget_event_cb, "widget_event_cb", 1508466754u, 0, 15, NULL); +be_define_const_str(widget_event_cb, "widget_event_cb", 1508466754u, 0, 15, &be_const_str_year); be_define_const_str(widget_event_impl, "widget_event_impl", 2178430561u, 0, 17, NULL); be_define_const_str(widget_group_def, "widget_group_def", 1246968785u, 0, 16, NULL); be_define_const_str(widget_height_def, "widget_height_def", 3131667813u, 0, 17, NULL); be_define_const_str(widget_instance_size, "widget_instance_size", 2055354779u, 0, 20, NULL); -be_define_const_str(widget_struct_by_class, "widget_struct_by_class", 3806373842u, 0, 22, NULL); +be_define_const_str(widget_struct_by_class, "widget_struct_by_class", 3806373842u, 0, 22, &be_const_str_x1); be_define_const_str(widget_struct_default, "widget_struct_default", 781673633u, 0, 21, NULL); be_define_const_str(widget_width_def, "widget_width_def", 3986078862u, 0, 16, NULL); -be_define_const_str(width, "width", 2508680735u, 0, 5, NULL); +be_define_const_str(width, "width", 2508680735u, 0, 5, &be_const_str_true); be_define_const_str(width_def, "width_def", 1143717879u, 0, 9, NULL); -be_define_const_str(wifi, "wifi", 120087624u, 0, 4, NULL); +be_define_const_str(wifi, "wifi", 120087624u, 0, 4, &be_const_str_write8); be_define_const_str(wire, "wire", 4082753944u, 0, 4, NULL); -be_define_const_str(wire1, "wire1", 3212721419u, 0, 5, &be_const_str_true); +be_define_const_str(wire1, "wire1", 3212721419u, 0, 5, NULL); be_define_const_str(wire2, "wire2", 3229499038u, 0, 5, NULL); be_define_const_str(wire_scan, "wire_scan", 2671275880u, 0, 9, NULL); be_define_const_str(write, "write", 3190202204u, 0, 5, NULL); @@ -741,369 +740,368 @@ be_define_const_str(_X7B_X7D, "{}", 1415952421u, 0, 2, NULL); be_define_const_str(_X7D, "}", 4161554600u, 0, 1, NULL); static const bstring* const m_string_table[] = { - (const bstring *)&be_const_str__X3E_X3D, - (const bstring *)&be_const_str_run_bat, NULL, - NULL, - (const bstring *)&be_const_str_io_error, - (const bstring *)&be_const_str_depower, - (const bstring *)&be_const_str_SERIAL_6O1, - (const bstring *)&be_const_str_STATE_DEFAULT, - (const bstring *)&be_const_str_SERIAL_6N1, - (const bstring *)&be_const_str_Auto_X2Dconfiguration, - (const bstring *)&be_const_str_decrypt, - (const bstring *)&be_const_str_insert, - NULL, - (const bstring *)&be_const_str__X3D, - (const bstring *)&be_const_str_write_bytes, - NULL, - (const bstring *)&be_const_str_running, - (const bstring *)&be_const_str_onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E, - (const bstring *)&be_const_str_read_bytes, - (const bstring *)&be_const_str_draw_arc, - (const bstring *)&be_const_str__X20, - (const bstring *)&be_const_str_event, - (const bstring *)&be_const_str_SERIAL_5E2, - (const bstring *)&be_const_str_SERIAL_6E1, - (const bstring *)&be_const_str_leds, - (const bstring *)&be_const_str__lvgl, - (const bstring *)&be_const_str_zip, - (const bstring *)&be_const_str_EC_C25519, - (const bstring *)&be_const_str_COLOR_BLACK, - (const bstring *)&be_const_str_readline, - (const bstring *)&be_const_str__X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E, - NULL, - (const bstring *)&be_const_str_load_templates, - (const bstring *)&be_const_str_get, - (const bstring *)&be_const_str_POST, - (const bstring *)&be_const_str___iterator__, - (const bstring *)&be_const_str_AudioGeneratorMP3, - (const bstring *)&be_const_str__energy, - (const bstring *)&be_const_str__rules, - (const bstring *)&be_const_str_break, - (const bstring *)&be_const_str__X2F_X2Eautoconf, (const bstring *)&be_const_str_content_button, - (const bstring *)&be_const_str_copy, - (const bstring *)&be_const_str_get_aps_voltage, - (const bstring *)&be_const_str_AXP192, - (const bstring *)&be_const_str_select, - (const bstring *)&be_const_str_autoexec, - (const bstring *)&be_const_str__X0A, - (const bstring *)&be_const_str_available, - NULL, - (const bstring *)&be_const_str__X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B, - (const bstring *)&be_const_str_gc, - (const bstring *)&be_const_str_CFG_X3A_X20loading_X20_X27_X25s_X27, - (const bstring *)&be_const_str__X21_X3D_X3D, - (const bstring *)&be_const_str_split, - (const bstring *)&be_const_str_lower, - (const bstring *)&be_const_str__X3Clabel_X3EChoose_X20a_X20device_X20configuration_X3A_X3C_X2Flabel_X3E_X3Cbr_X3E, - (const bstring *)&be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, - (const bstring *)&be_const_str_base_class, - (const bstring *)&be_const_str_connected, - (const bstring *)&be_const_str_instance, - NULL, - (const bstring *)&be_const_str__X2Etapp, - (const bstring *)&be_const_str__X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E, - (const bstring *)&be_const_str_attrdump, - (const bstring *)&be_const_str_EVENT_DRAW_MAIN, - (const bstring *)&be_const_str__request_from, - (const bstring *)&be_const_str__X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E, - (const bstring *)&be_const_str_acos, - (const bstring *)&be_const_str_get_light, - (const bstring *)&be_const_str_resp_cmnd_str, - NULL, - (const bstring *)&be_const_str_CFG_X3A_X20removing_X20autoconf_X20files, - NULL, - (const bstring *)&be_const_str_w, - (const bstring *)&be_const_str_draw_line, - NULL, - (const bstring *)&be_const_str_strip, - (const bstring *)&be_const_str_format, - (const bstring *)&be_const_str_Leds, - (const bstring *)&be_const_str_exec_tele, - (const bstring *)&be_const_str_chars_in_string, - (const bstring *)&be_const_str_CFG_X3A_X20skipping_X20_X27display_X2Eini_X27_X20because_X20already_X20present_X20in_X20file_X2Dsystem, - NULL, - (const bstring *)&be_const_str_widget_dtor_cb, - (const bstring *)&be_const_str_invalidate, - (const bstring *)&be_const_str__X3A, - NULL, - (const bstring *)&be_const_str_out_X20of_X20range, - NULL, - (const bstring *)&be_const_str_lv_event_cb, - (const bstring *)&be_const_str_LVG_X3A_X20call_X20to_X20unsupported_X20callback, - (const bstring *)&be_const_str_escape, - (const bstring *)&be_const_str_event_cb, - (const bstring *)&be_const_str_init_draw_line_dsc, - NULL, - (const bstring *)&be_const_str_isinstance, - (const bstring *)&be_const_str_exists, - (const bstring *)&be_const_str_HTTP_GET, - (const bstring *)&be_const_str_clear_first_time, - (const bstring *)&be_const_str__X2Eautoconf, - (const bstring *)&be_const_str_clear, - (const bstring *)&be_const_str__X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E, - (const bstring *)&be_const_str_SERIAL_7N1, - (const bstring *)&be_const_str_get_percentage, - (const bstring *)&be_const_str_SERIAL_7O1, - (const bstring *)&be_const_str_remove, - (const bstring *)&be_const_str_set_time, - (const bstring *)&be_const_str_get_size, - (const bstring *)&be_const_str_remove_timer, - (const bstring *)&be_const_str__X23autoexec_X2Ebat, - (const bstring *)&be_const_str__X2D_X2D_X3A_X2D_X2D, - (const bstring *)&be_const_str_due, - (const bstring *)&be_const_str__X2C, - (const bstring *)&be_const_str_instance_size, - (const bstring *)&be_const_str_Animate_X20pc_X20is_X20out_X20of_X20range, - (const bstring *)&be_const_str_cb, - (const bstring *)&be_const_str_resp_cmnd_done, - NULL, - (const bstring *)&be_const_str_energy_struct, - NULL, - (const bstring *)&be_const_str__drivers, - (const bstring *)&be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dzip_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, - (const bstring *)&be_const_str_tob64, - (const bstring *)&be_const_str__X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, - (const bstring *)&be_const_str_CFG_X3A_X20multiple_X20autoconf_X20files_X20found_X2C_X20aborting_X20_X28_X27_X25s_X27_X20_X2B_X20_X27_X25s_X27_X29, - (const bstring *)&be_const_str__X3C, - (const bstring *)&be_const_str_y, - (const bstring *)&be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, - (const bstring *)&be_const_str_files, - (const bstring *)&be_const_str__X2Ew, - (const bstring *)&be_const_str_assert, - (const bstring *)&be_const_str_bytes, - (const bstring *)&be_const_str__X23, - (const bstring *)&be_const_str_abs, - (const bstring *)&be_const_str__X2E_X2E, - (const bstring *)&be_const_str__global_addr, - (const bstring *)&be_const_str_connect, - (const bstring *)&be_const_str__settings_ptr, - NULL, - (const bstring *)&be_const_str_CFG_X3A_X20ran_X20_X20, - (const bstring *)&be_const_str_BRY_X3A_X20ERROR_X2C_X20bad_X20json_X3A_X20, - NULL, - (const bstring *)&be_const_str__X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d, - (const bstring *)&be_const_str_i2c_enabled, - (const bstring *)&be_const_str_ctypes_bytes_dyn, - (const bstring *)&be_const_str_CFG_X3A_X20loading_X20, - NULL, - NULL, - (const bstring *)&be_const_str_refr_size, - (const bstring *)&be_const_str_content_send_style, - NULL, - NULL, - (const bstring *)&be_const_str_begin, - (const bstring *)&be_const_str_c, - (const bstring *)&be_const_str_ins_goto, - (const bstring *)&be_const_str__buffer, - (const bstring *)&be_const_str_concat, - (const bstring *)&be_const_str_percentage, NULL, (const bstring *)&be_const_str_SERIAL_5N2, + (const bstring *)&be_const_str__X2Elen, + (const bstring *)&be_const_str_call_native, + (const bstring *)&be_const_str_EVENT_DRAW_PART_END, + (const bstring *)&be_const_str_alternate, + (const bstring *)&be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dzip_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, + (const bstring *)&be_const_str_read13, + (const bstring *)&be_const_str_dac_voltage, + (const bstring *)&be_const_str_widget_group_def, + (const bstring *)&be_const_str__begin_transmission, NULL, + (const bstring *)&be_const_str_a, + (const bstring *)&be_const_str_start, + (const bstring *)&be_const_str__p, + (const bstring *)&be_const_str_load, + (const bstring *)&be_const_str_delete_all_configs, + (const bstring *)&be_const_str_Auto_X2Dconfiguration, + (const bstring *)&be_const_str_clear, + (const bstring *)&be_const_str_page_autoconf_mgr, + (const bstring *)&be_const_str__dirty, + (const bstring *)&be_const_str_set_timer, NULL, - (const bstring *)&be_const_str_SK6812_GRBW, - (const bstring *)&be_const_str__X3Cp_X3E_X3Csmall_X3E_X26nbsp_X3B_X28This_X20feature_X20requires_X20an_X20internet_X20connection_X29_X3C_X2Fsmall_X3E_X3C_X2Fp_X3E, - (const bstring *)&be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, - NULL, - NULL, - (const bstring *)&be_const_str_lv_obj, - (const bstring *)&be_const_str___upper__, - (const bstring *)&be_const_str_Restart_X201, - NULL, - (const bstring *)&be_const_str_introspect, - (const bstring *)&be_const_str__X23autoexec_X2Ebe, - (const bstring *)&be_const_str_CFG_X3A_X20exception_X20_X27_X25s_X27_X20_X2D_X20_X27_X25s_X27, - (const bstring *)&be_const_str_bool, - (const bstring *)&be_const_str_PART_MAIN, - (const bstring *)&be_const_str_back_forth, - (const bstring *)&be_const_str_lv_obj_class, - (const bstring *)&be_const_str_TAP_X3A_X20found_X20Tasmota_X20App_X20_X27_X25s_X27, - (const bstring *)&be_const_str_GET, - (const bstring *)&be_const_str_deg, - (const bstring *)&be_const_str__X28_X29, - NULL, - (const bstring *)&be_const_str__X23preinit_X2Ebe, - (const bstring *)&be_const_str__class, - NULL, - (const bstring *)&be_const_str__X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, - (const bstring *)&be_const_str_CFG_X3A_X20downloading_X20_X27_X25s_X27, - (const bstring *)&be_const_str__X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E, - (const bstring *)&be_const_str_fromstring, - (const bstring *)&be_const_str_SERIAL_8E2, - NULL, - (const bstring *)&be_const_str__anonymous_, - (const bstring *)&be_const_str__X2502d_X25s_X2502d, - (const bstring *)&be_const_str_CFG_X3A_X20return_code_X3D_X25i, - (const bstring *)&be_const_str_web_sensor, - (const bstring *)&be_const_str_detect, - (const bstring *)&be_const_str_exec_cmd, - (const bstring *)&be_const_str_to_gamma, - (const bstring *)&be_const_str__ptr, - (const bstring *)&be_const_str_null_cb, - (const bstring *)&be_const_str_eth, - (const bstring *)&be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_X2F_X25s_X2Eautoconf, - (const bstring *)&be_const_str_erase, - (const bstring *)&be_const_str__archive, - (const bstring *)&be_const_str_CFG_X3A_X20removed_X20file_X20_X27_X25s_X27, - (const bstring *)&be_const_str_code, - (const bstring *)&be_const_str_BUTTON_CONFIGURATION, - (const bstring *)&be_const_str_web_send_decimal, - (const bstring *)&be_const_str_fromptr, - (const bstring *)&be_const_str_SERIAL_8E1, - NULL, - (const bstring *)&be_const_str_set_style_bg_color, - (const bstring *)&be_const_str_end, - (const bstring *)&be_const_str__read, - (const bstring *)&be_const_str_cos, - (const bstring *)&be_const_str_codedump, - (const bstring *)&be_const_str__X23init_X2Ebat, - (const bstring *)&be_const_str_get_battery_chargin_status, - (const bstring *)&be_const_str__X2Ebec, - (const bstring *)&be_const_str_set_dcdc_enable, - NULL, - (const bstring *)&be_const_str_ctor, - (const bstring *)&be_const_str_digital_read, - (const bstring *)&be_const_str_close, - (const bstring *)&be_const_str__X2F, - (const bstring *)&be_const_str_cosh, - (const bstring *)&be_const_str_I2C_Driver, - (const bstring *)&be_const_str_read24, - (const bstring *)&be_const_str__write, - (const bstring *)&be_const_str__X23display_X2Eini, - (const bstring *)&be_const_str_get_bat_power, - (const bstring *)&be_const_str_pin_mode, - (const bstring *)&be_const_str__, - (const bstring *)&be_const_str_scale_uint, - (const bstring *)&be_const_str_WS2812_GRB, - (const bstring *)&be_const_str_AudioOutput, - (const bstring *)&be_const_str_animate, - (const bstring *)&be_const_str__X3F, - (const bstring *)&be_const_str_id, - (const bstring *)&be_const_str_arg_name, - (const bstring *)&be_const_str_internal_error, - (const bstring *)&be_const_str_serial, - NULL, + (const bstring *)&be_const_str_iter, + (const bstring *)&be_const_str_AudioGenerator, NULL, (const bstring *)&be_const_str_CFG_X3A_X20could_X20not_X20run_X20_X25s_X20_X28_X25s_X20_X2D_X20_X25s_X29, - (const bstring *)&be_const_str__begin_transmission, - (const bstring *)&be_const_str__X2Ep1, - (const bstring *)&be_const_str_engine, - (const bstring *)&be_const_str__def, - (const bstring *)&be_const_str_get_pixel_color, - (const bstring *)&be_const_str__X3C_X3D, - (const bstring *)&be_const_str_CFG_X3A_X20removing_X20first_X20time_X20marker, - (const bstring *)&be_const_str__X3D_X3D, - (const bstring *)&be_const_str_can_show, - (const bstring *)&be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, - (const bstring *)&be_const_str_response_append, - (const bstring *)&be_const_str_CFG_X3A_X20_X27init_X2Ebat_X27_X20done_X2C_X20restarting, - (const bstring *)&be_const_str_content_send, - (const bstring *)&be_const_str_create_segment, - (const bstring *)&be_const_str_duration, - (const bstring *)&be_const_str_get_height, - (const bstring *)&be_const_str_delete_all_configs, - (const bstring *)&be_const_str_reset_search, + (const bstring *)&be_const_str_EC_C25519, + (const bstring *)&be_const_str__persist_X2Ejson, + (const bstring *)&be_const_str_width, + (const bstring *)&be_const_str_STATE_DEFAULT, + (const bstring *)&be_const_str_assert, + (const bstring *)&be_const_str_button_pressed, + (const bstring *)&be_const_str_Animate_X20pc_X20is_X20out_X20of_X20range, + (const bstring *)&be_const_str__X2Fac, + (const bstring *)&be_const_str__X2Ebec, + (const bstring *)&be_const_str_instance_size, + (const bstring *)&be_const_str_GET, + (const bstring *)&be_const_str_path, + (const bstring *)&be_const_str_tele, + (const bstring *)&be_const_str_geti, + (const bstring *)&be_const_str_write_file, + (const bstring *)&be_const_str__archive, (const bstring *)&be_const_str_BRY_X3A_X20failed_X20to_X20load_X20_persist_X2Ejson, - (const bstring *)&be_const_str_, - (const bstring *)&be_const_str_b, - (const bstring *)&be_const_str_SERIAL_5E1, - (const bstring *)&be_const_str_SERIAL_6E2, - (const bstring *)&be_const_str_read13, - (const bstring *)&be_const_str_BRY_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s, - (const bstring *)&be_const_str_publish_result, - (const bstring *)&be_const_str_get_bat_current, + (const bstring *)&be_const_str_CFG_X3A_X20return_code_X3D_X25i, + (const bstring *)&be_const_str_sin, + (const bstring *)&be_const_str_copy, + (const bstring *)&be_const_str_CFG_X3A_X20downloading_X20_X27_X25s_X27, NULL, - (const bstring *)&be_const_str_ceil, - (const bstring *)&be_const_str_autorun, - (const bstring *)&be_const_str_length_X20in_X20bits_X20must_X20be_X20between_X200_X20and_X2032, - (const bstring *)&be_const_str_set_text, - (const bstring *)&be_const_str__X3D_X3C_X3E_X21, - (const bstring *)&be_const_str_r, - (const bstring *)&be_const_str_CFG_X3A_X20loaded_X20_X20, - (const bstring *)&be_const_str__X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E, - (const bstring *)&be_const_str__X2Ep, - (const bstring *)&be_const_str__error, - (const bstring *)&be_const_str_lv, - (const bstring *)&be_const_str_flush, - (const bstring *)&be_const_str_AudioFileSource, - (const bstring *)&be_const_str_web_add_main_button, - (const bstring *)&be_const_str__X2Elen, - (const bstring *)&be_const_str_persist_X2E_p_X20is_X20not_X20a_X20map, - (const bstring *)&be_const_str_compile, + (const bstring *)&be_const_str__X21_X3D, + (const bstring *)&be_const_str__X2B, + (const bstring *)&be_const_str_cb_event_closure, + (const bstring *)&be_const_str_code, + NULL, + (const bstring *)&be_const_str_PART_MAIN, + (const bstring *)&be_const_str_target_search, (const bstring *)&be_const_str_CFG_X3A_X20running_X20, + (const bstring *)&be_const_str__X2Ep, + (const bstring *)&be_const_str_widget_struct_by_class, + (const bstring *)&be_const_str_CFG_X3A_X20removing_X20first_X20time_X20marker, + (const bstring *)&be_const_str_False, + (const bstring *)&be_const_str__X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, + (const bstring *)&be_const_str__X23preinit_X2Ebe, + (const bstring *)&be_const_str_bool, + NULL, + (const bstring *)&be_const_str__X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B, + (const bstring *)&be_const_str_SERIAL_7N1, + (const bstring *)&be_const_str_file, + (const bstring *)&be_const_str_chars_in_string, + (const bstring *)&be_const_str_minute, + (const bstring *)&be_const_str_CFG_X3A_X20ran_X20_X20, + (const bstring *)&be_const_str__drivers, + NULL, + (const bstring *)&be_const_str_base_class, + (const bstring *)&be_const_str_invalidate, + (const bstring *)&be_const_str_elif, + (const bstring *)&be_const_str_decompress, + (const bstring *)&be_const_str_input, + (const bstring *)&be_const_str__X2Eautoconf, + (const bstring *)&be_const_str_read8, + (const bstring *)&be_const_str_WS2812_GRB, + (const bstring *)&be_const_str_Leds, + (const bstring *)&be_const_str__X28_X29, + (const bstring *)&be_const_str_BRY_X3A_X20ERROR_X2C_X20bad_X20json_X3A_X20, + (const bstring *)&be_const_str__buffer, + NULL, + (const bstring *)&be_const_str_lv_event_cb, + (const bstring *)&be_const_str_ins_time, + (const bstring *)&be_const_str_CFG_X3A_X20skipping_X20_X27display_X2Eini_X27_X20because_X20already_X20present_X20in_X20file_X2Dsystem, + (const bstring *)&be_const_str_bus, + (const bstring *)&be_const_str_TAP_X3A_X20found_X20Tasmota_X20App_X20_X27_X25s_X27, + NULL, + (const bstring *)&be_const_str_register_obj, + (const bstring *)&be_const_str__lvgl, + (const bstring *)&be_const_str_Wire, + (const bstring *)&be_const_str_depower, + (const bstring *)&be_const_str_state, + (const bstring *)&be_const_str__X3D_X3D, + (const bstring *)&be_const_str_connected, + (const bstring *)&be_const_str_SERIAL_7E1, + (const bstring *)&be_const_str__X23, + (const bstring *)&be_const_str_redirect, + (const bstring *)&be_const_str_get_current_module_path, + (const bstring *)&be_const_str__X3E, + (const bstring *)&be_const_str__settings_ptr, + NULL, + (const bstring *)&be_const_str_WS2812, + (const bstring *)&be_const_str_close, + (const bstring *)&be_const_str_EVENT_DRAW_PART_BEGIN, + (const bstring *)&be_const_str_None, + (const bstring *)&be_const_str_add_header, + (const bstring *)&be_const_str_resize, + (const bstring *)&be_const_str__X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, + (const bstring *)&be_const_str_CFG_X3A_X20multiple_X20autoconf_X20files_X20found_X2C_X20aborting_X20_X28_X27_X25s_X27_X20_X2B_X20_X27_X25s_X27_X29, + (const bstring *)&be_const_str__read, + (const bstring *)&be_const_str_collect, + (const bstring *)&be_const_str__X3E_X3D, + (const bstring *)&be_const_str_SERIAL_7N2, + (const bstring *)&be_const_str__X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, + (const bstring *)&be_const_str_setmember, + (const bstring *)&be_const_str__end_transmission, + (const bstring *)&be_const_str_arg, + NULL, + (const bstring *)&be_const_str_lv, + (const bstring *)&be_const_str_resp_cmnd, + (const bstring *)&be_const_str_try_rule, + (const bstring *)&be_const_str__X3Clabel_X3EChoose_X20a_X20device_X20configuration_X3A_X3C_X2Flabel_X3E_X3Cbr_X3E, + (const bstring *)&be_const_str__X7B_X7D, + (const bstring *)&be_const_str_ceil, + (const bstring *)&be_const_str_json_fdump_any, + NULL, + (const bstring *)&be_const_str_CFG_X3A_X20no_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found, + (const bstring *)&be_const_str__X25s_X2Eautoconf, + (const bstring *)&be_const_str_srand, + (const bstring *)&be_const_str_AudioGeneratorMP3, + NULL, + (const bstring *)&be_const_str_cb, + (const bstring *)&be_const_str_add_cmd, + (const bstring *)&be_const_str_reverse_gamma10, + (const bstring *)&be_const_str__X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E, + (const bstring *)&be_const_str_HTTP_GET, + (const bstring *)&be_const_str__X2502d_X25s_X2502d, + (const bstring *)&be_const_str_cos, + (const bstring *)&be_const_str__X3D_X3C_X3E_X21, + (const bstring *)&be_const_str__X2Etapp, + (const bstring *)&be_const_str__X2F_X3Frst_X3D, + (const bstring *)&be_const_str__X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E, + (const bstring *)&be_const_str_get_bat_current, + (const bstring *)&be_const_str_escape, + (const bstring *)&be_const_str_read24, + (const bstring *)&be_const_str_SERIAL_8O1, + (const bstring *)&be_const_str__X20, + (const bstring *)&be_const_str_obj_class_create_obj, + (const bstring *)&be_const_str__X23init_X2Ebat, + (const bstring *)&be_const_str__X3F, + NULL, + (const bstring *)&be_const_str__X23display_X2Eini, + (const bstring *)&be_const_str_from_to, + (const bstring *)&be_const_str_debug, + NULL, + (const bstring *)&be_const_str__X2Ew, + (const bstring *)&be_const_str_exec_tele, + (const bstring *)&be_const_str_reapply, + (const bstring *)&be_const_str__X23autoexec_X2Ebe, + (const bstring *)&be_const_str__, + (const bstring *)&be_const_str_SERIAL_6O2, + (const bstring *)&be_const_str__X2Ep1, + (const bstring *)&be_const_str_min, + (const bstring *)&be_const_str__error, + (const bstring *)&be_const_str_offseta, + NULL, + (const bstring *)&be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, + (const bstring *)&be_const_str__X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E, + (const bstring *)&be_const_str_display_X2Eini, + (const bstring *)&be_const_str_introspect, + (const bstring *)&be_const_str__global_addr, + (const bstring *)&be_const_str_widget_width_def, + (const bstring *)&be_const_str_percentage, + NULL, + NULL, + (const bstring *)&be_const_str_web_add_main_button, + (const bstring *)&be_const_str_POST, + (const bstring *)&be_const_str_AES_GCM, + (const bstring *)&be_const_str_ctor, + (const bstring *)&be_const_str_read12, + (const bstring *)&be_const_str_acos, + (const bstring *)&be_const_str_setrange, + (const bstring *)&be_const_str_module, + (const bstring *)&be_const_str_COLOR_BLACK, + (const bstring *)&be_const_str_due, + (const bstring *)&be_const_str_set_dcdc_enable, + NULL, + (const bstring *)&be_const_str_bytes, + (const bstring *)&be_const_str_arg_size, + (const bstring *)&be_const_str__X2Ebe, + (const bstring *)&be_const_str_set_power, + (const bstring *)&be_const_str_clear_to, + (const bstring *)&be_const_str__rules, + (const bstring *)&be_const_str_SERIAL_8N2, + (const bstring *)&be_const_str__X0A, + (const bstring *)&be_const_str_CFG_X3A_X20loaded_X20_X20, + (const bstring *)&be_const_str_SERIAL_5O1, + (const bstring *)&be_const_str_back_forth, + (const bstring *)&be_const_str__X2E, + NULL, + (const bstring *)&be_const_str__X3C, + (const bstring *)&be_const_str__X2Esize, + (const bstring *)&be_const_str_CFG_X3A_X20loading_X20_X27_X25s_X27, + (const bstring *)&be_const_str__X3C_X3D, + NULL, + (const bstring *)&be_const_str_find_key_i, + (const bstring *)&be_const_str_content_start, + (const bstring *)&be_const_str_COLOR_WHITE, + NULL, + (const bstring *)&be_const_str_Tasmota, + (const bstring *)&be_const_str_rule, + (const bstring *)&be_const_str_atleast1, + (const bstring *)&be_const_str__X2Ep2, + (const bstring *)&be_const_str_Timer, + NULL, + (const bstring *)&be_const_str_BUTTON_CONFIGURATION, + (const bstring *)&be_const_str_gamma10, + (const bstring *)&be_const_str_lower, + (const bstring *)&be_const_str_i2c_enabled, + (const bstring *)&be_const_str_get_pixel_color, + (const bstring *)&be_const_str_display, + (const bstring *)&be_const_str_classof, + (const bstring *)&be_const_str__X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D, + (const bstring *)&be_const_str_class_init_obj, + (const bstring *)&be_const_str__X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d, + (const bstring *)&be_const_str_cb_do_nothing, + NULL, + (const bstring *)&be_const_str_get_current_module_name, + (const bstring *)&be_const_str_content_send, + (const bstring *)&be_const_str_get_bat_charge_current, + (const bstring *)&be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, + (const bstring *)&be_const_str_get_width, + (const bstring *)&be_const_str_unknown_X20instruction, + (const bstring *)&be_const_str_SERIAL_5E2, + (const bstring *)&be_const_str_call, + (const bstring *)&be_const_str_detect, (const bstring *)&be_const_str_compress, NULL, - (const bstring *)&be_const_str_pin_used, - (const bstring *)&be_const_str__X2Ebe, - (const bstring *)&be_const_str_SERIAL_8O1, - (const bstring *)&be_const_str_CFG_X3A_X20loaded_X20_X27_X25s_X27, - (const bstring *)&be_const_str_EVENT_DRAW_PART_END, + (const bstring *)&be_const_str_lv_obj, + (const bstring *)&be_const_str_AudioOutputI2S, + (const bstring *)&be_const_str_widget_ctor_impl, + (const bstring *)&be_const_str_CFG_X3A_X20removing_X20autoconf_X20files, + (const bstring *)&be_const_str__def, + (const bstring *)&be_const_str_param, + (const bstring *)&be_const_str_SERIAL_8N1, NULL, - NULL, - (const bstring *)&be_const_str_button_pressed, - (const bstring *)&be_const_str_atleast1, - (const bstring *)&be_const_str_add_anim, - (const bstring *)&be_const_str_count, - (const bstring *)&be_const_str__X25s_X2Eautoconf, - (const bstring *)&be_const_str_False, - (const bstring *)&be_const_str_time_str, + (const bstring *)&be_const_str_get_aps_voltage, (const bstring *)&be_const_str__X26lt_X3BNone_X26gt_X3B, - (const bstring *)&be_const_str_allocated, + (const bstring *)&be_const_str_clear_first_time, + (const bstring *)&be_const_str__X2F, + (const bstring *)&be_const_str_sinh, + (const bstring *)&be_const_str__X3D, + (const bstring *)&be_const_str__X3A, + (const bstring *)&be_const_str_int, NULL, - (const bstring *)&be_const_str_cb_obj, - (const bstring *)&be_const_str__X21_X3D, - (const bstring *)&be_const_str__X3Cselect_X20name_X3D_X27zip_X27_X3E, + NULL, + (const bstring *)&be_const_str_get_height, + (const bstring *)&be_const_str_SERIAL_7O2, + (const bstring *)&be_const_str__X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E, + (const bstring *)&be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, + (const bstring *)&be_const_str_atan, + (const bstring *)&be_const_str__X5D, + (const bstring *)&be_const_str__X2D_X2D_X3A_X2D_X2D, + (const bstring *)&be_const_str_c, + (const bstring *)&be_const_str_Tele, + (const bstring *)&be_const_str_web_send_decimal, + NULL, + (const bstring *)&be_const_str_gpio, + NULL, + (const bstring *)&be_const_str_HTTP_POST, + (const bstring *)&be_const_str__X2E_X2E, + (const bstring *)&be_const_str_I2C_Driver, + NULL, + (const bstring *)&be_const_str_SERIAL_6E1, + (const bstring *)&be_const_str_read_bytes, + (const bstring *)&be_const_str_AudioOutput, + (const bstring *)&be_const_str_arg_X20must_X20be_X20a_X20subclass_X20of_X20lv_obj, (const bstring *)&be_const_str_OneWire, - (const bstring *)&be_const_str_classof, - (const bstring *)&be_const_str_json, - (const bstring *)&be_const_str_True, - (const bstring *)&be_const_str__X2B, - (const bstring *)&be_const_str_decompress, - (const bstring *)&be_const_str_CFG_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s, - (const bstring *)&be_const_str_lv_event, - (const bstring *)&be_const_str_counters, - (const bstring *)&be_const_str_pc, - (const bstring *)&be_const_str__X2Esize, + (const bstring *)&be_const_str__X23autoexec_X2Ebat, + (const bstring *)&be_const_str_gamma8, + (const bstring *)&be_const_str__available, NULL, - (const bstring *)&be_const_str__X5B, - (const bstring *)&be_const_str__X3C_X2Fform_X3E_X3C_X2Fp_X3E, - (const bstring *)&be_const_str_connection_error, - (const bstring *)&be_const_str_classname, - (const bstring *)&be_const_str_AudioGeneratorWAV, - (const bstring *)&be_const_str_AudioGenerator, - (const bstring *)&be_const_str_Parameter_X20error, - (const bstring *)&be_const_str_get_tasmota, - (const bstring *)&be_const_str_loop, - (const bstring *)&be_const_str__timers, - (const bstring *)&be_const_str_constructor_cb, - (const bstring *)&be_const_str_addr, - (const bstring *)&be_const_str__X2E, - (const bstring *)&be_const_str_RES_OK, - NULL, - (const bstring *)&be_const_str_OPTION_A, - NULL, - (const bstring *)&be_const_str_collect, - (const bstring *)&be_const_str_SERIAL_6O2, - (const bstring *)&be_const_str_AudioFileSourceFS, - (const bstring *)&be_const_str_show, - (const bstring *)&be_const_str__cmd, - (const bstring *)&be_const_str_SERIAL_7N2, (const bstring *)&be_const_str_dirty, - (const bstring *)&be_const_str_SERIAL_7E2, - (const bstring *)&be_const_str__X3E, - (const bstring *)&be_const_str__X2F_X3Frst_X3D, - (const bstring *)&be_const_str__X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, - (const bstring *)&be_const_str_EVENT_DRAW_PART_BEGIN, - (const bstring *)&be_const_str__persist_X2Ejson, - (const bstring *)&be_const_str_tasmota_X2Eset_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eset_X28_X29, - (const bstring *)&be_const_str__X3Clambda_X3E + (const bstring *)&be_const_str_get_bat_voltage, + (const bstring *)&be_const_str_SERIAL_5E1, + (const bstring *)&be_const_str__cmd, + NULL, + (const bstring *)&be_const_str_set_timeouts, + (const bstring *)&be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_manifest_X2Ejson, + (const bstring *)&be_const_str_break, + (const bstring *)&be_const_str__global_def, + (const bstring *)&be_const_str_imax, + (const bstring *)&be_const_str_Restart_X201, + (const bstring *)&be_const_str__X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E, + (const bstring *)&be_const_str__settings_def, + (const bstring *)&be_const_str_encrypt, + (const bstring *)&be_const_str_char, + (const bstring *)&be_const_str__X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D, + (const bstring *)&be_const_str_animators, + (const bstring *)&be_const_str_lvgl_event_dispatch, + (const bstring *)&be_const_str__X2C, + (const bstring *)&be_const_str_webclient, + NULL, + (const bstring *)&be_const_str_couldn_X27t_X20not_X20initialize_X20noepixelbus, + (const bstring *)&be_const_str_pc_abs, + (const bstring *)&be_const_str_every_100ms, + (const bstring *)&be_const_str_cmd, + (const bstring *)&be_const_str_AudioGeneratorWAV, + (const bstring *)&be_const_str_SERIAL_7O1, + (const bstring *)&be_const_str_sec, + (const bstring *)&be_const_str_exec_cmd, + (const bstring *)&be_const_str_remove_driver, + (const bstring *)&be_const_str_point, + (const bstring *)&be_const_str_OPTION_A, + (const bstring *)&be_const_str_readline, + (const bstring *)&be_const_str_set_useragent, + (const bstring *)&be_const_str_BRY_X3A_X20could_X20not_X20save_X20compiled_X20file_X20_X25s_X20_X28_X25s_X29, + (const bstring *)&be_const_str_get_light, + (const bstring *)&be_const_str_CFG_X3A_X20exception_X20_X27_X25s_X27_X20_X2D_X20_X27_X25s_X27, + (const bstring *)&be_const_str_decrypt, + (const bstring *)&be_const_str___iterator__, + (const bstring *)&be_const_str__X3Clambda_X3E, + (const bstring *)&be_const_str_I2C_X3A, + NULL, + (const bstring *)&be_const_str_SERIAL_6E2, + (const bstring *)&be_const_str_isrunning, + (const bstring *)&be_const_str_json_fdump_map, + (const bstring *)&be_const_str_create_custom_widget, + (const bstring *)&be_const_str_event_cb, + (const bstring *)&be_const_str_page_autoconf_ctl, + (const bstring *)&be_const_str_autoexec, + (const bstring *)&be_const_str_contains, + (const bstring *)&be_const_str_, + NULL, + (const bstring *)&be_const_str_tag, + (const bstring *)&be_const_str__X21_X3D_X3D, + (const bstring *)&be_const_str_can_show, + (const bstring *)&be_const_str_local, + (const bstring *)&be_const_str_CFG_X3A_X20_X27init_X2Ebat_X27_X20done_X2C_X20restarting, + NULL, + (const bstring *)&be_const_str__X3C_X2Fform_X3E_X3C_X2Fp_X3E, + NULL, + NULL, + (const bstring *)&be_const_str_has_arg, + NULL, + (const bstring *)&be_const_str_Unknown_X20command, + NULL, + (const bstring *)&be_const_str_lv_event, + (const bstring *)&be_const_str__X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29, + (const bstring *)&be_const_str__X3Cselect_X20name_X3D_X27zip_X27_X3E, + (const bstring *)&be_const_str_reset_search }; static const struct bconststrtab m_const_string_table = { - .size = 359, - .count = 741, + .size = 358, + .count = 740, .table = m_string_table }; diff --git a/lib/libesp32/berry/generate/be_fixed_be_class_map.h b/lib/libesp32/berry/generate/be_fixed_be_class_map.h index f884630e3..d9ce16027 100644 --- a/lib/libesp32/berry/generate/be_fixed_be_class_map.h +++ b/lib/libesp32/berry/generate/be_fixed_be_class_map.h @@ -1,25 +1,23 @@ #include "be_constobj.h" static be_define_const_map_slots(be_class_map_map) { - { be_const_key(setitem, -1), be_const_func(m_setitem) }, - { be_const_key(remove, 8), be_const_func(m_remove) }, - { be_const_key(insert, -1), be_const_func(m_insert) }, - { be_const_key(tostring, 4), be_const_func(m_tostring) }, - { be_const_key(has, -1), be_const_func(m_contains) }, - { be_const_key(init, -1), be_const_func(m_init) }, - { be_const_key(contains, 9), be_const_func(m_contains) }, - { be_const_key(_X2Ep, 13), be_const_var(0) }, - { be_const_key(reduce, -1), be_const_func(m_reduce) }, { be_const_key(size, -1), be_const_func(m_size) }, - { be_const_key(find, -1), be_const_func(m_find) }, + { be_const_key(tostring, -1), be_const_func(m_tostring) }, + { be_const_key(insert, -1), be_const_func(m_insert) }, + { be_const_key(init, -1), be_const_func(m_init) }, + { be_const_key(contains, -1), be_const_func(m_contains) }, { be_const_key(keys, -1), be_const_func(m_keys) }, - { be_const_key(item, -1), be_const_func(m_item) }, - { be_const_key(iter, -1), be_const_func(m_iter) }, + { be_const_key(_X2Ep, -1), be_const_var(0) }, + { be_const_key(iter, 6), be_const_func(m_iter) }, + { be_const_key(setitem, 2), be_const_func(m_setitem) }, + { be_const_key(remove, -1), be_const_func(m_remove) }, + { be_const_key(item, 11), be_const_func(m_item) }, + { be_const_key(find, -1), be_const_func(m_find) }, }; static be_define_const_map( be_class_map_map, - 14 + 12 ); BE_EXPORT_VARIABLE be_define_const_class( diff --git a/lib/libesp32/berry/src/be_byteslib.c b/lib/libesp32/berry/src/be_byteslib.c index 17a5a7d4c..94c8823ae 100644 --- a/lib/libesp32/berry/src/be_byteslib.c +++ b/lib/libesp32/berry/src/be_byteslib.c @@ -1271,38 +1271,38 @@ be_local_closure(getbits, /* name */ &be_const_str_getbits, &be_const_str_solidified, ( &(const binstruction[32]) { /* code */ - 0x180C0500, // 0000 LE R3 R2 K0 - 0x740E0002, // 0001 JMPT R3 #0005 - 0x540E001F, // 0002 LDINT R3 32 - 0x240C0403, // 0003 GT R3 R2 R3 - 0x780E0000, // 0004 JMPF R3 #0006 - 0xB0060302, // 0005 RAISE 1 K1 K2 - 0x580C0000, // 0006 LDCONST R3 K0 - 0x3C100303, // 0007 SHR R4 R1 K3 - 0x54160007, // 0008 LDINT R5 8 - 0x10040205, // 0009 MOD R1 R1 R5 - 0x58140000, // 000A LDCONST R5 K0 - 0x24180500, // 000B GT R6 R2 K0 - 0x781A0011, // 000C JMPF R6 #001F - 0x541A0007, // 000D LDINT R6 8 - 0x04180C01, // 000E SUB R6 R6 R1 - 0x241C0C02, // 000F GT R7 R6 R2 - 0x781E0000, // 0010 JMPF R7 #0012 - 0x5C180400, // 0011 MOVE R6 R2 - 0x381E0806, // 0012 SHL R7 K4 R6 - 0x041C0F04, // 0013 SUB R7 R7 K4 - 0x381C0E01, // 0014 SHL R7 R7 R1 - 0x94200004, // 0015 GETIDX R8 R0 R4 - 0x2C201007, // 0016 AND R8 R8 R7 - 0x3C201001, // 0017 SHR R8 R8 R1 - 0x38201005, // 0018 SHL R8 R8 R5 - 0x300C0608, // 0019 OR R3 R3 R8 - 0x00140A06, // 001A ADD R5 R5 R6 - 0x04080406, // 001B SUB R2 R2 R6 - 0x58040000, // 001C LDCONST R1 K0 - 0x00100904, // 001D ADD R4 R4 K4 - 0x7001FFEB, // 001E JMP #000B - 0x80040600, // 001F RET 1 R3 + 0x180C0500, // 0000 LE R3 R2 K0 + 0x740E0002, // 0001 JMPT R3 #0005 + 0x540E001F, // 0002 LDINT R3 32 + 0x240C0403, // 0003 GT R3 R2 R3 + 0x780E0000, // 0004 JMPF R3 #0006 + 0xB0060302, // 0005 RAISE 1 K1 K2 + 0x580C0000, // 0006 LDCONST R3 K0 + 0x3C100303, // 0007 SHR R4 R1 K3 + 0x54160007, // 0008 LDINT R5 8 + 0x10040205, // 0009 MOD R1 R1 R5 + 0x58140000, // 000A LDCONST R5 K0 + 0x24180500, // 000B GT R6 R2 K0 + 0x781A0011, // 000C JMPF R6 #001F + 0x541A0007, // 000D LDINT R6 8 + 0x04180C01, // 000E SUB R6 R6 R1 + 0x241C0C02, // 000F GT R7 R6 R2 + 0x781E0000, // 0010 JMPF R7 #0012 + 0x5C180400, // 0011 MOVE R6 R2 + 0x381E0806, // 0012 SHL R7 K4 R6 + 0x041C0F04, // 0013 SUB R7 R7 K4 + 0x381C0E01, // 0014 SHL R7 R7 R1 + 0x94200004, // 0015 GETIDX R8 R0 R4 + 0x2C201007, // 0016 AND R8 R8 R7 + 0x3C201001, // 0017 SHR R8 R8 R1 + 0x38201005, // 0018 SHL R8 R8 R5 + 0x300C0608, // 0019 OR R3 R3 R8 + 0x00140A06, // 001A ADD R5 R5 R6 + 0x04080406, // 001B SUB R2 R2 R6 + 0x58040000, // 001C LDCONST R1 K0 + 0x00100904, // 001D ADD R4 R4 K4 + 0x7001FFEB, // 001E JMP #000B + 0x80040600, // 001F RET 1 R3 }) ) ); @@ -1331,43 +1331,43 @@ be_local_closure(setbits, /* name */ &be_const_str_setbits, &be_const_str_solidified, ( &(const binstruction[37]) { /* code */ - 0x14100500, // 0000 LT R4 R2 K0 - 0x74120002, // 0001 JMPT R4 #0005 - 0x5412001F, // 0002 LDINT R4 32 - 0x24100404, // 0003 GT R4 R2 R4 - 0x78120000, // 0004 JMPF R4 #0006 - 0xB0060302, // 0005 RAISE 1 K1 K2 - 0x60100009, // 0006 GETGBL R4 G9 - 0x5C140600, // 0007 MOVE R5 R3 - 0x7C100200, // 0008 CALL R4 1 - 0x5C0C0800, // 0009 MOVE R3 R4 - 0x3C100303, // 000A SHR R4 R1 K3 - 0x54160007, // 000B LDINT R5 8 - 0x10040205, // 000C MOD R1 R1 R5 - 0x24140500, // 000D GT R5 R2 K0 - 0x78160014, // 000E JMPF R5 #0024 - 0x54160007, // 000F LDINT R5 8 - 0x04140A01, // 0010 SUB R5 R5 R1 - 0x24180A02, // 0011 GT R6 R5 R2 - 0x781A0000, // 0012 JMPF R6 #0014 - 0x5C140400, // 0013 MOVE R5 R2 - 0x381A0805, // 0014 SHL R6 K4 R5 - 0x04180D04, // 0015 SUB R6 R6 K4 - 0x541E00FE, // 0016 LDINT R7 255 - 0x38200C01, // 0017 SHL R8 R6 R1 - 0x041C0E08, // 0018 SUB R7 R7 R8 - 0x94200004, // 0019 GETIDX R8 R0 R4 - 0x2C201007, // 001A AND R8 R8 R7 - 0x2C240606, // 001B AND R9 R3 R6 - 0x38241201, // 001C SHL R9 R9 R1 - 0x30201009, // 001D OR R8 R8 R9 - 0x98000808, // 001E SETIDX R0 R4 R8 - 0x3C0C0605, // 001F SHR R3 R3 R5 - 0x04080405, // 0020 SUB R2 R2 R5 - 0x58040000, // 0021 LDCONST R1 K0 - 0x00100904, // 0022 ADD R4 R4 K4 - 0x7001FFE8, // 0023 JMP #000D - 0x80040000, // 0024 RET 1 R0 + 0x14100500, // 0000 LT R4 R2 K0 + 0x74120002, // 0001 JMPT R4 #0005 + 0x5412001F, // 0002 LDINT R4 32 + 0x24100404, // 0003 GT R4 R2 R4 + 0x78120000, // 0004 JMPF R4 #0006 + 0xB0060302, // 0005 RAISE 1 K1 K2 + 0x60100009, // 0006 GETGBL R4 G9 + 0x5C140600, // 0007 MOVE R5 R3 + 0x7C100200, // 0008 CALL R4 1 + 0x5C0C0800, // 0009 MOVE R3 R4 + 0x3C100303, // 000A SHR R4 R1 K3 + 0x54160007, // 000B LDINT R5 8 + 0x10040205, // 000C MOD R1 R1 R5 + 0x24140500, // 000D GT R5 R2 K0 + 0x78160014, // 000E JMPF R5 #0024 + 0x54160007, // 000F LDINT R5 8 + 0x04140A01, // 0010 SUB R5 R5 R1 + 0x24180A02, // 0011 GT R6 R5 R2 + 0x781A0000, // 0012 JMPF R6 #0014 + 0x5C140400, // 0013 MOVE R5 R2 + 0x381A0805, // 0014 SHL R6 K4 R5 + 0x04180D04, // 0015 SUB R6 R6 K4 + 0x541E00FE, // 0016 LDINT R7 255 + 0x38200C01, // 0017 SHL R8 R6 R1 + 0x041C0E08, // 0018 SUB R7 R7 R8 + 0x94200004, // 0019 GETIDX R8 R0 R4 + 0x2C201007, // 001A AND R8 R8 R7 + 0x2C240606, // 001B AND R9 R3 R6 + 0x38241201, // 001C SHL R9 R9 R1 + 0x30201009, // 001D OR R8 R8 R9 + 0x98000808, // 001E SETIDX R0 R4 R8 + 0x3C0C0605, // 001F SHR R3 R3 R5 + 0x04080405, // 0020 SUB R2 R2 R5 + 0x58040000, // 0021 LDCONST R1 K0 + 0x00100904, // 0022 ADD R4 R4 K4 + 0x7001FFE8, // 0023 JMP #000D + 0x80040000, // 0024 RET 1 R0 }) ) ); diff --git a/lib/libesp32/berry/src/be_constobj.h b/lib/libesp32/berry/src/be_constobj.h index 8716d7fe2..2ffe6a0ce 100644 --- a/lib/libesp32/berry/src/be_constobj.h +++ b/lib/libesp32/berry/src/be_constobj.h @@ -201,15 +201,6 @@ const bntvmodule be_native_module(_module) = { \ .members = _members \ } -// #define be_local_instance(_name, _class_ptr, _members) \ -// static const binstance i_##_name = { \ -// be_const_header(BE_INSTANCE), \ -// .super = NULL, \ -// .sub = NULL, \ -// ._class = (bclass*) _class_ptr, \ -// .members = _members \ -// } - #define be_nested_map(_size, _slots) \ & (const bmap) { \ be_const_header(BE_MAP), \ @@ -233,13 +224,6 @@ const bntvmodule be_native_module(_module) = { \ BE_STRING \ } -#define be_nested_str_literal(_str) \ - { \ - { .s=(be_nested_const_str(_str, 0, sizeof(_str)-1 )) \ - }, \ - BE_STRING \ - } - #define be_str_literal(_str) \ be_nested_const_str(_str, 0, sizeof(_str)-1 ) diff --git a/lib/libesp32/berry/src/be_gc.c b/lib/libesp32/berry/src/be_gc.c index 8d19affb1..19e88cb12 100644 --- a/lib/libesp32/berry/src/be_gc.c +++ b/lib/libesp32/berry/src/be_gc.c @@ -561,5 +561,9 @@ void be_gc_collect(bvm *vm) reset_fixedlist(vm); /* step 5: calculate the next GC threshold */ vm->gc.threshold = next_threshold(vm->gc); +#if BE_USE_PERF_COUNTERS if (vm->obshook != NULL) (*vm->obshook)(vm, BE_OBS_GC_END, vm->gc.usage, vm->counter_gc_kept, vm->counter_gc_freed); +#else + if (vm->obshook != NULL) (*vm->obshook)(vm, BE_OBS_GC_END, vm->gc.usage); +#endif } diff --git a/lib/libesp32/berry/src/be_maplib.c b/lib/libesp32/berry/src/be_maplib.c index a8fc7309e..d1574f280 100644 --- a/lib/libesp32/berry/src/be_maplib.c +++ b/lib/libesp32/berry/src/be_maplib.c @@ -212,62 +212,6 @@ static int m_keys(bvm *vm) be_return(vm); } -/* apply a function/closure to each element of a map */ -/* `map.reduce(f:function [, initializer:any]) -> any` */ -/* Calls for each element `f(key, value, acc) -> any` */ -/* `acc` is initialized with `initilizer` if present or `nil` */ -/* the return value of the function becomes the next value passed in arg `acc` */ -static int m_reduce(bvm *vm) -{ - int argc = be_top(vm); - if (argc > 1 && be_isfunction(vm, 2)) { - bbool has_initializer = (argc > 2); - /* get map internal object */ - be_getmember(vm, 1, ".p"); - bvalue *v = be_indexof(vm, -1); - bmap *map = cast(bmap*, var_toobj(v)); - /* get the number of slots if any */ - int slots_initial = be_map_size(map); - /* place-holder for on-going value and return value */ - if (has_initializer) { - be_pushvalue(vm, 3); - } else { - be_pushnil(vm); /* if no initializer use `nil` */ - } - for (int i = 0; i < slots_initial; i++) { - bmapnode * node = map->slots + i; - if (!var_isnil(&node->key)) { /* is the key present in this slot? */ - be_pushvalue(vm, 2); /* push function */ - - bvalue kv; /* push key on stack */ - kv.type = node->key.type; - kv.v = node->key.v; - bvalue *reg = vm->top; - var_setval(reg, &kv); - be_incrtop(vm); - - reg = vm->top; /* push value on stack */ - var_setval(reg, &node->value); - be_incrtop(vm); - - be_pushvalue(vm, -4); - - be_call(vm, 3); - be_pop(vm, 3); /* pop args, keep return value */ - be_remove(vm, -2); /* remove previous accumulator, keep return value from function */ - } - /* check if the map has been resized during the call */ - if (be_map_size(map) != slots_initial) { - be_raise(vm, "stop_iteration", "map resized within apply"); - break; /* abort */ - } - } - be_return(vm); - } - be_raise(vm, "value_error", "needs function as first argument"); - be_return_nil(vm); -} - #if !BE_USE_PRECOMPILED_OBJECT void be_load_maplib(bvm *vm) { @@ -280,12 +224,10 @@ void be_load_maplib(bvm *vm) { "setitem", m_setitem }, { "find", m_find }, { "contains", m_contains }, - { "has", m_contains }, /* deprecated */ { "size", m_size }, { "insert", m_insert }, { "iter", m_iter }, { "keys", m_keys }, - { "reduce", m_reduce }, { NULL, NULL } }; be_regclass(vm, "map", members); @@ -301,12 +243,10 @@ class be_class_map (scope: global, name: map) { setitem, func(m_setitem) find, func(m_find) contains, func(m_contains) - has, func(m_contains) size, func(m_size) insert, func(m_insert) iter, func(m_iter) keys, func(m_keys) - reduce, func(m_reduce) } @const_object_info_end */ #include "../generate/be_fixed_be_class_map.h" diff --git a/lib/libesp32/berry/src/be_solidifylib.c b/lib/libesp32/berry/src/be_solidifylib.c index 581131b75..4d4e3bcb6 100644 --- a/lib/libesp32/berry/src/be_solidifylib.c +++ b/lib/libesp32/berry/src/be_solidifylib.c @@ -38,11 +38,11 @@ extern const bclass be_class_map; be_writestring(__lbuf); \ } while (0) -/******************************************************************** +/********************************************************************\ * Encode string to identifiers * * `_X` is used as an escape marker -/********************************************************************/ +\********************************************************************/ static unsigned toidentifier_length(const char *s) { unsigned len = 1; @@ -115,7 +115,6 @@ static void m_solidify_map(bvm *vm, bmap * map, const char *class_name) be_raise(vm, "internal_error", error); } int key_next = node->key.next; - size_t len = strlen(str(node->key.v.s)); if (0xFFFFFF == key_next) { key_next = -1; /* more readable */ } @@ -192,10 +191,16 @@ static void m_solidify_bvalue(bvm *vm, bvalue * value, const char *classname, co } break; case BE_CLOSURE: - logfmt("be_const_%sclosure(%s%s%s_closure)", - func_isstatic(value) ? "static_" : "", - classname ? classname : "", classname ? "_" : "", - str(((bclosure*) var_toobj(value))->proto->name)); + { + const char * func_name = str(((bclosure*) var_toobj(value))->proto->name); + size_t id_len = toidentifier_length(func_name); + char func_name_id[id_len]; + toidentifier(func_name_id, func_name); + logfmt("be_const_%sclosure(%s%s%s_closure)", + func_isstatic(value) ? "static_" : "", + classname ? classname : "", classname ? "_" : "", + func_name_id); + } break; case BE_CLASS: logfmt("be_const_class(be_class_%s)", str(((bclass*) var_toobj(value))->name)); @@ -365,9 +370,14 @@ static void m_solidify_closure(bvm *vm, bclosure *cl, const char * classname, in logfmt("** Solidified function: %s\n", func_name); logfmt("********************************************************************/\n"); - logfmt("be_local_closure(%s%s%s, /* name */\n", - classname ? classname : "", classname ? "_" : "", - func_name); + { + size_t id_len = toidentifier_length(func_name); + char func_name_id[id_len]; + toidentifier(func_name_id, func_name); + logfmt("be_local_closure(%s%s%s, /* name */\n", + classname ? classname : "", classname ? "_" : "", + func_name_id); + } m_solidify_proto(vm, pr, func_name, builtins, indent); logfmt("\n"); From ef764fcc70c1650ba2702db6dc6a268c481b61b8 Mon Sep 17 00:00:00 2001 From: Stephan Hadinger Date: Thu, 16 Dec 2021 08:50:35 +0100 Subject: [PATCH 050/402] Put back map.has (deprecated) --- .../berry/generate/be_fixed_be_class_map.h | 19 ++++++++++--------- lib/libesp32/berry/src/be_maplib.c | 2 ++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/lib/libesp32/berry/generate/be_fixed_be_class_map.h b/lib/libesp32/berry/generate/be_fixed_be_class_map.h index d9ce16027..db15432d4 100644 --- a/lib/libesp32/berry/generate/be_fixed_be_class_map.h +++ b/lib/libesp32/berry/generate/be_fixed_be_class_map.h @@ -1,23 +1,24 @@ #include "be_constobj.h" static be_define_const_map_slots(be_class_map_map) { - { be_const_key(size, -1), be_const_func(m_size) }, { be_const_key(tostring, -1), be_const_func(m_tostring) }, - { be_const_key(insert, -1), be_const_func(m_insert) }, - { be_const_key(init, -1), be_const_func(m_init) }, { be_const_key(contains, -1), be_const_func(m_contains) }, + { be_const_key(item, 4), be_const_func(m_item) }, + { be_const_key(setitem, 9), be_const_func(m_setitem) }, + { be_const_key(has, -1), be_const_func(m_contains) }, { be_const_key(keys, -1), be_const_func(m_keys) }, + { be_const_key(init, -1), be_const_func(m_init) }, + { be_const_key(remove, 5), be_const_func(m_remove) }, + { be_const_key(size, -1), be_const_func(m_size) }, + { be_const_key(iter, -1), be_const_func(m_iter) }, + { be_const_key(insert, -1), be_const_func(m_insert) }, { be_const_key(_X2Ep, -1), be_const_var(0) }, - { be_const_key(iter, 6), be_const_func(m_iter) }, - { be_const_key(setitem, 2), be_const_func(m_setitem) }, - { be_const_key(remove, -1), be_const_func(m_remove) }, - { be_const_key(item, 11), be_const_func(m_item) }, - { be_const_key(find, -1), be_const_func(m_find) }, + { be_const_key(find, 8), be_const_func(m_find) }, }; static be_define_const_map( be_class_map_map, - 12 + 13 ); BE_EXPORT_VARIABLE be_define_const_class( diff --git a/lib/libesp32/berry/src/be_maplib.c b/lib/libesp32/berry/src/be_maplib.c index d1574f280..fc9f09fe7 100644 --- a/lib/libesp32/berry/src/be_maplib.c +++ b/lib/libesp32/berry/src/be_maplib.c @@ -224,6 +224,7 @@ void be_load_maplib(bvm *vm) { "setitem", m_setitem }, { "find", m_find }, { "contains", m_contains }, + { "has", m_contains }, /* deprecated */ { "size", m_size }, { "insert", m_insert }, { "iter", m_iter }, @@ -243,6 +244,7 @@ class be_class_map (scope: global, name: map) { setitem, func(m_setitem) find, func(m_find) contains, func(m_contains) + has, func(m_contains) size, func(m_size) insert, func(m_insert) iter, func(m_iter) From 6d9e4279709ebdc0cec928b167503f273f1a6212 Mon Sep 17 00:00:00 2001 From: Stephan Hadinger Date: Thu, 16 Dec 2021 13:57:12 +0100 Subject: [PATCH 051/402] Fix Berry I2C driver lib with latest changes --- lib/libesp32/berry/default/be_driverlib.c | 81 +++-------------- lib/libesp32/berry/default/be_i2c_driverlib.c | 86 +++++++++---------- lib/libesp32/berry/default/embedded/Driver.be | 7 -- .../berry/default/embedded/i2c_driver.be | 2 - lib/libesp32/berry/generate/be_const_strtab.h | 1 - .../berry/generate/be_const_strtab_def.h | 5 +- .../berry/drivers/i2c_axp192_M5StackCore2.be | 4 +- 7 files changed, 61 insertions(+), 125 deletions(-) diff --git a/lib/libesp32/berry/default/be_driverlib.c b/lib/libesp32/berry/default/be_driverlib.c index 45a611382..0d163f836 100644 --- a/lib/libesp32/berry/default/be_driverlib.c +++ b/lib/libesp32/berry/default/be_driverlib.c @@ -6,57 +6,6 @@ *******************************************************************/ #include "be_constobj.h" -/******************************************************************** -** Solidified function: init -********************************************************************/ -be_local_closure(Driver_init, /* name */ - be_nested_proto( - 1, /* nstack */ - 1, /* argc */ - 0, /* varg */ - 0, /* has upvals */ - NULL, /* no upvals */ - 0, /* has sup protos */ - NULL, /* no sub protos */ - 0, /* has constants */ - NULL, /* no const */ - &be_const_str_init, - &be_const_str_solidified, - ( &(const binstruction[ 1]) { /* code */ - 0x80000000, // 0000 RET 0 - }) - ) -); -/*******************************************************************/ - - -/******************************************************************** -** Solidified function: get_tasmota -********************************************************************/ -be_local_closure(Driver_get_tasmota, /* name */ - be_nested_proto( - 2, /* nstack */ - 1, /* argc */ - 0, /* varg */ - 0, /* has upvals */ - NULL, /* no upvals */ - 0, /* has sup protos */ - NULL, /* no sub protos */ - 1, /* has constants */ - ( &(const bvalue[ 1]) { /* constants */ - /* K0 */ be_nested_str(tasmota), - }), - &be_const_str_get_tasmota, - &be_const_str_solidified, - ( &(const binstruction[ 2]) { /* code */ - 0xB8060000, // 0000 GETNGBL R1 K0 - 0x80040200, // 0001 RET 1 R1 - }) - ) -); -/*******************************************************************/ - - /******************************************************************** ** Solidified function: add_cmd ********************************************************************/ @@ -123,24 +72,22 @@ be_local_closure(Driver_add_cmd, /* name */ be_local_class(Driver, 13, NULL, - be_nested_map(16, + be_nested_map(14, ( (struct bmapnode*) &(const bmapnode[]) { - { be_const_key(web_add_main_button, 14), be_const_var(4) }, - { be_const_key(web_add_console_button, -1), be_const_var(7) }, - { be_const_key(web_add_management_button, 8), be_const_var(5) }, - { be_const_key(init, -1), be_const_closure(Driver_init_closure) }, - { be_const_key(json_append, -1), be_const_var(10) }, - { be_const_key(web_add_config_button, 7), be_const_var(6) }, - { be_const_key(every_100ms, -1), be_const_var(1) }, - { be_const_key(display, -1), be_const_var(12) }, - { be_const_key(web_add_button, 13), be_const_var(3) }, - { be_const_key(every_second, -1), be_const_var(0) }, - { be_const_key(save_before_restart, -1), be_const_var(8) }, - { be_const_key(get_tasmota, -1), be_const_closure(Driver_get_tasmota_closure) }, - { be_const_key(web_sensor, 6), be_const_var(9) }, - { be_const_key(web_add_handler, -1), be_const_var(2) }, - { be_const_key(button_pressed, 1), be_const_var(11) }, + { be_const_key(web_add_console_button, 6), be_const_var(7) }, + { be_const_key(web_add_config_button, -1), be_const_var(6) }, + { be_const_key(button_pressed, 9), be_const_var(11) }, + { be_const_key(every_second, 1), be_const_var(0) }, + { be_const_key(web_add_handler, 11), be_const_var(2) }, { be_const_key(add_cmd, -1), be_const_closure(Driver_add_cmd_closure) }, + { be_const_key(web_sensor, -1), be_const_var(9) }, + { be_const_key(display, -1), be_const_var(12) }, + { be_const_key(web_add_main_button, 2), be_const_var(4) }, + { be_const_key(save_before_restart, -1), be_const_var(8) }, + { be_const_key(web_add_management_button, 0), be_const_var(5) }, + { be_const_key(every_100ms, 13), be_const_var(1) }, + { be_const_key(json_append, -1), be_const_var(10) }, + { be_const_key(web_add_button, -1), be_const_var(3) }, })), be_str_literal("Driver") ); diff --git a/lib/libesp32/berry/default/be_i2c_driverlib.c b/lib/libesp32/berry/default/be_i2c_driverlib.c index 45f829e19..a61321c12 100644 --- a/lib/libesp32/berry/default/be_i2c_driverlib.c +++ b/lib/libesp32/berry/default/be_i2c_driverlib.c @@ -279,7 +279,7 @@ be_local_closure(I2C_Driver_read8, /* name */ ********************************************************************/ be_local_closure(I2C_Driver_init, /* name */ be_nested_proto( - 10, /* nstack */ + 9, /* nstack */ 4, /* argc */ 0, /* varg */ 0, /* has upvals */ @@ -288,7 +288,7 @@ be_local_closure(I2C_Driver_init, /* name */ NULL, /* no sub protos */ 1, /* has constants */ ( &(const bvalue[10]) { /* constants */ - /* K0 */ be_nested_str(get_tasmota), + /* K0 */ be_nested_str(tasmota), /* K1 */ be_nested_str(i2c_enabled), /* K2 */ be_nested_str(addr), /* K3 */ be_nested_str(wire), @@ -302,49 +302,49 @@ be_local_closure(I2C_Driver_init, /* name */ &be_const_str_init, &be_const_str_solidified, ( &(const binstruction[44]) { /* code */ - 0x8C100100, // 0000 GETMET R4 R0 K0 - 0x7C100200, // 0001 CALL R4 1 - 0x4C140000, // 0002 LDNIL R5 - 0x20140605, // 0003 NE R5 R3 R5 - 0x78160004, // 0004 JMPF R5 #000A - 0x8C140901, // 0005 GETMET R5 R4 K1 - 0x5C1C0600, // 0006 MOVE R7 R3 - 0x7C140400, // 0007 CALL R5 2 - 0x74160000, // 0008 JMPT R5 #000A - 0x80000A00, // 0009 RET 0 - 0x90020402, // 000A SETMBR R0 K2 R2 - 0x8C140904, // 000B GETMET R5 R4 K4 - 0x881C0102, // 000C GETMBR R7 R0 K2 - 0x7C140400, // 000D CALL R5 2 - 0x90020605, // 000E SETMBR R0 K3 R5 - 0x88140103, // 000F GETMBR R5 R0 K3 - 0x78160019, // 0010 JMPF R5 #002B - 0x60140004, // 0011 GETGBL R5 G4 - 0x5C180200, // 0012 MOVE R6 R1 - 0x7C140200, // 0013 CALL R5 1 - 0x1C140B05, // 0014 EQ R5 R5 K5 - 0x78160004, // 0015 JMPF R5 #001B - 0x5C140200, // 0016 MOVE R5 R1 - 0x5C180000, // 0017 MOVE R6 R0 - 0x7C140200, // 0018 CALL R5 1 - 0x90020C05, // 0019 SETMBR R0 K6 R5 + 0x4C100000, // 0000 LDNIL R4 + 0x20100604, // 0001 NE R4 R3 R4 + 0x78120005, // 0002 JMPF R4 #0009 + 0xB8120000, // 0003 GETNGBL R4 K0 + 0x8C100901, // 0004 GETMET R4 R4 K1 + 0x5C180600, // 0005 MOVE R6 R3 + 0x7C100400, // 0006 CALL R4 2 + 0x74120000, // 0007 JMPT R4 #0009 + 0x80000800, // 0008 RET 0 + 0x90020402, // 0009 SETMBR R0 K2 R2 + 0xB8120000, // 000A GETNGBL R4 K0 + 0x8C100904, // 000B GETMET R4 R4 K4 + 0x88180102, // 000C GETMBR R6 R0 K2 + 0x7C100400, // 000D CALL R4 2 + 0x90020604, // 000E SETMBR R0 K3 R4 + 0x88100103, // 000F GETMBR R4 R0 K3 + 0x78120019, // 0010 JMPF R4 #002B + 0x60100004, // 0011 GETGBL R4 G4 + 0x5C140200, // 0012 MOVE R5 R1 + 0x7C100200, // 0013 CALL R4 1 + 0x1C100905, // 0014 EQ R4 R4 K5 + 0x78120004, // 0015 JMPF R4 #001B + 0x5C100200, // 0016 MOVE R4 R1 + 0x5C140000, // 0017 MOVE R5 R0 + 0x7C100200, // 0018 CALL R4 1 + 0x90020C04, // 0019 SETMBR R0 K6 R4 0x70020000, // 001A JMP #001C 0x90020C01, // 001B SETMBR R0 K6 R1 - 0x88140106, // 001C GETMBR R5 R0 K6 - 0x4C180000, // 001D LDNIL R6 - 0x1C140A06, // 001E EQ R5 R5 R6 - 0x78160001, // 001F JMPF R5 #0022 - 0x4C140000, // 0020 LDNIL R5 - 0x90020605, // 0021 SETMBR R0 K3 R5 - 0x88140103, // 0022 GETMBR R5 R0 K3 - 0x78160006, // 0023 JMPF R5 #002B - 0x60140001, // 0024 GETGBL R5 G1 - 0x58180007, // 0025 LDCONST R6 K7 - 0x881C0106, // 0026 GETMBR R7 R0 K6 - 0x58200008, // 0027 LDCONST R8 K8 - 0x88240103, // 0028 GETMBR R9 R0 K3 - 0x88241309, // 0029 GETMBR R9 R9 K9 - 0x7C140800, // 002A CALL R5 4 + 0x88100106, // 001C GETMBR R4 R0 K6 + 0x4C140000, // 001D LDNIL R5 + 0x1C100805, // 001E EQ R4 R4 R5 + 0x78120001, // 001F JMPF R4 #0022 + 0x4C100000, // 0020 LDNIL R4 + 0x90020604, // 0021 SETMBR R0 K3 R4 + 0x88100103, // 0022 GETMBR R4 R0 K3 + 0x78120006, // 0023 JMPF R4 #002B + 0x60100001, // 0024 GETGBL R4 G1 + 0x58140007, // 0025 LDCONST R5 K7 + 0x88180106, // 0026 GETMBR R6 R0 K6 + 0x581C0008, // 0027 LDCONST R7 K8 + 0x88200103, // 0028 GETMBR R8 R0 K3 + 0x88201109, // 0029 GETMBR R8 R8 K9 + 0x7C100800, // 002A CALL R4 4 0x80000000, // 002B RET 0 }) ) diff --git a/lib/libesp32/berry/default/embedded/Driver.be b/lib/libesp32/berry/default/embedded/Driver.be index d0782f024..bb365aa29 100644 --- a/lib/libesp32/berry/default/embedded/Driver.be +++ b/lib/libesp32/berry/default/embedded/Driver.be @@ -16,13 +16,6 @@ class Driver var button_pressed var display - def init() - end - - def get_tasmota() - return tasmota - end - def add_cmd(c, f) tasmota.add_cmd(c, / cmd, idx, payload, payload_json -> f(self, cmd, idx, payload, payload_json)) end diff --git a/lib/libesp32/berry/default/embedded/i2c_driver.be b/lib/libesp32/berry/default/embedded/i2c_driver.be index a66afa5ad..816a4d9be 100644 --- a/lib/libesp32/berry/default/embedded/i2c_driver.be +++ b/lib/libesp32/berry/default/embedded/i2c_driver.be @@ -29,8 +29,6 @@ class I2C_Driver - i2c_index : Tasmota I2C index, see `I2CDEVICES.md` (int) --# def init(name_or_detect, addr, i2c_index) - var tasmota = self.get_tasmota() #- retrieve the 'tasmota' singleton -# - #- check if the i2c index is disabled by Tasmota configuration -# if i2c_index != nil && !tasmota.i2c_enabled(i2c_index) return end diff --git a/lib/libesp32/berry/generate/be_const_strtab.h b/lib/libesp32/berry/generate/be_const_strtab.h index 0635eefc5..3c0d37bc8 100644 --- a/lib/libesp32/berry/generate/be_const_strtab.h +++ b/lib/libesp32/berry/generate/be_const_strtab.h @@ -400,7 +400,6 @@ extern const bcstring be_const_str_get_style_bg_color; extern const bcstring be_const_str_get_style_line_color; extern const bcstring be_const_str_get_style_pad_right; extern const bcstring be_const_str_get_switch; -extern const bcstring be_const_str_get_tasmota; extern const bcstring be_const_str_get_temp; extern const bcstring be_const_str_get_vbus_current; extern const bcstring be_const_str_get_vbus_voltage; diff --git a/lib/libesp32/berry/generate/be_const_strtab_def.h b/lib/libesp32/berry/generate/be_const_strtab_def.h index 9cfcd09bc..544cfdd52 100644 --- a/lib/libesp32/berry/generate/be_const_strtab_def.h +++ b/lib/libesp32/berry/generate/be_const_strtab_def.h @@ -264,7 +264,7 @@ be_define_const_str(collect, "collect", 2399039025u, 0, 7, &be_const_str_json_fd be_define_const_str(color, "color", 1031692888u, 0, 5, &be_const_str_del); be_define_const_str(compile, "compile", 1000265118u, 0, 7, &be_const_str_skip); be_define_const_str(compress, "compress", 2818084237u, 0, 8, &be_const_str_width_def); -be_define_const_str(concat, "concat", 4124019837u, 0, 6, &be_const_str_get_tasmota); +be_define_const_str(concat, "concat", 4124019837u, 0, 6, NULL); be_define_const_str(connect, "connect", 2866859257u, 0, 7, &be_const_str_resolvecmnd); be_define_const_str(connected, "connected", 1424938192u, 0, 9, &be_const_str_exp); be_define_const_str(connection_error, "connection_error", 1358926260u, 0, 16, &be_const_str_tanh); @@ -392,7 +392,6 @@ be_define_const_str(get_style_bg_color, "get_style_bg_color", 964794381u, 0, 18, be_define_const_str(get_style_line_color, "get_style_line_color", 805371932u, 0, 20, &be_const_str_ip); be_define_const_str(get_style_pad_right, "get_style_pad_right", 3150287466u, 0, 19, NULL); be_define_const_str(get_switch, "get_switch", 164821028u, 0, 10, &be_const_str_init_draw_line_dsc); -be_define_const_str(get_tasmota, "get_tasmota", 334356779u, 0, 11, NULL); be_define_const_str(get_temp, "get_temp", 3370919486u, 0, 8, NULL); be_define_const_str(get_vbus_current, "get_vbus_current", 1205347942u, 0, 16, &be_const_str_rotate); be_define_const_str(get_vbus_voltage, "get_vbus_voltage", 2398210401u, 0, 16, NULL); @@ -1102,6 +1101,6 @@ static const bstring* const m_string_table[] = { static const struct bconststrtab m_const_string_table = { .size = 358, - .count = 740, + .count = 739, .table = m_string_table }; diff --git a/tasmota/berry/drivers/i2c_axp192_M5StackCore2.be b/tasmota/berry/drivers/i2c_axp192_M5StackCore2.be index 79e6ee7f6..212fc8e32 100644 --- a/tasmota/berry/drivers/i2c_axp192_M5StackCore2.be +++ b/tasmota/berry/drivers/i2c_axp192_M5StackCore2.be @@ -67,9 +67,9 @@ class AXP192_M5Stack_Core2 : AXP192 # Reset LCD Controller self.set_lcd_reset(false) - self.get_tasmota().delay(100) # wait for 100ms + tasmota.delay(100) # wait for 100ms self.set_lcd_reset(true) - self.get_tasmota().delay(100) # wait for 100ms + tasmota.delay(100) # wait for 100ms # bus power mode_output self.set_buf_power_mode(false) From fe682ea97f8136cf85bbbaf1589b914b17a55d34 Mon Sep 17 00:00:00 2001 From: Stephan Hadinger Date: Thu, 16 Dec 2021 16:43:13 +0100 Subject: [PATCH 052/402] Berry fix memory corruption due to unicode character --- lib/libesp32/berry/default/be_i2c_axp192_lib.c | 2 +- lib/libesp32/berry/default/embedded/i2c_axp192.be | 2 +- lib/libesp32/berry/generate/be_const_strtab.h | 2 +- lib/libesp32/berry/generate/be_const_strtab_def.h | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libesp32/berry/default/be_i2c_axp192_lib.c b/lib/libesp32/berry/default/be_i2c_axp192_lib.c index 4f9f02307..528ce2f4c 100644 --- a/lib/libesp32/berry/default/be_i2c_axp192_lib.c +++ b/lib/libesp32/berry/default/be_i2c_axp192_lib.c @@ -712,7 +712,7 @@ be_local_closure(AXP192_web_sensor, /* name */ /* K4 */ be_nested_str(_X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D), /* K5 */ be_nested_str(_X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D), /* K6 */ be_nested_str(_X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D), - /* K7 */ be_nested_str(_X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_XB0C_X7Be_X7D), + /* K7 */ be_nested_str(_X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20C_X7Be_X7D), /* K8 */ be_nested_str(get_vbus_voltage), /* K9 */ be_nested_str(get_bat_voltage), /* K10 */ be_nested_str(get_bat_current), diff --git a/lib/libesp32/berry/default/embedded/i2c_axp192.be b/lib/libesp32/berry/default/embedded/i2c_axp192.be index 3d958334f..2869b1d38 100644 --- a/lib/libesp32/berry/default/embedded/i2c_axp192.be +++ b/lib/libesp32/berry/default/embedded/i2c_axp192.be @@ -153,7 +153,7 @@ class AXP192 : I2C_Driver "{s}Batt Voltage{m}%.3f V{e}".. "{s}Batt Current{m}%.1f mA{e}".. #"{s}Batt Power{m}%.3f{e}".. - "{s}Temp AXP{m}%.1f °C{e}", + "{s}Temp AXP{m}%.1f C{e}", self.get_vbus_voltage(), self.get_vbus_voltage(), self.get_bat_voltage(), self.get_bat_current(), #self.get_bat_power(), diff --git a/lib/libesp32/berry/generate/be_const_strtab.h b/lib/libesp32/berry/generate/be_const_strtab.h index 3c0d37bc8..977069d28 100644 --- a/lib/libesp32/berry/generate/be_const_strtab.h +++ b/lib/libesp32/berry/generate/be_const_strtab.h @@ -162,7 +162,7 @@ extern const bcstring be_const_str__X7B; extern const bcstring be_const_str__X7B_X7D; extern const bcstring be_const_str__X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D; extern const bcstring be_const_str__X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D; -extern const bcstring be_const_str__X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_XB0C_X7Be_X7D; +extern const bcstring be_const_str__X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20C_X7Be_X7D; extern const bcstring be_const_str__X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D; extern const bcstring be_const_str__X7Bs_X7DVBus_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D; extern const bcstring be_const_str__X7D; diff --git a/lib/libesp32/berry/generate/be_const_strtab_def.h b/lib/libesp32/berry/generate/be_const_strtab_def.h index 544cfdd52..3375cece2 100644 --- a/lib/libesp32/berry/generate/be_const_strtab_def.h +++ b/lib/libesp32/berry/generate/be_const_strtab_def.h @@ -577,7 +577,7 @@ be_define_const_str(run_deferred, "run_deferred", 371594696u, 0, 12, NULL); be_define_const_str(running, "running", 343848780u, 0, 7, NULL); be_define_const_str(save, "save", 3439296072u, 0, 4, NULL); be_define_const_str(save_before_restart, "save_before_restart", 1253239338u, 0, 19, &be_const_str_scale_uint); -be_define_const_str(scale_uint, "scale_uint", 3090811094u, 0, 10, &be_const_str__X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_XB0C_X7Be_X7D); +be_define_const_str(scale_uint, "scale_uint", 3090811094u, 0, 10, NULL); be_define_const_str(scan, "scan", 3974641896u, 0, 4, NULL); be_define_const_str(search, "search", 2150836393u, 0, 6, NULL); be_define_const_str(sec, "sec", 3139892658u, 0, 3, NULL); @@ -642,7 +642,7 @@ be_define_const_str(super, "super", 4152230356u, 0, 5, NULL); be_define_const_str(sys, "sys", 3277365014u, 0, 3, NULL); be_define_const_str(tag, "tag", 2516003219u, 0, 3, NULL); be_define_const_str(tan, "tan", 2633446552u, 0, 3, &be_const_str_do); -be_define_const_str(tanh, "tanh", 153638352u, 0, 4, NULL); +be_define_const_str(tanh, "tanh", 153638352u, 0, 4, &be_const_str__X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20C_X7Be_X7D); be_define_const_str(target, "target", 845187144u, 0, 6, NULL); be_define_const_str(target_search, "target_search", 1947846553u, 0, 13, NULL); be_define_const_str(tasmota, "tasmota", 424643812u, 0, 7, NULL); @@ -732,7 +732,7 @@ be_define_const_str(zip, "zip", 2877453236u, 0, 3, NULL); be_define_const_str(_X7B, "{", 4262220314u, 0, 1, NULL); be_define_const_str(_X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D, "{s}Batt Current{m}%.1f mA{e}", 866537156u, 0, 28, NULL); be_define_const_str(_X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D, "{s}Batt Voltage{m}%.3f V{e}", 3184308199u, 0, 27, NULL); -be_define_const_str(_X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_XB0C_X7Be_X7D, "{s}Temp AXP{m}%.1f \u00b0C{e}", 2304457292u, 0, 24, NULL); +be_define_const_str(_X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20C_X7Be_X7D, "{s}Temp AXP{m}%.1f C{e}", 3211020286u, 0, 23, NULL); be_define_const_str(_X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D, "{s}VBus Current{m}%.1f mA{e}", 1032721155u, 0, 28, NULL); be_define_const_str(_X7Bs_X7DVBus_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D, "{s}VBus Voltage{m}%.3f V{e}", 165651270u, 0, 27, NULL); be_define_const_str(_X7B_X7D, "{}", 1415952421u, 0, 2, NULL); From 5cd2c22730ccb40e946a9977375b2bbd555b56cd Mon Sep 17 00:00:00 2001 From: Stephan Hadinger Date: Thu, 16 Dec 2021 18:40:46 +0100 Subject: [PATCH 053/402] Use htlm `°` entity --- lib/libesp32/berry/default/be_i2c_axp192_lib.c | 2 +- lib/libesp32/berry/default/embedded/i2c_axp192.be | 2 +- lib/libesp32/berry/generate/be_const_strtab.h | 2 +- lib/libesp32/berry/generate/be_const_strtab_def.h | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libesp32/berry/default/be_i2c_axp192_lib.c b/lib/libesp32/berry/default/be_i2c_axp192_lib.c index 528ce2f4c..298e7b3a2 100644 --- a/lib/libesp32/berry/default/be_i2c_axp192_lib.c +++ b/lib/libesp32/berry/default/be_i2c_axp192_lib.c @@ -712,7 +712,7 @@ be_local_closure(AXP192_web_sensor, /* name */ /* K4 */ be_nested_str(_X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D), /* K5 */ be_nested_str(_X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D), /* K6 */ be_nested_str(_X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D), - /* K7 */ be_nested_str(_X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20C_X7Be_X7D), + /* K7 */ be_nested_str(_X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_X26deg_X3BC_X7Be_X7D), /* K8 */ be_nested_str(get_vbus_voltage), /* K9 */ be_nested_str(get_bat_voltage), /* K10 */ be_nested_str(get_bat_current), diff --git a/lib/libesp32/berry/default/embedded/i2c_axp192.be b/lib/libesp32/berry/default/embedded/i2c_axp192.be index 2869b1d38..d762b0363 100644 --- a/lib/libesp32/berry/default/embedded/i2c_axp192.be +++ b/lib/libesp32/berry/default/embedded/i2c_axp192.be @@ -153,7 +153,7 @@ class AXP192 : I2C_Driver "{s}Batt Voltage{m}%.3f V{e}".. "{s}Batt Current{m}%.1f mA{e}".. #"{s}Batt Power{m}%.3f{e}".. - "{s}Temp AXP{m}%.1f C{e}", + "{s}Temp AXP{m}%.1f °C{e}", self.get_vbus_voltage(), self.get_vbus_voltage(), self.get_bat_voltage(), self.get_bat_current(), #self.get_bat_power(), diff --git a/lib/libesp32/berry/generate/be_const_strtab.h b/lib/libesp32/berry/generate/be_const_strtab.h index 977069d28..cdf680ea3 100644 --- a/lib/libesp32/berry/generate/be_const_strtab.h +++ b/lib/libesp32/berry/generate/be_const_strtab.h @@ -162,7 +162,7 @@ extern const bcstring be_const_str__X7B; extern const bcstring be_const_str__X7B_X7D; extern const bcstring be_const_str__X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D; extern const bcstring be_const_str__X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D; -extern const bcstring be_const_str__X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20C_X7Be_X7D; +extern const bcstring be_const_str__X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_X26deg_X3BC_X7Be_X7D; extern const bcstring be_const_str__X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D; extern const bcstring be_const_str__X7Bs_X7DVBus_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D; extern const bcstring be_const_str__X7D; diff --git a/lib/libesp32/berry/generate/be_const_strtab_def.h b/lib/libesp32/berry/generate/be_const_strtab_def.h index 3375cece2..cd2198905 100644 --- a/lib/libesp32/berry/generate/be_const_strtab_def.h +++ b/lib/libesp32/berry/generate/be_const_strtab_def.h @@ -642,7 +642,7 @@ be_define_const_str(super, "super", 4152230356u, 0, 5, NULL); be_define_const_str(sys, "sys", 3277365014u, 0, 3, NULL); be_define_const_str(tag, "tag", 2516003219u, 0, 3, NULL); be_define_const_str(tan, "tan", 2633446552u, 0, 3, &be_const_str_do); -be_define_const_str(tanh, "tanh", 153638352u, 0, 4, &be_const_str__X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20C_X7Be_X7D); +be_define_const_str(tanh, "tanh", 153638352u, 0, 4, NULL); be_define_const_str(target, "target", 845187144u, 0, 6, NULL); be_define_const_str(target_search, "target_search", 1947846553u, 0, 13, NULL); be_define_const_str(tasmota, "tasmota", 424643812u, 0, 7, NULL); @@ -671,7 +671,7 @@ be_define_const_str(type, "type", 1361572173u, 0, 4, NULL); be_define_const_str(unknown_X20instruction, "unknown instruction", 1093911841u, 0, 19, &be_const_str_raise); be_define_const_str(update, "update", 672109684u, 0, 6, NULL); be_define_const_str(upper, "upper", 176974407u, 0, 5, NULL); -be_define_const_str(url_encode, "url_encode", 528392145u, 0, 10, NULL); +be_define_const_str(url_encode, "url_encode", 528392145u, 0, 10, &be_const_str__X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_X26deg_X3BC_X7Be_X7D); be_define_const_str(v, "v", 4077666505u, 0, 1, &be_const_str_widget_struct_default); be_define_const_str(value, "value", 1113510858u, 0, 5, NULL); be_define_const_str(value_error, "value_error", 773297791u, 0, 11, NULL); @@ -732,7 +732,7 @@ be_define_const_str(zip, "zip", 2877453236u, 0, 3, NULL); be_define_const_str(_X7B, "{", 4262220314u, 0, 1, NULL); be_define_const_str(_X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D, "{s}Batt Current{m}%.1f mA{e}", 866537156u, 0, 28, NULL); be_define_const_str(_X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D, "{s}Batt Voltage{m}%.3f V{e}", 3184308199u, 0, 27, NULL); -be_define_const_str(_X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20C_X7Be_X7D, "{s}Temp AXP{m}%.1f C{e}", 3211020286u, 0, 23, NULL); +be_define_const_str(_X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_X26deg_X3BC_X7Be_X7D, "{s}Temp AXP{m}%.1f °C{e}", 2622904081u, 0, 28, NULL); be_define_const_str(_X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D, "{s}VBus Current{m}%.1f mA{e}", 1032721155u, 0, 28, NULL); be_define_const_str(_X7Bs_X7DVBus_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D, "{s}VBus Voltage{m}%.3f V{e}", 165651270u, 0, 27, NULL); be_define_const_str(_X7B_X7D, "{}", 1415952421u, 0, 2, NULL); From 776fa99ee6d4e76354112042a0d9491c377edebd Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Fri, 17 Dec 2021 11:31:29 +0100 Subject: [PATCH 054/402] Fix exception 28 on HRG15 Fix exception 28 on HRG15 (#14067) --- tasmota/xsns_90_hrg15.ino | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/tasmota/xsns_90_hrg15.ino b/tasmota/xsns_90_hrg15.ino index f7ba63721..46c17b28a 100644 --- a/tasmota/xsns_90_hrg15.ino +++ b/tasmota/xsns_90_hrg15.ino @@ -53,8 +53,7 @@ struct RG15 { float rate = 0.0f; } Rg15; -void Rg15Init(void) -{ +void Rg15Init(void) { Rg15.ready = 0; if (PinUsed(GPIO_HRG15_RX) && PinUsed(GPIO_HRG15_TX)) { HydreonSerial = new TasmotaSerial(Pin(GPIO_HRG15_RX), Pin(GPIO_HRG15_TX)); @@ -92,8 +91,7 @@ bool Rg15Poll(void) { while (HydreonSerial->available()) { Rg15ReadLine(rg15_buffer); - AddLog(LOG_LEVEL_DEBUG_MORE,PSTR("%s:" D_JSON_SERIALRECEIVED " = %s"),"HRG", rg15_buffer); - + AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("HRG: Received '%s'"), rg15_buffer); Rg15Process(rg15_buffer); } @@ -102,11 +100,11 @@ bool Rg15Poll(void) { return true; } -bool Rg15ReadLine(char* buffer) -{ +bool Rg15ReadLine(char* buffer) { char c; uint8_t i = 0; uint32_t cmillis = millis(); + buffer[0] = '\0'; while (1) { if (HydreonSerial->available()) { @@ -121,8 +119,7 @@ bool Rg15ReadLine(char* buffer) return false; } } - - buffer[i-2] = '\0'; + if (i > 1) { buffer[i-2] = '\0'; } return true; } @@ -163,14 +160,14 @@ bool Rg15Command(void) { HydreonSerial->flush(); if (send[0] == 'k' || send[0] == 'K' || send[0] == 'o' || send[0] == 'O') { - ResponseCmndDone(); - return serviced; + ResponseCmndDone(); + return serviced; } char rg15_buffer[255]; if (Rg15ReadLine(rg15_buffer)) { - Response_P(PSTR("{\"" D_JSON_SERIALRECEIVED "\":%s\"}"), rg15_buffer); - Rg15Process(rg15_buffer); + Response_P(PSTR("{\"" D_JSON_SERIALRECEIVED "\":\"%s\"}"), rg15_buffer); + Rg15Process(rg15_buffer); } } @@ -184,7 +181,7 @@ void Rg15Show(bool json) } if (json) { - ResponseAppend_P(PSTR(",\"" RG15_NAME "\":{\"" D_JSON_ACTIVE "\":%2_f, \"" D_JSON_EVENT "\":%2_f, \"" D_JSON_TOTAL "\":%2_f, \"" D_JSON_FLOWRATE "\":%2_f}"), &Rg15.acc, &Rg15.event, &Rg15.total, &Rg15.rate); + ResponseAppend_P(PSTR(",\"" RG15_NAME "\":{\"" D_JSON_ACTIVE "\":%2_f,\"" D_JSON_EVENT "\":%2_f,\"" D_JSON_TOTAL "\":%2_f,\"" D_JSON_FLOWRATE "\":%2_f}"), &Rg15.acc, &Rg15.event, &Rg15.total, &Rg15.rate); #ifdef USE_WEBSERVER } else { WSContentSend_PD(HTTP_RG15, &Rg15.acc, &Rg15.event, &Rg15.total, &Rg15.rate); From 60660dc177384237948c921e47e6b2bf3a80e079 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Fri, 17 Dec 2021 15:26:13 +0300 Subject: [PATCH 055/402] revert /xlgt_01_ws2812.ino --- tasmota/xlgt_01_ws2812.ino | 99 +------------------------------------- 1 file changed, 1 insertion(+), 98 deletions(-) diff --git a/tasmota/xlgt_01_ws2812.ino b/tasmota/xlgt_01_ws2812.ino index f2c8b0610..3a9e396f3 100644 --- a/tasmota/xlgt_01_ws2812.ino +++ b/tasmota/xlgt_01_ws2812.ino @@ -17,11 +17,6 @@ along with this program. If not, see . */ -#ifndef FIRMWARE_MINIMAL -#define USE_LIGHT -#define USE_WS2812 -#endif - #ifdef USE_LIGHT #ifdef USE_WS2812 /*********************************************************************************************\ @@ -42,7 +37,7 @@ #define XLGT_01 1 -const uint8_t WS2812_SCHEMES = 10; // Number of WS2812 schemes +const uint8_t WS2812_SCHEMES = 9; // Number of WS2812 schemes const char kWs2812Commands[] PROGMEM = "|" // No prefix D_CMND_LED "|" D_CMND_PIXELS "|" D_CMND_ROTATION "|" D_CMND_WIDTH "|" D_CMND_STEPPIXELS ; @@ -296,93 +291,6 @@ void Ws2812Clock(void) Ws2812StripShow(); } -#define pow2(x) ((x)*(x)) -#define pow3(x) ((x)*pow2(x)) -#define pow4(x) (pow2(x)*pow2(x)) - -void Ws2812RunningStrip(int scheme) -{ -#if (USE_WS2812_CTYPE > NEO_3LED) - RgbwColor c; - c.W = 0; -#else - RgbColor c(Settings->light_dimmer); -#endif - - static uint32_t timer_counter = 0; - static uint32_t last_timer_counter = timer_counter; - if (Settings->light_rotation%2) timer_counter--; - else timer_counter++; - - uint32_t width = Settings->ws_width[WS_MINUTE]?Settings->ws_width[WS_MINUTE]:1; - uint32_t repeat = 1;//kWsRepeat[Settings->light_width]; // number of scheme.count per ledcount - uint32_t range = (uint32_t)ceil((float)Settings->light_pixels / (float)repeat); - uint32_t speed = Settings->light_speed; //((Settings->light_speed * 2) -1) * (STATES / 10); // - static uint32_t offset = 0; - - if (scheme==WS2812_SCHEMES-1) { - if (timer_counter/speed!=last_timer_counter/speed) { - offset = random(range); - last_timer_counter = timer_counter; - } - } else { - offset = speed > 0 ? timer_counter / speed : 0; - } - - //WsColor oldColor, currentColor; - //Ws2812GradientColor(schemenr, &oldColor, range, gradRange, offset); - //currentColor = oldColor; - int power = Settings->ws_width[WS_SECOND]; - int max_input = pow(width, power); - float dimmer = 100 / (float)Settings->light_dimmer; - - uint32_t target = offset % Settings->light_pixels; - - for (uint32_t i = 0; i < Settings->light_pixels; i++) { - int delta = targetlight_color[0] / pow(delta+1, power); - float fmyGrn = Settings->light_color[1] / pow(delta+1, power); - float fmyBlu = Settings->light_color[2] / pow(delta+1, power); - /* - float fmyRed = (float)wsmap(max_input-pow(delta+1, power), 0, max_input, 0, Settings->light_color[0]); - float fmyGrn = (float)wsmap(max_input-pow(delta+1, power), 0, max_input, 0, Settings->light_color[1]); - float fmyBlu = (float)wsmap(max_input-pow(delta+1, power), 0, max_input, 0, Settings->light_color[2]); - */ - - c.R = (uint8_t)fmyRed/dimmer; - c.G = (uint8_t)fmyGrn/dimmer; - c.B = (uint8_t)fmyBlu/dimmer; - } - else { - c.R = 0 ; - c.G = 0 ; - c.B = 0 ; - } - - if (Settings->light_width==2) { - c.R = Settings->light_color[0]/dimmer - c.R; - c.G = Settings->light_color[1]/dimmer - c.G; - c.B = Settings->light_color[2]/dimmer - c.B; - } else if (Settings->ws_width[WS_MINUTE]==3) { - c.R = max(100 - c.R,0); - c.G = max(100 - c.G,0); - c.B = max(100 - c.B,0); - } - - strip->SetPixelColor(i, c); -/* - // Blend old and current color based on time for smooth movement. - c.R = wsmap(Light.strip_timer_counter % speed, 0, speed, oldColor.red, currentColor.red); - c.G = wsmap(Light.strip_timer_counter % speed, 0, speed, oldColor.green, currentColor.green); - c.B = wsmap(Light.strip_timer_counter % speed, 0, speed, oldColor.blue, currentColor.blue); - strip->SetPixelColor(i, c); - oldColor = currentColor; - */ - } - Ws2812StripShow(); -} - void Ws2812GradientColor(uint32_t schemenr, struct WsColor* mColor, uint32_t range, uint32_t gradRange, uint32_t i) { /* @@ -680,11 +588,6 @@ void Ws2812ShowScheme(void) Ws2812.show_next = 0; } break; - case WS2812_SCHEMES-2: // Running strip - case WS2812_SCHEMES-1: // Running strip - Ws2812RunningStrip(scheme); - Ws2812.show_next = 1; - break; default: if(Settings->light_step_pixels > 0){ Ws2812Steps(scheme -1); From aca519ddecf66e1255d7be8ac6ae6a2ef3b8822d Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Fri, 17 Dec 2021 15:27:34 +0300 Subject: [PATCH 056/402] format fixes --- tasmota/xsns_69_opentherm.ino | 1 + tasmota/xsns_69_opentherm_protocol.ino | 1 + 2 files changed, 2 insertions(+) diff --git a/tasmota/xsns_69_opentherm.ino b/tasmota/xsns_69_opentherm.ino index 38c1ae2c9..23df42a90 100644 --- a/tasmota/xsns_69_opentherm.ino +++ b/tasmota/xsns_69_opentherm.ino @@ -16,6 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ + #ifdef USE_OPENTHERM #define XSNS_69 69 diff --git a/tasmota/xsns_69_opentherm_protocol.ino b/tasmota/xsns_69_opentherm_protocol.ino index 68430d94a..4047884c6 100644 --- a/tasmota/xsns_69_opentherm_protocol.ino +++ b/tasmota/xsns_69_opentherm_protocol.ino @@ -16,6 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ + #ifdef USE_OPENTHERM #include "OpenTherm.h" From 8bad0115b03ecb51694fec750e7b523f546729bc Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Fri, 17 Dec 2021 18:01:27 +0100 Subject: [PATCH 057/402] Fix ESP32 webcam WDT Fix ESP32 webcam WDT (#13882) --- lib/libesp32_div/esp32-camera/CMakeLists.txt | 64 + lib/libesp32_div/esp32-camera/Kconfig | 114 ++ lib/libesp32_div/esp32-camera/LICENSE | 202 +++ lib/libesp32_div/esp32-camera/README.md | 368 ++++++ lib/libesp32_div/esp32-camera/component.mk | 4 + .../esp32-camera/conversions/esp_jpg_decode.c | 132 ++ .../conversions/include/esp_jpg_decode.h | 43 + .../conversions/include/img_converters.h | 130 ++ .../esp32-camera/conversions/jpge.cpp | 723 +++++++++++ .../conversions/private_include/jpge.h | 142 +++ .../conversions/private_include/yuv.h | 29 + .../esp32-camera/conversions/to_bmp.c | 393 ++++++ .../esp32-camera/conversions/to_jpg.cpp | 245 ++++ .../esp32-camera/conversions/yuv.c | 298 +++++ .../esp32-camera/driver/cam_hal.c | 483 +++++++ .../esp32-camera/driver/esp_camera.c | 416 ++++++ .../esp32-camera/driver/include/esp_camera.h | 214 ++++ .../esp32-camera/driver/include/sensor.h | 245 ++++ .../driver/private_include/cam_hal.h | 60 + .../driver/private_include/sccb.h | 19 + .../driver/private_include/xclk.h | 9 + lib/libesp32_div/esp32-camera/driver/sccb.c | 184 +++ lib/libesp32_div/esp32-camera/driver/sensor.c | 52 + .../esp32-camera/examples/CMakeLists.txt | 9 + .../esp32-camera/examples/Makefile | 11 + .../esp32-camera/examples/main/CMakeLists.txt | 3 + .../esp32-camera/examples/main/component.mk | 5 + .../esp32-camera/examples/main/take_picture.c | 155 +++ .../esp32-camera/examples/sdkconfig.defaults | 17 + lib/libesp32_div/esp32-camera/library.json | 26 + .../esp32-camera/sensors/gc0308.c | 465 +++++++ .../esp32-camera/sensors/gc032a.c | 391 ++++++ .../esp32-camera/sensors/gc2145.c | 475 +++++++ .../esp32-camera/sensors/nt99141.c | 1022 +++++++++++++++ .../esp32-camera/sensors/ov2640.c | 612 +++++++++ .../esp32-camera/sensors/ov3660.c | 1053 +++++++++++++++ .../esp32-camera/sensors/ov5640.c | 1130 +++++++++++++++++ .../esp32-camera/sensors/ov7670.c | 457 +++++++ .../esp32-camera/sensors/ov7725.c | 575 +++++++++ .../sensors/private_include/gc0308.h | 31 + .../sensors/private_include/gc0308_regs.h | 25 + .../sensors/private_include/gc0308_settings.h | 245 ++++ .../sensors/private_include/gc032a.h | 31 + .../sensors/private_include/gc032a_regs.h | 82 ++ .../sensors/private_include/gc032a_settings.h | 401 ++++++ .../sensors/private_include/gc2145.h | 27 + .../sensors/private_include/gc2145_regs.h | 85 ++ .../sensors/private_include/gc2145_settings.h | 719 +++++++++++ .../sensors/private_include/nt99141.h | 34 + .../sensors/private_include/nt99141_regs.h | 211 +++ .../private_include/nt99141_settings.h | 825 ++++++++++++ .../sensors/private_include/ov2640.h | 32 + .../sensors/private_include/ov2640_regs.h | 216 ++++ .../sensors/private_include/ov2640_settings.h | 485 +++++++ .../sensors/private_include/ov3660.h | 34 + .../sensors/private_include/ov3660_regs.h | 211 +++ .../sensors/private_include/ov3660_settings.h | 318 +++++ .../sensors/private_include/ov5640.h | 27 + .../sensors/private_include/ov5640_regs.h | 213 ++++ .../sensors/private_include/ov5640_settings.h | 334 +++++ .../sensors/private_include/ov7670.h | 33 + .../sensors/private_include/ov7670_regs.h | 354 ++++++ .../sensors/private_include/ov7725.h | 33 + .../sensors/private_include/ov7725_regs.h | 335 +++++ .../esp32-camera/target/esp32/ll_cam.c | 522 ++++++++ .../esp32-camera/target/esp32s2/ll_cam.c | 402 ++++++ .../target/esp32s2/private_include/tjpgd.h | 99 ++ .../esp32-camera/target/esp32s2/tjpgd.c | 970 ++++++++++++++ .../esp32-camera/target/esp32s3/ll_cam.c | 452 +++++++ .../target/private_include/ll_cam.h | 141 ++ lib/libesp32_div/esp32-camera/target/xclk.c | 64 + .../esp32-camera/test/CMakeLists.txt | 4 + .../esp32-camera/test/component.mk | 8 + .../test/pictures/test_inside.jpeg | Bin 0 -> 18832 bytes .../test/pictures/test_outside.jpeg | Bin 0 -> 81744 bytes .../esp32-camera/test/pictures/testimg.jpeg | Bin 0 -> 5764 bytes .../esp32-camera/test/test_camera.c | 500 ++++++++ platformio_tasmota_env32.ini | 2 +- tasmota/support_esp.ino | 25 +- tasmota/tasmota.ino | 7 +- tasmota/xdrv_50_filesystem.ino | 52 +- tasmota/xdrv_81_esp32_webcam.ino | 34 +- 82 files changed, 19546 insertions(+), 52 deletions(-) create mode 100644 lib/libesp32_div/esp32-camera/CMakeLists.txt create mode 100644 lib/libesp32_div/esp32-camera/Kconfig create mode 100644 lib/libesp32_div/esp32-camera/LICENSE create mode 100644 lib/libesp32_div/esp32-camera/README.md create mode 100644 lib/libesp32_div/esp32-camera/component.mk create mode 100644 lib/libesp32_div/esp32-camera/conversions/esp_jpg_decode.c create mode 100644 lib/libesp32_div/esp32-camera/conversions/include/esp_jpg_decode.h create mode 100644 lib/libesp32_div/esp32-camera/conversions/include/img_converters.h create mode 100644 lib/libesp32_div/esp32-camera/conversions/jpge.cpp create mode 100644 lib/libesp32_div/esp32-camera/conversions/private_include/jpge.h create mode 100644 lib/libesp32_div/esp32-camera/conversions/private_include/yuv.h create mode 100644 lib/libesp32_div/esp32-camera/conversions/to_bmp.c create mode 100644 lib/libesp32_div/esp32-camera/conversions/to_jpg.cpp create mode 100644 lib/libesp32_div/esp32-camera/conversions/yuv.c create mode 100644 lib/libesp32_div/esp32-camera/driver/cam_hal.c create mode 100644 lib/libesp32_div/esp32-camera/driver/esp_camera.c create mode 100644 lib/libesp32_div/esp32-camera/driver/include/esp_camera.h create mode 100644 lib/libesp32_div/esp32-camera/driver/include/sensor.h create mode 100644 lib/libesp32_div/esp32-camera/driver/private_include/cam_hal.h create mode 100644 lib/libesp32_div/esp32-camera/driver/private_include/sccb.h create mode 100644 lib/libesp32_div/esp32-camera/driver/private_include/xclk.h create mode 100644 lib/libesp32_div/esp32-camera/driver/sccb.c create mode 100644 lib/libesp32_div/esp32-camera/driver/sensor.c create mode 100644 lib/libesp32_div/esp32-camera/examples/CMakeLists.txt create mode 100644 lib/libesp32_div/esp32-camera/examples/Makefile create mode 100644 lib/libesp32_div/esp32-camera/examples/main/CMakeLists.txt create mode 100644 lib/libesp32_div/esp32-camera/examples/main/component.mk create mode 100644 lib/libesp32_div/esp32-camera/examples/main/take_picture.c create mode 100644 lib/libesp32_div/esp32-camera/examples/sdkconfig.defaults create mode 100644 lib/libesp32_div/esp32-camera/library.json create mode 100644 lib/libesp32_div/esp32-camera/sensors/gc0308.c create mode 100644 lib/libesp32_div/esp32-camera/sensors/gc032a.c create mode 100644 lib/libesp32_div/esp32-camera/sensors/gc2145.c create mode 100644 lib/libesp32_div/esp32-camera/sensors/nt99141.c create mode 100644 lib/libesp32_div/esp32-camera/sensors/ov2640.c create mode 100644 lib/libesp32_div/esp32-camera/sensors/ov3660.c create mode 100644 lib/libesp32_div/esp32-camera/sensors/ov5640.c create mode 100644 lib/libesp32_div/esp32-camera/sensors/ov7670.c create mode 100644 lib/libesp32_div/esp32-camera/sensors/ov7725.c create mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/gc0308.h create mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/gc0308_regs.h create mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/gc0308_settings.h create mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/gc032a.h create mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/gc032a_regs.h create mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/gc032a_settings.h create mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/gc2145.h create mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/gc2145_regs.h create mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/gc2145_settings.h create mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/nt99141.h create mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/nt99141_regs.h create mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/nt99141_settings.h create mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/ov2640.h create mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/ov2640_regs.h create mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/ov2640_settings.h create mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/ov3660.h create mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/ov3660_regs.h create mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/ov3660_settings.h create mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/ov5640.h create mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/ov5640_regs.h create mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/ov5640_settings.h create mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/ov7670.h create mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/ov7670_regs.h create mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/ov7725.h create mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/ov7725_regs.h create mode 100644 lib/libesp32_div/esp32-camera/target/esp32/ll_cam.c create mode 100644 lib/libesp32_div/esp32-camera/target/esp32s2/ll_cam.c create mode 100644 lib/libesp32_div/esp32-camera/target/esp32s2/private_include/tjpgd.h create mode 100644 lib/libesp32_div/esp32-camera/target/esp32s2/tjpgd.c create mode 100644 lib/libesp32_div/esp32-camera/target/esp32s3/ll_cam.c create mode 100644 lib/libesp32_div/esp32-camera/target/private_include/ll_cam.h create mode 100644 lib/libesp32_div/esp32-camera/target/xclk.c create mode 100644 lib/libesp32_div/esp32-camera/test/CMakeLists.txt create mode 100644 lib/libesp32_div/esp32-camera/test/component.mk create mode 100644 lib/libesp32_div/esp32-camera/test/pictures/test_inside.jpeg create mode 100644 lib/libesp32_div/esp32-camera/test/pictures/test_outside.jpeg create mode 100644 lib/libesp32_div/esp32-camera/test/pictures/testimg.jpeg create mode 100644 lib/libesp32_div/esp32-camera/test/test_camera.c diff --git a/lib/libesp32_div/esp32-camera/CMakeLists.txt b/lib/libesp32_div/esp32-camera/CMakeLists.txt new file mode 100644 index 000000000..5ceec97c0 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/CMakeLists.txt @@ -0,0 +1,64 @@ +if(IDF_TARGET STREQUAL "esp32" OR IDF_TARGET STREQUAL "esp32s2" OR IDF_TARGET STREQUAL "esp32s3") + set(COMPONENT_SRCS + driver/esp_camera.c + driver/cam_hal.c + driver/sccb.c + driver/sensor.c + sensors/ov2640.c + sensors/ov3660.c + sensors/ov5640.c + sensors/ov7725.c + sensors/ov7670.c + sensors/nt99141.c + sensors/gc0308.c + sensors/gc2145.c + sensors/gc032a.c + conversions/yuv.c + conversions/to_jpg.cpp + conversions/to_bmp.c + conversions/jpge.cpp + conversions/esp_jpg_decode.c + ) + + set(COMPONENT_ADD_INCLUDEDIRS + driver/include + conversions/include + ) + + set(COMPONENT_PRIV_INCLUDEDIRS + driver/private_include + sensors/private_include + conversions/private_include + target/private_include + ) + + if(IDF_TARGET STREQUAL "esp32") + list(APPEND COMPONENT_SRCS + target/xclk.c + target/esp32/ll_cam.c + ) + endif() + + if(IDF_TARGET STREQUAL "esp32s2") + list(APPEND COMPONENT_SRCS + target/xclk.c + target/esp32s2/ll_cam.c + target/esp32s2/tjpgd.c + ) + + list(APPEND COMPONENT_PRIV_INCLUDEDIRS + target/esp32s2/private_include + ) + endif() + + if(IDF_TARGET STREQUAL "esp32s3") + list(APPEND COMPONENT_SRCS + target/esp32s3/ll_cam.c + ) + endif() + + set(COMPONENT_REQUIRES driver) + set(COMPONENT_PRIV_REQUIRES freertos nvs_flash) + + register_component() +endif() diff --git a/lib/libesp32_div/esp32-camera/Kconfig b/lib/libesp32_div/esp32-camera/Kconfig new file mode 100644 index 000000000..6fb5aad21 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/Kconfig @@ -0,0 +1,114 @@ +menu "Camera configuration" + + config OV7670_SUPPORT + bool "Support OV7670 VGA" + default y + help + Enable this option if you want to use the OV7670. + Disable this option to save memory. + + config OV7725_SUPPORT + bool "Support OV7725 VGA" + default y + help + Enable this option if you want to use the OV7725. + Disable this option to save memory. + + config NT99141_SUPPORT + bool "Support NT99141 HD" + default y + help + Enable this option if you want to use the NT99141. + Disable this option to save memory. + + config OV2640_SUPPORT + bool "Support OV2640 2MP" + default y + help + Enable this option if you want to use the OV2640. + Disable this option to save memory. + + config OV3660_SUPPORT + bool "Support OV3660 3MP" + default y + help + Enable this option if you want to use the OV3360. + Disable this option to save memory. + + config OV5640_SUPPORT + bool "Support OV5640 5MP" + default y + help + Enable this option if you want to use the OV5640. + Disable this option to save memory. + + config GC2145_SUPPORT + bool "Support GC2145 2MP" + default y + help + Enable this option if you want to use the GC2145. + Disable this option to save memory. + + config GC032A_SUPPORT + bool "Support GC032A VGA" + default y + help + Enable this option if you want to use the GC032A. + Disable this option to save memory. + + config GC0308_SUPPORT + bool "Support GC0308 VGA" + default y + help + Enable this option if you want to use the GC0308. + Disable this option to save memory. + + choice SCCB_HARDWARE_I2C_PORT + bool "I2C peripheral to use for SCCB" + default SCCB_HARDWARE_I2C_PORT1 + + config SCCB_HARDWARE_I2C_PORT0 + bool "I2C0" + config SCCB_HARDWARE_I2C_PORT1 + bool "I2C1" + + endchoice + + choice GC_SENSOR_WINDOW_MODE + bool "GalaxyCore Sensor Window Mode" + depends on (GC2145_SUPPORT || GC032A_SUPPORT || GC0308_SUPPORT) + default GC_SENSOR_SUBSAMPLE_MODE + help + This option determines how to reduce the output size when the resolution you set is less than the maximum resolution. + SUBSAMPLE_MODE has a bigger perspective and WINDOWING_MODE has a higher frame rate. + + config GC_SENSOR_WINDOWING_MODE + bool "Windowing Mode" + config GC_SENSOR_SUBSAMPLE_MODE + bool "Subsample Mode" + endchoice + + choice CAMERA_TASK_PINNED_TO_CORE + bool "Camera task pinned to core" + default CAMERA_CORE0 + help + Pin the camera handle task to a certain core(0/1). It can also be done automatically choosing NO_AFFINITY. + + config CAMERA_CORE0 + bool "CORE0" + config CAMERA_CORE1 + bool "CORE1" + config CAMERA_NO_AFFINITY + bool "NO_AFFINITY" + + endchoice + + config CAMERA_DMA_BUFFER_SIZE_MAX + int "DMA buffer size" + range 8192 32768 + default 32768 + help + Maximum value of DMA buffer + Larger values may fail to allocate due to insufficient contiguous memory blocks, and smaller value may cause DMA interrupt to be too frequent + +endmenu diff --git a/lib/libesp32_div/esp32-camera/LICENSE b/lib/libesp32_div/esp32-camera/LICENSE new file mode 100644 index 000000000..d64569567 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/LICENSE @@ -0,0 +1,202 @@ + + 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 [yyyy] [name of copyright owner] + + 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. diff --git a/lib/libesp32_div/esp32-camera/README.md b/lib/libesp32_div/esp32-camera/README.md new file mode 100644 index 000000000..e93d5cdba --- /dev/null +++ b/lib/libesp32_div/esp32-camera/README.md @@ -0,0 +1,368 @@ +# ESP32 Camera Driver + +[![Build examples](https://github.com/espressif/esp32-camera/actions/workflows/build.yml/badge.svg)](https://github.com/espressif/esp32-camera/actions/workflows/build.yml) +## General Information + +This repository hosts ESP32 series Soc compatible driver for image sensors. Additionally it provides a few tools, which allow converting the captured frame data to the more common BMP and JPEG formats. + +### Supported Soc + +- ESP32 +- ESP32-S2 +- ESP32-S3 + +### Supported Sensor + +| model | max resolution | color type | output format | Len Size | +| ------- | -------------- | ---------- | ------------------------------------------------------------ | -------- | +| OV2640 | 1600 x 1200 | color | YUV(422/420)/YCbCr422
RGB565/555
8-bit compressed data
8/10-bit Raw RGB data | 1/4" | +| OV3660 | 2048 x 1536 | color | raw RGB data
RGB565/555/444
CCIR656
YCbCr422
compression | 1/5" | +| OV5640 | 2592 x 1944 | color | RAW RGB
RGB565/555/444
CCIR656
YUV422/420
YCbCr422
compression | 1/4" | +| OV7670 | 640 x 480 | color | Raw Bayer RGB
Processed Bayer RGB
YUV/YCbCr422
GRB422
RGB565/555 | 1/6" | +| OV7725 | 640 x 480 | color | Raw RGB
GRB 422
RGB565/555/444
YCbCr 422 | 1/4" | +| NT99141 | 1280 x 720 | color | YCbCr 422
RGB565/555/444
Raw
CCIR656
JPEG compression | 1/4" | +| GC032A | 640 x 480 | color | YUV/YCbCr422
RAW Bayer
RGB565 | 1/10" | +| GC0308 | 640 x 480 | color | YUV/YCbCr422
RAW Bayer
RGB565 | 1/6.5" | +| GC2145 | 1600 x 1200 | color | YUV/YCbCr422
RAW Bayer
RGB565 | 1/5" | + +## Important to Remember + +- Except when using CIF or lower resolution with JPEG, the driver requires PSRAM to be installed and activated. +- Using YUV or RGB puts a lot of strain on the chip because writing to PSRAM is not particularly fast. The result is that image data might be missing. This is particularly true if WiFi is enabled. If you need RGB data, it is recommended that JPEG is captured and then turned into RGB using `fmt2rgb888` or `fmt2bmp`/`frame2bmp`. +- When 1 frame buffer is used, the driver will wait for the current frame to finish (VSYNC) and start I2S DMA. After the frame is acquired, I2S will be stopped and the frame buffer returned to the application. This approach gives more control over the system, but results in longer time to get the frame. +- When 2 or more frame bufers are used, I2S is running in continuous mode and each frame is pushed to a queue that the application can access. This approach puts more strain on the CPU/Memory, but allows for double the frame rate. Please use only with JPEG. + +## Installation Instructions + + +### Using esp-idf + +- Clone or download and extract the repository to the components folder of your ESP-IDF project +- Enable PSRAM in `menuconfig` (also set Flash and PSRAM frequiencies to 80MHz) +- Include `esp_camera.h` in your code + +### Using PlatformIO + +The easy way -- on the `env` section of `platformio.ini`, add the following: + +```ini +[env] +lib_deps = + esp32-camera +``` + +Now the `esp_camera.h` is available to be included: + +```c +#include "esp_camera.h" +``` + +Enable PSRAM on `menuconfig` or type it direclty on `sdkconfig`. Check the [official doc](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/kconfig.html#config-esp32-spiram-support) for more info. + +``` +CONFIG_ESP32_SPIRAM_SUPPORT=y +``` + +***Arduino*** The easy-way (content above) only seems to work if you're using `framework=arduino` which seems to take a bunch of the guesswork out (thanks Arduino!) but also suck up a lot more memory and flash, almost crippling the performance. If you plan to use the `framework=espidf` then read the sections below carefully!! + +## Platform.io lib/submodule (for framework=espidf) + +It's probably easier to just skip the platform.io library registry version and link the git repo as a submodule. (i.e. using code outside the platform.io library management). In this example we will install this as a submodule inside the platform.io $project/lib folder: +``` +cd $project\lib +git submodule add -b master https://github.com/espressif/esp32-camera.git +``` + +Then in `platformio.ini` file +``` +build_flags = + -I../lib/esp32-camera +``` +After that `#include "esp_camera.h"` statement will be available. Now the module is included, and you're hopefully back to the same place as the easy-Arduino way. + +**Warning about platform.io/espidf and fresh (not initialized) git repos** +There is a sharp-edge on you'll discover in the platform.io build process (in espidf v3.3 & 4.0.1) where a project which has only had `git init` but nothing committed will crash platform.io build process with highly non-useful output. The cause is due to lack of a version (making you think you did something wrong, when you didn't at all) - the output is horribly non-descript. Solution: the devs want you to create a file called version.txt with a number in it, or simply commit any file to the projects git repo and use git. This happens because platform.io build process tries to be too clever and determine the build version number from the git repo - it's a sharp edge you'll only encounter if you're experimenting on a new project with no commits .. like wtf is my camera not working let's try a 'clean project'?! + +## Platform.io Kconfig +Kconfig is used by the platform.io menuconfig (accessed by running: `pio run -t menuconfig`) to interactively manage the various #ifdef statements throughout the espidf and supporting libraries (i.e. this repo: esp32-camera and arduino-esp32.git). The menuconfig process generates the `sdkconfig` file which is ultimately used behind the scenes by espidf compile+build process. + +**Make sure to append or symlink** [this `Kconfig`](./Kconfig) content into the `Kconfig` of your project. + +You symlink (or copy) the included Kconfig into your platform.io projects src directory. The file should be named `Kconfig.projbuild` in your projects src\ directory or you could also add the library path to a CMakefile.txt and hope the `Kconfig` (or `Kconfig.projbuild`) gets discovered by the menuconfig process, though this unpredictable for me. + +The unpredictable wonky behavior in platform.io build process around Kconfig naming (Kconfig vs. Kconfig.projbuild) occurs between espidf versions 3.3 and 4.0 - but if you don't see "Camera configuration" in your `pio run -t menuconfig` then there is no point trying to test camera code (it may compile, but it probably won't work!) and it seems the platform.io devs (when they built their wrapper around the espidf menuconfig) didn't implement it properly. You've probably already figured out you can't use the espidf build tools since the files are in totally different locations and also different versions with sometimes different syntax. This is one of those times you might consider changing the `platformio.ini` from `platform=espressif32` to `platform=https://github.com/platformio/platform-espressif32.git#develop` to get a more recent version of the espidf 4.0 tools. + +However with a bit of patience and experimenting you'll figure the Kconfig out. Once Kconfig (or Kconfig.projbuild) is working then you will be able to choose the configurations according to your setup or the camera libraries will be compiled. Although you might also need to delete your .pio/build directory before the options appear .. again, the `pio run -t menuconfig` doens't always notice the new Kconfig files! + +If you miss-skip-ignore this critical step the camera module will compile but camera logic inside the library will be 'empty' because the Kconfig sets the proper #ifdef statements during the build process to initialize the selected cameras. It's very not optional! + + +## Examples + +### Initialization + +```c +#include "esp_camera.h" + +//WROVER-KIT PIN Map +#define CAM_PIN_PWDN -1 //power down is not used +#define CAM_PIN_RESET -1 //software reset will be performed +#define CAM_PIN_XCLK 21 +#define CAM_PIN_SIOD 26 +#define CAM_PIN_SIOC 27 + +#define CAM_PIN_D7 35 +#define CAM_PIN_D6 34 +#define CAM_PIN_D5 39 +#define CAM_PIN_D4 36 +#define CAM_PIN_D3 19 +#define CAM_PIN_D2 18 +#define CAM_PIN_D1 5 +#define CAM_PIN_D0 4 +#define CAM_PIN_VSYNC 25 +#define CAM_PIN_HREF 23 +#define CAM_PIN_PCLK 22 + +static camera_config_t camera_config = { + .pin_pwdn = CAM_PIN_PWDN, + .pin_reset = CAM_PIN_RESET, + .pin_xclk = CAM_PIN_XCLK, + .pin_sscb_sda = CAM_PIN_SIOD, + .pin_sscb_scl = CAM_PIN_SIOC, + + .pin_d7 = CAM_PIN_D7, + .pin_d6 = CAM_PIN_D6, + .pin_d5 = CAM_PIN_D5, + .pin_d4 = CAM_PIN_D4, + .pin_d3 = CAM_PIN_D3, + .pin_d2 = CAM_PIN_D2, + .pin_d1 = CAM_PIN_D1, + .pin_d0 = CAM_PIN_D0, + .pin_vsync = CAM_PIN_VSYNC, + .pin_href = CAM_PIN_HREF, + .pin_pclk = CAM_PIN_PCLK, + + .xclk_freq_hz = 20000000,//EXPERIMENTAL: Set to 16MHz on ESP32-S2 or ESP32-S3 to enable EDMA mode + .ledc_timer = LEDC_TIMER_0, + .ledc_channel = LEDC_CHANNEL_0, + + .pixel_format = PIXFORMAT_JPEG,//YUV422,GRAYSCALE,RGB565,JPEG + .frame_size = FRAMESIZE_UXGA,//QQVGA-QXGA Do not use sizes above QVGA when not JPEG + + .jpeg_quality = 12, //0-63 lower number means higher quality + .fb_count = 1, //if more than one, i2s runs in continuous mode. Use only with JPEG + .grab_mode = CAMERA_GRAB_WHEN_EMPTY//CAMERA_GRAB_LATEST. Sets when buffers should be filled +}; + +esp_err_t camera_init(){ + //power up the camera if PWDN pin is defined + if(CAM_PIN_PWDN != -1){ + pinMode(CAM_PIN_PWDN, OUTPUT); + digitalWrite(CAM_PIN_PWDN, LOW); + } + + //initialize the camera + esp_err_t err = esp_camera_init(&camera_config); + if (err != ESP_OK) { + ESP_LOGE(TAG, "Camera Init Failed"); + return err; + } + + return ESP_OK; +} + +esp_err_t camera_capture(){ + //acquire a frame + camera_fb_t * fb = esp_camera_fb_get(); + if (!fb) { + ESP_LOGE(TAG, "Camera Capture Failed"); + return ESP_FAIL; + } + //replace this with your own function + process_image(fb->width, fb->height, fb->format, fb->buf, fb->len); + + //return the frame buffer back to the driver for reuse + esp_camera_fb_return(fb); + return ESP_OK; +} +``` + +### JPEG HTTP Capture + +```c +#include "esp_camera.h" +#include "esp_http_server.h" +#include "esp_timer.h" + +typedef struct { + httpd_req_t *req; + size_t len; +} jpg_chunking_t; + +static size_t jpg_encode_stream(void * arg, size_t index, const void* data, size_t len){ + jpg_chunking_t *j = (jpg_chunking_t *)arg; + if(!index){ + j->len = 0; + } + if(httpd_resp_send_chunk(j->req, (const char *)data, len) != ESP_OK){ + return 0; + } + j->len += len; + return len; +} + +esp_err_t jpg_httpd_handler(httpd_req_t *req){ + camera_fb_t * fb = NULL; + esp_err_t res = ESP_OK; + size_t fb_len = 0; + int64_t fr_start = esp_timer_get_time(); + + fb = esp_camera_fb_get(); + if (!fb) { + ESP_LOGE(TAG, "Camera capture failed"); + httpd_resp_send_500(req); + return ESP_FAIL; + } + res = httpd_resp_set_type(req, "image/jpeg"); + if(res == ESP_OK){ + res = httpd_resp_set_hdr(req, "Content-Disposition", "inline; filename=capture.jpg"); + } + + if(res == ESP_OK){ + if(fb->format == PIXFORMAT_JPEG){ + fb_len = fb->len; + res = httpd_resp_send(req, (const char *)fb->buf, fb->len); + } else { + jpg_chunking_t jchunk = {req, 0}; + res = frame2jpg_cb(fb, 80, jpg_encode_stream, &jchunk)?ESP_OK:ESP_FAIL; + httpd_resp_send_chunk(req, NULL, 0); + fb_len = jchunk.len; + } + } + esp_camera_fb_return(fb); + int64_t fr_end = esp_timer_get_time(); + ESP_LOGI(TAG, "JPG: %uKB %ums", (uint32_t)(fb_len/1024), (uint32_t)((fr_end - fr_start)/1000)); + return res; +} +``` + +### JPEG HTTP Stream + +```c +#include "esp_camera.h" +#include "esp_http_server.h" +#include "esp_timer.h" + +#define PART_BOUNDARY "123456789000000000000987654321" +static const char* _STREAM_CONTENT_TYPE = "multipart/x-mixed-replace;boundary=" PART_BOUNDARY; +static const char* _STREAM_BOUNDARY = "\r\n--" PART_BOUNDARY "\r\n"; +static const char* _STREAM_PART = "Content-Type: image/jpeg\r\nContent-Length: %u\r\n\r\n"; + +esp_err_t jpg_stream_httpd_handler(httpd_req_t *req){ + camera_fb_t * fb = NULL; + esp_err_t res = ESP_OK; + size_t _jpg_buf_len; + uint8_t * _jpg_buf; + char * part_buf[64]; + static int64_t last_frame = 0; + if(!last_frame) { + last_frame = esp_timer_get_time(); + } + + res = httpd_resp_set_type(req, _STREAM_CONTENT_TYPE); + if(res != ESP_OK){ + return res; + } + + while(true){ + fb = esp_camera_fb_get(); + if (!fb) { + ESP_LOGE(TAG, "Camera capture failed"); + res = ESP_FAIL; + break; + } + if(fb->format != PIXFORMAT_JPEG){ + bool jpeg_converted = frame2jpg(fb, 80, &_jpg_buf, &_jpg_buf_len); + if(!jpeg_converted){ + ESP_LOGE(TAG, "JPEG compression failed"); + esp_camera_fb_return(fb); + res = ESP_FAIL; + } + } else { + _jpg_buf_len = fb->len; + _jpg_buf = fb->buf; + } + + if(res == ESP_OK){ + res = httpd_resp_send_chunk(req, _STREAM_BOUNDARY, strlen(_STREAM_BOUNDARY)); + } + if(res == ESP_OK){ + size_t hlen = snprintf((char *)part_buf, 64, _STREAM_PART, _jpg_buf_len); + + res = httpd_resp_send_chunk(req, (const char *)part_buf, hlen); + } + if(res == ESP_OK){ + res = httpd_resp_send_chunk(req, (const char *)_jpg_buf, _jpg_buf_len); + } + if(fb->format != PIXFORMAT_JPEG){ + free(_jpg_buf); + } + esp_camera_fb_return(fb); + if(res != ESP_OK){ + break; + } + int64_t fr_end = esp_timer_get_time(); + int64_t frame_time = fr_end - last_frame; + last_frame = fr_end; + frame_time /= 1000; + ESP_LOGI(TAG, "MJPG: %uKB %ums (%.1ffps)", + (uint32_t)(_jpg_buf_len/1024), + (uint32_t)frame_time, 1000.0 / (uint32_t)frame_time); + } + + last_frame = 0; + return res; +} +``` + +### BMP HTTP Capture + +```c +#include "esp_camera.h" +#include "esp_http_server.h" +#include "esp_timer.h" + +esp_err_t bmp_httpd_handler(httpd_req_t *req){ + camera_fb_t * fb = NULL; + esp_err_t res = ESP_OK; + int64_t fr_start = esp_timer_get_time(); + + fb = esp_camera_fb_get(); + if (!fb) { + ESP_LOGE(TAG, "Camera capture failed"); + httpd_resp_send_500(req); + return ESP_FAIL; + } + + uint8_t * buf = NULL; + size_t buf_len = 0; + bool converted = frame2bmp(fb, &buf, &buf_len); + esp_camera_fb_return(fb); + if(!converted){ + ESP_LOGE(TAG, "BMP conversion failed"); + httpd_resp_send_500(req); + return ESP_FAIL; + } + + res = httpd_resp_set_type(req, "image/x-windows-bmp") + || httpd_resp_set_hdr(req, "Content-Disposition", "inline; filename=capture.bmp") + || httpd_resp_send(req, (const char *)buf, buf_len); + free(buf); + int64_t fr_end = esp_timer_get_time(); + ESP_LOGI(TAG, "BMP: %uKB %ums", (uint32_t)(buf_len/1024), (uint32_t)((fr_end - fr_start)/1000)); + return res; +} +``` + + + diff --git a/lib/libesp32_div/esp32-camera/component.mk b/lib/libesp32_div/esp32-camera/component.mk new file mode 100644 index 000000000..8db15eb88 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/component.mk @@ -0,0 +1,4 @@ +COMPONENT_ADD_INCLUDEDIRS := driver/include conversions/include +COMPONENT_PRIV_INCLUDEDIRS := driver/private_include conversions/private_include sensors/private_include target/private_include +COMPONENT_SRCDIRS := driver conversions sensors target target/esp32 +CXXFLAGS += -fno-rtti diff --git a/lib/libesp32_div/esp32-camera/conversions/esp_jpg_decode.c b/lib/libesp32_div/esp32-camera/conversions/esp_jpg_decode.c new file mode 100644 index 000000000..a9615e36c --- /dev/null +++ b/lib/libesp32_div/esp32-camera/conversions/esp_jpg_decode.c @@ -0,0 +1,132 @@ +// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD +// +// 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. +#include "esp_jpg_decode.h" + +#include "esp_system.h" +#if ESP_IDF_VERSION_MAJOR >= 4 // IDF 4+ +#if CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4 +#include "esp32/rom/tjpgd.h" +#elif CONFIG_IDF_TARGET_ESP32S2 +#include "tjpgd.h" +#elif CONFIG_IDF_TARGET_ESP32S3 +#include "esp32s3/rom/tjpgd.h" +#else +#error Target CONFIG_IDF_TARGET is not supported +#endif +#else // ESP32 Before IDF 4.0 +#include "rom/tjpgd.h" +#endif + +#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) +#include "esp32-hal-log.h" +#define TAG "" +#else +#include "esp_log.h" +static const char* TAG = "esp_jpg_decode"; +#endif + +typedef struct { + jpg_scale_t scale; + jpg_reader_cb reader; + jpg_writer_cb writer; + void * arg; + size_t len; + size_t index; +} esp_jpg_decoder_t; + +static const char * jd_errors[] = { + "Succeeded", + "Interrupted by output function", + "Device error or wrong termination of input stream", + "Insufficient memory pool for the image", + "Insufficient stream input buffer", + "Parameter error", + "Data format error", + "Right format but not supported", + "Not supported JPEG standard" +}; + +static uint32_t _jpg_write(JDEC *decoder, void *bitmap, JRECT *rect) +{ + uint16_t x = rect->left; + uint16_t y = rect->top; + uint16_t w = rect->right + 1 - x; + uint16_t h = rect->bottom + 1 - y; + uint8_t *data = (uint8_t *)bitmap; + + esp_jpg_decoder_t * jpeg = (esp_jpg_decoder_t *)decoder->device; + + if (jpeg->writer) { + return jpeg->writer(jpeg->arg, x, y, w, h, data); + } + return 0; +} + +static uint32_t _jpg_read(JDEC *decoder, uint8_t *buf, uint32_t len) +{ + esp_jpg_decoder_t * jpeg = (esp_jpg_decoder_t *)decoder->device; + if (jpeg->len && len > (jpeg->len - jpeg->index)) { + len = jpeg->len - jpeg->index; + } + if (len) { + len = jpeg->reader(jpeg->arg, jpeg->index, buf, len); + if (!len) { + ESP_LOGE(TAG, "Read Fail at %u/%u", jpeg->index, jpeg->len); + } + jpeg->index += len; + } + return len; +} + +esp_err_t esp_jpg_decode(size_t len, jpg_scale_t scale, jpg_reader_cb reader, jpg_writer_cb writer, void * arg) +{ + static uint8_t work[3100]; + JDEC decoder; + esp_jpg_decoder_t jpeg; + + jpeg.len = len; + jpeg.reader = reader; + jpeg.writer = writer; + jpeg.arg = arg; + jpeg.scale = scale; + jpeg.index = 0; + + JRESULT jres = jd_prepare(&decoder, _jpg_read, work, 3100, &jpeg); + if(jres != JDR_OK){ + ESP_LOGE(TAG, "JPG Header Parse Failed! %s", jd_errors[jres]); + return ESP_FAIL; + } + + uint16_t output_width = decoder.width / (1 << (uint8_t)(jpeg.scale)); + uint16_t output_height = decoder.height / (1 << (uint8_t)(jpeg.scale)); + + //output start + writer(arg, 0, 0, output_width, output_height, NULL); + //output write + jres = jd_decomp(&decoder, _jpg_write, (uint8_t)jpeg.scale); + //output end + writer(arg, output_width, output_height, output_width, output_height, NULL); + + if (jres != JDR_OK) { + ESP_LOGE(TAG, "JPG Decompression Failed! %s", jd_errors[jres]); + return ESP_FAIL; + } + //check if all data has been consumed. + if (len && jpeg.index < len) { + _jpg_read(&decoder, NULL, len - jpeg.index); + } + + return ESP_OK; +} + diff --git a/lib/libesp32_div/esp32-camera/conversions/include/esp_jpg_decode.h b/lib/libesp32_div/esp32-camera/conversions/include/esp_jpg_decode.h new file mode 100644 index 000000000..f13536edf --- /dev/null +++ b/lib/libesp32_div/esp32-camera/conversions/include/esp_jpg_decode.h @@ -0,0 +1,43 @@ +// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD +// +// 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. +#ifndef _ESP_JPG_DECODE_H_ +#define _ESP_JPG_DECODE_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include +#include +#include "esp_err.h" + +typedef enum { + JPG_SCALE_NONE, + JPG_SCALE_2X, + JPG_SCALE_4X, + JPG_SCALE_8X, + JPG_SCALE_MAX = JPG_SCALE_8X +} jpg_scale_t; + +typedef size_t (* jpg_reader_cb)(void * arg, size_t index, uint8_t *buf, size_t len); +typedef bool (* jpg_writer_cb)(void * arg, uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint8_t *data); + +esp_err_t esp_jpg_decode(size_t len, jpg_scale_t scale, jpg_reader_cb reader, jpg_writer_cb writer, void * arg); + +#ifdef __cplusplus +} +#endif + +#endif /* _ESP_JPG_DECODE_H_ */ diff --git a/lib/libesp32_div/esp32-camera/conversions/include/img_converters.h b/lib/libesp32_div/esp32-camera/conversions/include/img_converters.h new file mode 100644 index 000000000..f736200a9 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/conversions/include/img_converters.h @@ -0,0 +1,130 @@ +// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD +// +// 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. +#ifndef _IMG_CONVERTERS_H_ +#define _IMG_CONVERTERS_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include +#include +#include "esp_camera.h" +#include "esp_jpg_decode.h" + +typedef size_t (* jpg_out_cb)(void * arg, size_t index, const void* data, size_t len); + +/** + * @brief Convert image buffer to JPEG + * + * @param src Source buffer in RGB565, RGB888, YUYV or GRAYSCALE format + * @param src_len Length in bytes of the source buffer + * @param width Width in pixels of the source image + * @param height Height in pixels of the source image + * @param format Format of the source image + * @param quality JPEG quality of the resulting image + * @param cp Callback to be called to write the bytes of the output JPEG + * @param arg Pointer to be passed to the callback + * + * @return true on success + */ +bool fmt2jpg_cb(uint8_t *src, size_t src_len, uint16_t width, uint16_t height, pixformat_t format, uint8_t quality, jpg_out_cb cb, void * arg); + +/** + * @brief Convert camera frame buffer to JPEG + * + * @param fb Source camera frame buffer + * @param quality JPEG quality of the resulting image + * @param cp Callback to be called to write the bytes of the output JPEG + * @param arg Pointer to be passed to the callback + * + * @return true on success + */ +bool frame2jpg_cb(camera_fb_t * fb, uint8_t quality, jpg_out_cb cb, void * arg); + +/** + * @brief Convert image buffer to JPEG buffer + * + * @param src Source buffer in RGB565, RGB888, YUYV or GRAYSCALE format + * @param src_len Length in bytes of the source buffer + * @param width Width in pixels of the source image + * @param height Height in pixels of the source image + * @param format Format of the source image + * @param quality JPEG quality of the resulting image + * @param out Pointer to be populated with the address of the resulting buffer. + * You MUST free the pointer once you are done with it. + * @param out_len Pointer to be populated with the length of the output buffer + * + * @return true on success + */ +bool fmt2jpg(uint8_t *src, size_t src_len, uint16_t width, uint16_t height, pixformat_t format, uint8_t quality, uint8_t ** out, size_t * out_len); + +/** + * @brief Convert camera frame buffer to JPEG buffer + * + * @param fb Source camera frame buffer + * @param quality JPEG quality of the resulting image + * @param out Pointer to be populated with the address of the resulting buffer + * @param out_len Pointer to be populated with the length of the output buffer + * + * @return true on success + */ +bool frame2jpg(camera_fb_t * fb, uint8_t quality, uint8_t ** out, size_t * out_len); + +/** + * @brief Convert image buffer to BMP buffer + * + * @param src Source buffer in JPEG, RGB565, RGB888, YUYV or GRAYSCALE format + * @param src_len Length in bytes of the source buffer + * @param width Width in pixels of the source image + * @param height Height in pixels of the source image + * @param format Format of the source image + * @param out Pointer to be populated with the address of the resulting buffer + * @param out_len Pointer to be populated with the length of the output buffer + * + * @return true on success + */ +bool fmt2bmp(uint8_t *src, size_t src_len, uint16_t width, uint16_t height, pixformat_t format, uint8_t ** out, size_t * out_len); + +/** + * @brief Convert camera frame buffer to BMP buffer + * + * @param fb Source camera frame buffer + * @param out Pointer to be populated with the address of the resulting buffer + * @param out_len Pointer to be populated with the length of the output buffer + * + * @return true on success + */ +bool frame2bmp(camera_fb_t * fb, uint8_t ** out, size_t * out_len); + +/** + * @brief Convert image buffer to RGB888 buffer (used for face detection) + * + * @param src Source buffer in JPEG, RGB565, RGB888, YUYV or GRAYSCALE format + * @param src_len Length in bytes of the source buffer + * @param format Format of the source image + * @param rgb_buf Pointer to the output buffer (width * height * 3) + * + * @return true on success + */ +bool fmt2rgb888(const uint8_t *src_buf, size_t src_len, pixformat_t format, uint8_t * rgb_buf); + +bool jpg2rgb565(const uint8_t *src, size_t src_len, uint8_t * out, jpg_scale_t scale); + +#ifdef __cplusplus +} +#endif + +#endif /* _IMG_CONVERTERS_H_ */ diff --git a/lib/libesp32_div/esp32-camera/conversions/jpge.cpp b/lib/libesp32_div/esp32-camera/conversions/jpge.cpp new file mode 100644 index 000000000..a8ab93e02 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/conversions/jpge.cpp @@ -0,0 +1,723 @@ +// jpge.cpp - C++ class for JPEG compression. +// Public domain, Rich Geldreich +// v1.01, Dec. 18, 2010 - Initial release +// v1.02, Apr. 6, 2011 - Removed 2x2 ordered dither in H2V1 chroma subsampling method load_block_16_8_8(). (The rounding factor was 2, when it should have been 1. Either way, it wasn't helping.) +// v1.03, Apr. 16, 2011 - Added support for optimized Huffman code tables, optimized dynamic memory allocation down to only 1 alloc. +// Also from Alex Evans: Added RGBA support, linear memory allocator (no longer needed in v1.03). +// v1.04, May. 19, 2012: Forgot to set m_pFile ptr to NULL in cfile_stream::close(). Thanks to Owen Kaluza for reporting this bug. +// Code tweaks to fix VS2008 static code analysis warnings (all looked harmless). +// Code review revealed method load_block_16_8_8() (used for the non-default H2V1 sampling mode to downsample chroma) somehow didn't get the rounding factor fix from v1.02. + +#include "jpge.h" + +#include +#include +#include +#include +#include +#include +#include +#include "esp_heap_caps.h" + +#define JPGE_MAX(a,b) (((a)>(b))?(a):(b)) +#define JPGE_MIN(a,b) (((a)<(b))?(a):(b)) + +namespace jpge { + + static inline void *jpge_malloc(size_t nSize) { + void * b = malloc(nSize); + if(b){ + return b; + } + return heap_caps_malloc(nSize, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT); + } + static inline void jpge_free(void *p) { free(p); } + + // Various JPEG enums and tables. + enum { M_SOF0 = 0xC0, M_DHT = 0xC4, M_SOI = 0xD8, M_EOI = 0xD9, M_SOS = 0xDA, M_DQT = 0xDB, M_APP0 = 0xE0 }; + enum { DC_LUM_CODES = 12, AC_LUM_CODES = 256, DC_CHROMA_CODES = 12, AC_CHROMA_CODES = 256, MAX_HUFF_SYMBOLS = 257, MAX_HUFF_CODESIZE = 32 }; + + static const uint8 s_zag[64] = { 0,1,8,16,9,2,3,10,17,24,32,25,18,11,4,5,12,19,26,33,40,48,41,34,27,20,13,6,7,14,21,28,35,42,49,56,57,50,43,36,29,22,15,23,30,37,44,51,58,59,52,45,38,31,39,46,53,60,61,54,47,55,62,63 }; + static const int16 s_std_lum_quant[64] = { 16,11,12,14,12,10,16,14,13,14,18,17,16,19,24,40,26,24,22,22,24,49,35,37,29,40,58,51,61,60,57,51,56,55,64,72,92,78,64,68,87,69,55,56,80,109,81,87,95,98,103,104,103,62,77,113,121,112,100,120,92,101,103,99 }; + static const int16 s_std_croma_quant[64] = { 17,18,18,24,21,24,47,26,26,47,99,66,56,66,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99 }; + static const uint8 s_dc_lum_bits[17] = { 0,0,1,5,1,1,1,1,1,1,0,0,0,0,0,0,0 }; + static const uint8 s_dc_lum_val[DC_LUM_CODES] = { 0,1,2,3,4,5,6,7,8,9,10,11 }; + static const uint8 s_ac_lum_bits[17] = { 0,0,2,1,3,3,2,4,3,5,5,4,4,0,0,1,0x7d }; + static const uint8 s_ac_lum_val[AC_LUM_CODES] = { + 0x01,0x02,0x03,0x00,0x04,0x11,0x05,0x12,0x21,0x31,0x41,0x06,0x13,0x51,0x61,0x07,0x22,0x71,0x14,0x32,0x81,0x91,0xa1,0x08,0x23,0x42,0xb1,0xc1,0x15,0x52,0xd1,0xf0, + 0x24,0x33,0x62,0x72,0x82,0x09,0x0a,0x16,0x17,0x18,0x19,0x1a,0x25,0x26,0x27,0x28,0x29,0x2a,0x34,0x35,0x36,0x37,0x38,0x39,0x3a,0x43,0x44,0x45,0x46,0x47,0x48,0x49, + 0x4a,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5a,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x83,0x84,0x85,0x86,0x87,0x88,0x89, + 0x8a,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9a,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xb2,0xb3,0xb4,0xb5,0xb6,0xb7,0xb8,0xb9,0xba,0xc2,0xc3,0xc4,0xc5, + 0xc6,0xc7,0xc8,0xc9,0xca,0xd2,0xd3,0xd4,0xd5,0xd6,0xd7,0xd8,0xd9,0xda,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8, + 0xf9,0xfa + }; + static const uint8 s_dc_chroma_bits[17] = { 0,0,3,1,1,1,1,1,1,1,1,1,0,0,0,0,0 }; + static const uint8 s_dc_chroma_val[DC_CHROMA_CODES] = { 0,1,2,3,4,5,6,7,8,9,10,11 }; + static const uint8 s_ac_chroma_bits[17] = { 0,0,2,1,2,4,4,3,4,7,5,4,4,0,1,2,0x77 }; + static const uint8 s_ac_chroma_val[AC_CHROMA_CODES] = { + 0x00,0x01,0x02,0x03,0x11,0x04,0x05,0x21,0x31,0x06,0x12,0x41,0x51,0x07,0x61,0x71,0x13,0x22,0x32,0x81,0x08,0x14,0x42,0x91,0xa1,0xb1,0xc1,0x09,0x23,0x33,0x52,0xf0, + 0x15,0x62,0x72,0xd1,0x0a,0x16,0x24,0x34,0xe1,0x25,0xf1,0x17,0x18,0x19,0x1a,0x26,0x27,0x28,0x29,0x2a,0x35,0x36,0x37,0x38,0x39,0x3a,0x43,0x44,0x45,0x46,0x47,0x48, + 0x49,0x4a,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5a,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x82,0x83,0x84,0x85,0x86,0x87, + 0x88,0x89,0x8a,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9a,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xb2,0xb3,0xb4,0xb5,0xb6,0xb7,0xb8,0xb9,0xba,0xc2,0xc3, + 0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xd2,0xd3,0xd4,0xd5,0xd6,0xd7,0xd8,0xd9,0xda,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8, + 0xf9,0xfa + }; + + const int YR = 19595, YG = 38470, YB = 7471, CB_R = -11059, CB_G = -21709, CB_B = 32768, CR_R = 32768, CR_G = -27439, CR_B = -5329; + + static int32 m_last_quality = 0; + static int32 m_quantization_tables[2][64]; + + static bool m_huff_initialized = false; + static uint m_huff_codes[4][256]; + static uint8 m_huff_code_sizes[4][256]; + static uint8 m_huff_bits[4][17]; + static uint8 m_huff_val[4][256]; + + static inline uint8 clamp(int i) { + if (i < 0) { + i = 0; + } else if (i > 255){ + i = 255; + } + return static_cast(i); + } + + static void RGB_to_YCC(uint8* pDst, const uint8 *pSrc, int num_pixels) { + for ( ; num_pixels; pDst += 3, pSrc += 3, num_pixels--) { + const int r = pSrc[0], g = pSrc[1], b = pSrc[2]; + pDst[0] = static_cast((r * YR + g * YG + b * YB + 32768) >> 16); + pDst[1] = clamp(128 + ((r * CB_R + g * CB_G + b * CB_B + 32768) >> 16)); + pDst[2] = clamp(128 + ((r * CR_R + g * CR_G + b * CR_B + 32768) >> 16)); + } + } + + static void RGB_to_Y(uint8* pDst, const uint8 *pSrc, int num_pixels) { + for ( ; num_pixels; pDst++, pSrc += 3, num_pixels--) { + pDst[0] = static_cast((pSrc[0] * YR + pSrc[1] * YG + pSrc[2] * YB + 32768) >> 16); + } + } + + static void Y_to_YCC(uint8* pDst, const uint8* pSrc, int num_pixels) { + for( ; num_pixels; pDst += 3, pSrc++, num_pixels--) { + pDst[0] = pSrc[0]; + pDst[1] = 128; + pDst[2] = 128; + } + } + + // Forward DCT - DCT derived from jfdctint. + enum { CONST_BITS = 13, ROW_BITS = 2 }; +#define DCT_DESCALE(x, n) (((x) + (((int32)1) << ((n) - 1))) >> (n)) +#define DCT_MUL(var, c) (static_cast(var) * static_cast(c)) +#define DCT1D(s0, s1, s2, s3, s4, s5, s6, s7) \ + int32 t0 = s0 + s7, t7 = s0 - s7, t1 = s1 + s6, t6 = s1 - s6, t2 = s2 + s5, t5 = s2 - s5, t3 = s3 + s4, t4 = s3 - s4; \ + int32 t10 = t0 + t3, t13 = t0 - t3, t11 = t1 + t2, t12 = t1 - t2; \ + int32 u1 = DCT_MUL(t12 + t13, 4433); \ + s2 = u1 + DCT_MUL(t13, 6270); \ + s6 = u1 + DCT_MUL(t12, -15137); \ + u1 = t4 + t7; \ + int32 u2 = t5 + t6, u3 = t4 + t6, u4 = t5 + t7; \ + int32 z5 = DCT_MUL(u3 + u4, 9633); \ + t4 = DCT_MUL(t4, 2446); t5 = DCT_MUL(t5, 16819); \ + t6 = DCT_MUL(t6, 25172); t7 = DCT_MUL(t7, 12299); \ + u1 = DCT_MUL(u1, -7373); u2 = DCT_MUL(u2, -20995); \ + u3 = DCT_MUL(u3, -16069); u4 = DCT_MUL(u4, -3196); \ + u3 += z5; u4 += z5; \ + s0 = t10 + t11; s1 = t7 + u1 + u4; s3 = t6 + u2 + u3; s4 = t10 - t11; s5 = t5 + u2 + u4; s7 = t4 + u1 + u3; + + static void DCT2D(int32 *p) { + int32 c, *q = p; + for (c = 7; c >= 0; c--, q += 8) { + int32 s0 = q[0], s1 = q[1], s2 = q[2], s3 = q[3], s4 = q[4], s5 = q[5], s6 = q[6], s7 = q[7]; + DCT1D(s0, s1, s2, s3, s4, s5, s6, s7); + q[0] = s0 << ROW_BITS; q[1] = DCT_DESCALE(s1, CONST_BITS-ROW_BITS); q[2] = DCT_DESCALE(s2, CONST_BITS-ROW_BITS); q[3] = DCT_DESCALE(s3, CONST_BITS-ROW_BITS); + q[4] = s4 << ROW_BITS; q[5] = DCT_DESCALE(s5, CONST_BITS-ROW_BITS); q[6] = DCT_DESCALE(s6, CONST_BITS-ROW_BITS); q[7] = DCT_DESCALE(s7, CONST_BITS-ROW_BITS); + } + for (q = p, c = 7; c >= 0; c--, q++) { + int32 s0 = q[0*8], s1 = q[1*8], s2 = q[2*8], s3 = q[3*8], s4 = q[4*8], s5 = q[5*8], s6 = q[6*8], s7 = q[7*8]; + DCT1D(s0, s1, s2, s3, s4, s5, s6, s7); + q[0*8] = DCT_DESCALE(s0, ROW_BITS+3); q[1*8] = DCT_DESCALE(s1, CONST_BITS+ROW_BITS+3); q[2*8] = DCT_DESCALE(s2, CONST_BITS+ROW_BITS+3); q[3*8] = DCT_DESCALE(s3, CONST_BITS+ROW_BITS+3); + q[4*8] = DCT_DESCALE(s4, ROW_BITS+3); q[5*8] = DCT_DESCALE(s5, CONST_BITS+ROW_BITS+3); q[6*8] = DCT_DESCALE(s6, CONST_BITS+ROW_BITS+3); q[7*8] = DCT_DESCALE(s7, CONST_BITS+ROW_BITS+3); + } + } + + // Compute the actual canonical Huffman codes/code sizes given the JPEG huff bits and val arrays. + static void compute_huffman_table(uint *codes, uint8 *code_sizes, uint8 *bits, uint8 *val) + { + int i, l, last_p, si; + static uint8 huff_size[257]; + static uint huff_code[257]; + uint code; + + int p = 0; + for (l = 1; l <= 16; l++) { + for (i = 1; i <= bits[l]; i++) { + huff_size[p++] = (char)l; + } + } + + huff_size[p] = 0; + last_p = p; // write sentinel + + code = 0; si = huff_size[0]; p = 0; + + while (huff_size[p]) { + while (huff_size[p] == si) { + huff_code[p++] = code++; + } + code <<= 1; + si++; + } + + memset(codes, 0, sizeof(codes[0])*256); + memset(code_sizes, 0, sizeof(code_sizes[0])*256); + for (p = 0; p < last_p; p++) { + codes[val[p]] = huff_code[p]; + code_sizes[val[p]] = huff_size[p]; + } + } + + void jpeg_encoder::flush_output_buffer() + { + if (m_out_buf_left != JPGE_OUT_BUF_SIZE) { + m_all_stream_writes_succeeded = m_all_stream_writes_succeeded && m_pStream->put_buf(m_out_buf, JPGE_OUT_BUF_SIZE - m_out_buf_left); + } + m_pOut_buf = m_out_buf; + m_out_buf_left = JPGE_OUT_BUF_SIZE; + } + + void jpeg_encoder::emit_byte(uint8 i) + { + *m_pOut_buf++ = i; + if (--m_out_buf_left == 0) { + flush_output_buffer(); + } + } + + void jpeg_encoder::put_bits(uint bits, uint len) + { + uint8 c = 0; + m_bit_buffer |= ((uint32)bits << (24 - (m_bits_in += len))); + while (m_bits_in >= 8) { + c = (uint8)((m_bit_buffer >> 16) & 0xFF); + emit_byte(c); + if (c == 0xFF) { + emit_byte(0); + } + m_bit_buffer <<= 8; + m_bits_in -= 8; + } + } + + void jpeg_encoder::emit_word(uint i) + { + emit_byte(uint8(i >> 8)); emit_byte(uint8(i & 0xFF)); + } + + // JPEG marker generation. + void jpeg_encoder::emit_marker(int marker) + { + emit_byte(uint8(0xFF)); emit_byte(uint8(marker)); + } + + // Emit JFIF marker + void jpeg_encoder::emit_jfif_app0() + { + emit_marker(M_APP0); + emit_word(2 + 4 + 1 + 2 + 1 + 2 + 2 + 1 + 1); + emit_byte(0x4A); emit_byte(0x46); emit_byte(0x49); emit_byte(0x46); /* Identifier: ASCII "JFIF" */ + emit_byte(0); + emit_byte(1); /* Major version */ + emit_byte(1); /* Minor version */ + emit_byte(0); /* Density unit */ + emit_word(1); + emit_word(1); + emit_byte(0); /* No thumbnail image */ + emit_byte(0); + } + + // Emit quantization tables + void jpeg_encoder::emit_dqt() + { + for (int i = 0; i < ((m_num_components == 3) ? 2 : 1); i++) + { + emit_marker(M_DQT); + emit_word(64 + 1 + 2); + emit_byte(static_cast(i)); + for (int j = 0; j < 64; j++) + emit_byte(static_cast(m_quantization_tables[i][j])); + } + } + + // Emit start of frame marker + void jpeg_encoder::emit_sof() + { + emit_marker(M_SOF0); /* baseline */ + emit_word(3 * m_num_components + 2 + 5 + 1); + emit_byte(8); /* precision */ + emit_word(m_image_y); + emit_word(m_image_x); + emit_byte(m_num_components); + for (int i = 0; i < m_num_components; i++) + { + emit_byte(static_cast(i + 1)); /* component ID */ + emit_byte((m_comp_h_samp[i] << 4) + m_comp_v_samp[i]); /* h and v sampling */ + emit_byte(i > 0); /* quant. table num */ + } + } + + // Emit Huffman table. + void jpeg_encoder::emit_dht(uint8 *bits, uint8 *val, int index, bool ac_flag) + { + emit_marker(M_DHT); + + int length = 0; + for (int i = 1; i <= 16; i++) + length += bits[i]; + + emit_word(length + 2 + 1 + 16); + emit_byte(static_cast(index + (ac_flag << 4))); + + for (int i = 1; i <= 16; i++) + emit_byte(bits[i]); + + for (int i = 0; i < length; i++) + emit_byte(val[i]); + } + + // Emit all Huffman tables. + void jpeg_encoder::emit_dhts() + { + emit_dht(m_huff_bits[0+0], m_huff_val[0+0], 0, false); + emit_dht(m_huff_bits[2+0], m_huff_val[2+0], 0, true); + if (m_num_components == 3) { + emit_dht(m_huff_bits[0+1], m_huff_val[0+1], 1, false); + emit_dht(m_huff_bits[2+1], m_huff_val[2+1], 1, true); + } + } + + // emit start of scan + void jpeg_encoder::emit_sos() + { + emit_marker(M_SOS); + emit_word(2 * m_num_components + 2 + 1 + 3); + emit_byte(m_num_components); + for (int i = 0; i < m_num_components; i++) + { + emit_byte(static_cast(i + 1)); + if (i == 0) + emit_byte((0 << 4) + 0); + else + emit_byte((1 << 4) + 1); + } + emit_byte(0); /* spectral selection */ + emit_byte(63); + emit_byte(0); + } + + void jpeg_encoder::load_block_8_8_grey(int x) + { + uint8 *pSrc; + sample_array_t *pDst = m_sample_array; + x <<= 3; + for (int i = 0; i < 8; i++, pDst += 8) + { + pSrc = m_mcu_lines[i] + x; + pDst[0] = pSrc[0] - 128; pDst[1] = pSrc[1] - 128; pDst[2] = pSrc[2] - 128; pDst[3] = pSrc[3] - 128; + pDst[4] = pSrc[4] - 128; pDst[5] = pSrc[5] - 128; pDst[6] = pSrc[6] - 128; pDst[7] = pSrc[7] - 128; + } + } + + void jpeg_encoder::load_block_8_8(int x, int y, int c) + { + uint8 *pSrc; + sample_array_t *pDst = m_sample_array; + x = (x * (8 * 3)) + c; + y <<= 3; + for (int i = 0; i < 8; i++, pDst += 8) + { + pSrc = m_mcu_lines[y + i] + x; + pDst[0] = pSrc[0 * 3] - 128; pDst[1] = pSrc[1 * 3] - 128; pDst[2] = pSrc[2 * 3] - 128; pDst[3] = pSrc[3 * 3] - 128; + pDst[4] = pSrc[4 * 3] - 128; pDst[5] = pSrc[5 * 3] - 128; pDst[6] = pSrc[6 * 3] - 128; pDst[7] = pSrc[7 * 3] - 128; + } + } + + void jpeg_encoder::load_block_16_8(int x, int c) + { + uint8 *pSrc1, *pSrc2; + sample_array_t *pDst = m_sample_array; + x = (x * (16 * 3)) + c; + int a = 0, b = 2; + for (int i = 0; i < 16; i += 2, pDst += 8) + { + pSrc1 = m_mcu_lines[i + 0] + x; + pSrc2 = m_mcu_lines[i + 1] + x; + pDst[0] = ((pSrc1[ 0 * 3] + pSrc1[ 1 * 3] + pSrc2[ 0 * 3] + pSrc2[ 1 * 3] + a) >> 2) - 128; pDst[1] = ((pSrc1[ 2 * 3] + pSrc1[ 3 * 3] + pSrc2[ 2 * 3] + pSrc2[ 3 * 3] + b) >> 2) - 128; + pDst[2] = ((pSrc1[ 4 * 3] + pSrc1[ 5 * 3] + pSrc2[ 4 * 3] + pSrc2[ 5 * 3] + a) >> 2) - 128; pDst[3] = ((pSrc1[ 6 * 3] + pSrc1[ 7 * 3] + pSrc2[ 6 * 3] + pSrc2[ 7 * 3] + b) >> 2) - 128; + pDst[4] = ((pSrc1[ 8 * 3] + pSrc1[ 9 * 3] + pSrc2[ 8 * 3] + pSrc2[ 9 * 3] + a) >> 2) - 128; pDst[5] = ((pSrc1[10 * 3] + pSrc1[11 * 3] + pSrc2[10 * 3] + pSrc2[11 * 3] + b) >> 2) - 128; + pDst[6] = ((pSrc1[12 * 3] + pSrc1[13 * 3] + pSrc2[12 * 3] + pSrc2[13 * 3] + a) >> 2) - 128; pDst[7] = ((pSrc1[14 * 3] + pSrc1[15 * 3] + pSrc2[14 * 3] + pSrc2[15 * 3] + b) >> 2) - 128; + int temp = a; a = b; b = temp; + } + } + + void jpeg_encoder::load_block_16_8_8(int x, int c) + { + uint8 *pSrc1; + sample_array_t *pDst = m_sample_array; + x = (x * (16 * 3)) + c; + for (int i = 0; i < 8; i++, pDst += 8) + { + pSrc1 = m_mcu_lines[i + 0] + x; + pDst[0] = ((pSrc1[ 0 * 3] + pSrc1[ 1 * 3]) >> 1) - 128; pDst[1] = ((pSrc1[ 2 * 3] + pSrc1[ 3 * 3]) >> 1) - 128; + pDst[2] = ((pSrc1[ 4 * 3] + pSrc1[ 5 * 3]) >> 1) - 128; pDst[3] = ((pSrc1[ 6 * 3] + pSrc1[ 7 * 3]) >> 1) - 128; + pDst[4] = ((pSrc1[ 8 * 3] + pSrc1[ 9 * 3]) >> 1) - 128; pDst[5] = ((pSrc1[10 * 3] + pSrc1[11 * 3]) >> 1) - 128; + pDst[6] = ((pSrc1[12 * 3] + pSrc1[13 * 3]) >> 1) - 128; pDst[7] = ((pSrc1[14 * 3] + pSrc1[15 * 3]) >> 1) - 128; + } + } + + void jpeg_encoder::load_quantized_coefficients(int component_num) + { + int32 *q = m_quantization_tables[component_num > 0]; + int16 *pDst = m_coefficient_array; + for (int i = 0; i < 64; i++) + { + sample_array_t j = m_sample_array[s_zag[i]]; + if (j < 0) + { + if ((j = -j + (*q >> 1)) < *q) + *pDst++ = 0; + else + *pDst++ = static_cast(-(j / *q)); + } + else + { + if ((j = j + (*q >> 1)) < *q) + *pDst++ = 0; + else + *pDst++ = static_cast((j / *q)); + } + q++; + } + } + + void jpeg_encoder::code_coefficients_pass_two(int component_num) + { + int i, j, run_len, nbits, temp1, temp2; + int16 *pSrc = m_coefficient_array; + uint *codes[2]; + uint8 *code_sizes[2]; + + if (component_num == 0) + { + codes[0] = m_huff_codes[0 + 0]; codes[1] = m_huff_codes[2 + 0]; + code_sizes[0] = m_huff_code_sizes[0 + 0]; code_sizes[1] = m_huff_code_sizes[2 + 0]; + } + else + { + codes[0] = m_huff_codes[0 + 1]; codes[1] = m_huff_codes[2 + 1]; + code_sizes[0] = m_huff_code_sizes[0 + 1]; code_sizes[1] = m_huff_code_sizes[2 + 1]; + } + + temp1 = temp2 = pSrc[0] - m_last_dc_val[component_num]; + m_last_dc_val[component_num] = pSrc[0]; + + if (temp1 < 0) + { + temp1 = -temp1; temp2--; + } + + nbits = 0; + while (temp1) + { + nbits++; temp1 >>= 1; + } + + put_bits(codes[0][nbits], code_sizes[0][nbits]); + if (nbits) put_bits(temp2 & ((1 << nbits) - 1), nbits); + + for (run_len = 0, i = 1; i < 64; i++) + { + if ((temp1 = m_coefficient_array[i]) == 0) + run_len++; + else + { + while (run_len >= 16) + { + put_bits(codes[1][0xF0], code_sizes[1][0xF0]); + run_len -= 16; + } + if ((temp2 = temp1) < 0) + { + temp1 = -temp1; + temp2--; + } + nbits = 1; + while (temp1 >>= 1) + nbits++; + j = (run_len << 4) + nbits; + put_bits(codes[1][j], code_sizes[1][j]); + put_bits(temp2 & ((1 << nbits) - 1), nbits); + run_len = 0; + } + } + if (run_len) + put_bits(codes[1][0], code_sizes[1][0]); + } + + void jpeg_encoder::code_block(int component_num) + { + DCT2D(m_sample_array); + load_quantized_coefficients(component_num); + code_coefficients_pass_two(component_num); + } + + void jpeg_encoder::process_mcu_row() + { + if (m_num_components == 1) + { + for (int i = 0; i < m_mcus_per_row; i++) + { + load_block_8_8_grey(i); code_block(0); + } + } + else if ((m_comp_h_samp[0] == 1) && (m_comp_v_samp[0] == 1)) + { + for (int i = 0; i < m_mcus_per_row; i++) + { + load_block_8_8(i, 0, 0); code_block(0); load_block_8_8(i, 0, 1); code_block(1); load_block_8_8(i, 0, 2); code_block(2); + } + } + else if ((m_comp_h_samp[0] == 2) && (m_comp_v_samp[0] == 1)) + { + for (int i = 0; i < m_mcus_per_row; i++) + { + load_block_8_8(i * 2 + 0, 0, 0); code_block(0); load_block_8_8(i * 2 + 1, 0, 0); code_block(0); + load_block_16_8_8(i, 1); code_block(1); load_block_16_8_8(i, 2); code_block(2); + } + } + else if ((m_comp_h_samp[0] == 2) && (m_comp_v_samp[0] == 2)) + { + for (int i = 0; i < m_mcus_per_row; i++) + { + load_block_8_8(i * 2 + 0, 0, 0); code_block(0); load_block_8_8(i * 2 + 1, 0, 0); code_block(0); + load_block_8_8(i * 2 + 0, 1, 0); code_block(0); load_block_8_8(i * 2 + 1, 1, 0); code_block(0); + load_block_16_8(i, 1); code_block(1); load_block_16_8(i, 2); code_block(2); + } + } + } + + void jpeg_encoder::load_mcu(const void *pSrc) + { + const uint8* Psrc = reinterpret_cast(pSrc); + + uint8* pDst = m_mcu_lines[m_mcu_y_ofs]; // OK to write up to m_image_bpl_xlt bytes to pDst + + if (m_num_components == 1) { + if (m_image_bpp == 3) + RGB_to_Y(pDst, Psrc, m_image_x); + else + memcpy(pDst, Psrc, m_image_x); + } else { + if (m_image_bpp == 3) + RGB_to_YCC(pDst, Psrc, m_image_x); + else + Y_to_YCC(pDst, Psrc, m_image_x); + } + + // Possibly duplicate pixels at end of scanline if not a multiple of 8 or 16 + if (m_num_components == 1) + memset(m_mcu_lines[m_mcu_y_ofs] + m_image_bpl_xlt, pDst[m_image_bpl_xlt - 1], m_image_x_mcu - m_image_x); + else + { + const uint8 y = pDst[m_image_bpl_xlt - 3 + 0], cb = pDst[m_image_bpl_xlt - 3 + 1], cr = pDst[m_image_bpl_xlt - 3 + 2]; + uint8 *q = m_mcu_lines[m_mcu_y_ofs] + m_image_bpl_xlt; + for (int i = m_image_x; i < m_image_x_mcu; i++) + { + *q++ = y; *q++ = cb; *q++ = cr; + } + } + + if (++m_mcu_y_ofs == m_mcu_y) + { + process_mcu_row(); + m_mcu_y_ofs = 0; + } + } + + // Quantization table generation. + void jpeg_encoder::compute_quant_table(int32 *pDst, const int16 *pSrc) + { + int32 q; + if (m_params.m_quality < 50) + q = 5000 / m_params.m_quality; + else + q = 200 - m_params.m_quality * 2; + for (int i = 0; i < 64; i++) + { + int32 j = *pSrc++; j = (j * q + 50L) / 100L; + *pDst++ = JPGE_MIN(JPGE_MAX(j, 1), 255); + } + } + + // Higher-level methods. + bool jpeg_encoder::jpg_open(int p_x_res, int p_y_res, int src_channels) + { + m_num_components = 3; + switch (m_params.m_subsampling) + { + case Y_ONLY: + { + m_num_components = 1; + m_comp_h_samp[0] = 1; m_comp_v_samp[0] = 1; + m_mcu_x = 8; m_mcu_y = 8; + break; + } + case H1V1: + { + m_comp_h_samp[0] = 1; m_comp_v_samp[0] = 1; + m_comp_h_samp[1] = 1; m_comp_v_samp[1] = 1; + m_comp_h_samp[2] = 1; m_comp_v_samp[2] = 1; + m_mcu_x = 8; m_mcu_y = 8; + break; + } + case H2V1: + { + m_comp_h_samp[0] = 2; m_comp_v_samp[0] = 1; + m_comp_h_samp[1] = 1; m_comp_v_samp[1] = 1; + m_comp_h_samp[2] = 1; m_comp_v_samp[2] = 1; + m_mcu_x = 16; m_mcu_y = 8; + break; + } + case H2V2: + { + m_comp_h_samp[0] = 2; m_comp_v_samp[0] = 2; + m_comp_h_samp[1] = 1; m_comp_v_samp[1] = 1; + m_comp_h_samp[2] = 1; m_comp_v_samp[2] = 1; + m_mcu_x = 16; m_mcu_y = 16; + } + } + + m_image_x = p_x_res; m_image_y = p_y_res; + m_image_bpp = src_channels; + m_image_bpl = m_image_x * src_channels; + m_image_x_mcu = (m_image_x + m_mcu_x - 1) & (~(m_mcu_x - 1)); + m_image_y_mcu = (m_image_y + m_mcu_y - 1) & (~(m_mcu_y - 1)); + m_image_bpl_xlt = m_image_x * m_num_components; + m_image_bpl_mcu = m_image_x_mcu * m_num_components; + m_mcus_per_row = m_image_x_mcu / m_mcu_x; + + if ((m_mcu_lines[0] = static_cast(jpge_malloc(m_image_bpl_mcu * m_mcu_y))) == NULL) { + return false; + } + for (int i = 1; i < m_mcu_y; i++) + m_mcu_lines[i] = m_mcu_lines[i-1] + m_image_bpl_mcu; + + if(m_last_quality != m_params.m_quality){ + m_last_quality = m_params.m_quality; + compute_quant_table(m_quantization_tables[0], s_std_lum_quant); + compute_quant_table(m_quantization_tables[1], s_std_croma_quant); + } + + if(!m_huff_initialized){ + m_huff_initialized = true; + + memcpy(m_huff_bits[0+0], s_dc_lum_bits, 17); memcpy(m_huff_val[0+0], s_dc_lum_val, DC_LUM_CODES); + memcpy(m_huff_bits[2+0], s_ac_lum_bits, 17); memcpy(m_huff_val[2+0], s_ac_lum_val, AC_LUM_CODES); + memcpy(m_huff_bits[0+1], s_dc_chroma_bits, 17); memcpy(m_huff_val[0+1], s_dc_chroma_val, DC_CHROMA_CODES); + memcpy(m_huff_bits[2+1], s_ac_chroma_bits, 17); memcpy(m_huff_val[2+1], s_ac_chroma_val, AC_CHROMA_CODES); + + compute_huffman_table(&m_huff_codes[0+0][0], &m_huff_code_sizes[0+0][0], m_huff_bits[0+0], m_huff_val[0+0]); + compute_huffman_table(&m_huff_codes[2+0][0], &m_huff_code_sizes[2+0][0], m_huff_bits[2+0], m_huff_val[2+0]); + compute_huffman_table(&m_huff_codes[0+1][0], &m_huff_code_sizes[0+1][0], m_huff_bits[0+1], m_huff_val[0+1]); + compute_huffman_table(&m_huff_codes[2+1][0], &m_huff_code_sizes[2+1][0], m_huff_bits[2+1], m_huff_val[2+1]); + } + + m_out_buf_left = JPGE_OUT_BUF_SIZE; + m_pOut_buf = m_out_buf; + m_bit_buffer = 0; + m_bits_in = 0; + m_mcu_y_ofs = 0; + m_pass_num = 2; + memset(m_last_dc_val, 0, 3 * sizeof(m_last_dc_val[0])); + + // Emit all markers at beginning of image file. + emit_marker(M_SOI); + emit_jfif_app0(); + emit_dqt(); + emit_sof(); + emit_dhts(); + emit_sos(); + + return m_all_stream_writes_succeeded; + } + + bool jpeg_encoder::process_end_of_image() + { + if (m_mcu_y_ofs) { + if (m_mcu_y_ofs < 16) { // check here just to shut up static analysis + for (int i = m_mcu_y_ofs; i < m_mcu_y; i++) { + memcpy(m_mcu_lines[i], m_mcu_lines[m_mcu_y_ofs - 1], m_image_bpl_mcu); + } + } + process_mcu_row(); + } + + put_bits(0x7F, 7); + emit_marker(M_EOI); + flush_output_buffer(); + m_all_stream_writes_succeeded = m_all_stream_writes_succeeded && m_pStream->put_buf(NULL, 0); + m_pass_num++; // purposely bump up m_pass_num, for debugging + return true; + } + + void jpeg_encoder::clear() + { + m_mcu_lines[0] = NULL; + m_pass_num = 0; + m_all_stream_writes_succeeded = true; + } + + jpeg_encoder::jpeg_encoder() + { + clear(); + } + + jpeg_encoder::~jpeg_encoder() + { + deinit(); + } + + bool jpeg_encoder::init(output_stream *pStream, int width, int height, int src_channels, const params &comp_params) + { + deinit(); + if (((!pStream) || (width < 1) || (height < 1)) || ((src_channels != 1) && (src_channels != 3) && (src_channels != 4)) || (!comp_params.check())) return false; + m_pStream = pStream; + m_params = comp_params; + return jpg_open(width, height, src_channels); + } + + void jpeg_encoder::deinit() + { + jpge_free(m_mcu_lines[0]); + clear(); + } + + bool jpeg_encoder::process_scanline(const void* pScanline) + { + if ((m_pass_num < 1) || (m_pass_num > 2)) { + return false; + } + if (m_all_stream_writes_succeeded) { + if (!pScanline) { + if (!process_end_of_image()) { + return false; + } + } else { + load_mcu(pScanline); + } + } + return m_all_stream_writes_succeeded; + } + +} // namespace jpge diff --git a/lib/libesp32_div/esp32-camera/conversions/private_include/jpge.h b/lib/libesp32_div/esp32-camera/conversions/private_include/jpge.h new file mode 100644 index 000000000..aa295c8af --- /dev/null +++ b/lib/libesp32_div/esp32-camera/conversions/private_include/jpge.h @@ -0,0 +1,142 @@ +// jpge.h - C++ class for JPEG compression. +// Public domain, Rich Geldreich +// Alex Evans: Added RGBA support, linear memory allocator. +#ifndef JPEG_ENCODER_H +#define JPEG_ENCODER_H + +namespace jpge +{ + typedef unsigned char uint8; + typedef signed short int16; + typedef signed int int32; + typedef unsigned short uint16; + typedef unsigned int uint32; + typedef unsigned int uint; + + // JPEG chroma subsampling factors. Y_ONLY (grayscale images) and H2V2 (color images) are the most common. + enum subsampling_t { Y_ONLY = 0, H1V1 = 1, H2V1 = 2, H2V2 = 3 }; + + // JPEG compression parameters structure. + struct params { + inline params() : m_quality(85), m_subsampling(H2V2) { } + + inline bool check() const { + if ((m_quality < 1) || (m_quality > 100)) { + return false; + } + if ((uint)m_subsampling > (uint)H2V2) { + return false; + } + return true; + } + + // Quality: 1-100, higher is better. Typical values are around 50-95. + int m_quality; + + // m_subsampling: + // 0 = Y (grayscale) only + // 1 = H1V1 subsampling (YCbCr 1x1x1, 3 blocks per MCU) + // 2 = H2V1 subsampling (YCbCr 2x1x1, 4 blocks per MCU) + // 3 = H2V2 subsampling (YCbCr 4x1x1, 6 blocks per MCU-- very common) + subsampling_t m_subsampling; + }; + + // Output stream abstract class - used by the jpeg_encoder class to write to the output stream. + // put_buf() is generally called with len==JPGE_OUT_BUF_SIZE bytes, but for headers it'll be called with smaller amounts. + class output_stream { + public: + virtual ~output_stream() { }; + virtual bool put_buf(const void* Pbuf, int len) = 0; + virtual uint get_size() const = 0; + }; + + // Lower level jpeg_encoder class - useful if more control is needed than the above helper functions. + class jpeg_encoder { + public: + jpeg_encoder(); + ~jpeg_encoder(); + + // Initializes the compressor. + // pStream: The stream object to use for writing compressed data. + // params - Compression parameters structure, defined above. + // width, height - Image dimensions. + // channels - May be 1, or 3. 1 indicates grayscale, 3 indicates RGB source data. + // Returns false on out of memory or if a stream write fails. + bool init(output_stream *pStream, int width, int height, int src_channels, const params &comp_params = params()); + + // Call this method with each source scanline. + // width * src_channels bytes per scanline is expected (RGB or Y format). + // You must call with NULL after all scanlines are processed to finish compression. + // Returns false on out of memory or if a stream write fails. + bool process_scanline(const void* pScanline); + + // Deinitializes the compressor, freeing any allocated memory. May be called at any time. + void deinit(); + + private: + jpeg_encoder(const jpeg_encoder &); + jpeg_encoder &operator =(const jpeg_encoder &); + + typedef int32 sample_array_t; + enum { JPGE_OUT_BUF_SIZE = 512 }; + + output_stream *m_pStream; + params m_params; + uint8 m_num_components; + uint8 m_comp_h_samp[3], m_comp_v_samp[3]; + int m_image_x, m_image_y, m_image_bpp, m_image_bpl; + int m_image_x_mcu, m_image_y_mcu; + int m_image_bpl_xlt, m_image_bpl_mcu; + int m_mcus_per_row; + int m_mcu_x, m_mcu_y; + uint8 *m_mcu_lines[16]; + uint8 m_mcu_y_ofs; + sample_array_t m_sample_array[64]; + int16 m_coefficient_array[64]; + + int m_last_dc_val[3]; + uint8 m_out_buf[JPGE_OUT_BUF_SIZE]; + uint8 *m_pOut_buf; + uint m_out_buf_left; + uint32 m_bit_buffer; + uint m_bits_in; + uint8 m_pass_num; + bool m_all_stream_writes_succeeded; + + bool jpg_open(int p_x_res, int p_y_res, int src_channels); + + void flush_output_buffer(); + void put_bits(uint bits, uint len); + + void emit_byte(uint8 i); + void emit_word(uint i); + void emit_marker(int marker); + + void emit_jfif_app0(); + void emit_dqt(); + void emit_sof(); + void emit_dht(uint8 *bits, uint8 *val, int index, bool ac_flag); + void emit_dhts(); + void emit_sos(); + + void compute_quant_table(int32 *dst, const int16 *src); + void load_quantized_coefficients(int component_num); + + void load_block_8_8_grey(int x); + void load_block_8_8(int x, int y, int c); + void load_block_16_8(int x, int c); + void load_block_16_8_8(int x, int c); + + void code_coefficients_pass_two(int component_num); + void code_block(int component_num); + + void process_mcu_row(); + bool process_end_of_image(); + void load_mcu(const void* src); + void clear(); + void init(); + }; + +} // namespace jpge + +#endif // JPEG_ENCODER diff --git a/lib/libesp32_div/esp32-camera/conversions/private_include/yuv.h b/lib/libesp32_div/esp32-camera/conversions/private_include/yuv.h new file mode 100644 index 000000000..c5a0577ef --- /dev/null +++ b/lib/libesp32_div/esp32-camera/conversions/private_include/yuv.h @@ -0,0 +1,29 @@ +// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD +// +// 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. +#ifndef _CONVERSIONS_YUV_H_ +#define _CONVERSIONS_YUV_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +void yuv2rgb(uint8_t y, uint8_t u, uint8_t v, uint8_t *r, uint8_t *g, uint8_t *b); + +#ifdef __cplusplus +} +#endif + +#endif /* _CONVERSIONS_YUV_H_ */ diff --git a/lib/libesp32_div/esp32-camera/conversions/to_bmp.c b/lib/libesp32_div/esp32-camera/conversions/to_bmp.c new file mode 100644 index 000000000..5a54bdbae --- /dev/null +++ b/lib/libesp32_div/esp32-camera/conversions/to_bmp.c @@ -0,0 +1,393 @@ +// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD +// +// 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. +#include +#include +#include "img_converters.h" +#include "soc/efuse_reg.h" +#include "esp_heap_caps.h" +#include "yuv.h" +#include "sdkconfig.h" +#include "esp_jpg_decode.h" + +#include "esp_system.h" +#if ESP_IDF_VERSION_MAJOR >= 4 // IDF 4+ +#if CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4 +#include "esp32/spiram.h" +#elif CONFIG_IDF_TARGET_ESP32S2 +#include "esp32s2/spiram.h" +#elif CONFIG_IDF_TARGET_ESP32S3 +#include "esp32s3/spiram.h" +#else +#error Target CONFIG_IDF_TARGET is not supported +#endif +#else // ESP32 Before IDF 4.0 +#include "esp_spiram.h" +#endif + +#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) +#include "esp32-hal-log.h" +#define TAG "" +#else +#include "esp_log.h" +static const char* TAG = "to_bmp"; +#endif + +static const int BMP_HEADER_LEN = 54; + +typedef struct { + uint32_t filesize; + uint32_t reserved; + uint32_t fileoffset_to_pixelarray; + uint32_t dibheadersize; + int32_t width; + int32_t height; + uint16_t planes; + uint16_t bitsperpixel; + uint32_t compression; + uint32_t imagesize; + uint32_t ypixelpermeter; + uint32_t xpixelpermeter; + uint32_t numcolorspallette; + uint32_t mostimpcolor; +} bmp_header_t; + +typedef struct { + uint16_t width; + uint16_t height; + uint16_t data_offset; + const uint8_t *input; + uint8_t *output; +} rgb_jpg_decoder; + +static void *_malloc(size_t size) +{ + return heap_caps_malloc(size, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT); +} + +//output buffer and image width +static bool _rgb_write(void * arg, uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint8_t *data) +{ + rgb_jpg_decoder * jpeg = (rgb_jpg_decoder *)arg; + if(!data){ + if(x == 0 && y == 0){ + //write start + jpeg->width = w; + jpeg->height = h; + //if output is null, this is BMP + if(!jpeg->output){ + jpeg->output = (uint8_t *)_malloc((w*h*3)+jpeg->data_offset); + if(!jpeg->output){ + return false; + } + } + } else { + //write end + } + return true; + } + + 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->output+jpeg->data_offset; + uint8_t *o = out; + size_t iy, ix; + + w = w * 3; + + for(iy=t; iywidth = w; + jpeg->height = h; + //if output is null, this is BMP + if(!jpeg->output){ + jpeg->output = (uint8_t *)_malloc((w*h*3)+jpeg->data_offset); + if(!jpeg->output){ + return false; + } + } + } else { + //write end + } + return true; + } + + 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->output+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; +} + +//input buffer +static uint32_t _jpg_read(void * arg, size_t index, uint8_t *buf, size_t len) +{ + rgb_jpg_decoder * jpeg = (rgb_jpg_decoder *)arg; + if(buf) { + memcpy(buf, jpeg->input + index, len); + } + return len; +} + +static bool jpg2rgb888(const uint8_t *src, size_t src_len, uint8_t * out, jpg_scale_t scale) +{ + rgb_jpg_decoder jpeg; + jpeg.width = 0; + jpeg.height = 0; + jpeg.input = src; + jpeg.output = out; + jpeg.data_offset = 0; + + if(esp_jpg_decode(src_len, scale, _jpg_read, _rgb_write, (void*)&jpeg) != ESP_OK){ + return false; + } + return true; +} + +bool jpg2rgb565(const uint8_t *src, size_t src_len, uint8_t * out, jpg_scale_t scale) +{ + rgb_jpg_decoder jpeg; + jpeg.width = 0; + jpeg.height = 0; + jpeg.input = src; + jpeg.output = out; + jpeg.data_offset = 0; + + if(esp_jpg_decode(src_len, scale, _jpg_read, _rgb565_write, (void*)&jpeg) != ESP_OK){ + return false; + } + return true; +} + +bool jpg2bmp(const uint8_t *src, size_t src_len, uint8_t ** out, size_t * out_len) +{ + + rgb_jpg_decoder jpeg; + jpeg.width = 0; + jpeg.height = 0; + jpeg.input = src; + jpeg.output = NULL; + jpeg.data_offset = BMP_HEADER_LEN; + + if(esp_jpg_decode(src_len, JPG_SCALE_NONE, _jpg_read, _rgb_write, (void*)&jpeg) != ESP_OK){ + return false; + } + + size_t output_size = jpeg.width*jpeg.height*3; + + jpeg.output[0] = 'B'; + jpeg.output[1] = 'M'; + bmp_header_t * bitmap = (bmp_header_t*)&jpeg.output[2]; + bitmap->reserved = 0; + bitmap->filesize = output_size+BMP_HEADER_LEN; + bitmap->fileoffset_to_pixelarray = BMP_HEADER_LEN; + bitmap->dibheadersize = 40; + bitmap->width = jpeg.width; + bitmap->height = -jpeg.height;//set negative for top to bottom + bitmap->planes = 1; + bitmap->bitsperpixel = 24; + bitmap->compression = 0; + bitmap->imagesize = output_size; + bitmap->ypixelpermeter = 0x0B13 ; //2835 , 72 DPI + bitmap->xpixelpermeter = 0x0B13 ; //2835 , 72 DPI + bitmap->numcolorspallette = 0; + bitmap->mostimpcolor = 0; + + *out = jpeg.output; + *out_len = output_size+BMP_HEADER_LEN; + + return true; +} + +bool fmt2rgb888(const uint8_t *src_buf, size_t src_len, pixformat_t format, uint8_t * rgb_buf) +{ + int pix_count = 0; + if(format == PIXFORMAT_JPEG) { + return jpg2rgb888(src_buf, src_len, rgb_buf, JPG_SCALE_NONE); + } else if(format == PIXFORMAT_RGB888) { + memcpy(rgb_buf, src_buf, src_len); + } else if(format == PIXFORMAT_RGB565) { + int i; + uint8_t hb, lb; + pix_count = src_len / 2; + for(i=0; i> 3; + *rgb_buf++ = hb & 0xF8; + } + } else if(format == PIXFORMAT_GRAYSCALE) { + int i; + uint8_t b; + pix_count = src_len; + for(i=0; ireserved = 0; + bitmap->filesize = out_size; + bitmap->fileoffset_to_pixelarray = BMP_HEADER_LEN; + bitmap->dibheadersize = 40; + bitmap->width = width; + bitmap->height = -height;//set negative for top to bottom + bitmap->planes = 1; + bitmap->bitsperpixel = 24; + bitmap->compression = 0; + bitmap->imagesize = pix_count * 3; + bitmap->ypixelpermeter = 0x0B13 ; //2835 , 72 DPI + bitmap->xpixelpermeter = 0x0B13 ; //2835 , 72 DPI + bitmap->numcolorspallette = 0; + bitmap->mostimpcolor = 0; + + uint8_t * rgb_buf = out_buf + BMP_HEADER_LEN; + uint8_t * src_buf = src; + + + //convert data to RGB888 + if(format == PIXFORMAT_RGB888) { + memcpy(rgb_buf, src_buf, pix_count*3); + } else if(format == PIXFORMAT_RGB565) { + int i; + uint8_t hb, lb; + for(i=0; i> 3; + *rgb_buf++ = hb & 0xF8; + } + } else if(format == PIXFORMAT_GRAYSCALE) { + int i; + uint8_t b; + for(i=0; ibuf, fb->len, fb->width, fb->height, fb->format, out, out_len); +} diff --git a/lib/libesp32_div/esp32-camera/conversions/to_jpg.cpp b/lib/libesp32_div/esp32-camera/conversions/to_jpg.cpp new file mode 100644 index 000000000..9b8905a73 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/conversions/to_jpg.cpp @@ -0,0 +1,245 @@ +// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD +// +// 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. +#include +#include +#include "esp_attr.h" +#include "soc/efuse_reg.h" +#include "esp_heap_caps.h" +#include "esp_camera.h" +#include "img_converters.h" +#include "jpge.h" +#include "yuv.h" + +#include "esp_system.h" +#if ESP_IDF_VERSION_MAJOR >= 4 // IDF 4+ +#if CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4 +#include "esp32/spiram.h" +#elif CONFIG_IDF_TARGET_ESP32S2 +#include "esp32s2/spiram.h" +#elif CONFIG_IDF_TARGET_ESP32S3 +#include "esp32s3/spiram.h" +#else +#error Target CONFIG_IDF_TARGET is not supported +#endif +#else // ESP32 Before IDF 4.0 +#include "esp_spiram.h" +#endif + +#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) +#include "esp32-hal-log.h" +#define TAG "" +#else +#include "esp_log.h" +static const char* TAG = "to_jpg"; +#endif + +static void *_malloc(size_t size) +{ + void * res = malloc(size); + if(res) { + return res; + } + return heap_caps_malloc(size, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT); +} + +static IRAM_ATTR void convert_line_format(uint8_t * src, pixformat_t format, uint8_t * dst, size_t width, size_t in_channels, size_t line) +{ + int i=0, o=0, l=0; + if(format == PIXFORMAT_GRAYSCALE) { + memcpy(dst, src + line * width, width); + } else if(format == PIXFORMAT_RGB888) { + l = width * 3; + src += l * line; + for(i=0; i> 3; + dst[o++] = (src[i+1] & 0x1F) << 3; + } + } else if(format == PIXFORMAT_YUV422) { + uint8_t y0, y1, u, v; + uint8_t r, g, b; + l = width * 2; + src += l * line; + for(i=0; i 100) { + quality = 100; + } + + jpge::params comp_params = jpge::params(); + comp_params.m_subsampling = subsampling; + comp_params.m_quality = quality; + + jpge::jpeg_encoder dst_image; + + if (!dst_image.init(dst_stream, width, height, num_channels, comp_params)) { + ESP_LOGE(TAG, "JPG encoder init failed"); + return false; + } + + uint8_t* line = (uint8_t*)_malloc(width * num_channels); + if(!line) { + ESP_LOGE(TAG, "Scan line malloc failed"); + return false; + } + + for (int i = 0; i < height; i++) { + convert_line_format(src, format, line, width, num_channels, i); + if (!dst_image.process_scanline(line)) { + ESP_LOGE(TAG, "JPG process line %u failed", i); + free(line); + return false; + } + } + free(line); + + if (!dst_image.process_scanline(NULL)) { + ESP_LOGE(TAG, "JPG image finish failed"); + return false; + } + dst_image.deinit(); + return true; +} + +class callback_stream : public jpge::output_stream { +protected: + jpg_out_cb ocb; + void * oarg; + size_t index; + +public: + callback_stream(jpg_out_cb cb, void * arg) : ocb(cb), oarg(arg), index(0) { } + virtual ~callback_stream() { } + virtual bool put_buf(const void* data, int len) + { + index += ocb(oarg, index, data, len); + return true; + } + virtual size_t get_size() const + { + return index; + } +}; + +bool fmt2jpg_cb(uint8_t *src, size_t src_len, uint16_t width, uint16_t height, pixformat_t format, uint8_t quality, jpg_out_cb cb, void * arg) +{ + callback_stream dst_stream(cb, arg); + return convert_image(src, width, height, format, quality, &dst_stream); +} + +bool frame2jpg_cb(camera_fb_t * fb, uint8_t quality, jpg_out_cb cb, void * arg) +{ + return fmt2jpg_cb(fb->buf, fb->len, fb->width, fb->height, fb->format, quality, cb, arg); +} + + + +class memory_stream : public jpge::output_stream { +protected: + uint8_t *out_buf; + size_t max_len, index; + +public: + memory_stream(void *pBuf, uint buf_size) : out_buf(static_cast(pBuf)), max_len(buf_size), index(0) { } + + virtual ~memory_stream() { } + + virtual bool put_buf(const void* pBuf, int len) + { + if (!pBuf) { + //end of image + return true; + } + if ((size_t)len > (max_len - index)) { + //ESP_LOGW(TAG, "JPG output overflow: %d bytes (%d,%d,%d)", len - (max_len - index), len, index, max_len); + len = max_len - index; + } + if (len) { + memcpy(out_buf + index, pBuf, len); + index += len; + } + return true; + } + + virtual size_t get_size() const + { + return index; + } +}; + +bool fmt2jpg(uint8_t *src, size_t src_len, uint16_t width, uint16_t height, pixformat_t format, uint8_t quality, uint8_t ** out, size_t * out_len) +{ + //todo: allocate proper buffer for holding JPEG data + //this should be enough for CIF frame size + int jpg_buf_len = 128*1024; + + + uint8_t * jpg_buf = (uint8_t *)_malloc(jpg_buf_len); + if(jpg_buf == NULL) { + ESP_LOGE(TAG, "JPG buffer malloc failed"); + return false; + } + memory_stream dst_stream(jpg_buf, jpg_buf_len); + + if(!convert_image(src, width, height, format, quality, &dst_stream)) { + free(jpg_buf); + return false; + } + + *out = jpg_buf; + *out_len = dst_stream.get_size(); + return true; +} + +bool frame2jpg(camera_fb_t * fb, uint8_t quality, uint8_t ** out, size_t * out_len) +{ + return fmt2jpg(fb->buf, fb->len, fb->width, fb->height, fb->format, quality, out, out_len); +} diff --git a/lib/libesp32_div/esp32-camera/conversions/yuv.c b/lib/libesp32_div/esp32-camera/conversions/yuv.c new file mode 100644 index 000000000..46034cc86 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/conversions/yuv.c @@ -0,0 +1,298 @@ +// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD +// +// 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. +#include "yuv.h" +#include "esp_attr.h" + +typedef struct { + int16_t vY; + int16_t vVr; + int16_t vVg; + int16_t vUg; + int16_t vUb; +} yuv_table_row; + +static const yuv_table_row yuv_table[256] = { + // Y Vr Vg Ug Ub // # + { -18, -204, 50, 104, -258 }, // 0 + { -17, -202, 49, 103, -256 }, // 1 + { -16, -201, 49, 102, -254 }, // 2 + { -15, -199, 48, 101, -252 }, // 3 + { -13, -197, 48, 100, -250 }, // 4 + { -12, -196, 48, 99, -248 }, // 5 + { -11, -194, 47, 99, -246 }, // 6 + { -10, -193, 47, 98, -244 }, // 7 + { -9, -191, 46, 97, -242 }, // 8 + { -8, -189, 46, 96, -240 }, // 9 + { -6, -188, 46, 95, -238 }, // 10 + { -5, -186, 45, 95, -236 }, // 11 + { -4, -185, 45, 94, -234 }, // 12 + { -3, -183, 44, 93, -232 }, // 13 + { -2, -181, 44, 92, -230 }, // 14 + { -1, -180, 44, 91, -228 }, // 15 + { 0, -178, 43, 91, -226 }, // 16 + { 1, -177, 43, 90, -223 }, // 17 + { 2, -175, 43, 89, -221 }, // 18 + { 3, -173, 42, 88, -219 }, // 19 + { 4, -172, 42, 87, -217 }, // 20 + { 5, -170, 41, 86, -215 }, // 21 + { 6, -169, 41, 86, -213 }, // 22 + { 8, -167, 41, 85, -211 }, // 23 + { 9, -165, 40, 84, -209 }, // 24 + { 10, -164, 40, 83, -207 }, // 25 + { 11, -162, 39, 82, -205 }, // 26 + { 12, -161, 39, 82, -203 }, // 27 + { 13, -159, 39, 81, -201 }, // 28 + { 15, -158, 38, 80, -199 }, // 29 + { 16, -156, 38, 79, -197 }, // 30 + { 17, -154, 37, 78, -195 }, // 31 + { 18, -153, 37, 78, -193 }, // 32 + { 19, -151, 37, 77, -191 }, // 33 + { 20, -150, 36, 76, -189 }, // 34 + { 22, -148, 36, 75, -187 }, // 35 + { 23, -146, 35, 74, -185 }, // 36 + { 24, -145, 35, 73, -183 }, // 37 + { 25, -143, 35, 73, -181 }, // 38 + { 26, -142, 34, 72, -179 }, // 39 + { 27, -140, 34, 71, -177 }, // 40 + { 29, -138, 34, 70, -175 }, // 41 + { 30, -137, 33, 69, -173 }, // 42 + { 31, -135, 33, 69, -171 }, // 43 + { 32, -134, 32, 68, -169 }, // 44 + { 33, -132, 32, 67, -167 }, // 45 + { 34, -130, 32, 66, -165 }, // 46 + { 36, -129, 31, 65, -163 }, // 47 + { 37, -127, 31, 65, -161 }, // 48 + { 38, -126, 30, 64, -159 }, // 49 + { 39, -124, 30, 63, -157 }, // 50 + { 40, -122, 30, 62, -155 }, // 51 + { 41, -121, 29, 61, -153 }, // 52 + { 43, -119, 29, 60, -151 }, // 53 + { 44, -118, 28, 60, -149 }, // 54 + { 45, -116, 28, 59, -147 }, // 55 + { 46, -114, 28, 58, -145 }, // 56 + { 47, -113, 27, 57, -143 }, // 57 + { 48, -111, 27, 56, -141 }, // 58 + { 50, -110, 26, 56, -139 }, // 59 + { 51, -108, 26, 55, -137 }, // 60 + { 52, -106, 26, 54, -135 }, // 61 + { 53, -105, 25, 53, -133 }, // 62 + { 54, -103, 25, 52, -131 }, // 63 + { 55, -102, 25, 52, -129 }, // 64 + { 57, -100, 24, 51, -127 }, // 65 + { 58, -98, 24, 50, -125 }, // 66 + { 59, -97, 23, 49, -123 }, // 67 + { 60, -95, 23, 48, -121 }, // 68 + { 61, -94, 23, 47, -119 }, // 69 + { 62, -92, 22, 47, -117 }, // 70 + { 64, -90, 22, 46, -115 }, // 71 + { 65, -89, 21, 45, -113 }, // 72 + { 66, -87, 21, 44, -110 }, // 73 + { 67, -86, 21, 43, -108 }, // 74 + { 68, -84, 20, 43, -106 }, // 75 + { 69, -82, 20, 42, -104 }, // 76 + { 71, -81, 19, 41, -102 }, // 77 + { 72, -79, 19, 40, -100 }, // 78 + { 73, -78, 19, 39, -98 }, // 79 + { 74, -76, 18, 39, -96 }, // 80 + { 75, -75, 18, 38, -94 }, // 81 + { 76, -73, 17, 37, -92 }, // 82 + { 77, -71, 17, 36, -90 }, // 83 + { 79, -70, 17, 35, -88 }, // 84 + { 80, -68, 16, 34, -86 }, // 85 + { 81, -67, 16, 34, -84 }, // 86 + { 82, -65, 16, 33, -82 }, // 87 + { 83, -63, 15, 32, -80 }, // 88 + { 84, -62, 15, 31, -78 }, // 89 + { 86, -60, 14, 30, -76 }, // 90 + { 87, -59, 14, 30, -74 }, // 91 + { 88, -57, 14, 29, -72 }, // 92 + { 89, -55, 13, 28, -70 }, // 93 + { 90, -54, 13, 27, -68 }, // 94 + { 91, -52, 12, 26, -66 }, // 95 + { 93, -51, 12, 26, -64 }, // 96 + { 94, -49, 12, 25, -62 }, // 97 + { 95, -47, 11, 24, -60 }, // 98 + { 96, -46, 11, 23, -58 }, // 99 + { 97, -44, 10, 22, -56 }, // 100 + { 98, -43, 10, 21, -54 }, // 101 + { 100, -41, 10, 21, -52 }, // 102 + { 101, -39, 9, 20, -50 }, // 103 + { 102, -38, 9, 19, -48 }, // 104 + { 103, -36, 8, 18, -46 }, // 105 + { 104, -35, 8, 17, -44 }, // 106 + { 105, -33, 8, 17, -42 }, // 107 + { 107, -31, 7, 16, -40 }, // 108 + { 108, -30, 7, 15, -38 }, // 109 + { 109, -28, 7, 14, -36 }, // 110 + { 110, -27, 6, 13, -34 }, // 111 + { 111, -25, 6, 13, -32 }, // 112 + { 112, -23, 5, 12, -30 }, // 113 + { 114, -22, 5, 11, -28 }, // 114 + { 115, -20, 5, 10, -26 }, // 115 + { 116, -19, 4, 9, -24 }, // 116 + { 117, -17, 4, 8, -22 }, // 117 + { 118, -15, 3, 8, -20 }, // 118 + { 119, -14, 3, 7, -18 }, // 119 + { 121, -12, 3, 6, -16 }, // 120 + { 122, -11, 2, 5, -14 }, // 121 + { 123, -9, 2, 4, -12 }, // 122 + { 124, -7, 1, 4, -10 }, // 123 + { 125, -6, 1, 3, -8 }, // 124 + { 126, -4, 1, 2, -6 }, // 125 + { 128, -3, 0, 1, -4 }, // 126 + { 129, -1, 0, 0, -2 }, // 127 + { 130, 0, 0, 0, 0 }, // 128 + { 131, 1, 0, 0, 2 }, // 129 + { 132, 3, 0, -1, 4 }, // 130 + { 133, 4, -1, -2, 6 }, // 131 + { 135, 6, -1, -3, 8 }, // 132 + { 136, 7, -1, -4, 10 }, // 133 + { 137, 9, -2, -4, 12 }, // 134 + { 138, 11, -2, -5, 14 }, // 135 + { 139, 12, -3, -6, 16 }, // 136 + { 140, 14, -3, -7, 18 }, // 137 + { 142, 15, -3, -8, 20 }, // 138 + { 143, 17, -4, -8, 22 }, // 139 + { 144, 19, -4, -9, 24 }, // 140 + { 145, 20, -5, -10, 26 }, // 141 + { 146, 22, -5, -11, 28 }, // 142 + { 147, 23, -5, -12, 30 }, // 143 + { 148, 25, -6, -13, 32 }, // 144 + { 150, 27, -6, -13, 34 }, // 145 + { 151, 28, -7, -14, 36 }, // 146 + { 152, 30, -7, -15, 38 }, // 147 + { 153, 31, -7, -16, 40 }, // 148 + { 154, 33, -8, -17, 42 }, // 149 + { 155, 35, -8, -17, 44 }, // 150 + { 157, 36, -8, -18, 46 }, // 151 + { 158, 38, -9, -19, 48 }, // 152 + { 159, 39, -9, -20, 50 }, // 153 + { 160, 41, -10, -21, 52 }, // 154 + { 161, 43, -10, -21, 54 }, // 155 + { 162, 44, -10, -22, 56 }, // 156 + { 164, 46, -11, -23, 58 }, // 157 + { 165, 47, -11, -24, 60 }, // 158 + { 166, 49, -12, -25, 62 }, // 159 + { 167, 51, -12, -26, 64 }, // 160 + { 168, 52, -12, -26, 66 }, // 161 + { 169, 54, -13, -27, 68 }, // 162 + { 171, 55, -13, -28, 70 }, // 163 + { 172, 57, -14, -29, 72 }, // 164 + { 173, 59, -14, -30, 74 }, // 165 + { 174, 60, -14, -30, 76 }, // 166 + { 175, 62, -15, -31, 78 }, // 167 + { 176, 63, -15, -32, 80 }, // 168 + { 178, 65, -16, -33, 82 }, // 169 + { 179, 67, -16, -34, 84 }, // 170 + { 180, 68, -16, -34, 86 }, // 171 + { 181, 70, -17, -35, 88 }, // 172 + { 182, 71, -17, -36, 90 }, // 173 + { 183, 73, -17, -37, 92 }, // 174 + { 185, 75, -18, -38, 94 }, // 175 + { 186, 76, -18, -39, 96 }, // 176 + { 187, 78, -19, -39, 98 }, // 177 + { 188, 79, -19, -40, 100 }, // 178 + { 189, 81, -19, -41, 102 }, // 179 + { 190, 82, -20, -42, 104 }, // 180 + { 192, 84, -20, -43, 106 }, // 181 + { 193, 86, -21, -43, 108 }, // 182 + { 194, 87, -21, -44, 110 }, // 183 + { 195, 89, -21, -45, 113 }, // 184 + { 196, 90, -22, -46, 115 }, // 185 + { 197, 92, -22, -47, 117 }, // 186 + { 199, 94, -23, -47, 119 }, // 187 + { 200, 95, -23, -48, 121 }, // 188 + { 201, 97, -23, -49, 123 }, // 189 + { 202, 98, -24, -50, 125 }, // 190 + { 203, 100, -24, -51, 127 }, // 191 + { 204, 102, -25, -52, 129 }, // 192 + { 206, 103, -25, -52, 131 }, // 193 + { 207, 105, -25, -53, 133 }, // 194 + { 208, 106, -26, -54, 135 }, // 195 + { 209, 108, -26, -55, 137 }, // 196 + { 210, 110, -26, -56, 139 }, // 197 + { 211, 111, -27, -56, 141 }, // 198 + { 213, 113, -27, -57, 143 }, // 199 + { 214, 114, -28, -58, 145 }, // 200 + { 215, 116, -28, -59, 147 }, // 201 + { 216, 118, -28, -60, 149 }, // 202 + { 217, 119, -29, -60, 151 }, // 203 + { 218, 121, -29, -61, 153 }, // 204 + { 219, 122, -30, -62, 155 }, // 205 + { 221, 124, -30, -63, 157 }, // 206 + { 222, 126, -30, -64, 159 }, // 207 + { 223, 127, -31, -65, 161 }, // 208 + { 224, 129, -31, -65, 163 }, // 209 + { 225, 130, -32, -66, 165 }, // 210 + { 226, 132, -32, -67, 167 }, // 211 + { 228, 134, -32, -68, 169 }, // 212 + { 229, 135, -33, -69, 171 }, // 213 + { 230, 137, -33, -69, 173 }, // 214 + { 231, 138, -34, -70, 175 }, // 215 + { 232, 140, -34, -71, 177 }, // 216 + { 233, 142, -34, -72, 179 }, // 217 + { 235, 143, -35, -73, 181 }, // 218 + { 236, 145, -35, -73, 183 }, // 219 + { 237, 146, -35, -74, 185 }, // 220 + { 238, 148, -36, -75, 187 }, // 221 + { 239, 150, -36, -76, 189 }, // 222 + { 240, 151, -37, -77, 191 }, // 223 + { 242, 153, -37, -78, 193 }, // 224 + { 243, 154, -37, -78, 195 }, // 225 + { 244, 156, -38, -79, 197 }, // 226 + { 245, 158, -38, -80, 199 }, // 227 + { 246, 159, -39, -81, 201 }, // 228 + { 247, 161, -39, -82, 203 }, // 229 + { 249, 162, -39, -82, 205 }, // 230 + { 250, 164, -40, -83, 207 }, // 231 + { 251, 165, -40, -84, 209 }, // 232 + { 252, 167, -41, -85, 211 }, // 233 + { 253, 169, -41, -86, 213 }, // 234 + { 254, 170, -41, -86, 215 }, // 235 + { 256, 172, -42, -87, 217 }, // 236 + { 257, 173, -42, -88, 219 }, // 237 + { 258, 175, -43, -89, 221 }, // 238 + { 259, 177, -43, -90, 223 }, // 239 + { 260, 178, -43, -91, 226 }, // 240 + { 261, 180, -44, -91, 228 }, // 241 + { 263, 181, -44, -92, 230 }, // 242 + { 264, 183, -44, -93, 232 }, // 243 + { 265, 185, -45, -94, 234 }, // 244 + { 266, 186, -45, -95, 236 }, // 245 + { 267, 188, -46, -95, 238 }, // 246 + { 268, 189, -46, -96, 240 }, // 247 + { 270, 191, -46, -97, 242 }, // 248 + { 271, 193, -47, -98, 244 }, // 249 + { 272, 194, -47, -99, 246 }, // 250 + { 273, 196, -48, -99, 248 }, // 251 + { 274, 197, -48, -100, 250 }, // 252 + { 275, 199, -48, -101, 252 }, // 253 + { 277, 201, -49, -102, 254 }, // 254 + { 278, 202, -49, -103, 256 } // 255 +}; + +#define YUYV_CONSTRAIN(v) ((v)<0)?0:(((v)>255)?255:(v)) + +void IRAM_ATTR yuv2rgb(uint8_t y, uint8_t u, uint8_t v, uint8_t *r, uint8_t *g, uint8_t *b) +{ + int16_t ri, gi, bi; + + ri = yuv_table[y].vY + yuv_table[v].vVr; + gi = yuv_table[y].vY + yuv_table[u].vUg + yuv_table[v].vVg; + bi = yuv_table[y].vY + yuv_table[u].vUb; + + *r = YUYV_CONSTRAIN(ri); + *g = YUYV_CONSTRAIN(gi); + *b = YUYV_CONSTRAIN(bi); +} diff --git a/lib/libesp32_div/esp32-camera/driver/cam_hal.c b/lib/libesp32_div/esp32-camera/driver/cam_hal.c new file mode 100644 index 000000000..c54fb8172 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/driver/cam_hal.c @@ -0,0 +1,483 @@ +// Copyright 2010-2020 Espressif Systems (Shanghai) PTE LTD +// +// 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. + +#include +#include +#include "esp_heap_caps.h" +#include "ll_cam.h" +#include "cam_hal.h" + +static const char *TAG = "cam_hal"; + +static cam_obj_t *cam_obj = NULL; + +static const uint32_t JPEG_SOI_MARKER = 0xFFD8FF; // written in little-endian for esp32 +static const uint16_t JPEG_EOI_MARKER = 0xD9FF; // written in little-endian for esp32 + +static int cam_verify_jpeg_soi(const uint8_t *inbuf, uint32_t length) +{ + uint32_t sig = *((uint32_t *)inbuf) & 0xFFFFFF; + if(sig != JPEG_SOI_MARKER) { + for (uint32_t i = 0; i < length; i++) { + sig = *((uint32_t *)(&inbuf[i])) & 0xFFFFFF; + if (sig == JPEG_SOI_MARKER) { + ESP_LOGW(TAG, "SOI: %d", i); + return i; + } + } + ESP_LOGW(TAG, "NO-SOI"); + return -1; + } + return 0; +} + +static int cam_verify_jpeg_eoi(const uint8_t *inbuf, uint32_t length) +{ + int offset = -1; + uint8_t *dptr = (uint8_t *)inbuf + length - 2; + while (dptr > inbuf) { + uint16_t sig = *((uint16_t *)dptr); + if (JPEG_EOI_MARKER == sig) { + offset = dptr - inbuf; + //ESP_LOGW(TAG, "EOI: %d", length - (offset + 2)); + return offset; + } + dptr--; + } + return -1; +} + +static bool cam_get_next_frame(int * frame_pos) +{ + if(!cam_obj->frames[*frame_pos].en){ + for (int x = 0; x < cam_obj->frame_cnt; x++) { + if (cam_obj->frames[x].en) { + *frame_pos = x; + return true; + } + } + } else { + return true; + } + return false; +} + +static bool cam_start_frame(int * frame_pos) +{ + if (cam_get_next_frame(frame_pos)) { + if(ll_cam_start(cam_obj, *frame_pos)){ + // Vsync the frame manually + ll_cam_do_vsync(cam_obj); + uint64_t us = (uint64_t)esp_timer_get_time(); + cam_obj->frames[*frame_pos].fb.timestamp.tv_sec = us / 1000000UL; + cam_obj->frames[*frame_pos].fb.timestamp.tv_usec = us % 1000000UL; + return true; + } + } + return false; +} + +void IRAM_ATTR ll_cam_send_event(cam_obj_t *cam, cam_event_t cam_event, BaseType_t * HPTaskAwoken) +{ + if (xQueueSendFromISR(cam->event_queue, (void *)&cam_event, HPTaskAwoken) != pdTRUE) { + ll_cam_stop(cam); + cam->state = CAM_STATE_IDLE; + ESP_EARLY_LOGE(TAG, "EV-%s-OVF", cam_event==CAM_IN_SUC_EOF_EVENT ? "EOF" : "VSYNC"); + } +} + +//Copy fram from DMA dma_buffer to fram dma_buffer +static void cam_task(void *arg) +{ + int cnt = 0; + int frame_pos = 0; + cam_obj->state = CAM_STATE_IDLE; + cam_event_t cam_event = 0; + + xQueueReset(cam_obj->event_queue); + + while (1) { + xQueueReceive(cam_obj->event_queue, (void *)&cam_event, portMAX_DELAY); + DBG_PIN_SET(1); + switch (cam_obj->state) { + + case CAM_STATE_IDLE: { + if (cam_event == CAM_VSYNC_EVENT) { + //DBG_PIN_SET(1); + if(cam_start_frame(&frame_pos)){ + cam_obj->frames[frame_pos].fb.len = 0; + cam_obj->state = CAM_STATE_READ_BUF; + } + cnt = 0; + } + } + break; + + case CAM_STATE_READ_BUF: { + camera_fb_t * frame_buffer_event = &cam_obj->frames[frame_pos].fb; + size_t pixels_per_dma = (cam_obj->dma_half_buffer_size * cam_obj->fb_bytes_per_pixel) / (cam_obj->dma_bytes_per_item * cam_obj->in_bytes_per_pixel); + + if (cam_event == CAM_IN_SUC_EOF_EVENT) { + if(!cam_obj->psram_mode){ + if (cam_obj->fb_size < (frame_buffer_event->len + pixels_per_dma)) { + ESP_LOGW(TAG, "FB-OVF"); + ll_cam_stop(cam_obj); + DBG_PIN_SET(0); + continue; + } + frame_buffer_event->len += ll_cam_memcpy(cam_obj, + &frame_buffer_event->buf[frame_buffer_event->len], + &cam_obj->dma_buffer[(cnt % cam_obj->dma_half_buffer_cnt) * cam_obj->dma_half_buffer_size], + cam_obj->dma_half_buffer_size); + } + //Check for JPEG SOI in the first buffer. stop if not found + if (cam_obj->jpeg_mode && cnt == 0 && cam_verify_jpeg_soi(frame_buffer_event->buf, frame_buffer_event->len) != 0) { + ll_cam_stop(cam_obj); + cam_obj->state = CAM_STATE_IDLE; + } + cnt++; + + } else if (cam_event == CAM_VSYNC_EVENT) { + //DBG_PIN_SET(1); + ll_cam_stop(cam_obj); + + if (cnt || !cam_obj->jpeg_mode || cam_obj->psram_mode) { + if (cam_obj->jpeg_mode) { + if (!cam_obj->psram_mode) { + if (cam_obj->fb_size < (frame_buffer_event->len + pixels_per_dma)) { + ESP_LOGW(TAG, "FB-OVF"); + cnt--; + } else { + frame_buffer_event->len += ll_cam_memcpy(cam_obj, + &frame_buffer_event->buf[frame_buffer_event->len], + &cam_obj->dma_buffer[(cnt % cam_obj->dma_half_buffer_cnt) * cam_obj->dma_half_buffer_size], + cam_obj->dma_half_buffer_size); + } + } + cnt++; + } + + cam_obj->frames[frame_pos].en = 0; + + if (cam_obj->psram_mode) { + if (cam_obj->jpeg_mode) { + frame_buffer_event->len = cnt * cam_obj->dma_half_buffer_size; + } else { + frame_buffer_event->len = cam_obj->recv_size; + } + } else if (!cam_obj->jpeg_mode) { + if (frame_buffer_event->len != cam_obj->fb_size) { + cam_obj->frames[frame_pos].en = 1; + ESP_LOGE(TAG, "FB-SIZE: %u != %u", frame_buffer_event->len, cam_obj->fb_size); + } + } + //send frame + if(!cam_obj->frames[frame_pos].en && xQueueSend(cam_obj->frame_buffer_queue, (void *)&frame_buffer_event, 0) != pdTRUE) { + //pop frame buffer from the queue + camera_fb_t * fb2 = NULL; + if(xQueueReceive(cam_obj->frame_buffer_queue, &fb2, 0) == pdTRUE) { + //push the new frame to the end of the queue + if (xQueueSend(cam_obj->frame_buffer_queue, (void *)&frame_buffer_event, 0) != pdTRUE) { + cam_obj->frames[frame_pos].en = 1; + ESP_LOGE(TAG, "FBQ-SND"); + } + //free the popped buffer + cam_give(fb2); + } else { + //queue is full and we could not pop a frame from it + cam_obj->frames[frame_pos].en = 1; + ESP_LOGE(TAG, "FBQ-RCV"); + } + } + } + + if(!cam_start_frame(&frame_pos)){ + cam_obj->state = CAM_STATE_IDLE; + } else { + cam_obj->frames[frame_pos].fb.len = 0; + } + cnt = 0; + } + } + break; + } + DBG_PIN_SET(0); + } +} + +static lldesc_t * allocate_dma_descriptors(uint32_t count, uint16_t size, uint8_t * buffer) +{ + lldesc_t *dma = (lldesc_t *)heap_caps_malloc(count * sizeof(lldesc_t), MALLOC_CAP_DMA); + if (dma == NULL) { + return dma; + } + + for (int x = 0; x < count; x++) { + dma[x].size = size; + dma[x].length = 0; + dma[x].sosf = 0; + dma[x].eof = 0; + dma[x].owner = 1; + dma[x].buf = (buffer + size * x); + dma[x].empty = (uint32_t)&dma[(x + 1) % count]; + } + return dma; +} + +static esp_err_t cam_dma_config(const camera_config_t *config) +{ + bool ret = ll_cam_dma_sizes(cam_obj); + if (0 == ret) { + return ESP_FAIL; + } + + cam_obj->dma_node_cnt = (cam_obj->dma_buffer_size) / cam_obj->dma_node_buffer_size; // Number of DMA nodes + cam_obj->frame_copy_cnt = cam_obj->recv_size / cam_obj->dma_half_buffer_size; // Number of interrupted copies, ping-pong copy + + ESP_LOGI(TAG, "buffer_size: %d, half_buffer_size: %d, node_buffer_size: %d, node_cnt: %d, total_cnt: %d", + cam_obj->dma_buffer_size, cam_obj->dma_half_buffer_size, cam_obj->dma_node_buffer_size, cam_obj->dma_node_cnt, cam_obj->frame_copy_cnt); + + cam_obj->dma_buffer = NULL; + cam_obj->dma = NULL; + + cam_obj->frames = (cam_frame_t *)heap_caps_calloc(1, cam_obj->frame_cnt * sizeof(cam_frame_t), MALLOC_CAP_DEFAULT); + CAM_CHECK(cam_obj->frames != NULL, "frames malloc failed", ESP_FAIL); + + uint8_t dma_align = 0; + size_t fb_size = cam_obj->fb_size; + if (cam_obj->psram_mode) { + dma_align = ll_cam_get_dma_align(cam_obj); + if (cam_obj->fb_size < cam_obj->recv_size) { + fb_size = cam_obj->recv_size; + } + } + + /* Allocate memeory for frame buffer */ + size_t alloc_size = fb_size * sizeof(uint8_t) + dma_align; + uint32_t _caps = MALLOC_CAP_8BIT; + if (CAMERA_FB_IN_DRAM == config->fb_location) { + _caps |= MALLOC_CAP_INTERNAL; + } else { + _caps |= MALLOC_CAP_SPIRAM; + } + for (int x = 0; x < cam_obj->frame_cnt; x++) { + cam_obj->frames[x].dma = NULL; + cam_obj->frames[x].fb_offset = 0; + cam_obj->frames[x].en = 0; + ESP_LOGI(TAG, "Allocating %d Byte frame buffer in %s", alloc_size, _caps & MALLOC_CAP_SPIRAM ? "PSRAM" : "OnBoard RAM"); + cam_obj->frames[x].fb.buf = (uint8_t *)heap_caps_malloc(alloc_size, _caps); + CAM_CHECK(cam_obj->frames[x].fb.buf != NULL, "frame buffer malloc failed", ESP_FAIL); + if (cam_obj->psram_mode) { + //align PSRAM buffer. TODO: save the offset so proper address can be freed later + cam_obj->frames[x].fb_offset = dma_align - ((uint32_t)cam_obj->frames[x].fb.buf & (dma_align - 1)); + cam_obj->frames[x].fb.buf += cam_obj->frames[x].fb_offset; + ESP_LOGI(TAG, "Frame[%d]: Offset: %u, Addr: 0x%08X", x, cam_obj->frames[x].fb_offset, (uint32_t)cam_obj->frames[x].fb.buf); + cam_obj->frames[x].dma = allocate_dma_descriptors(cam_obj->dma_node_cnt, cam_obj->dma_node_buffer_size, cam_obj->frames[x].fb.buf); + CAM_CHECK(cam_obj->frames[x].dma != NULL, "frame dma malloc failed", ESP_FAIL); + } + cam_obj->frames[x].en = 1; + } + + if (!cam_obj->psram_mode) { + cam_obj->dma_buffer = (uint8_t *)heap_caps_malloc(cam_obj->dma_buffer_size * sizeof(uint8_t), MALLOC_CAP_DMA); + if(NULL == cam_obj->dma_buffer) { + ESP_LOGE(TAG,"%s(%d): DMA buffer %d Byte malloc failed, the current largest free block:%d Byte", __FUNCTION__, __LINE__, + cam_obj->dma_buffer_size, heap_caps_get_largest_free_block(MALLOC_CAP_DMA)); + return ESP_FAIL; + } + + cam_obj->dma = allocate_dma_descriptors(cam_obj->dma_node_cnt, cam_obj->dma_node_buffer_size, cam_obj->dma_buffer); + CAM_CHECK(cam_obj->dma != NULL, "dma malloc failed", ESP_FAIL); + } + + return ESP_OK; +} + +esp_err_t cam_init(const camera_config_t *config) +{ + CAM_CHECK(NULL != config, "config pointer is invalid", ESP_ERR_INVALID_ARG); + + esp_err_t ret = ESP_OK; + cam_obj = (cam_obj_t *)heap_caps_calloc(1, sizeof(cam_obj_t), MALLOC_CAP_DMA); + CAM_CHECK(NULL != cam_obj, "lcd_cam object malloc error", ESP_ERR_NO_MEM); + + cam_obj->swap_data = 0; + cam_obj->vsync_pin = config->pin_vsync; + cam_obj->vsync_invert = true; + + ll_cam_set_pin(cam_obj, config); + ret = ll_cam_config(cam_obj, config); + CAM_CHECK_GOTO(ret == ESP_OK, "ll_cam initialize failed", err); + +#if CAMERA_DBG_PIN_ENABLE + PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[DBG_PIN_NUM], PIN_FUNC_GPIO); + gpio_set_direction(DBG_PIN_NUM, GPIO_MODE_OUTPUT); + gpio_set_pull_mode(DBG_PIN_NUM, GPIO_FLOATING); +#endif + + ESP_LOGI(TAG, "cam init ok"); + return ESP_OK; + +err: + free(cam_obj); + cam_obj = NULL; + return ESP_FAIL; +} + +esp_err_t cam_config(const camera_config_t *config, framesize_t frame_size, uint16_t sensor_pid) +{ + CAM_CHECK(NULL != config, "config pointer is invalid", ESP_ERR_INVALID_ARG); + esp_err_t ret = ESP_OK; + + ret = ll_cam_set_sample_mode(cam_obj, (pixformat_t)config->pixel_format, config->xclk_freq_hz, sensor_pid); + + cam_obj->jpeg_mode = config->pixel_format == PIXFORMAT_JPEG; +#if CONFIG_IDF_TARGET_ESP32 + cam_obj->psram_mode = false; +#else + cam_obj->psram_mode = (config->xclk_freq_hz == 16000000); +#endif + cam_obj->frame_cnt = config->fb_count; + cam_obj->width = resolution[frame_size].width; + cam_obj->height = resolution[frame_size].height; + + if(cam_obj->jpeg_mode){ + cam_obj->recv_size = cam_obj->width * cam_obj->height / 5; + cam_obj->fb_size = cam_obj->recv_size; + } else { + cam_obj->recv_size = cam_obj->width * cam_obj->height * cam_obj->in_bytes_per_pixel; + cam_obj->fb_size = cam_obj->width * cam_obj->height * cam_obj->fb_bytes_per_pixel; + } + + ret = cam_dma_config(config); + CAM_CHECK_GOTO(ret == ESP_OK, "cam_dma_config failed", err); + + cam_obj->event_queue = xQueueCreate(cam_obj->dma_half_buffer_cnt - 1, sizeof(cam_event_t)); + CAM_CHECK_GOTO(cam_obj->event_queue != NULL, "event_queue create failed", err); + + size_t frame_buffer_queue_len = cam_obj->frame_cnt; + if (config->grab_mode == CAMERA_GRAB_LATEST && cam_obj->frame_cnt > 1) { + frame_buffer_queue_len = cam_obj->frame_cnt - 1; + } + cam_obj->frame_buffer_queue = xQueueCreate(frame_buffer_queue_len, sizeof(camera_fb_t*)); + CAM_CHECK_GOTO(cam_obj->frame_buffer_queue != NULL, "frame_buffer_queue create failed", err); + + ret = ll_cam_init_isr(cam_obj); + CAM_CHECK_GOTO(ret == ESP_OK, "cam intr alloc failed", err); + + +#if CONFIG_CAMERA_CORE0 + xTaskCreatePinnedToCore(cam_task, "cam_task", 2048, NULL, configMAX_PRIORITIES - 2, &cam_obj->task_handle, 0); +#elif CONFIG_CAMERA_CORE1 + xTaskCreatePinnedToCore(cam_task, "cam_task", 2048, NULL, configMAX_PRIORITIES - 2, &cam_obj->task_handle, 1); +#else + xTaskCreate(cam_task, "cam_task", 2048, NULL, configMAX_PRIORITIES - 2, &cam_obj->task_handle); +#endif + + ESP_LOGI(TAG, "cam config ok"); + return ESP_OK; + +err: + cam_deinit(); + return ESP_FAIL; +} + +esp_err_t cam_deinit(void) +{ + if (!cam_obj) { + return ESP_FAIL; + } + + cam_stop(); + if (cam_obj->task_handle) { + vTaskDelete(cam_obj->task_handle); + } + if (cam_obj->event_queue) { + vQueueDelete(cam_obj->event_queue); + } + if (cam_obj->frame_buffer_queue) { + vQueueDelete(cam_obj->frame_buffer_queue); + } + if (cam_obj->dma) { + free(cam_obj->dma); + } + if (cam_obj->dma_buffer) { + free(cam_obj->dma_buffer); + } + if (cam_obj->frames) { + for (int x = 0; x < cam_obj->frame_cnt; x++) { + free(cam_obj->frames[x].fb.buf - cam_obj->frames[x].fb_offset); + if (cam_obj->frames[x].dma) { + free(cam_obj->frames[x].dma); + } + } + free(cam_obj->frames); + } + + ll_cam_deinit(cam_obj); + + free(cam_obj); + cam_obj = NULL; + return ESP_OK; +} + +void cam_stop(void) +{ + ll_cam_vsync_intr_enable(cam_obj, false); + ll_cam_stop(cam_obj); +} + +void cam_start(void) +{ + ll_cam_vsync_intr_enable(cam_obj, true); +} + +camera_fb_t *cam_take(TickType_t timeout) +{ + camera_fb_t *dma_buffer = NULL; + TickType_t start = xTaskGetTickCount(); + xQueueReceive(cam_obj->frame_buffer_queue, (void *)&dma_buffer, timeout); + if (dma_buffer) { + if(cam_obj->jpeg_mode){ + // find the end marker for JPEG. Data after that can be discarded + int offset_e = cam_verify_jpeg_eoi(dma_buffer->buf, dma_buffer->len); + if (offset_e >= 0) { + // adjust buffer length + dma_buffer->len = offset_e + sizeof(JPEG_EOI_MARKER); + return dma_buffer; + } else { + ESP_LOGW(TAG, "NO-EOI"); + cam_give(dma_buffer); + return cam_take(timeout - (xTaskGetTickCount() - start));//recurse!!!! + } + } else if(cam_obj->psram_mode && cam_obj->in_bytes_per_pixel != cam_obj->fb_bytes_per_pixel){ + //currently this is used only for YUV to GRAYSCALE + dma_buffer->len = ll_cam_memcpy(cam_obj, dma_buffer->buf, dma_buffer->buf, dma_buffer->len); + } + return dma_buffer; + } else { + ESP_LOGW(TAG, "Failed to get the frame on time!"); + } + return NULL; +} + +void cam_give(camera_fb_t *dma_buffer) +{ + for (int x = 0; x < cam_obj->frame_cnt; x++) { + if (&cam_obj->frames[x].fb == dma_buffer) { + cam_obj->frames[x].en = 1; + break; + } + } +} diff --git a/lib/libesp32_div/esp32-camera/driver/esp_camera.c b/lib/libesp32_div/esp32-camera/driver/esp_camera.c new file mode 100644 index 000000000..9ae1b56ca --- /dev/null +++ b/lib/libesp32_div/esp32-camera/driver/esp_camera.c @@ -0,0 +1,416 @@ +// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD +// +// 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. +#include +#include +#include +#include "time.h" +#include "sys/time.h" +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" +#include "driver/gpio.h" +#include "esp_system.h" +#include "nvs_flash.h" +#include "nvs.h" +#include "sensor.h" +#include "sccb.h" +#include "cam_hal.h" +#include "esp_camera.h" +#include "xclk.h" +#if CONFIG_OV2640_SUPPORT +#include "ov2640.h" +#endif +#if CONFIG_OV7725_SUPPORT +#include "ov7725.h" +#endif +#if CONFIG_OV3660_SUPPORT +#include "ov3660.h" +#endif +#if CONFIG_OV5640_SUPPORT +#include "ov5640.h" +#endif +#if CONFIG_NT99141_SUPPORT +#include "nt99141.h" +#endif +#if CONFIG_OV7670_SUPPORT +#include "ov7670.h" +#endif +#if CONFIG_GC2145_SUPPORT +#include "gc2145.h" +#endif +#if CONFIG_GC032A_SUPPORT +#include "gc032a.h" +#endif +#if CONFIG_GC0308_SUPPORT +#include "gc0308.h" +#endif + + +#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) +#include "esp32-hal-log.h" +#define TAG "" +#else +#include "esp_log.h" +static const char *TAG = "camera"; +#endif + +typedef struct { + sensor_t sensor; + camera_fb_t fb; +} camera_state_t; + +static const char *CAMERA_SENSOR_NVS_KEY = "sensor"; +static const char *CAMERA_PIXFORMAT_NVS_KEY = "pixformat"; +static camera_state_t *s_state = NULL; + +#if CONFIG_IDF_TARGET_ESP32S3 // LCD_CAM module of ESP32-S3 will generate xclk +#define CAMERA_ENABLE_OUT_CLOCK(v) +#define CAMERA_DISABLE_OUT_CLOCK() +#else +#define CAMERA_ENABLE_OUT_CLOCK(v) camera_enable_out_clock((v)) +#define CAMERA_DISABLE_OUT_CLOCK() camera_disable_out_clock() +#endif + +typedef struct { + int (*detect)(int slv_addr, sensor_id_t *id); + int (*init)(sensor_t *sensor); +} sensor_func_t; + +static const sensor_func_t g_sensors[] = { +#if CONFIG_OV7725_SUPPORT + {ov7725_detect, ov7725_init}, +#endif +#if CONFIG_OV7670_SUPPORT + {ov7670_detect, ov7670_init}, +#endif +#if CONFIG_OV2640_SUPPORT + {ov2640_detect, ov2640_init}, +#endif +#if CONFIG_OV3660_SUPPORT + {ov3660_detect, ov3660_init}, +#endif +#if CONFIG_OV5640_SUPPORT + {ov5640_detect, ov5640_init}, +#endif +#if CONFIG_NT99141_SUPPORT + {nt99141_detect, nt99141_init}, +#endif +#if CONFIG_GC2145_SUPPORT + {gc2145_detect, gc2145_init}, +#endif +#if CONFIG_GC032A_SUPPORT + {gc032a_detect, gc032a_init}, +#endif +#if CONFIG_GC0308_SUPPORT + {gc0308_detect, gc0308_init}, +#endif +}; + +static esp_err_t camera_probe(const camera_config_t *config, camera_model_t *out_camera_model) +{ + *out_camera_model = CAMERA_NONE; + if (s_state != NULL) { + return ESP_ERR_INVALID_STATE; + } + + s_state = (camera_state_t *) calloc(sizeof(camera_state_t), 1); + if (!s_state) { + return ESP_ERR_NO_MEM; + } + + if (config->pin_xclk >= 0) { + ESP_LOGD(TAG, "Enabling XCLK output"); + CAMERA_ENABLE_OUT_CLOCK(config); + } + + if (config->pin_sscb_sda != -1) { + ESP_LOGD(TAG, "Initializing SSCB"); + SCCB_Init(config->pin_sscb_sda, config->pin_sscb_scl); + } + + if (config->pin_pwdn >= 0) { + ESP_LOGD(TAG, "Resetting camera by power down line"); + gpio_config_t conf = { 0 }; + conf.pin_bit_mask = 1LL << config->pin_pwdn; + conf.mode = GPIO_MODE_OUTPUT; + gpio_config(&conf); + + // carefull, logic is inverted compared to reset pin + gpio_set_level(config->pin_pwdn, 1); + vTaskDelay(10 / portTICK_PERIOD_MS); + gpio_set_level(config->pin_pwdn, 0); + vTaskDelay(10 / portTICK_PERIOD_MS); + } + + if (config->pin_reset >= 0) { + ESP_LOGD(TAG, "Resetting camera"); + gpio_config_t conf = { 0 }; + conf.pin_bit_mask = 1LL << config->pin_reset; + conf.mode = GPIO_MODE_OUTPUT; + gpio_config(&conf); + + gpio_set_level(config->pin_reset, 0); + vTaskDelay(10 / portTICK_PERIOD_MS); + gpio_set_level(config->pin_reset, 1); + vTaskDelay(10 / portTICK_PERIOD_MS); + } + + + ESP_LOGD(TAG, "Searching for camera address"); + vTaskDelay(10 / portTICK_PERIOD_MS); + + uint8_t slv_addr = SCCB_Probe(); + + if (slv_addr == 0) { + CAMERA_DISABLE_OUT_CLOCK(); + return ESP_ERR_NOT_FOUND; + } + + ESP_LOGI(TAG, "Detected camera at address=0x%02x", slv_addr); + s_state->sensor.slv_addr = slv_addr; + s_state->sensor.xclk_freq_hz = config->xclk_freq_hz; + + /** + * Read sensor ID and then initialize sensor + * Attention: Some sensors have the same SCCB address. Therefore, several attempts may be made in the detection process + */ + sensor_id_t *id = &s_state->sensor.id; + for (size_t i = 0; i < sizeof(g_sensors) / sizeof(sensor_func_t); i++) { + if (g_sensors[i].detect(slv_addr, id)) { + camera_sensor_info_t *info = esp_camera_sensor_get_info(id); + if (NULL != info) { + *out_camera_model = info->model; + ESP_LOGI(TAG, "Detected %s camera", info->name); + g_sensors[i].init(&s_state->sensor); + break; + } + } + } + + if (CAMERA_NONE == *out_camera_model) { //If no supported sensors are detected + CAMERA_DISABLE_OUT_CLOCK(); + ESP_LOGE(TAG, "Detected camera not supported."); + return ESP_ERR_NOT_SUPPORTED; + } + + ESP_LOGI(TAG, "Camera PID=0x%02x VER=0x%02x MIDL=0x%02x MIDH=0x%02x", + id->PID, id->VER, id->MIDH, id->MIDL); + + ESP_LOGD(TAG, "Doing SW reset of sensor"); + vTaskDelay(10 / portTICK_PERIOD_MS); + s_state->sensor.reset(&s_state->sensor); + + return ESP_OK; +} + +esp_err_t esp_camera_init(const camera_config_t *config) +{ + esp_err_t err; + err = cam_init(config); + if (err != ESP_OK) { + ESP_LOGE(TAG, "Camera init failed with error 0x%x", err); + return err; + } + + camera_model_t camera_model = CAMERA_NONE; + err = camera_probe(config, &camera_model); + if (err != ESP_OK) { + ESP_LOGE(TAG, "Camera probe failed with error 0x%x(%s)", err, esp_err_to_name(err)); + goto fail; + } + + framesize_t frame_size = (framesize_t) config->frame_size; + pixformat_t pix_format = (pixformat_t) config->pixel_format; + + if (PIXFORMAT_JPEG == pix_format && (!camera_sensor[camera_model].support_jpeg)) { + ESP_LOGE(TAG, "JPEG format is not supported on this sensor"); + err = ESP_ERR_NOT_SUPPORTED; + goto fail; + } + + if (frame_size > camera_sensor[camera_model].max_size) { + ESP_LOGW(TAG, "The frame size exceeds the maximum for this sensor, it will be forced to the maximum possible value"); + frame_size = camera_sensor[camera_model].max_size; + } + + err = cam_config(config, frame_size, s_state->sensor.id.PID); + if (err != ESP_OK) { + ESP_LOGE(TAG, "Camera config failed with error 0x%x", err); + goto fail; + } + + s_state->sensor.status.framesize = frame_size; + s_state->sensor.pixformat = pix_format; + ESP_LOGD(TAG, "Setting frame size to %dx%d", resolution[frame_size].width, resolution[frame_size].height); + if (s_state->sensor.set_framesize(&s_state->sensor, frame_size) != 0) { + ESP_LOGE(TAG, "Failed to set frame size"); + err = ESP_ERR_CAMERA_FAILED_TO_SET_FRAME_SIZE; + goto fail; + } + s_state->sensor.set_pixformat(&s_state->sensor, pix_format); + + if (s_state->sensor.id.PID == OV2640_PID) { + s_state->sensor.set_gainceiling(&s_state->sensor, GAINCEILING_2X); + s_state->sensor.set_bpc(&s_state->sensor, false); + s_state->sensor.set_wpc(&s_state->sensor, true); + s_state->sensor.set_lenc(&s_state->sensor, true); + } + + if (pix_format == PIXFORMAT_JPEG) { + s_state->sensor.set_quality(&s_state->sensor, config->jpeg_quality); + } + s_state->sensor.init_status(&s_state->sensor); + + cam_start(); + + return ESP_OK; + +fail: + esp_camera_deinit(); + return err; +} + +esp_err_t esp_camera_deinit() +{ + esp_err_t ret = cam_deinit(); + CAMERA_DISABLE_OUT_CLOCK(); + if (s_state) { + SCCB_Deinit(); + + free(s_state); + s_state = NULL; + } + + return ret; +} + +#define FB_GET_TIMEOUT (4000 / portTICK_PERIOD_MS) + +camera_fb_t *esp_camera_fb_get() +{ + if (s_state == NULL) { + return NULL; + } + camera_fb_t *fb = cam_take(FB_GET_TIMEOUT); + //set the frame properties + if (fb) { + fb->width = resolution[s_state->sensor.status.framesize].width; + fb->height = resolution[s_state->sensor.status.framesize].height; + fb->format = s_state->sensor.pixformat; + } + return fb; +} + +void esp_camera_fb_return(camera_fb_t *fb) +{ + if (s_state == NULL) { + return; + } + cam_give(fb); +} + +sensor_t *esp_camera_sensor_get() +{ + if (s_state == NULL) { + return NULL; + } + return &s_state->sensor; +} + +esp_err_t esp_camera_save_to_nvs(const char *key) +{ +#if ESP_IDF_VERSION_MAJOR > 3 + nvs_handle_t handle; +#else + nvs_handle handle; +#endif + esp_err_t ret = nvs_open(key, NVS_READWRITE, &handle); + + if (ret == ESP_OK) { + sensor_t *s = esp_camera_sensor_get(); + if (s != NULL) { + ret = nvs_set_blob(handle, CAMERA_SENSOR_NVS_KEY, &s->status, sizeof(camera_status_t)); + if (ret == ESP_OK) { + uint8_t pf = s->pixformat; + ret = nvs_set_u8(handle, CAMERA_PIXFORMAT_NVS_KEY, pf); + } + return ret; + } else { + return ESP_ERR_CAMERA_NOT_DETECTED; + } + nvs_close(handle); + return ret; + } else { + return ret; + } +} + +esp_err_t esp_camera_load_from_nvs(const char *key) +{ +#if ESP_IDF_VERSION_MAJOR > 3 + nvs_handle_t handle; +#else + nvs_handle handle; +#endif + uint8_t pf; + + esp_err_t ret = nvs_open(key, NVS_READWRITE, &handle); + + if (ret == ESP_OK) { + sensor_t *s = esp_camera_sensor_get(); + camera_status_t st; + if (s != NULL) { + size_t size = sizeof(camera_status_t); + ret = nvs_get_blob(handle, CAMERA_SENSOR_NVS_KEY, &st, &size); + if (ret == ESP_OK) { + s->set_ae_level(s, st.ae_level); + s->set_aec2(s, st.aec2); + s->set_aec_value(s, st.aec_value); + s->set_agc_gain(s, st.agc_gain); + s->set_awb_gain(s, st.awb_gain); + s->set_bpc(s, st.bpc); + s->set_brightness(s, st.brightness); + s->set_colorbar(s, st.colorbar); + s->set_contrast(s, st.contrast); + s->set_dcw(s, st.dcw); + s->set_denoise(s, st.denoise); + s->set_exposure_ctrl(s, st.aec); + s->set_framesize(s, st.framesize); + s->set_gain_ctrl(s, st.agc); + s->set_gainceiling(s, st.gainceiling); + s->set_hmirror(s, st.hmirror); + s->set_lenc(s, st.lenc); + s->set_quality(s, st.quality); + s->set_raw_gma(s, st.raw_gma); + s->set_saturation(s, st.saturation); + s->set_sharpness(s, st.sharpness); + s->set_special_effect(s, st.special_effect); + s->set_vflip(s, st.vflip); + s->set_wb_mode(s, st.wb_mode); + s->set_whitebal(s, st.awb); + s->set_wpc(s, st.wpc); + } + ret = nvs_get_u8(handle, CAMERA_PIXFORMAT_NVS_KEY, &pf); + if (ret == ESP_OK) { + s->set_pixformat(s, pf); + } + } else { + return ESP_ERR_CAMERA_NOT_DETECTED; + } + nvs_close(handle); + return ret; + } else { + ESP_LOGW(TAG, "Error (%d) opening nvs key \"%s\"", ret, key); + return ret; + } +} diff --git a/lib/libesp32_div/esp32-camera/driver/include/esp_camera.h b/lib/libesp32_div/esp32-camera/driver/include/esp_camera.h new file mode 100644 index 000000000..e9981671f --- /dev/null +++ b/lib/libesp32_div/esp32-camera/driver/include/esp_camera.h @@ -0,0 +1,214 @@ +// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD +// +// 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. +/* + * Example Use + * + static camera_config_t camera_example_config = { + .pin_pwdn = PIN_PWDN, + .pin_reset = PIN_RESET, + .pin_xclk = PIN_XCLK, + .pin_sscb_sda = PIN_SIOD, + .pin_sscb_scl = PIN_SIOC, + .pin_d7 = PIN_D7, + .pin_d6 = PIN_D6, + .pin_d5 = PIN_D5, + .pin_d4 = PIN_D4, + .pin_d3 = PIN_D3, + .pin_d2 = PIN_D2, + .pin_d1 = PIN_D1, + .pin_d0 = PIN_D0, + .pin_vsync = PIN_VSYNC, + .pin_href = PIN_HREF, + .pin_pclk = PIN_PCLK, + + .xclk_freq_hz = 20000000, + .ledc_timer = LEDC_TIMER_0, + .ledc_channel = LEDC_CHANNEL_0, + .pixel_format = PIXFORMAT_JPEG, + .frame_size = FRAMESIZE_SVGA, + .jpeg_quality = 10, + .fb_count = 2, + .grab_mode = CAMERA_GRAB_WHEN_EMPTY + }; + + esp_err_t camera_example_init(){ + return esp_camera_init(&camera_example_config); + } + + esp_err_t camera_example_capture(){ + //capture a frame + camera_fb_t * fb = esp_camera_fb_get(); + if (!fb) { + ESP_LOGE(TAG, "Frame buffer could not be acquired"); + return ESP_FAIL; + } + + //replace this with your own function + display_image(fb->width, fb->height, fb->pixformat, fb->buf, fb->len); + + //return the frame buffer back to be reused + esp_camera_fb_return(fb); + + return ESP_OK; + } +*/ + +#pragma once + +#include "esp_err.h" +#include "driver/ledc.h" +#include "sensor.h" +#include "sys/time.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @brief Configuration structure for camera initialization + */ +typedef enum { + CAMERA_GRAB_WHEN_EMPTY, /*!< Fills buffers when they are empty. Less resources but first 'fb_count' frames might be old */ + CAMERA_GRAB_LATEST /*!< Except when 1 frame buffer is used, queue will always contain the last 'fb_count' frames */ +} camera_grab_mode_t; + +/** + * @brief Camera frame buffer location + */ +typedef enum { + CAMERA_FB_IN_PSRAM, /*!< Frame buffer is placed in external PSRAM */ + CAMERA_FB_IN_DRAM /*!< Frame buffer is placed in internal DRAM */ +} camera_fb_location_t; + +/** + * @brief Configuration structure for camera initialization + */ +typedef struct { + int pin_pwdn; /*!< GPIO pin for camera power down line */ + int pin_reset; /*!< GPIO pin for camera reset line */ + int pin_xclk; /*!< GPIO pin for camera XCLK line */ + int pin_sscb_sda; /*!< GPIO pin for camera SDA line */ + int pin_sscb_scl; /*!< GPIO pin for camera SCL line */ + int pin_d7; /*!< GPIO pin for camera D7 line */ + int pin_d6; /*!< GPIO pin for camera D6 line */ + int pin_d5; /*!< GPIO pin for camera D5 line */ + int pin_d4; /*!< GPIO pin for camera D4 line */ + int pin_d3; /*!< GPIO pin for camera D3 line */ + int pin_d2; /*!< GPIO pin for camera D2 line */ + int pin_d1; /*!< GPIO pin for camera D1 line */ + int pin_d0; /*!< GPIO pin for camera D0 line */ + int pin_vsync; /*!< GPIO pin for camera VSYNC line */ + int pin_href; /*!< GPIO pin for camera HREF line */ + int pin_pclk; /*!< GPIO pin for camera PCLK line */ + + int xclk_freq_hz; /*!< Frequency of XCLK signal, in Hz. EXPERIMENTAL: Set to 16MHz on ESP32-S2 or ESP32-S3 to enable EDMA mode */ + + ledc_timer_t ledc_timer; /*!< LEDC timer to be used for generating XCLK */ + ledc_channel_t ledc_channel; /*!< LEDC channel to be used for generating XCLK */ + + pixformat_t pixel_format; /*!< Format of the pixel data: PIXFORMAT_ + YUV422|GRAYSCALE|RGB565|JPEG */ + framesize_t frame_size; /*!< Size of the output image: FRAMESIZE_ + QVGA|CIF|VGA|SVGA|XGA|SXGA|UXGA */ + + int jpeg_quality; /*!< Quality of JPEG output. 0-63 lower means higher quality */ + size_t fb_count; /*!< Number of frame buffers to be allocated. If more than one, then each frame will be acquired (double speed) */ + camera_fb_location_t fb_location; /*!< The location where the frame buffer will be allocated */ + camera_grab_mode_t grab_mode; /*!< When buffers should be filled */ +} camera_config_t; + +/** + * @brief Data structure of camera frame buffer + */ +typedef struct { + uint8_t * buf; /*!< Pointer to the pixel data */ + size_t len; /*!< Length of the buffer in bytes */ + size_t width; /*!< Width of the buffer in pixels */ + size_t height; /*!< Height of the buffer in pixels */ + pixformat_t format; /*!< Format of the pixel data */ + struct timeval timestamp; /*!< Timestamp since boot of the first DMA buffer of the frame */ +} camera_fb_t; + +#define ESP_ERR_CAMERA_BASE 0x20000 +#define ESP_ERR_CAMERA_NOT_DETECTED (ESP_ERR_CAMERA_BASE + 1) +#define ESP_ERR_CAMERA_FAILED_TO_SET_FRAME_SIZE (ESP_ERR_CAMERA_BASE + 2) +#define ESP_ERR_CAMERA_FAILED_TO_SET_OUT_FORMAT (ESP_ERR_CAMERA_BASE + 3) +#define ESP_ERR_CAMERA_NOT_SUPPORTED (ESP_ERR_CAMERA_BASE + 4) + +/** + * @brief Initialize the camera driver + * + * @note call camera_probe before calling this function + * + * This function detects and configures camera over I2C interface, + * allocates framebuffer and DMA buffers, + * initializes parallel I2S input, and sets up DMA descriptors. + * + * Currently this function can only be called once and there is + * no way to de-initialize this module. + * + * @param config Camera configuration parameters + * + * @return ESP_OK on success + */ +esp_err_t esp_camera_init(const camera_config_t* config); + +/** + * @brief Deinitialize the camera driver + * + * @return + * - ESP_OK on success + * - ESP_ERR_INVALID_STATE if the driver hasn't been initialized yet + */ +esp_err_t esp_camera_deinit(); + +/** + * @brief Obtain pointer to a frame buffer. + * + * @return pointer to the frame buffer + */ +camera_fb_t* esp_camera_fb_get(); + +/** + * @brief Return the frame buffer to be reused again. + * + * @param fb Pointer to the frame buffer + */ +void esp_camera_fb_return(camera_fb_t * fb); + +/** + * @brief Get a pointer to the image sensor control structure + * + * @return pointer to the sensor + */ +sensor_t * esp_camera_sensor_get(); + +/** + * @brief Save camera settings to non-volatile-storage (NVS) + * + * @param key A unique nvs key name for the camera settings + */ +esp_err_t esp_camera_save_to_nvs(const char *key); + +/** + * @brief Load camera settings from non-volatile-storage (NVS) + * + * @param key A unique nvs key name for the camera settings + */ +esp_err_t esp_camera_load_from_nvs(const char *key); + +#ifdef __cplusplus +} +#endif + +#include "img_converters.h" + diff --git a/lib/libesp32_div/esp32-camera/driver/include/sensor.h b/lib/libesp32_div/esp32-camera/driver/include/sensor.h new file mode 100644 index 000000000..1f99c1541 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/driver/include/sensor.h @@ -0,0 +1,245 @@ +/* + * This file is part of the OpenMV project. + * Copyright (c) 2013/2014 Ibrahim Abdelkader + * This work is licensed under the MIT license, see the file LICENSE for details. + * + * Sensor abstraction layer. + * + */ +#ifndef __SENSOR_H__ +#define __SENSOR_H__ +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +typedef enum { + OV9650_PID = 0x96, + OV7725_PID = 0x77, + OV2640_PID = 0x26, + OV3660_PID = 0x3660, + OV5640_PID = 0x5640, + OV7670_PID = 0x76, + NT99141_PID = 0x1410, + GC2145_PID = 0x2145, + GC032A_PID = 0x232a, + GC0308_PID = 0x9b, +} camera_pid_t; + +typedef enum { + CAMERA_OV7725, + CAMERA_OV2640, + CAMERA_OV3660, + CAMERA_OV5640, + CAMERA_OV7670, + CAMERA_NT99141, + CAMERA_GC2145, + CAMERA_GC032A, + CAMERA_GC0308, + CAMERA_MODEL_MAX, + CAMERA_NONE, +} camera_model_t; + +typedef enum { + OV2640_SCCB_ADDR = 0x30,// 0x60 >> 1 + OV5640_SCCB_ADDR = 0x3C,// 0x78 >> 1 + OV3660_SCCB_ADDR = 0x3C,// 0x78 >> 1 + OV7725_SCCB_ADDR = 0x21,// 0x42 >> 1 + OV7670_SCCB_ADDR = 0x21,// 0x42 >> 1 + NT99141_SCCB_ADDR = 0x2A,// 0x54 >> 1 + GC2145_SCCB_ADDR = 0x3C,// 0x78 >> 1 + GC032A_SCCB_ADDR = 0x21,// 0x42 >> 1 + GC0308_SCCB_ADDR = 0x21,// 0x42 >> 1 +} camera_sccb_addr_t; + +typedef enum { + PIXFORMAT_RGB565, // 2BPP/RGB565 + PIXFORMAT_YUV422, // 2BPP/YUV422 + PIXFORMAT_GRAYSCALE, // 1BPP/GRAYSCALE + PIXFORMAT_JPEG, // JPEG/COMPRESSED + PIXFORMAT_RGB888, // 3BPP/RGB888 + PIXFORMAT_RAW, // RAW + PIXFORMAT_RGB444, // 3BP2P/RGB444 + PIXFORMAT_RGB555, // 3BP2P/RGB555 +} pixformat_t; + +typedef enum { + FRAMESIZE_96X96, // 96x96 + FRAMESIZE_QQVGA, // 160x120 + FRAMESIZE_QCIF, // 176x144 + FRAMESIZE_HQVGA, // 240x176 + FRAMESIZE_240X240, // 240x240 + FRAMESIZE_QVGA, // 320x240 + FRAMESIZE_CIF, // 400x296 + FRAMESIZE_HVGA, // 480x320 + FRAMESIZE_VGA, // 640x480 + FRAMESIZE_SVGA, // 800x600 + FRAMESIZE_XGA, // 1024x768 + FRAMESIZE_HD, // 1280x720 + FRAMESIZE_SXGA, // 1280x1024 + FRAMESIZE_UXGA, // 1600x1200 + // 3MP Sensors + FRAMESIZE_FHD, // 1920x1080 + FRAMESIZE_P_HD, // 720x1280 + FRAMESIZE_P_3MP, // 864x1536 + FRAMESIZE_QXGA, // 2048x1536 + // 5MP Sensors + FRAMESIZE_QHD, // 2560x1440 + FRAMESIZE_WQXGA, // 2560x1600 + FRAMESIZE_P_FHD, // 1080x1920 + FRAMESIZE_QSXGA, // 2560x1920 + FRAMESIZE_INVALID +} framesize_t; + +typedef struct { + const camera_model_t model; + const char *name; + const camera_sccb_addr_t sccb_addr; + const camera_pid_t pid; + const framesize_t max_size; + const bool support_jpeg; +} camera_sensor_info_t; + +typedef enum { + ASPECT_RATIO_4X3, + ASPECT_RATIO_3X2, + ASPECT_RATIO_16X10, + ASPECT_RATIO_5X3, + ASPECT_RATIO_16X9, + ASPECT_RATIO_21X9, + ASPECT_RATIO_5X4, + ASPECT_RATIO_1X1, + ASPECT_RATIO_9X16 +} aspect_ratio_t; + +typedef enum { + GAINCEILING_2X, + GAINCEILING_4X, + GAINCEILING_8X, + GAINCEILING_16X, + GAINCEILING_32X, + GAINCEILING_64X, + GAINCEILING_128X, +} gainceiling_t; + +typedef struct { + uint16_t max_width; + uint16_t max_height; + uint16_t start_x; + uint16_t start_y; + uint16_t end_x; + uint16_t end_y; + uint16_t offset_x; + uint16_t offset_y; + uint16_t total_x; + uint16_t total_y; +} ratio_settings_t; + +typedef struct { + const uint16_t width; + const uint16_t height; + const aspect_ratio_t aspect_ratio; +} resolution_info_t; + +// Resolution table (in sensor.c) +extern const resolution_info_t resolution[]; +// camera sensor table (in sensor.c) +extern const camera_sensor_info_t camera_sensor[]; + +typedef struct { + uint8_t MIDH; + uint8_t MIDL; + uint16_t PID; + uint8_t VER; +} sensor_id_t; + +typedef struct { + framesize_t framesize;//0 - 10 + bool scale; + bool binning; + uint8_t quality;//0 - 63 + int8_t brightness;//-2 - 2 + int8_t contrast;//-2 - 2 + int8_t saturation;//-2 - 2 + int8_t sharpness;//-2 - 2 + uint8_t denoise; + uint8_t special_effect;//0 - 6 + uint8_t wb_mode;//0 - 4 + uint8_t awb; + uint8_t awb_gain; + uint8_t aec; + uint8_t aec2; + int8_t ae_level;//-2 - 2 + uint16_t aec_value;//0 - 1200 + uint8_t agc; + uint8_t agc_gain;//0 - 30 + uint8_t gainceiling;//0 - 6 + uint8_t bpc; + uint8_t wpc; + uint8_t raw_gma; + uint8_t lenc; + uint8_t hmirror; + uint8_t vflip; + uint8_t dcw; + uint8_t colorbar; +} camera_status_t; + +typedef struct _sensor sensor_t; +typedef struct _sensor { + sensor_id_t id; // Sensor ID. + uint8_t slv_addr; // Sensor I2C slave address. + pixformat_t pixformat; + camera_status_t status; + int xclk_freq_hz; + + // Sensor function pointers + int (*init_status) (sensor_t *sensor); + int (*reset) (sensor_t *sensor); + int (*set_pixformat) (sensor_t *sensor, pixformat_t pixformat); + int (*set_framesize) (sensor_t *sensor, framesize_t framesize); + int (*set_contrast) (sensor_t *sensor, int level); + int (*set_brightness) (sensor_t *sensor, int level); + int (*set_saturation) (sensor_t *sensor, int level); + int (*set_sharpness) (sensor_t *sensor, int level); + int (*set_denoise) (sensor_t *sensor, int level); + int (*set_gainceiling) (sensor_t *sensor, gainceiling_t gainceiling); + int (*set_quality) (sensor_t *sensor, int quality); + int (*set_colorbar) (sensor_t *sensor, int enable); + int (*set_whitebal) (sensor_t *sensor, int enable); + int (*set_gain_ctrl) (sensor_t *sensor, int enable); + int (*set_exposure_ctrl) (sensor_t *sensor, int enable); + int (*set_hmirror) (sensor_t *sensor, int enable); + int (*set_vflip) (sensor_t *sensor, int enable); + + int (*set_aec2) (sensor_t *sensor, int enable); + int (*set_awb_gain) (sensor_t *sensor, int enable); + int (*set_agc_gain) (sensor_t *sensor, int gain); + int (*set_aec_value) (sensor_t *sensor, int gain); + + int (*set_special_effect) (sensor_t *sensor, int effect); + int (*set_wb_mode) (sensor_t *sensor, int mode); + int (*set_ae_level) (sensor_t *sensor, int level); + + int (*set_dcw) (sensor_t *sensor, int enable); + int (*set_bpc) (sensor_t *sensor, int enable); + int (*set_wpc) (sensor_t *sensor, int enable); + + int (*set_raw_gma) (sensor_t *sensor, int enable); + int (*set_lenc) (sensor_t *sensor, int enable); + + int (*get_reg) (sensor_t *sensor, int reg, int mask); + int (*set_reg) (sensor_t *sensor, int reg, int mask, int value); + int (*set_res_raw) (sensor_t *sensor, int startX, int startY, int endX, int endY, int offsetX, int offsetY, int totalX, int totalY, int outputX, int outputY, bool scale, bool binning); + int (*set_pll) (sensor_t *sensor, int bypass, int mul, int sys, int root, int pre, int seld5, int pclken, int pclk); + int (*set_xclk) (sensor_t *sensor, int timer, int xclk); +} sensor_t; + +camera_sensor_info_t *esp_camera_sensor_get_info(sensor_id_t *id); + +#ifdef __cplusplus +} +#endif + +#endif /* __SENSOR_H__ */ diff --git a/lib/libesp32_div/esp32-camera/driver/private_include/cam_hal.h b/lib/libesp32_div/esp32-camera/driver/private_include/cam_hal.h new file mode 100644 index 000000000..c8e38ed47 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/driver/private_include/cam_hal.h @@ -0,0 +1,60 @@ +// Copyright 2010-2020 Espressif Systems (Shanghai) PTE LTD +// +// 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. + +#pragma once + +#include "esp_camera.h" + + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @brief Uninitialize the lcd_cam module + * + * @param handle Provide handle pointer to release resources + * + * @return + * - ESP_OK Success + * - ESP_FAIL Uninitialize fail + */ +esp_err_t cam_deinit(void); + +/** + * @brief Initialize the lcd_cam module + * + * @param config Configurations - see lcd_cam_config_t struct + * + * @return + * - ESP_OK Success + * - ESP_ERR_INVALID_ARG Parameter error + * - ESP_ERR_NO_MEM No memory to initialize lcd_cam + * - ESP_FAIL Initialize fail + */ +esp_err_t cam_init(const camera_config_t *config); + +esp_err_t cam_config(const camera_config_t *config, framesize_t frame_size, uint16_t sensor_pid); + +void cam_stop(void); + +void cam_start(void); + +camera_fb_t *cam_take(TickType_t timeout); + +void cam_give(camera_fb_t *dma_buffer); + +#ifdef __cplusplus +} +#endif diff --git a/lib/libesp32_div/esp32-camera/driver/private_include/sccb.h b/lib/libesp32_div/esp32-camera/driver/private_include/sccb.h new file mode 100644 index 000000000..ace081a48 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/driver/private_include/sccb.h @@ -0,0 +1,19 @@ +/* + * This file is part of the OpenMV project. + * Copyright (c) 2013/2014 Ibrahim Abdelkader + * This work is licensed under the MIT license, see the file LICENSE for details. + * + * SCCB (I2C like) driver. + * + */ +#ifndef __SCCB_H__ +#define __SCCB_H__ +#include +int SCCB_Init(int pin_sda, int pin_scl); +int SCCB_Deinit(void); +uint8_t SCCB_Probe(); +uint8_t SCCB_Read(uint8_t slv_addr, uint8_t reg); +uint8_t SCCB_Write(uint8_t slv_addr, uint8_t reg, uint8_t data); +uint8_t SCCB_Read16(uint8_t slv_addr, uint16_t reg); +uint8_t SCCB_Write16(uint8_t slv_addr, uint16_t reg, uint8_t data); +#endif // __SCCB_H__ diff --git a/lib/libesp32_div/esp32-camera/driver/private_include/xclk.h b/lib/libesp32_div/esp32-camera/driver/private_include/xclk.h new file mode 100644 index 000000000..3d721a613 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/driver/private_include/xclk.h @@ -0,0 +1,9 @@ +#pragma once + +#include "esp_system.h" + +esp_err_t xclk_timer_conf(int ledc_timer, int xclk_freq_hz); + +esp_err_t camera_enable_out_clock(); + +void camera_disable_out_clock(); diff --git a/lib/libesp32_div/esp32-camera/driver/sccb.c b/lib/libesp32_div/esp32-camera/driver/sccb.c new file mode 100644 index 000000000..1a2c56e23 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/driver/sccb.c @@ -0,0 +1,184 @@ +/* + * This file is part of the OpenMV project. + * Copyright (c) 2013/2014 Ibrahim Abdelkader + * This work is licensed under the MIT license, see the file LICENSE for details. + * + * SCCB (I2C like) driver. + * + */ +#include +#include +#include +#include +#include "sccb.h" +#include "sensor.h" +#include +#include "sdkconfig.h" +#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) +#include "esp32-hal-log.h" +#else +#include "esp_log.h" +static const char* TAG = "sccb"; +#endif + +#define LITTLETOBIG(x) ((x<<8)|(x>>8)) + +#include "driver/i2c.h" + +#define SCCB_FREQ 100000 /*!< I2C master frequency*/ +#define WRITE_BIT I2C_MASTER_WRITE /*!< I2C master write */ +#define READ_BIT I2C_MASTER_READ /*!< I2C master read */ +#define ACK_CHECK_EN 0x1 /*!< I2C master will check ack from slave*/ +#define ACK_CHECK_DIS 0x0 /*!< I2C master will not check ack from slave */ +#define ACK_VAL 0x0 /*!< I2C ack value */ +#define NACK_VAL 0x1 /*!< I2C nack value */ +#if CONFIG_SCCB_HARDWARE_I2C_PORT1 +const int SCCB_I2C_PORT = 1; +#else +const int SCCB_I2C_PORT = 0; +#endif + +int SCCB_Init(int pin_sda, int pin_scl) +{ + ESP_LOGI(TAG, "pin_sda %d pin_scl %d", pin_sda, pin_scl); + i2c_config_t conf; + memset(&conf, 0, sizeof(i2c_config_t)); + conf.mode = I2C_MODE_MASTER; + conf.sda_io_num = pin_sda; + conf.sda_pullup_en = GPIO_PULLUP_ENABLE; + conf.scl_io_num = pin_scl; + conf.scl_pullup_en = GPIO_PULLUP_ENABLE; + conf.master.clk_speed = SCCB_FREQ; + + i2c_param_config(SCCB_I2C_PORT, &conf); + i2c_driver_install(SCCB_I2C_PORT, conf.mode, 0, 0, 0); + return 0; +} + +int SCCB_Deinit(void) +{ + return i2c_driver_delete(SCCB_I2C_PORT); +} + +uint8_t SCCB_Probe(void) +{ + uint8_t slave_addr = 0x0; + // for (size_t i = 1; i < 0x80; i++) { + // i2c_cmd_handle_t cmd = i2c_cmd_link_create(); + // i2c_master_start(cmd); + // i2c_master_write_byte(cmd, ( i << 1 ) | WRITE_BIT, ACK_CHECK_EN); + // i2c_master_stop(cmd); + // esp_err_t ret = i2c_master_cmd_begin(SCCB_I2C_PORT, cmd, 1000 / portTICK_RATE_MS); + // i2c_cmd_link_delete(cmd); + // if( ret == ESP_OK) { + // ESP_LOGW(TAG, "Found I2C Device at 0x%02X", i); + // } + // } + for (size_t i = 0; i < CAMERA_MODEL_MAX; i++) { + if (slave_addr == camera_sensor[i].sccb_addr) { + continue; + } + slave_addr = camera_sensor[i].sccb_addr; + i2c_cmd_handle_t cmd = i2c_cmd_link_create(); + i2c_master_start(cmd); + i2c_master_write_byte(cmd, ( slave_addr << 1 ) | WRITE_BIT, ACK_CHECK_EN); + i2c_master_stop(cmd); + esp_err_t ret = i2c_master_cmd_begin(SCCB_I2C_PORT, cmd, 1000 / portTICK_RATE_MS); + i2c_cmd_link_delete(cmd); + if( ret == ESP_OK) { + return slave_addr; + } + } + return 0; +} + +uint8_t SCCB_Read(uint8_t slv_addr, uint8_t reg) +{ + uint8_t data=0; + esp_err_t ret = ESP_FAIL; + i2c_cmd_handle_t cmd = i2c_cmd_link_create(); + i2c_master_start(cmd); + i2c_master_write_byte(cmd, ( slv_addr << 1 ) | WRITE_BIT, ACK_CHECK_EN); + i2c_master_write_byte(cmd, reg, ACK_CHECK_EN); + i2c_master_stop(cmd); + ret = i2c_master_cmd_begin(SCCB_I2C_PORT, cmd, 1000 / portTICK_RATE_MS); + i2c_cmd_link_delete(cmd); + if(ret != ESP_OK) return -1; + cmd = i2c_cmd_link_create(); + i2c_master_start(cmd); + i2c_master_write_byte(cmd, ( slv_addr << 1 ) | READ_BIT, ACK_CHECK_EN); + i2c_master_read_byte(cmd, &data, NACK_VAL); + i2c_master_stop(cmd); + ret = i2c_master_cmd_begin(SCCB_I2C_PORT, cmd, 1000 / portTICK_RATE_MS); + i2c_cmd_link_delete(cmd); + if(ret != ESP_OK) { + ESP_LOGE(TAG, "SCCB_Read Failed addr:0x%02x, reg:0x%02x, data:0x%02x, ret:%d", slv_addr, reg, data, ret); + } + return data; +} + +uint8_t SCCB_Write(uint8_t slv_addr, uint8_t reg, uint8_t data) +{ + esp_err_t ret = ESP_FAIL; + i2c_cmd_handle_t cmd = i2c_cmd_link_create(); + i2c_master_start(cmd); + i2c_master_write_byte(cmd, ( slv_addr << 1 ) | WRITE_BIT, ACK_CHECK_EN); + i2c_master_write_byte(cmd, reg, ACK_CHECK_EN); + i2c_master_write_byte(cmd, data, ACK_CHECK_EN); + i2c_master_stop(cmd); + ret = i2c_master_cmd_begin(SCCB_I2C_PORT, cmd, 1000 / portTICK_RATE_MS); + i2c_cmd_link_delete(cmd); + if(ret != ESP_OK) { + ESP_LOGE(TAG, "SCCB_Write Failed addr:0x%02x, reg:0x%02x, data:0x%02x, ret:%d", slv_addr, reg, data, ret); + } + return ret == ESP_OK ? 0 : -1; +} + +uint8_t SCCB_Read16(uint8_t slv_addr, uint16_t reg) +{ + uint8_t data=0; + esp_err_t ret = ESP_FAIL; + uint16_t reg_htons = LITTLETOBIG(reg); + uint8_t *reg_u8 = (uint8_t *)®_htons; + i2c_cmd_handle_t cmd = i2c_cmd_link_create(); + i2c_master_start(cmd); + i2c_master_write_byte(cmd, ( slv_addr << 1 ) | WRITE_BIT, ACK_CHECK_EN); + i2c_master_write_byte(cmd, reg_u8[0], ACK_CHECK_EN); + i2c_master_write_byte(cmd, reg_u8[1], ACK_CHECK_EN); + i2c_master_stop(cmd); + ret = i2c_master_cmd_begin(SCCB_I2C_PORT, cmd, 1000 / portTICK_RATE_MS); + i2c_cmd_link_delete(cmd); + if(ret != ESP_OK) return -1; + cmd = i2c_cmd_link_create(); + i2c_master_start(cmd); + i2c_master_write_byte(cmd, ( slv_addr << 1 ) | READ_BIT, ACK_CHECK_EN); + i2c_master_read_byte(cmd, &data, NACK_VAL); + i2c_master_stop(cmd); + ret = i2c_master_cmd_begin(SCCB_I2C_PORT, cmd, 1000 / portTICK_RATE_MS); + i2c_cmd_link_delete(cmd); + if(ret != ESP_OK) { + ESP_LOGE(TAG, "W [%04x]=%02x fail\n", reg, data); + } + return data; +} + +uint8_t SCCB_Write16(uint8_t slv_addr, uint16_t reg, uint8_t data) +{ + static uint16_t i = 0; + esp_err_t ret = ESP_FAIL; + uint16_t reg_htons = LITTLETOBIG(reg); + uint8_t *reg_u8 = (uint8_t *)®_htons; + i2c_cmd_handle_t cmd = i2c_cmd_link_create(); + i2c_master_start(cmd); + i2c_master_write_byte(cmd, ( slv_addr << 1 ) | WRITE_BIT, ACK_CHECK_EN); + i2c_master_write_byte(cmd, reg_u8[0], ACK_CHECK_EN); + i2c_master_write_byte(cmd, reg_u8[1], ACK_CHECK_EN); + i2c_master_write_byte(cmd, data, ACK_CHECK_EN); + i2c_master_stop(cmd); + ret = i2c_master_cmd_begin(SCCB_I2C_PORT, cmd, 1000 / portTICK_RATE_MS); + i2c_cmd_link_delete(cmd); + if(ret != ESP_OK) { + ESP_LOGE(TAG, "W [%04x]=%02x %d fail\n", reg, data, i++); + } + return ret == ESP_OK ? 0 : -1; +} diff --git a/lib/libesp32_div/esp32-camera/driver/sensor.c b/lib/libesp32_div/esp32-camera/driver/sensor.c new file mode 100644 index 000000000..7ebd7af21 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/driver/sensor.c @@ -0,0 +1,52 @@ +#include +#include "sensor.h" + +const camera_sensor_info_t camera_sensor[CAMERA_MODEL_MAX] = { + // The sequence must be consistent with camera_model_t + {CAMERA_OV7725, "OV7725", OV7725_SCCB_ADDR, OV7725_PID, FRAMESIZE_VGA, false}, + {CAMERA_OV2640, "OV2640", OV2640_SCCB_ADDR, OV2640_PID, FRAMESIZE_UXGA, true}, + {CAMERA_OV3660, "OV3660", OV3660_SCCB_ADDR, OV3660_PID, FRAMESIZE_QXGA, true}, + {CAMERA_OV5640, "OV5640", OV5640_SCCB_ADDR, OV5640_PID, FRAMESIZE_QSXGA, true}, + {CAMERA_OV7670, "OV7670", OV7670_SCCB_ADDR, OV7670_PID, FRAMESIZE_VGA, false}, + {CAMERA_NT99141, "NT99141", NT99141_SCCB_ADDR, NT99141_PID, FRAMESIZE_HD, true}, + {CAMERA_GC2145, "GC2145", GC2145_SCCB_ADDR, GC2145_PID, FRAMESIZE_UXGA, false}, + {CAMERA_GC032A, "GC032A", GC032A_SCCB_ADDR, GC032A_PID, FRAMESIZE_VGA, false}, + {CAMERA_GC0308, "GC0308", GC0308_SCCB_ADDR, GC0308_PID, FRAMESIZE_VGA, false}, +}; + +const resolution_info_t resolution[FRAMESIZE_INVALID] = { + { 96, 96, ASPECT_RATIO_1X1 }, /* 96x96 */ + { 160, 120, ASPECT_RATIO_4X3 }, /* QQVGA */ + { 176, 144, ASPECT_RATIO_5X4 }, /* QCIF */ + { 240, 176, ASPECT_RATIO_4X3 }, /* HQVGA */ + { 240, 240, ASPECT_RATIO_1X1 }, /* 240x240 */ + { 320, 240, ASPECT_RATIO_4X3 }, /* QVGA */ + { 400, 296, ASPECT_RATIO_4X3 }, /* CIF */ + { 480, 320, ASPECT_RATIO_3X2 }, /* HVGA */ + { 640, 480, ASPECT_RATIO_4X3 }, /* VGA */ + { 800, 600, ASPECT_RATIO_4X3 }, /* SVGA */ + { 1024, 768, ASPECT_RATIO_4X3 }, /* XGA */ + { 1280, 720, ASPECT_RATIO_16X9 }, /* HD */ + { 1280, 1024, ASPECT_RATIO_5X4 }, /* SXGA */ + { 1600, 1200, ASPECT_RATIO_4X3 }, /* UXGA */ + // 3MP Sensors + { 1920, 1080, ASPECT_RATIO_16X9 }, /* FHD */ + { 720, 1280, ASPECT_RATIO_9X16 }, /* Portrait HD */ + { 864, 1536, ASPECT_RATIO_9X16 }, /* Portrait 3MP */ + { 2048, 1536, ASPECT_RATIO_4X3 }, /* QXGA */ + // 5MP Sensors + { 2560, 1440, ASPECT_RATIO_16X9 }, /* QHD */ + { 2560, 1600, ASPECT_RATIO_16X10 }, /* WQXGA */ + { 1088, 1920, ASPECT_RATIO_9X16 }, /* Portrait FHD */ + { 2560, 1920, ASPECT_RATIO_4X3 }, /* QSXGA */ +}; + +camera_sensor_info_t *esp_camera_sensor_get_info(sensor_id_t *id) +{ + for (int i = 0; i < CAMERA_MODEL_MAX; i++) { + if (id->PID == camera_sensor[i].pid) { + return (camera_sensor_info_t *)&camera_sensor[i]; + } + } + return NULL; +} diff --git a/lib/libesp32_div/esp32-camera/examples/CMakeLists.txt b/lib/libesp32_div/esp32-camera/examples/CMakeLists.txt new file mode 100644 index 000000000..0a0396884 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/examples/CMakeLists.txt @@ -0,0 +1,9 @@ +# 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(EXTRA_COMPONENT_DIRS "../") + +add_compile_options(-fdiagnostics-color=always) +include($ENV{IDF_PATH}/tools/cmake/project.cmake) +project(camera_example) \ No newline at end of file diff --git a/lib/libesp32_div/esp32-camera/examples/Makefile b/lib/libesp32_div/esp32-camera/examples/Makefile new file mode 100644 index 000000000..f06df0ecc --- /dev/null +++ b/lib/libesp32_div/esp32-camera/examples/Makefile @@ -0,0 +1,11 @@ +# +# This is a project Makefile. It is assumed the directory this Makefile resides in is a +# project subdirectory. +# + +PROJECT_NAME := camera_example + +EXTRA_COMPONENT_DIRS := ../ + +include $(IDF_PATH)/make/project.mk + diff --git a/lib/libesp32_div/esp32-camera/examples/main/CMakeLists.txt b/lib/libesp32_div/esp32-camera/examples/main/CMakeLists.txt new file mode 100644 index 000000000..1735fb184 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/examples/main/CMakeLists.txt @@ -0,0 +1,3 @@ +set(COMPONENT_SRCS take_picture.c) +set(COMPONENT_ADD_INCLUDEDIRS .) +register_component() \ No newline at end of file diff --git a/lib/libesp32_div/esp32-camera/examples/main/component.mk b/lib/libesp32_div/esp32-camera/examples/main/component.mk new file mode 100644 index 000000000..0b9d7585e --- /dev/null +++ b/lib/libesp32_div/esp32-camera/examples/main/component.mk @@ -0,0 +1,5 @@ +# +# "main" pseudo-component makefile. +# +# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.) + diff --git a/lib/libesp32_div/esp32-camera/examples/main/take_picture.c b/lib/libesp32_div/esp32-camera/examples/main/take_picture.c new file mode 100644 index 000000000..1cbad908b --- /dev/null +++ b/lib/libesp32_div/esp32-camera/examples/main/take_picture.c @@ -0,0 +1,155 @@ +/** + * This example takes a picture every 5s and print its size on serial monitor. + */ + +// =============================== SETUP ====================================== + +// 1. Board setup (Uncomment): +// #define BOARD_WROVER_KIT +// #define BOARD_ESP32CAM_AITHINKER + +/** + * 2. Kconfig setup + * + * If you have a Kconfig file, copy the content from + * https://github.com/espressif/esp32-camera/blob/master/Kconfig into it. + * In case you haven't, copy and paste this Kconfig file inside the src directory. + * This Kconfig file has definitions that allows more control over the camera and + * how it will be initialized. + */ + +/** + * 3. Enable PSRAM on sdkconfig: + * + * CONFIG_ESP32_SPIRAM_SUPPORT=y + * + * More info on + * https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/kconfig.html#config-esp32-spiram-support + */ + +// ================================ CODE ====================================== + +#include +#include +#include +#include +#include + +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" + +#include "esp_camera.h" + +#define BOARD_WROVER_KIT 1 + +// WROVER-KIT PIN Map +#ifdef BOARD_WROVER_KIT + +#define CAM_PIN_PWDN -1 //power down is not used +#define CAM_PIN_RESET -1 //software reset will be performed +#define CAM_PIN_XCLK 21 +#define CAM_PIN_SIOD 26 +#define CAM_PIN_SIOC 27 + +#define CAM_PIN_D7 35 +#define CAM_PIN_D6 34 +#define CAM_PIN_D5 39 +#define CAM_PIN_D4 36 +#define CAM_PIN_D3 19 +#define CAM_PIN_D2 18 +#define CAM_PIN_D1 5 +#define CAM_PIN_D0 4 +#define CAM_PIN_VSYNC 25 +#define CAM_PIN_HREF 23 +#define CAM_PIN_PCLK 22 + +#endif + +// ESP32Cam (AiThinker) PIN Map +#ifdef BOARD_ESP32CAM_AITHINKER + +#define CAM_PIN_PWDN 32 +#define CAM_PIN_RESET -1 //software reset will be performed +#define CAM_PIN_XCLK 0 +#define CAM_PIN_SIOD 26 +#define CAM_PIN_SIOC 27 + +#define CAM_PIN_D7 35 +#define CAM_PIN_D6 34 +#define CAM_PIN_D5 39 +#define CAM_PIN_D4 36 +#define CAM_PIN_D3 21 +#define CAM_PIN_D2 19 +#define CAM_PIN_D1 18 +#define CAM_PIN_D0 5 +#define CAM_PIN_VSYNC 25 +#define CAM_PIN_HREF 23 +#define CAM_PIN_PCLK 22 + +#endif + +static const char *TAG = "example:take_picture"; + +static camera_config_t camera_config = { + .pin_pwdn = CAM_PIN_PWDN, + .pin_reset = CAM_PIN_RESET, + .pin_xclk = CAM_PIN_XCLK, + .pin_sscb_sda = CAM_PIN_SIOD, + .pin_sscb_scl = CAM_PIN_SIOC, + + .pin_d7 = CAM_PIN_D7, + .pin_d6 = CAM_PIN_D6, + .pin_d5 = CAM_PIN_D5, + .pin_d4 = CAM_PIN_D4, + .pin_d3 = CAM_PIN_D3, + .pin_d2 = CAM_PIN_D2, + .pin_d1 = CAM_PIN_D1, + .pin_d0 = CAM_PIN_D0, + .pin_vsync = CAM_PIN_VSYNC, + .pin_href = CAM_PIN_HREF, + .pin_pclk = CAM_PIN_PCLK, + + //XCLK 20MHz or 10MHz for OV2640 double FPS (Experimental) + .xclk_freq_hz = 20000000, + .ledc_timer = LEDC_TIMER_0, + .ledc_channel = LEDC_CHANNEL_0, + + .pixel_format = PIXFORMAT_RGB565, //YUV422,GRAYSCALE,RGB565,JPEG + .frame_size = FRAMESIZE_QVGA, //QQVGA-UXGA Do not use sizes above QVGA when not JPEG + + .jpeg_quality = 12, //0-63 lower number means higher quality + .fb_count = 1, //if more than one, i2s runs in continuous mode. Use only with JPEG + .grab_mode = CAMERA_GRAB_WHEN_EMPTY, +}; + +static esp_err_t init_camera() +{ + //initialize the camera + esp_err_t err = esp_camera_init(&camera_config); + if (err != ESP_OK) + { + ESP_LOGE(TAG, "Camera Init Failed"); + return err; + } + + return ESP_OK; +} + +void app_main() +{ + if(ESP_OK != init_camera()) { + return; + } + + while (1) + { + ESP_LOGI(TAG, "Taking picture..."); + camera_fb_t *pic = esp_camera_fb_get(); + + // use pic->buf to access the image + ESP_LOGI(TAG, "Picture taken! Its size was: %zu bytes", pic->len); + esp_camera_fb_return(pic); + + vTaskDelay(5000 / portTICK_RATE_MS); + } +} diff --git a/lib/libesp32_div/esp32-camera/examples/sdkconfig.defaults b/lib/libesp32_div/esp32-camera/examples/sdkconfig.defaults new file mode 100644 index 000000000..e5ac4557a --- /dev/null +++ b/lib/libesp32_div/esp32-camera/examples/sdkconfig.defaults @@ -0,0 +1,17 @@ +CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y +CONFIG_ESP32S2_DEFAULT_CPU_FREQ_240=y +CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240=y + +CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y +CONFIG_PARTITION_TABLE_OFFSET=0x10000 + +CONFIG_FREERTOS_HZ=1000 +CONFIG_ESPTOOLPY_FLASHFREQ_80M=y +CONFIG_ESPTOOLPY_FLASHMODE_QIO=y + +CONFIG_SPIRAM_SUPPORT=y +CONFIG_ESP32_SPIRAM_SUPPORT=y +CONFIG_ESP32S2_SPIRAM_SUPPORT=y +CONFIG_ESP32S3_SPIRAM_SUPPORT=y +CONFIG_SPIRAM_SPEED_80M=y + diff --git a/lib/libesp32_div/esp32-camera/library.json b/lib/libesp32_div/esp32-camera/library.json new file mode 100644 index 000000000..2147a3908 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/library.json @@ -0,0 +1,26 @@ +{ + "name": "esp32-camera", + "version": "1.0.0", + "keywords": "esp32, camera, espressif, esp32-cam", + "description": "ESP32 compatible driver for OV2640, OV3660, OV5640, OV7670 and OV7725 image sensors.", + "repository": { + "type": "git", + "url": "https://github.com/espressif/esp32-camera" + }, + "frameworks": "*", + "platforms": "*", + "build": { + "flags": [ + "-Idriver/include", + "-Iconversions/include", + "-Idriver/private_include", + "-Iconversions/private_include", + "-Isensors/private_include", + "-Itarget/private_include", + "-fno-rtti" + ], + "includeDir": ".", + "srcDir": ".", + "srcFilter": ["-<*>", "+", "+", "+"] + } +} diff --git a/lib/libesp32_div/esp32-camera/sensors/gc0308.c b/lib/libesp32_div/esp32-camera/sensors/gc0308.c new file mode 100644 index 000000000..19064d3a7 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/gc0308.c @@ -0,0 +1,465 @@ +// Copyright 2015-2021 Espressif Systems (Shanghai) PTE LTD +// +// 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. + +#include +#include +#include +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" +#include "sccb.h" +#include "gc0308.h" +#include "gc0308_regs.h" +#include "gc0308_settings.h" + +#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) +#include "esp32-hal-log.h" +#else +#include "esp_log.h" +static const char *TAG = "gc0308"; +#endif + +#define H8(v) ((v)>>8) +#define L8(v) ((v)&0xff) + +//#define REG_DEBUG_ON + +static int read_reg(uint8_t slv_addr, const uint16_t reg) +{ + int ret = SCCB_Read(slv_addr, reg); +#ifdef REG_DEBUG_ON + if (ret < 0) { + ESP_LOGE(TAG, "READ REG 0x%04x FAILED: %d", reg, ret); + } +#endif + return ret; +} + +static int write_reg(uint8_t slv_addr, const uint16_t reg, uint8_t value) +{ + int ret = 0; +#ifndef REG_DEBUG_ON + ret = SCCB_Write(slv_addr, reg, value); +#else + int old_value = read_reg(slv_addr, reg); + if (old_value < 0) { + return old_value; + } + if ((uint8_t)old_value != value) { + ESP_LOGI(TAG, "NEW REG 0x%04x: 0x%02x to 0x%02x", reg, (uint8_t)old_value, value); + ret = SCCB_Write(slv_addr, reg, value); + } else { + ESP_LOGD(TAG, "OLD REG 0x%04x: 0x%02x", reg, (uint8_t)old_value); + ret = SCCB_Write(slv_addr, reg, value);//maybe not? + } + if (ret < 0) { + ESP_LOGE(TAG, "WRITE REG 0x%04x FAILED: %d", reg, ret); + } +#endif + return ret; +} + +static int check_reg_mask(uint8_t slv_addr, uint16_t reg, uint8_t mask) +{ + return (read_reg(slv_addr, reg) & mask) == mask; +} + +static int set_reg_bits(uint8_t slv_addr, uint16_t reg, uint8_t offset, uint8_t mask, uint8_t value) +{ + int ret = 0; + uint8_t c_value, new_value; + ret = read_reg(slv_addr, reg); + if (ret < 0) { + return ret; + } + c_value = ret; + new_value = (c_value & ~(mask << offset)) | ((value & mask) << offset); + ret = write_reg(slv_addr, reg, new_value); + return ret; +} + +static int write_regs(uint8_t slv_addr, const uint16_t (*regs)[2]) +{ + int i = 0, ret = 0; + while (!ret && regs[i][0] != REGLIST_TAIL) { + if (regs[i][0] == REG_DLY) { + vTaskDelay(regs[i][1] / portTICK_PERIOD_MS); + } else { + ret = write_reg(slv_addr, regs[i][0], regs[i][1]); + } + i++; + } + return ret; +} + +static void print_regs(uint8_t slv_addr) +{ +#ifdef DEBUG_PRINT_REG + ESP_LOGI(TAG, "REG list look ======================"); + for (size_t i = 0xf0; i <= 0xfe; i++) { + ESP_LOGI(TAG, "reg[0x%02x] = 0x%02x", i, read_reg(slv_addr, i)); + } + ESP_LOGI(TAG, "\npage 0 ==="); + write_reg(slv_addr, 0xfe, 0x00); // page 0 + for (size_t i = 0x03; i <= 0xa2; i++) { + ESP_LOGI(TAG, "p0 reg[0x%02x] = 0x%02x", i, read_reg(slv_addr, i)); + } + + ESP_LOGI(TAG, "\npage 3 ==="); + write_reg(slv_addr, 0xfe, 0x03); // page 3 + for (size_t i = 0x01; i <= 0x43; i++) { + ESP_LOGI(TAG, "p3 reg[0x%02x] = 0x%02x", i, read_reg(slv_addr, i)); + } +#endif +} + +static int reset(sensor_t *sensor) +{ + int ret = 0; + // Software Reset: clear all registers and reset them to their default values + ret = write_reg(sensor->slv_addr, RESET_RELATED, 0xf0); + if (ret) { + ESP_LOGE(TAG, "Software Reset FAILED!"); + return ret; + } + vTaskDelay(100 / portTICK_PERIOD_MS); + ret = write_regs(sensor->slv_addr, gc0308_sensor_default_regs); + if (ret == 0) { + ESP_LOGD(TAG, "Camera defaults loaded"); + vTaskDelay(100 / portTICK_PERIOD_MS); + write_reg(sensor->slv_addr, 0xfe, 0x00); +#ifdef CONFIG_IDF_TARGET_ESP32 + set_reg_bits(sensor->slv_addr, 0x28, 4, 0x07, 1); //frequency division for esp32, ensure pclk <= 15MHz +#endif + } + return ret; +} + +static int set_pixformat(sensor_t *sensor, pixformat_t pixformat) +{ + int ret = 0; + + switch (pixformat) { + case PIXFORMAT_RGB565: + write_reg(sensor->slv_addr, 0xfe, 0x00); + ret = set_reg_bits(sensor->slv_addr, 0x24, 0, 0x0f, 6); //RGB565 + break; + + case PIXFORMAT_YUV422: + write_reg(sensor->slv_addr, 0xfe, 0x00); + ret = set_reg_bits(sensor->slv_addr, 0x24, 0, 0x0f, 2); //yuv422 Y Cb Y Cr + break; + default: + ESP_LOGW(TAG, "unsupport format"); + ret = -1; + break; + } + + if (ret == 0) { + sensor->pixformat = pixformat; + ESP_LOGD(TAG, "Set pixformat to: %u", pixformat); + } + return ret; +} + +static int set_framesize(sensor_t *sensor, framesize_t framesize) +{ + int ret = 0; + if (framesize > FRAMESIZE_VGA) { + ESP_LOGW(TAG, "Invalid framesize: %u", framesize); + framesize = FRAMESIZE_VGA; + } + sensor->status.framesize = framesize; + uint16_t w = resolution[framesize].width; + uint16_t h = resolution[framesize].height; + uint16_t row_s = (resolution[FRAMESIZE_VGA].height - h) / 2; + uint16_t col_s = (resolution[FRAMESIZE_VGA].width - w) / 2; + +#if CONFIG_GC_SENSOR_SUBSAMPLE_MODE + struct subsample_cfg { + uint16_t ratio_numerator; + uint16_t ratio_denominator; + uint8_t reg0x54; + uint8_t reg0x56; + uint8_t reg0x57; + uint8_t reg0x58; + uint8_t reg0x59; + }; + const struct subsample_cfg subsample_cfgs[] = { // define some subsample ratio + {84, 420, 0x55, 0x00, 0x00, 0x00, 0x00}, //1/5 + {105, 420, 0x44, 0x00, 0x00, 0x00, 0x00},//1/4 + {140, 420, 0x33, 0x00, 0x00, 0x00, 0x00},//1/3 + {210, 420, 0x22, 0x00, 0x00, 0x00, 0x00},//1/2 + {240, 420, 0x77, 0x02, 0x46, 0x02, 0x46},//4/7 + {252, 420, 0x55, 0x02, 0x04, 0x02, 0x04},//3/5 + {280, 420, 0x33, 0x02, 0x00, 0x02, 0x00},//2/3 + {420, 420, 0x11, 0x00, 0x00, 0x00, 0x00},//1/1 + }; + uint16_t win_w = 640; + uint16_t win_h = 480; + const struct subsample_cfg *cfg = NULL; + /** + * Strategy: try to keep the maximum perspective + */ + for (size_t i = 0; i < sizeof(subsample_cfgs) / sizeof(struct subsample_cfg); i++) { + cfg = &subsample_cfgs[i]; + if ((win_w * cfg->ratio_numerator / cfg->ratio_denominator >= w) && (win_h * cfg->ratio_numerator / cfg->ratio_denominator >= h)) { + win_w = w * cfg->ratio_denominator / cfg->ratio_numerator; + win_h = h * cfg->ratio_denominator / cfg->ratio_numerator; + row_s = (resolution[FRAMESIZE_VGA].height - win_h) / 2; + col_s = (resolution[FRAMESIZE_VGA].width - win_w) / 2; + ESP_LOGI(TAG, "subsample win:%dx%d, ratio:%f", win_w, win_h, (float)cfg->ratio_numerator / (float)cfg->ratio_denominator); + break; + } + } + + write_reg(sensor->slv_addr, 0xfe, 0x00); + + write_reg(sensor->slv_addr, 0x05, H8(row_s)); + write_reg(sensor->slv_addr, 0x06, L8(row_s)); + write_reg(sensor->slv_addr, 0x07, H8(col_s)); + write_reg(sensor->slv_addr, 0x08, L8(col_s)); + write_reg(sensor->slv_addr, 0x09, H8(win_h + 8)); + write_reg(sensor->slv_addr, 0x0a, L8(win_h + 8)); + write_reg(sensor->slv_addr, 0x0b, H8(win_w + 8)); + write_reg(sensor->slv_addr, 0x0c, L8(win_w + 8)); + + write_reg(sensor->slv_addr, 0xfe, 0x01); + set_reg_bits(sensor->slv_addr, 0x53, 7, 0x01, 1); + set_reg_bits(sensor->slv_addr, 0x55, 0, 0x01, 1); + write_reg(sensor->slv_addr, 0x54, cfg->reg0x54); + write_reg(sensor->slv_addr, 0x56, cfg->reg0x56); + write_reg(sensor->slv_addr, 0x57, cfg->reg0x57); + write_reg(sensor->slv_addr, 0x58, cfg->reg0x58); + write_reg(sensor->slv_addr, 0x59, cfg->reg0x59); + + write_reg(sensor->slv_addr, 0xfe, 0x00); + +#elif CONFIG_GC_SENSOR_WINDOWING_MODE + write_reg(sensor->slv_addr, 0xfe, 0x00); + + write_reg(sensor->slv_addr, 0xf7, col_s / 4); + write_reg(sensor->slv_addr, 0xf8, row_s / 4); + write_reg(sensor->slv_addr, 0xf9, (col_s + h) / 4); + write_reg(sensor->slv_addr, 0xfa, (row_s + w) / 4); + + write_reg(sensor->slv_addr, 0x05, H8(row_s)); + write_reg(sensor->slv_addr, 0x06, L8(row_s)); + write_reg(sensor->slv_addr, 0x07, H8(col_s)); + write_reg(sensor->slv_addr, 0x08, L8(col_s)); + + write_reg(sensor->slv_addr, 0x09, H8(h + 8)); + write_reg(sensor->slv_addr, 0x0a, L8(h + 8)); + write_reg(sensor->slv_addr, 0x0b, H8(w + 8)); + write_reg(sensor->slv_addr, 0x0c, L8(w + 8)); + +#endif + if (ret == 0) { + ESP_LOGD(TAG, "Set framesize to: %ux%u", w, h); + } + return 0; +} + +static int set_contrast(sensor_t *sensor, int contrast) +{ + if (contrast != 0) { + write_reg(sensor->slv_addr, 0xfe, 0x00); + write_reg(sensor->slv_addr, 0xb3, contrast); + } + return 0; +} + +static int set_global_gain(sensor_t *sensor, int gain_level) +{ + if (gain_level != 0) { + write_reg(sensor->slv_addr, 0xfe, 0x00); + write_reg(sensor->slv_addr, 0x50, gain_level); + } + return 0; +} + +static int set_hmirror(sensor_t *sensor, int enable) +{ + int ret = 0; + sensor->status.hmirror = enable; + ret = write_reg(sensor->slv_addr, 0xfe, 0x00); + ret |= set_reg_bits(sensor->slv_addr, 0x14, 0, 0x01, enable != 0); + if (ret == 0) { + ESP_LOGD(TAG, "Set h-mirror to: %d", enable); + } + return ret; +} + +static int set_vflip(sensor_t *sensor, int enable) +{ + int ret = 0; + sensor->status.vflip = enable; + ret = write_reg(sensor->slv_addr, 0xfe, 0x00); + ret |= set_reg_bits(sensor->slv_addr, 0x14, 1, 0x01, enable != 0); + if (ret == 0) { + ESP_LOGD(TAG, "Set v-flip to: %d", enable); + } + return ret; +} + +static int set_colorbar(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = write_reg(sensor->slv_addr, 0xfe, 0x00); + ret |= set_reg_bits(sensor->slv_addr, 0x2e, 0, 0x01, enable); + if (ret == 0) { + sensor->status.colorbar = enable; + ESP_LOGD(TAG, "Set colorbar to: %d", enable); + } + return ret; +} + +static int get_reg(sensor_t *sensor, int reg, int mask) +{ + int ret = 0; + if (mask > 0xFF) { + ESP_LOGE(TAG, "mask should not more than 0xff"); + } else { + ret = read_reg(sensor->slv_addr, reg); + } + if (ret > 0) { + ret &= mask; + } + return ret; +} + +static int set_reg(sensor_t *sensor, int reg, int mask, int value) +{ + int ret = 0; + if (mask > 0xFF) { + ESP_LOGE(TAG, "mask should not more than 0xff"); + } else { + ret = read_reg(sensor->slv_addr, reg); + } + if (ret < 0) { + return ret; + } + value = (ret & ~mask) | (value & mask); + + if (mask > 0xFF) { + + } else { + ret = write_reg(sensor->slv_addr, reg, value); + } + return ret; +} + +static int init_status(sensor_t *sensor) +{ + write_reg(sensor->slv_addr, 0xfe, 0x00); + sensor->status.brightness = 0; + sensor->status.contrast = 0; + sensor->status.saturation = 0; + sensor->status.sharpness = 0; + sensor->status.denoise = 0; + sensor->status.ae_level = 0; + sensor->status.gainceiling = 0; + sensor->status.awb = 0; + sensor->status.dcw = 0; + sensor->status.agc = 0; + sensor->status.aec = 0; + sensor->status.hmirror = check_reg_mask(sensor->slv_addr, 0x14, 0x01); + sensor->status.vflip = check_reg_mask(sensor->slv_addr, 0x14, 0x02); + sensor->status.colorbar = 0; + sensor->status.bpc = 0; + sensor->status.wpc = 0; + sensor->status.raw_gma = 0; + sensor->status.lenc = 0; + sensor->status.quality = 0; + sensor->status.special_effect = 0; + sensor->status.wb_mode = 0; + sensor->status.awb_gain = 0; + sensor->status.agc_gain = 0; + sensor->status.aec_value = 0; + sensor->status.aec2 = 0; + + print_regs(sensor->slv_addr); + return 0; +} + +static int set_dummy(sensor_t *sensor, int val) +{ + ESP_LOGW(TAG, "Unsupported"); + return -1; +} +static int set_gainceiling_dummy(sensor_t *sensor, gainceiling_t val) +{ + ESP_LOGW(TAG, "Unsupported"); + return -1; +} + +int gc0308_detect(int slv_addr, sensor_id_t *id) +{ + if (GC0308_SCCB_ADDR == slv_addr) { + write_reg(slv_addr, 0xfe, 0x00); + uint8_t PID = SCCB_Read(slv_addr, 0x00); + if (GC0308_PID == PID) { + id->PID = PID; + return PID; + } else { + ESP_LOGI(TAG, "Mismatch PID=0x%x", PID); + } + } + return 0; +} + +int gc0308_init(sensor_t *sensor) +{ + sensor->init_status = init_status; + sensor->reset = reset; + sensor->set_pixformat = set_pixformat; + sensor->set_framesize = set_framesize; + sensor->set_contrast = set_contrast; + sensor->set_brightness = set_dummy; + sensor->set_saturation = set_dummy; + sensor->set_sharpness = set_dummy; + sensor->set_denoise = set_dummy; + sensor->set_gainceiling = set_gainceiling_dummy; + sensor->set_quality = set_dummy; + sensor->set_colorbar = set_colorbar; + sensor->set_whitebal = set_dummy; + sensor->set_gain_ctrl = set_global_gain; + sensor->set_exposure_ctrl = set_dummy; + sensor->set_hmirror = set_hmirror; + sensor->set_vflip = set_vflip; + + sensor->set_aec2 = set_dummy; + sensor->set_awb_gain = set_dummy; + sensor->set_agc_gain = set_dummy; + sensor->set_aec_value = set_dummy; + + sensor->set_special_effect = set_dummy; + sensor->set_wb_mode = set_dummy; + sensor->set_ae_level = set_dummy; + + sensor->set_dcw = set_dummy; + sensor->set_bpc = set_dummy; + sensor->set_wpc = set_dummy; + + sensor->set_raw_gma = set_dummy; + sensor->set_lenc = set_dummy; + + sensor->get_reg = get_reg; + sensor->set_reg = set_reg; + sensor->set_res_raw = NULL; + sensor->set_pll = NULL; + sensor->set_xclk = NULL; + + ESP_LOGD(TAG, "GC0308 Attached"); + return 0; +} diff --git a/lib/libesp32_div/esp32-camera/sensors/gc032a.c b/lib/libesp32_div/esp32-camera/sensors/gc032a.c new file mode 100644 index 000000000..612e17b1e --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/gc032a.c @@ -0,0 +1,391 @@ +// Copyright 2015-2021 Espressif Systems (Shanghai) PTE LTD +// +// 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. + +#include +#include +#include +#include +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" +#include "sccb.h" +#include "gc032a.h" +#include "gc032a_regs.h" +#include "gc032a_settings.h" + +#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) +#include "esp32-hal-log.h" +#else +#include "esp_log.h" +static const char *TAG = "gc032a"; +#endif + +#define H8(v) ((v)>>8) +#define L8(v) ((v)&0xff) + +//#define REG_DEBUG_ON + +static int read_reg(uint8_t slv_addr, const uint16_t reg) +{ + int ret = SCCB_Read(slv_addr, reg); +#ifdef REG_DEBUG_ON + if (ret < 0) { + ESP_LOGE(TAG, "READ REG 0x%04x FAILED: %d", reg, ret); + } +#endif + return ret; +} + +static int write_reg(uint8_t slv_addr, const uint16_t reg, uint8_t value) +{ + int ret = 0; +#ifndef REG_DEBUG_ON + ret = SCCB_Write(slv_addr, reg, value); +#else + int old_value = read_reg(slv_addr, reg); + if (old_value < 0) { + return old_value; + } + if ((uint8_t)old_value != value) { + ESP_LOGI(TAG, "NEW REG 0x%04x: 0x%02x to 0x%02x", reg, (uint8_t)old_value, value); + ret = SCCB_Write(slv_addr, reg, value); + } else { + ESP_LOGD(TAG, "OLD REG 0x%04x: 0x%02x", reg, (uint8_t)old_value); + ret = SCCB_Write(slv_addr, reg, value);//maybe not? + } + if (ret < 0) { + ESP_LOGE(TAG, "WRITE REG 0x%04x FAILED: %d", reg, ret); + } +#endif + return ret; +} + +static int check_reg_mask(uint8_t slv_addr, uint16_t reg, uint8_t mask) +{ + return (read_reg(slv_addr, reg) & mask) == mask; +} + +static void print_regs(uint8_t slv_addr) +{ +#ifdef DEBUG_PRINT_REG + vTaskDelay(pdMS_TO_TICKS(100)); + ESP_LOGI(TAG, "REG list look ======================"); + for (size_t i = 0xf0; i <= 0xfe; i++) { + ESP_LOGI(TAG, "reg[0x%02x] = 0x%02x", i, read_reg(slv_addr, i)); + } + ESP_LOGI(TAG, "\npage 0 ==="); + write_reg(slv_addr, 0xfe, 0x00); // page 0 + for (size_t i = 0x03; i <= 0x24; i++) { + ESP_LOGI(TAG, "p0 reg[0x%02x] = 0x%02x", i, read_reg(slv_addr, i)); + } + for (size_t i = 0x40; i <= 0x95; i++) { + ESP_LOGI(TAG, "p0 reg[0x%02x] = 0x%02x", i, read_reg(slv_addr, i)); + } + ESP_LOGI(TAG, "\npage 3 ==="); + write_reg(slv_addr, 0xfe, 0x03); // page 3 + for (size_t i = 0x01; i <= 0x43; i++) { + ESP_LOGI(TAG, "p3 reg[0x%02x] = 0x%02x", i, read_reg(slv_addr, i)); + } +#endif +} + +static int set_reg_bits(uint8_t slv_addr, uint16_t reg, uint8_t offset, uint8_t mask, uint8_t value) +{ + int ret = 0; + uint8_t c_value, new_value; + ret = read_reg(slv_addr, reg); + if (ret < 0) { + return ret; + } + c_value = ret; + new_value = (c_value & ~(mask << offset)) | ((value & mask) << offset); + ret = write_reg(slv_addr, reg, new_value); + return ret; +} + +static int write_regs(uint8_t slv_addr, const uint16_t (*regs)[2]) +{ + int i = 0, ret = 0; + while (!ret && regs[i][0] != REGLIST_TAIL) { + if (regs[i][0] == REG_DLY) { + vTaskDelay(regs[i][1] / portTICK_PERIOD_MS); + } else { + ret = write_reg(slv_addr, regs[i][0], regs[i][1]); + } + i++; + } + return ret; +} + +static int reset(sensor_t *sensor) +{ + int ret; + // Software Reset: clear all registers and reset them to their default values + ret = write_reg(sensor->slv_addr, RESET_RELATED, 0xf0); + if (ret) { + ESP_LOGE(TAG, "Software Reset FAILED!"); + return ret; + } + vTaskDelay(100 / portTICK_PERIOD_MS); + + ret = write_regs(sensor->slv_addr, gc032a_default_regs); + if (ret == 0) { + ESP_LOGD(TAG, "Camera defaults loaded"); + vTaskDelay(100 / portTICK_PERIOD_MS); + write_reg(sensor->slv_addr, 0xfe, 0x00); + set_reg_bits(sensor->slv_addr, 0xf7, 1, 0x01, 1); // PLL_mode1:div2en + set_reg_bits(sensor->slv_addr, 0xf7, 7, 0x01, 1); // PLL_mode1:dvp mode + set_reg_bits(sensor->slv_addr, 0xf8, 0, 0x3f, 8); //PLL_mode2 :divx4 + set_reg_bits(sensor->slv_addr, 0xfa, 4, 0x0f, 2); //vlk div mode :divide_by + } + + return ret; +} + +static int set_pixformat(sensor_t *sensor, pixformat_t pixformat) +{ + int ret = 0; + switch (pixformat) { + case PIXFORMAT_RGB565: + write_reg(sensor->slv_addr, 0xfe, 0x00); + ret = set_reg_bits(sensor->slv_addr, 0x44, 0, 0x1f, 6); //RGB565 + break; + + case PIXFORMAT_YUV422: + write_reg(sensor->slv_addr, 0xfe, 0x00); + ret = set_reg_bits(sensor->slv_addr, 0x44, 0, 0x1f, 3); + break; + default: + ESP_LOGW(TAG, "unsupport format"); + ret = -1; + break; + } + if (ret == 0) { + sensor->pixformat = pixformat; + ESP_LOGD(TAG, "Set pixformat to: %u", pixformat); + } + + return ret; +} + +static int set_framesize(sensor_t *sensor, framesize_t framesize) +{ + ESP_LOGI(TAG, "set_framesize"); + int ret = 0; + if (framesize > FRAMESIZE_VGA) { + ESP_LOGW(TAG, "Invalid framesize: %u", framesize); + framesize = FRAMESIZE_VGA; + } + sensor->status.framesize = framesize; + uint16_t w = resolution[framesize].width; + uint16_t h = resolution[framesize].height; + uint16_t row_s = (resolution[FRAMESIZE_VGA].height - h) / 2; + uint16_t col_s = (resolution[FRAMESIZE_VGA].width - w) / 2; + + write_reg(sensor->slv_addr, 0xfe, 0x00); + write_reg(sensor->slv_addr, P0_ROW_START_HIGH, H8(row_s)); // Row_start[8] + write_reg(sensor->slv_addr, P0_ROW_START_LOW, L8(row_s)); // Row_start[7:0] + write_reg(sensor->slv_addr, P0_COLUMN_START_HIGH, H8(col_s)); // Column_start[9:8] + write_reg(sensor->slv_addr, P0_COLUMN_START_LOW, L8(col_s)); // Column_start[7:0] + write_reg(sensor->slv_addr, P0_WINDOW_HEIGHT_HIGH, H8(h + 8)); //window_height [8] + write_reg(sensor->slv_addr, P0_WINDOW_HEIGHT_LOW, L8(h + 8)); //window_height [7:0] + write_reg(sensor->slv_addr, P0_WINDOW_WIDTH_HIGH, H8(w + 8)); //window_width [9:8] + write_reg(sensor->slv_addr, P0_WINDOW_WIDTH_LOW, L8(w + 8)); //window_width [7:0] + + write_reg(sensor->slv_addr, P0_WIN_MODE, 0x01); + write_reg(sensor->slv_addr, P0_OUT_WIN_HEIGHT_HIGH, H8(h)); + write_reg(sensor->slv_addr, P0_OUT_WIN_HEIGHT_LOW, L8(h)); + write_reg(sensor->slv_addr, P0_OUT_WIN_WIDTH_HIGH, H8(w)); + write_reg(sensor->slv_addr, P0_OUT_WIN_WIDTH_LOW, L8(w)); + + if (ret == 0) { + ESP_LOGD(TAG, "Set framesize to: %ux%u", w, h); + } + print_regs(sensor->slv_addr); + return ret; +} + +static int set_hmirror(sensor_t *sensor, int enable) +{ + int ret = 0; + sensor->status.hmirror = enable; + ret = write_reg(sensor->slv_addr, 0xfe, 0x00); + ret |= set_reg_bits(sensor->slv_addr, P0_CISCTL_MODE1, 0, 0x01, enable); + if (ret == 0) { + ESP_LOGD(TAG, "Set h-mirror to: %d", enable); + } + return ret; +} + +static int set_vflip(sensor_t *sensor, int enable) +{ + int ret = 0; + sensor->status.vflip = enable; + ret = write_reg(sensor->slv_addr, 0xfe, 0x00); + ret |= set_reg_bits(sensor->slv_addr, P0_CISCTL_MODE1, 1, 0x01, enable); + if (ret == 0) { + ESP_LOGD(TAG, "Set v-flip to: %d", enable); + } + return ret; +} + +static int set_colorbar(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = write_reg(sensor->slv_addr, 0xfe, 0x00); + ret |= set_reg_bits(sensor->slv_addr, P0_DEBUG_MODE2, 3, 0x01, enable); + if (ret == 0) { + sensor->status.colorbar = enable; + ESP_LOGD(TAG, "Set colorbar to: %d", enable); + } + return ret; +} + +static int get_reg(sensor_t *sensor, int reg, int mask) +{ + int ret = 0; + if (mask > 0xFF) { + ESP_LOGE(TAG, "mask should not more than 0xff"); + } else { + ret = read_reg(sensor->slv_addr, reg); + } + if (ret > 0) { + ret &= mask; + } + return ret; +} + +static int set_reg(sensor_t *sensor, int reg, int mask, int value) +{ + int ret = 0; + if (mask > 0xFF) { + ESP_LOGE(TAG, "mask should not more than 0xff"); + } else { + ret = read_reg(sensor->slv_addr, reg); + } + if (ret < 0) { + return ret; + } + value = (ret & ~mask) | (value & mask); + + if (mask > 0xFF) { + + } else { + ret = write_reg(sensor->slv_addr, reg, value); + } + return ret; +} + +static int init_status(sensor_t *sensor) +{ + write_reg(sensor->slv_addr, 0xfe, 0x00); + sensor->status.brightness = 0; + sensor->status.contrast = 0; + sensor->status.saturation = 0; + sensor->status.sharpness = 0; + sensor->status.denoise = 0; + sensor->status.ae_level = 0; + sensor->status.gainceiling = 0; + sensor->status.awb = 0; + sensor->status.dcw = 0; + sensor->status.agc = 0; + sensor->status.aec = 0; + sensor->status.hmirror = check_reg_mask(sensor->slv_addr, P0_CISCTL_MODE1, 0x01); + sensor->status.vflip = check_reg_mask(sensor->slv_addr, P0_CISCTL_MODE1, 0x02); + sensor->status.colorbar = 0; + sensor->status.bpc = 0; + sensor->status.wpc = 0; + sensor->status.raw_gma = 0; + sensor->status.lenc = 0; + sensor->status.quality = 0; + sensor->status.special_effect = 0; + sensor->status.wb_mode = 0; + sensor->status.awb_gain = 0; + sensor->status.agc_gain = 0; + sensor->status.aec_value = 0; + sensor->status.aec2 = 0; + return 0; +} + +static int set_dummy(sensor_t *sensor, int val) +{ + ESP_LOGW(TAG, "Unsupported"); + return -1; +} +static int set_gainceiling_dummy(sensor_t *sensor, gainceiling_t val) +{ + ESP_LOGW(TAG, "Unsupported"); + return -1; +} + +int gc032a_detect(int slv_addr, sensor_id_t *id) +{ + if (GC032A_SCCB_ADDR == slv_addr) { + uint8_t MIDL = SCCB_Read(slv_addr, SENSOR_ID_LOW); + uint8_t MIDH = SCCB_Read(slv_addr, SENSOR_ID_HIGH); + uint16_t PID = MIDH << 8 | MIDL; + if (GC032A_PID == PID) { + id->PID = PID; + return PID; + } else { + ESP_LOGI(TAG, "Mismatch PID=0x%x", PID); + } + } + return 0; +} + +int gc032a_init(sensor_t *sensor) +{ + sensor->init_status = init_status; + sensor->reset = reset; + sensor->set_pixformat = set_pixformat; + sensor->set_framesize = set_framesize; + sensor->set_contrast = set_dummy; + sensor->set_brightness = set_dummy; + sensor->set_saturation = set_dummy; + sensor->set_sharpness = set_dummy; + sensor->set_denoise = set_dummy; + sensor->set_gainceiling = set_gainceiling_dummy; + sensor->set_quality = set_dummy; + sensor->set_colorbar = set_colorbar; + sensor->set_whitebal = set_dummy; + sensor->set_gain_ctrl = set_dummy; + sensor->set_exposure_ctrl = set_dummy; + sensor->set_hmirror = set_hmirror; + sensor->set_vflip = set_vflip; + + sensor->set_aec2 = set_dummy; + sensor->set_awb_gain = set_dummy; + sensor->set_agc_gain = set_dummy; + sensor->set_aec_value = set_dummy; + + sensor->set_special_effect = set_dummy; + sensor->set_wb_mode = set_dummy; + sensor->set_ae_level = set_dummy; + + sensor->set_dcw = set_dummy; + sensor->set_bpc = set_dummy; + sensor->set_wpc = set_dummy; + + sensor->set_raw_gma = set_dummy; + sensor->set_lenc = set_dummy; + + sensor->get_reg = get_reg; + sensor->set_reg = set_reg; + sensor->set_res_raw = NULL; + sensor->set_pll = NULL; + sensor->set_xclk = NULL; + + ESP_LOGD(TAG, "GC032A Attached"); + return 0; +} diff --git a/lib/libesp32_div/esp32-camera/sensors/gc2145.c b/lib/libesp32_div/esp32-camera/sensors/gc2145.c new file mode 100644 index 000000000..311308290 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/gc2145.c @@ -0,0 +1,475 @@ +// Copyright 2015-2021 Espressif Systems (Shanghai) PTE LTD +// +// 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. + +#include +#include +#include +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" +#include "sccb.h" +#include "gc2145.h" +#include "gc2145_regs.h" +#include "gc2145_settings.h" + +#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) +#include "esp32-hal-log.h" +#else +#include "esp_log.h" +static const char *TAG = "gc2145"; +#endif + +#define H8(v) ((v)>>8) +#define L8(v) ((v)&0xff) + +//#define REG_DEBUG_ON + +static int read_reg(uint8_t slv_addr, const uint16_t reg) +{ + int ret = SCCB_Read(slv_addr, reg); +#ifdef REG_DEBUG_ON + if (ret < 0) { + ESP_LOGE(TAG, "READ REG 0x%04x FAILED: %d", reg, ret); + } +#endif + return ret; +} + +static int write_reg(uint8_t slv_addr, const uint16_t reg, uint8_t value) +{ + int ret = 0; +#ifndef REG_DEBUG_ON + ret = SCCB_Write(slv_addr, reg, value); +#else + int old_value = read_reg(slv_addr, reg); + if (old_value < 0) { + return old_value; + } + if ((uint8_t)old_value != value) { + ESP_LOGI(TAG, "NEW REG 0x%04x: 0x%02x to 0x%02x", reg, (uint8_t)old_value, value); + ret = SCCB_Write(slv_addr, reg, value); + } else { + ESP_LOGD(TAG, "OLD REG 0x%04x: 0x%02x", reg, (uint8_t)old_value); + ret = SCCB_Write(slv_addr, reg, value);//maybe not? + } + if (ret < 0) { + ESP_LOGE(TAG, "WRITE REG 0x%04x FAILED: %d", reg, ret); + } +#endif + return ret; +} + +static int check_reg_mask(uint8_t slv_addr, uint16_t reg, uint8_t mask) +{ + return (read_reg(slv_addr, reg) & mask) == mask; +} + +static int set_reg_bits(uint8_t slv_addr, uint16_t reg, uint8_t offset, uint8_t mask, uint8_t value) +{ + int ret = 0; + uint8_t c_value, new_value; + ret = read_reg(slv_addr, reg); + if (ret < 0) { + return ret; + } + c_value = ret; + new_value = (c_value & ~(mask << offset)) | ((value & mask) << offset); + ret = write_reg(slv_addr, reg, new_value); + return ret; +} + +static int write_regs(uint8_t slv_addr, const uint16_t (*regs)[2]) +{ + int i = 0, ret = 0; + while (!ret && regs[i][0] != REGLIST_TAIL) { + if (regs[i][0] == REG_DLY) { + vTaskDelay(regs[i][1] / portTICK_PERIOD_MS); + } else { + ret = write_reg(slv_addr, regs[i][0], regs[i][1]); + } + i++; + } + return ret; +} + +static void print_regs(uint8_t slv_addr) +{ +#ifdef DEBUG_PRINT_REG + vTaskDelay(pdMS_TO_TICKS(100)); + ESP_LOGI(TAG, "REG list look ======================"); + for (size_t i = 0xf0; i <= 0xfe; i++) { + ESP_LOGI(TAG, "reg[0x%02x] = 0x%02x", i, read_reg(slv_addr, i)); + } + ESP_LOGI(TAG, "\npage 0 ==="); + write_reg(slv_addr, 0xfe, 0x00); // page 0 + for (size_t i = 0x03; i <= 0x24; i++) { + ESP_LOGI(TAG, "p0 reg[0x%02x] = 0x%02x", i, read_reg(slv_addr, i)); + } + for (size_t i = 0x80; i <= 0xa2; i++) { + ESP_LOGI(TAG, "p0 reg[0x%02x] = 0x%02x", i, read_reg(slv_addr, i)); + } + ESP_LOGI(TAG, "\npage 3 ==="); + write_reg(slv_addr, 0xfe, 0x03); // page 3 + for (size_t i = 0x01; i <= 0x43; i++) { + ESP_LOGI(TAG, "p3 reg[0x%02x] = 0x%02x", i, read_reg(slv_addr, i)); + } +#endif +} + +static int reset(sensor_t *sensor) +{ + int ret = 0; + // Software Reset: clear all registers and reset them to their default values + ret = write_reg(sensor->slv_addr, RESET_RELATED, 0xe0); + if (ret) { + ESP_LOGE(TAG, "Software Reset FAILED!"); + return ret; + } + vTaskDelay(100 / portTICK_PERIOD_MS); + ret = write_regs(sensor->slv_addr, gc2145_default_init_regs); + if (ret == 0) { + ESP_LOGD(TAG, "Camera defaults loaded"); + vTaskDelay(100 / portTICK_PERIOD_MS); +#ifdef CONFIG_IDF_TARGET_ESP32 + write_reg(sensor->slv_addr, 0xfe, 0x00); + //ensure pclk <= 15MHz for esp32 + set_reg_bits(sensor->slv_addr, 0xf8, 0, 0x3f, 2); // divx4 + set_reg_bits(sensor->slv_addr, 0xfa, 4, 0x0f, 2); // divide_by +#endif + + } + return ret; +} + +static int set_pixformat(sensor_t *sensor, pixformat_t pixformat) +{ + int ret = 0; + + switch (pixformat) { + case PIXFORMAT_RGB565: + write_reg(sensor->slv_addr, 0xfe, 0x00); + ret = set_reg_bits(sensor->slv_addr, P0_OUTPUT_FORMAT, 0, 0x1f, 6); //RGB565 + break; + + case PIXFORMAT_YUV422: + write_reg(sensor->slv_addr, 0xfe, 0x00); + ret = set_reg_bits(sensor->slv_addr, P0_OUTPUT_FORMAT, 0, 0x1f, 2); //yuv422 + break; + default: + ESP_LOGW(TAG, "unsupport format"); + ret = -1; + break; + } + + if (ret == 0) { + sensor->pixformat = pixformat; + ESP_LOGD(TAG, "Set pixformat to: %u", pixformat); + } + return ret; +} + +static int set_framesize(sensor_t *sensor, framesize_t framesize) +{ + int ret = 0; + if (framesize > FRAMESIZE_UXGA) { + ESP_LOGW(TAG, "Invalid framesize: %u", framesize); + framesize = FRAMESIZE_UXGA; + } + sensor->status.framesize = framesize; + uint16_t w = resolution[framesize].width; + uint16_t h = resolution[framesize].height; + uint16_t row_s = (resolution[FRAMESIZE_UXGA].height - h) / 2; + uint16_t col_s = (resolution[FRAMESIZE_UXGA].width - w) / 2; + +#if CONFIG_GC_SENSOR_SUBSAMPLE_MODE + struct subsample_cfg { + uint16_t ratio_numerator; + uint16_t ratio_denominator; + uint8_t reg0x99; + uint8_t reg0x9b; + uint8_t reg0x9c; + uint8_t reg0x9d; + uint8_t reg0x9e; + uint8_t reg0x9f; + uint8_t reg0xa0; + uint8_t reg0xa1; + uint8_t reg0xa2; + }; + const struct subsample_cfg subsample_cfgs[] = { // define some subsample ratio + // {60, 420, 0x77, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, //1/7 // A smaller ratio brings a larger view, but it reduces the frame rate + // {84, 420, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, //1/5 + // {105, 420, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},//1/4 + {140, 420, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},//1/3 + {210, 420, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},//1/2 + {240, 420, 0x77, 0x02, 0x46, 0x02, 0x46, 0x02, 0x46, 0x02, 0x46},//4/7 + {252, 420, 0x55, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04},//3/5 + {280, 420, 0x33, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00},//2/3 + {420, 420, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},//1/1 + }; + uint16_t win_w = resolution[FRAMESIZE_UXGA].width; + uint16_t win_h = resolution[FRAMESIZE_UXGA].height; + const struct subsample_cfg *cfg = NULL; + /** + * Strategy: try to keep the maximum perspective + */ + uint8_t i = 0; + if (framesize >= FRAMESIZE_QVGA) { + i = 1; + } + for (; i < sizeof(subsample_cfgs) / sizeof(struct subsample_cfg); i++) { + cfg = &subsample_cfgs[i]; + if ((win_w * cfg->ratio_numerator / cfg->ratio_denominator >= w) && (win_h * cfg->ratio_numerator / cfg->ratio_denominator >= h)) { + win_w = w * cfg->ratio_denominator / cfg->ratio_numerator; + win_h = h * cfg->ratio_denominator / cfg->ratio_numerator; + row_s = (resolution[FRAMESIZE_UXGA].height - win_h) / 2; + col_s = (resolution[FRAMESIZE_UXGA].width - win_w) / 2; + ESP_LOGI(TAG, "subsample win:%dx%d, ratio:%f", win_w, win_h, (float)cfg->ratio_numerator / (float)cfg->ratio_denominator); + break; + } + } + + write_reg(sensor->slv_addr, 0xfe, 0x00); + write_reg(sensor->slv_addr, P0_CROP_ENABLE, 0x01); + write_reg(sensor->slv_addr, 0x09, H8(row_s)); + write_reg(sensor->slv_addr, 0x0a, L8(row_s)); + write_reg(sensor->slv_addr, 0x0b, H8(col_s)); + write_reg(sensor->slv_addr, 0x0c, L8(col_s)); + write_reg(sensor->slv_addr, 0x0d, H8(win_h + 8)); + write_reg(sensor->slv_addr, 0x0e, L8(win_h + 8)); + write_reg(sensor->slv_addr, 0x0f, H8(win_w + 16)); + write_reg(sensor->slv_addr, 0x10, L8(win_w + 16)); + + write_reg(sensor->slv_addr, 0x99, cfg->reg0x99); + write_reg(sensor->slv_addr, 0x9b, cfg->reg0x9b); + write_reg(sensor->slv_addr, 0x9c, cfg->reg0x9c); + write_reg(sensor->slv_addr, 0x9d, cfg->reg0x9d); + write_reg(sensor->slv_addr, 0x9e, cfg->reg0x9e); + write_reg(sensor->slv_addr, 0x9f, cfg->reg0x9f); + write_reg(sensor->slv_addr, 0xa0, cfg->reg0xa0); + write_reg(sensor->slv_addr, 0xa1, cfg->reg0xa1); + write_reg(sensor->slv_addr, 0xa2, cfg->reg0xa2); + + write_reg(sensor->slv_addr, 0x95, H8(h)); + write_reg(sensor->slv_addr, 0x96, L8(h)); + write_reg(sensor->slv_addr, 0x97, H8(w)); + write_reg(sensor->slv_addr, 0x98, L8(w)); + + +#elif CONFIG_GC_SENSOR_WINDOWING_MODE + write_reg(sensor->slv_addr, 0xfe, 0x00); + + write_reg(sensor->slv_addr, P0_CROP_ENABLE, 0x01); + // write_reg(sensor->slv_addr, 0xec, col_s / 8); //measure window + // write_reg(sensor->slv_addr, 0xed, row_s / 8); + // write_reg(sensor->slv_addr, 0xee, (col_s + h) / 8); + // write_reg(sensor->slv_addr, 0xef, (row_s + w) / 8); + + write_reg(sensor->slv_addr, 0x09, H8(row_s)); + write_reg(sensor->slv_addr, 0x0a, L8(row_s)); + write_reg(sensor->slv_addr, 0x0b, H8(col_s)); + write_reg(sensor->slv_addr, 0x0c, L8(col_s)); + write_reg(sensor->slv_addr, 0x0d, H8(h + 8)); + write_reg(sensor->slv_addr, 0x0e, L8(h + 8)); + write_reg(sensor->slv_addr, 0x0f, H8(w + 8)); + write_reg(sensor->slv_addr, 0x10, L8(w + 8)); + + write_reg(sensor->slv_addr, 0x95, H8(h)); + write_reg(sensor->slv_addr, 0x96, L8(h)); + write_reg(sensor->slv_addr, 0x97, H8(w)); + write_reg(sensor->slv_addr, 0x98, L8(w)); + +#endif + + if (ret == 0) { + ESP_LOGD(TAG, "Set framesize to: %ux%u", w, h); + } + return ret; + +} + +static int set_hmirror(sensor_t *sensor, int enable) +{ + int ret = 0; + sensor->status.hmirror = enable; + ret = write_reg(sensor->slv_addr, 0xfe, 0x00); + ret |= set_reg_bits(sensor->slv_addr, P0_ANALOG_MODE1, 0, 0x01, enable != 0); + if (ret == 0) { + ESP_LOGD(TAG, "Set h-mirror to: %d", enable); + } + return ret; +} + +static int set_vflip(sensor_t *sensor, int enable) +{ + int ret = 0; + sensor->status.vflip = enable; + ret = write_reg(sensor->slv_addr, 0xfe, 0x00); + ret |= set_reg_bits(sensor->slv_addr, P0_ANALOG_MODE1, 1, 0x01, enable != 0); + if (ret == 0) { + ESP_LOGD(TAG, "Set v-flip to: %d", enable); + } + return ret; +} + +static int set_colorbar(sensor_t *sensor, int enable) +{ + int ret = 0; + // ret = write_reg(sensor->slv_addr, 0xfe, 0x00); + // ret |= set_reg_bits(sensor->slv_addr, P0_DEBUG_MODE3, 3, 0x01, enable); + if (ret == 0) { + sensor->status.colorbar = enable; + ESP_LOGD(TAG, "Set colorbar to: %d", enable); + } + return ret; +} + +static int get_reg(sensor_t *sensor, int reg, int mask) +{ + int ret = 0; + if (mask > 0xFF) { + ESP_LOGE(TAG, "mask should not more than 0xff"); + } else { + ret = read_reg(sensor->slv_addr, reg); + } + if (ret > 0) { + ret &= mask; + } + return ret; +} + +static int set_reg(sensor_t *sensor, int reg, int mask, int value) +{ + int ret = 0; + if (mask > 0xFF) { + ESP_LOGE(TAG, "mask should not more than 0xff"); + } else { + ret = read_reg(sensor->slv_addr, reg); + } + if (ret < 0) { + return ret; + } + value = (ret & ~mask) | (value & mask); + + if (mask > 0xFF) { + + } else { + ret = write_reg(sensor->slv_addr, reg, value); + } + return ret; +} + +static int init_status(sensor_t *sensor) +{ + write_reg(sensor->slv_addr, 0xfe, 0x00); + sensor->status.brightness = 0; + sensor->status.contrast = 0; + sensor->status.saturation = 0; + sensor->status.sharpness = 0; + sensor->status.denoise = 0; + sensor->status.ae_level = 0; + sensor->status.gainceiling = 0; + sensor->status.awb = 0; + sensor->status.dcw = 0; + sensor->status.agc = 0; + sensor->status.aec = 0; + sensor->status.hmirror = check_reg_mask(sensor->slv_addr, P0_ANALOG_MODE1, 0x01); + sensor->status.vflip = check_reg_mask(sensor->slv_addr, P0_ANALOG_MODE1, 0x02); + sensor->status.colorbar = 0; + sensor->status.bpc = 0; + sensor->status.wpc = 0; + sensor->status.raw_gma = 0; + sensor->status.lenc = 0; + sensor->status.quality = 0; + sensor->status.special_effect = 0; + sensor->status.wb_mode = 0; + sensor->status.awb_gain = 0; + sensor->status.agc_gain = 0; + sensor->status.aec_value = 0; + sensor->status.aec2 = 0; + + print_regs(sensor->slv_addr); + return 0; +} + +static int set_dummy(sensor_t *sensor, int val) +{ + ESP_LOGW(TAG, "Unsupported"); + return -1; +} +static int set_gainceiling_dummy(sensor_t *sensor, gainceiling_t val) +{ + ESP_LOGW(TAG, "Unsupported"); + return -1; +} + +int gc2145_detect(int slv_addr, sensor_id_t *id) +{ + if (GC2145_SCCB_ADDR == slv_addr) { + uint8_t MIDL = SCCB_Read(slv_addr, CHIP_ID_LOW); + uint8_t MIDH = SCCB_Read(slv_addr, CHIP_ID_HIGH); + uint16_t PID = MIDH << 8 | MIDL; + if (GC2145_PID == PID) { + id->PID = PID; + return PID; + } else { + ESP_LOGI(TAG, "Mismatch PID=0x%x", PID); + } + } + return 0; +} + +int gc2145_init(sensor_t *sensor) +{ + sensor->init_status = init_status; + sensor->reset = reset; + sensor->set_pixformat = set_pixformat; + sensor->set_framesize = set_framesize; + sensor->set_contrast = set_dummy; + sensor->set_brightness = set_dummy; + sensor->set_saturation = set_dummy; + sensor->set_sharpness = set_dummy; + sensor->set_denoise = set_dummy; + sensor->set_gainceiling = set_gainceiling_dummy; + sensor->set_quality = set_dummy; + sensor->set_colorbar = set_colorbar; + sensor->set_whitebal = set_dummy; + sensor->set_gain_ctrl = set_dummy; + sensor->set_exposure_ctrl = set_dummy; + sensor->set_hmirror = set_hmirror; + sensor->set_vflip = set_vflip; + + sensor->set_aec2 = set_dummy; + sensor->set_awb_gain = set_dummy; + sensor->set_agc_gain = set_dummy; + sensor->set_aec_value = set_dummy; + + sensor->set_special_effect = set_dummy; + sensor->set_wb_mode = set_dummy; + sensor->set_ae_level = set_dummy; + + sensor->set_dcw = set_dummy; + sensor->set_bpc = set_dummy; + sensor->set_wpc = set_dummy; + + sensor->set_raw_gma = set_dummy; + sensor->set_lenc = set_dummy; + + sensor->get_reg = get_reg; + sensor->set_reg = set_reg; + sensor->set_res_raw = NULL; + sensor->set_pll = NULL; + sensor->set_xclk = NULL; + + ESP_LOGD(TAG, "GC2145 Attached"); + return 0; +} diff --git a/lib/libesp32_div/esp32-camera/sensors/nt99141.c b/lib/libesp32_div/esp32-camera/sensors/nt99141.c new file mode 100644 index 000000000..86a8b8a0b --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/nt99141.c @@ -0,0 +1,1022 @@ +/* + * This file is part of the OpenMV project. + * Copyright (c) 2013/2014 Ibrahim Abdelkader + * This work is licensed under the MIT license, see the file LICENSE for details. + * + * NT99141 driver. + * + */ +#include +#include +#include +#include "sccb.h" +#include "xclk.h" +#include "nt99141.h" +#include "nt99141_regs.h" +#include "nt99141_settings.h" +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" + +#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) +#include "esp32-hal-log.h" +#else +#include "esp_log.h" +static const char *TAG = "NT99141"; +#endif + +//#define REG_DEBUG_ON + +static int read_reg(uint8_t slv_addr, const uint16_t reg) +{ + int ret = SCCB_Read16(slv_addr, reg); +#ifdef REG_DEBUG_ON + + if (ret < 0) { + ESP_LOGE(TAG, "READ REG 0x%04x FAILED: %d", reg, ret); + } + +#endif + return ret; +} + +static int check_reg_mask(uint8_t slv_addr, uint16_t reg, uint8_t mask) +{ + return (read_reg(slv_addr, reg) & mask) == mask; +} + +static int read_reg16(uint8_t slv_addr, const uint16_t reg) +{ + int ret = 0, ret2 = 0; + ret = read_reg(slv_addr, reg); + + if (ret >= 0) { + ret = (ret & 0xFF) << 8; + ret2 = read_reg(slv_addr, reg + 1); + + if (ret2 < 0) { + ret = ret2; + } else { + ret |= ret2 & 0xFF; + } + } + + return ret; +} + + +static int write_reg(uint8_t slv_addr, const uint16_t reg, uint8_t value) +{ + int ret = 0; +#ifndef REG_DEBUG_ON + ret = SCCB_Write16(slv_addr, reg, value); +#else + int old_value = read_reg(slv_addr, reg); + + if (old_value < 0) { + return old_value; + } + + if ((uint8_t)old_value != value) { + ESP_LOGD(TAG, "NEW REG 0x%04x: 0x%02x to 0x%02x", reg, (uint8_t)old_value, value); + ret = SCCB_Write16(slv_addr, reg, value); + } else { + ESP_LOGD(TAG, "OLD REG 0x%04x: 0x%02x", reg, (uint8_t)old_value); + ret = SCCB_Write16(slv_addr, reg, value);//maybe not? + } + + if (ret < 0) { + ESP_LOGE(TAG, "WRITE REG 0x%04x FAILED: %d", reg, ret); + } + +#endif + return ret; +} + +static int set_reg_bits(uint8_t slv_addr, uint16_t reg, uint8_t offset, uint8_t mask, uint8_t value) +{ + int ret = 0; + uint8_t c_value, new_value; + ret = read_reg(slv_addr, reg); + + if (ret < 0) { + return ret; + } + + c_value = ret; + new_value = (c_value & ~(mask << offset)) | ((value & mask) << offset); + ret = write_reg(slv_addr, reg, new_value); + return ret; +} + +static int write_regs(uint8_t slv_addr, const uint16_t (*regs)[2]) +{ + int i = 0, ret = 0; + + while (!ret && regs[i][0] != REGLIST_TAIL) { + if (regs[i][0] == REG_DLY) { + vTaskDelay(regs[i][1] / portTICK_PERIOD_MS); + } else { + ret = write_reg(slv_addr, regs[i][0], regs[i][1]); + } + + i++; + } + + return ret; +} + +static int write_reg16(uint8_t slv_addr, const uint16_t reg, uint16_t value) +{ + if (write_reg(slv_addr, reg, value >> 8) || write_reg(slv_addr, reg + 1, value)) { + return -1; + } + + return 0; +} + +static int write_addr_reg(uint8_t slv_addr, const uint16_t reg, uint16_t x_value, uint16_t y_value) +{ + if (write_reg16(slv_addr, reg, x_value) || write_reg16(slv_addr, reg + 2, y_value)) { + return -1; + } + + return 0; +} + +#define write_reg_bits(slv_addr, reg, mask, enable) set_reg_bits(slv_addr, reg, 0, mask, enable?mask:0) + +static int set_pll(sensor_t *sensor, bool bypass, uint8_t multiplier, uint8_t sys_div, uint8_t pre_div, bool root_2x, uint8_t seld5, bool pclk_manual, uint8_t pclk_div) +{ + return -1; +} + +static int set_ae_level(sensor_t *sensor, int level); + +static int reset(sensor_t *sensor) +{ + + int ret = 0; + // Software Reset: clear all registers and reset them to their default values + ret = write_reg(sensor->slv_addr, SYSTEM_CTROL0, 0x01); + + if (ret) { + ESP_LOGE(TAG, "Software Reset FAILED!"); + return ret; + } + + vTaskDelay(100 / portTICK_PERIOD_MS); + ret = write_regs(sensor->slv_addr, sensor_default_regs); //re-initial + + if (ret == 0) { + ESP_LOGD(TAG, "Camera defaults loaded"); + ret = set_ae_level(sensor, 0); + vTaskDelay(100 / portTICK_PERIOD_MS); + } + + return ret; +} + +static int set_pixformat(sensor_t *sensor, pixformat_t pixformat) +{ + int ret = 0; + const uint16_t (*regs)[2]; + + switch (pixformat) { + case PIXFORMAT_YUV422: + regs = sensor_fmt_yuv422; + break; + + case PIXFORMAT_GRAYSCALE: + regs = sensor_fmt_grayscale; + break; + + case PIXFORMAT_RGB565: + case PIXFORMAT_RGB888: + regs = sensor_fmt_rgb565; + break; + + case PIXFORMAT_JPEG: + regs = sensor_fmt_jpeg; + break; + + case PIXFORMAT_RAW: + regs = sensor_fmt_raw; + break; + + default: + ESP_LOGE(TAG, "Unsupported pixformat: %u", pixformat); + return -1; + } + + ret = write_regs(sensor->slv_addr, regs); + + if (ret == 0) { + sensor->pixformat = pixformat; + ESP_LOGD(TAG, "Set pixformat to: %u", pixformat); + } + + return ret; +} + +static int set_image_options(sensor_t *sensor) +{ + int ret = 0; + uint8_t reg20 = 0; + uint8_t reg21 = 0; + uint8_t reg4514 = 0; + uint8_t reg4514_test = 0; + + // V-Flip + if (sensor->status.vflip) { + reg20 |= 0x01; + reg4514_test |= 1; + } + + // H-Mirror + if (sensor->status.hmirror) { + reg21 |= 0x02; + reg4514_test |= 2; + } + + switch (reg4514_test) { + + } + + if (write_reg(sensor->slv_addr, TIMING_TC_REG20, reg20 | reg21)) { + ESP_LOGE(TAG, "Setting Image Options Failed"); + ret = -1; + } + + ESP_LOGD(TAG, "Set Image Options: Compression: %u, Binning: %u, V-Flip: %u, H-Mirror: %u, Reg-4514: 0x%02x", + sensor->pixformat == PIXFORMAT_JPEG, sensor->status.binning, sensor->status.vflip, sensor->status.hmirror, reg4514); + return ret; +} + +static int set_framesize(sensor_t *sensor, framesize_t framesize) +{ + int ret = 0; + + sensor->status.framesize = framesize; + ret = write_regs(sensor->slv_addr, sensor_default_regs); + + if (framesize == FRAMESIZE_QVGA) { + ESP_LOGD(TAG, "Set FRAMESIZE_QVGA"); + ret = write_regs(sensor->slv_addr, sensor_framesize_QVGA); +#if CONFIG_NT99141_SUPPORT_XSKIP + ESP_LOGD(TAG, "Set FRAMESIZE_QVGA: xskip mode"); + ret = write_regs(sensor->slv_addr, sensor_framesize_QVGA_xskip); +#elif CONFIG_NT99141_SUPPORT_CROP + ESP_LOGD(TAG, "Set FRAMESIZE_QVGA: crop mode"); + ret = write_regs(sensor->slv_addr, sensor_framesize_QVGA_crop); +#endif + } else if (framesize == FRAMESIZE_VGA) { + ESP_LOGD(TAG, "Set FRAMESIZE_VGA"); + // ret = write_regs(sensor->slv_addr, sensor_framesize_VGA); + ret = write_regs(sensor->slv_addr, sensor_framesize_VGA_xyskip);// Resolution:640*360 This configuration is equally-scaled without deforming +#ifdef CONFIG_NT99141_SUPPORT_XSKIP + ESP_LOGD(TAG, "Set FRAMESIZE_QVGA: xskip mode"); + ret = write_regs(sensor->slv_addr, sensor_framesize_VGA_xskip); +#elif CONFIG_NT99141_SUPPORT_CROP + ESP_LOGD(TAG, "Set FRAMESIZE_QVGA: crop mode"); + ret = write_regs(sensor->slv_addr, sensor_framesize_VGA_crop); +#endif + } else if (framesize >= FRAMESIZE_HD) { + ESP_LOGD(TAG, "Set FRAMESIZE_HD"); + ret = write_regs(sensor->slv_addr, sensor_framesize_HD); + } else { + ESP_LOGD(TAG, "Dont suppost this size, Set FRAMESIZE_VGA"); + ret = write_regs(sensor->slv_addr, sensor_framesize_VGA); + } + + return ret; +} + +static int set_hmirror(sensor_t *sensor, int enable) +{ + int ret = 0; + sensor->status.hmirror = enable; + ret = set_image_options(sensor); + + if (ret == 0) { + ESP_LOGD(TAG, "Set h-mirror to: %d", enable); + } + + return ret; +} + +static int set_vflip(sensor_t *sensor, int enable) +{ + int ret = 0; + sensor->status.vflip = enable; + ret = set_image_options(sensor); + + if (ret == 0) { + ESP_LOGD(TAG, "Set v-flip to: %d", enable); + } + + return ret; +} + +static int set_quality(sensor_t *sensor, int qs) +{ + int ret = 0; + ret = write_reg(sensor->slv_addr, COMPRESSION_CTRL07, qs & 0x3f); + + if (ret == 0) { + sensor->status.quality = qs; + ESP_LOGD(TAG, "Set quality to: %d", qs); + } + + return ret; +} + +static int set_colorbar(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = write_reg_bits(sensor->slv_addr, PRE_ISP_TEST_SETTING_1, TEST_COLOR_BAR, enable); + + if (ret == 0) { + sensor->status.colorbar = enable; + ESP_LOGD(TAG, "Set colorbar to: %d", enable); + } + + return ret; +} + +static int set_gain_ctrl(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = write_reg_bits(sensor->slv_addr, 0x32bb, 0x87, enable); + + if (ret == 0) { + ESP_LOGD(TAG, "Set gain_ctrl to: %d", enable); + sensor->status.agc = enable; + } + + return ret; +} + +static int set_exposure_ctrl(sensor_t *sensor, int enable) +{ + int ret = 0; + int data = 0; + // ret = write_reg_bits(sensor->slv_addr, 0x32bb, 0x87, enable); + data = read_reg(sensor->slv_addr, 0x3201); + ESP_LOGD(TAG, "set_exposure_ctrl:enable"); + if (enable) { + ESP_LOGD(TAG, "set_exposure_ctrl:enable"); + ret = write_reg(sensor->slv_addr, 0x3201, (1 << 5) | data); + } else { + ESP_LOGD(TAG, "set_exposure_ctrl:disable"); + ret = write_reg(sensor->slv_addr, 0x3201, (~(1 << 5)) & data); + } + + if (ret == 0) { + ESP_LOGD(TAG, "Set exposure_ctrl to: %d", enable); + sensor->status.aec = enable; + } + + return ret; +} + +static int set_whitebal(sensor_t *sensor, int enable) +{ + int ret = 0; + + if (ret == 0) { + ESP_LOGD(TAG, "Set awb to: %d", enable); + sensor->status.awb = enable; + } + + return ret; +} + +//Advanced AWB +static int set_dcw_dsp(sensor_t *sensor, int enable) +{ + int ret = 0; + + if (ret == 0) { + ESP_LOGD(TAG, "Set dcw to: %d", enable); + sensor->status.dcw = enable; + } + + return ret; +} + +//night mode enable +static int set_aec2(sensor_t *sensor, int enable) +{ + int ret = 0; + + if (ret == 0) { + ESP_LOGD(TAG, "Set aec2 to: %d", enable); + sensor->status.aec2 = enable; + } + + return ret; +} + +static int set_bpc_dsp(sensor_t *sensor, int enable) +{ + int ret = 0; + + if (ret == 0) { + ESP_LOGD(TAG, "Set bpc to: %d", enable); + sensor->status.bpc = enable; + } + + return ret; +} + +static int set_wpc_dsp(sensor_t *sensor, int enable) +{ + int ret = 0; + + if (ret == 0) { + ESP_LOGD(TAG, "Set wpc to: %d", enable); + sensor->status.wpc = enable; + } + + return ret; +} + +//Gamma enable +static int set_raw_gma_dsp(sensor_t *sensor, int enable) +{ + int ret = 0; + + if (ret == 0) { + ESP_LOGD(TAG, "Set raw_gma to: %d", enable); + sensor->status.raw_gma = enable; + } + + return ret; +} + +static int set_lenc_dsp(sensor_t *sensor, int enable) +{ + int ret = 0; + + if (ret == 0) { + ESP_LOGD(TAG, "Set lenc to: %d", enable); + sensor->status.lenc = enable; + } + + return ret; +} + +static int get_agc_gain(sensor_t *sensor) +{ + ESP_LOGD(TAG, "get_agc_gain can not be configured at present"); + return 0; +} + +//real gain +static int set_agc_gain(sensor_t *sensor, int gain) +{ + ESP_LOGD(TAG, "set_agc_gain can not be configured at present"); + // ESP_LOGD(TAG, "GAIN = %d\n", gain); + int cnt = gain / 2; + + switch (cnt) { + case 0: + ESP_LOGD(TAG, "set_agc_gain: 1x"); + write_reg(sensor->slv_addr, 0X301D, 0X00); + break; + + case 1: + ESP_LOGD(TAG,"set_agc_gain: 2x"); + write_reg(sensor->slv_addr, 0X301D, 0X0F); + break; + + case 2: + ESP_LOGD(TAG,"set_agc_gain: 4x"); + write_reg(sensor->slv_addr, 0X301D, 0X2F); + break; + + case 3: + ESP_LOGD(TAG,"set_agc_gain: 6x"); + write_reg(sensor->slv_addr, 0X301D, 0X37); + break; + + case 4: + ESP_LOGD(TAG,"set_agc_gain: 8x"); + write_reg(sensor->slv_addr, 0X301D, 0X3F); + break; + + default: + ESP_LOGD(TAG,"fail set_agc_gain"); + break; + } + + return 0; +} + +static int get_aec_value(sensor_t *sensor) +{ + ESP_LOGD(TAG, "get_aec_value can not be configured at present"); + return 0; +} + +static int set_aec_value(sensor_t *sensor, int value) +{ + ESP_LOGD(TAG, "set_aec_value can not be configured at present"); + int ret = 0; + // ESP_LOGD(TAG, " set_aec_value to: %d", value); + ret = write_reg_bits(sensor->slv_addr, 0x3012, 0x00, (value >> 8) & 0xff); + ret = write_reg_bits(sensor->slv_addr, 0x3013, 0x01, value & 0xff); + + if (ret == 0) { + ESP_LOGD(TAG, " set_aec_value to: %d", value); + // sensor->status.aec = enable; + } + + return ret; +} + +static int set_ae_level(sensor_t *sensor, int level) +{ + ESP_LOGD(TAG, "set_ae_level can not be configured at present"); + int ret = 0; + + if (level < 0) { + level = 0; + } else if (level > 9) { + level = 9; + } + + for (int i = 0; i < 5; i++) { + ret += write_reg(sensor->slv_addr, sensor_ae_level[ 5 * level + i ][0], sensor_ae_level[5 * level + i ][1]); + } + + if (ret) { + ESP_LOGE(TAG, " fail to set ae level: %d", ret); + } + + return 0; +} + +static int set_wb_mode(sensor_t *sensor, int mode) +{ + int ret = 0; + + if (mode < 0 || mode > 4) { + return -1; + } + + ret = write_reg(sensor->slv_addr, 0x3201, (mode != 0)); + + if (ret) { + return ret; + } + + switch (mode) { + case 1://Sunny + ret = write_reg16(sensor->slv_addr, 0x3290, 0x01) + || write_reg16(sensor->slv_addr, 0x3291, 0x38) + || write_reg16(sensor->slv_addr, 0x3296, 0x01) + || write_reg16(sensor->slv_addr, 0x3297, 0x68) + || write_reg16(sensor->slv_addr, 0x3060, 0x01); + + break; + + case 2://Cloudy + + ret = write_reg16(sensor->slv_addr, 0x3290, 0x01) + || write_reg16(sensor->slv_addr, 0x3291, 0x51) + || write_reg16(sensor->slv_addr, 0x3296, 0x01) + || write_reg16(sensor->slv_addr, 0x3297, 0x00) + || write_reg16(sensor->slv_addr, 0x3060, 0x01); + break; + + case 3://INCANDESCENCE] + ret = write_reg16(sensor->slv_addr, 0x3290, 0x01) + || write_reg16(sensor->slv_addr, 0x3291, 0x30) + || write_reg16(sensor->slv_addr, 0x3296, 0x01) + || write_reg16(sensor->slv_addr, 0x3297, 0xCB) + || write_reg16(sensor->slv_addr, 0x3060, 0x01); + break; + + case 4://FLUORESCENT + ret = write_reg16(sensor->slv_addr, 0x3290, 0x01) + || write_reg16(sensor->slv_addr, 0x3291, 0x70) + || write_reg16(sensor->slv_addr, 0x3296, 0x01) + || write_reg16(sensor->slv_addr, 0x3297, 0xFF) + || write_reg16(sensor->slv_addr, 0x3060, 0x01); + break; + + default://AUTO + break; + } + + if (ret == 0) { + ESP_LOGD(TAG, "Set wb_mode to: %d", mode); + sensor->status.wb_mode = mode; + } + + return ret; +} + +static int set_awb_gain_dsp(sensor_t *sensor, int enable) +{ + int ret = 0; + int old_mode = sensor->status.wb_mode; + int mode = enable ? old_mode : 0; + + ret = set_wb_mode(sensor, mode); + + if (ret == 0) { + sensor->status.wb_mode = old_mode; + ESP_LOGD(TAG, "Set awb_gain to: %d", enable); + sensor->status.awb_gain = enable; + } + + return ret; +} + +static int set_special_effect(sensor_t *sensor, int effect) +{ + int ret = 0; + + if (effect < 0 || effect > 6) { + return -1; + } + + uint8_t *regs = (uint8_t *)sensor_special_effects[effect]; + ret = write_reg(sensor->slv_addr, 0x32F1, regs[0]) + || write_reg(sensor->slv_addr, 0x32F4, regs[1]) + || write_reg(sensor->slv_addr, 0x32F5, regs[2]) + || write_reg(sensor->slv_addr, 0x3060, regs[3]); + + if (ret == 0) { + ESP_LOGD(TAG, "Set special_effect to: %d", effect); + sensor->status.special_effect = effect; + } + + return ret; +} + +static int set_brightness(sensor_t *sensor, int level) +{ + int ret = 0; + uint8_t value = 0; + + switch (level) { + case 3: + value = 0xA0; + break; + + case 2: + value = 0x90; + break; + + case 1: + value = 0x88; + break; + + case -1: + value = 0x78; + break; + + case -2: + value = 0x70; + break; + + case -3: + value = 0x60; + break; + + default: // 0 + break; + } + + ret = write_reg(sensor->slv_addr, 0x32F2, value); + + if (ret == 0) { + ESP_LOGD(TAG, "Set brightness to: %d", level); + sensor->status.brightness = level; + } + + return ret; +} + +static int set_contrast(sensor_t *sensor, int level) +{ + int ret = 0; + uint8_t value1 = 0, value2 = 0 ; + + switch (level) { + case 3: + value1 = 0xD0; + value2 = 0xB0; + break; + + case 2: + value1 = 0xE0; + value2 = 0xA0; + break; + + case 1: + value1 = 0xF0; + value2 = 0x90; + break; + + case 0: + value1 = 0x00; + value2 = 0x80; + break; + + case -1: + value1 = 0x10; + value2 = 0x70; + break; + + case -2: + value1 = 0x20; + value2 = 0x60; + break; + + case -3: + value1 = 0x30; + value2 = 0x50; + break; + + default: // 0 + break; + } + + ret = write_reg(sensor->slv_addr, 0x32FC, value1); + ret = write_reg(sensor->slv_addr, 0x32F2, value2); + ret = write_reg(sensor->slv_addr, 0x3060, 0x01); + + if (ret == 0) { + ESP_LOGD(TAG, "Set contrast to: %d", level); + sensor->status.contrast = level; + } + + return ret; +} + +static int set_saturation(sensor_t *sensor, int level) +{ + int ret = 0; + + if (level > 4 || level < -4) { + return -1; + } + + uint8_t *regs = (uint8_t *)sensor_saturation_levels[level + 4]; + { + ret = write_reg(sensor->slv_addr, 0x32F3, regs[0]); + + if (ret) { + return ret; + } + } + + if (ret == 0) { + ESP_LOGD(TAG, "Set saturation to: %d", level); + sensor->status.saturation = level; + } + + return ret; +} + +static int set_sharpness(sensor_t *sensor, int level) +{ + int ret = 0; + + if (level > 3 || level < -3) { + return -1; + } + + uint8_t mt_offset_2 = (level + 3) * 8; + uint8_t mt_offset_1 = mt_offset_2 + 1; + + ret = write_reg_bits(sensor->slv_addr, 0x5308, 0x40, false)//0x40 means auto + || write_reg(sensor->slv_addr, 0x5300, 0x10) + || write_reg(sensor->slv_addr, 0x5301, 0x10) + || write_reg(sensor->slv_addr, 0x5302, mt_offset_1) + || write_reg(sensor->slv_addr, 0x5303, mt_offset_2) + || write_reg(sensor->slv_addr, 0x5309, 0x10) + || write_reg(sensor->slv_addr, 0x530a, 0x10) + || write_reg(sensor->slv_addr, 0x530b, 0x04) + || write_reg(sensor->slv_addr, 0x530c, 0x06); + + if (ret == 0) { + ESP_LOGD(TAG, "Set sharpness to: %d", level); + sensor->status.sharpness = level; + } + + return ret; +} + +static int set_gainceiling(sensor_t *sensor, gainceiling_t level) +{ + ESP_LOGD(TAG, "set_gainceiling can not be configured at present"); + return 0; +} + +static int get_denoise(sensor_t *sensor) +{ + + return (read_reg(sensor->slv_addr, 0x5306) / 4) + 1; +} + +static int set_denoise(sensor_t *sensor, int level) +{ + ESP_LOGD(TAG, "set_denoise can not be configured at present"); + return 0; +} + +static int get_reg(sensor_t *sensor, int reg, int mask) +{ + int ret = 0, ret2 = 0; + + if (mask > 0xFF) { + ret = read_reg16(sensor->slv_addr, reg); + + if (ret >= 0 && mask > 0xFFFF) { + ret2 = read_reg(sensor->slv_addr, reg + 2); + + if (ret2 >= 0) { + ret = (ret << 8) | ret2 ; + } else { + ret = ret2; + } + } + } else { + ret = read_reg(sensor->slv_addr, reg); + } + + if (ret > 0) { + ret &= mask; + } + + return ret; +} + +static int set_reg(sensor_t *sensor, int reg, int mask, int value) +{ + int ret = 0, ret2 = 0; + + if (mask > 0xFF) { + ret = read_reg16(sensor->slv_addr, reg); + + if (ret >= 0 && mask > 0xFFFF) { + ret2 = read_reg(sensor->slv_addr, reg + 2); + + if (ret2 >= 0) { + ret = (ret << 8) | ret2 ; + } else { + ret = ret2; + } + } + } else { + ret = read_reg(sensor->slv_addr, reg); + } + + if (ret < 0) { + return ret; + } + + value = (ret & ~mask) | (value & mask); + + if (mask > 0xFFFF) { + ret = write_reg16(sensor->slv_addr, reg, value >> 8); + + if (ret >= 0) { + ret = write_reg(sensor->slv_addr, reg + 2, value & 0xFF); + } + } else if (mask > 0xFF) { + ret = write_reg16(sensor->slv_addr, reg, value); + } else { + ret = write_reg(sensor->slv_addr, reg, value); + } + + return ret; +} + +static int set_res_raw(sensor_t *sensor, int startX, int startY, int endX, int endY, int offsetX, int offsetY, int totalX, int totalY, int outputX, int outputY, bool scale, bool binning) +{ + int ret = 0; + ret = write_addr_reg(sensor->slv_addr, X_ADDR_ST_H, startX, startY) + || write_addr_reg(sensor->slv_addr, X_ADDR_END_H, endX, endY) + || write_addr_reg(sensor->slv_addr, X_OFFSET_H, offsetX, offsetY) + || write_addr_reg(sensor->slv_addr, X_TOTAL_SIZE_H, totalX, totalY) + || write_addr_reg(sensor->slv_addr, X_OUTPUT_SIZE_H, outputX, outputY); + + if (!ret) { + sensor->status.scale = scale; + sensor->status.binning = binning; + ret = set_image_options(sensor); + } + + return ret; +} + +static int _set_pll(sensor_t *sensor, int bypass, int multiplier, int sys_div, int root_2x, int pre_div, int seld5, int pclk_manual, int pclk_div) +{ + return set_pll(sensor, bypass > 0, multiplier, sys_div, pre_div, root_2x > 0, seld5, pclk_manual > 0, pclk_div); +} + +static int set_xclk(sensor_t *sensor, int timer, int xclk) +{ + int ret = 0; + if (xclk > 10) + { + ESP_LOGE(TAG, "only XCLK under 10MHz is supported, and XCLK is now set to 10M"); + xclk = 10; + } + sensor->xclk_freq_hz = xclk * 1000000U; + ret = xclk_timer_conf(timer, sensor->xclk_freq_hz); + return ret; +} + +int nt99141_detect(int slv_addr, sensor_id_t *id) +{ + if (NT99141_SCCB_ADDR == slv_addr) { + SCCB_Write16(slv_addr, 0x3008, 0x01);//bank sensor + uint16_t h = SCCB_Read16(slv_addr, 0x3000); + uint16_t l = SCCB_Read16(slv_addr, 0x3001); + uint16_t PID = (h<<8) | l; + if (NT99141_PID == PID) { + id->PID = PID; + return PID; + } else { + ESP_LOGI(TAG, "Mismatch PID=0x%x", PID); + } + } + return 0; +} + +static int init_status(sensor_t *sensor) +{ + sensor->status.brightness = 0; + sensor->status.contrast = 0; + sensor->status.saturation = 0; + sensor->status.sharpness = (read_reg(sensor->slv_addr, 0x3301)); + sensor->status.denoise = get_denoise(sensor); + sensor->status.ae_level = 0; + sensor->status.gainceiling = read_reg16(sensor->slv_addr, 0x32F0) & 0xFF; + sensor->status.awb = check_reg_mask(sensor->slv_addr, ISP_CONTROL_01, 0x10); + sensor->status.dcw = !check_reg_mask(sensor->slv_addr, 0x5183, 0x80); + sensor->status.agc = !check_reg_mask(sensor->slv_addr, AEC_PK_MANUAL, AEC_PK_MANUAL_AGC_MANUALEN); + sensor->status.aec = !check_reg_mask(sensor->slv_addr, AEC_PK_MANUAL, AEC_PK_MANUAL_AEC_MANUALEN); + sensor->status.hmirror = check_reg_mask(sensor->slv_addr, TIMING_TC_REG21, TIMING_TC_REG21_HMIRROR); + sensor->status.vflip = check_reg_mask(sensor->slv_addr, TIMING_TC_REG20, TIMING_TC_REG20_VFLIP); + sensor->status.colorbar = check_reg_mask(sensor->slv_addr, PRE_ISP_TEST_SETTING_1, TEST_COLOR_BAR); + sensor->status.bpc = check_reg_mask(sensor->slv_addr, 0x5000, 0x04); + sensor->status.wpc = check_reg_mask(sensor->slv_addr, 0x5000, 0x02); + sensor->status.raw_gma = check_reg_mask(sensor->slv_addr, 0x5000, 0x20); + sensor->status.lenc = check_reg_mask(sensor->slv_addr, 0x5000, 0x80); + sensor->status.quality = read_reg(sensor->slv_addr, COMPRESSION_CTRL07) & 0x3f; + sensor->status.special_effect = 0; + sensor->status.wb_mode = 0; + sensor->status.awb_gain = check_reg_mask(sensor->slv_addr, 0x3000, 0x01); + sensor->status.agc_gain = get_agc_gain(sensor); + sensor->status.aec_value = get_aec_value(sensor); + sensor->status.aec2 = check_reg_mask(sensor->slv_addr, 0x3000, 0x04); + return 0; +} + +int nt99141_init(sensor_t *sensor) +{ + sensor->reset = reset; + sensor->set_pixformat = set_pixformat; + sensor->set_framesize = set_framesize; + sensor->set_contrast = set_contrast; + sensor->set_brightness = set_brightness; + sensor->set_saturation = set_saturation; + sensor->set_sharpness = set_sharpness; + sensor->set_gainceiling = set_gainceiling; + sensor->set_quality = set_quality; + sensor->set_colorbar = set_colorbar; + sensor->set_gain_ctrl = set_gain_ctrl; + sensor->set_exposure_ctrl = set_exposure_ctrl; + sensor->set_whitebal = set_whitebal; + sensor->set_hmirror = set_hmirror; + sensor->set_vflip = set_vflip; + sensor->init_status = init_status; + sensor->set_aec2 = set_aec2; + sensor->set_aec_value = set_aec_value; + sensor->set_special_effect = set_special_effect; + sensor->set_wb_mode = set_wb_mode; + sensor->set_ae_level = set_ae_level; + sensor->set_dcw = set_dcw_dsp; + sensor->set_bpc = set_bpc_dsp; + sensor->set_wpc = set_wpc_dsp; + sensor->set_awb_gain = set_awb_gain_dsp; + sensor->set_agc_gain = set_agc_gain; + sensor->set_raw_gma = set_raw_gma_dsp; + sensor->set_lenc = set_lenc_dsp; + sensor->set_denoise = set_denoise; + + sensor->get_reg = get_reg; + sensor->set_reg = set_reg; + sensor->set_res_raw = set_res_raw; + sensor->set_pll = _set_pll; + sensor->set_xclk = set_xclk; + return 0; +} diff --git a/lib/libesp32_div/esp32-camera/sensors/ov2640.c b/lib/libesp32_div/esp32-camera/sensors/ov2640.c new file mode 100644 index 000000000..7e3d77174 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/ov2640.c @@ -0,0 +1,612 @@ +/* + * This file is part of the OpenMV project. + * Copyright (c) 2013/2014 Ibrahim Abdelkader + * This work is licensed under the MIT license, see the file LICENSE for details. + * + * OV2640 driver. + * + */ +#include +#include +#include +#include "sccb.h" +#include "xclk.h" +#include "ov2640.h" +#include "ov2640_regs.h" +#include "ov2640_settings.h" +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" + +#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) +#include "esp32-hal-log.h" +#else +#include "esp_log.h" +static const char* TAG = "ov2640"; +#endif + +static volatile ov2640_bank_t reg_bank = BANK_MAX; +static int set_bank(sensor_t *sensor, ov2640_bank_t bank) +{ + int res = 0; + if (bank != reg_bank) { + reg_bank = bank; + res = SCCB_Write(sensor->slv_addr, BANK_SEL, bank); + } + return res; +} + +static int write_regs(sensor_t *sensor, const uint8_t (*regs)[2]) +{ + int i=0, res = 0; + while (regs[i][0]) { + if (regs[i][0] == BANK_SEL) { + res = set_bank(sensor, regs[i][1]); + } else { + res = SCCB_Write(sensor->slv_addr, regs[i][0], regs[i][1]); + } + if (res) { + return res; + } + i++; + } + return res; +} + +static int write_reg(sensor_t *sensor, ov2640_bank_t bank, uint8_t reg, uint8_t value) +{ + int ret = set_bank(sensor, bank); + if(!ret) { + ret = SCCB_Write(sensor->slv_addr, reg, value); + } + return ret; +} + +static int set_reg_bits(sensor_t *sensor, uint8_t bank, uint8_t reg, uint8_t offset, uint8_t mask, uint8_t value) +{ + int ret = 0; + uint8_t c_value, new_value; + + ret = set_bank(sensor, bank); + if(ret) { + return ret; + } + c_value = SCCB_Read(sensor->slv_addr, reg); + new_value = (c_value & ~(mask << offset)) | ((value & mask) << offset); + ret = SCCB_Write(sensor->slv_addr, reg, new_value); + return ret; +} + +static int read_reg(sensor_t *sensor, ov2640_bank_t bank, uint8_t reg) +{ + if(set_bank(sensor, bank)){ + return 0; + } + return SCCB_Read(sensor->slv_addr, reg); +} + +static uint8_t get_reg_bits(sensor_t *sensor, uint8_t bank, uint8_t reg, uint8_t offset, uint8_t mask) +{ + return (read_reg(sensor, bank, reg) >> offset) & mask; +} + +static int write_reg_bits(sensor_t *sensor, uint8_t bank, uint8_t reg, uint8_t mask, int enable) +{ + return set_reg_bits(sensor, bank, reg, 0, mask, enable?mask:0); +} + +#define WRITE_REGS_OR_RETURN(regs) ret = write_regs(sensor, regs); if(ret){return ret;} +#define WRITE_REG_OR_RETURN(bank, reg, val) ret = write_reg(sensor, bank, reg, val); if(ret){return ret;} +#define SET_REG_BITS_OR_RETURN(bank, reg, offset, mask, val) ret = set_reg_bits(sensor, bank, reg, offset, mask, val); if(ret){return ret;} + +static int reset(sensor_t *sensor) +{ + int ret = 0; + WRITE_REG_OR_RETURN(BANK_SENSOR, COM7, COM7_SRST); + vTaskDelay(10 / portTICK_PERIOD_MS); + WRITE_REGS_OR_RETURN(ov2640_settings_cif); + return ret; +} + +static int set_pixformat(sensor_t *sensor, pixformat_t pixformat) +{ + int ret = 0; + sensor->pixformat = pixformat; + switch (pixformat) { + case PIXFORMAT_RGB565: + case PIXFORMAT_RGB888: + WRITE_REGS_OR_RETURN(ov2640_settings_rgb565); + break; + case PIXFORMAT_YUV422: + case PIXFORMAT_GRAYSCALE: + WRITE_REGS_OR_RETURN(ov2640_settings_yuv422); + break; + case PIXFORMAT_JPEG: + WRITE_REGS_OR_RETURN(ov2640_settings_jpeg3); + break; + default: + ret = -1; + break; + } + if(!ret) { + vTaskDelay(10 / portTICK_PERIOD_MS); + } + + return ret; +} + +static int set_window(sensor_t *sensor, ov2640_sensor_mode_t mode, int offset_x, int offset_y, int max_x, int max_y, int w, int h){ + int ret = 0; + const uint8_t (*regs)[2]; + ov2640_clk_t c; + c.reserved = 0; + + max_x /= 4; + max_y /= 4; + w /= 4; + h /= 4; + uint8_t win_regs[][2] = { + {BANK_SEL, BANK_DSP}, + {HSIZE, max_x & 0xFF}, + {VSIZE, max_y & 0xFF}, + {XOFFL, offset_x & 0xFF}, + {YOFFL, offset_y & 0xFF}, + {VHYX, ((max_y >> 1) & 0X80) | ((offset_y >> 4) & 0X70) | ((max_x >> 5) & 0X08) | ((offset_x >> 8) & 0X07)}, + {TEST, (max_x >> 2) & 0X80}, + {ZMOW, (w)&0xFF}, + {ZMOH, (h)&0xFF}, + {ZMHH, ((h>>6)&0x04)|((w>>8)&0x03)}, + {0, 0} + }; + + if (sensor->pixformat == PIXFORMAT_JPEG) { + c.clk_2x = 0; + c.clk_div = 0; + c.pclk_auto = 0; + c.pclk_div = 8; + if(mode == OV2640_MODE_UXGA) { + c.pclk_div = 12; + } + // if (sensor->xclk_freq_hz == 16000000) { + // c.pclk_div = c.pclk_div / 2; + // } + } else { +#if CONFIG_IDF_TARGET_ESP32 + c.clk_2x = 0; +#else + c.clk_2x = 1; +#endif + c.clk_div = 7; + c.pclk_auto = 1; + c.pclk_div = 8; + if (mode == OV2640_MODE_CIF) { + c.clk_div = 3; + } else if(mode == OV2640_MODE_UXGA) { + c.pclk_div = 12; + } + } + ESP_LOGI(TAG, "Set PLL: clk_2x: %u, clk_div: %u, pclk_auto: %u, pclk_div: %u", c.clk_2x, c.clk_div, c.pclk_auto, c.pclk_div); + + if (mode == OV2640_MODE_CIF) { + regs = ov2640_settings_to_cif; + } else if (mode == OV2640_MODE_SVGA) { + regs = ov2640_settings_to_svga; + } else { + regs = ov2640_settings_to_uxga; + } + + WRITE_REG_OR_RETURN(BANK_DSP, R_BYPASS, R_BYPASS_DSP_BYPAS); + WRITE_REGS_OR_RETURN(regs); + WRITE_REGS_OR_RETURN(win_regs); + WRITE_REG_OR_RETURN(BANK_SENSOR, CLKRC, c.clk); + WRITE_REG_OR_RETURN(BANK_DSP, R_DVP_SP, c.pclk); + WRITE_REG_OR_RETURN(BANK_DSP, R_BYPASS, R_BYPASS_DSP_EN); + + vTaskDelay(10 / portTICK_PERIOD_MS); + //required when changing resolution + set_pixformat(sensor, sensor->pixformat); + + return ret; +} + +static int set_framesize(sensor_t *sensor, framesize_t framesize) +{ + int ret = 0; + uint16_t w = resolution[framesize].width; + uint16_t h = resolution[framesize].height; + aspect_ratio_t ratio = resolution[framesize].aspect_ratio; + uint16_t max_x = ratio_table[ratio].max_x; + uint16_t max_y = ratio_table[ratio].max_y; + uint16_t offset_x = ratio_table[ratio].offset_x; + uint16_t offset_y = ratio_table[ratio].offset_y; + ov2640_sensor_mode_t mode = OV2640_MODE_UXGA; + + sensor->status.framesize = framesize; + + + + if (framesize <= FRAMESIZE_CIF) { + mode = OV2640_MODE_CIF; + max_x /= 4; + max_y /= 4; + offset_x /= 4; + offset_y /= 4; + if(max_y > 296){ + max_y = 296; + } + } else if (framesize <= FRAMESIZE_SVGA) { + mode = OV2640_MODE_SVGA; + max_x /= 2; + max_y /= 2; + offset_x /= 2; + offset_y /= 2; + } + + ret = set_window(sensor, mode, offset_x, offset_y, max_x, max_y, w, h); + return ret; +} + +static int set_contrast(sensor_t *sensor, int level) +{ + int ret=0; + level += 3; + if (level <= 0 || level > NUM_CONTRAST_LEVELS) { + return -1; + } + sensor->status.contrast = level-3; + for (int i=0; i<7; i++) { + WRITE_REG_OR_RETURN(BANK_DSP, contrast_regs[0][i], contrast_regs[level][i]); + } + return ret; +} + +static int set_brightness(sensor_t *sensor, int level) +{ + int ret=0; + level += 3; + if (level <= 0 || level > NUM_BRIGHTNESS_LEVELS) { + return -1; + } + sensor->status.brightness = level-3; + for (int i=0; i<5; i++) { + WRITE_REG_OR_RETURN(BANK_DSP, brightness_regs[0][i], brightness_regs[level][i]); + } + return ret; +} + +static int set_saturation(sensor_t *sensor, int level) +{ + int ret=0; + level += 3; + if (level <= 0 || level > NUM_SATURATION_LEVELS) { + return -1; + } + sensor->status.saturation = level-3; + for (int i=0; i<5; i++) { + WRITE_REG_OR_RETURN(BANK_DSP, saturation_regs[0][i], saturation_regs[level][i]); + } + return ret; +} + +static int set_special_effect(sensor_t *sensor, int effect) +{ + int ret=0; + effect++; + if (effect <= 0 || effect > NUM_SPECIAL_EFFECTS) { + return -1; + } + sensor->status.special_effect = effect-1; + for (int i=0; i<5; i++) { + WRITE_REG_OR_RETURN(BANK_DSP, special_effects_regs[0][i], special_effects_regs[effect][i]); + } + return ret; +} + +static int set_wb_mode(sensor_t *sensor, int mode) +{ + int ret=0; + if (mode < 0 || mode > NUM_WB_MODES) { + return -1; + } + sensor->status.wb_mode = mode; + SET_REG_BITS_OR_RETURN(BANK_DSP, 0XC7, 6, 1, mode?1:0); + if(mode) { + for (int i=0; i<3; i++) { + WRITE_REG_OR_RETURN(BANK_DSP, wb_modes_regs[0][i], wb_modes_regs[mode][i]); + } + } + return ret; +} + +static int set_ae_level(sensor_t *sensor, int level) +{ + int ret=0; + level += 3; + if (level <= 0 || level > NUM_AE_LEVELS) { + return -1; + } + sensor->status.ae_level = level-3; + for (int i=0; i<3; i++) { + WRITE_REG_OR_RETURN(BANK_SENSOR, ae_levels_regs[0][i], ae_levels_regs[level][i]); + } + return ret; +} + +static int set_quality(sensor_t *sensor, int quality) +{ + if(quality < 0) { + quality = 0; + } else if(quality > 63) { + quality = 63; + } + sensor->status.quality = quality; + return write_reg(sensor, BANK_DSP, QS, quality); +} + +static int set_agc_gain(sensor_t *sensor, int gain) +{ + if(gain < 0) { + gain = 0; + } else if(gain > 30) { + gain = 30; + } + sensor->status.agc_gain = gain; + return write_reg(sensor, BANK_SENSOR, GAIN, agc_gain_tbl[gain]); +} + +static int set_gainceiling_sensor(sensor_t *sensor, gainceiling_t gainceiling) +{ + sensor->status.gainceiling = gainceiling; + //return write_reg(sensor, BANK_SENSOR, COM9, COM9_AGC_SET(gainceiling)); + return set_reg_bits(sensor, BANK_SENSOR, COM9, 5, 7, gainceiling); +} + +static int set_aec_value(sensor_t *sensor, int value) +{ + if(value < 0) { + value = 0; + } else if(value > 1200) { + value = 1200; + } + sensor->status.aec_value = value; + return set_reg_bits(sensor, BANK_SENSOR, REG04, 0, 3, value & 0x3) + || write_reg(sensor, BANK_SENSOR, AEC, (value >> 2) & 0xFF) + || set_reg_bits(sensor, BANK_SENSOR, REG45, 0, 0x3F, value >> 10); +} + +static int set_aec2(sensor_t *sensor, int enable) +{ + sensor->status.aec2 = enable; + return set_reg_bits(sensor, BANK_DSP, CTRL0, 6, 1, enable?0:1); +} + +static int set_colorbar(sensor_t *sensor, int enable) +{ + sensor->status.colorbar = enable; + return write_reg_bits(sensor, BANK_SENSOR, COM7, COM7_COLOR_BAR, enable?1:0); +} + +static int set_agc_sensor(sensor_t *sensor, int enable) +{ + sensor->status.agc = enable; + return write_reg_bits(sensor, BANK_SENSOR, COM8, COM8_AGC_EN, enable?1:0); +} + +static int set_aec_sensor(sensor_t *sensor, int enable) +{ + sensor->status.aec = enable; + return write_reg_bits(sensor, BANK_SENSOR, COM8, COM8_AEC_EN, enable?1:0); +} + +static int set_hmirror_sensor(sensor_t *sensor, int enable) +{ + sensor->status.hmirror = enable; + return write_reg_bits(sensor, BANK_SENSOR, REG04, REG04_HFLIP_IMG, enable?1:0); +} + +static int set_vflip_sensor(sensor_t *sensor, int enable) +{ + int ret = 0; + sensor->status.vflip = enable; + ret = write_reg_bits(sensor, BANK_SENSOR, REG04, REG04_VREF_EN, enable?1:0); + return ret & write_reg_bits(sensor, BANK_SENSOR, REG04, REG04_VFLIP_IMG, enable?1:0); +} + +static int set_raw_gma_dsp(sensor_t *sensor, int enable) +{ + sensor->status.raw_gma = enable; + return set_reg_bits(sensor, BANK_DSP, CTRL1, 5, 1, enable?1:0); +} + +static int set_awb_dsp(sensor_t *sensor, int enable) +{ + sensor->status.awb = enable; + return set_reg_bits(sensor, BANK_DSP, CTRL1, 3, 1, enable?1:0); +} + +static int set_awb_gain_dsp(sensor_t *sensor, int enable) +{ + sensor->status.awb_gain = enable; + return set_reg_bits(sensor, BANK_DSP, CTRL1, 2, 1, enable?1:0); +} + +static int set_lenc_dsp(sensor_t *sensor, int enable) +{ + sensor->status.lenc = enable; + return set_reg_bits(sensor, BANK_DSP, CTRL1, 1, 1, enable?1:0); +} + +static int set_dcw_dsp(sensor_t *sensor, int enable) +{ + sensor->status.dcw = enable; + return set_reg_bits(sensor, BANK_DSP, CTRL2, 5, 1, enable?1:0); +} + +static int set_bpc_dsp(sensor_t *sensor, int enable) +{ + sensor->status.bpc = enable; + return set_reg_bits(sensor, BANK_DSP, CTRL3, 7, 1, enable?1:0); +} + +static int set_wpc_dsp(sensor_t *sensor, int enable) +{ + sensor->status.wpc = enable; + return set_reg_bits(sensor, BANK_DSP, CTRL3, 6, 1, enable?1:0); +} + +//unsupported +static int set_sharpness(sensor_t *sensor, int level) +{ + return -1; +} + +static int set_denoise(sensor_t *sensor, int level) +{ + return -1; +} + +static int get_reg(sensor_t *sensor, int reg, int mask) +{ + int ret = read_reg(sensor, (reg >> 8) & 0x01, reg & 0xFF); + if(ret > 0){ + ret &= mask; + } + return ret; +} + +static int set_reg(sensor_t *sensor, int reg, int mask, int value) +{ + int ret = 0; + ret = read_reg(sensor, (reg >> 8) & 0x01, reg & 0xFF); + if(ret < 0){ + return ret; + } + value = (ret & ~mask) | (value & mask); + ret = write_reg(sensor, (reg >> 8) & 0x01, reg & 0xFF, value); + return ret; +} + +static int set_res_raw(sensor_t *sensor, int startX, int startY, int endX, int endY, int offsetX, int offsetY, int totalX, int totalY, int outputX, int outputY, bool scale, bool binning) +{ + return set_window(sensor, (ov2640_sensor_mode_t)startX, offsetX, offsetY, totalX, totalY, outputX, outputY); +} + +static int _set_pll(sensor_t *sensor, int bypass, int multiplier, int sys_div, int root_2x, int pre_div, int seld5, int pclk_manual, int pclk_div) +{ + return -1; +} + +static int set_xclk(sensor_t *sensor, int timer, int xclk) +{ + int ret = 0; + sensor->xclk_freq_hz = xclk * 1000000U; + ret = xclk_timer_conf(timer, sensor->xclk_freq_hz); + return ret; +} + +static int init_status(sensor_t *sensor){ + sensor->status.brightness = 0; + sensor->status.contrast = 0; + sensor->status.saturation = 0; + sensor->status.ae_level = 0; + sensor->status.special_effect = 0; + sensor->status.wb_mode = 0; + + sensor->status.agc_gain = 30; + int agc_gain = read_reg(sensor, BANK_SENSOR, GAIN); + for (int i=0; i<30; i++){ + if(agc_gain >= agc_gain_tbl[i] && agc_gain < agc_gain_tbl[i+1]){ + sensor->status.agc_gain = i; + break; + } + } + + sensor->status.aec_value = ((uint16_t)get_reg_bits(sensor, BANK_SENSOR, REG45, 0, 0x3F) << 10) + | ((uint16_t)read_reg(sensor, BANK_SENSOR, AEC) << 2) + | get_reg_bits(sensor, BANK_SENSOR, REG04, 0, 3);//0 - 1200 + sensor->status.quality = read_reg(sensor, BANK_DSP, QS); + sensor->status.gainceiling = get_reg_bits(sensor, BANK_SENSOR, COM9, 5, 7); + + sensor->status.awb = get_reg_bits(sensor, BANK_DSP, CTRL1, 3, 1); + sensor->status.awb_gain = get_reg_bits(sensor, BANK_DSP, CTRL1, 2, 1); + sensor->status.aec = get_reg_bits(sensor, BANK_SENSOR, COM8, 0, 1); + sensor->status.aec2 = get_reg_bits(sensor, BANK_DSP, CTRL0, 6, 1); + sensor->status.agc = get_reg_bits(sensor, BANK_SENSOR, COM8, 2, 1); + sensor->status.bpc = get_reg_bits(sensor, BANK_DSP, CTRL3, 7, 1); + sensor->status.wpc = get_reg_bits(sensor, BANK_DSP, CTRL3, 6, 1); + sensor->status.raw_gma = get_reg_bits(sensor, BANK_DSP, CTRL1, 5, 1); + sensor->status.lenc = get_reg_bits(sensor, BANK_DSP, CTRL1, 1, 1); + sensor->status.hmirror = get_reg_bits(sensor, BANK_SENSOR, REG04, 7, 1); + sensor->status.vflip = get_reg_bits(sensor, BANK_SENSOR, REG04, 6, 1); + sensor->status.dcw = get_reg_bits(sensor, BANK_DSP, CTRL2, 5, 1); + sensor->status.colorbar = get_reg_bits(sensor, BANK_SENSOR, COM7, 1, 1); + + sensor->status.sharpness = 0;//not supported + sensor->status.denoise = 0; + return 0; +} + +int ov2640_detect(int slv_addr, sensor_id_t *id) +{ + if (OV2640_SCCB_ADDR == slv_addr) { + SCCB_Write(slv_addr, 0xFF, 0x01);//bank sensor + uint16_t PID = SCCB_Read(slv_addr, 0x0A); + if (OV2640_PID == PID) { + id->PID = PID; + id->VER = SCCB_Read(slv_addr, REG_VER); + id->MIDL = SCCB_Read(slv_addr, REG_MIDL); + id->MIDH = SCCB_Read(slv_addr, REG_MIDH); + return PID; + } else { + ESP_LOGI(TAG, "Mismatch PID=0x%x", PID); + } + } + return 0; +} + +int ov2640_init(sensor_t *sensor) +{ + sensor->reset = reset; + sensor->init_status = init_status; + sensor->set_pixformat = set_pixformat; + sensor->set_framesize = set_framesize; + sensor->set_contrast = set_contrast; + sensor->set_brightness= set_brightness; + sensor->set_saturation= set_saturation; + + sensor->set_quality = set_quality; + sensor->set_colorbar = set_colorbar; + + sensor->set_gainceiling = set_gainceiling_sensor; + sensor->set_gain_ctrl = set_agc_sensor; + sensor->set_exposure_ctrl = set_aec_sensor; + sensor->set_hmirror = set_hmirror_sensor; + sensor->set_vflip = set_vflip_sensor; + + sensor->set_whitebal = set_awb_dsp; + sensor->set_aec2 = set_aec2; + sensor->set_aec_value = set_aec_value; + sensor->set_special_effect = set_special_effect; + sensor->set_wb_mode = set_wb_mode; + sensor->set_ae_level = set_ae_level; + + sensor->set_dcw = set_dcw_dsp; + sensor->set_bpc = set_bpc_dsp; + sensor->set_wpc = set_wpc_dsp; + sensor->set_awb_gain = set_awb_gain_dsp; + sensor->set_agc_gain = set_agc_gain; + + sensor->set_raw_gma = set_raw_gma_dsp; + sensor->set_lenc = set_lenc_dsp; + + //not supported + sensor->set_sharpness = set_sharpness; + sensor->set_denoise = set_denoise; + + sensor->get_reg = get_reg; + sensor->set_reg = set_reg; + sensor->set_res_raw = set_res_raw; + sensor->set_pll = _set_pll; + sensor->set_xclk = set_xclk; + ESP_LOGD(TAG, "OV2640 Attached"); + return 0; +} diff --git a/lib/libesp32_div/esp32-camera/sensors/ov3660.c b/lib/libesp32_div/esp32-camera/sensors/ov3660.c new file mode 100644 index 000000000..b9ebdba3b --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/ov3660.c @@ -0,0 +1,1053 @@ +/* + * This file is part of the OpenMV project. + * Copyright (c) 2013/2014 Ibrahim Abdelkader + * This work is licensed under the MIT license, see the file LICENSE for details. + * + * OV3660 driver. + * + */ +#include +#include +#include +#include "sccb.h" +#include "xclk.h" +#include "ov3660.h" +#include "ov3660_regs.h" +#include "ov3660_settings.h" +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" + +#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) +#include "esp32-hal-log.h" +#else +#include "esp_log.h" +static const char *TAG = "ov3660"; +#endif + +//#define REG_DEBUG_ON + +static int read_reg(uint8_t slv_addr, const uint16_t reg){ + int ret = SCCB_Read16(slv_addr, reg); +#ifdef REG_DEBUG_ON + if (ret < 0) { + ESP_LOGE(TAG, "READ REG 0x%04x FAILED: %d", reg, ret); + } +#endif + return ret; +} + +static int check_reg_mask(uint8_t slv_addr, uint16_t reg, uint8_t mask){ + return (read_reg(slv_addr, reg) & mask) == mask; +} + +static int read_reg16(uint8_t slv_addr, const uint16_t reg){ + int ret = 0, ret2 = 0; + ret = read_reg(slv_addr, reg); + if (ret >= 0) { + ret = (ret & 0xFF) << 8; + ret2 = read_reg(slv_addr, reg+1); + if (ret2 < 0) { + ret = ret2; + } else { + ret |= ret2 & 0xFF; + } + } + return ret; +} + + +static int write_reg(uint8_t slv_addr, const uint16_t reg, uint8_t value){ + int ret = 0; +#ifndef REG_DEBUG_ON + ret = SCCB_Write16(slv_addr, reg, value); +#else + int old_value = read_reg(slv_addr, reg); + if (old_value < 0) { + return old_value; + } + if ((uint8_t)old_value != value) { + ESP_LOGI(TAG, "NEW REG 0x%04x: 0x%02x to 0x%02x", reg, (uint8_t)old_value, value); + ret = SCCB_Write16(slv_addr, reg, value); + } else { + ESP_LOGD(TAG, "OLD REG 0x%04x: 0x%02x", reg, (uint8_t)old_value); + ret = SCCB_Write16(slv_addr, reg, value);//maybe not? + } + if (ret < 0) { + ESP_LOGE(TAG, "WRITE REG 0x%04x FAILED: %d", reg, ret); + } +#endif + return ret; +} + +static int set_reg_bits(uint8_t slv_addr, uint16_t reg, uint8_t offset, uint8_t mask, uint8_t value) +{ + int ret = 0; + uint8_t c_value, new_value; + ret = read_reg(slv_addr, reg); + if(ret < 0) { + return ret; + } + c_value = ret; + new_value = (c_value & ~(mask << offset)) | ((value & mask) << offset); + ret = write_reg(slv_addr, reg, new_value); + return ret; +} + +static int write_regs(uint8_t slv_addr, const uint16_t (*regs)[2]) +{ + int i = 0, ret = 0; + while (!ret && regs[i][0] != REGLIST_TAIL) { + if (regs[i][0] == REG_DLY) { + vTaskDelay(regs[i][1] / portTICK_PERIOD_MS); + } else { + ret = write_reg(slv_addr, regs[i][0], regs[i][1]); + } + i++; + } + return ret; +} + +static int write_reg16(uint8_t slv_addr, const uint16_t reg, uint16_t value) +{ + if (write_reg(slv_addr, reg, value >> 8) || write_reg(slv_addr, reg + 1, value)) { + return -1; + } + return 0; +} + +static int write_addr_reg(uint8_t slv_addr, const uint16_t reg, uint16_t x_value, uint16_t y_value) +{ + if (write_reg16(slv_addr, reg, x_value) || write_reg16(slv_addr, reg + 2, y_value)) { + return -1; + } + return 0; +} + +#define write_reg_bits(slv_addr, reg, mask, enable) set_reg_bits(slv_addr, reg, 0, mask, enable?mask:0) + +static int calc_sysclk(int xclk, bool pll_bypass, int pll_multiplier, int pll_sys_div, int pll_pre_div, bool pll_root_2x, int pll_seld5, bool pclk_manual, int pclk_div) +{ + const int pll_pre_div2x_map[] = { 2, 3, 4, 6 };//values are multiplied by two to avoid floats + const int pll_seld52x_map[] = { 2, 2, 4, 5 }; + + if(!pll_sys_div) { + pll_sys_div = 1; + } + + int pll_pre_div2x = pll_pre_div2x_map[pll_pre_div]; + int pll_root_div = pll_root_2x?2:1; + int pll_seld52x = pll_seld52x_map[pll_seld5]; + + int VCO = (xclk / 1000) * pll_multiplier * pll_root_div * 2 / pll_pre_div2x; + int PLLCLK = pll_bypass?(xclk):(VCO * 1000 * 2 / pll_sys_div / pll_seld52x); + int PCLK = PLLCLK / 2 / ((pclk_manual && pclk_div)?pclk_div:1); + int SYSCLK = PLLCLK / 4; + + ESP_LOGI(TAG, "Calculated VCO: %d Hz, PLLCLK: %d Hz, SYSCLK: %d Hz, PCLK: %d Hz", VCO*1000, PLLCLK, SYSCLK, PCLK); + return SYSCLK; +} + +static int set_pll(sensor_t *sensor, bool bypass, uint8_t multiplier, uint8_t sys_div, uint8_t pre_div, bool root_2x, uint8_t seld5, bool pclk_manual, uint8_t pclk_div){ + int ret = 0; + if(multiplier > 31 || sys_div > 15 || pre_div > 3 || pclk_div > 31 || seld5 > 3){ + ESP_LOGE(TAG, "Invalid arguments"); + return -1; + } + + calc_sysclk(sensor->xclk_freq_hz, bypass, multiplier, sys_div, pre_div, root_2x, seld5, pclk_manual, pclk_div); + + ret = write_reg(sensor->slv_addr, SC_PLLS_CTRL0, bypass?0x80:0x00); + if (ret == 0) { + ret = write_reg(sensor->slv_addr, SC_PLLS_CTRL1, multiplier & 0x1f); + } + if (ret == 0) { + ret = write_reg(sensor->slv_addr, SC_PLLS_CTRL2, 0x10 | (sys_div & 0x0f)); + } + if (ret == 0) { + ret = write_reg(sensor->slv_addr, SC_PLLS_CTRL3, (pre_div & 0x3) << 4 | seld5 | (root_2x?0x40:0x00)); + } + if (ret == 0) { + ret = write_reg(sensor->slv_addr, PCLK_RATIO, pclk_div & 0x1f); + } + if (ret == 0) { + ret = write_reg(sensor->slv_addr, VFIFO_CTRL0C, pclk_manual?0x22:0x20); + } + if(ret){ + ESP_LOGE(TAG, "set_sensor_pll FAILED!"); + } + return ret; +} + +static int set_ae_level(sensor_t *sensor, int level); + +static int reset(sensor_t *sensor) +{ + int ret = 0; + // Software Reset: clear all registers and reset them to their default values + ret = write_reg(sensor->slv_addr, SYSTEM_CTROL0, 0x82); + if(ret){ + ESP_LOGE(TAG, "Software Reset FAILED!"); + return ret; + } + vTaskDelay(100 / portTICK_PERIOD_MS); + ret = write_regs(sensor->slv_addr, sensor_default_regs); + if (ret == 0) { + ESP_LOGD(TAG, "Camera defaults loaded"); + ret = set_ae_level(sensor, 0); + vTaskDelay(100 / portTICK_PERIOD_MS); + } + return ret; +} + +static int set_pixformat(sensor_t *sensor, pixformat_t pixformat) +{ + int ret = 0; + const uint16_t (*regs)[2]; + + switch (pixformat) { + case PIXFORMAT_YUV422: + regs = sensor_fmt_yuv422; + break; + + case PIXFORMAT_GRAYSCALE: + regs = sensor_fmt_grayscale; + break; + + case PIXFORMAT_RGB565: + case PIXFORMAT_RGB888: + regs = sensor_fmt_rgb565; + break; + + case PIXFORMAT_JPEG: + regs = sensor_fmt_jpeg; + break; + + case PIXFORMAT_RAW: + regs = sensor_fmt_raw; + break; + + default: + ESP_LOGE(TAG, "Unsupported pixformat: %u", pixformat); + return -1; + } + + ret = write_regs(sensor->slv_addr, regs); + if(ret == 0) { + sensor->pixformat = pixformat; + ESP_LOGD(TAG, "Set pixformat to: %u", pixformat); + } + return ret; +} + +static int set_image_options(sensor_t *sensor) +{ + int ret = 0; + uint8_t reg20 = 0; + uint8_t reg21 = 0; + uint8_t reg4514 = 0; + uint8_t reg4514_test = 0; + + // compression + if (sensor->pixformat == PIXFORMAT_JPEG) { + reg21 |= 0x20; + } + + // binning + if (sensor->status.binning) { + reg20 |= 0x01; + reg21 |= 0x01; + reg4514_test |= 4; + } else { + reg20 |= 0x40; + } + + // V-Flip + if (sensor->status.vflip) { + reg20 |= 0x06; + reg4514_test |= 1; + } + + // H-Mirror + if (sensor->status.hmirror) { + reg21 |= 0x06; + reg4514_test |= 2; + } + + switch (reg4514_test) { + //no binning + case 0: reg4514 = 0x88; break;//normal + case 1: reg4514 = 0x88; break;//v-flip + case 2: reg4514 = 0xbb; break;//h-mirror + case 3: reg4514 = 0xbb; break;//v-flip+h-mirror + //binning + case 4: reg4514 = 0xaa; break;//normal + case 5: reg4514 = 0xbb; break;//v-flip + case 6: reg4514 = 0xbb; break;//h-mirror + case 7: reg4514 = 0xaa; break;//v-flip+h-mirror + } + + if(write_reg(sensor->slv_addr, TIMING_TC_REG20, reg20) + || write_reg(sensor->slv_addr, TIMING_TC_REG21, reg21) + || write_reg(sensor->slv_addr, 0x4514, reg4514)){ + ESP_LOGE(TAG, "Setting Image Options Failed"); + ret = -1; + } + + if (sensor->status.binning) { + ret = write_reg(sensor->slv_addr, 0x4520, 0x0b) + || write_reg(sensor->slv_addr, X_INCREMENT, 0x31)//odd:3, even: 1 + || write_reg(sensor->slv_addr, Y_INCREMENT, 0x31);//odd:3, even: 1 + } else { + ret = write_reg(sensor->slv_addr, 0x4520, 0xb0) + || write_reg(sensor->slv_addr, X_INCREMENT, 0x11)//odd:1, even: 1 + || write_reg(sensor->slv_addr, Y_INCREMENT, 0x11);//odd:1, even: 1 + } + + ESP_LOGD(TAG, "Set Image Options: Compression: %u, Binning: %u, V-Flip: %u, H-Mirror: %u, Reg-4514: 0x%02x", + sensor->pixformat == PIXFORMAT_JPEG, sensor->status.binning, sensor->status.vflip, sensor->status.hmirror, reg4514); + return ret; +} + +static int set_framesize(sensor_t *sensor, framesize_t framesize) +{ + int ret = 0; + + if(framesize > FRAMESIZE_QXGA){ + ESP_LOGW(TAG, "Invalid framesize: %u", framesize); + framesize = FRAMESIZE_QXGA; + } + framesize_t old_framesize = sensor->status.framesize; + sensor->status.framesize = framesize; + uint16_t w = resolution[framesize].width; + uint16_t h = resolution[framesize].height; + aspect_ratio_t ratio = resolution[sensor->status.framesize].aspect_ratio; + ratio_settings_t settings = ratio_table[ratio]; + + sensor->status.binning = (w <= (settings.max_width / 2) && h <= (settings.max_height / 2)); + sensor->status.scale = !((w == settings.max_width && h == settings.max_height) + || (w == (settings.max_width / 2) && h == (settings.max_height / 2))); + + ret = write_addr_reg(sensor->slv_addr, X_ADDR_ST_H, settings.start_x, settings.start_y) + || write_addr_reg(sensor->slv_addr, X_ADDR_END_H, settings.end_x, settings.end_y) + || write_addr_reg(sensor->slv_addr, X_OUTPUT_SIZE_H, w, h); + + if (ret) { + goto fail; + } + + if (sensor->status.binning) { + ret = write_addr_reg(sensor->slv_addr, X_TOTAL_SIZE_H, settings.total_x, (settings.total_y / 2) + 1) + || write_addr_reg(sensor->slv_addr, X_OFFSET_H, 8, 2); + } else { + ret = write_addr_reg(sensor->slv_addr, X_TOTAL_SIZE_H, settings.total_x, settings.total_y) + || write_addr_reg(sensor->slv_addr, X_OFFSET_H, 16, 6); + } + + if (ret == 0) { + ret = write_reg_bits(sensor->slv_addr, ISP_CONTROL_01, 0x20, sensor->status.scale); + } + + if (ret == 0) { + ret = set_image_options(sensor); + } + + if (ret) { + goto fail; + } + + if (sensor->pixformat == PIXFORMAT_JPEG) { + if (framesize == FRAMESIZE_QXGA || sensor->xclk_freq_hz == 16000000) { + //40MHz SYSCLK and 10MHz PCLK + ret = set_pll(sensor, false, 24, 1, 3, false, 0, true, 8); + } else { + //50MHz SYSCLK and 10MHz PCLK + ret = set_pll(sensor, false, 30, 1, 3, false, 0, true, 10); + } + } else { + //tuned for 16MHz XCLK and 8MHz PCLK + if (framesize > FRAMESIZE_HVGA) { + //8MHz SYSCLK and 8MHz PCLK (4.44 FPS) + ret = set_pll(sensor, false, 4, 1, 0, false, 2, true, 2); + } else if (framesize >= FRAMESIZE_QVGA) { + //16MHz SYSCLK and 8MHz PCLK (10.25 FPS) + ret = set_pll(sensor, false, 8, 1, 0, false, 2, true, 4); + } else { + //32MHz SYSCLK and 8MHz PCLK (17.77 FPS) + ret = set_pll(sensor, false, 8, 1, 0, false, 0, true, 8); + } + } + + if (ret == 0) { + ESP_LOGD(TAG, "Set framesize to: %ux%u", w, h); + } + return ret; + +fail: + sensor->status.framesize = old_framesize; + ESP_LOGE(TAG, "Setting framesize to: %ux%u failed", w, h); + return ret; +} + +static int set_hmirror(sensor_t *sensor, int enable) +{ + int ret = 0; + sensor->status.hmirror = enable; + ret = set_image_options(sensor); + if (ret == 0) { + ESP_LOGD(TAG, "Set h-mirror to: %d", enable); + } + return ret; +} + +static int set_vflip(sensor_t *sensor, int enable) +{ + int ret = 0; + sensor->status.vflip = enable; + ret = set_image_options(sensor); + if (ret == 0) { + ESP_LOGD(TAG, "Set v-flip to: %d", enable); + } + return ret; +} + +static int set_quality(sensor_t *sensor, int qs) +{ + int ret = 0; + ret = write_reg(sensor->slv_addr, COMPRESSION_CTRL07, qs & 0x3f); + if (ret == 0) { + sensor->status.quality = qs; + ESP_LOGD(TAG, "Set quality to: %d", qs); + } + return ret; +} + +static int set_colorbar(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = write_reg_bits(sensor->slv_addr, PRE_ISP_TEST_SETTING_1, TEST_COLOR_BAR, enable); + if (ret == 0) { + sensor->status.colorbar = enable; + ESP_LOGD(TAG, "Set colorbar to: %d", enable); + } + return ret; +} + +static int set_gain_ctrl(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = write_reg_bits(sensor->slv_addr, AEC_PK_MANUAL, AEC_PK_MANUAL_AGC_MANUALEN, !enable); + if (ret == 0) { + ESP_LOGD(TAG, "Set gain_ctrl to: %d", enable); + sensor->status.agc = enable; + } + return ret; +} + +static int set_exposure_ctrl(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = write_reg_bits(sensor->slv_addr, AEC_PK_MANUAL, AEC_PK_MANUAL_AEC_MANUALEN, !enable); + if (ret == 0) { + ESP_LOGD(TAG, "Set exposure_ctrl to: %d", enable); + sensor->status.aec = enable; + } + return ret; +} + +static int set_whitebal(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = write_reg_bits(sensor->slv_addr, ISP_CONTROL_01, 0x01, enable); + if (ret == 0) { + ESP_LOGD(TAG, "Set awb to: %d", enable); + sensor->status.awb = enable; + } + return ret; +} + +//Advanced AWB +static int set_dcw_dsp(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = write_reg_bits(sensor->slv_addr, 0x5183, 0x80, !enable); + if (ret == 0) { + ESP_LOGD(TAG, "Set dcw to: %d", enable); + sensor->status.dcw = enable; + } + return ret; +} + +//night mode enable +static int set_aec2(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = write_reg_bits(sensor->slv_addr, 0x3a00, 0x04, enable); + if (ret == 0) { + ESP_LOGD(TAG, "Set aec2 to: %d", enable); + sensor->status.aec2 = enable; + } + return ret; +} + +static int set_bpc_dsp(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = write_reg_bits(sensor->slv_addr, 0x5000, 0x04, enable); + if (ret == 0) { + ESP_LOGD(TAG, "Set bpc to: %d", enable); + sensor->status.bpc = enable; + } + return ret; +} + +static int set_wpc_dsp(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = write_reg_bits(sensor->slv_addr, 0x5000, 0x02, enable); + if (ret == 0) { + ESP_LOGD(TAG, "Set wpc to: %d", enable); + sensor->status.wpc = enable; + } + return ret; +} + +//Gamma enable +static int set_raw_gma_dsp(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = write_reg_bits(sensor->slv_addr, 0x5000, 0x20, enable); + if (ret == 0) { + ESP_LOGD(TAG, "Set raw_gma to: %d", enable); + sensor->status.raw_gma = enable; + } + return ret; +} + +static int set_lenc_dsp(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = write_reg_bits(sensor->slv_addr, 0x5000, 0x80, enable); + if (ret == 0) { + ESP_LOGD(TAG, "Set lenc to: %d", enable); + sensor->status.lenc = enable; + } + return ret; +} + +static int get_agc_gain(sensor_t *sensor) +{ + int ra = read_reg(sensor->slv_addr, 0x350a); + if (ra < 0) { + return 0; + } + int rb = read_reg(sensor->slv_addr, 0x350b); + if (rb < 0) { + return 0; + } + int res = (rb & 0xF0) >> 4 | (ra & 0x03) << 4; + if (rb & 0x0F) { + res += 1; + } + return res; +} + +//real gain +static int set_agc_gain(sensor_t *sensor, int gain) +{ + int ret = 0; + if(gain < 0) { + gain = 0; + } else if(gain > 64) { + gain = 64; + } + + //gain value is 6.4 bits float + //in order to use the max range, we deduct 1/16 + int gainv = gain << 4; + if(gainv){ + gainv -= 1; + } + + ret = write_reg(sensor->slv_addr, 0x350a, gainv >> 8) || write_reg(sensor->slv_addr, 0x350b, gainv & 0xff); + if (ret == 0) { + ESP_LOGD(TAG, "Set agc_gain to: %d", gain); + sensor->status.agc_gain = gain; + } + return ret; +} + +static int get_aec_value(sensor_t *sensor) +{ + int ra = read_reg(sensor->slv_addr, 0x3500); + if (ra < 0) { + return 0; + } + int rb = read_reg(sensor->slv_addr, 0x3501); + if (rb < 0) { + return 0; + } + int rc = read_reg(sensor->slv_addr, 0x3502); + if (rc < 0) { + return 0; + } + int res = (ra & 0x0F) << 12 | (rb & 0xFF) << 4 | (rc & 0xF0) >> 4; + return res; +} + +static int set_aec_value(sensor_t *sensor, int value) +{ + int ret = 0, max_val = 0; + max_val = read_reg16(sensor->slv_addr, 0x380e); + if (max_val < 0) { + ESP_LOGE(TAG, "Could not read max aec_value"); + return -1; + } + if (value > max_val) { + value =max_val; + } + + ret = write_reg(sensor->slv_addr, 0x3500, (value >> 12) & 0x0F) + || write_reg(sensor->slv_addr, 0x3501, (value >> 4) & 0xFF) + || write_reg(sensor->slv_addr, 0x3502, (value << 4) & 0xF0); + + if (ret == 0) { + ESP_LOGD(TAG, "Set aec_value to: %d / %d", value, max_val); + sensor->status.aec_value = value; + } + return ret; +} + +static int set_ae_level(sensor_t *sensor, int level) +{ + int ret = 0; + if (level < -5 || level > 5) { + return -1; + } + //good targets are between 5 and 115 + int target_level = ((level + 5) * 10) + 5; + + int level_high, level_low; + int fast_high, fast_low; + + level_low = target_level * 23 / 25; //0.92 (0.46) + level_high = target_level * 27 / 25; //1.08 (2.08) + + fast_low = level_low >> 1; + fast_high = level_high << 1; + + if(fast_high>255) { + fast_high = 255; + } + + ret = write_reg(sensor->slv_addr, 0x3a0f, level_high) + || write_reg(sensor->slv_addr, 0x3a10, level_low) + || write_reg(sensor->slv_addr, 0x3a1b, level_high) + || write_reg(sensor->slv_addr, 0x3a1e, level_low) + || write_reg(sensor->slv_addr, 0x3a11, fast_high) + || write_reg(sensor->slv_addr, 0x3a1f, fast_low); + + if (ret == 0) { + ESP_LOGD(TAG, "Set ae_level to: %d", level); + sensor->status.ae_level = level; + } + return ret; +} + +static int set_wb_mode(sensor_t *sensor, int mode) +{ + int ret = 0; + if (mode < 0 || mode > 4) { + return -1; + } + + ret = write_reg(sensor->slv_addr, 0x3406, (mode != 0)); + if (ret) { + return ret; + } + switch (mode) { + case 1://Sunny + ret = write_reg16(sensor->slv_addr, 0x3400, 0x5e0) //AWB R GAIN + || write_reg16(sensor->slv_addr, 0x3402, 0x410) //AWB G GAIN + || write_reg16(sensor->slv_addr, 0x3404, 0x540);//AWB B GAIN + break; + case 2://Cloudy + ret = write_reg16(sensor->slv_addr, 0x3400, 0x650) //AWB R GAIN + || write_reg16(sensor->slv_addr, 0x3402, 0x410) //AWB G GAIN + || write_reg16(sensor->slv_addr, 0x3404, 0x4f0);//AWB B GAIN + break; + case 3://Office + ret = write_reg16(sensor->slv_addr, 0x3400, 0x520) //AWB R GAIN + || write_reg16(sensor->slv_addr, 0x3402, 0x410) //AWB G GAIN + || write_reg16(sensor->slv_addr, 0x3404, 0x660);//AWB B GAIN + break; + case 4://HOME + ret = write_reg16(sensor->slv_addr, 0x3400, 0x420) //AWB R GAIN + || write_reg16(sensor->slv_addr, 0x3402, 0x3f0) //AWB G GAIN + || write_reg16(sensor->slv_addr, 0x3404, 0x710);//AWB B GAIN + break; + default://AUTO + break; + } + + if (ret == 0) { + ESP_LOGD(TAG, "Set wb_mode to: %d", mode); + sensor->status.wb_mode = mode; + } + return ret; +} + +static int set_awb_gain_dsp(sensor_t *sensor, int enable) +{ + int ret = 0; + int old_mode = sensor->status.wb_mode; + int mode = enable?old_mode:0; + + ret = set_wb_mode(sensor, mode); + + if (ret == 0) { + sensor->status.wb_mode = old_mode; + ESP_LOGD(TAG, "Set awb_gain to: %d", enable); + sensor->status.awb_gain = enable; + } + return ret; +} + +static int set_special_effect(sensor_t *sensor, int effect) +{ + int ret=0; + if (effect < 0 || effect > 6) { + return -1; + } + + uint8_t * regs = (uint8_t *)sensor_special_effects[effect]; + ret = write_reg(sensor->slv_addr, 0x5580, regs[0]) + || write_reg(sensor->slv_addr, 0x5583, regs[1]) + || write_reg(sensor->slv_addr, 0x5584, regs[2]) + || write_reg(sensor->slv_addr, 0x5003, regs[3]); + + if (ret == 0) { + ESP_LOGD(TAG, "Set special_effect to: %d", effect); + sensor->status.special_effect = effect; + } + return ret; +} + +static int set_brightness(sensor_t *sensor, int level) +{ + int ret = 0; + uint8_t value = 0; + bool negative = false; + + switch (level) { + case 3: + value = 0x30; + break; + case 2: + value = 0x20; + break; + case 1: + value = 0x10; + break; + case -1: + value = 0x10; + negative = true; + break; + case -2: + value = 0x20; + negative = true; + break; + case -3: + value = 0x30; + negative = true; + break; + default: // 0 + break; + } + + ret = write_reg(sensor->slv_addr, 0x5587, value); + if (ret == 0) { + ret = write_reg_bits(sensor->slv_addr, 0x5588, 0x08, negative); + } + + if (ret == 0) { + ESP_LOGD(TAG, "Set brightness to: %d", level); + sensor->status.brightness = level; + } + return ret; +} + +static int set_contrast(sensor_t *sensor, int level) +{ + int ret = 0; + if(level > 3 || level < -3) { + return -1; + } + ret = write_reg(sensor->slv_addr, 0x5586, (level + 4) << 3); + + if (ret == 0) { + ESP_LOGD(TAG, "Set contrast to: %d", level); + sensor->status.contrast = level; + } + return ret; +} + +static int set_saturation(sensor_t *sensor, int level) +{ + int ret = 0; + if(level > 4 || level < -4) { + return -1; + } + + uint8_t * regs = (uint8_t *)sensor_saturation_levels[level+4]; + for(int i=0; i<11; i++) { + ret = write_reg(sensor->slv_addr, 0x5381 + i, regs[i]); + if (ret) { + break; + } + } + + if (ret == 0) { + ESP_LOGD(TAG, "Set saturation to: %d", level); + sensor->status.saturation = level; + } + return ret; +} + +static int set_sharpness(sensor_t *sensor, int level) +{ + int ret = 0; + if(level > 3 || level < -3) { + return -1; + } + + uint8_t mt_offset_2 = (level + 3) * 8; + uint8_t mt_offset_1 = mt_offset_2 + 1; + + ret = write_reg_bits(sensor->slv_addr, 0x5308, 0x40, false)//0x40 means auto + || write_reg(sensor->slv_addr, 0x5300, 0x10) + || write_reg(sensor->slv_addr, 0x5301, 0x10) + || write_reg(sensor->slv_addr, 0x5302, mt_offset_1) + || write_reg(sensor->slv_addr, 0x5303, mt_offset_2) + || write_reg(sensor->slv_addr, 0x5309, 0x10) + || write_reg(sensor->slv_addr, 0x530a, 0x10) + || write_reg(sensor->slv_addr, 0x530b, 0x04) + || write_reg(sensor->slv_addr, 0x530c, 0x06); + + if (ret == 0) { + ESP_LOGD(TAG, "Set sharpness to: %d", level); + sensor->status.sharpness = level; + } + return ret; +} + +static int set_gainceiling(sensor_t *sensor, gainceiling_t level) +{ + int ret = 0, l = (int)level; + + ret = write_reg(sensor->slv_addr, 0x3A18, (l >> 8) & 3) + || write_reg(sensor->slv_addr, 0x3A19, l & 0xFF); + + if (ret == 0) { + ESP_LOGD(TAG, "Set gainceiling to: %d", l); + sensor->status.gainceiling = l; + } + return ret; +} + +static int get_denoise(sensor_t *sensor) +{ + if (!check_reg_mask(sensor->slv_addr, 0x5308, 0x10)) { + return 0; + } + return (read_reg(sensor->slv_addr, 0x5306) / 4) + 1; +} + +static int set_denoise(sensor_t *sensor, int level) +{ + int ret = 0; + if (level < 0 || level > 8) { + return -1; + } + + ret = write_reg_bits(sensor->slv_addr, 0x5308, 0x10, level > 0); + if (ret == 0 && level > 0) { + ret = write_reg(sensor->slv_addr, 0x5306, (level - 1) * 4); + } + + if (ret == 0) { + ESP_LOGD(TAG, "Set denoise to: %d", level); + sensor->status.denoise = level; + } + return ret; +} + +static int get_reg(sensor_t *sensor, int reg, int mask) +{ + int ret = 0, ret2 = 0; + if(mask > 0xFF){ + ret = read_reg16(sensor->slv_addr, reg); + if(ret >= 0 && mask > 0xFFFF){ + ret2 = read_reg(sensor->slv_addr, reg+2); + if(ret2 >= 0){ + ret = (ret << 8) | ret2 ; + } else { + ret = ret2; + } + } + } else { + ret = read_reg(sensor->slv_addr, reg); + } + if(ret > 0){ + ret &= mask; + } + return ret; +} + +static int set_reg(sensor_t *sensor, int reg, int mask, int value) +{ + int ret = 0, ret2 = 0; + if(mask > 0xFF){ + ret = read_reg16(sensor->slv_addr, reg); + if(ret >= 0 && mask > 0xFFFF){ + ret2 = read_reg(sensor->slv_addr, reg+2); + if(ret2 >= 0){ + ret = (ret << 8) | ret2 ; + } else { + ret = ret2; + } + } + } else { + ret = read_reg(sensor->slv_addr, reg); + } + if(ret < 0){ + return ret; + } + value = (ret & ~mask) | (value & mask); + if(mask > 0xFFFF){ + ret = write_reg16(sensor->slv_addr, reg, value >> 8); + if(ret >= 0){ + ret = write_reg(sensor->slv_addr, reg+2, value & 0xFF); + } + } else if(mask > 0xFF){ + ret = write_reg16(sensor->slv_addr, reg, value); + } else { + ret = write_reg(sensor->slv_addr, reg, value); + } + return ret; +} + +static int set_res_raw(sensor_t *sensor, int startX, int startY, int endX, int endY, int offsetX, int offsetY, int totalX, int totalY, int outputX, int outputY, bool scale, bool binning) +{ + int ret = 0; + ret = write_addr_reg(sensor->slv_addr, X_ADDR_ST_H, startX, startY) + || write_addr_reg(sensor->slv_addr, X_ADDR_END_H, endX, endY) + || write_addr_reg(sensor->slv_addr, X_OFFSET_H, offsetX, offsetY) + || write_addr_reg(sensor->slv_addr, X_TOTAL_SIZE_H, totalX, totalY) + || write_addr_reg(sensor->slv_addr, X_OUTPUT_SIZE_H, outputX, outputY) + || write_reg_bits(sensor->slv_addr, ISP_CONTROL_01, 0x20, scale); + if(!ret){ + sensor->status.scale = scale; + sensor->status.binning = binning; + ret = set_image_options(sensor); + } + return ret; +} + +static int _set_pll(sensor_t *sensor, int bypass, int multiplier, int sys_div, int root_2x, int pre_div, int seld5, int pclk_manual, int pclk_div) +{ + return set_pll(sensor, bypass > 0, multiplier, sys_div, pre_div, root_2x > 0, seld5, pclk_manual > 0, pclk_div); +} + +static int set_xclk(sensor_t *sensor, int timer, int xclk) +{ + int ret = 0; + sensor->xclk_freq_hz = xclk * 1000000U; + ret = xclk_timer_conf(timer, sensor->xclk_freq_hz); + return ret; +} + +static int init_status(sensor_t *sensor) +{ + sensor->status.brightness = 0; + sensor->status.contrast = 0; + sensor->status.saturation = 0; + sensor->status.sharpness = (read_reg(sensor->slv_addr, 0x5303) / 8) - 3; + sensor->status.denoise = get_denoise(sensor); + sensor->status.ae_level = 0; + sensor->status.gainceiling = read_reg16(sensor->slv_addr, 0x3A18) & 0x3FF; + sensor->status.awb = check_reg_mask(sensor->slv_addr, ISP_CONTROL_01, 0x01); + sensor->status.dcw = !check_reg_mask(sensor->slv_addr, 0x5183, 0x80); + sensor->status.agc = !check_reg_mask(sensor->slv_addr, AEC_PK_MANUAL, AEC_PK_MANUAL_AGC_MANUALEN); + sensor->status.aec = !check_reg_mask(sensor->slv_addr, AEC_PK_MANUAL, AEC_PK_MANUAL_AEC_MANUALEN); + sensor->status.hmirror = check_reg_mask(sensor->slv_addr, TIMING_TC_REG21, TIMING_TC_REG21_HMIRROR); + sensor->status.vflip = check_reg_mask(sensor->slv_addr, TIMING_TC_REG20, TIMING_TC_REG20_VFLIP); + sensor->status.colorbar = check_reg_mask(sensor->slv_addr, PRE_ISP_TEST_SETTING_1, TEST_COLOR_BAR); + sensor->status.bpc = check_reg_mask(sensor->slv_addr, 0x5000, 0x04); + sensor->status.wpc = check_reg_mask(sensor->slv_addr, 0x5000, 0x02); + sensor->status.raw_gma = check_reg_mask(sensor->slv_addr, 0x5000, 0x20); + sensor->status.lenc = check_reg_mask(sensor->slv_addr, 0x5000, 0x80); + sensor->status.quality = read_reg(sensor->slv_addr, COMPRESSION_CTRL07) & 0x3f; + sensor->status.special_effect = 0; + sensor->status.wb_mode = 0; + sensor->status.awb_gain = check_reg_mask(sensor->slv_addr, 0x3406, 0x01); + sensor->status.agc_gain = get_agc_gain(sensor); + sensor->status.aec_value = get_aec_value(sensor); + sensor->status.aec2 = check_reg_mask(sensor->slv_addr, 0x3a00, 0x04); + return 0; +} + +int ov3660_detect(int slv_addr, sensor_id_t *id) +{ + if (OV3660_SCCB_ADDR == slv_addr) { + uint8_t h = SCCB_Read16(slv_addr, 0x300A); + uint8_t l = SCCB_Read16(slv_addr, 0x300B); + uint16_t PID = (h<<8) | l; + if (OV3660_PID == PID) { + id->PID = PID; + return PID; + } else { + ESP_LOGI(TAG, "Mismatch PID=0x%x", PID); + } + } + return 0; +} + +int ov3660_init(sensor_t *sensor) +{ + sensor->reset = reset; + sensor->set_pixformat = set_pixformat; + sensor->set_framesize = set_framesize; + sensor->set_contrast = set_contrast; + sensor->set_brightness = set_brightness; + sensor->set_saturation = set_saturation; + sensor->set_sharpness = set_sharpness; + sensor->set_gainceiling = set_gainceiling; + sensor->set_quality = set_quality; + sensor->set_colorbar = set_colorbar; + sensor->set_gain_ctrl = set_gain_ctrl; + sensor->set_exposure_ctrl = set_exposure_ctrl; + sensor->set_whitebal = set_whitebal; + sensor->set_hmirror = set_hmirror; + sensor->set_vflip = set_vflip; + sensor->init_status = init_status; + sensor->set_aec2 = set_aec2; + sensor->set_aec_value = set_aec_value; + sensor->set_special_effect = set_special_effect; + sensor->set_wb_mode = set_wb_mode; + sensor->set_ae_level = set_ae_level; + sensor->set_dcw = set_dcw_dsp; + sensor->set_bpc = set_bpc_dsp; + sensor->set_wpc = set_wpc_dsp; + sensor->set_awb_gain = set_awb_gain_dsp; + sensor->set_agc_gain = set_agc_gain; + sensor->set_raw_gma = set_raw_gma_dsp; + sensor->set_lenc = set_lenc_dsp; + sensor->set_denoise = set_denoise; + + sensor->get_reg = get_reg; + sensor->set_reg = set_reg; + sensor->set_res_raw = set_res_raw; + sensor->set_pll = _set_pll; + sensor->set_xclk = set_xclk; + return 0; +} diff --git a/lib/libesp32_div/esp32-camera/sensors/ov5640.c b/lib/libesp32_div/esp32-camera/sensors/ov5640.c new file mode 100644 index 000000000..a32b374f5 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/ov5640.c @@ -0,0 +1,1130 @@ +/* + * This file is part of the OpenMV project. + * Copyright (c) 2013/2014 Ibrahim Abdelkader + * This work is licensed under the MIT license, see the file LICENSE for details. + * + * OV3660 driver. + * + */ +#include +#include +#include +#include "sccb.h" +#include "xclk.h" +#include "ov5640.h" +#include "ov5640_regs.h" +#include "ov5640_settings.h" +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" + +#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) +#include "esp32-hal-log.h" +#else +#include "esp_log.h" +static const char *TAG = "ov5640"; +#endif + +//#define REG_DEBUG_ON + +static int read_reg(uint8_t slv_addr, const uint16_t reg){ + int ret = SCCB_Read16(slv_addr, reg); +#ifdef REG_DEBUG_ON + if (ret < 0) { + ESP_LOGE(TAG, "READ REG 0x%04x FAILED: %d", reg, ret); + } +#endif + return ret; +} + +static int check_reg_mask(uint8_t slv_addr, uint16_t reg, uint8_t mask){ + return (read_reg(slv_addr, reg) & mask) == mask; +} + +static int read_reg16(uint8_t slv_addr, const uint16_t reg){ + int ret = 0, ret2 = 0; + ret = read_reg(slv_addr, reg); + if (ret >= 0) { + ret = (ret & 0xFF) << 8; + ret2 = read_reg(slv_addr, reg+1); + if (ret2 < 0) { + ret = ret2; + } else { + ret |= ret2 & 0xFF; + } + } + return ret; +} + +//static void dump_reg(sensor_t *sensor, const uint16_t reg){ +// int v = SCCB_Read16(sensor->slv_addr, reg); +// if(v < 0){ +// ets_printf(" 0x%04x: FAIL[%d]\n", reg, v); +// } else { +// ets_printf(" 0x%04x: 0x%02X\n", reg, v); +// } +//} +// +//static void dump_range(sensor_t *sensor, const char * name, const uint16_t start_reg, const uint16_t end_reg){ +// ets_printf("%s: 0x%04x - 0x%04X\n", name, start_reg, end_reg); +// for(uint16_t reg = start_reg; reg <= end_reg; reg++){ +// dump_reg(sensor, reg); +// } +//} +// +//static void dump_regs(sensor_t *sensor){ +//// dump_range(sensor, "All Regs", 0x3000, 0x6100); +//// dump_range(sensor, "system and IO pad control", 0x3000, 0x3052); +//// dump_range(sensor, "SCCB control", 0x3100, 0x3108); +//// dump_range(sensor, "SRB control", 0x3200, 0x3211); +//// dump_range(sensor, "AWB gain control", 0x3400, 0x3406); +//// dump_range(sensor, "AEC/AGC control", 0x3500, 0x350D); +//// dump_range(sensor, "VCM control", 0x3600, 0x3606); +//// dump_range(sensor, "timing control", 0x3800, 0x3821); +//// dump_range(sensor, "AEC/AGC power down domain control", 0x3A00, 0x3A25); +//// dump_range(sensor, "strobe control", 0x3B00, 0x3B0C); +//// dump_range(sensor, "50/60Hz detector control", 0x3C00, 0x3C1E); +//// dump_range(sensor, "OTP control", 0x3D00, 0x3D21); +//// dump_range(sensor, "MC control", 0x3F00, 0x3F0D); +//// dump_range(sensor, "BLC control", 0x4000, 0x4033); +//// dump_range(sensor, "frame control", 0x4201, 0x4202); +//// dump_range(sensor, "format control", 0x4300, 0x430D); +//// dump_range(sensor, "JPEG control", 0x4400, 0x4431); +//// dump_range(sensor, "VFIFO control", 0x4600, 0x460D); +//// dump_range(sensor, "DVP control", 0x4709, 0x4745); +//// dump_range(sensor, "MIPI control", 0x4800, 0x4837); +//// dump_range(sensor, "ISP frame control", 0x4901, 0x4902); +//// dump_range(sensor, "ISP top control", 0x5000, 0x5063); +//// dump_range(sensor, "AWB control", 0x5180, 0x51D0); +//// dump_range(sensor, "CIP control", 0x5300, 0x530F); +//// dump_range(sensor, "CMX control", 0x5380, 0x538B); +//// dump_range(sensor, "gamma control", 0x5480, 0x5490); +//// dump_range(sensor, "SDE control", 0x5580, 0x558C); +//// dump_range(sensor, "scale control", 0x5600, 0x5606); +//// dump_range(sensor, "AVG control", 0x5680, 0x56A2); +//// dump_range(sensor, "LENC control", 0x5800, 0x5849); +//// dump_range(sensor, "AFC control", 0x6000, 0x603F); +//} + +static int write_reg(uint8_t slv_addr, const uint16_t reg, uint8_t value){ + int ret = 0; +#ifndef REG_DEBUG_ON + ret = SCCB_Write16(slv_addr, reg, value); +#else + int old_value = read_reg(slv_addr, reg); + if (old_value < 0) { + return old_value; + } + if ((uint8_t)old_value != value) { + ESP_LOGI(TAG, "NEW REG 0x%04x: 0x%02x to 0x%02x", reg, (uint8_t)old_value, value); + ret = SCCB_Write16(slv_addr, reg, value); + } else { + ESP_LOGD(TAG, "OLD REG 0x%04x: 0x%02x", reg, (uint8_t)old_value); + ret = SCCB_Write16(slv_addr, reg, value);//maybe not? + } + if (ret < 0) { + ESP_LOGE(TAG, "WRITE REG 0x%04x FAILED: %d", reg, ret); + } +#endif + return ret; +} + +static int set_reg_bits(uint8_t slv_addr, uint16_t reg, uint8_t offset, uint8_t mask, uint8_t value) +{ + int ret = 0; + uint8_t c_value, new_value; + ret = read_reg(slv_addr, reg); + if(ret < 0) { + return ret; + } + c_value = ret; + new_value = (c_value & ~(mask << offset)) | ((value & mask) << offset); + ret = write_reg(slv_addr, reg, new_value); + return ret; +} + +static int write_regs(uint8_t slv_addr, const uint16_t (*regs)[2]) +{ + int i = 0, ret = 0; + while (!ret && regs[i][0] != REGLIST_TAIL) { + if (regs[i][0] == REG_DLY) { + vTaskDelay(regs[i][1] / portTICK_PERIOD_MS); + } else { + ret = write_reg(slv_addr, regs[i][0], regs[i][1]); + } + i++; + } + return ret; +} + +static int write_reg16(uint8_t slv_addr, const uint16_t reg, uint16_t value) +{ + if (write_reg(slv_addr, reg, value >> 8) || write_reg(slv_addr, reg + 1, value)) { + return -1; + } + return 0; +} + +static int write_addr_reg(uint8_t slv_addr, const uint16_t reg, uint16_t x_value, uint16_t y_value) +{ + if (write_reg16(slv_addr, reg, x_value) || write_reg16(slv_addr, reg + 2, y_value)) { + return -1; + } + return 0; +} + +#define write_reg_bits(slv_addr, reg, mask, enable) set_reg_bits(slv_addr, reg, 0, mask, (enable)?(mask):0) + +static int calc_sysclk(int xclk, bool pll_bypass, int pll_multiplier, int pll_sys_div, int pre_div, bool root_2x, int pclk_root_div, bool pclk_manual, int pclk_div) +{ + const float pll_pre_div2x_map[] = { 1, 1, 2, 3, 4, 1.5, 6, 2.5, 8}; + const int pll_pclk_root_div_map[] = { 1, 2, 4, 8 }; + + if(!pll_sys_div) { + pll_sys_div = 1; + } + + float pll_pre_div = pll_pre_div2x_map[pre_div]; + unsigned int root_2x_div = root_2x?2:1; + unsigned int pll_pclk_root_div = pll_pclk_root_div_map[pclk_root_div]; + + unsigned int REFIN = xclk / pll_pre_div; + + unsigned int VCO = REFIN * pll_multiplier / root_2x_div; + + unsigned int PLL_CLK = pll_bypass?(xclk):(VCO / pll_sys_div * 2 / 5);//5 here is 10bit mode / 2, for 8bit it should be 4 (reg 0x3034) + + unsigned int PCLK = PLL_CLK / pll_pclk_root_div / ((pclk_manual && pclk_div)?pclk_div:2); + + unsigned int SYSCLK = PLL_CLK / 4; + + ESP_LOGI(TAG, "Calculated XVCLK: %d Hz, REFIN: %u Hz, VCO: %u Hz, PLL_CLK: %u Hz, SYSCLK: %u Hz, PCLK: %u Hz", xclk, REFIN, VCO, PLL_CLK, SYSCLK, PCLK); + return SYSCLK; +} + +static int set_pll(sensor_t *sensor, bool bypass, uint8_t multiplier, uint8_t sys_div, uint8_t pre_div, bool root_2x, uint8_t pclk_root_div, bool pclk_manual, uint8_t pclk_div){ + int ret = 0; + if(multiplier > 252 || multiplier < 4 || sys_div > 15 || pre_div > 8 || pclk_div > 31 || pclk_root_div > 3){ + ESP_LOGE(TAG, "Invalid arguments"); + return -1; + } + if(multiplier > 127){ + multiplier &= 0xFE;//only even integers above 127 + } + ESP_LOGI(TAG, "Set PLL: bypass: %u, multiplier: %u, sys_div: %u, pre_div: %u, root_2x: %u, pclk_root_div: %u, pclk_manual: %u, pclk_div: %u", bypass, multiplier, sys_div, pre_div, root_2x, pclk_root_div, pclk_manual, pclk_div); + + calc_sysclk(sensor->xclk_freq_hz, bypass, multiplier, sys_div, pre_div, root_2x, pclk_root_div, pclk_manual, pclk_div); + + ret = write_reg(sensor->slv_addr, 0x3039, bypass?0x80:0x00); + if (ret == 0) { + ret = write_reg(sensor->slv_addr, 0x3034, 0x1A);//10bit mode + } + if (ret == 0) { + ret = write_reg(sensor->slv_addr, 0x3035, 0x01 | ((sys_div & 0x0f) << 4)); + } + if (ret == 0) { + ret = write_reg(sensor->slv_addr, 0x3036, multiplier & 0xff); + } + if (ret == 0) { + ret = write_reg(sensor->slv_addr, 0x3037, (pre_div & 0xf) | (root_2x?0x10:0x00)); + } + if (ret == 0) { + ret = write_reg(sensor->slv_addr, 0x3108, (pclk_root_div & 0x3) << 4 | 0x06); + } + if (ret == 0) { + ret = write_reg(sensor->slv_addr, 0x3824, pclk_div & 0x1f); + } + if (ret == 0) { + ret = write_reg(sensor->slv_addr, 0x460C, pclk_manual?0x22:0x20); + } + if (ret == 0) { + ret = write_reg(sensor->slv_addr, 0x3103, 0x13);// system clock from pll, bit[1] + } + if(ret){ + ESP_LOGE(TAG, "set_sensor_pll FAILED!"); + } + return ret; +} + +static int set_ae_level(sensor_t *sensor, int level); + +static int reset(sensor_t *sensor) +{ + //dump_regs(sensor); + vTaskDelay(100 / portTICK_PERIOD_MS); + int ret = 0; + // Software Reset: clear all registers and reset them to their default values + ret = write_reg(sensor->slv_addr, SYSTEM_CTROL0, 0x82); + if(ret){ + ESP_LOGE(TAG, "Software Reset FAILED!"); + return ret; + } + vTaskDelay(100 / portTICK_PERIOD_MS); + ret = write_regs(sensor->slv_addr, sensor_default_regs); + if (ret == 0) { + ESP_LOGD(TAG, "Camera defaults loaded"); + vTaskDelay(100 / portTICK_PERIOD_MS); + //write_regs(sensor->slv_addr, sensor_regs_awb0); + //write_regs(sensor->slv_addr, sensor_regs_gamma1); + } + return ret; +} + +static int set_pixformat(sensor_t *sensor, pixformat_t pixformat) +{ + int ret = 0; + const uint16_t (*regs)[2]; + + switch (pixformat) { + case PIXFORMAT_YUV422: + regs = sensor_fmt_yuv422; + break; + + case PIXFORMAT_GRAYSCALE: + regs = sensor_fmt_grayscale; + break; + + case PIXFORMAT_RGB565: + case PIXFORMAT_RGB888: + regs = sensor_fmt_rgb565; + break; + + case PIXFORMAT_JPEG: + regs = sensor_fmt_jpeg; + break; + + case PIXFORMAT_RAW: + regs = sensor_fmt_raw; + break; + + default: + ESP_LOGE(TAG, "Unsupported pixformat: %u", pixformat); + return -1; + } + + ret = write_regs(sensor->slv_addr, regs); + if(ret == 0) { + sensor->pixformat = pixformat; + ESP_LOGD(TAG, "Set pixformat to: %u", pixformat); + } + return ret; +} + +static int set_image_options(sensor_t *sensor) +{ + int ret = 0; + uint8_t reg20 = 0; + uint8_t reg21 = 0; + uint8_t reg4514 = 0; + uint8_t reg4514_test = 0; + + // compression + if (sensor->pixformat == PIXFORMAT_JPEG) { + reg21 |= 0x20; + } + + // binning + if (!sensor->status.binning) { + reg20 |= 0x40; + } else { + reg20 |= 0x01; + reg21 |= 0x01; + reg4514_test |= 4; + } + + // V-Flip + if (sensor->status.vflip) { + reg20 |= 0x06; + reg4514_test |= 1; + } + + // H-Mirror + if (sensor->status.hmirror) { + reg21 |= 0x06; + reg4514_test |= 2; + } + + switch (reg4514_test) { + //no binning + case 0: reg4514 = 0x88; break;//normal + case 1: reg4514 = 0x00; break;//v-flip + case 2: reg4514 = 0xbb; break;//h-mirror + case 3: reg4514 = 0x00; break;//v-flip+h-mirror + //binning + case 4: reg4514 = 0xaa; break;//normal + case 5: reg4514 = 0xbb; break;//v-flip + case 6: reg4514 = 0xbb; break;//h-mirror + case 7: reg4514 = 0xaa; break;//v-flip+h-mirror + } + + if(write_reg(sensor->slv_addr, TIMING_TC_REG20, reg20) + || write_reg(sensor->slv_addr, TIMING_TC_REG21, reg21) + || write_reg(sensor->slv_addr, 0x4514, reg4514)){ + ESP_LOGE(TAG, "Setting Image Options Failed"); + return -1; + } + + if (!sensor->status.binning) { + ret = write_reg(sensor->slv_addr, 0x4520, 0x10) + || write_reg(sensor->slv_addr, X_INCREMENT, 0x11)//odd:1, even: 1 + || write_reg(sensor->slv_addr, Y_INCREMENT, 0x11);//odd:1, even: 1 + } else { + ret = write_reg(sensor->slv_addr, 0x4520, 0x0b) + || write_reg(sensor->slv_addr, X_INCREMENT, 0x31)//odd:3, even: 1 + || write_reg(sensor->slv_addr, Y_INCREMENT, 0x31);//odd:3, even: 1 + } + + ESP_LOGD(TAG, "Set Image Options: Compression: %u, Binning: %u, V-Flip: %u, H-Mirror: %u, Reg-4514: 0x%02x", + sensor->pixformat == PIXFORMAT_JPEG, sensor->status.binning, sensor->status.vflip, sensor->status.hmirror, reg4514); + return ret; +} + +static int set_framesize(sensor_t *sensor, framesize_t framesize) +{ + int ret = 0; + framesize_t old_framesize = sensor->status.framesize; + sensor->status.framesize = framesize; + + if(framesize > FRAMESIZE_QSXGA){ + ESP_LOGE(TAG, "Invalid framesize: %u", framesize); + return -1; + } + uint16_t w = resolution[framesize].width; + uint16_t h = resolution[framesize].height; + aspect_ratio_t ratio = resolution[framesize].aspect_ratio; + ratio_settings_t settings = ratio_table[ratio]; + + sensor->status.binning = (w <= (settings.max_width / 2) && h <= (settings.max_height / 2)); + sensor->status.scale = !((w == settings.max_width && h == settings.max_height) + || (w == (settings.max_width / 2) && h == (settings.max_height / 2))); + + ret = write_addr_reg(sensor->slv_addr, X_ADDR_ST_H, settings.start_x, settings.start_y) + || write_addr_reg(sensor->slv_addr, X_ADDR_END_H, settings.end_x, settings.end_y) + || write_addr_reg(sensor->slv_addr, X_OUTPUT_SIZE_H, w, h); + + if (ret) { + goto fail; + } + + if (!sensor->status.binning) { + ret = write_addr_reg(sensor->slv_addr, X_TOTAL_SIZE_H, settings.total_x, settings.total_y) + || write_addr_reg(sensor->slv_addr, X_OFFSET_H, settings.offset_x, settings.offset_y); + } else { + if (w > 920) { + ret = write_addr_reg(sensor->slv_addr, X_TOTAL_SIZE_H, settings.total_x - 200, settings.total_y / 2); + } else { + ret = write_addr_reg(sensor->slv_addr, X_TOTAL_SIZE_H, 2060, settings.total_y / 2); + } + if (ret == 0) { + ret = write_addr_reg(sensor->slv_addr, X_OFFSET_H, settings.offset_x / 2, settings.offset_y / 2); + } + } + + if (ret == 0) { + ret = write_reg_bits(sensor->slv_addr, ISP_CONTROL_01, 0x20, sensor->status.scale); + } + + if (ret == 0) { + ret = set_image_options(sensor); + } + + if (ret) { + goto fail; + } + + if (sensor->pixformat == PIXFORMAT_JPEG) { + //10MHz PCLK + uint8_t sys_mul = 200; + if(framesize < FRAMESIZE_QVGA || sensor->xclk_freq_hz == 16000000){ + sys_mul = 160; + } else if(framesize < FRAMESIZE_XGA){ + sys_mul = 180; + } + ret = set_pll(sensor, false, sys_mul, 4, 2, false, 2, true, 4); + //Set PLL: bypass: 0, multiplier: sys_mul, sys_div: 4, pre_div: 2, root_2x: 0, pclk_root_div: 2, pclk_manual: 1, pclk_div: 4 + } else { + //ret = set_pll(sensor, false, 8, 1, 1, false, 1, true, 4); + if (framesize > FRAMESIZE_HVGA) { + ret = set_pll(sensor, false, 10, 1, 2, false, 1, true, 2); + } else if (framesize >= FRAMESIZE_QVGA) { + ret = set_pll(sensor, false, 8, 1, 1, false, 1, true, 4); + } else { + ret = set_pll(sensor, false, 20, 1, 1, false, 1, true, 8); + } + } + + if (ret == 0) { + ESP_LOGD(TAG, "Set framesize to: %ux%u", w, h); + } + return ret; + +fail: + sensor->status.framesize = old_framesize; + ESP_LOGE(TAG, "Setting framesize to: %ux%u failed", w, h); + return ret; +} + +static int set_hmirror(sensor_t *sensor, int enable) +{ + int ret = 0; + sensor->status.hmirror = enable; + ret = set_image_options(sensor); + if (ret == 0) { + ESP_LOGD(TAG, "Set h-mirror to: %d", enable); + } + return ret; +} + +static int set_vflip(sensor_t *sensor, int enable) +{ + int ret = 0; + sensor->status.vflip = enable; + ret = set_image_options(sensor); + if (ret == 0) { + ESP_LOGD(TAG, "Set v-flip to: %d", enable); + } + return ret; +} + +static int set_quality(sensor_t *sensor, int qs) +{ + int ret = 0; + ret = write_reg(sensor->slv_addr, COMPRESSION_CTRL07, qs & 0x3f); + if (ret == 0) { + sensor->status.quality = qs; + ESP_LOGD(TAG, "Set quality to: %d", qs); + } + return ret; +} + +static int set_colorbar(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = write_reg_bits(sensor->slv_addr, PRE_ISP_TEST_SETTING_1, TEST_COLOR_BAR, enable); + if (ret == 0) { + sensor->status.colorbar = enable; + ESP_LOGD(TAG, "Set colorbar to: %d", enable); + } + return ret; +} + +static int set_gain_ctrl(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = write_reg_bits(sensor->slv_addr, AEC_PK_MANUAL, AEC_PK_MANUAL_AGC_MANUALEN, !enable); + if (ret == 0) { + ESP_LOGD(TAG, "Set gain_ctrl to: %d", enable); + sensor->status.agc = enable; + } + return ret; +} + +static int set_exposure_ctrl(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = write_reg_bits(sensor->slv_addr, AEC_PK_MANUAL, AEC_PK_MANUAL_AEC_MANUALEN, !enable); + if (ret == 0) { + ESP_LOGD(TAG, "Set exposure_ctrl to: %d", enable); + sensor->status.aec = enable; + } + return ret; +} + +static int set_whitebal(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = write_reg_bits(sensor->slv_addr, ISP_CONTROL_01, 0x01, enable); + if (ret == 0) { + ESP_LOGD(TAG, "Set awb to: %d", enable); + sensor->status.awb = enable; + } + return ret; +} + +//Advanced AWB +static int set_dcw_dsp(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = write_reg_bits(sensor->slv_addr, 0x5183, 0x80, !enable); + if (ret == 0) { + ESP_LOGD(TAG, "Set dcw to: %d", enable); + sensor->status.dcw = enable; + } + return ret; +} + +//night mode enable +static int set_aec2(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = write_reg_bits(sensor->slv_addr, 0x3a00, 0x04, enable); + if (ret == 0) { + ESP_LOGD(TAG, "Set aec2 to: %d", enable); + sensor->status.aec2 = enable; + } + return ret; +} + +static int set_bpc_dsp(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = write_reg_bits(sensor->slv_addr, 0x5000, 0x04, enable); + if (ret == 0) { + ESP_LOGD(TAG, "Set bpc to: %d", enable); + sensor->status.bpc = enable; + } + return ret; +} + +static int set_wpc_dsp(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = write_reg_bits(sensor->slv_addr, 0x5000, 0x02, enable); + if (ret == 0) { + ESP_LOGD(TAG, "Set wpc to: %d", enable); + sensor->status.wpc = enable; + } + return ret; +} + +//Gamma enable +static int set_raw_gma_dsp(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = write_reg_bits(sensor->slv_addr, 0x5000, 0x20, enable); + if (ret == 0) { + ESP_LOGD(TAG, "Set raw_gma to: %d", enable); + sensor->status.raw_gma = enable; + } + return ret; +} + +static int set_lenc_dsp(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = write_reg_bits(sensor->slv_addr, 0x5000, 0x80, enable); + if (ret == 0) { + ESP_LOGD(TAG, "Set lenc to: %d", enable); + sensor->status.lenc = enable; + } + return ret; +} + +static int get_agc_gain(sensor_t *sensor) +{ + int ra = read_reg(sensor->slv_addr, 0x350a); + if (ra < 0) { + return 0; + } + int rb = read_reg(sensor->slv_addr, 0x350b); + if (rb < 0) { + return 0; + } + int res = (rb & 0xF0) >> 4 | (ra & 0x03) << 4; + if (rb & 0x0F) { + res += 1; + } + return res; +} + +//real gain +static int set_agc_gain(sensor_t *sensor, int gain) +{ + int ret = 0; + if(gain < 0) { + gain = 0; + } else if(gain > 64) { + gain = 64; + } + + //gain value is 6.4 bits float + //in order to use the max range, we deduct 1/16 + int gainv = gain << 4; + if(gainv){ + gainv -= 1; + } + + ret = write_reg(sensor->slv_addr, 0x350a, gainv >> 8) || write_reg(sensor->slv_addr, 0x350b, gainv & 0xff); + if (ret == 0) { + ESP_LOGD(TAG, "Set agc_gain to: %d", gain); + sensor->status.agc_gain = gain; + } + return ret; +} + +static int get_aec_value(sensor_t *sensor) +{ + int ra = read_reg(sensor->slv_addr, 0x3500); + if (ra < 0) { + return 0; + } + int rb = read_reg(sensor->slv_addr, 0x3501); + if (rb < 0) { + return 0; + } + int rc = read_reg(sensor->slv_addr, 0x3502); + if (rc < 0) { + return 0; + } + int res = (ra & 0x0F) << 12 | (rb & 0xFF) << 4 | (rc & 0xF0) >> 4; + return res; +} + +static int set_aec_value(sensor_t *sensor, int value) +{ + int ret = 0, max_val = 0; + max_val = read_reg16(sensor->slv_addr, 0x380e); + if (max_val < 0) { + ESP_LOGE(TAG, "Could not read max aec_value"); + return -1; + } + if (value > max_val) { + value =max_val; + } + + ret = write_reg(sensor->slv_addr, 0x3500, (value >> 12) & 0x0F) + || write_reg(sensor->slv_addr, 0x3501, (value >> 4) & 0xFF) + || write_reg(sensor->slv_addr, 0x3502, (value << 4) & 0xF0); + + if (ret == 0) { + ESP_LOGD(TAG, "Set aec_value to: %d / %d", value, max_val); + sensor->status.aec_value = value; + } + return ret; +} + +static int set_ae_level(sensor_t *sensor, int level) +{ + int ret = 0; + if (level < -5 || level > 5) { + return -1; + } + //good targets are between 5 and 115 + int target_level = ((level + 5) * 10) + 5; + + int level_high, level_low; + int fast_high, fast_low; + + level_low = target_level * 23 / 25; //0.92 (0.46) + level_high = target_level * 27 / 25; //1.08 (2.08) + + fast_low = level_low >> 1; + fast_high = level_high << 1; + + if(fast_high>255) { + fast_high = 255; + } + + ret = write_reg(sensor->slv_addr, 0x3a0f, level_high) + || write_reg(sensor->slv_addr, 0x3a10, level_low) + || write_reg(sensor->slv_addr, 0x3a1b, level_high) + || write_reg(sensor->slv_addr, 0x3a1e, level_low) + || write_reg(sensor->slv_addr, 0x3a11, fast_high) + || write_reg(sensor->slv_addr, 0x3a1f, fast_low); + + if (ret == 0) { + ESP_LOGD(TAG, "Set ae_level to: %d", level); + sensor->status.ae_level = level; + } + return ret; +} + +static int set_wb_mode(sensor_t *sensor, int mode) +{ + int ret = 0; + if (mode < 0 || mode > 4) { + return -1; + } + + ret = write_reg(sensor->slv_addr, 0x3406, (mode != 0)); + if (ret) { + return ret; + } + switch (mode) { + case 1://Sunny + ret = write_reg16(sensor->slv_addr, 0x3400, 0x5e0) //AWB R GAIN + || write_reg16(sensor->slv_addr, 0x3402, 0x410) //AWB G GAIN + || write_reg16(sensor->slv_addr, 0x3404, 0x540);//AWB B GAIN + break; + case 2://Cloudy + ret = write_reg16(sensor->slv_addr, 0x3400, 0x650) //AWB R GAIN + || write_reg16(sensor->slv_addr, 0x3402, 0x410) //AWB G GAIN + || write_reg16(sensor->slv_addr, 0x3404, 0x4f0);//AWB B GAIN + break; + case 3://Office + ret = write_reg16(sensor->slv_addr, 0x3400, 0x520) //AWB R GAIN + || write_reg16(sensor->slv_addr, 0x3402, 0x410) //AWB G GAIN + || write_reg16(sensor->slv_addr, 0x3404, 0x660);//AWB B GAIN + break; + case 4://HOME + ret = write_reg16(sensor->slv_addr, 0x3400, 0x420) //AWB R GAIN + || write_reg16(sensor->slv_addr, 0x3402, 0x3f0) //AWB G GAIN + || write_reg16(sensor->slv_addr, 0x3404, 0x710);//AWB B GAIN + break; + default://AUTO + break; + } + + if (ret == 0) { + ESP_LOGD(TAG, "Set wb_mode to: %d", mode); + sensor->status.wb_mode = mode; + } + return ret; +} + +static int set_awb_gain_dsp(sensor_t *sensor, int enable) +{ + int ret = 0; + int old_mode = sensor->status.wb_mode; + int mode = enable?old_mode:0; + + ret = set_wb_mode(sensor, mode); + + if (ret == 0) { + sensor->status.wb_mode = old_mode; + ESP_LOGD(TAG, "Set awb_gain to: %d", enable); + sensor->status.awb_gain = enable; + } + return ret; +} + +static int set_special_effect(sensor_t *sensor, int effect) +{ + int ret=0; + if (effect < 0 || effect > 6) { + return -1; + } + + uint8_t * regs = (uint8_t *)sensor_special_effects[effect]; + ret = write_reg(sensor->slv_addr, 0x5580, regs[0]) + || write_reg(sensor->slv_addr, 0x5583, regs[1]) + || write_reg(sensor->slv_addr, 0x5584, regs[2]) + || write_reg(sensor->slv_addr, 0x5003, regs[3]); + + if (ret == 0) { + ESP_LOGD(TAG, "Set special_effect to: %d", effect); + sensor->status.special_effect = effect; + } + return ret; +} + +static int set_brightness(sensor_t *sensor, int level) +{ + int ret = 0; + uint8_t value = 0; + bool negative = false; + + switch (level) { + case 3: + value = 0x30; + break; + case 2: + value = 0x20; + break; + case 1: + value = 0x10; + break; + case -1: + value = 0x10; + negative = true; + break; + case -2: + value = 0x20; + negative = true; + break; + case -3: + value = 0x30; + negative = true; + break; + default: // 0 + break; + } + + ret = write_reg(sensor->slv_addr, 0x5587, value); + if (ret == 0) { + ret = write_reg_bits(sensor->slv_addr, 0x5588, 0x08, negative); + } + + if (ret == 0) { + ESP_LOGD(TAG, "Set brightness to: %d", level); + sensor->status.brightness = level; + } + return ret; +} + +static int set_contrast(sensor_t *sensor, int level) +{ + int ret = 0; + if(level > 3 || level < -3) { + return -1; + } + ret = write_reg(sensor->slv_addr, 0x5586, (level + 4) << 3); + + if (ret == 0) { + ESP_LOGD(TAG, "Set contrast to: %d", level); + sensor->status.contrast = level; + } + return ret; +} + +static int set_saturation(sensor_t *sensor, int level) +{ + int ret = 0; + if(level > 4 || level < -4) { + return -1; + } + + uint8_t * regs = (uint8_t *)sensor_saturation_levels[level+4]; + for(int i=0; i<11; i++) { + ret = write_reg(sensor->slv_addr, 0x5381 + i, regs[i]); + if (ret) { + break; + } + } + + if (ret == 0) { + ESP_LOGD(TAG, "Set saturation to: %d", level); + sensor->status.saturation = level; + } + return ret; +} + +static int set_sharpness(sensor_t *sensor, int level) +{ + int ret = 0; + if(level > 3 || level < -3) { + return -1; + } + + uint8_t mt_offset_2 = (level + 3) * 8; + uint8_t mt_offset_1 = mt_offset_2 + 1; + + ret = write_reg_bits(sensor->slv_addr, 0x5308, 0x40, false)//0x40 means auto + || write_reg(sensor->slv_addr, 0x5300, 0x10) + || write_reg(sensor->slv_addr, 0x5301, 0x10) + || write_reg(sensor->slv_addr, 0x5302, mt_offset_1) + || write_reg(sensor->slv_addr, 0x5303, mt_offset_2) + || write_reg(sensor->slv_addr, 0x5309, 0x10) + || write_reg(sensor->slv_addr, 0x530a, 0x10) + || write_reg(sensor->slv_addr, 0x530b, 0x04) + || write_reg(sensor->slv_addr, 0x530c, 0x06); + + if (ret == 0) { + ESP_LOGD(TAG, "Set sharpness to: %d", level); + sensor->status.sharpness = level; + } + return ret; +} + +static int set_gainceiling(sensor_t *sensor, gainceiling_t level) +{ + int ret = 0, l = (int)level; + + ret = write_reg(sensor->slv_addr, 0x3A18, (l >> 8) & 3) + || write_reg(sensor->slv_addr, 0x3A19, l & 0xFF); + + if (ret == 0) { + ESP_LOGD(TAG, "Set gainceiling to: %d", l); + sensor->status.gainceiling = l; + } + return ret; +} + +static int get_denoise(sensor_t *sensor) +{ + if (!check_reg_mask(sensor->slv_addr, 0x5308, 0x10)) { + return 0; + } + return (read_reg(sensor->slv_addr, 0x5306) / 4) + 1; +} + +static int set_denoise(sensor_t *sensor, int level) +{ + int ret = 0; + if (level < 0 || level > 8) { + return -1; + } + + ret = write_reg_bits(sensor->slv_addr, 0x5308, 0x10, level > 0); + if (ret == 0 && level > 0) { + ret = write_reg(sensor->slv_addr, 0x5306, (level - 1) * 4); + } + + if (ret == 0) { + ESP_LOGD(TAG, "Set denoise to: %d", level); + sensor->status.denoise = level; + } + return ret; +} + +static int get_reg(sensor_t *sensor, int reg, int mask) +{ + int ret = 0, ret2 = 0; + if(mask > 0xFF){ + ret = read_reg16(sensor->slv_addr, reg); + if(ret >= 0 && mask > 0xFFFF){ + ret2 = read_reg(sensor->slv_addr, reg+2); + if(ret2 >= 0){ + ret = (ret << 8) | ret2 ; + } else { + ret = ret2; + } + } + } else { + ret = read_reg(sensor->slv_addr, reg); + } + if(ret > 0){ + ret &= mask; + } + return ret; +} + +static int set_reg(sensor_t *sensor, int reg, int mask, int value) +{ + int ret = 0, ret2 = 0; + if(mask > 0xFF){ + ret = read_reg16(sensor->slv_addr, reg); + if(ret >= 0 && mask > 0xFFFF){ + ret2 = read_reg(sensor->slv_addr, reg+2); + if(ret2 >= 0){ + ret = (ret << 8) | ret2 ; + } else { + ret = ret2; + } + } + } else { + ret = read_reg(sensor->slv_addr, reg); + } + if(ret < 0){ + return ret; + } + value = (ret & ~mask) | (value & mask); + if(mask > 0xFFFF){ + ret = write_reg16(sensor->slv_addr, reg, value >> 8); + if(ret >= 0){ + ret = write_reg(sensor->slv_addr, reg+2, value & 0xFF); + } + } else if(mask > 0xFF){ + ret = write_reg16(sensor->slv_addr, reg, value); + } else { + ret = write_reg(sensor->slv_addr, reg, value); + } + return ret; +} + +static int set_res_raw(sensor_t *sensor, int startX, int startY, int endX, int endY, int offsetX, int offsetY, int totalX, int totalY, int outputX, int outputY, bool scale, bool binning) +{ + int ret = 0; + ret = write_addr_reg(sensor->slv_addr, X_ADDR_ST_H, startX, startY) + || write_addr_reg(sensor->slv_addr, X_ADDR_END_H, endX, endY) + || write_addr_reg(sensor->slv_addr, X_OFFSET_H, offsetX, offsetY) + || write_addr_reg(sensor->slv_addr, X_TOTAL_SIZE_H, totalX, totalY) + || write_addr_reg(sensor->slv_addr, X_OUTPUT_SIZE_H, outputX, outputY) + || write_reg_bits(sensor->slv_addr, ISP_CONTROL_01, 0x20, scale); + if(!ret){ + sensor->status.scale = scale; + sensor->status.binning = binning; + ret = set_image_options(sensor); + } + return ret; +} + +static int _set_pll(sensor_t *sensor, int bypass, int multiplier, int sys_div, int root_2x, int pre_div, int seld5, int pclk_manual, int pclk_div) +{ + int ret = 0; + ret = set_pll(sensor, bypass > 0, multiplier, sys_div, pre_div, root_2x > 0, seld5, pclk_manual > 0, pclk_div); + return ret; +} + +static int set_xclk(sensor_t *sensor, int timer, int xclk) +{ + int ret = 0; + sensor->xclk_freq_hz = xclk * 1000000U; + ret = xclk_timer_conf(timer, sensor->xclk_freq_hz); + return ret; +} + +static int init_status(sensor_t *sensor) +{ + sensor->status.brightness = 0; + sensor->status.contrast = 0; + sensor->status.saturation = 0; + sensor->status.sharpness = (read_reg(sensor->slv_addr, 0x5303) / 8) - 3; + sensor->status.denoise = get_denoise(sensor); + sensor->status.ae_level = 0; + sensor->status.gainceiling = read_reg16(sensor->slv_addr, 0x3A18) & 0x3FF; + sensor->status.awb = check_reg_mask(sensor->slv_addr, ISP_CONTROL_01, 0x01); + sensor->status.dcw = !check_reg_mask(sensor->slv_addr, 0x5183, 0x80); + sensor->status.agc = !check_reg_mask(sensor->slv_addr, AEC_PK_MANUAL, AEC_PK_MANUAL_AGC_MANUALEN); + sensor->status.aec = !check_reg_mask(sensor->slv_addr, AEC_PK_MANUAL, AEC_PK_MANUAL_AEC_MANUALEN); + sensor->status.hmirror = check_reg_mask(sensor->slv_addr, TIMING_TC_REG21, TIMING_TC_REG21_HMIRROR); + sensor->status.vflip = check_reg_mask(sensor->slv_addr, TIMING_TC_REG20, TIMING_TC_REG20_VFLIP); + sensor->status.colorbar = check_reg_mask(sensor->slv_addr, PRE_ISP_TEST_SETTING_1, TEST_COLOR_BAR); + sensor->status.bpc = check_reg_mask(sensor->slv_addr, 0x5000, 0x04); + sensor->status.wpc = check_reg_mask(sensor->slv_addr, 0x5000, 0x02); + sensor->status.raw_gma = check_reg_mask(sensor->slv_addr, 0x5000, 0x20); + sensor->status.lenc = check_reg_mask(sensor->slv_addr, 0x5000, 0x80); + sensor->status.quality = read_reg(sensor->slv_addr, COMPRESSION_CTRL07) & 0x3f; + sensor->status.special_effect = 0; + sensor->status.wb_mode = 0; + sensor->status.awb_gain = check_reg_mask(sensor->slv_addr, 0x3406, 0x01); + sensor->status.agc_gain = get_agc_gain(sensor); + sensor->status.aec_value = get_aec_value(sensor); + sensor->status.aec2 = check_reg_mask(sensor->slv_addr, 0x3a00, 0x04); + return 0; +} + +int ov5640_detect(int slv_addr, sensor_id_t *id) +{ + if (OV5640_SCCB_ADDR == slv_addr) { + uint8_t h = SCCB_Read16(slv_addr, 0x300A); + uint8_t l = SCCB_Read16(slv_addr, 0x300B); + uint16_t PID = (h<<8) | l; + if (OV5640_PID == PID) { + id->PID = PID; + return PID; + } else { + ESP_LOGI(TAG, "Mismatch PID=0x%x", PID); + } + } + return 0; +} + +int ov5640_init(sensor_t *sensor) +{ + sensor->reset = reset; + sensor->set_pixformat = set_pixformat; + sensor->set_framesize = set_framesize; + sensor->set_contrast = set_contrast; + sensor->set_brightness = set_brightness; + sensor->set_saturation = set_saturation; + sensor->set_sharpness = set_sharpness; + sensor->set_gainceiling = set_gainceiling; + sensor->set_quality = set_quality; + sensor->set_colorbar = set_colorbar; + sensor->set_gain_ctrl = set_gain_ctrl; + sensor->set_exposure_ctrl = set_exposure_ctrl; + sensor->set_whitebal = set_whitebal; + sensor->set_hmirror = set_hmirror; + sensor->set_vflip = set_vflip; + sensor->init_status = init_status; + sensor->set_aec2 = set_aec2; + sensor->set_aec_value = set_aec_value; + sensor->set_special_effect = set_special_effect; + sensor->set_wb_mode = set_wb_mode; + sensor->set_ae_level = set_ae_level; + sensor->set_dcw = set_dcw_dsp; + sensor->set_bpc = set_bpc_dsp; + sensor->set_wpc = set_wpc_dsp; + sensor->set_awb_gain = set_awb_gain_dsp; + sensor->set_agc_gain = set_agc_gain; + sensor->set_raw_gma = set_raw_gma_dsp; + sensor->set_lenc = set_lenc_dsp; + sensor->set_denoise = set_denoise; + + sensor->get_reg = get_reg; + sensor->set_reg = set_reg; + sensor->set_res_raw = set_res_raw; + sensor->set_pll = _set_pll; + sensor->set_xclk = set_xclk; + return 0; +} diff --git a/lib/libesp32_div/esp32-camera/sensors/ov7670.c b/lib/libesp32_div/esp32-camera/sensors/ov7670.c new file mode 100644 index 000000000..b9dcf2327 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/ov7670.c @@ -0,0 +1,457 @@ +/* + * This file is part of the OpenMV project. + * author: Juan Schiavoni + * This work is licensed under the MIT license, see the file LICENSE for details. + * + * OV7725 driver. + * + */ +#include +#include +#include +#include "sccb.h" +#include "ov7670.h" +#include "ov7670_regs.h" +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" +#include + +#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) +#include "esp32-hal-log.h" +#else +#include "esp_log.h" +static const char* TAG = "ov7760"; +#endif + +static int ov7670_clkrc = 0x01; + +/* + * The default register settings, as obtained from OmniVision. There + * is really no making sense of most of these - lots of "reserved" values + * and such. + * + * These settings give VGA YUYV. + */ +struct regval_list { + uint8_t reg_num; + uint8_t value; +}; + +static struct regval_list ov7670_default_regs[] = { + /* Sensor automatically sets output window when resolution changes. */ + {TSLB, 0x04}, + + /* Frame rate 30 fps at 12 Mhz clock */ + {CLKRC, 0x00}, + {DBLV, 0x4A}, + + {COM10, COM10_VSYNC_NEG | COM10_PCLK_MASK}, + + /* Improve white balance */ + {COM4, 0x40}, + + /* Improve color */ + {RSVD_B0, 0x84}, + + /* Enable 50/60 Hz auto detection */ + {COM11, COM11_EXP|COM11_HZAUTO}, + + /* Disable some delays */ + {HSYST, 0}, + {HSYEN, 0}, + + {MVFP, MVFP_SUN}, + + /* More reserved magic, some of which tweaks white balance */ + {AWBC1, 0x0a}, + {AWBC2, 0xf0}, + {AWBC3, 0x34}, + {AWBC4, 0x58}, + {AWBC5, 0x28}, + {AWBC6, 0x3a}, + + {AWBCTR3, 0x0a}, + {AWBCTR2, 0x55}, + {AWBCTR1, 0x11}, + {AWBCTR0, 0x9e}, + + {COM8, COM8_FAST_AUTO|COM8_STEP_UNLIMIT|COM8_AGC_EN|COM8_AEC_EN|COM8_AWB_EN}, + + /* End marker is FF because in ov7670 the address of GAIN 0 and default value too. */ + {0xFF, 0xFF}, +}; + +static struct regval_list ov7670_fmt_yuv422[] = { + { COM7, 0x0 }, /* Selects YUV mode */ + { RGB444, 0 }, /* No RGB444 please */ + { COM1, 0 }, /* CCIR601 */ + { COM15, COM15_R00FF }, + { MVFP, MVFP_SUN }, + { COM9, 0x6A }, /* 128x gain ceiling; 0x8 is reserved bit */ + { MTX1, 0x80 }, /* "matrix coefficient 1" */ + { MTX2, 0x80 }, /* "matrix coefficient 2" */ + { MTX3, 0 }, /* vb */ + { MTX4, 0x22 }, /* "matrix coefficient 4" */ + { MTX5, 0x5e }, /* "matrix coefficient 5" */ + { MTX6, 0x80 }, /* "matrix coefficient 6" */ + { COM13, COM13_UVSAT }, + { 0xff, 0xff }, /* END MARKER */ +}; + +static struct regval_list ov7670_fmt_rgb565[] = { + { COM7, COM7_FMT_RGB565 }, /* Selects RGB mode */ + { RGB444, 0 }, /* No RGB444 please */ + { COM1, 0x0 }, /* CCIR601 */ + { COM15, COM15_RGB565 |COM15_R00FF }, + { MVFP, MVFP_SUN }, + { COM9, 0x6A }, /* 128x gain ceiling; 0x8 is reserved bit */ + { MTX1, 0xb3 }, /* "matrix coefficient 1" */ + { MTX2, 0xb3 }, /* "matrix coefficient 2" */ + { MTX3, 0 }, /* vb */ + { MTX4, 0x3d }, /* "matrix coefficient 4" */ + { MTX5, 0xa7 }, /* "matrix coefficient 5" */ + { MTX6, 0xe4 }, /* "matrix coefficient 6" */ + { COM13, COM13_UVSAT }, + { 0xff, 0xff }, /* END MARKER */ +}; + + +static struct regval_list ov7670_vga[] = { + { COM3, 0x00 }, + { COM14, 0x00 }, + { SCALING_XSC, 0x3A }, + { SCALING_YSC, 0x35 }, + { SCALING_DCWCTR, 0x11 }, + { SCALING_PCLK_DIV, 0xF0 }, + { SCALING_PCLK_DELAY, 0x02 }, + { 0xff, 0xff }, +}; + +static struct regval_list ov7670_qvga[] = { + { COM3, 0x04 }, + { COM14, 0x19 }, + { SCALING_XSC, 0x3A }, + { SCALING_YSC, 0x35 }, + { SCALING_DCWCTR, 0x11 }, + { SCALING_PCLK_DIV, 0xF1 }, + { SCALING_PCLK_DELAY, 0x02 }, + { 0xff, 0xff }, +}; + +static struct regval_list ov7670_qqvga[] = { + { COM3, 0x04 }, //DCW enable + { COM14, 0x1a }, //pixel clock divided by 4, manual scaling enable, DCW and PCLK controlled by register + { SCALING_XSC, 0x3a }, + { SCALING_YSC, 0x35 }, + { SCALING_DCWCTR, 0x22 }, //downsample by 4 + { SCALING_PCLK_DIV, 0xf2 }, //pixel clock divided by 4 + { SCALING_PCLK_DELAY, 0x02 }, + { 0xff, 0xff }, +}; + +/* + * Write a list of register settings; ff/ff stops the process. + */ +static int ov7670_write_array(sensor_t *sensor, struct regval_list *vals) +{ +int ret = 0; + + while ( (vals->reg_num != 0xff || vals->value != 0xff) && (ret == 0) ) { + ret = SCCB_Write(sensor->slv_addr, vals->reg_num, vals->value); + + ESP_LOGD(TAG, "reset reg %02X, W(%02X) R(%02X)", vals->reg_num, + vals->value, SCCB_Read(sensor->slv_addr, vals->reg_num) ); + + vals++; + } + + return ret; +} + +/* + * Calculate the frame control registers. + */ +static int ov7670_frame_control(sensor_t *sensor, int hstart, int hstop, int vstart, int vstop) +{ +struct regval_list frame[7]; + + frame[0].reg_num = HSTART; + frame[0].value = (hstart >> 3); + + frame[1].reg_num = HSTOP; + frame[1].value = (hstop >> 3); + + frame[2].reg_num = HREF; + frame[2].value = (((hstop & 0x07) << 3) | (hstart & 0x07)); + + frame[3].reg_num = VSTART; + frame[3].value = (vstart >> 2); + + frame[4].reg_num = VSTOP; + frame[4].value = (vstop >> 2); + + frame[5].reg_num = VREF; + frame[5].value = (((vstop & 0x02) << 2) | (vstart & 0x02)); + + /* End mark */ + frame[5].reg_num = 0xFF; + frame[5].value = 0xFF; + + return ov7670_write_array(sensor, frame); +} + +static int reset(sensor_t *sensor) +{ + int ret; + + // Reset all registers + SCCB_Write(sensor->slv_addr, COM7, COM7_RESET); + + // Delay 10 ms + vTaskDelay(10 / portTICK_PERIOD_MS); + + ret = ov7670_write_array(sensor, ov7670_default_regs); + + // Delay + vTaskDelay(30 / portTICK_PERIOD_MS); + + return ret; +} + +static int set_pixformat(sensor_t *sensor, pixformat_t pixformat) +{ +int ret; + + switch (pixformat) { + case PIXFORMAT_RGB565: + case PIXFORMAT_RGB888: + ret = ov7670_write_array(sensor, ov7670_fmt_rgb565); + break; + + case PIXFORMAT_YUV422: + case PIXFORMAT_GRAYSCALE: + default: + ret = ov7670_write_array(sensor, ov7670_fmt_yuv422); + break; + } + + vTaskDelay(30 / portTICK_PERIOD_MS); + + /* + * If we're running RGB565, we must rewrite clkrc after setting + * the other parameters or the image looks poor. If we're *not* + * doing RGB565, we must not rewrite clkrc or the image looks + * *really* poor. + * + * (Update) Now that we retain clkrc state, we should be able + * to write it unconditionally, and that will make the frame + * rate persistent too. + */ + if (pixformat == PIXFORMAT_RGB565) { + ret = SCCB_Write(sensor->slv_addr, CLKRC, ov7670_clkrc); + } + + return ret; +} + +static int set_framesize(sensor_t *sensor, framesize_t framesize) +{ + int ret; + + // store clkrc before changing window settings... + ov7670_clkrc = SCCB_Read(sensor->slv_addr, CLKRC); + + switch (framesize){ + case FRAMESIZE_VGA: + if( (ret = ov7670_write_array(sensor, ov7670_vga)) == 0 ) { + /* These values from Omnivision */ + ret = ov7670_frame_control(sensor, 158, 14, 10, 490); + } + break; + case FRAMESIZE_QVGA: + if( (ret = ov7670_write_array(sensor, ov7670_qvga)) == 0 ) { + /* These values from Omnivision */ + ret = ov7670_frame_control(sensor, 158, 14, 10, 490); + } + break; + case FRAMESIZE_QQVGA: + if( (ret = ov7670_write_array(sensor, ov7670_qqvga)) == 0 ) { + /* These values from Omnivision */ + ret = ov7670_frame_control(sensor, 158, 14, 10, 490); + } + break; + + default: + ret = -1; + } + + vTaskDelay(30 / portTICK_PERIOD_MS); + + if (ret == 0) { + sensor->status.framesize = framesize; + } + + return ret; +} + +static int set_colorbar(sensor_t *sensor, int enable) +{ + uint8_t ret = 0; + // Read register scaling_xsc + uint8_t reg = SCCB_Read(sensor->slv_addr, SCALING_XSC); + + // Pattern to set color bar bit[0]=0 in every case + reg = SCALING_XSC_CBAR(reg); + + // Write pattern to SCALING_XSC + ret = SCCB_Write(sensor->slv_addr, SCALING_XSC, reg); + + // Read register scaling_ysc + reg = SCCB_Read(sensor->slv_addr, SCALING_YSC); + + // Pattern to set color bar bit[0]=0 in every case + reg = SCALING_YSC_CBAR(reg, enable); + + // Write pattern to SCALING_YSC + ret = ret | SCCB_Write(sensor->slv_addr, SCALING_YSC, reg); + + // return 0 or 0xFF + return ret; +} + +static int set_whitebal(sensor_t *sensor, int enable) +{ + // Read register COM8 + uint8_t reg = SCCB_Read(sensor->slv_addr, COM8); + + // Set white bal on/off + reg = COM8_SET_AWB(reg, enable); + + // Write back register COM8 + return SCCB_Write(sensor->slv_addr, COM8, reg); +} + +static int set_gain_ctrl(sensor_t *sensor, int enable) +{ + // Read register COM8 + uint8_t reg = SCCB_Read(sensor->slv_addr, COM8); + + // Set white bal on/off + reg = COM8_SET_AGC(reg, enable); + + // Write back register COM8 + return SCCB_Write(sensor->slv_addr, COM8, reg); +} + +static int set_exposure_ctrl(sensor_t *sensor, int enable) +{ + // Read register COM8 + uint8_t reg = SCCB_Read(sensor->slv_addr, COM8); + + // Set white bal on/off + reg = COM8_SET_AEC(reg, enable); + + // Write back register COM8 + return SCCB_Write(sensor->slv_addr, COM8, reg); +} + +static int set_hmirror(sensor_t *sensor, int enable) +{ + // Read register MVFP + uint8_t reg = SCCB_Read(sensor->slv_addr, MVFP); + + // Set mirror on/off + reg = MVFP_SET_MIRROR(reg, enable); + + // Write back register MVFP + return SCCB_Write(sensor->slv_addr, MVFP, reg); +} + +static int set_vflip(sensor_t *sensor, int enable) +{ + // Read register MVFP + uint8_t reg = SCCB_Read(sensor->slv_addr, MVFP); + + // Set mirror on/off + reg = MVFP_SET_FLIP(reg, enable); + + // Write back register MVFP + return SCCB_Write(sensor->slv_addr, MVFP, reg); +} + +static int init_status(sensor_t *sensor) +{ + sensor->status.awb = 0; + sensor->status.aec = 0; + sensor->status.agc = 0; + sensor->status.hmirror = 0; + sensor->status.vflip = 0; + sensor->status.colorbar = 0; + return 0; +} + +static int set_dummy(sensor_t *sensor, int val){ return -1; } +static int set_gainceiling_dummy(sensor_t *sensor, gainceiling_t val){ return -1; } + +int ov7670_detect(int slv_addr, sensor_id_t *id) +{ + if (OV7670_SCCB_ADDR == slv_addr) { + SCCB_Write(slv_addr, 0xFF, 0x01);//bank sensor + uint16_t PID = SCCB_Read(slv_addr, 0x0A); + if (OV7670_PID == PID) { + id->PID = PID; + id->VER = SCCB_Read(slv_addr, REG_VER); + id->MIDL = SCCB_Read(slv_addr, REG_MIDL); + id->MIDH = SCCB_Read(slv_addr, REG_MIDH); + return PID; + } else { + ESP_LOGI(TAG, "Mismatch PID=0x%x", PID); + } + } + return 0; +} + +int ov7670_init(sensor_t *sensor) +{ + // Set function pointers + sensor->reset = reset; + sensor->init_status = init_status; + sensor->set_pixformat = set_pixformat; + sensor->set_framesize = set_framesize; + sensor->set_colorbar = set_colorbar; + sensor->set_whitebal = set_whitebal; + sensor->set_gain_ctrl = set_gain_ctrl; + sensor->set_exposure_ctrl = set_exposure_ctrl; + sensor->set_hmirror = set_hmirror; + sensor->set_vflip = set_vflip; + + //not supported + sensor->set_brightness= set_dummy; + sensor->set_saturation= set_dummy; + sensor->set_quality = set_dummy; + sensor->set_gainceiling = set_gainceiling_dummy; + sensor->set_aec2 = set_dummy; + sensor->set_aec_value = set_dummy; + sensor->set_special_effect = set_dummy; + sensor->set_wb_mode = set_dummy; + sensor->set_ae_level = set_dummy; + sensor->set_dcw = set_dummy; + sensor->set_bpc = set_dummy; + sensor->set_wpc = set_dummy; + sensor->set_awb_gain = set_dummy; + sensor->set_agc_gain = set_dummy; + sensor->set_raw_gma = set_dummy; + sensor->set_lenc = set_dummy; + sensor->set_sharpness = set_dummy; + sensor->set_denoise = set_dummy; + + // Retrieve sensor's signature + sensor->id.MIDH = SCCB_Read(sensor->slv_addr, REG_MIDH); + sensor->id.MIDL = SCCB_Read(sensor->slv_addr, REG_MIDL); + sensor->id.PID = SCCB_Read(sensor->slv_addr, REG_PID); + sensor->id.VER = SCCB_Read(sensor->slv_addr, REG_VER); + + ESP_LOGD(TAG, "OV7670 Attached"); + + return 0; +} diff --git a/lib/libesp32_div/esp32-camera/sensors/ov7725.c b/lib/libesp32_div/esp32-camera/sensors/ov7725.c new file mode 100644 index 000000000..ad5d89541 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/ov7725.c @@ -0,0 +1,575 @@ +/* + * This file is part of the OpenMV project. + * Copyright (c) 2013/2014 Ibrahim Abdelkader + * This work is licensed under the MIT license, see the file LICENSE for details. + * + * OV7725 driver. + * + */ +#include +#include +#include +#include +#include "sccb.h" +#include "xclk.h" +#include "ov7725.h" +#include "ov7725_regs.h" +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" + +#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) +#include "esp32-hal-log.h" +#else +#include "esp_log.h" +static const char* TAG = "ov7725"; +#endif + + +static const uint8_t default_regs[][2] = { + {COM3, COM3_SWAP_YUV}, + {COM7, COM7_RES_QVGA | COM7_FMT_YUV}, + + {COM4, 0x01 | 0x00}, /* bypass PLL (0x00:off, 0x40:4x, 0x80:6x, 0xC0:8x) */ + {CLKRC, 0x80 | 0x03}, /* Res/Bypass pre-scalar (0x40:bypass, 0x00-0x3F:prescaler PCLK=XCLK/(prescaler + 1)/2 ) */ + + // QVGA Window Size + {HSTART, 0x3F}, + {HSIZE, 0x50}, + {VSTART, 0x03}, + {VSIZE, 0x78}, + {HREF, 0x00}, + + // Scale down to QVGA Resolution + {HOUTSIZE, 0x50}, + {VOUTSIZE, 0x78}, + {EXHCH, 0x00}, + + {COM12, 0x03}, + {TGT_B, 0x7F}, + {FIXGAIN, 0x09}, + {AWB_CTRL0, 0xE0}, + {DSP_CTRL1, 0xFF}, + + {DSP_CTRL2, DSP_CTRL2_VDCW_EN | DSP_CTRL2_HDCW_EN | DSP_CTRL2_HZOOM_EN | DSP_CTRL2_VZOOM_EN}, + + {DSP_CTRL3, 0x00}, + {DSP_CTRL4, 0x00}, + {DSPAUTO, 0xFF}, + + {COM8, 0xF0}, + {COM6, 0xC5}, + {COM9, 0x11}, + {COM10, COM10_VSYNC_NEG | COM10_PCLK_MASK}, //Invert VSYNC and MASK PCLK + {BDBASE, 0x7F}, + {DBSTEP, 0x03}, + {AEW, 0x96}, + {AEB, 0x64}, + {VPT, 0xA1}, + {EXHCL, 0x00}, + {AWB_CTRL3, 0xAA}, + {COM8, 0xFF}, + + //Gamma + {GAM1, 0x0C}, + {GAM2, 0x16}, + {GAM3, 0x2A}, + {GAM4, 0x4E}, + {GAM5, 0x61}, + {GAM6, 0x6F}, + {GAM7, 0x7B}, + {GAM8, 0x86}, + {GAM9, 0x8E}, + {GAM10, 0x97}, + {GAM11, 0xA4}, + {GAM12, 0xAF}, + {GAM13, 0xC5}, + {GAM14, 0xD7}, + {GAM15, 0xE8}, + + {SLOP, 0x20}, + {EDGE1, 0x05}, + {EDGE2, 0x03}, + {EDGE3, 0x00}, + {DNSOFF, 0x01}, + + {MTX1, 0xB0}, + {MTX2, 0x9D}, + {MTX3, 0x13}, + {MTX4, 0x16}, + {MTX5, 0x7B}, + {MTX6, 0x91}, + {MTX_CTRL, 0x1E}, + + {BRIGHTNESS, 0x08}, + {CONTRAST, 0x30}, + {UVADJ0, 0x81}, + {SDE, (SDE_CONT_BRIGHT_EN | SDE_SATURATION_EN)}, + + // For 30 fps/60Hz + {DM_LNL, 0x00}, + {DM_LNH, 0x00}, + {BDBASE, 0x7F}, + {DBSTEP, 0x03}, + + // Lens Correction, should be tuned with real camera module + {LC_RADI, 0x10}, + {LC_COEF, 0x10}, + {LC_COEFB, 0x14}, + {LC_COEFR, 0x17}, + {LC_CTR, 0x05}, + {COM5, 0xF5}, //0x65 + + {0x00, 0x00}, +}; + +static int get_reg(sensor_t *sensor, int reg, int mask) +{ + int ret = SCCB_Read(sensor->slv_addr, reg & 0xFF); + if(ret > 0){ + ret &= mask; + } + return ret; +} + +static int set_reg(sensor_t *sensor, int reg, int mask, int value) +{ + int ret = 0; + ret = SCCB_Read(sensor->slv_addr, reg & 0xFF); + if(ret < 0){ + return ret; + } + value = (ret & ~mask) | (value & mask); + ret = SCCB_Write(sensor->slv_addr, reg & 0xFF, value); + return ret; +} + +static int set_reg_bits(sensor_t *sensor, uint8_t reg, uint8_t offset, uint8_t length, uint8_t value) +{ + int ret = 0; + ret = SCCB_Read(sensor->slv_addr, reg); + if(ret < 0){ + return ret; + } + uint8_t mask = ((1 << length) - 1) << offset; + value = (ret & ~mask) | ((value << offset) & mask); + ret = SCCB_Write(sensor->slv_addr, reg & 0xFF, value); + return ret; +} + +static int get_reg_bits(sensor_t *sensor, uint8_t reg, uint8_t offset, uint8_t length) +{ + int ret = 0; + ret = SCCB_Read(sensor->slv_addr, reg); + if(ret < 0){ + return ret; + } + uint8_t mask = ((1 << length) - 1) << offset; + return (ret & mask) >> offset; +} + + +static int reset(sensor_t *sensor) +{ + int i=0; + const uint8_t (*regs)[2]; + + // Reset all registers + SCCB_Write(sensor->slv_addr, COM7, COM7_RESET); + + // Delay 10 ms + vTaskDelay(10 / portTICK_PERIOD_MS); + + // Write default regsiters + for (i=0, regs = default_regs; regs[i][0]; i++) { + SCCB_Write(sensor->slv_addr, regs[i][0], regs[i][1]); + } + + // Delay + vTaskDelay(30 / portTICK_PERIOD_MS); + + return 0; +} + + +static int set_pixformat(sensor_t *sensor, pixformat_t pixformat) +{ + int ret=0; + sensor->pixformat = pixformat; + // Read register COM7 + uint8_t reg = SCCB_Read(sensor->slv_addr, COM7); + + switch (pixformat) { + case PIXFORMAT_RGB565: + reg = COM7_SET_RGB(reg, COM7_FMT_RGB565); + break; + case PIXFORMAT_YUV422: + case PIXFORMAT_GRAYSCALE: + reg = COM7_SET_FMT(reg, COM7_FMT_YUV); + break; + default: + return -1; + } + + // Write back register COM7 + ret = SCCB_Write(sensor->slv_addr, COM7, reg); + + // Delay + vTaskDelay(30 / portTICK_PERIOD_MS); + + return ret; +} + +static int set_framesize(sensor_t *sensor, framesize_t framesize) +{ + int ret=0; + if (framesize > FRAMESIZE_VGA) { + return -1; + } + uint16_t w = resolution[framesize].width; + uint16_t h = resolution[framesize].height; + uint8_t reg = SCCB_Read(sensor->slv_addr, COM7); + + sensor->status.framesize = framesize; + + // Write MSBs + ret |= SCCB_Write(sensor->slv_addr, HOUTSIZE, w>>2); + ret |= SCCB_Write(sensor->slv_addr, VOUTSIZE, h>>1); + + ret |= SCCB_Write(sensor->slv_addr, HSIZE, w>>2); + ret |= SCCB_Write(sensor->slv_addr, VSIZE, h>>1); + + // Write LSBs + ret |= SCCB_Write(sensor->slv_addr, HREF, ((w&0x3) | ((h&0x1) << 2))); + + if (framesize < FRAMESIZE_VGA) { + // Enable auto-scaling/zooming factors + ret |= SCCB_Write(sensor->slv_addr, DSPAUTO, 0xFF); + + ret |= SCCB_Write(sensor->slv_addr, HSTART, 0x3F); + ret |= SCCB_Write(sensor->slv_addr, VSTART, 0x03); + + ret |= SCCB_Write(sensor->slv_addr, COM7, reg | COM7_RES_QVGA); + + ret |= SCCB_Write(sensor->slv_addr, CLKRC, 0x80 | 0x01); + + } else { + // Disable auto-scaling/zooming factors + ret |= SCCB_Write(sensor->slv_addr, DSPAUTO, 0xF3); + + // Clear auto-scaling/zooming factors + ret |= SCCB_Write(sensor->slv_addr, SCAL0, 0x00); + ret |= SCCB_Write(sensor->slv_addr, SCAL1, 0x00); + ret |= SCCB_Write(sensor->slv_addr, SCAL2, 0x00); + + ret |= SCCB_Write(sensor->slv_addr, HSTART, 0x23); + ret |= SCCB_Write(sensor->slv_addr, VSTART, 0x07); + + ret |= SCCB_Write(sensor->slv_addr, COM7, reg & ~COM7_RES_QVGA); + + ret |= SCCB_Write(sensor->slv_addr, CLKRC, 0x80 | 0x03); + } + + // Delay + vTaskDelay(30 / portTICK_PERIOD_MS); + + return ret; +} + +static int set_colorbar(sensor_t *sensor, int enable) +{ + int ret=0; + uint8_t reg; + sensor->status.colorbar = enable; + + // Read reg COM3 + reg = SCCB_Read(sensor->slv_addr, COM3); + // Enable colorbar test pattern output + reg = COM3_SET_CBAR(reg, enable); + // Write back COM3 + ret |= SCCB_Write(sensor->slv_addr, COM3, reg); + + // Read reg DSP_CTRL3 + reg = SCCB_Read(sensor->slv_addr, DSP_CTRL3); + // Enable DSP colorbar output + reg = DSP_CTRL3_SET_CBAR(reg, enable); + // Write back DSP_CTRL3 + ret |= SCCB_Write(sensor->slv_addr, DSP_CTRL3, reg); + + return ret; +} + +static int set_whitebal(sensor_t *sensor, int enable) +{ + if(set_reg_bits(sensor, COM8, 1, 1, enable) >= 0){ + sensor->status.awb = !!enable; + } + return sensor->status.awb; +} + +static int set_gain_ctrl(sensor_t *sensor, int enable) +{ + if(set_reg_bits(sensor, COM8, 2, 1, enable) >= 0){ + sensor->status.agc = !!enable; + } + return sensor->status.agc; +} + +static int set_exposure_ctrl(sensor_t *sensor, int enable) +{ + if(set_reg_bits(sensor, COM8, 0, 1, enable) >= 0){ + sensor->status.aec = !!enable; + } + return sensor->status.aec; +} + +static int set_hmirror(sensor_t *sensor, int enable) +{ + if(set_reg_bits(sensor, COM3, 6, 1, enable) >= 0){ + sensor->status.hmirror = !!enable; + } + return sensor->status.hmirror; +} + +static int set_vflip(sensor_t *sensor, int enable) +{ + if(set_reg_bits(sensor, COM3, 7, 1, enable) >= 0){ + sensor->status.vflip = !!enable; + } + return sensor->status.vflip; +} + +static int set_dcw_dsp(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = set_reg_bits(sensor, 0x65, 2, 1, !enable); + if (ret == 0) { + ESP_LOGD(TAG, "Set dcw to: %d", enable); + sensor->status.dcw = enable; + } + return ret; +} + +static int set_aec2(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = set_reg_bits(sensor, COM8, 7, 1, enable); + if (ret == 0) { + ESP_LOGD(TAG, "Set aec2 to: %d", enable); + sensor->status.aec2 = enable; + } + return ret; +} + +static int set_bpc_dsp(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = set_reg_bits(sensor, 0x64, 1, 1, enable); + if (ret == 0) { + ESP_LOGD(TAG, "Set bpc to: %d", enable); + sensor->status.bpc = enable; + } + return ret; +} + +static int set_wpc_dsp(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = set_reg_bits(sensor, 0x64, 0, 1, enable); + if (ret == 0) { + ESP_LOGD(TAG, "Set wpc to: %d", enable); + sensor->status.wpc = enable; + } + return ret; +} + +static int set_raw_gma_dsp(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = set_reg_bits(sensor, 0x64, 2, 1, enable); + if (ret == 0) { + ESP_LOGD(TAG, "Set raw_gma to: %d", enable); + sensor->status.raw_gma = enable; + } + return ret; +} + +static int set_lenc_dsp(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = set_reg_bits(sensor, LC_CTR, 0, 1, enable); + if (ret == 0) { + ESP_LOGD(TAG, "Set lenc to: %d", enable); + sensor->status.lenc = enable; + } + return ret; +} + +//real gain +static int set_agc_gain(sensor_t *sensor, int gain) +{ + int ret = 0; + ret = set_reg_bits(sensor, COM9, 4, 3, gain % 5); + if (ret == 0) { + ESP_LOGD(TAG, "Set gain to: %d", gain); + sensor->status.agc_gain = gain; + } + return ret; +} + +static int set_aec_value(sensor_t *sensor, int value) +{ + int ret = 0; + ret = SCCB_Write(sensor->slv_addr, AEC, value & 0xff) | SCCB_Write(sensor->slv_addr, AECH, value >> 8); + if (ret == 0) { + ESP_LOGD(TAG, "Set aec_value to: %d", value); + sensor->status.aec_value = value; + } + return ret; +} + +static int set_awb_gain_dsp(sensor_t *sensor, int enable) +{ + int ret = 0; + ret = set_reg_bits(sensor, 0x63, 7, 1, enable); + if (ret == 0) { + ESP_LOGD(TAG, "Set awb_gain to: %d", enable); + sensor->status.awb_gain = enable; + } + return ret; +} + +static int set_brightness(sensor_t *sensor, int level) +{ + int ret = 0; + ret = SCCB_Write(sensor->slv_addr, 0x9B, level); + if (ret == 0) { + ESP_LOGD(TAG, "Set brightness to: %d", level); + sensor->status.brightness = level; + } + return ret; +} + +static int set_contrast(sensor_t *sensor, int level) +{ + int ret = 0; + ret = SCCB_Write(sensor->slv_addr, 0x9C, level); + if (ret == 0) { + ESP_LOGD(TAG, "Set contrast to: %d", level); + sensor->status.contrast = level; + } + return ret; +} + +static int init_status(sensor_t *sensor) +{ + sensor->status.brightness = SCCB_Read(sensor->slv_addr, 0x9B); + sensor->status.contrast = SCCB_Read(sensor->slv_addr, 0x9C); + sensor->status.saturation = 0; + sensor->status.ae_level = 0; + sensor->status.special_effect = get_reg_bits(sensor, 0x64, 5, 1); + sensor->status.wb_mode = get_reg_bits(sensor, 0x6B, 7, 1); + sensor->status.agc_gain = get_reg_bits(sensor, COM9, 4, 3); + sensor->status.aec_value = SCCB_Read(sensor->slv_addr, AEC) | (SCCB_Read(sensor->slv_addr, AECH) << 8); + sensor->status.gainceiling = SCCB_Read(sensor->slv_addr, 0x00); + sensor->status.awb = get_reg_bits(sensor, COM8, 1, 1); + sensor->status.awb_gain = get_reg_bits(sensor, 0x63, 7, 1); + sensor->status.aec = get_reg_bits(sensor, COM8, 0, 1); + sensor->status.aec2 = get_reg_bits(sensor, COM8, 7, 1); + sensor->status.agc = get_reg_bits(sensor, COM8, 2, 1); + sensor->status.bpc = get_reg_bits(sensor, 0x64, 1, 1); + sensor->status.wpc = get_reg_bits(sensor, 0x64, 0, 1); + sensor->status.raw_gma = get_reg_bits(sensor, 0x64, 2, 1); + sensor->status.lenc = get_reg_bits(sensor, LC_CTR, 0, 1); + sensor->status.hmirror = get_reg_bits(sensor, COM3, 6, 1); + sensor->status.vflip = get_reg_bits(sensor, COM3, 7, 1); + sensor->status.dcw = get_reg_bits(sensor, 0x65, 2, 1); + sensor->status.colorbar = get_reg_bits(sensor, COM3, 0, 1); + sensor->status.sharpness = get_reg_bits(sensor, EDGE0, 0, 5); + sensor->status.denoise = SCCB_Read(sensor->slv_addr, 0x8E); + return 0; +} + +static int set_dummy(sensor_t *sensor, int val){ return -1; } +static int set_gainceiling_dummy(sensor_t *sensor, gainceiling_t val){ return -1; } +static int set_res_raw(sensor_t *sensor, int startX, int startY, int endX, int endY, int offsetX, int offsetY, int totalX, int totalY, int outputX, int outputY, bool scale, bool binning){return -1;} +static int _set_pll(sensor_t *sensor, int bypass, int multiplier, int sys_div, int root_2x, int pre_div, int seld5, int pclk_manual, int pclk_div){return -1;} + +static int set_xclk(sensor_t *sensor, int timer, int xclk) +{ + int ret = 0; + sensor->xclk_freq_hz = xclk * 1000000U; + ret = xclk_timer_conf(timer, sensor->xclk_freq_hz); + return ret; +} + +int ov7725_detect(int slv_addr, sensor_id_t *id) +{ + if (OV7725_SCCB_ADDR == slv_addr) { + SCCB_Write(slv_addr, 0xFF, 0x01);//bank sensor + uint16_t PID = SCCB_Read(slv_addr, 0x0A); + if (OV7725_PID == PID) { + id->PID = PID; + id->VER = SCCB_Read(slv_addr, REG_VER); + id->MIDL = SCCB_Read(slv_addr, REG_MIDL); + id->MIDH = SCCB_Read(slv_addr, REG_MIDH); + return PID; + } else { + ESP_LOGI(TAG, "Mismatch PID=0x%x", PID); + } + } + return 0; +} + +int ov7725_init(sensor_t *sensor) +{ + // Set function pointers + sensor->reset = reset; + sensor->init_status = init_status; + sensor->set_pixformat = set_pixformat; + sensor->set_framesize = set_framesize; + sensor->set_colorbar = set_colorbar; + sensor->set_whitebal = set_whitebal; + sensor->set_gain_ctrl = set_gain_ctrl; + sensor->set_exposure_ctrl = set_exposure_ctrl; + sensor->set_hmirror = set_hmirror; + sensor->set_vflip = set_vflip; + + sensor->set_brightness = set_brightness; + sensor->set_contrast = set_contrast; + sensor->set_aec2 = set_aec2; + sensor->set_aec_value = set_aec_value; + sensor->set_awb_gain = set_awb_gain_dsp; + sensor->set_agc_gain = set_agc_gain; + sensor->set_dcw = set_dcw_dsp; + sensor->set_bpc = set_bpc_dsp; + sensor->set_wpc = set_wpc_dsp; + sensor->set_raw_gma = set_raw_gma_dsp; + sensor->set_lenc = set_lenc_dsp; + + //not supported + sensor->set_saturation= set_dummy; + sensor->set_sharpness = set_dummy; + sensor->set_denoise = set_dummy; + sensor->set_quality = set_dummy; + sensor->set_special_effect = set_dummy; + sensor->set_wb_mode = set_dummy; + sensor->set_ae_level = set_dummy; + sensor->set_gainceiling = set_gainceiling_dummy; + + + sensor->get_reg = get_reg; + sensor->set_reg = set_reg; + sensor->set_res_raw = set_res_raw; + sensor->set_pll = _set_pll; + sensor->set_xclk = set_xclk; + + // Retrieve sensor's signature + sensor->id.MIDH = SCCB_Read(sensor->slv_addr, REG_MIDH); + sensor->id.MIDL = SCCB_Read(sensor->slv_addr, REG_MIDL); + sensor->id.PID = SCCB_Read(sensor->slv_addr, REG_PID); + sensor->id.VER = SCCB_Read(sensor->slv_addr, REG_VER); + + ESP_LOGD(TAG, "OV7725 Attached"); + + return 0; +} diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/gc0308.h b/lib/libesp32_div/esp32-camera/sensors/private_include/gc0308.h new file mode 100644 index 000000000..edffca1e0 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/private_include/gc0308.h @@ -0,0 +1,31 @@ +#pragma once + +#include "sensor.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @brief Detect sensor pid + * + * @param slv_addr SCCB address + * @param id Detection result + * @return + * 0: Can't detect this sensor + * Nonzero: This sensor has been detected + */ +int gc0308_detect(int slv_addr, sensor_id_t *id); + +/** + * @brief initialize sensor function pointers + * + * @param sensor pointer of sensor + * @return + * Always 0 + */ +int gc0308_init(sensor_t *sensor); + +#ifdef __cplusplus +} +#endif diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/gc0308_regs.h b/lib/libesp32_div/esp32-camera/sensors/private_include/gc0308_regs.h new file mode 100644 index 000000000..f1cb4532b --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/private_include/gc0308_regs.h @@ -0,0 +1,25 @@ +/* + * GC0308 register definitions. + */ +#ifndef __GC0308_REG_REGS_H__ +#define __GC0308_REG_REGS_H__ + +#define RESET_RELATED 0xfe // Bit[7]: Software reset + // Bit[6:5]: NA + // Bit[4]: CISCTL_restart_n + // Bit[3:1]: NA + // Bit[0]: page select + // 0:page0 + // 1:page1 + + +// page0: + + + +/** + * @brief register value + */ + + +#endif // __GC0308_REG_REGS_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/gc0308_settings.h b/lib/libesp32_div/esp32-camera/sensors/private_include/gc0308_settings.h new file mode 100644 index 000000000..32ef3816a --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/private_include/gc0308_settings.h @@ -0,0 +1,245 @@ +#ifndef _GC0308_SETTINGS_H_ +#define _GC0308_SETTINGS_H_ + +#include + +#define REG_DLY 0xffff +#define REGLIST_TAIL 0x0000 /* Array end token */ + +static const uint16_t gc0308_sensor_default_regs[][2] = { + {0xfe, 0x00}, + {0xec, 0x20}, + {0x05, 0x00}, + {0x06, 0x00}, + {0x07, 0x00}, + {0x08, 0x00}, + {0x09, 0x01}, + {0x0a, 0xe8}, + {0x0b, 0x02}, + {0x0c, 0x88}, + {0x0d, 0x02}, + {0x0e, 0x02}, + {0x10, 0x26}, + {0x11, 0x0d}, + {0x12, 0x2a}, + {0x13, 0x00}, + {0x14, 0x11}, + {0x15, 0x0a}, + {0x16, 0x05}, + {0x17, 0x01}, + {0x18, 0x44}, + {0x19, 0x44}, + {0x1a, 0x2a}, + {0x1b, 0x00}, + {0x1c, 0x49}, + {0x1d, 0x9a}, + {0x1e, 0x61}, + {0x1f, 0x00}, //pad drv <=24MHz, use 0x00 is ok + {0x20, 0x7f}, + {0x21, 0xfa}, + {0x22, 0x57}, + {0x24, 0xa2}, //YCbYCr + {0x25, 0x0f}, + {0x26, 0x03}, // 0x01 + {0x28, 0x00}, + {0x2d, 0x0a}, + {0x2f, 0x01}, + {0x30, 0xf7}, + {0x31, 0x50}, + {0x32, 0x00}, + {0x33, 0x28}, + {0x34, 0x2a}, + {0x35, 0x28}, + {0x39, 0x04}, + {0x3a, 0x20}, + {0x3b, 0x20}, + {0x3c, 0x00}, + {0x3d, 0x00}, + {0x3e, 0x00}, + {0x3f, 0x00}, + {0x50, 0x14}, // 0x14 + {0x52, 0x41}, + {0x53, 0x80}, + {0x54, 0x80}, + {0x55, 0x80}, + {0x56, 0x80}, + {0x8b, 0x20}, + {0x8c, 0x20}, + {0x8d, 0x20}, + {0x8e, 0x14}, + {0x8f, 0x10}, + {0x90, 0x14}, + {0x91, 0x3c}, + {0x92, 0x50}, +//{0x8b,0x10}, +//{0x8c,0x10}, +//{0x8d,0x10}, +//{0x8e,0x10}, +//{0x8f,0x10}, +//{0x90,0x10}, +//{0x91,0x3c}, +//{0x92,0x50}, + {0x5d, 0x12}, + {0x5e, 0x1a}, + {0x5f, 0x24}, + {0x60, 0x07}, + {0x61, 0x15}, + {0x62, 0x08}, // 0x08 + {0x64, 0x03}, // 0x03 + {0x66, 0xe8}, + {0x67, 0x86}, + {0x68, 0x82}, + {0x69, 0x18}, + {0x6a, 0x0f}, + {0x6b, 0x00}, + {0x6c, 0x5f}, + {0x6d, 0x8f}, + {0x6e, 0x55}, + {0x6f, 0x38}, + {0x70, 0x15}, + {0x71, 0x33}, + {0x72, 0xdc}, + {0x73, 0x00}, + {0x74, 0x02}, + {0x75, 0x3f}, + {0x76, 0x02}, + {0x77, 0x38}, // 0x47 + {0x78, 0x88}, + {0x79, 0x81}, + {0x7a, 0x81}, + {0x7b, 0x22}, + {0x7c, 0xff}, + {0x93, 0x48}, //color matrix default + {0x94, 0x02}, + {0x95, 0x07}, + {0x96, 0xe0}, + {0x97, 0x40}, + {0x98, 0xf0}, + {0xb1, 0x40}, + {0xb2, 0x40}, + {0xb3, 0x40}, //0x40 + {0xb6, 0xe0}, + {0xbd, 0x38}, + {0xbe, 0x36}, + {0xd0, 0xCB}, + {0xd1, 0x10}, + {0xd2, 0x90}, + {0xd3, 0x48}, + {0xd5, 0xF2}, + {0xd6, 0x16}, + {0xdb, 0x92}, + {0xdc, 0xA5}, + {0xdf, 0x23}, + {0xd9, 0x00}, + {0xda, 0x00}, + {0xe0, 0x09}, + {0xed, 0x04}, + {0xee, 0xa0}, + {0xef, 0x40}, + {0x80, 0x03}, + + {0x9F, 0x10}, + {0xA0, 0x20}, + {0xA1, 0x38}, + {0xA2, 0x4e}, + {0xA3, 0x63}, + {0xA4, 0x76}, + {0xA5, 0x87}, + {0xA6, 0xa2}, + {0xA7, 0xb8}, + {0xA8, 0xca}, + {0xA9, 0xd8}, + {0xAA, 0xe3}, + {0xAB, 0xeb}, + {0xAC, 0xf0}, + {0xAD, 0xF8}, + {0xAE, 0xFd}, + {0xAF, 0xFF}, + + {0xc0, 0x00}, + {0xc1, 0x10}, + {0xc2, 0x1c}, + {0xc3, 0x30}, + {0xc4, 0x43}, + {0xc5, 0x54}, + {0xc6, 0x65}, + {0xc7, 0x75}, + {0xc8, 0x93}, + {0xc9, 0xB0}, + {0xca, 0xCB}, + {0xcb, 0xE6}, + {0xcc, 0xFF}, + {0xf0, 0x02}, + {0xf1, 0x01}, + {0xf2, 0x02}, + {0xf3, 0x30}, + {0xf7, 0x04}, + {0xf8, 0x02}, + {0xf9, 0x9f}, + {0xfa, 0x78}, + {0xfe, 0x01}, + {0x00, 0xf5}, + {0x02, 0x20}, + {0x04, 0x10}, + {0x05, 0x08}, + {0x06, 0x20}, + {0x08, 0x0a}, + {0x0a, 0xa0}, + {0x0b, 0x60}, + {0x0c, 0x08}, + {0x0e, 0x44}, + {0x0f, 0x32}, + {0x10, 0x41}, + {0x11, 0x37}, + {0x12, 0x22}, + {0x13, 0x19}, + {0x14, 0x44}, + {0x15, 0x44}, + {0x16, 0xc2}, + {0x17, 0xA8}, + {0x18, 0x18}, + {0x19, 0x50}, + {0x1a, 0xd8}, + {0x1b, 0xf5}, + {0x70, 0x40}, + {0x71, 0x58}, + {0x72, 0x30}, + {0x73, 0x48}, + {0x74, 0x20}, + {0x75, 0x60}, + {0x77, 0x20}, + {0x78, 0x32}, + {0x30, 0x03}, + {0x31, 0x40}, + {0x32, 0x10}, + {0x33, 0xe0}, + {0x34, 0xe0}, + {0x35, 0x00}, + {0x36, 0x80}, + {0x37, 0x00}, + {0x38, 0x04}, + {0x39, 0x09}, + {0x3a, 0x12}, + {0x3b, 0x1C}, + {0x3c, 0x28}, + {0x3d, 0x31}, + {0x3e, 0x44}, + {0x3f, 0x57}, + {0x40, 0x6C}, + {0x41, 0x81}, + {0x42, 0x94}, + {0x43, 0xA7}, + {0x44, 0xB8}, + {0x45, 0xD6}, + {0x46, 0xEE}, + {0x47, 0x0d}, + {0x62, 0xf7}, + {0x63, 0x68}, + {0x64, 0xd3}, + {0x65, 0xd3}, + {0x66, 0x60}, + {0xfe, 0x00}, + {REGLIST_TAIL, 0x00}, +}; + +#endif diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/gc032a.h b/lib/libesp32_div/esp32-camera/sensors/private_include/gc032a.h new file mode 100644 index 000000000..7679f0708 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/private_include/gc032a.h @@ -0,0 +1,31 @@ +/* + * + * GC032A driver. + * + */ +#ifndef __GC032A_H__ +#define __GC032A_H__ + +#include "sensor.h" + +/** + * @brief Detect sensor pid + * + * @param slv_addr SCCB address + * @param id Detection result + * @return + * 0: Can't detect this sensor + * Nonzero: This sensor has been detected + */ +int gc032a_detect(int slv_addr, sensor_id_t *id); + +/** + * @brief initialize sensor function pointers + * + * @param sensor pointer of sensor + * @return + * Always 0 + */ +int gc032a_init(sensor_t *sensor); + +#endif // __GC032A_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/gc032a_regs.h b/lib/libesp32_div/esp32-camera/sensors/private_include/gc032a_regs.h new file mode 100644 index 000000000..5de59d1d2 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/private_include/gc032a_regs.h @@ -0,0 +1,82 @@ +/* + * GC032A register definitions. + */ +#ifndef __GC032A_REG_REGS_H__ +#define __GC032A_REG_REGS_H__ + +#define SENSOR_ID_HIGH 0XF0 +#define SENSOR_ID_LOW 0XF1 +#define PAD_VB_HIZ_MODE 0XF2 +#define SYNC_OUTPUT 0XF3 +#define I2C_CONFIG 0XF4 +#define PLL_MODE1 0XF7 +#define PLL_MODE2 0XF8 +#define CM_MODE 0XF9 +#define ISP_DIV_MODE 0XFA +#define I2C_DEVICE_ID 0XFB +#define ANALOG_PWC 0XFC +#define ISP_DIV_MODE2 0XFD +#define RESET_RELATED 0XFE // Bit[7]: Software reset + // Bit[6]: cm reset + // Bit[5]: spi reset + // Bit[4]: CISCTL_restart_n + // Bit[3]: PLL_rst + // Bit[2:0]: page select + // 000:page0 + // 001:page1 + // 010:page2 + // 011:page3 + +//----page0----------------------------- +#define P0_EXPOSURE_HIGH 0X03 +#define P0_EXPOSURE_LOW 0X04 +#define P0_HB_HIGH 0X05 +#define P0_HB_LOW 0X06 +#define P0_VB_HIGH 0X07 +#define P0_VB_LOW 0X08 +#define P0_ROW_START_HIGH 0X09 +#define P0_ROW_START_LOW 0X0A +#define P0_COLUMN_START_HIGH 0X0B +#define P0_COLUMN_START_LOW 0X0C +#define P0_WINDOW_HEIGHT_HIGH 0X0D +#define P0_WINDOW_HEIGHT_LOW 0X0E +#define P0_WINDOW_WIDTH_HIGH 0X0F +#define P0_WINDOW_WIDTH_LOW 0X10 +#define P0_SH_DELAY 0X11 +#define P0_VS_ST 0X12 +#define P0_VS_ET 0X13 +#define P0_CISCTL_MODE1 0X17 + +#define P0_BLOCK_ENABLE_1 0X40 +#define P0_AAAA_ENABLE 0X42 +#define P0_SPECIAL_EFFECT 0X43 +#define P0_SYNC_MODE 0X46 +#define P0_GAIN_CODE 0X48 +#define P0_DEBUG_MODE2 0X4C +#define P0_WIN_MODE 0X50 +#define P0_OUT_WIN_Y1_HIGH 0X51 +#define P0_OUT_WIN_Y1_LOW 0X52 +#define P0_OUT_WIN_X1_HIGH 0X53 +#define P0_OUT_WIN_X1_LOW 0X54 +#define P0_OUT_WIN_HEIGHT_HIGH 0X55 +#define P0_OUT_WIN_HEIGHT_LOW 0X56 +#define P0_OUT_WIN_WIDTH_HIGH 0X57 +#define P0_OUT_WIN_WIDTH_LOW 0X58 + +#define P0_GLOBAL_SATURATION 0XD0 +#define P0_SATURATION_CB 0XD1 +#define P0_SATURATION_CR 0XD2 +#define P0_LUMA_CONTRAST 0XD3 +#define P0_CONTRAST_CENTER 0XD4 +#define P0_LUMA_OFFSET 0XD5 +#define P0_FIXED_CB 0XDA +#define P0_FIXED_CR 0XDB + +//----page3----------------------------- +#define P3_IMAGE_WIDTH_LOW 0X5B +#define P3_IMAGE_WIDTH_HIGH 0X5C +#define P3_IMAGE_HEIGHT_LOW 0X5D +#define P3_IMAGE_HEIGHT_HIGH 0X5E + + +#endif //__GC032A_REG_REGS_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/gc032a_settings.h b/lib/libesp32_div/esp32-camera/sensors/private_include/gc032a_settings.h new file mode 100644 index 000000000..a19ffc7c6 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/private_include/gc032a_settings.h @@ -0,0 +1,401 @@ +#ifndef _GC032A_SETTINGS_H_ +#define _GC032A_SETTINGS_H_ + +#include +#include +#include "esp_attr.h" +#include "gc032a_regs.h" + + +#define REG_DLY 0xffff +#define REGLIST_TAIL 0x0000 + + +/* + * The default register settings, as obtained from OmniVision. There + * is really no making sense of most of these - lots of "reserved" values + * and such. + * + */ +static const uint16_t gc032a_default_regs[][2] = { + /*System*/ + {0xf3, 0xff}, + {0xf5, 0x06}, + {0xf7, 0x01}, + {0xf8, 0x03}, + {0xf9, 0xce}, + {0xfa, 0x00}, + {0xfc, 0x02}, + {0xfe, 0x02}, + {0x81, 0x03}, + + {0xfe, 0x00}, + {0x77, 0x64}, + {0x78, 0x40}, + {0x79, 0x60}, + /*ANALOG & CISCTL*/ + {0xfe, 0x00}, + {0x03, 0x01}, + {0x04, 0xce}, + {0x05, 0x01}, + {0x06, 0xad}, + {0x07, 0x00}, + {0x08, 0x10}, + {0x0a, 0x00}, + {0x0c, 0x00}, + {0x0d, 0x01}, + {0x0e, 0xe8}, // height 488 + {0x0f, 0x02}, + {0x10, 0x88}, // width 648 + {0x17, 0x54}, + {0x19, 0x08}, + {0x1a, 0x0a}, + {0x1f, 0x40}, + {0x20, 0x30}, + {0x2e, 0x80}, + {0x2f, 0x2b}, + {0x30, 0x1a}, + {0xfe, 0x02}, + {0x03, 0x02}, + {0x05, 0xd7}, + {0x06, 0x60}, + {0x08, 0x80}, + {0x12, 0x89}, + + /*blk*/ + {0xfe, 0x00}, + {0x18, 0x02}, + {0xfe, 0x02}, + {0x40, 0x22}, + {0x45, 0x00}, + {0x46, 0x00}, + {0x49, 0x20}, + {0x4b, 0x3c}, + {0x50, 0x20}, + {0x42, 0x10}, + + /*isp*/ + {0xfe, 0x01}, + {0x0a, 0xc5}, + {0x45, 0x00}, + {0xfe, 0x00}, + {0x40, 0xff}, + {0x41, 0x25}, + {0x42, 0xcf}, + {0x43, 0x10}, + {0x44, 0x83}, + {0x46, 0x23}, + {0x49, 0x03}, + {0x52, 0x02}, + {0x54, 0x00}, + {0xfe, 0x02}, + {0x22, 0xf6}, + + /*Shading*/ + {0xfe, 0x01}, + {0xc1, 0x38}, + {0xc2, 0x4c}, + {0xc3, 0x00}, + {0xc4, 0x32}, + {0xc5, 0x24}, + {0xc6, 0x16}, + {0xc7, 0x08}, + {0xc8, 0x08}, + {0xc9, 0x00}, + {0xca, 0x20}, + {0xdc, 0x8a}, + {0xdd, 0xa0}, + {0xde, 0xa6}, + {0xdf, 0x75}, + + /*AWB*/ + {0xfe, 0x01}, + {0x7c, 0x09}, + {0x65, 0x06}, + {0x7c, 0x08}, + {0x56, 0xf4}, + {0x66, 0x0f}, + {0x67, 0x84}, + {0x6b, 0x80}, + {0x6d, 0x12}, + {0x6e, 0xb0}, + {0x86, 0x00}, + {0x87, 0x00}, + {0x88, 0x00}, + {0x89, 0x00}, + {0x8a, 0x00}, + {0x8b, 0x00}, + {0x8c, 0x00}, + {0x8d, 0x00}, + {0x8e, 0x00}, + {0x8f, 0x00}, + {0x90, 0x00}, + {0x91, 0x00}, + {0x92, 0xf4}, + {0x93, 0xd5}, + {0x94, 0x50}, + {0x95, 0x0f}, + {0x96, 0xf4}, + {0x97, 0x2d}, + {0x98, 0x0f}, + {0x99, 0xa6}, + {0x9a, 0x2d}, + {0x9b, 0x0f}, + {0x9c, 0x59}, + {0x9d, 0x2d}, + {0x9e, 0xaa}, + {0x9f, 0x67}, + {0xa0, 0x59}, + {0xa1, 0x00}, + {0xa2, 0x00}, + {0xa3, 0x0a}, + {0xa4, 0x00}, + {0xa5, 0x00}, + {0xa6, 0xd4}, + {0xa7, 0x9f}, + {0xa8, 0x55}, + {0xa9, 0xd4}, + {0xaa, 0x9f}, + {0xab, 0xac}, + {0xac, 0x9f}, + {0xad, 0x55}, + {0xae, 0xd4}, + {0xaf, 0xac}, + {0xb0, 0xd4}, + {0xb1, 0xa3}, + {0xb2, 0x55}, + {0xb3, 0xd4}, + {0xb4, 0xac}, + {0xb5, 0x00}, + {0xb6, 0x00}, + {0xb7, 0x05}, + {0xb8, 0xd6}, + {0xb9, 0x8c}, + + /*CC*/ + {0xfe, 0x01}, + {0xd0, 0x40}, + {0xd1, 0xf8}, + {0xd2, 0x00}, + {0xd3, 0xfa}, + {0xd4, 0x45}, + {0xd5, 0x02}, + + {0xd6, 0x30}, + {0xd7, 0xfa}, + {0xd8, 0x08}, + {0xd9, 0x08}, + {0xda, 0x58}, + {0xdb, 0x02}, + {0xfe, 0x00}, + + /*Gamma*/ + {0xfe, 0x00}, + {0xba, 0x00}, + {0xbb, 0x04}, + {0xbc, 0x0a}, + {0xbd, 0x0e}, + {0xbe, 0x22}, + {0xbf, 0x30}, + {0xc0, 0x3d}, + {0xc1, 0x4a}, + {0xc2, 0x5d}, + {0xc3, 0x6b}, + {0xc4, 0x7a}, + {0xc5, 0x85}, + {0xc6, 0x90}, + {0xc7, 0xa5}, + {0xc8, 0xb5}, + {0xc9, 0xc2}, + {0xca, 0xcc}, + {0xcb, 0xd5}, + {0xcc, 0xde}, + {0xcd, 0xea}, + {0xce, 0xf5}, + {0xcf, 0xff}, + + /*Auto Gamma*/ + {0xfe, 0x00}, + {0x5a, 0x08}, + {0x5b, 0x0f}, + {0x5c, 0x15}, + {0x5d, 0x1c}, + {0x5e, 0x28}, + {0x5f, 0x36}, + {0x60, 0x45}, + {0x61, 0x51}, + {0x62, 0x6a}, + {0x63, 0x7d}, + {0x64, 0x8d}, + {0x65, 0x98}, + {0x66, 0xa2}, + {0x67, 0xb5}, + {0x68, 0xc3}, + {0x69, 0xcd}, + {0x6a, 0xd4}, + {0x6b, 0xdc}, + {0x6c, 0xe3}, + {0x6d, 0xf0}, + {0x6e, 0xf9}, + {0x6f, 0xff}, + + /*Gain*/ + {0xfe, 0x00}, + {0x70, 0x50}, + + /*AEC*/ + {0xfe, 0x00}, + {0x4f, 0x01}, + {0xfe, 0x01}, + {0x0d, 0x00}, + {0x12, 0xa0}, + {0x13, 0x3a}, + {0x44, 0x04}, + {0x1f, 0x30}, + {0x20, 0x40}, + {0x26, 0x9a}, + {0x3e, 0x20}, + {0x3f, 0x2d}, + {0x40, 0x40}, + {0x41, 0x5b}, + {0x42, 0x82}, + {0x43, 0xb7}, + {0x04, 0x0a}, + {0x02, 0x79}, + {0x03, 0xc0}, + + /*measure window*/ + {0xfe, 0x01}, + {0xcc, 0x08}, + {0xcd, 0x08}, + {0xce, 0xa4}, + {0xcf, 0xec}, + + /*DNDD*/ + {0xfe, 0x00}, + {0x81, 0xb8}, + {0x82, 0x12}, + {0x83, 0x0a}, + {0x84, 0x01}, + {0x86, 0x50}, + {0x87, 0x18}, + {0x88, 0x10}, + {0x89, 0x70}, + {0x8a, 0x20}, + {0x8b, 0x10}, + {0x8c, 0x08}, + {0x8d, 0x0a}, + + /*Intpee*/ + {0xfe, 0x00}, + {0x8f, 0xaa}, + {0x90, 0x9c}, + {0x91, 0x52}, + {0x92, 0x03}, + {0x93, 0x03}, + {0x94, 0x08}, + {0x95, 0x44}, + {0x97, 0x00}, + {0x98, 0x00}, + + /*ASDE*/ + {0xfe, 0x00}, + {0xa1, 0x30}, + {0xa2, 0x41}, + {0xa4, 0x30}, + {0xa5, 0x20}, + {0xaa, 0x30}, + {0xac, 0x32}, + + /*YCP*/ + {0xfe, 0x00}, + {0xd1, 0x3c}, + {0xd2, 0x3c}, + {0xd3, 0x38}, + {0xd6, 0xf4}, + {0xd7, 0x1d}, + {0xdd, 0x73}, + {0xde, 0x84}, + + /*Banding*/ + {0xfe, 0x00}, + {0x05, 0x01}, + {0x06, 0xad}, + {0x07, 0x00}, + {0x08, 0x10}, + + {0xfe, 0x01}, + {0x25, 0x00}, + {0x26, 0x9a}, + + {0x27, 0x01}, + {0x28, 0xce}, + {0x29, 0x02}, + {0x2a, 0x68}, + {0x2b, 0x02}, + {0x2c, 0x68}, + {0x2d, 0x07}, + {0x2e, 0xd2}, + {0x2f, 0x0b}, + {0x30, 0x6e}, + {0x31, 0x0e}, + {0x32, 0x70}, + {0x33, 0x12}, + {0x34, 0x0c}, + {0x3c, 0x30}, + + /*Analog&Cisctl*/ + {0xfe, 0x00}, + {0x05, 0x01}, + {0x06, 0xa0}, + {0x07, 0x00}, + {0x08, 0x20}, + {0x0a, 0x78}, + {0x0c, 0xa0}, + {0x0d, 0x00}, //window_height [8] + {0x0e, 0xf8}, //window_height [7:0] 248 + {0x0f, 0x01}, //window_width [9:8] + {0x10, 0x48}, //window_width [7:0] 328 + + {0x55, 0x00}, + {0x56, 0xf0}, // 240 + {0x57, 0x01}, + {0x58, 0x40}, // 320 + + /*SPI*/ + {0xfe, 0x03}, + {0x5b, 0x40}, + {0x5c, 0x01}, + {0x5d, 0xf0}, + {0x5e, 0x00}, + + /*AEC*/ + {0xfe, 0x01}, + {0x25, 0x00}, //step + {0x26, 0x63}, + {0x27, 0x01}, + {0x28, 0x29}, + {0x29, 0x01}, + {0x2a, 0x29}, + {0x2b, 0x01}, + {0x2c, 0x29}, + {0x2d, 0x01}, + {0x2e, 0x29}, + {0x2f, 0x01}, + {0x30, 0x29}, + {0x31, 0x01}, + {0x32, 0x29}, + {0x33, 0x01}, + {0x34, 0x29}, + {0x3c, 0x00}, + + /*measure window*/ + {0xfe, 0x01}, + {0xcc, 0x04}, + {0xcd, 0x04}, + {0xce, 0x72}, + {0xcf, 0x52}, + {REGLIST_TAIL, 0x00}, +}; + +#endif diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/gc2145.h b/lib/libesp32_div/esp32-camera/sensors/private_include/gc2145.h new file mode 100644 index 000000000..6c5b60f70 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/private_include/gc2145.h @@ -0,0 +1,27 @@ + +#ifndef __GC2145_H__ +#define __GC2145_H__ + +#include "sensor.h" + +/** + * @brief Detect sensor pid + * + * @param slv_addr SCCB address + * @param id Detection result + * @return + * 0: Can't detect this sensor + * Nonzero: This sensor has been detected + */ +int gc2145_detect(int slv_addr, sensor_id_t *id); + +/** + * @brief initialize sensor function pointers + * + * @param sensor pointer of sensor + * @return + * Always 0 + */ +int gc2145_init(sensor_t *sensor); + +#endif // __GC2145_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/gc2145_regs.h b/lib/libesp32_div/esp32-camera/sensors/private_include/gc2145_regs.h new file mode 100644 index 000000000..b034a1689 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/private_include/gc2145_regs.h @@ -0,0 +1,85 @@ +/* + * GC2145 register definitions. + */ +#ifndef __GC2145_REG_REGS_H__ +#define __GC2145_REG_REGS_H__ + +#define CHIP_ID_HIGH 0XF0 +#define CHIP_ID_LOW 0XF1 +#define PLL_MODE1 0XF7 +#define PLL_MODE2 0XF8 +#define CM_MODE 0XF9 +#define CLK_DIV_MODE 0XFA +#define RESET_RELATED 0xfe // Bit[7]: Software reset + // Bit[6]: cm reset + // Bit[5]: mipi reset + // Bit[4]: CISCTL_restart_n + // Bit[3]: NA + // Bit[2:0]: page select + // 000:page0 + // 001:page1 + // 010:page2 + // 011:page3 + +//-page0---------------- + +#define P0_EXPOSURE_HIGH 0X03 +#define P0_EXPOSURE_LOW 0X04 +#define P0_HB_HIGH 0X05 +#define P0_HB_LOW 0X06 +#define P0_VB_HIGH 0X07 +#define P0_VB_LOW 0X08 +#define P0_ROW_START_HIGH 0X09 +#define P0_ROW_START_LOW 0X0A +#define P0_COL_START_HIGH 0X0B +#define P0_COL_START_LOW 0X0C + +#define P0_WIN_HEIGHT_HIGH 0X0D +#define P0_WIN_HEIGHT_LOW 0X0E +#define P0_WIN_WIDTH_HIGH 0X0F +#define P0_WIN_WIDTH_LOW 0X10 +#define P0_ANALOG_MODE1 0X17 +#define P0_ANALOG_MODE2 0X18 + +#define P0_SPECIAL_EFFECT 0X83 +#define P0_OUTPUT_FORMAT 0x84 // Format select + // Bit[7]:YUV420 row switch + // Bit[6]:YUV420 col switch + // Bit[7]:YUV420_legacy + // Bit[4:0]:output data mode + // 5’h00 Cb Y Cr Y + // 5’h01 Cr Y Cb Y + // 5’h02 Y Cb Y Cr + // 5’h03 Y Cr Y Cb + // 5’h04 LSC bypass, C/Y + // 5’h05 LSC bypass, Y/C + // 5’h06 RGB 565 + // 5’h0f bypass 10bits + // 5’h17 switch odd/even column /row to controls output Bayer pattern + // 00 RGBG + // 01 RGGB + // 10 BGGR + // 11 GBRG + // 5'h18 DNDD out mode + // 5'h19 LSC out mode + // 5;h1b EEINTP out mode +#define P0_FRAME_START 0X85 +#define P0_SYNC_MODE 0X86 +#define P0_MODULE_GATING 0X88 +#define P0_BYPASS_MODE 0X89 +#define P0_DEBUG_MODE2 0X8C +#define P0_DEBUG_MODE3 0X8D +#define P0_CROP_ENABLE 0X90 +#define P0_OUT_WIN_Y1_HIGH 0X91 +#define P0_OUT_WIN_Y1_LOW 0X92 +#define P0_OUT_WIN_X1_HIGH 0X93 +#define P0_OUT_WIN_X1_LOW 0X94 +#define P0_OUT_WIN_HEIGHT_HIGH 0X95 +#define P0_OUT_WIN_HEIGHT_LOW 0X96 +#define P0_OUT_WIN_WIDTH_HIGH 0X97 +#define P0_OUT_WIN_WIDTH_LOW 0X98 +#define P0_SUBSAMPLE 0X99 +#define P0_SUBSAMPLE_MODE 0X9A + + +#endif // __GC2145_REG_REGS_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/gc2145_settings.h b/lib/libesp32_div/esp32-camera/sensors/private_include/gc2145_settings.h new file mode 100644 index 000000000..879fd53b3 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/private_include/gc2145_settings.h @@ -0,0 +1,719 @@ + +#include + +#define REG_DLY 0xffff +#define REGLIST_TAIL 0x0000 /* Array end token */ + +static const uint16_t gc2145_default_init_regs[][2] = { + {0xfe, 0xf0}, + {0xfe, 0xf0}, + {0xfe, 0xf0}, + + {0xfc, 0x06}, + {0xf6, 0x00}, + + {0xf7, 0x1d}, //37 //17 //37 //1d//05 + {0xf8, 0x83}, //87 //83 //82 + {0xfa, 0x00}, + {0xf9, 0xfe}, //ff + {0xfd, 0x00}, + {0xc2, 0x00}, + {0xf2, 0x0f}, +////////////////////////////////////////////////////// +//////////////////// Analog & Cisctl //////////////// +////////////////////////////////////////////////////// + {0xfe, 0x00}, + + {0x03, 0x04}, //exp time + {0x04, 0x62}, //exp time + + {0x05, 0x01}, //00 //hb[11:8] + {0x06, 0x3b}, //0b //hb + + {0x09, 0x00}, //row start + {0x0a, 0x00}, // + {0x0b, 0x00}, //col start + {0x0c, 0x00}, + {0x0d, 0x04}, //height + {0x0e, 0xc0}, + {0x0f, 0x06}, //width + {0x10, 0x52}, + + {0x12, 0x2e}, //sh_delay 太短 YUV出图异常 + {0x17, 0x14}, //CISCTL Mode1 [1:0]mirror flip + {0x18, 0x22}, //sdark mode + {0x19, 0x0f}, // AD pipe number + {0x1a, 0x01}, //AD manual switch mode + + {0x1b, 0x4b}, //48 restg Width,SH width + {0x1c, 0x07}, //06 帧率快后，横条纹 //12 //TX Width,Space Width + {0x1d, 0x10}, //double reset + {0x1e, 0x88}, //90//98 //fix 竖线//Analog Mode1,TX high,Coln_r + {0x1f, 0x78}, //78 //38 //18 //Analog Mode2,txlow + {0x20, 0x03}, //07 //Analog Mode3,comv,ad_clk mode + {0x21, 0x40}, //10//20//40 //fix 灯管横条纹 + {0x22, 0xa0}, //d0//f0 //a2 //Vref vpix FPN严重 + {0x24, 0x1e}, + {0x25, 0x01}, //col sel + {0x26, 0x10}, //Analog PGA gain1 + {0x2d, 0x60}, //40//40 //txl drv mode + {0x30, 0x01}, //Analog Mode4 + {0x31, 0x90}, //b0//70 // Analog Mode7 [7:5]rsgh_r灯管横条纹[4:3]isp_g + {0x33, 0x06}, //03//02//01 //EQ_hstart_width + {0x34, 0x01}, +// +/////////////////////////////////////////////////// +//////////////////// ISP reg ////////////////////// +////////////////////////////////////////////////////// + {0x80, 0xff}, //outdoor gamma_en, GAMMA_en, CC_en, EE_en, INTP_en, DN_en, DD_en,LSC_en + {0x81, 0x24}, //26//24 //BLK dither mode, ll_y_en ,skin_en, edge SA, new_skin_mode, autogray_en,ll_gamma_en,BFF test image + {0x82, 0xfa}, //FA //auto_SA, auto_EE, auto_DN, auto_DD, auto_LSC, ABS_en, AWB_en, NA + {0x83, 0x00}, //special_effect + {0x84, 0x02}, //output format + {0x86, 0x03}, //c2 //46 //c2 //sync mode + {0x88, 0x03}, //[1]ctl_auto_gating [0]out_auto_gating + {0x89, 0x03}, //bypass disable + {0x85, 0x30}, //60//frame start cut + {0x8a, 0x00}, //ISP_quiet_mode,close aaa pclk,BLK gate mode,exception,close first pipe clock,close dndd clock,close intp clock,DIV_gatedclk_en + {0x8b, 0x00}, //[7:6]BFF_gate_mode,[5]BLK switch gain,[4]protect exp,[3:2]pipe gate mode,[1]not split sram,[0]dark current update + + {0xb0, 0x55}, //60 //global gain + {0xc3, 0x00}, //[7:4]auto_exp_gamma_th1[11:8],[3:0]auto_exp_gamma_th2[11:8] + {0xc4, 0x80}, //auto_exp_gamma_th1[7:0] into + {0xc5, 0x90}, //auto_exp_gamma_th2[7:0] out //outdoor gamma + {0xc6, 0x38}, //auto_gamma_th1 + {0xc7, 0x40}, //auto_gamma_th2 + + {0xec, 0x06}, //measure window + {0xed, 0x04}, + {0xee, 0x60}, //16 col + {0xef, 0x90}, //8 row + + {0xb6, 0x01}, //[0]aec en + + {0x90, 0x01}, //crop + {0x91, 0x00}, + {0x92, 0x00}, + {0x93, 0x00}, + {0x94, 0x00}, //08 + {0x95, 0x04}, + {0x96, 0xb0}, + {0x97, 0x06}, + {0x98, 0x40}, + +/////////////////////////////////////////////// +/////////// BLK //////////////////////// +/////////////////////////////////////////////// + {0x18, 0x02}, + {0x40, 0x42}, //2b //27 + {0x41, 0x00}, //80 //dark row sel + {0x43, 0x54}, //[7:4]BLK start not smooth [3:0]output start frame + + {0x5e, 0x00}, //00//10 //18 + {0x5f, 0x00}, //00//10 //18 + {0x60, 0x00}, //00//10 //18 + {0x61, 0x00}, //00///10 //18 + {0x62, 0x00}, //00//10 //18 + {0x63, 0x00}, //00//10 //18 + {0x64, 0x00}, //00/10 //18 + {0x65, 0x00}, //00//10 //18 + {0x66, 0x20}, //1e + {0x67, 0x20}, //1e + {0x68, 0x20}, //1e + {0x69, 0x20}, //1e + + + {0x76, 0x00}, //0f + + {0x6a, 0x00}, //06 + {0x6b, 0x00}, //06 + {0x6c, 0x3e}, //06 + {0x6d, 0x3e}, //06 + {0x6e, 0x3f}, //06 + {0x6f, 0x3f}, //06 + {0x70, 0x00}, //06 + {0x71, 0x00}, //06 //manual offset + + {0x76, 0x00}, //1f//add offset + {0x72, 0xf0}, //[7:4]BLK DD th [3:0]BLK various th + {0x7e, 0x3c}, //ndark + {0x7f, 0x00}, + + {0xfe, 0x02}, + {0x48, 0x15}, + {0x49, 0x00}, //04//04 //ASDE OFFSET SLOPE + {0x4b, 0x0b}, //ASDE y OFFSET SLOPE + {0xfe, 0x00}, + +/////////////////////////////////////////////// +/////////// AEC //////////////////////// +/////////////////////////////////////////////// + {0xfe, 0x01}, + + {0x01, 0x04}, //AEC X1 + {0x02, 0xc0}, //AEC X2 + {0x03, 0x04}, //AEC Y1 + {0x04, 0x90}, //AEC Y2 + {0x05, 0x30}, //20 //AEC center X1 + {0x06, 0x90}, //40 //AEC center X2 + {0x07, 0x20}, //30 //AEC center Y1 + {0x08, 0x70}, //60 //AEC center Y2 + + {0x09, 0x00}, //AEC show mode + {0x0a, 0xc2}, //[7]col gain enable + {0x0b, 0x11}, //AEC every N + {0x0c, 0x10}, //AEC_mode3 center weight + {0x13, 0x40}, //2a //AEC Y target + {0x17, 0x00}, //AEC ignore mode + {0x1c, 0x11}, // + {0x1e, 0x61}, // + {0x1f, 0x30}, //40//50 //max pre gain + {0x20, 0x40}, //60//40 //max post gain + {0x22, 0x80}, //AEC outdoor THD + {0x23, 0x20}, //target_Y_low_limit + {0xfe, 0x02}, + {0x0f, 0x04}, //05 + {0xfe, 0x01}, + + {0x12, 0x35}, //35 //[5:4]group_size [3]slope_disable [2]outdoor_enable [0]histogram_enable + {0x15, 0x50}, //target_Y_high_limit + {0x10, 0x31}, //num_thd_high + {0x3e, 0x28}, //num_thd_low + {0x3f, 0xe0}, //luma_thd + {0x40, 0x20}, //luma_slope + {0x41, 0x0f}, //color_diff + + {0xfe, 0x02}, + {0x0f, 0x05}, //max_col_level +/////////////////////////// +////// INTPEE ///////////// +/////////////////////////// + {0xfe, 0x02}, //page2 + {0x90, 0x6c}, //ac //eeintp mode1 + {0x91, 0x03}, //02 ////eeintp mode2 + {0x92, 0xc8}, //44 //low criteria for direction + {0x94, 0x66}, + {0x95, 0xb5}, + {0x97, 0x64}, //78 ////edge effect + {0xa2, 0x11}, //fix direction + {0xfe, 0x00}, + +///////////////////////////// +//////// DNDD/////////////// +///////////////////////////// + {0xfe, 0x02}, + {0x80, 0xc1}, //c1 //[7]share mode [6]skin mode [5]is 5x5 mode [1:0]noise value select 0:2 1:2.5 2:3 3:4 + {0x81, 0x08}, // + {0x82, 0x08}, //signal a 0.6 + {0x83, 0x08}, //04 //signal b 2.5 + + {0x84, 0x0a}, //10 //05 dark_DD_TH + {0x86, 0xf0}, //a0 Y_value_dd_th2 + {0x87, 0x50}, //90 Y_value_dd_th3 + {0x88, 0x15}, //60 Y_value_dd_th4 + + {0x89, 0x50}, //80 // asde th2 + {0x8a, 0x30}, //60 // asde th3 + {0x8b, 0x10}, //30 // asde th4 + +///////////////////////////////////////////////// +///////////// ASDE //////////////////////// +///////////////////////////////////////////////// + {0xfe, 0x01}, //page 1 + {0x21, 0x14}, //luma_value_div_sel(分频，与0xef呈2倍关系，增大1，0xef的值减小1倍) +//ff ef luma_value read_only + + {0xfe, 0x02}, //page2 + {0xa3, 0x40}, //ASDE_low_luma_value_LSC_th_H + {0xa4, 0x20}, //ASDE_low_luma_value_LSC_th_L + + {0xa5, 0x40}, //80 //ASDE_LSC_gain_dec_slope_H + {0xa6, 0x80}, // 80 //ASDE_LSC_gain_dec_slope_L +//ff a7 ASDE_LSC_gain_dec //read only + + {0xab, 0x40}, //50 //ASDE_low_luma_value_OT_th + + {0xae, 0x0c}, //[3]EE1_effect_inc_or_dec_high,[2]EE2_effect_inc_or_dec_high, + //[1]EE1_effect_inc_or_dec_low,[0]EE2_effect_inc_or_dec_low, 1:inc 0:dec + + {0xb3, 0x34}, //44 //ASDE_EE1_effect_slope_low,ASDE_EE2_effect_slope_low + {0xb4, 0x44}, //12 //ASDE_EE1_effect_slope_high,ASDE_EE2_effect_slope_high + + {0xb6, 0x38}, //40//40 //ASDE_auto_saturation_dec_slope + {0xb7, 0x02}, //04 //ASDE_sub_saturation_slope + {0xb9, 0x30}, //[7:0]ASDE_auto_saturation_low_limit + {0x3c, 0x08}, //[3:0]auto gray_dec_slope + {0x3d, 0x30}, //[7:0]auto gray_dec_th + + + {0x4b, 0x0d}, //y offset slope + {0x4c, 0x20}, //y offset limit + + {0xfe, 0x00}, +// +///////////////////gamma1//////////////////// +////Gamma + {0xfe, 0x02}, + {0x10, 0x10}, + {0x11, 0x15}, + {0x12, 0x1a}, + {0x13, 0x1f}, + {0x14, 0x2c}, + {0x15, 0x39}, + {0x16, 0x45}, + {0x17, 0x54}, + {0x18, 0x69}, + {0x19, 0x7d}, + {0x1a, 0x8f}, + {0x1b, 0x9d}, + {0x1c, 0xa9}, + {0x1d, 0xbd}, + {0x1e, 0xcd}, + {0x1f, 0xd9}, + {0x20, 0xe3}, + {0x21, 0xea}, + {0x22, 0xef}, + {0x23, 0xf5}, + {0x24, 0xf9}, + {0x25, 0xff}, + +/////auto gamma///// + {0xfe, 0x02}, + {0x26, 0x0f}, + {0x27, 0x14}, + {0x28, 0x19}, + {0x29, 0x1e}, + {0x2a, 0x27}, + {0x2b, 0x33}, + {0x2c, 0x3b}, + {0x2d, 0x45}, + {0x2e, 0x59}, + {0x2f, 0x69}, + {0x30, 0x7c}, + {0x31, 0x89}, + {0x32, 0x98}, + {0x33, 0xae}, + {0x34, 0xc0}, + {0x35, 0xcf}, + {0x36, 0xda}, + {0x37, 0xe2}, + {0x38, 0xe9}, + {0x39, 0xf3}, + {0x3a, 0xf9}, + {0x3b, 0xff}, + +/////////////////////////////////////////////// +/////////// YCP /////////////////////// +/////////////////////////////////////////////// + {0xfe, 0x02}, + {0xd1, 0x30}, //32 // + {0xd2, 0x30}, //32 // + {0xd3, 0x45}, + {0xdd, 0x14}, //edge sa + {0xde, 0x86}, //asde auto gray + {0xed, 0x01}, // + {0xee, 0x28}, + {0xef, 0x30}, + {0xd8, 0xd8}, //autogray protecy + +//////////////////////////// +//////// LSC 0.8/////////////// +//////////////////////////// + {0xfe, 0x01}, + {0xa1, 0x80}, // center_row + {0xa2, 0x80}, // center_col + {0xa4, 0x00}, // sign of b1 + {0xa5, 0x00}, // sign of b1 + {0xa6, 0x70}, // sign of b4 + {0xa7, 0x00}, // sign of b4 + {0xa8, 0x77}, // sign of b22 + {0xa9, 0x77}, // sign of b22 + {0xaa, 0x1f}, // Q1_b1 of R + {0xab, 0x0d}, // Q1_b1 of G + {0xac, 0x19}, // Q1_b1 of B + {0xad, 0x24}, // Q2_b1 of R + {0xae, 0x0e}, // Q2_b1 of G + {0xaf, 0x1d}, // Q2_b1 of B + {0xb0, 0x12}, // Q3_b1 of R + {0xb1, 0x0c}, // Q3_b1 of G + {0xb2, 0x06}, // Q3_b1 of B + {0xb3, 0x13}, // Q4_b1 of R + {0xb4, 0x10}, // Q4_b1 of G + {0xb5, 0x0c}, // Q4_b1 of B + {0xb6, 0x6a}, // right_b2 of R + {0xb7, 0x46}, // right_b2 of G + {0xb8, 0x40}, // right_b2 of B + {0xb9, 0x0b}, // right_b4 of R + {0xba, 0x04}, // right_b4 of G + {0xbb, 0x00}, // right_b4 of B + {0xbc, 0x53}, // left_b2 of R + {0xbd, 0x37}, // left_b2 of G + {0xbe, 0x2d}, // left_b2 of B + {0xbf, 0x0a}, // left_b4 of R + {0xc0, 0x0a}, // left_b4 of G + {0xc1, 0x14}, // left_b4 of B + {0xc2, 0x34}, // up_b2 of R + {0xc3, 0x22}, // up_b2 of G + {0xc4, 0x18}, // up_b2 of B + {0xc5, 0x23}, // up_b4 of R + {0xc6, 0x0f}, // up_b4 of G + {0xc7, 0x3c}, // up_b4 of B + {0xc8, 0x20}, // down_b2 of R + {0xc9, 0x1f}, // down_b2 of G + {0xca, 0x17}, // down_b2 of B + {0xcb, 0x2d}, // down_b4 of R + {0xcc, 0x12}, // down_b4 of G + {0xcd, 0x20}, // down_b4 of B + {0xd0, 0x61}, // right_up_b22 of R + {0xd1, 0x2f}, // right_up_b22 of G + {0xd2, 0x39}, // right_up_b22 of B + {0xd3, 0x45}, // right_down_b22 of R + {0xd4, 0x2c}, // right_down_b22 of G + {0xd5, 0x21}, // right_down_b22 of B + {0xd6, 0x64}, // left_up_b22 of R + {0xd7, 0x2d}, // left_up_b22 of G + {0xd8, 0x30}, // left_up_b22 of B + {0xd9, 0x42}, // left_down_b22 of R + {0xda, 0x27}, // left_down_b22 of G + {0xdb, 0x13}, // left_down_b22 of B + {0xfe, 0x00}, + +///////////////////////////////////////////////// +///////////// AWB //////////////////////// +///////////////////////////////////////////////// + {0xfe, 0x01}, + + {0x4f, 0x00}, + {0x4f, 0x00}, + {0x4b, 0x01}, + {0x4f, 0x00}, + + + {0x4c, 0x01}, + {0x4d, 0x6f}, + {0x4e, 0x02}, + {0x4c, 0x01}, + {0x4d, 0x70}, + + {0x4e, 0x02}, + {0x4c, 0x01}, + {0x4d, 0x8f}, + {0x4e, 0x02}, + + {0x4c, 0x01}, + {0x4d, 0x90}, + {0x4e, 0x02}, //light + + + {0x4c, 0x01}, + {0x4d, 0xed}, + {0x4e, 0x33}, //light + {0x4c, 0x01}, + {0x4d, 0xcd}, + {0x4e, 0x33}, //light + {0x4c, 0x01}, + {0x4d, 0xec}, + {0x4e, 0x03}, //light + + {0x4c, 0x01}, + {0x4d, 0x6c}, + {0x4e, 0x03}, + {0x4c, 0x01}, + {0x4d, 0x6d}, + {0x4e, 0x03}, + {0x4c, 0x01}, + {0x4d, 0x6e}, + {0x4e, 0x03}, + {0x4c, 0x01}, + {0x4d, 0x8c}, + {0x4e, 0x03}, + {0x4c, 0x01}, + {0x4d, 0x8d}, + {0x4e, 0x03}, + {0x4c, 0x01}, + {0x4d, 0x8e}, + {0x4e, 0x03}, + {0x4c, 0x01}, + {0x4d, 0xab}, + {0x4e, 0x03}, + {0x4c, 0x01}, + {0x4d, 0xac}, + {0x4e, 0x03}, + {0x4c, 0x01}, + {0x4d, 0xad}, + {0x4e, 0x03}, + {0x4c, 0x01}, + {0x4d, 0xae}, + {0x4e, 0x03}, + {0x4c, 0x01}, + {0x4d, 0xcb}, + {0x4e, 0x03}, + + {0x4c, 0x01}, + {0x4d, 0xcc}, + {0x4e, 0x03}, + {0x4c, 0x01}, + {0x4d, 0xce}, + {0x4e, 0x03}, + {0x4c, 0x01}, + {0x4d, 0xeb}, + {0x4e, 0x03}, + {0x4c, 0x01}, + {0x4d, 0xec}, + {0x4e, 0x03}, + {0x4c, 0x01}, + {0x4d, 0xee}, + {0x4e, 0x03}, + {0x4c, 0x02}, + {0x4d, 0x0c}, + {0x4e, 0x03}, + {0x4c, 0x02}, + {0x4d, 0x0d}, + {0x4e, 0x03}, + {0x4c, 0x01}, + {0x4d, 0xea}, + {0x4e, 0x03}, + {0x4c, 0x01}, + {0x4d, 0xaf}, + {0x4e, 0x03}, //dark + {0x4c, 0x01}, + {0x4d, 0xcf}, + {0x4e, 0x03}, //dark + + {0x4c, 0x01}, + {0x4d, 0xca}, + {0x4e, 0x04}, //light + {0x4c, 0x02}, + {0x4d, 0x0b}, + {0x4e, 0x05}, //light + {0x4c, 0x02}, + {0x4d, 0xc8}, + {0x4e, 0x06}, //light 100lux + {0x4c, 0x02}, + {0x4d, 0xa8}, + + {0x4e, 0x06}, //light + {0x4c, 0x02}, + {0x4d, 0xa9}, + {0x4e, 0x06}, //light + + + {0x4c, 0x02}, + {0x4d, 0x89}, + {0x4e, 0x06}, //400lux + {0x4c, 0x02}, + {0x4d, 0x69}, + {0x4e, 0x06}, //f12 + {0x4c, 0x02}, + {0x4d, 0x6a}, + {0x4e, 0x06}, //f12 + {0x4c, 0x02}, + {0x4d, 0xc7}, + {0x4e, 0x07}, + {0x4c, 0x02}, + {0x4d, 0xe7}, + {0x4e, 0x07}, //100lux + {0x4c, 0x03}, + {0x4d, 0x07}, + {0x4e, 0x07}, //light + + {0x4c, 0x02}, + {0x4d, 0xe8}, + {0x4e, 0x07}, + {0x4c, 0x02}, + {0x4d, 0xe9}, + {0x4e, 0x07}, + {0x4c, 0x03}, + {0x4d, 0x08}, + {0x4e, 0x07}, + {0x4c, 0x03}, + {0x4d, 0x09}, + {0x4e, 0x07}, + {0x4c, 0x03}, + {0x4d, 0x27}, + {0x4e, 0x07}, + {0x4c, 0x03}, + {0x4d, 0x28}, + {0x4e, 0x07}, + {0x4c, 0x03}, + {0x4d, 0x29}, + {0x4e, 0x07}, + {0x4c, 0x03}, + {0x4d, 0x47}, + {0x4e, 0x07}, + {0x4c, 0x03}, + {0x4d, 0x48}, + {0x4e, 0x07}, + {0x4c, 0x03}, + {0x4d, 0x49}, + {0x4e, 0x07}, + {0x4c, 0x03}, + {0x4d, 0x67}, + {0x4e, 0x07}, + {0x4c, 0x03}, + {0x4d, 0x68}, + {0x4e, 0x07}, + {0x4c, 0x03}, + {0x4d, 0x69}, + {0x4e, 0x07}, + + {0x4f, 0x01}, + {0xfe, 0x01}, + {0x50, 0x80}, //AWB_PRE_mode + {0x51, 0xa8}, //AWB_pre_THD_min[7:0] + {0x52, 0x57}, //AWB_pre_THD_min[15:8] Dominiate luma 0.25=639c 0.22=57a8 + {0x53, 0x38}, //AWB_pre_THD_min_MIX[7:0] + {0x54, 0xc7}, //AWB_pre_THD_min_MIX[15:8] Mix luma 0.5 + + {0x56, 0x0e}, //AWB_tone mode + {0x58, 0x08}, //AWB_C_num_sel,AWB_D_num_sel + {0x5b, 0x00}, //AWB_mix_mode + + {0x5c, 0x74}, //green_num0[7:0] + {0x5d, 0x8b}, //green_num0[15:8] 0.35 + + {0x61, 0xd3}, //R2G_stand0 + {0x62, 0xb5}, //B2G_stand0 + {0x63, 0x00}, //88//a4 //AWB gray mode [7]enable + {0x65, 0x04}, //AWB margin + + {0x67, 0xb2}, //R2G_stand3[7:0] FF/CWF + {0x68, 0xac}, //B2G_stand3[7:0] + {0x69, 0x00}, //R2G_stand4[9:8] B2G_stand4[9:8] R2G_stand3[9:8] B2G_stand3[9:8] + {0x6a, 0xb2}, //R2G_stand4[7:0] TL84/TL84&CWF + {0x6b, 0xac}, //B2G_stand4[7:0] + {0x6c, 0xb2}, //R2G_stand5[7:0] A + {0x6d, 0xac}, //B2G_stand5[7:0] + {0x6e, 0x40}, //AWB_skin_weight R2G_stand5[9:8] B2G_stand5[9:8] + {0x6f, 0x18}, //AWB_indoor_THD (0x21=17 caculate) + {0x73, 0x00}, //AWB_indoor_mode + + {0x70, 0x10}, //AWB low luma TH + {0x71, 0xe8}, //AWB outdoor TH + {0x72, 0xc0}, //outdoor mode + {0x74, 0x01}, //[2:0]AWB skip mode 2x2,4x4,4x8,8x8 + {0x75, 0x01}, //[1:0]AWB_every_N + {0x7f, 0x08}, //[3]gray world frame start + + {0x76, 0x70}, //R limit + {0x77, 0x58}, //G limit + {0x78, 0xa0}, //d8 //B limit + + {0xfe, 0x00}, +// +////////////////////////////////////////// +/////////// CC //////////////////////// +////////////////////////////////////////// + {0xfe, 0x02}, + + {0xc0, 0x01}, //[5:4] CC mode [0]CCT enable + + {0xC1, 0x50}, //D50/D65 + {0xc2, 0xF9}, + {0xc3, 0x00}, //0 + {0xc4, 0xe8}, //e0 + {0xc5, 0x48}, + {0xc6, 0xf0}, + + + {0xC7, 0x50}, + {0xc8, 0xf2}, + {0xc9, 0x00}, + {0xcA, 0xE0}, + {0xcB, 0x45}, + {0xcC, 0xec}, + + {0xCd, 0x45}, + {0xce, 0xf0}, + {0xcf, 0x00}, + {0xe3, 0xf0}, + {0xe4, 0x45}, + {0xe5, 0xe8}, + + + {0xfe, 0x00}, + + {0xf2, 0x0f}, + + +//////////////frame rate 50Hz + {0xfe, 0x00}, + + {0xf7, 0x1d}, + {0xf8, 0x84}, + {0xfa, 0x00}, + + {0x05, 0x01}, //hb + {0x06, 0x3b}, + {0x07, 0x01}, //Vb + {0x08, 0x0b}, + + {0xfe, 0x01}, + {0x25, 0x01}, + {0x26, 0x32}, //step + {0x27, 0x03}, //8.15fps + {0x28, 0x96}, + {0x29, 0x03}, //8.15fps + {0x2a, 0x96}, + {0x2b, 0x03}, //8.15fps + {0x2c, 0x96}, + {0x2d, 0x04}, //8.15fps + {0x2e, 0x62}, + {0x3c, 0x00}, + {0xfe, 0x00}, + +/////////dark sun////// + {0xfe, 0x00}, + {0x18, 0x22}, + {0xfe, 0x02}, + {0x40, 0xbf}, + {0x46, 0xcf}, + {0xfe, 0x00}, + + {0xfe, 0x00}, + + {0xf7, 0x1d}, + {0xf8, 0x84}, + {0xfa, 0x10}, + + {0x05, 0x01}, //hb + {0x06, 0x18}, + {0x07, 0x00}, //Vb + {0x08, 0x2e}, + + {0xfe, 0x01}, + {0x25, 0x00}, + {0x26, 0xa2}, //step + {0x27, 0x01}, + {0x28, 0xe6}, + {0x29, 0x01}, + {0x2a, 0xe6}, + {0x2b, 0x01}, + {0x2c, 0xe6}, + {0x2d, 0x04}, // AEC_exp_level4[12:8] + {0x2e, 0x62}, // AEC_exp_level4[7:0] + {0x3c, 0x00}, + {0xfe, 0x00}, + + {0x09, 0x01}, //row start + {0x0a, 0xd0}, // + {0x0b, 0x02}, //col start + {0x0c, 0x70}, + {0x0d, 0x01}, //height + {0x0e, 0x00}, + {0x0f, 0x01}, //width + {0x10, 0x50}, + + {0x90, 0x01}, //crop + {0x91, 0x00}, + {0x92, 0x00}, + {0x93, 0x00}, + {0x94, 0x00}, + {0x95, 0x00}, + {0x96, 0xf0}, + {0x97, 0x01}, + {0x98, 0x40}, + + + {REGLIST_TAIL, 0x00}, +}; diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/nt99141.h b/lib/libesp32_div/esp32-camera/sensors/private_include/nt99141.h new file mode 100644 index 000000000..8b0c562b9 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/private_include/nt99141.h @@ -0,0 +1,34 @@ +/* + * This file is part of the OpenMV project. + * Copyright (c) 2013/2014 Ibrahim Abdelkader + * This work is licensed under the MIT license, see the file LICENSE for details. + * + * NT99141 driver. + * + */ +#ifndef __NT99141_H__ +#define __NT99141_H__ + +#include "sensor.h" + +/** + * @brief Detect sensor pid + * + * @param slv_addr SCCB address + * @param id Detection result + * @return + * 0: Can't detect this sensor + * Nonzero: This sensor has been detected + */ +int nt99141_detect(int slv_addr, sensor_id_t *id); + +/** + * @brief initialize sensor function pointers + * + * @param sensor pointer of sensor + * @return + * Always 0 + */ +int nt99141_init(sensor_t *sensor); + +#endif // __NT99141_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/nt99141_regs.h b/lib/libesp32_div/esp32-camera/sensors/private_include/nt99141_regs.h new file mode 100644 index 000000000..8301db901 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/private_include/nt99141_regs.h @@ -0,0 +1,211 @@ +/* + * NT99141 register definitions. + */ +#ifndef __NT99141_REG_REGS_H__ +#define __NT99141_REG_REGS_H__ + +/* system control registers */ +#define SYSTEM_CTROL0 0x3021 // Bit[7]: Software reset + // Bit[6]: Software power down + // Bit[5]: Reserved + // Bit[4]: SRB clock SYNC enable + // Bit[3]: Isolation suspend select + // Bit[2:0]: Not used + +/* output format control registers */ +#define FORMAT_CTRL 0x501F // Format select + // Bit[2:0]: + // 000: YUV422 + // 001: RGB + // 010: Dither + // 011: RAW after DPC + // 101: RAW after CIP + +/* format control registers */ +#define FORMAT_CTRL00 0x4300 + +/* frame control registers */ +#define FRAME_CTRL01 0x4201 // Control Passed Frame Number When both ON and OFF number set to 0x00,frame control is in bypass mode + // Bit[7:4]: Not used + // Bit[3:0]: Frame ON number +#define FRAME_CTRL02 0x4202 // Control Masked Frame Number When both ON and OFF number set to 0x00,frame control is in bypass mode + // Bit[7:4]: Not used + // BIT[3:0]: Frame OFF number + +/* ISP top control registers */ +#define PRE_ISP_TEST_SETTING_1 0x3025 // Bit[7]: Test enable + // 0: Test disable + // 1: Color bar enable + // Bit[6]: Rolling + // Bit[5]: Transparent + // Bit[4]: Square black and white + // Bit[3:2]: Color bar style + // 00: Standard 8 color bar + // 01: Gradual change at vertical mode 1 + // 10: Gradual change at horizontal + // 11: Gradual change at vertical mode 2 + // Bit[1:0]: Test select + // 00: Color bar + // 01: Random data + // 10: Square data + // 11: Black image + +//exposure = {0x3500[3:0], 0x3501[7:0], 0x3502[7:0]} / 16 × tROW + +/* AEC/AGC control functions */ +#define AEC_PK_MANUAL 0x3201 // AEC Manual Mode Control + // Bit[7:6]: Reserved + // Bit[5]: Gain delay option + // Valid when 0x3503[4]=1’b0 + // 0: Delay one frame latch + // 1: One frame latch + // Bit[4:2]: Reserved + // Bit[1]: AGC manual + // 0: Auto enable + // 1: Manual enable + // Bit[0]: AEC manual + // 0: Auto enable + // 1: Manual enable + +//gain = {0x350A[1:0], 0x350B[7:0]} / 16 + +/* mirror and flip registers */ +#define TIMING_TC_REG20 0x3022 // Timing Control Register + // Bit[2:1]: Vertical flip enable + // 00: Normal + // 11: Vertical flip + // Bit[0]: Vertical binning enable +#define TIMING_TC_REG21 0x3022 // Timing Control Register + // Bit[5]: Compression Enable + // Bit[2:1]: Horizontal mirror enable + // 00: Normal + // 11: Horizontal mirror + // Bit[0]: Horizontal binning enable + +#define CLOCK_POL_CONTROL 0x3024// Bit[5]: PCLK polarity 0: active low + // 1: active high + // Bit[3]: Gate PCLK under VSYNC + // Bit[2]: Gate PCLK under HREF + // Bit[1]: HREF polarity + // 0: active low + // 1: active high + // Bit[0] VSYNC polarity + // 0: active low + // 1: active high +#define DRIVE_CAPABILITY 0x306a // Bit[7:6]: + // 00: 1x + // 01: 2x + // 10: 3x + // 11: 4x + + +#define X_ADDR_ST_H 0x3800 //Bit[3:0]: X address start[11:8] +#define X_ADDR_ST_L 0x3801 //Bit[7:0]: X address start[7:0] +#define Y_ADDR_ST_H 0x3802 //Bit[2:0]: Y address start[10:8] +#define Y_ADDR_ST_L 0x3803 //Bit[7:0]: Y address start[7:0] +#define X_ADDR_END_H 0x3804 //Bit[3:0]: X address end[11:8] +#define X_ADDR_END_L 0x3805 //Bit[7:0]: +#define Y_ADDR_END_H 0x3806 //Bit[2:0]: Y address end[10:8] +#define Y_ADDR_END_L 0x3807 //Bit[7:0]: +// Size after scaling +#define X_OUTPUT_SIZE_H 0x3808 //Bit[3:0]: DVP output horizontal width[11:8] +#define X_OUTPUT_SIZE_L 0x3809 //Bit[7:0]: +#define Y_OUTPUT_SIZE_H 0x380a //Bit[2:0]: DVP output vertical height[10:8] +#define Y_OUTPUT_SIZE_L 0x380b //Bit[7:0]: +#define X_TOTAL_SIZE_H 0x380c //Bit[3:0]: Total horizontal size[11:8] +#define X_TOTAL_SIZE_L 0x380d //Bit[7:0]: +#define Y_TOTAL_SIZE_H 0x380e //Bit[7:0]: Total vertical size[15:8] +#define Y_TOTAL_SIZE_L 0x380f //Bit[7:0]: +#define X_OFFSET_H 0x3810 //Bit[3:0]: ISP horizontal offset[11:8] +#define X_OFFSET_L 0x3811 //Bit[7:0]: +#define Y_OFFSET_H 0x3812 //Bit[2:0]: ISP vertical offset[10:8] +#define Y_OFFSET_L 0x3813 //Bit[7:0]: +#define X_INCREMENT 0x3814 //Bit[7:4]: Horizontal odd subsample increment + //Bit[3:0]: Horizontal even subsample increment +#define Y_INCREMENT 0x3815 //Bit[7:4]: Vertical odd subsample increment + //Bit[3:0]: Vertical even subsample increment +// Size before scaling +//#define X_INPUT_SIZE (X_ADDR_END - X_ADDR_ST + 1 - (2 * X_OFFSET)) +//#define Y_INPUT_SIZE (Y_ADDR_END - Y_ADDR_ST + 1 - (2 * Y_OFFSET)) + +#define ISP_CONTROL_01 0x3021 // Bit[5]: Scale enable + // 0: Disable + // 1: Enable + +#define SCALE_CTRL_1 0x5601 // Bit[6:4]: HDIV RW + // DCW scale times + // 000: DCW 1 time + // 001: DCW 2 times + // 010: DCW 4 times + // 100: DCW 8 times + // 101: DCW 16 times + // Others: DCW 16 times + // Bit[2:0]: VDIV RW + // DCW scale times + // 000: DCW 1 time + // 001: DCW 2 times + // 010: DCW 4 times + // 100: DCW 8 times + // 101: DCW 16 times + // Others: DCW 16 times + +#define SCALE_CTRL_2 0x5602 // X_SCALE High Bits +#define SCALE_CTRL_3 0x5603 // X_SCALE Low Bits +#define SCALE_CTRL_4 0x5604 // Y_SCALE High Bits +#define SCALE_CTRL_5 0x5605 // Y_SCALE Low Bits +#define SCALE_CTRL_6 0x5606 // Bit[3:0]: V Offset + +#define PCLK_RATIO 0x3824 // Bit[4:0]: PCLK ratio manual +#define VFIFO_CTRL0C 0x460C // Bit[1]: PCLK manual enable + // 0: Auto + // 1: Manual by PCLK_RATIO + +#define VFIFO_X_SIZE_H 0x4602 +#define VFIFO_X_SIZE_L 0x4603 +#define VFIFO_Y_SIZE_H 0x4604 +#define VFIFO_Y_SIZE_L 0x4605 + +#define SC_PLLS_CTRL0 0x303a // Bit[7]: PLLS bypass +#define SC_PLLS_CTRL1 0x303b // Bit[4:0]: PLLS multiplier +#define SC_PLLS_CTRL2 0x303c // Bit[6:4]: PLLS charge pump control + // Bit[3:0]: PLLS system divider +#define SC_PLLS_CTRL3 0x303d // Bit[5:4]: PLLS pre-divider + // 00: 1 + // 01: 1.5 + // 10: 2 + // 11: 3 + // Bit[2]: PLLS root-divider - 1 + // Bit[1:0]: PLLS seld5 + // 00: 1 + // 01: 1 + // 10: 2 + // 11: 2.5 + +#define COMPRESSION_CTRL00 0x4400 // +#define COMPRESSION_CTRL01 0x4401 // +#define COMPRESSION_CTRL02 0x4402 // +#define COMPRESSION_CTRL03 0x4403 // +#define COMPRESSION_CTRL04 0x4404 // +#define COMPRESSION_CTRL05 0x4405 // +#define COMPRESSION_CTRL06 0x4406 // +#define COMPRESSION_CTRL07 0x3401 // Bit[5:0]: QS +#define COMPRESSION_ISI_CTRL 0x4408 // +#define COMPRESSION_CTRL09 0x4409 // +#define COMPRESSION_CTRL0a 0x440a // +#define COMPRESSION_CTRL0b 0x440b // +#define COMPRESSION_CTRL0c 0x440c // +#define COMPRESSION_CTRL0d 0x440d // +#define COMPRESSION_CTRL0E 0x440e // + +/** + * @brief register value + */ +#define TEST_COLOR_BAR 0x02 /* Enable Color Bar roling Test */ + +#define AEC_PK_MANUAL_AGC_MANUALEN 0x02 /* Enable AGC Manual enable */ +#define AEC_PK_MANUAL_AEC_MANUALEN 0x01 /* Enable AEC Manual enable */ + +#define TIMING_TC_REG20_VFLIP 0x01 /* Vertical flip enable */ +#define TIMING_TC_REG21_HMIRROR 0x02 /* Horizontal mirror enable */ + +#endif // __NT99141_REG_REGS_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/nt99141_settings.h b/lib/libesp32_div/esp32-camera/sensors/private_include/nt99141_settings.h new file mode 100644 index 000000000..1ffec2053 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/private_include/nt99141_settings.h @@ -0,0 +1,825 @@ +#ifndef _NT99141_SETTINGS_H_ +#define _NT99141_SETTINGS_H_ + +#include +#include +#include "esp_attr.h" +#include "nt99141_regs.h" + +static const ratio_settings_t ratio_table[] = { + // mw, mh, sx, sy, ex, ey, ox, oy, tx, ty + { 1280, 720, 0, 4, 1283, 723, 0, 4, 1660, 963 }, + +}; + +#define REG_DLY 0xffff +#define REGLIST_TAIL 0x0000 + +static const DRAM_ATTR uint16_t sensor_default_regs[][2] = { + //initial +{0x3021, 0x00}, +{REG_DLY, 100}, // delay 100ms +{0x3109, 0x04}, +{0x3040, 0x04}, +{0x3041, 0x02}, +{0x3042, 0xFF}, +{0x3043, 0x08}, +{0x3052, 0xE0}, +{0x305F, 0x33}, +{0x3100, 0x07}, +{0x3106, 0x03}, +{0x3105, 0x01}, +{0x3108, 0x05}, +{0x3110, 0x22}, +{0x3111, 0x57}, +{0x3112, 0x22}, +{0x3113, 0x55}, +{0x3114, 0x05}, +{0x3135, 0x00}, +{0x32F0, 0x01}, +{0x3290, 0x01}, +{0x3291, 0x80}, +{0x3296, 0x01}, +{0x3297, 0x73}, +{0x3250, 0x80}, +{0x3251, 0x03}, +{0x3252, 0xFF}, +{0x3253, 0x00}, +{0x3254, 0x03}, +{0x3255, 0xFF}, +{0x3256, 0x00}, +{0x3257, 0x50}, +{0x3270, 0x00}, +{0x3271, 0x0C}, +{0x3272, 0x18}, +{0x3273, 0x32}, +{0x3274, 0x44}, +{0x3275, 0x54}, +{0x3276, 0x70}, +{0x3277, 0x88}, +{0x3278, 0x9D}, +{0x3279, 0xB0}, +{0x327A, 0xCF}, +{0x327B, 0xE2}, +{0x327C, 0xEF}, +{0x327D, 0xF7}, +{0x327E, 0xFF}, +{0x3302, 0x00}, +{0x3303, 0x40}, +{0x3304, 0x00}, +{0x3305, 0x96}, +{0x3306, 0x00}, +{0x3307, 0x29}, +{0x3308, 0x07}, +{0x3309, 0xBA}, +{0x330A, 0x06}, +{0x330B, 0xF5}, +{0x330C, 0x01}, +{0x330D, 0x51}, +{0x330E, 0x01}, +{0x330F, 0x30}, +{0x3310, 0x07}, +{0x3311, 0x16}, +{0x3312, 0x07}, +{0x3313, 0xBA}, +{0x3326, 0x02}, +{0x32F6, 0x0F}, +{0x32F9, 0x42}, +{0x32FA, 0x24}, +{0x3325, 0x4A}, +{0x3330, 0x00}, +{0x3331, 0x0A}, +{0x3332, 0xFF}, +{0x3338, 0x30}, +{0x3339, 0x84}, +{0x333A, 0x48}, +{0x333F, 0x07}, +{0x3360, 0x10}, +{0x3361, 0x18}, +{0x3362, 0x1f}, +{0x3363, 0x37}, +{0x3364, 0x80}, +{0x3365, 0x80}, +{0x3366, 0x68}, +{0x3367, 0x60}, +{0x3368, 0x30}, +{0x3369, 0x28}, +{0x336A, 0x20}, +{0x336B, 0x10}, +{0x336C, 0x00}, +{0x336D, 0x20}, +{0x336E, 0x1C}, +{0x336F, 0x18}, +{0x3370, 0x10}, +{0x3371, 0x38}, +{0x3372, 0x3C}, +{0x3373, 0x3F}, +{0x3374, 0x3F}, +{0x338A, 0x34}, +{0x338B, 0x7F}, +{0x338C, 0x10}, +{0x338D, 0x23}, +{0x338E, 0x7F}, +{0x338F, 0x14}, +{0x3375, 0x08}, +{0x3376, 0x0C}, +{0x3377, 0x18}, +{0x3378, 0x20}, +{0x3012, 0x02}, +{0x3013, 0xD0}, +{0x3025, 0x02}, //colorbar +{REGLIST_TAIL, 0x00}, // tail +}; + +static const DRAM_ATTR uint16_t sensor_fmt_jpeg[][2] = { + {0x32F0, 0x70}, // YUV422 + {REGLIST_TAIL, 0x00}, // tail +}; + +static const DRAM_ATTR uint16_t sensor_fmt_raw[][2] = { + {0x32F0, 0x50}, // RAW + {REGLIST_TAIL, 0x00}, // tail +}; + +static const DRAM_ATTR uint16_t sensor_fmt_grayscale[][2] = { + {0x32F1, 0x01}, + {REGLIST_TAIL, 0x00}, // tail +}; + +static const DRAM_ATTR uint16_t sensor_fmt_yuv422[][2] = { + {0x32F0, 0x00}, // YUV422 + {REGLIST_TAIL, 0x00}, // tail +}; + +static const DRAM_ATTR uint16_t sensor_fmt_rgb565[][2] = { + {0x32F0, 0x01}, // RGB + {REGLIST_TAIL, 0x00}, // tail +}; + +static const DRAM_ATTR uint8_t sensor_saturation_levels[9][1] = { + {0x60},//-4 + {0x68},//-3 + {0x70},//-2 + {0x78},//-1 + {0x80},//0 + {0x88},//+1 + {0x90},//+2 + {0x98},//+3 + {0xA0},//+4 +}; + +static const DRAM_ATTR uint8_t sensor_special_effects[7][4] = { + {0x00, 0x80, 0x80, 0x01},//Normal + {0x03, 0x80, 0x80, 0x01},//Negative + {0x01, 0x80, 0x80, 0x01},//Grayscale + {0x05, 0x2A, 0xF0, 0x01},//Red Tint + {0x05, 0x60, 0x20, 0x01},//Green Tint + {0x05, 0xF0, 0x80, 0x01},//Blue Tint + {0x02, 0x80, 0x80, 0x01},//Sepia + +}; + +// AE LEVEL +static const DRAM_ATTR uint16_t sensor_ae_level[][2] = { + +// 1. [AE_Target : 0x24] +// Set_Device_Format = FORMAT_16_8 +// SET_Device_Addr = 0x54 + {0x32B8, 0x29 }, + {0x32B9, 0x1F }, + {0x32BC, 0x24 }, + {0x32BD, 0x27 }, + {0x32BE, 0x21 }, +//------------------------------------------------------------------------ +// 2. [AE_Target : 0x28] +// Set_Device_Format = FORMAT_16_8 +// SET_Device_Addr = 0x54 + {0x32B8, 0x2D }, + {0x32B9, 0x23 }, + {0x32BC, 0x28 }, + {0x32BD, 0x2B }, + {0x32BE, 0x25 }, +//------------------------------------------------------------------------ +// 3. [AE_Target : 0x2C] +// Set_Device_Format = FORMAT_16_8 +// SET_Device_Addr = 0x54 + {0x32B8, 0x32 }, + {0x32B9, 0x26 }, + {0x32BC, 0x2C }, + {0x32BD, 0x2F }, + {0x32BE, 0x29 }, +//------------------------------------------------------------------------ +// 4, [AE_Target : 0x30] +// Set_Device_Format = FORMAT_16_8 +// SET_Device_Addr = 0x54 + {0x32B8, 0x36 }, + {0x32B9, 0x2A }, + {0x32BC, 0x30 }, + {0x32BD, 0x33 }, + {0x32BE, 0x2D }, +//------------------------------------------------------------------------ +// 5. [AE_Target : 0x34] +// Set_Device_Format = FORMAT_16_8 +// SET_Device_Addr = 0x54 + {0x32B8, 0x3B }, + {0x32B9, 0x2D }, + {0x32BC, 0x34 }, + {0x32BD, 0x38 }, + {0x32BE, 0x30 }, +//------------------------------------------------------------------------ +// 6. [AE_Target : 0x38] +// Set_Device_Format = FORMAT_16_8 +// SET_Device_Addr = 0x54 + {0x32B8, 0x3F }, + {0x32B9, 0x31 }, + {0x32BC, 0x38 }, + {0x32BD, 0x3C }, + {0x32BE, 0x34 }, +//------------------------------------------------------------------------ +// 7. [AE_Target : 0x3D] +// Set_Device_Format = FORMAT_16_8 +// SET_Device_Addr = 0x54 + {0x32B8, 0x44 }, + {0x32B9, 0x34 }, + {0x32BC, 0x3C }, + {0x32BD, 0x40 }, + {0x32BE, 0x38 }, +//------------------------------------------------------------------------ +// 8. [AE_Target : 0x40] +// Set_Device_Format = FORMAT_16_8 +// SET_Device_Addr = 0x54 + {0x32B8, 0x48 }, + {0x32B9, 0x38 }, + {0x32BC, 0x40 }, + {0x32BD, 0x44 }, + {0x32BE, 0x3C }, +//------------------------------------------------------------------------ +// 9. [AE_Target : 0x44] +// Set_Device_Format = FORMAT_16_8 +// SET_Device_Addr = 0x54 + {0x32B8, 0x4D }, + {0x32B9, 0x3B }, + {0x32BC, 0x44 }, + {0x32BD, 0x49 }, + {0x32BE, 0x3F }, +}; + +static const DRAM_ATTR uint16_t sensor_framesize_HD[][2] = { +//[JPEG_1280x720_8.18_8.18_Fps] +{0x3021, 0x00}, +{REG_DLY, 100}, // delay 100ms +{0x32BF, 0x60}, +{0x32C0, 0x5A}, +{0x32C1, 0x5A}, +{0x32C2, 0x5A}, +{0x32C3, 0x00}, +{0x32C4, 0x20}, +{0x32C5, 0x20}, +{0x32C6, 0x20}, +{0x32C7, 0x00}, +{0x32C8, 0x3C}, +{0x32C9, 0x5A}, +{0x32CA, 0x7A}, +{0x32CB, 0x7A}, +{0x32CC, 0x7A}, +{0x32CD, 0x7A}, +{0x32DB, 0x5E}, +{0x32F0, 0x70}, +{0x3400, 0x08}, +{0x3400, 0x00}, +{0x3401, 0x4E}, +{0x3404, 0x00}, +{0x3405, 0x00}, +{0x3410, 0x00}, +{0x3200, 0x3E}, +{0x3201, 0x0F}, +{0x3028, 0x0F}, +{0x3029, 0x00}, +{0x302A, 0x08}, +{0x3022, 0x24}, +{0x3023, 0x24}, +{0x3002, 0x00}, +{0x3003, 0x04}, +{0x3004, 0x00}, +{0x3005, 0x04}, +{0x3006, 0x05}, +{0x3007, 0x03}, +{0x3008, 0x02}, +{0x3009, 0xD3}, +{0x300A, 0x06}, +{0x300B, 0x7C}, +{0x300C, 0x02}, +{0x300D, 0xE0}, +{0x300E, 0x05}, +{0x300F, 0x00}, +{0x3010, 0x02}, +{0x3011, 0xD0}, +{0x32B8, 0x3F}, +{0x32B9, 0x31}, +{0x32BB, 0x87}, +{0x32BC, 0x38}, +{0x32BD, 0x3C}, +{0x32BE, 0x34}, +{0x3201, 0x3F}, +{0x3021, 0x06}, +{0x3025, 0x00}, //normal +{0x3400, 0x01}, +{0x3060, 0x01}, +{REGLIST_TAIL, 0x00}, // tail +}; + +static const DRAM_ATTR uint16_t sensor_framesize_VGA[][2] = { +//[JPEG_640x480_10.14_10.14_Fps] +{0x3021, 0x00}, +{REG_DLY, 100}, // delay 100ms +{0x32BF, 0x60}, +{0x32C0, 0x5A}, +{0x32C1, 0x5A}, +{0x32C2, 0x5A}, +{0x32C3, 0x00}, +{0x32C4, 0x20}, +{0x32C5, 0x20}, +{0x32C6, 0x20}, +{0x32C7, 0x00}, +{0x32C8, 0x4B}, +{0x32C9, 0x5A}, +{0x32CA, 0x7A}, +{0x32CB, 0x7A}, +{0x32CC, 0x7A}, +{0x32CD, 0x7A}, +{0x32DB, 0x62}, +{0x32F0, 0x70}, +{0x3400, 0x08}, +{0x3400, 0x00}, +{0x3401, 0x4E}, +{0x3404, 0x00}, +{0x3405, 0x00}, +{0x3410, 0x00}, +{0x32E0, 0x02}, +{0x32E1, 0x80}, +{0x32E2, 0x01}, +{0x32E3, 0xE0}, +{0x32E4, 0x00}, +{0x32E5, 0x80}, +{0x32E6, 0x00}, +{0x32E7, 0x80}, +{0x3200, 0x3E}, +{0x3201, 0x0F}, +{0x3028, 0x0F}, +{0x3029, 0x00}, +{0x302A, 0x08}, +{0x3022, 0x24}, +{0x3023, 0x24}, +{0x3002, 0x00}, +{0x3003, 0xA4}, +{0x3004, 0x00}, +{0x3005, 0x04}, +{0x3006, 0x04}, +{0x3007, 0x63}, +{0x3008, 0x02}, +{0x3009, 0xD3}, +{0x300A, 0x05}, +{0x300B, 0x3C}, +{0x300C, 0x02}, +{0x300D, 0xE0}, +{0x300E, 0x03}, +{0x300F, 0xC0}, +{0x3010, 0x02}, +{0x3011, 0xD0}, +{0x32B8, 0x3F}, +{0x32B9, 0x31}, +{0x32BB, 0x87}, +{0x32BC, 0x38}, +{0x32BD, 0x3C}, +{0x32BE, 0x34}, +{0x3201, 0x7F}, +{0x3021, 0x06}, +{0x3025, 0x00}, //normal +{0x3400, 0x01}, +{0x3060, 0x01}, +{REGLIST_TAIL, 0x00}, // tail +}; + +static const DRAM_ATTR uint16_t sensor_framesize_QVGA[][2] = { +//[JPEG_320x240_10.14_10.14_Fps] +{0x3021, 0x00}, +{REG_DLY, 100}, // delay 100ms +{0x32BF, 0x60}, +{0x32C0, 0x5A}, +{0x32C1, 0x5A}, +{0x32C2, 0x5A}, +{0x32C3, 0x00}, +{0x32C4, 0x20}, +{0x32C5, 0x20}, +{0x32C6, 0x20}, +{0x32C7, 0x00}, +{0x32C8, 0x4B}, +{0x32C9, 0x5A}, +{0x32CA, 0x7A}, +{0x32CB, 0x7A}, +{0x32CC, 0x7A}, +{0x32CD, 0x7A}, +{0x32DB, 0x62}, +{0x32F0, 0x70}, +{0x3400, 0x08}, +{0x3400, 0x00}, +{0x3401, 0x4E}, +{0x3404, 0x00}, +{0x3405, 0x00}, +{0x3410, 0x00}, +{0x32E0, 0x01}, +{0x32E1, 0x40}, +{0x32E2, 0x00}, +{0x32E3, 0xF0}, +{0x32E4, 0x02}, +{0x32E5, 0x02}, +{0x32E6, 0x02}, +{0x32E7, 0x03}, +{0x3200, 0x3E}, +{0x3201, 0x0F}, +{0x3028, 0x0F}, +{0x3029, 0x00}, +{0x302A, 0x08}, +{0x3022, 0x24}, +{0x3023, 0x24}, +{0x3002, 0x00}, +{0x3003, 0xA4}, +{0x3004, 0x00}, +{0x3005, 0x04}, +{0x3006, 0x04}, +{0x3007, 0x63}, +{0x3008, 0x02}, +{0x3009, 0xD3}, +{0x300A, 0x05}, +{0x300B, 0x3C}, +{0x300C, 0x02}, +{0x300D, 0xE0}, +{0x300E, 0x03}, +{0x300F, 0xC0}, +{0x3010, 0x02}, +{0x3011, 0xD0}, +{0x32B8, 0x3F}, +{0x32B9, 0x31}, +{0x32BB, 0x87}, +{0x32BC, 0x38}, +{0x32BD, 0x3C}, +{0x32BE, 0x34}, +{0x3201, 0x7F}, +{0x3021, 0x06}, +{0x3025, 0x00}, //normal +{0x3400, 0x01}, +{0x3060, 0x01}, +{REGLIST_TAIL, 0x00}, // tail +}; + +static const DRAM_ATTR uint16_t sensor_framesize_VGA_xyskip[][2] = { +// [JPEG_640x360_20.00_25.01_Fps_XY_Skip] +// Set_Device_Format = FORMAT_16_8 +// SET_Device_Addr = 0x54 +{0x3021, 0x00}, +{REG_DLY, 100}, // delay 100ms +{0x32BF, 0x60 }, +{0x320A, 0xB2 }, +{0x32C0, 0x64 }, +{0x32C1, 0x64 }, +{0x32C2, 0x64 }, +{0x32C3, 0x00 }, +{0x32C4, 0x20 }, +{0x32C5, 0x20 }, +{0x32C6, 0x20 }, +{0x32C7, 0x00 }, +{0x32C8, 0x62 }, +{0x32C9, 0x64 }, +{0x32CA, 0x84 }, +{0x32CB, 0x84 }, +{0x32CC, 0x84 }, +{0x32CD, 0x84 }, +{0x32DB, 0x68 }, +{0x32F0, 0x70 }, +{0x3400, 0x08 }, +{0x3400, 0x00 }, +{0x3401, 0x4E }, +{0x3404, 0x00 }, +{0x3405, 0x00 }, +{0x3410, 0x00 }, +{0x3200, 0x3E }, +{0x3201, 0x0F }, +{0x3028, 0x0F }, +{0x3029, 0x00 }, +{0x302A, 0x08 }, +{0x3022, 0x24 }, +{0x3023, 0x6C }, +{0x3002, 0x00 }, +{0x3003, 0x04 }, +{0x3004, 0x00 }, +{0x3005, 0x04 }, +{0x3006, 0x05 }, +{0x3007, 0x03 }, +{0x3008, 0x02 }, +{0x3009, 0xD3 }, +{0x300A, 0x03 }, +{0x300B, 0xFC }, +{0x300C, 0x01 }, +{0x300D, 0x88 }, +{0x300E, 0x02 }, +{0x300F, 0x80 }, +{0x3010, 0x01 }, +{0x3011, 0x68 }, +{0x32B8, 0x3F }, +{0x32B9, 0x31 }, +{0x32BB, 0x87 }, +{0x32BC, 0x38 }, +{0x32BD, 0x3C }, +{0x32BE, 0x34 }, +{0x3201, 0x3F }, +{0x3025, 0x00 }, //normal +{0x3021, 0x06 }, +{0x3400, 0x01 }, +{0x3060, 0x01 }, +{REGLIST_TAIL, 0x00}, // tail +}; + +static const DRAM_ATTR uint16_t sensor_framesize_VGA_xskip[][2] = { +//[JPEG_640x480_Xskip_13.32_13.32_Fps] +{0x3021, 0x00}, +{REG_DLY, 100}, // delay 100ms +{0x32BF, 0x60}, +{0x32C0, 0x5A}, +{0x32C1, 0x5A}, +{0x32C2, 0x5A}, +{0x32C3, 0x00}, +{0x32C4, 0x20}, +{0x32C5, 0x20}, +{0x32C6, 0x20}, +{0x32C7, 0x00}, +{0x32C8, 0x62}, +{0x32C9, 0x5A}, +{0x32CA, 0x7A}, +{0x32CB, 0x7A}, +{0x32CC, 0x7A}, +{0x32CD, 0x7A}, +{0x32DB, 0x68}, +{0x32F0, 0x70}, +{0x3400, 0x08}, +{0x3400, 0x00}, +{0x3401, 0x4E}, +{0x3404, 0x00}, +{0x3405, 0x00}, +{0x3410, 0x00}, +{0x32E0, 0x02}, +{0x32E1, 0x80}, +{0x32E2, 0x01}, +{0x32E3, 0xE0}, +{0x32E4, 0x00}, +{0x32E5, 0x00}, +{0x32E6, 0x00}, +{0x32E7, 0x80}, +{0x3200, 0x3E}, +{0x3201, 0x0F}, +{0x3028, 0x0F}, +{0x3029, 0x00}, +{0x302A, 0x08}, +{0x3022, 0x24}, +{0x3023, 0x2C}, +{0x3002, 0x00}, +{0x3003, 0x04}, +{0x3004, 0x00}, +{0x3005, 0x04}, +{0x3006, 0x05}, +{0x3007, 0x03}, +{0x3008, 0x02}, +{0x3009, 0xD3}, +{0x300A, 0x03}, +{0x300B, 0xFC}, +{0x300C, 0x02}, +{0x300D, 0xE0}, +{0x300E, 0x02}, +{0x300F, 0x80}, +{0x3010, 0x02}, +{0x3011, 0xD0}, +{0x32B8, 0x3F}, +{0x32B9, 0x31}, +{0x32BB, 0x87}, +{0x32BC, 0x38}, +{0x32BD, 0x3C}, +{0x32BE, 0x34}, +{0x3201, 0x7F}, +{0x3021, 0x06}, +{0x3025, 0x00}, //normal +{0x3400, 0x01}, +{0x3060, 0x01}, +{REGLIST_TAIL, 0x00}, // tail +}; + +static const DRAM_ATTR uint16_t sensor_framesize_QVGA_xskip[][2] = { +{0x3021, 0x00}, +{REG_DLY, 100}, // delay 100ms +//[JPEG_320x240_Xskip_13.32_13.32_Fps] +{0x32BF, 0x60}, +{0x32C0, 0x5A}, +{0x32C1, 0x5A}, +{0x32C2, 0x5A}, +{0x32C3, 0x00}, +{0x32C4, 0x20}, +{0x32C5, 0x20}, +{0x32C6, 0x20}, +{0x32C7, 0x00}, +{0x32C8, 0x62}, +{0x32C9, 0x5A}, +{0x32CA, 0x7A}, +{0x32CB, 0x7A}, +{0x32CC, 0x7A}, +{0x32CD, 0x7A}, +{0x32DB, 0x68}, +{0x32F0, 0x70}, +{0x3400, 0x08}, +{0x3400, 0x00}, +{0x3401, 0x4E}, +{0x3404, 0x00}, +{0x3405, 0x00}, +{0x3410, 0x00}, +{0x32E0, 0x01}, +{0x32E1, 0x40}, +{0x32E2, 0x00}, +{0x32E3, 0xF0}, +{0x32E4, 0x01}, +{0x32E5, 0x01}, +{0x32E6, 0x02}, +{0x32E7, 0x03}, +{0x3200, 0x3E}, +{0x3201, 0x0F}, +{0x3028, 0x0F}, +{0x3029, 0x00}, +{0x302A, 0x08}, +{0x3022, 0x24}, +{0x3023, 0x2C}, +{0x3002, 0x00}, +{0x3003, 0x04}, +{0x3004, 0x00}, +{0x3005, 0x04}, +{0x3006, 0x05}, +{0x3007, 0x03}, +{0x3008, 0x02}, +{0x3009, 0xD3}, +{0x300A, 0x03}, +{0x300B, 0xFC}, +{0x300C, 0x02}, +{0x300D, 0xE0}, +{0x300E, 0x02}, +{0x300F, 0x80}, +{0x3010, 0x02}, +{0x3011, 0xD0}, +{0x32B8, 0x3F}, +{0x32B9, 0x31}, +{0x32BB, 0x87}, +{0x32BC, 0x38}, +{0x32BD, 0x3C}, +{0x32BE, 0x34}, +{0x3201, 0x7F}, +{0x3021, 0x06}, +{0x3025, 0x00}, //normal +{0x3400, 0x01}, +{0x3060, 0x01}, +{REGLIST_TAIL, 0x00}, // tail +}; + + +static const DRAM_ATTR uint16_t sensor_framesize_VGA_crop[][2] = { +//[JPEG_640x480_Crop_19.77_19.77_Fps] +{0x3021, 0x00}, +{REG_DLY, 100}, // delay 100ms +{0x32BF, 0x60}, +{0x32C0, 0x5A}, +{0x32C1, 0x5A}, +{0x32C2, 0x5A}, +{0x32C3, 0x00}, +{0x32C4, 0x20}, +{0x32C5, 0x20}, +{0x32C6, 0x20}, +{0x32C7, 0x00}, +{0x32C8, 0x62}, +{0x32C9, 0x5A}, +{0x32CA, 0x7A}, +{0x32CB, 0x7A}, +{0x32CC, 0x7A}, +{0x32CD, 0x7A}, +{0x32DB, 0x68}, +{0x32F0, 0x70}, +{0x3400, 0x08}, +{0x3400, 0x00}, +{0x3401, 0x4E}, +{0x3404, 0x00}, +{0x3405, 0x00}, +{0x3410, 0x00}, +{0x3200, 0x3E}, +{0x3201, 0x0F}, +{0x3028, 0x0F}, +{0x3029, 0x00}, +{0x302A, 0x08}, +{0x3022, 0x24}, +{0x3023, 0x24}, +{0x3002, 0x01}, +{0x3003, 0x44}, +{0x3004, 0x00}, +{0x3005, 0x7C}, +{0x3006, 0x03}, +{0x3007, 0xC3}, +{0x3008, 0x02}, +{0x3009, 0x5B}, +{0x300A, 0x03}, +{0x300B, 0xFC}, +{0x300C, 0x01}, +{0x300D, 0xF0}, +{0x300E, 0x02}, +{0x300F, 0x80}, +{0x3010, 0x01}, +{0x3011, 0xE0}, +{0x32B8, 0x3F}, +{0x32B9, 0x31}, +{0x32BB, 0x87}, +{0x32BC, 0x38}, +{0x32BD, 0x3C}, +{0x32BE, 0x34}, +{0x3201, 0x3F}, +{0x3021, 0x06}, +{0x3025, 0x00}, //normal +{0x3400, 0x01}, +{0x3060, 0x01}, +{REGLIST_TAIL, 0x00}, // tail +}; + +static const DRAM_ATTR uint16_t sensor_framesize_QVGA_crop[][2] = { +//[JPEG_320x240_Crop_19.77_19.77_Fps] +{0x3021, 0x00}, +{REG_DLY, 100}, // delay 100ms +{0x32BF, 0x60}, +{0x32C0, 0x5A}, +{0x32C1, 0x5A}, +{0x32C2, 0x5A}, +{0x32C3, 0x00}, +{0x32C4, 0x20}, +{0x32C5, 0x20}, +{0x32C6, 0x20}, +{0x32C7, 0x00}, +{0x32C8, 0x62}, +{0x32C9, 0x5A}, +{0x32CA, 0x7A}, +{0x32CB, 0x7A}, +{0x32CC, 0x7A}, +{0x32CD, 0x7A}, +{0x32DB, 0x68}, +{0x32F0, 0x70}, +{0x3400, 0x08}, +{0x3400, 0x00}, +{0x3401, 0x4E}, +{0x3404, 0x00}, +{0x3405, 0x00}, +{0x3410, 0x00}, +{0x32E0, 0x01}, +{0x32E1, 0x40}, +{0x32E2, 0x00}, +{0x32E3, 0xF0}, +{0x32E4, 0x01}, +{0x32E5, 0x01}, +{0x32E6, 0x01}, +{0x32E7, 0x02}, +{0x3200, 0x3E}, +{0x3201, 0x0F}, +{0x3028, 0x0F}, +{0x3029, 0x00}, +{0x302A, 0x08}, +{0x3022, 0x24}, +{0x3023, 0x24}, +{0x3002, 0x01}, +{0x3003, 0x44}, +{0x3004, 0x00}, +{0x3005, 0x7C}, +{0x3006, 0x03}, +{0x3007, 0xC3}, +{0x3008, 0x02}, +{0x3009, 0x5B}, +{0x300A, 0x03}, +{0x300B, 0xFC}, +{0x300C, 0x01}, +{0x300D, 0xF0}, +{0x300E, 0x02}, +{0x300F, 0x80}, +{0x3010, 0x01}, +{0x3011, 0xE0}, +{0x32B8, 0x3F}, +{0x32B9, 0x31}, +{0x32BB, 0x87}, +{0x32BC, 0x38}, +{0x32BD, 0x3C}, +{0x32BE, 0x34}, +{0x3201, 0x7F}, +{0x3021, 0x06}, +{0x3025, 0x00}, //normal +{0x3400, 0x01}, +{0x3060, 0x01}, +{REGLIST_TAIL, 0x00}, // tail +}; + +#endif + + diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/ov2640.h b/lib/libesp32_div/esp32-camera/sensors/private_include/ov2640.h new file mode 100644 index 000000000..342ab2132 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/private_include/ov2640.h @@ -0,0 +1,32 @@ +/* + * This file is part of the OpenMV project. + * Copyright (c) 2013/2014 Ibrahim Abdelkader + * This work is licensed under the MIT license, see the file LICENSE for details. + * + * OV2640 driver. + * + */ +#ifndef __OV2640_H__ +#define __OV2640_H__ +#include "sensor.h" +/** + * @brief Detect sensor pid + * + * @param slv_addr SCCB address + * @param id Detection result + * @return + * 0: Can't detect this sensor + * Nonzero: This sensor has been detected + */ +int ov2640_detect(int slv_addr, sensor_id_t *id); + +/** + * @brief initialize sensor function pointers + * + * @param sensor pointer of sensor + * @return + * Always 0 + */ +int ov2640_init(sensor_t *sensor); + +#endif // __OV2640_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/ov2640_regs.h b/lib/libesp32_div/esp32-camera/sensors/private_include/ov2640_regs.h new file mode 100644 index 000000000..8f47333fa --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/private_include/ov2640_regs.h @@ -0,0 +1,216 @@ +/* + * This file is part of the OpenMV project. + * Copyright (c) 2013/2014 Ibrahim Abdelkader + * This work is licensed under the MIT license, see the file LICENSE for details. + * + * OV2640 register definitions. + */ +#ifndef __REG_REGS_H__ +#define __REG_REGS_H__ +/* DSP register bank FF=0x00*/ +#define R_BYPASS 0x05 +#define QS 0x44 +#define CTRLI 0x50 +#define HSIZE 0x51 +#define VSIZE 0x52 +#define XOFFL 0x53 +#define YOFFL 0x54 +#define VHYX 0x55 +#define DPRP 0x56 +#define TEST 0x57 +#define ZMOW 0x5A +#define ZMOH 0x5B +#define ZMHH 0x5C +#define BPADDR 0x7C +#define BPDATA 0x7D +#define CTRL2 0x86 +#define CTRL3 0x87 +#define SIZEL 0x8C +#define HSIZE8 0xC0 +#define VSIZE8 0xC1 +#define CTRL0 0xC2 +#define CTRL1 0xC3 +#define R_DVP_SP 0xD3 +#define IMAGE_MODE 0xDA +#define RESET 0xE0 +#define MS_SP 0xF0 +#define SS_ID 0xF7 +#define SS_CTRL 0xF7 +#define MC_BIST 0xF9 +#define MC_AL 0xFA +#define MC_AH 0xFB +#define MC_D 0xFC +#define P_CMD 0xFD +#define P_STATUS 0xFE +#define BANK_SEL 0xFF + +#define CTRLI_LP_DP 0x80 +#define CTRLI_ROUND 0x40 + +#define CTRL0_AEC_EN 0x80 +#define CTRL0_AEC_SEL 0x40 +#define CTRL0_STAT_SEL 0x20 +#define CTRL0_VFIRST 0x10 +#define CTRL0_YUV422 0x08 +#define CTRL0_YUV_EN 0x04 +#define CTRL0_RGB_EN 0x02 +#define CTRL0_RAW_EN 0x01 + +#define CTRL2_DCW_EN 0x20 +#define CTRL2_SDE_EN 0x10 +#define CTRL2_UV_ADJ_EN 0x08 +#define CTRL2_UV_AVG_EN 0x04 +#define CTRL2_CMX_EN 0x01 + +#define CTRL3_BPC_EN 0x80 +#define CTRL3_WPC_EN 0x40 + +#define R_DVP_SP_AUTO_MODE 0x80 + +#define R_BYPASS_DSP_EN 0x00 +#define R_BYPASS_DSP_BYPAS 0x01 + +#define IMAGE_MODE_Y8_DVP_EN 0x40 +#define IMAGE_MODE_JPEG_EN 0x10 +#define IMAGE_MODE_YUV422 0x00 +#define IMAGE_MODE_RAW10 0x04 +#define IMAGE_MODE_RGB565 0x08 +#define IMAGE_MODE_HREF_VSYNC 0x02 +#define IMAGE_MODE_LBYTE_FIRST 0x01 + +#define RESET_MICROC 0x40 +#define RESET_SCCB 0x20 +#define RESET_JPEG 0x10 +#define RESET_DVP 0x04 +#define RESET_IPU 0x02 +#define RESET_CIF 0x01 + +#define MC_BIST_RESET 0x80 +#define MC_BIST_BOOT_ROM_SEL 0x40 +#define MC_BIST_12KB_SEL 0x20 +#define MC_BIST_12KB_MASK 0x30 +#define MC_BIST_512KB_SEL 0x08 +#define MC_BIST_512KB_MASK 0x0C +#define MC_BIST_BUSY_BIT_R 0x02 +#define MC_BIST_MC_RES_ONE_SH_W 0x02 +#define MC_BIST_LAUNCH 0x01 + + +typedef enum { + BANK_DSP, BANK_SENSOR, BANK_MAX +} ov2640_bank_t; + +/* Sensor register bank FF=0x01*/ +#define GAIN 0x00 +#define COM1 0x03 +#define REG04 0x04 +#define REG08 0x08 +#define COM2 0x09 +#define REG_PID 0x0A +#define REG_VER 0x0B +#define COM3 0x0C +#define COM4 0x0D +#define AEC 0x10 +#define CLKRC 0x11 +#define COM7 0x12 +#define COM8 0x13 +#define COM9 0x14 /* AGC gain ceiling */ +#define COM10 0x15 +#define HSTART 0x17 +#define HSTOP 0x18 +#define VSTART 0x19 +#define VSTOP 0x1A +#define REG_MIDH 0x1C +#define REG_MIDL 0x1D +#define AEW 0x24 +#define AEB 0x25 +#define VV 0x26 +#define REG2A 0x2A +#define FRARL 0x2B +#define ADDVSL 0x2D +#define ADDVSH 0x2E +#define YAVG 0x2F +#define HSDY 0x30 +#define HEDY 0x31 +#define REG32 0x32 +#define ARCOM2 0x34 +#define REG45 0x45 +#define FLL 0x46 +#define FLH 0x47 +#define COM19 0x48 +#define ZOOMS 0x49 +#define COM22 0x4B +#define COM25 0x4E +#define BD50 0x4F +#define BD60 0x50 +#define REG5D 0x5D +#define REG5E 0x5E +#define REG5F 0x5F +#define REG60 0x60 +#define HISTO_LOW 0x61 +#define HISTO_HIGH 0x62 + +#define REG04_DEFAULT 0x28 +#define REG04_HFLIP_IMG 0x80 +#define REG04_VFLIP_IMG 0x40 +#define REG04_VREF_EN 0x10 +#define REG04_HREF_EN 0x08 +#define REG04_SET(x) (REG04_DEFAULT|x) + +#define COM2_STDBY 0x10 +#define COM2_OUT_DRIVE_1x 0x00 +#define COM2_OUT_DRIVE_2x 0x01 +#define COM2_OUT_DRIVE_3x 0x02 +#define COM2_OUT_DRIVE_4x 0x03 + +#define COM3_DEFAULT 0x38 +#define COM3_BAND_50Hz 0x04 +#define COM3_BAND_60Hz 0x00 +#define COM3_BAND_AUTO 0x02 +#define COM3_BAND_SET(x) (COM3_DEFAULT|x) + +#define COM7_SRST 0x80 +#define COM7_RES_UXGA 0x00 /* UXGA */ +#define COM7_RES_SVGA 0x40 /* SVGA */ +#define COM7_RES_CIF 0x20 /* CIF */ +#define COM7_ZOOM_EN 0x04 /* Enable Zoom */ +#define COM7_COLOR_BAR 0x02 /* Enable Color Bar Test */ + +#define COM8_DEFAULT 0xC0 +#define COM8_BNDF_EN 0x20 /* Enable Banding filter */ +#define COM8_AGC_EN 0x04 /* AGC Auto/Manual control selection */ +#define COM8_AEC_EN 0x01 /* Auto/Manual Exposure control */ +#define COM8_SET(x) (COM8_DEFAULT|x) + +#define COM9_DEFAULT 0x08 +#define COM9_AGC_GAIN_2x 0x00 /* AGC: 2x */ +#define COM9_AGC_GAIN_4x 0x01 /* AGC: 4x */ +#define COM9_AGC_GAIN_8x 0x02 /* AGC: 8x */ +#define COM9_AGC_GAIN_16x 0x03 /* AGC: 16x */ +#define COM9_AGC_GAIN_32x 0x04 /* AGC: 32x */ +#define COM9_AGC_GAIN_64x 0x05 /* AGC: 64x */ +#define COM9_AGC_GAIN_128x 0x06 /* AGC: 128x */ +#define COM9_AGC_SET(x) (COM9_DEFAULT|(x<<5)) + +#define COM10_HREF_EN 0x80 /* HSYNC changes to HREF */ +#define COM10_HSYNC_EN 0x40 /* HREF changes to HSYNC */ +#define COM10_PCLK_FREE 0x20 /* PCLK output option: free running PCLK */ +#define COM10_PCLK_EDGE 0x10 /* Data is updated at the rising edge of PCLK */ +#define COM10_HREF_NEG 0x08 /* HREF negative */ +#define COM10_VSYNC_NEG 0x02 /* VSYNC negative */ +#define COM10_HSYNC_NEG 0x01 /* HSYNC negative */ + +#define CTRL1_AWB 0x08 /* Enable AWB */ + +#define VV_AGC_TH_SET(h,l) ((h<<4)|(l&0x0F)) + +#define REG32_UXGA 0x36 +#define REG32_SVGA 0x09 +#define REG32_CIF 0x89 + +#define CLKRC_2X 0x80 +#define CLKRC_2X_UXGA (0x01 | CLKRC_2X) +#define CLKRC_2X_SVGA CLKRC_2X +#define CLKRC_2X_CIF CLKRC_2X + +#endif //__REG_REGS_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/ov2640_settings.h b/lib/libesp32_div/esp32-camera/sensors/private_include/ov2640_settings.h new file mode 100644 index 000000000..f151f0a42 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/private_include/ov2640_settings.h @@ -0,0 +1,485 @@ +// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD +// +// 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. +#ifndef _OV2640_SETTINGS_H_ +#define _OV2640_SETTINGS_H_ + +#include +#include +#include "esp_attr.h" +#include "ov2640_regs.h" + +typedef enum { + OV2640_MODE_UXGA, OV2640_MODE_SVGA, OV2640_MODE_CIF, OV2640_MODE_MAX +} ov2640_sensor_mode_t; + +typedef struct { + union { + struct { + uint8_t pclk_div:7; + uint8_t pclk_auto:1; + }; + uint8_t pclk; + }; + union { + struct { + uint8_t clk_div:6; + uint8_t reserved:1; + uint8_t clk_2x:1; + }; + uint8_t clk; + }; +} ov2640_clk_t; + +typedef struct { + uint16_t offset_x; + uint16_t offset_y; + uint16_t max_x; + uint16_t max_y; +} ov2640_ratio_settings_t; + +static const DRAM_ATTR ov2640_ratio_settings_t ratio_table[] = { + // ox, oy, mx, my + { 0, 0, 1600, 1200 }, //4x3 + { 8, 72, 1584, 1056 }, //3x2 + { 0, 100, 1600, 1000 }, //16x10 + { 0, 120, 1600, 960 }, //5x3 + { 0, 150, 1600, 900 }, //16x9 + { 2, 258, 1596, 684 }, //21x9 + { 50, 0, 1500, 1200 }, //5x4 + { 200, 0, 1200, 1200 }, //1x1 + { 462, 0, 676, 1200 } //9x16 +}; + +// 30fps@24MHz +const DRAM_ATTR uint8_t ov2640_settings_cif[][2] = { + {BANK_SEL, BANK_DSP}, + {0x2c, 0xff}, + {0x2e, 0xdf}, + {BANK_SEL, BANK_SENSOR}, + {0x3c, 0x32}, + {CLKRC, 0x01}, + {COM2, COM2_OUT_DRIVE_3x}, + {REG04, REG04_DEFAULT}, + {COM8, COM8_DEFAULT | COM8_BNDF_EN | COM8_AGC_EN | COM8_AEC_EN}, + {COM9, COM9_AGC_SET(COM9_AGC_GAIN_8x)}, + {0x2c, 0x0c}, + {0x33, 0x78}, + {0x3a, 0x33}, + {0x3b, 0xfB}, + {0x3e, 0x00}, + {0x43, 0x11}, + {0x16, 0x10}, + {0x39, 0x92}, + {0x35, 0xda}, + {0x22, 0x1a}, + {0x37, 0xc3}, + {0x23, 0x00}, + {ARCOM2, 0xc0}, + {0x06, 0x88}, + {0x07, 0xc0}, + {COM4, 0x87}, + {0x0e, 0x41}, + {0x4c, 0x00}, + {0x4a, 0x81}, + {0x21, 0x99}, + {AEW, 0x40}, + {AEB, 0x38}, + {VV, VV_AGC_TH_SET(8,2)}, + {0x5c, 0x00}, + {0x63, 0x00}, + {HISTO_LOW, 0x70}, + {HISTO_HIGH, 0x80}, + {0x7c, 0x05}, + {0x20, 0x80}, + {0x28, 0x30}, + {0x6c, 0x00}, + {0x6d, 0x80}, + {0x6e, 0x00}, + {0x70, 0x02}, + {0x71, 0x94}, + {0x73, 0xc1}, + {0x3d, 0x34}, + {0x5a, 0x57}, + {BD50, 0xbb}, + {BD60, 0x9c}, + {COM7, COM7_RES_CIF}, + {HSTART, 0x11}, + {HSTOP, 0x43}, + {VSTART, 0x00}, + {VSTOP, 0x25}, + {REG32, 0x89}, + {0x37, 0xc0}, + {BD50, 0xca}, + {BD60, 0xa8}, + {0x6d, 0x00}, + {0x3d, 0x38}, + {BANK_SEL, BANK_DSP}, + {0xe5, 0x7f}, + {MC_BIST, MC_BIST_RESET | MC_BIST_BOOT_ROM_SEL}, + {0x41, 0x24}, + {RESET, RESET_JPEG | RESET_DVP}, + {0x76, 0xff}, + {0x33, 0xa0}, + {0x42, 0x20}, + {0x43, 0x18}, + {0x4c, 0x00}, + {CTRL3, CTRL3_WPC_EN | 0x10 }, + {0x88, 0x3f}, + {0xd7, 0x03}, + {0xd9, 0x10}, + {R_DVP_SP, R_DVP_SP_AUTO_MODE | 0x02}, + {0xc8, 0x08}, + {0xc9, 0x80}, + {BPADDR, 0x00}, + {BPDATA, 0x00}, + {BPADDR, 0x03}, + {BPDATA, 0x48}, + {BPDATA, 0x48}, + {BPADDR, 0x08}, + {BPDATA, 0x20}, + {BPDATA, 0x10}, + {BPDATA, 0x0e}, + {0x90, 0x00}, + {0x91, 0x0e}, + {0x91, 0x1a}, + {0x91, 0x31}, + {0x91, 0x5a}, + {0x91, 0x69}, + {0x91, 0x75}, + {0x91, 0x7e}, + {0x91, 0x88}, + {0x91, 0x8f}, + {0x91, 0x96}, + {0x91, 0xa3}, + {0x91, 0xaf}, + {0x91, 0xc4}, + {0x91, 0xd7}, + {0x91, 0xe8}, + {0x91, 0x20}, + {0x92, 0x00}, + {0x93, 0x06}, + {0x93, 0xe3}, + {0x93, 0x05}, + {0x93, 0x05}, + {0x93, 0x00}, + {0x93, 0x04}, + {0x93, 0x00}, + {0x93, 0x00}, + {0x93, 0x00}, + {0x93, 0x00}, + {0x93, 0x00}, + {0x93, 0x00}, + {0x93, 0x00}, + {0x96, 0x00}, + {0x97, 0x08}, + {0x97, 0x19}, + {0x97, 0x02}, + {0x97, 0x0c}, + {0x97, 0x24}, + {0x97, 0x30}, + {0x97, 0x28}, + {0x97, 0x26}, + {0x97, 0x02}, + {0x97, 0x98}, + {0x97, 0x80}, + {0x97, 0x00}, + {0x97, 0x00}, + {0xa4, 0x00}, + {0xa8, 0x00}, + {0xc5, 0x11}, + {0xc6, 0x51}, + {0xbf, 0x80}, + {0xc7, 0x10}, + {0xb6, 0x66}, + {0xb8, 0xA5}, + {0xb7, 0x64}, + {0xb9, 0x7C}, + {0xb3, 0xaf}, + {0xb4, 0x97}, + {0xb5, 0xFF}, + {0xb0, 0xC5}, + {0xb1, 0x94}, + {0xb2, 0x0f}, + {0xc4, 0x5c}, + {CTRL1, 0xfd}, + {0x7f, 0x00}, + {0xe5, 0x1f}, + {0xe1, 0x67}, + {0xdd, 0x7f}, + {IMAGE_MODE, 0x00}, + {RESET, 0x00}, + {R_BYPASS, R_BYPASS_DSP_EN}, + {0, 0} +}; + +const DRAM_ATTR uint8_t ov2640_settings_to_cif[][2] = { + {BANK_SEL, BANK_SENSOR}, + {COM7, COM7_RES_CIF}, + + //Set the sensor output window + {COM1, 0x0A}, + {REG32, REG32_CIF}, + {HSTART, 0x11}, + {HSTOP, 0x43}, + {VSTART, 0x00}, + {VSTOP, 0x25}, + + //{CLKRC, 0x00}, + {BD50, 0xca}, + {BD60, 0xa8}, + {0x5a, 0x23}, + {0x6d, 0x00}, + {0x3d, 0x38}, + {0x39, 0x92}, + {0x35, 0xda}, + {0x22, 0x1a}, + {0x37, 0xc3}, + {0x23, 0x00}, + {ARCOM2, 0xc0}, + {0x06, 0x88}, + {0x07, 0xc0}, + {COM4, 0x87}, + {0x0e, 0x41}, + {0x4c, 0x00}, + {BANK_SEL, BANK_DSP}, + {RESET, RESET_DVP}, + + //Set the sensor resolution (UXGA, SVGA, CIF) + {HSIZE8, 0x32}, + {VSIZE8, 0x25}, + {SIZEL, 0x00}, + + //Set the image window size >= output size + {HSIZE, 0x64}, + {VSIZE, 0x4a}, + {XOFFL, 0x00}, + {YOFFL, 0x00}, + {VHYX, 0x00}, + {TEST, 0x00}, + + {CTRL2, CTRL2_DCW_EN | 0x1D}, + {CTRLI, CTRLI_LP_DP | 0x00}, + //{R_DVP_SP, 0x08}, + {0, 0} +}; + +const DRAM_ATTR uint8_t ov2640_settings_to_svga[][2] = { + {BANK_SEL, BANK_SENSOR}, + {COM7, COM7_RES_SVGA}, + + //Set the sensor output window + {COM1, 0x0A}, + {REG32, REG32_SVGA}, + {HSTART, 0x11}, + {HSTOP, 0x43}, + {VSTART, 0x00}, + {VSTOP, 0x4b}, + + //{CLKRC, 0x00}, + {0x37, 0xc0}, + {BD50, 0xca}, + {BD60, 0xa8}, + {0x5a, 0x23}, + {0x6d, 0x00}, + {0x3d, 0x38}, + {0x39, 0x92}, + {0x35, 0xda}, + {0x22, 0x1a}, + {0x37, 0xc3}, + {0x23, 0x00}, + {ARCOM2, 0xc0}, + {0x06, 0x88}, + {0x07, 0xc0}, + {COM4, 0x87}, + {0x0e, 0x41}, + {0x42, 0x03}, + {0x4c, 0x00}, + {BANK_SEL, BANK_DSP}, + {RESET, RESET_DVP}, + + //Set the sensor resolution (UXGA, SVGA, CIF) + {HSIZE8, 0x64}, + {VSIZE8, 0x4B}, + {SIZEL, 0x00}, + + //Set the image window size >= output size + {HSIZE, 0xC8}, + {VSIZE, 0x96}, + {XOFFL, 0x00}, + {YOFFL, 0x00}, + {VHYX, 0x00}, + {TEST, 0x00}, + + {CTRL2, CTRL2_DCW_EN | 0x1D}, + {CTRLI, CTRLI_LP_DP | 0x00}, + //{R_DVP_SP, 0x08}, + {0, 0} +}; + +const DRAM_ATTR uint8_t ov2640_settings_to_uxga[][2] = { + {BANK_SEL, BANK_SENSOR}, + {COM7, COM7_RES_UXGA}, + + //Set the sensor output window + {COM1, 0x0F}, + {REG32, REG32_UXGA}, + {HSTART, 0x11}, + {HSTOP, 0x75}, + {VSTART, 0x01}, + {VSTOP, 0x97}, + + //{CLKRC, 0x00}, + {0x3d, 0x34}, + {BD50, 0xbb}, + {BD60, 0x9c}, + {0x5a, 0x57}, + {0x6d, 0x80}, + {0x39, 0x82}, + {0x23, 0x00}, + {0x07, 0xc0}, + {0x4c, 0x00}, + {0x35, 0x88}, + {0x22, 0x0a}, + {0x37, 0x40}, + {ARCOM2, 0xa0}, + {0x06, 0x02}, + {COM4, 0xb7}, + {0x0e, 0x01}, + {0x42, 0x83}, + {BANK_SEL, BANK_DSP}, + {RESET, RESET_DVP}, + + //Set the sensor resolution (UXGA, SVGA, CIF) + {HSIZE8, 0xc8}, + {VSIZE8, 0x96}, + {SIZEL, 0x00}, + + //Set the image window size >= output size + {HSIZE, 0x90}, + {VSIZE, 0x2c}, + {XOFFL, 0x00}, + {YOFFL, 0x00}, + {VHYX, 0x88}, + {TEST, 0x00}, + + {CTRL2, CTRL2_DCW_EN | 0x1d}, + {CTRLI, 0x00}, + //{R_DVP_SP, 0x06}, + {0, 0} +}; + +const DRAM_ATTR uint8_t ov2640_settings_jpeg3[][2] = { + {BANK_SEL, BANK_DSP}, + {RESET, RESET_JPEG | RESET_DVP}, + {IMAGE_MODE, IMAGE_MODE_JPEG_EN | IMAGE_MODE_HREF_VSYNC}, + {0xD7, 0x03}, + {0xE1, 0x77}, + {0xE5, 0x1F}, + {0xD9, 0x10}, + {0xDF, 0x80}, + {0x33, 0x80}, + {0x3C, 0x10}, + {0xEB, 0x30}, + {0xDD, 0x7F}, + {RESET, 0x00}, + {0, 0} +}; + +static const uint8_t ov2640_settings_yuv422[][2] = { + {BANK_SEL, BANK_DSP}, + {RESET, RESET_DVP}, + {IMAGE_MODE, IMAGE_MODE_YUV422}, + {0xD7, 0x01}, + {0xE1, 0x67}, + {RESET, 0x00}, + {0, 0}, +}; + +static const uint8_t ov2640_settings_rgb565[][2] = { + {BANK_SEL, BANK_DSP}, + {RESET, RESET_DVP}, + {IMAGE_MODE, IMAGE_MODE_RGB565}, + {0xD7, 0x03}, + {0xE1, 0x77}, + {RESET, 0x00}, + {0, 0}, +}; + +#define NUM_BRIGHTNESS_LEVELS (5) +static const uint8_t brightness_regs[NUM_BRIGHTNESS_LEVELS + 1][5] = { + {BPADDR, BPDATA, BPADDR, BPDATA, BPDATA }, + {0x00, 0x04, 0x09, 0x00, 0x00 }, /* -2 */ + {0x00, 0x04, 0x09, 0x10, 0x00 }, /* -1 */ + {0x00, 0x04, 0x09, 0x20, 0x00 }, /* 0 */ + {0x00, 0x04, 0x09, 0x30, 0x00 }, /* +1 */ + {0x00, 0x04, 0x09, 0x40, 0x00 }, /* +2 */ +}; + +#define NUM_CONTRAST_LEVELS (5) +static const uint8_t contrast_regs[NUM_CONTRAST_LEVELS + 1][7] = { + {BPADDR, BPDATA, BPADDR, BPDATA, BPDATA, BPDATA, BPDATA }, + {0x00, 0x04, 0x07, 0x20, 0x18, 0x34, 0x06 }, /* -2 */ + {0x00, 0x04, 0x07, 0x20, 0x1c, 0x2a, 0x06 }, /* -1 */ + {0x00, 0x04, 0x07, 0x20, 0x20, 0x20, 0x06 }, /* 0 */ + {0x00, 0x04, 0x07, 0x20, 0x24, 0x16, 0x06 }, /* +1 */ + {0x00, 0x04, 0x07, 0x20, 0x28, 0x0c, 0x06 }, /* +2 */ +}; + +#define NUM_SATURATION_LEVELS (5) +static const uint8_t saturation_regs[NUM_SATURATION_LEVELS + 1][5] = { + {BPADDR, BPDATA, BPADDR, BPDATA, BPDATA }, + {0x00, 0x02, 0x03, 0x28, 0x28 }, /* -2 */ + {0x00, 0x02, 0x03, 0x38, 0x38 }, /* -1 */ + {0x00, 0x02, 0x03, 0x48, 0x48 }, /* 0 */ + {0x00, 0x02, 0x03, 0x58, 0x58 }, /* +1 */ + {0x00, 0x02, 0x03, 0x68, 0x68 }, /* +2 */ +}; + +#define NUM_SPECIAL_EFFECTS (7) +static const uint8_t special_effects_regs[NUM_SPECIAL_EFFECTS + 1][5] = { + {BPADDR, BPDATA, BPADDR, BPDATA, BPDATA }, + {0x00, 0X00, 0x05, 0X80, 0X80 }, /* no effect */ + {0x00, 0X40, 0x05, 0X80, 0X80 }, /* negative */ + {0x00, 0X18, 0x05, 0X80, 0X80 }, /* black and white */ + {0x00, 0X18, 0x05, 0X40, 0XC0 }, /* reddish */ + {0x00, 0X18, 0x05, 0X40, 0X40 }, /* greenish */ + {0x00, 0X18, 0x05, 0XA0, 0X40 }, /* blue */ + {0x00, 0X18, 0x05, 0X40, 0XA6 }, /* retro */ +}; + +#define NUM_WB_MODES (4) +static const uint8_t wb_modes_regs[NUM_WB_MODES + 1][3] = { + {0XCC, 0XCD, 0XCE }, + {0x5E, 0X41, 0x54 }, /* sunny */ + {0x65, 0X41, 0x4F }, /* cloudy */ + {0x52, 0X41, 0x66 }, /* office */ + {0x42, 0X3F, 0x71 }, /* home */ +}; + +#define NUM_AE_LEVELS (5) +static const uint8_t ae_levels_regs[NUM_AE_LEVELS + 1][3] = { + { AEW, AEB, VV }, + {0x20, 0X18, 0x60 }, + {0x34, 0X1C, 0x00 }, + {0x3E, 0X38, 0x81 }, + {0x48, 0X40, 0x81 }, + {0x58, 0X50, 0x92 }, +}; + +const uint8_t agc_gain_tbl[31] = { + 0x00, 0x10, 0x18, 0x30, 0x34, 0x38, 0x3C, 0x70, 0x72, 0x74, 0x76, 0x78, 0x7A, 0x7C, 0x7E, 0xF0, + 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF +}; + +#endif /* _OV2640_SETTINGS_H_ */ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/ov3660.h b/lib/libesp32_div/esp32-camera/sensors/private_include/ov3660.h new file mode 100644 index 000000000..341d68861 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/private_include/ov3660.h @@ -0,0 +1,34 @@ +/* + * This file is part of the OpenMV project. + * Copyright (c) 2013/2014 Ibrahim Abdelkader + * This work is licensed under the MIT license, see the file LICENSE for details. + * + * OV3660 driver. + * + */ +#ifndef __OV3660_H__ +#define __OV3660_H__ + +#include "sensor.h" + +/** + * @brief Detect sensor pid + * + * @param slv_addr SCCB address + * @param id Detection result + * @return + * 0: Can't detect this sensor + * Nonzero: This sensor has been detected + */ +int ov3660_detect(int slv_addr, sensor_id_t *id); + +/** + * @brief initialize sensor function pointers + * + * @param sensor pointer of sensor + * @return + * Always 0 + */ +int ov3660_init(sensor_t *sensor); + +#endif // __OV3660_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/ov3660_regs.h b/lib/libesp32_div/esp32-camera/sensors/private_include/ov3660_regs.h new file mode 100644 index 000000000..b5cf30a5b --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/private_include/ov3660_regs.h @@ -0,0 +1,211 @@ +/* + * OV3660 register definitions. + */ +#ifndef __OV3660_REG_REGS_H__ +#define __OV3660_REG_REGS_H__ + +/* system control registers */ +#define SYSTEM_CTROL0 0x3008 // Bit[7]: Software reset + // Bit[6]: Software power down + // Bit[5]: Reserved + // Bit[4]: SRB clock SYNC enable + // Bit[3]: Isolation suspend select + // Bit[2:0]: Not used + +/* output format control registers */ +#define FORMAT_CTRL 0x501F // Format select + // Bit[2:0]: + // 000: YUV422 + // 001: RGB + // 010: Dither + // 011: RAW after DPC + // 101: RAW after CIP + +/* format control registers */ +#define FORMAT_CTRL00 0x4300 + +/* frame control registers */ +#define FRAME_CTRL01 0x4201 // Control Passed Frame Number When both ON and OFF number set to 0x00,frame control is in bypass mode + // Bit[7:4]: Not used + // Bit[3:0]: Frame ON number +#define FRAME_CTRL02 0x4202 // Control Masked Frame Number When both ON and OFF number set to 0x00,frame control is in bypass mode + // Bit[7:4]: Not used + // BIT[3:0]: Frame OFF number + +/* ISP top control registers */ +#define PRE_ISP_TEST_SETTING_1 0x503D // Bit[7]: Test enable + // 0: Test disable + // 1: Color bar enable + // Bit[6]: Rolling + // Bit[5]: Transparent + // Bit[4]: Square black and white + // Bit[3:2]: Color bar style + // 00: Standard 8 color bar + // 01: Gradual change at vertical mode 1 + // 10: Gradual change at horizontal + // 11: Gradual change at vertical mode 2 + // Bit[1:0]: Test select + // 00: Color bar + // 01: Random data + // 10: Square data + // 11: Black image + +//exposure = {0x3500[3:0], 0x3501[7:0], 0x3502[7:0]} / 16 × tROW + +/* AEC/AGC control functions */ +#define AEC_PK_MANUAL 0x3503 // AEC Manual Mode Control + // Bit[7:6]: Reserved + // Bit[5]: Gain delay option + // Valid when 0x3503[4]=1’b0 + // 0: Delay one frame latch + // 1: One frame latch + // Bit[4:2]: Reserved + // Bit[1]: AGC manual + // 0: Auto enable + // 1: Manual enable + // Bit[0]: AEC manual + // 0: Auto enable + // 1: Manual enable + +//gain = {0x350A[1:0], 0x350B[7:0]} / 16 + +/* mirror and flip registers */ +#define TIMING_TC_REG20 0x3820 // Timing Control Register + // Bit[2:1]: Vertical flip enable + // 00: Normal + // 11: Vertical flip + // Bit[0]: Vertical binning enable +#define TIMING_TC_REG21 0x3821 // Timing Control Register + // Bit[5]: Compression Enable + // Bit[2:1]: Horizontal mirror enable + // 00: Normal + // 11: Horizontal mirror + // Bit[0]: Horizontal binning enable + +#define CLOCK_POL_CONTROL 0x4740// Bit[5]: PCLK polarity 0: active low + // 1: active high + // Bit[3]: Gate PCLK under VSYNC + // Bit[2]: Gate PCLK under HREF + // Bit[1]: HREF polarity + // 0: active low + // 1: active high + // Bit[0] VSYNC polarity + // 0: active low + // 1: active high +#define DRIVE_CAPABILITY 0x302c // Bit[7:6]: + // 00: 1x + // 01: 2x + // 10: 3x + // 11: 4x + + +#define X_ADDR_ST_H 0x3800 //Bit[3:0]: X address start[11:8] +#define X_ADDR_ST_L 0x3801 //Bit[7:0]: X address start[7:0] +#define Y_ADDR_ST_H 0x3802 //Bit[2:0]: Y address start[10:8] +#define Y_ADDR_ST_L 0x3803 //Bit[7:0]: Y address start[7:0] +#define X_ADDR_END_H 0x3804 //Bit[3:0]: X address end[11:8] +#define X_ADDR_END_L 0x3805 //Bit[7:0]: +#define Y_ADDR_END_H 0x3806 //Bit[2:0]: Y address end[10:8] +#define Y_ADDR_END_L 0x3807 //Bit[7:0]: +// Size after scaling +#define X_OUTPUT_SIZE_H 0x3808 //Bit[3:0]: DVP output horizontal width[11:8] +#define X_OUTPUT_SIZE_L 0x3809 //Bit[7:0]: +#define Y_OUTPUT_SIZE_H 0x380a //Bit[2:0]: DVP output vertical height[10:8] +#define Y_OUTPUT_SIZE_L 0x380b //Bit[7:0]: +#define X_TOTAL_SIZE_H 0x380c //Bit[3:0]: Total horizontal size[11:8] +#define X_TOTAL_SIZE_L 0x380d //Bit[7:0]: +#define Y_TOTAL_SIZE_H 0x380e //Bit[7:0]: Total vertical size[15:8] +#define Y_TOTAL_SIZE_L 0x380f //Bit[7:0]: +#define X_OFFSET_H 0x3810 //Bit[3:0]: ISP horizontal offset[11:8] +#define X_OFFSET_L 0x3811 //Bit[7:0]: +#define Y_OFFSET_H 0x3812 //Bit[2:0]: ISP vertical offset[10:8] +#define Y_OFFSET_L 0x3813 //Bit[7:0]: +#define X_INCREMENT 0x3814 //Bit[7:4]: Horizontal odd subsample increment + //Bit[3:0]: Horizontal even subsample increment +#define Y_INCREMENT 0x3815 //Bit[7:4]: Vertical odd subsample increment + //Bit[3:0]: Vertical even subsample increment +// Size before scaling +//#define X_INPUT_SIZE (X_ADDR_END - X_ADDR_ST + 1 - (2 * X_OFFSET)) +//#define Y_INPUT_SIZE (Y_ADDR_END - Y_ADDR_ST + 1 - (2 * Y_OFFSET)) + +#define ISP_CONTROL_01 0x5001 // Bit[5]: Scale enable + // 0: Disable + // 1: Enable + +#define SCALE_CTRL_1 0x5601 // Bit[6:4]: HDIV RW + // DCW scale times + // 000: DCW 1 time + // 001: DCW 2 times + // 010: DCW 4 times + // 100: DCW 8 times + // 101: DCW 16 times + // Others: DCW 16 times + // Bit[2:0]: VDIV RW + // DCW scale times + // 000: DCW 1 time + // 001: DCW 2 times + // 010: DCW 4 times + // 100: DCW 8 times + // 101: DCW 16 times + // Others: DCW 16 times + +#define SCALE_CTRL_2 0x5602 // X_SCALE High Bits +#define SCALE_CTRL_3 0x5603 // X_SCALE Low Bits +#define SCALE_CTRL_4 0x5604 // Y_SCALE High Bits +#define SCALE_CTRL_5 0x5605 // Y_SCALE Low Bits +#define SCALE_CTRL_6 0x5606 // Bit[3:0]: V Offset + +#define PCLK_RATIO 0x3824 // Bit[4:0]: PCLK ratio manual +#define VFIFO_CTRL0C 0x460C // Bit[1]: PCLK manual enable + // 0: Auto + // 1: Manual by PCLK_RATIO + +#define VFIFO_X_SIZE_H 0x4602 +#define VFIFO_X_SIZE_L 0x4603 +#define VFIFO_Y_SIZE_H 0x4604 +#define VFIFO_Y_SIZE_L 0x4605 + +#define SC_PLLS_CTRL0 0x303a // Bit[7]: PLLS bypass +#define SC_PLLS_CTRL1 0x303b // Bit[4:0]: PLLS multiplier +#define SC_PLLS_CTRL2 0x303c // Bit[6:4]: PLLS charge pump control + // Bit[3:0]: PLLS system divider +#define SC_PLLS_CTRL3 0x303d // Bit[5:4]: PLLS pre-divider + // 00: 1 + // 01: 1.5 + // 10: 2 + // 11: 3 + // Bit[2]: PLLS root-divider - 1 + // Bit[1:0]: PLLS seld5 + // 00: 1 + // 01: 1 + // 10: 2 + // 11: 2.5 + +#define COMPRESSION_CTRL00 0x4400 // +#define COMPRESSION_CTRL01 0x4401 // +#define COMPRESSION_CTRL02 0x4402 // +#define COMPRESSION_CTRL03 0x4403 // +#define COMPRESSION_CTRL04 0x4404 // +#define COMPRESSION_CTRL05 0x4405 // +#define COMPRESSION_CTRL06 0x4406 // +#define COMPRESSION_CTRL07 0x4407 // Bit[5:0]: QS +#define COMPRESSION_ISI_CTRL 0x4408 // +#define COMPRESSION_CTRL09 0x4409 // +#define COMPRESSION_CTRL0a 0x440a // +#define COMPRESSION_CTRL0b 0x440b // +#define COMPRESSION_CTRL0c 0x440c // +#define COMPRESSION_CTRL0d 0x440d // +#define COMPRESSION_CTRL0E 0x440e // + +/** + * @brief register value + */ +#define TEST_COLOR_BAR 0xC0 /* Enable Color Bar roling Test */ + +#define AEC_PK_MANUAL_AGC_MANUALEN 0x02 /* Enable AGC Manual enable */ +#define AEC_PK_MANUAL_AEC_MANUALEN 0x01 /* Enable AEC Manual enable */ + +#define TIMING_TC_REG20_VFLIP 0x06 /* Vertical flip enable */ +#define TIMING_TC_REG21_HMIRROR 0x06 /* Horizontal mirror enable */ + +#endif // __OV3660_REG_REGS_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/ov3660_settings.h b/lib/libesp32_div/esp32-camera/sensors/private_include/ov3660_settings.h new file mode 100644 index 000000000..97c4e03b6 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/private_include/ov3660_settings.h @@ -0,0 +1,318 @@ +#ifndef _OV3660_SETTINGS_H_ +#define _OV3660_SETTINGS_H_ + +#include +#include +#include "esp_attr.h" +#include "ov3660_regs.h" + +static const ratio_settings_t ratio_table[] = { + // mw, mh, sx, sy, ex, ey, ox, oy, tx, ty + { 2048, 1536, 0, 0, 2079, 1547, 16, 6, 2300, 1564 }, //4x3 + { 1920, 1280, 64, 128, 2015, 1419, 16, 6, 2172, 1436 }, //3x2 + { 2048, 1280, 0, 128, 2079, 1419, 16, 6, 2300, 1436 }, //16x10 + { 1920, 1152, 64, 192, 2015, 1355, 16, 6, 2172, 1372 }, //5x3 + { 1920, 1080, 64, 242, 2015, 1333, 16, 6, 2172, 1322 }, //16x9 + { 2048, 880, 0, 328, 2079, 1219, 16, 6, 2300, 1236 }, //21x9 + { 1920, 1536, 64, 0, 2015, 1547, 16, 6, 2172, 1564 }, //5x4 + { 1536, 1536, 256, 0, 1823, 1547, 16, 6, 2044, 1564 }, //1x1 + { 864, 1536, 592, 0, 1487, 1547, 16, 6, 2044, 1564 } //9x16 +}; + +#define REG_DLY 0xffff +#define REGLIST_TAIL 0x0000 + +static const DRAM_ATTR uint16_t sensor_default_regs[][2] = { + {SYSTEM_CTROL0, 0x82}, // software reset + {REG_DLY, 10}, // delay 10ms + + {0x3103, 0x13}, + {SYSTEM_CTROL0, 0x42}, + {0x3017, 0xff}, + {0x3018, 0xff}, + {DRIVE_CAPABILITY, 0xc3}, + {CLOCK_POL_CONTROL, 0x21}, + + {0x3611, 0x01}, + {0x3612, 0x2d}, + + {0x3032, 0x00}, + {0x3614, 0x80}, + {0x3618, 0x00}, + {0x3619, 0x75}, + {0x3622, 0x80}, + {0x3623, 0x00}, + {0x3624, 0x03}, + {0x3630, 0x52}, + {0x3632, 0x07}, + {0x3633, 0xd2}, + {0x3704, 0x80}, + {0x3708, 0x66}, + {0x3709, 0x12}, + {0x370b, 0x12}, + {0x3717, 0x00}, + {0x371b, 0x60}, + {0x371c, 0x00}, + {0x3901, 0x13}, + + {0x3600, 0x08}, + {0x3620, 0x43}, + {0x3702, 0x20}, + {0x3739, 0x48}, + {0x3730, 0x20}, + {0x370c, 0x0c}, + + {0x3a18, 0x00}, + {0x3a19, 0xf8}, + + {0x3000, 0x10}, + {0x3004, 0xef}, + + {0x6700, 0x05}, + {0x6701, 0x19}, + {0x6702, 0xfd}, + {0x6703, 0xd1}, + {0x6704, 0xff}, + {0x6705, 0xff}, + + {0x3c01, 0x80}, + {0x3c00, 0x04}, + {0x3a08, 0x00}, {0x3a09, 0x62}, //50Hz Band Width Step (10bit) + {0x3a0e, 0x08}, //50Hz Max Bands in One Frame (6 bit) + {0x3a0a, 0x00}, {0x3a0b, 0x52}, //60Hz Band Width Step (10bit) + {0x3a0d, 0x09}, //60Hz Max Bands in One Frame (6 bit) + + {0x3a00, 0x3a},//night mode off + {0x3a14, 0x09}, + {0x3a15, 0x30}, + {0x3a02, 0x09}, + {0x3a03, 0x30}, + + {COMPRESSION_CTRL0E, 0x08}, + {0x4520, 0x0b}, + {0x460b, 0x37}, + {0x4713, 0x02}, + {0x471c, 0xd0}, + {0x5086, 0x00}, + + {0x5002, 0x00}, + {0x501f, 0x00}, + + {SYSTEM_CTROL0, 0x02}, + + {0x5180, 0xff}, + {0x5181, 0xf2}, + {0x5182, 0x00}, + {0x5183, 0x14}, + {0x5184, 0x25}, + {0x5185, 0x24}, + {0x5186, 0x16}, + {0x5187, 0x16}, + {0x5188, 0x16}, + {0x5189, 0x68}, + {0x518a, 0x60}, + {0x518b, 0xe0}, + {0x518c, 0xb2}, + {0x518d, 0x42}, + {0x518e, 0x35}, + {0x518f, 0x56}, + {0x5190, 0x56}, + {0x5191, 0xf8}, + {0x5192, 0x04}, + {0x5193, 0x70}, + {0x5194, 0xf0}, + {0x5195, 0xf0}, + {0x5196, 0x03}, + {0x5197, 0x01}, + {0x5198, 0x04}, + {0x5199, 0x12}, + {0x519a, 0x04}, + {0x519b, 0x00}, + {0x519c, 0x06}, + {0x519d, 0x82}, + {0x519e, 0x38}, + + {0x5381, 0x1d}, + {0x5382, 0x60}, + {0x5383, 0x03}, + {0x5384, 0x0c}, + {0x5385, 0x78}, + {0x5386, 0x84}, + {0x5387, 0x7d}, + {0x5388, 0x6b}, + {0x5389, 0x12}, + {0x538a, 0x01}, + {0x538b, 0x98}, + + {0x5480, 0x01}, +// {0x5481, 0x05}, +// {0x5482, 0x09}, +// {0x5483, 0x10}, +// {0x5484, 0x3a}, +// {0x5485, 0x4c}, +// {0x5486, 0x5a}, +// {0x5487, 0x68}, +// {0x5488, 0x74}, +// {0x5489, 0x80}, +// {0x548a, 0x8e}, +// {0x548b, 0xa4}, +// {0x548c, 0xb4}, +// {0x548d, 0xc8}, +// {0x548e, 0xde}, +// {0x548f, 0xf0}, +// {0x5490, 0x15}, + + {0x5000, 0xa7}, + {0x5800, 0x0C}, + {0x5801, 0x09}, + {0x5802, 0x0C}, + {0x5803, 0x0C}, + {0x5804, 0x0D}, + {0x5805, 0x17}, + {0x5806, 0x06}, + {0x5807, 0x05}, + {0x5808, 0x04}, + {0x5809, 0x06}, + {0x580a, 0x09}, + {0x580b, 0x0E}, + {0x580c, 0x05}, + {0x580d, 0x01}, + {0x580e, 0x01}, + {0x580f, 0x01}, + {0x5810, 0x05}, + {0x5811, 0x0D}, + {0x5812, 0x05}, + {0x5813, 0x01}, + {0x5814, 0x01}, + {0x5815, 0x01}, + {0x5816, 0x05}, + {0x5817, 0x0D}, + {0x5818, 0x08}, + {0x5819, 0x06}, + {0x581a, 0x05}, + {0x581b, 0x07}, + {0x581c, 0x0B}, + {0x581d, 0x0D}, + {0x581e, 0x12}, + {0x581f, 0x0D}, + {0x5820, 0x0E}, + {0x5821, 0x10}, + {0x5822, 0x10}, + {0x5823, 0x1E}, + {0x5824, 0x53}, + {0x5825, 0x15}, + {0x5826, 0x05}, + {0x5827, 0x14}, + {0x5828, 0x54}, + {0x5829, 0x25}, + {0x582a, 0x33}, + {0x582b, 0x33}, + {0x582c, 0x34}, + {0x582d, 0x16}, + {0x582e, 0x24}, + {0x582f, 0x41}, + {0x5830, 0x50}, + {0x5831, 0x42}, + {0x5832, 0x15}, + {0x5833, 0x25}, + {0x5834, 0x34}, + {0x5835, 0x33}, + {0x5836, 0x24}, + {0x5837, 0x26}, + {0x5838, 0x54}, + {0x5839, 0x25}, + {0x583a, 0x15}, + {0x583b, 0x25}, + {0x583c, 0x53}, + {0x583d, 0xCF}, + + {0x3a0f, 0x30}, + {0x3a10, 0x28}, + {0x3a1b, 0x30}, + {0x3a1e, 0x28}, + {0x3a11, 0x60}, + {0x3a1f, 0x14}, + + {0x5302, 0x28}, + {0x5303, 0x20}, + + {0x5306, 0x1c}, //de-noise offset 1 + {0x5307, 0x28}, //de-noise offset 2 + + {0x4002, 0xc5}, + {0x4003, 0x81}, + {0x4005, 0x12}, + + {0x5688, 0x11}, + {0x5689, 0x11}, + {0x568a, 0x11}, + {0x568b, 0x11}, + {0x568c, 0x11}, + {0x568d, 0x11}, + {0x568e, 0x11}, + {0x568f, 0x11}, + + {0x5580, 0x06}, + {0x5588, 0x00}, + {0x5583, 0x40}, + {0x5584, 0x2c}, + + {ISP_CONTROL_01, 0x83}, // turn color matrix, awb and SDE + {REGLIST_TAIL, 0x00}, // tail +}; + +static const DRAM_ATTR uint16_t sensor_fmt_jpeg[][2] = { + {FORMAT_CTRL, 0x00}, // YUV422 + {FORMAT_CTRL00, 0x30}, // YUYV + {0x3002, 0x00},//0x1c to 0x00 !!! + {0x3006, 0xff},//0xc3 to 0xff !!! + {0x471c, 0x50},//0xd0 to 0x50 !!! + {REGLIST_TAIL, 0x00}, // tail +}; + +static const DRAM_ATTR uint16_t sensor_fmt_raw[][2] = { + {FORMAT_CTRL00, 0x00}, // RAW + {REGLIST_TAIL, 0x00} +}; + +static const DRAM_ATTR uint16_t sensor_fmt_grayscale[][2] = { + {FORMAT_CTRL, 0x00}, // YUV422 + {FORMAT_CTRL00, 0x10}, // Y8 + {REGLIST_TAIL, 0x00} +}; + +static const DRAM_ATTR uint16_t sensor_fmt_yuv422[][2] = { + {FORMAT_CTRL, 0x00}, // YUV422 + {FORMAT_CTRL00, 0x30}, // YUYV + {REGLIST_TAIL, 0x00} +}; + +static const DRAM_ATTR uint16_t sensor_fmt_rgb565[][2] = { + {FORMAT_CTRL, 0x01}, // RGB + {FORMAT_CTRL00, 0x61}, // RGB565 (BGR) + {REGLIST_TAIL, 0x00} +}; + +static const DRAM_ATTR uint8_t sensor_saturation_levels[9][11] = { + {0x1d, 0x60, 0x03, 0x07, 0x48, 0x4f, 0x4b, 0x40, 0x0b, 0x01, 0x98},//-4 + {0x1d, 0x60, 0x03, 0x08, 0x54, 0x5c, 0x58, 0x4b, 0x0d, 0x01, 0x98},//-3 + {0x1d, 0x60, 0x03, 0x0a, 0x60, 0x6a, 0x64, 0x56, 0x0e, 0x01, 0x98},//-2 + {0x1d, 0x60, 0x03, 0x0b, 0x6c, 0x77, 0x70, 0x60, 0x10, 0x01, 0x98},//-1 + {0x1d, 0x60, 0x03, 0x0c, 0x78, 0x84, 0x7d, 0x6b, 0x12, 0x01, 0x98},//0 + {0x1d, 0x60, 0x03, 0x0d, 0x84, 0x91, 0x8a, 0x76, 0x14, 0x01, 0x98},//+1 + {0x1d, 0x60, 0x03, 0x0e, 0x90, 0x9e, 0x96, 0x80, 0x16, 0x01, 0x98},//+2 + {0x1d, 0x60, 0x03, 0x10, 0x9c, 0xac, 0xa2, 0x8b, 0x17, 0x01, 0x98},//+3 + {0x1d, 0x60, 0x03, 0x11, 0xa8, 0xb9, 0xaf, 0x96, 0x19, 0x01, 0x98},//+4 +}; + +static const DRAM_ATTR uint8_t sensor_special_effects[7][4] = { + {0x06, 0x40, 0x2c, 0x08},//Normal + {0x46, 0x40, 0x28, 0x08},//Negative + {0x1e, 0x80, 0x80, 0x08},//Grayscale + {0x1e, 0x80, 0xc0, 0x08},//Red Tint + {0x1e, 0x60, 0x60, 0x08},//Green Tint + {0x1e, 0xa0, 0x40, 0x08},//Blue Tint + {0x1e, 0x40, 0xa0, 0x08},//Sepia +}; + +#endif diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/ov5640.h b/lib/libesp32_div/esp32-camera/sensors/private_include/ov5640.h new file mode 100644 index 000000000..120ae7205 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/private_include/ov5640.h @@ -0,0 +1,27 @@ + +#ifndef __OV5640_H__ +#define __OV5640_H__ + +#include "sensor.h" + +/** + * @brief Detect sensor pid + * + * @param slv_addr SCCB address + * @param id Detection result + * @return + * 0: Can't detect this sensor + * Nonzero: This sensor has been detected + */ +int ov5640_detect(int slv_addr, sensor_id_t *id); + +/** + * @brief initialize sensor function pointers + * + * @param sensor pointer of sensor + * @return + * Always 0 + */ +int ov5640_init(sensor_t *sensor); + +#endif // __OV5640_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/ov5640_regs.h b/lib/libesp32_div/esp32-camera/sensors/private_include/ov5640_regs.h new file mode 100644 index 000000000..c28d80f5b --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/private_include/ov5640_regs.h @@ -0,0 +1,213 @@ +/* + * OV5640 register definitions. + */ +#ifndef __OV5640_REG_REGS_H__ +#define __OV5640_REG_REGS_H__ + +/* system control registers */ +#define SYSTEM_CTROL0 0x3008 // Bit[7]: Software reset + // Bit[6]: Software power down + // Bit[5]: Reserved + // Bit[4]: SRB clock SYNC enable + // Bit[3]: Isolation suspend select + // Bit[2:0]: Not used + +#define DRIVE_CAPABILITY 0x302c // Bit[7:6]: + // 00: 1x + // 01: 2x + // 10: 3x + // 11: 4x + +#define SC_PLLS_CTRL0 0x303a // Bit[7]: PLLS bypass +#define SC_PLLS_CTRL1 0x303b // Bit[4:0]: PLLS multiplier +#define SC_PLLS_CTRL2 0x303c // Bit[6:4]: PLLS charge pump control + // Bit[3:0]: PLLS system divider +#define SC_PLLS_CTRL3 0x303d // Bit[5:4]: PLLS pre-divider + // 00: 1 + // 01: 1.5 + // 10: 2 + // 11: 3 + // Bit[2]: PLLS root-divider - 1 + // Bit[1:0]: PLLS seld5 + // 00: 1 + // 01: 1 + // 10: 2 + // 11: 2.5 + +/* AEC/AGC control functions */ +#define AEC_PK_MANUAL 0x3503 // AEC Manual Mode Control + // Bit[7:6]: Reserved + // Bit[5]: Gain delay option + // Valid when 0x3503[4]=1’b0 + // 0: Delay one frame latch + // 1: One frame latch + // Bit[4:2]: Reserved + // Bit[1]: AGC manual + // 0: Auto enable + // 1: Manual enable + // Bit[0]: AEC manual + // 0: Auto enable + // 1: Manual enable + +//gain = {0x350A[1:0], 0x350B[7:0]} / 16 + + +#define X_ADDR_ST_H 0x3800 //Bit[3:0]: X address start[11:8] +#define X_ADDR_ST_L 0x3801 //Bit[7:0]: X address start[7:0] +#define Y_ADDR_ST_H 0x3802 //Bit[2:0]: Y address start[10:8] +#define Y_ADDR_ST_L 0x3803 //Bit[7:0]: Y address start[7:0] +#define X_ADDR_END_H 0x3804 //Bit[3:0]: X address end[11:8] +#define X_ADDR_END_L 0x3805 //Bit[7:0]: +#define Y_ADDR_END_H 0x3806 //Bit[2:0]: Y address end[10:8] +#define Y_ADDR_END_L 0x3807 //Bit[7:0]: +// Size after scaling +#define X_OUTPUT_SIZE_H 0x3808 //Bit[3:0]: DVP output horizontal width[11:8] +#define X_OUTPUT_SIZE_L 0x3809 //Bit[7:0]: +#define Y_OUTPUT_SIZE_H 0x380a //Bit[2:0]: DVP output vertical height[10:8] +#define Y_OUTPUT_SIZE_L 0x380b //Bit[7:0]: +#define X_TOTAL_SIZE_H 0x380c //Bit[3:0]: Total horizontal size[11:8] +#define X_TOTAL_SIZE_L 0x380d //Bit[7:0]: +#define Y_TOTAL_SIZE_H 0x380e //Bit[7:0]: Total vertical size[15:8] +#define Y_TOTAL_SIZE_L 0x380f //Bit[7:0]: +#define X_OFFSET_H 0x3810 //Bit[3:0]: ISP horizontal offset[11:8] +#define X_OFFSET_L 0x3811 //Bit[7:0]: +#define Y_OFFSET_H 0x3812 //Bit[2:0]: ISP vertical offset[10:8] +#define Y_OFFSET_L 0x3813 //Bit[7:0]: +#define X_INCREMENT 0x3814 //Bit[7:4]: Horizontal odd subsample increment + //Bit[3:0]: Horizontal even subsample increment +#define Y_INCREMENT 0x3815 //Bit[7:4]: Vertical odd subsample increment + //Bit[3:0]: Vertical even subsample increment +// Size before scaling +//#define X_INPUT_SIZE (X_ADDR_END - X_ADDR_ST + 1 - (2 * X_OFFSET)) +//#define Y_INPUT_SIZE (Y_ADDR_END - Y_ADDR_ST + 1 - (2 * Y_OFFSET)) + +/* mirror and flip registers */ +#define TIMING_TC_REG20 0x3820 // Timing Control Register + // Bit[2:1]: Vertical flip enable + // 00: Normal + // 11: Vertical flip + // Bit[0]: Vertical binning enable +#define TIMING_TC_REG21 0x3821 // Timing Control Register + // Bit[5]: Compression Enable + // Bit[2:1]: Horizontal mirror enable + // 00: Normal + // 11: Horizontal mirror + // Bit[0]: Horizontal binning enable + +#define PCLK_RATIO 0x3824 // Bit[4:0]: PCLK ratio manual + +/* frame control registers */ +#define FRAME_CTRL01 0x4201 // Control Passed Frame Number When both ON and OFF number set to 0x00,frame control is in bypass mode + // Bit[7:4]: Not used + // Bit[3:0]: Frame ON number +#define FRAME_CTRL02 0x4202 // Control Masked Frame Number When both ON and OFF number set to 0x00,frame control is in bypass mode + // Bit[7:4]: Not used + // BIT[3:0]: Frame OFF number + +/* format control registers */ +#define FORMAT_CTRL00 0x4300 + +#define CLOCK_POL_CONTROL 0x4740// Bit[5]: PCLK polarity 0: active low + // 1: active high + // Bit[3]: Gate PCLK under VSYNC + // Bit[2]: Gate PCLK under HREF + // Bit[1]: HREF polarity + // 0: active low + // 1: active high + // Bit[0] VSYNC polarity + // 0: active low + // 1: active high + +#define ISP_CONTROL_01 0x5001 // Bit[5]: Scale enable + // 0: Disable + // 1: Enable + +/* output format control registers */ +#define FORMAT_CTRL 0x501F // Format select + // Bit[2:0]: + // 000: YUV422 + // 001: RGB + // 010: Dither + // 011: RAW after DPC + // 101: RAW after CIP + +/* ISP top control registers */ +#define PRE_ISP_TEST_SETTING_1 0x503D // Bit[7]: Test enable + // 0: Test disable + // 1: Color bar enable + // Bit[6]: Rolling + // Bit[5]: Transparent + // Bit[4]: Square black and white + // Bit[3:2]: Color bar style + // 00: Standard 8 color bar + // 01: Gradual change at vertical mode 1 + // 10: Gradual change at horizontal + // 11: Gradual change at vertical mode 2 + // Bit[1:0]: Test select + // 00: Color bar + // 01: Random data + // 10: Square data + // 11: Black image + +//exposure = {0x3500[3:0], 0x3501[7:0], 0x3502[7:0]} / 16 × tROW + +#define SCALE_CTRL_1 0x5601 // Bit[6:4]: HDIV RW + // DCW scale times + // 000: DCW 1 time + // 001: DCW 2 times + // 010: DCW 4 times + // 100: DCW 8 times + // 101: DCW 16 times + // Others: DCW 16 times + // Bit[2:0]: VDIV RW + // DCW scale times + // 000: DCW 1 time + // 001: DCW 2 times + // 010: DCW 4 times + // 100: DCW 8 times + // 101: DCW 16 times + // Others: DCW 16 times + +#define SCALE_CTRL_2 0x5602 // X_SCALE High Bits +#define SCALE_CTRL_3 0x5603 // X_SCALE Low Bits +#define SCALE_CTRL_4 0x5604 // Y_SCALE High Bits +#define SCALE_CTRL_5 0x5605 // Y_SCALE Low Bits +#define SCALE_CTRL_6 0x5606 // Bit[3:0]: V Offset + +#define VFIFO_CTRL0C 0x460C // Bit[1]: PCLK manual enable + // 0: Auto + // 1: Manual by PCLK_RATIO + +#define VFIFO_X_SIZE_H 0x4602 +#define VFIFO_X_SIZE_L 0x4603 +#define VFIFO_Y_SIZE_H 0x4604 +#define VFIFO_Y_SIZE_L 0x4605 + +#define COMPRESSION_CTRL00 0x4400 // +#define COMPRESSION_CTRL01 0x4401 // +#define COMPRESSION_CTRL02 0x4402 // +#define COMPRESSION_CTRL03 0x4403 // +#define COMPRESSION_CTRL04 0x4404 // +#define COMPRESSION_CTRL05 0x4405 // +#define COMPRESSION_CTRL06 0x4406 // +#define COMPRESSION_CTRL07 0x4407 // Bit[5:0]: QS +#define COMPRESSION_ISI_CTRL 0x4408 // +#define COMPRESSION_CTRL09 0x4409 // +#define COMPRESSION_CTRL0a 0x440a // +#define COMPRESSION_CTRL0b 0x440b // +#define COMPRESSION_CTRL0c 0x440c // +#define COMPRESSION_CTRL0d 0x440d // +#define COMPRESSION_CTRL0E 0x440e // + +/** + * @brief register value + */ +#define TEST_COLOR_BAR 0xC0 /* Enable Color Bar roling Test */ + +#define AEC_PK_MANUAL_AGC_MANUALEN 0x02 /* Enable AGC Manual enable */ +#define AEC_PK_MANUAL_AEC_MANUALEN 0x01 /* Enable AEC Manual enable */ + +#define TIMING_TC_REG20_VFLIP 0x06 /* Vertical flip enable */ +#define TIMING_TC_REG21_HMIRROR 0x06 /* Horizontal mirror enable */ + +#endif // __OV3660_REG_REGS_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/ov5640_settings.h b/lib/libesp32_div/esp32-camera/sensors/private_include/ov5640_settings.h new file mode 100644 index 000000000..fec7d679f --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/private_include/ov5640_settings.h @@ -0,0 +1,334 @@ +#ifndef _OV5640_SETTINGS_H_ +#define _OV5640_SETTINGS_H_ + +#include +#include +#include "esp_attr.h" +#include "ov5640_regs.h" + +static const ratio_settings_t ratio_table[] = { + // mw, mh, sx, sy, ex, ey, ox, oy, tx, ty + { 2560, 1920, 0, 0, 2623, 1951, 32, 16, 2844, 1968 }, //4x3 + { 2560, 1704, 0, 110, 2623, 1843, 32, 16, 2844, 1752 }, //3x2 + { 2560, 1600, 0, 160, 2623, 1791, 32, 16, 2844, 1648 }, //16x10 + { 2560, 1536, 0, 192, 2623, 1759, 32, 16, 2844, 1584 }, //5x3 + { 2560, 1440, 0, 240, 2623, 1711, 32, 16, 2844, 1488 }, //16x9 + { 2560, 1080, 0, 420, 2623, 1531, 32, 16, 2844, 1128 }, //21x9 + { 2400, 1920, 80, 0, 2543, 1951, 32, 16, 2684, 1968 }, //5x4 + { 1920, 1920, 320, 0, 2543, 1951, 32, 16, 2684, 1968 }, //1x1 + { 1088, 1920, 736, 0, 1887, 1951, 32, 16, 1884, 1968 } //9x16 +}; + +#define REG_DLY 0xffff +#define REGLIST_TAIL 0x0000 + +static const DRAM_ATTR uint16_t sensor_default_regs[][2] = { + {SYSTEM_CTROL0, 0x82}, // software reset + {REG_DLY, 10}, // delay 10ms + {SYSTEM_CTROL0, 0x42}, // power down + + //enable pll + {0x3103, 0x13}, + + //io direction + {0x3017, 0xff}, + {0x3018, 0xff}, + + {DRIVE_CAPABILITY, 0xc3}, + {CLOCK_POL_CONTROL, 0x21}, + + {0x4713, 0x02},//jpg mode select + + {ISP_CONTROL_01, 0x83}, // turn color matrix, awb and SDE + + //sys reset + {0x3000, 0x00}, + {0x3002, 0x1c}, + + //clock enable + {0x3004, 0xff}, + {0x3006, 0xc3}, + + //isp control + {0x5000, 0xa7}, + {ISP_CONTROL_01, 0xa3},//+scaling? + {0x5003, 0x08},//special_effect + + //unknown + {0x370c, 0x02},//!!IMPORTANT + {0x3634, 0x40},//!!IMPORTANT + + //AEC/AGC + {0x3a02, 0x03}, + {0x3a03, 0xd8}, + {0x3a08, 0x01}, + {0x3a09, 0x27}, + {0x3a0a, 0x00}, + {0x3a0b, 0xf6}, + {0x3a0d, 0x04}, + {0x3a0e, 0x03}, + {0x3a0f, 0x30},//ae_level + {0x3a10, 0x28},//ae_level + {0x3a11, 0x60},//ae_level + {0x3a13, 0x43}, + {0x3a14, 0x03}, + {0x3a15, 0xd8}, + {0x3a18, 0x00},//gainceiling + {0x3a19, 0xf8},//gainceiling + {0x3a1b, 0x30},//ae_level + {0x3a1e, 0x26},//ae_level + {0x3a1f, 0x14},//ae_level + + //vcm debug + {0x3600, 0x08}, + {0x3601, 0x33}, + + //50/60Hz + {0x3c01, 0xa4}, + {0x3c04, 0x28}, + {0x3c05, 0x98}, + {0x3c06, 0x00}, + {0x3c07, 0x08}, + {0x3c08, 0x00}, + {0x3c09, 0x1c}, + {0x3c0a, 0x9c}, + {0x3c0b, 0x40}, + + {0x460c, 0x22},//disable jpeg footer + + //BLC + {0x4001, 0x02}, + {0x4004, 0x02}, + + //AWB + {0x5180, 0xff}, + {0x5181, 0xf2}, + {0x5182, 0x00}, + {0x5183, 0x14}, + {0x5184, 0x25}, + {0x5185, 0x24}, + {0x5186, 0x09}, + {0x5187, 0x09}, + {0x5188, 0x09}, + {0x5189, 0x75}, + {0x518a, 0x54}, + {0x518b, 0xe0}, + {0x518c, 0xb2}, + {0x518d, 0x42}, + {0x518e, 0x3d}, + {0x518f, 0x56}, + {0x5190, 0x46}, + {0x5191, 0xf8}, + {0x5192, 0x04}, + {0x5193, 0x70}, + {0x5194, 0xf0}, + {0x5195, 0xf0}, + {0x5196, 0x03}, + {0x5197, 0x01}, + {0x5198, 0x04}, + {0x5199, 0x12}, + {0x519a, 0x04}, + {0x519b, 0x00}, + {0x519c, 0x06}, + {0x519d, 0x82}, + {0x519e, 0x38}, + + //color matrix (Saturation) + {0x5381, 0x1e}, + {0x5382, 0x5b}, + {0x5383, 0x08}, + {0x5384, 0x0a}, + {0x5385, 0x7e}, + {0x5386, 0x88}, + {0x5387, 0x7c}, + {0x5388, 0x6c}, + {0x5389, 0x10}, + {0x538a, 0x01}, + {0x538b, 0x98}, + + //CIP control (Sharpness) + {0x5300, 0x10},//sharpness + {0x5301, 0x10},//sharpness + {0x5302, 0x18},//sharpness + {0x5303, 0x19},//sharpness + {0x5304, 0x10}, + {0x5305, 0x10}, + {0x5306, 0x08},//denoise + {0x5307, 0x16}, + {0x5308, 0x40}, + {0x5309, 0x10},//sharpness + {0x530a, 0x10},//sharpness + {0x530b, 0x04},//sharpness + {0x530c, 0x06},//sharpness + + //GAMMA + {0x5480, 0x01}, + {0x5481, 0x00}, + {0x5482, 0x1e}, + {0x5483, 0x3b}, + {0x5484, 0x58}, + {0x5485, 0x66}, + {0x5486, 0x71}, + {0x5487, 0x7d}, + {0x5488, 0x83}, + {0x5489, 0x8f}, + {0x548a, 0x98}, + {0x548b, 0xa6}, + {0x548c, 0xb8}, + {0x548d, 0xca}, + {0x548e, 0xd7}, + {0x548f, 0xe3}, + {0x5490, 0x1d}, + + //Special Digital Effects (SDE) (UV adjust) + {0x5580, 0x06},//enable brightness and contrast + {0x5583, 0x40},//special_effect + {0x5584, 0x10},//special_effect + {0x5586, 0x20},//contrast + {0x5587, 0x00},//brightness + {0x5588, 0x00},//brightness + {0x5589, 0x10}, + {0x558a, 0x00}, + {0x558b, 0xf8}, + {0x501d, 0x40},// enable manual offset of contrast + + //power on + {0x3008, 0x02}, + + //50Hz + {0x3c00, 0x04}, + + {REG_DLY, 300}, + {REGLIST_TAIL, 0x00}, // tail +}; + +static const DRAM_ATTR uint16_t sensor_fmt_jpeg[][2] = { + {FORMAT_CTRL, 0x00}, // YUV422 + {FORMAT_CTRL00, 0x30}, // YUYV + {0x3002, 0x00},//0x1c to 0x00 !!! + {0x3006, 0xff},//0xc3 to 0xff !!! + {0x471c, 0x50},//0xd0 to 0x50 !!! + {REGLIST_TAIL, 0x00}, // tail +}; + +static const DRAM_ATTR uint16_t sensor_fmt_raw[][2] = { + {FORMAT_CTRL, 0x03}, // RAW (DPC) + {FORMAT_CTRL00, 0x00}, // RAW + {REGLIST_TAIL, 0x00} +}; + +static const DRAM_ATTR uint16_t sensor_fmt_grayscale[][2] = { + {FORMAT_CTRL, 0x00}, // YUV422 + {FORMAT_CTRL00, 0x10}, // Y8 + {REGLIST_TAIL, 0x00} +}; + +static const DRAM_ATTR uint16_t sensor_fmt_yuv422[][2] = { + {FORMAT_CTRL, 0x00}, // YUV422 + {FORMAT_CTRL00, 0x30}, // YUYV + {REGLIST_TAIL, 0x00} +}; + +static const DRAM_ATTR uint16_t sensor_fmt_rgb565[][2] = { + {FORMAT_CTRL, 0x01}, // RGB + {FORMAT_CTRL00, 0x61}, // RGB565 (BGR) + {REGLIST_TAIL, 0x00} +}; + +static const DRAM_ATTR uint8_t sensor_saturation_levels[9][11] = { + {0x1d, 0x60, 0x03, 0x07, 0x48, 0x4f, 0x4b, 0x40, 0x0b, 0x01, 0x98},//-4 + {0x1d, 0x60, 0x03, 0x08, 0x54, 0x5c, 0x58, 0x4b, 0x0d, 0x01, 0x98},//-3 + {0x1d, 0x60, 0x03, 0x0a, 0x60, 0x6a, 0x64, 0x56, 0x0e, 0x01, 0x98},//-2 + {0x1d, 0x60, 0x03, 0x0b, 0x6c, 0x77, 0x70, 0x60, 0x10, 0x01, 0x98},//-1 + {0x1d, 0x60, 0x03, 0x0c, 0x78, 0x84, 0x7d, 0x6b, 0x12, 0x01, 0x98},//0 + {0x1d, 0x60, 0x03, 0x0d, 0x84, 0x91, 0x8a, 0x76, 0x14, 0x01, 0x98},//+1 + {0x1d, 0x60, 0x03, 0x0e, 0x90, 0x9e, 0x96, 0x80, 0x16, 0x01, 0x98},//+2 + {0x1d, 0x60, 0x03, 0x10, 0x9c, 0xac, 0xa2, 0x8b, 0x17, 0x01, 0x98},//+3 + {0x1d, 0x60, 0x03, 0x11, 0xa8, 0xb9, 0xaf, 0x96, 0x19, 0x01, 0x98},//+4 +}; + +static const DRAM_ATTR uint8_t sensor_special_effects[7][4] = { + {0x06, 0x40, 0x2c, 0x08},//Normal + {0x46, 0x40, 0x28, 0x08},//Negative + {0x1e, 0x80, 0x80, 0x08},//Grayscale + {0x1e, 0x80, 0xc0, 0x08},//Red Tint + {0x1e, 0x60, 0x60, 0x08},//Green Tint + {0x1e, 0xa0, 0x40, 0x08},//Blue Tint + {0x1e, 0x40, 0xa0, 0x08},//Sepia +}; + +static const DRAM_ATTR uint16_t sensor_regs_gamma0[][2] = { + {0x5480, 0x01}, + {0x5481, 0x08}, + {0x5482, 0x14}, + {0x5483, 0x28}, + {0x5484, 0x51}, + {0x5485, 0x65}, + {0x5486, 0x71}, + {0x5487, 0x7d}, + {0x5488, 0x87}, + {0x5489, 0x91}, + {0x548a, 0x9a}, + {0x548b, 0xaa}, + {0x548c, 0xb8}, + {0x548d, 0xcd}, + {0x548e, 0xdd}, + {0x548f, 0xea}, + {0x5490, 0x1d} +}; + +static const DRAM_ATTR uint16_t sensor_regs_gamma1[][2] = { + {0x5480, 0x1}, + {0x5481, 0x0}, + {0x5482, 0x1e}, + {0x5483, 0x3b}, + {0x5484, 0x58}, + {0x5485, 0x66}, + {0x5486, 0x71}, + {0x5487, 0x7d}, + {0x5488, 0x83}, + {0x5489, 0x8f}, + {0x548a, 0x98}, + {0x548b, 0xa6}, + {0x548c, 0xb8}, + {0x548d, 0xca}, + {0x548e, 0xd7}, + {0x548f, 0xe3}, + {0x5490, 0x1d} +}; + +static const DRAM_ATTR uint16_t sensor_regs_awb0[][2] = { + {0x5180, 0xff}, + {0x5181, 0xf2}, + {0x5182, 0x00}, + {0x5183, 0x14}, + {0x5184, 0x25}, + {0x5185, 0x24}, + {0x5186, 0x09}, + {0x5187, 0x09}, + {0x5188, 0x09}, + {0x5189, 0x75}, + {0x518a, 0x54}, + {0x518b, 0xe0}, + {0x518c, 0xb2}, + {0x518d, 0x42}, + {0x518e, 0x3d}, + {0x518f, 0x56}, + {0x5190, 0x46}, + {0x5191, 0xf8}, + {0x5192, 0x04}, + {0x5193, 0x70}, + {0x5194, 0xf0}, + {0x5195, 0xf0}, + {0x5196, 0x03}, + {0x5197, 0x01}, + {0x5198, 0x04}, + {0x5199, 0x12}, + {0x519a, 0x04}, + {0x519b, 0x00}, + {0x519c, 0x06}, + {0x519d, 0x82}, + {0x519e, 0x38} +}; + +#endif diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/ov7670.h b/lib/libesp32_div/esp32-camera/sensors/private_include/ov7670.h new file mode 100644 index 000000000..b3a645a70 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/private_include/ov7670.h @@ -0,0 +1,33 @@ +/* + * This file is part of the OpenMV project. + * author: Juan Schiavoni + * This work is licensed under the MIT license, see the file LICENSE for details. + * + * OV7670 driver. + * + */ +#ifndef __OV7670_H__ +#define __OV7670_H__ +#include "sensor.h" + +/** + * @brief Detect sensor pid + * + * @param slv_addr SCCB address + * @param id Detection result + * @return + * 0: Can't detect this sensor + * Nonzero: This sensor has been detected + */ +int ov7670_detect(int slv_addr, sensor_id_t *id); + +/** + * @brief initialize sensor function pointers + * + * @param sensor pointer of sensor + * @return + * Always 0 + */ +int ov7670_init(sensor_t *sensor); + +#endif // __OV7670_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/ov7670_regs.h b/lib/libesp32_div/esp32-camera/sensors/private_include/ov7670_regs.h new file mode 100644 index 000000000..699354877 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/private_include/ov7670_regs.h @@ -0,0 +1,354 @@ +/* + * This file is for the OpenMV project so the OV7670 can be used + * author: Juan Schiavoni + * + * OV7670 register definitions. + */ +#ifndef __OV7670_REG_REGS_H__ +#define __OV7670_REG_REGS_H__ +#define GAIN 0x00 /* AGC – Gain control gain setting */ +#define BLUE 0x01 /* AWB – Blue channel gain setting */ +#define RED 0x02 /* AWB – Red channel gain setting */ +#define VREF 0x03 /* AWB – Green channel gain setting */ +#define COM1 0x04 /* Common Control 1 */ +#define BAVG 0x05 /* U/B Average Level */ +#define GAVG 0x06 /* Y/Gb Average Level */ +#define AECH 0x07 /* Exposure VAlue - AEC MSB 5 bits */ +#define RAVG 0x08 /* V/R Average Level */ + +#define COM2 0x09 /* Common Control 2 */ +#define COM2_SOFT_SLEEP 0x10 /* Soft sleep mode */ +#define COM2_OUT_DRIVE_1x 0x00 /* Output drive capability 1x */ +#define COM2_OUT_DRIVE_2x 0x01 /* Output drive capability 2x */ +#define COM2_OUT_DRIVE_3x 0x02 /* Output drive capability 3x */ +#define COM2_OUT_DRIVE_4x 0x03 /* Output drive capability 4x */ + +#define REG_PID 0x0A /* Product ID Number MSB */ +#define REG_VER 0x0B /* Product ID Number LSB */ + +#define COM3 0x0C /* Common Control 3 */ +#define COM3_SWAP_OUT 0x40 /* Output data MSB/LSB swap */ +#define COM3_TRI_CLK 0x20 /* Tri-state output clock */ +#define COM3_TRI_DATA 0x10 /* Tri-state option output */ +#define COM3_SCALE_EN 0x08 /* Scale enable */ +#define COM3_DCW 0x04 /* DCW enable */ + +#define COM4 0x0D /* Common Control 4 */ +#define COM4_PLL_BYPASS 0x00 /* Bypass PLL */ +#define COM4_PLL_4x 0x40 /* PLL frequency 4x */ +#define COM4_PLL_6x 0x80 /* PLL frequency 6x */ +#define COM4_PLL_8x 0xc0 /* PLL frequency 8x */ +#define COM4_AEC_FULL 0x00 /* AEC evaluate full window */ +#define COM4_AEC_1_2 0x10 /* AEC evaluate 1/2 window */ +#define COM4_AEC_1_4 0x20 /* AEC evaluate 1/4 window */ +#define COM4_AEC_2_3 0x30 /* AEC evaluate 2/3 window */ + +#define COM5 0x0E /* Common Control 5 */ +#define COM5_AFR 0x80 /* Auto frame rate control ON/OFF selection (night mode) */ +#define COM5_AFR_SPEED 0x40 /* Auto frame rate control speed selection */ +#define COM5_AFR_0 0x00 /* No reduction of frame rate */ +#define COM5_AFR_1_2 0x10 /* Max reduction to 1/2 frame rate */ +#define COM5_AFR_1_4 0x20 /* Max reduction to 1/4 frame rate */ +#define COM5_AFR_1_8 0x30 /* Max reduction to 1/8 frame rate */ +#define COM5_AFR_4x 0x04 /* Add frame when AGC reaches 4x gain */ +#define COM5_AFR_8x 0x08 /* Add frame when AGC reaches 8x gain */ +#define COM5_AFR_16x 0x0c /* Add frame when AGC reaches 16x gain */ +#define COM5_AEC_NO_LIMIT 0x01 /* No limit to AEC increase step */ + +#define COM6 0x0F /* Common Control 6 */ +#define COM6_AUTO_WINDOW 0x01 /* Auto window setting ON/OFF selection when format changes */ + +#define AEC 0x10 /* AEC[7:0] (see register AECH for AEC[15:8]) */ +#define CLKRC 0x11 /* Internal Clock */ + +#define COM7 0x12 /* Common Control 7 */ +#define COM7_RESET 0x80 /* SCCB Register Reset */ +#define COM7_RES_VGA 0x00 /* Resolution VGA */ +#define COM7_RES_QVGA 0x40 /* Resolution QVGA */ +#define COM7_BT656 0x20 /* BT.656 protocol ON/OFF */ +#define COM7_SENSOR_RAW 0x10 /* Sensor RAW */ +#define COM7_FMT_GBR422 0x00 /* RGB output format GBR422 */ +#define COM7_FMT_RGB565 0x04 /* RGB output format RGB565 */ +#define COM7_FMT_RGB555 0x08 /* RGB output format RGB555 */ +#define COM7_FMT_RGB444 0x0C /* RGB output format RGB444 */ +#define COM7_FMT_YUV 0x00 /* Output format YUV */ +#define COM7_FMT_P_BAYER 0x01 /* Output format Processed Bayer RAW */ +#define COM7_FMT_RGB 0x04 /* Output format RGB */ +#define COM7_FMT_R_BAYER 0x03 /* Output format Bayer RAW */ +#define COM7_SET_FMT(r, x) ((r&0xFC)|((x&0x5)<<0)) + +#define COM8 0x13 /* Common Control 8 */ +#define COM8_FAST_AUTO 0x80 /* Enable fast AGC/AEC algorithm */ +#define COM8_STEP_VSYNC 0x00 /* AEC - Step size limited to vertical blank */ +#define COM8_STEP_UNLIMIT 0x40 /* AEC - Step size unlimited step size */ +#define COM8_BANDF_EN 0x20 /* Banding filter ON/OFF */ +#define COM8_AEC_BANDF 0x10 /* Enable AEC below banding value */ +#define COM8_AEC_FINE_EN 0x08 /* Fine AEC ON/OFF control */ +#define COM8_AGC_EN 0x04 /* AGC Enable */ +#define COM8_AWB_EN 0x02 /* AWB Enable */ +#define COM8_AEC_EN 0x01 /* AEC Enable */ +#define COM8_SET_AGC(r, x) ((r&0xFB)|((x&0x1)<<2)) +#define COM8_SET_AWB(r, x) ((r&0xFD)|((x&0x1)<<1)) +#define COM8_SET_AEC(r, x) ((r&0xFE)|((x&0x1)<<0)) + +#define COM9 0x14 /* Common Control 9 */ +#define COM9_HISTO_AVG 0x80 /* Histogram or average based AEC/AGC selection */ +#define COM9_AGC_GAIN_2x 0x00 /* Automatic Gain Ceiling 2x */ +#define COM9_AGC_GAIN_4x 0x10 /* Automatic Gain Ceiling 4x */ +#define COM9_AGC_GAIN_8x 0x20 /* Automatic Gain Ceiling 8x */ +#define COM9_AGC_GAIN_16x 0x30 /* Automatic Gain Ceiling 16x */ +#define COM9_AGC_GAIN_32x 0x40 /* Automatic Gain Ceiling 32x */ +#define COM9_DROP_VSYNC 0x04 /* Drop VSYNC output of corrupt frame */ +#define COM9_DROP_HREF 0x02 /* Drop HREF output of corrupt frame */ +#define COM9_SET_AGC(r, x) ((r&0x8F)|((x&0x07)<<4)) + +#define COM10 0x15 /* Common Control 10 */ +#define COM10_NEGATIVE 0x80 /* Output negative data */ +#define COM10_HSYNC_EN 0x40 /* HREF changes to HSYNC */ +#define COM10_PCLK_FREE 0x00 /* PCLK output option: free running PCLK */ +#define COM10_PCLK_MASK 0x20 /* PCLK output option: masked during horizontal blank */ +#define COM10_PCLK_REV 0x10 /* PCLK reverse */ +#define COM10_HREF_REV 0x08 /* HREF reverse */ +#define COM10_VSYNC_FALLING 0x00 /* VSYNC changes on falling edge of PCLK */ +#define COM10_VSYNC_RISING 0x04 /* VSYNC changes on rising edge of PCLK */ +#define COM10_VSYNC_NEG 0x02 /* VSYNC negative */ +#define COM10_OUT_RANGE_8 0x01 /* Output data range: Full range */ +#define COM10_OUT_RANGE_10 0x00 /* Output data range: Data from [10] to [F0] (8 MSBs) */ + +#define RSVD_16 0x16 /* Reserved register */ + +#define HSTART 0x17 /* Horizontal Frame (HREF column) Start high 8-bit(low 3 bits are at HREF[2:0]) */ +#define HSTOP 0x18 /* Horizontal Frame (HREF column) end high 8-bit (low 3 bits are at HREF[5:3]) */ +#define VSTART 0x19 /* Vertical Frame (row) Start high 8-bit (low 2 bits are at VREF[1:0]) */ +#define VSTOP 0x1A /* Vertical Frame (row) End high 8-bit (low 2 bits are at VREF[3:2]) */ +#define PSHFT 0x1B /* Data Format - Pixel Delay Select */ +#define REG_MIDH 0x1C /* Manufacturer ID Byte – High */ +#define REG_MIDL 0x1D /* Manufacturer ID Byte – Low */ + +#define MVFP 0x1E /* Mirror/Vflip Enable */ +#define MVFP_MIRROR 0x20 /* Mirror image */ +#define MVFP_FLIP 0x10 /* Vertical flip */ +#define MVFP_SUN 0x02 /* Black sun enable */ +#define MVFP_SET_MIRROR(r,x) ((r&0xDF)|((x&1)<<5)) /* change only bit5 according to x */ +#define MVFP_SET_FLIP(r,x) ((r&0xEF)|((x&1)<<4)) /* change only bit4 according to x */ + +#define LAEC 0x1F /* Fine AEC Value - defines exposure value less than one row period (Reserved?) */ +#define ADCCTR0 0x20 /* ADC control */ +#define ADCCTR1 0x21 /* reserved */ +#define ADCCTR2 0x22 /* reserved */ +#define ADCCTR3 0x23 /* reserved */ +#define AEW 0x24 /* AGC/AEC - Stable Operating Region (Upper Limit) */ +#define AEB 0x25 /* AGC/AEC - Stable Operating Region (Lower Limit) */ +#define VPT 0x26 /* AGC/AEC Fast Mode Operating Region */ +#define BBIAS 0x27 /* B channel signal output bias (effective only when COM6[3]=1) */ +#define GbBIAS 0x28 /* Gb channel signal output bias (effective only when COM6[3]=1) */ +#define RSVD_29 0x29 /* reserved */ +#define EXHCH 0x2A /* Dummy Pixel Insert MSB */ +#define EXHCL 0x2B /* Dummy Pixel Insert LSB */ +#define RBIAS 0x2C /* R channel signal output bias (effective only when COM6[3]=1) */ +#define ADVFL 0x2D /* LSB of Insert Dummy Rows in Vertical Sync (1 bit equals 1 row) */ +#define ADVFH 0x2E /* MSB of Insert Dummy Rows in Vertical Sync */ +#define YAVE 0x2F /* Y/G Channel Average Value */ +#define HSYST 0x30 /* HSync rising edge delay */ +#define HSYEN 0x31 /* HSync falling edge delay */ +#define HREF 0x32 /* Image Start and Size Control DIFFERENT CONTROL SEQUENCE */ +#define CHLF 0x33 /* Array Current control */ +#define ARBLM 0x34 /* Array reference control */ +#define RSVD_35 0x35 /* Reserved */ +#define RSVD_36 0x36 /* Reserved */ +#define ADC 0x37 /* ADC control */ +#define ACOM 0x38 /* ADC and analog common mode control */ +#define OFON 0x39 /* ADC offset control */ +#define TSLB 0x3A /* Line buffer test option */ + +#define COM11 0x3B /* Common control 11 */ +#define COM11_EXP 0x02 +#define COM11_HZAUTO 0x10 /* Auto detect 50/60 Hz */ + +#define COM12 0x3C /* Common control 12 */ + +#define COM13 0x3D /* Common control 13 */ +#define COM13_GAMMA 0x80 /* Gamma enable */ +#define COM13_UVSAT 0x40 /* UV saturation auto adjustment */ + +#define COM14 0x3E /* Common Control 14 */ + +#define EDGE 0x3F /* edge enhancement adjustment */ +#define COM15 0x40 /* Common Control 15 DIFFERENT CONTROLS */ +#define COM15_SET_RGB565(r,x) ((r&0xEF)|((x&1)<<4)) /* set rgb565 mode */ +#define COM15_RGB565 0x10 /* RGB565 output */ +#define COM15_R00FF 0xC0 /* Output range: [00] to [FF] */ + +#define COM16 0x41 /* Common Control 16 DIFFERENT CONTROLS */ +#define COM16_AWBGAIN 0x08 /* AWB gain enable */ +#define COM17 0x42 /* Common Control 17 */ + +#define AWBC1 0x43 /* Reserved */ +#define AWBC2 0x44 /* Reserved */ +#define AWBC3 0x45 /* Reserved */ +#define AWBC4 0x46 /* Reserved */ +#define AWBC5 0x47 /* Reserved */ +#define AWBC6 0x48 /* Reserved */ + +#define RSVD_49 0x49 /* Reserved */ +#define RSVD_4A 0x4A /* Reserved */ + +#define REG4B 0x4B /* Register 4B */ +#define DNSTH 0x4C /* Denoise strength */ + +#define RSVD_4D 0x4D /* Reserved */ +#define RSVD_4E 0x4E /* Reserved */ + +#define MTX1 0x4F /* Matrix coefficient 1 */ +#define MTX2 0x50 /* Matrix coefficient 2 */ +#define MTX3 0x51 /* Matrix coefficient 3 */ +#define MTX4 0x52 /* Matrix coefficient 4 */ +#define MTX5 0x53 /* Matrix coefficient 5 */ +#define MTX6 0x54 /* Matrix coefficient 6 */ +#define BRIGHTNESS 0x55 /* Brightness control */ +#define CONTRAST 0x56 /* Contrast control */ +#define CONTRASCENTER 0x57 /* Contrast center */ +#define MTXS 0x58 /* Matrix coefficient sign for coefficient 5 to 0*/ + +#define RSVD_59 0x59 /* Reserved */ +#define RSVD_5A 0x5A /* Reserved */ +#define RSVD_5B 0x5B /* Reserved */ +#define RSVD_5C 0x5C /* Reserved */ +#define RSVD_5D 0x5D /* Reserved */ +#define RSVD_5E 0x5E /* Reserved */ +#define RSVD_5F 0x5F /* Reserved */ +#define RSVD_60 0x60 /* Reserved */ +#define RSVD_61 0x61 /* Reserved */ + +#define LCC1 0x62 /* Lens correction option 1 */ + +#define LCC2 0x63 /* Lens correction option 2 */ +#define LCC3 0x64 /* Lens correction option 3 */ +#define LCC4 0x65 /* Lens correction option 4 */ +#define LCC5 0x66 /* Lens correction option 5 */ + +#define MANU 0x67 /* Manual U Value */ +#define MANV 0x68 /* Manual V Value */ +#define GFIX 0x69 /* Fix gain control */ +#define GGAIN 0x6A /* G channel AWB gain */ + +#define DBLV 0x6B /* PLL and clock ? */ + +#define AWBCTR3 0x6C /* AWB Control 3 */ +#define AWBCTR2 0x6D /* AWB Control 2 */ +#define AWBCTR1 0x6E /* AWB Control 1 */ +#define AWBCTR0 0x6F /* AWB Control 0 */ +#define SCALING_XSC 0x70 /* test pattern and horizontal scaling factor */ +#define SCALING_XSC_CBAR(r) (r&0x7F) /* make sure bit7 is 0 for color bar */ +#define SCALING_YSC 0x71 /* test pattern and vertical scaling factor */ +#define SCALING_YSC_CBAR(r,x) ((r&0x7F)|((x&1)<<7)) /* change bit7 for color bar on/off */ +#define SCALING_DCWCTR 0x72 /* DCW control */ +#define SCALING_PCLK_DIV 0x73 /* */ +#define REG74 0x74 /* */ +#define REG75 0x75 /* */ +#define REG76 0x76 /* */ +#define REG77 0x77 /* */ + +#define RSVD_78 0x78 /* Reserved */ +#define RSVD_79 0x79 /* Reserved */ + +#define SLOP 0x7A /* Gamma curve highest segment slope */ +#define GAM1 0x7B /* Gamma Curve 1st Segment Input End Point 0x04 Output Value */ +#define GAM2 0x7C /* Gamma Curve 2nd Segment Input End Point 0x08 Output Value */ +#define GAM3 0x7D /* Gamma Curve 3rd Segment Input End Point 0x10 Output Value */ +#define GAM4 0x7E /* Gamma Curve 4th Segment Input End Point 0x20 Output Value */ +#define GAM5 0x7F /* Gamma Curve 5th Segment Input End Point 0x28 Output Value */ +#define GAM6 0x80 /* Gamma Curve 6rd Segment Input End Point 0x30 Output Value */ +#define GAM7 0x81 /* Gamma Curve 7th Segment Input End Point 0x38 Output Value */ +#define GAM8 0x82 /* Gamma Curve 8th Segment Input End Point 0x40 Output Value */ +#define GAM9 0x83 /* Gamma Curve 9th Segment Input End Point 0x48 Output Value */ +#define GAM10 0x84 /* Gamma Curve 10th Segment Input End Point 0x50 Output Value */ +#define GAM11 0x85 /* Gamma Curve 11th Segment Input End Point 0x60 Output Value */ +#define GAM12 0x86 /* Gamma Curve 12th Segment Input End Point 0x70 Output Value */ +#define GAM13 0x87 /* Gamma Curve 13th Segment Input End Point 0x90 Output Value */ +#define GAM14 0x88 /* Gamma Curve 14th Segment Input End Point 0xB0 Output Value */ +#define GAM15 0x89 /* Gamma Curve 15th Segment Input End Point 0xD0 Output Value */ + +#define RSVD_8A 0x8A /* Reserved */ +#define RSVD_8B 0x8B /* Reserved */ + +#define RGB444 0x8C /* */ + +#define RSVD_8D 0x8D /* Reserved */ +#define RSVD_8E 0x8E /* Reserved */ +#define RSVD_8F 0x8F /* Reserved */ +#define RSVD_90 0x90 /* Reserved */ +#define RSVD_91 0x91 /* Reserved */ + +#define DM_LNL 0x92 /* Dummy line low 8 bit */ +#define DM_LNH 0x93 /* Dummy line high 8 bit */ +#define LCC6 0x94 /* Lens correction option 6 */ +#define LCC7 0x95 /* Lens correction option 7 */ + +#define RSVD_96 0x96 /* Reserved */ +#define RSVD_97 0x97 /* Reserved */ +#define RSVD_98 0x98 /* Reserved */ +#define RSVD_99 0x99 /* Reserved */ +#define RSVD_9A 0x9A /* Reserved */ +#define RSVD_9B 0x9B /* Reserved */ +#define RSVD_9C 0x9C /* Reserved */ + +#define BD50ST 0x9D /* 50 Hz banding filter value */ +#define BD60ST 0x9E /* 60 Hz banding filter value */ +#define HAECC1 0x9F /* Histogram-based AEC/AGC control 1 */ +#define HAECC2 0xA0 /* Histogram-based AEC/AGC control 2 */ + +#define RSVD_A1 0xA1 /* Reserved */ + +#define SCALING_PCLK_DELAY 0xA2 /* Pixel clock delay */ + +#define RSVD_A3 0xA3 /* Reserved */ + +#define NT_CNTRL 0xA4 /* */ +#define BD50MAX 0xA5 /* 50 Hz banding step limit */ +#define HAECC3 0xA6 /* Histogram-based AEC/AGC control 3 */ +#define HAECC4 0xA7 /* Histogram-based AEC/AGC control 4 */ +#define HAECC5 0xA8 /* Histogram-based AEC/AGC control 5 */ +#define HAECC6 0xA9 /* Histogram-based AEC/AGC control 6 */ + +#define HAECC7 0xAA /* Histogram-based AEC/AGC control 7 */ +#define HAECC_EN 0x80 /* Histogram-based AEC algorithm enable */ + +#define BD60MAX 0xAB /* 60 Hz banding step limit */ + +#define STR_OPT 0xAC /* Register AC */ +#define STR_R 0xAD /* R gain for led output frame */ +#define STR_G 0xAE /* G gain for led output frame */ +#define STR_B 0xAF /* B gain for led output frame */ +#define RSVD_B0 0xB0 /* Reserved */ +#define ABLC1 0xB1 /* */ +#define RSVD_B2 0xB2 /* Reserved */ +#define THL_ST 0xB3 /* ABLC target */ +#define THL_DLT 0xB5 /* ABLC stable range */ + +#define RSVD_B6 0xB6 /* Reserved */ +#define RSVD_B7 0xB7 /* Reserved */ +#define RSVD_B8 0xB8 /* Reserved */ +#define RSVD_B9 0xB9 /* Reserved */ +#define RSVD_BA 0xBA /* Reserved */ +#define RSVD_BB 0xBB /* Reserved */ +#define RSVD_BC 0xBC /* Reserved */ +#define RSVD_BD 0xBD /* Reserved */ + +#define AD_CHB 0xBE /* blue channel black level compensation */ +#define AD_CHR 0xBF /* Red channel black level compensation */ +#define AD_CHGb 0xC0 /* Gb channel black level compensation */ +#define AD_CHGr 0xC1 /* Gr channel black level compensation */ + +#define RSVD_C2 0xC2 /* Reserved */ +#define RSVD_C3 0xC3 /* Reserved */ +#define RSVD_C4 0xC4 /* Reserved */ +#define RSVD_C5 0xC5 /* Reserved */ +#define RSVD_C6 0xC6 /* Reserved */ +#define RSVD_C7 0xC7 /* Reserved */ +#define RSVD_C8 0xC8 /* Reserved */ + +#define SATCTR 0xC9 /* Saturation control */ +#define SET_REG(reg, x) (##reg_DEFAULT|x) + +#endif //__OV7670_REG_REGS_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/ov7725.h b/lib/libesp32_div/esp32-camera/sensors/private_include/ov7725.h new file mode 100644 index 000000000..291b26680 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/private_include/ov7725.h @@ -0,0 +1,33 @@ +/* + * This file is part of the OpenMV project. + * Copyright (c) 2013/2014 Ibrahim Abdelkader + * This work is licensed under the MIT license, see the file LICENSE for details. + * + * OV7725 driver. + * + */ +#ifndef __OV7725_H__ +#define __OV7725_H__ +#include "sensor.h" + +/** + * @brief Detect sensor pid + * + * @param slv_addr SCCB address + * @param id Detection result + * @return + * 0: Can't detect this sensor + * Nonzero: This sensor has been detected + */ +int ov7725_detect(int slv_addr, sensor_id_t *id); + +/** + * @brief initialize sensor function pointers + * + * @param sensor pointer of sensor + * @return + * Always 0 + */ +int ov7725_init(sensor_t *sensor); + +#endif // __OV7725_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/ov7725_regs.h b/lib/libesp32_div/esp32-camera/sensors/private_include/ov7725_regs.h new file mode 100644 index 000000000..5cb233dc9 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/sensors/private_include/ov7725_regs.h @@ -0,0 +1,335 @@ +/* + * This file is part of the OpenMV project. + * Copyright (c) 2013/2014 Ibrahim Abdelkader + * This work is licensed under the MIT license, see the file LICENSE for details. + * + * OV2640 register definitions. + */ +#ifndef __REG_REGS_H__ +#define __REG_REGS_H__ +#define GAIN 0x00 /* AGC – Gain control gain setting */ +#define BLUE 0x01 /* AWB – Blue channel gain setting */ +#define RED 0x02 /* AWB – Red channel gain setting */ +#define GREEN 0x03 /* AWB – Green channel gain setting */ +#define BAVG 0x05 /* U/B Average Level */ +#define GAVG 0x06 /* Y/Gb Average Level */ +#define RAVG 0x07 /* V/R Average Level */ +#define AECH 0x08 /* Exposure Value – AEC MSBs */ + +#define COM2 0x09 /* Common Control 2 */ +#define COM2_SOFT_SLEEP 0x10 /* Soft sleep mode */ +#define COM2_OUT_DRIVE_1x 0x00 /* Output drive capability 1x */ +#define COM2_OUT_DRIVE_2x 0x01 /* Output drive capability 2x */ +#define COM2_OUT_DRIVE_3x 0x02 /* Output drive capability 3x */ +#define COM2_OUT_DRIVE_4x 0x03 /* Output drive capability 4x */ + +#define REG_PID 0x0A /* Product ID Number MSB */ +#define REG_VER 0x0B /* Product ID Number LSB */ + +#define COM3 0x0C /* Common Control 3 */ +#define COM3_VFLIP 0x80 /* Vertical flip image ON/OFF selection */ +#define COM3_MIRROR 0x40 /* Horizontal mirror image ON/OFF selection */ +#define COM3_SWAP_BR 0x20 /* Swap B/R output sequence in RGB output mode */ +#define COM3_SWAP_YUV 0x10 /* Swap Y/UV output sequence in YUV output mode */ +#define COM3_SWAP_MSB 0x08 /* Swap output MSB/LSB */ +#define COM3_TRI_CLOCK 0x04 /* Tri-state option for output clock at power-down period */ +#define COM3_TRI_DATA 0x02 /* Tri-state option for output data at power-down period */ +#define COM3_COLOR_BAR 0x01 /* Sensor color bar test pattern output enable */ +#define COM3_SET_CBAR(r, x) ((r&0xFE)|((x&1)<<0)) +#define COM3_SET_MIRROR(r, x) ((r&0xBF)|((x&1)<<6)) +#define COM3_SET_FLIP(r, x) ((r&0x7F)|((x&1)<<7)) + +#define COM4 0x0D /* Common Control 4 */ +#define COM4_PLL_BYPASS 0x00 /* Bypass PLL */ +#define COM4_PLL_4x 0x40 /* PLL frequency 4x */ +#define COM4_PLL_6x 0x80 /* PLL frequency 6x */ +#define COM4_PLL_8x 0xc0 /* PLL frequency 8x */ +#define COM4_AEC_FULL 0x00 /* AEC evaluate full window */ +#define COM4_AEC_1_2 0x10 /* AEC evaluate 1/2 window */ +#define COM4_AEC_1_4 0x20 /* AEC evaluate 1/4 window */ +#define COM4_AEC_2_3 0x30 /* AEC evaluate 2/3 window */ + +#define COM5 0x0E /* Common Control 5 */ +#define COM5_AFR 0x80 /* Auto frame rate control ON/OFF selection (night mode) */ +#define COM5_AFR_SPEED 0x40 /* Auto frame rate control speed selection */ +#define COM5_AFR_0 0x00 /* No reduction of frame rate */ +#define COM5_AFR_1_2 0x10 /* Max reduction to 1/2 frame rate */ +#define COM5_AFR_1_4 0x20 /* Max reduction to 1/4 frame rate */ +#define COM5_AFR_1_8 0x30 /* Max reduction to 1/8 frame rate */ +#define COM5_AFR_4x 0x04 /* Add frame when AGC reaches 4x gain */ +#define COM5_AFR_8x 0x08 /* Add frame when AGC reaches 8x gain */ +#define COM5_AFR_16x 0x0c /* Add frame when AGC reaches 16x gain */ +#define COM5_AEC_NO_LIMIT 0x01 /* No limit to AEC increase step */ + +#define COM6 0x0F /* Common Control 6 */ +#define COM6_AUTO_WINDOW 0x01 /* Auto window setting ON/OFF selection when format changes */ + +#define AEC 0x10 /* AEC[7:0] (see register AECH for AEC[15:8]) */ +#define CLKRC 0x11 /* Internal Clock */ + +#define COM7 0x12 /* Common Control 7 */ +#define COM7_RESET 0x80 /* SCCB Register Reset */ +#define COM7_RES_VGA 0x00 /* Resolution VGA */ +#define COM7_RES_QVGA 0x40 /* Resolution QVGA */ +#define COM7_BT656 0x20 /* BT.656 protocol ON/OFF */ +#define COM7_SENSOR_RAW 0x10 /* Sensor RAW */ +#define COM7_FMT_GBR422 0x00 /* RGB output format GBR422 */ +#define COM7_FMT_RGB565 0x04 /* RGB output format RGB565 */ +#define COM7_FMT_RGB555 0x08 /* RGB output format RGB555 */ +#define COM7_FMT_RGB444 0x0C /* RGB output format RGB444 */ +#define COM7_FMT_YUV 0x00 /* Output format YUV */ +#define COM7_FMT_P_BAYER 0x01 /* Output format Processed Bayer RAW */ +#define COM7_FMT_RGB 0x02 /* Output format RGB */ +#define COM7_FMT_R_BAYER 0x03 /* Output format Bayer RAW */ +#define COM7_SET_FMT(r, x) ((r&0xFC)|((x&0x3)<<0)) +#define COM7_SET_RGB(r, x) ((r&0xF0)|(x&0x0C)|COM7_FMT_RGB) + +#define COM8 0x13 /* Common Control 8 */ +#define COM8_FAST_AUTO 0x80 /* Enable fast AGC/AEC algorithm */ +#define COM8_STEP_VSYNC 0x00 /* AEC - Step size limited to vertical blank */ +#define COM8_STEP_UNLIMIT 0x40 /* AEC - Step size unlimited step size */ +#define COM8_BANDF_EN 0x20 /* Banding filter ON/OFF */ +#define COM8_AEC_BANDF 0x10 /* Enable AEC below banding value */ +#define COM8_AEC_FINE_EN 0x08 /* Fine AEC ON/OFF control */ +#define COM8_AGC_EN 0x04 /* AGC Enable */ +#define COM8_AWB_EN 0x02 /* AWB Enable */ +#define COM8_AEC_EN 0x01 /* AEC Enable */ +#define COM8_SET_AGC(r, x) ((r&0xFB)|((x&0x1)<<2)) +#define COM8_SET_AWB(r, x) ((r&0xFD)|((x&0x1)<<1)) +#define COM8_SET_AEC(r, x) ((r&0xFE)|((x&0x1)<<0)) + +#define COM9 0x14 /* Common Control 9 */ +#define COM9_HISTO_AVG 0x80 /* Histogram or average based AEC/AGC selection */ +#define COM9_AGC_GAIN_2x 0x00 /* Automatic Gain Ceiling 2x */ +#define COM9_AGC_GAIN_4x 0x10 /* Automatic Gain Ceiling 4x */ +#define COM9_AGC_GAIN_8x 0x20 /* Automatic Gain Ceiling 8x */ +#define COM9_AGC_GAIN_16x 0x30 /* Automatic Gain Ceiling 16x */ +#define COM9_AGC_GAIN_32x 0x40 /* Automatic Gain Ceiling 32x */ +#define COM9_DROP_VSYNC 0x04 /* Drop VSYNC output of corrupt frame */ +#define COM9_DROP_HREF 0x02 /* Drop HREF output of corrupt frame */ +#define COM9_SET_AGC(r, x) ((r&0x8F)|((x&0x07)<<4)) + +#define COM10 0x15 /* Common Control 10 */ +#define COM10_NEGATIVE 0x80 /* Output negative data */ +#define COM10_HSYNC_EN 0x40 /* HREF changes to HSYNC */ +#define COM10_PCLK_FREE 0x00 /* PCLK output option: free running PCLK */ +#define COM10_PCLK_MASK 0x20 /* PCLK output option: masked during horizontal blank */ +#define COM10_PCLK_REV 0x10 /* PCLK reverse */ +#define COM10_HREF_REV 0x08 /* HREF reverse */ +#define COM10_VSYNC_FALLING 0x00 /* VSYNC changes on falling edge of PCLK */ +#define COM10_VSYNC_RISING 0x04 /* VSYNC changes on rising edge of PCLK */ +#define COM10_VSYNC_NEG 0x02 /* VSYNC negative */ +#define COM10_OUT_RANGE_8 0x01 /* Output data range: Full range */ +#define COM10_OUT_RANGE_10 0x00 /* Output data range: Data from [10] to [F0] (8 MSBs) */ + +#define REG16 0x16 /* Register 16 */ +#define REG16_BIT_SHIFT 0x80 /* Bit shift test pattern options */ +#define HSTART 0x17 /* Horizontal Frame (HREF column) Start 8 MSBs (2 LSBs are at HREF[5:4]) */ +#define HSIZE 0x18 /* Horizontal Sensor Size (2 LSBs are at HREF[1:0]) */ +#define VSTART 0x19 /* Vertical Frame (row) Start 8 MSBs (1 LSB is at HREF[6]) */ +#define VSIZE 0x1A /* Vertical Sensor Size (1 LSB is at HREF[2]) */ +#define PSHFT 0x1B /* Data Format - Pixel Delay Select */ +#define REG_MIDH 0x1C /* Manufacturer ID Byte – High */ +#define REG_MIDL 0x1D /* Manufacturer ID Byte – Low */ +#define LAEC 0x1F /* Fine AEC Value - defines exposure value less than one row period */ + +#define COM11 0x20 /* Common Control 11 */ +#define COM11_SNGL_FRAME_EN 0x02 /* Single frame ON/OFF selection */ +#define COM11_SNGL_XFR_TRIG 0x01 /* Single frame transfer trigger */ + +#define BDBASE 0x22 /* Banding Filter Minimum AEC Value */ +#define DBSTEP 0x23 /* Banding Filter Maximum Step */ +#define AEW 0x24 /* AGC/AEC - Stable Operating Region (Upper Limit) */ +#define AEB 0x25 /* AGC/AEC - Stable Operating Region (Lower Limit) */ +#define VPT 0x26 /* AGC/AEC Fast Mode Operating Region */ +#define REG28 0x28 /* Selection on the number of dummy rows, N */ +#define HOUTSIZE 0x29 /* Horizontal Data Output Size MSBs (2 LSBs at register EXHCH[1:0]) */ +#define EXHCH 0x2A /* Dummy Pixel Insert MSB */ +#define EXHCL 0x2B /* Dummy Pixel Insert LSB */ +#define VOUTSIZE 0x2C /* Vertical Data Output Size MSBs (LSB at register EXHCH[2]) */ +#define ADVFL 0x2D /* LSB of Insert Dummy Rows in Vertical Sync (1 bit equals 1 row) */ +#define ADVFH 0x2E /* MSB of Insert Dummy Rows in Vertical Sync */ +#define YAVE 0x2F /* Y/G Channel Average Value */ +#define LUMHTH 0x30 /* Histogram AEC/AGC Luminance High Level Threshold */ +#define LUMLTH 0x31 /* Histogram AEC/AGC Luminance Low Level Threshold */ +#define HREF 0x32 /* Image Start and Size Control */ +#define DM_LNL 0x33 /* Dummy Row Low 8 Bits */ +#define DM_LNH 0x34 /* Dummy Row High 8 Bits */ +#define ADOFF_B 0x35 /* AD Offset Compensation Value for B Channel */ +#define ADOFF_R 0x36 /* AD Offset Compensation Value for R Channel */ +#define ADOFF_GB 0x37 /* AD Offset Compensation Value for GB Channel */ +#define ADOFF_GR 0x38 /* AD Offset Compensation Value for GR Channel */ +#define OFF_B 0x39 /* AD Offset Compensation Value for B Channel */ +#define OFF_R 0x3A /* AD Offset Compensation Value for R Channel */ +#define OFF_GB 0x3B /* AD Offset Compensation Value for GB Channel */ +#define OFF_GR 0x3C /* AD Offset Compensation Value for GR Channel */ +#define COM12 0x3D /* DC offset compensation for analog process */ + +#define COM13 0x3E /* Common Control 13 */ +#define COM13_BLC_EN 0x80 /* BLC enable */ +#define COM13_ADC_EN 0x40 /* ADC channel BLC ON/OFF control */ +#define COM13_ANALOG_BLC 0x20 /* Analog processing channel BLC ON/OFF control */ +#define COM13_ABLC_GAIN_EN 0x04 /* ABLC gain trigger enable */ + +#define COM14 0x3F /* Common Control 14 */ +#define COM15 0x40 /* Common Control 15 */ +#define COM16 0x41 /* Common Control 16 */ +#define TGT_B 0x42 /* BLC Blue Channel Target Value */ +#define TGT_R 0x43 /* BLC Red Channel Target Value */ +#define TGT_GB 0x44 /* BLC Gb Channel Target Value */ +#define TGT_GR 0x45 /* BLC Gr Channel Target Value */ + +#define LC_CTR 0x46 /* Lens Correction Control */ +#define LC_CTR_RGB_COMP_1 0x00 /* R, G, and B channel compensation coefficient is set by LC_COEF (0x49) */ +#define LC_CTR_RGB_COMP_3 0x04 /* R, G, and B channel compensation coefficient is set by registers + LC_COEFB (0x4B), LC_COEF (0x49), and LC_COEFR (0x4C), respectively */ +#define LC_CTR_EN 0x01 /* Lens correction enable */ +#define LC_XC 0x47 /* X Coordinate of Lens Correction Center Relative to Array Center */ +#define LC_YC 0x48 /* Y Coordinate of Lens Correction Center Relative to Array Center */ +#define LC_COEF 0x49 /* Lens Correction Coefficient */ +#define LC_RADI 0x4A /* Lens Correction Radius */ +#define LC_COEFB 0x4B /* Lens Correction B Channel Compensation Coefficient */ +#define LC_COEFR 0x4C /* Lens Correction R Channel Compensation Coefficient */ + +#define FIXGAIN 0x4D /* Analog Fix Gain Amplifier */ +#define AREF0 0x4E /* Sensor Reference Control */ +#define AREF1 0x4F /* Sensor Reference Current Control */ +#define AREF2 0x50 /* Analog Reference Control */ +#define AREF3 0x51 /* ADC Reference Control */ +#define AREF4 0x52 /* ADC Reference Control */ +#define AREF5 0x53 /* ADC Reference Control */ +#define AREF6 0x54 /* Analog Reference Control */ +#define AREF7 0x55 /* Analog Reference Control */ +#define UFIX 0x60 /* U Channel Fixed Value Output */ +#define VFIX 0x61 /* V Channel Fixed Value Output */ +#define AWBB_BLK 0x62 /* AWB Option for Advanced AWB */ + +#define AWB_CTRL0 0x63 /* AWB Control Byte 0 */ +#define AWB_CTRL0_GAIN_EN 0x80 /* AWB gain enable */ +#define AWB_CTRL0_CALC_EN 0x40 /* AWB calculate enable */ +#define AWB_CTRL0_WBC_MASK 0x0F /* WBC threshold 2 */ + +#define DSP_CTRL1 0x64 /* DSP Control Byte 1 */ +#define DSP_CTRL1_FIFO_EN 0x80 /* FIFO enable/disable selection */ +#define DSP_CTRL1_UV_EN 0x40 /* UV adjust function ON/OFF selection */ +#define DSP_CTRL1_SDE_EN 0x20 /* SDE enable */ +#define DSP_CTRL1_MTRX_EN 0x10 /* Color matrix ON/OFF selection */ +#define DSP_CTRL1_INTRP_EN 0x08 /* Interpolation ON/OFF selection */ +#define DSP_CTRL1_GAMMA_EN 0x04 /* Gamma function ON/OFF selection */ +#define DSP_CTRL1_BLACK_EN 0x02 /* Black defect auto correction ON/OFF */ +#define DSP_CTRL1_WHITE_EN 0x01 /* White defect auto correction ON/OFF */ + +#define DSP_CTRL2 0x65 /* DSP Control Byte 2 */ +#define DSP_CTRL2_VDCW_EN 0x08 /* Vertical DCW enable */ +#define DSP_CTRL2_HDCW_EN 0x04 /* Horizontal DCW enable */ +#define DSP_CTRL2_VZOOM_EN 0x02 /* Vertical zoom out enable */ +#define DSP_CTRL2_HZOOM_EN 0x01 /* Horizontal zoom out enable */ + +#define DSP_CTRL3 0x66 /* DSP Control Byte 3 */ +#define DSP_CTRL3_UV_EN 0x80 /* UV output sequence option */ +#define DSP_CTRL3_CBAR_EN 0x20 /* DSP color bar ON/OFF selection */ +#define DSP_CTRL3_FIFO_EN 0x08 /* FIFO power down ON/OFF selection */ +#define DSP_CTRL3_SCAL1_PWDN 0x04 /* Scaling module power down control 1 */ +#define DSP_CTRL3_SCAL2_PWDN 0x02 /* Scaling module power down control 2 */ +#define DSP_CTRL3_INTRP_PWDN 0x01 /* Interpolation module power down control */ +#define DSP_CTRL3_SET_CBAR(r, x) ((r&0xDF)|((x&1)<<5)) + + +#define DSP_CTRL4 0x67 /* DSP Control Byte 4 */ +#define DSP_CTRL4_YUV_RGB 0x00 /* Output selection YUV or RGB */ +#define DSP_CTRL4_RAW8 0x02 /* Output selection RAW8 */ +#define DSP_CTRL4_RAW10 0x03 /* Output selection RAW10 */ + + +#define AWB_BIAS 0x68 /* AWB BLC Level Clip */ +#define AWB_CTRL1 0x69 /* AWB Control 1 */ +#define AWB_CTRL2 0x6A /* AWB Control 2 */ + +#define AWB_CTRL3 0x6B /* AWB Control 3 */ +#define AWB_CTRL3_ADVANCED 0x80 /* AWB mode select - Advanced AWB */ +#define AWB_CTRL3_SIMPLE 0x00 /* AWB mode select - Simple AWB */ + +#define AWB_CTRL4 0x6C /* AWB Control 4 */ +#define AWB_CTRL5 0x6D /* AWB Control 5 */ +#define AWB_CTRL6 0x6E /* AWB Control 6 */ +#define AWB_CTRL7 0x6F /* AWB Control 7 */ +#define AWB_CTRL8 0x70 /* AWB Control 8 */ +#define AWB_CTRL9 0x71 /* AWB Control 9 */ +#define AWB_CTRL10 0x72 /* AWB Control 10 */ +#define AWB_CTRL11 0x73 /* AWB Control 11 */ +#define AWB_CTRL12 0x74 /* AWB Control 12 */ +#define AWB_CTRL13 0x75 /* AWB Control 13 */ +#define AWB_CTRL14 0x76 /* AWB Control 14 */ +#define AWB_CTRL15 0x77 /* AWB Control 15 */ +#define AWB_CTRL16 0x78 /* AWB Control 16 */ +#define AWB_CTRL17 0x79 /* AWB Control 17 */ +#define AWB_CTRL18 0x7A /* AWB Control 18 */ +#define AWB_CTRL19 0x7B /* AWB Control 19 */ +#define AWB_CTRL20 0x7C /* AWB Control 20 */ +#define AWB_CTRL21 0x7D /* AWB Control 21 */ +#define GAM1 0x7E /* Gamma Curve 1st Segment Input End Point 0x04 Output Value */ +#define GAM2 0x7F /* Gamma Curve 2nd Segment Input End Point 0x08 Output Value */ +#define GAM3 0x80 /* Gamma Curve 3rd Segment Input End Point 0x10 Output Value */ +#define GAM4 0x81 /* Gamma Curve 4th Segment Input End Point 0x20 Output Value */ +#define GAM5 0x82 /* Gamma Curve 5th Segment Input End Point 0x28 Output Value */ +#define GAM6 0x83 /* Gamma Curve 6th Segment Input End Point 0x30 Output Value */ +#define GAM7 0x84 /* Gamma Curve 7th Segment Input End Point 0x38 Output Value */ +#define GAM8 0x85 /* Gamma Curve 8th Segment Input End Point 0x40 Output Value */ +#define GAM9 0x86 /* Gamma Curve 9th Segment Input End Point 0x48 Output Value */ +#define GAM10 0x87 /* Gamma Curve 10th Segment Input End Point 0x50 Output Value */ +#define GAM11 0x88 /* Gamma Curve 11th Segment Input End Point 0x60 Output Value */ +#define GAM12 0x89 /* Gamma Curve 12th Segment Input End Point 0x70 Output Value */ +#define GAM13 0x8A /* Gamma Curve 13th Segment Input End Point 0x90 Output Value */ +#define GAM14 0x8B /* Gamma Curve 14th Segment Input End Point 0xB0 Output Value */ +#define GAM15 0x8C /* Gamma Curve 15th Segment Input End Point 0xD0 Output Value */ +#define SLOP 0x8D /* Gamma Curve Highest Segment Slope */ +#define DNSTH 0x8E /* De-noise Threshold */ +#define EDGE0 0x8F /* Edge Enhancement Strength Control */ +#define EDGE1 0x90 /* Edge Enhancement Threshold Control */ +#define DNSOFF 0x91 /* Auto De-noise Threshold Control */ +#define EDGE2 0x92 /* Edge Enhancement Strength Upper Limit */ +#define EDGE3 0x93 /* Edge Enhancement Strength Upper Limit */ +#define MTX1 0x94 /* Matrix Coefficient 1 */ +#define MTX2 0x95 /* Matrix Coefficient 2 */ +#define MTX3 0x96 /* Matrix Coefficient 3 */ +#define MTX4 0x97 /* Matrix Coefficient 4 */ +#define MTX5 0x98 /* Matrix Coefficient 5 */ +#define MTX6 0x99 /* Matrix Coefficient 6 */ + +#define MTX_CTRL 0x9A /* Matrix Control */ +#define MTX_CTRL_DBL_EN 0x80 /* Matrix double ON/OFF selection */ + +#define BRIGHTNESS 0x9B /* Brightness Control */ +#define CONTRAST 0x9C /* Contrast Gain */ +#define UVADJ0 0x9E /* Auto UV Adjust Control 0 */ +#define UVADJ1 0x9F /* Auto UV Adjust Control 1 */ +#define SCAL0 0xA0 /* DCW Ratio Control */ +#define SCAL1 0xA1 /* Horizontal Zoom Out Control */ +#define SCAL2 0xA2 /* Vertical Zoom Out Control */ +#define FIFODLYM 0xA3 /* FIFO Manual Mode Delay Control */ +#define FIFODLYA 0xA4 /* FIFO Auto Mode Delay Control */ + +#define SDE 0xA6 /* Special Digital Effect Control */ +#define SDE_NEGATIVE_EN 0x40 /* Negative image enable */ +#define SDE_GRAYSCALE_EN 0x20 /* Gray scale image enable */ +#define SDE_V_FIXED_EN 0x10 /* V fixed value enable */ +#define SDE_U_FIXED_EN 0x08 /* U fixed value enable */ +#define SDE_CONT_BRIGHT_EN 0x04 /* Contrast/Brightness enable */ +#define SDE_SATURATION_EN 0x02 /* Saturation enable */ +#define SDE_HUE_EN 0x01 /* Hue enable */ + +#define USAT 0xA7 /* U Component Saturation Gain */ +#define VSAT 0xA8 /* V Component Saturation Gain */ +#define HUECOS 0xA9 /* Cosine value × 0x80 */ +#define HUESIN 0xAA /* Sine value × 0x80 */ +#define SIGN_BIT 0xAB /* Sign Bit for Hue and Brightness */ + +#define DSPAUTO 0xAC /* DSP Auto Function ON/OFF Control */ +#define DSPAUTO_AWB_EN 0x80 /* AWB auto threshold control */ +#define DSPAUTO_DENOISE_EN 0x40 /* De-noise auto threshold control */ +#define DSPAUTO_EDGE_EN 0x20 /* Sharpness (edge enhancement) auto strength control */ +#define DSPAUTO_UV_EN 0x10 /* UV adjust auto slope control */ +#define DSPAUTO_SCAL0_EN 0x08 /* Auto scaling factor control (register SCAL0 (0xA0)) */ +#define DSPAUTO_SCAL1_EN 0x04 /* Auto scaling factor control (registers SCAL1 (0xA1 and SCAL2 (0xA2))*/ +#define SET_REG(reg, x) (##reg_DEFAULT|x) +#endif //__REG_REGS_H__ diff --git a/lib/libesp32_div/esp32-camera/target/esp32/ll_cam.c b/lib/libesp32_div/esp32-camera/target/esp32/ll_cam.c new file mode 100644 index 000000000..e513205d2 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/target/esp32/ll_cam.c @@ -0,0 +1,522 @@ +// Copyright 2010-2020 Espressif Systems (Shanghai) PTE LTD +// +// 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. + +#include +#include +#include "soc/i2s_struct.h" +#include "esp_idf_version.h" +#if (ESP_IDF_VERSION_MAJOR >= 4) && (ESP_IDF_VERSION_MINOR > 1) +#include "hal/gpio_ll.h" +#else +#include "soc/gpio_periph.h" +#define esp_rom_delay_us ets_delay_us +static inline int gpio_ll_get_level(gpio_dev_t *hw, int gpio_num) +{ + if (gpio_num < 32) { + return (hw->in >> gpio_num) & 0x1; + } else { + return (hw->in1.data >> (gpio_num - 32)) & 0x1; + } +} +#endif +#include "ll_cam.h" +#include "xclk.h" +#include "cam_hal.h" + +static const char *TAG = "esp32 ll_cam"; + +#define I2S_ISR_ENABLE(i) {I2S0.int_clr.i = 1;I2S0.int_ena.i = 1;} +#define I2S_ISR_DISABLE(i) {I2S0.int_ena.i = 0;I2S0.int_clr.i = 1;} + +typedef union { + struct { + uint32_t sample2:8; + uint32_t unused2:8; + uint32_t sample1:8; + uint32_t unused1:8; + }; + uint32_t val; +} dma_elem_t; + +typedef enum { + /* camera sends byte sequence: s1, s2, s3, s4, ... + * fifo receives: 00 s1 00 s2, 00 s2 00 s3, 00 s3 00 s4, ... + */ + SM_0A0B_0B0C = 0, + /* camera sends byte sequence: s1, s2, s3, s4, ... + * fifo receives: 00 s1 00 s2, 00 s3 00 s4, ... + */ + SM_0A0B_0C0D = 1, + /* camera sends byte sequence: s1, s2, s3, s4, ... + * fifo receives: 00 s1 00 00, 00 s2 00 00, 00 s3 00 00, ... + */ + SM_0A00_0B00 = 3, +} i2s_sampling_mode_t; + +typedef size_t (*dma_filter_t)(uint8_t* dst, const uint8_t* src, size_t len); + +static i2s_sampling_mode_t sampling_mode = SM_0A00_0B00; + +static size_t ll_cam_bytes_per_sample(i2s_sampling_mode_t mode) +{ + switch(mode) { + case SM_0A00_0B00: + return 4; + case SM_0A0B_0B0C: + return 4; + case SM_0A0B_0C0D: + return 2; + default: + assert(0 && "invalid sampling mode"); + return 0; + } +} + +static size_t IRAM_ATTR ll_cam_dma_filter_jpeg(uint8_t* dst, const uint8_t* src, size_t len) +{ + const dma_elem_t* dma_el = (const dma_elem_t*)src; + size_t elements = len / sizeof(dma_elem_t); + size_t end = elements / 4; + // manually unrolling 4 iterations of the loop here + for (size_t i = 0; i < end; ++i) { + dst[0] = dma_el[0].sample1; + dst[1] = dma_el[1].sample1; + dst[2] = dma_el[2].sample1; + dst[3] = dma_el[3].sample1; + dma_el += 4; + dst += 4; + } + return elements; +} + +static size_t IRAM_ATTR ll_cam_dma_filter_grayscale(uint8_t* dst, const uint8_t* src, size_t len) +{ + const dma_elem_t* dma_el = (const dma_elem_t*)src; + size_t elements = len / sizeof(dma_elem_t); + size_t end = elements / 4; + for (size_t i = 0; i < end; ++i) { + // manually unrolling 4 iterations of the loop here + dst[0] = dma_el[0].sample1; + dst[1] = dma_el[1].sample1; + dst[2] = dma_el[2].sample1; + dst[3] = dma_el[3].sample1; + dma_el += 4; + dst += 4; + } + return elements; +} + +static size_t IRAM_ATTR ll_cam_dma_filter_grayscale_highspeed(uint8_t* dst, const uint8_t* src, size_t len) +{ + const dma_elem_t* dma_el = (const dma_elem_t*)src; + size_t elements = len / sizeof(dma_elem_t); + size_t end = elements / 8; + for (size_t i = 0; i < end; ++i) { + // manually unrolling 4 iterations of the loop here + dst[0] = dma_el[0].sample1; + dst[1] = dma_el[2].sample1; + dst[2] = dma_el[4].sample1; + dst[3] = dma_el[6].sample1; + dma_el += 8; + dst += 4; + } + // the final sample of a line in SM_0A0B_0B0C sampling mode needs special handling + if ((elements & 0x7) != 0) { + dst[0] = dma_el[0].sample1; + dst[1] = dma_el[2].sample1; + elements += 1; + } + return elements / 2; +} + +static size_t IRAM_ATTR ll_cam_dma_filter_yuyv(uint8_t* dst, const uint8_t* src, size_t len) +{ + const dma_elem_t* dma_el = (const dma_elem_t*)src; + size_t elements = len / sizeof(dma_elem_t); + size_t end = elements / 4; + for (size_t i = 0; i < end; ++i) { + dst[0] = dma_el[0].sample1;//y0 + dst[1] = dma_el[0].sample2;//u + dst[2] = dma_el[1].sample1;//y1 + dst[3] = dma_el[1].sample2;//v + + dst[4] = dma_el[2].sample1;//y0 + dst[5] = dma_el[2].sample2;//u + dst[6] = dma_el[3].sample1;//y1 + dst[7] = dma_el[3].sample2;//v + dma_el += 4; + dst += 8; + } + return elements * 2; +} + +static size_t IRAM_ATTR ll_cam_dma_filter_yuyv_highspeed(uint8_t* dst, const uint8_t* src, size_t len) +{ + const dma_elem_t* dma_el = (const dma_elem_t*)src; + size_t elements = len / sizeof(dma_elem_t); + size_t end = elements / 8; + for (size_t i = 0; i < end; ++i) { + dst[0] = dma_el[0].sample1;//y0 + dst[1] = dma_el[1].sample1;//u + dst[2] = dma_el[2].sample1;//y1 + dst[3] = dma_el[3].sample1;//v + + dst[4] = dma_el[4].sample1;//y0 + dst[5] = dma_el[5].sample1;//u + dst[6] = dma_el[6].sample1;//y1 + dst[7] = dma_el[7].sample1;//v + dma_el += 8; + dst += 8; + } + if ((elements & 0x7) != 0) { + dst[0] = dma_el[0].sample1;//y0 + dst[1] = dma_el[1].sample1;//u + dst[2] = dma_el[2].sample1;//y1 + dst[3] = dma_el[2].sample2;//v + elements += 4; + } + return elements; +} + +static void IRAM_ATTR ll_cam_vsync_isr(void *arg) +{ + //DBG_PIN_SET(1); + cam_obj_t *cam = (cam_obj_t *)arg; + BaseType_t HPTaskAwoken = pdFALSE; + // filter + ets_delay_us(1); + if (gpio_ll_get_level(&GPIO, cam->vsync_pin) == !cam->vsync_invert) { + ll_cam_send_event(cam, CAM_VSYNC_EVENT, &HPTaskAwoken); + if (HPTaskAwoken == pdTRUE) { + portYIELD_FROM_ISR(); + } + } + //DBG_PIN_SET(0); +} + +static void IRAM_ATTR ll_cam_dma_isr(void *arg) +{ + //DBG_PIN_SET(1); + cam_obj_t *cam = (cam_obj_t *)arg; + BaseType_t HPTaskAwoken = pdFALSE; + + typeof(I2S0.int_st) status = I2S0.int_st; + if (status.val == 0) { + return; + } + + I2S0.int_clr.val = status.val; + + if (status.in_suc_eof) { + ll_cam_send_event(cam, CAM_IN_SUC_EOF_EVENT, &HPTaskAwoken); + } + if (HPTaskAwoken == pdTRUE) { + portYIELD_FROM_ISR(); + } + //DBG_PIN_SET(0); +} + +bool ll_cam_stop(cam_obj_t *cam) +{ + I2S0.conf.rx_start = 0; + I2S_ISR_DISABLE(in_suc_eof); + I2S0.in_link.stop = 1; + return true; +} + +esp_err_t ll_cam_deinit(cam_obj_t *cam) +{ + gpio_isr_handler_remove(cam->vsync_pin); + + if (cam->cam_intr_handle) { + esp_intr_free(cam->cam_intr_handle); + cam->cam_intr_handle = NULL; + } + + return ESP_OK; +} + +bool ll_cam_start(cam_obj_t *cam, int frame_pos) +{ + I2S0.conf.rx_start = 0; + + I2S_ISR_ENABLE(in_suc_eof); + + I2S0.conf.rx_reset = 1; + I2S0.conf.rx_reset = 0; + I2S0.conf.rx_fifo_reset = 1; + I2S0.conf.rx_fifo_reset = 0; + I2S0.lc_conf.in_rst = 1; + I2S0.lc_conf.in_rst = 0; + I2S0.lc_conf.ahbm_fifo_rst = 1; + I2S0.lc_conf.ahbm_fifo_rst = 0; + I2S0.lc_conf.ahbm_rst = 1; + I2S0.lc_conf.ahbm_rst = 0; + + I2S0.rx_eof_num = cam->dma_half_buffer_size / sizeof(dma_elem_t); + I2S0.in_link.addr = ((uint32_t)&cam->dma[0]) & 0xfffff; + + I2S0.in_link.start = 1; + I2S0.conf.rx_start = 1; + return true; +} + +esp_err_t ll_cam_config(cam_obj_t *cam, const camera_config_t *config) +{ + // Enable and configure I2S peripheral + periph_module_enable(PERIPH_I2S0_MODULE); + + I2S0.conf.rx_reset = 1; + I2S0.conf.rx_reset = 0; + I2S0.conf.rx_fifo_reset = 1; + I2S0.conf.rx_fifo_reset = 0; + I2S0.lc_conf.in_rst = 1; + I2S0.lc_conf.in_rst = 0; + I2S0.lc_conf.ahbm_fifo_rst = 1; + I2S0.lc_conf.ahbm_fifo_rst = 0; + I2S0.lc_conf.ahbm_rst = 1; + I2S0.lc_conf.ahbm_rst = 0; + + I2S0.conf.rx_slave_mod = 1; + I2S0.conf.rx_right_first = 0; + I2S0.conf.rx_msb_right = 0; + I2S0.conf.rx_msb_shift = 0; + I2S0.conf.rx_mono = 0; + I2S0.conf.rx_short_sync = 0; + + I2S0.conf2.lcd_en = 1; + I2S0.conf2.camera_en = 1; + + // Configure clock divider + I2S0.clkm_conf.clkm_div_a = 0; + I2S0.clkm_conf.clkm_div_b = 0; + I2S0.clkm_conf.clkm_div_num = 2; + + I2S0.fifo_conf.dscr_en = 1; + I2S0.fifo_conf.rx_fifo_mod = sampling_mode; + I2S0.fifo_conf.rx_fifo_mod_force_en = 1; + + I2S0.conf_chan.rx_chan_mod = 1; + I2S0.sample_rate_conf.rx_bits_mod = 0; + I2S0.timing.val = 0; + I2S0.timing.rx_dsync_sw = 1; + + return ESP_OK; +} + +void ll_cam_vsync_intr_enable(cam_obj_t *cam, bool en) +{ + if (en) { + gpio_intr_enable(cam->vsync_pin); + } else { + gpio_intr_disable(cam->vsync_pin); + } +} + +esp_err_t ll_cam_set_pin(cam_obj_t *cam, const camera_config_t *config) +{ + gpio_config_t io_conf = {0}; + io_conf.intr_type = cam->vsync_invert ? GPIO_PIN_INTR_NEGEDGE : GPIO_PIN_INTR_POSEDGE; + io_conf.pin_bit_mask = 1ULL << config->pin_vsync; + io_conf.mode = GPIO_MODE_INPUT; + io_conf.pull_up_en = 1; + io_conf.pull_down_en = 0; + gpio_config(&io_conf); + gpio_install_isr_service(ESP_INTR_FLAG_LOWMED | ESP_INTR_FLAG_IRAM); + gpio_isr_handler_add(config->pin_vsync, ll_cam_vsync_isr, cam); + gpio_intr_disable(config->pin_vsync); + + PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[config->pin_pclk], PIN_FUNC_GPIO); + gpio_set_direction(config->pin_pclk, GPIO_MODE_INPUT); + gpio_set_pull_mode(config->pin_pclk, GPIO_FLOATING); + gpio_matrix_in(config->pin_pclk, I2S0I_WS_IN_IDX, false); + + PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[config->pin_vsync], PIN_FUNC_GPIO); + gpio_set_direction(config->pin_vsync, GPIO_MODE_INPUT); + gpio_set_pull_mode(config->pin_vsync, GPIO_FLOATING); + gpio_matrix_in(config->pin_vsync, I2S0I_V_SYNC_IDX, false); + + PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[config->pin_href], PIN_FUNC_GPIO); + gpio_set_direction(config->pin_href, GPIO_MODE_INPUT); + gpio_set_pull_mode(config->pin_href, GPIO_FLOATING); + gpio_matrix_in(config->pin_href, I2S0I_H_SYNC_IDX, false); + + int data_pins[8] = { + config->pin_d0, config->pin_d1, config->pin_d2, config->pin_d3, config->pin_d4, config->pin_d5, config->pin_d6, config->pin_d7, + }; + for (int i = 0; i < 8; i++) { + PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[data_pins[i]], PIN_FUNC_GPIO); + gpio_set_direction(data_pins[i], GPIO_MODE_INPUT); + gpio_set_pull_mode(data_pins[i], GPIO_FLOATING); + gpio_matrix_in(data_pins[i], I2S0I_DATA_IN0_IDX + i, false); + } + + gpio_matrix_in(0x38, I2S0I_H_ENABLE_IDX, false); + return ESP_OK; +} + +esp_err_t ll_cam_init_isr(cam_obj_t *cam) +{ + return esp_intr_alloc(ETS_I2S0_INTR_SOURCE, ESP_INTR_FLAG_LOWMED | ESP_INTR_FLAG_IRAM, ll_cam_dma_isr, cam, &cam->cam_intr_handle); +} + +void ll_cam_do_vsync(cam_obj_t *cam) +{ +} + +uint8_t ll_cam_get_dma_align(cam_obj_t *cam) +{ + return 0; +} + +static bool ll_cam_calc_rgb_dma(cam_obj_t *cam){ + size_t dma_half_buffer_max = CONFIG_CAMERA_DMA_BUFFER_SIZE_MAX / 2 / cam->dma_bytes_per_item; + size_t dma_buffer_max = 2 * dma_half_buffer_max; + size_t node_max = LCD_CAM_DMA_NODE_BUFFER_MAX_SIZE / cam->dma_bytes_per_item; + + size_t line_width = cam->width * cam->in_bytes_per_pixel; + size_t image_size = cam->height * line_width; + if (image_size > (4 * 1024 * 1024) || (line_width > dma_half_buffer_max)) { + ESP_LOGE(TAG, "Resolution too high"); + return 0; + } + + size_t node_size = node_max; + size_t nodes_per_line = 1; + size_t lines_per_node = 1; + size_t lines_per_half_buffer = 1; + size_t dma_half_buffer_min = node_max; + size_t dma_half_buffer = dma_half_buffer_max; + size_t dma_buffer_size = dma_buffer_max; + + // Calculate DMA Node Size so that it's divisable by or divisor of the line width + if(line_width >= node_max){ + // One or more nodes will be requied for one line + for(size_t i = node_max; i > 0; i=i-1){ + if ((line_width % i) == 0) { + node_size = i; + nodes_per_line = line_width / node_size; + break; + } + } + } else { + // One or more lines can fit into one node + for(size_t i = node_max; i > 0; i=i-1){ + if ((i % line_width) == 0) { + node_size = i; + lines_per_node = node_size / line_width; + while((cam->height % lines_per_node) != 0){ + lines_per_node = lines_per_node - 1; + node_size = lines_per_node * line_width; + } + break; + } + } + } + // Calculate minimum EOF size = max(mode_size, line_size) + dma_half_buffer_min = node_size * nodes_per_line; + // Calculate max EOF size divisable by node size + dma_half_buffer = (dma_half_buffer_max / dma_half_buffer_min) * dma_half_buffer_min; + // Adjust EOF size so that height will be divisable by the number of lines in each EOF + lines_per_half_buffer = dma_half_buffer / line_width; + while((cam->height % lines_per_half_buffer) != 0){ + dma_half_buffer = dma_half_buffer - dma_half_buffer_min; + lines_per_half_buffer = dma_half_buffer / line_width; + } + // Calculate DMA size + dma_buffer_size =(dma_buffer_max / dma_half_buffer) * dma_half_buffer; + + ESP_LOGI(TAG, "node_size: %4u, nodes_per_line: %u, lines_per_node: %u, dma_half_buffer_min: %5u, dma_half_buffer: %5u, lines_per_half_buffer: %2u, dma_buffer_size: %5u, image_size: %u", + node_size * cam->dma_bytes_per_item, nodes_per_line, lines_per_node, dma_half_buffer_min * cam->dma_bytes_per_item, dma_half_buffer * cam->dma_bytes_per_item, lines_per_half_buffer, dma_buffer_size * cam->dma_bytes_per_item, image_size); + + cam->dma_buffer_size = dma_buffer_size * cam->dma_bytes_per_item; + cam->dma_half_buffer_size = dma_half_buffer * cam->dma_bytes_per_item; + cam->dma_node_buffer_size = node_size * cam->dma_bytes_per_item; + cam->dma_half_buffer_cnt = cam->dma_buffer_size / cam->dma_half_buffer_size; + return 1; +} + +bool ll_cam_dma_sizes(cam_obj_t *cam) +{ + cam->dma_bytes_per_item = ll_cam_bytes_per_sample(sampling_mode); + if (cam->jpeg_mode) { + cam->dma_half_buffer_cnt = 8; + cam->dma_node_buffer_size = 2048; + cam->dma_half_buffer_size = cam->dma_node_buffer_size * 2; + cam->dma_buffer_size = cam->dma_half_buffer_cnt * cam->dma_half_buffer_size; + } else { + return ll_cam_calc_rgb_dma(cam); + } + return 1; +} + +static dma_filter_t dma_filter = ll_cam_dma_filter_jpeg; + +size_t IRAM_ATTR ll_cam_memcpy(cam_obj_t *cam, uint8_t *out, const uint8_t *in, size_t len) +{ + //DBG_PIN_SET(1); + size_t r = dma_filter(out, in, len); + //DBG_PIN_SET(0); + return r; +} + +esp_err_t ll_cam_set_sample_mode(cam_obj_t *cam, pixformat_t pix_format, uint32_t xclk_freq_hz, uint16_t sensor_pid) +{ + if (pix_format == PIXFORMAT_GRAYSCALE) { + if (sensor_pid == OV3660_PID || sensor_pid == OV5640_PID || sensor_pid == NT99141_PID) { + if (xclk_freq_hz > 10000000) { + sampling_mode = SM_0A00_0B00; + dma_filter = ll_cam_dma_filter_yuyv_highspeed; + } else { + sampling_mode = SM_0A0B_0C0D; + dma_filter = ll_cam_dma_filter_yuyv; + } + cam->in_bytes_per_pixel = 1; // camera sends Y8 + } else { + if (xclk_freq_hz > 10000000 && sensor_pid != OV7725_PID) { + sampling_mode = SM_0A00_0B00; + dma_filter = ll_cam_dma_filter_grayscale_highspeed; + } else { + sampling_mode = SM_0A0B_0C0D; + dma_filter = ll_cam_dma_filter_grayscale; + } + cam->in_bytes_per_pixel = 2; // camera sends YU/YV + } + cam->fb_bytes_per_pixel = 1; // frame buffer stores Y8 + } else if (pix_format == PIXFORMAT_YUV422 || pix_format == PIXFORMAT_RGB565) { + if (xclk_freq_hz > 10000000 && sensor_pid != OV7725_PID) { + if (sensor_pid == OV7670_PID) { + sampling_mode = SM_0A0B_0B0C; + } else { + sampling_mode = SM_0A00_0B00; + } + dma_filter = ll_cam_dma_filter_yuyv_highspeed; + } else { + sampling_mode = SM_0A0B_0C0D; + dma_filter = ll_cam_dma_filter_yuyv; + } + cam->in_bytes_per_pixel = 2; // camera sends YU/YV + cam->fb_bytes_per_pixel = 2; // frame buffer stores YU/YV/RGB565 + } else if (pix_format == PIXFORMAT_JPEG) { + cam->in_bytes_per_pixel = 1; + cam->fb_bytes_per_pixel = 1; + dma_filter = ll_cam_dma_filter_jpeg; + sampling_mode = SM_0A00_0B00; + } else { + ESP_LOGE(TAG, "Requested format is not supported"); + return ESP_ERR_NOT_SUPPORTED; + } + I2S0.fifo_conf.rx_fifo_mod = sampling_mode; + return ESP_OK; +} diff --git a/lib/libesp32_div/esp32-camera/target/esp32s2/ll_cam.c b/lib/libesp32_div/esp32-camera/target/esp32s2/ll_cam.c new file mode 100644 index 000000000..d3cb5353b --- /dev/null +++ b/lib/libesp32_div/esp32-camera/target/esp32s2/ll_cam.c @@ -0,0 +1,402 @@ +// Copyright 2010-2020 Espressif Systems (Shanghai) PTE LTD +// +// 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. + +#include +#include +#include "soc/system_reg.h" +#include "soc/i2s_struct.h" +#include "hal/gpio_ll.h" +#include "ll_cam.h" +#include "xclk.h" +#include "cam_hal.h" + +static const char *TAG = "s2 ll_cam"; + +#define I2S_ISR_ENABLE(i) {I2S0.int_clr.i = 1;I2S0.int_ena.i = 1;} +#define I2S_ISR_DISABLE(i) {I2S0.int_ena.i = 0;I2S0.int_clr.i = 1;} + +static void IRAM_ATTR ll_cam_vsync_isr(void *arg) +{ + //DBG_PIN_SET(1); + cam_obj_t *cam = (cam_obj_t *)arg; + BaseType_t HPTaskAwoken = pdFALSE; + // filter + ets_delay_us(1); + if (gpio_ll_get_level(&GPIO, cam->vsync_pin) == !cam->vsync_invert) { + ll_cam_send_event(cam, CAM_VSYNC_EVENT, &HPTaskAwoken); + } + + if (HPTaskAwoken == pdTRUE) { + portYIELD_FROM_ISR(); + } + //DBG_PIN_SET(0); +} + +static void IRAM_ATTR ll_cam_dma_isr(void *arg) +{ + cam_obj_t *cam = (cam_obj_t *)arg; + BaseType_t HPTaskAwoken = pdFALSE; + + typeof(I2S0.int_st) status = I2S0.int_st; + if (status.val == 0) { + return; + } + + I2S0.int_clr.val = status.val; + + if (status.in_suc_eof) { + ll_cam_send_event(cam, CAM_IN_SUC_EOF_EVENT, &HPTaskAwoken); + } + + if (HPTaskAwoken == pdTRUE) { + portYIELD_FROM_ISR(); + } +} + +bool ll_cam_stop(cam_obj_t *cam) +{ + I2S0.conf.rx_start = 0; + + if (cam->jpeg_mode || !cam->psram_mode) { + I2S_ISR_DISABLE(in_suc_eof); + } + + I2S0.in_link.stop = 1; + return true; +} + +esp_err_t ll_cam_deinit(cam_obj_t *cam) +{ + gpio_isr_handler_remove(cam->vsync_pin); + + if (cam->cam_intr_handle) { + esp_intr_free(cam->cam_intr_handle); + cam->cam_intr_handle = NULL; + } + + return ESP_OK; +} + +bool ll_cam_start(cam_obj_t *cam, int frame_pos) +{ + I2S0.conf.rx_start = 0; + + if (cam->jpeg_mode || !cam->psram_mode) { + I2S_ISR_ENABLE(in_suc_eof); + } + + I2S0.conf.rx_reset = 1; + I2S0.conf.rx_reset = 0; + I2S0.conf.rx_fifo_reset = 1; + I2S0.conf.rx_fifo_reset = 0; + I2S0.lc_conf.in_rst = 1; + I2S0.lc_conf.in_rst = 0; + I2S0.lc_conf.ahbm_fifo_rst = 1; + I2S0.lc_conf.ahbm_fifo_rst = 0; + I2S0.lc_conf.ahbm_rst = 1; + I2S0.lc_conf.ahbm_rst = 0; + + I2S0.rx_eof_num = cam->dma_half_buffer_size; // Ping pong operation + if (!cam->psram_mode) { + I2S0.in_link.addr = ((uint32_t)&cam->dma[0]) & 0xfffff; + } else { + I2S0.in_link.addr = ((uint32_t)&cam->frames[frame_pos].dma[0]) & 0xfffff; + } + + I2S0.in_link.start = 1; + I2S0.conf.rx_start = 1; + return true; +} + +esp_err_t ll_cam_config(cam_obj_t *cam, const camera_config_t *config) +{ + esp_err_t err = camera_enable_out_clock(config); + if(err != ESP_OK) { + return err; + } + periph_module_enable(PERIPH_I2S0_MODULE); + // Configure the clock + I2S0.clkm_conf.clkm_div_num = 2; // 160MHz / 2 = 80MHz + I2S0.clkm_conf.clkm_div_b = 0; + I2S0.clkm_conf.clkm_div_a = 0; + I2S0.clkm_conf.clk_sel = 2; + I2S0.clkm_conf.clk_en = 1; + + + I2S0.conf.val = 0; + I2S0.fifo_conf.val = 0; + I2S0.fifo_conf.dscr_en = 1; + + I2S0.lc_conf.ahbm_fifo_rst = 1; + I2S0.lc_conf.ahbm_fifo_rst = 0; + I2S0.lc_conf.ahbm_rst = 1; + I2S0.lc_conf.ahbm_rst = 0; + I2S0.lc_conf.check_owner = 0; + //I2S0.lc_conf.indscr_burst_en = 1; + //I2S0.lc_conf.ext_mem_bk_size = 0; // DMA access external memory block size. 0: 16 bytes, 1: 32 bytes, 2:64 bytes, 3:reserved + + I2S0.timing.val = 0; + + I2S0.int_ena.val = 0; + I2S0.int_clr.val = ~0; + + I2S0.conf2.lcd_en = 1; + I2S0.conf2.camera_en = 1; + + // Configuration data format + I2S0.conf.rx_slave_mod = 1; + I2S0.conf.rx_right_first = 0; + I2S0.conf.rx_msb_right = cam->swap_data; + I2S0.conf.rx_short_sync = 0; + I2S0.conf.rx_mono = 0; + I2S0.conf.rx_msb_shift = 0; + I2S0.conf.rx_dma_equal = 1; + + // Configure sampling rate + I2S0.sample_rate_conf.rx_bck_div_num = 1; + I2S0.sample_rate_conf.rx_bits_mod = 8; + + I2S0.conf1.rx_pcm_bypass = 1; + + I2S0.conf2.i_v_sync_filter_en = 1; + I2S0.conf2.i_v_sync_filter_thres = 4; + I2S0.conf2.cam_sync_fifo_reset = 1; + I2S0.conf2.cam_sync_fifo_reset = 0; + + I2S0.conf_chan.rx_chan_mod = 1; + + I2S0.fifo_conf.rx_fifo_mod_force_en = 1; + I2S0.fifo_conf.rx_data_num = 32; + I2S0.fifo_conf.rx_fifo_mod = 2; + + I2S0.lc_conf.in_rst = 1; + I2S0.lc_conf.in_rst = 0; + + I2S0.conf.rx_start = 1; + + return ESP_OK; +} + +void ll_cam_vsync_intr_enable(cam_obj_t *cam, bool en) +{ + if (en) { + gpio_intr_enable(cam->vsync_pin); + } else { + gpio_intr_disable(cam->vsync_pin); + } +} + +esp_err_t ll_cam_set_pin(cam_obj_t *cam, const camera_config_t *config) +{ + gpio_config_t io_conf = {0}; + io_conf.intr_type = cam->vsync_invert ? GPIO_PIN_INTR_NEGEDGE : GPIO_PIN_INTR_POSEDGE; + io_conf.pin_bit_mask = 1ULL << config->pin_vsync; + io_conf.mode = GPIO_MODE_INPUT; + io_conf.pull_up_en = 1; + io_conf.pull_down_en = 0; + gpio_config(&io_conf); + gpio_install_isr_service(ESP_INTR_FLAG_LOWMED | ESP_INTR_FLAG_IRAM); + gpio_isr_handler_add(config->pin_vsync, ll_cam_vsync_isr, cam); + gpio_intr_disable(config->pin_vsync); + + PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[config->pin_pclk], PIN_FUNC_GPIO); + gpio_set_direction(config->pin_pclk, GPIO_MODE_INPUT); + gpio_set_pull_mode(config->pin_pclk, GPIO_FLOATING); + gpio_matrix_in(config->pin_pclk, I2S0I_WS_IN_IDX, false); + + PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[config->pin_vsync], PIN_FUNC_GPIO); + gpio_set_direction(config->pin_vsync, GPIO_MODE_INPUT); + gpio_set_pull_mode(config->pin_vsync, GPIO_FLOATING); + gpio_matrix_in(config->pin_vsync, I2S0I_V_SYNC_IDX, cam->vsync_invert); + + PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[config->pin_href], PIN_FUNC_GPIO); + gpio_set_direction(config->pin_href, GPIO_MODE_INPUT); + gpio_set_pull_mode(config->pin_href, GPIO_FLOATING); + gpio_matrix_in(config->pin_href, I2S0I_H_SYNC_IDX, false); + + int data_pins[8] = { + config->pin_d0, config->pin_d1, config->pin_d2, config->pin_d3, config->pin_d4, config->pin_d5, config->pin_d6, config->pin_d7, + }; + for (int i = 0; i < 8; i++) { + PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[data_pins[i]], PIN_FUNC_GPIO); + gpio_set_direction(data_pins[i], GPIO_MODE_INPUT); + gpio_set_pull_mode(data_pins[i], GPIO_FLOATING); + // High bit alignment, IN16 is always the highest bit + // fifo accesses data by bit, when rx_bits_mod is 8, the data needs to be aligned by 8 bits + gpio_matrix_in(data_pins[i], I2S0I_DATA_IN0_IDX + 8 + i, false); + } + + gpio_matrix_in(0x38, I2S0I_H_ENABLE_IDX, false); + + return ESP_OK; +} + +esp_err_t ll_cam_init_isr(cam_obj_t *cam) +{ + return esp_intr_alloc(ETS_I2S0_INTR_SOURCE, ESP_INTR_FLAG_LOWMED | ESP_INTR_FLAG_IRAM, ll_cam_dma_isr, cam, &cam->cam_intr_handle); +} + +void ll_cam_do_vsync(cam_obj_t *cam) +{ + ll_cam_vsync_intr_enable(cam, false); + gpio_matrix_in(cam->vsync_pin, I2S0I_V_SYNC_IDX, !cam->vsync_invert); + ets_delay_us(10); + gpio_matrix_in(cam->vsync_pin, I2S0I_V_SYNC_IDX, cam->vsync_invert); + ll_cam_vsync_intr_enable(cam, true); +} + +uint8_t ll_cam_get_dma_align(cam_obj_t *cam) +{ + return 64;//16 << I2S0.lc_conf.ext_mem_bk_size; +} + +static bool ll_cam_calc_rgb_dma(cam_obj_t *cam){ + size_t node_max = LCD_CAM_DMA_NODE_BUFFER_MAX_SIZE / cam->dma_bytes_per_item; + size_t line_width = cam->width * cam->in_bytes_per_pixel; + size_t node_size = node_max; + size_t nodes_per_line = 1; + size_t lines_per_node = 1; + + // Calculate DMA Node Size so that it's divisable by or divisor of the line width + if(line_width >= node_max){ + // One or more nodes will be requied for one line + for(size_t i = node_max; i > 0; i=i-1){ + if ((line_width % i) == 0) { + node_size = i; + nodes_per_line = line_width / node_size; + break; + } + } + } else { + // One or more lines can fit into one node + for(size_t i = node_max; i > 0; i=i-1){ + if ((i % line_width) == 0) { + node_size = i; + lines_per_node = node_size / line_width; + while((cam->height % lines_per_node) != 0){ + lines_per_node = lines_per_node - 1; + node_size = lines_per_node * line_width; + } + break; + } + } + } + + ESP_LOGI(TAG, "node_size: %4u, nodes_per_line: %u, lines_per_node: %u", + node_size * cam->dma_bytes_per_item, nodes_per_line, lines_per_node); + + cam->dma_node_buffer_size = node_size * cam->dma_bytes_per_item; + + if (cam->psram_mode) { + cam->dma_buffer_size = cam->recv_size * cam->dma_bytes_per_item; + cam->dma_half_buffer_cnt = 2; + cam->dma_half_buffer_size = cam->dma_buffer_size / cam->dma_half_buffer_cnt; + } else { + size_t dma_half_buffer_max = CONFIG_CAMERA_DMA_BUFFER_SIZE_MAX / 2 / cam->dma_bytes_per_item; + if (line_width > dma_half_buffer_max) { + ESP_LOGE(TAG, "Resolution too high"); + return 0; + } + + // Calculate minimum EOF size = max(mode_size, line_size) + size_t dma_half_buffer_min = node_size * nodes_per_line; + + // Calculate max EOF size divisable by node size + size_t dma_half_buffer = (dma_half_buffer_max / dma_half_buffer_min) * dma_half_buffer_min; + + // Adjust EOF size so that height will be divisable by the number of lines in each EOF + size_t lines_per_half_buffer = dma_half_buffer / line_width; + while((cam->height % lines_per_half_buffer) != 0){ + dma_half_buffer = dma_half_buffer - dma_half_buffer_min; + lines_per_half_buffer = dma_half_buffer / line_width; + } + + // Calculate DMA size + size_t dma_buffer_max = 2 * dma_half_buffer_max; + size_t dma_buffer_size = dma_buffer_max; + dma_buffer_size =(dma_buffer_max / dma_half_buffer) * dma_half_buffer; + + ESP_LOGI(TAG, "dma_half_buffer_min: %5u, dma_half_buffer: %5u, lines_per_half_buffer: %2u, dma_buffer_size: %5u", + dma_half_buffer_min * cam->dma_bytes_per_item, dma_half_buffer * cam->dma_bytes_per_item, lines_per_half_buffer, dma_buffer_size * cam->dma_bytes_per_item); + + cam->dma_buffer_size = dma_buffer_size * cam->dma_bytes_per_item; + cam->dma_half_buffer_size = dma_half_buffer * cam->dma_bytes_per_item; + cam->dma_half_buffer_cnt = cam->dma_buffer_size / cam->dma_half_buffer_size; + } + return 1; +} + +bool ll_cam_dma_sizes(cam_obj_t *cam) +{ + cam->dma_bytes_per_item = 1; + if (cam->jpeg_mode) { + if (cam->psram_mode) { + cam->dma_buffer_size = cam->recv_size; + cam->dma_half_buffer_size = 1024; + cam->dma_half_buffer_cnt = cam->dma_buffer_size / cam->dma_half_buffer_size; + cam->dma_node_buffer_size = cam->dma_half_buffer_size; + } else { + cam->dma_half_buffer_cnt = 16; + cam->dma_buffer_size = cam->dma_half_buffer_cnt * 1024; + cam->dma_half_buffer_size = cam->dma_buffer_size / cam->dma_half_buffer_cnt; + cam->dma_node_buffer_size = cam->dma_half_buffer_size; + } + } else { + return ll_cam_calc_rgb_dma(cam); + } + return 1; +} + +size_t IRAM_ATTR ll_cam_memcpy(cam_obj_t *cam, uint8_t *out, const uint8_t *in, size_t len) +{ + // YUV to Grayscale + if (cam->in_bytes_per_pixel == 2 && cam->fb_bytes_per_pixel == 1) { + size_t end = len / 8; + for (size_t i = 0; i < end; ++i) { + out[0] = in[0]; + out[1] = in[2]; + out[2] = in[4]; + out[3] = in[6]; + out += 4; + in += 8; + } + return len / 2; + } + + // just memcpy + memcpy(out, in, len); + return len; +} + +esp_err_t ll_cam_set_sample_mode(cam_obj_t *cam, pixformat_t pix_format, uint32_t xclk_freq_hz, uint16_t sensor_pid) +{ + if (pix_format == PIXFORMAT_GRAYSCALE) { + if (sensor_pid == OV3660_PID || sensor_pid == OV5640_PID || sensor_pid == NT99141_PID) { + cam->in_bytes_per_pixel = 1; // camera sends Y8 + } else { + cam->in_bytes_per_pixel = 2; // camera sends YU/YV + } + cam->fb_bytes_per_pixel = 1; // frame buffer stores Y8 + } else if (pix_format == PIXFORMAT_YUV422 || pix_format == PIXFORMAT_RGB565) { + cam->in_bytes_per_pixel = 2; // camera sends YU/YV + cam->fb_bytes_per_pixel = 2; // frame buffer stores YU/YV/RGB565 + } else if (pix_format == PIXFORMAT_JPEG) { + cam->in_bytes_per_pixel = 1; + cam->fb_bytes_per_pixel = 1; + } else { + ESP_LOGE(TAG, "Requested format is not supported"); + return ESP_ERR_NOT_SUPPORTED; + } + return ESP_OK; +} diff --git a/lib/libesp32_div/esp32-camera/target/esp32s2/private_include/tjpgd.h b/lib/libesp32_div/esp32-camera/target/esp32s2/private_include/tjpgd.h new file mode 100644 index 000000000..31fbc97cc --- /dev/null +++ b/lib/libesp32_div/esp32-camera/target/esp32s2/private_include/tjpgd.h @@ -0,0 +1,99 @@ +/*----------------------------------------------------------------------------/ +/ TJpgDec - Tiny JPEG Decompressor include file (C)ChaN, 2012 +/----------------------------------------------------------------------------*/ +#ifndef _TJPGDEC +#define _TJPGDEC +/*---------------------------------------------------------------------------*/ +/* System Configurations */ + +#define JD_SZBUF 512 /* Size of stream input buffer */ +#define JD_FORMAT 0 /* Output pixel format 0:RGB888 (3 BYTE/pix), 1:RGB565 (1 WORD/pix) */ +#define JD_USE_SCALE 1 /* Use descaling feature for output */ +#define JD_TBLCLIP 1 /* Use table for saturation (might be a bit faster but increases 1K bytes of code size) */ + +/*---------------------------------------------------------------------------*/ + +#ifdef __cplusplus +extern "C" { +#endif + +/* These types must be 16-bit, 32-bit or larger integer */ +typedef int INT; +typedef unsigned int UINT; + +/* These types must be 8-bit integer */ +typedef char CHAR; +typedef unsigned char UCHAR; +typedef unsigned char BYTE; + +/* These types must be 16-bit integer */ +typedef short SHORT; +typedef unsigned short USHORT; +typedef unsigned short WORD; +typedef unsigned short WCHAR; + +/* These types must be 32-bit integer */ +typedef long LONG; +typedef unsigned long ULONG; +typedef unsigned long DWORD; + + +/* Error code */ +typedef enum { + JDR_OK = 0, /* 0: Succeeded */ + JDR_INTR, /* 1: Interrupted by output function */ + JDR_INP, /* 2: Device error or wrong termination of input stream */ + JDR_MEM1, /* 3: Insufficient memory pool for the image */ + JDR_MEM2, /* 4: Insufficient stream input buffer */ + JDR_PAR, /* 5: Parameter error */ + JDR_FMT1, /* 6: Data format error (may be damaged data) */ + JDR_FMT2, /* 7: Right format but not supported */ + JDR_FMT3 /* 8: Not supported JPEG standard */ +} JRESULT; + + + +/* Rectangular structure */ +typedef struct { + WORD left, right, top, bottom; +} JRECT; + + + +/* Decompressor object structure */ +typedef struct JDEC JDEC; +struct JDEC { + UINT dctr; /* Number of bytes available in the input buffer */ + BYTE* dptr; /* Current data read ptr */ + BYTE* inbuf; /* Bit stream input buffer */ + BYTE dmsk; /* Current bit in the current read byte */ + BYTE scale; /* Output scaling ratio */ + BYTE msx, msy; /* MCU size in unit of block (width, height) */ + BYTE qtid[3]; /* Quantization table ID of each component */ + SHORT dcv[3]; /* Previous DC element of each component */ + WORD nrst; /* Restart inverval */ + UINT width, height; /* Size of the input image (pixel) */ + BYTE* huffbits[2][2]; /* Huffman bit distribution tables [id][dcac] */ + WORD* huffcode[2][2]; /* Huffman code word tables [id][dcac] */ + BYTE* huffdata[2][2]; /* Huffman decoded data tables [id][dcac] */ + LONG* qttbl[4]; /* Dequaitizer tables [id] */ + void* workbuf; /* Working buffer for IDCT and RGB output */ + BYTE* mcubuf; /* Working buffer for the MCU */ + void* pool; /* Pointer to available memory pool */ + UINT sz_pool; /* Size of momory pool (bytes available) */ + UINT (*infunc)(JDEC*, BYTE*, UINT);/* Pointer to jpeg stream input function */ + void* device; /* Pointer to I/O device identifiler for the session */ +}; + + + +/* TJpgDec API functions */ +JRESULT jd_prepare (JDEC*, UINT(*)(JDEC*,BYTE*,UINT), void*, UINT, void*); +JRESULT jd_decomp (JDEC*, UINT(*)(JDEC*,void*,JRECT*), BYTE); + + +#ifdef __cplusplus +} +#endif + +#endif /* _TJPGDEC */ diff --git a/lib/libesp32_div/esp32-camera/target/esp32s2/tjpgd.c b/lib/libesp32_div/esp32-camera/target/esp32s2/tjpgd.c new file mode 100644 index 000000000..5a983c4c7 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/target/esp32s2/tjpgd.c @@ -0,0 +1,970 @@ +/*----------------------------------------------------------------------------/ +/ TJpgDec - Tiny JPEG Decompressor R0.01b (C)ChaN, 2012 +/-----------------------------------------------------------------------------/ +/ The TJpgDec is a generic JPEG decompressor module for tiny embedded systems. +/ This is a free software that opened for education, research and commercial +/ developments under license policy of following terms. +/ +/ Copyright (C) 2012, ChaN, all right reserved. +/ +/ * The TJpgDec module is a free software and there is NO WARRANTY. +/ * No restriction on use. You can use, modify and redistribute it for +/ personal, non-profit or commercial products UNDER YOUR RESPONSIBILITY. +/ * Redistributions of source code must retain the above copyright notice. +/ +/-----------------------------------------------------------------------------/ +/ Oct 04,'11 R0.01 First release. +/ Feb 19,'12 R0.01a Fixed decompression fails when scan starts with an escape seq. +/ Sep 03,'12 R0.01b Added JD_TBLCLIP option. +/----------------------------------------------------------------------------*/ + +#include "tjpgd.h" + +#define SUPPORT_JPEG 1 + +#ifdef SUPPORT_JPEG +/*-----------------------------------------------*/ +/* Zigzag-order to raster-order conversion table */ +/*-----------------------------------------------*/ + +#define ZIG(n) Zig[n] + +static +const BYTE Zig[64] = { /* Zigzag-order to raster-order conversion table */ + 0, 1, 8, 16, 9, 2, 3, 10, 17, 24, 32, 25, 18, 11, 4, 5, + 12, 19, 26, 33, 40, 48, 41, 34, 27, 20, 13, 6, 7, 14, 21, 28, + 35, 42, 49, 56, 57, 50, 43, 36, 29, 22, 15, 23, 30, 37, 44, 51, + 58, 59, 52, 45, 38, 31, 39, 46, 53, 60, 61, 54, 47, 55, 62, 63 +}; + + + +/*-------------------------------------------------*/ +/* Input scale factor of Arai algorithm */ +/* (scaled up 16 bits for fixed point operations) */ +/*-------------------------------------------------*/ + +#define IPSF(n) Ipsf[n] + +static +const WORD Ipsf[64] = { /* See also aa_idct.png */ + (WORD)(1.00000*8192), (WORD)(1.38704*8192), (WORD)(1.30656*8192), (WORD)(1.17588*8192), (WORD)(1.00000*8192), (WORD)(0.78570*8192), (WORD)(0.54120*8192), (WORD)(0.27590*8192), + (WORD)(1.38704*8192), (WORD)(1.92388*8192), (WORD)(1.81226*8192), (WORD)(1.63099*8192), (WORD)(1.38704*8192), (WORD)(1.08979*8192), (WORD)(0.75066*8192), (WORD)(0.38268*8192), + (WORD)(1.30656*8192), (WORD)(1.81226*8192), (WORD)(1.70711*8192), (WORD)(1.53636*8192), (WORD)(1.30656*8192), (WORD)(1.02656*8192), (WORD)(0.70711*8192), (WORD)(0.36048*8192), + (WORD)(1.17588*8192), (WORD)(1.63099*8192), (WORD)(1.53636*8192), (WORD)(1.38268*8192), (WORD)(1.17588*8192), (WORD)(0.92388*8192), (WORD)(0.63638*8192), (WORD)(0.32442*8192), + (WORD)(1.00000*8192), (WORD)(1.38704*8192), (WORD)(1.30656*8192), (WORD)(1.17588*8192), (WORD)(1.00000*8192), (WORD)(0.78570*8192), (WORD)(0.54120*8192), (WORD)(0.27590*8192), + (WORD)(0.78570*8192), (WORD)(1.08979*8192), (WORD)(1.02656*8192), (WORD)(0.92388*8192), (WORD)(0.78570*8192), (WORD)(0.61732*8192), (WORD)(0.42522*8192), (WORD)(0.21677*8192), + (WORD)(0.54120*8192), (WORD)(0.75066*8192), (WORD)(0.70711*8192), (WORD)(0.63638*8192), (WORD)(0.54120*8192), (WORD)(0.42522*8192), (WORD)(0.29290*8192), (WORD)(0.14932*8192), + (WORD)(0.27590*8192), (WORD)(0.38268*8192), (WORD)(0.36048*8192), (WORD)(0.32442*8192), (WORD)(0.27590*8192), (WORD)(0.21678*8192), (WORD)(0.14932*8192), (WORD)(0.07612*8192) +}; + + + +/*---------------------------------------------*/ +/* Conversion table for fast clipping process */ +/*---------------------------------------------*/ + +#if JD_TBLCLIP + +#define BYTECLIP(v) Clip8[(UINT)(v) & 0x3FF] + +static +const BYTE Clip8[1024] = { + /* 0..255 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, + 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, + 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, + 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, + 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, + 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, + 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, + 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, + /* 256..511 */ + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + /* -512..-257 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + /* -256..-1 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +}; + +#else /* JD_TBLCLIP */ + +inline +BYTE BYTECLIP ( + INT val +) +{ + if (val < 0) val = 0; + if (val > 255) val = 255; + + return (BYTE)val; +} + +#endif + + + +/*-----------------------------------------------------------------------*/ +/* Allocate a memory block from memory pool */ +/*-----------------------------------------------------------------------*/ + +static +void* alloc_pool ( /* Pointer to allocated memory block (NULL:no memory available) */ + JDEC* jd, /* Pointer to the decompressor object */ + UINT nd /* Number of bytes to allocate */ +) +{ + char *rp = 0; + + + nd = (nd + 3) & ~3; /* Align block size to the word boundary */ + + if (jd->sz_pool >= nd) { + jd->sz_pool -= nd; + rp = (char*)jd->pool; /* Get start of available memory pool */ + jd->pool = (void*)(rp + nd); /* Allocate requierd bytes */ + } + + return (void*)rp; /* Return allocated memory block (NULL:no memory to allocate) */ +} + + + + +/*-----------------------------------------------------------------------*/ +/* Create de-quantization and prescaling tables with a DQT segment */ +/*-----------------------------------------------------------------------*/ + +static +UINT create_qt_tbl ( /* 0:OK, !0:Failed */ + JDEC* jd, /* Pointer to the decompressor object */ + const BYTE* data, /* Pointer to the quantizer tables */ + UINT ndata /* Size of input data */ +) +{ + UINT i; + BYTE d, z; + LONG *pb; + + + while (ndata) { /* Process all tables in the segment */ + if (ndata < 65) return JDR_FMT1; /* Err: table size is unaligned */ + ndata -= 65; + d = *data++; /* Get table property */ + if (d & 0xF0) return JDR_FMT1; /* Err: not 8-bit resolution */ + i = d & 3; /* Get table ID */ + pb = alloc_pool(jd, 64 * sizeof (LONG));/* Allocate a memory block for the table */ + if (!pb) return JDR_MEM1; /* Err: not enough memory */ + jd->qttbl[i] = pb; /* Register the table */ + for (i = 0; i < 64; i++) { /* Load the table */ + z = ZIG(i); /* Zigzag-order to raster-order conversion */ + pb[z] = (LONG)((DWORD)*data++ * IPSF(z)); /* Apply scale factor of Arai algorithm to the de-quantizers */ + } + } + + return JDR_OK; +} + + + + +/*-----------------------------------------------------------------------*/ +/* Create huffman code tables with a DHT segment */ +/*-----------------------------------------------------------------------*/ + +static +UINT create_huffman_tbl ( /* 0:OK, !0:Failed */ + JDEC* jd, /* Pointer to the decompressor object */ + const BYTE* data, /* Pointer to the packed huffman tables */ + UINT ndata /* Size of input data */ +) +{ + UINT i, j, b, np, cls, num; + BYTE d, *pb, *pd; + WORD hc, *ph; + + + while (ndata) { /* Process all tables in the segment */ + if (ndata < 17) return JDR_FMT1; /* Err: wrong data size */ + ndata -= 17; + d = *data++; /* Get table number and class */ + cls = (d >> 4); num = d & 0x0F; /* class = dc(0)/ac(1), table number = 0/1 */ + if (d & 0xEE) return JDR_FMT1; /* Err: invalid class/number */ + pb = alloc_pool(jd, 16); /* Allocate a memory block for the bit distribution table */ + if (!pb) return JDR_MEM1; /* Err: not enough memory */ + jd->huffbits[num][cls] = pb; + for (np = i = 0; i < 16; i++) { /* Load number of patterns for 1 to 16-bit code */ + pb[i] = b = *data++; + np += b; /* Get sum of code words for each code */ + } + + ph = alloc_pool(jd, np * sizeof (WORD));/* Allocate a memory block for the code word table */ + if (!ph) return JDR_MEM1; /* Err: not enough memory */ + jd->huffcode[num][cls] = ph; + hc = 0; + for (j = i = 0; i < 16; i++) { /* Re-build huffman code word table */ + b = pb[i]; + while (b--) ph[j++] = hc++; + hc <<= 1; + } + + if (ndata < np) return JDR_FMT1; /* Err: wrong data size */ + ndata -= np; + pd = alloc_pool(jd, np); /* Allocate a memory block for the decoded data */ + if (!pd) return JDR_MEM1; /* Err: not enough memory */ + jd->huffdata[num][cls] = pd; + for (i = 0; i < np; i++) { /* Load decoded data corresponds to each code ward */ + d = *data++; + if (!cls && d > 11) return JDR_FMT1; + *pd++ = d; + } + } + + return JDR_OK; +} + + + + +/*-----------------------------------------------------------------------*/ +/* Extract N bits from input stream */ +/*-----------------------------------------------------------------------*/ + +static +INT bitext ( /* >=0: extracted data, <0: error code */ + JDEC* jd, /* Pointer to the decompressor object */ + UINT nbit /* Number of bits to extract (1 to 11) */ +) +{ + BYTE msk, s, *dp; + UINT dc, v, f; + + + msk = jd->dmsk; dc = jd->dctr; dp = jd->dptr; /* Bit mask, number of data available, read ptr */ + s = *dp; v = f = 0; + do { + if (!msk) { /* Next byte? */ + if (!dc) { /* No input data is available, re-fill input buffer */ + dp = jd->inbuf; /* Top of input buffer */ + dc = jd->infunc(jd, dp, JD_SZBUF); + if (!dc) return 0 - (INT)JDR_INP; /* Err: read error or wrong stream termination */ + } else { + dp++; /* Next data ptr */ + } + dc--; /* Decrement number of available bytes */ + if (f) { /* In flag sequence? */ + f = 0; /* Exit flag sequence */ + if (*dp != 0) return 0 - (INT)JDR_FMT1; /* Err: unexpected flag is detected (may be collapted data) */ + *dp = s = 0xFF; /* The flag is a data 0xFF */ + } else { + s = *dp; /* Get next data byte */ + if (s == 0xFF) { /* Is start of flag sequence? */ + f = 1; continue; /* Enter flag sequence */ + } + } + msk = 0x80; /* Read from MSB */ + } + v <<= 1; /* Get a bit */ + if (s & msk) v++; + msk >>= 1; + nbit--; + } while (nbit); + jd->dmsk = msk; jd->dctr = dc; jd->dptr = dp; + + return (INT)v; +} + + + + +/*-----------------------------------------------------------------------*/ +/* Extract a huffman decoded data from input stream */ +/*-----------------------------------------------------------------------*/ + +static +INT huffext ( /* >=0: decoded data, <0: error code */ + JDEC* jd, /* Pointer to the decompressor object */ + const BYTE* hbits, /* Pointer to the bit distribution table */ + const WORD* hcode, /* Pointer to the code word table */ + const BYTE* hdata /* Pointer to the data table */ +) +{ + BYTE msk, s, *dp; + UINT dc, v, f, bl, nd; + + + msk = jd->dmsk; dc = jd->dctr; dp = jd->dptr; /* Bit mask, number of data available, read ptr */ + s = *dp; v = f = 0; + bl = 16; /* Max code length */ + do { + if (!msk) { /* Next byte? */ + if (!dc) { /* No input data is available, re-fill input buffer */ + dp = jd->inbuf; /* Top of input buffer */ + dc = jd->infunc(jd, dp, JD_SZBUF); + if (!dc) return 0 - (INT)JDR_INP; /* Err: read error or wrong stream termination */ + } else { + dp++; /* Next data ptr */ + } + dc--; /* Decrement number of available bytes */ + if (f) { /* In flag sequence? */ + f = 0; /* Exit flag sequence */ + if (*dp != 0) + return 0 - (INT)JDR_FMT1; /* Err: unexpected flag is detected (may be collapted data) */ + *dp = s = 0xFF; /* The flag is a data 0xFF */ + } else { + s = *dp; /* Get next data byte */ + if (s == 0xFF) { /* Is start of flag sequence? */ + f = 1; continue; /* Enter flag sequence, get trailing byte */ + } + } + msk = 0x80; /* Read from MSB */ + } + v <<= 1; /* Get a bit */ + if (s & msk) v++; + msk >>= 1; + + for (nd = *hbits++; nd; nd--) { /* Search the code word in this bit length */ + if (v == *hcode++) { /* Matched? */ + jd->dmsk = msk; jd->dctr = dc; jd->dptr = dp; + return *hdata; /* Return the decoded data */ + } + hdata++; + } + bl--; + } while (bl); + + return 0 - (INT)JDR_FMT1; /* Err: code not found (may be collapted data) */ +} + + + + +/*-----------------------------------------------------------------------*/ +/* Apply Inverse-DCT in Arai Algorithm (see also aa_idct.png) */ +/*-----------------------------------------------------------------------*/ + +static +void block_idct ( + LONG* src, /* Input block data (de-quantized and pre-scaled for Arai Algorithm) */ + BYTE* dst /* Pointer to the destination to store the block as byte array */ +) +{ + const LONG M13 = (LONG)(1.41421*4096), M2 = (LONG)(1.08239*4096), M4 = (LONG)(2.61313*4096), M5 = (LONG)(1.84776*4096); + LONG v0, v1, v2, v3, v4, v5, v6, v7; + LONG t10, t11, t12, t13; + UINT i; + + /* Process columns */ + for (i = 0; i < 8; i++) { + v0 = src[8 * 0]; /* Get even elements */ + v1 = src[8 * 2]; + v2 = src[8 * 4]; + v3 = src[8 * 6]; + + t10 = v0 + v2; /* Process the even elements */ + t12 = v0 - v2; + t11 = (v1 - v3) * M13 >> 12; + v3 += v1; + t11 -= v3; + v0 = t10 + v3; + v3 = t10 - v3; + v1 = t11 + t12; + v2 = t12 - t11; + + v4 = src[8 * 7]; /* Get odd elements */ + v5 = src[8 * 1]; + v6 = src[8 * 5]; + v7 = src[8 * 3]; + + t10 = v5 - v4; /* Process the odd elements */ + t11 = v5 + v4; + t12 = v6 - v7; + v7 += v6; + v5 = (t11 - v7) * M13 >> 12; + v7 += t11; + t13 = (t10 + t12) * M5 >> 12; + v4 = t13 - (t10 * M2 >> 12); + v6 = t13 - (t12 * M4 >> 12) - v7; + v5 -= v6; + v4 -= v5; + + src[8 * 0] = v0 + v7; /* Write-back transformed values */ + src[8 * 7] = v0 - v7; + src[8 * 1] = v1 + v6; + src[8 * 6] = v1 - v6; + src[8 * 2] = v2 + v5; + src[8 * 5] = v2 - v5; + src[8 * 3] = v3 + v4; + src[8 * 4] = v3 - v4; + + src++; /* Next column */ + } + + /* Process rows */ + src -= 8; + for (i = 0; i < 8; i++) { + v0 = src[0] + (128L << 8); /* Get even elements (remove DC offset (-128) here) */ + v1 = src[2]; + v2 = src[4]; + v3 = src[6]; + + t10 = v0 + v2; /* Process the even elements */ + t12 = v0 - v2; + t11 = (v1 - v3) * M13 >> 12; + v3 += v1; + t11 -= v3; + v0 = t10 + v3; + v3 = t10 - v3; + v1 = t11 + t12; + v2 = t12 - t11; + + v4 = src[7]; /* Get odd elements */ + v5 = src[1]; + v6 = src[5]; + v7 = src[3]; + + t10 = v5 - v4; /* Process the odd elements */ + t11 = v5 + v4; + t12 = v6 - v7; + v7 += v6; + v5 = (t11 - v7) * M13 >> 12; + v7 += t11; + t13 = (t10 + t12) * M5 >> 12; + v4 = t13 - (t10 * M2 >> 12); + v6 = t13 - (t12 * M4 >> 12) - v7; + v5 -= v6; + v4 -= v5; + + dst[0] = BYTECLIP((v0 + v7) >> 8); /* Descale the transformed values 8 bits and output */ + dst[7] = BYTECLIP((v0 - v7) >> 8); + dst[1] = BYTECLIP((v1 + v6) >> 8); + dst[6] = BYTECLIP((v1 - v6) >> 8); + dst[2] = BYTECLIP((v2 + v5) >> 8); + dst[5] = BYTECLIP((v2 - v5) >> 8); + dst[3] = BYTECLIP((v3 + v4) >> 8); + dst[4] = BYTECLIP((v3 - v4) >> 8); + dst += 8; + + src += 8; /* Next row */ + } +} + + + + +/*-----------------------------------------------------------------------*/ +/* Load all blocks in the MCU into working buffer */ +/*-----------------------------------------------------------------------*/ + +static +JRESULT mcu_load ( + JDEC* jd /* Pointer to the decompressor object */ +) +{ + LONG *tmp = (LONG*)jd->workbuf; /* Block working buffer for de-quantize and IDCT */ + UINT blk, nby, nbc, i, z, id, cmp; + INT b, d, e; + BYTE *bp; + const BYTE *hb, *hd; + const WORD *hc; + const LONG *dqf; + + + nby = jd->msx * jd->msy; /* Number of Y blocks (1, 2 or 4) */ + nbc = 2; /* Number of C blocks (2) */ + bp = jd->mcubuf; /* Pointer to the first block */ + + for (blk = 0; blk < nby + nbc; blk++) { + cmp = (blk < nby) ? 0 : blk - nby + 1; /* Component number 0:Y, 1:Cb, 2:Cr */ + id = cmp ? 1 : 0; /* Huffman table ID of the component */ + + /* Extract a DC element from input stream */ + hb = jd->huffbits[id][0]; /* Huffman table for the DC element */ + hc = jd->huffcode[id][0]; + hd = jd->huffdata[id][0]; + b = huffext(jd, hb, hc, hd); /* Extract a huffman coded data (bit length) */ + if (b < 0) return 0 - b; /* Err: invalid code or input */ + d = jd->dcv[cmp]; /* DC value of previous block */ + if (b) { /* If there is any difference from previous block */ + e = bitext(jd, b); /* Extract data bits */ + if (e < 0) return 0 - e; /* Err: input */ + b = 1 << (b - 1); /* MSB position */ + if (!(e & b)) e -= (b << 1) - 1; /* Restore sign if needed */ + d += e; /* Get current value */ + jd->dcv[cmp] = (SHORT)d; /* Save current DC value for next block */ + } + dqf = jd->qttbl[jd->qtid[cmp]]; /* De-quantizer table ID for this component */ + tmp[0] = d * dqf[0] >> 8; /* De-quantize, apply scale factor of Arai algorithm and descale 8 bits */ + + /* Extract following 63 AC elements from input stream */ + for (i = 1; i < 64; i++) tmp[i] = 0; /* Clear rest of elements */ + hb = jd->huffbits[id][1]; /* Huffman table for the AC elements */ + hc = jd->huffcode[id][1]; + hd = jd->huffdata[id][1]; + i = 1; /* Top of the AC elements */ + do { + b = huffext(jd, hb, hc, hd); /* Extract a huffman coded value (zero runs and bit length) */ + if (b == 0) break; /* EOB? */ + if (b < 0) return 0 - b; /* Err: invalid code or input error */ + z = (UINT)b >> 4; /* Number of leading zero elements */ + if (z) { + i += z; /* Skip zero elements */ + if (i >= 64) return JDR_FMT1; /* Too long zero run */ + } + if (b &= 0x0F) { /* Bit length */ + d = bitext(jd, b); /* Extract data bits */ + if (d < 0) return 0 - d; /* Err: input device */ + b = 1 << (b - 1); /* MSB position */ + if (!(d & b)) d -= (b << 1) - 1;/* Restore negative value if needed */ + z = ZIG(i); /* Zigzag-order to raster-order converted index */ + tmp[z] = d * dqf[z] >> 8; /* De-quantize, apply scale factor of Arai algorithm and descale 8 bits */ + } + } while (++i < 64); /* Next AC element */ + + if (JD_USE_SCALE && jd->scale == 3) + *bp = (*tmp / 256) + 128; /* If scale ratio is 1/8, IDCT can be ommited and only DC element is used */ + else + block_idct(tmp, bp); /* Apply IDCT and store the block to the MCU buffer */ + + bp += 64; /* Next block */ + } + + return JDR_OK; /* All blocks have been loaded successfully */ +} + + + + +/*-----------------------------------------------------------------------*/ +/* Output an MCU: Convert YCrCb to RGB and output it in RGB form */ +/*-----------------------------------------------------------------------*/ + +static +JRESULT mcu_output ( + JDEC* jd, /* Pointer to the decompressor object */ + UINT (*outfunc)(JDEC*, void*, JRECT*), /* RGB output function */ + UINT x, /* MCU position in the image (left of the MCU) */ + UINT y /* MCU position in the image (top of the MCU) */ +) +{ + const INT CVACC = (sizeof (INT) > 2) ? 1024 : 128; + UINT ix, iy, mx, my, rx, ry; + INT yy, cb, cr; + BYTE *py, *pc, *rgb24; + JRECT rect; + + + mx = jd->msx * 8; my = jd->msy * 8; /* MCU size (pixel) */ + rx = (x + mx <= jd->width) ? mx : jd->width - x; /* Output rectangular size (it may be clipped at right/bottom end) */ + ry = (y + my <= jd->height) ? my : jd->height - y; + if (JD_USE_SCALE) { + rx >>= jd->scale; ry >>= jd->scale; + if (!rx || !ry) return JDR_OK; /* Skip this MCU if all pixel is to be rounded off */ + x >>= jd->scale; y >>= jd->scale; + } + rect.left = x; rect.right = x + rx - 1; /* Rectangular area in the frame buffer */ + rect.top = y; rect.bottom = y + ry - 1; + + + if (!JD_USE_SCALE || jd->scale != 3) { /* Not for 1/8 scaling */ + + /* Build an RGB MCU from discrete comopnents */ + rgb24 = (BYTE*)jd->workbuf; + for (iy = 0; iy < my; iy++) { + pc = jd->mcubuf; + py = pc + iy * 8; + if (my == 16) { /* Double block height? */ + pc += 64 * 4 + (iy >> 1) * 8; + if (iy >= 8) py += 64; + } else { /* Single block height */ + pc += mx * 8 + iy * 8; + } + for (ix = 0; ix < mx; ix++) { + cb = pc[0] - 128; /* Get Cb/Cr component and restore right level */ + cr = pc[64] - 128; + if (mx == 16) { /* Double block width? */ + if (ix == 8) py += 64 - 8; /* Jump to next block if double block heigt */ + pc += ix & 1; /* Increase chroma pointer every two pixels */ + } else { /* Single block width */ + pc++; /* Increase chroma pointer every pixel */ + } + yy = *py++; /* Get Y component */ + + /* Convert YCbCr to RGB */ + *rgb24++ = /* R */ BYTECLIP(yy + ((INT)(1.402 * CVACC) * cr) / CVACC); + *rgb24++ = /* G */ BYTECLIP(yy - ((INT)(0.344 * CVACC) * cb + (INT)(0.714 * CVACC) * cr) / CVACC); + *rgb24++ = /* B */ BYTECLIP(yy + ((INT)(1.772 * CVACC) * cb) / CVACC); + } + } + + /* Descale the MCU rectangular if needed */ + if (JD_USE_SCALE && jd->scale) { + UINT x, y, r, g, b, s, w, a; + BYTE *op; + + /* Get averaged RGB value of each square correcponds to a pixel */ + s = jd->scale * 2; /* Bumber of shifts for averaging */ + w = 1 << jd->scale; /* Width of square */ + a = (mx - w) * 3; /* Bytes to skip for next line in the square */ + op = (BYTE*)jd->workbuf; + for (iy = 0; iy < my; iy += w) { + for (ix = 0; ix < mx; ix += w) { + rgb24 = (BYTE*)jd->workbuf + (iy * mx + ix) * 3; + r = g = b = 0; + for (y = 0; y < w; y++) { /* Accumulate RGB value in the square */ + for (x = 0; x < w; x++) { + r += *rgb24++; + g += *rgb24++; + b += *rgb24++; + } + rgb24 += a; + } /* Put the averaged RGB value as a pixel */ + *op++ = (BYTE)(r >> s); + *op++ = (BYTE)(g >> s); + *op++ = (BYTE)(b >> s); + } + } + } + + } else { /* For only 1/8 scaling (left-top pixel in each block are the DC value of the block) */ + + /* Build a 1/8 descaled RGB MCU from discrete comopnents */ + rgb24 = (BYTE*)jd->workbuf; + pc = jd->mcubuf + mx * my; + cb = pc[0] - 128; /* Get Cb/Cr component and restore right level */ + cr = pc[64] - 128; + for (iy = 0; iy < my; iy += 8) { + py = jd->mcubuf; + if (iy == 8) py += 64 * 2; + for (ix = 0; ix < mx; ix += 8) { + yy = *py; /* Get Y component */ + py += 64; + + /* Convert YCbCr to RGB */ + *rgb24++ = /* R */ BYTECLIP(yy + ((INT)(1.402 * CVACC) * cr / CVACC)); + *rgb24++ = /* G */ BYTECLIP(yy - ((INT)(0.344 * CVACC) * cb + (INT)(0.714 * CVACC) * cr) / CVACC); + *rgb24++ = /* B */ BYTECLIP(yy + ((INT)(1.772 * CVACC) * cb / CVACC)); + } + } + } + + /* Squeeze up pixel table if a part of MCU is to be truncated */ + mx >>= jd->scale; + if (rx < mx) { + BYTE *s, *d; + UINT x, y; + + s = d = (BYTE*)jd->workbuf; + for (y = 0; y < ry; y++) { + for (x = 0; x < rx; x++) { /* Copy effective pixels */ + *d++ = *s++; + *d++ = *s++; + *d++ = *s++; + } + s += (mx - rx) * 3; /* Skip truncated pixels */ + } + } + + /* Convert RGB888 to RGB565 if needed */ + if (JD_FORMAT == 1) { + BYTE *s = (BYTE*)jd->workbuf; + WORD w, *d = (WORD*)s; + UINT n = rx * ry; + + do { + w = (*s++ & 0xF8) << 8; /* RRRRR----------- */ + w |= (*s++ & 0xFC) << 3; /* -----GGGGGG----- */ + w |= *s++ >> 3; /* -----------BBBBB */ + *d++ = w; + } while (--n); + } + + /* Output the RGB rectangular */ + return outfunc(jd, jd->workbuf, &rect) ? JDR_OK : JDR_INTR; +} + + + + +/*-----------------------------------------------------------------------*/ +/* Process restart interval */ +/*-----------------------------------------------------------------------*/ + +static +JRESULT restart ( + JDEC* jd, /* Pointer to the decompressor object */ + WORD rstn /* Expected restert sequense number */ +) +{ + UINT i, dc; + WORD d; + BYTE *dp; + + + /* Discard padding bits and get two bytes from the input stream */ + dp = jd->dptr; dc = jd->dctr; + d = 0; + for (i = 0; i < 2; i++) { + if (!dc) { /* No input data is available, re-fill input buffer */ + dp = jd->inbuf; + dc = jd->infunc(jd, dp, JD_SZBUF); + if (!dc) return JDR_INP; + } else { + dp++; + } + dc--; + d = (d << 8) | *dp; /* Get a byte */ + } + jd->dptr = dp; jd->dctr = dc; jd->dmsk = 0; + + /* Check the marker */ + if ((d & 0xFFD8) != 0xFFD0 || (d & 7) != (rstn & 7)) + return JDR_FMT1; /* Err: expected RSTn marker is not detected (may be collapted data) */ + + /* Reset DC offset */ + jd->dcv[2] = jd->dcv[1] = jd->dcv[0] = 0; + + return JDR_OK; +} + + + + +/*-----------------------------------------------------------------------*/ +/* Analyze the JPEG image and Initialize decompressor object */ +/*-----------------------------------------------------------------------*/ + +#define LDB_WORD(ptr) (WORD)(((WORD)*((BYTE*)(ptr))<<8)|(WORD)*(BYTE*)((ptr)+1)) + + +JRESULT jd_prepare ( + JDEC* jd, /* Blank decompressor object */ + UINT (*infunc)(JDEC*, BYTE*, UINT), /* JPEG strem input function */ + void* pool, /* Working buffer for the decompression session */ + UINT sz_pool, /* Size of working buffer */ + void* dev /* I/O device identifier for the session */ +) +{ + BYTE *seg, b; + WORD marker; + DWORD ofs; + UINT n, i, j, len; + JRESULT rc; + + + if (!pool) return JDR_PAR; + + jd->pool = pool; /* Work memroy */ + jd->sz_pool = sz_pool; /* Size of given work memory */ + jd->infunc = infunc; /* Stream input function */ + jd->device = dev; /* I/O device identifier */ + jd->nrst = 0; /* No restart interval (default) */ + + for (i = 0; i < 2; i++) { /* Nulls pointers */ + for (j = 0; j < 2; j++) { + jd->huffbits[i][j] = 0; + jd->huffcode[i][j] = 0; + jd->huffdata[i][j] = 0; + } + } + for (i = 0; i < 4; i++) jd->qttbl[i] = 0; + + jd->inbuf = seg = alloc_pool(jd, JD_SZBUF); /* Allocate stream input buffer */ + if (!seg) return JDR_MEM1; + + if (jd->infunc(jd, seg, 2) != 2) return JDR_INP;/* Check SOI marker */ + if (LDB_WORD(seg) != 0xFFD8) return JDR_FMT1; /* Err: SOI is not detected */ + ofs = 2; + + for (;;) { + /* Get a JPEG marker */ + if (jd->infunc(jd, seg, 4) != 4) return JDR_INP; + marker = LDB_WORD(seg); /* Marker */ + len = LDB_WORD(seg + 2); /* Length field */ + if (len <= 2 || (marker >> 8) != 0xFF) return JDR_FMT1; + len -= 2; /* Content size excluding length field */ + ofs += 4 + len; /* Number of bytes loaded */ + + switch (marker & 0xFF) { + case 0xC0: /* SOF0 (baseline JPEG) */ + /* Load segment data */ + if (len > JD_SZBUF) return JDR_MEM2; + if (jd->infunc(jd, seg, len) != len) return JDR_INP; + + jd->width = LDB_WORD(seg+3); /* Image width in unit of pixel */ + jd->height = LDB_WORD(seg+1); /* Image height in unit of pixel */ + if (seg[5] != 3) return JDR_FMT3; /* Err: Supports only Y/Cb/Cr format */ + + /* Check three image components */ + for (i = 0; i < 3; i++) { + b = seg[7 + 3 * i]; /* Get sampling factor */ + if (!i) { /* Y component */ + if (b != 0x11 && b != 0x22 && b != 0x21)/* Check sampling factor */ + return JDR_FMT3; /* Err: Supports only 4:4:4, 4:2:0 or 4:2:2 */ + jd->msx = b >> 4; jd->msy = b & 15; /* Size of MCU [blocks] */ + } else { /* Cb/Cr component */ + if (b != 0x11) return JDR_FMT3; /* Err: Sampling factor of Cr/Cb must be 1 */ + } + b = seg[8 + 3 * i]; /* Get dequantizer table ID for this component */ + if (b > 3) return JDR_FMT3; /* Err: Invalid ID */ + jd->qtid[i] = b; + } + break; + + case 0xDD: /* DRI */ + /* Load segment data */ + if (len > JD_SZBUF) return JDR_MEM2; + if (jd->infunc(jd, seg, len) != len) return JDR_INP; + + /* Get restart interval (MCUs) */ + jd->nrst = LDB_WORD(seg); + break; + + case 0xC4: /* DHT */ + /* Load segment data */ + if (len > JD_SZBUF) return JDR_MEM2; + if (jd->infunc(jd, seg, len) != len) return JDR_INP; + + /* Create huffman tables */ + rc = create_huffman_tbl(jd, seg, len); + if (rc) return rc; + break; + + case 0xDB: /* DQT */ + /* Load segment data */ + if (len > JD_SZBUF) return JDR_MEM2; + if (jd->infunc(jd, seg, len) != len) return JDR_INP; + + /* Create de-quantizer tables */ + rc = create_qt_tbl(jd, seg, len); + if (rc) return rc; + break; + + case 0xDA: /* SOS */ + /* Load segment data */ + if (len > JD_SZBUF) return JDR_MEM2; + if (jd->infunc(jd, seg, len) != len) return JDR_INP; + + if (!jd->width || !jd->height) return JDR_FMT1; /* Err: Invalid image size */ + + if (seg[0] != 3) return JDR_FMT3; /* Err: Supports only three color components format */ + + /* Check if all tables corresponding to each components have been loaded */ + for (i = 0; i < 3; i++) { + b = seg[2 + 2 * i]; /* Get huffman table ID */ + if (b != 0x00 && b != 0x11) return JDR_FMT3; /* Err: Different table number for DC/AC element */ + b = i ? 1 : 0; + if (!jd->huffbits[b][0] || !jd->huffbits[b][1]) /* Check huffman table for this component */ + return JDR_FMT1; /* Err: Huffman table not loaded */ + if (!jd->qttbl[jd->qtid[i]]) return JDR_FMT1; /* Err: Dequantizer table not loaded */ + } + + /* Allocate working buffer for MCU and RGB */ + n = jd->msy * jd->msx; /* Number of Y blocks in the MCU */ + if (!n) return JDR_FMT1; /* Err: SOF0 has not been loaded */ + len = n * 64 * 2 + 64; /* Allocate buffer for IDCT and RGB output */ + if (len < 256) len = 256; /* but at least 256 byte is required for IDCT */ + jd->workbuf = alloc_pool(jd, len); /* and it may occupy a part of following MCU working buffer for RGB output */ + if (!jd->workbuf) return JDR_MEM1; /* Err: not enough memory */ + jd->mcubuf = alloc_pool(jd, (n + 2) * 64); /* Allocate MCU working buffer */ + if (!jd->mcubuf) return JDR_MEM1; /* Err: not enough memory */ + + /* Pre-load the JPEG data to extract it from the bit stream */ + jd->dptr = seg; jd->dctr = 0; jd->dmsk = 0; /* Prepare to read bit stream */ + if (ofs %= JD_SZBUF) { /* Align read offset to JD_SZBUF */ + jd->dctr = jd->infunc(jd, seg + ofs, JD_SZBUF - (UINT)ofs); + jd->dptr = seg + ofs - 1; + } + + return JDR_OK; /* Initialization succeeded. Ready to decompress the JPEG image. */ + + case 0xC1: /* SOF1 */ + case 0xC2: /* SOF2 */ + case 0xC3: /* SOF3 */ + case 0xC5: /* SOF5 */ + case 0xC6: /* SOF6 */ + case 0xC7: /* SOF7 */ + case 0xC9: /* SOF9 */ + case 0xCA: /* SOF10 */ + case 0xCB: /* SOF11 */ + case 0xCD: /* SOF13 */ + case 0xCE: /* SOF14 */ + case 0xCF: /* SOF15 */ + case 0xD9: /* EOI */ + return JDR_FMT3; /* Unsuppoted JPEG standard (may be progressive JPEG) */ + + default: /* Unknown segment (comment, exif or etc..) */ + /* Skip segment data */ + if (jd->infunc(jd, 0, len) != len) /* Null pointer specifies to skip bytes of stream */ + return JDR_INP; + } + } +} + + + + +/*-----------------------------------------------------------------------*/ +/* Start to decompress the JPEG picture */ +/*-----------------------------------------------------------------------*/ + +JRESULT jd_decomp ( + JDEC* jd, /* Initialized decompression object */ + UINT (*outfunc)(JDEC*, void*, JRECT*), /* RGB output function */ + BYTE scale /* Output de-scaling factor (0 to 3) */ +) +{ + UINT x, y, mx, my; + WORD rst, rsc; + JRESULT rc; + + + if (scale > (JD_USE_SCALE ? 3 : 0)) return JDR_PAR; + jd->scale = scale; + + mx = jd->msx * 8; my = jd->msy * 8; /* Size of the MCU (pixel) */ + + jd->dcv[2] = jd->dcv[1] = jd->dcv[0] = 0; /* Initialize DC values */ + rst = rsc = 0; + + rc = JDR_OK; + for (y = 0; y < jd->height; y += my) { /* Vertical loop of MCUs */ + for (x = 0; x < jd->width; x += mx) { /* Horizontal loop of MCUs */ + if (jd->nrst && rst++ == jd->nrst) { /* Process restart interval if enabled */ + rc = restart(jd, rsc++); + if (rc != JDR_OK) return rc; + rst = 1; + } + rc = mcu_load(jd); /* Load an MCU (decompress huffman coded stream and apply IDCT) */ + if (rc != JDR_OK) return rc; + rc = mcu_output(jd, outfunc, x, y); /* Output the MCU (color space conversion, scaling and output) */ + if (rc != JDR_OK) return rc; + } + } + + return rc; +} +#endif//SUPPORT_JPEG + + diff --git a/lib/libesp32_div/esp32-camera/target/esp32s3/ll_cam.c b/lib/libesp32_div/esp32-camera/target/esp32s3/ll_cam.c new file mode 100644 index 000000000..9a1f185c4 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/target/esp32s3/ll_cam.c @@ -0,0 +1,452 @@ +// Copyright 2010-2020 Espressif Systems (Shanghai) PTE LTD +// +// 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. + +#include +#include +#include "soc/system_reg.h" +#include "soc/lcd_cam_struct.h" +#include "soc/lcd_cam_reg.h" +#include "soc/gdma_struct.h" +#include "soc/gdma_periph.h" +#include "soc/gdma_reg.h" +#include "ll_cam.h" +#include "cam_hal.h" + +static const char *TAG = "s3 ll_cam"; + +static void IRAM_ATTR ll_cam_vsync_isr(void *arg) +{ + //DBG_PIN_SET(1); + cam_obj_t *cam = (cam_obj_t *)arg; + BaseType_t HPTaskAwoken = pdFALSE; + + typeof(LCD_CAM.lc_dma_int_st) status = LCD_CAM.lc_dma_int_st; + if (status.val == 0) { + return; + } + + LCD_CAM.lc_dma_int_clr.val = status.val; + + if (status.cam_vsync_int_st) { + ll_cam_send_event(cam, CAM_VSYNC_EVENT, &HPTaskAwoken); + } + + if (HPTaskAwoken == pdTRUE) { + portYIELD_FROM_ISR(); + } + //DBG_PIN_SET(0); +} + +static void IRAM_ATTR ll_cam_dma_isr(void *arg) +{ + cam_obj_t *cam = (cam_obj_t *)arg; + BaseType_t HPTaskAwoken = pdFALSE; + + typeof(GDMA.channel[cam->dma_num].in.int_st) status = GDMA.channel[cam->dma_num].in.int_st; + if (status.val == 0) { + return; + } + + GDMA.channel[cam->dma_num].in.int_clr.val = status.val; + + if (status.in_suc_eof) { + ll_cam_send_event(cam, CAM_IN_SUC_EOF_EVENT, &HPTaskAwoken); + } + + if (HPTaskAwoken == pdTRUE) { + portYIELD_FROM_ISR(); + } +} + +bool ll_cam_stop(cam_obj_t *cam) +{ + if (cam->jpeg_mode || !cam->psram_mode) { + GDMA.channel[cam->dma_num].in.int_ena.in_suc_eof = 0; + GDMA.channel[cam->dma_num].in.int_clr.in_suc_eof = 1; + } + GDMA.channel[cam->dma_num].in.link.stop = 1; + return true; +} + +esp_err_t ll_cam_deinit(cam_obj_t *cam) +{ + if (cam->cam_intr_handle) { + esp_intr_free(cam->cam_intr_handle); + cam->cam_intr_handle = NULL; + } + + if (cam->dma_intr_handle) { + esp_intr_free(cam->dma_intr_handle); + cam->dma_intr_handle = NULL; + } + GDMA.channel[cam->dma_num].in.link.addr = 0x0; + + LCD_CAM.cam_ctrl1.cam_start = 0; + LCD_CAM.cam_ctrl1.cam_reset = 1; + LCD_CAM.cam_ctrl1.cam_reset = 0; + return ESP_OK; +} + +bool ll_cam_start(cam_obj_t *cam, int frame_pos) +{ + LCD_CAM.cam_ctrl1.cam_start = 0; + + if (cam->jpeg_mode || !cam->psram_mode) { + GDMA.channel[cam->dma_num].in.int_clr.in_suc_eof = 1; + GDMA.channel[cam->dma_num].in.int_ena.in_suc_eof = 1; + } + + LCD_CAM.cam_ctrl1.cam_reset = 1; + LCD_CAM.cam_ctrl1.cam_reset = 0; + LCD_CAM.cam_ctrl1.cam_afifo_reset = 1; + LCD_CAM.cam_ctrl1.cam_afifo_reset = 0; + GDMA.channel[cam->dma_num].in.conf0.in_rst = 1; + GDMA.channel[cam->dma_num].in.conf0.in_rst = 0; + + LCD_CAM.cam_ctrl1.cam_rec_data_bytelen = cam->dma_half_buffer_size - 1; // Ping pong operation + + if (!cam->psram_mode) { + GDMA.channel[cam->dma_num].in.link.addr = ((uint32_t)&cam->dma[0]) & 0xfffff; + } else { + GDMA.channel[cam->dma_num].in.link.addr = ((uint32_t)&cam->frames[frame_pos].dma[0]) & 0xfffff; + } + + GDMA.channel[cam->dma_num].in.link.start = 1; + + LCD_CAM.cam_ctrl.cam_update = 1; + LCD_CAM.cam_ctrl1.cam_start = 1; + return true; +} + +static esp_err_t ll_cam_dma_init(cam_obj_t *cam) +{ + for (int x = (SOC_GDMA_PAIRS_PER_GROUP - 1); x >= 0; x--) { + if (GDMA.channel[x].in.link.addr == 0x0) { + cam->dma_num = x; + ESP_LOGI(TAG, "DMA Channel=%d", cam->dma_num); + break; + } + if (x == 0) { + cam_deinit(); + ESP_LOGE(TAG, "Can't found available GDMA channel"); + return ESP_FAIL; + } + } + + if (REG_GET_BIT(SYSTEM_PERIP_CLK_EN1_REG, SYSTEM_DMA_CLK_EN) == 0) { + REG_CLR_BIT(SYSTEM_PERIP_CLK_EN1_REG, SYSTEM_DMA_CLK_EN); + REG_SET_BIT(SYSTEM_PERIP_CLK_EN1_REG, SYSTEM_DMA_CLK_EN); + REG_SET_BIT(SYSTEM_PERIP_RST_EN1_REG, SYSTEM_DMA_RST); + REG_CLR_BIT(SYSTEM_PERIP_RST_EN1_REG, SYSTEM_DMA_RST); + } + + GDMA.channel[cam->dma_num].in.int_clr.val = ~0; + GDMA.channel[cam->dma_num].in.int_ena.val = 0; + + GDMA.channel[cam->dma_num].in.conf0.val = 0; + GDMA.channel[cam->dma_num].in.conf0.in_rst = 1; + GDMA.channel[cam->dma_num].in.conf0.in_rst = 0; + + //internal SRAM only + if (!cam->psram_mode) { + GDMA.channel[cam->dma_num].in.conf0.indscr_burst_en = 1; + GDMA.channel[cam->dma_num].in.conf0.in_data_burst_en = 1; + } + + GDMA.channel[cam->dma_num].in.conf1.in_check_owner = 0; + + GDMA.channel[cam->dma_num].in.peri_sel.sel = 5; + //GDMA.channel[cam->dma_num].in.pri.rx_pri = 1;//rx prio 0-15 + //GDMA.channel[cam->dma_num].in.sram_size.in_size = 6;//This register is used to configure the size of L2 Tx FIFO for Rx channel. 0:16 bytes, 1:24 bytes, 2:32 bytes, 3: 40 bytes, 4: 48 bytes, 5:56 bytes, 6: 64 bytes, 7: 72 bytes, 8: 80 bytes. + //GDMA.channel[cam->dma_num].in.wight.rx_weight = 7;//The weight of Rx channel 0-15 + return ESP_OK; +} + +esp_err_t ll_cam_config(cam_obj_t *cam, const camera_config_t *config) +{ + if (REG_GET_BIT(SYSTEM_PERIP_CLK_EN1_REG, SYSTEM_LCD_CAM_CLK_EN) == 0) { + REG_CLR_BIT(SYSTEM_PERIP_CLK_EN1_REG, SYSTEM_LCD_CAM_CLK_EN); + REG_SET_BIT(SYSTEM_PERIP_CLK_EN1_REG, SYSTEM_LCD_CAM_CLK_EN); + REG_SET_BIT(SYSTEM_PERIP_RST_EN1_REG, SYSTEM_LCD_CAM_RST); + REG_CLR_BIT(SYSTEM_PERIP_RST_EN1_REG, SYSTEM_LCD_CAM_RST); + } + + LCD_CAM.cam_ctrl.val = 0; + + LCD_CAM.cam_ctrl.cam_clkm_div_b = 0; + LCD_CAM.cam_ctrl.cam_clkm_div_a = 0; + LCD_CAM.cam_ctrl.cam_clkm_div_num = 160000000 / config->xclk_freq_hz; + LCD_CAM.cam_ctrl.cam_clk_sel = 3;//Select Camera module source clock. 0: no clock. 1: APLL. 2: CLK160. 3: no clock. + + LCD_CAM.cam_ctrl.cam_stop_en = 0; + LCD_CAM.cam_ctrl.cam_vsync_filter_thres = 4; // Filter by LCD_CAM clock + LCD_CAM.cam_ctrl.cam_update = 0; + LCD_CAM.cam_ctrl.cam_byte_order = cam->swap_data; + LCD_CAM.cam_ctrl.cam_bit_order = 0; + LCD_CAM.cam_ctrl.cam_line_int_en = 0; + LCD_CAM.cam_ctrl.cam_vs_eof_en = 0; //1: CAM_VSYNC to generate in_suc_eof. 0: in_suc_eof is controlled by reg_cam_rec_data_cyclelen + + LCD_CAM.cam_ctrl1.val = 0; + LCD_CAM.cam_ctrl1.cam_rec_data_bytelen = LCD_CAM_DMA_NODE_BUFFER_MAX_SIZE - 1; // Cannot be assigned to 0, and it is easy to overflow + LCD_CAM.cam_ctrl1.cam_line_int_num = 0; // The number of hsyncs that generate hs interrupts + LCD_CAM.cam_ctrl1.cam_clk_inv = 0; + LCD_CAM.cam_ctrl1.cam_vsync_filter_en = 1; + LCD_CAM.cam_ctrl1.cam_2byte_en = 0; + LCD_CAM.cam_ctrl1.cam_de_inv = 0; + LCD_CAM.cam_ctrl1.cam_hsync_inv = 0; + LCD_CAM.cam_ctrl1.cam_vsync_inv = 0; + LCD_CAM.cam_ctrl1.cam_vh_de_mode_en = 0; + + LCD_CAM.cam_rgb_yuv.val = 0; + + LCD_CAM.cam_ctrl.cam_update = 1; + LCD_CAM.cam_ctrl1.cam_start = 1; + + esp_err_t err = ll_cam_dma_init(cam); + if(err != ESP_OK) { + return err; + } + + return ESP_OK; +} + +void ll_cam_vsync_intr_enable(cam_obj_t *cam, bool en) +{ + LCD_CAM.lc_dma_int_clr.cam_vsync_int_clr = 1; + if (en) { + LCD_CAM.lc_dma_int_ena.cam_vsync_int_ena = 1; + } else { + LCD_CAM.lc_dma_int_ena.cam_vsync_int_ena = 0; + } +} + +esp_err_t ll_cam_set_pin(cam_obj_t *cam, const camera_config_t *config) +{ + PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[config->pin_pclk], PIN_FUNC_GPIO); + gpio_set_direction(config->pin_pclk, GPIO_MODE_INPUT); + gpio_set_pull_mode(config->pin_pclk, GPIO_FLOATING); + gpio_matrix_in(config->pin_pclk, CAM_PCLK_IDX, false); + + PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[config->pin_vsync], PIN_FUNC_GPIO); + gpio_set_direction(config->pin_vsync, GPIO_MODE_INPUT); + gpio_set_pull_mode(config->pin_vsync, GPIO_FLOATING); + gpio_matrix_in(config->pin_vsync, CAM_V_SYNC_IDX, cam->vsync_invert); + + PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[config->pin_href], PIN_FUNC_GPIO); + gpio_set_direction(config->pin_href, GPIO_MODE_INPUT); + gpio_set_pull_mode(config->pin_href, GPIO_FLOATING); + gpio_matrix_in(config->pin_href, CAM_H_ENABLE_IDX, false); + + int data_pins[8] = { + config->pin_d0, config->pin_d1, config->pin_d2, config->pin_d3, config->pin_d4, config->pin_d5, config->pin_d6, config->pin_d7, + }; + for (int i = 0; i < 8; i++) { + PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[data_pins[i]], PIN_FUNC_GPIO); + gpio_set_direction(data_pins[i], GPIO_MODE_INPUT); + gpio_set_pull_mode(data_pins[i], GPIO_FLOATING); + gpio_matrix_in(data_pins[i], CAM_DATA_IN0_IDX + i, false); + } + + PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[config->pin_xclk], PIN_FUNC_GPIO); + gpio_set_direction(config->pin_xclk, GPIO_MODE_OUTPUT); + gpio_set_pull_mode(config->pin_xclk, GPIO_FLOATING); + gpio_matrix_out(config->pin_xclk, CAM_CLK_IDX, false, false); + + return ESP_OK; +} + +esp_err_t ll_cam_init_isr(cam_obj_t *cam) +{ + esp_err_t ret = ESP_OK; + ret = esp_intr_alloc_intrstatus(gdma_periph_signals.groups[0].pairs[cam->dma_num].rx_irq_id, + ESP_INTR_FLAG_LOWMED | ESP_INTR_FLAG_SHARED | ESP_INTR_FLAG_IRAM, + (uint32_t)&GDMA.channel[cam->dma_num].in.int_st, GDMA_IN_SUC_EOF_CH0_INT_ST_M, + ll_cam_dma_isr, cam, &cam->dma_intr_handle); + if (ret != ESP_OK) { + ESP_LOGE(TAG, "DMA interrupt allocation of camera failed"); + return ret; + } + + ret = esp_intr_alloc_intrstatus(ETS_LCD_CAM_INTR_SOURCE, + ESP_INTR_FLAG_LOWMED | ESP_INTR_FLAG_SHARED | ESP_INTR_FLAG_IRAM, + (uint32_t)&LCD_CAM.lc_dma_int_st.val, LCD_CAM_CAM_VSYNC_INT_ST_M, + ll_cam_vsync_isr, cam, &cam->cam_intr_handle); + if (ret != ESP_OK) { + ESP_LOGE(TAG, "LCD_CAM interrupt allocation of camera failed"); + return ret; + } + return ESP_OK; +} + +void ll_cam_do_vsync(cam_obj_t *cam) +{ + gpio_matrix_in(cam->vsync_pin, CAM_V_SYNC_IDX, !cam->vsync_invert); + ets_delay_us(10); + gpio_matrix_in(cam->vsync_pin, CAM_V_SYNC_IDX, cam->vsync_invert); +} + +uint8_t ll_cam_get_dma_align(cam_obj_t *cam) +{ + return 16 << GDMA.channel[cam->dma_num].in.conf1.in_ext_mem_bk_size; +} + +static bool ll_cam_calc_rgb_dma(cam_obj_t *cam){ + size_t node_max = LCD_CAM_DMA_NODE_BUFFER_MAX_SIZE / cam->dma_bytes_per_item; + size_t line_width = cam->width * cam->in_bytes_per_pixel; + size_t node_size = node_max; + size_t nodes_per_line = 1; + size_t lines_per_node = 1; + + // Calculate DMA Node Size so that it's divisable by or divisor of the line width + if(line_width >= node_max){ + // One or more nodes will be requied for one line + for(size_t i = node_max; i > 0; i=i-1){ + if ((line_width % i) == 0) { + node_size = i; + nodes_per_line = line_width / node_size; + break; + } + } + } else { + // One or more lines can fit into one node + for(size_t i = node_max; i > 0; i=i-1){ + if ((i % line_width) == 0) { + node_size = i; + lines_per_node = node_size / line_width; + while((cam->height % lines_per_node) != 0){ + lines_per_node = lines_per_node - 1; + node_size = lines_per_node * line_width; + } + break; + } + } + } + + ESP_LOGI(TAG, "node_size: %4u, nodes_per_line: %u, lines_per_node: %u", + node_size * cam->dma_bytes_per_item, nodes_per_line, lines_per_node); + + cam->dma_node_buffer_size = node_size * cam->dma_bytes_per_item; + + size_t dma_half_buffer_max = CONFIG_CAMERA_DMA_BUFFER_SIZE_MAX / 2 / cam->dma_bytes_per_item; + if (line_width > dma_half_buffer_max) { + ESP_LOGE(TAG, "Resolution too high"); + return 0; + } + + // Calculate minimum EOF size = max(mode_size, line_size) + size_t dma_half_buffer_min = node_size * nodes_per_line; + + // Calculate max EOF size divisable by node size + size_t dma_half_buffer = (dma_half_buffer_max / dma_half_buffer_min) * dma_half_buffer_min; + + // Adjust EOF size so that height will be divisable by the number of lines in each EOF + size_t lines_per_half_buffer = dma_half_buffer / line_width; + while((cam->height % lines_per_half_buffer) != 0){ + dma_half_buffer = dma_half_buffer - dma_half_buffer_min; + lines_per_half_buffer = dma_half_buffer / line_width; + } + + // Calculate DMA size + size_t dma_buffer_max = 2 * dma_half_buffer_max; + if (cam->psram_mode) { + dma_buffer_max = cam->recv_size / cam->dma_bytes_per_item; + } + size_t dma_buffer_size = dma_buffer_max; + if (!cam->psram_mode) { + dma_buffer_size =(dma_buffer_max / dma_half_buffer) * dma_half_buffer; + } + + ESP_LOGI(TAG, "dma_half_buffer_min: %5u, dma_half_buffer: %5u, lines_per_half_buffer: %2u, dma_buffer_size: %5u", + dma_half_buffer_min * cam->dma_bytes_per_item, dma_half_buffer * cam->dma_bytes_per_item, lines_per_half_buffer, dma_buffer_size * cam->dma_bytes_per_item); + + cam->dma_buffer_size = dma_buffer_size * cam->dma_bytes_per_item; + cam->dma_half_buffer_size = dma_half_buffer * cam->dma_bytes_per_item; + cam->dma_half_buffer_cnt = cam->dma_buffer_size / cam->dma_half_buffer_size; + return 1; +} + +bool ll_cam_dma_sizes(cam_obj_t *cam) +{ + cam->dma_bytes_per_item = 1; + if (cam->jpeg_mode) { + if (cam->psram_mode) { + cam->dma_buffer_size = cam->recv_size; + cam->dma_half_buffer_size = 1024; + cam->dma_half_buffer_cnt = cam->dma_buffer_size / cam->dma_half_buffer_size; + cam->dma_node_buffer_size = cam->dma_half_buffer_size; + } else { + cam->dma_half_buffer_cnt = 16; + cam->dma_buffer_size = cam->dma_half_buffer_cnt * 1024; + cam->dma_half_buffer_size = cam->dma_buffer_size / cam->dma_half_buffer_cnt; + cam->dma_node_buffer_size = cam->dma_half_buffer_size; + } + } else { + return ll_cam_calc_rgb_dma(cam); + } + return 1; +} + +size_t IRAM_ATTR ll_cam_memcpy(cam_obj_t *cam, uint8_t *out, const uint8_t *in, size_t len) +{ + // YUV to Grayscale + if (cam->in_bytes_per_pixel == 2 && cam->fb_bytes_per_pixel == 1) { + size_t end = len / 8; + for (size_t i = 0; i < end; ++i) { + out[0] = in[0]; + out[1] = in[2]; + out[2] = in[4]; + out[3] = in[6]; + out += 4; + in += 8; + } + return len / 2; + } + + // just memcpy + memcpy(out, in, len); + return len; +} + +esp_err_t ll_cam_set_sample_mode(cam_obj_t *cam, pixformat_t pix_format, uint32_t xclk_freq_hz, uint16_t sensor_pid) +{ + if (pix_format == PIXFORMAT_GRAYSCALE) { + if (sensor_pid == OV3660_PID || sensor_pid == OV5640_PID || sensor_pid == NT99141_PID) { + cam->in_bytes_per_pixel = 1; // camera sends Y8 + } else { + cam->in_bytes_per_pixel = 2; // camera sends YU/YV + } + cam->fb_bytes_per_pixel = 1; // frame buffer stores Y8 + } else if (pix_format == PIXFORMAT_YUV422 || pix_format == PIXFORMAT_RGB565) { + cam->in_bytes_per_pixel = 2; // camera sends YU/YV + cam->fb_bytes_per_pixel = 2; // frame buffer stores YU/YV/RGB565 + } else if (pix_format == PIXFORMAT_JPEG) { + cam->in_bytes_per_pixel = 1; + cam->fb_bytes_per_pixel = 1; + } else { + ESP_LOGE(TAG, "Requested format is not supported"); + return ESP_ERR_NOT_SUPPORTED; + } + return ESP_OK; +} + +// implements function from xclk.c to allow dynamic XCLK change +esp_err_t xclk_timer_conf(int ledc_timer, int xclk_freq_hz) +{ + LCD_CAM.cam_ctrl.cam_clkm_div_b = 0; + LCD_CAM.cam_ctrl.cam_clkm_div_a = 0; + LCD_CAM.cam_ctrl.cam_clkm_div_num = 160000000 / xclk_freq_hz; + LCD_CAM.cam_ctrl.cam_clk_sel = 3;//Select Camera module source clock. 0: no clock. 1: APLL. 2: CLK160. 3: no clock. + LCD_CAM.cam_ctrl.cam_update = 1; + return ESP_OK; +} diff --git a/lib/libesp32_div/esp32-camera/target/private_include/ll_cam.h b/lib/libesp32_div/esp32-camera/target/private_include/ll_cam.h new file mode 100644 index 000000000..7d30c370a --- /dev/null +++ b/lib/libesp32_div/esp32-camera/target/private_include/ll_cam.h @@ -0,0 +1,141 @@ +// Copyright 2010-2020 Espressif Systems (Shanghai) PTE LTD +// +// 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. + +#pragma once + +#include +#include "sdkconfig.h" +#include "esp_idf_version.h" +#if CONFIG_IDF_TARGET_ESP32 +#if ESP_IDF_VERSION_MAJOR >= 4 +#include "esp32/rom/lldesc.h" +#else +#include "rom/lldesc.h" +#endif +#elif CONFIG_IDF_TARGET_ESP32S2 +#include "esp32s2/rom/lldesc.h" +#elif CONFIG_IDF_TARGET_ESP32S3 +#include "esp32s3/rom/lldesc.h" +#endif +#include "esp_log.h" +#include "esp_camera.h" +#include "freertos/FreeRTOS.h" +#include "freertos/queue.h" +#include "freertos/task.h" +#include "freertos/semphr.h" + +#if __has_include("esp_private/periph_ctrl.h") +# include "esp_private/periph_ctrl.h" +#endif + +#define CAMERA_DBG_PIN_ENABLE 0 +#if CAMERA_DBG_PIN_ENABLE + #if CONFIG_IDF_TARGET_ESP32 + #define DBG_PIN_NUM 26 + #else + #define DBG_PIN_NUM 7 + #endif + #include "hal/gpio_ll.h" + #define DBG_PIN_SET(v) gpio_ll_set_level(&GPIO, DBG_PIN_NUM, v) +#else + #define DBG_PIN_SET(v) +#endif + +#define CAM_CHECK(a, str, ret) if (!(a)) { \ + ESP_LOGE(TAG,"%s(%d): %s", __FUNCTION__, __LINE__, str); \ + return (ret); \ + } + +#define CAM_CHECK_GOTO(a, str, lab) if (!(a)) { \ + ESP_LOGE(TAG,"%s(%d): %s", __FUNCTION__, __LINE__, str); \ + goto lab; \ + } + +#define LCD_CAM_DMA_NODE_BUFFER_MAX_SIZE (4092) + +typedef enum { + CAM_IN_SUC_EOF_EVENT = 0, + CAM_VSYNC_EVENT +} cam_event_t; + +typedef enum { + CAM_STATE_IDLE = 0, + CAM_STATE_READ_BUF = 1, +} cam_state_t; + +typedef struct { + camera_fb_t fb; + uint8_t en; + //for RGB/YUV modes + lldesc_t *dma; + size_t fb_offset; +} cam_frame_t; + +typedef struct { + uint32_t dma_bytes_per_item; + uint32_t dma_buffer_size; + uint32_t dma_half_buffer_size; + uint32_t dma_half_buffer_cnt; + uint32_t dma_node_buffer_size; + uint32_t dma_node_cnt; + uint32_t frame_copy_cnt; + + //for JPEG mode + lldesc_t *dma; + uint8_t *dma_buffer; + + cam_frame_t *frames; + + QueueHandle_t event_queue; + QueueHandle_t frame_buffer_queue; + TaskHandle_t task_handle; + intr_handle_t cam_intr_handle; + + uint8_t dma_num;//ESP32-S3 + intr_handle_t dma_intr_handle;//ESP32-S3 + + uint8_t jpeg_mode; + uint8_t vsync_pin; + uint8_t vsync_invert; + uint32_t frame_cnt; + uint32_t recv_size; + bool swap_data; + bool psram_mode; + + //for RGB/YUV modes + uint16_t width; + uint16_t height; + uint8_t in_bytes_per_pixel; + uint8_t fb_bytes_per_pixel; + uint32_t fb_size; + + cam_state_t state; +} cam_obj_t; + + +bool ll_cam_stop(cam_obj_t *cam); +bool ll_cam_start(cam_obj_t *cam, int frame_pos); +esp_err_t ll_cam_config(cam_obj_t *cam, const camera_config_t *config); +esp_err_t ll_cam_deinit(cam_obj_t *cam); +void ll_cam_vsync_intr_enable(cam_obj_t *cam, bool en); +esp_err_t ll_cam_set_pin(cam_obj_t *cam, const camera_config_t *config); +esp_err_t ll_cam_init_isr(cam_obj_t *cam); +void ll_cam_do_vsync(cam_obj_t *cam); +uint8_t ll_cam_get_dma_align(cam_obj_t *cam); +bool ll_cam_dma_sizes(cam_obj_t *cam); +size_t IRAM_ATTR ll_cam_memcpy(cam_obj_t *cam, uint8_t *out, const uint8_t *in, size_t len); +esp_err_t ll_cam_set_sample_mode(cam_obj_t *cam, pixformat_t pix_format, uint32_t xclk_freq_hz, uint16_t sensor_pid); + +// implemented in cam_hal +void ll_cam_send_event(cam_obj_t *cam, cam_event_t cam_event, BaseType_t * HPTaskAwoken); diff --git a/lib/libesp32_div/esp32-camera/target/xclk.c b/lib/libesp32_div/esp32-camera/target/xclk.c new file mode 100644 index 000000000..b5ea53e77 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/target/xclk.c @@ -0,0 +1,64 @@ +#include "driver/gpio.h" +#include "driver/ledc.h" +#include "esp_err.h" +#include "esp_log.h" +#include "esp_system.h" +#include "xclk.h" +#include "esp_camera.h" + +#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) +#include "esp32-hal-log.h" +#else +#include "esp_log.h" +static const char* TAG = "camera_xclk"; +#endif + +static ledc_channel_t g_ledc_channel = 0; + +esp_err_t xclk_timer_conf(int ledc_timer, int xclk_freq_hz) +{ + ledc_timer_config_t timer_conf; + timer_conf.duty_resolution = LEDC_TIMER_1_BIT; + timer_conf.freq_hz = xclk_freq_hz; + timer_conf.speed_mode = LEDC_LOW_SPEED_MODE; + +#if ESP_IDF_VERSION_MAJOR >= 4 + timer_conf.clk_cfg = LEDC_AUTO_CLK; +#endif + timer_conf.timer_num = (ledc_timer_t)ledc_timer; + esp_err_t err = ledc_timer_config(&timer_conf); + if (err != ESP_OK) { + ESP_LOGE(TAG, "ledc_timer_config failed for freq %d, rc=%x", xclk_freq_hz, err); + } + return err; +} + +esp_err_t camera_enable_out_clock(camera_config_t* config) +{ + esp_err_t err = xclk_timer_conf(config->ledc_timer, config->xclk_freq_hz); + if (err != ESP_OK) { + ESP_LOGE(TAG, "ledc_timer_config failed, rc=%x", err); + return err; + } + + g_ledc_channel = config->ledc_channel; + ledc_channel_config_t ch_conf; + ch_conf.gpio_num = config->pin_xclk; + ch_conf.speed_mode = LEDC_LOW_SPEED_MODE; + ch_conf.channel = config->ledc_channel; + ch_conf.intr_type = LEDC_INTR_DISABLE; + ch_conf.timer_sel = config->ledc_timer; + ch_conf.duty = 1; + ch_conf.hpoint = 0; + err = ledc_channel_config(&ch_conf); + if (err != ESP_OK) { + ESP_LOGE(TAG, "ledc_channel_config failed, rc=%x", err); + return err; + } + return ESP_OK; +} + +void camera_disable_out_clock() +{ + ledc_stop(LEDC_LOW_SPEED_MODE, g_ledc_channel, 0); +} diff --git a/lib/libesp32_div/esp32-camera/test/CMakeLists.txt b/lib/libesp32_div/esp32-camera/test/CMakeLists.txt new file mode 100644 index 000000000..a8c3d16b7 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/test/CMakeLists.txt @@ -0,0 +1,4 @@ +idf_component_register(SRC_DIRS . + PRIV_INCLUDE_DIRS . + PRIV_REQUIRES test_utils esp32-camera nvs_flash + EMBED_TXTFILES pictures/testimg.jpeg pictures/test_outside.jpeg pictures/test_inside.jpeg) diff --git a/lib/libesp32_div/esp32-camera/test/component.mk b/lib/libesp32_div/esp32-camera/test/component.mk new file mode 100644 index 000000000..5fb883650 --- /dev/null +++ b/lib/libesp32_div/esp32-camera/test/component.mk @@ -0,0 +1,8 @@ +# +#Component Makefile +# + +COMPONENT_SRCDIRS += ./ +COMPONENT_PRIV_INCLUDEDIRS += ./ + +COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive diff --git a/lib/libesp32_div/esp32-camera/test/pictures/test_inside.jpeg b/lib/libesp32_div/esp32-camera/test/pictures/test_inside.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..92e7bc3694e8568be514673432c3601a8c1c4126 GIT binary patch literal 18832 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 F|Jg`@ubTh> literal 0 HcmV?d00001 diff --git a/lib/libesp32_div/esp32-camera/test/pictures/test_outside.jpeg b/lib/libesp32_div/esp32-camera/test/pictures/test_outside.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..dcb4bf1b3c82c9aa3858223414be90a54a1ff4c6 GIT binary patch literal 81744 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 +#include +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" +#include "unity.h" +#include +#include "esp_log.h" + +#include "esp_camera.h" + +#ifdef CONFIG_IDF_TARGET_ESP32 +#define BOARD_WROVER_KIT 1 +#elif defined CONFIG_IDF_TARGET_ESP32S2 +#define BOARD_CAMERA_MODEL_ESP32S2 1 +#elif defined CONFIG_IDF_TARGET_ESP32S3 +#define BOARD_CAMERA_MODEL_ESP32_S3_EYE 1 +#endif + +// WROVER-KIT PIN Map +#if BOARD_WROVER_KIT + +#define PWDN_GPIO_NUM -1 //power down is not used +#define RESET_GPIO_NUM -1 //software reset will be performed +#define XCLK_GPIO_NUM 21 +#define SIOD_GPIO_NUM 26 +#define SIOC_GPIO_NUM 27 + +#define Y9_GPIO_NUM 35 +#define Y8_GPIO_NUM 34 +#define Y7_GPIO_NUM 39 +#define Y6_GPIO_NUM 36 +#define Y5_GPIO_NUM 19 +#define Y4_GPIO_NUM 18 +#define Y3_GPIO_NUM 5 +#define Y2_GPIO_NUM 4 +#define VSYNC_GPIO_NUM 25 +#define HREF_GPIO_NUM 23 +#define PCLK_GPIO_NUM 22 + +// ESP32Cam (AiThinker) PIN Map +#elif BOARD_ESP32CAM_AITHINKER + +#define PWDN_GPIO_NUM 32 +#define RESET_GPIO_NUM -1 //software reset will be performed +#define XCLK_GPIO_NUM 0 +#define SIOD_GPIO_NUM 26 +#define SIOC_GPIO_NUM 27 + +#define Y9_GPIO_NUM 35 +#define Y8_GPIO_NUM 34 +#define Y7_GPIO_NUM 39 +#define Y6_GPIO_NUM 36 +#define Y5_GPIO_NUM 21 +#define Y4_GPIO_NUM 19 +#define Y3_GPIO_NUM 18 +#define Y2_GPIO_NUM 5 +#define VSYNC_GPIO_NUM 25 +#define HREF_GPIO_NUM 23 +#define PCLK_GPIO_NUM 22 + +#elif BOARD_CAMERA_MODEL_ESP32S2 + +#define PWDN_GPIO_NUM -1 +#define RESET_GPIO_NUM -1 + +#define VSYNC_GPIO_NUM 21 +#define HREF_GPIO_NUM 38 +#define PCLK_GPIO_NUM 11 +#define XCLK_GPIO_NUM 40 + +#define SIOD_GPIO_NUM 17 +#define SIOC_GPIO_NUM 18 + +#define Y9_GPIO_NUM 39 +#define Y8_GPIO_NUM 41 +#define Y7_GPIO_NUM 42 +#define Y6_GPIO_NUM 12 +#define Y5_GPIO_NUM 3 +#define Y4_GPIO_NUM 14 +#define Y3_GPIO_NUM 37 +#define Y2_GPIO_NUM 13 + +#elif BOARD_CAMERA_MODEL_ESP32_S3_EYE + +#define PWDN_GPIO_NUM 43 +#define RESET_GPIO_NUM 44 + +#define VSYNC_GPIO_NUM 6 +#define HREF_GPIO_NUM 7 +#define PCLK_GPIO_NUM 13 +#define XCLK_GPIO_NUM 15 + +#define SIOD_GPIO_NUM 4 +#define SIOC_GPIO_NUM 5 + +#define Y9_GPIO_NUM 16 +#define Y8_GPIO_NUM 17 +#define Y7_GPIO_NUM 18 +#define Y6_GPIO_NUM 12 +#define Y5_GPIO_NUM 11 +#define Y4_GPIO_NUM 10 +#define Y3_GPIO_NUM 9 +#define Y2_GPIO_NUM 8 + +#endif + +static const char *TAG = "test camera"; + +typedef void (*decode_func_t)(uint8_t *jpegbuffer, uint32_t size, uint8_t *outbuffer); + +static esp_err_t init_camera(uint32_t xclk_freq_hz, pixformat_t pixel_format, framesize_t frame_size, uint8_t fb_count) +{ + framesize_t size_bak = frame_size; + if (PIXFORMAT_JPEG == pixel_format && FRAMESIZE_SVGA > frame_size) { + frame_size = FRAMESIZE_HD; + } + camera_config_t camera_config = { + .pin_pwdn = PWDN_GPIO_NUM, + .pin_reset = RESET_GPIO_NUM, + .pin_xclk = XCLK_GPIO_NUM, + .pin_sscb_sda = SIOD_GPIO_NUM, + .pin_sscb_scl = SIOC_GPIO_NUM, + + .pin_d7 = Y9_GPIO_NUM, + .pin_d6 = Y8_GPIO_NUM, + .pin_d5 = Y7_GPIO_NUM, + .pin_d4 = Y6_GPIO_NUM, + .pin_d3 = Y5_GPIO_NUM, + .pin_d2 = Y4_GPIO_NUM, + .pin_d1 = Y3_GPIO_NUM, + .pin_d0 = Y2_GPIO_NUM, + .pin_vsync = VSYNC_GPIO_NUM, + .pin_href = HREF_GPIO_NUM, + .pin_pclk = PCLK_GPIO_NUM, + + //EXPERIMENTAL: Set to 16MHz on ESP32-S2 or ESP32-S3 to enable EDMA mode + .xclk_freq_hz = xclk_freq_hz, + .ledc_timer = LEDC_TIMER_0, + .ledc_channel = LEDC_CHANNEL_0, + + .pixel_format = pixel_format, //YUV422,GRAYSCALE,RGB565,JPEG + .frame_size = frame_size, //QQVGA-UXGA Do not use sizes above QVGA when not JPEG + + .jpeg_quality = 12, //0-63 lower number means higher quality + .fb_count = fb_count, //if more than one, i2s runs in continuous mode. Use only with JPEG + .grab_mode = CAMERA_GRAB_WHEN_EMPTY + }; + + //initialize the camera + esp_err_t ret = esp_camera_init(&camera_config); + + if (ESP_OK == ret && PIXFORMAT_JPEG == pixel_format && FRAMESIZE_SVGA > size_bak) { + sensor_t *s = esp_camera_sensor_get(); + s->set_framesize(s, size_bak); + } + + return ret; +} + +static bool camera_test_fps(uint16_t times, float *fps, uint32_t *size) +{ + *fps = 0.0f; + *size = 0; + uint32_t s = 0; + uint32_t num = 0; + uint64_t total_time = esp_timer_get_time(); + for (size_t i = 0; i < times; i++) { + camera_fb_t *pic = esp_camera_fb_get(); + if (NULL == pic) { + ESP_LOGW(TAG, "fb get failed"); + return 0; + } else { + s += pic->len; + num++; + } + esp_camera_fb_return(pic); + } + total_time = esp_timer_get_time() - total_time; + if (num) { + *fps = num * 1000000.0f / total_time ; + *size = s / num; + } + return 1; +} + +static const char *get_cam_format_name(pixformat_t pixel_format) +{ + switch (pixel_format) { + case PIXFORMAT_JPEG: return "JPEG"; + case PIXFORMAT_RGB565: return "RGB565"; + case PIXFORMAT_RGB888: return "RGB888"; + case PIXFORMAT_YUV422: return "YUV422"; + default: + break; + } + return "UNKNOW"; +} + +static void printf_img_base64(const camera_fb_t *pic) +{ + uint8_t *outbuffer = NULL; + size_t outsize = 0; + if (PIXFORMAT_JPEG != pic->format) { + fmt2jpg(pic->buf, pic->width * pic->height * 2, pic->width, pic->height, pic->format, 50, &outbuffer, &outsize); + } else { + outbuffer = pic->buf; + outsize = pic->len; + } + + uint8_t *base64_buf = calloc(1, outsize * 4); + if (NULL != base64_buf) { + size_t out_len = 0; + mbedtls_base64_encode(base64_buf, outsize * 4, &out_len, outbuffer, outsize); + printf("%s\n", base64_buf); + free(base64_buf); + if (PIXFORMAT_JPEG != pic->format) { + free(outbuffer); + } + } else { + ESP_LOGE(TAG, "malloc for base64 buffer failed"); + } +} + +static void camera_performance_test(uint32_t xclk_freq, uint32_t pic_num) +{ + esp_err_t ret = ESP_OK; + //detect sensor information + TEST_ESP_OK(init_camera(20000000, PIXFORMAT_RGB565, FRAMESIZE_QVGA, 2)); + sensor_t *s = esp_camera_sensor_get(); + camera_sensor_info_t *info = esp_camera_sensor_get_info(&s->id); + TEST_ASSERT_NOT_NULL(info); + TEST_ESP_OK(esp_camera_deinit()); + vTaskDelay(500 / portTICK_RATE_MS); + framesize_t max_size = info->max_size; + pixformat_t all_format[] = {PIXFORMAT_JPEG, PIXFORMAT_RGB565, PIXFORMAT_YUV422, }; + pixformat_t *format_s = &all_format[0]; + pixformat_t *format_e = &all_format[2]; + if (false == info->support_jpeg) { + format_s++; // skip jpeg + } + + struct fps_result { + float fps[FRAMESIZE_INVALID]; + uint32_t size[FRAMESIZE_INVALID]; + }; + struct fps_result results[3] = {0}; + + for (; format_s <= format_e; format_s++) { + for (size_t i = 0; i <= max_size; i++) { + ESP_LOGI(TAG, "\n\n===> Testing format:%s resolution: %d x %d <===", get_cam_format_name(*format_s), resolution[i].width, resolution[i].height); + ret = init_camera(xclk_freq, *format_s, i, 2); + vTaskDelay(100 / portTICK_RATE_MS); + if (ESP_OK != ret) { + ESP_LOGW(TAG, "Testing init failed :-(, skip this item"); + vTaskDelay(500 / portTICK_RATE_MS); + continue; + } + camera_test_fps(pic_num, &results[format_s - all_format].fps[i], &results[format_s - all_format].size[i]); + TEST_ESP_OK(esp_camera_deinit()); + } + } + + printf("FPS Result\n"); + printf("resolution , JPEG fps, JPEG size, RGB565 fps, RGB565 size, YUV422 fps, YUV422 size \n"); + for (size_t i = 0; i <= max_size; i++) { + printf("%4d x %4d , %5.2f, %6d, %5.2f, %7d, %5.2f, %7d \n", + resolution[i].width, resolution[i].height, + results[0].fps[i], results[0].size[i], + results[1].fps[i], results[1].size[i], + results[2].fps[i], results[2].size[i]); + } + printf("----------------------------------------------------------------------------------------\n"); +} + +TEST_CASE("Camera driver init, deinit test", "[camera]") +{ + uint64_t t1 = esp_timer_get_time(); + TEST_ESP_OK(init_camera(20000000, PIXFORMAT_RGB565, FRAMESIZE_QVGA, 2)); + uint64_t t2 = esp_timer_get_time(); + ESP_LOGI(TAG, "Camera init time %llu ms", (t2 - t1) / 1000); + + TEST_ESP_OK(esp_camera_deinit()); +} + +TEST_CASE("Camera driver take RGB565 picture test", "[camera]") +{ + TEST_ESP_OK(init_camera(10000000, PIXFORMAT_RGB565, FRAMESIZE_QVGA, 2)); + vTaskDelay(500 / portTICK_RATE_MS); + ESP_LOGI(TAG, "Taking picture..."); + camera_fb_t *pic = esp_camera_fb_get(); + if (pic) { + ESP_LOGI(TAG, "picture: %d x %d, size: %u", pic->width, pic->height, pic->len); + printf_img_base64(pic); + esp_camera_fb_return(pic); + } + + TEST_ESP_OK(esp_camera_deinit()); + TEST_ASSERT_NOT_NULL(pic); +} + +TEST_CASE("Camera driver take YUV422 picture test", "[camera]") +{ + TEST_ESP_OK(init_camera(10000000, PIXFORMAT_YUV422, FRAMESIZE_QVGA, 2)); + vTaskDelay(500 / portTICK_RATE_MS); + ESP_LOGI(TAG, "Taking picture..."); + camera_fb_t *pic = esp_camera_fb_get(); + if (pic) { + ESP_LOGI(TAG, "picture: %d x %d, size: %u", pic->width, pic->height, pic->len); + printf_img_base64(pic); + esp_camera_fb_return(pic); + } + + TEST_ESP_OK(esp_camera_deinit()); + TEST_ASSERT_NOT_NULL(pic); +} + +TEST_CASE("Camera driver take JPEG picture test", "[camera]") +{ + TEST_ESP_OK(init_camera(20000000, PIXFORMAT_JPEG, FRAMESIZE_QVGA, 2)); + vTaskDelay(500 / portTICK_RATE_MS); + ESP_LOGI(TAG, "Taking picture..."); + camera_fb_t *pic = esp_camera_fb_get(); + if (pic) { + ESP_LOGI(TAG, "picture: %d x %d, size: %u", pic->width, pic->height, pic->len); + printf_img_base64(pic); + esp_camera_fb_return(pic); + } + + TEST_ESP_OK(esp_camera_deinit()); + TEST_ASSERT_NOT_NULL(pic); +} + +TEST_CASE("Camera driver performance test", "[camera]") +{ + camera_performance_test(20 * 1000000, 16); +} + + +static void print_rgb565_img(uint8_t *img, int width, int height) +{ + uint16_t *p = (uint16_t *)img; + const char temp2char[17] = "@MNHQ&#UJ*x7^i;."; + for (size_t j = 0; j < height; j++) { + for (size_t i = 0; i < width; i++) { + uint32_t c = p[j * width + i]; + uint8_t r = c >> 11; + uint8_t g = (c >> 6) & 0x1f; + uint8_t b = c & 0x1f; + c = (r + g + b) / 3; + c >>= 1; + printf("%c", temp2char[15 - c]); + } + printf("\n"); + } +} + +static void print_rgb888_img(uint8_t *img, int width, int height) +{ + uint8_t *p = (uint8_t *)img; + const char temp2char[17] = "@MNHQ&#UJ*x7^i;."; + for (size_t j = 0; j < height; j++) { + for (size_t i = 0; i < width; i++) { + uint8_t *c = p + 3 * (j * width + i); + uint8_t r = *c++; + uint8_t g = *c++; + uint8_t b = *c; + uint32_t v = (r + g + b) / 3; + v >>= 4; + printf("%c", temp2char[15 - v]); + } + printf("\n"); + } +} + +static void tjpgd_decode_rgb565(uint8_t *mjpegbuffer, uint32_t size, uint8_t *outbuffer) +{ + jpg2rgb565(mjpegbuffer, size, outbuffer, JPG_SCALE_NONE); +} + +static void tjpgd_decode_rgb888(uint8_t *mjpegbuffer, uint32_t size, uint8_t *outbuffer) +{ + fmt2rgb888(mjpegbuffer, size, PIXFORMAT_JPEG, outbuffer); +} + +typedef enum { + DECODE_RGB565, + DECODE_RGB888, +} decode_type_t; + +static const decode_func_t g_decode_func[2][2] = { + {tjpgd_decode_rgb565,}, + {tjpgd_decode_rgb888,}, +}; + + +static float jpg_decode_test(uint8_t decoder_index, decode_type_t type, const uint8_t *jpg, uint32_t length, uint32_t img_w, uint32_t img_h, uint32_t times) +{ + uint8_t *jpg_buf = malloc(length); + if (NULL == jpg_buf) { + ESP_LOGE(TAG, "malloc for jpg buffer failed"); + return 0; + } + memcpy(jpg_buf, jpg, length); + + uint8_t *rgb_buf = heap_caps_malloc(img_w * img_h * 3, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT); + if (NULL == rgb_buf) { + free(jpg_buf); + ESP_LOGE(TAG, "malloc for rgb buffer failed"); + return 0; + } + decode_func_t decode = g_decode_func[type][decoder_index]; + decode(jpg_buf, length, rgb_buf); + if (DECODE_RGB565 == type) { + ESP_LOGI(TAG, "jpeg decode to rgb565"); + print_rgb565_img(rgb_buf, img_w, img_h); + } else { + ESP_LOGI(TAG, "jpeg decode to rgb888"); + print_rgb888_img(rgb_buf, img_w, img_h); + } + + uint64_t t_decode[times]; + for (size_t i = 0; i < times; i++) { + uint64_t t1 = esp_timer_get_time(); + decode(jpg_buf, length, rgb_buf); + t_decode[i] = esp_timer_get_time() - t1; + } + + printf("resolution , t \n"); + uint64_t t_total = 0; + for (size_t i = 0; i < times; i++) { + t_total += t_decode[i]; + float t = t_decode[i] / 1000.0f; + printf("%4d x %4d , %5.2f ms \n", img_w, img_h, t); + } + + float fps = times / (t_total / 1000000.0f); + printf("Decode FPS Result\n"); + printf("resolution , fps \n"); + printf("%4d x %4d , %5.2f \n", img_w, img_h, fps); + + free(jpg_buf); + heap_caps_free(rgb_buf); + return fps; +} + +static void img_jpeg_decode_test(uint16_t pic_index, uint16_t lib_index) +{ + extern const uint8_t img1_start[] asm("_binary_testimg_jpeg_start"); + extern const uint8_t img1_end[] asm("_binary_testimg_jpeg_end"); + extern const uint8_t img2_start[] asm("_binary_test_inside_jpeg_start"); + extern const uint8_t img2_end[] asm("_binary_test_inside_jpeg_end"); + extern const uint8_t img3_start[] asm("_binary_test_outside_jpeg_start"); + extern const uint8_t img3_end[] asm("_binary_test_outside_jpeg_end"); + + struct img_t { + const uint8_t *buf; + uint32_t length; + uint16_t w, h; + }; + struct img_t imgs[3] = { + { + .buf = img1_start, + .length = img1_end - img1_start, + .w = 227, + .h = 149, + }, + { + .buf = img2_start, + .length = img2_end - img2_start, + .w = 320, + .h = 240, + }, + { + .buf = img3_start, + .length = img3_end - img3_start, + .w = 480, + .h = 320, + }, + }; + + ESP_LOGI(TAG, "pic_index:%d", pic_index); + ESP_LOGI(TAG, "lib_index:%d", lib_index); + jpg_decode_test(lib_index, DECODE_RGB565, imgs[pic_index].buf, imgs[pic_index].length, imgs[pic_index].w, imgs[pic_index].h, 16); +} + +TEST_CASE("Conversions image 227x149 jpeg decode test", "[camera]") +{ + img_jpeg_decode_test(0, 0); +} + +TEST_CASE("Conversions image 320x240 jpeg decode test", "[camera]") +{ + img_jpeg_decode_test(1, 0); +} + +TEST_CASE("Conversions image 480x320 jpeg decode test", "[camera]") +{ + img_jpeg_decode_test(2, 0); +} diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini index bb8cc70d6..c52786497 100644 --- a/platformio_tasmota_env32.ini +++ b/platformio_tasmota_env32.ini @@ -56,7 +56,7 @@ build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32 extends = env:tasmota32_base board = esp32-cam build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_WEBCAM -lib_extra_dirs = lib/libesp32 +lib_extra_dirs = lib/libesp32, lib/libesp32_div [env:tasmota32-odroidgo] extends = env:tasmota32_base diff --git a/tasmota/support_esp.ino b/tasmota/support_esp.ino index 81b6ee6f6..27a00e108 100644 --- a/tasmota/support_esp.ino +++ b/tasmota/support_esp.ino @@ -139,7 +139,6 @@ String GetDeviceHardware(void) { bool NvmLoad(const char *sNvsName, const char *sName, void *pSettings, unsigned nSettingsLen) { nvs_handle_t handle; -// noInterrupts(); esp_err_t result = nvs_open(sNvsName, NVS_READONLY, &handle); if (result != ESP_OK) { AddLog(LOG_LEVEL_DEBUG, PSTR("NVS: Error %d"), result); @@ -148,32 +147,33 @@ bool NvmLoad(const char *sNvsName, const char *sName, void *pSettings, unsigned size_t size = nSettingsLen; nvs_get_blob(handle, sName, pSettings, &size); nvs_close(handle); -// interrupts(); return true; } void NvmSave(const char *sNvsName, const char *sName, const void *pSettings, unsigned nSettingsLen) { +#ifdef USE_WEBCAM + WcInterrupt(0); // Stop stream if active to fix TG1WDT_SYS_RESET +#endif nvs_handle_t handle; -// noInterrupts(); esp_err_t result = nvs_open(sNvsName, NVS_READWRITE, &handle); if (result != ESP_OK) { AddLog(LOG_LEVEL_DEBUG, PSTR("NVS: Error %d"), result); - return; + } else { + nvs_set_blob(handle, sName, pSettings, nSettingsLen); + nvs_commit(handle); + nvs_close(handle); } - nvs_set_blob(handle, sName, pSettings, nSettingsLen); - nvs_commit(handle); - nvs_close(handle); -// interrupts(); +#ifdef USE_WEBCAM + WcInterrupt(1); +#endif } int32_t NvmErase(const char *sNvsName) { nvs_handle_t handle; -// noInterrupts(); int32_t result = nvs_open(sNvsName, NVS_READWRITE, &handle); if (ESP_OK == result) { result = nvs_erase_all(handle); } if (ESP_OK == result) { result = nvs_commit(handle); } nvs_close(handle); -// interrupts(); return result; } @@ -232,10 +232,7 @@ void SettingsWrite(const void *pSettings, unsigned nSettingsLen) { #ifdef USE_UFILESYS TfsSaveFile(TASM_FILE_SETTINGS, (const uint8_t*)pSettings, nSettingsLen); #endif -#ifdef USE_WEBCAM - if (!WcStreamActive()) -#endif - NvmSave("main", "Settings", pSettings, nSettingsLen); + NvmSave("main", "Settings", pSettings, nSettingsLen); } void QPCRead(void *pSettings, unsigned nSettingsLen) { diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino index 872ad6ace..6ebe7d7d2 100644 --- a/tasmota/tasmota.ino +++ b/tasmota/tasmota.ino @@ -232,8 +232,7 @@ void setup(void) { #ifdef ESP32 #ifdef DISABLE_ESP32_BROWNOUT DisableBrownout(); // Workaround possible weak LDO resulting in brownout detection during Wifi connection -#endif -#endif +#endif // DISABLE_ESP32_BROWNOUT #ifdef CONFIG_IDF_TARGET_ESP32 // restore GPIO16/17 if no PSRAM is found @@ -246,7 +245,9 @@ void setup(void) { gpio_reset_pin(GPIO_NUM_17); } } -#endif +#endif // CONFIG_IDF_TARGET_ESP32 +#endif // ESP32 + RtcPreInit(); SettingsInit(); diff --git a/tasmota/xdrv_50_filesystem.ino b/tasmota/xdrv_50_filesystem.ino index 7150fbd85..0785a7329 100644 --- a/tasmota/xdrv_50_filesystem.ino +++ b/tasmota/xdrv_50_filesystem.ino @@ -287,32 +287,40 @@ bool TfsFileExists(const char *fname){ bool TfsSaveFile(const char *fname, const uint8_t *buf, uint32_t len) { if (!ffs_type) { return false; } - +#ifdef USE_WEBCAM + WcInterrupt(0); // Stop stream if active to fix TG1WDT_SYS_RESET +#endif + bool result = false; File file = ffsp->open(fname, "w"); if (!file) { AddLog(LOG_LEVEL_INFO, PSTR("TFS: Save failed")); - return false; + } else { + // This will timeout on ESP32-webcam + // But now solved with WcInterrupt(0) in support_esp.ino + file.write(buf, len); + /* + // This will still timeout on ESP32-webcam when wcresolution 10 + uint32_t count = len / 512; + uint32_t chunk = len / count; + for (uint32_t i = 0; i < count; i++) { + file.write(buf + (i * chunk), chunk); + // do actually wait a little to allow ESP32 tasks to tick + // fixes task timeout in ESP32Solo1 style unicore code and webcam. + delay(10); + OsWatchLoop(); + } + uint32_t left = len % count; + if (left) { + file.write(buf + (count * chunk), left); + } + */ + file.close(); + result = true; } - -// This will timeout on ESP32-webcam -// file.write(buf, len); - - uint32_t count = len / 512; - uint32_t chunk = len / count; - for (uint32_t i = 0; i < count; i++) { - file.write(buf + (i * chunk), chunk); - // do actually wait a little to allow ESP32 tasks to tick - // fixes task timeout in ESP32Solo1 style unicore code and webcam. - delay(10); - OsWatchLoop(); - } - uint32_t left = len % count; - if (left) { - file.write(buf + (count * chunk), left); - } - - file.close(); - return true; +#ifdef USE_WEBCAM + WcInterrupt(1); +#endif + return result; } bool TfsInitFile(const char *fname, uint32_t len, uint8_t init_value) { diff --git a/tasmota/xdrv_81_esp32_webcam.ino b/tasmota/xdrv_81_esp32_webcam.ino index 273885049..b89bc7930 100644 --- a/tasmota/xdrv_81_esp32_webcam.ino +++ b/tasmota/xdrv_81_esp32_webcam.ino @@ -26,7 +26,7 @@ * {"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: - * WcStream = Control streaming, 0 = stop, 1 = start + * WcInterrupt = Control streaming, 0 = stop, 1 = start * WcResolution = Set resolution 0 = FRAMESIZE_96X96, // 96x96 1 = FRAMESIZE_QQVGA, // 160x120 @@ -78,6 +78,7 @@ #define XDRV_81 81 +#include "cam_hal.h" #include "esp_camera.h" #include "sensor.h" #include "fb_gfx.h" @@ -162,10 +163,21 @@ struct { #endif // ENABLE_RTSPSERVER } Wc; - - /*********************************************************************************************/ +void WcInterrupt(uint32_t state) { + // Stop camera ISR if active to fix TG1WDT_SYS_RESET + if (!Wc.up) { return; } + + if (state) { + // Re-enable interrupts + cam_start(); + } else { + // Stop interrupts + cam_stop(); + } +} + bool WcPinUsed(void) { bool pin_used = true; for (uint32_t i = 0; i < MAX_WEBCAM_DATA; i++) { @@ -711,7 +723,7 @@ void HandleImageBasic(void) { if (Settings->webcam_config.stream) { if (!Wc.CamServer) { - WcStreamControl(); + WcInterruptControl(); } } @@ -871,19 +883,17 @@ uint32_t WcSetStreamserver(uint32_t flag) { return 0; } -void WcStreamControl() { +void WcInterruptControl() { WcSetStreamserver(Settings->webcam_config.stream); WcSetup(Settings->webcam_config.resolution); } -bool WcStreamActive(void) { - return (Wc.stream_active); -} - /*********************************************************************************************/ void WcLoop(void) { + if (4 == Wc.stream_active) { return; } + if (Wc.CamServer) { Wc.CamServer->handleClient(); if (Wc.stream_active) { HandleWebcamMjpegTask(); } @@ -945,7 +955,7 @@ void WcShowStream(void) { if (Settings->webcam_config.stream) { // if (!Wc.CamServer || !Wc.up) { if (!Wc.CamServer) { - WcStreamControl(); + WcInterruptControl(); delay(50); // Give the webcam webserver some time to prepare the stream } if (Wc.CamServer && Wc.up) { @@ -1018,7 +1028,7 @@ void CmndWebcam(void) { void CmndWebcamStream(void) { if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) { Settings->webcam_config.stream = XdrvMailbox.payload; - if (!Settings->webcam_config.stream) { WcStreamControl(); } // Stop stream + if (!Settings->webcam_config.stream) { WcInterruptControl(); } // Stop stream } ResponseCmndStateText(Settings->webcam_config.stream); } @@ -1072,7 +1082,7 @@ void CmndWebcamContrast(void) { } void CmndWebcamInit(void) { - WcStreamControl(); + WcInterruptControl(); ResponseCmndDone(); } From 394ae4961303ad426262eb8b52cbab215da5ef96 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Fri, 17 Dec 2021 18:54:27 +0100 Subject: [PATCH 058/402] fix c3 compile no webcam --- platformio_tasmota_env32.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini index c52786497..7a686762f 100644 --- a/platformio_tasmota_env32.ini +++ b/platformio_tasmota_env32.ini @@ -102,6 +102,7 @@ lib_ignore = TTGO TWatch Library Micro-RTSP epdiy + esp32-camera [env:tasmota32-AF] extends = env:tasmota32_base From 26a7fad65b00547a4677e13719edcc8f6a87b784 Mon Sep 17 00:00:00 2001 From: Stephan Hadinger Date: Fri, 17 Dec 2021 19:41:36 +0100 Subject: [PATCH 059/402] Berry C mapping moved to a separate ``berry_mapping`` library --- CHANGELOG.md | 1 + .../default/be_lvgl_ctypes_definitions.c | 2 +- lib/libesp32/berry/default/be_lvgl_glob_lib.c | 81 ++-- lib/libesp32/berry/default/be_lvgl_module.c | 11 +- .../berry/default/embedded/lvgl_glob.be | 11 +- lib/libesp32/berry/include/be_lvgl.h | 40 -- .../berry_mapping/src/be_class_wrapper.c | 406 ++++++++++++++++++ .../berry_mapping/src/be_const_members.c | 64 +++ lib/libesp32/berry_mapping/src/be_mapping.h | 58 ++- .../berry_mapping/src/be_mapping_utils.c | 97 +++++ lib/libesp32/berry_mapping/src/be_raisef.c | 22 + tasmota/berry/include/be_gpio_defines.h | 2 +- tasmota/lvgl_berry/be_lv_c_mapping.h | 119 ++--- tasmota/xdrv_52_1_berry_native.ino | 350 --------------- tasmota/xdrv_52_3_berry_gpio.ino | 2 +- tasmota/xdrv_52_3_berry_light.ino | 32 +- tasmota/xdrv_52_3_berry_lvgl.ino | 175 +------- tasmota/xdrv_52_3_berry_tasmota.ino | 78 ++-- tasmota/xdrv_52_3_berry_webclient.ino | 2 +- tasmota/xdrv_52_3_berry_webserver.ino | 4 +- tools/lv_berry/convert.py | 22 +- tools/lv_gpio/gpio_convert.py | 2 +- 22 files changed, 843 insertions(+), 738 deletions(-) delete mode 100644 lib/libesp32/berry/include/be_lvgl.h create mode 100644 lib/libesp32/berry_mapping/src/be_class_wrapper.c create mode 100644 lib/libesp32/berry_mapping/src/be_const_members.c create mode 100644 lib/libesp32/berry_mapping/src/be_mapping_utils.c create mode 100644 lib/libesp32/berry_mapping/src/be_raisef.c diff --git a/CHANGELOG.md b/CHANGELOG.md index e5d9a8633..6ca69c83c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -893,6 +893,7 @@ All notable changes to this project will be documented in this file. ### Changed - Triple-mode TLS via configuration in a single firmware (TLS AWS IoT, Letsencrypt and No-TLS) +- Berry C mapping moved to a separate ``berry_mapping`` library ### Fixed - ESP32 PWM range diff --git a/lib/libesp32/berry/default/be_lvgl_ctypes_definitions.c b/lib/libesp32/berry/default/be_lvgl_ctypes_definitions.c index bb1ffb65c..74797a760 100644 --- a/lib/libesp32/berry/default/be_lvgl_ctypes_definitions.c +++ b/lib/libesp32/berry/default/be_lvgl_ctypes_definitions.c @@ -6,7 +6,7 @@ #ifdef USE_LVGL #include "lvgl.h" -#include "be_lvgl.h" +#include "be_mapping.h" /******************************************************************** * Generated code, don't edit diff --git a/lib/libesp32/berry/default/be_lvgl_glob_lib.c b/lib/libesp32/berry/default/be_lvgl_glob_lib.c index 06827fc0e..49848e1dc 100644 --- a/lib/libesp32/berry/default/be_lvgl_glob_lib.c +++ b/lib/libesp32/berry/default/be_lvgl_glob_lib.c @@ -249,7 +249,7 @@ be_local_closure(LVGL_glob_register_obj, /* name */ be_local_closure(LVGL_glob_gen_cb, /* name */ be_nested_proto( 8, /* nstack */ - 5, /* argc */ + 4, /* argc */ 0, /* varg */ 0, /* has upvals */ NULL, /* no upvals */ @@ -281,56 +281,57 @@ be_local_closure(LVGL_glob_gen_cb, /* name */ ), }), 1, /* has constants */ - ( &(const bvalue[ 8]) { /* constants */ - /* K0 */ be_nested_str(lv_event_cb), - /* K1 */ be_nested_str(cb_event_closure), - /* K2 */ be_nested_str(event_cb), - /* K3 */ be_nested_str(tasmota), + ( &(const bvalue[ 9]) { /* constants */ + /* K0 */ be_nested_str(cb), + /* K1 */ be_nested_str(lv_event_cb), + /* K2 */ be_nested_str(cb_event_closure), + /* K3 */ be_nested_str(event_cb), /* K4 */ be_nested_str(gen_cb), /* K5 */ be_nested_str(register_obj), - /* K6 */ be_nested_str(null_cb), - /* K7 */ be_nested_str(cb_do_nothing), + /* K6 */ be_nested_str(_p), + /* K7 */ be_nested_str(null_cb), + /* K8 */ be_nested_str(cb_do_nothing), }), &be_const_str_gen_cb, &be_const_str_solidified, ( &(const binstruction[41]) { /* code */ - 0x1C140300, // 0000 EQ R5 R1 K0 - 0x78160018, // 0001 JMPF R5 #001B - 0x88140101, // 0002 GETMBR R5 R0 K1 - 0x4C180000, // 0003 LDNIL R6 - 0x1C140A06, // 0004 EQ R5 R5 R6 - 0x78160002, // 0005 JMPF R5 #0009 - 0x60140013, // 0006 GETGBL R5 G19 - 0x7C140000, // 0007 CALL R5 0 - 0x90020205, // 0008 SETMBR R0 K1 R5 - 0x88140102, // 0009 GETMBR R5 R0 K2 - 0x4C180000, // 000A LDNIL R6 - 0x1C140A06, // 000B EQ R5 R5 R6 - 0x78160004, // 000C JMPF R5 #0012 - 0xB8160600, // 000D GETNGBL R5 K3 - 0x8C140B04, // 000E GETMET R5 R5 K4 + 0xA4120000, // 0000 IMPORT R4 K0 + 0x1C140701, // 0001 EQ R5 R3 K1 + 0x78160018, // 0002 JMPF R5 #001C + 0x88140102, // 0003 GETMBR R5 R0 K2 + 0x4C180000, // 0004 LDNIL R6 + 0x1C140A06, // 0005 EQ R5 R5 R6 + 0x78160002, // 0006 JMPF R5 #000A + 0x60140013, // 0007 GETGBL R5 G19 + 0x7C140000, // 0008 CALL R5 0 + 0x90020405, // 0009 SETMBR R0 K2 R5 + 0x88140103, // 000A GETMBR R5 R0 K3 + 0x4C180000, // 000B LDNIL R6 + 0x1C140A06, // 000C EQ R5 R5 R6 + 0x78160003, // 000D JMPF R5 #0012 + 0x8C140904, // 000E GETMET R5 R4 K4 0x841C0000, // 000F CLOSURE R7 P0 0x7C140400, // 0010 CALL R5 2 - 0x90020405, // 0011 SETMBR R0 K2 R5 + 0x90020605, // 0011 SETMBR R0 K3 R5 0x8C140105, // 0012 GETMET R5 R0 K5 - 0x5C1C0600, // 0013 MOVE R7 R3 + 0x5C1C0400, // 0013 MOVE R7 R2 0x7C140400, // 0014 CALL R5 2 - 0x88140101, // 0015 GETMBR R5 R0 K1 - 0x98140802, // 0016 SETIDX R5 R4 R2 - 0x88140102, // 0017 GETMBR R5 R0 K2 - 0xA0000000, // 0018 CLOSE R0 - 0x80040A00, // 0019 RET 1 R5 - 0x7002000B, // 001A JMP #0027 - 0x88140106, // 001B GETMBR R5 R0 K6 - 0x4C180000, // 001C LDNIL R6 - 0x1C140A06, // 001D EQ R5 R5 R6 - 0x78160004, // 001E JMPF R5 #0024 - 0xB8160600, // 001F GETNGBL R5 K3 - 0x8C140B04, // 0020 GETMET R5 R5 K4 - 0x881C0107, // 0021 GETMBR R7 R0 K7 + 0x88140506, // 0015 GETMBR R5 R2 K6 + 0x88180102, // 0016 GETMBR R6 R0 K2 + 0x98180A01, // 0017 SETIDX R6 R5 R1 + 0x88140103, // 0018 GETMBR R5 R0 K3 + 0xA0000000, // 0019 CLOSE R0 + 0x80040A00, // 001A RET 1 R5 + 0x7002000A, // 001B JMP #0027 + 0x88140107, // 001C GETMBR R5 R0 K7 + 0x4C180000, // 001D LDNIL R6 + 0x1C140A06, // 001E EQ R5 R5 R6 + 0x78160003, // 001F JMPF R5 #0024 + 0x8C140904, // 0020 GETMET R5 R4 K4 + 0x881C0108, // 0021 GETMBR R7 R0 K8 0x7C140400, // 0022 CALL R5 2 - 0x90020C05, // 0023 SETMBR R0 K6 R5 - 0x88140106, // 0024 GETMBR R5 R0 K6 + 0x90020E05, // 0023 SETMBR R0 K7 R5 + 0x88140107, // 0024 GETMBR R5 R0 K7 0xA0000000, // 0025 CLOSE R0 0x80040A00, // 0026 RET 1 R5 0xA0000000, // 0027 CLOSE R0 diff --git a/lib/libesp32/berry/default/be_lvgl_module.c b/lib/libesp32/berry/default/be_lvgl_module.c index 890efd2ff..bb9b86e3e 100644 --- a/lib/libesp32/berry/default/be_lvgl_module.c +++ b/lib/libesp32/berry/default/be_lvgl_module.c @@ -9,7 +9,7 @@ #ifdef USE_LVGL #include "lvgl.h" -#include "be_lvgl.h" +#include "be_mapping.h" #include "lv_theme_openhasp.h" extern int lv0_member(bvm *vm); // resolve virtual members @@ -34,7 +34,7 @@ static int lv_get_ver_res(void) { } /* `lv` methods */ -const lvbe_call_c_t lv_func[] = { +const be_ntv_func_def_t lv_func[] = { { "clamp_height", (void*) &lv_clamp_height, "i", "iiii" }, { "clamp_width", (void*) &lv_clamp_width, "i", "iiii" }, @@ -111,12 +111,7 @@ const size_t lv_func_size = sizeof(lv_func) / sizeof(lv_func[0]); -typedef struct be_constint_t { - const char * name; - int32_t value; -} be_constint_t; - -const be_constint_t lv0_constants[] = { +const be_const_member_t lv0_constants[] = { { "ALIGN_BOTTOM_LEFT", LV_ALIGN_BOTTOM_LEFT }, { "ALIGN_BOTTOM_MID", LV_ALIGN_BOTTOM_MID }, diff --git a/lib/libesp32/berry/default/embedded/lvgl_glob.be b/lib/libesp32/berry/default/embedded/lvgl_glob.be index 04250ff54..17a62bf31 100644 --- a/lib/libesp32/berry/default/embedded/lvgl_glob.be +++ b/lib/libesp32/berry/default/embedded/lvgl_glob.be @@ -44,20 +44,21 @@ class LVGL_glob f(obj, event) end - def gen_cb(name, f, obj, ptr) - #print('>> gen_cb', name, obj, ptr) + def gen_cb(f, obj, name) + import cb + # print('>> gen_cb', f, name, obj) # record the object, whatever the callback if name == "lv_event_cb" if self.cb_event_closure == nil self.cb_event_closure = {} end - if self.event_cb == nil self.event_cb = tasmota.gen_cb(/ event_ptr -> self.lvgl_event_dispatch(event_ptr)) end # encapsulate 'self' in closure + if self.event_cb == nil self.event_cb = cb.gen_cb(/ event_ptr -> self.lvgl_event_dispatch(event_ptr)) end # encapsulate 'self' in closure self.register_obj(obj) - self.cb_event_closure[ptr] = f + self.cb_event_closure[obj._p] = f return self.event_cb # elif name == "" else - if self.null_cb == nil self.null_cb = tasmota.gen_cb(self.cb_do_nothing) end + if self.null_cb == nil self.null_cb = cb.gen_cb(self.cb_do_nothing) end return self.null_cb end end diff --git a/lib/libesp32/berry/include/be_lvgl.h b/lib/libesp32/berry/include/be_lvgl.h deleted file mode 100644 index 52b5edc2d..000000000 --- a/lib/libesp32/berry/include/be_lvgl.h +++ /dev/null @@ -1,40 +0,0 @@ -/******************************************************************** - * Tasmota LVGL Headers - *******************************************************************/ -#ifndef __BE_LVGL_H__ -#define __BE_LVGL_H__ - -#include "be_constobj.h" - -#ifdef USE_LVGL - -#include "lvgl.h" - -#ifdef __cplusplus -extern "C" { -#endif - // table of functions per class - typedef struct lvbe_call_c_t { - const char * name; - void * func; - const char * return_type; - const char * arg_type; - } lvbe_call_c_t; - - // list of classes and function tables - typedef struct lvbe_call_c_classes_t { - const char * name; - const bclass * cl; - const lvbe_call_c_t * func_table; - size_t size; - } lvbe_call_c_classes_t; - extern const lvbe_call_c_classes_t lv_classes[]; - extern const size_t lv_classes_size; - -#ifdef __cplusplus -} -#endif - -#endif // USE_LVGL - -#endif // __BE_LVGL_H__ \ No newline at end of file diff --git a/lib/libesp32/berry_mapping/src/be_class_wrapper.c b/lib/libesp32/berry_mapping/src/be_class_wrapper.c new file mode 100644 index 000000000..5f71e7da1 --- /dev/null +++ b/lib/libesp32/berry_mapping/src/be_class_wrapper.c @@ -0,0 +1,406 @@ +/*********************************************************************************************\ + * Class wrappers for native objects + * + * These class are simple wrappers (containers) for a pointer of an external object. + * The pointer is stored interanlly by the class. + * + * The constructor of this class must accept the first argument to be `comptr`, + * in such case, the constructor must store the pointer. + * The class is not supposed to free the object at `deinit` time. +\*********************************************************************************************/ + +#include "be_mapping.h" +#include "be_exec.h" +#include + +/*********************************************************************************************\ + * Create an object of `class_name` given an external poinrt `ptr`. + * + * Instanciates the class and calls `init()` with `ptr` wrapped in `comptr` as single arg. + * Both arguments but nost bu NULL. + * + * On return, the created instance is top of stack. +\*********************************************************************************************/ +void be_create_class_wrapper(bvm *vm, const char * class_name, void * ptr) { + if (ptr == NULL) { + be_throw(vm, BE_MALLOC_FAIL); + } + + be_getglobal(vm, class_name); // stack = class + be_call(vm, 0); // instanciate, stack = instance + be_getmember(vm, -1, "init"); // stack = instance, init_func + be_pushvalue(vm, -2); // stack = instance, init_func, instance + be_pushcomptr(vm, ptr); // stack = instance, init_func, instance, ptr + be_call(vm, 2); // stack = instance, ret, instance, ptr + be_pop(vm, 3); // stack = instance +} + + +/*********************************************************************************************\ + * Find an object by global or composite name. + * + * I.e. `lv.lv_object` will check for a global called `lv` and a member `lv_object` + * + * Only supports one level of depth, meaning a class within a module. + * Does not check the type of the object found. + * + * Arguments: + * `name`: can be NULL, in such case considers the member as not found + * + * Case 1: (no dot in name) `lv_wifi_bars` will look for a global variable `lv_wifi_bars` + * Case 2: (dot in name) `lvgl.lv_obj` will get global `lvgl` and look for `lv_obj` within this module + * + * Returns the number of elements pushed on the stack: 1 for module, 2 for instance method, 0 if not found +\*********************************************************************************************/ +int be_find_global_or_module_member(bvm *vm, const char * name) { + char *saveptr; + + if (name == NULL) { + be_pushnil(vm); + return 0; + } + char name_buf[strlen(name)+1]; + strcpy(name_buf, name); + + char * prefix = strtok_r(name_buf, ".", &saveptr); + char * suffix = strtok_r(NULL, ".", &saveptr); + if (suffix) { + if (be_getglobal(vm, prefix)) { + if (be_getmember(vm, -1, suffix)) { + if (be_isinstance(vm, -2)) { // instance, so we need to push method + instance + be_pushvalue(vm, -2); + be_remove(vm, -3); + return 2; + } else { // not instane, so keep only the top object + be_remove(vm, -2); + return 1; + } + } else { + be_pop(vm, 2); + return 0; + } + } + be_pop(vm, 1); // remove nil + return 0; + } else { // no suffix, get the global object + if (be_getglobal(vm, prefix)) { + return 1; + } + be_pop(vm, 1); + return 0; + } +} + + +/*********************************************************************************************\ + * Automatically parse Berry stack and call the C function accordingly + * + * This function takes the n incoming arguments and pushes them as arguments + * on the stack for the C function: + * - be_int -> int32_t + * - be_bool -> int32_t with value 0/1 + * - be_string -> const char * + * - be_instance -> gets the member "_p" and pushes as void* + * + * This works because C silently ignores any unwanted arguments. + * There is a strong requirements that all ints and pointers are 32 bits. + * Float is not supported but could be added. Double cannot be supported because they are 64 bits + * + * Optional argument: + * - return_type: the C function return value is int32_t and is converted to the + * relevant Berry object depending on this char: + * '' (default): nil, no value + * 'i' be_int + * 'b' be_bool + * 's' be_str + * + * - arg_type: optionally check the types of input arguments, or throw an error + * string of argument types, '+' marks optional arguments + * '.' don't care + * 'i' be_int + * 'b' be_bool + * 's' be_string + * 'c' C callback + * '-' ignore and don't send to C function + * 'lv_obj' be_instance of type or subtype + * '^lv_event_cb' callback of a named class - will call `_lvgl.gen_cb(arg_type, closure, self)` and expects a callback address in return + * + * Ex: "oii+s" takes 3 mandatory arguments (obj_instance, int, int) and an optional fourth one [,string] +\*********************************************************************************************/ +// general form of lv_obj_t* function, up to 4 parameters +// We can only send 32 bits arguments (no 64 bits nor double) and we expect pointers to be 32 bits + +// read a single value at stack position idx, convert to int. +// if object instance, get `_p` member and convert it recursively +intptr_t be_convert_single_elt(bvm *vm, int idx, const char * arg_type, const char * gen_cb) { + // berry_log_C("be_convert_single_elt(idx=%i, argtype='%s', gen_cb=%p", idx, arg_type, gen_cb); + int ret = 0; + char provided_type = 0; + idx = be_absindex(vm, idx); // make sure we have an absolute index + + // berry_log_C(">> 0 idx=%i arg_type=%s", idx, arg_type ? arg_type : "NULL"); + if (arg_type == NULL) { arg_type = "."; } // if no type provided, replace with wildchar + size_t arg_type_len = strlen(arg_type); + + // handle callbacks first, since a wrong parameter will always yield to a crash + if (arg_type_len > 1 && arg_type[0] == '^') { // it is a callback + arg_type++; // skip first character + if (be_isclosure(vm, idx)) { + ret = be_find_global_or_module_member(vm, gen_cb); + if (ret) { + be_remove(vm, -3); // stack contains method + instance + be_pushvalue(vm, idx); + be_pushvalue(vm, 1); + be_pushstring(vm, arg_type); + be_call(vm, 2 + ret); + const void * func = be_tocomptr(vm, -(3 + ret)); + be_pop(vm, 3 + ret); + + // berry_log_C("func=%p", func); + return (int32_t) func; + } else { + be_raisef(vm, "type_error", "Can't find callback generator: %s", gen_cb); + } + } else { + be_raise(vm, "type_error", "Closure expected for callback type"); + } + } + + // first convert the value to int32 + if (be_isint(vm, idx)) { ret = be_toint(vm, idx); provided_type = 'i'; } + else if (be_isbool(vm, idx)) { ret = be_tobool(vm, idx); provided_type = 'b'; } + else if (be_isstring(vm, idx)) { ret = (intptr_t) be_tostring(vm, idx); provided_type = 's'; } + else if (be_iscomptr(vm, idx)) { ret = (intptr_t) be_tocomptr(vm, idx); provided_type = 'c'; } + else if (be_isnil(vm, idx)) { ret = 0; provided_type = 'c'; } + + // check if simple type was a match + if (provided_type) { + bbool type_ok = bfalse; + type_ok = (arg_type[0] == '.'); // any type is accepted + type_ok = type_ok || (arg_type[0] == provided_type); // or type is a match + type_ok = type_ok || (ret == 0 && arg_type_len != 1); // or NULL is accepted for an instance + + if (!type_ok) { + be_raisef(vm, "type_error", "Unexpected argument type '%c', expected '%s'", provided_type, arg_type); + } + // berry_log_C("be_convert_single_elt provided type=%i", ret); + return ret; + } + + // berry_log_C("be_convert_single_elt non simple type"); + // non-simple type + if (be_isinstance(vm, idx)) { + // check if the instance is a subclass of `bytes()`` + be_getbuiltin(vm, "bytes"); + if (be_isderived(vm, idx)) { + be_pop(vm, 1); + be_getmember(vm, idx, "_buffer"); + be_pushvalue(vm, idx); + be_call(vm, 1); + int32_t ret = (int32_t) be_tocomptr(vm, -2); + be_pop(vm, 2); + return ret; + } else { + be_pop(vm, 1); + // we accept either `_p` or `.p` attribute to retrieve a pointer + if (!be_getmember(vm, idx, "_p")) { + be_pop(vm, 1); // remove `nil` + be_getmember(vm, idx, ".p"); + } + int32_t ret = be_convert_single_elt(vm, -1, NULL, NULL); // recurse + be_pop(vm, 1); + + if (arg_type_len > 1) { + // Check type + be_classof(vm, idx); + int class_found = be_find_global_or_module_member(vm, arg_type); + // Stack: class_of_idx, class_of_target (or nil) + if (class_found) { + if (!be_isderived(vm, -2)) { + be_raisef(vm, "type_error", "Unexpected class type '%s', expected '%s'", be_classname(vm, idx), arg_type); + } + } else { + be_raisef(vm, "value_error", "Unable to find class '%s' (%d)", arg_type, arg_type_len); + } + be_pop(vm, 2); + } else if (arg_type[0] != '.') { + be_raisef(vm, "value_error", "Unexpected instance type '%s', expected '%s'", be_classname(vm, idx), arg_type); + } + + return ret; + } + } else { + be_raisef(vm, "value_error", "Unexpected '%s'", be_typename(vm, idx)); + } + + return ret; +} + +/*********************************************************************************************\ + * Calling any LVGL function with auto-mapping + * +\*********************************************************************************************/ + +// check input parameters, and create callbacks if needed +// change values in place +// +// Format: +// - either a lowercase character encoding for a simple type +// - 'b': bool +// - 'i': int (int32_t) +// - 's': string (const char *) +// +// - a class name surroungded by parenthesis +// - '(lv_button)' -> lv_button class or derived +// - '[lv_event_cb]' -> callback type, still prefixed with '^' to mark that it is cb +// +void be_check_arg_type(bvm *vm, int arg_start, int argc, const char * arg_type, intptr_t p[8]) { + bbool arg_type_check = (arg_type != NULL); // is type checking activated + int32_t arg_idx = 0; // position in arg_type string + char type_short_name[32]; + + uint32_t p_idx = 0; // index in p[], is incremented with each parameter except '-' + for (uint32_t i = 0; i < argc; i++) { + type_short_name[0] = 0; // clear string + // extract individual type + if (NULL != arg_type) { + switch (arg_type[arg_idx]) { + case '-': + arg_idx++; + continue; // ignore current parameter and advance + case '.': + case 'a'...'z': + type_short_name[0] = arg_type[arg_idx]; + type_short_name[1] = 0; + arg_idx++; + break; + case '(': + case '^': + { + uint32_t prefix = 0; + if (arg_type[arg_idx] == '^') { + type_short_name[0] = '^'; + type_short_name[1] = 0; + prefix = 1; + } + uint32_t offset = 0; + arg_idx++; + while (arg_type[arg_idx + offset] != ')' && arg_type[arg_idx + offset] != '^' && arg_type[arg_idx + offset] != 0 && offset+prefix+1 < sizeof(type_short_name)) { + type_short_name[offset+prefix] = arg_type[arg_idx + offset]; + type_short_name[offset+prefix+1] = 0; + offset++; + } + if (arg_type[arg_idx + offset] == 0) { + arg_type = NULL; // no more parameters, stop iterations + } + arg_idx += offset + 1; + } + break; + case 0: + arg_type = NULL; // stop iterations + break; + } + } + // AddLog(LOG_LEVEL_INFO, ">> 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, "_lvgl.gen_cb"); + } + + // check if we are missing arguments + if (arg_type != NULL && arg_type[arg_idx] != 0) { + be_raisef(vm, "value_error", "Missing arguments, remaining type '%s'", &arg_type[arg_idx]); + } +} + +// +// Internal function +// +// Called for constructors, i.e. C function mapped to Berry `init()` +// +// Pre-conditions: +// The instance must be at stack position `1` (default when calling `init()`) +// +// Arguments: +// vm: point to Berry vm (as usual) +// ptr: the C pointer for internal data (can be NULL), will be stored in an instance variable +// name: name of instance variable to store the pointer as `comptr`. +// If NULL, this function does nothing +// the name can be prefixed with `+`, if so first char is ignored. +// Ex: `+_p` stores in instance variable `_p` +static void be_set_ctor_ptr(bvm *vm, void * ptr, const char *name) { + if (name == NULL) return; // do nothing if no name of attribute + if (name[0] == '+') { name++; } // skip prefix '^' if any + if (strlen(name) == 0) return; // do nothing if name is empty + + be_pushcomptr(vm, ptr); + if (be_setmember(vm, 1, name)) { + be_pop(vm, 1); + } else { + be_raisef(vm, "attribute_error", "Missing member '%s' in ctor", name); + } +} + +/*********************************************************************************************\ + * Call a C function with auto-mapping + * + * Arguments: + * vm: pointer to Berry vm (as ususal) + * func: pointer to C function + * return_type: how to convert the result into a Berry type + * arg_type: string describing the optional and mandatory parameters + * + * Note: the C function mapping supports max 8 arguments and does not directly support + * pointers to values (although it is possible to mimick with classes) +\*********************************************************************************************/ +int be_call_c_func(bvm *vm, void * func, const char * return_type, const char * arg_type) { + intptr_t p[8] = {0,0,0,0,0,0,0,0}; + int argc = be_top(vm); // Get the number of arguments + + // the following describe the active payload for the C function (start and count) + // this is because the `init()` constructor first arg is not passed to the C function + int arg_start = 1; // start with standard values + int arg_count = argc; + + // check if we call a constructor, in this case we store the return type into the new object + // check if we call a constructor with a comptr as first arg + if (return_type && return_type[0] == '+') { + if (argc > 1 && be_iscomptr(vm, 2)) { + void * obj = be_tocomptr(vm, 2); + be_set_ctor_ptr(vm, obj, return_type); + be_return_nil(vm); + } else { + // we need to discard the first arg + arg_start++; + arg_count--; + } + } + + fn_any_callable f = (fn_any_callable) func; + be_check_arg_type(vm, arg_start, arg_count, arg_type, p); + intptr_t ret = (*f)(p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]); + // berry_log_C("be_call_c_func '%s' -> '%s': (%i,%i,%i,%i,%i,%i) -> %i", return_type, arg_type, p[0], p[1], p[2], p[3], p[4], p[5], ret); + + if ((return_type == NULL) || (strlen(return_type) == 0)) { be_return_nil(vm); } // does not return + else if (return_type[0] == '+') { + void * obj = (void*) ret; + be_set_ctor_ptr(vm, obj, return_type); + be_return_nil(vm); + } + else if (strlen(return_type) == 1) { + switch (return_type[0]) { + case '.': // fallback next + case 'i': be_pushint(vm, ret); break; + case 'b': be_pushbool(vm, ret); break; + case 's': be_pushstring(vm, (const char*) ret); break; + case 'c': be_pushint(vm, ret); break; // TODO missing 'c' general callback type + default: be_raise(vm, "internal_error", "Unsupported return type"); break; + } + be_return(vm); + } else { // class name + be_find_global_or_module_member(vm, return_type); + be_pushcomptr(vm, (void*) ret); // stack = class, ptr + be_pushcomptr(vm, (void*) -1); // stack = class, ptr, -1 + be_call(vm, 2); // instanciate with 2 arguments, stack = instance, -1, ptr + be_pop(vm, 2); // stack = instance + be_return(vm); + } +} diff --git a/lib/libesp32/berry_mapping/src/be_const_members.c b/lib/libesp32/berry_mapping/src/be_const_members.c new file mode 100644 index 000000000..7a1a796df --- /dev/null +++ b/lib/libesp32/berry_mapping/src/be_const_members.c @@ -0,0 +1,64 @@ +/*********************************************************************************************\ + * Add const virtual members to classes and modules from C static tables + * + * This allows to creates hundreds of constant members (integers, strings...) + * stored in a C array instead of explicit berry members. + * + * It has the following advantages: + * - consumes much less flash memory, especially with hundreds of members + * - allows C preprocessor to compute the value at compile time (instead of pure numerical numbers) + * - allows to compute pointer addresses to C structures + * + * Takes a pointer to be_const_member_t array and size + * Returns true if a match was found. In such case the result is on Berry stack + * + * Encoding depend on prefix (which is skipped when matching names): + * 1. `COLOR_WHITE` int value + * 3. `$SYMBOL_OK"` string pointer + * 4. `&seg7_font` comptr +\*********************************************************************************************/ + +#include "be_mapping.h" +#include "be_exec.h" +#include +/*********************************************************************************************\ + * Takes a pointer to be_const_member_t array and size + * Returns true if a match was found. In such case the result is on Berry stack + * + * Can be called directly by `member()` function, takes the name of the member from + * berry stack at position 1. + * + * Encoding depend on prefix (which is skipped when matching names): + * 1. `COLOR_WHITE` int value + * 3. `$SYMBOL_OK"` string pointer + * 4. `&seg7_font` comptr + * + * The array must be lexically sorted, but the sort function must ignore the prefix `$` or `&` +\*********************************************************************************************/ +bbool be_const_member(bvm *vm, const be_const_member_t * definitions, size_t def_len) { + int32_t argc = be_top(vm); // Get the number of arguments + if (argc == 1 && be_isstring(vm, 1)) { + const char * needle = be_tostring(vm, 1); + int32_t idx; + + idx = be_map_bin_search(needle, &definitions[0].name, sizeof(definitions[0]), def_len); + if (idx >= 0) { + // we did have a match + const char * key = definitions[idx].name; + switch (key[0]) { + // switch depending on the first char of the key, indicating the type + case '$': // string + be_pushstring(vm, (const char*) definitions[idx].value); + break; + case '&': // native function + be_pushntvfunction(vm, (bntvfunc) definitions[idx].value); + break; + default: // int + be_pushint(vm, definitions[idx].value); + break; + } + return btrue; + } + } + return bfalse; +} \ No newline at end of file diff --git a/lib/libesp32/berry_mapping/src/be_mapping.h b/lib/libesp32/berry_mapping/src/be_mapping.h index 850cd08c0..108db129b 100644 --- a/lib/libesp32/berry_mapping/src/be_mapping.h +++ b/lib/libesp32/berry_mapping/src/be_mapping.h @@ -3,8 +3,64 @@ #ifndef __BE_MAPPING__ #define __BE_MAPPING__ -// include this header to force compilation fo this module +#ifdef __cplusplus +extern "C" { +#endif +#include "berry.h" + +// include this header to force compilation fo this module #define BE_MAX_CB 20 // max number of callbacks, each callback requires a distinct address +/*********************************************************************************************\ + * Support for Berry int constants + * as virtual members + \*********************************************************************************************/ + +typedef intptr_t (*fn_any_callable)(intptr_t p0, intptr_t p1, intptr_t p2, intptr_t p3, + intptr_t p4, intptr_t p5, intptr_t p6, intptr_t p7); + +typedef struct be_const_member_t { + const char * name; + int value; +} be_const_member_t; + +// table of functions per class +typedef struct be_ntv_func_def_t { + const char * name; + void * func; + const char * return_type; + const char * arg_type; +} be_ntv_func_def_t; + +struct bclass; +// list of classes and function tables +typedef struct be_ntv_class_def_t { + const char * name; + const struct bclass * cl; + const be_ntv_func_def_t * func_table; + size_t size; +} be_ntv_class_def_t; + +void be_raisef(bvm *vm, const char *except, const char *msg, ...); + +extern void be_map_insert_int(bvm *vm, const char *key, bint value); +extern void be_map_insert_bool(bvm *vm, const char *key, bbool value); +extern void be_map_insert_real(bvm *vm, const char *key, breal value); +extern void be_map_insert_str(bvm *vm, const char *key, const char *value); +extern void be_map_insert_list_uint8(bvm *vm, const char *key, const uint8_t *value, size_t size); + +extern int be_map_bin_search(const char * needle, const void * table, size_t elt_size, size_t total_elements); + +extern void be_create_class_wrapper(bvm *vm, const char * class_name, void * ptr); +extern int be_find_global_or_module_member(bvm *vm, const char * cl_name); + +extern bbool be_const_member(bvm *vm, const be_const_member_t * definitions, size_t def_len); +extern intptr_t be_convert_single_elt(bvm *vm, int idx, const char * arg_type, const char * gen_cb); +extern void be_check_arg_type(bvm *vm, int arg_start, int argc, const char * arg_type, intptr_t p[8]);; +extern int be_call_c_func(bvm *vm, void * func, const char * return_type, const char * arg_type); + +#ifdef __cplusplus +} +#endif #endif // __BE_MAPPING__ diff --git a/lib/libesp32/berry_mapping/src/be_mapping_utils.c b/lib/libesp32/berry_mapping/src/be_mapping_utils.c new file mode 100644 index 000000000..e3a2cc6e2 --- /dev/null +++ b/lib/libesp32/berry_mapping/src/be_mapping_utils.c @@ -0,0 +1,97 @@ +#include "be_mapping.h" +#include +#include + +/*********************************************************************************************\ + * Helper functions to create a map with single line calls +\*********************************************************************************************/ +/* Insert an int to a key */ +void be_map_insert_int(bvm *vm, const char *key, bint value) +{ + be_pushstring(vm, key); + be_pushint(vm, value); + be_data_insert(vm, -3); + be_pop(vm, 2); +} +/* Insert an bbool to a key */ +void be_map_insert_bool(bvm *vm, const char *key, bbool value) +{ + be_pushstring(vm, key); + be_pushbool(vm, value); + be_data_insert(vm, -3); + be_pop(vm, 2); +} +/* Insert an real to a key */ +/* if value == NAN, ignore */ +void be_map_insert_real(bvm *vm, const char *key, breal value) +{ + if (!isnan(value)) { + be_pushstring(vm, key); + be_pushreal(vm, value); + be_data_insert(vm, -3); + be_pop(vm, 2); + } +} +/* Insert an C string to a key */ +void be_map_insert_str(bvm *vm, const char *key, const char *value) +{ + be_pushstring(vm, key); + be_pushstring(vm, value); + be_data_insert(vm, -3); + be_pop(vm, 2); +} +/* Insert list of bytes as individual integers to a key */ +void be_map_insert_list_uint8(bvm *vm, const char *key, const uint8_t *value, size_t size) +{ + be_pushstring(vm, key); + + be_newobject(vm, "list"); + for (uint32_t i=0; i < size; i++) { + be_pushint(vm, value[i]); + be_data_push(vm, -2); + be_pop(vm, 1); + } + be_pop(vm, 1); // now list is on top + + be_data_insert(vm, -3); // insert into map, key/value + be_pop(vm, 2); // pop both key and value +} + +/*********************************************************************************************\ + * Binary search for dynamic attributes + * + * Names need to be sorted +\*********************************************************************************************/ +// binary search within an array of sorted strings +// the first 4 bytes are a pointer to a string +// returns 0..total_elements-1 or -1 if not found +// +// This version skips the first character of the string if it's not a letter, +// the first character is used to indicate the type of the value associated to the key +int be_map_bin_search(const char * needle, const void * table, size_t elt_size, size_t total_elements) { + int low = 0; + int high = total_elements - 1; + int mid = (low + high) / 2; + // start a dissect + while (low <= high) { + const char * elt = *(const char **) ( ((uint8_t*)table) + mid * elt_size ); + char first_char = elt[0]; + if ( !(first_char >= 'a' && first_char <='z') && !(first_char >= 'A' && first_char <='Z') ) { + elt++; // skip first char + } + int comp = strcmp(needle, elt); + if (comp < 0) { + high = mid - 1; + } else if (comp > 0) { + low = mid + 1; + } else { + break; + } + mid = (low + high) / 2; + } + if (low <= high) { + return mid; + } else { + return -1; + } +} \ No newline at end of file diff --git a/lib/libesp32/berry_mapping/src/be_raisef.c b/lib/libesp32/berry_mapping/src/be_raisef.c new file mode 100644 index 000000000..6d8451bab --- /dev/null +++ b/lib/libesp32/berry_mapping/src/be_raisef.c @@ -0,0 +1,22 @@ +/*********************************************************************************************\ + * Extended version of be_raise() +\*********************************************************************************************/ + +#include "be_mapping.h" +#include "be_exec.h" +#include +#include +#include + +// variant of be_raise with string format +void be_raisef(bvm *vm, const char *except, const char *msg, ...) { + // To save stack space support logging for max text length of 128 characters + char log_data[128]; + + va_list arg; + va_start(arg, msg); + uint32_t len = vsnprintf(log_data, sizeof(log_data)-3, msg, arg); + va_end(arg); + if (len+3 > sizeof(log_data)) { strcat(log_data, "..."); } // Actual data is more + be_raise(vm, except, log_data); +} diff --git a/tasmota/berry/include/be_gpio_defines.h b/tasmota/berry/include/be_gpio_defines.h index 73f37825e..e40219dc4 100644 --- a/tasmota/berry/include/be_gpio_defines.h +++ b/tasmota/berry/include/be_gpio_defines.h @@ -2,7 +2,7 @@ * Generated code, don't edit *******************************************************************/ -const be_constint_t lv_gpio_constants[] = { +const be_const_member_t lv_gpio_constants[] = { { "A4988_DIR", (int32_t) GPIO_A4988_DIR }, { "A4988_ENA", (int32_t) GPIO_A4988_ENA }, diff --git a/tasmota/lvgl_berry/be_lv_c_mapping.h b/tasmota/lvgl_berry/be_lv_c_mapping.h index 553238373..dd654f5f3 100644 --- a/tasmota/lvgl_berry/be_lv_c_mapping.h +++ b/tasmota/lvgl_berry/be_lv_c_mapping.h @@ -8,9 +8,10 @@ extern "C" { #endif #include "be_ctypes.h" +#include "be_mapping.h" /* `lv_style` methods */ -const lvbe_call_c_t lv_style_func[] = { +const be_ntv_func_def_t lv_style_func[] = { { "set_align", (void*) &lv_style_set_align, "", "(lv.lv_style)i" }, { "set_anim_speed", (void*) &lv_style_set_anim_speed, "", "(lv.lv_style)i" }, { "set_anim_time", (void*) &lv_style_set_anim_time, "", "(lv.lv_style)i" }, @@ -103,20 +104,20 @@ const lvbe_call_c_t lv_style_func[] = { }; /* `lv_font` methods */ -const lvbe_call_c_t lv_font_func[] = { +const be_ntv_func_def_t lv_font_func[] = { }; /* `lv_color` methods */ -const lvbe_call_c_t lv_color_func[] = { +const be_ntv_func_def_t lv_color_func[] = { }; /* `lv_theme` methods */ -const lvbe_call_c_t lv_theme_func[] = { +const be_ntv_func_def_t lv_theme_func[] = { }; /* `lv_img` methods */ #ifdef BE_LV_WIDGET_IMG -const lvbe_call_c_t lv_img_func[] = { +const be_ntv_func_def_t lv_img_func[] = { { "get_angle", (void*) &lv_img_get_angle, "i", "(lv.lv_obj)" }, { "get_antialias", (void*) &lv_img_get_antialias, "b", "(lv.lv_obj)" }, { "get_offset_x", (void*) &lv_img_get_offset_x, "i", "(lv.lv_obj)" }, @@ -136,7 +137,7 @@ const lvbe_call_c_t lv_img_func[] = { #endif // BE_LV_WIDGET_IMG /* `lv_disp` methods */ -const lvbe_call_c_t lv_disp_func[] = { +const be_ntv_func_def_t lv_disp_func[] = { { "clean_dcache", (void*) &lv_disp_clean_dcache, "", "(lv.lv_disp)" }, { "dpx", (void*) &lv_disp_dpx, "i", "(lv.lv_disp)i" }, { "get_inactive_time", (void*) &lv_disp_get_inactive_time, "i", "(lv.lv_disp)" }, @@ -154,7 +155,7 @@ const lvbe_call_c_t lv_disp_func[] = { }; /* `lv_obj` methods */ -const lvbe_call_c_t lv_obj_func[] = { +const be_ntv_func_def_t lv_obj_func[] = { { "add_event_cb", (void*) &lv_obj_add_event_cb, "i", "(lv.lv_obj)^lv_event_cb^i." }, { "add_flag", (void*) &lv_obj_add_flag, "", "(lv.lv_obj)i" }, { "add_state", (void*) &lv_obj_add_state, "", "(lv.lv_obj)i" }, @@ -458,7 +459,7 @@ const lvbe_call_c_t lv_obj_func[] = { }; /* `lv_group` methods */ -const lvbe_call_c_t lv_group_func[] = { +const be_ntv_func_def_t lv_group_func[] = { { "add_obj", (void*) &lv_group_add_obj, "", "(lv.lv_group)(lv.lv_obj)" }, { "del", (void*) &lv_group_del, "", "(lv.lv_group)" }, { "focus_freeze", (void*) &lv_group_focus_freeze, "", "(lv.lv_group)b" }, @@ -481,7 +482,7 @@ const lvbe_call_c_t lv_group_func[] = { }; /* `lv_indev` methods */ -const lvbe_call_c_t lv_indev_func[] = { +const be_ntv_func_def_t lv_indev_func[] = { { "enable", (void*) &lv_indev_enable, "", "(lv.lv_indev)b" }, { "get_gesture_dir", (void*) &lv_indev_get_gesture_dir, "i", "(lv.lv_indev)" }, { "get_key", (void*) &lv_indev_get_key, "i", "(lv.lv_indev)" }, @@ -501,7 +502,7 @@ const lvbe_call_c_t lv_indev_func[] = { /* `lv_chart` methods */ #ifdef BE_LV_WIDGET_CHART -const lvbe_call_c_t lv_chart_func[] = { +const be_ntv_func_def_t lv_chart_func[] = { { "get_cursor_point", (void*) &lv_chart_get_cursor_point, "i", "(lv.lv_obj)(lv.lv_chart_cursor)" }, { "get_point_count", (void*) &lv_chart_get_point_count, "i", "(lv.lv_obj)" }, { "get_point_pos_by_id", (void*) &lv_chart_get_point_pos_by_id, "", "(lv.lv_obj)(lv.lv_chart_series)i(lv.lv_point)" }, @@ -537,7 +538,7 @@ const lvbe_call_c_t lv_chart_func[] = { /* `lv_colorwheel` methods */ #ifdef BE_LV_WIDGET_COLORWHEEL -const lvbe_call_c_t lv_colorwheel_func[] = { +const be_ntv_func_def_t lv_colorwheel_func[] = { { "get_color_mode", (void*) &lv_colorwheel_get_color_mode, "i", "(lv.lv_obj)" }, { "get_color_mode_fixed", (void*) &lv_colorwheel_get_color_mode_fixed, "b", "(lv.lv_obj)" }, { "get_hsv", (void*) &lv_colorwheel_get_hsv, "i", "(lv.lv_obj)" }, @@ -551,14 +552,14 @@ const lvbe_call_c_t lv_colorwheel_func[] = { /* `lv_imgbtn` methods */ #ifdef BE_LV_WIDGET_IMGBTN -const lvbe_call_c_t lv_imgbtn_func[] = { +const be_ntv_func_def_t lv_imgbtn_func[] = { { "set_src", (void*) &lv_imgbtn_set_src, "", "(lv.lv_obj)(lv.lv_imgbtn_state)..." }, }; #endif // BE_LV_WIDGET_IMGBTN /* `lv_led` methods */ #ifdef BE_LV_WIDGET_LED -const lvbe_call_c_t lv_led_func[] = { +const be_ntv_func_def_t lv_led_func[] = { { "get_brightness", (void*) &lv_led_get_brightness, "i", "(lv.lv_obj)" }, { "off", (void*) &lv_led_off, "", "(lv.lv_obj)" }, { "on", (void*) &lv_led_on, "", "(lv.lv_obj)" }, @@ -570,7 +571,7 @@ const lvbe_call_c_t lv_led_func[] = { /* `lv_meter` methods */ #ifdef BE_LV_WIDGET_METER -const lvbe_call_c_t lv_meter_func[] = { +const be_ntv_func_def_t lv_meter_func[] = { { "add_arc", (void*) &lv_meter_add_arc, "lv.lv_meter_indicator", "(lv.lv_obj)(lv.lv_meter_scale)i(lv.lv_color)i" }, { "add_needle_img", (void*) &lv_meter_add_needle_img, "lv.lv_meter_indicator", "(lv.lv_obj)(lv.lv_meter_scale).ii" }, { "add_needle_line", (void*) &lv_meter_add_needle_line, "lv.lv_meter_indicator", "(lv.lv_obj)(lv.lv_meter_scale)i(lv.lv_color)i" }, @@ -587,7 +588,7 @@ const lvbe_call_c_t lv_meter_func[] = { /* `lv_msgbox` methods */ #ifdef BE_LV_WIDGET_MSGBOX -const lvbe_call_c_t lv_msgbox_func[] = { +const be_ntv_func_def_t lv_msgbox_func[] = { { "close", (void*) &lv_msgbox_close, "", "(lv.lv_obj)" }, { "get_active_btn_text", (void*) &lv_msgbox_get_active_btn_text, "s", "(lv.lv_obj)" }, { "get_btns", (void*) &lv_msgbox_get_btns, "lv.lv_obj", "(lv.lv_obj)" }, @@ -599,7 +600,7 @@ const lvbe_call_c_t lv_msgbox_func[] = { /* `lv_spinbox` methods */ #ifdef BE_LV_WIDGET_SPINBOX -const lvbe_call_c_t lv_spinbox_func[] = { +const be_ntv_func_def_t lv_spinbox_func[] = { { "decrement", (void*) &lv_spinbox_decrement, "", "(lv.lv_obj)" }, { "get_rollover", (void*) &lv_spinbox_get_rollover, "b", "(lv.lv_obj)" }, { "get_step", (void*) &lv_spinbox_get_step, "i", "(lv.lv_obj)" }, @@ -617,13 +618,13 @@ const lvbe_call_c_t lv_spinbox_func[] = { /* `lv_spinner` methods */ #ifdef BE_LV_WIDGET_SPINNER -const lvbe_call_c_t lv_spinner_func[] = { +const be_ntv_func_def_t lv_spinner_func[] = { }; #endif // BE_LV_WIDGET_SPINNER /* `lv_arc` methods */ #ifdef BE_LV_WIDGET_ARC -const lvbe_call_c_t lv_arc_func[] = { +const be_ntv_func_def_t lv_arc_func[] = { { "get_angle_end", (void*) &lv_arc_get_angle_end, "i", "(lv.lv_obj)" }, { "get_angle_start", (void*) &lv_arc_get_angle_start, "i", "(lv.lv_obj)" }, { "get_bg_angle_end", (void*) &lv_arc_get_bg_angle_end, "i", "(lv.lv_obj)" }, @@ -648,7 +649,7 @@ const lvbe_call_c_t lv_arc_func[] = { /* `lv_bar` methods */ #ifdef BE_LV_WIDGET_BAR -const lvbe_call_c_t lv_bar_func[] = { +const be_ntv_func_def_t lv_bar_func[] = { { "get_max_value", (void*) &lv_bar_get_max_value, "i", "(lv.lv_obj)" }, { "get_min_value", (void*) &lv_bar_get_min_value, "i", "(lv.lv_obj)" }, { "get_mode", (void*) &lv_bar_get_mode, "i", "(lv.lv_obj)" }, @@ -663,13 +664,13 @@ const lvbe_call_c_t lv_bar_func[] = { /* `lv_btn` methods */ #ifdef BE_LV_WIDGET_BTN -const lvbe_call_c_t lv_btn_func[] = { +const be_ntv_func_def_t lv_btn_func[] = { }; #endif // BE_LV_WIDGET_BTN /* `lv_btnmatrix` methods */ #ifdef BE_LV_WIDGET_BTNMATRIX -const lvbe_call_c_t lv_btnmatrix_func[] = { +const be_ntv_func_def_t lv_btnmatrix_func[] = { { "clear_btn_ctrl", (void*) &lv_btnmatrix_clear_btn_ctrl, "", "(lv.lv_obj)i(lv.lv_btnmatrix_ctrl)" }, { "clear_btn_ctrl_all", (void*) &lv_btnmatrix_clear_btn_ctrl_all, "", "(lv.lv_obj)(lv.lv_btnmatrix_ctrl)" }, { "get_btn_text", (void*) &lv_btnmatrix_get_btn_text, "s", "(lv.lv_obj)i" }, @@ -688,7 +689,7 @@ const lvbe_call_c_t lv_btnmatrix_func[] = { /* `lv_canvas` methods */ #ifdef BE_LV_WIDGET_CANVAS -const lvbe_call_c_t lv_canvas_func[] = { +const be_ntv_func_def_t lv_canvas_func[] = { { "blur_hor", (void*) &lv_canvas_blur_hor, "", "(lv.lv_obj)(lv.lv_area)i" }, { "blur_ver", (void*) &lv_canvas_blur_ver, "", "(lv.lv_obj)(lv.lv_area)i" }, { "copy_buf", (void*) &lv_canvas_copy_buf, "", "(lv.lv_obj).iiii" }, @@ -709,7 +710,7 @@ const lvbe_call_c_t lv_canvas_func[] = { /* `lv_checkbox` methods */ #ifdef BE_LV_WIDGET_CHECKBOX -const lvbe_call_c_t lv_checkbox_func[] = { +const be_ntv_func_def_t lv_checkbox_func[] = { { "get_text", (void*) &lv_checkbox_get_text, "s", "(lv.lv_obj)" }, { "set_text", (void*) &lv_checkbox_set_text, "", "(lv.lv_obj)s" }, { "set_text_static", (void*) &lv_checkbox_set_text_static, "", "(lv.lv_obj)s" }, @@ -718,7 +719,7 @@ const lvbe_call_c_t lv_checkbox_func[] = { /* `lv_dropdown` methods */ #ifdef BE_LV_WIDGET_DROPDOWN -const lvbe_call_c_t lv_dropdown_func[] = { +const be_ntv_func_def_t lv_dropdown_func[] = { { "add_option", (void*) &lv_dropdown_add_option, "", "(lv.lv_obj)si" }, { "clear_options", (void*) &lv_dropdown_clear_options, "", "(lv.lv_obj)" }, { "close", (void*) &lv_dropdown_close, "", "(lv.lv_obj)" }, @@ -744,7 +745,7 @@ const lvbe_call_c_t lv_dropdown_func[] = { /* `lv_label` methods */ #ifdef BE_LV_WIDGET_LABEL -const lvbe_call_c_t lv_label_func[] = { +const be_ntv_func_def_t lv_label_func[] = { { "cut_text", (void*) &lv_label_cut_text, "", "(lv.lv_obj)ii" }, { "get_letter_on", (void*) &lv_label_get_letter_on, "i", "(lv.lv_obj)(lv.lv_point)" }, { "get_letter_pos", (void*) &lv_label_get_letter_pos, "", "(lv.lv_obj)i(lv.lv_point)" }, @@ -767,7 +768,7 @@ const lvbe_call_c_t lv_label_func[] = { /* `lv_line` methods */ #ifdef BE_LV_WIDGET_LINE -const lvbe_call_c_t lv_line_func[] = { +const be_ntv_func_def_t lv_line_func[] = { { "get_y_invert", (void*) &lv_line_get_y_invert, "b", "(lv.lv_obj)" }, { "set_points", (void*) &lv_line_set_points, "", "(lv.lv_obj)ii" }, { "set_y_invert", (void*) &lv_line_set_y_invert, "", "(lv.lv_obj)b" }, @@ -776,7 +777,7 @@ const lvbe_call_c_t lv_line_func[] = { /* `lv_roller` methods */ #ifdef BE_LV_WIDGET_ROLLER -const lvbe_call_c_t lv_roller_func[] = { +const be_ntv_func_def_t lv_roller_func[] = { { "get_option_cnt", (void*) &lv_roller_get_option_cnt, "i", "(lv.lv_obj)" }, { "get_options", (void*) &lv_roller_get_options, "s", "(lv.lv_obj)" }, { "get_selected", (void*) &lv_roller_get_selected, "i", "(lv.lv_obj)" }, @@ -789,7 +790,7 @@ const lvbe_call_c_t lv_roller_func[] = { /* `lv_slider` methods */ #ifdef BE_LV_WIDGET_SLIDER -const lvbe_call_c_t lv_slider_func[] = { +const be_ntv_func_def_t lv_slider_func[] = { { "get_left_value", (void*) &lv_slider_get_left_value, "i", "(lv.lv_obj)" }, { "get_max_value", (void*) &lv_slider_get_max_value, "i", "(lv.lv_obj)" }, { "get_min_value", (void*) &lv_slider_get_min_value, "i", "(lv.lv_obj)" }, @@ -805,13 +806,13 @@ const lvbe_call_c_t lv_slider_func[] = { /* `lv_switch` methods */ #ifdef BE_LV_WIDGET_SWITCH -const lvbe_call_c_t lv_switch_func[] = { +const be_ntv_func_def_t lv_switch_func[] = { }; #endif // BE_LV_WIDGET_SWITCH /* `lv_table` methods */ #ifdef BE_LV_WIDGET_TABLE -const lvbe_call_c_t lv_table_func[] = { +const be_ntv_func_def_t lv_table_func[] = { { "add_cell_ctrl", (void*) &lv_table_add_cell_ctrl, "", "(lv.lv_obj)ii(lv.lv_table_cell_ctrl)" }, { "clear_cell_ctrl", (void*) &lv_table_clear_cell_ctrl, "", "(lv.lv_obj)ii(lv.lv_table_cell_ctrl)" }, { "get_cell_value", (void*) &lv_table_get_cell_value, "s", "(lv.lv_obj)ii" }, @@ -830,7 +831,7 @@ const lvbe_call_c_t lv_table_func[] = { /* `lv_textarea` methods */ #ifdef BE_LV_WIDGET_TEXTAREA -const lvbe_call_c_t lv_textarea_func[] = { +const be_ntv_func_def_t lv_textarea_func[] = { { "add_char", (void*) &lv_textarea_add_char, "", "(lv.lv_obj)i" }, { "add_text", (void*) &lv_textarea_add_text, "", "(lv.lv_obj)s" }, { "clear_selection", (void*) &lv_textarea_clear_selection, "", "(lv.lv_obj)" }, @@ -901,7 +902,7 @@ extern const bclass be_class_lv_theme; // map of clases -const lvbe_call_c_classes_t lv_classes[] = { +const be_ntv_class_def_t lv_classes[] = { #ifdef BE_LV_WIDGET_ARC { "lv_arc", &be_class_lv_arc, lv_arc_func, sizeof(lv_arc_func) / sizeof(lv_arc_func[0]) }, #endif // BE_LV_WIDGET_ARC @@ -988,106 +989,106 @@ const size_t lv_classes_size = sizeof(lv_classes) / sizeof(lv_classes[0]); /* `lv_theme` methods */ /* `lv_img` methods */ #ifdef BE_LV_WIDGET_IMG - int be_ntv_lv_img_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_img_create, "+", "(lv.lv_obj)"); } + int be_ntv_lv_img_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_img_create, "+_p", "(lv.lv_obj)"); } #endif // BE_LV_WIDGET_IMG /* `lv_disp` methods */ /* `lv_obj` methods */ - int be_ntv_lv_obj_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_obj_create, "+", "(lv.lv_obj)"); } + int be_ntv_lv_obj_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_obj_create, "+_p", "(lv.lv_obj)"); } /* `lv_group` methods */ - int be_ntv_lv_group_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_group_create, "+", ""); } + int be_ntv_lv_group_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_group_create, "+_p", ""); } /* `lv_indev` methods */ /* `lv_chart` methods */ #ifdef BE_LV_WIDGET_CHART - int be_ntv_lv_chart_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_chart_create, "+", "(lv.lv_obj)"); } + int be_ntv_lv_chart_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_chart_create, "+_p", "(lv.lv_obj)"); } #endif // BE_LV_WIDGET_CHART /* `lv_colorwheel` methods */ #ifdef BE_LV_WIDGET_COLORWHEEL - int be_ntv_lv_colorwheel_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_colorwheel_create, "+", "(lv.lv_obj)b"); } + int be_ntv_lv_colorwheel_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_colorwheel_create, "+_p", "(lv.lv_obj)b"); } #endif // BE_LV_WIDGET_COLORWHEEL /* `lv_imgbtn` methods */ #ifdef BE_LV_WIDGET_IMGBTN - int be_ntv_lv_imgbtn_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_imgbtn_create, "+", "(lv.lv_obj)"); } + int be_ntv_lv_imgbtn_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_imgbtn_create, "+_p", "(lv.lv_obj)"); } #endif // BE_LV_WIDGET_IMGBTN /* `lv_led` methods */ #ifdef BE_LV_WIDGET_LED - int be_ntv_lv_led_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_led_create, "+", "(lv.lv_obj)"); } + int be_ntv_lv_led_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_led_create, "+_p", "(lv.lv_obj)"); } #endif // BE_LV_WIDGET_LED /* `lv_meter` methods */ #ifdef BE_LV_WIDGET_METER - int be_ntv_lv_meter_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_meter_create, "+", "(lv.lv_obj)"); } + int be_ntv_lv_meter_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_meter_create, "+_p", "(lv.lv_obj)"); } #endif // BE_LV_WIDGET_METER /* `lv_msgbox` methods */ #ifdef BE_LV_WIDGET_MSGBOX - int be_ntv_lv_msgbox_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_msgbox_create, "+", "(lv.lv_obj)sssb"); } + int be_ntv_lv_msgbox_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_msgbox_create, "+_p", "(lv.lv_obj)sssb"); } #endif // BE_LV_WIDGET_MSGBOX /* `lv_spinbox` methods */ #ifdef BE_LV_WIDGET_SPINBOX - int be_ntv_lv_spinbox_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_spinbox_create, "+", "(lv.lv_obj)"); } + int be_ntv_lv_spinbox_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_spinbox_create, "+_p", "(lv.lv_obj)"); } #endif // BE_LV_WIDGET_SPINBOX /* `lv_spinner` methods */ #ifdef BE_LV_WIDGET_SPINNER - int be_ntv_lv_spinner_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_spinner_create, "+", "(lv.lv_obj)ii"); } + int be_ntv_lv_spinner_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_spinner_create, "+_p", "(lv.lv_obj)ii"); } #endif // BE_LV_WIDGET_SPINNER /* `lv_arc` methods */ #ifdef BE_LV_WIDGET_ARC - int be_ntv_lv_arc_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_arc_create, "+", "(lv.lv_obj)"); } + int be_ntv_lv_arc_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_arc_create, "+_p", "(lv.lv_obj)"); } #endif // BE_LV_WIDGET_ARC /* `lv_bar` methods */ #ifdef BE_LV_WIDGET_BAR - int be_ntv_lv_bar_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_bar_create, "+", "(lv.lv_obj)"); } + int be_ntv_lv_bar_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_bar_create, "+_p", "(lv.lv_obj)"); } #endif // BE_LV_WIDGET_BAR /* `lv_btn` methods */ #ifdef BE_LV_WIDGET_BTN - int be_ntv_lv_btn_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_btn_create, "+", "(lv.lv_obj)"); } + int be_ntv_lv_btn_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_btn_create, "+_p", "(lv.lv_obj)"); } #endif // BE_LV_WIDGET_BTN /* `lv_btnmatrix` methods */ #ifdef BE_LV_WIDGET_BTNMATRIX - int be_ntv_lv_btnmatrix_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_btnmatrix_create, "+", "(lv.lv_obj)"); } + int be_ntv_lv_btnmatrix_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_btnmatrix_create, "+_p", "(lv.lv_obj)"); } #endif // BE_LV_WIDGET_BTNMATRIX /* `lv_canvas` methods */ #ifdef BE_LV_WIDGET_CANVAS - int be_ntv_lv_canvas_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_canvas_create, "+", "(lv.lv_obj)"); } + int be_ntv_lv_canvas_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_canvas_create, "+_p", "(lv.lv_obj)"); } #endif // BE_LV_WIDGET_CANVAS /* `lv_checkbox` methods */ #ifdef BE_LV_WIDGET_CHECKBOX - int be_ntv_lv_checkbox_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_checkbox_create, "+", "(lv.lv_obj)"); } + int be_ntv_lv_checkbox_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_checkbox_create, "+_p", "(lv.lv_obj)"); } #endif // BE_LV_WIDGET_CHECKBOX /* `lv_dropdown` methods */ #ifdef BE_LV_WIDGET_DROPDOWN - int be_ntv_lv_dropdown_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_dropdown_create, "+", "(lv.lv_obj)"); } + int be_ntv_lv_dropdown_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_dropdown_create, "+_p", "(lv.lv_obj)"); } #endif // BE_LV_WIDGET_DROPDOWN /* `lv_label` methods */ #ifdef BE_LV_WIDGET_LABEL - int be_ntv_lv_label_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_label_create, "+", "(lv.lv_obj)"); } + int be_ntv_lv_label_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_label_create, "+_p", "(lv.lv_obj)"); } #endif // BE_LV_WIDGET_LABEL /* `lv_line` methods */ #ifdef BE_LV_WIDGET_LINE - int be_ntv_lv_line_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_line_create, "+", "(lv.lv_obj)"); } + int be_ntv_lv_line_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_line_create, "+_p", "(lv.lv_obj)"); } #endif // BE_LV_WIDGET_LINE /* `lv_roller` methods */ #ifdef BE_LV_WIDGET_ROLLER - int be_ntv_lv_roller_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_roller_create, "+", "(lv.lv_obj)"); } + int be_ntv_lv_roller_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_roller_create, "+_p", "(lv.lv_obj)"); } #endif // BE_LV_WIDGET_ROLLER /* `lv_slider` methods */ #ifdef BE_LV_WIDGET_SLIDER - int be_ntv_lv_slider_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_slider_create, "+", "(lv.lv_obj)"); } + int be_ntv_lv_slider_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_slider_create, "+_p", "(lv.lv_obj)"); } #endif // BE_LV_WIDGET_SLIDER /* `lv_switch` methods */ #ifdef BE_LV_WIDGET_SWITCH - int be_ntv_lv_switch_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_switch_create, "+", "(lv.lv_obj)"); } + int be_ntv_lv_switch_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_switch_create, "+_p", "(lv.lv_obj)"); } #endif // BE_LV_WIDGET_SWITCH /* `lv_table` methods */ #ifdef BE_LV_WIDGET_TABLE - int be_ntv_lv_table_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_table_create, "+", "(lv.lv_obj)"); } + int be_ntv_lv_table_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_table_create, "+_p", "(lv.lv_obj)"); } #endif // BE_LV_WIDGET_TABLE /* `lv_textarea` methods */ #ifdef BE_LV_WIDGET_TEXTAREA - int be_ntv_lv_textarea_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_textarea_create, "+", "(lv.lv_obj)"); } + int be_ntv_lv_textarea_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_textarea_create, "+_p", "(lv.lv_obj)"); } #endif // BE_LV_WIDGET_TEXTAREA // create font either empty or from parameter on stack -int lvbe_font_create(bvm *vm) { return be_call_c_func(vm, NULL, "+lv_font", ""); } -int lvbe_theme_create(bvm *vm) { return be_call_c_func(vm, NULL, "+lv_theme", ""); } +int lvbe_font_create(bvm *vm) { return be_call_c_func(vm, NULL, "+_p", ""); } +int lvbe_theme_create(bvm *vm) { return be_call_c_func(vm, NULL, "+_p", ""); } #ifdef __cplusplus diff --git a/tasmota/xdrv_52_1_berry_native.ino b/tasmota/xdrv_52_1_berry_native.ino index 2bf1f152e..4481320d7 100644 --- a/tasmota/xdrv_52_1_berry_native.ino +++ b/tasmota/xdrv_52_1_berry_native.ino @@ -26,19 +26,6 @@ const char kTypeError[] PROGMEM = "type_error"; const char kInternalError[] PROGMEM = "intenal_error"; -extern "C" { - - /*********************************************************************************************\ - * Support for Berry int constants - * as virtual members - \*********************************************************************************************/ - typedef struct be_constint_t { - const char * name; - int32_t value; - } be_constint_t; - -} - /*********************************************************************************************\ * LVGL top level virtual members * @@ -76,65 +63,6 @@ extern "C" { return v; } - // variant of be_raise with string format - [[ noreturn ]] void be_raisef(bvm *vm, const char *except, const char *msg, ...) { - // To save stack space support logging for max text length of 128 characters - char log_data[128]; - - va_list arg; - va_start(arg, msg); - uint32_t len = ext_vsnprintf_P(log_data, sizeof(log_data)-3, msg, arg); - va_end(arg); - if (len+3 > sizeof(log_data)) { strcat(log_data, "..."); } // Actual data is more - be_raise(vm, except, log_data); - } - - static void map_insert_int(bvm *vm, const char *key, int value) - { - be_pushstring(vm, key); - be_pushint(vm, value); - be_data_insert(vm, -3); - be_pop(vm, 2); - } - static void map_insert_bool(bvm *vm, const char *key, bool value) - { - be_pushstring(vm, key); - be_pushbool(vm, value); - be_data_insert(vm, -3); - be_pop(vm, 2); - } - // if value == NAN, ignore - static void map_insert_float(bvm *vm, const char *key, float value) - { - if (!isnan(value)) { - be_pushstring(vm, key); - be_pushreal(vm, value); - be_data_insert(vm, -3); - be_pop(vm, 2); - } - } - static void map_insert_str(bvm *vm, const char *key, const char *value) - { - be_pushstring(vm, key); - be_pushstring(vm, value); - be_data_insert(vm, -3); - be_pop(vm, 2); - } - static void map_insert_list_uint8(bvm *vm, const char *key, const uint8_t *value, size_t size) - { - be_pushstring(vm, key); - - be_newobject(vm, "list"); - for (uint32_t i=0; i < size; i++) { - be_pushint(vm, value[i]); - be_data_push(vm, -2); - be_pop(vm, 1); - } - be_pop(vm, 1); // now list is on top - - be_data_insert(vm, -3); // insert into map, key/value - be_pop(vm, 2); // pop both key and value - } int32_t member_find(bvm *vm, const char *key, int32_t default_value) { int32_t ret = default_value; if (be_getmember(vm, -1, key)) { @@ -171,283 +99,6 @@ extern "C" { be_call(vm, 2); // call wirn 2 parameters (implicit instance and key) be_pop(vm, 2); // pop 2 arguments and return value } - - // create an object from the pointer and a class name - // on return, instance is pushed on the stack - void lv_create_object(bvm *vm, const char * class_name, void * ptr); - void lv_create_object(bvm *vm, const char * class_name, void * ptr) { - if (ptr == nullptr) { - be_throw(vm, BE_MALLOC_FAIL); - } - - be_getglobal(vm, class_name); // stack = class - be_call(vm, 0); // instanciate, stack = instance - be_getmember(vm, -1, "init"); // stack = instance, init_func - be_pushvalue(vm, -2); // stack = instance, init_func, instance - be_pushcomptr(vm, ptr); // stack = instance, init_func, instance, ptr - be_call(vm, 2); // stack = instance, ret, instance, ptr - be_pop(vm, 3); // stack = instance - } - - extern void berry_log_C(const char * berry_buf, ...); - // Create a class given a global name or a name within a module - // Case 1: (no dot in name) `lv_wifi_bars` will look for a global variable `lv_wifi_bars` - // Case 2: (dot in name) `lvgl.lv_obj` will import `lvgl` and look for `lv_obj` within this module - // returns true if successful and result is top of stack, or false if not found and `nil` is at top of stack - bbool be_find_class(bvm *vm, const char * cl_name); - bbool be_find_class(bvm *vm, const char * cl_name) { - char *saveptr; - bbool ret = false; - - if (cl_name == NULL) { - be_pushnil(vm); - return ret; - } - // berry_log_C(">> be_find_class %s", cl_name); - char cl_name_buf[strlen(cl_name)+1]; - strcpy(cl_name_buf, cl_name); - - char * prefix = strtok_r(cl_name_buf, ".", &saveptr); - char * suffix = strtok_r(NULL, ".", &saveptr); - if (suffix) { - // berry_log_C(">> be_find_class %s - %s", prefix, suffix); - be_getmodule(vm, prefix); - ret = be_getmember(vm, -1, suffix); - // berry_log_C(">> be_find_class ret=%i", ret); - be_remove(vm, -2); - } else { - ret = be_getglobal(vm, prefix); - } - return ret; - } -} - -/*********************************************************************************************\ - * Binary search for dynamic attributes - * - * Names need to be sorted -\*********************************************************************************************/ -// binary search within an array of sorted strings -// the first 4 bytes are a pointer to a string -// returns 0..total_elements-1 or -1 if not found -// -// This version skips the first character of the string if it's not a letter, -// the first character is used to indicate the type of the value associated to the key -extern "C" { - int32_t bin_search(const char * needle, const void * table, size_t elt_size, size_t total_elements); - int32_t bin_search(const char * needle, const void * table, size_t elt_size, size_t total_elements) { - int32_t low = 0; - int32_t high = total_elements - 1; - int32_t mid = (low + high) / 2; - // start a dissect - while (low <= high) { - const char * elt = *(const char **) ( ((uint8_t*)table) + mid * elt_size ); - char first_char = elt[0]; - if ( !(first_char >= 'a' && first_char <='z') && !(first_char >= 'A' && first_char <='Z') ) { - elt++; // skip first char - } - int32_t comp = strcmp(needle, elt); - if (comp < 0) { - high = mid - 1; - } else if (comp > 0) { - low = mid + 1; - } else { - break; - } - mid = (low + high) / 2; - } - if (low <= high) { - return mid; - } else { - return -1; - } - } -} - -/*********************************************************************************************\ - * Generalized callbacks - * - * Warning, the following expect all parameters to be 32 bits wide -\*********************************************************************************************/ - -/*********************************************************************************************\ - * Automatically parse Berry stack and call the C function accordingly - * - * This function takes the n incoming arguments and pushes them as arguments - * on the stack for the C function: - * - be_int -> int32_t - * - be_bool -> int32_t with value 0/1 - * - be_string -> const char * - * - be_instance -> gets the member "_p" and pushes as void* - * - * This works because C silently ignores any unwanted arguments. - * There is a strong requirements that all ints and pointers are 32 bits. - * Float is not supported but could be added. Double cannot be supported because they are 64 bits - * - * Optional argument: - * - return_type: the C function return value is int32_t and is converted to the - * relevant Berry object depending on this char: - * '' (default): nil, no value - * 'i' be_int - * 'b' be_bool - * 's' be_str - * - * - arg_type: optionally check the types of input arguments, or throw an error - * string of argument types, '+' marks optional arguments - * '.' don't care - * 'i' be_int - * 'b' be_bool - * 's' be_string - * 'c' C callback - * 'lv_obj' be_instance of type or subtype - * '^lv_event_cb' callback of a named class - will call `_lvgl.gen_cb(arg_type, closure, self, lv native pointer)` and expects a callback address in return - * - * Ex: "oii+s" takes 3 mandatory arguments (obj_instance, int, int) and an optional fourth one [,string] -\*********************************************************************************************/ -// general form of lv_obj_t* function, up to 4 parameters -// We can only send 32 bits arguments (no 64 bits nor double) and we expect pointers to be 32 bits - -#define LVBE_LVGL_GLOB "_lvgl" -#define LVBE_LVGL_CB_GEN "gen_cb" - -// read a single value at stack position idx, convert to int. -// if object instance, get `_p` member and convert it recursively -int32_t be_convert_single_elt(bvm *vm, int32_t idx, const char * arg_type = nullptr, void * lv_obj_cb = nullptr) { - int32_t ret = 0; - char provided_type = 0; - idx = be_absindex(vm, idx); // make sure we have an absolute index - - // berry_log_C(">> 0 idx=%i arg_type=%s", idx, arg_type ? arg_type : "NULL"); - if (arg_type == nullptr) { arg_type = "."; } // if no type provided, replace with wildchar - size_t arg_type_len = strlen(arg_type); - - // handle callbacks first, since a wrong parameter will always yield to a crash - if (arg_type_len > 1 && arg_type[0] == '^') { // it is a callback - arg_type++; // skip first character - if (be_isclosure(vm, idx)) { - be_getglobal(vm, LVBE_LVGL_GLOB); - be_getmethod(vm, -1, LVBE_LVGL_CB_GEN); - be_pushvalue(vm, -2); - be_remove(vm, -3); // stack contains method + instance - be_pushstring(vm, arg_type); - be_pushvalue(vm, idx); - be_pushvalue(vm, 1); - be_pushcomptr(vm, lv_obj_cb); - be_call(vm, 5); - const void * func = be_tocomptr(vm, -6); - be_pop(vm, 6); - - // berry_log_C("func=%p", func); - return (int32_t) func; - } else { - be_raise(vm, kTypeError, "Closure expected for callback type"); - } - } - - // first convert the value to int32 - if (be_isint(vm, idx)) { ret = be_toint(vm, idx); provided_type = 'i'; } - else if (be_isbool(vm, idx)) { ret = be_tobool(vm, idx); provided_type = 'b'; } - else if (be_isstring(vm, idx)) { ret = (int32_t) be_tostring(vm, idx); provided_type = 's'; } - else if (be_iscomptr(vm, idx)) { ret = (int32_t) be_tocomptr(vm, idx); provided_type = 'c'; } - - // check if simple type was a match - if (provided_type) { - bool type_ok = false; - type_ok = (arg_type[0] == '.'); // any type is accepted - type_ok = type_ok || (arg_type[0] == provided_type); // or type is a match - type_ok = type_ok || (ret == 0 && arg_type_len != 1); // or NULL is accepted for an instance - - if (!type_ok) { - berry_log_C("Unexpected argument type '%c', expected '%s'", provided_type, arg_type); - } - return ret; - } - - // non-simple type - if (be_isinstance(vm, idx)) { - // check if the instance is a subclass of `bytes()`` - be_getbuiltin(vm, "bytes"); // add "list" class - if (be_isderived(vm, idx)) { - be_pop(vm, 1); - be_getmember(vm, idx, "_buffer"); - be_pushvalue(vm, idx); - be_call(vm, 1); - int32_t ret = (int32_t) be_tocomptr(vm, -2); - be_pop(vm, 2); - return ret; - } else { - be_pop(vm, 1); - be_getmember(vm, idx, "_p"); - int32_t ret = be_convert_single_elt(vm, -1, nullptr); // recurse - be_pop(vm, 1); - - if (arg_type_len > 1) { - // Check type - be_classof(vm, idx); - bool class_found = be_find_class(vm, arg_type); - // Stack: class_of_idx, class_of_target (or nil) - if (class_found) { - if (!be_isderived(vm, -2)) { - berry_log_C("Unexpected class type '%s', expected '%s'", be_classname(vm, idx), arg_type); - } - } else { - berry_log_C("Unable to find class '%s' (%d)", arg_type, arg_type_len); - } - be_pop(vm, 2); - } else if (arg_type[0] != '.') { - berry_log_C("Unexpected instance type '%s', expected '%s'", be_classname(vm, idx), arg_type); - } - - return ret; - } - } else { - be_raise(vm, kTypeError, nullptr); - } - - return ret; -} - -extern "C" { - - /*********************************************************************************************\ - * Generalized virtual members for modules - * - * Takes a pointer to be_constint_t array and size - * Returns true if a match was found. In such case the result is on Berry stack - * - * Encoding depend on prefix (which is skipped when matching names): - * 1. `COLOR_WHITE` int value - * 3. `$SYMBOL_OK"` string pointer - * 4. `&seg7_font` comptr - \*********************************************************************************************/ - bool be_module_member(bvm *vm, const be_constint_t * definitions, size_t def_len); - bool be_module_member(bvm *vm, const be_constint_t * definitions, size_t def_len) { - int32_t argc = be_top(vm); // Get the number of arguments - if (argc == 1 && be_isstring(vm, 1)) { - const char * needle = be_tostring(vm, 1); - int32_t idx; - - idx = bin_search(needle, &definitions[0].name, sizeof(definitions[0]), def_len); - if (idx >= 0) { - // we did have a match - const char * key = definitions[idx].name; - switch (key[0]) { - // switch depending on the first char of the key, indicating the type - case '$': // string - be_pushstring(vm, (const char*) definitions[idx].value); - break; - case '&': // native function - be_pushntvfunction(vm, (bntvfunc) definitions[idx].value); - break; - default: // int - be_pushint(vm, definitions[idx].value); - break; - } - return true; - } - } - return false; - } } /*********************************************************************************************\ @@ -459,7 +110,6 @@ void BrTimeoutStart(void) { if (0 == berry.timeout) { berry.timeout = 1; // rare case when value accidentally computes to zero } - } void BrTimeoutYield(void) { diff --git a/tasmota/xdrv_52_3_berry_gpio.ino b/tasmota/xdrv_52_3_berry_gpio.ino index f694b6444..63f29c258 100644 --- a/tasmota/xdrv_52_3_berry_gpio.ino +++ b/tasmota/xdrv_52_3_berry_gpio.ino @@ -39,7 +39,7 @@ extern "C" { // virtual member int gp_member(bvm *vm); int gp_member(bvm *vm) { - if (be_module_member(vm, lv_gpio_constants, lv_gpio_constants_size)) { + if (be_const_member(vm, lv_gpio_constants, lv_gpio_constants_size)) { be_return(vm); } else { be_return_nil(vm); diff --git a/tasmota/xdrv_52_3_berry_light.ino b/tasmota/xdrv_52_3_berry_light.ino index 19aa3cfb6..89ba735e3 100644 --- a/tasmota/xdrv_52_3_berry_light.ino +++ b/tasmota/xdrv_52_3_berry_light.ino @@ -50,11 +50,11 @@ extern "C" { light_controller.calcLevels(channels); uint8_t bri = light_state.getBri(); - // map_insert_int(vm, "_devices_present", TasmotaGlobal.devices_present); - // map_insert_int(vm, "_light_device", Light.device); - // map_insert_int(vm, "_light_subtype", Light.subtype); - // map_insert_int(vm, "_light_multi", Light.pwm_multi_channels); - // map_insert_int(vm, "_light_linked", light_controller.isCTRGBLinked()); + // be_map_insert_int(vm, "_devices_present", TasmotaGlobal.devices_present); + // be_map_insert_int(vm, "_light_device", Light.device); + // be_map_insert_int(vm, "_light_subtype", Light.subtype); + // be_map_insert_int(vm, "_light_multi", Light.pwm_multi_channels); + // be_map_insert_int(vm, "_light_linked", light_controller.isCTRGBLinked()); if (!Light.pwm_multi_channels) { uint32_t subtype = Light.subtype; // virtual sub-type, for SO37 128 @@ -64,7 +64,7 @@ extern "C" { if (light_controller.isCTRGBLinked() && (light_num == 0)) { data_present = true; // valid combination if (subtype >= LST_RGBW) { - map_insert_str(vm, "colormode", (light_state.getColorMode() & LCM_RGB ? "rgb" : "ct")); + be_map_insert_str(vm, "colormode", (light_state.getColorMode() & LCM_RGB ? "rgb" : "ct")); } } if (!light_controller.isCTRGBLinked()) { @@ -83,33 +83,33 @@ extern "C" { if (data_present) { // see ResponseLightState() - map_insert_bool(vm, "power", bitRead(TasmotaGlobal.power, light_num + Light.device - 1)); - map_insert_int(vm, "bri", bri); + be_map_insert_bool(vm, "power", bitRead(TasmotaGlobal.power, light_num + Light.device - 1)); + be_map_insert_int(vm, "bri", bri); if (subtype >= LST_RGB) { uint16_t hue; uint8_t sat, bri; light_state.getHSB(&hue, &sat, &bri); - map_insert_int(vm, "hue", hue); - map_insert_int(vm, "sat", sat); + be_map_insert_int(vm, "hue", hue); + be_map_insert_int(vm, "sat", sat); } if ((LST_COLDWARM == subtype) || (LST_RGBW <= subtype)) { - map_insert_int(vm, "ct", light_state.getCT()); + be_map_insert_int(vm, "ct", light_state.getCT()); } if (subtype >= LST_RGB) { snprintf(s_rgb, sizeof(s_rgb), PSTR("%02X%02X%02X"), channels[0], channels[1], channels[2]); - map_insert_str(vm, "rgb", s_rgb); + be_map_insert_str(vm, "rgb", s_rgb); } if (subtype > LST_NONE) { - map_insert_list_uint8(vm, "channels", &channels[chanidx], subtype); + be_map_insert_list_uint8(vm, "channels", &channels[chanidx], subtype); } } } else { // Light.pwm_multi_channels if ((light_num >= 0) && (light_num < LST_MAX)) { data_present = true; - map_insert_bool(vm, "power", Light.power & (1 << light_num)); - map_insert_int(vm, "bri", Light.current_color[light_num]); - map_insert_list_uint8(vm, "channels", &channels[light_num], 1); + be_map_insert_bool(vm, "power", Light.power & (1 << light_num)); + be_map_insert_int(vm, "bri", Light.current_color[light_num]); + be_map_insert_list_uint8(vm, "channels", &channels[light_num], 1); } } diff --git a/tasmota/xdrv_52_3_berry_lvgl.ino b/tasmota/xdrv_52_3_berry_lvgl.ino index f0cba617a..f86ed7db7 100644 --- a/tasmota/xdrv_52_3_berry_lvgl.ino +++ b/tasmota/xdrv_52_3_berry_lvgl.ino @@ -23,7 +23,7 @@ #include #include "lvgl.h" -#include "be_lvgl.h" +#include "be_mapping.h" #include "be_ctypes.h" #include "Adafruit_LvGL_Glue.h" @@ -35,6 +35,8 @@ // Berry easy logging extern "C" { extern void berry_log_C(const char * berry_buf, ...); + extern const be_ntv_class_def_t lv_classes[]; + extern const size_t lv_classes_size; } extern Adafruit_LvGL_Glue * glue; @@ -99,80 +101,6 @@ LVBE_globals lvbe; extern void start_lvgl(const char * uconfig); extern void lv_ex_get_started_1(void); -/*********************************************************************************************\ - * Calling any LVGL function with auto-mapping - * -\*********************************************************************************************/ - -// check input parameters, and create callbacks if needed -// change values in place -// -// Format: -// - either a lowercase character encoding for a simple type -// - 'b': bool -// - 'i': int (int32_t) -// - 's': string (const char *) -// -// - a class name surroungded by parenthesis -// - '(lv_button)' -> lv_button class or derived -// - '[lv_event_cb]' -> callback type, still prefixed with '^' to mark that it is cb -// -void be_check_arg_type(bvm *vm, int32_t arg_start, int32_t argc, const char * arg_type, int32_t p[8]); -void be_check_arg_type(bvm *vm, int32_t arg_start, int32_t argc, const char * arg_type, int32_t p[8]) { - bool arg_type_check = (arg_type != nullptr); // is type checking activated - int32_t arg_idx = 0; // position in arg_type string - char type_short_name[32]; - - for (uint32_t i = 0; i < argc; i++) { - type_short_name[0] = 0; // clear string - // extract individual type - if (nullptr != arg_type) { - switch (arg_type[arg_idx]) { - case '.': - case 'a'...'z': - type_short_name[0] = arg_type[arg_idx]; - type_short_name[1] = 0; - arg_idx++; - break; - case '(': - case '^': - { - uint32_t prefix = 0; - if (arg_type[arg_idx] == '^') { - type_short_name[0] = '^'; - type_short_name[1] = 0; - prefix = 1; - } - uint32_t offset = 0; - arg_idx++; - while (arg_type[arg_idx + offset] != ')' && arg_type[arg_idx + offset] != '^' && arg_type[arg_idx + offset] != 0 && offset+prefix+1 < sizeof(type_short_name)) { - type_short_name[offset+prefix] = arg_type[arg_idx + offset]; - type_short_name[offset+prefix+1] = 0; - offset++; - } - if (arg_type[arg_idx + offset] == 0) { - arg_type = nullptr; // no more parameters, stop iterations - } - arg_idx += offset + 1; - } - break; - case 0: - arg_type = nullptr; // stop iterations - break; - } - } - // AddLog(LOG_LEVEL_INFO, ">> be_call_c_func arg %i, type %s", i, arg_type_check ? type_short_name : ""); - p[i] = be_convert_single_elt(vm, i + arg_start, arg_type_check ? type_short_name : nullptr, (void*) p[0]); - } - - // check if we are missing arguments - if (arg_type != nullptr && arg_type[arg_idx] != 0) { - berry_log_C("Missing arguments, remaining type '%s'", &arg_type[arg_idx]); - } -} - -typedef int32_t (*fn_any_callable)(int32_t p0, int32_t p1, int32_t p2, int32_t p3, - int32_t p4, int32_t p5, int32_t p6, int32_t p7); extern "C" { void lv_init_set_member(bvm *vm, int index, void * ptr); @@ -205,15 +133,15 @@ extern "C" { // berry_log_C("lvx_member looking for method '%s' of class '%s'", method_name, class_name); // look for class descriptor - int32_t class_idx = bin_search(class_name, &lv_classes[0].name, sizeof(lv_classes[0]), lv_classes_size); + int32_t class_idx = be_map_bin_search(class_name, &lv_classes[0].name, sizeof(lv_classes[0]), lv_classes_size); if (class_idx >= 0) { - const lvbe_call_c_t * methods_calls = lv_classes[class_idx].func_table; + const be_ntv_func_def_t * methods_calls = lv_classes[class_idx].func_table; size_t methods_size = lv_classes[class_idx].size; - int32_t method_idx = bin_search(method_name, methods_calls, sizeof(lvbe_call_c_t), methods_size); + int32_t method_idx = be_map_bin_search(method_name, methods_calls, sizeof(be_ntv_func_def_t), methods_size); if (method_idx >= 0) { // method found - const lvbe_call_c_t * method = &methods_calls[method_idx]; + const be_ntv_func_def_t * method = &methods_calls[method_idx]; // berry_log_C("lvx_member method found func=%p return_type=%s arg_type=%s", method->func, method->return_type, method->arg_type); // push native closure be_pushntvclosure(vm, &lvx_call_c, 3); // 3 upvals @@ -245,63 +173,6 @@ extern "C" { } be_raise(vm, kTypeError, nullptr); } - - int be_call_c_func(bvm *vm, void * func, const char * return_type, const char * arg_type) { - // AddLog(LOG_LEVEL_INFO, ">> be_call_c_func, func=%p, return_type=%s, arg_type=%s", func, return_type ? return_type : "", arg_type ? arg_type : ""); - int32_t p[8] = {0,0,0,0,0,0,0,0}; - int32_t argc = be_top(vm); // Get the number of arguments - - // the following describe the active payload for the C function (start and count) - // this is because the `init()` constructor first arg is not passed to the C function - int32_t arg_start = 1; // start with standard values - int32_t arg_count = argc; - - // check if we call a constructor, in this case we store the return type into the new object - // check if we call a constructor with a comptr as first arg - if (return_type && return_type[0] == '+') { - if (argc > 1 && be_iscomptr(vm, 2)) { - lv_obj_t * obj = (lv_obj_t*) be_tocomptr(vm, 2); - lv_init_set_member(vm, 1, obj); - be_return_nil(vm); - } else { - // we need to discard the first arg - arg_start++; - arg_count--; - } - } - - fn_any_callable f = (fn_any_callable) func; - // AddLog(LOG_LEVEL_INFO, ">> before be_check_arg_type argc=%i - %i", arg_count, arg_start); - be_check_arg_type(vm, arg_start, arg_count, arg_type, p); - // AddLog(LOG_LEVEL_INFO, ">> be_call_c_func(%p) - %p,%p,%p,%p,%p - %s", f, p[0], p[1], p[2], p[3], p[4], return_type ? return_type : "NULL"); - int32_t ret = (*f)(p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]); - // AddLog(LOG_LEVEL_INFO, ">> be_call_c_func, ret = %p", ret); - if ((return_type == nullptr) || (strlen(return_type) == 0)) { be_return_nil(vm); } // does not return - else if (return_type[0] == '+') { - lv_obj_t * obj = (lv_obj_t*) ret; - lv_init_set_member(vm, 1, obj); - be_return_nil(vm); - } - else if (strlen(return_type) == 1) { - switch (return_type[0]) { - case '.': // fallback next - case 'i': be_pushint(vm, ret); break; - case 'b': be_pushbool(vm, ret); break; - case 's': be_pushstring(vm, (const char*) ret); break; - case 'c': be_pushint(vm, ret); break; // TODO missing 'c' general callback type - default: be_raise(vm, "internal_error", "Unsupported return type"); break; - } - be_return(vm); - } else { // class name - // AddLog(LOG_LEVEL_INFO, ">> be_call_c_func, create_obj ret=%i return_type=%s", ret, return_type); - be_find_class(vm, return_type); - be_pushcomptr(vm, (void*) ret); // stack = class, ptr - be_pushcomptr(vm, (void*) -1); // stack = class, ptr, -1 - be_call(vm, 2); // instanciate with 2 arguments, stack = instance, -1, ptr - be_pop(vm, 2); // stack = instance - be_return(vm); - } - } } /*********************************************************************************************\ @@ -396,7 +267,7 @@ extern "C" { typedef lv_obj_t* (*fn_lvobj__void)(void); // f() -> newly created lv_obj() int lv0_lvobj__void_call(bvm *vm, fn_lvobj__void func) { lv_obj_t * obj = (*func)(); - be_find_class(vm, "lv.lv_obj"); + be_find_global_or_module_member(vm, "lv.lv_obj"); be_pushcomptr(vm, (void*) -1); // stack = class, -1 be_pushcomptr(vm, (void*) obj); // stack = class, -1, ptr be_call(vm, 2); // instanciate, stack = instance (don't call init() ) @@ -413,7 +284,7 @@ extern "C" { if (argc == 1 && be_isstring(vm, 1)) { lv_font_t * font = lv_font_load(be_tostring(vm, 1)); if (font != nullptr) { - be_find_class(vm, "lv.lv_font"); + be_find_global_or_module_member(vm, "lv.lv_font"); be_pushcomptr(vm, font); be_call(vm, 1); be_pop(vm, 1); @@ -441,7 +312,7 @@ extern "C" { lv_font_t * font = info.font; if (font != nullptr) { - be_find_class(vm, "lv.lv_font"); + be_find_global_or_module_member(vm, "lv.lv_font"); be_pushcomptr(vm, font); be_call(vm, 1); be_pop(vm, 1); @@ -637,7 +508,7 @@ extern "C" { be_raisef(vm, "value_error", "unknown font size '%s-%i'", name, size); } - be_find_class(vm, "lv.lv_font"); + be_find_global_or_module_member(vm, "lv.lv_font"); be_pushcomptr(vm, (void*)font_entry->font); be_call(vm, 1); be_pop(vm, 1); @@ -674,10 +545,10 @@ extern "C" { * Responds to virtual constants \*********************************************************************************************/ - extern const lvbe_call_c_t lv_func[]; + extern const be_ntv_func_def_t lv_func[]; extern const size_t lv_func_size; - extern const be_constint_t lv0_constants[]; + extern const be_const_member_t lv0_constants[]; extern const size_t lv0_constants_size; extern const be_ctypes_class_by_name_t be_ctypes_lvgl_classes[]; @@ -686,7 +557,7 @@ extern "C" { int lv0_member(bvm *vm); int lv0_member(bvm *vm) { // first try the standard way - if (be_module_member(vm, lv0_constants, lv0_constants_size)) { + if (be_const_member(vm, lv0_constants, lv0_constants_size)) { be_return(vm); } // try alternative members @@ -698,9 +569,9 @@ extern "C" { // search for a class with this name char cl_prefixed[32]; snprintf(cl_prefixed, sizeof(cl_prefixed), "lv_%s", needle); // we try both actual name and prefixed with `lv_` so both `lv.obj` and `lv.lv_obj` work - idx = bin_search(cl_prefixed, &lv_classes[0].name, sizeof(lv_classes[0]), lv_classes_size); + idx = be_map_bin_search(cl_prefixed, &lv_classes[0].name, sizeof(lv_classes[0]), lv_classes_size); if (idx < 0) { - idx = bin_search(needle, &lv_classes[0].name, sizeof(lv_classes[0]), lv_classes_size); + idx = be_map_bin_search(needle, &lv_classes[0].name, sizeof(lv_classes[0]), lv_classes_size); } if (idx >= 0) { // we did have a match @@ -708,9 +579,9 @@ extern "C" { be_return(vm); } // same search for ctypes - idx = bin_search(cl_prefixed, &be_ctypes_lvgl_classes[0].name, sizeof(be_ctypes_lvgl_classes[0]), be_ctypes_lvgl_classes_size); + idx = be_map_bin_search(cl_prefixed, &be_ctypes_lvgl_classes[0].name, sizeof(be_ctypes_lvgl_classes[0]), be_ctypes_lvgl_classes_size); if (idx < 0) { - idx = bin_search(needle, &be_ctypes_lvgl_classes[0].name, sizeof(be_ctypes_lvgl_classes[0]), be_ctypes_lvgl_classes_size); + idx = be_map_bin_search(needle, &be_ctypes_lvgl_classes[0].name, sizeof(be_ctypes_lvgl_classes[0]), be_ctypes_lvgl_classes_size); } if (idx >= 0) { // we did have a match @@ -719,9 +590,9 @@ extern "C" { } // search for a method with this name - idx = bin_search(needle, &lv_func[0].name, sizeof(lv_func[0]), lv_func_size); + idx = be_map_bin_search(needle, &lv_func[0].name, sizeof(lv_func[0]), lv_func_size); if (idx >= 0) { - const lvbe_call_c_t * method = &lv_func[idx]; + const be_ntv_func_def_t * method = &lv_func[idx]; // push native closure be_pushntvclosure(vm, &lvx_call_c, 3); // 3 upvals @@ -803,7 +674,7 @@ extern "C" { lv_indev_t * indev = lv_indev_drv_register(&lvbe.indev_drv); lvbe.indev_list.addHead(indev); // keep track of indevs - be_find_class(vm, "lv.lv_indev"); + be_find_global_or_module_member(vm, "lv.lv_indev"); be_pushint(vm, (int32_t) indev); be_call(vm, 1); be_pop(vm, 1); @@ -859,7 +730,7 @@ extern "C" { void * obj = nullptr; int argc = be_top(vm); if (argc > 1) { - obj = (void*) be_convert_single_elt(vm, 2); + obj = (void*) be_convert_single_elt(vm, 2, NULL, NULL); } lv_init_set_member(vm, 1, obj); be_return_nil(vm); @@ -885,7 +756,7 @@ extern "C" { lv_style_t * style = nullptr; if (argc > 1) { - style = (lv_style_t*) be_convert_single_elt(vm, 2); + style = (lv_style_t*) be_convert_single_elt(vm, 2, NULL, NULL); } if (style == nullptr) { style = (lv_style_t*) be_malloc(vm, sizeof(lv_style_t)); diff --git a/tasmota/xdrv_52_3_berry_tasmota.ino b/tasmota/xdrv_52_3_berry_tasmota.ino index a9d0ad734..fdff25f1e 100644 --- a/tasmota/xdrv_52_3_berry_tasmota.ino +++ b/tasmota/xdrv_52_3_berry_tasmota.ino @@ -181,10 +181,10 @@ extern "C" { int32_t top = be_top(vm); // Get the number of arguments if (top == 1) { // no argument (instance only) be_newobject(vm, "map"); - map_insert_int(vm, "utc", Rtc.utc_time); - map_insert_int(vm, "local", Rtc.local_time); - map_insert_int(vm, "restart", Rtc.restart_time); - map_insert_int(vm, "timezone", Rtc.time_timezone); + be_map_insert_int(vm, "utc", Rtc.utc_time); + be_map_insert_int(vm, "local", Rtc.local_time); + be_map_insert_int(vm, "restart", Rtc.restart_time); + be_map_insert_int(vm, "timezone", Rtc.time_timezone); be_pop(vm, 1); be_return(vm); } @@ -198,14 +198,14 @@ extern "C" { int32_t top = be_top(vm); // Get the number of arguments if (top == 1) { // no argument (instance only) be_newobject(vm, "map"); - map_insert_int(vm, "flash", ESP.getFlashChipSize() / 1024); - map_insert_int(vm, "program", ESP_getSketchSize() / 1024); - map_insert_int(vm, "program_free", ESP.getFreeSketchSpace() / 1024); - map_insert_int(vm, "heap_free", ESP_getFreeHeap() / 1024); - map_insert_int(vm, "frag", ESP_getHeapFragmentation()); + be_map_insert_int(vm, "flash", ESP.getFlashChipSize() / 1024); + be_map_insert_int(vm, "program", ESP_getSketchSize() / 1024); + be_map_insert_int(vm, "program_free", ESP.getFreeSketchSpace() / 1024); + be_map_insert_int(vm, "heap_free", ESP_getFreeHeap() / 1024); + be_map_insert_int(vm, "frag", ESP_getHeapFragmentation()); if (UsePSRAM()) { - map_insert_int(vm, "psram", ESP.getPsramSize() / 1024); - map_insert_int(vm, "psram_free", ESP.getFreePsram() / 1024); + be_map_insert_int(vm, "psram", ESP.getPsramSize() / 1024); + be_map_insert_int(vm, "psram_free", ESP.getFreePsram() / 1024); } be_pop(vm, 1); be_return(vm); @@ -222,17 +222,17 @@ extern "C" { be_newobject(vm, "map"); if (Settings->flag4.network_wifi) { int32_t rssi = WiFi.RSSI(); - map_insert_int(vm, "rssi", rssi); - map_insert_int(vm, "quality", WifiGetRssiAsQuality(rssi)); + be_map_insert_int(vm, "rssi", rssi); + be_map_insert_int(vm, "quality", WifiGetRssiAsQuality(rssi)); #if LWIP_IPV6 String ipv6_addr = WifiGetIPv6(); if (ipv6_addr != "") { - map_insert_str(vm, "ip6", ipv6_addr.c_str()); + be_map_insert_str(vm, "ip6", ipv6_addr.c_str()); } #endif if (static_cast(WiFi.localIP()) != 0) { - map_insert_str(vm, "mac", WiFi.macAddress().c_str()); - map_insert_str(vm, "ip", WiFi.localIP().toString().c_str()); + be_map_insert_str(vm, "mac", WiFi.macAddress().c_str()); + be_map_insert_str(vm, "ip", WiFi.localIP().toString().c_str()); } } be_pop(vm, 1); @@ -250,8 +250,8 @@ extern "C" { be_newobject(vm, "map"); #ifdef USE_ETHERNET if (static_cast(EthernetLocalIP()) != 0) { - map_insert_str(vm, "mac", EthernetMacAddress().c_str()); - map_insert_str(vm, "ip", EthernetLocalIP().toString().c_str()); + be_map_insert_str(vm, "mac", EthernetMacAddress().c_str()); + be_map_insert_str(vm, "ip", EthernetLocalIP().toString().c_str()); } #endif be_pop(vm, 1); @@ -262,14 +262,14 @@ extern "C" { static void l_push_time(bvm *vm, struct tm *t, const char *unparsed) { be_newobject(vm, "map"); - map_insert_int(vm, "year", t->tm_year + 1900); - map_insert_int(vm, "month", t->tm_mon + 1); - map_insert_int(vm, "day", t->tm_mday); - map_insert_int(vm, "hour", t->tm_hour); - map_insert_int(vm, "min", t->tm_min); - map_insert_int(vm, "sec", t->tm_sec); - map_insert_int(vm, "weekday", t->tm_wday); - if (unparsed) map_insert_str(vm, "unparsed", unparsed); + be_map_insert_int(vm, "year", t->tm_year + 1900); + be_map_insert_int(vm, "month", t->tm_mon + 1); + be_map_insert_int(vm, "day", t->tm_mday); + be_map_insert_int(vm, "hour", t->tm_hour); + be_map_insert_int(vm, "min", t->tm_min); + be_map_insert_int(vm, "sec", t->tm_sec); + be_map_insert_int(vm, "weekday", t->tm_wday); + if (unparsed) be_map_insert_str(vm, "unparsed", unparsed); be_pop(vm, 1); } @@ -332,27 +332,14 @@ extern "C" { // ESP object int32_t l_yield(bvm *vm); int32_t l_yield(bvm *vm) { - BrTimeoutYield(); // reset timeout - be_return_nil(vm); + return be_call_c_func(vm, (void*) &BrTimeoutYield, NULL, "-"); } // Berry: tasmota.scale_uint(int * 5) -> int // int32_t l_scaleuint(struct bvm *vm); int32_t l_scaleuint(struct bvm *vm) { - int32_t top = be_top(vm); // Get the number of arguments - if (top == 6 && be_isint(vm, 2) && be_isint(vm, 3) && be_isint(vm, 4) && be_isint(vm, 5) && be_isint(vm, 6)) { // only 1 argument of type string accepted - int32_t v = be_toint(vm, 2); - int32_t from1 = be_toint(vm, 3); - int32_t from2 = be_toint(vm, 4); - int32_t to1 = be_toint(vm, 5); - int32_t to2 = be_toint(vm, 6); - - int32_t ret = changeUIntScale(v, from1, from2, to1, to2); - be_pushint(vm, ret); - be_return(vm); - } - be_raise(vm, kTypeError, nullptr); + return be_call_c_func(vm, (void*) &changeUIntScale, "i", "-iiiii"); } int32_t l_respCmnd(bvm *vm); @@ -379,20 +366,17 @@ extern "C" { int32_t l_respCmndDone(bvm *vm); int32_t l_respCmndDone(bvm *vm) { - ResponseCmndDone(); - be_return_nil(vm); + return be_call_c_func(vm, (void*) &ResponseCmndDone, NULL, "-"); } int32_t l_respCmndError(bvm *vm); int32_t l_respCmndError(bvm *vm) { - ResponseCmndError(); - be_return_nil(vm); + return be_call_c_func(vm, (void*) &ResponseCmndError, NULL, "-"); } int32_t l_respCmndFailed(bvm *vm); int32_t l_respCmndFailed(bvm *vm) { - ResponseCmndFailed(); - be_return_nil(vm); + return be_call_c_func(vm, (void*) &ResponseCmndFailed, NULL, "-"); } // update XdrvMailbox.command with actual command diff --git a/tasmota/xdrv_52_3_berry_webclient.ino b/tasmota/xdrv_52_3_berry_webclient.ino index 5c1700ebf..625c54622 100644 --- a/tasmota/xdrv_52_3_berry_webclient.ino +++ b/tasmota/xdrv_52_3_berry_webclient.ino @@ -57,7 +57,7 @@ String wc_UrlEncode(const String& text) { /*********************************************************************************************\ * Int constants *********************************************************************************************/ -// const be_constint_t webserver_constants[] = { +// const be_const_member_t webserver_constants[] = { // { "BUTTON_CONFIGURATION", BUTTON_CONFIGURATION }, // { "BUTTON_INFORMATION", BUTTON_INFORMATION }, // { "BUTTON_MAIN", BUTTON_MAIN }, diff --git a/tasmota/xdrv_52_3_berry_webserver.ino b/tasmota/xdrv_52_3_berry_webserver.ino index 2faa223ba..00f260d5a 100644 --- a/tasmota/xdrv_52_3_berry_webserver.ino +++ b/tasmota/xdrv_52_3_berry_webserver.ino @@ -27,7 +27,7 @@ /*********************************************************************************************\ * Int constants *********************************************************************************************/ -const be_constint_t webserver_constants[] = { +const be_const_member_t webserver_constants[] = { { "BUTTON_CONFIGURATION", BUTTON_CONFIGURATION }, { "BUTTON_INFORMATION", BUTTON_INFORMATION }, { "BUTTON_MAIN", BUTTON_MAIN }, @@ -51,7 +51,7 @@ extern "C" { if (argc == 1 && be_isstring(vm, 1)) { const char * needle = be_tostring(vm, 1); - int32_t constant_idx = bin_search(needle, &webserver_constants[0].name, sizeof(webserver_constants[0]), ARRAY_SIZE(webserver_constants)); + int32_t constant_idx = be_map_bin_search(needle, &webserver_constants[0].name, sizeof(webserver_constants[0]), ARRAY_SIZE(webserver_constants)); if (constant_idx >= 0) { // we did have a match, low == high diff --git a/tools/lv_berry/convert.py b/tools/lv_berry/convert.py index a814af381..86a4b86d4 100644 --- a/tools/lv_berry/convert.py +++ b/tools/lv_berry/convert.py @@ -320,13 +320,14 @@ extern "C" { #endif #include "be_ctypes.h" +#include "be_mapping.h" """) for subtype, flv in lv.items(): print(f"/* `lv_{subtype}` methods */") if subtype in lv_widgets: print(f"#ifdef BE_LV_WIDGET_{subtype.upper()}") - print(f"const lvbe_call_c_t lv_{subtype}_func[] = {{") + print(f"const be_ntv_func_def_t lv_{subtype}_func[] = {{") func_out = {} # used to sort output for f in flv: @@ -361,7 +362,7 @@ print() # print the global map of classes print(f""" // map of clases -const lvbe_call_c_classes_t lv_classes[] = {{""") +const be_ntv_class_def_t lv_classes[] = {{""") for subtype in sorted(lv): # for subtype, flv in lv.items(): @@ -391,7 +392,7 @@ for subtype, flv in lv.items(): if len(c_ret_type) > 1: c_ret_type = "lv." + c_ret_type if c_func_name.endswith("_create"): - c_ret_type = "+" # constructor, init method does not return any value + c_ret_type = "+_p" # constructor, init method does not return any value if subtype in lv_widgets: print(f"#ifdef BE_LV_WIDGET_{subtype.upper()}") print(f" int be_ntv_lv_{subtype}_init(bvm *vm) {{ return be_call_c_func(vm, (void*) &{orig_func_name}, \"{c_ret_type}\", { c_argc if c_argc else 'nullptr'}); }}") @@ -401,8 +402,8 @@ for subtype, flv in lv.items(): print(""" // create font either empty or from parameter on stack -int lvbe_font_create(bvm *vm) { return be_call_c_func(vm, NULL, "+lv_font", ""); } -int lvbe_theme_create(bvm *vm) { return be_call_c_func(vm, NULL, "+lv_theme", ""); } +int lvbe_font_create(bvm *vm) { return be_call_c_func(vm, NULL, "+_p", ""); } +int lvbe_theme_create(bvm *vm) { return be_call_c_func(vm, NULL, "+_p", ""); } """) print() @@ -660,7 +661,7 @@ print("""/******************************************************************** #ifdef USE_LVGL #include "lvgl.h" -#include "be_lvgl.h" +#include "be_mapping.h" #include "lv_theme_openhasp.h" extern int lv0_member(bvm *vm); // resolve virtual members @@ -685,7 +686,7 @@ static int lv_get_ver_res(void) { } /* `lv` methods */ -const lvbe_call_c_t lv_func[] = { +const be_ntv_func_def_t lv_func[] = { """) func_out = {} # used to sort output @@ -728,12 +729,7 @@ const size_t lv_func_size = sizeof(lv_func) / sizeof(lv_func[0]); print(""" -typedef struct be_constint_t { - const char * name; - int32_t value; -} be_constint_t; - -const be_constint_t lv0_constants[] = { +const be_const_member_t lv0_constants[] = { """) lv_module2 = {} diff --git a/tools/lv_gpio/gpio_convert.py b/tools/lv_gpio/gpio_convert.py index dfa3d78f0..6232fd287 100644 --- a/tools/lv_gpio/gpio_convert.py +++ b/tools/lv_gpio/gpio_convert.py @@ -56,7 +56,7 @@ print(" * Generated code, don't edit") print(" *******************************************************************/") print(""" -const be_constint_t lv_gpio_constants[] = { +const be_const_member_t lv_gpio_constants[] = { """) lv_module2 = {} From e5479cdc9643391af8c7fb3e3d888829b11dc9e3 Mon Sep 17 00:00:00 2001 From: Stephan Hadinger Date: Sat, 18 Dec 2021 11:47:03 +0100 Subject: [PATCH 060/402] Berry move LVGL mapping to its own library --- lib/libesp32/berry/default/be_modtab.c | 9 +- lib/libesp32/berry/gen.sh | 2 +- .../berry_mapping/src/be_class_wrapper.c | 24 +- lib/libesp32/berry_mapping/src/be_mapping.h | 1 + .../lv_berry/generate/be_lv_c_mapping.h | 1097 +++++++++++++++++ .../lv_berry/generate}/be_lvgl_module.c | 4 - .../lv_berry/generate}/be_lvgl_widgets_lib.c | 5 - lib/libesp32_lvgl/lv_berry/library.json | 25 + .../libesp32_lvgl/lv_berry/mapping}/lv_enum.h | 0 .../lv_berry/mapping}/lv_funcs.h | 110 +- .../src}/be_lvgl_ctypes_definitions.c | 4 - .../lv_berry/src}/be_lvgl_glob_lib.c | 6 - .../lv_berry/src}/embedded/lvgl_glob.be | 0 lib/libesp32_lvgl/lv_berry/src/lv_berry.c | 11 + lib/libesp32_lvgl/lv_berry/src/lv_berry.h | 17 + .../libesp32_lvgl/lv_berry/tools}/convert.py | 17 +- .../lv_berry/tools}/preprocessor.py | 10 +- lib/libesp32_lvgl/{LVGL8 => lvgl}/Kconfig | 0 lib/libesp32_lvgl/{LVGL8 => lvgl}/LICENCE.txt | 0 lib/libesp32_lvgl/{LVGL8 => lvgl}/README.md | 0 .../{LVGL8 => lvgl}/library.json | 0 .../{LVGL8 => lvgl}/library.properties | 0 .../{LVGL8 => lvgl}/lv_conf_template.h | 0 lib/libesp32_lvgl/{LVGL8 => lvgl}/lvgl.h | 0 lib/libesp32_lvgl/{LVGL8 => lvgl}/lvgl.mk | 0 .../{LVGL8 => lvgl}/src/core/lv_core.mk | 0 .../{LVGL8 => lvgl}/src/core/lv_disp.c | 0 .../{LVGL8 => lvgl}/src/core/lv_disp.h | 0 .../{LVGL8 => lvgl}/src/core/lv_event.c | 0 .../{LVGL8 => lvgl}/src/core/lv_event.h | 0 .../{LVGL8 => lvgl}/src/core/lv_group.c | 0 .../{LVGL8 => lvgl}/src/core/lv_group.h | 0 .../{LVGL8 => lvgl}/src/core/lv_indev.c | 0 .../{LVGL8 => lvgl}/src/core/lv_indev.h | 0 .../src/core/lv_indev_scroll.c | 0 .../src/core/lv_indev_scroll.h | 0 .../{LVGL8 => lvgl}/src/core/lv_obj.c | 0 .../{LVGL8 => lvgl}/src/core/lv_obj.h | 0 .../{LVGL8 => lvgl}/src/core/lv_obj_class.c | 0 .../{LVGL8 => lvgl}/src/core/lv_obj_class.h | 0 .../{LVGL8 => lvgl}/src/core/lv_obj_draw.c | 0 .../{LVGL8 => lvgl}/src/core/lv_obj_draw.h | 0 .../{LVGL8 => lvgl}/src/core/lv_obj_pos.c | 0 .../{LVGL8 => lvgl}/src/core/lv_obj_pos.h | 0 .../{LVGL8 => lvgl}/src/core/lv_obj_scroll.c | 0 .../{LVGL8 => lvgl}/src/core/lv_obj_scroll.h | 0 .../{LVGL8 => lvgl}/src/core/lv_obj_style.c | 0 .../{LVGL8 => lvgl}/src/core/lv_obj_style.h | 0 .../src/core/lv_obj_style_gen.c | 0 .../src/core/lv_obj_style_gen.h | 0 .../{LVGL8 => lvgl}/src/core/lv_obj_tree.c | 0 .../{LVGL8 => lvgl}/src/core/lv_obj_tree.h | 0 .../{LVGL8 => lvgl}/src/core/lv_refr.c | 0 .../{LVGL8 => lvgl}/src/core/lv_refr.h | 0 .../{LVGL8 => lvgl}/src/core/lv_theme.c | 0 .../{LVGL8 => lvgl}/src/core/lv_theme.h | 0 .../{LVGL8 => lvgl}/src/draw/lv_draw.h | 0 .../{LVGL8 => lvgl}/src/draw/lv_draw.mk | 0 .../{LVGL8 => lvgl}/src/draw/lv_draw_arc.c | 0 .../{LVGL8 => lvgl}/src/draw/lv_draw_arc.h | 0 .../{LVGL8 => lvgl}/src/draw/lv_draw_blend.c | 0 .../{LVGL8 => lvgl}/src/draw/lv_draw_blend.h | 0 .../{LVGL8 => lvgl}/src/draw/lv_draw_img.c | 0 .../{LVGL8 => lvgl}/src/draw/lv_draw_img.h | 0 .../{LVGL8 => lvgl}/src/draw/lv_draw_label.c | 0 .../{LVGL8 => lvgl}/src/draw/lv_draw_label.h | 0 .../{LVGL8 => lvgl}/src/draw/lv_draw_line.c | 0 .../{LVGL8 => lvgl}/src/draw/lv_draw_line.h | 0 .../{LVGL8 => lvgl}/src/draw/lv_draw_mask.c | 0 .../{LVGL8 => lvgl}/src/draw/lv_draw_mask.h | 0 .../{LVGL8 => lvgl}/src/draw/lv_draw_rect.c | 0 .../{LVGL8 => lvgl}/src/draw/lv_draw_rect.h | 0 .../src/draw/lv_draw_triangle.c | 0 .../src/draw/lv_draw_triangle.h | 0 .../{LVGL8 => lvgl}/src/draw/lv_img_buf.c | 0 .../{LVGL8 => lvgl}/src/draw/lv_img_buf.h | 0 .../{LVGL8 => lvgl}/src/draw/lv_img_cache.c | 0 .../{LVGL8 => lvgl}/src/draw/lv_img_cache.h | 0 .../{LVGL8 => lvgl}/src/draw/lv_img_decoder.c | 0 .../{LVGL8 => lvgl}/src/draw/lv_img_decoder.h | 0 .../{LVGL8 => lvgl}/src/extra/extra.mk | 0 .../src/extra/layouts/flex/lv_flex.c | 0 .../src/extra/layouts/flex/lv_flex.h | 0 .../src/extra/layouts/grid/lv_grid.c | 0 .../src/extra/layouts/grid/lv_grid.h | 0 .../src/extra/layouts/lv_layouts.h | 0 .../{LVGL8 => lvgl}/src/extra/lv_extra.c | 0 .../{LVGL8 => lvgl}/src/extra/lv_extra.h | 0 .../src/extra/themes/basic/lv_theme_basic.c | 0 .../src/extra/themes/basic/lv_theme_basic.h | 0 .../extra/themes/default/lv_theme_default.c | 0 .../extra/themes/default/lv_theme_default.h | 0 .../src/extra/themes/lv_themes.h | 0 .../src/extra/themes/mono/lv_theme_mono.c | 0 .../src/extra/themes/mono/lv_theme_mono.h | 0 .../src/extra/widgets/animimg/lv_animimg.c | 0 .../src/extra/widgets/animimg/lv_animimg.h | 0 .../src/extra/widgets/calendar/lv_calendar.c | 0 .../src/extra/widgets/calendar/lv_calendar.h | 0 .../calendar/lv_calendar_header_arrow.c | 0 .../calendar/lv_calendar_header_arrow.h | 0 .../calendar/lv_calendar_header_dropdown.c | 0 .../calendar/lv_calendar_header_dropdown.h | 0 .../src/extra/widgets/chart/lv_chart.c | 0 .../src/extra/widgets/chart/lv_chart.h | 0 .../extra/widgets/colorwheel/lv_colorwheel.c | 0 .../extra/widgets/colorwheel/lv_colorwheel.h | 0 .../src/extra/widgets/imgbtn/lv_imgbtn.c | 0 .../src/extra/widgets/imgbtn/lv_imgbtn.h | 0 .../src/extra/widgets/keyboard/lv_keyboard.c | 0 .../src/extra/widgets/keyboard/lv_keyboard.h | 0 .../src/extra/widgets/led/lv_led.c | 0 .../src/extra/widgets/led/lv_led.h | 0 .../src/extra/widgets/list/lv_list.c | 0 .../src/extra/widgets/list/lv_list.h | 0 .../src/extra/widgets/lv_widgets.h | 0 .../src/extra/widgets/meter/lv_meter.c | 0 .../src/extra/widgets/meter/lv_meter.h | 0 .../src/extra/widgets/msgbox/lv_msgbox.c | 0 .../src/extra/widgets/msgbox/lv_msgbox.h | 0 .../src/extra/widgets/span/lv_span.c | 0 .../src/extra/widgets/span/lv_span.h | 0 .../src/extra/widgets/spinbox/lv_spinbox.c | 0 .../src/extra/widgets/spinbox/lv_spinbox.h | 0 .../src/extra/widgets/spinner/lv_spinner.c | 0 .../src/extra/widgets/spinner/lv_spinner.h | 0 .../src/extra/widgets/tabview/lv_tabview.c | 0 .../src/extra/widgets/tabview/lv_tabview.h | 0 .../src/extra/widgets/tileview/lv_tileview.c | 0 .../src/extra/widgets/tileview/lv_tileview.h | 0 .../src/extra/widgets/win/lv_win.c | 0 .../src/extra/widgets/win/lv_win.h | 0 .../{LVGL8 => lvgl}/src/font/korean.ttf | Bin .../{LVGL8 => lvgl}/src/font/lv_font.c | 0 .../{LVGL8 => lvgl}/src/font/lv_font.h | 0 .../{LVGL8 => lvgl}/src/font/lv_font.mk | 0 .../font/lv_font_dejavu_16_persian_hebrew.c | 0 .../src/font/lv_font_fmt_txt.c | 0 .../src/font/lv_font_fmt_txt.h | 0 .../{LVGL8 => lvgl}/src/font/lv_font_loader.c | 0 .../{LVGL8 => lvgl}/src/font/lv_font_loader.h | 0 .../src/font/lv_font_montserrat_10.c | 0 .../src/font/lv_font_montserrat_12.c | 0 .../src/font/lv_font_montserrat_12_subpx.c | 0 .../src/font/lv_font_montserrat_14.c | 0 .../src/font/lv_font_montserrat_16.c | 0 .../src/font/lv_font_montserrat_18.c | 0 .../src/font/lv_font_montserrat_20.c | 0 .../src/font/lv_font_montserrat_22.c | 0 .../src/font/lv_font_montserrat_24.c | 0 .../src/font/lv_font_montserrat_26.c | 0 .../src/font/lv_font_montserrat_28.c | 0 .../font/lv_font_montserrat_28_compressed.c | 0 .../src/font/lv_font_montserrat_30.c | 0 .../src/font/lv_font_montserrat_32.c | 0 .../src/font/lv_font_montserrat_34.c | 0 .../src/font/lv_font_montserrat_36.c | 0 .../src/font/lv_font_montserrat_38.c | 0 .../src/font/lv_font_montserrat_40.c | 0 .../src/font/lv_font_montserrat_42.c | 0 .../src/font/lv_font_montserrat_44.c | 0 .../src/font/lv_font_montserrat_46.c | 0 .../src/font/lv_font_montserrat_48.c | 0 .../src/font/lv_font_montserrat_8.c | 0 .../src/font/lv_font_simsun_16_cjk.c | 0 .../src/font/lv_font_unscii_16.c | 0 .../src/font/lv_font_unscii_8.c | 0 .../{LVGL8 => lvgl}/src/font/lv_symbol_def.h | 0 .../{LVGL8 => lvgl}/src/gpu/lv_gpu.mk | 0 .../{LVGL8 => lvgl}/src/gpu/lv_gpu_nxp_pxp.c | 0 .../{LVGL8 => lvgl}/src/gpu/lv_gpu_nxp_pxp.h | 0 .../src/gpu/lv_gpu_nxp_pxp_osa.c | 0 .../src/gpu/lv_gpu_nxp_pxp_osa.h | 0 .../src/gpu/lv_gpu_nxp_vglite.c | 0 .../src/gpu/lv_gpu_nxp_vglite.h | 0 .../src/gpu/lv_gpu_stm32_dma2d.c | 0 .../src/gpu/lv_gpu_stm32_dma2d.h | 0 .../{LVGL8 => lvgl}/src/hal/lv_hal.h | 0 .../{LVGL8 => lvgl}/src/hal/lv_hal.mk | 0 .../{LVGL8 => lvgl}/src/hal/lv_hal_disp.c | 0 .../{LVGL8 => lvgl}/src/hal/lv_hal_disp.h | 0 .../{LVGL8 => lvgl}/src/hal/lv_hal_indev.c | 0 .../{LVGL8 => lvgl}/src/hal/lv_hal_indev.h | 0 .../{LVGL8 => lvgl}/src/hal/lv_hal_tick.c | 0 .../{LVGL8 => lvgl}/src/hal/lv_hal_tick.h | 0 .../{LVGL8 => lvgl}/src/lv_api_map.h | 0 .../{LVGL8 => lvgl}/src/lv_conf_internal.h | 0 .../{LVGL8 => lvgl}/src/lv_conf_kconfig.h | 0 lib/libesp32_lvgl/{LVGL8 => lvgl}/src/lvgl.h | 0 .../{LVGL8 => lvgl}/src/misc/lv_anim.c | 0 .../{LVGL8 => lvgl}/src/misc/lv_anim.h | 0 .../{LVGL8 => lvgl}/src/misc/lv_area.c | 0 .../{LVGL8 => lvgl}/src/misc/lv_area.h | 0 .../{LVGL8 => lvgl}/src/misc/lv_assert.h | 0 .../{LVGL8 => lvgl}/src/misc/lv_async.c | 0 .../{LVGL8 => lvgl}/src/misc/lv_async.h | 0 .../{LVGL8 => lvgl}/src/misc/lv_bidi.c | 0 .../{LVGL8 => lvgl}/src/misc/lv_bidi.h | 0 .../{LVGL8 => lvgl}/src/misc/lv_color.c | 0 .../{LVGL8 => lvgl}/src/misc/lv_color.h | 0 .../{LVGL8 => lvgl}/src/misc/lv_fs.c | 0 .../{LVGL8 => lvgl}/src/misc/lv_fs.h | 0 .../{LVGL8 => lvgl}/src/misc/lv_gc.c | 0 .../{LVGL8 => lvgl}/src/misc/lv_gc.h | 0 .../{LVGL8 => lvgl}/src/misc/lv_ll.c | 0 .../{LVGL8 => lvgl}/src/misc/lv_ll.h | 0 .../{LVGL8 => lvgl}/src/misc/lv_log.c | 0 .../{LVGL8 => lvgl}/src/misc/lv_log.h | 0 .../{LVGL8 => lvgl}/src/misc/lv_math.c | 0 .../{LVGL8 => lvgl}/src/misc/lv_math.h | 0 .../{LVGL8 => lvgl}/src/misc/lv_mem.c | 0 .../{LVGL8 => lvgl}/src/misc/lv_mem.h | 0 .../{LVGL8 => lvgl}/src/misc/lv_misc.mk | 0 .../{LVGL8 => lvgl}/src/misc/lv_printf.c | 0 .../{LVGL8 => lvgl}/src/misc/lv_printf.h | 0 .../{LVGL8 => lvgl}/src/misc/lv_style.c | 0 .../{LVGL8 => lvgl}/src/misc/lv_style.h | 0 .../{LVGL8 => lvgl}/src/misc/lv_style_gen.c | 0 .../{LVGL8 => lvgl}/src/misc/lv_style_gen.h | 0 .../{LVGL8 => lvgl}/src/misc/lv_templ.c | 0 .../{LVGL8 => lvgl}/src/misc/lv_templ.h | 0 .../{LVGL8 => lvgl}/src/misc/lv_timer.c | 0 .../{LVGL8 => lvgl}/src/misc/lv_timer.h | 0 .../{LVGL8 => lvgl}/src/misc/lv_tlsf.c | 0 .../{LVGL8 => lvgl}/src/misc/lv_tlsf.h | 0 .../{LVGL8 => lvgl}/src/misc/lv_txt.c | 0 .../{LVGL8 => lvgl}/src/misc/lv_txt.h | 0 .../{LVGL8 => lvgl}/src/misc/lv_txt_ap.c | 0 .../{LVGL8 => lvgl}/src/misc/lv_txt_ap.h | 0 .../{LVGL8 => lvgl}/src/misc/lv_types.h | 0 .../{LVGL8 => lvgl}/src/misc/lv_utils.c | 0 .../{LVGL8 => lvgl}/src/misc/lv_utils.h | 0 .../{LVGL8 => lvgl}/src/widgets/lv_arc.c | 0 .../{LVGL8 => lvgl}/src/widgets/lv_arc.h | 0 .../{LVGL8 => lvgl}/src/widgets/lv_bar.c | 0 .../{LVGL8 => lvgl}/src/widgets/lv_bar.h | 0 .../{LVGL8 => lvgl}/src/widgets/lv_btn.c | 0 .../{LVGL8 => lvgl}/src/widgets/lv_btn.h | 0 .../src/widgets/lv_btnmatrix.c | 0 .../src/widgets/lv_btnmatrix.h | 0 .../{LVGL8 => lvgl}/src/widgets/lv_canvas.c | 0 .../{LVGL8 => lvgl}/src/widgets/lv_canvas.h | 0 .../{LVGL8 => lvgl}/src/widgets/lv_checkbox.c | 0 .../{LVGL8 => lvgl}/src/widgets/lv_checkbox.h | 0 .../{LVGL8 => lvgl}/src/widgets/lv_dropdown.c | 0 .../{LVGL8 => lvgl}/src/widgets/lv_dropdown.h | 0 .../{LVGL8 => lvgl}/src/widgets/lv_img.c | 0 .../{LVGL8 => lvgl}/src/widgets/lv_img.h | 0 .../{LVGL8 => lvgl}/src/widgets/lv_label.c | 0 .../{LVGL8 => lvgl}/src/widgets/lv_label.h | 0 .../{LVGL8 => lvgl}/src/widgets/lv_line.c | 0 .../{LVGL8 => lvgl}/src/widgets/lv_line.h | 0 .../src/widgets/lv_objx_templ.c | 0 .../src/widgets/lv_objx_templ.h | 0 .../{LVGL8 => lvgl}/src/widgets/lv_roller.c | 0 .../{LVGL8 => lvgl}/src/widgets/lv_roller.h | 0 .../{LVGL8 => lvgl}/src/widgets/lv_slider.c | 0 .../{LVGL8 => lvgl}/src/widgets/lv_slider.h | 0 .../{LVGL8 => lvgl}/src/widgets/lv_switch.c | 0 .../{LVGL8 => lvgl}/src/widgets/lv_switch.h | 0 .../{LVGL8 => lvgl}/src/widgets/lv_table.c | 0 .../{LVGL8 => lvgl}/src/widgets/lv_table.h | 0 .../{LVGL8 => lvgl}/src/widgets/lv_textarea.c | 0 .../{LVGL8 => lvgl}/src/widgets/lv_textarea.h | 0 .../{LVGL8 => lvgl}/src/widgets/lv_widgets.mk | 0 tasmota/xdrv_52_3_berry_lvgl.ino | 2 + tools/lv_berry/lv_symbol.h | 62 - tools/lv_berry/lv_symbols.h | 61 - 268 files changed, 1237 insertions(+), 230 deletions(-) create mode 100644 lib/libesp32_lvgl/lv_berry/generate/be_lv_c_mapping.h rename lib/{libesp32/berry/default => libesp32_lvgl/lv_berry/generate}/be_lvgl_module.c (99%) rename lib/{libesp32/berry/default => libesp32_lvgl/lv_berry/generate}/be_lvgl_widgets_lib.c (99%) create mode 100644 lib/libesp32_lvgl/lv_berry/library.json rename {tools/lv_berry => lib/libesp32_lvgl/lv_berry/mapping}/lv_enum.h (100%) rename {tools/lv_berry => lib/libesp32_lvgl/lv_berry/mapping}/lv_funcs.h (95%) rename lib/{libesp32/berry/default => libesp32_lvgl/lv_berry/src}/be_lvgl_ctypes_definitions.c (99%) rename lib/{libesp32/berry/default => libesp32_lvgl/lv_berry/src}/be_lvgl_glob_lib.c (99%) rename lib/{libesp32/berry/default => libesp32_lvgl/lv_berry/src}/embedded/lvgl_glob.be (100%) create mode 100644 lib/libesp32_lvgl/lv_berry/src/lv_berry.c create mode 100644 lib/libesp32_lvgl/lv_berry/src/lv_berry.h rename {tools/lv_berry => lib/libesp32_lvgl/lv_berry/tools}/convert.py (99%) rename {tools/lv_berry => lib/libesp32_lvgl/lv_berry/tools}/preprocessor.py (97%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/Kconfig (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/LICENCE.txt (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/README.md (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/library.json (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/library.properties (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/lv_conf_template.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/lvgl.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/lvgl.mk (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_core.mk (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_disp.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_disp.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_event.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_event.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_group.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_group.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_indev.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_indev.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_indev_scroll.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_indev_scroll.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_obj.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_obj.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_obj_class.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_obj_class.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_obj_draw.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_obj_draw.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_obj_pos.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_obj_pos.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_obj_scroll.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_obj_scroll.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_obj_style.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_obj_style.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_obj_style_gen.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_obj_style_gen.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_obj_tree.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_obj_tree.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_refr.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_refr.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_theme.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/core/lv_theme.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/draw/lv_draw.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/draw/lv_draw.mk (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/draw/lv_draw_arc.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/draw/lv_draw_arc.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/draw/lv_draw_blend.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/draw/lv_draw_blend.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/draw/lv_draw_img.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/draw/lv_draw_img.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/draw/lv_draw_label.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/draw/lv_draw_label.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/draw/lv_draw_line.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/draw/lv_draw_line.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/draw/lv_draw_mask.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/draw/lv_draw_mask.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/draw/lv_draw_rect.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/draw/lv_draw_rect.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/draw/lv_draw_triangle.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/draw/lv_draw_triangle.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/draw/lv_img_buf.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/draw/lv_img_buf.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/draw/lv_img_cache.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/draw/lv_img_cache.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/draw/lv_img_decoder.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/draw/lv_img_decoder.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/extra.mk (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/layouts/flex/lv_flex.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/layouts/flex/lv_flex.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/layouts/grid/lv_grid.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/layouts/grid/lv_grid.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/layouts/lv_layouts.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/lv_extra.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/lv_extra.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/themes/basic/lv_theme_basic.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/themes/basic/lv_theme_basic.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/themes/default/lv_theme_default.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/themes/default/lv_theme_default.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/themes/lv_themes.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/themes/mono/lv_theme_mono.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/themes/mono/lv_theme_mono.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/animimg/lv_animimg.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/animimg/lv_animimg.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/calendar/lv_calendar.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/calendar/lv_calendar.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/calendar/lv_calendar_header_arrow.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/calendar/lv_calendar_header_arrow.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/calendar/lv_calendar_header_dropdown.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/calendar/lv_calendar_header_dropdown.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/chart/lv_chart.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/chart/lv_chart.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/colorwheel/lv_colorwheel.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/colorwheel/lv_colorwheel.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/imgbtn/lv_imgbtn.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/imgbtn/lv_imgbtn.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/keyboard/lv_keyboard.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/keyboard/lv_keyboard.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/led/lv_led.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/led/lv_led.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/list/lv_list.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/list/lv_list.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/lv_widgets.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/meter/lv_meter.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/meter/lv_meter.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/msgbox/lv_msgbox.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/msgbox/lv_msgbox.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/span/lv_span.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/span/lv_span.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/spinbox/lv_spinbox.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/spinbox/lv_spinbox.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/spinner/lv_spinner.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/spinner/lv_spinner.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/tabview/lv_tabview.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/tabview/lv_tabview.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/tileview/lv_tileview.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/tileview/lv_tileview.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/win/lv_win.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/extra/widgets/win/lv_win.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/korean.ttf (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font.mk (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_dejavu_16_persian_hebrew.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_fmt_txt.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_fmt_txt.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_loader.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_loader.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_montserrat_10.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_montserrat_12.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_montserrat_12_subpx.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_montserrat_14.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_montserrat_16.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_montserrat_18.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_montserrat_20.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_montserrat_22.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_montserrat_24.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_montserrat_26.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_montserrat_28.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_montserrat_28_compressed.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_montserrat_30.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_montserrat_32.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_montserrat_34.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_montserrat_36.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_montserrat_38.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_montserrat_40.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_montserrat_42.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_montserrat_44.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_montserrat_46.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_montserrat_48.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_montserrat_8.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_simsun_16_cjk.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_unscii_16.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_font_unscii_8.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/font/lv_symbol_def.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/gpu/lv_gpu.mk (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/gpu/lv_gpu_nxp_pxp.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/gpu/lv_gpu_nxp_pxp.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/gpu/lv_gpu_nxp_pxp_osa.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/gpu/lv_gpu_nxp_pxp_osa.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/gpu/lv_gpu_nxp_vglite.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/gpu/lv_gpu_nxp_vglite.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/gpu/lv_gpu_stm32_dma2d.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/gpu/lv_gpu_stm32_dma2d.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/hal/lv_hal.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/hal/lv_hal.mk (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/hal/lv_hal_disp.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/hal/lv_hal_disp.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/hal/lv_hal_indev.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/hal/lv_hal_indev.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/hal/lv_hal_tick.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/hal/lv_hal_tick.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/lv_api_map.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/lv_conf_internal.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/lv_conf_kconfig.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/lvgl.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_anim.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_anim.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_area.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_area.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_assert.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_async.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_async.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_bidi.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_bidi.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_color.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_color.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_fs.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_fs.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_gc.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_gc.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_ll.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_ll.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_log.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_log.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_math.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_math.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_mem.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_mem.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_misc.mk (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_printf.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_printf.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_style.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_style.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_style_gen.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_style_gen.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_templ.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_templ.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_timer.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_timer.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_tlsf.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_tlsf.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_txt.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_txt.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_txt_ap.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_txt_ap.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_types.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_utils.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/misc/lv_utils.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_arc.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_arc.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_bar.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_bar.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_btn.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_btn.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_btnmatrix.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_btnmatrix.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_canvas.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_canvas.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_checkbox.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_checkbox.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_dropdown.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_dropdown.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_img.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_img.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_label.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_label.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_line.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_line.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_objx_templ.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_objx_templ.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_roller.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_roller.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_slider.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_slider.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_switch.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_switch.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_table.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_table.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_textarea.c (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_textarea.h (100%) rename lib/libesp32_lvgl/{LVGL8 => lvgl}/src/widgets/lv_widgets.mk (100%) delete mode 100644 tools/lv_berry/lv_symbol.h delete mode 100644 tools/lv_berry/lv_symbols.h diff --git a/lib/libesp32/berry/default/be_modtab.c b/lib/libesp32/berry/default/be_modtab.c index 934400bbb..02b25a747 100644 --- a/lib/libesp32/berry/default/be_modtab.c +++ b/lib/libesp32/berry/default/be_modtab.c @@ -157,9 +157,7 @@ extern void be_load_driver_audio_lib(bvm *vm); #endif #ifdef USE_LVGL -extern void be_load_lv_color_class(bvm *vm); -extern void be_load_lv_font_class(bvm *vm); -extern void be_load_LVGL_glob_class(bvm *vm); +#include "lv_berry.h" // custom widgets extern void be_load_lv_signal_bars_class(bvm *vm); extern void be_load_lv_wifi_bars_class(bvm *vm); @@ -213,10 +211,7 @@ BERRY_API void be_load_custom_libs(bvm *vm) #endif #ifdef USE_LVGL // LVGL - be_load_lv_color_class(vm); - be_load_lv_font_class(vm); - - be_load_LVGL_glob_class(vm); + be_load_lvgl_classes(vm); // custom widgets be_load_lv_signal_bars_class(vm); be_load_lv_wifi_bars_class(vm); diff --git a/lib/libesp32/berry/gen.sh b/lib/libesp32/berry/gen.sh index 303a62c95..0dc462474 100755 --- a/lib/libesp32/berry/gen.sh +++ b/lib/libesp32/berry/gen.sh @@ -1,2 +1,2 @@ #!/bin/bash -python3 tools/pycoc/main.py -o generate src default ../berry_mapping/src -c default/berry_conf.h +python3 tools/pycoc/main.py -o generate src default ../berry_mapping/src ../../libesp32_lvgl/lv_berry/src -c default/berry_conf.h diff --git a/lib/libesp32/berry_mapping/src/be_class_wrapper.c b/lib/libesp32/berry_mapping/src/be_class_wrapper.c index 5f71e7da1..aa03fa4dd 100644 --- a/lib/libesp32/berry_mapping/src/be_class_wrapper.c +++ b/lib/libesp32/berry_mapping/src/be_class_wrapper.c @@ -13,6 +13,14 @@ #include "be_exec.h" #include +// By default the cb generator is cb.gen_cb +// This can be changed. Note: it is across all VMs +static const char * be_gen_cb_name = "cb.gen_cb"; + +void be_set_gen_cb_name(bvm *vm, const char * gen_cb) { + if (gen_cb) be_gen_cb_name = gen_cb; +} + /*********************************************************************************************\ * Create an object of `class_name` given an external poinrt `ptr`. * @@ -115,7 +123,7 @@ int be_find_global_or_module_member(bvm *vm, const char * name) { * 's' be_str * * - arg_type: optionally check the types of input arguments, or throw an error - * string of argument types, '+' marks optional arguments + * string of argument types * '.' don't care * 'i' be_int * 'b' be_bool @@ -125,7 +133,7 @@ int be_find_global_or_module_member(bvm *vm, const char * name) { * 'lv_obj' be_instance of type or subtype * '^lv_event_cb' callback of a named class - will call `_lvgl.gen_cb(arg_type, closure, self)` and expects a callback address in return * - * Ex: "oii+s" takes 3 mandatory arguments (obj_instance, int, int) and an optional fourth one [,string] + * Ex: ".ii" takes 3 arguments, first one is any type, followed by 2 ints \*********************************************************************************************/ // general form of lv_obj_t* function, up to 4 parameters // We can only send 32 bits arguments (no 64 bits nor double) and we expect pointers to be 32 bits @@ -302,7 +310,7 @@ void be_check_arg_type(bvm *vm, int arg_start, int argc, const char * arg_type, } } // AddLog(LOG_LEVEL_INFO, ">> 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, "_lvgl.gen_cb"); + p[p_idx++] = be_convert_single_elt(vm, i + arg_start, arg_type_check ? type_short_name : NULL, be_gen_cb_name); } // check if we are missing arguments @@ -324,11 +332,13 @@ void be_check_arg_type(bvm *vm, int arg_start, int argc, const char * arg_type, // ptr: the C pointer for internal data (can be NULL), will be stored in an instance variable // name: name of instance variable to store the pointer as `comptr`. // If NULL, this function does nothing -// the name can be prefixed with `+`, if so first char is ignored. +// the name can be prefixed with `+` or `=`, if so first char is ignored. // Ex: `+_p` stores in instance variable `_p` +// `+` forbids any NULL value (raises an exception) while `=` allows a NULL value static void be_set_ctor_ptr(bvm *vm, void * ptr, const char *name) { if (name == NULL) return; // do nothing if no name of attribute - if (name[0] == '+') { name++; } // skip prefix '^' if any + if (name[0] == '=' && ptr == NULL) { be_raise(vm, "value_error", "argument cannot be NULL"); } + if (name[0] == '+' || name[0] == '=') { name++; } // skip prefix '^' if any if (strlen(name) == 0) return; // do nothing if name is empty be_pushcomptr(vm, ptr); @@ -362,7 +372,7 @@ int be_call_c_func(bvm *vm, void * func, const char * return_type, const char * // check if we call a constructor, in this case we store the return type into the new object // check if we call a constructor with a comptr as first arg - if (return_type && return_type[0] == '+') { + if (return_type && (return_type[0] == '+' || return_type[0] == '=')) { if (argc > 1 && be_iscomptr(vm, 2)) { void * obj = be_tocomptr(vm, 2); be_set_ctor_ptr(vm, obj, return_type); @@ -380,7 +390,7 @@ int be_call_c_func(bvm *vm, void * func, const char * return_type, const char * // berry_log_C("be_call_c_func '%s' -> '%s': (%i,%i,%i,%i,%i,%i) -> %i", return_type, arg_type, p[0], p[1], p[2], p[3], p[4], p[5], ret); if ((return_type == NULL) || (strlen(return_type) == 0)) { be_return_nil(vm); } // does not return - else if (return_type[0] == '+') { + else if (return_type[0] == '+' || return_type[0] == '=') { void * obj = (void*) ret; be_set_ctor_ptr(vm, obj, return_type); be_return_nil(vm); diff --git a/lib/libesp32/berry_mapping/src/be_mapping.h b/lib/libesp32/berry_mapping/src/be_mapping.h index 108db129b..d41d04fbc 100644 --- a/lib/libesp32/berry_mapping/src/be_mapping.h +++ b/lib/libesp32/berry_mapping/src/be_mapping.h @@ -43,6 +43,7 @@ typedef struct be_ntv_class_def_t { } be_ntv_class_def_t; void be_raisef(bvm *vm, const char *except, const char *msg, ...); +void be_set_gen_cb_name(bvm *vm, const char * gen_cb); extern void be_map_insert_int(bvm *vm, const char *key, bint value); extern void be_map_insert_bool(bvm *vm, const char *key, bbool value); diff --git a/lib/libesp32_lvgl/lv_berry/generate/be_lv_c_mapping.h b/lib/libesp32_lvgl/lv_berry/generate/be_lv_c_mapping.h new file mode 100644 index 000000000..dd654f5f3 --- /dev/null +++ b/lib/libesp32_lvgl/lv_berry/generate/be_lv_c_mapping.h @@ -0,0 +1,1097 @@ + +/******************************************************************** + * Generated code, don't edit + *******************************************************************/ + +#ifdef __cplusplus +extern "C" { +#endif + +#include "be_ctypes.h" +#include "be_mapping.h" + +/* `lv_style` methods */ +const be_ntv_func_def_t lv_style_func[] = { + { "set_align", (void*) &lv_style_set_align, "", "(lv.lv_style)i" }, + { "set_anim_speed", (void*) &lv_style_set_anim_speed, "", "(lv.lv_style)i" }, + { "set_anim_time", (void*) &lv_style_set_anim_time, "", "(lv.lv_style)i" }, + { "set_arc_color", (void*) &lv_style_set_arc_color, "", "(lv.lv_style)(lv.lv_color)" }, + { "set_arc_color_filtered", (void*) &lv_style_set_arc_color_filtered, "", "(lv.lv_style)(lv.lv_color)" }, + { "set_arc_img_src", (void*) &lv_style_set_arc_img_src, "", "(lv.lv_style)." }, + { "set_arc_opa", (void*) &lv_style_set_arc_opa, "", "(lv.lv_style)i" }, + { "set_arc_rounded", (void*) &lv_style_set_arc_rounded, "", "(lv.lv_style)i" }, + { "set_arc_width", (void*) &lv_style_set_arc_width, "", "(lv.lv_style)i" }, + { "set_base_dir", (void*) &lv_style_set_base_dir, "", "(lv.lv_style)i" }, + { "set_bg_color", (void*) &lv_style_set_bg_color, "", "(lv.lv_style)(lv.lv_color)" }, + { "set_bg_color_filtered", (void*) &lv_style_set_bg_color_filtered, "", "(lv.lv_style)(lv.lv_color)" }, + { "set_bg_grad_color", (void*) &lv_style_set_bg_grad_color, "", "(lv.lv_style)(lv.lv_color)" }, + { "set_bg_grad_color_filtered", (void*) &lv_style_set_bg_grad_color_filtered, "", "(lv.lv_style)(lv.lv_color)" }, + { "set_bg_grad_dir", (void*) &lv_style_set_bg_grad_dir, "", "(lv.lv_style)i" }, + { "set_bg_grad_stop", (void*) &lv_style_set_bg_grad_stop, "", "(lv.lv_style)i" }, + { "set_bg_img_opa", (void*) &lv_style_set_bg_img_opa, "", "(lv.lv_style)i" }, + { "set_bg_img_recolor", (void*) &lv_style_set_bg_img_recolor, "", "(lv.lv_style)(lv.lv_color)" }, + { "set_bg_img_recolor_filtered", (void*) &lv_style_set_bg_img_recolor_filtered, "", "(lv.lv_style)(lv.lv_color)" }, + { "set_bg_img_recolor_opa", (void*) &lv_style_set_bg_img_recolor_opa, "", "(lv.lv_style)i" }, + { "set_bg_img_src", (void*) &lv_style_set_bg_img_src, "", "(lv.lv_style)." }, + { "set_bg_img_tiled", (void*) &lv_style_set_bg_img_tiled, "", "(lv.lv_style)b" }, + { "set_bg_main_stop", (void*) &lv_style_set_bg_main_stop, "", "(lv.lv_style)i" }, + { "set_bg_opa", (void*) &lv_style_set_bg_opa, "", "(lv.lv_style)i" }, + { "set_blend_mode", (void*) &lv_style_set_blend_mode, "", "(lv.lv_style)i" }, + { "set_border_color", (void*) &lv_style_set_border_color, "", "(lv.lv_style)(lv.lv_color)" }, + { "set_border_color_filtered", (void*) &lv_style_set_border_color_filtered, "", "(lv.lv_style)(lv.lv_color)" }, + { "set_border_opa", (void*) &lv_style_set_border_opa, "", "(lv.lv_style)i" }, + { "set_border_post", (void*) &lv_style_set_border_post, "", "(lv.lv_style)b" }, + { "set_border_side", (void*) &lv_style_set_border_side, "", "(lv.lv_style)i" }, + { "set_border_width", (void*) &lv_style_set_border_width, "", "(lv.lv_style)i" }, + { "set_clip_corner", (void*) &lv_style_set_clip_corner, "", "(lv.lv_style)b" }, + { "set_color_filter_dsc", (void*) &lv_style_set_color_filter_dsc, "", "(lv.lv_style)(lv.lv_color_filter_dsc)" }, + { "set_color_filter_opa", (void*) &lv_style_set_color_filter_opa, "", "(lv.lv_style)i" }, + { "set_height", (void*) &lv_style_set_height, "", "(lv.lv_style)i" }, + { "set_img_opa", (void*) &lv_style_set_img_opa, "", "(lv.lv_style)i" }, + { "set_img_recolor", (void*) &lv_style_set_img_recolor, "", "(lv.lv_style)(lv.lv_color)" }, + { "set_img_recolor_filtered", (void*) &lv_style_set_img_recolor_filtered, "", "(lv.lv_style)(lv.lv_color)" }, + { "set_img_recolor_opa", (void*) &lv_style_set_img_recolor_opa, "", "(lv.lv_style)i" }, + { "set_layout", (void*) &lv_style_set_layout, "", "(lv.lv_style)i" }, + { "set_line_color", (void*) &lv_style_set_line_color, "", "(lv.lv_style)(lv.lv_color)" }, + { "set_line_color_filtered", (void*) &lv_style_set_line_color_filtered, "", "(lv.lv_style)(lv.lv_color)" }, + { "set_line_dash_gap", (void*) &lv_style_set_line_dash_gap, "", "(lv.lv_style)i" }, + { "set_line_dash_width", (void*) &lv_style_set_line_dash_width, "", "(lv.lv_style)i" }, + { "set_line_opa", (void*) &lv_style_set_line_opa, "", "(lv.lv_style)i" }, + { "set_line_rounded", (void*) &lv_style_set_line_rounded, "", "(lv.lv_style)i" }, + { "set_line_width", (void*) &lv_style_set_line_width, "", "(lv.lv_style)i" }, + { "set_max_height", (void*) &lv_style_set_max_height, "", "(lv.lv_style)i" }, + { "set_max_width", (void*) &lv_style_set_max_width, "", "(lv.lv_style)i" }, + { "set_min_height", (void*) &lv_style_set_min_height, "", "(lv.lv_style)i" }, + { "set_min_width", (void*) &lv_style_set_min_width, "", "(lv.lv_style)i" }, + { "set_opa", (void*) &lv_style_set_opa, "", "(lv.lv_style)i" }, + { "set_outline_color", (void*) &lv_style_set_outline_color, "", "(lv.lv_style)(lv.lv_color)" }, + { "set_outline_color_filtered", (void*) &lv_style_set_outline_color_filtered, "", "(lv.lv_style)(lv.lv_color)" }, + { "set_outline_opa", (void*) &lv_style_set_outline_opa, "", "(lv.lv_style)i" }, + { "set_outline_pad", (void*) &lv_style_set_outline_pad, "", "(lv.lv_style)i" }, + { "set_outline_width", (void*) &lv_style_set_outline_width, "", "(lv.lv_style)i" }, + { "set_pad_bottom", (void*) &lv_style_set_pad_bottom, "", "(lv.lv_style)i" }, + { "set_pad_column", (void*) &lv_style_set_pad_column, "", "(lv.lv_style)i" }, + { "set_pad_left", (void*) &lv_style_set_pad_left, "", "(lv.lv_style)i" }, + { "set_pad_right", (void*) &lv_style_set_pad_right, "", "(lv.lv_style)i" }, + { "set_pad_row", (void*) &lv_style_set_pad_row, "", "(lv.lv_style)i" }, + { "set_pad_top", (void*) &lv_style_set_pad_top, "", "(lv.lv_style)i" }, + { "set_radius", (void*) &lv_style_set_radius, "", "(lv.lv_style)i" }, + { "set_shadow_color", (void*) &lv_style_set_shadow_color, "", "(lv.lv_style)(lv.lv_color)" }, + { "set_shadow_color_filtered", (void*) &lv_style_set_shadow_color_filtered, "", "(lv.lv_style)(lv.lv_color)" }, + { "set_shadow_ofs_x", (void*) &lv_style_set_shadow_ofs_x, "", "(lv.lv_style)i" }, + { "set_shadow_ofs_y", (void*) &lv_style_set_shadow_ofs_y, "", "(lv.lv_style)i" }, + { "set_shadow_opa", (void*) &lv_style_set_shadow_opa, "", "(lv.lv_style)i" }, + { "set_shadow_spread", (void*) &lv_style_set_shadow_spread, "", "(lv.lv_style)i" }, + { "set_shadow_width", (void*) &lv_style_set_shadow_width, "", "(lv.lv_style)i" }, + { "set_text_align", (void*) &lv_style_set_text_align, "", "(lv.lv_style)i" }, + { "set_text_color", (void*) &lv_style_set_text_color, "", "(lv.lv_style)(lv.lv_color)" }, + { "set_text_color_filtered", (void*) &lv_style_set_text_color_filtered, "", "(lv.lv_style)(lv.lv_color)" }, + { "set_text_decor", (void*) &lv_style_set_text_decor, "", "(lv.lv_style)i" }, + { "set_text_font", (void*) &lv_style_set_text_font, "", "(lv.lv_style)(lv.lv_font)" }, + { "set_text_letter_space", (void*) &lv_style_set_text_letter_space, "", "(lv.lv_style)i" }, + { "set_text_line_space", (void*) &lv_style_set_text_line_space, "", "(lv.lv_style)i" }, + { "set_text_opa", (void*) &lv_style_set_text_opa, "", "(lv.lv_style)i" }, + { "set_transform_angle", (void*) &lv_style_set_transform_angle, "", "(lv.lv_style)i" }, + { "set_transform_height", (void*) &lv_style_set_transform_height, "", "(lv.lv_style)i" }, + { "set_transform_width", (void*) &lv_style_set_transform_width, "", "(lv.lv_style)i" }, + { "set_transform_zoom", (void*) &lv_style_set_transform_zoom, "", "(lv.lv_style)i" }, + { "set_transition", (void*) &lv_style_set_transition, "", "(lv.lv_style)(lv.lv_style_transition_dsc)" }, + { "set_translate_x", (void*) &lv_style_set_translate_x, "", "(lv.lv_style)i" }, + { "set_translate_y", (void*) &lv_style_set_translate_y, "", "(lv.lv_style)i" }, + { "set_width", (void*) &lv_style_set_width, "", "(lv.lv_style)i" }, + { "set_x", (void*) &lv_style_set_x, "", "(lv.lv_style)i" }, + { "set_y", (void*) &lv_style_set_y, "", "(lv.lv_style)i" }, +}; + +/* `lv_font` methods */ +const be_ntv_func_def_t lv_font_func[] = { +}; + +/* `lv_color` methods */ +const be_ntv_func_def_t lv_color_func[] = { +}; + +/* `lv_theme` methods */ +const be_ntv_func_def_t lv_theme_func[] = { +}; + +/* `lv_img` methods */ +#ifdef BE_LV_WIDGET_IMG +const be_ntv_func_def_t lv_img_func[] = { + { "get_angle", (void*) &lv_img_get_angle, "i", "(lv.lv_obj)" }, + { "get_antialias", (void*) &lv_img_get_antialias, "b", "(lv.lv_obj)" }, + { "get_offset_x", (void*) &lv_img_get_offset_x, "i", "(lv.lv_obj)" }, + { "get_offset_y", (void*) &lv_img_get_offset_y, "i", "(lv.lv_obj)" }, + { "get_pivot", (void*) &lv_img_get_pivot, "", "(lv.lv_obj)(lv.lv_point)" }, + { "get_src", (void*) &lv_img_get_src, ".", "(lv.lv_obj)" }, + { "get_zoom", (void*) &lv_img_get_zoom, "i", "(lv.lv_obj)" }, + { "set_angle", (void*) &lv_img_set_angle, "", "(lv.lv_obj)i" }, + { "set_antialias", (void*) &lv_img_set_antialias, "", "(lv.lv_obj)b" }, + { "set_offset_x", (void*) &lv_img_set_offset_x, "", "(lv.lv_obj)i" }, + { "set_offset_y", (void*) &lv_img_set_offset_y, "", "(lv.lv_obj)i" }, + { "set_pivot", (void*) &lv_img_set_pivot, "", "(lv.lv_obj)ii" }, + { "set_src", (void*) &lv_img_set_src, "", "(lv.lv_obj)." }, + { "set_tasmota_logo", (void*) &lv_img_set_tasmota_logo, "", "(lv.lv_obj)" }, + { "set_zoom", (void*) &lv_img_set_zoom, "", "(lv.lv_obj)i" }, +}; +#endif // BE_LV_WIDGET_IMG + +/* `lv_disp` methods */ +const be_ntv_func_def_t lv_disp_func[] = { + { "clean_dcache", (void*) &lv_disp_clean_dcache, "", "(lv.lv_disp)" }, + { "dpx", (void*) &lv_disp_dpx, "i", "(lv.lv_disp)i" }, + { "get_inactive_time", (void*) &lv_disp_get_inactive_time, "i", "(lv.lv_disp)" }, + { "get_layer_sys", (void*) &lv_disp_get_layer_sys, "lv.lv_obj", "(lv.lv_disp)" }, + { "get_layer_top", (void*) &lv_disp_get_layer_top, "lv.lv_obj", "(lv.lv_disp)" }, + { "get_scr_act", (void*) &lv_disp_get_scr_act, "lv.lv_obj", "(lv.lv_disp)" }, + { "get_scr_prev", (void*) &lv_disp_get_scr_prev, "lv.lv_obj", "(lv.lv_disp)" }, + { "get_theme", (void*) &lv_disp_get_theme, "lv.lv_theme", "(lv.lv_disp)" }, + { "load_scr", (void*) &lv_disp_load_scr, "", "(lv.lv_obj)" }, + { "set_bg_color", (void*) &lv_disp_set_bg_color, "", "(lv.lv_disp)(lv.lv_color)" }, + { "set_bg_image", (void*) &lv_disp_set_bg_image, "", "(lv.lv_disp)." }, + { "set_bg_opa", (void*) &lv_disp_set_bg_opa, "", "(lv.lv_disp)i" }, + { "set_theme", (void*) &lv_disp_set_theme, "", "(lv.lv_disp)(lv.lv_theme)" }, + { "trig_activity", (void*) &lv_disp_trig_activity, "", "(lv.lv_disp)" }, +}; + +/* `lv_obj` methods */ +const be_ntv_func_def_t lv_obj_func[] = { + { "add_event_cb", (void*) &lv_obj_add_event_cb, "i", "(lv.lv_obj)^lv_event_cb^i." }, + { "add_flag", (void*) &lv_obj_add_flag, "", "(lv.lv_obj)i" }, + { "add_state", (void*) &lv_obj_add_state, "", "(lv.lv_obj)i" }, + { "add_style", (void*) &lv_obj_add_style, "", "(lv.lv_obj)(lv.lv_style)i" }, + { "align", (void*) &lv_obj_align, "", "(lv.lv_obj)iii" }, + { "align_to", (void*) &lv_obj_align_to, "", "(lv.lv_obj)(lv.lv_obj)iii" }, + { "allocate_spec_attr", (void*) &lv_obj_allocate_spec_attr, "", "(lv.lv_obj)" }, + { "area_is_visible", (void*) &lv_obj_area_is_visible, "b", "(lv.lv_obj)(lv.lv_area)" }, + { "calculate_ext_draw_size", (void*) &lv_obj_calculate_ext_draw_size, "i", "(lv.lv_obj)i" }, + { "center", (void*) &lv_obj_center, "", "(lv.lv_obj)" }, + { "check_type", (void*) &lv_obj_check_type, "b", "(lv.lv_obj)(lv.lv_obj_class)" }, + { "class_init_obj", (void*) &lv_obj_class_init_obj, "", "(lv.lv_obj)" }, + { "clean", (void*) &lv_obj_clean, "", "(lv.lv_obj)" }, + { "clear_flag", (void*) &lv_obj_clear_flag, "", "(lv.lv_obj)i" }, + { "clear_state", (void*) &lv_obj_clear_state, "", "(lv.lv_obj)i" }, + { "del", (void*) &lv_obj_del, "", "(lv.lv_obj)" }, + { "del_async", (void*) &lv_obj_del_async, "", "(lv.lv_obj)" }, + { "dpx", (void*) &lv_obj_dpx, "i", "(lv.lv_obj)i" }, + { "fade_in", (void*) &lv_obj_fade_in, "", "(lv.lv_obj)ii" }, + { "fade_out", (void*) &lv_obj_fade_out, "", "(lv.lv_obj)ii" }, + { "get_child", (void*) &lv_obj_get_child, "lv.lv_obj", "(lv.lv_obj)i" }, + { "get_child_cnt", (void*) &lv_obj_get_child_cnt, "i", "(lv.lv_obj)" }, + { "get_child_id", (void*) &lv_obj_get_child_id, "i", "(lv.lv_obj)" }, + { "get_class", (void*) &lv_obj_get_class, "lv.lv_obj_class", "(lv.lv_obj)" }, + { "get_click_area", (void*) &lv_obj_get_click_area, "", "(lv.lv_obj)(lv.lv_area)" }, + { "get_content_coords", (void*) &lv_obj_get_content_coords, "", "(lv.lv_obj)(lv.lv_area)" }, + { "get_content_height", (void*) &lv_obj_get_content_height, "i", "(lv.lv_obj)" }, + { "get_content_width", (void*) &lv_obj_get_content_width, "i", "(lv.lv_obj)" }, + { "get_coords", (void*) &lv_obj_get_coords, "", "(lv.lv_obj)(lv.lv_area)" }, + { "get_disp", (void*) &lv_obj_get_disp, "lv.lv_disp", "(lv.lv_obj)" }, + { "get_group", (void*) &lv_obj_get_group, ".", "(lv.lv_obj)" }, + { "get_height", (void*) &lv_obj_get_height, "i", "(lv.lv_obj)" }, + { "get_local_style_prop", (void*) &lv_obj_get_local_style_prop, "i", "(lv.lv_obj)(lv.lv_style_prop)(lv.lv_style_value)i" }, + { "get_parent", (void*) &lv_obj_get_parent, "lv.lv_obj", "(lv.lv_obj)" }, + { "get_screen", (void*) &lv_obj_get_screen, "lv.lv_obj", "(lv.lv_obj)" }, + { "get_scroll_bottom", (void*) &lv_obj_get_scroll_bottom, "i", "(lv.lv_obj)" }, + { "get_scroll_dir", (void*) &lv_obj_get_scroll_dir, "i", "(lv.lv_obj)" }, + { "get_scroll_end", (void*) &lv_obj_get_scroll_end, "", "(lv.lv_obj)(lv.lv_point)" }, + { "get_scroll_left", (void*) &lv_obj_get_scroll_left, "i", "(lv.lv_obj)" }, + { "get_scroll_right", (void*) &lv_obj_get_scroll_right, "i", "(lv.lv_obj)" }, + { "get_scroll_snap_x", (void*) &lv_obj_get_scroll_snap_x, "i", "(lv.lv_obj)" }, + { "get_scroll_snap_y", (void*) &lv_obj_get_scroll_snap_y, "i", "(lv.lv_obj)" }, + { "get_scroll_top", (void*) &lv_obj_get_scroll_top, "i", "(lv.lv_obj)" }, + { "get_scroll_x", (void*) &lv_obj_get_scroll_x, "i", "(lv.lv_obj)" }, + { "get_scroll_y", (void*) &lv_obj_get_scroll_y, "i", "(lv.lv_obj)" }, + { "get_scrollbar_area", (void*) &lv_obj_get_scrollbar_area, "", "(lv.lv_obj)(lv.lv_area)(lv.lv_area)" }, + { "get_scrollbar_mode", (void*) &lv_obj_get_scrollbar_mode, "i", "(lv.lv_obj)" }, + { "get_self_height", (void*) &lv_obj_get_self_height, "i", "(lv.lv_obj)" }, + { "get_self_width", (void*) &lv_obj_get_self_width, "i", "(lv.lv_obj)" }, + { "get_state", (void*) &lv_obj_get_state, "i", "(lv.lv_obj)" }, + { "get_style_align", (void*) &lv_obj_get_style_align, "i", "(lv.lv_obj)i" }, + { "get_style_anim_speed", (void*) &lv_obj_get_style_anim_speed, "i", "(lv.lv_obj)i" }, + { "get_style_anim_time", (void*) &lv_obj_get_style_anim_time, "i", "(lv.lv_obj)i" }, + { "get_style_arc_color", (void*) &lv_obj_get_style_arc_color, "lv.lv_color", "(lv.lv_obj)i" }, + { "get_style_arc_color_filtered", (void*) &lv_obj_get_style_arc_color_filtered, "lv.lv_color", "(lv.lv_obj)i" }, + { "get_style_arc_img_src", (void*) &lv_obj_get_style_arc_img_src, ".", "(lv.lv_obj)i" }, + { "get_style_arc_opa", (void*) &lv_obj_get_style_arc_opa, "i", "(lv.lv_obj)i" }, + { "get_style_arc_rounded", (void*) &lv_obj_get_style_arc_rounded, "i", "(lv.lv_obj)i" }, + { "get_style_arc_width", (void*) &lv_obj_get_style_arc_width, "i", "(lv.lv_obj)i" }, + { "get_style_base_dir", (void*) &lv_obj_get_style_base_dir, "i", "(lv.lv_obj)i" }, + { "get_style_bg_color", (void*) &lv_obj_get_style_bg_color, "lv.lv_color", "(lv.lv_obj)i" }, + { "get_style_bg_color_filtered", (void*) &lv_obj_get_style_bg_color_filtered, "lv.lv_color", "(lv.lv_obj)i" }, + { "get_style_bg_grad_color", (void*) &lv_obj_get_style_bg_grad_color, "lv.lv_color", "(lv.lv_obj)i" }, + { "get_style_bg_grad_color_filtered", (void*) &lv_obj_get_style_bg_grad_color_filtered, "lv.lv_color", "(lv.lv_obj)i" }, + { "get_style_bg_grad_dir", (void*) &lv_obj_get_style_bg_grad_dir, "i", "(lv.lv_obj)i" }, + { "get_style_bg_grad_stop", (void*) &lv_obj_get_style_bg_grad_stop, "i", "(lv.lv_obj)i" }, + { "get_style_bg_img_opa", (void*) &lv_obj_get_style_bg_img_opa, "i", "(lv.lv_obj)i" }, + { "get_style_bg_img_recolor", (void*) &lv_obj_get_style_bg_img_recolor, "lv.lv_color", "(lv.lv_obj)i" }, + { "get_style_bg_img_recolor_filtered", (void*) &lv_obj_get_style_bg_img_recolor_filtered, "lv.lv_color", "(lv.lv_obj)i" }, + { "get_style_bg_img_recolor_opa", (void*) &lv_obj_get_style_bg_img_recolor_opa, "i", "(lv.lv_obj)i" }, + { "get_style_bg_img_src", (void*) &lv_obj_get_style_bg_img_src, ".", "(lv.lv_obj)i" }, + { "get_style_bg_img_tiled", (void*) &lv_obj_get_style_bg_img_tiled, "b", "(lv.lv_obj)i" }, + { "get_style_bg_main_stop", (void*) &lv_obj_get_style_bg_main_stop, "i", "(lv.lv_obj)i" }, + { "get_style_bg_opa", (void*) &lv_obj_get_style_bg_opa, "i", "(lv.lv_obj)i" }, + { "get_style_blend_mode", (void*) &lv_obj_get_style_blend_mode, "i", "(lv.lv_obj)i" }, + { "get_style_border_color", (void*) &lv_obj_get_style_border_color, "lv.lv_color", "(lv.lv_obj)i" }, + { "get_style_border_color_filtered", (void*) &lv_obj_get_style_border_color_filtered, "lv.lv_color", "(lv.lv_obj)i" }, + { "get_style_border_opa", (void*) &lv_obj_get_style_border_opa, "i", "(lv.lv_obj)i" }, + { "get_style_border_post", (void*) &lv_obj_get_style_border_post, "b", "(lv.lv_obj)i" }, + { "get_style_border_side", (void*) &lv_obj_get_style_border_side, "i", "(lv.lv_obj)i" }, + { "get_style_border_width", (void*) &lv_obj_get_style_border_width, "i", "(lv.lv_obj)i" }, + { "get_style_clip_corner", (void*) &lv_obj_get_style_clip_corner, "b", "(lv.lv_obj)i" }, + { "get_style_color_filter_opa", (void*) &lv_obj_get_style_color_filter_opa, "i", "(lv.lv_obj)i" }, + { "get_style_height", (void*) &lv_obj_get_style_height, "i", "(lv.lv_obj)i" }, + { "get_style_img_opa", (void*) &lv_obj_get_style_img_opa, "i", "(lv.lv_obj)i" }, + { "get_style_img_recolor", (void*) &lv_obj_get_style_img_recolor, "lv.lv_color", "(lv.lv_obj)i" }, + { "get_style_img_recolor_filtered", (void*) &lv_obj_get_style_img_recolor_filtered, "lv.lv_color", "(lv.lv_obj)i" }, + { "get_style_img_recolor_opa", (void*) &lv_obj_get_style_img_recolor_opa, "i", "(lv.lv_obj)i" }, + { "get_style_layout", (void*) &lv_obj_get_style_layout, "i", "(lv.lv_obj)i" }, + { "get_style_line_color", (void*) &lv_obj_get_style_line_color, "lv.lv_color", "(lv.lv_obj)i" }, + { "get_style_line_color_filtered", (void*) &lv_obj_get_style_line_color_filtered, "lv.lv_color", "(lv.lv_obj)i" }, + { "get_style_line_dash_gap", (void*) &lv_obj_get_style_line_dash_gap, "i", "(lv.lv_obj)i" }, + { "get_style_line_dash_width", (void*) &lv_obj_get_style_line_dash_width, "i", "(lv.lv_obj)i" }, + { "get_style_line_opa", (void*) &lv_obj_get_style_line_opa, "i", "(lv.lv_obj)i" }, + { "get_style_line_rounded", (void*) &lv_obj_get_style_line_rounded, "i", "(lv.lv_obj)i" }, + { "get_style_line_width", (void*) &lv_obj_get_style_line_width, "i", "(lv.lv_obj)i" }, + { "get_style_max_height", (void*) &lv_obj_get_style_max_height, "i", "(lv.lv_obj)i" }, + { "get_style_max_width", (void*) &lv_obj_get_style_max_width, "i", "(lv.lv_obj)i" }, + { "get_style_min_height", (void*) &lv_obj_get_style_min_height, "i", "(lv.lv_obj)i" }, + { "get_style_min_width", (void*) &lv_obj_get_style_min_width, "i", "(lv.lv_obj)i" }, + { "get_style_opa", (void*) &lv_obj_get_style_opa, "i", "(lv.lv_obj)i" }, + { "get_style_outline_color", (void*) &lv_obj_get_style_outline_color, "lv.lv_color", "(lv.lv_obj)i" }, + { "get_style_outline_color_filtered", (void*) &lv_obj_get_style_outline_color_filtered, "lv.lv_color", "(lv.lv_obj)i" }, + { "get_style_outline_opa", (void*) &lv_obj_get_style_outline_opa, "i", "(lv.lv_obj)i" }, + { "get_style_outline_pad", (void*) &lv_obj_get_style_outline_pad, "i", "(lv.lv_obj)i" }, + { "get_style_outline_width", (void*) &lv_obj_get_style_outline_width, "i", "(lv.lv_obj)i" }, + { "get_style_pad_bottom", (void*) &lv_obj_get_style_pad_bottom, "i", "(lv.lv_obj)i" }, + { "get_style_pad_column", (void*) &lv_obj_get_style_pad_column, "i", "(lv.lv_obj)i" }, + { "get_style_pad_left", (void*) &lv_obj_get_style_pad_left, "i", "(lv.lv_obj)i" }, + { "get_style_pad_right", (void*) &lv_obj_get_style_pad_right, "i", "(lv.lv_obj)i" }, + { "get_style_pad_row", (void*) &lv_obj_get_style_pad_row, "i", "(lv.lv_obj)i" }, + { "get_style_pad_top", (void*) &lv_obj_get_style_pad_top, "i", "(lv.lv_obj)i" }, + { "get_style_prop", (void*) &lv_obj_get_style_prop, "i", "(lv.lv_obj)i(lv.lv_style_prop)" }, + { "get_style_radius", (void*) &lv_obj_get_style_radius, "i", "(lv.lv_obj)i" }, + { "get_style_shadow_color", (void*) &lv_obj_get_style_shadow_color, "lv.lv_color", "(lv.lv_obj)i" }, + { "get_style_shadow_color_filtered", (void*) &lv_obj_get_style_shadow_color_filtered, "lv.lv_color", "(lv.lv_obj)i" }, + { "get_style_shadow_ofs_x", (void*) &lv_obj_get_style_shadow_ofs_x, "i", "(lv.lv_obj)i" }, + { "get_style_shadow_ofs_y", (void*) &lv_obj_get_style_shadow_ofs_y, "i", "(lv.lv_obj)i" }, + { "get_style_shadow_opa", (void*) &lv_obj_get_style_shadow_opa, "i", "(lv.lv_obj)i" }, + { "get_style_shadow_spread", (void*) &lv_obj_get_style_shadow_spread, "i", "(lv.lv_obj)i" }, + { "get_style_shadow_width", (void*) &lv_obj_get_style_shadow_width, "i", "(lv.lv_obj)i" }, + { "get_style_text_align", (void*) &lv_obj_get_style_text_align, "i", "(lv.lv_obj)i" }, + { "get_style_text_color", (void*) &lv_obj_get_style_text_color, "lv.lv_color", "(lv.lv_obj)i" }, + { "get_style_text_color_filtered", (void*) &lv_obj_get_style_text_color_filtered, "lv.lv_color", "(lv.lv_obj)i" }, + { "get_style_text_decor", (void*) &lv_obj_get_style_text_decor, "i", "(lv.lv_obj)i" }, + { "get_style_text_font", (void*) &lv_obj_get_style_text_font, "lv.lv_font", "(lv.lv_obj)i" }, + { "get_style_text_letter_space", (void*) &lv_obj_get_style_text_letter_space, "i", "(lv.lv_obj)i" }, + { "get_style_text_line_space", (void*) &lv_obj_get_style_text_line_space, "i", "(lv.lv_obj)i" }, + { "get_style_text_opa", (void*) &lv_obj_get_style_text_opa, "i", "(lv.lv_obj)i" }, + { "get_style_transform_angle", (void*) &lv_obj_get_style_transform_angle, "i", "(lv.lv_obj)i" }, + { "get_style_transform_height", (void*) &lv_obj_get_style_transform_height, "i", "(lv.lv_obj)i" }, + { "get_style_transform_width", (void*) &lv_obj_get_style_transform_width, "i", "(lv.lv_obj)i" }, + { "get_style_transform_zoom", (void*) &lv_obj_get_style_transform_zoom, "i", "(lv.lv_obj)i" }, + { "get_style_translate_x", (void*) &lv_obj_get_style_translate_x, "i", "(lv.lv_obj)i" }, + { "get_style_translate_y", (void*) &lv_obj_get_style_translate_y, "i", "(lv.lv_obj)i" }, + { "get_style_width", (void*) &lv_obj_get_style_width, "i", "(lv.lv_obj)i" }, + { "get_style_x", (void*) &lv_obj_get_style_x, "i", "(lv.lv_obj)i" }, + { "get_style_y", (void*) &lv_obj_get_style_y, "i", "(lv.lv_obj)i" }, + { "get_user_data", (void*) &lv_obj_get_user_data, ".", "(lv.lv_obj)" }, + { "get_width", (void*) &lv_obj_get_width, "i", "(lv.lv_obj)" }, + { "get_x", (void*) &lv_obj_get_x, "i", "(lv.lv_obj)" }, + { "get_x2", (void*) &lv_obj_get_x2, "i", "(lv.lv_obj)" }, + { "get_y", (void*) &lv_obj_get_y, "i", "(lv.lv_obj)" }, + { "get_y2", (void*) &lv_obj_get_y2, "i", "(lv.lv_obj)" }, + { "has_class", (void*) &lv_obj_has_class, "b", "(lv.lv_obj)(lv.lv_obj_class)" }, + { "has_flag", (void*) &lv_obj_has_flag, "b", "(lv.lv_obj)i" }, + { "has_flag_any", (void*) &lv_obj_has_flag_any, "b", "(lv.lv_obj)i" }, + { "has_state", (void*) &lv_obj_has_state, "b", "(lv.lv_obj)i" }, + { "hit_test", (void*) &lv_obj_hit_test, "b", "(lv.lv_obj)(lv.lv_point)" }, + { "init_draw_arc_dsc", (void*) &lv_obj_init_draw_arc_dsc, "", "(lv.lv_obj)i(lv.lv_draw_arc_dsc)" }, + { "init_draw_img_dsc", (void*) &lv_obj_init_draw_img_dsc, "", "(lv.lv_obj)i(lv.lv_draw_img_dsc)" }, + { "init_draw_label_dsc", (void*) &lv_obj_init_draw_label_dsc, "", "(lv.lv_obj)i(lv.lv_draw_label_dsc)" }, + { "init_draw_line_dsc", (void*) &lv_obj_init_draw_line_dsc, "", "(lv.lv_obj)i(lv.lv_draw_line_dsc)" }, + { "init_draw_rect_dsc", (void*) &lv_obj_init_draw_rect_dsc, "", "(lv.lv_obj)i(lv.lv_draw_rect_dsc)" }, + { "invalidate", (void*) &lv_obj_invalidate, "", "(lv.lv_obj)" }, + { "invalidate_area", (void*) &lv_obj_invalidate_area, "", "(lv.lv_obj)(lv.lv_area)" }, + { "is_editable", (void*) &lv_obj_is_editable, "b", "(lv.lv_obj)" }, + { "is_group_def", (void*) &lv_obj_is_group_def, "b", "(lv.lv_obj)" }, + { "is_layout_positioned", (void*) &lv_obj_is_layout_positioned, "b", "(lv.lv_obj)" }, + { "is_scrolling", (void*) &lv_obj_is_scrolling, "b", "(lv.lv_obj)" }, + { "is_valid", (void*) &lv_obj_is_valid, "b", "(lv.lv_obj)" }, + { "is_visible", (void*) &lv_obj_is_visible, "b", "(lv.lv_obj)" }, + { "mark_layout_as_dirty", (void*) &lv_obj_mark_layout_as_dirty, "", "(lv.lv_obj)" }, + { "move_background", (void*) &lv_obj_move_background, "", "(lv.lv_obj)" }, + { "move_children_by", (void*) &lv_obj_move_children_by, "", "(lv.lv_obj)iib" }, + { "move_foreground", (void*) &lv_obj_move_foreground, "", "(lv.lv_obj)" }, + { "move_to", (void*) &lv_obj_move_to, "", "(lv.lv_obj)ii" }, + { "readjust_scroll", (void*) &lv_obj_readjust_scroll, "", "(lv.lv_obj)(lv.lv_anim_enable)" }, + { "refr_pos", (void*) &lv_obj_refr_pos, "", "(lv.lv_obj)" }, + { "refr_size", (void*) &lv_obj_refr_size, "b", "(lv.lv_obj)" }, + { "refresh_ext_draw_size", (void*) &lv_obj_refresh_ext_draw_size, "", "(lv.lv_obj)" }, + { "refresh_self_size", (void*) &lv_obj_refresh_self_size, "b", "(lv.lv_obj)" }, + { "refresh_style", (void*) &lv_obj_refresh_style, "", "(lv.lv_obj)i(lv.lv_style_prop)" }, + { "remove_event_cb", (void*) &lv_obj_remove_event_cb, "b", "(lv.lv_obj)^lv_event_cb^" }, + { "remove_event_dsc", (void*) &lv_obj_remove_event_dsc, "b", "(lv.lv_obj)i" }, + { "remove_local_style_prop", (void*) &lv_obj_remove_local_style_prop, "b", "(lv.lv_obj)(lv.lv_style_prop)i" }, + { "remove_style", (void*) &lv_obj_remove_style, "", "(lv.lv_obj)(lv.lv_style)i" }, + { "remove_style_all", (void*) &lv_obj_remove_style_all, "", "(lv.lv_obj)" }, + { "scroll_by", (void*) &lv_obj_scroll_by, "", "(lv.lv_obj)ii(lv.lv_anim_enable)" }, + { "scroll_to", (void*) &lv_obj_scroll_to, "", "(lv.lv_obj)ii(lv.lv_anim_enable)" }, + { "scroll_to_view", (void*) &lv_obj_scroll_to_view, "", "(lv.lv_obj)(lv.lv_anim_enable)" }, + { "scroll_to_view_recursive", (void*) &lv_obj_scroll_to_view_recursive, "", "(lv.lv_obj)(lv.lv_anim_enable)" }, + { "scroll_to_x", (void*) &lv_obj_scroll_to_x, "", "(lv.lv_obj)i(lv.lv_anim_enable)" }, + { "scroll_to_y", (void*) &lv_obj_scroll_to_y, "", "(lv.lv_obj)i(lv.lv_anim_enable)" }, + { "scrollbar_invalidate", (void*) &lv_obj_scrollbar_invalidate, "", "(lv.lv_obj)" }, + { "set_align", (void*) &lv_obj_set_align, "", "(lv.lv_obj)i" }, + { "set_content_height", (void*) &lv_obj_set_content_height, "", "(lv.lv_obj)i" }, + { "set_content_width", (void*) &lv_obj_set_content_width, "", "(lv.lv_obj)i" }, + { "set_ext_click_area", (void*) &lv_obj_set_ext_click_area, "", "(lv.lv_obj)i" }, + { "set_height", (void*) &lv_obj_set_height, "", "(lv.lv_obj)i" }, + { "set_layout", (void*) &lv_obj_set_layout, "", "(lv.lv_obj)i" }, + { "set_local_style_prop", (void*) &lv_obj_set_local_style_prop, "", "(lv.lv_obj)(lv.lv_style_prop)ii" }, + { "set_parent", (void*) &lv_obj_set_parent, "", "(lv.lv_obj)(lv.lv_obj)" }, + { "set_pos", (void*) &lv_obj_set_pos, "", "(lv.lv_obj)ii" }, + { "set_scroll_dir", (void*) &lv_obj_set_scroll_dir, "", "(lv.lv_obj)i" }, + { "set_scroll_snap_x", (void*) &lv_obj_set_scroll_snap_x, "", "(lv.lv_obj)i" }, + { "set_scroll_snap_y", (void*) &lv_obj_set_scroll_snap_y, "", "(lv.lv_obj)i" }, + { "set_scrollbar_mode", (void*) &lv_obj_set_scrollbar_mode, "", "(lv.lv_obj)i" }, + { "set_size", (void*) &lv_obj_set_size, "", "(lv.lv_obj)ii" }, + { "set_style_align", (void*) &lv_obj_set_style_align, "", "(lv.lv_obj)ii" }, + { "set_style_anim_speed", (void*) &lv_obj_set_style_anim_speed, "", "(lv.lv_obj)ii" }, + { "set_style_anim_time", (void*) &lv_obj_set_style_anim_time, "", "(lv.lv_obj)ii" }, + { "set_style_arc_color", (void*) &lv_obj_set_style_arc_color, "", "(lv.lv_obj)(lv.lv_color)i" }, + { "set_style_arc_color_filtered", (void*) &lv_obj_set_style_arc_color_filtered, "", "(lv.lv_obj)(lv.lv_color)i" }, + { "set_style_arc_img_src", (void*) &lv_obj_set_style_arc_img_src, "", "(lv.lv_obj).i" }, + { "set_style_arc_opa", (void*) &lv_obj_set_style_arc_opa, "", "(lv.lv_obj)ii" }, + { "set_style_arc_rounded", (void*) &lv_obj_set_style_arc_rounded, "", "(lv.lv_obj)ii" }, + { "set_style_arc_width", (void*) &lv_obj_set_style_arc_width, "", "(lv.lv_obj)ii" }, + { "set_style_base_dir", (void*) &lv_obj_set_style_base_dir, "", "(lv.lv_obj)ii" }, + { "set_style_bg_color", (void*) &lv_obj_set_style_bg_color, "", "(lv.lv_obj)(lv.lv_color)i" }, + { "set_style_bg_color_filtered", (void*) &lv_obj_set_style_bg_color_filtered, "", "(lv.lv_obj)(lv.lv_color)i" }, + { "set_style_bg_grad_color", (void*) &lv_obj_set_style_bg_grad_color, "", "(lv.lv_obj)(lv.lv_color)i" }, + { "set_style_bg_grad_color_filtered", (void*) &lv_obj_set_style_bg_grad_color_filtered, "", "(lv.lv_obj)(lv.lv_color)i" }, + { "set_style_bg_grad_dir", (void*) &lv_obj_set_style_bg_grad_dir, "", "(lv.lv_obj)ii" }, + { "set_style_bg_grad_stop", (void*) &lv_obj_set_style_bg_grad_stop, "", "(lv.lv_obj)ii" }, + { "set_style_bg_img_opa", (void*) &lv_obj_set_style_bg_img_opa, "", "(lv.lv_obj)ii" }, + { "set_style_bg_img_recolor", (void*) &lv_obj_set_style_bg_img_recolor, "", "(lv.lv_obj)(lv.lv_color)i" }, + { "set_style_bg_img_recolor_filtered", (void*) &lv_obj_set_style_bg_img_recolor_filtered, "", "(lv.lv_obj)(lv.lv_color)i" }, + { "set_style_bg_img_recolor_opa", (void*) &lv_obj_set_style_bg_img_recolor_opa, "", "(lv.lv_obj)ii" }, + { "set_style_bg_img_src", (void*) &lv_obj_set_style_bg_img_src, "", "(lv.lv_obj).i" }, + { "set_style_bg_img_tiled", (void*) &lv_obj_set_style_bg_img_tiled, "", "(lv.lv_obj)bi" }, + { "set_style_bg_main_stop", (void*) &lv_obj_set_style_bg_main_stop, "", "(lv.lv_obj)ii" }, + { "set_style_bg_opa", (void*) &lv_obj_set_style_bg_opa, "", "(lv.lv_obj)ii" }, + { "set_style_blend_mode", (void*) &lv_obj_set_style_blend_mode, "", "(lv.lv_obj)ii" }, + { "set_style_border_color", (void*) &lv_obj_set_style_border_color, "", "(lv.lv_obj)(lv.lv_color)i" }, + { "set_style_border_color_filtered", (void*) &lv_obj_set_style_border_color_filtered, "", "(lv.lv_obj)(lv.lv_color)i" }, + { "set_style_border_opa", (void*) &lv_obj_set_style_border_opa, "", "(lv.lv_obj)ii" }, + { "set_style_border_post", (void*) &lv_obj_set_style_border_post, "", "(lv.lv_obj)bi" }, + { "set_style_border_side", (void*) &lv_obj_set_style_border_side, "", "(lv.lv_obj)ii" }, + { "set_style_border_width", (void*) &lv_obj_set_style_border_width, "", "(lv.lv_obj)ii" }, + { "set_style_clip_corner", (void*) &lv_obj_set_style_clip_corner, "", "(lv.lv_obj)bi" }, + { "set_style_color_filter_dsc", (void*) &lv_obj_set_style_color_filter_dsc, "", "(lv.lv_obj)(lv.lv_color_filter_dsc)i" }, + { "set_style_color_filter_opa", (void*) &lv_obj_set_style_color_filter_opa, "", "(lv.lv_obj)ii" }, + { "set_style_height", (void*) &lv_obj_set_style_height, "", "(lv.lv_obj)ii" }, + { "set_style_img_opa", (void*) &lv_obj_set_style_img_opa, "", "(lv.lv_obj)ii" }, + { "set_style_img_recolor", (void*) &lv_obj_set_style_img_recolor, "", "(lv.lv_obj)(lv.lv_color)i" }, + { "set_style_img_recolor_filtered", (void*) &lv_obj_set_style_img_recolor_filtered, "", "(lv.lv_obj)(lv.lv_color)i" }, + { "set_style_img_recolor_opa", (void*) &lv_obj_set_style_img_recolor_opa, "", "(lv.lv_obj)ii" }, + { "set_style_layout", (void*) &lv_obj_set_style_layout, "", "(lv.lv_obj)ii" }, + { "set_style_line_color", (void*) &lv_obj_set_style_line_color, "", "(lv.lv_obj)(lv.lv_color)i" }, + { "set_style_line_color_filtered", (void*) &lv_obj_set_style_line_color_filtered, "", "(lv.lv_obj)(lv.lv_color)i" }, + { "set_style_line_dash_gap", (void*) &lv_obj_set_style_line_dash_gap, "", "(lv.lv_obj)ii" }, + { "set_style_line_dash_width", (void*) &lv_obj_set_style_line_dash_width, "", "(lv.lv_obj)ii" }, + { "set_style_line_opa", (void*) &lv_obj_set_style_line_opa, "", "(lv.lv_obj)ii" }, + { "set_style_line_rounded", (void*) &lv_obj_set_style_line_rounded, "", "(lv.lv_obj)ii" }, + { "set_style_line_width", (void*) &lv_obj_set_style_line_width, "", "(lv.lv_obj)ii" }, + { "set_style_max_height", (void*) &lv_obj_set_style_max_height, "", "(lv.lv_obj)ii" }, + { "set_style_max_width", (void*) &lv_obj_set_style_max_width, "", "(lv.lv_obj)ii" }, + { "set_style_min_height", (void*) &lv_obj_set_style_min_height, "", "(lv.lv_obj)ii" }, + { "set_style_min_width", (void*) &lv_obj_set_style_min_width, "", "(lv.lv_obj)ii" }, + { "set_style_opa", (void*) &lv_obj_set_style_opa, "", "(lv.lv_obj)ii" }, + { "set_style_outline_color", (void*) &lv_obj_set_style_outline_color, "", "(lv.lv_obj)(lv.lv_color)i" }, + { "set_style_outline_color_filtered", (void*) &lv_obj_set_style_outline_color_filtered, "", "(lv.lv_obj)(lv.lv_color)i" }, + { "set_style_outline_opa", (void*) &lv_obj_set_style_outline_opa, "", "(lv.lv_obj)ii" }, + { "set_style_outline_pad", (void*) &lv_obj_set_style_outline_pad, "", "(lv.lv_obj)ii" }, + { "set_style_outline_width", (void*) &lv_obj_set_style_outline_width, "", "(lv.lv_obj)ii" }, + { "set_style_pad_all", (void*) &lv_obj_set_style_pad_all, "", "(lv.lv_obj)ii" }, + { "set_style_pad_bottom", (void*) &lv_obj_set_style_pad_bottom, "", "(lv.lv_obj)ii" }, + { "set_style_pad_column", (void*) &lv_obj_set_style_pad_column, "", "(lv.lv_obj)ii" }, + { "set_style_pad_gap", (void*) &lv_obj_set_style_pad_gap, "", "(lv.lv_obj)ii" }, + { "set_style_pad_hor", (void*) &lv_obj_set_style_pad_hor, "", "(lv.lv_obj)ii" }, + { "set_style_pad_left", (void*) &lv_obj_set_style_pad_left, "", "(lv.lv_obj)ii" }, + { "set_style_pad_right", (void*) &lv_obj_set_style_pad_right, "", "(lv.lv_obj)ii" }, + { "set_style_pad_row", (void*) &lv_obj_set_style_pad_row, "", "(lv.lv_obj)ii" }, + { "set_style_pad_top", (void*) &lv_obj_set_style_pad_top, "", "(lv.lv_obj)ii" }, + { "set_style_pad_ver", (void*) &lv_obj_set_style_pad_ver, "", "(lv.lv_obj)ii" }, + { "set_style_radius", (void*) &lv_obj_set_style_radius, "", "(lv.lv_obj)ii" }, + { "set_style_shadow_color", (void*) &lv_obj_set_style_shadow_color, "", "(lv.lv_obj)(lv.lv_color)i" }, + { "set_style_shadow_color_filtered", (void*) &lv_obj_set_style_shadow_color_filtered, "", "(lv.lv_obj)(lv.lv_color)i" }, + { "set_style_shadow_ofs_x", (void*) &lv_obj_set_style_shadow_ofs_x, "", "(lv.lv_obj)ii" }, + { "set_style_shadow_ofs_y", (void*) &lv_obj_set_style_shadow_ofs_y, "", "(lv.lv_obj)ii" }, + { "set_style_shadow_opa", (void*) &lv_obj_set_style_shadow_opa, "", "(lv.lv_obj)ii" }, + { "set_style_shadow_spread", (void*) &lv_obj_set_style_shadow_spread, "", "(lv.lv_obj)ii" }, + { "set_style_shadow_width", (void*) &lv_obj_set_style_shadow_width, "", "(lv.lv_obj)ii" }, + { "set_style_size", (void*) &lv_obj_set_style_size, "", "(lv.lv_obj)ii" }, + { "set_style_text_align", (void*) &lv_obj_set_style_text_align, "", "(lv.lv_obj)ii" }, + { "set_style_text_color", (void*) &lv_obj_set_style_text_color, "", "(lv.lv_obj)(lv.lv_color)i" }, + { "set_style_text_color_filtered", (void*) &lv_obj_set_style_text_color_filtered, "", "(lv.lv_obj)(lv.lv_color)i" }, + { "set_style_text_decor", (void*) &lv_obj_set_style_text_decor, "", "(lv.lv_obj)ii" }, + { "set_style_text_font", (void*) &lv_obj_set_style_text_font, "", "(lv.lv_obj)(lv.lv_font)i" }, + { "set_style_text_letter_space", (void*) &lv_obj_set_style_text_letter_space, "", "(lv.lv_obj)ii" }, + { "set_style_text_line_space", (void*) &lv_obj_set_style_text_line_space, "", "(lv.lv_obj)ii" }, + { "set_style_text_opa", (void*) &lv_obj_set_style_text_opa, "", "(lv.lv_obj)ii" }, + { "set_style_transform_angle", (void*) &lv_obj_set_style_transform_angle, "", "(lv.lv_obj)ii" }, + { "set_style_transform_height", (void*) &lv_obj_set_style_transform_height, "", "(lv.lv_obj)ii" }, + { "set_style_transform_width", (void*) &lv_obj_set_style_transform_width, "", "(lv.lv_obj)ii" }, + { "set_style_transform_zoom", (void*) &lv_obj_set_style_transform_zoom, "", "(lv.lv_obj)ii" }, + { "set_style_transition", (void*) &lv_obj_set_style_transition, "", "(lv.lv_obj)(lv.lv_style_transition_dsc)i" }, + { "set_style_translate_x", (void*) &lv_obj_set_style_translate_x, "", "(lv.lv_obj)ii" }, + { "set_style_translate_y", (void*) &lv_obj_set_style_translate_y, "", "(lv.lv_obj)ii" }, + { "set_style_width", (void*) &lv_obj_set_style_width, "", "(lv.lv_obj)ii" }, + { "set_style_x", (void*) &lv_obj_set_style_x, "", "(lv.lv_obj)ii" }, + { "set_style_y", (void*) &lv_obj_set_style_y, "", "(lv.lv_obj)ii" }, + { "set_user_data", (void*) &lv_obj_set_user_data, "", "(lv.lv_obj)." }, + { "set_width", (void*) &lv_obj_set_width, "", "(lv.lv_obj)i" }, + { "set_x", (void*) &lv_obj_set_x, "", "(lv.lv_obj)i" }, + { "set_y", (void*) &lv_obj_set_y, "", "(lv.lv_obj)i" }, + { "tree_walk", (void*) &lv_obj_tree_walk, "", "(lv.lv_obj)^lv_obj_tree_walk_cb^." }, + { "update_layout", (void*) &lv_obj_update_layout, "", "(lv.lv_obj)" }, + { "update_snap", (void*) &lv_obj_update_snap, "", "(lv.lv_obj)(lv.lv_anim_enable)" }, +}; + +/* `lv_group` methods */ +const be_ntv_func_def_t lv_group_func[] = { + { "add_obj", (void*) &lv_group_add_obj, "", "(lv.lv_group)(lv.lv_obj)" }, + { "del", (void*) &lv_group_del, "", "(lv.lv_group)" }, + { "focus_freeze", (void*) &lv_group_focus_freeze, "", "(lv.lv_group)b" }, + { "focus_next", (void*) &lv_group_focus_next, "", "(lv.lv_group)" }, + { "focus_obj", (void*) &lv_group_focus_obj, "", "(lv.lv_obj)" }, + { "focus_prev", (void*) &lv_group_focus_prev, "", "(lv.lv_group)" }, + { "get_editing", (void*) &lv_group_get_editing, "b", "(lv.lv_group)" }, + { "get_focus_cb", (void*) &lv_group_get_focus_cb, "lv.lv_group_focus_cb", "(lv.lv_group)" }, + { "get_focused", (void*) &lv_group_get_focused, "lv.lv_obj", "(lv.lv_group)" }, + { "get_obj_count", (void*) &lv_group_get_obj_count, "i", "(lv.lv_group)" }, + { "get_wrap", (void*) &lv_group_get_wrap, "b", "(lv.lv_group)" }, + { "remove_all_objs", (void*) &lv_group_remove_all_objs, "", "(lv.lv_group)" }, + { "remove_obj", (void*) &lv_group_remove_obj, "", "(lv.lv_obj)" }, + { "send_data", (void*) &lv_group_send_data, "i", "(lv.lv_group)i" }, + { "set_default", (void*) &lv_group_set_default, "", "(lv.lv_group)" }, + { "set_editing", (void*) &lv_group_set_editing, "", "(lv.lv_group)b" }, + { "set_focus_cb", (void*) &lv_group_set_focus_cb, "", "(lv.lv_group)^lv_group_focus_cb^" }, + { "set_refocus_policy", (void*) &lv_group_set_refocus_policy, "", "(lv.lv_group)(lv.lv_group_refocus_policy)" }, + { "set_wrap", (void*) &lv_group_set_wrap, "", "(lv.lv_group)b" }, +}; + +/* `lv_indev` methods */ +const be_ntv_func_def_t lv_indev_func[] = { + { "enable", (void*) &lv_indev_enable, "", "(lv.lv_indev)b" }, + { "get_gesture_dir", (void*) &lv_indev_get_gesture_dir, "i", "(lv.lv_indev)" }, + { "get_key", (void*) &lv_indev_get_key, "i", "(lv.lv_indev)" }, + { "get_point", (void*) &lv_indev_get_point, "", "(lv.lv_indev)(lv.lv_point)" }, + { "get_scroll_dir", (void*) &lv_indev_get_scroll_dir, "i", "(lv.lv_indev)" }, + { "get_scroll_obj", (void*) &lv_indev_get_scroll_obj, "lv.lv_obj", "(lv.lv_indev)" }, + { "get_type", (void*) &lv_indev_get_type, "i", "(lv.lv_indev)" }, + { "get_vect", (void*) &lv_indev_get_vect, "", "(lv.lv_indev)(lv.lv_point)" }, + { "reset", (void*) &lv_indev_reset, "", "(lv.lv_indev)(lv.lv_obj)" }, + { "reset_long_press", (void*) &lv_indev_reset_long_press, "", "(lv.lv_indev)" }, + { "search_obj", (void*) &lv_indev_search_obj, "lv.lv_obj", "(lv.lv_obj)(lv.lv_point)" }, + { "set_button_points", (void*) &lv_indev_set_button_points, "", "(lv.lv_indev)i" }, + { "set_cursor", (void*) &lv_indev_set_cursor, "", "(lv.lv_indev)(lv.lv_obj)" }, + { "set_group", (void*) &lv_indev_set_group, "", "(lv.lv_indev)(lv.lv_group)" }, + { "wait_release", (void*) &lv_indev_wait_release, "", "(lv.lv_indev)" }, +}; + +/* `lv_chart` methods */ +#ifdef BE_LV_WIDGET_CHART +const be_ntv_func_def_t lv_chart_func[] = { + { "get_cursor_point", (void*) &lv_chart_get_cursor_point, "i", "(lv.lv_obj)(lv.lv_chart_cursor)" }, + { "get_point_count", (void*) &lv_chart_get_point_count, "i", "(lv.lv_obj)" }, + { "get_point_pos_by_id", (void*) &lv_chart_get_point_pos_by_id, "", "(lv.lv_obj)(lv.lv_chart_series)i(lv.lv_point)" }, + { "get_pressed_point", (void*) &lv_chart_get_pressed_point, "i", "(lv.lv_obj)" }, + { "get_type", (void*) &lv_chart_get_type, "i", "(lv.lv_obj)" }, + { "get_x_start_point", (void*) &lv_chart_get_x_start_point, "i", "(lv.lv_obj)(lv.lv_chart_series)" }, + { "get_zoom_x", (void*) &lv_chart_get_zoom_x, "i", "(lv.lv_obj)" }, + { "get_zoom_y", (void*) &lv_chart_get_zoom_y, "i", "(lv.lv_obj)" }, + { "hide_series", (void*) &lv_chart_hide_series, "", "(lv.lv_obj)(lv.lv_chart_series)b" }, + { "refresh", (void*) &lv_chart_refresh, "", "(lv.lv_obj)" }, + { "remove_series", (void*) &lv_chart_remove_series, "", "(lv.lv_obj)(lv.lv_chart_series)" }, + { "set_all_value", (void*) &lv_chart_set_all_value, "", "(lv.lv_obj)(lv.lv_chart_series)i" }, + { "set_axis_tick", (void*) &lv_chart_set_axis_tick, "", "(lv.lv_obj)iiiiibi" }, + { "set_cursor_point", (void*) &lv_chart_set_cursor_point, "", "(lv.lv_obj)(lv.lv_chart_cursor)(lv.lv_chart_series)i" }, + { "set_cursor_pos", (void*) &lv_chart_set_cursor_pos, "", "(lv.lv_obj)(lv.lv_chart_cursor)(lv.lv_point)" }, + { "set_div_line_count", (void*) &lv_chart_set_div_line_count, "", "(lv.lv_obj)ii" }, + { "set_ext_x_array", (void*) &lv_chart_set_ext_x_array, "", "(lv.lv_obj)(lv.lv_chart_series)i" }, + { "set_ext_y_array", (void*) &lv_chart_set_ext_y_array, "", "(lv.lv_obj)(lv.lv_chart_series)i" }, + { "set_next_value", (void*) &lv_chart_set_next_value, "", "(lv.lv_obj)(lv.lv_chart_series)i" }, + { "set_next_value2", (void*) &lv_chart_set_next_value2, "", "(lv.lv_obj)(lv.lv_chart_series)ii" }, + { "set_point_count", (void*) &lv_chart_set_point_count, "", "(lv.lv_obj)i" }, + { "set_range", (void*) &lv_chart_set_range, "", "(lv.lv_obj)iii" }, + { "set_series_color", (void*) &lv_chart_set_series_color, "", "(lv.lv_obj)(lv.lv_chart_series)(lv.lv_color)" }, + { "set_type", (void*) &lv_chart_set_type, "", "(lv.lv_obj)i" }, + { "set_update_mode", (void*) &lv_chart_set_update_mode, "", "(lv.lv_obj)(lv.lv_chart_update_mode)" }, + { "set_value_by_id", (void*) &lv_chart_set_value_by_id, "", "(lv.lv_obj)(lv.lv_chart_series)ii" }, + { "set_value_by_id2", (void*) &lv_chart_set_value_by_id2, "", "(lv.lv_obj)(lv.lv_chart_series)iii" }, + { "set_x_start_point", (void*) &lv_chart_set_x_start_point, "", "(lv.lv_obj)(lv.lv_chart_series)i" }, + { "set_zoom_x", (void*) &lv_chart_set_zoom_x, "", "(lv.lv_obj)i" }, + { "set_zoom_y", (void*) &lv_chart_set_zoom_y, "", "(lv.lv_obj)i" }, +}; +#endif // BE_LV_WIDGET_CHART + +/* `lv_colorwheel` methods */ +#ifdef BE_LV_WIDGET_COLORWHEEL +const be_ntv_func_def_t lv_colorwheel_func[] = { + { "get_color_mode", (void*) &lv_colorwheel_get_color_mode, "i", "(lv.lv_obj)" }, + { "get_color_mode_fixed", (void*) &lv_colorwheel_get_color_mode_fixed, "b", "(lv.lv_obj)" }, + { "get_hsv", (void*) &lv_colorwheel_get_hsv, "i", "(lv.lv_obj)" }, + { "get_rgb", (void*) &lv_colorwheel_get_rgb, "lv.lv_color", "(lv.lv_obj)" }, + { "set_hsv", (void*) &lv_colorwheel_set_hsv, "b", "(lv.lv_obj)i" }, + { "set_mode", (void*) &lv_colorwheel_set_mode, "", "(lv.lv_obj)i" }, + { "set_mode_fixed", (void*) &lv_colorwheel_set_mode_fixed, "", "(lv.lv_obj)b" }, + { "set_rgb", (void*) &lv_colorwheel_set_rgb, "b", "(lv.lv_obj)(lv.lv_color)" }, +}; +#endif // BE_LV_WIDGET_COLORWHEEL + +/* `lv_imgbtn` methods */ +#ifdef BE_LV_WIDGET_IMGBTN +const be_ntv_func_def_t lv_imgbtn_func[] = { + { "set_src", (void*) &lv_imgbtn_set_src, "", "(lv.lv_obj)(lv.lv_imgbtn_state)..." }, +}; +#endif // BE_LV_WIDGET_IMGBTN + +/* `lv_led` methods */ +#ifdef BE_LV_WIDGET_LED +const be_ntv_func_def_t lv_led_func[] = { + { "get_brightness", (void*) &lv_led_get_brightness, "i", "(lv.lv_obj)" }, + { "off", (void*) &lv_led_off, "", "(lv.lv_obj)" }, + { "on", (void*) &lv_led_on, "", "(lv.lv_obj)" }, + { "set_brightness", (void*) &lv_led_set_brightness, "", "(lv.lv_obj)i" }, + { "set_color", (void*) &lv_led_set_color, "", "(lv.lv_obj)(lv.lv_color)" }, + { "toggle", (void*) &lv_led_toggle, "", "(lv.lv_obj)" }, +}; +#endif // BE_LV_WIDGET_LED + +/* `lv_meter` methods */ +#ifdef BE_LV_WIDGET_METER +const be_ntv_func_def_t lv_meter_func[] = { + { "add_arc", (void*) &lv_meter_add_arc, "lv.lv_meter_indicator", "(lv.lv_obj)(lv.lv_meter_scale)i(lv.lv_color)i" }, + { "add_needle_img", (void*) &lv_meter_add_needle_img, "lv.lv_meter_indicator", "(lv.lv_obj)(lv.lv_meter_scale).ii" }, + { "add_needle_line", (void*) &lv_meter_add_needle_line, "lv.lv_meter_indicator", "(lv.lv_obj)(lv.lv_meter_scale)i(lv.lv_color)i" }, + { "add_scale", (void*) &lv_meter_add_scale, "lv.lv_meter_scale", "(lv.lv_obj)" }, + { "add_scale_lines", (void*) &lv_meter_add_scale_lines, "lv.lv_meter_indicator", "(lv.lv_obj)(lv.lv_meter_scale)(lv.lv_color)(lv.lv_color)bi" }, + { "set_indicator_end_value", (void*) &lv_meter_set_indicator_end_value, "", "(lv.lv_obj)(lv.lv_meter_indicator)i" }, + { "set_indicator_start_value", (void*) &lv_meter_set_indicator_start_value, "", "(lv.lv_obj)(lv.lv_meter_indicator)i" }, + { "set_indicator_value", (void*) &lv_meter_set_indicator_value, "", "(lv.lv_obj)(lv.lv_meter_indicator)i" }, + { "set_scale_major_ticks", (void*) &lv_meter_set_scale_major_ticks, "", "(lv.lv_obj)(lv.lv_meter_scale)iii(lv.lv_color)i" }, + { "set_scale_range", (void*) &lv_meter_set_scale_range, "", "(lv.lv_obj)(lv.lv_meter_scale)iiii" }, + { "set_scale_ticks", (void*) &lv_meter_set_scale_ticks, "", "(lv.lv_obj)(lv.lv_meter_scale)iii(lv.lv_color)" }, +}; +#endif // BE_LV_WIDGET_METER + +/* `lv_msgbox` methods */ +#ifdef BE_LV_WIDGET_MSGBOX +const be_ntv_func_def_t lv_msgbox_func[] = { + { "close", (void*) &lv_msgbox_close, "", "(lv.lv_obj)" }, + { "get_active_btn_text", (void*) &lv_msgbox_get_active_btn_text, "s", "(lv.lv_obj)" }, + { "get_btns", (void*) &lv_msgbox_get_btns, "lv.lv_obj", "(lv.lv_obj)" }, + { "get_close_btn", (void*) &lv_msgbox_get_close_btn, "lv.lv_obj", "(lv.lv_obj)" }, + { "get_text", (void*) &lv_msgbox_get_text, "lv.lv_obj", "(lv.lv_obj)" }, + { "get_title", (void*) &lv_msgbox_get_title, "lv.lv_obj", "(lv.lv_obj)" }, +}; +#endif // BE_LV_WIDGET_MSGBOX + +/* `lv_spinbox` methods */ +#ifdef BE_LV_WIDGET_SPINBOX +const be_ntv_func_def_t lv_spinbox_func[] = { + { "decrement", (void*) &lv_spinbox_decrement, "", "(lv.lv_obj)" }, + { "get_rollover", (void*) &lv_spinbox_get_rollover, "b", "(lv.lv_obj)" }, + { "get_step", (void*) &lv_spinbox_get_step, "i", "(lv.lv_obj)" }, + { "get_value", (void*) &lv_spinbox_get_value, "i", "(lv.lv_obj)" }, + { "increment", (void*) &lv_spinbox_increment, "", "(lv.lv_obj)" }, + { "set_digit_format", (void*) &lv_spinbox_set_digit_format, "", "(lv.lv_obj)ii" }, + { "set_range", (void*) &lv_spinbox_set_range, "", "(lv.lv_obj)ii" }, + { "set_rollover", (void*) &lv_spinbox_set_rollover, "", "(lv.lv_obj)b" }, + { "set_step", (void*) &lv_spinbox_set_step, "", "(lv.lv_obj)i" }, + { "set_value", (void*) &lv_spinbox_set_value, "", "(lv.lv_obj)i" }, + { "step_next", (void*) &lv_spinbox_step_next, "", "(lv.lv_obj)" }, + { "step_prev", (void*) &lv_spinbox_step_prev, "", "(lv.lv_obj)" }, +}; +#endif // BE_LV_WIDGET_SPINBOX + +/* `lv_spinner` methods */ +#ifdef BE_LV_WIDGET_SPINNER +const be_ntv_func_def_t lv_spinner_func[] = { +}; +#endif // BE_LV_WIDGET_SPINNER + +/* `lv_arc` methods */ +#ifdef BE_LV_WIDGET_ARC +const be_ntv_func_def_t lv_arc_func[] = { + { "get_angle_end", (void*) &lv_arc_get_angle_end, "i", "(lv.lv_obj)" }, + { "get_angle_start", (void*) &lv_arc_get_angle_start, "i", "(lv.lv_obj)" }, + { "get_bg_angle_end", (void*) &lv_arc_get_bg_angle_end, "i", "(lv.lv_obj)" }, + { "get_bg_angle_start", (void*) &lv_arc_get_bg_angle_start, "i", "(lv.lv_obj)" }, + { "get_max_value", (void*) &lv_arc_get_max_value, "i", "(lv.lv_obj)" }, + { "get_min_value", (void*) &lv_arc_get_min_value, "i", "(lv.lv_obj)" }, + { "get_mode", (void*) &lv_arc_get_mode, "i", "(lv.lv_obj)" }, + { "get_value", (void*) &lv_arc_get_value, "i", "(lv.lv_obj)" }, + { "set_angles", (void*) &lv_arc_set_angles, "", "(lv.lv_obj)ii" }, + { "set_bg_angles", (void*) &lv_arc_set_bg_angles, "", "(lv.lv_obj)ii" }, + { "set_bg_end_angle", (void*) &lv_arc_set_bg_end_angle, "", "(lv.lv_obj)i" }, + { "set_bg_start_angle", (void*) &lv_arc_set_bg_start_angle, "", "(lv.lv_obj)i" }, + { "set_change_rate", (void*) &lv_arc_set_change_rate, "", "(lv.lv_obj)i" }, + { "set_end_angle", (void*) &lv_arc_set_end_angle, "", "(lv.lv_obj)i" }, + { "set_mode", (void*) &lv_arc_set_mode, "", "(lv.lv_obj)i" }, + { "set_range", (void*) &lv_arc_set_range, "", "(lv.lv_obj)ii" }, + { "set_rotation", (void*) &lv_arc_set_rotation, "", "(lv.lv_obj)i" }, + { "set_start_angle", (void*) &lv_arc_set_start_angle, "", "(lv.lv_obj)i" }, + { "set_value", (void*) &lv_arc_set_value, "", "(lv.lv_obj)i" }, +}; +#endif // BE_LV_WIDGET_ARC + +/* `lv_bar` methods */ +#ifdef BE_LV_WIDGET_BAR +const be_ntv_func_def_t lv_bar_func[] = { + { "get_max_value", (void*) &lv_bar_get_max_value, "i", "(lv.lv_obj)" }, + { "get_min_value", (void*) &lv_bar_get_min_value, "i", "(lv.lv_obj)" }, + { "get_mode", (void*) &lv_bar_get_mode, "i", "(lv.lv_obj)" }, + { "get_start_value", (void*) &lv_bar_get_start_value, "i", "(lv.lv_obj)" }, + { "get_value", (void*) &lv_bar_get_value, "i", "(lv.lv_obj)" }, + { "set_mode", (void*) &lv_bar_set_mode, "", "(lv.lv_obj)i" }, + { "set_range", (void*) &lv_bar_set_range, "", "(lv.lv_obj)ii" }, + { "set_start_value", (void*) &lv_bar_set_start_value, "", "(lv.lv_obj)i(lv.lv_anim_enable)" }, + { "set_value", (void*) &lv_bar_set_value, "", "(lv.lv_obj)i(lv.lv_anim_enable)" }, +}; +#endif // BE_LV_WIDGET_BAR + +/* `lv_btn` methods */ +#ifdef BE_LV_WIDGET_BTN +const be_ntv_func_def_t lv_btn_func[] = { +}; +#endif // BE_LV_WIDGET_BTN + +/* `lv_btnmatrix` methods */ +#ifdef BE_LV_WIDGET_BTNMATRIX +const be_ntv_func_def_t lv_btnmatrix_func[] = { + { "clear_btn_ctrl", (void*) &lv_btnmatrix_clear_btn_ctrl, "", "(lv.lv_obj)i(lv.lv_btnmatrix_ctrl)" }, + { "clear_btn_ctrl_all", (void*) &lv_btnmatrix_clear_btn_ctrl_all, "", "(lv.lv_obj)(lv.lv_btnmatrix_ctrl)" }, + { "get_btn_text", (void*) &lv_btnmatrix_get_btn_text, "s", "(lv.lv_obj)i" }, + { "get_one_checked", (void*) &lv_btnmatrix_get_one_checked, "b", "(lv.lv_obj)" }, + { "get_selected_btn", (void*) &lv_btnmatrix_get_selected_btn, "i", "(lv.lv_obj)" }, + { "has_btn_ctrl", (void*) &lv_btnmatrix_has_btn_ctrl, "b", "(lv.lv_obj)i(lv.lv_btnmatrix_ctrl)" }, + { "set_btn_ctrl", (void*) &lv_btnmatrix_set_btn_ctrl, "", "(lv.lv_obj)i(lv.lv_btnmatrix_ctrl)" }, + { "set_btn_ctrl_all", (void*) &lv_btnmatrix_set_btn_ctrl_all, "", "(lv.lv_obj)(lv.lv_btnmatrix_ctrl)" }, + { "set_btn_width", (void*) &lv_btnmatrix_set_btn_width, "", "(lv.lv_obj)ii" }, + { "set_ctrl_map", (void*) &lv_btnmatrix_set_ctrl_map, "", "(lv.lv_obj)(lv.lv_btnmatrix_ctrl)" }, + { "set_map", (void*) &lv_btnmatrix_set_map, "", "(lv.lv_obj)s" }, + { "set_one_checked", (void*) &lv_btnmatrix_set_one_checked, "", "(lv.lv_obj)b" }, + { "set_selected_btn", (void*) &lv_btnmatrix_set_selected_btn, "", "(lv.lv_obj)i" }, +}; +#endif // BE_LV_WIDGET_BTNMATRIX + +/* `lv_canvas` methods */ +#ifdef BE_LV_WIDGET_CANVAS +const be_ntv_func_def_t lv_canvas_func[] = { + { "blur_hor", (void*) &lv_canvas_blur_hor, "", "(lv.lv_obj)(lv.lv_area)i" }, + { "blur_ver", (void*) &lv_canvas_blur_ver, "", "(lv.lv_obj)(lv.lv_area)i" }, + { "copy_buf", (void*) &lv_canvas_copy_buf, "", "(lv.lv_obj).iiii" }, + { "draw_arc", (void*) &lv_canvas_draw_arc, "", "(lv.lv_obj)iiiii(lv.lv_draw_arc_dsc)" }, + { "draw_img", (void*) &lv_canvas_draw_img, "", "(lv.lv_obj)ii.(lv.lv_draw_img_dsc)" }, + { "draw_line", (void*) &lv_canvas_draw_line, "", "(lv.lv_obj)ii(lv.lv_draw_line_dsc)" }, + { "draw_polygon", (void*) &lv_canvas_draw_polygon, "", "(lv.lv_obj)ii(lv.lv_draw_rect_dsc)" }, + { "draw_rect", (void*) &lv_canvas_draw_rect, "", "(lv.lv_obj)iiii(lv.lv_draw_rect_dsc)" }, + { "draw_text", (void*) &lv_canvas_draw_text, "", "(lv.lv_obj)iii(lv.lv_draw_label_dsc)s" }, + { "fill_bg", (void*) &lv_canvas_fill_bg, "", "(lv.lv_obj)(lv.lv_color)i" }, + { "get_px", (void*) &lv_canvas_get_px, "lv.lv_color", "(lv.lv_obj)ii" }, + { "set_buffer", (void*) &lv_canvas_set_buffer, "", "(lv.lv_obj).iii" }, + { "set_palette", (void*) &lv_canvas_set_palette, "", "(lv.lv_obj)i(lv.lv_color)" }, + { "set_px", (void*) &lv_canvas_set_px, "", "(lv.lv_obj)ii(lv.lv_color)" }, + { "transform", (void*) &lv_canvas_transform, "", "(lv.lv_obj)(lv.lv_img_dsc)iiiiiib" }, +}; +#endif // BE_LV_WIDGET_CANVAS + +/* `lv_checkbox` methods */ +#ifdef BE_LV_WIDGET_CHECKBOX +const be_ntv_func_def_t lv_checkbox_func[] = { + { "get_text", (void*) &lv_checkbox_get_text, "s", "(lv.lv_obj)" }, + { "set_text", (void*) &lv_checkbox_set_text, "", "(lv.lv_obj)s" }, + { "set_text_static", (void*) &lv_checkbox_set_text_static, "", "(lv.lv_obj)s" }, +}; +#endif // BE_LV_WIDGET_CHECKBOX + +/* `lv_dropdown` methods */ +#ifdef BE_LV_WIDGET_DROPDOWN +const be_ntv_func_def_t lv_dropdown_func[] = { + { "add_option", (void*) &lv_dropdown_add_option, "", "(lv.lv_obj)si" }, + { "clear_options", (void*) &lv_dropdown_clear_options, "", "(lv.lv_obj)" }, + { "close", (void*) &lv_dropdown_close, "", "(lv.lv_obj)" }, + { "get_dir", (void*) &lv_dropdown_get_dir, "i", "(lv.lv_obj)" }, + { "get_list", (void*) &lv_dropdown_get_list, "lv.lv_obj", "(lv.lv_obj)" }, + { "get_option_cnt", (void*) &lv_dropdown_get_option_cnt, "i", "(lv.lv_obj)" }, + { "get_options", (void*) &lv_dropdown_get_options, "s", "(lv.lv_obj)" }, + { "get_selected", (void*) &lv_dropdown_get_selected, "i", "(lv.lv_obj)" }, + { "get_selected_highlight", (void*) &lv_dropdown_get_selected_highlight, "b", "(lv.lv_obj)" }, + { "get_selected_str", (void*) &lv_dropdown_get_selected_str, "", "(lv.lv_obj)si" }, + { "get_symbol", (void*) &lv_dropdown_get_symbol, "s", "(lv.lv_obj)" }, + { "get_text", (void*) &lv_dropdown_get_text, "s", "(lv.lv_obj)" }, + { "open", (void*) &lv_dropdown_open, "", "(lv.lv_obj)" }, + { "set_dir", (void*) &lv_dropdown_set_dir, "", "(lv.lv_obj)i" }, + { "set_options", (void*) &lv_dropdown_set_options, "", "(lv.lv_obj)s" }, + { "set_options_static", (void*) &lv_dropdown_set_options_static, "", "(lv.lv_obj)s" }, + { "set_selected", (void*) &lv_dropdown_set_selected, "", "(lv.lv_obj)i" }, + { "set_selected_highlight", (void*) &lv_dropdown_set_selected_highlight, "", "(lv.lv_obj)b" }, + { "set_symbol", (void*) &lv_dropdown_set_symbol, "", "(lv.lv_obj)." }, + { "set_text", (void*) &lv_dropdown_set_text, "", "(lv.lv_obj)s" }, +}; +#endif // BE_LV_WIDGET_DROPDOWN + +/* `lv_label` methods */ +#ifdef BE_LV_WIDGET_LABEL +const be_ntv_func_def_t lv_label_func[] = { + { "cut_text", (void*) &lv_label_cut_text, "", "(lv.lv_obj)ii" }, + { "get_letter_on", (void*) &lv_label_get_letter_on, "i", "(lv.lv_obj)(lv.lv_point)" }, + { "get_letter_pos", (void*) &lv_label_get_letter_pos, "", "(lv.lv_obj)i(lv.lv_point)" }, + { "get_long_mode", (void*) &lv_label_get_long_mode, "i", "(lv.lv_obj)" }, + { "get_recolor", (void*) &lv_label_get_recolor, "b", "(lv.lv_obj)" }, + { "get_text", (void*) &lv_label_get_text, "s", "(lv.lv_obj)" }, + { "get_text_selection_end", (void*) &lv_label_get_text_selection_end, "i", "(lv.lv_obj)" }, + { "get_text_selection_start", (void*) &lv_label_get_text_selection_start, "i", "(lv.lv_obj)" }, + { "ins_text", (void*) &lv_label_ins_text, "", "(lv.lv_obj)is" }, + { "is_char_under_pos", (void*) &lv_label_is_char_under_pos, "b", "(lv.lv_obj)(lv.lv_point)" }, + { "set_long_mode", (void*) &lv_label_set_long_mode, "", "(lv.lv_obj)i" }, + { "set_recolor", (void*) &lv_label_set_recolor, "", "(lv.lv_obj)b" }, + { "set_text", (void*) &lv_label_set_text, "", "(lv.lv_obj)s" }, + { "set_text_fmt", (void*) &lv_label_set_text_fmt, "", "(lv.lv_obj)s" }, + { "set_text_sel_end", (void*) &lv_label_set_text_sel_end, "", "(lv.lv_obj)i" }, + { "set_text_sel_start", (void*) &lv_label_set_text_sel_start, "", "(lv.lv_obj)i" }, + { "set_text_static", (void*) &lv_label_set_text_static, "", "(lv.lv_obj)s" }, +}; +#endif // BE_LV_WIDGET_LABEL + +/* `lv_line` methods */ +#ifdef BE_LV_WIDGET_LINE +const be_ntv_func_def_t lv_line_func[] = { + { "get_y_invert", (void*) &lv_line_get_y_invert, "b", "(lv.lv_obj)" }, + { "set_points", (void*) &lv_line_set_points, "", "(lv.lv_obj)ii" }, + { "set_y_invert", (void*) &lv_line_set_y_invert, "", "(lv.lv_obj)b" }, +}; +#endif // BE_LV_WIDGET_LINE + +/* `lv_roller` methods */ +#ifdef BE_LV_WIDGET_ROLLER +const be_ntv_func_def_t lv_roller_func[] = { + { "get_option_cnt", (void*) &lv_roller_get_option_cnt, "i", "(lv.lv_obj)" }, + { "get_options", (void*) &lv_roller_get_options, "s", "(lv.lv_obj)" }, + { "get_selected", (void*) &lv_roller_get_selected, "i", "(lv.lv_obj)" }, + { "get_selected_str", (void*) &lv_roller_get_selected_str, "", "(lv.lv_obj)si" }, + { "set_options", (void*) &lv_roller_set_options, "", "(lv.lv_obj)s(lv.lv_roller_mode)" }, + { "set_selected", (void*) &lv_roller_set_selected, "", "(lv.lv_obj)i(lv.lv_anim_enable)" }, + { "set_visible_row_count", (void*) &lv_roller_set_visible_row_count, "", "(lv.lv_obj)i" }, +}; +#endif // BE_LV_WIDGET_ROLLER + +/* `lv_slider` methods */ +#ifdef BE_LV_WIDGET_SLIDER +const be_ntv_func_def_t lv_slider_func[] = { + { "get_left_value", (void*) &lv_slider_get_left_value, "i", "(lv.lv_obj)" }, + { "get_max_value", (void*) &lv_slider_get_max_value, "i", "(lv.lv_obj)" }, + { "get_min_value", (void*) &lv_slider_get_min_value, "i", "(lv.lv_obj)" }, + { "get_mode", (void*) &lv_slider_get_mode, "i", "(lv.lv_obj)" }, + { "get_value", (void*) &lv_slider_get_value, "i", "(lv.lv_obj)" }, + { "is_dragged", (void*) &lv_slider_is_dragged, "b", "(lv.lv_obj)" }, + { "set_left_value", (void*) &lv_slider_set_left_value, "", "(lv.lv_obj)i(lv.lv_anim_enable)" }, + { "set_mode", (void*) &lv_slider_set_mode, "", "(lv.lv_obj)i" }, + { "set_range", (void*) &lv_slider_set_range, "", "(lv.lv_obj)ii" }, + { "set_value", (void*) &lv_slider_set_value, "", "(lv.lv_obj)i(lv.lv_anim_enable)" }, +}; +#endif // BE_LV_WIDGET_SLIDER + +/* `lv_switch` methods */ +#ifdef BE_LV_WIDGET_SWITCH +const be_ntv_func_def_t lv_switch_func[] = { +}; +#endif // BE_LV_WIDGET_SWITCH + +/* `lv_table` methods */ +#ifdef BE_LV_WIDGET_TABLE +const be_ntv_func_def_t lv_table_func[] = { + { "add_cell_ctrl", (void*) &lv_table_add_cell_ctrl, "", "(lv.lv_obj)ii(lv.lv_table_cell_ctrl)" }, + { "clear_cell_ctrl", (void*) &lv_table_clear_cell_ctrl, "", "(lv.lv_obj)ii(lv.lv_table_cell_ctrl)" }, + { "get_cell_value", (void*) &lv_table_get_cell_value, "s", "(lv.lv_obj)ii" }, + { "get_col_cnt", (void*) &lv_table_get_col_cnt, "i", "(lv.lv_obj)" }, + { "get_col_width", (void*) &lv_table_get_col_width, "i", "(lv.lv_obj)i" }, + { "get_row_cnt", (void*) &lv_table_get_row_cnt, "i", "(lv.lv_obj)" }, + { "get_selected_cell", (void*) &lv_table_get_selected_cell, "", "(lv.lv_obj)(lv.uint16)(lv.uint16)" }, + { "has_cell_ctrl", (void*) &lv_table_has_cell_ctrl, "b", "(lv.lv_obj)ii(lv.lv_table_cell_ctrl)" }, + { "set_cell_value", (void*) &lv_table_set_cell_value, "", "(lv.lv_obj)iis" }, + { "set_cell_value_fmt", (void*) &lv_table_set_cell_value_fmt, "", "(lv.lv_obj)iis" }, + { "set_col_cnt", (void*) &lv_table_set_col_cnt, "", "(lv.lv_obj)i" }, + { "set_col_width", (void*) &lv_table_set_col_width, "", "(lv.lv_obj)ii" }, + { "set_row_cnt", (void*) &lv_table_set_row_cnt, "", "(lv.lv_obj)i" }, +}; +#endif // BE_LV_WIDGET_TABLE + +/* `lv_textarea` methods */ +#ifdef BE_LV_WIDGET_TEXTAREA +const be_ntv_func_def_t lv_textarea_func[] = { + { "add_char", (void*) &lv_textarea_add_char, "", "(lv.lv_obj)i" }, + { "add_text", (void*) &lv_textarea_add_text, "", "(lv.lv_obj)s" }, + { "clear_selection", (void*) &lv_textarea_clear_selection, "", "(lv.lv_obj)" }, + { "cursor_down", (void*) &lv_textarea_cursor_down, "", "(lv.lv_obj)" }, + { "cursor_left", (void*) &lv_textarea_cursor_left, "", "(lv.lv_obj)" }, + { "cursor_right", (void*) &lv_textarea_cursor_right, "", "(lv.lv_obj)" }, + { "cursor_up", (void*) &lv_textarea_cursor_up, "", "(lv.lv_obj)" }, + { "del_char", (void*) &lv_textarea_del_char, "", "(lv.lv_obj)" }, + { "del_char_forward", (void*) &lv_textarea_del_char_forward, "", "(lv.lv_obj)" }, + { "get_accepted_chars", (void*) &lv_textarea_get_accepted_chars, "s", "(lv.lv_obj)" }, + { "get_cursor_click_pos", (void*) &lv_textarea_get_cursor_click_pos, "b", "(lv.lv_obj)" }, + { "get_cursor_pos", (void*) &lv_textarea_get_cursor_pos, "i", "(lv.lv_obj)" }, + { "get_label", (void*) &lv_textarea_get_label, "lv.lv_obj", "(lv.lv_obj)" }, + { "get_max_length", (void*) &lv_textarea_get_max_length, "i", "(lv.lv_obj)" }, + { "get_one_line", (void*) &lv_textarea_get_one_line, "b", "(lv.lv_obj)" }, + { "get_password_mode", (void*) &lv_textarea_get_password_mode, "b", "(lv.lv_obj)" }, + { "get_password_show_time", (void*) &lv_textarea_get_password_show_time, "i", "(lv.lv_obj)" }, + { "get_placeholder_text", (void*) &lv_textarea_get_placeholder_text, "s", "(lv.lv_obj)" }, + { "get_text", (void*) &lv_textarea_get_text, "s", "(lv.lv_obj)" }, + { "get_text_selection", (void*) &lv_textarea_get_text_selection, "b", "(lv.lv_obj)" }, + { "set_accepted_chars", (void*) &lv_textarea_set_accepted_chars, "", "(lv.lv_obj)s" }, + { "set_align", (void*) &lv_textarea_set_align, "", "(lv.lv_obj)i" }, + { "set_cursor_click_pos", (void*) &lv_textarea_set_cursor_click_pos, "", "(lv.lv_obj)b" }, + { "set_cursor_pos", (void*) &lv_textarea_set_cursor_pos, "", "(lv.lv_obj)i" }, + { "set_insert_replace", (void*) &lv_textarea_set_insert_replace, "", "(lv.lv_obj)s" }, + { "set_max_length", (void*) &lv_textarea_set_max_length, "", "(lv.lv_obj)i" }, + { "set_one_line", (void*) &lv_textarea_set_one_line, "", "(lv.lv_obj)b" }, + { "set_password_mode", (void*) &lv_textarea_set_password_mode, "", "(lv.lv_obj)b" }, + { "set_password_show_time", (void*) &lv_textarea_set_password_show_time, "", "(lv.lv_obj)i" }, + { "set_placeholder_text", (void*) &lv_textarea_set_placeholder_text, "", "(lv.lv_obj)s" }, + { "set_text", (void*) &lv_textarea_set_text, "", "(lv.lv_obj)s" }, + { "set_text_selection", (void*) &lv_textarea_set_text_selection, "", "(lv.lv_obj)b" }, + { "text_is_selected", (void*) &lv_textarea_text_is_selected, "b", "(lv.lv_obj)" }, +}; +#endif // BE_LV_WIDGET_TEXTAREA + +extern const bclass be_class_lv_arc; +extern const bclass be_class_lv_bar; +extern const bclass be_class_lv_btn; +extern const bclass be_class_lv_btnmatrix; +extern const bclass be_class_lv_canvas; +extern const bclass be_class_lv_chart; +extern const bclass be_class_lv_checkbox; +extern const bclass be_class_lv_color; +extern const bclass be_class_lv_colorwheel; +extern const bclass be_class_lv_disp; +extern const bclass be_class_lv_dropdown; +extern const bclass be_class_lv_font; +extern const bclass be_class_lv_group; +extern const bclass be_class_lv_img; +extern const bclass be_class_lv_imgbtn; +extern const bclass be_class_lv_indev; +extern const bclass be_class_lv_label; +extern const bclass be_class_lv_led; +extern const bclass be_class_lv_line; +extern const bclass be_class_lv_meter; +extern const bclass be_class_lv_msgbox; +extern const bclass be_class_lv_obj; +extern const bclass be_class_lv_roller; +extern const bclass be_class_lv_slider; +extern const bclass be_class_lv_spinbox; +extern const bclass be_class_lv_spinner; +extern const bclass be_class_lv_style; +extern const bclass be_class_lv_switch; +extern const bclass be_class_lv_table; +extern const bclass be_class_lv_textarea; +extern const bclass be_class_lv_theme; + + +// map of clases +const be_ntv_class_def_t lv_classes[] = { +#ifdef BE_LV_WIDGET_ARC + { "lv_arc", &be_class_lv_arc, lv_arc_func, sizeof(lv_arc_func) / sizeof(lv_arc_func[0]) }, +#endif // BE_LV_WIDGET_ARC +#ifdef BE_LV_WIDGET_BAR + { "lv_bar", &be_class_lv_bar, lv_bar_func, sizeof(lv_bar_func) / sizeof(lv_bar_func[0]) }, +#endif // BE_LV_WIDGET_BAR +#ifdef BE_LV_WIDGET_BTN + { "lv_btn", &be_class_lv_btn, lv_btn_func, sizeof(lv_btn_func) / sizeof(lv_btn_func[0]) }, +#endif // BE_LV_WIDGET_BTN +#ifdef BE_LV_WIDGET_BTNMATRIX + { "lv_btnmatrix", &be_class_lv_btnmatrix, lv_btnmatrix_func, sizeof(lv_btnmatrix_func) / sizeof(lv_btnmatrix_func[0]) }, +#endif // BE_LV_WIDGET_BTNMATRIX +#ifdef BE_LV_WIDGET_CANVAS + { "lv_canvas", &be_class_lv_canvas, lv_canvas_func, sizeof(lv_canvas_func) / sizeof(lv_canvas_func[0]) }, +#endif // BE_LV_WIDGET_CANVAS +#ifdef BE_LV_WIDGET_CHART + { "lv_chart", &be_class_lv_chart, lv_chart_func, sizeof(lv_chart_func) / sizeof(lv_chart_func[0]) }, +#endif // BE_LV_WIDGET_CHART +#ifdef BE_LV_WIDGET_CHECKBOX + { "lv_checkbox", &be_class_lv_checkbox, lv_checkbox_func, sizeof(lv_checkbox_func) / sizeof(lv_checkbox_func[0]) }, +#endif // BE_LV_WIDGET_CHECKBOX + { "lv_color", &be_class_lv_color, lv_color_func, sizeof(lv_color_func) / sizeof(lv_color_func[0]) }, +#ifdef BE_LV_WIDGET_COLORWHEEL + { "lv_colorwheel", &be_class_lv_colorwheel, lv_colorwheel_func, sizeof(lv_colorwheel_func) / sizeof(lv_colorwheel_func[0]) }, +#endif // BE_LV_WIDGET_COLORWHEEL + { "lv_disp", &be_class_lv_disp, lv_disp_func, sizeof(lv_disp_func) / sizeof(lv_disp_func[0]) }, +#ifdef BE_LV_WIDGET_DROPDOWN + { "lv_dropdown", &be_class_lv_dropdown, lv_dropdown_func, sizeof(lv_dropdown_func) / sizeof(lv_dropdown_func[0]) }, +#endif // BE_LV_WIDGET_DROPDOWN + { "lv_font", &be_class_lv_font, lv_font_func, sizeof(lv_font_func) / sizeof(lv_font_func[0]) }, + { "lv_group", &be_class_lv_group, lv_group_func, sizeof(lv_group_func) / sizeof(lv_group_func[0]) }, +#ifdef BE_LV_WIDGET_IMG + { "lv_img", &be_class_lv_img, lv_img_func, sizeof(lv_img_func) / sizeof(lv_img_func[0]) }, +#endif // BE_LV_WIDGET_IMG +#ifdef BE_LV_WIDGET_IMGBTN + { "lv_imgbtn", &be_class_lv_imgbtn, lv_imgbtn_func, sizeof(lv_imgbtn_func) / sizeof(lv_imgbtn_func[0]) }, +#endif // BE_LV_WIDGET_IMGBTN + { "lv_indev", &be_class_lv_indev, lv_indev_func, sizeof(lv_indev_func) / sizeof(lv_indev_func[0]) }, +#ifdef BE_LV_WIDGET_LABEL + { "lv_label", &be_class_lv_label, lv_label_func, sizeof(lv_label_func) / sizeof(lv_label_func[0]) }, +#endif // BE_LV_WIDGET_LABEL +#ifdef BE_LV_WIDGET_LED + { "lv_led", &be_class_lv_led, lv_led_func, sizeof(lv_led_func) / sizeof(lv_led_func[0]) }, +#endif // BE_LV_WIDGET_LED +#ifdef BE_LV_WIDGET_LINE + { "lv_line", &be_class_lv_line, lv_line_func, sizeof(lv_line_func) / sizeof(lv_line_func[0]) }, +#endif // BE_LV_WIDGET_LINE +#ifdef BE_LV_WIDGET_METER + { "lv_meter", &be_class_lv_meter, lv_meter_func, sizeof(lv_meter_func) / sizeof(lv_meter_func[0]) }, +#endif // BE_LV_WIDGET_METER +#ifdef BE_LV_WIDGET_MSGBOX + { "lv_msgbox", &be_class_lv_msgbox, lv_msgbox_func, sizeof(lv_msgbox_func) / sizeof(lv_msgbox_func[0]) }, +#endif // BE_LV_WIDGET_MSGBOX + { "lv_obj", &be_class_lv_obj, lv_obj_func, sizeof(lv_obj_func) / sizeof(lv_obj_func[0]) }, +#ifdef BE_LV_WIDGET_ROLLER + { "lv_roller", &be_class_lv_roller, lv_roller_func, sizeof(lv_roller_func) / sizeof(lv_roller_func[0]) }, +#endif // BE_LV_WIDGET_ROLLER +#ifdef BE_LV_WIDGET_SLIDER + { "lv_slider", &be_class_lv_slider, lv_slider_func, sizeof(lv_slider_func) / sizeof(lv_slider_func[0]) }, +#endif // BE_LV_WIDGET_SLIDER +#ifdef BE_LV_WIDGET_SPINBOX + { "lv_spinbox", &be_class_lv_spinbox, lv_spinbox_func, sizeof(lv_spinbox_func) / sizeof(lv_spinbox_func[0]) }, +#endif // BE_LV_WIDGET_SPINBOX +#ifdef BE_LV_WIDGET_SPINNER + { "lv_spinner", &be_class_lv_spinner, lv_spinner_func, sizeof(lv_spinner_func) / sizeof(lv_spinner_func[0]) }, +#endif // BE_LV_WIDGET_SPINNER + { "lv_style", &be_class_lv_style, lv_style_func, sizeof(lv_style_func) / sizeof(lv_style_func[0]) }, +#ifdef BE_LV_WIDGET_SWITCH + { "lv_switch", &be_class_lv_switch, lv_switch_func, sizeof(lv_switch_func) / sizeof(lv_switch_func[0]) }, +#endif // BE_LV_WIDGET_SWITCH +#ifdef BE_LV_WIDGET_TABLE + { "lv_table", &be_class_lv_table, lv_table_func, sizeof(lv_table_func) / sizeof(lv_table_func[0]) }, +#endif // BE_LV_WIDGET_TABLE +#ifdef BE_LV_WIDGET_TEXTAREA + { "lv_textarea", &be_class_lv_textarea, lv_textarea_func, sizeof(lv_textarea_func) / sizeof(lv_textarea_func[0]) }, +#endif // BE_LV_WIDGET_TEXTAREA + { "lv_theme", &be_class_lv_theme, lv_theme_func, sizeof(lv_theme_func) / sizeof(lv_theme_func[0]) }, +}; +const size_t lv_classes_size = sizeof(lv_classes) / sizeof(lv_classes[0]); + + /* `lv_style` methods */ + /* `lv_font` methods */ + /* `lv_color` methods */ + /* `lv_theme` methods */ + /* `lv_img` methods */ +#ifdef BE_LV_WIDGET_IMG + int be_ntv_lv_img_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_img_create, "+_p", "(lv.lv_obj)"); } +#endif // BE_LV_WIDGET_IMG + /* `lv_disp` methods */ + /* `lv_obj` methods */ + int be_ntv_lv_obj_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_obj_create, "+_p", "(lv.lv_obj)"); } + /* `lv_group` methods */ + int be_ntv_lv_group_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_group_create, "+_p", ""); } + /* `lv_indev` methods */ + /* `lv_chart` methods */ +#ifdef BE_LV_WIDGET_CHART + int be_ntv_lv_chart_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_chart_create, "+_p", "(lv.lv_obj)"); } +#endif // BE_LV_WIDGET_CHART + /* `lv_colorwheel` methods */ +#ifdef BE_LV_WIDGET_COLORWHEEL + int be_ntv_lv_colorwheel_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_colorwheel_create, "+_p", "(lv.lv_obj)b"); } +#endif // BE_LV_WIDGET_COLORWHEEL + /* `lv_imgbtn` methods */ +#ifdef BE_LV_WIDGET_IMGBTN + int be_ntv_lv_imgbtn_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_imgbtn_create, "+_p", "(lv.lv_obj)"); } +#endif // BE_LV_WIDGET_IMGBTN + /* `lv_led` methods */ +#ifdef BE_LV_WIDGET_LED + int be_ntv_lv_led_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_led_create, "+_p", "(lv.lv_obj)"); } +#endif // BE_LV_WIDGET_LED + /* `lv_meter` methods */ +#ifdef BE_LV_WIDGET_METER + int be_ntv_lv_meter_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_meter_create, "+_p", "(lv.lv_obj)"); } +#endif // BE_LV_WIDGET_METER + /* `lv_msgbox` methods */ +#ifdef BE_LV_WIDGET_MSGBOX + int be_ntv_lv_msgbox_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_msgbox_create, "+_p", "(lv.lv_obj)sssb"); } +#endif // BE_LV_WIDGET_MSGBOX + /* `lv_spinbox` methods */ +#ifdef BE_LV_WIDGET_SPINBOX + int be_ntv_lv_spinbox_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_spinbox_create, "+_p", "(lv.lv_obj)"); } +#endif // BE_LV_WIDGET_SPINBOX + /* `lv_spinner` methods */ +#ifdef BE_LV_WIDGET_SPINNER + int be_ntv_lv_spinner_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_spinner_create, "+_p", "(lv.lv_obj)ii"); } +#endif // BE_LV_WIDGET_SPINNER + /* `lv_arc` methods */ +#ifdef BE_LV_WIDGET_ARC + int be_ntv_lv_arc_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_arc_create, "+_p", "(lv.lv_obj)"); } +#endif // BE_LV_WIDGET_ARC + /* `lv_bar` methods */ +#ifdef BE_LV_WIDGET_BAR + int be_ntv_lv_bar_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_bar_create, "+_p", "(lv.lv_obj)"); } +#endif // BE_LV_WIDGET_BAR + /* `lv_btn` methods */ +#ifdef BE_LV_WIDGET_BTN + int be_ntv_lv_btn_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_btn_create, "+_p", "(lv.lv_obj)"); } +#endif // BE_LV_WIDGET_BTN + /* `lv_btnmatrix` methods */ +#ifdef BE_LV_WIDGET_BTNMATRIX + int be_ntv_lv_btnmatrix_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_btnmatrix_create, "+_p", "(lv.lv_obj)"); } +#endif // BE_LV_WIDGET_BTNMATRIX + /* `lv_canvas` methods */ +#ifdef BE_LV_WIDGET_CANVAS + int be_ntv_lv_canvas_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_canvas_create, "+_p", "(lv.lv_obj)"); } +#endif // BE_LV_WIDGET_CANVAS + /* `lv_checkbox` methods */ +#ifdef BE_LV_WIDGET_CHECKBOX + int be_ntv_lv_checkbox_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_checkbox_create, "+_p", "(lv.lv_obj)"); } +#endif // BE_LV_WIDGET_CHECKBOX + /* `lv_dropdown` methods */ +#ifdef BE_LV_WIDGET_DROPDOWN + int be_ntv_lv_dropdown_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_dropdown_create, "+_p", "(lv.lv_obj)"); } +#endif // BE_LV_WIDGET_DROPDOWN + /* `lv_label` methods */ +#ifdef BE_LV_WIDGET_LABEL + int be_ntv_lv_label_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_label_create, "+_p", "(lv.lv_obj)"); } +#endif // BE_LV_WIDGET_LABEL + /* `lv_line` methods */ +#ifdef BE_LV_WIDGET_LINE + int be_ntv_lv_line_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_line_create, "+_p", "(lv.lv_obj)"); } +#endif // BE_LV_WIDGET_LINE + /* `lv_roller` methods */ +#ifdef BE_LV_WIDGET_ROLLER + int be_ntv_lv_roller_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_roller_create, "+_p", "(lv.lv_obj)"); } +#endif // BE_LV_WIDGET_ROLLER + /* `lv_slider` methods */ +#ifdef BE_LV_WIDGET_SLIDER + int be_ntv_lv_slider_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_slider_create, "+_p", "(lv.lv_obj)"); } +#endif // BE_LV_WIDGET_SLIDER + /* `lv_switch` methods */ +#ifdef BE_LV_WIDGET_SWITCH + int be_ntv_lv_switch_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_switch_create, "+_p", "(lv.lv_obj)"); } +#endif // BE_LV_WIDGET_SWITCH + /* `lv_table` methods */ +#ifdef BE_LV_WIDGET_TABLE + int be_ntv_lv_table_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_table_create, "+_p", "(lv.lv_obj)"); } +#endif // BE_LV_WIDGET_TABLE + /* `lv_textarea` methods */ +#ifdef BE_LV_WIDGET_TEXTAREA + int be_ntv_lv_textarea_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_textarea_create, "+_p", "(lv.lv_obj)"); } +#endif // BE_LV_WIDGET_TEXTAREA + +// create font either empty or from parameter on stack +int lvbe_font_create(bvm *vm) { return be_call_c_func(vm, NULL, "+_p", ""); } +int lvbe_theme_create(bvm *vm) { return be_call_c_func(vm, NULL, "+_p", ""); } + + +#ifdef __cplusplus +} /* extern "C" */ +#endif +/********************************************************************/ diff --git a/lib/libesp32/berry/default/be_lvgl_module.c b/lib/libesp32_lvgl/lv_berry/generate/be_lvgl_module.c similarity index 99% rename from lib/libesp32/berry/default/be_lvgl_module.c rename to lib/libesp32_lvgl/lv_berry/generate/be_lvgl_module.c index bb9b86e3e..706f4559f 100644 --- a/lib/libesp32/berry/default/be_lvgl_module.c +++ b/lib/libesp32_lvgl/lv_berry/generate/be_lvgl_module.c @@ -6,8 +6,6 @@ *******************************************************************/ #include "be_constobj.h" -#ifdef USE_LVGL - #include "lvgl.h" #include "be_mapping.h" #include "lv_theme_openhasp.h" @@ -682,6 +680,4 @@ be_local_module(lv, ); BE_EXPORT_VARIABLE be_define_const_native_module(lv); -#endif // USE_LVGL - /********************************************************************/ diff --git a/lib/libesp32/berry/default/be_lvgl_widgets_lib.c b/lib/libesp32_lvgl/lv_berry/generate/be_lvgl_widgets_lib.c similarity index 99% rename from lib/libesp32/berry/default/be_lvgl_widgets_lib.c rename to lib/libesp32_lvgl/lv_berry/generate/be_lvgl_widgets_lib.c index 68950d144..1d20bee34 100644 --- a/lib/libesp32/berry/default/be_lvgl_widgets_lib.c +++ b/lib/libesp32_lvgl/lv_berry/generate/be_lvgl_widgets_lib.c @@ -8,8 +8,6 @@ *******************************************************************/ #include "be_constobj.h" -#ifdef USE_LVGL - #include "lvgl.h" extern int lv0_init(bvm *vm); @@ -1559,6 +1557,3 @@ void be_load_lv_textarea_class(bvm *vm) { be_pop(vm, 1); } - -#endif // USE_LVGL - diff --git a/lib/libesp32_lvgl/lv_berry/library.json b/lib/libesp32_lvgl/lv_berry/library.json new file mode 100644 index 000000000..c5cd36d2f --- /dev/null +++ b/lib/libesp32_lvgl/lv_berry/library.json @@ -0,0 +1,25 @@ +{ + "name": "Berry mapping to LVGL", + "version": "1.0", + "description": "Mapping of LVGL functions to Berry", + "license": "MIT", + "homepage": "https://github.com/arendst/Tasmota", + "frameworks": "*", + "platforms": "*", + "authors": + { + "name": "Stephan Hadinger", + "maintainer": true + }, + "build": { + "srcFilter": [ + "+<*.c>", + "+<../generate/*.c>", + "+<../generate/*.cpp>", + "+<../generate/*.hpp>", + "+<*.cpp>", + "+<*.h>" + ], + "flags": [ "-I$PROJECT_DIR/include" ] + } + } \ No newline at end of file diff --git a/tools/lv_berry/lv_enum.h b/lib/libesp32_lvgl/lv_berry/mapping/lv_enum.h similarity index 100% rename from tools/lv_berry/lv_enum.h rename to lib/libesp32_lvgl/lv_berry/mapping/lv_enum.h diff --git a/tools/lv_berry/lv_funcs.h b/lib/libesp32_lvgl/lv_berry/mapping/lv_funcs.h similarity index 95% rename from tools/lv_berry/lv_funcs.h rename to lib/libesp32_lvgl/lv_berry/mapping/lv_funcs.h index 31367d8bf..8531ba8ac 100644 --- a/tools/lv_berry/lv_funcs.h +++ b/lib/libesp32_lvgl/lv_berry/mapping/lv_funcs.h @@ -28,7 +28,7 @@ lv_coord_t lv_get_ver_res(void); // ====================================================================== -// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_disp.h +// ../../lvgl/src/core/lv_disp.h lv_obj_t * lv_disp_get_scr_act(lv_disp_t * disp) lv_obj_t * lv_disp_get_scr_prev(lv_disp_t * disp) void lv_disp_load_scr(lv_obj_t * scr) @@ -50,7 +50,7 @@ static inline void lv_scr_load(lv_obj_t * scr) static inline lv_coord_t lv_dpx(lv_coord_t n) static inline lv_coord_t lv_disp_dpx(const lv_disp_t * disp, lv_coord_t n) -// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_event.h +// ../../lvgl/src/core/lv_event.h lv_res_t lv_event_send(struct _lv_obj_t * obj, lv_event_code_t event_code, void * param) lv_res_t lv_obj_event_base(const lv_obj_class_t * class_p, lv_event_t * e) uint32_t lv_event_register_id(void) @@ -60,7 +60,7 @@ bool lv_obj_remove_event_dsc(struct _lv_obj_t * obj, struct _lv_event_dsc_t * ev void lv_event_set_ext_draw_size(lv_event_t * e, lv_coord_t size) void lv_event_set_cover_res(lv_event_t * e, lv_cover_res_t res) -// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_group.h +// ../../lvgl/src/core/lv_group.h lv_group_t * lv_group_create(void) void lv_group_del(lv_group_t * group) void lv_group_set_default(lv_group_t * group) @@ -83,7 +83,7 @@ bool lv_group_get_editing(const lv_group_t * group) bool lv_group_get_wrap(lv_group_t * group) uint32_t lv_group_get_obj_count(lv_group_t * group) -// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_indev.h +// ../../lvgl/src/core/lv_indev.h void lv_indev_read_timer_cb(lv_timer_t * timer) void lv_indev_enable(lv_indev_t * indev, bool en) lv_indev_t * lv_indev_get_act(void) @@ -104,9 +104,9 @@ lv_obj_t * lv_indev_get_obj_act(void) lv_timer_t * lv_indev_get_read_timer(lv_disp_t * indev) lv_obj_t * lv_indev_search_obj(lv_obj_t * obj, lv_point_t * point) -// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_indev_scroll.h +// ../../lvgl/src/core/lv_indev_scroll.h -// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_obj.h +// ../../lvgl/src/core/lv_obj.h lv_obj_t * lv_obj_create(lv_obj_t * parent) void lv_obj_add_flag(lv_obj_t * obj, lv_obj_flag_t f) void lv_obj_clear_flag(lv_obj_t * obj, lv_obj_flag_t f) @@ -126,13 +126,13 @@ const lv_obj_class_t * lv_obj_get_class(const lv_obj_t * obj) bool lv_obj_is_valid(const lv_obj_t * obj) static inline lv_coord_t lv_obj_dpx(const lv_obj_t * obj, lv_coord_t n) -// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_obj_class.h +// ../../lvgl/src/core/lv_obj_class.h struct _lv_obj_t * lv_obj_class_create_obj(const struct _lv_obj_class_t * class_p, struct _lv_obj_t * parent) void lv_obj_class_init_obj(struct _lv_obj_t * obj) bool lv_obj_is_editable(struct _lv_obj_t * obj) bool lv_obj_is_group_def(struct _lv_obj_t * obj) -// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_obj_draw.h +// ../../lvgl/src/core/lv_obj_draw.h void lv_obj_init_draw_rect_dsc(struct _lv_obj_t * obj, uint32_t part, lv_draw_rect_dsc_t * draw_dsc) void lv_obj_init_draw_label_dsc(struct _lv_obj_t * obj, uint32_t part, lv_draw_label_dsc_t * draw_dsc) void lv_obj_init_draw_img_dsc(struct _lv_obj_t * obj, uint32_t part, lv_draw_img_dsc_t * draw_dsc) @@ -142,7 +142,7 @@ lv_coord_t lv_obj_calculate_ext_draw_size(struct _lv_obj_t * obj, uint32_t part) void lv_obj_draw_dsc_init(lv_obj_draw_part_dsc_t * dsc, const lv_area_t * clip_area) void lv_obj_refresh_ext_draw_size(struct _lv_obj_t * obj) -// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_obj_pos.h +// ../../lvgl/src/core/lv_obj_pos.h void lv_obj_set_pos(struct _lv_obj_t * obj, lv_coord_t x, lv_coord_t y) void lv_obj_set_x(struct _lv_obj_t * obj, lv_coord_t x) void lv_obj_set_y(struct _lv_obj_t * obj, lv_coord_t y) @@ -187,7 +187,7 @@ bool lv_obj_hit_test(struct _lv_obj_t * obj, const lv_point_t * point) lv_coord_t lv_clamp_width(lv_coord_t width, lv_coord_t min_width, lv_coord_t max_width, lv_coord_t ref_width) lv_coord_t lv_clamp_height(lv_coord_t height, lv_coord_t min_height, lv_coord_t max_height, lv_coord_t ref_height) -// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_obj_scroll.h +// ../../lvgl/src/core/lv_obj_scroll.h void lv_obj_set_scrollbar_mode(struct _lv_obj_t * obj, lv_scrollbar_mode_t mode) void lv_obj_set_scroll_dir(struct _lv_obj_t * obj, lv_dir_t dir) void lv_obj_set_scroll_snap_x(struct _lv_obj_t * obj, lv_scroll_snap_t align) @@ -215,7 +215,7 @@ void lv_obj_get_scrollbar_area(struct _lv_obj_t * obj, lv_area_t * hor, lv_area_ void lv_obj_scrollbar_invalidate(struct _lv_obj_t * obj) void lv_obj_readjust_scroll(struct _lv_obj_t * obj, lv_anim_enable_t anim_en) -// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_obj_style.h +// ../../lvgl/src/core/lv_obj_style.h void lv_obj_add_style(struct _lv_obj_t * obj, lv_style_t * style, lv_style_selector_t selector) void lv_obj_remove_style(struct _lv_obj_t * obj, lv_style_t * style, lv_style_selector_t selector) static inline void lv_obj_remove_style_all(struct _lv_obj_t * obj) @@ -236,7 +236,7 @@ static inline void lv_obj_set_style_pad_ver(struct _lv_obj_t * obj, lv_coord_t v static inline void lv_obj_set_style_pad_gap(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector) static inline void lv_obj_set_style_size(struct _lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector) -// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_obj_style_gen.h +// ../../lvgl/src/core/lv_obj_style_gen.h static inline lv_coord_t lv_obj_get_style_width(const struct _lv_obj_t * obj, uint32_t part) static inline lv_coord_t lv_obj_get_style_min_width(const struct _lv_obj_t * obj, uint32_t part) static inline lv_coord_t lv_obj_get_style_max_width(const struct _lv_obj_t * obj, uint32_t part) @@ -416,7 +416,7 @@ void lv_obj_set_style_arc_color_filtered(struct _lv_obj_t * obj, lv_color_t valu void lv_obj_set_style_arc_opa(struct _lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector) void lv_obj_set_style_arc_img_src(struct _lv_obj_t * obj, const void * value, lv_style_selector_t selector) -// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_obj_tree.h +// ../../lvgl/src/core/lv_obj_tree.h void lv_obj_del(struct _lv_obj_t * obj) void lv_obj_clean(struct _lv_obj_t * obj) void lv_obj_del_anim_ready_cb(lv_anim_t * a) @@ -432,10 +432,10 @@ uint32_t lv_obj_get_child_cnt(const struct _lv_obj_t * obj) uint32_t lv_obj_get_child_id(const struct _lv_obj_t * obj) void lv_obj_tree_walk(struct _lv_obj_t * start_obj, lv_obj_tree_walk_cb_t cb, void * user_data) -// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_refr.h +// ../../lvgl/src/core/lv_refr.h void lv_refr_now(lv_disp_t * disp) -// ../../lib/libesp32_lvgl/LVGL8/src/core/lv_theme.h +// ../../lvgl/src/core/lv_theme.h lv_theme_t * lv_theme_get_from_obj(lv_obj_t * obj) void lv_theme_apply(lv_obj_t * obj) void lv_theme_set_parent(lv_theme_t * new_theme, lv_theme_t * parent) @@ -446,30 +446,30 @@ const lv_font_t * lv_theme_get_font_large(lv_obj_t * obj) lv_color_t lv_theme_get_color_primary(lv_obj_t * obj) lv_color_t lv_theme_get_color_secondary(lv_obj_t * obj) -// ../../lib/libesp32_lvgl/LVGL8/src/draw/lv_draw.h +// ../../lvgl/src/draw/lv_draw.h -// ../../lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_arc.h +// ../../lvgl/src/draw/lv_draw_arc.h void lv_draw_arc_dsc_init(lv_draw_arc_dsc_t * dsc) void lv_draw_arc(lv_coord_t center_x, lv_coord_t center_y, uint16_t radius, uint16_t start_angle, uint16_t end_angle, const lv_area_t * clip_area, const lv_draw_arc_dsc_t * dsc) void lv_draw_arc_get_area(lv_coord_t x, lv_coord_t y, uint16_t radius, uint16_t start_angle, uint16_t end_angle, lv_coord_t w, bool rounded, lv_area_t * area) -// ../../lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_blend.h +// ../../lvgl/src/draw/lv_draw_blend.h -// ../../lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_img.h +// ../../lvgl/src/draw/lv_draw_img.h void lv_draw_img_dsc_init(lv_draw_img_dsc_t * dsc) void lv_draw_img(const lv_area_t * coords, const lv_area_t * mask, const void * src, const lv_draw_img_dsc_t * dsc) lv_img_src_t lv_img_src_get_type(const void * src) -// ../../lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_label.h +// ../../lvgl/src/draw/lv_draw_label.h void lv_draw_label_dsc_init(lv_draw_label_dsc_t * dsc) void lv_draw_label(const lv_area_t * coords, const lv_area_t * mask, const lv_draw_label_dsc_t * dsc, const char * txt, lv_draw_label_hint_t * hint) void lv_draw_letter(const lv_point_t * pos_p, const lv_area_t * clip_area, const lv_font_t * font_p, uint32_t letter, lv_color_t color, lv_opa_t opa, lv_blend_mode_t blend_mode) -// ../../lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_line.h +// ../../lvgl/src/draw/lv_draw_line.h void lv_draw_line(const lv_point_t * point1, const lv_point_t * point2, const lv_area_t * clip, const lv_draw_line_dsc_t * dsc) void lv_draw_line_dsc_init(lv_draw_line_dsc_t * dsc) -// ../../lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_mask.h +// ../../lvgl/src/draw/lv_draw_mask.h static inline uint8_t lv_draw_mask_get_cnt(void) int16_t lv_draw_mask_add(void * param, void * custom_id) lv_draw_mask_res_t lv_draw_mask_apply(lv_opa_t * mask_buf, lv_coord_t abs_x, lv_coord_t abs_y, lv_coord_t len) @@ -483,28 +483,28 @@ void lv_draw_mask_radius_init(lv_draw_mask_radius_param_t * param, const lv_area void lv_draw_mask_fade_init(lv_draw_mask_fade_param_t * param, const lv_area_t * coords, lv_opa_t opa_top, lv_coord_t y_top, lv_opa_t opa_bottom, lv_coord_t y_bottom) void lv_draw_mask_map_init(lv_draw_mask_map_param_t * param, const lv_area_t * coords, const lv_opa_t * map) -// ../../lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_rect.h +// ../../lvgl/src/draw/lv_draw_rect.h void lv_draw_rect_dsc_init(lv_draw_rect_dsc_t * dsc) void lv_draw_rect(const lv_area_t * coords, const lv_area_t * mask, const lv_draw_rect_dsc_t * dsc) -// ../../lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_triangle.h +// ../../lvgl/src/draw/lv_draw_triangle.h void lv_draw_triangle(const lv_point_t points[], const lv_area_t * clip, const lv_draw_rect_dsc_t * draw_dsc) void lv_draw_polygon(const lv_point_t points[], uint16_t point_cnt, const lv_area_t * mask, const lv_draw_rect_dsc_t * draw_dsc) -// ../../lib/libesp32_lvgl/LVGL8/src/draw/lv_img_buf.h +// ../../lvgl/src/draw/lv_img_buf.h -// ../../lib/libesp32_lvgl/LVGL8/src/draw/lv_img_cache.h +// ../../lvgl/src/draw/lv_img_cache.h -// ../../lib/libesp32_lvgl/LVGL8/src/draw/lv_img_decoder.h +// ../../lvgl/src/draw/lv_img_decoder.h -// ../../lib/libesp32_lvgl/LVGL8/src/extra/themes/default/lv_theme_default.h +// ../../lvgl/src/extra/themes/default/lv_theme_default.h lv_theme_t * lv_theme_default_init(lv_disp_t * disp, lv_color_t color_primary, lv_color_t color_secondary, bool dark, const lv_font_t * font) bool lv_theme_default_is_inited(void) -// ../../lib/libesp32_lvgl/LVGL8/src/extra/themes/mono/lv_theme_mono.h +// ../../lvgl/src/extra/themes/mono/lv_theme_mono.h lv_theme_t * lv_theme_mono_init(lv_disp_t * disp, bool dark_bg, const lv_font_t * font) -// ../../lib/libesp32_lvgl/LVGL8/src/extra/widgets/chart/lv_chart.h +// ../../lvgl/src/extra/widgets/chart/lv_chart.h lv_obj_t * lv_chart_create(lv_obj_t * parent) void lv_chart_set_type(lv_obj_t * obj, lv_chart_type_t type) void lv_chart_set_point_count(lv_obj_t * obj, uint16_t cnt) @@ -542,7 +542,7 @@ lv_coord_t * lv_chart_get_y_array(const lv_obj_t * obj, lv_chart_series_t * ser) lv_coord_t * lv_chart_get_x_array(const lv_obj_t * obj, lv_chart_series_t * ser) uint32_t lv_chart_get_pressed_point(const lv_obj_t * obj) -// ../../lib/libesp32_lvgl/LVGL8/src/extra/widgets/colorwheel/lv_colorwheel.h +// ../../lvgl/src/extra/widgets/colorwheel/lv_colorwheel.h lv_obj_t * lv_colorwheel_create(lv_obj_t * parent, bool knob_recolor) bool lv_colorwheel_set_hsv(lv_obj_t * obj, lv_color_hsv_t hsv) bool lv_colorwheel_set_rgb(lv_obj_t * obj, lv_color_t color) @@ -553,11 +553,11 @@ lv_color_t lv_colorwheel_get_rgb(lv_obj_t * obj) lv_colorwheel_mode_t lv_colorwheel_get_color_mode(lv_obj_t * obj) bool lv_colorwheel_get_color_mode_fixed(lv_obj_t * obj) -// ../../lib/libesp32_lvgl/LVGL8/src/extra/widgets/imgbtn/lv_imgbtn.h +// ../../lvgl/src/extra/widgets/imgbtn/lv_imgbtn.h lv_obj_t * lv_imgbtn_create(lv_obj_t * parent) void lv_imgbtn_set_src(lv_obj_t * imgbtn, lv_imgbtn_state_t state, const void * src_left, const void * src_mid, const void * src_right) -// ../../lib/libesp32_lvgl/LVGL8/src/extra/widgets/led/lv_led.h +// ../../lvgl/src/extra/widgets/led/lv_led.h lv_obj_t * lv_led_create(lv_obj_t * parent) void lv_led_set_color(lv_obj_t * led, lv_color_t color) void lv_led_set_brightness(lv_obj_t * led, uint8_t bright) @@ -566,7 +566,7 @@ void lv_led_off(lv_obj_t * led) void lv_led_toggle(lv_obj_t * led) uint8_t lv_led_get_brightness(const lv_obj_t * obj) -// ../../lib/libesp32_lvgl/LVGL8/src/extra/widgets/meter/lv_meter.h +// ../../lvgl/src/extra/widgets/meter/lv_meter.h lv_obj_t * lv_meter_create(lv_obj_t * parent) lv_meter_scale_t * lv_meter_add_scale(lv_obj_t * obj) void lv_meter_set_scale_ticks(lv_obj_t * obj, lv_meter_scale_t * scale, uint16_t cnt, uint16_t width, uint16_t len, lv_color_t color) @@ -580,7 +580,7 @@ void lv_meter_set_indicator_value(lv_obj_t * obj, lv_meter_indicator_t * indic, void lv_meter_set_indicator_start_value(lv_obj_t * obj, lv_meter_indicator_t * indic, int32_t value) void lv_meter_set_indicator_end_value(lv_obj_t * obj, lv_meter_indicator_t * indic, int32_t value) -// ../../lib/libesp32_lvgl/LVGL8/src/extra/widgets/msgbox/lv_msgbox.h +// ../../lvgl/src/extra/widgets/msgbox/lv_msgbox.h lv_obj_t * lv_msgbox_create(lv_obj_t * parent, const char * title, const char * txt, const char * btn_txts[], bool add_close_btn) lv_obj_t * lv_msgbox_get_title(lv_obj_t * mbox) lv_obj_t * lv_msgbox_get_close_btn(lv_obj_t * mbox) @@ -589,7 +589,7 @@ lv_obj_t * lv_msgbox_get_btns(lv_obj_t * mbox) const char * lv_msgbox_get_active_btn_text(lv_obj_t * mbox) void lv_msgbox_close(lv_obj_t * mbox) -// ../../lib/libesp32_lvgl/LVGL8/src/extra/widgets/spinbox/lv_spinbox.h +// ../../lvgl/src/extra/widgets/spinbox/lv_spinbox.h lv_obj_t * lv_spinbox_create(lv_obj_t * parent) void lv_spinbox_set_value(lv_obj_t * obj, int32_t i) void lv_spinbox_set_rollover(lv_obj_t * obj, bool b) @@ -604,10 +604,10 @@ void lv_spinbox_step_prev(lv_obj_t * obj) void lv_spinbox_increment(lv_obj_t * obj) void lv_spinbox_decrement(lv_obj_t * obj) -// ../../lib/libesp32_lvgl/LVGL8/src/extra/widgets/spinner/lv_spinner.h +// ../../lvgl/src/extra/widgets/spinner/lv_spinner.h lv_obj_t * lv_spinner_create(lv_obj_t * parent, uint32_t time, uint32_t arc_length) -// ../../lib/libesp32_lvgl/LVGL8/src/misc/lv_style_gen.h +// ../../lvgl/src/misc/lv_style_gen.h void lv_style_set_width(lv_style_t * style, lv_coord_t value) void lv_style_set_min_width(lv_style_t * style, lv_coord_t value) void lv_style_set_max_width(lv_style_t * style, lv_coord_t value) @@ -698,7 +698,7 @@ void lv_style_set_arc_color_filtered(lv_style_t * style, lv_color_t value) void lv_style_set_arc_opa(lv_style_t * style, lv_opa_t value) void lv_style_set_arc_img_src(lv_style_t * style, const void * value) -// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_arc.h +// ../../lvgl/src/widgets/lv_arc.h lv_obj_t * lv_arc_create(lv_obj_t * parent) void lv_arc_set_start_angle(lv_obj_t * arc, uint16_t start) void lv_arc_set_end_angle(lv_obj_t * arc, uint16_t end) @@ -720,7 +720,7 @@ int16_t lv_arc_get_min_value(const lv_obj_t * obj) int16_t lv_arc_get_max_value(const lv_obj_t * obj) lv_arc_mode_t lv_arc_get_mode(const lv_obj_t * obj) -// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_bar.h +// ../../lvgl/src/widgets/lv_bar.h lv_obj_t * lv_bar_create(lv_obj_t * parent) void lv_bar_set_value(lv_obj_t * obj, int32_t value, lv_anim_enable_t anim) void lv_bar_set_start_value(lv_obj_t * obj, int32_t start_value, lv_anim_enable_t anim) @@ -732,10 +732,10 @@ int32_t lv_bar_get_min_value(const lv_obj_t * obj) int32_t lv_bar_get_max_value(const lv_obj_t * obj) lv_bar_mode_t lv_bar_get_mode(lv_obj_t * obj) -// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_btn.h +// ../../lvgl/src/widgets/lv_btn.h lv_obj_t * lv_btn_create(lv_obj_t * parent) -// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_btnmatrix.h +// ../../lvgl/src/widgets/lv_btnmatrix.h lv_obj_t * lv_btnmatrix_create(lv_obj_t * parent) void lv_btnmatrix_set_map(lv_obj_t * obj, const char * map[]) void lv_btnmatrix_set_ctrl_map(lv_obj_t * obj, const lv_btnmatrix_ctrl_t ctrl_map[]) @@ -752,7 +752,7 @@ const char * lv_btnmatrix_get_btn_text(const lv_obj_t * obj, uint16_t btn_id) bool lv_btnmatrix_has_btn_ctrl(lv_obj_t * obj, uint16_t btn_id, lv_btnmatrix_ctrl_t ctrl) bool lv_btnmatrix_get_one_checked(const lv_obj_t * obj) -// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_canvas.h +// ../../lvgl/src/widgets/lv_canvas.h lv_obj_t * lv_canvas_create(lv_obj_t * parent) void lv_canvas_set_buffer(lv_obj_t * canvas, void * buf, lv_coord_t w, lv_coord_t h, lv_img_cf_t cf) void lv_canvas_set_px(lv_obj_t * canvas, lv_coord_t x, lv_coord_t y, lv_color_t c) @@ -771,13 +771,13 @@ void lv_canvas_draw_line(lv_obj_t * canvas, const lv_point_t points[], uint32_t void lv_canvas_draw_polygon(lv_obj_t * canvas, const lv_point_t points[], uint32_t point_cnt, const lv_draw_rect_dsc_t * draw_dsc) void lv_canvas_draw_arc(lv_obj_t * canvas, lv_coord_t x, lv_coord_t y, lv_coord_t r, int32_t start_angle, int32_t end_angle, const lv_draw_arc_dsc_t * draw_dsc) -// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_checkbox.h +// ../../lvgl/src/widgets/lv_checkbox.h lv_obj_t * lv_checkbox_create(lv_obj_t * parent) void lv_checkbox_set_text(lv_obj_t * obj, const char * txt) void lv_checkbox_set_text_static(lv_obj_t * obj, const char * txt) const char * lv_checkbox_get_text(const lv_obj_t * obj) -// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_dropdown.h +// ../../lvgl/src/widgets/lv_dropdown.h lv_obj_t * lv_dropdown_create(lv_obj_t * parent) void lv_dropdown_set_text(lv_obj_t * obj, const char * txt) void lv_dropdown_set_options(lv_obj_t * obj, const char * options) @@ -800,7 +800,7 @@ lv_dir_t lv_dropdown_get_dir(const lv_obj_t * obj) void lv_dropdown_open(lv_obj_t * dropdown_obj) void lv_dropdown_close(lv_obj_t * obj) -// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_img.h +// ../../lvgl/src/widgets/lv_img.h lv_obj_t * lv_img_create(lv_obj_t * parent) void lv_img_set_src(lv_obj_t * obj, const void * src) void lv_img_set_offset_x(lv_obj_t * obj, lv_coord_t x) @@ -817,7 +817,7 @@ void lv_img_get_pivot(lv_obj_t * obj, lv_point_t * pivot) uint16_t lv_img_get_zoom(lv_obj_t * obj) bool lv_img_get_antialias(lv_obj_t * obj) -// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_label.h +// ../../lvgl/src/widgets/lv_label.h lv_obj_t * lv_label_create(lv_obj_t * parent) void lv_label_set_text(lv_obj_t * obj, const char * text) void lv_label_set_text_fmt(lv_obj_t * obj, const char * fmt, ...) LV_FORMAT_ATTRIBUTE(2, 3) @@ -837,15 +837,15 @@ uint32_t lv_label_get_text_selection_end(const lv_obj_t * obj) void lv_label_ins_text(lv_obj_t * obj, uint32_t pos, const char * txt) void lv_label_cut_text(lv_obj_t * obj, uint32_t pos, uint32_t cnt) -// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_line.h +// ../../lvgl/src/widgets/lv_line.h lv_obj_t * lv_line_create(lv_obj_t * parent) void lv_line_set_points(lv_obj_t * obj, const lv_point_t points[], uint16_t point_num) void lv_line_set_y_invert(lv_obj_t * obj, bool en) bool lv_line_get_y_invert(const lv_obj_t * obj) -// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_objx_templ.h +// ../../lvgl/src/widgets/lv_objx_templ.h -// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_roller.h +// ../../lvgl/src/widgets/lv_roller.h lv_obj_t * lv_roller_create(lv_obj_t * parent) void lv_roller_set_options(lv_obj_t * obj, const char * options, lv_roller_mode_t mode) void lv_roller_set_selected(lv_obj_t * obj, uint16_t sel_opt, lv_anim_enable_t anim) @@ -855,7 +855,7 @@ void lv_roller_get_selected_str(const lv_obj_t * obj, char * buf, uint32_t buf_s const char * lv_roller_get_options(const lv_obj_t * obj) uint16_t lv_roller_get_option_cnt(const lv_obj_t * obj) -// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_slider.h +// ../../lvgl/src/widgets/lv_slider.h lv_obj_t * lv_slider_create(lv_obj_t * parent) static inline void lv_slider_set_value(lv_obj_t * obj, int32_t value, lv_anim_enable_t anim) static inline void lv_slider_set_left_value(lv_obj_t * obj, int32_t value, lv_anim_enable_t anim) @@ -868,10 +868,10 @@ static inline int32_t lv_slider_get_max_value(const lv_obj_t * obj) bool lv_slider_is_dragged(const lv_obj_t * obj) static inline lv_slider_mode_t lv_slider_get_mode(lv_obj_t * slider) -// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_switch.h +// ../../lvgl/src/widgets/lv_switch.h lv_obj_t * lv_switch_create(lv_obj_t * parent) -// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_table.h +// ../../lvgl/src/widgets/lv_table.h lv_obj_t * lv_table_create(lv_obj_t * parent) void lv_table_set_cell_value(lv_obj_t * obj, uint16_t row, uint16_t col, const char * txt) void lv_table_set_cell_value_fmt(lv_obj_t * obj, uint16_t row, uint16_t col, const char * fmt, ...) @@ -887,7 +887,7 @@ lv_coord_t lv_table_get_col_width(lv_obj_t * obj, uint16_t col) bool lv_table_has_cell_ctrl(lv_obj_t * obj, uint16_t row, uint16_t col, lv_table_cell_ctrl_t ctrl) void lv_table_get_selected_cell(lv_obj_t * obj, uint16_t * row, uint16_t * col) -// ../../lib/libesp32_lvgl/LVGL8/src/widgets/lv_textarea.h +// ../../lvgl/src/widgets/lv_textarea.h lv_obj_t * lv_textarea_create(lv_obj_t * parent) void lv_textarea_add_char(lv_obj_t * obj, uint32_t c) void lv_textarea_add_text(lv_obj_t * obj, const char * txt) @@ -923,7 +923,7 @@ void lv_textarea_cursor_left(lv_obj_t * obj) void lv_textarea_cursor_down(lv_obj_t * obj) void lv_textarea_cursor_up(lv_obj_t * obj) -// ../../lib/libesp32_lvgl/LVGL_assets/src/lv_theme_openhasp.h +// ../../LVGL_assets/src/lv_theme_openhasp.h lv_theme_t * lv_theme_openhasp_init(lv_disp_t * disp, lv_color_t color_primary, lv_color_t color_secondary, bool dark, const lv_font_t * font) bool lv_theme_openhasp_is_inited(void) diff --git a/lib/libesp32/berry/default/be_lvgl_ctypes_definitions.c b/lib/libesp32_lvgl/lv_berry/src/be_lvgl_ctypes_definitions.c similarity index 99% rename from lib/libesp32/berry/default/be_lvgl_ctypes_definitions.c rename to lib/libesp32_lvgl/lv_berry/src/be_lvgl_ctypes_definitions.c index 74797a760..e632ed6b2 100644 --- a/lib/libesp32/berry/default/be_lvgl_ctypes_definitions.c +++ b/lib/libesp32_lvgl/lv_berry/src/be_lvgl_ctypes_definitions.c @@ -3,8 +3,6 @@ *******************************************************************/ #include "be_ctypes.h" -#ifdef USE_LVGL - #include "lvgl.h" #include "be_mapping.h" @@ -527,5 +525,3 @@ be_ctypes_class_by_name_t be_ctypes_lvgl_classes[] = { const size_t be_ctypes_lvgl_classes_size = sizeof(be_ctypes_lvgl_classes)/sizeof(be_ctypes_lvgl_classes[0]); /********************************************************************/ - -#endif // USE_LVGL \ No newline at end of file diff --git a/lib/libesp32/berry/default/be_lvgl_glob_lib.c b/lib/libesp32_lvgl/lv_berry/src/be_lvgl_glob_lib.c similarity index 99% rename from lib/libesp32/berry/default/be_lvgl_glob_lib.c rename to lib/libesp32_lvgl/lv_berry/src/be_lvgl_glob_lib.c index 49848e1dc..1c11b078e 100644 --- a/lib/libesp32/berry/default/be_lvgl_glob_lib.c +++ b/lib/libesp32_lvgl/lv_berry/src/be_lvgl_glob_lib.c @@ -3,10 +3,6 @@ *******************************************************************/ #include "be_constobj.h" -#ifdef USE_LVGL - -#include "lvgl.h" - /******************************************************************** ** Solidified function: get_object_from_ptr ********************************************************************/ @@ -823,5 +819,3 @@ void be_load_LVGL_glob_class(bvm *vm) { be_setglobal(vm, "LVGL_glob"); be_pop(vm, 1); } - -#endif // USE_LVGL \ No newline at end of file diff --git a/lib/libesp32/berry/default/embedded/lvgl_glob.be b/lib/libesp32_lvgl/lv_berry/src/embedded/lvgl_glob.be similarity index 100% rename from lib/libesp32/berry/default/embedded/lvgl_glob.be rename to lib/libesp32_lvgl/lv_berry/src/embedded/lvgl_glob.be diff --git a/lib/libesp32_lvgl/lv_berry/src/lv_berry.c b/lib/libesp32_lvgl/lv_berry/src/lv_berry.c new file mode 100644 index 000000000..ae56cf4bc --- /dev/null +++ b/lib/libesp32_lvgl/lv_berry/src/lv_berry.c @@ -0,0 +1,11 @@ +#include "lv_berry.h" + +extern void be_load_lv_color_class(bvm *vm); +extern void be_load_lv_font_class(bvm *vm); +extern void be_load_LVGL_glob_class(bvm *vm); + +void be_load_lvgl_classes(bvm *vm) { + be_load_lv_color_class(vm); + be_load_lv_font_class(vm); + be_load_LVGL_glob_class(vm); +} diff --git a/lib/libesp32_lvgl/lv_berry/src/lv_berry.h b/lib/libesp32_lvgl/lv_berry/src/lv_berry.h new file mode 100644 index 000000000..869628bfd --- /dev/null +++ b/lib/libesp32_lvgl/lv_berry/src/lv_berry.h @@ -0,0 +1,17 @@ + + +#ifndef __LV_BERRY__ +#define __LV_BERRY__ + +#ifdef __cplusplus +extern "C" { +#endif + +#include "berry.h" + +extern void be_load_lvgl_classes(bvm *vm); + +#ifdef __cplusplus +} +#endif +#endif // __LV_BERRY__ diff --git a/tools/lv_berry/convert.py b/lib/libesp32_lvgl/lv_berry/tools/convert.py similarity index 99% rename from tools/lv_berry/convert.py rename to lib/libesp32_lvgl/lv_berry/tools/convert.py index 86a4b86d4..01abafad0 100644 --- a/tools/lv_berry/convert.py +++ b/lib/libesp32_lvgl/lv_berry/tools/convert.py @@ -1,11 +1,11 @@ import re import sys -lv_widgets_file = "lv_funcs.h" -lv_module_file = "lv_enum.h" +lv_widgets_file = "../mapping/lv_funcs.h" +lv_module_file = "../mapping/lv_enum.h" -out_prefix = "../../tasmota/lvgl_berry/" -lvgl_prefix = "../../lib/libesp32/Berry/default/" +out_prefix = "../generate/" +lvgl_prefix = "../generate/" be_lv_defines = "be_lv_defines.h" be_lv_c_mapping = "be_lv_c_mapping.h" @@ -425,8 +425,6 @@ print(""" *******************************************************************/ #include "be_constobj.h" -#ifdef USE_LVGL - #include "lvgl.h" extern int lv0_init(bvm *vm); @@ -642,9 +640,6 @@ be_local_class(lv_{subtype}, }} """) -print(""" -#endif // USE_LVGL -""") sys.stdout.close() @@ -658,8 +653,6 @@ print("""/******************************************************************** *******************************************************************/ #include "be_constobj.h" -#ifdef USE_LVGL - #include "lvgl.h" #include "be_mapping.h" #include "lv_theme_openhasp.h" @@ -778,8 +771,6 @@ be_local_module(lv, })) ); BE_EXPORT_VARIABLE be_define_const_native_module(lv); - -#endif // USE_LVGL """) print("/********************************************************************/") diff --git a/tools/lv_berry/preprocessor.py b/lib/libesp32_lvgl/lv_berry/tools/preprocessor.py similarity index 97% rename from tools/lv_berry/preprocessor.py rename to lib/libesp32_lvgl/lv_berry/tools/preprocessor.py index 216a726fb..678237b52 100644 --- a/tools/lv_berry/preprocessor.py +++ b/lib/libesp32_lvgl/lv_berry/tools/preprocessor.py @@ -48,7 +48,7 @@ def clean_source(raw): # Parse function signatures # ################################################################################ -lv_src_prefix = "../../lib/libesp32_lvgl/LVGL8/src/" +lv_src_prefix = "../../lvgl/src/" lv_fun_globs = [ "widgets/*.h", # all widgets # "extra/widgets/*/*.h", @@ -69,14 +69,14 @@ lv_fun_globs = [ #"**/*.h", ] headers_names = list_files(lv_src_prefix, lv_fun_globs) -headers_names += list_files("../../lib/libesp32_lvgl/LVGL_assets/src/", ["lv_theme_openhasp.h"]) +headers_names += list_files("../../LVGL_assets/src/", ["lv_theme_openhasp.h"]) # headers_names += ["lv_pre_style.h"] # for LVGL v7, add pre-generated style functions from C preprocessor # unit test # headers_names = [ '../../lib/libesp32_lvgl/LVGL/src/lv_widgets/lv_btn.h' ] # headers_names = [ '../../lib/libesp32_lvgl/LVGL/src/lv_api_map.h' ] -output_filename = "lv_funcs.h" +output_filename = "../mapping/lv_funcs.h" sys.stdout = open(output_filename, 'w') print(""" @@ -169,11 +169,11 @@ sys.stdout.close() # Parse 'enum' # ################################################################################ -lv_src_prefix = "../../lib/libesp32_lvgl/LVGL8/src/" +lv_src_prefix = "../../lvgl/src/" lv_fun_globs = [ "**/*.h" ] headers_names = list_files(lv_src_prefix, lv_fun_globs) -output_filename = "lv_enum.h" +output_filename = "../mapping/lv_enum.h" sys.stdout = open(output_filename, 'w') print("""// ====================================================================== // Functions diff --git a/lib/libesp32_lvgl/LVGL8/Kconfig b/lib/libesp32_lvgl/lvgl/Kconfig similarity index 100% rename from lib/libesp32_lvgl/LVGL8/Kconfig rename to lib/libesp32_lvgl/lvgl/Kconfig diff --git a/lib/libesp32_lvgl/LVGL8/LICENCE.txt b/lib/libesp32_lvgl/lvgl/LICENCE.txt similarity index 100% rename from lib/libesp32_lvgl/LVGL8/LICENCE.txt rename to lib/libesp32_lvgl/lvgl/LICENCE.txt diff --git a/lib/libesp32_lvgl/LVGL8/README.md b/lib/libesp32_lvgl/lvgl/README.md similarity index 100% rename from lib/libesp32_lvgl/LVGL8/README.md rename to lib/libesp32_lvgl/lvgl/README.md diff --git a/lib/libesp32_lvgl/LVGL8/library.json b/lib/libesp32_lvgl/lvgl/library.json similarity index 100% rename from lib/libesp32_lvgl/LVGL8/library.json rename to lib/libesp32_lvgl/lvgl/library.json diff --git a/lib/libesp32_lvgl/LVGL8/library.properties b/lib/libesp32_lvgl/lvgl/library.properties similarity index 100% rename from lib/libesp32_lvgl/LVGL8/library.properties rename to lib/libesp32_lvgl/lvgl/library.properties diff --git a/lib/libesp32_lvgl/LVGL8/lv_conf_template.h b/lib/libesp32_lvgl/lvgl/lv_conf_template.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/lv_conf_template.h rename to lib/libesp32_lvgl/lvgl/lv_conf_template.h diff --git a/lib/libesp32_lvgl/LVGL8/lvgl.h b/lib/libesp32_lvgl/lvgl/lvgl.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/lvgl.h rename to lib/libesp32_lvgl/lvgl/lvgl.h diff --git a/lib/libesp32_lvgl/LVGL8/lvgl.mk b/lib/libesp32_lvgl/lvgl/lvgl.mk similarity index 100% rename from lib/libesp32_lvgl/LVGL8/lvgl.mk rename to lib/libesp32_lvgl/lvgl/lvgl.mk diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_core.mk b/lib/libesp32_lvgl/lvgl/src/core/lv_core.mk similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_core.mk rename to lib/libesp32_lvgl/lvgl/src/core/lv_core.mk diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_disp.c b/lib/libesp32_lvgl/lvgl/src/core/lv_disp.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_disp.c rename to lib/libesp32_lvgl/lvgl/src/core/lv_disp.c diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_disp.h b/lib/libesp32_lvgl/lvgl/src/core/lv_disp.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_disp.h rename to lib/libesp32_lvgl/lvgl/src/core/lv_disp.h diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_event.c b/lib/libesp32_lvgl/lvgl/src/core/lv_event.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_event.c rename to lib/libesp32_lvgl/lvgl/src/core/lv_event.c diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_event.h b/lib/libesp32_lvgl/lvgl/src/core/lv_event.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_event.h rename to lib/libesp32_lvgl/lvgl/src/core/lv_event.h diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_group.c b/lib/libesp32_lvgl/lvgl/src/core/lv_group.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_group.c rename to lib/libesp32_lvgl/lvgl/src/core/lv_group.c diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_group.h b/lib/libesp32_lvgl/lvgl/src/core/lv_group.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_group.h rename to lib/libesp32_lvgl/lvgl/src/core/lv_group.h diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_indev.c b/lib/libesp32_lvgl/lvgl/src/core/lv_indev.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_indev.c rename to lib/libesp32_lvgl/lvgl/src/core/lv_indev.c diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_indev.h b/lib/libesp32_lvgl/lvgl/src/core/lv_indev.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_indev.h rename to lib/libesp32_lvgl/lvgl/src/core/lv_indev.h diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_indev_scroll.c b/lib/libesp32_lvgl/lvgl/src/core/lv_indev_scroll.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_indev_scroll.c rename to lib/libesp32_lvgl/lvgl/src/core/lv_indev_scroll.c diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_indev_scroll.h b/lib/libesp32_lvgl/lvgl/src/core/lv_indev_scroll.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_indev_scroll.h rename to lib/libesp32_lvgl/lvgl/src/core/lv_indev_scroll.h diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_obj.c b/lib/libesp32_lvgl/lvgl/src/core/lv_obj.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_obj.c rename to lib/libesp32_lvgl/lvgl/src/core/lv_obj.c diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_obj.h b/lib/libesp32_lvgl/lvgl/src/core/lv_obj.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_obj.h rename to lib/libesp32_lvgl/lvgl/src/core/lv_obj.h diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_obj_class.c b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_class.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_obj_class.c rename to lib/libesp32_lvgl/lvgl/src/core/lv_obj_class.c diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_obj_class.h b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_class.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_obj_class.h rename to lib/libesp32_lvgl/lvgl/src/core/lv_obj_class.h diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_obj_draw.c b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_draw.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_obj_draw.c rename to lib/libesp32_lvgl/lvgl/src/core/lv_obj_draw.c diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_obj_draw.h b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_draw.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_obj_draw.h rename to lib/libesp32_lvgl/lvgl/src/core/lv_obj_draw.h diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_obj_pos.c b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_pos.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_obj_pos.c rename to lib/libesp32_lvgl/lvgl/src/core/lv_obj_pos.c diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_obj_pos.h b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_pos.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_obj_pos.h rename to lib/libesp32_lvgl/lvgl/src/core/lv_obj_pos.h diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_obj_scroll.c b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_scroll.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_obj_scroll.c rename to lib/libesp32_lvgl/lvgl/src/core/lv_obj_scroll.c diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_obj_scroll.h b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_scroll.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_obj_scroll.h rename to lib/libesp32_lvgl/lvgl/src/core/lv_obj_scroll.h diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_obj_style.c b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_style.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_obj_style.c rename to lib/libesp32_lvgl/lvgl/src/core/lv_obj_style.c diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_obj_style.h b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_style.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_obj_style.h rename to lib/libesp32_lvgl/lvgl/src/core/lv_obj_style.h diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_obj_style_gen.c b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_style_gen.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_obj_style_gen.c rename to lib/libesp32_lvgl/lvgl/src/core/lv_obj_style_gen.c diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_obj_style_gen.h b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_style_gen.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_obj_style_gen.h rename to lib/libesp32_lvgl/lvgl/src/core/lv_obj_style_gen.h diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_obj_tree.c b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_tree.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_obj_tree.c rename to lib/libesp32_lvgl/lvgl/src/core/lv_obj_tree.c diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_obj_tree.h b/lib/libesp32_lvgl/lvgl/src/core/lv_obj_tree.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_obj_tree.h rename to lib/libesp32_lvgl/lvgl/src/core/lv_obj_tree.h diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_refr.c b/lib/libesp32_lvgl/lvgl/src/core/lv_refr.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_refr.c rename to lib/libesp32_lvgl/lvgl/src/core/lv_refr.c diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_refr.h b/lib/libesp32_lvgl/lvgl/src/core/lv_refr.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_refr.h rename to lib/libesp32_lvgl/lvgl/src/core/lv_refr.h diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_theme.c b/lib/libesp32_lvgl/lvgl/src/core/lv_theme.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_theme.c rename to lib/libesp32_lvgl/lvgl/src/core/lv_theme.c diff --git a/lib/libesp32_lvgl/LVGL8/src/core/lv_theme.h b/lib/libesp32_lvgl/lvgl/src/core/lv_theme.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/core/lv_theme.h rename to lib/libesp32_lvgl/lvgl/src/core/lv_theme.h diff --git a/lib/libesp32_lvgl/LVGL8/src/draw/lv_draw.h b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/draw/lv_draw.h rename to lib/libesp32_lvgl/lvgl/src/draw/lv_draw.h diff --git a/lib/libesp32_lvgl/LVGL8/src/draw/lv_draw.mk b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw.mk similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/draw/lv_draw.mk rename to lib/libesp32_lvgl/lvgl/src/draw/lv_draw.mk diff --git a/lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_arc.c b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_arc.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_arc.c rename to lib/libesp32_lvgl/lvgl/src/draw/lv_draw_arc.c diff --git a/lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_arc.h b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_arc.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_arc.h rename to lib/libesp32_lvgl/lvgl/src/draw/lv_draw_arc.h diff --git a/lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_blend.c b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_blend.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_blend.c rename to lib/libesp32_lvgl/lvgl/src/draw/lv_draw_blend.c diff --git a/lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_blend.h b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_blend.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_blend.h rename to lib/libesp32_lvgl/lvgl/src/draw/lv_draw_blend.h diff --git a/lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_img.c b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_img.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_img.c rename to lib/libesp32_lvgl/lvgl/src/draw/lv_draw_img.c diff --git a/lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_img.h b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_img.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_img.h rename to lib/libesp32_lvgl/lvgl/src/draw/lv_draw_img.h diff --git a/lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_label.c b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_label.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_label.c rename to lib/libesp32_lvgl/lvgl/src/draw/lv_draw_label.c diff --git a/lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_label.h b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_label.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_label.h rename to lib/libesp32_lvgl/lvgl/src/draw/lv_draw_label.h diff --git a/lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_line.c b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_line.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_line.c rename to lib/libesp32_lvgl/lvgl/src/draw/lv_draw_line.c diff --git a/lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_line.h b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_line.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_line.h rename to lib/libesp32_lvgl/lvgl/src/draw/lv_draw_line.h diff --git a/lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_mask.c b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_mask.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_mask.c rename to lib/libesp32_lvgl/lvgl/src/draw/lv_draw_mask.c diff --git a/lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_mask.h b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_mask.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_mask.h rename to lib/libesp32_lvgl/lvgl/src/draw/lv_draw_mask.h diff --git a/lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_rect.c b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_rect.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_rect.c rename to lib/libesp32_lvgl/lvgl/src/draw/lv_draw_rect.c diff --git a/lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_rect.h b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_rect.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_rect.h rename to lib/libesp32_lvgl/lvgl/src/draw/lv_draw_rect.h diff --git a/lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_triangle.c b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_triangle.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_triangle.c rename to lib/libesp32_lvgl/lvgl/src/draw/lv_draw_triangle.c diff --git a/lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_triangle.h b/lib/libesp32_lvgl/lvgl/src/draw/lv_draw_triangle.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/draw/lv_draw_triangle.h rename to lib/libesp32_lvgl/lvgl/src/draw/lv_draw_triangle.h diff --git a/lib/libesp32_lvgl/LVGL8/src/draw/lv_img_buf.c b/lib/libesp32_lvgl/lvgl/src/draw/lv_img_buf.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/draw/lv_img_buf.c rename to lib/libesp32_lvgl/lvgl/src/draw/lv_img_buf.c diff --git a/lib/libesp32_lvgl/LVGL8/src/draw/lv_img_buf.h b/lib/libesp32_lvgl/lvgl/src/draw/lv_img_buf.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/draw/lv_img_buf.h rename to lib/libesp32_lvgl/lvgl/src/draw/lv_img_buf.h diff --git a/lib/libesp32_lvgl/LVGL8/src/draw/lv_img_cache.c b/lib/libesp32_lvgl/lvgl/src/draw/lv_img_cache.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/draw/lv_img_cache.c rename to lib/libesp32_lvgl/lvgl/src/draw/lv_img_cache.c diff --git a/lib/libesp32_lvgl/LVGL8/src/draw/lv_img_cache.h b/lib/libesp32_lvgl/lvgl/src/draw/lv_img_cache.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/draw/lv_img_cache.h rename to lib/libesp32_lvgl/lvgl/src/draw/lv_img_cache.h diff --git a/lib/libesp32_lvgl/LVGL8/src/draw/lv_img_decoder.c b/lib/libesp32_lvgl/lvgl/src/draw/lv_img_decoder.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/draw/lv_img_decoder.c rename to lib/libesp32_lvgl/lvgl/src/draw/lv_img_decoder.c diff --git a/lib/libesp32_lvgl/LVGL8/src/draw/lv_img_decoder.h b/lib/libesp32_lvgl/lvgl/src/draw/lv_img_decoder.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/draw/lv_img_decoder.h rename to lib/libesp32_lvgl/lvgl/src/draw/lv_img_decoder.h diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/extra.mk b/lib/libesp32_lvgl/lvgl/src/extra/extra.mk similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/extra.mk rename to lib/libesp32_lvgl/lvgl/src/extra/extra.mk diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/layouts/flex/lv_flex.c b/lib/libesp32_lvgl/lvgl/src/extra/layouts/flex/lv_flex.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/layouts/flex/lv_flex.c rename to lib/libesp32_lvgl/lvgl/src/extra/layouts/flex/lv_flex.c diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/layouts/flex/lv_flex.h b/lib/libesp32_lvgl/lvgl/src/extra/layouts/flex/lv_flex.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/layouts/flex/lv_flex.h rename to lib/libesp32_lvgl/lvgl/src/extra/layouts/flex/lv_flex.h diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/layouts/grid/lv_grid.c b/lib/libesp32_lvgl/lvgl/src/extra/layouts/grid/lv_grid.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/layouts/grid/lv_grid.c rename to lib/libesp32_lvgl/lvgl/src/extra/layouts/grid/lv_grid.c diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/layouts/grid/lv_grid.h b/lib/libesp32_lvgl/lvgl/src/extra/layouts/grid/lv_grid.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/layouts/grid/lv_grid.h rename to lib/libesp32_lvgl/lvgl/src/extra/layouts/grid/lv_grid.h diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/layouts/lv_layouts.h b/lib/libesp32_lvgl/lvgl/src/extra/layouts/lv_layouts.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/layouts/lv_layouts.h rename to lib/libesp32_lvgl/lvgl/src/extra/layouts/lv_layouts.h diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/lv_extra.c b/lib/libesp32_lvgl/lvgl/src/extra/lv_extra.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/lv_extra.c rename to lib/libesp32_lvgl/lvgl/src/extra/lv_extra.c diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/lv_extra.h b/lib/libesp32_lvgl/lvgl/src/extra/lv_extra.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/lv_extra.h rename to lib/libesp32_lvgl/lvgl/src/extra/lv_extra.h diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/themes/basic/lv_theme_basic.c b/lib/libesp32_lvgl/lvgl/src/extra/themes/basic/lv_theme_basic.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/themes/basic/lv_theme_basic.c rename to lib/libesp32_lvgl/lvgl/src/extra/themes/basic/lv_theme_basic.c diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/themes/basic/lv_theme_basic.h b/lib/libesp32_lvgl/lvgl/src/extra/themes/basic/lv_theme_basic.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/themes/basic/lv_theme_basic.h rename to lib/libesp32_lvgl/lvgl/src/extra/themes/basic/lv_theme_basic.h diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/themes/default/lv_theme_default.c b/lib/libesp32_lvgl/lvgl/src/extra/themes/default/lv_theme_default.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/themes/default/lv_theme_default.c rename to lib/libesp32_lvgl/lvgl/src/extra/themes/default/lv_theme_default.c diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/themes/default/lv_theme_default.h b/lib/libesp32_lvgl/lvgl/src/extra/themes/default/lv_theme_default.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/themes/default/lv_theme_default.h rename to lib/libesp32_lvgl/lvgl/src/extra/themes/default/lv_theme_default.h diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/themes/lv_themes.h b/lib/libesp32_lvgl/lvgl/src/extra/themes/lv_themes.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/themes/lv_themes.h rename to lib/libesp32_lvgl/lvgl/src/extra/themes/lv_themes.h diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/themes/mono/lv_theme_mono.c b/lib/libesp32_lvgl/lvgl/src/extra/themes/mono/lv_theme_mono.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/themes/mono/lv_theme_mono.c rename to lib/libesp32_lvgl/lvgl/src/extra/themes/mono/lv_theme_mono.c diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/themes/mono/lv_theme_mono.h b/lib/libesp32_lvgl/lvgl/src/extra/themes/mono/lv_theme_mono.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/themes/mono/lv_theme_mono.h rename to lib/libesp32_lvgl/lvgl/src/extra/themes/mono/lv_theme_mono.h diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/animimg/lv_animimg.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/animimg/lv_animimg.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/animimg/lv_animimg.c rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/animimg/lv_animimg.c diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/animimg/lv_animimg.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/animimg/lv_animimg.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/animimg/lv_animimg.h rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/animimg/lv_animimg.h diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/calendar/lv_calendar.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/calendar/lv_calendar.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/calendar/lv_calendar.c rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/calendar/lv_calendar.c diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/calendar/lv_calendar.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/calendar/lv_calendar.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/calendar/lv_calendar.h rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/calendar/lv_calendar.h diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/calendar/lv_calendar_header_arrow.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/calendar/lv_calendar_header_arrow.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/calendar/lv_calendar_header_arrow.c rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/calendar/lv_calendar_header_arrow.c diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/calendar/lv_calendar_header_arrow.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/calendar/lv_calendar_header_arrow.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/calendar/lv_calendar_header_arrow.h rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/calendar/lv_calendar_header_arrow.h diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/calendar/lv_calendar_header_dropdown.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/calendar/lv_calendar_header_dropdown.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/calendar/lv_calendar_header_dropdown.c rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/calendar/lv_calendar_header_dropdown.c diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/calendar/lv_calendar_header_dropdown.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/calendar/lv_calendar_header_dropdown.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/calendar/lv_calendar_header_dropdown.h rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/calendar/lv_calendar_header_dropdown.h diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/chart/lv_chart.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/chart/lv_chart.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/chart/lv_chart.c rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/chart/lv_chart.c diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/chart/lv_chart.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/chart/lv_chart.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/chart/lv_chart.h rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/chart/lv_chart.h diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/colorwheel/lv_colorwheel.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/colorwheel/lv_colorwheel.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/colorwheel/lv_colorwheel.c rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/colorwheel/lv_colorwheel.c diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/colorwheel/lv_colorwheel.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/colorwheel/lv_colorwheel.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/colorwheel/lv_colorwheel.h rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/colorwheel/lv_colorwheel.h diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/imgbtn/lv_imgbtn.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/imgbtn/lv_imgbtn.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/imgbtn/lv_imgbtn.c rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/imgbtn/lv_imgbtn.c diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/imgbtn/lv_imgbtn.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/imgbtn/lv_imgbtn.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/imgbtn/lv_imgbtn.h rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/imgbtn/lv_imgbtn.h diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/keyboard/lv_keyboard.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/keyboard/lv_keyboard.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/keyboard/lv_keyboard.c rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/keyboard/lv_keyboard.c diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/keyboard/lv_keyboard.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/keyboard/lv_keyboard.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/keyboard/lv_keyboard.h rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/keyboard/lv_keyboard.h diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/led/lv_led.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/led/lv_led.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/led/lv_led.c rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/led/lv_led.c diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/led/lv_led.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/led/lv_led.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/led/lv_led.h rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/led/lv_led.h diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/list/lv_list.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/list/lv_list.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/list/lv_list.c rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/list/lv_list.c diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/list/lv_list.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/list/lv_list.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/list/lv_list.h rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/list/lv_list.h diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/lv_widgets.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/lv_widgets.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/lv_widgets.h rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/lv_widgets.h diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/meter/lv_meter.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/meter/lv_meter.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/meter/lv_meter.c rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/meter/lv_meter.c diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/meter/lv_meter.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/meter/lv_meter.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/meter/lv_meter.h rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/meter/lv_meter.h diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/msgbox/lv_msgbox.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/msgbox/lv_msgbox.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/msgbox/lv_msgbox.c rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/msgbox/lv_msgbox.c diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/msgbox/lv_msgbox.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/msgbox/lv_msgbox.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/msgbox/lv_msgbox.h rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/msgbox/lv_msgbox.h diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/span/lv_span.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/span/lv_span.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/span/lv_span.c rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/span/lv_span.c diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/span/lv_span.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/span/lv_span.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/span/lv_span.h rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/span/lv_span.h diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/spinbox/lv_spinbox.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/spinbox/lv_spinbox.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/spinbox/lv_spinbox.c rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/spinbox/lv_spinbox.c diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/spinbox/lv_spinbox.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/spinbox/lv_spinbox.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/spinbox/lv_spinbox.h rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/spinbox/lv_spinbox.h diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/spinner/lv_spinner.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/spinner/lv_spinner.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/spinner/lv_spinner.c rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/spinner/lv_spinner.c diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/spinner/lv_spinner.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/spinner/lv_spinner.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/spinner/lv_spinner.h rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/spinner/lv_spinner.h diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/tabview/lv_tabview.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/tabview/lv_tabview.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/tabview/lv_tabview.c rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/tabview/lv_tabview.c diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/tabview/lv_tabview.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/tabview/lv_tabview.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/tabview/lv_tabview.h rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/tabview/lv_tabview.h diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/tileview/lv_tileview.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/tileview/lv_tileview.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/tileview/lv_tileview.c rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/tileview/lv_tileview.c diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/tileview/lv_tileview.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/tileview/lv_tileview.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/tileview/lv_tileview.h rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/tileview/lv_tileview.h diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/win/lv_win.c b/lib/libesp32_lvgl/lvgl/src/extra/widgets/win/lv_win.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/win/lv_win.c rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/win/lv_win.c diff --git a/lib/libesp32_lvgl/LVGL8/src/extra/widgets/win/lv_win.h b/lib/libesp32_lvgl/lvgl/src/extra/widgets/win/lv_win.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/extra/widgets/win/lv_win.h rename to lib/libesp32_lvgl/lvgl/src/extra/widgets/win/lv_win.h diff --git a/lib/libesp32_lvgl/LVGL8/src/font/korean.ttf b/lib/libesp32_lvgl/lvgl/src/font/korean.ttf similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/korean.ttf rename to lib/libesp32_lvgl/lvgl/src/font/korean.ttf diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font.h b/lib/libesp32_lvgl/lvgl/src/font/lv_font.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font.h rename to lib/libesp32_lvgl/lvgl/src/font/lv_font.h diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font.mk b/lib/libesp32_lvgl/lvgl/src/font/lv_font.mk similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font.mk rename to lib/libesp32_lvgl/lvgl/src/font/lv_font.mk diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_dejavu_16_persian_hebrew.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_dejavu_16_persian_hebrew.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_dejavu_16_persian_hebrew.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_dejavu_16_persian_hebrew.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_fmt_txt.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_fmt_txt.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_fmt_txt.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_fmt_txt.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_fmt_txt.h b/lib/libesp32_lvgl/lvgl/src/font/lv_font_fmt_txt.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_fmt_txt.h rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_fmt_txt.h diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_loader.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_loader.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_loader.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_loader.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_loader.h b/lib/libesp32_lvgl/lvgl/src/font/lv_font_loader.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_loader.h rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_loader.h diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_10.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_10.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_10.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_10.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_12.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_12.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_12.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_12.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_12_subpx.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_12_subpx.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_12_subpx.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_12_subpx.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_14.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_14.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_14.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_14.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_16.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_16.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_16.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_16.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_18.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_18.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_18.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_18.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_20.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_20.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_20.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_20.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_22.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_22.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_22.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_22.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_24.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_24.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_24.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_24.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_26.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_26.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_26.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_26.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_28.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_28.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_28.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_28.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_28_compressed.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_28_compressed.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_28_compressed.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_28_compressed.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_30.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_30.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_30.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_30.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_32.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_32.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_32.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_32.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_34.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_34.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_34.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_34.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_36.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_36.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_36.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_36.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_38.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_38.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_38.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_38.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_40.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_40.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_40.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_40.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_42.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_42.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_42.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_42.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_44.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_44.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_44.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_44.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_46.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_46.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_46.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_46.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_48.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_48.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_48.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_48.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_8.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_8.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_montserrat_8.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_montserrat_8.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_simsun_16_cjk.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_simsun_16_cjk.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_simsun_16_cjk.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_simsun_16_cjk.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_unscii_16.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_unscii_16.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_unscii_16.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_unscii_16.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_font_unscii_8.c b/lib/libesp32_lvgl/lvgl/src/font/lv_font_unscii_8.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_font_unscii_8.c rename to lib/libesp32_lvgl/lvgl/src/font/lv_font_unscii_8.c diff --git a/lib/libesp32_lvgl/LVGL8/src/font/lv_symbol_def.h b/lib/libesp32_lvgl/lvgl/src/font/lv_symbol_def.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/font/lv_symbol_def.h rename to lib/libesp32_lvgl/lvgl/src/font/lv_symbol_def.h diff --git a/lib/libesp32_lvgl/LVGL8/src/gpu/lv_gpu.mk b/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu.mk similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/gpu/lv_gpu.mk rename to lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu.mk diff --git a/lib/libesp32_lvgl/LVGL8/src/gpu/lv_gpu_nxp_pxp.c b/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_pxp.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/gpu/lv_gpu_nxp_pxp.c rename to lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_pxp.c diff --git a/lib/libesp32_lvgl/LVGL8/src/gpu/lv_gpu_nxp_pxp.h b/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_pxp.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/gpu/lv_gpu_nxp_pxp.h rename to lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_pxp.h diff --git a/lib/libesp32_lvgl/LVGL8/src/gpu/lv_gpu_nxp_pxp_osa.c b/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_pxp_osa.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/gpu/lv_gpu_nxp_pxp_osa.c rename to lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_pxp_osa.c diff --git a/lib/libesp32_lvgl/LVGL8/src/gpu/lv_gpu_nxp_pxp_osa.h b/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_pxp_osa.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/gpu/lv_gpu_nxp_pxp_osa.h rename to lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_pxp_osa.h diff --git a/lib/libesp32_lvgl/LVGL8/src/gpu/lv_gpu_nxp_vglite.c b/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_vglite.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/gpu/lv_gpu_nxp_vglite.c rename to lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_vglite.c diff --git a/lib/libesp32_lvgl/LVGL8/src/gpu/lv_gpu_nxp_vglite.h b/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_vglite.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/gpu/lv_gpu_nxp_vglite.h rename to lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_nxp_vglite.h diff --git a/lib/libesp32_lvgl/LVGL8/src/gpu/lv_gpu_stm32_dma2d.c b/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_stm32_dma2d.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/gpu/lv_gpu_stm32_dma2d.c rename to lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_stm32_dma2d.c diff --git a/lib/libesp32_lvgl/LVGL8/src/gpu/lv_gpu_stm32_dma2d.h b/lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_stm32_dma2d.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/gpu/lv_gpu_stm32_dma2d.h rename to lib/libesp32_lvgl/lvgl/src/gpu/lv_gpu_stm32_dma2d.h diff --git a/lib/libesp32_lvgl/LVGL8/src/hal/lv_hal.h b/lib/libesp32_lvgl/lvgl/src/hal/lv_hal.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/hal/lv_hal.h rename to lib/libesp32_lvgl/lvgl/src/hal/lv_hal.h diff --git a/lib/libesp32_lvgl/LVGL8/src/hal/lv_hal.mk b/lib/libesp32_lvgl/lvgl/src/hal/lv_hal.mk similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/hal/lv_hal.mk rename to lib/libesp32_lvgl/lvgl/src/hal/lv_hal.mk diff --git a/lib/libesp32_lvgl/LVGL8/src/hal/lv_hal_disp.c b/lib/libesp32_lvgl/lvgl/src/hal/lv_hal_disp.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/hal/lv_hal_disp.c rename to lib/libesp32_lvgl/lvgl/src/hal/lv_hal_disp.c diff --git a/lib/libesp32_lvgl/LVGL8/src/hal/lv_hal_disp.h b/lib/libesp32_lvgl/lvgl/src/hal/lv_hal_disp.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/hal/lv_hal_disp.h rename to lib/libesp32_lvgl/lvgl/src/hal/lv_hal_disp.h diff --git a/lib/libesp32_lvgl/LVGL8/src/hal/lv_hal_indev.c b/lib/libesp32_lvgl/lvgl/src/hal/lv_hal_indev.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/hal/lv_hal_indev.c rename to lib/libesp32_lvgl/lvgl/src/hal/lv_hal_indev.c diff --git a/lib/libesp32_lvgl/LVGL8/src/hal/lv_hal_indev.h b/lib/libesp32_lvgl/lvgl/src/hal/lv_hal_indev.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/hal/lv_hal_indev.h rename to lib/libesp32_lvgl/lvgl/src/hal/lv_hal_indev.h diff --git a/lib/libesp32_lvgl/LVGL8/src/hal/lv_hal_tick.c b/lib/libesp32_lvgl/lvgl/src/hal/lv_hal_tick.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/hal/lv_hal_tick.c rename to lib/libesp32_lvgl/lvgl/src/hal/lv_hal_tick.c diff --git a/lib/libesp32_lvgl/LVGL8/src/hal/lv_hal_tick.h b/lib/libesp32_lvgl/lvgl/src/hal/lv_hal_tick.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/hal/lv_hal_tick.h rename to lib/libesp32_lvgl/lvgl/src/hal/lv_hal_tick.h diff --git a/lib/libesp32_lvgl/LVGL8/src/lv_api_map.h b/lib/libesp32_lvgl/lvgl/src/lv_api_map.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/lv_api_map.h rename to lib/libesp32_lvgl/lvgl/src/lv_api_map.h diff --git a/lib/libesp32_lvgl/LVGL8/src/lv_conf_internal.h b/lib/libesp32_lvgl/lvgl/src/lv_conf_internal.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/lv_conf_internal.h rename to lib/libesp32_lvgl/lvgl/src/lv_conf_internal.h diff --git a/lib/libesp32_lvgl/LVGL8/src/lv_conf_kconfig.h b/lib/libesp32_lvgl/lvgl/src/lv_conf_kconfig.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/lv_conf_kconfig.h rename to lib/libesp32_lvgl/lvgl/src/lv_conf_kconfig.h diff --git a/lib/libesp32_lvgl/LVGL8/src/lvgl.h b/lib/libesp32_lvgl/lvgl/src/lvgl.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/lvgl.h rename to lib/libesp32_lvgl/lvgl/src/lvgl.h diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_anim.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_anim.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_anim.c rename to lib/libesp32_lvgl/lvgl/src/misc/lv_anim.c diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_anim.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_anim.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_anim.h rename to lib/libesp32_lvgl/lvgl/src/misc/lv_anim.h diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_area.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_area.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_area.c rename to lib/libesp32_lvgl/lvgl/src/misc/lv_area.c diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_area.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_area.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_area.h rename to lib/libesp32_lvgl/lvgl/src/misc/lv_area.h diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_assert.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_assert.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_assert.h rename to lib/libesp32_lvgl/lvgl/src/misc/lv_assert.h diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_async.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_async.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_async.c rename to lib/libesp32_lvgl/lvgl/src/misc/lv_async.c diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_async.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_async.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_async.h rename to lib/libesp32_lvgl/lvgl/src/misc/lv_async.h diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_bidi.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_bidi.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_bidi.c rename to lib/libesp32_lvgl/lvgl/src/misc/lv_bidi.c diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_bidi.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_bidi.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_bidi.h rename to lib/libesp32_lvgl/lvgl/src/misc/lv_bidi.h diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_color.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_color.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_color.c rename to lib/libesp32_lvgl/lvgl/src/misc/lv_color.c diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_color.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_color.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_color.h rename to lib/libesp32_lvgl/lvgl/src/misc/lv_color.h diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_fs.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_fs.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_fs.c rename to lib/libesp32_lvgl/lvgl/src/misc/lv_fs.c diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_fs.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_fs.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_fs.h rename to lib/libesp32_lvgl/lvgl/src/misc/lv_fs.h diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_gc.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_gc.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_gc.c rename to lib/libesp32_lvgl/lvgl/src/misc/lv_gc.c diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_gc.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_gc.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_gc.h rename to lib/libesp32_lvgl/lvgl/src/misc/lv_gc.h diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_ll.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_ll.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_ll.c rename to lib/libesp32_lvgl/lvgl/src/misc/lv_ll.c diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_ll.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_ll.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_ll.h rename to lib/libesp32_lvgl/lvgl/src/misc/lv_ll.h diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_log.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_log.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_log.c rename to lib/libesp32_lvgl/lvgl/src/misc/lv_log.c diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_log.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_log.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_log.h rename to lib/libesp32_lvgl/lvgl/src/misc/lv_log.h diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_math.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_math.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_math.c rename to lib/libesp32_lvgl/lvgl/src/misc/lv_math.c diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_math.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_math.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_math.h rename to lib/libesp32_lvgl/lvgl/src/misc/lv_math.h diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_mem.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_mem.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_mem.c rename to lib/libesp32_lvgl/lvgl/src/misc/lv_mem.c diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_mem.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_mem.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_mem.h rename to lib/libesp32_lvgl/lvgl/src/misc/lv_mem.h diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_misc.mk b/lib/libesp32_lvgl/lvgl/src/misc/lv_misc.mk similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_misc.mk rename to lib/libesp32_lvgl/lvgl/src/misc/lv_misc.mk diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_printf.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_printf.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_printf.c rename to lib/libesp32_lvgl/lvgl/src/misc/lv_printf.c diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_printf.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_printf.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_printf.h rename to lib/libesp32_lvgl/lvgl/src/misc/lv_printf.h diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_style.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_style.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_style.c rename to lib/libesp32_lvgl/lvgl/src/misc/lv_style.c diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_style.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_style.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_style.h rename to lib/libesp32_lvgl/lvgl/src/misc/lv_style.h diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_style_gen.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_style_gen.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_style_gen.c rename to lib/libesp32_lvgl/lvgl/src/misc/lv_style_gen.c diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_style_gen.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_style_gen.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_style_gen.h rename to lib/libesp32_lvgl/lvgl/src/misc/lv_style_gen.h diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_templ.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_templ.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_templ.c rename to lib/libesp32_lvgl/lvgl/src/misc/lv_templ.c diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_templ.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_templ.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_templ.h rename to lib/libesp32_lvgl/lvgl/src/misc/lv_templ.h diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_timer.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_timer.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_timer.c rename to lib/libesp32_lvgl/lvgl/src/misc/lv_timer.c diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_timer.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_timer.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_timer.h rename to lib/libesp32_lvgl/lvgl/src/misc/lv_timer.h diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_tlsf.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_tlsf.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_tlsf.c rename to lib/libesp32_lvgl/lvgl/src/misc/lv_tlsf.c diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_tlsf.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_tlsf.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_tlsf.h rename to lib/libesp32_lvgl/lvgl/src/misc/lv_tlsf.h diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_txt.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_txt.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_txt.c rename to lib/libesp32_lvgl/lvgl/src/misc/lv_txt.c diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_txt.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_txt.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_txt.h rename to lib/libesp32_lvgl/lvgl/src/misc/lv_txt.h diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_txt_ap.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_txt_ap.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_txt_ap.c rename to lib/libesp32_lvgl/lvgl/src/misc/lv_txt_ap.c diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_txt_ap.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_txt_ap.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_txt_ap.h rename to lib/libesp32_lvgl/lvgl/src/misc/lv_txt_ap.h diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_types.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_types.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_types.h rename to lib/libesp32_lvgl/lvgl/src/misc/lv_types.h diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_utils.c b/lib/libesp32_lvgl/lvgl/src/misc/lv_utils.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_utils.c rename to lib/libesp32_lvgl/lvgl/src/misc/lv_utils.c diff --git a/lib/libesp32_lvgl/LVGL8/src/misc/lv_utils.h b/lib/libesp32_lvgl/lvgl/src/misc/lv_utils.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/misc/lv_utils.h rename to lib/libesp32_lvgl/lvgl/src/misc/lv_utils.h diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_arc.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_arc.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_arc.c rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_arc.c diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_arc.h b/lib/libesp32_lvgl/lvgl/src/widgets/lv_arc.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_arc.h rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_arc.h diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_bar.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_bar.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_bar.c rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_bar.c diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_bar.h b/lib/libesp32_lvgl/lvgl/src/widgets/lv_bar.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_bar.h rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_bar.h diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_btn.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_btn.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_btn.c rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_btn.c diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_btn.h b/lib/libesp32_lvgl/lvgl/src/widgets/lv_btn.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_btn.h rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_btn.h diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_btnmatrix.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_btnmatrix.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_btnmatrix.c rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_btnmatrix.c diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_btnmatrix.h b/lib/libesp32_lvgl/lvgl/src/widgets/lv_btnmatrix.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_btnmatrix.h rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_btnmatrix.h diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_canvas.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_canvas.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_canvas.c rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_canvas.c diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_canvas.h b/lib/libesp32_lvgl/lvgl/src/widgets/lv_canvas.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_canvas.h rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_canvas.h diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_checkbox.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_checkbox.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_checkbox.c rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_checkbox.c diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_checkbox.h b/lib/libesp32_lvgl/lvgl/src/widgets/lv_checkbox.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_checkbox.h rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_checkbox.h diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_dropdown.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_dropdown.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_dropdown.c rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_dropdown.c diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_dropdown.h b/lib/libesp32_lvgl/lvgl/src/widgets/lv_dropdown.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_dropdown.h rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_dropdown.h diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_img.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_img.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_img.c rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_img.c diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_img.h b/lib/libesp32_lvgl/lvgl/src/widgets/lv_img.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_img.h rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_img.h diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_label.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_label.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_label.c rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_label.c diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_label.h b/lib/libesp32_lvgl/lvgl/src/widgets/lv_label.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_label.h rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_label.h diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_line.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_line.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_line.c rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_line.c diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_line.h b/lib/libesp32_lvgl/lvgl/src/widgets/lv_line.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_line.h rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_line.h diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_objx_templ.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_objx_templ.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_objx_templ.c rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_objx_templ.c diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_objx_templ.h b/lib/libesp32_lvgl/lvgl/src/widgets/lv_objx_templ.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_objx_templ.h rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_objx_templ.h diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_roller.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_roller.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_roller.c rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_roller.c diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_roller.h b/lib/libesp32_lvgl/lvgl/src/widgets/lv_roller.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_roller.h rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_roller.h diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_slider.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_slider.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_slider.c rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_slider.c diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_slider.h b/lib/libesp32_lvgl/lvgl/src/widgets/lv_slider.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_slider.h rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_slider.h diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_switch.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_switch.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_switch.c rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_switch.c diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_switch.h b/lib/libesp32_lvgl/lvgl/src/widgets/lv_switch.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_switch.h rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_switch.h diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_table.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_table.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_table.c rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_table.c diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_table.h b/lib/libesp32_lvgl/lvgl/src/widgets/lv_table.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_table.h rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_table.h diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_textarea.c b/lib/libesp32_lvgl/lvgl/src/widgets/lv_textarea.c similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_textarea.c rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_textarea.c diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_textarea.h b/lib/libesp32_lvgl/lvgl/src/widgets/lv_textarea.h similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_textarea.h rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_textarea.h diff --git a/lib/libesp32_lvgl/LVGL8/src/widgets/lv_widgets.mk b/lib/libesp32_lvgl/lvgl/src/widgets/lv_widgets.mk similarity index 100% rename from lib/libesp32_lvgl/LVGL8/src/widgets/lv_widgets.mk rename to lib/libesp32_lvgl/lvgl/src/widgets/lv_widgets.mk diff --git a/tasmota/xdrv_52_3_berry_lvgl.ino b/tasmota/xdrv_52_3_berry_lvgl.ino index f86ed7db7..8398ecbd9 100644 --- a/tasmota/xdrv_52_3_berry_lvgl.ino +++ b/tasmota/xdrv_52_3_berry_lvgl.ino @@ -25,6 +25,7 @@ #include "lvgl.h" #include "be_mapping.h" #include "be_ctypes.h" +#include "lv_berry.h" #include "Adafruit_LvGL_Glue.h" #ifdef USE_LVGL_FREETYPE @@ -629,6 +630,7 @@ extern "C" { if (argc == 1) { uconfig = be_tostring(vm, 1); } + be_set_gen_cb_name(vm, "_lvgl.gen_cb"); // TODO maybe not the best place for it start_lvgl(uconfig); be_return_nil(vm); } diff --git a/tools/lv_berry/lv_symbol.h b/tools/lv_berry/lv_symbol.h deleted file mode 100644 index 8006c215c..000000000 --- a/tools/lv_berry/lv_symbol.h +++ /dev/null @@ -1,62 +0,0 @@ - -SYMBOL_AUDIO="\xef\x80\x81" -SYMBOL_VIDEO="\xef\x80\x88" -SYMBOL_LIST="\xef\x80\x8b" -SYMBOL_OK="\xef\x80\x8c" -SYMBOL_CLOSE="\xef\x80\x8d" -SYMBOL_POWER="\xef\x80\x91" -SYMBOL_SETTINGS="\xef\x80\x93" -SYMBOL_HOME="\xef\x80\x95" -SYMBOL_DOWNLOAD="\xef\x80\x99" -SYMBOL_DRIVE="\xef\x80\x9c" -SYMBOL_REFRESH="\xef\x80\xa1" -SYMBOL_MUTE="\xef\x80\xa6" -SYMBOL_VOLUME_MID="\xef\x80\xa7" -SYMBOL_VOLUME_MAX="\xef\x80\xa8" -SYMBOL_IMAGE="\xef\x80\xbe" -SYMBOL_EDIT="\xef\x8C\x84" -SYMBOL_PREV="\xef\x81\x88" -SYMBOL_PLAY="\xef\x81\x8b" -SYMBOL_PAUSE="\xef\x81\x8c" -SYMBOL_STOP="\xef\x81\x8d" -SYMBOL_NEXT="\xef\x81\x91" -SYMBOL_EJECT="\xef\x81\x92" -SYMBOL_LEFT="\xef\x81\x93" -SYMBOL_RIGHT="\xef\x81\x94" -SYMBOL_PLUS="\xef\x81\xa7" -SYMBOL_MINUS="\xef\x81\xa8" -SYMBOL_EYE_OPEN="\xef\x81\xae" -SYMBOL_EYE_CLOSE="\xef\x81\xb0" -SYMBOL_WARNING="\xef\x81\xb1" -SYMBOL_SHUFFLE="\xef\x81\xb4" -SYMBOL_UP="\xef\x81\xb7" -SYMBOL_DOWN="\xef\x81\xb8" -SYMBOL_LOOP="\xef\x81\xb9" -SYMBOL_DIRECTORY="\xef\x81\xbb" -SYMBOL_UPLOAD="\xef\x82\x93" -SYMBOL_CALL="\xef\x82\x95" -SYMBOL_CUT="\xef\x83\x84" -SYMBOL_COPY="\xef\x83\x85" -SYMBOL_SAVE="\xef\x83\x87" -SYMBOL_CHARGE="\xef\x83\xa7" -SYMBOL_PASTE="\xef\x83\xAA" -SYMBOL_BELL="\xef\x83\xb3" -SYMBOL_KEYBOARD="\xef\x84\x9c" -SYMBOL_GPS="\xef\x84\xa4" -SYMBOL_FILE="\xef\x85\x9b" -SYMBOL_WIFI="\xef\x87\xab" -SYMBOL_BATTERY_FULL="\xef\x89\x80" -SYMBOL_BATTERY_3="\xef\x89\x81" -SYMBOL_BATTERY_2="\xef\x89\x82" -SYMBOL_BATTERY_1="\xef\x89\x83" -SYMBOL_BATTERY_EMPTY="\xef\x89\x84" -SYMBOL_USB="\xef\x8a\x87" -SYMBOL_BLUETOOTH="\xef\x8a\x93" -SYMBOL_TRASH="\xef\x8B\xAD" -SYMBOL_BACKSPACE="\xef\x95\x9A" -SYMBOL_SD_CARD="\xef\x9F\x82" -SYMBOL_NEW_LINE="\xef\xA2\xA2" - -SYMBOL_DUMMY="\xEF\xA3\xBF" - -SYMBOL_BULLET="\xE2\x80\xA2" \ No newline at end of file diff --git a/tools/lv_berry/lv_symbols.h b/tools/lv_berry/lv_symbols.h deleted file mode 100644 index cce4f230a..000000000 --- a/tools/lv_berry/lv_symbols.h +++ /dev/null @@ -1,61 +0,0 @@ -SYMBOL_AUDIO "\\xef\\x80\\x81" -SYMBOL_VIDEO "\\xef\\x80\\x88" -SYMBOL_LIST "\\xef\\x80\\x8b" -SYMBOL_OK "\\xef\\x80\\x8c" -SYMBOL_CLOSE "\\xef\\x80\\x8d" -SYMBOL_POWER "\\xef\\x80\\x91" -SYMBOL_SETTINGS "\\xef\\x80\\x93" -SYMBOL_HOME "\\xef\\x80\\x95" -SYMBOL_DOWNLOAD "\\xef\\x80\\x99" -SYMBOL_DRIVE "\\xef\\x80\\x9c" -SYMBOL_REFRESH "\\xef\\x80\\xa1" -SYMBOL_MUTE "\\xef\\x80\\xa6" -SYMBOL_VOLUME_MID "\\xef\\x80\\xa7" -SYMBOL_VOLUME_MAX "\\xef\\x80\\xa8" -SYMBOL_IMAGE "\\xef\\x80\\xbe" -SYMBOL_EDIT "\\xef\\x8C\\x84" -SYMBOL_PREV "\\xef\\x81\\x88" -SYMBOL_PLAY "\\xef\\x81\\x8b" -SYMBOL_PAUSE "\\xef\\x81\\x8c" -SYMBOL_STOP "\\xef\\x81\\x8d" -SYMBOL_NEXT "\\xef\\x81\\x91" -SYMBOL_EJECT "\\xef\\x81\\x92" -SYMBOL_LEFT "\\xef\\x81\\x93" -SYMBOL_RIGHT "\\xef\\x81\\x94" -SYMBOL_PLUS "\\xef\\x81\\xa7" -SYMBOL_MINUS "\\xef\\x81\\xa8" -SYMBOL_EYE_OPEN "\\xef\\x81\\xae" -SYMBOL_EYE_CLOSE "\\xef\\x81\\xb0" -SYMBOL_WARNING "\\xef\\x81\\xb1" -SYMBOL_SHUFFLE "\\xef\\x81\\xb4" -SYMBOL_UP "\\xef\\x81\\xb7" -SYMBOL_DOWN "\\xef\\x81\\xb8" -SYMBOL_LOOP "\\xef\\x81\\xb9" -SYMBOL_DIRECTORY "\\xef\\x81\\xbb" -SYMBOL_UPLOAD "\\xef\\x82\\x93" -SYMBOL_CALL "\\xef\\x82\\x95" -SYMBOL_CUT "\\xef\\x83\\x84" -SYMBOL_COPY "\\xef\\x83\\x85" -SYMBOL_SAVE "\\xef\\x83\\x87" -SYMBOL_CHARGE "\\xef\\x83\\xa7" -SYMBOL_PASTE "\\xef\\x83\\xAA" -SYMBOL_BELL "\\xef\\x83\\xb3" -SYMBOL_KEYBOARD "\\xef\\x84\\x9c" -SYMBOL_GPS "\\xef\\x84\\xa4" -SYMBOL_FILE "\\xef\\x85\\x9b" -SYMBOL_WIFI "\\xef\\x87\\xab" -SYMBOL_BATTERY_FULL "\\xef\\x89\\x80" -SYMBOL_BATTERY_3 "\\xef\\x89\\x81" -SYMBOL_BATTERY_2 "\\xef\\x89\\x82" -SYMBOL_BATTERY_1 "\\xef\\x89\\x83" -SYMBOL_BATTERY_EMPTY "\\xef\\x89\\x84" -SYMBOL_USB "\\xef\\x8a\\x87" -SYMBOL_BLUETOOTH "\\xef\\x8a\\x93" -SYMBOL_TRASH "\\xef\\x8B\\xAD" -SYMBOL_BACKSPACE "\\xef\\x95\\x9A" -SYMBOL_SD_CARD "\\xef\\x9F\\x82" -SYMBOL_NEW_LINE "\\xef\\xA2\\xA2" - -SYMBOL_DUMMY "\\xEF\\xA3\\xBF" - -SYMBOL_BULLET "\\xE2\\x80\\xA2" From 699515fc4e9caa583345f7482c81ccfa50963a95 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 18 Dec 2021 13:01:07 +0100 Subject: [PATCH 061/402] fix s2 build --- platformio_tasmota_cenv_sample.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/platformio_tasmota_cenv_sample.ini b/platformio_tasmota_cenv_sample.ini index ea5114455..44cfd6ca5 100644 --- a/platformio_tasmota_cenv_sample.ini +++ b/platformio_tasmota_cenv_sample.ini @@ -9,6 +9,7 @@ lib_ignore = TTGO TWatch Library NimBLE-Arduino epdiy + esp32-camera [env:tasmota-rangeextender] build_flags = ${env.build_flags} From 3d716866b17e4e6d9f5640c894b93bb9ed8eca8b Mon Sep 17 00:00:00 2001 From: Jason2866 Date: Sat, 18 Dec 2021 13:26:16 +0100 Subject: [PATCH 062/402] fix compiler warning webcam --- lib/libesp32/Berry-HttpClientLight/library.json | 4 ++-- lib/libesp32/Zip-readonly-FS/library.json | 4 ++-- lib/libesp32/berry/library.json | 4 ++-- lib/libesp32/berry_mapping/library.json | 4 ++-- lib/libesp32/re1.5/library.json | 4 ++-- lib/libesp32_div/esp32-camera/library.json | 7 +++---- lib/libesp32_lvgl/freetype/library.json | 4 ++-- lib/libesp32_lvgl/lv_berry/library.json | 4 ++-- lib/libesp32_lvgl/lvgl/library.json | 4 ++-- 9 files changed, 19 insertions(+), 20 deletions(-) diff --git a/lib/libesp32/Berry-HttpClientLight/library.json b/lib/libesp32/Berry-HttpClientLight/library.json index 1e1479bbb..c9e5208f9 100644 --- a/lib/libesp32/Berry-HttpClientLight/library.json +++ b/lib/libesp32/Berry-HttpClientLight/library.json @@ -4,8 +4,8 @@ "description": "Forked version of Arduino HttpClient to support BearSSL instead of mbedTLS", "license": "MIT", "homepage": "https://github.com/arendst/Tasmota", - "frameworks": "*", - "platforms": "*", + "frameworks": "arduino", + "platforms": "espressif32", "authors": { "name": "Stephan Hadinger", diff --git a/lib/libesp32/Zip-readonly-FS/library.json b/lib/libesp32/Zip-readonly-FS/library.json index a8c83f81b..e57844d30 100644 --- a/lib/libesp32/Zip-readonly-FS/library.json +++ b/lib/libesp32/Zip-readonly-FS/library.json @@ -4,8 +4,8 @@ "description": "Simple filesystem to open an uncompressed ZIP file and read-only", "license": "MIT", "homepage": "https://github.com/arendst/Tasmota", - "frameworks": "*", - "platforms": "*", + "frameworks": "arduino", + "platforms": "espressif32", "authors": { "name": "Stephan Hadinger", diff --git a/lib/libesp32/berry/library.json b/lib/libesp32/berry/library.json index 705592bd5..901800fca 100644 --- a/lib/libesp32/berry/library.json +++ b/lib/libesp32/berry/library.json @@ -14,8 +14,8 @@ }, "version": "7.0", "license": "MIT License", - "frameworks": "*", - "platforms": "*", + "frameworks": "arduino", + "platforms": "espressif32", "build": { "srcFilter": [ "+<*.c>", diff --git a/lib/libesp32/berry_mapping/library.json b/lib/libesp32/berry_mapping/library.json index 6bcf119fa..1add02751 100644 --- a/lib/libesp32/berry_mapping/library.json +++ b/lib/libesp32/berry_mapping/library.json @@ -4,8 +4,8 @@ "description": "Mapping to C functions", "license": "MIT", "homepage": "https://github.com/arendst/Tasmota", - "frameworks": "*", - "platforms": "*", + "frameworks": "arduino", + "platforms": "espressif32", "authors": { "name": "Stephan Hadinger", diff --git a/lib/libesp32/re1.5/library.json b/lib/libesp32/re1.5/library.json index 8233b2142..7584bee24 100644 --- a/lib/libesp32/re1.5/library.json +++ b/lib/libesp32/re1.5/library.json @@ -8,6 +8,6 @@ "type": "git", "url": "https://github.com/pfalcon/re1.5" }, - "frameworks": "*", - "platforms": "*" + "frameworks": "arduino", + "platforms": "espressif32" } \ No newline at end of file diff --git a/lib/libesp32_div/esp32-camera/library.json b/lib/libesp32_div/esp32-camera/library.json index 2147a3908..2f2c9fc1b 100644 --- a/lib/libesp32_div/esp32-camera/library.json +++ b/lib/libesp32_div/esp32-camera/library.json @@ -7,8 +7,8 @@ "type": "git", "url": "https://github.com/espressif/esp32-camera" }, - "frameworks": "*", - "platforms": "*", + "frameworks": "arduino", + "platforms": "espressif32", "build": { "flags": [ "-Idriver/include", @@ -16,8 +16,7 @@ "-Idriver/private_include", "-Iconversions/private_include", "-Isensors/private_include", - "-Itarget/private_include", - "-fno-rtti" + "-Itarget/private_include" ], "includeDir": ".", "srcDir": ".", diff --git a/lib/libesp32_lvgl/freetype/library.json b/lib/libesp32_lvgl/freetype/library.json index 1349b099a..f8864de49 100644 --- a/lib/libesp32_lvgl/freetype/library.json +++ b/lib/libesp32_lvgl/freetype/library.json @@ -8,8 +8,8 @@ "type": "git", "url": "https://gitlab.freedesktop.org/freetype" }, - "frameworks": "*", - "platforms": "*", + "frameworks": "arduino", + "platforms": "espressif32", "build": { "srcFilter": [ "+", diff --git a/lib/libesp32_lvgl/lv_berry/library.json b/lib/libesp32_lvgl/lv_berry/library.json index c5cd36d2f..cecb243ce 100644 --- a/lib/libesp32_lvgl/lv_berry/library.json +++ b/lib/libesp32_lvgl/lv_berry/library.json @@ -4,8 +4,8 @@ "description": "Mapping of LVGL functions to Berry", "license": "MIT", "homepage": "https://github.com/arendst/Tasmota", - "frameworks": "*", - "platforms": "*", + "frameworks": "arduino", + "platforms": "espressif32", "authors": { "name": "Stephan Hadinger", diff --git a/lib/libesp32_lvgl/lvgl/library.json b/lib/libesp32_lvgl/lvgl/library.json index 4582bb729..441a52235 100644 --- a/lib/libesp32_lvgl/lvgl/library.json +++ b/lib/libesp32_lvgl/lvgl/library.json @@ -12,8 +12,8 @@ }, "license": "MIT", "homepage": "https://lvgl.io", - "frameworks": "*", - "platforms": "*", + "frameworks": "arduino", + "platforms": "espressif32", "build": { "flags": [ "-I$PROJECT_DIR/tasmota/lvgl_berry" ] } From 85731148c52b4121b2808ff1ced47cf3658f762d Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Sat, 18 Dec 2021 14:30:25 +0100 Subject: [PATCH 063/402] Refactor GPIO_HEARTBEAT Remove delay from interrupt by refactoring GPIO_HEARTBEAT --- tasmota/support_rtc.ino | 6 ------ tasmota/support_tasmota.ino | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tasmota/support_rtc.ino b/tasmota/support_rtc.ino index 03b7164fa..fe5fd10ec 100644 --- a/tasmota/support_rtc.ino +++ b/tasmota/support_rtc.ino @@ -377,12 +377,6 @@ void RtcSecond(void) static uint32_t last_sync = 0; static bool mutex = false; - if ((TasmotaGlobal.init_state >= INIT_GPIOS) && PinUsed(GPIO_HEARTBEAT)) { - digitalWrite(Pin(GPIO_HEARTBEAT), ~TasmotaGlobal.heartbeat_inverted &1); - delayMicroseconds(50); - digitalWrite(Pin(GPIO_HEARTBEAT), TasmotaGlobal.heartbeat_inverted); - } - if (mutex) { return; } if (Rtc.time_synced) { diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino index 3129c2831..72a1b7ced 100644 --- a/tasmota/support_tasmota.ino +++ b/tasmota/support_tasmota.ino @@ -983,6 +983,12 @@ void PerformEverySecond(void) ResetGlobalValues(); + if ((TasmotaGlobal.init_state >= INIT_GPIOS) && PinUsed(GPIO_HEARTBEAT)) { + digitalWrite(Pin(GPIO_HEARTBEAT), ~TasmotaGlobal.heartbeat_inverted &1); + delayMicroseconds(50); + digitalWrite(Pin(GPIO_HEARTBEAT), TasmotaGlobal.heartbeat_inverted); + } + if (Settings->tele_period || (3601 == TasmotaGlobal.tele_period)) { if (TasmotaGlobal.tele_period >= 9999) { if (!TasmotaGlobal.global_state.network_down) { From 2d7a48152bce1f80ef508df221af178d12aaea4f Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Sat, 18 Dec 2021 14:47:03 +0100 Subject: [PATCH 064/402] Fix exception 28 on HRG15 Fix exception 28 on HRG15 (#14067) --- tasmota/xsns_90_hrg15.ino | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tasmota/xsns_90_hrg15.ino b/tasmota/xsns_90_hrg15.ino index 46c17b28a..ca90df2ee 100644 --- a/tasmota/xsns_90_hrg15.ino +++ b/tasmota/xsns_90_hrg15.ino @@ -91,7 +91,8 @@ bool Rg15Poll(void) { while (HydreonSerial->available()) { Rg15ReadLine(rg15_buffer); - AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("HRG: Received '%s'"), rg15_buffer); + // AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("HRG: Received '%s'"), rg15_buffer); + AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("HRG: Received %*_H"), strlen(rg15_buffer), rg15_buffer); Rg15Process(rg15_buffer); } From 7b7913e8f32389b383b68ee0a9433d07c1ac74a1 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 18 Dec 2021 15:14:47 +0100 Subject: [PATCH 065/402] merged, ready for PR2 --- lib/lib_display/LedControl/src/LedControl.cpp | 11 +- lib/lib_display/LedControl/src/LedControl.h | 1 - lib/lib_display/LedControl/src/LedMatrix.cpp | 141 ++- lib/lib_display/LedControl/src/LedMatrix.h | 11 +- .../LedControl/src/font_6x8_UTF8_C2.h | 340 ++++++ .../LedControl/src/font_6x8_UTF8_C3.h | 678 ++++++++++++ .../LedControl/src/font_6x8_base.h | 986 ++++++++++++++++++ .../LedControl/src/font_6x8_horizontal_MSB.h | 267 ----- tasmota/xdsp_19_max7219_matrix.ino | 123 ++- 9 files changed, 2226 insertions(+), 332 deletions(-) create mode 100644 lib/lib_display/LedControl/src/font_6x8_UTF8_C2.h create mode 100644 lib/lib_display/LedControl/src/font_6x8_UTF8_C3.h create mode 100644 lib/lib_display/LedControl/src/font_6x8_base.h delete mode 100644 lib/lib_display/LedControl/src/font_6x8_horizontal_MSB.h diff --git a/lib/lib_display/LedControl/src/LedControl.cpp b/lib/lib_display/LedControl/src/LedControl.cpp index 5807aa6af..e2230944c 100644 --- a/lib/lib_display/LedControl/src/LedControl.cpp +++ b/lib/lib_display/LedControl/src/LedControl.cpp @@ -49,7 +49,7 @@ LedControl::LedControl(int dataPin, int clkPin, int csPin, int numDevices) { SPI_CS=csPin; if(numDevices<=0 || numDevices>8 ) numDevices=8; - maxDevices = numDevices; + maxDevices=numDevices; pinMode(SPI_MOSI,OUTPUT); pinMode(SPI_CLK,OUTPUT); pinMode(SPI_CS,OUTPUT); @@ -59,14 +59,14 @@ LedControl::LedControl(int dataPin, int clkPin, int csPin, int numDevices) { status[i]=0x00; for(int i=0;i MAX72XX_MAX_DEVICES) @@ -79,6 +81,7 @@ LedMatrix::LedMatrix(int dataPin, int clkPin, int csPin, unsigned int colums, un textPosY = 0; appendTextBuf[0] = 0; setScrollAppendText(" "); + powerIsOn = false; // initialize all connected MAX7219/MAX7221 devices SPI_MOSI = dataPin; @@ -104,8 +107,9 @@ bool LedMatrix::drawText( const char *str, bool clearBefore) strncpy(textBuf, str, TEXT_BUFFER_SIZE -1); textPosX = 0; textPosY = 0; - textWidth = strlen(textBuf) * charWidth; - if(textWidth < displayWidth) + textLen = countChars(str); + textWidth = textLen * charWidth; + if(textWidth <= displayWidth) { // text fits into the display, place it into the center textPosX = (displayWidth - textWidth) / 2; // center @@ -113,8 +117,8 @@ bool LedMatrix::drawText( const char *str, bool clearBefore) else { // The text ist longer than the display width. Scrolling is needed. - // Append a space between end of text and the beginning of the repeting text. - appendSpace(); + // Add a space in front of text to have a distance to the pervious scroll text. + addSpace(); } drawTextAt(textBuf, textPosX, textPosY); refresh(); // refresh display with the new drawed string content @@ -124,19 +128,90 @@ bool LedMatrix::drawText( const char *str, bool clearBefore) bool LedMatrix::drawTextAt( const char *str, const int x, const int y ) { // draw character by character - unsigned int len = strlen(str); int xPos = x; - for (unsigned int i = 0; i < len; i++) + const char* fontChar = nullptr; + for (unsigned int i = 0; (i= 0x20 && c < 0x80) // basic font + { + fontChar = font_20_7F[c-0x20]; + } + +#ifdef font_6x8_UTF8_C2_h + else if(c == 0xC2) // UTF special characters + { + i++; + c= str[i]; + if(c>= 0xA0 && c < 0xC0) + { + fontChar = font_UTF_C2_A0_BF[c - 0xA0]; + } + } +#endif // font_6x8_UTF8_C2_h + +#ifdef font_6x8_UTF8_C3_h + else if(c == 0xC3) // UTF latin1 + { + i++; + c= str[i]; + if(c>= 0x80 && c < 0xC0) + { + fontChar = font_UTF_C3_80_BF[c - 0x80]; + } + } +#endif // font_6x8_UTF8_C3_h + + else if(c>= 0xC0 && c <= 0xDF) + { + i += 1; // 2 byte UTF sequence + } + else if(c>= 0xE0 && c <= 0xEF) + { + i += 2; // 3 byte UTF sequence + } + else if(c>= 0xF0 && c <= 0xF7) + { + i += 3; // 4 byte UTF sequence + } + + drawCharAt(fontChar, xPos, y); xPos += charWidth; } return true; } +int LedMatrix::countChars( const char* utfText) +{ + int len = 0; + for( int i = 0; (i> 4]; } -void LedMatrix::appendSpace() +void LedMatrix::addSpace() { strncat(textBuf, appendTextBuf, TEXT_BUFFER_SIZE -1); - textWidth = strlen(textBuf) * charWidth; + textPosX = strlen(appendTextBuf) * charWidth; // start scrolling with space + textLen = countChars(textBuf); + textWidth = countChars(textBuf) * charWidth; } void LedMatrix::setRow_allDevices(int row, byte *data) diff --git a/lib/lib_display/LedControl/src/LedMatrix.h b/lib/lib_display/LedControl/src/LedMatrix.h index aec15d052..b77038ecc 100644 --- a/lib/lib_display/LedControl/src/LedMatrix.h +++ b/lib/lib_display/LedControl/src/LedMatrix.h @@ -106,6 +106,8 @@ class LedMatrix void power( bool on ); + bool isPowerOn(); + /** * @brief cleares the display and text buffer * @@ -136,7 +138,7 @@ class LedMatrix */ /** - * @brief Set the a pending string to the scrolling text to set a distance to the repeating text. Usually some spaces are used. + * @brief Adds a string before the scrolling text to set a distance. Usually some spaces are used. * * @param append text to append to the scrolling text before repeating. */ @@ -151,9 +153,10 @@ class LedMatrix private: - bool drawCharAt( char c, int x, int y ); // Draws a character to a defined position + bool drawCharAt( const char* fontChar, int x, int y ); // Draws a character to a defined position + int countChars( const char* utfText); // count the characters of an UTF8 string. To be uesd instead of strlen(). byte revereBitorder(byte b); // returnes the byte in the reverse bit order. - void appendSpace(); // appends characters to the end of the text to get a distance to the repeating scroll text + void addSpace(); // adds characters in front of the text to get a distance to the repeating scroll text // device contrl MAX7219/MAX7221 /** @@ -196,10 +199,12 @@ class LedMatrix int charHeight; char textBuf[TEXT_BUFFER_SIZE]; char appendTextBuf[TEXT_APPEND_BUFFER_SIZE]; + int textLen; // number of UTF8 characters int textWidth; // width of text [pixel] int textPosX; // horizontal pixel position of scrolling text int textPosY; // vertical pixelposition of scrolling text; byte spidata[SPI_BUFFER_SIZE]; // The array for shifting the data to the devices + bool powerIsOn; }; diff --git a/lib/lib_display/LedControl/src/font_6x8_UTF8_C2.h b/lib/lib_display/LedControl/src/font_6x8_UTF8_C2.h new file mode 100644 index 000000000..72854b4da --- /dev/null +++ b/lib/lib_display/LedControl/src/font_6x8_UTF8_C2.h @@ -0,0 +1,340 @@ +// 6x8 ascii font +#ifndef font_6x8_UTF8_C2_h +#define font_6x8_UTF8_C2_h +/** + * additional characters to font_6x8_base.h + * 256 bytes + * + */ + +/* +UTF8 after 0xC2 + …0 …1 …2 …3 …4 …5 …6 …7 …8 …9 …A …B …C …D …E …F +A… NBSP¡ ¢ £ ¤ ¥ ¦ § ¨ © ª « ¬ SHY ® ¯ +B… ° ± ² ³ ´ µ ¶ · ¸ ¹ º » ¼ ½ ¾ ¿ +*/ +const char font_UTF_C2_A0_BF[0xC0-0xA0][8] = { + + { + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + }, // 0x80 NBSP + { + 0b00000100, + 0b00000000, + 0b00000100, + 0b00000100, + 0b00001110, + 0b00001110, + 0b00000100, + 0b00000000, + }, // 0x81 ¡ + { + 0b00000000, + 0b00000100, + 0b00001110, + 0b00010000, + 0b00010000, + 0b00001110, + 0b00000100, + 0b00000000, + }, // 0x82 ¢ + { + 0b00000110, + 0b00001001, + 0b00001000, + 0b00011110, + 0b00001000, + 0b00001001, + 0b00010111, + 0b00000000, + }, // 0x83 £ + { + 0b00010001, + 0b00001110, + 0b00010001, + 0b00010001, + 0b00010001, + 0b00001110, + 0b00010001, + 0b00000000, + }, // 0x84 ¤ + { + 0b00010001, + 0b00001010, + 0b00000100, + 0b00011111, + 0b00000100, + 0b00011111, + 0b00000100, + 0b00000000, + }, // 0x85 ¥ + { + 0b00000100, + 0b00000100, + 0b00000100, + 0b00000000, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00000000, + }, // 0x86 ¦ + { + 0b00001110, + 0b00010001, + 0b00001100, + 0b00001010, + 0b00000110, + 0b00010001, + 0b00001110, + 0b00000000, + }, // 0x87 § + { + 0b00000000, + 0b00000000, + 0b00000000, + 0b00001010, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + }, // 0x88 ¨ + { + 0b00011110, + 0b00100001, + 0b00101101, + 0b00101001, + 0b00101101, + 0b00100001, + 0b00011110, + 0b00000000, + }, // 0x89 © + { + 0b00001110, + 0b00000001, + 0b00001111, + 0b00010001, + 0b00001111, + 0b00000000, + 0b00001111, + 0b00000000, + }, // 0x8A ª + { + 0b00000000, + 0b00000000, + 0b00001001, + 0b00010010, + 0b00001001, + 0b00000000, + 0b00000000, + 0b00000000, + }, // 0x8B « + { + 0b00000000, + 0b00000000, + 0b00111111, + 0b00000001, + 0b00000001, + 0b00000000, + 0b00000000, + 0b00000000, + }, // 0x8C ¬ + { + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000001, + 0b00000001, + 0b00000000, + 0b11111111, + 0b00000000, + }, // 0x8D SHY + { + 0b00011110, + 0b00100101, + 0b00101011, + 0b00101101, + 0b00101011, + 0b00100001, + 0b00011110, + 0b00000000, + }, // 0x8E ® + { + 0b00000000, + 0b00001110, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + }, // 0x8F ¯ + { + 0b00001100, + 0b00010010, + 0b00010010, + 0b00001100, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + }, // 0x90 ° + { + 0b00000000, + 0b00000100, + 0b00001110, + 0b00000100, + 0b00000000, + 0b00001110, + 0b00000000, + 0b00000000, + }, // 0x91 ± + { + 0b00011000, + 0b00000100, + 0b00001000, + 0b00011100, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + }, // 0x92 ² + { + 0b00011100, + 0b00001000, + 0b00001100, + 0b00011000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + }, // 0x93 ³ + { + 0b00001100, + 0b00001100, + 0b00001000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + }, // 0x94 ´ + { + 0b00000000, + 0b00000000, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00011100, + 0b00010000, + 0b00010000, + }, // 0x95 µ + { + 0b00001111, + 0b00010101, + 0b00010101, + 0b00001101, + 0b00000101, + 0b00000101, + 0b00000101, + 0b00000000, + }, // 0x96 ¶ + { + 0b00000000, + 0b00000000, + 0b00000000, + 0b00001000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + }, // 0x97 · + { + 0b00000000, + 0b00000000, + 0b00000000, + 0b00001110, + 0b00000110, + 0b00000000, + 0b00000000, + 0b00000000, + }, // 0x98 ¸ + { + 0b00001000, + 0b00011000, + 0b00001000, + 0b00001000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + }, // 0x99 ¹ + { + 0b00001100, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00001100, + 0b00000000, + 0b00011110, + 0b00000000, + }, // 0x9A º + { + 0b00000000, + 0b00000000, + 0b00010010, + 0b00001001, + 0b00010010, + 0b00000000, + 0b00000000, + 0b00000000, + }, // 0x9B » + { + 0b00010000, + 0b00010010, + 0b00010100, + 0b00001011, + 0b00010101, + 0b00000111, + 0b00000001, + 0b00000000, + }, // 0x9C ¼ + { + 0b00010000, + 0b00010010, + 0b00010100, + 0b00001110, + 0b00010001, + 0b00000010, + 0b00000111, + 0b00000000, + }, // 0x9D ½ + { + 0b00110000, + 0b00011010, + 0b00110100, + 0b00001011, + 0b00010101, + 0b00000111, + 0b00000001, + 0b00000000, + }, // 0x9E ¾ + { + 0b00000100, + 0b00000000, + 0b00000100, + 0b00001100, + 0b00010000, + 0b00010001, + 0b00001110, + 0b00000000, + }, // 0x9F ¿ +}; + +#endif // font_6x8_UTF8_C2_h \ No newline at end of file diff --git a/lib/lib_display/LedControl/src/font_6x8_UTF8_C3.h b/lib/lib_display/LedControl/src/font_6x8_UTF8_C3.h new file mode 100644 index 000000000..aa32f434a --- /dev/null +++ b/lib/lib_display/LedControl/src/font_6x8_UTF8_C3.h @@ -0,0 +1,678 @@ +// 6x8 ascii font +#ifndef font_6x8_UTF8_C3_h +#define font_6x8_UTF8_C3_h +/** + * additional characters to font_6x8_base.h + * 512 bytes + * + */ + +/* +UTF8 after 0xC3 + …0 …1 …2 …3 …4 …5 …6 …7 …8 …9 …A …B …C …D …E …F +8… À Á Â Ã Ä Å Æ Ç È É Ê Ë Ì Í Î Ï +9… Ð Ñ Ò Ó Ô Õ Ö × Ø Ù Ú Û Ü Ý Þ ß +A… à á â ã ä å æ ç è é ê ë ì í î ï +B… ð ñ ò ó ô õ ö ÷ ø ù ú û ü ý þ ÿ +*/ +const char font_UTF_C3_80_BF[0xC0-0x80][8] = { + + { + 0b00001100, + 0b00000000, + 0b00000100, + 0b00001010, + 0b00010001, + 0b00011111, + 0b00010001, + 0b00000000, + }, // 0x80 À + { + 0b00000110, + 0b00000000, + 0b00000100, + 0b00001010, + 0b00010001, + 0b00011111, + 0b00010001, + 0b00000000, + }, // 0x81 Á + { + 0b00001110, + 0b00000000, + 0b00000100, + 0b00001010, + 0b00010001, + 0b00011111, + 0b00010001, + 0b00000000, + }, // 0x82 Â + { + 0b00000101, + 0b00001010, + 0b00000100, + 0b00001010, + 0b00010001, + 0b00011111, + 0b00010001, + 0b00000000, + }, // 0x83 Ã + { + 0b00001010, + 0b00000000, + 0b00000100, + 0b00001010, + 0b00010001, + 0b00011111, + 0b00010001, + 0b00000000, + }, // 0x84 Ä + { + 0b00001110, + 0b00001010, + 0b00001110, + 0b00011011, + 0b00010001, + 0b00011111, + 0b00010001, + 0b00000000, + }, // 0x85 Å + { + 0b00000111, + 0b00001100, + 0b00010100, + 0b00010111, + 0b00011100, + 0b00010100, + 0b00010111, + 0b00000000, + }, // 0x86 Æ + { + 0b00001110, + 0b00010001, + 0b00010000, + 0b00010000, + 0b00010001, + 0b00001110, + 0b00000100, + 0b00001100, + }, // 0x87 Ç + { + 0b00001100, + 0b00000000, + 0b00011111, + 0b00010000, + 0b00011110, + 0b00010000, + 0b00011111, + 0b00000000, + }, // 0x88 È + + { + 0b00000011, + 0b00000000, + 0b00011111, + 0b00010000, + 0b00011110, + 0b00010000, + 0b00011111, + 0b00000000, + }, // 0x89 É + { + 0b00001110, + 0b00000000, + 0b00011111, + 0b00010000, + 0b00011110, + 0b00010000, + 0b00011111, + 0b00000000, + }, // 0x8A Ê + { + 0b00001010, + 0b00000000, + 0b00011111, + 0b00010000, + 0b00011110, + 0b00010000, + 0b00011111, + 0b00000000, + }, // 0x8B Ë + { + 0b00001100, + 0b00000000, + 0b00001110, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00001110, + 0b00000000, + }, // 0x8C Ì + { + 0b00000110, + 0b00000000, + 0b00001110, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00001110, + 0b00000000, + }, // 0x8D Í + { + 0b00001110, + 0b00000000, + 0b00001110, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00001110, + 0b00000000, + }, // 0x8E Î + { + 0b00001010, + 0b00000000, + 0b00001110, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00001110, + 0b00000000, + }, // 0x8F Ï + + { + 0b00001110, + 0b00001001, + 0b00001001, + 0b00011101, + 0b00001001, + 0b00001001, + 0b00001110, + 0b00000000, + }, // 0x90 Ð + { + 0b00001010, + 0b00010100, + 0b00000000, + 0b00010010, + 0b00011010, + 0b00010110, + 0b00010010, + 0b00000000, + }, // 0x91 Ñ + { + 0b00011000, + 0b00001100, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00001100, + 0b00000000, + }, // 0x92 Ò + { + 0b00000110, + 0b00001100, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00001100, + 0b00000000, + }, // 0x93 Ó + { + 0b00001110, + 0b00001100, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00001100, + 0b00000000, + }, // 0x94 Ô + { + 0b00001010, + 0b00010100, + 0b00001100, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00001100, + 0b00000000, + }, // 0x95 Õ + { + 0b00010010, + 0b00001100, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00001100, + 0b00000000, + }, // 0x96 Ö + { + 0b00000000, + 0b00010001, + 0b00001010, + 0b00000100, + 0b00001010, + 0b00010001, + 0b00000000, + 0b00000000, + }, // 0x97 × + { + 0b00001111, + 0b00010011, + 0b00010101, + 0b00010101, + 0b00010101, + 0b00011001, + 0b00011110, + 0b00000000, + }, // 0x98 Ø + + { + 0b00011000, + 0b00000000, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00001100, + 0b00000000, + }, // 0x99 Ù + { + 0b00000110, + 0b00000000, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00001100, + 0b00000000, + }, // 0x9A Ú + { + 0b00001110, + 0b00000000, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00001100, + 0b00000000, + }, // 0x9B Û + { + 0b00001010, + 0b00000000, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00001100, + 0b00000000, + }, // 0x9C Ü + { + 0b00000110, + 0b00000000, + 0b00010001, + 0b00001010, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00000000, + }, // 0x9D Ý + { + 0b00011000, + 0b00010000, + 0b00011100, + 0b00010010, + 0b00010010, + 0b00011100, + 0b00010000, + 0b00011000, + }, // 0x9E Þ + { + 0b00000000, + 0b00011100, + 0b00010010, + 0b00011100, + 0b00010010, + 0b00010010, + 0b00011100, + 0b00010000, + }, // 0x9F ß + + { + 0b00001100, + 0b00000000, + 0b00001110, + 0b00000001, + 0b00001111, + 0b00010001, + 0b00001111, + 0b00000000, + }, // 0xA0 à + { + 0b00000110, + 0b00000000, + 0b00001110, + 0b00000001, + 0b00001111, + 0b00010001, + 0b00001111, + 0b00000000, + }, // 0xA1 á + { + 0b00001110, + 0b00000000, + 0b00001110, + 0b00000001, + 0b00001111, + 0b00010001, + 0b00001111, + 0b00000000, + }, // 0xA2 â + { + 0b00000101, + 0b00001010, + 0b00001110, + 0b00000001, + 0b00001111, + 0b00010001, + 0b00001111, + 0b00000000, + }, // 0xA3 ã + { + 0b00001010, + 0b00000000, + 0b00001110, + 0b00000001, + 0b00001111, + 0b00010001, + 0b00001111, + 0b00000000, + }, // 0xA4 ä + { + 0b00001110, + 0b00001010, + 0b00001110, + 0b00000001, + 0b00001111, + 0b00010001, + 0b00001111, + 0b00000000, + }, // 0xA5 å + { + 0b00000000, + 0b00000000, + 0b00011110, + 0b00000101, + 0b00011111, + 0b00010100, + 0b00001111, + 0b00000000, + }, // 0xA6 æ + { + 0b00000000, + 0b00001110, + 0b00010001, + 0b00010000, + 0b00010001, + 0b00001110, + 0b00000100, + 0b00001100, + }, // 0xA7 ç + { + 0b00001100, + 0b00000000, + 0b00001110, + 0b00010001, + 0b00011110, + 0b00010000, + 0b00001110, + 0b00000000, + }, // 0xA8 è + { + 0b00000011, + 0b00000000, + 0b00001110, + 0b00010001, + 0b00011110, + 0b00010000, + 0b00001110, + 0b00000000, + }, // 0xA9 é + { + 0b00001110, + 0b00000000, + 0b00001110, + 0b00010001, + 0b00011110, + 0b00010000, + 0b00001110, + 0b00000000, + }, // 0xAA ê + { + 0b00001010, + 0b00000000, + 0b00001110, + 0b00010001, + 0b00011110, + 0b00010000, + 0b00001110, + 0b00000000, + }, // 0xAB ë + { + 0b00001000, + 0b00000000, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00000110, + 0b00000000, + }, // 0xAC ì + { + 0b00000110, + 0b00000000, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00000110, + 0b00000000, + }, // 0xAD í + { + 0b00000110, + 0b00000000, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00000110, + 0b00000000, + }, // 0xAE î + { + 0b00001010, + 0b00000000, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00000110, + 0b00000000, + }, // 0xAF ï + + { + 0b00001100, + 0b00010000, + 0b00001000, + 0b00000100, + 0b00001110, + 0b00010010, + 0b00001100, + 0b00000000, + }, // 0xB0 ð + { + 0b00001010, + 0b00010100, + 0b00000000, + 0b00011100, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00000000, + }, // 0xB1 ñ + { + 0b00011000, + 0b00000000, + 0b00001100, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00001100, + 0b00000000, + }, // 0xB2 ò + { + 0b00000110, + 0b00000000, + 0b00001100, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00001100, + 0b00000000, + }, // 0xB3 ó + { + 0b00001110, + 0b00000000, + 0b00001100, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00001100, + 0b00000000, + }, // 0xB4 ô + { + 0b00001010, + 0b00010100, + 0b00000000, + 0b00001100, + 0b00010010, + 0b00010010, + 0b00001100, + 0b00000000, + }, // 0xB5 õ + { + 0b00001010, + 0b00000000, + 0b00001100, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00001100, + 0b00000000, + }, // 0xB6 ö + { + 0b00000000, + 0b00000100, + 0b00000000, + 0b00011111, + 0b00000000, + 0b00000100, + 0b00000000, + 0b00000000, + }, // 0xB7 ÷ + { + 0b00000000, + 0b00000000, + 0b00000001, + 0b00001110, + 0b00010110, + 0b00011010, + 0b00011100, + 0b00100000, + }, // 0xB8 ø + { + 0b00011000, + 0b00000000, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00010110, + 0b00001010, + 0b00000000, + }, // 0xB9 ù + { + 0b00000110, + 0b00000000, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00010110, + 0b00001010, + 0b00000000, + }, // 0xBA ú + { + 0b00001110, + 0b00000000, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00010110, + 0b00001010, + 0b00000000, + }, // 0xBB û + { + 0b00010010, + 0b00000000, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00010110, + 0b00001010, + 0b00000000, + }, // 0xBC ü + { + 0b00000110, + 0b00000000, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00001110, + 0b00000100, + 0b00011000, + }, // 0xBD ý + { + 0b00000000, + 0b00011000, + 0b00010000, + 0b00011100, + 0b00010010, + 0b00011100, + 0b00010000, + 0b00011000, + }, // 0xBE þ + { + 0b00001010, + 0b00000000, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00001110, + 0b00000100, + 0b00011000, + }, // 0xBF ÿ +}; + +/* +ISO/IEC 8859-1 (latin1) + …0 …1 …2 …3 …4 …5 …6 …7 …8 …9 …A …B …C …D …E …F +A… NBSP ¡ ¢ £ ¤ ¥ ¦ § ¨ © ª « ¬ SHY ® ¯ +B… ° ± ² ³ ´ µ ¶ · ¸ ¹ º » ¼ ½ ¾ ¿ +C… À Á Â Ã Ä Å Æ Ç È É Ê Ë Ì Í Î Ï +D… Ð Ñ Ò Ó Ô Õ Ö × Ø Ù Ú Û Ü Ý Þ ß +E… à á â ã ä å æ ç è é ê ë ì í î ï +F… ð ñ ò ó ô õ ö ÷ ø ù ú û ü ý þ ÿ +*/ + +#endif // font_6x8_UTF8_C3_h \ No newline at end of file diff --git a/lib/lib_display/LedControl/src/font_6x8_base.h b/lib/lib_display/LedControl/src/font_6x8_base.h new file mode 100644 index 000000000..084b28c00 --- /dev/null +++ b/lib/lib_display/LedControl/src/font_6x8_base.h @@ -0,0 +1,986 @@ +// 6x8 ascii font +#ifndef font_6x8_base_h +#define font_6x8_base_h +/** + * Momory size of basic ascii font: 768 bytes + * + */ + +/* + …0 …1 …2 …3 …4 …5 …6 …7 …8 …9 …A …B …C …D …E …F +2… SP ! " # $ % & ' ( ) * + , - . / +3… 0 1 2 3 4 5 6 7 8 9 : ; < = > ? +4… @ A B C D E F G H I J K L M N O +5… P Q R S T U V W X Y Z [ \ ] ^ _ +6… ` a b c d e f g h i j k l m n o +7… p q r s t u v w x y z { | } ~ +*/ + +const unsigned int font_char_width = 6; +const unsigned int font_char_height = 8; + +const char font_20_7F[0x80-0x20][8] = { + { + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + }, // 0x20 + { + 0b00000100, + 0b00001110, + 0b00001110, + 0b00000100, + 0b00000100, + 0b00000000, + 0b00000100, + 0b00000000, + }, // 0x21 ! + { + 0b00011011, + 0b00011011, + 0b00010010, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + }, // 0x22 " + { + 0b00000000, + 0b00001010, + 0b00011111, + 0b00001010, + 0b00001010, + 0b00011111, + 0b00001010, + 0b00000000, + }, // 0x23 # + { + 0b00001000, + 0b00001110, + 0b00010000, + 0b00001100, + 0b00000010, + 0b00011100, + 0b00000100, + 0b00000000, + }, // 0x24 $ + { + 0b00011001, + 0b00011001, + 0b00000010, + 0b00000100, + 0b00001000, + 0b00010011, + 0b00010011, + 0b00000000, + }, // 0x25 % + { + 0b00001000, + 0b00010100, + 0b00010100, + 0b00001000, + 0b00010101, + 0b00010010, + 0b00001101, + 0b00000000, + }, // 0x26 & + { + 0b00001100, + 0b00001100, + 0b00001000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + }, // 0x27 ' + { + 0b00000100, + 0b00001000, + 0b00001000, + 0b00001000, + 0b00001000, + 0b00001000, + 0b00000100, + 0b00000000, + }, // 0x28 ( + { + 0b00001000, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00001000, + 0b00000000, + }, // 0x29 ) + { + 0b00000000, + 0b00001010, + 0b00001110, + 0b00011111, + 0b00001110, + 0b00001010, + 0b00000000, + 0b00000000, + }, // 0x2A * + { + 0b00000000, + 0b00000100, + 0b00000100, + 0b00011111, + 0b00000100, + 0b00000100, + 0b00000000, + 0b00000000, + }, // 0x2B + + { + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00001100, + 0b00001100, + 0b00001000, + }, // 0x2C , + { + 0b00000000, + 0b00000000, + 0b00000000, + 0b00011111, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + }, // 0x2D - + { + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00001100, + 0b00001100, + 0b00000000, + }, // 0x2E . + { + 0b00000000, + 0b00000001, + 0b00000010, + 0b00000100, + 0b00001000, + 0b00010000, + 0b00000000, + 0b00000000, + }, // 0x2F / + { + 0b00001110, + 0b00010001, + 0b00010011, + 0b00010101, + 0b00011001, + 0b00010001, + 0b00001110, + 0b00000000, + }, // 0x30 0 + { + 0b00000100, + 0b00001100, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00001110, + 0b00000000, + }, // 0x31 1 + { + 0b00001110, + 0b00010001, + 0b00000001, + 0b00000110, + 0b00001000, + 0b00010000, + 0b00011111, + 0b00000000, + }, // 0x32 2 + { + 0b00001110, + 0b00010001, + 0b00000001, + 0b00001110, + 0b00000001, + 0b00010001, + 0b00001110, + 0b00000000, + }, // 0x33 3 + { + 0b00000010, + 0b00000110, + 0b00001010, + 0b00010010, + 0b00011111, + 0b00000010, + 0b00000010, + 0b00000000, + }, // 0x34 4 + { + 0b00011111, + 0b00010000, + 0b00010000, + 0b00011110, + 0b00000001, + 0b00010001, + 0b00001110, + 0b00000000, + }, // 0x35 5 + { + 0b00000110, + 0b00001000, + 0b00010000, + 0b00011110, + 0b00010001, + 0b00010001, + 0b00001110, + 0b00000000, + }, // 0x36 6 + { + 0b00011111, + 0b00000001, + 0b00000010, + 0b00000100, + 0b00001000, + 0b00001000, + 0b00001000, + 0b00000000, + }, // 0x37 7 + { + 0b00001110, + 0b00010001, + 0b00010001, + 0b00001110, + 0b00010001, + 0b00010001, + 0b00001110, + 0b00000000, + }, // 0x38 8 + { + 0b00001110, + 0b00010001, + 0b00010001, + 0b00001111, + 0b00000001, + 0b00000010, + 0b00001100, + 0b00000000, + }, // 0x39 9 + { + 0b00000000, + 0b00000000, + 0b00001100, + 0b00001100, + 0b00000000, + 0b00001100, + 0b00001100, + 0b00000000, + }, // 0x3A : + { + 0b00000000, + 0b00000000, + 0b00001100, + 0b00001100, + 0b00000000, + 0b00001100, + 0b00001100, + 0b00001000, + }, // 0x3B ; + { + 0b00000010, + 0b00000100, + 0b00001000, + 0b00010000, + 0b00001000, + 0b00000100, + 0b00000010, + 0b00000000, + }, // 0x3C < + { + 0b00000000, + 0b00000000, + 0b00011111, + 0b00000000, + 0b00000000, + 0b00011111, + 0b00000000, + 0b00000000, + }, // 0x3D = + { + 0b00001000, + 0b00000100, + 0b00000010, + 0b00000001, + 0b00000010, + 0b00000100, + 0b00001000, + 0b00000000, + }, // 0x3E > + { + 0b00001110, + 0b00010001, + 0b00000001, + 0b00000110, + 0b00000100, + 0b00000000, + 0b00000100, + 0b00000000, + }, // 0x3F ? + + { + 0b00001110, + 0b00010001, + 0b00010111, + 0b00010101, + 0b00010111, + 0b00010000, + 0b00001110, + 0b00000000, + }, // 0x40 @ + { + 0b00001110, + 0b00010001, + 0b00010001, + 0b00010001, + 0b00011111, + 0b00010001, + 0b00010001, + 0b00000000, + }, // 0x41 A + { + 0b00011110, + 0b00010001, + 0b00010001, + 0b00011110, + 0b00010001, + 0b00010001, + 0b00011110, + 0b00000000, + }, // 0x42 B + { + 0b00001110, + 0b00010001, + 0b00010000, + 0b00010000, + 0b00010000, + 0b00010001, + 0b00001110, + 0b00000000, + }, // 0x43 C + { + 0b00011110, + 0b00010001, + 0b00010001, + 0b00010001, + 0b00010001, + 0b00010001, + 0b00011110, + 0b00000000, + }, // 0x44 D + { + 0b00011111, + 0b00010000, + 0b00010000, + 0b00011110, + 0b00010000, + 0b00010000, + 0b00011111, + 0b00000000, + }, // 0x45 E + { + 0b00011111, + 0b00010000, + 0b00010000, + 0b00011110, + 0b00010000, + 0b00010000, + 0b00010000, + 0b00000000, + }, // 0x46 F + { + 0b00001110, + 0b00010001, + 0b00010000, + 0b00010111, + 0b00010001, + 0b00010001, + 0b00001111, + 0b00000000, + }, // 0x47 G + { + 0b00010001, + 0b00010001, + 0b00010001, + 0b00011111, + 0b00010001, + 0b00010001, + 0b00010001, + 0b00000000, + }, // 0x48 H + { + 0b00001110, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00001110, + 0b00000000, + }, // 0x49 I + { + 0b00000001, + 0b00000001, + 0b00000001, + 0b00000001, + 0b00010001, + 0b00010001, + 0b00001110, + 0b00000000, + }, // 0x4A J + { + 0b00010001, + 0b00010010, + 0b00010100, + 0b00011000, + 0b00010100, + 0b00010010, + 0b00010001, + 0b00000000, + }, // 0x4B K + { + 0b00010000, + 0b00010000, + 0b00010000, + 0b00010000, + 0b00010000, + 0b00010000, + 0b00011111, + 0b00000000, + }, // 0x4C L + { + 0b00010001, + 0b00011011, + 0b00010101, + 0b00010001, + 0b00010001, + 0b00010001, + 0b00010001, + 0b00000000, + }, // 0x4D M + { + 0b00010001, + 0b00011001, + 0b00010101, + 0b00010011, + 0b00010001, + 0b00010001, + 0b00010001, + 0b00000000, + }, // 0x4E N + { + 0b00001110, + 0b00010001, + 0b00010001, + 0b00010001, + 0b00010001, + 0b00010001, + 0b00001110, + 0b00000000, + }, // 0x4F O + { + 0b00011110, + 0b00010001, + 0b00010001, + 0b00011110, + 0b00010000, + 0b00010000, + 0b00010000, + 0b00000000, + }, // 0x50 P + { + 0b00001110, + 0b00010001, + 0b00010001, + 0b00010001, + 0b00010101, + 0b00010010, + 0b00001101, + 0b00000000, + }, // 0x51 Q + { + 0b00011110, + 0b00010001, + 0b00010001, + 0b00011110, + 0b00010010, + 0b00010001, + 0b00010001, + 0b00000000, + }, // 0x52 R + { + 0b00001110, + 0b00010001, + 0b00010000, + 0b00001110, + 0b00000001, + 0b00010001, + 0b00001110, + 0b00000000, + }, // 0x53 S + { + 0b00011111, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00000000, + }, // 0x54 T + { + 0b00010001, + 0b00010001, + 0b00010001, + 0b00010001, + 0b00010001, + 0b00010001, + 0b00001110, + 0b00000000, + }, // 0x55 U + { + 0b00010001, + 0b00010001, + 0b00010001, + 0b00010001, + 0b00010001, + 0b00001010, + 0b00000100, + 0b00000000, + }, // 0x56 V + { + 0b00010001, + 0b00010001, + 0b00010101, + 0b00010101, + 0b00010101, + 0b00010101, + 0b00001010, + 0b00000000, + }, // 0x57 W + { + 0b00010001, + 0b00010001, + 0b00001010, + 0b00000100, + 0b00001010, + 0b00010001, + 0b00010001, + 0b00000000, + }, // 0x58 X + { + 0b00010001, + 0b00010001, + 0b00010001, + 0b00001010, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00000000, + }, // 0x59 Y + { + 0b00011110, + 0b00000010, + 0b00000100, + 0b00001000, + 0b00010000, + 0b00010000, + 0b00011110, + 0b00000000, + }, // 0x5A Z + { + 0b00001110, + 0b00001000, + 0b00001000, + 0b00001000, + 0b00001000, + 0b00001000, + 0b00001110, + 0b00000000, + }, // 0x5B [ + { + 0b00000000, + 0b00010000, + 0b00001000, + 0b00000100, + 0b00000010, + 0b00000001, + 0b00000000, + 0b00000000, + }, // 0x5C backslash + { + 0b00001110, + 0b00000010, + 0b00000010, + 0b00000010, + 0b00000010, + 0b00000010, + 0b00001110, + 0b00000000, + }, // 0x5D ] + { + 0b00000100, + 0b00001010, + 0b00010001, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + }, // 0x5E ^ + { + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00111111, + }, // 0x5F _ + { + 0b00001100, + 0b00001100, + 0b00000100, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + }, // 0x60 ` + { + 0b00000000, + 0b00000000, + 0b00001110, + 0b00000001, + 0b00001111, + 0b00010001, + 0b00001111, + 0b00000000, + }, // 0x61 a + { + 0b00010000, + 0b00010000, + 0b00011110, + 0b00010001, + 0b00010001, + 0b00010001, + 0b00011110, + 0b00000000, + }, // 0x62 b + { + 0b00000000, + 0b00000000, + 0b00001110, + 0b00010001, + 0b00010000, + 0b00010001, + 0b00001110, + 0b00000000, + }, // 0x63 c + { + 0b00000001, + 0b00000001, + 0b00001111, + 0b00010001, + 0b00010001, + 0b00010001, + 0b00001111, + 0b00000000, + }, // 0x64 d + { + 0b00000000, + 0b00000000, + 0b00001110, + 0b00010001, + 0b00011110, + 0b00010000, + 0b00001110, + 0b00000000, + }, // 0x65 e + { + 0b00000110, + 0b00001000, + 0b00001000, + 0b00011110, + 0b00001000, + 0b00001000, + 0b00001000, + 0b00000000, + }, // 0x66 f + { + 0b00000000, + 0b00000000, + 0b00001111, + 0b00010001, + 0b00010001, + 0b00001111, + 0b00000001, + 0b00001110, + }, // 0x67 g + { + 0b00010000, + 0b00010000, + 0b00011100, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00000000, + }, // 0x68 h + { + 0b00000100, + 0b00000000, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00000110, + 0b00000000, + }, // 0x69 i + { + 0b00000010, + 0b00000000, + 0b00000110, + 0b00000010, + 0b00000010, + 0b00000010, + 0b00010010, + 0b00001100, + }, // 0x6A j + { + 0b00010000, + 0b00010000, + 0b00010010, + 0b00010100, + 0b00011000, + 0b00010100, + 0b00010010, + 0b00000000, + }, // 0x6B k + { + 0b00000100, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00000110, + 0b00000000, + }, // 0x6C l + { + 0b00000000, + 0b00000000, + 0b00011010, + 0b00010101, + 0b00010101, + 0b00010001, + 0b00010001, + 0b00000000, + }, // 0x6D m + { + 0b00000000, + 0b00000000, + 0b00011100, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00000000, + }, // 0x6E n + { + 0b00000000, + 0b00000000, + 0b00001110, + 0b00010001, + 0b00010001, + 0b00010001, + 0b00001110, + 0b00000000, + }, // 0x6F o + { + 0b00000000, + 0b00000000, + 0b00011110, + 0b00010001, + 0b00010001, + 0b00010001, + 0b00011110, + 0b00010000, + }, // 0x70 p + { + 0b00000000, + 0b00000000, + 0b00001111, + 0b00010001, + 0b00010001, + 0b00010001, + 0b00001111, + 0b00000001, + }, // 0x71 q + { + 0b00000000, + 0b00000000, + 0b00010110, + 0b00001001, + 0b00001000, + 0b00001000, + 0b00011100, + 0b00000000, + }, // 0x72 r + { + 0b00000000, + 0b00000000, + 0b00001110, + 0b00010000, + 0b00001110, + 0b00000001, + 0b00001110, + 0b00000000, + }, // 0x73 s + { + 0b00000000, + 0b00001000, + 0b00011110, + 0b00001000, + 0b00001000, + 0b00001010, + 0b00000100, + 0b00000000, + }, // 0x74 t + { + 0b00000000, + 0b00000000, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00010110, + 0b00001010, + 0b00000000, + }, // 0x75 u + { + 0b00000000, + 0b00000000, + 0b00010001, + 0b00010001, + 0b00010001, + 0b00001010, + 0b00000100, + 0b00000000, + }, // 0x76 v + { + 0b00000000, + 0b00000000, + 0b00010001, + 0b00010001, + 0b00010101, + 0b00011111, + 0b00001010, + 0b00000000, + }, // 0x77 w + { + 0b00000000, + 0b00000000, + 0b00010010, + 0b00010010, + 0b00001100, + 0b00010010, + 0b00010010, + 0b00000000, + }, // 0x78 x + { + 0b00000000, + 0b00000000, + 0b00010010, + 0b00010010, + 0b00010010, + 0b00001110, + 0b00000100, + 0b00011000, + }, // 0x79 y + { + 0b00000000, + 0b00000000, + 0b00011110, + 0b00000010, + 0b00001100, + 0b00010000, + 0b00011110, + 0b00000000, + }, // 0x7A z + { + 0b00000110, + 0b00001000, + 0b00001000, + 0b00011000, + 0b00001000, + 0b00001000, + 0b00000110, + 0b00000000, + }, // 0x7B { + { + 0b00000100, + 0b00000100, + 0b00000100, + 0b00000000, + 0b00000100, + 0b00000100, + 0b00000100, + 0b00000000, + }, // 0x7C | + { + 0b00001100, + 0b00000010, + 0b00000010, + 0b00000011, + 0b00000010, + 0b00000010, + 0b00001100, + 0b00000000, + }, // 0x7D } + { + 0b00001010, + 0b00010100, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + 0b00000000, + }, // 0x7E ~ + { + 0b00000100, + 0b00001110, + 0b00011011, + 0b00010001, + 0b00010001, + 0b00011111, + 0b00000000, + 0b00000000, + }, // 0x7F ␡ +}; + +#endif // font_6x8_base_h \ No newline at end of file diff --git a/lib/lib_display/LedControl/src/font_6x8_horizontal_MSB.h b/lib/lib_display/LedControl/src/font_6x8_horizontal_MSB.h deleted file mode 100644 index e5c522cd4..000000000 --- a/lib/lib_display/LedControl/src/font_6x8_horizontal_MSB.h +++ /dev/null @@ -1,267 +0,0 @@ -// 6x8 ascii font -#ifndef font_6x8_horizontal_MSB_h -#define font_6x8_horizontal_MSB_h - -const unsigned int font_char_width = 6; -const unsigned int font_char_height = 8; - -const char font[256][8]={ -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x00 -{0x0E,0x11,0x1B,0x11,0x15,0x11,0x0E,0x00}, // 0x01 -{0x0E,0x1F,0x15,0x1F,0x11,0x1F,0x0E,0x00}, // 0x02 -{0x00,0x0A,0x1F,0x1F,0x1F,0x0E,0x04,0x00}, // 0x03 -{0x00,0x04,0x0E,0x1F,0x1F,0x0E,0x04,0x00}, // 0x04 -{0x04,0x0E,0x0E,0x04,0x1F,0x1F,0x04,0x00}, // 0x05 -{0x00,0x04,0x0E,0x1F,0x1F,0x04,0x0E,0x00}, // 0x06 -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x07 -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x08 -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x09 -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x0A -{0x00,0x07,0x03,0x0D,0x12,0x12,0x0C,0x00}, // 0x0B -{0x0E,0x11,0x11,0x0E,0x04,0x0E,0x04,0x00}, // 0x0C -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x0D -{0x03,0x0D,0x0B,0x0D,0x0B,0x1B,0x18,0x00}, // 0x0E -{0x00,0x15,0x0E,0x1B,0x0E,0x15,0x00,0x00}, // 0x0F -{0x08,0x0C,0x0E,0x0F,0x0E,0x0C,0x08,0x00}, // 0x10 -{0x02,0x06,0x0E,0x1E,0x0E,0x06,0x02,0x00}, // 0x11 -{0x04,0x0E,0x1F,0x04,0x1F,0x0E,0x04,0x00}, // 0x12 -{0x0A,0x0A,0x0A,0x0A,0x0A,0x00,0x0A,0x00}, // 0x13 -{0x0F,0x15,0x15,0x0D,0x05,0x05,0x05,0x00}, // 0x14 -{0x0E,0x11,0x0C,0x0A,0x06,0x11,0x0E,0x00}, // 0x15 -{0x00,0x00,0x00,0x00,0x00,0x1E,0x1E,0x00}, // 0x16 -{0x04,0x0E,0x1F,0x04,0x1F,0x0E,0x04,0x0E}, // 0x17 -{0x04,0x0E,0x1F,0x04,0x04,0x04,0x04,0x00}, // 0x18 -{0x04,0x04,0x04,0x04,0x1F,0x0E,0x04,0x00}, // 0x19 -{0x00,0x04,0x06,0x1F,0x06,0x04,0x00,0x00}, // 0x1A -{0x00,0x04,0x0C,0x1F,0x0C,0x04,0x00,0x00}, // 0x1B -{0x00,0x00,0x00,0x10,0x10,0x10,0x1F,0x00}, // 0x1C -{0x00,0x0A,0x0A,0x1F,0x0A,0x0A,0x00,0x00}, // 0x1D -{0x04,0x04,0x0E,0x0E,0x1F,0x1F,0x00,0x00}, // 0x1E -{0x1F,0x1F,0x0E,0x0E,0x04,0x04,0x00,0x00}, // 0x1F -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x20 -{0x04,0x0E,0x0E,0x04,0x04,0x00,0x04,0x00}, // 0x21 -{0x1B,0x1B,0x12,0x00,0x00,0x00,0x00,0x00}, // 0x22 -{0x00,0x0A,0x1F,0x0A,0x0A,0x1F,0x0A,0x00}, // 0x23 -{0x08,0x0E,0x10,0x0C,0x02,0x1C,0x04,0x00}, // 0x24 -{0x19,0x19,0x02,0x04,0x08,0x13,0x13,0x00}, // 0x25 -{0x08,0x14,0x14,0x08,0x15,0x12,0x0D,0x00}, // 0x26 -{0x0C,0x0C,0x08,0x00,0x00,0x00,0x00,0x00}, // 0x27 -{0x04,0x08,0x08,0x08,0x08,0x08,0x04,0x00}, // 0x28 -{0x08,0x04,0x04,0x04,0x04,0x04,0x08,0x00}, // 0x29 -{0x00,0x0A,0x0E,0x1F,0x0E,0x0A,0x00,0x00}, // 0x2A -{0x00,0x04,0x04,0x1F,0x04,0x04,0x00,0x00}, // 0x2B -{0x00,0x00,0x00,0x00,0x00,0x0C,0x0C,0x08}, // 0x2C -{0x00,0x00,0x00,0x1F,0x00,0x00,0x00,0x00}, // 0x2D -{0x00,0x00,0x00,0x00,0x00,0x0C,0x0C,0x00}, // 0x2E -{0x00,0x01,0x02,0x04,0x08,0x10,0x00,0x00}, // 0x2F -{0x0E,0x11,0x13,0x15,0x19,0x11,0x0E,0x00}, // 0x30 -{0x04,0x0C,0x04,0x04,0x04,0x04,0x0E,0x00}, // 0x31 -{0x0E,0x11,0x01,0x06,0x08,0x10,0x1F,0x00}, // 0x32 -{0x0E,0x11,0x01,0x0E,0x01,0x11,0x0E,0x00}, // 0x33 -{0x02,0x06,0x0A,0x12,0x1F,0x02,0x02,0x00}, // 0x34 -{0x1F,0x10,0x10,0x1E,0x01,0x11,0x0E,0x00}, // 0x35 -{0x06,0x08,0x10,0x1E,0x11,0x11,0x0E,0x00}, // 0x36 -{0x1F,0x01,0x02,0x04,0x08,0x08,0x08,0x00}, // 0x37 -{0x0E,0x11,0x11,0x0E,0x11,0x11,0x0E,0x00}, // 0x38 -{0x0E,0x11,0x11,0x0F,0x01,0x02,0x0C,0x00}, // 0x39 -{0x00,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00}, // 0x3A -{0x00,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x08}, // 0x3B -{0x02,0x04,0x08,0x10,0x08,0x04,0x02,0x00}, // 0x3C -{0x00,0x00,0x1F,0x00,0x00,0x1F,0x00,0x00}, // 0x3D -{0x08,0x04,0x02,0x01,0x02,0x04,0x08,0x00}, // 0x3E -{0x0E,0x11,0x01,0x06,0x04,0x00,0x04,0x00}, // 0x3F -{0x0E,0x11,0x17,0x15,0x17,0x10,0x0E,0x00}, // 0x40 -{0x0E,0x11,0x11,0x11,0x1F,0x11,0x11,0x00}, // 0x41 -{0x1E,0x11,0x11,0x1E,0x11,0x11,0x1E,0x00}, // 0x42 -{0x0E,0x11,0x10,0x10,0x10,0x11,0x0E,0x00}, // 0x43 -{0x1E,0x11,0x11,0x11,0x11,0x11,0x1E,0x00}, // 0x44 -{0x1F,0x10,0x10,0x1E,0x10,0x10,0x1F,0x00}, // 0x45 -{0x1F,0x10,0x10,0x1E,0x10,0x10,0x10,0x00}, // 0x46 -{0x0E,0x11,0x10,0x17,0x11,0x11,0x0F,0x00}, // 0x47 -{0x11,0x11,0x11,0x1F,0x11,0x11,0x11,0x00}, // 0x48 -{0x0E,0x04,0x04,0x04,0x04,0x04,0x0E,0x00}, // 0x49 -{0x01,0x01,0x01,0x01,0x11,0x11,0x0E,0x00}, // 0x4A -{0x11,0x12,0x14,0x18,0x14,0x12,0x11,0x00}, // 0x4B -{0x10,0x10,0x10,0x10,0x10,0x10,0x1F,0x00}, // 0x4C -{0x11,0x1B,0x15,0x11,0x11,0x11,0x11,0x00}, // 0x4D -{0x11,0x19,0x15,0x13,0x11,0x11,0x11,0x00}, // 0x4E -{0x0E,0x11,0x11,0x11,0x11,0x11,0x0E,0x00}, // 0x4F -{0x1E,0x11,0x11,0x1E,0x10,0x10,0x10,0x00}, // 0x50 -{0x0E,0x11,0x11,0x11,0x15,0x12,0x0D,0x00}, // 0x51 -{0x1E,0x11,0x11,0x1E,0x12,0x11,0x11,0x00}, // 0x52 -{0x0E,0x11,0x10,0x0E,0x01,0x11,0x0E,0x00}, // 0x53 -{0x1F,0x04,0x04,0x04,0x04,0x04,0x04,0x00}, // 0x54 -{0x11,0x11,0x11,0x11,0x11,0x11,0x0E,0x00}, // 0x55 -{0x11,0x11,0x11,0x11,0x11,0x0A,0x04,0x00}, // 0x56 -{0x11,0x11,0x15,0x15,0x15,0x15,0x0A,0x00}, // 0x57 -{0x11,0x11,0x0A,0x04,0x0A,0x11,0x11,0x00}, // 0x58 -{0x11,0x11,0x11,0x0A,0x04,0x04,0x04,0x00}, // 0x59 -{0x1E,0x02,0x04,0x08,0x10,0x10,0x1E,0x00}, // 0x5A -{0x0E,0x08,0x08,0x08,0x08,0x08,0x0E,0x00}, // 0x5B -{0x00,0x10,0x08,0x04,0x02,0x01,0x00,0x00}, // 0x5C -{0x0E,0x02,0x02,0x02,0x02,0x02,0x0E,0x00}, // 0x5D -{0x04,0x0A,0x11,0x00,0x00,0x00,0x00,0x00}, // 0x5E -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F}, // 0x5F -{0x0C,0x0C,0x04,0x00,0x00,0x00,0x00,0x00}, // 0x60 -{0x00,0x00,0x0E,0x01,0x0F,0x11,0x0F,0x00}, // 0x61 -{0x10,0x10,0x1E,0x11,0x11,0x11,0x1E,0x00}, // 0x62 -{0x00,0x00,0x0E,0x11,0x10,0x11,0x0E,0x00}, // 0x63 -{0x01,0x01,0x0F,0x11,0x11,0x11,0x0F,0x00}, // 0x64 -{0x00,0x00,0x0E,0x11,0x1E,0x10,0x0E,0x00}, // 0x65 -{0x06,0x08,0x08,0x1E,0x08,0x08,0x08,0x00}, // 0x66 -{0x00,0x00,0x0F,0x11,0x11,0x0F,0x01,0x0E}, // 0x67 -{0x10,0x10,0x1C,0x12,0x12,0x12,0x12,0x00}, // 0x68 -{0x04,0x00,0x04,0x04,0x04,0x04,0x06,0x00}, // 0x69 -{0x02,0x00,0x06,0x02,0x02,0x02,0x12,0x0C}, // 0x6A -{0x10,0x10,0x12,0x14,0x18,0x14,0x12,0x00}, // 0x6B -{0x04,0x04,0x04,0x04,0x04,0x04,0x06,0x00}, // 0x6C -{0x00,0x00,0x1A,0x15,0x15,0x11,0x11,0x00}, // 0x6D -{0x00,0x00,0x1C,0x12,0x12,0x12,0x12,0x00}, // 0x6E -{0x00,0x00,0x0E,0x11,0x11,0x11,0x0E,0x00}, // 0x6F -{0x00,0x00,0x1E,0x11,0x11,0x11,0x1E,0x10}, // 0x70 -{0x00,0x00,0x0F,0x11,0x11,0x11,0x0F,0x01}, // 0x71 -{0x00,0x00,0x16,0x09,0x08,0x08,0x1C,0x00}, // 0x72 -{0x00,0x00,0x0E,0x10,0x0E,0x01,0x0E,0x00}, // 0x73 -{0x00,0x08,0x1E,0x08,0x08,0x0A,0x04,0x00}, // 0x74 -{0x00,0x00,0x12,0x12,0x12,0x16,0x0A,0x00}, // 0x75 -{0x00,0x00,0x11,0x11,0x11,0x0A,0x04,0x00}, // 0x76 -{0x00,0x00,0x11,0x11,0x15,0x1F,0x0A,0x00}, // 0x77 -{0x00,0x00,0x12,0x12,0x0C,0x12,0x12,0x00}, // 0x78 -{0x00,0x00,0x12,0x12,0x12,0x0E,0x04,0x18}, // 0x79 -{0x00,0x00,0x1E,0x02,0x0C,0x10,0x1E,0x00}, // 0x7A -{0x06,0x08,0x08,0x18,0x08,0x08,0x06,0x00}, // 0x7B -{0x04,0x04,0x04,0x00,0x04,0x04,0x04,0x00}, // 0x7C -{0x0C,0x02,0x02,0x03,0x02,0x02,0x0C,0x00}, // 0x7D -{0x0A,0x14,0x00,0x00,0x00,0x00,0x00,0x00}, // 0x7E -{0x04,0x0E,0x1B,0x11,0x11,0x1F,0x00,0x00}, // 0x7F -{0x0E,0x11,0x10,0x10,0x11,0x0E,0x04,0x0C}, // 0x80 -{0x12,0x00,0x12,0x12,0x12,0x16,0x0A,0x00}, // 0x81 -{0x03,0x00,0x0E,0x11,0x1E,0x10,0x0E,0x00}, // 0x82 -{0x0E,0x00,0x0E,0x01,0x0F,0x11,0x0F,0x00}, // 0x83 -{0x0A,0x00,0x0E,0x01,0x0F,0x11,0x0F,0x00}, // 0x84 -{0x0C,0x00,0x0E,0x01,0x0F,0x11,0x0F,0x00}, // 0x85 -{0x0E,0x0A,0x0E,0x01,0x0F,0x11,0x0F,0x00}, // 0x86 -{0x00,0x0E,0x11,0x10,0x11,0x0E,0x04,0x0C}, // 0x87 -{0x0E,0x00,0x0E,0x11,0x1E,0x10,0x0E,0x00}, // 0x88 -{0x0A,0x00,0x0E,0x11,0x1E,0x10,0x0E,0x00}, // 0x89 -{0x0C,0x00,0x0E,0x11,0x1E,0x10,0x0E,0x00}, // 0x8A -{0x0A,0x00,0x04,0x04,0x04,0x04,0x06,0x00}, // 0x8B -{0x0E,0x00,0x04,0x04,0x04,0x04,0x06,0x00}, // 0x8C -{0x08,0x00,0x04,0x04,0x04,0x04,0x06,0x00}, // 0x8D -{0x0A,0x00,0x04,0x0A,0x11,0x1F,0x11,0x00}, // 0x8E -{0x0E,0x0A,0x0E,0x1B,0x11,0x1F,0x11,0x00}, // 0x8F -{0x03,0x00,0x1F,0x10,0x1E,0x10,0x1F,0x00}, // 0x90 -{0x00,0x00,0x1E,0x05,0x1F,0x14,0x0F,0x00}, // 0x91 -{0x0F,0x14,0x14,0x1F,0x14,0x14,0x17,0x00}, // 0x92 -{0x0E,0x00,0x0C,0x12,0x12,0x12,0x0C,0x00}, // 0x93 -{0x0A,0x00,0x0C,0x12,0x12,0x12,0x0C,0x00}, // 0x94 -{0x18,0x00,0x0C,0x12,0x12,0x12,0x0C,0x00}, // 0x95 -{0x0E,0x00,0x12,0x12,0x12,0x16,0x0A,0x00}, // 0x96 -{0x18,0x00,0x12,0x12,0x12,0x16,0x0A,0x00}, // 0x97 -{0x0A,0x00,0x12,0x12,0x12,0x0E,0x04,0x18}, // 0x98 -{0x12,0x0C,0x12,0x12,0x12,0x12,0x0C,0x00}, // 0x99 -{0x0A,0x00,0x12,0x12,0x12,0x12,0x0C,0x00}, // 0x9A -{0x00,0x00,0x01,0x0E,0x16,0x1A,0x1C,0x20}, // 0x9B -{0x06,0x09,0x08,0x1E,0x08,0x09,0x17,0x00}, // 0x9C -{0x0F,0x13,0x15,0x15,0x15,0x19,0x1E,0x00}, // 0x9D -{0x00,0x11,0x0A,0x04,0x0A,0x11,0x00,0x00}, // 0x9E -{0x02,0x05,0x04,0x0E,0x04,0x04,0x14,0x08}, // 0x9F -{0x06,0x00,0x0E,0x01,0x0F,0x11,0x0F,0x00}, // 0xA0 -{0x06,0x00,0x04,0x04,0x04,0x04,0x06,0x00}, // 0xA1 -{0x06,0x00,0x0C,0x12,0x12,0x12,0x0C,0x00}, // 0xA2 -{0x06,0x00,0x12,0x12,0x12,0x16,0x0A,0x00}, // 0xA3 -{0x0A,0x14,0x00,0x1C,0x12,0x12,0x12,0x00}, // 0xA4 -{0x0A,0x14,0x00,0x12,0x1A,0x16,0x12,0x00}, // 0xA5 -{0x0E,0x01,0x0F,0x11,0x0F,0x00,0x0F,0x00}, // 0xA6 -{0x0C,0x12,0x12,0x12,0x0C,0x00,0x1E,0x00}, // 0xA7 -{0x04,0x00,0x04,0x0C,0x10,0x11,0x0E,0x00}, // 0xA8 -{0x1E,0x25,0x2B,0x2D,0x2B,0x21,0x1E,0x00}, // 0xA9 -{0x00,0x00,0x3F,0x01,0x01,0x00,0x00,0x00}, // 0xAA -{0x10,0x12,0x14,0x0E,0x11,0x02,0x07,0x00}, // 0xAB -{0x10,0x12,0x14,0x0B,0x15,0x07,0x01,0x00}, // 0xAC -{0x04,0x00,0x04,0x04,0x0E,0x0E,0x04,0x00}, // 0xAD -{0x00,0x00,0x09,0x12,0x09,0x00,0x00,0x00}, // 0xAE -{0x00,0x00,0x12,0x09,0x12,0x00,0x00,0x00}, // 0xAF -{0x15,0x00,0x2A,0x00,0x15,0x00,0x2A,0x00}, // 0xB0 -{0x15,0x2A,0x15,0x2A,0x15,0x2A,0x15,0x2A}, // 0xB1 -{0x2A,0x3F,0x15,0x3F,0x2A,0x3F,0x15,0x3F}, // 0xB2 -{0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x04}, // 0xB3 -{0x04,0x04,0x04,0x3C,0x04,0x04,0x04,0x04}, // 0xB4 -{0x06,0x00,0x04,0x0A,0x11,0x1F,0x11,0x00}, // 0xB5 -{0x0E,0x00,0x04,0x0A,0x11,0x1F,0x11,0x00}, // 0xB6 -{0x0C,0x00,0x04,0x0A,0x11,0x1F,0x11,0x00}, // 0xB7 -{0x1E,0x21,0x2D,0x29,0x2D,0x21,0x1E,0x00}, // 0xB8 -{0x14,0x34,0x04,0x34,0x14,0x14,0x14,0x14}, // 0xB9 -{0x14,0x14,0x14,0x14,0x14,0x14,0x14,0x14}, // 0xBA -{0x00,0x3C,0x04,0x34,0x14,0x14,0x14,0x14}, // 0xBB -{0x14,0x34,0x04,0x3C,0x00,0x00,0x00,0x00}, // 0xBC -{0x00,0x04,0x0E,0x10,0x10,0x0E,0x04,0x00}, // 0xBD -{0x11,0x0A,0x04,0x1F,0x04,0x1F,0x04,0x00}, // 0xBE -{0x00,0x00,0x00,0x3C,0x04,0x04,0x04,0x04}, // 0xBF -{0x04,0x04,0x04,0x07,0x00,0x00,0x00,0x00}, // 0xC0 -{0x04,0x04,0x04,0x3F,0x00,0x00,0x00,0x00}, // 0xC1 -{0x00,0x00,0x00,0x3F,0x04,0x04,0x04,0x04}, // 0xC2 -{0x04,0x04,0x04,0x07,0x04,0x04,0x04,0x04}, // 0xC3 -{0x00,0x00,0x00,0x3F,0x00,0x00,0x00,0x00}, // 0xC4 -{0x04,0x04,0x04,0x3F,0x04,0x04,0x04,0x04}, // 0xC5 -{0x05,0x0A,0x0E,0x01,0x0F,0x11,0x0F,0x00}, // 0xC6 -{0x05,0x0A,0x04,0x0A,0x11,0x1F,0x11,0x00}, // 0xC7 -{0x14,0x17,0x10,0x1F,0x00,0x00,0x00,0x00}, // 0xC8 -{0x00,0x1F,0x10,0x17,0x14,0x14,0x14,0x14}, // 0xC9 -{0x14,0x37,0x00,0x3F,0x00,0x00,0x00,0x00}, // 0xCA -{0x00,0x3F,0x00,0x37,0x14,0x14,0x14,0x14}, // 0xCB -{0x14,0x17,0x10,0x17,0x14,0x14,0x14,0x14}, // 0xCC -{0x00,0x3F,0x00,0x3F,0x00,0x00,0x00,0x00}, // 0xCD -{0x14,0x37,0x00,0x37,0x14,0x14,0x14,0x14}, // 0xCE -{0x11,0x0E,0x11,0x11,0x11,0x0E,0x11,0x00}, // 0xCF -{0x0C,0x10,0x08,0x04,0x0E,0x12,0x0C,0x00}, // 0xD0 -{0x0E,0x09,0x09,0x1D,0x09,0x09,0x0E,0x00}, // 0xD1 -{0x0E,0x00,0x1F,0x10,0x1E,0x10,0x1F,0x00}, // 0xD2 -{0x0A,0x00,0x1F,0x10,0x1E,0x10,0x1F,0x00}, // 0xD3 -{0x0C,0x00,0x1F,0x10,0x1E,0x10,0x1F,0x00}, // 0xD4 -{0x04,0x04,0x04,0x00,0x00,0x00,0x00,0x00}, // 0xD5 -{0x06,0x00,0x0E,0x04,0x04,0x04,0x0E,0x00}, // 0xD6 -{0x0E,0x00,0x0E,0x04,0x04,0x04,0x0E,0x00}, // 0xD7 -{0x0A,0x00,0x0E,0x04,0x04,0x04,0x0E,0x00}, // 0xD8 -{0x04,0x04,0x04,0x3C,0x00,0x00,0x00,0x00}, // 0xD9 -{0x00,0x00,0x00,0x07,0x04,0x04,0x04,0x04}, // 0xDA -{0x3F,0x3F,0x3F,0x3F,0x3F,0x3F,0x3F,0x3F}, // 0xDB -{0x00,0x00,0x00,0x00,0x3F,0x3F,0x3F,0x3F}, // 0xDC -{0x04,0x04,0x04,0x00,0x04,0x04,0x04,0x00}, // 0xDD -{0x0C,0x00,0x0E,0x04,0x04,0x04,0x0E,0x00}, // 0xDE -{0x3F,0x3F,0x3F,0x3F,0x00,0x00,0x00,0x00}, // 0xDF -{0x06,0x0C,0x12,0x12,0x12,0x12,0x0C,0x00}, // 0xE0 -{0x00,0x1C,0x12,0x1C,0x12,0x12,0x1C,0x10}, // 0xE1 -{0x0E,0x0C,0x12,0x12,0x12,0x12,0x0C,0x00}, // 0xE2 -{0x18,0x0C,0x12,0x12,0x12,0x12,0x0C,0x00}, // 0xE3 -{0x0A,0x14,0x00,0x0C,0x12,0x12,0x0C,0x00}, // 0xE4 -{0x0A,0x14,0x0C,0x12,0x12,0x12,0x0C,0x00}, // 0xE5 -{0x00,0x00,0x12,0x12,0x12,0x1C,0x10,0x10}, // 0xE6 -{0x00,0x18,0x10,0x1C,0x12,0x1C,0x10,0x18}, // 0xE7 -{0x18,0x10,0x1C,0x12,0x12,0x1C,0x10,0x18}, // 0xE8 -{0x06,0x00,0x12,0x12,0x12,0x12,0x0C,0x00}, // 0xE9 -{0x0E,0x00,0x12,0x12,0x12,0x12,0x0C,0x00}, // 0xEA -{0x18,0x00,0x12,0x12,0x12,0x12,0x0C,0x00}, // 0xEB -{0x06,0x00,0x12,0x12,0x12,0x0E,0x04,0x18}, // 0xEC -{0x06,0x00,0x11,0x0A,0x04,0x04,0x04,0x00}, // 0xED -{0x00,0x0E,0x00,0x00,0x00,0x00,0x00,0x00}, // 0xEE -{0x0C,0x0C,0x08,0x00,0x00,0x00,0x00,0x00}, // 0xEF -{0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x00}, // 0xF0 -{0x00,0x04,0x0E,0x04,0x00,0x0E,0x00,0x00}, // 0xF1 -{0x00,0x00,0x1F,0x00,0x00,0x1F,0x00,0x00}, // 0xF2 -{0x30,0x1A,0x34,0x0B,0x15,0x07,0x01,0x00}, // 0xF3 -{0x0F,0x15,0x15,0x0D,0x05,0x05,0x05,0x00}, // 0xF4 -{0x0E,0x11,0x0C,0x0A,0x06,0x11,0x0E,0x00}, // 0xF5 -{0x00,0x04,0x00,0x1F,0x00,0x04,0x00,0x00}, // 0xF6 -{0x00,0x00,0x00,0x0E,0x06,0x00,0x00,0x00}, // 0xF7 -{0x0C,0x12,0x12,0x0C,0x00,0x00,0x00,0x00}, // 0xF8 -{0x00,0x00,0x00,0x0A,0x00,0x00,0x00,0x00}, // 0xF9 -{0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x00}, // 0xFA -{0x08,0x18,0x08,0x08,0x00,0x00,0x00,0x00}, // 0xFB -{0x1C,0x08,0x0C,0x18,0x00,0x00,0x00,0x00}, // 0xFC -{0x18,0x04,0x08,0x1C,0x00,0x00,0x00,0x00}, // 0xFD -{0x00,0x00,0x1E,0x1E,0x1E,0x1E,0x00,0x00}, // 0xFE -{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00} // 0xFF -}; - -#endif \ No newline at end of file diff --git a/tasmota/xdsp_19_max7219_matrix.ino b/tasmota/xdsp_19_max7219_matrix.ino index ecf500670..3e1a5c258 100644 --- a/tasmota/xdsp_19_max7219_matrix.ino +++ b/tasmota/xdsp_19_max7219_matrix.ino @@ -39,7 +39,7 @@ Once the GPIO configuration is saved and the ESP8266/ESP32 module restarts, set the Display Model to 19 and Display Mode to 0 - Depending on order oth the wired 8x8 matrix modules you have got a display of size pixel_width x pixel_height. + Depending on order of the wired 8x8 matrix modules you have got a display of size pixel_width x pixel_height. The size has to be set with the commands "DisplayWidth " and "DisplayHeight " After the ESP8266/ESP32 module restarts again, turn ON the display with the command "Power 1" @@ -55,6 +55,10 @@ DisplayDimmer [0..100] Sets the intensity of the display. + DisplayBlinkrate [0..3] + 0: not blinking + 1: slow, 2: medium 3: fast blinking + Power [ON|OFF] Sitches the display on or off. When "off", the display buffer is not cleared and will be shown again when after "Power ON". Other display commands are still active when off. @@ -72,13 +76,18 @@ DisplayHeight [8..256] Sets the pixel height of the display (8x number of module rows) + DisplayRotate [0|2] + 0: normal orientation; devide 0 starts at top left + 2: upside down; device 0 starts at bottom right + DisplayClock [0|1|2] Displays a clock. Commands "DisplayClock 1" // 12 hr format "DisplayClock 2" // 24 hr format - "DisplayClock 0" // turn off clock - + "DisplayClock 0" // turn off clock; please use additional cammand: DisplayMode 0 + If you would like to use the UTF8 latin1 character set, it cam be added by copile option: + #define USE_UTF8_LATIN1 \*********************************************************************************************/ @@ -86,10 +95,6 @@ #include -#ifdef USE_DISPLAY_MODES1TO5 -#include -#endif - LedMatrix *max7219_Matrix = nullptr; bool max2791Matrix_initDriver_done = false; struct @@ -99,7 +104,9 @@ struct byte scroll_delay = 0; byte scroll_iteration = 0; bool show_clock = false; - const char *timeFormat; + bool timeFormat24 = true; + byte blink_delay = 0; // 0: not blinking + byte blink_iteration = 0; } LedMatrix_settings; @@ -138,7 +145,8 @@ bool MAX7291Matrix_initDriver(void) bool MAX7291Matrix_init(void) { Settings->display_mode = 0; // text mode - LedMatrix_settings.show_clock = 0; // no clock + LedMatrix_settings.show_clock = 0; // no + LedMatrix_settings.blink_delay = 0; // no blinking int intensity = GetDisplayDimmer16(); // 0..15 max7219_Matrix->setIntensity(intensity); @@ -158,6 +166,13 @@ bool MAX7291Matrix_init(void) return true; } +bool MAX7291Matrix_setText(bool clearBefore=true) +{ + if(Settings->display_mode != 0) MAX7291Matrix_init(); + LedMatrix_settings.blink_delay = 0; // no blinking + return max7219_Matrix->drawText(XdrvMailbox.data, clearBefore); +} + // FUNC_DISPLAY_SCROLLDELAY bool MAX7291Matrix_scrollDelay(void) { @@ -178,6 +193,8 @@ bool MAX7291Matrix_scrollText(void) // This function is called every 50 ms. // scroll_delay defines the number of cycles to be ignored until the display scrolls by one pixel to the left. // e.g. scrall_delay = 4 causes a scroll each 200 ms. + + if(!max7219_Matrix->isPowerOn()) return false; // do not scroll on power off LedMatrix_settings.scroll_iteration++; if (LedMatrix_settings.scroll_delay) LedMatrix_settings.scroll_iteration = LedMatrix_settings.scroll_iteration % LedMatrix_settings.scroll_delay; @@ -189,6 +206,41 @@ bool MAX7291Matrix_scrollText(void) return max7219_Matrix->scrollText(); } +bool MAX7291Matrix_blink(void) +{ + // This function is called every 50 ms. + // blink_delay defines the number of cycles to be ignored until the blinkstate changes. + if(LedMatrix_settings.blink_delay == 0) return false; + + LedMatrix_settings.blink_iteration++; + if(LedMatrix_settings.blink_iteration == LedMatrix_settings.blink_delay) + { + max7219_Matrix->power(false); + } + else if(LedMatrix_settings.blink_iteration == 2* LedMatrix_settings.blink_delay ) + { + LedMatrix_settings.blink_iteration = 0; + max7219_Matrix->power(true); + } + return true; +} + + +bool MAX7291Matrix_setBlinkRate() +{ + LedMatrix_settings.blink_iteration = 0; + max7219_Matrix->power(true); + if (ArgC() == 0) + { + XdrvMailbox.payload = 0; + } + if (XdrvMailbox.payload) + LedMatrix_settings.blink_delay = 20 / XdrvMailbox.payload; // 1: once per second; 2: twice per second; 3: three times per second + else + LedMatrix_settings.blink_delay = 0; // do not blink + return true; +} + #ifdef USE_DISPLAY_MODES1TO5 // FUNC_DISPLAY_CLOCK bool MAX7291Matrix_clock(void) @@ -204,29 +256,19 @@ bool MAX7291Matrix_clock(void) return true; case 1: // 12 h clock - LedMatrix_settings.timeFormat = "%I:%M"; - if(LedMatrix_settings.modulesPerRow > 6) - { - LedMatrix_settings.timeFormat = "%I:%M:%S"; - } + LedMatrix_settings.timeFormat24 = false; Settings->display_mode = 1; break; case 2: // 24 h clock - LedMatrix_settings.timeFormat = "%H:%M"; - if(LedMatrix_settings.modulesPerRow > 6) - { - LedMatrix_settings.timeFormat = "%H:%M:%S"; - } + LedMatrix_settings.timeFormat24 = true; Settings->display_mode = 1; break; default: - //LedMatrix_settings.timeFormat = XdrvMailbox.payload; - //Settings->display_mode = 1; return false; } - AddLog(LOG_LEVEL_DEBUG, PSTR("MTX: LedMatrix_settings.show_clock %d, timeFormat %s"), LedMatrix_settings.show_clock, LedMatrix_settings.timeFormat); + AddLog(LOG_LEVEL_DEBUG, PSTR("MTX: LedMatrix_settings.show_clock %d, 24h: %b"), LedMatrix_settings.show_clock, LedMatrix_settings.timeFormat24); max7219_Matrix->clearDisplay(); MAX7291Matrix_showTime(); @@ -236,17 +278,30 @@ bool MAX7291Matrix_clock(void) // FUNC_DISPLAY_EVERY_SECOND bool MAX7291Matrix_showTime() { - time_t rawtime; - struct tm *timeinfo; + if(!LedMatrix_settings.show_clock) return false; + + uint8_t hr = RtcTime.hour; + uint8_t mn = RtcTime.minute; + uint8_t sc = RtcTime.second; char timeStr[10]; + if(!LedMatrix_settings.timeFormat24) + { + if(hr == 0) hr = 12; + if(hr > 12 ) hr -= 12; + } - time(&rawtime); - timeinfo = localtime(&rawtime); - strftime(timeStr, 10, LedMatrix_settings.timeFormat, timeinfo); - + if(LedMatrix_settings.modulesPerRow >= 6) + { + snprintf(timeStr, 10, "%02d:%02d:%02d", hr , mn, sc); + } + else + { + snprintf(timeStr, 10, "%02d:%02d", hr , mn); + } max7219_Matrix->drawText(timeStr, false); // false: do not clear desplay on update to prevent flicker return true; } + #endif // USE_DISPLAY_MODES1TO5 @@ -280,17 +335,21 @@ bool Xdsp19(uint8_t function) case FUNC_DISPLAY_DRAW_STRING: case FUNC_DISPLAY_SCROLLTEXT: case FUNC_DISPLAY_SEVENSEG_TEXT: - if(Settings->display_mode != 0) MAX7291Matrix_init(); - result = max7219_Matrix->drawText(XdrvMailbox.data, true); // true: clears display before drawing text + result = MAX7291Matrix_setText(true); // true: clears display before drawing text break; case FUNC_DISPLAY_SEVENSEG_TEXTNC: - if(Settings->display_mode != 0) MAX7291Matrix_init(); - result = max7219_Matrix->drawText(XdrvMailbox.data, false); // false: does not clear display before drawing text + result = MAX7291Matrix_setText(false); // false: does not clear display before drawing text break; case FUNC_DISPLAY_SCROLLDELAY: result = MAX7291Matrix_scrollDelay(); break; + case FUNC_DISPLAY_BLINKRATE: + { + result = MAX7291Matrix_setBlinkRate(); + break; + } case FUNC_DISPLAY_EVERY_50_MSECOND: + MAX7291Matrix_blink(); result = MAX7291Matrix_scrollText(); break; From 805006468f716b890d938d04fb8cd5a795a7779b Mon Sep 17 00:00:00 2001 From: Meek Home Automation <44222882+Meek-HA@users.noreply.github.com> Date: Sat, 18 Dec 2021 21:52:23 +0100 Subject: [PATCH 066/402] ESP32 Compile error when I2S_AUDIO is enabled Solves the compiling error with env:tasmota32 when I2s Audio is enabled: #ifndef USE_I2S_AUDIO #define USE_I2S_AUDIO #endif #ifdef USE_I2S_EXTERNAL_DAC #undef USE_I2S_EXTERNAL_DAC #endif #ifndef USE_I2S_NO_DAC #define USE_I2S_NO_DAC #endif Resolving the following compiling error: tasmota/xdrv_42_i2s_audio.ino:326:11: error: invalid conversion from 'AudioOutputI2S*' to 'AudioOutputI2SNoDAC*' [-fpermissive] --- tasmota/xdrv_42_i2s_audio.ino | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tasmota/xdrv_42_i2s_audio.ino b/tasmota/xdrv_42_i2s_audio.ino index c7b0c460b..c87d763da 100644 --- a/tasmota/xdrv_42_i2s_audio.ino +++ b/tasmota/xdrv_42_i2s_audio.ino @@ -320,7 +320,11 @@ uint32_t SpeakerMic(uint8_t spkr) { i2s_driver_uninstall(Speak_I2S_NUMBER); if (spkr==MODE_SPK) { - out = new AudioOutputI2S(); + #ifdef USE_I2S_NO_DAC + out = new AudioOutputI2SNoDAC(); + #else + out = new AudioOutputI2S(0, 1); + #endif out->SetPinout(DAC_IIS_BCK, DAC_IIS_WS, DAC_IIS_DOUT); out->SetGain(((float)is2_volume/100.0)*4.0); out->stop(); From 8004a81d834d785288a936e3a69b0209dfa4cb3c Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 18 Dec 2021 22:17:26 +0100 Subject: [PATCH 067/402] ignore Micro-RTSP lib for S2 --- platformio_tasmota_cenv_sample.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/platformio_tasmota_cenv_sample.ini b/platformio_tasmota_cenv_sample.ini index 44cfd6ca5..446f0aaa8 100644 --- a/platformio_tasmota_cenv_sample.ini +++ b/platformio_tasmota_cenv_sample.ini @@ -10,6 +10,7 @@ lib_ignore = NimBLE-Arduino epdiy esp32-camera + Micro-RTSP [env:tasmota-rangeextender] build_flags = ${env.build_flags} From 416cadd22981958e4499d06e9a2c7a99e2d5eec6 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 19 Dec 2021 13:52:50 +0100 Subject: [PATCH 068/402] Webcam reduce lib --- .gitpod.Dockerfile | 2 +- .gitpod.yml | 2 +- .../esp32-camera/LICENSE | 0 .../esp32-camera/README.md | 0 .../esp32-camera/driver/include}/cam_hal.h | 0 .../esp32-camera/driver/include/esp_camera.h | 0 .../esp32-camera/driver/include/sensor.h | 0 .../esp32-camera/driver/include}/xclk.h | 0 lib/libesp32/esp32-camera/library.json | 20 + lib/libesp32_div/esp32-camera/CMakeLists.txt | 64 - lib/libesp32_div/esp32-camera/Kconfig | 114 -- lib/libesp32_div/esp32-camera/component.mk | 4 - .../esp32-camera/conversions/esp_jpg_decode.c | 132 -- .../conversions/include/esp_jpg_decode.h | 43 - .../conversions/include/img_converters.h | 130 -- .../esp32-camera/conversions/jpge.cpp | 723 ----------- .../conversions/private_include/jpge.h | 142 --- .../conversions/private_include/yuv.h | 29 - .../esp32-camera/conversions/to_bmp.c | 393 ------ .../esp32-camera/conversions/to_jpg.cpp | 245 ---- .../esp32-camera/conversions/yuv.c | 298 ----- .../esp32-camera/driver/cam_hal.c | 483 ------- .../esp32-camera/driver/esp_camera.c | 416 ------ .../driver/private_include/sccb.h | 19 - lib/libesp32_div/esp32-camera/driver/sccb.c | 184 --- lib/libesp32_div/esp32-camera/driver/sensor.c | 52 - .../esp32-camera/examples/CMakeLists.txt | 9 - .../esp32-camera/examples/Makefile | 11 - .../esp32-camera/examples/main/CMakeLists.txt | 3 - .../esp32-camera/examples/main/component.mk | 5 - .../esp32-camera/examples/main/take_picture.c | 155 --- .../esp32-camera/examples/sdkconfig.defaults | 17 - lib/libesp32_div/esp32-camera/library.json | 25 - .../esp32-camera/sensors/gc0308.c | 465 ------- .../esp32-camera/sensors/gc032a.c | 391 ------ .../esp32-camera/sensors/gc2145.c | 475 ------- .../esp32-camera/sensors/nt99141.c | 1022 --------------- .../esp32-camera/sensors/ov2640.c | 612 --------- .../esp32-camera/sensors/ov3660.c | 1053 --------------- .../esp32-camera/sensors/ov5640.c | 1130 ----------------- .../esp32-camera/sensors/ov7670.c | 457 ------- .../esp32-camera/sensors/ov7725.c | 575 --------- .../sensors/private_include/gc0308.h | 31 - .../sensors/private_include/gc0308_regs.h | 25 - .../sensors/private_include/gc0308_settings.h | 245 ---- .../sensors/private_include/gc032a.h | 31 - .../sensors/private_include/gc032a_regs.h | 82 -- .../sensors/private_include/gc032a_settings.h | 401 ------ .../sensors/private_include/gc2145.h | 27 - .../sensors/private_include/gc2145_regs.h | 85 -- .../sensors/private_include/gc2145_settings.h | 719 ----------- .../sensors/private_include/nt99141.h | 34 - .../sensors/private_include/nt99141_regs.h | 211 --- .../private_include/nt99141_settings.h | 825 ------------ .../sensors/private_include/ov2640.h | 32 - .../sensors/private_include/ov2640_regs.h | 216 ---- .../sensors/private_include/ov2640_settings.h | 485 ------- .../sensors/private_include/ov3660.h | 34 - .../sensors/private_include/ov3660_regs.h | 211 --- .../sensors/private_include/ov3660_settings.h | 318 ----- .../sensors/private_include/ov5640.h | 27 - .../sensors/private_include/ov5640_regs.h | 213 ---- .../sensors/private_include/ov5640_settings.h | 334 ----- .../sensors/private_include/ov7670.h | 33 - .../sensors/private_include/ov7670_regs.h | 354 ------ .../sensors/private_include/ov7725.h | 33 - .../sensors/private_include/ov7725_regs.h | 335 ----- .../esp32-camera/target/esp32/ll_cam.c | 522 -------- .../esp32-camera/target/esp32s2/ll_cam.c | 402 ------ .../target/esp32s2/private_include/tjpgd.h | 99 -- .../esp32-camera/target/esp32s2/tjpgd.c | 970 -------------- .../esp32-camera/target/esp32s3/ll_cam.c | 452 ------- .../target/private_include/ll_cam.h | 141 -- lib/libesp32_div/esp32-camera/target/xclk.c | 64 - .../esp32-camera/test/CMakeLists.txt | 4 - .../esp32-camera/test/component.mk | 8 - .../test/pictures/test_inside.jpeg | Bin 18832 -> 0 bytes .../test/pictures/test_outside.jpeg | Bin 81744 -> 0 bytes .../esp32-camera/test/pictures/testimg.jpeg | Bin 5764 -> 0 bytes .../esp32-camera/test/test_camera.c | 500 -------- ...ride_sample.ini => platformio_override.ini | 4 +- 81 files changed, 24 insertions(+), 18383 deletions(-) rename lib/{libesp32_div => libesp32}/esp32-camera/LICENSE (100%) rename lib/{libesp32_div => libesp32}/esp32-camera/README.md (100%) rename lib/{libesp32_div/esp32-camera/driver/private_include => libesp32/esp32-camera/driver/include}/cam_hal.h (100%) rename lib/{libesp32_div => libesp32}/esp32-camera/driver/include/esp_camera.h (100%) rename lib/{libesp32_div => libesp32}/esp32-camera/driver/include/sensor.h (100%) rename lib/{libesp32_div/esp32-camera/driver/private_include => libesp32/esp32-camera/driver/include}/xclk.h (100%) create mode 100644 lib/libesp32/esp32-camera/library.json delete mode 100644 lib/libesp32_div/esp32-camera/CMakeLists.txt delete mode 100644 lib/libesp32_div/esp32-camera/Kconfig delete mode 100644 lib/libesp32_div/esp32-camera/component.mk delete mode 100644 lib/libesp32_div/esp32-camera/conversions/esp_jpg_decode.c delete mode 100644 lib/libesp32_div/esp32-camera/conversions/include/esp_jpg_decode.h delete mode 100644 lib/libesp32_div/esp32-camera/conversions/include/img_converters.h delete mode 100644 lib/libesp32_div/esp32-camera/conversions/jpge.cpp delete mode 100644 lib/libesp32_div/esp32-camera/conversions/private_include/jpge.h delete mode 100644 lib/libesp32_div/esp32-camera/conversions/private_include/yuv.h delete mode 100644 lib/libesp32_div/esp32-camera/conversions/to_bmp.c delete mode 100644 lib/libesp32_div/esp32-camera/conversions/to_jpg.cpp delete mode 100644 lib/libesp32_div/esp32-camera/conversions/yuv.c delete mode 100644 lib/libesp32_div/esp32-camera/driver/cam_hal.c delete mode 100644 lib/libesp32_div/esp32-camera/driver/esp_camera.c delete mode 100644 lib/libesp32_div/esp32-camera/driver/private_include/sccb.h delete mode 100644 lib/libesp32_div/esp32-camera/driver/sccb.c delete mode 100644 lib/libesp32_div/esp32-camera/driver/sensor.c delete mode 100644 lib/libesp32_div/esp32-camera/examples/CMakeLists.txt delete mode 100644 lib/libesp32_div/esp32-camera/examples/Makefile delete mode 100644 lib/libesp32_div/esp32-camera/examples/main/CMakeLists.txt delete mode 100644 lib/libesp32_div/esp32-camera/examples/main/component.mk delete mode 100644 lib/libesp32_div/esp32-camera/examples/main/take_picture.c delete mode 100644 lib/libesp32_div/esp32-camera/examples/sdkconfig.defaults delete mode 100644 lib/libesp32_div/esp32-camera/library.json delete mode 100644 lib/libesp32_div/esp32-camera/sensors/gc0308.c delete mode 100644 lib/libesp32_div/esp32-camera/sensors/gc032a.c delete mode 100644 lib/libesp32_div/esp32-camera/sensors/gc2145.c delete mode 100644 lib/libesp32_div/esp32-camera/sensors/nt99141.c delete mode 100644 lib/libesp32_div/esp32-camera/sensors/ov2640.c delete mode 100644 lib/libesp32_div/esp32-camera/sensors/ov3660.c delete mode 100644 lib/libesp32_div/esp32-camera/sensors/ov5640.c delete mode 100644 lib/libesp32_div/esp32-camera/sensors/ov7670.c delete mode 100644 lib/libesp32_div/esp32-camera/sensors/ov7725.c delete mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/gc0308.h delete mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/gc0308_regs.h delete mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/gc0308_settings.h delete mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/gc032a.h delete mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/gc032a_regs.h delete mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/gc032a_settings.h delete mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/gc2145.h delete mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/gc2145_regs.h delete mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/gc2145_settings.h delete mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/nt99141.h delete mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/nt99141_regs.h delete mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/nt99141_settings.h delete mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/ov2640.h delete mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/ov2640_regs.h delete mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/ov2640_settings.h delete mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/ov3660.h delete mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/ov3660_regs.h delete mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/ov3660_settings.h delete mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/ov5640.h delete mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/ov5640_regs.h delete mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/ov5640_settings.h delete mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/ov7670.h delete mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/ov7670_regs.h delete mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/ov7725.h delete mode 100644 lib/libesp32_div/esp32-camera/sensors/private_include/ov7725_regs.h delete mode 100644 lib/libesp32_div/esp32-camera/target/esp32/ll_cam.c delete mode 100644 lib/libesp32_div/esp32-camera/target/esp32s2/ll_cam.c delete mode 100644 lib/libesp32_div/esp32-camera/target/esp32s2/private_include/tjpgd.h delete mode 100644 lib/libesp32_div/esp32-camera/target/esp32s2/tjpgd.c delete mode 100644 lib/libesp32_div/esp32-camera/target/esp32s3/ll_cam.c delete mode 100644 lib/libesp32_div/esp32-camera/target/private_include/ll_cam.h delete mode 100644 lib/libesp32_div/esp32-camera/target/xclk.c delete mode 100644 lib/libesp32_div/esp32-camera/test/CMakeLists.txt delete mode 100644 lib/libesp32_div/esp32-camera/test/component.mk delete mode 100644 lib/libesp32_div/esp32-camera/test/pictures/test_inside.jpeg delete mode 100644 lib/libesp32_div/esp32-camera/test/pictures/test_outside.jpeg delete mode 100644 lib/libesp32_div/esp32-camera/test/pictures/testimg.jpeg delete mode 100644 lib/libesp32_div/esp32-camera/test/test_camera.c rename platformio_override_sample.ini => platformio_override.ini (96%) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 909bcf681..29d75d19d 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -2,4 +2,4 @@ FROM gitpod/workspace-full USER gitpod -RUN pip3 install -U platformio && brew install uncrustify +RUN pip3 install -U platformio diff --git a/.gitpod.yml b/.gitpod.yml index 50d9a86d9..7a7300013 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,6 +1,6 @@ tasks: - before: platformio upgrade - - command: platformio run -e tasmota + - command: platformio run -e tasmota32-webcam image: file: .gitpod.Dockerfile diff --git a/lib/libesp32_div/esp32-camera/LICENSE b/lib/libesp32/esp32-camera/LICENSE similarity index 100% rename from lib/libesp32_div/esp32-camera/LICENSE rename to lib/libesp32/esp32-camera/LICENSE diff --git a/lib/libesp32_div/esp32-camera/README.md b/lib/libesp32/esp32-camera/README.md similarity index 100% rename from lib/libesp32_div/esp32-camera/README.md rename to lib/libesp32/esp32-camera/README.md diff --git a/lib/libesp32_div/esp32-camera/driver/private_include/cam_hal.h b/lib/libesp32/esp32-camera/driver/include/cam_hal.h similarity index 100% rename from lib/libesp32_div/esp32-camera/driver/private_include/cam_hal.h rename to lib/libesp32/esp32-camera/driver/include/cam_hal.h diff --git a/lib/libesp32_div/esp32-camera/driver/include/esp_camera.h b/lib/libesp32/esp32-camera/driver/include/esp_camera.h similarity index 100% rename from lib/libesp32_div/esp32-camera/driver/include/esp_camera.h rename to lib/libesp32/esp32-camera/driver/include/esp_camera.h diff --git a/lib/libesp32_div/esp32-camera/driver/include/sensor.h b/lib/libesp32/esp32-camera/driver/include/sensor.h similarity index 100% rename from lib/libesp32_div/esp32-camera/driver/include/sensor.h rename to lib/libesp32/esp32-camera/driver/include/sensor.h diff --git a/lib/libesp32_div/esp32-camera/driver/private_include/xclk.h b/lib/libesp32/esp32-camera/driver/include/xclk.h similarity index 100% rename from lib/libesp32_div/esp32-camera/driver/private_include/xclk.h rename to lib/libesp32/esp32-camera/driver/include/xclk.h diff --git a/lib/libesp32/esp32-camera/library.json b/lib/libesp32/esp32-camera/library.json new file mode 100644 index 000000000..bb542c0bf --- /dev/null +++ b/lib/libesp32/esp32-camera/library.json @@ -0,0 +1,20 @@ +{ + "name": "esp32-camera-header", + "version": "1.0.0", + "keywords": "esp32, camera, espressif, esp32-cam", + "description": "ESP32 camera header files", + "repository": { + "type": "git", + "url": "https://github.com/espressif/esp32-camera" + }, + "frameworks": "arduino", + "platforms": "espressif32", + "build": { + "flags": [ + "-Idriver/include" + ], + "includeDir": ".", + "srcDir": ".", + "srcFilter": ["-<*>", "+"] + } +} diff --git a/lib/libesp32_div/esp32-camera/CMakeLists.txt b/lib/libesp32_div/esp32-camera/CMakeLists.txt deleted file mode 100644 index 5ceec97c0..000000000 --- a/lib/libesp32_div/esp32-camera/CMakeLists.txt +++ /dev/null @@ -1,64 +0,0 @@ -if(IDF_TARGET STREQUAL "esp32" OR IDF_TARGET STREQUAL "esp32s2" OR IDF_TARGET STREQUAL "esp32s3") - set(COMPONENT_SRCS - driver/esp_camera.c - driver/cam_hal.c - driver/sccb.c - driver/sensor.c - sensors/ov2640.c - sensors/ov3660.c - sensors/ov5640.c - sensors/ov7725.c - sensors/ov7670.c - sensors/nt99141.c - sensors/gc0308.c - sensors/gc2145.c - sensors/gc032a.c - conversions/yuv.c - conversions/to_jpg.cpp - conversions/to_bmp.c - conversions/jpge.cpp - conversions/esp_jpg_decode.c - ) - - set(COMPONENT_ADD_INCLUDEDIRS - driver/include - conversions/include - ) - - set(COMPONENT_PRIV_INCLUDEDIRS - driver/private_include - sensors/private_include - conversions/private_include - target/private_include - ) - - if(IDF_TARGET STREQUAL "esp32") - list(APPEND COMPONENT_SRCS - target/xclk.c - target/esp32/ll_cam.c - ) - endif() - - if(IDF_TARGET STREQUAL "esp32s2") - list(APPEND COMPONENT_SRCS - target/xclk.c - target/esp32s2/ll_cam.c - target/esp32s2/tjpgd.c - ) - - list(APPEND COMPONENT_PRIV_INCLUDEDIRS - target/esp32s2/private_include - ) - endif() - - if(IDF_TARGET STREQUAL "esp32s3") - list(APPEND COMPONENT_SRCS - target/esp32s3/ll_cam.c - ) - endif() - - set(COMPONENT_REQUIRES driver) - set(COMPONENT_PRIV_REQUIRES freertos nvs_flash) - - register_component() -endif() diff --git a/lib/libesp32_div/esp32-camera/Kconfig b/lib/libesp32_div/esp32-camera/Kconfig deleted file mode 100644 index 6fb5aad21..000000000 --- a/lib/libesp32_div/esp32-camera/Kconfig +++ /dev/null @@ -1,114 +0,0 @@ -menu "Camera configuration" - - config OV7670_SUPPORT - bool "Support OV7670 VGA" - default y - help - Enable this option if you want to use the OV7670. - Disable this option to save memory. - - config OV7725_SUPPORT - bool "Support OV7725 VGA" - default y - help - Enable this option if you want to use the OV7725. - Disable this option to save memory. - - config NT99141_SUPPORT - bool "Support NT99141 HD" - default y - help - Enable this option if you want to use the NT99141. - Disable this option to save memory. - - config OV2640_SUPPORT - bool "Support OV2640 2MP" - default y - help - Enable this option if you want to use the OV2640. - Disable this option to save memory. - - config OV3660_SUPPORT - bool "Support OV3660 3MP" - default y - help - Enable this option if you want to use the OV3360. - Disable this option to save memory. - - config OV5640_SUPPORT - bool "Support OV5640 5MP" - default y - help - Enable this option if you want to use the OV5640. - Disable this option to save memory. - - config GC2145_SUPPORT - bool "Support GC2145 2MP" - default y - help - Enable this option if you want to use the GC2145. - Disable this option to save memory. - - config GC032A_SUPPORT - bool "Support GC032A VGA" - default y - help - Enable this option if you want to use the GC032A. - Disable this option to save memory. - - config GC0308_SUPPORT - bool "Support GC0308 VGA" - default y - help - Enable this option if you want to use the GC0308. - Disable this option to save memory. - - choice SCCB_HARDWARE_I2C_PORT - bool "I2C peripheral to use for SCCB" - default SCCB_HARDWARE_I2C_PORT1 - - config SCCB_HARDWARE_I2C_PORT0 - bool "I2C0" - config SCCB_HARDWARE_I2C_PORT1 - bool "I2C1" - - endchoice - - choice GC_SENSOR_WINDOW_MODE - bool "GalaxyCore Sensor Window Mode" - depends on (GC2145_SUPPORT || GC032A_SUPPORT || GC0308_SUPPORT) - default GC_SENSOR_SUBSAMPLE_MODE - help - This option determines how to reduce the output size when the resolution you set is less than the maximum resolution. - SUBSAMPLE_MODE has a bigger perspective and WINDOWING_MODE has a higher frame rate. - - config GC_SENSOR_WINDOWING_MODE - bool "Windowing Mode" - config GC_SENSOR_SUBSAMPLE_MODE - bool "Subsample Mode" - endchoice - - choice CAMERA_TASK_PINNED_TO_CORE - bool "Camera task pinned to core" - default CAMERA_CORE0 - help - Pin the camera handle task to a certain core(0/1). It can also be done automatically choosing NO_AFFINITY. - - config CAMERA_CORE0 - bool "CORE0" - config CAMERA_CORE1 - bool "CORE1" - config CAMERA_NO_AFFINITY - bool "NO_AFFINITY" - - endchoice - - config CAMERA_DMA_BUFFER_SIZE_MAX - int "DMA buffer size" - range 8192 32768 - default 32768 - help - Maximum value of DMA buffer - Larger values may fail to allocate due to insufficient contiguous memory blocks, and smaller value may cause DMA interrupt to be too frequent - -endmenu diff --git a/lib/libesp32_div/esp32-camera/component.mk b/lib/libesp32_div/esp32-camera/component.mk deleted file mode 100644 index 8db15eb88..000000000 --- a/lib/libesp32_div/esp32-camera/component.mk +++ /dev/null @@ -1,4 +0,0 @@ -COMPONENT_ADD_INCLUDEDIRS := driver/include conversions/include -COMPONENT_PRIV_INCLUDEDIRS := driver/private_include conversions/private_include sensors/private_include target/private_include -COMPONENT_SRCDIRS := driver conversions sensors target target/esp32 -CXXFLAGS += -fno-rtti diff --git a/lib/libesp32_div/esp32-camera/conversions/esp_jpg_decode.c b/lib/libesp32_div/esp32-camera/conversions/esp_jpg_decode.c deleted file mode 100644 index a9615e36c..000000000 --- a/lib/libesp32_div/esp32-camera/conversions/esp_jpg_decode.c +++ /dev/null @@ -1,132 +0,0 @@ -// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD -// -// 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. -#include "esp_jpg_decode.h" - -#include "esp_system.h" -#if ESP_IDF_VERSION_MAJOR >= 4 // IDF 4+ -#if CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4 -#include "esp32/rom/tjpgd.h" -#elif CONFIG_IDF_TARGET_ESP32S2 -#include "tjpgd.h" -#elif CONFIG_IDF_TARGET_ESP32S3 -#include "esp32s3/rom/tjpgd.h" -#else -#error Target CONFIG_IDF_TARGET is not supported -#endif -#else // ESP32 Before IDF 4.0 -#include "rom/tjpgd.h" -#endif - -#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) -#include "esp32-hal-log.h" -#define TAG "" -#else -#include "esp_log.h" -static const char* TAG = "esp_jpg_decode"; -#endif - -typedef struct { - jpg_scale_t scale; - jpg_reader_cb reader; - jpg_writer_cb writer; - void * arg; - size_t len; - size_t index; -} esp_jpg_decoder_t; - -static const char * jd_errors[] = { - "Succeeded", - "Interrupted by output function", - "Device error or wrong termination of input stream", - "Insufficient memory pool for the image", - "Insufficient stream input buffer", - "Parameter error", - "Data format error", - "Right format but not supported", - "Not supported JPEG standard" -}; - -static uint32_t _jpg_write(JDEC *decoder, void *bitmap, JRECT *rect) -{ - uint16_t x = rect->left; - uint16_t y = rect->top; - uint16_t w = rect->right + 1 - x; - uint16_t h = rect->bottom + 1 - y; - uint8_t *data = (uint8_t *)bitmap; - - esp_jpg_decoder_t * jpeg = (esp_jpg_decoder_t *)decoder->device; - - if (jpeg->writer) { - return jpeg->writer(jpeg->arg, x, y, w, h, data); - } - return 0; -} - -static uint32_t _jpg_read(JDEC *decoder, uint8_t *buf, uint32_t len) -{ - esp_jpg_decoder_t * jpeg = (esp_jpg_decoder_t *)decoder->device; - if (jpeg->len && len > (jpeg->len - jpeg->index)) { - len = jpeg->len - jpeg->index; - } - if (len) { - len = jpeg->reader(jpeg->arg, jpeg->index, buf, len); - if (!len) { - ESP_LOGE(TAG, "Read Fail at %u/%u", jpeg->index, jpeg->len); - } - jpeg->index += len; - } - return len; -} - -esp_err_t esp_jpg_decode(size_t len, jpg_scale_t scale, jpg_reader_cb reader, jpg_writer_cb writer, void * arg) -{ - static uint8_t work[3100]; - JDEC decoder; - esp_jpg_decoder_t jpeg; - - jpeg.len = len; - jpeg.reader = reader; - jpeg.writer = writer; - jpeg.arg = arg; - jpeg.scale = scale; - jpeg.index = 0; - - JRESULT jres = jd_prepare(&decoder, _jpg_read, work, 3100, &jpeg); - if(jres != JDR_OK){ - ESP_LOGE(TAG, "JPG Header Parse Failed! %s", jd_errors[jres]); - return ESP_FAIL; - } - - uint16_t output_width = decoder.width / (1 << (uint8_t)(jpeg.scale)); - uint16_t output_height = decoder.height / (1 << (uint8_t)(jpeg.scale)); - - //output start - writer(arg, 0, 0, output_width, output_height, NULL); - //output write - jres = jd_decomp(&decoder, _jpg_write, (uint8_t)jpeg.scale); - //output end - writer(arg, output_width, output_height, output_width, output_height, NULL); - - if (jres != JDR_OK) { - ESP_LOGE(TAG, "JPG Decompression Failed! %s", jd_errors[jres]); - return ESP_FAIL; - } - //check if all data has been consumed. - if (len && jpeg.index < len) { - _jpg_read(&decoder, NULL, len - jpeg.index); - } - - return ESP_OK; -} - diff --git a/lib/libesp32_div/esp32-camera/conversions/include/esp_jpg_decode.h b/lib/libesp32_div/esp32-camera/conversions/include/esp_jpg_decode.h deleted file mode 100644 index f13536edf..000000000 --- a/lib/libesp32_div/esp32-camera/conversions/include/esp_jpg_decode.h +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD -// -// 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. -#ifndef _ESP_JPG_DECODE_H_ -#define _ESP_JPG_DECODE_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include -#include -#include -#include "esp_err.h" - -typedef enum { - JPG_SCALE_NONE, - JPG_SCALE_2X, - JPG_SCALE_4X, - JPG_SCALE_8X, - JPG_SCALE_MAX = JPG_SCALE_8X -} jpg_scale_t; - -typedef size_t (* jpg_reader_cb)(void * arg, size_t index, uint8_t *buf, size_t len); -typedef bool (* jpg_writer_cb)(void * arg, uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint8_t *data); - -esp_err_t esp_jpg_decode(size_t len, jpg_scale_t scale, jpg_reader_cb reader, jpg_writer_cb writer, void * arg); - -#ifdef __cplusplus -} -#endif - -#endif /* _ESP_JPG_DECODE_H_ */ diff --git a/lib/libesp32_div/esp32-camera/conversions/include/img_converters.h b/lib/libesp32_div/esp32-camera/conversions/include/img_converters.h deleted file mode 100644 index f736200a9..000000000 --- a/lib/libesp32_div/esp32-camera/conversions/include/img_converters.h +++ /dev/null @@ -1,130 +0,0 @@ -// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD -// -// 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. -#ifndef _IMG_CONVERTERS_H_ -#define _IMG_CONVERTERS_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include -#include -#include -#include "esp_camera.h" -#include "esp_jpg_decode.h" - -typedef size_t (* jpg_out_cb)(void * arg, size_t index, const void* data, size_t len); - -/** - * @brief Convert image buffer to JPEG - * - * @param src Source buffer in RGB565, RGB888, YUYV or GRAYSCALE format - * @param src_len Length in bytes of the source buffer - * @param width Width in pixels of the source image - * @param height Height in pixels of the source image - * @param format Format of the source image - * @param quality JPEG quality of the resulting image - * @param cp Callback to be called to write the bytes of the output JPEG - * @param arg Pointer to be passed to the callback - * - * @return true on success - */ -bool fmt2jpg_cb(uint8_t *src, size_t src_len, uint16_t width, uint16_t height, pixformat_t format, uint8_t quality, jpg_out_cb cb, void * arg); - -/** - * @brief Convert camera frame buffer to JPEG - * - * @param fb Source camera frame buffer - * @param quality JPEG quality of the resulting image - * @param cp Callback to be called to write the bytes of the output JPEG - * @param arg Pointer to be passed to the callback - * - * @return true on success - */ -bool frame2jpg_cb(camera_fb_t * fb, uint8_t quality, jpg_out_cb cb, void * arg); - -/** - * @brief Convert image buffer to JPEG buffer - * - * @param src Source buffer in RGB565, RGB888, YUYV or GRAYSCALE format - * @param src_len Length in bytes of the source buffer - * @param width Width in pixels of the source image - * @param height Height in pixels of the source image - * @param format Format of the source image - * @param quality JPEG quality of the resulting image - * @param out Pointer to be populated with the address of the resulting buffer. - * You MUST free the pointer once you are done with it. - * @param out_len Pointer to be populated with the length of the output buffer - * - * @return true on success - */ -bool fmt2jpg(uint8_t *src, size_t src_len, uint16_t width, uint16_t height, pixformat_t format, uint8_t quality, uint8_t ** out, size_t * out_len); - -/** - * @brief Convert camera frame buffer to JPEG buffer - * - * @param fb Source camera frame buffer - * @param quality JPEG quality of the resulting image - * @param out Pointer to be populated with the address of the resulting buffer - * @param out_len Pointer to be populated with the length of the output buffer - * - * @return true on success - */ -bool frame2jpg(camera_fb_t * fb, uint8_t quality, uint8_t ** out, size_t * out_len); - -/** - * @brief Convert image buffer to BMP buffer - * - * @param src Source buffer in JPEG, RGB565, RGB888, YUYV or GRAYSCALE format - * @param src_len Length in bytes of the source buffer - * @param width Width in pixels of the source image - * @param height Height in pixels of the source image - * @param format Format of the source image - * @param out Pointer to be populated with the address of the resulting buffer - * @param out_len Pointer to be populated with the length of the output buffer - * - * @return true on success - */ -bool fmt2bmp(uint8_t *src, size_t src_len, uint16_t width, uint16_t height, pixformat_t format, uint8_t ** out, size_t * out_len); - -/** - * @brief Convert camera frame buffer to BMP buffer - * - * @param fb Source camera frame buffer - * @param out Pointer to be populated with the address of the resulting buffer - * @param out_len Pointer to be populated with the length of the output buffer - * - * @return true on success - */ -bool frame2bmp(camera_fb_t * fb, uint8_t ** out, size_t * out_len); - -/** - * @brief Convert image buffer to RGB888 buffer (used for face detection) - * - * @param src Source buffer in JPEG, RGB565, RGB888, YUYV or GRAYSCALE format - * @param src_len Length in bytes of the source buffer - * @param format Format of the source image - * @param rgb_buf Pointer to the output buffer (width * height * 3) - * - * @return true on success - */ -bool fmt2rgb888(const uint8_t *src_buf, size_t src_len, pixformat_t format, uint8_t * rgb_buf); - -bool jpg2rgb565(const uint8_t *src, size_t src_len, uint8_t * out, jpg_scale_t scale); - -#ifdef __cplusplus -} -#endif - -#endif /* _IMG_CONVERTERS_H_ */ diff --git a/lib/libesp32_div/esp32-camera/conversions/jpge.cpp b/lib/libesp32_div/esp32-camera/conversions/jpge.cpp deleted file mode 100644 index a8ab93e02..000000000 --- a/lib/libesp32_div/esp32-camera/conversions/jpge.cpp +++ /dev/null @@ -1,723 +0,0 @@ -// jpge.cpp - C++ class for JPEG compression. -// Public domain, Rich Geldreich -// v1.01, Dec. 18, 2010 - Initial release -// v1.02, Apr. 6, 2011 - Removed 2x2 ordered dither in H2V1 chroma subsampling method load_block_16_8_8(). (The rounding factor was 2, when it should have been 1. Either way, it wasn't helping.) -// v1.03, Apr. 16, 2011 - Added support for optimized Huffman code tables, optimized dynamic memory allocation down to only 1 alloc. -// Also from Alex Evans: Added RGBA support, linear memory allocator (no longer needed in v1.03). -// v1.04, May. 19, 2012: Forgot to set m_pFile ptr to NULL in cfile_stream::close(). Thanks to Owen Kaluza for reporting this bug. -// Code tweaks to fix VS2008 static code analysis warnings (all looked harmless). -// Code review revealed method load_block_16_8_8() (used for the non-default H2V1 sampling mode to downsample chroma) somehow didn't get the rounding factor fix from v1.02. - -#include "jpge.h" - -#include -#include -#include -#include -#include -#include -#include -#include "esp_heap_caps.h" - -#define JPGE_MAX(a,b) (((a)>(b))?(a):(b)) -#define JPGE_MIN(a,b) (((a)<(b))?(a):(b)) - -namespace jpge { - - static inline void *jpge_malloc(size_t nSize) { - void * b = malloc(nSize); - if(b){ - return b; - } - return heap_caps_malloc(nSize, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT); - } - static inline void jpge_free(void *p) { free(p); } - - // Various JPEG enums and tables. - enum { M_SOF0 = 0xC0, M_DHT = 0xC4, M_SOI = 0xD8, M_EOI = 0xD9, M_SOS = 0xDA, M_DQT = 0xDB, M_APP0 = 0xE0 }; - enum { DC_LUM_CODES = 12, AC_LUM_CODES = 256, DC_CHROMA_CODES = 12, AC_CHROMA_CODES = 256, MAX_HUFF_SYMBOLS = 257, MAX_HUFF_CODESIZE = 32 }; - - static const uint8 s_zag[64] = { 0,1,8,16,9,2,3,10,17,24,32,25,18,11,4,5,12,19,26,33,40,48,41,34,27,20,13,6,7,14,21,28,35,42,49,56,57,50,43,36,29,22,15,23,30,37,44,51,58,59,52,45,38,31,39,46,53,60,61,54,47,55,62,63 }; - static const int16 s_std_lum_quant[64] = { 16,11,12,14,12,10,16,14,13,14,18,17,16,19,24,40,26,24,22,22,24,49,35,37,29,40,58,51,61,60,57,51,56,55,64,72,92,78,64,68,87,69,55,56,80,109,81,87,95,98,103,104,103,62,77,113,121,112,100,120,92,101,103,99 }; - static const int16 s_std_croma_quant[64] = { 17,18,18,24,21,24,47,26,26,47,99,66,56,66,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99 }; - static const uint8 s_dc_lum_bits[17] = { 0,0,1,5,1,1,1,1,1,1,0,0,0,0,0,0,0 }; - static const uint8 s_dc_lum_val[DC_LUM_CODES] = { 0,1,2,3,4,5,6,7,8,9,10,11 }; - static const uint8 s_ac_lum_bits[17] = { 0,0,2,1,3,3,2,4,3,5,5,4,4,0,0,1,0x7d }; - static const uint8 s_ac_lum_val[AC_LUM_CODES] = { - 0x01,0x02,0x03,0x00,0x04,0x11,0x05,0x12,0x21,0x31,0x41,0x06,0x13,0x51,0x61,0x07,0x22,0x71,0x14,0x32,0x81,0x91,0xa1,0x08,0x23,0x42,0xb1,0xc1,0x15,0x52,0xd1,0xf0, - 0x24,0x33,0x62,0x72,0x82,0x09,0x0a,0x16,0x17,0x18,0x19,0x1a,0x25,0x26,0x27,0x28,0x29,0x2a,0x34,0x35,0x36,0x37,0x38,0x39,0x3a,0x43,0x44,0x45,0x46,0x47,0x48,0x49, - 0x4a,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5a,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x83,0x84,0x85,0x86,0x87,0x88,0x89, - 0x8a,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9a,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xb2,0xb3,0xb4,0xb5,0xb6,0xb7,0xb8,0xb9,0xba,0xc2,0xc3,0xc4,0xc5, - 0xc6,0xc7,0xc8,0xc9,0xca,0xd2,0xd3,0xd4,0xd5,0xd6,0xd7,0xd8,0xd9,0xda,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8, - 0xf9,0xfa - }; - static const uint8 s_dc_chroma_bits[17] = { 0,0,3,1,1,1,1,1,1,1,1,1,0,0,0,0,0 }; - static const uint8 s_dc_chroma_val[DC_CHROMA_CODES] = { 0,1,2,3,4,5,6,7,8,9,10,11 }; - static const uint8 s_ac_chroma_bits[17] = { 0,0,2,1,2,4,4,3,4,7,5,4,4,0,1,2,0x77 }; - static const uint8 s_ac_chroma_val[AC_CHROMA_CODES] = { - 0x00,0x01,0x02,0x03,0x11,0x04,0x05,0x21,0x31,0x06,0x12,0x41,0x51,0x07,0x61,0x71,0x13,0x22,0x32,0x81,0x08,0x14,0x42,0x91,0xa1,0xb1,0xc1,0x09,0x23,0x33,0x52,0xf0, - 0x15,0x62,0x72,0xd1,0x0a,0x16,0x24,0x34,0xe1,0x25,0xf1,0x17,0x18,0x19,0x1a,0x26,0x27,0x28,0x29,0x2a,0x35,0x36,0x37,0x38,0x39,0x3a,0x43,0x44,0x45,0x46,0x47,0x48, - 0x49,0x4a,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5a,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x82,0x83,0x84,0x85,0x86,0x87, - 0x88,0x89,0x8a,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9a,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xb2,0xb3,0xb4,0xb5,0xb6,0xb7,0xb8,0xb9,0xba,0xc2,0xc3, - 0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xd2,0xd3,0xd4,0xd5,0xd6,0xd7,0xd8,0xd9,0xda,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8, - 0xf9,0xfa - }; - - const int YR = 19595, YG = 38470, YB = 7471, CB_R = -11059, CB_G = -21709, CB_B = 32768, CR_R = 32768, CR_G = -27439, CR_B = -5329; - - static int32 m_last_quality = 0; - static int32 m_quantization_tables[2][64]; - - static bool m_huff_initialized = false; - static uint m_huff_codes[4][256]; - static uint8 m_huff_code_sizes[4][256]; - static uint8 m_huff_bits[4][17]; - static uint8 m_huff_val[4][256]; - - static inline uint8 clamp(int i) { - if (i < 0) { - i = 0; - } else if (i > 255){ - i = 255; - } - return static_cast(i); - } - - static void RGB_to_YCC(uint8* pDst, const uint8 *pSrc, int num_pixels) { - for ( ; num_pixels; pDst += 3, pSrc += 3, num_pixels--) { - const int r = pSrc[0], g = pSrc[1], b = pSrc[2]; - pDst[0] = static_cast((r * YR + g * YG + b * YB + 32768) >> 16); - pDst[1] = clamp(128 + ((r * CB_R + g * CB_G + b * CB_B + 32768) >> 16)); - pDst[2] = clamp(128 + ((r * CR_R + g * CR_G + b * CR_B + 32768) >> 16)); - } - } - - static void RGB_to_Y(uint8* pDst, const uint8 *pSrc, int num_pixels) { - for ( ; num_pixels; pDst++, pSrc += 3, num_pixels--) { - pDst[0] = static_cast((pSrc[0] * YR + pSrc[1] * YG + pSrc[2] * YB + 32768) >> 16); - } - } - - static void Y_to_YCC(uint8* pDst, const uint8* pSrc, int num_pixels) { - for( ; num_pixels; pDst += 3, pSrc++, num_pixels--) { - pDst[0] = pSrc[0]; - pDst[1] = 128; - pDst[2] = 128; - } - } - - // Forward DCT - DCT derived from jfdctint. - enum { CONST_BITS = 13, ROW_BITS = 2 }; -#define DCT_DESCALE(x, n) (((x) + (((int32)1) << ((n) - 1))) >> (n)) -#define DCT_MUL(var, c) (static_cast(var) * static_cast(c)) -#define DCT1D(s0, s1, s2, s3, s4, s5, s6, s7) \ - int32 t0 = s0 + s7, t7 = s0 - s7, t1 = s1 + s6, t6 = s1 - s6, t2 = s2 + s5, t5 = s2 - s5, t3 = s3 + s4, t4 = s3 - s4; \ - int32 t10 = t0 + t3, t13 = t0 - t3, t11 = t1 + t2, t12 = t1 - t2; \ - int32 u1 = DCT_MUL(t12 + t13, 4433); \ - s2 = u1 + DCT_MUL(t13, 6270); \ - s6 = u1 + DCT_MUL(t12, -15137); \ - u1 = t4 + t7; \ - int32 u2 = t5 + t6, u3 = t4 + t6, u4 = t5 + t7; \ - int32 z5 = DCT_MUL(u3 + u4, 9633); \ - t4 = DCT_MUL(t4, 2446); t5 = DCT_MUL(t5, 16819); \ - t6 = DCT_MUL(t6, 25172); t7 = DCT_MUL(t7, 12299); \ - u1 = DCT_MUL(u1, -7373); u2 = DCT_MUL(u2, -20995); \ - u3 = DCT_MUL(u3, -16069); u4 = DCT_MUL(u4, -3196); \ - u3 += z5; u4 += z5; \ - s0 = t10 + t11; s1 = t7 + u1 + u4; s3 = t6 + u2 + u3; s4 = t10 - t11; s5 = t5 + u2 + u4; s7 = t4 + u1 + u3; - - static void DCT2D(int32 *p) { - int32 c, *q = p; - for (c = 7; c >= 0; c--, q += 8) { - int32 s0 = q[0], s1 = q[1], s2 = q[2], s3 = q[3], s4 = q[4], s5 = q[5], s6 = q[6], s7 = q[7]; - DCT1D(s0, s1, s2, s3, s4, s5, s6, s7); - q[0] = s0 << ROW_BITS; q[1] = DCT_DESCALE(s1, CONST_BITS-ROW_BITS); q[2] = DCT_DESCALE(s2, CONST_BITS-ROW_BITS); q[3] = DCT_DESCALE(s3, CONST_BITS-ROW_BITS); - q[4] = s4 << ROW_BITS; q[5] = DCT_DESCALE(s5, CONST_BITS-ROW_BITS); q[6] = DCT_DESCALE(s6, CONST_BITS-ROW_BITS); q[7] = DCT_DESCALE(s7, CONST_BITS-ROW_BITS); - } - for (q = p, c = 7; c >= 0; c--, q++) { - int32 s0 = q[0*8], s1 = q[1*8], s2 = q[2*8], s3 = q[3*8], s4 = q[4*8], s5 = q[5*8], s6 = q[6*8], s7 = q[7*8]; - DCT1D(s0, s1, s2, s3, s4, s5, s6, s7); - q[0*8] = DCT_DESCALE(s0, ROW_BITS+3); q[1*8] = DCT_DESCALE(s1, CONST_BITS+ROW_BITS+3); q[2*8] = DCT_DESCALE(s2, CONST_BITS+ROW_BITS+3); q[3*8] = DCT_DESCALE(s3, CONST_BITS+ROW_BITS+3); - q[4*8] = DCT_DESCALE(s4, ROW_BITS+3); q[5*8] = DCT_DESCALE(s5, CONST_BITS+ROW_BITS+3); q[6*8] = DCT_DESCALE(s6, CONST_BITS+ROW_BITS+3); q[7*8] = DCT_DESCALE(s7, CONST_BITS+ROW_BITS+3); - } - } - - // Compute the actual canonical Huffman codes/code sizes given the JPEG huff bits and val arrays. - static void compute_huffman_table(uint *codes, uint8 *code_sizes, uint8 *bits, uint8 *val) - { - int i, l, last_p, si; - static uint8 huff_size[257]; - static uint huff_code[257]; - uint code; - - int p = 0; - for (l = 1; l <= 16; l++) { - for (i = 1; i <= bits[l]; i++) { - huff_size[p++] = (char)l; - } - } - - huff_size[p] = 0; - last_p = p; // write sentinel - - code = 0; si = huff_size[0]; p = 0; - - while (huff_size[p]) { - while (huff_size[p] == si) { - huff_code[p++] = code++; - } - code <<= 1; - si++; - } - - memset(codes, 0, sizeof(codes[0])*256); - memset(code_sizes, 0, sizeof(code_sizes[0])*256); - for (p = 0; p < last_p; p++) { - codes[val[p]] = huff_code[p]; - code_sizes[val[p]] = huff_size[p]; - } - } - - void jpeg_encoder::flush_output_buffer() - { - if (m_out_buf_left != JPGE_OUT_BUF_SIZE) { - m_all_stream_writes_succeeded = m_all_stream_writes_succeeded && m_pStream->put_buf(m_out_buf, JPGE_OUT_BUF_SIZE - m_out_buf_left); - } - m_pOut_buf = m_out_buf; - m_out_buf_left = JPGE_OUT_BUF_SIZE; - } - - void jpeg_encoder::emit_byte(uint8 i) - { - *m_pOut_buf++ = i; - if (--m_out_buf_left == 0) { - flush_output_buffer(); - } - } - - void jpeg_encoder::put_bits(uint bits, uint len) - { - uint8 c = 0; - m_bit_buffer |= ((uint32)bits << (24 - (m_bits_in += len))); - while (m_bits_in >= 8) { - c = (uint8)((m_bit_buffer >> 16) & 0xFF); - emit_byte(c); - if (c == 0xFF) { - emit_byte(0); - } - m_bit_buffer <<= 8; - m_bits_in -= 8; - } - } - - void jpeg_encoder::emit_word(uint i) - { - emit_byte(uint8(i >> 8)); emit_byte(uint8(i & 0xFF)); - } - - // JPEG marker generation. - void jpeg_encoder::emit_marker(int marker) - { - emit_byte(uint8(0xFF)); emit_byte(uint8(marker)); - } - - // Emit JFIF marker - void jpeg_encoder::emit_jfif_app0() - { - emit_marker(M_APP0); - emit_word(2 + 4 + 1 + 2 + 1 + 2 + 2 + 1 + 1); - emit_byte(0x4A); emit_byte(0x46); emit_byte(0x49); emit_byte(0x46); /* Identifier: ASCII "JFIF" */ - emit_byte(0); - emit_byte(1); /* Major version */ - emit_byte(1); /* Minor version */ - emit_byte(0); /* Density unit */ - emit_word(1); - emit_word(1); - emit_byte(0); /* No thumbnail image */ - emit_byte(0); - } - - // Emit quantization tables - void jpeg_encoder::emit_dqt() - { - for (int i = 0; i < ((m_num_components == 3) ? 2 : 1); i++) - { - emit_marker(M_DQT); - emit_word(64 + 1 + 2); - emit_byte(static_cast(i)); - for (int j = 0; j < 64; j++) - emit_byte(static_cast(m_quantization_tables[i][j])); - } - } - - // Emit start of frame marker - void jpeg_encoder::emit_sof() - { - emit_marker(M_SOF0); /* baseline */ - emit_word(3 * m_num_components + 2 + 5 + 1); - emit_byte(8); /* precision */ - emit_word(m_image_y); - emit_word(m_image_x); - emit_byte(m_num_components); - for (int i = 0; i < m_num_components; i++) - { - emit_byte(static_cast(i + 1)); /* component ID */ - emit_byte((m_comp_h_samp[i] << 4) + m_comp_v_samp[i]); /* h and v sampling */ - emit_byte(i > 0); /* quant. table num */ - } - } - - // Emit Huffman table. - void jpeg_encoder::emit_dht(uint8 *bits, uint8 *val, int index, bool ac_flag) - { - emit_marker(M_DHT); - - int length = 0; - for (int i = 1; i <= 16; i++) - length += bits[i]; - - emit_word(length + 2 + 1 + 16); - emit_byte(static_cast(index + (ac_flag << 4))); - - for (int i = 1; i <= 16; i++) - emit_byte(bits[i]); - - for (int i = 0; i < length; i++) - emit_byte(val[i]); - } - - // Emit all Huffman tables. - void jpeg_encoder::emit_dhts() - { - emit_dht(m_huff_bits[0+0], m_huff_val[0+0], 0, false); - emit_dht(m_huff_bits[2+0], m_huff_val[2+0], 0, true); - if (m_num_components == 3) { - emit_dht(m_huff_bits[0+1], m_huff_val[0+1], 1, false); - emit_dht(m_huff_bits[2+1], m_huff_val[2+1], 1, true); - } - } - - // emit start of scan - void jpeg_encoder::emit_sos() - { - emit_marker(M_SOS); - emit_word(2 * m_num_components + 2 + 1 + 3); - emit_byte(m_num_components); - for (int i = 0; i < m_num_components; i++) - { - emit_byte(static_cast(i + 1)); - if (i == 0) - emit_byte((0 << 4) + 0); - else - emit_byte((1 << 4) + 1); - } - emit_byte(0); /* spectral selection */ - emit_byte(63); - emit_byte(0); - } - - void jpeg_encoder::load_block_8_8_grey(int x) - { - uint8 *pSrc; - sample_array_t *pDst = m_sample_array; - x <<= 3; - for (int i = 0; i < 8; i++, pDst += 8) - { - pSrc = m_mcu_lines[i] + x; - pDst[0] = pSrc[0] - 128; pDst[1] = pSrc[1] - 128; pDst[2] = pSrc[2] - 128; pDst[3] = pSrc[3] - 128; - pDst[4] = pSrc[4] - 128; pDst[5] = pSrc[5] - 128; pDst[6] = pSrc[6] - 128; pDst[7] = pSrc[7] - 128; - } - } - - void jpeg_encoder::load_block_8_8(int x, int y, int c) - { - uint8 *pSrc; - sample_array_t *pDst = m_sample_array; - x = (x * (8 * 3)) + c; - y <<= 3; - for (int i = 0; i < 8; i++, pDst += 8) - { - pSrc = m_mcu_lines[y + i] + x; - pDst[0] = pSrc[0 * 3] - 128; pDst[1] = pSrc[1 * 3] - 128; pDst[2] = pSrc[2 * 3] - 128; pDst[3] = pSrc[3 * 3] - 128; - pDst[4] = pSrc[4 * 3] - 128; pDst[5] = pSrc[5 * 3] - 128; pDst[6] = pSrc[6 * 3] - 128; pDst[7] = pSrc[7 * 3] - 128; - } - } - - void jpeg_encoder::load_block_16_8(int x, int c) - { - uint8 *pSrc1, *pSrc2; - sample_array_t *pDst = m_sample_array; - x = (x * (16 * 3)) + c; - int a = 0, b = 2; - for (int i = 0; i < 16; i += 2, pDst += 8) - { - pSrc1 = m_mcu_lines[i + 0] + x; - pSrc2 = m_mcu_lines[i + 1] + x; - pDst[0] = ((pSrc1[ 0 * 3] + pSrc1[ 1 * 3] + pSrc2[ 0 * 3] + pSrc2[ 1 * 3] + a) >> 2) - 128; pDst[1] = ((pSrc1[ 2 * 3] + pSrc1[ 3 * 3] + pSrc2[ 2 * 3] + pSrc2[ 3 * 3] + b) >> 2) - 128; - pDst[2] = ((pSrc1[ 4 * 3] + pSrc1[ 5 * 3] + pSrc2[ 4 * 3] + pSrc2[ 5 * 3] + a) >> 2) - 128; pDst[3] = ((pSrc1[ 6 * 3] + pSrc1[ 7 * 3] + pSrc2[ 6 * 3] + pSrc2[ 7 * 3] + b) >> 2) - 128; - pDst[4] = ((pSrc1[ 8 * 3] + pSrc1[ 9 * 3] + pSrc2[ 8 * 3] + pSrc2[ 9 * 3] + a) >> 2) - 128; pDst[5] = ((pSrc1[10 * 3] + pSrc1[11 * 3] + pSrc2[10 * 3] + pSrc2[11 * 3] + b) >> 2) - 128; - pDst[6] = ((pSrc1[12 * 3] + pSrc1[13 * 3] + pSrc2[12 * 3] + pSrc2[13 * 3] + a) >> 2) - 128; pDst[7] = ((pSrc1[14 * 3] + pSrc1[15 * 3] + pSrc2[14 * 3] + pSrc2[15 * 3] + b) >> 2) - 128; - int temp = a; a = b; b = temp; - } - } - - void jpeg_encoder::load_block_16_8_8(int x, int c) - { - uint8 *pSrc1; - sample_array_t *pDst = m_sample_array; - x = (x * (16 * 3)) + c; - for (int i = 0; i < 8; i++, pDst += 8) - { - pSrc1 = m_mcu_lines[i + 0] + x; - pDst[0] = ((pSrc1[ 0 * 3] + pSrc1[ 1 * 3]) >> 1) - 128; pDst[1] = ((pSrc1[ 2 * 3] + pSrc1[ 3 * 3]) >> 1) - 128; - pDst[2] = ((pSrc1[ 4 * 3] + pSrc1[ 5 * 3]) >> 1) - 128; pDst[3] = ((pSrc1[ 6 * 3] + pSrc1[ 7 * 3]) >> 1) - 128; - pDst[4] = ((pSrc1[ 8 * 3] + pSrc1[ 9 * 3]) >> 1) - 128; pDst[5] = ((pSrc1[10 * 3] + pSrc1[11 * 3]) >> 1) - 128; - pDst[6] = ((pSrc1[12 * 3] + pSrc1[13 * 3]) >> 1) - 128; pDst[7] = ((pSrc1[14 * 3] + pSrc1[15 * 3]) >> 1) - 128; - } - } - - void jpeg_encoder::load_quantized_coefficients(int component_num) - { - int32 *q = m_quantization_tables[component_num > 0]; - int16 *pDst = m_coefficient_array; - for (int i = 0; i < 64; i++) - { - sample_array_t j = m_sample_array[s_zag[i]]; - if (j < 0) - { - if ((j = -j + (*q >> 1)) < *q) - *pDst++ = 0; - else - *pDst++ = static_cast(-(j / *q)); - } - else - { - if ((j = j + (*q >> 1)) < *q) - *pDst++ = 0; - else - *pDst++ = static_cast((j / *q)); - } - q++; - } - } - - void jpeg_encoder::code_coefficients_pass_two(int component_num) - { - int i, j, run_len, nbits, temp1, temp2; - int16 *pSrc = m_coefficient_array; - uint *codes[2]; - uint8 *code_sizes[2]; - - if (component_num == 0) - { - codes[0] = m_huff_codes[0 + 0]; codes[1] = m_huff_codes[2 + 0]; - code_sizes[0] = m_huff_code_sizes[0 + 0]; code_sizes[1] = m_huff_code_sizes[2 + 0]; - } - else - { - codes[0] = m_huff_codes[0 + 1]; codes[1] = m_huff_codes[2 + 1]; - code_sizes[0] = m_huff_code_sizes[0 + 1]; code_sizes[1] = m_huff_code_sizes[2 + 1]; - } - - temp1 = temp2 = pSrc[0] - m_last_dc_val[component_num]; - m_last_dc_val[component_num] = pSrc[0]; - - if (temp1 < 0) - { - temp1 = -temp1; temp2--; - } - - nbits = 0; - while (temp1) - { - nbits++; temp1 >>= 1; - } - - put_bits(codes[0][nbits], code_sizes[0][nbits]); - if (nbits) put_bits(temp2 & ((1 << nbits) - 1), nbits); - - for (run_len = 0, i = 1; i < 64; i++) - { - if ((temp1 = m_coefficient_array[i]) == 0) - run_len++; - else - { - while (run_len >= 16) - { - put_bits(codes[1][0xF0], code_sizes[1][0xF0]); - run_len -= 16; - } - if ((temp2 = temp1) < 0) - { - temp1 = -temp1; - temp2--; - } - nbits = 1; - while (temp1 >>= 1) - nbits++; - j = (run_len << 4) + nbits; - put_bits(codes[1][j], code_sizes[1][j]); - put_bits(temp2 & ((1 << nbits) - 1), nbits); - run_len = 0; - } - } - if (run_len) - put_bits(codes[1][0], code_sizes[1][0]); - } - - void jpeg_encoder::code_block(int component_num) - { - DCT2D(m_sample_array); - load_quantized_coefficients(component_num); - code_coefficients_pass_two(component_num); - } - - void jpeg_encoder::process_mcu_row() - { - if (m_num_components == 1) - { - for (int i = 0; i < m_mcus_per_row; i++) - { - load_block_8_8_grey(i); code_block(0); - } - } - else if ((m_comp_h_samp[0] == 1) && (m_comp_v_samp[0] == 1)) - { - for (int i = 0; i < m_mcus_per_row; i++) - { - load_block_8_8(i, 0, 0); code_block(0); load_block_8_8(i, 0, 1); code_block(1); load_block_8_8(i, 0, 2); code_block(2); - } - } - else if ((m_comp_h_samp[0] == 2) && (m_comp_v_samp[0] == 1)) - { - for (int i = 0; i < m_mcus_per_row; i++) - { - load_block_8_8(i * 2 + 0, 0, 0); code_block(0); load_block_8_8(i * 2 + 1, 0, 0); code_block(0); - load_block_16_8_8(i, 1); code_block(1); load_block_16_8_8(i, 2); code_block(2); - } - } - else if ((m_comp_h_samp[0] == 2) && (m_comp_v_samp[0] == 2)) - { - for (int i = 0; i < m_mcus_per_row; i++) - { - load_block_8_8(i * 2 + 0, 0, 0); code_block(0); load_block_8_8(i * 2 + 1, 0, 0); code_block(0); - load_block_8_8(i * 2 + 0, 1, 0); code_block(0); load_block_8_8(i * 2 + 1, 1, 0); code_block(0); - load_block_16_8(i, 1); code_block(1); load_block_16_8(i, 2); code_block(2); - } - } - } - - void jpeg_encoder::load_mcu(const void *pSrc) - { - const uint8* Psrc = reinterpret_cast(pSrc); - - uint8* pDst = m_mcu_lines[m_mcu_y_ofs]; // OK to write up to m_image_bpl_xlt bytes to pDst - - if (m_num_components == 1) { - if (m_image_bpp == 3) - RGB_to_Y(pDst, Psrc, m_image_x); - else - memcpy(pDst, Psrc, m_image_x); - } else { - if (m_image_bpp == 3) - RGB_to_YCC(pDst, Psrc, m_image_x); - else - Y_to_YCC(pDst, Psrc, m_image_x); - } - - // Possibly duplicate pixels at end of scanline if not a multiple of 8 or 16 - if (m_num_components == 1) - memset(m_mcu_lines[m_mcu_y_ofs] + m_image_bpl_xlt, pDst[m_image_bpl_xlt - 1], m_image_x_mcu - m_image_x); - else - { - const uint8 y = pDst[m_image_bpl_xlt - 3 + 0], cb = pDst[m_image_bpl_xlt - 3 + 1], cr = pDst[m_image_bpl_xlt - 3 + 2]; - uint8 *q = m_mcu_lines[m_mcu_y_ofs] + m_image_bpl_xlt; - for (int i = m_image_x; i < m_image_x_mcu; i++) - { - *q++ = y; *q++ = cb; *q++ = cr; - } - } - - if (++m_mcu_y_ofs == m_mcu_y) - { - process_mcu_row(); - m_mcu_y_ofs = 0; - } - } - - // Quantization table generation. - void jpeg_encoder::compute_quant_table(int32 *pDst, const int16 *pSrc) - { - int32 q; - if (m_params.m_quality < 50) - q = 5000 / m_params.m_quality; - else - q = 200 - m_params.m_quality * 2; - for (int i = 0; i < 64; i++) - { - int32 j = *pSrc++; j = (j * q + 50L) / 100L; - *pDst++ = JPGE_MIN(JPGE_MAX(j, 1), 255); - } - } - - // Higher-level methods. - bool jpeg_encoder::jpg_open(int p_x_res, int p_y_res, int src_channels) - { - m_num_components = 3; - switch (m_params.m_subsampling) - { - case Y_ONLY: - { - m_num_components = 1; - m_comp_h_samp[0] = 1; m_comp_v_samp[0] = 1; - m_mcu_x = 8; m_mcu_y = 8; - break; - } - case H1V1: - { - m_comp_h_samp[0] = 1; m_comp_v_samp[0] = 1; - m_comp_h_samp[1] = 1; m_comp_v_samp[1] = 1; - m_comp_h_samp[2] = 1; m_comp_v_samp[2] = 1; - m_mcu_x = 8; m_mcu_y = 8; - break; - } - case H2V1: - { - m_comp_h_samp[0] = 2; m_comp_v_samp[0] = 1; - m_comp_h_samp[1] = 1; m_comp_v_samp[1] = 1; - m_comp_h_samp[2] = 1; m_comp_v_samp[2] = 1; - m_mcu_x = 16; m_mcu_y = 8; - break; - } - case H2V2: - { - m_comp_h_samp[0] = 2; m_comp_v_samp[0] = 2; - m_comp_h_samp[1] = 1; m_comp_v_samp[1] = 1; - m_comp_h_samp[2] = 1; m_comp_v_samp[2] = 1; - m_mcu_x = 16; m_mcu_y = 16; - } - } - - m_image_x = p_x_res; m_image_y = p_y_res; - m_image_bpp = src_channels; - m_image_bpl = m_image_x * src_channels; - m_image_x_mcu = (m_image_x + m_mcu_x - 1) & (~(m_mcu_x - 1)); - m_image_y_mcu = (m_image_y + m_mcu_y - 1) & (~(m_mcu_y - 1)); - m_image_bpl_xlt = m_image_x * m_num_components; - m_image_bpl_mcu = m_image_x_mcu * m_num_components; - m_mcus_per_row = m_image_x_mcu / m_mcu_x; - - if ((m_mcu_lines[0] = static_cast(jpge_malloc(m_image_bpl_mcu * m_mcu_y))) == NULL) { - return false; - } - for (int i = 1; i < m_mcu_y; i++) - m_mcu_lines[i] = m_mcu_lines[i-1] + m_image_bpl_mcu; - - if(m_last_quality != m_params.m_quality){ - m_last_quality = m_params.m_quality; - compute_quant_table(m_quantization_tables[0], s_std_lum_quant); - compute_quant_table(m_quantization_tables[1], s_std_croma_quant); - } - - if(!m_huff_initialized){ - m_huff_initialized = true; - - memcpy(m_huff_bits[0+0], s_dc_lum_bits, 17); memcpy(m_huff_val[0+0], s_dc_lum_val, DC_LUM_CODES); - memcpy(m_huff_bits[2+0], s_ac_lum_bits, 17); memcpy(m_huff_val[2+0], s_ac_lum_val, AC_LUM_CODES); - memcpy(m_huff_bits[0+1], s_dc_chroma_bits, 17); memcpy(m_huff_val[0+1], s_dc_chroma_val, DC_CHROMA_CODES); - memcpy(m_huff_bits[2+1], s_ac_chroma_bits, 17); memcpy(m_huff_val[2+1], s_ac_chroma_val, AC_CHROMA_CODES); - - compute_huffman_table(&m_huff_codes[0+0][0], &m_huff_code_sizes[0+0][0], m_huff_bits[0+0], m_huff_val[0+0]); - compute_huffman_table(&m_huff_codes[2+0][0], &m_huff_code_sizes[2+0][0], m_huff_bits[2+0], m_huff_val[2+0]); - compute_huffman_table(&m_huff_codes[0+1][0], &m_huff_code_sizes[0+1][0], m_huff_bits[0+1], m_huff_val[0+1]); - compute_huffman_table(&m_huff_codes[2+1][0], &m_huff_code_sizes[2+1][0], m_huff_bits[2+1], m_huff_val[2+1]); - } - - m_out_buf_left = JPGE_OUT_BUF_SIZE; - m_pOut_buf = m_out_buf; - m_bit_buffer = 0; - m_bits_in = 0; - m_mcu_y_ofs = 0; - m_pass_num = 2; - memset(m_last_dc_val, 0, 3 * sizeof(m_last_dc_val[0])); - - // Emit all markers at beginning of image file. - emit_marker(M_SOI); - emit_jfif_app0(); - emit_dqt(); - emit_sof(); - emit_dhts(); - emit_sos(); - - return m_all_stream_writes_succeeded; - } - - bool jpeg_encoder::process_end_of_image() - { - if (m_mcu_y_ofs) { - if (m_mcu_y_ofs < 16) { // check here just to shut up static analysis - for (int i = m_mcu_y_ofs; i < m_mcu_y; i++) { - memcpy(m_mcu_lines[i], m_mcu_lines[m_mcu_y_ofs - 1], m_image_bpl_mcu); - } - } - process_mcu_row(); - } - - put_bits(0x7F, 7); - emit_marker(M_EOI); - flush_output_buffer(); - m_all_stream_writes_succeeded = m_all_stream_writes_succeeded && m_pStream->put_buf(NULL, 0); - m_pass_num++; // purposely bump up m_pass_num, for debugging - return true; - } - - void jpeg_encoder::clear() - { - m_mcu_lines[0] = NULL; - m_pass_num = 0; - m_all_stream_writes_succeeded = true; - } - - jpeg_encoder::jpeg_encoder() - { - clear(); - } - - jpeg_encoder::~jpeg_encoder() - { - deinit(); - } - - bool jpeg_encoder::init(output_stream *pStream, int width, int height, int src_channels, const params &comp_params) - { - deinit(); - if (((!pStream) || (width < 1) || (height < 1)) || ((src_channels != 1) && (src_channels != 3) && (src_channels != 4)) || (!comp_params.check())) return false; - m_pStream = pStream; - m_params = comp_params; - return jpg_open(width, height, src_channels); - } - - void jpeg_encoder::deinit() - { - jpge_free(m_mcu_lines[0]); - clear(); - } - - bool jpeg_encoder::process_scanline(const void* pScanline) - { - if ((m_pass_num < 1) || (m_pass_num > 2)) { - return false; - } - if (m_all_stream_writes_succeeded) { - if (!pScanline) { - if (!process_end_of_image()) { - return false; - } - } else { - load_mcu(pScanline); - } - } - return m_all_stream_writes_succeeded; - } - -} // namespace jpge diff --git a/lib/libesp32_div/esp32-camera/conversions/private_include/jpge.h b/lib/libesp32_div/esp32-camera/conversions/private_include/jpge.h deleted file mode 100644 index aa295c8af..000000000 --- a/lib/libesp32_div/esp32-camera/conversions/private_include/jpge.h +++ /dev/null @@ -1,142 +0,0 @@ -// jpge.h - C++ class for JPEG compression. -// Public domain, Rich Geldreich -// Alex Evans: Added RGBA support, linear memory allocator. -#ifndef JPEG_ENCODER_H -#define JPEG_ENCODER_H - -namespace jpge -{ - typedef unsigned char uint8; - typedef signed short int16; - typedef signed int int32; - typedef unsigned short uint16; - typedef unsigned int uint32; - typedef unsigned int uint; - - // JPEG chroma subsampling factors. Y_ONLY (grayscale images) and H2V2 (color images) are the most common. - enum subsampling_t { Y_ONLY = 0, H1V1 = 1, H2V1 = 2, H2V2 = 3 }; - - // JPEG compression parameters structure. - struct params { - inline params() : m_quality(85), m_subsampling(H2V2) { } - - inline bool check() const { - if ((m_quality < 1) || (m_quality > 100)) { - return false; - } - if ((uint)m_subsampling > (uint)H2V2) { - return false; - } - return true; - } - - // Quality: 1-100, higher is better. Typical values are around 50-95. - int m_quality; - - // m_subsampling: - // 0 = Y (grayscale) only - // 1 = H1V1 subsampling (YCbCr 1x1x1, 3 blocks per MCU) - // 2 = H2V1 subsampling (YCbCr 2x1x1, 4 blocks per MCU) - // 3 = H2V2 subsampling (YCbCr 4x1x1, 6 blocks per MCU-- very common) - subsampling_t m_subsampling; - }; - - // Output stream abstract class - used by the jpeg_encoder class to write to the output stream. - // put_buf() is generally called with len==JPGE_OUT_BUF_SIZE bytes, but for headers it'll be called with smaller amounts. - class output_stream { - public: - virtual ~output_stream() { }; - virtual bool put_buf(const void* Pbuf, int len) = 0; - virtual uint get_size() const = 0; - }; - - // Lower level jpeg_encoder class - useful if more control is needed than the above helper functions. - class jpeg_encoder { - public: - jpeg_encoder(); - ~jpeg_encoder(); - - // Initializes the compressor. - // pStream: The stream object to use for writing compressed data. - // params - Compression parameters structure, defined above. - // width, height - Image dimensions. - // channels - May be 1, or 3. 1 indicates grayscale, 3 indicates RGB source data. - // Returns false on out of memory or if a stream write fails. - bool init(output_stream *pStream, int width, int height, int src_channels, const params &comp_params = params()); - - // Call this method with each source scanline. - // width * src_channels bytes per scanline is expected (RGB or Y format). - // You must call with NULL after all scanlines are processed to finish compression. - // Returns false on out of memory or if a stream write fails. - bool process_scanline(const void* pScanline); - - // Deinitializes the compressor, freeing any allocated memory. May be called at any time. - void deinit(); - - private: - jpeg_encoder(const jpeg_encoder &); - jpeg_encoder &operator =(const jpeg_encoder &); - - typedef int32 sample_array_t; - enum { JPGE_OUT_BUF_SIZE = 512 }; - - output_stream *m_pStream; - params m_params; - uint8 m_num_components; - uint8 m_comp_h_samp[3], m_comp_v_samp[3]; - int m_image_x, m_image_y, m_image_bpp, m_image_bpl; - int m_image_x_mcu, m_image_y_mcu; - int m_image_bpl_xlt, m_image_bpl_mcu; - int m_mcus_per_row; - int m_mcu_x, m_mcu_y; - uint8 *m_mcu_lines[16]; - uint8 m_mcu_y_ofs; - sample_array_t m_sample_array[64]; - int16 m_coefficient_array[64]; - - int m_last_dc_val[3]; - uint8 m_out_buf[JPGE_OUT_BUF_SIZE]; - uint8 *m_pOut_buf; - uint m_out_buf_left; - uint32 m_bit_buffer; - uint m_bits_in; - uint8 m_pass_num; - bool m_all_stream_writes_succeeded; - - bool jpg_open(int p_x_res, int p_y_res, int src_channels); - - void flush_output_buffer(); - void put_bits(uint bits, uint len); - - void emit_byte(uint8 i); - void emit_word(uint i); - void emit_marker(int marker); - - void emit_jfif_app0(); - void emit_dqt(); - void emit_sof(); - void emit_dht(uint8 *bits, uint8 *val, int index, bool ac_flag); - void emit_dhts(); - void emit_sos(); - - void compute_quant_table(int32 *dst, const int16 *src); - void load_quantized_coefficients(int component_num); - - void load_block_8_8_grey(int x); - void load_block_8_8(int x, int y, int c); - void load_block_16_8(int x, int c); - void load_block_16_8_8(int x, int c); - - void code_coefficients_pass_two(int component_num); - void code_block(int component_num); - - void process_mcu_row(); - bool process_end_of_image(); - void load_mcu(const void* src); - void clear(); - void init(); - }; - -} // namespace jpge - -#endif // JPEG_ENCODER diff --git a/lib/libesp32_div/esp32-camera/conversions/private_include/yuv.h b/lib/libesp32_div/esp32-camera/conversions/private_include/yuv.h deleted file mode 100644 index c5a0577ef..000000000 --- a/lib/libesp32_div/esp32-camera/conversions/private_include/yuv.h +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD -// -// 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. -#ifndef _CONVERSIONS_YUV_H_ -#define _CONVERSIONS_YUV_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include - -void yuv2rgb(uint8_t y, uint8_t u, uint8_t v, uint8_t *r, uint8_t *g, uint8_t *b); - -#ifdef __cplusplus -} -#endif - -#endif /* _CONVERSIONS_YUV_H_ */ diff --git a/lib/libesp32_div/esp32-camera/conversions/to_bmp.c b/lib/libesp32_div/esp32-camera/conversions/to_bmp.c deleted file mode 100644 index 5a54bdbae..000000000 --- a/lib/libesp32_div/esp32-camera/conversions/to_bmp.c +++ /dev/null @@ -1,393 +0,0 @@ -// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD -// -// 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. -#include -#include -#include "img_converters.h" -#include "soc/efuse_reg.h" -#include "esp_heap_caps.h" -#include "yuv.h" -#include "sdkconfig.h" -#include "esp_jpg_decode.h" - -#include "esp_system.h" -#if ESP_IDF_VERSION_MAJOR >= 4 // IDF 4+ -#if CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4 -#include "esp32/spiram.h" -#elif CONFIG_IDF_TARGET_ESP32S2 -#include "esp32s2/spiram.h" -#elif CONFIG_IDF_TARGET_ESP32S3 -#include "esp32s3/spiram.h" -#else -#error Target CONFIG_IDF_TARGET is not supported -#endif -#else // ESP32 Before IDF 4.0 -#include "esp_spiram.h" -#endif - -#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) -#include "esp32-hal-log.h" -#define TAG "" -#else -#include "esp_log.h" -static const char* TAG = "to_bmp"; -#endif - -static const int BMP_HEADER_LEN = 54; - -typedef struct { - uint32_t filesize; - uint32_t reserved; - uint32_t fileoffset_to_pixelarray; - uint32_t dibheadersize; - int32_t width; - int32_t height; - uint16_t planes; - uint16_t bitsperpixel; - uint32_t compression; - uint32_t imagesize; - uint32_t ypixelpermeter; - uint32_t xpixelpermeter; - uint32_t numcolorspallette; - uint32_t mostimpcolor; -} bmp_header_t; - -typedef struct { - uint16_t width; - uint16_t height; - uint16_t data_offset; - const uint8_t *input; - uint8_t *output; -} rgb_jpg_decoder; - -static void *_malloc(size_t size) -{ - return heap_caps_malloc(size, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT); -} - -//output buffer and image width -static bool _rgb_write(void * arg, uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint8_t *data) -{ - rgb_jpg_decoder * jpeg = (rgb_jpg_decoder *)arg; - if(!data){ - if(x == 0 && y == 0){ - //write start - jpeg->width = w; - jpeg->height = h; - //if output is null, this is BMP - if(!jpeg->output){ - jpeg->output = (uint8_t *)_malloc((w*h*3)+jpeg->data_offset); - if(!jpeg->output){ - return false; - } - } - } else { - //write end - } - return true; - } - - 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->output+jpeg->data_offset; - uint8_t *o = out; - size_t iy, ix; - - w = w * 3; - - for(iy=t; iywidth = w; - jpeg->height = h; - //if output is null, this is BMP - if(!jpeg->output){ - jpeg->output = (uint8_t *)_malloc((w*h*3)+jpeg->data_offset); - if(!jpeg->output){ - return false; - } - } - } else { - //write end - } - return true; - } - - 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->output+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; -} - -//input buffer -static uint32_t _jpg_read(void * arg, size_t index, uint8_t *buf, size_t len) -{ - rgb_jpg_decoder * jpeg = (rgb_jpg_decoder *)arg; - if(buf) { - memcpy(buf, jpeg->input + index, len); - } - return len; -} - -static bool jpg2rgb888(const uint8_t *src, size_t src_len, uint8_t * out, jpg_scale_t scale) -{ - rgb_jpg_decoder jpeg; - jpeg.width = 0; - jpeg.height = 0; - jpeg.input = src; - jpeg.output = out; - jpeg.data_offset = 0; - - if(esp_jpg_decode(src_len, scale, _jpg_read, _rgb_write, (void*)&jpeg) != ESP_OK){ - return false; - } - return true; -} - -bool jpg2rgb565(const uint8_t *src, size_t src_len, uint8_t * out, jpg_scale_t scale) -{ - rgb_jpg_decoder jpeg; - jpeg.width = 0; - jpeg.height = 0; - jpeg.input = src; - jpeg.output = out; - jpeg.data_offset = 0; - - if(esp_jpg_decode(src_len, scale, _jpg_read, _rgb565_write, (void*)&jpeg) != ESP_OK){ - return false; - } - return true; -} - -bool jpg2bmp(const uint8_t *src, size_t src_len, uint8_t ** out, size_t * out_len) -{ - - rgb_jpg_decoder jpeg; - jpeg.width = 0; - jpeg.height = 0; - jpeg.input = src; - jpeg.output = NULL; - jpeg.data_offset = BMP_HEADER_LEN; - - if(esp_jpg_decode(src_len, JPG_SCALE_NONE, _jpg_read, _rgb_write, (void*)&jpeg) != ESP_OK){ - return false; - } - - size_t output_size = jpeg.width*jpeg.height*3; - - jpeg.output[0] = 'B'; - jpeg.output[1] = 'M'; - bmp_header_t * bitmap = (bmp_header_t*)&jpeg.output[2]; - bitmap->reserved = 0; - bitmap->filesize = output_size+BMP_HEADER_LEN; - bitmap->fileoffset_to_pixelarray = BMP_HEADER_LEN; - bitmap->dibheadersize = 40; - bitmap->width = jpeg.width; - bitmap->height = -jpeg.height;//set negative for top to bottom - bitmap->planes = 1; - bitmap->bitsperpixel = 24; - bitmap->compression = 0; - bitmap->imagesize = output_size; - bitmap->ypixelpermeter = 0x0B13 ; //2835 , 72 DPI - bitmap->xpixelpermeter = 0x0B13 ; //2835 , 72 DPI - bitmap->numcolorspallette = 0; - bitmap->mostimpcolor = 0; - - *out = jpeg.output; - *out_len = output_size+BMP_HEADER_LEN; - - return true; -} - -bool fmt2rgb888(const uint8_t *src_buf, size_t src_len, pixformat_t format, uint8_t * rgb_buf) -{ - int pix_count = 0; - if(format == PIXFORMAT_JPEG) { - return jpg2rgb888(src_buf, src_len, rgb_buf, JPG_SCALE_NONE); - } else if(format == PIXFORMAT_RGB888) { - memcpy(rgb_buf, src_buf, src_len); - } else if(format == PIXFORMAT_RGB565) { - int i; - uint8_t hb, lb; - pix_count = src_len / 2; - for(i=0; i> 3; - *rgb_buf++ = hb & 0xF8; - } - } else if(format == PIXFORMAT_GRAYSCALE) { - int i; - uint8_t b; - pix_count = src_len; - for(i=0; ireserved = 0; - bitmap->filesize = out_size; - bitmap->fileoffset_to_pixelarray = BMP_HEADER_LEN; - bitmap->dibheadersize = 40; - bitmap->width = width; - bitmap->height = -height;//set negative for top to bottom - bitmap->planes = 1; - bitmap->bitsperpixel = 24; - bitmap->compression = 0; - bitmap->imagesize = pix_count * 3; - bitmap->ypixelpermeter = 0x0B13 ; //2835 , 72 DPI - bitmap->xpixelpermeter = 0x0B13 ; //2835 , 72 DPI - bitmap->numcolorspallette = 0; - bitmap->mostimpcolor = 0; - - uint8_t * rgb_buf = out_buf + BMP_HEADER_LEN; - uint8_t * src_buf = src; - - - //convert data to RGB888 - if(format == PIXFORMAT_RGB888) { - memcpy(rgb_buf, src_buf, pix_count*3); - } else if(format == PIXFORMAT_RGB565) { - int i; - uint8_t hb, lb; - for(i=0; i> 3; - *rgb_buf++ = hb & 0xF8; - } - } else if(format == PIXFORMAT_GRAYSCALE) { - int i; - uint8_t b; - for(i=0; ibuf, fb->len, fb->width, fb->height, fb->format, out, out_len); -} diff --git a/lib/libesp32_div/esp32-camera/conversions/to_jpg.cpp b/lib/libesp32_div/esp32-camera/conversions/to_jpg.cpp deleted file mode 100644 index 9b8905a73..000000000 --- a/lib/libesp32_div/esp32-camera/conversions/to_jpg.cpp +++ /dev/null @@ -1,245 +0,0 @@ -// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD -// -// 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. -#include -#include -#include "esp_attr.h" -#include "soc/efuse_reg.h" -#include "esp_heap_caps.h" -#include "esp_camera.h" -#include "img_converters.h" -#include "jpge.h" -#include "yuv.h" - -#include "esp_system.h" -#if ESP_IDF_VERSION_MAJOR >= 4 // IDF 4+ -#if CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4 -#include "esp32/spiram.h" -#elif CONFIG_IDF_TARGET_ESP32S2 -#include "esp32s2/spiram.h" -#elif CONFIG_IDF_TARGET_ESP32S3 -#include "esp32s3/spiram.h" -#else -#error Target CONFIG_IDF_TARGET is not supported -#endif -#else // ESP32 Before IDF 4.0 -#include "esp_spiram.h" -#endif - -#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) -#include "esp32-hal-log.h" -#define TAG "" -#else -#include "esp_log.h" -static const char* TAG = "to_jpg"; -#endif - -static void *_malloc(size_t size) -{ - void * res = malloc(size); - if(res) { - return res; - } - return heap_caps_malloc(size, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT); -} - -static IRAM_ATTR void convert_line_format(uint8_t * src, pixformat_t format, uint8_t * dst, size_t width, size_t in_channels, size_t line) -{ - int i=0, o=0, l=0; - if(format == PIXFORMAT_GRAYSCALE) { - memcpy(dst, src + line * width, width); - } else if(format == PIXFORMAT_RGB888) { - l = width * 3; - src += l * line; - for(i=0; i> 3; - dst[o++] = (src[i+1] & 0x1F) << 3; - } - } else if(format == PIXFORMAT_YUV422) { - uint8_t y0, y1, u, v; - uint8_t r, g, b; - l = width * 2; - src += l * line; - for(i=0; i 100) { - quality = 100; - } - - jpge::params comp_params = jpge::params(); - comp_params.m_subsampling = subsampling; - comp_params.m_quality = quality; - - jpge::jpeg_encoder dst_image; - - if (!dst_image.init(dst_stream, width, height, num_channels, comp_params)) { - ESP_LOGE(TAG, "JPG encoder init failed"); - return false; - } - - uint8_t* line = (uint8_t*)_malloc(width * num_channels); - if(!line) { - ESP_LOGE(TAG, "Scan line malloc failed"); - return false; - } - - for (int i = 0; i < height; i++) { - convert_line_format(src, format, line, width, num_channels, i); - if (!dst_image.process_scanline(line)) { - ESP_LOGE(TAG, "JPG process line %u failed", i); - free(line); - return false; - } - } - free(line); - - if (!dst_image.process_scanline(NULL)) { - ESP_LOGE(TAG, "JPG image finish failed"); - return false; - } - dst_image.deinit(); - return true; -} - -class callback_stream : public jpge::output_stream { -protected: - jpg_out_cb ocb; - void * oarg; - size_t index; - -public: - callback_stream(jpg_out_cb cb, void * arg) : ocb(cb), oarg(arg), index(0) { } - virtual ~callback_stream() { } - virtual bool put_buf(const void* data, int len) - { - index += ocb(oarg, index, data, len); - return true; - } - virtual size_t get_size() const - { - return index; - } -}; - -bool fmt2jpg_cb(uint8_t *src, size_t src_len, uint16_t width, uint16_t height, pixformat_t format, uint8_t quality, jpg_out_cb cb, void * arg) -{ - callback_stream dst_stream(cb, arg); - return convert_image(src, width, height, format, quality, &dst_stream); -} - -bool frame2jpg_cb(camera_fb_t * fb, uint8_t quality, jpg_out_cb cb, void * arg) -{ - return fmt2jpg_cb(fb->buf, fb->len, fb->width, fb->height, fb->format, quality, cb, arg); -} - - - -class memory_stream : public jpge::output_stream { -protected: - uint8_t *out_buf; - size_t max_len, index; - -public: - memory_stream(void *pBuf, uint buf_size) : out_buf(static_cast(pBuf)), max_len(buf_size), index(0) { } - - virtual ~memory_stream() { } - - virtual bool put_buf(const void* pBuf, int len) - { - if (!pBuf) { - //end of image - return true; - } - if ((size_t)len > (max_len - index)) { - //ESP_LOGW(TAG, "JPG output overflow: %d bytes (%d,%d,%d)", len - (max_len - index), len, index, max_len); - len = max_len - index; - } - if (len) { - memcpy(out_buf + index, pBuf, len); - index += len; - } - return true; - } - - virtual size_t get_size() const - { - return index; - } -}; - -bool fmt2jpg(uint8_t *src, size_t src_len, uint16_t width, uint16_t height, pixformat_t format, uint8_t quality, uint8_t ** out, size_t * out_len) -{ - //todo: allocate proper buffer for holding JPEG data - //this should be enough for CIF frame size - int jpg_buf_len = 128*1024; - - - uint8_t * jpg_buf = (uint8_t *)_malloc(jpg_buf_len); - if(jpg_buf == NULL) { - ESP_LOGE(TAG, "JPG buffer malloc failed"); - return false; - } - memory_stream dst_stream(jpg_buf, jpg_buf_len); - - if(!convert_image(src, width, height, format, quality, &dst_stream)) { - free(jpg_buf); - return false; - } - - *out = jpg_buf; - *out_len = dst_stream.get_size(); - return true; -} - -bool frame2jpg(camera_fb_t * fb, uint8_t quality, uint8_t ** out, size_t * out_len) -{ - return fmt2jpg(fb->buf, fb->len, fb->width, fb->height, fb->format, quality, out, out_len); -} diff --git a/lib/libesp32_div/esp32-camera/conversions/yuv.c b/lib/libesp32_div/esp32-camera/conversions/yuv.c deleted file mode 100644 index 46034cc86..000000000 --- a/lib/libesp32_div/esp32-camera/conversions/yuv.c +++ /dev/null @@ -1,298 +0,0 @@ -// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD -// -// 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. -#include "yuv.h" -#include "esp_attr.h" - -typedef struct { - int16_t vY; - int16_t vVr; - int16_t vVg; - int16_t vUg; - int16_t vUb; -} yuv_table_row; - -static const yuv_table_row yuv_table[256] = { - // Y Vr Vg Ug Ub // # - { -18, -204, 50, 104, -258 }, // 0 - { -17, -202, 49, 103, -256 }, // 1 - { -16, -201, 49, 102, -254 }, // 2 - { -15, -199, 48, 101, -252 }, // 3 - { -13, -197, 48, 100, -250 }, // 4 - { -12, -196, 48, 99, -248 }, // 5 - { -11, -194, 47, 99, -246 }, // 6 - { -10, -193, 47, 98, -244 }, // 7 - { -9, -191, 46, 97, -242 }, // 8 - { -8, -189, 46, 96, -240 }, // 9 - { -6, -188, 46, 95, -238 }, // 10 - { -5, -186, 45, 95, -236 }, // 11 - { -4, -185, 45, 94, -234 }, // 12 - { -3, -183, 44, 93, -232 }, // 13 - { -2, -181, 44, 92, -230 }, // 14 - { -1, -180, 44, 91, -228 }, // 15 - { 0, -178, 43, 91, -226 }, // 16 - { 1, -177, 43, 90, -223 }, // 17 - { 2, -175, 43, 89, -221 }, // 18 - { 3, -173, 42, 88, -219 }, // 19 - { 4, -172, 42, 87, -217 }, // 20 - { 5, -170, 41, 86, -215 }, // 21 - { 6, -169, 41, 86, -213 }, // 22 - { 8, -167, 41, 85, -211 }, // 23 - { 9, -165, 40, 84, -209 }, // 24 - { 10, -164, 40, 83, -207 }, // 25 - { 11, -162, 39, 82, -205 }, // 26 - { 12, -161, 39, 82, -203 }, // 27 - { 13, -159, 39, 81, -201 }, // 28 - { 15, -158, 38, 80, -199 }, // 29 - { 16, -156, 38, 79, -197 }, // 30 - { 17, -154, 37, 78, -195 }, // 31 - { 18, -153, 37, 78, -193 }, // 32 - { 19, -151, 37, 77, -191 }, // 33 - { 20, -150, 36, 76, -189 }, // 34 - { 22, -148, 36, 75, -187 }, // 35 - { 23, -146, 35, 74, -185 }, // 36 - { 24, -145, 35, 73, -183 }, // 37 - { 25, -143, 35, 73, -181 }, // 38 - { 26, -142, 34, 72, -179 }, // 39 - { 27, -140, 34, 71, -177 }, // 40 - { 29, -138, 34, 70, -175 }, // 41 - { 30, -137, 33, 69, -173 }, // 42 - { 31, -135, 33, 69, -171 }, // 43 - { 32, -134, 32, 68, -169 }, // 44 - { 33, -132, 32, 67, -167 }, // 45 - { 34, -130, 32, 66, -165 }, // 46 - { 36, -129, 31, 65, -163 }, // 47 - { 37, -127, 31, 65, -161 }, // 48 - { 38, -126, 30, 64, -159 }, // 49 - { 39, -124, 30, 63, -157 }, // 50 - { 40, -122, 30, 62, -155 }, // 51 - { 41, -121, 29, 61, -153 }, // 52 - { 43, -119, 29, 60, -151 }, // 53 - { 44, -118, 28, 60, -149 }, // 54 - { 45, -116, 28, 59, -147 }, // 55 - { 46, -114, 28, 58, -145 }, // 56 - { 47, -113, 27, 57, -143 }, // 57 - { 48, -111, 27, 56, -141 }, // 58 - { 50, -110, 26, 56, -139 }, // 59 - { 51, -108, 26, 55, -137 }, // 60 - { 52, -106, 26, 54, -135 }, // 61 - { 53, -105, 25, 53, -133 }, // 62 - { 54, -103, 25, 52, -131 }, // 63 - { 55, -102, 25, 52, -129 }, // 64 - { 57, -100, 24, 51, -127 }, // 65 - { 58, -98, 24, 50, -125 }, // 66 - { 59, -97, 23, 49, -123 }, // 67 - { 60, -95, 23, 48, -121 }, // 68 - { 61, -94, 23, 47, -119 }, // 69 - { 62, -92, 22, 47, -117 }, // 70 - { 64, -90, 22, 46, -115 }, // 71 - { 65, -89, 21, 45, -113 }, // 72 - { 66, -87, 21, 44, -110 }, // 73 - { 67, -86, 21, 43, -108 }, // 74 - { 68, -84, 20, 43, -106 }, // 75 - { 69, -82, 20, 42, -104 }, // 76 - { 71, -81, 19, 41, -102 }, // 77 - { 72, -79, 19, 40, -100 }, // 78 - { 73, -78, 19, 39, -98 }, // 79 - { 74, -76, 18, 39, -96 }, // 80 - { 75, -75, 18, 38, -94 }, // 81 - { 76, -73, 17, 37, -92 }, // 82 - { 77, -71, 17, 36, -90 }, // 83 - { 79, -70, 17, 35, -88 }, // 84 - { 80, -68, 16, 34, -86 }, // 85 - { 81, -67, 16, 34, -84 }, // 86 - { 82, -65, 16, 33, -82 }, // 87 - { 83, -63, 15, 32, -80 }, // 88 - { 84, -62, 15, 31, -78 }, // 89 - { 86, -60, 14, 30, -76 }, // 90 - { 87, -59, 14, 30, -74 }, // 91 - { 88, -57, 14, 29, -72 }, // 92 - { 89, -55, 13, 28, -70 }, // 93 - { 90, -54, 13, 27, -68 }, // 94 - { 91, -52, 12, 26, -66 }, // 95 - { 93, -51, 12, 26, -64 }, // 96 - { 94, -49, 12, 25, -62 }, // 97 - { 95, -47, 11, 24, -60 }, // 98 - { 96, -46, 11, 23, -58 }, // 99 - { 97, -44, 10, 22, -56 }, // 100 - { 98, -43, 10, 21, -54 }, // 101 - { 100, -41, 10, 21, -52 }, // 102 - { 101, -39, 9, 20, -50 }, // 103 - { 102, -38, 9, 19, -48 }, // 104 - { 103, -36, 8, 18, -46 }, // 105 - { 104, -35, 8, 17, -44 }, // 106 - { 105, -33, 8, 17, -42 }, // 107 - { 107, -31, 7, 16, -40 }, // 108 - { 108, -30, 7, 15, -38 }, // 109 - { 109, -28, 7, 14, -36 }, // 110 - { 110, -27, 6, 13, -34 }, // 111 - { 111, -25, 6, 13, -32 }, // 112 - { 112, -23, 5, 12, -30 }, // 113 - { 114, -22, 5, 11, -28 }, // 114 - { 115, -20, 5, 10, -26 }, // 115 - { 116, -19, 4, 9, -24 }, // 116 - { 117, -17, 4, 8, -22 }, // 117 - { 118, -15, 3, 8, -20 }, // 118 - { 119, -14, 3, 7, -18 }, // 119 - { 121, -12, 3, 6, -16 }, // 120 - { 122, -11, 2, 5, -14 }, // 121 - { 123, -9, 2, 4, -12 }, // 122 - { 124, -7, 1, 4, -10 }, // 123 - { 125, -6, 1, 3, -8 }, // 124 - { 126, -4, 1, 2, -6 }, // 125 - { 128, -3, 0, 1, -4 }, // 126 - { 129, -1, 0, 0, -2 }, // 127 - { 130, 0, 0, 0, 0 }, // 128 - { 131, 1, 0, 0, 2 }, // 129 - { 132, 3, 0, -1, 4 }, // 130 - { 133, 4, -1, -2, 6 }, // 131 - { 135, 6, -1, -3, 8 }, // 132 - { 136, 7, -1, -4, 10 }, // 133 - { 137, 9, -2, -4, 12 }, // 134 - { 138, 11, -2, -5, 14 }, // 135 - { 139, 12, -3, -6, 16 }, // 136 - { 140, 14, -3, -7, 18 }, // 137 - { 142, 15, -3, -8, 20 }, // 138 - { 143, 17, -4, -8, 22 }, // 139 - { 144, 19, -4, -9, 24 }, // 140 - { 145, 20, -5, -10, 26 }, // 141 - { 146, 22, -5, -11, 28 }, // 142 - { 147, 23, -5, -12, 30 }, // 143 - { 148, 25, -6, -13, 32 }, // 144 - { 150, 27, -6, -13, 34 }, // 145 - { 151, 28, -7, -14, 36 }, // 146 - { 152, 30, -7, -15, 38 }, // 147 - { 153, 31, -7, -16, 40 }, // 148 - { 154, 33, -8, -17, 42 }, // 149 - { 155, 35, -8, -17, 44 }, // 150 - { 157, 36, -8, -18, 46 }, // 151 - { 158, 38, -9, -19, 48 }, // 152 - { 159, 39, -9, -20, 50 }, // 153 - { 160, 41, -10, -21, 52 }, // 154 - { 161, 43, -10, -21, 54 }, // 155 - { 162, 44, -10, -22, 56 }, // 156 - { 164, 46, -11, -23, 58 }, // 157 - { 165, 47, -11, -24, 60 }, // 158 - { 166, 49, -12, -25, 62 }, // 159 - { 167, 51, -12, -26, 64 }, // 160 - { 168, 52, -12, -26, 66 }, // 161 - { 169, 54, -13, -27, 68 }, // 162 - { 171, 55, -13, -28, 70 }, // 163 - { 172, 57, -14, -29, 72 }, // 164 - { 173, 59, -14, -30, 74 }, // 165 - { 174, 60, -14, -30, 76 }, // 166 - { 175, 62, -15, -31, 78 }, // 167 - { 176, 63, -15, -32, 80 }, // 168 - { 178, 65, -16, -33, 82 }, // 169 - { 179, 67, -16, -34, 84 }, // 170 - { 180, 68, -16, -34, 86 }, // 171 - { 181, 70, -17, -35, 88 }, // 172 - { 182, 71, -17, -36, 90 }, // 173 - { 183, 73, -17, -37, 92 }, // 174 - { 185, 75, -18, -38, 94 }, // 175 - { 186, 76, -18, -39, 96 }, // 176 - { 187, 78, -19, -39, 98 }, // 177 - { 188, 79, -19, -40, 100 }, // 178 - { 189, 81, -19, -41, 102 }, // 179 - { 190, 82, -20, -42, 104 }, // 180 - { 192, 84, -20, -43, 106 }, // 181 - { 193, 86, -21, -43, 108 }, // 182 - { 194, 87, -21, -44, 110 }, // 183 - { 195, 89, -21, -45, 113 }, // 184 - { 196, 90, -22, -46, 115 }, // 185 - { 197, 92, -22, -47, 117 }, // 186 - { 199, 94, -23, -47, 119 }, // 187 - { 200, 95, -23, -48, 121 }, // 188 - { 201, 97, -23, -49, 123 }, // 189 - { 202, 98, -24, -50, 125 }, // 190 - { 203, 100, -24, -51, 127 }, // 191 - { 204, 102, -25, -52, 129 }, // 192 - { 206, 103, -25, -52, 131 }, // 193 - { 207, 105, -25, -53, 133 }, // 194 - { 208, 106, -26, -54, 135 }, // 195 - { 209, 108, -26, -55, 137 }, // 196 - { 210, 110, -26, -56, 139 }, // 197 - { 211, 111, -27, -56, 141 }, // 198 - { 213, 113, -27, -57, 143 }, // 199 - { 214, 114, -28, -58, 145 }, // 200 - { 215, 116, -28, -59, 147 }, // 201 - { 216, 118, -28, -60, 149 }, // 202 - { 217, 119, -29, -60, 151 }, // 203 - { 218, 121, -29, -61, 153 }, // 204 - { 219, 122, -30, -62, 155 }, // 205 - { 221, 124, -30, -63, 157 }, // 206 - { 222, 126, -30, -64, 159 }, // 207 - { 223, 127, -31, -65, 161 }, // 208 - { 224, 129, -31, -65, 163 }, // 209 - { 225, 130, -32, -66, 165 }, // 210 - { 226, 132, -32, -67, 167 }, // 211 - { 228, 134, -32, -68, 169 }, // 212 - { 229, 135, -33, -69, 171 }, // 213 - { 230, 137, -33, -69, 173 }, // 214 - { 231, 138, -34, -70, 175 }, // 215 - { 232, 140, -34, -71, 177 }, // 216 - { 233, 142, -34, -72, 179 }, // 217 - { 235, 143, -35, -73, 181 }, // 218 - { 236, 145, -35, -73, 183 }, // 219 - { 237, 146, -35, -74, 185 }, // 220 - { 238, 148, -36, -75, 187 }, // 221 - { 239, 150, -36, -76, 189 }, // 222 - { 240, 151, -37, -77, 191 }, // 223 - { 242, 153, -37, -78, 193 }, // 224 - { 243, 154, -37, -78, 195 }, // 225 - { 244, 156, -38, -79, 197 }, // 226 - { 245, 158, -38, -80, 199 }, // 227 - { 246, 159, -39, -81, 201 }, // 228 - { 247, 161, -39, -82, 203 }, // 229 - { 249, 162, -39, -82, 205 }, // 230 - { 250, 164, -40, -83, 207 }, // 231 - { 251, 165, -40, -84, 209 }, // 232 - { 252, 167, -41, -85, 211 }, // 233 - { 253, 169, -41, -86, 213 }, // 234 - { 254, 170, -41, -86, 215 }, // 235 - { 256, 172, -42, -87, 217 }, // 236 - { 257, 173, -42, -88, 219 }, // 237 - { 258, 175, -43, -89, 221 }, // 238 - { 259, 177, -43, -90, 223 }, // 239 - { 260, 178, -43, -91, 226 }, // 240 - { 261, 180, -44, -91, 228 }, // 241 - { 263, 181, -44, -92, 230 }, // 242 - { 264, 183, -44, -93, 232 }, // 243 - { 265, 185, -45, -94, 234 }, // 244 - { 266, 186, -45, -95, 236 }, // 245 - { 267, 188, -46, -95, 238 }, // 246 - { 268, 189, -46, -96, 240 }, // 247 - { 270, 191, -46, -97, 242 }, // 248 - { 271, 193, -47, -98, 244 }, // 249 - { 272, 194, -47, -99, 246 }, // 250 - { 273, 196, -48, -99, 248 }, // 251 - { 274, 197, -48, -100, 250 }, // 252 - { 275, 199, -48, -101, 252 }, // 253 - { 277, 201, -49, -102, 254 }, // 254 - { 278, 202, -49, -103, 256 } // 255 -}; - -#define YUYV_CONSTRAIN(v) ((v)<0)?0:(((v)>255)?255:(v)) - -void IRAM_ATTR yuv2rgb(uint8_t y, uint8_t u, uint8_t v, uint8_t *r, uint8_t *g, uint8_t *b) -{ - int16_t ri, gi, bi; - - ri = yuv_table[y].vY + yuv_table[v].vVr; - gi = yuv_table[y].vY + yuv_table[u].vUg + yuv_table[v].vVg; - bi = yuv_table[y].vY + yuv_table[u].vUb; - - *r = YUYV_CONSTRAIN(ri); - *g = YUYV_CONSTRAIN(gi); - *b = YUYV_CONSTRAIN(bi); -} diff --git a/lib/libesp32_div/esp32-camera/driver/cam_hal.c b/lib/libesp32_div/esp32-camera/driver/cam_hal.c deleted file mode 100644 index c54fb8172..000000000 --- a/lib/libesp32_div/esp32-camera/driver/cam_hal.c +++ /dev/null @@ -1,483 +0,0 @@ -// Copyright 2010-2020 Espressif Systems (Shanghai) PTE LTD -// -// 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. - -#include -#include -#include "esp_heap_caps.h" -#include "ll_cam.h" -#include "cam_hal.h" - -static const char *TAG = "cam_hal"; - -static cam_obj_t *cam_obj = NULL; - -static const uint32_t JPEG_SOI_MARKER = 0xFFD8FF; // written in little-endian for esp32 -static const uint16_t JPEG_EOI_MARKER = 0xD9FF; // written in little-endian for esp32 - -static int cam_verify_jpeg_soi(const uint8_t *inbuf, uint32_t length) -{ - uint32_t sig = *((uint32_t *)inbuf) & 0xFFFFFF; - if(sig != JPEG_SOI_MARKER) { - for (uint32_t i = 0; i < length; i++) { - sig = *((uint32_t *)(&inbuf[i])) & 0xFFFFFF; - if (sig == JPEG_SOI_MARKER) { - ESP_LOGW(TAG, "SOI: %d", i); - return i; - } - } - ESP_LOGW(TAG, "NO-SOI"); - return -1; - } - return 0; -} - -static int cam_verify_jpeg_eoi(const uint8_t *inbuf, uint32_t length) -{ - int offset = -1; - uint8_t *dptr = (uint8_t *)inbuf + length - 2; - while (dptr > inbuf) { - uint16_t sig = *((uint16_t *)dptr); - if (JPEG_EOI_MARKER == sig) { - offset = dptr - inbuf; - //ESP_LOGW(TAG, "EOI: %d", length - (offset + 2)); - return offset; - } - dptr--; - } - return -1; -} - -static bool cam_get_next_frame(int * frame_pos) -{ - if(!cam_obj->frames[*frame_pos].en){ - for (int x = 0; x < cam_obj->frame_cnt; x++) { - if (cam_obj->frames[x].en) { - *frame_pos = x; - return true; - } - } - } else { - return true; - } - return false; -} - -static bool cam_start_frame(int * frame_pos) -{ - if (cam_get_next_frame(frame_pos)) { - if(ll_cam_start(cam_obj, *frame_pos)){ - // Vsync the frame manually - ll_cam_do_vsync(cam_obj); - uint64_t us = (uint64_t)esp_timer_get_time(); - cam_obj->frames[*frame_pos].fb.timestamp.tv_sec = us / 1000000UL; - cam_obj->frames[*frame_pos].fb.timestamp.tv_usec = us % 1000000UL; - return true; - } - } - return false; -} - -void IRAM_ATTR ll_cam_send_event(cam_obj_t *cam, cam_event_t cam_event, BaseType_t * HPTaskAwoken) -{ - if (xQueueSendFromISR(cam->event_queue, (void *)&cam_event, HPTaskAwoken) != pdTRUE) { - ll_cam_stop(cam); - cam->state = CAM_STATE_IDLE; - ESP_EARLY_LOGE(TAG, "EV-%s-OVF", cam_event==CAM_IN_SUC_EOF_EVENT ? "EOF" : "VSYNC"); - } -} - -//Copy fram from DMA dma_buffer to fram dma_buffer -static void cam_task(void *arg) -{ - int cnt = 0; - int frame_pos = 0; - cam_obj->state = CAM_STATE_IDLE; - cam_event_t cam_event = 0; - - xQueueReset(cam_obj->event_queue); - - while (1) { - xQueueReceive(cam_obj->event_queue, (void *)&cam_event, portMAX_DELAY); - DBG_PIN_SET(1); - switch (cam_obj->state) { - - case CAM_STATE_IDLE: { - if (cam_event == CAM_VSYNC_EVENT) { - //DBG_PIN_SET(1); - if(cam_start_frame(&frame_pos)){ - cam_obj->frames[frame_pos].fb.len = 0; - cam_obj->state = CAM_STATE_READ_BUF; - } - cnt = 0; - } - } - break; - - case CAM_STATE_READ_BUF: { - camera_fb_t * frame_buffer_event = &cam_obj->frames[frame_pos].fb; - size_t pixels_per_dma = (cam_obj->dma_half_buffer_size * cam_obj->fb_bytes_per_pixel) / (cam_obj->dma_bytes_per_item * cam_obj->in_bytes_per_pixel); - - if (cam_event == CAM_IN_SUC_EOF_EVENT) { - if(!cam_obj->psram_mode){ - if (cam_obj->fb_size < (frame_buffer_event->len + pixels_per_dma)) { - ESP_LOGW(TAG, "FB-OVF"); - ll_cam_stop(cam_obj); - DBG_PIN_SET(0); - continue; - } - frame_buffer_event->len += ll_cam_memcpy(cam_obj, - &frame_buffer_event->buf[frame_buffer_event->len], - &cam_obj->dma_buffer[(cnt % cam_obj->dma_half_buffer_cnt) * cam_obj->dma_half_buffer_size], - cam_obj->dma_half_buffer_size); - } - //Check for JPEG SOI in the first buffer. stop if not found - if (cam_obj->jpeg_mode && cnt == 0 && cam_verify_jpeg_soi(frame_buffer_event->buf, frame_buffer_event->len) != 0) { - ll_cam_stop(cam_obj); - cam_obj->state = CAM_STATE_IDLE; - } - cnt++; - - } else if (cam_event == CAM_VSYNC_EVENT) { - //DBG_PIN_SET(1); - ll_cam_stop(cam_obj); - - if (cnt || !cam_obj->jpeg_mode || cam_obj->psram_mode) { - if (cam_obj->jpeg_mode) { - if (!cam_obj->psram_mode) { - if (cam_obj->fb_size < (frame_buffer_event->len + pixels_per_dma)) { - ESP_LOGW(TAG, "FB-OVF"); - cnt--; - } else { - frame_buffer_event->len += ll_cam_memcpy(cam_obj, - &frame_buffer_event->buf[frame_buffer_event->len], - &cam_obj->dma_buffer[(cnt % cam_obj->dma_half_buffer_cnt) * cam_obj->dma_half_buffer_size], - cam_obj->dma_half_buffer_size); - } - } - cnt++; - } - - cam_obj->frames[frame_pos].en = 0; - - if (cam_obj->psram_mode) { - if (cam_obj->jpeg_mode) { - frame_buffer_event->len = cnt * cam_obj->dma_half_buffer_size; - } else { - frame_buffer_event->len = cam_obj->recv_size; - } - } else if (!cam_obj->jpeg_mode) { - if (frame_buffer_event->len != cam_obj->fb_size) { - cam_obj->frames[frame_pos].en = 1; - ESP_LOGE(TAG, "FB-SIZE: %u != %u", frame_buffer_event->len, cam_obj->fb_size); - } - } - //send frame - if(!cam_obj->frames[frame_pos].en && xQueueSend(cam_obj->frame_buffer_queue, (void *)&frame_buffer_event, 0) != pdTRUE) { - //pop frame buffer from the queue - camera_fb_t * fb2 = NULL; - if(xQueueReceive(cam_obj->frame_buffer_queue, &fb2, 0) == pdTRUE) { - //push the new frame to the end of the queue - if (xQueueSend(cam_obj->frame_buffer_queue, (void *)&frame_buffer_event, 0) != pdTRUE) { - cam_obj->frames[frame_pos].en = 1; - ESP_LOGE(TAG, "FBQ-SND"); - } - //free the popped buffer - cam_give(fb2); - } else { - //queue is full and we could not pop a frame from it - cam_obj->frames[frame_pos].en = 1; - ESP_LOGE(TAG, "FBQ-RCV"); - } - } - } - - if(!cam_start_frame(&frame_pos)){ - cam_obj->state = CAM_STATE_IDLE; - } else { - cam_obj->frames[frame_pos].fb.len = 0; - } - cnt = 0; - } - } - break; - } - DBG_PIN_SET(0); - } -} - -static lldesc_t * allocate_dma_descriptors(uint32_t count, uint16_t size, uint8_t * buffer) -{ - lldesc_t *dma = (lldesc_t *)heap_caps_malloc(count * sizeof(lldesc_t), MALLOC_CAP_DMA); - if (dma == NULL) { - return dma; - } - - for (int x = 0; x < count; x++) { - dma[x].size = size; - dma[x].length = 0; - dma[x].sosf = 0; - dma[x].eof = 0; - dma[x].owner = 1; - dma[x].buf = (buffer + size * x); - dma[x].empty = (uint32_t)&dma[(x + 1) % count]; - } - return dma; -} - -static esp_err_t cam_dma_config(const camera_config_t *config) -{ - bool ret = ll_cam_dma_sizes(cam_obj); - if (0 == ret) { - return ESP_FAIL; - } - - cam_obj->dma_node_cnt = (cam_obj->dma_buffer_size) / cam_obj->dma_node_buffer_size; // Number of DMA nodes - cam_obj->frame_copy_cnt = cam_obj->recv_size / cam_obj->dma_half_buffer_size; // Number of interrupted copies, ping-pong copy - - ESP_LOGI(TAG, "buffer_size: %d, half_buffer_size: %d, node_buffer_size: %d, node_cnt: %d, total_cnt: %d", - cam_obj->dma_buffer_size, cam_obj->dma_half_buffer_size, cam_obj->dma_node_buffer_size, cam_obj->dma_node_cnt, cam_obj->frame_copy_cnt); - - cam_obj->dma_buffer = NULL; - cam_obj->dma = NULL; - - cam_obj->frames = (cam_frame_t *)heap_caps_calloc(1, cam_obj->frame_cnt * sizeof(cam_frame_t), MALLOC_CAP_DEFAULT); - CAM_CHECK(cam_obj->frames != NULL, "frames malloc failed", ESP_FAIL); - - uint8_t dma_align = 0; - size_t fb_size = cam_obj->fb_size; - if (cam_obj->psram_mode) { - dma_align = ll_cam_get_dma_align(cam_obj); - if (cam_obj->fb_size < cam_obj->recv_size) { - fb_size = cam_obj->recv_size; - } - } - - /* Allocate memeory for frame buffer */ - size_t alloc_size = fb_size * sizeof(uint8_t) + dma_align; - uint32_t _caps = MALLOC_CAP_8BIT; - if (CAMERA_FB_IN_DRAM == config->fb_location) { - _caps |= MALLOC_CAP_INTERNAL; - } else { - _caps |= MALLOC_CAP_SPIRAM; - } - for (int x = 0; x < cam_obj->frame_cnt; x++) { - cam_obj->frames[x].dma = NULL; - cam_obj->frames[x].fb_offset = 0; - cam_obj->frames[x].en = 0; - ESP_LOGI(TAG, "Allocating %d Byte frame buffer in %s", alloc_size, _caps & MALLOC_CAP_SPIRAM ? "PSRAM" : "OnBoard RAM"); - cam_obj->frames[x].fb.buf = (uint8_t *)heap_caps_malloc(alloc_size, _caps); - CAM_CHECK(cam_obj->frames[x].fb.buf != NULL, "frame buffer malloc failed", ESP_FAIL); - if (cam_obj->psram_mode) { - //align PSRAM buffer. TODO: save the offset so proper address can be freed later - cam_obj->frames[x].fb_offset = dma_align - ((uint32_t)cam_obj->frames[x].fb.buf & (dma_align - 1)); - cam_obj->frames[x].fb.buf += cam_obj->frames[x].fb_offset; - ESP_LOGI(TAG, "Frame[%d]: Offset: %u, Addr: 0x%08X", x, cam_obj->frames[x].fb_offset, (uint32_t)cam_obj->frames[x].fb.buf); - cam_obj->frames[x].dma = allocate_dma_descriptors(cam_obj->dma_node_cnt, cam_obj->dma_node_buffer_size, cam_obj->frames[x].fb.buf); - CAM_CHECK(cam_obj->frames[x].dma != NULL, "frame dma malloc failed", ESP_FAIL); - } - cam_obj->frames[x].en = 1; - } - - if (!cam_obj->psram_mode) { - cam_obj->dma_buffer = (uint8_t *)heap_caps_malloc(cam_obj->dma_buffer_size * sizeof(uint8_t), MALLOC_CAP_DMA); - if(NULL == cam_obj->dma_buffer) { - ESP_LOGE(TAG,"%s(%d): DMA buffer %d Byte malloc failed, the current largest free block:%d Byte", __FUNCTION__, __LINE__, - cam_obj->dma_buffer_size, heap_caps_get_largest_free_block(MALLOC_CAP_DMA)); - return ESP_FAIL; - } - - cam_obj->dma = allocate_dma_descriptors(cam_obj->dma_node_cnt, cam_obj->dma_node_buffer_size, cam_obj->dma_buffer); - CAM_CHECK(cam_obj->dma != NULL, "dma malloc failed", ESP_FAIL); - } - - return ESP_OK; -} - -esp_err_t cam_init(const camera_config_t *config) -{ - CAM_CHECK(NULL != config, "config pointer is invalid", ESP_ERR_INVALID_ARG); - - esp_err_t ret = ESP_OK; - cam_obj = (cam_obj_t *)heap_caps_calloc(1, sizeof(cam_obj_t), MALLOC_CAP_DMA); - CAM_CHECK(NULL != cam_obj, "lcd_cam object malloc error", ESP_ERR_NO_MEM); - - cam_obj->swap_data = 0; - cam_obj->vsync_pin = config->pin_vsync; - cam_obj->vsync_invert = true; - - ll_cam_set_pin(cam_obj, config); - ret = ll_cam_config(cam_obj, config); - CAM_CHECK_GOTO(ret == ESP_OK, "ll_cam initialize failed", err); - -#if CAMERA_DBG_PIN_ENABLE - PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[DBG_PIN_NUM], PIN_FUNC_GPIO); - gpio_set_direction(DBG_PIN_NUM, GPIO_MODE_OUTPUT); - gpio_set_pull_mode(DBG_PIN_NUM, GPIO_FLOATING); -#endif - - ESP_LOGI(TAG, "cam init ok"); - return ESP_OK; - -err: - free(cam_obj); - cam_obj = NULL; - return ESP_FAIL; -} - -esp_err_t cam_config(const camera_config_t *config, framesize_t frame_size, uint16_t sensor_pid) -{ - CAM_CHECK(NULL != config, "config pointer is invalid", ESP_ERR_INVALID_ARG); - esp_err_t ret = ESP_OK; - - ret = ll_cam_set_sample_mode(cam_obj, (pixformat_t)config->pixel_format, config->xclk_freq_hz, sensor_pid); - - cam_obj->jpeg_mode = config->pixel_format == PIXFORMAT_JPEG; -#if CONFIG_IDF_TARGET_ESP32 - cam_obj->psram_mode = false; -#else - cam_obj->psram_mode = (config->xclk_freq_hz == 16000000); -#endif - cam_obj->frame_cnt = config->fb_count; - cam_obj->width = resolution[frame_size].width; - cam_obj->height = resolution[frame_size].height; - - if(cam_obj->jpeg_mode){ - cam_obj->recv_size = cam_obj->width * cam_obj->height / 5; - cam_obj->fb_size = cam_obj->recv_size; - } else { - cam_obj->recv_size = cam_obj->width * cam_obj->height * cam_obj->in_bytes_per_pixel; - cam_obj->fb_size = cam_obj->width * cam_obj->height * cam_obj->fb_bytes_per_pixel; - } - - ret = cam_dma_config(config); - CAM_CHECK_GOTO(ret == ESP_OK, "cam_dma_config failed", err); - - cam_obj->event_queue = xQueueCreate(cam_obj->dma_half_buffer_cnt - 1, sizeof(cam_event_t)); - CAM_CHECK_GOTO(cam_obj->event_queue != NULL, "event_queue create failed", err); - - size_t frame_buffer_queue_len = cam_obj->frame_cnt; - if (config->grab_mode == CAMERA_GRAB_LATEST && cam_obj->frame_cnt > 1) { - frame_buffer_queue_len = cam_obj->frame_cnt - 1; - } - cam_obj->frame_buffer_queue = xQueueCreate(frame_buffer_queue_len, sizeof(camera_fb_t*)); - CAM_CHECK_GOTO(cam_obj->frame_buffer_queue != NULL, "frame_buffer_queue create failed", err); - - ret = ll_cam_init_isr(cam_obj); - CAM_CHECK_GOTO(ret == ESP_OK, "cam intr alloc failed", err); - - -#if CONFIG_CAMERA_CORE0 - xTaskCreatePinnedToCore(cam_task, "cam_task", 2048, NULL, configMAX_PRIORITIES - 2, &cam_obj->task_handle, 0); -#elif CONFIG_CAMERA_CORE1 - xTaskCreatePinnedToCore(cam_task, "cam_task", 2048, NULL, configMAX_PRIORITIES - 2, &cam_obj->task_handle, 1); -#else - xTaskCreate(cam_task, "cam_task", 2048, NULL, configMAX_PRIORITIES - 2, &cam_obj->task_handle); -#endif - - ESP_LOGI(TAG, "cam config ok"); - return ESP_OK; - -err: - cam_deinit(); - return ESP_FAIL; -} - -esp_err_t cam_deinit(void) -{ - if (!cam_obj) { - return ESP_FAIL; - } - - cam_stop(); - if (cam_obj->task_handle) { - vTaskDelete(cam_obj->task_handle); - } - if (cam_obj->event_queue) { - vQueueDelete(cam_obj->event_queue); - } - if (cam_obj->frame_buffer_queue) { - vQueueDelete(cam_obj->frame_buffer_queue); - } - if (cam_obj->dma) { - free(cam_obj->dma); - } - if (cam_obj->dma_buffer) { - free(cam_obj->dma_buffer); - } - if (cam_obj->frames) { - for (int x = 0; x < cam_obj->frame_cnt; x++) { - free(cam_obj->frames[x].fb.buf - cam_obj->frames[x].fb_offset); - if (cam_obj->frames[x].dma) { - free(cam_obj->frames[x].dma); - } - } - free(cam_obj->frames); - } - - ll_cam_deinit(cam_obj); - - free(cam_obj); - cam_obj = NULL; - return ESP_OK; -} - -void cam_stop(void) -{ - ll_cam_vsync_intr_enable(cam_obj, false); - ll_cam_stop(cam_obj); -} - -void cam_start(void) -{ - ll_cam_vsync_intr_enable(cam_obj, true); -} - -camera_fb_t *cam_take(TickType_t timeout) -{ - camera_fb_t *dma_buffer = NULL; - TickType_t start = xTaskGetTickCount(); - xQueueReceive(cam_obj->frame_buffer_queue, (void *)&dma_buffer, timeout); - if (dma_buffer) { - if(cam_obj->jpeg_mode){ - // find the end marker for JPEG. Data after that can be discarded - int offset_e = cam_verify_jpeg_eoi(dma_buffer->buf, dma_buffer->len); - if (offset_e >= 0) { - // adjust buffer length - dma_buffer->len = offset_e + sizeof(JPEG_EOI_MARKER); - return dma_buffer; - } else { - ESP_LOGW(TAG, "NO-EOI"); - cam_give(dma_buffer); - return cam_take(timeout - (xTaskGetTickCount() - start));//recurse!!!! - } - } else if(cam_obj->psram_mode && cam_obj->in_bytes_per_pixel != cam_obj->fb_bytes_per_pixel){ - //currently this is used only for YUV to GRAYSCALE - dma_buffer->len = ll_cam_memcpy(cam_obj, dma_buffer->buf, dma_buffer->buf, dma_buffer->len); - } - return dma_buffer; - } else { - ESP_LOGW(TAG, "Failed to get the frame on time!"); - } - return NULL; -} - -void cam_give(camera_fb_t *dma_buffer) -{ - for (int x = 0; x < cam_obj->frame_cnt; x++) { - if (&cam_obj->frames[x].fb == dma_buffer) { - cam_obj->frames[x].en = 1; - break; - } - } -} diff --git a/lib/libesp32_div/esp32-camera/driver/esp_camera.c b/lib/libesp32_div/esp32-camera/driver/esp_camera.c deleted file mode 100644 index 9ae1b56ca..000000000 --- a/lib/libesp32_div/esp32-camera/driver/esp_camera.c +++ /dev/null @@ -1,416 +0,0 @@ -// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD -// -// 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. -#include -#include -#include -#include "time.h" -#include "sys/time.h" -#include "freertos/FreeRTOS.h" -#include "freertos/task.h" -#include "driver/gpio.h" -#include "esp_system.h" -#include "nvs_flash.h" -#include "nvs.h" -#include "sensor.h" -#include "sccb.h" -#include "cam_hal.h" -#include "esp_camera.h" -#include "xclk.h" -#if CONFIG_OV2640_SUPPORT -#include "ov2640.h" -#endif -#if CONFIG_OV7725_SUPPORT -#include "ov7725.h" -#endif -#if CONFIG_OV3660_SUPPORT -#include "ov3660.h" -#endif -#if CONFIG_OV5640_SUPPORT -#include "ov5640.h" -#endif -#if CONFIG_NT99141_SUPPORT -#include "nt99141.h" -#endif -#if CONFIG_OV7670_SUPPORT -#include "ov7670.h" -#endif -#if CONFIG_GC2145_SUPPORT -#include "gc2145.h" -#endif -#if CONFIG_GC032A_SUPPORT -#include "gc032a.h" -#endif -#if CONFIG_GC0308_SUPPORT -#include "gc0308.h" -#endif - - -#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) -#include "esp32-hal-log.h" -#define TAG "" -#else -#include "esp_log.h" -static const char *TAG = "camera"; -#endif - -typedef struct { - sensor_t sensor; - camera_fb_t fb; -} camera_state_t; - -static const char *CAMERA_SENSOR_NVS_KEY = "sensor"; -static const char *CAMERA_PIXFORMAT_NVS_KEY = "pixformat"; -static camera_state_t *s_state = NULL; - -#if CONFIG_IDF_TARGET_ESP32S3 // LCD_CAM module of ESP32-S3 will generate xclk -#define CAMERA_ENABLE_OUT_CLOCK(v) -#define CAMERA_DISABLE_OUT_CLOCK() -#else -#define CAMERA_ENABLE_OUT_CLOCK(v) camera_enable_out_clock((v)) -#define CAMERA_DISABLE_OUT_CLOCK() camera_disable_out_clock() -#endif - -typedef struct { - int (*detect)(int slv_addr, sensor_id_t *id); - int (*init)(sensor_t *sensor); -} sensor_func_t; - -static const sensor_func_t g_sensors[] = { -#if CONFIG_OV7725_SUPPORT - {ov7725_detect, ov7725_init}, -#endif -#if CONFIG_OV7670_SUPPORT - {ov7670_detect, ov7670_init}, -#endif -#if CONFIG_OV2640_SUPPORT - {ov2640_detect, ov2640_init}, -#endif -#if CONFIG_OV3660_SUPPORT - {ov3660_detect, ov3660_init}, -#endif -#if CONFIG_OV5640_SUPPORT - {ov5640_detect, ov5640_init}, -#endif -#if CONFIG_NT99141_SUPPORT - {nt99141_detect, nt99141_init}, -#endif -#if CONFIG_GC2145_SUPPORT - {gc2145_detect, gc2145_init}, -#endif -#if CONFIG_GC032A_SUPPORT - {gc032a_detect, gc032a_init}, -#endif -#if CONFIG_GC0308_SUPPORT - {gc0308_detect, gc0308_init}, -#endif -}; - -static esp_err_t camera_probe(const camera_config_t *config, camera_model_t *out_camera_model) -{ - *out_camera_model = CAMERA_NONE; - if (s_state != NULL) { - return ESP_ERR_INVALID_STATE; - } - - s_state = (camera_state_t *) calloc(sizeof(camera_state_t), 1); - if (!s_state) { - return ESP_ERR_NO_MEM; - } - - if (config->pin_xclk >= 0) { - ESP_LOGD(TAG, "Enabling XCLK output"); - CAMERA_ENABLE_OUT_CLOCK(config); - } - - if (config->pin_sscb_sda != -1) { - ESP_LOGD(TAG, "Initializing SSCB"); - SCCB_Init(config->pin_sscb_sda, config->pin_sscb_scl); - } - - if (config->pin_pwdn >= 0) { - ESP_LOGD(TAG, "Resetting camera by power down line"); - gpio_config_t conf = { 0 }; - conf.pin_bit_mask = 1LL << config->pin_pwdn; - conf.mode = GPIO_MODE_OUTPUT; - gpio_config(&conf); - - // carefull, logic is inverted compared to reset pin - gpio_set_level(config->pin_pwdn, 1); - vTaskDelay(10 / portTICK_PERIOD_MS); - gpio_set_level(config->pin_pwdn, 0); - vTaskDelay(10 / portTICK_PERIOD_MS); - } - - if (config->pin_reset >= 0) { - ESP_LOGD(TAG, "Resetting camera"); - gpio_config_t conf = { 0 }; - conf.pin_bit_mask = 1LL << config->pin_reset; - conf.mode = GPIO_MODE_OUTPUT; - gpio_config(&conf); - - gpio_set_level(config->pin_reset, 0); - vTaskDelay(10 / portTICK_PERIOD_MS); - gpio_set_level(config->pin_reset, 1); - vTaskDelay(10 / portTICK_PERIOD_MS); - } - - - ESP_LOGD(TAG, "Searching for camera address"); - vTaskDelay(10 / portTICK_PERIOD_MS); - - uint8_t slv_addr = SCCB_Probe(); - - if (slv_addr == 0) { - CAMERA_DISABLE_OUT_CLOCK(); - return ESP_ERR_NOT_FOUND; - } - - ESP_LOGI(TAG, "Detected camera at address=0x%02x", slv_addr); - s_state->sensor.slv_addr = slv_addr; - s_state->sensor.xclk_freq_hz = config->xclk_freq_hz; - - /** - * Read sensor ID and then initialize sensor - * Attention: Some sensors have the same SCCB address. Therefore, several attempts may be made in the detection process - */ - sensor_id_t *id = &s_state->sensor.id; - for (size_t i = 0; i < sizeof(g_sensors) / sizeof(sensor_func_t); i++) { - if (g_sensors[i].detect(slv_addr, id)) { - camera_sensor_info_t *info = esp_camera_sensor_get_info(id); - if (NULL != info) { - *out_camera_model = info->model; - ESP_LOGI(TAG, "Detected %s camera", info->name); - g_sensors[i].init(&s_state->sensor); - break; - } - } - } - - if (CAMERA_NONE == *out_camera_model) { //If no supported sensors are detected - CAMERA_DISABLE_OUT_CLOCK(); - ESP_LOGE(TAG, "Detected camera not supported."); - return ESP_ERR_NOT_SUPPORTED; - } - - ESP_LOGI(TAG, "Camera PID=0x%02x VER=0x%02x MIDL=0x%02x MIDH=0x%02x", - id->PID, id->VER, id->MIDH, id->MIDL); - - ESP_LOGD(TAG, "Doing SW reset of sensor"); - vTaskDelay(10 / portTICK_PERIOD_MS); - s_state->sensor.reset(&s_state->sensor); - - return ESP_OK; -} - -esp_err_t esp_camera_init(const camera_config_t *config) -{ - esp_err_t err; - err = cam_init(config); - if (err != ESP_OK) { - ESP_LOGE(TAG, "Camera init failed with error 0x%x", err); - return err; - } - - camera_model_t camera_model = CAMERA_NONE; - err = camera_probe(config, &camera_model); - if (err != ESP_OK) { - ESP_LOGE(TAG, "Camera probe failed with error 0x%x(%s)", err, esp_err_to_name(err)); - goto fail; - } - - framesize_t frame_size = (framesize_t) config->frame_size; - pixformat_t pix_format = (pixformat_t) config->pixel_format; - - if (PIXFORMAT_JPEG == pix_format && (!camera_sensor[camera_model].support_jpeg)) { - ESP_LOGE(TAG, "JPEG format is not supported on this sensor"); - err = ESP_ERR_NOT_SUPPORTED; - goto fail; - } - - if (frame_size > camera_sensor[camera_model].max_size) { - ESP_LOGW(TAG, "The frame size exceeds the maximum for this sensor, it will be forced to the maximum possible value"); - frame_size = camera_sensor[camera_model].max_size; - } - - err = cam_config(config, frame_size, s_state->sensor.id.PID); - if (err != ESP_OK) { - ESP_LOGE(TAG, "Camera config failed with error 0x%x", err); - goto fail; - } - - s_state->sensor.status.framesize = frame_size; - s_state->sensor.pixformat = pix_format; - ESP_LOGD(TAG, "Setting frame size to %dx%d", resolution[frame_size].width, resolution[frame_size].height); - if (s_state->sensor.set_framesize(&s_state->sensor, frame_size) != 0) { - ESP_LOGE(TAG, "Failed to set frame size"); - err = ESP_ERR_CAMERA_FAILED_TO_SET_FRAME_SIZE; - goto fail; - } - s_state->sensor.set_pixformat(&s_state->sensor, pix_format); - - if (s_state->sensor.id.PID == OV2640_PID) { - s_state->sensor.set_gainceiling(&s_state->sensor, GAINCEILING_2X); - s_state->sensor.set_bpc(&s_state->sensor, false); - s_state->sensor.set_wpc(&s_state->sensor, true); - s_state->sensor.set_lenc(&s_state->sensor, true); - } - - if (pix_format == PIXFORMAT_JPEG) { - s_state->sensor.set_quality(&s_state->sensor, config->jpeg_quality); - } - s_state->sensor.init_status(&s_state->sensor); - - cam_start(); - - return ESP_OK; - -fail: - esp_camera_deinit(); - return err; -} - -esp_err_t esp_camera_deinit() -{ - esp_err_t ret = cam_deinit(); - CAMERA_DISABLE_OUT_CLOCK(); - if (s_state) { - SCCB_Deinit(); - - free(s_state); - s_state = NULL; - } - - return ret; -} - -#define FB_GET_TIMEOUT (4000 / portTICK_PERIOD_MS) - -camera_fb_t *esp_camera_fb_get() -{ - if (s_state == NULL) { - return NULL; - } - camera_fb_t *fb = cam_take(FB_GET_TIMEOUT); - //set the frame properties - if (fb) { - fb->width = resolution[s_state->sensor.status.framesize].width; - fb->height = resolution[s_state->sensor.status.framesize].height; - fb->format = s_state->sensor.pixformat; - } - return fb; -} - -void esp_camera_fb_return(camera_fb_t *fb) -{ - if (s_state == NULL) { - return; - } - cam_give(fb); -} - -sensor_t *esp_camera_sensor_get() -{ - if (s_state == NULL) { - return NULL; - } - return &s_state->sensor; -} - -esp_err_t esp_camera_save_to_nvs(const char *key) -{ -#if ESP_IDF_VERSION_MAJOR > 3 - nvs_handle_t handle; -#else - nvs_handle handle; -#endif - esp_err_t ret = nvs_open(key, NVS_READWRITE, &handle); - - if (ret == ESP_OK) { - sensor_t *s = esp_camera_sensor_get(); - if (s != NULL) { - ret = nvs_set_blob(handle, CAMERA_SENSOR_NVS_KEY, &s->status, sizeof(camera_status_t)); - if (ret == ESP_OK) { - uint8_t pf = s->pixformat; - ret = nvs_set_u8(handle, CAMERA_PIXFORMAT_NVS_KEY, pf); - } - return ret; - } else { - return ESP_ERR_CAMERA_NOT_DETECTED; - } - nvs_close(handle); - return ret; - } else { - return ret; - } -} - -esp_err_t esp_camera_load_from_nvs(const char *key) -{ -#if ESP_IDF_VERSION_MAJOR > 3 - nvs_handle_t handle; -#else - nvs_handle handle; -#endif - uint8_t pf; - - esp_err_t ret = nvs_open(key, NVS_READWRITE, &handle); - - if (ret == ESP_OK) { - sensor_t *s = esp_camera_sensor_get(); - camera_status_t st; - if (s != NULL) { - size_t size = sizeof(camera_status_t); - ret = nvs_get_blob(handle, CAMERA_SENSOR_NVS_KEY, &st, &size); - if (ret == ESP_OK) { - s->set_ae_level(s, st.ae_level); - s->set_aec2(s, st.aec2); - s->set_aec_value(s, st.aec_value); - s->set_agc_gain(s, st.agc_gain); - s->set_awb_gain(s, st.awb_gain); - s->set_bpc(s, st.bpc); - s->set_brightness(s, st.brightness); - s->set_colorbar(s, st.colorbar); - s->set_contrast(s, st.contrast); - s->set_dcw(s, st.dcw); - s->set_denoise(s, st.denoise); - s->set_exposure_ctrl(s, st.aec); - s->set_framesize(s, st.framesize); - s->set_gain_ctrl(s, st.agc); - s->set_gainceiling(s, st.gainceiling); - s->set_hmirror(s, st.hmirror); - s->set_lenc(s, st.lenc); - s->set_quality(s, st.quality); - s->set_raw_gma(s, st.raw_gma); - s->set_saturation(s, st.saturation); - s->set_sharpness(s, st.sharpness); - s->set_special_effect(s, st.special_effect); - s->set_vflip(s, st.vflip); - s->set_wb_mode(s, st.wb_mode); - s->set_whitebal(s, st.awb); - s->set_wpc(s, st.wpc); - } - ret = nvs_get_u8(handle, CAMERA_PIXFORMAT_NVS_KEY, &pf); - if (ret == ESP_OK) { - s->set_pixformat(s, pf); - } - } else { - return ESP_ERR_CAMERA_NOT_DETECTED; - } - nvs_close(handle); - return ret; - } else { - ESP_LOGW(TAG, "Error (%d) opening nvs key \"%s\"", ret, key); - return ret; - } -} diff --git a/lib/libesp32_div/esp32-camera/driver/private_include/sccb.h b/lib/libesp32_div/esp32-camera/driver/private_include/sccb.h deleted file mode 100644 index ace081a48..000000000 --- a/lib/libesp32_div/esp32-camera/driver/private_include/sccb.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * This file is part of the OpenMV project. - * Copyright (c) 2013/2014 Ibrahim Abdelkader - * This work is licensed under the MIT license, see the file LICENSE for details. - * - * SCCB (I2C like) driver. - * - */ -#ifndef __SCCB_H__ -#define __SCCB_H__ -#include -int SCCB_Init(int pin_sda, int pin_scl); -int SCCB_Deinit(void); -uint8_t SCCB_Probe(); -uint8_t SCCB_Read(uint8_t slv_addr, uint8_t reg); -uint8_t SCCB_Write(uint8_t slv_addr, uint8_t reg, uint8_t data); -uint8_t SCCB_Read16(uint8_t slv_addr, uint16_t reg); -uint8_t SCCB_Write16(uint8_t slv_addr, uint16_t reg, uint8_t data); -#endif // __SCCB_H__ diff --git a/lib/libesp32_div/esp32-camera/driver/sccb.c b/lib/libesp32_div/esp32-camera/driver/sccb.c deleted file mode 100644 index 1a2c56e23..000000000 --- a/lib/libesp32_div/esp32-camera/driver/sccb.c +++ /dev/null @@ -1,184 +0,0 @@ -/* - * This file is part of the OpenMV project. - * Copyright (c) 2013/2014 Ibrahim Abdelkader - * This work is licensed under the MIT license, see the file LICENSE for details. - * - * SCCB (I2C like) driver. - * - */ -#include -#include -#include -#include -#include "sccb.h" -#include "sensor.h" -#include -#include "sdkconfig.h" -#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) -#include "esp32-hal-log.h" -#else -#include "esp_log.h" -static const char* TAG = "sccb"; -#endif - -#define LITTLETOBIG(x) ((x<<8)|(x>>8)) - -#include "driver/i2c.h" - -#define SCCB_FREQ 100000 /*!< I2C master frequency*/ -#define WRITE_BIT I2C_MASTER_WRITE /*!< I2C master write */ -#define READ_BIT I2C_MASTER_READ /*!< I2C master read */ -#define ACK_CHECK_EN 0x1 /*!< I2C master will check ack from slave*/ -#define ACK_CHECK_DIS 0x0 /*!< I2C master will not check ack from slave */ -#define ACK_VAL 0x0 /*!< I2C ack value */ -#define NACK_VAL 0x1 /*!< I2C nack value */ -#if CONFIG_SCCB_HARDWARE_I2C_PORT1 -const int SCCB_I2C_PORT = 1; -#else -const int SCCB_I2C_PORT = 0; -#endif - -int SCCB_Init(int pin_sda, int pin_scl) -{ - ESP_LOGI(TAG, "pin_sda %d pin_scl %d", pin_sda, pin_scl); - i2c_config_t conf; - memset(&conf, 0, sizeof(i2c_config_t)); - conf.mode = I2C_MODE_MASTER; - conf.sda_io_num = pin_sda; - conf.sda_pullup_en = GPIO_PULLUP_ENABLE; - conf.scl_io_num = pin_scl; - conf.scl_pullup_en = GPIO_PULLUP_ENABLE; - conf.master.clk_speed = SCCB_FREQ; - - i2c_param_config(SCCB_I2C_PORT, &conf); - i2c_driver_install(SCCB_I2C_PORT, conf.mode, 0, 0, 0); - return 0; -} - -int SCCB_Deinit(void) -{ - return i2c_driver_delete(SCCB_I2C_PORT); -} - -uint8_t SCCB_Probe(void) -{ - uint8_t slave_addr = 0x0; - // for (size_t i = 1; i < 0x80; i++) { - // i2c_cmd_handle_t cmd = i2c_cmd_link_create(); - // i2c_master_start(cmd); - // i2c_master_write_byte(cmd, ( i << 1 ) | WRITE_BIT, ACK_CHECK_EN); - // i2c_master_stop(cmd); - // esp_err_t ret = i2c_master_cmd_begin(SCCB_I2C_PORT, cmd, 1000 / portTICK_RATE_MS); - // i2c_cmd_link_delete(cmd); - // if( ret == ESP_OK) { - // ESP_LOGW(TAG, "Found I2C Device at 0x%02X", i); - // } - // } - for (size_t i = 0; i < CAMERA_MODEL_MAX; i++) { - if (slave_addr == camera_sensor[i].sccb_addr) { - continue; - } - slave_addr = camera_sensor[i].sccb_addr; - i2c_cmd_handle_t cmd = i2c_cmd_link_create(); - i2c_master_start(cmd); - i2c_master_write_byte(cmd, ( slave_addr << 1 ) | WRITE_BIT, ACK_CHECK_EN); - i2c_master_stop(cmd); - esp_err_t ret = i2c_master_cmd_begin(SCCB_I2C_PORT, cmd, 1000 / portTICK_RATE_MS); - i2c_cmd_link_delete(cmd); - if( ret == ESP_OK) { - return slave_addr; - } - } - return 0; -} - -uint8_t SCCB_Read(uint8_t slv_addr, uint8_t reg) -{ - uint8_t data=0; - esp_err_t ret = ESP_FAIL; - i2c_cmd_handle_t cmd = i2c_cmd_link_create(); - i2c_master_start(cmd); - i2c_master_write_byte(cmd, ( slv_addr << 1 ) | WRITE_BIT, ACK_CHECK_EN); - i2c_master_write_byte(cmd, reg, ACK_CHECK_EN); - i2c_master_stop(cmd); - ret = i2c_master_cmd_begin(SCCB_I2C_PORT, cmd, 1000 / portTICK_RATE_MS); - i2c_cmd_link_delete(cmd); - if(ret != ESP_OK) return -1; - cmd = i2c_cmd_link_create(); - i2c_master_start(cmd); - i2c_master_write_byte(cmd, ( slv_addr << 1 ) | READ_BIT, ACK_CHECK_EN); - i2c_master_read_byte(cmd, &data, NACK_VAL); - i2c_master_stop(cmd); - ret = i2c_master_cmd_begin(SCCB_I2C_PORT, cmd, 1000 / portTICK_RATE_MS); - i2c_cmd_link_delete(cmd); - if(ret != ESP_OK) { - ESP_LOGE(TAG, "SCCB_Read Failed addr:0x%02x, reg:0x%02x, data:0x%02x, ret:%d", slv_addr, reg, data, ret); - } - return data; -} - -uint8_t SCCB_Write(uint8_t slv_addr, uint8_t reg, uint8_t data) -{ - esp_err_t ret = ESP_FAIL; - i2c_cmd_handle_t cmd = i2c_cmd_link_create(); - i2c_master_start(cmd); - i2c_master_write_byte(cmd, ( slv_addr << 1 ) | WRITE_BIT, ACK_CHECK_EN); - i2c_master_write_byte(cmd, reg, ACK_CHECK_EN); - i2c_master_write_byte(cmd, data, ACK_CHECK_EN); - i2c_master_stop(cmd); - ret = i2c_master_cmd_begin(SCCB_I2C_PORT, cmd, 1000 / portTICK_RATE_MS); - i2c_cmd_link_delete(cmd); - if(ret != ESP_OK) { - ESP_LOGE(TAG, "SCCB_Write Failed addr:0x%02x, reg:0x%02x, data:0x%02x, ret:%d", slv_addr, reg, data, ret); - } - return ret == ESP_OK ? 0 : -1; -} - -uint8_t SCCB_Read16(uint8_t slv_addr, uint16_t reg) -{ - uint8_t data=0; - esp_err_t ret = ESP_FAIL; - uint16_t reg_htons = LITTLETOBIG(reg); - uint8_t *reg_u8 = (uint8_t *)®_htons; - i2c_cmd_handle_t cmd = i2c_cmd_link_create(); - i2c_master_start(cmd); - i2c_master_write_byte(cmd, ( slv_addr << 1 ) | WRITE_BIT, ACK_CHECK_EN); - i2c_master_write_byte(cmd, reg_u8[0], ACK_CHECK_EN); - i2c_master_write_byte(cmd, reg_u8[1], ACK_CHECK_EN); - i2c_master_stop(cmd); - ret = i2c_master_cmd_begin(SCCB_I2C_PORT, cmd, 1000 / portTICK_RATE_MS); - i2c_cmd_link_delete(cmd); - if(ret != ESP_OK) return -1; - cmd = i2c_cmd_link_create(); - i2c_master_start(cmd); - i2c_master_write_byte(cmd, ( slv_addr << 1 ) | READ_BIT, ACK_CHECK_EN); - i2c_master_read_byte(cmd, &data, NACK_VAL); - i2c_master_stop(cmd); - ret = i2c_master_cmd_begin(SCCB_I2C_PORT, cmd, 1000 / portTICK_RATE_MS); - i2c_cmd_link_delete(cmd); - if(ret != ESP_OK) { - ESP_LOGE(TAG, "W [%04x]=%02x fail\n", reg, data); - } - return data; -} - -uint8_t SCCB_Write16(uint8_t slv_addr, uint16_t reg, uint8_t data) -{ - static uint16_t i = 0; - esp_err_t ret = ESP_FAIL; - uint16_t reg_htons = LITTLETOBIG(reg); - uint8_t *reg_u8 = (uint8_t *)®_htons; - i2c_cmd_handle_t cmd = i2c_cmd_link_create(); - i2c_master_start(cmd); - i2c_master_write_byte(cmd, ( slv_addr << 1 ) | WRITE_BIT, ACK_CHECK_EN); - i2c_master_write_byte(cmd, reg_u8[0], ACK_CHECK_EN); - i2c_master_write_byte(cmd, reg_u8[1], ACK_CHECK_EN); - i2c_master_write_byte(cmd, data, ACK_CHECK_EN); - i2c_master_stop(cmd); - ret = i2c_master_cmd_begin(SCCB_I2C_PORT, cmd, 1000 / portTICK_RATE_MS); - i2c_cmd_link_delete(cmd); - if(ret != ESP_OK) { - ESP_LOGE(TAG, "W [%04x]=%02x %d fail\n", reg, data, i++); - } - return ret == ESP_OK ? 0 : -1; -} diff --git a/lib/libesp32_div/esp32-camera/driver/sensor.c b/lib/libesp32_div/esp32-camera/driver/sensor.c deleted file mode 100644 index 7ebd7af21..000000000 --- a/lib/libesp32_div/esp32-camera/driver/sensor.c +++ /dev/null @@ -1,52 +0,0 @@ -#include -#include "sensor.h" - -const camera_sensor_info_t camera_sensor[CAMERA_MODEL_MAX] = { - // The sequence must be consistent with camera_model_t - {CAMERA_OV7725, "OV7725", OV7725_SCCB_ADDR, OV7725_PID, FRAMESIZE_VGA, false}, - {CAMERA_OV2640, "OV2640", OV2640_SCCB_ADDR, OV2640_PID, FRAMESIZE_UXGA, true}, - {CAMERA_OV3660, "OV3660", OV3660_SCCB_ADDR, OV3660_PID, FRAMESIZE_QXGA, true}, - {CAMERA_OV5640, "OV5640", OV5640_SCCB_ADDR, OV5640_PID, FRAMESIZE_QSXGA, true}, - {CAMERA_OV7670, "OV7670", OV7670_SCCB_ADDR, OV7670_PID, FRAMESIZE_VGA, false}, - {CAMERA_NT99141, "NT99141", NT99141_SCCB_ADDR, NT99141_PID, FRAMESIZE_HD, true}, - {CAMERA_GC2145, "GC2145", GC2145_SCCB_ADDR, GC2145_PID, FRAMESIZE_UXGA, false}, - {CAMERA_GC032A, "GC032A", GC032A_SCCB_ADDR, GC032A_PID, FRAMESIZE_VGA, false}, - {CAMERA_GC0308, "GC0308", GC0308_SCCB_ADDR, GC0308_PID, FRAMESIZE_VGA, false}, -}; - -const resolution_info_t resolution[FRAMESIZE_INVALID] = { - { 96, 96, ASPECT_RATIO_1X1 }, /* 96x96 */ - { 160, 120, ASPECT_RATIO_4X3 }, /* QQVGA */ - { 176, 144, ASPECT_RATIO_5X4 }, /* QCIF */ - { 240, 176, ASPECT_RATIO_4X3 }, /* HQVGA */ - { 240, 240, ASPECT_RATIO_1X1 }, /* 240x240 */ - { 320, 240, ASPECT_RATIO_4X3 }, /* QVGA */ - { 400, 296, ASPECT_RATIO_4X3 }, /* CIF */ - { 480, 320, ASPECT_RATIO_3X2 }, /* HVGA */ - { 640, 480, ASPECT_RATIO_4X3 }, /* VGA */ - { 800, 600, ASPECT_RATIO_4X3 }, /* SVGA */ - { 1024, 768, ASPECT_RATIO_4X3 }, /* XGA */ - { 1280, 720, ASPECT_RATIO_16X9 }, /* HD */ - { 1280, 1024, ASPECT_RATIO_5X4 }, /* SXGA */ - { 1600, 1200, ASPECT_RATIO_4X3 }, /* UXGA */ - // 3MP Sensors - { 1920, 1080, ASPECT_RATIO_16X9 }, /* FHD */ - { 720, 1280, ASPECT_RATIO_9X16 }, /* Portrait HD */ - { 864, 1536, ASPECT_RATIO_9X16 }, /* Portrait 3MP */ - { 2048, 1536, ASPECT_RATIO_4X3 }, /* QXGA */ - // 5MP Sensors - { 2560, 1440, ASPECT_RATIO_16X9 }, /* QHD */ - { 2560, 1600, ASPECT_RATIO_16X10 }, /* WQXGA */ - { 1088, 1920, ASPECT_RATIO_9X16 }, /* Portrait FHD */ - { 2560, 1920, ASPECT_RATIO_4X3 }, /* QSXGA */ -}; - -camera_sensor_info_t *esp_camera_sensor_get_info(sensor_id_t *id) -{ - for (int i = 0; i < CAMERA_MODEL_MAX; i++) { - if (id->PID == camera_sensor[i].pid) { - return (camera_sensor_info_t *)&camera_sensor[i]; - } - } - return NULL; -} diff --git a/lib/libesp32_div/esp32-camera/examples/CMakeLists.txt b/lib/libesp32_div/esp32-camera/examples/CMakeLists.txt deleted file mode 100644 index 0a0396884..000000000 --- a/lib/libesp32_div/esp32-camera/examples/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -# 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(EXTRA_COMPONENT_DIRS "../") - -add_compile_options(-fdiagnostics-color=always) -include($ENV{IDF_PATH}/tools/cmake/project.cmake) -project(camera_example) \ No newline at end of file diff --git a/lib/libesp32_div/esp32-camera/examples/Makefile b/lib/libesp32_div/esp32-camera/examples/Makefile deleted file mode 100644 index f06df0ecc..000000000 --- a/lib/libesp32_div/esp32-camera/examples/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# -# This is a project Makefile. It is assumed the directory this Makefile resides in is a -# project subdirectory. -# - -PROJECT_NAME := camera_example - -EXTRA_COMPONENT_DIRS := ../ - -include $(IDF_PATH)/make/project.mk - diff --git a/lib/libesp32_div/esp32-camera/examples/main/CMakeLists.txt b/lib/libesp32_div/esp32-camera/examples/main/CMakeLists.txt deleted file mode 100644 index 1735fb184..000000000 --- a/lib/libesp32_div/esp32-camera/examples/main/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -set(COMPONENT_SRCS take_picture.c) -set(COMPONENT_ADD_INCLUDEDIRS .) -register_component() \ No newline at end of file diff --git a/lib/libesp32_div/esp32-camera/examples/main/component.mk b/lib/libesp32_div/esp32-camera/examples/main/component.mk deleted file mode 100644 index 0b9d7585e..000000000 --- a/lib/libesp32_div/esp32-camera/examples/main/component.mk +++ /dev/null @@ -1,5 +0,0 @@ -# -# "main" pseudo-component makefile. -# -# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.) - diff --git a/lib/libesp32_div/esp32-camera/examples/main/take_picture.c b/lib/libesp32_div/esp32-camera/examples/main/take_picture.c deleted file mode 100644 index 1cbad908b..000000000 --- a/lib/libesp32_div/esp32-camera/examples/main/take_picture.c +++ /dev/null @@ -1,155 +0,0 @@ -/** - * This example takes a picture every 5s and print its size on serial monitor. - */ - -// =============================== SETUP ====================================== - -// 1. Board setup (Uncomment): -// #define BOARD_WROVER_KIT -// #define BOARD_ESP32CAM_AITHINKER - -/** - * 2. Kconfig setup - * - * If you have a Kconfig file, copy the content from - * https://github.com/espressif/esp32-camera/blob/master/Kconfig into it. - * In case you haven't, copy and paste this Kconfig file inside the src directory. - * This Kconfig file has definitions that allows more control over the camera and - * how it will be initialized. - */ - -/** - * 3. Enable PSRAM on sdkconfig: - * - * CONFIG_ESP32_SPIRAM_SUPPORT=y - * - * More info on - * https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/kconfig.html#config-esp32-spiram-support - */ - -// ================================ CODE ====================================== - -#include -#include -#include -#include -#include - -#include "freertos/FreeRTOS.h" -#include "freertos/task.h" - -#include "esp_camera.h" - -#define BOARD_WROVER_KIT 1 - -// WROVER-KIT PIN Map -#ifdef BOARD_WROVER_KIT - -#define CAM_PIN_PWDN -1 //power down is not used -#define CAM_PIN_RESET -1 //software reset will be performed -#define CAM_PIN_XCLK 21 -#define CAM_PIN_SIOD 26 -#define CAM_PIN_SIOC 27 - -#define CAM_PIN_D7 35 -#define CAM_PIN_D6 34 -#define CAM_PIN_D5 39 -#define CAM_PIN_D4 36 -#define CAM_PIN_D3 19 -#define CAM_PIN_D2 18 -#define CAM_PIN_D1 5 -#define CAM_PIN_D0 4 -#define CAM_PIN_VSYNC 25 -#define CAM_PIN_HREF 23 -#define CAM_PIN_PCLK 22 - -#endif - -// ESP32Cam (AiThinker) PIN Map -#ifdef BOARD_ESP32CAM_AITHINKER - -#define CAM_PIN_PWDN 32 -#define CAM_PIN_RESET -1 //software reset will be performed -#define CAM_PIN_XCLK 0 -#define CAM_PIN_SIOD 26 -#define CAM_PIN_SIOC 27 - -#define CAM_PIN_D7 35 -#define CAM_PIN_D6 34 -#define CAM_PIN_D5 39 -#define CAM_PIN_D4 36 -#define CAM_PIN_D3 21 -#define CAM_PIN_D2 19 -#define CAM_PIN_D1 18 -#define CAM_PIN_D0 5 -#define CAM_PIN_VSYNC 25 -#define CAM_PIN_HREF 23 -#define CAM_PIN_PCLK 22 - -#endif - -static const char *TAG = "example:take_picture"; - -static camera_config_t camera_config = { - .pin_pwdn = CAM_PIN_PWDN, - .pin_reset = CAM_PIN_RESET, - .pin_xclk = CAM_PIN_XCLK, - .pin_sscb_sda = CAM_PIN_SIOD, - .pin_sscb_scl = CAM_PIN_SIOC, - - .pin_d7 = CAM_PIN_D7, - .pin_d6 = CAM_PIN_D6, - .pin_d5 = CAM_PIN_D5, - .pin_d4 = CAM_PIN_D4, - .pin_d3 = CAM_PIN_D3, - .pin_d2 = CAM_PIN_D2, - .pin_d1 = CAM_PIN_D1, - .pin_d0 = CAM_PIN_D0, - .pin_vsync = CAM_PIN_VSYNC, - .pin_href = CAM_PIN_HREF, - .pin_pclk = CAM_PIN_PCLK, - - //XCLK 20MHz or 10MHz for OV2640 double FPS (Experimental) - .xclk_freq_hz = 20000000, - .ledc_timer = LEDC_TIMER_0, - .ledc_channel = LEDC_CHANNEL_0, - - .pixel_format = PIXFORMAT_RGB565, //YUV422,GRAYSCALE,RGB565,JPEG - .frame_size = FRAMESIZE_QVGA, //QQVGA-UXGA Do not use sizes above QVGA when not JPEG - - .jpeg_quality = 12, //0-63 lower number means higher quality - .fb_count = 1, //if more than one, i2s runs in continuous mode. Use only with JPEG - .grab_mode = CAMERA_GRAB_WHEN_EMPTY, -}; - -static esp_err_t init_camera() -{ - //initialize the camera - esp_err_t err = esp_camera_init(&camera_config); - if (err != ESP_OK) - { - ESP_LOGE(TAG, "Camera Init Failed"); - return err; - } - - return ESP_OK; -} - -void app_main() -{ - if(ESP_OK != init_camera()) { - return; - } - - while (1) - { - ESP_LOGI(TAG, "Taking picture..."); - camera_fb_t *pic = esp_camera_fb_get(); - - // use pic->buf to access the image - ESP_LOGI(TAG, "Picture taken! Its size was: %zu bytes", pic->len); - esp_camera_fb_return(pic); - - vTaskDelay(5000 / portTICK_RATE_MS); - } -} diff --git a/lib/libesp32_div/esp32-camera/examples/sdkconfig.defaults b/lib/libesp32_div/esp32-camera/examples/sdkconfig.defaults deleted file mode 100644 index e5ac4557a..000000000 --- a/lib/libesp32_div/esp32-camera/examples/sdkconfig.defaults +++ /dev/null @@ -1,17 +0,0 @@ -CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y -CONFIG_ESP32S2_DEFAULT_CPU_FREQ_240=y -CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240=y - -CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y -CONFIG_PARTITION_TABLE_OFFSET=0x10000 - -CONFIG_FREERTOS_HZ=1000 -CONFIG_ESPTOOLPY_FLASHFREQ_80M=y -CONFIG_ESPTOOLPY_FLASHMODE_QIO=y - -CONFIG_SPIRAM_SUPPORT=y -CONFIG_ESP32_SPIRAM_SUPPORT=y -CONFIG_ESP32S2_SPIRAM_SUPPORT=y -CONFIG_ESP32S3_SPIRAM_SUPPORT=y -CONFIG_SPIRAM_SPEED_80M=y - diff --git a/lib/libesp32_div/esp32-camera/library.json b/lib/libesp32_div/esp32-camera/library.json deleted file mode 100644 index 2f2c9fc1b..000000000 --- a/lib/libesp32_div/esp32-camera/library.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "esp32-camera", - "version": "1.0.0", - "keywords": "esp32, camera, espressif, esp32-cam", - "description": "ESP32 compatible driver for OV2640, OV3660, OV5640, OV7670 and OV7725 image sensors.", - "repository": { - "type": "git", - "url": "https://github.com/espressif/esp32-camera" - }, - "frameworks": "arduino", - "platforms": "espressif32", - "build": { - "flags": [ - "-Idriver/include", - "-Iconversions/include", - "-Idriver/private_include", - "-Iconversions/private_include", - "-Isensors/private_include", - "-Itarget/private_include" - ], - "includeDir": ".", - "srcDir": ".", - "srcFilter": ["-<*>", "+", "+", "+"] - } -} diff --git a/lib/libesp32_div/esp32-camera/sensors/gc0308.c b/lib/libesp32_div/esp32-camera/sensors/gc0308.c deleted file mode 100644 index 19064d3a7..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/gc0308.c +++ /dev/null @@ -1,465 +0,0 @@ -// Copyright 2015-2021 Espressif Systems (Shanghai) PTE LTD -// -// 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. - -#include -#include -#include -#include "freertos/FreeRTOS.h" -#include "freertos/task.h" -#include "sccb.h" -#include "gc0308.h" -#include "gc0308_regs.h" -#include "gc0308_settings.h" - -#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) -#include "esp32-hal-log.h" -#else -#include "esp_log.h" -static const char *TAG = "gc0308"; -#endif - -#define H8(v) ((v)>>8) -#define L8(v) ((v)&0xff) - -//#define REG_DEBUG_ON - -static int read_reg(uint8_t slv_addr, const uint16_t reg) -{ - int ret = SCCB_Read(slv_addr, reg); -#ifdef REG_DEBUG_ON - if (ret < 0) { - ESP_LOGE(TAG, "READ REG 0x%04x FAILED: %d", reg, ret); - } -#endif - return ret; -} - -static int write_reg(uint8_t slv_addr, const uint16_t reg, uint8_t value) -{ - int ret = 0; -#ifndef REG_DEBUG_ON - ret = SCCB_Write(slv_addr, reg, value); -#else - int old_value = read_reg(slv_addr, reg); - if (old_value < 0) { - return old_value; - } - if ((uint8_t)old_value != value) { - ESP_LOGI(TAG, "NEW REG 0x%04x: 0x%02x to 0x%02x", reg, (uint8_t)old_value, value); - ret = SCCB_Write(slv_addr, reg, value); - } else { - ESP_LOGD(TAG, "OLD REG 0x%04x: 0x%02x", reg, (uint8_t)old_value); - ret = SCCB_Write(slv_addr, reg, value);//maybe not? - } - if (ret < 0) { - ESP_LOGE(TAG, "WRITE REG 0x%04x FAILED: %d", reg, ret); - } -#endif - return ret; -} - -static int check_reg_mask(uint8_t slv_addr, uint16_t reg, uint8_t mask) -{ - return (read_reg(slv_addr, reg) & mask) == mask; -} - -static int set_reg_bits(uint8_t slv_addr, uint16_t reg, uint8_t offset, uint8_t mask, uint8_t value) -{ - int ret = 0; - uint8_t c_value, new_value; - ret = read_reg(slv_addr, reg); - if (ret < 0) { - return ret; - } - c_value = ret; - new_value = (c_value & ~(mask << offset)) | ((value & mask) << offset); - ret = write_reg(slv_addr, reg, new_value); - return ret; -} - -static int write_regs(uint8_t slv_addr, const uint16_t (*regs)[2]) -{ - int i = 0, ret = 0; - while (!ret && regs[i][0] != REGLIST_TAIL) { - if (regs[i][0] == REG_DLY) { - vTaskDelay(regs[i][1] / portTICK_PERIOD_MS); - } else { - ret = write_reg(slv_addr, regs[i][0], regs[i][1]); - } - i++; - } - return ret; -} - -static void print_regs(uint8_t slv_addr) -{ -#ifdef DEBUG_PRINT_REG - ESP_LOGI(TAG, "REG list look ======================"); - for (size_t i = 0xf0; i <= 0xfe; i++) { - ESP_LOGI(TAG, "reg[0x%02x] = 0x%02x", i, read_reg(slv_addr, i)); - } - ESP_LOGI(TAG, "\npage 0 ==="); - write_reg(slv_addr, 0xfe, 0x00); // page 0 - for (size_t i = 0x03; i <= 0xa2; i++) { - ESP_LOGI(TAG, "p0 reg[0x%02x] = 0x%02x", i, read_reg(slv_addr, i)); - } - - ESP_LOGI(TAG, "\npage 3 ==="); - write_reg(slv_addr, 0xfe, 0x03); // page 3 - for (size_t i = 0x01; i <= 0x43; i++) { - ESP_LOGI(TAG, "p3 reg[0x%02x] = 0x%02x", i, read_reg(slv_addr, i)); - } -#endif -} - -static int reset(sensor_t *sensor) -{ - int ret = 0; - // Software Reset: clear all registers and reset them to their default values - ret = write_reg(sensor->slv_addr, RESET_RELATED, 0xf0); - if (ret) { - ESP_LOGE(TAG, "Software Reset FAILED!"); - return ret; - } - vTaskDelay(100 / portTICK_PERIOD_MS); - ret = write_regs(sensor->slv_addr, gc0308_sensor_default_regs); - if (ret == 0) { - ESP_LOGD(TAG, "Camera defaults loaded"); - vTaskDelay(100 / portTICK_PERIOD_MS); - write_reg(sensor->slv_addr, 0xfe, 0x00); -#ifdef CONFIG_IDF_TARGET_ESP32 - set_reg_bits(sensor->slv_addr, 0x28, 4, 0x07, 1); //frequency division for esp32, ensure pclk <= 15MHz -#endif - } - return ret; -} - -static int set_pixformat(sensor_t *sensor, pixformat_t pixformat) -{ - int ret = 0; - - switch (pixformat) { - case PIXFORMAT_RGB565: - write_reg(sensor->slv_addr, 0xfe, 0x00); - ret = set_reg_bits(sensor->slv_addr, 0x24, 0, 0x0f, 6); //RGB565 - break; - - case PIXFORMAT_YUV422: - write_reg(sensor->slv_addr, 0xfe, 0x00); - ret = set_reg_bits(sensor->slv_addr, 0x24, 0, 0x0f, 2); //yuv422 Y Cb Y Cr - break; - default: - ESP_LOGW(TAG, "unsupport format"); - ret = -1; - break; - } - - if (ret == 0) { - sensor->pixformat = pixformat; - ESP_LOGD(TAG, "Set pixformat to: %u", pixformat); - } - return ret; -} - -static int set_framesize(sensor_t *sensor, framesize_t framesize) -{ - int ret = 0; - if (framesize > FRAMESIZE_VGA) { - ESP_LOGW(TAG, "Invalid framesize: %u", framesize); - framesize = FRAMESIZE_VGA; - } - sensor->status.framesize = framesize; - uint16_t w = resolution[framesize].width; - uint16_t h = resolution[framesize].height; - uint16_t row_s = (resolution[FRAMESIZE_VGA].height - h) / 2; - uint16_t col_s = (resolution[FRAMESIZE_VGA].width - w) / 2; - -#if CONFIG_GC_SENSOR_SUBSAMPLE_MODE - struct subsample_cfg { - uint16_t ratio_numerator; - uint16_t ratio_denominator; - uint8_t reg0x54; - uint8_t reg0x56; - uint8_t reg0x57; - uint8_t reg0x58; - uint8_t reg0x59; - }; - const struct subsample_cfg subsample_cfgs[] = { // define some subsample ratio - {84, 420, 0x55, 0x00, 0x00, 0x00, 0x00}, //1/5 - {105, 420, 0x44, 0x00, 0x00, 0x00, 0x00},//1/4 - {140, 420, 0x33, 0x00, 0x00, 0x00, 0x00},//1/3 - {210, 420, 0x22, 0x00, 0x00, 0x00, 0x00},//1/2 - {240, 420, 0x77, 0x02, 0x46, 0x02, 0x46},//4/7 - {252, 420, 0x55, 0x02, 0x04, 0x02, 0x04},//3/5 - {280, 420, 0x33, 0x02, 0x00, 0x02, 0x00},//2/3 - {420, 420, 0x11, 0x00, 0x00, 0x00, 0x00},//1/1 - }; - uint16_t win_w = 640; - uint16_t win_h = 480; - const struct subsample_cfg *cfg = NULL; - /** - * Strategy: try to keep the maximum perspective - */ - for (size_t i = 0; i < sizeof(subsample_cfgs) / sizeof(struct subsample_cfg); i++) { - cfg = &subsample_cfgs[i]; - if ((win_w * cfg->ratio_numerator / cfg->ratio_denominator >= w) && (win_h * cfg->ratio_numerator / cfg->ratio_denominator >= h)) { - win_w = w * cfg->ratio_denominator / cfg->ratio_numerator; - win_h = h * cfg->ratio_denominator / cfg->ratio_numerator; - row_s = (resolution[FRAMESIZE_VGA].height - win_h) / 2; - col_s = (resolution[FRAMESIZE_VGA].width - win_w) / 2; - ESP_LOGI(TAG, "subsample win:%dx%d, ratio:%f", win_w, win_h, (float)cfg->ratio_numerator / (float)cfg->ratio_denominator); - break; - } - } - - write_reg(sensor->slv_addr, 0xfe, 0x00); - - write_reg(sensor->slv_addr, 0x05, H8(row_s)); - write_reg(sensor->slv_addr, 0x06, L8(row_s)); - write_reg(sensor->slv_addr, 0x07, H8(col_s)); - write_reg(sensor->slv_addr, 0x08, L8(col_s)); - write_reg(sensor->slv_addr, 0x09, H8(win_h + 8)); - write_reg(sensor->slv_addr, 0x0a, L8(win_h + 8)); - write_reg(sensor->slv_addr, 0x0b, H8(win_w + 8)); - write_reg(sensor->slv_addr, 0x0c, L8(win_w + 8)); - - write_reg(sensor->slv_addr, 0xfe, 0x01); - set_reg_bits(sensor->slv_addr, 0x53, 7, 0x01, 1); - set_reg_bits(sensor->slv_addr, 0x55, 0, 0x01, 1); - write_reg(sensor->slv_addr, 0x54, cfg->reg0x54); - write_reg(sensor->slv_addr, 0x56, cfg->reg0x56); - write_reg(sensor->slv_addr, 0x57, cfg->reg0x57); - write_reg(sensor->slv_addr, 0x58, cfg->reg0x58); - write_reg(sensor->slv_addr, 0x59, cfg->reg0x59); - - write_reg(sensor->slv_addr, 0xfe, 0x00); - -#elif CONFIG_GC_SENSOR_WINDOWING_MODE - write_reg(sensor->slv_addr, 0xfe, 0x00); - - write_reg(sensor->slv_addr, 0xf7, col_s / 4); - write_reg(sensor->slv_addr, 0xf8, row_s / 4); - write_reg(sensor->slv_addr, 0xf9, (col_s + h) / 4); - write_reg(sensor->slv_addr, 0xfa, (row_s + w) / 4); - - write_reg(sensor->slv_addr, 0x05, H8(row_s)); - write_reg(sensor->slv_addr, 0x06, L8(row_s)); - write_reg(sensor->slv_addr, 0x07, H8(col_s)); - write_reg(sensor->slv_addr, 0x08, L8(col_s)); - - write_reg(sensor->slv_addr, 0x09, H8(h + 8)); - write_reg(sensor->slv_addr, 0x0a, L8(h + 8)); - write_reg(sensor->slv_addr, 0x0b, H8(w + 8)); - write_reg(sensor->slv_addr, 0x0c, L8(w + 8)); - -#endif - if (ret == 0) { - ESP_LOGD(TAG, "Set framesize to: %ux%u", w, h); - } - return 0; -} - -static int set_contrast(sensor_t *sensor, int contrast) -{ - if (contrast != 0) { - write_reg(sensor->slv_addr, 0xfe, 0x00); - write_reg(sensor->slv_addr, 0xb3, contrast); - } - return 0; -} - -static int set_global_gain(sensor_t *sensor, int gain_level) -{ - if (gain_level != 0) { - write_reg(sensor->slv_addr, 0xfe, 0x00); - write_reg(sensor->slv_addr, 0x50, gain_level); - } - return 0; -} - -static int set_hmirror(sensor_t *sensor, int enable) -{ - int ret = 0; - sensor->status.hmirror = enable; - ret = write_reg(sensor->slv_addr, 0xfe, 0x00); - ret |= set_reg_bits(sensor->slv_addr, 0x14, 0, 0x01, enable != 0); - if (ret == 0) { - ESP_LOGD(TAG, "Set h-mirror to: %d", enable); - } - return ret; -} - -static int set_vflip(sensor_t *sensor, int enable) -{ - int ret = 0; - sensor->status.vflip = enable; - ret = write_reg(sensor->slv_addr, 0xfe, 0x00); - ret |= set_reg_bits(sensor->slv_addr, 0x14, 1, 0x01, enable != 0); - if (ret == 0) { - ESP_LOGD(TAG, "Set v-flip to: %d", enable); - } - return ret; -} - -static int set_colorbar(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = write_reg(sensor->slv_addr, 0xfe, 0x00); - ret |= set_reg_bits(sensor->slv_addr, 0x2e, 0, 0x01, enable); - if (ret == 0) { - sensor->status.colorbar = enable; - ESP_LOGD(TAG, "Set colorbar to: %d", enable); - } - return ret; -} - -static int get_reg(sensor_t *sensor, int reg, int mask) -{ - int ret = 0; - if (mask > 0xFF) { - ESP_LOGE(TAG, "mask should not more than 0xff"); - } else { - ret = read_reg(sensor->slv_addr, reg); - } - if (ret > 0) { - ret &= mask; - } - return ret; -} - -static int set_reg(sensor_t *sensor, int reg, int mask, int value) -{ - int ret = 0; - if (mask > 0xFF) { - ESP_LOGE(TAG, "mask should not more than 0xff"); - } else { - ret = read_reg(sensor->slv_addr, reg); - } - if (ret < 0) { - return ret; - } - value = (ret & ~mask) | (value & mask); - - if (mask > 0xFF) { - - } else { - ret = write_reg(sensor->slv_addr, reg, value); - } - return ret; -} - -static int init_status(sensor_t *sensor) -{ - write_reg(sensor->slv_addr, 0xfe, 0x00); - sensor->status.brightness = 0; - sensor->status.contrast = 0; - sensor->status.saturation = 0; - sensor->status.sharpness = 0; - sensor->status.denoise = 0; - sensor->status.ae_level = 0; - sensor->status.gainceiling = 0; - sensor->status.awb = 0; - sensor->status.dcw = 0; - sensor->status.agc = 0; - sensor->status.aec = 0; - sensor->status.hmirror = check_reg_mask(sensor->slv_addr, 0x14, 0x01); - sensor->status.vflip = check_reg_mask(sensor->slv_addr, 0x14, 0x02); - sensor->status.colorbar = 0; - sensor->status.bpc = 0; - sensor->status.wpc = 0; - sensor->status.raw_gma = 0; - sensor->status.lenc = 0; - sensor->status.quality = 0; - sensor->status.special_effect = 0; - sensor->status.wb_mode = 0; - sensor->status.awb_gain = 0; - sensor->status.agc_gain = 0; - sensor->status.aec_value = 0; - sensor->status.aec2 = 0; - - print_regs(sensor->slv_addr); - return 0; -} - -static int set_dummy(sensor_t *sensor, int val) -{ - ESP_LOGW(TAG, "Unsupported"); - return -1; -} -static int set_gainceiling_dummy(sensor_t *sensor, gainceiling_t val) -{ - ESP_LOGW(TAG, "Unsupported"); - return -1; -} - -int gc0308_detect(int slv_addr, sensor_id_t *id) -{ - if (GC0308_SCCB_ADDR == slv_addr) { - write_reg(slv_addr, 0xfe, 0x00); - uint8_t PID = SCCB_Read(slv_addr, 0x00); - if (GC0308_PID == PID) { - id->PID = PID; - return PID; - } else { - ESP_LOGI(TAG, "Mismatch PID=0x%x", PID); - } - } - return 0; -} - -int gc0308_init(sensor_t *sensor) -{ - sensor->init_status = init_status; - sensor->reset = reset; - sensor->set_pixformat = set_pixformat; - sensor->set_framesize = set_framesize; - sensor->set_contrast = set_contrast; - sensor->set_brightness = set_dummy; - sensor->set_saturation = set_dummy; - sensor->set_sharpness = set_dummy; - sensor->set_denoise = set_dummy; - sensor->set_gainceiling = set_gainceiling_dummy; - sensor->set_quality = set_dummy; - sensor->set_colorbar = set_colorbar; - sensor->set_whitebal = set_dummy; - sensor->set_gain_ctrl = set_global_gain; - sensor->set_exposure_ctrl = set_dummy; - sensor->set_hmirror = set_hmirror; - sensor->set_vflip = set_vflip; - - sensor->set_aec2 = set_dummy; - sensor->set_awb_gain = set_dummy; - sensor->set_agc_gain = set_dummy; - sensor->set_aec_value = set_dummy; - - sensor->set_special_effect = set_dummy; - sensor->set_wb_mode = set_dummy; - sensor->set_ae_level = set_dummy; - - sensor->set_dcw = set_dummy; - sensor->set_bpc = set_dummy; - sensor->set_wpc = set_dummy; - - sensor->set_raw_gma = set_dummy; - sensor->set_lenc = set_dummy; - - sensor->get_reg = get_reg; - sensor->set_reg = set_reg; - sensor->set_res_raw = NULL; - sensor->set_pll = NULL; - sensor->set_xclk = NULL; - - ESP_LOGD(TAG, "GC0308 Attached"); - return 0; -} diff --git a/lib/libesp32_div/esp32-camera/sensors/gc032a.c b/lib/libesp32_div/esp32-camera/sensors/gc032a.c deleted file mode 100644 index 612e17b1e..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/gc032a.c +++ /dev/null @@ -1,391 +0,0 @@ -// Copyright 2015-2021 Espressif Systems (Shanghai) PTE LTD -// -// 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. - -#include -#include -#include -#include -#include "freertos/FreeRTOS.h" -#include "freertos/task.h" -#include "sccb.h" -#include "gc032a.h" -#include "gc032a_regs.h" -#include "gc032a_settings.h" - -#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) -#include "esp32-hal-log.h" -#else -#include "esp_log.h" -static const char *TAG = "gc032a"; -#endif - -#define H8(v) ((v)>>8) -#define L8(v) ((v)&0xff) - -//#define REG_DEBUG_ON - -static int read_reg(uint8_t slv_addr, const uint16_t reg) -{ - int ret = SCCB_Read(slv_addr, reg); -#ifdef REG_DEBUG_ON - if (ret < 0) { - ESP_LOGE(TAG, "READ REG 0x%04x FAILED: %d", reg, ret); - } -#endif - return ret; -} - -static int write_reg(uint8_t slv_addr, const uint16_t reg, uint8_t value) -{ - int ret = 0; -#ifndef REG_DEBUG_ON - ret = SCCB_Write(slv_addr, reg, value); -#else - int old_value = read_reg(slv_addr, reg); - if (old_value < 0) { - return old_value; - } - if ((uint8_t)old_value != value) { - ESP_LOGI(TAG, "NEW REG 0x%04x: 0x%02x to 0x%02x", reg, (uint8_t)old_value, value); - ret = SCCB_Write(slv_addr, reg, value); - } else { - ESP_LOGD(TAG, "OLD REG 0x%04x: 0x%02x", reg, (uint8_t)old_value); - ret = SCCB_Write(slv_addr, reg, value);//maybe not? - } - if (ret < 0) { - ESP_LOGE(TAG, "WRITE REG 0x%04x FAILED: %d", reg, ret); - } -#endif - return ret; -} - -static int check_reg_mask(uint8_t slv_addr, uint16_t reg, uint8_t mask) -{ - return (read_reg(slv_addr, reg) & mask) == mask; -} - -static void print_regs(uint8_t slv_addr) -{ -#ifdef DEBUG_PRINT_REG - vTaskDelay(pdMS_TO_TICKS(100)); - ESP_LOGI(TAG, "REG list look ======================"); - for (size_t i = 0xf0; i <= 0xfe; i++) { - ESP_LOGI(TAG, "reg[0x%02x] = 0x%02x", i, read_reg(slv_addr, i)); - } - ESP_LOGI(TAG, "\npage 0 ==="); - write_reg(slv_addr, 0xfe, 0x00); // page 0 - for (size_t i = 0x03; i <= 0x24; i++) { - ESP_LOGI(TAG, "p0 reg[0x%02x] = 0x%02x", i, read_reg(slv_addr, i)); - } - for (size_t i = 0x40; i <= 0x95; i++) { - ESP_LOGI(TAG, "p0 reg[0x%02x] = 0x%02x", i, read_reg(slv_addr, i)); - } - ESP_LOGI(TAG, "\npage 3 ==="); - write_reg(slv_addr, 0xfe, 0x03); // page 3 - for (size_t i = 0x01; i <= 0x43; i++) { - ESP_LOGI(TAG, "p3 reg[0x%02x] = 0x%02x", i, read_reg(slv_addr, i)); - } -#endif -} - -static int set_reg_bits(uint8_t slv_addr, uint16_t reg, uint8_t offset, uint8_t mask, uint8_t value) -{ - int ret = 0; - uint8_t c_value, new_value; - ret = read_reg(slv_addr, reg); - if (ret < 0) { - return ret; - } - c_value = ret; - new_value = (c_value & ~(mask << offset)) | ((value & mask) << offset); - ret = write_reg(slv_addr, reg, new_value); - return ret; -} - -static int write_regs(uint8_t slv_addr, const uint16_t (*regs)[2]) -{ - int i = 0, ret = 0; - while (!ret && regs[i][0] != REGLIST_TAIL) { - if (regs[i][0] == REG_DLY) { - vTaskDelay(regs[i][1] / portTICK_PERIOD_MS); - } else { - ret = write_reg(slv_addr, regs[i][0], regs[i][1]); - } - i++; - } - return ret; -} - -static int reset(sensor_t *sensor) -{ - int ret; - // Software Reset: clear all registers and reset them to their default values - ret = write_reg(sensor->slv_addr, RESET_RELATED, 0xf0); - if (ret) { - ESP_LOGE(TAG, "Software Reset FAILED!"); - return ret; - } - vTaskDelay(100 / portTICK_PERIOD_MS); - - ret = write_regs(sensor->slv_addr, gc032a_default_regs); - if (ret == 0) { - ESP_LOGD(TAG, "Camera defaults loaded"); - vTaskDelay(100 / portTICK_PERIOD_MS); - write_reg(sensor->slv_addr, 0xfe, 0x00); - set_reg_bits(sensor->slv_addr, 0xf7, 1, 0x01, 1); // PLL_mode1:div2en - set_reg_bits(sensor->slv_addr, 0xf7, 7, 0x01, 1); // PLL_mode1:dvp mode - set_reg_bits(sensor->slv_addr, 0xf8, 0, 0x3f, 8); //PLL_mode2 :divx4 - set_reg_bits(sensor->slv_addr, 0xfa, 4, 0x0f, 2); //vlk div mode :divide_by - } - - return ret; -} - -static int set_pixformat(sensor_t *sensor, pixformat_t pixformat) -{ - int ret = 0; - switch (pixformat) { - case PIXFORMAT_RGB565: - write_reg(sensor->slv_addr, 0xfe, 0x00); - ret = set_reg_bits(sensor->slv_addr, 0x44, 0, 0x1f, 6); //RGB565 - break; - - case PIXFORMAT_YUV422: - write_reg(sensor->slv_addr, 0xfe, 0x00); - ret = set_reg_bits(sensor->slv_addr, 0x44, 0, 0x1f, 3); - break; - default: - ESP_LOGW(TAG, "unsupport format"); - ret = -1; - break; - } - if (ret == 0) { - sensor->pixformat = pixformat; - ESP_LOGD(TAG, "Set pixformat to: %u", pixformat); - } - - return ret; -} - -static int set_framesize(sensor_t *sensor, framesize_t framesize) -{ - ESP_LOGI(TAG, "set_framesize"); - int ret = 0; - if (framesize > FRAMESIZE_VGA) { - ESP_LOGW(TAG, "Invalid framesize: %u", framesize); - framesize = FRAMESIZE_VGA; - } - sensor->status.framesize = framesize; - uint16_t w = resolution[framesize].width; - uint16_t h = resolution[framesize].height; - uint16_t row_s = (resolution[FRAMESIZE_VGA].height - h) / 2; - uint16_t col_s = (resolution[FRAMESIZE_VGA].width - w) / 2; - - write_reg(sensor->slv_addr, 0xfe, 0x00); - write_reg(sensor->slv_addr, P0_ROW_START_HIGH, H8(row_s)); // Row_start[8] - write_reg(sensor->slv_addr, P0_ROW_START_LOW, L8(row_s)); // Row_start[7:0] - write_reg(sensor->slv_addr, P0_COLUMN_START_HIGH, H8(col_s)); // Column_start[9:8] - write_reg(sensor->slv_addr, P0_COLUMN_START_LOW, L8(col_s)); // Column_start[7:0] - write_reg(sensor->slv_addr, P0_WINDOW_HEIGHT_HIGH, H8(h + 8)); //window_height [8] - write_reg(sensor->slv_addr, P0_WINDOW_HEIGHT_LOW, L8(h + 8)); //window_height [7:0] - write_reg(sensor->slv_addr, P0_WINDOW_WIDTH_HIGH, H8(w + 8)); //window_width [9:8] - write_reg(sensor->slv_addr, P0_WINDOW_WIDTH_LOW, L8(w + 8)); //window_width [7:0] - - write_reg(sensor->slv_addr, P0_WIN_MODE, 0x01); - write_reg(sensor->slv_addr, P0_OUT_WIN_HEIGHT_HIGH, H8(h)); - write_reg(sensor->slv_addr, P0_OUT_WIN_HEIGHT_LOW, L8(h)); - write_reg(sensor->slv_addr, P0_OUT_WIN_WIDTH_HIGH, H8(w)); - write_reg(sensor->slv_addr, P0_OUT_WIN_WIDTH_LOW, L8(w)); - - if (ret == 0) { - ESP_LOGD(TAG, "Set framesize to: %ux%u", w, h); - } - print_regs(sensor->slv_addr); - return ret; -} - -static int set_hmirror(sensor_t *sensor, int enable) -{ - int ret = 0; - sensor->status.hmirror = enable; - ret = write_reg(sensor->slv_addr, 0xfe, 0x00); - ret |= set_reg_bits(sensor->slv_addr, P0_CISCTL_MODE1, 0, 0x01, enable); - if (ret == 0) { - ESP_LOGD(TAG, "Set h-mirror to: %d", enable); - } - return ret; -} - -static int set_vflip(sensor_t *sensor, int enable) -{ - int ret = 0; - sensor->status.vflip = enable; - ret = write_reg(sensor->slv_addr, 0xfe, 0x00); - ret |= set_reg_bits(sensor->slv_addr, P0_CISCTL_MODE1, 1, 0x01, enable); - if (ret == 0) { - ESP_LOGD(TAG, "Set v-flip to: %d", enable); - } - return ret; -} - -static int set_colorbar(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = write_reg(sensor->slv_addr, 0xfe, 0x00); - ret |= set_reg_bits(sensor->slv_addr, P0_DEBUG_MODE2, 3, 0x01, enable); - if (ret == 0) { - sensor->status.colorbar = enable; - ESP_LOGD(TAG, "Set colorbar to: %d", enable); - } - return ret; -} - -static int get_reg(sensor_t *sensor, int reg, int mask) -{ - int ret = 0; - if (mask > 0xFF) { - ESP_LOGE(TAG, "mask should not more than 0xff"); - } else { - ret = read_reg(sensor->slv_addr, reg); - } - if (ret > 0) { - ret &= mask; - } - return ret; -} - -static int set_reg(sensor_t *sensor, int reg, int mask, int value) -{ - int ret = 0; - if (mask > 0xFF) { - ESP_LOGE(TAG, "mask should not more than 0xff"); - } else { - ret = read_reg(sensor->slv_addr, reg); - } - if (ret < 0) { - return ret; - } - value = (ret & ~mask) | (value & mask); - - if (mask > 0xFF) { - - } else { - ret = write_reg(sensor->slv_addr, reg, value); - } - return ret; -} - -static int init_status(sensor_t *sensor) -{ - write_reg(sensor->slv_addr, 0xfe, 0x00); - sensor->status.brightness = 0; - sensor->status.contrast = 0; - sensor->status.saturation = 0; - sensor->status.sharpness = 0; - sensor->status.denoise = 0; - sensor->status.ae_level = 0; - sensor->status.gainceiling = 0; - sensor->status.awb = 0; - sensor->status.dcw = 0; - sensor->status.agc = 0; - sensor->status.aec = 0; - sensor->status.hmirror = check_reg_mask(sensor->slv_addr, P0_CISCTL_MODE1, 0x01); - sensor->status.vflip = check_reg_mask(sensor->slv_addr, P0_CISCTL_MODE1, 0x02); - sensor->status.colorbar = 0; - sensor->status.bpc = 0; - sensor->status.wpc = 0; - sensor->status.raw_gma = 0; - sensor->status.lenc = 0; - sensor->status.quality = 0; - sensor->status.special_effect = 0; - sensor->status.wb_mode = 0; - sensor->status.awb_gain = 0; - sensor->status.agc_gain = 0; - sensor->status.aec_value = 0; - sensor->status.aec2 = 0; - return 0; -} - -static int set_dummy(sensor_t *sensor, int val) -{ - ESP_LOGW(TAG, "Unsupported"); - return -1; -} -static int set_gainceiling_dummy(sensor_t *sensor, gainceiling_t val) -{ - ESP_LOGW(TAG, "Unsupported"); - return -1; -} - -int gc032a_detect(int slv_addr, sensor_id_t *id) -{ - if (GC032A_SCCB_ADDR == slv_addr) { - uint8_t MIDL = SCCB_Read(slv_addr, SENSOR_ID_LOW); - uint8_t MIDH = SCCB_Read(slv_addr, SENSOR_ID_HIGH); - uint16_t PID = MIDH << 8 | MIDL; - if (GC032A_PID == PID) { - id->PID = PID; - return PID; - } else { - ESP_LOGI(TAG, "Mismatch PID=0x%x", PID); - } - } - return 0; -} - -int gc032a_init(sensor_t *sensor) -{ - sensor->init_status = init_status; - sensor->reset = reset; - sensor->set_pixformat = set_pixformat; - sensor->set_framesize = set_framesize; - sensor->set_contrast = set_dummy; - sensor->set_brightness = set_dummy; - sensor->set_saturation = set_dummy; - sensor->set_sharpness = set_dummy; - sensor->set_denoise = set_dummy; - sensor->set_gainceiling = set_gainceiling_dummy; - sensor->set_quality = set_dummy; - sensor->set_colorbar = set_colorbar; - sensor->set_whitebal = set_dummy; - sensor->set_gain_ctrl = set_dummy; - sensor->set_exposure_ctrl = set_dummy; - sensor->set_hmirror = set_hmirror; - sensor->set_vflip = set_vflip; - - sensor->set_aec2 = set_dummy; - sensor->set_awb_gain = set_dummy; - sensor->set_agc_gain = set_dummy; - sensor->set_aec_value = set_dummy; - - sensor->set_special_effect = set_dummy; - sensor->set_wb_mode = set_dummy; - sensor->set_ae_level = set_dummy; - - sensor->set_dcw = set_dummy; - sensor->set_bpc = set_dummy; - sensor->set_wpc = set_dummy; - - sensor->set_raw_gma = set_dummy; - sensor->set_lenc = set_dummy; - - sensor->get_reg = get_reg; - sensor->set_reg = set_reg; - sensor->set_res_raw = NULL; - sensor->set_pll = NULL; - sensor->set_xclk = NULL; - - ESP_LOGD(TAG, "GC032A Attached"); - return 0; -} diff --git a/lib/libesp32_div/esp32-camera/sensors/gc2145.c b/lib/libesp32_div/esp32-camera/sensors/gc2145.c deleted file mode 100644 index 311308290..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/gc2145.c +++ /dev/null @@ -1,475 +0,0 @@ -// Copyright 2015-2021 Espressif Systems (Shanghai) PTE LTD -// -// 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. - -#include -#include -#include -#include "freertos/FreeRTOS.h" -#include "freertos/task.h" -#include "sccb.h" -#include "gc2145.h" -#include "gc2145_regs.h" -#include "gc2145_settings.h" - -#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) -#include "esp32-hal-log.h" -#else -#include "esp_log.h" -static const char *TAG = "gc2145"; -#endif - -#define H8(v) ((v)>>8) -#define L8(v) ((v)&0xff) - -//#define REG_DEBUG_ON - -static int read_reg(uint8_t slv_addr, const uint16_t reg) -{ - int ret = SCCB_Read(slv_addr, reg); -#ifdef REG_DEBUG_ON - if (ret < 0) { - ESP_LOGE(TAG, "READ REG 0x%04x FAILED: %d", reg, ret); - } -#endif - return ret; -} - -static int write_reg(uint8_t slv_addr, const uint16_t reg, uint8_t value) -{ - int ret = 0; -#ifndef REG_DEBUG_ON - ret = SCCB_Write(slv_addr, reg, value); -#else - int old_value = read_reg(slv_addr, reg); - if (old_value < 0) { - return old_value; - } - if ((uint8_t)old_value != value) { - ESP_LOGI(TAG, "NEW REG 0x%04x: 0x%02x to 0x%02x", reg, (uint8_t)old_value, value); - ret = SCCB_Write(slv_addr, reg, value); - } else { - ESP_LOGD(TAG, "OLD REG 0x%04x: 0x%02x", reg, (uint8_t)old_value); - ret = SCCB_Write(slv_addr, reg, value);//maybe not? - } - if (ret < 0) { - ESP_LOGE(TAG, "WRITE REG 0x%04x FAILED: %d", reg, ret); - } -#endif - return ret; -} - -static int check_reg_mask(uint8_t slv_addr, uint16_t reg, uint8_t mask) -{ - return (read_reg(slv_addr, reg) & mask) == mask; -} - -static int set_reg_bits(uint8_t slv_addr, uint16_t reg, uint8_t offset, uint8_t mask, uint8_t value) -{ - int ret = 0; - uint8_t c_value, new_value; - ret = read_reg(slv_addr, reg); - if (ret < 0) { - return ret; - } - c_value = ret; - new_value = (c_value & ~(mask << offset)) | ((value & mask) << offset); - ret = write_reg(slv_addr, reg, new_value); - return ret; -} - -static int write_regs(uint8_t slv_addr, const uint16_t (*regs)[2]) -{ - int i = 0, ret = 0; - while (!ret && regs[i][0] != REGLIST_TAIL) { - if (regs[i][0] == REG_DLY) { - vTaskDelay(regs[i][1] / portTICK_PERIOD_MS); - } else { - ret = write_reg(slv_addr, regs[i][0], regs[i][1]); - } - i++; - } - return ret; -} - -static void print_regs(uint8_t slv_addr) -{ -#ifdef DEBUG_PRINT_REG - vTaskDelay(pdMS_TO_TICKS(100)); - ESP_LOGI(TAG, "REG list look ======================"); - for (size_t i = 0xf0; i <= 0xfe; i++) { - ESP_LOGI(TAG, "reg[0x%02x] = 0x%02x", i, read_reg(slv_addr, i)); - } - ESP_LOGI(TAG, "\npage 0 ==="); - write_reg(slv_addr, 0xfe, 0x00); // page 0 - for (size_t i = 0x03; i <= 0x24; i++) { - ESP_LOGI(TAG, "p0 reg[0x%02x] = 0x%02x", i, read_reg(slv_addr, i)); - } - for (size_t i = 0x80; i <= 0xa2; i++) { - ESP_LOGI(TAG, "p0 reg[0x%02x] = 0x%02x", i, read_reg(slv_addr, i)); - } - ESP_LOGI(TAG, "\npage 3 ==="); - write_reg(slv_addr, 0xfe, 0x03); // page 3 - for (size_t i = 0x01; i <= 0x43; i++) { - ESP_LOGI(TAG, "p3 reg[0x%02x] = 0x%02x", i, read_reg(slv_addr, i)); - } -#endif -} - -static int reset(sensor_t *sensor) -{ - int ret = 0; - // Software Reset: clear all registers and reset them to their default values - ret = write_reg(sensor->slv_addr, RESET_RELATED, 0xe0); - if (ret) { - ESP_LOGE(TAG, "Software Reset FAILED!"); - return ret; - } - vTaskDelay(100 / portTICK_PERIOD_MS); - ret = write_regs(sensor->slv_addr, gc2145_default_init_regs); - if (ret == 0) { - ESP_LOGD(TAG, "Camera defaults loaded"); - vTaskDelay(100 / portTICK_PERIOD_MS); -#ifdef CONFIG_IDF_TARGET_ESP32 - write_reg(sensor->slv_addr, 0xfe, 0x00); - //ensure pclk <= 15MHz for esp32 - set_reg_bits(sensor->slv_addr, 0xf8, 0, 0x3f, 2); // divx4 - set_reg_bits(sensor->slv_addr, 0xfa, 4, 0x0f, 2); // divide_by -#endif - - } - return ret; -} - -static int set_pixformat(sensor_t *sensor, pixformat_t pixformat) -{ - int ret = 0; - - switch (pixformat) { - case PIXFORMAT_RGB565: - write_reg(sensor->slv_addr, 0xfe, 0x00); - ret = set_reg_bits(sensor->slv_addr, P0_OUTPUT_FORMAT, 0, 0x1f, 6); //RGB565 - break; - - case PIXFORMAT_YUV422: - write_reg(sensor->slv_addr, 0xfe, 0x00); - ret = set_reg_bits(sensor->slv_addr, P0_OUTPUT_FORMAT, 0, 0x1f, 2); //yuv422 - break; - default: - ESP_LOGW(TAG, "unsupport format"); - ret = -1; - break; - } - - if (ret == 0) { - sensor->pixformat = pixformat; - ESP_LOGD(TAG, "Set pixformat to: %u", pixformat); - } - return ret; -} - -static int set_framesize(sensor_t *sensor, framesize_t framesize) -{ - int ret = 0; - if (framesize > FRAMESIZE_UXGA) { - ESP_LOGW(TAG, "Invalid framesize: %u", framesize); - framesize = FRAMESIZE_UXGA; - } - sensor->status.framesize = framesize; - uint16_t w = resolution[framesize].width; - uint16_t h = resolution[framesize].height; - uint16_t row_s = (resolution[FRAMESIZE_UXGA].height - h) / 2; - uint16_t col_s = (resolution[FRAMESIZE_UXGA].width - w) / 2; - -#if CONFIG_GC_SENSOR_SUBSAMPLE_MODE - struct subsample_cfg { - uint16_t ratio_numerator; - uint16_t ratio_denominator; - uint8_t reg0x99; - uint8_t reg0x9b; - uint8_t reg0x9c; - uint8_t reg0x9d; - uint8_t reg0x9e; - uint8_t reg0x9f; - uint8_t reg0xa0; - uint8_t reg0xa1; - uint8_t reg0xa2; - }; - const struct subsample_cfg subsample_cfgs[] = { // define some subsample ratio - // {60, 420, 0x77, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, //1/7 // A smaller ratio brings a larger view, but it reduces the frame rate - // {84, 420, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, //1/5 - // {105, 420, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},//1/4 - {140, 420, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},//1/3 - {210, 420, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},//1/2 - {240, 420, 0x77, 0x02, 0x46, 0x02, 0x46, 0x02, 0x46, 0x02, 0x46},//4/7 - {252, 420, 0x55, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04},//3/5 - {280, 420, 0x33, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00},//2/3 - {420, 420, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},//1/1 - }; - uint16_t win_w = resolution[FRAMESIZE_UXGA].width; - uint16_t win_h = resolution[FRAMESIZE_UXGA].height; - const struct subsample_cfg *cfg = NULL; - /** - * Strategy: try to keep the maximum perspective - */ - uint8_t i = 0; - if (framesize >= FRAMESIZE_QVGA) { - i = 1; - } - for (; i < sizeof(subsample_cfgs) / sizeof(struct subsample_cfg); i++) { - cfg = &subsample_cfgs[i]; - if ((win_w * cfg->ratio_numerator / cfg->ratio_denominator >= w) && (win_h * cfg->ratio_numerator / cfg->ratio_denominator >= h)) { - win_w = w * cfg->ratio_denominator / cfg->ratio_numerator; - win_h = h * cfg->ratio_denominator / cfg->ratio_numerator; - row_s = (resolution[FRAMESIZE_UXGA].height - win_h) / 2; - col_s = (resolution[FRAMESIZE_UXGA].width - win_w) / 2; - ESP_LOGI(TAG, "subsample win:%dx%d, ratio:%f", win_w, win_h, (float)cfg->ratio_numerator / (float)cfg->ratio_denominator); - break; - } - } - - write_reg(sensor->slv_addr, 0xfe, 0x00); - write_reg(sensor->slv_addr, P0_CROP_ENABLE, 0x01); - write_reg(sensor->slv_addr, 0x09, H8(row_s)); - write_reg(sensor->slv_addr, 0x0a, L8(row_s)); - write_reg(sensor->slv_addr, 0x0b, H8(col_s)); - write_reg(sensor->slv_addr, 0x0c, L8(col_s)); - write_reg(sensor->slv_addr, 0x0d, H8(win_h + 8)); - write_reg(sensor->slv_addr, 0x0e, L8(win_h + 8)); - write_reg(sensor->slv_addr, 0x0f, H8(win_w + 16)); - write_reg(sensor->slv_addr, 0x10, L8(win_w + 16)); - - write_reg(sensor->slv_addr, 0x99, cfg->reg0x99); - write_reg(sensor->slv_addr, 0x9b, cfg->reg0x9b); - write_reg(sensor->slv_addr, 0x9c, cfg->reg0x9c); - write_reg(sensor->slv_addr, 0x9d, cfg->reg0x9d); - write_reg(sensor->slv_addr, 0x9e, cfg->reg0x9e); - write_reg(sensor->slv_addr, 0x9f, cfg->reg0x9f); - write_reg(sensor->slv_addr, 0xa0, cfg->reg0xa0); - write_reg(sensor->slv_addr, 0xa1, cfg->reg0xa1); - write_reg(sensor->slv_addr, 0xa2, cfg->reg0xa2); - - write_reg(sensor->slv_addr, 0x95, H8(h)); - write_reg(sensor->slv_addr, 0x96, L8(h)); - write_reg(sensor->slv_addr, 0x97, H8(w)); - write_reg(sensor->slv_addr, 0x98, L8(w)); - - -#elif CONFIG_GC_SENSOR_WINDOWING_MODE - write_reg(sensor->slv_addr, 0xfe, 0x00); - - write_reg(sensor->slv_addr, P0_CROP_ENABLE, 0x01); - // write_reg(sensor->slv_addr, 0xec, col_s / 8); //measure window - // write_reg(sensor->slv_addr, 0xed, row_s / 8); - // write_reg(sensor->slv_addr, 0xee, (col_s + h) / 8); - // write_reg(sensor->slv_addr, 0xef, (row_s + w) / 8); - - write_reg(sensor->slv_addr, 0x09, H8(row_s)); - write_reg(sensor->slv_addr, 0x0a, L8(row_s)); - write_reg(sensor->slv_addr, 0x0b, H8(col_s)); - write_reg(sensor->slv_addr, 0x0c, L8(col_s)); - write_reg(sensor->slv_addr, 0x0d, H8(h + 8)); - write_reg(sensor->slv_addr, 0x0e, L8(h + 8)); - write_reg(sensor->slv_addr, 0x0f, H8(w + 8)); - write_reg(sensor->slv_addr, 0x10, L8(w + 8)); - - write_reg(sensor->slv_addr, 0x95, H8(h)); - write_reg(sensor->slv_addr, 0x96, L8(h)); - write_reg(sensor->slv_addr, 0x97, H8(w)); - write_reg(sensor->slv_addr, 0x98, L8(w)); - -#endif - - if (ret == 0) { - ESP_LOGD(TAG, "Set framesize to: %ux%u", w, h); - } - return ret; - -} - -static int set_hmirror(sensor_t *sensor, int enable) -{ - int ret = 0; - sensor->status.hmirror = enable; - ret = write_reg(sensor->slv_addr, 0xfe, 0x00); - ret |= set_reg_bits(sensor->slv_addr, P0_ANALOG_MODE1, 0, 0x01, enable != 0); - if (ret == 0) { - ESP_LOGD(TAG, "Set h-mirror to: %d", enable); - } - return ret; -} - -static int set_vflip(sensor_t *sensor, int enable) -{ - int ret = 0; - sensor->status.vflip = enable; - ret = write_reg(sensor->slv_addr, 0xfe, 0x00); - ret |= set_reg_bits(sensor->slv_addr, P0_ANALOG_MODE1, 1, 0x01, enable != 0); - if (ret == 0) { - ESP_LOGD(TAG, "Set v-flip to: %d", enable); - } - return ret; -} - -static int set_colorbar(sensor_t *sensor, int enable) -{ - int ret = 0; - // ret = write_reg(sensor->slv_addr, 0xfe, 0x00); - // ret |= set_reg_bits(sensor->slv_addr, P0_DEBUG_MODE3, 3, 0x01, enable); - if (ret == 0) { - sensor->status.colorbar = enable; - ESP_LOGD(TAG, "Set colorbar to: %d", enable); - } - return ret; -} - -static int get_reg(sensor_t *sensor, int reg, int mask) -{ - int ret = 0; - if (mask > 0xFF) { - ESP_LOGE(TAG, "mask should not more than 0xff"); - } else { - ret = read_reg(sensor->slv_addr, reg); - } - if (ret > 0) { - ret &= mask; - } - return ret; -} - -static int set_reg(sensor_t *sensor, int reg, int mask, int value) -{ - int ret = 0; - if (mask > 0xFF) { - ESP_LOGE(TAG, "mask should not more than 0xff"); - } else { - ret = read_reg(sensor->slv_addr, reg); - } - if (ret < 0) { - return ret; - } - value = (ret & ~mask) | (value & mask); - - if (mask > 0xFF) { - - } else { - ret = write_reg(sensor->slv_addr, reg, value); - } - return ret; -} - -static int init_status(sensor_t *sensor) -{ - write_reg(sensor->slv_addr, 0xfe, 0x00); - sensor->status.brightness = 0; - sensor->status.contrast = 0; - sensor->status.saturation = 0; - sensor->status.sharpness = 0; - sensor->status.denoise = 0; - sensor->status.ae_level = 0; - sensor->status.gainceiling = 0; - sensor->status.awb = 0; - sensor->status.dcw = 0; - sensor->status.agc = 0; - sensor->status.aec = 0; - sensor->status.hmirror = check_reg_mask(sensor->slv_addr, P0_ANALOG_MODE1, 0x01); - sensor->status.vflip = check_reg_mask(sensor->slv_addr, P0_ANALOG_MODE1, 0x02); - sensor->status.colorbar = 0; - sensor->status.bpc = 0; - sensor->status.wpc = 0; - sensor->status.raw_gma = 0; - sensor->status.lenc = 0; - sensor->status.quality = 0; - sensor->status.special_effect = 0; - sensor->status.wb_mode = 0; - sensor->status.awb_gain = 0; - sensor->status.agc_gain = 0; - sensor->status.aec_value = 0; - sensor->status.aec2 = 0; - - print_regs(sensor->slv_addr); - return 0; -} - -static int set_dummy(sensor_t *sensor, int val) -{ - ESP_LOGW(TAG, "Unsupported"); - return -1; -} -static int set_gainceiling_dummy(sensor_t *sensor, gainceiling_t val) -{ - ESP_LOGW(TAG, "Unsupported"); - return -1; -} - -int gc2145_detect(int slv_addr, sensor_id_t *id) -{ - if (GC2145_SCCB_ADDR == slv_addr) { - uint8_t MIDL = SCCB_Read(slv_addr, CHIP_ID_LOW); - uint8_t MIDH = SCCB_Read(slv_addr, CHIP_ID_HIGH); - uint16_t PID = MIDH << 8 | MIDL; - if (GC2145_PID == PID) { - id->PID = PID; - return PID; - } else { - ESP_LOGI(TAG, "Mismatch PID=0x%x", PID); - } - } - return 0; -} - -int gc2145_init(sensor_t *sensor) -{ - sensor->init_status = init_status; - sensor->reset = reset; - sensor->set_pixformat = set_pixformat; - sensor->set_framesize = set_framesize; - sensor->set_contrast = set_dummy; - sensor->set_brightness = set_dummy; - sensor->set_saturation = set_dummy; - sensor->set_sharpness = set_dummy; - sensor->set_denoise = set_dummy; - sensor->set_gainceiling = set_gainceiling_dummy; - sensor->set_quality = set_dummy; - sensor->set_colorbar = set_colorbar; - sensor->set_whitebal = set_dummy; - sensor->set_gain_ctrl = set_dummy; - sensor->set_exposure_ctrl = set_dummy; - sensor->set_hmirror = set_hmirror; - sensor->set_vflip = set_vflip; - - sensor->set_aec2 = set_dummy; - sensor->set_awb_gain = set_dummy; - sensor->set_agc_gain = set_dummy; - sensor->set_aec_value = set_dummy; - - sensor->set_special_effect = set_dummy; - sensor->set_wb_mode = set_dummy; - sensor->set_ae_level = set_dummy; - - sensor->set_dcw = set_dummy; - sensor->set_bpc = set_dummy; - sensor->set_wpc = set_dummy; - - sensor->set_raw_gma = set_dummy; - sensor->set_lenc = set_dummy; - - sensor->get_reg = get_reg; - sensor->set_reg = set_reg; - sensor->set_res_raw = NULL; - sensor->set_pll = NULL; - sensor->set_xclk = NULL; - - ESP_LOGD(TAG, "GC2145 Attached"); - return 0; -} diff --git a/lib/libesp32_div/esp32-camera/sensors/nt99141.c b/lib/libesp32_div/esp32-camera/sensors/nt99141.c deleted file mode 100644 index 86a8b8a0b..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/nt99141.c +++ /dev/null @@ -1,1022 +0,0 @@ -/* - * This file is part of the OpenMV project. - * Copyright (c) 2013/2014 Ibrahim Abdelkader - * This work is licensed under the MIT license, see the file LICENSE for details. - * - * NT99141 driver. - * - */ -#include -#include -#include -#include "sccb.h" -#include "xclk.h" -#include "nt99141.h" -#include "nt99141_regs.h" -#include "nt99141_settings.h" -#include "freertos/FreeRTOS.h" -#include "freertos/task.h" - -#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) -#include "esp32-hal-log.h" -#else -#include "esp_log.h" -static const char *TAG = "NT99141"; -#endif - -//#define REG_DEBUG_ON - -static int read_reg(uint8_t slv_addr, const uint16_t reg) -{ - int ret = SCCB_Read16(slv_addr, reg); -#ifdef REG_DEBUG_ON - - if (ret < 0) { - ESP_LOGE(TAG, "READ REG 0x%04x FAILED: %d", reg, ret); - } - -#endif - return ret; -} - -static int check_reg_mask(uint8_t slv_addr, uint16_t reg, uint8_t mask) -{ - return (read_reg(slv_addr, reg) & mask) == mask; -} - -static int read_reg16(uint8_t slv_addr, const uint16_t reg) -{ - int ret = 0, ret2 = 0; - ret = read_reg(slv_addr, reg); - - if (ret >= 0) { - ret = (ret & 0xFF) << 8; - ret2 = read_reg(slv_addr, reg + 1); - - if (ret2 < 0) { - ret = ret2; - } else { - ret |= ret2 & 0xFF; - } - } - - return ret; -} - - -static int write_reg(uint8_t slv_addr, const uint16_t reg, uint8_t value) -{ - int ret = 0; -#ifndef REG_DEBUG_ON - ret = SCCB_Write16(slv_addr, reg, value); -#else - int old_value = read_reg(slv_addr, reg); - - if (old_value < 0) { - return old_value; - } - - if ((uint8_t)old_value != value) { - ESP_LOGD(TAG, "NEW REG 0x%04x: 0x%02x to 0x%02x", reg, (uint8_t)old_value, value); - ret = SCCB_Write16(slv_addr, reg, value); - } else { - ESP_LOGD(TAG, "OLD REG 0x%04x: 0x%02x", reg, (uint8_t)old_value); - ret = SCCB_Write16(slv_addr, reg, value);//maybe not? - } - - if (ret < 0) { - ESP_LOGE(TAG, "WRITE REG 0x%04x FAILED: %d", reg, ret); - } - -#endif - return ret; -} - -static int set_reg_bits(uint8_t slv_addr, uint16_t reg, uint8_t offset, uint8_t mask, uint8_t value) -{ - int ret = 0; - uint8_t c_value, new_value; - ret = read_reg(slv_addr, reg); - - if (ret < 0) { - return ret; - } - - c_value = ret; - new_value = (c_value & ~(mask << offset)) | ((value & mask) << offset); - ret = write_reg(slv_addr, reg, new_value); - return ret; -} - -static int write_regs(uint8_t slv_addr, const uint16_t (*regs)[2]) -{ - int i = 0, ret = 0; - - while (!ret && regs[i][0] != REGLIST_TAIL) { - if (regs[i][0] == REG_DLY) { - vTaskDelay(regs[i][1] / portTICK_PERIOD_MS); - } else { - ret = write_reg(slv_addr, regs[i][0], regs[i][1]); - } - - i++; - } - - return ret; -} - -static int write_reg16(uint8_t slv_addr, const uint16_t reg, uint16_t value) -{ - if (write_reg(slv_addr, reg, value >> 8) || write_reg(slv_addr, reg + 1, value)) { - return -1; - } - - return 0; -} - -static int write_addr_reg(uint8_t slv_addr, const uint16_t reg, uint16_t x_value, uint16_t y_value) -{ - if (write_reg16(slv_addr, reg, x_value) || write_reg16(slv_addr, reg + 2, y_value)) { - return -1; - } - - return 0; -} - -#define write_reg_bits(slv_addr, reg, mask, enable) set_reg_bits(slv_addr, reg, 0, mask, enable?mask:0) - -static int set_pll(sensor_t *sensor, bool bypass, uint8_t multiplier, uint8_t sys_div, uint8_t pre_div, bool root_2x, uint8_t seld5, bool pclk_manual, uint8_t pclk_div) -{ - return -1; -} - -static int set_ae_level(sensor_t *sensor, int level); - -static int reset(sensor_t *sensor) -{ - - int ret = 0; - // Software Reset: clear all registers and reset them to their default values - ret = write_reg(sensor->slv_addr, SYSTEM_CTROL0, 0x01); - - if (ret) { - ESP_LOGE(TAG, "Software Reset FAILED!"); - return ret; - } - - vTaskDelay(100 / portTICK_PERIOD_MS); - ret = write_regs(sensor->slv_addr, sensor_default_regs); //re-initial - - if (ret == 0) { - ESP_LOGD(TAG, "Camera defaults loaded"); - ret = set_ae_level(sensor, 0); - vTaskDelay(100 / portTICK_PERIOD_MS); - } - - return ret; -} - -static int set_pixformat(sensor_t *sensor, pixformat_t pixformat) -{ - int ret = 0; - const uint16_t (*regs)[2]; - - switch (pixformat) { - case PIXFORMAT_YUV422: - regs = sensor_fmt_yuv422; - break; - - case PIXFORMAT_GRAYSCALE: - regs = sensor_fmt_grayscale; - break; - - case PIXFORMAT_RGB565: - case PIXFORMAT_RGB888: - regs = sensor_fmt_rgb565; - break; - - case PIXFORMAT_JPEG: - regs = sensor_fmt_jpeg; - break; - - case PIXFORMAT_RAW: - regs = sensor_fmt_raw; - break; - - default: - ESP_LOGE(TAG, "Unsupported pixformat: %u", pixformat); - return -1; - } - - ret = write_regs(sensor->slv_addr, regs); - - if (ret == 0) { - sensor->pixformat = pixformat; - ESP_LOGD(TAG, "Set pixformat to: %u", pixformat); - } - - return ret; -} - -static int set_image_options(sensor_t *sensor) -{ - int ret = 0; - uint8_t reg20 = 0; - uint8_t reg21 = 0; - uint8_t reg4514 = 0; - uint8_t reg4514_test = 0; - - // V-Flip - if (sensor->status.vflip) { - reg20 |= 0x01; - reg4514_test |= 1; - } - - // H-Mirror - if (sensor->status.hmirror) { - reg21 |= 0x02; - reg4514_test |= 2; - } - - switch (reg4514_test) { - - } - - if (write_reg(sensor->slv_addr, TIMING_TC_REG20, reg20 | reg21)) { - ESP_LOGE(TAG, "Setting Image Options Failed"); - ret = -1; - } - - ESP_LOGD(TAG, "Set Image Options: Compression: %u, Binning: %u, V-Flip: %u, H-Mirror: %u, Reg-4514: 0x%02x", - sensor->pixformat == PIXFORMAT_JPEG, sensor->status.binning, sensor->status.vflip, sensor->status.hmirror, reg4514); - return ret; -} - -static int set_framesize(sensor_t *sensor, framesize_t framesize) -{ - int ret = 0; - - sensor->status.framesize = framesize; - ret = write_regs(sensor->slv_addr, sensor_default_regs); - - if (framesize == FRAMESIZE_QVGA) { - ESP_LOGD(TAG, "Set FRAMESIZE_QVGA"); - ret = write_regs(sensor->slv_addr, sensor_framesize_QVGA); -#if CONFIG_NT99141_SUPPORT_XSKIP - ESP_LOGD(TAG, "Set FRAMESIZE_QVGA: xskip mode"); - ret = write_regs(sensor->slv_addr, sensor_framesize_QVGA_xskip); -#elif CONFIG_NT99141_SUPPORT_CROP - ESP_LOGD(TAG, "Set FRAMESIZE_QVGA: crop mode"); - ret = write_regs(sensor->slv_addr, sensor_framesize_QVGA_crop); -#endif - } else if (framesize == FRAMESIZE_VGA) { - ESP_LOGD(TAG, "Set FRAMESIZE_VGA"); - // ret = write_regs(sensor->slv_addr, sensor_framesize_VGA); - ret = write_regs(sensor->slv_addr, sensor_framesize_VGA_xyskip);// Resolution:640*360 This configuration is equally-scaled without deforming -#ifdef CONFIG_NT99141_SUPPORT_XSKIP - ESP_LOGD(TAG, "Set FRAMESIZE_QVGA: xskip mode"); - ret = write_regs(sensor->slv_addr, sensor_framesize_VGA_xskip); -#elif CONFIG_NT99141_SUPPORT_CROP - ESP_LOGD(TAG, "Set FRAMESIZE_QVGA: crop mode"); - ret = write_regs(sensor->slv_addr, sensor_framesize_VGA_crop); -#endif - } else if (framesize >= FRAMESIZE_HD) { - ESP_LOGD(TAG, "Set FRAMESIZE_HD"); - ret = write_regs(sensor->slv_addr, sensor_framesize_HD); - } else { - ESP_LOGD(TAG, "Dont suppost this size, Set FRAMESIZE_VGA"); - ret = write_regs(sensor->slv_addr, sensor_framesize_VGA); - } - - return ret; -} - -static int set_hmirror(sensor_t *sensor, int enable) -{ - int ret = 0; - sensor->status.hmirror = enable; - ret = set_image_options(sensor); - - if (ret == 0) { - ESP_LOGD(TAG, "Set h-mirror to: %d", enable); - } - - return ret; -} - -static int set_vflip(sensor_t *sensor, int enable) -{ - int ret = 0; - sensor->status.vflip = enable; - ret = set_image_options(sensor); - - if (ret == 0) { - ESP_LOGD(TAG, "Set v-flip to: %d", enable); - } - - return ret; -} - -static int set_quality(sensor_t *sensor, int qs) -{ - int ret = 0; - ret = write_reg(sensor->slv_addr, COMPRESSION_CTRL07, qs & 0x3f); - - if (ret == 0) { - sensor->status.quality = qs; - ESP_LOGD(TAG, "Set quality to: %d", qs); - } - - return ret; -} - -static int set_colorbar(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = write_reg_bits(sensor->slv_addr, PRE_ISP_TEST_SETTING_1, TEST_COLOR_BAR, enable); - - if (ret == 0) { - sensor->status.colorbar = enable; - ESP_LOGD(TAG, "Set colorbar to: %d", enable); - } - - return ret; -} - -static int set_gain_ctrl(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = write_reg_bits(sensor->slv_addr, 0x32bb, 0x87, enable); - - if (ret == 0) { - ESP_LOGD(TAG, "Set gain_ctrl to: %d", enable); - sensor->status.agc = enable; - } - - return ret; -} - -static int set_exposure_ctrl(sensor_t *sensor, int enable) -{ - int ret = 0; - int data = 0; - // ret = write_reg_bits(sensor->slv_addr, 0x32bb, 0x87, enable); - data = read_reg(sensor->slv_addr, 0x3201); - ESP_LOGD(TAG, "set_exposure_ctrl:enable"); - if (enable) { - ESP_LOGD(TAG, "set_exposure_ctrl:enable"); - ret = write_reg(sensor->slv_addr, 0x3201, (1 << 5) | data); - } else { - ESP_LOGD(TAG, "set_exposure_ctrl:disable"); - ret = write_reg(sensor->slv_addr, 0x3201, (~(1 << 5)) & data); - } - - if (ret == 0) { - ESP_LOGD(TAG, "Set exposure_ctrl to: %d", enable); - sensor->status.aec = enable; - } - - return ret; -} - -static int set_whitebal(sensor_t *sensor, int enable) -{ - int ret = 0; - - if (ret == 0) { - ESP_LOGD(TAG, "Set awb to: %d", enable); - sensor->status.awb = enable; - } - - return ret; -} - -//Advanced AWB -static int set_dcw_dsp(sensor_t *sensor, int enable) -{ - int ret = 0; - - if (ret == 0) { - ESP_LOGD(TAG, "Set dcw to: %d", enable); - sensor->status.dcw = enable; - } - - return ret; -} - -//night mode enable -static int set_aec2(sensor_t *sensor, int enable) -{ - int ret = 0; - - if (ret == 0) { - ESP_LOGD(TAG, "Set aec2 to: %d", enable); - sensor->status.aec2 = enable; - } - - return ret; -} - -static int set_bpc_dsp(sensor_t *sensor, int enable) -{ - int ret = 0; - - if (ret == 0) { - ESP_LOGD(TAG, "Set bpc to: %d", enable); - sensor->status.bpc = enable; - } - - return ret; -} - -static int set_wpc_dsp(sensor_t *sensor, int enable) -{ - int ret = 0; - - if (ret == 0) { - ESP_LOGD(TAG, "Set wpc to: %d", enable); - sensor->status.wpc = enable; - } - - return ret; -} - -//Gamma enable -static int set_raw_gma_dsp(sensor_t *sensor, int enable) -{ - int ret = 0; - - if (ret == 0) { - ESP_LOGD(TAG, "Set raw_gma to: %d", enable); - sensor->status.raw_gma = enable; - } - - return ret; -} - -static int set_lenc_dsp(sensor_t *sensor, int enable) -{ - int ret = 0; - - if (ret == 0) { - ESP_LOGD(TAG, "Set lenc to: %d", enable); - sensor->status.lenc = enable; - } - - return ret; -} - -static int get_agc_gain(sensor_t *sensor) -{ - ESP_LOGD(TAG, "get_agc_gain can not be configured at present"); - return 0; -} - -//real gain -static int set_agc_gain(sensor_t *sensor, int gain) -{ - ESP_LOGD(TAG, "set_agc_gain can not be configured at present"); - // ESP_LOGD(TAG, "GAIN = %d\n", gain); - int cnt = gain / 2; - - switch (cnt) { - case 0: - ESP_LOGD(TAG, "set_agc_gain: 1x"); - write_reg(sensor->slv_addr, 0X301D, 0X00); - break; - - case 1: - ESP_LOGD(TAG,"set_agc_gain: 2x"); - write_reg(sensor->slv_addr, 0X301D, 0X0F); - break; - - case 2: - ESP_LOGD(TAG,"set_agc_gain: 4x"); - write_reg(sensor->slv_addr, 0X301D, 0X2F); - break; - - case 3: - ESP_LOGD(TAG,"set_agc_gain: 6x"); - write_reg(sensor->slv_addr, 0X301D, 0X37); - break; - - case 4: - ESP_LOGD(TAG,"set_agc_gain: 8x"); - write_reg(sensor->slv_addr, 0X301D, 0X3F); - break; - - default: - ESP_LOGD(TAG,"fail set_agc_gain"); - break; - } - - return 0; -} - -static int get_aec_value(sensor_t *sensor) -{ - ESP_LOGD(TAG, "get_aec_value can not be configured at present"); - return 0; -} - -static int set_aec_value(sensor_t *sensor, int value) -{ - ESP_LOGD(TAG, "set_aec_value can not be configured at present"); - int ret = 0; - // ESP_LOGD(TAG, " set_aec_value to: %d", value); - ret = write_reg_bits(sensor->slv_addr, 0x3012, 0x00, (value >> 8) & 0xff); - ret = write_reg_bits(sensor->slv_addr, 0x3013, 0x01, value & 0xff); - - if (ret == 0) { - ESP_LOGD(TAG, " set_aec_value to: %d", value); - // sensor->status.aec = enable; - } - - return ret; -} - -static int set_ae_level(sensor_t *sensor, int level) -{ - ESP_LOGD(TAG, "set_ae_level can not be configured at present"); - int ret = 0; - - if (level < 0) { - level = 0; - } else if (level > 9) { - level = 9; - } - - for (int i = 0; i < 5; i++) { - ret += write_reg(sensor->slv_addr, sensor_ae_level[ 5 * level + i ][0], sensor_ae_level[5 * level + i ][1]); - } - - if (ret) { - ESP_LOGE(TAG, " fail to set ae level: %d", ret); - } - - return 0; -} - -static int set_wb_mode(sensor_t *sensor, int mode) -{ - int ret = 0; - - if (mode < 0 || mode > 4) { - return -1; - } - - ret = write_reg(sensor->slv_addr, 0x3201, (mode != 0)); - - if (ret) { - return ret; - } - - switch (mode) { - case 1://Sunny - ret = write_reg16(sensor->slv_addr, 0x3290, 0x01) - || write_reg16(sensor->slv_addr, 0x3291, 0x38) - || write_reg16(sensor->slv_addr, 0x3296, 0x01) - || write_reg16(sensor->slv_addr, 0x3297, 0x68) - || write_reg16(sensor->slv_addr, 0x3060, 0x01); - - break; - - case 2://Cloudy - - ret = write_reg16(sensor->slv_addr, 0x3290, 0x01) - || write_reg16(sensor->slv_addr, 0x3291, 0x51) - || write_reg16(sensor->slv_addr, 0x3296, 0x01) - || write_reg16(sensor->slv_addr, 0x3297, 0x00) - || write_reg16(sensor->slv_addr, 0x3060, 0x01); - break; - - case 3://INCANDESCENCE] - ret = write_reg16(sensor->slv_addr, 0x3290, 0x01) - || write_reg16(sensor->slv_addr, 0x3291, 0x30) - || write_reg16(sensor->slv_addr, 0x3296, 0x01) - || write_reg16(sensor->slv_addr, 0x3297, 0xCB) - || write_reg16(sensor->slv_addr, 0x3060, 0x01); - break; - - case 4://FLUORESCENT - ret = write_reg16(sensor->slv_addr, 0x3290, 0x01) - || write_reg16(sensor->slv_addr, 0x3291, 0x70) - || write_reg16(sensor->slv_addr, 0x3296, 0x01) - || write_reg16(sensor->slv_addr, 0x3297, 0xFF) - || write_reg16(sensor->slv_addr, 0x3060, 0x01); - break; - - default://AUTO - break; - } - - if (ret == 0) { - ESP_LOGD(TAG, "Set wb_mode to: %d", mode); - sensor->status.wb_mode = mode; - } - - return ret; -} - -static int set_awb_gain_dsp(sensor_t *sensor, int enable) -{ - int ret = 0; - int old_mode = sensor->status.wb_mode; - int mode = enable ? old_mode : 0; - - ret = set_wb_mode(sensor, mode); - - if (ret == 0) { - sensor->status.wb_mode = old_mode; - ESP_LOGD(TAG, "Set awb_gain to: %d", enable); - sensor->status.awb_gain = enable; - } - - return ret; -} - -static int set_special_effect(sensor_t *sensor, int effect) -{ - int ret = 0; - - if (effect < 0 || effect > 6) { - return -1; - } - - uint8_t *regs = (uint8_t *)sensor_special_effects[effect]; - ret = write_reg(sensor->slv_addr, 0x32F1, regs[0]) - || write_reg(sensor->slv_addr, 0x32F4, regs[1]) - || write_reg(sensor->slv_addr, 0x32F5, regs[2]) - || write_reg(sensor->slv_addr, 0x3060, regs[3]); - - if (ret == 0) { - ESP_LOGD(TAG, "Set special_effect to: %d", effect); - sensor->status.special_effect = effect; - } - - return ret; -} - -static int set_brightness(sensor_t *sensor, int level) -{ - int ret = 0; - uint8_t value = 0; - - switch (level) { - case 3: - value = 0xA0; - break; - - case 2: - value = 0x90; - break; - - case 1: - value = 0x88; - break; - - case -1: - value = 0x78; - break; - - case -2: - value = 0x70; - break; - - case -3: - value = 0x60; - break; - - default: // 0 - break; - } - - ret = write_reg(sensor->slv_addr, 0x32F2, value); - - if (ret == 0) { - ESP_LOGD(TAG, "Set brightness to: %d", level); - sensor->status.brightness = level; - } - - return ret; -} - -static int set_contrast(sensor_t *sensor, int level) -{ - int ret = 0; - uint8_t value1 = 0, value2 = 0 ; - - switch (level) { - case 3: - value1 = 0xD0; - value2 = 0xB0; - break; - - case 2: - value1 = 0xE0; - value2 = 0xA0; - break; - - case 1: - value1 = 0xF0; - value2 = 0x90; - break; - - case 0: - value1 = 0x00; - value2 = 0x80; - break; - - case -1: - value1 = 0x10; - value2 = 0x70; - break; - - case -2: - value1 = 0x20; - value2 = 0x60; - break; - - case -3: - value1 = 0x30; - value2 = 0x50; - break; - - default: // 0 - break; - } - - ret = write_reg(sensor->slv_addr, 0x32FC, value1); - ret = write_reg(sensor->slv_addr, 0x32F2, value2); - ret = write_reg(sensor->slv_addr, 0x3060, 0x01); - - if (ret == 0) { - ESP_LOGD(TAG, "Set contrast to: %d", level); - sensor->status.contrast = level; - } - - return ret; -} - -static int set_saturation(sensor_t *sensor, int level) -{ - int ret = 0; - - if (level > 4 || level < -4) { - return -1; - } - - uint8_t *regs = (uint8_t *)sensor_saturation_levels[level + 4]; - { - ret = write_reg(sensor->slv_addr, 0x32F3, regs[0]); - - if (ret) { - return ret; - } - } - - if (ret == 0) { - ESP_LOGD(TAG, "Set saturation to: %d", level); - sensor->status.saturation = level; - } - - return ret; -} - -static int set_sharpness(sensor_t *sensor, int level) -{ - int ret = 0; - - if (level > 3 || level < -3) { - return -1; - } - - uint8_t mt_offset_2 = (level + 3) * 8; - uint8_t mt_offset_1 = mt_offset_2 + 1; - - ret = write_reg_bits(sensor->slv_addr, 0x5308, 0x40, false)//0x40 means auto - || write_reg(sensor->slv_addr, 0x5300, 0x10) - || write_reg(sensor->slv_addr, 0x5301, 0x10) - || write_reg(sensor->slv_addr, 0x5302, mt_offset_1) - || write_reg(sensor->slv_addr, 0x5303, mt_offset_2) - || write_reg(sensor->slv_addr, 0x5309, 0x10) - || write_reg(sensor->slv_addr, 0x530a, 0x10) - || write_reg(sensor->slv_addr, 0x530b, 0x04) - || write_reg(sensor->slv_addr, 0x530c, 0x06); - - if (ret == 0) { - ESP_LOGD(TAG, "Set sharpness to: %d", level); - sensor->status.sharpness = level; - } - - return ret; -} - -static int set_gainceiling(sensor_t *sensor, gainceiling_t level) -{ - ESP_LOGD(TAG, "set_gainceiling can not be configured at present"); - return 0; -} - -static int get_denoise(sensor_t *sensor) -{ - - return (read_reg(sensor->slv_addr, 0x5306) / 4) + 1; -} - -static int set_denoise(sensor_t *sensor, int level) -{ - ESP_LOGD(TAG, "set_denoise can not be configured at present"); - return 0; -} - -static int get_reg(sensor_t *sensor, int reg, int mask) -{ - int ret = 0, ret2 = 0; - - if (mask > 0xFF) { - ret = read_reg16(sensor->slv_addr, reg); - - if (ret >= 0 && mask > 0xFFFF) { - ret2 = read_reg(sensor->slv_addr, reg + 2); - - if (ret2 >= 0) { - ret = (ret << 8) | ret2 ; - } else { - ret = ret2; - } - } - } else { - ret = read_reg(sensor->slv_addr, reg); - } - - if (ret > 0) { - ret &= mask; - } - - return ret; -} - -static int set_reg(sensor_t *sensor, int reg, int mask, int value) -{ - int ret = 0, ret2 = 0; - - if (mask > 0xFF) { - ret = read_reg16(sensor->slv_addr, reg); - - if (ret >= 0 && mask > 0xFFFF) { - ret2 = read_reg(sensor->slv_addr, reg + 2); - - if (ret2 >= 0) { - ret = (ret << 8) | ret2 ; - } else { - ret = ret2; - } - } - } else { - ret = read_reg(sensor->slv_addr, reg); - } - - if (ret < 0) { - return ret; - } - - value = (ret & ~mask) | (value & mask); - - if (mask > 0xFFFF) { - ret = write_reg16(sensor->slv_addr, reg, value >> 8); - - if (ret >= 0) { - ret = write_reg(sensor->slv_addr, reg + 2, value & 0xFF); - } - } else if (mask > 0xFF) { - ret = write_reg16(sensor->slv_addr, reg, value); - } else { - ret = write_reg(sensor->slv_addr, reg, value); - } - - return ret; -} - -static int set_res_raw(sensor_t *sensor, int startX, int startY, int endX, int endY, int offsetX, int offsetY, int totalX, int totalY, int outputX, int outputY, bool scale, bool binning) -{ - int ret = 0; - ret = write_addr_reg(sensor->slv_addr, X_ADDR_ST_H, startX, startY) - || write_addr_reg(sensor->slv_addr, X_ADDR_END_H, endX, endY) - || write_addr_reg(sensor->slv_addr, X_OFFSET_H, offsetX, offsetY) - || write_addr_reg(sensor->slv_addr, X_TOTAL_SIZE_H, totalX, totalY) - || write_addr_reg(sensor->slv_addr, X_OUTPUT_SIZE_H, outputX, outputY); - - if (!ret) { - sensor->status.scale = scale; - sensor->status.binning = binning; - ret = set_image_options(sensor); - } - - return ret; -} - -static int _set_pll(sensor_t *sensor, int bypass, int multiplier, int sys_div, int root_2x, int pre_div, int seld5, int pclk_manual, int pclk_div) -{ - return set_pll(sensor, bypass > 0, multiplier, sys_div, pre_div, root_2x > 0, seld5, pclk_manual > 0, pclk_div); -} - -static int set_xclk(sensor_t *sensor, int timer, int xclk) -{ - int ret = 0; - if (xclk > 10) - { - ESP_LOGE(TAG, "only XCLK under 10MHz is supported, and XCLK is now set to 10M"); - xclk = 10; - } - sensor->xclk_freq_hz = xclk * 1000000U; - ret = xclk_timer_conf(timer, sensor->xclk_freq_hz); - return ret; -} - -int nt99141_detect(int slv_addr, sensor_id_t *id) -{ - if (NT99141_SCCB_ADDR == slv_addr) { - SCCB_Write16(slv_addr, 0x3008, 0x01);//bank sensor - uint16_t h = SCCB_Read16(slv_addr, 0x3000); - uint16_t l = SCCB_Read16(slv_addr, 0x3001); - uint16_t PID = (h<<8) | l; - if (NT99141_PID == PID) { - id->PID = PID; - return PID; - } else { - ESP_LOGI(TAG, "Mismatch PID=0x%x", PID); - } - } - return 0; -} - -static int init_status(sensor_t *sensor) -{ - sensor->status.brightness = 0; - sensor->status.contrast = 0; - sensor->status.saturation = 0; - sensor->status.sharpness = (read_reg(sensor->slv_addr, 0x3301)); - sensor->status.denoise = get_denoise(sensor); - sensor->status.ae_level = 0; - sensor->status.gainceiling = read_reg16(sensor->slv_addr, 0x32F0) & 0xFF; - sensor->status.awb = check_reg_mask(sensor->slv_addr, ISP_CONTROL_01, 0x10); - sensor->status.dcw = !check_reg_mask(sensor->slv_addr, 0x5183, 0x80); - sensor->status.agc = !check_reg_mask(sensor->slv_addr, AEC_PK_MANUAL, AEC_PK_MANUAL_AGC_MANUALEN); - sensor->status.aec = !check_reg_mask(sensor->slv_addr, AEC_PK_MANUAL, AEC_PK_MANUAL_AEC_MANUALEN); - sensor->status.hmirror = check_reg_mask(sensor->slv_addr, TIMING_TC_REG21, TIMING_TC_REG21_HMIRROR); - sensor->status.vflip = check_reg_mask(sensor->slv_addr, TIMING_TC_REG20, TIMING_TC_REG20_VFLIP); - sensor->status.colorbar = check_reg_mask(sensor->slv_addr, PRE_ISP_TEST_SETTING_1, TEST_COLOR_BAR); - sensor->status.bpc = check_reg_mask(sensor->slv_addr, 0x5000, 0x04); - sensor->status.wpc = check_reg_mask(sensor->slv_addr, 0x5000, 0x02); - sensor->status.raw_gma = check_reg_mask(sensor->slv_addr, 0x5000, 0x20); - sensor->status.lenc = check_reg_mask(sensor->slv_addr, 0x5000, 0x80); - sensor->status.quality = read_reg(sensor->slv_addr, COMPRESSION_CTRL07) & 0x3f; - sensor->status.special_effect = 0; - sensor->status.wb_mode = 0; - sensor->status.awb_gain = check_reg_mask(sensor->slv_addr, 0x3000, 0x01); - sensor->status.agc_gain = get_agc_gain(sensor); - sensor->status.aec_value = get_aec_value(sensor); - sensor->status.aec2 = check_reg_mask(sensor->slv_addr, 0x3000, 0x04); - return 0; -} - -int nt99141_init(sensor_t *sensor) -{ - sensor->reset = reset; - sensor->set_pixformat = set_pixformat; - sensor->set_framesize = set_framesize; - sensor->set_contrast = set_contrast; - sensor->set_brightness = set_brightness; - sensor->set_saturation = set_saturation; - sensor->set_sharpness = set_sharpness; - sensor->set_gainceiling = set_gainceiling; - sensor->set_quality = set_quality; - sensor->set_colorbar = set_colorbar; - sensor->set_gain_ctrl = set_gain_ctrl; - sensor->set_exposure_ctrl = set_exposure_ctrl; - sensor->set_whitebal = set_whitebal; - sensor->set_hmirror = set_hmirror; - sensor->set_vflip = set_vflip; - sensor->init_status = init_status; - sensor->set_aec2 = set_aec2; - sensor->set_aec_value = set_aec_value; - sensor->set_special_effect = set_special_effect; - sensor->set_wb_mode = set_wb_mode; - sensor->set_ae_level = set_ae_level; - sensor->set_dcw = set_dcw_dsp; - sensor->set_bpc = set_bpc_dsp; - sensor->set_wpc = set_wpc_dsp; - sensor->set_awb_gain = set_awb_gain_dsp; - sensor->set_agc_gain = set_agc_gain; - sensor->set_raw_gma = set_raw_gma_dsp; - sensor->set_lenc = set_lenc_dsp; - sensor->set_denoise = set_denoise; - - sensor->get_reg = get_reg; - sensor->set_reg = set_reg; - sensor->set_res_raw = set_res_raw; - sensor->set_pll = _set_pll; - sensor->set_xclk = set_xclk; - return 0; -} diff --git a/lib/libesp32_div/esp32-camera/sensors/ov2640.c b/lib/libesp32_div/esp32-camera/sensors/ov2640.c deleted file mode 100644 index 7e3d77174..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/ov2640.c +++ /dev/null @@ -1,612 +0,0 @@ -/* - * This file is part of the OpenMV project. - * Copyright (c) 2013/2014 Ibrahim Abdelkader - * This work is licensed under the MIT license, see the file LICENSE for details. - * - * OV2640 driver. - * - */ -#include -#include -#include -#include "sccb.h" -#include "xclk.h" -#include "ov2640.h" -#include "ov2640_regs.h" -#include "ov2640_settings.h" -#include "freertos/FreeRTOS.h" -#include "freertos/task.h" - -#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) -#include "esp32-hal-log.h" -#else -#include "esp_log.h" -static const char* TAG = "ov2640"; -#endif - -static volatile ov2640_bank_t reg_bank = BANK_MAX; -static int set_bank(sensor_t *sensor, ov2640_bank_t bank) -{ - int res = 0; - if (bank != reg_bank) { - reg_bank = bank; - res = SCCB_Write(sensor->slv_addr, BANK_SEL, bank); - } - return res; -} - -static int write_regs(sensor_t *sensor, const uint8_t (*regs)[2]) -{ - int i=0, res = 0; - while (regs[i][0]) { - if (regs[i][0] == BANK_SEL) { - res = set_bank(sensor, regs[i][1]); - } else { - res = SCCB_Write(sensor->slv_addr, regs[i][0], regs[i][1]); - } - if (res) { - return res; - } - i++; - } - return res; -} - -static int write_reg(sensor_t *sensor, ov2640_bank_t bank, uint8_t reg, uint8_t value) -{ - int ret = set_bank(sensor, bank); - if(!ret) { - ret = SCCB_Write(sensor->slv_addr, reg, value); - } - return ret; -} - -static int set_reg_bits(sensor_t *sensor, uint8_t bank, uint8_t reg, uint8_t offset, uint8_t mask, uint8_t value) -{ - int ret = 0; - uint8_t c_value, new_value; - - ret = set_bank(sensor, bank); - if(ret) { - return ret; - } - c_value = SCCB_Read(sensor->slv_addr, reg); - new_value = (c_value & ~(mask << offset)) | ((value & mask) << offset); - ret = SCCB_Write(sensor->slv_addr, reg, new_value); - return ret; -} - -static int read_reg(sensor_t *sensor, ov2640_bank_t bank, uint8_t reg) -{ - if(set_bank(sensor, bank)){ - return 0; - } - return SCCB_Read(sensor->slv_addr, reg); -} - -static uint8_t get_reg_bits(sensor_t *sensor, uint8_t bank, uint8_t reg, uint8_t offset, uint8_t mask) -{ - return (read_reg(sensor, bank, reg) >> offset) & mask; -} - -static int write_reg_bits(sensor_t *sensor, uint8_t bank, uint8_t reg, uint8_t mask, int enable) -{ - return set_reg_bits(sensor, bank, reg, 0, mask, enable?mask:0); -} - -#define WRITE_REGS_OR_RETURN(regs) ret = write_regs(sensor, regs); if(ret){return ret;} -#define WRITE_REG_OR_RETURN(bank, reg, val) ret = write_reg(sensor, bank, reg, val); if(ret){return ret;} -#define SET_REG_BITS_OR_RETURN(bank, reg, offset, mask, val) ret = set_reg_bits(sensor, bank, reg, offset, mask, val); if(ret){return ret;} - -static int reset(sensor_t *sensor) -{ - int ret = 0; - WRITE_REG_OR_RETURN(BANK_SENSOR, COM7, COM7_SRST); - vTaskDelay(10 / portTICK_PERIOD_MS); - WRITE_REGS_OR_RETURN(ov2640_settings_cif); - return ret; -} - -static int set_pixformat(sensor_t *sensor, pixformat_t pixformat) -{ - int ret = 0; - sensor->pixformat = pixformat; - switch (pixformat) { - case PIXFORMAT_RGB565: - case PIXFORMAT_RGB888: - WRITE_REGS_OR_RETURN(ov2640_settings_rgb565); - break; - case PIXFORMAT_YUV422: - case PIXFORMAT_GRAYSCALE: - WRITE_REGS_OR_RETURN(ov2640_settings_yuv422); - break; - case PIXFORMAT_JPEG: - WRITE_REGS_OR_RETURN(ov2640_settings_jpeg3); - break; - default: - ret = -1; - break; - } - if(!ret) { - vTaskDelay(10 / portTICK_PERIOD_MS); - } - - return ret; -} - -static int set_window(sensor_t *sensor, ov2640_sensor_mode_t mode, int offset_x, int offset_y, int max_x, int max_y, int w, int h){ - int ret = 0; - const uint8_t (*regs)[2]; - ov2640_clk_t c; - c.reserved = 0; - - max_x /= 4; - max_y /= 4; - w /= 4; - h /= 4; - uint8_t win_regs[][2] = { - {BANK_SEL, BANK_DSP}, - {HSIZE, max_x & 0xFF}, - {VSIZE, max_y & 0xFF}, - {XOFFL, offset_x & 0xFF}, - {YOFFL, offset_y & 0xFF}, - {VHYX, ((max_y >> 1) & 0X80) | ((offset_y >> 4) & 0X70) | ((max_x >> 5) & 0X08) | ((offset_x >> 8) & 0X07)}, - {TEST, (max_x >> 2) & 0X80}, - {ZMOW, (w)&0xFF}, - {ZMOH, (h)&0xFF}, - {ZMHH, ((h>>6)&0x04)|((w>>8)&0x03)}, - {0, 0} - }; - - if (sensor->pixformat == PIXFORMAT_JPEG) { - c.clk_2x = 0; - c.clk_div = 0; - c.pclk_auto = 0; - c.pclk_div = 8; - if(mode == OV2640_MODE_UXGA) { - c.pclk_div = 12; - } - // if (sensor->xclk_freq_hz == 16000000) { - // c.pclk_div = c.pclk_div / 2; - // } - } else { -#if CONFIG_IDF_TARGET_ESP32 - c.clk_2x = 0; -#else - c.clk_2x = 1; -#endif - c.clk_div = 7; - c.pclk_auto = 1; - c.pclk_div = 8; - if (mode == OV2640_MODE_CIF) { - c.clk_div = 3; - } else if(mode == OV2640_MODE_UXGA) { - c.pclk_div = 12; - } - } - ESP_LOGI(TAG, "Set PLL: clk_2x: %u, clk_div: %u, pclk_auto: %u, pclk_div: %u", c.clk_2x, c.clk_div, c.pclk_auto, c.pclk_div); - - if (mode == OV2640_MODE_CIF) { - regs = ov2640_settings_to_cif; - } else if (mode == OV2640_MODE_SVGA) { - regs = ov2640_settings_to_svga; - } else { - regs = ov2640_settings_to_uxga; - } - - WRITE_REG_OR_RETURN(BANK_DSP, R_BYPASS, R_BYPASS_DSP_BYPAS); - WRITE_REGS_OR_RETURN(regs); - WRITE_REGS_OR_RETURN(win_regs); - WRITE_REG_OR_RETURN(BANK_SENSOR, CLKRC, c.clk); - WRITE_REG_OR_RETURN(BANK_DSP, R_DVP_SP, c.pclk); - WRITE_REG_OR_RETURN(BANK_DSP, R_BYPASS, R_BYPASS_DSP_EN); - - vTaskDelay(10 / portTICK_PERIOD_MS); - //required when changing resolution - set_pixformat(sensor, sensor->pixformat); - - return ret; -} - -static int set_framesize(sensor_t *sensor, framesize_t framesize) -{ - int ret = 0; - uint16_t w = resolution[framesize].width; - uint16_t h = resolution[framesize].height; - aspect_ratio_t ratio = resolution[framesize].aspect_ratio; - uint16_t max_x = ratio_table[ratio].max_x; - uint16_t max_y = ratio_table[ratio].max_y; - uint16_t offset_x = ratio_table[ratio].offset_x; - uint16_t offset_y = ratio_table[ratio].offset_y; - ov2640_sensor_mode_t mode = OV2640_MODE_UXGA; - - sensor->status.framesize = framesize; - - - - if (framesize <= FRAMESIZE_CIF) { - mode = OV2640_MODE_CIF; - max_x /= 4; - max_y /= 4; - offset_x /= 4; - offset_y /= 4; - if(max_y > 296){ - max_y = 296; - } - } else if (framesize <= FRAMESIZE_SVGA) { - mode = OV2640_MODE_SVGA; - max_x /= 2; - max_y /= 2; - offset_x /= 2; - offset_y /= 2; - } - - ret = set_window(sensor, mode, offset_x, offset_y, max_x, max_y, w, h); - return ret; -} - -static int set_contrast(sensor_t *sensor, int level) -{ - int ret=0; - level += 3; - if (level <= 0 || level > NUM_CONTRAST_LEVELS) { - return -1; - } - sensor->status.contrast = level-3; - for (int i=0; i<7; i++) { - WRITE_REG_OR_RETURN(BANK_DSP, contrast_regs[0][i], contrast_regs[level][i]); - } - return ret; -} - -static int set_brightness(sensor_t *sensor, int level) -{ - int ret=0; - level += 3; - if (level <= 0 || level > NUM_BRIGHTNESS_LEVELS) { - return -1; - } - sensor->status.brightness = level-3; - for (int i=0; i<5; i++) { - WRITE_REG_OR_RETURN(BANK_DSP, brightness_regs[0][i], brightness_regs[level][i]); - } - return ret; -} - -static int set_saturation(sensor_t *sensor, int level) -{ - int ret=0; - level += 3; - if (level <= 0 || level > NUM_SATURATION_LEVELS) { - return -1; - } - sensor->status.saturation = level-3; - for (int i=0; i<5; i++) { - WRITE_REG_OR_RETURN(BANK_DSP, saturation_regs[0][i], saturation_regs[level][i]); - } - return ret; -} - -static int set_special_effect(sensor_t *sensor, int effect) -{ - int ret=0; - effect++; - if (effect <= 0 || effect > NUM_SPECIAL_EFFECTS) { - return -1; - } - sensor->status.special_effect = effect-1; - for (int i=0; i<5; i++) { - WRITE_REG_OR_RETURN(BANK_DSP, special_effects_regs[0][i], special_effects_regs[effect][i]); - } - return ret; -} - -static int set_wb_mode(sensor_t *sensor, int mode) -{ - int ret=0; - if (mode < 0 || mode > NUM_WB_MODES) { - return -1; - } - sensor->status.wb_mode = mode; - SET_REG_BITS_OR_RETURN(BANK_DSP, 0XC7, 6, 1, mode?1:0); - if(mode) { - for (int i=0; i<3; i++) { - WRITE_REG_OR_RETURN(BANK_DSP, wb_modes_regs[0][i], wb_modes_regs[mode][i]); - } - } - return ret; -} - -static int set_ae_level(sensor_t *sensor, int level) -{ - int ret=0; - level += 3; - if (level <= 0 || level > NUM_AE_LEVELS) { - return -1; - } - sensor->status.ae_level = level-3; - for (int i=0; i<3; i++) { - WRITE_REG_OR_RETURN(BANK_SENSOR, ae_levels_regs[0][i], ae_levels_regs[level][i]); - } - return ret; -} - -static int set_quality(sensor_t *sensor, int quality) -{ - if(quality < 0) { - quality = 0; - } else if(quality > 63) { - quality = 63; - } - sensor->status.quality = quality; - return write_reg(sensor, BANK_DSP, QS, quality); -} - -static int set_agc_gain(sensor_t *sensor, int gain) -{ - if(gain < 0) { - gain = 0; - } else if(gain > 30) { - gain = 30; - } - sensor->status.agc_gain = gain; - return write_reg(sensor, BANK_SENSOR, GAIN, agc_gain_tbl[gain]); -} - -static int set_gainceiling_sensor(sensor_t *sensor, gainceiling_t gainceiling) -{ - sensor->status.gainceiling = gainceiling; - //return write_reg(sensor, BANK_SENSOR, COM9, COM9_AGC_SET(gainceiling)); - return set_reg_bits(sensor, BANK_SENSOR, COM9, 5, 7, gainceiling); -} - -static int set_aec_value(sensor_t *sensor, int value) -{ - if(value < 0) { - value = 0; - } else if(value > 1200) { - value = 1200; - } - sensor->status.aec_value = value; - return set_reg_bits(sensor, BANK_SENSOR, REG04, 0, 3, value & 0x3) - || write_reg(sensor, BANK_SENSOR, AEC, (value >> 2) & 0xFF) - || set_reg_bits(sensor, BANK_SENSOR, REG45, 0, 0x3F, value >> 10); -} - -static int set_aec2(sensor_t *sensor, int enable) -{ - sensor->status.aec2 = enable; - return set_reg_bits(sensor, BANK_DSP, CTRL0, 6, 1, enable?0:1); -} - -static int set_colorbar(sensor_t *sensor, int enable) -{ - sensor->status.colorbar = enable; - return write_reg_bits(sensor, BANK_SENSOR, COM7, COM7_COLOR_BAR, enable?1:0); -} - -static int set_agc_sensor(sensor_t *sensor, int enable) -{ - sensor->status.agc = enable; - return write_reg_bits(sensor, BANK_SENSOR, COM8, COM8_AGC_EN, enable?1:0); -} - -static int set_aec_sensor(sensor_t *sensor, int enable) -{ - sensor->status.aec = enable; - return write_reg_bits(sensor, BANK_SENSOR, COM8, COM8_AEC_EN, enable?1:0); -} - -static int set_hmirror_sensor(sensor_t *sensor, int enable) -{ - sensor->status.hmirror = enable; - return write_reg_bits(sensor, BANK_SENSOR, REG04, REG04_HFLIP_IMG, enable?1:0); -} - -static int set_vflip_sensor(sensor_t *sensor, int enable) -{ - int ret = 0; - sensor->status.vflip = enable; - ret = write_reg_bits(sensor, BANK_SENSOR, REG04, REG04_VREF_EN, enable?1:0); - return ret & write_reg_bits(sensor, BANK_SENSOR, REG04, REG04_VFLIP_IMG, enable?1:0); -} - -static int set_raw_gma_dsp(sensor_t *sensor, int enable) -{ - sensor->status.raw_gma = enable; - return set_reg_bits(sensor, BANK_DSP, CTRL1, 5, 1, enable?1:0); -} - -static int set_awb_dsp(sensor_t *sensor, int enable) -{ - sensor->status.awb = enable; - return set_reg_bits(sensor, BANK_DSP, CTRL1, 3, 1, enable?1:0); -} - -static int set_awb_gain_dsp(sensor_t *sensor, int enable) -{ - sensor->status.awb_gain = enable; - return set_reg_bits(sensor, BANK_DSP, CTRL1, 2, 1, enable?1:0); -} - -static int set_lenc_dsp(sensor_t *sensor, int enable) -{ - sensor->status.lenc = enable; - return set_reg_bits(sensor, BANK_DSP, CTRL1, 1, 1, enable?1:0); -} - -static int set_dcw_dsp(sensor_t *sensor, int enable) -{ - sensor->status.dcw = enable; - return set_reg_bits(sensor, BANK_DSP, CTRL2, 5, 1, enable?1:0); -} - -static int set_bpc_dsp(sensor_t *sensor, int enable) -{ - sensor->status.bpc = enable; - return set_reg_bits(sensor, BANK_DSP, CTRL3, 7, 1, enable?1:0); -} - -static int set_wpc_dsp(sensor_t *sensor, int enable) -{ - sensor->status.wpc = enable; - return set_reg_bits(sensor, BANK_DSP, CTRL3, 6, 1, enable?1:0); -} - -//unsupported -static int set_sharpness(sensor_t *sensor, int level) -{ - return -1; -} - -static int set_denoise(sensor_t *sensor, int level) -{ - return -1; -} - -static int get_reg(sensor_t *sensor, int reg, int mask) -{ - int ret = read_reg(sensor, (reg >> 8) & 0x01, reg & 0xFF); - if(ret > 0){ - ret &= mask; - } - return ret; -} - -static int set_reg(sensor_t *sensor, int reg, int mask, int value) -{ - int ret = 0; - ret = read_reg(sensor, (reg >> 8) & 0x01, reg & 0xFF); - if(ret < 0){ - return ret; - } - value = (ret & ~mask) | (value & mask); - ret = write_reg(sensor, (reg >> 8) & 0x01, reg & 0xFF, value); - return ret; -} - -static int set_res_raw(sensor_t *sensor, int startX, int startY, int endX, int endY, int offsetX, int offsetY, int totalX, int totalY, int outputX, int outputY, bool scale, bool binning) -{ - return set_window(sensor, (ov2640_sensor_mode_t)startX, offsetX, offsetY, totalX, totalY, outputX, outputY); -} - -static int _set_pll(sensor_t *sensor, int bypass, int multiplier, int sys_div, int root_2x, int pre_div, int seld5, int pclk_manual, int pclk_div) -{ - return -1; -} - -static int set_xclk(sensor_t *sensor, int timer, int xclk) -{ - int ret = 0; - sensor->xclk_freq_hz = xclk * 1000000U; - ret = xclk_timer_conf(timer, sensor->xclk_freq_hz); - return ret; -} - -static int init_status(sensor_t *sensor){ - sensor->status.brightness = 0; - sensor->status.contrast = 0; - sensor->status.saturation = 0; - sensor->status.ae_level = 0; - sensor->status.special_effect = 0; - sensor->status.wb_mode = 0; - - sensor->status.agc_gain = 30; - int agc_gain = read_reg(sensor, BANK_SENSOR, GAIN); - for (int i=0; i<30; i++){ - if(agc_gain >= agc_gain_tbl[i] && agc_gain < agc_gain_tbl[i+1]){ - sensor->status.agc_gain = i; - break; - } - } - - sensor->status.aec_value = ((uint16_t)get_reg_bits(sensor, BANK_SENSOR, REG45, 0, 0x3F) << 10) - | ((uint16_t)read_reg(sensor, BANK_SENSOR, AEC) << 2) - | get_reg_bits(sensor, BANK_SENSOR, REG04, 0, 3);//0 - 1200 - sensor->status.quality = read_reg(sensor, BANK_DSP, QS); - sensor->status.gainceiling = get_reg_bits(sensor, BANK_SENSOR, COM9, 5, 7); - - sensor->status.awb = get_reg_bits(sensor, BANK_DSP, CTRL1, 3, 1); - sensor->status.awb_gain = get_reg_bits(sensor, BANK_DSP, CTRL1, 2, 1); - sensor->status.aec = get_reg_bits(sensor, BANK_SENSOR, COM8, 0, 1); - sensor->status.aec2 = get_reg_bits(sensor, BANK_DSP, CTRL0, 6, 1); - sensor->status.agc = get_reg_bits(sensor, BANK_SENSOR, COM8, 2, 1); - sensor->status.bpc = get_reg_bits(sensor, BANK_DSP, CTRL3, 7, 1); - sensor->status.wpc = get_reg_bits(sensor, BANK_DSP, CTRL3, 6, 1); - sensor->status.raw_gma = get_reg_bits(sensor, BANK_DSP, CTRL1, 5, 1); - sensor->status.lenc = get_reg_bits(sensor, BANK_DSP, CTRL1, 1, 1); - sensor->status.hmirror = get_reg_bits(sensor, BANK_SENSOR, REG04, 7, 1); - sensor->status.vflip = get_reg_bits(sensor, BANK_SENSOR, REG04, 6, 1); - sensor->status.dcw = get_reg_bits(sensor, BANK_DSP, CTRL2, 5, 1); - sensor->status.colorbar = get_reg_bits(sensor, BANK_SENSOR, COM7, 1, 1); - - sensor->status.sharpness = 0;//not supported - sensor->status.denoise = 0; - return 0; -} - -int ov2640_detect(int slv_addr, sensor_id_t *id) -{ - if (OV2640_SCCB_ADDR == slv_addr) { - SCCB_Write(slv_addr, 0xFF, 0x01);//bank sensor - uint16_t PID = SCCB_Read(slv_addr, 0x0A); - if (OV2640_PID == PID) { - id->PID = PID; - id->VER = SCCB_Read(slv_addr, REG_VER); - id->MIDL = SCCB_Read(slv_addr, REG_MIDL); - id->MIDH = SCCB_Read(slv_addr, REG_MIDH); - return PID; - } else { - ESP_LOGI(TAG, "Mismatch PID=0x%x", PID); - } - } - return 0; -} - -int ov2640_init(sensor_t *sensor) -{ - sensor->reset = reset; - sensor->init_status = init_status; - sensor->set_pixformat = set_pixformat; - sensor->set_framesize = set_framesize; - sensor->set_contrast = set_contrast; - sensor->set_brightness= set_brightness; - sensor->set_saturation= set_saturation; - - sensor->set_quality = set_quality; - sensor->set_colorbar = set_colorbar; - - sensor->set_gainceiling = set_gainceiling_sensor; - sensor->set_gain_ctrl = set_agc_sensor; - sensor->set_exposure_ctrl = set_aec_sensor; - sensor->set_hmirror = set_hmirror_sensor; - sensor->set_vflip = set_vflip_sensor; - - sensor->set_whitebal = set_awb_dsp; - sensor->set_aec2 = set_aec2; - sensor->set_aec_value = set_aec_value; - sensor->set_special_effect = set_special_effect; - sensor->set_wb_mode = set_wb_mode; - sensor->set_ae_level = set_ae_level; - - sensor->set_dcw = set_dcw_dsp; - sensor->set_bpc = set_bpc_dsp; - sensor->set_wpc = set_wpc_dsp; - sensor->set_awb_gain = set_awb_gain_dsp; - sensor->set_agc_gain = set_agc_gain; - - sensor->set_raw_gma = set_raw_gma_dsp; - sensor->set_lenc = set_lenc_dsp; - - //not supported - sensor->set_sharpness = set_sharpness; - sensor->set_denoise = set_denoise; - - sensor->get_reg = get_reg; - sensor->set_reg = set_reg; - sensor->set_res_raw = set_res_raw; - sensor->set_pll = _set_pll; - sensor->set_xclk = set_xclk; - ESP_LOGD(TAG, "OV2640 Attached"); - return 0; -} diff --git a/lib/libesp32_div/esp32-camera/sensors/ov3660.c b/lib/libesp32_div/esp32-camera/sensors/ov3660.c deleted file mode 100644 index b9ebdba3b..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/ov3660.c +++ /dev/null @@ -1,1053 +0,0 @@ -/* - * This file is part of the OpenMV project. - * Copyright (c) 2013/2014 Ibrahim Abdelkader - * This work is licensed under the MIT license, see the file LICENSE for details. - * - * OV3660 driver. - * - */ -#include -#include -#include -#include "sccb.h" -#include "xclk.h" -#include "ov3660.h" -#include "ov3660_regs.h" -#include "ov3660_settings.h" -#include "freertos/FreeRTOS.h" -#include "freertos/task.h" - -#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) -#include "esp32-hal-log.h" -#else -#include "esp_log.h" -static const char *TAG = "ov3660"; -#endif - -//#define REG_DEBUG_ON - -static int read_reg(uint8_t slv_addr, const uint16_t reg){ - int ret = SCCB_Read16(slv_addr, reg); -#ifdef REG_DEBUG_ON - if (ret < 0) { - ESP_LOGE(TAG, "READ REG 0x%04x FAILED: %d", reg, ret); - } -#endif - return ret; -} - -static int check_reg_mask(uint8_t slv_addr, uint16_t reg, uint8_t mask){ - return (read_reg(slv_addr, reg) & mask) == mask; -} - -static int read_reg16(uint8_t slv_addr, const uint16_t reg){ - int ret = 0, ret2 = 0; - ret = read_reg(slv_addr, reg); - if (ret >= 0) { - ret = (ret & 0xFF) << 8; - ret2 = read_reg(slv_addr, reg+1); - if (ret2 < 0) { - ret = ret2; - } else { - ret |= ret2 & 0xFF; - } - } - return ret; -} - - -static int write_reg(uint8_t slv_addr, const uint16_t reg, uint8_t value){ - int ret = 0; -#ifndef REG_DEBUG_ON - ret = SCCB_Write16(slv_addr, reg, value); -#else - int old_value = read_reg(slv_addr, reg); - if (old_value < 0) { - return old_value; - } - if ((uint8_t)old_value != value) { - ESP_LOGI(TAG, "NEW REG 0x%04x: 0x%02x to 0x%02x", reg, (uint8_t)old_value, value); - ret = SCCB_Write16(slv_addr, reg, value); - } else { - ESP_LOGD(TAG, "OLD REG 0x%04x: 0x%02x", reg, (uint8_t)old_value); - ret = SCCB_Write16(slv_addr, reg, value);//maybe not? - } - if (ret < 0) { - ESP_LOGE(TAG, "WRITE REG 0x%04x FAILED: %d", reg, ret); - } -#endif - return ret; -} - -static int set_reg_bits(uint8_t slv_addr, uint16_t reg, uint8_t offset, uint8_t mask, uint8_t value) -{ - int ret = 0; - uint8_t c_value, new_value; - ret = read_reg(slv_addr, reg); - if(ret < 0) { - return ret; - } - c_value = ret; - new_value = (c_value & ~(mask << offset)) | ((value & mask) << offset); - ret = write_reg(slv_addr, reg, new_value); - return ret; -} - -static int write_regs(uint8_t slv_addr, const uint16_t (*regs)[2]) -{ - int i = 0, ret = 0; - while (!ret && regs[i][0] != REGLIST_TAIL) { - if (regs[i][0] == REG_DLY) { - vTaskDelay(regs[i][1] / portTICK_PERIOD_MS); - } else { - ret = write_reg(slv_addr, regs[i][0], regs[i][1]); - } - i++; - } - return ret; -} - -static int write_reg16(uint8_t slv_addr, const uint16_t reg, uint16_t value) -{ - if (write_reg(slv_addr, reg, value >> 8) || write_reg(slv_addr, reg + 1, value)) { - return -1; - } - return 0; -} - -static int write_addr_reg(uint8_t slv_addr, const uint16_t reg, uint16_t x_value, uint16_t y_value) -{ - if (write_reg16(slv_addr, reg, x_value) || write_reg16(slv_addr, reg + 2, y_value)) { - return -1; - } - return 0; -} - -#define write_reg_bits(slv_addr, reg, mask, enable) set_reg_bits(slv_addr, reg, 0, mask, enable?mask:0) - -static int calc_sysclk(int xclk, bool pll_bypass, int pll_multiplier, int pll_sys_div, int pll_pre_div, bool pll_root_2x, int pll_seld5, bool pclk_manual, int pclk_div) -{ - const int pll_pre_div2x_map[] = { 2, 3, 4, 6 };//values are multiplied by two to avoid floats - const int pll_seld52x_map[] = { 2, 2, 4, 5 }; - - if(!pll_sys_div) { - pll_sys_div = 1; - } - - int pll_pre_div2x = pll_pre_div2x_map[pll_pre_div]; - int pll_root_div = pll_root_2x?2:1; - int pll_seld52x = pll_seld52x_map[pll_seld5]; - - int VCO = (xclk / 1000) * pll_multiplier * pll_root_div * 2 / pll_pre_div2x; - int PLLCLK = pll_bypass?(xclk):(VCO * 1000 * 2 / pll_sys_div / pll_seld52x); - int PCLK = PLLCLK / 2 / ((pclk_manual && pclk_div)?pclk_div:1); - int SYSCLK = PLLCLK / 4; - - ESP_LOGI(TAG, "Calculated VCO: %d Hz, PLLCLK: %d Hz, SYSCLK: %d Hz, PCLK: %d Hz", VCO*1000, PLLCLK, SYSCLK, PCLK); - return SYSCLK; -} - -static int set_pll(sensor_t *sensor, bool bypass, uint8_t multiplier, uint8_t sys_div, uint8_t pre_div, bool root_2x, uint8_t seld5, bool pclk_manual, uint8_t pclk_div){ - int ret = 0; - if(multiplier > 31 || sys_div > 15 || pre_div > 3 || pclk_div > 31 || seld5 > 3){ - ESP_LOGE(TAG, "Invalid arguments"); - return -1; - } - - calc_sysclk(sensor->xclk_freq_hz, bypass, multiplier, sys_div, pre_div, root_2x, seld5, pclk_manual, pclk_div); - - ret = write_reg(sensor->slv_addr, SC_PLLS_CTRL0, bypass?0x80:0x00); - if (ret == 0) { - ret = write_reg(sensor->slv_addr, SC_PLLS_CTRL1, multiplier & 0x1f); - } - if (ret == 0) { - ret = write_reg(sensor->slv_addr, SC_PLLS_CTRL2, 0x10 | (sys_div & 0x0f)); - } - if (ret == 0) { - ret = write_reg(sensor->slv_addr, SC_PLLS_CTRL3, (pre_div & 0x3) << 4 | seld5 | (root_2x?0x40:0x00)); - } - if (ret == 0) { - ret = write_reg(sensor->slv_addr, PCLK_RATIO, pclk_div & 0x1f); - } - if (ret == 0) { - ret = write_reg(sensor->slv_addr, VFIFO_CTRL0C, pclk_manual?0x22:0x20); - } - if(ret){ - ESP_LOGE(TAG, "set_sensor_pll FAILED!"); - } - return ret; -} - -static int set_ae_level(sensor_t *sensor, int level); - -static int reset(sensor_t *sensor) -{ - int ret = 0; - // Software Reset: clear all registers and reset them to their default values - ret = write_reg(sensor->slv_addr, SYSTEM_CTROL0, 0x82); - if(ret){ - ESP_LOGE(TAG, "Software Reset FAILED!"); - return ret; - } - vTaskDelay(100 / portTICK_PERIOD_MS); - ret = write_regs(sensor->slv_addr, sensor_default_regs); - if (ret == 0) { - ESP_LOGD(TAG, "Camera defaults loaded"); - ret = set_ae_level(sensor, 0); - vTaskDelay(100 / portTICK_PERIOD_MS); - } - return ret; -} - -static int set_pixformat(sensor_t *sensor, pixformat_t pixformat) -{ - int ret = 0; - const uint16_t (*regs)[2]; - - switch (pixformat) { - case PIXFORMAT_YUV422: - regs = sensor_fmt_yuv422; - break; - - case PIXFORMAT_GRAYSCALE: - regs = sensor_fmt_grayscale; - break; - - case PIXFORMAT_RGB565: - case PIXFORMAT_RGB888: - regs = sensor_fmt_rgb565; - break; - - case PIXFORMAT_JPEG: - regs = sensor_fmt_jpeg; - break; - - case PIXFORMAT_RAW: - regs = sensor_fmt_raw; - break; - - default: - ESP_LOGE(TAG, "Unsupported pixformat: %u", pixformat); - return -1; - } - - ret = write_regs(sensor->slv_addr, regs); - if(ret == 0) { - sensor->pixformat = pixformat; - ESP_LOGD(TAG, "Set pixformat to: %u", pixformat); - } - return ret; -} - -static int set_image_options(sensor_t *sensor) -{ - int ret = 0; - uint8_t reg20 = 0; - uint8_t reg21 = 0; - uint8_t reg4514 = 0; - uint8_t reg4514_test = 0; - - // compression - if (sensor->pixformat == PIXFORMAT_JPEG) { - reg21 |= 0x20; - } - - // binning - if (sensor->status.binning) { - reg20 |= 0x01; - reg21 |= 0x01; - reg4514_test |= 4; - } else { - reg20 |= 0x40; - } - - // V-Flip - if (sensor->status.vflip) { - reg20 |= 0x06; - reg4514_test |= 1; - } - - // H-Mirror - if (sensor->status.hmirror) { - reg21 |= 0x06; - reg4514_test |= 2; - } - - switch (reg4514_test) { - //no binning - case 0: reg4514 = 0x88; break;//normal - case 1: reg4514 = 0x88; break;//v-flip - case 2: reg4514 = 0xbb; break;//h-mirror - case 3: reg4514 = 0xbb; break;//v-flip+h-mirror - //binning - case 4: reg4514 = 0xaa; break;//normal - case 5: reg4514 = 0xbb; break;//v-flip - case 6: reg4514 = 0xbb; break;//h-mirror - case 7: reg4514 = 0xaa; break;//v-flip+h-mirror - } - - if(write_reg(sensor->slv_addr, TIMING_TC_REG20, reg20) - || write_reg(sensor->slv_addr, TIMING_TC_REG21, reg21) - || write_reg(sensor->slv_addr, 0x4514, reg4514)){ - ESP_LOGE(TAG, "Setting Image Options Failed"); - ret = -1; - } - - if (sensor->status.binning) { - ret = write_reg(sensor->slv_addr, 0x4520, 0x0b) - || write_reg(sensor->slv_addr, X_INCREMENT, 0x31)//odd:3, even: 1 - || write_reg(sensor->slv_addr, Y_INCREMENT, 0x31);//odd:3, even: 1 - } else { - ret = write_reg(sensor->slv_addr, 0x4520, 0xb0) - || write_reg(sensor->slv_addr, X_INCREMENT, 0x11)//odd:1, even: 1 - || write_reg(sensor->slv_addr, Y_INCREMENT, 0x11);//odd:1, even: 1 - } - - ESP_LOGD(TAG, "Set Image Options: Compression: %u, Binning: %u, V-Flip: %u, H-Mirror: %u, Reg-4514: 0x%02x", - sensor->pixformat == PIXFORMAT_JPEG, sensor->status.binning, sensor->status.vflip, sensor->status.hmirror, reg4514); - return ret; -} - -static int set_framesize(sensor_t *sensor, framesize_t framesize) -{ - int ret = 0; - - if(framesize > FRAMESIZE_QXGA){ - ESP_LOGW(TAG, "Invalid framesize: %u", framesize); - framesize = FRAMESIZE_QXGA; - } - framesize_t old_framesize = sensor->status.framesize; - sensor->status.framesize = framesize; - uint16_t w = resolution[framesize].width; - uint16_t h = resolution[framesize].height; - aspect_ratio_t ratio = resolution[sensor->status.framesize].aspect_ratio; - ratio_settings_t settings = ratio_table[ratio]; - - sensor->status.binning = (w <= (settings.max_width / 2) && h <= (settings.max_height / 2)); - sensor->status.scale = !((w == settings.max_width && h == settings.max_height) - || (w == (settings.max_width / 2) && h == (settings.max_height / 2))); - - ret = write_addr_reg(sensor->slv_addr, X_ADDR_ST_H, settings.start_x, settings.start_y) - || write_addr_reg(sensor->slv_addr, X_ADDR_END_H, settings.end_x, settings.end_y) - || write_addr_reg(sensor->slv_addr, X_OUTPUT_SIZE_H, w, h); - - if (ret) { - goto fail; - } - - if (sensor->status.binning) { - ret = write_addr_reg(sensor->slv_addr, X_TOTAL_SIZE_H, settings.total_x, (settings.total_y / 2) + 1) - || write_addr_reg(sensor->slv_addr, X_OFFSET_H, 8, 2); - } else { - ret = write_addr_reg(sensor->slv_addr, X_TOTAL_SIZE_H, settings.total_x, settings.total_y) - || write_addr_reg(sensor->slv_addr, X_OFFSET_H, 16, 6); - } - - if (ret == 0) { - ret = write_reg_bits(sensor->slv_addr, ISP_CONTROL_01, 0x20, sensor->status.scale); - } - - if (ret == 0) { - ret = set_image_options(sensor); - } - - if (ret) { - goto fail; - } - - if (sensor->pixformat == PIXFORMAT_JPEG) { - if (framesize == FRAMESIZE_QXGA || sensor->xclk_freq_hz == 16000000) { - //40MHz SYSCLK and 10MHz PCLK - ret = set_pll(sensor, false, 24, 1, 3, false, 0, true, 8); - } else { - //50MHz SYSCLK and 10MHz PCLK - ret = set_pll(sensor, false, 30, 1, 3, false, 0, true, 10); - } - } else { - //tuned for 16MHz XCLK and 8MHz PCLK - if (framesize > FRAMESIZE_HVGA) { - //8MHz SYSCLK and 8MHz PCLK (4.44 FPS) - ret = set_pll(sensor, false, 4, 1, 0, false, 2, true, 2); - } else if (framesize >= FRAMESIZE_QVGA) { - //16MHz SYSCLK and 8MHz PCLK (10.25 FPS) - ret = set_pll(sensor, false, 8, 1, 0, false, 2, true, 4); - } else { - //32MHz SYSCLK and 8MHz PCLK (17.77 FPS) - ret = set_pll(sensor, false, 8, 1, 0, false, 0, true, 8); - } - } - - if (ret == 0) { - ESP_LOGD(TAG, "Set framesize to: %ux%u", w, h); - } - return ret; - -fail: - sensor->status.framesize = old_framesize; - ESP_LOGE(TAG, "Setting framesize to: %ux%u failed", w, h); - return ret; -} - -static int set_hmirror(sensor_t *sensor, int enable) -{ - int ret = 0; - sensor->status.hmirror = enable; - ret = set_image_options(sensor); - if (ret == 0) { - ESP_LOGD(TAG, "Set h-mirror to: %d", enable); - } - return ret; -} - -static int set_vflip(sensor_t *sensor, int enable) -{ - int ret = 0; - sensor->status.vflip = enable; - ret = set_image_options(sensor); - if (ret == 0) { - ESP_LOGD(TAG, "Set v-flip to: %d", enable); - } - return ret; -} - -static int set_quality(sensor_t *sensor, int qs) -{ - int ret = 0; - ret = write_reg(sensor->slv_addr, COMPRESSION_CTRL07, qs & 0x3f); - if (ret == 0) { - sensor->status.quality = qs; - ESP_LOGD(TAG, "Set quality to: %d", qs); - } - return ret; -} - -static int set_colorbar(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = write_reg_bits(sensor->slv_addr, PRE_ISP_TEST_SETTING_1, TEST_COLOR_BAR, enable); - if (ret == 0) { - sensor->status.colorbar = enable; - ESP_LOGD(TAG, "Set colorbar to: %d", enable); - } - return ret; -} - -static int set_gain_ctrl(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = write_reg_bits(sensor->slv_addr, AEC_PK_MANUAL, AEC_PK_MANUAL_AGC_MANUALEN, !enable); - if (ret == 0) { - ESP_LOGD(TAG, "Set gain_ctrl to: %d", enable); - sensor->status.agc = enable; - } - return ret; -} - -static int set_exposure_ctrl(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = write_reg_bits(sensor->slv_addr, AEC_PK_MANUAL, AEC_PK_MANUAL_AEC_MANUALEN, !enable); - if (ret == 0) { - ESP_LOGD(TAG, "Set exposure_ctrl to: %d", enable); - sensor->status.aec = enable; - } - return ret; -} - -static int set_whitebal(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = write_reg_bits(sensor->slv_addr, ISP_CONTROL_01, 0x01, enable); - if (ret == 0) { - ESP_LOGD(TAG, "Set awb to: %d", enable); - sensor->status.awb = enable; - } - return ret; -} - -//Advanced AWB -static int set_dcw_dsp(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = write_reg_bits(sensor->slv_addr, 0x5183, 0x80, !enable); - if (ret == 0) { - ESP_LOGD(TAG, "Set dcw to: %d", enable); - sensor->status.dcw = enable; - } - return ret; -} - -//night mode enable -static int set_aec2(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = write_reg_bits(sensor->slv_addr, 0x3a00, 0x04, enable); - if (ret == 0) { - ESP_LOGD(TAG, "Set aec2 to: %d", enable); - sensor->status.aec2 = enable; - } - return ret; -} - -static int set_bpc_dsp(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = write_reg_bits(sensor->slv_addr, 0x5000, 0x04, enable); - if (ret == 0) { - ESP_LOGD(TAG, "Set bpc to: %d", enable); - sensor->status.bpc = enable; - } - return ret; -} - -static int set_wpc_dsp(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = write_reg_bits(sensor->slv_addr, 0x5000, 0x02, enable); - if (ret == 0) { - ESP_LOGD(TAG, "Set wpc to: %d", enable); - sensor->status.wpc = enable; - } - return ret; -} - -//Gamma enable -static int set_raw_gma_dsp(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = write_reg_bits(sensor->slv_addr, 0x5000, 0x20, enable); - if (ret == 0) { - ESP_LOGD(TAG, "Set raw_gma to: %d", enable); - sensor->status.raw_gma = enable; - } - return ret; -} - -static int set_lenc_dsp(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = write_reg_bits(sensor->slv_addr, 0x5000, 0x80, enable); - if (ret == 0) { - ESP_LOGD(TAG, "Set lenc to: %d", enable); - sensor->status.lenc = enable; - } - return ret; -} - -static int get_agc_gain(sensor_t *sensor) -{ - int ra = read_reg(sensor->slv_addr, 0x350a); - if (ra < 0) { - return 0; - } - int rb = read_reg(sensor->slv_addr, 0x350b); - if (rb < 0) { - return 0; - } - int res = (rb & 0xF0) >> 4 | (ra & 0x03) << 4; - if (rb & 0x0F) { - res += 1; - } - return res; -} - -//real gain -static int set_agc_gain(sensor_t *sensor, int gain) -{ - int ret = 0; - if(gain < 0) { - gain = 0; - } else if(gain > 64) { - gain = 64; - } - - //gain value is 6.4 bits float - //in order to use the max range, we deduct 1/16 - int gainv = gain << 4; - if(gainv){ - gainv -= 1; - } - - ret = write_reg(sensor->slv_addr, 0x350a, gainv >> 8) || write_reg(sensor->slv_addr, 0x350b, gainv & 0xff); - if (ret == 0) { - ESP_LOGD(TAG, "Set agc_gain to: %d", gain); - sensor->status.agc_gain = gain; - } - return ret; -} - -static int get_aec_value(sensor_t *sensor) -{ - int ra = read_reg(sensor->slv_addr, 0x3500); - if (ra < 0) { - return 0; - } - int rb = read_reg(sensor->slv_addr, 0x3501); - if (rb < 0) { - return 0; - } - int rc = read_reg(sensor->slv_addr, 0x3502); - if (rc < 0) { - return 0; - } - int res = (ra & 0x0F) << 12 | (rb & 0xFF) << 4 | (rc & 0xF0) >> 4; - return res; -} - -static int set_aec_value(sensor_t *sensor, int value) -{ - int ret = 0, max_val = 0; - max_val = read_reg16(sensor->slv_addr, 0x380e); - if (max_val < 0) { - ESP_LOGE(TAG, "Could not read max aec_value"); - return -1; - } - if (value > max_val) { - value =max_val; - } - - ret = write_reg(sensor->slv_addr, 0x3500, (value >> 12) & 0x0F) - || write_reg(sensor->slv_addr, 0x3501, (value >> 4) & 0xFF) - || write_reg(sensor->slv_addr, 0x3502, (value << 4) & 0xF0); - - if (ret == 0) { - ESP_LOGD(TAG, "Set aec_value to: %d / %d", value, max_val); - sensor->status.aec_value = value; - } - return ret; -} - -static int set_ae_level(sensor_t *sensor, int level) -{ - int ret = 0; - if (level < -5 || level > 5) { - return -1; - } - //good targets are between 5 and 115 - int target_level = ((level + 5) * 10) + 5; - - int level_high, level_low; - int fast_high, fast_low; - - level_low = target_level * 23 / 25; //0.92 (0.46) - level_high = target_level * 27 / 25; //1.08 (2.08) - - fast_low = level_low >> 1; - fast_high = level_high << 1; - - if(fast_high>255) { - fast_high = 255; - } - - ret = write_reg(sensor->slv_addr, 0x3a0f, level_high) - || write_reg(sensor->slv_addr, 0x3a10, level_low) - || write_reg(sensor->slv_addr, 0x3a1b, level_high) - || write_reg(sensor->slv_addr, 0x3a1e, level_low) - || write_reg(sensor->slv_addr, 0x3a11, fast_high) - || write_reg(sensor->slv_addr, 0x3a1f, fast_low); - - if (ret == 0) { - ESP_LOGD(TAG, "Set ae_level to: %d", level); - sensor->status.ae_level = level; - } - return ret; -} - -static int set_wb_mode(sensor_t *sensor, int mode) -{ - int ret = 0; - if (mode < 0 || mode > 4) { - return -1; - } - - ret = write_reg(sensor->slv_addr, 0x3406, (mode != 0)); - if (ret) { - return ret; - } - switch (mode) { - case 1://Sunny - ret = write_reg16(sensor->slv_addr, 0x3400, 0x5e0) //AWB R GAIN - || write_reg16(sensor->slv_addr, 0x3402, 0x410) //AWB G GAIN - || write_reg16(sensor->slv_addr, 0x3404, 0x540);//AWB B GAIN - break; - case 2://Cloudy - ret = write_reg16(sensor->slv_addr, 0x3400, 0x650) //AWB R GAIN - || write_reg16(sensor->slv_addr, 0x3402, 0x410) //AWB G GAIN - || write_reg16(sensor->slv_addr, 0x3404, 0x4f0);//AWB B GAIN - break; - case 3://Office - ret = write_reg16(sensor->slv_addr, 0x3400, 0x520) //AWB R GAIN - || write_reg16(sensor->slv_addr, 0x3402, 0x410) //AWB G GAIN - || write_reg16(sensor->slv_addr, 0x3404, 0x660);//AWB B GAIN - break; - case 4://HOME - ret = write_reg16(sensor->slv_addr, 0x3400, 0x420) //AWB R GAIN - || write_reg16(sensor->slv_addr, 0x3402, 0x3f0) //AWB G GAIN - || write_reg16(sensor->slv_addr, 0x3404, 0x710);//AWB B GAIN - break; - default://AUTO - break; - } - - if (ret == 0) { - ESP_LOGD(TAG, "Set wb_mode to: %d", mode); - sensor->status.wb_mode = mode; - } - return ret; -} - -static int set_awb_gain_dsp(sensor_t *sensor, int enable) -{ - int ret = 0; - int old_mode = sensor->status.wb_mode; - int mode = enable?old_mode:0; - - ret = set_wb_mode(sensor, mode); - - if (ret == 0) { - sensor->status.wb_mode = old_mode; - ESP_LOGD(TAG, "Set awb_gain to: %d", enable); - sensor->status.awb_gain = enable; - } - return ret; -} - -static int set_special_effect(sensor_t *sensor, int effect) -{ - int ret=0; - if (effect < 0 || effect > 6) { - return -1; - } - - uint8_t * regs = (uint8_t *)sensor_special_effects[effect]; - ret = write_reg(sensor->slv_addr, 0x5580, regs[0]) - || write_reg(sensor->slv_addr, 0x5583, regs[1]) - || write_reg(sensor->slv_addr, 0x5584, regs[2]) - || write_reg(sensor->slv_addr, 0x5003, regs[3]); - - if (ret == 0) { - ESP_LOGD(TAG, "Set special_effect to: %d", effect); - sensor->status.special_effect = effect; - } - return ret; -} - -static int set_brightness(sensor_t *sensor, int level) -{ - int ret = 0; - uint8_t value = 0; - bool negative = false; - - switch (level) { - case 3: - value = 0x30; - break; - case 2: - value = 0x20; - break; - case 1: - value = 0x10; - break; - case -1: - value = 0x10; - negative = true; - break; - case -2: - value = 0x20; - negative = true; - break; - case -3: - value = 0x30; - negative = true; - break; - default: // 0 - break; - } - - ret = write_reg(sensor->slv_addr, 0x5587, value); - if (ret == 0) { - ret = write_reg_bits(sensor->slv_addr, 0x5588, 0x08, negative); - } - - if (ret == 0) { - ESP_LOGD(TAG, "Set brightness to: %d", level); - sensor->status.brightness = level; - } - return ret; -} - -static int set_contrast(sensor_t *sensor, int level) -{ - int ret = 0; - if(level > 3 || level < -3) { - return -1; - } - ret = write_reg(sensor->slv_addr, 0x5586, (level + 4) << 3); - - if (ret == 0) { - ESP_LOGD(TAG, "Set contrast to: %d", level); - sensor->status.contrast = level; - } - return ret; -} - -static int set_saturation(sensor_t *sensor, int level) -{ - int ret = 0; - if(level > 4 || level < -4) { - return -1; - } - - uint8_t * regs = (uint8_t *)sensor_saturation_levels[level+4]; - for(int i=0; i<11; i++) { - ret = write_reg(sensor->slv_addr, 0x5381 + i, regs[i]); - if (ret) { - break; - } - } - - if (ret == 0) { - ESP_LOGD(TAG, "Set saturation to: %d", level); - sensor->status.saturation = level; - } - return ret; -} - -static int set_sharpness(sensor_t *sensor, int level) -{ - int ret = 0; - if(level > 3 || level < -3) { - return -1; - } - - uint8_t mt_offset_2 = (level + 3) * 8; - uint8_t mt_offset_1 = mt_offset_2 + 1; - - ret = write_reg_bits(sensor->slv_addr, 0x5308, 0x40, false)//0x40 means auto - || write_reg(sensor->slv_addr, 0x5300, 0x10) - || write_reg(sensor->slv_addr, 0x5301, 0x10) - || write_reg(sensor->slv_addr, 0x5302, mt_offset_1) - || write_reg(sensor->slv_addr, 0x5303, mt_offset_2) - || write_reg(sensor->slv_addr, 0x5309, 0x10) - || write_reg(sensor->slv_addr, 0x530a, 0x10) - || write_reg(sensor->slv_addr, 0x530b, 0x04) - || write_reg(sensor->slv_addr, 0x530c, 0x06); - - if (ret == 0) { - ESP_LOGD(TAG, "Set sharpness to: %d", level); - sensor->status.sharpness = level; - } - return ret; -} - -static int set_gainceiling(sensor_t *sensor, gainceiling_t level) -{ - int ret = 0, l = (int)level; - - ret = write_reg(sensor->slv_addr, 0x3A18, (l >> 8) & 3) - || write_reg(sensor->slv_addr, 0x3A19, l & 0xFF); - - if (ret == 0) { - ESP_LOGD(TAG, "Set gainceiling to: %d", l); - sensor->status.gainceiling = l; - } - return ret; -} - -static int get_denoise(sensor_t *sensor) -{ - if (!check_reg_mask(sensor->slv_addr, 0x5308, 0x10)) { - return 0; - } - return (read_reg(sensor->slv_addr, 0x5306) / 4) + 1; -} - -static int set_denoise(sensor_t *sensor, int level) -{ - int ret = 0; - if (level < 0 || level > 8) { - return -1; - } - - ret = write_reg_bits(sensor->slv_addr, 0x5308, 0x10, level > 0); - if (ret == 0 && level > 0) { - ret = write_reg(sensor->slv_addr, 0x5306, (level - 1) * 4); - } - - if (ret == 0) { - ESP_LOGD(TAG, "Set denoise to: %d", level); - sensor->status.denoise = level; - } - return ret; -} - -static int get_reg(sensor_t *sensor, int reg, int mask) -{ - int ret = 0, ret2 = 0; - if(mask > 0xFF){ - ret = read_reg16(sensor->slv_addr, reg); - if(ret >= 0 && mask > 0xFFFF){ - ret2 = read_reg(sensor->slv_addr, reg+2); - if(ret2 >= 0){ - ret = (ret << 8) | ret2 ; - } else { - ret = ret2; - } - } - } else { - ret = read_reg(sensor->slv_addr, reg); - } - if(ret > 0){ - ret &= mask; - } - return ret; -} - -static int set_reg(sensor_t *sensor, int reg, int mask, int value) -{ - int ret = 0, ret2 = 0; - if(mask > 0xFF){ - ret = read_reg16(sensor->slv_addr, reg); - if(ret >= 0 && mask > 0xFFFF){ - ret2 = read_reg(sensor->slv_addr, reg+2); - if(ret2 >= 0){ - ret = (ret << 8) | ret2 ; - } else { - ret = ret2; - } - } - } else { - ret = read_reg(sensor->slv_addr, reg); - } - if(ret < 0){ - return ret; - } - value = (ret & ~mask) | (value & mask); - if(mask > 0xFFFF){ - ret = write_reg16(sensor->slv_addr, reg, value >> 8); - if(ret >= 0){ - ret = write_reg(sensor->slv_addr, reg+2, value & 0xFF); - } - } else if(mask > 0xFF){ - ret = write_reg16(sensor->slv_addr, reg, value); - } else { - ret = write_reg(sensor->slv_addr, reg, value); - } - return ret; -} - -static int set_res_raw(sensor_t *sensor, int startX, int startY, int endX, int endY, int offsetX, int offsetY, int totalX, int totalY, int outputX, int outputY, bool scale, bool binning) -{ - int ret = 0; - ret = write_addr_reg(sensor->slv_addr, X_ADDR_ST_H, startX, startY) - || write_addr_reg(sensor->slv_addr, X_ADDR_END_H, endX, endY) - || write_addr_reg(sensor->slv_addr, X_OFFSET_H, offsetX, offsetY) - || write_addr_reg(sensor->slv_addr, X_TOTAL_SIZE_H, totalX, totalY) - || write_addr_reg(sensor->slv_addr, X_OUTPUT_SIZE_H, outputX, outputY) - || write_reg_bits(sensor->slv_addr, ISP_CONTROL_01, 0x20, scale); - if(!ret){ - sensor->status.scale = scale; - sensor->status.binning = binning; - ret = set_image_options(sensor); - } - return ret; -} - -static int _set_pll(sensor_t *sensor, int bypass, int multiplier, int sys_div, int root_2x, int pre_div, int seld5, int pclk_manual, int pclk_div) -{ - return set_pll(sensor, bypass > 0, multiplier, sys_div, pre_div, root_2x > 0, seld5, pclk_manual > 0, pclk_div); -} - -static int set_xclk(sensor_t *sensor, int timer, int xclk) -{ - int ret = 0; - sensor->xclk_freq_hz = xclk * 1000000U; - ret = xclk_timer_conf(timer, sensor->xclk_freq_hz); - return ret; -} - -static int init_status(sensor_t *sensor) -{ - sensor->status.brightness = 0; - sensor->status.contrast = 0; - sensor->status.saturation = 0; - sensor->status.sharpness = (read_reg(sensor->slv_addr, 0x5303) / 8) - 3; - sensor->status.denoise = get_denoise(sensor); - sensor->status.ae_level = 0; - sensor->status.gainceiling = read_reg16(sensor->slv_addr, 0x3A18) & 0x3FF; - sensor->status.awb = check_reg_mask(sensor->slv_addr, ISP_CONTROL_01, 0x01); - sensor->status.dcw = !check_reg_mask(sensor->slv_addr, 0x5183, 0x80); - sensor->status.agc = !check_reg_mask(sensor->slv_addr, AEC_PK_MANUAL, AEC_PK_MANUAL_AGC_MANUALEN); - sensor->status.aec = !check_reg_mask(sensor->slv_addr, AEC_PK_MANUAL, AEC_PK_MANUAL_AEC_MANUALEN); - sensor->status.hmirror = check_reg_mask(sensor->slv_addr, TIMING_TC_REG21, TIMING_TC_REG21_HMIRROR); - sensor->status.vflip = check_reg_mask(sensor->slv_addr, TIMING_TC_REG20, TIMING_TC_REG20_VFLIP); - sensor->status.colorbar = check_reg_mask(sensor->slv_addr, PRE_ISP_TEST_SETTING_1, TEST_COLOR_BAR); - sensor->status.bpc = check_reg_mask(sensor->slv_addr, 0x5000, 0x04); - sensor->status.wpc = check_reg_mask(sensor->slv_addr, 0x5000, 0x02); - sensor->status.raw_gma = check_reg_mask(sensor->slv_addr, 0x5000, 0x20); - sensor->status.lenc = check_reg_mask(sensor->slv_addr, 0x5000, 0x80); - sensor->status.quality = read_reg(sensor->slv_addr, COMPRESSION_CTRL07) & 0x3f; - sensor->status.special_effect = 0; - sensor->status.wb_mode = 0; - sensor->status.awb_gain = check_reg_mask(sensor->slv_addr, 0x3406, 0x01); - sensor->status.agc_gain = get_agc_gain(sensor); - sensor->status.aec_value = get_aec_value(sensor); - sensor->status.aec2 = check_reg_mask(sensor->slv_addr, 0x3a00, 0x04); - return 0; -} - -int ov3660_detect(int slv_addr, sensor_id_t *id) -{ - if (OV3660_SCCB_ADDR == slv_addr) { - uint8_t h = SCCB_Read16(slv_addr, 0x300A); - uint8_t l = SCCB_Read16(slv_addr, 0x300B); - uint16_t PID = (h<<8) | l; - if (OV3660_PID == PID) { - id->PID = PID; - return PID; - } else { - ESP_LOGI(TAG, "Mismatch PID=0x%x", PID); - } - } - return 0; -} - -int ov3660_init(sensor_t *sensor) -{ - sensor->reset = reset; - sensor->set_pixformat = set_pixformat; - sensor->set_framesize = set_framesize; - sensor->set_contrast = set_contrast; - sensor->set_brightness = set_brightness; - sensor->set_saturation = set_saturation; - sensor->set_sharpness = set_sharpness; - sensor->set_gainceiling = set_gainceiling; - sensor->set_quality = set_quality; - sensor->set_colorbar = set_colorbar; - sensor->set_gain_ctrl = set_gain_ctrl; - sensor->set_exposure_ctrl = set_exposure_ctrl; - sensor->set_whitebal = set_whitebal; - sensor->set_hmirror = set_hmirror; - sensor->set_vflip = set_vflip; - sensor->init_status = init_status; - sensor->set_aec2 = set_aec2; - sensor->set_aec_value = set_aec_value; - sensor->set_special_effect = set_special_effect; - sensor->set_wb_mode = set_wb_mode; - sensor->set_ae_level = set_ae_level; - sensor->set_dcw = set_dcw_dsp; - sensor->set_bpc = set_bpc_dsp; - sensor->set_wpc = set_wpc_dsp; - sensor->set_awb_gain = set_awb_gain_dsp; - sensor->set_agc_gain = set_agc_gain; - sensor->set_raw_gma = set_raw_gma_dsp; - sensor->set_lenc = set_lenc_dsp; - sensor->set_denoise = set_denoise; - - sensor->get_reg = get_reg; - sensor->set_reg = set_reg; - sensor->set_res_raw = set_res_raw; - sensor->set_pll = _set_pll; - sensor->set_xclk = set_xclk; - return 0; -} diff --git a/lib/libesp32_div/esp32-camera/sensors/ov5640.c b/lib/libesp32_div/esp32-camera/sensors/ov5640.c deleted file mode 100644 index a32b374f5..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/ov5640.c +++ /dev/null @@ -1,1130 +0,0 @@ -/* - * This file is part of the OpenMV project. - * Copyright (c) 2013/2014 Ibrahim Abdelkader - * This work is licensed under the MIT license, see the file LICENSE for details. - * - * OV3660 driver. - * - */ -#include -#include -#include -#include "sccb.h" -#include "xclk.h" -#include "ov5640.h" -#include "ov5640_regs.h" -#include "ov5640_settings.h" -#include "freertos/FreeRTOS.h" -#include "freertos/task.h" - -#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) -#include "esp32-hal-log.h" -#else -#include "esp_log.h" -static const char *TAG = "ov5640"; -#endif - -//#define REG_DEBUG_ON - -static int read_reg(uint8_t slv_addr, const uint16_t reg){ - int ret = SCCB_Read16(slv_addr, reg); -#ifdef REG_DEBUG_ON - if (ret < 0) { - ESP_LOGE(TAG, "READ REG 0x%04x FAILED: %d", reg, ret); - } -#endif - return ret; -} - -static int check_reg_mask(uint8_t slv_addr, uint16_t reg, uint8_t mask){ - return (read_reg(slv_addr, reg) & mask) == mask; -} - -static int read_reg16(uint8_t slv_addr, const uint16_t reg){ - int ret = 0, ret2 = 0; - ret = read_reg(slv_addr, reg); - if (ret >= 0) { - ret = (ret & 0xFF) << 8; - ret2 = read_reg(slv_addr, reg+1); - if (ret2 < 0) { - ret = ret2; - } else { - ret |= ret2 & 0xFF; - } - } - return ret; -} - -//static void dump_reg(sensor_t *sensor, const uint16_t reg){ -// int v = SCCB_Read16(sensor->slv_addr, reg); -// if(v < 0){ -// ets_printf(" 0x%04x: FAIL[%d]\n", reg, v); -// } else { -// ets_printf(" 0x%04x: 0x%02X\n", reg, v); -// } -//} -// -//static void dump_range(sensor_t *sensor, const char * name, const uint16_t start_reg, const uint16_t end_reg){ -// ets_printf("%s: 0x%04x - 0x%04X\n", name, start_reg, end_reg); -// for(uint16_t reg = start_reg; reg <= end_reg; reg++){ -// dump_reg(sensor, reg); -// } -//} -// -//static void dump_regs(sensor_t *sensor){ -//// dump_range(sensor, "All Regs", 0x3000, 0x6100); -//// dump_range(sensor, "system and IO pad control", 0x3000, 0x3052); -//// dump_range(sensor, "SCCB control", 0x3100, 0x3108); -//// dump_range(sensor, "SRB control", 0x3200, 0x3211); -//// dump_range(sensor, "AWB gain control", 0x3400, 0x3406); -//// dump_range(sensor, "AEC/AGC control", 0x3500, 0x350D); -//// dump_range(sensor, "VCM control", 0x3600, 0x3606); -//// dump_range(sensor, "timing control", 0x3800, 0x3821); -//// dump_range(sensor, "AEC/AGC power down domain control", 0x3A00, 0x3A25); -//// dump_range(sensor, "strobe control", 0x3B00, 0x3B0C); -//// dump_range(sensor, "50/60Hz detector control", 0x3C00, 0x3C1E); -//// dump_range(sensor, "OTP control", 0x3D00, 0x3D21); -//// dump_range(sensor, "MC control", 0x3F00, 0x3F0D); -//// dump_range(sensor, "BLC control", 0x4000, 0x4033); -//// dump_range(sensor, "frame control", 0x4201, 0x4202); -//// dump_range(sensor, "format control", 0x4300, 0x430D); -//// dump_range(sensor, "JPEG control", 0x4400, 0x4431); -//// dump_range(sensor, "VFIFO control", 0x4600, 0x460D); -//// dump_range(sensor, "DVP control", 0x4709, 0x4745); -//// dump_range(sensor, "MIPI control", 0x4800, 0x4837); -//// dump_range(sensor, "ISP frame control", 0x4901, 0x4902); -//// dump_range(sensor, "ISP top control", 0x5000, 0x5063); -//// dump_range(sensor, "AWB control", 0x5180, 0x51D0); -//// dump_range(sensor, "CIP control", 0x5300, 0x530F); -//// dump_range(sensor, "CMX control", 0x5380, 0x538B); -//// dump_range(sensor, "gamma control", 0x5480, 0x5490); -//// dump_range(sensor, "SDE control", 0x5580, 0x558C); -//// dump_range(sensor, "scale control", 0x5600, 0x5606); -//// dump_range(sensor, "AVG control", 0x5680, 0x56A2); -//// dump_range(sensor, "LENC control", 0x5800, 0x5849); -//// dump_range(sensor, "AFC control", 0x6000, 0x603F); -//} - -static int write_reg(uint8_t slv_addr, const uint16_t reg, uint8_t value){ - int ret = 0; -#ifndef REG_DEBUG_ON - ret = SCCB_Write16(slv_addr, reg, value); -#else - int old_value = read_reg(slv_addr, reg); - if (old_value < 0) { - return old_value; - } - if ((uint8_t)old_value != value) { - ESP_LOGI(TAG, "NEW REG 0x%04x: 0x%02x to 0x%02x", reg, (uint8_t)old_value, value); - ret = SCCB_Write16(slv_addr, reg, value); - } else { - ESP_LOGD(TAG, "OLD REG 0x%04x: 0x%02x", reg, (uint8_t)old_value); - ret = SCCB_Write16(slv_addr, reg, value);//maybe not? - } - if (ret < 0) { - ESP_LOGE(TAG, "WRITE REG 0x%04x FAILED: %d", reg, ret); - } -#endif - return ret; -} - -static int set_reg_bits(uint8_t slv_addr, uint16_t reg, uint8_t offset, uint8_t mask, uint8_t value) -{ - int ret = 0; - uint8_t c_value, new_value; - ret = read_reg(slv_addr, reg); - if(ret < 0) { - return ret; - } - c_value = ret; - new_value = (c_value & ~(mask << offset)) | ((value & mask) << offset); - ret = write_reg(slv_addr, reg, new_value); - return ret; -} - -static int write_regs(uint8_t slv_addr, const uint16_t (*regs)[2]) -{ - int i = 0, ret = 0; - while (!ret && regs[i][0] != REGLIST_TAIL) { - if (regs[i][0] == REG_DLY) { - vTaskDelay(regs[i][1] / portTICK_PERIOD_MS); - } else { - ret = write_reg(slv_addr, regs[i][0], regs[i][1]); - } - i++; - } - return ret; -} - -static int write_reg16(uint8_t slv_addr, const uint16_t reg, uint16_t value) -{ - if (write_reg(slv_addr, reg, value >> 8) || write_reg(slv_addr, reg + 1, value)) { - return -1; - } - return 0; -} - -static int write_addr_reg(uint8_t slv_addr, const uint16_t reg, uint16_t x_value, uint16_t y_value) -{ - if (write_reg16(slv_addr, reg, x_value) || write_reg16(slv_addr, reg + 2, y_value)) { - return -1; - } - return 0; -} - -#define write_reg_bits(slv_addr, reg, mask, enable) set_reg_bits(slv_addr, reg, 0, mask, (enable)?(mask):0) - -static int calc_sysclk(int xclk, bool pll_bypass, int pll_multiplier, int pll_sys_div, int pre_div, bool root_2x, int pclk_root_div, bool pclk_manual, int pclk_div) -{ - const float pll_pre_div2x_map[] = { 1, 1, 2, 3, 4, 1.5, 6, 2.5, 8}; - const int pll_pclk_root_div_map[] = { 1, 2, 4, 8 }; - - if(!pll_sys_div) { - pll_sys_div = 1; - } - - float pll_pre_div = pll_pre_div2x_map[pre_div]; - unsigned int root_2x_div = root_2x?2:1; - unsigned int pll_pclk_root_div = pll_pclk_root_div_map[pclk_root_div]; - - unsigned int REFIN = xclk / pll_pre_div; - - unsigned int VCO = REFIN * pll_multiplier / root_2x_div; - - unsigned int PLL_CLK = pll_bypass?(xclk):(VCO / pll_sys_div * 2 / 5);//5 here is 10bit mode / 2, for 8bit it should be 4 (reg 0x3034) - - unsigned int PCLK = PLL_CLK / pll_pclk_root_div / ((pclk_manual && pclk_div)?pclk_div:2); - - unsigned int SYSCLK = PLL_CLK / 4; - - ESP_LOGI(TAG, "Calculated XVCLK: %d Hz, REFIN: %u Hz, VCO: %u Hz, PLL_CLK: %u Hz, SYSCLK: %u Hz, PCLK: %u Hz", xclk, REFIN, VCO, PLL_CLK, SYSCLK, PCLK); - return SYSCLK; -} - -static int set_pll(sensor_t *sensor, bool bypass, uint8_t multiplier, uint8_t sys_div, uint8_t pre_div, bool root_2x, uint8_t pclk_root_div, bool pclk_manual, uint8_t pclk_div){ - int ret = 0; - if(multiplier > 252 || multiplier < 4 || sys_div > 15 || pre_div > 8 || pclk_div > 31 || pclk_root_div > 3){ - ESP_LOGE(TAG, "Invalid arguments"); - return -1; - } - if(multiplier > 127){ - multiplier &= 0xFE;//only even integers above 127 - } - ESP_LOGI(TAG, "Set PLL: bypass: %u, multiplier: %u, sys_div: %u, pre_div: %u, root_2x: %u, pclk_root_div: %u, pclk_manual: %u, pclk_div: %u", bypass, multiplier, sys_div, pre_div, root_2x, pclk_root_div, pclk_manual, pclk_div); - - calc_sysclk(sensor->xclk_freq_hz, bypass, multiplier, sys_div, pre_div, root_2x, pclk_root_div, pclk_manual, pclk_div); - - ret = write_reg(sensor->slv_addr, 0x3039, bypass?0x80:0x00); - if (ret == 0) { - ret = write_reg(sensor->slv_addr, 0x3034, 0x1A);//10bit mode - } - if (ret == 0) { - ret = write_reg(sensor->slv_addr, 0x3035, 0x01 | ((sys_div & 0x0f) << 4)); - } - if (ret == 0) { - ret = write_reg(sensor->slv_addr, 0x3036, multiplier & 0xff); - } - if (ret == 0) { - ret = write_reg(sensor->slv_addr, 0x3037, (pre_div & 0xf) | (root_2x?0x10:0x00)); - } - if (ret == 0) { - ret = write_reg(sensor->slv_addr, 0x3108, (pclk_root_div & 0x3) << 4 | 0x06); - } - if (ret == 0) { - ret = write_reg(sensor->slv_addr, 0x3824, pclk_div & 0x1f); - } - if (ret == 0) { - ret = write_reg(sensor->slv_addr, 0x460C, pclk_manual?0x22:0x20); - } - if (ret == 0) { - ret = write_reg(sensor->slv_addr, 0x3103, 0x13);// system clock from pll, bit[1] - } - if(ret){ - ESP_LOGE(TAG, "set_sensor_pll FAILED!"); - } - return ret; -} - -static int set_ae_level(sensor_t *sensor, int level); - -static int reset(sensor_t *sensor) -{ - //dump_regs(sensor); - vTaskDelay(100 / portTICK_PERIOD_MS); - int ret = 0; - // Software Reset: clear all registers and reset them to their default values - ret = write_reg(sensor->slv_addr, SYSTEM_CTROL0, 0x82); - if(ret){ - ESP_LOGE(TAG, "Software Reset FAILED!"); - return ret; - } - vTaskDelay(100 / portTICK_PERIOD_MS); - ret = write_regs(sensor->slv_addr, sensor_default_regs); - if (ret == 0) { - ESP_LOGD(TAG, "Camera defaults loaded"); - vTaskDelay(100 / portTICK_PERIOD_MS); - //write_regs(sensor->slv_addr, sensor_regs_awb0); - //write_regs(sensor->slv_addr, sensor_regs_gamma1); - } - return ret; -} - -static int set_pixformat(sensor_t *sensor, pixformat_t pixformat) -{ - int ret = 0; - const uint16_t (*regs)[2]; - - switch (pixformat) { - case PIXFORMAT_YUV422: - regs = sensor_fmt_yuv422; - break; - - case PIXFORMAT_GRAYSCALE: - regs = sensor_fmt_grayscale; - break; - - case PIXFORMAT_RGB565: - case PIXFORMAT_RGB888: - regs = sensor_fmt_rgb565; - break; - - case PIXFORMAT_JPEG: - regs = sensor_fmt_jpeg; - break; - - case PIXFORMAT_RAW: - regs = sensor_fmt_raw; - break; - - default: - ESP_LOGE(TAG, "Unsupported pixformat: %u", pixformat); - return -1; - } - - ret = write_regs(sensor->slv_addr, regs); - if(ret == 0) { - sensor->pixformat = pixformat; - ESP_LOGD(TAG, "Set pixformat to: %u", pixformat); - } - return ret; -} - -static int set_image_options(sensor_t *sensor) -{ - int ret = 0; - uint8_t reg20 = 0; - uint8_t reg21 = 0; - uint8_t reg4514 = 0; - uint8_t reg4514_test = 0; - - // compression - if (sensor->pixformat == PIXFORMAT_JPEG) { - reg21 |= 0x20; - } - - // binning - if (!sensor->status.binning) { - reg20 |= 0x40; - } else { - reg20 |= 0x01; - reg21 |= 0x01; - reg4514_test |= 4; - } - - // V-Flip - if (sensor->status.vflip) { - reg20 |= 0x06; - reg4514_test |= 1; - } - - // H-Mirror - if (sensor->status.hmirror) { - reg21 |= 0x06; - reg4514_test |= 2; - } - - switch (reg4514_test) { - //no binning - case 0: reg4514 = 0x88; break;//normal - case 1: reg4514 = 0x00; break;//v-flip - case 2: reg4514 = 0xbb; break;//h-mirror - case 3: reg4514 = 0x00; break;//v-flip+h-mirror - //binning - case 4: reg4514 = 0xaa; break;//normal - case 5: reg4514 = 0xbb; break;//v-flip - case 6: reg4514 = 0xbb; break;//h-mirror - case 7: reg4514 = 0xaa; break;//v-flip+h-mirror - } - - if(write_reg(sensor->slv_addr, TIMING_TC_REG20, reg20) - || write_reg(sensor->slv_addr, TIMING_TC_REG21, reg21) - || write_reg(sensor->slv_addr, 0x4514, reg4514)){ - ESP_LOGE(TAG, "Setting Image Options Failed"); - return -1; - } - - if (!sensor->status.binning) { - ret = write_reg(sensor->slv_addr, 0x4520, 0x10) - || write_reg(sensor->slv_addr, X_INCREMENT, 0x11)//odd:1, even: 1 - || write_reg(sensor->slv_addr, Y_INCREMENT, 0x11);//odd:1, even: 1 - } else { - ret = write_reg(sensor->slv_addr, 0x4520, 0x0b) - || write_reg(sensor->slv_addr, X_INCREMENT, 0x31)//odd:3, even: 1 - || write_reg(sensor->slv_addr, Y_INCREMENT, 0x31);//odd:3, even: 1 - } - - ESP_LOGD(TAG, "Set Image Options: Compression: %u, Binning: %u, V-Flip: %u, H-Mirror: %u, Reg-4514: 0x%02x", - sensor->pixformat == PIXFORMAT_JPEG, sensor->status.binning, sensor->status.vflip, sensor->status.hmirror, reg4514); - return ret; -} - -static int set_framesize(sensor_t *sensor, framesize_t framesize) -{ - int ret = 0; - framesize_t old_framesize = sensor->status.framesize; - sensor->status.framesize = framesize; - - if(framesize > FRAMESIZE_QSXGA){ - ESP_LOGE(TAG, "Invalid framesize: %u", framesize); - return -1; - } - uint16_t w = resolution[framesize].width; - uint16_t h = resolution[framesize].height; - aspect_ratio_t ratio = resolution[framesize].aspect_ratio; - ratio_settings_t settings = ratio_table[ratio]; - - sensor->status.binning = (w <= (settings.max_width / 2) && h <= (settings.max_height / 2)); - sensor->status.scale = !((w == settings.max_width && h == settings.max_height) - || (w == (settings.max_width / 2) && h == (settings.max_height / 2))); - - ret = write_addr_reg(sensor->slv_addr, X_ADDR_ST_H, settings.start_x, settings.start_y) - || write_addr_reg(sensor->slv_addr, X_ADDR_END_H, settings.end_x, settings.end_y) - || write_addr_reg(sensor->slv_addr, X_OUTPUT_SIZE_H, w, h); - - if (ret) { - goto fail; - } - - if (!sensor->status.binning) { - ret = write_addr_reg(sensor->slv_addr, X_TOTAL_SIZE_H, settings.total_x, settings.total_y) - || write_addr_reg(sensor->slv_addr, X_OFFSET_H, settings.offset_x, settings.offset_y); - } else { - if (w > 920) { - ret = write_addr_reg(sensor->slv_addr, X_TOTAL_SIZE_H, settings.total_x - 200, settings.total_y / 2); - } else { - ret = write_addr_reg(sensor->slv_addr, X_TOTAL_SIZE_H, 2060, settings.total_y / 2); - } - if (ret == 0) { - ret = write_addr_reg(sensor->slv_addr, X_OFFSET_H, settings.offset_x / 2, settings.offset_y / 2); - } - } - - if (ret == 0) { - ret = write_reg_bits(sensor->slv_addr, ISP_CONTROL_01, 0x20, sensor->status.scale); - } - - if (ret == 0) { - ret = set_image_options(sensor); - } - - if (ret) { - goto fail; - } - - if (sensor->pixformat == PIXFORMAT_JPEG) { - //10MHz PCLK - uint8_t sys_mul = 200; - if(framesize < FRAMESIZE_QVGA || sensor->xclk_freq_hz == 16000000){ - sys_mul = 160; - } else if(framesize < FRAMESIZE_XGA){ - sys_mul = 180; - } - ret = set_pll(sensor, false, sys_mul, 4, 2, false, 2, true, 4); - //Set PLL: bypass: 0, multiplier: sys_mul, sys_div: 4, pre_div: 2, root_2x: 0, pclk_root_div: 2, pclk_manual: 1, pclk_div: 4 - } else { - //ret = set_pll(sensor, false, 8, 1, 1, false, 1, true, 4); - if (framesize > FRAMESIZE_HVGA) { - ret = set_pll(sensor, false, 10, 1, 2, false, 1, true, 2); - } else if (framesize >= FRAMESIZE_QVGA) { - ret = set_pll(sensor, false, 8, 1, 1, false, 1, true, 4); - } else { - ret = set_pll(sensor, false, 20, 1, 1, false, 1, true, 8); - } - } - - if (ret == 0) { - ESP_LOGD(TAG, "Set framesize to: %ux%u", w, h); - } - return ret; - -fail: - sensor->status.framesize = old_framesize; - ESP_LOGE(TAG, "Setting framesize to: %ux%u failed", w, h); - return ret; -} - -static int set_hmirror(sensor_t *sensor, int enable) -{ - int ret = 0; - sensor->status.hmirror = enable; - ret = set_image_options(sensor); - if (ret == 0) { - ESP_LOGD(TAG, "Set h-mirror to: %d", enable); - } - return ret; -} - -static int set_vflip(sensor_t *sensor, int enable) -{ - int ret = 0; - sensor->status.vflip = enable; - ret = set_image_options(sensor); - if (ret == 0) { - ESP_LOGD(TAG, "Set v-flip to: %d", enable); - } - return ret; -} - -static int set_quality(sensor_t *sensor, int qs) -{ - int ret = 0; - ret = write_reg(sensor->slv_addr, COMPRESSION_CTRL07, qs & 0x3f); - if (ret == 0) { - sensor->status.quality = qs; - ESP_LOGD(TAG, "Set quality to: %d", qs); - } - return ret; -} - -static int set_colorbar(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = write_reg_bits(sensor->slv_addr, PRE_ISP_TEST_SETTING_1, TEST_COLOR_BAR, enable); - if (ret == 0) { - sensor->status.colorbar = enable; - ESP_LOGD(TAG, "Set colorbar to: %d", enable); - } - return ret; -} - -static int set_gain_ctrl(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = write_reg_bits(sensor->slv_addr, AEC_PK_MANUAL, AEC_PK_MANUAL_AGC_MANUALEN, !enable); - if (ret == 0) { - ESP_LOGD(TAG, "Set gain_ctrl to: %d", enable); - sensor->status.agc = enable; - } - return ret; -} - -static int set_exposure_ctrl(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = write_reg_bits(sensor->slv_addr, AEC_PK_MANUAL, AEC_PK_MANUAL_AEC_MANUALEN, !enable); - if (ret == 0) { - ESP_LOGD(TAG, "Set exposure_ctrl to: %d", enable); - sensor->status.aec = enable; - } - return ret; -} - -static int set_whitebal(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = write_reg_bits(sensor->slv_addr, ISP_CONTROL_01, 0x01, enable); - if (ret == 0) { - ESP_LOGD(TAG, "Set awb to: %d", enable); - sensor->status.awb = enable; - } - return ret; -} - -//Advanced AWB -static int set_dcw_dsp(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = write_reg_bits(sensor->slv_addr, 0x5183, 0x80, !enable); - if (ret == 0) { - ESP_LOGD(TAG, "Set dcw to: %d", enable); - sensor->status.dcw = enable; - } - return ret; -} - -//night mode enable -static int set_aec2(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = write_reg_bits(sensor->slv_addr, 0x3a00, 0x04, enable); - if (ret == 0) { - ESP_LOGD(TAG, "Set aec2 to: %d", enable); - sensor->status.aec2 = enable; - } - return ret; -} - -static int set_bpc_dsp(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = write_reg_bits(sensor->slv_addr, 0x5000, 0x04, enable); - if (ret == 0) { - ESP_LOGD(TAG, "Set bpc to: %d", enable); - sensor->status.bpc = enable; - } - return ret; -} - -static int set_wpc_dsp(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = write_reg_bits(sensor->slv_addr, 0x5000, 0x02, enable); - if (ret == 0) { - ESP_LOGD(TAG, "Set wpc to: %d", enable); - sensor->status.wpc = enable; - } - return ret; -} - -//Gamma enable -static int set_raw_gma_dsp(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = write_reg_bits(sensor->slv_addr, 0x5000, 0x20, enable); - if (ret == 0) { - ESP_LOGD(TAG, "Set raw_gma to: %d", enable); - sensor->status.raw_gma = enable; - } - return ret; -} - -static int set_lenc_dsp(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = write_reg_bits(sensor->slv_addr, 0x5000, 0x80, enable); - if (ret == 0) { - ESP_LOGD(TAG, "Set lenc to: %d", enable); - sensor->status.lenc = enable; - } - return ret; -} - -static int get_agc_gain(sensor_t *sensor) -{ - int ra = read_reg(sensor->slv_addr, 0x350a); - if (ra < 0) { - return 0; - } - int rb = read_reg(sensor->slv_addr, 0x350b); - if (rb < 0) { - return 0; - } - int res = (rb & 0xF0) >> 4 | (ra & 0x03) << 4; - if (rb & 0x0F) { - res += 1; - } - return res; -} - -//real gain -static int set_agc_gain(sensor_t *sensor, int gain) -{ - int ret = 0; - if(gain < 0) { - gain = 0; - } else if(gain > 64) { - gain = 64; - } - - //gain value is 6.4 bits float - //in order to use the max range, we deduct 1/16 - int gainv = gain << 4; - if(gainv){ - gainv -= 1; - } - - ret = write_reg(sensor->slv_addr, 0x350a, gainv >> 8) || write_reg(sensor->slv_addr, 0x350b, gainv & 0xff); - if (ret == 0) { - ESP_LOGD(TAG, "Set agc_gain to: %d", gain); - sensor->status.agc_gain = gain; - } - return ret; -} - -static int get_aec_value(sensor_t *sensor) -{ - int ra = read_reg(sensor->slv_addr, 0x3500); - if (ra < 0) { - return 0; - } - int rb = read_reg(sensor->slv_addr, 0x3501); - if (rb < 0) { - return 0; - } - int rc = read_reg(sensor->slv_addr, 0x3502); - if (rc < 0) { - return 0; - } - int res = (ra & 0x0F) << 12 | (rb & 0xFF) << 4 | (rc & 0xF0) >> 4; - return res; -} - -static int set_aec_value(sensor_t *sensor, int value) -{ - int ret = 0, max_val = 0; - max_val = read_reg16(sensor->slv_addr, 0x380e); - if (max_val < 0) { - ESP_LOGE(TAG, "Could not read max aec_value"); - return -1; - } - if (value > max_val) { - value =max_val; - } - - ret = write_reg(sensor->slv_addr, 0x3500, (value >> 12) & 0x0F) - || write_reg(sensor->slv_addr, 0x3501, (value >> 4) & 0xFF) - || write_reg(sensor->slv_addr, 0x3502, (value << 4) & 0xF0); - - if (ret == 0) { - ESP_LOGD(TAG, "Set aec_value to: %d / %d", value, max_val); - sensor->status.aec_value = value; - } - return ret; -} - -static int set_ae_level(sensor_t *sensor, int level) -{ - int ret = 0; - if (level < -5 || level > 5) { - return -1; - } - //good targets are between 5 and 115 - int target_level = ((level + 5) * 10) + 5; - - int level_high, level_low; - int fast_high, fast_low; - - level_low = target_level * 23 / 25; //0.92 (0.46) - level_high = target_level * 27 / 25; //1.08 (2.08) - - fast_low = level_low >> 1; - fast_high = level_high << 1; - - if(fast_high>255) { - fast_high = 255; - } - - ret = write_reg(sensor->slv_addr, 0x3a0f, level_high) - || write_reg(sensor->slv_addr, 0x3a10, level_low) - || write_reg(sensor->slv_addr, 0x3a1b, level_high) - || write_reg(sensor->slv_addr, 0x3a1e, level_low) - || write_reg(sensor->slv_addr, 0x3a11, fast_high) - || write_reg(sensor->slv_addr, 0x3a1f, fast_low); - - if (ret == 0) { - ESP_LOGD(TAG, "Set ae_level to: %d", level); - sensor->status.ae_level = level; - } - return ret; -} - -static int set_wb_mode(sensor_t *sensor, int mode) -{ - int ret = 0; - if (mode < 0 || mode > 4) { - return -1; - } - - ret = write_reg(sensor->slv_addr, 0x3406, (mode != 0)); - if (ret) { - return ret; - } - switch (mode) { - case 1://Sunny - ret = write_reg16(sensor->slv_addr, 0x3400, 0x5e0) //AWB R GAIN - || write_reg16(sensor->slv_addr, 0x3402, 0x410) //AWB G GAIN - || write_reg16(sensor->slv_addr, 0x3404, 0x540);//AWB B GAIN - break; - case 2://Cloudy - ret = write_reg16(sensor->slv_addr, 0x3400, 0x650) //AWB R GAIN - || write_reg16(sensor->slv_addr, 0x3402, 0x410) //AWB G GAIN - || write_reg16(sensor->slv_addr, 0x3404, 0x4f0);//AWB B GAIN - break; - case 3://Office - ret = write_reg16(sensor->slv_addr, 0x3400, 0x520) //AWB R GAIN - || write_reg16(sensor->slv_addr, 0x3402, 0x410) //AWB G GAIN - || write_reg16(sensor->slv_addr, 0x3404, 0x660);//AWB B GAIN - break; - case 4://HOME - ret = write_reg16(sensor->slv_addr, 0x3400, 0x420) //AWB R GAIN - || write_reg16(sensor->slv_addr, 0x3402, 0x3f0) //AWB G GAIN - || write_reg16(sensor->slv_addr, 0x3404, 0x710);//AWB B GAIN - break; - default://AUTO - break; - } - - if (ret == 0) { - ESP_LOGD(TAG, "Set wb_mode to: %d", mode); - sensor->status.wb_mode = mode; - } - return ret; -} - -static int set_awb_gain_dsp(sensor_t *sensor, int enable) -{ - int ret = 0; - int old_mode = sensor->status.wb_mode; - int mode = enable?old_mode:0; - - ret = set_wb_mode(sensor, mode); - - if (ret == 0) { - sensor->status.wb_mode = old_mode; - ESP_LOGD(TAG, "Set awb_gain to: %d", enable); - sensor->status.awb_gain = enable; - } - return ret; -} - -static int set_special_effect(sensor_t *sensor, int effect) -{ - int ret=0; - if (effect < 0 || effect > 6) { - return -1; - } - - uint8_t * regs = (uint8_t *)sensor_special_effects[effect]; - ret = write_reg(sensor->slv_addr, 0x5580, regs[0]) - || write_reg(sensor->slv_addr, 0x5583, regs[1]) - || write_reg(sensor->slv_addr, 0x5584, regs[2]) - || write_reg(sensor->slv_addr, 0x5003, regs[3]); - - if (ret == 0) { - ESP_LOGD(TAG, "Set special_effect to: %d", effect); - sensor->status.special_effect = effect; - } - return ret; -} - -static int set_brightness(sensor_t *sensor, int level) -{ - int ret = 0; - uint8_t value = 0; - bool negative = false; - - switch (level) { - case 3: - value = 0x30; - break; - case 2: - value = 0x20; - break; - case 1: - value = 0x10; - break; - case -1: - value = 0x10; - negative = true; - break; - case -2: - value = 0x20; - negative = true; - break; - case -3: - value = 0x30; - negative = true; - break; - default: // 0 - break; - } - - ret = write_reg(sensor->slv_addr, 0x5587, value); - if (ret == 0) { - ret = write_reg_bits(sensor->slv_addr, 0x5588, 0x08, negative); - } - - if (ret == 0) { - ESP_LOGD(TAG, "Set brightness to: %d", level); - sensor->status.brightness = level; - } - return ret; -} - -static int set_contrast(sensor_t *sensor, int level) -{ - int ret = 0; - if(level > 3 || level < -3) { - return -1; - } - ret = write_reg(sensor->slv_addr, 0x5586, (level + 4) << 3); - - if (ret == 0) { - ESP_LOGD(TAG, "Set contrast to: %d", level); - sensor->status.contrast = level; - } - return ret; -} - -static int set_saturation(sensor_t *sensor, int level) -{ - int ret = 0; - if(level > 4 || level < -4) { - return -1; - } - - uint8_t * regs = (uint8_t *)sensor_saturation_levels[level+4]; - for(int i=0; i<11; i++) { - ret = write_reg(sensor->slv_addr, 0x5381 + i, regs[i]); - if (ret) { - break; - } - } - - if (ret == 0) { - ESP_LOGD(TAG, "Set saturation to: %d", level); - sensor->status.saturation = level; - } - return ret; -} - -static int set_sharpness(sensor_t *sensor, int level) -{ - int ret = 0; - if(level > 3 || level < -3) { - return -1; - } - - uint8_t mt_offset_2 = (level + 3) * 8; - uint8_t mt_offset_1 = mt_offset_2 + 1; - - ret = write_reg_bits(sensor->slv_addr, 0x5308, 0x40, false)//0x40 means auto - || write_reg(sensor->slv_addr, 0x5300, 0x10) - || write_reg(sensor->slv_addr, 0x5301, 0x10) - || write_reg(sensor->slv_addr, 0x5302, mt_offset_1) - || write_reg(sensor->slv_addr, 0x5303, mt_offset_2) - || write_reg(sensor->slv_addr, 0x5309, 0x10) - || write_reg(sensor->slv_addr, 0x530a, 0x10) - || write_reg(sensor->slv_addr, 0x530b, 0x04) - || write_reg(sensor->slv_addr, 0x530c, 0x06); - - if (ret == 0) { - ESP_LOGD(TAG, "Set sharpness to: %d", level); - sensor->status.sharpness = level; - } - return ret; -} - -static int set_gainceiling(sensor_t *sensor, gainceiling_t level) -{ - int ret = 0, l = (int)level; - - ret = write_reg(sensor->slv_addr, 0x3A18, (l >> 8) & 3) - || write_reg(sensor->slv_addr, 0x3A19, l & 0xFF); - - if (ret == 0) { - ESP_LOGD(TAG, "Set gainceiling to: %d", l); - sensor->status.gainceiling = l; - } - return ret; -} - -static int get_denoise(sensor_t *sensor) -{ - if (!check_reg_mask(sensor->slv_addr, 0x5308, 0x10)) { - return 0; - } - return (read_reg(sensor->slv_addr, 0x5306) / 4) + 1; -} - -static int set_denoise(sensor_t *sensor, int level) -{ - int ret = 0; - if (level < 0 || level > 8) { - return -1; - } - - ret = write_reg_bits(sensor->slv_addr, 0x5308, 0x10, level > 0); - if (ret == 0 && level > 0) { - ret = write_reg(sensor->slv_addr, 0x5306, (level - 1) * 4); - } - - if (ret == 0) { - ESP_LOGD(TAG, "Set denoise to: %d", level); - sensor->status.denoise = level; - } - return ret; -} - -static int get_reg(sensor_t *sensor, int reg, int mask) -{ - int ret = 0, ret2 = 0; - if(mask > 0xFF){ - ret = read_reg16(sensor->slv_addr, reg); - if(ret >= 0 && mask > 0xFFFF){ - ret2 = read_reg(sensor->slv_addr, reg+2); - if(ret2 >= 0){ - ret = (ret << 8) | ret2 ; - } else { - ret = ret2; - } - } - } else { - ret = read_reg(sensor->slv_addr, reg); - } - if(ret > 0){ - ret &= mask; - } - return ret; -} - -static int set_reg(sensor_t *sensor, int reg, int mask, int value) -{ - int ret = 0, ret2 = 0; - if(mask > 0xFF){ - ret = read_reg16(sensor->slv_addr, reg); - if(ret >= 0 && mask > 0xFFFF){ - ret2 = read_reg(sensor->slv_addr, reg+2); - if(ret2 >= 0){ - ret = (ret << 8) | ret2 ; - } else { - ret = ret2; - } - } - } else { - ret = read_reg(sensor->slv_addr, reg); - } - if(ret < 0){ - return ret; - } - value = (ret & ~mask) | (value & mask); - if(mask > 0xFFFF){ - ret = write_reg16(sensor->slv_addr, reg, value >> 8); - if(ret >= 0){ - ret = write_reg(sensor->slv_addr, reg+2, value & 0xFF); - } - } else if(mask > 0xFF){ - ret = write_reg16(sensor->slv_addr, reg, value); - } else { - ret = write_reg(sensor->slv_addr, reg, value); - } - return ret; -} - -static int set_res_raw(sensor_t *sensor, int startX, int startY, int endX, int endY, int offsetX, int offsetY, int totalX, int totalY, int outputX, int outputY, bool scale, bool binning) -{ - int ret = 0; - ret = write_addr_reg(sensor->slv_addr, X_ADDR_ST_H, startX, startY) - || write_addr_reg(sensor->slv_addr, X_ADDR_END_H, endX, endY) - || write_addr_reg(sensor->slv_addr, X_OFFSET_H, offsetX, offsetY) - || write_addr_reg(sensor->slv_addr, X_TOTAL_SIZE_H, totalX, totalY) - || write_addr_reg(sensor->slv_addr, X_OUTPUT_SIZE_H, outputX, outputY) - || write_reg_bits(sensor->slv_addr, ISP_CONTROL_01, 0x20, scale); - if(!ret){ - sensor->status.scale = scale; - sensor->status.binning = binning; - ret = set_image_options(sensor); - } - return ret; -} - -static int _set_pll(sensor_t *sensor, int bypass, int multiplier, int sys_div, int root_2x, int pre_div, int seld5, int pclk_manual, int pclk_div) -{ - int ret = 0; - ret = set_pll(sensor, bypass > 0, multiplier, sys_div, pre_div, root_2x > 0, seld5, pclk_manual > 0, pclk_div); - return ret; -} - -static int set_xclk(sensor_t *sensor, int timer, int xclk) -{ - int ret = 0; - sensor->xclk_freq_hz = xclk * 1000000U; - ret = xclk_timer_conf(timer, sensor->xclk_freq_hz); - return ret; -} - -static int init_status(sensor_t *sensor) -{ - sensor->status.brightness = 0; - sensor->status.contrast = 0; - sensor->status.saturation = 0; - sensor->status.sharpness = (read_reg(sensor->slv_addr, 0x5303) / 8) - 3; - sensor->status.denoise = get_denoise(sensor); - sensor->status.ae_level = 0; - sensor->status.gainceiling = read_reg16(sensor->slv_addr, 0x3A18) & 0x3FF; - sensor->status.awb = check_reg_mask(sensor->slv_addr, ISP_CONTROL_01, 0x01); - sensor->status.dcw = !check_reg_mask(sensor->slv_addr, 0x5183, 0x80); - sensor->status.agc = !check_reg_mask(sensor->slv_addr, AEC_PK_MANUAL, AEC_PK_MANUAL_AGC_MANUALEN); - sensor->status.aec = !check_reg_mask(sensor->slv_addr, AEC_PK_MANUAL, AEC_PK_MANUAL_AEC_MANUALEN); - sensor->status.hmirror = check_reg_mask(sensor->slv_addr, TIMING_TC_REG21, TIMING_TC_REG21_HMIRROR); - sensor->status.vflip = check_reg_mask(sensor->slv_addr, TIMING_TC_REG20, TIMING_TC_REG20_VFLIP); - sensor->status.colorbar = check_reg_mask(sensor->slv_addr, PRE_ISP_TEST_SETTING_1, TEST_COLOR_BAR); - sensor->status.bpc = check_reg_mask(sensor->slv_addr, 0x5000, 0x04); - sensor->status.wpc = check_reg_mask(sensor->slv_addr, 0x5000, 0x02); - sensor->status.raw_gma = check_reg_mask(sensor->slv_addr, 0x5000, 0x20); - sensor->status.lenc = check_reg_mask(sensor->slv_addr, 0x5000, 0x80); - sensor->status.quality = read_reg(sensor->slv_addr, COMPRESSION_CTRL07) & 0x3f; - sensor->status.special_effect = 0; - sensor->status.wb_mode = 0; - sensor->status.awb_gain = check_reg_mask(sensor->slv_addr, 0x3406, 0x01); - sensor->status.agc_gain = get_agc_gain(sensor); - sensor->status.aec_value = get_aec_value(sensor); - sensor->status.aec2 = check_reg_mask(sensor->slv_addr, 0x3a00, 0x04); - return 0; -} - -int ov5640_detect(int slv_addr, sensor_id_t *id) -{ - if (OV5640_SCCB_ADDR == slv_addr) { - uint8_t h = SCCB_Read16(slv_addr, 0x300A); - uint8_t l = SCCB_Read16(slv_addr, 0x300B); - uint16_t PID = (h<<8) | l; - if (OV5640_PID == PID) { - id->PID = PID; - return PID; - } else { - ESP_LOGI(TAG, "Mismatch PID=0x%x", PID); - } - } - return 0; -} - -int ov5640_init(sensor_t *sensor) -{ - sensor->reset = reset; - sensor->set_pixformat = set_pixformat; - sensor->set_framesize = set_framesize; - sensor->set_contrast = set_contrast; - sensor->set_brightness = set_brightness; - sensor->set_saturation = set_saturation; - sensor->set_sharpness = set_sharpness; - sensor->set_gainceiling = set_gainceiling; - sensor->set_quality = set_quality; - sensor->set_colorbar = set_colorbar; - sensor->set_gain_ctrl = set_gain_ctrl; - sensor->set_exposure_ctrl = set_exposure_ctrl; - sensor->set_whitebal = set_whitebal; - sensor->set_hmirror = set_hmirror; - sensor->set_vflip = set_vflip; - sensor->init_status = init_status; - sensor->set_aec2 = set_aec2; - sensor->set_aec_value = set_aec_value; - sensor->set_special_effect = set_special_effect; - sensor->set_wb_mode = set_wb_mode; - sensor->set_ae_level = set_ae_level; - sensor->set_dcw = set_dcw_dsp; - sensor->set_bpc = set_bpc_dsp; - sensor->set_wpc = set_wpc_dsp; - sensor->set_awb_gain = set_awb_gain_dsp; - sensor->set_agc_gain = set_agc_gain; - sensor->set_raw_gma = set_raw_gma_dsp; - sensor->set_lenc = set_lenc_dsp; - sensor->set_denoise = set_denoise; - - sensor->get_reg = get_reg; - sensor->set_reg = set_reg; - sensor->set_res_raw = set_res_raw; - sensor->set_pll = _set_pll; - sensor->set_xclk = set_xclk; - return 0; -} diff --git a/lib/libesp32_div/esp32-camera/sensors/ov7670.c b/lib/libesp32_div/esp32-camera/sensors/ov7670.c deleted file mode 100644 index b9dcf2327..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/ov7670.c +++ /dev/null @@ -1,457 +0,0 @@ -/* - * This file is part of the OpenMV project. - * author: Juan Schiavoni - * This work is licensed under the MIT license, see the file LICENSE for details. - * - * OV7725 driver. - * - */ -#include -#include -#include -#include "sccb.h" -#include "ov7670.h" -#include "ov7670_regs.h" -#include "freertos/FreeRTOS.h" -#include "freertos/task.h" -#include - -#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) -#include "esp32-hal-log.h" -#else -#include "esp_log.h" -static const char* TAG = "ov7760"; -#endif - -static int ov7670_clkrc = 0x01; - -/* - * The default register settings, as obtained from OmniVision. There - * is really no making sense of most of these - lots of "reserved" values - * and such. - * - * These settings give VGA YUYV. - */ -struct regval_list { - uint8_t reg_num; - uint8_t value; -}; - -static struct regval_list ov7670_default_regs[] = { - /* Sensor automatically sets output window when resolution changes. */ - {TSLB, 0x04}, - - /* Frame rate 30 fps at 12 Mhz clock */ - {CLKRC, 0x00}, - {DBLV, 0x4A}, - - {COM10, COM10_VSYNC_NEG | COM10_PCLK_MASK}, - - /* Improve white balance */ - {COM4, 0x40}, - - /* Improve color */ - {RSVD_B0, 0x84}, - - /* Enable 50/60 Hz auto detection */ - {COM11, COM11_EXP|COM11_HZAUTO}, - - /* Disable some delays */ - {HSYST, 0}, - {HSYEN, 0}, - - {MVFP, MVFP_SUN}, - - /* More reserved magic, some of which tweaks white balance */ - {AWBC1, 0x0a}, - {AWBC2, 0xf0}, - {AWBC3, 0x34}, - {AWBC4, 0x58}, - {AWBC5, 0x28}, - {AWBC6, 0x3a}, - - {AWBCTR3, 0x0a}, - {AWBCTR2, 0x55}, - {AWBCTR1, 0x11}, - {AWBCTR0, 0x9e}, - - {COM8, COM8_FAST_AUTO|COM8_STEP_UNLIMIT|COM8_AGC_EN|COM8_AEC_EN|COM8_AWB_EN}, - - /* End marker is FF because in ov7670 the address of GAIN 0 and default value too. */ - {0xFF, 0xFF}, -}; - -static struct regval_list ov7670_fmt_yuv422[] = { - { COM7, 0x0 }, /* Selects YUV mode */ - { RGB444, 0 }, /* No RGB444 please */ - { COM1, 0 }, /* CCIR601 */ - { COM15, COM15_R00FF }, - { MVFP, MVFP_SUN }, - { COM9, 0x6A }, /* 128x gain ceiling; 0x8 is reserved bit */ - { MTX1, 0x80 }, /* "matrix coefficient 1" */ - { MTX2, 0x80 }, /* "matrix coefficient 2" */ - { MTX3, 0 }, /* vb */ - { MTX4, 0x22 }, /* "matrix coefficient 4" */ - { MTX5, 0x5e }, /* "matrix coefficient 5" */ - { MTX6, 0x80 }, /* "matrix coefficient 6" */ - { COM13, COM13_UVSAT }, - { 0xff, 0xff }, /* END MARKER */ -}; - -static struct regval_list ov7670_fmt_rgb565[] = { - { COM7, COM7_FMT_RGB565 }, /* Selects RGB mode */ - { RGB444, 0 }, /* No RGB444 please */ - { COM1, 0x0 }, /* CCIR601 */ - { COM15, COM15_RGB565 |COM15_R00FF }, - { MVFP, MVFP_SUN }, - { COM9, 0x6A }, /* 128x gain ceiling; 0x8 is reserved bit */ - { MTX1, 0xb3 }, /* "matrix coefficient 1" */ - { MTX2, 0xb3 }, /* "matrix coefficient 2" */ - { MTX3, 0 }, /* vb */ - { MTX4, 0x3d }, /* "matrix coefficient 4" */ - { MTX5, 0xa7 }, /* "matrix coefficient 5" */ - { MTX6, 0xe4 }, /* "matrix coefficient 6" */ - { COM13, COM13_UVSAT }, - { 0xff, 0xff }, /* END MARKER */ -}; - - -static struct regval_list ov7670_vga[] = { - { COM3, 0x00 }, - { COM14, 0x00 }, - { SCALING_XSC, 0x3A }, - { SCALING_YSC, 0x35 }, - { SCALING_DCWCTR, 0x11 }, - { SCALING_PCLK_DIV, 0xF0 }, - { SCALING_PCLK_DELAY, 0x02 }, - { 0xff, 0xff }, -}; - -static struct regval_list ov7670_qvga[] = { - { COM3, 0x04 }, - { COM14, 0x19 }, - { SCALING_XSC, 0x3A }, - { SCALING_YSC, 0x35 }, - { SCALING_DCWCTR, 0x11 }, - { SCALING_PCLK_DIV, 0xF1 }, - { SCALING_PCLK_DELAY, 0x02 }, - { 0xff, 0xff }, -}; - -static struct regval_list ov7670_qqvga[] = { - { COM3, 0x04 }, //DCW enable - { COM14, 0x1a }, //pixel clock divided by 4, manual scaling enable, DCW and PCLK controlled by register - { SCALING_XSC, 0x3a }, - { SCALING_YSC, 0x35 }, - { SCALING_DCWCTR, 0x22 }, //downsample by 4 - { SCALING_PCLK_DIV, 0xf2 }, //pixel clock divided by 4 - { SCALING_PCLK_DELAY, 0x02 }, - { 0xff, 0xff }, -}; - -/* - * Write a list of register settings; ff/ff stops the process. - */ -static int ov7670_write_array(sensor_t *sensor, struct regval_list *vals) -{ -int ret = 0; - - while ( (vals->reg_num != 0xff || vals->value != 0xff) && (ret == 0) ) { - ret = SCCB_Write(sensor->slv_addr, vals->reg_num, vals->value); - - ESP_LOGD(TAG, "reset reg %02X, W(%02X) R(%02X)", vals->reg_num, - vals->value, SCCB_Read(sensor->slv_addr, vals->reg_num) ); - - vals++; - } - - return ret; -} - -/* - * Calculate the frame control registers. - */ -static int ov7670_frame_control(sensor_t *sensor, int hstart, int hstop, int vstart, int vstop) -{ -struct regval_list frame[7]; - - frame[0].reg_num = HSTART; - frame[0].value = (hstart >> 3); - - frame[1].reg_num = HSTOP; - frame[1].value = (hstop >> 3); - - frame[2].reg_num = HREF; - frame[2].value = (((hstop & 0x07) << 3) | (hstart & 0x07)); - - frame[3].reg_num = VSTART; - frame[3].value = (vstart >> 2); - - frame[4].reg_num = VSTOP; - frame[4].value = (vstop >> 2); - - frame[5].reg_num = VREF; - frame[5].value = (((vstop & 0x02) << 2) | (vstart & 0x02)); - - /* End mark */ - frame[5].reg_num = 0xFF; - frame[5].value = 0xFF; - - return ov7670_write_array(sensor, frame); -} - -static int reset(sensor_t *sensor) -{ - int ret; - - // Reset all registers - SCCB_Write(sensor->slv_addr, COM7, COM7_RESET); - - // Delay 10 ms - vTaskDelay(10 / portTICK_PERIOD_MS); - - ret = ov7670_write_array(sensor, ov7670_default_regs); - - // Delay - vTaskDelay(30 / portTICK_PERIOD_MS); - - return ret; -} - -static int set_pixformat(sensor_t *sensor, pixformat_t pixformat) -{ -int ret; - - switch (pixformat) { - case PIXFORMAT_RGB565: - case PIXFORMAT_RGB888: - ret = ov7670_write_array(sensor, ov7670_fmt_rgb565); - break; - - case PIXFORMAT_YUV422: - case PIXFORMAT_GRAYSCALE: - default: - ret = ov7670_write_array(sensor, ov7670_fmt_yuv422); - break; - } - - vTaskDelay(30 / portTICK_PERIOD_MS); - - /* - * If we're running RGB565, we must rewrite clkrc after setting - * the other parameters or the image looks poor. If we're *not* - * doing RGB565, we must not rewrite clkrc or the image looks - * *really* poor. - * - * (Update) Now that we retain clkrc state, we should be able - * to write it unconditionally, and that will make the frame - * rate persistent too. - */ - if (pixformat == PIXFORMAT_RGB565) { - ret = SCCB_Write(sensor->slv_addr, CLKRC, ov7670_clkrc); - } - - return ret; -} - -static int set_framesize(sensor_t *sensor, framesize_t framesize) -{ - int ret; - - // store clkrc before changing window settings... - ov7670_clkrc = SCCB_Read(sensor->slv_addr, CLKRC); - - switch (framesize){ - case FRAMESIZE_VGA: - if( (ret = ov7670_write_array(sensor, ov7670_vga)) == 0 ) { - /* These values from Omnivision */ - ret = ov7670_frame_control(sensor, 158, 14, 10, 490); - } - break; - case FRAMESIZE_QVGA: - if( (ret = ov7670_write_array(sensor, ov7670_qvga)) == 0 ) { - /* These values from Omnivision */ - ret = ov7670_frame_control(sensor, 158, 14, 10, 490); - } - break; - case FRAMESIZE_QQVGA: - if( (ret = ov7670_write_array(sensor, ov7670_qqvga)) == 0 ) { - /* These values from Omnivision */ - ret = ov7670_frame_control(sensor, 158, 14, 10, 490); - } - break; - - default: - ret = -1; - } - - vTaskDelay(30 / portTICK_PERIOD_MS); - - if (ret == 0) { - sensor->status.framesize = framesize; - } - - return ret; -} - -static int set_colorbar(sensor_t *sensor, int enable) -{ - uint8_t ret = 0; - // Read register scaling_xsc - uint8_t reg = SCCB_Read(sensor->slv_addr, SCALING_XSC); - - // Pattern to set color bar bit[0]=0 in every case - reg = SCALING_XSC_CBAR(reg); - - // Write pattern to SCALING_XSC - ret = SCCB_Write(sensor->slv_addr, SCALING_XSC, reg); - - // Read register scaling_ysc - reg = SCCB_Read(sensor->slv_addr, SCALING_YSC); - - // Pattern to set color bar bit[0]=0 in every case - reg = SCALING_YSC_CBAR(reg, enable); - - // Write pattern to SCALING_YSC - ret = ret | SCCB_Write(sensor->slv_addr, SCALING_YSC, reg); - - // return 0 or 0xFF - return ret; -} - -static int set_whitebal(sensor_t *sensor, int enable) -{ - // Read register COM8 - uint8_t reg = SCCB_Read(sensor->slv_addr, COM8); - - // Set white bal on/off - reg = COM8_SET_AWB(reg, enable); - - // Write back register COM8 - return SCCB_Write(sensor->slv_addr, COM8, reg); -} - -static int set_gain_ctrl(sensor_t *sensor, int enable) -{ - // Read register COM8 - uint8_t reg = SCCB_Read(sensor->slv_addr, COM8); - - // Set white bal on/off - reg = COM8_SET_AGC(reg, enable); - - // Write back register COM8 - return SCCB_Write(sensor->slv_addr, COM8, reg); -} - -static int set_exposure_ctrl(sensor_t *sensor, int enable) -{ - // Read register COM8 - uint8_t reg = SCCB_Read(sensor->slv_addr, COM8); - - // Set white bal on/off - reg = COM8_SET_AEC(reg, enable); - - // Write back register COM8 - return SCCB_Write(sensor->slv_addr, COM8, reg); -} - -static int set_hmirror(sensor_t *sensor, int enable) -{ - // Read register MVFP - uint8_t reg = SCCB_Read(sensor->slv_addr, MVFP); - - // Set mirror on/off - reg = MVFP_SET_MIRROR(reg, enable); - - // Write back register MVFP - return SCCB_Write(sensor->slv_addr, MVFP, reg); -} - -static int set_vflip(sensor_t *sensor, int enable) -{ - // Read register MVFP - uint8_t reg = SCCB_Read(sensor->slv_addr, MVFP); - - // Set mirror on/off - reg = MVFP_SET_FLIP(reg, enable); - - // Write back register MVFP - return SCCB_Write(sensor->slv_addr, MVFP, reg); -} - -static int init_status(sensor_t *sensor) -{ - sensor->status.awb = 0; - sensor->status.aec = 0; - sensor->status.agc = 0; - sensor->status.hmirror = 0; - sensor->status.vflip = 0; - sensor->status.colorbar = 0; - return 0; -} - -static int set_dummy(sensor_t *sensor, int val){ return -1; } -static int set_gainceiling_dummy(sensor_t *sensor, gainceiling_t val){ return -1; } - -int ov7670_detect(int slv_addr, sensor_id_t *id) -{ - if (OV7670_SCCB_ADDR == slv_addr) { - SCCB_Write(slv_addr, 0xFF, 0x01);//bank sensor - uint16_t PID = SCCB_Read(slv_addr, 0x0A); - if (OV7670_PID == PID) { - id->PID = PID; - id->VER = SCCB_Read(slv_addr, REG_VER); - id->MIDL = SCCB_Read(slv_addr, REG_MIDL); - id->MIDH = SCCB_Read(slv_addr, REG_MIDH); - return PID; - } else { - ESP_LOGI(TAG, "Mismatch PID=0x%x", PID); - } - } - return 0; -} - -int ov7670_init(sensor_t *sensor) -{ - // Set function pointers - sensor->reset = reset; - sensor->init_status = init_status; - sensor->set_pixformat = set_pixformat; - sensor->set_framesize = set_framesize; - sensor->set_colorbar = set_colorbar; - sensor->set_whitebal = set_whitebal; - sensor->set_gain_ctrl = set_gain_ctrl; - sensor->set_exposure_ctrl = set_exposure_ctrl; - sensor->set_hmirror = set_hmirror; - sensor->set_vflip = set_vflip; - - //not supported - sensor->set_brightness= set_dummy; - sensor->set_saturation= set_dummy; - sensor->set_quality = set_dummy; - sensor->set_gainceiling = set_gainceiling_dummy; - sensor->set_aec2 = set_dummy; - sensor->set_aec_value = set_dummy; - sensor->set_special_effect = set_dummy; - sensor->set_wb_mode = set_dummy; - sensor->set_ae_level = set_dummy; - sensor->set_dcw = set_dummy; - sensor->set_bpc = set_dummy; - sensor->set_wpc = set_dummy; - sensor->set_awb_gain = set_dummy; - sensor->set_agc_gain = set_dummy; - sensor->set_raw_gma = set_dummy; - sensor->set_lenc = set_dummy; - sensor->set_sharpness = set_dummy; - sensor->set_denoise = set_dummy; - - // Retrieve sensor's signature - sensor->id.MIDH = SCCB_Read(sensor->slv_addr, REG_MIDH); - sensor->id.MIDL = SCCB_Read(sensor->slv_addr, REG_MIDL); - sensor->id.PID = SCCB_Read(sensor->slv_addr, REG_PID); - sensor->id.VER = SCCB_Read(sensor->slv_addr, REG_VER); - - ESP_LOGD(TAG, "OV7670 Attached"); - - return 0; -} diff --git a/lib/libesp32_div/esp32-camera/sensors/ov7725.c b/lib/libesp32_div/esp32-camera/sensors/ov7725.c deleted file mode 100644 index ad5d89541..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/ov7725.c +++ /dev/null @@ -1,575 +0,0 @@ -/* - * This file is part of the OpenMV project. - * Copyright (c) 2013/2014 Ibrahim Abdelkader - * This work is licensed under the MIT license, see the file LICENSE for details. - * - * OV7725 driver. - * - */ -#include -#include -#include -#include -#include "sccb.h" -#include "xclk.h" -#include "ov7725.h" -#include "ov7725_regs.h" -#include "freertos/FreeRTOS.h" -#include "freertos/task.h" - -#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) -#include "esp32-hal-log.h" -#else -#include "esp_log.h" -static const char* TAG = "ov7725"; -#endif - - -static const uint8_t default_regs[][2] = { - {COM3, COM3_SWAP_YUV}, - {COM7, COM7_RES_QVGA | COM7_FMT_YUV}, - - {COM4, 0x01 | 0x00}, /* bypass PLL (0x00:off, 0x40:4x, 0x80:6x, 0xC0:8x) */ - {CLKRC, 0x80 | 0x03}, /* Res/Bypass pre-scalar (0x40:bypass, 0x00-0x3F:prescaler PCLK=XCLK/(prescaler + 1)/2 ) */ - - // QVGA Window Size - {HSTART, 0x3F}, - {HSIZE, 0x50}, - {VSTART, 0x03}, - {VSIZE, 0x78}, - {HREF, 0x00}, - - // Scale down to QVGA Resolution - {HOUTSIZE, 0x50}, - {VOUTSIZE, 0x78}, - {EXHCH, 0x00}, - - {COM12, 0x03}, - {TGT_B, 0x7F}, - {FIXGAIN, 0x09}, - {AWB_CTRL0, 0xE0}, - {DSP_CTRL1, 0xFF}, - - {DSP_CTRL2, DSP_CTRL2_VDCW_EN | DSP_CTRL2_HDCW_EN | DSP_CTRL2_HZOOM_EN | DSP_CTRL2_VZOOM_EN}, - - {DSP_CTRL3, 0x00}, - {DSP_CTRL4, 0x00}, - {DSPAUTO, 0xFF}, - - {COM8, 0xF0}, - {COM6, 0xC5}, - {COM9, 0x11}, - {COM10, COM10_VSYNC_NEG | COM10_PCLK_MASK}, //Invert VSYNC and MASK PCLK - {BDBASE, 0x7F}, - {DBSTEP, 0x03}, - {AEW, 0x96}, - {AEB, 0x64}, - {VPT, 0xA1}, - {EXHCL, 0x00}, - {AWB_CTRL3, 0xAA}, - {COM8, 0xFF}, - - //Gamma - {GAM1, 0x0C}, - {GAM2, 0x16}, - {GAM3, 0x2A}, - {GAM4, 0x4E}, - {GAM5, 0x61}, - {GAM6, 0x6F}, - {GAM7, 0x7B}, - {GAM8, 0x86}, - {GAM9, 0x8E}, - {GAM10, 0x97}, - {GAM11, 0xA4}, - {GAM12, 0xAF}, - {GAM13, 0xC5}, - {GAM14, 0xD7}, - {GAM15, 0xE8}, - - {SLOP, 0x20}, - {EDGE1, 0x05}, - {EDGE2, 0x03}, - {EDGE3, 0x00}, - {DNSOFF, 0x01}, - - {MTX1, 0xB0}, - {MTX2, 0x9D}, - {MTX3, 0x13}, - {MTX4, 0x16}, - {MTX5, 0x7B}, - {MTX6, 0x91}, - {MTX_CTRL, 0x1E}, - - {BRIGHTNESS, 0x08}, - {CONTRAST, 0x30}, - {UVADJ0, 0x81}, - {SDE, (SDE_CONT_BRIGHT_EN | SDE_SATURATION_EN)}, - - // For 30 fps/60Hz - {DM_LNL, 0x00}, - {DM_LNH, 0x00}, - {BDBASE, 0x7F}, - {DBSTEP, 0x03}, - - // Lens Correction, should be tuned with real camera module - {LC_RADI, 0x10}, - {LC_COEF, 0x10}, - {LC_COEFB, 0x14}, - {LC_COEFR, 0x17}, - {LC_CTR, 0x05}, - {COM5, 0xF5}, //0x65 - - {0x00, 0x00}, -}; - -static int get_reg(sensor_t *sensor, int reg, int mask) -{ - int ret = SCCB_Read(sensor->slv_addr, reg & 0xFF); - if(ret > 0){ - ret &= mask; - } - return ret; -} - -static int set_reg(sensor_t *sensor, int reg, int mask, int value) -{ - int ret = 0; - ret = SCCB_Read(sensor->slv_addr, reg & 0xFF); - if(ret < 0){ - return ret; - } - value = (ret & ~mask) | (value & mask); - ret = SCCB_Write(sensor->slv_addr, reg & 0xFF, value); - return ret; -} - -static int set_reg_bits(sensor_t *sensor, uint8_t reg, uint8_t offset, uint8_t length, uint8_t value) -{ - int ret = 0; - ret = SCCB_Read(sensor->slv_addr, reg); - if(ret < 0){ - return ret; - } - uint8_t mask = ((1 << length) - 1) << offset; - value = (ret & ~mask) | ((value << offset) & mask); - ret = SCCB_Write(sensor->slv_addr, reg & 0xFF, value); - return ret; -} - -static int get_reg_bits(sensor_t *sensor, uint8_t reg, uint8_t offset, uint8_t length) -{ - int ret = 0; - ret = SCCB_Read(sensor->slv_addr, reg); - if(ret < 0){ - return ret; - } - uint8_t mask = ((1 << length) - 1) << offset; - return (ret & mask) >> offset; -} - - -static int reset(sensor_t *sensor) -{ - int i=0; - const uint8_t (*regs)[2]; - - // Reset all registers - SCCB_Write(sensor->slv_addr, COM7, COM7_RESET); - - // Delay 10 ms - vTaskDelay(10 / portTICK_PERIOD_MS); - - // Write default regsiters - for (i=0, regs = default_regs; regs[i][0]; i++) { - SCCB_Write(sensor->slv_addr, regs[i][0], regs[i][1]); - } - - // Delay - vTaskDelay(30 / portTICK_PERIOD_MS); - - return 0; -} - - -static int set_pixformat(sensor_t *sensor, pixformat_t pixformat) -{ - int ret=0; - sensor->pixformat = pixformat; - // Read register COM7 - uint8_t reg = SCCB_Read(sensor->slv_addr, COM7); - - switch (pixformat) { - case PIXFORMAT_RGB565: - reg = COM7_SET_RGB(reg, COM7_FMT_RGB565); - break; - case PIXFORMAT_YUV422: - case PIXFORMAT_GRAYSCALE: - reg = COM7_SET_FMT(reg, COM7_FMT_YUV); - break; - default: - return -1; - } - - // Write back register COM7 - ret = SCCB_Write(sensor->slv_addr, COM7, reg); - - // Delay - vTaskDelay(30 / portTICK_PERIOD_MS); - - return ret; -} - -static int set_framesize(sensor_t *sensor, framesize_t framesize) -{ - int ret=0; - if (framesize > FRAMESIZE_VGA) { - return -1; - } - uint16_t w = resolution[framesize].width; - uint16_t h = resolution[framesize].height; - uint8_t reg = SCCB_Read(sensor->slv_addr, COM7); - - sensor->status.framesize = framesize; - - // Write MSBs - ret |= SCCB_Write(sensor->slv_addr, HOUTSIZE, w>>2); - ret |= SCCB_Write(sensor->slv_addr, VOUTSIZE, h>>1); - - ret |= SCCB_Write(sensor->slv_addr, HSIZE, w>>2); - ret |= SCCB_Write(sensor->slv_addr, VSIZE, h>>1); - - // Write LSBs - ret |= SCCB_Write(sensor->slv_addr, HREF, ((w&0x3) | ((h&0x1) << 2))); - - if (framesize < FRAMESIZE_VGA) { - // Enable auto-scaling/zooming factors - ret |= SCCB_Write(sensor->slv_addr, DSPAUTO, 0xFF); - - ret |= SCCB_Write(sensor->slv_addr, HSTART, 0x3F); - ret |= SCCB_Write(sensor->slv_addr, VSTART, 0x03); - - ret |= SCCB_Write(sensor->slv_addr, COM7, reg | COM7_RES_QVGA); - - ret |= SCCB_Write(sensor->slv_addr, CLKRC, 0x80 | 0x01); - - } else { - // Disable auto-scaling/zooming factors - ret |= SCCB_Write(sensor->slv_addr, DSPAUTO, 0xF3); - - // Clear auto-scaling/zooming factors - ret |= SCCB_Write(sensor->slv_addr, SCAL0, 0x00); - ret |= SCCB_Write(sensor->slv_addr, SCAL1, 0x00); - ret |= SCCB_Write(sensor->slv_addr, SCAL2, 0x00); - - ret |= SCCB_Write(sensor->slv_addr, HSTART, 0x23); - ret |= SCCB_Write(sensor->slv_addr, VSTART, 0x07); - - ret |= SCCB_Write(sensor->slv_addr, COM7, reg & ~COM7_RES_QVGA); - - ret |= SCCB_Write(sensor->slv_addr, CLKRC, 0x80 | 0x03); - } - - // Delay - vTaskDelay(30 / portTICK_PERIOD_MS); - - return ret; -} - -static int set_colorbar(sensor_t *sensor, int enable) -{ - int ret=0; - uint8_t reg; - sensor->status.colorbar = enable; - - // Read reg COM3 - reg = SCCB_Read(sensor->slv_addr, COM3); - // Enable colorbar test pattern output - reg = COM3_SET_CBAR(reg, enable); - // Write back COM3 - ret |= SCCB_Write(sensor->slv_addr, COM3, reg); - - // Read reg DSP_CTRL3 - reg = SCCB_Read(sensor->slv_addr, DSP_CTRL3); - // Enable DSP colorbar output - reg = DSP_CTRL3_SET_CBAR(reg, enable); - // Write back DSP_CTRL3 - ret |= SCCB_Write(sensor->slv_addr, DSP_CTRL3, reg); - - return ret; -} - -static int set_whitebal(sensor_t *sensor, int enable) -{ - if(set_reg_bits(sensor, COM8, 1, 1, enable) >= 0){ - sensor->status.awb = !!enable; - } - return sensor->status.awb; -} - -static int set_gain_ctrl(sensor_t *sensor, int enable) -{ - if(set_reg_bits(sensor, COM8, 2, 1, enable) >= 0){ - sensor->status.agc = !!enable; - } - return sensor->status.agc; -} - -static int set_exposure_ctrl(sensor_t *sensor, int enable) -{ - if(set_reg_bits(sensor, COM8, 0, 1, enable) >= 0){ - sensor->status.aec = !!enable; - } - return sensor->status.aec; -} - -static int set_hmirror(sensor_t *sensor, int enable) -{ - if(set_reg_bits(sensor, COM3, 6, 1, enable) >= 0){ - sensor->status.hmirror = !!enable; - } - return sensor->status.hmirror; -} - -static int set_vflip(sensor_t *sensor, int enable) -{ - if(set_reg_bits(sensor, COM3, 7, 1, enable) >= 0){ - sensor->status.vflip = !!enable; - } - return sensor->status.vflip; -} - -static int set_dcw_dsp(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = set_reg_bits(sensor, 0x65, 2, 1, !enable); - if (ret == 0) { - ESP_LOGD(TAG, "Set dcw to: %d", enable); - sensor->status.dcw = enable; - } - return ret; -} - -static int set_aec2(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = set_reg_bits(sensor, COM8, 7, 1, enable); - if (ret == 0) { - ESP_LOGD(TAG, "Set aec2 to: %d", enable); - sensor->status.aec2 = enable; - } - return ret; -} - -static int set_bpc_dsp(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = set_reg_bits(sensor, 0x64, 1, 1, enable); - if (ret == 0) { - ESP_LOGD(TAG, "Set bpc to: %d", enable); - sensor->status.bpc = enable; - } - return ret; -} - -static int set_wpc_dsp(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = set_reg_bits(sensor, 0x64, 0, 1, enable); - if (ret == 0) { - ESP_LOGD(TAG, "Set wpc to: %d", enable); - sensor->status.wpc = enable; - } - return ret; -} - -static int set_raw_gma_dsp(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = set_reg_bits(sensor, 0x64, 2, 1, enable); - if (ret == 0) { - ESP_LOGD(TAG, "Set raw_gma to: %d", enable); - sensor->status.raw_gma = enable; - } - return ret; -} - -static int set_lenc_dsp(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = set_reg_bits(sensor, LC_CTR, 0, 1, enable); - if (ret == 0) { - ESP_LOGD(TAG, "Set lenc to: %d", enable); - sensor->status.lenc = enable; - } - return ret; -} - -//real gain -static int set_agc_gain(sensor_t *sensor, int gain) -{ - int ret = 0; - ret = set_reg_bits(sensor, COM9, 4, 3, gain % 5); - if (ret == 0) { - ESP_LOGD(TAG, "Set gain to: %d", gain); - sensor->status.agc_gain = gain; - } - return ret; -} - -static int set_aec_value(sensor_t *sensor, int value) -{ - int ret = 0; - ret = SCCB_Write(sensor->slv_addr, AEC, value & 0xff) | SCCB_Write(sensor->slv_addr, AECH, value >> 8); - if (ret == 0) { - ESP_LOGD(TAG, "Set aec_value to: %d", value); - sensor->status.aec_value = value; - } - return ret; -} - -static int set_awb_gain_dsp(sensor_t *sensor, int enable) -{ - int ret = 0; - ret = set_reg_bits(sensor, 0x63, 7, 1, enable); - if (ret == 0) { - ESP_LOGD(TAG, "Set awb_gain to: %d", enable); - sensor->status.awb_gain = enable; - } - return ret; -} - -static int set_brightness(sensor_t *sensor, int level) -{ - int ret = 0; - ret = SCCB_Write(sensor->slv_addr, 0x9B, level); - if (ret == 0) { - ESP_LOGD(TAG, "Set brightness to: %d", level); - sensor->status.brightness = level; - } - return ret; -} - -static int set_contrast(sensor_t *sensor, int level) -{ - int ret = 0; - ret = SCCB_Write(sensor->slv_addr, 0x9C, level); - if (ret == 0) { - ESP_LOGD(TAG, "Set contrast to: %d", level); - sensor->status.contrast = level; - } - return ret; -} - -static int init_status(sensor_t *sensor) -{ - sensor->status.brightness = SCCB_Read(sensor->slv_addr, 0x9B); - sensor->status.contrast = SCCB_Read(sensor->slv_addr, 0x9C); - sensor->status.saturation = 0; - sensor->status.ae_level = 0; - sensor->status.special_effect = get_reg_bits(sensor, 0x64, 5, 1); - sensor->status.wb_mode = get_reg_bits(sensor, 0x6B, 7, 1); - sensor->status.agc_gain = get_reg_bits(sensor, COM9, 4, 3); - sensor->status.aec_value = SCCB_Read(sensor->slv_addr, AEC) | (SCCB_Read(sensor->slv_addr, AECH) << 8); - sensor->status.gainceiling = SCCB_Read(sensor->slv_addr, 0x00); - sensor->status.awb = get_reg_bits(sensor, COM8, 1, 1); - sensor->status.awb_gain = get_reg_bits(sensor, 0x63, 7, 1); - sensor->status.aec = get_reg_bits(sensor, COM8, 0, 1); - sensor->status.aec2 = get_reg_bits(sensor, COM8, 7, 1); - sensor->status.agc = get_reg_bits(sensor, COM8, 2, 1); - sensor->status.bpc = get_reg_bits(sensor, 0x64, 1, 1); - sensor->status.wpc = get_reg_bits(sensor, 0x64, 0, 1); - sensor->status.raw_gma = get_reg_bits(sensor, 0x64, 2, 1); - sensor->status.lenc = get_reg_bits(sensor, LC_CTR, 0, 1); - sensor->status.hmirror = get_reg_bits(sensor, COM3, 6, 1); - sensor->status.vflip = get_reg_bits(sensor, COM3, 7, 1); - sensor->status.dcw = get_reg_bits(sensor, 0x65, 2, 1); - sensor->status.colorbar = get_reg_bits(sensor, COM3, 0, 1); - sensor->status.sharpness = get_reg_bits(sensor, EDGE0, 0, 5); - sensor->status.denoise = SCCB_Read(sensor->slv_addr, 0x8E); - return 0; -} - -static int set_dummy(sensor_t *sensor, int val){ return -1; } -static int set_gainceiling_dummy(sensor_t *sensor, gainceiling_t val){ return -1; } -static int set_res_raw(sensor_t *sensor, int startX, int startY, int endX, int endY, int offsetX, int offsetY, int totalX, int totalY, int outputX, int outputY, bool scale, bool binning){return -1;} -static int _set_pll(sensor_t *sensor, int bypass, int multiplier, int sys_div, int root_2x, int pre_div, int seld5, int pclk_manual, int pclk_div){return -1;} - -static int set_xclk(sensor_t *sensor, int timer, int xclk) -{ - int ret = 0; - sensor->xclk_freq_hz = xclk * 1000000U; - ret = xclk_timer_conf(timer, sensor->xclk_freq_hz); - return ret; -} - -int ov7725_detect(int slv_addr, sensor_id_t *id) -{ - if (OV7725_SCCB_ADDR == slv_addr) { - SCCB_Write(slv_addr, 0xFF, 0x01);//bank sensor - uint16_t PID = SCCB_Read(slv_addr, 0x0A); - if (OV7725_PID == PID) { - id->PID = PID; - id->VER = SCCB_Read(slv_addr, REG_VER); - id->MIDL = SCCB_Read(slv_addr, REG_MIDL); - id->MIDH = SCCB_Read(slv_addr, REG_MIDH); - return PID; - } else { - ESP_LOGI(TAG, "Mismatch PID=0x%x", PID); - } - } - return 0; -} - -int ov7725_init(sensor_t *sensor) -{ - // Set function pointers - sensor->reset = reset; - sensor->init_status = init_status; - sensor->set_pixformat = set_pixformat; - sensor->set_framesize = set_framesize; - sensor->set_colorbar = set_colorbar; - sensor->set_whitebal = set_whitebal; - sensor->set_gain_ctrl = set_gain_ctrl; - sensor->set_exposure_ctrl = set_exposure_ctrl; - sensor->set_hmirror = set_hmirror; - sensor->set_vflip = set_vflip; - - sensor->set_brightness = set_brightness; - sensor->set_contrast = set_contrast; - sensor->set_aec2 = set_aec2; - sensor->set_aec_value = set_aec_value; - sensor->set_awb_gain = set_awb_gain_dsp; - sensor->set_agc_gain = set_agc_gain; - sensor->set_dcw = set_dcw_dsp; - sensor->set_bpc = set_bpc_dsp; - sensor->set_wpc = set_wpc_dsp; - sensor->set_raw_gma = set_raw_gma_dsp; - sensor->set_lenc = set_lenc_dsp; - - //not supported - sensor->set_saturation= set_dummy; - sensor->set_sharpness = set_dummy; - sensor->set_denoise = set_dummy; - sensor->set_quality = set_dummy; - sensor->set_special_effect = set_dummy; - sensor->set_wb_mode = set_dummy; - sensor->set_ae_level = set_dummy; - sensor->set_gainceiling = set_gainceiling_dummy; - - - sensor->get_reg = get_reg; - sensor->set_reg = set_reg; - sensor->set_res_raw = set_res_raw; - sensor->set_pll = _set_pll; - sensor->set_xclk = set_xclk; - - // Retrieve sensor's signature - sensor->id.MIDH = SCCB_Read(sensor->slv_addr, REG_MIDH); - sensor->id.MIDL = SCCB_Read(sensor->slv_addr, REG_MIDL); - sensor->id.PID = SCCB_Read(sensor->slv_addr, REG_PID); - sensor->id.VER = SCCB_Read(sensor->slv_addr, REG_VER); - - ESP_LOGD(TAG, "OV7725 Attached"); - - return 0; -} diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/gc0308.h b/lib/libesp32_div/esp32-camera/sensors/private_include/gc0308.h deleted file mode 100644 index edffca1e0..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/private_include/gc0308.h +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once - -#include "sensor.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @brief Detect sensor pid - * - * @param slv_addr SCCB address - * @param id Detection result - * @return - * 0: Can't detect this sensor - * Nonzero: This sensor has been detected - */ -int gc0308_detect(int slv_addr, sensor_id_t *id); - -/** - * @brief initialize sensor function pointers - * - * @param sensor pointer of sensor - * @return - * Always 0 - */ -int gc0308_init(sensor_t *sensor); - -#ifdef __cplusplus -} -#endif diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/gc0308_regs.h b/lib/libesp32_div/esp32-camera/sensors/private_include/gc0308_regs.h deleted file mode 100644 index f1cb4532b..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/private_include/gc0308_regs.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * GC0308 register definitions. - */ -#ifndef __GC0308_REG_REGS_H__ -#define __GC0308_REG_REGS_H__ - -#define RESET_RELATED 0xfe // Bit[7]: Software reset - // Bit[6:5]: NA - // Bit[4]: CISCTL_restart_n - // Bit[3:1]: NA - // Bit[0]: page select - // 0:page0 - // 1:page1 - - -// page0: - - - -/** - * @brief register value - */ - - -#endif // __GC0308_REG_REGS_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/gc0308_settings.h b/lib/libesp32_div/esp32-camera/sensors/private_include/gc0308_settings.h deleted file mode 100644 index 32ef3816a..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/private_include/gc0308_settings.h +++ /dev/null @@ -1,245 +0,0 @@ -#ifndef _GC0308_SETTINGS_H_ -#define _GC0308_SETTINGS_H_ - -#include - -#define REG_DLY 0xffff -#define REGLIST_TAIL 0x0000 /* Array end token */ - -static const uint16_t gc0308_sensor_default_regs[][2] = { - {0xfe, 0x00}, - {0xec, 0x20}, - {0x05, 0x00}, - {0x06, 0x00}, - {0x07, 0x00}, - {0x08, 0x00}, - {0x09, 0x01}, - {0x0a, 0xe8}, - {0x0b, 0x02}, - {0x0c, 0x88}, - {0x0d, 0x02}, - {0x0e, 0x02}, - {0x10, 0x26}, - {0x11, 0x0d}, - {0x12, 0x2a}, - {0x13, 0x00}, - {0x14, 0x11}, - {0x15, 0x0a}, - {0x16, 0x05}, - {0x17, 0x01}, - {0x18, 0x44}, - {0x19, 0x44}, - {0x1a, 0x2a}, - {0x1b, 0x00}, - {0x1c, 0x49}, - {0x1d, 0x9a}, - {0x1e, 0x61}, - {0x1f, 0x00}, //pad drv <=24MHz, use 0x00 is ok - {0x20, 0x7f}, - {0x21, 0xfa}, - {0x22, 0x57}, - {0x24, 0xa2}, //YCbYCr - {0x25, 0x0f}, - {0x26, 0x03}, // 0x01 - {0x28, 0x00}, - {0x2d, 0x0a}, - {0x2f, 0x01}, - {0x30, 0xf7}, - {0x31, 0x50}, - {0x32, 0x00}, - {0x33, 0x28}, - {0x34, 0x2a}, - {0x35, 0x28}, - {0x39, 0x04}, - {0x3a, 0x20}, - {0x3b, 0x20}, - {0x3c, 0x00}, - {0x3d, 0x00}, - {0x3e, 0x00}, - {0x3f, 0x00}, - {0x50, 0x14}, // 0x14 - {0x52, 0x41}, - {0x53, 0x80}, - {0x54, 0x80}, - {0x55, 0x80}, - {0x56, 0x80}, - {0x8b, 0x20}, - {0x8c, 0x20}, - {0x8d, 0x20}, - {0x8e, 0x14}, - {0x8f, 0x10}, - {0x90, 0x14}, - {0x91, 0x3c}, - {0x92, 0x50}, -//{0x8b,0x10}, -//{0x8c,0x10}, -//{0x8d,0x10}, -//{0x8e,0x10}, -//{0x8f,0x10}, -//{0x90,0x10}, -//{0x91,0x3c}, -//{0x92,0x50}, - {0x5d, 0x12}, - {0x5e, 0x1a}, - {0x5f, 0x24}, - {0x60, 0x07}, - {0x61, 0x15}, - {0x62, 0x08}, // 0x08 - {0x64, 0x03}, // 0x03 - {0x66, 0xe8}, - {0x67, 0x86}, - {0x68, 0x82}, - {0x69, 0x18}, - {0x6a, 0x0f}, - {0x6b, 0x00}, - {0x6c, 0x5f}, - {0x6d, 0x8f}, - {0x6e, 0x55}, - {0x6f, 0x38}, - {0x70, 0x15}, - {0x71, 0x33}, - {0x72, 0xdc}, - {0x73, 0x00}, - {0x74, 0x02}, - {0x75, 0x3f}, - {0x76, 0x02}, - {0x77, 0x38}, // 0x47 - {0x78, 0x88}, - {0x79, 0x81}, - {0x7a, 0x81}, - {0x7b, 0x22}, - {0x7c, 0xff}, - {0x93, 0x48}, //color matrix default - {0x94, 0x02}, - {0x95, 0x07}, - {0x96, 0xe0}, - {0x97, 0x40}, - {0x98, 0xf0}, - {0xb1, 0x40}, - {0xb2, 0x40}, - {0xb3, 0x40}, //0x40 - {0xb6, 0xe0}, - {0xbd, 0x38}, - {0xbe, 0x36}, - {0xd0, 0xCB}, - {0xd1, 0x10}, - {0xd2, 0x90}, - {0xd3, 0x48}, - {0xd5, 0xF2}, - {0xd6, 0x16}, - {0xdb, 0x92}, - {0xdc, 0xA5}, - {0xdf, 0x23}, - {0xd9, 0x00}, - {0xda, 0x00}, - {0xe0, 0x09}, - {0xed, 0x04}, - {0xee, 0xa0}, - {0xef, 0x40}, - {0x80, 0x03}, - - {0x9F, 0x10}, - {0xA0, 0x20}, - {0xA1, 0x38}, - {0xA2, 0x4e}, - {0xA3, 0x63}, - {0xA4, 0x76}, - {0xA5, 0x87}, - {0xA6, 0xa2}, - {0xA7, 0xb8}, - {0xA8, 0xca}, - {0xA9, 0xd8}, - {0xAA, 0xe3}, - {0xAB, 0xeb}, - {0xAC, 0xf0}, - {0xAD, 0xF8}, - {0xAE, 0xFd}, - {0xAF, 0xFF}, - - {0xc0, 0x00}, - {0xc1, 0x10}, - {0xc2, 0x1c}, - {0xc3, 0x30}, - {0xc4, 0x43}, - {0xc5, 0x54}, - {0xc6, 0x65}, - {0xc7, 0x75}, - {0xc8, 0x93}, - {0xc9, 0xB0}, - {0xca, 0xCB}, - {0xcb, 0xE6}, - {0xcc, 0xFF}, - {0xf0, 0x02}, - {0xf1, 0x01}, - {0xf2, 0x02}, - {0xf3, 0x30}, - {0xf7, 0x04}, - {0xf8, 0x02}, - {0xf9, 0x9f}, - {0xfa, 0x78}, - {0xfe, 0x01}, - {0x00, 0xf5}, - {0x02, 0x20}, - {0x04, 0x10}, - {0x05, 0x08}, - {0x06, 0x20}, - {0x08, 0x0a}, - {0x0a, 0xa0}, - {0x0b, 0x60}, - {0x0c, 0x08}, - {0x0e, 0x44}, - {0x0f, 0x32}, - {0x10, 0x41}, - {0x11, 0x37}, - {0x12, 0x22}, - {0x13, 0x19}, - {0x14, 0x44}, - {0x15, 0x44}, - {0x16, 0xc2}, - {0x17, 0xA8}, - {0x18, 0x18}, - {0x19, 0x50}, - {0x1a, 0xd8}, - {0x1b, 0xf5}, - {0x70, 0x40}, - {0x71, 0x58}, - {0x72, 0x30}, - {0x73, 0x48}, - {0x74, 0x20}, - {0x75, 0x60}, - {0x77, 0x20}, - {0x78, 0x32}, - {0x30, 0x03}, - {0x31, 0x40}, - {0x32, 0x10}, - {0x33, 0xe0}, - {0x34, 0xe0}, - {0x35, 0x00}, - {0x36, 0x80}, - {0x37, 0x00}, - {0x38, 0x04}, - {0x39, 0x09}, - {0x3a, 0x12}, - {0x3b, 0x1C}, - {0x3c, 0x28}, - {0x3d, 0x31}, - {0x3e, 0x44}, - {0x3f, 0x57}, - {0x40, 0x6C}, - {0x41, 0x81}, - {0x42, 0x94}, - {0x43, 0xA7}, - {0x44, 0xB8}, - {0x45, 0xD6}, - {0x46, 0xEE}, - {0x47, 0x0d}, - {0x62, 0xf7}, - {0x63, 0x68}, - {0x64, 0xd3}, - {0x65, 0xd3}, - {0x66, 0x60}, - {0xfe, 0x00}, - {REGLIST_TAIL, 0x00}, -}; - -#endif diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/gc032a.h b/lib/libesp32_div/esp32-camera/sensors/private_include/gc032a.h deleted file mode 100644 index 7679f0708..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/private_include/gc032a.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * - * GC032A driver. - * - */ -#ifndef __GC032A_H__ -#define __GC032A_H__ - -#include "sensor.h" - -/** - * @brief Detect sensor pid - * - * @param slv_addr SCCB address - * @param id Detection result - * @return - * 0: Can't detect this sensor - * Nonzero: This sensor has been detected - */ -int gc032a_detect(int slv_addr, sensor_id_t *id); - -/** - * @brief initialize sensor function pointers - * - * @param sensor pointer of sensor - * @return - * Always 0 - */ -int gc032a_init(sensor_t *sensor); - -#endif // __GC032A_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/gc032a_regs.h b/lib/libesp32_div/esp32-camera/sensors/private_include/gc032a_regs.h deleted file mode 100644 index 5de59d1d2..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/private_include/gc032a_regs.h +++ /dev/null @@ -1,82 +0,0 @@ -/* - * GC032A register definitions. - */ -#ifndef __GC032A_REG_REGS_H__ -#define __GC032A_REG_REGS_H__ - -#define SENSOR_ID_HIGH 0XF0 -#define SENSOR_ID_LOW 0XF1 -#define PAD_VB_HIZ_MODE 0XF2 -#define SYNC_OUTPUT 0XF3 -#define I2C_CONFIG 0XF4 -#define PLL_MODE1 0XF7 -#define PLL_MODE2 0XF8 -#define CM_MODE 0XF9 -#define ISP_DIV_MODE 0XFA -#define I2C_DEVICE_ID 0XFB -#define ANALOG_PWC 0XFC -#define ISP_DIV_MODE2 0XFD -#define RESET_RELATED 0XFE // Bit[7]: Software reset - // Bit[6]: cm reset - // Bit[5]: spi reset - // Bit[4]: CISCTL_restart_n - // Bit[3]: PLL_rst - // Bit[2:0]: page select - // 000:page0 - // 001:page1 - // 010:page2 - // 011:page3 - -//----page0----------------------------- -#define P0_EXPOSURE_HIGH 0X03 -#define P0_EXPOSURE_LOW 0X04 -#define P0_HB_HIGH 0X05 -#define P0_HB_LOW 0X06 -#define P0_VB_HIGH 0X07 -#define P0_VB_LOW 0X08 -#define P0_ROW_START_HIGH 0X09 -#define P0_ROW_START_LOW 0X0A -#define P0_COLUMN_START_HIGH 0X0B -#define P0_COLUMN_START_LOW 0X0C -#define P0_WINDOW_HEIGHT_HIGH 0X0D -#define P0_WINDOW_HEIGHT_LOW 0X0E -#define P0_WINDOW_WIDTH_HIGH 0X0F -#define P0_WINDOW_WIDTH_LOW 0X10 -#define P0_SH_DELAY 0X11 -#define P0_VS_ST 0X12 -#define P0_VS_ET 0X13 -#define P0_CISCTL_MODE1 0X17 - -#define P0_BLOCK_ENABLE_1 0X40 -#define P0_AAAA_ENABLE 0X42 -#define P0_SPECIAL_EFFECT 0X43 -#define P0_SYNC_MODE 0X46 -#define P0_GAIN_CODE 0X48 -#define P0_DEBUG_MODE2 0X4C -#define P0_WIN_MODE 0X50 -#define P0_OUT_WIN_Y1_HIGH 0X51 -#define P0_OUT_WIN_Y1_LOW 0X52 -#define P0_OUT_WIN_X1_HIGH 0X53 -#define P0_OUT_WIN_X1_LOW 0X54 -#define P0_OUT_WIN_HEIGHT_HIGH 0X55 -#define P0_OUT_WIN_HEIGHT_LOW 0X56 -#define P0_OUT_WIN_WIDTH_HIGH 0X57 -#define P0_OUT_WIN_WIDTH_LOW 0X58 - -#define P0_GLOBAL_SATURATION 0XD0 -#define P0_SATURATION_CB 0XD1 -#define P0_SATURATION_CR 0XD2 -#define P0_LUMA_CONTRAST 0XD3 -#define P0_CONTRAST_CENTER 0XD4 -#define P0_LUMA_OFFSET 0XD5 -#define P0_FIXED_CB 0XDA -#define P0_FIXED_CR 0XDB - -//----page3----------------------------- -#define P3_IMAGE_WIDTH_LOW 0X5B -#define P3_IMAGE_WIDTH_HIGH 0X5C -#define P3_IMAGE_HEIGHT_LOW 0X5D -#define P3_IMAGE_HEIGHT_HIGH 0X5E - - -#endif //__GC032A_REG_REGS_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/gc032a_settings.h b/lib/libesp32_div/esp32-camera/sensors/private_include/gc032a_settings.h deleted file mode 100644 index a19ffc7c6..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/private_include/gc032a_settings.h +++ /dev/null @@ -1,401 +0,0 @@ -#ifndef _GC032A_SETTINGS_H_ -#define _GC032A_SETTINGS_H_ - -#include -#include -#include "esp_attr.h" -#include "gc032a_regs.h" - - -#define REG_DLY 0xffff -#define REGLIST_TAIL 0x0000 - - -/* - * The default register settings, as obtained from OmniVision. There - * is really no making sense of most of these - lots of "reserved" values - * and such. - * - */ -static const uint16_t gc032a_default_regs[][2] = { - /*System*/ - {0xf3, 0xff}, - {0xf5, 0x06}, - {0xf7, 0x01}, - {0xf8, 0x03}, - {0xf9, 0xce}, - {0xfa, 0x00}, - {0xfc, 0x02}, - {0xfe, 0x02}, - {0x81, 0x03}, - - {0xfe, 0x00}, - {0x77, 0x64}, - {0x78, 0x40}, - {0x79, 0x60}, - /*ANALOG & CISCTL*/ - {0xfe, 0x00}, - {0x03, 0x01}, - {0x04, 0xce}, - {0x05, 0x01}, - {0x06, 0xad}, - {0x07, 0x00}, - {0x08, 0x10}, - {0x0a, 0x00}, - {0x0c, 0x00}, - {0x0d, 0x01}, - {0x0e, 0xe8}, // height 488 - {0x0f, 0x02}, - {0x10, 0x88}, // width 648 - {0x17, 0x54}, - {0x19, 0x08}, - {0x1a, 0x0a}, - {0x1f, 0x40}, - {0x20, 0x30}, - {0x2e, 0x80}, - {0x2f, 0x2b}, - {0x30, 0x1a}, - {0xfe, 0x02}, - {0x03, 0x02}, - {0x05, 0xd7}, - {0x06, 0x60}, - {0x08, 0x80}, - {0x12, 0x89}, - - /*blk*/ - {0xfe, 0x00}, - {0x18, 0x02}, - {0xfe, 0x02}, - {0x40, 0x22}, - {0x45, 0x00}, - {0x46, 0x00}, - {0x49, 0x20}, - {0x4b, 0x3c}, - {0x50, 0x20}, - {0x42, 0x10}, - - /*isp*/ - {0xfe, 0x01}, - {0x0a, 0xc5}, - {0x45, 0x00}, - {0xfe, 0x00}, - {0x40, 0xff}, - {0x41, 0x25}, - {0x42, 0xcf}, - {0x43, 0x10}, - {0x44, 0x83}, - {0x46, 0x23}, - {0x49, 0x03}, - {0x52, 0x02}, - {0x54, 0x00}, - {0xfe, 0x02}, - {0x22, 0xf6}, - - /*Shading*/ - {0xfe, 0x01}, - {0xc1, 0x38}, - {0xc2, 0x4c}, - {0xc3, 0x00}, - {0xc4, 0x32}, - {0xc5, 0x24}, - {0xc6, 0x16}, - {0xc7, 0x08}, - {0xc8, 0x08}, - {0xc9, 0x00}, - {0xca, 0x20}, - {0xdc, 0x8a}, - {0xdd, 0xa0}, - {0xde, 0xa6}, - {0xdf, 0x75}, - - /*AWB*/ - {0xfe, 0x01}, - {0x7c, 0x09}, - {0x65, 0x06}, - {0x7c, 0x08}, - {0x56, 0xf4}, - {0x66, 0x0f}, - {0x67, 0x84}, - {0x6b, 0x80}, - {0x6d, 0x12}, - {0x6e, 0xb0}, - {0x86, 0x00}, - {0x87, 0x00}, - {0x88, 0x00}, - {0x89, 0x00}, - {0x8a, 0x00}, - {0x8b, 0x00}, - {0x8c, 0x00}, - {0x8d, 0x00}, - {0x8e, 0x00}, - {0x8f, 0x00}, - {0x90, 0x00}, - {0x91, 0x00}, - {0x92, 0xf4}, - {0x93, 0xd5}, - {0x94, 0x50}, - {0x95, 0x0f}, - {0x96, 0xf4}, - {0x97, 0x2d}, - {0x98, 0x0f}, - {0x99, 0xa6}, - {0x9a, 0x2d}, - {0x9b, 0x0f}, - {0x9c, 0x59}, - {0x9d, 0x2d}, - {0x9e, 0xaa}, - {0x9f, 0x67}, - {0xa0, 0x59}, - {0xa1, 0x00}, - {0xa2, 0x00}, - {0xa3, 0x0a}, - {0xa4, 0x00}, - {0xa5, 0x00}, - {0xa6, 0xd4}, - {0xa7, 0x9f}, - {0xa8, 0x55}, - {0xa9, 0xd4}, - {0xaa, 0x9f}, - {0xab, 0xac}, - {0xac, 0x9f}, - {0xad, 0x55}, - {0xae, 0xd4}, - {0xaf, 0xac}, - {0xb0, 0xd4}, - {0xb1, 0xa3}, - {0xb2, 0x55}, - {0xb3, 0xd4}, - {0xb4, 0xac}, - {0xb5, 0x00}, - {0xb6, 0x00}, - {0xb7, 0x05}, - {0xb8, 0xd6}, - {0xb9, 0x8c}, - - /*CC*/ - {0xfe, 0x01}, - {0xd0, 0x40}, - {0xd1, 0xf8}, - {0xd2, 0x00}, - {0xd3, 0xfa}, - {0xd4, 0x45}, - {0xd5, 0x02}, - - {0xd6, 0x30}, - {0xd7, 0xfa}, - {0xd8, 0x08}, - {0xd9, 0x08}, - {0xda, 0x58}, - {0xdb, 0x02}, - {0xfe, 0x00}, - - /*Gamma*/ - {0xfe, 0x00}, - {0xba, 0x00}, - {0xbb, 0x04}, - {0xbc, 0x0a}, - {0xbd, 0x0e}, - {0xbe, 0x22}, - {0xbf, 0x30}, - {0xc0, 0x3d}, - {0xc1, 0x4a}, - {0xc2, 0x5d}, - {0xc3, 0x6b}, - {0xc4, 0x7a}, - {0xc5, 0x85}, - {0xc6, 0x90}, - {0xc7, 0xa5}, - {0xc8, 0xb5}, - {0xc9, 0xc2}, - {0xca, 0xcc}, - {0xcb, 0xd5}, - {0xcc, 0xde}, - {0xcd, 0xea}, - {0xce, 0xf5}, - {0xcf, 0xff}, - - /*Auto Gamma*/ - {0xfe, 0x00}, - {0x5a, 0x08}, - {0x5b, 0x0f}, - {0x5c, 0x15}, - {0x5d, 0x1c}, - {0x5e, 0x28}, - {0x5f, 0x36}, - {0x60, 0x45}, - {0x61, 0x51}, - {0x62, 0x6a}, - {0x63, 0x7d}, - {0x64, 0x8d}, - {0x65, 0x98}, - {0x66, 0xa2}, - {0x67, 0xb5}, - {0x68, 0xc3}, - {0x69, 0xcd}, - {0x6a, 0xd4}, - {0x6b, 0xdc}, - {0x6c, 0xe3}, - {0x6d, 0xf0}, - {0x6e, 0xf9}, - {0x6f, 0xff}, - - /*Gain*/ - {0xfe, 0x00}, - {0x70, 0x50}, - - /*AEC*/ - {0xfe, 0x00}, - {0x4f, 0x01}, - {0xfe, 0x01}, - {0x0d, 0x00}, - {0x12, 0xa0}, - {0x13, 0x3a}, - {0x44, 0x04}, - {0x1f, 0x30}, - {0x20, 0x40}, - {0x26, 0x9a}, - {0x3e, 0x20}, - {0x3f, 0x2d}, - {0x40, 0x40}, - {0x41, 0x5b}, - {0x42, 0x82}, - {0x43, 0xb7}, - {0x04, 0x0a}, - {0x02, 0x79}, - {0x03, 0xc0}, - - /*measure window*/ - {0xfe, 0x01}, - {0xcc, 0x08}, - {0xcd, 0x08}, - {0xce, 0xa4}, - {0xcf, 0xec}, - - /*DNDD*/ - {0xfe, 0x00}, - {0x81, 0xb8}, - {0x82, 0x12}, - {0x83, 0x0a}, - {0x84, 0x01}, - {0x86, 0x50}, - {0x87, 0x18}, - {0x88, 0x10}, - {0x89, 0x70}, - {0x8a, 0x20}, - {0x8b, 0x10}, - {0x8c, 0x08}, - {0x8d, 0x0a}, - - /*Intpee*/ - {0xfe, 0x00}, - {0x8f, 0xaa}, - {0x90, 0x9c}, - {0x91, 0x52}, - {0x92, 0x03}, - {0x93, 0x03}, - {0x94, 0x08}, - {0x95, 0x44}, - {0x97, 0x00}, - {0x98, 0x00}, - - /*ASDE*/ - {0xfe, 0x00}, - {0xa1, 0x30}, - {0xa2, 0x41}, - {0xa4, 0x30}, - {0xa5, 0x20}, - {0xaa, 0x30}, - {0xac, 0x32}, - - /*YCP*/ - {0xfe, 0x00}, - {0xd1, 0x3c}, - {0xd2, 0x3c}, - {0xd3, 0x38}, - {0xd6, 0xf4}, - {0xd7, 0x1d}, - {0xdd, 0x73}, - {0xde, 0x84}, - - /*Banding*/ - {0xfe, 0x00}, - {0x05, 0x01}, - {0x06, 0xad}, - {0x07, 0x00}, - {0x08, 0x10}, - - {0xfe, 0x01}, - {0x25, 0x00}, - {0x26, 0x9a}, - - {0x27, 0x01}, - {0x28, 0xce}, - {0x29, 0x02}, - {0x2a, 0x68}, - {0x2b, 0x02}, - {0x2c, 0x68}, - {0x2d, 0x07}, - {0x2e, 0xd2}, - {0x2f, 0x0b}, - {0x30, 0x6e}, - {0x31, 0x0e}, - {0x32, 0x70}, - {0x33, 0x12}, - {0x34, 0x0c}, - {0x3c, 0x30}, - - /*Analog&Cisctl*/ - {0xfe, 0x00}, - {0x05, 0x01}, - {0x06, 0xa0}, - {0x07, 0x00}, - {0x08, 0x20}, - {0x0a, 0x78}, - {0x0c, 0xa0}, - {0x0d, 0x00}, //window_height [8] - {0x0e, 0xf8}, //window_height [7:0] 248 - {0x0f, 0x01}, //window_width [9:8] - {0x10, 0x48}, //window_width [7:0] 328 - - {0x55, 0x00}, - {0x56, 0xf0}, // 240 - {0x57, 0x01}, - {0x58, 0x40}, // 320 - - /*SPI*/ - {0xfe, 0x03}, - {0x5b, 0x40}, - {0x5c, 0x01}, - {0x5d, 0xf0}, - {0x5e, 0x00}, - - /*AEC*/ - {0xfe, 0x01}, - {0x25, 0x00}, //step - {0x26, 0x63}, - {0x27, 0x01}, - {0x28, 0x29}, - {0x29, 0x01}, - {0x2a, 0x29}, - {0x2b, 0x01}, - {0x2c, 0x29}, - {0x2d, 0x01}, - {0x2e, 0x29}, - {0x2f, 0x01}, - {0x30, 0x29}, - {0x31, 0x01}, - {0x32, 0x29}, - {0x33, 0x01}, - {0x34, 0x29}, - {0x3c, 0x00}, - - /*measure window*/ - {0xfe, 0x01}, - {0xcc, 0x04}, - {0xcd, 0x04}, - {0xce, 0x72}, - {0xcf, 0x52}, - {REGLIST_TAIL, 0x00}, -}; - -#endif diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/gc2145.h b/lib/libesp32_div/esp32-camera/sensors/private_include/gc2145.h deleted file mode 100644 index 6c5b60f70..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/private_include/gc2145.h +++ /dev/null @@ -1,27 +0,0 @@ - -#ifndef __GC2145_H__ -#define __GC2145_H__ - -#include "sensor.h" - -/** - * @brief Detect sensor pid - * - * @param slv_addr SCCB address - * @param id Detection result - * @return - * 0: Can't detect this sensor - * Nonzero: This sensor has been detected - */ -int gc2145_detect(int slv_addr, sensor_id_t *id); - -/** - * @brief initialize sensor function pointers - * - * @param sensor pointer of sensor - * @return - * Always 0 - */ -int gc2145_init(sensor_t *sensor); - -#endif // __GC2145_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/gc2145_regs.h b/lib/libesp32_div/esp32-camera/sensors/private_include/gc2145_regs.h deleted file mode 100644 index b034a1689..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/private_include/gc2145_regs.h +++ /dev/null @@ -1,85 +0,0 @@ -/* - * GC2145 register definitions. - */ -#ifndef __GC2145_REG_REGS_H__ -#define __GC2145_REG_REGS_H__ - -#define CHIP_ID_HIGH 0XF0 -#define CHIP_ID_LOW 0XF1 -#define PLL_MODE1 0XF7 -#define PLL_MODE2 0XF8 -#define CM_MODE 0XF9 -#define CLK_DIV_MODE 0XFA -#define RESET_RELATED 0xfe // Bit[7]: Software reset - // Bit[6]: cm reset - // Bit[5]: mipi reset - // Bit[4]: CISCTL_restart_n - // Bit[3]: NA - // Bit[2:0]: page select - // 000:page0 - // 001:page1 - // 010:page2 - // 011:page3 - -//-page0---------------- - -#define P0_EXPOSURE_HIGH 0X03 -#define P0_EXPOSURE_LOW 0X04 -#define P0_HB_HIGH 0X05 -#define P0_HB_LOW 0X06 -#define P0_VB_HIGH 0X07 -#define P0_VB_LOW 0X08 -#define P0_ROW_START_HIGH 0X09 -#define P0_ROW_START_LOW 0X0A -#define P0_COL_START_HIGH 0X0B -#define P0_COL_START_LOW 0X0C - -#define P0_WIN_HEIGHT_HIGH 0X0D -#define P0_WIN_HEIGHT_LOW 0X0E -#define P0_WIN_WIDTH_HIGH 0X0F -#define P0_WIN_WIDTH_LOW 0X10 -#define P0_ANALOG_MODE1 0X17 -#define P0_ANALOG_MODE2 0X18 - -#define P0_SPECIAL_EFFECT 0X83 -#define P0_OUTPUT_FORMAT 0x84 // Format select - // Bit[7]:YUV420 row switch - // Bit[6]:YUV420 col switch - // Bit[7]:YUV420_legacy - // Bit[4:0]:output data mode - // 5’h00 Cb Y Cr Y - // 5’h01 Cr Y Cb Y - // 5’h02 Y Cb Y Cr - // 5’h03 Y Cr Y Cb - // 5’h04 LSC bypass, C/Y - // 5’h05 LSC bypass, Y/C - // 5’h06 RGB 565 - // 5’h0f bypass 10bits - // 5’h17 switch odd/even column /row to controls output Bayer pattern - // 00 RGBG - // 01 RGGB - // 10 BGGR - // 11 GBRG - // 5'h18 DNDD out mode - // 5'h19 LSC out mode - // 5;h1b EEINTP out mode -#define P0_FRAME_START 0X85 -#define P0_SYNC_MODE 0X86 -#define P0_MODULE_GATING 0X88 -#define P0_BYPASS_MODE 0X89 -#define P0_DEBUG_MODE2 0X8C -#define P0_DEBUG_MODE3 0X8D -#define P0_CROP_ENABLE 0X90 -#define P0_OUT_WIN_Y1_HIGH 0X91 -#define P0_OUT_WIN_Y1_LOW 0X92 -#define P0_OUT_WIN_X1_HIGH 0X93 -#define P0_OUT_WIN_X1_LOW 0X94 -#define P0_OUT_WIN_HEIGHT_HIGH 0X95 -#define P0_OUT_WIN_HEIGHT_LOW 0X96 -#define P0_OUT_WIN_WIDTH_HIGH 0X97 -#define P0_OUT_WIN_WIDTH_LOW 0X98 -#define P0_SUBSAMPLE 0X99 -#define P0_SUBSAMPLE_MODE 0X9A - - -#endif // __GC2145_REG_REGS_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/gc2145_settings.h b/lib/libesp32_div/esp32-camera/sensors/private_include/gc2145_settings.h deleted file mode 100644 index 879fd53b3..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/private_include/gc2145_settings.h +++ /dev/null @@ -1,719 +0,0 @@ - -#include - -#define REG_DLY 0xffff -#define REGLIST_TAIL 0x0000 /* Array end token */ - -static const uint16_t gc2145_default_init_regs[][2] = { - {0xfe, 0xf0}, - {0xfe, 0xf0}, - {0xfe, 0xf0}, - - {0xfc, 0x06}, - {0xf6, 0x00}, - - {0xf7, 0x1d}, //37 //17 //37 //1d//05 - {0xf8, 0x83}, //87 //83 //82 - {0xfa, 0x00}, - {0xf9, 0xfe}, //ff - {0xfd, 0x00}, - {0xc2, 0x00}, - {0xf2, 0x0f}, -////////////////////////////////////////////////////// -//////////////////// Analog & Cisctl //////////////// -////////////////////////////////////////////////////// - {0xfe, 0x00}, - - {0x03, 0x04}, //exp time - {0x04, 0x62}, //exp time - - {0x05, 0x01}, //00 //hb[11:8] - {0x06, 0x3b}, //0b //hb - - {0x09, 0x00}, //row start - {0x0a, 0x00}, // - {0x0b, 0x00}, //col start - {0x0c, 0x00}, - {0x0d, 0x04}, //height - {0x0e, 0xc0}, - {0x0f, 0x06}, //width - {0x10, 0x52}, - - {0x12, 0x2e}, //sh_delay 太短 YUV出图异常 - {0x17, 0x14}, //CISCTL Mode1 [1:0]mirror flip - {0x18, 0x22}, //sdark mode - {0x19, 0x0f}, // AD pipe number - {0x1a, 0x01}, //AD manual switch mode - - {0x1b, 0x4b}, //48 restg Width,SH width - {0x1c, 0x07}, //06 帧率快后，横条纹 //12 //TX Width,Space Width - {0x1d, 0x10}, //double reset - {0x1e, 0x88}, //90//98 //fix 竖线//Analog Mode1,TX high,Coln_r - {0x1f, 0x78}, //78 //38 //18 //Analog Mode2,txlow - {0x20, 0x03}, //07 //Analog Mode3,comv,ad_clk mode - {0x21, 0x40}, //10//20//40 //fix 灯管横条纹 - {0x22, 0xa0}, //d0//f0 //a2 //Vref vpix FPN严重 - {0x24, 0x1e}, - {0x25, 0x01}, //col sel - {0x26, 0x10}, //Analog PGA gain1 - {0x2d, 0x60}, //40//40 //txl drv mode - {0x30, 0x01}, //Analog Mode4 - {0x31, 0x90}, //b0//70 // Analog Mode7 [7:5]rsgh_r灯管横条纹[4:3]isp_g - {0x33, 0x06}, //03//02//01 //EQ_hstart_width - {0x34, 0x01}, -// -/////////////////////////////////////////////////// -//////////////////// ISP reg ////////////////////// -////////////////////////////////////////////////////// - {0x80, 0xff}, //outdoor gamma_en, GAMMA_en, CC_en, EE_en, INTP_en, DN_en, DD_en,LSC_en - {0x81, 0x24}, //26//24 //BLK dither mode, ll_y_en ,skin_en, edge SA, new_skin_mode, autogray_en,ll_gamma_en,BFF test image - {0x82, 0xfa}, //FA //auto_SA, auto_EE, auto_DN, auto_DD, auto_LSC, ABS_en, AWB_en, NA - {0x83, 0x00}, //special_effect - {0x84, 0x02}, //output format - {0x86, 0x03}, //c2 //46 //c2 //sync mode - {0x88, 0x03}, //[1]ctl_auto_gating [0]out_auto_gating - {0x89, 0x03}, //bypass disable - {0x85, 0x30}, //60//frame start cut - {0x8a, 0x00}, //ISP_quiet_mode,close aaa pclk,BLK gate mode,exception,close first pipe clock,close dndd clock,close intp clock,DIV_gatedclk_en - {0x8b, 0x00}, //[7:6]BFF_gate_mode,[5]BLK switch gain,[4]protect exp,[3:2]pipe gate mode,[1]not split sram,[0]dark current update - - {0xb0, 0x55}, //60 //global gain - {0xc3, 0x00}, //[7:4]auto_exp_gamma_th1[11:8],[3:0]auto_exp_gamma_th2[11:8] - {0xc4, 0x80}, //auto_exp_gamma_th1[7:0] into - {0xc5, 0x90}, //auto_exp_gamma_th2[7:0] out //outdoor gamma - {0xc6, 0x38}, //auto_gamma_th1 - {0xc7, 0x40}, //auto_gamma_th2 - - {0xec, 0x06}, //measure window - {0xed, 0x04}, - {0xee, 0x60}, //16 col - {0xef, 0x90}, //8 row - - {0xb6, 0x01}, //[0]aec en - - {0x90, 0x01}, //crop - {0x91, 0x00}, - {0x92, 0x00}, - {0x93, 0x00}, - {0x94, 0x00}, //08 - {0x95, 0x04}, - {0x96, 0xb0}, - {0x97, 0x06}, - {0x98, 0x40}, - -/////////////////////////////////////////////// -/////////// BLK //////////////////////// -/////////////////////////////////////////////// - {0x18, 0x02}, - {0x40, 0x42}, //2b //27 - {0x41, 0x00}, //80 //dark row sel - {0x43, 0x54}, //[7:4]BLK start not smooth [3:0]output start frame - - {0x5e, 0x00}, //00//10 //18 - {0x5f, 0x00}, //00//10 //18 - {0x60, 0x00}, //00//10 //18 - {0x61, 0x00}, //00///10 //18 - {0x62, 0x00}, //00//10 //18 - {0x63, 0x00}, //00//10 //18 - {0x64, 0x00}, //00/10 //18 - {0x65, 0x00}, //00//10 //18 - {0x66, 0x20}, //1e - {0x67, 0x20}, //1e - {0x68, 0x20}, //1e - {0x69, 0x20}, //1e - - - {0x76, 0x00}, //0f - - {0x6a, 0x00}, //06 - {0x6b, 0x00}, //06 - {0x6c, 0x3e}, //06 - {0x6d, 0x3e}, //06 - {0x6e, 0x3f}, //06 - {0x6f, 0x3f}, //06 - {0x70, 0x00}, //06 - {0x71, 0x00}, //06 //manual offset - - {0x76, 0x00}, //1f//add offset - {0x72, 0xf0}, //[7:4]BLK DD th [3:0]BLK various th - {0x7e, 0x3c}, //ndark - {0x7f, 0x00}, - - {0xfe, 0x02}, - {0x48, 0x15}, - {0x49, 0x00}, //04//04 //ASDE OFFSET SLOPE - {0x4b, 0x0b}, //ASDE y OFFSET SLOPE - {0xfe, 0x00}, - -/////////////////////////////////////////////// -/////////// AEC //////////////////////// -/////////////////////////////////////////////// - {0xfe, 0x01}, - - {0x01, 0x04}, //AEC X1 - {0x02, 0xc0}, //AEC X2 - {0x03, 0x04}, //AEC Y1 - {0x04, 0x90}, //AEC Y2 - {0x05, 0x30}, //20 //AEC center X1 - {0x06, 0x90}, //40 //AEC center X2 - {0x07, 0x20}, //30 //AEC center Y1 - {0x08, 0x70}, //60 //AEC center Y2 - - {0x09, 0x00}, //AEC show mode - {0x0a, 0xc2}, //[7]col gain enable - {0x0b, 0x11}, //AEC every N - {0x0c, 0x10}, //AEC_mode3 center weight - {0x13, 0x40}, //2a //AEC Y target - {0x17, 0x00}, //AEC ignore mode - {0x1c, 0x11}, // - {0x1e, 0x61}, // - {0x1f, 0x30}, //40//50 //max pre gain - {0x20, 0x40}, //60//40 //max post gain - {0x22, 0x80}, //AEC outdoor THD - {0x23, 0x20}, //target_Y_low_limit - {0xfe, 0x02}, - {0x0f, 0x04}, //05 - {0xfe, 0x01}, - - {0x12, 0x35}, //35 //[5:4]group_size [3]slope_disable [2]outdoor_enable [0]histogram_enable - {0x15, 0x50}, //target_Y_high_limit - {0x10, 0x31}, //num_thd_high - {0x3e, 0x28}, //num_thd_low - {0x3f, 0xe0}, //luma_thd - {0x40, 0x20}, //luma_slope - {0x41, 0x0f}, //color_diff - - {0xfe, 0x02}, - {0x0f, 0x05}, //max_col_level -/////////////////////////// -////// INTPEE ///////////// -/////////////////////////// - {0xfe, 0x02}, //page2 - {0x90, 0x6c}, //ac //eeintp mode1 - {0x91, 0x03}, //02 ////eeintp mode2 - {0x92, 0xc8}, //44 //low criteria for direction - {0x94, 0x66}, - {0x95, 0xb5}, - {0x97, 0x64}, //78 ////edge effect - {0xa2, 0x11}, //fix direction - {0xfe, 0x00}, - -///////////////////////////// -//////// DNDD/////////////// -///////////////////////////// - {0xfe, 0x02}, - {0x80, 0xc1}, //c1 //[7]share mode [6]skin mode [5]is 5x5 mode [1:0]noise value select 0:2 1:2.5 2:3 3:4 - {0x81, 0x08}, // - {0x82, 0x08}, //signal a 0.6 - {0x83, 0x08}, //04 //signal b 2.5 - - {0x84, 0x0a}, //10 //05 dark_DD_TH - {0x86, 0xf0}, //a0 Y_value_dd_th2 - {0x87, 0x50}, //90 Y_value_dd_th3 - {0x88, 0x15}, //60 Y_value_dd_th4 - - {0x89, 0x50}, //80 // asde th2 - {0x8a, 0x30}, //60 // asde th3 - {0x8b, 0x10}, //30 // asde th4 - -///////////////////////////////////////////////// -///////////// ASDE //////////////////////// -///////////////////////////////////////////////// - {0xfe, 0x01}, //page 1 - {0x21, 0x14}, //luma_value_div_sel(分频，与0xef呈2倍关系，增大1，0xef的值减小1倍) -//ff ef luma_value read_only - - {0xfe, 0x02}, //page2 - {0xa3, 0x40}, //ASDE_low_luma_value_LSC_th_H - {0xa4, 0x20}, //ASDE_low_luma_value_LSC_th_L - - {0xa5, 0x40}, //80 //ASDE_LSC_gain_dec_slope_H - {0xa6, 0x80}, // 80 //ASDE_LSC_gain_dec_slope_L -//ff a7 ASDE_LSC_gain_dec //read only - - {0xab, 0x40}, //50 //ASDE_low_luma_value_OT_th - - {0xae, 0x0c}, //[3]EE1_effect_inc_or_dec_high,[2]EE2_effect_inc_or_dec_high, - //[1]EE1_effect_inc_or_dec_low,[0]EE2_effect_inc_or_dec_low, 1:inc 0:dec - - {0xb3, 0x34}, //44 //ASDE_EE1_effect_slope_low,ASDE_EE2_effect_slope_low - {0xb4, 0x44}, //12 //ASDE_EE1_effect_slope_high,ASDE_EE2_effect_slope_high - - {0xb6, 0x38}, //40//40 //ASDE_auto_saturation_dec_slope - {0xb7, 0x02}, //04 //ASDE_sub_saturation_slope - {0xb9, 0x30}, //[7:0]ASDE_auto_saturation_low_limit - {0x3c, 0x08}, //[3:0]auto gray_dec_slope - {0x3d, 0x30}, //[7:0]auto gray_dec_th - - - {0x4b, 0x0d}, //y offset slope - {0x4c, 0x20}, //y offset limit - - {0xfe, 0x00}, -// -///////////////////gamma1//////////////////// -////Gamma - {0xfe, 0x02}, - {0x10, 0x10}, - {0x11, 0x15}, - {0x12, 0x1a}, - {0x13, 0x1f}, - {0x14, 0x2c}, - {0x15, 0x39}, - {0x16, 0x45}, - {0x17, 0x54}, - {0x18, 0x69}, - {0x19, 0x7d}, - {0x1a, 0x8f}, - {0x1b, 0x9d}, - {0x1c, 0xa9}, - {0x1d, 0xbd}, - {0x1e, 0xcd}, - {0x1f, 0xd9}, - {0x20, 0xe3}, - {0x21, 0xea}, - {0x22, 0xef}, - {0x23, 0xf5}, - {0x24, 0xf9}, - {0x25, 0xff}, - -/////auto gamma///// - {0xfe, 0x02}, - {0x26, 0x0f}, - {0x27, 0x14}, - {0x28, 0x19}, - {0x29, 0x1e}, - {0x2a, 0x27}, - {0x2b, 0x33}, - {0x2c, 0x3b}, - {0x2d, 0x45}, - {0x2e, 0x59}, - {0x2f, 0x69}, - {0x30, 0x7c}, - {0x31, 0x89}, - {0x32, 0x98}, - {0x33, 0xae}, - {0x34, 0xc0}, - {0x35, 0xcf}, - {0x36, 0xda}, - {0x37, 0xe2}, - {0x38, 0xe9}, - {0x39, 0xf3}, - {0x3a, 0xf9}, - {0x3b, 0xff}, - -/////////////////////////////////////////////// -/////////// YCP /////////////////////// -/////////////////////////////////////////////// - {0xfe, 0x02}, - {0xd1, 0x30}, //32 // - {0xd2, 0x30}, //32 // - {0xd3, 0x45}, - {0xdd, 0x14}, //edge sa - {0xde, 0x86}, //asde auto gray - {0xed, 0x01}, // - {0xee, 0x28}, - {0xef, 0x30}, - {0xd8, 0xd8}, //autogray protecy - -//////////////////////////// -//////// LSC 0.8/////////////// -//////////////////////////// - {0xfe, 0x01}, - {0xa1, 0x80}, // center_row - {0xa2, 0x80}, // center_col - {0xa4, 0x00}, // sign of b1 - {0xa5, 0x00}, // sign of b1 - {0xa6, 0x70}, // sign of b4 - {0xa7, 0x00}, // sign of b4 - {0xa8, 0x77}, // sign of b22 - {0xa9, 0x77}, // sign of b22 - {0xaa, 0x1f}, // Q1_b1 of R - {0xab, 0x0d}, // Q1_b1 of G - {0xac, 0x19}, // Q1_b1 of B - {0xad, 0x24}, // Q2_b1 of R - {0xae, 0x0e}, // Q2_b1 of G - {0xaf, 0x1d}, // Q2_b1 of B - {0xb0, 0x12}, // Q3_b1 of R - {0xb1, 0x0c}, // Q3_b1 of G - {0xb2, 0x06}, // Q3_b1 of B - {0xb3, 0x13}, // Q4_b1 of R - {0xb4, 0x10}, // Q4_b1 of G - {0xb5, 0x0c}, // Q4_b1 of B - {0xb6, 0x6a}, // right_b2 of R - {0xb7, 0x46}, // right_b2 of G - {0xb8, 0x40}, // right_b2 of B - {0xb9, 0x0b}, // right_b4 of R - {0xba, 0x04}, // right_b4 of G - {0xbb, 0x00}, // right_b4 of B - {0xbc, 0x53}, // left_b2 of R - {0xbd, 0x37}, // left_b2 of G - {0xbe, 0x2d}, // left_b2 of B - {0xbf, 0x0a}, // left_b4 of R - {0xc0, 0x0a}, // left_b4 of G - {0xc1, 0x14}, // left_b4 of B - {0xc2, 0x34}, // up_b2 of R - {0xc3, 0x22}, // up_b2 of G - {0xc4, 0x18}, // up_b2 of B - {0xc5, 0x23}, // up_b4 of R - {0xc6, 0x0f}, // up_b4 of G - {0xc7, 0x3c}, // up_b4 of B - {0xc8, 0x20}, // down_b2 of R - {0xc9, 0x1f}, // down_b2 of G - {0xca, 0x17}, // down_b2 of B - {0xcb, 0x2d}, // down_b4 of R - {0xcc, 0x12}, // down_b4 of G - {0xcd, 0x20}, // down_b4 of B - {0xd0, 0x61}, // right_up_b22 of R - {0xd1, 0x2f}, // right_up_b22 of G - {0xd2, 0x39}, // right_up_b22 of B - {0xd3, 0x45}, // right_down_b22 of R - {0xd4, 0x2c}, // right_down_b22 of G - {0xd5, 0x21}, // right_down_b22 of B - {0xd6, 0x64}, // left_up_b22 of R - {0xd7, 0x2d}, // left_up_b22 of G - {0xd8, 0x30}, // left_up_b22 of B - {0xd9, 0x42}, // left_down_b22 of R - {0xda, 0x27}, // left_down_b22 of G - {0xdb, 0x13}, // left_down_b22 of B - {0xfe, 0x00}, - -///////////////////////////////////////////////// -///////////// AWB //////////////////////// -///////////////////////////////////////////////// - {0xfe, 0x01}, - - {0x4f, 0x00}, - {0x4f, 0x00}, - {0x4b, 0x01}, - {0x4f, 0x00}, - - - {0x4c, 0x01}, - {0x4d, 0x6f}, - {0x4e, 0x02}, - {0x4c, 0x01}, - {0x4d, 0x70}, - - {0x4e, 0x02}, - {0x4c, 0x01}, - {0x4d, 0x8f}, - {0x4e, 0x02}, - - {0x4c, 0x01}, - {0x4d, 0x90}, - {0x4e, 0x02}, //light - - - {0x4c, 0x01}, - {0x4d, 0xed}, - {0x4e, 0x33}, //light - {0x4c, 0x01}, - {0x4d, 0xcd}, - {0x4e, 0x33}, //light - {0x4c, 0x01}, - {0x4d, 0xec}, - {0x4e, 0x03}, //light - - {0x4c, 0x01}, - {0x4d, 0x6c}, - {0x4e, 0x03}, - {0x4c, 0x01}, - {0x4d, 0x6d}, - {0x4e, 0x03}, - {0x4c, 0x01}, - {0x4d, 0x6e}, - {0x4e, 0x03}, - {0x4c, 0x01}, - {0x4d, 0x8c}, - {0x4e, 0x03}, - {0x4c, 0x01}, - {0x4d, 0x8d}, - {0x4e, 0x03}, - {0x4c, 0x01}, - {0x4d, 0x8e}, - {0x4e, 0x03}, - {0x4c, 0x01}, - {0x4d, 0xab}, - {0x4e, 0x03}, - {0x4c, 0x01}, - {0x4d, 0xac}, - {0x4e, 0x03}, - {0x4c, 0x01}, - {0x4d, 0xad}, - {0x4e, 0x03}, - {0x4c, 0x01}, - {0x4d, 0xae}, - {0x4e, 0x03}, - {0x4c, 0x01}, - {0x4d, 0xcb}, - {0x4e, 0x03}, - - {0x4c, 0x01}, - {0x4d, 0xcc}, - {0x4e, 0x03}, - {0x4c, 0x01}, - {0x4d, 0xce}, - {0x4e, 0x03}, - {0x4c, 0x01}, - {0x4d, 0xeb}, - {0x4e, 0x03}, - {0x4c, 0x01}, - {0x4d, 0xec}, - {0x4e, 0x03}, - {0x4c, 0x01}, - {0x4d, 0xee}, - {0x4e, 0x03}, - {0x4c, 0x02}, - {0x4d, 0x0c}, - {0x4e, 0x03}, - {0x4c, 0x02}, - {0x4d, 0x0d}, - {0x4e, 0x03}, - {0x4c, 0x01}, - {0x4d, 0xea}, - {0x4e, 0x03}, - {0x4c, 0x01}, - {0x4d, 0xaf}, - {0x4e, 0x03}, //dark - {0x4c, 0x01}, - {0x4d, 0xcf}, - {0x4e, 0x03}, //dark - - {0x4c, 0x01}, - {0x4d, 0xca}, - {0x4e, 0x04}, //light - {0x4c, 0x02}, - {0x4d, 0x0b}, - {0x4e, 0x05}, //light - {0x4c, 0x02}, - {0x4d, 0xc8}, - {0x4e, 0x06}, //light 100lux - {0x4c, 0x02}, - {0x4d, 0xa8}, - - {0x4e, 0x06}, //light - {0x4c, 0x02}, - {0x4d, 0xa9}, - {0x4e, 0x06}, //light - - - {0x4c, 0x02}, - {0x4d, 0x89}, - {0x4e, 0x06}, //400lux - {0x4c, 0x02}, - {0x4d, 0x69}, - {0x4e, 0x06}, //f12 - {0x4c, 0x02}, - {0x4d, 0x6a}, - {0x4e, 0x06}, //f12 - {0x4c, 0x02}, - {0x4d, 0xc7}, - {0x4e, 0x07}, - {0x4c, 0x02}, - {0x4d, 0xe7}, - {0x4e, 0x07}, //100lux - {0x4c, 0x03}, - {0x4d, 0x07}, - {0x4e, 0x07}, //light - - {0x4c, 0x02}, - {0x4d, 0xe8}, - {0x4e, 0x07}, - {0x4c, 0x02}, - {0x4d, 0xe9}, - {0x4e, 0x07}, - {0x4c, 0x03}, - {0x4d, 0x08}, - {0x4e, 0x07}, - {0x4c, 0x03}, - {0x4d, 0x09}, - {0x4e, 0x07}, - {0x4c, 0x03}, - {0x4d, 0x27}, - {0x4e, 0x07}, - {0x4c, 0x03}, - {0x4d, 0x28}, - {0x4e, 0x07}, - {0x4c, 0x03}, - {0x4d, 0x29}, - {0x4e, 0x07}, - {0x4c, 0x03}, - {0x4d, 0x47}, - {0x4e, 0x07}, - {0x4c, 0x03}, - {0x4d, 0x48}, - {0x4e, 0x07}, - {0x4c, 0x03}, - {0x4d, 0x49}, - {0x4e, 0x07}, - {0x4c, 0x03}, - {0x4d, 0x67}, - {0x4e, 0x07}, - {0x4c, 0x03}, - {0x4d, 0x68}, - {0x4e, 0x07}, - {0x4c, 0x03}, - {0x4d, 0x69}, - {0x4e, 0x07}, - - {0x4f, 0x01}, - {0xfe, 0x01}, - {0x50, 0x80}, //AWB_PRE_mode - {0x51, 0xa8}, //AWB_pre_THD_min[7:0] - {0x52, 0x57}, //AWB_pre_THD_min[15:8] Dominiate luma 0.25=639c 0.22=57a8 - {0x53, 0x38}, //AWB_pre_THD_min_MIX[7:0] - {0x54, 0xc7}, //AWB_pre_THD_min_MIX[15:8] Mix luma 0.5 - - {0x56, 0x0e}, //AWB_tone mode - {0x58, 0x08}, //AWB_C_num_sel,AWB_D_num_sel - {0x5b, 0x00}, //AWB_mix_mode - - {0x5c, 0x74}, //green_num0[7:0] - {0x5d, 0x8b}, //green_num0[15:8] 0.35 - - {0x61, 0xd3}, //R2G_stand0 - {0x62, 0xb5}, //B2G_stand0 - {0x63, 0x00}, //88//a4 //AWB gray mode [7]enable - {0x65, 0x04}, //AWB margin - - {0x67, 0xb2}, //R2G_stand3[7:0] FF/CWF - {0x68, 0xac}, //B2G_stand3[7:0] - {0x69, 0x00}, //R2G_stand4[9:8] B2G_stand4[9:8] R2G_stand3[9:8] B2G_stand3[9:8] - {0x6a, 0xb2}, //R2G_stand4[7:0] TL84/TL84&CWF - {0x6b, 0xac}, //B2G_stand4[7:0] - {0x6c, 0xb2}, //R2G_stand5[7:0] A - {0x6d, 0xac}, //B2G_stand5[7:0] - {0x6e, 0x40}, //AWB_skin_weight R2G_stand5[9:8] B2G_stand5[9:8] - {0x6f, 0x18}, //AWB_indoor_THD (0x21=17 caculate) - {0x73, 0x00}, //AWB_indoor_mode - - {0x70, 0x10}, //AWB low luma TH - {0x71, 0xe8}, //AWB outdoor TH - {0x72, 0xc0}, //outdoor mode - {0x74, 0x01}, //[2:0]AWB skip mode 2x2,4x4,4x8,8x8 - {0x75, 0x01}, //[1:0]AWB_every_N - {0x7f, 0x08}, //[3]gray world frame start - - {0x76, 0x70}, //R limit - {0x77, 0x58}, //G limit - {0x78, 0xa0}, //d8 //B limit - - {0xfe, 0x00}, -// -////////////////////////////////////////// -/////////// CC //////////////////////// -////////////////////////////////////////// - {0xfe, 0x02}, - - {0xc0, 0x01}, //[5:4] CC mode [0]CCT enable - - {0xC1, 0x50}, //D50/D65 - {0xc2, 0xF9}, - {0xc3, 0x00}, //0 - {0xc4, 0xe8}, //e0 - {0xc5, 0x48}, - {0xc6, 0xf0}, - - - {0xC7, 0x50}, - {0xc8, 0xf2}, - {0xc9, 0x00}, - {0xcA, 0xE0}, - {0xcB, 0x45}, - {0xcC, 0xec}, - - {0xCd, 0x45}, - {0xce, 0xf0}, - {0xcf, 0x00}, - {0xe3, 0xf0}, - {0xe4, 0x45}, - {0xe5, 0xe8}, - - - {0xfe, 0x00}, - - {0xf2, 0x0f}, - - -//////////////frame rate 50Hz - {0xfe, 0x00}, - - {0xf7, 0x1d}, - {0xf8, 0x84}, - {0xfa, 0x00}, - - {0x05, 0x01}, //hb - {0x06, 0x3b}, - {0x07, 0x01}, //Vb - {0x08, 0x0b}, - - {0xfe, 0x01}, - {0x25, 0x01}, - {0x26, 0x32}, //step - {0x27, 0x03}, //8.15fps - {0x28, 0x96}, - {0x29, 0x03}, //8.15fps - {0x2a, 0x96}, - {0x2b, 0x03}, //8.15fps - {0x2c, 0x96}, - {0x2d, 0x04}, //8.15fps - {0x2e, 0x62}, - {0x3c, 0x00}, - {0xfe, 0x00}, - -/////////dark sun////// - {0xfe, 0x00}, - {0x18, 0x22}, - {0xfe, 0x02}, - {0x40, 0xbf}, - {0x46, 0xcf}, - {0xfe, 0x00}, - - {0xfe, 0x00}, - - {0xf7, 0x1d}, - {0xf8, 0x84}, - {0xfa, 0x10}, - - {0x05, 0x01}, //hb - {0x06, 0x18}, - {0x07, 0x00}, //Vb - {0x08, 0x2e}, - - {0xfe, 0x01}, - {0x25, 0x00}, - {0x26, 0xa2}, //step - {0x27, 0x01}, - {0x28, 0xe6}, - {0x29, 0x01}, - {0x2a, 0xe6}, - {0x2b, 0x01}, - {0x2c, 0xe6}, - {0x2d, 0x04}, // AEC_exp_level4[12:8] - {0x2e, 0x62}, // AEC_exp_level4[7:0] - {0x3c, 0x00}, - {0xfe, 0x00}, - - {0x09, 0x01}, //row start - {0x0a, 0xd0}, // - {0x0b, 0x02}, //col start - {0x0c, 0x70}, - {0x0d, 0x01}, //height - {0x0e, 0x00}, - {0x0f, 0x01}, //width - {0x10, 0x50}, - - {0x90, 0x01}, //crop - {0x91, 0x00}, - {0x92, 0x00}, - {0x93, 0x00}, - {0x94, 0x00}, - {0x95, 0x00}, - {0x96, 0xf0}, - {0x97, 0x01}, - {0x98, 0x40}, - - - {REGLIST_TAIL, 0x00}, -}; diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/nt99141.h b/lib/libesp32_div/esp32-camera/sensors/private_include/nt99141.h deleted file mode 100644 index 8b0c562b9..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/private_include/nt99141.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This file is part of the OpenMV project. - * Copyright (c) 2013/2014 Ibrahim Abdelkader - * This work is licensed under the MIT license, see the file LICENSE for details. - * - * NT99141 driver. - * - */ -#ifndef __NT99141_H__ -#define __NT99141_H__ - -#include "sensor.h" - -/** - * @brief Detect sensor pid - * - * @param slv_addr SCCB address - * @param id Detection result - * @return - * 0: Can't detect this sensor - * Nonzero: This sensor has been detected - */ -int nt99141_detect(int slv_addr, sensor_id_t *id); - -/** - * @brief initialize sensor function pointers - * - * @param sensor pointer of sensor - * @return - * Always 0 - */ -int nt99141_init(sensor_t *sensor); - -#endif // __NT99141_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/nt99141_regs.h b/lib/libesp32_div/esp32-camera/sensors/private_include/nt99141_regs.h deleted file mode 100644 index 8301db901..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/private_include/nt99141_regs.h +++ /dev/null @@ -1,211 +0,0 @@ -/* - * NT99141 register definitions. - */ -#ifndef __NT99141_REG_REGS_H__ -#define __NT99141_REG_REGS_H__ - -/* system control registers */ -#define SYSTEM_CTROL0 0x3021 // Bit[7]: Software reset - // Bit[6]: Software power down - // Bit[5]: Reserved - // Bit[4]: SRB clock SYNC enable - // Bit[3]: Isolation suspend select - // Bit[2:0]: Not used - -/* output format control registers */ -#define FORMAT_CTRL 0x501F // Format select - // Bit[2:0]: - // 000: YUV422 - // 001: RGB - // 010: Dither - // 011: RAW after DPC - // 101: RAW after CIP - -/* format control registers */ -#define FORMAT_CTRL00 0x4300 - -/* frame control registers */ -#define FRAME_CTRL01 0x4201 // Control Passed Frame Number When both ON and OFF number set to 0x00,frame control is in bypass mode - // Bit[7:4]: Not used - // Bit[3:0]: Frame ON number -#define FRAME_CTRL02 0x4202 // Control Masked Frame Number When both ON and OFF number set to 0x00,frame control is in bypass mode - // Bit[7:4]: Not used - // BIT[3:0]: Frame OFF number - -/* ISP top control registers */ -#define PRE_ISP_TEST_SETTING_1 0x3025 // Bit[7]: Test enable - // 0: Test disable - // 1: Color bar enable - // Bit[6]: Rolling - // Bit[5]: Transparent - // Bit[4]: Square black and white - // Bit[3:2]: Color bar style - // 00: Standard 8 color bar - // 01: Gradual change at vertical mode 1 - // 10: Gradual change at horizontal - // 11: Gradual change at vertical mode 2 - // Bit[1:0]: Test select - // 00: Color bar - // 01: Random data - // 10: Square data - // 11: Black image - -//exposure = {0x3500[3:0], 0x3501[7:0], 0x3502[7:0]} / 16 × tROW - -/* AEC/AGC control functions */ -#define AEC_PK_MANUAL 0x3201 // AEC Manual Mode Control - // Bit[7:6]: Reserved - // Bit[5]: Gain delay option - // Valid when 0x3503[4]=1’b0 - // 0: Delay one frame latch - // 1: One frame latch - // Bit[4:2]: Reserved - // Bit[1]: AGC manual - // 0: Auto enable - // 1: Manual enable - // Bit[0]: AEC manual - // 0: Auto enable - // 1: Manual enable - -//gain = {0x350A[1:0], 0x350B[7:0]} / 16 - -/* mirror and flip registers */ -#define TIMING_TC_REG20 0x3022 // Timing Control Register - // Bit[2:1]: Vertical flip enable - // 00: Normal - // 11: Vertical flip - // Bit[0]: Vertical binning enable -#define TIMING_TC_REG21 0x3022 // Timing Control Register - // Bit[5]: Compression Enable - // Bit[2:1]: Horizontal mirror enable - // 00: Normal - // 11: Horizontal mirror - // Bit[0]: Horizontal binning enable - -#define CLOCK_POL_CONTROL 0x3024// Bit[5]: PCLK polarity 0: active low - // 1: active high - // Bit[3]: Gate PCLK under VSYNC - // Bit[2]: Gate PCLK under HREF - // Bit[1]: HREF polarity - // 0: active low - // 1: active high - // Bit[0] VSYNC polarity - // 0: active low - // 1: active high -#define DRIVE_CAPABILITY 0x306a // Bit[7:6]: - // 00: 1x - // 01: 2x - // 10: 3x - // 11: 4x - - -#define X_ADDR_ST_H 0x3800 //Bit[3:0]: X address start[11:8] -#define X_ADDR_ST_L 0x3801 //Bit[7:0]: X address start[7:0] -#define Y_ADDR_ST_H 0x3802 //Bit[2:0]: Y address start[10:8] -#define Y_ADDR_ST_L 0x3803 //Bit[7:0]: Y address start[7:0] -#define X_ADDR_END_H 0x3804 //Bit[3:0]: X address end[11:8] -#define X_ADDR_END_L 0x3805 //Bit[7:0]: -#define Y_ADDR_END_H 0x3806 //Bit[2:0]: Y address end[10:8] -#define Y_ADDR_END_L 0x3807 //Bit[7:0]: -// Size after scaling -#define X_OUTPUT_SIZE_H 0x3808 //Bit[3:0]: DVP output horizontal width[11:8] -#define X_OUTPUT_SIZE_L 0x3809 //Bit[7:0]: -#define Y_OUTPUT_SIZE_H 0x380a //Bit[2:0]: DVP output vertical height[10:8] -#define Y_OUTPUT_SIZE_L 0x380b //Bit[7:0]: -#define X_TOTAL_SIZE_H 0x380c //Bit[3:0]: Total horizontal size[11:8] -#define X_TOTAL_SIZE_L 0x380d //Bit[7:0]: -#define Y_TOTAL_SIZE_H 0x380e //Bit[7:0]: Total vertical size[15:8] -#define Y_TOTAL_SIZE_L 0x380f //Bit[7:0]: -#define X_OFFSET_H 0x3810 //Bit[3:0]: ISP horizontal offset[11:8] -#define X_OFFSET_L 0x3811 //Bit[7:0]: -#define Y_OFFSET_H 0x3812 //Bit[2:0]: ISP vertical offset[10:8] -#define Y_OFFSET_L 0x3813 //Bit[7:0]: -#define X_INCREMENT 0x3814 //Bit[7:4]: Horizontal odd subsample increment - //Bit[3:0]: Horizontal even subsample increment -#define Y_INCREMENT 0x3815 //Bit[7:4]: Vertical odd subsample increment - //Bit[3:0]: Vertical even subsample increment -// Size before scaling -//#define X_INPUT_SIZE (X_ADDR_END - X_ADDR_ST + 1 - (2 * X_OFFSET)) -//#define Y_INPUT_SIZE (Y_ADDR_END - Y_ADDR_ST + 1 - (2 * Y_OFFSET)) - -#define ISP_CONTROL_01 0x3021 // Bit[5]: Scale enable - // 0: Disable - // 1: Enable - -#define SCALE_CTRL_1 0x5601 // Bit[6:4]: HDIV RW - // DCW scale times - // 000: DCW 1 time - // 001: DCW 2 times - // 010: DCW 4 times - // 100: DCW 8 times - // 101: DCW 16 times - // Others: DCW 16 times - // Bit[2:0]: VDIV RW - // DCW scale times - // 000: DCW 1 time - // 001: DCW 2 times - // 010: DCW 4 times - // 100: DCW 8 times - // 101: DCW 16 times - // Others: DCW 16 times - -#define SCALE_CTRL_2 0x5602 // X_SCALE High Bits -#define SCALE_CTRL_3 0x5603 // X_SCALE Low Bits -#define SCALE_CTRL_4 0x5604 // Y_SCALE High Bits -#define SCALE_CTRL_5 0x5605 // Y_SCALE Low Bits -#define SCALE_CTRL_6 0x5606 // Bit[3:0]: V Offset - -#define PCLK_RATIO 0x3824 // Bit[4:0]: PCLK ratio manual -#define VFIFO_CTRL0C 0x460C // Bit[1]: PCLK manual enable - // 0: Auto - // 1: Manual by PCLK_RATIO - -#define VFIFO_X_SIZE_H 0x4602 -#define VFIFO_X_SIZE_L 0x4603 -#define VFIFO_Y_SIZE_H 0x4604 -#define VFIFO_Y_SIZE_L 0x4605 - -#define SC_PLLS_CTRL0 0x303a // Bit[7]: PLLS bypass -#define SC_PLLS_CTRL1 0x303b // Bit[4:0]: PLLS multiplier -#define SC_PLLS_CTRL2 0x303c // Bit[6:4]: PLLS charge pump control - // Bit[3:0]: PLLS system divider -#define SC_PLLS_CTRL3 0x303d // Bit[5:4]: PLLS pre-divider - // 00: 1 - // 01: 1.5 - // 10: 2 - // 11: 3 - // Bit[2]: PLLS root-divider - 1 - // Bit[1:0]: PLLS seld5 - // 00: 1 - // 01: 1 - // 10: 2 - // 11: 2.5 - -#define COMPRESSION_CTRL00 0x4400 // -#define COMPRESSION_CTRL01 0x4401 // -#define COMPRESSION_CTRL02 0x4402 // -#define COMPRESSION_CTRL03 0x4403 // -#define COMPRESSION_CTRL04 0x4404 // -#define COMPRESSION_CTRL05 0x4405 // -#define COMPRESSION_CTRL06 0x4406 // -#define COMPRESSION_CTRL07 0x3401 // Bit[5:0]: QS -#define COMPRESSION_ISI_CTRL 0x4408 // -#define COMPRESSION_CTRL09 0x4409 // -#define COMPRESSION_CTRL0a 0x440a // -#define COMPRESSION_CTRL0b 0x440b // -#define COMPRESSION_CTRL0c 0x440c // -#define COMPRESSION_CTRL0d 0x440d // -#define COMPRESSION_CTRL0E 0x440e // - -/** - * @brief register value - */ -#define TEST_COLOR_BAR 0x02 /* Enable Color Bar roling Test */ - -#define AEC_PK_MANUAL_AGC_MANUALEN 0x02 /* Enable AGC Manual enable */ -#define AEC_PK_MANUAL_AEC_MANUALEN 0x01 /* Enable AEC Manual enable */ - -#define TIMING_TC_REG20_VFLIP 0x01 /* Vertical flip enable */ -#define TIMING_TC_REG21_HMIRROR 0x02 /* Horizontal mirror enable */ - -#endif // __NT99141_REG_REGS_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/nt99141_settings.h b/lib/libesp32_div/esp32-camera/sensors/private_include/nt99141_settings.h deleted file mode 100644 index 1ffec2053..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/private_include/nt99141_settings.h +++ /dev/null @@ -1,825 +0,0 @@ -#ifndef _NT99141_SETTINGS_H_ -#define _NT99141_SETTINGS_H_ - -#include -#include -#include "esp_attr.h" -#include "nt99141_regs.h" - -static const ratio_settings_t ratio_table[] = { - // mw, mh, sx, sy, ex, ey, ox, oy, tx, ty - { 1280, 720, 0, 4, 1283, 723, 0, 4, 1660, 963 }, - -}; - -#define REG_DLY 0xffff -#define REGLIST_TAIL 0x0000 - -static const DRAM_ATTR uint16_t sensor_default_regs[][2] = { - //initial -{0x3021, 0x00}, -{REG_DLY, 100}, // delay 100ms -{0x3109, 0x04}, -{0x3040, 0x04}, -{0x3041, 0x02}, -{0x3042, 0xFF}, -{0x3043, 0x08}, -{0x3052, 0xE0}, -{0x305F, 0x33}, -{0x3100, 0x07}, -{0x3106, 0x03}, -{0x3105, 0x01}, -{0x3108, 0x05}, -{0x3110, 0x22}, -{0x3111, 0x57}, -{0x3112, 0x22}, -{0x3113, 0x55}, -{0x3114, 0x05}, -{0x3135, 0x00}, -{0x32F0, 0x01}, -{0x3290, 0x01}, -{0x3291, 0x80}, -{0x3296, 0x01}, -{0x3297, 0x73}, -{0x3250, 0x80}, -{0x3251, 0x03}, -{0x3252, 0xFF}, -{0x3253, 0x00}, -{0x3254, 0x03}, -{0x3255, 0xFF}, -{0x3256, 0x00}, -{0x3257, 0x50}, -{0x3270, 0x00}, -{0x3271, 0x0C}, -{0x3272, 0x18}, -{0x3273, 0x32}, -{0x3274, 0x44}, -{0x3275, 0x54}, -{0x3276, 0x70}, -{0x3277, 0x88}, -{0x3278, 0x9D}, -{0x3279, 0xB0}, -{0x327A, 0xCF}, -{0x327B, 0xE2}, -{0x327C, 0xEF}, -{0x327D, 0xF7}, -{0x327E, 0xFF}, -{0x3302, 0x00}, -{0x3303, 0x40}, -{0x3304, 0x00}, -{0x3305, 0x96}, -{0x3306, 0x00}, -{0x3307, 0x29}, -{0x3308, 0x07}, -{0x3309, 0xBA}, -{0x330A, 0x06}, -{0x330B, 0xF5}, -{0x330C, 0x01}, -{0x330D, 0x51}, -{0x330E, 0x01}, -{0x330F, 0x30}, -{0x3310, 0x07}, -{0x3311, 0x16}, -{0x3312, 0x07}, -{0x3313, 0xBA}, -{0x3326, 0x02}, -{0x32F6, 0x0F}, -{0x32F9, 0x42}, -{0x32FA, 0x24}, -{0x3325, 0x4A}, -{0x3330, 0x00}, -{0x3331, 0x0A}, -{0x3332, 0xFF}, -{0x3338, 0x30}, -{0x3339, 0x84}, -{0x333A, 0x48}, -{0x333F, 0x07}, -{0x3360, 0x10}, -{0x3361, 0x18}, -{0x3362, 0x1f}, -{0x3363, 0x37}, -{0x3364, 0x80}, -{0x3365, 0x80}, -{0x3366, 0x68}, -{0x3367, 0x60}, -{0x3368, 0x30}, -{0x3369, 0x28}, -{0x336A, 0x20}, -{0x336B, 0x10}, -{0x336C, 0x00}, -{0x336D, 0x20}, -{0x336E, 0x1C}, -{0x336F, 0x18}, -{0x3370, 0x10}, -{0x3371, 0x38}, -{0x3372, 0x3C}, -{0x3373, 0x3F}, -{0x3374, 0x3F}, -{0x338A, 0x34}, -{0x338B, 0x7F}, -{0x338C, 0x10}, -{0x338D, 0x23}, -{0x338E, 0x7F}, -{0x338F, 0x14}, -{0x3375, 0x08}, -{0x3376, 0x0C}, -{0x3377, 0x18}, -{0x3378, 0x20}, -{0x3012, 0x02}, -{0x3013, 0xD0}, -{0x3025, 0x02}, //colorbar -{REGLIST_TAIL, 0x00}, // tail -}; - -static const DRAM_ATTR uint16_t sensor_fmt_jpeg[][2] = { - {0x32F0, 0x70}, // YUV422 - {REGLIST_TAIL, 0x00}, // tail -}; - -static const DRAM_ATTR uint16_t sensor_fmt_raw[][2] = { - {0x32F0, 0x50}, // RAW - {REGLIST_TAIL, 0x00}, // tail -}; - -static const DRAM_ATTR uint16_t sensor_fmt_grayscale[][2] = { - {0x32F1, 0x01}, - {REGLIST_TAIL, 0x00}, // tail -}; - -static const DRAM_ATTR uint16_t sensor_fmt_yuv422[][2] = { - {0x32F0, 0x00}, // YUV422 - {REGLIST_TAIL, 0x00}, // tail -}; - -static const DRAM_ATTR uint16_t sensor_fmt_rgb565[][2] = { - {0x32F0, 0x01}, // RGB - {REGLIST_TAIL, 0x00}, // tail -}; - -static const DRAM_ATTR uint8_t sensor_saturation_levels[9][1] = { - {0x60},//-4 - {0x68},//-3 - {0x70},//-2 - {0x78},//-1 - {0x80},//0 - {0x88},//+1 - {0x90},//+2 - {0x98},//+3 - {0xA0},//+4 -}; - -static const DRAM_ATTR uint8_t sensor_special_effects[7][4] = { - {0x00, 0x80, 0x80, 0x01},//Normal - {0x03, 0x80, 0x80, 0x01},//Negative - {0x01, 0x80, 0x80, 0x01},//Grayscale - {0x05, 0x2A, 0xF0, 0x01},//Red Tint - {0x05, 0x60, 0x20, 0x01},//Green Tint - {0x05, 0xF0, 0x80, 0x01},//Blue Tint - {0x02, 0x80, 0x80, 0x01},//Sepia - -}; - -// AE LEVEL -static const DRAM_ATTR uint16_t sensor_ae_level[][2] = { - -// 1. [AE_Target : 0x24] -// Set_Device_Format = FORMAT_16_8 -// SET_Device_Addr = 0x54 - {0x32B8, 0x29 }, - {0x32B9, 0x1F }, - {0x32BC, 0x24 }, - {0x32BD, 0x27 }, - {0x32BE, 0x21 }, -//------------------------------------------------------------------------ -// 2. [AE_Target : 0x28] -// Set_Device_Format = FORMAT_16_8 -// SET_Device_Addr = 0x54 - {0x32B8, 0x2D }, - {0x32B9, 0x23 }, - {0x32BC, 0x28 }, - {0x32BD, 0x2B }, - {0x32BE, 0x25 }, -//------------------------------------------------------------------------ -// 3. [AE_Target : 0x2C] -// Set_Device_Format = FORMAT_16_8 -// SET_Device_Addr = 0x54 - {0x32B8, 0x32 }, - {0x32B9, 0x26 }, - {0x32BC, 0x2C }, - {0x32BD, 0x2F }, - {0x32BE, 0x29 }, -//------------------------------------------------------------------------ -// 4, [AE_Target : 0x30] -// Set_Device_Format = FORMAT_16_8 -// SET_Device_Addr = 0x54 - {0x32B8, 0x36 }, - {0x32B9, 0x2A }, - {0x32BC, 0x30 }, - {0x32BD, 0x33 }, - {0x32BE, 0x2D }, -//------------------------------------------------------------------------ -// 5. [AE_Target : 0x34] -// Set_Device_Format = FORMAT_16_8 -// SET_Device_Addr = 0x54 - {0x32B8, 0x3B }, - {0x32B9, 0x2D }, - {0x32BC, 0x34 }, - {0x32BD, 0x38 }, - {0x32BE, 0x30 }, -//------------------------------------------------------------------------ -// 6. [AE_Target : 0x38] -// Set_Device_Format = FORMAT_16_8 -// SET_Device_Addr = 0x54 - {0x32B8, 0x3F }, - {0x32B9, 0x31 }, - {0x32BC, 0x38 }, - {0x32BD, 0x3C }, - {0x32BE, 0x34 }, -//------------------------------------------------------------------------ -// 7. [AE_Target : 0x3D] -// Set_Device_Format = FORMAT_16_8 -// SET_Device_Addr = 0x54 - {0x32B8, 0x44 }, - {0x32B9, 0x34 }, - {0x32BC, 0x3C }, - {0x32BD, 0x40 }, - {0x32BE, 0x38 }, -//------------------------------------------------------------------------ -// 8. [AE_Target : 0x40] -// Set_Device_Format = FORMAT_16_8 -// SET_Device_Addr = 0x54 - {0x32B8, 0x48 }, - {0x32B9, 0x38 }, - {0x32BC, 0x40 }, - {0x32BD, 0x44 }, - {0x32BE, 0x3C }, -//------------------------------------------------------------------------ -// 9. [AE_Target : 0x44] -// Set_Device_Format = FORMAT_16_8 -// SET_Device_Addr = 0x54 - {0x32B8, 0x4D }, - {0x32B9, 0x3B }, - {0x32BC, 0x44 }, - {0x32BD, 0x49 }, - {0x32BE, 0x3F }, -}; - -static const DRAM_ATTR uint16_t sensor_framesize_HD[][2] = { -//[JPEG_1280x720_8.18_8.18_Fps] -{0x3021, 0x00}, -{REG_DLY, 100}, // delay 100ms -{0x32BF, 0x60}, -{0x32C0, 0x5A}, -{0x32C1, 0x5A}, -{0x32C2, 0x5A}, -{0x32C3, 0x00}, -{0x32C4, 0x20}, -{0x32C5, 0x20}, -{0x32C6, 0x20}, -{0x32C7, 0x00}, -{0x32C8, 0x3C}, -{0x32C9, 0x5A}, -{0x32CA, 0x7A}, -{0x32CB, 0x7A}, -{0x32CC, 0x7A}, -{0x32CD, 0x7A}, -{0x32DB, 0x5E}, -{0x32F0, 0x70}, -{0x3400, 0x08}, -{0x3400, 0x00}, -{0x3401, 0x4E}, -{0x3404, 0x00}, -{0x3405, 0x00}, -{0x3410, 0x00}, -{0x3200, 0x3E}, -{0x3201, 0x0F}, -{0x3028, 0x0F}, -{0x3029, 0x00}, -{0x302A, 0x08}, -{0x3022, 0x24}, -{0x3023, 0x24}, -{0x3002, 0x00}, -{0x3003, 0x04}, -{0x3004, 0x00}, -{0x3005, 0x04}, -{0x3006, 0x05}, -{0x3007, 0x03}, -{0x3008, 0x02}, -{0x3009, 0xD3}, -{0x300A, 0x06}, -{0x300B, 0x7C}, -{0x300C, 0x02}, -{0x300D, 0xE0}, -{0x300E, 0x05}, -{0x300F, 0x00}, -{0x3010, 0x02}, -{0x3011, 0xD0}, -{0x32B8, 0x3F}, -{0x32B9, 0x31}, -{0x32BB, 0x87}, -{0x32BC, 0x38}, -{0x32BD, 0x3C}, -{0x32BE, 0x34}, -{0x3201, 0x3F}, -{0x3021, 0x06}, -{0x3025, 0x00}, //normal -{0x3400, 0x01}, -{0x3060, 0x01}, -{REGLIST_TAIL, 0x00}, // tail -}; - -static const DRAM_ATTR uint16_t sensor_framesize_VGA[][2] = { -//[JPEG_640x480_10.14_10.14_Fps] -{0x3021, 0x00}, -{REG_DLY, 100}, // delay 100ms -{0x32BF, 0x60}, -{0x32C0, 0x5A}, -{0x32C1, 0x5A}, -{0x32C2, 0x5A}, -{0x32C3, 0x00}, -{0x32C4, 0x20}, -{0x32C5, 0x20}, -{0x32C6, 0x20}, -{0x32C7, 0x00}, -{0x32C8, 0x4B}, -{0x32C9, 0x5A}, -{0x32CA, 0x7A}, -{0x32CB, 0x7A}, -{0x32CC, 0x7A}, -{0x32CD, 0x7A}, -{0x32DB, 0x62}, -{0x32F0, 0x70}, -{0x3400, 0x08}, -{0x3400, 0x00}, -{0x3401, 0x4E}, -{0x3404, 0x00}, -{0x3405, 0x00}, -{0x3410, 0x00}, -{0x32E0, 0x02}, -{0x32E1, 0x80}, -{0x32E2, 0x01}, -{0x32E3, 0xE0}, -{0x32E4, 0x00}, -{0x32E5, 0x80}, -{0x32E6, 0x00}, -{0x32E7, 0x80}, -{0x3200, 0x3E}, -{0x3201, 0x0F}, -{0x3028, 0x0F}, -{0x3029, 0x00}, -{0x302A, 0x08}, -{0x3022, 0x24}, -{0x3023, 0x24}, -{0x3002, 0x00}, -{0x3003, 0xA4}, -{0x3004, 0x00}, -{0x3005, 0x04}, -{0x3006, 0x04}, -{0x3007, 0x63}, -{0x3008, 0x02}, -{0x3009, 0xD3}, -{0x300A, 0x05}, -{0x300B, 0x3C}, -{0x300C, 0x02}, -{0x300D, 0xE0}, -{0x300E, 0x03}, -{0x300F, 0xC0}, -{0x3010, 0x02}, -{0x3011, 0xD0}, -{0x32B8, 0x3F}, -{0x32B9, 0x31}, -{0x32BB, 0x87}, -{0x32BC, 0x38}, -{0x32BD, 0x3C}, -{0x32BE, 0x34}, -{0x3201, 0x7F}, -{0x3021, 0x06}, -{0x3025, 0x00}, //normal -{0x3400, 0x01}, -{0x3060, 0x01}, -{REGLIST_TAIL, 0x00}, // tail -}; - -static const DRAM_ATTR uint16_t sensor_framesize_QVGA[][2] = { -//[JPEG_320x240_10.14_10.14_Fps] -{0x3021, 0x00}, -{REG_DLY, 100}, // delay 100ms -{0x32BF, 0x60}, -{0x32C0, 0x5A}, -{0x32C1, 0x5A}, -{0x32C2, 0x5A}, -{0x32C3, 0x00}, -{0x32C4, 0x20}, -{0x32C5, 0x20}, -{0x32C6, 0x20}, -{0x32C7, 0x00}, -{0x32C8, 0x4B}, -{0x32C9, 0x5A}, -{0x32CA, 0x7A}, -{0x32CB, 0x7A}, -{0x32CC, 0x7A}, -{0x32CD, 0x7A}, -{0x32DB, 0x62}, -{0x32F0, 0x70}, -{0x3400, 0x08}, -{0x3400, 0x00}, -{0x3401, 0x4E}, -{0x3404, 0x00}, -{0x3405, 0x00}, -{0x3410, 0x00}, -{0x32E0, 0x01}, -{0x32E1, 0x40}, -{0x32E2, 0x00}, -{0x32E3, 0xF0}, -{0x32E4, 0x02}, -{0x32E5, 0x02}, -{0x32E6, 0x02}, -{0x32E7, 0x03}, -{0x3200, 0x3E}, -{0x3201, 0x0F}, -{0x3028, 0x0F}, -{0x3029, 0x00}, -{0x302A, 0x08}, -{0x3022, 0x24}, -{0x3023, 0x24}, -{0x3002, 0x00}, -{0x3003, 0xA4}, -{0x3004, 0x00}, -{0x3005, 0x04}, -{0x3006, 0x04}, -{0x3007, 0x63}, -{0x3008, 0x02}, -{0x3009, 0xD3}, -{0x300A, 0x05}, -{0x300B, 0x3C}, -{0x300C, 0x02}, -{0x300D, 0xE0}, -{0x300E, 0x03}, -{0x300F, 0xC0}, -{0x3010, 0x02}, -{0x3011, 0xD0}, -{0x32B8, 0x3F}, -{0x32B9, 0x31}, -{0x32BB, 0x87}, -{0x32BC, 0x38}, -{0x32BD, 0x3C}, -{0x32BE, 0x34}, -{0x3201, 0x7F}, -{0x3021, 0x06}, -{0x3025, 0x00}, //normal -{0x3400, 0x01}, -{0x3060, 0x01}, -{REGLIST_TAIL, 0x00}, // tail -}; - -static const DRAM_ATTR uint16_t sensor_framesize_VGA_xyskip[][2] = { -// [JPEG_640x360_20.00_25.01_Fps_XY_Skip] -// Set_Device_Format = FORMAT_16_8 -// SET_Device_Addr = 0x54 -{0x3021, 0x00}, -{REG_DLY, 100}, // delay 100ms -{0x32BF, 0x60 }, -{0x320A, 0xB2 }, -{0x32C0, 0x64 }, -{0x32C1, 0x64 }, -{0x32C2, 0x64 }, -{0x32C3, 0x00 }, -{0x32C4, 0x20 }, -{0x32C5, 0x20 }, -{0x32C6, 0x20 }, -{0x32C7, 0x00 }, -{0x32C8, 0x62 }, -{0x32C9, 0x64 }, -{0x32CA, 0x84 }, -{0x32CB, 0x84 }, -{0x32CC, 0x84 }, -{0x32CD, 0x84 }, -{0x32DB, 0x68 }, -{0x32F0, 0x70 }, -{0x3400, 0x08 }, -{0x3400, 0x00 }, -{0x3401, 0x4E }, -{0x3404, 0x00 }, -{0x3405, 0x00 }, -{0x3410, 0x00 }, -{0x3200, 0x3E }, -{0x3201, 0x0F }, -{0x3028, 0x0F }, -{0x3029, 0x00 }, -{0x302A, 0x08 }, -{0x3022, 0x24 }, -{0x3023, 0x6C }, -{0x3002, 0x00 }, -{0x3003, 0x04 }, -{0x3004, 0x00 }, -{0x3005, 0x04 }, -{0x3006, 0x05 }, -{0x3007, 0x03 }, -{0x3008, 0x02 }, -{0x3009, 0xD3 }, -{0x300A, 0x03 }, -{0x300B, 0xFC }, -{0x300C, 0x01 }, -{0x300D, 0x88 }, -{0x300E, 0x02 }, -{0x300F, 0x80 }, -{0x3010, 0x01 }, -{0x3011, 0x68 }, -{0x32B8, 0x3F }, -{0x32B9, 0x31 }, -{0x32BB, 0x87 }, -{0x32BC, 0x38 }, -{0x32BD, 0x3C }, -{0x32BE, 0x34 }, -{0x3201, 0x3F }, -{0x3025, 0x00 }, //normal -{0x3021, 0x06 }, -{0x3400, 0x01 }, -{0x3060, 0x01 }, -{REGLIST_TAIL, 0x00}, // tail -}; - -static const DRAM_ATTR uint16_t sensor_framesize_VGA_xskip[][2] = { -//[JPEG_640x480_Xskip_13.32_13.32_Fps] -{0x3021, 0x00}, -{REG_DLY, 100}, // delay 100ms -{0x32BF, 0x60}, -{0x32C0, 0x5A}, -{0x32C1, 0x5A}, -{0x32C2, 0x5A}, -{0x32C3, 0x00}, -{0x32C4, 0x20}, -{0x32C5, 0x20}, -{0x32C6, 0x20}, -{0x32C7, 0x00}, -{0x32C8, 0x62}, -{0x32C9, 0x5A}, -{0x32CA, 0x7A}, -{0x32CB, 0x7A}, -{0x32CC, 0x7A}, -{0x32CD, 0x7A}, -{0x32DB, 0x68}, -{0x32F0, 0x70}, -{0x3400, 0x08}, -{0x3400, 0x00}, -{0x3401, 0x4E}, -{0x3404, 0x00}, -{0x3405, 0x00}, -{0x3410, 0x00}, -{0x32E0, 0x02}, -{0x32E1, 0x80}, -{0x32E2, 0x01}, -{0x32E3, 0xE0}, -{0x32E4, 0x00}, -{0x32E5, 0x00}, -{0x32E6, 0x00}, -{0x32E7, 0x80}, -{0x3200, 0x3E}, -{0x3201, 0x0F}, -{0x3028, 0x0F}, -{0x3029, 0x00}, -{0x302A, 0x08}, -{0x3022, 0x24}, -{0x3023, 0x2C}, -{0x3002, 0x00}, -{0x3003, 0x04}, -{0x3004, 0x00}, -{0x3005, 0x04}, -{0x3006, 0x05}, -{0x3007, 0x03}, -{0x3008, 0x02}, -{0x3009, 0xD3}, -{0x300A, 0x03}, -{0x300B, 0xFC}, -{0x300C, 0x02}, -{0x300D, 0xE0}, -{0x300E, 0x02}, -{0x300F, 0x80}, -{0x3010, 0x02}, -{0x3011, 0xD0}, -{0x32B8, 0x3F}, -{0x32B9, 0x31}, -{0x32BB, 0x87}, -{0x32BC, 0x38}, -{0x32BD, 0x3C}, -{0x32BE, 0x34}, -{0x3201, 0x7F}, -{0x3021, 0x06}, -{0x3025, 0x00}, //normal -{0x3400, 0x01}, -{0x3060, 0x01}, -{REGLIST_TAIL, 0x00}, // tail -}; - -static const DRAM_ATTR uint16_t sensor_framesize_QVGA_xskip[][2] = { -{0x3021, 0x00}, -{REG_DLY, 100}, // delay 100ms -//[JPEG_320x240_Xskip_13.32_13.32_Fps] -{0x32BF, 0x60}, -{0x32C0, 0x5A}, -{0x32C1, 0x5A}, -{0x32C2, 0x5A}, -{0x32C3, 0x00}, -{0x32C4, 0x20}, -{0x32C5, 0x20}, -{0x32C6, 0x20}, -{0x32C7, 0x00}, -{0x32C8, 0x62}, -{0x32C9, 0x5A}, -{0x32CA, 0x7A}, -{0x32CB, 0x7A}, -{0x32CC, 0x7A}, -{0x32CD, 0x7A}, -{0x32DB, 0x68}, -{0x32F0, 0x70}, -{0x3400, 0x08}, -{0x3400, 0x00}, -{0x3401, 0x4E}, -{0x3404, 0x00}, -{0x3405, 0x00}, -{0x3410, 0x00}, -{0x32E0, 0x01}, -{0x32E1, 0x40}, -{0x32E2, 0x00}, -{0x32E3, 0xF0}, -{0x32E4, 0x01}, -{0x32E5, 0x01}, -{0x32E6, 0x02}, -{0x32E7, 0x03}, -{0x3200, 0x3E}, -{0x3201, 0x0F}, -{0x3028, 0x0F}, -{0x3029, 0x00}, -{0x302A, 0x08}, -{0x3022, 0x24}, -{0x3023, 0x2C}, -{0x3002, 0x00}, -{0x3003, 0x04}, -{0x3004, 0x00}, -{0x3005, 0x04}, -{0x3006, 0x05}, -{0x3007, 0x03}, -{0x3008, 0x02}, -{0x3009, 0xD3}, -{0x300A, 0x03}, -{0x300B, 0xFC}, -{0x300C, 0x02}, -{0x300D, 0xE0}, -{0x300E, 0x02}, -{0x300F, 0x80}, -{0x3010, 0x02}, -{0x3011, 0xD0}, -{0x32B8, 0x3F}, -{0x32B9, 0x31}, -{0x32BB, 0x87}, -{0x32BC, 0x38}, -{0x32BD, 0x3C}, -{0x32BE, 0x34}, -{0x3201, 0x7F}, -{0x3021, 0x06}, -{0x3025, 0x00}, //normal -{0x3400, 0x01}, -{0x3060, 0x01}, -{REGLIST_TAIL, 0x00}, // tail -}; - - -static const DRAM_ATTR uint16_t sensor_framesize_VGA_crop[][2] = { -//[JPEG_640x480_Crop_19.77_19.77_Fps] -{0x3021, 0x00}, -{REG_DLY, 100}, // delay 100ms -{0x32BF, 0x60}, -{0x32C0, 0x5A}, -{0x32C1, 0x5A}, -{0x32C2, 0x5A}, -{0x32C3, 0x00}, -{0x32C4, 0x20}, -{0x32C5, 0x20}, -{0x32C6, 0x20}, -{0x32C7, 0x00}, -{0x32C8, 0x62}, -{0x32C9, 0x5A}, -{0x32CA, 0x7A}, -{0x32CB, 0x7A}, -{0x32CC, 0x7A}, -{0x32CD, 0x7A}, -{0x32DB, 0x68}, -{0x32F0, 0x70}, -{0x3400, 0x08}, -{0x3400, 0x00}, -{0x3401, 0x4E}, -{0x3404, 0x00}, -{0x3405, 0x00}, -{0x3410, 0x00}, -{0x3200, 0x3E}, -{0x3201, 0x0F}, -{0x3028, 0x0F}, -{0x3029, 0x00}, -{0x302A, 0x08}, -{0x3022, 0x24}, -{0x3023, 0x24}, -{0x3002, 0x01}, -{0x3003, 0x44}, -{0x3004, 0x00}, -{0x3005, 0x7C}, -{0x3006, 0x03}, -{0x3007, 0xC3}, -{0x3008, 0x02}, -{0x3009, 0x5B}, -{0x300A, 0x03}, -{0x300B, 0xFC}, -{0x300C, 0x01}, -{0x300D, 0xF0}, -{0x300E, 0x02}, -{0x300F, 0x80}, -{0x3010, 0x01}, -{0x3011, 0xE0}, -{0x32B8, 0x3F}, -{0x32B9, 0x31}, -{0x32BB, 0x87}, -{0x32BC, 0x38}, -{0x32BD, 0x3C}, -{0x32BE, 0x34}, -{0x3201, 0x3F}, -{0x3021, 0x06}, -{0x3025, 0x00}, //normal -{0x3400, 0x01}, -{0x3060, 0x01}, -{REGLIST_TAIL, 0x00}, // tail -}; - -static const DRAM_ATTR uint16_t sensor_framesize_QVGA_crop[][2] = { -//[JPEG_320x240_Crop_19.77_19.77_Fps] -{0x3021, 0x00}, -{REG_DLY, 100}, // delay 100ms -{0x32BF, 0x60}, -{0x32C0, 0x5A}, -{0x32C1, 0x5A}, -{0x32C2, 0x5A}, -{0x32C3, 0x00}, -{0x32C4, 0x20}, -{0x32C5, 0x20}, -{0x32C6, 0x20}, -{0x32C7, 0x00}, -{0x32C8, 0x62}, -{0x32C9, 0x5A}, -{0x32CA, 0x7A}, -{0x32CB, 0x7A}, -{0x32CC, 0x7A}, -{0x32CD, 0x7A}, -{0x32DB, 0x68}, -{0x32F0, 0x70}, -{0x3400, 0x08}, -{0x3400, 0x00}, -{0x3401, 0x4E}, -{0x3404, 0x00}, -{0x3405, 0x00}, -{0x3410, 0x00}, -{0x32E0, 0x01}, -{0x32E1, 0x40}, -{0x32E2, 0x00}, -{0x32E3, 0xF0}, -{0x32E4, 0x01}, -{0x32E5, 0x01}, -{0x32E6, 0x01}, -{0x32E7, 0x02}, -{0x3200, 0x3E}, -{0x3201, 0x0F}, -{0x3028, 0x0F}, -{0x3029, 0x00}, -{0x302A, 0x08}, -{0x3022, 0x24}, -{0x3023, 0x24}, -{0x3002, 0x01}, -{0x3003, 0x44}, -{0x3004, 0x00}, -{0x3005, 0x7C}, -{0x3006, 0x03}, -{0x3007, 0xC3}, -{0x3008, 0x02}, -{0x3009, 0x5B}, -{0x300A, 0x03}, -{0x300B, 0xFC}, -{0x300C, 0x01}, -{0x300D, 0xF0}, -{0x300E, 0x02}, -{0x300F, 0x80}, -{0x3010, 0x01}, -{0x3011, 0xE0}, -{0x32B8, 0x3F}, -{0x32B9, 0x31}, -{0x32BB, 0x87}, -{0x32BC, 0x38}, -{0x32BD, 0x3C}, -{0x32BE, 0x34}, -{0x3201, 0x7F}, -{0x3021, 0x06}, -{0x3025, 0x00}, //normal -{0x3400, 0x01}, -{0x3060, 0x01}, -{REGLIST_TAIL, 0x00}, // tail -}; - -#endif - - diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/ov2640.h b/lib/libesp32_div/esp32-camera/sensors/private_include/ov2640.h deleted file mode 100644 index 342ab2132..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/private_include/ov2640.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the OpenMV project. - * Copyright (c) 2013/2014 Ibrahim Abdelkader - * This work is licensed under the MIT license, see the file LICENSE for details. - * - * OV2640 driver. - * - */ -#ifndef __OV2640_H__ -#define __OV2640_H__ -#include "sensor.h" -/** - * @brief Detect sensor pid - * - * @param slv_addr SCCB address - * @param id Detection result - * @return - * 0: Can't detect this sensor - * Nonzero: This sensor has been detected - */ -int ov2640_detect(int slv_addr, sensor_id_t *id); - -/** - * @brief initialize sensor function pointers - * - * @param sensor pointer of sensor - * @return - * Always 0 - */ -int ov2640_init(sensor_t *sensor); - -#endif // __OV2640_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/ov2640_regs.h b/lib/libesp32_div/esp32-camera/sensors/private_include/ov2640_regs.h deleted file mode 100644 index 8f47333fa..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/private_include/ov2640_regs.h +++ /dev/null @@ -1,216 +0,0 @@ -/* - * This file is part of the OpenMV project. - * Copyright (c) 2013/2014 Ibrahim Abdelkader - * This work is licensed under the MIT license, see the file LICENSE for details. - * - * OV2640 register definitions. - */ -#ifndef __REG_REGS_H__ -#define __REG_REGS_H__ -/* DSP register bank FF=0x00*/ -#define R_BYPASS 0x05 -#define QS 0x44 -#define CTRLI 0x50 -#define HSIZE 0x51 -#define VSIZE 0x52 -#define XOFFL 0x53 -#define YOFFL 0x54 -#define VHYX 0x55 -#define DPRP 0x56 -#define TEST 0x57 -#define ZMOW 0x5A -#define ZMOH 0x5B -#define ZMHH 0x5C -#define BPADDR 0x7C -#define BPDATA 0x7D -#define CTRL2 0x86 -#define CTRL3 0x87 -#define SIZEL 0x8C -#define HSIZE8 0xC0 -#define VSIZE8 0xC1 -#define CTRL0 0xC2 -#define CTRL1 0xC3 -#define R_DVP_SP 0xD3 -#define IMAGE_MODE 0xDA -#define RESET 0xE0 -#define MS_SP 0xF0 -#define SS_ID 0xF7 -#define SS_CTRL 0xF7 -#define MC_BIST 0xF9 -#define MC_AL 0xFA -#define MC_AH 0xFB -#define MC_D 0xFC -#define P_CMD 0xFD -#define P_STATUS 0xFE -#define BANK_SEL 0xFF - -#define CTRLI_LP_DP 0x80 -#define CTRLI_ROUND 0x40 - -#define CTRL0_AEC_EN 0x80 -#define CTRL0_AEC_SEL 0x40 -#define CTRL0_STAT_SEL 0x20 -#define CTRL0_VFIRST 0x10 -#define CTRL0_YUV422 0x08 -#define CTRL0_YUV_EN 0x04 -#define CTRL0_RGB_EN 0x02 -#define CTRL0_RAW_EN 0x01 - -#define CTRL2_DCW_EN 0x20 -#define CTRL2_SDE_EN 0x10 -#define CTRL2_UV_ADJ_EN 0x08 -#define CTRL2_UV_AVG_EN 0x04 -#define CTRL2_CMX_EN 0x01 - -#define CTRL3_BPC_EN 0x80 -#define CTRL3_WPC_EN 0x40 - -#define R_DVP_SP_AUTO_MODE 0x80 - -#define R_BYPASS_DSP_EN 0x00 -#define R_BYPASS_DSP_BYPAS 0x01 - -#define IMAGE_MODE_Y8_DVP_EN 0x40 -#define IMAGE_MODE_JPEG_EN 0x10 -#define IMAGE_MODE_YUV422 0x00 -#define IMAGE_MODE_RAW10 0x04 -#define IMAGE_MODE_RGB565 0x08 -#define IMAGE_MODE_HREF_VSYNC 0x02 -#define IMAGE_MODE_LBYTE_FIRST 0x01 - -#define RESET_MICROC 0x40 -#define RESET_SCCB 0x20 -#define RESET_JPEG 0x10 -#define RESET_DVP 0x04 -#define RESET_IPU 0x02 -#define RESET_CIF 0x01 - -#define MC_BIST_RESET 0x80 -#define MC_BIST_BOOT_ROM_SEL 0x40 -#define MC_BIST_12KB_SEL 0x20 -#define MC_BIST_12KB_MASK 0x30 -#define MC_BIST_512KB_SEL 0x08 -#define MC_BIST_512KB_MASK 0x0C -#define MC_BIST_BUSY_BIT_R 0x02 -#define MC_BIST_MC_RES_ONE_SH_W 0x02 -#define MC_BIST_LAUNCH 0x01 - - -typedef enum { - BANK_DSP, BANK_SENSOR, BANK_MAX -} ov2640_bank_t; - -/* Sensor register bank FF=0x01*/ -#define GAIN 0x00 -#define COM1 0x03 -#define REG04 0x04 -#define REG08 0x08 -#define COM2 0x09 -#define REG_PID 0x0A -#define REG_VER 0x0B -#define COM3 0x0C -#define COM4 0x0D -#define AEC 0x10 -#define CLKRC 0x11 -#define COM7 0x12 -#define COM8 0x13 -#define COM9 0x14 /* AGC gain ceiling */ -#define COM10 0x15 -#define HSTART 0x17 -#define HSTOP 0x18 -#define VSTART 0x19 -#define VSTOP 0x1A -#define REG_MIDH 0x1C -#define REG_MIDL 0x1D -#define AEW 0x24 -#define AEB 0x25 -#define VV 0x26 -#define REG2A 0x2A -#define FRARL 0x2B -#define ADDVSL 0x2D -#define ADDVSH 0x2E -#define YAVG 0x2F -#define HSDY 0x30 -#define HEDY 0x31 -#define REG32 0x32 -#define ARCOM2 0x34 -#define REG45 0x45 -#define FLL 0x46 -#define FLH 0x47 -#define COM19 0x48 -#define ZOOMS 0x49 -#define COM22 0x4B -#define COM25 0x4E -#define BD50 0x4F -#define BD60 0x50 -#define REG5D 0x5D -#define REG5E 0x5E -#define REG5F 0x5F -#define REG60 0x60 -#define HISTO_LOW 0x61 -#define HISTO_HIGH 0x62 - -#define REG04_DEFAULT 0x28 -#define REG04_HFLIP_IMG 0x80 -#define REG04_VFLIP_IMG 0x40 -#define REG04_VREF_EN 0x10 -#define REG04_HREF_EN 0x08 -#define REG04_SET(x) (REG04_DEFAULT|x) - -#define COM2_STDBY 0x10 -#define COM2_OUT_DRIVE_1x 0x00 -#define COM2_OUT_DRIVE_2x 0x01 -#define COM2_OUT_DRIVE_3x 0x02 -#define COM2_OUT_DRIVE_4x 0x03 - -#define COM3_DEFAULT 0x38 -#define COM3_BAND_50Hz 0x04 -#define COM3_BAND_60Hz 0x00 -#define COM3_BAND_AUTO 0x02 -#define COM3_BAND_SET(x) (COM3_DEFAULT|x) - -#define COM7_SRST 0x80 -#define COM7_RES_UXGA 0x00 /* UXGA */ -#define COM7_RES_SVGA 0x40 /* SVGA */ -#define COM7_RES_CIF 0x20 /* CIF */ -#define COM7_ZOOM_EN 0x04 /* Enable Zoom */ -#define COM7_COLOR_BAR 0x02 /* Enable Color Bar Test */ - -#define COM8_DEFAULT 0xC0 -#define COM8_BNDF_EN 0x20 /* Enable Banding filter */ -#define COM8_AGC_EN 0x04 /* AGC Auto/Manual control selection */ -#define COM8_AEC_EN 0x01 /* Auto/Manual Exposure control */ -#define COM8_SET(x) (COM8_DEFAULT|x) - -#define COM9_DEFAULT 0x08 -#define COM9_AGC_GAIN_2x 0x00 /* AGC: 2x */ -#define COM9_AGC_GAIN_4x 0x01 /* AGC: 4x */ -#define COM9_AGC_GAIN_8x 0x02 /* AGC: 8x */ -#define COM9_AGC_GAIN_16x 0x03 /* AGC: 16x */ -#define COM9_AGC_GAIN_32x 0x04 /* AGC: 32x */ -#define COM9_AGC_GAIN_64x 0x05 /* AGC: 64x */ -#define COM9_AGC_GAIN_128x 0x06 /* AGC: 128x */ -#define COM9_AGC_SET(x) (COM9_DEFAULT|(x<<5)) - -#define COM10_HREF_EN 0x80 /* HSYNC changes to HREF */ -#define COM10_HSYNC_EN 0x40 /* HREF changes to HSYNC */ -#define COM10_PCLK_FREE 0x20 /* PCLK output option: free running PCLK */ -#define COM10_PCLK_EDGE 0x10 /* Data is updated at the rising edge of PCLK */ -#define COM10_HREF_NEG 0x08 /* HREF negative */ -#define COM10_VSYNC_NEG 0x02 /* VSYNC negative */ -#define COM10_HSYNC_NEG 0x01 /* HSYNC negative */ - -#define CTRL1_AWB 0x08 /* Enable AWB */ - -#define VV_AGC_TH_SET(h,l) ((h<<4)|(l&0x0F)) - -#define REG32_UXGA 0x36 -#define REG32_SVGA 0x09 -#define REG32_CIF 0x89 - -#define CLKRC_2X 0x80 -#define CLKRC_2X_UXGA (0x01 | CLKRC_2X) -#define CLKRC_2X_SVGA CLKRC_2X -#define CLKRC_2X_CIF CLKRC_2X - -#endif //__REG_REGS_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/ov2640_settings.h b/lib/libesp32_div/esp32-camera/sensors/private_include/ov2640_settings.h deleted file mode 100644 index f151f0a42..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/private_include/ov2640_settings.h +++ /dev/null @@ -1,485 +0,0 @@ -// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD -// -// 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. -#ifndef _OV2640_SETTINGS_H_ -#define _OV2640_SETTINGS_H_ - -#include -#include -#include "esp_attr.h" -#include "ov2640_regs.h" - -typedef enum { - OV2640_MODE_UXGA, OV2640_MODE_SVGA, OV2640_MODE_CIF, OV2640_MODE_MAX -} ov2640_sensor_mode_t; - -typedef struct { - union { - struct { - uint8_t pclk_div:7; - uint8_t pclk_auto:1; - }; - uint8_t pclk; - }; - union { - struct { - uint8_t clk_div:6; - uint8_t reserved:1; - uint8_t clk_2x:1; - }; - uint8_t clk; - }; -} ov2640_clk_t; - -typedef struct { - uint16_t offset_x; - uint16_t offset_y; - uint16_t max_x; - uint16_t max_y; -} ov2640_ratio_settings_t; - -static const DRAM_ATTR ov2640_ratio_settings_t ratio_table[] = { - // ox, oy, mx, my - { 0, 0, 1600, 1200 }, //4x3 - { 8, 72, 1584, 1056 }, //3x2 - { 0, 100, 1600, 1000 }, //16x10 - { 0, 120, 1600, 960 }, //5x3 - { 0, 150, 1600, 900 }, //16x9 - { 2, 258, 1596, 684 }, //21x9 - { 50, 0, 1500, 1200 }, //5x4 - { 200, 0, 1200, 1200 }, //1x1 - { 462, 0, 676, 1200 } //9x16 -}; - -// 30fps@24MHz -const DRAM_ATTR uint8_t ov2640_settings_cif[][2] = { - {BANK_SEL, BANK_DSP}, - {0x2c, 0xff}, - {0x2e, 0xdf}, - {BANK_SEL, BANK_SENSOR}, - {0x3c, 0x32}, - {CLKRC, 0x01}, - {COM2, COM2_OUT_DRIVE_3x}, - {REG04, REG04_DEFAULT}, - {COM8, COM8_DEFAULT | COM8_BNDF_EN | COM8_AGC_EN | COM8_AEC_EN}, - {COM9, COM9_AGC_SET(COM9_AGC_GAIN_8x)}, - {0x2c, 0x0c}, - {0x33, 0x78}, - {0x3a, 0x33}, - {0x3b, 0xfB}, - {0x3e, 0x00}, - {0x43, 0x11}, - {0x16, 0x10}, - {0x39, 0x92}, - {0x35, 0xda}, - {0x22, 0x1a}, - {0x37, 0xc3}, - {0x23, 0x00}, - {ARCOM2, 0xc0}, - {0x06, 0x88}, - {0x07, 0xc0}, - {COM4, 0x87}, - {0x0e, 0x41}, - {0x4c, 0x00}, - {0x4a, 0x81}, - {0x21, 0x99}, - {AEW, 0x40}, - {AEB, 0x38}, - {VV, VV_AGC_TH_SET(8,2)}, - {0x5c, 0x00}, - {0x63, 0x00}, - {HISTO_LOW, 0x70}, - {HISTO_HIGH, 0x80}, - {0x7c, 0x05}, - {0x20, 0x80}, - {0x28, 0x30}, - {0x6c, 0x00}, - {0x6d, 0x80}, - {0x6e, 0x00}, - {0x70, 0x02}, - {0x71, 0x94}, - {0x73, 0xc1}, - {0x3d, 0x34}, - {0x5a, 0x57}, - {BD50, 0xbb}, - {BD60, 0x9c}, - {COM7, COM7_RES_CIF}, - {HSTART, 0x11}, - {HSTOP, 0x43}, - {VSTART, 0x00}, - {VSTOP, 0x25}, - {REG32, 0x89}, - {0x37, 0xc0}, - {BD50, 0xca}, - {BD60, 0xa8}, - {0x6d, 0x00}, - {0x3d, 0x38}, - {BANK_SEL, BANK_DSP}, - {0xe5, 0x7f}, - {MC_BIST, MC_BIST_RESET | MC_BIST_BOOT_ROM_SEL}, - {0x41, 0x24}, - {RESET, RESET_JPEG | RESET_DVP}, - {0x76, 0xff}, - {0x33, 0xa0}, - {0x42, 0x20}, - {0x43, 0x18}, - {0x4c, 0x00}, - {CTRL3, CTRL3_WPC_EN | 0x10 }, - {0x88, 0x3f}, - {0xd7, 0x03}, - {0xd9, 0x10}, - {R_DVP_SP, R_DVP_SP_AUTO_MODE | 0x02}, - {0xc8, 0x08}, - {0xc9, 0x80}, - {BPADDR, 0x00}, - {BPDATA, 0x00}, - {BPADDR, 0x03}, - {BPDATA, 0x48}, - {BPDATA, 0x48}, - {BPADDR, 0x08}, - {BPDATA, 0x20}, - {BPDATA, 0x10}, - {BPDATA, 0x0e}, - {0x90, 0x00}, - {0x91, 0x0e}, - {0x91, 0x1a}, - {0x91, 0x31}, - {0x91, 0x5a}, - {0x91, 0x69}, - {0x91, 0x75}, - {0x91, 0x7e}, - {0x91, 0x88}, - {0x91, 0x8f}, - {0x91, 0x96}, - {0x91, 0xa3}, - {0x91, 0xaf}, - {0x91, 0xc4}, - {0x91, 0xd7}, - {0x91, 0xe8}, - {0x91, 0x20}, - {0x92, 0x00}, - {0x93, 0x06}, - {0x93, 0xe3}, - {0x93, 0x05}, - {0x93, 0x05}, - {0x93, 0x00}, - {0x93, 0x04}, - {0x93, 0x00}, - {0x93, 0x00}, - {0x93, 0x00}, - {0x93, 0x00}, - {0x93, 0x00}, - {0x93, 0x00}, - {0x93, 0x00}, - {0x96, 0x00}, - {0x97, 0x08}, - {0x97, 0x19}, - {0x97, 0x02}, - {0x97, 0x0c}, - {0x97, 0x24}, - {0x97, 0x30}, - {0x97, 0x28}, - {0x97, 0x26}, - {0x97, 0x02}, - {0x97, 0x98}, - {0x97, 0x80}, - {0x97, 0x00}, - {0x97, 0x00}, - {0xa4, 0x00}, - {0xa8, 0x00}, - {0xc5, 0x11}, - {0xc6, 0x51}, - {0xbf, 0x80}, - {0xc7, 0x10}, - {0xb6, 0x66}, - {0xb8, 0xA5}, - {0xb7, 0x64}, - {0xb9, 0x7C}, - {0xb3, 0xaf}, - {0xb4, 0x97}, - {0xb5, 0xFF}, - {0xb0, 0xC5}, - {0xb1, 0x94}, - {0xb2, 0x0f}, - {0xc4, 0x5c}, - {CTRL1, 0xfd}, - {0x7f, 0x00}, - {0xe5, 0x1f}, - {0xe1, 0x67}, - {0xdd, 0x7f}, - {IMAGE_MODE, 0x00}, - {RESET, 0x00}, - {R_BYPASS, R_BYPASS_DSP_EN}, - {0, 0} -}; - -const DRAM_ATTR uint8_t ov2640_settings_to_cif[][2] = { - {BANK_SEL, BANK_SENSOR}, - {COM7, COM7_RES_CIF}, - - //Set the sensor output window - {COM1, 0x0A}, - {REG32, REG32_CIF}, - {HSTART, 0x11}, - {HSTOP, 0x43}, - {VSTART, 0x00}, - {VSTOP, 0x25}, - - //{CLKRC, 0x00}, - {BD50, 0xca}, - {BD60, 0xa8}, - {0x5a, 0x23}, - {0x6d, 0x00}, - {0x3d, 0x38}, - {0x39, 0x92}, - {0x35, 0xda}, - {0x22, 0x1a}, - {0x37, 0xc3}, - {0x23, 0x00}, - {ARCOM2, 0xc0}, - {0x06, 0x88}, - {0x07, 0xc0}, - {COM4, 0x87}, - {0x0e, 0x41}, - {0x4c, 0x00}, - {BANK_SEL, BANK_DSP}, - {RESET, RESET_DVP}, - - //Set the sensor resolution (UXGA, SVGA, CIF) - {HSIZE8, 0x32}, - {VSIZE8, 0x25}, - {SIZEL, 0x00}, - - //Set the image window size >= output size - {HSIZE, 0x64}, - {VSIZE, 0x4a}, - {XOFFL, 0x00}, - {YOFFL, 0x00}, - {VHYX, 0x00}, - {TEST, 0x00}, - - {CTRL2, CTRL2_DCW_EN | 0x1D}, - {CTRLI, CTRLI_LP_DP | 0x00}, - //{R_DVP_SP, 0x08}, - {0, 0} -}; - -const DRAM_ATTR uint8_t ov2640_settings_to_svga[][2] = { - {BANK_SEL, BANK_SENSOR}, - {COM7, COM7_RES_SVGA}, - - //Set the sensor output window - {COM1, 0x0A}, - {REG32, REG32_SVGA}, - {HSTART, 0x11}, - {HSTOP, 0x43}, - {VSTART, 0x00}, - {VSTOP, 0x4b}, - - //{CLKRC, 0x00}, - {0x37, 0xc0}, - {BD50, 0xca}, - {BD60, 0xa8}, - {0x5a, 0x23}, - {0x6d, 0x00}, - {0x3d, 0x38}, - {0x39, 0x92}, - {0x35, 0xda}, - {0x22, 0x1a}, - {0x37, 0xc3}, - {0x23, 0x00}, - {ARCOM2, 0xc0}, - {0x06, 0x88}, - {0x07, 0xc0}, - {COM4, 0x87}, - {0x0e, 0x41}, - {0x42, 0x03}, - {0x4c, 0x00}, - {BANK_SEL, BANK_DSP}, - {RESET, RESET_DVP}, - - //Set the sensor resolution (UXGA, SVGA, CIF) - {HSIZE8, 0x64}, - {VSIZE8, 0x4B}, - {SIZEL, 0x00}, - - //Set the image window size >= output size - {HSIZE, 0xC8}, - {VSIZE, 0x96}, - {XOFFL, 0x00}, - {YOFFL, 0x00}, - {VHYX, 0x00}, - {TEST, 0x00}, - - {CTRL2, CTRL2_DCW_EN | 0x1D}, - {CTRLI, CTRLI_LP_DP | 0x00}, - //{R_DVP_SP, 0x08}, - {0, 0} -}; - -const DRAM_ATTR uint8_t ov2640_settings_to_uxga[][2] = { - {BANK_SEL, BANK_SENSOR}, - {COM7, COM7_RES_UXGA}, - - //Set the sensor output window - {COM1, 0x0F}, - {REG32, REG32_UXGA}, - {HSTART, 0x11}, - {HSTOP, 0x75}, - {VSTART, 0x01}, - {VSTOP, 0x97}, - - //{CLKRC, 0x00}, - {0x3d, 0x34}, - {BD50, 0xbb}, - {BD60, 0x9c}, - {0x5a, 0x57}, - {0x6d, 0x80}, - {0x39, 0x82}, - {0x23, 0x00}, - {0x07, 0xc0}, - {0x4c, 0x00}, - {0x35, 0x88}, - {0x22, 0x0a}, - {0x37, 0x40}, - {ARCOM2, 0xa0}, - {0x06, 0x02}, - {COM4, 0xb7}, - {0x0e, 0x01}, - {0x42, 0x83}, - {BANK_SEL, BANK_DSP}, - {RESET, RESET_DVP}, - - //Set the sensor resolution (UXGA, SVGA, CIF) - {HSIZE8, 0xc8}, - {VSIZE8, 0x96}, - {SIZEL, 0x00}, - - //Set the image window size >= output size - {HSIZE, 0x90}, - {VSIZE, 0x2c}, - {XOFFL, 0x00}, - {YOFFL, 0x00}, - {VHYX, 0x88}, - {TEST, 0x00}, - - {CTRL2, CTRL2_DCW_EN | 0x1d}, - {CTRLI, 0x00}, - //{R_DVP_SP, 0x06}, - {0, 0} -}; - -const DRAM_ATTR uint8_t ov2640_settings_jpeg3[][2] = { - {BANK_SEL, BANK_DSP}, - {RESET, RESET_JPEG | RESET_DVP}, - {IMAGE_MODE, IMAGE_MODE_JPEG_EN | IMAGE_MODE_HREF_VSYNC}, - {0xD7, 0x03}, - {0xE1, 0x77}, - {0xE5, 0x1F}, - {0xD9, 0x10}, - {0xDF, 0x80}, - {0x33, 0x80}, - {0x3C, 0x10}, - {0xEB, 0x30}, - {0xDD, 0x7F}, - {RESET, 0x00}, - {0, 0} -}; - -static const uint8_t ov2640_settings_yuv422[][2] = { - {BANK_SEL, BANK_DSP}, - {RESET, RESET_DVP}, - {IMAGE_MODE, IMAGE_MODE_YUV422}, - {0xD7, 0x01}, - {0xE1, 0x67}, - {RESET, 0x00}, - {0, 0}, -}; - -static const uint8_t ov2640_settings_rgb565[][2] = { - {BANK_SEL, BANK_DSP}, - {RESET, RESET_DVP}, - {IMAGE_MODE, IMAGE_MODE_RGB565}, - {0xD7, 0x03}, - {0xE1, 0x77}, - {RESET, 0x00}, - {0, 0}, -}; - -#define NUM_BRIGHTNESS_LEVELS (5) -static const uint8_t brightness_regs[NUM_BRIGHTNESS_LEVELS + 1][5] = { - {BPADDR, BPDATA, BPADDR, BPDATA, BPDATA }, - {0x00, 0x04, 0x09, 0x00, 0x00 }, /* -2 */ - {0x00, 0x04, 0x09, 0x10, 0x00 }, /* -1 */ - {0x00, 0x04, 0x09, 0x20, 0x00 }, /* 0 */ - {0x00, 0x04, 0x09, 0x30, 0x00 }, /* +1 */ - {0x00, 0x04, 0x09, 0x40, 0x00 }, /* +2 */ -}; - -#define NUM_CONTRAST_LEVELS (5) -static const uint8_t contrast_regs[NUM_CONTRAST_LEVELS + 1][7] = { - {BPADDR, BPDATA, BPADDR, BPDATA, BPDATA, BPDATA, BPDATA }, - {0x00, 0x04, 0x07, 0x20, 0x18, 0x34, 0x06 }, /* -2 */ - {0x00, 0x04, 0x07, 0x20, 0x1c, 0x2a, 0x06 }, /* -1 */ - {0x00, 0x04, 0x07, 0x20, 0x20, 0x20, 0x06 }, /* 0 */ - {0x00, 0x04, 0x07, 0x20, 0x24, 0x16, 0x06 }, /* +1 */ - {0x00, 0x04, 0x07, 0x20, 0x28, 0x0c, 0x06 }, /* +2 */ -}; - -#define NUM_SATURATION_LEVELS (5) -static const uint8_t saturation_regs[NUM_SATURATION_LEVELS + 1][5] = { - {BPADDR, BPDATA, BPADDR, BPDATA, BPDATA }, - {0x00, 0x02, 0x03, 0x28, 0x28 }, /* -2 */ - {0x00, 0x02, 0x03, 0x38, 0x38 }, /* -1 */ - {0x00, 0x02, 0x03, 0x48, 0x48 }, /* 0 */ - {0x00, 0x02, 0x03, 0x58, 0x58 }, /* +1 */ - {0x00, 0x02, 0x03, 0x68, 0x68 }, /* +2 */ -}; - -#define NUM_SPECIAL_EFFECTS (7) -static const uint8_t special_effects_regs[NUM_SPECIAL_EFFECTS + 1][5] = { - {BPADDR, BPDATA, BPADDR, BPDATA, BPDATA }, - {0x00, 0X00, 0x05, 0X80, 0X80 }, /* no effect */ - {0x00, 0X40, 0x05, 0X80, 0X80 }, /* negative */ - {0x00, 0X18, 0x05, 0X80, 0X80 }, /* black and white */ - {0x00, 0X18, 0x05, 0X40, 0XC0 }, /* reddish */ - {0x00, 0X18, 0x05, 0X40, 0X40 }, /* greenish */ - {0x00, 0X18, 0x05, 0XA0, 0X40 }, /* blue */ - {0x00, 0X18, 0x05, 0X40, 0XA6 }, /* retro */ -}; - -#define NUM_WB_MODES (4) -static const uint8_t wb_modes_regs[NUM_WB_MODES + 1][3] = { - {0XCC, 0XCD, 0XCE }, - {0x5E, 0X41, 0x54 }, /* sunny */ - {0x65, 0X41, 0x4F }, /* cloudy */ - {0x52, 0X41, 0x66 }, /* office */ - {0x42, 0X3F, 0x71 }, /* home */ -}; - -#define NUM_AE_LEVELS (5) -static const uint8_t ae_levels_regs[NUM_AE_LEVELS + 1][3] = { - { AEW, AEB, VV }, - {0x20, 0X18, 0x60 }, - {0x34, 0X1C, 0x00 }, - {0x3E, 0X38, 0x81 }, - {0x48, 0X40, 0x81 }, - {0x58, 0X50, 0x92 }, -}; - -const uint8_t agc_gain_tbl[31] = { - 0x00, 0x10, 0x18, 0x30, 0x34, 0x38, 0x3C, 0x70, 0x72, 0x74, 0x76, 0x78, 0x7A, 0x7C, 0x7E, 0xF0, - 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF -}; - -#endif /* _OV2640_SETTINGS_H_ */ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/ov3660.h b/lib/libesp32_div/esp32-camera/sensors/private_include/ov3660.h deleted file mode 100644 index 341d68861..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/private_include/ov3660.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This file is part of the OpenMV project. - * Copyright (c) 2013/2014 Ibrahim Abdelkader - * This work is licensed under the MIT license, see the file LICENSE for details. - * - * OV3660 driver. - * - */ -#ifndef __OV3660_H__ -#define __OV3660_H__ - -#include "sensor.h" - -/** - * @brief Detect sensor pid - * - * @param slv_addr SCCB address - * @param id Detection result - * @return - * 0: Can't detect this sensor - * Nonzero: This sensor has been detected - */ -int ov3660_detect(int slv_addr, sensor_id_t *id); - -/** - * @brief initialize sensor function pointers - * - * @param sensor pointer of sensor - * @return - * Always 0 - */ -int ov3660_init(sensor_t *sensor); - -#endif // __OV3660_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/ov3660_regs.h b/lib/libesp32_div/esp32-camera/sensors/private_include/ov3660_regs.h deleted file mode 100644 index b5cf30a5b..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/private_include/ov3660_regs.h +++ /dev/null @@ -1,211 +0,0 @@ -/* - * OV3660 register definitions. - */ -#ifndef __OV3660_REG_REGS_H__ -#define __OV3660_REG_REGS_H__ - -/* system control registers */ -#define SYSTEM_CTROL0 0x3008 // Bit[7]: Software reset - // Bit[6]: Software power down - // Bit[5]: Reserved - // Bit[4]: SRB clock SYNC enable - // Bit[3]: Isolation suspend select - // Bit[2:0]: Not used - -/* output format control registers */ -#define FORMAT_CTRL 0x501F // Format select - // Bit[2:0]: - // 000: YUV422 - // 001: RGB - // 010: Dither - // 011: RAW after DPC - // 101: RAW after CIP - -/* format control registers */ -#define FORMAT_CTRL00 0x4300 - -/* frame control registers */ -#define FRAME_CTRL01 0x4201 // Control Passed Frame Number When both ON and OFF number set to 0x00,frame control is in bypass mode - // Bit[7:4]: Not used - // Bit[3:0]: Frame ON number -#define FRAME_CTRL02 0x4202 // Control Masked Frame Number When both ON and OFF number set to 0x00,frame control is in bypass mode - // Bit[7:4]: Not used - // BIT[3:0]: Frame OFF number - -/* ISP top control registers */ -#define PRE_ISP_TEST_SETTING_1 0x503D // Bit[7]: Test enable - // 0: Test disable - // 1: Color bar enable - // Bit[6]: Rolling - // Bit[5]: Transparent - // Bit[4]: Square black and white - // Bit[3:2]: Color bar style - // 00: Standard 8 color bar - // 01: Gradual change at vertical mode 1 - // 10: Gradual change at horizontal - // 11: Gradual change at vertical mode 2 - // Bit[1:0]: Test select - // 00: Color bar - // 01: Random data - // 10: Square data - // 11: Black image - -//exposure = {0x3500[3:0], 0x3501[7:0], 0x3502[7:0]} / 16 × tROW - -/* AEC/AGC control functions */ -#define AEC_PK_MANUAL 0x3503 // AEC Manual Mode Control - // Bit[7:6]: Reserved - // Bit[5]: Gain delay option - // Valid when 0x3503[4]=1’b0 - // 0: Delay one frame latch - // 1: One frame latch - // Bit[4:2]: Reserved - // Bit[1]: AGC manual - // 0: Auto enable - // 1: Manual enable - // Bit[0]: AEC manual - // 0: Auto enable - // 1: Manual enable - -//gain = {0x350A[1:0], 0x350B[7:0]} / 16 - -/* mirror and flip registers */ -#define TIMING_TC_REG20 0x3820 // Timing Control Register - // Bit[2:1]: Vertical flip enable - // 00: Normal - // 11: Vertical flip - // Bit[0]: Vertical binning enable -#define TIMING_TC_REG21 0x3821 // Timing Control Register - // Bit[5]: Compression Enable - // Bit[2:1]: Horizontal mirror enable - // 00: Normal - // 11: Horizontal mirror - // Bit[0]: Horizontal binning enable - -#define CLOCK_POL_CONTROL 0x4740// Bit[5]: PCLK polarity 0: active low - // 1: active high - // Bit[3]: Gate PCLK under VSYNC - // Bit[2]: Gate PCLK under HREF - // Bit[1]: HREF polarity - // 0: active low - // 1: active high - // Bit[0] VSYNC polarity - // 0: active low - // 1: active high -#define DRIVE_CAPABILITY 0x302c // Bit[7:6]: - // 00: 1x - // 01: 2x - // 10: 3x - // 11: 4x - - -#define X_ADDR_ST_H 0x3800 //Bit[3:0]: X address start[11:8] -#define X_ADDR_ST_L 0x3801 //Bit[7:0]: X address start[7:0] -#define Y_ADDR_ST_H 0x3802 //Bit[2:0]: Y address start[10:8] -#define Y_ADDR_ST_L 0x3803 //Bit[7:0]: Y address start[7:0] -#define X_ADDR_END_H 0x3804 //Bit[3:0]: X address end[11:8] -#define X_ADDR_END_L 0x3805 //Bit[7:0]: -#define Y_ADDR_END_H 0x3806 //Bit[2:0]: Y address end[10:8] -#define Y_ADDR_END_L 0x3807 //Bit[7:0]: -// Size after scaling -#define X_OUTPUT_SIZE_H 0x3808 //Bit[3:0]: DVP output horizontal width[11:8] -#define X_OUTPUT_SIZE_L 0x3809 //Bit[7:0]: -#define Y_OUTPUT_SIZE_H 0x380a //Bit[2:0]: DVP output vertical height[10:8] -#define Y_OUTPUT_SIZE_L 0x380b //Bit[7:0]: -#define X_TOTAL_SIZE_H 0x380c //Bit[3:0]: Total horizontal size[11:8] -#define X_TOTAL_SIZE_L 0x380d //Bit[7:0]: -#define Y_TOTAL_SIZE_H 0x380e //Bit[7:0]: Total vertical size[15:8] -#define Y_TOTAL_SIZE_L 0x380f //Bit[7:0]: -#define X_OFFSET_H 0x3810 //Bit[3:0]: ISP horizontal offset[11:8] -#define X_OFFSET_L 0x3811 //Bit[7:0]: -#define Y_OFFSET_H 0x3812 //Bit[2:0]: ISP vertical offset[10:8] -#define Y_OFFSET_L 0x3813 //Bit[7:0]: -#define X_INCREMENT 0x3814 //Bit[7:4]: Horizontal odd subsample increment - //Bit[3:0]: Horizontal even subsample increment -#define Y_INCREMENT 0x3815 //Bit[7:4]: Vertical odd subsample increment - //Bit[3:0]: Vertical even subsample increment -// Size before scaling -//#define X_INPUT_SIZE (X_ADDR_END - X_ADDR_ST + 1 - (2 * X_OFFSET)) -//#define Y_INPUT_SIZE (Y_ADDR_END - Y_ADDR_ST + 1 - (2 * Y_OFFSET)) - -#define ISP_CONTROL_01 0x5001 // Bit[5]: Scale enable - // 0: Disable - // 1: Enable - -#define SCALE_CTRL_1 0x5601 // Bit[6:4]: HDIV RW - // DCW scale times - // 000: DCW 1 time - // 001: DCW 2 times - // 010: DCW 4 times - // 100: DCW 8 times - // 101: DCW 16 times - // Others: DCW 16 times - // Bit[2:0]: VDIV RW - // DCW scale times - // 000: DCW 1 time - // 001: DCW 2 times - // 010: DCW 4 times - // 100: DCW 8 times - // 101: DCW 16 times - // Others: DCW 16 times - -#define SCALE_CTRL_2 0x5602 // X_SCALE High Bits -#define SCALE_CTRL_3 0x5603 // X_SCALE Low Bits -#define SCALE_CTRL_4 0x5604 // Y_SCALE High Bits -#define SCALE_CTRL_5 0x5605 // Y_SCALE Low Bits -#define SCALE_CTRL_6 0x5606 // Bit[3:0]: V Offset - -#define PCLK_RATIO 0x3824 // Bit[4:0]: PCLK ratio manual -#define VFIFO_CTRL0C 0x460C // Bit[1]: PCLK manual enable - // 0: Auto - // 1: Manual by PCLK_RATIO - -#define VFIFO_X_SIZE_H 0x4602 -#define VFIFO_X_SIZE_L 0x4603 -#define VFIFO_Y_SIZE_H 0x4604 -#define VFIFO_Y_SIZE_L 0x4605 - -#define SC_PLLS_CTRL0 0x303a // Bit[7]: PLLS bypass -#define SC_PLLS_CTRL1 0x303b // Bit[4:0]: PLLS multiplier -#define SC_PLLS_CTRL2 0x303c // Bit[6:4]: PLLS charge pump control - // Bit[3:0]: PLLS system divider -#define SC_PLLS_CTRL3 0x303d // Bit[5:4]: PLLS pre-divider - // 00: 1 - // 01: 1.5 - // 10: 2 - // 11: 3 - // Bit[2]: PLLS root-divider - 1 - // Bit[1:0]: PLLS seld5 - // 00: 1 - // 01: 1 - // 10: 2 - // 11: 2.5 - -#define COMPRESSION_CTRL00 0x4400 // -#define COMPRESSION_CTRL01 0x4401 // -#define COMPRESSION_CTRL02 0x4402 // -#define COMPRESSION_CTRL03 0x4403 // -#define COMPRESSION_CTRL04 0x4404 // -#define COMPRESSION_CTRL05 0x4405 // -#define COMPRESSION_CTRL06 0x4406 // -#define COMPRESSION_CTRL07 0x4407 // Bit[5:0]: QS -#define COMPRESSION_ISI_CTRL 0x4408 // -#define COMPRESSION_CTRL09 0x4409 // -#define COMPRESSION_CTRL0a 0x440a // -#define COMPRESSION_CTRL0b 0x440b // -#define COMPRESSION_CTRL0c 0x440c // -#define COMPRESSION_CTRL0d 0x440d // -#define COMPRESSION_CTRL0E 0x440e // - -/** - * @brief register value - */ -#define TEST_COLOR_BAR 0xC0 /* Enable Color Bar roling Test */ - -#define AEC_PK_MANUAL_AGC_MANUALEN 0x02 /* Enable AGC Manual enable */ -#define AEC_PK_MANUAL_AEC_MANUALEN 0x01 /* Enable AEC Manual enable */ - -#define TIMING_TC_REG20_VFLIP 0x06 /* Vertical flip enable */ -#define TIMING_TC_REG21_HMIRROR 0x06 /* Horizontal mirror enable */ - -#endif // __OV3660_REG_REGS_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/ov3660_settings.h b/lib/libesp32_div/esp32-camera/sensors/private_include/ov3660_settings.h deleted file mode 100644 index 97c4e03b6..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/private_include/ov3660_settings.h +++ /dev/null @@ -1,318 +0,0 @@ -#ifndef _OV3660_SETTINGS_H_ -#define _OV3660_SETTINGS_H_ - -#include -#include -#include "esp_attr.h" -#include "ov3660_regs.h" - -static const ratio_settings_t ratio_table[] = { - // mw, mh, sx, sy, ex, ey, ox, oy, tx, ty - { 2048, 1536, 0, 0, 2079, 1547, 16, 6, 2300, 1564 }, //4x3 - { 1920, 1280, 64, 128, 2015, 1419, 16, 6, 2172, 1436 }, //3x2 - { 2048, 1280, 0, 128, 2079, 1419, 16, 6, 2300, 1436 }, //16x10 - { 1920, 1152, 64, 192, 2015, 1355, 16, 6, 2172, 1372 }, //5x3 - { 1920, 1080, 64, 242, 2015, 1333, 16, 6, 2172, 1322 }, //16x9 - { 2048, 880, 0, 328, 2079, 1219, 16, 6, 2300, 1236 }, //21x9 - { 1920, 1536, 64, 0, 2015, 1547, 16, 6, 2172, 1564 }, //5x4 - { 1536, 1536, 256, 0, 1823, 1547, 16, 6, 2044, 1564 }, //1x1 - { 864, 1536, 592, 0, 1487, 1547, 16, 6, 2044, 1564 } //9x16 -}; - -#define REG_DLY 0xffff -#define REGLIST_TAIL 0x0000 - -static const DRAM_ATTR uint16_t sensor_default_regs[][2] = { - {SYSTEM_CTROL0, 0x82}, // software reset - {REG_DLY, 10}, // delay 10ms - - {0x3103, 0x13}, - {SYSTEM_CTROL0, 0x42}, - {0x3017, 0xff}, - {0x3018, 0xff}, - {DRIVE_CAPABILITY, 0xc3}, - {CLOCK_POL_CONTROL, 0x21}, - - {0x3611, 0x01}, - {0x3612, 0x2d}, - - {0x3032, 0x00}, - {0x3614, 0x80}, - {0x3618, 0x00}, - {0x3619, 0x75}, - {0x3622, 0x80}, - {0x3623, 0x00}, - {0x3624, 0x03}, - {0x3630, 0x52}, - {0x3632, 0x07}, - {0x3633, 0xd2}, - {0x3704, 0x80}, - {0x3708, 0x66}, - {0x3709, 0x12}, - {0x370b, 0x12}, - {0x3717, 0x00}, - {0x371b, 0x60}, - {0x371c, 0x00}, - {0x3901, 0x13}, - - {0x3600, 0x08}, - {0x3620, 0x43}, - {0x3702, 0x20}, - {0x3739, 0x48}, - {0x3730, 0x20}, - {0x370c, 0x0c}, - - {0x3a18, 0x00}, - {0x3a19, 0xf8}, - - {0x3000, 0x10}, - {0x3004, 0xef}, - - {0x6700, 0x05}, - {0x6701, 0x19}, - {0x6702, 0xfd}, - {0x6703, 0xd1}, - {0x6704, 0xff}, - {0x6705, 0xff}, - - {0x3c01, 0x80}, - {0x3c00, 0x04}, - {0x3a08, 0x00}, {0x3a09, 0x62}, //50Hz Band Width Step (10bit) - {0x3a0e, 0x08}, //50Hz Max Bands in One Frame (6 bit) - {0x3a0a, 0x00}, {0x3a0b, 0x52}, //60Hz Band Width Step (10bit) - {0x3a0d, 0x09}, //60Hz Max Bands in One Frame (6 bit) - - {0x3a00, 0x3a},//night mode off - {0x3a14, 0x09}, - {0x3a15, 0x30}, - {0x3a02, 0x09}, - {0x3a03, 0x30}, - - {COMPRESSION_CTRL0E, 0x08}, - {0x4520, 0x0b}, - {0x460b, 0x37}, - {0x4713, 0x02}, - {0x471c, 0xd0}, - {0x5086, 0x00}, - - {0x5002, 0x00}, - {0x501f, 0x00}, - - {SYSTEM_CTROL0, 0x02}, - - {0x5180, 0xff}, - {0x5181, 0xf2}, - {0x5182, 0x00}, - {0x5183, 0x14}, - {0x5184, 0x25}, - {0x5185, 0x24}, - {0x5186, 0x16}, - {0x5187, 0x16}, - {0x5188, 0x16}, - {0x5189, 0x68}, - {0x518a, 0x60}, - {0x518b, 0xe0}, - {0x518c, 0xb2}, - {0x518d, 0x42}, - {0x518e, 0x35}, - {0x518f, 0x56}, - {0x5190, 0x56}, - {0x5191, 0xf8}, - {0x5192, 0x04}, - {0x5193, 0x70}, - {0x5194, 0xf0}, - {0x5195, 0xf0}, - {0x5196, 0x03}, - {0x5197, 0x01}, - {0x5198, 0x04}, - {0x5199, 0x12}, - {0x519a, 0x04}, - {0x519b, 0x00}, - {0x519c, 0x06}, - {0x519d, 0x82}, - {0x519e, 0x38}, - - {0x5381, 0x1d}, - {0x5382, 0x60}, - {0x5383, 0x03}, - {0x5384, 0x0c}, - {0x5385, 0x78}, - {0x5386, 0x84}, - {0x5387, 0x7d}, - {0x5388, 0x6b}, - {0x5389, 0x12}, - {0x538a, 0x01}, - {0x538b, 0x98}, - - {0x5480, 0x01}, -// {0x5481, 0x05}, -// {0x5482, 0x09}, -// {0x5483, 0x10}, -// {0x5484, 0x3a}, -// {0x5485, 0x4c}, -// {0x5486, 0x5a}, -// {0x5487, 0x68}, -// {0x5488, 0x74}, -// {0x5489, 0x80}, -// {0x548a, 0x8e}, -// {0x548b, 0xa4}, -// {0x548c, 0xb4}, -// {0x548d, 0xc8}, -// {0x548e, 0xde}, -// {0x548f, 0xf0}, -// {0x5490, 0x15}, - - {0x5000, 0xa7}, - {0x5800, 0x0C}, - {0x5801, 0x09}, - {0x5802, 0x0C}, - {0x5803, 0x0C}, - {0x5804, 0x0D}, - {0x5805, 0x17}, - {0x5806, 0x06}, - {0x5807, 0x05}, - {0x5808, 0x04}, - {0x5809, 0x06}, - {0x580a, 0x09}, - {0x580b, 0x0E}, - {0x580c, 0x05}, - {0x580d, 0x01}, - {0x580e, 0x01}, - {0x580f, 0x01}, - {0x5810, 0x05}, - {0x5811, 0x0D}, - {0x5812, 0x05}, - {0x5813, 0x01}, - {0x5814, 0x01}, - {0x5815, 0x01}, - {0x5816, 0x05}, - {0x5817, 0x0D}, - {0x5818, 0x08}, - {0x5819, 0x06}, - {0x581a, 0x05}, - {0x581b, 0x07}, - {0x581c, 0x0B}, - {0x581d, 0x0D}, - {0x581e, 0x12}, - {0x581f, 0x0D}, - {0x5820, 0x0E}, - {0x5821, 0x10}, - {0x5822, 0x10}, - {0x5823, 0x1E}, - {0x5824, 0x53}, - {0x5825, 0x15}, - {0x5826, 0x05}, - {0x5827, 0x14}, - {0x5828, 0x54}, - {0x5829, 0x25}, - {0x582a, 0x33}, - {0x582b, 0x33}, - {0x582c, 0x34}, - {0x582d, 0x16}, - {0x582e, 0x24}, - {0x582f, 0x41}, - {0x5830, 0x50}, - {0x5831, 0x42}, - {0x5832, 0x15}, - {0x5833, 0x25}, - {0x5834, 0x34}, - {0x5835, 0x33}, - {0x5836, 0x24}, - {0x5837, 0x26}, - {0x5838, 0x54}, - {0x5839, 0x25}, - {0x583a, 0x15}, - {0x583b, 0x25}, - {0x583c, 0x53}, - {0x583d, 0xCF}, - - {0x3a0f, 0x30}, - {0x3a10, 0x28}, - {0x3a1b, 0x30}, - {0x3a1e, 0x28}, - {0x3a11, 0x60}, - {0x3a1f, 0x14}, - - {0x5302, 0x28}, - {0x5303, 0x20}, - - {0x5306, 0x1c}, //de-noise offset 1 - {0x5307, 0x28}, //de-noise offset 2 - - {0x4002, 0xc5}, - {0x4003, 0x81}, - {0x4005, 0x12}, - - {0x5688, 0x11}, - {0x5689, 0x11}, - {0x568a, 0x11}, - {0x568b, 0x11}, - {0x568c, 0x11}, - {0x568d, 0x11}, - {0x568e, 0x11}, - {0x568f, 0x11}, - - {0x5580, 0x06}, - {0x5588, 0x00}, - {0x5583, 0x40}, - {0x5584, 0x2c}, - - {ISP_CONTROL_01, 0x83}, // turn color matrix, awb and SDE - {REGLIST_TAIL, 0x00}, // tail -}; - -static const DRAM_ATTR uint16_t sensor_fmt_jpeg[][2] = { - {FORMAT_CTRL, 0x00}, // YUV422 - {FORMAT_CTRL00, 0x30}, // YUYV - {0x3002, 0x00},//0x1c to 0x00 !!! - {0x3006, 0xff},//0xc3 to 0xff !!! - {0x471c, 0x50},//0xd0 to 0x50 !!! - {REGLIST_TAIL, 0x00}, // tail -}; - -static const DRAM_ATTR uint16_t sensor_fmt_raw[][2] = { - {FORMAT_CTRL00, 0x00}, // RAW - {REGLIST_TAIL, 0x00} -}; - -static const DRAM_ATTR uint16_t sensor_fmt_grayscale[][2] = { - {FORMAT_CTRL, 0x00}, // YUV422 - {FORMAT_CTRL00, 0x10}, // Y8 - {REGLIST_TAIL, 0x00} -}; - -static const DRAM_ATTR uint16_t sensor_fmt_yuv422[][2] = { - {FORMAT_CTRL, 0x00}, // YUV422 - {FORMAT_CTRL00, 0x30}, // YUYV - {REGLIST_TAIL, 0x00} -}; - -static const DRAM_ATTR uint16_t sensor_fmt_rgb565[][2] = { - {FORMAT_CTRL, 0x01}, // RGB - {FORMAT_CTRL00, 0x61}, // RGB565 (BGR) - {REGLIST_TAIL, 0x00} -}; - -static const DRAM_ATTR uint8_t sensor_saturation_levels[9][11] = { - {0x1d, 0x60, 0x03, 0x07, 0x48, 0x4f, 0x4b, 0x40, 0x0b, 0x01, 0x98},//-4 - {0x1d, 0x60, 0x03, 0x08, 0x54, 0x5c, 0x58, 0x4b, 0x0d, 0x01, 0x98},//-3 - {0x1d, 0x60, 0x03, 0x0a, 0x60, 0x6a, 0x64, 0x56, 0x0e, 0x01, 0x98},//-2 - {0x1d, 0x60, 0x03, 0x0b, 0x6c, 0x77, 0x70, 0x60, 0x10, 0x01, 0x98},//-1 - {0x1d, 0x60, 0x03, 0x0c, 0x78, 0x84, 0x7d, 0x6b, 0x12, 0x01, 0x98},//0 - {0x1d, 0x60, 0x03, 0x0d, 0x84, 0x91, 0x8a, 0x76, 0x14, 0x01, 0x98},//+1 - {0x1d, 0x60, 0x03, 0x0e, 0x90, 0x9e, 0x96, 0x80, 0x16, 0x01, 0x98},//+2 - {0x1d, 0x60, 0x03, 0x10, 0x9c, 0xac, 0xa2, 0x8b, 0x17, 0x01, 0x98},//+3 - {0x1d, 0x60, 0x03, 0x11, 0xa8, 0xb9, 0xaf, 0x96, 0x19, 0x01, 0x98},//+4 -}; - -static const DRAM_ATTR uint8_t sensor_special_effects[7][4] = { - {0x06, 0x40, 0x2c, 0x08},//Normal - {0x46, 0x40, 0x28, 0x08},//Negative - {0x1e, 0x80, 0x80, 0x08},//Grayscale - {0x1e, 0x80, 0xc0, 0x08},//Red Tint - {0x1e, 0x60, 0x60, 0x08},//Green Tint - {0x1e, 0xa0, 0x40, 0x08},//Blue Tint - {0x1e, 0x40, 0xa0, 0x08},//Sepia -}; - -#endif diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/ov5640.h b/lib/libesp32_div/esp32-camera/sensors/private_include/ov5640.h deleted file mode 100644 index 120ae7205..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/private_include/ov5640.h +++ /dev/null @@ -1,27 +0,0 @@ - -#ifndef __OV5640_H__ -#define __OV5640_H__ - -#include "sensor.h" - -/** - * @brief Detect sensor pid - * - * @param slv_addr SCCB address - * @param id Detection result - * @return - * 0: Can't detect this sensor - * Nonzero: This sensor has been detected - */ -int ov5640_detect(int slv_addr, sensor_id_t *id); - -/** - * @brief initialize sensor function pointers - * - * @param sensor pointer of sensor - * @return - * Always 0 - */ -int ov5640_init(sensor_t *sensor); - -#endif // __OV5640_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/ov5640_regs.h b/lib/libesp32_div/esp32-camera/sensors/private_include/ov5640_regs.h deleted file mode 100644 index c28d80f5b..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/private_include/ov5640_regs.h +++ /dev/null @@ -1,213 +0,0 @@ -/* - * OV5640 register definitions. - */ -#ifndef __OV5640_REG_REGS_H__ -#define __OV5640_REG_REGS_H__ - -/* system control registers */ -#define SYSTEM_CTROL0 0x3008 // Bit[7]: Software reset - // Bit[6]: Software power down - // Bit[5]: Reserved - // Bit[4]: SRB clock SYNC enable - // Bit[3]: Isolation suspend select - // Bit[2:0]: Not used - -#define DRIVE_CAPABILITY 0x302c // Bit[7:6]: - // 00: 1x - // 01: 2x - // 10: 3x - // 11: 4x - -#define SC_PLLS_CTRL0 0x303a // Bit[7]: PLLS bypass -#define SC_PLLS_CTRL1 0x303b // Bit[4:0]: PLLS multiplier -#define SC_PLLS_CTRL2 0x303c // Bit[6:4]: PLLS charge pump control - // Bit[3:0]: PLLS system divider -#define SC_PLLS_CTRL3 0x303d // Bit[5:4]: PLLS pre-divider - // 00: 1 - // 01: 1.5 - // 10: 2 - // 11: 3 - // Bit[2]: PLLS root-divider - 1 - // Bit[1:0]: PLLS seld5 - // 00: 1 - // 01: 1 - // 10: 2 - // 11: 2.5 - -/* AEC/AGC control functions */ -#define AEC_PK_MANUAL 0x3503 // AEC Manual Mode Control - // Bit[7:6]: Reserved - // Bit[5]: Gain delay option - // Valid when 0x3503[4]=1’b0 - // 0: Delay one frame latch - // 1: One frame latch - // Bit[4:2]: Reserved - // Bit[1]: AGC manual - // 0: Auto enable - // 1: Manual enable - // Bit[0]: AEC manual - // 0: Auto enable - // 1: Manual enable - -//gain = {0x350A[1:0], 0x350B[7:0]} / 16 - - -#define X_ADDR_ST_H 0x3800 //Bit[3:0]: X address start[11:8] -#define X_ADDR_ST_L 0x3801 //Bit[7:0]: X address start[7:0] -#define Y_ADDR_ST_H 0x3802 //Bit[2:0]: Y address start[10:8] -#define Y_ADDR_ST_L 0x3803 //Bit[7:0]: Y address start[7:0] -#define X_ADDR_END_H 0x3804 //Bit[3:0]: X address end[11:8] -#define X_ADDR_END_L 0x3805 //Bit[7:0]: -#define Y_ADDR_END_H 0x3806 //Bit[2:0]: Y address end[10:8] -#define Y_ADDR_END_L 0x3807 //Bit[7:0]: -// Size after scaling -#define X_OUTPUT_SIZE_H 0x3808 //Bit[3:0]: DVP output horizontal width[11:8] -#define X_OUTPUT_SIZE_L 0x3809 //Bit[7:0]: -#define Y_OUTPUT_SIZE_H 0x380a //Bit[2:0]: DVP output vertical height[10:8] -#define Y_OUTPUT_SIZE_L 0x380b //Bit[7:0]: -#define X_TOTAL_SIZE_H 0x380c //Bit[3:0]: Total horizontal size[11:8] -#define X_TOTAL_SIZE_L 0x380d //Bit[7:0]: -#define Y_TOTAL_SIZE_H 0x380e //Bit[7:0]: Total vertical size[15:8] -#define Y_TOTAL_SIZE_L 0x380f //Bit[7:0]: -#define X_OFFSET_H 0x3810 //Bit[3:0]: ISP horizontal offset[11:8] -#define X_OFFSET_L 0x3811 //Bit[7:0]: -#define Y_OFFSET_H 0x3812 //Bit[2:0]: ISP vertical offset[10:8] -#define Y_OFFSET_L 0x3813 //Bit[7:0]: -#define X_INCREMENT 0x3814 //Bit[7:4]: Horizontal odd subsample increment - //Bit[3:0]: Horizontal even subsample increment -#define Y_INCREMENT 0x3815 //Bit[7:4]: Vertical odd subsample increment - //Bit[3:0]: Vertical even subsample increment -// Size before scaling -//#define X_INPUT_SIZE (X_ADDR_END - X_ADDR_ST + 1 - (2 * X_OFFSET)) -//#define Y_INPUT_SIZE (Y_ADDR_END - Y_ADDR_ST + 1 - (2 * Y_OFFSET)) - -/* mirror and flip registers */ -#define TIMING_TC_REG20 0x3820 // Timing Control Register - // Bit[2:1]: Vertical flip enable - // 00: Normal - // 11: Vertical flip - // Bit[0]: Vertical binning enable -#define TIMING_TC_REG21 0x3821 // Timing Control Register - // Bit[5]: Compression Enable - // Bit[2:1]: Horizontal mirror enable - // 00: Normal - // 11: Horizontal mirror - // Bit[0]: Horizontal binning enable - -#define PCLK_RATIO 0x3824 // Bit[4:0]: PCLK ratio manual - -/* frame control registers */ -#define FRAME_CTRL01 0x4201 // Control Passed Frame Number When both ON and OFF number set to 0x00,frame control is in bypass mode - // Bit[7:4]: Not used - // Bit[3:0]: Frame ON number -#define FRAME_CTRL02 0x4202 // Control Masked Frame Number When both ON and OFF number set to 0x00,frame control is in bypass mode - // Bit[7:4]: Not used - // BIT[3:0]: Frame OFF number - -/* format control registers */ -#define FORMAT_CTRL00 0x4300 - -#define CLOCK_POL_CONTROL 0x4740// Bit[5]: PCLK polarity 0: active low - // 1: active high - // Bit[3]: Gate PCLK under VSYNC - // Bit[2]: Gate PCLK under HREF - // Bit[1]: HREF polarity - // 0: active low - // 1: active high - // Bit[0] VSYNC polarity - // 0: active low - // 1: active high - -#define ISP_CONTROL_01 0x5001 // Bit[5]: Scale enable - // 0: Disable - // 1: Enable - -/* output format control registers */ -#define FORMAT_CTRL 0x501F // Format select - // Bit[2:0]: - // 000: YUV422 - // 001: RGB - // 010: Dither - // 011: RAW after DPC - // 101: RAW after CIP - -/* ISP top control registers */ -#define PRE_ISP_TEST_SETTING_1 0x503D // Bit[7]: Test enable - // 0: Test disable - // 1: Color bar enable - // Bit[6]: Rolling - // Bit[5]: Transparent - // Bit[4]: Square black and white - // Bit[3:2]: Color bar style - // 00: Standard 8 color bar - // 01: Gradual change at vertical mode 1 - // 10: Gradual change at horizontal - // 11: Gradual change at vertical mode 2 - // Bit[1:0]: Test select - // 00: Color bar - // 01: Random data - // 10: Square data - // 11: Black image - -//exposure = {0x3500[3:0], 0x3501[7:0], 0x3502[7:0]} / 16 × tROW - -#define SCALE_CTRL_1 0x5601 // Bit[6:4]: HDIV RW - // DCW scale times - // 000: DCW 1 time - // 001: DCW 2 times - // 010: DCW 4 times - // 100: DCW 8 times - // 101: DCW 16 times - // Others: DCW 16 times - // Bit[2:0]: VDIV RW - // DCW scale times - // 000: DCW 1 time - // 001: DCW 2 times - // 010: DCW 4 times - // 100: DCW 8 times - // 101: DCW 16 times - // Others: DCW 16 times - -#define SCALE_CTRL_2 0x5602 // X_SCALE High Bits -#define SCALE_CTRL_3 0x5603 // X_SCALE Low Bits -#define SCALE_CTRL_4 0x5604 // Y_SCALE High Bits -#define SCALE_CTRL_5 0x5605 // Y_SCALE Low Bits -#define SCALE_CTRL_6 0x5606 // Bit[3:0]: V Offset - -#define VFIFO_CTRL0C 0x460C // Bit[1]: PCLK manual enable - // 0: Auto - // 1: Manual by PCLK_RATIO - -#define VFIFO_X_SIZE_H 0x4602 -#define VFIFO_X_SIZE_L 0x4603 -#define VFIFO_Y_SIZE_H 0x4604 -#define VFIFO_Y_SIZE_L 0x4605 - -#define COMPRESSION_CTRL00 0x4400 // -#define COMPRESSION_CTRL01 0x4401 // -#define COMPRESSION_CTRL02 0x4402 // -#define COMPRESSION_CTRL03 0x4403 // -#define COMPRESSION_CTRL04 0x4404 // -#define COMPRESSION_CTRL05 0x4405 // -#define COMPRESSION_CTRL06 0x4406 // -#define COMPRESSION_CTRL07 0x4407 // Bit[5:0]: QS -#define COMPRESSION_ISI_CTRL 0x4408 // -#define COMPRESSION_CTRL09 0x4409 // -#define COMPRESSION_CTRL0a 0x440a // -#define COMPRESSION_CTRL0b 0x440b // -#define COMPRESSION_CTRL0c 0x440c // -#define COMPRESSION_CTRL0d 0x440d // -#define COMPRESSION_CTRL0E 0x440e // - -/** - * @brief register value - */ -#define TEST_COLOR_BAR 0xC0 /* Enable Color Bar roling Test */ - -#define AEC_PK_MANUAL_AGC_MANUALEN 0x02 /* Enable AGC Manual enable */ -#define AEC_PK_MANUAL_AEC_MANUALEN 0x01 /* Enable AEC Manual enable */ - -#define TIMING_TC_REG20_VFLIP 0x06 /* Vertical flip enable */ -#define TIMING_TC_REG21_HMIRROR 0x06 /* Horizontal mirror enable */ - -#endif // __OV3660_REG_REGS_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/ov5640_settings.h b/lib/libesp32_div/esp32-camera/sensors/private_include/ov5640_settings.h deleted file mode 100644 index fec7d679f..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/private_include/ov5640_settings.h +++ /dev/null @@ -1,334 +0,0 @@ -#ifndef _OV5640_SETTINGS_H_ -#define _OV5640_SETTINGS_H_ - -#include -#include -#include "esp_attr.h" -#include "ov5640_regs.h" - -static const ratio_settings_t ratio_table[] = { - // mw, mh, sx, sy, ex, ey, ox, oy, tx, ty - { 2560, 1920, 0, 0, 2623, 1951, 32, 16, 2844, 1968 }, //4x3 - { 2560, 1704, 0, 110, 2623, 1843, 32, 16, 2844, 1752 }, //3x2 - { 2560, 1600, 0, 160, 2623, 1791, 32, 16, 2844, 1648 }, //16x10 - { 2560, 1536, 0, 192, 2623, 1759, 32, 16, 2844, 1584 }, //5x3 - { 2560, 1440, 0, 240, 2623, 1711, 32, 16, 2844, 1488 }, //16x9 - { 2560, 1080, 0, 420, 2623, 1531, 32, 16, 2844, 1128 }, //21x9 - { 2400, 1920, 80, 0, 2543, 1951, 32, 16, 2684, 1968 }, //5x4 - { 1920, 1920, 320, 0, 2543, 1951, 32, 16, 2684, 1968 }, //1x1 - { 1088, 1920, 736, 0, 1887, 1951, 32, 16, 1884, 1968 } //9x16 -}; - -#define REG_DLY 0xffff -#define REGLIST_TAIL 0x0000 - -static const DRAM_ATTR uint16_t sensor_default_regs[][2] = { - {SYSTEM_CTROL0, 0x82}, // software reset - {REG_DLY, 10}, // delay 10ms - {SYSTEM_CTROL0, 0x42}, // power down - - //enable pll - {0x3103, 0x13}, - - //io direction - {0x3017, 0xff}, - {0x3018, 0xff}, - - {DRIVE_CAPABILITY, 0xc3}, - {CLOCK_POL_CONTROL, 0x21}, - - {0x4713, 0x02},//jpg mode select - - {ISP_CONTROL_01, 0x83}, // turn color matrix, awb and SDE - - //sys reset - {0x3000, 0x00}, - {0x3002, 0x1c}, - - //clock enable - {0x3004, 0xff}, - {0x3006, 0xc3}, - - //isp control - {0x5000, 0xa7}, - {ISP_CONTROL_01, 0xa3},//+scaling? - {0x5003, 0x08},//special_effect - - //unknown - {0x370c, 0x02},//!!IMPORTANT - {0x3634, 0x40},//!!IMPORTANT - - //AEC/AGC - {0x3a02, 0x03}, - {0x3a03, 0xd8}, - {0x3a08, 0x01}, - {0x3a09, 0x27}, - {0x3a0a, 0x00}, - {0x3a0b, 0xf6}, - {0x3a0d, 0x04}, - {0x3a0e, 0x03}, - {0x3a0f, 0x30},//ae_level - {0x3a10, 0x28},//ae_level - {0x3a11, 0x60},//ae_level - {0x3a13, 0x43}, - {0x3a14, 0x03}, - {0x3a15, 0xd8}, - {0x3a18, 0x00},//gainceiling - {0x3a19, 0xf8},//gainceiling - {0x3a1b, 0x30},//ae_level - {0x3a1e, 0x26},//ae_level - {0x3a1f, 0x14},//ae_level - - //vcm debug - {0x3600, 0x08}, - {0x3601, 0x33}, - - //50/60Hz - {0x3c01, 0xa4}, - {0x3c04, 0x28}, - {0x3c05, 0x98}, - {0x3c06, 0x00}, - {0x3c07, 0x08}, - {0x3c08, 0x00}, - {0x3c09, 0x1c}, - {0x3c0a, 0x9c}, - {0x3c0b, 0x40}, - - {0x460c, 0x22},//disable jpeg footer - - //BLC - {0x4001, 0x02}, - {0x4004, 0x02}, - - //AWB - {0x5180, 0xff}, - {0x5181, 0xf2}, - {0x5182, 0x00}, - {0x5183, 0x14}, - {0x5184, 0x25}, - {0x5185, 0x24}, - {0x5186, 0x09}, - {0x5187, 0x09}, - {0x5188, 0x09}, - {0x5189, 0x75}, - {0x518a, 0x54}, - {0x518b, 0xe0}, - {0x518c, 0xb2}, - {0x518d, 0x42}, - {0x518e, 0x3d}, - {0x518f, 0x56}, - {0x5190, 0x46}, - {0x5191, 0xf8}, - {0x5192, 0x04}, - {0x5193, 0x70}, - {0x5194, 0xf0}, - {0x5195, 0xf0}, - {0x5196, 0x03}, - {0x5197, 0x01}, - {0x5198, 0x04}, - {0x5199, 0x12}, - {0x519a, 0x04}, - {0x519b, 0x00}, - {0x519c, 0x06}, - {0x519d, 0x82}, - {0x519e, 0x38}, - - //color matrix (Saturation) - {0x5381, 0x1e}, - {0x5382, 0x5b}, - {0x5383, 0x08}, - {0x5384, 0x0a}, - {0x5385, 0x7e}, - {0x5386, 0x88}, - {0x5387, 0x7c}, - {0x5388, 0x6c}, - {0x5389, 0x10}, - {0x538a, 0x01}, - {0x538b, 0x98}, - - //CIP control (Sharpness) - {0x5300, 0x10},//sharpness - {0x5301, 0x10},//sharpness - {0x5302, 0x18},//sharpness - {0x5303, 0x19},//sharpness - {0x5304, 0x10}, - {0x5305, 0x10}, - {0x5306, 0x08},//denoise - {0x5307, 0x16}, - {0x5308, 0x40}, - {0x5309, 0x10},//sharpness - {0x530a, 0x10},//sharpness - {0x530b, 0x04},//sharpness - {0x530c, 0x06},//sharpness - - //GAMMA - {0x5480, 0x01}, - {0x5481, 0x00}, - {0x5482, 0x1e}, - {0x5483, 0x3b}, - {0x5484, 0x58}, - {0x5485, 0x66}, - {0x5486, 0x71}, - {0x5487, 0x7d}, - {0x5488, 0x83}, - {0x5489, 0x8f}, - {0x548a, 0x98}, - {0x548b, 0xa6}, - {0x548c, 0xb8}, - {0x548d, 0xca}, - {0x548e, 0xd7}, - {0x548f, 0xe3}, - {0x5490, 0x1d}, - - //Special Digital Effects (SDE) (UV adjust) - {0x5580, 0x06},//enable brightness and contrast - {0x5583, 0x40},//special_effect - {0x5584, 0x10},//special_effect - {0x5586, 0x20},//contrast - {0x5587, 0x00},//brightness - {0x5588, 0x00},//brightness - {0x5589, 0x10}, - {0x558a, 0x00}, - {0x558b, 0xf8}, - {0x501d, 0x40},// enable manual offset of contrast - - //power on - {0x3008, 0x02}, - - //50Hz - {0x3c00, 0x04}, - - {REG_DLY, 300}, - {REGLIST_TAIL, 0x00}, // tail -}; - -static const DRAM_ATTR uint16_t sensor_fmt_jpeg[][2] = { - {FORMAT_CTRL, 0x00}, // YUV422 - {FORMAT_CTRL00, 0x30}, // YUYV - {0x3002, 0x00},//0x1c to 0x00 !!! - {0x3006, 0xff},//0xc3 to 0xff !!! - {0x471c, 0x50},//0xd0 to 0x50 !!! - {REGLIST_TAIL, 0x00}, // tail -}; - -static const DRAM_ATTR uint16_t sensor_fmt_raw[][2] = { - {FORMAT_CTRL, 0x03}, // RAW (DPC) - {FORMAT_CTRL00, 0x00}, // RAW - {REGLIST_TAIL, 0x00} -}; - -static const DRAM_ATTR uint16_t sensor_fmt_grayscale[][2] = { - {FORMAT_CTRL, 0x00}, // YUV422 - {FORMAT_CTRL00, 0x10}, // Y8 - {REGLIST_TAIL, 0x00} -}; - -static const DRAM_ATTR uint16_t sensor_fmt_yuv422[][2] = { - {FORMAT_CTRL, 0x00}, // YUV422 - {FORMAT_CTRL00, 0x30}, // YUYV - {REGLIST_TAIL, 0x00} -}; - -static const DRAM_ATTR uint16_t sensor_fmt_rgb565[][2] = { - {FORMAT_CTRL, 0x01}, // RGB - {FORMAT_CTRL00, 0x61}, // RGB565 (BGR) - {REGLIST_TAIL, 0x00} -}; - -static const DRAM_ATTR uint8_t sensor_saturation_levels[9][11] = { - {0x1d, 0x60, 0x03, 0x07, 0x48, 0x4f, 0x4b, 0x40, 0x0b, 0x01, 0x98},//-4 - {0x1d, 0x60, 0x03, 0x08, 0x54, 0x5c, 0x58, 0x4b, 0x0d, 0x01, 0x98},//-3 - {0x1d, 0x60, 0x03, 0x0a, 0x60, 0x6a, 0x64, 0x56, 0x0e, 0x01, 0x98},//-2 - {0x1d, 0x60, 0x03, 0x0b, 0x6c, 0x77, 0x70, 0x60, 0x10, 0x01, 0x98},//-1 - {0x1d, 0x60, 0x03, 0x0c, 0x78, 0x84, 0x7d, 0x6b, 0x12, 0x01, 0x98},//0 - {0x1d, 0x60, 0x03, 0x0d, 0x84, 0x91, 0x8a, 0x76, 0x14, 0x01, 0x98},//+1 - {0x1d, 0x60, 0x03, 0x0e, 0x90, 0x9e, 0x96, 0x80, 0x16, 0x01, 0x98},//+2 - {0x1d, 0x60, 0x03, 0x10, 0x9c, 0xac, 0xa2, 0x8b, 0x17, 0x01, 0x98},//+3 - {0x1d, 0x60, 0x03, 0x11, 0xa8, 0xb9, 0xaf, 0x96, 0x19, 0x01, 0x98},//+4 -}; - -static const DRAM_ATTR uint8_t sensor_special_effects[7][4] = { - {0x06, 0x40, 0x2c, 0x08},//Normal - {0x46, 0x40, 0x28, 0x08},//Negative - {0x1e, 0x80, 0x80, 0x08},//Grayscale - {0x1e, 0x80, 0xc0, 0x08},//Red Tint - {0x1e, 0x60, 0x60, 0x08},//Green Tint - {0x1e, 0xa0, 0x40, 0x08},//Blue Tint - {0x1e, 0x40, 0xa0, 0x08},//Sepia -}; - -static const DRAM_ATTR uint16_t sensor_regs_gamma0[][2] = { - {0x5480, 0x01}, - {0x5481, 0x08}, - {0x5482, 0x14}, - {0x5483, 0x28}, - {0x5484, 0x51}, - {0x5485, 0x65}, - {0x5486, 0x71}, - {0x5487, 0x7d}, - {0x5488, 0x87}, - {0x5489, 0x91}, - {0x548a, 0x9a}, - {0x548b, 0xaa}, - {0x548c, 0xb8}, - {0x548d, 0xcd}, - {0x548e, 0xdd}, - {0x548f, 0xea}, - {0x5490, 0x1d} -}; - -static const DRAM_ATTR uint16_t sensor_regs_gamma1[][2] = { - {0x5480, 0x1}, - {0x5481, 0x0}, - {0x5482, 0x1e}, - {0x5483, 0x3b}, - {0x5484, 0x58}, - {0x5485, 0x66}, - {0x5486, 0x71}, - {0x5487, 0x7d}, - {0x5488, 0x83}, - {0x5489, 0x8f}, - {0x548a, 0x98}, - {0x548b, 0xa6}, - {0x548c, 0xb8}, - {0x548d, 0xca}, - {0x548e, 0xd7}, - {0x548f, 0xe3}, - {0x5490, 0x1d} -}; - -static const DRAM_ATTR uint16_t sensor_regs_awb0[][2] = { - {0x5180, 0xff}, - {0x5181, 0xf2}, - {0x5182, 0x00}, - {0x5183, 0x14}, - {0x5184, 0x25}, - {0x5185, 0x24}, - {0x5186, 0x09}, - {0x5187, 0x09}, - {0x5188, 0x09}, - {0x5189, 0x75}, - {0x518a, 0x54}, - {0x518b, 0xe0}, - {0x518c, 0xb2}, - {0x518d, 0x42}, - {0x518e, 0x3d}, - {0x518f, 0x56}, - {0x5190, 0x46}, - {0x5191, 0xf8}, - {0x5192, 0x04}, - {0x5193, 0x70}, - {0x5194, 0xf0}, - {0x5195, 0xf0}, - {0x5196, 0x03}, - {0x5197, 0x01}, - {0x5198, 0x04}, - {0x5199, 0x12}, - {0x519a, 0x04}, - {0x519b, 0x00}, - {0x519c, 0x06}, - {0x519d, 0x82}, - {0x519e, 0x38} -}; - -#endif diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/ov7670.h b/lib/libesp32_div/esp32-camera/sensors/private_include/ov7670.h deleted file mode 100644 index b3a645a70..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/private_include/ov7670.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * This file is part of the OpenMV project. - * author: Juan Schiavoni - * This work is licensed under the MIT license, see the file LICENSE for details. - * - * OV7670 driver. - * - */ -#ifndef __OV7670_H__ -#define __OV7670_H__ -#include "sensor.h" - -/** - * @brief Detect sensor pid - * - * @param slv_addr SCCB address - * @param id Detection result - * @return - * 0: Can't detect this sensor - * Nonzero: This sensor has been detected - */ -int ov7670_detect(int slv_addr, sensor_id_t *id); - -/** - * @brief initialize sensor function pointers - * - * @param sensor pointer of sensor - * @return - * Always 0 - */ -int ov7670_init(sensor_t *sensor); - -#endif // __OV7670_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/ov7670_regs.h b/lib/libesp32_div/esp32-camera/sensors/private_include/ov7670_regs.h deleted file mode 100644 index 699354877..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/private_include/ov7670_regs.h +++ /dev/null @@ -1,354 +0,0 @@ -/* - * This file is for the OpenMV project so the OV7670 can be used - * author: Juan Schiavoni - * - * OV7670 register definitions. - */ -#ifndef __OV7670_REG_REGS_H__ -#define __OV7670_REG_REGS_H__ -#define GAIN 0x00 /* AGC – Gain control gain setting */ -#define BLUE 0x01 /* AWB – Blue channel gain setting */ -#define RED 0x02 /* AWB – Red channel gain setting */ -#define VREF 0x03 /* AWB – Green channel gain setting */ -#define COM1 0x04 /* Common Control 1 */ -#define BAVG 0x05 /* U/B Average Level */ -#define GAVG 0x06 /* Y/Gb Average Level */ -#define AECH 0x07 /* Exposure VAlue - AEC MSB 5 bits */ -#define RAVG 0x08 /* V/R Average Level */ - -#define COM2 0x09 /* Common Control 2 */ -#define COM2_SOFT_SLEEP 0x10 /* Soft sleep mode */ -#define COM2_OUT_DRIVE_1x 0x00 /* Output drive capability 1x */ -#define COM2_OUT_DRIVE_2x 0x01 /* Output drive capability 2x */ -#define COM2_OUT_DRIVE_3x 0x02 /* Output drive capability 3x */ -#define COM2_OUT_DRIVE_4x 0x03 /* Output drive capability 4x */ - -#define REG_PID 0x0A /* Product ID Number MSB */ -#define REG_VER 0x0B /* Product ID Number LSB */ - -#define COM3 0x0C /* Common Control 3 */ -#define COM3_SWAP_OUT 0x40 /* Output data MSB/LSB swap */ -#define COM3_TRI_CLK 0x20 /* Tri-state output clock */ -#define COM3_TRI_DATA 0x10 /* Tri-state option output */ -#define COM3_SCALE_EN 0x08 /* Scale enable */ -#define COM3_DCW 0x04 /* DCW enable */ - -#define COM4 0x0D /* Common Control 4 */ -#define COM4_PLL_BYPASS 0x00 /* Bypass PLL */ -#define COM4_PLL_4x 0x40 /* PLL frequency 4x */ -#define COM4_PLL_6x 0x80 /* PLL frequency 6x */ -#define COM4_PLL_8x 0xc0 /* PLL frequency 8x */ -#define COM4_AEC_FULL 0x00 /* AEC evaluate full window */ -#define COM4_AEC_1_2 0x10 /* AEC evaluate 1/2 window */ -#define COM4_AEC_1_4 0x20 /* AEC evaluate 1/4 window */ -#define COM4_AEC_2_3 0x30 /* AEC evaluate 2/3 window */ - -#define COM5 0x0E /* Common Control 5 */ -#define COM5_AFR 0x80 /* Auto frame rate control ON/OFF selection (night mode) */ -#define COM5_AFR_SPEED 0x40 /* Auto frame rate control speed selection */ -#define COM5_AFR_0 0x00 /* No reduction of frame rate */ -#define COM5_AFR_1_2 0x10 /* Max reduction to 1/2 frame rate */ -#define COM5_AFR_1_4 0x20 /* Max reduction to 1/4 frame rate */ -#define COM5_AFR_1_8 0x30 /* Max reduction to 1/8 frame rate */ -#define COM5_AFR_4x 0x04 /* Add frame when AGC reaches 4x gain */ -#define COM5_AFR_8x 0x08 /* Add frame when AGC reaches 8x gain */ -#define COM5_AFR_16x 0x0c /* Add frame when AGC reaches 16x gain */ -#define COM5_AEC_NO_LIMIT 0x01 /* No limit to AEC increase step */ - -#define COM6 0x0F /* Common Control 6 */ -#define COM6_AUTO_WINDOW 0x01 /* Auto window setting ON/OFF selection when format changes */ - -#define AEC 0x10 /* AEC[7:0] (see register AECH for AEC[15:8]) */ -#define CLKRC 0x11 /* Internal Clock */ - -#define COM7 0x12 /* Common Control 7 */ -#define COM7_RESET 0x80 /* SCCB Register Reset */ -#define COM7_RES_VGA 0x00 /* Resolution VGA */ -#define COM7_RES_QVGA 0x40 /* Resolution QVGA */ -#define COM7_BT656 0x20 /* BT.656 protocol ON/OFF */ -#define COM7_SENSOR_RAW 0x10 /* Sensor RAW */ -#define COM7_FMT_GBR422 0x00 /* RGB output format GBR422 */ -#define COM7_FMT_RGB565 0x04 /* RGB output format RGB565 */ -#define COM7_FMT_RGB555 0x08 /* RGB output format RGB555 */ -#define COM7_FMT_RGB444 0x0C /* RGB output format RGB444 */ -#define COM7_FMT_YUV 0x00 /* Output format YUV */ -#define COM7_FMT_P_BAYER 0x01 /* Output format Processed Bayer RAW */ -#define COM7_FMT_RGB 0x04 /* Output format RGB */ -#define COM7_FMT_R_BAYER 0x03 /* Output format Bayer RAW */ -#define COM7_SET_FMT(r, x) ((r&0xFC)|((x&0x5)<<0)) - -#define COM8 0x13 /* Common Control 8 */ -#define COM8_FAST_AUTO 0x80 /* Enable fast AGC/AEC algorithm */ -#define COM8_STEP_VSYNC 0x00 /* AEC - Step size limited to vertical blank */ -#define COM8_STEP_UNLIMIT 0x40 /* AEC - Step size unlimited step size */ -#define COM8_BANDF_EN 0x20 /* Banding filter ON/OFF */ -#define COM8_AEC_BANDF 0x10 /* Enable AEC below banding value */ -#define COM8_AEC_FINE_EN 0x08 /* Fine AEC ON/OFF control */ -#define COM8_AGC_EN 0x04 /* AGC Enable */ -#define COM8_AWB_EN 0x02 /* AWB Enable */ -#define COM8_AEC_EN 0x01 /* AEC Enable */ -#define COM8_SET_AGC(r, x) ((r&0xFB)|((x&0x1)<<2)) -#define COM8_SET_AWB(r, x) ((r&0xFD)|((x&0x1)<<1)) -#define COM8_SET_AEC(r, x) ((r&0xFE)|((x&0x1)<<0)) - -#define COM9 0x14 /* Common Control 9 */ -#define COM9_HISTO_AVG 0x80 /* Histogram or average based AEC/AGC selection */ -#define COM9_AGC_GAIN_2x 0x00 /* Automatic Gain Ceiling 2x */ -#define COM9_AGC_GAIN_4x 0x10 /* Automatic Gain Ceiling 4x */ -#define COM9_AGC_GAIN_8x 0x20 /* Automatic Gain Ceiling 8x */ -#define COM9_AGC_GAIN_16x 0x30 /* Automatic Gain Ceiling 16x */ -#define COM9_AGC_GAIN_32x 0x40 /* Automatic Gain Ceiling 32x */ -#define COM9_DROP_VSYNC 0x04 /* Drop VSYNC output of corrupt frame */ -#define COM9_DROP_HREF 0x02 /* Drop HREF output of corrupt frame */ -#define COM9_SET_AGC(r, x) ((r&0x8F)|((x&0x07)<<4)) - -#define COM10 0x15 /* Common Control 10 */ -#define COM10_NEGATIVE 0x80 /* Output negative data */ -#define COM10_HSYNC_EN 0x40 /* HREF changes to HSYNC */ -#define COM10_PCLK_FREE 0x00 /* PCLK output option: free running PCLK */ -#define COM10_PCLK_MASK 0x20 /* PCLK output option: masked during horizontal blank */ -#define COM10_PCLK_REV 0x10 /* PCLK reverse */ -#define COM10_HREF_REV 0x08 /* HREF reverse */ -#define COM10_VSYNC_FALLING 0x00 /* VSYNC changes on falling edge of PCLK */ -#define COM10_VSYNC_RISING 0x04 /* VSYNC changes on rising edge of PCLK */ -#define COM10_VSYNC_NEG 0x02 /* VSYNC negative */ -#define COM10_OUT_RANGE_8 0x01 /* Output data range: Full range */ -#define COM10_OUT_RANGE_10 0x00 /* Output data range: Data from [10] to [F0] (8 MSBs) */ - -#define RSVD_16 0x16 /* Reserved register */ - -#define HSTART 0x17 /* Horizontal Frame (HREF column) Start high 8-bit(low 3 bits are at HREF[2:0]) */ -#define HSTOP 0x18 /* Horizontal Frame (HREF column) end high 8-bit (low 3 bits are at HREF[5:3]) */ -#define VSTART 0x19 /* Vertical Frame (row) Start high 8-bit (low 2 bits are at VREF[1:0]) */ -#define VSTOP 0x1A /* Vertical Frame (row) End high 8-bit (low 2 bits are at VREF[3:2]) */ -#define PSHFT 0x1B /* Data Format - Pixel Delay Select */ -#define REG_MIDH 0x1C /* Manufacturer ID Byte – High */ -#define REG_MIDL 0x1D /* Manufacturer ID Byte – Low */ - -#define MVFP 0x1E /* Mirror/Vflip Enable */ -#define MVFP_MIRROR 0x20 /* Mirror image */ -#define MVFP_FLIP 0x10 /* Vertical flip */ -#define MVFP_SUN 0x02 /* Black sun enable */ -#define MVFP_SET_MIRROR(r,x) ((r&0xDF)|((x&1)<<5)) /* change only bit5 according to x */ -#define MVFP_SET_FLIP(r,x) ((r&0xEF)|((x&1)<<4)) /* change only bit4 according to x */ - -#define LAEC 0x1F /* Fine AEC Value - defines exposure value less than one row period (Reserved?) */ -#define ADCCTR0 0x20 /* ADC control */ -#define ADCCTR1 0x21 /* reserved */ -#define ADCCTR2 0x22 /* reserved */ -#define ADCCTR3 0x23 /* reserved */ -#define AEW 0x24 /* AGC/AEC - Stable Operating Region (Upper Limit) */ -#define AEB 0x25 /* AGC/AEC - Stable Operating Region (Lower Limit) */ -#define VPT 0x26 /* AGC/AEC Fast Mode Operating Region */ -#define BBIAS 0x27 /* B channel signal output bias (effective only when COM6[3]=1) */ -#define GbBIAS 0x28 /* Gb channel signal output bias (effective only when COM6[3]=1) */ -#define RSVD_29 0x29 /* reserved */ -#define EXHCH 0x2A /* Dummy Pixel Insert MSB */ -#define EXHCL 0x2B /* Dummy Pixel Insert LSB */ -#define RBIAS 0x2C /* R channel signal output bias (effective only when COM6[3]=1) */ -#define ADVFL 0x2D /* LSB of Insert Dummy Rows in Vertical Sync (1 bit equals 1 row) */ -#define ADVFH 0x2E /* MSB of Insert Dummy Rows in Vertical Sync */ -#define YAVE 0x2F /* Y/G Channel Average Value */ -#define HSYST 0x30 /* HSync rising edge delay */ -#define HSYEN 0x31 /* HSync falling edge delay */ -#define HREF 0x32 /* Image Start and Size Control DIFFERENT CONTROL SEQUENCE */ -#define CHLF 0x33 /* Array Current control */ -#define ARBLM 0x34 /* Array reference control */ -#define RSVD_35 0x35 /* Reserved */ -#define RSVD_36 0x36 /* Reserved */ -#define ADC 0x37 /* ADC control */ -#define ACOM 0x38 /* ADC and analog common mode control */ -#define OFON 0x39 /* ADC offset control */ -#define TSLB 0x3A /* Line buffer test option */ - -#define COM11 0x3B /* Common control 11 */ -#define COM11_EXP 0x02 -#define COM11_HZAUTO 0x10 /* Auto detect 50/60 Hz */ - -#define COM12 0x3C /* Common control 12 */ - -#define COM13 0x3D /* Common control 13 */ -#define COM13_GAMMA 0x80 /* Gamma enable */ -#define COM13_UVSAT 0x40 /* UV saturation auto adjustment */ - -#define COM14 0x3E /* Common Control 14 */ - -#define EDGE 0x3F /* edge enhancement adjustment */ -#define COM15 0x40 /* Common Control 15 DIFFERENT CONTROLS */ -#define COM15_SET_RGB565(r,x) ((r&0xEF)|((x&1)<<4)) /* set rgb565 mode */ -#define COM15_RGB565 0x10 /* RGB565 output */ -#define COM15_R00FF 0xC0 /* Output range: [00] to [FF] */ - -#define COM16 0x41 /* Common Control 16 DIFFERENT CONTROLS */ -#define COM16_AWBGAIN 0x08 /* AWB gain enable */ -#define COM17 0x42 /* Common Control 17 */ - -#define AWBC1 0x43 /* Reserved */ -#define AWBC2 0x44 /* Reserved */ -#define AWBC3 0x45 /* Reserved */ -#define AWBC4 0x46 /* Reserved */ -#define AWBC5 0x47 /* Reserved */ -#define AWBC6 0x48 /* Reserved */ - -#define RSVD_49 0x49 /* Reserved */ -#define RSVD_4A 0x4A /* Reserved */ - -#define REG4B 0x4B /* Register 4B */ -#define DNSTH 0x4C /* Denoise strength */ - -#define RSVD_4D 0x4D /* Reserved */ -#define RSVD_4E 0x4E /* Reserved */ - -#define MTX1 0x4F /* Matrix coefficient 1 */ -#define MTX2 0x50 /* Matrix coefficient 2 */ -#define MTX3 0x51 /* Matrix coefficient 3 */ -#define MTX4 0x52 /* Matrix coefficient 4 */ -#define MTX5 0x53 /* Matrix coefficient 5 */ -#define MTX6 0x54 /* Matrix coefficient 6 */ -#define BRIGHTNESS 0x55 /* Brightness control */ -#define CONTRAST 0x56 /* Contrast control */ -#define CONTRASCENTER 0x57 /* Contrast center */ -#define MTXS 0x58 /* Matrix coefficient sign for coefficient 5 to 0*/ - -#define RSVD_59 0x59 /* Reserved */ -#define RSVD_5A 0x5A /* Reserved */ -#define RSVD_5B 0x5B /* Reserved */ -#define RSVD_5C 0x5C /* Reserved */ -#define RSVD_5D 0x5D /* Reserved */ -#define RSVD_5E 0x5E /* Reserved */ -#define RSVD_5F 0x5F /* Reserved */ -#define RSVD_60 0x60 /* Reserved */ -#define RSVD_61 0x61 /* Reserved */ - -#define LCC1 0x62 /* Lens correction option 1 */ - -#define LCC2 0x63 /* Lens correction option 2 */ -#define LCC3 0x64 /* Lens correction option 3 */ -#define LCC4 0x65 /* Lens correction option 4 */ -#define LCC5 0x66 /* Lens correction option 5 */ - -#define MANU 0x67 /* Manual U Value */ -#define MANV 0x68 /* Manual V Value */ -#define GFIX 0x69 /* Fix gain control */ -#define GGAIN 0x6A /* G channel AWB gain */ - -#define DBLV 0x6B /* PLL and clock ? */ - -#define AWBCTR3 0x6C /* AWB Control 3 */ -#define AWBCTR2 0x6D /* AWB Control 2 */ -#define AWBCTR1 0x6E /* AWB Control 1 */ -#define AWBCTR0 0x6F /* AWB Control 0 */ -#define SCALING_XSC 0x70 /* test pattern and horizontal scaling factor */ -#define SCALING_XSC_CBAR(r) (r&0x7F) /* make sure bit7 is 0 for color bar */ -#define SCALING_YSC 0x71 /* test pattern and vertical scaling factor */ -#define SCALING_YSC_CBAR(r,x) ((r&0x7F)|((x&1)<<7)) /* change bit7 for color bar on/off */ -#define SCALING_DCWCTR 0x72 /* DCW control */ -#define SCALING_PCLK_DIV 0x73 /* */ -#define REG74 0x74 /* */ -#define REG75 0x75 /* */ -#define REG76 0x76 /* */ -#define REG77 0x77 /* */ - -#define RSVD_78 0x78 /* Reserved */ -#define RSVD_79 0x79 /* Reserved */ - -#define SLOP 0x7A /* Gamma curve highest segment slope */ -#define GAM1 0x7B /* Gamma Curve 1st Segment Input End Point 0x04 Output Value */ -#define GAM2 0x7C /* Gamma Curve 2nd Segment Input End Point 0x08 Output Value */ -#define GAM3 0x7D /* Gamma Curve 3rd Segment Input End Point 0x10 Output Value */ -#define GAM4 0x7E /* Gamma Curve 4th Segment Input End Point 0x20 Output Value */ -#define GAM5 0x7F /* Gamma Curve 5th Segment Input End Point 0x28 Output Value */ -#define GAM6 0x80 /* Gamma Curve 6rd Segment Input End Point 0x30 Output Value */ -#define GAM7 0x81 /* Gamma Curve 7th Segment Input End Point 0x38 Output Value */ -#define GAM8 0x82 /* Gamma Curve 8th Segment Input End Point 0x40 Output Value */ -#define GAM9 0x83 /* Gamma Curve 9th Segment Input End Point 0x48 Output Value */ -#define GAM10 0x84 /* Gamma Curve 10th Segment Input End Point 0x50 Output Value */ -#define GAM11 0x85 /* Gamma Curve 11th Segment Input End Point 0x60 Output Value */ -#define GAM12 0x86 /* Gamma Curve 12th Segment Input End Point 0x70 Output Value */ -#define GAM13 0x87 /* Gamma Curve 13th Segment Input End Point 0x90 Output Value */ -#define GAM14 0x88 /* Gamma Curve 14th Segment Input End Point 0xB0 Output Value */ -#define GAM15 0x89 /* Gamma Curve 15th Segment Input End Point 0xD0 Output Value */ - -#define RSVD_8A 0x8A /* Reserved */ -#define RSVD_8B 0x8B /* Reserved */ - -#define RGB444 0x8C /* */ - -#define RSVD_8D 0x8D /* Reserved */ -#define RSVD_8E 0x8E /* Reserved */ -#define RSVD_8F 0x8F /* Reserved */ -#define RSVD_90 0x90 /* Reserved */ -#define RSVD_91 0x91 /* Reserved */ - -#define DM_LNL 0x92 /* Dummy line low 8 bit */ -#define DM_LNH 0x93 /* Dummy line high 8 bit */ -#define LCC6 0x94 /* Lens correction option 6 */ -#define LCC7 0x95 /* Lens correction option 7 */ - -#define RSVD_96 0x96 /* Reserved */ -#define RSVD_97 0x97 /* Reserved */ -#define RSVD_98 0x98 /* Reserved */ -#define RSVD_99 0x99 /* Reserved */ -#define RSVD_9A 0x9A /* Reserved */ -#define RSVD_9B 0x9B /* Reserved */ -#define RSVD_9C 0x9C /* Reserved */ - -#define BD50ST 0x9D /* 50 Hz banding filter value */ -#define BD60ST 0x9E /* 60 Hz banding filter value */ -#define HAECC1 0x9F /* Histogram-based AEC/AGC control 1 */ -#define HAECC2 0xA0 /* Histogram-based AEC/AGC control 2 */ - -#define RSVD_A1 0xA1 /* Reserved */ - -#define SCALING_PCLK_DELAY 0xA2 /* Pixel clock delay */ - -#define RSVD_A3 0xA3 /* Reserved */ - -#define NT_CNTRL 0xA4 /* */ -#define BD50MAX 0xA5 /* 50 Hz banding step limit */ -#define HAECC3 0xA6 /* Histogram-based AEC/AGC control 3 */ -#define HAECC4 0xA7 /* Histogram-based AEC/AGC control 4 */ -#define HAECC5 0xA8 /* Histogram-based AEC/AGC control 5 */ -#define HAECC6 0xA9 /* Histogram-based AEC/AGC control 6 */ - -#define HAECC7 0xAA /* Histogram-based AEC/AGC control 7 */ -#define HAECC_EN 0x80 /* Histogram-based AEC algorithm enable */ - -#define BD60MAX 0xAB /* 60 Hz banding step limit */ - -#define STR_OPT 0xAC /* Register AC */ -#define STR_R 0xAD /* R gain for led output frame */ -#define STR_G 0xAE /* G gain for led output frame */ -#define STR_B 0xAF /* B gain for led output frame */ -#define RSVD_B0 0xB0 /* Reserved */ -#define ABLC1 0xB1 /* */ -#define RSVD_B2 0xB2 /* Reserved */ -#define THL_ST 0xB3 /* ABLC target */ -#define THL_DLT 0xB5 /* ABLC stable range */ - -#define RSVD_B6 0xB6 /* Reserved */ -#define RSVD_B7 0xB7 /* Reserved */ -#define RSVD_B8 0xB8 /* Reserved */ -#define RSVD_B9 0xB9 /* Reserved */ -#define RSVD_BA 0xBA /* Reserved */ -#define RSVD_BB 0xBB /* Reserved */ -#define RSVD_BC 0xBC /* Reserved */ -#define RSVD_BD 0xBD /* Reserved */ - -#define AD_CHB 0xBE /* blue channel black level compensation */ -#define AD_CHR 0xBF /* Red channel black level compensation */ -#define AD_CHGb 0xC0 /* Gb channel black level compensation */ -#define AD_CHGr 0xC1 /* Gr channel black level compensation */ - -#define RSVD_C2 0xC2 /* Reserved */ -#define RSVD_C3 0xC3 /* Reserved */ -#define RSVD_C4 0xC4 /* Reserved */ -#define RSVD_C5 0xC5 /* Reserved */ -#define RSVD_C6 0xC6 /* Reserved */ -#define RSVD_C7 0xC7 /* Reserved */ -#define RSVD_C8 0xC8 /* Reserved */ - -#define SATCTR 0xC9 /* Saturation control */ -#define SET_REG(reg, x) (##reg_DEFAULT|x) - -#endif //__OV7670_REG_REGS_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/ov7725.h b/lib/libesp32_div/esp32-camera/sensors/private_include/ov7725.h deleted file mode 100644 index 291b26680..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/private_include/ov7725.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * This file is part of the OpenMV project. - * Copyright (c) 2013/2014 Ibrahim Abdelkader - * This work is licensed under the MIT license, see the file LICENSE for details. - * - * OV7725 driver. - * - */ -#ifndef __OV7725_H__ -#define __OV7725_H__ -#include "sensor.h" - -/** - * @brief Detect sensor pid - * - * @param slv_addr SCCB address - * @param id Detection result - * @return - * 0: Can't detect this sensor - * Nonzero: This sensor has been detected - */ -int ov7725_detect(int slv_addr, sensor_id_t *id); - -/** - * @brief initialize sensor function pointers - * - * @param sensor pointer of sensor - * @return - * Always 0 - */ -int ov7725_init(sensor_t *sensor); - -#endif // __OV7725_H__ diff --git a/lib/libesp32_div/esp32-camera/sensors/private_include/ov7725_regs.h b/lib/libesp32_div/esp32-camera/sensors/private_include/ov7725_regs.h deleted file mode 100644 index 5cb233dc9..000000000 --- a/lib/libesp32_div/esp32-camera/sensors/private_include/ov7725_regs.h +++ /dev/null @@ -1,335 +0,0 @@ -/* - * This file is part of the OpenMV project. - * Copyright (c) 2013/2014 Ibrahim Abdelkader - * This work is licensed under the MIT license, see the file LICENSE for details. - * - * OV2640 register definitions. - */ -#ifndef __REG_REGS_H__ -#define __REG_REGS_H__ -#define GAIN 0x00 /* AGC – Gain control gain setting */ -#define BLUE 0x01 /* AWB – Blue channel gain setting */ -#define RED 0x02 /* AWB – Red channel gain setting */ -#define GREEN 0x03 /* AWB – Green channel gain setting */ -#define BAVG 0x05 /* U/B Average Level */ -#define GAVG 0x06 /* Y/Gb Average Level */ -#define RAVG 0x07 /* V/R Average Level */ -#define AECH 0x08 /* Exposure Value – AEC MSBs */ - -#define COM2 0x09 /* Common Control 2 */ -#define COM2_SOFT_SLEEP 0x10 /* Soft sleep mode */ -#define COM2_OUT_DRIVE_1x 0x00 /* Output drive capability 1x */ -#define COM2_OUT_DRIVE_2x 0x01 /* Output drive capability 2x */ -#define COM2_OUT_DRIVE_3x 0x02 /* Output drive capability 3x */ -#define COM2_OUT_DRIVE_4x 0x03 /* Output drive capability 4x */ - -#define REG_PID 0x0A /* Product ID Number MSB */ -#define REG_VER 0x0B /* Product ID Number LSB */ - -#define COM3 0x0C /* Common Control 3 */ -#define COM3_VFLIP 0x80 /* Vertical flip image ON/OFF selection */ -#define COM3_MIRROR 0x40 /* Horizontal mirror image ON/OFF selection */ -#define COM3_SWAP_BR 0x20 /* Swap B/R output sequence in RGB output mode */ -#define COM3_SWAP_YUV 0x10 /* Swap Y/UV output sequence in YUV output mode */ -#define COM3_SWAP_MSB 0x08 /* Swap output MSB/LSB */ -#define COM3_TRI_CLOCK 0x04 /* Tri-state option for output clock at power-down period */ -#define COM3_TRI_DATA 0x02 /* Tri-state option for output data at power-down period */ -#define COM3_COLOR_BAR 0x01 /* Sensor color bar test pattern output enable */ -#define COM3_SET_CBAR(r, x) ((r&0xFE)|((x&1)<<0)) -#define COM3_SET_MIRROR(r, x) ((r&0xBF)|((x&1)<<6)) -#define COM3_SET_FLIP(r, x) ((r&0x7F)|((x&1)<<7)) - -#define COM4 0x0D /* Common Control 4 */ -#define COM4_PLL_BYPASS 0x00 /* Bypass PLL */ -#define COM4_PLL_4x 0x40 /* PLL frequency 4x */ -#define COM4_PLL_6x 0x80 /* PLL frequency 6x */ -#define COM4_PLL_8x 0xc0 /* PLL frequency 8x */ -#define COM4_AEC_FULL 0x00 /* AEC evaluate full window */ -#define COM4_AEC_1_2 0x10 /* AEC evaluate 1/2 window */ -#define COM4_AEC_1_4 0x20 /* AEC evaluate 1/4 window */ -#define COM4_AEC_2_3 0x30 /* AEC evaluate 2/3 window */ - -#define COM5 0x0E /* Common Control 5 */ -#define COM5_AFR 0x80 /* Auto frame rate control ON/OFF selection (night mode) */ -#define COM5_AFR_SPEED 0x40 /* Auto frame rate control speed selection */ -#define COM5_AFR_0 0x00 /* No reduction of frame rate */ -#define COM5_AFR_1_2 0x10 /* Max reduction to 1/2 frame rate */ -#define COM5_AFR_1_4 0x20 /* Max reduction to 1/4 frame rate */ -#define COM5_AFR_1_8 0x30 /* Max reduction to 1/8 frame rate */ -#define COM5_AFR_4x 0x04 /* Add frame when AGC reaches 4x gain */ -#define COM5_AFR_8x 0x08 /* Add frame when AGC reaches 8x gain */ -#define COM5_AFR_16x 0x0c /* Add frame when AGC reaches 16x gain */ -#define COM5_AEC_NO_LIMIT 0x01 /* No limit to AEC increase step */ - -#define COM6 0x0F /* Common Control 6 */ -#define COM6_AUTO_WINDOW 0x01 /* Auto window setting ON/OFF selection when format changes */ - -#define AEC 0x10 /* AEC[7:0] (see register AECH for AEC[15:8]) */ -#define CLKRC 0x11 /* Internal Clock */ - -#define COM7 0x12 /* Common Control 7 */ -#define COM7_RESET 0x80 /* SCCB Register Reset */ -#define COM7_RES_VGA 0x00 /* Resolution VGA */ -#define COM7_RES_QVGA 0x40 /* Resolution QVGA */ -#define COM7_BT656 0x20 /* BT.656 protocol ON/OFF */ -#define COM7_SENSOR_RAW 0x10 /* Sensor RAW */ -#define COM7_FMT_GBR422 0x00 /* RGB output format GBR422 */ -#define COM7_FMT_RGB565 0x04 /* RGB output format RGB565 */ -#define COM7_FMT_RGB555 0x08 /* RGB output format RGB555 */ -#define COM7_FMT_RGB444 0x0C /* RGB output format RGB444 */ -#define COM7_FMT_YUV 0x00 /* Output format YUV */ -#define COM7_FMT_P_BAYER 0x01 /* Output format Processed Bayer RAW */ -#define COM7_FMT_RGB 0x02 /* Output format RGB */ -#define COM7_FMT_R_BAYER 0x03 /* Output format Bayer RAW */ -#define COM7_SET_FMT(r, x) ((r&0xFC)|((x&0x3)<<0)) -#define COM7_SET_RGB(r, x) ((r&0xF0)|(x&0x0C)|COM7_FMT_RGB) - -#define COM8 0x13 /* Common Control 8 */ -#define COM8_FAST_AUTO 0x80 /* Enable fast AGC/AEC algorithm */ -#define COM8_STEP_VSYNC 0x00 /* AEC - Step size limited to vertical blank */ -#define COM8_STEP_UNLIMIT 0x40 /* AEC - Step size unlimited step size */ -#define COM8_BANDF_EN 0x20 /* Banding filter ON/OFF */ -#define COM8_AEC_BANDF 0x10 /* Enable AEC below banding value */ -#define COM8_AEC_FINE_EN 0x08 /* Fine AEC ON/OFF control */ -#define COM8_AGC_EN 0x04 /* AGC Enable */ -#define COM8_AWB_EN 0x02 /* AWB Enable */ -#define COM8_AEC_EN 0x01 /* AEC Enable */ -#define COM8_SET_AGC(r, x) ((r&0xFB)|((x&0x1)<<2)) -#define COM8_SET_AWB(r, x) ((r&0xFD)|((x&0x1)<<1)) -#define COM8_SET_AEC(r, x) ((r&0xFE)|((x&0x1)<<0)) - -#define COM9 0x14 /* Common Control 9 */ -#define COM9_HISTO_AVG 0x80 /* Histogram or average based AEC/AGC selection */ -#define COM9_AGC_GAIN_2x 0x00 /* Automatic Gain Ceiling 2x */ -#define COM9_AGC_GAIN_4x 0x10 /* Automatic Gain Ceiling 4x */ -#define COM9_AGC_GAIN_8x 0x20 /* Automatic Gain Ceiling 8x */ -#define COM9_AGC_GAIN_16x 0x30 /* Automatic Gain Ceiling 16x */ -#define COM9_AGC_GAIN_32x 0x40 /* Automatic Gain Ceiling 32x */ -#define COM9_DROP_VSYNC 0x04 /* Drop VSYNC output of corrupt frame */ -#define COM9_DROP_HREF 0x02 /* Drop HREF output of corrupt frame */ -#define COM9_SET_AGC(r, x) ((r&0x8F)|((x&0x07)<<4)) - -#define COM10 0x15 /* Common Control 10 */ -#define COM10_NEGATIVE 0x80 /* Output negative data */ -#define COM10_HSYNC_EN 0x40 /* HREF changes to HSYNC */ -#define COM10_PCLK_FREE 0x00 /* PCLK output option: free running PCLK */ -#define COM10_PCLK_MASK 0x20 /* PCLK output option: masked during horizontal blank */ -#define COM10_PCLK_REV 0x10 /* PCLK reverse */ -#define COM10_HREF_REV 0x08 /* HREF reverse */ -#define COM10_VSYNC_FALLING 0x00 /* VSYNC changes on falling edge of PCLK */ -#define COM10_VSYNC_RISING 0x04 /* VSYNC changes on rising edge of PCLK */ -#define COM10_VSYNC_NEG 0x02 /* VSYNC negative */ -#define COM10_OUT_RANGE_8 0x01 /* Output data range: Full range */ -#define COM10_OUT_RANGE_10 0x00 /* Output data range: Data from [10] to [F0] (8 MSBs) */ - -#define REG16 0x16 /* Register 16 */ -#define REG16_BIT_SHIFT 0x80 /* Bit shift test pattern options */ -#define HSTART 0x17 /* Horizontal Frame (HREF column) Start 8 MSBs (2 LSBs are at HREF[5:4]) */ -#define HSIZE 0x18 /* Horizontal Sensor Size (2 LSBs are at HREF[1:0]) */ -#define VSTART 0x19 /* Vertical Frame (row) Start 8 MSBs (1 LSB is at HREF[6]) */ -#define VSIZE 0x1A /* Vertical Sensor Size (1 LSB is at HREF[2]) */ -#define PSHFT 0x1B /* Data Format - Pixel Delay Select */ -#define REG_MIDH 0x1C /* Manufacturer ID Byte – High */ -#define REG_MIDL 0x1D /* Manufacturer ID Byte – Low */ -#define LAEC 0x1F /* Fine AEC Value - defines exposure value less than one row period */ - -#define COM11 0x20 /* Common Control 11 */ -#define COM11_SNGL_FRAME_EN 0x02 /* Single frame ON/OFF selection */ -#define COM11_SNGL_XFR_TRIG 0x01 /* Single frame transfer trigger */ - -#define BDBASE 0x22 /* Banding Filter Minimum AEC Value */ -#define DBSTEP 0x23 /* Banding Filter Maximum Step */ -#define AEW 0x24 /* AGC/AEC - Stable Operating Region (Upper Limit) */ -#define AEB 0x25 /* AGC/AEC - Stable Operating Region (Lower Limit) */ -#define VPT 0x26 /* AGC/AEC Fast Mode Operating Region */ -#define REG28 0x28 /* Selection on the number of dummy rows, N */ -#define HOUTSIZE 0x29 /* Horizontal Data Output Size MSBs (2 LSBs at register EXHCH[1:0]) */ -#define EXHCH 0x2A /* Dummy Pixel Insert MSB */ -#define EXHCL 0x2B /* Dummy Pixel Insert LSB */ -#define VOUTSIZE 0x2C /* Vertical Data Output Size MSBs (LSB at register EXHCH[2]) */ -#define ADVFL 0x2D /* LSB of Insert Dummy Rows in Vertical Sync (1 bit equals 1 row) */ -#define ADVFH 0x2E /* MSB of Insert Dummy Rows in Vertical Sync */ -#define YAVE 0x2F /* Y/G Channel Average Value */ -#define LUMHTH 0x30 /* Histogram AEC/AGC Luminance High Level Threshold */ -#define LUMLTH 0x31 /* Histogram AEC/AGC Luminance Low Level Threshold */ -#define HREF 0x32 /* Image Start and Size Control */ -#define DM_LNL 0x33 /* Dummy Row Low 8 Bits */ -#define DM_LNH 0x34 /* Dummy Row High 8 Bits */ -#define ADOFF_B 0x35 /* AD Offset Compensation Value for B Channel */ -#define ADOFF_R 0x36 /* AD Offset Compensation Value for R Channel */ -#define ADOFF_GB 0x37 /* AD Offset Compensation Value for GB Channel */ -#define ADOFF_GR 0x38 /* AD Offset Compensation Value for GR Channel */ -#define OFF_B 0x39 /* AD Offset Compensation Value for B Channel */ -#define OFF_R 0x3A /* AD Offset Compensation Value for R Channel */ -#define OFF_GB 0x3B /* AD Offset Compensation Value for GB Channel */ -#define OFF_GR 0x3C /* AD Offset Compensation Value for GR Channel */ -#define COM12 0x3D /* DC offset compensation for analog process */ - -#define COM13 0x3E /* Common Control 13 */ -#define COM13_BLC_EN 0x80 /* BLC enable */ -#define COM13_ADC_EN 0x40 /* ADC channel BLC ON/OFF control */ -#define COM13_ANALOG_BLC 0x20 /* Analog processing channel BLC ON/OFF control */ -#define COM13_ABLC_GAIN_EN 0x04 /* ABLC gain trigger enable */ - -#define COM14 0x3F /* Common Control 14 */ -#define COM15 0x40 /* Common Control 15 */ -#define COM16 0x41 /* Common Control 16 */ -#define TGT_B 0x42 /* BLC Blue Channel Target Value */ -#define TGT_R 0x43 /* BLC Red Channel Target Value */ -#define TGT_GB 0x44 /* BLC Gb Channel Target Value */ -#define TGT_GR 0x45 /* BLC Gr Channel Target Value */ - -#define LC_CTR 0x46 /* Lens Correction Control */ -#define LC_CTR_RGB_COMP_1 0x00 /* R, G, and B channel compensation coefficient is set by LC_COEF (0x49) */ -#define LC_CTR_RGB_COMP_3 0x04 /* R, G, and B channel compensation coefficient is set by registers - LC_COEFB (0x4B), LC_COEF (0x49), and LC_COEFR (0x4C), respectively */ -#define LC_CTR_EN 0x01 /* Lens correction enable */ -#define LC_XC 0x47 /* X Coordinate of Lens Correction Center Relative to Array Center */ -#define LC_YC 0x48 /* Y Coordinate of Lens Correction Center Relative to Array Center */ -#define LC_COEF 0x49 /* Lens Correction Coefficient */ -#define LC_RADI 0x4A /* Lens Correction Radius */ -#define LC_COEFB 0x4B /* Lens Correction B Channel Compensation Coefficient */ -#define LC_COEFR 0x4C /* Lens Correction R Channel Compensation Coefficient */ - -#define FIXGAIN 0x4D /* Analog Fix Gain Amplifier */ -#define AREF0 0x4E /* Sensor Reference Control */ -#define AREF1 0x4F /* Sensor Reference Current Control */ -#define AREF2 0x50 /* Analog Reference Control */ -#define AREF3 0x51 /* ADC Reference Control */ -#define AREF4 0x52 /* ADC Reference Control */ -#define AREF5 0x53 /* ADC Reference Control */ -#define AREF6 0x54 /* Analog Reference Control */ -#define AREF7 0x55 /* Analog Reference Control */ -#define UFIX 0x60 /* U Channel Fixed Value Output */ -#define VFIX 0x61 /* V Channel Fixed Value Output */ -#define AWBB_BLK 0x62 /* AWB Option for Advanced AWB */ - -#define AWB_CTRL0 0x63 /* AWB Control Byte 0 */ -#define AWB_CTRL0_GAIN_EN 0x80 /* AWB gain enable */ -#define AWB_CTRL0_CALC_EN 0x40 /* AWB calculate enable */ -#define AWB_CTRL0_WBC_MASK 0x0F /* WBC threshold 2 */ - -#define DSP_CTRL1 0x64 /* DSP Control Byte 1 */ -#define DSP_CTRL1_FIFO_EN 0x80 /* FIFO enable/disable selection */ -#define DSP_CTRL1_UV_EN 0x40 /* UV adjust function ON/OFF selection */ -#define DSP_CTRL1_SDE_EN 0x20 /* SDE enable */ -#define DSP_CTRL1_MTRX_EN 0x10 /* Color matrix ON/OFF selection */ -#define DSP_CTRL1_INTRP_EN 0x08 /* Interpolation ON/OFF selection */ -#define DSP_CTRL1_GAMMA_EN 0x04 /* Gamma function ON/OFF selection */ -#define DSP_CTRL1_BLACK_EN 0x02 /* Black defect auto correction ON/OFF */ -#define DSP_CTRL1_WHITE_EN 0x01 /* White defect auto correction ON/OFF */ - -#define DSP_CTRL2 0x65 /* DSP Control Byte 2 */ -#define DSP_CTRL2_VDCW_EN 0x08 /* Vertical DCW enable */ -#define DSP_CTRL2_HDCW_EN 0x04 /* Horizontal DCW enable */ -#define DSP_CTRL2_VZOOM_EN 0x02 /* Vertical zoom out enable */ -#define DSP_CTRL2_HZOOM_EN 0x01 /* Horizontal zoom out enable */ - -#define DSP_CTRL3 0x66 /* DSP Control Byte 3 */ -#define DSP_CTRL3_UV_EN 0x80 /* UV output sequence option */ -#define DSP_CTRL3_CBAR_EN 0x20 /* DSP color bar ON/OFF selection */ -#define DSP_CTRL3_FIFO_EN 0x08 /* FIFO power down ON/OFF selection */ -#define DSP_CTRL3_SCAL1_PWDN 0x04 /* Scaling module power down control 1 */ -#define DSP_CTRL3_SCAL2_PWDN 0x02 /* Scaling module power down control 2 */ -#define DSP_CTRL3_INTRP_PWDN 0x01 /* Interpolation module power down control */ -#define DSP_CTRL3_SET_CBAR(r, x) ((r&0xDF)|((x&1)<<5)) - - -#define DSP_CTRL4 0x67 /* DSP Control Byte 4 */ -#define DSP_CTRL4_YUV_RGB 0x00 /* Output selection YUV or RGB */ -#define DSP_CTRL4_RAW8 0x02 /* Output selection RAW8 */ -#define DSP_CTRL4_RAW10 0x03 /* Output selection RAW10 */ - - -#define AWB_BIAS 0x68 /* AWB BLC Level Clip */ -#define AWB_CTRL1 0x69 /* AWB Control 1 */ -#define AWB_CTRL2 0x6A /* AWB Control 2 */ - -#define AWB_CTRL3 0x6B /* AWB Control 3 */ -#define AWB_CTRL3_ADVANCED 0x80 /* AWB mode select - Advanced AWB */ -#define AWB_CTRL3_SIMPLE 0x00 /* AWB mode select - Simple AWB */ - -#define AWB_CTRL4 0x6C /* AWB Control 4 */ -#define AWB_CTRL5 0x6D /* AWB Control 5 */ -#define AWB_CTRL6 0x6E /* AWB Control 6 */ -#define AWB_CTRL7 0x6F /* AWB Control 7 */ -#define AWB_CTRL8 0x70 /* AWB Control 8 */ -#define AWB_CTRL9 0x71 /* AWB Control 9 */ -#define AWB_CTRL10 0x72 /* AWB Control 10 */ -#define AWB_CTRL11 0x73 /* AWB Control 11 */ -#define AWB_CTRL12 0x74 /* AWB Control 12 */ -#define AWB_CTRL13 0x75 /* AWB Control 13 */ -#define AWB_CTRL14 0x76 /* AWB Control 14 */ -#define AWB_CTRL15 0x77 /* AWB Control 15 */ -#define AWB_CTRL16 0x78 /* AWB Control 16 */ -#define AWB_CTRL17 0x79 /* AWB Control 17 */ -#define AWB_CTRL18 0x7A /* AWB Control 18 */ -#define AWB_CTRL19 0x7B /* AWB Control 19 */ -#define AWB_CTRL20 0x7C /* AWB Control 20 */ -#define AWB_CTRL21 0x7D /* AWB Control 21 */ -#define GAM1 0x7E /* Gamma Curve 1st Segment Input End Point 0x04 Output Value */ -#define GAM2 0x7F /* Gamma Curve 2nd Segment Input End Point 0x08 Output Value */ -#define GAM3 0x80 /* Gamma Curve 3rd Segment Input End Point 0x10 Output Value */ -#define GAM4 0x81 /* Gamma Curve 4th Segment Input End Point 0x20 Output Value */ -#define GAM5 0x82 /* Gamma Curve 5th Segment Input End Point 0x28 Output Value */ -#define GAM6 0x83 /* Gamma Curve 6th Segment Input End Point 0x30 Output Value */ -#define GAM7 0x84 /* Gamma Curve 7th Segment Input End Point 0x38 Output Value */ -#define GAM8 0x85 /* Gamma Curve 8th Segment Input End Point 0x40 Output Value */ -#define GAM9 0x86 /* Gamma Curve 9th Segment Input End Point 0x48 Output Value */ -#define GAM10 0x87 /* Gamma Curve 10th Segment Input End Point 0x50 Output Value */ -#define GAM11 0x88 /* Gamma Curve 11th Segment Input End Point 0x60 Output Value */ -#define GAM12 0x89 /* Gamma Curve 12th Segment Input End Point 0x70 Output Value */ -#define GAM13 0x8A /* Gamma Curve 13th Segment Input End Point 0x90 Output Value */ -#define GAM14 0x8B /* Gamma Curve 14th Segment Input End Point 0xB0 Output Value */ -#define GAM15 0x8C /* Gamma Curve 15th Segment Input End Point 0xD0 Output Value */ -#define SLOP 0x8D /* Gamma Curve Highest Segment Slope */ -#define DNSTH 0x8E /* De-noise Threshold */ -#define EDGE0 0x8F /* Edge Enhancement Strength Control */ -#define EDGE1 0x90 /* Edge Enhancement Threshold Control */ -#define DNSOFF 0x91 /* Auto De-noise Threshold Control */ -#define EDGE2 0x92 /* Edge Enhancement Strength Upper Limit */ -#define EDGE3 0x93 /* Edge Enhancement Strength Upper Limit */ -#define MTX1 0x94 /* Matrix Coefficient 1 */ -#define MTX2 0x95 /* Matrix Coefficient 2 */ -#define MTX3 0x96 /* Matrix Coefficient 3 */ -#define MTX4 0x97 /* Matrix Coefficient 4 */ -#define MTX5 0x98 /* Matrix Coefficient 5 */ -#define MTX6 0x99 /* Matrix Coefficient 6 */ - -#define MTX_CTRL 0x9A /* Matrix Control */ -#define MTX_CTRL_DBL_EN 0x80 /* Matrix double ON/OFF selection */ - -#define BRIGHTNESS 0x9B /* Brightness Control */ -#define CONTRAST 0x9C /* Contrast Gain */ -#define UVADJ0 0x9E /* Auto UV Adjust Control 0 */ -#define UVADJ1 0x9F /* Auto UV Adjust Control 1 */ -#define SCAL0 0xA0 /* DCW Ratio Control */ -#define SCAL1 0xA1 /* Horizontal Zoom Out Control */ -#define SCAL2 0xA2 /* Vertical Zoom Out Control */ -#define FIFODLYM 0xA3 /* FIFO Manual Mode Delay Control */ -#define FIFODLYA 0xA4 /* FIFO Auto Mode Delay Control */ - -#define SDE 0xA6 /* Special Digital Effect Control */ -#define SDE_NEGATIVE_EN 0x40 /* Negative image enable */ -#define SDE_GRAYSCALE_EN 0x20 /* Gray scale image enable */ -#define SDE_V_FIXED_EN 0x10 /* V fixed value enable */ -#define SDE_U_FIXED_EN 0x08 /* U fixed value enable */ -#define SDE_CONT_BRIGHT_EN 0x04 /* Contrast/Brightness enable */ -#define SDE_SATURATION_EN 0x02 /* Saturation enable */ -#define SDE_HUE_EN 0x01 /* Hue enable */ - -#define USAT 0xA7 /* U Component Saturation Gain */ -#define VSAT 0xA8 /* V Component Saturation Gain */ -#define HUECOS 0xA9 /* Cosine value × 0x80 */ -#define HUESIN 0xAA /* Sine value × 0x80 */ -#define SIGN_BIT 0xAB /* Sign Bit for Hue and Brightness */ - -#define DSPAUTO 0xAC /* DSP Auto Function ON/OFF Control */ -#define DSPAUTO_AWB_EN 0x80 /* AWB auto threshold control */ -#define DSPAUTO_DENOISE_EN 0x40 /* De-noise auto threshold control */ -#define DSPAUTO_EDGE_EN 0x20 /* Sharpness (edge enhancement) auto strength control */ -#define DSPAUTO_UV_EN 0x10 /* UV adjust auto slope control */ -#define DSPAUTO_SCAL0_EN 0x08 /* Auto scaling factor control (register SCAL0 (0xA0)) */ -#define DSPAUTO_SCAL1_EN 0x04 /* Auto scaling factor control (registers SCAL1 (0xA1 and SCAL2 (0xA2))*/ -#define SET_REG(reg, x) (##reg_DEFAULT|x) -#endif //__REG_REGS_H__ diff --git a/lib/libesp32_div/esp32-camera/target/esp32/ll_cam.c b/lib/libesp32_div/esp32-camera/target/esp32/ll_cam.c deleted file mode 100644 index e513205d2..000000000 --- a/lib/libesp32_div/esp32-camera/target/esp32/ll_cam.c +++ /dev/null @@ -1,522 +0,0 @@ -// Copyright 2010-2020 Espressif Systems (Shanghai) PTE LTD -// -// 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. - -#include -#include -#include "soc/i2s_struct.h" -#include "esp_idf_version.h" -#if (ESP_IDF_VERSION_MAJOR >= 4) && (ESP_IDF_VERSION_MINOR > 1) -#include "hal/gpio_ll.h" -#else -#include "soc/gpio_periph.h" -#define esp_rom_delay_us ets_delay_us -static inline int gpio_ll_get_level(gpio_dev_t *hw, int gpio_num) -{ - if (gpio_num < 32) { - return (hw->in >> gpio_num) & 0x1; - } else { - return (hw->in1.data >> (gpio_num - 32)) & 0x1; - } -} -#endif -#include "ll_cam.h" -#include "xclk.h" -#include "cam_hal.h" - -static const char *TAG = "esp32 ll_cam"; - -#define I2S_ISR_ENABLE(i) {I2S0.int_clr.i = 1;I2S0.int_ena.i = 1;} -#define I2S_ISR_DISABLE(i) {I2S0.int_ena.i = 0;I2S0.int_clr.i = 1;} - -typedef union { - struct { - uint32_t sample2:8; - uint32_t unused2:8; - uint32_t sample1:8; - uint32_t unused1:8; - }; - uint32_t val; -} dma_elem_t; - -typedef enum { - /* camera sends byte sequence: s1, s2, s3, s4, ... - * fifo receives: 00 s1 00 s2, 00 s2 00 s3, 00 s3 00 s4, ... - */ - SM_0A0B_0B0C = 0, - /* camera sends byte sequence: s1, s2, s3, s4, ... - * fifo receives: 00 s1 00 s2, 00 s3 00 s4, ... - */ - SM_0A0B_0C0D = 1, - /* camera sends byte sequence: s1, s2, s3, s4, ... - * fifo receives: 00 s1 00 00, 00 s2 00 00, 00 s3 00 00, ... - */ - SM_0A00_0B00 = 3, -} i2s_sampling_mode_t; - -typedef size_t (*dma_filter_t)(uint8_t* dst, const uint8_t* src, size_t len); - -static i2s_sampling_mode_t sampling_mode = SM_0A00_0B00; - -static size_t ll_cam_bytes_per_sample(i2s_sampling_mode_t mode) -{ - switch(mode) { - case SM_0A00_0B00: - return 4; - case SM_0A0B_0B0C: - return 4; - case SM_0A0B_0C0D: - return 2; - default: - assert(0 && "invalid sampling mode"); - return 0; - } -} - -static size_t IRAM_ATTR ll_cam_dma_filter_jpeg(uint8_t* dst, const uint8_t* src, size_t len) -{ - const dma_elem_t* dma_el = (const dma_elem_t*)src; - size_t elements = len / sizeof(dma_elem_t); - size_t end = elements / 4; - // manually unrolling 4 iterations of the loop here - for (size_t i = 0; i < end; ++i) { - dst[0] = dma_el[0].sample1; - dst[1] = dma_el[1].sample1; - dst[2] = dma_el[2].sample1; - dst[3] = dma_el[3].sample1; - dma_el += 4; - dst += 4; - } - return elements; -} - -static size_t IRAM_ATTR ll_cam_dma_filter_grayscale(uint8_t* dst, const uint8_t* src, size_t len) -{ - const dma_elem_t* dma_el = (const dma_elem_t*)src; - size_t elements = len / sizeof(dma_elem_t); - size_t end = elements / 4; - for (size_t i = 0; i < end; ++i) { - // manually unrolling 4 iterations of the loop here - dst[0] = dma_el[0].sample1; - dst[1] = dma_el[1].sample1; - dst[2] = dma_el[2].sample1; - dst[3] = dma_el[3].sample1; - dma_el += 4; - dst += 4; - } - return elements; -} - -static size_t IRAM_ATTR ll_cam_dma_filter_grayscale_highspeed(uint8_t* dst, const uint8_t* src, size_t len) -{ - const dma_elem_t* dma_el = (const dma_elem_t*)src; - size_t elements = len / sizeof(dma_elem_t); - size_t end = elements / 8; - for (size_t i = 0; i < end; ++i) { - // manually unrolling 4 iterations of the loop here - dst[0] = dma_el[0].sample1; - dst[1] = dma_el[2].sample1; - dst[2] = dma_el[4].sample1; - dst[3] = dma_el[6].sample1; - dma_el += 8; - dst += 4; - } - // the final sample of a line in SM_0A0B_0B0C sampling mode needs special handling - if ((elements & 0x7) != 0) { - dst[0] = dma_el[0].sample1; - dst[1] = dma_el[2].sample1; - elements += 1; - } - return elements / 2; -} - -static size_t IRAM_ATTR ll_cam_dma_filter_yuyv(uint8_t* dst, const uint8_t* src, size_t len) -{ - const dma_elem_t* dma_el = (const dma_elem_t*)src; - size_t elements = len / sizeof(dma_elem_t); - size_t end = elements / 4; - for (size_t i = 0; i < end; ++i) { - dst[0] = dma_el[0].sample1;//y0 - dst[1] = dma_el[0].sample2;//u - dst[2] = dma_el[1].sample1;//y1 - dst[3] = dma_el[1].sample2;//v - - dst[4] = dma_el[2].sample1;//y0 - dst[5] = dma_el[2].sample2;//u - dst[6] = dma_el[3].sample1;//y1 - dst[7] = dma_el[3].sample2;//v - dma_el += 4; - dst += 8; - } - return elements * 2; -} - -static size_t IRAM_ATTR ll_cam_dma_filter_yuyv_highspeed(uint8_t* dst, const uint8_t* src, size_t len) -{ - const dma_elem_t* dma_el = (const dma_elem_t*)src; - size_t elements = len / sizeof(dma_elem_t); - size_t end = elements / 8; - for (size_t i = 0; i < end; ++i) { - dst[0] = dma_el[0].sample1;//y0 - dst[1] = dma_el[1].sample1;//u - dst[2] = dma_el[2].sample1;//y1 - dst[3] = dma_el[3].sample1;//v - - dst[4] = dma_el[4].sample1;//y0 - dst[5] = dma_el[5].sample1;//u - dst[6] = dma_el[6].sample1;//y1 - dst[7] = dma_el[7].sample1;//v - dma_el += 8; - dst += 8; - } - if ((elements & 0x7) != 0) { - dst[0] = dma_el[0].sample1;//y0 - dst[1] = dma_el[1].sample1;//u - dst[2] = dma_el[2].sample1;//y1 - dst[3] = dma_el[2].sample2;//v - elements += 4; - } - return elements; -} - -static void IRAM_ATTR ll_cam_vsync_isr(void *arg) -{ - //DBG_PIN_SET(1); - cam_obj_t *cam = (cam_obj_t *)arg; - BaseType_t HPTaskAwoken = pdFALSE; - // filter - ets_delay_us(1); - if (gpio_ll_get_level(&GPIO, cam->vsync_pin) == !cam->vsync_invert) { - ll_cam_send_event(cam, CAM_VSYNC_EVENT, &HPTaskAwoken); - if (HPTaskAwoken == pdTRUE) { - portYIELD_FROM_ISR(); - } - } - //DBG_PIN_SET(0); -} - -static void IRAM_ATTR ll_cam_dma_isr(void *arg) -{ - //DBG_PIN_SET(1); - cam_obj_t *cam = (cam_obj_t *)arg; - BaseType_t HPTaskAwoken = pdFALSE; - - typeof(I2S0.int_st) status = I2S0.int_st; - if (status.val == 0) { - return; - } - - I2S0.int_clr.val = status.val; - - if (status.in_suc_eof) { - ll_cam_send_event(cam, CAM_IN_SUC_EOF_EVENT, &HPTaskAwoken); - } - if (HPTaskAwoken == pdTRUE) { - portYIELD_FROM_ISR(); - } - //DBG_PIN_SET(0); -} - -bool ll_cam_stop(cam_obj_t *cam) -{ - I2S0.conf.rx_start = 0; - I2S_ISR_DISABLE(in_suc_eof); - I2S0.in_link.stop = 1; - return true; -} - -esp_err_t ll_cam_deinit(cam_obj_t *cam) -{ - gpio_isr_handler_remove(cam->vsync_pin); - - if (cam->cam_intr_handle) { - esp_intr_free(cam->cam_intr_handle); - cam->cam_intr_handle = NULL; - } - - return ESP_OK; -} - -bool ll_cam_start(cam_obj_t *cam, int frame_pos) -{ - I2S0.conf.rx_start = 0; - - I2S_ISR_ENABLE(in_suc_eof); - - I2S0.conf.rx_reset = 1; - I2S0.conf.rx_reset = 0; - I2S0.conf.rx_fifo_reset = 1; - I2S0.conf.rx_fifo_reset = 0; - I2S0.lc_conf.in_rst = 1; - I2S0.lc_conf.in_rst = 0; - I2S0.lc_conf.ahbm_fifo_rst = 1; - I2S0.lc_conf.ahbm_fifo_rst = 0; - I2S0.lc_conf.ahbm_rst = 1; - I2S0.lc_conf.ahbm_rst = 0; - - I2S0.rx_eof_num = cam->dma_half_buffer_size / sizeof(dma_elem_t); - I2S0.in_link.addr = ((uint32_t)&cam->dma[0]) & 0xfffff; - - I2S0.in_link.start = 1; - I2S0.conf.rx_start = 1; - return true; -} - -esp_err_t ll_cam_config(cam_obj_t *cam, const camera_config_t *config) -{ - // Enable and configure I2S peripheral - periph_module_enable(PERIPH_I2S0_MODULE); - - I2S0.conf.rx_reset = 1; - I2S0.conf.rx_reset = 0; - I2S0.conf.rx_fifo_reset = 1; - I2S0.conf.rx_fifo_reset = 0; - I2S0.lc_conf.in_rst = 1; - I2S0.lc_conf.in_rst = 0; - I2S0.lc_conf.ahbm_fifo_rst = 1; - I2S0.lc_conf.ahbm_fifo_rst = 0; - I2S0.lc_conf.ahbm_rst = 1; - I2S0.lc_conf.ahbm_rst = 0; - - I2S0.conf.rx_slave_mod = 1; - I2S0.conf.rx_right_first = 0; - I2S0.conf.rx_msb_right = 0; - I2S0.conf.rx_msb_shift = 0; - I2S0.conf.rx_mono = 0; - I2S0.conf.rx_short_sync = 0; - - I2S0.conf2.lcd_en = 1; - I2S0.conf2.camera_en = 1; - - // Configure clock divider - I2S0.clkm_conf.clkm_div_a = 0; - I2S0.clkm_conf.clkm_div_b = 0; - I2S0.clkm_conf.clkm_div_num = 2; - - I2S0.fifo_conf.dscr_en = 1; - I2S0.fifo_conf.rx_fifo_mod = sampling_mode; - I2S0.fifo_conf.rx_fifo_mod_force_en = 1; - - I2S0.conf_chan.rx_chan_mod = 1; - I2S0.sample_rate_conf.rx_bits_mod = 0; - I2S0.timing.val = 0; - I2S0.timing.rx_dsync_sw = 1; - - return ESP_OK; -} - -void ll_cam_vsync_intr_enable(cam_obj_t *cam, bool en) -{ - if (en) { - gpio_intr_enable(cam->vsync_pin); - } else { - gpio_intr_disable(cam->vsync_pin); - } -} - -esp_err_t ll_cam_set_pin(cam_obj_t *cam, const camera_config_t *config) -{ - gpio_config_t io_conf = {0}; - io_conf.intr_type = cam->vsync_invert ? GPIO_PIN_INTR_NEGEDGE : GPIO_PIN_INTR_POSEDGE; - io_conf.pin_bit_mask = 1ULL << config->pin_vsync; - io_conf.mode = GPIO_MODE_INPUT; - io_conf.pull_up_en = 1; - io_conf.pull_down_en = 0; - gpio_config(&io_conf); - gpio_install_isr_service(ESP_INTR_FLAG_LOWMED | ESP_INTR_FLAG_IRAM); - gpio_isr_handler_add(config->pin_vsync, ll_cam_vsync_isr, cam); - gpio_intr_disable(config->pin_vsync); - - PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[config->pin_pclk], PIN_FUNC_GPIO); - gpio_set_direction(config->pin_pclk, GPIO_MODE_INPUT); - gpio_set_pull_mode(config->pin_pclk, GPIO_FLOATING); - gpio_matrix_in(config->pin_pclk, I2S0I_WS_IN_IDX, false); - - PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[config->pin_vsync], PIN_FUNC_GPIO); - gpio_set_direction(config->pin_vsync, GPIO_MODE_INPUT); - gpio_set_pull_mode(config->pin_vsync, GPIO_FLOATING); - gpio_matrix_in(config->pin_vsync, I2S0I_V_SYNC_IDX, false); - - PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[config->pin_href], PIN_FUNC_GPIO); - gpio_set_direction(config->pin_href, GPIO_MODE_INPUT); - gpio_set_pull_mode(config->pin_href, GPIO_FLOATING); - gpio_matrix_in(config->pin_href, I2S0I_H_SYNC_IDX, false); - - int data_pins[8] = { - config->pin_d0, config->pin_d1, config->pin_d2, config->pin_d3, config->pin_d4, config->pin_d5, config->pin_d6, config->pin_d7, - }; - for (int i = 0; i < 8; i++) { - PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[data_pins[i]], PIN_FUNC_GPIO); - gpio_set_direction(data_pins[i], GPIO_MODE_INPUT); - gpio_set_pull_mode(data_pins[i], GPIO_FLOATING); - gpio_matrix_in(data_pins[i], I2S0I_DATA_IN0_IDX + i, false); - } - - gpio_matrix_in(0x38, I2S0I_H_ENABLE_IDX, false); - return ESP_OK; -} - -esp_err_t ll_cam_init_isr(cam_obj_t *cam) -{ - return esp_intr_alloc(ETS_I2S0_INTR_SOURCE, ESP_INTR_FLAG_LOWMED | ESP_INTR_FLAG_IRAM, ll_cam_dma_isr, cam, &cam->cam_intr_handle); -} - -void ll_cam_do_vsync(cam_obj_t *cam) -{ -} - -uint8_t ll_cam_get_dma_align(cam_obj_t *cam) -{ - return 0; -} - -static bool ll_cam_calc_rgb_dma(cam_obj_t *cam){ - size_t dma_half_buffer_max = CONFIG_CAMERA_DMA_BUFFER_SIZE_MAX / 2 / cam->dma_bytes_per_item; - size_t dma_buffer_max = 2 * dma_half_buffer_max; - size_t node_max = LCD_CAM_DMA_NODE_BUFFER_MAX_SIZE / cam->dma_bytes_per_item; - - size_t line_width = cam->width * cam->in_bytes_per_pixel; - size_t image_size = cam->height * line_width; - if (image_size > (4 * 1024 * 1024) || (line_width > dma_half_buffer_max)) { - ESP_LOGE(TAG, "Resolution too high"); - return 0; - } - - size_t node_size = node_max; - size_t nodes_per_line = 1; - size_t lines_per_node = 1; - size_t lines_per_half_buffer = 1; - size_t dma_half_buffer_min = node_max; - size_t dma_half_buffer = dma_half_buffer_max; - size_t dma_buffer_size = dma_buffer_max; - - // Calculate DMA Node Size so that it's divisable by or divisor of the line width - if(line_width >= node_max){ - // One or more nodes will be requied for one line - for(size_t i = node_max; i > 0; i=i-1){ - if ((line_width % i) == 0) { - node_size = i; - nodes_per_line = line_width / node_size; - break; - } - } - } else { - // One or more lines can fit into one node - for(size_t i = node_max; i > 0; i=i-1){ - if ((i % line_width) == 0) { - node_size = i; - lines_per_node = node_size / line_width; - while((cam->height % lines_per_node) != 0){ - lines_per_node = lines_per_node - 1; - node_size = lines_per_node * line_width; - } - break; - } - } - } - // Calculate minimum EOF size = max(mode_size, line_size) - dma_half_buffer_min = node_size * nodes_per_line; - // Calculate max EOF size divisable by node size - dma_half_buffer = (dma_half_buffer_max / dma_half_buffer_min) * dma_half_buffer_min; - // Adjust EOF size so that height will be divisable by the number of lines in each EOF - lines_per_half_buffer = dma_half_buffer / line_width; - while((cam->height % lines_per_half_buffer) != 0){ - dma_half_buffer = dma_half_buffer - dma_half_buffer_min; - lines_per_half_buffer = dma_half_buffer / line_width; - } - // Calculate DMA size - dma_buffer_size =(dma_buffer_max / dma_half_buffer) * dma_half_buffer; - - ESP_LOGI(TAG, "node_size: %4u, nodes_per_line: %u, lines_per_node: %u, dma_half_buffer_min: %5u, dma_half_buffer: %5u, lines_per_half_buffer: %2u, dma_buffer_size: %5u, image_size: %u", - node_size * cam->dma_bytes_per_item, nodes_per_line, lines_per_node, dma_half_buffer_min * cam->dma_bytes_per_item, dma_half_buffer * cam->dma_bytes_per_item, lines_per_half_buffer, dma_buffer_size * cam->dma_bytes_per_item, image_size); - - cam->dma_buffer_size = dma_buffer_size * cam->dma_bytes_per_item; - cam->dma_half_buffer_size = dma_half_buffer * cam->dma_bytes_per_item; - cam->dma_node_buffer_size = node_size * cam->dma_bytes_per_item; - cam->dma_half_buffer_cnt = cam->dma_buffer_size / cam->dma_half_buffer_size; - return 1; -} - -bool ll_cam_dma_sizes(cam_obj_t *cam) -{ - cam->dma_bytes_per_item = ll_cam_bytes_per_sample(sampling_mode); - if (cam->jpeg_mode) { - cam->dma_half_buffer_cnt = 8; - cam->dma_node_buffer_size = 2048; - cam->dma_half_buffer_size = cam->dma_node_buffer_size * 2; - cam->dma_buffer_size = cam->dma_half_buffer_cnt * cam->dma_half_buffer_size; - } else { - return ll_cam_calc_rgb_dma(cam); - } - return 1; -} - -static dma_filter_t dma_filter = ll_cam_dma_filter_jpeg; - -size_t IRAM_ATTR ll_cam_memcpy(cam_obj_t *cam, uint8_t *out, const uint8_t *in, size_t len) -{ - //DBG_PIN_SET(1); - size_t r = dma_filter(out, in, len); - //DBG_PIN_SET(0); - return r; -} - -esp_err_t ll_cam_set_sample_mode(cam_obj_t *cam, pixformat_t pix_format, uint32_t xclk_freq_hz, uint16_t sensor_pid) -{ - if (pix_format == PIXFORMAT_GRAYSCALE) { - if (sensor_pid == OV3660_PID || sensor_pid == OV5640_PID || sensor_pid == NT99141_PID) { - if (xclk_freq_hz > 10000000) { - sampling_mode = SM_0A00_0B00; - dma_filter = ll_cam_dma_filter_yuyv_highspeed; - } else { - sampling_mode = SM_0A0B_0C0D; - dma_filter = ll_cam_dma_filter_yuyv; - } - cam->in_bytes_per_pixel = 1; // camera sends Y8 - } else { - if (xclk_freq_hz > 10000000 && sensor_pid != OV7725_PID) { - sampling_mode = SM_0A00_0B00; - dma_filter = ll_cam_dma_filter_grayscale_highspeed; - } else { - sampling_mode = SM_0A0B_0C0D; - dma_filter = ll_cam_dma_filter_grayscale; - } - cam->in_bytes_per_pixel = 2; // camera sends YU/YV - } - cam->fb_bytes_per_pixel = 1; // frame buffer stores Y8 - } else if (pix_format == PIXFORMAT_YUV422 || pix_format == PIXFORMAT_RGB565) { - if (xclk_freq_hz > 10000000 && sensor_pid != OV7725_PID) { - if (sensor_pid == OV7670_PID) { - sampling_mode = SM_0A0B_0B0C; - } else { - sampling_mode = SM_0A00_0B00; - } - dma_filter = ll_cam_dma_filter_yuyv_highspeed; - } else { - sampling_mode = SM_0A0B_0C0D; - dma_filter = ll_cam_dma_filter_yuyv; - } - cam->in_bytes_per_pixel = 2; // camera sends YU/YV - cam->fb_bytes_per_pixel = 2; // frame buffer stores YU/YV/RGB565 - } else if (pix_format == PIXFORMAT_JPEG) { - cam->in_bytes_per_pixel = 1; - cam->fb_bytes_per_pixel = 1; - dma_filter = ll_cam_dma_filter_jpeg; - sampling_mode = SM_0A00_0B00; - } else { - ESP_LOGE(TAG, "Requested format is not supported"); - return ESP_ERR_NOT_SUPPORTED; - } - I2S0.fifo_conf.rx_fifo_mod = sampling_mode; - return ESP_OK; -} diff --git a/lib/libesp32_div/esp32-camera/target/esp32s2/ll_cam.c b/lib/libesp32_div/esp32-camera/target/esp32s2/ll_cam.c deleted file mode 100644 index d3cb5353b..000000000 --- a/lib/libesp32_div/esp32-camera/target/esp32s2/ll_cam.c +++ /dev/null @@ -1,402 +0,0 @@ -// Copyright 2010-2020 Espressif Systems (Shanghai) PTE LTD -// -// 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. - -#include -#include -#include "soc/system_reg.h" -#include "soc/i2s_struct.h" -#include "hal/gpio_ll.h" -#include "ll_cam.h" -#include "xclk.h" -#include "cam_hal.h" - -static const char *TAG = "s2 ll_cam"; - -#define I2S_ISR_ENABLE(i) {I2S0.int_clr.i = 1;I2S0.int_ena.i = 1;} -#define I2S_ISR_DISABLE(i) {I2S0.int_ena.i = 0;I2S0.int_clr.i = 1;} - -static void IRAM_ATTR ll_cam_vsync_isr(void *arg) -{ - //DBG_PIN_SET(1); - cam_obj_t *cam = (cam_obj_t *)arg; - BaseType_t HPTaskAwoken = pdFALSE; - // filter - ets_delay_us(1); - if (gpio_ll_get_level(&GPIO, cam->vsync_pin) == !cam->vsync_invert) { - ll_cam_send_event(cam, CAM_VSYNC_EVENT, &HPTaskAwoken); - } - - if (HPTaskAwoken == pdTRUE) { - portYIELD_FROM_ISR(); - } - //DBG_PIN_SET(0); -} - -static void IRAM_ATTR ll_cam_dma_isr(void *arg) -{ - cam_obj_t *cam = (cam_obj_t *)arg; - BaseType_t HPTaskAwoken = pdFALSE; - - typeof(I2S0.int_st) status = I2S0.int_st; - if (status.val == 0) { - return; - } - - I2S0.int_clr.val = status.val; - - if (status.in_suc_eof) { - ll_cam_send_event(cam, CAM_IN_SUC_EOF_EVENT, &HPTaskAwoken); - } - - if (HPTaskAwoken == pdTRUE) { - portYIELD_FROM_ISR(); - } -} - -bool ll_cam_stop(cam_obj_t *cam) -{ - I2S0.conf.rx_start = 0; - - if (cam->jpeg_mode || !cam->psram_mode) { - I2S_ISR_DISABLE(in_suc_eof); - } - - I2S0.in_link.stop = 1; - return true; -} - -esp_err_t ll_cam_deinit(cam_obj_t *cam) -{ - gpio_isr_handler_remove(cam->vsync_pin); - - if (cam->cam_intr_handle) { - esp_intr_free(cam->cam_intr_handle); - cam->cam_intr_handle = NULL; - } - - return ESP_OK; -} - -bool ll_cam_start(cam_obj_t *cam, int frame_pos) -{ - I2S0.conf.rx_start = 0; - - if (cam->jpeg_mode || !cam->psram_mode) { - I2S_ISR_ENABLE(in_suc_eof); - } - - I2S0.conf.rx_reset = 1; - I2S0.conf.rx_reset = 0; - I2S0.conf.rx_fifo_reset = 1; - I2S0.conf.rx_fifo_reset = 0; - I2S0.lc_conf.in_rst = 1; - I2S0.lc_conf.in_rst = 0; - I2S0.lc_conf.ahbm_fifo_rst = 1; - I2S0.lc_conf.ahbm_fifo_rst = 0; - I2S0.lc_conf.ahbm_rst = 1; - I2S0.lc_conf.ahbm_rst = 0; - - I2S0.rx_eof_num = cam->dma_half_buffer_size; // Ping pong operation - if (!cam->psram_mode) { - I2S0.in_link.addr = ((uint32_t)&cam->dma[0]) & 0xfffff; - } else { - I2S0.in_link.addr = ((uint32_t)&cam->frames[frame_pos].dma[0]) & 0xfffff; - } - - I2S0.in_link.start = 1; - I2S0.conf.rx_start = 1; - return true; -} - -esp_err_t ll_cam_config(cam_obj_t *cam, const camera_config_t *config) -{ - esp_err_t err = camera_enable_out_clock(config); - if(err != ESP_OK) { - return err; - } - periph_module_enable(PERIPH_I2S0_MODULE); - // Configure the clock - I2S0.clkm_conf.clkm_div_num = 2; // 160MHz / 2 = 80MHz - I2S0.clkm_conf.clkm_div_b = 0; - I2S0.clkm_conf.clkm_div_a = 0; - I2S0.clkm_conf.clk_sel = 2; - I2S0.clkm_conf.clk_en = 1; - - - I2S0.conf.val = 0; - I2S0.fifo_conf.val = 0; - I2S0.fifo_conf.dscr_en = 1; - - I2S0.lc_conf.ahbm_fifo_rst = 1; - I2S0.lc_conf.ahbm_fifo_rst = 0; - I2S0.lc_conf.ahbm_rst = 1; - I2S0.lc_conf.ahbm_rst = 0; - I2S0.lc_conf.check_owner = 0; - //I2S0.lc_conf.indscr_burst_en = 1; - //I2S0.lc_conf.ext_mem_bk_size = 0; // DMA access external memory block size. 0: 16 bytes, 1: 32 bytes, 2:64 bytes, 3:reserved - - I2S0.timing.val = 0; - - I2S0.int_ena.val = 0; - I2S0.int_clr.val = ~0; - - I2S0.conf2.lcd_en = 1; - I2S0.conf2.camera_en = 1; - - // Configuration data format - I2S0.conf.rx_slave_mod = 1; - I2S0.conf.rx_right_first = 0; - I2S0.conf.rx_msb_right = cam->swap_data; - I2S0.conf.rx_short_sync = 0; - I2S0.conf.rx_mono = 0; - I2S0.conf.rx_msb_shift = 0; - I2S0.conf.rx_dma_equal = 1; - - // Configure sampling rate - I2S0.sample_rate_conf.rx_bck_div_num = 1; - I2S0.sample_rate_conf.rx_bits_mod = 8; - - I2S0.conf1.rx_pcm_bypass = 1; - - I2S0.conf2.i_v_sync_filter_en = 1; - I2S0.conf2.i_v_sync_filter_thres = 4; - I2S0.conf2.cam_sync_fifo_reset = 1; - I2S0.conf2.cam_sync_fifo_reset = 0; - - I2S0.conf_chan.rx_chan_mod = 1; - - I2S0.fifo_conf.rx_fifo_mod_force_en = 1; - I2S0.fifo_conf.rx_data_num = 32; - I2S0.fifo_conf.rx_fifo_mod = 2; - - I2S0.lc_conf.in_rst = 1; - I2S0.lc_conf.in_rst = 0; - - I2S0.conf.rx_start = 1; - - return ESP_OK; -} - -void ll_cam_vsync_intr_enable(cam_obj_t *cam, bool en) -{ - if (en) { - gpio_intr_enable(cam->vsync_pin); - } else { - gpio_intr_disable(cam->vsync_pin); - } -} - -esp_err_t ll_cam_set_pin(cam_obj_t *cam, const camera_config_t *config) -{ - gpio_config_t io_conf = {0}; - io_conf.intr_type = cam->vsync_invert ? GPIO_PIN_INTR_NEGEDGE : GPIO_PIN_INTR_POSEDGE; - io_conf.pin_bit_mask = 1ULL << config->pin_vsync; - io_conf.mode = GPIO_MODE_INPUT; - io_conf.pull_up_en = 1; - io_conf.pull_down_en = 0; - gpio_config(&io_conf); - gpio_install_isr_service(ESP_INTR_FLAG_LOWMED | ESP_INTR_FLAG_IRAM); - gpio_isr_handler_add(config->pin_vsync, ll_cam_vsync_isr, cam); - gpio_intr_disable(config->pin_vsync); - - PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[config->pin_pclk], PIN_FUNC_GPIO); - gpio_set_direction(config->pin_pclk, GPIO_MODE_INPUT); - gpio_set_pull_mode(config->pin_pclk, GPIO_FLOATING); - gpio_matrix_in(config->pin_pclk, I2S0I_WS_IN_IDX, false); - - PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[config->pin_vsync], PIN_FUNC_GPIO); - gpio_set_direction(config->pin_vsync, GPIO_MODE_INPUT); - gpio_set_pull_mode(config->pin_vsync, GPIO_FLOATING); - gpio_matrix_in(config->pin_vsync, I2S0I_V_SYNC_IDX, cam->vsync_invert); - - PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[config->pin_href], PIN_FUNC_GPIO); - gpio_set_direction(config->pin_href, GPIO_MODE_INPUT); - gpio_set_pull_mode(config->pin_href, GPIO_FLOATING); - gpio_matrix_in(config->pin_href, I2S0I_H_SYNC_IDX, false); - - int data_pins[8] = { - config->pin_d0, config->pin_d1, config->pin_d2, config->pin_d3, config->pin_d4, config->pin_d5, config->pin_d6, config->pin_d7, - }; - for (int i = 0; i < 8; i++) { - PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[data_pins[i]], PIN_FUNC_GPIO); - gpio_set_direction(data_pins[i], GPIO_MODE_INPUT); - gpio_set_pull_mode(data_pins[i], GPIO_FLOATING); - // High bit alignment, IN16 is always the highest bit - // fifo accesses data by bit, when rx_bits_mod is 8, the data needs to be aligned by 8 bits - gpio_matrix_in(data_pins[i], I2S0I_DATA_IN0_IDX + 8 + i, false); - } - - gpio_matrix_in(0x38, I2S0I_H_ENABLE_IDX, false); - - return ESP_OK; -} - -esp_err_t ll_cam_init_isr(cam_obj_t *cam) -{ - return esp_intr_alloc(ETS_I2S0_INTR_SOURCE, ESP_INTR_FLAG_LOWMED | ESP_INTR_FLAG_IRAM, ll_cam_dma_isr, cam, &cam->cam_intr_handle); -} - -void ll_cam_do_vsync(cam_obj_t *cam) -{ - ll_cam_vsync_intr_enable(cam, false); - gpio_matrix_in(cam->vsync_pin, I2S0I_V_SYNC_IDX, !cam->vsync_invert); - ets_delay_us(10); - gpio_matrix_in(cam->vsync_pin, I2S0I_V_SYNC_IDX, cam->vsync_invert); - ll_cam_vsync_intr_enable(cam, true); -} - -uint8_t ll_cam_get_dma_align(cam_obj_t *cam) -{ - return 64;//16 << I2S0.lc_conf.ext_mem_bk_size; -} - -static bool ll_cam_calc_rgb_dma(cam_obj_t *cam){ - size_t node_max = LCD_CAM_DMA_NODE_BUFFER_MAX_SIZE / cam->dma_bytes_per_item; - size_t line_width = cam->width * cam->in_bytes_per_pixel; - size_t node_size = node_max; - size_t nodes_per_line = 1; - size_t lines_per_node = 1; - - // Calculate DMA Node Size so that it's divisable by or divisor of the line width - if(line_width >= node_max){ - // One or more nodes will be requied for one line - for(size_t i = node_max; i > 0; i=i-1){ - if ((line_width % i) == 0) { - node_size = i; - nodes_per_line = line_width / node_size; - break; - } - } - } else { - // One or more lines can fit into one node - for(size_t i = node_max; i > 0; i=i-1){ - if ((i % line_width) == 0) { - node_size = i; - lines_per_node = node_size / line_width; - while((cam->height % lines_per_node) != 0){ - lines_per_node = lines_per_node - 1; - node_size = lines_per_node * line_width; - } - break; - } - } - } - - ESP_LOGI(TAG, "node_size: %4u, nodes_per_line: %u, lines_per_node: %u", - node_size * cam->dma_bytes_per_item, nodes_per_line, lines_per_node); - - cam->dma_node_buffer_size = node_size * cam->dma_bytes_per_item; - - if (cam->psram_mode) { - cam->dma_buffer_size = cam->recv_size * cam->dma_bytes_per_item; - cam->dma_half_buffer_cnt = 2; - cam->dma_half_buffer_size = cam->dma_buffer_size / cam->dma_half_buffer_cnt; - } else { - size_t dma_half_buffer_max = CONFIG_CAMERA_DMA_BUFFER_SIZE_MAX / 2 / cam->dma_bytes_per_item; - if (line_width > dma_half_buffer_max) { - ESP_LOGE(TAG, "Resolution too high"); - return 0; - } - - // Calculate minimum EOF size = max(mode_size, line_size) - size_t dma_half_buffer_min = node_size * nodes_per_line; - - // Calculate max EOF size divisable by node size - size_t dma_half_buffer = (dma_half_buffer_max / dma_half_buffer_min) * dma_half_buffer_min; - - // Adjust EOF size so that height will be divisable by the number of lines in each EOF - size_t lines_per_half_buffer = dma_half_buffer / line_width; - while((cam->height % lines_per_half_buffer) != 0){ - dma_half_buffer = dma_half_buffer - dma_half_buffer_min; - lines_per_half_buffer = dma_half_buffer / line_width; - } - - // Calculate DMA size - size_t dma_buffer_max = 2 * dma_half_buffer_max; - size_t dma_buffer_size = dma_buffer_max; - dma_buffer_size =(dma_buffer_max / dma_half_buffer) * dma_half_buffer; - - ESP_LOGI(TAG, "dma_half_buffer_min: %5u, dma_half_buffer: %5u, lines_per_half_buffer: %2u, dma_buffer_size: %5u", - dma_half_buffer_min * cam->dma_bytes_per_item, dma_half_buffer * cam->dma_bytes_per_item, lines_per_half_buffer, dma_buffer_size * cam->dma_bytes_per_item); - - cam->dma_buffer_size = dma_buffer_size * cam->dma_bytes_per_item; - cam->dma_half_buffer_size = dma_half_buffer * cam->dma_bytes_per_item; - cam->dma_half_buffer_cnt = cam->dma_buffer_size / cam->dma_half_buffer_size; - } - return 1; -} - -bool ll_cam_dma_sizes(cam_obj_t *cam) -{ - cam->dma_bytes_per_item = 1; - if (cam->jpeg_mode) { - if (cam->psram_mode) { - cam->dma_buffer_size = cam->recv_size; - cam->dma_half_buffer_size = 1024; - cam->dma_half_buffer_cnt = cam->dma_buffer_size / cam->dma_half_buffer_size; - cam->dma_node_buffer_size = cam->dma_half_buffer_size; - } else { - cam->dma_half_buffer_cnt = 16; - cam->dma_buffer_size = cam->dma_half_buffer_cnt * 1024; - cam->dma_half_buffer_size = cam->dma_buffer_size / cam->dma_half_buffer_cnt; - cam->dma_node_buffer_size = cam->dma_half_buffer_size; - } - } else { - return ll_cam_calc_rgb_dma(cam); - } - return 1; -} - -size_t IRAM_ATTR ll_cam_memcpy(cam_obj_t *cam, uint8_t *out, const uint8_t *in, size_t len) -{ - // YUV to Grayscale - if (cam->in_bytes_per_pixel == 2 && cam->fb_bytes_per_pixel == 1) { - size_t end = len / 8; - for (size_t i = 0; i < end; ++i) { - out[0] = in[0]; - out[1] = in[2]; - out[2] = in[4]; - out[3] = in[6]; - out += 4; - in += 8; - } - return len / 2; - } - - // just memcpy - memcpy(out, in, len); - return len; -} - -esp_err_t ll_cam_set_sample_mode(cam_obj_t *cam, pixformat_t pix_format, uint32_t xclk_freq_hz, uint16_t sensor_pid) -{ - if (pix_format == PIXFORMAT_GRAYSCALE) { - if (sensor_pid == OV3660_PID || sensor_pid == OV5640_PID || sensor_pid == NT99141_PID) { - cam->in_bytes_per_pixel = 1; // camera sends Y8 - } else { - cam->in_bytes_per_pixel = 2; // camera sends YU/YV - } - cam->fb_bytes_per_pixel = 1; // frame buffer stores Y8 - } else if (pix_format == PIXFORMAT_YUV422 || pix_format == PIXFORMAT_RGB565) { - cam->in_bytes_per_pixel = 2; // camera sends YU/YV - cam->fb_bytes_per_pixel = 2; // frame buffer stores YU/YV/RGB565 - } else if (pix_format == PIXFORMAT_JPEG) { - cam->in_bytes_per_pixel = 1; - cam->fb_bytes_per_pixel = 1; - } else { - ESP_LOGE(TAG, "Requested format is not supported"); - return ESP_ERR_NOT_SUPPORTED; - } - return ESP_OK; -} diff --git a/lib/libesp32_div/esp32-camera/target/esp32s2/private_include/tjpgd.h b/lib/libesp32_div/esp32-camera/target/esp32s2/private_include/tjpgd.h deleted file mode 100644 index 31fbc97cc..000000000 --- a/lib/libesp32_div/esp32-camera/target/esp32s2/private_include/tjpgd.h +++ /dev/null @@ -1,99 +0,0 @@ -/*----------------------------------------------------------------------------/ -/ TJpgDec - Tiny JPEG Decompressor include file (C)ChaN, 2012 -/----------------------------------------------------------------------------*/ -#ifndef _TJPGDEC -#define _TJPGDEC -/*---------------------------------------------------------------------------*/ -/* System Configurations */ - -#define JD_SZBUF 512 /* Size of stream input buffer */ -#define JD_FORMAT 0 /* Output pixel format 0:RGB888 (3 BYTE/pix), 1:RGB565 (1 WORD/pix) */ -#define JD_USE_SCALE 1 /* Use descaling feature for output */ -#define JD_TBLCLIP 1 /* Use table for saturation (might be a bit faster but increases 1K bytes of code size) */ - -/*---------------------------------------------------------------------------*/ - -#ifdef __cplusplus -extern "C" { -#endif - -/* These types must be 16-bit, 32-bit or larger integer */ -typedef int INT; -typedef unsigned int UINT; - -/* These types must be 8-bit integer */ -typedef char CHAR; -typedef unsigned char UCHAR; -typedef unsigned char BYTE; - -/* These types must be 16-bit integer */ -typedef short SHORT; -typedef unsigned short USHORT; -typedef unsigned short WORD; -typedef unsigned short WCHAR; - -/* These types must be 32-bit integer */ -typedef long LONG; -typedef unsigned long ULONG; -typedef unsigned long DWORD; - - -/* Error code */ -typedef enum { - JDR_OK = 0, /* 0: Succeeded */ - JDR_INTR, /* 1: Interrupted by output function */ - JDR_INP, /* 2: Device error or wrong termination of input stream */ - JDR_MEM1, /* 3: Insufficient memory pool for the image */ - JDR_MEM2, /* 4: Insufficient stream input buffer */ - JDR_PAR, /* 5: Parameter error */ - JDR_FMT1, /* 6: Data format error (may be damaged data) */ - JDR_FMT2, /* 7: Right format but not supported */ - JDR_FMT3 /* 8: Not supported JPEG standard */ -} JRESULT; - - - -/* Rectangular structure */ -typedef struct { - WORD left, right, top, bottom; -} JRECT; - - - -/* Decompressor object structure */ -typedef struct JDEC JDEC; -struct JDEC { - UINT dctr; /* Number of bytes available in the input buffer */ - BYTE* dptr; /* Current data read ptr */ - BYTE* inbuf; /* Bit stream input buffer */ - BYTE dmsk; /* Current bit in the current read byte */ - BYTE scale; /* Output scaling ratio */ - BYTE msx, msy; /* MCU size in unit of block (width, height) */ - BYTE qtid[3]; /* Quantization table ID of each component */ - SHORT dcv[3]; /* Previous DC element of each component */ - WORD nrst; /* Restart inverval */ - UINT width, height; /* Size of the input image (pixel) */ - BYTE* huffbits[2][2]; /* Huffman bit distribution tables [id][dcac] */ - WORD* huffcode[2][2]; /* Huffman code word tables [id][dcac] */ - BYTE* huffdata[2][2]; /* Huffman decoded data tables [id][dcac] */ - LONG* qttbl[4]; /* Dequaitizer tables [id] */ - void* workbuf; /* Working buffer for IDCT and RGB output */ - BYTE* mcubuf; /* Working buffer for the MCU */ - void* pool; /* Pointer to available memory pool */ - UINT sz_pool; /* Size of momory pool (bytes available) */ - UINT (*infunc)(JDEC*, BYTE*, UINT);/* Pointer to jpeg stream input function */ - void* device; /* Pointer to I/O device identifiler for the session */ -}; - - - -/* TJpgDec API functions */ -JRESULT jd_prepare (JDEC*, UINT(*)(JDEC*,BYTE*,UINT), void*, UINT, void*); -JRESULT jd_decomp (JDEC*, UINT(*)(JDEC*,void*,JRECT*), BYTE); - - -#ifdef __cplusplus -} -#endif - -#endif /* _TJPGDEC */ diff --git a/lib/libesp32_div/esp32-camera/target/esp32s2/tjpgd.c b/lib/libesp32_div/esp32-camera/target/esp32s2/tjpgd.c deleted file mode 100644 index 5a983c4c7..000000000 --- a/lib/libesp32_div/esp32-camera/target/esp32s2/tjpgd.c +++ /dev/null @@ -1,970 +0,0 @@ -/*----------------------------------------------------------------------------/ -/ TJpgDec - Tiny JPEG Decompressor R0.01b (C)ChaN, 2012 -/-----------------------------------------------------------------------------/ -/ The TJpgDec is a generic JPEG decompressor module for tiny embedded systems. -/ This is a free software that opened for education, research and commercial -/ developments under license policy of following terms. -/ -/ Copyright (C) 2012, ChaN, all right reserved. -/ -/ * The TJpgDec module is a free software and there is NO WARRANTY. -/ * No restriction on use. You can use, modify and redistribute it for -/ personal, non-profit or commercial products UNDER YOUR RESPONSIBILITY. -/ * Redistributions of source code must retain the above copyright notice. -/ -/-----------------------------------------------------------------------------/ -/ Oct 04,'11 R0.01 First release. -/ Feb 19,'12 R0.01a Fixed decompression fails when scan starts with an escape seq. -/ Sep 03,'12 R0.01b Added JD_TBLCLIP option. -/----------------------------------------------------------------------------*/ - -#include "tjpgd.h" - -#define SUPPORT_JPEG 1 - -#ifdef SUPPORT_JPEG -/*-----------------------------------------------*/ -/* Zigzag-order to raster-order conversion table */ -/*-----------------------------------------------*/ - -#define ZIG(n) Zig[n] - -static -const BYTE Zig[64] = { /* Zigzag-order to raster-order conversion table */ - 0, 1, 8, 16, 9, 2, 3, 10, 17, 24, 32, 25, 18, 11, 4, 5, - 12, 19, 26, 33, 40, 48, 41, 34, 27, 20, 13, 6, 7, 14, 21, 28, - 35, 42, 49, 56, 57, 50, 43, 36, 29, 22, 15, 23, 30, 37, 44, 51, - 58, 59, 52, 45, 38, 31, 39, 46, 53, 60, 61, 54, 47, 55, 62, 63 -}; - - - -/*-------------------------------------------------*/ -/* Input scale factor of Arai algorithm */ -/* (scaled up 16 bits for fixed point operations) */ -/*-------------------------------------------------*/ - -#define IPSF(n) Ipsf[n] - -static -const WORD Ipsf[64] = { /* See also aa_idct.png */ - (WORD)(1.00000*8192), (WORD)(1.38704*8192), (WORD)(1.30656*8192), (WORD)(1.17588*8192), (WORD)(1.00000*8192), (WORD)(0.78570*8192), (WORD)(0.54120*8192), (WORD)(0.27590*8192), - (WORD)(1.38704*8192), (WORD)(1.92388*8192), (WORD)(1.81226*8192), (WORD)(1.63099*8192), (WORD)(1.38704*8192), (WORD)(1.08979*8192), (WORD)(0.75066*8192), (WORD)(0.38268*8192), - (WORD)(1.30656*8192), (WORD)(1.81226*8192), (WORD)(1.70711*8192), (WORD)(1.53636*8192), (WORD)(1.30656*8192), (WORD)(1.02656*8192), (WORD)(0.70711*8192), (WORD)(0.36048*8192), - (WORD)(1.17588*8192), (WORD)(1.63099*8192), (WORD)(1.53636*8192), (WORD)(1.38268*8192), (WORD)(1.17588*8192), (WORD)(0.92388*8192), (WORD)(0.63638*8192), (WORD)(0.32442*8192), - (WORD)(1.00000*8192), (WORD)(1.38704*8192), (WORD)(1.30656*8192), (WORD)(1.17588*8192), (WORD)(1.00000*8192), (WORD)(0.78570*8192), (WORD)(0.54120*8192), (WORD)(0.27590*8192), - (WORD)(0.78570*8192), (WORD)(1.08979*8192), (WORD)(1.02656*8192), (WORD)(0.92388*8192), (WORD)(0.78570*8192), (WORD)(0.61732*8192), (WORD)(0.42522*8192), (WORD)(0.21677*8192), - (WORD)(0.54120*8192), (WORD)(0.75066*8192), (WORD)(0.70711*8192), (WORD)(0.63638*8192), (WORD)(0.54120*8192), (WORD)(0.42522*8192), (WORD)(0.29290*8192), (WORD)(0.14932*8192), - (WORD)(0.27590*8192), (WORD)(0.38268*8192), (WORD)(0.36048*8192), (WORD)(0.32442*8192), (WORD)(0.27590*8192), (WORD)(0.21678*8192), (WORD)(0.14932*8192), (WORD)(0.07612*8192) -}; - - - -/*---------------------------------------------*/ -/* Conversion table for fast clipping process */ -/*---------------------------------------------*/ - -#if JD_TBLCLIP - -#define BYTECLIP(v) Clip8[(UINT)(v) & 0x3FF] - -static -const BYTE Clip8[1024] = { - /* 0..255 */ - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, - 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, - 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, - 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, - 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, - 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, - /* 256..511 */ - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - /* -512..-257 */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - /* -256..-1 */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -}; - -#else /* JD_TBLCLIP */ - -inline -BYTE BYTECLIP ( - INT val -) -{ - if (val < 0) val = 0; - if (val > 255) val = 255; - - return (BYTE)val; -} - -#endif - - - -/*-----------------------------------------------------------------------*/ -/* Allocate a memory block from memory pool */ -/*-----------------------------------------------------------------------*/ - -static -void* alloc_pool ( /* Pointer to allocated memory block (NULL:no memory available) */ - JDEC* jd, /* Pointer to the decompressor object */ - UINT nd /* Number of bytes to allocate */ -) -{ - char *rp = 0; - - - nd = (nd + 3) & ~3; /* Align block size to the word boundary */ - - if (jd->sz_pool >= nd) { - jd->sz_pool -= nd; - rp = (char*)jd->pool; /* Get start of available memory pool */ - jd->pool = (void*)(rp + nd); /* Allocate requierd bytes */ - } - - return (void*)rp; /* Return allocated memory block (NULL:no memory to allocate) */ -} - - - - -/*-----------------------------------------------------------------------*/ -/* Create de-quantization and prescaling tables with a DQT segment */ -/*-----------------------------------------------------------------------*/ - -static -UINT create_qt_tbl ( /* 0:OK, !0:Failed */ - JDEC* jd, /* Pointer to the decompressor object */ - const BYTE* data, /* Pointer to the quantizer tables */ - UINT ndata /* Size of input data */ -) -{ - UINT i; - BYTE d, z; - LONG *pb; - - - while (ndata) { /* Process all tables in the segment */ - if (ndata < 65) return JDR_FMT1; /* Err: table size is unaligned */ - ndata -= 65; - d = *data++; /* Get table property */ - if (d & 0xF0) return JDR_FMT1; /* Err: not 8-bit resolution */ - i = d & 3; /* Get table ID */ - pb = alloc_pool(jd, 64 * sizeof (LONG));/* Allocate a memory block for the table */ - if (!pb) return JDR_MEM1; /* Err: not enough memory */ - jd->qttbl[i] = pb; /* Register the table */ - for (i = 0; i < 64; i++) { /* Load the table */ - z = ZIG(i); /* Zigzag-order to raster-order conversion */ - pb[z] = (LONG)((DWORD)*data++ * IPSF(z)); /* Apply scale factor of Arai algorithm to the de-quantizers */ - } - } - - return JDR_OK; -} - - - - -/*-----------------------------------------------------------------------*/ -/* Create huffman code tables with a DHT segment */ -/*-----------------------------------------------------------------------*/ - -static -UINT create_huffman_tbl ( /* 0:OK, !0:Failed */ - JDEC* jd, /* Pointer to the decompressor object */ - const BYTE* data, /* Pointer to the packed huffman tables */ - UINT ndata /* Size of input data */ -) -{ - UINT i, j, b, np, cls, num; - BYTE d, *pb, *pd; - WORD hc, *ph; - - - while (ndata) { /* Process all tables in the segment */ - if (ndata < 17) return JDR_FMT1; /* Err: wrong data size */ - ndata -= 17; - d = *data++; /* Get table number and class */ - cls = (d >> 4); num = d & 0x0F; /* class = dc(0)/ac(1), table number = 0/1 */ - if (d & 0xEE) return JDR_FMT1; /* Err: invalid class/number */ - pb = alloc_pool(jd, 16); /* Allocate a memory block for the bit distribution table */ - if (!pb) return JDR_MEM1; /* Err: not enough memory */ - jd->huffbits[num][cls] = pb; - for (np = i = 0; i < 16; i++) { /* Load number of patterns for 1 to 16-bit code */ - pb[i] = b = *data++; - np += b; /* Get sum of code words for each code */ - } - - ph = alloc_pool(jd, np * sizeof (WORD));/* Allocate a memory block for the code word table */ - if (!ph) return JDR_MEM1; /* Err: not enough memory */ - jd->huffcode[num][cls] = ph; - hc = 0; - for (j = i = 0; i < 16; i++) { /* Re-build huffman code word table */ - b = pb[i]; - while (b--) ph[j++] = hc++; - hc <<= 1; - } - - if (ndata < np) return JDR_FMT1; /* Err: wrong data size */ - ndata -= np; - pd = alloc_pool(jd, np); /* Allocate a memory block for the decoded data */ - if (!pd) return JDR_MEM1; /* Err: not enough memory */ - jd->huffdata[num][cls] = pd; - for (i = 0; i < np; i++) { /* Load decoded data corresponds to each code ward */ - d = *data++; - if (!cls && d > 11) return JDR_FMT1; - *pd++ = d; - } - } - - return JDR_OK; -} - - - - -/*-----------------------------------------------------------------------*/ -/* Extract N bits from input stream */ -/*-----------------------------------------------------------------------*/ - -static -INT bitext ( /* >=0: extracted data, <0: error code */ - JDEC* jd, /* Pointer to the decompressor object */ - UINT nbit /* Number of bits to extract (1 to 11) */ -) -{ - BYTE msk, s, *dp; - UINT dc, v, f; - - - msk = jd->dmsk; dc = jd->dctr; dp = jd->dptr; /* Bit mask, number of data available, read ptr */ - s = *dp; v = f = 0; - do { - if (!msk) { /* Next byte? */ - if (!dc) { /* No input data is available, re-fill input buffer */ - dp = jd->inbuf; /* Top of input buffer */ - dc = jd->infunc(jd, dp, JD_SZBUF); - if (!dc) return 0 - (INT)JDR_INP; /* Err: read error or wrong stream termination */ - } else { - dp++; /* Next data ptr */ - } - dc--; /* Decrement number of available bytes */ - if (f) { /* In flag sequence? */ - f = 0; /* Exit flag sequence */ - if (*dp != 0) return 0 - (INT)JDR_FMT1; /* Err: unexpected flag is detected (may be collapted data) */ - *dp = s = 0xFF; /* The flag is a data 0xFF */ - } else { - s = *dp; /* Get next data byte */ - if (s == 0xFF) { /* Is start of flag sequence? */ - f = 1; continue; /* Enter flag sequence */ - } - } - msk = 0x80; /* Read from MSB */ - } - v <<= 1; /* Get a bit */ - if (s & msk) v++; - msk >>= 1; - nbit--; - } while (nbit); - jd->dmsk = msk; jd->dctr = dc; jd->dptr = dp; - - return (INT)v; -} - - - - -/*-----------------------------------------------------------------------*/ -/* Extract a huffman decoded data from input stream */ -/*-----------------------------------------------------------------------*/ - -static -INT huffext ( /* >=0: decoded data, <0: error code */ - JDEC* jd, /* Pointer to the decompressor object */ - const BYTE* hbits, /* Pointer to the bit distribution table */ - const WORD* hcode, /* Pointer to the code word table */ - const BYTE* hdata /* Pointer to the data table */ -) -{ - BYTE msk, s, *dp; - UINT dc, v, f, bl, nd; - - - msk = jd->dmsk; dc = jd->dctr; dp = jd->dptr; /* Bit mask, number of data available, read ptr */ - s = *dp; v = f = 0; - bl = 16; /* Max code length */ - do { - if (!msk) { /* Next byte? */ - if (!dc) { /* No input data is available, re-fill input buffer */ - dp = jd->inbuf; /* Top of input buffer */ - dc = jd->infunc(jd, dp, JD_SZBUF); - if (!dc) return 0 - (INT)JDR_INP; /* Err: read error or wrong stream termination */ - } else { - dp++; /* Next data ptr */ - } - dc--; /* Decrement number of available bytes */ - if (f) { /* In flag sequence? */ - f = 0; /* Exit flag sequence */ - if (*dp != 0) - return 0 - (INT)JDR_FMT1; /* Err: unexpected flag is detected (may be collapted data) */ - *dp = s = 0xFF; /* The flag is a data 0xFF */ - } else { - s = *dp; /* Get next data byte */ - if (s == 0xFF) { /* Is start of flag sequence? */ - f = 1; continue; /* Enter flag sequence, get trailing byte */ - } - } - msk = 0x80; /* Read from MSB */ - } - v <<= 1; /* Get a bit */ - if (s & msk) v++; - msk >>= 1; - - for (nd = *hbits++; nd; nd--) { /* Search the code word in this bit length */ - if (v == *hcode++) { /* Matched? */ - jd->dmsk = msk; jd->dctr = dc; jd->dptr = dp; - return *hdata; /* Return the decoded data */ - } - hdata++; - } - bl--; - } while (bl); - - return 0 - (INT)JDR_FMT1; /* Err: code not found (may be collapted data) */ -} - - - - -/*-----------------------------------------------------------------------*/ -/* Apply Inverse-DCT in Arai Algorithm (see also aa_idct.png) */ -/*-----------------------------------------------------------------------*/ - -static -void block_idct ( - LONG* src, /* Input block data (de-quantized and pre-scaled for Arai Algorithm) */ - BYTE* dst /* Pointer to the destination to store the block as byte array */ -) -{ - const LONG M13 = (LONG)(1.41421*4096), M2 = (LONG)(1.08239*4096), M4 = (LONG)(2.61313*4096), M5 = (LONG)(1.84776*4096); - LONG v0, v1, v2, v3, v4, v5, v6, v7; - LONG t10, t11, t12, t13; - UINT i; - - /* Process columns */ - for (i = 0; i < 8; i++) { - v0 = src[8 * 0]; /* Get even elements */ - v1 = src[8 * 2]; - v2 = src[8 * 4]; - v3 = src[8 * 6]; - - t10 = v0 + v2; /* Process the even elements */ - t12 = v0 - v2; - t11 = (v1 - v3) * M13 >> 12; - v3 += v1; - t11 -= v3; - v0 = t10 + v3; - v3 = t10 - v3; - v1 = t11 + t12; - v2 = t12 - t11; - - v4 = src[8 * 7]; /* Get odd elements */ - v5 = src[8 * 1]; - v6 = src[8 * 5]; - v7 = src[8 * 3]; - - t10 = v5 - v4; /* Process the odd elements */ - t11 = v5 + v4; - t12 = v6 - v7; - v7 += v6; - v5 = (t11 - v7) * M13 >> 12; - v7 += t11; - t13 = (t10 + t12) * M5 >> 12; - v4 = t13 - (t10 * M2 >> 12); - v6 = t13 - (t12 * M4 >> 12) - v7; - v5 -= v6; - v4 -= v5; - - src[8 * 0] = v0 + v7; /* Write-back transformed values */ - src[8 * 7] = v0 - v7; - src[8 * 1] = v1 + v6; - src[8 * 6] = v1 - v6; - src[8 * 2] = v2 + v5; - src[8 * 5] = v2 - v5; - src[8 * 3] = v3 + v4; - src[8 * 4] = v3 - v4; - - src++; /* Next column */ - } - - /* Process rows */ - src -= 8; - for (i = 0; i < 8; i++) { - v0 = src[0] + (128L << 8); /* Get even elements (remove DC offset (-128) here) */ - v1 = src[2]; - v2 = src[4]; - v3 = src[6]; - - t10 = v0 + v2; /* Process the even elements */ - t12 = v0 - v2; - t11 = (v1 - v3) * M13 >> 12; - v3 += v1; - t11 -= v3; - v0 = t10 + v3; - v3 = t10 - v3; - v1 = t11 + t12; - v2 = t12 - t11; - - v4 = src[7]; /* Get odd elements */ - v5 = src[1]; - v6 = src[5]; - v7 = src[3]; - - t10 = v5 - v4; /* Process the odd elements */ - t11 = v5 + v4; - t12 = v6 - v7; - v7 += v6; - v5 = (t11 - v7) * M13 >> 12; - v7 += t11; - t13 = (t10 + t12) * M5 >> 12; - v4 = t13 - (t10 * M2 >> 12); - v6 = t13 - (t12 * M4 >> 12) - v7; - v5 -= v6; - v4 -= v5; - - dst[0] = BYTECLIP((v0 + v7) >> 8); /* Descale the transformed values 8 bits and output */ - dst[7] = BYTECLIP((v0 - v7) >> 8); - dst[1] = BYTECLIP((v1 + v6) >> 8); - dst[6] = BYTECLIP((v1 - v6) >> 8); - dst[2] = BYTECLIP((v2 + v5) >> 8); - dst[5] = BYTECLIP((v2 - v5) >> 8); - dst[3] = BYTECLIP((v3 + v4) >> 8); - dst[4] = BYTECLIP((v3 - v4) >> 8); - dst += 8; - - src += 8; /* Next row */ - } -} - - - - -/*-----------------------------------------------------------------------*/ -/* Load all blocks in the MCU into working buffer */ -/*-----------------------------------------------------------------------*/ - -static -JRESULT mcu_load ( - JDEC* jd /* Pointer to the decompressor object */ -) -{ - LONG *tmp = (LONG*)jd->workbuf; /* Block working buffer for de-quantize and IDCT */ - UINT blk, nby, nbc, i, z, id, cmp; - INT b, d, e; - BYTE *bp; - const BYTE *hb, *hd; - const WORD *hc; - const LONG *dqf; - - - nby = jd->msx * jd->msy; /* Number of Y blocks (1, 2 or 4) */ - nbc = 2; /* Number of C blocks (2) */ - bp = jd->mcubuf; /* Pointer to the first block */ - - for (blk = 0; blk < nby + nbc; blk++) { - cmp = (blk < nby) ? 0 : blk - nby + 1; /* Component number 0:Y, 1:Cb, 2:Cr */ - id = cmp ? 1 : 0; /* Huffman table ID of the component */ - - /* Extract a DC element from input stream */ - hb = jd->huffbits[id][0]; /* Huffman table for the DC element */ - hc = jd->huffcode[id][0]; - hd = jd->huffdata[id][0]; - b = huffext(jd, hb, hc, hd); /* Extract a huffman coded data (bit length) */ - if (b < 0) return 0 - b; /* Err: invalid code or input */ - d = jd->dcv[cmp]; /* DC value of previous block */ - if (b) { /* If there is any difference from previous block */ - e = bitext(jd, b); /* Extract data bits */ - if (e < 0) return 0 - e; /* Err: input */ - b = 1 << (b - 1); /* MSB position */ - if (!(e & b)) e -= (b << 1) - 1; /* Restore sign if needed */ - d += e; /* Get current value */ - jd->dcv[cmp] = (SHORT)d; /* Save current DC value for next block */ - } - dqf = jd->qttbl[jd->qtid[cmp]]; /* De-quantizer table ID for this component */ - tmp[0] = d * dqf[0] >> 8; /* De-quantize, apply scale factor of Arai algorithm and descale 8 bits */ - - /* Extract following 63 AC elements from input stream */ - for (i = 1; i < 64; i++) tmp[i] = 0; /* Clear rest of elements */ - hb = jd->huffbits[id][1]; /* Huffman table for the AC elements */ - hc = jd->huffcode[id][1]; - hd = jd->huffdata[id][1]; - i = 1; /* Top of the AC elements */ - do { - b = huffext(jd, hb, hc, hd); /* Extract a huffman coded value (zero runs and bit length) */ - if (b == 0) break; /* EOB? */ - if (b < 0) return 0 - b; /* Err: invalid code or input error */ - z = (UINT)b >> 4; /* Number of leading zero elements */ - if (z) { - i += z; /* Skip zero elements */ - if (i >= 64) return JDR_FMT1; /* Too long zero run */ - } - if (b &= 0x0F) { /* Bit length */ - d = bitext(jd, b); /* Extract data bits */ - if (d < 0) return 0 - d; /* Err: input device */ - b = 1 << (b - 1); /* MSB position */ - if (!(d & b)) d -= (b << 1) - 1;/* Restore negative value if needed */ - z = ZIG(i); /* Zigzag-order to raster-order converted index */ - tmp[z] = d * dqf[z] >> 8; /* De-quantize, apply scale factor of Arai algorithm and descale 8 bits */ - } - } while (++i < 64); /* Next AC element */ - - if (JD_USE_SCALE && jd->scale == 3) - *bp = (*tmp / 256) + 128; /* If scale ratio is 1/8, IDCT can be ommited and only DC element is used */ - else - block_idct(tmp, bp); /* Apply IDCT and store the block to the MCU buffer */ - - bp += 64; /* Next block */ - } - - return JDR_OK; /* All blocks have been loaded successfully */ -} - - - - -/*-----------------------------------------------------------------------*/ -/* Output an MCU: Convert YCrCb to RGB and output it in RGB form */ -/*-----------------------------------------------------------------------*/ - -static -JRESULT mcu_output ( - JDEC* jd, /* Pointer to the decompressor object */ - UINT (*outfunc)(JDEC*, void*, JRECT*), /* RGB output function */ - UINT x, /* MCU position in the image (left of the MCU) */ - UINT y /* MCU position in the image (top of the MCU) */ -) -{ - const INT CVACC = (sizeof (INT) > 2) ? 1024 : 128; - UINT ix, iy, mx, my, rx, ry; - INT yy, cb, cr; - BYTE *py, *pc, *rgb24; - JRECT rect; - - - mx = jd->msx * 8; my = jd->msy * 8; /* MCU size (pixel) */ - rx = (x + mx <= jd->width) ? mx : jd->width - x; /* Output rectangular size (it may be clipped at right/bottom end) */ - ry = (y + my <= jd->height) ? my : jd->height - y; - if (JD_USE_SCALE) { - rx >>= jd->scale; ry >>= jd->scale; - if (!rx || !ry) return JDR_OK; /* Skip this MCU if all pixel is to be rounded off */ - x >>= jd->scale; y >>= jd->scale; - } - rect.left = x; rect.right = x + rx - 1; /* Rectangular area in the frame buffer */ - rect.top = y; rect.bottom = y + ry - 1; - - - if (!JD_USE_SCALE || jd->scale != 3) { /* Not for 1/8 scaling */ - - /* Build an RGB MCU from discrete comopnents */ - rgb24 = (BYTE*)jd->workbuf; - for (iy = 0; iy < my; iy++) { - pc = jd->mcubuf; - py = pc + iy * 8; - if (my == 16) { /* Double block height? */ - pc += 64 * 4 + (iy >> 1) * 8; - if (iy >= 8) py += 64; - } else { /* Single block height */ - pc += mx * 8 + iy * 8; - } - for (ix = 0; ix < mx; ix++) { - cb = pc[0] - 128; /* Get Cb/Cr component and restore right level */ - cr = pc[64] - 128; - if (mx == 16) { /* Double block width? */ - if (ix == 8) py += 64 - 8; /* Jump to next block if double block heigt */ - pc += ix & 1; /* Increase chroma pointer every two pixels */ - } else { /* Single block width */ - pc++; /* Increase chroma pointer every pixel */ - } - yy = *py++; /* Get Y component */ - - /* Convert YCbCr to RGB */ - *rgb24++ = /* R */ BYTECLIP(yy + ((INT)(1.402 * CVACC) * cr) / CVACC); - *rgb24++ = /* G */ BYTECLIP(yy - ((INT)(0.344 * CVACC) * cb + (INT)(0.714 * CVACC) * cr) / CVACC); - *rgb24++ = /* B */ BYTECLIP(yy + ((INT)(1.772 * CVACC) * cb) / CVACC); - } - } - - /* Descale the MCU rectangular if needed */ - if (JD_USE_SCALE && jd->scale) { - UINT x, y, r, g, b, s, w, a; - BYTE *op; - - /* Get averaged RGB value of each square correcponds to a pixel */ - s = jd->scale * 2; /* Bumber of shifts for averaging */ - w = 1 << jd->scale; /* Width of square */ - a = (mx - w) * 3; /* Bytes to skip for next line in the square */ - op = (BYTE*)jd->workbuf; - for (iy = 0; iy < my; iy += w) { - for (ix = 0; ix < mx; ix += w) { - rgb24 = (BYTE*)jd->workbuf + (iy * mx + ix) * 3; - r = g = b = 0; - for (y = 0; y < w; y++) { /* Accumulate RGB value in the square */ - for (x = 0; x < w; x++) { - r += *rgb24++; - g += *rgb24++; - b += *rgb24++; - } - rgb24 += a; - } /* Put the averaged RGB value as a pixel */ - *op++ = (BYTE)(r >> s); - *op++ = (BYTE)(g >> s); - *op++ = (BYTE)(b >> s); - } - } - } - - } else { /* For only 1/8 scaling (left-top pixel in each block are the DC value of the block) */ - - /* Build a 1/8 descaled RGB MCU from discrete comopnents */ - rgb24 = (BYTE*)jd->workbuf; - pc = jd->mcubuf + mx * my; - cb = pc[0] - 128; /* Get Cb/Cr component and restore right level */ - cr = pc[64] - 128; - for (iy = 0; iy < my; iy += 8) { - py = jd->mcubuf; - if (iy == 8) py += 64 * 2; - for (ix = 0; ix < mx; ix += 8) { - yy = *py; /* Get Y component */ - py += 64; - - /* Convert YCbCr to RGB */ - *rgb24++ = /* R */ BYTECLIP(yy + ((INT)(1.402 * CVACC) * cr / CVACC)); - *rgb24++ = /* G */ BYTECLIP(yy - ((INT)(0.344 * CVACC) * cb + (INT)(0.714 * CVACC) * cr) / CVACC); - *rgb24++ = /* B */ BYTECLIP(yy + ((INT)(1.772 * CVACC) * cb / CVACC)); - } - } - } - - /* Squeeze up pixel table if a part of MCU is to be truncated */ - mx >>= jd->scale; - if (rx < mx) { - BYTE *s, *d; - UINT x, y; - - s = d = (BYTE*)jd->workbuf; - for (y = 0; y < ry; y++) { - for (x = 0; x < rx; x++) { /* Copy effective pixels */ - *d++ = *s++; - *d++ = *s++; - *d++ = *s++; - } - s += (mx - rx) * 3; /* Skip truncated pixels */ - } - } - - /* Convert RGB888 to RGB565 if needed */ - if (JD_FORMAT == 1) { - BYTE *s = (BYTE*)jd->workbuf; - WORD w, *d = (WORD*)s; - UINT n = rx * ry; - - do { - w = (*s++ & 0xF8) << 8; /* RRRRR----------- */ - w |= (*s++ & 0xFC) << 3; /* -----GGGGGG----- */ - w |= *s++ >> 3; /* -----------BBBBB */ - *d++ = w; - } while (--n); - } - - /* Output the RGB rectangular */ - return outfunc(jd, jd->workbuf, &rect) ? JDR_OK : JDR_INTR; -} - - - - -/*-----------------------------------------------------------------------*/ -/* Process restart interval */ -/*-----------------------------------------------------------------------*/ - -static -JRESULT restart ( - JDEC* jd, /* Pointer to the decompressor object */ - WORD rstn /* Expected restert sequense number */ -) -{ - UINT i, dc; - WORD d; - BYTE *dp; - - - /* Discard padding bits and get two bytes from the input stream */ - dp = jd->dptr; dc = jd->dctr; - d = 0; - for (i = 0; i < 2; i++) { - if (!dc) { /* No input data is available, re-fill input buffer */ - dp = jd->inbuf; - dc = jd->infunc(jd, dp, JD_SZBUF); - if (!dc) return JDR_INP; - } else { - dp++; - } - dc--; - d = (d << 8) | *dp; /* Get a byte */ - } - jd->dptr = dp; jd->dctr = dc; jd->dmsk = 0; - - /* Check the marker */ - if ((d & 0xFFD8) != 0xFFD0 || (d & 7) != (rstn & 7)) - return JDR_FMT1; /* Err: expected RSTn marker is not detected (may be collapted data) */ - - /* Reset DC offset */ - jd->dcv[2] = jd->dcv[1] = jd->dcv[0] = 0; - - return JDR_OK; -} - - - - -/*-----------------------------------------------------------------------*/ -/* Analyze the JPEG image and Initialize decompressor object */ -/*-----------------------------------------------------------------------*/ - -#define LDB_WORD(ptr) (WORD)(((WORD)*((BYTE*)(ptr))<<8)|(WORD)*(BYTE*)((ptr)+1)) - - -JRESULT jd_prepare ( - JDEC* jd, /* Blank decompressor object */ - UINT (*infunc)(JDEC*, BYTE*, UINT), /* JPEG strem input function */ - void* pool, /* Working buffer for the decompression session */ - UINT sz_pool, /* Size of working buffer */ - void* dev /* I/O device identifier for the session */ -) -{ - BYTE *seg, b; - WORD marker; - DWORD ofs; - UINT n, i, j, len; - JRESULT rc; - - - if (!pool) return JDR_PAR; - - jd->pool = pool; /* Work memroy */ - jd->sz_pool = sz_pool; /* Size of given work memory */ - jd->infunc = infunc; /* Stream input function */ - jd->device = dev; /* I/O device identifier */ - jd->nrst = 0; /* No restart interval (default) */ - - for (i = 0; i < 2; i++) { /* Nulls pointers */ - for (j = 0; j < 2; j++) { - jd->huffbits[i][j] = 0; - jd->huffcode[i][j] = 0; - jd->huffdata[i][j] = 0; - } - } - for (i = 0; i < 4; i++) jd->qttbl[i] = 0; - - jd->inbuf = seg = alloc_pool(jd, JD_SZBUF); /* Allocate stream input buffer */ - if (!seg) return JDR_MEM1; - - if (jd->infunc(jd, seg, 2) != 2) return JDR_INP;/* Check SOI marker */ - if (LDB_WORD(seg) != 0xFFD8) return JDR_FMT1; /* Err: SOI is not detected */ - ofs = 2; - - for (;;) { - /* Get a JPEG marker */ - if (jd->infunc(jd, seg, 4) != 4) return JDR_INP; - marker = LDB_WORD(seg); /* Marker */ - len = LDB_WORD(seg + 2); /* Length field */ - if (len <= 2 || (marker >> 8) != 0xFF) return JDR_FMT1; - len -= 2; /* Content size excluding length field */ - ofs += 4 + len; /* Number of bytes loaded */ - - switch (marker & 0xFF) { - case 0xC0: /* SOF0 (baseline JPEG) */ - /* Load segment data */ - if (len > JD_SZBUF) return JDR_MEM2; - if (jd->infunc(jd, seg, len) != len) return JDR_INP; - - jd->width = LDB_WORD(seg+3); /* Image width in unit of pixel */ - jd->height = LDB_WORD(seg+1); /* Image height in unit of pixel */ - if (seg[5] != 3) return JDR_FMT3; /* Err: Supports only Y/Cb/Cr format */ - - /* Check three image components */ - for (i = 0; i < 3; i++) { - b = seg[7 + 3 * i]; /* Get sampling factor */ - if (!i) { /* Y component */ - if (b != 0x11 && b != 0x22 && b != 0x21)/* Check sampling factor */ - return JDR_FMT3; /* Err: Supports only 4:4:4, 4:2:0 or 4:2:2 */ - jd->msx = b >> 4; jd->msy = b & 15; /* Size of MCU [blocks] */ - } else { /* Cb/Cr component */ - if (b != 0x11) return JDR_FMT3; /* Err: Sampling factor of Cr/Cb must be 1 */ - } - b = seg[8 + 3 * i]; /* Get dequantizer table ID for this component */ - if (b > 3) return JDR_FMT3; /* Err: Invalid ID */ - jd->qtid[i] = b; - } - break; - - case 0xDD: /* DRI */ - /* Load segment data */ - if (len > JD_SZBUF) return JDR_MEM2; - if (jd->infunc(jd, seg, len) != len) return JDR_INP; - - /* Get restart interval (MCUs) */ - jd->nrst = LDB_WORD(seg); - break; - - case 0xC4: /* DHT */ - /* Load segment data */ - if (len > JD_SZBUF) return JDR_MEM2; - if (jd->infunc(jd, seg, len) != len) return JDR_INP; - - /* Create huffman tables */ - rc = create_huffman_tbl(jd, seg, len); - if (rc) return rc; - break; - - case 0xDB: /* DQT */ - /* Load segment data */ - if (len > JD_SZBUF) return JDR_MEM2; - if (jd->infunc(jd, seg, len) != len) return JDR_INP; - - /* Create de-quantizer tables */ - rc = create_qt_tbl(jd, seg, len); - if (rc) return rc; - break; - - case 0xDA: /* SOS */ - /* Load segment data */ - if (len > JD_SZBUF) return JDR_MEM2; - if (jd->infunc(jd, seg, len) != len) return JDR_INP; - - if (!jd->width || !jd->height) return JDR_FMT1; /* Err: Invalid image size */ - - if (seg[0] != 3) return JDR_FMT3; /* Err: Supports only three color components format */ - - /* Check if all tables corresponding to each components have been loaded */ - for (i = 0; i < 3; i++) { - b = seg[2 + 2 * i]; /* Get huffman table ID */ - if (b != 0x00 && b != 0x11) return JDR_FMT3; /* Err: Different table number for DC/AC element */ - b = i ? 1 : 0; - if (!jd->huffbits[b][0] || !jd->huffbits[b][1]) /* Check huffman table for this component */ - return JDR_FMT1; /* Err: Huffman table not loaded */ - if (!jd->qttbl[jd->qtid[i]]) return JDR_FMT1; /* Err: Dequantizer table not loaded */ - } - - /* Allocate working buffer for MCU and RGB */ - n = jd->msy * jd->msx; /* Number of Y blocks in the MCU */ - if (!n) return JDR_FMT1; /* Err: SOF0 has not been loaded */ - len = n * 64 * 2 + 64; /* Allocate buffer for IDCT and RGB output */ - if (len < 256) len = 256; /* but at least 256 byte is required for IDCT */ - jd->workbuf = alloc_pool(jd, len); /* and it may occupy a part of following MCU working buffer for RGB output */ - if (!jd->workbuf) return JDR_MEM1; /* Err: not enough memory */ - jd->mcubuf = alloc_pool(jd, (n + 2) * 64); /* Allocate MCU working buffer */ - if (!jd->mcubuf) return JDR_MEM1; /* Err: not enough memory */ - - /* Pre-load the JPEG data to extract it from the bit stream */ - jd->dptr = seg; jd->dctr = 0; jd->dmsk = 0; /* Prepare to read bit stream */ - if (ofs %= JD_SZBUF) { /* Align read offset to JD_SZBUF */ - jd->dctr = jd->infunc(jd, seg + ofs, JD_SZBUF - (UINT)ofs); - jd->dptr = seg + ofs - 1; - } - - return JDR_OK; /* Initialization succeeded. Ready to decompress the JPEG image. */ - - case 0xC1: /* SOF1 */ - case 0xC2: /* SOF2 */ - case 0xC3: /* SOF3 */ - case 0xC5: /* SOF5 */ - case 0xC6: /* SOF6 */ - case 0xC7: /* SOF7 */ - case 0xC9: /* SOF9 */ - case 0xCA: /* SOF10 */ - case 0xCB: /* SOF11 */ - case 0xCD: /* SOF13 */ - case 0xCE: /* SOF14 */ - case 0xCF: /* SOF15 */ - case 0xD9: /* EOI */ - return JDR_FMT3; /* Unsuppoted JPEG standard (may be progressive JPEG) */ - - default: /* Unknown segment (comment, exif or etc..) */ - /* Skip segment data */ - if (jd->infunc(jd, 0, len) != len) /* Null pointer specifies to skip bytes of stream */ - return JDR_INP; - } - } -} - - - - -/*-----------------------------------------------------------------------*/ -/* Start to decompress the JPEG picture */ -/*-----------------------------------------------------------------------*/ - -JRESULT jd_decomp ( - JDEC* jd, /* Initialized decompression object */ - UINT (*outfunc)(JDEC*, void*, JRECT*), /* RGB output function */ - BYTE scale /* Output de-scaling factor (0 to 3) */ -) -{ - UINT x, y, mx, my; - WORD rst, rsc; - JRESULT rc; - - - if (scale > (JD_USE_SCALE ? 3 : 0)) return JDR_PAR; - jd->scale = scale; - - mx = jd->msx * 8; my = jd->msy * 8; /* Size of the MCU (pixel) */ - - jd->dcv[2] = jd->dcv[1] = jd->dcv[0] = 0; /* Initialize DC values */ - rst = rsc = 0; - - rc = JDR_OK; - for (y = 0; y < jd->height; y += my) { /* Vertical loop of MCUs */ - for (x = 0; x < jd->width; x += mx) { /* Horizontal loop of MCUs */ - if (jd->nrst && rst++ == jd->nrst) { /* Process restart interval if enabled */ - rc = restart(jd, rsc++); - if (rc != JDR_OK) return rc; - rst = 1; - } - rc = mcu_load(jd); /* Load an MCU (decompress huffman coded stream and apply IDCT) */ - if (rc != JDR_OK) return rc; - rc = mcu_output(jd, outfunc, x, y); /* Output the MCU (color space conversion, scaling and output) */ - if (rc != JDR_OK) return rc; - } - } - - return rc; -} -#endif//SUPPORT_JPEG - - diff --git a/lib/libesp32_div/esp32-camera/target/esp32s3/ll_cam.c b/lib/libesp32_div/esp32-camera/target/esp32s3/ll_cam.c deleted file mode 100644 index 9a1f185c4..000000000 --- a/lib/libesp32_div/esp32-camera/target/esp32s3/ll_cam.c +++ /dev/null @@ -1,452 +0,0 @@ -// Copyright 2010-2020 Espressif Systems (Shanghai) PTE LTD -// -// 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. - -#include -#include -#include "soc/system_reg.h" -#include "soc/lcd_cam_struct.h" -#include "soc/lcd_cam_reg.h" -#include "soc/gdma_struct.h" -#include "soc/gdma_periph.h" -#include "soc/gdma_reg.h" -#include "ll_cam.h" -#include "cam_hal.h" - -static const char *TAG = "s3 ll_cam"; - -static void IRAM_ATTR ll_cam_vsync_isr(void *arg) -{ - //DBG_PIN_SET(1); - cam_obj_t *cam = (cam_obj_t *)arg; - BaseType_t HPTaskAwoken = pdFALSE; - - typeof(LCD_CAM.lc_dma_int_st) status = LCD_CAM.lc_dma_int_st; - if (status.val == 0) { - return; - } - - LCD_CAM.lc_dma_int_clr.val = status.val; - - if (status.cam_vsync_int_st) { - ll_cam_send_event(cam, CAM_VSYNC_EVENT, &HPTaskAwoken); - } - - if (HPTaskAwoken == pdTRUE) { - portYIELD_FROM_ISR(); - } - //DBG_PIN_SET(0); -} - -static void IRAM_ATTR ll_cam_dma_isr(void *arg) -{ - cam_obj_t *cam = (cam_obj_t *)arg; - BaseType_t HPTaskAwoken = pdFALSE; - - typeof(GDMA.channel[cam->dma_num].in.int_st) status = GDMA.channel[cam->dma_num].in.int_st; - if (status.val == 0) { - return; - } - - GDMA.channel[cam->dma_num].in.int_clr.val = status.val; - - if (status.in_suc_eof) { - ll_cam_send_event(cam, CAM_IN_SUC_EOF_EVENT, &HPTaskAwoken); - } - - if (HPTaskAwoken == pdTRUE) { - portYIELD_FROM_ISR(); - } -} - -bool ll_cam_stop(cam_obj_t *cam) -{ - if (cam->jpeg_mode || !cam->psram_mode) { - GDMA.channel[cam->dma_num].in.int_ena.in_suc_eof = 0; - GDMA.channel[cam->dma_num].in.int_clr.in_suc_eof = 1; - } - GDMA.channel[cam->dma_num].in.link.stop = 1; - return true; -} - -esp_err_t ll_cam_deinit(cam_obj_t *cam) -{ - if (cam->cam_intr_handle) { - esp_intr_free(cam->cam_intr_handle); - cam->cam_intr_handle = NULL; - } - - if (cam->dma_intr_handle) { - esp_intr_free(cam->dma_intr_handle); - cam->dma_intr_handle = NULL; - } - GDMA.channel[cam->dma_num].in.link.addr = 0x0; - - LCD_CAM.cam_ctrl1.cam_start = 0; - LCD_CAM.cam_ctrl1.cam_reset = 1; - LCD_CAM.cam_ctrl1.cam_reset = 0; - return ESP_OK; -} - -bool ll_cam_start(cam_obj_t *cam, int frame_pos) -{ - LCD_CAM.cam_ctrl1.cam_start = 0; - - if (cam->jpeg_mode || !cam->psram_mode) { - GDMA.channel[cam->dma_num].in.int_clr.in_suc_eof = 1; - GDMA.channel[cam->dma_num].in.int_ena.in_suc_eof = 1; - } - - LCD_CAM.cam_ctrl1.cam_reset = 1; - LCD_CAM.cam_ctrl1.cam_reset = 0; - LCD_CAM.cam_ctrl1.cam_afifo_reset = 1; - LCD_CAM.cam_ctrl1.cam_afifo_reset = 0; - GDMA.channel[cam->dma_num].in.conf0.in_rst = 1; - GDMA.channel[cam->dma_num].in.conf0.in_rst = 0; - - LCD_CAM.cam_ctrl1.cam_rec_data_bytelen = cam->dma_half_buffer_size - 1; // Ping pong operation - - if (!cam->psram_mode) { - GDMA.channel[cam->dma_num].in.link.addr = ((uint32_t)&cam->dma[0]) & 0xfffff; - } else { - GDMA.channel[cam->dma_num].in.link.addr = ((uint32_t)&cam->frames[frame_pos].dma[0]) & 0xfffff; - } - - GDMA.channel[cam->dma_num].in.link.start = 1; - - LCD_CAM.cam_ctrl.cam_update = 1; - LCD_CAM.cam_ctrl1.cam_start = 1; - return true; -} - -static esp_err_t ll_cam_dma_init(cam_obj_t *cam) -{ - for (int x = (SOC_GDMA_PAIRS_PER_GROUP - 1); x >= 0; x--) { - if (GDMA.channel[x].in.link.addr == 0x0) { - cam->dma_num = x; - ESP_LOGI(TAG, "DMA Channel=%d", cam->dma_num); - break; - } - if (x == 0) { - cam_deinit(); - ESP_LOGE(TAG, "Can't found available GDMA channel"); - return ESP_FAIL; - } - } - - if (REG_GET_BIT(SYSTEM_PERIP_CLK_EN1_REG, SYSTEM_DMA_CLK_EN) == 0) { - REG_CLR_BIT(SYSTEM_PERIP_CLK_EN1_REG, SYSTEM_DMA_CLK_EN); - REG_SET_BIT(SYSTEM_PERIP_CLK_EN1_REG, SYSTEM_DMA_CLK_EN); - REG_SET_BIT(SYSTEM_PERIP_RST_EN1_REG, SYSTEM_DMA_RST); - REG_CLR_BIT(SYSTEM_PERIP_RST_EN1_REG, SYSTEM_DMA_RST); - } - - GDMA.channel[cam->dma_num].in.int_clr.val = ~0; - GDMA.channel[cam->dma_num].in.int_ena.val = 0; - - GDMA.channel[cam->dma_num].in.conf0.val = 0; - GDMA.channel[cam->dma_num].in.conf0.in_rst = 1; - GDMA.channel[cam->dma_num].in.conf0.in_rst = 0; - - //internal SRAM only - if (!cam->psram_mode) { - GDMA.channel[cam->dma_num].in.conf0.indscr_burst_en = 1; - GDMA.channel[cam->dma_num].in.conf0.in_data_burst_en = 1; - } - - GDMA.channel[cam->dma_num].in.conf1.in_check_owner = 0; - - GDMA.channel[cam->dma_num].in.peri_sel.sel = 5; - //GDMA.channel[cam->dma_num].in.pri.rx_pri = 1;//rx prio 0-15 - //GDMA.channel[cam->dma_num].in.sram_size.in_size = 6;//This register is used to configure the size of L2 Tx FIFO for Rx channel. 0:16 bytes, 1:24 bytes, 2:32 bytes, 3: 40 bytes, 4: 48 bytes, 5:56 bytes, 6: 64 bytes, 7: 72 bytes, 8: 80 bytes. - //GDMA.channel[cam->dma_num].in.wight.rx_weight = 7;//The weight of Rx channel 0-15 - return ESP_OK; -} - -esp_err_t ll_cam_config(cam_obj_t *cam, const camera_config_t *config) -{ - if (REG_GET_BIT(SYSTEM_PERIP_CLK_EN1_REG, SYSTEM_LCD_CAM_CLK_EN) == 0) { - REG_CLR_BIT(SYSTEM_PERIP_CLK_EN1_REG, SYSTEM_LCD_CAM_CLK_EN); - REG_SET_BIT(SYSTEM_PERIP_CLK_EN1_REG, SYSTEM_LCD_CAM_CLK_EN); - REG_SET_BIT(SYSTEM_PERIP_RST_EN1_REG, SYSTEM_LCD_CAM_RST); - REG_CLR_BIT(SYSTEM_PERIP_RST_EN1_REG, SYSTEM_LCD_CAM_RST); - } - - LCD_CAM.cam_ctrl.val = 0; - - LCD_CAM.cam_ctrl.cam_clkm_div_b = 0; - LCD_CAM.cam_ctrl.cam_clkm_div_a = 0; - LCD_CAM.cam_ctrl.cam_clkm_div_num = 160000000 / config->xclk_freq_hz; - LCD_CAM.cam_ctrl.cam_clk_sel = 3;//Select Camera module source clock. 0: no clock. 1: APLL. 2: CLK160. 3: no clock. - - LCD_CAM.cam_ctrl.cam_stop_en = 0; - LCD_CAM.cam_ctrl.cam_vsync_filter_thres = 4; // Filter by LCD_CAM clock - LCD_CAM.cam_ctrl.cam_update = 0; - LCD_CAM.cam_ctrl.cam_byte_order = cam->swap_data; - LCD_CAM.cam_ctrl.cam_bit_order = 0; - LCD_CAM.cam_ctrl.cam_line_int_en = 0; - LCD_CAM.cam_ctrl.cam_vs_eof_en = 0; //1: CAM_VSYNC to generate in_suc_eof. 0: in_suc_eof is controlled by reg_cam_rec_data_cyclelen - - LCD_CAM.cam_ctrl1.val = 0; - LCD_CAM.cam_ctrl1.cam_rec_data_bytelen = LCD_CAM_DMA_NODE_BUFFER_MAX_SIZE - 1; // Cannot be assigned to 0, and it is easy to overflow - LCD_CAM.cam_ctrl1.cam_line_int_num = 0; // The number of hsyncs that generate hs interrupts - LCD_CAM.cam_ctrl1.cam_clk_inv = 0; - LCD_CAM.cam_ctrl1.cam_vsync_filter_en = 1; - LCD_CAM.cam_ctrl1.cam_2byte_en = 0; - LCD_CAM.cam_ctrl1.cam_de_inv = 0; - LCD_CAM.cam_ctrl1.cam_hsync_inv = 0; - LCD_CAM.cam_ctrl1.cam_vsync_inv = 0; - LCD_CAM.cam_ctrl1.cam_vh_de_mode_en = 0; - - LCD_CAM.cam_rgb_yuv.val = 0; - - LCD_CAM.cam_ctrl.cam_update = 1; - LCD_CAM.cam_ctrl1.cam_start = 1; - - esp_err_t err = ll_cam_dma_init(cam); - if(err != ESP_OK) { - return err; - } - - return ESP_OK; -} - -void ll_cam_vsync_intr_enable(cam_obj_t *cam, bool en) -{ - LCD_CAM.lc_dma_int_clr.cam_vsync_int_clr = 1; - if (en) { - LCD_CAM.lc_dma_int_ena.cam_vsync_int_ena = 1; - } else { - LCD_CAM.lc_dma_int_ena.cam_vsync_int_ena = 0; - } -} - -esp_err_t ll_cam_set_pin(cam_obj_t *cam, const camera_config_t *config) -{ - PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[config->pin_pclk], PIN_FUNC_GPIO); - gpio_set_direction(config->pin_pclk, GPIO_MODE_INPUT); - gpio_set_pull_mode(config->pin_pclk, GPIO_FLOATING); - gpio_matrix_in(config->pin_pclk, CAM_PCLK_IDX, false); - - PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[config->pin_vsync], PIN_FUNC_GPIO); - gpio_set_direction(config->pin_vsync, GPIO_MODE_INPUT); - gpio_set_pull_mode(config->pin_vsync, GPIO_FLOATING); - gpio_matrix_in(config->pin_vsync, CAM_V_SYNC_IDX, cam->vsync_invert); - - PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[config->pin_href], PIN_FUNC_GPIO); - gpio_set_direction(config->pin_href, GPIO_MODE_INPUT); - gpio_set_pull_mode(config->pin_href, GPIO_FLOATING); - gpio_matrix_in(config->pin_href, CAM_H_ENABLE_IDX, false); - - int data_pins[8] = { - config->pin_d0, config->pin_d1, config->pin_d2, config->pin_d3, config->pin_d4, config->pin_d5, config->pin_d6, config->pin_d7, - }; - for (int i = 0; i < 8; i++) { - PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[data_pins[i]], PIN_FUNC_GPIO); - gpio_set_direction(data_pins[i], GPIO_MODE_INPUT); - gpio_set_pull_mode(data_pins[i], GPIO_FLOATING); - gpio_matrix_in(data_pins[i], CAM_DATA_IN0_IDX + i, false); - } - - PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[config->pin_xclk], PIN_FUNC_GPIO); - gpio_set_direction(config->pin_xclk, GPIO_MODE_OUTPUT); - gpio_set_pull_mode(config->pin_xclk, GPIO_FLOATING); - gpio_matrix_out(config->pin_xclk, CAM_CLK_IDX, false, false); - - return ESP_OK; -} - -esp_err_t ll_cam_init_isr(cam_obj_t *cam) -{ - esp_err_t ret = ESP_OK; - ret = esp_intr_alloc_intrstatus(gdma_periph_signals.groups[0].pairs[cam->dma_num].rx_irq_id, - ESP_INTR_FLAG_LOWMED | ESP_INTR_FLAG_SHARED | ESP_INTR_FLAG_IRAM, - (uint32_t)&GDMA.channel[cam->dma_num].in.int_st, GDMA_IN_SUC_EOF_CH0_INT_ST_M, - ll_cam_dma_isr, cam, &cam->dma_intr_handle); - if (ret != ESP_OK) { - ESP_LOGE(TAG, "DMA interrupt allocation of camera failed"); - return ret; - } - - ret = esp_intr_alloc_intrstatus(ETS_LCD_CAM_INTR_SOURCE, - ESP_INTR_FLAG_LOWMED | ESP_INTR_FLAG_SHARED | ESP_INTR_FLAG_IRAM, - (uint32_t)&LCD_CAM.lc_dma_int_st.val, LCD_CAM_CAM_VSYNC_INT_ST_M, - ll_cam_vsync_isr, cam, &cam->cam_intr_handle); - if (ret != ESP_OK) { - ESP_LOGE(TAG, "LCD_CAM interrupt allocation of camera failed"); - return ret; - } - return ESP_OK; -} - -void ll_cam_do_vsync(cam_obj_t *cam) -{ - gpio_matrix_in(cam->vsync_pin, CAM_V_SYNC_IDX, !cam->vsync_invert); - ets_delay_us(10); - gpio_matrix_in(cam->vsync_pin, CAM_V_SYNC_IDX, cam->vsync_invert); -} - -uint8_t ll_cam_get_dma_align(cam_obj_t *cam) -{ - return 16 << GDMA.channel[cam->dma_num].in.conf1.in_ext_mem_bk_size; -} - -static bool ll_cam_calc_rgb_dma(cam_obj_t *cam){ - size_t node_max = LCD_CAM_DMA_NODE_BUFFER_MAX_SIZE / cam->dma_bytes_per_item; - size_t line_width = cam->width * cam->in_bytes_per_pixel; - size_t node_size = node_max; - size_t nodes_per_line = 1; - size_t lines_per_node = 1; - - // Calculate DMA Node Size so that it's divisable by or divisor of the line width - if(line_width >= node_max){ - // One or more nodes will be requied for one line - for(size_t i = node_max; i > 0; i=i-1){ - if ((line_width % i) == 0) { - node_size = i; - nodes_per_line = line_width / node_size; - break; - } - } - } else { - // One or more lines can fit into one node - for(size_t i = node_max; i > 0; i=i-1){ - if ((i % line_width) == 0) { - node_size = i; - lines_per_node = node_size / line_width; - while((cam->height % lines_per_node) != 0){ - lines_per_node = lines_per_node - 1; - node_size = lines_per_node * line_width; - } - break; - } - } - } - - ESP_LOGI(TAG, "node_size: %4u, nodes_per_line: %u, lines_per_node: %u", - node_size * cam->dma_bytes_per_item, nodes_per_line, lines_per_node); - - cam->dma_node_buffer_size = node_size * cam->dma_bytes_per_item; - - size_t dma_half_buffer_max = CONFIG_CAMERA_DMA_BUFFER_SIZE_MAX / 2 / cam->dma_bytes_per_item; - if (line_width > dma_half_buffer_max) { - ESP_LOGE(TAG, "Resolution too high"); - return 0; - } - - // Calculate minimum EOF size = max(mode_size, line_size) - size_t dma_half_buffer_min = node_size * nodes_per_line; - - // Calculate max EOF size divisable by node size - size_t dma_half_buffer = (dma_half_buffer_max / dma_half_buffer_min) * dma_half_buffer_min; - - // Adjust EOF size so that height will be divisable by the number of lines in each EOF - size_t lines_per_half_buffer = dma_half_buffer / line_width; - while((cam->height % lines_per_half_buffer) != 0){ - dma_half_buffer = dma_half_buffer - dma_half_buffer_min; - lines_per_half_buffer = dma_half_buffer / line_width; - } - - // Calculate DMA size - size_t dma_buffer_max = 2 * dma_half_buffer_max; - if (cam->psram_mode) { - dma_buffer_max = cam->recv_size / cam->dma_bytes_per_item; - } - size_t dma_buffer_size = dma_buffer_max; - if (!cam->psram_mode) { - dma_buffer_size =(dma_buffer_max / dma_half_buffer) * dma_half_buffer; - } - - ESP_LOGI(TAG, "dma_half_buffer_min: %5u, dma_half_buffer: %5u, lines_per_half_buffer: %2u, dma_buffer_size: %5u", - dma_half_buffer_min * cam->dma_bytes_per_item, dma_half_buffer * cam->dma_bytes_per_item, lines_per_half_buffer, dma_buffer_size * cam->dma_bytes_per_item); - - cam->dma_buffer_size = dma_buffer_size * cam->dma_bytes_per_item; - cam->dma_half_buffer_size = dma_half_buffer * cam->dma_bytes_per_item; - cam->dma_half_buffer_cnt = cam->dma_buffer_size / cam->dma_half_buffer_size; - return 1; -} - -bool ll_cam_dma_sizes(cam_obj_t *cam) -{ - cam->dma_bytes_per_item = 1; - if (cam->jpeg_mode) { - if (cam->psram_mode) { - cam->dma_buffer_size = cam->recv_size; - cam->dma_half_buffer_size = 1024; - cam->dma_half_buffer_cnt = cam->dma_buffer_size / cam->dma_half_buffer_size; - cam->dma_node_buffer_size = cam->dma_half_buffer_size; - } else { - cam->dma_half_buffer_cnt = 16; - cam->dma_buffer_size = cam->dma_half_buffer_cnt * 1024; - cam->dma_half_buffer_size = cam->dma_buffer_size / cam->dma_half_buffer_cnt; - cam->dma_node_buffer_size = cam->dma_half_buffer_size; - } - } else { - return ll_cam_calc_rgb_dma(cam); - } - return 1; -} - -size_t IRAM_ATTR ll_cam_memcpy(cam_obj_t *cam, uint8_t *out, const uint8_t *in, size_t len) -{ - // YUV to Grayscale - if (cam->in_bytes_per_pixel == 2 && cam->fb_bytes_per_pixel == 1) { - size_t end = len / 8; - for (size_t i = 0; i < end; ++i) { - out[0] = in[0]; - out[1] = in[2]; - out[2] = in[4]; - out[3] = in[6]; - out += 4; - in += 8; - } - return len / 2; - } - - // just memcpy - memcpy(out, in, len); - return len; -} - -esp_err_t ll_cam_set_sample_mode(cam_obj_t *cam, pixformat_t pix_format, uint32_t xclk_freq_hz, uint16_t sensor_pid) -{ - if (pix_format == PIXFORMAT_GRAYSCALE) { - if (sensor_pid == OV3660_PID || sensor_pid == OV5640_PID || sensor_pid == NT99141_PID) { - cam->in_bytes_per_pixel = 1; // camera sends Y8 - } else { - cam->in_bytes_per_pixel = 2; // camera sends YU/YV - } - cam->fb_bytes_per_pixel = 1; // frame buffer stores Y8 - } else if (pix_format == PIXFORMAT_YUV422 || pix_format == PIXFORMAT_RGB565) { - cam->in_bytes_per_pixel = 2; // camera sends YU/YV - cam->fb_bytes_per_pixel = 2; // frame buffer stores YU/YV/RGB565 - } else if (pix_format == PIXFORMAT_JPEG) { - cam->in_bytes_per_pixel = 1; - cam->fb_bytes_per_pixel = 1; - } else { - ESP_LOGE(TAG, "Requested format is not supported"); - return ESP_ERR_NOT_SUPPORTED; - } - return ESP_OK; -} - -// implements function from xclk.c to allow dynamic XCLK change -esp_err_t xclk_timer_conf(int ledc_timer, int xclk_freq_hz) -{ - LCD_CAM.cam_ctrl.cam_clkm_div_b = 0; - LCD_CAM.cam_ctrl.cam_clkm_div_a = 0; - LCD_CAM.cam_ctrl.cam_clkm_div_num = 160000000 / xclk_freq_hz; - LCD_CAM.cam_ctrl.cam_clk_sel = 3;//Select Camera module source clock. 0: no clock. 1: APLL. 2: CLK160. 3: no clock. - LCD_CAM.cam_ctrl.cam_update = 1; - return ESP_OK; -} diff --git a/lib/libesp32_div/esp32-camera/target/private_include/ll_cam.h b/lib/libesp32_div/esp32-camera/target/private_include/ll_cam.h deleted file mode 100644 index 7d30c370a..000000000 --- a/lib/libesp32_div/esp32-camera/target/private_include/ll_cam.h +++ /dev/null @@ -1,141 +0,0 @@ -// Copyright 2010-2020 Espressif Systems (Shanghai) PTE LTD -// -// 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. - -#pragma once - -#include -#include "sdkconfig.h" -#include "esp_idf_version.h" -#if CONFIG_IDF_TARGET_ESP32 -#if ESP_IDF_VERSION_MAJOR >= 4 -#include "esp32/rom/lldesc.h" -#else -#include "rom/lldesc.h" -#endif -#elif CONFIG_IDF_TARGET_ESP32S2 -#include "esp32s2/rom/lldesc.h" -#elif CONFIG_IDF_TARGET_ESP32S3 -#include "esp32s3/rom/lldesc.h" -#endif -#include "esp_log.h" -#include "esp_camera.h" -#include "freertos/FreeRTOS.h" -#include "freertos/queue.h" -#include "freertos/task.h" -#include "freertos/semphr.h" - -#if __has_include("esp_private/periph_ctrl.h") -# include "esp_private/periph_ctrl.h" -#endif - -#define CAMERA_DBG_PIN_ENABLE 0 -#if CAMERA_DBG_PIN_ENABLE - #if CONFIG_IDF_TARGET_ESP32 - #define DBG_PIN_NUM 26 - #else - #define DBG_PIN_NUM 7 - #endif - #include "hal/gpio_ll.h" - #define DBG_PIN_SET(v) gpio_ll_set_level(&GPIO, DBG_PIN_NUM, v) -#else - #define DBG_PIN_SET(v) -#endif - -#define CAM_CHECK(a, str, ret) if (!(a)) { \ - ESP_LOGE(TAG,"%s(%d): %s", __FUNCTION__, __LINE__, str); \ - return (ret); \ - } - -#define CAM_CHECK_GOTO(a, str, lab) if (!(a)) { \ - ESP_LOGE(TAG,"%s(%d): %s", __FUNCTION__, __LINE__, str); \ - goto lab; \ - } - -#define LCD_CAM_DMA_NODE_BUFFER_MAX_SIZE (4092) - -typedef enum { - CAM_IN_SUC_EOF_EVENT = 0, - CAM_VSYNC_EVENT -} cam_event_t; - -typedef enum { - CAM_STATE_IDLE = 0, - CAM_STATE_READ_BUF = 1, -} cam_state_t; - -typedef struct { - camera_fb_t fb; - uint8_t en; - //for RGB/YUV modes - lldesc_t *dma; - size_t fb_offset; -} cam_frame_t; - -typedef struct { - uint32_t dma_bytes_per_item; - uint32_t dma_buffer_size; - uint32_t dma_half_buffer_size; - uint32_t dma_half_buffer_cnt; - uint32_t dma_node_buffer_size; - uint32_t dma_node_cnt; - uint32_t frame_copy_cnt; - - //for JPEG mode - lldesc_t *dma; - uint8_t *dma_buffer; - - cam_frame_t *frames; - - QueueHandle_t event_queue; - QueueHandle_t frame_buffer_queue; - TaskHandle_t task_handle; - intr_handle_t cam_intr_handle; - - uint8_t dma_num;//ESP32-S3 - intr_handle_t dma_intr_handle;//ESP32-S3 - - uint8_t jpeg_mode; - uint8_t vsync_pin; - uint8_t vsync_invert; - uint32_t frame_cnt; - uint32_t recv_size; - bool swap_data; - bool psram_mode; - - //for RGB/YUV modes - uint16_t width; - uint16_t height; - uint8_t in_bytes_per_pixel; - uint8_t fb_bytes_per_pixel; - uint32_t fb_size; - - cam_state_t state; -} cam_obj_t; - - -bool ll_cam_stop(cam_obj_t *cam); -bool ll_cam_start(cam_obj_t *cam, int frame_pos); -esp_err_t ll_cam_config(cam_obj_t *cam, const camera_config_t *config); -esp_err_t ll_cam_deinit(cam_obj_t *cam); -void ll_cam_vsync_intr_enable(cam_obj_t *cam, bool en); -esp_err_t ll_cam_set_pin(cam_obj_t *cam, const camera_config_t *config); -esp_err_t ll_cam_init_isr(cam_obj_t *cam); -void ll_cam_do_vsync(cam_obj_t *cam); -uint8_t ll_cam_get_dma_align(cam_obj_t *cam); -bool ll_cam_dma_sizes(cam_obj_t *cam); -size_t IRAM_ATTR ll_cam_memcpy(cam_obj_t *cam, uint8_t *out, const uint8_t *in, size_t len); -esp_err_t ll_cam_set_sample_mode(cam_obj_t *cam, pixformat_t pix_format, uint32_t xclk_freq_hz, uint16_t sensor_pid); - -// implemented in cam_hal -void ll_cam_send_event(cam_obj_t *cam, cam_event_t cam_event, BaseType_t * HPTaskAwoken); diff --git a/lib/libesp32_div/esp32-camera/target/xclk.c b/lib/libesp32_div/esp32-camera/target/xclk.c deleted file mode 100644 index b5ea53e77..000000000 --- a/lib/libesp32_div/esp32-camera/target/xclk.c +++ /dev/null @@ -1,64 +0,0 @@ -#include "driver/gpio.h" -#include "driver/ledc.h" -#include "esp_err.h" -#include "esp_log.h" -#include "esp_system.h" -#include "xclk.h" -#include "esp_camera.h" - -#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_ARDUHAL_ESP_LOG) -#include "esp32-hal-log.h" -#else -#include "esp_log.h" -static const char* TAG = "camera_xclk"; -#endif - -static ledc_channel_t g_ledc_channel = 0; - -esp_err_t xclk_timer_conf(int ledc_timer, int xclk_freq_hz) -{ - ledc_timer_config_t timer_conf; - timer_conf.duty_resolution = LEDC_TIMER_1_BIT; - timer_conf.freq_hz = xclk_freq_hz; - timer_conf.speed_mode = LEDC_LOW_SPEED_MODE; - -#if ESP_IDF_VERSION_MAJOR >= 4 - timer_conf.clk_cfg = LEDC_AUTO_CLK; -#endif - timer_conf.timer_num = (ledc_timer_t)ledc_timer; - esp_err_t err = ledc_timer_config(&timer_conf); - if (err != ESP_OK) { - ESP_LOGE(TAG, "ledc_timer_config failed for freq %d, rc=%x", xclk_freq_hz, err); - } - return err; -} - -esp_err_t camera_enable_out_clock(camera_config_t* config) -{ - esp_err_t err = xclk_timer_conf(config->ledc_timer, config->xclk_freq_hz); - if (err != ESP_OK) { - ESP_LOGE(TAG, "ledc_timer_config failed, rc=%x", err); - return err; - } - - g_ledc_channel = config->ledc_channel; - ledc_channel_config_t ch_conf; - ch_conf.gpio_num = config->pin_xclk; - ch_conf.speed_mode = LEDC_LOW_SPEED_MODE; - ch_conf.channel = config->ledc_channel; - ch_conf.intr_type = LEDC_INTR_DISABLE; - ch_conf.timer_sel = config->ledc_timer; - ch_conf.duty = 1; - ch_conf.hpoint = 0; - err = ledc_channel_config(&ch_conf); - if (err != ESP_OK) { - ESP_LOGE(TAG, "ledc_channel_config failed, rc=%x", err); - return err; - } - return ESP_OK; -} - -void camera_disable_out_clock() -{ - ledc_stop(LEDC_LOW_SPEED_MODE, g_ledc_channel, 0); -} diff --git a/lib/libesp32_div/esp32-camera/test/CMakeLists.txt b/lib/libesp32_div/esp32-camera/test/CMakeLists.txt deleted file mode 100644 index a8c3d16b7..000000000 --- a/lib/libesp32_div/esp32-camera/test/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -idf_component_register(SRC_DIRS . - PRIV_INCLUDE_DIRS . - PRIV_REQUIRES test_utils esp32-camera nvs_flash - EMBED_TXTFILES pictures/testimg.jpeg pictures/test_outside.jpeg pictures/test_inside.jpeg) diff --git a/lib/libesp32_div/esp32-camera/test/component.mk b/lib/libesp32_div/esp32-camera/test/component.mk deleted file mode 100644 index 5fb883650..000000000 --- a/lib/libesp32_div/esp32-camera/test/component.mk +++ /dev/null @@ -1,8 +0,0 @@ -# -#Component Makefile -# - -COMPONENT_SRCDIRS += ./ -COMPONENT_PRIV_INCLUDEDIRS += ./ - -COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive diff --git a/lib/libesp32_div/esp32-camera/test/pictures/test_inside.jpeg b/lib/libesp32_div/esp32-camera/test/pictures/test_inside.jpeg deleted file mode 100644 index 92e7bc3694e8568be514673432c3601a8c1c4126..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18832 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 F|Jg`@ubTh> diff --git a/lib/libesp32_div/esp32-camera/test/pictures/test_outside.jpeg b/lib/libesp32_div/esp32-camera/test/pictures/test_outside.jpeg deleted file mode 100644 index dcb4bf1b3c82c9aa3858223414be90a54a1ff4c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 81744 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 -#include -#include "freertos/FreeRTOS.h" -#include "freertos/task.h" -#include "unity.h" -#include -#include "esp_log.h" - -#include "esp_camera.h" - -#ifdef CONFIG_IDF_TARGET_ESP32 -#define BOARD_WROVER_KIT 1 -#elif defined CONFIG_IDF_TARGET_ESP32S2 -#define BOARD_CAMERA_MODEL_ESP32S2 1 -#elif defined CONFIG_IDF_TARGET_ESP32S3 -#define BOARD_CAMERA_MODEL_ESP32_S3_EYE 1 -#endif - -// WROVER-KIT PIN Map -#if BOARD_WROVER_KIT - -#define PWDN_GPIO_NUM -1 //power down is not used -#define RESET_GPIO_NUM -1 //software reset will be performed -#define XCLK_GPIO_NUM 21 -#define SIOD_GPIO_NUM 26 -#define SIOC_GPIO_NUM 27 - -#define Y9_GPIO_NUM 35 -#define Y8_GPIO_NUM 34 -#define Y7_GPIO_NUM 39 -#define Y6_GPIO_NUM 36 -#define Y5_GPIO_NUM 19 -#define Y4_GPIO_NUM 18 -#define Y3_GPIO_NUM 5 -#define Y2_GPIO_NUM 4 -#define VSYNC_GPIO_NUM 25 -#define HREF_GPIO_NUM 23 -#define PCLK_GPIO_NUM 22 - -// ESP32Cam (AiThinker) PIN Map -#elif BOARD_ESP32CAM_AITHINKER - -#define PWDN_GPIO_NUM 32 -#define RESET_GPIO_NUM -1 //software reset will be performed -#define XCLK_GPIO_NUM 0 -#define SIOD_GPIO_NUM 26 -#define SIOC_GPIO_NUM 27 - -#define Y9_GPIO_NUM 35 -#define Y8_GPIO_NUM 34 -#define Y7_GPIO_NUM 39 -#define Y6_GPIO_NUM 36 -#define Y5_GPIO_NUM 21 -#define Y4_GPIO_NUM 19 -#define Y3_GPIO_NUM 18 -#define Y2_GPIO_NUM 5 -#define VSYNC_GPIO_NUM 25 -#define HREF_GPIO_NUM 23 -#define PCLK_GPIO_NUM 22 - -#elif BOARD_CAMERA_MODEL_ESP32S2 - -#define PWDN_GPIO_NUM -1 -#define RESET_GPIO_NUM -1 - -#define VSYNC_GPIO_NUM 21 -#define HREF_GPIO_NUM 38 -#define PCLK_GPIO_NUM 11 -#define XCLK_GPIO_NUM 40 - -#define SIOD_GPIO_NUM 17 -#define SIOC_GPIO_NUM 18 - -#define Y9_GPIO_NUM 39 -#define Y8_GPIO_NUM 41 -#define Y7_GPIO_NUM 42 -#define Y6_GPIO_NUM 12 -#define Y5_GPIO_NUM 3 -#define Y4_GPIO_NUM 14 -#define Y3_GPIO_NUM 37 -#define Y2_GPIO_NUM 13 - -#elif BOARD_CAMERA_MODEL_ESP32_S3_EYE - -#define PWDN_GPIO_NUM 43 -#define RESET_GPIO_NUM 44 - -#define VSYNC_GPIO_NUM 6 -#define HREF_GPIO_NUM 7 -#define PCLK_GPIO_NUM 13 -#define XCLK_GPIO_NUM 15 - -#define SIOD_GPIO_NUM 4 -#define SIOC_GPIO_NUM 5 - -#define Y9_GPIO_NUM 16 -#define Y8_GPIO_NUM 17 -#define Y7_GPIO_NUM 18 -#define Y6_GPIO_NUM 12 -#define Y5_GPIO_NUM 11 -#define Y4_GPIO_NUM 10 -#define Y3_GPIO_NUM 9 -#define Y2_GPIO_NUM 8 - -#endif - -static const char *TAG = "test camera"; - -typedef void (*decode_func_t)(uint8_t *jpegbuffer, uint32_t size, uint8_t *outbuffer); - -static esp_err_t init_camera(uint32_t xclk_freq_hz, pixformat_t pixel_format, framesize_t frame_size, uint8_t fb_count) -{ - framesize_t size_bak = frame_size; - if (PIXFORMAT_JPEG == pixel_format && FRAMESIZE_SVGA > frame_size) { - frame_size = FRAMESIZE_HD; - } - camera_config_t camera_config = { - .pin_pwdn = PWDN_GPIO_NUM, - .pin_reset = RESET_GPIO_NUM, - .pin_xclk = XCLK_GPIO_NUM, - .pin_sscb_sda = SIOD_GPIO_NUM, - .pin_sscb_scl = SIOC_GPIO_NUM, - - .pin_d7 = Y9_GPIO_NUM, - .pin_d6 = Y8_GPIO_NUM, - .pin_d5 = Y7_GPIO_NUM, - .pin_d4 = Y6_GPIO_NUM, - .pin_d3 = Y5_GPIO_NUM, - .pin_d2 = Y4_GPIO_NUM, - .pin_d1 = Y3_GPIO_NUM, - .pin_d0 = Y2_GPIO_NUM, - .pin_vsync = VSYNC_GPIO_NUM, - .pin_href = HREF_GPIO_NUM, - .pin_pclk = PCLK_GPIO_NUM, - - //EXPERIMENTAL: Set to 16MHz on ESP32-S2 or ESP32-S3 to enable EDMA mode - .xclk_freq_hz = xclk_freq_hz, - .ledc_timer = LEDC_TIMER_0, - .ledc_channel = LEDC_CHANNEL_0, - - .pixel_format = pixel_format, //YUV422,GRAYSCALE,RGB565,JPEG - .frame_size = frame_size, //QQVGA-UXGA Do not use sizes above QVGA when not JPEG - - .jpeg_quality = 12, //0-63 lower number means higher quality - .fb_count = fb_count, //if more than one, i2s runs in continuous mode. Use only with JPEG - .grab_mode = CAMERA_GRAB_WHEN_EMPTY - }; - - //initialize the camera - esp_err_t ret = esp_camera_init(&camera_config); - - if (ESP_OK == ret && PIXFORMAT_JPEG == pixel_format && FRAMESIZE_SVGA > size_bak) { - sensor_t *s = esp_camera_sensor_get(); - s->set_framesize(s, size_bak); - } - - return ret; -} - -static bool camera_test_fps(uint16_t times, float *fps, uint32_t *size) -{ - *fps = 0.0f; - *size = 0; - uint32_t s = 0; - uint32_t num = 0; - uint64_t total_time = esp_timer_get_time(); - for (size_t i = 0; i < times; i++) { - camera_fb_t *pic = esp_camera_fb_get(); - if (NULL == pic) { - ESP_LOGW(TAG, "fb get failed"); - return 0; - } else { - s += pic->len; - num++; - } - esp_camera_fb_return(pic); - } - total_time = esp_timer_get_time() - total_time; - if (num) { - *fps = num * 1000000.0f / total_time ; - *size = s / num; - } - return 1; -} - -static const char *get_cam_format_name(pixformat_t pixel_format) -{ - switch (pixel_format) { - case PIXFORMAT_JPEG: return "JPEG"; - case PIXFORMAT_RGB565: return "RGB565"; - case PIXFORMAT_RGB888: return "RGB888"; - case PIXFORMAT_YUV422: return "YUV422"; - default: - break; - } - return "UNKNOW"; -} - -static void printf_img_base64(const camera_fb_t *pic) -{ - uint8_t *outbuffer = NULL; - size_t outsize = 0; - if (PIXFORMAT_JPEG != pic->format) { - fmt2jpg(pic->buf, pic->width * pic->height * 2, pic->width, pic->height, pic->format, 50, &outbuffer, &outsize); - } else { - outbuffer = pic->buf; - outsize = pic->len; - } - - uint8_t *base64_buf = calloc(1, outsize * 4); - if (NULL != base64_buf) { - size_t out_len = 0; - mbedtls_base64_encode(base64_buf, outsize * 4, &out_len, outbuffer, outsize); - printf("%s\n", base64_buf); - free(base64_buf); - if (PIXFORMAT_JPEG != pic->format) { - free(outbuffer); - } - } else { - ESP_LOGE(TAG, "malloc for base64 buffer failed"); - } -} - -static void camera_performance_test(uint32_t xclk_freq, uint32_t pic_num) -{ - esp_err_t ret = ESP_OK; - //detect sensor information - TEST_ESP_OK(init_camera(20000000, PIXFORMAT_RGB565, FRAMESIZE_QVGA, 2)); - sensor_t *s = esp_camera_sensor_get(); - camera_sensor_info_t *info = esp_camera_sensor_get_info(&s->id); - TEST_ASSERT_NOT_NULL(info); - TEST_ESP_OK(esp_camera_deinit()); - vTaskDelay(500 / portTICK_RATE_MS); - framesize_t max_size = info->max_size; - pixformat_t all_format[] = {PIXFORMAT_JPEG, PIXFORMAT_RGB565, PIXFORMAT_YUV422, }; - pixformat_t *format_s = &all_format[0]; - pixformat_t *format_e = &all_format[2]; - if (false == info->support_jpeg) { - format_s++; // skip jpeg - } - - struct fps_result { - float fps[FRAMESIZE_INVALID]; - uint32_t size[FRAMESIZE_INVALID]; - }; - struct fps_result results[3] = {0}; - - for (; format_s <= format_e; format_s++) { - for (size_t i = 0; i <= max_size; i++) { - ESP_LOGI(TAG, "\n\n===> Testing format:%s resolution: %d x %d <===", get_cam_format_name(*format_s), resolution[i].width, resolution[i].height); - ret = init_camera(xclk_freq, *format_s, i, 2); - vTaskDelay(100 / portTICK_RATE_MS); - if (ESP_OK != ret) { - ESP_LOGW(TAG, "Testing init failed :-(, skip this item"); - vTaskDelay(500 / portTICK_RATE_MS); - continue; - } - camera_test_fps(pic_num, &results[format_s - all_format].fps[i], &results[format_s - all_format].size[i]); - TEST_ESP_OK(esp_camera_deinit()); - } - } - - printf("FPS Result\n"); - printf("resolution , JPEG fps, JPEG size, RGB565 fps, RGB565 size, YUV422 fps, YUV422 size \n"); - for (size_t i = 0; i <= max_size; i++) { - printf("%4d x %4d , %5.2f, %6d, %5.2f, %7d, %5.2f, %7d \n", - resolution[i].width, resolution[i].height, - results[0].fps[i], results[0].size[i], - results[1].fps[i], results[1].size[i], - results[2].fps[i], results[2].size[i]); - } - printf("----------------------------------------------------------------------------------------\n"); -} - -TEST_CASE("Camera driver init, deinit test", "[camera]") -{ - uint64_t t1 = esp_timer_get_time(); - TEST_ESP_OK(init_camera(20000000, PIXFORMAT_RGB565, FRAMESIZE_QVGA, 2)); - uint64_t t2 = esp_timer_get_time(); - ESP_LOGI(TAG, "Camera init time %llu ms", (t2 - t1) / 1000); - - TEST_ESP_OK(esp_camera_deinit()); -} - -TEST_CASE("Camera driver take RGB565 picture test", "[camera]") -{ - TEST_ESP_OK(init_camera(10000000, PIXFORMAT_RGB565, FRAMESIZE_QVGA, 2)); - vTaskDelay(500 / portTICK_RATE_MS); - ESP_LOGI(TAG, "Taking picture..."); - camera_fb_t *pic = esp_camera_fb_get(); - if (pic) { - ESP_LOGI(TAG, "picture: %d x %d, size: %u", pic->width, pic->height, pic->len); - printf_img_base64(pic); - esp_camera_fb_return(pic); - } - - TEST_ESP_OK(esp_camera_deinit()); - TEST_ASSERT_NOT_NULL(pic); -} - -TEST_CASE("Camera driver take YUV422 picture test", "[camera]") -{ - TEST_ESP_OK(init_camera(10000000, PIXFORMAT_YUV422, FRAMESIZE_QVGA, 2)); - vTaskDelay(500 / portTICK_RATE_MS); - ESP_LOGI(TAG, "Taking picture..."); - camera_fb_t *pic = esp_camera_fb_get(); - if (pic) { - ESP_LOGI(TAG, "picture: %d x %d, size: %u", pic->width, pic->height, pic->len); - printf_img_base64(pic); - esp_camera_fb_return(pic); - } - - TEST_ESP_OK(esp_camera_deinit()); - TEST_ASSERT_NOT_NULL(pic); -} - -TEST_CASE("Camera driver take JPEG picture test", "[camera]") -{ - TEST_ESP_OK(init_camera(20000000, PIXFORMAT_JPEG, FRAMESIZE_QVGA, 2)); - vTaskDelay(500 / portTICK_RATE_MS); - ESP_LOGI(TAG, "Taking picture..."); - camera_fb_t *pic = esp_camera_fb_get(); - if (pic) { - ESP_LOGI(TAG, "picture: %d x %d, size: %u", pic->width, pic->height, pic->len); - printf_img_base64(pic); - esp_camera_fb_return(pic); - } - - TEST_ESP_OK(esp_camera_deinit()); - TEST_ASSERT_NOT_NULL(pic); -} - -TEST_CASE("Camera driver performance test", "[camera]") -{ - camera_performance_test(20 * 1000000, 16); -} - - -static void print_rgb565_img(uint8_t *img, int width, int height) -{ - uint16_t *p = (uint16_t *)img; - const char temp2char[17] = "@MNHQ&#UJ*x7^i;."; - for (size_t j = 0; j < height; j++) { - for (size_t i = 0; i < width; i++) { - uint32_t c = p[j * width + i]; - uint8_t r = c >> 11; - uint8_t g = (c >> 6) & 0x1f; - uint8_t b = c & 0x1f; - c = (r + g + b) / 3; - c >>= 1; - printf("%c", temp2char[15 - c]); - } - printf("\n"); - } -} - -static void print_rgb888_img(uint8_t *img, int width, int height) -{ - uint8_t *p = (uint8_t *)img; - const char temp2char[17] = "@MNHQ&#UJ*x7^i;."; - for (size_t j = 0; j < height; j++) { - for (size_t i = 0; i < width; i++) { - uint8_t *c = p + 3 * (j * width + i); - uint8_t r = *c++; - uint8_t g = *c++; - uint8_t b = *c; - uint32_t v = (r + g + b) / 3; - v >>= 4; - printf("%c", temp2char[15 - v]); - } - printf("\n"); - } -} - -static void tjpgd_decode_rgb565(uint8_t *mjpegbuffer, uint32_t size, uint8_t *outbuffer) -{ - jpg2rgb565(mjpegbuffer, size, outbuffer, JPG_SCALE_NONE); -} - -static void tjpgd_decode_rgb888(uint8_t *mjpegbuffer, uint32_t size, uint8_t *outbuffer) -{ - fmt2rgb888(mjpegbuffer, size, PIXFORMAT_JPEG, outbuffer); -} - -typedef enum { - DECODE_RGB565, - DECODE_RGB888, -} decode_type_t; - -static const decode_func_t g_decode_func[2][2] = { - {tjpgd_decode_rgb565,}, - {tjpgd_decode_rgb888,}, -}; - - -static float jpg_decode_test(uint8_t decoder_index, decode_type_t type, const uint8_t *jpg, uint32_t length, uint32_t img_w, uint32_t img_h, uint32_t times) -{ - uint8_t *jpg_buf = malloc(length); - if (NULL == jpg_buf) { - ESP_LOGE(TAG, "malloc for jpg buffer failed"); - return 0; - } - memcpy(jpg_buf, jpg, length); - - uint8_t *rgb_buf = heap_caps_malloc(img_w * img_h * 3, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT); - if (NULL == rgb_buf) { - free(jpg_buf); - ESP_LOGE(TAG, "malloc for rgb buffer failed"); - return 0; - } - decode_func_t decode = g_decode_func[type][decoder_index]; - decode(jpg_buf, length, rgb_buf); - if (DECODE_RGB565 == type) { - ESP_LOGI(TAG, "jpeg decode to rgb565"); - print_rgb565_img(rgb_buf, img_w, img_h); - } else { - ESP_LOGI(TAG, "jpeg decode to rgb888"); - print_rgb888_img(rgb_buf, img_w, img_h); - } - - uint64_t t_decode[times]; - for (size_t i = 0; i < times; i++) { - uint64_t t1 = esp_timer_get_time(); - decode(jpg_buf, length, rgb_buf); - t_decode[i] = esp_timer_get_time() - t1; - } - - printf("resolution , t \n"); - uint64_t t_total = 0; - for (size_t i = 0; i < times; i++) { - t_total += t_decode[i]; - float t = t_decode[i] / 1000.0f; - printf("%4d x %4d , %5.2f ms \n", img_w, img_h, t); - } - - float fps = times / (t_total / 1000000.0f); - printf("Decode FPS Result\n"); - printf("resolution , fps \n"); - printf("%4d x %4d , %5.2f \n", img_w, img_h, fps); - - free(jpg_buf); - heap_caps_free(rgb_buf); - return fps; -} - -static void img_jpeg_decode_test(uint16_t pic_index, uint16_t lib_index) -{ - extern const uint8_t img1_start[] asm("_binary_testimg_jpeg_start"); - extern const uint8_t img1_end[] asm("_binary_testimg_jpeg_end"); - extern const uint8_t img2_start[] asm("_binary_test_inside_jpeg_start"); - extern const uint8_t img2_end[] asm("_binary_test_inside_jpeg_end"); - extern const uint8_t img3_start[] asm("_binary_test_outside_jpeg_start"); - extern const uint8_t img3_end[] asm("_binary_test_outside_jpeg_end"); - - struct img_t { - const uint8_t *buf; - uint32_t length; - uint16_t w, h; - }; - struct img_t imgs[3] = { - { - .buf = img1_start, - .length = img1_end - img1_start, - .w = 227, - .h = 149, - }, - { - .buf = img2_start, - .length = img2_end - img2_start, - .w = 320, - .h = 240, - }, - { - .buf = img3_start, - .length = img3_end - img3_start, - .w = 480, - .h = 320, - }, - }; - - ESP_LOGI(TAG, "pic_index:%d", pic_index); - ESP_LOGI(TAG, "lib_index:%d", lib_index); - jpg_decode_test(lib_index, DECODE_RGB565, imgs[pic_index].buf, imgs[pic_index].length, imgs[pic_index].w, imgs[pic_index].h, 16); -} - -TEST_CASE("Conversions image 227x149 jpeg decode test", "[camera]") -{ - img_jpeg_decode_test(0, 0); -} - -TEST_CASE("Conversions image 320x240 jpeg decode test", "[camera]") -{ - img_jpeg_decode_test(1, 0); -} - -TEST_CASE("Conversions image 480x320 jpeg decode test", "[camera]") -{ - img_jpeg_decode_test(2, 0); -} diff --git a/platformio_override_sample.ini b/platformio_override.ini similarity index 96% rename from platformio_override_sample.ini rename to platformio_override.ini index b1d7b7eff..816fffe7e 100644 --- a/platformio_override_sample.ini +++ b/platformio_override.ini @@ -16,7 +16,7 @@ extra_configs = platformio_tasmota_cenv.ini ; *** Build/upload environment default_envs = ; *** Uncomment the line(s) below to select version(s) - tasmota +; tasmota ; tasmota-debug ; tasmota-minimal ; tasmota-lite @@ -27,7 +27,7 @@ default_envs = ; tasmota-ir ; tasmota32 ; tasmota32-bluetooth -; tasmota32-webcam + tasmota32-webcam ; tasmota32-knx ; tasmota32-sensors ; tasmota32-display From 3c631c1f0fd598daa0de2d0dbaa1511052ffbfed Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 19 Dec 2021 13:56:06 +0100 Subject: [PATCH 069/402] Update .gitpod.yml --- .gitpod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod.yml b/.gitpod.yml index 7a7300013..50d9a86d9 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,6 +1,6 @@ tasks: - before: platformio upgrade - - command: platformio run -e tasmota32-webcam + - command: platformio run -e tasmota image: file: .gitpod.Dockerfile From 047fd6d05e1d6ad537c561477dff9a3be054f8ae Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 19 Dec 2021 13:59:46 +0100 Subject: [PATCH 070/402] Update and rename platformio_override.ini to platformio_override_sample.ini --- platformio_override.ini => platformio_override_sample.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename platformio_override.ini => platformio_override_sample.ini (96%) diff --git a/platformio_override.ini b/platformio_override_sample.ini similarity index 96% rename from platformio_override.ini rename to platformio_override_sample.ini index 816fffe7e..b1d7b7eff 100644 --- a/platformio_override.ini +++ b/platformio_override_sample.ini @@ -16,7 +16,7 @@ extra_configs = platformio_tasmota_cenv.ini ; *** Build/upload environment default_envs = ; *** Uncomment the line(s) below to select version(s) -; tasmota + tasmota ; tasmota-debug ; tasmota-minimal ; tasmota-lite @@ -27,7 +27,7 @@ default_envs = ; tasmota-ir ; tasmota32 ; tasmota32-bluetooth - tasmota32-webcam +; tasmota32-webcam ; tasmota32-knx ; tasmota32-sensors ; tasmota32-display From e0d9c3dcef7837a0e76768286573eb7c71bd4b01 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 19 Dec 2021 14:04:41 +0100 Subject: [PATCH 071/402] Update platformio_tasmota_env32.ini --- platformio_tasmota_env32.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini index 7a686762f..f7558b5c7 100644 --- a/platformio_tasmota_env32.ini +++ b/platformio_tasmota_env32.ini @@ -56,7 +56,7 @@ build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32 extends = env:tasmota32_base board = esp32-cam build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_WEBCAM -lib_extra_dirs = lib/libesp32, lib/libesp32_div +lib_extra_dirs = lib/libesp32 [env:tasmota32-odroidgo] extends = env:tasmota32_base From 81aa57947100f641a350427f0204c1a0bef94a57 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Sun, 19 Dec 2021 16:41:10 +0100 Subject: [PATCH 072/402] Refactor Tuya driver to enable ESP32 support Refactor Tuya driver to enable ESP32 support (#14086, #14106) --- tasmota/tasmota_globals.h | 3 - tasmota/xdrv_12_discovery.ino | 6 +- tasmota/xdrv_12_home_assistant.ino | 24 ++++---- tasmota/xdrv_16_tuyamcu.ino | 92 +++++++++++++++++------------- 4 files changed, 69 insertions(+), 56 deletions(-) diff --git a/tasmota/tasmota_globals.h b/tasmota/tasmota_globals.h index aa9f97063..b69f1f166 100644 --- a/tasmota/tasmota_globals.h +++ b/tasmota/tasmota_globals.h @@ -133,7 +133,6 @@ String EthernetMacAddress(void); #undef FIRMWARE_MINIMAL // Minimal is not supported as not needed // Hardware has no ESP32 -#undef USE_TUYA_DIMMER #undef USE_PWM_DIMMER #undef USE_EXS_DIMMER #undef USE_ARMTRONIX_DIMMERS @@ -146,9 +145,7 @@ String EthernetMacAddress(void); #undef USE_RF_FLASH // Not ported (yet) - #undef USE_MY92X1 -#undef USE_TUYA_MCU #undef USE_PS_16_DZ #undef USE_HM10 // Disable support for HM-10 as a BLE-bridge as an alternative is using the internal ESP32 BLE diff --git a/tasmota/xdrv_12_discovery.ino b/tasmota/xdrv_12_discovery.ino index da92495d5..112df2387 100644 --- a/tasmota/xdrv_12_discovery.ino +++ b/tasmota/xdrv_12_discovery.ino @@ -48,10 +48,12 @@ void TasDiscoverMessage(void) { } bool TuyaMod = false; +#ifdef USE_TUYA_MCU + TuyaMod = IsModuleTuya(); +#endif bool iFanMod = false; #ifdef ESP8266 - if ((TUYA_DIMMER == TasmotaGlobal.module_type) || (SK03_TUYA == TasmotaGlobal.module_type)) { TuyaMod = true; }; - if ((SONOFF_IFAN02 == TasmotaGlobal.module_type) || (SONOFF_IFAN03 == TasmotaGlobal.module_type)) { iFanMod = true; }; + iFanMod = ((SONOFF_IFAN02 == TasmotaGlobal.module_type) || (SONOFF_IFAN03 == TasmotaGlobal.module_type)); #endif // ESP8266 ResponseAppend_P(PSTR("]," // Friendly Names (end) diff --git a/tasmota/xdrv_12_home_assistant.ino b/tasmota/xdrv_12_home_assistant.ino index a686531f6..e1cdc5179 100644 --- a/tasmota/xdrv_12_home_assistant.ino +++ b/tasmota/xdrv_12_home_assistant.ino @@ -215,10 +215,12 @@ void HassDiscoverMessage(void) { } bool TuyaMod = false; +#ifdef USE_TUYA_MCU + TuyaMod = IsModuleTuya(); +#endif bool iFanMod = false; #ifdef ESP8266 - if ((TUYA_DIMMER == TasmotaGlobal.module_type) || (SK03_TUYA == TasmotaGlobal.module_type)) { TuyaMod = true; }; - if ((SONOFF_IFAN02 == TasmotaGlobal.module_type) || (SONOFF_IFAN03 == TasmotaGlobal.module_type)) { iFanMod = true; }; + iFanMod = ((SONOFF_IFAN02 == TasmotaGlobal.module_type) || (SONOFF_IFAN03 == TasmotaGlobal.module_type)); #endif // ESP8266 ResponseAppend_P(PSTR("]," // Friendly Names (end) @@ -456,12 +458,14 @@ void HAssAnnounceRelayLight(void) uint8_t TuyaDim = 0; power_t shutter_mask = 0; - #ifdef ESP8266 - if (PWM_DIMMER == TasmotaGlobal.module_type ) { PwmMod = true; } // - if (SONOFF_IFAN02 == TasmotaGlobal.module_type || SONOFF_IFAN03 == TasmotaGlobal.module_type) { FanMod = true; } - if (SONOFF_DUAL == TasmotaGlobal.module_type) { valid_relay = 2; } - if (TUYA_DIMMER == TasmotaGlobal.module_type || SK03_TUYA == TasmotaGlobal.module_type) { TuyaMod = true; } - #endif //ESP8266 +#ifdef ESP8266 + PwmMod = (PWM_DIMMER == TasmotaGlobal.module_type); + FanMod = (SONOFF_IFAN02 == TasmotaGlobal.module_type || SONOFF_IFAN03 == TasmotaGlobal.module_type); + if (SONOFF_DUAL == TasmotaGlobal.module_type) { valid_relay = 2; } +#endif //ESP8266 +#ifdef USE_TUYA_MCU + TuyaMod = IsModuleTuya(); +#endif #ifdef USE_LIGHT // If there is a special Light to be enabled and managed with SetOption68 or SetOption37 >= 128, Discovery calculates the maximum number of entities to be generated in advance @@ -1038,10 +1042,10 @@ void HAssAnnounceShutters(void) GetTopic_P(stemp1, STAT, TasmotaGlobal.mqtt_topic, PSTR("SHUTTER")); GetTopic_P(stemp2, CMND, TasmotaGlobal.mqtt_topic, PSTR("ShutterPosition")); TryResponseAppend_P(HASS_DISCOVER_SHUTTER_POS, stemp1, i + 1, stemp2, i + 1); - + GetTopic_P(stemp1, CMND, TasmotaGlobal.mqtt_topic, PSTR("ShutterTilt")); TryResponseAppend_P(HASS_DISCOVER_SHUTTER_TILT, stemp1, i + 1, Settings->shutter_tilt_config[3][i], Settings->shutter_tilt_config[4][i]); - + TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO_SHORT, unique_id, ESP_getChipId()); TryResponseAppend_P(PSTR("}")); } else { diff --git a/tasmota/xdrv_16_tuyamcu.ino b/tasmota/xdrv_16_tuyamcu.ino index 5750839c5..3c550424f 100644 --- a/tasmota/xdrv_16_tuyamcu.ino +++ b/tasmota/xdrv_16_tuyamcu.ino @@ -81,6 +81,7 @@ struct TUYA { bool send_success_next_second = false; // Second command success in low power mode uint32_t ignore_dimmer_cmd_timeout = 0; // Time until which received dimmer commands should be ignored bool ignore_tuyareceived = false; // When a modeset changes ignore stat + bool active; } Tuya; #define D_JSON_TUYA_MCU_RECEIVED "TuyaReceived" @@ -109,9 +110,16 @@ void (* const TuyaCommand[])(void) PROGMEM = { /*********************************************************************************************\ * Web Interface \*********************************************************************************************/ -bool IsModuleTuya(void) -{ - return ((TUYA_DIMMER == TasmotaGlobal.module_type) || (SK03_TUYA == TasmotaGlobal.module_type)); + +bool IsModuleTuya(void) { + bool is_tuya = Tuya.active; +//#ifdef ESP8266 + // This is not a Tuya driven device. It uses a Tuya provided ESP8266. Why it was here is a mystery to me. +// if (SK03_TUYA == TasmotaGlobal.module_type) { +// is_tuya = true; +// } +//#endif + return is_tuya; } bool AsModuleTuyaMS(void) // ModeSet Layout @@ -123,6 +131,7 @@ bool TuyaModeSet(void) // ModeSet Status { return Tuya.ModeSet; } + /*********************************************************************************************\ * Web Interface \*********************************************************************************************/ @@ -1055,8 +1064,10 @@ void TuyaNormalPowerModePacketProcess(void) * API Functions \*********************************************************************************************/ -bool TuyaModuleSelected(void) -{ +bool TuyaModuleSelected(void) { +#ifdef ESP8266 + if (TUYA_DIMMER != TasmotaGlobal.module_type) { return false; } + if (!PinUsed(GPIO_TUYA_RX) || !PinUsed(GPIO_TUYA_TX)) { // fallback to hardware-serial if not explicitly selected SetPin(1, AGPIO(GPIO_TUYA_TX)); SetPin(3, AGPIO(GPIO_TUYA_RX)); @@ -1064,6 +1075,8 @@ bool TuyaModuleSelected(void) Settings->my_gp.io[3] = AGPIO(GPIO_TUYA_RX); TasmotaGlobal.restart_flag = 2; } +#endif + if (!PinUsed(GPIO_TUYA_RX) || !PinUsed(GPIO_TUYA_TX)) { return false; } if (TuyaGetDpId(TUYA_MCU_FUNC_DIMMER) == 0 && TUYA_DIMMER_ID > 0) { TuyaAddMcuFunc(TUYA_MCU_FUNC_DIMMER, TUYA_DIMMER_ID); @@ -1119,8 +1132,7 @@ bool TuyaModuleSelected(void) return true; } -void TuyaInit(void) -{ +void TuyaInit(void) { int baudrate = 9600; if (Settings->flag4.tuyamcu_baudrate) { baudrate = 115200; } // SetOption97 - Set Baud rate for TuyaMCU serial communication (0 = 9600 or 1 = 115200) @@ -1134,10 +1146,12 @@ void TuyaInit(void) Tuya.ignore_topic_timeout = millis() + 1000; // suppress /STAT topic for 1000ms to avoid data overflow AddLog(LOG_LEVEL_DEBUG, PSTR("TYA: Request MCU configuration at %d bps"), baudrate); - + Tuya.heartbeat_timer = 0; // init heartbeat timer when dimmer init is done + return; } + free(Tuya.buffer); } - Tuya.heartbeat_timer = 0; // init heartbeat timer when dimmer init is done + Tuya.active = false; } void TuyaSerialInput(void) @@ -1332,33 +1346,6 @@ void TuyaSetTime(void) { } #endif //USE_TUYA_TIME -#ifdef USE_ENERGY_SENSOR - -/*********************************************************************************************\ - * Energy Interface -\*********************************************************************************************/ - -bool Xnrg32(uint8_t function) -{ - bool result = false; - - if (TUYA_DIMMER == TasmotaGlobal.module_type) { - if (FUNC_PRE_INIT == function) { - if (TuyaGetDpId(TUYA_MCU_FUNC_POWER) != 0 || TuyaGetDpId(TUYA_MCU_FUNC_POWER_COMBINED) != 0) { - if (TuyaGetDpId(TUYA_MCU_FUNC_CURRENT) == 0 && TuyaGetDpId(TUYA_MCU_FUNC_POWER_COMBINED) == 0) { - Energy.current_available = false; - } - if (TuyaGetDpId(TUYA_MCU_FUNC_VOLTAGE) == 0 && TuyaGetDpId(TUYA_MCU_FUNC_POWER_COMBINED) == 0) { - Energy.voltage_available = false; - } - TasmotaGlobal.energy_driver = XNRG_32; - } - } - } - return result; -} -#endif // USE_ENERGY_SENSOR - /*********************************************************************************************\ * Sensors \*********************************************************************************************/ @@ -1471,18 +1458,41 @@ void TuyaAddButton(void) { * Interface \*********************************************************************************************/ -bool Xdrv16(uint8_t function) +#ifdef USE_ENERGY_SENSOR + +bool Xnrg32(uint8_t function) { bool result = false; - if (TUYA_DIMMER == TasmotaGlobal.module_type) { + if (Tuya.active) { + if (FUNC_PRE_INIT == function) { + if (TuyaGetDpId(TUYA_MCU_FUNC_POWER) != 0 || TuyaGetDpId(TUYA_MCU_FUNC_POWER_COMBINED) != 0) { + if (TuyaGetDpId(TUYA_MCU_FUNC_CURRENT) == 0 && TuyaGetDpId(TUYA_MCU_FUNC_POWER_COMBINED) == 0) { + Energy.current_available = false; + } + if (TuyaGetDpId(TUYA_MCU_FUNC_VOLTAGE) == 0 && TuyaGetDpId(TUYA_MCU_FUNC_POWER_COMBINED) == 0) { + Energy.voltage_available = false; + } + TasmotaGlobal.energy_driver = XNRG_32; + } + } + } + return result; +} +#endif // USE_ENERGY_SENSOR + +bool Xdrv16(uint8_t function) { + bool result = false; + + if (FUNC_MODULE_INIT == function) { + result = TuyaModuleSelected(); + Tuya.active = result; + } + else if (Tuya.active) { switch (function) { case FUNC_LOOP: if (TuyaSerial) { TuyaSerialInput(); } break; - case FUNC_MODULE_INIT: - result = TuyaModuleSelected(); - break; case FUNC_PRE_INIT: TuyaInit(); break; From 463dd14f901e5c0d68acde5df5ca09413a2c2028 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Sun, 19 Dec 2021 16:57:57 +0100 Subject: [PATCH 073/402] Enable My92X1 for ESP32 --- tasmota/tasmota_globals.h | 1 - tasmota/xlgt_02_my92x1.ino | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tasmota/tasmota_globals.h b/tasmota/tasmota_globals.h index b69f1f166..b7067ab94 100644 --- a/tasmota/tasmota_globals.h +++ b/tasmota/tasmota_globals.h @@ -145,7 +145,6 @@ String EthernetMacAddress(void); #undef USE_RF_FLASH // Not ported (yet) -#undef USE_MY92X1 #undef USE_PS_16_DZ #undef USE_HM10 // Disable support for HM-10 as a BLE-bridge as an alternative is using the internal ESP32 BLE diff --git a/tasmota/xlgt_02_my92x1.ino b/tasmota/xlgt_02_my92x1.ino index 2c851a9b1..ef23c3c9c 100644 --- a/tasmota/xlgt_02_my92x1.ino +++ b/tasmota/xlgt_02_my92x1.ino @@ -125,7 +125,8 @@ void My92x1ModuleSelected(void) digitalWrite(My92x1.pdcki_pin, LOW); My92x1.model = 2; - TasmotaGlobal.light_type = LT_RGBW; // RGBW (2 chips) as used in Lohas + TasmotaGlobal.light_type = LT_RGBW; // RGBW (2 chips) as used in Lohas +#ifdef ESP8266 if (AILIGHT == TasmotaGlobal.module_type) { // RGBW (1 chip) as used in Ailight My92x1.model = 0; // TasmotaGlobal.light_type = LT_RGBW; @@ -134,6 +135,7 @@ void My92x1ModuleSelected(void) My92x1.model = 1; TasmotaGlobal.light_type = LT_RGBWC; } +#endif // ESP8266 LightMy92x1Init(); From acb54f99f7eefa40f125462a988291d691da035b Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 19 Dec 2021 17:37:15 +0100 Subject: [PATCH 074/402] Update platformio_tasmota_cenv_sample.ini --- platformio_tasmota_cenv_sample.ini | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/platformio_tasmota_cenv_sample.ini b/platformio_tasmota_cenv_sample.ini index 446f0aaa8..5aad5fecf 100644 --- a/platformio_tasmota_cenv_sample.ini +++ b/platformio_tasmota_cenv_sample.ini @@ -1,17 +1,3 @@ -;*** Beta Tasmota version for ESP32-S2 -[env:tasmota32s2] -extends = env:tasmota32_base -board = esp32s2 -build_flags = ${env:tasmota32_base.build_flags} -D FIRMWARE_TASMOTA32 -lib_ignore = - ESP8266Audio - ESP8266SAM - TTGO TWatch Library - NimBLE-Arduino - epdiy - esp32-camera - Micro-RTSP - [env:tasmota-rangeextender] build_flags = ${env.build_flags} -D FIRMWARE_RANGE_EXTENDER From 02145d59874fc8f591062345d842bbaaa7a95da0 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 19 Dec 2021 17:39:47 +0100 Subject: [PATCH 075/402] mv S2 build to env32 --- platformio_tasmota_env32.ini | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini index f7558b5c7..aa5436e7e 100644 --- a/platformio_tasmota_env32.ini +++ b/platformio_tasmota_env32.ini @@ -102,7 +102,18 @@ lib_ignore = TTGO TWatch Library Micro-RTSP epdiy - esp32-camera + +[env:tasmota32s2] +extends = env:tasmota32_base +board = esp32s2 +build_flags = ${env:tasmota32_base.build_flags} -D FIRMWARE_TASMOTA32 -DUSE_AUTOCONF +lib_ignore = + ESP8266Audio + ESP8266SAM + TTGO TWatch Library + NimBLE-Arduino + Micro-RTSP + epdiy [env:tasmota32-AF] extends = env:tasmota32_base From da01a344ee14bd5afa5735bc49425ee9826c4823 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 19 Dec 2021 23:30:29 +0100 Subject: [PATCH 076/402] add esp32 exception decoder --- platformio_tasmota_cenv_sample.ini | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/platformio_tasmota_cenv_sample.ini b/platformio_tasmota_cenv_sample.ini index 5aad5fecf..864046de2 100644 --- a/platformio_tasmota_cenv_sample.ini +++ b/platformio_tasmota_cenv_sample.ini @@ -24,22 +24,24 @@ extends = env:tasmota32_base build_type = debug build_unflags = ${env:tasmota32_base.build_unflags} build_flags = ${env:tasmota32_base.build_flags} +monitor_filters = esp32_exception_decoder ; -Wstack-usage=300 ; *** JTAG Debug version, needs esp-prog or FT2232H or FT232H ; *** Install howto for Windows https://community.platformio.org/t/esp32-pio-unified-debugger/4541/20 [env:tasmota32-ocd] -;build_type = debug +build_type = debug extends = env:tasmota32_base debug_tool = esp-prog upload_protocol = esp-prog debug_init_break = tbreak setup build_unflags = ${env:tasmota32_base.build_unflags} build_flags = ${env:tasmota32_base.build_flags} +monitor_filters = esp32_exception_decoder ; *** JTAG Debug version, needs esp-prog or FT2232H or FT232H [env:tasmota32solo1-ocd] -;build_type = debug +build_type = debug extends = env:tasmota32_base platform_packages = ${core32solo1.platform_packages} board = esp32_solo1_4M @@ -48,3 +50,4 @@ upload_protocol = esp-prog debug_init_break = tbreak setup build_unflags = ${env:tasmota32_base.build_unflags} build_flags = ${env:tasmota32_base.build_flags} +monitor_filters = esp32_exception_decoder From 38e6a9fdf03ad2ea24e5e39b717b555aeb097225 Mon Sep 17 00:00:00 2001 From: Stephan Hadinger Date: Mon, 20 Dec 2021 11:17:11 +0100 Subject: [PATCH 077/402] Berry created separate library `lv_berry` to isolate LVGL-Berry mapping --- lib/libesp32/berry/generate/be_const_strtab.h | 4 + .../berry/generate/be_const_strtab_def.h | 1834 +++++++++-------- lib/libesp32/berry/generate/be_fixed_cb.h | 5 +- lib/libesp32/berry_mapping/src/be_cb_module.c | 130 +- .../berry_mapping/src/be_class_wrapper.c | 59 +- .../lv_berry/generate/be_lvgl_widgets_lib.c | 30 +- lib/libesp32_lvgl/lv_berry/library.json | 6 +- .../lv_berry/src/be_lvgl_glob_lib.c | 911 ++++---- .../lv_berry/src/embedded/lvgl_glob.be | 21 +- lib/libesp32_lvgl/lv_berry/src/lv_berry.c | 287 +++ lib/libesp32_lvgl/lv_berry/src/lv_berry.h | 16 + lib/libesp32_lvgl/lv_berry/tools/convert.py | 30 +- tasmota/berry/lvgl_examples/widget_test.be | 7 +- tasmota/lvgl_berry/be_lv_c_mapping.h | 1097 ---------- tasmota/lvgl_berry/tasmota_lv_stdlib.h | 24 - tasmota/xdrv_52_3_berry_lvgl.ino | 313 --- 16 files changed, 1941 insertions(+), 2833 deletions(-) delete mode 100644 tasmota/lvgl_berry/be_lv_c_mapping.h delete mode 100644 tasmota/lvgl_berry/tasmota_lv_stdlib.h diff --git a/lib/libesp32/berry/generate/be_const_strtab.h b/lib/libesp32/berry/generate/be_const_strtab.h index cdf680ea3..430c08944 100644 --- a/lib/libesp32/berry/generate/be_const_strtab.h +++ b/lib/libesp32/berry/generate/be_const_strtab.h @@ -206,6 +206,7 @@ extern const bcstring be_const_str_add; extern const bcstring be_const_str_add_anim; extern const bcstring be_const_str_add_cmd; extern const bcstring be_const_str_add_driver; +extern const bcstring be_const_str_add_handler; extern const bcstring be_const_str_add_header; extern const bcstring be_const_str_add_rule; extern const bcstring be_const_str_addr; @@ -464,6 +465,7 @@ extern const bcstring be_const_str_length_X20in_X20bits_X20must_X20be_X20between extern const bcstring be_const_str_light; extern const bcstring be_const_str_line_dsc; extern const bcstring be_const_str_list; +extern const bcstring be_const_str_list_handlers; extern const bcstring be_const_str_listdir; extern const bcstring be_const_str_load; extern const bcstring be_const_str_load_templates; @@ -473,11 +475,13 @@ extern const bcstring be_const_str_log10; extern const bcstring be_const_str_loop; extern const bcstring be_const_str_lower; extern const bcstring be_const_str_lv; +extern const bcstring be_const_str_lv_; extern const bcstring be_const_str_lv_event; extern const bcstring be_const_str_lv_event_cb; extern const bcstring be_const_str_lv_obj; extern const bcstring be_const_str_lv_obj_class; extern const bcstring be_const_str_lvgl_event_dispatch; +extern const bcstring be_const_str_make_cb; extern const bcstring be_const_str_map; extern const bcstring be_const_str_math; extern const bcstring be_const_str_matrix; diff --git a/lib/libesp32/berry/generate/be_const_strtab_def.h b/lib/libesp32/berry/generate/be_const_strtab_def.h index cd2198905..822b96cde 100644 --- a/lib/libesp32/berry/generate/be_const_strtab_def.h +++ b/lib/libesp32/berry/generate/be_const_strtab_def.h @@ -1,716 +1,720 @@ -be_define_const_str(, "", 2166136261u, 0, 0, &be_const_str_AudioFileSourceFS); -be_define_const_str(_X0A, "\n", 252472541u, 0, 1, &be_const_str_file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27); -be_define_const_str(_X20, " ", 621580159u, 0, 1, &be_const_str_gen_cb); -be_define_const_str(_X21_X3D, "!=", 2428715011u, 0, 2, &be_const_str__X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E); -be_define_const_str(_X21_X3D_X3D, "!==", 559817114u, 0, 3, &be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E); -be_define_const_str(_X23, "#", 638357778u, 0, 1, &be_const_str_refr_size); -be_define_const_str(_X23autoexec_X2Ebat, "#autoexec.bat", 3382890497u, 0, 13, &be_const_str_get_option); -be_define_const_str(_X23autoexec_X2Ebe, "#autoexec.be", 1181757091u, 0, 12, &be_const_str_every_second); -be_define_const_str(_X23display_X2Eini, "#display.ini", 182218220u, 0, 12, &be_const_str__X3Cp_X3E_X3Csmall_X3E_X26nbsp_X3B_X28This_X20feature_X20requires_X20an_X20internet_X20connection_X29_X3C_X2Fsmall_X3E_X3C_X2Fp_X3E); -be_define_const_str(_X23init_X2Ebat, "#init.bat", 3297595077u, 0, 9, &be_const_str_real); -be_define_const_str(_X23preinit_X2Ebe, "#preinit.be", 687035716u, 0, 11, &be_const_str_publish_result); -be_define_const_str(_X2502d_X25s_X2502d, "%02d%s%02d", 1587999717u, 0, 10, &be_const_str_last_modified); -be_define_const_str(_X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d, "%04d-%02d-%02dT%02d:%02d:%02d", 3425528601u, 0, 29, &be_const_str__write); -be_define_const_str(_X25s_X2Eautoconf, "%s.autoconf", 3560383524u, 0, 11, &be_const_str_format); -be_define_const_str(_X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B, "<Error: apply new or remove>", 2855507949u, 0, 34, &be_const_str___upper__); -be_define_const_str(_X26lt_X3BNone_X26gt_X3B, "<None>", 2602165498u, 0, 12, &be_const_str_SERIAL_7E2); -be_define_const_str(_X28_X29, "()", 685372826u, 0, 2, &be_const_str_get_alternate); -be_define_const_str(_X2B, "+", 772578730u, 0, 1, &be_const_str_area); -be_define_const_str(_X2C, ",", 688690635u, 0, 1, NULL); -be_define_const_str(_X2D_X2D_X3A_X2D_X2D, "--:--", 1370615441u, 0, 5, &be_const_str__X2F_X2Eautoconf); -be_define_const_str(_X2E, ".", 722245873u, 0, 1, &be_const_str__ccmd); -be_define_const_str(_X2E_X2E, "..", 2748622605u, 0, 2, NULL); -be_define_const_str(_X2Eautoconf, ".autoconf", 2524679088u, 0, 9, NULL); -be_define_const_str(_X2Ebe, ".be", 1325797348u, 0, 3, &be_const_str_digital_read); -be_define_const_str(_X2Ebec, ".bec", 3985273221u, 0, 4, &be_const_str_CFG_X3A_X20loading_X20); -be_define_const_str(_X2Elen, ".len", 850842136u, 0, 4, &be_const_str_SERIAL_6N2); -be_define_const_str(_X2Ep, ".p", 1171526419u, 0, 2, &be_const_str_arg_name); -be_define_const_str(_X2Ep1, ".p1", 249175686u, 0, 3, &be_const_str_battery_present); -be_define_const_str(_X2Ep2, ".p2", 232398067u, 0, 3, &be_const_str_b); -be_define_const_str(_X2Esize, ".size", 1965188224u, 0, 5, &be_const_str_CFG_X3A_X20loaded_X20_X27_X25s_X27); -be_define_const_str(_X2Etapp, ".tapp", 1363391594u, 0, 5, &be_const_str_Parameter_X20error); -be_define_const_str(_X2Ew, ".w", 1255414514u, 0, 2, &be_const_str_running); -be_define_const_str(_X2F, "/", 705468254u, 0, 1, &be_const_str__class); -be_define_const_str(_X2F_X2Eautoconf, "/.autoconf", 2212074393u, 0, 10, &be_const_str_connect); -be_define_const_str(_X2F_X3Frst_X3D, "/?rst=", 580074707u, 0, 6, &be_const_str_content_stop); -be_define_const_str(_X2Fac, "/ac", 3904651978u, 0, 3, &be_const_str_ins_ramp); -be_define_const_str(_X3A, ":", 1057798253u, 0, 1, &be_const_str_get_string); -be_define_const_str(_X3C, "<", 957132539u, 0, 1, &be_const_str_set_bri); -be_define_const_str(_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "

", 3546571739u, 0, 11, &be_const_str_remove); -be_define_const_str(_X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "

", 1863865923u, 0, 16, NULL); -be_define_const_str(_X3C_X3D, "<=", 2499223986u, 0, 2, &be_const_str_remove_rule); -be_define_const_str(_X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, "", 3147934216u, 0, 82, &be_const_str___lower__); -be_define_const_str(_X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, "", 1205771629u, 0, 72, &be_const_str_content_send_style); -be_define_const_str(_X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, "
", 842307168u, 0, 77, &be_const_str_bri); -be_define_const_str(_X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29, "Choose a device configuration:
", 1336654704u, 0, 49, &be_const_str_cosh); -be_define_const_str(_X3Clambda_X3E, "", 607256038u, 0, 8, &be_const_str_item); -be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Current auto-configuration", 4212500780u, 0, 82, &be_const_str_AXP192); -be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Select new auto-configuration", 1926223891u, 0, 80, &be_const_str_internal_error); -be_define_const_str(_X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E, "", 510303524u, 0, 30, &be_const_str_enabled); -be_define_const_str(_X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E, "", 3994619755u, 0, 54, &be_const_str_widget_cb); -be_define_const_str(_X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E, "

Exception:
'%s'
%s

", 4252565082u, 0, 59, &be_const_str_EVENT_DRAW_MAIN); -be_define_const_str(_X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "

", 2052843416u, 0, 25, &be_const_str_allocated); -be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "

", 452285201u, 0, 120, &be_const_str_CFG_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s); -be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, "

 (This feature requires an internet connection)

", 2719266486u, 0, 74, &be_const_str_str); -be_define_const_str(_X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E, "

Current configuration:

%s

", 4115655761u, 0, 46, &be_const_str_gc); -be_define_const_str(_X3Cselect_X20name_X3D_X27zip_X27_X3E, "

", 1863865923u, 0, 16, &be_const_str_rule); +be_define_const_str(_X3C_X3D, "<=", 2499223986u, 0, 2, &be_const_str_set_chg_current); +be_define_const_str(_X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, "", 3147934216u, 0, 82, &be_const_str_find_op); +be_define_const_str(_X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, "", 1205771629u, 0, 72, NULL); +be_define_const_str(_X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, "
", 842307168u, 0, 77, &be_const_str_get_current_module_path); +be_define_const_str(_X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29, "Choose a device configuration:
", 1336654704u, 0, 49, &be_const_str_delay); +be_define_const_str(_X3Clambda_X3E, "", 607256038u, 0, 8, &be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20); +be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Current auto-configuration", 4212500780u, 0, 82, &be_const_str_CFG_X3A_X20could_X20not_X20run_X20_X25s_X20_X28_X25s_X20_X2D_X20_X25s_X29); +be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Select new auto-configuration", 1926223891u, 0, 80, &be_const_str_CFG_X3A_X20multiple_X20autoconf_X20files_X20found_X2C_X20aborting_X20_X28_X27_X25s_X27_X20_X2B_X20_X27_X25s_X27_X29); +be_define_const_str(_X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E, "", 510303524u, 0, 30, &be_const_str_write); +be_define_const_str(_X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E, "", 3994619755u, 0, 54, &be_const_str_None); +be_define_const_str(_X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E, "

Exception:
'%s'
%s

", 4252565082u, 0, 59, &be_const_str_classof); +be_define_const_str(_X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "

", 2052843416u, 0, 25, &be_const_str_button_pressed); +be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "

", 452285201u, 0, 120, NULL); +be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, "

 (This feature requires an internet connection)

", 2719266486u, 0, 74, NULL); +be_define_const_str(_X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E, "

Current configuration:

%s

", 4115655761u, 0, 46, &be_const_str_exec_tele); +be_define_const_str(_X3Cselect_X20name_X3D_X27zip_X27_X3E, "

", 1863865923u, 0, 16, &be_const_str_rule); -be_define_const_str(_X3C_X3D, "<=", 2499223986u, 0, 2, &be_const_str_set_chg_current); -be_define_const_str(_X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, "", 3147934216u, 0, 82, &be_const_str_find_op); -be_define_const_str(_X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, "", 1205771629u, 0, 72, NULL); -be_define_const_str(_X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, "
", 842307168u, 0, 77, &be_const_str_get_current_module_path); -be_define_const_str(_X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29, "Choose a device configuration:
", 1336654704u, 0, 49, &be_const_str_delay); -be_define_const_str(_X3Clambda_X3E, "", 607256038u, 0, 8, &be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20); -be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Current auto-configuration", 4212500780u, 0, 82, &be_const_str_CFG_X3A_X20could_X20not_X20run_X20_X25s_X20_X28_X25s_X20_X2D_X20_X25s_X29); -be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Select new auto-configuration", 1926223891u, 0, 80, &be_const_str_CFG_X3A_X20multiple_X20autoconf_X20files_X20found_X2C_X20aborting_X20_X28_X27_X25s_X27_X20_X2B_X20_X27_X25s_X27_X29); -be_define_const_str(_X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E, "", 510303524u, 0, 30, &be_const_str_write); -be_define_const_str(_X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E, "", 3994619755u, 0, 54, &be_const_str_None); -be_define_const_str(_X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E, "

Exception:
'%s'
%s

", 4252565082u, 0, 59, &be_const_str_classof); -be_define_const_str(_X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "

", 2052843416u, 0, 25, &be_const_str_button_pressed); -be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "

", 452285201u, 0, 120, NULL); -be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, "

 (This feature requires an internet connection)

", 2719266486u, 0, 74, NULL); -be_define_const_str(_X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E, "

Current configuration:

%s

", 4115655761u, 0, 46, &be_const_str_exec_tele); -be_define_const_str(_X3Cselect_X20name_X3D_X27zip_X27_X3E, "

", 1863865923u, 0, 16, &be_const_str_f); +be_define_const_str(_X3C_X3D, "<=", 2499223986u, 0, 2, &be_const_str_exp); +be_define_const_str(_X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, "", 3147934216u, 0, 82, &be_const_str__X3Cp_X3E_X3Csmall_X3E_X26nbsp_X3B_X28This_X20feature_X20requires_X20an_X20internet_X20connection_X29_X3C_X2Fsmall_X3E_X3C_X2Fp_X3E); +be_define_const_str(_X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, "", 1205771629u, 0, 72, &be_const_str_CFG_X3A_X20removed_X20file_X20_X27_X25s_X27); +be_define_const_str(_X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, "
", 842307168u, 0, 77, &be_const_str_get_bat_charge_current); +be_define_const_str(_X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29, "Choose a device configuration:
", 1336654704u, 0, 49, &be_const_str_compile); +be_define_const_str(_X3Clambda_X3E, "", 607256038u, 0, 8, &be_const_str_widget_struct_by_class); +be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Current auto-configuration", 4212500780u, 0, 82, &be_const_str_pin_mode); +be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Select new auto-configuration", 1926223891u, 0, 80, &be_const_str_set_ldo_enable); +be_define_const_str(_X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E, "", 510303524u, 0, 30, NULL); +be_define_const_str(_X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E, "", 3994619755u, 0, 54, &be_const_str_event_cb); +be_define_const_str(_X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E, "

Exception:
'%s'
%s

", 4252565082u, 0, 59, &be_const_str_color); +be_define_const_str(_X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "

", 2052843416u, 0, 25, &be_const_str__X3Cselect_X20name_X3D_X27zip_X27_X3E); +be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "

", 452285201u, 0, 120, &be_const_str_I2C_X3A); +be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, "

 (This feature requires an internet connection)

", 2719266486u, 0, 74, &be_const_str_cosh); +be_define_const_str(_X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E, "

Current configuration:

%s

", 4115655761u, 0, 46, &be_const_str_push); +be_define_const_str(_X3Cselect_X20name_X3D_X27zip_X27_X3E, "

", 1863865923u, 0, 16, &be_const_str_f); -be_define_const_str(_X3C_X3D, "<=", 2499223986u, 0, 2, &be_const_str_exp); -be_define_const_str(_X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, "", 3147934216u, 0, 82, &be_const_str__X3Cp_X3E_X3Csmall_X3E_X26nbsp_X3B_X28This_X20feature_X20requires_X20an_X20internet_X20connection_X29_X3C_X2Fsmall_X3E_X3C_X2Fp_X3E); -be_define_const_str(_X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, "", 1205771629u, 0, 72, &be_const_str_CFG_X3A_X20removed_X20file_X20_X27_X25s_X27); -be_define_const_str(_X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, "
", 842307168u, 0, 77, &be_const_str_get_bat_charge_current); -be_define_const_str(_X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29, "Choose a device configuration:
", 1336654704u, 0, 49, &be_const_str_compile); -be_define_const_str(_X3Clambda_X3E, "", 607256038u, 0, 8, &be_const_str_widget_struct_by_class); -be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Current auto-configuration", 4212500780u, 0, 82, &be_const_str_pin_mode); -be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Select new auto-configuration", 1926223891u, 0, 80, &be_const_str_set_ldo_enable); -be_define_const_str(_X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E, "", 510303524u, 0, 30, NULL); -be_define_const_str(_X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E, "", 3994619755u, 0, 54, &be_const_str_event_cb); -be_define_const_str(_X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E, "

Exception:
'%s'
%s

", 4252565082u, 0, 59, &be_const_str_color); -be_define_const_str(_X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "

", 2052843416u, 0, 25, &be_const_str__X3Cselect_X20name_X3D_X27zip_X27_X3E); -be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "

", 452285201u, 0, 120, &be_const_str_I2C_X3A); -be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, "

 (This feature requires an internet connection)

", 2719266486u, 0, 74, &be_const_str_cosh); -be_define_const_str(_X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E, "

Current configuration:

%s

", 4115655761u, 0, 46, &be_const_str_push); -be_define_const_str(_X3Cselect_X20name_X3D_X27zip_X27_X3E, "

", 1863865923u, 0, 16, &be_const_str_get_style_pad_right); +be_define_const_str(_X3C_X3D, "<=", 2499223986u, 0, 2, &be_const_str_json); +be_define_const_str(_X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, "", 3147934216u, 0, 82, &be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20); +be_define_const_str(_X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, "", 1205771629u, 0, 72, &be_const_str_add_rule); +be_define_const_str(_X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, "
", 842307168u, 0, 77, &be_const_str__X3D); +be_define_const_str(_X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29, "Choose a device configuration:
", 1336654704u, 0, 49, &be_const_str_SK6812_GRBW); +be_define_const_str(_X3Clambda_X3E, "", 607256038u, 0, 8, &be_const_str_get_bri); +be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Current auto-configuration", 4212500780u, 0, 82, &be_const_str_battery_present); +be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Select new auto-configuration", 1926223891u, 0, 80, &be_const_str_connect); +be_define_const_str(_X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E, "", 510303524u, 0, 30, &be_const_str_CFG_X3A_X20loading_X20); +be_define_const_str(_X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E, "", 3994619755u, 0, 54, &be_const_str__lvgl); +be_define_const_str(_X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E, "

Exception:
'%s'
%s

", 4252565082u, 0, 59, &be_const_str_exec_rules); +be_define_const_str(_X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "

", 2052843416u, 0, 25, &be_const_str_CFG_X3A_X20no_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found); +be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "

", 452285201u, 0, 120, &be_const_str_AudioOutput); +be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, "

 (This feature requires an internet connection)

", 2719266486u, 0, 74, &be_const_str_leds); +be_define_const_str(_X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E, "

Current configuration:

%s

", 4115655761u, 0, 46, &be_const_str__); +be_define_const_str(_X3Cselect_X20name_X3D_X27zip_X27_X3E, "

", 1863865923u, 0, 16, &be_const_str_get_style_pad_right); -be_define_const_str(_X3C_X3D, "<=", 2499223986u, 0, 2, &be_const_str_json); -be_define_const_str(_X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, "", 3147934216u, 0, 82, &be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20); -be_define_const_str(_X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, "", 1205771629u, 0, 72, &be_const_str_add_rule); -be_define_const_str(_X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, "
", 842307168u, 0, 77, &be_const_str__X3D); -be_define_const_str(_X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29, "Choose a device configuration:
", 1336654704u, 0, 49, &be_const_str_SK6812_GRBW); -be_define_const_str(_X3Clambda_X3E, "", 607256038u, 0, 8, &be_const_str_get_bri); -be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Current auto-configuration", 4212500780u, 0, 82, &be_const_str_battery_present); -be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Select new auto-configuration", 1926223891u, 0, 80, &be_const_str_connect); -be_define_const_str(_X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E, "", 510303524u, 0, 30, &be_const_str_CFG_X3A_X20loading_X20); -be_define_const_str(_X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E, "", 3994619755u, 0, 54, &be_const_str__lvgl); -be_define_const_str(_X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E, "

Exception:
'%s'
%s

", 4252565082u, 0, 59, &be_const_str_exec_rules); -be_define_const_str(_X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "

", 2052843416u, 0, 25, &be_const_str_CFG_X3A_X20no_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found); -be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "

", 452285201u, 0, 120, &be_const_str_AudioOutput); -be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, "

 (This feature requires an internet connection)

", 2719266486u, 0, 74, &be_const_str_leds); -be_define_const_str(_X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E, "

Current configuration:

%s

", 4115655761u, 0, 46, &be_const_str__); -be_define_const_str(_X3Cselect_X20name_X3D_X27zip_X27_X3E, "

", 1863865923u, 0, 16, &be_const_str_content_send); +be_define_const_str(_X3C_X3D, "<=", 2499223986u, 0, 2, &be_const_str__X3E); +be_define_const_str(_X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, "", 3147934216u, 0, 82, &be_const_str_compile); +be_define_const_str(_X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, "", 1205771629u, 0, 72, &be_const_str_Timer); +be_define_const_str(_X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, "
", 842307168u, 0, 77, &be_const_str_pi); +be_define_const_str(_X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29, "Choose a device configuration:
", 1336654704u, 0, 49, &be_const_str__X3Cp_X3E_X3Csmall_X3E_X26nbsp_X3B_X28This_X20feature_X20requires_X20an_X20internet_X20connection_X29_X3C_X2Fsmall_X3E_X3C_X2Fp_X3E); +be_define_const_str(_X3Clambda_X3E, "", 607256038u, 0, 8, &be_const_str__read); +be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Current auto-configuration", 4212500780u, 0, 82, &be_const_str_code); +be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Select new auto-configuration", 1926223891u, 0, 80, &be_const_str__end_transmission); +be_define_const_str(_X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E, "", 510303524u, 0, 30, NULL); +be_define_const_str(_X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E, "", 3994619755u, 0, 54, &be_const_str_event_cb); +be_define_const_str(_X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E, "

Exception:
'%s'
%s

", 4252565082u, 0, 59, &be_const_str_width_def); +be_define_const_str(_X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "

", 2052843416u, 0, 25, &be_const_str_Unknown_X20command); +be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "

", 452285201u, 0, 120, &be_const_str__energy); +be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, "

 (This feature requires an internet connection)

", 2719266486u, 0, 74, &be_const_str_color); +be_define_const_str(_X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E, "

Current configuration:

%s

", 4115655761u, 0, 46, &be_const_str_static); +be_define_const_str(_X3Cselect_X20name_X3D_X27zip_X27_X3E, "

", 1863865923u, 0, 16, &be_const_str_content_send); -be_define_const_str(_X3C_X3D, "<=", 2499223986u, 0, 2, &be_const_str__X3E); -be_define_const_str(_X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, "", 3147934216u, 0, 82, &be_const_str_compile); -be_define_const_str(_X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, "", 1205771629u, 0, 72, &be_const_str_Timer); -be_define_const_str(_X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, "
", 842307168u, 0, 77, &be_const_str_pi); -be_define_const_str(_X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29, "Choose a device configuration:
", 1336654704u, 0, 49, &be_const_str__X3Cp_X3E_X3Csmall_X3E_X26nbsp_X3B_X28This_X20feature_X20requires_X20an_X20internet_X20connection_X29_X3C_X2Fsmall_X3E_X3C_X2Fp_X3E); -be_define_const_str(_X3Clambda_X3E, "", 607256038u, 0, 8, &be_const_str__read); -be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Current auto-configuration", 4212500780u, 0, 82, &be_const_str_code); -be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Select new auto-configuration", 1926223891u, 0, 80, &be_const_str__end_transmission); -be_define_const_str(_X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E, "", 510303524u, 0, 30, NULL); -be_define_const_str(_X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E, "", 3994619755u, 0, 54, &be_const_str_event_cb); -be_define_const_str(_X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E, "

Exception:
'%s'
%s

", 4252565082u, 0, 59, &be_const_str_width_def); -be_define_const_str(_X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "

", 2052843416u, 0, 25, &be_const_str_Unknown_X20command); -be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "

", 452285201u, 0, 120, &be_const_str__energy); -be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, "

 (This feature requires an internet connection)

", 2719266486u, 0, 74, &be_const_str_color); -be_define_const_str(_X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E, "

Current configuration:

%s

", 4115655761u, 0, 46, &be_const_str_static); -be_define_const_str(_X3Cselect_X20name_X3D_X27zip_X27_X3E, "

", 1863865923u, 0, 16, &be_const_str_add_rule); +be_define_const_str(_X3C_X3D, "<=", 2499223986u, 0, 2, &be_const_str_asstring); +be_define_const_str(_X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, "", 3147934216u, 0, 82, &be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20); +be_define_const_str(_X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, "", 1205771629u, 0, 72, NULL); +be_define_const_str(_X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, "
", 842307168u, 0, 77, &be_const_str_SERIAL_6E1); +be_define_const_str(_X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29, "Choose a device configuration:
", 1336654704u, 0, 49, &be_const_str_sys); +be_define_const_str(_X3Clambda_X3E, "", 607256038u, 0, 8, &be_const_str_SERIAL_7E2); +be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Current auto-configuration", 4212500780u, 0, 82, &be_const_str_Unknown_X20command); +be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Select new auto-configuration", 1926223891u, 0, 80, &be_const_str_SERIAL_6E2); +be_define_const_str(_X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E, "", 510303524u, 0, 30, &be_const_str_AudioOutput); +be_define_const_str(_X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E, "", 3994619755u, 0, 54, &be_const_str_add_driver); +be_define_const_str(_X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E, "

Exception:
'%s'
%s

", 4252565082u, 0, 59, &be_const_str_widget_width_def); +be_define_const_str(_X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "

", 2052843416u, 0, 25, &be_const_str_find_op); +be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "

", 452285201u, 0, 120, &be_const_str_CFG_X3A_X20loading_X20); +be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, "

 (This feature requires an internet connection)

", 2719266486u, 0, 74, &be_const_str_count); +be_define_const_str(_X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E, "

Current configuration:

%s

", 4115655761u, 0, 46, &be_const_str_widget_dtor_cb); +be_define_const_str(_X3Cselect_X20name_X3D_X27zip_X27_X3E, "

", 1863865923u, 0, 16, &be_const_str_add_rule); -be_define_const_str(_X3C_X3D, "<=", 2499223986u, 0, 2, &be_const_str_asstring); -be_define_const_str(_X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, "", 3147934216u, 0, 82, &be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20); -be_define_const_str(_X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, "", 1205771629u, 0, 72, NULL); -be_define_const_str(_X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, "
", 842307168u, 0, 77, &be_const_str_SERIAL_6E1); -be_define_const_str(_X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29, "Choose a device configuration:
", 1336654704u, 0, 49, &be_const_str_sys); -be_define_const_str(_X3Clambda_X3E, "", 607256038u, 0, 8, &be_const_str_SERIAL_7E2); -be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Current auto-configuration", 4212500780u, 0, 82, &be_const_str_Unknown_X20command); -be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Select new auto-configuration", 1926223891u, 0, 80, &be_const_str_SERIAL_6E2); -be_define_const_str(_X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E, "", 510303524u, 0, 30, &be_const_str_AudioOutput); -be_define_const_str(_X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E, "", 3994619755u, 0, 54, &be_const_str_add_driver); -be_define_const_str(_X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E, "

Exception:
'%s'
%s

", 4252565082u, 0, 59, &be_const_str_widget_width_def); -be_define_const_str(_X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "

", 2052843416u, 0, 25, &be_const_str_find_op); -be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "

", 452285201u, 0, 120, &be_const_str_CFG_X3A_X20loading_X20); -be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, "

 (This feature requires an internet connection)

", 2719266486u, 0, 74, &be_const_str_count); -be_define_const_str(_X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E, "

Current configuration:

%s

", 4115655761u, 0, 46, &be_const_str_widget_dtor_cb); -be_define_const_str(_X3Cselect_X20name_X3D_X27zip_X27_X3E, "

", 1863865923u, 0, 16, &be_const_str__global_def); +be_define_const_str(_X3C_X3D, "<=", 2499223986u, 0, 2, &be_const_str_OPTION_A); +be_define_const_str(_X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, "", 3147934216u, 0, 82, &be_const_str_draw_line); +be_define_const_str(_X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, "", 1205771629u, 0, 72, &be_const_str_POST); +be_define_const_str(_X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, "
", 842307168u, 0, 77, &be_const_str_web_add_management_button); +be_define_const_str(_X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29, "Choose a device configuration:
", 1336654704u, 0, 49, &be_const_str_bri); +be_define_const_str(_X3Clambda_X3E, "", 607256038u, 0, 8, &be_const_str_is_first_time); +be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Current auto-configuration", 4212500780u, 0, 82, &be_const_str_HTTP_GET); +be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Select new auto-configuration", 1926223891u, 0, 80, &be_const_str_remote_port); +be_define_const_str(_X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E, "", 510303524u, 0, 30, &be_const_str__anonymous_); +be_define_const_str(_X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E, "", 3994619755u, 0, 54, &be_const_str_tr); +be_define_const_str(_X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E, "

Exception:
'%s'
%s

", 4252565082u, 0, 59, &be_const_str_shared_key); +be_define_const_str(_X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "

", 2052843416u, 0, 25, &be_const_str_register_button_encoder); +be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "

", 452285201u, 0, 120, &be_const_str_due); +be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, "

 (This feature requires an internet connection)

", 2719266486u, 0, 74, NULL); +be_define_const_str(_X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E, "

Current configuration:

%s

", 4115655761u, 0, 46, NULL); +be_define_const_str(_X3Cselect_X20name_X3D_X27zip_X27_X3E, "

", 1863865923u, 0, 16, &be_const_str__global_def); -be_define_const_str(_X3C_X3D, "<=", 2499223986u, 0, 2, &be_const_str_OPTION_A); -be_define_const_str(_X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, "", 3147934216u, 0, 82, &be_const_str_draw_line); -be_define_const_str(_X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, "", 1205771629u, 0, 72, &be_const_str_POST); -be_define_const_str(_X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, "
", 842307168u, 0, 77, &be_const_str_web_add_management_button); +be_define_const_str(_X2F_X3Frst_X3D, "/?rst=", 580074707u, 0, 6, &be_const_str_json_fdump_map); +be_define_const_str(_X2Fac, "/ac", 3904651978u, 0, 3, &be_const_str_detected_X20on_X20bus); +be_define_const_str(_X3A, ":", 1057798253u, 0, 1, &be_const_str_SERIAL_6N1); +be_define_const_str(_X3C, "<", 957132539u, 0, 1, &be_const_str_MD5); +be_define_const_str(_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "

", 3546571739u, 0, 11, &be_const_str_cb_event_closure); +be_define_const_str(_X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "

", 1863865923u, 0, 16, &be_const_str_True); +be_define_const_str(_X3C_X3D, "<=", 2499223986u, 0, 2, &be_const_str__request_from); +be_define_const_str(_X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, "", 3147934216u, 0, 82, &be_const_str_add_header); +be_define_const_str(_X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, "", 1205771629u, 0, 72, &be_const_str_arg_name); +be_define_const_str(_X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, "
", 842307168u, 0, 77, &be_const_str_connection_error); be_define_const_str(_X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29, "Choose a device configuration:
", 1336654704u, 0, 49, &be_const_str_bri); -be_define_const_str(_X3Clambda_X3E, "", 607256038u, 0, 8, &be_const_str_is_first_time); -be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Current auto-configuration", 4212500780u, 0, 82, &be_const_str_HTTP_GET); -be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, " Select new auto-configuration", 1926223891u, 0, 80, &be_const_str_remote_port); -be_define_const_str(_X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E, "", 510303524u, 0, 30, &be_const_str__anonymous_); -be_define_const_str(_X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E, "", 3994619755u, 0, 54, &be_const_str_tr); -be_define_const_str(_X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E, "

Exception:
'%s'
%s

", 4252565082u, 0, 59, &be_const_str_shared_key); -be_define_const_str(_X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "

", 2052843416u, 0, 25, &be_const_str_register_button_encoder); -be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "

", 452285201u, 0, 120, &be_const_str_due); -be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, "

 (This feature requires an internet connection)

", 2719266486u, 0, 74, NULL); -be_define_const_str(_X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E, "

Current configuration:

%s

", 4115655761u, 0, 46, NULL); -be_define_const_str(_X3Cselect_X20name_X3D_X27zip_X27_X3E, "", 4247924536u, 0, 19, &be_const_str_BRY_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s); +be_define_const_str(_X3D, "=", 940354920u, 0, 1, &be_const_str_set_first_time); +be_define_const_str(_X3D_X3C_X3E_X21, "=<>!", 2664470277u, 0, 4, &be_const_str__global_addr); +be_define_const_str(_X3D_X3D, "==", 2431966415u, 0, 2, NULL); +be_define_const_str(_X3E, ">", 990687777u, 0, 1, &be_const_str_class); +be_define_const_str(_X3E_X3D, ">=", 284975636u, 0, 2, &be_const_str_scale_uint); +be_define_const_str(_X3F, "?", 973910158u, 0, 1, &be_const_str_web_add_button); +be_define_const_str(AES_GCM, "AES_GCM", 3832208678u, 0, 7, &be_const_str_value); +be_define_const_str(AXP192, "AXP192", 757230128u, 0, 6, NULL); +be_define_const_str(Animate_X20pc_X20is_X20out_X20of_X20range, "Animate pc is out of range", 1854929421u, 0, 26, &be_const_str_arch); +be_define_const_str(AudioFileSource, "AudioFileSource", 2959980058u, 0, 15, NULL); +be_define_const_str(AudioFileSourceFS, "AudioFileSourceFS", 1839147653u, 0, 17, NULL); +be_define_const_str(AudioGenerator, "AudioGenerator", 1839297342u, 0, 14, &be_const_str_widget_ctor_cb); +be_define_const_str(AudioGeneratorMP3, "AudioGeneratorMP3", 2199818488u, 0, 17, &be_const_str_register_button_encoder); +be_define_const_str(AudioGeneratorWAV, "AudioGeneratorWAV", 2746509368u, 0, 17, &be_const_str_atleast1); +be_define_const_str(AudioOutput, "AudioOutput", 3257792048u, 0, 11, &be_const_str__buffer); be_define_const_str(AudioOutputI2S, "AudioOutputI2S", 638031784u, 0, 14, NULL); -be_define_const_str(Auto_X2Dconfiguration, "Auto-configuration", 1665006109u, 0, 18, NULL); -be_define_const_str(BRY_X3A_X20ERROR_X2C_X20bad_X20json_X3A_X20, "BRY: ERROR, bad json: ", 2715135809u, 0, 22, &be_const_str_CFG_X3A_X20loading_X20); -be_define_const_str(BRY_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s, "BRY: Exception> '%s' - %s", 2246990964u, 0, 25, &be_const_str_seti); -be_define_const_str(BRY_X3A_X20could_X20not_X20save_X20compiled_X20file_X20_X25s_X20_X28_X25s_X29, "BRY: could not save compiled file %s (%s)", 736659787u, 0, 41, NULL); -be_define_const_str(BRY_X3A_X20failed_X20to_X20load_X20_persist_X2Ejson, "BRY: failed to load _persist.json", 2991913445u, 0, 33, NULL); -be_define_const_str(BUTTON_CONFIGURATION, "BUTTON_CONFIGURATION", 70820856u, 0, 20, &be_const_str_invalidate); -be_define_const_str(CFG_X3A_X20_X27init_X2Ebat_X27_X20done_X2C_X20restarting, "CFG: 'init.bat' done, restarting", 1569670677u, 0, 32, &be_const_str_push_path); -be_define_const_str(CFG_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s, "CFG: Exception> '%s' - %s", 1228874553u, 0, 25, &be_const_str_event_cb); -be_define_const_str(CFG_X3A_X20could_X20not_X20run_X20_X25s_X20_X28_X25s_X20_X2D_X20_X25s_X29, "CFG: could not run %s (%s - %s)", 1428829580u, 0, 31, &be_const_str_lv_wifi_bars_icon); -be_define_const_str(CFG_X3A_X20downloading_X20_X27_X25s_X27, "CFG: downloading '%s'", 589480701u, 0, 21, NULL); -be_define_const_str(CFG_X3A_X20exception_X20_X27_X25s_X27_X20_X2D_X20_X27_X25s_X27, "CFG: exception '%s' - '%s'", 4095407913u, 0, 26, &be_const_str__debug_present); -be_define_const_str(CFG_X3A_X20loaded_X20_X20, "CFG: loaded ", 3710273538u, 0, 13, &be_const_str_count); -be_define_const_str(CFG_X3A_X20loaded_X20_X27_X25s_X27, "CFG: loaded '%s'", 1699028828u, 0, 16, &be_const_str_animate); -be_define_const_str(CFG_X3A_X20loading_X20, "CFG: loading ", 4010361503u, 0, 13, NULL); -be_define_const_str(CFG_X3A_X20loading_X20_X27_X25s_X27, "CFG: loading '%s'", 2285306097u, 0, 17, &be_const_str_SK6812_GRBW); -be_define_const_str(CFG_X3A_X20multiple_X20autoconf_X20files_X20found_X2C_X20aborting_X20_X28_X27_X25s_X27_X20_X2B_X20_X27_X25s_X27_X29, "CFG: multiple autoconf files found, aborting ('%s' + '%s')", 197663371u, 0, 58, &be_const_str_write_file); -be_define_const_str(CFG_X3A_X20no_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found, "CFG: no '*.autoconf' file found", 127493957u, 0, 31, &be_const_str_internal_error); -be_define_const_str(CFG_X3A_X20ran_X20_X20, "CFG: ran ", 3579570472u, 0, 10, &be_const_str_couldn_X27t_X20not_X20initialize_X20noepixelbus); -be_define_const_str(CFG_X3A_X20removed_X20file_X20_X27_X25s_X27, "CFG: removed file '%s'", 2048602473u, 0, 22, &be_const_str_list); -be_define_const_str(CFG_X3A_X20removing_X20autoconf_X20files, "CFG: removing autoconf files", 4014704970u, 0, 28, &be_const_str_add_anim); -be_define_const_str(CFG_X3A_X20removing_X20first_X20time_X20marker, "CFG: removing first time marker", 2125556683u, 0, 31, NULL); -be_define_const_str(CFG_X3A_X20return_code_X3D_X25i, "CFG: return_code=%i", 2059897320u, 0, 19, NULL); -be_define_const_str(CFG_X3A_X20running_X20, "CFG: running ", 2478334534u, 0, 13, &be_const_str_rtc); -be_define_const_str(CFG_X3A_X20skipping_X20_X27display_X2Eini_X27_X20because_X20already_X20present_X20in_X20file_X2Dsystem, "CFG: skipping 'display.ini' because already present in file-system", 3965549264u, 0, 66, &be_const_str_set_matrix_pixel_color); -be_define_const_str(COLOR_BLACK, "COLOR_BLACK", 264427940u, 0, 11, &be_const_str_SERIAL_7E2); -be_define_const_str(COLOR_WHITE, "COLOR_WHITE", 2536871270u, 0, 11, &be_const_str_codedump); -be_define_const_str(EC_C25519, "EC_C25519", 95492591u, 0, 9, &be_const_str_base_class); -be_define_const_str(EVENT_DRAW_MAIN, "EVENT_DRAW_MAIN", 1955620614u, 0, 15, &be_const_str_SERIAL_8E1); -be_define_const_str(EVENT_DRAW_PART_BEGIN, "EVENT_DRAW_PART_BEGIN", 3391865024u, 0, 21, &be_const_str__begin_transmission); -be_define_const_str(EVENT_DRAW_PART_END, "EVENT_DRAW_PART_END", 3301625292u, 0, 19, &be_const_str_imin); -be_define_const_str(False, "False", 2541049336u, 0, 5, &be_const_str_lower); -be_define_const_str(GET, "GET", 2531704439u, 0, 3, &be_const_str_set_time); -be_define_const_str(HTTP_GET, "HTTP_GET", 1722467738u, 0, 8, &be_const_str_find_key_i); -be_define_const_str(HTTP_POST, "HTTP_POST", 1999554144u, 0, 9, NULL); -be_define_const_str(I2C_X3A, "I2C:", 813483371u, 0, 4, &be_const_str_p2); -be_define_const_str(I2C_Driver, "I2C_Driver", 1714501658u, 0, 10, NULL); -be_define_const_str(LVG_X3A_X20call_X20to_X20unsupported_X20callback, "LVG: call to unsupported callback", 504176819u, 0, 33, &be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_X2F_X25s_X2Eautoconf); -be_define_const_str(Leds, "Leds", 2709245275u, 0, 4, &be_const_str_editable); -be_define_const_str(MD5, "MD5", 1935726387u, 0, 3, NULL); -be_define_const_str(None, "None", 810547195u, 0, 4, &be_const_str_connect); -be_define_const_str(OPTION_A, "OPTION_A", 1133299440u, 0, 8, &be_const_str_pin); -be_define_const_str(OneWire, "OneWire", 2298990722u, 0, 7, &be_const_str_SERIAL_7O2); -be_define_const_str(PART_MAIN, "PART_MAIN", 2473491508u, 0, 9, &be_const_str_remove_cmd); -be_define_const_str(POST, "POST", 1929554311u, 0, 4, &be_const_str_function); -be_define_const_str(Parameter_X20error, "Parameter error", 3840042038u, 0, 15, &be_const_str__dirty); -be_define_const_str(RES_OK, "RES_OK", 1233817284u, 0, 6, &be_const_str__t); -be_define_const_str(Restart_X201, "Restart 1", 3504455855u, 0, 9, NULL); -be_define_const_str(SERIAL_5E1, "SERIAL_5E1", 1163775235u, 0, 10, &be_const_str_display); -be_define_const_str(SERIAL_5E2, "SERIAL_5E2", 1180552854u, 0, 10, NULL); -be_define_const_str(SERIAL_5N1, "SERIAL_5N1", 3313031680u, 0, 10, &be_const_str_tomap); -be_define_const_str(SERIAL_5N2, "SERIAL_5N2", 3363364537u, 0, 10, &be_const_str_True); -be_define_const_str(SERIAL_5O1, "SERIAL_5O1", 3782657917u, 0, 10, &be_const_str_v); -be_define_const_str(SERIAL_5O2, "SERIAL_5O2", 3732325060u, 0, 10, &be_const_str__read); -be_define_const_str(SERIAL_6E1, "SERIAL_6E1", 334249486u, 0, 10, &be_const_str_add); -be_define_const_str(SERIAL_6E2, "SERIAL_6E2", 317471867u, 0, 10, &be_const_str_content_button); -be_define_const_str(SERIAL_6N1, "SERIAL_6N1", 198895701u, 0, 10, &be_const_str_SERIAL_8N1); -be_define_const_str(SERIAL_6N2, "SERIAL_6N2", 148562844u, 0, 10, &be_const_str__class); -be_define_const_str(SERIAL_6O1, "SERIAL_6O1", 266153272u, 0, 10, &be_const_str_settings); -be_define_const_str(SERIAL_6O2, "SERIAL_6O2", 316486129u, 0, 10, NULL); -be_define_const_str(SERIAL_7E1, "SERIAL_7E1", 147718061u, 0, 10, &be_const_str_width); -be_define_const_str(SERIAL_7E2, "SERIAL_7E2", 97385204u, 0, 10, &be_const_str_get_pixel_color); +be_define_const_str(Auto_X2Dconfiguration, "Auto-configuration", 1665006109u, 0, 18, &be_const_str_resolvecmnd); +be_define_const_str(BRY_X3A_X20ERROR_X2C_X20bad_X20json_X3A_X20, "BRY: ERROR, bad json: ", 2715135809u, 0, 22, NULL); +be_define_const_str(BRY_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s, "BRY: Exception> '%s' - %s", 2246990964u, 0, 25, &be_const_str_set_useragent); +be_define_const_str(BRY_X3A_X20could_X20not_X20save_X20compiled_X20file_X20_X25s_X20_X28_X25s_X29, "BRY: could not save compiled file %s (%s)", 736659787u, 0, 41, &be_const_str_autorun); +be_define_const_str(BRY_X3A_X20failed_X20to_X20load_X20_persist_X2Ejson, "BRY: failed to load _persist.json", 2991913445u, 0, 33, &be_const_str_char); +be_define_const_str(BUTTON_CONFIGURATION, "BUTTON_CONFIGURATION", 70820856u, 0, 20, NULL); +be_define_const_str(CFG_X3A_X20_X27init_X2Ebat_X27_X20done_X2C_X20restarting, "CFG: 'init.bat' done, restarting", 1569670677u, 0, 32, &be_const_str_CFG_X3A_X20loading_X20); +be_define_const_str(CFG_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s, "CFG: Exception> '%s' - %s", 1228874553u, 0, 25, &be_const_str_is_running); +be_define_const_str(CFG_X3A_X20could_X20not_X20run_X20_X25s_X20_X28_X25s_X20_X2D_X20_X25s_X29, "CFG: could not run %s (%s - %s)", 1428829580u, 0, 31, NULL); +be_define_const_str(CFG_X3A_X20downloading_X20_X27_X25s_X27, "CFG: downloading '%s'", 589480701u, 0, 21, &be_const_str_percentage); +be_define_const_str(CFG_X3A_X20exception_X20_X27_X25s_X27_X20_X2D_X20_X27_X25s_X27, "CFG: exception '%s' - '%s'", 4095407913u, 0, 26, &be_const_str_SK6812_GRBW); +be_define_const_str(CFG_X3A_X20loaded_X20_X20, "CFG: loaded ", 3710273538u, 0, 13, &be_const_str_attrdump); +be_define_const_str(CFG_X3A_X20loaded_X20_X27_X25s_X27, "CFG: loaded '%s'", 1699028828u, 0, 16, &be_const_str_cosh); +be_define_const_str(CFG_X3A_X20loading_X20, "CFG: loading ", 4010361503u, 0, 13, &be_const_str_push_path); +be_define_const_str(CFG_X3A_X20loading_X20_X27_X25s_X27, "CFG: loading '%s'", 2285306097u, 0, 17, &be_const_str_static); +be_define_const_str(CFG_X3A_X20multiple_X20autoconf_X20files_X20found_X2C_X20aborting_X20_X28_X27_X25s_X27_X20_X2B_X20_X27_X25s_X27_X29, "CFG: multiple autoconf files found, aborting ('%s' + '%s')", 197663371u, 0, 58, NULL); +be_define_const_str(CFG_X3A_X20no_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found, "CFG: no '*.autoconf' file found", 127493957u, 0, 31, NULL); +be_define_const_str(CFG_X3A_X20ran_X20_X20, "CFG: ran ", 3579570472u, 0, 10, &be_const_str__settings_ptr); +be_define_const_str(CFG_X3A_X20removed_X20file_X20_X27_X25s_X27, "CFG: removed file '%s'", 2048602473u, 0, 22, &be_const_str_content_send); +be_define_const_str(CFG_X3A_X20removing_X20autoconf_X20files, "CFG: removing autoconf files", 4014704970u, 0, 28, &be_const_str_font_montserrat); +be_define_const_str(CFG_X3A_X20removing_X20first_X20time_X20marker, "CFG: removing first time marker", 2125556683u, 0, 31, &be_const_str_json_fdump_any); +be_define_const_str(CFG_X3A_X20return_code_X3D_X25i, "CFG: return_code=%i", 2059897320u, 0, 19, &be_const_str__dirty); +be_define_const_str(CFG_X3A_X20running_X20, "CFG: running ", 2478334534u, 0, 13, &be_const_str_COLOR_BLACK); +be_define_const_str(CFG_X3A_X20skipping_X20_X27display_X2Eini_X27_X20because_X20already_X20present_X20in_X20file_X2Dsystem, "CFG: skipping 'display.ini' because already present in file-system", 3965549264u, 0, 66, &be_const_str_chars_in_string); +be_define_const_str(COLOR_BLACK, "COLOR_BLACK", 264427940u, 0, 11, &be_const_str_ceil); +be_define_const_str(COLOR_WHITE, "COLOR_WHITE", 2536871270u, 0, 11, &be_const_str_WS2812); +be_define_const_str(EC_C25519, "EC_C25519", 95492591u, 0, 9, &be_const_str_LVG_X3A_X20call_X20to_X20unsupported_X20callback); +be_define_const_str(EVENT_DRAW_MAIN, "EVENT_DRAW_MAIN", 1955620614u, 0, 15, &be_const_str_connected); +be_define_const_str(EVENT_DRAW_PART_BEGIN, "EVENT_DRAW_PART_BEGIN", 3391865024u, 0, 21, &be_const_str_find_key_i); +be_define_const_str(EVENT_DRAW_PART_END, "EVENT_DRAW_PART_END", 3301625292u, 0, 19, &be_const_str_classof); +be_define_const_str(False, "False", 2541049336u, 0, 5, &be_const_str_copy); +be_define_const_str(GET, "GET", 2531704439u, 0, 3, &be_const_str_call_native); +be_define_const_str(HTTP_GET, "HTTP_GET", 1722467738u, 0, 8, &be_const_str_widget_event_cb); +be_define_const_str(HTTP_POST, "HTTP_POST", 1999554144u, 0, 9, &be_const_str__); +be_define_const_str(I2C_X3A, "I2C:", 813483371u, 0, 4, &be_const_str_map); +be_define_const_str(I2C_Driver, "I2C_Driver", 1714501658u, 0, 10, &be_const_str_get_cb_list); +be_define_const_str(LVG_X3A_X20call_X20to_X20unsupported_X20callback, "LVG: call to unsupported callback", 504176819u, 0, 33, &be_const_str__rules); +be_define_const_str(Leds, "Leds", 2709245275u, 0, 4, &be_const_str_web_add_config_button); +be_define_const_str(MD5, "MD5", 1935726387u, 0, 3, &be_const_str_pow); +be_define_const_str(None, "None", 810547195u, 0, 4, &be_const_str_POST); +be_define_const_str(OPTION_A, "OPTION_A", 1133299440u, 0, 8, NULL); +be_define_const_str(OneWire, "OneWire", 2298990722u, 0, 7, &be_const_str_files); +be_define_const_str(OpusDecoder, "OpusDecoder", 3618742074u, 0, 11, &be_const_str_cb_do_nothing); +be_define_const_str(PART_MAIN, "PART_MAIN", 2473491508u, 0, 9, &be_const_str_get_switch); +be_define_const_str(POST, "POST", 1929554311u, 0, 4, &be_const_str_gc); +be_define_const_str(Parameter_X20error, "Parameter error", 3840042038u, 0, 15, &be_const_str__X7Bs_X7DVBus_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D); +be_define_const_str(RES_OK, "RES_OK", 1233817284u, 0, 6, &be_const_str_decrypt); +be_define_const_str(Restart_X201, "Restart 1", 3504455855u, 0, 9, &be_const_str_SERIAL_5N2); +be_define_const_str(SERIAL_5E1, "SERIAL_5E1", 1163775235u, 0, 10, &be_const_str_set_style_text_font); +be_define_const_str(SERIAL_5E2, "SERIAL_5E2", 1180552854u, 0, 10, &be_const_str__anonymous_); +be_define_const_str(SERIAL_5N1, "SERIAL_5N1", 3313031680u, 0, 10, &be_const_str__archive); +be_define_const_str(SERIAL_5N2, "SERIAL_5N2", 3363364537u, 0, 10, &be_const_str_get_string); +be_define_const_str(SERIAL_5O1, "SERIAL_5O1", 3782657917u, 0, 10, &be_const_str_add_driver); +be_define_const_str(SERIAL_5O2, "SERIAL_5O2", 3732325060u, 0, 10, NULL); +be_define_const_str(SERIAL_6E1, "SERIAL_6E1", 334249486u, 0, 10, &be_const_str_pop_path); +be_define_const_str(SERIAL_6E2, "SERIAL_6E2", 317471867u, 0, 10, &be_const_str_select); +be_define_const_str(SERIAL_6N1, "SERIAL_6N1", 198895701u, 0, 10, NULL); +be_define_const_str(SERIAL_6N2, "SERIAL_6N2", 148562844u, 0, 10, &be_const_str_every_100ms); +be_define_const_str(SERIAL_6O1, "SERIAL_6O1", 266153272u, 0, 10, &be_const_str_cmd_res); +be_define_const_str(SERIAL_6O2, "SERIAL_6O2", 316486129u, 0, 10, &be_const_str_get_object_from_ptr); +be_define_const_str(SERIAL_7E1, "SERIAL_7E1", 147718061u, 0, 10, &be_const_str_wire1); +be_define_const_str(SERIAL_7E2, "SERIAL_7E2", 97385204u, 0, 10, &be_const_str__p); be_define_const_str(SERIAL_7N1, "SERIAL_7N1", 1891060246u, 0, 10, NULL); -be_define_const_str(SERIAL_7N2, "SERIAL_7N2", 1874282627u, 0, 10, &be_const_str_constructor_cb); -be_define_const_str(SERIAL_7O1, "SERIAL_7O1", 1823802675u, 0, 10, &be_const_str_input); -be_define_const_str(SERIAL_7O2, "SERIAL_7O2", 1840580294u, 0, 10, &be_const_str_get_current_module_name); -be_define_const_str(SERIAL_8E1, "SERIAL_8E1", 2371121616u, 0, 10, &be_const_str_delay); -be_define_const_str(SERIAL_8E2, "SERIAL_8E2", 2421454473u, 0, 10, &be_const_str_get_power); -be_define_const_str(SERIAL_8N1, "SERIAL_8N1", 2369297235u, 0, 10, &be_const_str_char); -be_define_const_str(SERIAL_8N2, "SERIAL_8N2", 2386074854u, 0, 10, &be_const_str_int); -be_define_const_str(SERIAL_8O1, "SERIAL_8O1", 289122742u, 0, 10, &be_const_str_wd); -be_define_const_str(SERIAL_8O2, "SERIAL_8O2", 272345123u, 0, 10, NULL); -be_define_const_str(SK6812_GRBW, "SK6812_GRBW", 81157857u, 0, 11, &be_const_str_event); -be_define_const_str(STATE_DEFAULT, "STATE_DEFAULT", 712406428u, 0, 13, &be_const_str__error); -be_define_const_str(TAP_X3A_X20found_X20Tasmota_X20App_X20_X27_X25s_X27, "TAP: found Tasmota App '%s'", 2643152398u, 0, 27, &be_const_str__ptr); -be_define_const_str(Tasmota, "Tasmota", 4047617668u, 0, 7, &be_const_str_set_useragent); -be_define_const_str(Tele, "Tele", 1329980653u, 0, 4, &be_const_str_cb_event_closure); -be_define_const_str(Timer, "Timer", 3948127682u, 0, 5, &be_const_str__energy); -be_define_const_str(True, "True", 3453902341u, 0, 4, &be_const_str__settings_def); +be_define_const_str(SERIAL_7N2, "SERIAL_7N2", 1874282627u, 0, 10, &be_const_str_b); +be_define_const_str(SERIAL_7O1, "SERIAL_7O1", 1823802675u, 0, 10, &be_const_str_dirty); +be_define_const_str(SERIAL_7O2, "SERIAL_7O2", 1840580294u, 0, 10, &be_const_str_send_multicast); +be_define_const_str(SERIAL_8E1, "SERIAL_8E1", 2371121616u, 0, 10, &be_const_str_members); +be_define_const_str(SERIAL_8E2, "SERIAL_8E2", 2421454473u, 0, 10, &be_const_str_widget_struct_default); +be_define_const_str(SERIAL_8N1, "SERIAL_8N1", 2369297235u, 0, 10, &be_const_str_clock_icon); +be_define_const_str(SERIAL_8N2, "SERIAL_8N2", 2386074854u, 0, 10, &be_const_str_coord_arr); +be_define_const_str(SERIAL_8O1, "SERIAL_8O1", 289122742u, 0, 10, &be_const_str_format); +be_define_const_str(SERIAL_8O2, "SERIAL_8O2", 272345123u, 0, 10, &be_const_str_get_height); +be_define_const_str(SK6812_GRBW, "SK6812_GRBW", 81157857u, 0, 11, &be_const_str_animators); +be_define_const_str(STATE_DEFAULT, "STATE_DEFAULT", 712406428u, 0, 13, &be_const_str___lower__); +be_define_const_str(TAP_X3A_X20found_X20Tasmota_X20App_X20_X27_X25s_X27, "TAP: found Tasmota App '%s'", 2643152398u, 0, 27, &be_const_str_fromstring); +be_define_const_str(Tasmota, "Tasmota", 4047617668u, 0, 7, &be_const_str_line_dsc); +be_define_const_str(Tele, "Tele", 1329980653u, 0, 4, &be_const_str_set_y); +be_define_const_str(Timer, "Timer", 3948127682u, 0, 5, NULL); +be_define_const_str(True, "True", 3453902341u, 0, 4, &be_const_str_connect); be_define_const_str(Unknown_X20command, "Unknown command", 1830905432u, 0, 15, NULL); -be_define_const_str(WS2812, "WS2812", 3539741218u, 0, 6, &be_const_str_connected); -be_define_const_str(WS2812_GRB, "WS2812_GRB", 1736405692u, 0, 10, &be_const_str__timers); -be_define_const_str(Wire, "Wire", 1938276536u, 0, 4, &be_const_str_udp); -be_define_const_str(_X5B, "[", 3725336506u, 0, 1, &be_const_str_check_privileged_access); -be_define_const_str(_X5D, "]", 3624670792u, 0, 1, &be_const_str_get_vbus_current); -be_define_const_str(_, "_", 3658226030u, 0, 1, &be_const_str_set_ldo_voltage); -be_define_const_str(__iterator__, "__iterator__", 3884039703u, 0, 12, &be_const_str_open); -be_define_const_str(__lower__, "__lower__", 123855590u, 0, 9, &be_const_str_w); -be_define_const_str(__upper__, "__upper__", 3612202883u, 0, 9, &be_const_str_digital_write); -be_define_const_str(_anonymous_, "_anonymous_", 1957281476u, 0, 11, &be_const_str_ceil); -be_define_const_str(_archive, "_archive", 4004559404u, 0, 8, NULL); -be_define_const_str(_available, "_available", 1306196581u, 0, 10, &be_const_str_assert); -be_define_const_str(_begin_transmission, "_begin_transmission", 2779461176u, 0, 19, &be_const_str_name); -be_define_const_str(_buffer, "_buffer", 2044888568u, 0, 7, &be_const_str__X7B); -be_define_const_str(_ccmd, "_ccmd", 2163421413u, 0, 5, &be_const_str_gen_cb); -be_define_const_str(_class, "_class", 2732146350u, 0, 6, &be_const_str_chars_in_string); -be_define_const_str(_cmd, "_cmd", 3419822142u, 0, 4, &be_const_str_isnan); -be_define_const_str(_debug_present, "_debug_present", 4063411725u, 0, 14, &be_const_str_argument_X20must_X20be_X20a_X20list); -be_define_const_str(_def, "_def", 1985022181u, 0, 4, &be_const_str_exists); -be_define_const_str(_dirty, "_dirty", 283846766u, 0, 6, &be_const_str_load_freetype_font); -be_define_const_str(_drivers, "_drivers", 3260328985u, 0, 8, &be_const_str_ctor); -be_define_const_str(_end_transmission, "_end_transmission", 3237480400u, 0, 17, NULL); -be_define_const_str(_energy, "_energy", 535372070u, 0, 7, &be_const_str_get_coords); -be_define_const_str(_error, "_error", 1132109656u, 0, 6, NULL); -be_define_const_str(_filename, "_filename", 1430813195u, 0, 9, NULL); -be_define_const_str(_global_addr, "_global_addr", 533766721u, 0, 12, NULL); -be_define_const_str(_global_def, "_global_def", 646007001u, 0, 11, NULL); -be_define_const_str(_lvgl, "_lvgl", 2689219483u, 0, 5, &be_const_str_ins_goto); -be_define_const_str(_p, "_p", 1594591802u, 0, 2, &be_const_str_lvgl_event_dispatch); -be_define_const_str(_persist_X2Ejson, "_persist.json", 2008425138u, 0, 13, &be_const_str_compile); -be_define_const_str(_ptr, "_ptr", 306235816u, 0, 4, NULL); -be_define_const_str(_read, "_read", 346717030u, 0, 5, &be_const_str_tan); -be_define_const_str(_request_from, "_request_from", 3965148604u, 0, 13, NULL); -be_define_const_str(_rules, "_rules", 4266217105u, 0, 6, &be_const_str_has); -be_define_const_str(_settings_def, "_settings_def", 3775560307u, 0, 13, &be_const_str_hour); -be_define_const_str(_settings_ptr, "_settings_ptr", 1825772182u, 0, 13, NULL); -be_define_const_str(_t, "_t", 1527481326u, 0, 2, &be_const_str_write8); -be_define_const_str(_timers, "_timers", 2600100916u, 0, 7, NULL); -be_define_const_str(_write, "_write", 2215462825u, 0, 6, &be_const_str__X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D); -be_define_const_str(a, "a", 3826002220u, 0, 1, &be_const_str_classname); -be_define_const_str(abs, "abs", 709362235u, 0, 3, &be_const_str_list_handlers); -be_define_const_str(acos, "acos", 1006755615u, 0, 4, &be_const_str_animators); -be_define_const_str(add, "add", 993596020u, 0, 3, &be_const_str_read32); -be_define_const_str(add_anim, "add_anim", 3980662668u, 0, 8, NULL); -be_define_const_str(add_cmd, "add_cmd", 3361630879u, 0, 7, &be_const_str_arg_X20must_X20be_X20a_X20subclass_X20of_X20lv_obj); -be_define_const_str(add_driver, "add_driver", 1654458371u, 0, 10, &be_const_str_widget_destructor); -be_define_const_str(add_handler, "add_handler", 2055124119u, 0, 11, &be_const_str_arg_size); -be_define_const_str(add_header, "add_header", 927130612u, 0, 10, NULL); -be_define_const_str(add_rule, "add_rule", 596540743u, 0, 8, &be_const_str_h); -be_define_const_str(addr, "addr", 1087856498u, 0, 4, &be_const_str_copy); -be_define_const_str(allocated, "allocated", 429986098u, 0, 9, &be_const_str_local); -be_define_const_str(alternate, "alternate", 1140253277u, 0, 9, &be_const_str_ctypes_bytes_dyn); +be_define_const_str(WS2812, "WS2812", 3539741218u, 0, 6, &be_const_str_lv_event); +be_define_const_str(WS2812_GRB, "WS2812_GRB", 1736405692u, 0, 10, &be_const_str_refr_size); +be_define_const_str(Wire, "Wire", 1938276536u, 0, 4, &be_const_str_web_send_decimal); +be_define_const_str(_X5B, "[", 3725336506u, 0, 1, &be_const_str_area); +be_define_const_str(_X5D, "]", 3624670792u, 0, 1, &be_const_str_asstring); +be_define_const_str(_, "_", 3658226030u, 0, 1, NULL); +be_define_const_str(__iterator__, "__iterator__", 3884039703u, 0, 12, &be_const_str_abs); +be_define_const_str(__lower__, "__lower__", 123855590u, 0, 9, &be_const_str_get_alternate); +be_define_const_str(__upper__, "__upper__", 3612202883u, 0, 9, &be_const_str_push); +be_define_const_str(_anonymous_, "_anonymous_", 1957281476u, 0, 11, &be_const_str_available); +be_define_const_str(_archive, "_archive", 4004559404u, 0, 8, &be_const_str_get_pixel_color); +be_define_const_str(_available, "_available", 1306196581u, 0, 10, &be_const_str_content_send_style); +be_define_const_str(_begin_transmission, "_begin_transmission", 2779461176u, 0, 19, NULL); +be_define_const_str(_buffer, "_buffer", 2044888568u, 0, 7, &be_const_str_get_current_module_name); +be_define_const_str(_ccmd, "_ccmd", 2163421413u, 0, 5, &be_const_str_ctypes_bytes); +be_define_const_str(_class, "_class", 2732146350u, 0, 6, &be_const_str_battery_present); +be_define_const_str(_cmd, "_cmd", 3419822142u, 0, 4, &be_const_str_draw_line); +be_define_const_str(_debug_present, "_debug_present", 4063411725u, 0, 14, NULL); +be_define_const_str(_def, "_def", 1985022181u, 0, 4, NULL); +be_define_const_str(_dirty, "_dirty", 283846766u, 0, 6, NULL); +be_define_const_str(_drivers, "_drivers", 3260328985u, 0, 8, &be_const_str_floor); +be_define_const_str(_end_transmission, "_end_transmission", 3237480400u, 0, 17, &be_const_str_dac_voltage); +be_define_const_str(_energy, "_energy", 535372070u, 0, 7, &be_const_str_counters); +be_define_const_str(_error, "_error", 1132109656u, 0, 6, &be_const_str_int); +be_define_const_str(_filename, "_filename", 1430813195u, 0, 9, &be_const_str_content_flush); +be_define_const_str(_global_addr, "_global_addr", 533766721u, 0, 12, &be_const_str_gen_cb); +be_define_const_str(_global_def, "_global_def", 646007001u, 0, 11, &be_const_str_assert); +be_define_const_str(_lvgl, "_lvgl", 2689219483u, 0, 5, &be_const_str_atan); +be_define_const_str(_p, "_p", 1594591802u, 0, 2, &be_const_str_height_def); +be_define_const_str(_persist_X2Ejson, "_persist.json", 2008425138u, 0, 13, &be_const_str_gamma); +be_define_const_str(_ptr, "_ptr", 306235816u, 0, 4, &be_const_str_isinstance); +be_define_const_str(_read, "_read", 346717030u, 0, 5, &be_const_str_create_custom_widget); +be_define_const_str(_request_from, "_request_from", 3965148604u, 0, 13, &be_const_str_set_auth); +be_define_const_str(_rules, "_rules", 4266217105u, 0, 6, &be_const_str_depower); +be_define_const_str(_settings_def, "_settings_def", 3775560307u, 0, 13, &be_const_str_read_sensors); +be_define_const_str(_settings_ptr, "_settings_ptr", 1825772182u, 0, 13, &be_const_str_enabled); +be_define_const_str(_t, "_t", 1527481326u, 0, 2, &be_const_str_no_X20GPIO_X20specified_X20for_X20neopixelbus); +be_define_const_str(_timers, "_timers", 2600100916u, 0, 7, &be_const_str_add_anim); +be_define_const_str(_write, "_write", 2215462825u, 0, 6, &be_const_str_acos); +be_define_const_str(a, "a", 3826002220u, 0, 1, &be_const_str_web_add_main_button); +be_define_const_str(abs, "abs", 709362235u, 0, 3, &be_const_str_byte); +be_define_const_str(acos, "acos", 1006755615u, 0, 4, NULL); +be_define_const_str(add, "add", 993596020u, 0, 3, &be_const_str_length_X20in_X20bits_X20must_X20be_X20between_X200_X20and_X2032); +be_define_const_str(add_anim, "add_anim", 3980662668u, 0, 8, &be_const_str_back_forth); +be_define_const_str(add_cmd, "add_cmd", 3361630879u, 0, 7, &be_const_str_h); +be_define_const_str(add_driver, "add_driver", 1654458371u, 0, 10, &be_const_str_fromb64); +be_define_const_str(add_handler, "add_handler", 2055124119u, 0, 11, &be_const_str_display_X2Eini); +be_define_const_str(add_header, "add_header", 927130612u, 0, 10, &be_const_str_contains); +be_define_const_str(add_rule, "add_rule", 596540743u, 0, 8, &be_const_str_reset_search); +be_define_const_str(addr, "addr", 1087856498u, 0, 4, &be_const_str_pin_mode); +be_define_const_str(allocated, "allocated", 429986098u, 0, 9, &be_const_str_remove_cmd); +be_define_const_str(alternate, "alternate", 1140253277u, 0, 9, &be_const_str_out_X20of_X20range); be_define_const_str(animate, "animate", 3885786800u, 0, 7, NULL); -be_define_const_str(animators, "animators", 279858213u, 0, 9, &be_const_str_fromb64); -be_define_const_str(arch, "arch", 2952804297u, 0, 4, &be_const_str_bus); -be_define_const_str(area, "area", 2601460036u, 0, 4, &be_const_str_ins_ramp); -be_define_const_str(arg, "arg", 1047474471u, 0, 3, &be_const_str_get_battery_chargin_status); -be_define_const_str(arg_X20must_X20be_X20a_X20subclass_X20of_X20lv_obj, "arg must be a subclass of lv_obj", 1641882079u, 0, 32, &be_const_str_math); +be_define_const_str(animators, "animators", 279858213u, 0, 9, &be_const_str_get_battery_chargin_status); +be_define_const_str(arch, "arch", 2952804297u, 0, 4, &be_const_str_get_aps_voltage); +be_define_const_str(area, "area", 2601460036u, 0, 4, &be_const_str_kv); +be_define_const_str(arg, "arg", 1047474471u, 0, 3, &be_const_str_json_fdump_list); +be_define_const_str(arg_X20must_X20be_X20a_X20subclass_X20of_X20lv_obj, "arg must be a subclass of lv_obj", 1641882079u, 0, 32, &be_const_str_gamma10); be_define_const_str(arg_name, "arg_name", 1345046155u, 0, 8, NULL); -be_define_const_str(arg_size, "arg_size", 3310243257u, 0, 8, NULL); -be_define_const_str(argument_X20must_X20be_X20a_X20list, "argument must be a list", 3056915661u, 0, 23, &be_const_str_clear_first_time); +be_define_const_str(arg_size, "arg_size", 3310243257u, 0, 8, &be_const_str_get_free_heap); +be_define_const_str(argument_X20must_X20be_X20a_X20list, "argument must be a list", 3056915661u, 0, 23, &be_const_str_every_second); be_define_const_str(as, "as", 1579491469u, 67, 2, NULL); -be_define_const_str(asin, "asin", 4272848550u, 0, 4, &be_const_str_get_cb_list); -be_define_const_str(assert, "assert", 2774883451u, 0, 6, &be_const_str_read8); -be_define_const_str(asstring, "asstring", 1298225088u, 0, 8, NULL); -be_define_const_str(atan, "atan", 108579519u, 0, 4, &be_const_str_hs2rgb); -be_define_const_str(atan2, "atan2", 3173440503u, 0, 5, &be_const_str_loop); -be_define_const_str(atleast1, "atleast1", 1956331672u, 0, 8, &be_const_str_remove_driver); -be_define_const_str(attrdump, "attrdump", 1521571304u, 0, 8, &be_const_str_battery_present); -be_define_const_str(autoexec, "autoexec", 3676861891u, 0, 8, &be_const_str_exec_cmd); -be_define_const_str(autorun, "autorun", 1447527407u, 0, 7, &be_const_str_fromptr); -be_define_const_str(available, "available", 1727918744u, 0, 9, &be_const_str_digital_read); -be_define_const_str(b, "b", 3876335077u, 0, 1, &be_const_str_lv_signal_bars); -be_define_const_str(back_forth, "back_forth", 2665042062u, 0, 10, &be_const_str_get_style_pad_right); -be_define_const_str(base_class, "base_class", 1107737279u, 0, 10, &be_const_str_get_string); -be_define_const_str(battery_present, "battery_present", 3588397058u, 0, 15, &be_const_str_register_obj); -be_define_const_str(begin, "begin", 1748273790u, 0, 5, &be_const_str_cos); -be_define_const_str(begin_multicast, "begin_multicast", 57647915u, 0, 15, &be_const_str_min); -be_define_const_str(bool, "bool", 3365180733u, 0, 4, &be_const_str_set_height); +be_define_const_str(asin, "asin", 4272848550u, 0, 4, &be_const_str_check_privileged_access); +be_define_const_str(assert, "assert", 2774883451u, 0, 6, &be_const_str_create_matrix); +be_define_const_str(asstring, "asstring", 1298225088u, 0, 8, &be_const_str_set_timeouts); +be_define_const_str(atan, "atan", 108579519u, 0, 4, &be_const_str_redirect); +be_define_const_str(atan2, "atan2", 3173440503u, 0, 5, &be_const_str_collect); +be_define_const_str(atleast1, "atleast1", 1956331672u, 0, 8, NULL); +be_define_const_str(attrdump, "attrdump", 1521571304u, 0, 8, NULL); +be_define_const_str(autoexec, "autoexec", 3676861891u, 0, 8, NULL); +be_define_const_str(autorun, "autorun", 1447527407u, 0, 7, &be_const_str_search); +be_define_const_str(available, "available", 1727918744u, 0, 9, &be_const_str_tob64); +be_define_const_str(b, "b", 3876335077u, 0, 1, NULL); +be_define_const_str(back_forth, "back_forth", 2665042062u, 0, 10, &be_const_str_listdir); +be_define_const_str(base_class, "base_class", 1107737279u, 0, 10, &be_const_str_open); +be_define_const_str(battery_present, "battery_present", 3588397058u, 0, 15, NULL); +be_define_const_str(begin, "begin", 1748273790u, 0, 5, &be_const_str_resp_cmnd_str); +be_define_const_str(begin_multicast, "begin_multicast", 57647915u, 0, 15, &be_const_str_resp_cmnd_done); +be_define_const_str(bool, "bool", 3365180733u, 0, 4, &be_const_str_v); be_define_const_str(break, "break", 3378807160u, 58, 5, NULL); -be_define_const_str(bri, "bri", 2112284244u, 0, 3, &be_const_str_memory); -be_define_const_str(bus, "bus", 1607822841u, 0, 3, NULL); -be_define_const_str(button_pressed, "button_pressed", 1694209616u, 0, 14, &be_const_str_calldepth); -be_define_const_str(byte, "byte", 1683620383u, 0, 4, NULL); -be_define_const_str(bytes, "bytes", 1706151940u, 0, 5, &be_const_str_eth); -be_define_const_str(c, "c", 3859557458u, 0, 1, &be_const_str_fromstring); -be_define_const_str(call, "call", 3018949801u, 0, 4, &be_const_str_get_height); -be_define_const_str(call_native, "call_native", 1389147405u, 0, 11, &be_const_str_floor); -be_define_const_str(calldepth, "calldepth", 3122364302u, 0, 9, &be_const_str_cb); -be_define_const_str(can_show, "can_show", 960091187u, 0, 8, &be_const_str_lv_wifi_arcs_icon); -be_define_const_str(cb, "cb", 1428787088u, 0, 2, &be_const_str_get_percentage); -be_define_const_str(cb_do_nothing, "cb_do_nothing", 1488730702u, 0, 13, &be_const_str_web_send); -be_define_const_str(cb_event_closure, "cb_event_closure", 3828267325u, 0, 16, &be_const_str_content_stop); -be_define_const_str(cb_obj, "cb_obj", 1195696482u, 0, 6, &be_const_str_print); -be_define_const_str(ceil, "ceil", 1659167240u, 0, 4, &be_const_str_lv_extra); -be_define_const_str(char, "char", 2823553821u, 0, 4, &be_const_str_depower); -be_define_const_str(chars_in_string, "chars_in_string", 3148785132u, 0, 15, NULL); -be_define_const_str(check_privileged_access, "check_privileged_access", 3692933968u, 0, 23, &be_const_str_montserrat_font); +be_define_const_str(bri, "bri", 2112284244u, 0, 3, NULL); +be_define_const_str(bus, "bus", 1607822841u, 0, 3, &be_const_str_content_start); +be_define_const_str(button_pressed, "button_pressed", 1694209616u, 0, 14, NULL); +be_define_const_str(byte, "byte", 1683620383u, 0, 4, &be_const_str_response_append); +be_define_const_str(bytes, "bytes", 1706151940u, 0, 5, &be_const_str_cb); +be_define_const_str(c, "c", 3859557458u, 0, 1, NULL); +be_define_const_str(call, "call", 3018949801u, 0, 4, &be_const_str_tele); +be_define_const_str(call_native, "call_native", 1389147405u, 0, 11, NULL); +be_define_const_str(calldepth, "calldepth", 3122364302u, 0, 9, NULL); +be_define_const_str(can_show, "can_show", 960091187u, 0, 8, &be_const_str_min); +be_define_const_str(cb, "cb", 1428787088u, 0, 2, &be_const_str_yield); +be_define_const_str(cb_do_nothing, "cb_do_nothing", 1488730702u, 0, 13, &be_const_str_target); +be_define_const_str(cb_event_closure, "cb_event_closure", 3828267325u, 0, 16, NULL); +be_define_const_str(cb_obj, "cb_obj", 1195696482u, 0, 6, NULL); +be_define_const_str(ceil, "ceil", 1659167240u, 0, 4, &be_const_str_reset); +be_define_const_str(char, "char", 2823553821u, 0, 4, &be_const_str_content_button); +be_define_const_str(chars_in_string, "chars_in_string", 3148785132u, 0, 15, &be_const_str_event_send); +be_define_const_str(check_privileged_access, "check_privileged_access", 3692933968u, 0, 23, NULL); be_define_const_str(class, "class", 2872970239u, 57, 5, NULL); -be_define_const_str(class_init_obj, "class_init_obj", 178410604u, 0, 14, &be_const_str_x1); -be_define_const_str(classname, "classname", 1998589948u, 0, 9, NULL); -be_define_const_str(classof, "classof", 1796577762u, 0, 7, &be_const_str_exec_rules); -be_define_const_str(clear, "clear", 1550717474u, 0, 5, &be_const_str_get_width); -be_define_const_str(clear_first_time, "clear_first_time", 632769909u, 0, 16, &be_const_str_r); -be_define_const_str(clear_to, "clear_to", 3528002130u, 0, 8, &be_const_str_geti); +be_define_const_str(class_init_obj, "class_init_obj", 178410604u, 0, 14, &be_const_str_string); +be_define_const_str(classname, "classname", 1998589948u, 0, 9, &be_const_str_lv_wifi_bars_icon); +be_define_const_str(classof, "classof", 1796577762u, 0, 7, &be_const_str_lv_solidified); +be_define_const_str(clear, "clear", 1550717474u, 0, 5, &be_const_str_get_style_pad_right); +be_define_const_str(clear_first_time, "clear_first_time", 632769909u, 0, 16, &be_const_str__X7B_X7D); +be_define_const_str(clear_to, "clear_to", 3528002130u, 0, 8, &be_const_str_cos); be_define_const_str(clock_icon, "clock_icon", 544669651u, 0, 10, NULL); -be_define_const_str(close, "close", 667630371u, 0, 5, NULL); -be_define_const_str(closure, "closure", 1548407746u, 0, 7, &be_const_str_widget_event_cb); +be_define_const_str(close, "close", 667630371u, 0, 5, &be_const_str_hour); +be_define_const_str(closure, "closure", 1548407746u, 0, 7, &be_const_str_delay); be_define_const_str(cmd, "cmd", 4136785899u, 0, 3, NULL); -be_define_const_str(cmd_res, "cmd_res", 921166762u, 0, 7, &be_const_str_deinit); -be_define_const_str(code, "code", 4180765940u, 0, 4, &be_const_str_cosh); -be_define_const_str(codedump, "codedump", 1786337906u, 0, 8, &be_const_str_isrunning); -be_define_const_str(collect, "collect", 2399039025u, 0, 7, &be_const_str_get_style_bg_color); -be_define_const_str(color, "color", 1031692888u, 0, 5, NULL); -be_define_const_str(compile, "compile", 1000265118u, 0, 7, &be_const_str_connection_error); -be_define_const_str(compress, "compress", 2818084237u, 0, 8, &be_const_str_tostring); -be_define_const_str(concat, "concat", 4124019837u, 0, 6, NULL); -be_define_const_str(connect, "connect", 2866859257u, 0, 7, NULL); -be_define_const_str(connected, "connected", 1424938192u, 0, 9, NULL); -be_define_const_str(connection_error, "connection_error", 1358926260u, 0, 16, &be_const_str_kv); +be_define_const_str(cmd_res, "cmd_res", 921166762u, 0, 7, &be_const_str_write8); +be_define_const_str(code, "code", 4180765940u, 0, 4, NULL); +be_define_const_str(codedump, "codedump", 1786337906u, 0, 8, &be_const_str_range); +be_define_const_str(collect, "collect", 2399039025u, 0, 7, NULL); +be_define_const_str(color, "color", 1031692888u, 0, 5, &be_const_str_exp); +be_define_const_str(compile, "compile", 1000265118u, 0, 7, NULL); +be_define_const_str(compress, "compress", 2818084237u, 0, 8, NULL); +be_define_const_str(concat, "concat", 4124019837u, 0, 6, &be_const_str_remote_ip); +be_define_const_str(connect, "connect", 2866859257u, 0, 7, &be_const_str_srand); +be_define_const_str(connected, "connected", 1424938192u, 0, 9, &be_const_str_continue); +be_define_const_str(connection_error, "connection_error", 1358926260u, 0, 16, &be_const_str_load_freetype_font); be_define_const_str(constructor_cb, "constructor_cb", 2489105297u, 0, 14, NULL); -be_define_const_str(contains, "contains", 1825239352u, 0, 8, NULL); -be_define_const_str(content_button, "content_button", 1956476087u, 0, 14, &be_const_str_widget_struct_default); -be_define_const_str(content_flush, "content_flush", 214922475u, 0, 13, NULL); -be_define_const_str(content_send, "content_send", 1673733649u, 0, 12, &be_const_str_lv_wifi_arcs); -be_define_const_str(content_send_style, "content_send_style", 1087907647u, 0, 18, &be_const_str_wifi_bars_icon); -be_define_const_str(content_start, "content_start", 2937509069u, 0, 13, &be_const_str_wire1); -be_define_const_str(content_stop, "content_stop", 658554751u, 0, 12, &be_const_str_from_to); +be_define_const_str(consume_mono, "consume_mono", 3577563453u, 0, 12, NULL); +be_define_const_str(consume_silence, "consume_silence", 1445390925u, 0, 15, NULL); +be_define_const_str(consume_stereo, "consume_stereo", 1834661098u, 0, 14, &be_const_str_id); +be_define_const_str(contains, "contains", 1825239352u, 0, 8, &be_const_str_get_style_line_color); +be_define_const_str(content_button, "content_button", 1956476087u, 0, 14, &be_const_str_engine); +be_define_const_str(content_flush, "content_flush", 214922475u, 0, 13, &be_const_str_due); +be_define_const_str(content_send, "content_send", 1673733649u, 0, 12, &be_const_str_editable); +be_define_const_str(content_send_style, "content_send_style", 1087907647u, 0, 18, NULL); +be_define_const_str(content_start, "content_start", 2937509069u, 0, 13, &be_const_str_content_stop); +be_define_const_str(content_stop, "content_stop", 658554751u, 0, 12, &be_const_str_readline); be_define_const_str(continue, "continue", 2977070660u, 59, 8, NULL); -be_define_const_str(coord_arr, "coord_arr", 4189963658u, 0, 9, &be_const_str_lv_solidified); -be_define_const_str(copy, "copy", 3848464964u, 0, 4, NULL); -be_define_const_str(cos, "cos", 4220379804u, 0, 3, &be_const_str_every_100ms); -be_define_const_str(cosh, "cosh", 4099687964u, 0, 4, &be_const_str_path); -be_define_const_str(couldn_X27t_X20not_X20initialize_X20noepixelbus, "couldn't not initialize noepixelbus", 2536490812u, 0, 35, &be_const_str_write_gpio); -be_define_const_str(count, "count", 967958004u, 0, 5, &be_const_str_font_montserrat); -be_define_const_str(counters, "counters", 4095866864u, 0, 8, &be_const_str_detect); -be_define_const_str(create_custom_widget, "create_custom_widget", 1140594778u, 0, 20, &be_const_str_show); -be_define_const_str(create_matrix, "create_matrix", 3528185923u, 0, 13, &be_const_str_tcpclient); -be_define_const_str(create_segment, "create_segment", 3863522719u, 0, 14, NULL); -be_define_const_str(ctor, "ctor", 375399343u, 0, 4, &be_const_str_get_aps_voltage); -be_define_const_str(ctypes_bytes, "ctypes_bytes", 3879019703u, 0, 12, &be_const_str_lv_coord_arr); -be_define_const_str(ctypes_bytes_dyn, "ctypes_bytes_dyn", 915205307u, 0, 16, &be_const_str_draw_line_dsc); -be_define_const_str(dac_voltage, "dac_voltage", 1552257222u, 0, 11, &be_const_str_except); -be_define_const_str(day, "day", 3830391293u, 0, 3, &be_const_str_i2c_enabled); -be_define_const_str(debug, "debug", 1483009432u, 0, 5, &be_const_str_isinstance); -be_define_const_str(decompress, "decompress", 2887031650u, 0, 10, &be_const_str_rand); -be_define_const_str(decrypt, "decrypt", 2886974618u, 0, 7, &be_const_str_lv_point_arr); +be_define_const_str(coord_arr, "coord_arr", 4189963658u, 0, 9, &be_const_str_lv_event_cb); +be_define_const_str(copy, "copy", 3848464964u, 0, 4, &be_const_str_digital_read); +be_define_const_str(cos, "cos", 4220379804u, 0, 3, &be_const_str_imax); +be_define_const_str(cosh, "cosh", 4099687964u, 0, 4, &be_const_str_udp); +be_define_const_str(couldn_X27t_X20not_X20initialize_X20noepixelbus, "couldn't not initialize noepixelbus", 2536490812u, 0, 35, &be_const_str_hex); +be_define_const_str(count, "count", 967958004u, 0, 5, &be_const_str_decompress); +be_define_const_str(counters, "counters", 4095866864u, 0, 8, &be_const_str_set_alternate); +be_define_const_str(create_custom_widget, "create_custom_widget", 1140594778u, 0, 20, &be_const_str_toptr); +be_define_const_str(create_matrix, "create_matrix", 3528185923u, 0, 13, &be_const_str_set_time); +be_define_const_str(create_segment, "create_segment", 3863522719u, 0, 14, &be_const_str_get_warning_level); +be_define_const_str(ctor, "ctor", 375399343u, 0, 4, &be_const_str_getbits); +be_define_const_str(ctypes_bytes, "ctypes_bytes", 3879019703u, 0, 12, NULL); +be_define_const_str(ctypes_bytes_dyn, "ctypes_bytes_dyn", 915205307u, 0, 16, NULL); +be_define_const_str(dac_voltage, "dac_voltage", 1552257222u, 0, 11, &be_const_str_get_bat_voltage); +be_define_const_str(day, "day", 3830391293u, 0, 3, &be_const_str__X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D); +be_define_const_str(debug, "debug", 1483009432u, 0, 5, &be_const_str_while); +be_define_const_str(decode, "decode", 3007678287u, 0, 6, &be_const_str_read13); +be_define_const_str(decompress, "decompress", 2887031650u, 0, 10, &be_const_str_lv_obj_class); +be_define_const_str(decrypt, "decrypt", 2886974618u, 0, 7, &be_const_str_set_percentage); be_define_const_str(def, "def", 3310976652u, 55, 3, NULL); -be_define_const_str(deg, "deg", 3327754271u, 0, 3, NULL); -be_define_const_str(deinit, "deinit", 2345559592u, 0, 6, &be_const_str_item); -be_define_const_str(del, "del", 3478752842u, 0, 3, &be_const_str_set_width); -be_define_const_str(delay, "delay", 1322381784u, 0, 5, &be_const_str_for); -be_define_const_str(delete_all_configs, "delete_all_configs", 2382067578u, 0, 18, NULL); +be_define_const_str(deg, "deg", 3327754271u, 0, 3, &be_const_str_make_cb); +be_define_const_str(deinit, "deinit", 2345559592u, 0, 6, &be_const_str_destructor_cb); +be_define_const_str(del, "del", 3478752842u, 0, 3, NULL); +be_define_const_str(delay, "delay", 1322381784u, 0, 5, &be_const_str_widget_width_def); +be_define_const_str(delete_all_configs, "delete_all_configs", 2382067578u, 0, 18, &be_const_str_get_light); be_define_const_str(depower, "depower", 3563819571u, 0, 7, NULL); -be_define_const_str(deregister_obj, "deregister_obj", 3909966993u, 0, 14, &be_const_str_true); +be_define_const_str(deregister_obj, "deregister_obj", 3909966993u, 0, 14, NULL); be_define_const_str(destructor_cb, "destructor_cb", 1930283190u, 0, 13, NULL); -be_define_const_str(detect, "detect", 8884370u, 0, 6, &be_const_str_set_first_time); -be_define_const_str(detected_X20on_X20bus, "detected on bus", 1432002650u, 0, 15, NULL); -be_define_const_str(digital_read, "digital_read", 3585496928u, 0, 12, NULL); -be_define_const_str(digital_write, "digital_write", 3435877979u, 0, 13, &be_const_str_widget_cb); -be_define_const_str(dirty, "dirty", 2667581083u, 0, 5, &be_const_str_erase); -be_define_const_str(display, "display", 1164572437u, 0, 7, &be_const_str_iter); -be_define_const_str(display_X2Eini, "display.ini", 2646174001u, 0, 11, &be_const_str_is_running); +be_define_const_str(detect, "detect", 8884370u, 0, 6, &be_const_str_name); +be_define_const_str(detected_X20on_X20bus, "detected on bus", 1432002650u, 0, 15, &be_const_str_preinit); +be_define_const_str(digital_read, "digital_read", 3585496928u, 0, 12, &be_const_str_lv_); +be_define_const_str(digital_write, "digital_write", 3435877979u, 0, 13, &be_const_str_pixel_size); +be_define_const_str(dirty, "dirty", 2667581083u, 0, 5, &be_const_str_set_text); +be_define_const_str(display, "display", 1164572437u, 0, 7, &be_const_str_event_cb); +be_define_const_str(display_X2Eini, "display.ini", 2646174001u, 0, 11, NULL); be_define_const_str(do, "do", 1646057492u, 65, 2, NULL); -be_define_const_str(draw_arc, "draw_arc", 1828251676u, 0, 8, &be_const_str_lv_point); -be_define_const_str(draw_line, "draw_line", 1634465686u, 0, 9, NULL); -be_define_const_str(draw_line_dsc, "draw_line_dsc", 4220676203u, 0, 13, &be_const_str_exec_tele); -be_define_const_str(draw_line_dsc_init, "draw_line_dsc_init", 3866693646u, 0, 18, &be_const_str_enabled); -be_define_const_str(due, "due", 3895530293u, 0, 3, &be_const_str_get_free_heap); +be_define_const_str(draw_arc, "draw_arc", 1828251676u, 0, 8, NULL); +be_define_const_str(draw_line, "draw_line", 1634465686u, 0, 9, &be_const_str_run_deferred); +be_define_const_str(draw_line_dsc, "draw_line_dsc", 4220676203u, 0, 13, &be_const_str_tasmota_X2Eset_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eset_X28_X29); +be_define_const_str(draw_line_dsc_init, "draw_line_dsc_init", 3866693646u, 0, 18, &be_const_str_false); +be_define_const_str(due, "due", 3895530293u, 0, 3, &be_const_str_get_bat_current); be_define_const_str(dump, "dump", 3663001223u, 0, 4, NULL); -be_define_const_str(duration, "duration", 799079693u, 0, 8, &be_const_str_get_input_power_status); -be_define_const_str(editable, "editable", 60532369u, 0, 8, NULL); -be_define_const_str(elements_X20must_X20be_X20a_X20lv_point, "elements must be a lv_point", 1415796524u, 0, 27, &be_const_str_every_50ms); +be_define_const_str(duration, "duration", 799079693u, 0, 8, &be_const_str_function); +be_define_const_str(editable, "editable", 60532369u, 0, 8, &be_const_str_get_vbus_voltage); +be_define_const_str(elements_X20must_X20be_X20a_X20lv_point, "elements must be a lv_point", 1415796524u, 0, 27, NULL); be_define_const_str(elif, "elif", 3232090307u, 51, 4, NULL); -be_define_const_str(else, "else", 3183434736u, 52, 4, &be_const_str_nil); -be_define_const_str(enabled, "enabled", 49525662u, 0, 7, &be_const_str_webclient); -be_define_const_str(encrypt, "encrypt", 2194327650u, 0, 7, NULL); +be_define_const_str(else, "else", 3183434736u, 52, 4, NULL); +be_define_const_str(enabled, "enabled", 49525662u, 0, 7, NULL); +be_define_const_str(encrypt, "encrypt", 2194327650u, 0, 7, &be_const_str_find_op); be_define_const_str(end, "end", 1787721130u, 56, 3, NULL); -be_define_const_str(energy_struct, "energy_struct", 1655792843u, 0, 13, &be_const_str_set_style_bg_color); -be_define_const_str(engine, "engine", 3993360443u, 0, 6, &be_const_str_reset_search); -be_define_const_str(erase, "erase", 1010949589u, 0, 5, &be_const_str_widget_event_impl); +be_define_const_str(energy_struct, "energy_struct", 1655792843u, 0, 13, &be_const_str_lv_wifi_arcs_icon); +be_define_const_str(engine, "engine", 3993360443u, 0, 6, &be_const_str_f); +be_define_const_str(erase, "erase", 1010949589u, 0, 5, &be_const_str_internal_error); be_define_const_str(escape, "escape", 2652972038u, 0, 6, NULL); -be_define_const_str(eth, "eth", 2191266556u, 0, 3, &be_const_str_find); +be_define_const_str(eth, "eth", 2191266556u, 0, 3, NULL); be_define_const_str(event, "event", 4264611999u, 0, 5, NULL); -be_define_const_str(event_cb, "event_cb", 3128698017u, 0, 8, &be_const_str_percentage); -be_define_const_str(event_send, "event_send", 598925582u, 0, 10, &be_const_str_remove_rule); -be_define_const_str(every_100ms, "every_100ms", 1546407804u, 0, 11, NULL); -be_define_const_str(every_50ms, "every_50ms", 2383884008u, 0, 10, &be_const_str_insert); -be_define_const_str(every_second, "every_second", 2075451465u, 0, 12, NULL); +be_define_const_str(event_cb, "event_cb", 3128698017u, 0, 8, NULL); +be_define_const_str(event_send, "event_send", 598925582u, 0, 10, &be_const_str_publish_result); +be_define_const_str(every_100ms, "every_100ms", 1546407804u, 0, 11, &be_const_str_path); +be_define_const_str(every_50ms, "every_50ms", 2383884008u, 0, 10, &be_const_str_tomap); +be_define_const_str(every_second, "every_second", 2075451465u, 0, 12, &be_const_str_persist); be_define_const_str(except, "except", 950914032u, 69, 6, NULL); -be_define_const_str(exec_cmd, "exec_cmd", 493567399u, 0, 8, &be_const_str_flush); -be_define_const_str(exec_rules, "exec_rules", 1445221092u, 0, 10, NULL); +be_define_const_str(exec_cmd, "exec_cmd", 493567399u, 0, 8, NULL); +be_define_const_str(exec_rules, "exec_rules", 1445221092u, 0, 10, &be_const_str_introspect); be_define_const_str(exec_tele, "exec_tele", 1020751601u, 0, 9, &be_const_str_get); -be_define_const_str(exists, "exists", 1002329533u, 0, 6, &be_const_str_make_cb); +be_define_const_str(exists, "exists", 1002329533u, 0, 6, &be_const_str_remove_timer); be_define_const_str(exp, "exp", 1923516200u, 0, 3, NULL); -be_define_const_str(f, "f", 3809224601u, 0, 1, &be_const_str_tasmota_X2Eset_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eset_X28_X29); +be_define_const_str(f, "f", 3809224601u, 0, 1, NULL); be_define_const_str(false, "false", 184981848u, 62, 5, NULL); -be_define_const_str(file, "file", 2867484483u, 0, 4, &be_const_str_leds); -be_define_const_str(file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27, "file extension is not '.be' or '.bec'", 3095719639u, 0, 37, &be_const_str_font_seg7); -be_define_const_str(files, "files", 1055342736u, 0, 5, &be_const_str_reapply); -be_define_const_str(find, "find", 3186656602u, 0, 4, NULL); -be_define_const_str(find_key_i, "find_key_i", 850136726u, 0, 10, &be_const_str_json_append); -be_define_const_str(find_op, "find_op", 3766713376u, 0, 7, &be_const_str_if); -be_define_const_str(finish, "finish", 1494643858u, 0, 6, &be_const_str_break); -be_define_const_str(floor, "floor", 3102149661u, 0, 5, &be_const_str_issubclass); -be_define_const_str(flush, "flush", 3002334877u, 0, 5, &be_const_str_json_fdump_map); -be_define_const_str(font_montserrat, "font_montserrat", 3790091262u, 0, 15, &be_const_str_resp_cmnd_str); -be_define_const_str(font_seg7, "font_seg7", 1551771835u, 0, 9, &be_const_str_ins_time); +be_define_const_str(file, "file", 2867484483u, 0, 4, &be_const_str_read); +be_define_const_str(file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27, "file extension is not '.be' or '.bec'", 3095719639u, 0, 37, &be_const_str_sqrt); +be_define_const_str(files, "files", 1055342736u, 0, 5, NULL); +be_define_const_str(find, "find", 3186656602u, 0, 4, &be_const_str_onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E); +be_define_const_str(find_key_i, "find_key_i", 850136726u, 0, 10, NULL); +be_define_const_str(find_op, "find_op", 3766713376u, 0, 7, &be_const_str_set_ldo_voltage); +be_define_const_str(finish, "finish", 1494643858u, 0, 6, &be_const_str_get_width); +be_define_const_str(floor, "floor", 3102149661u, 0, 5, &be_const_str_real); +be_define_const_str(flush, "flush", 3002334877u, 0, 5, NULL); +be_define_const_str(font_montserrat, "font_montserrat", 3790091262u, 0, 15, &be_const_str_has_arg); +be_define_const_str(font_seg7, "font_seg7", 1551771835u, 0, 9, NULL); be_define_const_str(for, "for", 2901640080u, 54, 3, NULL); -be_define_const_str(format, "format", 3114108242u, 0, 6, NULL); +be_define_const_str(format, "format", 3114108242u, 0, 6, &be_const_str_lv_extra); be_define_const_str(from_to, "from_to", 21625507u, 0, 7, NULL); -be_define_const_str(fromb64, "fromb64", 2717019639u, 0, 7, &be_const_str_read_sensors); -be_define_const_str(fromptr, "fromptr", 666189689u, 0, 7, NULL); -be_define_const_str(fromstring, "fromstring", 610302344u, 0, 10, &be_const_str_get_switch); -be_define_const_str(function, "function", 2664841801u, 0, 8, &be_const_str_member); -be_define_const_str(gamma, "gamma", 3492353034u, 0, 5, NULL); +be_define_const_str(fromb64, "fromb64", 2717019639u, 0, 7, &be_const_str_reverse); +be_define_const_str(fromptr, "fromptr", 666189689u, 0, 7, &be_const_str_get_size); +be_define_const_str(fromstring, "fromstring", 610302344u, 0, 10, &be_const_str_ip); +be_define_const_str(function, "function", 2664841801u, 0, 8, &be_const_str_light); +be_define_const_str(gamma, "gamma", 3492353034u, 0, 5, &be_const_str_set_style_line_color); be_define_const_str(gamma10, "gamma10", 3472052483u, 0, 7, NULL); -be_define_const_str(gamma8, "gamma8", 3802843830u, 0, 6, &be_const_str_lv_obj_class); +be_define_const_str(gamma8, "gamma8", 3802843830u, 0, 6, &be_const_str_get_temp); be_define_const_str(gc, "gc", 1042313471u, 0, 2, NULL); -be_define_const_str(gen_cb, "gen_cb", 3245227551u, 0, 6, &be_const_str_module); -be_define_const_str(get, "get", 1410115415u, 0, 3, NULL); -be_define_const_str(get_alternate, "get_alternate", 1450148894u, 0, 13, &be_const_str_length_X20in_X20bits_X20must_X20be_X20between_X200_X20and_X2032); -be_define_const_str(get_aps_voltage, "get_aps_voltage", 2293036435u, 0, 15, &be_const_str_point); -be_define_const_str(get_bat_charge_current, "get_bat_charge_current", 1385293050u, 0, 22, &be_const_str_init_draw_line_dsc); -be_define_const_str(get_bat_current, "get_bat_current", 1912106073u, 0, 15, &be_const_str_millis); +be_define_const_str(gen_cb, "gen_cb", 3245227551u, 0, 6, &be_const_str_get_bri); +be_define_const_str(get, "get", 1410115415u, 0, 3, &be_const_str_remote_port); +be_define_const_str(get_alternate, "get_alternate", 1450148894u, 0, 13, &be_const_str_get_coords); +be_define_const_str(get_aps_voltage, "get_aps_voltage", 2293036435u, 0, 15, NULL); +be_define_const_str(get_bat_charge_current, "get_bat_charge_current", 1385293050u, 0, 22, &be_const_str_gpio); +be_define_const_str(get_bat_current, "get_bat_current", 1912106073u, 0, 15, &be_const_str_widget_height_def); be_define_const_str(get_bat_power, "get_bat_power", 3067374853u, 0, 13, NULL); -be_define_const_str(get_bat_voltage, "get_bat_voltage", 706676538u, 0, 15, &be_const_str_scan); -be_define_const_str(get_battery_chargin_status, "get_battery_chargin_status", 2233241571u, 0, 26, &be_const_str_widget_height_def); -be_define_const_str(get_bri, "get_bri", 2041809895u, 0, 7, &be_const_str_json_fdump_list); -be_define_const_str(get_cb_list, "get_cb_list", 1605319182u, 0, 11, &be_const_str_set_chg_current); -be_define_const_str(get_coords, "get_coords", 1044089006u, 0, 10, &be_const_str_global); -be_define_const_str(get_current_module_name, "get_current_module_name", 2379270740u, 0, 23, &be_const_str_nan); -be_define_const_str(get_current_module_path, "get_current_module_path", 3206673408u, 0, 23, &be_const_str_preinit); -be_define_const_str(get_free_heap, "get_free_heap", 625069757u, 0, 13, &be_const_str_minute); -be_define_const_str(get_height, "get_height", 3571755523u, 0, 10, &be_const_str_light); -be_define_const_str(get_input_power_status, "get_input_power_status", 4102829177u, 0, 22, &be_const_str_time_dump); +be_define_const_str(get_bat_voltage, "get_bat_voltage", 706676538u, 0, 15, &be_const_str_write_gpio); +be_define_const_str(get_battery_chargin_status, "get_battery_chargin_status", 2233241571u, 0, 26, &be_const_str_millis); +be_define_const_str(get_bri, "get_bri", 2041809895u, 0, 7, &be_const_str_strptime); +be_define_const_str(get_cb_list, "get_cb_list", 1605319182u, 0, 11, &be_const_str_state); +be_define_const_str(get_coords, "get_coords", 1044089006u, 0, 10, &be_const_str_on); +be_define_const_str(get_current_module_name, "get_current_module_name", 2379270740u, 0, 23, &be_const_str_isnan); +be_define_const_str(get_current_module_path, "get_current_module_path", 3206673408u, 0, 23, &be_const_str_lv_clock_icon); +be_define_const_str(get_free_heap, "get_free_heap", 625069757u, 0, 13, NULL); +be_define_const_str(get_height, "get_height", 3571755523u, 0, 10, NULL); +be_define_const_str(get_input_power_status, "get_input_power_status", 4102829177u, 0, 22, NULL); be_define_const_str(get_light, "get_light", 381930476u, 0, 9, NULL); -be_define_const_str(get_object_from_ptr, "get_object_from_ptr", 2345019201u, 0, 19, &be_const_str_persist); -be_define_const_str(get_option, "get_option", 2123730033u, 0, 10, &be_const_str_init); +be_define_const_str(get_object_from_ptr, "get_object_from_ptr", 2345019201u, 0, 19, NULL); +be_define_const_str(get_option, "get_option", 2123730033u, 0, 10, &be_const_str_input); be_define_const_str(get_percentage, "get_percentage", 2880483992u, 0, 14, NULL); -be_define_const_str(get_pixel_color, "get_pixel_color", 337490048u, 0, 15, &be_const_str_sys); -be_define_const_str(get_power, "get_power", 3009799377u, 0, 9, NULL); -be_define_const_str(get_size, "get_size", 2803644713u, 0, 8, &be_const_str_widget_instance_size); -be_define_const_str(get_string, "get_string", 4195847969u, 0, 10, NULL); -be_define_const_str(get_style_bg_color, "get_style_bg_color", 964794381u, 0, 18, NULL); -be_define_const_str(get_style_line_color, "get_style_line_color", 805371932u, 0, 20, NULL); -be_define_const_str(get_style_pad_right, "get_style_pad_right", 3150287466u, 0, 19, &be_const_str_target); -be_define_const_str(get_switch, "get_switch", 164821028u, 0, 10, &be_const_str_lv_event_cb); -be_define_const_str(get_temp, "get_temp", 3370919486u, 0, 8, &be_const_str_web_add_handler); -be_define_const_str(get_vbus_current, "get_vbus_current", 1205347942u, 0, 16, &be_const_str_param); -be_define_const_str(get_vbus_voltage, "get_vbus_voltage", 2398210401u, 0, 16, NULL); -be_define_const_str(get_warning_level, "get_warning_level", 1737834441u, 0, 17, &be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_manifest_X2Ejson); -be_define_const_str(get_width, "get_width", 3293417300u, 0, 9, NULL); -be_define_const_str(getbits, "getbits", 3094168979u, 0, 7, &be_const_str_the_X20second_X20argument_X20is_X20not_X20a_X20function); -be_define_const_str(geti, "geti", 2381006490u, 0, 4, &be_const_str_rotate); +be_define_const_str(get_pixel_color, "get_pixel_color", 337490048u, 0, 15, &be_const_str_is_first_time); +be_define_const_str(get_power, "get_power", 3009799377u, 0, 9, &be_const_str_init); +be_define_const_str(get_size, "get_size", 2803644713u, 0, 8, NULL); +be_define_const_str(get_string, "get_string", 4195847969u, 0, 10, &be_const_str_stop); +be_define_const_str(get_style_bg_color, "get_style_bg_color", 964794381u, 0, 18, &be_const_str_time_dump); +be_define_const_str(get_style_line_color, "get_style_line_color", 805371932u, 0, 20, &be_const_str_set_rate); +be_define_const_str(get_style_pad_right, "get_style_pad_right", 3150287466u, 0, 19, &be_const_str_pin_used); +be_define_const_str(get_switch, "get_switch", 164821028u, 0, 10, &be_const_str_set_width); +be_define_const_str(get_temp, "get_temp", 3370919486u, 0, 8, NULL); +be_define_const_str(get_vbus_current, "get_vbus_current", 1205347942u, 0, 16, &be_const_str_local); +be_define_const_str(get_vbus_voltage, "get_vbus_voltage", 2398210401u, 0, 16, &be_const_str_tostring); +be_define_const_str(get_warning_level, "get_warning_level", 1737834441u, 0, 17, NULL); +be_define_const_str(get_width, "get_width", 3293417300u, 0, 9, &be_const_str_obj_class_create_obj); +be_define_const_str(getbits, "getbits", 3094168979u, 0, 7, NULL); +be_define_const_str(geti, "geti", 2381006490u, 0, 4, &be_const_str_pop); be_define_const_str(global, "global", 503252654u, 0, 6, NULL); -be_define_const_str(gpio, "gpio", 2638155258u, 0, 4, &be_const_str_line_dsc); -be_define_const_str(group_def, "group_def", 1524213328u, 0, 9, &be_const_str_super); -be_define_const_str(h, "h", 3977000791u, 0, 1, &be_const_str_setbits); +be_define_const_str(gpio, "gpio", 2638155258u, 0, 4, &be_const_str_set_dc_voltage); +be_define_const_str(group_def, "group_def", 1524213328u, 0, 9, &be_const_str_offset); +be_define_const_str(h, "h", 3977000791u, 0, 1, &be_const_str_setmember); be_define_const_str(has, "has", 3988721635u, 0, 3, NULL); -be_define_const_str(has_arg, "has_arg", 424878688u, 0, 7, &be_const_str_io_error); -be_define_const_str(height_def, "height_def", 2348238838u, 0, 10, NULL); -be_define_const_str(hex, "hex", 4273249610u, 0, 3, &be_const_str_zip); -be_define_const_str(hour, "hour", 3053661199u, 0, 4, NULL); -be_define_const_str(hs2rgb, "hs2rgb", 1040816349u, 0, 6, NULL); -be_define_const_str(https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_X2F_X25s_X2Eautoconf, "https://raw.githubusercontent.com/tasmota/autoconf/main/%s/%s.autoconf", 2743526309u, 0, 70, &be_const_str_set_bri); +be_define_const_str(has_arg, "has_arg", 424878688u, 0, 7, &be_const_str__X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D); +be_define_const_str(height_def, "height_def", 2348238838u, 0, 10, &be_const_str_memory); +be_define_const_str(hex, "hex", 4273249610u, 0, 3, &be_const_str_k); +be_define_const_str(hour, "hour", 3053661199u, 0, 4, &be_const_str_screenshot); +be_define_const_str(hs2rgb, "hs2rgb", 1040816349u, 0, 6, &be_const_str_point_arr); +be_define_const_str(https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_X2F_X25s_X2Eautoconf, "https://raw.githubusercontent.com/tasmota/autoconf/main/%s/%s.autoconf", 2743526309u, 0, 70, &be_const_str_lv_signal_bars); be_define_const_str(https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_manifest_X2Ejson, "https://raw.githubusercontent.com/tasmota/autoconf/main/%s_manifest.json", 3657552045u, 0, 72, NULL); be_define_const_str(i2c_enabled, "i2c_enabled", 218388101u, 0, 11, NULL); -be_define_const_str(id, "id", 926444256u, 0, 2, &be_const_str_to_gamma); +be_define_const_str(id, "id", 926444256u, 0, 2, &be_const_str_wifi_arcs); be_define_const_str(if, "if", 959999494u, 50, 2, NULL); -be_define_const_str(imax, "imax", 3084515410u, 0, 4, NULL); -be_define_const_str(imin, "imin", 2714127864u, 0, 4, &be_const_str_json_fdump); +be_define_const_str(imax, "imax", 3084515410u, 0, 4, &be_const_str_write); +be_define_const_str(imin, "imin", 2714127864u, 0, 4, &be_const_str_read32); be_define_const_str(import, "import", 288002260u, 66, 6, NULL); -be_define_const_str(init, "init", 380752755u, 0, 4, NULL); +be_define_const_str(init, "init", 380752755u, 0, 4, &be_const_str_strftime); be_define_const_str(init_draw_line_dsc, "init_draw_line_dsc", 2507936040u, 0, 18, NULL); -be_define_const_str(input, "input", 4191711099u, 0, 5, NULL); -be_define_const_str(ins_goto, "ins_goto", 1342843963u, 0, 8, NULL); -be_define_const_str(ins_ramp, "ins_ramp", 1068049360u, 0, 8, &be_const_str_set_style_line_color); -be_define_const_str(ins_time, "ins_time", 2980245553u, 0, 8, NULL); -be_define_const_str(insert, "insert", 3332609576u, 0, 6, &be_const_str_lv_event); -be_define_const_str(instance, "instance", 193386898u, 0, 8, NULL); -be_define_const_str(instance_size, "instance_size", 4280269518u, 0, 13, &be_const_str_sec); -be_define_const_str(int, "int", 2515107422u, 0, 3, &be_const_str_on); -be_define_const_str(internal_error, "internal_error", 2519158169u, 0, 14, &be_const_str_stop); -be_define_const_str(introspect, "introspect", 164638290u, 0, 10, &be_const_str_reset); -be_define_const_str(invalidate, "invalidate", 2649734928u, 0, 10, &be_const_str_pop); -be_define_const_str(io_error, "io_error", 1970281036u, 0, 8, &be_const_str_set_dcdc_enable); -be_define_const_str(ip, "ip", 1261996636u, 0, 2, &be_const_str_top); +be_define_const_str(input, "input", 4191711099u, 0, 5, &be_const_str_read24); +be_define_const_str(ins_goto, "ins_goto", 1342843963u, 0, 8, &be_const_str_try_rule); +be_define_const_str(ins_ramp, "ins_ramp", 1068049360u, 0, 8, &be_const_str_pin); +be_define_const_str(ins_time, "ins_time", 2980245553u, 0, 8, &be_const_str_log); +be_define_const_str(insert, "insert", 3332609576u, 0, 6, NULL); +be_define_const_str(instance, "instance", 193386898u, 0, 8, &be_const_str_param); +be_define_const_str(instance_size, "instance_size", 4280269518u, 0, 13, &be_const_str_do); +be_define_const_str(int, "int", 2515107422u, 0, 3, NULL); +be_define_const_str(internal_error, "internal_error", 2519158169u, 0, 14, &be_const_str_month); +be_define_const_str(introspect, "introspect", 164638290u, 0, 10, &be_const_str_sec); +be_define_const_str(invalidate, "invalidate", 2649734928u, 0, 10, &be_const_str_publish); +be_define_const_str(io_error, "io_error", 1970281036u, 0, 8, NULL); +be_define_const_str(ip, "ip", 1261996636u, 0, 2, &be_const_str_register_obj); be_define_const_str(is_dirty, "is_dirty", 418034110u, 0, 8, NULL); -be_define_const_str(is_first_time, "is_first_time", 275242384u, 0, 13, NULL); -be_define_const_str(is_running, "is_running", 2226847261u, 0, 10, &be_const_str_readline); -be_define_const_str(isinstance, "isinstance", 3669352738u, 0, 10, &be_const_str_signal_bars); -be_define_const_str(isnan, "isnan", 2981347434u, 0, 5, &be_const_str_lv_wifi_bars); -be_define_const_str(isrunning, "isrunning", 1688182268u, 0, 9, &be_const_str_onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E); -be_define_const_str(issubclass, "issubclass", 4078395519u, 0, 10, NULL); -be_define_const_str(item, "item", 2671260646u, 0, 4, NULL); -be_define_const_str(iter, "iter", 3124256359u, 0, 4, &be_const_str_load); -be_define_const_str(json, "json", 916562499u, 0, 4, &be_const_str_redirect); +be_define_const_str(is_first_time, "is_first_time", 275242384u, 0, 13, &be_const_str_x1); +be_define_const_str(is_running, "is_running", 2226847261u, 0, 10, NULL); +be_define_const_str(isinstance, "isinstance", 3669352738u, 0, 10, &be_const_str_set_channels); +be_define_const_str(isnan, "isnan", 2981347434u, 0, 5, &be_const_str_update); +be_define_const_str(isrunning, "isrunning", 1688182268u, 0, 9, &be_const_str_round_start); +be_define_const_str(issubclass, "issubclass", 4078395519u, 0, 10, &be_const_str_set_bri); +be_define_const_str(item, "item", 2671260646u, 0, 4, &be_const_str_log10); +be_define_const_str(iter, "iter", 3124256359u, 0, 4, &be_const_str_onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20change_X20the_X20current_X20configuration_X20and_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E); +be_define_const_str(json, "json", 916562499u, 0, 4, NULL); be_define_const_str(json_append, "json_append", 3002019284u, 0, 11, NULL); -be_define_const_str(json_fdump, "json_fdump", 1694216580u, 0, 10, &be_const_str_reverse_gamma10); -be_define_const_str(json_fdump_any, "json_fdump_any", 3348629385u, 0, 14, NULL); -be_define_const_str(json_fdump_list, "json_fdump_list", 3903879853u, 0, 15, NULL); -be_define_const_str(json_fdump_map, "json_fdump_map", 4091954653u, 0, 14, &be_const_str_lv_obj); -be_define_const_str(k, "k", 3993778410u, 0, 1, &be_const_str_write_bytes); -be_define_const_str(keys, "keys", 4182378701u, 0, 4, NULL); -be_define_const_str(kv, "kv", 1497177492u, 0, 2, &be_const_str_matrix); -be_define_const_str(last_modified, "last_modified", 772177145u, 0, 13, &be_const_str_return); -be_define_const_str(leds, "leds", 558858555u, 0, 4, &be_const_str_lv); -be_define_const_str(length_X20in_X20bits_X20must_X20be_X20between_X200_X20and_X2032, "length in bits must be between 0 and 32", 2584509128u, 0, 39, &be_const_str_tob64); -be_define_const_str(light, "light", 3801947695u, 0, 5, &be_const_str_resize); -be_define_const_str(line_dsc, "line_dsc", 4094490978u, 0, 8, NULL); -be_define_const_str(list, "list", 217798785u, 0, 4, &be_const_str_upper); -be_define_const_str(list_handlers, "list_handlers", 593774371u, 0, 13, &be_const_str_unknown_X20instruction); +be_define_const_str(json_fdump, "json_fdump", 1694216580u, 0, 10, NULL); +be_define_const_str(json_fdump_any, "json_fdump_any", 3348629385u, 0, 14, &be_const_str_leds); +be_define_const_str(json_fdump_list, "json_fdump_list", 3903879853u, 0, 15, &be_const_str_value_error); +be_define_const_str(json_fdump_map, "json_fdump_map", 4091954653u, 0, 14, &be_const_str_page_autoconf_mgr); +be_define_const_str(k, "k", 3993778410u, 0, 1, NULL); +be_define_const_str(keys, "keys", 4182378701u, 0, 4, &be_const_str_resp_cmnd_error); +be_define_const_str(kv, "kv", 1497177492u, 0, 2, &be_const_str_rand); +be_define_const_str(last_modified, "last_modified", 772177145u, 0, 13, &be_const_str_p2); +be_define_const_str(leds, "leds", 558858555u, 0, 4, &be_const_str_url_encode); +be_define_const_str(length_X20in_X20bits_X20must_X20be_X20between_X200_X20and_X2032, "length in bits must be between 0 and 32", 2584509128u, 0, 39, &be_const_str_signal_bars); +be_define_const_str(light, "light", 3801947695u, 0, 5, NULL); +be_define_const_str(line_dsc, "line_dsc", 4094490978u, 0, 8, &be_const_str_nan); +be_define_const_str(list, "list", 217798785u, 0, 4, &be_const_str_sin); +be_define_const_str(list_handlers, "list_handlers", 593774371u, 0, 13, NULL); be_define_const_str(listdir, "listdir", 2005220720u, 0, 7, NULL); be_define_const_str(load, "load", 3859241449u, 0, 4, NULL); -be_define_const_str(load_freetype_font, "load_freetype_font", 2368447592u, 0, 18, &be_const_str_quality); -be_define_const_str(load_templates, "load_templates", 3513870133u, 0, 14, NULL); -be_define_const_str(local, "local", 2621662984u, 0, 5, &be_const_str_wire); -be_define_const_str(log, "log", 1062293841u, 0, 3, NULL); -be_define_const_str(log10, "log10", 2346846000u, 0, 5, NULL); -be_define_const_str(loop, "loop", 3723446379u, 0, 4, &be_const_str_return_X20code_X3D_X25i); -be_define_const_str(lower, "lower", 3038577850u, 0, 5, &be_const_str_round_start); -be_define_const_str(lv, "lv", 1529997255u, 0, 2, &be_const_str_strip); +be_define_const_str(load_freetype_font, "load_freetype_font", 2368447592u, 0, 18, NULL); +be_define_const_str(load_templates, "load_templates", 3513870133u, 0, 14, &be_const_str_module); +be_define_const_str(local, "local", 2621662984u, 0, 5, NULL); +be_define_const_str(log, "log", 1062293841u, 0, 3, &be_const_str_solidified); +be_define_const_str(log10, "log10", 2346846000u, 0, 5, &be_const_str_lv_point); +be_define_const_str(loop, "loop", 3723446379u, 0, 4, &be_const_str_wifi_bars); +be_define_const_str(lower, "lower", 3038577850u, 0, 5, &be_const_str_set_x); +be_define_const_str(lv, "lv", 1529997255u, 0, 2, &be_const_str_pc_abs); be_define_const_str(lv_, "lv_", 663721032u, 0, 3, NULL); be_define_const_str(lv_clock_icon, "lv_clock_icon", 3257216210u, 0, 13, NULL); -be_define_const_str(lv_coord_arr, "lv_coord_arr", 1197238601u, 0, 12, &be_const_str_wifi_bars); -be_define_const_str(lv_event, "lv_event", 2434089968u, 0, 8, &be_const_str_set_alternate); -be_define_const_str(lv_event_cb, "lv_event_cb", 2480731016u, 0, 11, NULL); -be_define_const_str(lv_extra, "lv_extra", 399561998u, 0, 8, &be_const_str_lv_signal_arcs); -be_define_const_str(lv_module_init, "lv_module_init", 1133027755u, 0, 14, &be_const_str_screenshot); -be_define_const_str(lv_obj, "lv_obj", 4257833149u, 0, 6, &be_const_str_valuer_error); -be_define_const_str(lv_obj_class, "lv_obj_class", 4039656294u, 0, 12, NULL); -be_define_const_str(lv_point, "lv_point", 4120221790u, 0, 8, &be_const_str_p1); -be_define_const_str(lv_point_arr, "lv_point_arr", 3959768858u, 0, 12, &be_const_str_yield); +be_define_const_str(lv_coord_arr, "lv_coord_arr", 1197238601u, 0, 12, NULL); +be_define_const_str(lv_event, "lv_event", 2434089968u, 0, 8, NULL); +be_define_const_str(lv_event_cb, "lv_event_cb", 2480731016u, 0, 11, &be_const_str_save_before_restart); +be_define_const_str(lv_extra, "lv_extra", 399561998u, 0, 8, NULL); +be_define_const_str(lv_module_init, "lv_module_init", 1133027755u, 0, 14, NULL); +be_define_const_str(lv_obj, "lv_obj", 4257833149u, 0, 6, &be_const_str_tolower); +be_define_const_str(lv_obj_class, "lv_obj_class", 4039656294u, 0, 12, &be_const_str_set_light); +be_define_const_str(lv_point, "lv_point", 4120221790u, 0, 8, &be_const_str_lv_wifi_bars); +be_define_const_str(lv_point_arr, "lv_point_arr", 3959768858u, 0, 12, NULL); be_define_const_str(lv_signal_arcs, "lv_signal_arcs", 2839156988u, 0, 14, NULL); -be_define_const_str(lv_signal_bars, "lv_signal_bars", 3513972559u, 0, 14, &be_const_str_remove_timer); -be_define_const_str(lv_solidified, "lv_solidified", 2274121310u, 0, 13, &be_const_str_publish); -be_define_const_str(lv_wifi_arcs, "lv_wifi_arcs", 2082091963u, 0, 12, &be_const_str_reverse); -be_define_const_str(lv_wifi_arcs_icon, "lv_wifi_arcs_icon", 1507982909u, 0, 17, &be_const_str_srand); -be_define_const_str(lv_wifi_bars, "lv_wifi_bars", 2109539196u, 0, 12, &be_const_str_resp_cmnd_failed); -be_define_const_str(lv_wifi_bars_icon, "lv_wifi_bars_icon", 2805815540u, 0, 17, NULL); -be_define_const_str(lvgl_event_dispatch, "lvgl_event_dispatch", 2104396622u, 0, 19, NULL); -be_define_const_str(make_cb, "make_cb", 71252785u, 0, 7, NULL); -be_define_const_str(map, "map", 3751997361u, 0, 3, NULL); +be_define_const_str(lv_signal_bars, "lv_signal_bars", 3513972559u, 0, 14, &be_const_str_stop_iteration); +be_define_const_str(lv_solidified, "lv_solidified", 2274121310u, 0, 13, &be_const_str_persist_X2E_p_X20is_X20not_X20a_X20map); +be_define_const_str(lv_wifi_arcs, "lv_wifi_arcs", 2082091963u, 0, 12, &be_const_str_r); +be_define_const_str(lv_wifi_arcs_icon, "lv_wifi_arcs_icon", 1507982909u, 0, 17, &be_const_str_signal_arcs); +be_define_const_str(lv_wifi_bars, "lv_wifi_bars", 2109539196u, 0, 12, NULL); +be_define_const_str(lv_wifi_bars_icon, "lv_wifi_bars_icon", 2805815540u, 0, 17, &be_const_str_public_key); +be_define_const_str(lvgl_event_dispatch, "lvgl_event_dispatch", 2104396622u, 0, 19, &be_const_str_if); +be_define_const_str(make_cb, "make_cb", 71252785u, 0, 7, &be_const_str_widget_cb); +be_define_const_str(map, "map", 3751997361u, 0, 3, &be_const_str_valuer_error); be_define_const_str(math, "math", 4001929615u, 0, 4, NULL); -be_define_const_str(matrix, "matrix", 365099244u, 0, 6, &be_const_str_members); +be_define_const_str(matrix, "matrix", 365099244u, 0, 6, &be_const_str_pc); be_define_const_str(member, "member", 719708611u, 0, 6, NULL); -be_define_const_str(members, "members", 937576464u, 0, 7, &be_const_str_skip); -be_define_const_str(memory, "memory", 2229924270u, 0, 6, &be_const_str_widget_dtor_impl); -be_define_const_str(millis, "millis", 1214679063u, 0, 6, &be_const_str_width_def); +be_define_const_str(members, "members", 937576464u, 0, 7, &be_const_str_page_autoconf_ctl); +be_define_const_str(memory, "memory", 2229924270u, 0, 6, NULL); +be_define_const_str(millis, "millis", 1214679063u, 0, 6, &be_const_str_serial); be_define_const_str(min, "min", 3381609815u, 0, 3, NULL); be_define_const_str(minute, "minute", 954666857u, 0, 6, NULL); -be_define_const_str(module, "module", 3617558685u, 0, 6, &be_const_str_read_bytes); -be_define_const_str(month, "month", 3598321157u, 0, 5, &be_const_str_pixels_buffer); -be_define_const_str(montserrat_font, "montserrat_font", 1819065874u, 0, 15, NULL); -be_define_const_str(name, "name", 2369371622u, 0, 4, NULL); -be_define_const_str(nan, "nan", 797905850u, 0, 3, &be_const_str_setitem); +be_define_const_str(module, "module", 3617558685u, 0, 6, NULL); +be_define_const_str(month, "month", 3598321157u, 0, 5, &be_const_str_widget_instance_size); +be_define_const_str(montserrat_font, "montserrat_font", 1819065874u, 0, 15, &be_const_str_wire); +be_define_const_str(name, "name", 2369371622u, 0, 4, &be_const_str_rotate); +be_define_const_str(nan, "nan", 797905850u, 0, 3, NULL); be_define_const_str(nil, "nil", 228849900u, 63, 3, NULL); -be_define_const_str(no_X20GPIO_X20specified_X20for_X20neopixelbus, "no GPIO specified for neopixelbus", 42078528u, 0, 33, &be_const_str_running); +be_define_const_str(no_X20GPIO_X20specified_X20for_X20neopixelbus, "no GPIO specified for neopixelbus", 42078528u, 0, 33, &be_const_str_remove_driver); be_define_const_str(null_cb, "null_cb", 2333536460u, 0, 7, NULL); -be_define_const_str(number, "number", 467038368u, 0, 6, &be_const_str_page_autoconf_ctl); -be_define_const_str(obj_class_create_obj, "obj_class_create_obj", 3304390632u, 0, 20, &be_const_str_wifi_arcs_icon); -be_define_const_str(obj_event_base, "obj_event_base", 1624064363u, 0, 14, &be_const_str_set_text); -be_define_const_str(offset, "offset", 348705738u, 0, 6, NULL); -be_define_const_str(offseta, "offseta", 1663383089u, 0, 7, &be_const_str_sinh); -be_define_const_str(on, "on", 1630810064u, 0, 2, &be_const_str_pc); -be_define_const_str(onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E, "onsubmit='return confirm(\"This will cause a restart.\");'>", 232646018u, 0, 57, &be_const_str_range); -be_define_const_str(onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20change_X20the_X20current_X20configuration_X20and_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E, "onsubmit='return confirm(\"This will change the current configuration and cause a restart.\");'>", 3792412559u, 0, 94, &be_const_str_elif); +be_define_const_str(number, "number", 467038368u, 0, 6, NULL); +be_define_const_str(obj_class_create_obj, "obj_class_create_obj", 3304390632u, 0, 20, NULL); +be_define_const_str(obj_event_base, "obj_event_base", 1624064363u, 0, 14, &be_const_str_elif); +be_define_const_str(offset, "offset", 348705738u, 0, 6, &be_const_str_end); +be_define_const_str(offseta, "offseta", 1663383089u, 0, 7, &be_const_str_setbits); +be_define_const_str(on, "on", 1630810064u, 0, 2, &be_const_str_pc_rel); +be_define_const_str(onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E, "onsubmit='return confirm(\"This will cause a restart.\");'>", 232646018u, 0, 57, &be_const_str__X7D); +be_define_const_str(onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20change_X20the_X20current_X20configuration_X20and_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E, "onsubmit='return confirm(\"This will change the current configuration and cause a restart.\");'>", 3792412559u, 0, 94, NULL); be_define_const_str(open, "open", 3546203337u, 0, 4, NULL); be_define_const_str(out_X20of_X20range, "out of range", 2236631477u, 0, 12, NULL); -be_define_const_str(p1, "p1", 2689521274u, 0, 2, &be_const_str_y); -be_define_const_str(p2, "p2", 2672743655u, 0, 2, &be_const_str_pow); -be_define_const_str(page_autoconf_ctl, "page_autoconf_ctl", 2453381496u, 0, 17, &be_const_str_size); -be_define_const_str(page_autoconf_mgr, "page_autoconf_mgr", 3643937031u, 0, 17, &be_const_str_split); -be_define_const_str(param, "param", 1309554226u, 0, 5, &be_const_str_readbytes); -be_define_const_str(path, "path", 2223459638u, 0, 4, &be_const_str_pop_path); -be_define_const_str(pc, "pc", 1313756516u, 0, 2, &be_const_str__X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D); -be_define_const_str(pc_abs, "pc_abs", 920256495u, 0, 6, &be_const_str_tele); +be_define_const_str(p1, "p1", 2689521274u, 0, 2, NULL); +be_define_const_str(p2, "p2", 2672743655u, 0, 2, NULL); +be_define_const_str(page_autoconf_ctl, "page_autoconf_ctl", 2453381496u, 0, 17, NULL); +be_define_const_str(page_autoconf_mgr, "page_autoconf_mgr", 3643937031u, 0, 17, NULL); +be_define_const_str(param, "param", 1309554226u, 0, 5, &be_const_str_write_bytes); +be_define_const_str(path, "path", 2223459638u, 0, 4, NULL); +be_define_const_str(pc, "pc", 1313756516u, 0, 2, NULL); +be_define_const_str(pc_abs, "pc_abs", 920256495u, 0, 6, NULL); be_define_const_str(pc_rel, "pc_rel", 991921176u, 0, 6, NULL); -be_define_const_str(percentage, "percentage", 2538831285u, 0, 10, &be_const_str_x); +be_define_const_str(percentage, "percentage", 2538831285u, 0, 10, NULL); be_define_const_str(persist, "persist", 3917083779u, 0, 7, NULL); -be_define_const_str(persist_X2E_p_X20is_X20not_X20a_X20map, "persist._p is not a map", 1176528732u, 0, 23, &be_const_str__X7Bs_X7DVBus_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D); -be_define_const_str(pi, "pi", 1213090802u, 0, 2, &be_const_str_scale_uint); -be_define_const_str(pin, "pin", 1866532500u, 0, 3, &be_const_str_tanh); -be_define_const_str(pin_mode, "pin_mode", 3258314030u, 0, 8, &be_const_str_run_bat); -be_define_const_str(pin_used, "pin_used", 4033854612u, 0, 8, NULL); -be_define_const_str(pixel_count, "pixel_count", 2439130743u, 0, 11, NULL); -be_define_const_str(pixel_size, "pixel_size", 2209135785u, 0, 10, &be_const_str_read); +be_define_const_str(persist_X2E_p_X20is_X20not_X20a_X20map, "persist._p is not a map", 1176528732u, 0, 23, &be_const_str_def); +be_define_const_str(pi, "pi", 1213090802u, 0, 2, &be_const_str_try); +be_define_const_str(pin, "pin", 1866532500u, 0, 3, &be_const_str_quality); +be_define_const_str(pin_mode, "pin_mode", 3258314030u, 0, 8, NULL); +be_define_const_str(pin_used, "pin_used", 4033854612u, 0, 8, &be_const_str_settings); +be_define_const_str(pixel_count, "pixel_count", 2439130743u, 0, 11, &be_const_str_widget_dtor_cb); +be_define_const_str(pixel_size, "pixel_size", 2209135785u, 0, 10, NULL); be_define_const_str(pixels_buffer, "pixels_buffer", 1229555807u, 0, 13, NULL); -be_define_const_str(point, "point", 414084241u, 0, 5, &be_const_str_select); -be_define_const_str(point_arr, "point_arr", 1140859857u, 0, 9, NULL); +be_define_const_str(point, "point", 414084241u, 0, 5, NULL); +be_define_const_str(point_arr, "point_arr", 1140859857u, 0, 9, &be_const_str_start); be_define_const_str(pop, "pop", 1362321360u, 0, 3, NULL); be_define_const_str(pop_path, "pop_path", 2403243998u, 0, 8, NULL); -be_define_const_str(pow, "pow", 1479764693u, 0, 3, NULL); -be_define_const_str(preinit, "preinit", 2722007100u, 0, 7, &be_const_str_save_before_restart); -be_define_const_str(print, "print", 372738696u, 0, 5, NULL); -be_define_const_str(public_key, "public_key", 4169142980u, 0, 10, NULL); +be_define_const_str(pow, "pow", 1479764693u, 0, 3, &be_const_str_unknown_X20instruction); +be_define_const_str(preinit, "preinit", 2722007100u, 0, 7, NULL); +be_define_const_str(print, "print", 372738696u, 0, 5, &be_const_str_except); +be_define_const_str(public_key, "public_key", 4169142980u, 0, 10, &be_const_str_save); be_define_const_str(publish, "publish", 264247304u, 0, 7, NULL); -be_define_const_str(publish_result, "publish_result", 2013351252u, 0, 14, NULL); +be_define_const_str(publish_result, "publish_result", 2013351252u, 0, 14, &be_const_str_run); be_define_const_str(push, "push", 2272264157u, 0, 4, NULL); be_define_const_str(push_path, "push_path", 1155254157u, 0, 9, NULL); -be_define_const_str(quality, "quality", 2597670950u, 0, 7, &be_const_str_refr_size); -be_define_const_str(r, "r", 4144776981u, 0, 1, NULL); +be_define_const_str(quality, "quality", 2597670950u, 0, 7, &be_const_str_seti); +be_define_const_str(r, "r", 4144776981u, 0, 1, &be_const_str__X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D); be_define_const_str(rad, "rad", 1358899048u, 0, 3, NULL); be_define_const_str(raise, "raise", 1593437475u, 70, 5, NULL); -be_define_const_str(rand, "rand", 2711325910u, 0, 4, &be_const_str_send_multicast); -be_define_const_str(range, "range", 4208725202u, 0, 5, &be_const_str_web_add_console_button); -be_define_const_str(read, "read", 3470762949u, 0, 4, &be_const_str_seg7_font); -be_define_const_str(read12, "read12", 4291076970u, 0, 6, NULL); -be_define_const_str(read13, "read13", 12887293u, 0, 6, &be_const_str_search); +be_define_const_str(rand, "rand", 2711325910u, 0, 4, &be_const_str_readbytes); +be_define_const_str(range, "range", 4208725202u, 0, 5, NULL); +be_define_const_str(read, "read", 3470762949u, 0, 4, NULL); +be_define_const_str(read12, "read12", 4291076970u, 0, 6, &be_const_str_else); +be_define_const_str(read13, "read13", 12887293u, 0, 6, &be_const_str_tcpclient); be_define_const_str(read24, "read24", 1808533811u, 0, 6, NULL); -be_define_const_str(read32, "read32", 1741276240u, 0, 6, &be_const_str_set_pixel_color); +be_define_const_str(read32, "read32", 1741276240u, 0, 6, &be_const_str_skip); be_define_const_str(read8, "read8", 2802788167u, 0, 5, NULL); be_define_const_str(read_bytes, "read_bytes", 3576733173u, 0, 10, NULL); be_define_const_str(read_sensors, "read_sensors", 892689201u, 0, 12, NULL); be_define_const_str(readbytes, "readbytes", 2716426756u, 0, 9, NULL); be_define_const_str(readline, "readline", 1212709927u, 0, 8, NULL); -be_define_const_str(real, "real", 3604983901u, 0, 4, &be_const_str_resp_cmnd_error); +be_define_const_str(real, "real", 3604983901u, 0, 4, NULL); be_define_const_str(reapply, "reapply", 3778939332u, 0, 7, NULL); -be_define_const_str(redirect, "redirect", 389758641u, 0, 8, &be_const_str_response_append); -be_define_const_str(refr_size, "refr_size", 1958144468u, 0, 9, &be_const_str_write); -be_define_const_str(register_button_encoder, "register_button_encoder", 2811301550u, 0, 23, NULL); -be_define_const_str(register_obj, "register_obj", 3982614770u, 0, 12, NULL); -be_define_const_str(remote_ip, "remote_ip", 2953154693u, 0, 9, &be_const_str_start); +be_define_const_str(redirect, "redirect", 389758641u, 0, 8, &be_const_str_seg7_font); +be_define_const_str(refr_size, "refr_size", 1958144468u, 0, 9, &be_const_str_tanh); +be_define_const_str(register_button_encoder, "register_button_encoder", 2811301550u, 0, 23, &be_const_str_tan); +be_define_const_str(register_obj, "register_obj", 3982614770u, 0, 12, &be_const_str_set_matrix_pixel_color); +be_define_const_str(remote_ip, "remote_ip", 2953154693u, 0, 9, NULL); be_define_const_str(remote_port, "remote_port", 2163585967u, 0, 11, NULL); -be_define_const_str(remove, "remove", 3683784189u, 0, 6, &be_const_str_url_encode); -be_define_const_str(remove_cmd, "remove_cmd", 3832315702u, 0, 10, &be_const_str_tasmota); +be_define_const_str(remove, "remove", 3683784189u, 0, 6, NULL); +be_define_const_str(remove_cmd, "remove_cmd", 3832315702u, 0, 10, NULL); be_define_const_str(remove_driver, "remove_driver", 1030243768u, 0, 13, NULL); -be_define_const_str(remove_rule, "remove_rule", 3456211328u, 0, 11, &be_const_str_web_sensor); +be_define_const_str(remove_rule, "remove_rule", 3456211328u, 0, 11, &be_const_str_setitem); be_define_const_str(remove_timer, "remove_timer", 4141472215u, 0, 12, NULL); -be_define_const_str(reset, "reset", 1695364032u, 0, 5, &be_const_str_resp_cmnd); -be_define_const_str(reset_search, "reset_search", 1350414305u, 0, 12, &be_const_str_set_style_text_font); -be_define_const_str(resize, "resize", 3514612129u, 0, 6, &be_const_str__X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_X26deg_X3BC_X7Be_X7D); +be_define_const_str(reset, "reset", 1695364032u, 0, 5, NULL); +be_define_const_str(reset_search, "reset_search", 1350414305u, 0, 12, &be_const_str_send); +be_define_const_str(resize, "resize", 3514612129u, 0, 6, NULL); be_define_const_str(resolvecmnd, "resolvecmnd", 993361485u, 0, 11, NULL); be_define_const_str(resp_cmnd, "resp_cmnd", 2869459626u, 0, 9, NULL); -be_define_const_str(resp_cmnd_done, "resp_cmnd_done", 2601874875u, 0, 14, &be_const_str_set_ldo_enable); +be_define_const_str(resp_cmnd_done, "resp_cmnd_done", 2601874875u, 0, 14, NULL); be_define_const_str(resp_cmnd_error, "resp_cmnd_error", 2404088863u, 0, 15, &be_const_str_widget_ctor_impl); -be_define_const_str(resp_cmnd_failed, "resp_cmnd_failed", 2136281562u, 0, 16, NULL); +be_define_const_str(resp_cmnd_failed, "resp_cmnd_failed", 2136281562u, 0, 16, &be_const_str_run_bat); be_define_const_str(resp_cmnd_str, "resp_cmnd_str", 737845590u, 0, 13, NULL); be_define_const_str(response_append, "response_append", 450346371u, 0, 15, NULL); be_define_const_str(return, "return", 2246981567u, 60, 6, NULL); -be_define_const_str(return_X20code_X3D_X25i, "return code=%i", 2127454401u, 0, 14, &be_const_str_serial); -be_define_const_str(reverse, "reverse", 558918661u, 0, 7, &be_const_str_set_timer); -be_define_const_str(reverse_gamma10, "reverse_gamma10", 739112262u, 0, 15, NULL); -be_define_const_str(rotate, "rotate", 2784296202u, 0, 6, &be_const_str_false); -be_define_const_str(round_end, "round_end", 985288225u, 0, 9, &be_const_str_sin); -be_define_const_str(round_start, "round_start", 2949484384u, 0, 11, &be_const_str_import); -be_define_const_str(rtc, "rtc", 1070575216u, 0, 3, NULL); -be_define_const_str(rule, "rule", 4230889683u, 0, 4, &be_const_str_y1); -be_define_const_str(run, "run", 718098122u, 0, 3, NULL); -be_define_const_str(run_bat, "run_bat", 2536903298u, 0, 7, &be_const_str_setrange); +be_define_const_str(return_X20code_X3D_X25i, "return code=%i", 2127454401u, 0, 14, NULL); +be_define_const_str(reverse, "reverse", 558918661u, 0, 7, NULL); +be_define_const_str(reverse_gamma10, "reverse_gamma10", 739112262u, 0, 15, &be_const_str_web_send); +be_define_const_str(rotate, "rotate", 2784296202u, 0, 6, NULL); +be_define_const_str(round_end, "round_end", 985288225u, 0, 9, NULL); +be_define_const_str(round_start, "round_start", 2949484384u, 0, 11, &be_const_str_web_add_console_button); +be_define_const_str(rtc, "rtc", 1070575216u, 0, 3, &be_const_str_break); +be_define_const_str(rule, "rule", 4230889683u, 0, 4, &be_const_str_set); +be_define_const_str(run, "run", 718098122u, 0, 3, &be_const_str_tasmota); +be_define_const_str(run_bat, "run_bat", 2536903298u, 0, 7, &be_const_str_var); be_define_const_str(run_deferred, "run_deferred", 371594696u, 0, 12, NULL); -be_define_const_str(running, "running", 343848780u, 0, 7, &be_const_str_save); +be_define_const_str(running, "running", 343848780u, 0, 7, &be_const_str_str); be_define_const_str(save, "save", 3439296072u, 0, 4, NULL); -be_define_const_str(save_before_restart, "save_before_restart", 1253239338u, 0, 19, &be_const_str_set_dc_voltage); -be_define_const_str(scale_uint, "scale_uint", 3090811094u, 0, 10, &be_const_str_set_percentage); +be_define_const_str(save_before_restart, "save_before_restart", 1253239338u, 0, 19, NULL); +be_define_const_str(scale_uint, "scale_uint", 3090811094u, 0, 10, NULL); be_define_const_str(scan, "scan", 3974641896u, 0, 4, NULL); -be_define_const_str(screenshot, "screenshot", 3894592561u, 0, 10, &be_const_str_set); -be_define_const_str(search, "search", 2150836393u, 0, 6, &be_const_str_solidified); -be_define_const_str(sec, "sec", 3139892658u, 0, 3, NULL); +be_define_const_str(screenshot, "screenshot", 3894592561u, 0, 10, NULL); +be_define_const_str(search, "search", 2150836393u, 0, 6, NULL); +be_define_const_str(sec, "sec", 3139892658u, 0, 3, &be_const_str_show); be_define_const_str(seg7_font, "seg7_font", 4099690689u, 0, 9, NULL); -be_define_const_str(select, "select", 297952813u, 0, 6, NULL); +be_define_const_str(select, "select", 297952813u, 0, 6, &be_const_str_the_X20second_X20argument_X20is_X20not_X20a_X20function); be_define_const_str(send, "send", 1919010991u, 0, 4, NULL); be_define_const_str(send_multicast, "send_multicast", 812185870u, 0, 14, NULL); be_define_const_str(serial, "serial", 3687697785u, 0, 6, NULL); be_define_const_str(set, "set", 3324446467u, 0, 3, NULL); -be_define_const_str(set_alternate, "set_alternate", 1709680562u, 0, 13, &be_const_str_set_style_pad_right); -be_define_const_str(set_auth, "set_auth", 1057170930u, 0, 8, &be_const_str_def); -be_define_const_str(set_bri, "set_bri", 2789118779u, 0, 7, NULL); -be_define_const_str(set_chg_current, "set_chg_current", 336304386u, 0, 15, NULL); +be_define_const_str(set_alternate, "set_alternate", 1709680562u, 0, 13, &be_const_str_shared_key); +be_define_const_str(set_auth, "set_auth", 1057170930u, 0, 8, NULL); +be_define_const_str(set_bits_per_sample, "set_bits_per_sample", 3747657551u, 0, 19, &be_const_str_tag); +be_define_const_str(set_bri, "set_bri", 2789118779u, 0, 7, &be_const_str_set_height); +be_define_const_str(set_channels, "set_channels", 1370190620u, 0, 12, &be_const_str_set_style_pad_right); +be_define_const_str(set_chg_current, "set_chg_current", 336304386u, 0, 15, &be_const_str_super); be_define_const_str(set_dc_voltage, "set_dc_voltage", 2181981936u, 0, 14, NULL); be_define_const_str(set_dcdc_enable, "set_dcdc_enable", 1594690786u, 0, 15, NULL); -be_define_const_str(set_first_time, "set_first_time", 3111247550u, 0, 14, NULL); -be_define_const_str(set_height, "set_height", 1080207399u, 0, 10, NULL); +be_define_const_str(set_first_time, "set_first_time", 3111247550u, 0, 14, &be_const_str_zip); +be_define_const_str(set_gain, "set_gain", 3847781975u, 0, 8, NULL); +be_define_const_str(set_height, "set_height", 1080207399u, 0, 10, &be_const_str_type); be_define_const_str(set_ldo_enable, "set_ldo_enable", 2916502041u, 0, 14, NULL); be_define_const_str(set_ldo_voltage, "set_ldo_voltage", 4090501160u, 0, 15, NULL); -be_define_const_str(set_light, "set_light", 3176076152u, 0, 9, &be_const_str_time_str); -be_define_const_str(set_matrix_pixel_color, "set_matrix_pixel_color", 1197149462u, 0, 22, &be_const_str_widget_struct_by_class); -be_define_const_str(set_percentage, "set_percentage", 2952022724u, 0, 14, NULL); -be_define_const_str(set_pixel_color, "set_pixel_color", 1275248356u, 0, 15, NULL); -be_define_const_str(set_power, "set_power", 549820893u, 0, 9, &be_const_str_strftime); +be_define_const_str(set_light, "set_light", 3176076152u, 0, 9, NULL); +be_define_const_str(set_matrix_pixel_color, "set_matrix_pixel_color", 1197149462u, 0, 22, NULL); +be_define_const_str(set_percentage, "set_percentage", 2952022724u, 0, 14, &be_const_str_w); +be_define_const_str(set_pixel_color, "set_pixel_color", 1275248356u, 0, 15, &be_const_str_widget_constructor); +be_define_const_str(set_power, "set_power", 549820893u, 0, 9, NULL); +be_define_const_str(set_rate, "set_rate", 1154016838u, 0, 8, NULL); be_define_const_str(set_style_bg_color, "set_style_bg_color", 1689513089u, 0, 18, NULL); -be_define_const_str(set_style_line_color, "set_style_line_color", 3665238976u, 0, 20, &be_const_str_wire_scan); -be_define_const_str(set_style_pad_right, "set_style_pad_right", 3314069054u, 0, 19, &be_const_str_do); +be_define_const_str(set_style_line_color, "set_style_line_color", 3665238976u, 0, 20, &be_const_str_widget_struct_by_class); +be_define_const_str(set_style_pad_right, "set_style_pad_right", 3314069054u, 0, 19, &be_const_str_for); be_define_const_str(set_style_text_font, "set_style_text_font", 1028590019u, 0, 19, NULL); be_define_const_str(set_text, "set_text", 1849641155u, 0, 8, NULL); -be_define_const_str(set_time, "set_time", 900236405u, 0, 8, NULL); -be_define_const_str(set_timeouts, "set_timeouts", 3732850900u, 0, 12, NULL); -be_define_const_str(set_timer, "set_timer", 2135414533u, 0, 9, NULL); -be_define_const_str(set_useragent, "set_useragent", 612237244u, 0, 13, &be_const_str_widget_editable); -be_define_const_str(set_width, "set_width", 484671920u, 0, 9, NULL); +be_define_const_str(set_time, "set_time", 900236405u, 0, 8, &be_const_str_widget_event_impl); +be_define_const_str(set_timeouts, "set_timeouts", 3732850900u, 0, 12, &be_const_str_setrange); +be_define_const_str(set_timer, "set_timer", 2135414533u, 0, 9, &be_const_str_sinh); +be_define_const_str(set_useragent, "set_useragent", 612237244u, 0, 13, NULL); +be_define_const_str(set_width, "set_width", 484671920u, 0, 9, &be_const_str_time_str); be_define_const_str(set_x, "set_x", 1849400772u, 0, 5, NULL); -be_define_const_str(set_y, "set_y", 1866178391u, 0, 5, &be_const_str_widget_dtor_cb); +be_define_const_str(set_y, "set_y", 1866178391u, 0, 5, &be_const_str_target_search); be_define_const_str(setbits, "setbits", 2762408167u, 0, 7, NULL); be_define_const_str(seti, "seti", 1500556254u, 0, 4, NULL); be_define_const_str(setitem, "setitem", 1554834596u, 0, 7, NULL); be_define_const_str(setmember, "setmember", 1432909441u, 0, 9, NULL); be_define_const_str(setrange, "setrange", 3794019032u, 0, 8, NULL); -be_define_const_str(settings, "settings", 1745255176u, 0, 8, NULL); -be_define_const_str(shared_key, "shared_key", 2200833624u, 0, 10, &be_const_str_widget_width_def); +be_define_const_str(settings, "settings", 1745255176u, 0, 8, &be_const_str_webserver); +be_define_const_str(shared_key, "shared_key", 2200833624u, 0, 10, &be_const_str_sys); be_define_const_str(show, "show", 2840060476u, 0, 4, NULL); be_define_const_str(signal_arcs, "signal_arcs", 1505996127u, 0, 11, NULL); be_define_const_str(signal_bars, "signal_bars", 3181573600u, 0, 11, NULL); be_define_const_str(sin, "sin", 3761252941u, 0, 3, NULL); -be_define_const_str(sinh, "sinh", 282220607u, 0, 4, NULL); -be_define_const_str(size, "size", 597743964u, 0, 4, &be_const_str_state); -be_define_const_str(skip, "skip", 1097563074u, 0, 4, &be_const_str_else); -be_define_const_str(solidified, "solidified", 3257553487u, 0, 10, &be_const_str_class); -be_define_const_str(split, "split", 2276994531u, 0, 5, &be_const_str_raise); +be_define_const_str(sinh, "sinh", 282220607u, 0, 4, &be_const_str_strip); +be_define_const_str(size, "size", 597743964u, 0, 4, &be_const_str_webclient); +be_define_const_str(skip, "skip", 1097563074u, 0, 4, NULL); +be_define_const_str(solidified, "solidified", 3257553487u, 0, 10, NULL); +be_define_const_str(split, "split", 2276994531u, 0, 5, NULL); be_define_const_str(sqrt, "sqrt", 2112764879u, 0, 4, NULL); be_define_const_str(srand, "srand", 465518633u, 0, 5, NULL); be_define_const_str(start, "start", 1697318111u, 0, 5, NULL); -be_define_const_str(state, "state", 2016490230u, 0, 5, &be_const_str_write_bit); +be_define_const_str(state, "state", 2016490230u, 0, 5, NULL); be_define_const_str(static, "static", 3532702267u, 71, 6, NULL); -be_define_const_str(stop, "stop", 3411225317u, 0, 4, &be_const_str_tasmota_X2Eget_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eget_X28_X29); +be_define_const_str(stop, "stop", 3411225317u, 0, 4, NULL); be_define_const_str(stop_iteration, "stop_iteration", 4173793901u, 0, 14, NULL); -be_define_const_str(str, "str", 3259748752u, 0, 3, &be_const_str_string); +be_define_const_str(str, "str", 3259748752u, 0, 3, NULL); be_define_const_str(strftime, "strftime", 187738851u, 0, 8, NULL); -be_define_const_str(string, "string", 398550328u, 0, 6, &be_const_str_update); -be_define_const_str(strip, "strip", 4246411473u, 0, 5, &be_const_str_type); +be_define_const_str(string, "string", 398550328u, 0, 6, &be_const_str_widget_editable); +be_define_const_str(strip, "strip", 4246411473u, 0, 5, NULL); be_define_const_str(strptime, "strptime", 1277910361u, 0, 8, NULL); -be_define_const_str(super, "super", 4152230356u, 0, 5, &be_const_str_year); -be_define_const_str(sys, "sys", 3277365014u, 0, 3, NULL); -be_define_const_str(tag, "tag", 2516003219u, 0, 3, NULL); +be_define_const_str(super, "super", 4152230356u, 0, 5, NULL); +be_define_const_str(sys, "sys", 3277365014u, 0, 3, &be_const_str_web_add_management_button); +be_define_const_str(tag, "tag", 2516003219u, 0, 3, &be_const_str_width_def); be_define_const_str(tan, "tan", 2633446552u, 0, 3, NULL); be_define_const_str(tanh, "tanh", 153638352u, 0, 4, NULL); -be_define_const_str(target, "target", 845187144u, 0, 6, &be_const_str_web_add_button); +be_define_const_str(target, "target", 845187144u, 0, 6, &be_const_str_year); be_define_const_str(target_search, "target_search", 1947846553u, 0, 13, NULL); be_define_const_str(tasmota, "tasmota", 424643812u, 0, 7, NULL); be_define_const_str(tasmota_X2Eget_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eget_X28_X29, "tasmota.get_light() is deprecated, use light.get()", 3525753647u, 0, 50, NULL); be_define_const_str(tasmota_X2Eset_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eset_X28_X29, "tasmota.set_light() is deprecated, use light.set()", 2124937871u, 0, 50, NULL); -be_define_const_str(tcpclient, "tcpclient", 3828797983u, 0, 9, &be_const_str_static); +be_define_const_str(tcpclient, "tcpclient", 3828797983u, 0, 9, NULL); be_define_const_str(tele, "tele", 3474458061u, 0, 4, NULL); -be_define_const_str(the_X20second_X20argument_X20is_X20not_X20a_X20function, "the second argument is not a function", 3954574469u, 0, 37, &be_const_str_widget_group_def); -be_define_const_str(time_dump, "time_dump", 3330410747u, 0, 9, NULL); +be_define_const_str(the_X20second_X20argument_X20is_X20not_X20a_X20function, "the second argument is not a function", 3954574469u, 0, 37, NULL); +be_define_const_str(time_dump, "time_dump", 3330410747u, 0, 9, &be_const_str_write_file); be_define_const_str(time_reached, "time_reached", 2075136773u, 0, 12, NULL); be_define_const_str(time_str, "time_str", 2613827612u, 0, 8, NULL); be_define_const_str(to_gamma, "to_gamma", 1597139862u, 0, 8, NULL); be_define_const_str(tob64, "tob64", 373777640u, 0, 5, NULL); -be_define_const_str(tolower, "tolower", 1042520049u, 0, 7, &be_const_str__X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D); +be_define_const_str(tolower, "tolower", 1042520049u, 0, 7, NULL); be_define_const_str(tomap, "tomap", 612167626u, 0, 5, NULL); be_define_const_str(top, "top", 2802900028u, 0, 3, NULL); be_define_const_str(toptr, "toptr", 3379847454u, 0, 5, NULL); -be_define_const_str(tostring, "tostring", 2299708645u, 0, 8, NULL); -be_define_const_str(toupper, "toupper", 3691983576u, 0, 7, &be_const_str_web_send_decimal); +be_define_const_str(tostring, "tostring", 2299708645u, 0, 8, &be_const_str_return); +be_define_const_str(toupper, "toupper", 3691983576u, 0, 7, NULL); be_define_const_str(tr, "tr", 1195724803u, 0, 2, NULL); be_define_const_str(traceback, "traceback", 3385188109u, 0, 9, NULL); be_define_const_str(true, "true", 1303515621u, 61, 4, NULL); be_define_const_str(try, "try", 2887626766u, 68, 3, NULL); -be_define_const_str(try_rule, "try_rule", 1986449405u, 0, 8, NULL); +be_define_const_str(try_rule, "try_rule", 1986449405u, 0, 8, &be_const_str_x); be_define_const_str(type, "type", 1361572173u, 0, 4, NULL); -be_define_const_str(udp, "udp", 1253872004u, 0, 3, &be_const_str__X7D); -be_define_const_str(unknown_X20instruction, "unknown instruction", 1093911841u, 0, 19, NULL); +be_define_const_str(udp, "udp", 1253872004u, 0, 3, NULL); +be_define_const_str(unknown_X20instruction, "unknown instruction", 1093911841u, 0, 19, &be_const_str_wifi_bars_icon); be_define_const_str(update, "update", 672109684u, 0, 6, NULL); be_define_const_str(upper, "upper", 176974407u, 0, 5, NULL); be_define_const_str(url_encode, "url_encode", 528392145u, 0, 10, NULL); be_define_const_str(v, "v", 4077666505u, 0, 1, NULL); -be_define_const_str(value, "value", 1113510858u, 0, 5, NULL); -be_define_const_str(value_error, "value_error", 773297791u, 0, 11, NULL); -be_define_const_str(valuer_error, "valuer_error", 2567947105u, 0, 12, &be_const_str_as); +be_define_const_str(value, "value", 1113510858u, 0, 5, &be_const_str_web_sensor); +be_define_const_str(value_error, "value_error", 773297791u, 0, 11, &be_const_str_y1); +be_define_const_str(valuer_error, "valuer_error", 2567947105u, 0, 12, NULL); be_define_const_str(var, "var", 2317739966u, 64, 3, NULL); be_define_const_str(w, "w", 4060888886u, 0, 1, NULL); -be_define_const_str(wd, "wd", 1531424278u, 0, 2, &be_const_str_end); -be_define_const_str(web_add_button, "web_add_button", 3537875058u, 0, 14, NULL); +be_define_const_str(wd, "wd", 1531424278u, 0, 2, NULL); +be_define_const_str(web_add_button, "web_add_button", 3537875058u, 0, 14, &be_const_str_wifi_arcs_icon); be_define_const_str(web_add_config_button, "web_add_config_button", 639674325u, 0, 21, NULL); be_define_const_str(web_add_console_button, "web_add_console_button", 3481436192u, 0, 22, NULL); -be_define_const_str(web_add_handler, "web_add_handler", 3990174962u, 0, 15, &be_const_str_widget_constructor); -be_define_const_str(web_add_main_button, "web_add_main_button", 3960367664u, 0, 19, &be_const_str_wifi_arcs); +be_define_const_str(web_add_handler, "web_add_handler", 3990174962u, 0, 15, NULL); +be_define_const_str(web_add_main_button, "web_add_main_button", 3960367664u, 0, 19, &be_const_str_import); be_define_const_str(web_add_management_button, "web_add_management_button", 2738877186u, 0, 25, NULL); be_define_const_str(web_send, "web_send", 2989941448u, 0, 8, NULL); -be_define_const_str(web_send_decimal, "web_send_decimal", 1407210204u, 0, 16, &be_const_str_webserver); -be_define_const_str(web_sensor, "web_sensor", 2900096972u, 0, 10, &be_const_str_var); +be_define_const_str(web_send_decimal, "web_send_decimal", 1407210204u, 0, 16, NULL); +be_define_const_str(web_sensor, "web_sensor", 2900096972u, 0, 10, NULL); be_define_const_str(webclient, "webclient", 4076389146u, 0, 9, NULL); -be_define_const_str(webserver, "webserver", 1572454038u, 0, 9, &be_const_str_widget_ctor_cb); +be_define_const_str(webserver, "webserver", 1572454038u, 0, 9, NULL); be_define_const_str(while, "while", 231090382u, 53, 5, NULL); -be_define_const_str(widget_cb, "widget_cb", 2763583055u, 0, 9, NULL); +be_define_const_str(widget_cb, "widget_cb", 2763583055u, 0, 9, &be_const_str_widget_destructor); be_define_const_str(widget_constructor, "widget_constructor", 2543785934u, 0, 18, NULL); -be_define_const_str(widget_ctor_cb, "widget_ctor_cb", 876007560u, 0, 14, NULL); +be_define_const_str(widget_ctor_cb, "widget_ctor_cb", 876007560u, 0, 14, &be_const_str_wifi); be_define_const_str(widget_ctor_impl, "widget_ctor_impl", 194252479u, 0, 16, NULL); be_define_const_str(widget_destructor, "widget_destructor", 4207388345u, 0, 17, NULL); be_define_const_str(widget_dtor_cb, "widget_dtor_cb", 3151545845u, 0, 14, NULL); -be_define_const_str(widget_dtor_impl, "widget_dtor_impl", 520430610u, 0, 16, NULL); -be_define_const_str(widget_editable, "widget_editable", 3821793286u, 0, 15, &be_const_str_wire2); +be_define_const_str(widget_dtor_impl, "widget_dtor_impl", 520430610u, 0, 16, &be_const_str_wire_scan); +be_define_const_str(widget_editable, "widget_editable", 3821793286u, 0, 15, NULL); be_define_const_str(widget_event, "widget_event", 1951408186u, 0, 12, NULL); be_define_const_str(widget_event_cb, "widget_event_cb", 1508466754u, 0, 15, NULL); be_define_const_str(widget_event_impl, "widget_event_impl", 2178430561u, 0, 17, NULL); @@ -742,27 +751,27 @@ be_define_const_str(widget_group_def, "widget_group_def", 1246968785u, 0, 16, NU be_define_const_str(widget_height_def, "widget_height_def", 3131667813u, 0, 17, NULL); be_define_const_str(widget_instance_size, "widget_instance_size", 2055354779u, 0, 20, NULL); be_define_const_str(widget_struct_by_class, "widget_struct_by_class", 3806373842u, 0, 22, NULL); -be_define_const_str(widget_struct_default, "widget_struct_default", 781673633u, 0, 21, NULL); +be_define_const_str(widget_struct_default, "widget_struct_default", 781673633u, 0, 21, &be_const_str_width); be_define_const_str(widget_width_def, "widget_width_def", 3986078862u, 0, 16, NULL); be_define_const_str(width, "width", 2508680735u, 0, 5, NULL); be_define_const_str(width_def, "width_def", 1143717879u, 0, 9, NULL); -be_define_const_str(wifi, "wifi", 120087624u, 0, 4, NULL); +be_define_const_str(wifi, "wifi", 120087624u, 0, 4, &be_const_str_nil); be_define_const_str(wifi_arcs, "wifi_arcs", 3838492904u, 0, 9, NULL); be_define_const_str(wifi_arcs_icon, "wifi_arcs_icon", 767180544u, 0, 14, NULL); be_define_const_str(wifi_bars, "wifi_bars", 653141243u, 0, 9, NULL); be_define_const_str(wifi_bars_icon, "wifi_bars_icon", 3641522557u, 0, 14, NULL); -be_define_const_str(wire, "wire", 4082753944u, 0, 4, NULL); +be_define_const_str(wire, "wire", 4082753944u, 0, 4, &be_const_str_write_bit); be_define_const_str(wire1, "wire1", 3212721419u, 0, 5, NULL); -be_define_const_str(wire2, "wire2", 3229499038u, 0, 5, &be_const_str_try); +be_define_const_str(wire2, "wire2", 3229499038u, 0, 5, NULL); be_define_const_str(wire_scan, "wire_scan", 2671275880u, 0, 9, NULL); be_define_const_str(write, "write", 3190202204u, 0, 5, NULL); be_define_const_str(write8, "write8", 3133991532u, 0, 6, NULL); be_define_const_str(write_bit, "write_bit", 2660990436u, 0, 9, NULL); be_define_const_str(write_bytes, "write_bytes", 1227543792u, 0, 11, NULL); -be_define_const_str(write_file, "write_file", 3177658879u, 0, 10, NULL); +be_define_const_str(write_file, "write_file", 3177658879u, 0, 10, &be_const_str_zero); be_define_const_str(write_gpio, "write_gpio", 2267940334u, 0, 10, NULL); be_define_const_str(x, "x", 4245442695u, 0, 1, NULL); -be_define_const_str(x1, "x1", 274927234u, 0, 2, NULL); +be_define_const_str(x1, "x1", 274927234u, 0, 2, &be_const_str__X7B); be_define_const_str(y, "y", 4228665076u, 0, 1, NULL); be_define_const_str(y1, "y1", 2355101727u, 0, 2, NULL); be_define_const_str(year, "year", 2927578396u, 0, 4, NULL); @@ -779,388 +788,392 @@ be_define_const_str(_X7B_X7D, "{}", 1415952421u, 0, 2, NULL); be_define_const_str(_X7D, "}", 4161554600u, 0, 1, NULL); static const bstring* const m_string_table[] = { - (const bstring *)&be_const_str_files, - (const bstring *)&be_const_str_clock_icon, - NULL, - NULL, - (const bstring *)&be_const_str_cb_do_nothing, - (const bstring *)&be_const_str_content_start, - (const bstring *)&be_const_str__persist_X2Ejson, - NULL, - (const bstring *)&be_const_str_button_pressed, - (const bstring *)&be_const_str_deregister_obj, - (const bstring *)&be_const_str_rad, - (const bstring *)&be_const_str_gamma10, - (const bstring *)&be_const_str__X25s_X2Eautoconf, - (const bstring *)&be_const_str__X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, - (const bstring *)&be_const_str_OneWire, - (const bstring *)&be_const_str_cmd, - NULL, - (const bstring *)&be_const_str_gc, - (const bstring *)&be_const_str_pin_used, - NULL, - NULL, - (const bstring *)&be_const_str_page_autoconf_mgr, - (const bstring *)&be_const_str_height_def, - (const bstring *)&be_const_str_alternate, - (const bstring *)&be_const_str_publish_result, - (const bstring *)&be_const_str_Auto_X2Dconfiguration, - (const bstring *)&be_const_str__X2Etapp, - (const bstring *)&be_const_str__ccmd, - (const bstring *)&be_const_str__X2B, - (const bstring *)&be_const_str__X3A, (const bstring *)&be_const_str_delete_all_configs, - NULL, - (const bstring *)&be_const_str_get_light, - (const bstring *)&be_const_str_collect, - (const bstring *)&be_const_str_STATE_DEFAULT, - (const bstring *)&be_const_str__filename, - (const bstring *)&be_const_str_pc_rel, - (const bstring *)&be_const_str_traceback, - (const bstring *)&be_const_str_lv_clock_icon, - (const bstring *)&be_const_str_SERIAL_6N1, - (const bstring *)&be_const_str_cmd_res, - (const bstring *)&be_const_str_LVG_X3A_X20call_X20to_X20unsupported_X20callback, - (const bstring *)&be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dzip_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, - (const bstring *)&be_const_str_add_rule, - (const bstring *)&be_const_str__buffer, - (const bstring *)&be_const_str_web_add_config_button, - (const bstring *)&be_const_str__X2Elen, - NULL, - (const bstring *)&be_const_str_wifi, - (const bstring *)&be_const_str__X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E, - (const bstring *)&be_const_str__X2F, - (const bstring *)&be_const_str__X3E, - (const bstring *)&be_const_str__X2Fac, - (const bstring *)&be_const_str_month, - (const bstring *)&be_const_str_asin, - NULL, - (const bstring *)&be_const_str_hex, - NULL, - (const bstring *)&be_const_str_CFG_X3A_X20ran_X20_X20, - (const bstring *)&be_const_str_try_rule, - (const bstring *)&be_const_str_obj_class_create_obj, - (const bstring *)&be_const_str_arg_name, - (const bstring *)&be_const_str_Unknown_X20command, - (const bstring *)&be_const_str__X3D_X3C_X3E_X21, - (const bstring *)&be_const_str__X5D, - (const bstring *)&be_const_str__X2F_X3Frst_X3D, - (const bstring *)&be_const_str__X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E, - (const bstring *)&be_const_str_byte, - (const bstring *)&be_const_str_clear, - NULL, - (const bstring *)&be_const_str_SERIAL_6O1, - NULL, - (const bstring *)&be_const_str__X23, - (const bstring *)&be_const_str_create_matrix, - (const bstring *)&be_const_str_AES_GCM, - NULL, - (const bstring *)&be_const_str_find_op, - (const bstring *)&be_const_str__X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E, - (const bstring *)&be_const_str__X2Eautoconf, - (const bstring *)&be_const_str_, - (const bstring *)&be_const_str_event_send, - (const bstring *)&be_const_str_SERIAL_8E2, - (const bstring *)&be_const_str_while, - (const bstring *)&be_const_str_getbits, - (const bstring *)&be_const_str_classof, - NULL, - (const bstring *)&be_const_str_Timer, - (const bstring *)&be_const_str__X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E, - NULL, - (const bstring *)&be_const_str_Restart_X201, - (const bstring *)&be_const_str_number, - (const bstring *)&be_const_str__X2Ep, - (const bstring *)&be_const_str_addr, - (const bstring *)&be_const_str_atan2, - (const bstring *)&be_const_str_Tasmota, - NULL, - NULL, - (const bstring *)&be_const_str__lvgl, - (const bstring *)&be_const_str_CFG_X3A_X20loaded_X20_X27_X25s_X27, - (const bstring *)&be_const_str_CFG_X3A_X20removed_X20file_X20_X27_X25s_X27, - (const bstring *)&be_const_str_color, - NULL, - (const bstring *)&be_const_str_draw_line_dsc_init, - (const bstring *)&be_const_str__global_addr, - NULL, - (const bstring *)&be_const_str_MD5, - (const bstring *)&be_const_str_finish, - (const bstring *)&be_const_str___upper__, - (const bstring *)&be_const_str_destructor_cb, - (const bstring *)&be_const_str_get_bat_power, - (const bstring *)&be_const_str___lower__, - (const bstring *)&be_const_str_add_handler, - (const bstring *)&be_const_str__X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, - (const bstring *)&be_const_str_day, - (const bstring *)&be_const_str_log10, - (const bstring *)&be_const_str_compress, - (const bstring *)&be_const_str_AXP192, - (const bstring *)&be_const_str___iterator__, - NULL, - NULL, - (const bstring *)&be_const_str_toupper, - (const bstring *)&be_const_str_display_X2Eini, - (const bstring *)&be_const_str__X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E, - (const bstring *)&be_const_str_CFG_X3A_X20loading_X20_X27_X25s_X27, - (const bstring *)&be_const_str_PART_MAIN, - NULL, - (const bstring *)&be_const_str_instance_size, - (const bstring *)&be_const_str_Tele, - (const bstring *)&be_const_str_SERIAL_8N2, - (const bstring *)&be_const_str_every_second, - (const bstring *)&be_const_str_is_dirty, - (const bstring *)&be_const_str_energy_struct, - (const bstring *)&be_const_str_k, - (const bstring *)&be_const_str_value_error, - (const bstring *)&be_const_str_code, - NULL, - (const bstring *)&be_const_str_allocated, - (const bstring *)&be_const_str_offseta, - NULL, (const bstring *)&be_const_str__X2E, - (const bstring *)&be_const_str_Parameter_X20error, - (const bstring *)&be_const_str__X2E_X2E, - (const bstring *)&be_const_str_debug, - (const bstring *)&be_const_str__X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29, - (const bstring *)&be_const_str_toptr, - (const bstring *)&be_const_str_add_cmd, - (const bstring *)&be_const_str_pin_mode, - (const bstring *)&be_const_str_concat, - (const bstring *)&be_const_str__X2Ebe, + (const bstring *)&be_const_str_get_current_module_path, NULL, - (const bstring *)&be_const_str_SERIAL_6N2, - (const bstring *)&be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, - NULL, - (const bstring *)&be_const_str_atan, - (const bstring *)&be_const_str_area, - (const bstring *)&be_const_str_I2C_X3A, - (const bstring *)&be_const_str_gamma8, - (const bstring *)&be_const_str_BRY_X3A_X20could_X20not_X20save_X20compiled_X20file_X20_X25s_X20_X28_X25s_X29, - (const bstring *)&be_const_str__X2Ew, - (const bstring *)&be_const_str_get_option, - NULL, - (const bstring *)&be_const_str_dump, - (const bstring *)&be_const_str__X3D, - (const bstring *)&be_const_str__def, - (const bstring *)&be_const_str_CFG_X3A_X20could_X20not_X20run_X20_X25s_X20_X28_X25s_X20_X2D_X20_X25s_X29, - (const bstring *)&be_const_str_resolvecmnd, - (const bstring *)&be_const_str_ip, - (const bstring *)&be_const_str_duration, - (const bstring *)&be_const_str_EVENT_DRAW_PART_END, - (const bstring *)&be_const_str_real, - (const bstring *)&be_const_str_elements_X20must_X20be_X20a_X20lv_point, - (const bstring *)&be_const_str__X2502d_X25s_X2502d, - (const bstring *)&be_const_str__X3Clambda_X3E, - (const bstring *)&be_const_str_onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20change_X20the_X20current_X20configuration_X20and_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E, - (const bstring *)&be_const_str_CFG_X3A_X20loaded_X20_X20, - (const bstring *)&be_const_str_SERIAL_5E1, - (const bstring *)&be_const_str_c, - (const bstring *)&be_const_str_CFG_X3A_X20exception_X20_X27_X25s_X27_X20_X2D_X20_X27_X25s_X27, - (const bstring *)&be_const_str_bytes, - NULL, - (const bstring *)&be_const_str_read12, - (const bstring *)&be_const_str_get_bri, - (const bstring *)&be_const_str_AudioOutput, - (const bstring *)&be_const_str_arg, - (const bstring *)&be_const_str_add_header, - (const bstring *)&be_const_str_out_X20of_X20range, - (const bstring *)&be_const_str_set_auth, - (const bstring *)&be_const_str_file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27, - (const bstring *)&be_const_str__archive, - (const bstring *)&be_const_str__X23init_X2Ebat, - (const bstring *)&be_const_str_create_custom_widget, - (const bstring *)&be_const_str_get_size, - (const bstring *)&be_const_str_EVENT_DRAW_MAIN, - (const bstring *)&be_const_str__X23autoexec_X2Ebe, - NULL, - (const bstring *)&be_const_str_json, - (const bstring *)&be_const_str_widget_event, - (const bstring *)&be_const_str_SERIAL_7E1, - (const bstring *)&be_const_str__cmd, - (const bstring *)&be_const_str_SERIAL_5O1, - NULL, - (const bstring *)&be_const_str_bool, - (const bstring *)&be_const_str_contains, - NULL, - (const bstring *)&be_const_str_BRY_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s, - (const bstring *)&be_const_str_Leds, - (const bstring *)&be_const_str_escape, - (const bstring *)&be_const_str_tolower, - (const bstring *)&be_const_str_instance, - (const bstring *)&be_const_str_remote_ip, - (const bstring *)&be_const_str__X3Clabel_X3EChoose_X20a_X20device_X20configuration_X3A_X3C_X2Flabel_X3E_X3Cbr_X3E, - (const bstring *)&be_const_str_content_send_style, - NULL, - (const bstring *)&be_const_str_pixel_size, - (const bstring *)&be_const_str_CFG_X3A_X20running_X20, - (const bstring *)&be_const_str_obj_event_base, - NULL, - (const bstring *)&be_const_str_create_segment, - (const bstring *)&be_const_str_get_style_line_color, - (const bstring *)&be_const_str_arch, - (const bstring *)&be_const_str__X5B, - (const bstring *)&be_const_str__X3D_X3D, - (const bstring *)&be_const_str_dac_voltage, - NULL, - (const bstring *)&be_const_str_format, - NULL, - (const bstring *)&be_const_str__X3Cselect_X20name_X3D_X27zip_X27_X3E, - (const bstring *)&be_const_str_CFG_X3A_X20no_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found, - (const bstring *)&be_const_str_encrypt, - (const bstring *)&be_const_str_round_end, - (const bstring *)&be_const_str_available, - (const bstring *)&be_const_str_get_warning_level, - (const bstring *)&be_const_str_atleast1, - (const bstring *)&be_const_str_engine, - (const bstring *)&be_const_str_CFG_X3A_X20removing_X20autoconf_X20files, - NULL, - (const bstring *)&be_const_str__X28_X29, - (const bstring *)&be_const_str_set_power, - (const bstring *)&be_const_str_AudioGeneratorMP3, - NULL, - (const bstring *)&be_const_str_set_x, - (const bstring *)&be_const_str__rules, - (const bstring *)&be_const_str__, - (const bstring *)&be_const_str_acos, - (const bstring *)&be_const_str__X2Esize, + (const bstring *)&be_const_str_get_percentage, + (const bstring *)&be_const_str_pixel_count, + (const bstring *)&be_const_str_CFG_X3A_X20skipping_X20_X27display_X2Eini_X27_X20because_X20already_X20present_X20in_X20file_X2Dsystem, + (const bstring *)&be_const_str_argument_X20must_X20be_X20a_X20list, + (const bstring *)&be_const_str_SERIAL_7O2, (const bstring *)&be_const_str_SERIAL_7N2, - (const bstring *)&be_const_str_get_bat_voltage, - (const bstring *)&be_const_str_send, - (const bstring *)&be_const_str__X21_X3D_X3D, - (const bstring *)&be_const_str__X2F_X2Eautoconf, - (const bstring *)&be_const_str_TAP_X3A_X20found_X20Tasmota_X20App_X20_X27_X25s_X27, - (const bstring *)&be_const_str__X3C, - (const bstring *)&be_const_str__X3C_X3D, - (const bstring *)&be_const_str_abs, - (const bstring *)&be_const_str_I2C_Driver, - (const bstring *)&be_const_str_get_bat_current, - (const bstring *)&be_const_str_imax, - (const bstring *)&be_const_str_last_modified, - (const bstring *)&be_const_str__X3Cp_X3E_X3Csmall_X3E_X26nbsp_X3B_X28This_X20feature_X20requires_X20an_X20internet_X20connection_X29_X3C_X2Fsmall_X3E_X3C_X2Fp_X3E, - (const bstring *)&be_const_str_call, - (const bstring *)&be_const_str__X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E, - (const bstring *)&be_const_str_Animate_X20pc_X20is_X20out_X20of_X20range, - (const bstring *)&be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, - (const bstring *)&be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, - (const bstring *)&be_const_str_SERIAL_5E2, - (const bstring *)&be_const_str__X2Ep2, - (const bstring *)&be_const_str_Wire, - NULL, - (const bstring *)&be_const_str__X26lt_X3BNone_X26gt_X3B, - (const bstring *)&be_const_str_begin_multicast, - (const bstring *)&be_const_str_gpio, - (const bstring *)&be_const_str_setmember, - (const bstring *)&be_const_str_listdir, - NULL, - (const bstring *)&be_const_str_class_init_obj, - (const bstring *)&be_const_str_deg, - (const bstring *)&be_const_str_id, - (const bstring *)&be_const_str_load_templates, - (const bstring *)&be_const_str_get_alternate, - (const bstring *)&be_const_str_signal_arcs, - (const bstring *)&be_const_str_False, - (const bstring *)&be_const_str_SERIAL_8O2, - (const bstring *)&be_const_str_lv_, - (const bstring *)&be_const_str_None, - (const bstring *)&be_const_str_run_deferred, - (const bstring *)&be_const_str_CFG_X3A_X20downloading_X20_X27_X25s_X27, - (const bstring *)&be_const_str_WS2812, - (const bstring *)&be_const_str__X23autoexec_X2Ebat, - (const bstring *)&be_const_str_BUTTON_CONFIGURATION, - (const bstring *)&be_const_str__write, - NULL, - (const bstring *)&be_const_str_point_arr, - (const bstring *)&be_const_str_AudioOutputI2S, - (const bstring *)&be_const_str__X0A, - (const bstring *)&be_const_str_HTTP_POST, - (const bstring *)&be_const_str_SERIAL_5N2, - (const bstring *)&be_const_str__X23display_X2Eini, - (const bstring *)&be_const_str_file, - (const bstring *)&be_const_str_closure, - (const bstring *)&be_const_str_GET, - NULL, - (const bstring *)&be_const_str_content_send, - (const bstring *)&be_const_str__X3E_X3D, - (const bstring *)&be_const_str_SERIAL_7O1, - (const bstring *)&be_const_str__X23preinit_X2Ebe, - (const bstring *)&be_const_str_stop_iteration, - (const bstring *)&be_const_str_CFG_X3A_X20return_code_X3D_X25i, - (const bstring *)&be_const_str_dirty, - (const bstring *)&be_const_str_COLOR_BLACK, - (const bstring *)&be_const_str_remove, - (const bstring *)&be_const_str_SERIAL_5O2, - (const bstring *)&be_const_str_time_reached, - (const bstring *)&be_const_str_back_forth, - (const bstring *)&be_const_str_CFG_X3A_X20removing_X20first_X20time_X20marker, - (const bstring *)&be_const_str__p, - (const bstring *)&be_const_str__X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B, - NULL, - (const bstring *)&be_const_str_push, - (const bstring *)&be_const_str__X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, - NULL, - (const bstring *)&be_const_str_del, - (const bstring *)&be_const_str__X2Ebec, - (const bstring *)&be_const_str_WS2812_GRB, - NULL, - (const bstring *)&be_const_str_no_X20GPIO_X20specified_X20for_X20neopixelbus, - (const bstring *)&be_const_str_autoexec, - (const bstring *)&be_const_str_set_light, - (const bstring *)&be_const_str_resp_cmnd_done, - (const bstring *)&be_const_str_decompress, - (const bstring *)&be_const_str_set_y, - (const bstring *)&be_const_str_persist_X2E_p_X20is_X20not_X20a_X20map, - (const bstring *)&be_const_str__X7B_X7D, - (const bstring *)&be_const_str_null_cb, - (const bstring *)&be_const_str_CFG_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s, - (const bstring *)&be_const_str_SERIAL_7N1, - (const bstring *)&be_const_str_ctypes_bytes, - (const bstring *)&be_const_str_RES_OK, - (const bstring *)&be_const_str_SERIAL_6O2, - (const bstring *)&be_const_str_EVENT_DRAW_PART_BEGIN, - (const bstring *)&be_const_str__X2C, + (const bstring *)&be_const_str_instance_size, + (const bstring *)&be_const_str_SERIAL_5E1, (const bstring *)&be_const_str__X3F, - (const bstring *)&be_const_str_EC_C25519, - (const bstring *)&be_const_str_asstring, NULL, - (const bstring *)&be_const_str_attrdump, - (const bstring *)&be_const_str_close, + (const bstring *)&be_const_str__X2Fac, NULL, - (const bstring *)&be_const_str__X3C_X2Fform_X3E_X3C_X2Fp_X3E, - (const bstring *)&be_const_str_value, - (const bstring *)&be_const_str_lv_module_init, - (const bstring *)&be_const_str_pi, - (const bstring *)&be_const_str_CFG_X3A_X20_X27init_X2Ebat_X27_X20done_X2C_X20restarting, - (const bstring *)&be_const_str_set_timeouts, + NULL, + (const bstring *)&be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_X2F_X25s_X2Eautoconf, + (const bstring *)&be_const_str__X23display_X2Eini, + (const bstring *)&be_const_str__X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_X26deg_X3BC_X7Be_X7D, + (const bstring *)&be_const_str_every_50ms, + (const bstring *)&be_const_str_SERIAL_8E2, + (const bstring *)&be_const_str_allocated, + (const bstring *)&be_const_str_issubclass, + (const bstring *)&be_const_str_lv_point_arr, + (const bstring *)&be_const_str__X2C, + (const bstring *)&be_const_str_Parameter_X20error, + (const bstring *)&be_const_str_add_handler, + (const bstring *)&be_const_str_compile, + (const bstring *)&be_const_str_lv_obj, + (const bstring *)&be_const_str_wd, + (const bstring *)&be_const_str__X3D_X3C_X3E_X21, + (const bstring *)&be_const_str__X3Clabel_X3EChoose_X20a_X20device_X20configuration_X3A_X3C_X2Flabel_X3E_X3Cbr_X3E, + (const bstring *)&be_const_str__X2Ep, + (const bstring *)&be_const_str_SERIAL_7E2, + (const bstring *)&be_const_str_CFG_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s, + (const bstring *)&be_const_str__X3D, + (const bstring *)&be_const_str_set_ldo_enable, + (const bstring *)&be_const_str__X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E, + (const bstring *)&be_const_str_get_bat_power, + (const bstring *)&be_const_str_get_vbus_current, + (const bstring *)&be_const_str_remove, + (const bstring *)&be_const_str_resp_cmnd_failed, + (const bstring *)&be_const_str_file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27, + (const bstring *)&be_const_str_TAP_X3A_X20found_X20Tasmota_X20App_X20_X27_X25s_X27, + (const bstring *)&be_const_str_Leds, + NULL, + (const bstring *)&be_const_str_CFG_X3A_X20exception_X20_X27_X25s_X27_X20_X2D_X20_X27_X25s_X27, + NULL, + (const bstring *)&be_const_str_hs2rgb, + (const bstring *)&be_const_str_is_dirty, + (const bstring *)&be_const_str__X2E_X2E, + (const bstring *)&be_const_str_lv_signal_arcs, + (const bstring *)&be_const_str_last_modified, + (const bstring *)&be_const_str_AudioGeneratorMP3, + (const bstring *)&be_const_str__def, + (const bstring *)&be_const_str_EVENT_DRAW_PART_END, (const bstring *)&be_const_str_BRY_X3A_X20failed_X20to_X20load_X20_persist_X2Ejson, - (const bstring *)&be_const_str__X2Ep1, - (const bstring *)&be_const_str_zero, - (const bstring *)&be_const_str_coord_arr, - (const bstring *)&be_const_str_map, - (const bstring *)&be_const_str_str, + (const bstring *)&be_const_str_draw_arc, NULL, - (const bstring *)&be_const_str_offset, + (const bstring *)&be_const_str_Unknown_X20command, + (const bstring *)&be_const_str_point, + NULL, + (const bstring *)&be_const_str__X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E, + (const bstring *)&be_const_str__X3C_X3D, + (const bstring *)&be_const_str_list_handlers, + NULL, + (const bstring *)&be_const_str__X2F_X3Frst_X3D, + (const bstring *)&be_const_str_RES_OK, + (const bstring *)&be_const_str_Animate_X20pc_X20is_X20out_X20of_X20range, + (const bstring *)&be_const_str_matrix, + (const bstring *)&be_const_str_SERIAL_6E2, + (const bstring *)&be_const_str_null_cb, (const bstring *)&be_const_str__X20, - (const bstring *)&be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, - (const bstring *)&be_const_str_get_vbus_voltage, - (const bstring *)&be_const_str__end_transmission, + (const bstring *)&be_const_str_web_add_handler, + (const bstring *)&be_const_str_CFG_X3A_X20downloading_X20_X27_X25s_X27, + NULL, + (const bstring *)&be_const_str___iterator__, + (const bstring *)&be_const_str__read, + (const bstring *)&be_const_str_Restart_X201, + (const bstring *)&be_const_str_set_dcdc_enable, + (const bstring *)&be_const_str__X3C_X2Fform_X3E_X3C_X2Fp_X3E, + (const bstring *)&be_const_str__t, + (const bstring *)&be_const_str_time_reached, + (const bstring *)&be_const_str_encrypt, + (const bstring *)&be_const_str_alternate, + (const bstring *)&be_const_str_json_append, + (const bstring *)&be_const_str__X3D_X3D, + NULL, + (const bstring *)&be_const_str__X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, + (const bstring *)&be_const_str_I2C_Driver, + (const bstring *)&be_const_str_energy_struct, + (const bstring *)&be_const_str_codedump, + (const bstring *)&be_const_str_lv_module_init, + (const bstring *)&be_const_str_group_def, + NULL, + (const bstring *)&be_const_str_SERIAL_8N2, + (const bstring *)&be_const_str_exec_cmd, + (const bstring *)&be_const_str_finish, + NULL, + NULL, + (const bstring *)&be_const_str_arg_size, + (const bstring *)&be_const_str_COLOR_WHITE, + (const bstring *)&be_const_str_json, + (const bstring *)&be_const_str_AudioOutputI2S, + (const bstring *)&be_const_str_from_to, + (const bstring *)&be_const_str_lower, + (const bstring *)&be_const_str__filename, + (const bstring *)&be_const_str_geti, + (const bstring *)&be_const_str__X23autoexec_X2Ebat, + (const bstring *)&be_const_str_exec_rules, + (const bstring *)&be_const_str_raise, + (const bstring *)&be_const_str_STATE_DEFAULT, + (const bstring *)&be_const_str_None, + (const bstring *)&be_const_str__X3Cselect_X20name_X3D_X27zip_X27_X3E, + (const bstring *)&be_const_str_exists, + (const bstring *)&be_const_str_couldn_X27t_X20not_X20initialize_X20noepixelbus, + (const bstring *)&be_const_str_load, + (const bstring *)&be_const_str_isrunning, + (const bstring *)&be_const_str_resize, + (const bstring *)&be_const_str_SERIAL_6O1, + (const bstring *)&be_const_str_bus, + (const bstring *)&be_const_str_OneWire, + (const bstring *)&be_const_str__X2502d_X25s_X2502d, + (const bstring *)&be_const_str__X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E, + NULL, + (const bstring *)&be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dzip_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, + (const bstring *)&be_const_str_ins_goto, + (const bstring *)&be_const_str_bytes, + (const bstring *)&be_const_str_day, + (const bstring *)&be_const_str_reapply, + (const bstring *)&be_const_str_keys, + (const bstring *)&be_const_str_Wire, + (const bstring *)&be_const_str_SERIAL_8O2, + (const bstring *)&be_const_str_rad, + (const bstring *)&be_const_str_consume_mono, + (const bstring *)&be_const_str_deinit, + (const bstring *)&be_const_str__X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d, + (const bstring *)&be_const_str_CFG_X3A_X20return_code_X3D_X25i, (const bstring *)&be_const_str_BRY_X3A_X20ERROR_X2C_X20bad_X20json_X3A_X20, - (const bstring *)&be_const_str_clear_to, + NULL, + (const bstring *)&be_const_str_decode, + (const bstring *)&be_const_str__X2Ep1, + (const bstring *)&be_const_str__X3A, + (const bstring *)&be_const_str__begin_transmission, (const bstring *)&be_const_str_CFG_X3A_X20multiple_X20autoconf_X20files_X20found_X2C_X20aborting_X20_X28_X27_X25s_X27_X20_X2B_X20_X27_X25s_X27_X29, NULL, - (const bstring *)&be_const_str__X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d, - (const bstring *)&be_const_str_SERIAL_8O1, - (const bstring *)&be_const_str_AudioFileSourceFS, + (const bstring *)&be_const_str_flush, + NULL, + (const bstring *)&be_const_str_obj_event_base, + (const bstring *)&be_const_str_widget_event, + NULL, + NULL, + (const bstring *)&be_const_str_set_timer, + (const bstring *)&be_const_str_to_gamma, + NULL, + (const bstring *)&be_const_str__X2B, + (const bstring *)&be_const_str__X2Ebec, + (const bstring *)&be_const_str_resp_cmnd, + (const bstring *)&be_const_str_lv, + (const bstring *)&be_const_str_closure, + (const bstring *)&be_const_str_as, + (const bstring *)&be_const_str_instance, + NULL, + (const bstring *)&be_const_str__X2Ew, + NULL, + (const bstring *)&be_const_str__X2Elen, + (const bstring *)&be_const_str_dump, + (const bstring *)&be_const_str__ptr, + (const bstring *)&be_const_str_rule, + (const bstring *)&be_const_str_CFG_X3A_X20loaded_X20_X27_X25s_X27, + (const bstring *)&be_const_str_concat, + (const bstring *)&be_const_str_SERIAL_5O2, + (const bstring *)&be_const_str_constructor_cb, + (const bstring *)&be_const_str_code, + (const bstring *)&be_const_str_cmd, + (const bstring *)&be_const_str_OPTION_A, + (const bstring *)&be_const_str_lv_coord_arr, + (const bstring *)&be_const_str_class_init_obj, + (const bstring *)&be_const_str__debug_present, + (const bstring *)&be_const_str_toupper, + NULL, + (const bstring *)&be_const_str_count, + (const bstring *)&be_const_str_pixels_buffer, + (const bstring *)&be_const_str_set_pixel_color, + (const bstring *)&be_const_str_close, + (const bstring *)&be_const_str__X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, + (const bstring *)&be_const_str___upper__, + (const bstring *)&be_const_str__X3Clambda_X3E, + (const bstring *)&be_const_str_SERIAL_7E1, + (const bstring *)&be_const_str_SERIAL_5E2, + (const bstring *)&be_const_str__X3E, + (const bstring *)&be_const_str_cb_obj, + NULL, (const bstring *)&be_const_str_AudioGenerator, - (const bstring *)&be_const_str__X21_X3D, - (const bstring *)&be_const_str_decrypt, - (const bstring *)&be_const_str_pc_abs, + (const bstring *)&be_const_str_CFG_X3A_X20removing_X20first_X20time_X20marker, + (const bstring *)&be_const_str_detect, + (const bstring *)&be_const_str_get_input_power_status, + (const bstring *)&be_const_str__X3E_X3D, + (const bstring *)&be_const_str_lv_wifi_arcs, + NULL, + NULL, + (const bstring *)&be_const_str_number, + (const bstring *)&be_const_str_GET, + (const bstring *)&be_const_str__X2F, + (const bstring *)&be_const_str__X2D_X2D_X3A_X2D_X2D, + (const bstring *)&be_const_str_calldepth, + (const bstring *)&be_const_str_CFG_X3A_X20_X27init_X2Ebat_X27_X20done_X2C_X20restarting, + NULL, + (const bstring *)&be_const_str_round_end, + (const bstring *)&be_const_str_montserrat_font, + (const bstring *)&be_const_str_SERIAL_7O1, + (const bstring *)&be_const_str_c, + (const bstring *)&be_const_str_true, + (const bstring *)&be_const_str__X2Eautoconf, + (const bstring *)&be_const_str__X3C, + (const bstring *)&be_const_str__X26lt_X3BNone_X26gt_X3B, + (const bstring *)&be_const_str_iter, + (const bstring *)&be_const_str_CFG_X3A_X20could_X20not_X20run_X20_X25s_X20_X28_X25s_X20_X2D_X20_X25s_X29, + (const bstring *)&be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_manifest_X2Ejson, + (const bstring *)&be_const_str__class, + (const bstring *)&be_const_str__lvgl, + (const bstring *)&be_const_str__end_transmission, + (const bstring *)&be_const_str_draw_line_dsc, + (const bstring *)&be_const_str__X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, + (const bstring *)&be_const_str_tasmota_X2Eget_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eget_X28_X29, + (const bstring *)&be_const_str_init_draw_line_dsc, + NULL, + (const bstring *)&be_const_str_get_bat_charge_current, + (const bstring *)&be_const_str_i2c_enabled, + NULL, + (const bstring *)&be_const_str_EC_C25519, + (const bstring *)&be_const_str_p1, + (const bstring *)&be_const_str_exec_tele, + (const bstring *)&be_const_str_False, + (const bstring *)&be_const_str_deg, (const bstring *)&be_const_str_a, - (const bstring *)&be_const_str_add_driver + (const bstring *)&be_const_str_I2C_X3A, + (const bstring *)&be_const_str_elements_X20must_X20be_X20a_X20lv_point, + (const bstring *)&be_const_str_arg_X20must_X20be_X20a_X20subclass_X20of_X20lv_obj, + (const bstring *)&be_const_str_top, + (const bstring *)&be_const_str__drivers, + (const bstring *)&be_const_str_remove_rule, + NULL, + (const bstring *)&be_const_str_WS2812_GRB, + (const bstring *)&be_const_str_tr, + (const bstring *)&be_const_str__X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E, + (const bstring *)&be_const_str_bool, + (const bstring *)&be_const_str_SERIAL_8E1, + (const bstring *)&be_const_str_AudioFileSourceFS, + (const bstring *)&be_const_str__X3Cp_X3E_X3Csmall_X3E_X26nbsp_X3B_X28This_X20feature_X20requires_X20an_X20internet_X20connection_X29_X3C_X2Fsmall_X3E_X3C_X2Fp_X3E, + (const bstring *)&be_const_str_duration, + (const bstring *)&be_const_str__X23, + (const bstring *)&be_const_str__X2F_X2Eautoconf, + NULL, + (const bstring *)&be_const_str_split, + (const bstring *)&be_const_str_clear_to, + (const bstring *)&be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, + (const bstring *)&be_const_str_draw_line_dsc_init, + NULL, + (const bstring *)&be_const_str_lvgl_event_dispatch, + (const bstring *)&be_const_str_set_gain, + (const bstring *)&be_const_str__X2Ebe, + (const bstring *)&be_const_str_deregister_obj, + (const bstring *)&be_const_str_EVENT_DRAW_MAIN, + (const bstring *)&be_const_str_CFG_X3A_X20loading_X20_X27_X25s_X27, + (const bstring *)&be_const_str_running, + (const bstring *)&be_const_str__X21_X3D, + (const bstring *)&be_const_str__X28_X29, + (const bstring *)&be_const_str_get_option, + (const bstring *)&be_const_str_button_pressed, + (const bstring *)&be_const_str_set_power, + NULL, + (const bstring *)&be_const_str_can_show, + (const bstring *)&be_const_str__X25s_X2Eautoconf, + (const bstring *)&be_const_str_SERIAL_6O2, + (const bstring *)&be_const_str_color, + (const bstring *)&be_const_str__settings_def, + NULL, + (const bstring *)&be_const_str_clear_first_time, + (const bstring *)&be_const_str_ins_ramp, + (const bstring *)&be_const_str_Auto_X2Dconfiguration, + (const bstring *)&be_const_str_CFG_X3A_X20running_X20, + (const bstring *)&be_const_str_get_style_bg_color, + (const bstring *)&be_const_str_consume_stereo, + (const bstring *)&be_const_str_Tele, + (const bstring *)&be_const_str_print, + NULL, + (const bstring *)&be_const_str_animate, + (const bstring *)&be_const_str_event, + (const bstring *)&be_const_str_io_error, + (const bstring *)&be_const_str_BRY_X3A_X20could_X20not_X20save_X20compiled_X20file_X20_X25s_X20_X28_X25s_X29, + (const bstring *)&be_const_str_imin, + (const bstring *)&be_const_str_arg, + (const bstring *)&be_const_str_Tasmota, + (const bstring *)&be_const_str_, + (const bstring *)&be_const_str_size, + (const bstring *)&be_const_str__X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E, + (const bstring *)&be_const_str_Timer, + (const bstring *)&be_const_str_SERIAL_8N1, + (const bstring *)&be_const_str_read12, + (const bstring *)&be_const_str_upper, + (const bstring *)&be_const_str__X2Esize, + (const bstring *)&be_const_str_ctor, + (const bstring *)&be_const_str_widget_dtor_impl, + (const bstring *)&be_const_str_read8, + (const bstring *)&be_const_str_SERIAL_5N1, + (const bstring *)&be_const_str__global_def, + (const bstring *)&be_const_str__X5B, + (const bstring *)&be_const_str_base_class, + (const bstring *)&be_const_str_EVENT_DRAW_PART_BEGIN, + (const bstring *)&be_const_str_CFG_X3A_X20no_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found, + (const bstring *)&be_const_str__X23preinit_X2Ebe, + (const bstring *)&be_const_str_create_segment, + (const bstring *)&be_const_str_AXP192, + NULL, + (const bstring *)&be_const_str__X21_X3D_X3D, + (const bstring *)&be_const_str_loop, + (const bstring *)&be_const_str_del, + (const bstring *)&be_const_str_add_cmd, + (const bstring *)&be_const_str_insert, + (const bstring *)&be_const_str__ccmd, + (const bstring *)&be_const_str__error, + (const bstring *)&be_const_str__X23init_X2Ebat, + (const bstring *)&be_const_str_HTTP_GET, + NULL, + (const bstring *)&be_const_str_reverse_gamma10, + (const bstring *)&be_const_str_SERIAL_5O1, + (const bstring *)&be_const_str_classname, + (const bstring *)&be_const_str_set_bits_per_sample, + (const bstring *)&be_const_str_y, + (const bstring *)&be_const_str_compress, + (const bstring *)&be_const_str_invalidate, + (const bstring *)&be_const_str_atan2, + (const bstring *)&be_const_str_CFG_X3A_X20removing_X20autoconf_X20files, + (const bstring *)&be_const_str_consume_silence, + (const bstring *)&be_const_str_addr, + (const bstring *)&be_const_str__X0A, + (const bstring *)&be_const_str_eth, + (const bstring *)&be_const_str_list, + (const bstring *)&be_const_str_AES_GCM, + (const bstring *)&be_const_str_erase, + (const bstring *)&be_const_str_AudioFileSource, + (const bstring *)&be_const_str_minute, + (const bstring *)&be_const_str__timers, + (const bstring *)&be_const_str__X2Ep2, + (const bstring *)&be_const_str_bri, + (const bstring *)&be_const_str_autoexec, + (const bstring *)&be_const_str_BUTTON_CONFIGURATION, + (const bstring *)&be_const_str_load_templates, + (const bstring *)&be_const_str_item, + (const bstring *)&be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, + (const bstring *)&be_const_str_rtc, + NULL, + NULL, + (const bstring *)&be_const_str_ins_time, + (const bstring *)&be_const_str_HTTP_POST, + (const bstring *)&be_const_str_font_seg7, + (const bstring *)&be_const_str_json_fdump, + NULL, + (const bstring *)&be_const_str__X2Etapp, + (const bstring *)&be_const_str_display, + NULL, + (const bstring *)&be_const_str__X23autoexec_X2Ebe, + (const bstring *)&be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, + (const bstring *)&be_const_str_member, + (const bstring *)&be_const_str_begin, + (const bstring *)&be_const_str__X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E, + (const bstring *)&be_const_str_wire2, + NULL, + (const bstring *)&be_const_str_SERIAL_6N2, + (const bstring *)&be_const_str_digital_write, + (const bstring *)&be_const_str_set_chg_current, + (const bstring *)&be_const_str_traceback, + (const bstring *)&be_const_str_escape, + (const bstring *)&be_const_str_add_rule, + (const bstring *)&be_const_str__cmd, + NULL, + (const bstring *)&be_const_str_find, + (const bstring *)&be_const_str_offseta, + (const bstring *)&be_const_str__X5D, + NULL }; static const struct bconststrtab m_const_string_table = { - .size = 378, - .count = 779, + .size = 382, + .count = 788, .table = m_string_table }; diff --git a/lib/libesp32/berry/generate/be_fixed_be_class_audio_opus_decoder.h b/lib/libesp32/berry/generate/be_fixed_be_class_audio_opus_decoder.h new file mode 100644 index 000000000..cf6611e28 --- /dev/null +++ b/lib/libesp32/berry/generate/be_fixed_be_class_audio_opus_decoder.h @@ -0,0 +1,20 @@ +#include "be_constobj.h" + +static be_define_const_map_slots(be_class_audio_opus_decoder_map) { + { be_const_key(deinit, -1), be_const_func(be_audio_opus_decoder_deinit) }, + { be_const_key(decode, 2), be_const_func(be_audio_opus_decoder_decode) }, + { be_const_key(_X2Ep, -1), be_const_var(0) }, + { be_const_key(init, 1), be_const_func(be_audio_opus_decoder_init) }, +}; + +static be_define_const_map( + be_class_audio_opus_decoder_map, + 4 +); + +BE_EXPORT_VARIABLE be_define_const_class( + be_class_audio_opus_decoder, + 1, + NULL, + OpusDecoder +); diff --git a/lib/libesp32/berry/generate/be_fixed_be_class_audio_output.h b/lib/libesp32/berry/generate/be_fixed_be_class_audio_output.h index 192ee0677..7cf34b574 100644 --- a/lib/libesp32/berry/generate/be_fixed_be_class_audio_output.h +++ b/lib/libesp32/berry/generate/be_fixed_be_class_audio_output.h @@ -1,12 +1,23 @@ #include "be_constobj.h" static be_define_const_map_slots(be_class_audio_output_map) { + { be_const_key(set_bits_per_sample, -1), be_const_func(be_audio_output_set_bits_per_sample) }, + { be_const_key(flush, -1), be_const_func(be_audio_output_flush) }, + { be_const_key(consume_stereo, -1), be_const_func(be_audio_output_consume_stereo) }, + { be_const_key(init, -1), be_const_func(be_audio_output_init) }, + { be_const_key(consume_mono, -1), be_const_func(be_audio_output_consume_mono) }, + { be_const_key(stop, -1), be_const_func(be_audio_output_stop) }, + { be_const_key(begin, -1), be_const_func(be_audio_output_begin) }, { be_const_key(_X2Ep, -1), be_const_var(0) }, + { be_const_key(set_channels, -1), be_const_func(be_audio_output_set_channels) }, + { be_const_key(consume_silence, 4), be_const_func(be_audio_output_consume_silence) }, + { be_const_key(set_rate, 2), be_const_func(be_audio_output_set_rate) }, + { be_const_key(set_gain, 0), be_const_func(be_audio_output_set_gain) }, }; static be_define_const_map( be_class_audio_output_map, - 1 + 12 ); BE_EXPORT_VARIABLE be_define_const_class( diff --git a/lib/libesp32/berry/library.json b/lib/libesp32/berry/library.json index 901800fca..38df6e3fc 100644 --- a/lib/libesp32/berry/library.json +++ b/lib/libesp32/berry/library.json @@ -17,14 +17,16 @@ "frameworks": "arduino", "platforms": "espressif32", "build": { + "includeDir": "generate", "srcFilter": [ "+<*.c>", "+<../default/*.c>", "+<../default/*.cpp>", "+<../default/*.hpp>", + "+<../generate/*.h>", "+<*.cpp>", "+<*.h>" ], "flags": [ "-I$PROJECT_DIR/tasmota", "-DCOMPILE_BERRY_LIB" ] } -} \ No newline at end of file +} diff --git a/lib/libesp32/berry_mapping/src/be_class_wrapper.c b/lib/libesp32/berry_mapping/src/be_class_wrapper.c index ef8decaea..625723ae5 100644 --- a/lib/libesp32/berry_mapping/src/be_class_wrapper.c +++ b/lib/libesp32/berry_mapping/src/be_class_wrapper.c @@ -138,6 +138,7 @@ int be_find_global_or_module_member(bvm *vm, const char * name) { * 'i' be_int * 'b' be_bool * 's' be_str + * '&' bytes() object, pointer to buffer returned, and size passed with an additional (size_t*) argument * * - arg_type: optionally check the types of input arguments, or throw an error * string of argument types, '[' indicates that the following parameters are optional @@ -145,8 +146,10 @@ int be_find_global_or_module_member(bvm *vm, const char * name) { * 'i' be_int * 'b' be_bool * 's' be_string + * 'f' be_real (float) * 'c' C callback - * '-' ignore and don't send to C function + * '-': skip argument and ignore + * '~': send the length of the previous bytes() buffer (or raise an exception if no length known) * 'lv_obj' be_instance of type or subtype * '^lv_event_cb' callback of a named class - will call `_lvgl.gen_cb(arg_type, closure, self)` and expects a callback address in return * @@ -276,27 +279,33 @@ intptr_t be_convert_single_elt(bvm *vm, int idx, const char * arg_type, int *buf // - '.': any argument (no check) // - '-': skip argument and ignore // - '~': send the length of the previous bytes() buffer (or raise an exception if no length known) +// - if return type is '&' (bytes), an implicit additional parameter is passed as (size_t*) to return the length in bytes // // - a class name surroungded by parenthesis // - '(lv_button)' -> lv_button class or derived // - '[lv_event_cb]' -> callback type, still prefixed with '^' to mark that it is cb // -void be_check_arg_type(bvm *vm, int arg_start, int argc, const char * arg_type, intptr_t p[8]) { +// Returns the number of parameters sent to the function +// +int be_check_arg_type(bvm *vm, int arg_start, int argc, const char * arg_type, intptr_t p[8]) { bbool arg_type_check = (arg_type != NULL); // is type checking activated - int32_t arg_idx = 0; // position in arg_type string - bbool arg_optional = bfalse; // are remaining types optional? + int32_t arg_idx = 0; // position in arg_type string + bbool arg_optional = bfalse; // are remaining types optional? char type_short_name[32]; uint32_t p_idx = 0; // index in p[], is incremented with each parameter except '-' int32_t buf_len = -1; // stores the length of a bytes() buffer to be used as '~' attribute + + // special case when no parameters are passed but all are optional + if (NULL != arg_type && arg_type[arg_idx] == '[') { + arg_optional = btrue; + arg_idx++; + } + for (uint32_t i = 0; i < argc; i++) { type_short_name[0] = 0; // clear string // extract individual type if (NULL != arg_type) { - if (arg_type[arg_idx] == '[' || arg_type[arg_idx] == ']') { // '[' is a marker that following parameters are optional and default to NULL - arg_optional = btrue; - arg_idx++; - } switch (arg_type[arg_idx]) { case '-': arg_idx++; @@ -333,6 +342,10 @@ void be_check_arg_type(bvm *vm, int arg_start, int argc, const char * arg_type, arg_type = NULL; // stop iterations break; } + if (arg_type[arg_idx] == '[' || arg_type[arg_idx] == ']') { // '[' is a marker that following parameters are optional and default to NULL + arg_optional = btrue; + arg_idx++; + } } // AddLog(LOG_LEVEL_INFO, ">> 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); @@ -353,6 +366,7 @@ void be_check_arg_type(bvm *vm, int arg_start, int argc, const char * arg_type, if (!arg_optional && arg_type != NULL && arg_type[arg_idx] != 0) { be_raisef(vm, "value_error", "Missing arguments, remaining type '%s'", &arg_type[arg_idx]); } + return p_idx; } // @@ -420,8 +434,12 @@ int be_call_c_func(bvm *vm, void * func, const char * return_type, const char * } } - fn_any_callable f = (fn_any_callable) func; - be_check_arg_type(vm, arg_start, arg_count, arg_type, p); + fn_any_callable f = (fn_any_callable) func; // when returning a bytes buffer, this holds the length of the buffer, while the return value of the function is `void*` + size_t return_len = 0; + int c_args = be_check_arg_type(vm, arg_start, arg_count, arg_type, p); + if (return_type != NULL && return_type[0] == '&') { + if (c_args < 8) { p[c_args] = (intptr_t) &return_len; } + } intptr_t ret = 0; if (f) ret = (*f)(p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]); // berry_log_C("be_call_c_func '%s' -> '%s': (%i,%i,%i,%i,%i,%i) -> %i", return_type, arg_type, p[0], p[1], p[2], p[3], p[4], p[5], ret); @@ -438,7 +456,7 @@ int be_call_c_func(bvm *vm, void * func, const char * return_type, const char * case 'i': be_pushint(vm, ret); break; case 'b': be_pushbool(vm, ret); break; case 's': be_pushstring(vm, (const char*) ret); break; - case 'c': be_pushint(vm, ret); break; // TODO missing 'c' general callback type + case '&': be_pushbytes(vm, (void*) ret, return_len); break; default: be_raise(vm, "internal_error", "Unsupported return type"); break; } be_return(vm); diff --git a/lib/libesp32/berry_mapping/src/be_mapping.h b/lib/libesp32/berry_mapping/src/be_mapping.h index 3ba14660a..6264e1ebb 100644 --- a/lib/libesp32/berry_mapping/src/be_mapping.h +++ b/lib/libesp32/berry_mapping/src/be_mapping.h @@ -57,7 +57,7 @@ extern int be_find_global_or_module_member(bvm *vm, const char * cl_name); extern bbool be_const_member(bvm *vm, const be_const_member_t * definitions, size_t def_len); extern intptr_t be_convert_single_elt(bvm *vm, int idx, const char * arg_type, int *len); -extern void be_check_arg_type(bvm *vm, int arg_start, int argc, const char * arg_type, intptr_t p[8]);; +extern int be_check_arg_type(bvm *vm, int arg_start, int argc, const char * arg_type, intptr_t p[8]); extern int be_call_c_func(bvm *vm, void * func, const char * return_type, const char * arg_type); #ifdef __cplusplus diff --git a/lib/libesp32/berry/include/be_ctypes.h b/lib/libesp32/berry_tasmota/include/be_ctypes.h similarity index 100% rename from lib/libesp32/berry/include/be_ctypes.h rename to lib/libesp32/berry_tasmota/include/be_ctypes.h diff --git a/lib/libesp32/berry_tasmota/library.json b/lib/libesp32/berry_tasmota/library.json new file mode 100644 index 000000000..e506ce7b6 --- /dev/null +++ b/lib/libesp32/berry_tasmota/library.json @@ -0,0 +1,17 @@ +{ + "name": "Berry Tasmota mapping", + "version": "1.0", + "description": "Mapping of Tasmota features to Berry", + "license": "MIT", + "homepage": "https://github.com/arendst/Tasmota", + "frameworks": "arduino", + "platforms": "espressif32", + "authors": + { + "name": "Stephan Hadinger", + "maintainer": true + }, + "build": { + "flags": [ "-I$PROJECT_DIR/include", "-includetasmota_options.h" ] + } + } \ No newline at end of file diff --git a/lib/libesp32/berry/default/be_animate_lib.c b/lib/libesp32/berry_tasmota/src/be_animate_lib.c similarity index 100% rename from lib/libesp32/berry/default/be_animate_lib.c rename to lib/libesp32/berry_tasmota/src/be_animate_lib.c diff --git a/lib/libesp32/berry_tasmota/src/be_audio_opus_lib.c b/lib/libesp32/berry_tasmota/src/be_audio_opus_lib.c new file mode 100644 index 000000000..19253b0d3 --- /dev/null +++ b/lib/libesp32/berry_tasmota/src/be_audio_opus_lib.c @@ -0,0 +1,88 @@ +/******************************************************************** + * Tasmota I2S audio classes + * + * + *******************************************************************/ +#include "be_constobj.h" + +#ifdef USE_I2S +#ifdef USE_I2S_AUDIO_BERRY + +#include "libopus/opus.h" +#include "be_mapping.h" + +// Tasmota Logging +extern void tasmota_log_C(uint32_t loglevel, const char * berry_buf, ...); +enum LoggingLevels {LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_DEBUG, LOG_LEVEL_DEBUG_MORE}; + +// init(freq:int, channels:int) +void *be_audio_opus_decoder_init_ntv(int freq, int channels) { + if (freq <= 0) { freq = 16000; } + if (channels <= 0) { channels = 1; } + int opus_size = opus_decoder_get_size(channels); // get size for n channel + tasmota_log_C(LOG_LEVEL_DEBUG, "AUD: allocated %i bytes for Opus decoder", opus_size); + void * buf = BE_EXPLICIT_MALLOC(opus_size); + if (!buf) { berry_log_C("OPUS: out of memory"); } + + int err = opus_decoder_init((OpusDecoder*)buf, freq, channels); + if (err) { berry_log_C("OPUS: opus_encoder_init error=%i", err); } + + return buf; +} +int32_t be_audio_opus_decoder_init(struct bvm *vm) { + return be_call_c_func(vm, (void*) &be_audio_opus_decoder_init_ntv, "+.p", "i[i]"); +} + +// deinit() +void *be_audio_opus_decoder_deinit_ntv(OpusDecoder* buf) { + if (buf) BE_EXPLICIT_FREE(buf); + return NULL; +} +int32_t be_audio_opus_decoder_deinit(struct bvm *vm) { + return be_call_c_func(vm, (void*) &be_audio_opus_decoder_deinit_ntv, "", "."); +} + + +// decode(payload:bytes) -> pcm:bytes() +int32_t be_audio_opus_decoder_decode(struct bvm *vm) { + int32_t argc = be_top(vm); + be_call_c_func(vm, NULL, NULL, ".(bytes)"); + + OpusDecoder* st = (OpusDecoder*) be_convert_single_elt(vm, 1, NULL, NULL); // get value of '.p' + size_t frames_len; + const uint8_t * opus_frame = be_tobytes(vm, 2, &frames_len); + + int samples = opus_decoder_get_nb_samples(st, opus_frame, frames_len); + // tasmota_log_C(LOG_LEVEL_DEBUG, "AUD: frame contains %i samples", samples); + + // allocate a buffer for the content + void * pcm = be_pushbytes(vm, NULL, samples * 2); + + int ret = opus_decode(st, opus_frame, frames_len, pcm, samples, 0); + if (ret != samples) { be_raisef(vm, "internal_error", "wrong number of frames %i (supposed to be %i", ret, samples); } + + be_return(vm); +} + +#include "be_fixed_be_class_audio_opus_decoder.h" + +void be_load_driver_audio_opus_decoder(bvm *vm) { + be_pushntvclass(vm, &be_class_audio_opus_decoder); + be_setglobal(vm, "OpusDecoder"); + be_pop(vm, 1); +} + +/* @const_object_info_begin + +class be_class_audio_opus_decoder (scope: global, name: OpusDecoder) { + .p, var + init, func(be_audio_opus_decoder_init) + deinit, func(be_audio_opus_decoder_deinit) + + decode, func(be_audio_opus_decoder_decode) +} + +@const_object_info_end */ + +#endif // USE_I2S_AUDIO_BERRY +#endif // USE_I2S \ No newline at end of file diff --git a/lib/libesp32/berry/default/be_autoconf_lib.c b/lib/libesp32/berry_tasmota/src/be_autoconf_lib.c similarity index 100% rename from lib/libesp32/berry/default/be_autoconf_lib.c rename to lib/libesp32/berry_tasmota/src/be_autoconf_lib.c diff --git a/lib/libesp32/berry/default/be_crypto_lib.c b/lib/libesp32/berry_tasmota/src/be_crypto_lib.c similarity index 92% rename from lib/libesp32/berry/default/be_crypto_lib.c rename to lib/libesp32/berry_tasmota/src/be_crypto_lib.c index 04a10b28e..03173ec0c 100644 --- a/lib/libesp32/berry/default/be_crypto_lib.c +++ b/lib/libesp32/berry_tasmota/src/be_crypto_lib.c @@ -17,8 +17,8 @@ extern int m_aes_gcm_tag(bvm *vm); extern int m_ec_c25519_pubkey(bvm *vm); extern int m_ec_c25519_sharedkey(bvm *vm); -#include "../generate/be_fixed_be_class_aes_gcm.h" -#include "../generate/be_fixed_be_class_ec_c25519.h" +#include "be_fixed_be_class_aes_gcm.h" +#include "be_fixed_be_class_ec_c25519.h" void be_load_crypto_lib(bvm *vm) { // insert the class GCM in module AES diff --git a/lib/libesp32/berry/default/be_ctypes.c b/lib/libesp32/berry_tasmota/src/be_ctypes.c similarity index 99% rename from lib/libesp32/berry/default/be_ctypes.c rename to lib/libesp32/berry_tasmota/src/be_ctypes.c index 18e655d8b..5bd8f309d 100644 --- a/lib/libesp32/berry/default/be_ctypes.c +++ b/lib/libesp32/berry_tasmota/src/be_ctypes.c @@ -462,8 +462,8 @@ int be_ctypes_dyn_init(bvm *vm) { BE_EXPORT_VARIABLE extern const bclass be_class_bytes; -#include "../generate/be_fixed_be_class_ctypes.h" -#include "../generate/be_fixed_be_class_ctypes_dyn.h" +#include "be_fixed_be_class_ctypes.h" +#include "be_fixed_be_class_ctypes_dyn.h" void be_load_ctypes_lib(bvm *vm) { be_pushntvclass(vm, &be_class_ctypes); diff --git a/lib/libesp32/berry/default/be_display_lib.c b/lib/libesp32/berry_tasmota/src/be_display_lib.c similarity index 100% rename from lib/libesp32/berry/default/be_display_lib.c rename to lib/libesp32/berry_tasmota/src/be_display_lib.c diff --git a/lib/libesp32/berry/default/be_driverlib.c b/lib/libesp32/berry_tasmota/src/be_driverlib.c similarity index 100% rename from lib/libesp32/berry/default/be_driverlib.c rename to lib/libesp32/berry_tasmota/src/be_driverlib.c diff --git a/lib/libesp32/berry/default/be_energy_ctypes_definitions.c b/lib/libesp32/berry_tasmota/src/be_energy_ctypes_definitions.c similarity index 100% rename from lib/libesp32/berry/default/be_energy_ctypes_definitions.c rename to lib/libesp32/berry_tasmota/src/be_energy_ctypes_definitions.c diff --git a/lib/libesp32/berry/default/be_energylib.c b/lib/libesp32/berry_tasmota/src/be_energylib.c similarity index 100% rename from lib/libesp32/berry/default/be_energylib.c rename to lib/libesp32/berry_tasmota/src/be_energylib.c diff --git a/lib/libesp32/berry/default/be_flash_lib.c b/lib/libesp32/berry_tasmota/src/be_flash_lib.c similarity index 93% rename from lib/libesp32/berry/default/be_flash_lib.c rename to lib/libesp32/berry_tasmota/src/be_flash_lib.c index 539805d5d..cbce3ce47 100644 --- a/lib/libesp32/berry/default/be_flash_lib.c +++ b/lib/libesp32/berry_tasmota/src/be_flash_lib.c @@ -18,4 +18,4 @@ module flash (scope: global) { erase, func(p_flash_erase) } @const_object_info_end */ -#include "../generate/be_fixed_flash.h" +#include "be_fixed_flash.h" diff --git a/lib/libesp32/berry/default/be_gpio_lib.c b/lib/libesp32/berry_tasmota/src/be_gpio_lib.c similarity index 95% rename from lib/libesp32/berry/default/be_gpio_lib.c rename to lib/libesp32/berry_tasmota/src/be_gpio_lib.c index 3f0b2b3ed..3ada8347f 100644 --- a/lib/libesp32/berry/default/be_gpio_lib.c +++ b/lib/libesp32/berry_tasmota/src/be_gpio_lib.c @@ -31,4 +31,4 @@ module gpio (scope: global) { pin, func(gp_pin) } @const_object_info_end */ -#include "../generate/be_fixed_gpio.h" +#include "be_fixed_gpio.h" diff --git a/lib/libesp32/berry/default/be_i2c_axp192_lib.c b/lib/libesp32/berry_tasmota/src/be_i2c_axp192_lib.c similarity index 100% rename from lib/libesp32/berry/default/be_i2c_axp192_lib.c rename to lib/libesp32/berry_tasmota/src/be_i2c_axp192_lib.c diff --git a/lib/libesp32/berry/default/be_i2c_driverlib.c b/lib/libesp32/berry_tasmota/src/be_i2c_driverlib.c similarity index 100% rename from lib/libesp32/berry/default/be_i2c_driverlib.c rename to lib/libesp32/berry_tasmota/src/be_i2c_driverlib.c diff --git a/lib/libesp32/berry_tasmota/src/be_i2s_audio_lib.cpp b/lib/libesp32/berry_tasmota/src/be_i2s_audio_lib.cpp new file mode 100644 index 000000000..0b0d08919 --- /dev/null +++ b/lib/libesp32/berry_tasmota/src/be_i2s_audio_lib.cpp @@ -0,0 +1,245 @@ +/******************************************************************** + * Tasmota I2S audio classes + * + * + *******************************************************************/ +#include "be_constobj.h" + +#ifdef USE_I2S +#ifdef USE_I2S_AUDIO_BERRY + +#include "be_mapping.h" +#include "AudioOutput.h" + +extern "C" void berry_log_C(const char * berry_buf, ...); + +extern "C" { + extern int i2s_output_i2s_init(bvm *vm); + extern int i2s_output_i2s_deinit(bvm *vm); + extern int i2s_output_i2s_stop(bvm *vm); + + extern int i2s_generator_wav_init(bvm *vm); + extern int i2s_generator_wav_deinit(bvm *vm); + extern int i2s_generator_wav_begin(bvm *vm); + extern int i2s_generator_wav_loop(bvm *vm); + extern int i2s_generator_wav_stop(bvm *vm); + extern int i2s_generator_wav_isrunning(bvm *vm); + + extern int i2s_generator_mp3_init(bvm *vm); + extern int i2s_generator_mp3_deinit(bvm *vm); + extern int i2s_generator_mp3_begin(bvm *vm); + extern int i2s_generator_mp3_loop(bvm *vm); + extern int i2s_generator_mp3_stop(bvm *vm); + extern int i2s_generator_mp3_isrunning(bvm *vm); + +#ifdef USE_UFILESYS + extern int i2s_file_source_fs_init(bvm *vm); + extern int i2s_file_source_fs_deinit(bvm *vm); +#endif // USE_UFILESYS +} + +// AudioOutput.set_rate(rate_hz:int) -> bool +AudioOutput* be_audio_output_init_ntv(void) { + return new AudioOutput(); +} +int32_t be_audio_output_init(struct bvm *vm) { + return be_call_c_func(vm, (void*) &be_audio_output_init_ntv, "+.p", ""); +} + +// AudioOutput.set_rate(rate_hz:int) -> bool +int be_audio_output_set_rate_ntv(AudioOutput* out, int hz) { + return out->SetRate(hz); +} +int32_t be_audio_output_set_rate(struct bvm *vm) { + return be_call_c_func(vm, (void*) &be_audio_output_set_rate_ntv, "b", ".i"); +} + +// AudioOutput.set_bits_per_sample(bits_per_sample:int) -> bool +int be_audio_output_set_bits_per_sample_ntv(AudioOutput* out, int bps) { + return out->SetBitsPerSample(bps); +} +int32_t be_audio_output_set_bits_per_sample(struct bvm *vm) { + return be_call_c_func(vm, (void*) &be_audio_output_set_bits_per_sample_ntv, "b", ".i"); +} + +// AudioOutput.set_channels(channels:int) -> bool +int be_audio_output_set_channels_ntv(AudioOutput* out, int channels) { + return out->SetChannels(channels); +} +int32_t be_audio_output_set_channels(struct bvm *vm) { + return be_call_c_func(vm, (void*) &be_audio_output_set_channels_ntv, "b", ".i"); +} + +// AudioOutput.set_gain(gain:real) -> bool +int be_audio_output_set_gain_ntv(AudioOutput* out, float gain) { + return out->SetGain(gain); +} +int32_t be_audio_output_set_gain(struct bvm *vm) { + return be_call_c_func(vm, (void*) &be_audio_output_set_gain_ntv, "b", ".f"); +} + +// AudioOutput.begin() -> bool +int be_audio_output_begin_ntv(AudioOutput* out) { + return out->begin(); +} +int32_t be_audio_output_begin(struct bvm *vm) { + return be_call_c_func(vm, (void*) &be_audio_output_begin_ntv, "b", "."); +} +// AudioOutput.stop() -> bool +int be_audio_output_stop_ntv(AudioOutput* out) { + return out->stop(); +} +int32_t be_audio_output_stop(struct bvm *vm) { + return be_call_c_func(vm, (void*) &be_audio_output_stop_ntv, "b", "."); +} +// AudioOutput.flush() -> bool +void be_audio_output_flush_ntv(AudioOutput* out) { + out->flush(); +} +int32_t be_audio_output_flush(struct bvm *vm) { + return be_call_c_func(vm, (void*) &be_audio_output_flush_ntv, "", "."); +} + +// AudioOutput.consume_mono(bytes) -> int +int be_audio_output_consume_mono_ntv(AudioOutput* out, uint16_t *pcm, int bytes_len, int index) { + int pcm_len = bytes_len / 2; + int n; + // berry_log_C("be_audio_output_consume_mono_ntv out=%p pcm=%p bytes_len=%i index=%i", out, pcm, bytes_len, index); + for (n = 0; index + n < pcm_len; n++) { + int16_t ms[2]; + ms[AudioOutput::LEFTCHANNEL] = ms[AudioOutput::RIGHTCHANNEL] = pcm[index + n]; + if (!out->ConsumeSample(ms)) { break; } + } + return n; +} +int32_t be_audio_output_consume_mono(struct bvm *vm) { + return be_call_c_func(vm, (void*) &be_audio_output_consume_mono_ntv, "i", ".(bytes)~i"); +} + +// AudioOutput.consume_stereo(bytes) -> int +int be_audio_output_consume_stereo_ntv(AudioOutput* out, uint16_t *pcm, int bytes_len, int index) { + int pcm_len = bytes_len / 4; // 2 samples LEFT+RIGHT of 2 bytes each + int n; + // berry_log_C("be_audio_output_consume_stereo_ntv out=%p pcm=%p bytes_len=%i index=%i", out, pcm, bytes_len, index); + for (n = 0; index + n < pcm_len; n++) { + int16_t ms[2]; + ms[AudioOutput::LEFTCHANNEL] = pcm[index + n + n]; + ms[AudioOutput::RIGHTCHANNEL] = pcm[index + n + n + 1]; + if (!out->ConsumeSample(ms)) { break; } + } + return n; +} +int32_t be_audio_output_consume_stereo(struct bvm *vm) { + return be_call_c_func(vm, (void*) &be_audio_output_consume_stereo_ntv, "i", ".(bytes)~i"); +} + +// AudioOutput.consume_silence() -> int, push silence frames +int be_audio_output_consume_silence_ntv(AudioOutput* out) { + int n = 0; + int16_t ms[2] = {0, 0}; + while (true) { + if (!out->ConsumeSample(ms)) { break; } + n++; + } + return n; +} +int32_t be_audio_output_consume_silence(struct bvm *vm) { + return be_call_c_func(vm, (void*) &be_audio_output_consume_silence_ntv, "i", "."); +} + +extern "C" { + +#include "be_fixed_be_class_audio_output.h" +#include "be_fixed_be_class_audio_output_i2s.h" +#include "be_fixed_be_class_audio_generator.h" +#include "be_fixed_be_class_audio_generator_wav.h" +#include "be_fixed_be_class_audio_generator_mp3.h" +#include "be_fixed_be_class_audio_file_source.h" +#include "be_fixed_be_class_audio_file_source_fs.h" + + void be_load_driver_audio_lib(bvm *vm) { + be_pushntvclass(vm, &be_class_audio_output); + be_setglobal(vm, "AudioOutput"); + be_pop(vm, 1); + + be_pushntvclass(vm, &be_class_audio_output_i2s); + be_setglobal(vm, "AudioOutputI2S"); + be_pop(vm, 1); + + be_pushntvclass(vm, &be_class_audio_generator_wav); + be_setglobal(vm, "AudioGeneratorWAV"); + be_pop(vm, 1); + + be_pushntvclass(vm, &be_class_audio_generator_mp3); + be_setglobal(vm, "AudioGeneratorMP3"); + be_pop(vm, 1); + + #ifdef USE_UFILESYS + be_pushntvclass(vm, &be_class_audio_file_source_fs); + be_setglobal(vm, "AudioFileSourceFS"); + be_pop(vm, 1); + #endif // USE_UFILESYS + } +} + +/* @const_object_info_begin + +class be_class_audio_output (scope: global, name: AudioOutput) { + .p, var + init, func(be_audio_output_init) + + begin, func(be_audio_output_begin) + stop, func(be_audio_output_stop) + flush, func(be_audio_output_flush) + + consume_mono, func(be_audio_output_consume_mono) + consume_stereo, func(be_audio_output_consume_stereo) + consume_silence, func(be_audio_output_consume_silence) + + set_rate, func(be_audio_output_set_rate) + set_bits_per_sample, func(be_audio_output_set_bits_per_sample) + set_channels, func(be_audio_output_set_channels) + set_gain, func(be_audio_output_set_gain) +} + +class be_class_audio_generator (scope: global, name: AudioGenerator) { + .p, var +} + +class be_class_audio_file_source (scope: global, name: AudioFileSource) { + .p, var +} + +class be_class_audio_output_i2s (scope: global, name: AudioOutputI2S, super: be_class_audio_output) { + init, func(i2s_output_i2s_init) + deinit, func(i2s_output_i2s_deinit) + stop, func(i2s_output_i2s_stop) +} + +class be_class_audio_generator_wav (scope: global, name: AudioGeneratorWAV, super: be_class_audio_generator) { + init, func(i2s_generator_wav_init) + deinit, func(i2s_generator_wav_deinit) + begin, func(i2s_generator_wav_begin) + loop, func(i2s_generator_wav_loop) + stop, func(i2s_generator_wav_stop) + isrunning, func(i2s_generator_wav_isrunning) +} + +class be_class_audio_generator_mp3 (scope: global, name: AudioGeneratorMP3, super: be_class_audio_generator) { + init, func(i2s_generator_mp3_init) + deinit, func(i2s_generator_mp3_deinit) + begin, func(i2s_generator_mp3_begin) + loop, func(i2s_generator_mp3_loop) + stop, func(i2s_generator_mp3_stop) + isrunning, func(i2s_generator_mp3_isrunning) +} + +class be_class_audio_file_source_fs (scope: global, name: AudioFileSourceFS, super: be_class_audio_file_source) { + init, func(i2s_file_source_fs_init) + deinit, func(i2s_file_source_fs_deinit) +} + +@const_object_info_end */ + +#endif // USE_I2S_AUDIO_BERRY +#endif // USE_I2S \ No newline at end of file diff --git a/lib/libesp32/berry/default/be_leds_animator_lib.c b/lib/libesp32/berry_tasmota/src/be_leds_animator_lib.c similarity index 100% rename from lib/libesp32/berry/default/be_leds_animator_lib.c rename to lib/libesp32/berry_tasmota/src/be_leds_animator_lib.c diff --git a/lib/libesp32/berry/default/be_leds_lib.c b/lib/libesp32/berry_tasmota/src/be_leds_lib.c similarity index 100% rename from lib/libesp32/berry/default/be_leds_lib.c rename to lib/libesp32/berry_tasmota/src/be_leds_lib.c diff --git a/lib/libesp32/berry/default/be_leds_ntv_lib.c b/lib/libesp32/berry_tasmota/src/be_leds_ntv_lib.c similarity index 100% rename from lib/libesp32/berry/default/be_leds_ntv_lib.c rename to lib/libesp32/berry_tasmota/src/be_leds_ntv_lib.c diff --git a/lib/libesp32/berry/default/be_light_lib.c b/lib/libesp32/berry_tasmota/src/be_light_lib.c similarity index 94% rename from lib/libesp32/berry/default/be_light_lib.c rename to lib/libesp32/berry_tasmota/src/be_light_lib.c index 6d020eca8..cb0393411 100644 --- a/lib/libesp32/berry/default/be_light_lib.c +++ b/lib/libesp32/berry_tasmota/src/be_light_lib.c @@ -23,6 +23,6 @@ module light (scope: global) { reverse_gamma10, func(l_rev_gamma10) } @const_object_info_end */ -#include "../generate/be_fixed_light.h" +#include "be_fixed_light.h" #endif // USE_LIGHT \ No newline at end of file diff --git a/lib/libesp32/berry/default/be_lv_tasmota_lib.c b/lib/libesp32/berry_tasmota/src/be_lv_tasmota_lib.c similarity index 99% rename from lib/libesp32/berry/default/be_lv_tasmota_lib.c rename to lib/libesp32/berry_tasmota/src/be_lv_tasmota_lib.c index d69affbd9..6da172c6a 100644 --- a/lib/libesp32/berry/default/be_lv_tasmota_lib.c +++ b/lib/libesp32/berry_tasmota/src/be_lv_tasmota_lib.c @@ -111,6 +111,6 @@ module lv_tasmota (scope: global) { load_freetype_font, func(lv0_load_freetype_font) } @const_object_info_end */ -#include "../generate/be_fixed_lv_tasmota.h" +#include "be_fixed_lv_tasmota.h" #endif // USE_LVGL \ No newline at end of file diff --git a/lib/libesp32/berry/default/be_lvgl_clock_icon_lib.c b/lib/libesp32/berry_tasmota/src/be_lvgl_clock_icon_lib.c similarity index 100% rename from lib/libesp32/berry/default/be_lvgl_clock_icon_lib.c rename to lib/libesp32/berry_tasmota/src/be_lvgl_clock_icon_lib.c diff --git a/lib/libesp32/berry/default/be_lvgl_signal_arcs_lib.c b/lib/libesp32/berry_tasmota/src/be_lvgl_signal_arcs_lib.c similarity index 100% rename from lib/libesp32/berry/default/be_lvgl_signal_arcs_lib.c rename to lib/libesp32/berry_tasmota/src/be_lvgl_signal_arcs_lib.c diff --git a/lib/libesp32/berry/default/be_lvgl_signal_bars_lib.c b/lib/libesp32/berry_tasmota/src/be_lvgl_signal_bars_lib.c similarity index 100% rename from lib/libesp32/berry/default/be_lvgl_signal_bars_lib.c rename to lib/libesp32/berry_tasmota/src/be_lvgl_signal_bars_lib.c diff --git a/lib/libesp32/berry/default/be_lvgl_wifi_arcs_icon_lib.c b/lib/libesp32/berry_tasmota/src/be_lvgl_wifi_arcs_icon_lib.c similarity index 100% rename from lib/libesp32/berry/default/be_lvgl_wifi_arcs_icon_lib.c rename to lib/libesp32/berry_tasmota/src/be_lvgl_wifi_arcs_icon_lib.c diff --git a/lib/libesp32/berry/default/be_lvgl_wifi_arcs_lib.c b/lib/libesp32/berry_tasmota/src/be_lvgl_wifi_arcs_lib.c similarity index 100% rename from lib/libesp32/berry/default/be_lvgl_wifi_arcs_lib.c rename to lib/libesp32/berry_tasmota/src/be_lvgl_wifi_arcs_lib.c diff --git a/lib/libesp32/berry/default/be_lvgl_wifi_bars_icon_lib.c b/lib/libesp32/berry_tasmota/src/be_lvgl_wifi_bars_icon_lib.c similarity index 100% rename from lib/libesp32/berry/default/be_lvgl_wifi_bars_icon_lib.c rename to lib/libesp32/berry_tasmota/src/be_lvgl_wifi_bars_icon_lib.c diff --git a/lib/libesp32/berry/default/be_lvgl_wifi_bars_lib.c b/lib/libesp32/berry_tasmota/src/be_lvgl_wifi_bars_lib.c similarity index 100% rename from lib/libesp32/berry/default/be_lvgl_wifi_bars_lib.c rename to lib/libesp32/berry_tasmota/src/be_lvgl_wifi_bars_lib.c diff --git a/lib/libesp32/berry/default/be_md5_lib.c b/lib/libesp32/berry_tasmota/src/be_md5_lib.c similarity index 98% rename from lib/libesp32/berry/default/be_md5_lib.c rename to lib/libesp32/berry_tasmota/src/be_md5_lib.c index 2db161a0b..baa200747 100644 --- a/lib/libesp32/berry/default/be_md5_lib.c +++ b/lib/libesp32/berry_tasmota/src/be_md5_lib.c @@ -81,7 +81,7 @@ int32_t m_md5_finish(struct bvm *vm) { be_return(vm); } -#include "../generate/be_fixed_be_class_md5.h" +#include "be_fixed_be_class_md5.h" void be_load_md5_lib(bvm *vm) { be_pushntvclass(vm, &be_class_md5); diff --git a/lib/libesp32/berry_tasmota/src/be_modtab_tasmota.c b/lib/libesp32/berry_tasmota/src/be_modtab_tasmota.c new file mode 100644 index 000000000..b2a6be29e --- /dev/null +++ b/lib/libesp32/berry_tasmota/src/be_modtab_tasmota.c @@ -0,0 +1,2 @@ +// TODO + diff --git a/lib/libesp32/berry/default/be_onewire_lib.c b/lib/libesp32/berry_tasmota/src/be_onewire_lib.c similarity index 96% rename from lib/libesp32/berry/default/be_onewire_lib.c rename to lib/libesp32/berry_tasmota/src/be_onewire_lib.c index 838e6ccf9..e43fcf7c1 100644 --- a/lib/libesp32/berry/default/be_onewire_lib.c +++ b/lib/libesp32/berry_tasmota/src/be_onewire_lib.c @@ -24,7 +24,7 @@ extern int b_onewire_reset_search(bvm *vm); extern int b_onewire_target_search(bvm *vm); extern int b_onewire_search(bvm *vm); -#include "../generate/be_fixed_be_class_tasmota_onewire.h" +#include "be_fixed_be_class_tasmota_onewire.h" void be_load_onewirelib(bvm *vm) { be_pushntvclass(vm, &be_class_tasmota_onewire); diff --git a/lib/libesp32/berry/default/be_path_tasmota_lib.c b/lib/libesp32/berry_tasmota/src/be_path_tasmota_lib.c similarity index 97% rename from lib/libesp32/berry/default/be_path_tasmota_lib.c rename to lib/libesp32/berry_tasmota/src/be_path_tasmota_lib.c index 81711a053..0350edf12 100644 --- a/lib/libesp32/berry/default/be_path_tasmota_lib.c +++ b/lib/libesp32/berry_tasmota/src/be_path_tasmota_lib.c @@ -67,4 +67,4 @@ module path (scope: global, file: tasmota_path) { remove, func(m_path_remove) } @const_object_info_end */ -#include "../generate/be_fixed_tasmota_path.h" +#include "be_fixed_tasmota_path.h" diff --git a/lib/libesp32/berry/default/be_persist_lib.c b/lib/libesp32/berry_tasmota/src/be_persist_lib.c similarity index 100% rename from lib/libesp32/berry/default/be_persist_lib.c rename to lib/libesp32/berry_tasmota/src/be_persist_lib.c diff --git a/lib/libesp32/berry/default/be_port.cpp b/lib/libesp32/berry_tasmota/src/be_port.cpp similarity index 100% rename from lib/libesp32/berry/default/be_port.cpp rename to lib/libesp32/berry_tasmota/src/be_port.cpp diff --git a/lib/libesp32/berry/default/be_python_compat.c b/lib/libesp32/berry_tasmota/src/be_python_compat.c similarity index 100% rename from lib/libesp32/berry/default/be_python_compat.c rename to lib/libesp32/berry_tasmota/src/be_python_compat.c diff --git a/lib/libesp32/berry/default/be_re_lib.c b/lib/libesp32/berry_tasmota/src/be_re_lib.c similarity index 100% rename from lib/libesp32/berry/default/be_re_lib.c rename to lib/libesp32/berry_tasmota/src/be_re_lib.c diff --git a/lib/libesp32/berry/default/be_serial_lib.c b/lib/libesp32/berry_tasmota/src/be_serial_lib.c similarity index 96% rename from lib/libesp32/berry/default/be_serial_lib.c rename to lib/libesp32/berry_tasmota/src/be_serial_lib.c index 4f1c4b577..1a5f6fd96 100644 --- a/lib/libesp32/berry/default/be_serial_lib.c +++ b/lib/libesp32/berry_tasmota/src/be_serial_lib.c @@ -17,7 +17,7 @@ extern int b_serial_read(bvm *vm); extern int b_serial_available(bvm *vm); extern int b_serial_flush(bvm *vm); -#include "../generate/be_fixed_be_class_tasmota_serial.h" +#include "be_fixed_be_class_tasmota_serial.h" void be_load_serial_lib(bvm *vm) { be_pushntvclass(vm, &be_class_tasmota_serial); diff --git a/lib/libesp32/berry/default/be_tapp_lib.c b/lib/libesp32/berry_tasmota/src/be_tapp_lib.c similarity index 100% rename from lib/libesp32/berry/default/be_tapp_lib.c rename to lib/libesp32/berry_tasmota/src/be_tapp_lib.c diff --git a/lib/libesp32/berry/default/be_tasmotalib.c b/lib/libesp32/berry_tasmota/src/be_tasmotalib.c similarity index 99% rename from lib/libesp32/berry/default/be_tasmotalib.c rename to lib/libesp32/berry_tasmota/src/be_tasmotalib.c index 6539b0de3..5c7d15058 100644 --- a/lib/libesp32/berry/default/be_tasmotalib.c +++ b/lib/libesp32/berry_tasmota/src/be_tasmotalib.c @@ -31,6 +31,7 @@ extern int l_delay(bvm *vm); extern int l_scaleuint(bvm *vm); extern int l_logInfo(bvm *vm); extern int l_save(bvm *vm); +extern int t_random_byte(bvm *vm); extern int l_read_sensors(bvm *vm); @@ -1973,7 +1974,7 @@ be_local_closure(Tasmota_get_light, /* name */ ); /*******************************************************************/ -#include "../generate/be_fixed_be_class_tasmota.h" +#include "be_fixed_be_class_tasmota.h" // Class definition diff --git a/lib/libesp32/berry/default/be_tcpclient_lib.c b/lib/libesp32/berry_tasmota/src/be_tcpclient_lib.c similarity index 95% rename from lib/libesp32/berry/default/be_tcpclient_lib.c rename to lib/libesp32/berry_tasmota/src/be_tcpclient_lib.c index b39db458e..246436058 100644 --- a/lib/libesp32/berry/default/be_tcpclient_lib.c +++ b/lib/libesp32/berry_tasmota/src/be_tcpclient_lib.c @@ -20,7 +20,7 @@ extern int wc_tcp_write(bvm *vm); extern int wc_tcp_read(bvm *vm); extern int wc_tcp_readbytes(bvm *vm); -#include "../generate/be_fixed_be_class_tcpclient.h" +#include "be_fixed_be_class_tcpclient.h" void be_load_tcpclient_lib(bvm *vm) { be_pushntvclass(vm, &be_class_tcpclient); diff --git a/lib/libesp32/berry/default/be_timer_class.c b/lib/libesp32/berry_tasmota/src/be_timer_class.c similarity index 100% rename from lib/libesp32/berry/default/be_timer_class.c rename to lib/libesp32/berry_tasmota/src/be_timer_class.c diff --git a/lib/libesp32/berry/default/be_udp_lib.cpp b/lib/libesp32/berry_tasmota/src/be_udp_lib.cpp similarity index 98% rename from lib/libesp32/berry/default/be_udp_lib.cpp rename to lib/libesp32/berry_tasmota/src/be_udp_lib.cpp index e9c0a0cb5..042962952 100644 --- a/lib/libesp32/berry/default/be_udp_lib.cpp +++ b/lib/libesp32/berry_tasmota/src/be_udp_lib.cpp @@ -116,7 +116,7 @@ extern "C" { } } - #include "../generate/be_fixed_be_class_udp.h" + #include "be_fixed_be_class_udp.h" void be_load_udp_lib(bvm *vm) { be_pushntvclass(vm, &be_class_udp); diff --git a/lib/libesp32/berry/default/be_unishox_lib.c b/lib/libesp32/berry_tasmota/src/be_unishox_lib.c similarity index 100% rename from lib/libesp32/berry/default/be_unishox_lib.c rename to lib/libesp32/berry_tasmota/src/be_unishox_lib.c diff --git a/lib/libesp32/berry/default/be_webclient_lib.c b/lib/libesp32/berry_tasmota/src/be_webclient_lib.c similarity index 96% rename from lib/libesp32/berry/default/be_webclient_lib.c rename to lib/libesp32/berry_tasmota/src/be_webclient_lib.c index 0e4b66e90..b95740f76 100644 --- a/lib/libesp32/berry/default/be_webclient_lib.c +++ b/lib/libesp32/berry_tasmota/src/be_webclient_lib.c @@ -24,7 +24,7 @@ extern int wc_getstring(bvm *vm); extern int wc_writefile(bvm *vm); extern int wc_getsize(bvm *vm); -#include "../generate/be_fixed_be_class_webclient.h" +#include "be_fixed_be_class_webclient.h" void be_load_webclient_lib(bvm *vm) { be_pushntvclass(vm, &be_class_webclient); diff --git a/lib/libesp32/berry/default/be_webserver_lib.c b/lib/libesp32/berry_tasmota/src/be_webserver_lib.c similarity index 97% rename from lib/libesp32/berry/default/be_webserver_lib.c rename to lib/libesp32/berry_tasmota/src/be_webserver_lib.c index 0f3e45d05..c14e9efd3 100644 --- a/lib/libesp32/berry/default/be_webserver_lib.c +++ b/lib/libesp32/berry_tasmota/src/be_webserver_lib.c @@ -50,6 +50,6 @@ module webserver (scope: global) { has_arg, func(w_webserver_has_arg) } @const_object_info_end */ -#include "../generate/be_fixed_webserver.h" +#include "be_fixed_webserver.h" #endif // USE_WEBSERVER diff --git a/lib/libesp32/berry/default/be_wirelib.c b/lib/libesp32/berry_tasmota/src/be_wirelib.c similarity index 98% rename from lib/libesp32/berry/default/be_wirelib.c rename to lib/libesp32/berry_tasmota/src/be_wirelib.c index 38f345553..6dd1fd6a8 100644 --- a/lib/libesp32/berry/default/be_wirelib.c +++ b/lib/libesp32/berry_tasmota/src/be_wirelib.c @@ -118,7 +118,7 @@ be_local_closure(read_bytes, /* name */ /*******************************************************************/ -#include "../generate/be_fixed_be_class_tasmota_wire.h" +#include "be_fixed_be_class_tasmota_wire.h" void be_load_wirelib(bvm *vm) { be_pushntvclass(vm, &be_class_tasmota_wire); diff --git a/lib/libesp32/berry_tasmota/src/berry_tasmota.h b/lib/libesp32/berry_tasmota/src/berry_tasmota.h new file mode 100644 index 000000000..372a32b1e --- /dev/null +++ b/lib/libesp32/berry_tasmota/src/berry_tasmota.h @@ -0,0 +1,8 @@ +// force include of module by including this file + +#ifndef __BERRY_TASMOTA__ +#define __BERRY_TASMOTA__ + + + +#endif // __BERRY_TASMOTA__ diff --git a/lib/libesp32/berry/default/embedded/Animate.be b/lib/libesp32/berry_tasmota/src/embedded/Animate.be similarity index 100% rename from lib/libesp32/berry/default/embedded/Animate.be rename to lib/libesp32/berry_tasmota/src/embedded/Animate.be diff --git a/lib/libesp32/berry/default/embedded/Driver.be b/lib/libesp32/berry_tasmota/src/embedded/Driver.be similarity index 100% rename from lib/libesp32/berry/default/embedded/Driver.be rename to lib/libesp32/berry_tasmota/src/embedded/Driver.be diff --git a/lib/libesp32/berry/default/embedded/Tasmota.be b/lib/libesp32/berry_tasmota/src/embedded/Tasmota.be similarity index 100% rename from lib/libesp32/berry/default/embedded/Tasmota.be rename to lib/libesp32/berry_tasmota/src/embedded/Tasmota.be diff --git a/lib/libesp32/berry/default/embedded/Wire.be b/lib/libesp32/berry_tasmota/src/embedded/Wire.be similarity index 100% rename from lib/libesp32/berry/default/embedded/Wire.be rename to lib/libesp32/berry_tasmota/src/embedded/Wire.be diff --git a/lib/libesp32/berry/default/embedded/autoconf.be b/lib/libesp32/berry_tasmota/src/embedded/autoconf.be similarity index 100% rename from lib/libesp32/berry/default/embedded/autoconf.be rename to lib/libesp32/berry_tasmota/src/embedded/autoconf.be diff --git a/lib/libesp32/berry/default/embedded/i2c_axp192.be b/lib/libesp32/berry_tasmota/src/embedded/i2c_axp192.be similarity index 100% rename from lib/libesp32/berry/default/embedded/i2c_axp192.be rename to lib/libesp32/berry_tasmota/src/embedded/i2c_axp192.be diff --git a/lib/libesp32/berry/default/embedded/i2c_driver.be b/lib/libesp32/berry_tasmota/src/embedded/i2c_driver.be similarity index 100% rename from lib/libesp32/berry/default/embedded/i2c_driver.be rename to lib/libesp32/berry_tasmota/src/embedded/i2c_driver.be diff --git a/lib/libesp32/berry/default/embedded/leds.be b/lib/libesp32/berry_tasmota/src/embedded/leds.be similarity index 100% rename from lib/libesp32/berry/default/embedded/leds.be rename to lib/libesp32/berry_tasmota/src/embedded/leds.be diff --git a/lib/libesp32/berry/default/embedded/leds_animator.be b/lib/libesp32/berry_tasmota/src/embedded/leds_animator.be similarity index 100% rename from lib/libesp32/berry/default/embedded/leds_animator.be rename to lib/libesp32/berry_tasmota/src/embedded/leds_animator.be diff --git a/lib/libesp32/berry/default/embedded/lv_clock_icon.be b/lib/libesp32/berry_tasmota/src/embedded/lv_clock_icon.be similarity index 100% rename from lib/libesp32/berry/default/embedded/lv_clock_icon.be rename to lib/libesp32/berry_tasmota/src/embedded/lv_clock_icon.be diff --git a/lib/libesp32/berry/default/embedded/lv_signal_arcs.be b/lib/libesp32/berry_tasmota/src/embedded/lv_signal_arcs.be similarity index 100% rename from lib/libesp32/berry/default/embedded/lv_signal_arcs.be rename to lib/libesp32/berry_tasmota/src/embedded/lv_signal_arcs.be diff --git a/lib/libesp32/berry/default/embedded/lv_signal_bars.be b/lib/libesp32/berry_tasmota/src/embedded/lv_signal_bars.be similarity index 100% rename from lib/libesp32/berry/default/embedded/lv_signal_bars.be rename to lib/libesp32/berry_tasmota/src/embedded/lv_signal_bars.be diff --git a/lib/libesp32/berry/default/embedded/lv_tasmota.be b/lib/libesp32/berry_tasmota/src/embedded/lv_tasmota.be similarity index 100% rename from lib/libesp32/berry/default/embedded/lv_tasmota.be rename to lib/libesp32/berry_tasmota/src/embedded/lv_tasmota.be diff --git a/lib/libesp32/berry/default/embedded/openhasp.be b/lib/libesp32/berry_tasmota/src/embedded/openhasp.be similarity index 100% rename from lib/libesp32/berry/default/embedded/openhasp.be rename to lib/libesp32/berry_tasmota/src/embedded/openhasp.be diff --git a/lib/libesp32/berry/default/embedded/openhasp/demo-all.jsonl b/lib/libesp32/berry_tasmota/src/embedded/openhasp/demo-all.jsonl similarity index 100% rename from lib/libesp32/berry/default/embedded/openhasp/demo-all.jsonl rename to lib/libesp32/berry_tasmota/src/embedded/openhasp/demo-all.jsonl diff --git a/lib/libesp32/berry/default/embedded/openhasp/demo1.jsonl b/lib/libesp32/berry_tasmota/src/embedded/openhasp/demo1.jsonl similarity index 100% rename from lib/libesp32/berry/default/embedded/openhasp/demo1.jsonl rename to lib/libesp32/berry_tasmota/src/embedded/openhasp/demo1.jsonl diff --git a/lib/libesp32/berry/default/embedded/openhasp/demo2.jsonl b/lib/libesp32/berry_tasmota/src/embedded/openhasp/demo2.jsonl similarity index 100% rename from lib/libesp32/berry/default/embedded/openhasp/demo2.jsonl rename to lib/libesp32/berry_tasmota/src/embedded/openhasp/demo2.jsonl diff --git a/lib/libesp32/berry/default/embedded/openhasp/demo3.jsonl b/lib/libesp32/berry_tasmota/src/embedded/openhasp/demo3.jsonl similarity index 100% rename from lib/libesp32/berry/default/embedded/openhasp/demo3.jsonl rename to lib/libesp32/berry_tasmota/src/embedded/openhasp/demo3.jsonl diff --git a/lib/libesp32/berry/default/embedded/persist.be b/lib/libesp32/berry_tasmota/src/embedded/persist.be similarity index 100% rename from lib/libesp32/berry/default/embedded/persist.be rename to lib/libesp32/berry_tasmota/src/embedded/persist.be diff --git a/lib/libesp32/berry/default/embedded/tapp.be b/lib/libesp32/berry_tasmota/src/embedded/tapp.be similarity index 100% rename from lib/libesp32/berry/default/embedded/tapp.be rename to lib/libesp32/berry_tasmota/src/embedded/tapp.be diff --git a/lib/libesp32/berry/default/embedded/test_crypto.be b/lib/libesp32/berry_tasmota/src/embedded/test_crypto.be similarity index 100% rename from lib/libesp32/berry/default/embedded/test_crypto.be rename to lib/libesp32/berry_tasmota/src/embedded/test_crypto.be diff --git a/lib/libesp32/berry/default/static_block.hpp b/lib/libesp32/berry_tasmota/src/static_block.hpp similarity index 100% rename from lib/libesp32/berry/default/static_block.hpp rename to lib/libesp32/berry_tasmota/src/static_block.hpp diff --git a/tasmota/xdrv_52_3_berry_tasmota.ino b/tasmota/xdrv_52_3_berry_tasmota.ino index fdff25f1e..6279e4877 100644 --- a/tasmota/xdrv_52_3_berry_tasmota.ino +++ b/tasmota/xdrv_52_3_berry_tasmota.ino @@ -618,6 +618,16 @@ extern "C" { if (len+3 > LOGSZ) { strcat(log_data, "..."); } // Actual data is more berry_log(log_data); } + + void tasmota_log_C(int32_t loglevel, const char * berry_buf, ...) { + va_list arg; + va_start(arg, berry_buf); + char* log_data = ext_vsnprintf_malloc_P(berry_buf, arg); + va_end(arg); + if (log_data == nullptr) { return; } + AddLogData(loglevel, log_data); + free(log_data); + } } #endif // USE_BERRY diff --git a/tasmota/xdrv_52_9_berry.ino b/tasmota/xdrv_52_9_berry.ino index b48281fde..7ce662a2a 100644 --- a/tasmota/xdrv_52_9_berry.ino +++ b/tasmota/xdrv_52_9_berry.ino @@ -23,6 +23,7 @@ #define XDRV_52 52 #include +#include "berry_tasmota.h" #include "be_vm.h" #include "ZipReadFS.h" @@ -727,6 +728,7 @@ bool Xdrv52(uint8_t function) BrLoad("autoexec.be"); // run autoexec.be at first tick, so we know all modules are initialized berry.autoexec_done = true; } + callBerryEventDispatcher(PSTR("every_50ms"), nullptr, 0, nullptr); break; // Berry wide commands and events @@ -737,7 +739,9 @@ bool Xdrv52(uint8_t function) result = callBerryRule(nullptr, true); break; case FUNC_MQTT_DATA: +{int32_t now = millis(); result = callBerryEventDispatcher(PSTR("mqtt_data"), XdrvMailbox.topic, 0, XdrvMailbox.data, XdrvMailbox.data_len); +AddLog(LOG_LEVEL_INFO, ">>>: mqtt_data ms = %i", millis()-now);} break; case FUNC_COMMAND: result = DecodeCommand(kBrCommands, BerryCommand); From a26f2dbc2895c122ff871b0b160a125e7210e075 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Wed, 5 Jan 2022 10:44:58 +0100 Subject: [PATCH 178/402] Fix SPM power switching over 8 relays Fix SPM power switching over 8 relays (#14281) --- tasmota/xdrv_01_webserver.ino | 2 +- tasmota/xdrv_86_esp32_sonoff_spm.ino | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino index 1e8647ccf..4db0ad294 100644 --- a/tasmota/xdrv_01_webserver.ino +++ b/tasmota/xdrv_01_webserver.ino @@ -381,7 +381,7 @@ const char HTTP_END[] PROGMEM = "" ""; -const char HTTP_DEVICE_CONTROL[] PROGMEM = ""; // ?o is related to WebGetArg("o", tmp, sizeof(tmp)); +const char HTTP_DEVICE_CONTROL[] PROGMEM = ""; // ?o is related to WebGetArg(PSTR("o"), tmp, sizeof(tmp)) const char HTTP_DEVICE_STATE[] PROGMEM = "%s"; enum ButtonTitle { diff --git a/tasmota/xdrv_86_esp32_sonoff_spm.ino b/tasmota/xdrv_86_esp32_sonoff_spm.ino index 15acc5c1d..f22a98992 100644 --- a/tasmota/xdrv_86_esp32_sonoff_spm.ino +++ b/tasmota/xdrv_86_esp32_sonoff_spm.ino @@ -847,9 +847,12 @@ void SSPMHandleReceivedData(void) { Ty = Type of sub-device. 130: Four-channel sub-device */ if ((0x24 == Sspm->expected_bytes) && (Sspm->module_max < SSPM_MAX_MODULES)) { - memcpy(Sspm->module[1], Sspm->module[0], (SSPM_MAX_MODULES -1) * SSPM_MODULE_NAME_SIZE); + memmove(Sspm->module[1], Sspm->module[0], (SSPM_MAX_MODULES -1) * SSPM_MODULE_NAME_SIZE); memcpy(Sspm->module[0], SspmBuffer + 19, SSPM_MODULE_NAME_SIZE); Sspm->module_max++; + + AddLog(LOG_LEVEL_DEBUG, PSTR("SPM: Module %d type %d version %d.%d.%d found with id %12_H"), + Sspm->module_max, SspmBuffer[35], SspmBuffer[36], SspmBuffer[37], SspmBuffer[38], Sspm->module[0]); } SSPMSendAck(command_sequence); break; From 913db86f153b8732905287fe275bd77ac1e1fadc Mon Sep 17 00:00:00 2001 From: Stephan Hadinger Date: Wed, 5 Jan 2022 12:28:07 +0100 Subject: [PATCH 179/402] Remove debug leftovers --- tasmota/xdrv_52_9_berry.ino | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tasmota/xdrv_52_9_berry.ino b/tasmota/xdrv_52_9_berry.ino index 7ce662a2a..c48ab561d 100644 --- a/tasmota/xdrv_52_9_berry.ino +++ b/tasmota/xdrv_52_9_berry.ino @@ -728,7 +728,6 @@ bool Xdrv52(uint8_t function) BrLoad("autoexec.be"); // run autoexec.be at first tick, so we know all modules are initialized berry.autoexec_done = true; } - callBerryEventDispatcher(PSTR("every_50ms"), nullptr, 0, nullptr); break; // Berry wide commands and events @@ -739,10 +738,8 @@ bool Xdrv52(uint8_t function) result = callBerryRule(nullptr, true); break; case FUNC_MQTT_DATA: -{int32_t now = millis(); result = callBerryEventDispatcher(PSTR("mqtt_data"), XdrvMailbox.topic, 0, XdrvMailbox.data, XdrvMailbox.data_len); -AddLog(LOG_LEVEL_INFO, ">>>: mqtt_data ms = %i", millis()-now);} - break; + break; case FUNC_COMMAND: result = DecodeCommand(kBrCommands, BerryCommand); if (!result) { From fce010403516df3e87d5c7ca16b6f23a6baa4763 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Wed, 5 Jan 2022 12:43:26 +0100 Subject: [PATCH 180/402] Add SPM Relay scan timeout message --- tasmota/xdrv_86_esp32_sonoff_spm.ino | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tasmota/xdrv_86_esp32_sonoff_spm.ino b/tasmota/xdrv_86_esp32_sonoff_spm.ino index f22a98992..3a151dd01 100644 --- a/tasmota/xdrv_86_esp32_sonoff_spm.ino +++ b/tasmota/xdrv_86_esp32_sonoff_spm.ino @@ -1025,9 +1025,15 @@ void SSPMEvery100ms(void) { Sspm->module_max = 0; SSPMSendInitScan(); Sspm->mstate = SPM_WAIT_FOR_SCAN; + Sspm->last_totals = 0; break; case SPM_WAIT_FOR_SCAN: - // Wait for scan sequence to complete + // Wait for scan sequence to complete within 60 seconds + if (Sspm->last_totals > 600) { + AddLog(LOG_LEVEL_DEBUG, PSTR("SPM: Relay scan timeout")); + Sspm->mstate = SPM_NONE; + Sspm->error_led_blinks = 255; + } break; case SPM_SCAN_COMPLETE: // Scan sequence finished From c8082572849ff379d5e9ebd0b8e04b5d61469ac7 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 5 Jan 2022 17:50:36 +0100 Subject: [PATCH 181/402] Fix for one firmware file script THX @TD-er for this script!! --- pio-tools/post_esp32.py | 75 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 71 insertions(+), 4 deletions(-) diff --git a/pio-tools/post_esp32.py b/pio-tools/post_esp32.py index 904d24394..bef91e345 100644 --- a/pio-tools/post_esp32.py +++ b/pio-tools/post_esp32.py @@ -2,24 +2,91 @@ # Thanks TD-er :) Import("env") +import os + +def decode_flash_size_speed(byte_value): + speed = byte_value[0] & 0x0f + size = (byte_value[0] & 0xf0) / 16 + + spi_speed = { + 0: "40", + 1: "26", + 2: "20", + 0xf: "80" + } + speed_mhz = spi_speed.get(speed) + size_mb = str(1<\partitions.bin + # - 0xe000 | ~\.platformio\packages\framework-arduinoespressif32\tools\partitions\boot_app0.bin + # - 0x10000 | ~\Tasmota\.pio\build\/firmware.bin + new_file_name = env.subst("$BUILD_DIR/${PROGNAME}-factory.bin") sections = env.subst(env.get('FLASH_EXTRA_IMAGES')) new_file = open(new_file_name,"wb") + new_file.truncate() # Make sure no left over data is present from a previous build + + firmware_name = env.subst("$BUILD_DIR/${PROGNAME}.bin") + + # fill the file with 0xFF binary data to reflect 'erased and not yet written' data. + # Make sure to use exactly the size that normally would be erased + new_file.seek(0) + total_size = sketch_partition_start + os.path.getsize(firmware_name) + total_size = total_size - (total_size % flash_page_size) + flash_page_size + + new_file.write(bytes([0xff] * total_size)) + print(" {} | {}".format("Offset", "File")) for section in sections: sect_adr,sect_file = section.split(" ",1) print(" - {} | {}".format(sect_adr,sect_file)) source = open(sect_file,"rb") new_file.seek(int(sect_adr,0)-offset) - new_file.write(source.read()); + new_file.write(source.read()) + if "bootloader" in sect_file: + # Need to patch the bootloader to match the flash size + flash_size = env.BoardConfig().get("upload.flash_size") + + spi_speed_size_byte_offset = 3 + source.seek(spi_speed_size_byte_offset) + spi_speed_size_byte = source.read(1) + new_spi_speed_size_byte = spi_speed_size_byte[0] & 0x0f + + spi_size = { + "1MB": 0x00, + "2MB": 0x10, + "4MB": 0x20, + "8MB": 0x30, + "16MB": 0x40 + } + new_spi_speed_size_byte |= spi_size.get(flash_size, spi_speed_size_byte[0] & 0xf0) + + if new_spi_speed_size_byte != spi_speed_size_byte: + new_byte = bytes([new_spi_speed_size_byte]) + print(" | Patch flash size value {} -> {}".format(decode_flash_size_speed(spi_speed_size_byte), decode_flash_size_speed(new_byte))) + new_file.seek(int(sect_adr,0)-offset + spi_speed_size_byte_offset) + new_file.write(new_byte) + source.close() - firmware_name = env.subst("$BUILD_DIR/${PROGNAME}.bin") - firmware_start = 0x10000-offset + + firmware_start = sketch_partition_start-offset firmware = open(firmware_name,"rb") print(" - {} | {}".format(hex(firmware_start),firmware_name)) new_file.seek(firmware_start) From 2e77ed056009eb25e82874985dd6ad5261605971 Mon Sep 17 00:00:00 2001 From: SteWers Date: Wed, 5 Jan 2022 21:04:20 +0100 Subject: [PATCH 182/402] SolaxX1 RTS #1 --- tasmota/my_user_config.h | 4 ++-- tasmota/tasmota_template.h | 5 +++-- tasmota/tasmota_template_legacy.h | 2 ++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h index 1cf048513..7fadf4b9e 100644 --- a/tasmota/my_user_config.h +++ b/tasmota/my_user_config.h @@ -788,9 +788,9 @@ #define DDS2382_SPEED 9600 // Hiking DDS2382 Modbus RS485 serial speed (default: 9600 baud) //#define USE_DDSU666 // Add support for Chint DDSU666 Modbus energy monitor (+0k6 code) #define DDSU666_SPEED 9600 // Chint DDSU666 Modbus RS485 serial speed (default: 9600 baud) -//#define USE_SOLAX_X1 // Add support for Solax X1 series Modbus log info (+3k1 code) +#define USE_SOLAX_X1 // Add support for Solax X1 series Modbus log info (+3k1 code) #define SOLAXX1_SPEED 9600 // Solax X1 Modbus RS485 serial speed (default: 9600 baud) - #define SOLAXX1_PV2 // Solax X1 using second PV +// #define SOLAXX1_PV2 // Solax X1 using second PV //#define USE_LE01MR // Add support for F&F LE-01MR Modbus energy monitor (+1k code) #define LE01MR_SPEED 9600 // LE-01MR modbus baudrate (default: 9600) #define LE01MR_ADDR 1 // LE-01MR modbus address (default: 0x01) diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h index 2430cdf40..b961de31e 100644 --- a/tasmota/tasmota_template.h +++ b/tasmota/tasmota_template.h @@ -74,7 +74,7 @@ enum UserSelectablePins { GPIO_SSPI_MAX31865_CS1, // MAX31865 Chip Select GPIO_HRE_CLOCK, GPIO_HRE_DATA, // HR-E Water Meter GPIO_ADE7953_IRQ, // ADE7953 IRQ - GPIO_SOLAXX1_TX, GPIO_SOLAXX1_RX, // Solax Inverter Serial interface + GPIO_SOLAXX1_TX, GPIO_SOLAXX1_RX, GPIO_SOLAXX1_RTS, // Solax Inverter Serial interface GPIO_ZIGBEE_TX, GPIO_ZIGBEE_RX, // Zigbee Serial interface GPIO_RDM6300_RX, // RDM6300 RX GPIO_IBEACON_TX, GPIO_IBEACON_RX, // HM17 IBEACON Serial interface @@ -275,7 +275,7 @@ const char kSensorNames[] PROGMEM = D_SENSOR_MAX31865_CS "|" D_SENSOR_HRE_CLOCK "|" D_SENSOR_HRE_DATA "|" D_SENSOR_ADE7953_IRQ "|" - D_SENSOR_SOLAXX1_TX "|" D_SENSOR_SOLAXX1_RX "|" + D_SENSOR_SOLAXX1_TX "|" D_SENSOR_SOLAXX1_RX "|" D_SENSOR_SOLAXX1_RTS "|" D_SENSOR_ZIGBEE_TXD "|" D_SENSOR_ZIGBEE_RXD "|" D_SENSOR_RDM6300_RX "|" D_SENSOR_IBEACON_TX "|" D_SENSOR_IBEACON_RX "|" @@ -711,6 +711,7 @@ const uint16_t kGpioNiceList[] PROGMEM = { #ifdef USE_SOLAX_X1 AGPIO(GPIO_SOLAXX1_TX), // Solax Inverter tx pin AGPIO(GPIO_SOLAXX1_RX), // Solax Inverter rx pin + AGPIO(GPIO_SOLAXX1_RTS), // Solax Inverter RTS pin #endif // USE_SOLAX_X1 #ifdef USE_LE01MR AGPIO(GPIO_LE01MR_TX), // F7F LE-01MR energy meter tx pin diff --git a/tasmota/tasmota_template_legacy.h b/tasmota/tasmota_template_legacy.h index 4583a9783..af9afd3f1 100644 --- a/tasmota/tasmota_template_legacy.h +++ b/tasmota/tasmota_template_legacy.h @@ -190,6 +190,7 @@ enum LegacyUserSelectablePins { GPI8_OLED_RESET, // OLED Display Reset GPI8_SOLAXX1_TX, // Solax Inverter tx pin GPI8_SOLAXX1_RX, // Solax Inverter rx pin + GPI8_SOLAXX1_RTS, // Solax Inverter RTS pin GPI8_ZIGBEE_TX, // Zigbee Serial interface GPI8_ZIGBEE_RX, // Zigbee Serial interface GPI8_RDM6300_RX, // RDM6300 RX @@ -420,6 +421,7 @@ const uint16_t kGpioConvert[] PROGMEM = { AGPIO(GPIO_OLED_RESET), // OLED Display Reset AGPIO(GPIO_SOLAXX1_TX), // Solax Inverter tx pin AGPIO(GPIO_SOLAXX1_RX), // Solax Inverter rx pin + AGPIO(GPIO_SOLAXX1_RTS), // Solax Inverter RTS pin AGPIO(GPIO_ZIGBEE_TX), // Zigbee Serial interface AGPIO(GPIO_ZIGBEE_RX), // Zigbee Serial interface AGPIO(GPIO_RDM6300_RX), From 12ecfae94dc2ad32454722242339fe07a47a5972 Mon Sep 17 00:00:00 2001 From: Jason2866 Date: Wed, 5 Jan 2022 23:14:49 +0100 Subject: [PATCH 183/402] copy factory firmware to `build_output` --- pio-tools/name-firmware.py | 9 ++++++++- pio-tools/post_esp32.py | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pio-tools/name-firmware.py b/pio-tools/name-firmware.py index b49def236..dcb1e9d30 100644 --- a/pio-tools/name-firmware.py +++ b/pio-tools/name-firmware.py @@ -14,6 +14,12 @@ def bin_map_copy(source, target, env): map_file = tasmotapiolib.get_final_map_path(env) bin_file = tasmotapiolib.get_final_bin_path(env) + if env["PIOPLATFORM"] == "espressif32": + factory_tmp = pathlib.Path(firsttarget).with_suffix("") + factory = factory_tmp.with_suffix(factory_tmp.suffix + ".factory.bin") + one_bin_tmp = pathlib.Path(bin_file).with_suffix("") + one_bin_file = one_bin_tmp.with_suffix(one_bin_tmp.suffix + ".factory.bin") + # check if new target files exist and remove if necessary for f in [map_file, bin_file]: if f.is_file(): @@ -22,6 +28,7 @@ def bin_map_copy(source, target, env): # copy firmware.bin and map to final destination shutil.copy(firsttarget, bin_file) shutil.move(tasmotapiolib.get_source_map_path(env), map_file) - + if env["PIOPLATFORM"] == "espressif32": + shutil.copy(factory, one_bin_file) env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", bin_map_copy) diff --git a/pio-tools/post_esp32.py b/pio-tools/post_esp32.py index bef91e345..e254f1024 100644 --- a/pio-tools/post_esp32.py +++ b/pio-tools/post_esp32.py @@ -37,7 +37,7 @@ def esp32_create_factory_bin(source, target, env): # - 0xe000 | ~\.platformio\packages\framework-arduinoespressif32\tools\partitions\boot_app0.bin # - 0x10000 | ~\Tasmota\.pio\build\/firmware.bin - new_file_name = env.subst("$BUILD_DIR/${PROGNAME}-factory.bin") + new_file_name = env.subst("$BUILD_DIR/${PROGNAME}.factory.bin") sections = env.subst(env.get('FLASH_EXTRA_IMAGES')) new_file = open(new_file_name,"wb") new_file.truncate() # Make sure no left over data is present from a previous build From 32cc20219a283e34cb86a617879ef056975505ca Mon Sep 17 00:00:00 2001 From: SteWers Date: Thu, 6 Jan 2022 09:52:27 +0100 Subject: [PATCH 184/402] [Solax X1] RTS support and offline status --- tasmota/language/af_AF.h | 1 + tasmota/language/bg_BG.h | 1 + tasmota/language/cs_CZ.h | 1 + tasmota/language/de_DE.h | 1 + tasmota/language/el_GR.h | 1 + tasmota/language/en_GB.h | 1 + tasmota/language/es_ES.h | 1 + tasmota/language/fr_FR.h | 3 ++- tasmota/language/fy_NL.h | 1 + tasmota/language/he_HE.h | 1 + tasmota/language/hu_HU.h | 1 + tasmota/language/it_IT.h | 1 + tasmota/language/ko_KO.h | 1 + tasmota/language/nl_NL.h | 1 + tasmota/language/pl_PL.h | 1 + tasmota/language/pt_BR.h | 1 + tasmota/language/pt_PT.h | 1 + tasmota/language/ro_RO.h | 1 + tasmota/language/ru_RU.h | 1 + tasmota/language/sk_SK.h | 1 + tasmota/language/sv_SE.h | 1 + tasmota/language/tr_TR.h | 1 + tasmota/language/uk_UA.h | 1 + tasmota/language/vi_VN.h | 1 + tasmota/language/zh_CN.h | 1 + tasmota/language/zh_TW.h | 1 + tasmota/xnrg_12_solaxX1.ino | 21 +++++++++++++++++---- 27 files changed, 44 insertions(+), 5 deletions(-) diff --git a/tasmota/language/af_AF.h b/tasmota/language/af_AF.h index b9e290410..271d10364 100644 --- a/tasmota/language/af_AF.h +++ b/tasmota/language/af_AF.h @@ -737,6 +737,7 @@ #define D_SENSOR_ZIGBEE_RST "Zigbee Rst" #define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx" #define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx" +#define D_SENSOR_SOLAXX1_RTS "SolaxX1 RTS" #define D_SENSOR_IBEACON_TX "iBeacon TX" #define D_SENSOR_IBEACON_RX "iBeacon RX" #define D_SENSOR_RDM6300_RX "RDM6300 RX" diff --git a/tasmota/language/bg_BG.h b/tasmota/language/bg_BG.h index fac7105f1..eabffd0e4 100644 --- a/tasmota/language/bg_BG.h +++ b/tasmota/language/bg_BG.h @@ -737,6 +737,7 @@ #define D_SENSOR_ZIGBEE_RST "Zigbee Rst" #define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx" #define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx" +#define D_SENSOR_SOLAXX1_RTS "SolaxX1 RTS" #define D_SENSOR_IBEACON_TX "iBeacon TX" #define D_SENSOR_IBEACON_RX "iBeacon RX" #define D_SENSOR_RDM6300_RX "RDM6300 RX" diff --git a/tasmota/language/cs_CZ.h b/tasmota/language/cs_CZ.h index a297d5f0f..93652d39f 100644 --- a/tasmota/language/cs_CZ.h +++ b/tasmota/language/cs_CZ.h @@ -737,6 +737,7 @@ #define D_SENSOR_ZIGBEE_RST "Zigbee Rst" #define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx" #define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx" +#define D_SENSOR_SOLAXX1_RTS "SolaxX1 RTS" #define D_SENSOR_IBEACON_TX "iBeacon TX" #define D_SENSOR_IBEACON_RX "iBeacon RX" #define D_SENSOR_RDM6300_RX "RDM6300 RX" diff --git a/tasmota/language/de_DE.h b/tasmota/language/de_DE.h index e801818df..0b2715b37 100644 --- a/tasmota/language/de_DE.h +++ b/tasmota/language/de_DE.h @@ -737,6 +737,7 @@ #define D_SENSOR_ZIGBEE_RST "Zigbee Rst" #define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx" #define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx" +#define D_SENSOR_SOLAXX1_RTS "SolaxX1 RTS" #define D_SENSOR_IBEACON_TX "iBeacon TX" #define D_SENSOR_IBEACON_RX "iBeacon RX" #define D_SENSOR_RDM6300_RX "RDM6300 RX" diff --git a/tasmota/language/el_GR.h b/tasmota/language/el_GR.h index b777c0965..3476240ff 100644 --- a/tasmota/language/el_GR.h +++ b/tasmota/language/el_GR.h @@ -737,6 +737,7 @@ #define D_SENSOR_ZIGBEE_RST "Zigbee Rst" #define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx" #define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx" +#define D_SENSOR_SOLAXX1_RTS "SolaxX1 RTS" #define D_SENSOR_IBEACON_TX "iBeacon TX" #define D_SENSOR_IBEACON_RX "iBeacon RX" #define D_SENSOR_RDM6300_RX "RDM6300 RX" diff --git a/tasmota/language/en_GB.h b/tasmota/language/en_GB.h index 128e1c3bf..ee76acf3e 100644 --- a/tasmota/language/en_GB.h +++ b/tasmota/language/en_GB.h @@ -737,6 +737,7 @@ #define D_SENSOR_ZIGBEE_RST "Zigbee Rst" #define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx" #define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx" +#define D_SENSOR_SOLAXX1_RTS "SolaxX1 RTS" #define D_SENSOR_IBEACON_TX "iBeacon TX" #define D_SENSOR_IBEACON_RX "iBeacon RX" #define D_SENSOR_RDM6300_RX "RDM6300 RX" diff --git a/tasmota/language/es_ES.h b/tasmota/language/es_ES.h index f88f62cdb..25d0cd09b 100644 --- a/tasmota/language/es_ES.h +++ b/tasmota/language/es_ES.h @@ -737,6 +737,7 @@ #define D_SENSOR_ZIGBEE_RST "Zigbee Rst" #define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx" #define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx" +#define D_SENSOR_SOLAXX1_RTS "SolaxX1 RTS" #define D_SENSOR_IBEACON_TX "iBeacon TX" #define D_SENSOR_IBEACON_RX "iBeacon RX" #define D_SENSOR_RDM6300_RX "RDM6300 RX" diff --git a/tasmota/language/fr_FR.h b/tasmota/language/fr_FR.h index 01ae71a67..22ad7d585 100644 --- a/tasmota/language/fr_FR.h +++ b/tasmota/language/fr_FR.h @@ -736,7 +736,8 @@ #define D_SENSOR_ZIGBEE_RXD "ZigBee RX" #define D_SENSOR_ZIGBEE_RST "ZigBee RST" #define D_SENSOR_SOLAXX1_TX "SolaxX1 TX" -#define D_SENSOR_SOLAXX1_RX "SolaxX1 RX" +#define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx" +#define D_SENSOR_SOLAXX1_RTS "SolaxX1 RTS" #define D_SENSOR_IBEACON_TX "iBeacon TX" #define D_SENSOR_IBEACON_RX "iBeacon RX" #define D_SENSOR_RDM6300_RX "RDM6300 RX" diff --git a/tasmota/language/fy_NL.h b/tasmota/language/fy_NL.h index 0adcef573..7cb38ceef 100644 --- a/tasmota/language/fy_NL.h +++ b/tasmota/language/fy_NL.h @@ -737,6 +737,7 @@ #define D_SENSOR_ZIGBEE_RST "Zigbee Rst" #define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx" #define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx" +#define D_SENSOR_SOLAXX1_RTS "SolaxX1 RTS" #define D_SENSOR_IBEACON_TX "iBeacon TX" #define D_SENSOR_IBEACON_RX "iBeacon RX" #define D_SENSOR_RDM6300_RX "RDM6300 RX" diff --git a/tasmota/language/he_HE.h b/tasmota/language/he_HE.h index d00bac271..678eaf46b 100644 --- a/tasmota/language/he_HE.h +++ b/tasmota/language/he_HE.h @@ -737,6 +737,7 @@ #define D_SENSOR_ZIGBEE_RST "Zigbee Rst" #define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx" #define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx" +#define D_SENSOR_SOLAXX1_RTS "SolaxX1 RTS" #define D_SENSOR_IBEACON_TX "iBeacon TX" #define D_SENSOR_IBEACON_RX "iBeacon RX" #define D_SENSOR_RDM6300_RX "RDM6300 RX" diff --git a/tasmota/language/hu_HU.h b/tasmota/language/hu_HU.h index 85db8bbce..a59516ad1 100644 --- a/tasmota/language/hu_HU.h +++ b/tasmota/language/hu_HU.h @@ -737,6 +737,7 @@ #define D_SENSOR_ZIGBEE_RST "Zigbee Rst" #define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx" #define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx" +#define D_SENSOR_SOLAXX1_RTS "SolaxX1 RTS" #define D_SENSOR_IBEACON_TX "iBeacon TX" #define D_SENSOR_IBEACON_RX "iBeacon RX" #define D_SENSOR_RDM6300_RX "RDM6300 RX" diff --git a/tasmota/language/it_IT.h b/tasmota/language/it_IT.h index 9fcb4b292..247478aaf 100644 --- a/tasmota/language/it_IT.h +++ b/tasmota/language/it_IT.h @@ -735,6 +735,7 @@ #define D_SENSOR_ZIGBEE_RST "Zigbee - RESET" #define D_SENSOR_SOLAXX1_TX "SolaxX1 - TX" #define D_SENSOR_SOLAXX1_RX "SolaxX1 - RX" +#define D_SENSOR_SOLAXX1_RTS "SolaxX1 - RTS" #define D_SENSOR_IBEACON_TX "iBeacon - TX" #define D_SENSOR_IBEACON_RX "iBeacon - RX" #define D_SENSOR_RDM6300_RX "RDM6300 - RX" diff --git a/tasmota/language/ko_KO.h b/tasmota/language/ko_KO.h index 365480ef5..aa70e5be2 100644 --- a/tasmota/language/ko_KO.h +++ b/tasmota/language/ko_KO.h @@ -737,6 +737,7 @@ #define D_SENSOR_ZIGBEE_RST "Zigbee Rst" #define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx" #define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx" +#define D_SENSOR_SOLAXX1_RTS "SolaxX1 RTS" #define D_SENSOR_IBEACON_TX "iBeacon TX" #define D_SENSOR_IBEACON_RX "iBeacon RX" #define D_SENSOR_RDM6300_RX "RDM6300 RX" diff --git a/tasmota/language/nl_NL.h b/tasmota/language/nl_NL.h index 991187eb4..b721251f7 100644 --- a/tasmota/language/nl_NL.h +++ b/tasmota/language/nl_NL.h @@ -737,6 +737,7 @@ #define D_SENSOR_ZIGBEE_RST "Zigbee Rst" #define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx" #define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx" +#define D_SENSOR_SOLAXX1_RTS "SolaxX1 RTS" #define D_SENSOR_IBEACON_TX "iBeacon TX" #define D_SENSOR_IBEACON_RX "iBeacon RX" #define D_SENSOR_RDM6300_RX "RDM6300 RX" diff --git a/tasmota/language/pl_PL.h b/tasmota/language/pl_PL.h index 770606fd8..a9794adad 100644 --- a/tasmota/language/pl_PL.h +++ b/tasmota/language/pl_PL.h @@ -737,6 +737,7 @@ #define D_SENSOR_ZIGBEE_RST "Zigbee Rst" #define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx" #define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx" +#define D_SENSOR_SOLAXX1_RTS "SolaxX1 RTS" #define D_SENSOR_IBEACON_TX "iBeacon TX" #define D_SENSOR_IBEACON_RX "iBeacon RX" #define D_SENSOR_RDM6300_RX "RDM6300 RX" diff --git a/tasmota/language/pt_BR.h b/tasmota/language/pt_BR.h index bb039ff4d..ab86c23a3 100644 --- a/tasmota/language/pt_BR.h +++ b/tasmota/language/pt_BR.h @@ -737,6 +737,7 @@ #define D_SENSOR_ZIGBEE_RST "Zigbee Rst" #define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx" #define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx" +#define D_SENSOR_SOLAXX1_RTS "SolaxX1 RTS" #define D_SENSOR_IBEACON_TX "iBeacon TX" #define D_SENSOR_IBEACON_RX "iBeacon RX" #define D_SENSOR_RDM6300_RX "RDM6300 RX" diff --git a/tasmota/language/pt_PT.h b/tasmota/language/pt_PT.h index 89da9f494..c0556a582 100644 --- a/tasmota/language/pt_PT.h +++ b/tasmota/language/pt_PT.h @@ -737,6 +737,7 @@ #define D_SENSOR_ZIGBEE_RST "Zigbee Rst" #define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx" #define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx" +#define D_SENSOR_SOLAXX1_RTS "SolaxX1 RTS" #define D_SENSOR_IBEACON_TX "iBeacon TX" #define D_SENSOR_IBEACON_RX "iBeacon RX" #define D_SENSOR_RDM6300_RX "RDM6300 RX" diff --git a/tasmota/language/ro_RO.h b/tasmota/language/ro_RO.h index 16e8f042b..2aea98777 100644 --- a/tasmota/language/ro_RO.h +++ b/tasmota/language/ro_RO.h @@ -737,6 +737,7 @@ #define D_SENSOR_ZIGBEE_RST "Zigbee Rst" #define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx" #define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx" +#define D_SENSOR_SOLAXX1_RTS "SolaxX1 RTS" #define D_SENSOR_IBEACON_TX "iBeacon TX" #define D_SENSOR_IBEACON_RX "iBeacon RX" #define D_SENSOR_RDM6300_RX "RDM6300 RX" diff --git a/tasmota/language/ru_RU.h b/tasmota/language/ru_RU.h index 56233f278..44b4cda04 100644 --- a/tasmota/language/ru_RU.h +++ b/tasmota/language/ru_RU.h @@ -737,6 +737,7 @@ #define D_SENSOR_ZIGBEE_RST "Zigbee Rst" #define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx" #define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx" +#define D_SENSOR_SOLAXX1_RTS "SolaxX1 RTS" #define D_SENSOR_IBEACON_TX "iBeacon TX" #define D_SENSOR_IBEACON_RX "iBeacon RX" #define D_SENSOR_RDM6300_RX "RDM6300 RX" diff --git a/tasmota/language/sk_SK.h b/tasmota/language/sk_SK.h index b3a1098e5..93b2f989e 100644 --- a/tasmota/language/sk_SK.h +++ b/tasmota/language/sk_SK.h @@ -737,6 +737,7 @@ #define D_SENSOR_ZIGBEE_RST "Zigbee Rst" #define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx" #define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx" +#define D_SENSOR_SOLAXX1_RTS "SolaxX1 RTS" #define D_SENSOR_IBEACON_TX "iBeacon TX" #define D_SENSOR_IBEACON_RX "iBeacon RX" #define D_SENSOR_RDM6300_RX "RDM6300 RX" diff --git a/tasmota/language/sv_SE.h b/tasmota/language/sv_SE.h index aaf32fbde..8e28f96c5 100644 --- a/tasmota/language/sv_SE.h +++ b/tasmota/language/sv_SE.h @@ -737,6 +737,7 @@ #define D_SENSOR_ZIGBEE_RST "Zigbee Rst" #define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx" #define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx" +#define D_SENSOR_SOLAXX1_RTS "SolaxX1 RTS" #define D_SENSOR_IBEACON_TX "iBeacon TX" #define D_SENSOR_IBEACON_RX "iBeacon RX" #define D_SENSOR_RDM6300_RX "RDM6300 RX" diff --git a/tasmota/language/tr_TR.h b/tasmota/language/tr_TR.h index b9b2b7256..aae233362 100644 --- a/tasmota/language/tr_TR.h +++ b/tasmota/language/tr_TR.h @@ -737,6 +737,7 @@ #define D_SENSOR_ZIGBEE_RST "Zigbee Rst" #define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx" #define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx" +#define D_SENSOR_SOLAXX1_RTS "SolaxX1 RTS" #define D_SENSOR_IBEACON_TX "iBeacon TX" #define D_SENSOR_IBEACON_RX "iBeacon RX" #define D_SENSOR_RDM6300_RX "RDM6300 RX" diff --git a/tasmota/language/uk_UA.h b/tasmota/language/uk_UA.h index c404a9643..6a6d3d4cd 100644 --- a/tasmota/language/uk_UA.h +++ b/tasmota/language/uk_UA.h @@ -737,6 +737,7 @@ #define D_SENSOR_ZIGBEE_RST "Zigbee Rst" #define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx" #define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx" +#define D_SENSOR_SOLAXX1_RTS "SolaxX1 RTS" #define D_SENSOR_IBEACON_TX "iBeacon TX" #define D_SENSOR_IBEACON_RX "iBeacon RX" #define D_SENSOR_RDM6300_RX "RDM6300 RX" diff --git a/tasmota/language/vi_VN.h b/tasmota/language/vi_VN.h index 3bc724566..551307049 100644 --- a/tasmota/language/vi_VN.h +++ b/tasmota/language/vi_VN.h @@ -737,6 +737,7 @@ #define D_SENSOR_ZIGBEE_RST "Zigbee Rst" #define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx" #define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx" +#define D_SENSOR_SOLAXX1_RTS "SolaxX1 RTS" #define D_SENSOR_IBEACON_TX "iBeacon TX" #define D_SENSOR_IBEACON_RX "iBeacon RX" #define D_SENSOR_RDM6300_RX "RDM6300 RX" diff --git a/tasmota/language/zh_CN.h b/tasmota/language/zh_CN.h index d2d9f0d97..40120a356 100644 --- a/tasmota/language/zh_CN.h +++ b/tasmota/language/zh_CN.h @@ -737,6 +737,7 @@ #define D_SENSOR_ZIGBEE_RST "Zigbee Rst" #define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx" #define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx" +#define D_SENSOR_SOLAXX1_RTS "SolaxX1 RTS" #define D_SENSOR_IBEACON_TX "iBeacon TX" #define D_SENSOR_IBEACON_RX "iBeacon RX" #define D_SENSOR_RDM6300_RX "RDM6300 RX" diff --git a/tasmota/language/zh_TW.h b/tasmota/language/zh_TW.h index 39f468e0b..89368d38e 100644 --- a/tasmota/language/zh_TW.h +++ b/tasmota/language/zh_TW.h @@ -737,6 +737,7 @@ #define D_SENSOR_ZIGBEE_RST "Zigbee Rst" #define D_SENSOR_SOLAXX1_TX "SolaxX1 Tx" #define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx" +#define D_SENSOR_SOLAXX1_RTS "SolaxX1 RTS" #define D_SENSOR_IBEACON_TX "iBeacon TX" #define D_SENSOR_IBEACON_RX "iBeacon RX" #define D_SENSOR_RDM6300_RX "RDM6300 RX" diff --git a/tasmota/xnrg_12_solaxX1.ino b/tasmota/xnrg_12_solaxX1.ino index 3ee4c9f47..7637ac6cc 100644 --- a/tasmota/xnrg_12_solaxX1.ino +++ b/tasmota/xnrg_12_solaxX1.ino @@ -83,7 +83,7 @@ union { }; } ErrCode; -const char kSolaxMode[] PROGMEM = D_WAITING "|" D_CHECKING "|" D_WORKING "|" D_FAILURE; +const char kSolaxMode[] PROGMEM = D_WAITING "|" D_CHECKING "|" D_WORKING "|" D_FAILURE "|" D_OFF; const char kSolaxError[] PROGMEM = D_SOLAX_ERROR_0 "|" D_SOLAX_ERROR_1 "|" D_SOLAX_ERROR_2 "|" D_SOLAX_ERROR_3 "|" D_SOLAX_ERROR_4 "|" D_SOLAX_ERROR_5 "|" @@ -155,10 +155,19 @@ void solaxX1_RS485Send(uint16_t msgLen) solaxX1Serial->read(); } + if (PinUsed(GPIO_SOLAXX1_RTS)) { + AddLog(LOG_LEVEL_DEBUG, PSTR("SX1: RTS-high")); + digitalWrite(Pin(GPIO_SOLAXX1_RTS), HIGH); + } solaxX1Serial->flush(); solaxX1Serial->write(message, msgLen); solaxX1Serial->write(highByte(crc)); solaxX1Serial->write(lowByte(crc)); + solaxX1Serial->flush(); + if (PinUsed(GPIO_SOLAXX1_RTS)) { + digitalWrite(Pin(GPIO_SOLAXX1_RTS), LOW); + } + AddLogBuffer(LOG_LEVEL_DEBUG_MORE, message, msgLen); } @@ -363,8 +372,8 @@ void solaxX1250MSecond(void) // Every 250 milliseconds Energy.data_valid[0] = ENERGY_WATCHDOG; solaxX1.temperature = solaxX1.dc1_voltage = solaxX1.dc2_voltage = solaxX1.dc1_current = solaxX1.dc2_current = solaxX1.dc1_power = 0; - solaxX1.dc2_power = solaxX1.status = Energy.current[0] = Energy.voltage[0] = Energy.frequency[0] = Energy.active_power[0] = 0; - //solaxX1.energy_today = solaxX1.runtime_total = 0; + solaxX1.dc2_power = Energy.current[0] = Energy.voltage[0] = Energy.frequency[0] = Energy.active_power[0] = 0; + solaxX1.status = 4; // off(line) } else { if (protocolStatus.queryOfflineSend) { protocolStatus.status = 0b00001000; // queryOffline @@ -380,7 +389,8 @@ void solaxX1250MSecond(void) // Every 250 milliseconds void solaxX1SnsInit(void) { AddLog(LOG_LEVEL_DEBUG, PSTR("SX1: Solax X1 Inverter Init")); - DEBUG_SENSOR_LOG(PSTR("SX1: RX pin: %d, TX pin: %d"), Pin(GPIO_SOLAXX1_RX), Pin(GPIO_SOLAXX1_TX)); + AddLog(LOG_LEVEL_DEBUG, PSTR("SX1: RX-pin: %d, TX-pin: %d, RTS-pin: %d"), Pin(GPIO_SOLAXX1_RX), Pin(GPIO_SOLAXX1_TX), Pin(GPIO_SOLAXX1_RTS)); +// DEBUG_SENSOR_LOG(PSTR("SX1: RX pin: %d, TX pin: %d"), Pin(GPIO_SOLAXX1_RX), Pin(GPIO_SOLAXX1_TX)); protocolStatus.status = 0b00100000; // hasAddress solaxX1Serial = new TasmotaSerial(Pin(GPIO_SOLAXX1_RX), Pin(GPIO_SOLAXX1_TX), 1); @@ -389,6 +399,9 @@ void solaxX1SnsInit(void) } else { TasmotaGlobal.energy_driver = ENERGY_NONE; } + if (PinUsed(GPIO_SOLAXX1_RTS)) { + pinMode(Pin(GPIO_SOLAXX1_RTS), OUTPUT); + } } void solaxX1DrvInit(void) From aa7750997a8ea7cb51f0c0f863bc6f0b75425b42 Mon Sep 17 00:00:00 2001 From: SteWers Date: Thu, 6 Jan 2022 10:08:44 +0100 Subject: [PATCH 185/402] RTS support and offline status (Fix#1) --- tasmota/language/fr_FR.h | 2 +- tasmota/xnrg_12_solaxX1.ino | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tasmota/language/fr_FR.h b/tasmota/language/fr_FR.h index 22ad7d585..e14c37c41 100644 --- a/tasmota/language/fr_FR.h +++ b/tasmota/language/fr_FR.h @@ -736,7 +736,7 @@ #define D_SENSOR_ZIGBEE_RXD "ZigBee RX" #define D_SENSOR_ZIGBEE_RST "ZigBee RST" #define D_SENSOR_SOLAXX1_TX "SolaxX1 TX" -#define D_SENSOR_SOLAXX1_RX "SolaxX1 Rx" +#define D_SENSOR_SOLAXX1_RX "SolaxX1 RX" #define D_SENSOR_SOLAXX1_RTS "SolaxX1 RTS" #define D_SENSOR_IBEACON_TX "iBeacon TX" #define D_SENSOR_IBEACON_RX "iBeacon RX" diff --git a/tasmota/xnrg_12_solaxX1.ino b/tasmota/xnrg_12_solaxX1.ino index 7637ac6cc..534de4e47 100644 --- a/tasmota/xnrg_12_solaxX1.ino +++ b/tasmota/xnrg_12_solaxX1.ino @@ -156,7 +156,6 @@ void solaxX1_RS485Send(uint16_t msgLen) } if (PinUsed(GPIO_SOLAXX1_RTS)) { - AddLog(LOG_LEVEL_DEBUG, PSTR("SX1: RTS-high")); digitalWrite(Pin(GPIO_SOLAXX1_RTS), HIGH); } solaxX1Serial->flush(); From 0ef2aeaeba2040d8eef40a55c78954963963e032 Mon Sep 17 00:00:00 2001 From: SteWers Date: Thu, 6 Jan 2022 10:24:47 +0100 Subject: [PATCH 186/402] Revert my_user_config.h --- tasmota/my_user_config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h index 7fadf4b9e..2abd67f60 100644 --- a/tasmota/my_user_config.h +++ b/tasmota/my_user_config.h @@ -788,9 +788,9 @@ #define DDS2382_SPEED 9600 // Hiking DDS2382 Modbus RS485 serial speed (default: 9600 baud) //#define USE_DDSU666 // Add support for Chint DDSU666 Modbus energy monitor (+0k6 code) #define DDSU666_SPEED 9600 // Chint DDSU666 Modbus RS485 serial speed (default: 9600 baud) -#define USE_SOLAX_X1 // Add support for Solax X1 series Modbus log info (+3k1 code) +// #define USE_SOLAX_X1 // Add support for Solax X1 series Modbus log info (+3k1 code) #define SOLAXX1_SPEED 9600 // Solax X1 Modbus RS485 serial speed (default: 9600 baud) -// #define SOLAXX1_PV2 // Solax X1 using second PV + #define SOLAXX1_PV2 // Solax X1 using second PV //#define USE_LE01MR // Add support for F&F LE-01MR Modbus energy monitor (+1k code) #define LE01MR_SPEED 9600 // LE-01MR modbus baudrate (default: 9600) #define LE01MR_ADDR 1 // LE-01MR modbus address (default: 0x01) From 34112c833a9f5c840137a5d4008968af3186f464 Mon Sep 17 00:00:00 2001 From: SteWers <42718143+SteWers@users.noreply.github.com> Date: Thu, 6 Jan 2022 10:33:45 +0100 Subject: [PATCH 187/402] Update my_user_config.h --- tasmota/my_user_config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h index 2abd67f60..1cf048513 100644 --- a/tasmota/my_user_config.h +++ b/tasmota/my_user_config.h @@ -788,7 +788,7 @@ #define DDS2382_SPEED 9600 // Hiking DDS2382 Modbus RS485 serial speed (default: 9600 baud) //#define USE_DDSU666 // Add support for Chint DDSU666 Modbus energy monitor (+0k6 code) #define DDSU666_SPEED 9600 // Chint DDSU666 Modbus RS485 serial speed (default: 9600 baud) -// #define USE_SOLAX_X1 // Add support for Solax X1 series Modbus log info (+3k1 code) +//#define USE_SOLAX_X1 // Add support for Solax X1 series Modbus log info (+3k1 code) #define SOLAXX1_SPEED 9600 // Solax X1 Modbus RS485 serial speed (default: 9600 baud) #define SOLAXX1_PV2 // Solax X1 using second PV //#define USE_LE01MR // Add support for F&F LE-01MR Modbus energy monitor (+1k code) From 6755b754e0726c237b0f93a4ba356cb7b88aef2e Mon Sep 17 00:00:00 2001 From: Stephan Hadinger Date: Thu, 6 Jan 2022 13:41:51 +0100 Subject: [PATCH 188/402] Berry stores compiled bytecode into IRAM, freeing space in heap --- CHANGELOG.md | 1 + lib/libesp32/berry/default/berry_conf.h | 5 ++++- lib/libesp32/berry/src/be_parser.c | 6 +++--- lib/libesp32/berry/src/be_vector.c | 26 +++++++++++++++++++++++++ lib/libesp32/berry/src/be_vector.h | 1 + tasmota/my_user_config.h | 1 + tasmota/support_esp.ino | 11 +++++++++++ tasmota/xdrv_52_9_berry.ino | 23 ++++++++++++++++++++++ 8 files changed, 70 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25ff22862..0ca946200 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file. - PubSubClient library from v2.8.12 to v2.8.13 - From Semantic Versioning (SemVer) to Calendar Versioning (CalVer) - Set ESP32 stack size with ``#define SET_ESP32_STACK_SIZE``, added ``StackLowMark`` metrics +- Berry stores compiled bytecode into IRAM, freeing space in heap ### Fixed - Intermittent exceptions and heap corruption due to PubSubClient library buffer overflow (#13700) diff --git a/lib/libesp32/berry/default/berry_conf.h b/lib/libesp32/berry/default/berry_conf.h index 607a9c612..d796dce02 100644 --- a/lib/libesp32/berry/default/berry_conf.h +++ b/lib/libesp32/berry/default/berry_conf.h @@ -214,6 +214,9 @@ extern "C" { extern void *berry_malloc(size_t size); extern void berry_free(void *ptr); extern void *berry_realloc(void *ptr, size_t size); + extern void *berry_malloc32(size_t size); + extern void berry_free32(void *ptr); + extern void *berry_realloc32(void *ptr, size_t size); #ifdef __cplusplus } #endif @@ -241,7 +244,7 @@ extern "C" { /* Tasmota debug specific */ #ifdef USE_BERRY_DEBUG #undef BE_DEBUG_RUNTIME_INFO - #define BE_DEBUG_RUNTIME_INFO 2 /* record line information in 16 bits */ + #define BE_DEBUG_RUNTIME_INFO 1 /* record line information in 32 bits to be places in IRAM */ #endif // USE_BERRY_DEBUG #endif diff --git a/lib/libesp32/berry/src/be_parser.c b/lib/libesp32/berry/src/be_parser.c index 094a5adef..19b619f4b 100644 --- a/lib/libesp32/berry/src/be_parser.c +++ b/lib/libesp32/berry/src/be_parser.c @@ -313,14 +313,14 @@ static void end_func(bparser *parser) be_code_ret(finfo, NULL); /* append a return to last code */ end_block(parser); /* close block */ setupvals(finfo); /* close upvals */ - proto->code = be_vector_release(vm, &finfo->code); /* compact all vectors and return NULL if empty */ + proto->code = be_vector_release_32(vm, &finfo->code); /* compact all vectors and return NULL if empty */ proto->codesize = finfo->pc; - proto->ktab = be_vector_release(vm, &finfo->kvec); + proto->ktab = be_vector_release_32(vm, &finfo->kvec); proto->nconst = be_vector_count(&finfo->kvec); proto->ptab = be_vector_release(vm, &finfo->pvec); proto->nproto = be_vector_count(&finfo->pvec); #if BE_DEBUG_RUNTIME_INFO - proto->lineinfo = be_vector_release(vm, &finfo->linevec); + proto->lineinfo = be_vector_release_32(vm, &finfo->linevec); proto->nlineinfo = be_vector_count(&finfo->linevec); #endif #if BE_DEBUG_VAR_INFO diff --git a/lib/libesp32/berry/src/be_vector.c b/lib/libesp32/berry/src/be_vector.c index b73479601..b415b9c53 100644 --- a/lib/libesp32/berry/src/be_vector.c +++ b/lib/libesp32/berry/src/be_vector.c @@ -110,6 +110,32 @@ void* be_vector_release(bvm *vm, bvector *vector) return vector->data; } +/* free not used */ +void* be_vector_release_32(bvm *vm, bvector *vector) +{ + size_t size = vector->size; + int count = be_vector_count(vector); + if (count == 0) { + be_free(vm, vector->data, vector->capacity * size); + vector->capacity = 0; + vector->data = NULL; + vector->end = NULL; + } else if (count < vector->capacity) { + vector->data = be_realloc(vm, + vector->data, vector->capacity * size, count * size); // TODO - can we skip that step? + void* iram = berry_malloc32(count * size); + if (iram) { + memcpy(iram, vector->data, count * size); + free(vector->data); + vector->data = iram; + } + // vm->gc.usage = vm->gc.usage + count * size - vector->capacity * size; /* update allocated count */ + vector->end = (char*)vector->data + ((size_t)count - 1) * size; + vector->capacity = count; + } + return vector->data; +} + /* use binary search to find the vector capacity between 0-1024 */ static int binary_search(int value) { diff --git a/lib/libesp32/berry/src/be_vector.h b/lib/libesp32/berry/src/be_vector.h index 15f399cc6..3991986ca 100644 --- a/lib/libesp32/berry/src/be_vector.h +++ b/lib/libesp32/berry/src/be_vector.h @@ -38,6 +38,7 @@ void be_vector_remove_end(bvector *vector); void be_vector_resize(bvm *vm, bvector *vector, int count); void be_vector_clear(bvector *vector); void* be_vector_release(bvm *vm, bvector *vector); +void* be_vector_release_32(bvm *vm, bvector *vector); /* specialized call for 32 bits aligned accesses */ int be_nextsize(int value); #endif diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h index 1cf048513..099248267 100644 --- a/tasmota/my_user_config.h +++ b/tasmota/my_user_config.h @@ -1009,6 +1009,7 @@ #define USE_BERRY_PYTHON_COMPAT // Enable by default `import python_compat` #define USE_BERRY_TIMEOUT 4000 // Timeout in ms, will raise an exception if running time exceeds this timeout #define USE_BERRY_PSRAM // Allocate Berry memory in PSRAM if PSRAM is connected - this might be slightly slower but leaves main memory intact + #define USE_BERRY_IRAM // Allocate some data structures in IRAM (which is ususally unused) when possible and if no PSRAM is available // #define USE_BERRY_DEBUG // Compile Berry bytecode with line number information, makes exceptions easier to debug. Adds +8% of memory consumption for compiled code #define USE_WEBCLIENT // Enable `webclient` to make HTTP/HTTPS requests. Can be disabled for security reasons. // #define USE_WEBCLIENT_HTTPS // Enable HTTPS outgoing requests based on BearSSL (much ligher then mbedTLS, 42KB vs 150KB) in insecure mode (no verification of server's certificate) diff --git a/tasmota/support_esp.ino b/tasmota/support_esp.ino index e3a3ba943..71dff7fcb 100644 --- a/tasmota/support_esp.ino +++ b/tasmota/support_esp.ino @@ -503,6 +503,17 @@ void *special_calloc(size_t num, size_t size) { } } +// Variants for IRAM heap, which need all accesses to be 32 bits aligned +void *special_malloc32(uint32_t size) { + return heap_caps_malloc(size, UsePSRAM() ? MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT : MALLOC_CAP_32BIT); +} +void *special_realloc32(void *ptr, size_t size) { + return heap_caps_realloc(ptr, size, UsePSRAM() ? MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT : MALLOC_CAP_32BIT); +} +void *special_calloc32(size_t num, size_t size) { + return heap_caps_calloc(num, size, UsePSRAM() ? MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT : MALLOC_CAP_32BIT); +} + float CpuTemperature(void) { #ifdef CONFIG_IDF_TARGET_ESP32 return (float)temperatureRead(); // In Celsius diff --git a/tasmota/xdrv_52_9_berry.ino b/tasmota/xdrv_52_9_berry.ino index c48ab561d..dcbde05ca 100644 --- a/tasmota/xdrv_52_9_berry.ino +++ b/tasmota/xdrv_52_9_berry.ino @@ -84,6 +84,29 @@ extern "C" { } #endif // USE_BERRY_PSRAM + + void *berry_malloc32(uint32_t size) { + #ifdef USE_BERRY_IRAM + return special_malloc32(size); + #else + return special_malloc(size); + #endif + } + void *berry_realloc32(void *ptr, size_t size) { + #ifdef USE_BERRY_IRAM + return special_realloc32(ptr, size); + #else + return special_realloc(ptr, size); + #endif + } + void *berry_calloc32(size_t num, size_t size) { + #ifdef USE_BERRY_IRAM + return special_calloc32(num, size); + #else + return special_calloc(num, size); + #endif + } + void berry_free(void *ptr) { free(ptr); } From 479b378707da6ac40b759ba0c60a76f56ee1cf93 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Thu, 6 Jan 2022 14:06:56 +0100 Subject: [PATCH 189/402] Fix Modbus serial config --- CHANGELOG.md | 7 +++++-- RELEASENOTES.md | 4 ++++ .../{TasmotaSerial-3.3.0 => TasmotaSerial-3.4.0}/README.md | 0 .../examples/swsertest/swsertest.ino | 0 .../keywords.txt | 0 .../library.json | 2 +- .../library.properties | 2 +- .../src/TasmotaSerial.cpp | 0 .../src/TasmotaSerial.h | 0 .../{TasmotaModbus-1.2.0 => TasmotaModbus-3.4.0}/README.md | 0 .../examples/modbustest/modbustest.ino | 0 .../keywords.txt | 0 .../library.json | 2 +- .../library.properties | 2 +- .../src/TasmotaModbus.cpp | 4 ++-- .../src/TasmotaModbus.h | 2 +- 16 files changed, 16 insertions(+), 9 deletions(-) rename lib/default/{TasmotaSerial-3.3.0 => TasmotaSerial-3.4.0}/README.md (100%) rename lib/default/{TasmotaSerial-3.3.0 => TasmotaSerial-3.4.0}/examples/swsertest/swsertest.ino (100%) rename lib/default/{TasmotaSerial-3.3.0 => TasmotaSerial-3.4.0}/keywords.txt (100%) rename lib/default/{TasmotaSerial-3.3.0 => TasmotaSerial-3.4.0}/library.json (94%) rename lib/default/{TasmotaSerial-3.3.0 => TasmotaSerial-3.4.0}/library.properties (94%) rename lib/default/{TasmotaSerial-3.3.0 => TasmotaSerial-3.4.0}/src/TasmotaSerial.cpp (100%) rename lib/default/{TasmotaSerial-3.3.0 => TasmotaSerial-3.4.0}/src/TasmotaSerial.h (100%) rename lib/lib_basic/{TasmotaModbus-1.2.0 => TasmotaModbus-3.4.0}/README.md (100%) rename lib/lib_basic/{TasmotaModbus-1.2.0 => TasmotaModbus-3.4.0}/examples/modbustest/modbustest.ino (100%) rename lib/lib_basic/{TasmotaModbus-1.2.0 => TasmotaModbus-3.4.0}/keywords.txt (100%) rename lib/lib_basic/{TasmotaModbus-1.2.0 => TasmotaModbus-3.4.0}/library.json (93%) rename lib/lib_basic/{TasmotaModbus-1.2.0 => TasmotaModbus-3.4.0}/library.properties (93%) rename lib/lib_basic/{TasmotaModbus-1.2.0 => TasmotaModbus-3.4.0}/src/TasmotaModbus.cpp (98%) rename lib/lib_basic/{TasmotaModbus-1.2.0 => TasmotaModbus-3.4.0}/src/TasmotaModbus.h (96%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ca946200..c2c5c0388 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,12 +9,15 @@ All notable changes to this project will be documented in this file. ### Changed - PubSubClient library from v2.8.12 to v2.8.13 +- TasmotaSerial library from v3.3.0 to v3.4.0 +- TasmotaModbus library from v1.2.0 to v3.4.0 - From Semantic Versioning (SemVer) to Calendar Versioning (CalVer) -- Set ESP32 stack size with ``#define SET_ESP32_STACK_SIZE``, added ``StackLowMark`` metrics -- Berry stores compiled bytecode into IRAM, freeing space in heap +- ESP32 Set stack size with ``#define SET_ESP32_STACK_SIZE``, added ``StackLowMark`` metrics +- ESP32 Berry stores compiled bytecode into IRAM, freeing space in heap (#14307) ### Fixed - Intermittent exceptions and heap corruption due to PubSubClient library buffer overflow (#13700) +- Modbus serial config regression from v10.1.0.3 ## [10.1.0.3] 20211231 ### Added diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 2563a54b2..34a441891 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -114,11 +114,15 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo ### Changed - PubSubClient library from v2.8.12 to v2.8.13 +- TasmotaSerial library from v3.3.0 to v3.4.0 +- TasmotaModbus library from v1.2.0 to v3.4.0 - ESP8266Audio library from v1.9.2 to v1.9.5 - ESP8266SAM library from v1.0 to v1.0.1 - From Semantic Versioning (SemVer) to Calendar Versioning (CalVer) - Mitsubishi HVAC temperature resolution [#13936](https://github.com/arendst/Tasmota/issues/13936) - Remove restriction of topic must differ from mqttclient [#14019](https://github.com/arendst/Tasmota/issues/14019) +- ESP32 Set stack size with ``#define SET_ESP32_STACK_SIZE``, added ``StackLowMark`` metrics +- ESP32 Berry stores compiled bytecode into IRAM, freeing space in heap [#14307](https://github.com/arendst/Tasmota/issues/14307) ### Fixed - Intermittent exceptions and heap corruption due to PubSubClient library buffer overflow [#13700](https://github.com/arendst/Tasmota/issues/13700) diff --git a/lib/default/TasmotaSerial-3.3.0/README.md b/lib/default/TasmotaSerial-3.4.0/README.md similarity index 100% rename from lib/default/TasmotaSerial-3.3.0/README.md rename to lib/default/TasmotaSerial-3.4.0/README.md diff --git a/lib/default/TasmotaSerial-3.3.0/examples/swsertest/swsertest.ino b/lib/default/TasmotaSerial-3.4.0/examples/swsertest/swsertest.ino similarity index 100% rename from lib/default/TasmotaSerial-3.3.0/examples/swsertest/swsertest.ino rename to lib/default/TasmotaSerial-3.4.0/examples/swsertest/swsertest.ino diff --git a/lib/default/TasmotaSerial-3.3.0/keywords.txt b/lib/default/TasmotaSerial-3.4.0/keywords.txt similarity index 100% rename from lib/default/TasmotaSerial-3.3.0/keywords.txt rename to lib/default/TasmotaSerial-3.4.0/keywords.txt diff --git a/lib/default/TasmotaSerial-3.3.0/library.json b/lib/default/TasmotaSerial-3.4.0/library.json similarity index 94% rename from lib/default/TasmotaSerial-3.3.0/library.json rename to lib/default/TasmotaSerial-3.4.0/library.json index f6d1aaaeb..e9e2294fb 100644 --- a/lib/default/TasmotaSerial-3.3.0/library.json +++ b/lib/default/TasmotaSerial-3.4.0/library.json @@ -1,6 +1,6 @@ { "name": "TasmotaSerial", - "version": "3.3.0", + "version": "3.4.0", "keywords": [ "serial", "io", "TasmotaSerial" ], diff --git a/lib/default/TasmotaSerial-3.3.0/library.properties b/lib/default/TasmotaSerial-3.4.0/library.properties similarity index 94% rename from lib/default/TasmotaSerial-3.3.0/library.properties rename to lib/default/TasmotaSerial-3.4.0/library.properties index 6b43764a6..d254a7355 100644 --- a/lib/default/TasmotaSerial-3.3.0/library.properties +++ b/lib/default/TasmotaSerial-3.4.0/library.properties @@ -1,5 +1,5 @@ name=TasmotaSerial -version=3.3.0 +version=3.4.0 author=Theo Arends maintainer=Theo Arends sentence=Implementation of software serial with hardware serial fallback for ESP8266 and ESP32. diff --git a/lib/default/TasmotaSerial-3.3.0/src/TasmotaSerial.cpp b/lib/default/TasmotaSerial-3.4.0/src/TasmotaSerial.cpp similarity index 100% rename from lib/default/TasmotaSerial-3.3.0/src/TasmotaSerial.cpp rename to lib/default/TasmotaSerial-3.4.0/src/TasmotaSerial.cpp diff --git a/lib/default/TasmotaSerial-3.3.0/src/TasmotaSerial.h b/lib/default/TasmotaSerial-3.4.0/src/TasmotaSerial.h similarity index 100% rename from lib/default/TasmotaSerial-3.3.0/src/TasmotaSerial.h rename to lib/default/TasmotaSerial-3.4.0/src/TasmotaSerial.h diff --git a/lib/lib_basic/TasmotaModbus-1.2.0/README.md b/lib/lib_basic/TasmotaModbus-3.4.0/README.md similarity index 100% rename from lib/lib_basic/TasmotaModbus-1.2.0/README.md rename to lib/lib_basic/TasmotaModbus-3.4.0/README.md diff --git a/lib/lib_basic/TasmotaModbus-1.2.0/examples/modbustest/modbustest.ino b/lib/lib_basic/TasmotaModbus-3.4.0/examples/modbustest/modbustest.ino similarity index 100% rename from lib/lib_basic/TasmotaModbus-1.2.0/examples/modbustest/modbustest.ino rename to lib/lib_basic/TasmotaModbus-3.4.0/examples/modbustest/modbustest.ino diff --git a/lib/lib_basic/TasmotaModbus-1.2.0/keywords.txt b/lib/lib_basic/TasmotaModbus-3.4.0/keywords.txt similarity index 100% rename from lib/lib_basic/TasmotaModbus-1.2.0/keywords.txt rename to lib/lib_basic/TasmotaModbus-3.4.0/keywords.txt diff --git a/lib/lib_basic/TasmotaModbus-1.2.0/library.json b/lib/lib_basic/TasmotaModbus-3.4.0/library.json similarity index 93% rename from lib/lib_basic/TasmotaModbus-1.2.0/library.json rename to lib/lib_basic/TasmotaModbus-3.4.0/library.json index 3c28959ea..9c93d13b5 100644 --- a/lib/lib_basic/TasmotaModbus-1.2.0/library.json +++ b/lib/lib_basic/TasmotaModbus-3.4.0/library.json @@ -1,6 +1,6 @@ { "name": "TasmotaModbus", - "version": "1.2.0", + "version": "3.4.0", "keywords": [ "serial", "io", "TasmotaModbus" ], diff --git a/lib/lib_basic/TasmotaModbus-1.2.0/library.properties b/lib/lib_basic/TasmotaModbus-3.4.0/library.properties similarity index 93% rename from lib/lib_basic/TasmotaModbus-1.2.0/library.properties rename to lib/lib_basic/TasmotaModbus-3.4.0/library.properties index 7ac182843..748962a53 100644 --- a/lib/lib_basic/TasmotaModbus-1.2.0/library.properties +++ b/lib/lib_basic/TasmotaModbus-3.4.0/library.properties @@ -1,5 +1,5 @@ name=TasmotaModbus -version=1.2.0 +version=3.4.0 author=Theo Arends maintainer=Theo Arends sentence=Basic modbus wrapper for TasmotaSerial for ESP8266. diff --git a/lib/lib_basic/TasmotaModbus-1.2.0/src/TasmotaModbus.cpp b/lib/lib_basic/TasmotaModbus-3.4.0/src/TasmotaModbus.cpp similarity index 98% rename from lib/lib_basic/TasmotaModbus-1.2.0/src/TasmotaModbus.cpp rename to lib/lib_basic/TasmotaModbus-3.4.0/src/TasmotaModbus.cpp index 8c2180505..bd9b7a06b 100644 --- a/lib/lib_basic/TasmotaModbus-1.2.0/src/TasmotaModbus.cpp +++ b/lib/lib_basic/TasmotaModbus-3.4.0/src/TasmotaModbus.cpp @@ -42,11 +42,11 @@ uint16_t TasmotaModbus::CalculateCRC(uint8_t *frame, uint8_t num) return crc; } -int TasmotaModbus::Begin(long speed, int stop_bits) +int TasmotaModbus::Begin(long speed, uint32_t config) { int result = 0; - if (begin(speed, stop_bits)) { + if (begin(speed, config)) { result = 1; if (hardwareSerial()) { result = 2; } } diff --git a/lib/lib_basic/TasmotaModbus-1.2.0/src/TasmotaModbus.h b/lib/lib_basic/TasmotaModbus-3.4.0/src/TasmotaModbus.h similarity index 96% rename from lib/lib_basic/TasmotaModbus-1.2.0/src/TasmotaModbus.h rename to lib/lib_basic/TasmotaModbus-3.4.0/src/TasmotaModbus.h index d6c0c2883..78fc3d50b 100644 --- a/lib/lib_basic/TasmotaModbus-1.2.0/src/TasmotaModbus.h +++ b/lib/lib_basic/TasmotaModbus-3.4.0/src/TasmotaModbus.h @@ -30,7 +30,7 @@ class TasmotaModbus : public TasmotaSerial { TasmotaModbus(int receive_pin, int transmit_pin); virtual ~TasmotaModbus() {} - int Begin(long speed = TM_MODBUS_BAUDRATE, int stop_bits = 1); + int Begin(long speed = TM_MODBUS_BAUDRATE, uint32_t config = SERIAL_8N1); uint16_t CalculateCRC(uint8_t *frame, uint8_t num); From b98e82ae3d5262e0e44dd35a5e74f7dd2ba1efe6 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Thu, 6 Jan 2022 18:01:35 +0100 Subject: [PATCH 190/402] Add Sonoff SPM module mapping Add Sonoff SPM command ``SspmMap 2,1,..`` to map scanned module to physical module (#14281) --- CHANGELOG.md | 1 + RELEASENOTES.md | 1 + tasmota/xdrv_86_esp32_sonoff_spm.ino | 231 ++++++++++++++++++++++----- 3 files changed, 196 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2c5c0388..0be21fbc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file. ## [2022.01.1] ### Added - Experimental ADE7953 (Shelly EM) reset on restart (#14261) +- ESP32 Sonoff SPM command ``SspmMap 2,1,..`` to map scanned module to physical module (#14281) ### Changed - PubSubClient library from v2.8.12 to v2.8.13 diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 34a441891..db1bf297d 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -103,6 +103,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo ## Changelog v2022.01.1 ### Added - Command ``SSerialConfig `` to change Serial Bridge configuration +- ESP32 Sonoff SPM command ``SspmMap 2,1,..`` to map scanned module to physical module [#14281](https://github.com/arendst/Tasmota/issues/14281) - PWM Dimmer two button support [#13993](https://github.com/arendst/Tasmota/issues/13993) - Device Group Send full status item [#14045](https://github.com/arendst/Tasmota/issues/14045) - Support for MAX7219 Dot Matrix displays [#14091](https://github.com/arendst/Tasmota/issues/14091) diff --git a/tasmota/xdrv_86_esp32_sonoff_spm.ino b/tasmota/xdrv_86_esp32_sonoff_spm.ino index 3a151dd01..7a115e289 100644 --- a/tasmota/xdrv_86_esp32_sonoff_spm.ino +++ b/tasmota/xdrv_86_esp32_sonoff_spm.ino @@ -49,7 +49,9 @@ * Gui optimized for energy display. * Yellow led lights if no ARM connection can be made. * Yellow led blinks 2 seconds if an ARM-ESP comms CRC error is detected. + * Persistence for module mapping * Supported commands: + * SspmMap 2,3,1,.. - Map scanned module number to physical module number using positional numbering * SspmDisplay 0|1 - Select alternative GUI rotating display either all or powered on only * SspmIAmHere - Blink ERROR in SPM-4Relay where relay resides * SspmScan - Rescan ARM modbus taking around 20 seconds @@ -140,6 +142,8 @@ /*********************************************************************************************/ +const uint32_t SSPM_VERSION = 0x01010101; // Latest driver version (See settings deltas below) + enum SspmMachineStates { SPM_NONE, // Do nothing SPM_WAIT, // Wait 100ms SPM_RESET, // Toggle ARM reset pin @@ -156,6 +160,13 @@ enum SspmMachineStates { SPM_NONE, // Do nothing #include TasmotaSerial *SspmSerial; +// Global structure containing driver saved variables +struct { + uint32_t crc32; // To detect file changes + uint32_t version; // To detect driver function changes + uint16_t module_map[32]; // Max possible SPM relay modules +} SSPMSettings; + typedef struct { float voltage[SSPM_MAX_MODULES][4]; // 123.12 V float current[SSPM_MAX_MODULES][4]; // 123.12 A @@ -192,8 +203,124 @@ typedef struct { uint8_t *SspmBuffer = nullptr; TSspm *Sspm = nullptr; +/*********************************************************************************************\ + * Driver Settings load and save using filesystem +\*********************************************************************************************/ + +uint32_t SSPMSettingsCrc32(void) { + // Use Tasmota CRC calculation function + return GetCfgCrc32((uint8_t*)&SSPMSettings +4, sizeof(SSPMSettings) -4); // Skip crc32 +} + +void SSPMSettingsDefault(void) { + // Init default values in case file is not found + AddLog(LOG_LEVEL_INFO, PSTR("CFG: SPM " D_USE_DEFAULTS)); + + memset(&SSPMSettings, 0x00, sizeof(SSPMSettings)); + SSPMSettings.version = SSPM_VERSION; + // Init any other parameter in struct SSPMSettings +} + +void SSPMSettingsDelta(void) { + // Fix possible setting deltas + if (SSPMSettings.version != SSPM_VERSION) { // Fix version dependent changes + + if (Settings->version < 0x01010100) { + AddLog(LOG_LEVEL_INFO, PSTR("CFG: SPM update oldest version restore")); + + } + if (Settings->version < 0x01010101) { + AddLog(LOG_LEVEL_INFO, PSTR("CFG: SPM update old version restore")); + + } + + // Set current version and save settings + SSPMSettings.version = SSPM_VERSION; + SSPMSettingsSave(); + } +} + +void SSPMSettingsLoad(void) { + // Init default values in case file is not found + SSPMSettingsDefault(); + + // Try to load file /.drvset086 + char filename[20]; + // Use for drivers: + snprintf_P(filename, sizeof(filename), PSTR(TASM_FILE_DRIVER), XDRV_86); + +#ifdef USE_UFILESYS + if (TfsLoadFile(filename, (uint8_t*)&SSPMSettings, sizeof(SSPMSettings))) { + // Fix possible setting deltas + SSPMSettingsDelta(); + + AddLog(LOG_LEVEL_INFO, PSTR("CFG: SPM loaded from file")); + } else { + // File system not ready: No flash space reserved for file system + AddLog(LOG_LEVEL_INFO, PSTR("CFG: SPM ERROR File system not ready or file not found")); + } +#else + AddLog(LOG_LEVEL_INFO, PSTR("CFG: SPM ERROR File system not enabled")); +#endif // USE_UFILESYS + + SSPMSettings.crc32 = SSPMSettingsCrc32(); +} + +void SSPMSettingsSave(void) { + // Called from FUNC_SAVE_SETTINGS every SaveData second and at restart + + if (SSPMSettingsCrc32() != SSPMSettings.crc32) { + // Try to save file /.drvset086 + SSPMSettings.crc32 = SSPMSettingsCrc32(); + + char filename[20]; + // Use for drivers: + snprintf_P(filename, sizeof(filename), PSTR(TASM_FILE_DRIVER), XDRV_86); + +#ifdef USE_UFILESYS + if (TfsSaveFile(filename, (const uint8_t*)&SSPMSettings, sizeof(SSPMSettings))) { + AddLog(LOG_LEVEL_INFO, PSTR("CFG: SPM saved to file")); + } else { + // File system not ready: No flash space reserved for file system + AddLog(LOG_LEVEL_INFO, PSTR("CFG: SPM ERROR File system not ready or unable to save file")); + } +#else + AddLog(LOG_LEVEL_INFO, PSTR("CFG: SPM ERROR File system not enabled")); +#endif // USE_UFILESYS + } +} + /*********************************************************************************************/ +uint32_t SSMPGetModuleId(uint32_t module) { + // Return short module id + uint32_t module_id = 0; + if (module < Sspm->module_max) { + module_id = Sspm->module[module][0] << 8 | Sspm->module[module][1]; + } + return module_id; +} + +uint32_t SSPMGetMappedModuleId(uint32_t module) { + // Return mapped module number + for (uint32_t module_nr = 0; module_nr < Sspm->module_max; module_nr++) { + if (SSPMSettings.module_map[module] == SSMPGetModuleId(module_nr)) { + return module_nr; // 0, 1, .. + } + } + return module; +} + +uint32_t SSPMGetModuleNumberFromMap(uint32_t id) { + // Return module number based on first two bytes of module id + for (uint32_t module_nr = 0; module_nr < SSPM_MAX_MODULES; module_nr++) { + if (id == SSPMSettings.module_map[module_nr]) { + return module_nr; // 0, 1, ... + } + } + return 0; +} + void SSPMSetLock(uint32_t seconds) { Sspm->timeout = seconds * 10; // Decremented every 100mSec Sspm->allow_updates = 0; // Disable requests from 100mSec loop @@ -211,6 +338,8 @@ uint16_t SSPMCalculateCRC(uint8_t *frame, uint32_t num) { return crc ^ 0; } +/*********************************************************************************************/ + void SSPMSend(uint32_t size) { uint16_t crc = SSPMCalculateCRC(SspmBuffer, size -2); SspmBuffer[size -2] = (uint8_t)(crc >> 8); @@ -303,7 +432,7 @@ void SSPMSendGetOps(uint32_t module) { Marker |Module id |Ac|Cm|Size |Ix|Chksm| */ SSPMInitSend(); - memcpy(SspmBuffer +3, Sspm->module[module], SSPM_MODULE_NAME_SIZE); + memcpy(SspmBuffer +3, Sspm->module[SSPMGetMappedModuleId(module)], SSPM_MODULE_NAME_SIZE); SspmBuffer[16] = SSPM_FUNC_GET_OPS; // 0x04 Sspm->command_sequence++; SspmBuffer[19] = Sspm->command_sequence; @@ -323,7 +452,7 @@ void SSPMSendSetRelay(uint32_t relay, uint32_t state) { } uint8_t module = relay >> 2; SSPMInitSend(); - memcpy(SspmBuffer +3, Sspm->module[module], SSPM_MODULE_NAME_SIZE); + memcpy(SspmBuffer +3, Sspm->module[SSPMGetMappedModuleId(module)], SSPM_MODULE_NAME_SIZE); SspmBuffer[16] = SSPM_FUNC_SET_RELAY; // 0x08 SspmBuffer[18] = 0x01; SspmBuffer[19] = channel; @@ -340,7 +469,7 @@ void SSPMSendGetModuleState(uint32_t module) { Marker |Module id |Ac|Cm|Size |Pl|Ix|Chksm| */ SSPMInitSend(); - memcpy(SspmBuffer +3, Sspm->module[module], SSPM_MODULE_NAME_SIZE); + memcpy(SspmBuffer +3, Sspm->module[SSPMGetMappedModuleId(module)], SSPM_MODULE_NAME_SIZE); SspmBuffer[16] = SSPM_FUNC_GET_MODULE_STATE; // 0x09 SspmBuffer[18] = 0x01; SspmBuffer[19] = 0x0F; // State of all four relays @@ -407,7 +536,7 @@ void SSPMSendGetScheme(uint32_t module) { Marker |Module id |Ac|Cm|Size |Ix|Chksm| */ SSPMInitSend(); - memcpy(SspmBuffer +3, Sspm->module[module], SSPM_MODULE_NAME_SIZE); + memcpy(SspmBuffer +3, Sspm->module[SSPMGetMappedModuleId(module)], SSPM_MODULE_NAME_SIZE); SspmBuffer[16] = SSPM_FUNC_GET_SCHEME; // 0x0B Sspm->command_sequence++; SspmBuffer[19] = Sspm->command_sequence; @@ -459,7 +588,7 @@ void SSPMSendIAmHere(uint32_t relay) { */ uint8_t module = relay >> 2; SSPMInitSend(); - memcpy(SspmBuffer +3, Sspm->module[module], SSPM_MODULE_NAME_SIZE); + memcpy(SspmBuffer +3, Sspm->module[SSPMGetMappedModuleId(module)], SSPM_MODULE_NAME_SIZE); SspmBuffer[16] = SSPM_FUNC_IAMHERE; // 0x0D Sspm->command_sequence++; SspmBuffer[19] = Sspm->command_sequence; @@ -507,7 +636,7 @@ void SSPMSendGetEnergyTotal(uint32_t relay) { SSPMInitSend(); SspmBuffer[16] = SSPM_FUNC_GET_ENERGY_TOTAL; // 0x16 SspmBuffer[18] = 0x0D; - memcpy(SspmBuffer +19, Sspm->module[module], SSPM_MODULE_NAME_SIZE); + memcpy(SspmBuffer +19, Sspm->module[SSPMGetMappedModuleId(module)], SSPM_MODULE_NAME_SIZE); SspmBuffer[31] = channel; Sspm->command_sequence++; SspmBuffer[32] = Sspm->command_sequence; @@ -527,7 +656,7 @@ void SSPMSendGetEnergy(uint32_t relay) { SSPMInitSend(); SspmBuffer[16] = SSPM_FUNC_GET_ENERGY; // 0x18 SspmBuffer[18] = 0x10; - memcpy(SspmBuffer +19, Sspm->module[module], SSPM_MODULE_NAME_SIZE); + memcpy(SspmBuffer +19, Sspm->module[SSPMGetMappedModuleId(module)], SSPM_MODULE_NAME_SIZE); SspmBuffer[31] = 0x01; SspmBuffer[32] = channel; SspmBuffer[33] = 0; @@ -551,7 +680,7 @@ void SSPMSendGetLog(uint32_t relay, uint32_t entries) { SSPMInitSend(); SspmBuffer[16] = SSPM_FUNC_GET_LOG; // 0x1A SspmBuffer[18] = 0x10; - memcpy(SspmBuffer +19, Sspm->module[module], SSPM_MODULE_NAME_SIZE); + memcpy(SspmBuffer +19, Sspm->module[SSPMGetMappedModuleId(module)], SSPM_MODULE_NAME_SIZE); SspmBuffer[31] = startlog >> 8; // MSB start log SspmBuffer[32] = startlog; // LSB start log SspmBuffer[33] = entries >> 8; // MSB end log @@ -619,7 +748,8 @@ void SSPMHandleReceivedData(void) { power_t current_state = SspmBuffer[20] >> 4; // Relays state power_t mask = 0x0000000F; for (uint32_t i = 0; i < Sspm->module_max; i++) { - if ((SspmBuffer[3] == Sspm->module[i][0]) && (SspmBuffer[4] == Sspm->module[i][1])) { + uint32_t module = SSPMGetMappedModuleId(i); + if ((SspmBuffer[3] == Sspm->module[module][0]) && (SspmBuffer[4] == Sspm->module[module][1])) { current_state <<= (i * 4); mask <<= (i * 4); TasmotaGlobal.power &= (POWER_MASK ^ mask); @@ -703,14 +833,10 @@ void SSPMHandleReceivedData(void) { energy_total += today_energy; } uint32_t channel = SspmBuffer[32]; - for (uint32_t module = 0; module < Sspm->module_max; module++) { - if ((SspmBuffer[20] == Sspm->module[module][0]) && (SspmBuffer[21] == Sspm->module[module][1])) { - Sspm->energy_today[module][channel] = energy_today; - Sspm->energy_yesterday[module][channel] = energy_yesterday; - Sspm->energy_total[module][channel] = energy_total; // x.xxkWh - break; - } - } + uint32_t module = SSPMGetModuleNumberFromMap(SspmBuffer[20] << 8 | SspmBuffer[21]); + Sspm->energy_today[module][channel] = energy_today; + Sspm->energy_yesterday[module][channel] = energy_yesterday; + Sspm->energy_total[module][channel] = energy_total; // x.xxkWh Sspm->allow_updates = 1; } break; @@ -787,19 +913,15 @@ void SSPMHandleReceivedData(void) { if (SspmBuffer[31] & 1) { break; } SspmBuffer[31] >>= 1; } - for (uint32_t module = 0; module < Sspm->module_max; module++) { - if ((SspmBuffer[19] == Sspm->module[module][0]) && (SspmBuffer[20] == Sspm->module[module][1])) { - Sspm->current[module][channel] = SspmBuffer[32] + (float)SspmBuffer[33] / 100; // x.xxA - Sspm->voltage[module][channel] = (SspmBuffer[34] << 8) + SspmBuffer[35] + (float)SspmBuffer[36] / 100; // x.xxV - Sspm->active_power[module][channel] = (SspmBuffer[37] << 8) + SspmBuffer[38] + (float)SspmBuffer[39] / 100; // x.xxW - Sspm->reactive_power[module][channel] = (SspmBuffer[40] << 8) + SspmBuffer[41] + (float)SspmBuffer[42] / 100; // x.xxVAr - Sspm->apparent_power[module][channel] = (SspmBuffer[43] << 8) + SspmBuffer[44] + (float)SspmBuffer[45] / 100; // x.xxVA - float power_factor = (Sspm->active_power[module][channel] && Sspm->apparent_power[module][channel]) ? Sspm->active_power[module][channel] / Sspm->apparent_power[module][channel] : 0; - if (power_factor > 1) { power_factor = 1; } - Sspm->power_factor[module][channel] = power_factor; - break; - } - } + uint32_t module = SSPMGetModuleNumberFromMap(SspmBuffer[19] << 8 | SspmBuffer[20]); + Sspm->current[module][channel] = SspmBuffer[32] + (float)SspmBuffer[33] / 100; // x.xxA + Sspm->voltage[module][channel] = (SspmBuffer[34] << 8) + SspmBuffer[35] + (float)SspmBuffer[36] / 100; // x.xxV + Sspm->active_power[module][channel] = (SspmBuffer[37] << 8) + SspmBuffer[38] + (float)SspmBuffer[39] / 100; // x.xxW + Sspm->reactive_power[module][channel] = (SspmBuffer[40] << 8) + SspmBuffer[41] + (float)SspmBuffer[42] / 100; // x.xxVAr + Sspm->apparent_power[module][channel] = (SspmBuffer[43] << 8) + SspmBuffer[44] + (float)SspmBuffer[45] / 100; // x.xxVA + float power_factor = (Sspm->active_power[module][channel] && Sspm->apparent_power[module][channel]) ? Sspm->active_power[module][channel] / Sspm->apparent_power[module][channel] : 0; + if (power_factor > 1) { power_factor = 1; } + Sspm->power_factor[module][channel] = power_factor; SSPMSendAck(command_sequence); Sspm->allow_updates = 1; } @@ -814,7 +936,8 @@ void SSPMHandleReceivedData(void) { power_t relay = SspmBuffer[31] & 0x0F; // Relays active power_t relay_state = SspmBuffer[31] >> 4; // Relays state for (uint32_t i = 0; i < Sspm->module_max; i++) { - if ((SspmBuffer[19] == Sspm->module[i][0]) && (SspmBuffer[20] == Sspm->module[i][1])) { + uint32_t module = SSPMGetMappedModuleId(i); + if ((SspmBuffer[19] == Sspm->module[module][0]) && (SspmBuffer[20] == Sspm->module[module][1])) { relay <<= (i * 4); relay_state <<= (i * 4); break; @@ -847,12 +970,15 @@ void SSPMHandleReceivedData(void) { Ty = Type of sub-device. 130: Four-channel sub-device */ if ((0x24 == Sspm->expected_bytes) && (Sspm->module_max < SSPM_MAX_MODULES)) { - memmove(Sspm->module[1], Sspm->module[0], (SSPM_MAX_MODULES -1) * SSPM_MODULE_NAME_SIZE); - memcpy(Sspm->module[0], SspmBuffer + 19, SSPM_MODULE_NAME_SIZE); - Sspm->module_max++; + memcpy(Sspm->module[Sspm->module_max], SspmBuffer + 19, SSPM_MODULE_NAME_SIZE); + if (0 == SSPMSettings.module_map[Sspm->module_max]) { + SSPMSettings.module_map[Sspm->module_max] = SspmBuffer[19] << 8 | SspmBuffer[20]; + } AddLog(LOG_LEVEL_DEBUG, PSTR("SPM: Module %d type %d version %d.%d.%d found with id %12_H"), - Sspm->module_max, SspmBuffer[35], SspmBuffer[36], SspmBuffer[37], SspmBuffer[38], Sspm->module[0]); + Sspm->module_max +1, SspmBuffer[35], SspmBuffer[36], SspmBuffer[37], SspmBuffer[38], Sspm->module[Sspm->module_max]); + + Sspm->module_max++; } SSPMSendAck(command_sequence); break; @@ -938,6 +1064,8 @@ void SSPMInit(void) { return; } + SSPMSettingsLoad(); + pinMode(SSPM_GPIO_ARM_RESET, OUTPUT); digitalWrite(SSPM_GPIO_ARM_RESET, 1); @@ -1250,10 +1378,10 @@ void SSPMEnergyShow(bool json) { \*********************************************************************************************/ const char kSSPMCommands[] PROGMEM = "SSPM|" // Prefix - "Log|Energy|History|Scan|IamHere|Display|Reset" ; + "Log|Energy|History|Scan|IamHere|Display|Reset|Map" ; void (* const SSPMCommand[])(void) PROGMEM = { - &CmndSSPMLog, &CmndSSPMEnergy, &CmndSSPMEnergyHistory, &CmndSSPMScan, &CmndSSPMIamHere, &CmndSSPMDisplay, &CmndSSPMReset }; + &CmndSSPMLog, &CmndSSPMEnergy, &CmndSSPMEnergyHistory, &CmndSSPMScan, &CmndSSPMIamHere, &CmndSSPMDisplay, &CmndSSPMReset, &CmndSSPMMap }; void CmndSSPMLog(void) { // Report 29 log entries @@ -1277,12 +1405,14 @@ void CmndSSPMEnergyHistory(void) { void CmndSSPMScan(void) { // Start relay module scan taking up to 20 seconds + // SspmScan Sspm->mstate = SPM_START_SCAN; ResponseCmndChar(PSTR(D_JSON_STARTED)); } void CmndSSPMIamHere(void) { // Blink module ERROR led containing relay + // SspmIamHere 6 if ((XdrvMailbox.payload < 1) || (XdrvMailbox.payload > TasmotaGlobal.devices_present)) { XdrvMailbox.payload = 1; } SSPMSendIAmHere(XdrvMailbox.payload -1); ResponseCmndDone(); @@ -1290,6 +1420,7 @@ void CmndSSPMIamHere(void) { void CmndSSPMDisplay(void) { // Select either all relays or only powered on relays + // SspmDisplay 0 or SspmDisplay 1 if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) { Settings->sbflag1.sspm_display = XdrvMailbox.payload; } @@ -1298,6 +1429,7 @@ void CmndSSPMDisplay(void) { void CmndSSPMReset(void) { // Reset ARM and restart + // Reset 1 if (1 == XdrvMailbox.payload) { Sspm->mstate = SPM_NONE; SSPMSendCmnd(SSPM_FUNC_RESET); @@ -1308,6 +1440,28 @@ void CmndSSPMReset(void) { } } +void CmndSSPMMap(void) { + // Map scanned module number to physical module number using positional numbering + // SspmMap 1,3,4,2 + // TODO: Might need input checks on count and valid different numbers + if (Sspm->module_max) { // Valid after initial scan + char *p; + uint32_t i = 0; + for (char* str = strtok_r(XdrvMailbox.data, ",", &p); str && i < Sspm->module_max; str = strtok_r(nullptr, ",", &p)) { + uint32_t module = atoi(str); + if ((module > 0) && (module <= Sspm->module_max)) { // Only valid modules 1 to x + SSPMSettings.module_map[i] = SSMPGetModuleId(module -1); + } + i++; + } + Response_P(PSTR("{\"%s\":["), XdrvMailbox.command); + for (uint32_t i = 0; i < Sspm->module_max; i++) { + ResponseAppend_P(PSTR("%s%d"), (i)?",":"", SSPMGetModuleNumberFromMap(SSMPGetModuleId(i)) +1); + } + ResponseAppend_P(PSTR("]}")); + } +} + /*********************************************************************************************\ * Interface \*********************************************************************************************/ @@ -1326,6 +1480,9 @@ bool Xdrv86(uint8_t function) { case FUNC_EVERY_100_MSECOND: SSPMEvery100ms(); break; + case FUNC_SAVE_SETTINGS: + SSPMSettingsSave(); + break; case FUNC_SET_DEVICE_POWER: result = SSPMSetDevicePower(); break; From b9dc142134e28736ec5554b0f9820cb928fdda31 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 6 Jan 2022 18:38:02 +0100 Subject: [PATCH 191/402] Use esptool.py to generate one file firmware --- pio-tools/post_esp32.py | 120 ++++++++++++++-------------------------- 1 file changed, 42 insertions(+), 78 deletions(-) diff --git a/pio-tools/post_esp32.py b/pio-tools/post_esp32.py index e254f1024..d3ac6c7af 100644 --- a/pio-tools/post_esp32.py +++ b/pio-tools/post_esp32.py @@ -1,97 +1,61 @@ # From: https://github.com/letscontrolit/ESPEasy/blob/mega/tools/pio/post_esp32.py # Thanks TD-er :) +# Combines separate bin files with their respective offsets into a single file +# This single file must then be flashed to an ESP32 node with 0 offset. +# +# Original implementation: Bartłomiej Zimoń (@uzi18) +# +# Special thanks to @Jason2866 for helping debug flashing to >4MB flash +# Thanks @jesserockz (esphome) for adapting to use esptool.py with merge_bin +# +# Typical layout of the generated file: +# Offset | File +# - 0x1000 | ~\.platformio\packages\framework-arduinoespressif32\tools\sdk\esp32\bin\bootloader_dout_40m.bin +# - 0x8000 | ~\Tasmota\.pio\build\\partitions.bin +# - 0xe000 | ~\.platformio\packages\framework-arduinoespressif32\tools\partitions\boot_app0.bin +# - 0x10000 | ~\Tasmota\.pio\build\/firmware.bin + Import("env") -import os -def decode_flash_size_speed(byte_value): - speed = byte_value[0] & 0x0f - size = (byte_value[0] & 0xf0) / 16 +import subprocess +from os.path import join +import esptool - spi_speed = { - 0: "40", - 1: "26", - 2: "20", - 0xf: "80" - } - speed_mhz = spi_speed.get(speed) - size_mb = str(1<\partitions.bin - # - 0xe000 | ~\.platformio\packages\framework-arduinoespressif32\tools\partitions\boot_app0.bin - # - 0x10000 | ~\Tasmota\.pio\build\/firmware.bin + app_offset = 0x10000 new_file_name = env.subst("$BUILD_DIR/${PROGNAME}.factory.bin") - sections = env.subst(env.get('FLASH_EXTRA_IMAGES')) - new_file = open(new_file_name,"wb") - new_file.truncate() # Make sure no left over data is present from a previous build - + sections = env.subst(env.get("FLASH_EXTRA_IMAGES")) firmware_name = env.subst("$BUILD_DIR/${PROGNAME}.bin") + chip = env.get("BOARD_MCU") + flash_size = env.BoardConfig().get("upload.flash_size") + cmd = [ + "--chip", + chip, + "merge_bin", + "-o", + new_file_name, + "--flash_size", + flash_size, + ] - # fill the file with 0xFF binary data to reflect 'erased and not yet written' data. - # Make sure to use exactly the size that normally would be erased - new_file.seek(0) - total_size = sketch_partition_start + os.path.getsize(firmware_name) - total_size = total_size - (total_size % flash_page_size) + flash_page_size - - new_file.write(bytes([0xff] * total_size)) - - print(" {} | {}".format("Offset", "File")) + print(" Offset | File") for section in sections: - sect_adr,sect_file = section.split(" ",1) - print(" - {} | {}".format(sect_adr,sect_file)) - source = open(sect_file,"rb") - new_file.seek(int(sect_adr,0)-offset) - new_file.write(source.read()) - if "bootloader" in sect_file: - # Need to patch the bootloader to match the flash size - flash_size = env.BoardConfig().get("upload.flash_size") + sect_adr, sect_file = section.split(" ", 1) + print(f" - {sect_adr} | {sect_file}") + cmd += [sect_adr, sect_file] - spi_speed_size_byte_offset = 3 - source.seek(spi_speed_size_byte_offset) - spi_speed_size_byte = source.read(1) - new_spi_speed_size_byte = spi_speed_size_byte[0] & 0x0f + print(f" - {hex(app_offset)} | {firmware_name}") + cmd += [hex(app_offset), firmware_name] - spi_size = { - "1MB": 0x00, - "2MB": 0x10, - "4MB": 0x20, - "8MB": 0x30, - "16MB": 0x40 - } - new_spi_speed_size_byte |= spi_size.get(flash_size, spi_speed_size_byte[0] & 0xf0) + print('Using esptool.py arguments: %s' % ' '.join(cmd)) - if new_spi_speed_size_byte != spi_speed_size_byte: - new_byte = bytes([new_spi_speed_size_byte]) - print(" | Patch flash size value {} -> {}".format(decode_flash_size_speed(spi_speed_size_byte), decode_flash_size_speed(new_byte))) - new_file.seek(int(sect_adr,0)-offset + spi_speed_size_byte_offset) - new_file.write(new_byte) - - source.close() + esptool.main(cmd) - firmware_start = sketch_partition_start-offset - firmware = open(firmware_name,"rb") - print(" - {} | {}".format(hex(firmware_start),firmware_name)) - new_file.seek(firmware_start) - new_file.write(firmware.read()) - new_file.close() - firmware.close() - -env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", esp32_create_factory_bin) +env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", esp32_create_combined_bin) From ea12ddeca9ef22bc00c84c982148fddbc5ec836b Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 6 Jan 2022 19:07:59 +0100 Subject: [PATCH 192/402] find esptool for import --- pio-tools/post_esp32.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pio-tools/post_esp32.py b/pio-tools/post_esp32.py index d3ac6c7af..b2027def7 100644 --- a/pio-tools/post_esp32.py +++ b/pio-tools/post_esp32.py @@ -19,7 +19,9 @@ Import("env") import subprocess -from os.path import join +from os.path import expanduser, join +home = expanduser("~") +esptool = join(home, ".platformio", "packages", "tool-esptoolpy", "esptool.py") import esptool def esp32_create_combined_bin(source, target, env): From d88110e6862562ec5b9eb2a12dc87b2fd28ceb81 Mon Sep 17 00:00:00 2001 From: SteWers Date: Thu, 6 Jan 2022 19:11:44 +0100 Subject: [PATCH 193/402] Rework for PR #14305 - removed all changes in tasmota_template_legacy.h - moved new GPIO at the end of the list in tasmota_template.h - removed unnecessary "flush" in xnrg_12_solaxX1.ino --- tasmota/tasmota_template.h | 7 ++++--- tasmota/tasmota_template_legacy.h | 2 -- tasmota/xnrg_12_solaxX1.ino | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h index b961de31e..26b6970c0 100644 --- a/tasmota/tasmota_template.h +++ b/tasmota/tasmota_template.h @@ -74,7 +74,7 @@ enum UserSelectablePins { GPIO_SSPI_MAX31865_CS1, // MAX31865 Chip Select GPIO_HRE_CLOCK, GPIO_HRE_DATA, // HR-E Water Meter GPIO_ADE7953_IRQ, // ADE7953 IRQ - GPIO_SOLAXX1_TX, GPIO_SOLAXX1_RX, GPIO_SOLAXX1_RTS, // Solax Inverter Serial interface + GPIO_SOLAXX1_TX, GPIO_SOLAXX1_RX, // Solax Inverter Serial interface GPIO_ZIGBEE_TX, GPIO_ZIGBEE_RX, // Zigbee Serial interface GPIO_RDM6300_RX, // RDM6300 RX GPIO_IBEACON_TX, GPIO_IBEACON_RX, // HM17 IBEACON Serial interface @@ -177,6 +177,7 @@ enum UserSelectablePins { GPIO_HM330X_SET, // HM330X SET pin (sleep when low) GPIO_HEARTBEAT, GPIO_HEARTBEAT_INV, GPIO_SHIFT595_SRCLK, GPIO_SHIFT595_RCLK, GPIO_SHIFT595_OE, GPIO_SHIFT595_SER, // 74x595 Shift register + GPIO_SOLAXX1_RTS, // Solax Inverter Serial interface GPIO_SENSOR_END }; enum ProgramSelectablePins { @@ -275,7 +276,7 @@ const char kSensorNames[] PROGMEM = D_SENSOR_MAX31865_CS "|" D_SENSOR_HRE_CLOCK "|" D_SENSOR_HRE_DATA "|" D_SENSOR_ADE7953_IRQ "|" - D_SENSOR_SOLAXX1_TX "|" D_SENSOR_SOLAXX1_RX "|" D_SENSOR_SOLAXX1_RTS "|" + D_SENSOR_SOLAXX1_TX "|" D_SENSOR_SOLAXX1_RX "|" D_SENSOR_ZIGBEE_TXD "|" D_SENSOR_ZIGBEE_RXD "|" D_SENSOR_RDM6300_RX "|" D_SENSOR_IBEACON_TX "|" D_SENSOR_IBEACON_RX "|" @@ -373,8 +374,8 @@ const char kSensorNames[] PROGMEM = D_SENSOR_BL0942_RX "|" D_SENSOR_HM330X_SET "|" D_SENSOR_HEARTBEAT "|" D_SENSOR_HEARTBEAT "_i|" - D_GPIO_SHIFT595_SRCLK "|" D_GPIO_SHIFT595_RCLK "|" D_GPIO_SHIFT595_OE "|" D_GPIO_SHIFT595_SER "|" + D_SENSOR_SOLAXX1_RTS "|" ; const char kSensorNamesFixed[] PROGMEM = diff --git a/tasmota/tasmota_template_legacy.h b/tasmota/tasmota_template_legacy.h index af9afd3f1..4583a9783 100644 --- a/tasmota/tasmota_template_legacy.h +++ b/tasmota/tasmota_template_legacy.h @@ -190,7 +190,6 @@ enum LegacyUserSelectablePins { GPI8_OLED_RESET, // OLED Display Reset GPI8_SOLAXX1_TX, // Solax Inverter tx pin GPI8_SOLAXX1_RX, // Solax Inverter rx pin - GPI8_SOLAXX1_RTS, // Solax Inverter RTS pin GPI8_ZIGBEE_TX, // Zigbee Serial interface GPI8_ZIGBEE_RX, // Zigbee Serial interface GPI8_RDM6300_RX, // RDM6300 RX @@ -421,7 +420,6 @@ const uint16_t kGpioConvert[] PROGMEM = { AGPIO(GPIO_OLED_RESET), // OLED Display Reset AGPIO(GPIO_SOLAXX1_TX), // Solax Inverter tx pin AGPIO(GPIO_SOLAXX1_RX), // Solax Inverter rx pin - AGPIO(GPIO_SOLAXX1_RTS), // Solax Inverter RTS pin AGPIO(GPIO_ZIGBEE_TX), // Zigbee Serial interface AGPIO(GPIO_ZIGBEE_RX), // Zigbee Serial interface AGPIO(GPIO_RDM6300_RX), diff --git a/tasmota/xnrg_12_solaxX1.ino b/tasmota/xnrg_12_solaxX1.ino index 534de4e47..696b02757 100644 --- a/tasmota/xnrg_12_solaxX1.ino +++ b/tasmota/xnrg_12_solaxX1.ino @@ -162,7 +162,6 @@ void solaxX1_RS485Send(uint16_t msgLen) solaxX1Serial->write(message, msgLen); solaxX1Serial->write(highByte(crc)); solaxX1Serial->write(lowByte(crc)); - solaxX1Serial->flush(); if (PinUsed(GPIO_SOLAXX1_RTS)) { digitalWrite(Pin(GPIO_SOLAXX1_RTS), LOW); } From 17f3e9fab748226f092e5c45a70be4d4619b7e7b Mon Sep 17 00:00:00 2001 From: Christian Baars Date: Thu, 6 Jan 2022 20:51:40 +0100 Subject: [PATCH 194/402] Update obj-dump.py to support more boards and adding flag to demangle. --- pio-tools/obj-dump.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pio-tools/obj-dump.py b/pio-tools/obj-dump.py index 91bc3de58..74edd3958 100644 --- a/pio-tools/obj-dump.py +++ b/pio-tools/obj-dump.py @@ -3,7 +3,16 @@ Import('env') def obj_dump_after_elf(source, target, env): + platform = env.PioPlatform() + board = env.BoardConfig() + mcu = board.get("build.mcu", "esp32") + print("Create firmware.asm") - env.Execute("xtensa-lx106-elf-objdump "+ "-D " + str(target[0]) + " > "+ "${PROGNAME}.asm") - + if mcu == "esp8266": + env.Execute("xtensa-lx106-elf-objdump "+ "-D -C " + str(target[0]) + " > "+ "$BUILD_DIR/${PROGNAME}.asm") + if mcu == "esp32": + env.Execute("xtensa-esp32-elf-objdump "+ "-D -C " + str(target[0]) + " > "+ "$BUILD_DIR/${PROGNAME}.asm") + if mcu == "esp32c3": + env.Execute("riscv32-esp-elf-objdump "+ "-D -C " + str(target[0]) + " > "+ "$BUILD_DIR/${PROGNAME}.asm") + env.AddPostAction("$BUILD_DIR/${PROGNAME}.elf", [obj_dump_after_elf]) From e039e593750cf0193f45531aa60661bc7acba458 Mon Sep 17 00:00:00 2001 From: Jason2866 Date: Thu, 6 Jan 2022 22:02:59 +0000 Subject: [PATCH 195/402] next try to find esptool --- pio-tools/post_esp32.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pio-tools/post_esp32.py b/pio-tools/post_esp32.py index b2027def7..d4204bc00 100644 --- a/pio-tools/post_esp32.py +++ b/pio-tools/post_esp32.py @@ -19,9 +19,13 @@ Import("env") import subprocess +import sys + from os.path import expanduser, join + home = expanduser("~") -esptool = join(home, ".platformio", "packages", "tool-esptoolpy", "esptool.py") +esptoolpath = join(home, ".platformio", "packages", "tool-esptoolpy") +sys.path.append(esptoolpath) import esptool def esp32_create_combined_bin(source, target, env): From 48585eebd257f0a6766a60d12ba18a8707bacb92 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 6 Jan 2022 23:20:21 +0100 Subject: [PATCH 196/402] Less verbose --- pio-tools/post_esp32.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pio-tools/post_esp32.py b/pio-tools/post_esp32.py index d4204bc00..66aab37de 100644 --- a/pio-tools/post_esp32.py +++ b/pio-tools/post_esp32.py @@ -59,7 +59,7 @@ def esp32_create_combined_bin(source, target, env): print(f" - {hex(app_offset)} | {firmware_name}") cmd += [hex(app_offset), firmware_name] - print('Using esptool.py arguments: %s' % ' '.join(cmd)) + #print('Using esptool.py arguments: %s' % ' '.join(cmd)) esptool.main(cmd) From 705c39280c178e0f28d33ab8f5adbed1ad9260c9 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Fri, 7 Jan 2022 10:56:33 +0100 Subject: [PATCH 197/402] Update change logs --- CHANGELOG.md | 8 +++++++- RELEASENOTES.md | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0be21fbc5..bbd73a4ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,10 @@ All notable changes to this project will be documented in this file. ## [2022.01.1] ### Added - Experimental ADE7953 (Shelly EM) reset on restart (#14261) -- ESP32 Sonoff SPM command ``SspmMap 2,1,..`` to map scanned module to physical module (#14281) +- Command ``SspmMap 2,1,..`` to map Sonoff SPM scanned module to physical module (#14281) +- Solax X1 modbus RTS support and offline status (#14305) +- DDP schemes for light and WS2812 (#14017) +- ESP32 single binary firmware (#14239) ### Changed - PubSubClient library from v2.8.12 to v2.8.13 @@ -18,6 +21,9 @@ All notable changes to this project will be documented in this file. ### Fixed - Intermittent exceptions and heap corruption due to PubSubClient library buffer overflow (#13700) +- Scripter memory corruption (#14268) +- Edit file for SD card (#14229) +- Solax X1 negative temperature support (#14278) - Modbus serial config regression from v10.1.0.3 ## [10.1.0.3] 20211231 diff --git a/RELEASENOTES.md b/RELEASENOTES.md index db1bf297d..a6e79cf58 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -103,11 +103,15 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo ## Changelog v2022.01.1 ### Added - Command ``SSerialConfig `` to change Serial Bridge configuration -- ESP32 Sonoff SPM command ``SspmMap 2,1,..`` to map scanned module to physical module [#14281](https://github.com/arendst/Tasmota/issues/14281) +- Command ``SspmMap 2,1,..`` to map Sonoff SPM scanned module to physical module [#14281](https://github.com/arendst/Tasmota/issues/14281) - PWM Dimmer two button support [#13993](https://github.com/arendst/Tasmota/issues/13993) +- DDP schemes for light and WS2812 [#14017](https://github.com/arendst/Tasmota/issues/14017) - Device Group Send full status item [#14045](https://github.com/arendst/Tasmota/issues/14045) - Support for MAX7219 Dot Matrix displays [#14091](https://github.com/arendst/Tasmota/issues/14091) - Experimental ADE7953 (Shelly EM) reset on restart [#14261](https://github.com/arendst/Tasmota/issues/14261) +- Solax X1 negative temperature support [#14278](https://github.com/arendst/Tasmota/issues/14278) +- Solax X1 modbus RTS support and offline status [#14305](https://github.com/arendst/Tasmota/issues/14305) +- ESP32 single binary firmware [#14239](https://github.com/arendst/Tasmota/issues/14239) - ESP32 support for TuyaMcu - ESP32 Berry features @@ -130,6 +134,8 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo - EZOO2 sensor message format [#14000](https://github.com/arendst/Tasmota/issues/14000) - DHT support negative temperatures on different hardware [#14173](https://github.com/arendst/Tasmota/issues/14173) - Hardware serial parity and stop bits support [#14212](https://github.com/arendst/Tasmota/issues/14212) +- Edit file for SD card [#14229](https://github.com/arendst/Tasmota/issues/14229) +- Scripter memory corruption [#14268](https://github.com/arendst/Tasmota/issues/14268) - ESP32 Webcam exception during flashwrites - ESP32 LedPwmMode exception [#14073](https://github.com/arendst/Tasmota/issues/14073) - ESP32 Compile error when I2S_Audio is enabled [#14095](https://github.com/arendst/Tasmota/issues/14095) From c26742f9b56cce595c345fdc8769292b30a95795 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Fri, 7 Jan 2022 11:07:36 +0100 Subject: [PATCH 198/402] use pio env for esptool path --- pio-tools/post_esp32.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pio-tools/post_esp32.py b/pio-tools/post_esp32.py index 66aab37de..662d011d8 100644 --- a/pio-tools/post_esp32.py +++ b/pio-tools/post_esp32.py @@ -18,14 +18,12 @@ Import("env") -import subprocess +platform = env.PioPlatform() + import sys +from os.path import join -from os.path import expanduser, join - -home = expanduser("~") -esptoolpath = join(home, ".platformio", "packages", "tool-esptoolpy") -sys.path.append(esptoolpath) +sys.path.append(join(platform.get_package_dir("tool-esptoolpy"))) import esptool def esp32_create_combined_bin(source, target, env): From 38886e987f720750f373fd3bfcb4a152b700351d Mon Sep 17 00:00:00 2001 From: SteWers Date: Fri, 7 Jan 2022 12:47:23 +0100 Subject: [PATCH 199/402] Resolve RTS-timing problem On some devices there is a timing problem with the RTS line, when not using flush. flush does wait until all data is send: https://www.arduino.cc/reference/en/language/functions/communication/serial/flush/ --- tasmota/xnrg_12_solaxX1.ino | 1 + 1 file changed, 1 insertion(+) diff --git a/tasmota/xnrg_12_solaxX1.ino b/tasmota/xnrg_12_solaxX1.ino index 696b02757..534de4e47 100644 --- a/tasmota/xnrg_12_solaxX1.ino +++ b/tasmota/xnrg_12_solaxX1.ino @@ -162,6 +162,7 @@ void solaxX1_RS485Send(uint16_t msgLen) solaxX1Serial->write(message, msgLen); solaxX1Serial->write(highByte(crc)); solaxX1Serial->write(lowByte(crc)); + solaxX1Serial->flush(); if (PinUsed(GPIO_SOLAXX1_RTS)) { digitalWrite(Pin(GPIO_SOLAXX1_RTS), LOW); } From d6fc62e3769dc1655cce63445f08d933a6289ad2 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Fri, 7 Jan 2022 16:17:53 +0100 Subject: [PATCH 200/402] Add support for Linkind dimmer Add support for Linkind dimmer as GPIO ``Option A6`` (#14004) --- CHANGELOG.md | 2 ++ RELEASENOTES.md | 2 ++ tasmota/support.ino | 5 +++ tasmota/support_tasmota.ino | 5 +++ tasmota/tasmota.ino | 1 + tasmota/tasmota_configurations_ESP32.h | 2 +- tasmota/tasmota_globals.h | 1 - tasmota/tasmota_template.h | 44 +++++++++++++++++++------- tasmota/xdrv_04_light.ino | 11 +++++-- tasmota/xdrv_35_pwm_dimmer.ino | 32 +++++++++++++------ 10 files changed, 80 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bbd73a4ea..c3d105e34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ All notable changes to this project will be documented in this file. - Solax X1 modbus RTS support and offline status (#14305) - DDP schemes for light and WS2812 (#14017) - ESP32 single binary firmware (#14239) +- ESP32 support for USE_PWM_DIMMER as GPIO ``Option E1`` +- Support for Linkind dimmer as GPIO ``Option A6`` (#14004) ### Changed - PubSubClient library from v2.8.12 to v2.8.13 diff --git a/RELEASENOTES.md b/RELEASENOTES.md index a6e79cf58..01537aecd 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -105,6 +105,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo - Command ``SSerialConfig `` to change Serial Bridge configuration - Command ``SspmMap 2,1,..`` to map Sonoff SPM scanned module to physical module [#14281](https://github.com/arendst/Tasmota/issues/14281) - PWM Dimmer two button support [#13993](https://github.com/arendst/Tasmota/issues/13993) +- Support for Linkind dimmer as GPIO ``Option A6`` [#14004](https://github.com/arendst/Tasmota/issues/14004) - DDP schemes for light and WS2812 [#14017](https://github.com/arendst/Tasmota/issues/14017) - Device Group Send full status item [#14045](https://github.com/arendst/Tasmota/issues/14045) - Support for MAX7219 Dot Matrix displays [#14091](https://github.com/arendst/Tasmota/issues/14091) @@ -114,6 +115,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo - ESP32 single binary firmware [#14239](https://github.com/arendst/Tasmota/issues/14239) - ESP32 support for TuyaMcu - ESP32 Berry features +- ESP32 support for USE_PWM_DIMMER as GPIO ``Option E1`` ### Breaking Changed diff --git a/tasmota/support.ino b/tasmota/support.ino index 7f60fa7b9..d28922aa5 100644 --- a/tasmota/support.ino +++ b/tasmota/support.ino @@ -1523,6 +1523,11 @@ void ModuleDefault(uint32_t module) void SetModuleType(void) { TasmotaGlobal.module_type = (USER_MODULE == Settings->module) ? Settings->user_template_base : Settings->module; +#ifdef ESP32 + if (TasmotaGlobal.emulated_module_type) { + TasmotaGlobal.module_type = TasmotaGlobal.emulated_module_type; + } +#endif } bool FlashPin(uint32_t pin) diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino index 9bd9169a7..e85c280ed 100644 --- a/tasmota/support_tasmota.ino +++ b/tasmota/support_tasmota.ino @@ -1781,6 +1781,11 @@ void GpioInit(void) mpin -= (AGPIO(GPIO_KEY1_INV_NP) - AGPIO(GPIO_KEY1)); } #ifdef ESP32 + else if ((mpin >= AGPIO(GPIO_OPTION_E)) && (mpin < (AGPIO(GPIO_OPTION_E) + MAX_OPTIONS_E))) { + TasmotaGlobal.emulated_module_type = pgm_read_byte(kModuleEmulationList + (mpin - AGPIO(GPIO_OPTION_A))); + SetModuleType(); + mpin = GPIO_NONE; + } else if ((mpin >= AGPIO(GPIO_SWT1_PD)) && (mpin < (AGPIO(GPIO_SWT1_PD) + MAX_SWITCHES))) { SwitchPulldownFlag(mpin - AGPIO(GPIO_SWT1_PD)); mpin -= (AGPIO(GPIO_SWT1_PD) - AGPIO(GPIO_SWT1)); diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino index 591b8b4f4..ba38c7779 100644 --- a/tasmota/tasmota.ino +++ b/tasmota/tasmota.ino @@ -181,6 +181,7 @@ struct TasmotaGlobal_t { uint8_t syslog_level; // Current copy of Settings->syslog_level uint8_t templog_level; // Temporary log level to be used by HTTP cm and Telegram uint8_t module_type; // Current copy of Settings->module or user template type + uint8_t emulated_module_type; // Emulated module type as requested by ESP32 uint8_t last_source; // Last command source uint8_t shutters_present; // Number of actual define shutters uint8_t discovery_counter; // Delayed discovery counter diff --git a/tasmota/tasmota_configurations_ESP32.h b/tasmota/tasmota_configurations_ESP32.h index 74ed07d32..ece3096c8 100644 --- a/tasmota/tasmota_configurations_ESP32.h +++ b/tasmota/tasmota_configurations_ESP32.h @@ -391,7 +391,7 @@ #undef USE_EXS_DIMMER // Disable support for EX-Store WiFi Dimmer //#define USE_HOTPLUG // Add support for sensor HotPlug //#undef USE_DEVICE_GROUPS // Disable support for device groups (+5k6 code) -#undef USE_PWM_DIMMER // Disable support for MJ-SD01/acenx/NTONPOWER PWM dimmers (+4k5 code) +//#undef USE_PWM_DIMMER // Disable support for MJ-SD01/acenx/NTONPOWER PWM dimmers (+4k5 code) #undef USE_KEELOQ // Disable support for Jarolift rollers by Keeloq algorithm (+4k5 code) #undef USE_SONOFF_D1 // Disable support for Sonoff D1 Dimmer (+0k7 code) #undef USE_SHELLY_DIMMER // Disable support for Shelly Dimmer (+3k code) diff --git a/tasmota/tasmota_globals.h b/tasmota/tasmota_globals.h index b7067ab94..15ec22abe 100644 --- a/tasmota/tasmota_globals.h +++ b/tasmota/tasmota_globals.h @@ -133,7 +133,6 @@ String EthernetMacAddress(void); #undef FIRMWARE_MINIMAL // Minimal is not supported as not needed // Hardware has no ESP32 -#undef USE_PWM_DIMMER #undef USE_EXS_DIMMER #undef USE_ARMTRONIX_DIMMERS #undef USE_SONOFF_RF diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h index 26b6970c0..8f9f2b863 100644 --- a/tasmota/tasmota_template.h +++ b/tasmota/tasmota_template.h @@ -178,6 +178,7 @@ enum UserSelectablePins { GPIO_HEARTBEAT, GPIO_HEARTBEAT_INV, GPIO_SHIFT595_SRCLK, GPIO_SHIFT595_RCLK, GPIO_SHIFT595_OE, GPIO_SHIFT595_SER, // 74x595 Shift register GPIO_SOLAXX1_RTS, // Solax Inverter Serial interface + GPIO_OPTION_E, // Emulated module GPIO_SENSOR_END }; enum ProgramSelectablePins { @@ -185,7 +186,7 @@ enum ProgramSelectablePins { GPIO_USER, // User configurable needs to be 2047 GPIO_MAX }; -#define MAX_OPTIONS_A 5 // Increase if more bits are used from GpioOptionABits +#define MAX_OPTIONS_A 6 // Increase if more bits are used from GpioOptionABits typedef union { // Restricted by MISRA-C Rule 18.4 but so useful... uint32_t data; // Allow bit manipulation using SetOption @@ -195,7 +196,7 @@ typedef union { // Restricted by MISRA-C Rule 18.4 bu uint32_t udisplay_driver : 1; // bit 2 (v9.3.1.2) - Option_A3 - (Display) Universal display driver uint32_t enable_ccloader : 1; // bit 3 (v9.4.0.5) - Option_A4 - (Zigbee) Enable CCLoader using Zigbee Rx/Tx/Rst Gpios uint32_t rotary_mi_desk : 1; // bit 4 (v9.5.0.5) - Option_A5 - (Rotary) Enable Mi Desk emulation - uint32_t spare05 : 1; // bit 5 + uint32_t linkind_support : 1; // bit 5 (v2022.01.1) - Option_A6 - (Light) LinkInd support uint32_t spare06 : 1; // bit 6 uint32_t spare07 : 1; // bit 7 uint32_t spare08 : 1; // bit 8 @@ -225,6 +226,23 @@ typedef union { // Restricted by MISRA-C Rule 18.4 bu }; } GpioOptionABits; +enum SupportedEmulationModules { + SONOFF_BASIC, SONOFF_RF, SONOFF_SV, SONOFF_TH, SONOFF_DUAL, SONOFF_POW, SONOFF_4CH, SONOFF_S2X, SLAMPHER, SONOFF_TOUCH, + SONOFF_LED, CH1, CH4, MOTOR, ELECTRODRAGON, EXS_RELAY, WION, WEMOS_DUMMY, SONOFF_DEV, H801, + SONOFF_SC, SONOFF_BN, SONOFF_4CHPRO, HUAFAN_SS, SONOFF_BRIDGE, SONOFF_B1, AILIGHT, SONOFF_T11, SONOFF_T12, SONOFF_T13, + SUPLA1, WITTY, YUNSHAN, MAGICHOME, LUANIHVIO, KMC_70011, ARILUX_LC01, ARILUX_LC11, SONOFF_DUAL_R2, ARILUX_LC06, + SONOFF_S31, ZENGGE_ZF_WF017, SONOFF_POW_R2, SONOFF_IFAN02, BLITZWOLF_BWSHP, SHELLY1, SHELLY2, PHILIPS, NEO_COOLCAM, ESP_SWITCH, + OBI, TECKIN, APLIC_WDP303075, TUYA_DIMMER, GOSUND, ARMTRONIX_DIMMERS, SK03_TUYA, PS_16_DZ, TECKIN_US, MANZOKU_EU_4, + OBI2, YTF_IR_BRIDGE, DIGOO, KA10, ZX2820, MI_DESK_LAMP, SP10, WAGA, SYF05, SONOFF_L1, + SONOFF_IFAN03, EXS_DIMMER, PWM_DIMMER, SONOFF_D1, SONOFF_ZB_BRIDGE, + MAXMODULE_EMULATION }; + +#define MAX_OPTIONS_E 1 // Increase if more emulated modules are supported from kModuleEmulationList + +const uint8_t kModuleEmulationList[] PROGMEM = { + PWM_DIMMER // (v2022.01.1) - Option_E1 - (Light) USE_PWM_DIMMER support +}; + // Text in webpage Module Parameters and commands GPIOS and GPIO const char kSensorNames[] PROGMEM = D_SENSOR_NONE "|" @@ -376,6 +394,7 @@ const char kSensorNames[] PROGMEM = D_SENSOR_HEARTBEAT "|" D_SENSOR_HEARTBEAT "_i|" D_GPIO_SHIFT595_SRCLK "|" D_GPIO_SHIFT595_RCLK "|" D_GPIO_SHIFT595_OE "|" D_GPIO_SHIFT595_SER "|" D_SENSOR_SOLAXX1_RTS "|" + D_SENSOR_OPTION " E|" ; const char kSensorNamesFixed[] PROGMEM = @@ -390,6 +409,9 @@ const char kSensorNamesFixed[] PROGMEM = const uint16_t kGpioNiceList[] PROGMEM = { GPIO_NONE, // Not used AGPIO(GPIO_OPTION_A) + MAX_OPTIONS_A, // Device specific options +#ifdef ESP32 + AGPIO(GPIO_OPTION_E) + MAX_OPTIONS_E, // Device module emulation +#endif AGPIO(GPIO_KEY1) + MAX_KEYS, // Buttons AGPIO(GPIO_KEY1_NP) + MAX_KEYS, #ifdef ESP32 @@ -1143,8 +1165,8 @@ typedef struct MYTMPLT { #define USER_MODULE 255 -// Supported hardware modules -enum SupportedModules { +// Supported ESP8266 hardware modules +enum SupportedModulesESP8266 { SONOFF_BASIC, SONOFF_RF, SONOFF_SV, SONOFF_TH, SONOFF_DUAL, SONOFF_POW, SONOFF_4CH, SONOFF_S2X, SLAMPHER, SONOFF_TOUCH, SONOFF_LED, CH1, CH4, MOTOR, ELECTRODRAGON, EXS_RELAY, WION, WEMOS, SONOFF_DEV, H801, SONOFF_SC, SONOFF_BN, SONOFF_4CHPRO, HUAFAN_SS, SONOFF_BRIDGE, SONOFF_B1, AILIGHT, SONOFF_T11, SONOFF_T12, SONOFF_T13, @@ -2556,7 +2578,7 @@ const mytmplt8285 kModules8285[TMP_MAXMODULE_8266 - TMP_WEMOS] PROGMEM = { #define USER_MODULE 255 // Supported hardware modules -enum SupportedModules { +enum SupportedModulesESP32C3 { WEMOS, MAXMODULE }; @@ -2570,7 +2592,7 @@ const char kModuleNames[] PROGMEM = "ESP32C3|" ; -// !!! Update this list in the same order as SupportedModules !!! +// !!! Update this list in the same order as SupportedModulesESP32C3 !!! const mytmplt kModules[] PROGMEM = { { // Generic ESP32C3 device AGPIO(GPIO_USER), // 0 IO GPIO0, ADC1_CH0, XTAL_32K_P @@ -2606,13 +2628,13 @@ const mytmplt kModules[] PROGMEM = { #elif defined(CONFIG_IDF_TARGET_ESP32S2) /********************************************************************************************\ - * ESP32-C3 Module templates + * ESP32-S2 Module templates \********************************************************************************************/ #define USER_MODULE 255 // Supported hardware modules -enum SupportedModules { +enum SupportedModulesESP32S2 { WEMOS, MAXMODULE }; @@ -2626,7 +2648,7 @@ const char kModuleNames[] PROGMEM = "ESP32S2|" ; -// !!! Update this list in the same order as SupportedModules !!! +// !!! Update this list in the same order as SupportedModulesESP32S2 !!! const mytmplt kModules[] PROGMEM = { { // Generic ESP32C3 device AGPIO(GPIO_USER), // 0 IO GPIO0, RTC_GPIO0, Strapping @@ -2692,7 +2714,7 @@ const mytmplt kModules[] PROGMEM = { #define USER_MODULE 255 // Supported hardware modules -enum SupportedModules { +enum SupportedModulesESP32 { WEMOS, ESP32_CAM_AITHINKER, ODROID_GO, @@ -2748,7 +2770,7 @@ const char kModuleNames[] PROGMEM = #endif // USE_M5STACK_CORE2 ; -// !!! Update this list in the same order as SupportedModules !!! +// !!! Update this list in the same order as SupportedModulesESP32 !!! const mytmplt kModules[] PROGMEM = { { // WEMOS - Espressif ESP32-DevKitC - Any ESP32 device like WeMos and NodeMCU hardware (ESP32) AGPIO(GPIO_USER), // 0 (I)O GPIO0, ADC2_CH1, TOUCH1, RTC_GPIO11, CLK_OUT1, EMAC_TX_CLK diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino index 4a46c3ae2..34e920eac 100644 --- a/tasmota/xdrv_04_light.ino +++ b/tasmota/xdrv_04_light.ino @@ -1060,11 +1060,9 @@ bool LightModuleInit(void) } #endif // ESP8266 #ifdef USE_PWM_DIMMER -#ifdef USE_DEVICE_GROUPS else if (PWM_DIMMER == TasmotaGlobal.module_type) { TasmotaGlobal.light_type = Settings->pwm_dimmer_cfg.pwm_count + 1; } -#endif // USE_DEVICE_GROUPS #endif // USE_PWM_DIMMER if (TasmotaGlobal.light_type > LT_BASIC) { @@ -2091,6 +2089,15 @@ void LightSetOutputs(const uint16_t *cur_col_10) { if (TasmotaGlobal.light_type < LT_PWM6) { // only for direct PWM lights, not for Tuya, Armtronix... #ifdef USE_PWM_DIMMER uint16_t max_col = 0; +#ifdef USE_I2C + if (TasmotaGlobal.gpio_optiona.linkind_support) { // Option_A6 + uint8_t val = change10to8(cur_col_10[Light.pwm_offset] > 0 ? changeUIntScale(cur_col_10[Light.pwm_offset], 0, Settings->pwm_range, Light.pwm_min, Light.pwm_max) : 0); + max_col = val; + uint16_t chk = 65403 - val; + uint8_t buf[] = { 0x09, 0x50, 0x01, val, 0x00, 0x00, (uint8_t)(chk >> 8), (uint8_t)(chk & 0xff) }; + I2cWriteBuffer(0x50, 0x2A, buf, sizeof(buf)); + } else +#endif // USE_I2C #endif // USE_PWM_DIMMER for (uint32_t i = 0; i < (Light.subtype - Light.pwm_offset); i++) { uint16_t cur_col = cur_col_10[i + Light.pwm_offset]; diff --git a/tasmota/xdrv_35_pwm_dimmer.ino b/tasmota/xdrv_35_pwm_dimmer.ino index aad092643..803751500 100644 --- a/tasmota/xdrv_35_pwm_dimmer.ino +++ b/tasmota/xdrv_35_pwm_dimmer.ino @@ -29,6 +29,9 @@ * https://www.amazon.com/dp/B07K67D43J * https://www.amazon.com/dp/B07TTGFWFM * +* Template for Linkind device +* {"NAME":"ESP32-Linkind","GPIO":[6213,8448,0,0,640,0,0,0,0,288,0,0,0,0,0,0,0,608,0,0,0,544,0,0,0,0,0,0,33,32,0,0,0,0,0,0],"FLAG":0,"BASE":1} +* \*********************************************************************************************/ #define XDRV_35 35 @@ -126,7 +129,11 @@ void PWMModulePreInit(void) device_group_count = button_count; // If no relay or PWM is defined, all buttons control remote devices. - if (!PinUsed(GPIO_REL1) && !PinUsed(GPIO_PWM1)) { + if (!PinUsed(GPIO_REL1) && !PinUsed(GPIO_PWM1) +#ifdef USE_I2C + && !PinUsed(GPIO_I2C_SCL) +#endif // USE_I2C + ) { first_device_group_is_local = false; // Back out the changes made in the light module under the assumtion we have a relay or PWM. @@ -165,13 +172,16 @@ void PWMDimmerSetBrightnessLeds(int32_t bri) bri = ((bri == -2 && Settings->flag4.led_timeout) || !Light.power ? 0 : light_state.getBri()); if (!bri || !Settings->flag4.led_timeout) led_timeout_seconds = 0; } - uint32_t step = 256 / (leds + 1); // Turn the LED's on/off. - uint32_t level = 0; + uint32_t step = 256 / (leds + 1); + int32_t level = 0; + if (TasmotaGlobal.gpio_optiona.linkind_support) { + step = 256 / leds; + level = -step; + } led = -1; mask = 0; - uint16_t pwm_led_bri = 0; for (uint32_t count = 0; count < leds; count++) { level += step; for (;;) { @@ -180,8 +190,12 @@ void PWMDimmerSetBrightnessLeds(int32_t bri) if (!mask) mask = 1; if (Settings->ledmask & mask) break; } - pwm_led_bri = changeUIntScale((bri > level ? bri - level : 0), 0, step, 0, Settings->pwm_range); - analogWrite(Pin(GPIO_LED1, led), bitRead(TasmotaGlobal.led_inverted, led) ? Settings->pwm_range - pwm_led_bri : pwm_led_bri); + if (TasmotaGlobal.gpio_optiona.linkind_support) { + SetLedPowerIdx(led, bri > level); + } else { + uint16_t pwm_led_bri = changeUIntScale((bri > level ? bri - level : 0), 0, step, 0, Settings->pwm_range); + analogWrite(Pin(GPIO_LED1, led), bitRead(TasmotaGlobal.led_inverted, led) ? Settings->pwm_range - pwm_led_bri : pwm_led_bri); + } } } } @@ -450,15 +464,13 @@ void PWMDimmerHandleButton(uint32_t button_index, bool pressed) if (invert_power_button_bri_direction) { invert_power_button_bri_direction = false; #ifdef USE_PWM_DIMMER_REMOTE - if (active_remote_pwm_dimmer) + if (active_remote_pwm_dimmer) { active_remote_pwm_dimmer->power_button_increases_bri ^= 1; - else + } else #endif // USE_PWM_DIMMER_REMOTE power_button_increases_bri ^= 1; -#ifdef USE_PWM_DIMMER_REMOTE dgr_item = DGR_ITEM_FLAGS; state_updated = true; -#endif // USE_PWM_DIMMER_REMOTE } } From 1573cbe6cb3ca67c5c5a4257a4cb4e6a8957f407 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Fri, 7 Jan 2022 16:43:29 +0100 Subject: [PATCH 201/402] Bump version to v2022.01.2 --- CHANGELOG.md | 10 +++++++++- RELEASENOTES.md | 2 +- tasmota/tasmota_version.h | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3d105e34..9eb919e90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,15 @@ All notable changes to this project will be documented in this file. ## [Unreleased] - Development -## [2022.01.1] +## [2022.01.2] +### Added + +### Changed + +### Fixed + + +## [2022.01.1] 20220107 ### Added - Experimental ADE7953 (Shelly EM) reset on restart (#14261) - Command ``SspmMap 2,1,..`` to map Sonoff SPM scanned module to physical module (#14281) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 01537aecd..d90179c41 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -100,7 +100,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo [Complete list](BUILDS.md) of available feature and sensors. -## Changelog v2022.01.1 +## Changelog v2022.01.2 ### Added - Command ``SSerialConfig `` to change Serial Bridge configuration - Command ``SspmMap 2,1,..`` to map Sonoff SPM scanned module to physical module [#14281](https://github.com/arendst/Tasmota/issues/14281) diff --git a/tasmota/tasmota_version.h b/tasmota/tasmota_version.h index da915aab0..aaf925516 100644 --- a/tasmota/tasmota_version.h +++ b/tasmota/tasmota_version.h @@ -20,6 +20,6 @@ #ifndef _TASMOTA_VERSION_H_ #define _TASMOTA_VERSION_H_ -const uint32_t VERSION = 0x14160101; // 2022.01.1 +const uint32_t VERSION = 0x14160102; // 2022.01.2 #endif // _TASMOTA_VERSION_H_ From f78130319a11a7e85f9ad4bd56270f747cf9a5cf Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Fri, 7 Jan 2022 17:08:17 +0100 Subject: [PATCH 202/402] Fix compilation --- tasmota/tasmota_template.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h index 8f9f2b863..749cc8bb2 100644 --- a/tasmota/tasmota_template.h +++ b/tasmota/tasmota_template.h @@ -226,6 +226,7 @@ typedef union { // Restricted by MISRA-C Rule 18.4 bu }; } GpioOptionABits; +#ifdef ESP32 enum SupportedEmulationModules { SONOFF_BASIC, SONOFF_RF, SONOFF_SV, SONOFF_TH, SONOFF_DUAL, SONOFF_POW, SONOFF_4CH, SONOFF_S2X, SLAMPHER, SONOFF_TOUCH, SONOFF_LED, CH1, CH4, MOTOR, ELECTRODRAGON, EXS_RELAY, WION, WEMOS_DUMMY, SONOFF_DEV, H801, @@ -242,6 +243,7 @@ enum SupportedEmulationModules { const uint8_t kModuleEmulationList[] PROGMEM = { PWM_DIMMER // (v2022.01.1) - Option_E1 - (Light) USE_PWM_DIMMER support }; +#endif // ESP32 // Text in webpage Module Parameters and commands GPIOS and GPIO const char kSensorNames[] PROGMEM = From 7ed19501ad64c6bcf4f956b7ec73d25a764b664a Mon Sep 17 00:00:00 2001 From: pkkrusty <79770016+pkkrusty@users.noreply.github.com> Date: Fri, 7 Jan 2022 08:17:03 -0800 Subject: [PATCH 203/402] Add DS3231 bit for turning NTP on/off --- tasmota/support_features.ino | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tasmota/support_features.ino b/tasmota/support_features.ino index 206735a15..e186f9aa3 100644 --- a/tasmota/support_features.ino +++ b/tasmota/support_features.ino @@ -787,8 +787,9 @@ void ResponseAppendFeatures(void) #ifdef USE_SHIFT595 feature8 |= 0x00080000; // xdrv_60_shift595.ino #endif - -// feature8 |= 0x00100000; +#if defined(USE_I2C) && defined(USE_DS3231) + feature8 |= 0x00100000; // xsns_33_ds3231.ino +#endif // feature8 |= 0x00200000; // feature8 |= 0x00400000; // feature8 |= 0x00800000; From 0ef8807fac49493ca1b1eb9b3298fbbfb8e24bed Mon Sep 17 00:00:00 2001 From: pkkrusty <79770016+pkkrusty@users.noreply.github.com> Date: Fri, 7 Jan 2022 08:22:54 -0800 Subject: [PATCH 204/402] Add NTP server capability to DS3231 Copied from GPS driver (xsns_60) --- tasmota/xsns_33_ds3231.ino | 58 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/tasmota/xsns_33_ds3231.ino b/tasmota/xsns_33_ds3231.ino index 6082bbe49..987cfd240 100644 --- a/tasmota/xsns_33_ds3231.ino +++ b/tasmota/xsns_33_ds3231.ino @@ -35,6 +35,9 @@ #define XSNS_33 33 #define XI2C_26 26 // See I2CDEVICES.md +#include "NTPServer.h" +#include "NTPPacket.h" + //DS3232 I2C Address #ifndef USE_RTC_ADDR #define USE_RTC_ADDR 0x68 @@ -67,6 +70,23 @@ bool ds3231ReadStatus = false; bool ds3231WriteStatus = false; //flag, we want to read/write to DS3231 only once bool DS3231chipDetected = false; +#define D_CMND_NTP "NTP" + +const char S_JSON_NTP_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_NTP "%s\":%d}"; + +const char kRTCTypes[] PROGMEM = "NTP"; + +#define NTP_MILLIS_OFFSET 50 + +NtpServer timeServer(PortUdp); + +struct NTP_t { + struct { + uint32_t init:1; + uint32_t runningNTP:1; + } mode; +} NTP; + /*----------------------------------------------------------------------* Detect the DS3231 Chip ----------------------------------------------------------------------*/ @@ -156,6 +176,39 @@ void DS3231EverySecond(void) SetDS3231Time (Rtc.utc_time); //update the DS3231 time ds3231WriteStatus = true; } + if (NTP.mode.runningNTP) { + timeServer.processOneRequest(Rtc.utc_time, NTP_MILLIS_OFFSET); + } +} + +/*********************************************************************************************\ + NTP functions + \*********************************************************************************************/ + +void NTPSelectMode(uint16_t mode) +{ + DEBUG_SENSOR_LOG(PSTR("RTC: NTP status %u"),mode); + switch(mode){ + case 0: + NTP.mode.runningNTP = false; + break; + case 1: + if (timeServer.beginListening()) { + NTP.mode.runningNTP = true; + } + break; + + } +} + +bool NTPCmd(void) +{ + bool serviced = true; + if (XdrvMailbox.data_len > 0) { + NTPSelectMode(XdrvMailbox.payload); + Response_P(S_JSON_NTP_COMMAND_NVALUE, XdrvMailbox.command, XdrvMailbox.payload); + } + return serviced; } /*********************************************************************************************\ @@ -173,6 +226,11 @@ bool Xsns33(uint8_t function) } else if (DS3231chipDetected) { switch (function) { + case FUNC_COMMAND_SENSOR: + if (XSNS_33 == XdrvMailbox.index) { + result = NTPCmd(); + } + break; case FUNC_EVERY_SECOND: DS3231EverySecond(); break; From c244965186c92d57f5896f20ba26c5ed85da3690 Mon Sep 17 00:00:00 2001 From: pkkrusty <79770016+pkkrusty@users.noreply.github.com> Date: Fri, 7 Jan 2022 08:35:00 -0800 Subject: [PATCH 205/402] Reduce difference between NTP and DS3231 before re-sync Changed a re-write of DS3231 time from a 60 second difference to a 10 second difference. --- tasmota/xsns_33_ds3231.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasmota/xsns_33_ds3231.ino b/tasmota/xsns_33_ds3231.ino index 6082bbe49..ef9435b6a 100644 --- a/tasmota/xsns_33_ds3231.ino +++ b/tasmota/xsns_33_ds3231.ino @@ -150,7 +150,7 @@ void DS3231EverySecond(void) TasmotaGlobal.rules_flag.time_set = 1; } } - else if (!ds3231WriteStatus && Rtc.utc_time > START_VALID_TIME && abs((int32_t)(Rtc.utc_time - ReadFromDS3231())) > 60) { // If time is valid and is drift from RTC in more that 60 second + else if (!ds3231WriteStatus && Rtc.utc_time > START_VALID_TIME && abs((int32_t)(Rtc.utc_time - ReadFromDS3231())) > 10) { // If time is valid and has drifted from RTC more than 10 seconds AddLog(LOG_LEVEL_INFO, PSTR("Write Time TO DS3231 from NTP (" D_UTC_TIME ") %s, (" D_DST_TIME ") %s, (" D_STD_TIME ") %s"), GetDateAndTime(DT_UTC).c_str(), GetDateAndTime(DT_DST).c_str(), GetDateAndTime(DT_STD).c_str()); SetDS3231Time (Rtc.utc_time); //update the DS3231 time From 9758587cddb4daa396ebe1f58fbc8e298cf75dd6 Mon Sep 17 00:00:00 2001 From: barbudor Date: Fri, 7 Jan 2022 20:23:33 +0100 Subject: [PATCH 206/402] favicon step 1 --- tasmota/html_compressed/HTTP_HEADER1_ES6.h | 24 ++++++++++-------- tasmota/html_compressed/HTTP_HEADER1_NOES6.h | 25 +++++++++++-------- tasmota/html_uncompressed/HTTP_HEADER1_ES6.h | 1 + .../html_uncompressed/HTTP_HEADER1_NOES6.h | 1 + 4 files changed, 31 insertions(+), 20 deletions(-) diff --git a/tasmota/html_compressed/HTTP_HEADER1_ES6.h b/tasmota/html_compressed/HTTP_HEADER1_ES6.h index d95dc2499..e6e2cffa4 100644 --- a/tasmota/html_compressed/HTTP_HEADER1_ES6.h +++ b/tasmota/html_compressed/HTTP_HEADER1_ES6.h @@ -2,21 +2,25 @@ // compressed by tools/unishox/compress-html-uncompressed.py ///////////////////////////////////////////////////////////////////// -const size_t HTTP_HEADER1_SIZE = 371; +const size_t HTTP_HEADER1_SIZE = 505; const char HTTP_HEADER1_COMPRESSED[] PROGMEM = "\x3D\x0F\xE1\x10\x98\x1D\x19\x0C\x64\x85\x50\xD0\x8F\xC3\xD0\x55\x0D\x09\x05\x7C" "\x3C\x7C\x3D\x87\xD7\x8F\x62\x0C\x2B\xF7\x8F\x87\xB0\xF6\x1F\x87\xA0\xA7\x62\x1F" "\x87\xA0\xD7\x56\x83\x15\x7F\xF3\xA3\xE1\xF6\x2E\x8C\x1D\x67\x3E\x7D\x90\x21\x52" "\xEB\x1A\xCF\x87\xB0\xCF\x58\xF8\xCC\xFD\x1E\xC4\x1E\x75\x3E\xA3\xE1\xEC\x1F\xD1" "\x28\x51\xF0\x46\x67\xA1\xB3\xAC\x7F\x44\xA1\x47\x56\xF6\xD6\xD8\x47\x5F\x83\xB0" "\x99\xF0\xE4\x3A\x88\x5F\x9F\xCE\xBF\x07\x61\x58\xE0\x99\xF3\xB0\xF6\x1D\x87\xE1" - "\xE9\x5B\x41\x33\xF0\xFA\xF2\x3A\xD1\xF5\xE3\xD0\xEC\x04\x19\x67\xA7\x83\xFE\x8C" - "\xA3\xF0\xCE\xFE\x8D\x87\xCE\x16\x10\x47\x50\x54\x75\x56\x1D\x54\x30\xEA\x18\x19" - "\xF0\xFB\x3E\xCF\x0C\x71\xF3\xC7\xC3\xF0\x4C\x0C\x58\xD7\xD4\x74\x1E\x74\x4C\x26" - "\x35\xF5\x10\xE3\x22\xD1\x0E\xEF\x8E\xF1\xE0\xD5\xE0\x48\xBA\x6A\x16\xFE\x64\x5E" - "\x61\x30\xEB\x3E\x77\x7C\x77\x8F\x1E\x18\x7C\xD3\xE1\xF8\xC7\x1D\xDD\x3B\xC7\x4A" - "\x32\x18\xCF\x87\x74\x11\xA4\x1F\x0F\x87\xDD\x33\x65\x1F\x67\x68\xFB\x19\x7E\xF0" - "\xFE\x7C\x43\xEC\xF3\x04\x19\xC7\x78\xF0\x3E\x11\xF0\xC1\xF0\xFC\x1F\xDE\x13\x07" - "\xCE\x96\x20\x84\xCC\xDF\x51\x05\xBE\xA7\xCF\xE7\x74\xFB\x0B\x2C\x43\xEC\xEA\x30" - "\x77\x8F\x06"; + "\xE8\x16\xF1\xA2\xFB\x08\xF8\x7D\xE8\x79\xC7\xDA\x15\xF6\x60\xF8\x7D\x89\x75\x67" + "\x9E\x8D\xB1\xE6\x76\x1B\x0E\xBD\x0F\x38\xF0\x3A\xFC\xCE\x76\x1D\x44\x45\x77\x63" + "\xAE\xDD\xB1\xD7\x77\x6E\xC7\x5D\x96\x15\x91\xA8\xAC\xAC\x8C\x0F\x15\x95\x95\x90" + "\x63\xC4\x57\x77\x66\xAB\xBB\xBD\xB2\x37\xA0\x11\x3B\x1D\x64\x6F\x44\x22\x64\x08" + "\x91\x8D\xE9\x44\x21\xD8\x91\xE9\x5B\x41\x33\xF0\xFA\xF2\x3A\xD1\xF5\xE3\xD0\xEC" + "\x04\x19\x67\xA7\x83\xFE\x8C\xA3\xF0\xCE\xFE\x8D\x87\xCE\x16\x10\x47\x50\x54\x75" + "\x56\x1D\x54\x30\xEA\x18\x19\xF0\xFB\x3E\xCF\x0C\x71\xF3\xC7\xC3\xF0\x4C\x0C\x58" + "\xD7\xD4\x74\x1E\x74\x4C\x26\x35\xF5\x10\xE3\x22\xD1\x0E\xEF\x8E\xF1\xE0\xD5\xE0" + "\x48\xBA\x6A\x16\xFE\x64\x5E\x61\x30\xEB\x3E\x77\x7C\x77\x8F\x1E\x18\x7C\xD3\xE1" + "\xF8\xC7\x1D\xDD\x3B\xC7\x4A\x32\x18\xCF\x87\x74\x11\xA4\x1F\x0F\x87\xDD\x33\x65" + "\x1F\x67\x68\xFB\x19\x7E\xF0\xFE\x7C\x43\xEC\xF3\x04\x19\xC7\x78\xF0\x3E\x11\xF0" + "\xC1\xF0\xFC\x1F\xDE\x13\x07\xCE\x96\x20\x84\xCC\xDF\x51\x05\xBE\xA7\xCF\xE7\x74" + "\xFB\x0B\x2C\x43\xEC\xEA\x30\x77\x8F\x06"; #define HTTP_HEADER1 Decompress(HTTP_HEADER1_COMPRESSED,HTTP_HEADER1_SIZE).c_str() \ No newline at end of file diff --git a/tasmota/html_compressed/HTTP_HEADER1_NOES6.h b/tasmota/html_compressed/HTTP_HEADER1_NOES6.h index fae966b15..0c77ca6f7 100644 --- a/tasmota/html_compressed/HTTP_HEADER1_NOES6.h +++ b/tasmota/html_compressed/HTTP_HEADER1_NOES6.h @@ -2,21 +2,26 @@ // compressed by tools/unishox/compress-html-uncompressed.py ///////////////////////////////////////////////////////////////////// -const size_t HTTP_HEADER1_SIZE = 425; +const size_t HTTP_HEADER1_SIZE = 559; const char HTTP_HEADER1_COMPRESSED[] PROGMEM = "\x3D\x0F\xE1\x10\x98\x1D\x19\x0C\x64\x85\x50\xD0\x8F\xC3\xD0\x55\x0D\x09\x05\x7C" "\x3C\x7C\x3D\x87\xD7\x8F\x62\x0C\x2B\xF7\x8F\x87\xB0\xF6\x1F\x87\xA0\xA7\x62\x1F" "\x87\xA0\xD7\x56\x83\x15\x7F\xF3\xA3\xE1\xF6\x2E\x8C\x1D\x67\x3E\x7D\x90\x21\x52" "\xEB\x1A\xCF\x87\xB0\xCF\x58\xF8\xCC\xFD\x1E\xC4\x1E\x75\x3E\xA3\xE1\xEC\x1F\xD1" "\x28\x51\xF0\x46\x67\xA1\xB3\xAC\x7F\x44\xA1\x47\x56\xF6\xD6\xD8\x47\x5F\x83\xB0" "\x99\xF0\xE4\x3A\x88\x5F\x9F\xCE\xBF\x07\x61\x58\xE0\x99\xF3\xB0\xF6\x1D\x87\xE1" - "\xE9\x5B\x41\x33\xF0\xFA\xF2\x3A\xD1\xF5\xE3\xD0\xEC\x04\x19\x67\xA7\x83\xFE\x8C" - "\xA3\xF0\xCE\xFE\x8D\x87\xCE\x16\x10\x47\x50\x54\x75\x56\x1D\x54\x30\xEA\x18\x19" - "\xF0\xFB\x3E\xCF\x06\x05\xF0\x75\xB9\xC9\x8E\x3B\xBE\x3B\xC7\xB7\xEE\x85\xFF\x90" - "\x98\x18\xB1\xAF\xA8\xE8\x3C\xE8\x98\x4C\x6B\xEA\x21\xC6\x45\xA2\x1D\xDF\x1D\xE3" - "\xC1\xEE\x04\x4C\x38\xD5\xE0\x4F\xC3\x8D\x42\xDF\xCC\x8B\xCC\x26\x1D\x67\xC1\x27" - "\x0D\xF0\xC3\xBB\xA7\x78\xF6\xB1\xC7\x77\x4E\xF1\xD2\x8C\x86\x33\xE1\xDD\x04\x69" - "\x07\xC3\xE1\xF7\x4C\xD9\x47\xD9\xDA\x3E\xC6\x5F\xBC\x3F\x9F\x10\xFB\x3C\xC1\x06" - "\x70\x23\xE3\xE3\xE1\x1D\xD3\x07\x78\xF6\x8F\xEF\x09\x83\xE7\x4B\x10\x42\x66\x6F" - "\xA8\x82\xDF\x53\xE7\xF3\xBA\x7D\x85\x96\x21\xF6\x75\x18\x3B\xC7\x83\xDC"; + "\xE8\x16\xF1\xA2\xFB\x08\xF8\x7D\xE8\x79\xC7\xDA\x15\xF6\x60\xF8\x7D\x89\x75\x67" + "\x9E\x8D\xB1\xE6\x76\x1B\x0E\xBD\x0F\x38\xF0\x3A\xFC\xCE\x76\x1D\x44\x45\x77\x63" + "\xAE\xDD\xB1\xD7\x77\x6E\xC7\x5D\x96\x15\x91\xA8\xAC\xAC\x8C\x0F\x15\x95\x95\x90" + "\x63\xC4\x57\x77\x66\xAB\xBB\xBD\xB2\x37\xA0\x11\x3B\x1D\x64\x6F\x44\x22\x64\x08" + "\x91\x8D\xE9\x44\x21\xD8\x91\xE9\x5B\x41\x33\xF0\xFA\xF2\x3A\xD1\xF5\xE3\xD0\xEC" + "\x04\x19\x67\xA7\x83\xFE\x8C\xA3\xF0\xCE\xFE\x8D\x87\xCE\x16\x10\x47\x50\x54\x75" + "\x56\x1D\x54\x30\xEA\x18\x19\xF0\xFB\x3E\xCF\x06\x05\xF0\x75\xB9\xC9\x8E\x3B\xBE" + "\x3B\xC7\xB7\xEE\x85\xFF\x90\x98\x18\xB1\xAF\xA8\xE8\x3C\xE8\x98\x4C\x6B\xEA\x21" + "\xC6\x45\xA2\x1D\xDF\x1D\xE3\xC1\xEE\x04\x4C\x38\xD5\xE0\x4F\xC3\x8D\x42\xDF\xCC" + "\x8B\xCC\x26\x1D\x67\xC1\x27\x0D\xF0\xC3\xBB\xA7\x78\xF6\xB1\xC7\x77\x4E\xF1\xD2" + "\x8C\x86\x33\xE1\xDD\x04\x69\x07\xC3\xE1\xF7\x4C\xD9\x47\xD9\xDA\x3E\xC6\x5F\xBC" + "\x3F\x9F\x10\xFB\x3C\xC1\x06\x70\x23\xE3\xE3\xE1\x1D\xD3\x07\x78\xF6\x8F\xEF\x09" + "\x83\xE7\x4B\x10\x42\x66\x6F\xA8\x82\xDF\x53\xE7\xF3\xBA\x7D\x85\x96\x21\xF6\x75" + "\x18\x3B\xC7\x83\xDC"; #define HTTP_HEADER1 Decompress(HTTP_HEADER1_COMPRESSED,HTTP_HEADER1_SIZE).c_str() \ No newline at end of file diff --git a/tasmota/html_uncompressed/HTTP_HEADER1_ES6.h b/tasmota/html_uncompressed/HTTP_HEADER1_ES6.h index d89b93352..84fe7508c 100644 --- a/tasmota/html_uncompressed/HTTP_HEADER1_ES6.h +++ b/tasmota/html_uncompressed/HTTP_HEADER1_ES6.h @@ -3,6 +3,7 @@ const char HTTP_HEADER1[] PROGMEM = "" "" "" + "" "%s - %s" "