Merge pull request #82 from cdesouza71/bugfixes-1

Bugfixes 1

moisture_sensor_data_mqtt/README.md

@@ -59,6 +59,8 @@ week.
 
 ## Version information
 
+- v0.0.5
+ - Fix issue with processing reading with float timestamp
 - v0.0.4
  - Fix datetime serialization issue
 - v0.0.3

moisture_sensor_data_mqtt/moisture_sensor_data_mqtt-docs.html

@@ -105,6 +105,10 @@ <h2>Retention period</h2>
 <h2>Version information</h2>
 
 <ul>
+<li>v0.0.5
+<ul>
+<li>Fix issue with processing reading with float timestamp</li>
+</ul></li>
 <li>v0.0.4
 <ul>
 <li>Fix datetime serialization issue</li>

moisture_sensor_data_mqtt/moisture_sensor_data_mqtt.py

@@ -137,7 +137,7 @@ def mqtt_reader(client, msg):
  if driest is None or wettest is None:
  return
 
- ts_secs = gv.now
+ ts_secs = int(gv.now)
  ts = datetime.datetime.fromtimestamp(ts_secs)
  if interval is not None and sensor in last_reading:
  if last_reading[sensor]["ts"] + datetime.timedelta(minutes=interval) > ts:
@@ -213,7 +213,8 @@ def truncate_data_files(neme, **kw):
 
  for line in input:
  fields = line.split(",")
- if int(fields[0]) + retention > now:
+ # timestamp can be float or int
+ if int(float(fields[0])) + retention > now:
  output.write(line)
 
  try:
@@ -235,7 +236,7 @@ def load_moisture_data_mqtt_settings():
  # If file does not exist return default value
  settings = {
  "sensors": {},
- "last_truncate": gv.now,
+ "last_truncate": int(gv.now),
  }
 
 

monthly_adjust_per_station/README.md

@@ -25,6 +25,8 @@ The plugin does not currently respect the option "Ignore Plugin adjustments".
 
 ## Version information
 
+- v0.0.3
+ - Fix UI hanging schedules issue
 - v0.0.2
  - Ignore RUN ONCE programs
 - v0.0.1

monthly_adjust_per_station/monthly_adjust_per_station-docs.html

@@ -36,6 +36,10 @@ <h2>Limitations</h2>
 <h2>Version information</h2>
 
 <ul>
+<li>v0.0.3
+<ul>
+<li>Fix UI hanging schedules issue</li>
+</ul></li>
 <li>v0.0.2
 <ul>
 <li>Ignore RUN ONCE programs</li>

monthly_adjust_per_station/monthly_adjust_per_station.py

@@ -90,7 +90,8 @@ def notify_station_scheduled(station, **kw):
  station_settings["default"],
  ]
  )
- if default is None or default == 100:
+
+ if default is None:
  return
  else:
  adjustment = default
@@ -104,6 +105,10 @@ def notify_station_scheduled(station, **kw):
  duration = math.ceil(duration * adjustment / 100)
  gv.rs[station_index][1] = gv.rs[station_index][0] + duration
  gv.rs[station_index][2] = duration
+ if duration == 0:
+ gv.ps[station_index] = [0, 0]
+ else:
+ gv.ps[station_index][1] = duration
 
 
 scheduled_signal = signal("station_scheduled")