Skip to content

Discard bandwidth from hamlib mode report, use correct level command to request RF power #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mattmelling wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Discard bandwidth from hamlib mode report, use correct level command to request RF power #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions waveloggoat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,36 +222,36 @@ func (h *HamlibClient) GetData() (RigData, error) {
if _, err := fmt.Fprintf(conn, "m\n"); err != nil {
return RigData{}, fmt.Errorf("failed to send 'm' command to hamlib: %w", err)
}
modeResp, _, err := reader.ReadLine() // e.g., "USB 2400"
modeResp, _, err := reader.ReadLine() // e.g., "USB"
if err != nil {
return RigData{}, fmt.Errorf("failed to read mode response from hamlib: %w", err)
}
modeParts := strings.Fields(string(modeResp))
if len(modeParts) > 0 {
data.Mode = modeParts[0]
data.ModeB = modeParts[0] // Default modeB to Mode/RX for simplicity
} else {
return RigData{}, fmt.Errorf("invalid mode response format from hamlib: '%s'", modeResp)
data.Mode = modeResp
data.ModeB = modeResp

// Discard next line (bandwidth) directly following mode
if _, _, err := reader.ReadLine(); err != nil {
log.Warnf("Failed to read mode bandwidth response from hamlib: %v.", err)
}

// Query Power (P)
if _, err := fmt.Fprintf(conn, "P\n"); err != nil {
log.Warnf("Failed to send 'P' (power) command to hamlib: %v. Sending 0 W.", err)
if _, err := fmt.Fprintf(conn, "l RFPOWER\n"); err != nil {
log.Warnf("Failed to send 'l RFPOWER' (power) command to hamlib: %v. Sending 0 W.", err)
data.Power = 0.0
} else {
powerStr, _, err := reader.ReadLine()
if err != nil {
log.Warnf("Failed to read power response from hamlib: %v. Sending 0 W.", err)
data.Power = 0.0
} else {
// Hamlib returns 0-100 float percentage
// Hamlib returns 0-1 float percentage
powerPercent, err := strconv.ParseFloat(string(powerStr), 64)
if err != nil {
log.Warnf("Failed to parse power '%s': %v. Sending 0 W.", powerStr, err)
data.Power = 0.0
} else {
// Convert percentage to 100W max for simple display (Wavelog typically expects watts)
data.Power = powerPercent
data.Power = powerPercent * 100
}
}
}
Expand Down