Refactor reach package
- Rename reach package to emlid - Create generic Reach websocket client - Add 2 new subpackages 'updater' and 'reachview' to provides specific API
This commit is contained in:
@ -6,7 +6,8 @@ import (
|
||||
"log"
|
||||
"strings"
|
||||
|
||||
"forge.cadoles.com/Pyxis/orion/reach"
|
||||
"forge.cadoles.com/Pyxis/orion/emlid"
|
||||
"forge.cadoles.com/Pyxis/orion/emlid/updater"
|
||||
)
|
||||
|
||||
const (
|
||||
@ -18,7 +19,7 @@ var (
|
||||
phase = phaseConfigureWifi
|
||||
host = "192.168.42.1"
|
||||
ssid = ""
|
||||
security = string(reach.SecurityWPAPSK)
|
||||
security = string(updater.SecurityWPAPSK)
|
||||
password = ""
|
||||
)
|
||||
|
||||
@ -51,20 +52,20 @@ func main() {
|
||||
|
||||
}
|
||||
|
||||
func connect() *reach.Updater {
|
||||
func connect() *updater.Client {
|
||||
|
||||
updater := reach.NewUpdaterClient(
|
||||
reach.WithEndpoint(host, 80),
|
||||
c := updater.NewClient(
|
||||
emlid.WithEndpoint(host, 80),
|
||||
)
|
||||
|
||||
log.Printf("connecting to module '%s'", host)
|
||||
if err := updater.Connect(); err != nil {
|
||||
if err := c.Connect(); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
log.Println("connected")
|
||||
|
||||
return updater
|
||||
return c
|
||||
|
||||
}
|
||||
|
||||
@ -74,11 +75,11 @@ func configureWifi() {
|
||||
log.Fatal("you must provide a WiFi SSID with the -ssid flag")
|
||||
}
|
||||
|
||||
updater := connect()
|
||||
defer updater.Close()
|
||||
c := connect()
|
||||
defer c.Close()
|
||||
|
||||
log.Println("checking module status")
|
||||
results, err := updater.TestResults()
|
||||
results, err := c.TestResults()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
@ -91,7 +92,7 @@ func configureWifi() {
|
||||
|
||||
log.Printf("adding wifi network '%s'", ssid)
|
||||
|
||||
done, err := updater.AddWifiNetwork(ssid, reach.WifiSecurity(security), password)
|
||||
done, err := c.AddWifiNetwork(ssid, updater.WifiSecurity(security), password)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
@ -101,7 +102,7 @@ func configureWifi() {
|
||||
}
|
||||
|
||||
log.Println("connecting module to wifi network")
|
||||
if err := updater.JoinWifiNetwork(ssid, true); err != nil {
|
||||
if err := c.JoinWifiNetwork(ssid, true); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
log.Printf("you can now switch to the wifi network and start phase '%s'", phaseUpdateThenReboot)
|
||||
@ -109,25 +110,26 @@ func configureWifi() {
|
||||
}
|
||||
|
||||
func updateThenReboot() {
|
||||
updater := connect()
|
||||
defer updater.Close()
|
||||
|
||||
c := connect()
|
||||
defer c.Close()
|
||||
|
||||
log.Println("checking time sync")
|
||||
synced, err := updater.TimeSynced()
|
||||
synced, err := c.TimeSynced()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
log.Printf("time synced ? %v", synced)
|
||||
|
||||
log.Println("checking reachview version")
|
||||
version, err := updater.ReachViewVersion()
|
||||
version, err := c.ReachViewVersion()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
log.Printf("reachview version ? '%s'", version)
|
||||
|
||||
log.Println("checking for update")
|
||||
status, err := updater.Update()
|
||||
status, err := c.Update()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
@ -141,7 +143,7 @@ func updateThenReboot() {
|
||||
}
|
||||
|
||||
log.Println("rebooting device")
|
||||
if err := updater.RebootNow(true); err != nil {
|
||||
if err := c.RebootNow(true); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user