Index: firmware/App/Controllers/Fans.c
===================================================================
diff -u -ref6283257df7c1f993d58fb934da57ea3e0a7067 -r9d81efee3ea73c452bb6b84501c8accf85ab81f7
--- firmware/App/Controllers/Fans.c	(.../Fans.c)	(revision ef6283257df7c1f993d58fb934da57ea3e0a7067)
+++ firmware/App/Controllers/Fans.c	(.../Fans.c)	(revision 9d81efee3ea73c452bb6b84501c8accf85ab81f7)
@@ -402,7 +402,7 @@
     FAN_NAMES_T fan;
     BOOL isFanRPMOutOfRange = FALSE;
     BOOL isAlarmTriggered   = FALSE;
-    F32 rpm                 = 0.0;
+    F32 rpm                 = 0.0F;
 
     // The RPM is expected to be 5500 @ 100% duty cycle
     // The nominal RPM = duty cycle * 5500 / 1.0
Index: firmware/App/Controllers/Temperatures.c
===================================================================
diff -u -ref6283257df7c1f993d58fb934da57ea3e0a7067 -r9d81efee3ea73c452bb6b84501c8accf85ab81f7
--- firmware/App/Controllers/Temperatures.c	(.../Temperatures.c)	(revision ef6283257df7c1f993d58fb934da57ea3e0a7067)
+++ firmware/App/Controllers/Temperatures.c	(.../Temperatures.c)	(revision 9d81efee3ea73c452bb6b84501c8accf85ab81f7)
@@ -108,6 +108,7 @@
 
     for ( i = 0; i < NUM_OF_TEMPERATURES; i++ )
     {
+        benignPolynomialCalRecord( &temperaturesCalRecord.hdTemperatureSensors[ i ] );
         memset( &temperaturesStatus[ i ], 0x0, sizeof( TEMPERATURE_SENSORS_T ) );
     }
 
@@ -198,7 +199,7 @@
  *************************************************************************/
 F32 getTemperatureValue( TEMPERATURES_T sensorID )
 {
-    F32 temperature = 0.0;
+    F32 temperature = 0.0F;
 
     // Check if the temperature sensor is in range
     if ( sensorID < NUM_OF_TEMPERATURES )
@@ -340,7 +341,7 @@
                 // Wrong sensor was called, raise an alarm
                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_INVALID_TEMPERATURE_SENSOR_SELECTED, sensor );
                 // Wrong sensor, return temperature to be -1
-                temperature = -1.0;
+                temperature = -1.0F;
                 break;
 #endif
         }
Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -rd8015ede9ee8620fa26318990ebfeed9c84a9344 -r9d81efee3ea73c452bb6b84501c8accf85ab81f7
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision d8015ede9ee8620fa26318990ebfeed9c84a9344)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 9d81efee3ea73c452bb6b84501c8accf85ab81f7)
@@ -713,6 +713,7 @@
 
 #ifndef _RELEASE_
     if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_V3_SYSTEM ) )
+    //if ( HW_CONFIG_BETA == getHardwareConfigStatus() ) // TODO uncomment when FPGA is released
     {
         energizedUpperEdge   = INITIAL_V3_ENERGIZED_EDGE_UPPER_RANGE;
         deenergizedLowerEdge = INITIAL_V3_ENERGIZED_EDGE_LOWER_RANGE;
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rd8015ede9ee8620fa26318990ebfeed9c84a9344 -r9d81efee3ea73c452bb6b84501c8accf85ab81f7
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision d8015ede9ee8620fa26318990ebfeed9c84a9344)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 9d81efee3ea73c452bb6b84501c8accf85ab81f7)
@@ -1545,9 +1545,9 @@
     {
         F32 resOneDiffAfterDisplacement     = reservoirVolume[ DG_RESERVOIR_1 ] - getReservoirWeightLargeFilter( DG_RESERVOIR_1 );
         F32 resTwoDiffAfterDisplacement     = getReservoirWeightLargeFilter( DG_RESERVOIR_2 ) - reservoirVolume[ DG_RESERVOIR_2 ];
-        F32 averageDisp                     = ( resOneDiffAfterDisplacement + resTwoDiffAfterDisplacement ) / 2.0;
+        F32 averageDisp                     = ( resOneDiffAfterDisplacement + resTwoDiffAfterDisplacement ) / 2.0F;
         F32 integratedVolumeDiff            = fabs( fmdIntegratedVolume - averageDisp );
-        F32 integratedVolumeToTargetPercent = fabs( 1.0 - ( fmdIntegratedVolume / averageDisp ) );
+        F32 integratedVolumeToTargetPercent = fabs( 1.0F - ( fmdIntegratedVolume / averageDisp ) );
         F32 integrateVolumeToleranceG       = WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE;
 
 #ifndef _RELEASE_
Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -ref6283257df7c1f993d58fb934da57ea3e0a7067 -r9d81efee3ea73c452bb6b84501c8accf85ab81f7
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision ef6283257df7c1f993d58fb934da57ea3e0a7067)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 9d81efee3ea73c452bb6b84501c8accf85ab81f7)
@@ -138,7 +138,7 @@
 {
     U08 errorCountProcessor;                    ///< Reg 256.  TBD.
     U08 errorCountPC;                           ///< Reg 257.  TBD.
-    U08 reserved1;                              ///< Reg 258.  Reserved.
+    U08 fpgaHWConfigReg;                        ///< Reg 258. Hardware configuration register (i.e. BETA or DVT)
     U08 reserved2;                              ///< Reg 259.  Reserved.
     F32 reserved3;                              ///< Reg 260.  Reserved.
     U08 reserved4;                              ///< Reg 264.  Reserved.
@@ -2333,6 +2333,19 @@
     return ( fpgaSensorReadings.fpgaGPIO & PUMP_TRACK_SWITCH_MASK );
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getFPGAHWConfiguration function gets the FPGA hardware configuration
+ * such as BETA or DVT.
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
+ * @return hardware configuration
+ *************************************************************************/
+U08 getFPGAHWConfiguration( void )
+{
+    return fpgaSensorReadings.fpgaHWConfigReg;
+}
+
 #ifdef DEBUG_ENABLED
 /*********************************************************************//**
  * @brief
@@ -2360,5 +2373,5 @@
     return fpgaSensorReadings.VBAPWMTarget;
 }
 #endif
-
+
 /**@}*/
Index: firmware/App/Services/FPGA.h
===================================================================
diff -u -ref6283257df7c1f993d58fb934da57ea3e0a7067 -r9d81efee3ea73c452bb6b84501c8accf85ab81f7
--- firmware/App/Services/FPGA.h	(.../FPGA.h)	(revision ef6283257df7c1f993d58fb934da57ea3e0a7067)
+++ firmware/App/Services/FPGA.h	(.../FPGA.h)	(revision 9d81efee3ea73c452bb6b84501c8accf85ab81f7)
@@ -152,6 +152,8 @@
 U16 getFPGAFrontDoorStatus( void );
 U16 getFPGAPumpTrackSwitchStatus( void );
 
+U08 getFPGAHWConfiguration( void );
+
 // The PWM functions are only used during debugging
 #ifdef DEBUG_ENABLED
     void setFPGAValveDialyzerInletPWM( U16 count );
Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -rd089b3bd30b565fb264817b6df70e083d8a9ec46 -r9d81efee3ea73c452bb6b84501c8accf85ab81f7
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision d089b3bd30b565fb264817b6df70e083d8a9ec46)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 9d81efee3ea73c452bb6b84501c8accf85ab81f7)
@@ -351,7 +351,7 @@
     F32 targetUFFlowMLP      = getCurrentUFSetRate();
     F32 timeDepletionMS      = ( (F32)FILL_RESERVOIR_TO_VOLUME_ML / dialysateFlowMLP ) * SEC_PER_MIN * MS_PER_SECOND;
     F32 timeTotalCycleMS     = fillTimeMS + RESERVOIR_SETTLE_TIME_MS + RESERVOIR_CYCLE_EXTRA_MARGIN_TIME_MS + ratios.timeFillPrepMS;
-    F32 timeReservoirCycleMS = 0.0;
+    F32 timeReservoirCycleMS = 0.0F;
     F32 timeUFDepletionMS    = NEARLY_INFINITY;
 
     // Check if target UF flow is not zero to consider it in the calculations too
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r3f5b2cfad9edd2a67c0c6bbc9fd7f74021d566b8 -r9d81efee3ea73c452bb6b84501c8accf85ab81f7
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 3f5b2cfad9edd2a67c0c6bbc9fd7f74021d566b8)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 9d81efee3ea73c452bb6b84501c8accf85ab81f7)
@@ -1584,7 +1584,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD;
+    msg.hdr.msgID = MSG_ID_HD_START_STOP_TRIMMER_HEATER_CMD;
     msg.hdr.payloadLen = sizeof( BOOL );
 
     memcpy( payloadPtr, &start, sizeof( BOOL ) );