ice_tm 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b75ddb028fb7f91ece76d947e7baaf49ca49834e94fd8eb511dc8bc358d320f
-  data.tar.gz: 102c2e59d34635e2dcdd5518e5acda17cc33c16e26eec46dff5d7e09c924c411
+  metadata.gz: 6c380f58c33b9453b6a94bd9d75b7680a633896302a21df04c1a3f5fbb924d43
+  data.tar.gz: 6fe6b64fa1a479c37adde8c13b7848e6b961454363e41198e19ac31eb1783e2d
 SHA512:
-  metadata.gz: 7ebe5c6589697b31a5bf8b7d158bc99220eb043807720223556e4236544f8d5ce52cdcd61756a619dab0f3daa9f921c8ff0cf4c984b3cc416d21edf3d6d610f7
-  data.tar.gz: 41e1f87dd7ed6259ef5fd58768bbfad923c42060d036c3f35f2bd1bc651ca906d3cf7a4c383b3f701883e3799fb5cf02c78ddca6de3698cb85134392c89221f3
+  metadata.gz: f89ee7e4d43f523b17398f71d1b629136c5032a3a29e6bc06442ab025e42cd732446e46b62b1705dc0e1059aaf97acffbb1580e40623b5168b6dae1fc14e344d
+  data.tar.gz: 2a710389bebb0a1dfc4a90552587f4c5b438489f981e19a232556ceeb523a2e1f15701fd7836ddf7cac26092788af50a4aed3c04b5b608c8fa9ac71d54bb8753

data/ext/baudrate/baudrate.c

@@ -12,14 +12,18 @@ VALUE setBaudRate(volatile VALUE obj, volatile VALUE dev, volatile VALUE speed)
 
 	char status = tcgetattr(serial_port, &tty) ;
 
-	// IDE sets these flags
-	// speed 57600 baud; line = 0;
-	// min = 0; time = 0;
-	// -brkint -icrnl -imaxbel
-	// -opost
-	// -isig -icanon -iexten -echo -echoe -echok -echoctl -echoke
+	/*
+		Serial Monitor sets these flags:
+
+		speed 57600 baud; line = 0;
+		min = 0; time = 0;
+		-brkint -icrnl -imaxbel
+		-opost
+		-isig -icanon -iexten -echo -echoe -echok -echoctl -echoke
+	*/
 
 	if(status != 0) return Qnil ;
+
 	tty.c_cflag &= ~CSIZE ;
 	tty.c_cflag |= CS8 ;
 	tty.c_cflag |= CREAD | CLOCAL ;
@@ -43,7 +47,8 @@ VALUE setBaudRate(volatile VALUE obj, volatile VALUE dev, volatile VALUE speed)
 	status = tcsetattr(serial_port, TCSANOW, &tty) ;
 
 	if (status == 0) return Qtrue ;
-	else return Qfalse ;
+
+	return Qfalse ;
 }
 
 VALUE getBaudRate(volatile VALUE obj, volatile VALUE dev) {

data/lib/ice_tm/ice_tm.rb

@@ -23,7 +23,13 @@ module IceTM
 				Dir.glob('/dev/ttyUSB[0-9]*').each { |x|
 					if File.writable?(x)
 						puts "#{IceTM::BOLD}#{IceTM::BLUE}:: #{Time.now.strftime('%H:%M:%S.%2N')}: Changing `baudrate` to 57600...#{IceTM::RESET}"
-						IceTM.set_baudrate(x, IceTM::BAUDRATE)
+
+						if IceTM.set_baudrate(x, IceTM::BAUDRATE)
+							puts "#{IceTM::BOLD}#{IceTM::BLUE}:: #{Time.now.strftime('%H:%M:%S.%2N')}: Changing baudrate to 57600...#{IceTM::RESET}"
+						else
+							puts "#{IceTM::BOLD}#{IceTM::RED}:: #{Time.now.strftime('%H:%M:%S.%2N')}: Cannot change the baudrate#{IceTM::RESET}"
+						end
+
 					else
 						"#{BOLD}#{RED}:: #{Time.now.strftime('%H:%M:%S.%2N')}: No permission granted to change Baudrate#{RESET}"
 					end
@@ -73,14 +79,12 @@ module IceTM
 		cpu_u = mem_u = swap_u = iostat = net_upload = net_download = 0
 
 		Thread.new {
-			while true
-				cpu_u = LS::CPU.total_usage(0.125).to_f
-			end
+			cpu_u = LS::CPU.total_usage(0.25).to_f while true
 		}
 
 		Thread.new {
 			while true
-				netstat = LS::Net::current_usage(0.1)
+				netstat = LS::Net::current_usage(0.25)
 				net_upload = netstat[:transmitted].to_i
 				net_download = netstat[:received].to_i
 			end
@@ -101,8 +105,11 @@ module IceTM
 						break
 					end
 				rescue EOFError
+					sleep 0.05
 					retry
 				end
+
+				sleep 0.05
 			end
 
 			puts "#{IceTM::BOLD}#{IceTM::GREEN}:: #{Time.now.strftime('%H:%M:%S.%2N')}: Device ready!#{IceTM::RESET}"
@@ -130,12 +137,21 @@ module IceTM
 				disk_used_percent = convert_percent(diskstat[:used].*(100).fdiv(diskstat[:total]))
 				disk_avail_percent = convert_percent(_diskavail.*(100).fdiv(diskstat[:total]))
 
-				total_process = LS::Process.count
-				ps_r = LS::Process.running.count
-				ps_sl = LS::Process.sleeping.count
-				ps_i = LS::Process.idle.count
-				ps_t = LS::Process.stopped.count
-				ps_z = LS::Process.zombie.count
+				total_process = ps_r = ps_sl = ps_i = ps_t = ps_z = 0
+
+				# Get process count
+				process_types = LS::Process.types
+
+				total_process = 0
+				process_types.values.each { |x|
+					ps_r += 1 if x == :running
+					ps_sl += 1 if x == :sleeping
+					ps_i += 1 if x == :idle
+					ps_t += 1 if x == :stopped
+					ps_z += 1 if x == :zombie
+
+					total_process += 1
+				}
 
 				# Output has to be exactly this long. If not, ice-taskmanager shows invalid result.
 				# No string is split inside ice-task manager, it just depends on the string length.
@@ -172,7 +188,7 @@ module IceTM
 				file.syswrite('~')
 				STDOUT.flush
 
-				sleep 0.1
+				sleep 0.25
 			end
 		rescue Interrupt, SystemExit, SignalException
 			file &.close
@@ -181,7 +197,7 @@ module IceTM
 			device = find_device
 
 			unless device
-				puts "#{IceTM::BOLD}#{IceTM::RED}:: #{Time.now.strftime('%H:%M:%S.%2N')}: No device found. Retrying#{IceTM::RESET}"
+				puts "#{IceTM::BOLD}#{IceTM::RED}:: #{Time.now.strftime('%H:%M:%S.%2N')}: Error establishing connection. Don't worry if this is a valid device. Retrying...#{IceTM::RESET}"
 				sleep 0.1
 			end
 

data/lib/ice_tm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IceTM
-	VERSION = "0.1.0"
+	VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ice_tm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Sourav Goswami