Merge branch 'main' of https://git.rouggy.com/rouggy/ShackMaster

2026-01-09 23:55:14 +01:00
parent ac99f291a7 4ab192418e
commit bceac40518
16 changed files with 1514 additions and 0 deletions
--- a/internal/api/device_manager.go
+++ b/internal/api/device_manager.go
@@ -79,7 +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,
@@ -95,6 +98,7 @@ 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 {
@@ -122,6 +126,12 @@ func (dm *DeviceManager) Initialize() error {
 		}
 	}()
 	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
@@ -186,6 +196,7 @@ 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
@@ -206,6 +217,28 @@ func (dm *DeviceManager) updateStatus() {
 	} else {
 		log.Printf("Rotator Genius error: %v", err)
 	}
+=======
+	// // 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)
+	// }
+>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7

 	// Solar Data (fetched every 15 minutes, cached)
 	if solarData, err := dm.solarClient.GetSolarData(); err == nil {
--- a/internal/api/handlers.go
+++ b/internal/api/handlers.go
@@ -49,13 +49,18 @@ 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)

@@ -66,6 +71,16 @@ func (s *Server) SetupRoutes() *http.ServeMux {
 	// 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)
+
+	// Antenna Genius endpoints
+	mux.HandleFunc("/api/antenna/set", s.handleAntennaSet)
+
+	// Power Genius endpoints
+	mux.HandleFunc("/api/power/fanmode", s.handlePowerFanMode)
+>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7

 	// Static files (will be frontend)
 	mux.Handle("/", http.FileServer(http.Dir("./web/dist")))
@@ -181,14 +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 {
@@ -196,7 +220,11 @@ func (s *Server) handleRotatorHeading(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
 	}
@@ -210,7 +238,17 @@ 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)
+		return
+	}
+
+	if err := s.deviceManager.RotatorGenius().RotateCW(rotator); err != nil {
+>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
@@ -224,7 +262,17 @@ 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)
+		return
+	}
+
+	if err := s.deviceManager.RotatorGenius().RotateCCW(rotator); err != nil {
+>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
@@ -254,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 {
@@ -262,6 +314,7 @@ 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
@@ -286,6 +339,9 @@ func (s *Server) handleTunerBypass(w http.ResponseWriter, r *http.Request) {
 	}

 	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
 	}
@@ -307,15 +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"`
 	}

@@ -324,7 +387,11 @@ func (s *Server) handleAntennaSelect(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
 	}
@@ -332,13 +399,32 @@ func (s *Server) handleAntennaSelect(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"`
+	}
+
+	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
+		http.Error(w, "Invalid request body", http.StatusBadRequest)
+		return
+	}
+
+	if err := s.deviceManager.AntennaGenius().SetRadioAntenna(req.Radio, req.Antenna); err != nil {
+>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
@@ -370,6 +456,7 @@ 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)
@@ -393,6 +480,8 @@ func (s *Server) handlePowerOperate(w http.ResponseWriter, r *http.Request) {
 	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)
--- a/internal/devices/antennagenius/antennagenius.go
+++ b/internal/devices/antennagenius/antennagenius.go
@@ -3,6 +3,7 @@ package antennagenius
 import (
 	"bufio"
 	"fmt"
+<<<<<<< HEAD
 	"log"
 	"net"
 	"strconv"
@@ -52,17 +53,43 @@ type Antenna struct {
 	RX     string `json:"rx"`
 	InBand string `json:"in_band"`
 	Hotkey int    `json:"hotkey"`
+=======
+	"net"
+	"strconv"
+	"strings"
+	"time"
+
+	. "git.rouggy.com/rouggy/ShackMaster/internal/devices"
+)
+
+type Client struct {
+	host string
+	port int
+	conn net.Conn
+}
+
+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()

@@ -70,20 +97,26 @@ func (c *Client) Connect() error {
 		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()

@@ -91,12 +124,15 @@ func (c *Client) Close() error {
 		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
@@ -263,10 +299,46 @@ func (c *Client) sendCommand(cmd string) (string, error) {

 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 {
+			return "", err
+		}
+	}
+
+	// Get next command ID from global counter
+	cmdID := GetGlobalCommandID().GetNextID()
+
+	// Format command with ID: C<id>|<command>
+	fullCmd := fmt.Sprintf("C%d|%s\n", cmdID, cmd)
+
+	// Send command
+	_, err := c.conn.Write([]byte(fullCmd))
+	if err != nil {
+		c.conn = nil
+		return "", 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 "", fmt.Errorf("failed to read response: %w", err)
+	}
+
+	return strings.TrimSpace(response), nil
+}
+
+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>
@@ -333,10 +405,58 @@ func (c *Client) parseAntennaLine(line string) Antenna {

 func (c *Client) subscribeToPortUpdates() error {
 	resp, err := c.sendCommand("sub port all")
+=======
+	return c.parseStatus(resp)
+}
+
+func (c *Client) parseStatus(resp string) (*Status, error) {
+	status := &Status{
+		Connected: true,
+	}
+
+	// Parse response format from 4O3A API
+	// Expected format will vary - this is a basic parser
+	pairs := strings.Fields(resp)
+
+	for _, pair := range pairs {
+		parts := strings.SplitN(pair, "=", 2)
+		if len(parts) != 2 {
+			continue
+		}
+
+		key := parts[0]
+		value := parts[1]
+
+		switch key {
+		case "radio1", "r1":
+			status.Radio1Antenna, _ = strconv.Atoi(value)
+		case "radio2", "r2":
+			status.Radio2Antenna, _ = strconv.Atoi(value)
+		}
+	}
+
+	return status, nil
+}
+
+// SetRadioAntenna sets which antenna a radio should use
+// radio: 1 or 2
+// antenna: 0-7 (antenna index)
+func (c *Client) SetRadioAntenna(radio int, antenna int) error {
+	if radio < 1 || radio > 2 {
+		return fmt.Errorf("radio must be 1 or 2")
+	}
+	if antenna < 0 || antenna > 7 {
+		return fmt.Errorf("antenna must be between 0 and 7")
+	}
+
+	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")
@@ -345,11 +465,18 @@ func (c *Client) subscribeToPortUpdates() error {
 		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>

@@ -434,4 +561,21 @@ func (c *Client) SetAntenna(port, antenna int) error {
 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 {
+		return -1, fmt.Errorf("radio must be 1 or 2")
+	}
+
+	status, err := c.GetStatus()
+	if err != nil {
+		return -1, err
+	}
+
+	if radio == 1 {
+		return status.Radio1Antenna, nil
+	}
+	return status.Radio2Antenna, nil
+>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
 }
--- a/internal/devices/powergenius/powergenius.go
+++ b/internal/devices/powergenius/powergenius.go
@@ -3,6 +3,10 @@ package powergenius
 import (
 	"bufio"
 	"fmt"
+<<<<<<< HEAD
+=======
+	"log"
+>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
 	"math"
 	"net"
 	"strconv"
@@ -41,6 +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 {
@@ -88,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()

@@ -110,6 +128,7 @@ func (c *Client) pollLoop() {
 	for {
 		select {
 		case <-ticker.C:
+<<<<<<< HEAD
 			// Try to reconnect if not connected
 			c.connMu.Lock()
 			if c.conn == nil {
@@ -133,6 +152,12 @@ func (c *Client) pollLoop() {
 			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()
@@ -140,6 +165,7 @@ func (c *Client) pollLoop() {
 				}
 				c.connMu.Unlock()

+<<<<<<< HEAD
 				// Mark as disconnected and reset all values
 				c.statusMu.Lock()
 				c.lastStatus = &Status{
@@ -152,6 +178,14 @@ func (c *Client) pollLoop() {
 			// 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 {
@@ -327,6 +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":
@@ -399,6 +438,7 @@ 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)
@@ -411,3 +451,5 @@ func (c *Client) SetOperate(value int) error {
 	_, err := c.sendCommand(cmd)
 	return err
 }
+=======
+>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
--- a/internal/devices/rotatorgenius/rotatorgenius.go
+++ b/internal/devices/rotatorgenius/rotatorgenius.go
@@ -8,6 +8,8 @@ import (
 	"strings"
 	"sync"
 	"time"
+
+	. "git.rouggy.com/rouggy/ShackMaster/internal/devices"
 )

 type Client struct {
@@ -149,7 +151,18 @@ func (c *Client) sendCommand(cmd string) error {
 		return fmt.Errorf("not connected")
 	}

+<<<<<<< HEAD
 	_, err := c.conn.Write([]byte(cmd))
+=======
+	// Get next command ID from global counter
+	cmdID := GetGlobalCommandID().GetNextID()
+
+	// Format command with ID: C<id>|<command>
+	fullCmd := fmt.Sprintf("C%d%s", cmdID, cmd)
+
+	// Send command
+	_, err := c.conn.Write([]byte(fullCmd))
+>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
 	if err != nil {
 		c.conn = nil
 		c.reader = nil
--- a/internal/devices/tunergenius/tunergenius.go
+++ b/internal/devices/tunergenius/tunergenius.go
@@ -14,6 +14,7 @@ import (
 )

 type Client struct {
+<<<<<<< HEAD
 	host       string
 	port       int
 	conn       net.Conn
@@ -22,6 +23,11 @@ type Client struct {
 	statusMu   sync.RWMutex
 	stopChan   chan struct{}
 	running    bool
+=======
+	host string
+	port int
+	conn net.Conn
+>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
 }

 type Status struct {
@@ -52,9 +58,14 @@ type Status struct {

 func New(host string, port int) *Client {
 	return &Client{
+<<<<<<< HEAD
 		host:     host,
 		port:     port,
 		stopChan: make(chan struct{}),
+=======
+		host: host,
+		port: port,
+>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
 	}
 }

@@ -99,6 +110,7 @@ func (c *Client) Start() error {
 		return nil
 	}

+<<<<<<< HEAD
 	// Try to connect, but don't fail if it doesn't work
 	// The poll loop will keep trying
 	_ = c.Connect()
@@ -209,6 +221,8 @@ func (c *Client) sendCommand(cmd string) (string, error) {
 		return "", fmt.Errorf("not connected")
 	}

+=======
+>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
 	// Get next command ID from global counter
 	cmdID := GetGlobalCommandID().GetNextID()

--- a/internal/devices/webswitch/webswitch.go
+++ b/internal/devices/webswitch/webswitch.go
@@ -142,8 +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")
--- a/web/index.html
+++ b/web/index.html
@@ -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">
--- a/web/src/app.css
+++ b/web/src/app.css
@@ -1,4 +1,5 @@
 :root {
+<<<<<<< HEAD
  /* Modern dark theme inspired by FlexDXCluster */
  --bg-primary: #0a1628;
  --bg-secondary: #1a2332;
@@ -435,4 +436,132 @@ select:focus {
    order: 3;
    width: 100%;
  }
+=======
+  --bg-primary: #1a1a1a;
+  --bg-secondary: #2a2a2a;
+  --bg-card: #333333;
+  --text-primary: #ffffff;
+  --text-secondary: #b0b0b0;
+  --accent-teal: #00bcd4;
+  --accent-green: #4caf50;
+  --accent-red: #f44336;
+  --accent-blue: #2196f3;
+  --border-color: #444444;
+}
+
+* {
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
+}
+
+body {
+  margin: 0;
+  padding: 0;
+  font-family: 'Roboto', -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  background-color: var(--bg-primary);
+  color: var(--text-primary);
+  overflow-x: hidden;
+}
+
+#app {
+  min-height: 100vh;
+}
+
+button {
+  font-family: inherit;
+  cursor: pointer;
+  border: none;
+  outline: none;
+  transition: all 0.2s ease;
+}
+
+button:hover {
+  transform: translateY(-1px);
+}
+
+button:active {
+  transform: translateY(0);
+}
+
+input, select {
+  font-family: inherit;
+  outline: none;
+}
+
+.card {
+  background: var(--bg-card);
+  border: 1px solid var(--border-color);
+  border-radius: 8px;
+  padding: 16px;
+}
+
+.status-indicator {
+  display: inline-block;
+  width: 12px;
+  height: 12px;
+  border-radius: 50%;
+  margin-right: 8px;
+}
+
+.status-online {
+  background-color: var(--accent-green);
+  box-shadow: 0 0 8px var(--accent-green);
+}
+
+.status-offline {
+  background-color: var(--text-secondary);
+}
+
+.btn {
+  padding: 12px 24px;
+  border-radius: 6px;
+  font-weight: 500;
+  font-size: 14px;
+  text-transform: uppercase;
+  letter-spacing: 0.5px;
+  transition: all 0.2s ease;
+}
+
+.btn-primary {
+  background: var(--accent-green);
+  color: white;
+}
+
+.btn-primary:hover {
+  background: #45a049;
+}
+
+.btn-danger {
+  background: var(--accent-red);
+  color: white;
+}
+
+.btn-danger:hover {
+  background: #da190b;
+}
+
+.btn-secondary {
+  background: var(--bg-secondary);
+  color: var(--text-primary);
+  border: 1px solid var(--border-color);
+}
+
+.btn-secondary:hover {
+  background: var(--bg-card);
+}
+
+.value-display {
+  font-size: 24px;
+  font-weight: 300;
+  color: var(--accent-teal);
+}
+
+.label {
+  font-size: 12px;
+  color: var(--text-secondary);
+  text-transform: uppercase;
+  letter-spacing: 1px;
+  margin-bottom: 4px;
+>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
 }
--- a/web/src/components/AntennaGenius.svelte
+++ b/web/src/components/AntennaGenius.svelte
@@ -1,5 +1,6 @@
 <script>
  import { api } from '../lib/api.js';
+<<<<<<< HEAD
  
  export let status;

@@ -36,10 +37,25 @@
    } catch (err) {
      console.error('Failed to reboot:', err);
      alert('Failed to reboot');
+=======
+
+  export let status;
+
+  $: radio1Antenna = status?.radio1_antenna || 0;
+  $: radio2Antenna = status?.radio2_antenna || 0;
+  $: connected = status?.connected || false;
+
+  async function setRadioAntenna(radio, antenna) {
+    try {
+      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>
@@ -109,10 +125,53 @@
      <span class="reboot-icon">🔄</span>
      REBOOT
    </button>
+=======
+<div class="antenna-card card">
+  <h2>
+    AG 8X2
+    <span class="status-indicator" class:status-online={connected} class:status-offline={!connected}></span>
+  </h2>
+
+  <div class="radio-section">
+    <div class="radio-label">Radio 1 / Radio 2</div>
+    
+    <div class="radio-grid">
+      <div class="radio-column">
+        <div class="radio-title">Radio 1</div>
+        <div class="antenna-slots">
+          {#each Array(4) as _, i}
+            <button 
+              class="slot"
+              class:active={radio1Antenna === i}
+              on:click={() => setRadioAntenna(1, i)}
+            >
+              {i + 1}
+            </button>
+          {/each}
+        </div>
+      </div>
+
+      <div class="radio-column">
+        <div class="radio-title">Radio 2</div>
+        <div class="antenna-slots">
+          {#each Array(4) as _, i}
+            <button 
+              class="slot"
+              class:active={radio2Antenna === i}
+              on:click={() => setRadioAntenna(2, i)}
+            >
+              {i + 1}
+            </button>
+          {/each}
+        </div>
+      </div>
+    </div>
+>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
  </div>
 </div>

 <style>
+<<<<<<< HEAD
  .card {
    background: linear-gradient(135deg, #1a2332 0%, #0f1923 100%);
    border: 1px solid #2d3748;
@@ -306,5 +365,72 @@

  .reboot-icon {
    font-size: 16px;
+=======
+  .antenna-card {
+    min-width: 300px;
+  }
+
+  h2 {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    margin-bottom: 16px;
+    font-size: 18px;
+    font-weight: 500;
+    color: var(--accent-teal);
+  }
+
+  .radio-section {
+    margin-bottom: 16px;
+  }
+
+  .radio-label {
+    font-size: 12px;
+    color: var(--text-secondary);
+    margin-bottom: 12px;
+  }
+
+  .radio-grid {
+    display: flex;
+    gap: 16px;
+  }
+
+  .radio-column {
+    flex: 1;
+  }
+
+  .radio-title {
+    font-size: 14px;
+    font-weight: 500;
+    margin-bottom: 8px;
+    text-align: center;
+  }
+
+  .antenna-slots {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    gap: 8px;
+  }
+
+  .slot {
+    padding: 16px;
+    background: var(--bg-secondary);
+    color: var(--text-primary);
+    border: 2px solid var(--border-color);
+    border-radius: 6px;
+    font-size: 16px;
+    font-weight: 500;
+    transition: all 0.2s ease;
+  }
+
+  .slot:hover {
+    border-color: var(--accent-blue);
+  }
+
+  .slot.active {
+    background: var(--accent-blue);
+    border-color: var(--accent-blue);
+    color: white;
+>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
  }
 </style>
--- a/web/src/components/PowerGenius.svelte
+++ b/web/src/components/PowerGenius.svelte
@@ -1,4 +1,5 @@
 <script>
+<<<<<<< HEAD
  import { api } from '../lib/api.js';
  
  export let status;
@@ -233,11 +234,160 @@

  .metrics {
    padding: 16px;
+=======
+  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');
+$: meffa = status?.meffa || 'STANDBY';
+
+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');
+  }
+}
+
+</script>
+
+<div class="powergenius-card card">
+  <h2>
+    PGXL
+    <span class="status-indicator" class:status-online={connected} class:status-offline={!connected}></span>
+  </h2>
+  
+<div class="status-row">
+  <div class="status-label" class:normal={state === 'IDLE'} class:warning={state.includes('TRANSMIT')}>
+    {displayState}
+  </div>
+</div>
+
+  <div class="metrics">
+    <div class="metric">
+      <div class="label">FWD PWR (W)</div>
+      <div class="value">{powerForward.toFixed(1)}</div>
+      <div class="bar">
+        <div class="bar-fill" style="width: {Math.min(100, (powerForward / 1500) * 100)}%"></div>
+      </div>
+      <div class="scale">
+        <span>0</span>
+        <span>1000</span>
+        <span>2000</span>
+      </div>
+    </div>
+
+    <div class="metric">
+      <div class="label">PG XL SWR 1:1.00 use</div>
+      <div class="value">{swr.toFixed(2)}</div>
+    </div>
+
+    <div class="metric">
+      <div class="label">Temp / HL Temp</div>
+      <div class="value">{temperature.toFixed(0)}°C / {harmonicLoadTemp.toFixed(1)}°C</div>
+      <div class="bar">
+        <div class="bar-fill" style="width: {(temperature / 80) * 100}%"></div>
+      </div>
+      <div class="scale">
+        <span>25</span>
+        <span>55</span>
+        <span>80</span>
+      </div>
+    </div>
+
+    <div class="metric-row">
+      <div class="metric small">
+        <div class="label">VAC</div>
+        <div class="value">{voltage.toFixed(0)}</div>
+      </div>
+      <div class="metric small">
+        <div class="label">VDD</div>
+        <div class="value">{vdd.toFixed(1)}</div>
+      </div>
+      <div class="metric small">
+        <div class="label">ID peak</div>
+        <div class="value">{peakCurrent.toFixed(1)}</div>
+      </div>
+    </div>
+
+    <div class="fan-speed">
+      <div class="label">Fan Speed</div>
+      <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 class="band-info">
+      <div class="label">Band A</div>
+      <div class="value">{bandA}</div>
+    </div>
+    <div class="band-info">
+      <div class="label">Band B</div>
+      <div class="value">{bandB}</div>
+    </div>
+  </div>
+</div>
+
+
+
+<style>
+  .powergenius-card {
+    min-width: 350px;
+  }
+
+  h2 {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    margin-bottom: 12px;
+    font-size: 18px;
+    font-weight: 500;
+    color: var(--accent-teal);
+  }
+
+  .status-label {
+    display: inline-block;
+    padding: 8px 16px;
+    border-radius: 4px;
+    font-size: 14px;
+    font-weight: 500;
+    margin-bottom: 16px;
+  }
+
+  .status-label.normal {
+    background: var(--accent-green);
+    color: white;
+  }
+
+  .status-label.warning {
+    background: var(--accent-red);
+    color: white;
+  }
+
+  .metrics {
+>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
    display: flex;
    flex-direction: column;
    gap: 16px;
  }

+<<<<<<< HEAD
  /* Power Display */
  .power-display {
    display: flex;
@@ -439,10 +589,65 @@
  }

  .band-item {
+=======
+  .metric {
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+  }
+
+  .metric-row {
+    display: flex;
+    gap: 16px;
+  }
+
+  .metric.small {
+    flex: 1;
+  }
+
+  .value {
+    font-size: 20px;
+    font-weight: 300;
+    color: var(--accent-teal);
+  }
+
+  .bar {
+    width: 100%;
+    height: 8px;
+    background: #555;
+    border-radius: 4px;
+    overflow: hidden;
+  }
+
+  .bar-fill {
+    height: 100%;
+    background: linear-gradient(90deg, var(--accent-green), var(--accent-red));
+    transition: width 0.3s ease;
+  }
+
+  .scale {
+    display: flex;
+    justify-content: space-between;
+    font-size: 10px;
+    color: var(--text-secondary);
+  }
+
+  .fan-speed select {
+    width: 100%;
+    padding: 8px;
+    background: var(--bg-secondary);
+    color: var(--text-primary);
+    border: 1px solid var(--border-color);
+    border-radius: 4px;
+  }
+
+  .band-info {
+>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
    display: flex;
    justify-content: space-between;
    align-items: center;
  }
+<<<<<<< HEAD

  .band-label {
    font-size: 11px;
@@ -489,4 +694,6 @@
    border-color: var(--accent-cyan);
    box-shadow: 0 0 0 2px rgba(79, 195, 247, 0.2);
  }
+=======
+>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
 </style>
--- a/web/src/components/RotatorGenius.svelte
+++ b/web/src/components/RotatorGenius.svelte
@@ -1,4 +1,5 @@
 <script>
+<<<<<<< HEAD
  import { api } from '../lib/api.js';
  
  export let status;
@@ -26,19 +27,163 @@
  async function rotateCW() {
    try {
      await api.rotator.rotateCW();
+=======
+  import { onMount } from 'svelte';
+  import { api } from '../lib/api.js';
+
+  export let status;
+
+  $: rotator1 = status?.rotator1 || {};
+  $: rotator2 = status?.rotator2 || {};
+  $: currentHeading = rotator1.current_azimuth || 0;
+  $: targetHeading = rotator1.target_azimuth || 0;
+  $: moving = rotator1.moving || 0;
+  $: connected = rotator1.connected || false;
+
+  let targetInput = currentHeading;
+  let canvas;
+  let ctx;
+
+  onMount(() => {
+    if (canvas) {
+      ctx = canvas.getContext('2d');
+      drawGlobe();
+    }
+  });
+
+  $: if (ctx && currentHeading !== undefined) {
+    drawGlobe();
+  }
+
+  function drawGlobe() {
+    if (!ctx) return;
+
+    const width = canvas.width;
+    const height = canvas.height;
+    const centerX = width / 2;
+    const centerY = height / 2;
+    const radius = Math.min(width, height) / 2 - 20;
+
+    // Clear canvas
+    ctx.clearRect(0, 0, width, height);
+
+    // Draw globe circle
+    ctx.beginPath();
+    ctx.arc(centerX, centerY, radius, 0, 2 * Math.PI);
+    ctx.strokeStyle = '#444';
+    ctx.lineWidth = 2;
+    ctx.stroke();
+
+    // Draw grid lines (latitude/longitude)
+    ctx.strokeStyle = '#333';
+    ctx.lineWidth = 1;
+    
+    // Latitude lines
+    for (let i = 1; i < 4; i++) {
+      const y = centerY - radius + (radius * 2 * i / 4);
+      ctx.beginPath();
+      ctx.moveTo(centerX - radius, y);
+      ctx.lineTo(centerX + radius, y);
+      ctx.stroke();
+    }
+    
+    // Longitude lines
+    for (let i = 1; i < 4; i++) {
+      const x = centerX - radius + (radius * 2 * i / 4);
+      ctx.beginPath();
+      ctx.moveTo(x, centerY - radius);
+      ctx.lineTo(x, centerY + radius);
+      ctx.stroke();
+    }
+
+    // Draw cardinal directions
+    ctx.fillStyle = '#888';
+    ctx.font = '14px Roboto';
+    ctx.textAlign = 'center';
+    ctx.textBaseline = 'middle';
+    
+    ctx.fillText('N', centerX, centerY - radius - 10);
+    ctx.fillText('S', centerX, centerY + radius + 10);
+    ctx.fillText('E', centerX + radius + 10, centerY);
+    ctx.fillText('W', centerX - radius - 10, centerY);
+
+    // Draw heading indicator
+    const angle = (currentHeading - 90) * Math.PI / 180;
+    const lineLength = radius - 10;
+    const endX = centerX + Math.cos(angle) * lineLength;
+    const endY = centerY + Math.sin(angle) * lineLength;
+
+    ctx.beginPath();
+    ctx.moveTo(centerX, centerY);
+    ctx.lineTo(endX, endY);
+    ctx.strokeStyle = '#00bcd4';
+    ctx.lineWidth = 3;
+    ctx.stroke();
+
+    // Draw arrow head
+    const arrowSize = 15;
+    const arrowAngle1 = angle + Math.PI * 0.85;
+    const arrowAngle2 = angle - Math.PI * 0.85;
+    
+    ctx.beginPath();
+    ctx.moveTo(endX, endY);
+    ctx.lineTo(endX + Math.cos(arrowAngle1) * arrowSize, endY + Math.sin(arrowAngle1) * arrowSize);
+    ctx.moveTo(endX, endY);
+    ctx.lineTo(endX + Math.cos(arrowAngle2) * arrowSize, endY + Math.sin(arrowAngle2) * arrowSize);
+    ctx.strokeStyle = '#00bcd4';
+    ctx.lineWidth = 3;
+    ctx.stroke();
+
+    // Draw center dot
+    ctx.beginPath();
+    ctx.arc(centerX, centerY, 5, 0, 2 * Math.PI);
+    ctx.fillStyle = '#f44336';
+    ctx.fill();
+  }
+
+  async function moveToHeading() {
+    const heading = parseInt(targetInput);
+    if (isNaN(heading) || heading < 0 || heading > 360) {
+      alert('Please enter a valid heading (0-360)');
+      return;
+    }
+    
+    try {
+      await api.rotator.move(1, heading);
+    } catch (err) {
+      console.error('Failed to move rotator:', err);
+      alert('Failed to move rotator');
+    }
+  }
+
+  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();
@@ -46,6 +191,7 @@
      console.error('Failed to stop:', err);
    }
  }
+<<<<<<< HEAD
 </script>

 <div class="card">
@@ -423,5 +569,187 @@
  .arrow {
    font-size: 20px;
    line-height: 1;
+=======
+
+  // Preset directions
+  const presets = [
+    { name: 'EU-0', heading: 0 },
+    { name: 'JA-35', heading: 35 },
+    { name: 'AS-75', heading: 75 },
+    { name: 'VK-120', heading: 120 },
+    { name: 'AF-180', heading: 180 },
+    { name: 'SA-230', heading: 230 },
+    { name: 'WI-270', heading: 270 },
+    { name: 'NA-300', heading: 300 }
+  ];
+
+  async function gotoPreset(heading) {
+    try {
+      await api.rotator.move(1, heading);
+    } catch (err) {
+      console.error('Failed to move to preset:', err);
+    }
+  }
+</script>
+
+<div class="rotator-card card">
+  <h2>
+    ROTATOR GENIUS
+    <span class="status-indicator" class:status-online={connected} class:status-offline={!connected}></span>
+  </h2>
+
+  <div class="heading-display">
+    CURRENT HEADING: <span class="heading-value">{currentHeading}°</span>
+  </div>
+
+  {#if moving > 0}
+    <div class="moving-indicator">
+      {moving === 1 ? '↻ ROTATING CW' : '↺ ROTATING CCW'}
+    </div>
+  {/if}
+
+  <canvas bind:this={canvas} width="300" height="300"></canvas>
+
+  <div class="controls">
+    <div class="heading-input">
+      <input 
+        type="number" 
+        min="0" 
+        max="360" 
+        bind:value={targetInput}
+        placeholder="Enter heading"
+      />
+      <button class="btn btn-primary" on:click={moveToHeading}>GO</button>
+    </div>
+
+    <div class="rotation-controls">
+      <button class="btn btn-secondary" on:click={rotateCCW}>↺ CCW</button>
+      <button class="btn btn-danger" on:click={stop}>STOP</button>
+      <button class="btn btn-secondary" on:click={rotateCW}>CW ↻</button>
+    </div>
+  </div>
+
+  <div class="presets">
+    {#each presets as preset}
+      <button 
+        class="preset-btn"
+        class:active={Math.abs(currentHeading - preset.heading) < 5}
+        on:click={() => gotoPreset(preset.heading)}
+      >
+        {preset.name}
+      </button>
+    {/each}
+  </div>
+</div>
+
+<style>
+  .rotator-card {
+    min-width: 350px;
+  }
+
+  h2 {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    margin-bottom: 16px;
+    font-size: 18px;
+    font-weight: 500;
+    color: var(--accent-teal);
+  }
+
+  .heading-display {
+    font-size: 16px;
+    font-weight: 500;
+    text-align: center;
+    margin-bottom: 8px;
+    padding: 12px;
+    background: var(--bg-secondary);
+    border-radius: 6px;
+  }
+
+  .heading-value {
+    color: var(--accent-blue);
+    font-size: 24px;
+    margin-left: 8px;
+  }
+
+  .moving-indicator {
+    text-align: center;
+    padding: 8px;
+    background: var(--accent-green);
+    color: white;
+    border-radius: 4px;
+    margin-bottom: 12px;
+    font-weight: 500;
+    animation: pulse 1.5s ease-in-out infinite;
+  }
+
+  @keyframes pulse {
+    0%, 100% { opacity: 1; }
+    50% { opacity: 0.7; }
+  }
+
+  canvas {
+    display: block;
+    margin: 16px auto;
+    background: var(--bg-secondary);
+    border-radius: 8px;
+  }
+
+  .controls {
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+    margin-bottom: 16px;
+  }
+
+  .heading-input {
+    display: flex;
+    gap: 8px;
+  }
+
+  .heading-input input {
+    flex: 1;
+    padding: 12px;
+    background: var(--bg-secondary);
+    color: var(--text-primary);
+    border: 1px solid var(--border-color);
+    border-radius: 4px;
+    font-size: 16px;
+  }
+
+  .rotation-controls {
+    display: flex;
+    gap: 8px;
+  }
+
+  .rotation-controls button {
+    flex: 1;
+  }
+
+  .presets {
+    display: grid;
+    grid-template-columns: repeat(4, 1fr);
+    gap: 8px;
+  }
+
+  .preset-btn {
+    padding: 12px 8px;
+    background: var(--accent-blue);
+    color: white;
+    border-radius: 4px;
+    font-size: 12px;
+    font-weight: 500;
+    transition: all 0.2s ease;
+  }
+
+  .preset-btn:hover {
+    background: #1976d2;
+    transform: translateY(-2px);
+  }
+
+  .preset-btn.active {
+    background: var(--accent-green);
+>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
  }
 </style>
--- a/web/src/components/TunerGenius.svelte
+++ b/web/src/components/TunerGenius.svelte
@@ -1,5 +1,6 @@
 <script>
  import { api } from '../lib/api.js';
+<<<<<<< HEAD
  
  export let status;

@@ -43,10 +44,53 @@
    } catch (err) {
      console.error('Failed to set operate:', err);
      alert('Failed to set operate');
+=======
+
+  export let status;
+
+  $: operate = status?.operate || false;
+  $: activeAntenna = status?.active_antenna || 0;
+  $: tuningStatus = status?.tuning_status || 'READY';
+  $: frequencyA = status?.frequency_a || 0;
+  $: frequencyB = status?.frequency_b || 0;
+  $: c1 = status?.c1 || 0;
+  $: l = status?.l || 0;
+  $: c2 = status?.c2 || 0;
+  $: connected = status?.connected || false;
+
+  let tuning = false;
+
+  async function toggleOperate() {
+    try {
+      await api.tuner.operate(!operate);
+    } catch (err) {
+      console.error('Failed to toggle operate:', err);
+    }
+  }
+
+  async function startTune() {
+    tuning = true;
+    try {
+      await api.tuner.tune();
+    } catch (err) {
+      console.error('Failed to tune:', err);
+      alert('Tuning failed');
+    } finally {
+      tuning = false;
+    }
+  }
+
+  async function setAntenna(ant) {
+    try {
+      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>
@@ -440,10 +484,218 @@
    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
+    <span class="status-indicator" class:status-online={connected} class:status-offline={!connected}></span>
+  </h2>
+
+  <div class="power-status">
+    <div class="label">Power 0.0w</div>
+    <div class="status-badge">1500</div>
+    <div class="status-badge">1650</div>
+  </div>
+
+  <div class="tuning-controls">
+    <div class="tuning-row">
+      <div class="tuning-label">TG XL SWR 1.00 use</div>
+    </div>
+    
+    <div class="antenna-buttons">
+      <button 
+        class="antenna-btn"
+        class:active={activeAntenna === 0}
+        on:click={() => setAntenna(0)}
+      >
+        C1
+      </button>
+      <button 
+        class="antenna-btn"
+        class:active={activeAntenna === 1}
+        on:click={() => setAntenna(1)}
+      >
+        L
+      </button>
+      <button 
+        class="antenna-btn"
+        class:active={activeAntenna === 2}
+        on:click={() => setAntenna(2)}
+      >
+        C2
+      </button>
+    </div>
+
+    <div class="tuning-values">
+      <div class="value-box">
+        <div class="value">{c1}</div>
+        <div class="label">C1</div>
+      </div>
+      <div class="value-box">
+        <div class="value">{l}</div>
+        <div class="label">L</div>
+      </div>
+      <div class="value-box">
+        <div class="value">{c2}</div>
+        <div class="label">C2</div>
+      </div>
+    </div>
+  </div>
+
+  <div class="status-row">
+    <div class="metric">
+      <div class="label">Tuning Status</div>
+      <div class="status-badge" class:tuning={tuningStatus === 'TUNING'}>
+        {tuningStatus}
+      </div>
+    </div>
+  </div>
+
+  <div class="frequency-row">
+    <div class="metric">
+      <div class="label">Frequency A</div>
+      <div class="value-display">{(frequencyA / 1000).toFixed(3)}</div>
+    </div>
+    <div class="metric">
+      <div class="label">Frequency B</div>
+      <div class="value-display">{(frequencyB / 1000).toFixed(3)}</div>
+    </div>
+  </div>
+
+  <div class="action-buttons">
+    <button 
+      class="btn"
+      class:btn-primary={!operate}
+      class:btn-danger={operate}
+      on:click={toggleOperate}
+    >
+      {operate ? 'STANDBY' : 'OPERATE'}
+    </button>
+    <button class="btn btn-secondary" disabled>BYPASS</button>
+  </div>
+
+  <button 
+    class="btn btn-danger tune-btn"
+    disabled={tuning || !operate}
+    on:click={startTune}
+  >
+    {tuning ? 'TUNING...' : 'TUNE'}
+  </button>
+</div>
+
+<style>
+  .tuner-card {
+    min-width: 350px;
+  }
+
+  h2 {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    margin-bottom: 16px;
+    font-size: 18px;
+    font-weight: 500;
+    color: var(--accent-teal);
+  }
+
+  .power-status {
+    display: flex;
+    gap: 12px;
+    align-items: center;
+    margin-bottom: 16px;
+  }
+
+  .status-badge {
+    padding: 4px 12px;
+    background: var(--bg-secondary);
+    border: 1px solid var(--border-color);
+    border-radius: 4px;
+    font-size: 12px;
+  }
+
+  .status-badge.tuning {
+    background: var(--accent-green);
+    color: white;
+  }
+
+  .tuning-controls {
+    margin-bottom: 16px;
+  }
+
+  .tuning-label {
+    font-size: 12px;
+    margin-bottom: 8px;
+  }
+
+  .antenna-buttons {
+    display: flex;
+    gap: 8px;
+    margin: 12px 0;
+  }
+
+  .antenna-btn {
+    flex: 1;
+    padding: 12px;
+    background: var(--bg-secondary);
+    color: var(--text-primary);
+    border: 1px solid var(--border-color);
+    border-radius: 4px;
+    font-weight: 500;
+  }
+
+  .antenna-btn.active {
+    background: var(--accent-blue);
+    border-color: var(--accent-blue);
+  }
+
+  .tuning-values {
+    display: flex;
+    gap: 12px;
+    margin: 16px 0;
+  }
+
+  .value-box {
+    flex: 1;
+    text-align: center;
+    padding: 12px;
+    background: var(--bg-secondary);
+    border-radius: 4px;
+  }
+
+  .value-box .value {
+    font-size: 20px;
+    font-weight: 300;
+    color: var(--accent-teal);
+  }
+
+  .status-row {
+    margin-bottom: 16px;
+  }
+
+  .frequency-row {
+    display: flex;
+    gap: 16px;
+    margin-bottom: 16px;
+  }
+
+  .metric {
+    flex: 1;
+  }
+
+  .action-buttons {
+    display: flex;
+    gap: 12px;
+    margin-bottom: 12px;
+  }
+
+  .action-buttons button {
+    flex: 1;
+>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
  }

  .tune-btn {
    width: 100%;
+<<<<<<< HEAD
    padding: 14px;
    border-radius: 6px;
    font-size: 13px;
@@ -473,5 +725,7 @@

  .tune-icon {
    font-size: 18px;
+=======
+>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
  }
 </style>
--- a/web/src/components/WebSwitch.svelte
+++ b/web/src/components/WebSwitch.svelte
@@ -4,7 +4,10 @@
  export let status;

  $: relays = status?.relays || [];
+<<<<<<< HEAD
  $: connected = status?.connected || false;
+=======
+>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7

  const relayNames = {
    1: 'Power Supply',
@@ -52,6 +55,7 @@
  }
 </script>

+<<<<<<< HEAD
 <div class="card">
  <div class="card-header">
    <h2>WebSwitch</h2>
@@ -95,10 +99,40 @@
        ALL OFF
      </button>
    </div>
+=======
+<div class="webswitch-card card">
+  <h2>
+    1216RH
+    <span class="status-indicator" class:status-online={relays.length > 0} class:status-offline={relays.length === 0}></span>
+  </h2>
+  
+  <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-row">
+        <span class="relay-name">{relayNames[relayNum]}</span>
+        <button 
+          class="relay-toggle"
+          class:active={isOn}
+          disabled={loading[relayNum]}
+          on:click={() => toggleRelay(relayNum)}
+        >
+          <div class="toggle-icon"></div>
+        </button>
+      </div>
+    {/each}
+  </div>
+
+  <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;
@@ -301,5 +335,73 @@

  .all-off:hover {
    box-shadow: 0 6px 16px rgba(244, 67, 54, 0.5);
+=======
+  .webswitch-card {
+    min-width: 280px;
+  }
+
+  h2 {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    margin-bottom: 20px;
+    font-size: 18px;
+    font-weight: 500;
+    color: var(--accent-teal);
+  }
+
+  .relays {
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+    margin-bottom: 20px;
+  }
+
+  .relay-row {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .relay-name {
+    font-size: 14px;
+  }
+
+  .relay-toggle {
+    width: 60px;
+    height: 32px;
+    background: #555;
+    border-radius: 16px;
+    position: relative;
+    transition: background 0.3s ease;
+  }
+
+  .relay-toggle.active {
+    background: var(--accent-green);
+  }
+
+  .toggle-icon {
+    width: 24px;
+    height: 24px;
+    background: white;
+    border-radius: 50%;
+    position: absolute;
+    top: 4px;
+    left: 4px;
+    transition: transform 0.3s ease;
+  }
+
+  .relay-toggle.active .toggle-icon {
+    transform: translateX(28px);
+  }
+
+  .controls {
+    display: flex;
+    gap: 12px;
+  }
+
+  .controls button {
+    flex: 1;
+>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
  }
 </style>
--- a/web/src/lib/api.js
+++ b/web/src/lib/api.js
@@ -47,6 +47,7 @@ export const api = {

  // Tuner
  tuner: {
+<<<<<<< HEAD
    setOperate: (value) => request('/tuner/operate', {
      method: 'POST',
      body: JSON.stringify({ value }),
@@ -56,15 +57,33 @@ export const api = {
      body: JSON.stringify({ value }),
    }),
    autoTune: () => request('/tuner/autotune', { method: 'POST' }),
+=======
+    operate: (operate) => request('/tuner/operate', {
+      method: 'POST',
+      body: JSON.stringify({ operate }),
+    }),
+    tune: () => request('/tuner/tune', { method: 'POST' }),
+    antenna: (antenna) => request('/tuner/antenna', {
+      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
@@ -73,6 +92,7 @@ export const api = {
      method: 'POST',
      body: JSON.stringify({ mode }),
    }),
+<<<<<<< HEAD
    setOperate: (value) => request('/power/operate', {
      method: 'POST',
      body: JSON.stringify({ value }),
@@ -88,5 +108,7 @@ export const api = {
    rotateCW: () => request('/rotator/cw', { method: 'POST' }),
    rotateCCW: () => request('/rotator/ccw', { method: 'POST' }),
    stop: () => request('/rotator/stop', { method: 'POST' }),
+=======
+>>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
  },
 };
--- a/web/src/lib/websocket.js
+++ b/web/src/lib/websocket.js
@@ -28,7 +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));
          }