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

add ANPI to VARH

Browse Source
This commit is contained in:
pique_n
2021-12-17 17:30:41 +01:00
parent 0a2750f3b6
commit 5dc13acb5c
5 changed files with 54 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Core/Application/MAIN_MainApplication.c
View File

@ -228,18 +228,9 @@ PRIVATE VOID vMainTask( PVOID arg )
if( u32Flags & EVENT_NEW_MESSAGE ) {
CAND_Message stMessage;
osMessageQueueGet( m_pstCANRxMsgQueueID, &stMessage, NULL, 0 );
osMessageQueueGet( m_pstCANRxMsgQueueID, &stMessage, NULL, 0 );
if(stMessage.u8Id == 0x10){
S16 ControlVoltage = ((S16)(ANPI_flGetInputValue(ANPI_eControlVoltage)*1000));
au8Buffer[0] = (ControlVoltage & 0xFF00) >> 8;
au8Buffer[1] = ControlVoltage & 0xFF;
CAND_boSendMessage(0x11, 2, au8Buffer);
} else if(stMessage.u8Id == 0x12){
if(stMessage.u8Id == 0x12){
S16 s16Voltage = stMessage.au8Data[0] << 8;
s16Voltage |= stMessage.au8Data[1];
@ -247,15 +238,10 @@ PRIVATE VOID vMainTask( PVOID arg )
} else if(stMessage.u8Id == 0x13){
S16 SupplyVoltage24V = ((S16)(ANPI_flGetInputValue(ANPI_eSupplyVoltage24V)*1000));
S16 SupplyCurrent24V = ((S16)(ANPI_flGetInputValue(ANPI_eSupplyCurrent24V)*1000));
S16 OutputVoltage = ((S16)(ANPI_flGetInputValue(ANPI_eOutputVoltage)*1000));
S16 OutputCurrent = ((S16)(ANPI_flGetInputValue(ANPI_eOutputCurrent)*1000));
/*U16 SupplyVoltage24V = ANPI_flGetInputValue(ANPI_eSupplyVoltage24V);
U16 SupplyCurrent24V = ANPI_flGetInputValue(ANPI_eSupplyCurrent24V);
U16 OutputVoltage = ANPI_flGetInputValue(ANPI_eOutputVoltage);
U16 OutputCurrent = ANPI_flGetInputValue(ANPI_eOutputCurrent);*/
S16 SupplyVoltage24V = ((S16)(VARH_uGetVariableData(VARH_eSupply_U).flVal*1000));
S16 SupplyCurrent24V = ((S16)(VARH_uGetVariableData(VARH_eSupply_I).flVal*1000));
S16 OutputVoltage = ((S16)(VARH_uGetVariableData(VARH_ePeltier_U).flVal*1000));
S16 OutputCurrent = ((S16)(VARH_uGetVariableData(VARH_ePeltier_I).flVal*1000));
au8Buffer[0] = (SupplyVoltage24V & 0xFF00) >> 8;
au8Buffer[1] = SupplyVoltage24V & 0xFF;
@ -270,7 +256,7 @@ PRIVATE VOID vMainTask( PVOID arg )
} else if(stMessage.u8Id == 0x15){
S16 Cold = (S16)(VARH_uGetVariableData(VARH_eTemp_C).flVal*100);
S16 Cold = (S16)(VARH_uGetVariableData(VARH_eTemp_C).flVal*100);
S16 Hot = (S16)(VARH_uGetVariableData(VARH_eTemp_H).flVal*100);
au8Buffer[0] = (Cold & 0xFF00) >> 8;

1
Core/Application/VARH_VariableHandler.c
View File

@ -164,6 +164,7 @@ VOID VARH_vSetVariableData( U8 u8Variable, VARH_UVariable uData )
//-------------------------------------------------------------------------------------------------
// Function: VARH_vSetVariableDataFromSystem
// Description: Sets the Variable Data from System
// Use only internal, not for User!
// Parameters: U8 u8Variable
// VARH_UVariable uData
// Returns: None