Added Interlock

Fixed PID regulation functionality

git-svn-id: https://svn.vbchaos.nl/svn/hsb/trunk@250 05563f52-14a8-4384-a975-3d1654cca0fa
This commit is contained in:
mmi
2017-10-12 07:16:50 +00:00
parent 3df93a80d7
commit 54b6afe5a3
19 changed files with 504 additions and 261 deletions

View File

@@ -881,8 +881,8 @@ static void hwValidationMenuSM(struct HwValidationMenu* self, Button_Pressed_t b
bool value2 = false;
if( self->menuItemSelected == MENU_TEST_INTERLOCK_1)
{
if( GPIO_getValue(self->testItems->interlock1, &value1) == SUCCESS &&
GPIO_getValue(self->testItems->interlock2, &value2) == SUCCESS
if( GPIO_getValue(self->testItems->interlockNO, &value1) == SUCCESS &&
GPIO_getValue(self->testItems->interlockNC, &value2) == SUCCESS
){
outputBufferLength = sprintf(self->outputBuffer, "Interlock: NO: %d - NC: %d\r\n", value1, value2);
}
@@ -898,8 +898,8 @@ static void hwValidationMenuSM(struct HwValidationMenu* self, Button_Pressed_t b
if(pcba->pcba == Tesla)
{
if( GPIO_getValue(self->testItems->tesla1, &value1) == SUCCESS &&
GPIO_getValue(self->testItems->tesla2, &value2) == SUCCESS
if( GPIO_getValue(self->testItems->teslaNO, &value1) == SUCCESS &&
GPIO_getValue(self->testItems->teslaNC, &value2) == SUCCESS
){
outputBufferLength = sprintf(self->outputBuffer, "Interlock (tesla): NO: %d - NC: %d\r\n", value1, value2);
}
@@ -1106,7 +1106,6 @@ static void hwValidationMenuSM(struct HwValidationMenu* self, Button_Pressed_t b
{
if( self->menuItemSelected == MENU_TEST_GENERIC_KEYPAD)
{
char key;
Keypad_KeyState keyState;
char data[CMD_BUFFER_SIZE] = {0};