Skip to content

Update the cooling system handlers to fix flow readings #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mukama merged 1 commit into from
Apr 29, 2026
Merged

Update the cooling system handlers to fix flow readings #71

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 29 additions & 27 deletions workers/lib/server/handlers/coolingSystem.handlers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,9 @@ function buildMinersCircuit2View (equipment, config) {
level: ct.level,
level_sensor: towerLevelSensor,
vibration: ct.vibration,
vibration_sensor: towerVibrationSensorId
vibration_sensor: towerVibrationSensorId,
capacity_flow: towerConfig.defaults?.tower_capacity || null,
capacity_gcal: towerConfig.defaults?.tower_capacity_gcal || null
}))

// Makeup water system
Expand Down Expand Up @@ -624,22 +626,23 @@ function buildHvacCircuit2View (equipment, config) {
const supplyFlow = getSensorReading(flows, supplyReturnConfig.supply_flow_sensor)
const returnFlow = getSensorReading(flows, supplyReturnConfig.return_flow_sensor)

const supplyTempSensor = getSensorWithTag(temperatures, supplyReturnConfig.supply_temp_sensor)
const supplyFlowSensor = getSensorWithTag(flows, supplyReturnConfig.supply_flow_sensor)
const returnTempSensor = getSensorWithTag(temperatures, supplyReturnConfig.return_temp_sensor)
const returnFlowSensor = getSensorWithTag(flows, supplyReturnConfig.return_flow_sensor)

const supplyReturn = {
supply: {
name: 'Supply To Tower',
temperature: supplyTemp,
flow: supplyFlow,
sensors: [
getSensorWithTag(temperatures, supplyReturnConfig.supply_temp_sensor),
getSensorWithTag(flows, supplyReturnConfig.supply_flow_sensor)
].filter(Boolean)
sensors: [supplyTempSensor, supplyFlowSensor].filter(Boolean)
},
return: {
name: 'Return From Tower',
temperature: returnTemp,
flow: returnFlow,
sensors: [
getSensorWithTag(temperatures, supplyReturnConfig.return_temp_sensor),
getSensorWithTag(flows, supplyReturnConfig.return_flow_sensor)
].filter(Boolean)
sensors: [returnTempSensor, returnFlowSensor].filter(Boolean)
}
}

Expand All @@ -655,25 +658,24 @@ function buildHvacCircuit2View (equipment, config) {
const towerConfigRef = condenserConfig.tower || {}
const towerLevelSensorId = towerConfigRef.level_sensor
const towerLevel = getSensorReading(levels, towerLevelSensorId)
const towerVibrationSensorId = towerConfigRef.vibration_sensor
const towerFanId = towerConfigRef.fan

const towerData = (coolingTowers || []).map(ct => {
const isConfiguredTower = ct.equipment === towerConfigRef.equipment
return {
id: ct.equipment,
name: ct.equipment,
is_running: ct.is_running,
fan_status: ct.fan_status,
fan_speed: ct.fan_speed,
fan_power: ct.fan_power,
fan_id: isConfiguredTower ? towerConfigRef.fan : null,
level: ct.level,
level_sensor: isConfiguredTower ? towerConfigRef.level_sensor : null,
vibration: ct.vibration,
vibration_sensor: isConfiguredTower ? towerConfigRef.vibration_sensor : null,
capacity_mcal: condenserConfig.defaults?.tower_capacity_mcal || null,
capacity_flow: condenserConfig.defaults?.tower_flow || null
}
})
const towerData = (coolingTowers || []).map(ct => ({
id: ct.equipment,
name: ct.equipment,
is_running: ct.is_running,
fan_status: ct.fan_status,
fan_speed: ct.fan_speed,
fan_power: ct.fan_power,
fan_id: towerFanId || null,
level: ct.level,
level_sensor: towerLevelSensorId || null,
vibration: ct.vibration,
vibration_sensor: towerVibrationSensorId || null,
capacity_mcal: condenserConfig.defaults?.tower_capacity_mcal || null,
capacity_flow: condenserConfig.defaults?.tower_flow || null
}))

const condenserPumps = filterPumpsByCircuit(pumps, 'HVAC_CONDENSER').map(formatPump)

Expand Down
Loading