Add parsing for commands, response structs, position and time commands

indi-starbook/command_interface.cpp

@@ -22,6 +22,7 @@
 #include <exception>
 #include <regex>
 #include <inditelescope.h>
+#include <iomanip>
 #include "command_interface.h"
 
 
@@ -181,6 +182,16 @@ namespace starbook {
         return SendOkCommand(cmd.str());
     }
 
+    ResponseCode CommandInterface::SetPlace(LnLat posn, int tz) {
+        std::ostringstream cmd;
+        if (tz > 24 || tz < -24) throw std::runtime_error("bad tz");
+        cmd << "SETPLACE?" << posn
+            << "&timezone="
+            << std::setfill('0') << std::setw(2) << tz;
+        return SendOkCommand(cmd.str());
+    }
+
+
     ResponseCode CommandInterface::SetSpeed(int speed) {
         if (speed < MIN_SPEED || speed > MAX_SPEED)
             return ERROR_FORMAT;
@@ -200,7 +211,6 @@ namespace starbook {
         return SendOkCommand(cmd.str());
     }
 
-
     ResponseCode CommandInterface::Move(INDI_DIR_WE dir, INDI::Telescope::TelescopeMotionCommand command) {
         std::ostringstream cmd;
         cmd << "MOVE?WEST="
@@ -276,4 +286,30 @@ namespace starbook {
 
         return ERROR_UNKNOWN;
     }
+
+    PlaceResponse CommandInterface::ParsePlaceResponse(const CommandResponse &response) {
+        if (!response.status) throw std::runtime_error("can't parse");
+        return {{0, 0}, 0}; // TODO
+    }
+
+    ln_date CommandInterface::ParseTimeResponse(const CommandResponse &response) {
+        if (!response.status) throw std::runtime_error("can't parse");
+        std::stringstream ss{response.payload.at("time")};
+        UTC time(0, 0, 0, 0, 0, 0);
+        ss >> time;
+        return time;
+    }
+
+    XYResponse CommandInterface::ParseXYResponse(const CommandResponse &response) {
+        if (!response.status) throw std::runtime_error("can't parse");
+        return {
+                .x = std::stod(response.payload.at("X")),
+                .y = std::stod(response.payload.at("Y"))
+        };
+    }
+
+    long int CommandInterface::ParseRoundResponse(const CommandResponse &response) {
+        if (!response.status) throw std::runtime_error("can't parse");
+        return std::stol(response.payload.at("ROUND"));
+    }
 }

indi-starbook/command_interface.h

@@ -39,12 +39,17 @@ namespace starbook {
     } VersionResponse;
 
     typedef struct {
+        LnLat posn;
+        int t;
     } PlaceResponse;
+
     typedef struct {
+        double x;
+        double y;
     } XYResponse;
 
-    const int MIN_SPEED = 0;
-    const int MAX_SPEED = 7;
+    constexpr int MIN_SPEED = 0;
+    constexpr int MAX_SPEED = 7;
 
     class CommandInterface {
     public:
@@ -93,7 +98,7 @@ namespace starbook {
 
         ResponseCode SetSpeed(int speed);
 
-        ResponseCode SetPlace();
+        ResponseCode SetPlace(LnLat posn, int tz);
 
         ResponseCode SetTime(ln_date &utc);
 

indi-starbook/starbook_types.cpp

@@ -85,17 +85,34 @@ ostream &starbook::operator<<(ostream &os, const starbook::Equ &equ) {
     return os;
 }
 
-ostream &starbook::operator<<(ostream &os, const starbook::UTC &utc) {
+constexpr char sep = '+';
+
+ostream &starbook::operator<<(ostream &os, const starbook::UTC &obj) {
     os << setfill('0') << std::fixed << setprecision(0)
-       << utc.years << "+"
-       << setw(2) << utc.months << "+"
-       << setw(2) << utc.days << "+"
-       << setw(2) << utc.hours << "+"
-       << setw(2) << utc.minutes << "+"
-       << setw(2) << floor(utc.seconds);
+       << obj.years << sep
+       << setw(2) << obj.months << sep
+       << setw(2) << obj.days << sep
+       << setw(2) << obj.hours << sep
+       << setw(2) << obj.minutes << sep
+       << setw(2) << floor(obj.seconds);
     return os;
 }
 
+std::istream &starbook::operator>>(std::istream &is, starbook::UTC &utc) {
+    int Y, M, D, h, m, s;
+    std::array<char, 5> ch = {};
+    is >> Y >> ch[0] >> M >> ch[1] >> D >> ch[2] >> h >> ch[3] >> m >> ch[4] >> s;
+
+    if (!is) return is;
+    for (char i : ch)
+        if (i != sep) {
+            is.clear(ios_base::failbit);
+            return is;
+        }
+    utc = UTC(Y, M, D, h, m, static_cast<double>(s));
+    return is;
+}
+
 starbook::CommandResponse::CommandResponse(const std::string &url_like) : status{OK}, raw{url_like} {
     if (url_like.empty()) throw runtime_error("parsing error, no payload");
     if (url_like.rfind("OK", 0) == 0 || url_like.rfind("ERROR", 0) == 0) {

indi-starbook/starbook_types.h

@@ -49,7 +49,20 @@ namespace starbook {
         UTC(int years, int months, int days, int hours, int minutes, double seconds)
                 : ln_date{years, months, days, hours, minutes, seconds} {};
 
-        friend std::ostream &operator<<(std::ostream &os, const UTC &utc);
+        friend std::ostream &operator<<(std::ostream &os, const UTC &obj);
+
+        friend std::istream &operator>>(std::istream &is, UTC &obj);
+
+    };
+
+    struct LnLat : ln_lnlat_posn {
+        // I regret my life decisions
+        LnLat(double ln, double lat)
+                : ln_lnlat_posn{ln, lat} {};
+
+        friend std::ostream &operator<<(std::ostream &os, const LnLat &obj);
+
+        friend std::istream &operator>>(std::istream &is, LnLat &obj);
     };
 
     std::ostream &operator<<(std::ostream &os, const DMS &dms);
@@ -58,7 +71,13 @@ namespace starbook {
 
     std::ostream &operator<<(std::ostream &os, const Equ &equ);
 
-    std::ostream &operator<<(std::ostream &os, const UTC &utc);
+    std::ostream &operator<<(std::ostream &os, const UTC &obj);
+
+    std::istream &operator>>(std::istream &is, UTC &obj);
+
+    std::ostream &operator<<(std::ostream &os, const LnLat &obj);
+
+    std::istream &operator>>(std::istream &is, LnLat &obj);
 
     enum StarbookState {
         INIT, /* Initial state after boot */