Add device.GetKeyboardCount() (#43)

sago35 · Jul 18, 2024 · 1f08528 · 1f08528
1 parent f81c852
commit 1f08528
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/keyboard.go b/keyboard.go
@@ -134,6 +134,10 @@ func (d *Device) Init() error {
 	return nil
 }
 
+func (d *Device) GetKeyboardCount() int {
+	return len(d.kb)
+}
+
 func (d *Device) GetMaxKeyCount() int {
 	cnt := 0
 	for _, k := range d.kb {

diff --git a/via.go b/via.go
@@ -144,8 +144,8 @@ func rxHandler2(b []byte) bool {
 		for i := 0; i < int(sz/2); i++ {
 			//fmt.Printf("  %02X %02X\n", b[4+i+1], b[4+i+0])
 			tmp := i + int(offset)/2
-			layer := tmp / (cnt * len(device.kb))
-			tmp = tmp % (cnt * len(device.kb))
+			layer := tmp / (cnt * device.GetKeyboardCount())
+			tmp = tmp % (cnt * device.GetKeyboardCount())
 			kbd := tmp / cnt
 			idx := tmp % cnt
 			//layer := 0
@@ -265,7 +265,7 @@ func rxHandler2(b []byte) bool {
 
 func Save() error {
 	layers := 6
-	keyboards := len(device.kb)
+	keyboards := device.GetKeyboardCount()
 
 	cnt := device.GetMaxKeyCount()
 	wbuf := make([]byte, 4+layers*keyboards*cnt*2+len(device.Macros))