Procházet zdrojové kódy

Added new sensors for AFC

Lukas Cerny před 4 roky
rodič
revize
e0088d2690

+ 6 - 6
config/lorawanSenslog1.yaml

@@ -8,8 +8,8 @@ settings:
     - AzureLoraWan:
         name: "IoT LoraWan"
         provider: "cz.senslog.connector.fetch.azure.ConnectorFetchAzureProvider"
-        # startDate: 2020-09-10T00:00:00.000
-        startDate: 2021-04-08T00:00:00.000
+        startDate: 2021-07-09T00:00:00.000
+#        startDate: 2021-04-08T00:00:00.000
        # endDate: 2021-04-27T00:00:00.000
         limitPerSensor: 300
 
@@ -38,10 +38,10 @@ settings:
 
         allowedStation:
             # eui:
-            "8CF9574000000948":
-            "8CF95740000008AE":
-#            "086BD7D4B501":    # not new data at Azure (up to date at SensLog)
-#            "90FD9FA5F420":    # not registered yet
+           # "8CF9574000000948":
+           # "8CF95740000008AE":
+            "086BD7D4B501":    # not new data at Azure (up to date at SensLog)
+           # "90FD9FA5F420":    # not registered yet
 
         
     - SenslogV1:

+ 5 - 3
config/senslog1AFarCloud.yaml

@@ -7,7 +7,7 @@ settings:
         api: &apiDomain
             domain: "https://sensor.lesprojekt.cz/DBServiceST"
 
-        startDate: 2021-09-04T00:00:00+02:00
+        startDate: 2020-00-00T00:00:00+02:00
        # startDate: 2020-09-10T00:00:00.000
        # endDate: 2021-04-27T00:00:00.000
         
@@ -26,8 +26,10 @@ settings:
 
         allowedStation:
             # station_id: [sensor_id]
-             "10002222": [340020000, 410010000, 560030000]
-             "10002376": [340020000, 410010000, 560030000]
+             "20062496": [340470000, 590030000, 600030000]
+             "20046337": [340470000, 590030000, 600030000]
+            # "10002222": [340020000, 410010000, 560030000]
+            # "10002376": [340020000, 410010000, 560030000]
             # "1305167562287832": [340420000, 410180000, 360200000, 460090000, 470160000, 470180000, 480080000, 620030000]
             # "1305167561991327": [340380097, 410150097, 360200000, 780010097]
             # "1305167562028072": [340380097, 410150097, 360200000, 780010097]

+ 26 - 0
connector-model/src/main/java/cz/senslog/connector/model/converter/AFarCloudUnitSensorConverter.java

@@ -24,6 +24,32 @@ public final class AFarCloudUnitSensorConverter {
     }
 
     static {
+        // 20046337L
+        ReverseMap<Long, String> sensors = new ReverseMap<>();
+
+        sensors.put(340470000L, "rumen_temperature");
+        sensors.put(590030000L, "pH");
+        sensors.put(600030000L, "orp");
+
+        register(20046337L, "200463370", sensors,
+                new AFarCloudUnitProperties(SENSOR)
+        );
+    }
+
+    static {
+        // 20062496L
+        ReverseMap<Long, String> sensors = new ReverseMap<>();
+
+        sensors.put(340470000L, "rumen_temperature");
+        sensors.put(590030000L, "pH");
+        sensors.put(600030000L, "orp");
+
+        register(20062496L, "200624960", sensors,
+                new AFarCloudUnitProperties(SENSOR)
+        );
+    }
+
+    static {
         // 10002376L
         ReverseMap<Long, String> sensors = new ReverseMap<>();