Mirrors/OpenBK7231T_App
2
0
Fork 0
mirror of https://github.com/openshwprojects/OpenBK7231T_App.git synced 2026-02-20 00:32:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

double order stop

Browse Source
This commit is contained in:
Tester23
2025-12-22 22:29:01 +01:00
parent efc9cf203b
commit 41f2a96474
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/drv_public.h
View File

@@ -87,7 +87,7 @@ bool DRV_IsSensor();
void TuyaMCU_OnRGBCWChange(const float *rgbcw, int bLightEnableAll, int iLightMode, float brightnessRange01, float temperatureRange01);
bool TuyaMCU_IsLEDRunning();
void Shutter_MoveByIndex(int index, float frac);
void Shutter_MoveByIndex(int index, float frac, bool bStopOnDuplicate);
#endif /* __DRV_PUBLIC_H__ */

17
src/driver/drv_shutters.c
View File

@@ -197,7 +197,7 @@ static void Shutter_Stop(shutter_t *s) {
}
Shutter_SetPins(s, s->state);
}
void Shutter_MoveByIndex(int index, float frac) {
void Shutter_MoveByIndex(int index, float frac, bool bStopOnDuplicate) {
shutter_t *s = GetForChannel(index);
if (!s) {
return;
@@ -214,6 +214,13 @@ void Shutter_MoveByIndex(int index, float frac) {
if (frac < 0.0f) frac = 0.0f;
if (frac > 1.0f) frac = 1.0f;
if (bStopOnDuplicate && s->targetFrac == frac) {
// stop right now
Shutter_Stop(s);
// it's fair to assume that if we stop, target is the current pos
s->targetFrac = s->frac;
return;
}
s->targetFrac = frac;
if (s->frac < 0.0f)
@@ -232,15 +239,15 @@ static commandResult_t CMD_Shutter_MoveTo(const void *context, const char *cmd,
int index = atoi(cmd + strlen("ShutterMove"));
const char *target = Tokenizer_GetArg(0);
if (!stricmp(target, "open")) {
Shutter_MoveByIndex(index, 1);
Shutter_MoveByIndex(index, 1, false);
return CMD_RES_OK;
}
if (!stricmp(target, "close")) {
Shutter_MoveByIndex(index, 0);
Shutter_MoveByIndex(index, 0, false);
return CMD_RES_OK;
}
if (!stricmp(target, "stop")) {
Shutter_MoveByIndex(index, -1);
Shutter_MoveByIndex(index, -1, false);
return CMD_RES_OK;
}
/*
@@ -249,7 +256,7 @@ static commandResult_t CMD_Shutter_MoveTo(const void *context, const char *cmd,
position_closed: 0
*/
float frac = atof(target) * 0.01f;
Shutter_MoveByIndex(index, frac);
Shutter_MoveByIndex(index, frac, false);
return CMD_RES_OK;
}
void Shutter_SetTimes(int channel, float timeOpen, float timeClose) {

8
src/new_pins.c
View File

@@ -586,12 +586,12 @@ void Button_OnShortClick(int index)
#if ENABLE_DRIVER_SHUTTERS
if (g_cfg.pins.roles[index] == IOR_Button_ShutterUp)
{
Shutter_MoveByIndex(g_cfg.pins.channels[index], 1.0f);
Shutter_MoveByIndex(g_cfg.pins.channels[index], 1.0f, true);
return;
}
if (g_cfg.pins.roles[index] == IOR_Button_ShutterDown)
{
Shutter_MoveByIndex(g_cfg.pins.channels[index], 0.0f);
Shutter_MoveByIndex(g_cfg.pins.channels[index], 0.0f, true);
return;
}
#endif
@@ -644,13 +644,13 @@ void Button_OnDoubleClick(int index)
if (g_cfg.pins.roles[index] == IOR_Button_ShutterUp)
{
// issue stop order
Shutter_MoveByIndex(g_cfg.pins.channels[index], -1.0f);
Shutter_MoveByIndex(g_cfg.pins.channels[index], -1.0f, true);
return;
}
if (g_cfg.pins.roles[index] == IOR_Button_ShutterDown)
{
// issue stop order
Shutter_MoveByIndex(g_cfg.pins.channels[index], -1.0f);
Shutter_MoveByIndex(g_cfg.pins.channels[index], -1.0f, true);
return;
}
#endif