|
@@ -357,7 +357,7 @@ void GetPsuMaxVoltage(byte group)
|
|
|
SendCmdToPsu(PwrFrameMsg.PwrMessage, data, sizeof(data));
|
|
|
}
|
|
|
|
|
|
-void GetTemperature(byte group)
|
|
|
+void GetTemperature(byte group, byte type)
|
|
|
{
|
|
|
byte data[8];
|
|
|
PwrFrame PwrFrameMsg;
|
|
@@ -381,7 +381,10 @@ void GetTemperature(byte group)
|
|
|
data[0] = data[0] << 4;
|
|
|
data[0] |= PSU_MSG_CMD_READ_MSG;
|
|
|
// Command Type
|
|
|
- data[1] = PSU_R_TEMP;
|
|
|
+ if (type == UU_MODULE_TEMP_ENV)
|
|
|
+ data[1] = PSU_R_IN_TEMP;
|
|
|
+ else if (type == UU_MODULE_TEMP_DD)
|
|
|
+ data[1] = PSU_R_PFC_TEMP;
|
|
|
|
|
|
SendCmdToPsu(PwrFrameMsg.PwrMessage, data, sizeof(data));
|
|
|
}
|
|
@@ -881,7 +884,22 @@ void ReceiveDataFromCanBus()
|
|
|
}
|
|
|
}
|
|
|
break;
|
|
|
- case PSU_R_TEMP:
|
|
|
+ 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;
|
|
|
+
|
|
|
+ if (group > 0)
|
|
|
+ {
|
|
|
+ psuIndexAddr = moduleAddr + ShmUuPowerData.uu_pow_info[group - 1].psuCount;
|
|
|
+ }
|
|
|
+
|
|
|
+ return_mis_info(psuIndexAddr, ReturnValue, 2);
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ case PSU_R_PFC_TEMP:
|
|
|
+ case PSU_R_DD2_TEMP:
|
|
|
+ case PSU_R_DD3_TEMP:
|
|
|
{
|
|
|
//printf("----------PSU_R_TEMP---------- \n");
|
|
|
byte psuIndexAddr = moduleAddr;
|
|
@@ -890,8 +908,8 @@ void ReceiveDataFromCanBus()
|
|
|
psuIndexAddr = moduleAddr + ShmUuPowerData.uu_pow_info[group - 1].psuCount;
|
|
|
}
|
|
|
|
|
|
- return_output_temp(psuIndexAddr, LIB_NO_USE, LIB_NO_USE, LIB_NO_USE, ((frame.data[6] << 8 | frame.data[7])) / 1000, PSU_PROTOCOL_TYPE);
|
|
|
- //printf("temp = %02d \n", ((frame.data[6] << 8 | frame.data[7])) / 1000);
|
|
|
+ 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);
|
|
|
+ //printf("temp = %02d \n", ((frame.data[4] << 24 | frame.data[5] << 16 | frame.data[6] << 8 | frame.data[7])) / 1000);
|
|
|
}
|
|
|
break;
|
|
|
case PSU_RW_GROUP:
|
|
@@ -1255,7 +1273,8 @@ void GetModuleOutputF(byte group)
|
|
|
|
|
|
void GetDcTemperature(byte group)
|
|
|
{
|
|
|
- GetTemperature(group);
|
|
|
+ GetTemperature(group, UU_MODULE_TEMP_ENV);
|
|
|
+ GetTemperature(group, UU_MODULE_TEMP_DD);
|
|
|
GetInputVoltageL12(group);
|
|
|
GetInputVoltageL23(group);
|
|
|
GetInputVoltageL31(group);
|