Fix SETPLACE command

Xiretza · Apr 11, 2019 · b77e5e8 · b77e5e8
1 parent 13fa07a
commit b77e5e8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/3rdparty/indi-starbook/command_interface.cpp b/3rdparty/indi-starbook/command_interface.cpp
@@ -145,11 +145,11 @@ namespace starbook {
 
     ResponseCode CommandInterface::SetPlace(LnLat posn, int tz) {
         std::ostringstream cmd;
-        if (tz > 24 || tz < -24)
-            throw std::domain_error("timezone should be between -24 and 24");
+        if (tz > 12 || tz < -12)
+            throw std::domain_error("timezone should be between -12 and 12");
         cmd << "SETPLACE?" << posn
             << "&timezone="
-            << std::setfill('0') << std::setw(2) << tz;
+            << tz;
         return SendOkCommand(cmd.str());
     }
 

diff --git a/3rdparty/indi-starbook/indi_starbook.cpp b/3rdparty/indi-starbook/indi_starbook.cpp
@@ -326,7 +326,13 @@ bool StarbookDriver::updateLocation(double latitude, double longitude, double el
         LOGF_WARN("Can't update location in %s state", starbook::STATE_TO_STR.at(last_known_state).c_str());
         return false;
     }
+    if (TimeT[1].text == nullptr) {
+        LOG_WARN("Can't update location before time");
+        return false;
+    }
+
     auto utc_offset = static_cast<int>(std::floor(std::strtof(TimeT[1].text, nullptr)));
+    LOGF_DEBUG("UTC offset for location: %i", utc_offset);
     starbook::LnLat posn(latitude, longitude);
     starbook::ResponseCode rc = cmd_interface->SetPlace(posn, utc_offset);
     LogResponse("Updating location", rc);