Added automatic time-zone setting for UV390.

hmatuschek · Dec 22, 2019 · cd892a6 · cd892a6
1 parent 37b36bb
commit cd892a6
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/lib/uv390_codeplug.cc b/lib/uv390_codeplug.cc
@@ -4,6 +4,7 @@
 #include "channel.hh"
 #include "gpssystem.hh"
 #include "config.h"
+#include <QTimeZone>
 
 
 #define NCHAN           3000
@@ -684,7 +685,7 @@ UV390Codeplug::general_settings_t::clear() {
   group_call_match = 1;
   private_call_match = 1;
   _unused107_4 = 1;
-  time_zone = 0x0c;
+  setTimeZone();
 
   _unused108 = 0xffffffff;
 
@@ -713,6 +714,21 @@ UV390Codeplug::general_settings_t::clear() {
   _unused_160_7 = 1;
 }
 
+QTimeZone
+UV390Codeplug::general_settings_t::getTimeZone() const {
+  return QTimeZone((int(time_zone)-12)*3600);
+}
+
+void
+UV390Codeplug::general_settings_t::setTimeZone() {
+  setTimeZone(QTimeZone::systemTimeZone());
+}
+
+void
+UV390Codeplug::general_settings_t::setTimeZone(const QTimeZone &ts) {
+  time_zone = 12 + ts.offsetFromUtc(QDateTime::currentDateTime())/3600;
+}
+
 uint32_t
 UV390Codeplug::general_settings_t::getRadioId() const {
   return decode_dmr_id_bin(radio_id);
@@ -793,6 +809,7 @@ UV390Codeplug::general_settings_t::fromConfigObj(const Config *conf) {
   setRadioId(conf->id());
   setIntroLine1(conf->introLine1());
   setIntroLine2(conf->introLine2());
+  setTimeZone();
   mic_level = conf->micLevel()/2;
   channel_voice_announce = (conf->speech() ? 1 : 0);
 }

diff --git a/lib/uv390_codeplug.hh b/lib/uv390_codeplug.hh
@@ -522,6 +522,10 @@ protected:
     /** Resets this general settings. */
     void clear();
 
+    QTimeZone getTimeZone() const;
+    void setTimeZone();
+    void setTimeZone(const QTimeZone &tz);
+
     /** Returns the radio DMR ID. */
     uint32_t getRadioId() const;
     /** Sets the radio DMR ID. */
@@ -550,6 +554,7 @@ protected:
     QString getIntroLine2() const;
     /** Sets the second intro line. */
     void setIntroLine2(const QString &text);
+
     /** Updates the generic configuration from this general settings. */
     bool updateConfigObj(Config *conf) const;
     /** Updates this codeplug general settings from the generic configuration. */