teletask 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8350efc1b6d4c835ab2cc2320539fc1ba33d2a10
-  data.tar.gz: 514ce5aaa2c07422c8b9277e11b9e8120d50c161
+  metadata.gz: 5bf110c899a56469721c423745f3ef5c733db49a
+  data.tar.gz: 0eb0b4e397f907457ae01f881f94f4f4da9d5c93
 SHA512:
-  metadata.gz: 194cd77565b42009579133d36038c74abb3737999c36985800eaf0fb5b4854f2bb7a1265e36d5a668c677d16287167cbc58d7384c16817452da6d6673b9b63e9
-  data.tar.gz: e2f009831ea9c6b9c0298abe94be035de9be905bde7d97df471879e0b6d0cb1aac2b66973273e28b80dbfccdcda4e3455cdd14f35cd3e693705e4ce65bffe34b
+  metadata.gz: 32ab75974fd417efb56248547e3e3ee2635ec7b00dfbe83e22d035a5d3f46e4b24b6ee7f318ac4a5437e295ed39f3f76e5a9f7469cfd61f8028c2d228fa9dd9e
+  data.tar.gz: 615974b959e61ab11055b0f8c854e574553e0999575614eb75c409d69d37254795c21c04a8766bbd4bd5bdc64ad492b00c501708a1ccaaf1f039c159418122d8

data/lib/constants.rb

@@ -1,5 +1,11 @@
-class Teletask
+module TeletaskApi
+	module 	ConstantName
+		def name( val )
+    		constants.find{ |name| const_get(name)==val }
+  		end
+  	end
 	module Command
+		extend ConstantName
 		SET = 7
 		GET = 6
 		GROUPSET = 9
@@ -10,6 +16,7 @@ class Teletask
 	end
 
 	module Function
+		extend ConstantName
 		RELAY = 1
 		DIMMER = 2
 		MOTOR = 6
@@ -26,6 +33,7 @@ class Teletask
 	end
 
 	module Setting
+		extend ConstantName
 		ON = 255
 		TOGGLE = 103
 		OFF = 0

data/lib/request.rb

@@ -1,37 +1,39 @@
-class Request
-	START = 2
-	def initialize command, function = 0, number = 0, setting = nil
-		@command = command
-		@parameters = Array.new
-
-		case command
-		when Teletask::Command::KEEPALIVE
-		when Teletask::Command::LOG
+module TeletaskApi
+	class Request
+		START = 2
+		def initialize command, function = 0, number = 0, setting = nil
+			@command = command
 			@parameters = Array.new
-			@parameters[0] = function
-			@parameters[1] = number
-		else
-			@parameters[0] = 1 		#central number
-			@parameters[1] = function
-			@parameters[2] = 0 		#byte1
-			@parameters[3] = number	#byte2
-			@parameters[4] = setting if setting != nil
+
+			case command
+			when Teletask::Command::KEEPALIVE
+			when Teletask::Command::LOG
+				@parameters = Array.new
+				@parameters[0] = function
+				@parameters[1] = number
+			else
+				@parameters[0] = 1 		#central number
+				@parameters[1] = function
+				@parameters[2] = 0 		#byte1
+				@parameters[3] = number	#byte2
+				@parameters[4] = setting if setting != nil
+			end
 		end
-	end
 
-	def to_s
-		#"s,8,7,1,1,0,21,103,143,"
-		request = [START, length, @command] + @parameters + [checksum]
-		request.pack("C*")
-	end
+		def to_s
+			#"s,8,7,1,1,0,21,103,143,"
+			request = [START, length, @command] + @parameters + [checksum]
+			request.pack("C*")
+		end
 
-	private
-	def checksum
-		parametersum = @parameters.empty? ? 0 : @parameters.inject{|sum,x| sum + x }
-		return (START + length + @command + parametersum) % 256
-	end
+		private
+		def checksum
+			parametersum = @parameters.empty? ? 0 : @parameters.inject{|sum,x| sum + x }
+			return (START + length + @command + parametersum) % 256
+		end
 
-	def length
-		return @parameters.length + 3
+		def length
+			return @parameters.length + 3
+		end
 	end
 end

data/lib/response.rb

@@ -1,33 +1,59 @@
-class Response
+require_relative './converter'
 
-	attr_reader :central, :function, :number, :parameters
+module TeletaskApi
 
-	def initialize central, function, number, parameters
-		@central, @function, @number, @parameters = central, function, number, parameters
-	end
+	class Response
+
+		attr_reader :central, :function, :number, :parameters
+
+		def initialize central, function, number, parameters
+			@central, @function, @number, @parameters = central, function, number, parameters
+		end
 
-	def self.parse data
-		begin
-			data = data.unpack("C*")
-			unless data.first == 10
-				startindex = data.index(2) 
-				raise "Start byte not found in Response: #{data.inspect}" unless startindex
-				length = data[startindex+1]
-				calculatedChecksum = data[startindex..startindex+length-1].inject{|sum,x| sum + x } % 256
-				checksum = data[startindex+length]
-				raise "Checksum mismatch. Expecting #{checksum}, but calculated #{calculatedChecksum}" unless checksum == calculatedChecksum
-				raise "Not an response." unless data[startindex+2] == Teletask::Command::EVENTREPORT 
-				central = data[startindex+3]
-				function = data[startindex+4]
-				number = data[startindex+5..startindex+6].pack("c*").unpack("n").first
-				parameters =data[startindex+8]
-				return Response.new  central, function, number, parameters
-			else
-				return nil
+		def self.parse data
+			begin
+				data = data.unpack("C*")
+				#unless data.first == 10
+					startindex = data.index(2) 
+					raise "Start byte not found in Response: #{data.inspect}" unless startindex
+					length = data[startindex+1]
+					calculatedChecksum = data[startindex..startindex+length-1].inject{|sum,x| sum + x } % 256
+					checksum = data[startindex+length]
+					raise "Checksum mismatch. Expecting #{checksum}, but calculated #{calculatedChecksum}" unless checksum == calculatedChecksum
+					raise "Not an response." unless data[startindex+2] == Teletask::Command::EVENTREPORT 
+					central = data[startindex+3]
+					function = data[startindex+4]
+					number = data[startindex+5..startindex+6].pack("c*").unpack("n").first
+					case function
+					when Teletask::Function::SENSOR
+						parameters =data[startindex+8..startindex+9]
+					else
+						parameters =data[startindex+8]
+					end
+					return Response.new  central, function, number, parameters
+				#end
+			rescue Exception => ex
+				puts ex
+				nil
 			end
-		rescue Exception => ex
-			puts ex
-			nil
+			return nil
+		end
+
+		def to_hash
+			hash = Hash.new
+			hash[:function] = function
+			hash[:function_name] = Teletask::Function.name function
+			hash[:number] = number
+			hash[:parameters] = parameters
+			case function
+			when Teletask::Function::SENSOR
+				hash[:temperature] = TeletaskApi::Converter.short_to_temperature parameters
+			when Teletask::Function::RELAY
+				hash[:state] = parameters
+				hash[:state_name] = Teletask::Setting.name parameters
+			end
+			hash
 		end
 	end
+
 end

data/lib/teletask.rb

@@ -6,79 +6,87 @@ require_relative './constants'
 require_relative './request'
 require_relative './response'
 
-class Teletask
-	include Observable
-
-	@host
-	@port
-	@socket
-	@server
-
-	def initialize(host, port = 55957)
-		@host = host
-		@port = port
-		#add_observer(self)
+include TeletaskApi
+
+module TeletaskApi
+
+	class Teletask
+		include Observable
+
+		@host
+		@port
+		@socket
+		@server
+
+		def initialize(host, port = 55957)
+			@host = host
+			@port = port
+			#add_observer(self)
+		end
+
+		def finalize
+			close
+		end
+
+		def connect
+			puts "Connecting to Teletask on #{@host} at port #{@port}..."
+			@socket = TCPSocket.open @host, @port
+			puts "Connected"
+			@t = Thread.new{ 
+				while (data = @socket.recv(1024))
+					response = Response.parse data
+					if response
+				   		changed
+				   		notify_observers(self, response)
+				    end
+				end
+			}
+		end
+
+		def close()
+			puts "closing connection"
+			@socket.close
+		end
+
+		def keep_alive
+			f = Request.new Command::KEEPALIVE
+			@socket.write f.to_s
+		end
+
+		def set function, number, setting
+			f = Request.new Command::SET, function, number, setting
+			@socket.write f.to_s
+		end
+
+		def get function, number 
+			f = Request.new Command::GET, function, number
+			@socket.write f.to_s
+		end
+
+		def group_get
+			raise NotImplementedError.new
+		end
+
+		def log function, setting 
+			r = Request.new Command::LOG, function, setting
+			@socket.write r.to_s
+		end
+
+		def report_event
+			raise NotImplementedError.new
+		end
+
+		def message
+			raise NotImplementedError.new
+		end
 	end
 
-	def finalize
-		close
+	class TeleTaskEvent
+		def update object, response
+			puts "Update: #{response.to_hash.inspect}"
+		end
 	end
 
-	def connect
-		puts "connecting..."
-		@socket = TCPSocket.open @host, @port
-
-		@t = Thread.new{ 
-			while (data = @socket.recv(1024))
-				response = Response.parse data
-				if response
-			   		changed
-			   		notify_observers(self, response)
-			    end
-			end
-		}
-	end
-
-	def close()
-		puts "closing connection"
-		@socket.close
-	end
-
-	def keep_alive
-		f = Request.new Command::KEEPALIVE
-		@socket.write f.to_s
-	end
-
-	def set function, number, setting
-		f = Request.new Command::SET, function, number, setting
-		@socket.write f.to_s
-	end
-
-	def get function, number 
-		f = Request.new Command::GET, function, number
-		@socket.write f.to_s
-	end
-
-	def group_get
-		raise NotImplementedError.new
-	end
-
-	def log function, setting 
-		r = Request.new Command::LOG, function, setting
-		@socket.write r.to_s
-	end
-
-	def report_event
-		raise NotImplementedError.new
-	end
-
-	def message
-		raise NotImplementedError.new
-	end
 end
 
-class TeleTaskEvent
-	def update object, response
-		puts "Update: #{response.inspect}"
-	end
-end
+Teletask = TeletaskApi::Teletask

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teletask
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Sille Van Landschoot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-10-19 00:00:00.000000000 Z
 dependencies: []
 description: Teletask gem enables the communication with a Teletask Domitics central
   using the DoIP protocol
@@ -41,7 +41,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Teletask DoIP