mirror of
https://github.com/arendst/Tasmota.git
synced 2025-07-25 19:56:30 +00:00
MQTT fix on inverted shutter (#21663)
* MQTT fix on inverted shutter * MQTT fix on inverted shutter
This commit is contained in:
parent
3537d18483
commit
d18925897a
@ -1868,12 +1868,10 @@ void CmndShutterPosition(void)
|
||||
}
|
||||
|
||||
int8_t target_pos_percent = (XdrvMailbox.payload < 0) ? (XdrvMailbox.payload == -99 ? ShutterRealToPercentPosition(Shutter[index].real_position, index) : 0) : ((XdrvMailbox.payload > 100) ? 100 : XdrvMailbox.payload);
|
||||
target_pos_percent = ((ShutterSettings.shutter_options[index] & 1) && ((SRC_MQTT != TasmotaGlobal.last_source) // 1
|
||||
&& (SRC_SERIAL != TasmotaGlobal.last_source) // 6
|
||||
target_pos_percent = ((ShutterSettings.shutter_options[index] & 1) && ( (SRC_SERIAL != TasmotaGlobal.last_source) // 6
|
||||
&& (SRC_WEBGUI != TasmotaGlobal.last_source) // 7
|
||||
&& (SRC_WEBCOMMAND != TasmotaGlobal.last_source) // 8
|
||||
)) ? 100 - target_pos_percent : target_pos_percent;
|
||||
|
||||
// if position is either 0 or 100 reset the tilt to avoid tilt moving at the end
|
||||
if (target_pos_percent == 0 && ShutterRealToPercentPosition(Shutter[index].real_position, index) > 0 ) {Shutter[index].tilt_target_pos = Shutter[index].tilt_config[4];}
|
||||
if (target_pos_percent == 100 && ShutterRealToPercentPosition(Shutter[index].real_position, index) < 100) {Shutter[index].tilt_target_pos = Shutter[index].tilt_config[3];}
|
||||
|
@ -1332,8 +1332,7 @@ void CmndShutterPosition(void)
|
||||
}
|
||||
|
||||
int8_t target_pos_percent = (XdrvMailbox.payload < 0) ? (XdrvMailbox.payload == -99 ? ShutterRealToPercentPosition(Shutter[index].real_position, index) : 0) : ((XdrvMailbox.payload > 100) ? 100 : XdrvMailbox.payload);
|
||||
target_pos_percent = ((Settings->shutter_options[index] & 1) && ((SRC_MQTT != TasmotaGlobal.last_source)
|
||||
&& (SRC_SERIAL != TasmotaGlobal.last_source)
|
||||
target_pos_percent = ((Settings->shutter_options[index] & 1) && ( (SRC_SERIAL != TasmotaGlobal.last_source)
|
||||
&& (SRC_WEBGUI != TasmotaGlobal.last_source)
|
||||
&& (SRC_WEBCOMMAND != TasmotaGlobal.last_source)
|
||||
)) ? 100 - target_pos_percent : target_pos_percent;
|
||||
|
Loading…
x
Reference in New Issue
Block a user