From 966d857b51ae7477700a0b86623b19874b17252c Mon Sep 17 00:00:00 2001 From: Dr-Seltsam <46630992+Dr-Seltsam@users.noreply.github.com> Date: Sat, 9 Apr 2022 00:05:48 +0200 Subject: [PATCH] Update mqtt.py Removed the double quotes on the values (except "idx" and "wind_dir_text") to prevent treating as strings --- src/pywws/service/mqtt.py | 64 +++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/src/pywws/service/mqtt.py b/src/pywws/service/mqtt.py index 266ed8d0..0b744f47 100644 --- a/src/pywws/service/mqtt.py +++ b/src/pywws/service/mqtt.py @@ -47,39 +47,39 @@ ... (as above) template_txt = ('\\n' '#idx \\'"idx" : "%Y-%m-%d %H:%M:%S",\\'#\\n' - '#wind_dir \\'"wind_dir_degrees" : "%.d",\\' \\'\\' \\'winddir_degrees(x)\\'#\\n' + '#wind_dir \\'"wind_dir_degrees" : %.d,\\' \\'\\' \\'winddir_degrees(x)\\'#\\n' '#wind_dir \\'"wind_dir_text" : "%s",\\' \\'\\' \\'winddir_text(x)\\'#\\n' - '#wind_ave \\'"wind_ave_mps" : "%.2f",\\'#\\n' - '#wind_ave \\'"wind_ave_mph" : "%.2f",\\' \\'\\' \\'wind_mph(x)\\'#\\n' - '#wind_gust \\'"wind_gust_mps" : "%.2f",\\'#\\n' - '#wind_gust \\'"wind_gust_mph" : "%.2f",\\' \\'\\' \\'wind_mph(x)\\'#\\n' - '#calc \\'wind_chill(data["temp_out"],data["wind_ave"])\\' \\'"wind_chill_c" : "%.1f",\\'#\\n' - '#calc \\'temp_f(wind_chill(data["temp_out"],data["wind_ave"]))\\' \\'"wind_chill_f" : "%.1f",\\'#\\n' - '#calc \\'dew_point(data["temp_out"],data["hum_out"])\\' \\'"dew_point_c" : "%.1f",\\'#\\n' - '#calc \\'temp_f(dew_point(data["temp_out"],data["hum_out"]))\\' \\'"dew_point_f" : "%.1f",\\'#\\n' - '#hum_out \\'"hum_out" : "%.d",\\'#\\n' - '#hum_in \\'"hum_in" : "%.d",\\'#\\n' - '#temp_in \\'"temp_in_c" : "%.1f",\\'#\\n' - '#temp_in \\'"temp_in_f" : "%.1f",\\' \\'\\' \\'temp_f(x)\\'#\\n' - '#temp_out \\'"temp_out_c" : "%.1f",\\'#\\n' - '#temp_out \\'"temp_out_f" : "%.1f",\\' \\'\\' \\'temp_f(x)\\'#\\n' - '#calc \\'apparent_temp(data["temp_out"],data["hum_out"],data["wind_ave"])\\' \\'"temp_out_realfeel_c" : "%.1f",\\'#\\n' - '#calc \\'temp_f(apparent_temp(data["temp_out"],data["hum_out"],data["wind_ave"]))\\' \\'"temp_out_realfeel_f" : "%.1f",\\'#\\n' - '#rel_pressure \\'"pressure_rel_hpa": "%.1f",\\'#\\n' - '#rel_pressure \\'"pressure_rel_inhg": "%.4f",\\' \\'\\' \\'pressure_inhg(x)\\'#\\n' - '#abs_pressure \\'"pressure_abs_hpa": "%.1f",\\'#\\n' - '#abs_pressure \\'"pressure_abs_inhg": "%.4f",\\' \\'\\' \\'pressure_inhg(x)\\'#\\n' - '#rain \\'"rain_mm" : "%.1f",\\'#\\n' - '#rain \\'"rain_in" : "%.2f",\\' \\'\\' \\'rain_inch(x)\\'#\\n' - '#calc \\'rain_hour(data)\\' \\'"rain_last_hour_mm": "%.1f",\\'#\\n' - '#calc \\'rain_inch(rain_hour(data))\\' \\'"rain_last_hour_in": "%.2f",\\'#\\n' - '#calc \\'rain_24hr(data)\\' \\'"rain_last_24hours_mm": "%.1f",\\'#\\n' - '#calc \\'rain_inch(rain_24hr(data))\\' \\'"rain_last_24hours_in": "%.2f",\\'#\\n' - '#calc \\'rain_day(data)\\' \\'"rain_day_mm": "%.1f",\\'#\\n' - '#calc \\'rain_inch(rain_day(data))\\' \\'"rain_day_in": "%.2f",\\'#\\n' - '#illuminance \\'"illuminance_lux" : "%.1f",\\'#\\n' - '#illuminance \\'"illuminance_wm2" : "%.2f",\\' \\'\\' \\'illuminance_wm2(x)\\'#\\n' - '#uv \\'"uv" : "%.d",\\'#\\n' + '#wind_ave \\'"wind_ave_mps" : %.2f,\\'#\\n' + '#wind_ave \\'"wind_ave_mph" : %.2f,\\' \\'\\' \\'wind_mph(x)\\'#\\n' + '#wind_gust \\'"wind_gust_mps" : %.2f,\\'#\\n' + '#wind_gust \\'"wind_gust_mph" : %.2f,\\' \\'\\' \\'wind_mph(x)\\'#\\n' + '#calc \\'wind_chill(data["temp_out"],data["wind_ave"])\\' \\'"wind_chill_c" : %.1f,\\'#\\n' + '#calc \\'temp_f(wind_chill(data["temp_out"],data["wind_ave"]))\\' \\'"wind_chill_f" : %.1f,\\'#\\n' + '#calc \\'dew_point(data["temp_out"],data["hum_out"])\\' \\'"dew_point_c" : %.1f,\\'#\\n' + '#calc \\'temp_f(dew_point(data["temp_out"],data["hum_out"]))\\' \\'"dew_point_f" : %.1f,\\'#\\n' + '#hum_out \\'"hum_out" : %.d,\\'#\\n' + '#hum_in \\'"hum_in" : %.d,\\'#\\n' + '#temp_in \\'"temp_in_c" : %.1f,\\'#\\n' + '#temp_in \\'"temp_in_f" : %.1f,\\' \\'\\' \\'temp_f(x)\\'#\\n' + '#temp_out \\'"temp_out_c" : %.1f,\\'#\\n' + '#temp_out \\'"temp_out_f" : %.1f,\\' \\'\\' \\'temp_f(x)\\'#\\n' + '#calc \\'apparent_temp(data["temp_out"],data["hum_out"],data["wind_ave"])\\' \\'"temp_out_realfeel_c" : %.1f,\\'#\\n' + '#calc \\'temp_f(apparent_temp(data["temp_out"],data["hum_out"],data["wind_ave"]))\\' \\'"temp_out_realfeel_f" : %.1f,\\'#\\n' + '#rel_pressure \\'"pressure_rel_hpa": %.1f,\\'#\\n' + '#rel_pressure \\'"pressure_rel_inhg": %.4f,\\' \\'\\' \\'pressure_inhg(x)\\'#\\n' + '#abs_pressure \\'"pressure_abs_hpa": %.1f,\\'#\\n' + '#abs_pressure \\'"pressure_abs_inhg": %.4f,\\' \\'\\' \\'pressure_inhg(x)\\'#\\n' + '#rain \\'"rain_mm" : %.1f,\\'#\\n' + '#rain \\'"rain_in" : %.2f,\\' \\'\\' \\'rain_inch(x)\\'#\\n' + '#calc \\'rain_hour(data)\\' \\'"rain_last_hour_mm": %.1f,\\'#\\n' + '#calc \\'rain_inch(rain_hour(data))\\' \\'"rain_last_hour_in": %.2f,\\'#\\n' + '#calc \\'rain_24hr(data)\\' \\'"rain_last_24hours_mm": %.1f,\\'#\\n' + '#calc \\'rain_inch(rain_24hr(data))\\' \\'"rain_last_24hours_in": %.2f,\\'#\\n' + '#calc \\'rain_day(data)\\' \\'"rain_day_mm": %.1f,\\'#\\n' + '#calc \\'rain_inch(rain_day(data))\\' \\'"rain_day_in": %.2f,\\'#\\n' + '#illuminance \\'"illuminance_lux" : %.1f,\\'#\\n' + '#illuminance \\'"illuminance_wm2" : %.2f,\\' \\'\\' \\'illuminance_wm2(x)\\'#\\n' + '#uv \\'"uv" : %.d,\\'#\\n' '\\n') pywws will publish a JSON string of weather data. This data will be