build complete
This commit is contained in:
parent
26522970e7
commit
07bf51be74
@ -1,5 +1,5 @@
|
||||
2F62501ED4689FB349E356AB974DBE57=DAEBCB59B6A9C8F02BB774C81C53DE27
|
||||
2F62501ED4689FB349E356AB974DBE57=3C8163665DC52502E88D788B0CED9B35
|
||||
66BE74F758C12D739921AEA421D593D3=4
|
||||
8DF89ED150041C4CBC7CB9A9CAA90856=DAEBCB59B6A9C8F02BB774C81C53DE27
|
||||
DC22A860405A8BF2F2C095E5B6529F12=6E3170594736B6A8C2809AF37BE21851
|
||||
8DF89ED150041C4CBC7CB9A9CAA90856=3C8163665DC52502E88D788B0CED9B35
|
||||
DC22A860405A8BF2F2C095E5B6529F12=3C6A73657F8CAB85FF62A66955B31FC6
|
||||
eclipse.preferences.version=1
|
||||
|
@ -236,7 +236,7 @@ PRIVATE VOID vMainTask( PVOID arg )
|
||||
|
||||
S16 s16Voltage = stMessage.au8Data[0] << 8;
|
||||
s16Voltage |= stMessage.au8Data[1];
|
||||
VARH_vSetVariableData(VARH_eControlVoltage, s16Voltage);
|
||||
VARH_vSetVariableData(VARH_eControlVoltage, (VARH_UVariable)(FLOAT)s16Voltage);
|
||||
|
||||
} else if(stMessage.u8Id == 0x13){
|
||||
|
||||
|
@ -72,7 +72,7 @@ LOCAL osMutexId_t m_pstMutexID = NULL;
|
||||
|
||||
LOCAL CONST VARH_StVarInfo m_astVarInfo[VARH_eNumberOfVariables] =
|
||||
{
|
||||
{ VARH_FLAGINFO_NONE, (VARH_UVariable)1, (VARH_UVariable)0, (VARH_UVariable)1}, // VARH_eMode
|
||||
{ VARH_FLAGINFO_NONE, (VARH_UVariable)1.0f, (VARH_UVariable)0.0f, (VARH_UVariable)1.0f}, // VARH_eMode
|
||||
|
||||
{ VARH_FLAGINFO_FLOAT, (VARH_UVariable)0.0f, (VARH_UVariable)-2.0f, (VARH_UVariable)12.0f}, // VARH_eControlVoltage
|
||||
|
||||
@ -160,7 +160,7 @@ BOOL VARH_boInitializeModule( VOID )
|
||||
VOID VARH_vSetVariableData( U8 u8Variable, VARH_UVariable uData )
|
||||
{
|
||||
// check parameters
|
||||
if( m_astVarInfo[u8Variable].u8Flags & VARH_FLAG_READONLY )
|
||||
if( m_astVarInfo[u8Variable].u8Flags & VARH_FLAGINFO_READONLY )
|
||||
{
|
||||
return;
|
||||
}
|
||||
@ -308,13 +308,13 @@ PRIVATE BOOL boFloatVarCheck( U8 u8Variable, FLOAT flNewValue )
|
||||
//-------------------------------------------------------------------------------------------------
|
||||
PRIVATE BOOL boCheckRange( U8 u8Variable, VARH_UVariable uNewData )
|
||||
{
|
||||
if( m_astVarInfo[u8Variable].u8Flags & VARH_FLAG_FLOAT )
|
||||
if( m_astVarInfo[u8Variable].u8Flags & VARH_FLAGINFO_FLOAT )
|
||||
{
|
||||
return( boFloatVarCheck(u8Variable, uNewData.flVal ) );
|
||||
} else if( m_astVarInfo[u8Variable].u8Flags & VARH_FLAG_SIGNED )
|
||||
} else if( m_astVarInfo[u8Variable].u8Flags & VARH_FLAGINFO_SIGNED )
|
||||
{
|
||||
return( boS32VarCheck(u8Variable, uNewData.s32Val ) );
|
||||
} else if( m_astVarInfo[u8Variable].u8Flags & VARH_FLAG_BOOL )
|
||||
} else if( m_astVarInfo[u8Variable].u8Flags & VARH_FLAGINFO_BOOL )
|
||||
{
|
||||
return( boBooleanVarCheck( uNewData.s32Val ) );
|
||||
} else
|
||||
|
@ -134,7 +134,7 @@ LOCAL CONST osEventFlagsAttr_t stEventAttribute =
|
||||
//=================================================================================================
|
||||
|
||||
PRIVATE VOID PECO_vTask( PVOID arg );
|
||||
BOOL boSetPeltierVoltage( S16 Voltage );
|
||||
BOOL boSetPeltierVoltage( FLOAT Voltage );
|
||||
PRIVATE VOID vEventCallback( PVOID pvData );
|
||||
|
||||
//=================================================================================================
|
||||
@ -283,9 +283,9 @@ VOID PECO_vTask( PVOID arg )
|
||||
|
||||
boSetPeltierVoltage(output); // set the output
|
||||
|
||||
} else if (VARH_uGetVariableData(VARH_eMode).u32Val == PECO_eConstVoltage)
|
||||
} else if (VARH_uGetVariableData(VARH_eMode).u32Val == PECO_eConst_Voltage)
|
||||
{
|
||||
boSetPeltierVoltage(VARH_uGetVariableData(VARH_eControlVoltage).flVal) // set the output
|
||||
boSetPeltierVoltage(VARH_uGetVariableData(VARH_eControlVoltage).flVal); // set the output
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user