Merge pull request #76 from RobertGawron/feature/basic_sw_components_implementation

Feature/basic sw components implementation

software/Firmware/Inc/PulseCounter.h

@@ -8,9 +8,7 @@
 #ifndef INC_PULSECOUNTER_H_
 #define INC_PULSECOUNTER_H_
 
-#include "CommonDataTypes.h"
-
-void PulseCounter_Init(uint8_t pin);
+void PulseCounter_Init();
 
 void PulseCounter_Tick();
 

software/Firmware/Inc/VoltageSensorActualValue.h

@@ -18,9 +18,9 @@ typedef struct MCP3425A0TConfig_t {
 
 
 
-void MCP3425A0T_Init(MCP3425A0TConfig_t *config);
+void MCP3425A0T_Init();
 
-bool MCP3425A0T_GeMeasurementData(/*MCP3425A0TConfig_t *config, MCP3425A0TMeasurementData_t *measurementData*/);
+bool MCP3425A0T_GeMeasurementData(MCP3425A0TMeasurementData_t *measurementData);
 
 
 #endif /* SRC_MCP3425A0T_H_ */

software/Firmware/Src/ApplicationBuilder.c

@@ -15,17 +15,15 @@
 #include "VoltageSensorActualValue.h"
 #include "VoltageSensorPeakValue.h"
 
-static MCP3425A0TConfig_t adcConfig[]={{PIN_ADC_CHIP_1}, {PIN_ADC_CHIP_2}};
-
-
 void ApplicationBuilder_Init()
 {
     ClockConfigurator_Init();
     TimerConfigurator_Init();
 
     Logger_Init();
-    PulseCounter_Init(PIN_PULSE_COUNTER);
+    PulseCounter_Init();
     UserInterface_Init();
+    MCP3425A0T_Init();
     
     enableInterrupts();
 

software/Firmware/Src/Logger.c

@@ -61,9 +61,7 @@ void Logger_Init()
 
 void Logger_Tick()
 {
-    printf ("xyz");
-    //printf ('y');
-    //printf ('z');
+    printf ("ok ");
 }
 
 

software/Firmware/Src/PulseCounter.c

@@ -7,7 +7,7 @@
 
 #include "PulseCounter.h"
 
-void PulseCounter_Init(uint8_t pin)
+void PulseCounter_Init()
 {
 
 }

software/Firmware/Src/VoltageSensorActualValue.c

@@ -9,14 +9,14 @@
 
 #include "stm8s_i2c.h"
 
-void MCP3425A0T_Init(MCP3425A0TConfig_t *config)
+void MCP3425A0T_Init()
 {
     I2C_DeInit();
 }
 
 
 
-bool MCP3425A0T_GeMeasurementData(/*MCP3425A0TConfig_t *config, MCP3425A0TMeasurementData_t *measurementData*/)
+bool MCP3425A0T_GeMeasurementData(MCP3425A0TMeasurementData_t *measurementData)
 {
 	return TRUE;
 }

software/Firmware/makefile

@@ -92,8 +92,6 @@ $(BUILD_DIR)/ApplicationBuilder.rel: $(SRCS)/ApplicationBuilder.c $(BUILD_DIR)/V
 
 
 
-
-
 $(IHX): $(SRCS)/$(TARGET).c \
     	$(BUILD_DIR)/ApplicationBuilder.rel \
     	$(BUILD_DIR)/stm8s_gpio.rel \
@@ -104,7 +102,6 @@ $(IHX): $(SRCS)/$(TARGET).c \
     	$(BUILD_DIR)/stm8s_tim1.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 \
@@ -129,5 +126,5 @@ clean:
 	rm -rf $(BUILD_DIR)/*
 
 flash: $(IHX)
-	/opt/stm8flash -c stlink -p stm8s003f3 -w $<
+	stm8flash -c stlink -p stm8s003f3 -w $<