From 49b390f7bc140b1c41316921cb6f3e1999d82dca Mon Sep 17 00:00:00 2001
From: deadprogram <ron@hybridgroup.com>
Date: Sun, 8 Jan 2023 23:46:39 +0100
Subject: [PATCH] examples: lorawan atcmd able to join

Signed-off-by: deadprogram <ron@hybridgroup.com>
---
 examples/lora/lorawan/atcmd/commands.go | 89 ++++++++++++++++++++++---
 examples/lora/lorawan/atcmd/main.go     |  4 ++
 examples/lora/lorawan/atcmd/sx127x.go   |  4 +-
 3 files changed, 84 insertions(+), 13 deletions(-)

diff --git a/examples/lora/lorawan/atcmd/commands.go b/examples/lora/lorawan/atcmd/commands.go
index 1126fdb..3584b68 100644
--- a/examples/lora/lorawan/atcmd/commands.go
+++ b/examples/lora/lorawan/atcmd/commands.go
@@ -3,6 +3,8 @@ package main
 import (
 	"encoding/hex"
 	"strings"
+
+	"tinygo.org/x/drivers/lora/lorawan"
 )
 
 // Use to test if connection to module is OK.
@@ -23,13 +25,42 @@ func id(args string) error {
 	param, val, hasComma := strings.Cut(args, ",")
 	if hasComma {
 		// set
+		data := strings.Trim(val, "\"'")
+
+		// convert data from hex formatted string
+		data = strings.ReplaceAll(data, " ", "")
+		hexdata, err := hex.DecodeString(data)
+		if err != nil {
+			writeCommandOutput(cmd, err.Error())
+
+			return err
+		}
+
 		switch param {
 		case "DevAddr":
-			writeCommandOutput(cmd, "DevAddr, "+val)
+			if err := session.SetDevAddr(hexdata); err != nil {
+				writeCommandOutput(cmd, err.Error())
+
+				return err
+			}
+
+			writeCommandOutput(cmd, "DevAddr, "+session.GetDevAddr())
 		case "DevEui":
-			writeCommandOutput(cmd, "DevEui, "+val)
+			if err := otaa.SetDevEUI(hexdata); err != nil {
+				writeCommandOutput(cmd, err.Error())
+
+				return err
+			}
+
+			writeCommandOutput(cmd, "DevEui, "+otaa.GetDevEUI())
 		case "AppEui":
-			writeCommandOutput(cmd, "AppEui, "+val)
+			if err := otaa.SetAppEUI(hexdata); err != nil {
+				writeCommandOutput(cmd, err.Error())
+
+				return err
+			}
+
+			writeCommandOutput(cmd, "AppEui, "+otaa.GetAppEUI())
 		default:
 			return errInvalidCommand
 		}
@@ -40,15 +71,15 @@ func id(args string) error {
 	// get
 	switch param {
 	case "DevAddr":
-		writeCommandOutput(cmd, "DevAddr, xx:xx:xx:xx")
+		writeCommandOutput(cmd, "DevAddr, "+session.GetDevAddr())
 	case "DevEui":
-		writeCommandOutput(cmd, "DevEui, xx:xx:xx:xx:xx:xx:xx:xx")
+		writeCommandOutput(cmd, "DevEui, "+otaa.GetDevEUI())
 	case "AppEui":
-		writeCommandOutput(cmd, "AppEui, xx:xx:xx:xx:xx:xx:xx:xx")
+		writeCommandOutput(cmd, "AppEui, "+otaa.GetAppEUI())
 	default:
-		writeCommandOutput(cmd, "DevAddr, xx:xx:xx:xx")
-		writeCommandOutput(cmd, "DevEui, xx:xx:xx:xx:xx:xx:xx:xx")
-		writeCommandOutput(cmd, "AppEui, xx:xx:xx:xx:xx:xx:xx:xx")
+		writeCommandOutput(cmd, "DevAddr, "+session.GetDevAddr())
+		writeCommandOutput(cmd, "DevEui, "+otaa.GetDevEUI())
+		writeCommandOutput(cmd, "AppEui, "+otaa.GetAppEUI())
 	}
 
 	return nil
@@ -208,9 +239,38 @@ func rxwin1(setting string) error {
 
 func key(setting string) error {
 	cmd := "KEY"
-	writeCommandOutput(cmd, setting)
 
-	return nil
+	// look for comma in args
+	param, val, hasComma := strings.Cut(setting, ",")
+	if hasComma {
+		// set
+		data := strings.Trim(val, "\"'")
+
+		// convert data from hex formatted string
+		data = strings.ReplaceAll(data, " ", "")
+		hexdata, err := hex.DecodeString(data)
+		if err != nil {
+			writeCommandOutput(cmd, err.Error())
+
+			return err
+		}
+
+		switch param {
+		case "APPKEY":
+			if err := otaa.SetAppKey(hexdata); err != nil {
+				writeCommandOutput(cmd, err.Error())
+
+				return err
+			}
+
+			writeCommandOutput(cmd, "APPKEY, "+otaa.GetAppKey())
+		default:
+			return errInvalidCommand
+		}
+	}
+
+	// cannot get keys
+	return errInvalidCommand
 }
 
 func fdefault(setting string) error {
@@ -230,7 +290,14 @@ func mode(setting string) error {
 func join(setting string) error {
 	cmd := "JOIN"
 	writeCommandOutput(cmd, "Starting")
+	if err := lorawan.Join(otaa, session); err != nil {
+		writeCommandOutput(cmd, err.Error())
 
+		return err
+	}
+
+	writeCommandOutput(cmd, "Network joined")
+	// TODO: display NetID and DevAddr
 	writeCommandOutput(cmd, "Done")
 	return nil
 }
diff --git a/examples/lora/lorawan/atcmd/main.go b/examples/lora/lorawan/atcmd/main.go
index c0d24d2..cb0535e 100644
--- a/examples/lora/lorawan/atcmd/main.go
+++ b/examples/lora/lorawan/atcmd/main.go
@@ -39,6 +39,10 @@ func main() {
 		fail(err.Error())
 	}
 
+	session = &lorawan.Session{}
+	otaa = &lorawan.Otaa{}
+	lorawan.UseRadio(radio)
+
 	for {
 		if uart.Buffered() > 0 {
 			data, _ := uart.ReadByte()
diff --git a/examples/lora/lorawan/atcmd/sx127x.go b/examples/lora/lorawan/atcmd/sx127x.go
index d1d45d2..79018c6 100644
--- a/examples/lora/lorawan/atcmd/sx127x.go
+++ b/examples/lora/lorawan/atcmd/sx127x.go
@@ -55,14 +55,14 @@ func setupLora() (lora.Radio, error) {
 	// Prepare for Lora Operation
 	loraConf := lora.Config{
 		Freq:           FREQ,
-		Bw:             lora.Bandwidth_500_0,
+		Bw:             lora.Bandwidth_125_0,
 		Sf:             lora.SpreadingFactor9,
 		Cr:             lora.CodingRate4_7,
 		HeaderType:     lora.HeaderExplicit,
 		Preamble:       12,
 		Iq:             lora.IQStandard,
 		Crc:            lora.CRCOn,
-		SyncWord:       lora.SyncPrivate,
+		SyncWord:       lora.SyncPublic,
 		LoraTxPowerDBm: 20,
 	}