# HG changeset patch # User Michiel Broek # Date 1714312242 -7200 # Node ID ea24b4ce02b1242964e8f3e33b9c347302557d1c # Parent 93a87fe230cc93c5dd962ea8ace489b96732ecff It was impossible to remove devices from fermenters. Added beer_address2 device to the simulator. diff -r 93a87fe230cc -r ea24b4ce02b1 thermferm/devices.c --- a/thermferm/devices.c Sun Apr 28 14:25:26 2024 +0200 +++ b/thermferm/devices.c Sun Apr 28 15:50:42 2024 +0200 @@ -696,7 +696,7 @@ /* * Create simulated devices, or upgrade with new devices. */ - subdevices = 9; + subdevices = 10; for (i = found; i < subdevices; i++) { ndev = (devices_list *)malloc(sizeof(devices_list)); ndev->next = NULL; @@ -748,6 +748,10 @@ ndev->address = xstrcpy((char *)"SimLight"); ndev->description = xstrcpy((char *)"Simulated light"); break; + case 9: ndev->direction = DEVDIR_IN_ANALOG; + ndev->address = xstrcpy((char *)"SimBeerTemp2"); + ndev->description = xstrcpy((char *)"Simulated beer temperature (alt)"); + break; } syslog(LOG_NOTICE, "New Simulator device %s, subdevice %d, %s", ndev->address, ndev->subdevice, ndev->description); diff -r 93a87fe230cc -r ea24b4ce02b1 www/js/set_fermenters.js --- a/www/js/set_fermenters.js Sun Apr 28 14:25:26 2024 +0200 +++ b/www/js/set_fermenters.js Sun Apr 28 15:50:42 2024 +0200 @@ -435,6 +435,8 @@ air_idx: parseInt($('#air_idx').jqxNumberInput('decimal')) }; data += '&' + $.param(row); + } else { + data += '&air_address='; } if ($('#beer_address').val() != '') { var row = { @@ -443,6 +445,8 @@ beer_idx: parseInt($('#beer_idx').jqxNumberInput('decimal')) }; data += '&' + $.param(row); + } else { + data += '&beer_address=&beer_address2='; } if ($('#chiller_address').val() != '') { var row = { @@ -450,6 +454,8 @@ chiller_idx: parseInt($('#chiller_idx').jqxNumberInput('decimal')) }; data += '&' + $.param(row); + } else { + data += '&chiller_address='; } if ($('#heater_address').val() != '') { var row = { @@ -459,6 +465,8 @@ heater_delay: parseInt($('#heater_delay').jqxNumberInput('decimal')) }; data += '&' + $.param(row); + } else { + data += '&heater_address='; } if ($('#cooler_address').val() != '') { var row = { @@ -468,6 +476,8 @@ cooler_delay: parseInt($('#cooler_delay').jqxNumberInput('decimal')) }; data += '&' + $.param(row); + } else { + data += '&cooler_address='; } if ($('#fan_address').val() != '') { var row = { @@ -477,6 +487,8 @@ fan_delay: parseInt($('#fan_delay').jqxNumberInput('decimal')) }; data += '&' + $.param(row); + } else { + data += '&fan_address='; } if ($('#light_address').val() != '') { var row = { @@ -486,6 +498,8 @@ light_delay: parseInt($('#light_delay').jqxNumberInput('decimal')) }; data += '&' + $.param(row); + } else { + data += '&light_address='; } if ($('#door_address').val() != '') { var row = { @@ -493,6 +507,8 @@ door_idx: parseInt($('#door_idx').jqxNumberInput('decimal')) }; data += '&' + $.param(row); + } else { + data += '&door_address='; } if ($('#psu_address').val() != '') { var row = { @@ -500,6 +516,8 @@ psu_idx: parseInt($('#psu_idx').jqxNumberInput('decimal')) }; data += '&' + $.param(row); + } else { + data += '&psu_address='; } console.log(data);