mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3954 from andrethomas/development 

PCA9685 - bugfix for telemetry + status command
This commit is contained in:
Theo Arends 2018-10-01 21:30:20 +02:00 committed by GitHub
parent d9a0c0e4ae 2f85a4728b
commit 2f429e5a44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sonoff/xdrv_15_pca9685.ino
View File

@ -98,6 +98,7 @@ void PCA9685_SetPWM(uint8_t pin, uint16_t pwm, bool inverted) {
} else { } else {
PCA9685_SetPWM_Reg(pin, 0, pwm); PCA9685_SetPWM_Reg(pin, 0, pwm);
} }
pca9685_pin_pwm_value[pin] = pwm;
} }
bool PCA9685_Command(void) bool PCA9685_Command(void)
@ -120,6 +121,8 @@ bool PCA9685_Command(void)
if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET")) { PCA9685_Reset(); return serviced; } if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"RESET")) { PCA9685_Reset(); return serviced; }
if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"STATUS")) { PCA9685_OutputTelemetry(false); return serviced; }
if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"PWMF")) { if (!strcmp(subStr(sub_string, XdrvMailbox.data, ",", 1),"PWMF")) {
if (paramcount > 1) { if (paramcount > 1) {
uint16_t new_freq = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2)); uint16_t new_freq = atoi(subStr(sub_string, XdrvMailbox.data, ",", 2));
@ -162,7 +165,7 @@ bool PCA9685_Command(void)
return serviced; return serviced;
} }
void PCA9685_OutputTelemetry(void) { void PCA9685_OutputTelemetry(bool telemetry) {
if (0 == pca9685_detected) { return; } // We do not do this if the PCA9685 has not been detected if (0 == pca9685_detected) { return; } // We do not do this if the PCA9685 has not been detected
snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_JSON_TIME "\":\"%s\",\"PCA9685\": {"), GetDateAndTime(DT_LOCAL).c_str()); snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_JSON_TIME "\":\"%s\",\"PCA9685\": {"), GetDateAndTime(DT_LOCAL).c_str());
snprintf_P(mqtt_data,sizeof(mqtt_data), PSTR("%s\"PWM_FREQ\":%i,"),mqtt_data,pca9685_freq); snprintf_P(mqtt_data,sizeof(mqtt_data), PSTR("%s\"PWM_FREQ\":%i,"),mqtt_data,pca9685_freq);
@ -170,7 +173,9 @@ void PCA9685_OutputTelemetry(void) {
snprintf_P(mqtt_data,sizeof(mqtt_data), PSTR("%s\"PWM%i\":%i,"),mqtt_data,pin,pca9685_pin_pwm_value[pin]); snprintf_P(mqtt_data,sizeof(mqtt_data), PSTR("%s\"PWM%i\":%i,"),mqtt_data,pin,pca9685_pin_pwm_value[pin]);
} }
snprintf_P(mqtt_data,sizeof(mqtt_data),PSTR("%s\"END\":1}}"),mqtt_data); snprintf_P(mqtt_data,sizeof(mqtt_data),PSTR("%s\"END\":1}}"),mqtt_data);
MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain); if (telemetry) {
MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain);
}
} }
boolean Xdrv15(byte function) boolean Xdrv15(byte function)
@ -182,7 +187,7 @@ boolean Xdrv15(byte function)
case FUNC_EVERY_SECOND: case FUNC_EVERY_SECOND:
PCA9685_Detect(); PCA9685_Detect();
if (tele_period == 0) { if (tele_period == 0) {
PCA9685_OutputTelemetry(); PCA9685_OutputTelemetry(true);
} }
break; break;
case FUNC_COMMAND: case FUNC_COMMAND: