Started working on next milestone

- Removed the 6V5 power enable 
- Tweaked the cursor position for preset configuration
- Updated the MenuText header file for translation at Photonis

git-svn-id: https://svn.vbchaos.nl/svn/hsb/trunk@320 05563f52-14a8-4384-a975-3d1654cca0fa

S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/hsb-mrts/src/MenuCore.c

@@ -167,15 +167,13 @@ static void MenuCore_task(void* parameters)
          if (MenuCore_performAction(self, key, keyState) == SUCCESS)
          {
             // The key had an action
-            // Clear the screen for a new menu
-//            Display_clearScreen(self->display);
             // Print menu content to output device
             MenuCore_printMenu(self);
             // Add cursor if necessary
             MenuCore_printCursor(self);
          }
       }
-      vTaskDelay(50);
+      vTaskDelay(100);
    }
 
    LOGGER_INFO(mainLog, "Deleting MenuCore task");

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

@@ -43,7 +43,6 @@
 #include "Interlock.h"
 #include "Logger.h"
 #include "PCBA.h"
-#include "Power6V5Supply.h"
 #include "TeslaGunSafety.h"
 #include "Version.h"
 
@@ -140,13 +139,6 @@ ErrorStatus hsb_enableSafetyWithError(void)
       }
    }
 
-   // if Interlock(s) closed, continue procedure
-   if (returnValue == SUCCESS)
-   {
-      // Power the circuit
-      returnValue = Power6V5Supply_on();
-   }
-
    if (returnValue == SUCCESS)
    {
       _hsb_safetyIsEnabled = true;
@@ -193,13 +185,6 @@ ErrorStatus hsb_enableSafetyWithWarning(void)
       }
    }
 
-   // if Interlock(s) closed, continue procedure
-   if (returnValue == SUCCESS)
-   {
-      // Power the circuit
-      returnValue = Power6V5Supply_on();
-   }
-
    if (returnValue == SUCCESS)
    {
       _hsb_safetyIsEnabled = true;
@@ -239,8 +224,6 @@ ErrorStatus hsb_disableSafety(void)
    DAConverter_setOutputVoltage(dacRow2, 0);
    DAConverter_setOutputVoltage(dacRow3, 0);
 
-   // Un-Power the circuit
-   Power6V5Supply_off();
 
    if (PCBA_getInstance()->pcba != PCBA_Tesla)
    {

S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/hsb-mrts/src/main.c

@@ -52,7 +52,6 @@
 #include "Interlock.h"
 #include "Logger.h"
 #include "nhd0420.h"
-#include "Power6V5Supply.h"
 #include "TeslaGunSafety.h"
 
 #include "PCBA.h"

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

@@ -52,7 +52,6 @@
 #include "Interlock.h"
 #include "internalADC.h"
 #include "MAX5715.h"
-#include "Power6V5Supply.h"
 #include "TeslaGunSafety.h"
 
 #include "KeyboardDevice.h"
@@ -576,7 +575,6 @@ static void repairMenu_configPresetFirstSoftstart(struct MenuCore* self)
 
 static void repairMenu_configVoltageOutput(struct MenuCore* self)
 {
-   Power6V5Supply_on();
    repairMenu_clearInsertString(self);
    // In case of CathodeMCP, the insert value must be negative
    repairMenu_fillInsertStringWithValue(self, DAConverter_getCurrentValue(dacRow1));
@@ -1097,10 +1095,7 @@ void repairMenu_menuStateHandle(struct MenuCore* self)
          // repair is finished
          MenuCore_changeState(self, RM_FINISH_CONTROL);
       }
-//      else if (remainingTime == 0xFFFFFFFF)
-//      {
-//         Error_postError(REPAIR_FAIL);
-//      }
+
       else
       {
          // Create the repair screen
@@ -1180,14 +1175,13 @@ void repairMenu_menuStateHandle(struct MenuCore* self)
       snprintf(buffer, sizeof(buffer) / sizeof(buffer[0]), "%5sm", self->insertString);
       Display_write(self->display, buffer, 2, MENUTEXT_PRESET_MAX_LENGTH + 1);
       vTaskDelay(2);
-      Display_setCursorToPosition(self->display, 2, MENUTEXT_PRESET_MAX_LENGTH + 1 + 5);
+      Display_setCursorToPosition(self->display, 2, MENUTEXT_PRESET_MAX_LENGTH + 5);
       vTaskDelay(2);
       Display_setBlinkingCursorState(self->display, ON);
    }
 
    else if (self->menuState == RM_ADMIN_PRESET_CONFIG_FIRST_DURATION)
    {
-//      repairMenu_printConfigPreset(self);
       repairMenu_printPreset(self);
       char buffer[7];
 
@@ -1204,14 +1198,13 @@ void repairMenu_menuStateHandle(struct MenuCore* self)
       snprintf(buffer, sizeof(buffer) / sizeof(buffer[0]), "%5sm", self->insertString);
       Display_write(self->display, buffer, 3, MENUTEXT_PRESET_MAX_LENGTH + 1);
       vTaskDelay(2);
-      Display_setCursorToPosition(self->display, 3, MENUTEXT_PRESET_MAX_LENGTH + 1 + 5);
+      Display_setCursorToPosition(self->display, 3, MENUTEXT_PRESET_MAX_LENGTH + 5);
       vTaskDelay(2);
       Display_setBlinkingCursorState(self->display, ON);
    }
 
    else if (self->menuState == RM_ADMIN_PRESET_CONFIG_FIRST_VOLTAGE)
    {
-//      repairMenu_printConfigPreset(self);
       repairMenu_printPreset(self);
       char buffer[7];
 
@@ -1528,7 +1521,6 @@ void repairMenu_menuStateHandle(struct MenuCore* self)
       DAConverter_setOutputVoltage(dacRow2, 0);
       DAConverter_setOutputVoltage(dacRow3, 0);
 
-      Power6V5Supply_off();
 
       Display_writeCentered(self->display, MenuText_VOLTAGE_OUT_CLEANUP[languageIndex][0], 3);
       Display_writeCentered(self->display, MenuText_VOLTAGE_OUT_CLEANUP[languageIndex][1], 4);

S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/hsb-mrts/src/repairProcesses.c

@@ -31,7 +31,6 @@
 #include "Interlock.h"
 #include "Logger.h"
 #include "PCBA.h"
-#include "Power6V5Supply.h"
 #include "rtc.h"
 
 // -----------------------------------------------------------------------------