aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules
diff options
context:
space:
mode:
authorRonen Sberlo <ronen.s@twine-s.com>2020-12-06 13:59:06 +0200
committerRonen Sberlo <ronen.s@twine-s.com>2020-12-06 13:59:06 +0200
commitfd1ef2793fce213ced194a2c7d9b071bae5abc87 (patch)
treefdcdb0cb0e725c255ae73d7a615cb7aca31ce171 /Software/Embedded_SW/Embedded/Modules
parent21a8df59fc8589c58331789cf72a8226448c8ed3 (diff)
downloadTango-fd1ef2793fce213ced194a2c7d9b071bae5abc87.tar.gz
Tango-fd1ef2793fce213ced194a2c7d9b071bae5abc87.zip
get CP and B coefficients from hardware configuration
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c2
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c17
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h1
3 files changed, 16 insertions, 4 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
index adc6a7d8d..7b4a30dd2 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
@@ -426,7 +426,7 @@ uint32_t EmbeddedParametersInit(void)
}
if (EmbeddedParameters->n_generalparameters >= 15)
{
- //Set_Head_Blowers_Parameters(EmbeddedParameters->generalparameters[13],EmbeddedParameters->generalparameters[14]);
+ Set_Head_Blowers_Parameters(EmbeddedParameters->generalparameters[13],EmbeddedParameters->generalparameters[14]);
}
PowerIdleSetParameters(EmbeddedParameters->switchtoidletimeinseconds,EmbeddedParameters->idledriertemperature,EmbeddedParameters->idleheadtemperature,EmbeddedParameters->idlemixertemperature);
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
index 6e84c3107..a9699a752 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
@@ -52,8 +52,8 @@
#define ARC_ALARM_LIMIT 3
#define V0_INIT_STOP_FAN_TIME 5
-#define PRESSURE_SENSOR_CP 0.269
-#define PRESSURE_SENSOR_B 0.45
+#define PRESSURE_SENSOR_CP (0.242)
+#define PRESSURE_SENSOR_B (-0.134)
#define V0_DEFAULT_VALUE 1050
#define FAN_MIN_RPM_THRESHOLD 4000
extern uint16_t Head_Fan_Tach[2];
@@ -66,6 +66,8 @@ uint8_t BlowerIdToSensorId[2] = {HEAD_PT100_ZONE_7_0X86_0, HEAD_PT100_ZONE_5
uint32_t HeadBlowersInitControlId = 0xFF;
uint32_t HeadBlowersV0InitCount = 0;
uint32_t HeadBlowersV0InitInProgress = 0;
+float PressureSensor_CP = PRESSURE_SENSOR_CP;
+float PressureSensor_B = PRESSURE_SENSOR_B;
typedef struct
{
@@ -455,7 +457,7 @@ double PressureSensorGetPressure(uint8_t FanId)
Vm /= 10.0;
if ((Vm - V0 + 22)<0)
return 0.0;
- Q = sqrt(Vm - V0 + 22) * PRESSURE_SENSOR_CP - PRESSURE_SENSOR_B;
+ Q = sqrt(Vm - V0 + 22) * PressureSensor_CP + PressureSensor_B;
return Q;
}
@@ -550,3 +552,12 @@ uint32_t HeadBlowersV0Init(void)
Report("Head Blowers V0 init", __FILE__, __LINE__, Head_Type, RpMessage, 0, 0);
return OK;
}
+
+void Set_Head_Blowers_Parameters(float cp,float b)
+{
+ PressureSensor_CP = cp;
+ PressureSensor_B = b;
+ Report("Head Blowers CP Coefficient", __FILE__, __LINE__, PressureSensor_CP, RpMessage, 0, 0);
+ Report("Head Blowers B Coefficient", __FILE__, __LINE__, PressureSensor_B, RpMessage, 0, 0);
+}
+
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h
index a172532c2..7c11b12bf 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h
@@ -57,4 +57,5 @@ uint32_t HeadBlowerCommandRequestMessage(int blowerId, float flow);
void HeadBlowersOff(int off);
uint32_t HeadBlowersOffGet();
uint32_t HeadBlowersV0Init(void);
+void Set_Head_Blowers_Parameters(float cp,float b);