|
@@ -887,28 +887,31 @@ void ReceiveDataFromCanBus()
|
|
|
case PSU_R_IN_TEMP:
|
|
|
{
|
|
|
byte psuIndexAddr = moduleAddr;
|
|
|
- float ReturnValue = ((frame.data[4] << 24 | frame.data[5] << 16 | frame.data[6] << 8 | frame.data[7])) / 1000;
|
|
|
+ unsigned char ReturnValue = ((frame.data[4] << 24 | frame.data[5] << 16 | frame.data[6] << 8 | frame.data[7])) / 1000;
|
|
|
|
|
|
if (group > 0)
|
|
|
{
|
|
|
psuIndexAddr = moduleAddr + ShmUuPowerData.uu_pow_info[group - 1].psuCount;
|
|
|
}
|
|
|
|
|
|
- return_mis_info(psuIndexAddr, ReturnValue, 2);
|
|
|
+ // Env Temp
|
|
|
+ return_output_temp(psuIndexAddr, LIB_NO_USE, LIB_NO_USE, LIB_NO_USE, ReturnValue, PSU_PROTOCOL_TYPE);
|
|
|
}
|
|
|
break;
|
|
|
case PSU_R_PFC_TEMP:
|
|
|
case PSU_R_DD2_TEMP:
|
|
|
case PSU_R_DD3_TEMP:
|
|
|
{
|
|
|
- //printf("----------PSU_R_TEMP---------- \n");
|
|
|
byte psuIndexAddr = moduleAddr;
|
|
|
+ float ReturnValue = ((frame.data[4] << 24 | frame.data[5] << 16 | frame.data[6] << 8 | frame.data[7])) / 1000;
|
|
|
+
|
|
|
if (group > 0)
|
|
|
{
|
|
|
psuIndexAddr = moduleAddr + ShmUuPowerData.uu_pow_info[group - 1].psuCount;
|
|
|
}
|
|
|
|
|
|
- return_output_temp(psuIndexAddr, LIB_NO_USE, LIB_NO_USE, LIB_NO_USE, ((frame.data[4] << 24 | frame.data[5] << 16 | frame.data[6] << 8 | frame.data[7])) / 1000, PSU_PROTOCOL_TYPE);
|
|
|
+ // DD Temp
|
|
|
+ return_mis_info(psuIndexAddr, ReturnValue, 2);
|
|
|
//printf("temp = %02d \n", ((frame.data[4] << 24 | frame.data[5] << 16 | frame.data[6] << 8 | frame.data[7])) / 1000);
|
|
|
}
|
|
|
break;
|