itiscold 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: baeb51b5de66b8e9235bcb239504a9e30bb9dc41
-  data.tar.gz: 721c823a9712723ee5c50e6e40b45017ea3a16da
+SHA256:
+  metadata.gz: cd0869cec41e9176d979090a0aef0bfea8794a85dc0509df7b178ba1e4d883b7
+  data.tar.gz: bacb9058aed2cd7513310e8107ea6980ad5f34b7dbf90127ce4ae28a5c58234b
 SHA512:
-  metadata.gz: 5819af1c525e6e2d646c0d4b5385751a134f00cf242365ea597bb1b3eddd23dee3462dcc592745101e9067da0a9666799ce44653a272283318be794e5c7cfe8e
-  data.tar.gz: 202c719103f2817e9044aa14f751293eb457c8b9c3092133be061ec01fec7c724efe1c901092b358676589029697e6e877c0491fbd4b0dd6139492e5847b1258
+  metadata.gz: 173188a5ad7a6323de6bf79c8535e42ee4add3e65e056d3b2f9a563d8f6d99718a63dddc0d94cf8c4b2eb86ba693e8bc5daae7b011f45bce8fbda94dfe3466ea
+  data.tar.gz: e92feba74df7e9aa2b456f3ca1eb77518dfade47d339e324728b07a84bd5a515117c253304c6bbffe4870cddefa3ceefcb6050db7a44a8b8b13c2509c6c9c639

data/Rakefile

@@ -13,7 +13,7 @@ Hoe.spec 'itiscold' do
   self.readme_file   = 'README.md'
   self.history_file  = 'CHANGELOG.md'
   self.extra_rdoc_files  = FileList['*.md']
-  self.extra_deps << ['ruby-termios',             '~> 1']
+  self.extra_deps << ['uart',             '~> 1']
 end
 
 # vim: syntax=ruby

data/bin/itiscold

@@ -48,6 +48,7 @@ when 'samples'
   end
 when 'info'
   require 'psych'
+  temp = Itiscold.open options[:tty]
   puts Psych.dump temp.device_info
 when 'server'
   Itiscold::WebServer.start options[:tty]

data/lib/itiscold.rb

@@ -2,101 +2,18 @@ require 'termios'
 require 'fcntl'
 require 'webrick'
 require 'json'
+require 'uart'
+require 'io/wait'
 
 class Itiscold
-  VERSION = '1.0.1'
-
-  class TTY
-    include Termios
-
-    def self.open filename, speed, mode
-      if mode =~ /^(\d)(\w)(\d)$/
-        t.data_bits = $1.to_i
-        t.stop_bits = $3.to_i
-        t.parity = { 'N' => :none, 'E' => :even, 'O' => :odd }[$2]
-        t.speed = speed
-        t.read_timeout = 5
-        t.reading = true
-        t.update!
-      end
-    end
-
-    def self.data_bits t, val
-      t.cflag &= ~CSIZE               # clear previous values
-      t.cflag |= const_get("CS#{val}") # Set the data bits
-      t
-    end
-
-    def self.stop_bits t, val
-      case val
-      when 1 then t.cflag &= ~CSTOPB
-      when 2 then t.cflag |= CSTOPB
-      else
-        raise
-      end
-      t
-    end
-
-    def self.parity t, val
-      case val
-      when :none
-        t.cflag &= ~PARENB
-      when :even
-        t.cflag |= PARENB  # Enable parity
-        t.cflag &= ~PARODD # Make it not odd
-      when :odd
-        t.cflag |= PARENB  # Enable parity
-        t.cflag |= PARODD  # Make it odd
-      else
-        raise
-      end
-      t
-    end
-
-    def self.speed t, speed
-      t.ispeed = const_get("B#{speed}")
-      t.ospeed = const_get("B#{speed}")
-      t
-    end
-
-    def self.read_timeout t, val
-      t.cc[VTIME] = val
-      t.cc[VMIN] = 0
-      t
-    end
-
-    def self.reading t
-      t.cflag |= CLOCAL | CREAD
-      t
-    end
-  end
+  VERSION = '1.0.2'
 
   def self.open filename, speed = 115200
-    f = File.open filename, File::RDWR|Fcntl::O_NOCTTY|Fcntl::O_NDELAY
-    f.binmode
-    f.sync = true
-
-    # enable blocking reads, otherwise read timeout won't work
-    f.fcntl Fcntl::F_SETFL, f.fcntl(Fcntl::F_GETFL, 0) & ~Fcntl::O_NONBLOCK
-
-    t = Termios.tcgetattr f
-    t.iflag = 0
-    t.oflag = 0
-    t.lflag = 0
-    t = TTY.data_bits    t, 8
-    t = TTY.stop_bits    t, 1
-    t = TTY.parity       t, :none
-    t = TTY.speed        t, speed
-    t = TTY.read_timeout t, 5
-    t = TTY.reading      t
-
-    Termios.tcsetattr f, Termios::TCSANOW, t
-    Termios.tcflush f, Termios::TCIOFLUSH
+    f = UART.open filename, speed
 
     temp = new f
 
     # Try reading the version a few times before giving up
-    temp.flush
     temp
   end
 
@@ -125,10 +42,21 @@ class Itiscold
     :new_station_number
 
   def device_info
-    val = retry_comm(1) do
-      @tty.write with_checksum([0xCC, 0x00, 0x06, 0x00]).pack('C5')
-      @tty.read 160
+    val = nil
+
+    loop do
+      if @tty.wait_writable
+        @tty.write with_checksum([0xCC, 0x00, 0x06, 0x00]).pack('C5')
+      else
+        raise "Couldn't open tty for writing"
+      end
+
+      if @tty.wait_readable(2)
+        val = @tty.read 160
+        break
+      end
     end
+
     _,            # C set number
     station_no,   # C station number
     _,            # C
@@ -166,6 +94,10 @@ class Itiscold
       temp_calib / 10.0
   end
 
+  def close
+    @tty.close
+  end
+
   def device_params= values
     data = [
       0x33, # C
@@ -173,8 +105,8 @@ class Itiscold
       0x05, 0x00,            # CC
     ] + split_time(values.sample_interval) + # CCC
     [
-      (values.upper_limit * 10).to_i, # n
-      (values.lower_limit * 10).to_i, # s>
+      (values.upper_limit * 10).to_i & 0xFFFF, # n
+      (values.lower_limit * 10).to_i & 0xFFFF, # s>
       values.new_station_number || values.station_number, # C
       allowed_encode(values.stop_button), # C
       delay_time_encode(values.delay_time), # C
@@ -184,12 +116,25 @@ class Itiscold
       (values.temp_calibration * 10).to_i, # C
       0x00, 0x00, 0x00, 0x00, 0x00, 0x00 # C6
     ]
-    retry_comm(1) do
-      @tty.write with_checksum(data).pack('CCCCCCCns>CCCCCCCC6C')
-      @tty.read 3
+
+    loop do
+      if @tty.wait_writable
+        @tty.write with_checksum(data).pack('CCCCCCCns>CCCCCCCC6C')
+      else
+        raise "Couldn't open tty for writing"
+      end
+
+      if @tty.wait_readable(2)
+        @tty.read 3
+        break
+      end
     end
   end
 
+  def clear_data!
+    self.device_params = device_info
+  end
+
   def set_device_number station_number, dev_number
     str = dev_number.bytes.first(10)
     str.concat([0x00] * (10 - str.length))
@@ -358,7 +303,10 @@ class Itiscold
     raise "invalid checksum #{expected} == #{actual}" unless expected == actual
   end
 
+  NULL_DATE = [65535, 255, 255, 255, 255, 255].pack('nC5')
+
   def unpack_datetime bytes
+    return if bytes == NULL_DATE
     Time.new(*bytes.unpack('nC5'))
   end
 

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: itiscold
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Aaron Patterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2018-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ruby-termios
+  name: uart
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '5.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '5.10'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A thing that reads data from Elitech RC-5 temp sensor