release R2309

maierkomor · Oct 3, 2023 · 032e503 · 032e503
1 parent bd1a869
commit 032e503
Show file tree

Hide file tree

Showing 24 changed files with 621 additions and 212 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+R2309:
+======
+- fix SNTP for IDFv5.1 64bit timeval struct
+- update to IDF version 5.1.1
+- fix influx command not in line with its manpage
+- fix syslog stat race-condition
+- update for SGP30 driver
+
 R2307:
 ======
 - added/enhanced support for HDC1000 and HDC1080

diff --git a/components/netsvc/lwtcp.h b/components/netsvc/lwtcp.h
@@ -25,6 +25,10 @@
 #include <freertos/FreeRTOS.h>
 #include <freertos/semphr.h>
 
+#ifndef LWIP_TCPIP_CORE_LOCKING
+#error LWIP_TCPIP_CORE_LOCKING not defined
+#endif
+
 
 extern "C" const char *strlwiperr(int e);
 
@@ -71,7 +75,7 @@ class LwTcp
 	uint16_t m_port = 0, m_bufsize = 0, m_fill = 0, m_taken = 0, m_nwrite = 0, m_nout = 0;
 	err_t m_err = 0;
 	SemaphoreHandle_t m_sem, m_send, m_mtx;
-#ifndef CONFIG_IDF_TARGET_ESP8266
+#if LWIP_TCPIP_CORE_LOCKING == 0
 	ip_addr_t *m_addr = 0;
 	SemaphoreHandle_t m_lwip;
 #endif
@@ -122,7 +126,7 @@ class LwTcpListener
 	uint16_t m_port = 0, m_id = 0, m_stack;
 	uint8_t m_prio;
 	bool m_enabled = true;
-#ifndef CONFIG_IDF_TARGET_ESP8266
+#if LWIP_TCPIP_CORE_LOCKING == 0
 	SemaphoreHandle_t m_lwip;
 #endif
 };

diff --git a/components/netsvc/tcpio.c b/components/netsvc/tcpio.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2021, Thomas Maier-Komor
+ *  Copyright (C) 2021-2023, Thomas Maier-Komor
  *  Atrium Firmware Package for ESP
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 
 #include <sdkconfig.h>
 
-#ifndef CONFIG_IDF_TARGET_ESP8266
+#if LWIP_TCPIP_CORE_LOCKING == 0
 #include "log.h"
 #include "tcpio.h"
 

diff --git a/components/term/uart_terminal.cpp b/components/term/uart_terminal.cpp
@@ -94,7 +94,8 @@ void UartTerminal::init(uint8_t rx, uint8_t tx)
 {
 	m_uart_rx = rx;
 	m_uart_tx = tx;
-	snprintf(m_name,sizeof(m_name),"uart@%d,%d",rx,tx);
+	assert((rx < 10) && (tx < 10));
+	snprintf(m_name,sizeof(m_name),"uart@%1d,%1d",rx,tx);
 #if CONFIG_UART_CONSOLE_NONE != 1 && CONFIG_CONSOLE_UART_NUM != -1
 	if ((int)rx != CONFIG_CONSOLE_UART_NUM)
 #endif

diff --git a/data/lua/rgbcct.lua b/data/lua/rgbcct.lua
@@ -140,5 +140,5 @@ end
 
 function color_manual(arg)
 	sm_set('led','manual')
-	color_set(mqtt_get('rgbcct1/set_color'))
+	color_set(mqtt_get(var_get('node')..'/set_color'))
 end
diff --git a/data/man/i2c.man b/data/man/i2c.man
@@ -1,7 +1,12 @@
 synopsis: i2c [<device> [<cmd> [<args>]]]
+          i2c <busid> <buscmd>
 Without <device> this command prints the available I2C devices.
 With a specified <device>, device specific operations can be triggered.
 This includes sending commands with arguments to the I2C device.
 Read the documentation of the individual device drivers or pass '-h' as
 command to the device to learn what commands can be sent to the
 individual I2C devices.
+
+The second variant takes the busid as the first arguemnt, followed by a
+bus command. Possible bus commands are:
+- reset: perform a bus reset, using the general call address
diff --git a/data/man/influx.man b/data/man/influx.man
@@ -4,9 +4,10 @@ Command 'init' initializes influx with current configuration.
 Command 'send' sends an arbitrary argument to the influx server.
 Command 'clear' clears the configuration or specified field.
 Command 'stop' stops the influx service.
+command 'start' to start influx service.
 Valid <arg> are:
-host  : to set the influx database server host
-port  : to set the port on which influx is listening
-db    : to set the database name (set to send data to Influx via TCP)
-mm    : to set the measurement name
+host     : to set the influx database server host
+port     : to set the port on which influx is listening
+database : to set the database name (set to send data to Influx via TCP)
+mm       : to set the measurement name
 config: to set complete config in the form <host>:<port>/<mm>