ant-wireless 0.1.0.pre.20210715102740 → 0.1.0.pre.20210810141303

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60051597c316ed311fb5c3203f5903e62f46e107c2094ae379db5dbf07c8232e
-  data.tar.gz: 41a4cc508416234557867b3fd0ac8c27c5d856cea90c7531fb99f29106028ec8
+  metadata.gz: 05bb146cd01ae909001401030d988ca1e14977d6159c5da9ee81736e66a17540
+  data.tar.gz: b9240f153be4b7ca510344f41c94d8ad7bbb8a6dd2f72e41242c18641d772db8
 SHA512:
-  metadata.gz: 22d0cf3c237e478f41ed217a67ce07a13e1dea8584142bee797fa7085cbf5e24445758cba5b2d29f7ca2ea50f973e20bb231e6579c50647bf286bb94e935f144
-  data.tar.gz: 3ce7d04e91583044385715746750f9bfd83dcbd06831a0e38f8c123f57e05fd778c6eaf13e5f9a6d770e85156c8406f7c195eab637a620dc6b5fa99f66ff829f
+  metadata.gz: 415ed825c123a9ca66debe50a52e406da5d83310127956fc8f4caba7b28eddfbb679528be081c5449267ae44a6dd9e820bbbf86ea48af8ba2ac66a2f77445bbf
+  data.tar.gz: 64c3ade415dc32510a003e7cc41d1a61e532113541fd9de22ab5c4d31d8dfa797e099ff5bc05127ddf256438a1bf35a8461c70ebaf44c738af7fb5735dca0450

data/ext/ant_ext/ant_ext.c

@@ -490,7 +490,7 @@ Init_ant_ext()
 	/*
 	 * Document-module: Ant
 	 *
-	 * This is an extension for using the ANT ultra-low power wireless protocol via 
+	 * This is an extension for using the ANT ultra-low power wireless protocol via
 	 * the Garmin USB ANT Stick. ANT can be used to send information
 	 * wirelessly from one device to another device, in a robust and flexible
 	 * manner.

data/lib/ant-wireless.rb

@@ -0,0 +1,7 @@
+# -*- ruby -*-
+# frozen_string_literal: true
+
+# Namespace placeholder so you can `require 'ant-wireless'`
+
+require 'ant'
+

data/lib/ant.rb

@@ -14,7 +14,6 @@ module Ant
 	# Package version
 	VERSION = '0.0.1'
 
-
 	# A Range for matching valid ANT device numbers
 	VALID_DEVICE_NUMBERS = ( 0...65535 ).freeze
 

data/lib/ant/channel.rb

@@ -44,9 +44,8 @@ class Ant::Channel
 
 
 	### Set up the given +mod+ as the handler module for channel events.
-	def set_event_handlers( mod=Ant::Channel::EventCallbacks )
-		self.extend( mod )
-		self.on_event( &self.method(:handle_event_callback) )
+	def set_event_handlers( object=Ant::Channel::EventCallbacks )
+		self.on_event( &object.method(:handle_event_callback) )
 	end
 
 

data/lib/ant/channel/event_callbacks.rb

@@ -62,6 +62,10 @@ module Ant::Channel::EventCallbacks
 	end
 
 
+	###############
+	module_function
+	###############
+
 	### Default callback hook -- handles event callbacks.
 	def handle_event_callback( channel_num, event_id, data )
 		handler_method = HANDLER_METHODS[ event_id ] or
@@ -78,10 +82,9 @@ module Ant::Channel::EventCallbacks
 	### Handle an TX event.
 	def on_event_tx( channel_num, data )
 		# self.log.info "Broadcast message on channel %d was transmitted." % [ channel_num ]
-
-		# data = SecureRandom.bytes( 8 )
-		# self.log.debug "Sending our own broadcast data: %p." % [ data ]
-		# self.send_broadcast_data( data )
+		data = SecureRandom.bytes( 8 )
+		self.log.info "Sending our own broadcast data: \n%s" % [ hexdump(data) ]
+		self.send_broadcast_data( data )
 	end
 
 
@@ -139,11 +142,20 @@ module Ant::Channel::EventCallbacks
 	end
 
 
-	# def on_event_rx_flag_acknowledged( channel_num, data )
-	#
-	# end
+	def on_event_rx_flag_acknowledged( channel_num, data )
+		flags = data.bytes[ 9 ]
+		if flags & Ant::ANT_EXT_MESG_BITFIELD_DEVICE_ID
+			usDeviceNumber     = data.bytes[10] | (data.bytes[11] << 8)
+			ucDeviceType       = data.bytes[12]
+			ucTransmissionType = data.bytes[13]
+			self.log.info "Got an acknowledge on Chan ID(%d/%d/%d)" %
+				[usDeviceNumber, ucDeviceType, ucTransmissionType]
+		end
+
+		self.on_event_rx_acknowledged( channel_num, data )
+	end
+
 
-	### Handle an RX_FLAG_BURST_PACKET event.
 	def on_event_rx_flag_burst_packet( channel_num, data )
 		flags = data.bytes[ 9 ]
 		if flags & Ant::ANT_EXT_MESG_BITFIELD_DEVICE_ID
@@ -158,7 +170,6 @@ module Ant::Channel::EventCallbacks
 	end
 
 
-	### Handle an RX_FLAG_BROADCAST event.
 	def on_event_rx_flag_broadcast( channel_num, data )
 		flags = data.bytes[ 9 ]
 		if flags & Ant::ANT_EXT_MESG_BITFIELD_DEVICE_ID
@@ -173,23 +184,21 @@ module Ant::Channel::EventCallbacks
 	end
 
 
-	# def on_event_rx_acknowledged( channel_num, data )
-	#
-	# end
+	def on_event_rx_acknowledged( channel_num, data )
+		self.log.info "Acknowledged: Rx:\n%s" % [ hexdump(data[1..9]) ]
+	end
 
 
-	### Handle an RX_BURST_PACKET event.
 	def on_event_rx_burst_packet( channel_num, data )
 		channel = (data.bytes[0] & CHANNEL_NUMBER_MASK) >> 5
 		sequence_num = data.bytes[0] & SEQUENCE_NUMBER_MASK
 
-		self.log.info "Burst (0x%02x): Rx: %d:\n%s" % [ channel, sequence_num, hexdump(data[1..8]) ]
+		self.log.info "Burst (0x%02x): Rx: %d:\n%s" % [ channel, sequence_num, hexdump(data[1..9]) ]
 	end
 
 
-	### Handle an RX_BROADCAST event.
 	def on_event_rx_broadcast( channel_num, data )
-		self.log.info "Broadcast: Rx:\n%s" % [ hexdump(data[1..8]) ]
+		self.log.info "Broadcast: Rx:\n%s" % [ hexdump(data[1..9]) ]
 	end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ant-wireless
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.20210715102740
+  version: 0.1.0.pre.20210810141303
 platform: ruby
 authors:
 - Michael Granger
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 2021-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -65,6 +65,7 @@ files:
 - ext/ant_ext/message.c
 - ext/ant_ext/types.h
 - ext/ant_ext/version.h
+- lib/ant-wireless.rb
 - lib/ant.rb
 - lib/ant/channel.rb
 - lib/ant/channel/event_callbacks.rb