From 36dfdf568e80cc6c3dab689bb65224e68a8752b1 Mon Sep 17 00:00:00 2001
From: deadprogram <ron@hybridgroup.com>
Date: Sun, 8 Jan 2023 19:41:52 +0100
Subject: [PATCH] examples: move atcmd into lorawan

Signed-off-by: deadprogram <ron@hybridgroup.com>
---
 examples/lora/atcmd/radio.go                  | 22 -------------------
 examples/lora/{ => lorawan}/atcmd/README.md   |  0
 examples/lora/{ => lorawan}/atcmd/commands.go |  0
 examples/lora/{ => lorawan}/atcmd/main.go     |  8 ++++++-
 examples/lora/{ => lorawan}/atcmd/parser.go   |  0
 examples/lora/lorawan/atcmd/radio.go          | 10 +++++++++
 examples/lora/{ => lorawan}/atcmd/sim.go      |  4 +++-
 examples/lora/{ => lorawan}/atcmd/sx126x.go   |  2 +-
 examples/lora/{ => lorawan}/atcmd/sx127x.go   |  2 +-
 examples/lora/{ => lorawan}/atcmd/version.go  |  0
 examples/lora/{ => lorawan}/atcmd/wl55jc.go   |  0
 11 files changed, 22 insertions(+), 26 deletions(-)
 delete mode 100644 examples/lora/atcmd/radio.go
 rename examples/lora/{ => lorawan}/atcmd/README.md (100%)
 rename examples/lora/{ => lorawan}/atcmd/commands.go (100%)
 rename examples/lora/{ => lorawan}/atcmd/main.go (90%)
 rename examples/lora/{ => lorawan}/atcmd/parser.go (100%)
 create mode 100644 examples/lora/lorawan/atcmd/radio.go
 rename examples/lora/{ => lorawan}/atcmd/sim.go (91%)
 rename examples/lora/{ => lorawan}/atcmd/sx126x.go (97%)
 rename examples/lora/{ => lorawan}/atcmd/sx127x.go (98%)
 rename examples/lora/{ => lorawan}/atcmd/version.go (100%)
 rename examples/lora/{ => lorawan}/atcmd/wl55jc.go (100%)

diff --git a/examples/lora/atcmd/radio.go b/examples/lora/atcmd/radio.go
deleted file mode 100644
index 340f817..0000000
--- a/examples/lora/atcmd/radio.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package main
-
-import (
-	"errors"
-)
-
-var (
-	errRadioNotFound = errors.New("radio not found")
-	errRxTimeout     = errors.New("radio RX timeout")
-)
-
-type LoraRadio interface {
-	Reset()
-	Tx(pkt []uint8, timeoutMs uint32) error
-	Rx(timeoutMs uint32) ([]uint8, error)
-	SetFrequency(freq uint32)
-	SetIqMode(mode uint8)
-	SetCodingRate(cr uint8)
-	SetBandwidth(bw uint8)
-	SetCrc(enable bool)
-	SetSpreadingFactor(sf uint8)
-}
diff --git a/examples/lora/atcmd/README.md b/examples/lora/lorawan/atcmd/README.md
similarity index 100%
rename from examples/lora/atcmd/README.md
rename to examples/lora/lorawan/atcmd/README.md
diff --git a/examples/lora/atcmd/commands.go b/examples/lora/lorawan/atcmd/commands.go
similarity index 100%
rename from examples/lora/atcmd/commands.go
rename to examples/lora/lorawan/atcmd/commands.go
diff --git a/examples/lora/atcmd/main.go b/examples/lora/lorawan/atcmd/main.go
similarity index 90%
rename from examples/lora/atcmd/main.go
rename to examples/lora/lorawan/atcmd/main.go
index 2f53840..c0d24d2 100644
--- a/examples/lora/atcmd/main.go
+++ b/examples/lora/lorawan/atcmd/main.go
@@ -11,6 +11,9 @@ package main
 import (
 	"machine"
 	"time"
+
+	"tinygo.org/x/drivers/lora"
+	"tinygo.org/x/drivers/lora/lorawan"
 )
 
 // change these to test a different UART or pins if available
@@ -20,7 +23,10 @@ var (
 	rx    = machine.UART_RX_PIN
 	input = make([]byte, 0, 64)
 
-	radio          LoraRadio
+	radio   lora.Radio
+	session *lorawan.Session
+	otaa    *lorawan.Otaa
+
 	defaultTimeout uint32 = 1000
 )
 
diff --git a/examples/lora/atcmd/parser.go b/examples/lora/lorawan/atcmd/parser.go
similarity index 100%
rename from examples/lora/atcmd/parser.go
rename to examples/lora/lorawan/atcmd/parser.go
diff --git a/examples/lora/lorawan/atcmd/radio.go b/examples/lora/lorawan/atcmd/radio.go
new file mode 100644
index 0000000..92b37eb
--- /dev/null
+++ b/examples/lora/lorawan/atcmd/radio.go
@@ -0,0 +1,10 @@
+package main
+
+import (
+	"errors"
+)
+
+var (
+	errRadioNotFound = errors.New("radio not found")
+	errRxTimeout     = errors.New("radio RX timeout")
+)
diff --git a/examples/lora/atcmd/sim.go b/examples/lora/lorawan/atcmd/sim.go
similarity index 91%
rename from examples/lora/atcmd/sim.go
rename to examples/lora/lorawan/atcmd/sim.go
index 93934d3..7006d97 100644
--- a/examples/lora/atcmd/sim.go
+++ b/examples/lora/lorawan/atcmd/sim.go
@@ -2,8 +2,10 @@
 
 package main
 
+import "tinygo.org/x/drivers/lora"
+
 // do simulator setup here
-func setupLora() (LoraRadio, error) {
+func setupLora() (lora.Radio, error) {
 	return &SimLoraRadio{}, nil
 }
 
diff --git a/examples/lora/atcmd/sx126x.go b/examples/lora/lorawan/atcmd/sx126x.go
similarity index 97%
rename from examples/lora/atcmd/sx126x.go
rename to examples/lora/lorawan/atcmd/sx126x.go
index 83dcbb5..abccdd8 100644
--- a/examples/lora/atcmd/sx126x.go
+++ b/examples/lora/lorawan/atcmd/sx126x.go
@@ -24,7 +24,7 @@ var (
 )
 
 // do sx126x setup here
-func setupLora() (LoraRadio, error) {
+func setupLora() (lora.Radio, error) {
 	loraRadio = sx126x.New(machine.SPI3)
 	loraRadio.SetDeviceType(sx126x.DEVICE_TYPE_SX1262)
 
diff --git a/examples/lora/atcmd/sx127x.go b/examples/lora/lorawan/atcmd/sx127x.go
similarity index 98%
rename from examples/lora/atcmd/sx127x.go
rename to examples/lora/lorawan/atcmd/sx127x.go
index dd5a7de..d1d45d2 100644
--- a/examples/lora/atcmd/sx127x.go
+++ b/examples/lora/lorawan/atcmd/sx127x.go
@@ -28,7 +28,7 @@ var (
 )
 
 // do sx127x setup here
-func setupLora() (LoraRadio, error) {
+func setupLora() (lora.Radio, error) {
 	rstPin.Configure(machine.PinConfig{Mode: machine.PinOutput})
 	csPin.Configure(machine.PinConfig{Mode: machine.PinOutput})
 	dio0Pin.Configure(machine.PinConfig{Mode: machine.PinInputPullup})
diff --git a/examples/lora/atcmd/version.go b/examples/lora/lorawan/atcmd/version.go
similarity index 100%
rename from examples/lora/atcmd/version.go
rename to examples/lora/lorawan/atcmd/version.go
diff --git a/examples/lora/atcmd/wl55jc.go b/examples/lora/lorawan/atcmd/wl55jc.go
similarity index 100%
rename from examples/lora/atcmd/wl55jc.go
rename to examples/lora/lorawan/atcmd/wl55jc.go