--- a/src/global.h Thu Jan 12 16:56:34 2023 +0100
+++ b/src/global.h Fri Jan 13 12:00:58 2023 +0100
@@ -16,40 +16,40 @@
#define DEBUG_YEAST 1
#define DEBUG_WATER 1
-#define Ka1 0.0000004445
-#define Ka2 0.0000000000468
+#define Ka1 0.0000004445
+#define Ka2 0.0000000000468
-#define MMCa 40.078
-#define MMMg 24.305
-#define MMNa 22.98976928
-#define MMCl 35.4535
-#define MMSO4 96.0626
-#define MMCO3 60.0089
-#define MMNO3 62.0049
-#define MMHCO3 61.01684
-#define MMCaSO4 172.171
-#define MMCaCl2 147.015
-#define MMCaCO3 100.087
-#define MMMgCl2 95.211 /* Since 27-06-2021 */
-#define MMMgSO4 246.475
-#define MMNaHCO3 84.007
-#define MMNa2CO3 105.996
-#define MMNaCl 58.443
-#define MMCaOH2 74.06268
+#define MMCa 40.078
+#define MMMg 24.305
+#define MMNa 22.98976928
+#define MMCl 35.4535
+#define MMSO4 96.0626
+#define MMCO3 60.0089
+#define MMNO3 62.0049
+#define MMHCO3 61.01684
+#define MMCaSO4 172.171
+#define MMCaCl2 147.015
+#define MMCaCO3 100.087
+#define MMMgCl2 95.211 /* Since 27-06-2021 */
+#define MMMgSO4 246.475
+#define MMNaHCO3 84.007
+#define MMNa2CO3 105.996
+#define MMNaCl 58.443
+#define MMCaOH2 74.06268
#define SpecificHeatWater 1.0
-#define SpecificHeatMalt 0.399 //cal/g.°C
-#define SlakingHeat 10.318 //cal/g.°C
-#define equip_tun_weight 2.0 // 2 Kg pot
+#define SpecificHeatMalt 0.399 ///< cal/g.°C
+#define SlakingHeat 10.318 ///< cal/g.°C
+#define equip_tun_weight 2.0 ///< 2 Kg pot
#define equip_tun_specific_heat 0.110
-#define MaltVolume 0.87 // l/kg 0.688 volgens internetbronnen, gemeten 0.874 l/kg, na enige tijd maischen 0,715 l/kg (A3 Otten).
+#define MaltVolume 0.87 ///< l/kg 0.688 volgens internetbronnen, gemeten 0.874 l/kg, na enige tijd maischen 0,715 l/kg (A3 Otten).
-#define Seapressure 1013.25 // Air pressure at sealevel in hPa
-#define MolMassAir 0.0289644 // Air molair mass
-#define Gravacc 9.80665 // Gravitational acceleration in m/s2
-#define Gasconst 8.3144621 // Gas constant J K-1 mol-1
-#define Kelvin 273.15 // Kelvin to Celsius
-#define EoVwater 40660 // Enthalpy of Vaporization (ΔH) for water
+#define Seapressure 1013.25 ///< Air pressure at sealevel in hPa
+#define MolMassAir 0.0289644 ///< Air molair mass
+#define Gravacc 9.80665 ///< Gravitational acceleration in m/s2
+#define Gasconst 8.3144621 ///< Gas constant J K-1 mol-1
+#define Kelvin 273.15 ///< Kelvin to Celsius
+#define EoVwater 40660 ///< Enthalpy of Vaporization (ΔH) for water
extern QWebSocket *webSocket;
@@ -127,7 +127,7 @@
double utilisation;
double bu_factor;
double inventory; ///< In product, current inventory.
- bool avail; ///< Product available in database.
+ bool avail; ///< Product available in database.
};
@@ -191,7 +191,7 @@
double step_volume; ///< The water volume upto this step.
double step_infuse_amount; ///< Infuse/decoction volume this step.
double step_infuse_temp; ///< Infuse/decoction temperature.
- double step_temp; ///< Start tmperature this step.
+ double step_temp; ///< Start temperature this step.
double step_time; ///< Step rest time.
double ramp_time; ///< Estimated ramp time to this step.
double end_temp; ///< End temperature this step.
@@ -349,7 +349,7 @@
QString mash_name;
bool calc_acid;
- QString w1_name; ///< Water source 1
+ QString w1_name; ///< Water source 1
double w1_amount;
double w1_calcium;
double w1_sulfate;
@@ -359,7 +359,7 @@
double w1_total_alkalinity;
double w1_ph;
double w1_cost;
- QString w2_name; ///< Water source 2
+ QString w2_name; ///< Water source 2
double w2_amount;
double w2_calcium;
double w2_sulfate;
@@ -369,7 +369,7 @@
double w2_total_alkalinity;
double w2_ph;
double w2_cost;
- double wg_amount; ///< Mixed water
+ double wg_amount; ///< Mixed water
double wg_calcium;
double wg_sulfate;
double wg_chloride;
@@ -377,7 +377,7 @@
double wg_magnesium;
double wg_total_alkalinity;
double wg_ph;
- double wb_calcium; ///< Treated water
+ double wb_calcium; ///< Treated water
double wb_sulfate;
double wb_chloride;
double wb_sodium;
@@ -591,7 +591,7 @@
QString mash_name;
bool calc_acid;
- QString w1_name; ///< Water source 1
+ QString w1_name; ///< Water source 1
double w1_amount;
double w1_calcium;
double w1_sulfate;
@@ -601,7 +601,7 @@
double w1_total_alkalinity;
double w1_ph;
double w1_cost;
- QString w2_name; ///< Water source 2
+ QString w2_name; ///< Water source 2
double w2_amount;
double w2_calcium;
double w2_sulfate;
@@ -611,7 +611,7 @@
double w2_total_alkalinity;
double w2_ph;
double w2_cost;
- double wg_amount; ///< Mixed water
+ double wg_amount; ///< Mixed water
double wg_calcium;
double wg_sulfate;
double wg_chloride;
@@ -619,7 +619,7 @@
double wg_magnesium;
double wg_total_alkalinity;
double wg_ph;
- double wb_calcium; ///< Treated water
+ double wb_calcium; ///< Treated water
double wb_sulfate;
double wb_chloride;
double wb_sodium;