blink_tm 0.4.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aee9807ee73b58a75f7c4c0d09fcda705f6d8087d51e3c5178ab0472ebd2faae
-  data.tar.gz: d9156630e58cc9d4a41b26b7f0666f2abe565de91e8d1636bb8733920a9dfac0
+  metadata.gz: '080b57c4c4dac231dbb6353428aaaf7be86bd47e4da2379308c23d9ca5315aaa'
+  data.tar.gz: e13ccff20189b8e1e944230b0c27ce87272677a9d50ee2c289098800f1860fe9
 SHA512:
-  metadata.gz: 204d49f580218bce9aed96a58a27a1f6fae07996e8d9a911749fec17a621b8c4cfcf2f081e71447e0d61788b22032713239c287d0b1194d6c4e6b048fdcd24a1
-  data.tar.gz: 4c269cca6fb02329354483e4495a88da1270c6426a2756315eb8bc88ef0577466165d0f2239181a140bcf04042c04c4ae4b53c0ec53044034bd930954f98f606
+  metadata.gz: 1ae79bb6028b57c8046e1cf68ccd62fcac30ae38a75579d6402855e9dce94d012877cd358bd0b4a99dc6ddd1376ba3548a3ac88aa59867ea54d9c7bdd7e5f16c
+  data.tar.gz: 4cc14d89f98e59675fa2071005cda0b44a4c41f421c5ea0ba850193363b33c922c623187c939f9ed48bd152277732ceb7022e3ccedc88cc13ba710c2d52157f4

data/ext/baudrate/baudrate.c

@@ -7,7 +7,7 @@ VALUE setBaudRate(volatile VALUE obj, volatile VALUE dev, volatile VALUE speed)
 	char *device = StringValuePtr(dev) ;
 	unsigned int spd = NUM2UINT(speed) ;
 
-	int serial_port = open(device, O_RDWR) ;
+	int serial_port = open(device, O_RDWR | O_NOCTTY) ;
 	struct termios tty ;
 
 	char status = tcgetattr(serial_port, &tty) ;
@@ -22,7 +22,10 @@ VALUE setBaudRate(volatile VALUE obj, volatile VALUE dev, volatile VALUE speed)
 		-isig -icanon -iexten -echo -echoe -echok -echoctl -echoke
 	*/
 
-	if(status != 0) return Qnil ;
+	if(status != 0) {
+		close(serial_port) ;
+		return Qnil ;
+	}
 
 	tty.c_cflag &= ~CSIZE ;
 	tty.c_cflag |= CS8 ;
@@ -46,18 +49,20 @@ VALUE setBaudRate(volatile VALUE obj, volatile VALUE dev, volatile VALUE speed)
 	cfsetospeed(&tty, spd) ;
 	status = tcsetattr(serial_port, TCSANOW, &tty) ;
 
-	if (status == 0) return Qtrue ;
+	close(serial_port) ;
 
+	if (status == 0) return Qtrue ;
 	return Qfalse ;
 }
 
 VALUE getBaudRate(volatile VALUE obj, volatile VALUE dev) {
 	char *device = StringValuePtr(dev) ;
 
-	int serial_port = open(device, O_RDWR) ;
+	int serial_port = open(device, O_RDWR | O_NOCTTY | O_NONBLOCK) ;
 	struct termios tty ;
 
 	char status = tcgetattr(serial_port, &tty) ;
+	close(serial_port) ;
 
 	if(status == 0) {
 		unsigned int in = cfgetispeed(&tty) ;

data/ext/crc32/crc32.c

@@ -0,0 +1,33 @@
+/*
+	Source:
+	https://commandlinefanatic.com/cgi-bin/showarticle.cgi?article=art008
+
+	Note that this obeys the standard and matches with Ruby's Zlib.crc32(...)
+*/
+
+#define CRC32_DIVISOR 0xEDB88320
+#include "ruby.h"
+
+static VALUE getCRC(volatile VALUE obj, volatile VALUE str) {
+	char *input = StringValuePtr(str) ;
+	unsigned char len = strlen(input) ;
+	unsigned long crc = 0xFFFFFFFF ;
+
+	for (unsigned char i = 0 ; i < len ; ++i) {
+		crc ^= input[i] ;
+
+		for (unsigned char k = 8 ; k ; --k) {
+			crc = crc & 1 ? (crc >> 1) ^ CRC32_DIVISOR : crc >> 1 ;
+		}
+	}
+
+	char buffer[11] ;
+	sprintf(buffer, "%lu", crc ^ 0xFFFFFFFF) ;
+
+	return rb_str_new_cstr(buffer) ;
+}
+
+void Init_crc32() {
+	VALUE blinktm = rb_define_module("BlinkTM") ;
+	rb_define_module_function(blinktm, "crc32", getCRC, 1) ;
+}

data/ext/crc32/extconf.rb

@@ -0,0 +1,2 @@
+require 'mkmf'
+create_makefile 'blink_tm/crc32'

data/lib/blink_tm.rb

@@ -6,18 +6,19 @@ $-v = true
 
 module BlinkTM
 	# Important Constants
-	BAUDRATE = BlinkTM::B57600
+	BAUDRATE = BlinkTM::B38400
 	SCANID = 'BTM'
 
 	# POLLING time, how often should CPU, Net, IO usages should be updated.
 	# Should always be a float.
-	POLLING = 0.375
+	POLLING = 0.250
 
 	# Refresh time, how often the main loop should run
 	REFRESH = 0.5
 
 	# Errors
 	NoDeviceError = Class.new(StandardError)
+	SyncError = Class.new(StandardError)
 	DeviceNotReady = Class.new(StandardError)
 
 	# Units
@@ -47,3 +48,4 @@ end
 require 'blink_tm/version'
 require 'fcntl'
 require 'blink_tm/blink_tm'
+require 'blink_tm/crc32'

data/lib/blink_tm/blink_tm.rb

@@ -102,18 +102,25 @@ module BlinkTM
 			end
 		}
 
+		prev_crc32 = ''
+
 		begin
 			raise NoDeviceError unless device
 
 			in_sync = false
-			fd = IO.sysopen(device, Fcntl::O_RDWR)
+
+			fd = IO.sysopen(
+				device,
+				Fcntl::O_RDWR | Fcntl::O_NOCTTY | Fcntl::O_NONBLOCK | Fcntl::O_TRUNC
+			)
+
 			file = IO.open(fd)
 
 			until in_sync
 				# Clear out any extra zombie bits
-				file.syswrite(?~)
+				file.syswrite(?~.freeze)
 				# Start the device
-				file.syswrite(?#)
+				file.syswrite(?#.freeze)
 				file.flush
 
 				sleep 0.125
@@ -129,7 +136,10 @@ module BlinkTM
 				end
 			end
 
+			sync_error_count = 0
+
 			puts "#{BlinkTM::BOLD}#{BlinkTM::GREEN}:: #{Time.now.strftime('%H:%M:%S.%2N')}: Device ready!#{BlinkTM::RESET}"
+			file.read
 
 			while true
 				# cpu(01234) memUsed(999993) swapUsed(999992) io_active(0)
@@ -161,7 +171,16 @@ module BlinkTM
 				# Rescuing from suspend
 				file.syswrite(str)
 				file.flush
+				crc32 = file.read.scrub![/\d+/]
 
+				unless crc32 == prev_crc32 || prev_crc32.empty?
+					raise SyncError if sync_error_count > 1
+					sync_error_count += 1
+				else
+					sync_error_count = 0 unless sync_error_count == 0
+				end
+
+				prev_crc32 = BlinkTM.crc32(str[2..-2])
 				sleep REFRESH
 			end
 		rescue Interrupt, SystemExit, SignalException
@@ -176,6 +195,10 @@ module BlinkTM
 				sleep 0.1
 			end
 
+			retry
+		rescue BlinkTM::SyncError
+			file &.close
+			sleep 0.005
 			retry
 		rescue BlinkTM::DeviceNotReady
 			file &.close

data/lib/blink_tm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BlinkTM
-	VERSION = "0.4.0"
+	VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blink_tm
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Sourav Goswami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-07 00:00:00.000000000 Z
+date: 2021-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linux_stat
@@ -31,11 +31,14 @@ executables:
 - blink-tm
 extensions:
 - ext/baudrate/extconf.rb
+- ext/crc32/extconf.rb
 extra_rdoc_files: []
 files:
 - exe/blink-tm
 - ext/baudrate/baudrate.c
 - ext/baudrate/extconf.rb
+- ext/crc32/crc32.c
+- ext/crc32/extconf.rb
 - lib/blink_tm.rb
 - lib/blink_tm/blink_tm.rb
 - lib/blink_tm/version.rb
@@ -58,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.18
+rubygems_version: 3.2.21
 signing_key:
 specification_version: 4
 summary: A controller for Arduino OLED System Monitor, Blink Task Manager