From 83c6d651722a3673ee9e0494a797d9b1372d58e7 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Tue, 3 Nov 2020 10:05:45 +0100 Subject: [PATCH] rename signal to show --- cube/Makefile | 2 +- cube/User/Inc/{signal.h => show.h} | 8 ++++---- cube/User/Src/frontend.c | 4 ++-- cube/User/Src/logger.c | 4 ++-- cube/User/Src/loopCtrl.c | 4 ++-- cube/User/Src/main2.c | 10 +++++----- cube/User/Src/mbusComm.c | 6 +++--- cube/User/Src/{signal.c => show.c} | 4 ++-- 8 files changed, 21 insertions(+), 21 deletions(-) rename cube/User/Inc/{signal.h => show.h} (55%) rename cube/User/Src/{signal.c => show.c} (92%) diff --git a/cube/Makefile b/cube/Makefile index 8295b29..486694b 100644 --- a/cube/Makefile +++ b/cube/Makefile @@ -37,7 +37,7 @@ BUILD_DIR = build ###################################### # C sources C_SOURCES = \ -User/Src/frontend.c User/Src/signal.c User/Src/logger.c User/Src/loopCtrl.c User/Src/main2.c User/Src/mbusComm.c User/Src/ringbuffer.c hottislib/PontCoopScheduler.c \ +User/Src/frontend.c User/Src/show.c User/Src/logger.c User/Src/loopCtrl.c User/Src/main2.c User/Src/mbusComm.c User/Src/ringbuffer.c hottislib/PontCoopScheduler.c \ libmbus/mbus/mbus-protocol.c \ Core/Src/main.c \ Core/Src/gpio.c \ diff --git a/cube/User/Inc/signal.h b/cube/User/Inc/show.h similarity index 55% rename from cube/User/Inc/signal.h rename to cube/User/Inc/show.h index 66cd0bc..1aa47e9 100644 --- a/cube/User/Inc/signal.h +++ b/cube/User/Inc/show.h @@ -1,5 +1,5 @@ -#ifndef _DEBUG_H_ -#define _DEBUG_H_ +#ifndef _SHOW_H_ +#define _SHOW_H_ #include @@ -7,7 +7,7 @@ typedef enum { DEBUG_1, DEBUG_2, LED_RED, LED_GREEN } signalPin_t; typedef enum { ON, OFF, TOGGLE } signalAction_t; -void signal(signalPin_t signalPin, signalAction_t action); +void show(signalPin_t signalPin, signalAction_t action); -#endif // _DEBUG_H_ +#endif // _SHOW_H_ diff --git a/cube/User/Src/frontend.c b/cube/User/Src/frontend.c index 4e8cd00..6ee4cff 100644 --- a/cube/User/Src/frontend.c +++ b/cube/User/Src/frontend.c @@ -5,7 +5,7 @@ #include #include -#include +#include @@ -37,7 +37,7 @@ void frontendDisable() { void frontendAdcCallback(ADC_HandleTypeDef* hadc) { static int32_t holdValue = 0; - signal(DEBUG_2, TOGGLE); + show(DEBUG_2, TOGGLE); if (frontendEnabled) { int32_t currentValue = (int32_t) HAL_ADC_GetValue(hadc); diff --git a/cube/User/Src/logger.c b/cube/User/Src/logger.c index a3946a9..06dd6d5 100644 --- a/cube/User/Src/logger.c +++ b/cube/User/Src/logger.c @@ -1,7 +1,7 @@ #ifndef TEST #include #include -#include +#include #include #endif @@ -56,7 +56,7 @@ int logExec() { #ifndef TEST static void flashGreenLed(void *handle) { - signal(LED_GREEN, TOGGLE); + show(LED_GREEN, TOGGLE); } #endif // TEST diff --git a/cube/User/Src/loopCtrl.c b/cube/User/Src/loopCtrl.c index ea674b7..f29b84a 100644 --- a/cube/User/Src/loopCtrl.c +++ b/cube/User/Src/loopCtrl.c @@ -1,6 +1,6 @@ #include #include -#include +#include bool loopActive = false; @@ -20,7 +20,7 @@ void loopDisable() { void loopStatusCallback() { GPIO_PinState status = HAL_GPIO_ReadPin(Loop_Status_GPIO_Port, Loop_Status_Pin); if (status == GPIO_PIN_SET) { - signal(LED_RED, ON); + show(LED_RED, ON); loopActive = false; } } \ No newline at end of file diff --git a/cube/User/Src/main2.c b/cube/User/Src/main2.c index fddc8e0..65dd306 100644 --- a/cube/User/Src/main2.c +++ b/cube/User/Src/main2.c @@ -9,7 +9,7 @@ #include -#include +#include #include #include #include @@ -21,7 +21,7 @@ void my_setup_1() { } void my_errorHandler() { - signal(LED_RED, ON); + show(LED_RED, ON); } void helloMeterbus(void *handle) { @@ -36,8 +36,8 @@ void helloMeterbus(void *handle) { void my_setup_2() { - signal(LED_RED, OFF); - signal(LED_GREEN, ON); + show(LED_RED, OFF); + show(LED_GREEN, ON); frontendInit(); frontendSetThreshold(240); @@ -46,7 +46,7 @@ void my_setup_2() { } void my_loop() { - signal(DEBUG_1, TOGGLE); + show(DEBUG_1, TOGGLE); schExec(); logExec(); diff --git a/cube/User/Src/mbusComm.c b/cube/User/Src/mbusComm.c index f5b0bea..92b51cf 100644 --- a/cube/User/Src/mbusComm.c +++ b/cube/User/Src/mbusComm.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include @@ -99,7 +99,7 @@ static void handleRequestEngine(void *handle) { case MBCS_SEND_CONT: logMsg("hre state SEND_CONT"); - signal(LED_RED, OFF); + show(LED_RED, OFF); if (! loopActive) { logMsg("hre enabling loop, try %d", localMbusCommHandle->retryCnt); localMbusCommHandle->retryCnt++; @@ -266,7 +266,7 @@ static void handleRequestEngine(void *handle) { case MBCS_ERROR: logMsg("hre state ERROR"); - signal(LED_RED, ON); + show(LED_RED, ON); logMsg("hre err: already error, read the rest (now: %02x) until timeout", localMbusCommHandle->receivedOctet); receiveNext(localMbusCommHandle); break; diff --git a/cube/User/Src/signal.c b/cube/User/Src/show.c similarity index 92% rename from cube/User/Src/signal.c rename to cube/User/Src/show.c index ef75e8d..e0b912f 100644 --- a/cube/User/Src/signal.c +++ b/cube/User/Src/show.c @@ -1,11 +1,11 @@ #include -#include +#include #include #include #include -void signal(signalPin_t signalPin, signalAction_t action) { +void show(signalPin_t signalPin, signalAction_t action) { GPIO_TypeDef *port = NULL; uint16_t pin = 0;