diff --git a/software/Firmware/Inc/MCP3425A0T.h b/software/Firmware/Inc/VoltageSensorActualValue.h similarity index 100% rename from software/Firmware/Inc/MCP3425A0T.h rename to software/Firmware/Inc/VoltageSensorActualValue.h diff --git a/software/Firmware/Inc/VoltageSensorPeakValue.h b/software/Firmware/Inc/VoltageSensorPeakValue.h new file mode 100755 index 0000000..65a9011 --- /dev/null +++ b/software/Firmware/Inc/VoltageSensorPeakValue.h @@ -0,0 +1,13 @@ +/* + * VoltageSensorPeakValue.h + * + * Created on: 06.07.2019 + * Author: robert + */ + +#ifndef INC_VOLTAGESENSORPEAKVALUE_H_ +#define INC_VOLTAGESENSORPEAKVALUE_H_ + + + +#endif /* INC_VOLTAGESENSORPEAKVALUE_H_ */ diff --git a/software/Firmware/Src/ApplicationBuilder.c b/software/Firmware/Src/ApplicationBuilder.c index 72281c9..33432b9 100755 --- a/software/Firmware/Src/ApplicationBuilder.c +++ b/software/Firmware/Src/ApplicationBuilder.c @@ -12,7 +12,8 @@ #include "Logger.h" #include "PulseCounter.h" #include "UserInterface.h" -#include "MCP3425A0T.h" +#include "VoltageSensorActualValue".h +#include "VoltageSensorPeakValue.h" static MCP3425A0TConfig_t adcConfig[]={{PIN_ADC_CHIP_1}, {PIN_ADC_CHIP_2}}; diff --git a/software/Firmware/Src/MCP3425A0T.c b/software/Firmware/Src/VoltageSensorActualValue.c similarity index 100% rename from software/Firmware/Src/MCP3425A0T.c rename to software/Firmware/Src/VoltageSensorActualValue.c diff --git a/software/Firmware/Src/VoltageSensorPeakValue.c b/software/Firmware/Src/VoltageSensorPeakValue.c new file mode 100755 index 0000000..11127e8 --- /dev/null +++ b/software/Firmware/Src/VoltageSensorPeakValue.c @@ -0,0 +1,8 @@ +/* + * VoltageSensorPeakValue.c + * + * Created on: 06.07.2019 + * Author: robert + */ + +#include "VoltageSensorPeakValue.h" diff --git a/software/Firmware/makefile b/software/Firmware/makefile index 922a7bf..2e20dd9 100755 --- a/software/Firmware/makefile +++ b/software/Firmware/makefile @@ -71,8 +71,11 @@ $(BUILD_DIR)/ClockConfigurator.rel: $(SRCS)/ClockConfigurator.c $(BUILD_DIR)/TimerConfigurator.rel: $(SRCS)/TimerConfigurator.c $(CC) -c $(CFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/ $(SRCS)/TimerConfigurator.rel $(SRCS)/TimerConfigurator.c -$(BUILD_DIR)/MCP3425A0T.rel: $(SRCS)/MCP3425A0T.c - $(CC) -c $(CFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/ $(SRCS)/MCP3425A0T.rel $(SRCS)/MCP3425A0T.c +$(BUILD_DIR)/VoltageSensorActualValue.rel: $(SRCS)/VoltageSensorActualValue.c + $(CC) -c $(CFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/ $(SRCS)/VoltageSensorActualValue.rel $(SRCS)/VoltageSensorActualValue.c + +$(BUILD_DIR)/VoltageSensorPeakValue.rel: $(SRCS)/VoltageSensorPeakValue.c + $(CC) -c $(CFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/ $(SRCS)/VoltageSensorPeakValue.rel $(SRCS)/VoltageSensorPeakValue.c $(BUILD_DIR)/PulseCounter.rel: $(SRCS)/PulseCounter.c $(CC) -c $(CFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/ $(SRCS)/PulseCounter.rel $(SRCS)/PulseCounter.c @@ -84,7 +87,7 @@ $(BUILD_DIR)/Logger.rel: $(SRCS)/Logger.c $(CC) -c $(CFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/ $(SRCS)/Logger.rel $(SRCS)/Logger.c -$(BUILD_DIR)/ApplicationBuilder.rel: $(SRCS)/ApplicationBuilder.c $(BUILD_DIR)/MCP3425A0T.rel $(BUILD_DIR)/PulseCounter.rel $(BUILD_DIR)/Logger.rel $(BUILD_DIR)/UserInterface.rel $(BUILD_DIR)/stm8s_uart1.rel $(BUILD_DIR)/TimerConfigurator.rel $(BUILD_DIR)/stm8s_awu.rel $(BUILD_DIR)/stm8s_i2c.rel +$(BUILD_DIR)/ApplicationBuilder.rel: $(SRCS)/ApplicationBuilder.c $(BUILD_DIR)/VoltageSensorActualValue.rel $(BUILD_DIR)/PulseCounter.rel $(BUILD_DIR)/Logger.rel $(BUILD_DIR)/UserInterface.rel $(BUILD_DIR)/stm8s_uart1.rel $(BUILD_DIR)/TimerConfigurator.rel $(BUILD_DIR)/stm8s_awu.rel $(BUILD_DIR)/stm8s_i2c.rel $(CC) -c $(CFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/ $(SRCS)/ApplicationBuilder.rel $(SRCS)/ApplicationBuilder.c @@ -99,12 +102,13 @@ $(IHX): $(SRCS)/$(TARGET).c \ $(BUILD_DIR)/stm8s_clk.rel \ $(BUILD_DIR)/ClockConfigurator.rel \ $(BUILD_DIR)/stm8s_tim1.rel \ - $(BUILD_DIR)/stm8s_it.rel + $(BUILD_DIR)/stm8s_it.rel \ + $(BUILD_DIR)/VoltageSensorPeakValue.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)/VoltageSensorActualValue.rel \ $(BUILD_DIR)/ApplicationBuilder.rel \ $(BUILD_DIR)/PulseCounter.rel \ $(BUILD_DIR)/Logger.rel \ @@ -115,7 +119,8 @@ $(IHX): $(SRCS)/$(TARGET).c \ $(BUILD_DIR)/ClockConfigurator.rel \ $(BUILD_DIR)/TimerConfigurator.rel \ $(BUILD_DIR)/stm8s_awu.rel \ - $(BUILD_DIR)/stm8s_tim1.rel + $(BUILD_DIR)/stm8s_tim1.rel \ + $(BUILD_DIR)/VoltageSensorPeakValue.rel $(SIZE) $@