jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-25 11:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extent log buffer to 520 characters

Browse Source 
* Extent log buffer to accomodate up to 8 DS18B20 sensors http JSON data (#4354)
* Fix APDS9960 sensor use of log buffer
This commit is contained in:
Theo Arends 2018-11-15 14:24:19 +01:00
parent 7b9060dbdb
commit d5f3b8483c
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sonoff/sonoff.h
View File

@ -119,7 +119,7 @@ typedef unsigned long power_t; // Power (Relay) type
#define INPUT_BUFFER_SIZE 520 // Max number of characters in (serial and http) command buffer #define INPUT_BUFFER_SIZE 520 // Max number of characters in (serial and http) command buffer
#define CMDSZ 24 // Max number of characters in command #define CMDSZ 24 // Max number of characters in command
#define TOPSZ 100 // Max number of characters in topic string #define TOPSZ 100 // Max number of characters in topic string
#define LOGSZ 512 // Max number of characters in log #define LOGSZ 520 // Max number of characters in log
#define MIN_MESSZ 893 // Min number of characters in MQTT message #define MIN_MESSZ 893 // Min number of characters in MQTT message
#define SENSOR_MAX_MISS 5 // Max number of missed sensor reads before deciding it's offline #define SENSOR_MAX_MISS 5 // Max number of missed sensor reads before deciding it's offline

22
sonoff/xsns_27_apds9960.ino
View File

@ -1518,9 +1518,8 @@ int16_t readGesture(void)
if (gesture_loop_counter == APDS9960_MAX_GESTURE_CYCLES){ // We will escape after a few loops if (gesture_loop_counter == APDS9960_MAX_GESTURE_CYCLES){ // We will escape after a few loops
disableGestureSensor(); // stop the sensor to prevent problems with power consumption/blocking and return to the main loop disableGestureSensor(); // stop the sensor to prevent problems with power consumption/blocking and return to the main loop
APDS9960_overload = true; // we report this as "long"-gesture APDS9960_overload = true; // we report this as "long"-gesture
char log[LOGSZ]; snprintf_P(log_data, sizeof(log_data), PSTR("Sensor overload"));
snprintf_P(log, sizeof(log), PSTR("Sensor overload")); AddLog(LOG_LEVEL_DEBUG);
AddLog_P(LOG_LEVEL_DEBUG, log);
} }
gesture_loop_counter += 1; gesture_loop_counter += 1;
/* Wait some time to collect next batch of FIFO data */ /* Wait some time to collect next batch of FIFO data */
@ -1793,36 +1792,35 @@ bool decodeGesture(void)
void handleGesture(void) { void handleGesture(void) {
if (isGestureAvailable() ) { if (isGestureAvailable() ) {
char log[LOGSZ];
switch (readGesture()) { switch (readGesture()) {
case DIR_UP: case DIR_UP:
snprintf_P(log, sizeof(log), PSTR("UP")); snprintf_P(log_data, sizeof(log_data), PSTR("UP"));
snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Up")); snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Up"));
break; break;
case DIR_DOWN: case DIR_DOWN:
snprintf_P(log, sizeof(log), PSTR("DOWN")); snprintf_P(log_data, sizeof(log_data), PSTR("DOWN"));
snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Down")); snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Down"));
break; break;
case DIR_LEFT: case DIR_LEFT:
snprintf_P(log, sizeof(log), PSTR("LEFT")); snprintf_P(log_data, sizeof(log_data), PSTR("LEFT"));
snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Left")); snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Left"));
break; break;
case DIR_RIGHT: case DIR_RIGHT:
snprintf_P(log, sizeof(log), PSTR("RIGHT")); snprintf_P(log_data, sizeof(log_data), PSTR("RIGHT"));
snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Right")); snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Right"));
break; break;
default: default:
if(APDS9960_overload) if(APDS9960_overload)
{ {
snprintf_P(log, sizeof(log), PSTR("LONG")); snprintf_P(log_data, sizeof(log_data), PSTR("LONG"));
snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Long")); snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Long"));
} }
else{ else{
snprintf_P(log, sizeof(log), PSTR("NONE")); snprintf_P(log_data, sizeof(log_data), PSTR("NONE"));
snprintf_P(currentGesture, sizeof(currentGesture), PSTR("None")); snprintf_P(currentGesture, sizeof(currentGesture), PSTR("None"));
} }
} }
AddLog_P(LOG_LEVEL_DEBUG, log); AddLog(LOG_LEVEL_DEBUG);
mqtt_data[0] = '\0'; mqtt_data[0] = '\0';
if (MqttShowSensor()) { if (MqttShowSensor()) {
@ -1834,7 +1832,7 @@ void handleGesture(void) {
} }
} }
void APDS9960_adjustATime(void) // not really used atm void APDS9960_adjustATime(void) // not really used atm
{ {
//readAllColorAndProximityData(); //readAllColorAndProximityData();
I2cValidRead16LE(&color_data.a, APDS9960_I2C_ADDR, APDS9960_CDATAL); I2cValidRead16LE(&color_data.a, APDS9960_I2C_ADDR, APDS9960_CDATAL);