rouggy/ShackMaster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: rouggy:4ab192418e21065c68d59777493ea03b76c061e7
Branches Tags
rouggy:main rouggy:flexradio/reconnect rouggy:feature/flexradio-interlock
..
compare: rouggy:bceac40518988bbb04e1f46ea125a72d8e842e6b
Branches Tags
rouggy:flexradio/reconnect rouggy:main rouggy:feature/flexradio-interlock

2 Commits
4ab192418e ... bceac40518

Author SHA1 Message Date
rouggy
bceac40518 Merge branch 'main' of https://git.rouggy.com/rouggy/ShackMaster 2026-01-09 23:55:14 +01:00
rouggy
ac99f291a7 rot finished 2026-01-09 23:54:50 +01:00
16 changed files with 3642 additions and 279 deletions
Expand all files Collapse all files

57
internal/api/device_manager.go
View File

@@ -79,6 +79,10 @@ func (dm *DeviceManager) Initialize() error {
)
// Initialize Rotator Genius
<<<<<<< HEAD
log.Printf("Initializing RotatorGenius: host=%s port=%d", dm.config.Devices.RotatorGenius.Host, dm.config.Devices.RotatorGenius.Port)
=======
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
dm.rotatorGenius = rotatorgenius.New(
dm.config.Devices.RotatorGenius.Host,
dm.config.Devices.RotatorGenius.Port,
@@ -94,10 +98,40 @@ func (dm *DeviceManager) Initialize() error {
dm.config.Location.Longitude,
)
<<<<<<< HEAD
// Start device polling in background (non-blocking)
go func() {
if err := dm.powerGenius.Start(); err != nil {
log.Printf("Warning: Failed to start PowerGenius polling: %v", err)
}
}()
go func() {
if err := dm.tunerGenius.Start(); err != nil {
log.Printf("Warning: Failed to start TunerGenius polling: %v", err)
}
}()
go func() {
if err := dm.antennaGenius.Start(); err != nil {
log.Printf("Warning: Failed to start AntennaGenius polling: %v", err)
}
}()
log.Println("About to launch RotatorGenius goroutine...")
go func() {
log.Println("Starting RotatorGenius polling goroutine...")
if err := dm.rotatorGenius.Start(); err != nil {
log.Printf("Warning: Failed to start RotatorGenius polling: %v", err)
}
}()
log.Println("RotatorGenius goroutine launched")
=======
// Start PowerGenius continuous polling
if err := dm.powerGenius.Start(); err != nil {
log.Printf("Warning: Failed to start PowerGenius polling: %v", err)
}
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
log.Println("Device manager initialized")
return nil
@@ -162,6 +196,28 @@ func (dm *DeviceManager) updateStatus() {
log.Printf("Power Genius error: %v", err)
}
<<<<<<< HEAD
// Tuner Genius
if tgStatus, err := dm.tunerGenius.GetStatus(); err == nil {
status.TunerGenius = tgStatus
} else {
log.Printf("Tuner Genius error: %v", err)
}
// Antenna Genius
if agStatus, err := dm.antennaGenius.GetStatus(); err == nil {
status.AntennaGenius = agStatus
} else {
log.Printf("Antenna Genius error: %v", err)
}
// Rotator Genius
if rgStatus, err := dm.rotatorGenius.GetStatus(); err == nil {
status.RotatorGenius = rgStatus
} else {
log.Printf("Rotator Genius error: %v", err)
}
=======
// // Tuner Genius
// if tgStatus, err := dm.tunerGenius.GetStatus(); err == nil {
// status.TunerGenius = tgStatus
@@ -182,6 +238,7 @@ func (dm *DeviceManager) updateStatus() {
// } else {
// log.Printf("Rotator Genius error: %v", err)
// }
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
// Solar Data (fetched every 15 minutes, cached)
if solarData, err := dm.solarClient.GetSolarData(); err == nil {

115
internal/api/handlers.go
View File

@@ -49,13 +49,29 @@ func (s *Server) SetupRoutes() *http.ServeMux {
mux.HandleFunc("/api/webswitch/all/off", s.handleWebSwitchAllOff)
// Rotator endpoints
<<<<<<< HEAD
mux.HandleFunc("/api/rotator/heading", s.handleRotatorHeading)
=======
mux.HandleFunc("/api/rotator/move", s.handleRotatorMove)
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
mux.HandleFunc("/api/rotator/cw", s.handleRotatorCW)
mux.HandleFunc("/api/rotator/ccw", s.handleRotatorCCW)
mux.HandleFunc("/api/rotator/stop", s.handleRotatorStop)
// Tuner endpoints
mux.HandleFunc("/api/tuner/operate", s.handleTunerOperate)
<<<<<<< HEAD
mux.HandleFunc("/api/tuner/bypass", s.handleTunerBypass)
mux.HandleFunc("/api/tuner/autotune", s.handleTunerAutoTune)
// Antenna Genius endpoints
mux.HandleFunc("/api/antenna/select", s.handleAntennaSelect)
mux.HandleFunc("/api/antenna/reboot", s.handleAntennaReboot)
// Power Genius endpoints
mux.HandleFunc("/api/power/fanmode", s.handlePowerFanMode)
mux.HandleFunc("/api/power/operate", s.handlePowerOperate)
=======
mux.HandleFunc("/api/tuner/tune", s.handleTunerAutoTune)
mux.HandleFunc("/api/tuner/antenna", s.handleTunerAntenna)
@@ -64,6 +80,7 @@ func (s *Server) SetupRoutes() *http.ServeMux {
// Power Genius endpoints
mux.HandleFunc("/api/power/fanmode", s.handlePowerFanMode)
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
// Static files (will be frontend)
mux.Handle("/", http.FileServer(http.Dir("./web/dist")))
@@ -179,15 +196,23 @@ func (s *Server) handleWebSwitchAllOff(w http.ResponseWriter, r *http.Request) {
}
// Rotator handlers
<<<<<<< HEAD
func (s *Server) handleRotatorHeading(w http.ResponseWriter, r *http.Request) {
=======
func (s *Server) handleRotatorMove(w http.ResponseWriter, r *http.Request) {
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
if r.Method != http.MethodPost {
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
return
}
var req struct {
<<<<<<< HEAD
Heading int `json:"heading"`
=======
Rotator int `json:"rotator"`
Azimuth int `json:"azimuth"`
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
}
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
@@ -195,7 +220,11 @@ func (s *Server) handleRotatorMove(w http.ResponseWriter, r *http.Request) {
return
}
<<<<<<< HEAD
if err := s.deviceManager.RotatorGenius().SetHeading(req.Heading); err != nil {
=======
if err := s.deviceManager.RotatorGenius().MoveToAzimuth(req.Rotator, req.Azimuth); err != nil {
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
@@ -209,6 +238,9 @@ func (s *Server) handleRotatorCW(w http.ResponseWriter, r *http.Request) {
return
}
<<<<<<< HEAD
if err := s.deviceManager.RotatorGenius().RotateCW(); err != nil {
=======
rotator, err := strconv.Atoi(r.URL.Query().Get("rotator"))
if err != nil || rotator < 1 || rotator > 2 {
http.Error(w, "Invalid rotator number", http.StatusBadRequest)
@@ -216,6 +248,7 @@ func (s *Server) handleRotatorCW(w http.ResponseWriter, r *http.Request) {
}
if err := s.deviceManager.RotatorGenius().RotateCW(rotator); err != nil {
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
@@ -229,6 +262,9 @@ func (s *Server) handleRotatorCCW(w http.ResponseWriter, r *http.Request) {
return
}
<<<<<<< HEAD
if err := s.deviceManager.RotatorGenius().RotateCCW(); err != nil {
=======
rotator, err := strconv.Atoi(r.URL.Query().Get("rotator"))
if err != nil || rotator < 1 || rotator > 2 {
http.Error(w, "Invalid rotator number", http.StatusBadRequest)
@@ -236,6 +272,7 @@ func (s *Server) handleRotatorCCW(w http.ResponseWriter, r *http.Request) {
}
if err := s.deviceManager.RotatorGenius().RotateCCW(rotator); err != nil {
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
@@ -265,7 +302,11 @@ func (s *Server) handleTunerOperate(w http.ResponseWriter, r *http.Request) {
}
var req struct {
<<<<<<< HEAD
Value int `json:"value"`
=======
Operate bool `json:"operate"`
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
}
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
@@ -273,7 +314,34 @@ func (s *Server) handleTunerOperate(w http.ResponseWriter, r *http.Request) {
return
}
<<<<<<< HEAD
if err := s.deviceManager.TunerGenius().SetOperate(req.Value); err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
s.sendJSON(w, map[string]string{"status": "ok"})
}
func (s *Server) handleTunerBypass(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodPost {
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
return
}
var req struct {
Value int `json:"value"`
}
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
http.Error(w, "Invalid request body", http.StatusBadRequest)
return
}
if err := s.deviceManager.TunerGenius().SetBypass(req.Value); err != nil {
=======
if err := s.deviceManager.TunerGenius().SetOperate(req.Operate); err != nil {
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
@@ -295,13 +363,22 @@ func (s *Server) handleTunerAutoTune(w http.ResponseWriter, r *http.Request) {
s.sendJSON(w, map[string]string{"status": "ok"})
}
<<<<<<< HEAD
// Antenna Genius handlers
func (s *Server) handleAntennaSelect(w http.ResponseWriter, r *http.Request) {
=======
func (s *Server) handleTunerAntenna(w http.ResponseWriter, r *http.Request) {
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
if r.Method != http.MethodPost {
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
return
}
var req struct {
<<<<<<< HEAD
Port int `json:"port"`
=======
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
Antenna int `json:"antenna"`
}
@@ -310,7 +387,11 @@ func (s *Server) handleTunerAntenna(w http.ResponseWriter, r *http.Request) {
return
}
<<<<<<< HEAD
if err := s.deviceManager.AntennaGenius().SetAntenna(req.Port, req.Antenna); err != nil {
=======
if err := s.deviceManager.TunerGenius().ActivateAntenna(req.Antenna); err != nil {
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
@@ -318,13 +399,20 @@ func (s *Server) handleTunerAntenna(w http.ResponseWriter, r *http.Request) {
s.sendJSON(w, map[string]string{"status": "ok"})
}
<<<<<<< HEAD
func (s *Server) handleAntennaReboot(w http.ResponseWriter, r *http.Request) {
=======
// Antenna Genius handlers
func (s *Server) handleAntennaSet(w http.ResponseWriter, r *http.Request) {
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
if r.Method != http.MethodPost {
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
return
}
<<<<<<< HEAD
if err := s.deviceManager.AntennaGenius().Reboot(); err != nil {
=======
var req struct {
Radio int `json:"radio"`
Antenna int `json:"antenna"`
@@ -336,6 +424,7 @@ func (s *Server) handleAntennaSet(w http.ResponseWriter, r *http.Request) {
}
if err := s.deviceManager.AntennaGenius().SetRadioAntenna(req.Radio, req.Antenna); err != nil {
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
@@ -367,6 +456,32 @@ func (s *Server) handlePowerFanMode(w http.ResponseWriter, r *http.Request) {
s.sendJSON(w, map[string]string{"status": "ok"})
}
<<<<<<< HEAD
func (s *Server) handlePowerOperate(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodPost {
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
return
}
var req struct {
Value int `json:"value"`
}
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
http.Error(w, "Invalid request body", http.StatusBadRequest)
return
}
if err := s.deviceManager.PowerGenius().SetOperate(req.Value); err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
s.sendJSON(w, map[string]string{"status": "ok"})
}
=======
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
func (s *Server) sendJSON(w http.ResponseWriter, data interface{}) {
w.Header().Set("Content-Type", "application/json")
json.NewEncoder(w).Encode(data)

422
internal/devices/antennagenius/antennagenius.go
View File

@@ -3,6 +3,57 @@ package antennagenius
import (
"bufio"
"fmt"
<<<<<<< HEAD
"log"
"net"
"strconv"
"strings"
"sync"
"time"
)
type Client struct {
host string
port int
conn net.Conn
reader *bufio.Reader
connMu sync.Mutex
lastStatus *Status
statusMu sync.RWMutex
antennas []Antenna
antennasMu sync.RWMutex
stopChan chan struct{}
running bool
}
type Status struct {
PortA *PortStatus `json:"port_a"`
PortB *PortStatus `json:"port_b"`
Antennas []Antenna `json:"antennas"`
Connected bool `json:"connected"`
}
type PortStatus struct {
Auto bool `json:"auto"`
Source string `json:"source"`
Band int `json:"band"`
Frequency float64 `json:"frequency"`
Nickname string `json:"nickname"`
RxAnt int `json:"rx_ant"`
TxAnt int `json:"tx_ant"`
InBand int `json:"in_band"`
TX bool `json:"tx"`
Inhibit int `json:"inhibit"`
}
type Antenna struct {
Number int `json:"number"`
Name string `json:"name"`
TX string `json:"tx"`
RX string `json:"rx"`
InBand string `json:"in_band"`
Hotkey int `json:"hotkey"`
=======
"net"
"strconv"
"strings"
@@ -21,31 +72,234 @@ type Status struct {
Radio1Antenna int `json:"radio1_antenna"` // 0-7 (antenna index)
Radio2Antenna int `json:"radio2_antenna"` // 0-7 (antenna index)
Connected bool `json:"connected"`
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
}
func New(host string, port int) *Client {
return &Client{
<<<<<<< HEAD
host: host,
port: port,
stopChan: make(chan struct{}),
=======
host: host,
port: port,
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
}
}
func (c *Client) Connect() error {
<<<<<<< HEAD
c.connMu.Lock()
defer c.connMu.Unlock()
if c.conn != nil {
return nil
}
=======
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
conn, err := net.DialTimeout("tcp", fmt.Sprintf("%s:%d", c.host, c.port), 5*time.Second)
if err != nil {
return fmt.Errorf("failed to connect: %w", err)
}
c.conn = conn
<<<<<<< HEAD
c.reader = bufio.NewReader(c.conn)
// Read and discard banner
_, _ = c.reader.ReadString('\n')
=======
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
return nil
}
func (c *Client) Close() error {
<<<<<<< HEAD
c.connMu.Lock()
defer c.connMu.Unlock()
if c.stopChan != nil {
close(c.stopChan)
}
=======
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
if c.conn != nil {
return c.conn.Close()
}
return nil
}
<<<<<<< HEAD
func (c *Client) Start() error {
if c.running {
return nil
}
_ = c.Connect()
c.running = true
go c.pollLoop()
return nil
}
func (c *Client) pollLoop() {
ticker := time.NewTicker(100 * time.Millisecond)
defer ticker.Stop()
initialized := false
for {
select {
case <-ticker.C:
c.connMu.Lock()
if c.conn == nil {
c.connMu.Unlock()
c.statusMu.Lock()
c.lastStatus = &Status{Connected: false}
c.statusMu.Unlock()
if err := c.Connect(); err != nil {
continue
}
initialized = false
c.connMu.Lock()
}
c.connMu.Unlock()
// Initialize: get antenna list and subscribe
if !initialized {
if err := c.initialize(); err != nil {
log.Printf("AntennaGenius init error: %v", err)
c.connMu.Lock()
if c.conn != nil {
c.conn.Close()
c.conn = nil
c.reader = nil
}
c.connMu.Unlock()
continue
}
initialized = true
}
// Read spontaneous messages from subscription
c.connMu.Lock()
if c.conn != nil && c.reader != nil {
c.conn.SetReadDeadline(time.Now().Add(150 * time.Millisecond))
for {
line, err := c.reader.ReadString('\n')
if err != nil {
break
}
line = strings.TrimSpace(line)
if strings.HasPrefix(line, "S") {
c.parsePortStatus(line)
}
}
}
c.connMu.Unlock()
case <-c.stopChan:
return
}
}
}
func (c *Client) initialize() error {
// Get antenna list
antennas, err := c.getAntennaList()
if err != nil {
return fmt.Errorf("failed to get antenna list: %w", err)
}
c.antennasMu.Lock()
c.antennas = antennas
c.antennasMu.Unlock()
// Subscribe to port updates
if err := c.subscribeToPortUpdates(); err != nil {
return fmt.Errorf("failed to subscribe: %w", err)
}
// Initialize status
c.statusMu.Lock()
c.lastStatus = &Status{
PortA: &PortStatus{},
PortB: &PortStatus{},
Antennas: antennas,
Connected: true,
}
c.statusMu.Unlock()
return nil
}
func (c *Client) sendCommand(cmd string) (string, error) {
c.connMu.Lock()
defer c.connMu.Unlock()
if c.conn == nil || c.reader == nil {
return "", fmt.Errorf("not connected")
}
// AntennaGenius only accepts C1| for all commands
fullCmd := fmt.Sprintf("C1|%s\n", cmd)
_, err := c.conn.Write([]byte(fullCmd))
if err != nil {
c.conn = nil
c.reader = nil
return "", fmt.Errorf("failed to send command: %w", err)
}
// Read all response lines using shared reader
var response strings.Builder
// Set a read timeout to avoid blocking forever
c.conn.SetReadDeadline(time.Now().Add(2 * time.Second))
defer c.conn.SetReadDeadline(time.Time{})
for {
line, err := c.reader.ReadString('\n')
if err != nil {
if response.Len() > 0 {
// We got some data, return it
break
}
c.conn = nil
c.reader = nil
return "", fmt.Errorf("failed to read response: %w", err)
}
response.WriteString(line)
// Parse spontaneous status updates
trimmedLine := strings.TrimSpace(line)
if strings.HasPrefix(trimmedLine, "S0|") {
c.connMu.Unlock()
c.parsePortStatus(trimmedLine)
c.connMu.Lock()
}
// Check if this is the last line (empty line or timeout)
if trimmedLine == "" {
break
}
}
return response.String(), nil
}
func (c *Client) getAntennaList() ([]Antenna, error) {
resp, err := c.sendCommand("antenna list")
=======
func (c *Client) sendCommand(cmd string) (string, error) {
if c.conn == nil {
if err := c.Connect(); err != nil {
@@ -79,10 +333,79 @@ func (c *Client) sendCommand(cmd string) (string, error) {
func (c *Client) GetStatus() (*Status, error) {
resp, err := c.sendCommand("status")
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
if err != nil {
return nil, err
}
<<<<<<< HEAD
var antennas []Antenna
// Response format: R<id>|0|antenna <num> name=<name> tx=<hex> rx=<hex> inband=<hex> hotkey=<num>
lines := strings.Split(resp, "\n")
for _, line := range lines {
line = strings.TrimSpace(line)
if !strings.Contains(line, "antenna ") {
continue
}
antenna := c.parseAntennaLine(line)
// Skip unconfigured antennas (name = Antenna X with space)
if strings.HasPrefix(antenna.Name, "Antenna ") {
continue
}
antennas = append(antennas, antenna)
}
return antennas, nil
}
func (c *Client) parseAntennaLine(line string) Antenna {
antenna := Antenna{}
// Extract antenna number
if idx := strings.Index(line, "antenna "); idx != -1 {
rest := line[idx+8:]
parts := strings.Fields(rest)
if len(parts) > 0 {
antenna.Number, _ = strconv.Atoi(parts[0])
}
}
// Parse key=value pairs
pairs := strings.Fields(line)
for _, pair := range pairs {
kv := strings.SplitN(pair, "=", 2)
if len(kv) != 2 {
continue
}
key := kv[0]
value := kv[1]
switch key {
case "name":
// Replace underscores with spaces
antenna.Name = strings.ReplaceAll(value, "_", " ")
case "tx":
antenna.TX = value
case "rx":
antenna.RX = value
case "inband":
antenna.InBand = value
case "hotkey":
antenna.Hotkey, _ = strconv.Atoi(value)
}
}
return antenna
}
func (c *Client) subscribeToPortUpdates() error {
resp, err := c.sendCommand("sub port all")
=======
return c.parseStatus(resp)
}
@@ -128,19 +451,117 @@ func (c *Client) SetRadioAntenna(radio int, antenna int) error {
cmd := fmt.Sprintf("set radio%d=%d", radio, antenna)
resp, err := c.sendCommand(cmd)
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
if err != nil {
return err
}
<<<<<<< HEAD
// Parse initial port status from subscription response
// The response may contain S0|port messages with current status
lines := strings.Split(resp, "\n")
for _, line := range lines {
line = strings.TrimSpace(line)
if strings.HasPrefix(line, "S0|port") {
c.parsePortStatus(line)
}
=======
// Check response for success
if !strings.Contains(strings.ToLower(resp), "ok") && resp != "" {
// If response doesn't contain "ok" but isn't empty, assume success
// (some devices may return the new state instead of "ok")
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
}
return nil
}
<<<<<<< HEAD
func (c *Client) parsePortStatus(line string) {
// Format: S0|port <id> auto=<0|1> source=<src> band=<n> freq=<f> nickname=<name> rxant=<n> txant=<n> inband=<n> tx=<0|1> inhibit=<n>
var portID int
portStatus := &PortStatus{}
// Extract port ID
if idx := strings.Index(line, "port "); idx != -1 {
rest := line[idx+5:]
parts := strings.Fields(rest)
if len(parts) > 0 {
portID, _ = strconv.Atoi(parts[0])
}
}
// Parse key=value pairs
pairs := strings.Fields(line)
for _, pair := range pairs {
kv := strings.SplitN(pair, "=", 2)
if len(kv) != 2 {
continue
}
key := kv[0]
value := kv[1]
switch key {
case "auto":
portStatus.Auto = value == "1"
case "source":
portStatus.Source = value
case "band":
portStatus.Band, _ = strconv.Atoi(value)
case "freq":
portStatus.Frequency, _ = strconv.ParseFloat(value, 64)
case "nickname":
portStatus.Nickname = value
case "rxant":
portStatus.RxAnt, _ = strconv.Atoi(value)
case "txant":
portStatus.TxAnt, _ = strconv.Atoi(value)
case "inband":
portStatus.InBand, _ = strconv.Atoi(value)
case "tx":
portStatus.TX = value == "1"
case "inhibit":
portStatus.Inhibit, _ = strconv.Atoi(value)
}
}
// Update status
c.statusMu.Lock()
if c.lastStatus != nil {
if portID == 1 {
c.lastStatus.PortA = portStatus
} else if portID == 2 {
c.lastStatus.PortB = portStatus
}
}
c.statusMu.Unlock()
}
func (c *Client) GetStatus() (*Status, error) {
c.statusMu.RLock()
defer c.statusMu.RUnlock()
if c.lastStatus == nil {
return &Status{Connected: false}, nil
}
return c.lastStatus, nil
}
// SetAntenna sets the antenna for a specific port
func (c *Client) SetAntenna(port, antenna int) error {
cmd := fmt.Sprintf("port set %d rxant=%d", port, antenna)
_, err := c.sendCommand(cmd)
return err
}
// Reboot reboots the device
func (c *Client) Reboot() error {
_, err := c.sendCommand("reboot")
return err
=======
// GetRadioAntenna gets which antenna a radio is currently using
func (c *Client) GetRadioAntenna(radio int) (int, error) {
if radio < 1 || radio > 2 {
@@ -156,4 +577,5 @@ func (c *Client) GetRadioAntenna(radio int) (int, error) {
return status.Radio1Antenna, nil
}
return status.Radio2Antenna, nil
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
}

75
internal/devices/powergenius/powergenius.go
View File

@@ -3,7 +3,10 @@ package powergenius
import (
"bufio"
"fmt"
<<<<<<< HEAD
=======
"log"
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
"math"
"net"
"strconv"
@@ -42,7 +45,10 @@ type Status struct {
BandB string `json:"band_b"`
FaultPresent bool `json:"fault_present"`
Connected bool `json:"connected"`
<<<<<<< HEAD
=======
Meffa string `json:"meffa"`
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
}
func New(host string, port int) *Client {
@@ -90,14 +96,24 @@ func (c *Client) Close() error {
// Start begins continuous polling of the device
func (c *Client) Start() error {
<<<<<<< HEAD
=======
if err := c.Connect(); err != nil {
return err
}
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
if c.running {
return nil
}
<<<<<<< HEAD
// Try to connect, but don't fail if it doesn't work
// The poll loop will keep trying
_ = c.Connect()
=======
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
c.running = true
go c.pollLoop()
@@ -112,10 +128,36 @@ func (c *Client) pollLoop() {
for {
select {
case <-ticker.C:
<<<<<<< HEAD
// Try to reconnect if not connected
c.connMu.Lock()
if c.conn == nil {
c.connMu.Unlock()
// Mark as disconnected and reset all values
c.statusMu.Lock()
c.lastStatus = &Status{
Connected: false,
}
c.statusMu.Unlock()
if err := c.Connect(); err != nil {
// Silent fail, will retry on next tick
continue
}
c.connMu.Lock()
}
c.connMu.Unlock()
status, err := c.queryStatus()
if err != nil {
// Connection lost, close and retry next tick
=======
status, err := c.queryStatus()
if err != nil {
log.Printf("PowerGenius query error: %v", err)
// Try to reconnect
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
c.connMu.Lock()
if c.conn != nil {
c.conn.Close()
@@ -123,12 +165,27 @@ func (c *Client) pollLoop() {
}
c.connMu.Unlock()
<<<<<<< HEAD
// Mark as disconnected and reset all values
c.statusMu.Lock()
c.lastStatus = &Status{
Connected: false,
}
c.statusMu.Unlock()
continue
}
// Mark as connected
status.Connected = true
=======
if err := c.Connect(); err != nil {
log.Printf("PowerGenius reconnect failed: %v", err)
}
continue
}
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
// Merge with existing status (spontaneous messages may only update some fields)
c.statusMu.Lock()
if c.lastStatus != nil {
@@ -304,8 +361,11 @@ func (c *Client) parseStatus(resp string) (*Status, error) {
}
case "vac":
status.Voltage, _ = strconv.ParseFloat(value, 64)
<<<<<<< HEAD
=======
case "meffa":
status.Meffa = value
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
case "vdd":
status.VDD, _ = strconv.ParseFloat(value, 64)
case "id":
@@ -378,3 +438,18 @@ func (c *Client) SetFanMode(mode string) error {
_, err := c.sendCommand(cmd)
return err
}
<<<<<<< HEAD
// SetOperate sets the operate mode
// value can be: 0 (STANDBY) or 1 (OPERATE)
func (c *Client) SetOperate(value int) error {
if value != 0 && value != 1 {
return fmt.Errorf("invalid operate value: %d (must be 0 or 1)", value)
}
cmd := fmt.Sprintf("operate=%d", value)
_, err := c.sendCommand(cmd)
return err
}
=======
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7

338
internal/devices/rotatorgenius/rotatorgenius.go
View File

@@ -6,6 +6,7 @@ import (
"net"
"strconv"
"strings"
"sync"
"time"
. "git.rouggy.com/rouggy/ShackMaster/internal/devices"
@@ -15,25 +16,16 @@ type Client struct {
host string
port int
conn net.Conn
reader *bufio.Reader
connMu sync.Mutex
lastStatus *Status
statusMu sync.RWMutex
stopChan chan struct{}
running bool
}
type Status struct {
Rotator1 RotatorData `json:"rotator1"`
Rotator2 RotatorData `json:"rotator2"`
Panic bool `json:"panic"`
}
type RotatorData struct {
CurrentAzimuth int `json:"current_azimuth"`
LimitCW int `json:"limit_cw"`
LimitCCW int `json:"limit_ccw"`
Configuration string `json:"configuration"` // "A" for azimuth, "E" for elevation
Moving int `json:"moving"` // 0=stopped, 1=CW, 2=CCW
Offset int `json:"offset"`
TargetAzimuth int `json:"target_azimuth"`
StartAzimuth int `json:"start_azimuth"`
OutsideLimit bool `json:"outside_limit"`
Name string `json:"name"`
Heading int `json:"heading"`
Connected bool `json:"connected"`
}
@@ -41,32 +33,127 @@ func New(host string, port int) *Client {
return &Client{
host: host,
port: port,
stopChan: make(chan struct{}),
}
}
func (c *Client) Connect() error {
c.connMu.Lock()
defer c.connMu.Unlock()
if c.conn != nil {
return nil
}
fmt.Printf("RotatorGenius: Attempting to connect to %s:%d\n", c.host, c.port)
conn, err := net.DialTimeout("tcp", fmt.Sprintf("%s:%d", c.host, c.port), 5*time.Second)
if err != nil {
fmt.Printf("RotatorGenius: Connection failed: %v\n", err)
return fmt.Errorf("failed to connect: %w", err)
}
c.conn = conn
c.reader = bufio.NewReader(c.conn)
fmt.Println("RotatorGenius: Connected successfully")
return nil
}
func (c *Client) Close() error {
c.connMu.Lock()
defer c.connMu.Unlock()
if c.stopChan != nil {
close(c.stopChan)
}
if c.conn != nil {
return c.conn.Close()
}
return nil
}
func (c *Client) sendCommand(cmd string) (string, error) {
func (c *Client) Start() error {
fmt.Println("RotatorGenius Start() called")
if c.running {
fmt.Println("RotatorGenius already running, skipping")
return nil
}
fmt.Println("RotatorGenius attempting initial connection...")
_ = c.Connect()
c.running = true
fmt.Println("RotatorGenius launching pollLoop...")
go c.pollLoop()
fmt.Println("RotatorGenius Start() completed")
return nil
}
func (c *Client) pollLoop() {
ticker := time.NewTicker(500 * time.Millisecond)
defer ticker.Stop()
for {
select {
case <-ticker.C:
c.connMu.Lock()
if c.conn == nil {
c.connMu.Unlock()
c.statusMu.Lock()
c.lastStatus = &Status{Connected: false}
c.statusMu.Unlock()
if err := c.Connect(); err != nil {
return "", err
continue
}
c.connMu.Lock()
}
c.connMu.Unlock()
status, err := c.queryStatus()
if err != nil {
c.connMu.Lock()
if c.conn != nil {
c.conn.Close()
c.conn = nil
c.reader = nil
}
c.connMu.Unlock()
c.statusMu.Lock()
c.lastStatus = &Status{Connected: false}
c.statusMu.Unlock()
continue
}
status.Connected = true
c.statusMu.Lock()
c.lastStatus = status
c.statusMu.Unlock()
case <-c.stopChan:
return
}
}
}
func (c *Client) sendCommand(cmd string) error {
c.connMu.Lock()
defer c.connMu.Unlock()
if c.conn == nil || c.reader == nil {
return fmt.Errorf("not connected")
}
<<<<<<< HEAD
_, err := c.conn.Write([]byte(cmd))
=======
// Get next command ID from global counter
cmdID := GetGlobalCommandID().GetNextID()
@@ -75,166 +162,101 @@ func (c *Client) sendCommand(cmd string) (string, error) {
// Send command
_, err := c.conn.Write([]byte(fullCmd))
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
if err != nil {
c.conn = nil
return "", fmt.Errorf("failed to send command: %w", err)
c.reader = nil
return fmt.Errorf("failed to send command: %w", err)
}
// Read response
reader := bufio.NewReader(c.conn)
response, err := reader.ReadString('\n')
return nil
}
func (c *Client) queryStatus() (*Status, error) {
c.connMu.Lock()
defer c.connMu.Unlock()
if c.conn == nil || c.reader == nil {
return nil, fmt.Errorf("not connected")
}
// Send |h command
_, err := c.conn.Write([]byte("|h"))
if err != nil {
c.conn = nil
return "", fmt.Errorf("failed to read response: %w", err)
c.reader = nil
return nil, fmt.Errorf("failed to send query: %w", err)
}
return strings.TrimSpace(response), nil
// Read response - RotatorGenius doesn't send newline, read fixed amount
c.conn.SetReadDeadline(time.Now().Add(500 * time.Millisecond))
defer c.conn.SetReadDeadline(time.Time{})
buf := make([]byte, 100)
n, err := c.reader.Read(buf)
if err != nil || n == 0 {
c.conn = nil
c.reader = nil
return nil, fmt.Errorf("failed to read response: %w", err)
}
response := string(buf[:n])
return c.parseStatus(response), nil
}
func (c *Client) parseStatus(response string) *Status {
status := &Status{}
// Response format: |h2<null><heading>...
// Example: |h2\x00183 8 10A0...
// After |h2 there's a null byte, then 3 digits for heading
if !strings.HasPrefix(response, "|h2") {
return status
}
// Skip |h2 (3 chars) and null byte (1 char), then read 3 digits
if len(response) >= 7 {
// Position 3 is the null byte, position 4-6 are the heading
headingStr := response[4:7]
heading, err := strconv.Atoi(strings.TrimSpace(headingStr))
if err == nil {
status.Heading = heading
}
}
return status
}
func (c *Client) GetStatus() (*Status, error) {
resp, err := c.sendCommand("|h")
if err != nil {
return nil, err
c.statusMu.RLock()
defer c.statusMu.RUnlock()
if c.lastStatus == nil {
return &Status{Connected: false}, nil
}
return parseStatusResponse(resp)
return c.lastStatus, nil
}
func parseStatusResponse(resp string) (*Status, error) {
if len(resp) < 80 {
return nil, fmt.Errorf("response too short: %d bytes", len(resp))
// SetHeading rotates to a specific azimuth
func (c *Client) SetHeading(azimuth int) error {
cmd := fmt.Sprintf("|A1%d", azimuth)
return c.sendCommand(cmd)
}
status := &Status{}
// Parse panic flag
status.Panic = resp[3] != 0x00
// Parse Rotator 1 (positions 4-38)
status.Rotator1 = parseRotatorData(resp[4:38])
// Parse Rotator 2 (positions 38-72)
if len(resp) >= 72 {
status.Rotator2 = parseRotatorData(resp[38:72])
// RotateCW rotates clockwise
func (c *Client) RotateCW() error {
return c.sendCommand("|P1")
}
return status, nil
}
func parseRotatorData(data string) RotatorData {
rd := RotatorData{}
// Current azimuth (3 bytes)
if azStr := strings.TrimSpace(data[0:3]); azStr != "999" {
rd.CurrentAzimuth, _ = strconv.Atoi(azStr)
rd.Connected = true
} else {
rd.CurrentAzimuth = 999
rd.Connected = false
}
// Limits
rd.LimitCW, _ = strconv.Atoi(strings.TrimSpace(data[3:6]))
rd.LimitCCW, _ = strconv.Atoi(strings.TrimSpace(data[6:9]))
// Configuration
rd.Configuration = string(data[9])
// Moving state
rd.Moving, _ = strconv.Atoi(string(data[10]))
// Offset
rd.Offset, _ = strconv.Atoi(strings.TrimSpace(data[11:15]))
// Target azimuth
if targetStr := strings.TrimSpace(data[15:18]); targetStr != "999" {
rd.TargetAzimuth, _ = strconv.Atoi(targetStr)
} else {
rd.TargetAzimuth = 999
}
// Start azimuth
if startStr := strings.TrimSpace(data[18:21]); startStr != "999" {
rd.StartAzimuth, _ = strconv.Atoi(startStr)
} else {
rd.StartAzimuth = 999
}
// Limit flag
rd.OutsideLimit = data[21] == '1'
// Name
rd.Name = strings.TrimSpace(data[22:34])
return rd
}
func (c *Client) MoveToAzimuth(rotator int, azimuth int) error {
if rotator < 1 || rotator > 2 {
return fmt.Errorf("rotator must be 1 or 2")
}
if azimuth < 0 || azimuth > 360 {
return fmt.Errorf("azimuth must be between 0 and 360")
}
cmd := fmt.Sprintf("|A%d%03d", rotator, azimuth)
resp, err := c.sendCommand(cmd)
if err != nil {
return err
}
if !strings.HasSuffix(resp, "K") {
return fmt.Errorf("command failed: %s", resp)
}
return nil
}
func (c *Client) RotateCW(rotator int) error {
if rotator < 1 || rotator > 2 {
return fmt.Errorf("rotator must be 1 or 2")
}
cmd := fmt.Sprintf("|P%d", rotator)
resp, err := c.sendCommand(cmd)
if err != nil {
return err
}
if !strings.HasSuffix(resp, "K") {
return fmt.Errorf("command failed: %s", resp)
}
return nil
}
func (c *Client) RotateCCW(rotator int) error {
if rotator < 1 || rotator > 2 {
return fmt.Errorf("rotator must be 1 or 2")
}
cmd := fmt.Sprintf("|M%d", rotator)
resp, err := c.sendCommand(cmd)
if err != nil {
return err
}
if !strings.HasSuffix(resp, "K") {
return fmt.Errorf("command failed: %s", resp)
}
return nil
// RotateCCW rotates counter-clockwise
func (c *Client) RotateCCW() error {
return c.sendCommand("|M1")
}
// Stop stops rotation
func (c *Client) Stop() error {
resp, err := c.sendCommand("|S")
if err != nil {
return err
}
if !strings.HasSuffix(resp, "K") {
return fmt.Errorf("command failed: %s", resp)
}
return nil
return c.sendCommand("|S")
}

390
internal/devices/tunergenius/tunergenius.go
View File

@@ -3,65 +3,226 @@ package tunergenius
import (
"bufio"
"fmt"
"math"
"net"
"strconv"
"strings"
"sync"
"time"
. "git.rouggy.com/rouggy/ShackMaster/internal/devices"
)
type Client struct {
<<<<<<< HEAD
host string
port int
conn net.Conn
connMu sync.Mutex
lastStatus *Status
statusMu sync.RWMutex
stopChan chan struct{}
running bool
=======
host string
port int
conn net.Conn
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
}
type Status struct {
Operate bool `json:"operate"` // true = OPERATE, false = STANDBY
Bypass bool `json:"bypass"` // Bypass mode
ActiveAntenna int `json:"active_antenna"` // 0=ANT1, 1=ANT2, 2=ANT3
TuningStatus string `json:"tuning_status"`
FrequencyA float64 `json:"frequency_a"`
FrequencyB float64 `json:"frequency_b"`
C1 int `json:"c1"`
L int `json:"l"`
C2 int `json:"c2"`
PowerForward float64 `json:"power_forward"`
PowerPeak float64 `json:"power_peak"`
PowerMax float64 `json:"power_max"`
SWR float64 `json:"swr"`
Power float64 `json:"power"`
Temperature float64 `json:"temperature"`
PTTA int `json:"ptt_a"`
BandA int `json:"band_a"`
FreqA float64 `json:"frequency_a"`
BypassA bool `json:"bypass_a"`
AntA int `json:"antenna_a"`
PTTB int `json:"ptt_b"`
BandB int `json:"band_b"`
FreqB float64 `json:"frequency_b"`
BypassB bool `json:"bypass_b"`
AntB int `json:"antenna_b"`
State int `json:"state"`
Active int `json:"active"`
Tuning int `json:"tuning"`
Bypass bool `json:"bypass"`
RelayC1 int `json:"c1"`
RelayL int `json:"l"`
RelayC2 int `json:"c2"`
TuningStatus string `json:"tuning_status"`
Connected bool `json:"connected"`
}
func New(host string, port int) *Client {
return &Client{
<<<<<<< HEAD
host: host,
port: port,
stopChan: make(chan struct{}),
=======
host: host,
port: port,
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
}
}
func (c *Client) Connect() error {
c.connMu.Lock()
defer c.connMu.Unlock()
if c.conn != nil {
return nil // Already connected
}
conn, err := net.DialTimeout("tcp", fmt.Sprintf("%s:%d", c.host, c.port), 5*time.Second)
if err != nil {
return fmt.Errorf("failed to connect: %w", err)
}
c.conn = conn
// Read and discard version banner
reader := bufio.NewReader(c.conn)
_, _ = reader.ReadString('\n')
return nil
}
func (c *Client) Close() error {
c.connMu.Lock()
defer c.connMu.Unlock()
if c.stopChan != nil {
close(c.stopChan)
}
if c.conn != nil {
return c.conn.Close()
}
return nil
}
func (c *Client) sendCommand(cmd string) (string, error) {
// Start begins continuous polling of the device
func (c *Client) Start() error {
if c.running {
return nil
}
<<<<<<< HEAD
// Try to connect, but don't fail if it doesn't work
// The poll loop will keep trying
_ = c.Connect()
c.running = true
go c.pollLoop()
return nil
}
// pollLoop continuously polls the device for status
func (c *Client) pollLoop() {
ticker := time.NewTicker(100 * time.Millisecond)
defer ticker.Stop()
for {
select {
case <-ticker.C:
// Try to reconnect if not connected
c.connMu.Lock()
if c.conn == nil {
c.connMu.Unlock()
// Mark as disconnected and reset all values
c.statusMu.Lock()
c.lastStatus = &Status{
Connected: false,
}
c.statusMu.Unlock()
if err := c.Connect(); err != nil {
return "", err
// Silent fail, will retry on next tick
continue
}
c.connMu.Lock()
}
c.connMu.Unlock()
status, err := c.queryStatus()
if err != nil {
// Connection lost, close and retry next tick
c.connMu.Lock()
if c.conn != nil {
c.conn.Close()
c.conn = nil
}
c.connMu.Unlock()
// Mark as disconnected and reset all values
c.statusMu.Lock()
c.lastStatus = &Status{
Connected: false,
}
c.statusMu.Unlock()
continue
}
// Mark as connected
status.Connected = true
c.statusMu.Lock()
c.lastStatus = status
c.statusMu.Unlock()
case <-c.stopChan:
return
}
}
}
func (c *Client) queryStatus() (*Status, error) {
c.connMu.Lock()
defer c.connMu.Unlock()
if c.conn == nil {
return nil, fmt.Errorf("not connected")
}
// Get next command ID from global counter
cmdID := GetGlobalCommandID().GetNextID()
// Format command with ID: C<id>|status get
fullCmd := fmt.Sprintf("C%d|status get\n", cmdID)
// Send command
_, err := c.conn.Write([]byte(fullCmd))
if err != nil {
c.conn = nil
return nil, fmt.Errorf("failed to send command: %w", err)
}
// Read response
reader := bufio.NewReader(c.conn)
response, err := reader.ReadString('\n')
if err != nil {
c.conn = nil
return nil, fmt.Errorf("failed to read response: %w", err)
}
return c.parseStatus(strings.TrimSpace(response))
}
func (c *Client) sendCommand(cmd string) (string, error) {
c.connMu.Lock()
defer c.connMu.Unlock()
if c.conn == nil {
return "", fmt.Errorf("not connected")
}
=======
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
// Get next command ID from global counter
cmdID := GetGlobalCommandID().GetNextID()
@@ -87,119 +248,156 @@ func (c *Client) sendCommand(cmd string) (string, error) {
}
func (c *Client) GetStatus() (*Status, error) {
resp, err := c.sendCommand("status")
if err != nil {
return nil, err
c.statusMu.RLock()
defer c.statusMu.RUnlock()
if c.lastStatus == nil {
return &Status{Connected: false}, nil
}
// Parse the response - format will depend on actual device response
// This is a placeholder that should be updated based on real response format
return c.lastStatus, nil
}
func (c *Client) parseStatus(resp string) (*Status, error) {
status := &Status{
Connected: true,
}
// TODO: Parse actual status response from device
// The response format needs to be determined from real device testing
// For now, we just check if we got a response
_ = resp // Temporary: will be used when we parse the actual response format
// Response format: S<id>|status fwd=21.19 peak=21.55 ...
// Extract the data part after "S<id>|status "
idx := strings.Index(resp, "|status ")
if idx == -1 {
return nil, fmt.Errorf("invalid response format: %s", resp)
}
data := resp[idx+8:] // Skip "|status "
// Parse key=value pairs separated by spaces
pairs := strings.Fields(data)
for _, pair := range pairs {
kv := strings.SplitN(pair, "=", 2)
if len(kv) != 2 {
continue
}
key := kv[0]
value := kv[1]
switch key {
case "fwd":
// fwd is in dBm (e.g., 42.62 dBm)
// Formula: watts = 10^(dBm/10) / 1000
if dBm, err := strconv.ParseFloat(value, 64); err == nil {
milliwatts := math.Pow(10, dBm/10.0)
status.PowerForward = milliwatts / 1000.0
}
case "peak":
// peak power in dBm
if dBm, err := strconv.ParseFloat(value, 64); err == nil {
milliwatts := math.Pow(10, dBm/10.0)
status.PowerPeak = milliwatts / 1000.0
}
case "max":
if dBm, err := strconv.ParseFloat(value, 64); err == nil {
milliwatts := math.Pow(10, dBm/10.0)
status.PowerMax = milliwatts / 1000.0
}
case "swr":
// SWR from return loss
// Formula: returnLoss = abs(swr) / 20
// swr = (10^returnLoss + 1) / (10^returnLoss - 1)
if swrRaw, err := strconv.ParseFloat(value, 64); err == nil {
returnLoss := math.Abs(swrRaw) / 20.0
tenPowRL := math.Pow(10, returnLoss)
calculatedSWR := (tenPowRL + 1) / (tenPowRL - 1)
status.SWR = calculatedSWR
}
case "pttA":
status.PTTA, _ = strconv.Atoi(value)
case "bandA":
status.BandA, _ = strconv.Atoi(value)
case "freqA":
status.FreqA, _ = strconv.ParseFloat(value, 64)
case "bypassA":
status.BypassA = value == "1"
case "antA":
status.AntA, _ = strconv.Atoi(value)
case "pttB":
status.PTTB, _ = strconv.Atoi(value)
case "bandB":
status.BandB, _ = strconv.Atoi(value)
case "freqB":
status.FreqB, _ = strconv.ParseFloat(value, 64)
case "bypassB":
status.BypassB = value == "1"
case "antB":
status.AntB, _ = strconv.Atoi(value)
case "state":
status.State, _ = strconv.Atoi(value)
case "active":
status.Active, _ = strconv.Atoi(value)
case "tuning":
status.Tuning, _ = strconv.Atoi(value)
if status.Tuning == 1 {
status.TuningStatus = "TUNING"
} else {
status.TuningStatus = "READY"
}
case "bypass":
status.Bypass = value == "1"
case "relayC1":
status.RelayC1, _ = strconv.Atoi(value)
case "relayL":
status.RelayL, _ = strconv.Atoi(value)
case "relayC2":
status.RelayC2, _ = strconv.Atoi(value)
}
}
return status, nil
}
func (c *Client) SetOperate(operate bool) error {
var state int
if operate {
state = 1
// SetOperate switches between STANDBY (0) and OPERATE (1)
func (c *Client) SetOperate(value int) error {
if value != 0 && value != 1 {
return fmt.Errorf("invalid operate value: %d (must be 0 or 1)", value)
}
cmd := fmt.Sprintf("operate set=%d", state)
resp, err := c.sendCommand(cmd)
if err != nil {
cmd := fmt.Sprintf("operate set=%d", value)
_, err := c.sendCommand(cmd)
return err
}
// Check if command was successful
if resp == "" {
return fmt.Errorf("empty response from device")
// SetBypass sets BYPASS mode
func (c *Client) SetBypass(value int) error {
if value != 0 && value != 1 {
return fmt.Errorf("invalid bypass value: %d (must be 0 or 1)", value)
}
return nil
}
func (c *Client) SetBypass(bypass bool) error {
var state int
if bypass {
state = 1
}
cmd := fmt.Sprintf("bypass set=%d", state)
resp, err := c.sendCommand(cmd)
if err != nil {
cmd := fmt.Sprintf("bypass set=%d", value)
_, err := c.sendCommand(cmd)
return err
}
// Check if command was successful
if resp == "" {
return fmt.Errorf("empty response from device")
}
return nil
}
func (c *Client) ActivateAntenna(antenna int) error {
if antenna < 0 || antenna > 2 {
return fmt.Errorf("antenna must be 0 (ANT1), 1 (ANT2), or 2 (ANT3)")
}
cmd := fmt.Sprintf("activate ant=%d", antenna)
resp, err := c.sendCommand(cmd)
if err != nil {
return err
}
// Check if command was successful
if resp == "" {
return fmt.Errorf("empty response from device")
}
return nil
}
// AutoTune starts a tuning cycle
func (c *Client) AutoTune() error {
resp, err := c.sendCommand("autotune")
if err != nil {
_, err := c.sendCommand("autotune")
return err
}
// Check if command was successful
if resp == "" {
return fmt.Errorf("empty response from device")
}
return nil
}
// TuneRelay adjusts tuning parameters manually
// TuneRelay adjusts one tuning parameter by one step
// relay: 0=C1, 1=L, 2=C2
// move: -1 to decrease, 1 to increase
func (c *Client) TuneRelay(relay int, move int) error {
// move: -1 (decrease) or 1 (increase)
func (c *Client) TuneRelay(relay, move int) error {
if relay < 0 || relay > 2 {
return fmt.Errorf("relay must be 0 (C1), 1 (L), or 2 (C2)")
return fmt.Errorf("invalid relay: %d (must be 0, 1, or 2)", relay)
}
if move != -1 && move != 1 {
return fmt.Errorf("move must be -1 or 1")
return fmt.Errorf("invalid move: %d (must be -1 or 1)", move)
}
cmd := fmt.Sprintf("tune relay=%d move=%d", relay, move)
resp, err := c.sendCommand(cmd)
if err != nil {
_, err := c.sendCommand(cmd)
return err
}
// Check if command was successful
if resp == "" {
return fmt.Errorf("empty response from device")
}
return nil
}

54
internal/devices/webswitch/webswitch.go
View File

@@ -16,6 +16,7 @@ type Client struct {
type Status struct {
Relays []RelayState `json:"relays"`
Connected bool `json:"connected"`
}
type RelayState struct {
@@ -67,20 +68,56 @@ func (c *Client) TurnOff(relay int) error {
}
func (c *Client) AllOn() error {
for i := 1; i <= 5; i++ {
if err := c.TurnOn(i); err != nil {
return fmt.Errorf("failed to turn on relay %d: %w", i, err)
// Sequence for ALL ON:
// 1. Turn on relays 1, 2, 3, 5 immediately
// 2. Wait 5 seconds
// 3. Turn on relay 4 (Flex Radio Start)
// Turn on relays 1, 2, 3, 5
for _, relay := range []int{1, 2, 3, 5} {
if err := c.TurnOn(relay); err != nil {
return fmt.Errorf("failed to turn on relay %d: %w", relay, err)
}
}
// Wait 5 seconds for power supply to stabilize
time.Sleep(5 * time.Second)
// Turn on relay 4 (Flex Radio)
if err := c.TurnOn(4); err != nil {
return fmt.Errorf("failed to turn on relay 4: %w", err)
}
return nil
}
func (c *Client) AllOff() error {
for i := 1; i <= 5; i++ {
if err := c.TurnOff(i); err != nil {
return fmt.Errorf("failed to turn off relay %d: %w", i, err)
// Sequence for ALL OFF:
// 1. Turn off relay 4 (Flex Radio) immediately
// 2. Turn off relays 2, 3, 5 immediately
// 3. Wait 35 seconds for Flex Radio to shut down
// 4. Turn off relay 1 (Power Supply)
// Turn off relay 4 (Flex Radio)
if err := c.TurnOff(4); err != nil {
return fmt.Errorf("failed to turn off relay 4: %w", err)
}
// Turn off relays 2, 3, 5
for _, relay := range []int{2, 3, 5} {
if err := c.TurnOff(relay); err != nil {
return fmt.Errorf("failed to turn off relay %d: %w", relay, err)
}
}
// Wait 35 seconds for Flex Radio to shut down properly
time.Sleep(35 * time.Second)
// Turn off relay 1 (Power Supply)
if err := c.TurnOff(1); err != nil {
return fmt.Errorf("failed to turn off relay 1: %w", err)
}
return nil
}
@@ -105,7 +142,12 @@ func (c *Client) GetStatus() (*Status, error) {
// Parse response format: "1,1\n2,1\n3,1\n4,1\n5,0\n"
status := &Status{
<<<<<<< HEAD
Relays: make([]RelayState, 0, 5),
Connected: true,
=======
Relays: make([]RelayState, 0, 5),
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
}
lines := strings.Split(strings.TrimSpace(string(body)), "\n")

4
web/index.html
View File

@@ -3,7 +3,11 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<<<<<<< HEAD
<title>ShackMaster - F4BPO Shack</title>
=======
<title>ShackMaster - XV9Q Shack</title>
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500;700&display=swap" rel="stylesheet">

439
web/src/app.css
View File

@@ -1,4 +1,442 @@
:root {
<<<<<<< HEAD
/* Modern dark theme inspired by FlexDXCluster */
--bg-primary: #0a1628;
--bg-secondary: #1a2332;
--bg-tertiary: #243447;
--bg-hover: #2a3f5f;
--text-primary: #e0e6ed;
--text-secondary: #a0aec0;
--text-muted: #718096;
--accent-cyan: #4fc3f7;
--accent-blue: #2196f3;
--accent-green: #4caf50;
--accent-orange: #ff9800;
--accent-red: #f44336;
--accent-purple: #9c27b0;
--accent-yellow: #ffc107;
--border-color: #2d3748;
--border-light: #374151;
--card-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
--card-radius: 6px;
--header-height: 56px;
--spacing-xs: 4px;
--spacing-sm: 8px;
--spacing-md: 12px;
--spacing-lg: 16px;
--spacing-xl: 20px;
}
* {
box-sizing: border-box;
margin: 0;
padding: 0;
}
body {
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
background: var(--bg-primary);
color: var(--text-primary);
font-size: 13px;
line-height: 1.4;
overflow-x: hidden;
}
.app {
display: flex;
flex-direction: column;
height: 100vh;
overflow: hidden;
}
/* ==================== HEADER ==================== */
header {
height: var(--header-height);
background: var(--bg-secondary);
border-bottom: 1px solid var(--border-color);
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 var(--spacing-lg);
flex-shrink: 0;
}
.header-left {
display: flex;
align-items: center;
gap: var(--spacing-lg);
}
.header-left h1 {
font-size: 16px;
font-weight: 600;
color: var(--accent-cyan);
letter-spacing: 0.5px;
}
.connection-status {
display: flex;
align-items: center;
gap: var(--spacing-sm);
font-size: 12px;
color: var(--text-secondary);
}
.status-indicator {
width: 8px;
height: 8px;
border-radius: 50%;
background: var(--accent-red);
transition: background 0.3s;
}
.status-indicator.status-online {
background: var(--accent-green);
box-shadow: 0 0 8px var(--accent-green);
}
.header-center {
display: flex;
gap: var(--spacing-xl);
}
.solar-info {
display: flex;
gap: var(--spacing-md);
font-size: 12px;
}
.solar-item {
color: var(--text-secondary);
}
.solar-item .value {
color: var(--accent-cyan);
font-weight: 600;
margin-left: var(--spacing-xs);
}
.header-right {
display: flex;
align-items: center;
gap: var(--spacing-lg);
}
.weather-info {
display: flex;
gap: var(--spacing-md);
font-size: 12px;
color: var(--text-secondary);
}
.clock {
display: flex;
flex-direction: column;
align-items: flex-end;
font-size: 11px;
}
.clock .time {
font-size: 14px;
font-weight: 600;
color: var(--text-primary);
}
.clock .date {
color: var(--text-secondary);
}
/* ==================== MAIN CONTENT ==================== */
main {
flex: 1;
overflow-y: auto;
padding: var(--spacing-md);
}
.dashboard-grid {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(280px, 1fr));
gap: var(--spacing-md);
max-width: 1800px;
margin: 0 auto;
}
/* ==================== CARDS ==================== */
.card {
background: var(--bg-secondary);
border: 1px solid var(--border-color);
border-radius: var(--card-radius);
padding: var(--spacing-md);
box-shadow: var(--card-shadow);
transition: border-color 0.2s;
}
.card:hover {
border-color: var(--border-light);
}
.card h2 {
font-size: 14px;
font-weight: 600;
color: var(--accent-cyan);
margin-bottom: var(--spacing-md);
display: flex;
align-items: center;
gap: var(--spacing-sm);
letter-spacing: 0.5px;
}
.card h2::before {
content: '';
width: 3px;
height: 14px;
background: var(--accent-cyan);
border-radius: 2px;
}
/* Status indicators */
.status-dot {
width: 8px;
height: 8px;
border-radius: 50%;
background: var(--accent-green);
}
.status-dot.disconnected {
background: var(--accent-red);
}
/* ==================== LABELS & VALUES ==================== */
.label {
font-size: 11px;
color: var(--text-muted);
text-transform: uppercase;
letter-spacing: 0.5px;
margin-bottom: var(--spacing-xs);
}
.value {
font-size: 18px;
font-weight: 300;
color: var(--text-primary);
}
/* ==================== BUTTONS ==================== */
button, .button {
background: var(--bg-tertiary);
color: var(--text-primary);
border: 1px solid var(--border-color);
border-radius: 4px;
padding: var(--spacing-sm) var(--spacing-md);
font-size: 12px;
font-weight: 500;
cursor: pointer;
transition: all 0.2s;
text-transform: uppercase;
letter-spacing: 0.5px;
}
button:hover, .button:hover {
background: var(--bg-hover);
border-color: var(--border-light);
}
button:active, .button:active {
transform: scale(0.98);
}
button.primary {
background: var(--accent-cyan);
border-color: var(--accent-cyan);
color: #000;
}
button.primary:hover {
background: #29b6f6;
border-color: #29b6f6;
}
button.success {
background: var(--accent-green);
border-color: var(--accent-green);
color: white;
}
button.danger {
background: var(--accent-red);
border-color: var(--accent-red);
color: white;
}
button:disabled {
opacity: 0.5;
cursor: not-allowed;
}
/* ==================== SELECT ==================== */
select {
background: var(--bg-tertiary);
color: var(--text-primary);
border: 1px solid var(--border-color);
border-radius: 4px;
padding: var(--spacing-sm);
font-size: 12px;
cursor: pointer;
outline: none;
transition: all 0.2s;
}
select:hover {
border-color: var(--border-light);
}
select:focus {
border-color: var(--accent-cyan);
}
/* ==================== BADGES ==================== */
.badge {
display: inline-block;
padding: 4px 10px;
border-radius: 12px;
font-size: 11px;
font-weight: 600;
text-transform: uppercase;
letter-spacing: 0.5px;
}
.badge.green {
background: rgba(76, 175, 80, 0.2);
color: var(--accent-green);
}
.badge.red {
background: rgba(244, 67, 54, 0.2);
color: var(--accent-red);
}
.badge.orange {
background: rgba(255, 152, 0, 0.2);
color: var(--accent-orange);
}
.badge.cyan {
background: rgba(79, 195, 247, 0.2);
color: var(--accent-cyan);
}
.badge.purple {
background: rgba(156, 39, 176, 0.2);
color: var(--accent-purple);
}
/* ==================== PROGRESS BARS ==================== */
.bar {
width: 100%;
height: 6px;
background: var(--bg-tertiary);
border-radius: 3px;
overflow: hidden;
margin: var(--spacing-xs) 0;
}
.bar-fill {
height: 100%;
background: linear-gradient(90deg, var(--accent-green), var(--accent-orange), var(--accent-red));
transition: width 0.3s ease;
border-radius: 3px;
}
.scale {
display: flex;
justify-content: space-between;
font-size: 10px;
color: var(--text-muted);
margin-top: var(--spacing-xs);
}
/* ==================== METRICS ==================== */
.metrics {
display: flex;
flex-direction: column;
gap: var(--spacing-md);
}
.metric {
display: flex;
flex-direction: column;
gap: var(--spacing-xs);
}
.metric-row {
display: grid;
grid-template-columns: repeat(3, 1fr);
gap: var(--spacing-md);
}
.metric.small {
min-width: 0;
}
.metric-value {
display: flex;
justify-content: space-between;
align-items: baseline;
flex-wrap: wrap;
}
/* ==================== SCROLLBAR ==================== */
::-webkit-scrollbar {
width: 8px;
height: 8px;
}
::-webkit-scrollbar-track {
background: var(--bg-primary);
}
::-webkit-scrollbar-thumb {
background: var(--bg-tertiary);
border-radius: 4px;
}
::-webkit-scrollbar-thumb:hover {
background: var(--bg-hover);
}
/* ==================== RESPONSIVE ==================== */
@media (max-width: 1400px) {
.dashboard-grid {
grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
}
}
@media (max-width: 768px) {
header {
flex-direction: column;
height: auto;
padding: var(--spacing-sm);
gap: var(--spacing-sm);
}
.dashboard-grid {
grid-template-columns: 1fr;
}
.header-center {
order: 3;
width: 100%;
}
=======
--bg-primary: #1a1a1a;
--bg-secondary: #2a2a2a;
--bg-card: #333333;
@@ -125,4 +563,5 @@ input, select {
text-transform: uppercase;
letter-spacing: 1px;
margin-bottom: 4px;
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
}

307
web/src/components/AntennaGenius.svelte
View File

@@ -1,5 +1,43 @@
<script>
import { api } from '../lib/api.js';
<<<<<<< HEAD
export let status;
$: connected = status?.connected || false;
$: portA = status?.port_a || {};
$: portB = status?.port_b || {};
$: antennas = status?.antennas || [];
// Band names
const bandNames = {
0: '160M', 1: '80M', 2: '60M', 3: '40M', 4: '30M',
5: '20M', 6: '17M', 7: '15M', 8: '12M', 9: '10M',
10: '6M', 11: '4M', 12: '2M', 13: '1.25M', 14: '70CM', 15: 'GEN'
};
$: bandAName = bandNames[portA.band] || 'None';
$: bandBName = bandNames[portB.band] || 'None';
async function selectAntenna(port, antennaNum) {
try {
await api.antenna.selectAntenna(port, antennaNum, antennaNum);
} catch (err) {
console.error('Failed to select antenna:', err);
alert('Failed to select antenna');
}
}
async function reboot() {
if (!confirm('Are you sure you want to reboot the Antenna Genius?')) {
return;
}
try {
await api.antenna.reboot();
} catch (err) {
console.error('Failed to reboot:', err);
alert('Failed to reboot');
=======
export let status;
@@ -12,10 +50,82 @@
await api.antenna.set(radio, antenna);
} catch (err) {
console.error('Failed to set antenna:', err);
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
}
}
</script>
<<<<<<< HEAD
<div class="card">
<div class="card-header">
<h2>Antenna Genius</h2>
<span class="status-dot" class:disconnected={!connected}></span>
</div>
<div class="metrics">
<!-- Radio Sources -->
<div class="sources">
<div class="source-item">
<div class="source-label">{portA.source || 'FLEX'}</div>
</div>
<div class="source-item">
<div class="source-label">{portB.source || 'FLEX'}</div>
</div>
</div>
<!-- Bands -->
<div class="bands">
<div class="band-item">
<div class="band-value">{bandAName}</div>
</div>
<div class="band-item">
<div class="band-value">{bandBName}</div>
</div>
</div>
<!-- Antennas -->
<div class="antennas">
{#each antennas as antenna}
{@const isPortATx = portA.tx && portA.tx_ant === antenna.number}
{@const isPortBTx = portB.tx && portB.tx_ant === antenna.number}
{@const isPortARx = !portA.tx && (portA.rx_ant === antenna.number || portA.tx_ant === antenna.number)}
{@const isPortBRx = !portB.tx && (portB.rx_ant === antenna.number || portB.tx_ant === antenna.number)}
{@const isTx = isPortATx || isPortBTx}
{@const isActive = isPortARx || isPortBRx}
<div
class="antenna-card"
class:tx={isTx}
class:active-a={isPortARx}
class:active-b={isPortBRx}
>
<div class="antenna-name">{antenna.name}</div>
<div class="antenna-ports">
<button
class="port-btn"
class:active={portA.tx_ant === antenna.number || portA.rx_ant === antenna.number}
on:click={() => selectAntenna(1, antenna.number)}
>
A
</button>
<button
class="port-btn"
class:active={portB.tx_ant === antenna.number || portB.rx_ant === antenna.number}
on:click={() => selectAntenna(2, antenna.number)}
>
B
</button>
</div>
</div>
{/each}
</div>
<!-- Reboot Button -->
<button class="reboot-btn" on:click={reboot}>
<span class="reboot-icon">🔄</span>
REBOOT
</button>
=======
<div class="antenna-card card">
<h2>
AG 8X2
@@ -56,10 +166,206 @@
</div>
</div>
</div>
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
</div>
</div>
<style>
<<<<<<< HEAD
.card {
background: linear-gradient(135deg, #1a2332 0%, #0f1923 100%);
border: 1px solid #2d3748;
border-radius: 8px;
padding: 0;
overflow: hidden;
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.3);
}
.card-header {
display: flex;
justify-content: space-between;
align-items: center;
padding: 12px 16px;
background: rgba(79, 195, 247, 0.05);
border-bottom: 1px solid #2d3748;
}
h2 {
font-size: 14px;
font-weight: 600;
color: var(--accent-cyan);
margin: 0;
letter-spacing: 0.5px;
}
.status-dot {
width: 8px;
height: 8px;
border-radius: 50%;
background: #4caf50;
box-shadow: 0 0 8px #4caf50;
}
.status-dot.disconnected {
background: #f44336;
box-shadow: 0 0 8px #f44336;
}
.metrics {
padding: 16px;
display: flex;
flex-direction: column;
gap: 12px;
}
/* Sources */
.sources {
display: grid;
grid-template-columns: 1fr 1fr;
gap: 8px;
}
.source-item {
padding: 8px;
background: var(--bg-tertiary);
border-radius: 4px;
text-align: center;
}
.source-label {
font-size: 12px;
font-weight: 600;
color: var(--text-primary);
text-transform: uppercase;
}
/* Bands */
.bands {
display: grid;
grid-template-columns: 1fr 1fr;
gap: 8px;
}
.band-item {
padding: 10px;
background: rgba(79, 195, 247, 0.1);
border: 1px solid rgba(79, 195, 247, 0.3);
border-radius: 4px;
text-align: center;
}
.band-value {
font-size: 16px;
font-weight: 600;
color: var(--accent-cyan);
}
/* Antennas */
.antennas {
display: flex;
flex-direction: column;
gap: 8px;
}
.antenna-card {
display: flex;
justify-content: space-between;
align-items: center;
padding: 12px;
background: var(--bg-tertiary);
border: 2px solid var(--border-color);
border-radius: 6px;
transition: all 0.3s;
}
.antenna-card.tx {
background: rgba(244, 67, 54, 0.2);
border-color: #f44336;
box-shadow: 0 0 20px rgba(244, 67, 54, 0.4);
}
.antenna-card.active-a {
background: rgba(76, 175, 80, 0.2);
border-color: #4caf50;
box-shadow: 0 0 20px rgba(76, 175, 80, 0.3);
}
.antenna-card.active-b {
background: rgba(33, 150, 243, 0.2);
border-color: #2196f3;
box-shadow: 0 0 20px rgba(33, 150, 243, 0.3);
}
.antenna-name {
font-size: 14px;
font-weight: 500;
color: var(--text-primary);
}
.antenna-ports {
display: flex;
gap: 6px;
}
.port-btn {
width: 36px;
height: 36px;
border-radius: 4px;
font-size: 14px;
font-weight: 600;
cursor: pointer;
border: 1px solid var(--border-color);
background: var(--bg-primary);
color: var(--text-secondary);
transition: all 0.2s;
}
.port-btn:hover {
border-color: var(--accent-cyan);
transform: scale(1.05);
}
.port-btn.active {
background: var(--accent-cyan);
border-color: var(--accent-cyan);
color: #000;
box-shadow: 0 0 12px rgba(79, 195, 247, 0.5);
}
/* Reboot Button */
.reboot-btn {
width: 100%;
padding: 12px;
border-radius: 6px;
font-size: 12px;
font-weight: 600;
text-transform: uppercase;
letter-spacing: 0.5px;
cursor: pointer;
border: none;
background: linear-gradient(135deg, #ff9800, #f57c00);
color: white;
transition: all 0.2s;
display: flex;
align-items: center;
justify-content: center;
gap: 6px;
box-shadow: 0 4px 12px rgba(255, 152, 0, 0.4);
margin-top: 8px;
}
.reboot-btn:hover {
transform: translateY(-2px);
box-shadow: 0 6px 16px rgba(255, 152, 0, 0.5);
}
.reboot-btn:active {
transform: translateY(0);
}
.reboot-icon {
font-size: 16px;
=======
.antenna-card {
min-width: 300px;
}
@@ -125,5 +431,6 @@
background: var(--accent-blue);
border-color: var(--accent-blue);
color: white;
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
}
</style>

490
web/src/components/PowerGenius.svelte
View File

@@ -1,4 +1,240 @@
<script>
<<<<<<< HEAD
import { api } from '../lib/api.js';
export let status;
$: powerForward = status?.power_forward || 0;
$: powerReflected = status?.power_reflected || 0;
$: swr = status?.swr || 1.0;
$: voltage = status?.voltage || 0;
$: vdd = status?.vdd || 0;
$: current = status?.current || 0;
$: peakCurrent = status?.peak_current || 0;
$: temperature = status?.temperature || 0;
$: harmonicLoadTemp = status?.harmonic_load_temp || 0;
$: fanMode = status?.fan_mode || 'CONTEST';
$: state = status?.state || 'IDLE';
$: bandA = status?.band_a || '0';
$: bandB = status?.band_b || '0';
$: connected = status?.connected || false;
$: displayState = state.replace('TRANSMIT_A', 'TRANSMIT').replace('TRANSMIT_B', 'TRANSMIT');
// Color functions
$: tempColor = temperature < 40 ? '#4caf50' : temperature < 60 ? '#ffc107' : temperature < 75 ? '#ff9800' : '#f44336';
$: swrColor = swr < 1.5 ? '#4caf50' : swr < 2.0 ? '#ffc107' : swr < 3.0 ? '#ff9800' : '#f44336';
$: powerPercent = Math.min((powerForward / 2000) * 100, 100);
async function setFanMode(mode) {
try {
await api.power.setFanMode(mode);
} catch (err) {
console.error('Failed to set fan mode:', err);
alert('Failed to set fan mode');
}
}
async function toggleOperate() {
try {
const operateValue = state === 'IDLE' ? 0 : 1;
await api.power.setOperate(operateValue);
} catch (err) {
console.error('Failed to toggle operate:', err);
alert('Failed to toggle operate mode');
}
}
</script>
<div class="card">
<div class="card-header">
<h2>Power Genius XL</h2>
<div class="header-right">
<button
class="state-badge"
class:idle={state === 'IDLE'}
class:transmit={state.includes('TRANSMIT')}
on:click={toggleOperate}
>
{displayState}
</button>
<span class="status-dot" class:disconnected={!connected}></span>
</div>
</div>
<div class="metrics">
<!-- Power Display - Big and Bold -->
<div class="power-display">
<div class="power-main">
<div class="power-value">{powerForward.toFixed(0)}<span class="unit">W</span></div>
<div class="power-label">Forward Power</div>
</div>
<div class="power-bar">
<div class="power-bar-fill" style="width: {powerPercent}%">
<div class="power-bar-glow"></div>
</div>
<div class="power-scale">
<span>0</span>
<span>1000</span>
<span>2000</span>
</div>
</div>
</div>
<!-- SWR Circle Indicator -->
<div class="swr-container">
<div class="swr-circle" style="--swr-color: {swrColor}">
<div class="swr-value">{swr.toFixed(2)}</div>
<div class="swr-label">SWR</div>
</div>
<div class="swr-status">
{#if swr < 1.5}
<span class="status-text good">Excellent</span>
{:else if swr < 2.0}
<span class="status-text ok">Good</span>
{:else if swr < 3.0}
<span class="status-text warning">Caution</span>
{:else}
<span class="status-text danger">High!</span>
{/if}
</div>
</div>
<!-- Temperature Gauges -->
<div class="temp-group">
<div class="temp-item">
<div class="temp-value" style="color: {tempColor}">{temperature.toFixed(0)}°</div>
<div class="temp-label">PA Temp</div>
<div class="temp-mini-bar">
<div class="temp-mini-fill" style="width: {(temperature / 80) * 100}%; background: {tempColor}"></div>
</div>
</div>
<div class="temp-item">
<div class="temp-value" style="color: {tempColor}">{harmonicLoadTemp.toFixed(0)}°</div>
<div class="temp-label">HL Temp</div>
<div class="temp-mini-bar">
<div class="temp-mini-fill" style="width: {(harmonicLoadTemp / 80) * 100}%; background: {tempColor}"></div>
</div>
</div>
</div>
<!-- Electrical Parameters -->
<div class="params-grid">
<div class="param-box">
<div class="param-label">VAC</div>
<div class="param-value">{voltage.toFixed(0)}</div>
</div>
<div class="param-box">
<div class="param-label">VDD</div>
<div class="param-value">{vdd.toFixed(1)}</div>
</div>
<div class="param-box">
<div class="param-label">ID Peak</div>
<div class="param-value">{peakCurrent.toFixed(1)}</div>
</div>
</div>
<!-- Band Display -->
<div class="band-display">
<div class="band-item">
<span class="band-label">Band A</span>
<span class="band-value">{bandA}</span>
</div>
<div class="band-item">
<span class="band-label">Band B</span>
<span class="band-value">{bandB}</span>
</div>
</div>
<!-- Fan Control -->
<div class="fan-control">
<label class="control-label">Fan Mode</label>
<select value={fanMode} on:change={(e) => setFanMode(e.target.value)}>
<option value="STANDARD">Standard</option>
<option value="CONTEST">Contest</option>
<option value="BROADCAST">Broadcast</option>
</select>
</div>
</div>
</div>
<style>
.card {
background: linear-gradient(135deg, #1a2332 0%, #0f1923 100%);
border: 1px solid #2d3748;
border-radius: 8px;
padding: 0;
overflow: hidden;
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.3);
}
.card-header {
display: flex;
justify-content: space-between;
align-items: center;
padding: 12px 16px;
background: rgba(79, 195, 247, 0.05);
border-bottom: 1px solid #2d3748;
}
h2 {
font-size: 14px;
font-weight: 600;
color: var(--accent-cyan);
margin: 0;
letter-spacing: 0.5px;
}
.header-right {
display: flex;
align-items: center;
gap: 8px;
}
.state-badge {
padding: 4px 12px;
border-radius: 12px;
font-size: 11px;
font-weight: 600;
text-transform: uppercase;
letter-spacing: 0.5px;
cursor: pointer;
border: none;
transition: all 0.2s;
}
.state-badge.idle {
background: rgba(76, 175, 80, 0.2);
color: #4caf50;
}
.state-badge.transmit {
background: rgba(255, 152, 0, 0.2);
color: #ff9800;
animation: pulse 1s infinite;
}
@keyframes pulse {
0%, 100% { opacity: 1; }
50% { opacity: 0.7; }
}
.status-dot {
width: 8px;
height: 8px;
border-radius: 50%;
background: #4caf50;
box-shadow: 0 0 8px #4caf50;
}
.status-dot.disconnected {
background: #f44336;
box-shadow: 0 0 8px #f44336;
}
.metrics {
padding: 16px;
=======
export let status;
$: powerForward = status?.power_forward || 0;
@@ -145,11 +381,215 @@ async function setFanMode(mode) {
}
.metrics {
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
display: flex;
flex-direction: column;
gap: 16px;
}
<<<<<<< HEAD
/* Power Display */
.power-display {
display: flex;
flex-direction: column;
gap: 8px;
}
.power-main {
text-align: center;
}
.power-value {
font-size: 48px;
font-weight: 200;
color: var(--accent-cyan);
line-height: 1;
text-shadow: 0 0 20px rgba(79, 195, 247, 0.5);
}
.power-value .unit {
font-size: 24px;
color: var(--text-secondary);
margin-left: 4px;
}
.power-label {
font-size: 11px;
color: var(--text-muted);
text-transform: uppercase;
letter-spacing: 1px;
margin-top: 4px;
}
.power-bar {
position: relative;
height: 8px;
background: var(--bg-tertiary);
border-radius: 4px;
overflow: hidden;
}
.power-bar-fill {
position: relative;
height: 100%;
background: linear-gradient(90deg, #4caf50, #ffc107, #ff9800, #f44336);
border-radius: 4px;
transition: width 0.3s ease;
}
.power-bar-glow {
position: absolute;
top: 0;
right: 0;
width: 20px;
height: 100%;
background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.5));
animation: shimmer 2s infinite;
}
@keyframes shimmer {
0% { transform: translateX(-100%); }
100% { transform: translateX(100%); }
}
.power-scale {
display: flex;
justify-content: space-between;
font-size: 9px;
color: var(--text-muted);
margin-top: 4px;
}
/* SWR Circle */
.swr-container {
display: flex;
align-items: center;
gap: 16px;
}
.swr-circle {
width: 80px;
height: 80px;
border-radius: 50%;
background: radial-gradient(circle, rgba(79, 195, 247, 0.1), transparent);
border: 3px solid var(--swr-color);
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
box-shadow: 0 0 20px var(--swr-color);
}
.swr-value {
font-size: 24px;
font-weight: 300;
color: var(--swr-color);
}
.swr-label {
font-size: 10px;
color: var(--text-muted);
text-transform: uppercase;
}
.swr-status {
flex: 1;
}
.status-text {
font-size: 14px;
font-weight: 600;
text-transform: uppercase;
letter-spacing: 0.5px;
}
.status-text.good { color: #4caf50; }
.status-text.ok { color: #ffc107; }
.status-text.warning { color: #ff9800; }
.status-text.danger { color: #f44336; }
/* Temperature */
.temp-group {
display: grid;
grid-template-columns: 1fr 1fr;
gap: 12px;
}
.temp-item {
display: flex;
flex-direction: column;
gap: 4px;
padding: 12px;
background: var(--bg-tertiary);
border-radius: 6px;
}
.temp-value {
font-size: 32px;
font-weight: 300;
line-height: 1;
}
.temp-label {
font-size: 10px;
color: var(--text-muted);
text-transform: uppercase;
}
.temp-mini-bar {
height: 4px;
background: rgba(255, 255, 255, 0.1);
border-radius: 2px;
overflow: hidden;
margin-top: 4px;
}
.temp-mini-fill {
height: 100%;
border-radius: 2px;
transition: width 0.3s ease;
}
/* Parameters Grid */
.params-grid {
display: grid;
grid-template-columns: repeat(3, 1fr);
gap: 8px;
}
.param-box {
padding: 8px;
background: var(--bg-tertiary);
border-radius: 4px;
text-align: center;
}
.param-label {
font-size: 9px;
color: var(--text-muted);
text-transform: uppercase;
letter-spacing: 0.5px;
}
.param-value {
font-size: 18px;
font-weight: 300;
color: var(--text-primary);
margin-top: 2px;
}
/* Band Display */
.band-display {
display: grid;
grid-template-columns: 1fr 1fr;
gap: 8px;
padding: 8px;
background: rgba(79, 195, 247, 0.05);
border-radius: 6px;
}
.band-item {
=======
.metric {
display: flex;
flex-direction: column;
@@ -202,8 +642,58 @@ async function setFanMode(mode) {
}
.band-info {
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
display: flex;
justify-content: space-between;
align-items: center;
}
<<<<<<< HEAD
.band-label {
font-size: 11px;
color: var(--text-muted);
}
.band-value {
font-size: 14px;
font-weight: 600;
color: var(--accent-cyan);
}
/* Fan Control */
.fan-control {
display: flex;
flex-direction: column;
gap: 6px;
}
.control-label {
font-size: 11px;
color: var(--text-muted);
text-transform: uppercase;
letter-spacing: 0.5px;
}
select {
background: var(--bg-tertiary);
color: var(--text-primary);
border: 1px solid var(--border-color);
border-radius: 4px;
padding: 8px;
font-size: 12px;
cursor: pointer;
outline: none;
transition: all 0.2s;
}
select:hover {
border-color: var(--accent-cyan);
}
select:focus {
border-color: var(--accent-cyan);
box-shadow: 0 0 0 2px rgba(79, 195, 247, 0.2);
}
=======
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
</style>

421
web/src/components/RotatorGenius.svelte
View File

@@ -1,4 +1,33 @@
<script>
<<<<<<< HEAD
import { api } from '../lib/api.js';
export let status;
$: heading = status?.heading || 0;
$: connected = status?.connected || false;
let targetHeading = 0;
async function goToHeading() {
if (targetHeading < 0 || targetHeading > 359) {
alert('Heading must be between 0 and 359');
return;
}
try {
// Subtract 10 degrees to compensate for rotator momentum
const adjustedHeading = (targetHeading - 10 + 360) % 360;
await api.rotator.setHeading(adjustedHeading);
} catch (err) {
console.error('Failed to set heading:', err);
alert('Failed to rotate');
}
}
async function rotateCW() {
try {
await api.rotator.rotateCW();
=======
import { onMount } from 'svelte';
import { api } from '../lib/api.js';
@@ -130,19 +159,31 @@
async function rotateCW() {
try {
await api.rotator.cw(1);
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
} catch (err) {
console.error('Failed to rotate CW:', err);
}
}
<<<<<<< HEAD
async function rotateCCW() {
try {
await api.rotator.rotateCCW();
=======
async function rotateCCW() {
try {
await api.rotator.ccw(1);
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
} catch (err) {
console.error('Failed to rotate CCW:', err);
}
}
<<<<<<< HEAD
=======
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
async function stop() {
try {
await api.rotator.stop();
@@ -150,6 +191,385 @@
console.error('Failed to stop:', err);
}
}
<<<<<<< HEAD
</script>
<div class="card">
<div class="card-header">
<h2>Rotator Genius</h2>
<span class="status-dot" class:disconnected={!connected}></span>
</div>
<div class="metrics">
<!-- Current Heading Display -->
<div class="heading-display">
<div class="heading-label">CURRENT HEADING</div>
<div class="heading-value">{heading}°</div>
</div>
<!-- Map with Beam -->
<div class="map-container">
<svg viewBox="0 0 500 500" class="map-svg">
<defs>
<!-- Gradient for beam -->
<radialGradient id="beamGradient">
<stop offset="0%" style="stop-color:rgba(79, 195, 247, 0.7);stop-opacity:1" />
<stop offset="100%" style="stop-color:rgba(79, 195, 247, 0);stop-opacity:0" />
</radialGradient>
</defs>
<!-- Ocean background -->
<circle cx="250" cy="250" r="240" fill="rgba(30, 64, 175, 0.2)" stroke="rgba(79, 195, 247, 0.4)" stroke-width="3"/>
<!-- Simplified world map (Azimuthal centered on France ~46°N 6°E) -->
<g transform="translate(250, 250)" opacity="0.5">
<!-- Europe (enlarged and centered) -->
<!-- France -->
<path d="M -20,-15 L -15,-25 L -5,-28 L 5,-25 L 10,-18 L 8,-8 L 0,-5 L -10,-8 L -18,-12 Z"
fill="#4CAF50" stroke="#81C784" stroke-width="1.5"/>
<!-- Spain/Portugal -->
<path d="M -30,-8 L -22,-12 L -18,-8 L -20,0 L -25,5 L -32,3 L -35,-2 Z"
fill="#4CAF50" stroke="#81C784" stroke-width="1.5"/>
<!-- Italy -->
<path d="M 5,-10 L 10,-12 L 15,-8 L 18,5 L 15,15 L 10,12 L 8,0 Z"
fill="#4CAF50" stroke="#81C784" stroke-width="1.5"/>
<!-- Germany/Central Europe -->
<path d="M -5,-28 L 5,-32 L 15,-30 L 20,-22 L 15,-18 L 5,-20 L 0,-25 Z"
fill="#4CAF50" stroke="#81C784" stroke-width="1.5"/>
<!-- UK/Ireland -->
<path d="M -45,-25 L -40,-32 L -32,-35 L -28,-28 L -32,-20 L -40,-22 Z"
fill="#4CAF50" stroke="#81C784" stroke-width="1.5"/>
<!-- Scandinavia -->
<path d="M 0,-40 L 10,-50 L 20,-48 L 25,-38 L 20,-32 L 10,-35 L 5,-38 Z"
fill="#66BB6A" stroke="#81C784" stroke-width="1.5"/>
<!-- Eastern Europe/Russia West -->
<path d="M 20,-35 L 35,-40 L 50,-35 L 55,-20 L 50,-10 L 35,-8 L 25,-15 Z"
fill="#66BB6A" stroke="#81C784" stroke-width="1.5"/>
<!-- North Africa -->
<path d="M -35,10 L -20,8 L 0,12 L 15,18 L 10,35 L -5,40 L -25,35 L -35,25 Z"
fill="#FFA726" stroke="#FFB74D" stroke-width="1.5"/>
<!-- Sub-Saharan Africa -->
<path d="M -20,42 L 0,45 L 15,50 L 20,70 L 10,95 L -10,100 L -30,90 L -35,70 L -30,50 Z"
fill="#FF9800" stroke="#FFB74D" stroke-width="1.5"/>
<!-- Middle East -->
<path d="M 25,0 L 40,5 L 55,10 L 60,25 L 55,38 L 42,42 L 30,35 L 22,20 Z"
fill="#FFEB3B" stroke="#FFF176" stroke-width="1.5"/>
<!-- Russia East/Central Asia -->
<path d="M 60,-30 L 90,-35 L 120,-25 L 135,-10 L 140,15 L 130,30 L 105,35 L 80,28 L 65,10 L 62,-10 Z"
fill="#AB47BC" stroke="#BA68C8" stroke-width="1.5"/>
<!-- India/South Asia -->
<path d="M 70,40 L 85,38 L 95,45 L 98,60 L 92,75 L 78,80 L 68,72 L 65,55 Z"
fill="#EC407A" stroke="#F06292" stroke-width="1.5"/>
<!-- China/East Asia -->
<path d="M 110,0 L 135,5 L 150,18 L 155,35 L 145,52 L 125,58 L 105,50 L 95,32 L 100,15 Z"
fill="#7E57C2" stroke="#9575CD" stroke-width="1.5"/>
<!-- Japan -->
<path d="M 165,25 L 172,22 L 178,28 L 175,40 L 168,45 L 162,42 L 160,32 Z"
fill="#E91E63" stroke="#F06292" stroke-width="1.5"/>
<!-- North America -->
<path d="M -140,-40 L -110,-50 L -80,-48 L -60,-35 L -55,-15 L -65,5 L -85,15 L -110,12 L -135,-5 L -145,-25 Z"
fill="#42A5F5" stroke="#64B5F6" stroke-width="1.5"/>
<!-- Central America -->
<path d="M -75,20 L -65,18 L -55,25 L -58,35 L -68,38 L -78,32 Z"
fill="#29B6F6" stroke="#4FC3F7" stroke-width="1.5"/>
<!-- South America -->
<path d="M -70,45 L -60,42 L -48,50 L -45,70 L -50,100 L -60,120 L -75,125 L -88,115 L -92,90 L -85,65 L -78,52 Z"
fill="#26C6DA" stroke="#4DD0E1" stroke-width="1.5"/>
<!-- Australia -->
<path d="M 130,95 L 155,92 L 175,100 L 180,120 L 170,135 L 145,138 L 125,128 L 122,110 Z"
fill="#66BB6A" stroke="#81C784" stroke-width="1.5"/>
</g>
<!-- Distance circles -->
<circle cx="250" cy="250" r="180" fill="none" stroke="rgba(79,195,247,0.2)" stroke-width="1" stroke-dasharray="4,4"/>
<circle cx="250" cy="250" r="120" fill="none" stroke="rgba(79,195,247,0.2)" stroke-width="1" stroke-dasharray="4,4"/>
<circle cx="250" cy="250" r="60" fill="none" stroke="rgba(79,195,247,0.2)" stroke-width="1" stroke-dasharray="4,4"/>
<!-- Rotated group for beam -->
<g transform="translate(250, 250)">
<!-- Beam (rotates with heading) -->
<g transform="rotate({heading})">
<!-- Beam sector (±15° = 30° total beamwidth) -->
<path d="M 0,0 L {-Math.sin(15 * Math.PI/180) * 220},{-Math.cos(15 * Math.PI/180) * 220}
A 220,220 0 0,1 {Math.sin(15 * Math.PI/180) * 220},{-Math.cos(15 * Math.PI/180) * 220} Z"
fill="url(#beamGradient)"
opacity="0.85"/>
<!-- Beam outline -->
<line x1="0" y1="0" x2={-Math.sin(15 * Math.PI/180) * 220} y2={-Math.cos(15 * Math.PI/180) * 220}
stroke="#4fc3f7" stroke-width="3" opacity="0.9"/>
<line x1="0" y1="0" x2={Math.sin(15 * Math.PI/180) * 220} y2={-Math.cos(15 * Math.PI/180) * 220}
stroke="#4fc3f7" stroke-width="3" opacity="0.9"/>
<!-- Direction arrow -->
<g transform="translate(0, -190)">
<polygon points="0,-30 -12,8 0,0 12,8"
fill="#4fc3f7"
stroke="#0288d1"
stroke-width="3"
style="filter: drop-shadow(0 0 15px rgba(79, 195, 247, 1))"/>
</g>
</g>
<!-- Center dot (your QTH - JN36dg) -->
<circle cx="0" cy="0" r="6" fill="#f44336" stroke="#fff" stroke-width="3">
<animate attributeName="r" values="6;9;6" dur="2s" repeatCount="indefinite"/>
</circle>
<circle cx="0" cy="0" r="12" fill="none" stroke="#f44336" stroke-width="2" opacity="0.5">
<animate attributeName="r" values="12;20;12" dur="2s" repeatCount="indefinite"/>
<animate attributeName="opacity" values="0.5;0;0.5" dur="2s" repeatCount="indefinite"/>
</circle>
</g>
<!-- Cardinal points -->
<text x="250" y="30" text-anchor="middle" class="cardinal">N</text>
<text x="470" y="255" text-anchor="middle" class="cardinal">E</text>
<text x="250" y="480" text-anchor="middle" class="cardinal">S</text>
<text x="30" y="255" text-anchor="middle" class="cardinal">W</text>
<!-- Degree markers every 30° -->
{#each [30, 60, 120, 150, 210, 240, 300, 330] as angle}
{@const x = 250 + 215 * Math.sin(angle * Math.PI / 180)}
{@const y = 250 - 215 * Math.cos(angle * Math.PI / 180)}
<text x={x} y={y} text-anchor="middle" dominant-baseline="middle" class="degree-label">{angle}°</text>
{/each}
</svg>
</div>
<!-- Go To Heading -->
<div class="goto-container">
<input
type="number"
min="0"
max="359"
bind:value={targetHeading}
placeholder="Enter heading"
class="heading-input"
/>
<button class="go-btn" on:click={goToHeading}>GO</button>
</div>
<!-- Control Buttons -->
<div class="controls">
<button class="control-btn ccw" on:click={rotateCCW}>
<span class="arrow">↺</span>
CCW
</button>
<button class="control-btn stop" on:click={stop}>
STOP
</button>
<button class="control-btn cw" on:click={rotateCW}>
<span class="arrow">↻</span>
CW
</button>
</div>
</div>
</div>
<style>
.card {
background: linear-gradient(135deg, #1a2332 0%, #0f1923 100%);
border: 1px solid #2d3748;
border-radius: 8px;
padding: 0;
overflow: hidden;
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.3);
}
.card-header {
display: flex;
justify-content: space-between;
align-items: center;
padding: 12px 16px;
background: rgba(79, 195, 247, 0.05);
border-bottom: 1px solid #2d3748;
}
h2 {
font-size: 14px;
font-weight: 600;
color: var(--accent-cyan);
margin: 0;
letter-spacing: 0.5px;
}
.status-dot {
width: 8px;
height: 8px;
border-radius: 50%;
background: #4caf50;
box-shadow: 0 0 8px #4caf50;
}
.status-dot.disconnected {
background: #f44336;
box-shadow: 0 0 8px #f44336;
}
.metrics {
padding: 16px;
display: flex;
flex-direction: column;
gap: 16px;
}
/* Heading Display */
.heading-display {
text-align: center;
padding: 12px;
background: rgba(79, 195, 247, 0.1);
border-radius: 6px;
border: 1px solid rgba(79, 195, 247, 0.3);
}
.heading-label {
font-size: 10px;
color: var(--text-muted);
text-transform: uppercase;
letter-spacing: 1px;
margin-bottom: 4px;
}
.heading-value {
font-size: 42px;
font-weight: 200;
color: var(--accent-cyan);
text-shadow: 0 0 20px rgba(79, 195, 247, 0.5);
}
/* Map */
.map-container {
display: flex;
justify-content: center;
padding: 10px;
background: rgba(10, 22, 40, 0.6);
border-radius: 8px;
}
.map-svg {
width: 100%;
max-width: 500px;
height: auto;
}
.cardinal {
fill: var(--accent-cyan);
font-size: 18px;
font-weight: 700;
text-shadow: 0 0 10px rgba(79, 195, 247, 0.8);
}
.degree-label {
fill: rgba(79, 195, 247, 0.7);
font-size: 12px;
font-weight: 600;
}
/* Go To Heading */
.goto-container {
display: grid;
grid-template-columns: 1fr auto;
gap: 8px;
}
.heading-input {
background: var(--bg-tertiary);
color: var(--text-primary);
border: 1px solid var(--border-color);
border-radius: 4px;
padding: 10px 12px;
font-size: 14px;
outline: none;
transition: all 0.2s;
}
.heading-input:focus {
border-color: var(--accent-cyan);
box-shadow: 0 0 0 2px rgba(79, 195, 247, 0.2);
}
.go-btn {
padding: 10px 24px;
border-radius: 4px;
font-size: 13px;
font-weight: 600;
text-transform: uppercase;
cursor: pointer;
border: none;
background: linear-gradient(135deg, var(--accent-cyan), #0288d1);
color: #000;
transition: all 0.2s;
box-shadow: 0 4px 12px rgba(79, 195, 247, 0.4);
}
.go-btn:hover {
transform: translateY(-2px);
box-shadow: 0 6px 16px rgba(79, 195, 247, 0.5);
}
/* Controls */
.controls {
display: grid;
grid-template-columns: 1fr 1fr 1fr;
gap: 8px;
}
.control-btn {
padding: 12px;
border-radius: 6px;
font-size: 12px;
font-weight: 600;
text-transform: uppercase;
cursor: pointer;
border: 1px solid var(--border-color);
background: var(--bg-tertiary);
color: var(--text-primary);
transition: all 0.2s;
display: flex;
flex-direction: column;
align-items: center;
gap: 4px;
}
.control-btn:hover {
border-color: var(--accent-cyan);
transform: translateY(-1px);
}
.control-btn.stop {
background: linear-gradient(135deg, #f44336, #d32f2f);
border-color: #f44336;
color: white;
box-shadow: 0 4px 12px rgba(244, 67, 54, 0.4);
}
.control-btn.stop:hover {
box-shadow: 0 6px 16px rgba(244, 67, 54, 0.5);
}
.arrow {
font-size: 20px;
line-height: 1;
=======
// Preset directions
const presets = [
@@ -330,5 +750,6 @@
.preset-btn.active {
background: var(--accent-green);
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
}
</style>

474
web/src/components/TunerGenius.svelte
View File

@@ -1,5 +1,50 @@
<script>
import { api } from '../lib/api.js';
<<<<<<< HEAD
export let status;
$: powerForward = status?.power_forward || 0;
$: swr = status?.swr || 1.0;
$: tuningStatus = status?.tuning_status || 'READY';
$: frequencyA = status?.frequency_a || 0;
$: frequencyB = status?.frequency_b || 0;
$: bypass = status?.bypass || false;
$: state = status?.state || 0;
$: relayC1 = status?.c1 || 0;
$: relayL = status?.l || 0;
$: relayC2 = status?.c2 || 0;
$: connected = status?.connected || false;
// Color functions
$: swrColor = swr < 1.5 ? '#4caf50' : swr < 2.0 ? '#ffc107' : swr < 3.0 ? '#ff9800' : '#f44336';
$: powerPercent = Math.min((powerForward / 2000) * 100, 100);
async function autoTune() {
try {
await api.tuner.autoTune();
} catch (err) {
console.error('Failed to tune:', err);
alert('Failed to start tuning');
}
}
async function setBypass(value) {
try {
await api.tuner.setBypass(value);
} catch (err) {
console.error('Failed to set bypass:', err);
alert('Failed to set bypass');
}
}
async function setOperate(value) {
try {
await api.tuner.setOperate(value);
} catch (err) {
console.error('Failed to set operate:', err);
alert('Failed to set operate');
=======
export let status;
@@ -40,10 +85,406 @@
await api.tuner.antenna(ant);
} catch (err) {
console.error('Failed to set antenna:', err);
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
}
}
</script>
<<<<<<< HEAD
<div class="card">
<div class="card-header">
<h2>Tuner Genius XL</h2>
<div class="header-right">
<span class="tuning-badge" class:tuning={tuningStatus === 'TUNING'}>{tuningStatus}</span>
<span class="status-dot" class:disconnected={!connected}></span>
</div>
</div>
<div class="metrics">
<!-- Power Display -->
<div class="power-display">
<div class="power-main">
<div class="power-value">{powerForward.toFixed(0)}<span class="unit">W</span></div>
<div class="power-label">Forward Power</div>
</div>
<div class="power-bar">
<div class="power-bar-fill" style="width: {powerPercent}%">
<div class="power-bar-glow"></div>
</div>
<div class="power-scale">
<span>0</span>
<span>1000</span>
<span>2000</span>
</div>
</div>
</div>
<!-- SWR Circle -->
<div class="swr-container">
<div class="swr-circle" style="--swr-color: {swrColor}">
<div class="swr-value">{swr.toFixed(2)}</div>
<div class="swr-label">SWR</div>
</div>
<div class="swr-status">
{#if swr < 1.5}
<span class="status-text good">Excellent</span>
{:else if swr < 2.0}
<span class="status-text ok">Good</span>
{:else if swr < 3.0}
<span class="status-text warning">Caution</span>
{:else}
<span class="status-text danger">High!</span>
{/if}
</div>
</div>
<!-- Tuning Capacitors -->
<div class="capacitors">
<div class="cap-item">
<div class="cap-value">{relayC1}</div>
<div class="cap-label">C1</div>
</div>
<div class="cap-item">
<div class="cap-value">{relayL}</div>
<div class="cap-label">L</div>
</div>
<div class="cap-item">
<div class="cap-value">{relayC2}</div>
<div class="cap-label">C2</div>
</div>
</div>
<!-- Frequencies -->
<div class="freq-display">
<div class="freq-item">
<div class="freq-label">Freq A</div>
<div class="freq-value">{(frequencyA / 1000).toFixed(3)}<span class="freq-unit">MHz</span></div>
</div>
<div class="freq-item">
<div class="freq-label">Freq B</div>
<div class="freq-value">{(frequencyB / 1000).toFixed(3)}<span class="freq-unit">MHz</span></div>
</div>
</div>
<!-- Control Buttons -->
<div class="controls">
<button
class="control-btn operate"
class:active={state === 1}
on:click={() => setOperate(state === 1 ? 0 : 1)}
>
{state === 1 ? 'OPERATE' : 'STANDBY'}
</button>
<button
class="control-btn bypass"
class:active={bypass}
on:click={() => setBypass(bypass ? 0 : 1)}
>
BYPASS
</button>
</div>
<button class="tune-btn" on:click={autoTune}>
<span class="tune-icon">⚡</span>
AUTO TUNE
</button>
</div>
</div>
<style>
.card {
background: linear-gradient(135deg, #1a2332 0%, #0f1923 100%);
border: 1px solid #2d3748;
border-radius: 8px;
padding: 0;
overflow: hidden;
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.3);
}
.card-header {
display: flex;
justify-content: space-between;
align-items: center;
padding: 12px 16px;
background: rgba(79, 195, 247, 0.05);
border-bottom: 1px solid #2d3748;
}
h2 {
font-size: 14px;
font-weight: 600;
color: var(--accent-cyan);
margin: 0;
letter-spacing: 0.5px;
}
.header-right {
display: flex;
align-items: center;
gap: 8px;
}
.tuning-badge {
padding: 4px 12px;
border-radius: 12px;
font-size: 11px;
font-weight: 600;
text-transform: uppercase;
letter-spacing: 0.5px;
background: rgba(76, 175, 80, 0.2);
color: #4caf50;
}
.tuning-badge.tuning {
background: rgba(255, 152, 0, 0.2);
color: #ff9800;
animation: pulse 1s infinite;
}
@keyframes pulse {
0%, 100% { opacity: 1; }
50% { opacity: 0.7; }
}
.status-dot {
width: 8px;
height: 8px;
border-radius: 50%;
background: #4caf50;
box-shadow: 0 0 8px #4caf50;
}
.status-dot.disconnected {
background: #f44336;
box-shadow: 0 0 8px #f44336;
}
.metrics {
padding: 16px;
display: flex;
flex-direction: column;
gap: 16px;
}
/* Power Display */
.power-display {
display: flex;
flex-direction: column;
gap: 8px;
}
.power-main {
text-align: center;
}
.power-value {
font-size: 48px;
font-weight: 200;
color: var(--accent-cyan);
line-height: 1;
text-shadow: 0 0 20px rgba(79, 195, 247, 0.5);
}
.power-value .unit {
font-size: 24px;
color: var(--text-secondary);
margin-left: 4px;
}
.power-label {
font-size: 11px;
color: var(--text-muted);
text-transform: uppercase;
letter-spacing: 1px;
margin-top: 4px;
}
.power-bar {
position: relative;
height: 8px;
background: var(--bg-tertiary);
border-radius: 4px;
overflow: hidden;
}
.power-bar-fill {
position: relative;
height: 100%;
background: linear-gradient(90deg, #4caf50, #ffc107, #ff9800, #f44336);
border-radius: 4px;
transition: width 0.3s ease;
}
.power-bar-glow {
position: absolute;
top: 0;
right: 0;
width: 20px;
height: 100%;
background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.5));
animation: shimmer 2s infinite;
}
@keyframes shimmer {
0% { transform: translateX(-100%); }
100% { transform: translateX(100%); }
}
.power-scale {
display: flex;
justify-content: space-between;
font-size: 9px;
color: var(--text-muted);
margin-top: 4px;
}
/* SWR Circle */
.swr-container {
display: flex;
align-items: center;
gap: 16px;
}
.swr-circle {
width: 80px;
height: 80px;
border-radius: 50%;
background: radial-gradient(circle, rgba(79, 195, 247, 0.1), transparent);
border: 3px solid var(--swr-color);
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
box-shadow: 0 0 20px var(--swr-color);
}
.swr-value {
font-size: 24px;
font-weight: 300;
color: var(--swr-color);
}
.swr-label {
font-size: 10px;
color: var(--text-muted);
text-transform: uppercase;
}
.swr-status {
flex: 1;
}
.status-text {
font-size: 14px;
font-weight: 600;
text-transform: uppercase;
letter-spacing: 0.5px;
}
.status-text.good { color: #4caf50; }
.status-text.ok { color: #ffc107; }
.status-text.warning { color: #ff9800; }
.status-text.danger { color: #f44336; }
/* Capacitors */
.capacitors {
display: grid;
grid-template-columns: repeat(3, 1fr);
gap: 12px;
padding: 16px;
background: rgba(79, 195, 247, 0.05);
border-radius: 6px;
border: 1px solid rgba(79, 195, 247, 0.2);
}
.cap-item {
display: flex;
flex-direction: column;
align-items: center;
gap: 4px;
}
.cap-value {
font-size: 32px;
font-weight: 300;
color: var(--accent-cyan);
text-shadow: 0 0 15px rgba(79, 195, 247, 0.5);
}
.cap-label {
font-size: 10px;
color: var(--text-muted);
text-transform: uppercase;
letter-spacing: 1px;
}
/* Frequencies */
.freq-display {
display: grid;
grid-template-columns: 1fr 1fr;
gap: 12px;
}
.freq-item {
padding: 10px;
background: var(--bg-tertiary);
border-radius: 6px;
display: flex;
flex-direction: column;
gap: 4px;
}
.freq-label {
font-size: 9px;
color: var(--text-muted);
text-transform: uppercase;
letter-spacing: 0.5px;
}
.freq-value {
font-size: 16px;
font-weight: 300;
color: var(--text-primary);
}
.freq-unit {
font-size: 11px;
color: var(--text-secondary);
margin-left: 2px;
}
/* Controls */
.controls {
display: grid;
grid-template-columns: 1fr 1fr;
gap: 8px;
}
.control-btn {
padding: 12px;
border-radius: 6px;
font-size: 12px;
font-weight: 600;
text-transform: uppercase;
letter-spacing: 0.5px;
cursor: pointer;
border: 1px solid var(--border-color);
background: var(--bg-tertiary);
color: var(--text-primary);
transition: all 0.2s;
}
.control-btn:hover {
border-color: var(--accent-cyan);
transform: translateY(-1px);
}
.control-btn.active {
background: var(--accent-cyan);
border-color: var(--accent-cyan);
color: #000;
box-shadow: 0 0 15px rgba(79, 195, 247, 0.5);
=======
<div class="tuner-card card">
<h2>
TGXL
@@ -249,9 +690,42 @@
.action-buttons button {
flex: 1;
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
}
.tune-btn {
width: 100%;
<<<<<<< HEAD
padding: 14px;
border-radius: 6px;
font-size: 13px;
font-weight: 600;
text-transform: uppercase;
letter-spacing: 0.5px;
cursor: pointer;
border: none;
background: linear-gradient(135deg, #f44336, #d32f2f);
color: white;
transition: all 0.2s;
display: flex;
align-items: center;
justify-content: center;
gap: 8px;
box-shadow: 0 4px 12px rgba(244, 67, 54, 0.4);
}
.tune-btn:hover {
transform: translateY(-2px);
box-shadow: 0 6px 16px rgba(244, 67, 54, 0.5);
}
.tune-btn:active {
transform: translateY(0);
}
.tune-icon {
font-size: 18px;
=======
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
}
</style>

255
web/src/components/WebSwitch.svelte
View File

@@ -4,6 +4,10 @@
export let status;
$: relays = status?.relays || [];
<<<<<<< HEAD
$: connected = status?.connected || false;
=======
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
const relayNames = {
1: 'Power Supply',
@@ -51,6 +55,51 @@
}
</script>
<<<<<<< HEAD
<div class="card">
<div class="card-header">
<h2>WebSwitch</h2>
<span class="status-dot" class:disconnected={!connected}></span>
</div>
<div class="metrics">
<div class="relays">
{#each [1, 2, 3, 4, 5] as relayNum}
{@const relay = relays.find(r => r.number === relayNum)}
{@const isOn = relay?.state || false}
<div class="relay-card" class:relay-on={isOn}>
<div class="relay-info">
<div class="relay-details">
<div class="relay-name">{relayNames[relayNum]}</div>
<div class="relay-status">{isOn ? 'ON' : 'OFF'}</div>
</div>
</div>
<button
class="relay-toggle"
class:active={isOn}
class:loading={loading[relayNum]}
disabled={loading[relayNum]}
on:click={() => toggleRelay(relayNum)}
>
<div class="toggle-track">
<div class="toggle-thumb"></div>
</div>
</button>
</div>
{/each}
</div>
<div class="controls">
<button class="control-btn all-on" on:click={allOn}>
<span class="btn-icon">⚡</span>
ALL ON
</button>
<button class="control-btn all-off" on:click={allOff}>
<span class="btn-icon">⏻</span>
ALL OFF
</button>
</div>
=======
<div class="webswitch-card card">
<h2>
1216RH
@@ -78,10 +127,215 @@
<div class="controls">
<button class="btn btn-primary" on:click={allOn}>ALL ON</button>
<button class="btn btn-danger" on:click={allOff}>ALL OFF</button>
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
</div>
</div>
<style>
<<<<<<< HEAD
.card {
background: linear-gradient(135deg, #1a2332 0%, #0f1923 100%);
border: 1px solid #2d3748;
border-radius: 8px;
padding: 0;
overflow: hidden;
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.3);
}
.card-header {
display: flex;
justify-content: space-between;
align-items: center;
padding: 12px 16px;
background: rgba(79, 195, 247, 0.05);
border-bottom: 1px solid #2d3748;
}
h2 {
font-size: 14px;
font-weight: 600;
color: var(--accent-cyan);
margin: 0;
letter-spacing: 0.5px;
}
.status-dot {
width: 8px;
height: 8px;
border-radius: 50%;
background: #4caf50;
box-shadow: 0 0 8px #4caf50;
}
.status-dot.disconnected {
background: #f44336;
box-shadow: 0 0 8px #f44336;
}
.metrics {
padding: 16px;
display: flex;
flex-direction: column;
gap: 12px;
}
/* Relays */
.relays {
display: flex;
flex-direction: column;
gap: 8px;
}
.relay-card {
display: flex;
justify-content: space-between;
align-items: center;
padding: 12px;
background: var(--bg-tertiary);
border-radius: 6px;
border: 1px solid var(--border-color);
transition: all 0.3s;
}
.relay-card.relay-on {
background: rgba(76, 175, 80, 0.1);
border-color: rgba(76, 175, 80, 0.3);
box-shadow: 0 0 15px rgba(76, 175, 80, 0.2);
}
.relay-info {
display: flex;
align-items: center;
}
.relay-details {
display: flex;
flex-direction: column;
gap: 2px;
}
.relay-name {
font-size: 12px;
color: var(--text-primary);
font-weight: 500;
}
.relay-status {
font-size: 10px;
color: var(--text-muted);
text-transform: uppercase;
letter-spacing: 0.5px;
}
.relay-card.relay-on .relay-status {
color: #4caf50;
font-weight: 600;
}
/* Toggle Switch */
.relay-toggle {
padding: 0;
background: transparent;
border: none;
cursor: pointer;
}
.toggle-track {
width: 52px;
height: 28px;
background: var(--bg-primary);
border: 2px solid var(--border-color);
border-radius: 14px;
position: relative;
transition: all 0.3s;
}
.relay-toggle:hover .toggle-track {
border-color: var(--accent-cyan);
}
.relay-toggle.active .toggle-track {
background: linear-gradient(135deg, #4caf50, #66bb6a);
border-color: #4caf50;
box-shadow: 0 0 15px rgba(76, 175, 80, 0.5);
}
.toggle-thumb {
width: 20px;
height: 20px;
background: white;
border-radius: 50%;
position: absolute;
top: 2px;
left: 2px;
transition: all 0.3s;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
}
.relay-toggle.active .toggle-thumb {
transform: translateX(24px);
}
.relay-toggle:disabled {
opacity: 0.5;
cursor: not-allowed;
}
/* Controls */
.controls {
display: grid;
grid-template-columns: 1fr 1fr;
gap: 8px;
margin-top: 8px;
}
.control-btn {
padding: 12px;
border-radius: 6px;
font-size: 12px;
font-weight: 600;
text-transform: uppercase;
letter-spacing: 0.5px;
cursor: pointer;
border: none;
transition: all 0.2s;
display: flex;
align-items: center;
justify-content: center;
gap: 6px;
}
.control-btn:hover {
transform: translateY(-2px);
}
.control-btn:active {
transform: translateY(0);
}
.btn-icon {
font-size: 16px;
}
.all-on {
background: linear-gradient(135deg, #4caf50, #66bb6a);
color: white;
box-shadow: 0 4px 12px rgba(76, 175, 80, 0.4);
}
.all-on:hover {
box-shadow: 0 6px 16px rgba(76, 175, 80, 0.5);
}
.all-off {
background: linear-gradient(135deg, #f44336, #d32f2f);
color: white;
box-shadow: 0 4px 12px rgba(244, 67, 54, 0.4);
}
.all-off:hover {
box-shadow: 0 6px 16px rgba(244, 67, 54, 0.5);
=======
.webswitch-card {
min-width: 280px;
}
@@ -148,5 +402,6 @@
.controls button {
flex: 1;
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
}
</style>

38
web/src/lib/api.js
View File

@@ -47,6 +47,17 @@ export const api = {
// Tuner
tuner: {
<<<<<<< HEAD
setOperate: (value) => request('/tuner/operate', {
method: 'POST',
body: JSON.stringify({ value }),
}),
setBypass: (value) => request('/tuner/bypass', {
method: 'POST',
body: JSON.stringify({ value }),
}),
autoTune: () => request('/tuner/autotune', { method: 'POST' }),
=======
operate: (operate) => request('/tuner/operate', {
method: 'POST',
body: JSON.stringify({ operate }),
@@ -56,14 +67,23 @@ export const api = {
method: 'POST',
body: JSON.stringify({ antenna }),
}),
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
},
// Antenna Genius
antenna: {
<<<<<<< HEAD
selectAntenna: (port, antenna) => request('/antenna/select', {
method: 'POST',
body: JSON.stringify({ port, antenna }),
}),
reboot: () => request('/antenna/reboot', { method: 'POST' }),
=======
set: (radio, antenna) => request('/antenna/set', {
method: 'POST',
body: JSON.stringify({ radio, antenna }),
}),
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
},
// Power Genius
@@ -72,5 +92,23 @@ export const api = {
method: 'POST',
body: JSON.stringify({ mode }),
}),
<<<<<<< HEAD
setOperate: (value) => request('/power/operate', {
method: 'POST',
body: JSON.stringify({ value }),
}),
},
// Rotator Genius
rotator: {
setHeading: (heading) => request('/rotator/heading', {
method: 'POST',
body: JSON.stringify({ heading }),
}),
rotateCW: () => request('/rotator/cw', { method: 'POST' }),
rotateCCW: () => request('/rotator/ccw', { method: 'POST' }),
stop: () => request('/rotator/stop', { method: 'POST' }),
=======
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
},
};

4
web/src/lib/websocket.js
View File

@@ -28,6 +28,10 @@ class WebSocketService {
const message = JSON.parse(event.data);
if (message.type === 'update') {
<<<<<<< HEAD
console.log('System status updated:', message.data);
=======
>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
systemStatus.set(message.data);
lastUpdate.set(new Date(message.timestamp));
}