diff --git a/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/Makefile b/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/Makefile index aafde08..09a4aad 100644 --- a/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/Makefile +++ b/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/Makefile @@ -1,9 +1,9 @@ # Define release version for firmware here RELEASE_PRODUCT = S0 -RELEASE_MAJOR = 0 -RELEASE_MINOR = 9 +RELEASE_MAJOR = 1 +RELEASE_MINOR = 0 RELEASE_BRANCH = 0 -RELEASE_PATCH = 5 +RELEASE_PATCH = 0 # Define the platform to use PLATFORM_OLIMEX_STM32_H107 = OLI_STM32_H107 diff --git a/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/Platform/src/oli_stm32_h107.c b/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/Platform/src/oli_stm32_h107.c index 0e359ae..1e91a9f 100644 --- a/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/Platform/src/oli_stm32_h107.c +++ b/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/Platform/src/oli_stm32_h107.c @@ -371,11 +371,11 @@ static ErrorStatus initIO (void) /* HIGH VOLTAGE PRESENT initialisation -----------------------------------*/ // HV0 Present - hv0Present->gpio = configureGPIO(GPIOB, GPIO_Mode_Out_PP, GPIO_Speed_50MHz, GPIO_Pin_12); + hv0Present->gpio = configureGPIO(GPIOB, GPIO_Mode_IN_FLOATING, GPIO_Speed_50MHz, GPIO_Pin_12); // HV1 Present - hv1Present->gpio = configureGPIO(GPIOB, GPIO_Mode_Out_PP, GPIO_Speed_50MHz, GPIO_Pin_13); + hv1Present->gpio = configureGPIO(GPIOB, GPIO_Mode_IN_FLOATING, GPIO_Speed_50MHz, GPIO_Pin_13); // HV2 Present - hv2Present->gpio = configureGPIO(GPIOB, GPIO_Mode_Out_PP, GPIO_Speed_50MHz, GPIO_Pin_4); + hv2Present->gpio = configureGPIO(GPIOB, GPIO_Mode_IN_FLOATING, GPIO_Speed_50MHz, GPIO_Pin_14); /* ADC1 initialisation ---------------------------------------------------*/ // Channel 0 - PA0 diff --git a/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/hsb-mrts/src/hsb-mrts.c b/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/hsb-mrts/src/hsb-mrts.c index 48237c7..0a11c64 100644 --- a/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/hsb-mrts/src/hsb-mrts.c +++ b/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/hsb-mrts/src/hsb-mrts.c @@ -118,20 +118,20 @@ ErrorStatus hsb_enableSafetyWithError(void) CoverSolenoid_lock(); } -// if (returnValue == SUCCESS) -// { -// // Check for INTERLOCK CLOSE -// if (Interlock_isClosed(interlock)) -// { -// // Enable Interrupt for interlock switch -// Interlock_setEXTI(interlock, ENABLE); -// } -// else -// { -// Error_postError(INTERLOCK_COMMON_FAIL); -// returnValue = ERROR; -// } -// } + if (returnValue == SUCCESS) + { + // Check for INTERLOCK CLOSE + if (Interlock_isClosed(interlock)) + { + // Enable Interrupt for interlock switch + Interlock_setEXTI(interlock, ENABLE); + } + else + { + Error_postError(INTERLOCK_COMMON_FAIL); + returnValue = ERROR; + } + } if (returnValue == SUCCESS) @@ -213,10 +213,10 @@ ErrorStatus hsb_disableSafety(void) snprintf(buffer, sizeof(buffer) / sizeof(buffer[0]), "POWER DOWN"); Display_write(mainDisplay, buffer, 4, 6); -// while (HighVoltageDetection_isVoltagePresent()) -// { -// vTaskDelay(100); -// } + while (HighVoltageDetection_isVoltagePresent()) + { + vTaskDelay(100); + } Display_clearLine(mainDisplay, 3);