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

keypad functional

Browse Source 
started with external DAC implementation

git-svn-id: https://svn.vbchaos.nl/svn/hsb/trunk@224 05563f52-14a8-4384-a975-3d1654cca0fa
This commit is contained in:
mmi
2017-09-29 09:13:48 +00:00
parent 888601f8cf
commit b56bc71f36
13 changed files with 206 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/hsb-mrts/.cproject
View File

@@ -26,8 +26,8 @@
<option id="gnu.c.compiler.option.debugging.level.539814773" name="Debug Level" superClass="gnu.c.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.max" valueType="enumerated"/>
<option id="gnu.c.compiler.option.include.paths.1508262411" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/inc&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/HAL/Misc/inc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/HAL/Platform/inc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/HAL/inc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Platform/inc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/FreeRTOS/Source/portable/GCC/ARM_CM3}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/FreeRTOS/Source/include}&quot;"/>
</option>

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

@@ -97,8 +97,6 @@ ErrorStatus Logger_construct(struct IODevice* const device)
if(!initialized)
{
///TODO This is currently hardcoded into the UART - there must be a way for more generic usage
loggerDevice = device;
if(returnValue == SUCCESS)

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

@@ -155,18 +155,19 @@ static void initTask(void* parameters)
NHD0420_construct(&spiDisplay->device);
NHD0420_turnOffDisplay();
NHD0420_turnOffDisplay(&spiDisplay->device);
vTaskDelay(1000);
NHD0420_clearScreen();
NHD0420_clearScreen(&spiDisplay->device);
vTaskDelay(1000);
NHD0420_turnOnDisplay();
NHD0420_turnOnDisplay(&spiDisplay->device);
vTaskDelay(1000);
NHD0420_setContrast(30);
NHD0420_setContrast(&spiDisplay->device, 30);
vTaskDelay(1000);
NHD0420_setBacklightBrightness(3);
NHD0420_setBacklightBrightness(&spiDisplay->device, 3);
vTaskDelay(1000);
NHD0420_setCursorToHome();
NHD0420_setCursorToHome(&spiDisplay->device);
vTaskDelay(1000);
NHD0420_sendData(&spiDisplay->device, "Anode repair A", 20);
xTaskCreate(ledBlinkTask, (const char* const)"ledTask", 40, &ledTaskArguments, 0, &ledTaskHandle);

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

@@ -285,10 +285,6 @@ void EXTI4_IRQHandler(void)
IRQ_setKeypadEXTI(keypad, DISABLE);
xSemaphoreGiveFromISR(keypad->scanSemaphore, &higherPriorityTaskWoken);
LOGGER_INFO_ISR("EXT4 ISR");
EXTI_ClearITPendingBit(EXTI_Line4);
portEND_SWITCHING_ISR(higherPriorityTaskWoken);
@@ -302,21 +298,18 @@ void EXTI9_5_IRQHandler (void)
{
IRQ_setKeypadEXTI(keypad, DISABLE);
xSemaphoreGiveFromISR(keypad->scanSemaphore, &higherPriorityTaskWoken);
LOGGER_INFO_ISR("EXT5 ISR");
EXTI_ClearITPendingBit(EXTI_Line5);
}
else if (EXTI_GetITStatus(EXTI_Line6) != RESET)
{
IRQ_setKeypadEXTI(keypad, DISABLE);
xSemaphoreGiveFromISR(keypad->scanSemaphore, &higherPriorityTaskWoken);
LOGGER_INFO_ISR("EXT6 ISR");
EXTI_ClearITPendingBit(EXTI_Line6);
}
else if (EXTI_GetITStatus(EXTI_Line7) != RESET)
{
IRQ_setKeypadEXTI(keypad, DISABLE);
xSemaphoreGiveFromISR(keypad->scanSemaphore, &higherPriorityTaskWoken);
LOGGER_INFO_ISR("EXT7 ISR");
EXTI_ClearITPendingBit(EXTI_Line7);
}
else if (EXTI_GetITStatus(EXTI_Line8) != RESET)