timex_datalink_caldav 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c7e200c3fbb1011bd0b0b67b98db758f8802b72d8686ceb991b4766cb285860
-  data.tar.gz: e5b0052df0811f4af6f52c34727bd26bd93254903fdc218e9be00d51ae5ac169
+  metadata.gz: 8d31450cb602c3c36c121b4ffd2240664ed8f9e550388a246f1c5e169d12f7fa
+  data.tar.gz: 351b4213184ca2652205c80e99b7997538385bd0fab7e6ee3f4a6a57f1977247
 SHA512:
-  metadata.gz: b07bd1855b0b9ffe5a36301c239df18f588bacfd7c1ba6f3e20988057cab7491343dc86072ad43bd5194e0c67e5d25ccb9d4f252214953dd8ed2a793819d9a72
-  data.tar.gz: 529e2275b9207f501414c41131df0e505ae85e46ae8319a4ab0c04a35275b85be393c84b022e0e10890e3072ff4969a351aa55da453a3183b240bc9db19df94f
+  metadata.gz: '08bf1aa6454647ccc74a568cb0e54e5b9724394da3f0d8ff6a8bcb0205d63ddb35208b40d99cbdbdab0be8c6b6e5c0c6febdb9db3369c415bad5cfdba7be7cb5'
+  data.tar.gz: c2334ebf8d3d5515f4bce340808b61cacdc39ccdeaad6d2b7e7e356340fb97cf049c0316d1587d37b74dad9f4a593dcf91be66399bbfc3075018ef023a0e267d

data/Gemfile

@@ -18,3 +18,5 @@ gem "icalendar", "~> 2.8"
 gem "icalendar-recurrence", "~> 1.1"
 
 gem "activesupport", "~> 7.0"
+
+gem "tzinfo", "~> 2.0"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    timex_datalink_caldav (0.1.0)
+    timex_datalink_caldav (0.2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -92,6 +92,7 @@ DEPENDENCIES
   rspec (~> 3.12)
   timex_datalink_caldav!
   timex_datalink_client (~> 0.11.0)
+  tzinfo (~> 2.0)
 
 BUNDLED WITH
    2.4.10

data/README.md

@@ -45,14 +45,14 @@ After installing the gem, you can use it as a CLI tool:
 timex_datalink_caldav -u https://caldavendpoint.com -n your_username -p your_password -d your_device
 ```
 
-Please replace `your_username`, `your_password`, and `your_device` with your actual CalDAV server username, password, and device respectively. In this example, we're using Apple's iCloud CalDAV server. You'll need to replace this with the URI of your own CalDAV server if you're not using iCloud.
+Please replace `caldavendpoint.com` `your_username`, `your_password`, and `your_device` with your actual CalDAV server, username, password, and serial device respectively.
 
-## Note
+The device is a serial device that flashes an led when it receives data. On Linux, this is usually `/dev/ttyUSB0`. On macOS, this is usually `/dev/cu.usbserial-0001`. On Windows, this is usually `COM1`.
 
-Ensure you have the necessary dependencies installed on your system and you have the correct permissions to access the specified device. 
+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.
 
-The tool currently works with events that have attendees and converts event times to Eastern Standard Time (EST). Events are sorted by time before syncing to the watch.
+## Note
 
-## Resources
+Ensure you have the necessary dependencies installed on your system and you have the correct permissions to access the specified device.
 
-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).
+The tool currently filters down to events that have attendees and converts event times to Eastern Standard Time (EST). Events are sorted by time before syncing to the watch.

data/lib/timex_datalink_caldav/client.rb

@@ -2,14 +2,27 @@ require 'calendav'
 require 'icalendar/recurrence'
 require 'timex_datalink_client'
 require 'active_support/time'
+require 'tzinfo'
 
 module TimexDatalinkCaldav
   class Client
-    def initialize(user, password, server_url, serial_device)
+    def initialize(user, password, server_url, serial_device, protocol_version)
       @user = user
       @password = password
       @server_url = server_url
       @serial_device = serial_device
+      @protocol_version = protocol_version.to_i
+      @protocol_class = case @protocol_version
+                        when 1 then TimexDatalinkClient::Protocol1
+                        when 3 then TimexDatalinkClient::Protocol3
+                        when 4 then TimexDatalinkClient::Protocol4
+                        else
+                          raise ArgumentError, "Invalid protocol version: #{@protocol_version}"
+                        end
+                      end
+
+    def get_localzone
+      TZInfo::Timezone.get(TZInfo::Timezone.all_country_zones.detect {|z| z.period_for_local(Time.now).utc_total_offset == Time.now.utc_offset}.identifier)
     end
 
     def get_events
@@ -40,11 +53,12 @@ module TimexDatalinkCaldav
           if ical_event.attendee&.any? # Exclude events without attendees
             next_occurrence = ical_event.occurrences_between(Time.now, Time.now + 24*60*60).first
             if next_occurrence
-              est_time = next_occurrence.start_time.in_time_zone('Eastern Time (US & Canada)')
+              puts get_localzone
+              est_time = next_occurrence.start_time.in_time_zone(get_localzone)
               key = "#{est_time}_#{ical_event.summary.to_s}"
               unless appointment_map[key] # Check if the event is already in the map
                 puts "Adding appointment: #{ical_event.summary.to_s} at time #{est_time}"
-                appointment = TimexDatalinkClient::Protocol1::Eeprom::Appointment.new(
+                appointment = @protocol_class::Eeprom::Appointment.new(
                   time: est_time,
                   message: ical_event.summary.to_s
                 )
@@ -62,26 +76,62 @@ module TimexDatalinkCaldav
     end
 
     def write_to_watch(appointments)
-      time1 = Time.now
-
-      models = [
-        TimexDatalinkClient::Protocol1::Sync.new,
-        TimexDatalinkClient::Protocol1::Start.new,
-        TimexDatalinkClient::Protocol1::Time.new(
+      # add 3 because it always seems to be about 3 seconds behind.
+      time1 = Time.now + 3
+      time2 = time1.dup.utc
+      
+      if @protocol_version == 1
+        time_model = @protocol_class::Time.new(
           zone: 1,
           time: time1,
           is_24h: false
-        ),
-        TimexDatalinkClient::Protocol1::TimeName.new(
+        )
+        time_name_model = @protocol_class::TimeName.new(
           zone: 1,
           name: time1.zone
-        ),
-        TimexDatalinkClient::Protocol1::Eeprom.new(
+        )
+        utc_time_model = @protocol_class::Time.new(
+          zone: 2,
+          time: time2,
+          is_24h: true
+        )
+        utc_time_name_model = @protocol_class::TimeName.new(
+          zone: 2,
+          name: time2.zone
+        )
+      else
+        time_model = @protocol_class::Time.new(
+          zone: 1,
+          name: time1.zone,
+          time: time1,
+          is_24h: false,
+          date_format: "%_m-%d-%y"
+        )
+        utc_time_model = @protocol_class::Time.new(
+          zone: 2,
+          name: "UTC",
+          time: time2,
+          is_24h: true,
+          date_format: "%y-%m-%d"
+        )
+        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
+
+      end
+
+      models = [
+        @protocol_class::Sync.new,
+        @protocol_class::Start.new,
+        time_model,
+        time_name_model,
+        utc_time_model,
+        utc_time_name_model,
+        @protocol_class::Eeprom.new(
           appointments: appointments,
           appointment_notification_minutes: 5
         ),
-        TimexDatalinkClient::Protocol1::End.new
-      ]
+        @protocol_class::End.new
+      ].compact # Remove any nil entries
 
       timex_datalink_client = TimexDatalinkClient.new(
         serial_device: @serial_device,

data/lib/timex_datalink_caldav/version.rb

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

data/lib/timex_datalink_caldav.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require 'optparse'
-
 require_relative "timex_datalink_caldav/client"
 
 module TimexDatalinkCaldav
@@ -10,7 +9,7 @@ module TimexDatalinkCaldav
     end
 
     def execute
-      client = TimexDatalinkCaldav::Client.new(@options.fetch(:user), @options.fetch(:password), @options.fetch(:uri), @options.fetch(:device))
+      client = TimexDatalinkCaldav::Client.new(@options.fetch(:user), @options.fetch(:password), @options.fetch(:uri), @options.fetch(:device), @options.fetch(:api,1))
       client.sync_to_watch
     end
 
@@ -36,6 +35,10 @@ module TimexDatalinkCaldav
         opts.on("-d", "--device DEVICE", "Serial device for Timex Datalink watch") do |v|
           options[:device] = v
         end
+
+        opts.on("-a", "--api PROTOCOL_VERSION", "Protocol Version") do |v|
+          options[:api] = v
+        end
       end.parse!(arguments)
       options
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timex_datalink_caldav
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Willy Hardy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-15 00:00:00.000000000 Z
+date: 2023-05-17 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.'
@@ -19,7 +19,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".DS_Store"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock