mirror of
https://github.com/arendst/Tasmota.git
synced 2025-07-30 06:06:36 +00:00
Fix shutter JSON
This commit is contained in:
parent
a1df6b9db9
commit
8be7dbe235
@ -242,7 +242,6 @@ void ShutterInit(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void ShutterReportPosition(bool always = false)
|
void ShutterReportPosition(bool always = false)
|
||||||
{
|
{
|
||||||
uint16_t shutter_moving = 0;
|
uint16_t shutter_moving = 0;
|
||||||
@ -258,13 +257,15 @@ void ShutterReportPosition(bool always = false)
|
|||||||
//Settings.shutter_position[i] = Settings.shuttercoeff[2][i] * 5 > Shutter.real_position[i] ? Shutter.real_position[i] / Settings.shuttercoeff[2][i] : (Shutter.real_position[i]-Settings.shuttercoeff[0,i]) / Settings.shuttercoeff[1][i];
|
//Settings.shutter_position[i] = Settings.shuttercoeff[2][i] * 5 > Shutter.real_position[i] ? Shutter.real_position[i] / Settings.shuttercoeff[2][i] : (Shutter.real_position[i]-Settings.shuttercoeff[0,i]) / Settings.shuttercoeff[1][i];
|
||||||
AddLog_P2(LOG_LEVEL_INFO, MSG_SHUTTER_POS, i+1, Shutter.real_position[i], Shutter.start_position[i], Shutter.target_position[i], Shutter.direction[i], Shutter.motordelay[i],stemp2,Shutter.pwm_frequency);
|
AddLog_P2(LOG_LEVEL_INFO, MSG_SHUTTER_POS, i+1, Shutter.real_position[i], Shutter.start_position[i], Shutter.target_position[i], Shutter.direction[i], Shutter.motordelay[i],stemp2,Shutter.pwm_frequency);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (i) { ResponseAppend_P(PSTR(",")); }
|
||||||
ResponseAppend_P(JSON_SHUTTER_POS, i+1, Settings.shutter_invert[i] ? 100-position : position, Shutter.direction[i]);
|
ResponseAppend_P(JSON_SHUTTER_POS, i+1, Settings.shutter_invert[i] ? 100-position : position, Shutter.direction[i]);
|
||||||
if (i < shutters_present - 1)
|
// if (i < shutters_present - 1)
|
||||||
ResponseAppend_P(PSTR(", "));
|
// ResponseAppend_P(PSTR(", "));
|
||||||
}
|
}
|
||||||
ResponseJsonEnd();
|
ResponseJsonEnd();
|
||||||
if (always || shutter_moving == 1) {
|
if (always || (1 == shutter_moving)) {
|
||||||
MqttPublishPrefixTopic_P(RESULT_OR_TELE, mqtt_data);
|
MqttPublishPrefixTopic_P(RESULT_OR_TELE, PSTR(D_PRFX_SHUTTER));
|
||||||
}
|
}
|
||||||
if (rules_flag.shutter_moving > shutter_moving) {
|
if (rules_flag.shutter_moving > shutter_moving) {
|
||||||
rules_flag.shutter_moved = 1;
|
rules_flag.shutter_moved = 1;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user