Some changes before release

This commit is contained in:
Gunnar Skjold 2023-12-04 13:40:58 +01:00
parent fd996f44ba
commit c1b35b8ce0
3 changed files with 5 additions and 1 deletions

View File

@ -28,6 +28,8 @@ jobs:
run: |
sed -i 's/NO_AMS2MQTT_PRICE_KEY/AMS2MQTT_PRICE_KEY="${{secrets.AMS2MQTT_PRICE_KEY}}"/g' platformio.ini
sed -i 's/NO_AMS2MQTT_PRICE_AUTHENTICATION/AMS2MQTT_PRICE_AUTHENTICATION="${{secrets.AMS2MQTT_PRICE_AUTHENTICATION}}"/g' platformio.ini
sed -i 's/NO_ENERGY_SPEEDOMETER_USER/ENERGY_SPEEDOMETER_USER=\"${{secrets.ENERGY_SPEEDOMETER_USER}}\"/g' platformio.ini
sed -i 's/NO_ENERGY_SPEEDOMETER_PASS/ENERGY_SPEEDOMETER_PASS=\"${{secrets.ENERGY_SPEEDOMETER_PASS}}\"/g' platformio.ini
- name: Cache Python dependencies
uses: actions/cache@v1

View File

@ -1002,7 +1002,7 @@ void AmsWebServer::configurationJson() {
);
server.sendContent(buf);
snprintf_P(buf, BufferSize, CONF_CLOUD_JSON,
#if defined(ENERGY_SPEEDOMETER_PASS)
#if defined(ESP32) && defined(ENERGY_SPEEDOMETER_PASS)
sysConfig.energyspeedometer == 7 ? "true" : "false"
#else
"null"

View File

@ -14,6 +14,8 @@ build_flags =
-D WEBSOCKET_DISABLED=1
-D NO_AMS2MQTT_PRICE_KEY
-D NO_AMS2MQTT_PRICE_AUTHENTICATION
-D NO_ENERGY_SPEEDOMETER_USER
-D NO_ENERGY_SPEEDOMETER_PASS
-fexceptions
[esp32]