Follow S&C event names, and update for FZ!

RADIO-PROJECT-EU · Oct 26, 2017 · fdf63bb · fdf63bb
1 parent d9829cc
commit fdf63bb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/config/parameters.yaml b/config/parameters.yaml
@@ -1,7 +1,8 @@
 api_url: 'https://dev.encontrol.io/api/'
 username: 'gstavrinos'
 password: 'test'
-installation_id: '00000000-0000-0000-0000-b827eb9a72ca'
+installation_id: '00000000-0000-0000-0000-b827eb7eccf3' # FZ
+#installation_id: '00000000-0000-0000-0000-b827eb9a72ca' # FPHAG
 user_id: 543
 sensor_topic: 'snc_sensors/status'
 event_topic: 'snc_sensors/events'

diff --git a/src/snc.py b/src/snc.py
@@ -83,16 +83,17 @@ def init():
             jsn = jsn['Events']
             cnt = 0
             for j in jsn:
-                event = SnCSensor()
-                event.id = 'N/A'
-                event.name = j['Description']
-                event.status = j['Date']
-                event.value = 0
-                events.append(event)
-                # Add the five latest only, because the json response includes days of events!
-                cnt += 1
-                if cnt >= 5:
-                    break
+                if j['InstallationId'] == installationid:
+                    event = SnCSensor()
+                    event.id = j['InstallationId']
+                    event.name = j['Description']
+                    event.status = j['Date']
+                    event.value = 0
+                    events.append(event)
+                    # Add the ten latest only, because the json response includes days of events!
+                    cnt += 1
+                    if cnt >= 10:
+                        break
 
             msg.header.stamp = rospy.Time.now()
             msg.sensors = events