Skip to content

Commit

Permalink
Added TX Lock Out Functionality
Browse files Browse the repository at this point in the history
  • Loading branch information
talkkonnect committed Mar 6, 2022
1 parent 90c8e8f commit a8045a4
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 4 deletions.
4 changes: 4 additions & 0 deletions client.go
Original file line number Diff line number Diff line change
Expand Up @@ -459,13 +459,17 @@ func (b *Talkkonnect) ClientStart() {
if !RXLEDStatus {
log.Println("info: Speaking->", v.WhoTalking)
RXLEDStatus = true
txlockout := &TXLockOut
*txlockout = true
go GPIOOutPin("voiceactivity", "on")
MyLedStripVoiceActivityLEDOn()
go rxScreen(LastSpeaker)
}
case <-TalkedTicker.C:
if RXLEDStatus {
RXLEDStatus = false
txlockout := &TXLockOut
*txlockout = false
go GPIOOutPin("voiceactivity", "off")
MyLedStripVoiceActivityLEDOff()
//TalkedTicker.Stop()
Expand Down
16 changes: 15 additions & 1 deletion gpio.go
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,21 @@ func (b *Talkkonnect) initGPIO() {
} else {
time.Sleep(150 * time.Millisecond)
}
b.TransmitStart()
txlockout := &TXLockOut
if Config.Global.Software.Settings.TXLockOut && *txlockout {
log.Println("warn: TX Lockout Stopping Transmission")
eventSound := findEventSound("txlockout")
log.Println("alert: BP0 ", eventSound)
if eventSound.Enabled {
if v, err := strconv.Atoi(eventSound.Volume); err == nil {
localMediaPlayer(eventSound.FileName, v, eventSound.Blocking, 0, 1)
log.Printf("debug: Playing txlockout Sound")
}
}
} else {
b.TransmitStart()
}

}
}
}
Expand Down
6 changes: 3 additions & 3 deletions version.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
package talkkonnect

const (
talkkonnectVersion string = "2.12.05"
talkkonnectReleased string = "Mar 5 2022"
talkkonnectVersion string = "2.13.01"
talkkonnectReleased string = "Mar 6 2022"
)

/* Release Notes
1. Removed Old Scanning Function
1. Added TX Lock Out Functionality
*/
3 changes: 3 additions & 0 deletions xmlparser.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ type ConfigStruct struct {
SimplexWithMute bool `xml:"simplexwithmute"`
TxCounter bool `xml:"txcounter"`
NextServerIndex int `xml:"nextserverindex"`
TXLockOut bool `xml:"txlockout"`
} `xml:"settings"`
AutoProvisioning struct {
Enabled bool `xml:"enabled,attr"`
Expand Down Expand Up @@ -647,6 +648,7 @@ var (
InStreamSource bool
LCDIsDark bool
GPSDataChannelReceivers int
TXLockOut bool
)

// Generic Global Counter Variables
Expand Down Expand Up @@ -996,6 +998,7 @@ func printxmlconfig() {
log.Println("info: SimplexWithMute ", fmt.Sprintf("%t", Config.Global.Software.Settings.SimplexWithMute))
log.Println("info: TxCounter ", fmt.Sprintf("%t", Config.Global.Software.Settings.TxCounter))
log.Println("info: NextServerIndex ", fmt.Sprintf("%v", Config.Global.Software.Settings.NextServerIndex))
log.Println("info: TXLockOut ", fmt.Sprintf("%t", Config.Global.Software.Settings.TXLockOut))
} else {
log.Println("info: -------- System Settings -------- SKIPPED ")
}
Expand Down

0 comments on commit a8045a4

Please sign in to comment.