fixed uart protocol implementation and usage

software/DataAcquisitionFromDevice/datalogger.py

@@ -12,12 +12,8 @@ logFile.write("Time,Counter\n")
 ser.flushInput()
 
 while True:
-    #dataIn = ser.readline().strip()
-    dataIn = ser.read(4)
-
-    print(dataIn)
-    print(len(dataIn))
-    (msb, lsb) = (dataIn[1], dataIn[2]) 
+    dataIn = ser.read(5)
+    (msb, lsb) = (dataIn[2], dataIn[3]) 
     voltage = mcp3425.convert(msb, lsb, mcp3425.MCP3425_RESOLUTION.R14)
     now = datetime.datetime.now()
 

software/DataAcquisitionFromDevice/mcp3425.py

@@ -17,8 +17,8 @@ def convert(upperByte, lowerByte, resolution):
         return digitalToAnalog(digitalOutput, (1 * 0.01), 1)
         
     if resolution == MCP3425_RESOLUTION.R13:
-        return digitalToAnalog(digitalOutput, (250 * 0.000001), 1)
+        return digitalToAnalog(digitalOutput, (250 * 0.0000001), 1)
  
     if resolution == MCP3425_RESOLUTION.R14:
-        return digitalToAnalog(digitalOutput, (62.5 * 0.00001), 1)
+        return digitalToAnalog(digitalOutput, (62.5 * 0.000001), 1)
 

software/Firmware/Src/MeassurementFrame.c

@@ -14,11 +14,11 @@
 #define GET_CRC(configuration, data) (configuration ^ GET_MSB(data) ^ GET_LSB(data))
 
 
-enum Frameffsets { FRAME_PREAMBLE=0, 
-                FRAME_CONFIGURATION=1, 
-                FRAME_DATA_MSB=2, 
-                FRAME_DATA_LSB=3, 
-                FRAME_CRC=4 };
+enum Frameffsets { FRAME_PREAMBLE=0,
+                   FRAME_CONFIGURATION=1,
+                   FRAME_DATA_MSB=2,
+                   FRAME_DATA_LSB=3,
+                   FRAME_CRC=4 };
 
 static uint8_t buffer[MAX_FRAME_LENGTH];
 
@@ -32,13 +32,14 @@ void MeassurementFrame_Create(uint8_t configuration, uint16_t data)
     buffer[FRAME_CRC] = GET_CRC(configuration, data);
 }
 
+
 bool MeassurementFrame_Send(void (*sendFunction)(uint8_t))
 {
-    for(uint8_t i=0; i< MAX_FRAME_LENGTH; i++)
+    for(uint8_t i = 0; i < MAX_FRAME_LENGTH; i++)
     {
         sendFunction(buffer[i]);
     }
-    
+
     // TODO this should return status of sending data
     return TRUE;
 }

software/Firmware/Src/MeasurementCollector.c

@@ -19,7 +19,7 @@ void MeasurementCollector_Init()
 void MeasurementCollector_Tick()
 {
     uint8_t configuration = VoltageSensorActualValue_GetConfiguration();
-    
+
     VoltageSensorActualValue_MeasurementData_t sample;
     VoltageSensorActualValue_MeasureValue(&sample);
 

software/Firmware/Src/VoltageSensorActualValue.c

@@ -51,6 +51,7 @@ bool VoltageSensorActualValue_MeasureValue(VoltageSensorActualValue_MeasurementD
     return TRUE;
 }
 
+
 uint8_t VoltageSensorActualValue_GetConfiguration()
 {
     return MCP3425_CONFIGURATION;