From 74a373f895ac0f6457a102e5dc638ce3c9358762 Mon Sep 17 00:00:00 2001 From: MaMe82 Date: Fri, 7 Dec 2018 00:59:54 +0100 Subject: [PATCH] Minor fixes for alpha2 --- Makefile | 4 +- cli_client/cmd_hid.go | 4 +- cli_client/cmd_led.go | 2 +- cli_client/cmd_net.go | 6 +- cli_client/cmd_root.go | 2 +- cli_client/cmd_template.go | 2 +- cli_client/cmd_usb_new.go | 2 +- cli_client/cmd_wifi.go | 2 +- cli_client/rpc_client.go | 2 +- cmd/P4wnP1_cli/P4wnP1_cli.go | 2 +- cmd/P4wnP1_service/P4wnP1_service.go | 4 +- cmd/testhid/testhid.go | 2 +- common_web/Globals.go | 2 +- dist/db/init.db | Bin 1821 -> 2039 bytes go.mod | 2 +- mgenetlink/client.go | 2 +- mgenetlink/common.go | 2 +- mgenetlink/family.go | 2 +- mgenetlink/mcast_group.go | 2 +- mgenetlink/message.go | 2 +- mgenetlink/ops.go | 2 +- service/Event.go | 6 +- service/SubSysGpio.go | 4 +- service/SubSysLED.go | 2 +- service/SubSysNetworkManager.go | 6 +- service/SubSysTriggerAction.go | 8 +- service/SubSysUSB.go | 6 +- service/bluetooth.go | 10 +- service/bluetooth/controller.go | 4 +- service/defaults.go | 2 +- service/dhcp.go | 4 +- service/dwc2_connect_watcher.go | 6 +- service/led.go | 2 +- service/peripheral/Oled128_64.go | 132 -------------------------- service/rpc_server.go | 8 +- service/service.go | 8 +- service/wifi.go | 8 +- web_client/hvueCompHIDEvents.go | 2 +- web_client/hvueComponentWiFi.go | 2 +- web_client/hvueComponentsBluetooth.go | 2 +- web_client/hvueComponentsNetwork.go | 2 +- web_client/jsDataHandling.go | 4 +- web_client/jsDataTriggerAction.go | 2 +- web_client/main.go | 4 +- web_client/mvuexGlobalState.go | 4 +- web_client/rpcClient.go | 4 +- 46 files changed, 83 insertions(+), 209 deletions(-) delete mode 100644 service/peripheral/Oled128_64.go diff --git a/Makefile b/Makefile index a0dad60..c09bda5 100644 --- a/Makefile +++ b/Makefile @@ -46,13 +46,13 @@ dep: #go get -u github.com/gorilla/websocket compile: - go get -u github.com/mame82/P4wnP1_go/... # partially downloads again, but we need the library packages in go path to build + go get -u github.com/mame82/P4wnP1_aloa/... # partially downloads again, but we need the library packages in go path to build # <--- second compilation, maybe -d flag on go get above is better env GOBIN=$(CURDIR)/build go install ./cmd/... # compile all main packages to the build folder # compile the web app # ToDo: (check if dependencies have been fetched by 'go get', even with the build js tags) - $(HOME)/go/bin/gopherjs get github.com/mame82/P4wnP1_go/web_client/... + $(HOME)/go/bin/gopherjs get github.com/mame82/P4wnP1_aloa/web_client/... $(HOME)/go/bin/gopherjs build -m -o build/webapp.js web_client/*.go installkali: diff --git a/cli_client/cmd_hid.go b/cli_client/cmd_hid.go index 4052bec..ccffe17 100644 --- a/cli_client/cmd_hid.go +++ b/cli_client/cmd_hid.go @@ -2,7 +2,7 @@ package cli_client import ( "context" - "github.com/mame82/P4wnP1_go/common" + "github.com/mame82/P4wnP1_aloa/common" "github.com/spf13/cobra" "fmt" "path/filepath" @@ -13,7 +13,7 @@ import ( "errors" "log" "strconv" - pb "github.com/mame82/P4wnP1_go/proto" + pb "github.com/mame82/P4wnP1_aloa/proto" ) var ( diff --git a/cli_client/cmd_led.go b/cli_client/cmd_led.go index beaf451..8bd5e09 100644 --- a/cli_client/cmd_led.go +++ b/cli_client/cmd_led.go @@ -4,7 +4,7 @@ import ( "github.com/spf13/cobra" "os" - pb "github.com/mame82/P4wnP1_go/proto" + pb "github.com/mame82/P4wnP1_aloa/proto" "fmt" "log" ) diff --git a/cli_client/cmd_net.go b/cli_client/cmd_net.go index 98a8a27..80b22ae 100644 --- a/cli_client/cmd_net.go +++ b/cli_client/cmd_net.go @@ -2,15 +2,15 @@ package cli_client import ( "github.com/spf13/cobra" - pb "github.com/mame82/P4wnP1_go/proto" + pb "github.com/mame82/P4wnP1_aloa/proto" "net" "errors" "fmt" "google.golang.org/grpc/status" - //"github.com/mame82/P4wnP1_go/service" + //"github.com/mame82/P4wnP1_aloa/service" "strings" "strconv" - "github.com/mame82/P4wnP1_go/common_web" + "github.com/mame82/P4wnP1_aloa/common_web" ) //Empty settings used to store cobra flags diff --git a/cli_client/cmd_root.go b/cli_client/cmd_root.go index fac6ce3..4299f9b 100644 --- a/cli_client/cmd_root.go +++ b/cli_client/cmd_root.go @@ -2,7 +2,7 @@ package cli_client import ( "fmt" - "github.com/mame82/P4wnP1_go/common_web" + "github.com/mame82/P4wnP1_aloa/common_web" "os" "github.com/spf13/cobra" diff --git a/cli_client/cmd_template.go b/cli_client/cmd_template.go index e040019..f8d43d1 100644 --- a/cli_client/cmd_template.go +++ b/cli_client/cmd_template.go @@ -2,7 +2,7 @@ package cli_client import ( "fmt" - pb "github.com/mame82/P4wnP1_go/proto" + pb "github.com/mame82/P4wnP1_aloa/proto" "github.com/spf13/cobra" "github.com/spf13/pflag" "os" diff --git a/cli_client/cmd_usb_new.go b/cli_client/cmd_usb_new.go index 2011704..0a7c663 100644 --- a/cli_client/cmd_usb_new.go +++ b/cli_client/cmd_usb_new.go @@ -3,7 +3,7 @@ package cli_client import ( "encoding/json" "fmt" - pb "github.com/mame82/P4wnP1_go/proto" + pb "github.com/mame82/P4wnP1_aloa/proto" "github.com/spf13/cobra" "log" "os" diff --git a/cli_client/cmd_wifi.go b/cli_client/cmd_wifi.go index 753650f..42a721c 100644 --- a/cli_client/cmd_wifi.go +++ b/cli_client/cmd_wifi.go @@ -2,7 +2,7 @@ package cli_client import ( "github.com/spf13/cobra" - pb "github.com/mame82/P4wnP1_go/proto" + pb "github.com/mame82/P4wnP1_aloa/proto" "fmt" "google.golang.org/grpc/status" "os" diff --git a/cli_client/rpc_client.go b/cli_client/rpc_client.go index f3b22b5..900f70c 100644 --- a/cli_client/rpc_client.go +++ b/cli_client/rpc_client.go @@ -2,7 +2,7 @@ package cli_client import ( "fmt" - pb "github.com/mame82/P4wnP1_go/proto" + pb "github.com/mame82/P4wnP1_aloa/proto" "errors" "context" "google.golang.org/grpc" diff --git a/cmd/P4wnP1_cli/P4wnP1_cli.go b/cmd/P4wnP1_cli/P4wnP1_cli.go index 5ad071e..03a6561 100644 --- a/cmd/P4wnP1_cli/P4wnP1_cli.go +++ b/cmd/P4wnP1_cli/P4wnP1_cli.go @@ -1,7 +1,7 @@ package main import ( - "github.com/mame82/P4wnP1_go/cli_client" + "github.com/mame82/P4wnP1_aloa/cli_client" ) func main() { diff --git a/cmd/P4wnP1_service/P4wnP1_service.go b/cmd/P4wnP1_service/P4wnP1_service.go index 46e179b..43840da 100644 --- a/cmd/P4wnP1_service/P4wnP1_service.go +++ b/cmd/P4wnP1_service/P4wnP1_service.go @@ -4,8 +4,8 @@ package main import ( "fmt" - "github.com/mame82/P4wnP1_go/common_web" - "github.com/mame82/P4wnP1_go/service" + "github.com/mame82/P4wnP1_aloa/common_web" + "github.com/mame82/P4wnP1_aloa/service" "log" "os" "os/signal" diff --git a/cmd/testhid/testhid.go b/cmd/testhid/testhid.go index 2638ceb..9cd0933 100644 --- a/cmd/testhid/testhid.go +++ b/cmd/testhid/testhid.go @@ -3,7 +3,7 @@ package main import( - "github.com/mame82/P4wnP1_go/hid" + "github.com/mame82/P4wnP1_aloa/hid" "log" "fmt" diff --git a/common_web/Globals.go b/common_web/Globals.go index eab4017..e8bb12c 100644 --- a/common_web/Globals.go +++ b/common_web/Globals.go @@ -4,6 +4,6 @@ const ( MAJOR = 0 MINOR = 1 PATCH = 0 - SUFFIX = "-alpha1" + SUFFIX = "-alpha2" VERSION = "v0.1.0"+SUFFIX ) diff --git a/dist/db/init.db b/dist/db/init.db index 762f5ca779185ccb90a35f56ea20e1c15c083f33..09442443a071003e478d6d7fbc30e9f8061c1652 100644 GIT binary patch delta 257 zcmbQs_nm)(GfVv?1_ 200*time.Millisecond { - fmt.Printf("%s pressed\n", str) - timeLastEvent = time.Now() - - // send to output channel if needed here - } - //fmt.Printf("%+v\n", pin) - } else { - fmt.Println("Unknown GPIO input") - } - } -} - -func (w *WaveshareOled) Start() (err error) { - err = gpio.Open() - if err != nil { - return - } - - w.pins = make([]*gpio.Pin, len(waveshareRelevantEvents)) - for idx, evtPinNum := range waveshareRelevantEvents { - pin := gpio.NewPin(evtPinNum) - w.pins[idx] = pin - pin.Input() - pin.PullUp() - pin.Watch(gpio.EdgeFalling, w.GetHandler(pin2function[evtPinNum])) - } - return nil -} - -func (w *WaveshareOled) Stop() { - for _, p := range w.pins { - p.Unwatch() - p.PullNone() - } - gpio.Close() -} diff --git a/service/rpc_server.go b/service/rpc_server.go index 3a2930f..8e046db 100644 --- a/service/rpc_server.go +++ b/service/rpc_server.go @@ -7,10 +7,10 @@ import ( "errors" "fmt" "github.com/improbable-eng/grpc-web/go/grpcweb" - "github.com/mame82/P4wnP1_go/common" - "github.com/mame82/P4wnP1_go/common_web" - pb "github.com/mame82/P4wnP1_go/proto" - "github.com/mame82/P4wnP1_go/service/bluetooth" + "github.com/mame82/P4wnP1_aloa/common" + "github.com/mame82/P4wnP1_aloa/common_web" + pb "github.com/mame82/P4wnP1_aloa/proto" + "github.com/mame82/P4wnP1_aloa/service/bluetooth" "golang.org/x/net/context" "google.golang.org/grpc" "io" diff --git a/service/service.go b/service/service.go index d0a6bef..0701ca7 100644 --- a/service/service.go +++ b/service/service.go @@ -5,10 +5,10 @@ package service import ( "context" "fmt" - "github.com/mame82/P4wnP1_go/common" - "github.com/mame82/P4wnP1_go/common_web" - pb "github.com/mame82/P4wnP1_go/proto" - "github.com/mame82/P4wnP1_go/service/datastore" + "github.com/mame82/P4wnP1_aloa/common" + "github.com/mame82/P4wnP1_aloa/common_web" + pb "github.com/mame82/P4wnP1_aloa/proto" + "github.com/mame82/P4wnP1_aloa/service/datastore" "log" "syscall" "time" diff --git a/service/wifi.go b/service/wifi.go index 1eb1f91..072d91b 100644 --- a/service/wifi.go +++ b/service/wifi.go @@ -3,12 +3,12 @@ package service import ( - "github.com/mame82/P4wnP1_go/common_web" - "github.com/mame82/P4wnP1_go/netlink" - pb "github.com/mame82/P4wnP1_go/proto" + "github.com/mame82/P4wnP1_aloa/common_web" + "github.com/mame82/P4wnP1_aloa/netlink" + pb "github.com/mame82/P4wnP1_aloa/proto" "sync" "os/exec" - "github.com/mame82/P4wnP1_go/service/util" + "github.com/mame82/P4wnP1_aloa/service/util" "errors" "fmt" "strings" diff --git a/web_client/hvueCompHIDEvents.go b/web_client/hvueCompHIDEvents.go index e00238e..a1361de 100644 --- a/web_client/hvueCompHIDEvents.go +++ b/web_client/hvueCompHIDEvents.go @@ -4,7 +4,7 @@ package main import ( "github.com/mame82/hvue" - "github.com/mame82/P4wnP1_go/common_web" + "github.com/mame82/P4wnP1_aloa/common_web" "github.com/gopherjs/gopherjs/js" ) diff --git a/web_client/hvueComponentWiFi.go b/web_client/hvueComponentWiFi.go index 235c3ea..dad7f4d 100644 --- a/web_client/hvueComponentWiFi.go +++ b/web_client/hvueComponentWiFi.go @@ -4,7 +4,7 @@ package main import ( "github.com/gopherjs/gopherjs/js" - pb "github.com/mame82/P4wnP1_go/proto/gopherjs" + pb "github.com/mame82/P4wnP1_aloa/proto/gopherjs" "github.com/mame82/hvue" ) diff --git a/web_client/hvueComponentsBluetooth.go b/web_client/hvueComponentsBluetooth.go index e9fc8c4..42d350d 100644 --- a/web_client/hvueComponentsBluetooth.go +++ b/web_client/hvueComponentsBluetooth.go @@ -5,7 +5,7 @@ package main import ( "github.com/gopherjs/gopherjs/js" "github.com/mame82/hvue" - pb "github.com/mame82/P4wnP1_go/proto/gopherjs" + pb "github.com/mame82/P4wnP1_aloa/proto/gopherjs" ) type jsBluetoothRequestSettingsStorage struct { diff --git a/web_client/hvueComponentsNetwork.go b/web_client/hvueComponentsNetwork.go index 0a2a361..f481a09 100644 --- a/web_client/hvueComponentsNetwork.go +++ b/web_client/hvueComponentsNetwork.go @@ -5,7 +5,7 @@ package main import ( //"github.com/mame82/hvue" "github.com/gopherjs/gopherjs/js" - pb "github.com/mame82/P4wnP1_go/proto/gopherjs" + pb "github.com/mame82/P4wnP1_aloa/proto/gopherjs" "github.com/mame82/hvue" ) diff --git a/web_client/jsDataHandling.go b/web_client/jsDataHandling.go index 05ff555..4ec1e0e 100644 --- a/web_client/jsDataHandling.go +++ b/web_client/jsDataHandling.go @@ -5,8 +5,8 @@ package main import ( "errors" "github.com/gopherjs/gopherjs/js" - "github.com/mame82/P4wnP1_go/common_web" - pb "github.com/mame82/P4wnP1_go/proto/gopherjs" + "github.com/mame82/P4wnP1_aloa/common_web" + pb "github.com/mame82/P4wnP1_aloa/proto/gopherjs" "github.com/mame82/hvue" "strconv" ) diff --git a/web_client/jsDataTriggerAction.go b/web_client/jsDataTriggerAction.go index 63f8847..5adbfdc 100644 --- a/web_client/jsDataTriggerAction.go +++ b/web_client/jsDataTriggerAction.go @@ -4,7 +4,7 @@ package main import ( "github.com/gopherjs/gopherjs/js" - pb "github.com/mame82/P4wnP1_go/proto/gopherjs" + pb "github.com/mame82/P4wnP1_aloa/proto/gopherjs" "github.com/mame82/hvue" "strconv" ) diff --git a/web_client/main.go b/web_client/main.go index 1eedea4..f72b7c3 100644 --- a/web_client/main.go +++ b/web_client/main.go @@ -5,7 +5,7 @@ package main import ( // "honnef.co/go/js/dom" "github.com/gopherjs/gopherjs/js" - "github.com/mame82/P4wnP1_go/common_web" + "github.com/mame82/P4wnP1_aloa/common_web" "github.com/mame82/hvue" "github.com/mame82/mvuex" ) @@ -126,7 +126,7 @@ const templateMainApp = ` -
by MaMe82 ` + common_web.VERSION + ` by MaMe82
+
` + common_web.VERSION + ` by MaMe82
 diff --git a/web_client/mvuexGlobalState.go b/web_client/mvuexGlobalState.go index f032caf..5d1bf74 100644 --- a/web_client/mvuexGlobalState.go +++ b/web_client/mvuexGlobalState.go @@ -5,8 +5,8 @@ package main import ( "context" "github.com/gopherjs/gopherjs/js" - "github.com/mame82/P4wnP1_go/common_web" - pb "github.com/mame82/P4wnP1_go/proto/gopherjs" + "github.com/mame82/P4wnP1_aloa/common_web" + pb "github.com/mame82/P4wnP1_aloa/proto/gopherjs" "github.com/mame82/hvue" "github.com/mame82/mvuex" "errors" diff --git a/web_client/rpcClient.go b/web_client/rpcClient.go index 9c54038..c34f29d 100644 --- a/web_client/rpcClient.go +++ b/web_client/rpcClient.go @@ -6,8 +6,8 @@ import ( "context" "errors" "github.com/johanbrandhorst/protobuf/grpcweb" - "github.com/mame82/P4wnP1_go/common_web" - pb "github.com/mame82/P4wnP1_go/proto/gopherjs" + "github.com/mame82/P4wnP1_aloa/common_web" + pb "github.com/mame82/P4wnP1_aloa/proto/gopherjs" "sync" "time" )