private/hsb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added BiColour led behaviour to menu

Browse Source 
git-svn-id: https://svn.vbchaos.nl/svn/hsb/trunk@360 05563f52-14a8-4384-a975-3d1654cca0fa
This commit is contained in:
mmi
2017-12-13 14:02:34 +00:00
parent a48164fe7a
commit 3852a5e0d8
2 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/hsb-mrts/src/repairMenu.c
View File

@@ -1071,10 +1071,23 @@ void repairMenu_menuStateHandle(struct MenuCore* self)
{
// Stop the buzzer from recovered error or warning
if ((self->lastMenuState == RM_ERROR_STATE) || (self->lastMenuState == RM_WARNING_STATE))
if (self->lastMenuState == RM_ERROR_STATE)
{
if ((self->menuState != RM_ERROR_STATE) && (self->menuState != RM_WARNING_STATE))
Buzzer_stop(self->buzzer);
if (self->menuState != RM_ERROR_STATE)
{
Buzzer_stop(self->buzzer);
Led_off(LED_BICOLOR_RED);
}
}
// Stop the buzzer from recovered error or warning
if (self->lastMenuState == RM_WARNING_STATE)
{
if (self->menuState != RM_WARNING_STATE)
{
Buzzer_stop(self->buzzer);
Led_off(LED_BICOLOR_ORANGE);
}
}
// Catch ERROR state
@@ -1083,6 +1096,7 @@ void repairMenu_menuStateHandle(struct MenuCore* self)
self->lastMenuState = self->menuState;
// Show ERROR message
repairMenu_printError(self);
Led_on(LED_BICOLOR_RED);
// Handle error
if (hsb_safetyIsEnabled())
{
@@ -1093,6 +1107,7 @@ void repairMenu_menuStateHandle(struct MenuCore* self)
{
self->lastMenuState = self->menuState;
repairMenu_printWarning(self);
Led_on(LED_BICOLOR_ORANGE);
}
else if (self->menuState == RM_PRESET_PRINT)
@@ -1104,6 +1119,8 @@ void repairMenu_menuStateHandle(struct MenuCore* self)
{
// Check the remaining repair time
uint32_t remainingTime = repairProcess_getRemainingRepairTime(repairProcesses_getMainRepairProcess());
Led_on(LED_BICOLOR_GREEN);
if (remainingTime > (2 * REPAIRMENU_POPUPSCREEN_TIME_MS / 1000))
{
self->popUpCounter = remainingTime - (2 * REPAIRMENU_POPUPSCREEN_TIME_MS / 1000);
@@ -1134,6 +1151,7 @@ void repairMenu_menuStateHandle(struct MenuCore* self)
else if (self->menuState == RM_REPAIR_PAUSE)
{
repairMenu_printPause(self);
Led_off(LED_BICOLOR_GREEN);
}
else if (self->menuState == RM_FINISH_CONTROL)
{
@@ -1144,6 +1162,7 @@ void repairMenu_menuStateHandle(struct MenuCore* self)
else if (self->menuState == RM_FINISH)
{
repairMenu_printFinish(self);
Led_off(LED_BICOLOR_GREEN);
}
else if (self->menuState == RM_ADMINMENU_PIN_VERIFICATION)