ruby_astm 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e495bbce6cc215d7c08b9747276962a59e1f43bddb206b3383d709962472d140
-  data.tar.gz: 1b076d1c574bafae7b91fa976505cf0d23ec41cf9cc00eda5f3c899ecbc0da4f
+  metadata.gz: 80e32a89f60fc8e6323b9de22d2b1511d8c28d3eca13e819c2195f47bb9e1707
+  data.tar.gz: b394691adcb1355a3715fb7646d352c791357f5a7668b3183209b1f33087b335
 SHA512:
-  metadata.gz: 8dd76d5568de871b42efbb96c3f79d82c70d43933184bc442906e965fd18fb571a024e210bf7e2952617c959efcf47027c00f284813069e276d409387b7d2415
-  data.tar.gz: 42e1a222ebbd3e6a215d7de88164155b833565a1c418266a5735c4026352dc29f3bfbf99c127fc861ad04ccb56813b5f9f5a43489e13291da42ae83b37777c38
+  metadata.gz: 28abc36250ca2dfaf2e429cac95a89c26585c13823ede3ed17c892423249245b3f2298f2c0a2e81bf452036f4b4cd99c73e49d63f2dbc78a4180bd7fa7dde161
+  data.tar.gz: f1b7cde59e37731392f1ab47014e78290ea2c801a65c0e9de21e335f9d17c46a231f7f5ef785bef6cbcbb6fc3399d866caa6a71d163c648c27e10b2cd83a85f6

data/lib/ruby_astm/astm_server.rb

@@ -8,7 +8,7 @@ require "redis"
 class AstmServer
 
 	include LabInterface
-	include UsbModule
+	
 
 	def self.log(message)
 		puts "" + message
@@ -53,16 +53,7 @@ class AstmServer
 			puts "RUNNING SERIAL ON #{serial_port} ------------ #{serial.to_s}"
 			self.ethernet_server = EventMachine::start_server self.server_ip, self.server_port, LabInterface
 			AstmServer.log("Running ETHERNET SERVER on #{server_port}")
-			usb = EventMachine.open_serial(usb_port,usb_baud,usb_parity)
-			self.usb_response_bytes = []
-			EM.add_periodic_timer(5) do
-				puts "running usb on #{usb_port}"
-				puts "sending machine data request #{request_results}"
-			   usb.send_data(request_results)
-			end
-			usb.on_data do |data|
-				parse_usb_response(data)
-			end
+
 		}
 	end	
 

data/lib/ruby_astm/usb_module.rb

@@ -38,32 +38,34 @@ module UsbModule
 		#puts self.usb_response_bytes.to_s
 		if interpret?
 			#puts "interpret"
-			self.usb_response_bytes[13..-4].each_slice(32) do |patient_record|
-				bar_code = nil
-				bar_code = patient_record[11..23].pack('c*').gsub(/\./,'')
-				#puts "bar code: #{bar_code}"
-				unless bar_code.strip.blank?
-					esr = patient_record[26]
-					patient = Patient.new(:orders => [Order.new(:results => [Result.new(:value => esr, :name => "ESR", :report_name => "ESR")])])
-					patient = Patient.new({})
-					patient.patient_id = bar_code
-					patient.orders = []
-					order = Order.new({})
-					result = Result.new({})
-					result.value = esr.to_s
-					result.name = "ESR"
-					result.report_name = "ESR"
-					order.id = bar_code
-					order.results = []
-					order.results << result
-					patient.orders << order
-					#puts patient.orders.size
-					#puts patient.orders.first.results.size
-					#puts patient.orders.first.results.first.to_s
-					#puts "patient to json is:"
-					puts patient.to_json
-					$redis.lpush("patients",patient.to_json)
-				end 
+			if kk = self.usb_response_bytes[13..-4]
+				kk.each_slice(32) do |patient_record|
+					bar_code = nil
+					bar_code = patient_record[11..23].pack('c*').gsub(/\./,'')
+					#puts "bar code: #{bar_code}"
+					unless bar_code.strip.blank?
+						esr = patient_record[26]
+						patient = Patient.new(:orders => [Order.new(:results => [Result.new(:value => esr, :name => "ESR", :report_name => "ESR")])])
+						patient = Patient.new({})
+						patient.patient_id = bar_code
+						patient.orders = []
+						order = Order.new({})
+						result = Result.new({})
+						result.value = esr.to_s
+						result.name = "ESR"
+						result.report_name = "ESR"
+						order.id = bar_code
+						order.results = []
+						order.results << result
+						patient.orders << order
+						#puts patient.orders.size
+						#puts patient.orders.first.results.size
+						#puts patient.orders.first.results.first.to_s
+						#puts "patient to json is:"
+						puts patient.to_json
+						$redis.lpush("patients",patient.to_json)
+					end 
+				end
 			end
 			self.usb_response_bytes = []	
 		else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_astm
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Bhargav Raut