-
-- -* ESP32 -
-
-- - -## 库安装 - -这里有2种安装方法： -1. 使用此库前，请首先下载库文件，将其粘贴到\Arduino\libraries目录中，然后打开examples文件夹并在该文件夹中运行演示。 -2. 直接在Arduino软件库管理中搜索下载 DFRobot_MAX17043 库 - -## 方法 - -```C++ - /** - * @fn DFRobot_MAX17043 - * @brief 构造MAX17043对象 - * @return MAX17043 类对象 - */ - DFRobot_MAX17043(); - /** - * @fn begin - * @brief MAX17043 初始化 - * - * @return 初始化结果 - * @retval 0 成功 - * @retval -1 失败 - */ - int begin(); - /** - * @fn readVoltage - * @brief 读电池电压，单位： mV - * @return 电池电压，单位：mV - */ - float readVoltage(); - /** - * @fn readPercentage - * @brief 读取剩余电池容量的百分比 - * - * @return 剩余电池容量的百分比 - */ - float readPercentage(); - /** - * @fn setInterrupt - * @brief 设置 MAX17043 中断阈值 - * - * @param per 中断阈值范围： %1 - 32% (整数) - */ - void setInterrupt(uint8_t per); - /** - * @fn clearInterrupt - * @brief 清除 MAX17043 中断 - */ - void clearInterrupt(); - /** - * @fn setSleep - * @brief 设置 MAX17043 进入睡眠模式 - * - */ - void setSleep(); - /** - * @fn setWakeUp - * @brief 唤醒 MAX17043 - */ - void setWakeUp(); -``` - -## 兼容性 - -| MCU | Work Well | Work Wrong | Untested | Remarks | -| ------------------ | :-------: | :--------: | :------: | ------- | -| FireBeetle-ESP32 | √ | | | -| FireBeetle-ESP8266 | √ | | | -| Arduino uno | √ | | | - -## 历史 - -- 2018/04/14 - 1.0.0 版本 - -## 创作者 - -Written by ouki.wang(ouki.wang@dfrobot.com), 2018. (Welcome to our [website](https://www.dfrobot.com/)) - - - - diff --git a/lib/lib_i2c/DFRobot_MAX17043/examples/DFRobot_MAX17043/DFRobot_MAX17043.ino b/lib/lib_i2c/DFRobot_MAX17043/examples/DFRobot_MAX17043/DFRobot_MAX17043.ino deleted file mode 100644 index 746f166fe1c9..000000000000 --- a/lib/lib_i2c/DFRobot_MAX17043/examples/DFRobot_MAX17043/DFRobot_MAX17043.ino +++ /dev/null @@ -1,74 +0,0 @@ -/*! - * @file DFRobot_MAX17043.ino - * @brief connect gauge I2C interface with your board (please reference board compatibility) - * @n Voltage, percentage will be printed via serial. - * @n Use API to config alaram and sleep (please reference to the readme in lib) - * - * @copyright Copyright (c) 2010 DFRobot Co.Ltd (http://www.dfrobot.com) - * @license The MIT License (MIT) - * @author [ouki.wang](ouki.wang@dfrobot.com) - * @version V1.0 - * @date 2018-4-14 - * @url https://github.com/DFRobot/DFRobot_MAX17043 - */ - -#include "DFRobot_MAX17043.h" -#include "Wire.h" - -#ifdef __AVR__ - #define ALR_PIN 2 -#else - #define ALR_PIN D2 -#endif - -#define PRINT_INTERVAL 2000 - -DFRobot_MAX17043 gauge; -uint8_t intFlag = 0; - -void interruptCallBack() -{ - intFlag = 1; -} - -void setup() -{ - Serial.begin(115200); - while(!Serial); - Serial.println(); - Serial.println(); - pinMode(ALR_PIN, INPUT_PULLUP); - attachInterrupt(ALR_PIN, interruptCallBack, FALLING); //default alert is 32% - - while(gauge.begin() != 0) { - Serial.println("gauge begin faild!"); - delay(2000); - } - delay(2); - Serial.println("gauge begin successful!"); - //gauge.setInterrupt(32); //use this to modify alert threshold as 1% - 32% (integer) -} - -void loop() -{ - static unsigned long lastMillis = 0; - if((millis() - lastMillis) > PRINT_INTERVAL) { - lastMillis = millis(); - Serial.println(); - - Serial.print("voltage: "); - Serial.print(gauge.readVoltage()); - Serial.println(" mV"); - - Serial.print("precentage: "); - Serial.print(gauge.readPercentage()); - Serial.println(" %"); - } - - if(intFlag == 1) { - intFlag = 0; - gauge.clearInterrupt(); - Serial.println("Low power alert interrupt!"); - //put your battery low power alert interrupt service routine here - } -} diff --git a/lib/lib_i2c/DFRobot_MAX17043/keywords.txt b/lib/lib_i2c/DFRobot_MAX17043/keywords.txt deleted file mode 100644 index bcb479a57948..000000000000 --- a/lib/lib_i2c/DFRobot_MAX17043/keywords.txt +++ /dev/null @@ -1,9 +0,0 @@ -DFRobot_MAX17043 KEYWORD1 - -begin KEYWORD2 -readVoltage KEYWORD2 -readPercentage KEYWORD2 -setInterrupt KEYWORD2 -clearInterrupt KEYWORD2 -setSleep KEYWORD2 -setWakeUp KEYWORD2 \ No newline at end of file diff --git a/lib/lib_i2c/DFRobot_MAX17043/library.properties b/lib/lib_i2c/DFRobot_MAX17043/library.properties deleted file mode 100644 index c769e3bef282..000000000000 --- a/lib/lib_i2c/DFRobot_MAX17043/library.properties +++ /dev/null @@ -1,9 +0,0 @@ -name=DFRobot_MAX17043 -version=1.0.0 -author=DFRobot -maintainer=ouki.wang
-
-- - -## Installation - -To use this library download the zip file, uncomperss it to a folder named DFRobot_MAX17043 in your upyCraft workspace. - -## Methods - -```python - '''! - @brief MAX17043 begin and test moudle - @return initialization result: - @retval 0 successful - @retval -1 faild - ''' - def begin(self): - - '''! - @brief read battery voltage in mV - @return voltage in mV - ''' - def read_voltage(self): - - '''! - @brief read battery remaining capacity in percentage - @return battery remaining capacity in percentage - ''' - def read_percentage(self): - '''! - @brief set MAX17043 interrput threshold - @param per interrupt threshold as %1 - 32% (integer) - ''' - def set_interrupt(self, per): - - '''! - @brief clear MAX17043 interrupt. - ''' - def clear_interrupt(self): - - '''! - @brief set MAX17043 in sleep mode. - ''' - def set_sleep(self): - - '''! - @brief wake up MAX17043. - ''' - -``` -## Compatibility - -| MCU | Work Well | Work Wrong | Untested | Remarks | -| ------------------ | :-------: | :--------: | :------: | ------- | -| ESP32 | √ | | | - -## History - -- 2018/04/14 - Version 1.0.0 released. - -## Credits - -Written by ouki.wang(ouki.wang@dfrobot.com), 2018. (Welcome to our [website](https://www.dfrobot.com/)) diff --git a/lib/lib_i2c/DFRobot_MAX17043/python/micropython/README_CN.md b/lib/lib_i2c/DFRobot_MAX17043/python/micropython/README_CN.md deleted file mode 100644 index 48af8058c065..000000000000 --- a/lib/lib_i2c/DFRobot_MAX17043/python/micropython/README_CN.md +++ /dev/null @@ -1,97 +0,0 @@ -# DFRobot_MAX17043 - -* [English Version](./README.md) - -Gravity 3.7V锂电池电量计使用Gravity I2C接口，超低工作电流，通过Maxim专利算法，实时跟踪电池的相对充电状态(SOC，State-Of-Charge)，无需充放电学习过程，无积累误差，即插即用，准确地测量锂电池的当前电压和剩余电量。模块预留低电量报警中断引脚，当电池电量低于指定电量时，该引脚产生一个下跳脉冲，触发主控的外部中断。 - - - - -## 产品链接（[https://www.dfrobot.com.cn/goods-1743.html](https://www.dfrobot.com.cn/goods-1743.html)） - SKU: DFR0563 - -## 目录 - -* [概述](#概述) -* [连接](连接) -* [库安装](#库安装) -* [方法](#方法) -* [兼容性](#兼容性) -* [历史](#历史) -* [创作者](#创作者) - -## 概述 -提供 microPython 库，用于通过 I2C 读取和解释 MAX17043 数据 - -## 连接 -相同颜色的线连接在一起，我们只举例说明主板是如何连接到电量计的。接线时要注意管脚的对应关系，接线图如下： - -* ESP32 - -
-
-- - -## 库安装 - -要使用此库，请下载 zip 文件，将其解压缩到 upyCraft 工作区中名为 DFRobot_MAX17043 的文件夹中。 - -## 方法 - -```python - '''! - @brief 构造MAX17043对象 - @return MAX17043 初始化 - @retval 0 成功 - @retval -1 失败 - ''' - def begin(self): - - '''! - @brief 读电池电压，单位： mV - @return 电池电压，单位：mV - ''' - def read_voltage(self): - - '''! - @brief 读取剩余电池容量的百分比 - @return 剩余电池容量的百分比 - ''' - def read_percentage(self): - '''! - @brief 设置 MAX17043 中断阈值 - @param per 中断阈值范围： %1 - 32% (整数) - ''' - def set_interrupt(self, per): - - '''! - @brief 清除 MAX17043 中断. - ''' - def clear_interrupt(self): - - '''! - @brief 设置 MAX17043 进入睡眠模式 - ''' - def set_sleep(self): - - '''! - @brief 唤醒 MAX17043 - ''' - def set_wakeup(self): -``` - -## 兼容性 - -| MCU | Work Well | Work Wrong | Untested | Remarks | -| ------------------ | :-------: | :--------: | :------: | ------- | -| ESP32 | √ | | | - -## 历史 - -- 2018/04/14 - 1.0.0 版本 - -## 创作者 - -Written by ouki.wang(ouki.wang@dfrobot.com), 2018. (Welcome to our [website](https://www.dfrobot.com/)) - diff --git a/lib/lib_i2c/DFRobot_MAX17043/python/micropython/demo_MAX17043.py b/lib/lib_i2c/DFRobot_MAX17043/python/micropython/demo_MAX17043.py deleted file mode 100644 index d6d5e2f549a5..000000000000 --- a/lib/lib_i2c/DFRobot_MAX17043/python/micropython/demo_MAX17043.py +++ /dev/null @@ -1,38 +0,0 @@ -'''! - @file demo_MAX17043.py - @copyright Copyright (c) 2010 DFRobot Co.Ltd (http://www.dfrobot.com) - @license The MIT License (MIT) - @author [ouki.wang](ouki.wang@dfrobot.com) - @version V1.0 - @date 2018-4-14 - @url https://github.com/DFRobot/DFRobot_MAX17043 -''' - -import time -from machine import Pin -from DFRobot_MAX17043 import DFRobot_MAX17043 - -gauge = DFRobot_MAX17043() - -def interruptCallBack(channel): - gauge.clear_interrupt() - print('Low power alert interrupt!') - #put your battery low power alert interrupt service routine here - -pin_irq = Pin(25, Pin.IN) -pin_irq.irq(trigger = Pin.IRQ_FALLING, handler = interruptCallBack) - -rslt = gauge.begin() - -while rslt != 0: - print('gauge begin faild') - time.sleep(2) - rslt = gauge.begin() - -#gauge.set_Interrupt(32) #use this to modify alert threshold as 1% - 32% (integer) -print('gauge begin successful') - -while True: - time.sleep(2) - print('voltage: ' + str(gauge.read_voltage()) + 'mV') - print('percentage: ' + str(round(gauge.read_percentage(), 2)) + '%') diff --git a/lib/lib_i2c/DFRobot_MAX17043/python/raspberry/DFRobot_MAX17043.py b/lib/lib_i2c/DFRobot_MAX17043/python/raspberry/DFRobot_MAX17043.py deleted file mode 100644 index 1ddc751caf7e..000000000000 --- a/lib/lib_i2c/DFRobot_MAX17043/python/raspberry/DFRobot_MAX17043.py +++ /dev/null @@ -1,109 +0,0 @@ -'''! - @file DFRobot_MAX17043.py - @copyright Copyright (c) 2010 DFRobot Co.Ltd (http://www.dfrobot.com) - @license The MIT License (MIT) - @author [ouki.wang](ouki.wang@dfrobot.com) - @version V1.0 - @date 2018-4-14 - @url https://github.com/DFRobot/DFRobot_MAX17043 -''' - -import smbus -import time -import datetime - -# Get I2C bus -bus = smbus.SMBus(1) - -MAX17043_ADDR = 0x36 -MAX17043_VCELL = 0x02 -MAX17043_SOC = 0x04 -MAX17043_MODE = 0x06 -MAX17043_VERSION = 0x08 -MAX17043_CONFIG = 0x0c -MAX17043_COMMAND = 0xfe - -class DFRobot_MAX17043(): - - def __init__(self): - '''! - @brief create MAX17043 object - @return MAX17043 object - ''' - pass - - def begin(self): - '''! - @brief MAX17043 begin and test moudle - @return initialization result: - @retval 0 successful - @retval -1 faild - ''' - self._write16(MAX17043_COMMAND, 0x5400) - time.sleep(0.01) - if self._read16(MAX17043_CONFIG) == 0x971c: - self._write16(MAX17043_MODE, 0x4000) - time.sleep(0.01) - self._write16(MAX17043_CONFIG, 0x9700) - return 0 - else: - return -1 - - def read_voltage(self): - '''! - @brief read battery voltage in mV - @return voltage in mV - ''' - return (1.25 * (self._read16(MAX17043_VCELL) >> 4)) - - def read_percentage(self): - '''! - @brief read battery remaining capacity in percentage - @return battery remaining capacity in percentage - ''' - tmp = self._read16(MAX17043_SOC) - return ((tmp >> 8) + 0.003906 * (tmp & 0x00ff)) - - def set_interrupt(self, per): - '''! - @brief set MAX17043 interrput threshold - @param per interrupt threshold as %1 - 32% (integer) - ''' - if per > 32: - per = 32 - elif per < 1: - per = 1 - per = 32 - int(per) - self._write_reg_bits(MAX17043_CONFIG, per, 0x01f, 0) - - def clear_interrupt(self): - '''! - @brief clear MAX17043 interrupt. - ''' - self._write_reg_bits(MAX17043_CONFIG, 0, 0x01, 5) - - def set_sleep(self): - '''! - @brief set MAX17043 in sleep mode. - ''' - self._write_reg_bits(MAX17043_CONFIG, 1, 0x01, 7) - - def set_wakeup(self): - '''! - @brief wake up MAX17043. - ''' - self._write_reg_bits(MAX17043_CONFIG, 0, 0x01, 7) - - def _write16(self, reg, dat): - buf = [dat >> 8, dat & 0x00ff] - bus.write_i2c_block_data(MAX17043_ADDR, reg, buf) - - def _read16(self, reg): - buf = bus.read_i2c_block_data(MAX17043_ADDR, reg, 2) - return ((buf[0] << 8) | buf[1]) - - def _write_reg_bits(self, reg, dat, bits, offset): - tmp = self._read16(reg) - tmp = (tmp & (~(bits << offset))) | (dat << offset) - self._write16(reg, tmp) - diff --git a/lib/lib_i2c/DFRobot_MAX17043/python/raspberry/README.md b/lib/lib_i2c/DFRobot_MAX17043/python/raspberry/README.md deleted file mode 100644 index 47bd4267868e..000000000000 --- a/lib/lib_i2c/DFRobot_MAX17043/python/raspberry/README.md +++ /dev/null @@ -1,128 +0,0 @@ -# DFRobot_MAX17043 - -* [中文版](./README_CN.md) - -The MAX17043 is ultra-compact, low-cost,host-side fuel-gauge systems for lithium-ion (Li+) batter-ies in handheld and portable -equpiment.It employs Gravity I2C interface,ultra-low opearting current, and real-time tracking of the relative state of charge -(SOC) of the battery through Maxim's patented algorithm,eliminating the need for full-to-empty relearning and offset accumualtion -errors.Plug and play to accurately measure the voltage and remaining power of the battery. The module also features as a low -battery power alert interrupt function. When the battery power falls below specified threshold, the ALR pin generates a falling -pluse to trigger the external interrupt of the controller.One thing should mention that the default value of the battery low power -interrupt alert threshold is 32%, this threshold can be set by the function set_interrupt(). - - - -## Product Link（[https://www.dfrobot.com/product-1734.html](https://www.dfrobot.com/product-1734.html)） - SKU: DFR0563 - -## Table of Contents -* [Summary](#summary) -* [connection](connection) -* [Installation](#installation) -* [Methods](#methods) -* [Compatibility](#compatibility) -* [History](#history) -* [Credits](#credits) - -## Summary - -Provides an Raspberry pi library for reading and interperting MAX17043 data over I2C. - -## Connection -Wires of the same color are linked together,and We only exemplify how these three boards are connected to the Fuel Gauge. -When connecting , it is necessary to pay attention to the correspondence among pins, the connection diagram is as fellows. - -* Raspberry Pi -
-
-- -## Installation - -Download and install smbus library on Raspberry pi. Steps to install smbus are provided at: - -```python -$> sudo apt-get install -y python-smbus -$> sudo apt-get install -y i2c-tools -``` - -1. To use this library, first download the library file
-```python -sudo git clone https://github.com/DFRobot/DFRobot_MAX17043 -``` -2. Open and run the routine. To execute a routine demo_x.py, enter python demo_x.py in the command line. For example, to execute the demo_read_and_int.py.py routine, you need to enter :
- -```python -python demo_read_and_int.py.py -or -python2 demo_read_and_int.py.py -``` - -## Methods - -```python - '''! - @brief MAX17043 begin and test moudle - @return initialization result: - @retval 0 successful - @retval -1 faild - ''' - def begin(self): - - '''! - @brief read battery voltage in mV - @return voltage in mV - ''' - def read_voltage(self): - - '''! - @brief read battery remaining capacity in percentage - @return battery remaining capacity in percentage - ''' - def read_percentage(self): - '''! - @brief set MAX17043 interrput threshold - @param per interrupt threshold as %1 - 32% (integer) - ''' - def set_interrupt(self, per): - - '''! - @brief clear MAX17043 interrupt. - ''' - def clear_interrupt(self): - - '''! - @brief set MAX17043 in sleep mode. - ''' - def set_sleep(self): - - '''! - @brief wake up MAX17043. - ''' - def set_wakeup(self): - - -``` - -## Compatibility - -| 主板 | 通过 | 未通过 | 未测试 | 备注 | -| ------------ | :--: | :----: | :----: | :--: | -| RaspberryPi2 | | | √ | | -| RaspberryPi3 | | | √ | | -| RaspberryPi4 | √ | | | | - -* Python 版本 - -| Python | 通过 | 未通过 | 未测试 | 备注 | -| ------- | :--: | :----: | :----: | ---- | -| Python2 | √ | | | | -| Python3 | | | √ | | - -## History - -- 2018/04/14 - Version 1.0.0 released. - -## Credits - -Written by ouki.wang(ouki.wang@dfrobot.com), 2018. (Welcome to our [website](https://www.dfrobot.com/)) diff --git a/lib/lib_i2c/DFRobot_MAX17043/python/raspberry/README_CN.md b/lib/lib_i2c/DFRobot_MAX17043/python/raspberry/README_CN.md deleted file mode 100644 index 00894b09a262..000000000000 --- a/lib/lib_i2c/DFRobot_MAX17043/python/raspberry/README_CN.md +++ /dev/null @@ -1,119 +0,0 @@ -# DFRobot_MAX17043 - -* [English Version](./README.md) - -Gravity 3.7V锂电池电量计使用Gravity I2C接口，超低工作电流，通过Maxim专利算法，实时跟踪电池的相对充电状态(SOC，State-Of-Charge)，无需充放电学习过程，无积累误差，即插即用，准确地测量锂电池的当前电压和剩余电量。模块预留低电量报警中断引脚，当电池电量低于指定电量时，该引脚产生一个下跳脉冲，触发主控的外部中断。 - - - - -## 产品链接（[https://www.dfrobot.com.cn/goods-1743.html](https://www.dfrobot.com.cn/goods-1743.html)） - SKU: DFR0563 - -## 目录 - -* [概述](#概述) -* [连接](连接) -* [库安装](#库安装) -* [方法](#方法) -* [兼容性](#兼容性) -* [历史](#历史) -* [创作者](#创作者) - -## 概述 - -提供 python 库，用于通过 I2C 读取和解释 MAX17043 数据。 - -## 连接 -相同颜色的线连接在一起，我们只举例说明主板是如何连接到电量计的。接线时要注意管脚的对应关系，接线图如下： - -* Raspberry Pi -
-
-- -## 库安装 -1. 下载库至树莓派，要使用这个库，首先要将库下载到Raspberry Pi，命令下载方法如下:
-```python -sudo git clone https://github.com/DFRobot/DFRobot_MAX17043 -``` -2. 打开并运行例程，要执行一个例程demo_x.py，请在命令行中输入python demo_x.py。例如，要执行 demo_read_and_int.py例程，你需要输入:
- -```python -python demo_read_and_int.py -或 -python2 demo_read_and_int.py -``` - -## 方法 - -```python - '''! - @brief 构造MAX17043对象 - @return MAX17043 初始化 - @retval 0 成功 - @retval -1 失败 - ''' - def begin(self): - - '''! - @brief 读电池电压，单位： mV - @return 电池电压，单位：mV - ''' - def read_voltage(self): - - '''! - @brief 读取剩余电池容量的百分比 - @return 剩余电池容量的百分比 - ''' - def read_percentage(self): - '''! - @brief 设置 MAX17043 中断阈值 - @param per 中断阈值范围： %1 - 32% (整数) - ''' - def set_interrupt(self, per): - - '''! - @brief 清除 MAX17043 中断. - ''' - def clear_interrupt(self): - - '''! - @brief 设置 MAX17043 进入睡眠模式 - ''' - def set_sleep(self): - - '''! - @brief 唤醒 MAX17043 - ''' - def set_wakeup(self): -``` - -## 兼容性 - -| 主板 | 通过 | 未通过 | 未测试 | 备注 | -| ------------ | :--: | :----: | :----: | :--: | -| RaspberryPi2 | | | √ | | -| RaspberryPi3 | | | √ | | -| RaspberryPi4 | √ | | | | - -* Python 版本 - -| Python | 通过 | 未通过 | 未测试 | 备注 | -| ------- | :--: | :----: | :----: | ---- | -| Python2 | √ | | | | -| Python3 | | | √ | | - -## 历史 - -- 2018/04/14 - 1.0.0 版本 - -## 创作者 - -Written by ouki.wang(ouki.wang@dfrobot.com), 2018. (Welcome to our [website](https://www.dfrobot.com/)) - - - - - - diff --git a/lib/lib_i2c/DFRobot_MAX17043/python/raspberry/examples/demo_read_and_int.py b/lib/lib_i2c/DFRobot_MAX17043/python/raspberry/examples/demo_read_and_int.py deleted file mode 100644 index dd328c6402d6..000000000000 --- a/lib/lib_i2c/DFRobot_MAX17043/python/raspberry/examples/demo_read_and_int.py +++ /dev/null @@ -1,44 +0,0 @@ -'''! - @file demo_read_and_int.py - @copyright Copyright (c) 2010 DFRobot Co.Ltd (http://www.dfrobot.com) - @license The MIT License (MIT) - @author [ouki.wang](ouki.wang@dfrobot.com) - @version V1.0 - @date 2018-4-14 - @url https://github.com/DFRobot/DFRobot_MAX17043 -''' - -import sys -sys.path.append('../') -import time - -sys.path.append(os.path.dirname(os.path.dirname(os.path.realpath(__file__)))) -from DFRobot_MAX17043 import DFRobot_MAX17043 -import RPi.GPIO as GPIO - -gauge = DFRobot_MAX17043() - -GPIO.setmode(GPIO.BOARD) -GPIO.setup(7, GPIO.IN) - -def interruptCallBack(channel): - gauge.clear_interrupt() - print('Low power alert interrupt!') - #put your battery low power alert interrupt service routine here - -GPIO.add_event_detect(7, GPIO.FALLING, callback = interruptCallBack, bouncetime = 5) - -rslt = gauge.begin() - -while rslt != 0: - print('gauge begin faild') - time.sleep(2) - rslt = gauge.begin() - -gauge.set_interrupt(32) #use this to modify alert threshold as 1% - 32% (integer) -print('gauge begin successful') - -while True: - time.sleep(2) - print('voltage: ' + str(gauge.read_voltage()) + 'mV') - print('percentage: ' + str(round(gauge.read_percentage(), 2)) + '%') diff --git a/lib/lib_i2c/DFRobot_MAX17043/readme.md b/lib/lib_i2c/DFRobot_MAX17043/readme.md deleted file mode 100644 index fdc79ac77b4f..000000000000 --- a/lib/lib_i2c/DFRobot_MAX17043/readme.md +++ /dev/null @@ -1,122 +0,0 @@ -# DFRobot_MAX17043 - -* [中文版](./README_CN.md) - - The MAX17043 is ultra-compact, low-cost,host-side fuel-gauge systems for lithium-ion (Li+) batter-ies in handheld and portable -equipment.It employs Gravity I2C interface,ultra-low opearting current, and real-time tracking of the relative state of charge (SOC) -of the battery through Maxim's patented algorithm,eliminating the need for full-to-empty relearning and offset accumualtion errors. -Plug and play to accurately measure the voltage and remaining power of the battery. The module also features as a low battery power -alert interrupt function. When the battery power falls below specified threshold, the ALR pin generates a falling pluse to trigger -the external interrupt of the controller.One thing should mention that the default value of the battery low power interrupt alert -threshold is 32%, this threshold can be set by the function setInterrupt(). - - - -## Product Link（[https://www.dfrobot.com/product-1734.html](https://www.dfrobot.com/product-1734.html)） - SKU: DFR0563 - -## Table of Contents -* [Summary](#summary) -* [connection](connection) -* [Installation](#installation) -* [Methods](#methods) -* [Compatibility](#compatibility) -* [History](#history) -* [Credits](#credits) - -## Summary - -Provides an Arduino library for reading and interperting MAX17043 data over I2C. - -## Connection -Wires of the same color are linked together,and We only exemplify how these the boards are connected to the Fuel Gauge. -When connecting , it is necessary to pay attention to the correspondence among pins, the connection diagram is as fellows. - -* Arduino UNO -
-
-- -* ESP32 -
-
-- - -## Installation - -To use this library download the zip file, uncomperss it to a folder named DFRobot_MAX17043 in Arduino library. -## Methods - -```C++ - /** - * @fn DFRobot_MAX17043 - * @brief create MAX17043 object - * @return MAX17043 object - */ - DFRobot_MAX17043(); - /** - * @fn begin - * @brief MAX17043 begin and test moudle - * - * @return initialization result - * @retval 0 successful - * @retval -1 faild - */ - int begin(); - /** - * @fn readVoltage - * @brief read battery voltage in mV - * @return voltage in mV - */ - float readVoltage(); - /** - * @fn readPercentage - * @brief read battery remaining capacity in percentage - * - * @return battery remaining capacity in percentage - */ - float readPercentage(); - /** - * @fn setInterrupt - * @brief set MAX17043 interrput threshold - * - * @param per interrupt threshold as %1 - 32% (integer) - */ - void setInterrupt(uint8_t per); - /** - * @fn clearInterrupt - * @brief clear MAX17043 interrupt - */ - void clearInterrupt(); - /** - * @fn setSleep - * @brief set MAX17043 in sleep mode - * - */ - void setSleep(); - /** - * @fn setWakeUp - * @brief wake up MAX17043 - * - */ - void setWakeUp(); - -``` - -## Compatibility - -| MCU | Work Well | Work Wrong | Untested | Remarks | -| ------------------ | :-------: | :--------: | :------: | ------- | -| FireBeetle-ESP32 | √ | | | -| FireBeetle-ESP8266 | √ | | | -| Arduino uno | √ | | | - -## History - -- 2018/04/14 - Version 1.0.0 released. - -## Credits - -Written by ouki.wang(ouki.wang@dfrobot.com), 2018. (Welcome to our [website](https://www.dfrobot.com/)) - diff --git a/lib/lib_i2c/DFRobot_MAX17043/resources/images/DFR0563.jpg b/lib/lib_i2c/DFRobot_MAX17043/resources/images/DFR0563.jpg deleted file mode 100644 index eb0370a56c7a..000000000000 Binary files a/lib/lib_i2c/DFRobot_MAX17043/resources/images/DFR0563.jpg and /dev/null differ diff --git a/lib/lib_i2c/DFRobot_MAX17043/resources/images/Raspberry Pi.jpg b/lib/lib_i2c/DFRobot_MAX17043/resources/images/Raspberry Pi.jpg deleted file mode 100644 index 3ab96c2cde7f..000000000000 Binary files a/lib/lib_i2c/DFRobot_MAX17043/resources/images/Raspberry Pi.jpg and /dev/null differ diff --git a/lib/lib_i2c/DFRobot_MAX17043/resources/images/UNO.jpg b/lib/lib_i2c/DFRobot_MAX17043/resources/images/UNO.jpg deleted file mode 100644 index 8c3d66b65330..000000000000 Binary files a/lib/lib_i2c/DFRobot_MAX17043/resources/images/UNO.jpg and /dev/null differ diff --git a/lib/lib_i2c/DFRobot_MAX17043/resources/images/esp32.jpg b/lib/lib_i2c/DFRobot_MAX17043/resources/images/esp32.jpg deleted file mode 100644 index 41b163cfd552..000000000000 Binary files a/lib/lib_i2c/DFRobot_MAX17043/resources/images/esp32.jpg and /dev/null differ diff --git a/lib/libesp32/ESP32-to-ESP8266-compat/src/ESP32Wifi.cpp b/lib/libesp32/ESP32-to-ESP8266-compat/src/ESP32Wifi.cpp index d5d8edb3c33e..ea288d5478ed 100644 --- a/lib/libesp32/ESP32-to-ESP8266-compat/src/ESP32Wifi.cpp +++ b/lib/libesp32/ESP32-to-ESP8266-compat/src/ESP32Wifi.cpp @@ -111,18 +111,6 @@ void WiFiClass32::scrubDNS(void) { } else { dns_setserver(i, IP4_ADDR_ANY); } -#else // USE_IPV6 - uint32_t ip_dns = ip_addr_get_ip4_u32(dns_getserver(i)); - // Step 1. save valid values from DNS - if (has_v4 && (uint32_t)ip_dns != 0) { - ip_addr_set_ip4_u32_val(dns_save4[i], ip_dns); - } - // Step 2. scrub addresses not supported - if (!has_v4) { - ip_addr_set_ip4_u32_val(dns_save4[i], 0L); - } - // Step 3. restore saved value - dns_setserver(i, &dns_save4[i]); #endif // USE_IPV6 } // AddLog(LOG_LEVEL_DEBUG, "IP>: DNS: from(%s %s) to (%s %s) has4/6:%i-%i", dns_entry0.c_str(), dns_entry1.c_str(), IPAddress(dns_getserver(0)).toString().c_str(), IPAddress(dns_getserver(1)).toString().c_str(), has_v4, has_v6); diff --git a/lib/libesp32/ESP32-to-ESP8266-compat/src/ESP8266WiFi.h b/lib/libesp32/ESP32-to-ESP8266-compat/src/ESP8266WiFi.h index 943b89e9aad5..94cf3d6c1a21 100644 --- a/lib/libesp32/ESP32-to-ESP8266-compat/src/ESP8266WiFi.h +++ b/lib/libesp32/ESP32-to-ESP8266-compat/src/ESP8266WiFi.h @@ -76,8 +76,8 @@ class WiFiClass32 : public WiFiClass void scrubDNS(void); protected: - ip_addr_t dns_save4[DNS_MAX_SERVERS] = {}; // IPv4 DNS servers #ifdef USE_IPV6 + ip_addr_t dns_save4[DNS_MAX_SERVERS] = {}; // IPv4 DNS servers ip_addr_t dns_save6[DNS_MAX_SERVERS] = {}; // IPv6 DNS servers #endif // USE_IPV6 }; diff --git a/lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.cpp b/lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.cpp index dfc8c3dab0f8..c886a666da3a 100644 --- a/lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.cpp +++ b/lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.cpp @@ -16,6 +16,7 @@ #ifdef ESP32 #include "Arduino.h" +#include "esp_idf_version.h" #include "esp8266toEsp32.h" #include "driver/ledc.h" @@ -33,7 +34,11 @@ enum LoggingLevels {LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_D #else #define LEDC_DEFAULT_CLK LEDC_AUTO_CLK #endif -#define LEDC_MAX_BIT_WIDTH SOC_LEDC_TIMER_BIT_WIDE_NUM +#if (ESP_IDF_VERSION_MAJOR >= 5) + #define LEDC_MAX_BIT_WIDTH SOC_LEDC_TIMER_BIT_WIDTH +#else + #define LEDC_MAX_BIT_WIDTH SOC_LEDC_TIMER_BIT_WIDE_NUM +#endif // define our limits to ease any change from esp-idf #define MAX_TIMERS LEDC_TIMER_MAX // 4 timers for all ESP32 variants diff --git a/lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.h b/lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.h index c544d5d30379..07bc9c2d5c2e 100644 --- a/lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.h +++ b/lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.h @@ -53,7 +53,7 @@ uint8_t ledcReadResolution(uint8_t chan); // was not yet attached. // // Returns: hardware channel number, or -1 if it failed -int analogAttach(uint32_t pin, bool output_invert = false); // returns the ledc channel, or -1 if failed. This is implicitly called by analogWrite if the channel was not already allocated +int32_t analogAttach(uint32_t pin, bool output_invert = false); // returns the ledc channel, or -1 if failed. This is implicitly called by analogWrite if the channel was not already allocated // change both freq and range // `0`: set to global value diff --git a/lib/libesp32/berry/src/be_byteslib.c b/lib/libesp32/berry/src/be_byteslib.c index 665d630f3a3e..0a5c1747e6ea 100644 --- a/lib/libesp32/berry/src/be_byteslib.c +++ b/lib/libesp32/berry/src/be_byteslib.c @@ -356,6 +356,40 @@ static uint16_t buf_get2_be(buf_impl* attr, size_t offset) return 0; } +static uint32_t buf_get3_le(buf_impl* attr, size_t offset) +{ + if ((int32_t)offset + 2 < attr->len) { + return attr->bufptr[offset] | (attr->bufptr[offset+1] << 8) | (attr->bufptr[offset+2] << 16); + } + return 0; +} + +static uint16_t buf_get3_be(buf_impl* attr, size_t offset) +{ + if ((int32_t)offset + 2 < attr->len) { + return attr->bufptr[offset+2] | (attr->bufptr[offset+1] << 8) | (attr->bufptr[offset] << 16); + } + return 0; +} + +static void buf_set3_le(buf_impl* attr, size_t offset, uint32_t data) +{ + if ((int32_t)offset + 2 < attr->len) { + attr->bufptr[offset] = data & 0xFF; + attr->bufptr[offset+1] = (data >> 8) & 0xFF; + attr->bufptr[offset+2] = (data >> 16) & 0xFF; + } +} + +static void buf_set3_be(buf_impl* attr, size_t offset, uint32_t data) +{ + if ((int32_t)offset + 2 < attr->len) { + attr->bufptr[offset+2] = data & 0xFF; + attr->bufptr[offset+1] = (data >> 8) & 0xFF; + attr->bufptr[offset] = (data >> 16) & 0xFF; + } +} + static void buf_set4_le(buf_impl* attr, size_t offset, uint32_t data) { if ((int32_t)offset + 3 < attr->len) { @@ -832,12 +866,18 @@ static int m_get(bvm *vm, bbool sign) case 2: ret = buf_get2_le(&attr, idx); if (sign) { ret = (int16_t)(uint16_t) ret; } break; + case 3: ret = buf_get3_le(&attr, idx); + if (sign & (ret & 0x800000)) { ret = ret | 0xFF000000; } + break; case 4: ret = buf_get4_le(&attr, idx); break; case -2: ret = buf_get2_be(&attr, idx); if (sign) { ret = (int16_t)(uint16_t) ret; } break; + case -3: ret = buf_get3_be(&attr, idx); + if (sign & (ret & 0x800000)) { ret = ret | 0xFF000000; } + break; case -4: ret = buf_get4_be(&attr, idx); break; - default: be_raise(vm, "type_error", "size must be -4, -2, -1, 0, 1, 2 or 4."); + default: be_raise(vm, "type_error", "size must be -4, -3, -2, -1, 0, 1, 2, 3 or 4."); } be_pop(vm, argc - 1); if (vsize != 0) { @@ -911,10 +951,12 @@ static int m_set(bvm *vm) case -1: /* fallback below */ case 1: buf_set1(&attr, idx, value); break; case 2: buf_set2_le(&attr, idx, value); break; + case 3: buf_set3_le(&attr, idx, value); break; case 4: buf_set4_le(&attr, idx, value); break; case -2: buf_set2_be(&attr, idx, value); break; + case -3: buf_set3_be(&attr, idx, value); break; case -4: buf_set4_be(&attr, idx, value); break; - default: be_raise(vm, "type_error", "size must be -4, -2, -1, 0, 1, 2 or 4."); + default: be_raise(vm, "type_error", "size must be -4, -3, -2, -1, 0, 1, 2, 3 or 4."); } be_pop(vm, argc - 1); m_write_attributes(vm, 1, &attr); /* update attributes */ diff --git a/lib/libesp32/berry_mapping/src/be_cb_module.c b/lib/libesp32/berry_mapping/src/be_cb_module.c index 7bf729a0b018..111ba95e052d 100644 --- a/lib/libesp32/berry_mapping/src/be_cb_module.c +++ b/lib/libesp32/berry_mapping/src/be_cb_module.c @@ -22,10 +22,10 @@ enum LoggingLevels {LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_D * 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); +typedef int (*berry_callback_t)(int v0, int v1, int v2, int v3); +static int call_berry_cb(int num, int v0, int v1, int v2, int 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); } +#define BERRY_CB(n) int berry_cb_##n(int v0, int v1, int v2, int v3) { return call_berry_cb(n, v0, v1, v2, v3); } // list the callbacks BERRY_CB(0); BERRY_CB(1); @@ -85,7 +85,7 @@ typedef struct be_callback_handler_list_t { static be_callback_hook be_cb_hooks[BE_MAX_CB] = {0}; -static int32_t be_cb_gen_cb(bvm *vm); +static int be_cb_gen_cb(bvm *vm); static be_callback_handler_list_t be_callback_default_gen_cb = { NULL, be_const_func(&be_cb_gen_cb), @@ -102,7 +102,7 @@ static be_callback_handler_list_t *be_callback_handler_list_head = &be_callback_ * * arg1: function (or closure) \*********************************************************************************************/ -static int32_t be_cb_add_handler(bvm *vm) { +static int be_cb_add_handler(bvm *vm) { int32_t top = be_top(vm); if (top >= 1 && be_isfunction(vm, 1)) { bvalue *v = be_indexof(vm, 1); @@ -129,7 +129,7 @@ static int32_t be_cb_add_handler(bvm *vm) { * * No args \*********************************************************************************************/ -static int32_t be_cb_list_handlers(bvm *vm) { +static int be_cb_list_handlers(bvm *vm) { be_newobject(vm, "list"); for (be_callback_handler_list_t *elt = be_callback_handler_list_head; elt != NULL; elt = elt->next) { if (elt->vm == vm) { /* on purpose don't show the default handler, just pretend it's not there since it's default */ @@ -153,7 +153,7 @@ static int32_t be_cb_list_handlers(bvm *vm) { * arg2: type name for callback (optional) * argN: any other callback specific arguments (unlimited number, passed as-is) \*********************************************************************************************/ -static int32_t be_cb_make_cb(bvm *vm) { +static int be_cb_make_cb(bvm *vm) { int32_t argc = be_top(vm); if (argc >= 1 && be_isfunction(vm, 1)) { @@ -187,7 +187,7 @@ static int32_t be_cb_make_cb(bvm *vm) { * * arg1: function (or closure) \*********************************************************************************************/ -static int32_t be_cb_gen_cb(bvm *vm) { +static int be_cb_gen_cb(bvm *vm) { int32_t top = be_top(vm); // tasmota_log_C(LOG_LEVEL_DEBUG, "BRY: gen_cb() called"); if (top >= 1 && be_isfunction(vm, 1)) { @@ -217,7 +217,7 @@ static int32_t be_cb_gen_cb(bvm *vm) { * `get_cb_list`: Return the list of callbacks for this vm * \*********************************************************************************************/ -static int32_t be_cb_get_cb_list(bvm *vm) { +static int be_cb_get_cb_list(bvm *vm) { be_newobject(vm, "list"); for (uint32_t i=0; i < BE_MAX_CB; i++) { if (be_cb_hooks[i].vm) { @@ -242,7 +242,7 @@ static int32_t be_cb_get_cb_list(bvm *vm) { * 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) { +static int call_berry_cb(int num, int v0, int v1, int v2, int v3) { // call berry cb dispatcher int32_t ret = 0; // retrieve vm and function diff --git a/lib/libesp32/berry_matter/src/be_matter_misc.cpp b/lib/libesp32/berry_matter/src/be_matter_misc.cpp index 2ec805183294..0e57c2aa54f8 100644 --- a/lib/libesp32/berry_matter/src/be_matter_misc.cpp +++ b/lib/libesp32/berry_matter/src/be_matter_misc.cpp @@ -31,6 +31,7 @@ static uint8_t ip_bytes[16] = {}; extern "C" const void* matter_get_ip_bytes(const char* ip_str, size_t* ret_len) { IPAddress ip; if (ip.fromString(ip_str)) { +#ifdef USE_IPV6 if (ip.isV4()) { uint32_t ip_32 = ip; memcpy(ip_bytes, &ip_32, 4); @@ -39,6 +40,11 @@ extern "C" const void* matter_get_ip_bytes(const char* ip_str, size_t* ret_len) memcpy(ip_bytes, ip.raw6(), 16); *ret_len = 16; } +#else + uint32_t ip_32 = ip; + memcpy(ip_bytes, &ip_32, 4); + *ret_len = 4; +#endif return ip_bytes; } else { *ret_len = 0; diff --git a/lib/libesp32/berry_matter/src/be_matter_qrcode.c b/lib/libesp32/berry_matter/src/be_matter_qrcode.c index 5bcddef86c72..9892cda93be4 100644 --- a/lib/libesp32/berry_matter/src/be_matter_qrcode.c +++ b/lib/libesp32/berry_matter/src/be_matter_qrcode.c @@ -32,7 +32,7 @@ // `matter.QRCode.encode_str(content:string) -> map` // -int32_t qr_encode_str(bvm *vm) { +int qr_encode_str(bvm *vm) { int32_t argc = be_top(vm); if (argc >= 1 && be_isstring(vm, 1)) { const char * data_str = be_tostring(vm, 1); diff --git a/lib/libesp32/berry_matter/src/embedded/Matter_Commissioning.be b/lib/libesp32/berry_matter/src/embedded/Matter_Commissioning.be index 0ccc062c3f94..db7bc669ee25 100644 --- a/lib/libesp32/berry_matter/src/embedded/Matter_Commissioning.be +++ b/lib/libesp32/berry_matter/src/embedded/Matter_Commissioning.be @@ -289,18 +289,22 @@ class Matter_Commisioning_Context import crypto # Validate Sigma1 Destination ID, p.162 # traverse all existing fabrics - tasmota.log("MTR: SEARCHING: destinationId=" + destinationId.tohex(), 4) + if tasmota.loglevel(4) + tasmota.log("MTR: SEARCHING: destinationId=" + destinationId.tohex(), 4) + end for fabric : self.device.sessions.fabrics if fabric.noc == nil || fabric.fabric_id == nil || fabric.device_id == nil continue end # compute candidateDestinationId, Section 4.13.2.4.1, “Destination Identifier” var destinationMessage = initiatorRandom + fabric.get_ca_pub() + fabric.fabric_id + fabric.device_id var key = fabric.get_ipk_group_key() - tasmota.log("MTR: SIGMA1: destinationMessage=" + destinationMessage.tohex(), 4) + # tasmota.log("MTR: SIGMA1: destinationMessage=" + destinationMessage.tohex(), 4) # tasmota.log("MTR: SIGMA1: key_ipk=" + key.tohex(), 4) var h = crypto.HMAC_SHA256(key) h.update(destinationMessage) var candidateDestinationId = h.out() - tasmota.log("MTR: SIGMA1: candidateDestinationId=" + candidateDestinationId.tohex(), 4) + if tasmota.loglevel(4) + tasmota.log("MTR: SIGMA1: candidateDestinationId=" + candidateDestinationId.tohex(), 4) + end if candidateDestinationId == destinationId return fabric end diff --git a/lib/libesp32/berry_matter/src/embedded/Matter_Device.be b/lib/libesp32/berry_matter/src/embedded/Matter_Device.be index 1a157549018e..d272c4061e43 100644 --- a/lib/libesp32/berry_matter/src/embedded/Matter_Device.be +++ b/lib/libesp32/berry_matter/src/embedded/Matter_Device.be @@ -176,18 +176,24 @@ class Matter_Device ##################################################################### # Remove a fabric and clean all corresponding values and mDNS entries - def remove_fabric(fabric_parent) - var sub_fabrics = self.sessions.find_children_fabrics(fabric_parent.get_fabric_index()) - if sub_fabrics == nil return end - for fabric_index : sub_fabrics - var fabric = self.sessions.find_fabric_by_index(fabric_index) - if fabric != nil - tasmota.log("MTR: removing fabric " + fabric.get_fabric_id().copy().reverse().tohex(), 2) - self.message_handler.im.subs_shop.remove_by_fabric(fabric) - self.mdns_remove_op_discovery(fabric) - self.sessions.remove_fabric(fabric) - end + def remove_fabric(fabric) + if fabric != nil + tasmota.log("MTR: removing fabric " + fabric.get_fabric_id().copy().reverse().tohex(), 2) + self.message_handler.im.subs_shop.remove_by_fabric(fabric) + self.mdns_remove_op_discovery(fabric) + self.sessions.remove_fabric(fabric) end + # var sub_fabrics = self.sessions.find_children_fabrics(fabric_parent.get_fabric_index()) + # if sub_fabrics == nil return end + # for fabric_index : sub_fabrics + # var fabric = self.sessions.find_fabric_by_index(fabric_index) + # if fabric != nil + # tasmota.log("MTR: removing fabric " + fabric.get_fabric_id().copy().reverse().tohex(), 2) + # self.message_handler.im.subs_shop.remove_by_fabric(fabric) + # self.mdns_remove_op_discovery(fabric) + # self.sessions.remove_fabric(fabric) + # end + # end self.sessions.save_fabrics() end @@ -431,7 +437,7 @@ class Matter_Device var fabric = session.get_fabric() var fabric_id = fabric.get_fabric_id().copy().reverse().tohex() var vendor_name = fabric.get_admin_vendor_name() - tasmota.log(format("MTR: --- Commissioning complete for Fabric '%s' (Vendor %s) ---", fabric_id, vendor_name), 2) + tasmota.log(f"MTR: --- Commissioning complete for Fabric '{fabric_id}' (Vendor {vendor_name}) ---", 2) self.stop_basic_commissioning() # by default close commissioning when it's complete end @@ -1146,13 +1152,13 @@ class Matter_Device if !r_st13.contains(k) break end # no more SHTxxx var d = r_st13[k] tasmota.log(format("MTR: '%s' = %s", k, str(d)), 3) - var relay1 = d.find('Relay1', 0) - 1 # relay base 0 or -1 if none - var relay2 = d.find('Relay2', 0) - 1 # relay base 0 or -1 if none + var relay1 = d.find('Relay1', -1) # relay base 1 or -1 if none + var relay2 = d.find('Relay2', -1) # relay base 1 or -1 if none - if relay1 >= 0 relays_reserved.push(relay1) end # mark relay1/2 as non-relays - if relay2 >= 0 relays_reserved.push(relay2) end + if relay1 > 0 relays_reserved.push(relay1 - 1) end # mark relay1/2 as non-relays + if relay2 > 0 relays_reserved.push(relay2 - 1) end - tasmota.log(format("MTR: relay1 = %s, relay2 = %s", relay1, relay2), 3) + tasmota.log(f"MTR: {relay1=} {relay2=}", 3) # is there tilt support var tilt_array = d.find('TiltConfig') var tilt_config = tilt_array && (tilt_array[2] > 0) @@ -1171,7 +1177,7 @@ class Matter_Device while relay_index < relay_count if relays_reserved.find(relay_index) == nil # if relay is actual relay - m[str(endpoint)] = {'type':'relay','relay':relay_index} + m[str(endpoint)] = {'type':'relay','relay':relay_index + 1} # Relay index start with 1 endpoint += 1 end relay_index += 1 diff --git a/lib/libesp32/berry_matter/src/embedded/Matter_IM.be b/lib/libesp32/berry_matter/src/embedded/Matter_IM.be index 1f60e6b511ff..016115fc81bb 100644 --- a/lib/libesp32/berry_matter/src/embedded/Matter_IM.be +++ b/lib/libesp32/berry_matter/src/embedded/Matter_IM.be @@ -225,7 +225,7 @@ class Matter_IM # Inner code shared between read_attributes and subscribe_request # # query: `ReadRequestMessage` or `SubscribeRequestMessage` - def _inner_process_read_request(session, query, no_log) + def _inner_process_read_request(session, query, msg, no_log) ### Inner function to be iterated upon # ret is the ReportDataMessage list to send back @@ -243,22 +243,47 @@ class Matter_IM # Special case to report unsupported item, if pi==nil var res = (pi != nil) ? pi.read_attribute(session, ctx, self.tlv_solo) : nil var found = true # stop expansion since we have a value - var a1_raw # this is the bytes() block we need to add to response (or nil) + var a1_raw_or_list # contains either a bytes() buffer to append, or a list of bytes(), or nil if res != nil - var res_str = res.to_str_val() # get the value with anonymous tag before it is tagged, for logging + var res_str = "" + if !no_log + res_str = res.to_str_val() # get the value with anonymous tag before it is tagged, for logging + end - # encode directly raw bytes() - a1_raw = bytes(48) # pre-reserve 48 bytes - self.attributedata2raw(a1_raw, ctx, res) + # check if too big to encode as a single packet + if (res.is_list || res.is_array) && res.encode_len() > matter.IM_ReportData.MAX_MESSAGE + # tasmota.log(f"MTR: >>>>>> long response", 3) + a1_raw_or_list = [] # we return a list of block + var a1_raw = bytes(48) + var empty_list = TLV.Matter_TLV_array() + self.attributedata2raw(a1_raw, ctx, empty_list, false) + a1_raw_or_list.push(a1_raw) + # tasmota.log(f"MTR: >>>>>> long response global DELETE {a1_raw.tohex()}", 3) + + for elt:res.val + a1_raw = bytes(48) + # var list_item = TLV.Matter_TLV_array() + # list_item.val.push(elt) + self.attributedata2raw(a1_raw, ctx, elt, true #- add ListIndex:null -#) + # tasmota.log(f"MTR: >>>>>> long response global ADD {a1_raw.tohex()}", 3) + a1_raw_or_list.push(a1_raw) + end + # tasmota.log(f"MTR: >>>>>> long response global {a1_raw_or_list}", 3) + else + # normal encoding + # encode directly raw bytes() + a1_raw_or_list = bytes(48) # pre-reserve 48 bytes + self.attributedata2raw(a1_raw_or_list, ctx, res) + end if !no_log - tasmota.log(format("MTR: >Read_Attr (%6i) %s%s - %s", session.local_session_id, str(ctx), attr_name, res_str), 3) + tasmota.log(f"MTR: >Read_Attr ({session.local_session_id:6i}) {ctx}{attr_name} - {res_str}", 3) end elif ctx.status != nil if direct # we report an error only if a concrete direct read, not with wildcards # encode directly raw bytes() - a1_raw = bytes(48) # pre-reserve 48 bytes - self.attributestatus2raw(a1_raw, ctx, ctx.status) + a1_raw_or_list = bytes(48) # pre-reserve 48 bytes + self.attributestatus2raw(a1_raw_or_list, ctx, ctx.status) if tasmota.loglevel(3) tasmota.log(format("MTR: >Read_Attr (%6i) %s%s - STATUS: 0x%02X %s", session.local_session_id, str(ctx), attr_name, ctx.status, ctx.status == matter.UNSUPPORTED_ATTRIBUTE ? "UNSUPPORTED_ATTRIBUTE" : ""), 3) @@ -270,27 +295,55 @@ class Matter_IM found = false end - # check if we still have enough room in last block - if a1_raw # do we have bytes to add, and it's not zero size + # a1_raw_or_list if either nil, bytes(), of list(bytes()) + var idx = isinstance(a1_raw_or_list, list) ? 0 : nil # index in list, or nil if non-list + while a1_raw_or_list != nil + var elt = (idx == nil) ? a1_raw_or_list : a1_raw_or_list[idx] # dereference + if size(ret.attribute_reports) == 0 - ret.attribute_reports.push(a1_raw) # push raw binary instead of a TLV + ret.attribute_reports.push(elt) # push raw binary instead of a TLV else # already blocks present, see if we can add to the latest, or need to create a new block var last_block = ret.attribute_reports[-1] - if size(last_block) + size(a1_raw) <= matter.IM_ReportData.MAX_MESSAGE + if size(last_block) + size(elt) <= matter.IM_ReportData.MAX_MESSAGE # add to last block - last_block .. a1_raw + last_block .. elt else - ret.attribute_reports.push(a1_raw) # push raw binary instead of a TLV + ret.attribute_reports.push(elt) # push raw binary instead of a TLV + end + end + + if idx == nil + a1_raw_or_list = nil # stop loop + else + idx += 1 + if idx >= size(a1_raw_or_list) + a1_raw_or_list = nil # stop loop end end end + # check if we still have enough room in last block + # if a1_raw_or_list # do we have bytes to add, and it's not zero size + # if size(ret.attribute_reports) == 0 + # ret.attribute_reports.push(a1_raw_or_list) # push raw binary instead of a TLV + # else # already blocks present, see if we can add to the latest, or need to create a new block + # var last_block = ret.attribute_reports[-1] + # if size(last_block) + size(a1_raw_or_list) <= matter.IM_ReportData.MAX_MESSAGE + # # add to last block + # last_block .. a1_raw_or_list + # else + # ret.attribute_reports.push(a1_raw_or_list) # push raw binary instead of a TLV + # end + # end + # end + return found # return true if we had a match end var endpoints = self.device.get_active_endpoints() # structure is `ReadRequestMessage` 10.6.2 p.558 var ctx = matter.Path() + ctx.msg = msg # prepare the response var ret = matter.ReportDataMessage() @@ -302,6 +355,7 @@ class Matter_IM ctx.endpoint = q.endpoint ctx.cluster = q.cluster ctx.attribute = q.attribute + ctx.fabric_filtered = query.fabric_filtered ctx.status = matter.UNSUPPORTED_ATTRIBUTE #default error if returned `nil` # expand endpoint @@ -346,8 +400,10 @@ class Matter_IM # 2402 01 2 = 1U (U1) # 2403 39 3 = 0x39U (U1) # 2404 11 4 = 0x11U (U1) + # [OPTIONAL ListIndex] + # 3405 5 = NULL # 18 - def path2raw(raw, ctx, sub_tag) + def path2raw(raw, ctx, sub_tag, list_index_null) # open struct raw.add(0x37, 1) # add 37 raw.add(sub_tag, 1) # add sub_tag @@ -381,6 +437,11 @@ class Matter_IM raw.add(0x2604, -2) # add 2604 raw.add(ctx.attribute, 4) end + # do we add ListIndex: null + if list_index_null + raw.add(0x3405, -2) # add 3405 + end + # close raw.add(0x18, 1) # add 18 end @@ -417,15 +478,18 @@ class Matter_IM # 2402 01 2 = 1U (U1) # 2403 39 3 = 0x39U (U1) # 2404 11 4 = 0x11U (U1) + # [OPTIONAL ListIndex] + # 3405 5 = NULL + # # 18 # 2902 2 = True # 18 # 18 - def attributedata2raw(raw, ctx, val) + def attributedata2raw(raw, ctx, val, list_index_null) raw.add(0x15350124, -4) # add 15350124 raw.add(0x0001, -2) # add 0001 - self.path2raw(raw, ctx, 0x01) + self.path2raw(raw, ctx, 0x01, list_index_null) # add value with tag 2 val.tag_sub = 2 @@ -614,7 +678,7 @@ class Matter_IM var query = matter.ReadRequestMessage().from_TLV(val) # matter.profiler.log(str(query)) if query.attributes_requests != nil - var ret = self._inner_process_read_request(msg.session, query) + var ret = self._inner_process_read_request(msg.session, query, msg) self.send_report_data(msg, ret) end @@ -628,15 +692,10 @@ class Matter_IM # returns `true` if processed, `false` if silently ignored, # or raises an exception def process_read_request_solo(msg, ctx) - # matter.profiler.log("read_request_solo start") - # matter.profiler.log(str(val)) - # var query = matter.ReadRequestMessage().from_TLV(val) - # matter.profiler.log("read_request_start-TLV") - # prepare fallback error ctx.status = matter.INVALID_ACTION + ctx.msg = msg - # TODO # find pi for this endpoint/cluster/attribute var pi = self.device.process_attribute_read_solo(ctx) var res = nil @@ -652,6 +711,15 @@ class Matter_IM if res != nil + # check if the payload is a complex structure and too long to fit in a single response packet + if (res.is_list || res.is_array) && res.encode_len() > matter.IM_ReportData.MAX_MESSAGE + # revert to standard + # the attribute will be read again, but it's hard to avoid it + res = nil # indicated to GC that we don't need it again + tasmota.log(f"MTR: Response to big, revert to non-solo", 3) + var val = matter.TLV.parse(msg.raw, msg.app_payload_idx) + return self.process_read_request(msg, val) + end # encode directly raw bytes() raw = bytes(48) # pre-reserve 48 bytes @@ -664,8 +732,6 @@ class Matter_IM raw.add(0x1824FF01, -4) # add 1824FF01 raw.add(0x18, 1) # add 18 - # matter.profiler.log("read_request_solo raw done") - elif ctx.status != nil # encode directly raw bytes() @@ -685,31 +751,14 @@ class Matter_IM return false end - # matter.profiler.log("read_request_solo res ready") - # tasmota.log(f"MTR: process_read_request_solo {raw=}") - # send packet - # self.send_report_data_solo(msg, ret) - # var report_solo = matter.IM_ReportData_solo(msg, ret) var resp = msg.build_response(0x05 #-Report Data-#, true) - # super(self).reset(msg, 0x05 #-Report Data-#, true) - # matter.profiler.log("read_request_solo report_solo") - - # send_im() - # report_solo.send_im(self.device.message_handler) var responder = self.device.message_handler - # matter.profiler.log("read_request_solo send_im-1") - # if tasmota.loglevel(3) # TODO remove before flight - # tasmota.log(f">>>: data_raw={raw.tohex()}", 3) - # end - # matter.profiler.log("read_request_solo send_im-2") var msg_raw = msg.raw msg_raw.clear() resp.encode_frame(raw, msg_raw) # payload in cleartext - # matter.profiler.log("read_request_solo send_im-3") resp.encrypt() - # matter.profiler.log("read_request_solo send_im-encrypted") if tasmota.loglevel(4) tasmota.log(format("MTR:
пожалуйста обновите" #define D_WEBSERVER_ACTIVE_ON "Веб-сервер активен" #define D_WITH_IP_ADDRESS "с IP-адресом" #define D_WEBSERVER_STOPPED "Веб-сервер остановлен" #define D_FILE_NOT_FOUND "Файл не найден" -#define D_REDIRECTED "Перенаправлено на адаптивный портал" -#define D_WIFIMANAGER_SET_ACCESSPOINT_AND_STATION "Wifi менеджер устанавливает Точку Доступа и сохраняет станцию" -#define D_WIFIMANAGER_SET_ACCESSPOINT "Wifi менеджер установил Точку Доступа" +#define D_REDIRECTED "Перенаправлено на captive portal" +#define D_WIFIMANAGER_SET_ACCESSPOINT_AND_STATION "Wi-Fi менеджер устанавливает Точку Доступа и сохраняет станцию" +#define D_WIFIMANAGER_SET_ACCESSPOINT "Wi-Fi менеджер установить Точку Доступа" #define D_TRYING_TO_CONNECT "Попытка подключения устройства к сети" -#define D_RESTART_IN "Перезапуск" +#define D_RESTART_IN "Перезагрзука" #define D_SECONDS "секунд" -#define D_DEVICE_WILL_RESTART "Устройство будет перезапущено через несколько секунд" +#define D_DEVICE_WILL_RESTART "Устройство будет перезагружено через несколько секунд" #define D_BUTTON_TOGGLE "Переключить" -#define D_CONFIGURATION "Конфигурация" +#define D_CONFIGURATION "Настройки" #define D_INFORMATION "Информация" #define D_FIRMWARE_UPGRADE "Обновление прошивки" -#define D_MANAGEMENT "Consoles" +#define D_MANAGEMENT "Управление" #define D_CONSOLE "Консоль" -#define D_CONFIRM_RESTART "Подтвердить перезагрузку" - -#define D_CONFIGURE_MODULE "Конфигурация Модуля" -#define D_CONFIGURE_WIFI "Конфигурация WiFi" -#define D_CONFIGURE_MQTT "Конфигурация MQTT" -#define D_CONFIGURE_DOMOTICZ "Конфигурация Domoticz" -#define D_CONFIGURE_LOGGING "Конфигурация Logging" -#define D_CONFIGURE_OTHER "Конфигурация прочее" -#define D_CONFIRM_RESET_CONFIGURATION "Подтвердить Сброс Конфигурации" -#define D_RESET_CONFIGURATION "Сброс Конфигурации" -#define D_BACKUP_CONFIGURATION "Резервное копирование Конфигурации" -#define D_RESTORE_CONFIGURATION "Восстановление Конфигурации" -#define D_MAIN_MENU "Главное Меню" - -#define D_MODULE_PARAMETERS "Параметры модуля" +#define D_CONFIRM_RESTART "Перезагрузить устройство?" + +#define D_CONFIGURE_MODULE "Настройки модуля" +#define D_CONFIGURE_WIFI "Настройки Wi-Fi" +#define D_CONFIGURE_MQTT "Настройки MQTT" +#define D_CONFIGURE_DOMOTICZ "Настройки Domoticz" +#define D_CONFIGURE_LOGGING "Настройки логирования" +#define D_CONFIGURE_OTHER "Прочие настрйки" +#define D_CONFIRM_RESET_CONFIGURATION "Выполнить cброс настроек?" +#define D_RESET_CONFIGURATION "Сброс настроек" +#define D_BACKUP_CONFIGURATION "Резервное копирование настроек" +#define D_RESTORE_CONFIGURATION "Восстановление настроек" +#define D_MAIN_MENU "Главное меню" + +#define D_MODULE_PARAMETERS "Настройки модуля" #define D_MODULE_TYPE "Тип модуля" #define D_PULLUP_ENABLE "No Button/Switch pull-up" #define D_ADC "ADC" @@ -296,8 +297,8 @@ #define D_SERIAL_IN "Serial вход" #define D_SERIAL_OUT "Serial выход" -#define D_WIFI_PARAMETERS "Параметры Wifi" -#define D_SCAN_FOR_WIFI_NETWORKS "Сканирование беспроводных сетей Wifi" +#define D_WIFI_PARAMETERS "Настройки Wi-Fi" +#define D_SCAN_FOR_WIFI_NETWORKS "Сканирование сетей Wi-Fi" #define D_SCAN_DONE "Сканирование завершено" #define D_NO_NETWORKS_FOUND "Не найдено сетей" #define D_REFRESH_TO_SCAN_AGAIN "Обновить для повторного сканирования" @@ -307,62 +308,62 @@ #define D_WEP "WEP" #define D_WPA_PSK "WPA PSK" #define D_WPA2_PSK "WPA2 PSK" -#define D_AP1_SSID "WiFi Network" -#define D_AP1_SSID_HELP "Type or Select your WiFi Network" -#define D_AP2_SSID "WiFi Network 2" -#define D_AP2_SSID_HELP "Type your Alternative WiFi Network" -#define D_AP_PASSWORD "WiFi Пароль" -#define D_AP_PASSWORD_HELP "Enter your WiFi Password" -#define D_SELECT_YOUR_WIFI_NETWORK "Select your WiFi Network" -#define D_SHOW_MORE_WIFI_NETWORKS "Scan for all WiFi Networks" -#define D_SHOW_MORE_OPTIONS "More Options" -#define D_CHECK_CREDENTIALS "Please, check your credentials" -#define D_SUCCESSFUL_WIFI_CONNECTION "Successful WiFi Connection" -#define D_NOW_YOU_CAN_CLOSE_THIS_WINDOW "Now you can close this window" -#define D_REDIRECTING_TO_NEW_IP "Redirecting to new device's IP address" - -#define D_MQTT_PARAMETERS "Параметры MQTT" +#define D_AP1_SSID "Wi-Fi Сеть" +#define D_AP1_SSID_HELP "Введите или выберите вашу Wi-Fi сеть" +#define D_AP2_SSID "Wi-Fi Сеть 2" +#define D_AP2_SSID_HELP "Введите дополнительную Wi-Fi сеть" +#define D_AP_PASSWORD "Пароль" +#define D_AP_PASSWORD_HELP "Введите пароль от сети Wi-Fi" +#define D_SELECT_YOUR_WIFI_NETWORK "Выберите вашу Wi-Fi сеть" +#define D_SHOW_MORE_WIFI_NETWORKS "Сканировать все сети Wi-Fi" +#define D_SHOW_MORE_OPTIONS "Больше настроек" +#define D_CHECK_CREDENTIALS "Пожалуйста, проверьте ваши учетные данные" +#define D_SUCCESSFUL_WIFI_CONNECTION "Успешное подключение к Wi-Fi" +#define D_NOW_YOU_CAN_CLOSE_THIS_WINDOW "Теперь вы можете закрыть это окно" +#define D_REDIRECTING_TO_NEW_IP "Переадресация на новый IP адрес устройства" + +#define D_MQTT_PARAMETERS "Настройки MQTT" #define D_CLIENT "Клиент" -#define D_FULL_TOPIC "Полный Топик" +#define D_FULL_TOPIC "Полный топик" -#define D_LOGGING_PARAMETERS "Параметры Logging" -#define D_SERIAL_LOG_LEVEL "Serial лог уровень" -#define D_MQTT_LOG_LEVEL "Mqtt log level" -#define D_WEB_LOG_LEVEL "Web лог уровень" -#define D_SYS_LOG_LEVEL "System лог уровень" +#define D_LOGGING_PARAMETERS "Настройки логирования" +#define D_SERIAL_LOG_LEVEL "Уровень логирования Serial" +#define D_MQTT_LOG_LEVEL "Уровень логирования MQTT" +#define D_WEB_LOG_LEVEL "Уровень логирования Web" +#define D_SYS_LOG_LEVEL "Уровень логирования Syslog" #define D_MORE_DEBUG "Дополнительная информация для отладки" -#define D_SYSLOG_HOST "System лог хост" -#define D_SYSLOG_PORT "System лог порт" -#define D_TELEMETRY_PERIOD "Период телеметрии" - -#define D_OTHER_PARAMETERS "Параметры Прочие" -#define D_TEMPLATE "Template" -#define D_ACTIVATE "Activate" -#define D_DEVICE_NAME "Device Name" -#define D_WEB_ADMIN_PASSWORD "Пароль Web администратора" -#define D_MQTT_ENABLE "MQTT активен" +#define D_SYSLOG_HOST "Порт Syslog" +#define D_SYSLOG_PORT "Хост Syslog" +#define D_TELEMETRY_PERIOD "Период отправки телеметрии" + +#define D_OTHER_PARAMETERS "Настройки Прочие" +#define D_TEMPLATE "Шаблон" +#define D_ACTIVATE "Активировать" +#define D_DEVICE_NAME "Имя устройства" +#define D_WEB_ADMIN_PASSWORD "Пароль веб-интерфейса" +#define D_MQTT_ENABLE "Включить MQTT" #define D_MQTT_TLS_ENABLE "MQTT TLS" #define D_HTTP_API "HTTP API" -#define D_HTTP_API_ENABLE "HTTP API активен" -#define D_FRIENDLY_NAME "Дружественное Имя" +#define D_HTTP_API_ENABLE "Включить HTTP API" +#define D_FRIENDLY_NAME "Понятное имя устройства" #define D_BELKIN_WEMO "Belkin WeMo" #define D_HUE_BRIDGE "Hue Bridge" #define D_SINGLE_DEVICE "одиночное" #define D_MULTI_DEVICE "мульти" -#define D_CONFIGURE_TEMPLATE "Конфигурация Template" -#define D_TEMPLATE_PARAMETERS "Параметры Template" -#define D_TEMPLATE_NAME "Name" -#define D_BASE_TYPE "Based on" -#define D_TEMPLATE_FLAGS "Options" +#define D_CONFIGURE_TEMPLATE "Настройки шаблона" +#define D_TEMPLATE_PARAMETERS "Настройки шаблона" +#define D_TEMPLATE_NAME "Имя" +#define D_BASE_TYPE "На основе" +#define D_TEMPLATE_FLAGS "Настройки" -#define D_SAVE_CONFIGURATION "Сохранить конфигурацию" -#define D_CONFIGURATION_SAVED "Конфигурация сохранена " -#define D_CONFIGURATION_RESET "Конфигурация сброшена" +#define D_SAVE_CONFIGURATION "Сохранить настройки" +#define D_CONFIGURATION_SAVED "Настройки сохранены " +#define D_CONFIGURATION_RESET "Настройки сброшены" #define D_PROGRAM_VERSION "Версия программы" -#define D_BUILD_DATE_AND_TIME "Дата & Время сборки" -#define D_CORE_AND_SDK_VERSION "Версия Core/SDK" +#define D_BUILD_DATE_AND_TIME "Дата и время сборки" +#define D_CORE_AND_SDK_VERSION "Версия ядра/SDK" #define D_FLASH_WRITE_COUNT "Кол-во записей Flash" #define D_MAC_ADDRESS "MAC Адрес" #define D_MQTT_HOST "MQTT Хост" @@ -380,47 +381,47 @@ #define D_FLASH_CHIP_SIZE "Размер Flash памяти" #define D_FREE_PROGRAM_SPACE "Свободное пространство программ" -#define D_UPGRADE_BY_WEBSERVER "Обновление через Веб-сервер" -#define D_OTA_URL "OTA Url" +#define D_UPGRADE_BY_WEBSERVER "Обновление через веб-сервер" +#define D_OTA_URL "Ссылка OTA" #define D_START_UPGRADE "Начать обновление" -#define D_UPGRADE_BY_FILE_UPLOAD "Обновление путем загрузки файлов" -#define D_UPLOAD_FACTORY "Switching to safeboot partition" +#define D_UPGRADE_BY_FILE_UPLOAD "Обновление путем загрузки файлa" +#define D_UPLOAD_FACTORY "Переключение на раздел safeboot" #define D_UPLOAD_STARTED "Загрузка началась" #define D_UPGRADE_STARTED "Обновление началось" #define D_UPLOAD_DONE "Загрузка завершена" #define D_UPLOAD_TRANSFER "Upload transfer" -#define D_TRANSFER_STARTED "Transfer started" +#define D_TRANSFER_STARTED "Передача началась" #define D_UPLOAD_ERR_1 "Файл не выбран" #define D_UPLOAD_ERR_2 "Недостаточно места" -#define D_UPLOAD_ERR_3 "Invalid file signature" +#define D_UPLOAD_ERR_3 "Неверная подпись файла" #define D_UPLOAD_ERR_4 "Размер прошивки больше, чем реальный размер флеш памяти" #define D_UPLOAD_ERR_5 "Ошибка загрузки буфера" #define D_UPLOAD_ERR_6 "Ошибка загрузки. Включено лог уровня 3" #define D_UPLOAD_ERR_7 "Загрузка прервана" #define D_UPLOAD_ERR_8 "Файл неверный" #define D_UPLOAD_ERR_9 "Слишком большой файл" -#define D_UPLOAD_ERR_10 "Failed to init RF chip" -#define D_UPLOAD_ERR_11 "Failed to erase RF chip" -#define D_UPLOAD_ERR_12 "Failed to write to RF chip" -#define D_UPLOAD_ERR_13 "Failed to decode RF firmware" -#define D_UPLOAD_ERR_14 "Not compatible" +#define D_UPLOAD_ERR_10 "Не удалось инициализировать RF чип" +#define D_UPLOAD_ERR_11 "Не удалось стереть RF чип" +#define D_UPLOAD_ERR_12 "Не удалось записать в RF чип" +#define D_UPLOAD_ERR_13 "Не удалось декодировать прошивку RF чипа" +#define D_UPLOAD_ERR_14 "Не совместимо" #define D_UPLOAD_ERROR_CODE "Код ошибки загрузки" #define D_ENTER_COMMAND "Введите команду" -#define D_ENABLE_WEBLOG_FOR_RESPONSE "Включить Веб лог уровня 2 если ожидается ответ" +#define D_ENABLE_WEBLOG_FOR_RESPONSE "Включите веб лог уровня 2 если ожидается ответ" #define D_NEED_USER_AND_PASSWORD "Ожидается user=
+ ""
+ ""
+ "
"; // Add dummy
replacing HTTP_HEAD_STYLE3 closed
+#else
const char HTTP_FORM_CMND[] PROGMEM =
"
" ""; +#endif // USE_CONSOLE_CSS_FLEX const char HTTP_TABLE100[] PROGMEM = "";
@@ -3117,7 +3136,11 @@ void HandleConsole(void)
WSContentStart_P(PSTR(D_CONSOLE));
WSContentSend_P(HTTP_SCRIPT_CONSOL, Settings->web_refresh);
+#ifdef USE_CONSOLE_CSS_FLEX
+ WSContentSendStyle_P(HTTP_CMND_STYLE);
+#else
WSContentSendStyle();
+#endif // USE_CONSOLE_CSS_FLEX
WSContentSend_P(HTTP_FORM_CMND);
WSContentSpaceButton((WebUseManagementSubmenu()) ? BUTTON_MANAGEMENT : BUTTON_MAIN);
WSContentStop();
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_04_light.ino b/tasmota/tasmota_xdrv_driver/xdrv_04_light.ino
index f4b27dd101c3..6599fde21d2e 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_04_light.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_04_light.ino
@@ -2080,7 +2080,7 @@ bool LightApplyFade(void) { // did the value chanegd and needs to be applied
Light.fade_duration = LightGetSpeedSetting() * 500;
Light.speed_once_enabled = false; // The once off speed value has been read, reset it
if (!Settings->flag5.fade_fixed_duration) {
- Light.fade_duration = (distance * Light.fade_duration) / 1023; // time is proportional to distance, except with SO117
+ Light.fade_duration = (distance * Light.fade_duration) / 1023 + 1 /* make sure value is not zero */; // time is proportional to distance, except with SO117
}
if (Settings->save_data) {
// Also postpone the save_data for the duration of the Fade (in seconds)
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_10_scripter.ino b/tasmota/tasmota_xdrv_driver/xdrv_10_scripter.ino
index 54922adf9695..a91c48b0fa46 100755
--- a/tasmota/tasmota_xdrv_driver/xdrv_10_scripter.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_10_scripter.ino
@@ -5379,10 +5379,10 @@ extern char *SML_GetSVal(uint32_t index);
glob_script_mem.spi.settings = SPISettings(fvar, MSBFIRST, SPI_MODE0);
if (TasmotaGlobal.spi_enabled) {
-#ifdef EPS8266
+#ifdef ESP8266
SPI.begin();
glob_script_mem.spi.spip = &SPI;
-#endif // EPS8266
+#endif // ESP8266
#ifdef ESP32
if (glob_script_mem.spi.sclk == -1) {
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_5_2_converters.ino b/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_5_2_converters.ino
index 6c682450c1e4..67929f7582e9 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_5_2_converters.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_5_2_converters.ino
@@ -1214,6 +1214,8 @@ void ZCLFrame::syntheticAqaraSensor(Z_attribute_list &attr_list, class Z_attribu
attr_list.addAttribute(0x0001, 0x0020).setFloat(batteryvoltage);
uint8_t batterypercentage = toPercentageCR2032(uval32);
attr_list.addAttribute(0x0001, 0x0021).setUInt(batterypercentage * 2);
+ } else if (0x03 == attrid) {
+ attr_list.addAttributePMEM("AqaraTemperature").copyVal(attr); // Temperature
} else if ((nullptr != modelId) && ((0 == getManufCode()) || (0x115F == getManufCode()))) {
translated = true;
if (modelId.startsWith(F("lumi.sensor_magnet"))) { // door / window sensor
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_27_esp32_shutter.ino b/tasmota/tasmota_xdrv_driver/xdrv_27_esp32_shutter.ino
index f09370ed69cf..538e11fe492f 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_27_esp32_shutter.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_27_esp32_shutter.ino
@@ -460,8 +460,6 @@ void ShutterRtc50mS(void)
int32_t ShutterPercentToRealPosition(int16_t percent, uint32_t index)
{
- // if inverted recalculate the percentposition
- percent = (ShutterSettings.shutter_options[index] & 1) ? 100 - percent : percent;
if (ShutterSettings.shutter_set50percent[index] != 50) {
return (percent <= 5) ? ShutterSettings.shuttercoeff[2][index] * percent*10 : (ShutterSettings.shuttercoeff[1][index] * percent + (ShutterSettings.shuttercoeff[0][index]*10))*10;
} else {
@@ -523,9 +521,8 @@ uint8_t ShutterRealToPercentPosition(int32_t realpos, uint32_t index)
}
}
}
- realpercent = realpercent < 0 ? 0 : realpercent;
- // if inverted recalculate the percentposition
- return (ShutterSettings.shutter_options[index] & 1) ? 100 - realpercent : realpercent;
+ realpercent = realpercent < 0 ? 0 : realpercent;
+ return realpercent;
}
void ShutterInit(void)
@@ -1268,7 +1265,8 @@ bool ShutterButtonHandler(void)
// handle on button release: start shutter on shortpress and stop running shutter after longpress.
if (NOT_PRESSED == button
&& Shutter[shutter_index].direction != 0 // only act on shutters activly moving
- && Button.hold_timer[button_index] > 0) // kick in on first release of botton. do not check for multipress
+ && Button.hold_timer[button_index] > 0 // kick in on first release of botton. do not check for multipress
+ && !ShutterSettings.shutter_button[button_index].position[3].mqtt_broadcast ) // do not stop on hold release if broadcast
{
XdrvMailbox.index = shutter_index +1;
XdrvMailbox.payload = -99; // reset any payload to invalid
@@ -1321,7 +1319,7 @@ void ShutterToggle(bool dir)
void ShutterShow(){
for (uint32_t i = 0; i < TasmotaGlobal.shutters_present; i++) {
- WSContentSend_P(HTTP_MSG_SLIDER_SHUTTER, (ShutterSettings.shutter_options[i] & 1) ? D_OPEN : D_CLOSE,(ShutterSettings.shutter_options[i] & 1) ? D_CLOSE : D_OPEN, ShutterRealToPercentPosition(-9999, i), i+1);
+ WSContentSend_P(HTTP_MSG_SLIDER_SHUTTER, (Settings->shutter_options[i] & 1) ? D_OPEN : D_CLOSE,(Settings->shutter_options[i] & 1) ? D_CLOSE : D_OPEN, (Settings->shutter_options[i] & 1) ? (100 - ShutterRealToPercentPosition(-9999, i)) : ShutterRealToPercentPosition(-9999, i), i+1);
}
}
/*********************************************************************************************\
@@ -1516,8 +1514,11 @@ void CmndShutterPosition(void)
}
int8_t target_pos_percent = (XdrvMailbox.payload < 0) ? (XdrvMailbox.payload == -99 ? ShutterRealToPercentPosition(Shutter[index].real_position, index) : 0) : ((XdrvMailbox.payload > 100) ? 100 : XdrvMailbox.payload);
- // webgui still send also on inverted shutter the native position.
- target_pos_percent = ((ShutterSettings.shutter_options[index] & 1) && (SRC_WEBGUI == TasmotaGlobal.last_source)) ? 100 - target_pos_percent : target_pos_percent;
+ target_pos_percent = ((Settings->shutter_options[index] & 1) && ((SRC_MQTT != TasmotaGlobal.last_source)
+ || (SRC_SERIAL != TasmotaGlobal.last_source)
+ || (SRC_WEBCOMMAND != TasmotaGlobal.last_source)
+ )) ? 100 - target_pos_percent : target_pos_percent;
+
if (XdrvMailbox.payload != -99) {
Shutter[index].target_position = ShutterPercentToRealPosition(target_pos_percent, index);
//Shutter[i].accelerator[index] = ShutterGlobal.open_velocity_max / ((Shutter[i].motordelay[index] > 0) ? Shutter[i].motordelay[index] : 1);
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_27_shutter.ino b/tasmota/tasmota_xdrv_driver/xdrv_27_shutter.ino
index f6fe28a40807..c5255c5637fd 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_27_shutter.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_27_shutter.ino
@@ -252,8 +252,6 @@ void ShutterRtc50mS(void)
int32_t ShutterPercentToRealPosition(int16_t percent, uint32_t index)
{
- // if inverted recalculate the percentposition
- percent = (Settings->shutter_options[index] & 1) ? 100 - percent : percent;
if (Settings->shutter_set50percent[index] != 50) {
return (percent <= 5) ? Settings->shuttercoeff[2][index] * percent*10 : (Settings->shuttercoeff[1][index] * percent + (Settings->shuttercoeff[0][index]*10))*10;
} else {
@@ -315,9 +313,8 @@ uint8_t ShutterRealToPercentPosition(int32_t realpos, uint32_t index)
}
}
}
- realpercent = realpercent < 0 ? 0 : realpercent;
- // if inverted recalculate the percentposition
- return (Settings->shutter_options[index] & 1) ? 100 - realpercent : realpercent;
+ realpercent = realpercent < 0 ? 0 : realpercent;
+ return realpercent;
}
void ShutterInit(void)
@@ -950,7 +947,11 @@ bool ShutterButtonHandler(void)
if (NOT_PRESSED == button) {
//AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Shtr%d, Button %d, hold %d, dir %d, index %d, payload %d"), shutter_index+1, button_index+1, Button.hold_timer[button_index],Shutter[shutter_index].direction,XdrvMailbox.index,XdrvMailbox.payload);
- if (Shutter[shutter_index].direction && (Button.hold_timer[button_index] > 0 && (!Settings->flag.button_single || Button.hold_timer[button_index] > 20))) {
+ if (Shutter[shutter_index].direction
+ && (Button.hold_timer[button_index] > 0
+ && (!Settings->flag.button_single
+ || Button.hold_timer[button_index] > 20))
+ && !(Settings->shutter_button[button_index] & (0x01<<29))) {
XdrvMailbox.index = shutter_index +1;
XdrvMailbox.payload = XdrvMailbox.index;
//AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("SHT: Shtr%d, Button %d, hold %d, dir %d, index %d, payload %d"), shutter_index+1, button_index+1, Button.hold_timer[button_index],Shutter[shutter_index].direction,XdrvMailbox.index,XdrvMailbox.payload);
@@ -1144,7 +1145,7 @@ void ShutterToggle(bool dir)
void ShutterShow(){
for (uint32_t i = 0; i < TasmotaGlobal.shutters_present; i++) {
- WSContentSend_P(HTTP_MSG_SLIDER_SHUTTER, (Settings->shutter_options[i] & 1) ? D_OPEN : D_CLOSE,(Settings->shutter_options[i] & 1) ? D_CLOSE : D_OPEN, ShutterRealToPercentPosition(-9999, i), i+1);
+ WSContentSend_P(HTTP_MSG_SLIDER_SHUTTER, (Settings->shutter_options[i] & 1) ? D_OPEN : D_CLOSE,(Settings->shutter_options[i] & 1) ? D_CLOSE : D_OPEN, (Settings->shutter_options[i] & 1) ? (100 - ShutterRealToPercentPosition(-9999, i)) : ShutterRealToPercentPosition(-9999, i), i+1);
}
}
@@ -1338,8 +1339,10 @@ void CmndShutterPosition(void)
}
int8_t target_pos_percent = (XdrvMailbox.payload < 0) ? (XdrvMailbox.payload == -99 ? ShutterRealToPercentPosition(Shutter[index].real_position, index) : 0) : ((XdrvMailbox.payload > 100) ? 100 : XdrvMailbox.payload);
- // webgui still send also on inverted shutter the native position.
- target_pos_percent = ((Settings->shutter_options[index] & 1) && (SRC_WEBGUI != TasmotaGlobal.last_source)) ? 100 - target_pos_percent : target_pos_percent;
+ target_pos_percent = ((Settings->shutter_options[index] & 1) && ((SRC_MQTT != TasmotaGlobal.last_source)
+ || (SRC_SERIAL != TasmotaGlobal.last_source)
+ || (SRC_WEBCOMMAND != TasmotaGlobal.last_source)
+ )) ? 100 - target_pos_percent : target_pos_percent;
if (XdrvMailbox.payload != -99) {
//target_pos_percent = (Settings->shutter_options[index] & 1) ? 100 - target_pos_percent : target_pos_percent;
Shutter[index].target_position = ShutterPercentToRealPosition(target_pos_percent, index);
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_50_filesystem.ino b/tasmota/tasmota_xdrv_driver/xdrv_50_filesystem.ino
index ee99a4f801ff..dfc54172e0de 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_50_filesystem.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_50_filesystem.ino
@@ -183,9 +183,9 @@ void UfsCheckSDCardInit(void) {
if (TasmotaGlobal.spi_enabled && PinUsed(GPIO_SDCARD_CS)) {
int8_t cs = Pin(GPIO_SDCARD_CS);
-#ifdef EPS8266
+#ifdef ESP8266
SPI.begin();
-#endif // EPS8266
+#endif // ESP8266
#ifdef ESP32
SPI.begin(Pin(GPIO_SPI_CLK), Pin(GPIO_SPI_MISO), Pin(GPIO_SPI_MOSI), -1);
#endif // ESP32
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_flash.ino b/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_flash.ino
index ca0af5319606..6609ca082966 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_flash.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_flash.ino
@@ -21,9 +21,17 @@
#ifdef USE_BERRY
#include
" ""; +#endif // USE_CONSOLE_CSS_FLEX const char HTTP_TABLE100[] PROGMEM = "