emu_power 1.1 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4af5041560b2ee495b26c9eda94382a5ed7510d20ba524dc03ecf294e2601bd5
-  data.tar.gz: ca1eb350ef8c9fc67bc14886743759fe0b44ba02dadcef4128924dfdffbc2f68
+  metadata.gz: 9d6c6e6d6a64f468e6444fadddc097273e53c3d9ac39137e5aa98b9572f880fe
+  data.tar.gz: 975a4a0af9508b812694a3cfcb79feba1cf342f4751042d3d64b9bf34a87d423
 SHA512:
-  metadata.gz: 7ec1b79de1ddbafab3670e1154d4af9dff80c8cb7a72b011d5fcc35c0964ba8907ac58371abded9cb3ff62dea176fa43748fa81b3fbaa661e88b256a56525c09
-  data.tar.gz: 278a3d460f057d7c61e19852b6862a23745509005f7f23e419359c22096defcd7dfa23cf4f5fbe854facfd94a0c2e6daa13245141de24d9003f4deeb8f7286af
+  metadata.gz: 98bd516022ccc746b236943c64e6dacb2cde05e96936a21f9e45b762d35bb0833df82542c260586f3bdf20dc74506abc7dce7842656820484a1c8be03fe5f418
+  data.tar.gz: d2175b774449b338d3ce38317551ab70ae2a6ca969ba2e43f8a26f9adc5eb05818dfc4785f6517b38c60137f33cbe25cc51dfee7b6453442467989e2e5cefdd1

data/lib/emu_power/types.rb

@@ -26,9 +26,13 @@ class EmuPower::Types
 		# these into more standard Unix epoch timestamps by adding the
 		# appropriate offset.
 		def timestamp
-			ts = self.raw['TimeStamp']
-			return nil if ts == nil
-			return Integer(ts) + 946684800
+			parse_timestamp('TimeStamp')
+		end
+
+		def parse_timestamp(prop)
+			v = @raw[prop]
+			return nil if v == nil
+			return Integer(v) + 946684800
 		end
 
 		def parse_hex(prop)
@@ -56,30 +60,59 @@ class EmuPower::Types
 
 	end
 
+	# TODO
 	class ConnectionStatus < Notification
 	end
 
+	# TODO
 	class DeviceInfo < Notification
 	end
 
 	class ScheduleInfo < Notification
+
+		attr_accessor :mode
+		attr_accessor :event
+		attr_accessor :frequency
+		attr_accessor :enabled
+
+		def build(hash)
+			self.mode = hash['Mode']
+			self.event = hash['Event']
+			self.frequency = parse_hex('Frequency')
+			self.enabled = parse_bool('Enabled')
+		end
+
 	end
 
+	# TODO
 	class MeterList < Notification
 	end
 
+	# TODO
 	class MeterInfo < Notification
 	end
 
+	# TODO
 	class NetworkInfo < Notification
 	end
 
 	class TimeCluster < Notification
+
+		attr_accessor :utc_time
+		attr_accessor :local_time
+
+		def build(hash)
+			self.utc_time = parse_timestamp('UTCTime')
+			self.local_time = parse_timestamp('LocalTime')
+		end
+
 	end
 
+	# TODO
 	class MessageCluster < Notification
 	end
 
+	# TODO
 	class PriceCluster < Notification
 	end
 
@@ -111,14 +144,50 @@ class EmuPower::Types
 	end
 
 	class CurrentSummationDelivered < Notification
+
+		attr_accessor :raw_delivered
+		attr_accessor :raw_received
+		attr_accessor :multiplier
+		attr_accessor :divisor
+		attr_accessor :digits_right
+		attr_accessor :digits_left
+		attr_accessor :suppress_leading_zeroes
+
+		def build(hash)
+
+			self.raw_delivered = parse_hex('SummationDelivered')
+			self.raw_received = parse_hex('SummationReceived')
+			self.multiplier = parse_hex('Multiplier')
+			self.divisor = parse_hex('Divisor')
+			self.digits_right = parse_hex('DigitsRight')
+			self.digits_left = parse_hex('DigitsLeft')
+			self.suppress_leading_zeroes = parse_bool('SuppressLeadingZero')
+
+		end
+
+		def delivered
+			return 0 if self.raw_delivered == 0
+			return nil if self.multiplier.nil? || self.raw_delivered.nil? || self.divisor.nil?
+			return self.multiplier * self.raw_delivered / Float(self.divisor)
+		end
+
+		def received
+			return 0 if self.divisor == 0
+			return nil if self.multiplier.nil? || self.raw_received.nil? || self.divisor.nil?
+			return self.multiplier * self.raw_received / Float(self.divisor)
+		end
+		
 	end
 
+	# TODO
 	class CurrentPeriodUsage < Notification
 	end
 
+	# TODO
 	class LastPeriodUsage < Notification
 	end
 
+	# TODO
 	class ProfileData < Notification
 	end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emu_power
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
 platform: ruby
 authors:
 - Steven Bertolucci
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri