Update README.md

BirdySlimDocumentation.md

@@ -1,6 +1,8 @@
 ## Some more Info about the Birdy Slim (IoT) Pager
 
 
+- OTA Time "#ZEIT=hhmmDDMMYY#ZEIT=hhmmDDMMYY"
+
 - first 5 Characters of a Message can be used a MessageID, IF enabled per SubRIC
 ![image](https://user-images.githubusercontent.com/63829136/111872229-0ceaae00-898e-11eb-84d0-abfec9250c6b.png)
 

README.md

@@ -5,16 +5,22 @@ Smartpager.network aims to provide a fully featured and modular Paging Framework
 [W.I.P Application Flow](https://github.com/smartpager-network/smartpager-network.github.io/blob/master/Basisfunctionaliteit%20SmartpagerNetwork.pdf)
 
 Planned Features:
-- Menu Systems (only for Duplex Pagers like the Birdy Slim IoT)
+- Menu Systems (only for Duplex Pagers like the Birdy Slim IoT
-- Acknowledgement for Messages (only for Duplex Pagers like the Birdy Slim IoT)
-- Message Routing Modes (sensible Messages over LoRaWAN, anything else over POCSAG)
 - Integration/Compatibility with DAPNET
 - Many Message Ingress Modules, like bunq.com-Notifications, E-Mail, Telegram, etc..
 
+Working Features:
+- Acknowledgement for Messages (only for Duplex Pagers like the Birdy Slim IoT)
+- Device States( Birdy Slim IoT: GPSLocation, BatteryLevel, etc...)
+- Message Routing Modes
+
+#### How to Setup LoRaWAN for the Birdy Slim IoT
+- W.I.P
+- 
 #### Working Modules
-- [dispatcher-daemon](https://github.com/smartpager-network/pager-daemon) (This Piece of Software will handle Multipath-Routing and Responses)
+- [dispatcher-daemon](https://github.com/smartpager-network/pager-daemon) (This Piece of Software will handle Multipath-Routing and Responses) (LORAWAN included)
+- [msg-email](https://github.com/smartpager-network/msg-email) - Creates Notifications for new, unread received emails(IMAP).
 - [pocsag-connector](https://github.com/smartpager-network/pocsag-connector) ( works with the RFM69 or any other SX1231-Chipset Transceiver )
-- [msg-email](https://github.com/smartpager-network/msg-email) - Creates Notifications for new, unread received emails.
 
 #### Planned Modules
 - msg-bunq
@@ -24,9 +30,6 @@ Planned Features:
 - msg-prometheus-alerts
 - msg-telegram-bot-input
 
-#### W.I.P
-- [lorawan-connector](https://github.com/smartpager-network/lorawan-connector) ( waiting for Birdy Slim IoT Pager to arrive )
-
 # Some interesting Documentation about...
 - the [Birdy Slim Pager](https://github.com/smartpager-network/smartpager-network.github.io/blob/master/BirdySlimDocumentation.md)
-- the [Birdy Slim IoT LORAWAN Payload Foramtter](https://github.com/smartpager-network/smartpager-network.github.io/blob/master/birdy-slim-iot/payload-formatters/testing.md)
+- the [Birdy Slim IoT LORAWAN Payload Formatter](https://github.com/smartpager-network/smartpager-network.github.io/blob/master/birdy-slim-iot/payload-formatters/testing.md)

birdy-slim-iot/payload-formatters/testing.md

@@ -1,12 +1,14 @@
 # Settings for Birdy Slim IoT, WITH enabled GPS
 
-# LoRa Settings
+## LoRa Settings
 ![image](https://user-images.githubusercontent.com/63829136/112874430-3c529680-90c3-11eb-9dea-8d6a093f49bf.png)
 
-# GPS
+
+## GPS
 ![image](https://user-images.githubusercontent.com/63829136/112874465-496f8580-90c3-11eb-8556-88822839a6e4.png)
 
-# Acknowledgements
+
+## Acknowledgements
 
 select Format HEX, then use the small Helper Button on the right side of the Textbox
 
@@ -25,20 +27,33 @@ if wanted, you can configure Operational ACK
 
 If you want to use future Menu Systems, make sure to just give them a Number(options are declared inside the Message itself)
 
-# Messages "on/off" and OTA Status
+
+## Messages "on/off" and OTA Status
 
 ![image](https://user-images.githubusercontent.com/63829136/112875253-3f9a5200-90c4-11eb-86a2-47e93bca5f40.png)
 
-# Battery and chare device messages
+
+## Battery and chare device messages
 
 ![image](https://user-images.githubusercontent.com/63829136/112875298-4e810480-90c4-11eb-8930-ab5b1ac54495.png)
 
 
-# SOS
+## Canned Messages
+
+![image](https://user-images.githubusercontent.com/63829136/112876107-5d1beb80-90c5-11eb-8c79-eedb5fa3cc65.png)
+
+
+## Statuses
+
+![image](https://user-images.githubusercontent.com/63829136/113031194-ae43e200-918e-11eb-82f6-86ffe7e5cffb.png)
+
+
+## SOS
 
 ![image](https://user-images.githubusercontent.com/63829136/112875123-0feb4a00-90c4-11eb-9361-191e80d05fed.png)
 
-# Lone Worker
+
+## Lone Worker
 
 ![image](https://user-images.githubusercontent.com/63829136/112875216-3315f980-90c4-11eb-9323-037c80d7fe75.png)
 

birdy-slim-iot/payload-formatters/testing.ttnv2.js

@@ -1,5 +1,4 @@
-// This is for TTNv2 (deprecated)
+
-// configured for having no Choice of Recipient for CannedMessages
 function Decoder(bytes, port) {
   var data = {}
   function bytesToString(a) {
@@ -25,14 +24,36 @@ function Decoder(bytes, port) {
       }
       break;
     case 3: // Status & Canned Messages
+      // Canned Message '01' --- '05', single Hex Number, incrementing
+      // Status '<StatusIncrID>|Z|' or if no CenterSelection '<StatusIncrID>00'
       
+      if (bytes.length == 1) {
+        data.type = 'cannedMessage'
+        data.cannedMessage = bytes[0] * 1
+      } else {
+        data.type = 'status'
+        data.status = bytes[0] * 1
+        data.selection = bytes[1] * 1
+      }
       break;
-    case '4': // Battery and Power Notifications
+    case 4: // Battery and Power Notifications
       // Startup 'FF'
       // Shutdown 'EE'
       // Low Battery 'FD'
       // ChargingOn '|V|CC'
       // ChargingOff'|V|BB'
+      if (bytes.length == 1) {
+        data.type = 'power'
+        if (bytes[0] >= 0xEE) {
+          data.poweredOn =  bytes[0]== 0xFF
+        }
+        if (bytes[0] == 0xFD) {
+          data.type = 'low_battery'
+        }
+      } else {
+        data.battery = bytes[0] * 1
+        data.isCharging = bytes[1] == 0xCC
+      }
       break;
     case 5:  // OTAStatus + LoneWorker/SOS Trigger +  GPS Tracking Port '|G|'
       // GPS Tracking '|G|'