完善了网页显示
This commit is contained in:
@@ -525,28 +525,28 @@ public:
|
||||
power_bus_status.emergencyPowerLossSignal = data.emergencyPowerLossSignal == 0x55 ? 0 : 1;
|
||||
|
||||
//温度
|
||||
power_bus_status.dcDcTemperature = data.dcDcTemperature;
|
||||
power_bus_status.dcDcTemperature = data.dcDcTemperature-40;
|
||||
|
||||
//电压电流参数
|
||||
power_bus_status.powerBusVoltage = data.powerBusVoltage;
|
||||
power_bus_status.dcDc5ModuleCurrent = data.dcDc5ModuleCurrent;
|
||||
power_bus_status.powerBusCurrent = data.powerBusCurrent;
|
||||
power_bus_status.busbarAVoltage = data.busbarAVoltage;
|
||||
power_bus_status.propulsionMotorControlBoxCurrent = data.propulsionMotorControlBoxCurrent;
|
||||
power_bus_status.busbarACurrent = data.busbarACurrent;
|
||||
power_bus_status.lithiumBatteryGroupMeterCurrent = data.lithiumBatteryGroupMeterCurrent;
|
||||
power_bus_status.bowHighVoltageDistributionBoxCurrent = data.bowHighVoltageDistributionBoxCurrent;
|
||||
power_bus_status.sternFTDevice45Current = data.sternFTDevice45Current;
|
||||
power_bus_status.tyzReservedSwitchCurrent = data.tyzReservedSwitchCurrent;
|
||||
power_bus_status.sternRudderSwitch1Current = data.sternRudderSwitch1Current;
|
||||
power_bus_status.reservedCurrent1 = data.reservedCurrent1;
|
||||
power_bus_status.sternRudderSwitch2Current = data.sternRudderSwitch2Current;
|
||||
power_bus_status.reservedCurrent2 = data.reservedCurrent2;
|
||||
power_bus_status.fbReservedSwitchCurrent = data.fbReservedSwitchCurrent;
|
||||
power_bus_status.reservedCurrent3 = data.reservedCurrent3;
|
||||
power_bus_status.powerBusVoltage = data.powerBusVoltage * 0.1;
|
||||
power_bus_status.dcDc5ModuleCurrent = data.dcDc5ModuleCurrent * 0.1;
|
||||
power_bus_status.powerBusCurrent = data.powerBusCurrent * 0.1;
|
||||
power_bus_status.busbarAVoltage = data.busbarAVoltage * 0.1;
|
||||
power_bus_status.propulsionMotorControlBoxCurrent = data.propulsionMotorControlBoxCurrent * 0.1;
|
||||
power_bus_status.busbarACurrent = data.busbarACurrent * 0.1;
|
||||
power_bus_status.lithiumBatteryGroupMeterCurrent = data.lithiumBatteryGroupMeterCurrent * 0.1;
|
||||
power_bus_status.bowHighVoltageDistributionBoxCurrent = data.bowHighVoltageDistributionBoxCurrent * 0.1;
|
||||
power_bus_status.sternFTDevice45Current = data.sternFTDevice45Current * 0.1;
|
||||
power_bus_status.tyzReservedSwitchCurrent = data.tyzReservedSwitchCurrent * 0.1;
|
||||
power_bus_status.sternRudderSwitch1Current = data.sternRudderSwitch1Current * 0.1;
|
||||
power_bus_status.reservedCurrent1 = data.reservedCurrent1 * 0.1;
|
||||
power_bus_status.sternRudderSwitch2Current = data.sternRudderSwitch2Current * 0.1;
|
||||
power_bus_status.reservedCurrent2 = data.reservedCurrent2 * 0.1;
|
||||
power_bus_status.fbReservedSwitchCurrent = data.fbReservedSwitchCurrent * 0.1;
|
||||
power_bus_status.reservedCurrent3 = data.reservedCurrent3 * 0.1;
|
||||
|
||||
//冷却水压力
|
||||
power_bus_status.coolWaterPressure = data.coolWaterPressure;
|
||||
power_bus_status.coolWaterPressure = data.coolWaterPressure * 0.1;
|
||||
};
|
||||
void updateSystemData(disHighAVolBusState data){
|
||||
//断路器状态 (0x55 1 0xAA 0 0x5A 2)
|
||||
@@ -571,14 +571,14 @@ public:
|
||||
power_a_bus_status.waterIngressionAlarm = data.waterIngressionAlarm;
|
||||
|
||||
//电压电流参数
|
||||
power_a_bus_status.busbarBVoltage = data.busbarBVoltage;
|
||||
power_a_bus_status.busbarBCurrent = data.busbarBCurrent;
|
||||
power_a_bus_status.bowFTDevice123Current = data.bowFTDevice123Current;
|
||||
power_a_bus_status.actuatorCurrent = data.actuatorCurrent;
|
||||
power_a_bus_status.mastSteeringGearControlBoxCurrent = data.mastSteeringGearControlBoxCurrent;
|
||||
power_a_bus_status.xczCurrent = data.xczCurrent;
|
||||
power_a_bus_status.bowRudderControlBoxCurrent = data.bowRudderControlBoxCurrent;
|
||||
power_a_bus_status.openWaterCoverStartCylinderCurrent = data.openWaterCoverStartCylinderCurrent;
|
||||
power_a_bus_status.busbarBVoltage = data.busbarBVoltage * 0.1;
|
||||
power_a_bus_status.busbarBCurrent = data.busbarBCurrent * 0.1;
|
||||
power_a_bus_status.bowFTDevice123Current = data.bowFTDevice123Current * 0.1;
|
||||
power_a_bus_status.actuatorCurrent = data.actuatorCurrent * 0.1;
|
||||
power_a_bus_status.mastSteeringGearControlBoxCurrent = data.mastSteeringGearControlBoxCurrent * 0.1;
|
||||
power_a_bus_status.xczCurrent = data.xczCurrent * 0.1;
|
||||
power_a_bus_status.bowRudderControlBoxCurrent = data.bowRudderControlBoxCurrent * 0.1;
|
||||
power_a_bus_status.openWaterCoverStartCylinderCurrent = data.openWaterCoverStartCylinderCurrent * 0.1;
|
||||
};
|
||||
void updateSystemData(disLowMainBusState data){
|
||||
//断路器状态 (0x55 1 0xAA 0 0x5A 2)
|
||||
@@ -605,18 +605,18 @@ public:
|
||||
instrument_main_bus_status.instrumentBusbarInsulationLow = data.instrumentBusbarInsulationLow == 0x55 ? 0 : 1;
|
||||
|
||||
//电压电流参数
|
||||
instrument_main_bus_status.instrumentBusbarVoltage = data.instrumentBusbarVoltage;
|
||||
instrument_main_bus_status.bowLowVoltageDistributionBoxCurrent = data.bowLowVoltageDistributionBoxCurrent;
|
||||
instrument_main_bus_status.dcC1InstrumentDC48VCurrent = data.dcC1InstrumentDC48VCurrent;
|
||||
instrument_main_bus_status.reservedCurrent1 = data.reservedCurrent1;
|
||||
instrument_main_bus_status.emergencyLithiumBatteryGroup2Current = data.emergencyLithiumBatteryGroup2Current;
|
||||
instrument_main_bus_status.lithiumBatteryGroupInstrumentCurrent = data.lithiumBatteryGroupInstrumentCurrent;
|
||||
instrument_main_bus_status.unit4InstrumentDC48VCurrent = data.unit4InstrumentDC48VCurrent;
|
||||
instrument_main_bus_status.reservedCurrent2 = data.reservedCurrent2;
|
||||
instrument_main_bus_status.emergency2BusbarVoltage = data.emergency2BusbarVoltage;
|
||||
instrument_main_bus_status.compositeEnergyManagementSystemEmergencyDC48VCurrent = data.compositeEnergyManagementSystemEmergencyDC48VCurrent;
|
||||
instrument_main_bus_status.fuelCellSecuritySystemEmergencyDC48VCurrent = data.fuelCellSecuritySystemEmergencyDC48VCurrent;
|
||||
instrument_main_bus_status.plcControlPowerCurrent = data.plcControlPowerCurrent;
|
||||
instrument_main_bus_status.instrumentBusbarVoltage = data.instrumentBusbarVoltage * 0.1;
|
||||
instrument_main_bus_status.bowLowVoltageDistributionBoxCurrent = data.bowLowVoltageDistributionBoxCurrent * 0.1;
|
||||
instrument_main_bus_status.dcC1InstrumentDC48VCurrent = data.dcC1InstrumentDC48VCurrent * 0.1;
|
||||
instrument_main_bus_status.reservedCurrent1 = data.reservedCurrent1 * 0.1;
|
||||
instrument_main_bus_status.emergencyLithiumBatteryGroup2Current = data.emergencyLithiumBatteryGroup2Current * 0.1;
|
||||
instrument_main_bus_status.lithiumBatteryGroupInstrumentCurrent = data.lithiumBatteryGroupInstrumentCurrent * 0.1;
|
||||
instrument_main_bus_status.unit4InstrumentDC48VCurrent = data.unit4InstrumentDC48VCurrent * 0.1;
|
||||
instrument_main_bus_status.reservedCurrent2 = data.reservedCurrent2 * 0.1;
|
||||
instrument_main_bus_status.emergency2BusbarVoltage = data.emergency2BusbarVoltage * 0.1;
|
||||
instrument_main_bus_status.compositeEnergyManagementSystemEmergencyDC48VCurrent = data.compositeEnergyManagementSystemEmergencyDC48VCurrent * 0.1;
|
||||
instrument_main_bus_status.fuelCellSecuritySystemEmergencyDC48VCurrent = data.fuelCellSecuritySystemEmergencyDC48VCurrent * 0.1;
|
||||
instrument_main_bus_status.plcControlPowerCurrent = data.plcControlPowerCurrent * 0.1;
|
||||
}
|
||||
void updateSystemData(disLowBusState data){
|
||||
//断路器状态 (0x55 1 0xAA 0 0x5A 2)
|
||||
@@ -645,15 +645,15 @@ public:
|
||||
instrument_bus_status.waterIngressionAlarm = data.waterIngressionAlarm;
|
||||
|
||||
//电压电流参数
|
||||
instrument_bus_status.instrumentBusbarVoltage = data.instrumentBusbarVoltage;
|
||||
instrument_bus_status.instrumentBusbarCurrent = data.instrumentBusbarCurrent;
|
||||
instrument_bus_status.unit1Current = data.unit1Current;
|
||||
instrument_bus_status.unit2Current = data.unit2Current;
|
||||
instrument_bus_status.unit3Current = data.unit3Current;
|
||||
instrument_bus_status.unit5Current = data.unit5Current;
|
||||
instrument_bus_status.bowPZDeviceCurrent = data.bowPZDeviceCurrent;
|
||||
instrument_bus_status.emergencyLithiumBatteryGroup1Current = data.emergencyLithiumBatteryGroup1Current;
|
||||
instrument_bus_status.emergency1BusbarVoltage = data.emergency1BusbarVoltage;
|
||||
instrument_bus_status.instrumentBusbarVoltage = data.instrumentBusbarVoltage * 0.1;
|
||||
instrument_bus_status.instrumentBusbarCurrent = data.instrumentBusbarCurrent * 0.1;
|
||||
instrument_bus_status.unit1Current = data.unit1Current * 0.1;
|
||||
instrument_bus_status.unit2Current = data.unit2Current * 0.1;
|
||||
instrument_bus_status.unit3Current = data.unit3Current * 0.1;
|
||||
instrument_bus_status.unit5Current = data.unit5Current * 0.1;
|
||||
instrument_bus_status.bowPZDeviceCurrent = data.bowPZDeviceCurrent * 0.1;
|
||||
instrument_bus_status.emergencyLithiumBatteryGroup1Current = data.emergencyLithiumBatteryGroup1Current * 0.1;
|
||||
instrument_bus_status.emergency1BusbarVoltage = data.emergency1BusbarVoltage * 0.1;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user