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 762f5ca..0944244 100644 Binary files a/dist/db/init.db and b/dist/db/init.db differ diff --git a/go.mod b/go.mod index 29b248f..ba1820d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/mame82/P4wnP1_go +module github.com/mame82/P4wnP1_aloa require ( github.com/AndreasBriese/bbloom v0.0.0-20180913140656-343706a395b7 // indirect diff --git a/mgenetlink/client.go b/mgenetlink/client.go index bbc31db..2f55a77 100644 --- a/mgenetlink/client.go +++ b/mgenetlink/client.go @@ -1,7 +1,7 @@ package mgenetlink import ( - nl "github.com/mame82/P4wnP1_go/mnetlink" + nl "github.com/mame82/P4wnP1_aloa/mnetlink" "errors" "golang.org/x/sys/unix" "log" diff --git a/mgenetlink/common.go b/mgenetlink/common.go index c71cf3e..689c7e0 100644 --- a/mgenetlink/common.go +++ b/mgenetlink/common.go @@ -1,5 +1,5 @@ package mgenetlink -import "github.com/mame82/P4wnP1_go/mnetlink" +import "github.com/mame82/P4wnP1_aloa/mnetlink" var hbo = mnetlink.Hbo() diff --git a/mgenetlink/family.go b/mgenetlink/family.go index 110bc84..d3bf2f8 100644 --- a/mgenetlink/family.go +++ b/mgenetlink/family.go @@ -3,7 +3,7 @@ package mgenetlink import ( "errors" "fmt" - "github.com/mame82/P4wnP1_go/mnetlink" + "github.com/mame82/P4wnP1_aloa/mnetlink" "golang.org/x/sys/unix" ) diff --git a/mgenetlink/mcast_group.go b/mgenetlink/mcast_group.go index d763d07..ef047ae 100644 --- a/mgenetlink/mcast_group.go +++ b/mgenetlink/mcast_group.go @@ -2,7 +2,7 @@ package mgenetlink import ( "fmt" - "github.com/mame82/P4wnP1_go/mnetlink" + "github.com/mame82/P4wnP1_aloa/mnetlink" "errors" "golang.org/x/sys/unix" ) diff --git a/mgenetlink/message.go b/mgenetlink/message.go index 2966bf6..8fcf128 100644 --- a/mgenetlink/message.go +++ b/mgenetlink/message.go @@ -1,7 +1,7 @@ package mgenetlink import ( - "github.com/mame82/P4wnP1_go/mnetlink" + "github.com/mame82/P4wnP1_aloa/mnetlink" "golang.org/x/sys/unix" "errors" ) diff --git a/mgenetlink/ops.go b/mgenetlink/ops.go index d6eb62b..224d020 100644 --- a/mgenetlink/ops.go +++ b/mgenetlink/ops.go @@ -2,7 +2,7 @@ package mgenetlink import ( "fmt" - "github.com/mame82/P4wnP1_go/mnetlink" + "github.com/mame82/P4wnP1_aloa/mnetlink" "golang.org/x/sys/unix" ) diff --git a/service/Event.go b/service/Event.go index c9f1801..03b9d9d 100644 --- a/service/Event.go +++ b/service/Event.go @@ -3,9 +3,9 @@ package service import ( "context" "fmt" - "github.com/mame82/P4wnP1_go/common_web" - "github.com/mame82/P4wnP1_go/hid" - pb "github.com/mame82/P4wnP1_go/proto" + "github.com/mame82/P4wnP1_aloa/common_web" + "github.com/mame82/P4wnP1_aloa/hid" + pb "github.com/mame82/P4wnP1_aloa/proto" "log" "sync" "time" diff --git a/service/SubSysGpio.go b/service/SubSysGpio.go index 1f86170..2fcf192 100644 --- a/service/SubSysGpio.go +++ b/service/SubSysGpio.go @@ -5,7 +5,7 @@ package service import ( "context" "fmt" - "github.com/mame82/P4wnP1_go/service/pgpio" + "github.com/mame82/P4wnP1_aloa/service/pgpio" "periph.io/x/periph" "periph.io/x/periph/conn/gpio" "periph.io/x/periph/conn/gpio/gpioreg" @@ -15,7 +15,7 @@ import ( "sync" "time" "errors" - pb "github.com/mame82/P4wnP1_go/proto" + pb "github.com/mame82/P4wnP1_aloa/proto" ) var ( diff --git a/service/SubSysLED.go b/service/SubSysLED.go index 466f2b5..e553665 100644 --- a/service/SubSysLED.go +++ b/service/SubSysLED.go @@ -1,7 +1,7 @@ package service import ( - pb "github.com/mame82/P4wnP1_go/proto" + pb "github.com/mame82/P4wnP1_aloa/proto" "io/ioutil" "log" "os" diff --git a/service/SubSysNetworkManager.go b/service/SubSysNetworkManager.go index 182b773..52bcd83 100644 --- a/service/SubSysNetworkManager.go +++ b/service/SubSysNetworkManager.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" //"github.com/docker/libcontainer/netlink" - "github.com/mame82/P4wnP1_go/netlink" - pb "github.com/mame82/P4wnP1_go/proto" - "github.com/mame82/P4wnP1_go/service/util" + "github.com/mame82/P4wnP1_aloa/netlink" + pb "github.com/mame82/P4wnP1_aloa/proto" + "github.com/mame82/P4wnP1_aloa/service/util" "io/ioutil" "log" "net" diff --git a/service/SubSysTriggerAction.go b/service/SubSysTriggerAction.go index f62836d..4077906 100644 --- a/service/SubSysTriggerAction.go +++ b/service/SubSysTriggerAction.go @@ -6,10 +6,10 @@ import ( "context" "errors" "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/util" + "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/util" "io/ioutil" "sync" ) diff --git a/service/SubSysUSB.go b/service/SubSysUSB.go index a36f774..6b2c415 100644 --- a/service/SubSysUSB.go +++ b/service/SubSysUSB.go @@ -6,9 +6,9 @@ import ( "context" "errors" "fmt" - "github.com/mame82/P4wnP1_go/common" - "github.com/mame82/P4wnP1_go/hid" - pb "github.com/mame82/P4wnP1_go/proto" + "github.com/mame82/P4wnP1_aloa/common" + "github.com/mame82/P4wnP1_aloa/hid" + pb "github.com/mame82/P4wnP1_aloa/proto" "io/ioutil" "log" "net" diff --git a/service/bluetooth.go b/service/bluetooth.go index c201cd3..81d0299 100644 --- a/service/bluetooth.go +++ b/service/bluetooth.go @@ -5,10 +5,12 @@ package service import ( "errors" "fmt" - pb "github.com/mame82/P4wnP1_go/proto" - "github.com/mame82/P4wnP1_go/service/bluetooth" + pb "github.com/mame82/P4wnP1_aloa/proto" + "github.com/mame82/P4wnP1_aloa/service/bluetooth" "github.com/mame82/mblue-toolz/toolz" + "io/ioutil" "log" + "os" "os/exec" "regexp" "strconv" @@ -493,6 +495,10 @@ func (bt *BtService) EnableBridge() (err error) { log.Println("... reconfigure ethernet settings for interface", bt.BrName) if mi, err := bt.RootSvc.SubSysNetwork.GetManagedInterface(bt.BrName); err == nil { mi.ReDeploy() + // disable IPv6 for bridge interface + //ioutil.WriteFile("/proc/sys/net/ipv6/conf/" + bt.BrName + "/disable_ipv6", []byte("1"), os.ModePerm) + // disable IPv6 for all interfaces + ioutil.WriteFile("/proc/sys/net/ipv6/conf/all/disable_ipv6", []byte("1"), os.ModePerm) } diff --git a/service/bluetooth/controller.go b/service/bluetooth/controller.go index c7b31e2..fb6593a 100644 --- a/service/bluetooth/controller.go +++ b/service/bluetooth/controller.go @@ -9,12 +9,12 @@ import ( "sync" "time" - //"github.com/mame82/P4wnP1_go/service" + //"github.com/mame82/P4wnP1_aloa/service" "github.com/mame82/mblue-toolz/btmgmt" "github.com/mame82/mblue-toolz/dbusHelper" "github.com/mame82/mblue-toolz/toolz" "errors" - pb "github.com/mame82/P4wnP1_go/proto" + pb "github.com/mame82/P4wnP1_aloa/proto" ) diff --git a/service/defaults.go b/service/defaults.go index 877ea81..d4b5788 100644 --- a/service/defaults.go +++ b/service/defaults.go @@ -1,7 +1,7 @@ package service import ( - pb "github.com/mame82/P4wnP1_go/proto" + pb "github.com/mame82/P4wnP1_aloa/proto" ) const ( diff --git a/service/dhcp.go b/service/dhcp.go index 81b48bb..c31aca4 100644 --- a/service/dhcp.go +++ b/service/dhcp.go @@ -7,8 +7,8 @@ import ( "bytes" "errors" "fmt" - "github.com/mame82/P4wnP1_go/common_web" - pb "github.com/mame82/P4wnP1_go/proto" + "github.com/mame82/P4wnP1_aloa/common_web" + pb "github.com/mame82/P4wnP1_aloa/proto" "io/ioutil" "log" "net" diff --git a/service/dwc2_connect_watcher.go b/service/dwc2_connect_watcher.go index 8cfe75e..9118f54 100644 --- a/service/dwc2_connect_watcher.go +++ b/service/dwc2_connect_watcher.go @@ -5,10 +5,10 @@ package service import ( "fmt" "errors" - "github.com/mame82/P4wnP1_go/common_web" + "github.com/mame82/P4wnP1_aloa/common_web" - genl "github.com/mame82/P4wnP1_go/mgenetlink" - nl "github.com/mame82/P4wnP1_go/mnetlink" + genl "github.com/mame82/P4wnP1_aloa/mgenetlink" + nl "github.com/mame82/P4wnP1_aloa/mnetlink" ) /* diff --git a/service/led.go b/service/led.go index a26b3ec..ed7ed2e 100644 --- a/service/led.go +++ b/service/led.go @@ -7,7 +7,7 @@ import( "time" "sync/atomic" - pb "github.com/mame82/P4wnP1_go/proto" + pb "github.com/mame82/P4wnP1_aloa/proto" ) const ( diff --git a/service/peripheral/Oled128_64.go b/service/peripheral/Oled128_64.go deleted file mode 100644 index a830c8b..0000000 --- a/service/peripheral/Oled128_64.go +++ /dev/null @@ -1,132 +0,0 @@ -package peripheral - -import ( - "fmt" - "github.com/warthog618/gpio" - "time" -) - -/* -// https://www.waveshare.com/1.3inch-oled-hat.htm - -KEY1 P21 Button 1/GPIO -KEY2 P20 Button 2/GPIO -KEY3 P16 Button 3/GPIO -Joystick Up P6 Joystick Up -Joystick Down P19 Joystick Down -Joystick Left P5 Joystick Left -Joystick Right P26 Joystick Right -Joystick Press P13 Joystick Press -SCLK P11/SCLK SPI clock input -MOSI P10/MOSI SPI data input -DC P24 Data/Command selection (high for data, low for command) -CS P8/CE0 Chip selection, low active -RST P25 Reset, low active - */ - -var timeLastEvent time.Time -const ( - WAVESHARE_OLED_GPIO_KEY_1 = gpio.GPIO21 - WAVESHARE_OLED_GPIO_KEY_2 = gpio.GPIO20 - WAVESHARE_OLED_GPIO_KEY_3 = gpio.GPIO16 - - WAVESHARE_OLED_GPIO_JOY_UP = gpio.GPIO6 - WAVESHARE_OLED_GPIO_JOY_DOWN = gpio.GPIO19 - WAVESHARE_OLED_GPIO_JOY_LEFT = gpio.GPIO5 - WAVESHARE_OLED_GPIO_JOY_RIGHT = gpio.GPIO26 - WAVESHARE_OLED_GPIO_JOY_PRESS = gpio.GPIO13 -) - -var waveshareRelevantEvents = []uint8{ - WAVESHARE_OLED_GPIO_JOY_DOWN, - WAVESHARE_OLED_GPIO_JOY_LEFT, - WAVESHARE_OLED_GPIO_JOY_RIGHT, - WAVESHARE_OLED_GPIO_JOY_UP, - WAVESHARE_OLED_GPIO_JOY_PRESS, - WAVESHARE_OLED_GPIO_KEY_1, - WAVESHARE_OLED_GPIO_KEY_2, - WAVESHARE_OLED_GPIO_KEY_3, -} - -type WaveshareOledEvent int - -const ( - PRESSED_UP WaveshareOledEvent = iota - PRESSED_DOWN - PRESSED_LEFT - PRESSED_RIGHT - PRESSED_STICK - - PRESSED_KEY1 - PRESSED_KEY2 - PRESSED_KEY3 -) - -var pin2function = map[uint8]WaveshareOledEvent{ - WAVESHARE_OLED_GPIO_KEY_1: PRESSED_KEY1, - WAVESHARE_OLED_GPIO_KEY_2: PRESSED_KEY2, - WAVESHARE_OLED_GPIO_KEY_3: PRESSED_KEY3, - WAVESHARE_OLED_GPIO_JOY_UP: PRESSED_UP, - WAVESHARE_OLED_GPIO_JOY_DOWN: PRESSED_DOWN, - WAVESHARE_OLED_GPIO_JOY_LEFT: PRESSED_LEFT, - WAVESHARE_OLED_GPIO_JOY_RIGHT: PRESSED_RIGHT, - WAVESHARE_OLED_GPIO_JOY_PRESS: PRESSED_STICK, -} - -var function2string = map[WaveshareOledEvent]string{ - PRESSED_KEY1: "KEY 1", - PRESSED_KEY2: "KEY 2", - PRESSED_KEY3: "KEY 3", - PRESSED_UP: "UP", - PRESSED_DOWN: "DOWN", - PRESSED_LEFT: "LEFT", - PRESSED_RIGHT: "RIGHT", - PRESSED_STICK: "STICK", -} - -type WaveshareOled struct { - pins []*gpio.Pin - gpioOpened bool -} - -func (w *WaveshareOled) GetHandler(event WaveshareOledEvent) (func(*gpio.Pin)) { - timeLastEvent = time.Now() - return func(pin *gpio.Pin) { - if str,okay := function2string[event]; okay { - if time.Since(timeLastEvent) > 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" )