timex_datalink_caldav 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f4612f1904efd157ba195ed9b4b1db17877025eaa38801a8c00b02e2bd302d5
-  data.tar.gz: bb734ba73ba8ebde1ef50fda7c85a25e6be05bbaa59b7273bbbabe7bca172b9c
+  metadata.gz: 5d5a3f969562134331aad6dca68c643933c28fb0ff54b69b311d3a6869ffafda
+  data.tar.gz: 20540f73bc0cc75843b1a5a7b4dd677dcd5e90597b8bdf4d570faa6b2cc46dc5
 SHA512:
-  metadata.gz: 0cedac907434c2f7dc0c4f28cefc85d1c09b8b1186dc671d8fca6a0365f44c9fd7afd42967b9bc48314206d7caf47ac0f0de476204ade0df3e9a2e46bc23dc98
-  data.tar.gz: 4e8f924a23cd5fe3401f70ae1d7a28070070a412de12ba6d1848818661b2ee616069feba1e993b47454874dc1ff1d3ba1261a09921ecca413877d3e32a2671e7
+  metadata.gz: 146d615f4942b1bba8aabe4892c8764c78215e82a89006ae6ffe093f8d3d0622c8f1f2ec2e86344989374e9d8596dd7407b8ea5eece171f9a023ff2d5b48fc38
+  data.tar.gz: 64f141143666c103795713065ce8b663805474c5af44cdccc14bfffffd8b6e3619628ca5dc541e4061805e5646659d22078553a7fc79f5af62538f67237ef7cc

data/Gemfile

@@ -9,7 +9,7 @@ gem "rake", "~> 13.0"
 
 gem "rspec", "~> 3.12"
 
-gem "timex_datalink_client", "~> 0.11.0"
+gem "timex_datalink_client", "~> 0.12.1"
 
 gem "calendav", "~> 0.4.0"
 

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    timex_datalink_caldav (1.0.0)
+    timex_datalink_caldav (1.1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.4.3)
-      activesupport (= 7.0.4.3)
-    activesupport (7.0.4.3)
+    activemodel (7.0.6)
+      activesupport (= 7.0.6)
+    activesupport (7.0.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -39,7 +39,7 @@ GEM
       domain_name (~> 0.5)
     http-form_data (2.3.0)
     humanize (2.5.1)
-    i18n (1.13.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     icalendar (2.8.0)
       ice_cube (~> 0.16)
@@ -51,11 +51,11 @@ GEM
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
     mdb (0.5.0)
-    minitest (5.18.0)
-    nokogiri (1.14.4-arm64-darwin)
+    minitest (5.18.1)
+    nokogiri (1.15.3-arm64-darwin)
       racc (~> 1.4)
-    public_suffix (5.0.1)
-    racc (1.6.2)
+    public_suffix (5.0.3)
+    racc (1.7.1)
     rake (13.0.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -69,12 +69,12 @@ GEM
     rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+    rspec-support (3.12.1)
     ruby-progressbar (1.13.0)
     rubyserial (0.6.0)
       ffi (~> 1.9, >= 1.9.3)
     text (1.3.1)
-    timex_datalink_client (0.11.0)
+    timex_datalink_client (0.12.1)
       activemodel (~> 7.0.4)
       crc (~> 0.4.2)
       mdb (~> 0.5.0)
@@ -101,7 +101,7 @@ DEPENDENCIES
   ruby-progressbar (~> 1.13)
   text (~> 1.3)
   timex_datalink_caldav!
-  timex_datalink_client (~> 0.11.0)
+  timex_datalink_client (~> 0.12.1)
   tzinfo (~> 2.0)
   yaml (~> 0.2.1)
 

data/README.md

@@ -72,7 +72,7 @@ endpoints:
 
 The device is a serial device that flashes an led when it receives data. On Linux, this is usually `/dev/tty*`. On macOS, this is usually `$(ls /dev/tty.usbmodem* | head -n 1)`. On Windows, this is usually `COM1`.
 
-If you want to use this, I highly recommend pairing it with the Raspberry Pi Pico and [this project](https://github.com/famiclone6502/DIY_Datalink_Adapter). It is the cheapest and easiest way to get a serial device that works with the Timex Datalink watch.
+If you want to use this, I highly recommend pairing it with the Raspberry Pi Pico and [this project](https://github.com/famiclone6502/DIY_Datalink_Adapter) or [this one](https://github.com/synthead/timex-datalink-arduino). It is the cheapest and easiest way to get a serial device that works with the Timex Datalink watch.
 
 ## Notes
 

data/lib/timex_datalink_caldav/client.rb

@@ -20,7 +20,9 @@ module TimexDatalinkCaldav
                           when 1 then TimexDatalinkClient::Protocol1
                           when 3 then TimexDatalinkClient::Protocol3
                           when 4 then TimexDatalinkClient::Protocol4
+                          when 6 then TimexDatalinkClient::Protocol6
                           when 7 then TimexDatalinkClient::Protocol7
+                          when 9 then TimexDatalinkClient::Protocol9
                           else
                             raise ArgumentError, "Invalid protocol version: #{@protocol_version}"
                           end
@@ -126,7 +128,7 @@ module TimexDatalinkCaldav
         est_time = occurrence.start_time.in_time_zone(get_localzone)
         key = "#{est_time}_#{summary_words.join(' ')}"
         unless anniversary_map[key]
-          puts "Adding anniversary event: #{summary_words.join(' ')} at date #{event.dtstart.to_s}"
+          puts "Adding anniversary event: #{summary_words.join(' ')} at date #{est_time}"
           event_phrase = phrase_builder.vocab_ids_for(*summary_words)
           anniversary = @protocol_class::Eeprom::Calendar::Event.new(
             time: Time.new(est_time.year, est_time.month, est_time.day, 9, 30, 0),
@@ -159,9 +161,9 @@ module TimexDatalinkCaldav
         est_time = occurrence.start_time.in_time_zone(get_localzone)
         key = "#{est_time}_#{summary_words}"
         unless anniversary_map[key]
-          puts "Adding anniversary: #{summary_words.join(' ')} at date #{event.dtstart.to_s}"
+          puts "Adding anniversary: #{summary_words.join(' ')} at date #{est_time}"
           anniversary = @protocol_class::Eeprom::Anniversary.new(
-            time: event.dtstart.to_time,
+            time: est_time,
             anniversary: summary_words.join(' ')
           )
           anniversaries << anniversary
@@ -176,7 +178,7 @@ module TimexDatalinkCaldav
       time1 = Time.now + 3
       time2 = time1.dup.utc
       
-      if @protocol_version == 1
+      if @protocol_version == 1 or @protocol_version == 9
         time_model = @protocol_class::Time.new(
           zone: 1,
           time: time1,
@@ -212,15 +214,40 @@ module TimexDatalinkCaldav
         )
         time_name_model = nil # Not needed for protocol version 3 and 4
         utc_time_name_model = nil # Not needed for protocol version 3 and 4
-
+      elsif @protocol_version == 6
+        time_model = @protocol_class::Time.new(
+          zone: 1,
+          time: time1,
+          is_24h: false,
+          date_format: "%_m-%d-%y"
+        )
+        utc_time_model = @protocol_class::Time.new(
+          zone: 2,
+          flex_time: true,
+          flex_time_zone: true,
+          is_24h: true,
+          date_format: "%_m-%d-%y"
+        )
+        time_name_model = nil # Not needed for protocol version 6
+        utc_time_name_model = nil # Not needed for protocol version 6
       else
         time_model = nil
         utc_time_model = nil
         time_name_model = nil
         utc_time_name_model = nil
       end
-      
-      if @protocol_version == 7
+
+      if @protocol_version == 6 or @protocol_version == 9
+        models = [
+          @protocol_class::Sync.new,
+          @protocol_class::Start.new,
+          time_model,
+          time_name_model,
+          utc_time_model,
+          utc_time_name_model,
+          @protocol_class::End.new
+        ].compact
+      elsif @protocol_version == 7
         calendar = @protocol_class::Eeprom::Calendar.new(
           time: time1,
           events: appointments

data/lib/timex_datalink_caldav/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TimexDatalinkCaldav
-  VERSION = "1.1.1"
+  VERSION = "1.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timex_datalink_caldav
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - Willy Hardy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-13 00:00:00.000000000 Z
+date: 2023-07-11 00:00:00.000000000 Z
 dependencies: []
 description: 'Adds a CLI and a feature to pull your next day of calendar events into
   the Timex Datalink watch. Note: Hardcoded protocol1 and EST timezone. At the moment.'