Fix an issue where the OutputKey was incorrect when multiple Combos were configured (#63)

sago35 · web-flow · commit ea24640cfe6e · 2024-12-24T20:23:33.000+09:00
diff --git a/keyboard.go b/keyboard.go
@@ -323,7 +323,7 @@ func (d *Device) Tick() error {
 						}
 					}
 				}
-				if matchCnt >= 2 && zero+matchCnt == 4 && matchCnt > matchMax {
+				if matchCnt >= 2 && zero+matchCnt == 4 && matchCnt > matchMax && len(d.combosPressed) == matchCnt {
 					matched = true
 					matchMax = matchCnt
 					d.combosKey = 0xFF000000 | uint32(keycodeViaToTGK(combo[4]))

Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,7 @@ func (d *Device) Tick() error {`
`323`	`323`	`}`
`324`	`324`	`}`
`325`	`325`	`}`
`326`		`- if matchCnt >= 2 && zero+matchCnt == 4 && matchCnt > matchMax {`
	`326`	`+ if matchCnt >= 2 && zero+matchCnt == 4 && matchCnt > matchMax && len(d.combosPressed) == matchCnt {`
`327`	`327`	`matched = true`
`328`	`328`	`matchMax = matchCnt`
`329`	`329`	`d.combosKey = 0xFF000000 \| uint32(keycodeViaToTGK(combo[4]))`