Merge remote-tracking branch 'origin/ac_main' into mdev

2022-12-06 14:38:49 +01:00
parent a2c707831c e629c90a71
commit 3160a0b090
29 changed files with 5225 additions and 4981 deletions
--- a/usermods/usermod_v2_rotary_encoder_ui_ALT/usermod_v2_rotary_encoder_ui_ALT.h
+++ b/usermods/usermod_v2_rotary_encoder_ui_ALT/usermod_v2_rotary_encoder_ui_ALT.h
@@ -760,7 +760,7 @@ public:
      StaticJsonDocument<64> root;
      char str[64] = { '\0' };
      sprintf_P(str, PSTR("%d~%d~%s"), presetLow, presetHigh, increase?"":"-");
-      root[F("ps")] = str;
+      root["ps"] = str;
      deserializeState(root.as<JsonObject>(), CALL_MODE_BUTTON_PRESET);
 /*
      String apireq = F("win&PL=~");