Add Feature: customize pressure sensor scaling (#225)

* feat: Try out Nimrod PID library

* Fix for acaia pearl s scale

* quick hack for 12 bar pressure sensor

* Revert "feat: Try out Nimrod PID library"

This reverts commit b539c89.

* Revert "quick hack for 12 bar pressure sensor"

This reverts commit f4b5a6e.

* Added a setting for 12/16 bar pressure sensor; change to this setting requires reboot.

* changed to manual entry on web page, fixed value not being saved, value is still not being properly set.

* Changed data type from byte array to string representation of float value when sending pressureScaling between client/server; byte array data seemed to be distorted for certain values.
Controller.cpp:
moved setPressureScale into function

* oops, fixed function call

* Revert "Fix for acaia pearl s scale"

This reverts commit 8673645.

* Fix for acaia pearl s scale

---------

Co-authored-by: Jochen Ullrich <[email protected]>

Author: 0x64c

lib/NimBLEComm/src/NimBLEClientController.cpp

@@ -140,10 +140,7 @@ void NimBLEClientController::sendPidSettings(const String &pid) {
 
 void NimBLEClientController::setPressureScale(float scale) {
     if (client->isConnected() && pressureScaleChar != nullptr) {
-        constexpr size_t bufferSize = sizeof(float);
-        char buffer[bufferSize];
-        std::memcpy(buffer + 0, &scale, sizeof(scale));
-        pressureScaleChar->writeValue(buffer);
+        pressureScaleChar->writeValue(String(scale));
     }
 }
 

lib/NimBLEComm/src/NimBLEServerController.cpp

@@ -187,13 +187,12 @@ void NimBLEServerController::onWrite(NimBLECharacteristic *pCharacteristic) {
             pidControlCallback(Kp, Ki, Kd);
         }
     } else if (pCharacteristic->getUUID().equals(NimBLEUUID(PRESSURE_SCALE_UUID))) {
-        const uint8_t *data = pCharacteristic->getValue().data();
-        float scale;
-        std::memcpy(&scale, data + 0, sizeof(scale));
+        String scale_string = pCharacteristic->getValue().c_str();
+        float scale_value = scale_string.toFloat();
 
-        ESP_LOGI(LOG_TAG, "Received pressure scale: %.1f", scale);
+        ESP_LOGV(LOG_TAG, "Received pressure scale: %.2f", scale_value);
         if (pressureScaleCallback != nullptr) {
-            pressureScaleCallback(scale);
+            pressureScaleCallback(scale_value);
         }
     }
 }

platformio.ini

@@ -60,7 +60,7 @@ lib_deps =
 	mathieucarbou/ESPAsyncWebServer @ 3.3.22
 	bblanchon/ArduinoJson@^7.2.1
     256dpi/MQTT@^2.5.2
-    https://github.com/gaggimate/esp-arduino-ble-scales
+    https://github.com/0x64c/esp-arduino-ble-scales
 
 [env:controller]
 extends = env:base

src/display/core/Controller.cpp

@@ -165,6 +165,10 @@ void Controller::loop() {
             loaded = true;
             if (settings.getStartupMode() == MODE_STANDBY)
                 activateStandby();
+
+            ESP_LOGI("Controller","setting pressure scale to %.2f\n",settings.getPressureScaling());
+            setPressureScale();
+
             pluginManager->trigger("controller:ready");
         }
     }
@@ -279,6 +283,12 @@ void Controller::setTargetTemp(int temperature) {
     updateLastAction();
 }
 
+void Controller::setPressureScale(void){
+    if(systemInfo.capabilities.pressure){
+        clientController.setPressureScale(settings.getPressureScaling());
+    }
+}
+
 int Controller::getTargetDuration() const { return settings.getTargetDuration(); }
 
 void Controller::setTargetDuration(int duration) {

src/display/core/Controller.h

@@ -32,6 +32,8 @@ class Controller {
 
     void setTargetTemp(int temperature);
 
+    void setPressureScale();
+
     int getTargetDuration() const;
 
     void setTargetDuration(int duration);

src/display/core/Settings.cpp

@@ -16,6 +16,7 @@ Settings::Settings() {
     grindDelay = preferences.getDouble("del_gd", 1000.0);
     delayAdjust = preferences.getBool("del_ad", true);
     temperatureOffset = preferences.getInt("to", DEFAULT_TEMPERATURE_OFFSET);
+    pressureScaling = preferences.getFloat("ps", DEFAULT_PRESSURE_SCALING);
     pid = preferences.getString("pid", DEFAULT_PID);
     wifiSsid = preferences.getString("ws", "");
     wifiPassword = preferences.getString("wp", "");
@@ -80,6 +81,11 @@ void Settings::setTemperatureOffset(const int temperature_offset) {
     save();
 }
 
+void Settings::setPressureScaling(const float pressure_scaling){
+    pressureScaling = pressure_scaling;
+    save();
+}
+
 void Settings::setTargetDuration(const int target_duration) {
     targetDuration = target_duration;
     save();
@@ -262,6 +268,7 @@ void Settings::doSave() {
     preferences.putDouble("del_gd", grindDelay);
     preferences.putBool("del_ad", delayAdjust);
     preferences.putInt("to", temperatureOffset);
+    preferences.putFloat("ps", pressureScaling);
     preferences.putString("pid", pid);
     preferences.putString("ws", wifiSsid);
     preferences.putString("wp", wifiPassword);

src/display/core/Settings.h

@@ -23,6 +23,7 @@ class Settings {
     int getTargetSteamTemp() const { return targetSteamTemp; }
     int getTargetWaterTemp() const { return targetWaterTemp; }
     int getTemperatureOffset() const { return temperatureOffset; }
+    float getPressureScaling() const { return pressureScaling; }
     int getTargetDuration() const { return targetDuration; }
     int getTargetVolume() const { return targetVolume; }
     int getTargetGrindVolume() const { return targetGrindVolume; }
@@ -60,6 +61,7 @@ class Settings {
     void setTargetSteamTemp(int target_steam_temp);
     void setTargetWaterTemp(int target_water_temp);
     void setTemperatureOffset(int temperature_offset);
+    void setPressureScaling(float pressure_scaling);
     void setTargetDuration(int target_duration);
     void setTargetVolume(int target_volume);
     void setTargetGrindVolume(int target_grind_volume);
@@ -102,6 +104,7 @@ class Settings {
     int targetSteamTemp = 155;
     int targetWaterTemp = 80;
     int temperatureOffset = DEFAULT_TEMPERATURE_OFFSET;
+    float pressureScaling = DEFAULT_PRESSURE_SCALING;
     int targetDuration = 25000;
     int targetVolume = 36;
     int targetGrindVolume = 18;

src/display/core/constants.h

@@ -15,6 +15,7 @@
 #define MIN_TEMP 0
 #define MAX_TEMP 160
 #define DEFAULT_TEMPERATURE_OFFSET 0
+#define DEFAULT_PRESSURE_SCALING 16.0f
 #define DEFAULT_PID "24,0.2,700"
 #define DEFAULT_MDNS_NAME "gaggimate"
 #define DEFAULT_OTA_CHANNEL "latest"

src/display/plugins/WebUIPlugin.cpp

@@ -184,6 +184,8 @@ void WebUIPlugin::handleSettings(AsyncWebServerRequest *request) const {
                 settings->setTargetDuration(request->arg("targetDuration").toInt() * 1000);
             if (request->hasArg("temperatureOffset"))
                 settings->setTemperatureOffset(request->arg("temperatureOffset").toInt());
+            if (request->hasArg("pressureScaling"))
+                settings->setPressureScaling(request->arg("pressureScaling").toFloat());
             if (request->hasArg("infusePumpTime"))
                 settings->setInfusePumpTime(request->arg("infusePumpTime").toInt() * 1000);
             if (request->hasArg("infuseBloomTime"))
@@ -255,6 +257,7 @@ void WebUIPlugin::handleSettings(AsyncWebServerRequest *request) const {
     doc["wifiPassword"] = settings.getWifiPassword();
     doc["mdnsName"] = settings.getMdnsName();
     doc["temperatureOffset"] = String(settings.getTemperatureOffset());
+    doc["pressureScaling"] = String(settings.getPressureScaling());
     doc["boilerFillActive"] = settings.isBoilerFillActive();
     doc["startupFillTime"] = settings.getStartupFillTime() / 1000;
     doc["steamFillTime"] = settings.getSteamFillTime() / 1000;

web/src/pages/Settings/index.jsx

@@ -152,6 +152,25 @@ export function Settings() {
               />
             </div>
         </Card>
+        <Card xs={12} lg={6} title="Pressure settings">
+          <div>
+            <label htmlFor="pressureScaling" className="block font-medium text-gray-700 dark:text-gray-400">
+              Pressure scaling factor
+            </label>
+            <input
+              id="pressureScaling"
+              name="pressureScaling"
+              type="number"
+              inputmode="decimal"
+              placeholder="0.0"
+              className="input-field"
+              min="0"
+              step="any"
+              value={formData.pressureScaling}
+              onChange={onChange('pressureScaling')}
+            />
+          </div>
+        </Card>
         <Card xs={12} lg={6} title="Brew phases">
           <div>
             <label htmlFor="targetDuration" className="block font-medium text-gray-700 dark:text-gray-400">