ps
/
Lumenarium
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debug utilities for internal motor state tracking, and fixed a bug where closing the motors wouldn't turn the upper leds back on

This commit is contained in:
PS 2021-04-08 15:35:55 -10:00
parent 876c7107d1
commit b636e9ef3d
1 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/app/ss_blumen_lumen/blumen_lumen.cpp
View File

@ -392,6 +392,25 @@ BlumenLumen_CustomInit(app_state* State, context Context)
return Result; return Result;
} }
internal void
BlumenLumen_UpdateMotorState(blumen_lumen_state* BLState, motor_status_packet Motor, context Context)
{
motor_packet CurrPos = Motor.Pos;
motor_packet LastPos = BLState->LastKnownMotorState;
DEBUG_ReceivedMotorPositions(LastPos, Motor.Pos, Context.ThreadContext);
for (u32 i = 0; i < BL_FLOWER_COUNT; i++)
{
if (LastPos.FlowerPositions[i] != CurrPos.FlowerPositions[i])
{
BLState->LastTimeMotorStateChanged[i] = Context.SystemTime_Current.NanosSinceEpoch;
}
}
BLState->LastKnownMotorState = Motor.Pos;
BLState->ShouldUpdateLog = true;
}
internal void internal void
BlumenLumen_CustomUpdate(gs_data UserData, app_state* State, context* Context) BlumenLumen_CustomUpdate(gs_data UserData, app_state* State, context* Context)
{ {
@ -444,20 +463,7 @@ BlumenLumen_CustomUpdate(gs_data UserData, app_state* State, context* Context)
Motor.Temperature = (T[0] << 8 | Motor.Temperature = (T[0] << 8 |
T[1] << 0); T[1] << 0);
motor_packet CurrPos = Motor.Pos; BlumenLumen_UpdateMotorState(BLState, Motor, *Context);
motor_packet LastPos = BLState->LastKnownMotorState;
DEBUG_ReceivedMotorPositions(LastPos, Motor.Pos, Context->ThreadContext);
for (u32 i = 0; i < BL_FLOWER_COUNT; i++)
{
if (LastPos.FlowerPositions[i] != CurrPos.FlowerPositions[i])
{
BLState->LastTimeMotorStateChanged[i] = Context->SystemTime_Current.NanosSinceEpoch;
}
}
BLState->LastKnownMotorState = Motor.Pos;
BLState->ShouldUpdateLog = true;
}break; }break;
case PacketType_Temperature: case PacketType_Temperature:
@ -628,6 +634,11 @@ BlumenLumen_CustomUpdate(gs_data UserData, app_state* State, context* Context)
BLState->ShouldDimUpperLeds[i] = true; BLState->ShouldDimUpperLeds[i] = true;
} }
} }
else if (MotorPos == MotorState_Closed ||
MotorPos == MotorState_HalfOpen)
{
BLState->ShouldDimUpperLeds[i] = false;
}
} }
// NOTE(PS): If the flowers are mostly open or full open // NOTE(PS): If the flowers are mostly open or full open
@ -794,11 +805,23 @@ US_CUSTOM_DEBUG_UI(BlumenLumen_DebugUI)
ui_Label(I, MakeString("Set Internal Motor State:")); ui_Label(I, MakeString("Set Internal Motor State:"));
if (ui_Button(I, MakeString("Closed"))) if (ui_Button(I, MakeString("Closed")))
{ {
motor_status_packet Motor = {};
Motor.Pos.FlowerPositions[0] = MotorState_Closed;
Motor.Pos.FlowerPositions[1] = MotorState_Closed;
Motor.Pos.FlowerPositions[2] = MotorState_Closed;
Motor.Temperature = 16;
BlumenLumen_UpdateMotorState(BLState, Motor, Context);
} }
if (ui_Button(I, MakeString("Open"))) if (ui_Button(I, MakeString("Open")))
{ {
motor_status_packet Motor = {};
Motor.Pos.FlowerPositions[0] = MotorState_Open;
Motor.Pos.FlowerPositions[1] = MotorState_Open;
Motor.Pos.FlowerPositions[2] = MotorState_Open;
Motor.Temperature = 16;
BlumenLumen_UpdateMotorState(BLState, Motor, Context);
} }
} }
} }