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

Fixed some debugging methods that were necessary while no drawer was available

Browse Source 
Fixed HV0/1/2present GPIO settings (must be IN instead of OUT)

git-svn-id: https://svn.vbchaos.nl/svn/hsb/trunk@470 05563f52-14a8-4384-a975-3d1654cca0fa
This commit is contained in:
mmi
2018-03-14 09:18:06 +00:00
parent a6d2c6ffdf
commit f09eb6034c
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/Makefile
View File

@@ -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

6
S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/Platform/src/oli_stm32_h107.c
View File

@@ -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

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

@@ -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);