Merge branch 'main' of https://git.rouggy.com/rouggy/ShackMaster
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user