From 1559064a99a2a356d3a5e6e587d07a4b6e96c64d Mon Sep 17 00:00:00 2001 From: Robert Gawron Date: Sun, 16 Jun 2019 13:00:22 +0200 Subject: [PATCH] added datalogger module, changed cpu id, added led --- software/Firmware/Inc/DataLogger.h | 17 +++++++++++++++++ software/Firmware/Src/ApplicationBuilder.c | 2 ++ software/Firmware/Src/DataLogger.c | 19 +++++++++++++++++++ software/Firmware/Src/main.c | 7 +++++++ software/Firmware/makefile | 11 ++++++++--- 5 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 software/Firmware/Inc/DataLogger.h create mode 100644 software/Firmware/Src/DataLogger.c diff --git a/software/Firmware/Inc/DataLogger.h b/software/Firmware/Inc/DataLogger.h new file mode 100644 index 0000000..a8a08b2 --- /dev/null +++ b/software/Firmware/Inc/DataLogger.h @@ -0,0 +1,17 @@ +/* + * DataLogger.h + * + * Created on: 16.06.2019 + * Author: robert + */ + +#ifndef INC_DATALOGGER_H_ +#define INC_DATALOGGER_H_ + +#include "CommonDataTypes.h" + +bool DataLogger_Init(); + +void DataLogger_Tick(); + +#endif /* INC_DATALOGGER_H_ */ diff --git a/software/Firmware/Src/ApplicationBuilder.c b/software/Firmware/Src/ApplicationBuilder.c index 07e6beb..12f9187 100644 --- a/software/Firmware/Src/ApplicationBuilder.c +++ b/software/Firmware/Src/ApplicationBuilder.c @@ -9,6 +9,8 @@ #include "PinoutConfiguration.h" #include "MCP3425A0T.h" #include "PeakDetector.h" +#include "DataLogger.h" + static MCP3425A0TConfig_t adcConfig[]={{ADC_CHIP_1_PIN}, {ADC_CHIP_2_PIN}}; diff --git a/software/Firmware/Src/DataLogger.c b/software/Firmware/Src/DataLogger.c new file mode 100644 index 0000000..fd5df31 --- /dev/null +++ b/software/Firmware/Src/DataLogger.c @@ -0,0 +1,19 @@ +/* + * DataLogger.c + * + * Created on: 16.06.2019 + * Author: robert + */ + +#include "DataLogger.h" + +bool DataLogger_Init() +{ + + return TRUE; +} + +void DataLogger_Tick() +{ + +} diff --git a/software/Firmware/Src/main.c b/software/Firmware/Src/main.c index 7769a3a..589231e 100644 --- a/software/Firmware/Src/main.c +++ b/software/Firmware/Src/main.c @@ -9,8 +9,15 @@ #include "stm8s_it.h" #include "ApplicationBuilder.h" +#define LED_GPIO_PORT (GPIOD) +#define LED_GPIO_PINS (GPIO_PIN_2 | GPIO_PIN_3) + int main( void ) { + // just to test if the firmware is alive + GPIO_Init(LED_GPIO_PORT, (GPIO_Pin_TypeDef)LED_GPIO_PINS, GPIO_MODE_OUT_PP_LOW_FAST); + GPIO_WriteReverse(LED_GPIO_PORT, (GPIO_Pin_TypeDef)LED_GPIO_PINS); + ApplicationBuilder_Init(); while(TRUE) diff --git a/software/Firmware/makefile b/software/Firmware/makefile index 4854141..e08da92 100644 --- a/software/Firmware/makefile +++ b/software/Firmware/makefile @@ -13,7 +13,7 @@ INCLUDEDIR = $(STDLIB)/inc Inc LIBSRCDIR = $(STDLIB)/src SRCS = Src -MCU = STM8S105 +MCU = STM8S003 COMPILER = __SDCC__ DEFINES = -D$(COMPILER) -D$(MCU) -DUSE_STDPERIPH_DRIVER @@ -49,7 +49,12 @@ $(BUILD_DIR)/MCP3425A0T.rel: $(SRCS)/MCP3425A0T.c $(BUILD_DIR)/PeakDetector.rel: $(SRCS)/PeakDetector.c $(CC) -c $(CFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/ $(SRCS)/PeakDetector.rel $(SRCS)/PeakDetector.c -$(BUILD_DIR)/ApplicationBuilder.rel: $(SRCS)/ApplicationBuilder.c $(BUILD_DIR)/MCP3425A0T.rel $(BUILD_DIR)/PeakDetector.rel + +$(BUILD_DIR)/DataLogger.rel: $(SRCS)/DataLogger.c + $(CC) -c $(CFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/ $(SRCS)/DataLogger.rel $(SRCS)/DataLogger.c + + +$(BUILD_DIR)/ApplicationBuilder.rel: $(SRCS)/ApplicationBuilder.c $(BUILD_DIR)/MCP3425A0T.rel $(BUILD_DIR)/PeakDetector.rel $(BUILD_DIR)/DataLogger.rel $(CC) -c $(CFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/ $(SRCS)/ApplicationBuilder.rel $(SRCS)/ApplicationBuilder.c @@ -58,7 +63,7 @@ $(BUILD_DIR)/ApplicationBuilder.rel: $(SRCS)/ApplicationBuilder.c $(BUILD_DIR)/M $(IHX): $(SRCS)/$(TARGET).c $(BUILD_DIR)/ApplicationBuilder.rel $(BUILD_DIR)/stm8s_gpio.rel $(BUILD_DIR)/stm8s_it.rel mkdir -p $(BUILD_DIR) - $(CC) $(CFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/ $< $(BUILD_DIR)/stm8s_gpio.rel $(BUILD_DIR)/stm8s_it.rel $(BUILD_DIR)/MCP3425A0T.rel $(BUILD_DIR)/ApplicationBuilder.rel $(BUILD_DIR)/PeakDetector.rel + $(CC) $(CFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/ $< $(BUILD_DIR)/stm8s_gpio.rel $(BUILD_DIR)/stm8s_it.rel $(BUILD_DIR)/MCP3425A0T.rel $(BUILD_DIR)/ApplicationBuilder.rel $(BUILD_DIR)/PeakDetector.rel $(BUILD_DIR)/DataLogger.rel $(SIZE) $@