Coldbox/TECware
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

delete old temp converter

Browse Source
This commit is contained in:
Noah Piqué
2021-12-08 09:17:13 +01:00
parent 53ec4e3f2b
commit 167f69a9cc
1 changed files with 0 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Core/Drivers/TEMP_Temperature.c
View File

@@ -229,8 +229,6 @@ PRIVATE VOID vTempTask( PVOID arg )
U16 u16ADC_data[ADCD_eNumberOfTemps]; U16 u16ADC_data[ADCD_eNumberOfTemps];
U8 u8Channel; U8 u8Channel;
FLOAT temp = 0;
osDelay(10); osDelay(10);
while( TRUE ) while( TRUE )
@@ -246,7 +244,6 @@ PRIVATE VOID vTempTask( PVOID arg )
{ {
osMutexAcquire( m_pstMutexID, osWaitForever ); osMutexAcquire( m_pstMutexID, osWaitForever );
m_flTempData[ADCD_eHot] = flConvertADCData( u16ADC_data[ADCD_eHot] ); m_flTempData[ADCD_eHot] = flConvertADCData( u16ADC_data[ADCD_eHot] );
//temp = flConvertADCData( u16ADC_data[ADCD_eHot] ); // for debugging
//VARH_vSetVariableData( VARH_eTempHeatSink + u8Channel, (VARH_UVariable)(FLOAT)m_dbTempData[u8Channel] ); //VARH_vSetVariableData( VARH_eTempHeatSink + u8Channel, (VARH_UVariable)(FLOAT)m_dbTempData[u8Channel] );
osMutexRelease( m_pstMutexID ); osMutexRelease( m_pstMutexID );
} else { } else {
@@ -257,7 +254,6 @@ PRIVATE VOID vTempTask( PVOID arg )
{ {
osMutexAcquire( m_pstMutexID, osWaitForever ); osMutexAcquire( m_pstMutexID, osWaitForever );
m_flTempData[ADCD_eCold] = flConvertADCData( u16ADC_data[ADCD_eCold] ); m_flTempData[ADCD_eCold] = flConvertADCData( u16ADC_data[ADCD_eCold] );
//temp = flConvertADCData( u16ADC_data[ADCD_eCold] ); // for debugging
//VARH_vSetVariableData( VARH_eTempHeatSink + u8Channel, (VARH_UVariable)(FLOAT)m_dbTempData[u8Channel] ); //VARH_vSetVariableData( VARH_eTempHeatSink + u8Channel, (VARH_UVariable)(FLOAT)m_dbTempData[u8Channel] );
osMutexRelease( m_pstMutexID ); osMutexRelease( m_pstMutexID );
} else { } else {
@@ -329,34 +325,5 @@ PRIVATE FLOAT flConvertADCData( U16 u16RTemp )
flT *= u16R; flT *= u16R;
flT += -245.876f; flT += -245.876f;
/*DOUBLE flZ1, flZ2, flZ3, flZ4, flRt, flTemp, flRpoly;
flRt = u16RTemp;
flRt /= 32768;
flRt *= R_REF;
flZ1 = -RTD_A;
flZ2 = RTD_A * RTD_A - (4 * RTD_B);
flZ3 = (4 * RTD_B) / R_NOMINAL;
flZ4 = 2 * RTD_B;
flTemp = flZ2 + (flZ3 * flRt);
flTemp = (sqrt(flTemp) + flZ1) / flZ4;
if (flTemp >= 0)
return flTemp;
// ugh.
flRt /= R_NOMINAL;
flRt *= 100; // normalize to 100 ohm
flRpoly = flRt;
flTemp = -242.02;
flTemp += 2.2228 * flRpoly;
flRpoly *= flRt; // square
flTemp += 2.5859e-3 * flRpoly;
flRpoly *= flRt; // ^3
flTemp -= 4.8260e-6 * flRpoly;
flRpoly *= flRt; // ^4
flTemp -= 2.8183e-8 * flRpoly;
flRpoly *= flRt; // ^5
flTemp += 1.5243e-10 * flRpoly;*/
return( flT ); return( flT );
} }