Skip to content

Commit

Permalink
Merge branch 'talkkonnect:main' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
zrdimetc authored Jun 23, 2022
2 parents 5172c66 + 6bb6357 commit 3b7955d
Show file tree
Hide file tree
Showing 26 changed files with 2,148 additions and 1,164 deletions.
157 changes: 68 additions & 89 deletions README.md

Large diffs are not rendered by default.

360 changes: 195 additions & 165 deletions client.go

Large diffs are not rendered by default.

359 changes: 125 additions & 234 deletions clientcommands.go

Large diffs are not rendered by default.

150 changes: 110 additions & 40 deletions commandkeys.go

Large diffs are not rendered by default.

39 changes: 39 additions & 0 deletions display.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,42 @@ func oledDisplay(OledClear bool, OledRow int, OledColumn int, OledText string) {
func LcdDisplay(lcdtextshow [4]string, PRSPin int, PEPin int, PD4Pin int, PD5Pin int, PD6Pin int, PD7Pin int, LCDInterfaceType string, LCDI2CAddress byte) {
go hd44780.LcdDisplay(LcdText, LCDRSPin, LCDEPin, LCDD4Pin, LCDD5Pin, LCDD6Pin, LCDD7Pin, LCDInterfaceType, LCDI2CAddress)
}

func (b *Talkkonnect) sevenSegment(function string, value string) {
if Config.Global.Hardware.IO.Max7219.Enabled {
if function == "mumblechannel" {
prefix := "c"
if b.findEnabledRotaryEncoderFunction("mumblechannel") {
Max7219(Config.Global.Hardware.IO.Max7219.Max7219Cascaded, Config.Global.Hardware.IO.Max7219.SPIBus, Config.Global.Hardware.IO.Max7219.SPIDevice, Config.Global.Hardware.IO.Max7219.Brightness, prefix+value)
}
}
if function == "localvolume" {
prefix := "u"
if b.findEnabledRotaryEncoderFunction("localvolume") {
Max7219(Config.Global.Hardware.IO.Max7219.Max7219Cascaded, Config.Global.Hardware.IO.Max7219.SPIBus, Config.Global.Hardware.IO.Max7219.SPIDevice, Config.Global.Hardware.IO.Max7219.Brightness, prefix+value)
}
}
if function == "radiochannel" {
prefix := "r"
if b.findEnabledRotaryEncoderFunction("radiochannel") {
Max7219(Config.Global.Hardware.IO.Max7219.Max7219Cascaded, Config.Global.Hardware.IO.Max7219.SPIBus, Config.Global.Hardware.IO.Max7219.SPIDevice, Config.Global.Hardware.IO.Max7219.Brightness, prefix+value)
}
}
if function == "voicetarget" {
prefix := "t"
if b.findEnabledRotaryEncoderFunction("voicetarget") {
Max7219(Config.Global.Hardware.IO.Max7219.Max7219Cascaded, Config.Global.Hardware.IO.Max7219.SPIBus, Config.Global.Hardware.IO.Max7219.SPIDevice, Config.Global.Hardware.IO.Max7219.Brightness, prefix+value)
}
}
if function == "hello" {
prefix := "hello"
Max7219(Config.Global.Hardware.IO.Max7219.Max7219Cascaded, Config.Global.Hardware.IO.Max7219.SPIBus, Config.Global.Hardware.IO.Max7219.SPIDevice, Config.Global.Hardware.IO.Max7219.Brightness, prefix)
}
if function == "bye" {
prefix := "bye"
Max7219(Config.Global.Hardware.IO.Max7219.Max7219Cascaded, Config.Global.Hardware.IO.Max7219.SPIBus, Config.Global.Hardware.IO.Max7219.SPIDevice, Config.Global.Hardware.IO.Max7219.Brightness, prefix)
}
} else {
log.Println("debug: Max7219 Seven Segment Not Enabled")
}
}
45 changes: 0 additions & 45 deletions go.mod

This file was deleted.

92 changes: 0 additions & 92 deletions go.sum

This file was deleted.

Loading

0 comments on commit 3b7955d

Please sign in to comment.