Merge pull request #166 from phifogg/dev

0.10.4 update
phifogg · May 28, 2023 · fce4bec · fce4bec
2 parents 50922dd + 4222781
commit fce4bec
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 8 deletions.
diff --git a/.github/workflows/test_and_release.yml b/.github/workflows/test_and_release.yml
@@ -35,7 +35,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 18.x]
+        node-version: [16.x, 18.x]
         os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Fogg <foggch@gmail.com>
+Copyright (c) 2023 Fogg <foggch@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -137,7 +137,7 @@ Lisa for her [code to translate wind degrees in a heading](https://www.programmi
 ## License
 MIT License
 
-Copyright (c) 2022 Fogg <foggch@gmail.com>
+Copyright (c) 2023 Fogg <foggch@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/io-package.json b/io-package.json
@@ -1,8 +1,12 @@
 {
     "common": {
         "name": "sainlogic",
-        "version": "0.10.3",
+        "version": "0.10.4",
         "news": {
+          "0.10.4": {
+            "en": "Bugfix for lightning count, new battery states for additional sensors",
+            "de": "Fehlerbehebung für Lightning Count, neue Batterie-Datenpunkte für weitere Sensoren"
+          },
           "0.10.3": {
             "en": "Bugfixes last listener update at Ecowitt and forwarder",
             "de": "Fehlerbehebungen last listener update und forwarder bei Ecowitt"

diff --git a/lib/constants.js b/lib/constants.js
@@ -1230,6 +1230,23 @@ const DATAFIELDS = [
         listener_conversion: null,
         scheduler_conversion: null
     },
+    {
+        id: 'wh26batt',
+        channels: [{
+            channel: 'weather.info',
+            name: 'WH26 Battery Voltage'
+        }],
+        type: 'number',
+        unit: 'V',
+        role: 'value.voltage',
+        min: 0,
+        max: 24,
+        wunderground: '^wh26batt([0-9])*',
+        ecowitt: '^wh26batt([0-9])*',
+        scheduler: null,
+        listener_conversion: null,
+        scheduler_conversion: null
+    },
     {
         id: 'tf_ch',
         channels: [{
@@ -1274,6 +1291,23 @@ const DATAFIELDS = [
         listener_conversion: null,
         scheduler_conversion: null
     },
+    {
+        id: 'batt1',
+        channels: [{
+            channel: 'weather.info',
+            name: 'External sensor battery'
+        }],
+        type: 'number',
+        unit: 'V',
+        role: 'value.voltage',
+        min: 0,
+        max: 24,
+        wunderground: '^batt([0-9])*',
+        ecowitt: '^batt([0-9])*',
+        scheduler: null,
+        listener_conversion: null,
+        scheduler_conversion: null
+    },
     {
         id: 'tf_co2',
         channels: [{
@@ -1461,7 +1495,7 @@ const DATAFIELDS = [
         unit: 'km',
         role: 'value',
         wunderground: null,
-        ecowitt: 'lightning',
+        ecowitt: 'lightning$',
         scheduler: null,
         listener_conversion: null,
         scheduler_conversion: null

diff --git a/lib/listener.js b/lib/listener.js
@@ -114,8 +114,8 @@ class Listener {
                                 const fwd_url = new URL(this.forward_url);
 
                                 got(fwd_url, { method: 'POST', retry:  {limit: 0} , body: my_body }).then(got_response => {
-                                    this.adapter.log.info(got_response.body.url);
-                                    this.adapter.log.info(got_response.body.explanation);
+                                    this.adapter.log.info('Forward URL: + ' + got_response.requestUrl);
+                                    this.adapter.log.info('Forward response body: ' + got_response.body);
                                 }).catch(error => {
                                     this.adapter.log.info(error);
                                 });

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iobroker.sainlogic",
-  "version": "0.10.3",
+  "version": "0.10.4",
   "description": "Read data from a sainlogic based weather station",
   "author": {
     "name": "Daniel Draes",