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

Finished motor time of day controls

This commit is contained in:
Peter Slattery 2021-04-13 03:00:14 -04:00
parent f7aa8722a6
commit 5a1c37a23e
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,21 +77,22 @@ DEBUG_SentMotorCommand(motor_packet Packet, gs_thread_context Ctx)
} }
internal void internal void
DEBUG_ReceivedMotorPositions(motor_packet NewPos, DEBUG_ReceivedMotorPositions(blumen_lumen_state* BLState,
motor_packet LastPos, motor_status_packet NewPos,
gs_thread_context Ctx) gs_thread_context Ctx)
{ {
bool PosChanged = (LastPos.FlowerPositions[0] != NewPos.FlowerPositions[0] || motor_packet LastPos = BLState->LastKnownMotorState;
LastPos.FlowerPositions[1] != NewPos.FlowerPositions[1] || bool PosChanged = (LastPos.FlowerPositions[0] != NewPos.Pos.FlowerPositions[0] ||
LastPos.FlowerPositions[2] != NewPos.FlowerPositions[2]); LastPos.FlowerPositions[1] != NewPos.Pos.FlowerPositions[1] ||
LastPos.FlowerPositions[2] != NewPos.Pos.FlowerPositions[2]);
if (PosChanged) if (PosChanged)
{ {
Log_Message(GlobalLogBuffer, Log_Message(GlobalLogBuffer,
"Motor Status Received\nCurrent Positions: %d %d %d\n", "Motor Status Received\nCurrent Positions: %d %d %d\n",
NewPos.FlowerPositions[0], NewPos.Pos.FlowerPositions[0],
NewPos.FlowerPositions[1], NewPos.Pos.FlowerPositions[1],
NewPos.FlowerPositions[2]); NewPos.Pos.FlowerPositions[2]);
} }
} }
@ -421,10 +422,10 @@ BlumenLumen_CustomInit(app_state* State, context Context)
internal void internal void
BlumenLumen_UpdateMotorState(blumen_lumen_state* BLState, motor_status_packet Motor, context Context) BlumenLumen_UpdateMotorState(blumen_lumen_state* BLState, motor_status_packet Motor, context Context)
{ {
motor_packet CurrPos = Motor.Pos; DEBUG_ReceivedMotorPositions(BLState, Motor, Context.ThreadContext);
motor_packet LastPos = BLState->LastKnownMotorState;
DEBUG_ReceivedMotorPositions(LastPos, Motor.Pos, Context.ThreadContext);
motor_packet LastPos = BLState->LastKnownMotorState;
motor_packet CurrPos = Motor.Pos;
for (u32 i = 0; i < BL_FLOWER_COUNT; i++) for (u32 i = 0; i < BL_FLOWER_COUNT; i++)
{ {
if (LastPos.FlowerPositions[i] != CurrPos.FlowerPositions[i]) if (LastPos.FlowerPositions[i] != CurrPos.FlowerPositions[i])
@ -635,6 +636,15 @@ BlumenLumen_CustomUpdate(gs_data UserData, app_state* State, context* Context)
ShouldSendCurrentState = true; ShouldSendCurrentState = true;
} }
if (ShouldSendCurrentState)
{
BLState->LastSendTime = Context->SystemTime_Current;
BLState->LastSendState = NewMotorState;
Log_Message(GlobalLogBuffer,
"Would send motor state: %s",
NewMotorState == MotorState_Closed ? "Closed" : "Open");
}
ShouldSendCurrentState = false;
if (ShouldSendCurrentState) if (ShouldSendCurrentState)
{ {
BLState->LastSendTime = Context->SystemTime_Current; BLState->LastSendTime = Context->SystemTime_Current;
@ -754,7 +764,7 @@ BlumenLumen_CustomUpdate(gs_data UserData, app_state* State, context* Context)
if (SecondsSinceLastSend >= STATUS_PACKET_FREQ_SECONDS) if (SecondsSinceLastSend >= STATUS_PACKET_FREQ_SECONDS)
{ {
BLState->LastStatusUpdateTime = Context->SystemTime_Current; BLState->LastStatusUpdateTime = Context->SystemTime_Current;
OutputDebugString("Attempting to Send Lumenarium Status\n"); Log_Message(GlobalLogBuffer, "Attempting to Send Lumenarium Status\n");
blumen_packet Packet = {}; blumen_packet Packet = {};
Packet.Type = PacketType_LumenariumStatus; Packet.Type = PacketType_LumenariumStatus;
@ -874,6 +884,11 @@ US_CUSTOM_DEBUG_UI(BlumenLumen_DebugUI)
case MotorState_Open: { case MotorState_Open: {
StateStr = MakeString("Open"); StateStr = MakeString("Open");
} break; } break;
default:
{
StateStr = MakeString("Invalid Value");
} break;
} }
ui_Label(I, StateStr); ui_Label(I, StateStr);