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

Update xdrv_91_apds9960.ino

Browse Source 
Changed the payload back to string.
I think this is shorter, easier to understand without any documentation and still works with rules.
e.g.
on Tele-APDS9960#Up do command endon
This commit is contained in:
Christian 2018-06-23 18:37:14 +02:00 committed by GitHub
parent ac626b30e6
commit 8ee51f37db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sonoff/xdrv_91_apds9960.ino
View File

@ -23,7 +23,7 @@
POSSIBILITY OF SUCH DAMAGE. POSSIBILITY OF SUCH DAMAGE.
*/ */
// #define USE_APDS9960 // uncomment to enable the sensor //#define USE_APDS9960 // uncomment to enable the sensor
// !!!!!! turn off conflicting drivers !!!! // !!!!!! turn off conflicting drivers !!!!
#if defined(USE_SHT) || defined(USE_VEML6070) #if defined(USE_SHT) || defined(USE_VEML6070)
#warning I will turn off conflicting drivers (SHT and VEML6070) !!! #warning I will turn off conflicting drivers (SHT and VEML6070) !!!
@ -40,13 +40,6 @@ enum GestureCommands {
const char kGestureCommands[] PROGMEM = const char kGestureCommands[] PROGMEM =
"Gesture" ; "Gesture" ;
#define UP 1
#define RIGHT 2
#define DOWN 3
#define LEFT 4
#define LONG 5
#define NONE 6
/*********************************************************************************************\ /*********************************************************************************************\
* APDS9960 * APDS9960
* *
@ -69,7 +62,7 @@ const char kGestureCommands[] PROGMEM =
uint8_t APDS9960addr; uint8_t APDS9960addr;
uint8_t APDS9960type = 0; uint8_t APDS9960type = 0;
char APDS9960stype[7]; char APDS9960stype[7];
uint8_t currentGesture = NONE; char currentGesture[6];
bool gesture_mode = true; bool gesture_mode = true;
@ -1924,29 +1917,29 @@ void handleGesture() {
switch (readGesture()) { switch (readGesture()) {
case DIR_UP: case DIR_UP:
snprintf_P(log, sizeof(log), PSTR("UP")); snprintf_P(log, sizeof(log), PSTR("UP"));
currentGesture = 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, sizeof(log), PSTR("DOWN"));
currentGesture = 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, sizeof(log), PSTR("LEFT"));
currentGesture = 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, sizeof(log), PSTR("RIGHT"));
currentGesture = 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, sizeof(log), PSTR("LONG"));
currentGesture = LONG; snprintf_P(currentGesture, sizeof(currentGesture), PSTR("Long"));
} }
else{ else{
snprintf_P(log, sizeof(log), PSTR("NONE")); snprintf_P(log, sizeof(log), PSTR("NONE"));
currentGesture = NONE; snprintf_P(currentGesture, sizeof(currentGesture), PSTR("None"));
} }
} }
AddLog_P(LOG_LEVEL_DEBUG, log); AddLog_P(LOG_LEVEL_DEBUG, log);
@ -2020,6 +2013,7 @@ bool APDS9960_detect(void)
snprintf_P(log, sizeof(log), PSTR("APDS9960 not found at address 0x%x"), APDS9960_I2C_ADDR); snprintf_P(log, sizeof(log), PSTR("APDS9960 not found at address 0x%x"), APDS9960_I2C_ADDR);
AddLog_P(LOG_LEVEL_DEBUG, log); AddLog_P(LOG_LEVEL_DEBUG, log);
} }
currentGesture[0] = '\0';
return success; return success;
} }
@ -2070,10 +2064,9 @@ void APDS9960_show(boolean json)
#endif // USE_WEBSERVER #endif // USE_WEBSERVER
} }
else{ else{
if (json && currentGesture) { if (json && (currentGesture[0] != '\0' )) {
snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"%s\":{\"Gesture\":%x}"), snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"%s\":{\"%s\":1}"), mqtt_data, APDS9960stype, currentGesture);
mqtt_data, APDS9960stype ,currentGesture); currentGesture[0] = '\0';
currentGesture = 0;
} }
} }
} }