Add LORA message

Author: addshore

src/devices/zcard.toit

@@ -21,7 +21,7 @@ ZCARD-MESSAGES := [
     BatteryStatus.MT,
     AlarmControl.MT,
     LinkControl.MT,
-    1004, // LORA
+    Lora.MT,
     PresetPage.MT,
     TextPage.MT,
     MenuPage.MT,

src/messages/m1004-lora.toit

@@ -0,0 +1,96 @@
+import ..protocol as protocol
+
+class Lora extends protocol.Data:
+  static MT := 1004
+  static PAYLOAD := 2
+  static SPREAD_FACTOR := 4
+  static CODING_RATE := 5
+  static BANDWIDTH := 6
+  static CENTER_FREQUENCY := 7
+  static TX_POWER := 8
+  static PREAMBLE_LENGTH := 9
+  static RECEIVE_MS := 10
+  static SLEEP := 11
+  static STATE := 12
+
+  static setMsg --spreadFactor/int --codingRate/int --bandwidth/int --centerFrequency/int --txPower/int --preambleLength/int --sleep/int?=null -> protocol.Message:
+    msg := protocol.Message MT
+    msg.data.addDataUint8 SPREAD_FACTOR spreadFactor
+    msg.data.addDataUint8 CODING_RATE codingRate
+    msg.data.addDataUint8 BANDWIDTH bandwidth
+    msg.data.addDataUint32 CENTER_FREQUENCY centerFrequency
+    msg.data.addDataUint8 TX_POWER txPower
+    msg.data.addDataUint8 PREAMBLE_LENGTH preambleLength
+    if sleep:
+      msg.data.addDataUint8 SLEEP sleep
+    msg.header.data.addDataUint8 protocol.Header.TYPE_MESSAGE_METHOD protocol.Header.METHOD_SET
+    return msg
+
+  static getMsg -> protocol.Message:
+    msg := protocol.Message MT
+    msg.header.data.addDataUint8 protocol.Header.TYPE_MESSAGE_METHOD protocol.Header.METHOD_GET
+    return msg
+  
+  static doMsg --payload/ByteArray --receiveMs/int -> protocol.Message:
+    msg := protocol.Message MT
+    msg.data.addData PAYLOAD payload
+    msg.data.addDataUint32 RECEIVE_MS receiveMs
+    msg.header.data.addDataUint8 protocol.Header.TYPE_MESSAGE_METHOD protocol.Header.METHOD_DO
+    return msg
+  
+  static subscribeMsg -> protocol.Message:
+    msg := protocol.Message MT
+    msg.header.data.addDataUint8 protocol.Header.TYPE_MESSAGE_METHOD protocol.Header.METHOD_SUBSCRIBE
+    return msg
+  
+  static unsubscribeMsg -> protocol.Message:
+    msg := protocol.Message MT
+    msg.header.data.addDataUint8 protocol.Header.TYPE_MESSAGE_METHOD protocol.Header.METHOD_UNSUBSCRIBE
+    return msg
+
+  constructor.fromData data/protocol.Data:
+    super.fromData data
+
+  payload -> ByteArray:
+    return getData PAYLOAD
+
+  spreadFactor -> int:
+    return getDataUint8 SPREAD_FACTOR
+
+  codingRate -> int:
+    return getDataUint8 CODING_RATE
+
+  bandwidth -> int:
+    return getDataUint8 BANDWIDTH
+
+  centerFrequency -> int:
+    return getDataUint32 CENTER_FREQUENCY
+
+  txPower -> int:
+    return getDataUint8 TX_POWER
+
+  preambleLength -> int:
+    return getDataUint8 PREAMBLE_LENGTH
+
+  receiveMs -> int:
+    return getDataUint32 RECEIVE_MS
+
+  sleep -> int:
+    return getDataUint8 SLEEP
+
+  state -> int:
+    return getDataUint STATE
+
+  stringify -> string:
+    return {
+      "Payload": payload,
+      "Spread Factor": spreadFactor,
+      "Coding Rate": codingRate,
+      "Bandwidth": bandwidth,
+      "Center Frequency": centerFrequency,
+      "TX Power": txPower,
+      "Preamble Length": preambleLength,
+      "Receive Ms": receiveMs,
+      "Sleep": sleep,
+      "State": state,
+    }.stringify

src/messages/messages.toit

@@ -16,6 +16,7 @@ import .m43-battery-status show BatteryStatus
 import .m44-pressure show Pressure
 import .m45-alarm-control show AlarmControl
 import .m50-link-control show LinkControl
+import .m1004-lora show Lora
 import .m10008-preset-page show PresetPage
 import .m10009-text-page show TextPage
 import .m10010-menu-page show MenuPage

src/protocol/Header.toit

@@ -48,6 +48,7 @@ class Header:
   static METHOD_GET /int ::= 2
   static METHOD_SUBSCRIBE /int ::= 3
   static METHOD_DO /int ::= 4
+  static METHOD_UNSUBSCRIBE /int ::= 5
 
   messageLength_ /int := 0
   messageType_ /int := 0

src/services/httpmsg/msgs.toit

@@ -41,10 +41,10 @@ sample-messages := {
         "Duration 0": (messages.AlarmControl.doMsg --duration=0).bytesForProtocol,
         "3s pattern 4 intensity 1": (messages.AlarmControl.doMsg --duration=3 --buzzerPattern=4 --buzzerIntensity=1).bytesForProtocol,
     },
-    "1004 LORA": {
-      "Transmit": #[0X03, 0X18, 0X00, 0XEC, 0X03, 0X01, 0X00, 0X05, 0X01, 0X04, 0X02, 0X00, 0X02, 0X0A, 0X04, 0X6C, 0X62, 0X6C, 0X62, 0X02, 0X10, 0X27, 0X80, 0X55],
-      "Subscribe": #[0X03, 0X0E, 0X00, 0XEC, 0X03, 0X01, 0X00, 0X05, 0X01, 0X03, 0X00, 0X00, 0XC5, 0XD8],
-      "Unsubscribe": #[0X03, 0X0E, 0X00, 0XEC, 0X03, 0X01, 0X00, 0X05, 0X01, 0X05, 0X00, 0X00, 0X65, 0X6A],
+    "$(messages.Lora.MT) LORA": {
+      "Transmit lblb, receive 5s": (messages.Lora.doMsg --payload="lblb".to-byte-array --receiveMs=5000).bytesForProtocol,
+      "Subscribe": (messages.Lora.subscribeMsg).bytesForProtocol,
+      "Unsubscribe": (messages.Lora.unsubscribeMsg).bytesForProtocol,
     },
     // "GSM": {
     //     "SET Normal mode": #[0x03, 0x17, 0x00, 0x31, 0x00, 0x01, 0x00, 0x05, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x75, 0x30],