Merge pull request #2 from ftl/1-add-several-pages

1 add support for several pages

.github/workflows/ci.yml

@@ -18,10 +18,10 @@ jobs:
     - name: Install Linux packages
       run: sudo apt update && sudo apt install -y --no-install-recommends debhelper libhidapi-libusb0
 
-    - name: Set up Go 1.16
+    - name: Set up Go 1.21
       uses: actions/setup-go@v2
       with:
-        go-version: 1.16
+        go-version: 1.21
       id: go
 
     - name: Check out code into the Go module directory

.github/workflows/release.yml

@@ -19,10 +19,10 @@ jobs:
     - name: Install Linux packages
       run: sudo apt update && sudo apt install -y --no-install-recommends debhelper libhidapi-libusb0
 
-    - name: Set up Go 1.16
+    - name: Set up Go 1.21
       uses: actions/setup-go@v2
       with:
-        go-version: 1.16
+        go-version: 1.21
       id: go
 
     - name: Check out code into the Go module directory

Makefile

@@ -2,35 +2,35 @@ VERSION?=$(shell git describe --tags)
 GITCOMMIT=$(shell git rev-parse --verify --short HEAD)
 BUILDTIME=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
 
-all: test build
 .PHONY: all
+all: test build
 
-hamdeck:
-	go build -v -o hamdeck -ldflags "-X github.com/ftl/hamdeck/cmd.version=$(VERSION) -X github.com/ftl/hamdeck/cmd.gitCommit=$(GITCOMMIT) -X github.com/ftl/hamdeck/cmd.buildTime=$(BUILDTIME)" .
-
-build: hamdeck
 .PHONY: build
+build: hamdeck
 
+.PHONY: test
 test:
 	go test ./... -v
-.PHONY: test
 
+.PHONY: clean
 clean:
 	-@rm ./hamdeck
-.PHONY: clean
 
+.PHONY: install
 install: hamdeck
 	cp ./hamdeck /usr/bin/hamdeck
 	mkdir -p /usr/share/hamdeck
 	cp ./example_conf.json /usr/share/hamdeck/example_conf.json
 	cp ./.debpkg/lib/systemd/system/hamdeck.service /lib/systemd/system/hamdeck.service
 	cp ./.debpkg/lib/udev/rules.d/99-hamdeck.rules /lib/udev/rules.d/99-hamdeck.rules
-.PHONY: install
 
+.PHONY: uninstall
 uninstall:
 	-rm /usr/bin/hamdeck
 	-rm /usr/share/hamdeck/example_conf.json
 	-rmdir /usr/share/hamdeck
 	-rm /lib/systemd/system/hamdeck.service
 	-rm /lib/udev/rules.d/99-hamdeck.rules
-.PHONY: uninstall
+
+hamdeck:
+	go build -v -o hamdeck -ldflags "-X github.com/ftl/hamdeck/cmd.version=$(VERSION) -X github.com/ftl/hamdeck/cmd.gitCommit=$(GITCOMMIT) -X github.com/ftl/hamdeck/cmd.buildTime=$(BUILDTIME)" .

cmd/root.go

@@ -94,6 +94,7 @@ func run(cmd *cobra.Command, args []string) {
 	device.SetBrightness(rootFlags.brightness)
 
 	deck := hamdeck.New(device)
+	deck.RegisterFactory(hamdeck.NewButtonFactory(deck))
 	deck.RegisterFactory(pulse.NewButtonFactory())
 	if rootFlags.hamlibAddress != "" {
 		deck.RegisterFactory(hamlib.NewButtonFactory(rootFlags.hamlibAddress))