last
This commit is contained in:
@@ -67,7 +67,7 @@ func NewDeviceManager(cfg *config.Config, hub *Hub) *DeviceManager {
|
||||
return &DeviceManager{
|
||||
config: cfg,
|
||||
hub: hub,
|
||||
updateInterval: 200 * time.Millisecond, // Update status every second
|
||||
updateInterval: 1 * time.Second, // Update status every second
|
||||
stopChan: make(chan struct{}),
|
||||
freqThreshold: 25000, // 25 kHz default
|
||||
autoTrackEnabled: true, // Enabled by default
|
||||
@@ -130,7 +130,9 @@ func (dm *DeviceManager) Initialize() error {
|
||||
motorsMoving := dm.ultrabeamMotorsMoving
|
||||
dm.ultrabeamStateMu.RUnlock()
|
||||
// Block transmit if motors are moving
|
||||
return motorsMoving == 0
|
||||
allowed := motorsMoving == 0
|
||||
log.Printf("FlexRadio PTT check: motorsMoving=%d, transmit=%v", motorsMoving, allowed)
|
||||
return allowed
|
||||
})
|
||||
|
||||
// Set callback for immediate frequency changes (no waiting for update cycle)
|
||||
@@ -363,12 +365,26 @@ func (dm *DeviceManager) updateStatus() {
|
||||
dm.ultrabeamMotorsMoving = ubStatus.MotorsMoving
|
||||
dm.ultrabeamStateMu.Unlock()
|
||||
|
||||
// Log motor state changes
|
||||
// Proactively update FlexRadio interlock when motor state changes
|
||||
if previousMotors != ubStatus.MotorsMoving {
|
||||
if ubStatus.MotorsMoving > 0 {
|
||||
log.Printf("Ultrabeam: Motors STARTED (bitmask=%d)", ubStatus.MotorsMoving)
|
||||
// PROACTIVELY block transmit - don't wait for PTT_REQUESTED
|
||||
log.Printf("DEBUG: About to call ForceInterlockState(false), flexRadio=%v", dm.flexRadio != nil)
|
||||
if dm.flexRadio != nil {
|
||||
dm.flexRadio.ForceInterlockState(false)
|
||||
} else {
|
||||
log.Printf("DEBUG: FlexRadio is nil, cannot force interlock")
|
||||
}
|
||||
} else {
|
||||
log.Printf("Ultrabeam: Motors STOPPED")
|
||||
// PROACTIVELY allow transmit again
|
||||
log.Printf("DEBUG: About to call ForceInterlockState(true), flexRadio=%v", dm.flexRadio != nil)
|
||||
if dm.flexRadio != nil {
|
||||
dm.flexRadio.ForceInterlockState(true)
|
||||
} else {
|
||||
log.Printf("DEBUG: FlexRadio is nil, cannot force interlock")
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
@@ -467,6 +483,7 @@ func (dm *DeviceManager) updateStatus() {
|
||||
if dm.hub != nil {
|
||||
dm.hub.BroadcastStatusUpdate(status)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func (dm *DeviceManager) GetStatus() *SystemStatus {
|
||||
|
||||
Reference in New Issue
Block a user