Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r6b100c26db1b03b8507ce2f79c11f45f34715b11 -r0ba5dc1bbc6ef5a95882c80b420952b2cd034f84
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 6b100c26db1b03b8507ce2f79c11f45f34715b11)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 0ba5dc1bbc6ef5a95882c80b420952b2cd034f84)
@@ -50,8 +50,8 @@
 
 // Concentrates values
 #define ACID_1251_1_K                           1.0F                            ///< Acid 1251_1 potassium concentrate.
-#define ACID_1251_0_K                           2.0F                            ///< Acid 1251_0 potassium concentrate.
-#define ACID_1251_9_K                           3.0F                            ///< Acid 1251_9 potassium concentrate.
+#define ACID_2251_0_K                           2.0F                            ///< Acid 2251_0 potassium concentrate.
+#define ACID_3251_9_K                           3.0F                            ///< Acid 3251_9 potassium concentrate.
 
 #define ACID_TYPES_CA                           2.5F                            ///< Acid types calcium concentrate.
 #define ACID_TYPES_BICARB                       33                              ///< Acid type bicarb concentrate.
@@ -84,6 +84,10 @@
 
 static TREATMENT_LOG_DATA_PAYLOAD_T treatmentLogData;                           ///< Treatment parameters record for logging.
 
+static const ACID_TYPES_K[ NUM_OF_ACID_CONC_TYPES ] = { ACID_1251_1_K,
+                                                        ACID_2251_0_K,
+                                                        ACID_3251_9_K };        ///< Acid types potassium.
+
 // ********** private function prototypes **********
 
 static HD_POST_TREATMENT_STATE_T handlePostTreatmentDrainReservoirsState( void );
@@ -95,7 +99,6 @@
 static DRAIN_STATE_T handleDrainReservoirSwitchState( void );
 static DRAIN_STATE_T handleDrainReservoirStartDrainState( void );
 static DRAIN_STATE_T handleDrainReservoirDrainState( void );
-static void setTreatmentLogsConcentrates( void );
 
 /*********************************************************************//**
  * @brief
@@ -243,7 +246,10 @@
     treatmentLogData.acidConcentrate = getTreatmentParameterU32( TREATMENT_PARAM_ACID_CONCENTRATE );
     treatmentLogData.bicarbConcentrate = getTreatmentParameterU32( TREATMENT_PARAM_BICARB_CONCENTRATE );
 
-    setTreatmentLogsConcentrates();
+    treatmentLogData.potassiumConcentration   = ACID_TYPES_K[ treatmentLogData.acidConcentrate ];
+    treatmentLogData.calciumConcentration     = ACID_TYPES_CA;
+    treatmentLogData.bicarbonateConcentration = ACID_TYPES_BICARB;
+    treatmentLogData.sodiumConcentration      = ACID_TYPES_NA;
 
     treatmentLogData.dialysateTemperature_degC = getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE );
     treatmentLogData.dialyzerType = getTreatmentParameterU32( TREATMENT_PARAM_DIALYZER_TYPE );
@@ -724,43 +730,7 @@
     return state;
 }
 
-/*********************************************************************//**
- * @brief
- * The setTreatmentLogsConcentrates function sets the corresponding values
- * of the concentrations in the treatment logs.
- * @details Inputs: none
- * @details Outputs: treatmentLogData
- * @return none
- *************************************************************************/
-static void setTreatmentLogsConcentrates( void )
-{
-    ACID_CONCENTRATE_TYPE_T acidType = (ACID_CONCENTRATE_TYPE_T)getTreatmentParameterU32( TREATMENT_PARAM_ACID_CONCENTRATE );
 
-    treatmentLogData.calciumConcentration     = ACID_TYPES_CA;
-    treatmentLogData.bicarbonateConcentration = ACID_TYPES_BICARB;
-    treatmentLogData.sodiumConcentration      = ACID_TYPES_NA;
-
-    switch ( acidType )
-    {
-        case ACID_CONC_TYPE_FRESENIUS_08_1251_1:
-            treatmentLogData.potassiumConcentration = ACID_1251_1_K;
-            break;
-
-        case ACID_CONC_TYPE_FRESENIUS_08_2251_0:
-            treatmentLogData.potassiumConcentration = ACID_1251_0_K;
-            break;
-
-        case ACID_CONC_TYPE_FRESENIUS_08_3251_9:
-            treatmentLogData.potassiumConcentration = ACID_1251_9_K;
-            break;
-
-        default:
-            // Do nothing
-            break;
-    }
-}
-
-
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/