nRF24-ruby 0.0.4 → 0.0.5

data/bin/nRF24_udp.rb

@@ -0,0 +1,156 @@
+#!/usr/bin/env ruby
+#encoding: UTF-8
+
+
+require "pp"
+require 'socket'
+require 'json'
+require 'uri'
+require 'ipaddr'
+require 'time'
+require 'thread'
+
+
+if File.file? './lib/nRF24-ruby.rb'
+  require './lib/nRF24-ruby.rb'
+  puts "using local lib"
+else
+  require 'nRF24-ruby'
+end
+
+puts "\nPure Ruby nRF24 <-> UDP Bridge Starting..."
+
+http=true
+#http=false
+
+if http
+  puts "Loading Http-server.. hold on.."
+  require 'minimal-http-ruby'
+  minimal_http_server http_port: 8088, http_path: "./http/"
+  puts "\n"
+end
+
+def open_port uri_s
+  begin
+    uri = URI.parse(uri_s)
+    if uri.scheme== 'udp'
+      return [UDPSocket.new,uri.host,uri.port]
+    else
+      raise "Error: Cannot open socket for '#{uri_s}', unsupported scheme: '#{uri.scheme}'"
+    end
+  rescue => e
+    pp e.backtrace
+    raise "Error: Cannot open socket for '#{uri_s}': #{e}"
+  end
+end
+
+def poll_packet socket
+  begin
+    r,stuff=socket.recvfrom_nonblock(200) #get_packet --high level func!
+    client_ip=stuff[2]
+    client_port=stuff[1]
+    return [r,client_ip,client_port]
+  rescue IO::WaitReadable
+    sleep 0.1
+  rescue => e
+    puts "Error: receive thread died: #{e}"
+    pp e.backtrace
+  end
+  return nil
+end
+
+def poll_packet_block socket
+  #decide how to get data -- UDP-socket or FM-radio
+  r,stuff=socket.recvfrom(200) #get_packet --high level func!
+  client_ip=stuff[2]
+  client_port=stuff[1]
+  return [r,client_ip,client_port]
+end
+
+def send_raw_packet msg,socket,server,port
+  if socket
+    if socket.class.name=="UDPSocket"
+      socket.send(msg, 0, server, port)
+    else
+      a=msg.unpack('c*')
+      socket.send_q << {msg: a, to: server, socket: port,ack:false}
+    end
+    #MqttSN::hexdump msg
+  else
+    puts "Error: no socket at send_raw_packet"
+  end
+end
+
+
+r0=NRF24.new id: :eka, ce: 22,cs: 27, irq: 17, chan:4, ack: false, mac: "A7:A7",mac_header: true
+r1=NRF24.new id: :toka, ce: 24,cs: 23, irq: 22, chan: 4, ack: false, mac: "A5:A5",mac_header: true
+
+s0,s0_host,s0_port=open_port("udp://20.20.20.21:1882") # our port for forwarder/broker connection
+s1,s1_host,s1_port=open_port("udp://20.20.20.21:1882")
+s1.bind("0.0.0.0",5555) # our port for clients
+pp s0
+pp s1
+puts "Main Loop Starts:"
+
+loopc=0;
+sc=0;
+
+def poll_packet_radio r
+  if not r.recv_q.empty? #get packets from broker's radio and send them to udp broker/forwader
+    msg=r.recv_q.pop
+    pac=msg[:msg].pack("c*")
+    len=msg[:msg][0]
+    if len<1 or len>30
+      puts "crap #{msg}"
+      return nil
+    end
+    if msg[:checksum]!=msg[:check]
+      puts "checksum error #{msg}"
+      return nil
+    end
+    pac=pac[0...len]
+    #puts "got #{msg}, '#{pac}'"
+    return [pac,msg[:from],msg[:socket] ]
+  end
+  return nil
+end
+
+# client s1 <-> r0
+
+# forwarder s0 <-> r1
+
+loop do
+  begin
+    if pac=poll_packet(s1) #get packets from client's via udp (s1) and send them to forwarder's radio
+      r,@client_ip,@client_port=pac
+      puts "UDP1(#{@client_ip}:#{@client_port})->RAD0(#{r1.mac}:#{4}): #{pac}"
+      #r0.send_q << {msg: msg, to: r1.mac, socket: 3,ack:false}
+      send_raw_packet r,r0,r1.mac,4
+    end
+
+    if pac=poll_packet_radio(r1)  #this is forwarder receiving the packet from client -- and sendig it to broker at s0
+      r,client_ip,client_port=pac
+      puts "RAD1(#{client_ip}:#{client_port})->UDP0(#{s0_host}:#{s0_port}): #{pac}"
+      send_raw_packet r,s0,s0_host,s0_port
+    end
+
+
+    if pac=poll_packet(s0) #get packets from broker ... send to client via radio
+      r,client_ip,client_port=pac
+      puts "UDP0(#{client_ip}:#{client_port})->RAD1(#{r0.mac}:#{3}): #{pac}"
+      send_raw_packet r,r1,r0.mac,3
+    end
+
+    if pac=poll_packet_radio(r0)  #this is client listening to radio r0 and getting the packet (via s1)
+      r,client_ip,client_port=pac
+      puts "RAD0(#{client_ip}:#{client_port})->UDP1(#{@client_ip}:#{@client_port}): #{pac}"
+      send_raw_packet r,s1,@client_ip,@client_port
+    end
+
+  rescue => e
+      puts "Error: receive thread died: #{e}"
+      pp e.backtrace
+  end
+  sleep 0.01
+end
+

data/examples/nRF24-demo.rb

@@ -11,6 +11,7 @@ end
 puts "\nPure Ruby nRF24L01 Driver Starting..."
 
 http=true
+#http=false
 
 if http
   puts "Loading Http-server.. hold on.."
@@ -19,39 +20,40 @@ if http
   puts "\n"
 end
 
-bmac="B2:B2:B3"
+bmac="C7:C7:C7"
 NRF24::set_bmac bmac
-r0=NRF24.new id: :eka, ce: 22,cs: 27, irq: 17, chan:3, ack: false, mac: "00:A7:A7"
-r1=NRF24.new id: :toka, ce: 24,cs: 23, irq: 22, chan: 3, ack: false, mac: "00:A5:A5"
+r0=NRF24.new id: :eka, ce: 22,cs: 27, irq: 17, chan:4, ack: false, mac: "A7:A7",mac_header: true
+r1=NRF24.new id: :toka, ce: 24,cs: 23, irq: 22, chan: 4, ack: false, mac: "A5:A5",mac_header: true
 
 puts "Main Loop Starts: bmac: #{NRF24::get_bmac}"
 
 loopc=0;
 sc=0;
-
+lista=[]
 loop do
   if (loopc%4)==0
     msg=[]
-    str=sprintf "testing %5.5d -- testing?",sc%10000
+    str=sprintf "%5.5d",sc
+    lista<<sc
     sc+=1
     str.each_byte do |b|
       msg<<b
     end
     if sc&2==0
       if sc&1==0
-        r0.send_q << {msg: msg, tx_mac: bmac}
+        r0.send_q << {msg: msg, socket: :broadcast}
       else
-        r1.send_q << {msg: msg, tx_mac: bmac}
+        r1.send_q << {msg: msg, socket: :broadcast}
       end
     else  
       if sc&1==0
         #r0.send_q << {msg: msg, tx_mac: r1.mac,ack:true}
-        r0.send_q << {msg: msg, tx_mac: "FF:A5:A5",ack:true}
+        r0.send_q << {msg: msg, to: r1.mac, socket: 3,ack:true}
       else
-        r1.send_q << {msg: msg, tx_mac: r0.mac,ack:true}
+        r1.send_q << {msg: msg, to: r0.mac, socket: 4,ack:true}
       end
     end
-    NRF24::note "sent '#{str}' to #{sc&1}"
+    NRF24::note "lista:#{lista.size}"
   end
   loopc+=1
   while not r1.recv_q.empty?
@@ -59,25 +61,37 @@ loop do
     #puts "got 1 #{got}"
     msg=""
     len=0
-    got.each_with_index do |b,i|
-      msg[i]=b.chr
+    got[:msg].each_with_index do |b,i|
+      break  if b==0x00
+      msg[i]=b.chr 
     end
-    NRF24::note "got #{msg} from 1!"
+    got[:msg]=msg
+    s=got[:msg].to_i
+    lista-=[s]
+    NRF24::note "i #{got}"
   end
   while not r0.recv_q.empty?
     got=r0.recv_q.pop
     #puts "got 0 #{got}"
     msg=""
     len=0
-    got.each_with_index do |b,i|
-      msg[i]=b.chr
+    got[:msg].each_with_index do |b,i|
+      msg[i]=b.chr if b!=0x00
     end
-    NRF24::note "got #{msg} from 0!"
+    got[:msg]=msg
+    s=got[:msg].to_i
+    lista-=[s]
+    NRF24::note "i #{got}"
   end
   if not http
-    pp r0.json
-    pp r1.json
+   if NRF24::get_log.size>0
+      e=NRF24::get_log[0]
+      if e[:text][/lista/]
+        puts e
+      end
+      NRF24::get_log.shift
+   end
   end
-  sleep 0.1
+  sleep 0.05
 end
 

data/http/json/action.rb

@@ -20,7 +20,7 @@ def json_action request,args,session,event
 	    d.get_regs true
 	  else
 	  	puts "initing #{d}"
-	  	d.hw_init chan: chan, ack: aa, rf_dr: args['rf_dr'], rf_pwr: args['rf_pwr'], lna_hcurr: args['lna_hcurr']
+	  	d.hw_init chan: chan, ack: aa, rf_dr: args['rf_dr'], rf_pwr: args['rf_pwr'], lna_hcurr: args['lna_hcurr'],mac_header: true
 	  	d.get_regs true
 	  end
   end

data/lib/nRF24-ruby.rb

@@ -3,14 +3,16 @@
 
 require 'pp'
 require 'thread'
+require 'time'
 require 'pi_piper'
+require 'zlib'
 include PiPiper
 
 class NRF24
   @@all=[]
   @@PAYLOAD_SIZE=32
   @@SPI_CLOCK=250000
-        
+
   @@regs={
     CONFIG:      {address: 0x00,len:7},
     EN_AA:       {address: 0x01,len:6},
@@ -36,7 +38,7 @@ class NRF24
     RX_PW_P4:    {address: 0x15, format: :dec,hide: true},
     RX_PW_P5:    {address: 0x16, format: :dec,hide: true},
     FIFO_STATUS: {address: 0x17, poll: 1, len:7},
-    DYNPD:       {address: 0x1C,len:6}, 
+    DYNPD:       {address: 0x1C,len:6},
     FEATURE:     {address: 0x1D,len:3},
   }
 
@@ -53,13 +55,12 @@ class NRF24
     ACTIVATE2:  0x73,
   }
 
-  @@sem=Mutex.new 
+  @@sem=Mutex.new
   @@log=[]
   @@bmac="45:45:45:45:45"
 
   def self.set_bmac mac
     @@bmac=mac
-    puts "set bmac to #{mac}"
   end
 
   def self.note str,*args
@@ -72,7 +73,7 @@ class NRF24
       puts "note dies: #{e} '#{str}'"
     end
   end
-  
+
   def get_ccode c
     ccode=@@cmds[c]
     if not ccode
@@ -95,8 +96,8 @@ class NRF24
     status=0
     cc=get_ccode(c)
     @@sem.synchronize do
-      @cs.off 
-      PiPiper::Spi.begin do 
+      @cs.off
+      PiPiper::Spi.begin do
         clock(@@SPI_CLOCK)
         status=write cc
         data.each do |byte|
@@ -116,14 +117,14 @@ class NRF24
     cc=get_ccode(:R_REGISTER) +i
     @@sem.synchronize do
       @cs.off
-      PiPiper::Spi.begin do 
+      PiPiper::Spi.begin do
         clock(@@SPI_CLOCK)
         status=write cc
         if bytes==1
           data=write(0xff)
         else
           data=[]
-          bytes.times do 
+          bytes.times do
             data << write(0xff)
           end
         end
@@ -157,6 +158,16 @@ class NRF24
     [@s[:status]]
   end
 
+  def calc_crc str
+    checksum=0
+    str.unpack("c*").each do |c|
+      checksum+=c.ord
+    end
+    checksum&=0xff
+    #puts "cc calc: '#{str}'' -> #{checksum}"
+    return checksum
+  end
+
   def send packet,hash={}
     pac=Array.new(@@PAYLOAD_SIZE, 0)
     packet.each_with_index do |byte,i|
@@ -164,12 +175,16 @@ class NRF24
     end
     @ce.off
     wreg :CONFIG,0x0a
+    #prepend our mac?
+    if @s[:params][:mac_header]
+      checksum= calc_crc(pac.pack("c*"))
+      pac= NRF24::mac2a(@mac, short:true)+[checksum]+pac
+      pac=pac[0...32]
+    end
     if hash[:ack] and @s[:params][:ack]
       cmd :W_TX_PAYLOAD,pac
-      #puts "with ack"
     else
       cmd :W_TX_PAYLOAD_NOACK,pac
-      #puts "with NOack" 
     end
     @ce.on
     sleep 0.001
@@ -178,13 +193,6 @@ class NRF24
     @ce.on
   end
 
-  def recv 
-    fifo_status,_=rreg :FIFO_STATUS
-    if (fifo_status & 0x01) == 0x01
-      puts "on dataa"
-    end
-  end
-
   def get_regs all
     @@regs.each do |k,r|
       next if not r[:poll] and not all
@@ -198,34 +206,48 @@ class NRF24
       begin
         loop do
           donesome=false
-
+          cflag=0
           s,d,b=rreg :FIFO_STATUS
           if (s&0x40) == 0x40
-            NRF24::note "got RX_DR --received something"
-            wreg :STATUS,0x40
+            #NRF24::note "got RX_DR --received something"
+            cflag|=0x40
           end
           if (s&0x20) == 0x20
-            NRF24::note "got TX_DS --sent something"
+            #NRF24::note "got TX_DS --sent something"
             wreg :STATUS,0x20
+            cflag|=0x20
           end
           if (s&0x10) == 0x10
             NRF24::note "****************** got MAX_RT --send fails..."
-            wreg :STATUS,0x10
+            cflag|=0x10
             @s[:sfail]+=1
           end
-          if (d&0x01)==0x00
+          wreg(:STATUS,cflag) if cflag>0
+          while (d&0x01)==0x00
+            @s[:rfull]+=1 if (d&0x02)==0x02
             pipe=(s>>1)&0x05
-            NRF24::note "pipe: #{pipe}"
-            ret=cmd :R_RX_PAYLOAD,Array.new(@@PAYLOAD_SIZE, 0xff)
-            @recv_q<<ret
-            @s[:rcnt]+=1
-            donesome=true
-          end
-          if (d&0x02)==0x02
+            if pipe==0
+              socket=:broadcast
+            else
+              socket=pipe-1
+            end
             ret=cmd :R_RX_PAYLOAD,Array.new(@@PAYLOAD_SIZE, 0xff)
-            @recv_q<<ret
+            if @s[:params][:mac_header]
+              sender=NRF24::a2mac(ret[0..1])
+              checksum=ret[2]
+              ret.shift(3)
+              check= calc_crc(ret.pack("c*"))
+              if check!=checksum
+                puts "Error: Checksum error! Message Ignored!"
+                s,d,b=rreg :FIFO_STATUS
+                next
+              end
+            end
+            msg={msg:ret,socket:socket,from:sender,to:@mac,dir: :in,checksum:checksum,check:check}
+            @recv_q << msg
+            NRF24::note "i #{msg}"
             @s[:rcnt]+=1
-            @s[:rfull]+=1
+            s,d,b=rreg :FIFO_STATUS
             donesome=true
           end
 
@@ -233,7 +255,6 @@ class NRF24
           if not @send_q.empty?
             if (d&0x20)==0x00
 
-
               s,d,b=rreg :OBSERVE_TX
               if (d&0x0f)!=0x00
                 NRF24::note "got ARC_CNT:#{d&0x0f}******************"
@@ -241,9 +262,18 @@ class NRF24
               end
 
               msg=@send_q.pop
-              wreg :TX_ADDR,NRF24::mac2a(msg[:tx_mac]) 
-              #puts "send mac: #{msg[:tx_mac]}"
+              #puts "msg:#{msg}"
+              if msg[:socket]==:broadcast
+                to=NRF24::mac2a(NRF24::get_bmac)
+              else
+                to=NRF24::mac2a(msg[:to],socket: msg[:socket])
+              end
+              wreg :TX_ADDR, to
+              msg[:from]=@mac
+              msg[:dir]=:out
               send msg[:msg], ack:msg[:ack]
+              #msg[:msg]=msg[:msg].pack("c*")
+              NRF24::note "o #{msg}"
               @s[:scnt]+=1
             end
           end
@@ -299,19 +329,30 @@ class NRF24
     @@regs
   end
 
-  def json 
+  def json
     @s
   end
 
-  def self.get_log 
+  def self.get_log
     @@log
   end
 
-  def self.mac2a mac
+  def self.a2mac a,hash={}
+    mac=""
+    a.each do |e|
+      mac+=":" if mac!=""
+      mac+=sprintf "%02X",e
+    end
+    mac
+  end
+
+  def self.mac2a mac,hash={}
     a=[]
     mac.split(":").each do |b|
       a<<b.hex
     end
+    a.unshift hash[:socket]||0 if a.size==2 and not hash[:short]
+    #pp a
     a
   end
 
@@ -326,7 +367,7 @@ class NRF24
       scnt: 0,
       sarc: 0,
       sfail: 0,
-    } 
+    }
     @id=hash[:id]
     wreg :CONFIG,0x0b
     rf_dr=(hash[:rf_dr]||1).to_i&0x01
@@ -354,37 +395,27 @@ class NRF24
     wreg :RX_PW_P5,@@PAYLOAD_SIZE
     wreg :TX_ADDR,NRF24::mac2a(@@bmac)
     wreg :RX_ADDR_P0,NRF24::mac2a(@@bmac)
-    wreg :RX_ADDR_P2,0xfc
-    wreg :RX_ADDR_P3,0xfd
-    wreg :RX_ADDR_P4,0xfe
-    wreg :RX_ADDR_P5,0xff
+
     if hash[:mac] #keep old if not defined
-      wreg :RX_ADDR_P1,NRF24::mac2a(hash[:mac]) 
+      wreg :RX_ADDR_P1,NRF24::mac2a(hash[:mac])
       @mac=hash[:mac]
     else
-      s,d,bytes,code =rreg :RX_ADDR_P1
-      mac=""
-      d.each do |b|
-        mac+=":" if mac!=""
-        mac+=sprintf "%02X",b
-      end
-      @mac=mac
-    end
 
-#    if hash[:ack]
- #     cmd :ACTIVATE,[ 0]
-  #  else
-      cmd :ACTIVATE,[ get_ccode(:ACTIVATE2)]
-   # end
+    end
+    wreg :RX_ADDR_P2,1
+    wreg :RX_ADDR_P3,2
+    wreg :RX_ADDR_P4,3
+    wreg :RX_ADDR_P5,4
+    cmd :ACTIVATE,[ get_ccode(:ACTIVATE2)]
 
     cmd :FLUSH_TX
     cmd :FLUSH_RX
   end
 
   def initialize(hash={})
-    @semh=Mutex.new 
+    @semh=Mutex.new
+
 
-   
     @ce=PiPiper::Pin.new(:pin => hash[:ce], :direction => :out)
     @cs=PiPiper::Pin.new(:pin => hash[:cs], :direction => :out)
 
@@ -397,7 +428,8 @@ class NRF24
 
     hw_init hash
 
-    @server_t=rf_server 
+    @server_t=rf_server
+    @server_t.priority=100
     @monitor_t=do_monitor
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nRF24-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-28 00:00:00.000000000 Z
+date: 2014-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minimal-http-ruby
@@ -46,12 +46,14 @@ dependencies:
 description: ! 'Pure Ruby Driver and Utilitity with Http-server for the Ultra Cheap
   Radio Chip nRF24 '
 email: jalopuuverstas@gmail.com
-executables: []
+executables:
+- nRF24_udp.rb
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/nRF24-ruby.rb
 - examples/nRF24-demo.rb
+- bin/nRF24_udp.rb
 - http/json/logger.rb
 - http/json/nRF24.rb
 - http/json/action.rb