raspberry_pi_iot 0.0.6 → 0.0.7

data/doc/method_list.html

@@ -85,6 +85,30 @@
   
 
   <li class="even ">
+    <div class="item">
+      <span class='object_link'><a href="Bus/I2C.html#bus-class_method" title="Bus::I2C.bus (method)">bus</a></span>
+      <small>Bus::I2C</small>
+    </div>
+  </li>
+  
+
+  <li class="odd ">
+    <div class="item">
+      <span class='object_link'><a href="Bus/I2C.html#bus_number-class_method" title="Bus::I2C.bus_number (method)">bus_number</a></span>
+      <small>Bus::I2C</small>
+    </div>
+  </li>
+  
+
+  <li class="even ">
+    <div class="item">
+      <span class='object_link'><a href="Bus/I2C.html#bus_number=-class_method" title="Bus::I2C.bus_number= (method)">bus_number=</a></span>
+      <small>Bus::I2C</small>
+    </div>
+  </li>
+  
+
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="TemperatureSensor.html#celsius-instance_method" title="TemperatureSensor#celsius (method)">#celsius</a></span>
       <small>TemperatureSensor</small>
@@ -92,7 +116,23 @@
   </li>
   
 
+  <li class="even ">
+    <div class="item">
+      <span class='object_link'><a href="Bus/I2C.html#device_address-instance_method" title="Bus::I2C#device_address (method)">#device_address</a></span>
+      <small>Bus::I2C</small>
+    </div>
+  </li>
+  
+
   <li class="odd ">
+    <div class="item">
+      <span class='object_link'><a href="Bus/I2C.html#device_address=-instance_method" title="Bus::I2C#device_address= (method)">#device_address=</a></span>
+      <small>Bus::I2C</small>
+    </div>
+  </li>
+  
+
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="Button.html#double_press%3F-instance_method" title="Button#double_press? (method)">#double_press?</a></span>
       <small>Button</small>
@@ -100,7 +140,7 @@
   </li>
   
 
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="TemperatureSensor.html#fahrenheit-instance_method" title="TemperatureSensor#fahrenheit (method)">#fahrenheit</a></span>
       <small>TemperatureSensor</small>
@@ -108,7 +148,7 @@
   </li>
   
 
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="LED/RGB.html#green_off-instance_method" title="LED::RGB#green_off (method)">#green_off</a></span>
       <small>LED::RGB</small>
@@ -116,7 +156,7 @@
   </li>
   
 
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="LED/RGB.html#green_on-instance_method" title="LED::RGB#green_on (method)">#green_on</a></span>
       <small>LED::RGB</small>
@@ -124,7 +164,7 @@
   </li>
   
 
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="BMxSensor.html#hPa-instance_method" title="BMxSensor#hPa (method)">#hPa</a></span>
       <small>BMxSensor</small>
@@ -132,7 +172,7 @@
   </li>
   
 
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="RaspberryPi.html#hardware_info-class_method" title="RaspberryPi.hardware_info (method)">hardware_info</a></span>
       <small>RaspberryPi</small>
@@ -140,7 +180,7 @@
   </li>
   
 
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="BinaryReceptor.html#high%3F-instance_method" title="BinaryReceptor#high? (method)">#high?</a></span>
       <small>BinaryReceptor</small>
@@ -148,7 +188,7 @@
   </li>
   
 
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="HumitureSensor.html#humidity-instance_method" title="HumitureSensor#humidity (method)">#humidity</a></span>
       <small>HumitureSensor</small>
@@ -156,7 +196,7 @@
   </li>
   
 
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="BH1750.html#initialize-instance_method" title="BH1750#initialize (method)">#initialize</a></span>
       <small>BH1750</small>
@@ -164,7 +204,7 @@
   </li>
   
 
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="BinaryEffector.html#initialize-instance_method" title="BinaryEffector#initialize (method)">#initialize</a></span>
       <small>BinaryEffector</small>
@@ -172,7 +212,7 @@
   </li>
   
 
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="BinaryReceptor.html#initialize-instance_method" title="BinaryReceptor#initialize (method)">#initialize</a></span>
       <small>BinaryReceptor</small>
@@ -180,7 +220,7 @@
   </li>
   
 
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="BMxSensor.html#initialize-instance_method" title="BMxSensor#initialize (method)">#initialize</a></span>
       <small>BMxSensor</small>
@@ -188,7 +228,7 @@
   </li>
   
 
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="BMP280.html#initialize-instance_method" title="BMP280#initialize (method)">#initialize</a></span>
       <small>BMP280</small>
@@ -196,7 +236,7 @@
   </li>
   
 
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="BME280.html#initialize-instance_method" title="BME280#initialize (method)">#initialize</a></span>
       <small>BME280</small>
@@ -204,7 +244,7 @@
   </li>
   
 
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="Button.html#initialize-instance_method" title="Button#initialize (method)">#initialize</a></span>
       <small>Button</small>
@@ -212,7 +252,7 @@
   </li>
   
 
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="DHTxxSensor.html#initialize-instance_method" title="DHTxxSensor#initialize (method)">#initialize</a></span>
       <small>DHTxxSensor</small>
@@ -220,7 +260,7 @@
   </li>
   
 
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="DHT11.html#initialize-instance_method" title="DHT11#initialize (method)">#initialize</a></span>
       <small>DHT11</small>
@@ -228,7 +268,7 @@
   </li>
   
 
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="DHT22.html#initialize-instance_method" title="DHT22#initialize (method)">#initialize</a></span>
       <small>DHT22</small>
@@ -236,7 +276,7 @@
   </li>
   
 
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="DigitalEffector.html#initialize-instance_method" title="DigitalEffector#initialize (method)">#initialize</a></span>
       <small>DigitalEffector</small>
@@ -244,7 +284,7 @@
   </li>
   
 
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="DS18B20.html#initialize-instance_method" title="DS18B20#initialize (method)">#initialize</a></span>
       <small>DS18B20</small>
@@ -252,7 +292,7 @@
   </li>
   
 
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="HumitureSensor.html#initialize-instance_method" title="HumitureSensor#initialize (method)">#initialize</a></span>
       <small>HumitureSensor</small>
@@ -260,6 +300,14 @@
   </li>
   
 
+  <li class="odd ">
+    <div class="item">
+      <span class='object_link'><a href="IoT/Log.html#initialize-instance_method" title="IoT::Log#initialize (method)">#initialize</a></span>
+      <small>IoT::Log</small>
+    </div>
+  </li>
+  
+
   <li class="even ">
     <div class="item">
       <span class='object_link'><a href="LED.html#initialize-instance_method" title="LED#initialize (method)">#initialize</a></span>
@@ -341,6 +389,14 @@
   
 
   <li class="even ">
+    <div class="item">
+      <span class='object_link'><a href="IoT/Log.html#message-instance_method" title="IoT::Log#message (method)">#message</a></span>
+      <small>IoT::Log</small>
+    </div>
+  </li>
+  
+
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="Effector.html#model_name-instance_method" title="Effector#model_name (method)">#model_name</a></span>
       <small>Effector</small>
@@ -348,6 +404,14 @@
   </li>
   
 
+  <li class="even ">
+    <div class="item">
+      <span class='object_link'><a href="RaspberryPi.html#model_name-class_method" title="RaspberryPi.model_name (method)">model_name</a></span>
+      <small>RaspberryPi</small>
+    </div>
+  </li>
+  
+
   <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="Receptor.html#model_name-instance_method" title="Receptor#model_name (method)">#model_name</a></span>
@@ -485,14 +549,6 @@
   
 
   <li class="even ">
-    <div class="item">
-      <span class='object_link'><a href="RaspberryPi.html#pi_model-class_method" title="RaspberryPi.pi_model (method)">pi_model</a></span>
-      <small>RaspberryPi</small>
-    </div>
-  </li>
-  
-
-  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="Button.html#pressed%3F-instance_method" title="Button#pressed? (method)">#pressed?</a></span>
       <small>Button</small>
@@ -500,7 +556,7 @@
   </li>
   
 
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="BMxSensor.html#pressure-instance_method" title="BMxSensor#pressure (method)">#pressure</a></span>
       <small>BMxSensor</small>
@@ -508,7 +564,7 @@
   </li>
   
 
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="BMxSensor.html#read_data-instance_method" title="BMxSensor#read_data (method)">#read_data</a></span>
       <small>BMxSensor</small>
@@ -516,7 +572,7 @@
   </li>
   
 
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="DHTxxSensor.html#read_data-instance_method" title="DHTxxSensor#read_data (method)">#read_data</a></span>
       <small>DHTxxSensor</small>
@@ -524,7 +580,7 @@
   </li>
   
 
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="DS18B20.html#read_data-instance_method" title="DS18B20#read_data (method)">#read_data</a></span>
       <small>DS18B20</small>
@@ -532,7 +588,7 @@
   </li>
   
 
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="HumitureSensor.html#read_data-instance_method" title="HumitureSensor#read_data (method)">#read_data</a></span>
       <small>HumitureSensor</small>
@@ -540,7 +596,7 @@
   </li>
   
 
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="TemperatureSensor.html#read_data-instance_method" title="TemperatureSensor#read_data (method)">#read_data</a></span>
       <small>TemperatureSensor</small>
@@ -548,7 +604,7 @@
   </li>
   
 
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="RaspberryPi/ThermalSensor.html#read_data-instance_method" title="RaspberryPi::ThermalSensor#read_data (method)">#read_data</a></span>
       <small>RaspberryPi::ThermalSensor</small>
@@ -556,7 +612,7 @@
   </li>
   
 
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="BH1750.html#read_sensor-instance_method" title="BH1750#read_sensor (method)">#read_sensor</a></span>
       <small>BH1750</small>
@@ -564,7 +620,7 @@
   </li>
   
 
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="MAX44009.html#read_sensor-instance_method" title="MAX44009#read_sensor (method)">#read_sensor</a></span>
       <small>MAX44009</small>
@@ -572,7 +628,7 @@
   </li>
   
 
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="TemperatureSensor.html#reaumur-instance_method" title="TemperatureSensor#reaumur (method)">#reaumur</a></span>
       <small>TemperatureSensor</small>
@@ -580,7 +636,7 @@
   </li>
   
 
-  <li class="even ">
+  <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="LED/RGB.html#red_off-instance_method" title="LED::RGB#red_off (method)">#red_off</a></span>
       <small>LED::RGB</small>
@@ -588,7 +644,7 @@
   </li>
   
 
-  <li class="odd ">
+  <li class="even ">
     <div class="item">
       <span class='object_link'><a href="LED/RGB.html#red_on-instance_method" title="LED::RGB#red_on (method)">#red_on</a></span>
       <small>LED::RGB</small>
@@ -596,14 +652,6 @@
   </li>
   
 
-  <li class="even ">
-    <div class="item">
-      <span class='object_link'><a href="Bus/I2C.html#set_bus-class_method" title="Bus::I2C.set_bus (method)">set_bus</a></span>
-      <small>Bus::I2C</small>
-    </div>
-  </li>
-  
-
   <li class="odd ">
     <div class="item">
       <span class='object_link'><a href="Button.html#single_press%3F-instance_method" title="Button#single_press? (method)">#single_press?</a></span>

data/doc/top-level-namespace.html

@@ -102,7 +102,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Dec 11 17:46:24 2018 by
+  Generated on Mon Dec 17 17:41:39 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.16 (ruby-2.3.3).
 </div>

data/lib/bh1750.rb

@@ -14,9 +14,12 @@ class BH1750
   ONE_TIME_HIGH_RES_MODE_1 = 0x20   # Measure with resolution 1.0 lx, POWER DOWN after measuring
   ONE_TIME_HIGH_RES_MODE_2 = 0x21   # Measure with resolution 0.5 lx, POWER DOWN after measuring
 
-  def initialize(i2c_bus='/dev/i2c-1')
+  def initialize(device_address=DEVICE, bus_number=1)
     @sensor_name = 'BH1750'
-    @i2c_bus = i2c_bus
+    Bus::I2C.bus_number = bus_number
+    @device_address = device_address
+
+    @i2c_bus = Bus::I2C.bus
     @device = I2CDevice.new(address: DEVICE, driver: I2CDevice::Driver::I2CDev.new(@i2c_bus))
     @resolution = ONE_TIME_HIGH_RES_MODE_1
     @length = 2

data/lib/bus.rb

@@ -14,10 +14,34 @@ module Bus
 
   # I2C interface to devices
   class I2C
+    @@bus_number = 1
     @@i2c_bus = '/dev/i2c-1'
-    def self.set_bus(bus=1)
+    @device_address = 0x00
+
+    # Define the I2C bus number: 0 | 1 (default)
+    def self.bus_number=(bus=1)
+      @@bus_number = bus
       @@i2c_bus = "/dev/i2c-#{bus}"
     end
+
+    def self.bus_number
+      @@bus_number
+    end
+
+    # Return the I2C bus file
+    def self.bus
+      @@i2c_bus
+    end
+
+    # Define the device address
+    def device_address=(address)
+      @device_address = address
+    end
+
+    # Return the device address
+    def device_address
+      @device_address
+    end
   end
 
   # SPI interface to devices

data/lib/digital_actuator.rb

@@ -0,0 +1,5 @@
+require 'digital_effector'
+
+# DigitalActuator - a synonym for DigitalEffector
+class DigitalActuator < DigitalEffector
+end

data/lib/digital_effector.rb

@@ -47,10 +47,6 @@ class DigitalEffector < Effector
   end
 
   def off?(pin=@pin)
-    not on(pin)
+    !on(pin)
   end
 end
-
-# DigitalActuator - synonym for DigitalEffector
-class DigitalActuator < DigitalEffector
-end

data/lib/digital_receptor.rb

@@ -14,7 +14,3 @@ class DigitalReceptor < Receptor
   end
 
 end
-
-# DigitalSensor - a synonym for DigitalReceptor
-class DigitalSensor < DigitalReceptor
-end

data/lib/digital_sensor.rb

@@ -0,0 +1,5 @@
+require 'digital_receptor'
+
+# DigitalSensor - a synonym for DigitalReceptor
+class DigitalSensor < DigitalReceptor
+end

data/lib/ds18b20.rb

@@ -9,7 +9,7 @@ class DS18B20 < TemperatureSensor
     if @sensor_file
       @temperature = read_data
     else
-      raise "#{@sensor_name} - Sensor NOT FOUND!"
+      raise "#{self.name} - Sensor NOT FOUND!"
     end
   end
 

data/lib/iot.rb

@@ -1,4 +1,19 @@
 # IoT - Internet of Things classes and modules
 module IoT
 
+  # Logging events and  actions
+  class Log
+    @file_name = nil
+
+    def initialize(file_name='/tmp/iot.log')
+      @file_name = file_name
+    end
+
+    # Message types: I = Info, W = Warning, E = Error, F = Fatal error
+    def message(type='I', text='OK')
+      File.open(@file_name, 'w+') do |log|
+        log.printf "%s %s %s\n", Time.now.strftime("%Y%m%d %H%M%S"), type, text
+      end
+    end
+  end
 end

data/lib/led_rgb.rb

@@ -11,6 +11,7 @@ class LED
     @red   = red
     @green = green
     @blue  = blue
+    self.name = 'RGB LED'
   end
 
   def red_on

data/lib/raspberry_pi.rb

@@ -1,27 +1,19 @@
 module RaspberryPi
-# https://www.raspberrypi-spy.co.uk/2012/09/checking-your-raspberry-pi-board-version/
 
-  # Pi Model 3B V1.2
-  def self.pi_model_old
-    info = `pinout | grep -Eo "Pi Model[^|]+"`
-    info.strip
-  end
-
-  def self.pi_model
-    info = `cat /proc/device-tree/model`
+  # Return the model name
+  # https://www.raspberrypi-spy.co.uk/2012/09/checking-your-raspberry-pi-board-version/
+  def self.model_name(source='proc')
+    info = if source == 'proc'
+      `cat /proc/device-tree/model`
+    elsif
+      `pinout | grep -Eo "Pi Model[^|]+"`
+    else
+      'N/A'
+    end
     info.strip
   end
 
-  # Revision           : a22082
-  # SoC                : BCM2837
-  # RAM                : 1024Mb
-  # Storage            : MicroSD
-  # USB ports          : 4 (excluding power)
-  # Ethernet ports     : 1
-  # Wi-fi              : True
-  # Bluetooth          : True
-  # Camera ports (CSI) : 1
-  # Display ports (DSI): 1
+  # Return hardware info as a hash
   def self.hardware_info
     info = {}
     lines = ` pinout | grep ': '`

data/lib/temperature_sensor.rb

@@ -1,4 +1,4 @@
-require 'digital_receptor'
+require 'digital_sensor'
 
 # TemperatureSensor - temperature sensing receptor
 class TemperatureSensor < DigitalSensor

data/lib/thermal_sensor.rb

@@ -5,7 +5,7 @@ module RaspberryPi
   class ThermalSensor < TemperatureSensor
 
     def initialize
-      @sensor_name = 'DS18B20'
+      @name = 'Internal Thermal Zone'
       super
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raspberry_pi_iot
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Mike Shock (Mikhail V. Shokhirev)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-13 00:00:00.000000000 Z
+date: 2018-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rpi_gpio
@@ -148,6 +148,7 @@ files:
 - doc/TemperatureSensor.html
 - doc/_index.html
 - doc/class_list.html
+- doc/file.README.html
 - doc/file_list.html
 - doc/frames.html
 - doc/index.html
@@ -160,8 +161,10 @@ files:
 - lib/bus.rb
 - lib/button.rb
 - lib/dht_sensor.rb
+- lib/digital_actuator.rb
 - lib/digital_effector.rb
 - lib/digital_receptor.rb
+- lib/digital_sensor.rb
 - lib/ds18b20.rb
 - lib/effector.rb
 - lib/hcsr501.rb