nabaztag_hack_kit 0.0.3 → 0.1.0.alpha1

data/.gitignore

@@ -5,3 +5,5 @@ pkg/*
 .rvmrc
 *.bin
 *.o
+examples/record/config.ru
+.mtlrc

data/.travis.yml

@@ -1,3 +1,3 @@
 rvm:
   - 1.9.2
-script: "bundle exec rake test"
+script: "bundle exec rake spec"

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changes
 
+## v0.1.0 - xx-09-2012
+
+  * files restructured, speration byte & ruby code
+  * update server for generic structure, added callback
+  * mtl binaires respect defaults from local `.mtlrc` file
+
 ## v0.0.2 - 29-01-2012
 
   * rename to NabaztagHackKit
@@ -8,4 +14,4 @@
 
 ## v0.0.1 - 28-01-2012
 
-  * inital release
+  * inital release

data/Rakefile

@@ -1,21 +1,6 @@
 require "bundler/gem_tasks"
-
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new("unit") do |t|
-  t.pattern = "./test/**/*_spec.rb" # don't need this, it's default.
-end
-
-namespace :test do
-  desc "Test bytcode"
-  task :bytecode do
-    puts `bin/mtl_simu test/bytecode/test.mtl`
-  end
-end
 
-task :test => [:unit]
-task :default => :test
+RSpec::Core::RakeTask.new(:spec)
 
-desc "start server on port 9090"
-task :run do
-  `rackup -p 9090`
-end
+task :default => :spec

data/{ext/bytecode → bytecode}/Docs.md

@@ -433,7 +433,7 @@ On suppose l’existence d’une fonction ‘rand’ qui retourne un nombre alé
 Random notes of stuff I came accross while developing
 
 ### Leds
-Thank god it's RGB: Led 0 - 4, Color RGB
+Thank good it's RGB: Led 0 - 4, Color RGB
 
     led 0 0x000000; //black
     led 0 0x0000FF; //blue
@@ -446,6 +446,7 @@ Thank god it's RGB: Led 0 - 4, Color RGB
 
 
 ### Ears
+One loop is 15 ticks
 
 ### Custom functions
 

data/bytecode/Rakefile

@@ -0,0 +1,7 @@
+
+desc "Test bytcode"
+task :test do
+  puts `bin/mtl_simu test/test.mtl`
+end
+
+task :default => :test

data/{bin → bytecode/bin}/mtl_comp

@@ -1,5 +1,14 @@
 #!/usr/bin/env ruby
 
+MTL_FILE = ".mtlrc"
+
+if File.exists?(MTL_FILE)
+  File.read(MTL_FILE).split("\n").each do |line|
+    var, *data = line.split("=")
+    ENV[var] = data.join
+  end
+end
+
 BIN_NAME    = File.basename(__FILE__)
 BIN_PATH    = File.dirname(__FILE__)
 BIN         = File.join( File.expand_path("../ext/mtl", BIN_PATH), BIN_NAME)

data/{bin → bytecode/bin}/mtl_merge

@@ -14,9 +14,9 @@ file = ARGV.first
 dir = File.dirname(file)
 File.open(TMP, 'w') do |out|
   File.open(file).each_line do |line|
-    if line =~ /#include "([^"]+)"/
+    if line =~ /\A#include "([^"]+)"/
       line = `cat #{dir}/#{$1}.mtl`
     end
     out.puts line
   end
-end
+end

data/{bin → bytecode/bin}/mtl_simu

@@ -1,5 +1,14 @@
 #!/usr/bin/env ruby
 
+MTL_FILE = ".mtlrc"
+
+if File.exists?(MTL_FILE)
+  File.read(MTL_FILE).split("\n").each do |line|
+    var, *data = line.split("=")
+    ENV[var] = data.join
+  end
+end
+
 BIN_NAME    = File.basename(__FILE__)
 BIN_PATH    = File.dirname(__FILE__)
 BIN         = File.join( File.expand_path("../ext/mtl", BIN_PATH), BIN_NAME)

data/bytecode/lib/buffer.mtl

@@ -1,6 +1,12 @@
 //###############################################
 //---------------------- Buffer -------------------------------
 
+// #### LEDS
+//  Buffers 0 - 9, where 0-4 are used for onetime, and 5-9 for loop playback.
+
+// #### EARS
+// Buffers 10 - 13, where 10 & 11 are used for onetime, and 12 & 13 for loop playback.
+
 var buffers;;
 type BUFFER=[valB stepB lenB posB loopB];;
 

data/bytecode/lib/button.mtl

@@ -1,27 +1,33 @@
 //###############################################
 //------------------- Button --------------------
 
-const BUTTON_REBOOT = 30;; //ms MIN 50ms
+const BUTTON_REBOOT = 3000;; //ms MIN 50ms
 var button_pressed  = 0;;
+
 fun checkButton=
   if (button2 > 0) then
   (
-    set button_pressed = button_pressed + 1;
-    if button_pressed == 1 then
+    if button_pressed == 0 then
     (
-      httprequest "GET" buttonUrl (itoa time_ms) "" #_cbHttp HTTP_NORMAL;
-      0
-    ) else if button_pressed == BUTTON_REBOOT then
+      set button_pressed = time_ms
+    )
+    else if (time_ms - button_pressed) > BUTTON_REBOOT then
     (
-      buffersFill 0 4 "\0\255\0\255\0\255\255\255"
+      buffersFill 0 4 "\255"
     )
   )
   //reboot only when button not pressed, otherwise we get into setup mode
-  else if button_pressed > BUTTON_REBOOT then
+  else if button_pressed > 0 then
   (
-    exit
-  )
-  else (
-    set button_pressed = 0
+    if (time_ms - button_pressed) > BUTTON_REBOOT then
+    (
+      exit;
+      set button_pressed = 0
+    )
+    else
+    (
+      httprequest "GET" buttonPressedUrl (time_ms - button_pressed) "" #_cbHttp HTTP_NORMAL;
+      set button_pressed = 0
+    )
   )
 ;;

data/bytecode/lib/ear.mtl

@@ -46,10 +46,10 @@ fun earRead index=
         if ear.dir != EAR_STOP && lastDuration > 1000 && totalDuration < 1450 then
         (
            set ear.pos = earNorm (ear.dir - 1) / 2; // either 0 or 16
-           bufferFill 0 "\100";
-           log "reset" {index lastDuration totalDuration ear.dir ear.pos}
+           bufferFill 0 "\100"
+           // log "reset" {index lastDuration totalDuration ear.dir ear.pos}
         );
-        log "moved" {index ear.lastTime ear.lastTime2 ear.lastRead ear.pos ear.shouldPos ear.dir };
+        // log "moved" {index ear.lastTime ear.lastTime2 ear.lastRead ear.pos ear.shouldPos ear.dir };
 
         set ear.lastTime2 = ear.lastTime;
         set ear.lastTime = currentTime

data/bytecode/lib/led.mtl

@@ -14,7 +14,7 @@ fun ledBufferRead index=
 ;;
 
 fun setLeds=
-   //LED_CHECK_FQ
+  // let LED_CHECK_FQ -> led_check_fq in
   let (button3 + 1) * 3 -> led_check_fq in
   if ((time_ms - led_last_check) > led_check_fq) then
   (

data/bytecode/lib/ping.mtl

@@ -0,0 +1,16 @@
+//###############################################
+//------------------ PING ----------------------
+const PING_CHECK_FQ = 5000;; //ms -> 5s
+const PING_PARAMS   = "";;
+
+var ping_last_check = 0;;
+
+fun pingCheck=
+  let PING_CHECK_FQ -> ping_check_fq in
+  if ((time_ms - ping_last_check) > ping_check_fq) then
+  (
+    httprequest "GET" (pingUrl PING_PARAMS) "" #_cbHttp HTTP_NORMAL;
+    set ping_last_check = time_ms
+  )
+;;
+

data/bytecode/lib/record.mtl

@@ -0,0 +1,87 @@
+var lrec;;
+var recording = 0;;
+var recordingStartedAt = 0;;
+var recSeconds = 0;;
+
+var buff;;
+var buffx;;
+var buffy;;
+
+//-------------------------------------------------------------
+
+fun sqrt_ i i0 i1=
+  let (i0+i1)>>1 -> m in
+  if m==i0 then i0
+  else if m*m>i then sqrt_ i i0 m else sqrt_ i m i1;;
+
+fun sqrt i=
+  sqrt_ i 0 256;;
+
+fun _cbrec s=
+  let 255-(Iecholn sqrt recVol s 0) -> vol in
+  let 255-((vol*vol)>>8) -> vol in
+  let vol<<16 -> vol in
+  (
+    led 1 vol; led 2 vol; led 3 vol
+  );
+  set lrec=s::lrec;
+  0;;
+
+fun itobin4 i=
+  let strnew 4 -> s in
+  (
+    strset s 0 i;
+    strset s 1 i>>8;
+    strset s 2 i>>16;
+    strset s 3 i>>24;
+    s
+  );;
+
+fun liststrlen l r= if l==nil then r else liststrlen tl l r+strlen hd l;;
+
+fun mkriff ldata=
+  let Iecholn liststrlen ldata 0 -> len in
+  (strcatlist "RIFF"::(itobin4 len+52)::"WAVEfmt \$14\0\0\0\$11\0\1\0\$40\$1f\0\0\$d7\$0f\0\0\0\1\4\0\2\0\$f9\01"::
+  "fact\4\0\0\0"::(itobin4 (len>>8)*505)::"data"::(itobin4 len)::nil)::ldata
+;;
+
+fun recriff =
+  // rev -> reverse list
+  let mkriff rev lrec nil -> res in
+  (
+    set lrec=nil;
+    res
+  )
+;;
+
+fun recordingStart sec=
+  recStop;
+  loopBufferFill 9 "\0\200";
+  set recording = 1;
+  set recSeconds =sec;
+  set lrec = nil;
+  set recordingStartedAt = time_ms;
+  recStart 8000 0 #_cbrec
+;;
+
+fun httprequestBinary url postdata cb type=
+  httprequestRaw "POST" url "Content-Type:application/octet-stream\13\nContent-Disposition: attachment;filename=recording\13\nContent-Transfer-Encoding: binary\13\n" postdata cb type
+;;
+
+fun recordingStop =
+  set recording = 0;
+  recStop;
+  loopBufferFill 9 "\0";
+  let recriff -> wavfile in
+  (
+    httprequestBinary recordingFinishedUrl strcatlist wavfile #_cbHttp HTTP_NORMAL;
+    0
+  )
+;;
+
+fun recordingCheck =
+  if recording == 1 && recSeconds > 0 && (time_ms - recordingStartedAt) > recSeconds  then
+  (
+    recordingStop
+  )
+;;

data/bytecode/lib/rfid.mtl

@@ -1,7 +1,7 @@
 //###############################################
 //--------------- RFID ------------------------
 
-const RFID_CHECK_FQ  = 500;; //ms MIN 50ms
+const RFID_CHECK_FQ  = 200;; //ms MIN 50ms
 const RFID_STOP_BYTE = 0xFF;;
 const RFID_ID_START  = "\208\2\26";; // 0xd0 0x02 0x1a
 const RFID_ID_FALSE  = "\0\0\0\0\0\0\0\0\v";;
@@ -16,31 +16,13 @@ fun checkRFID=
     let rfidGet -> rfid in
     if (rfid != nil) then
     (
-      if ((strstr rfid RFID_ID_START 0) == 0) then
-      (
-        httprequest "PUT" playerUrl rfid "" #_cbHttp HTTP_NORMAL;
-        0
-      )
-      else if ((strstr rfid RFID_ID_FALSE 0) == 0) then
+      if ((strstr rfid RFID_ID_FALSE 0) == 0) then
       (
         0
       )
       else
       (
-        let strlen rfid -> len in //usually that's 8
-        for index = 0; index < len; index + 1 do
-        (
-          let strget rfid index -> data_byte in
-          (
-            if (data_byte != RFID_STOP_BYTE) then
-              set rfid_data = strcat rfid_data ctoh data_byte
-            else if ((strlen rfid_data) > 0) then
-            (
-              httprequest "POST" eventUrl rfid_data "" #_cbHttp HTTP_NORMAL;
-              set rfid_data = ""
-            )
-          )
-        );
+        httprequest "PUT" rfidUrl rfid "" #_cbHttp HTTP_NORMAL;
         0
       )
     );

data/bytecode/main.mtl

@@ -2,36 +2,58 @@
 
 proto main 0;;
 proto earsInit 0;;
-
-#include "../ext/bytecode/lib/var"
-#include "../ext/bytecode/lib/util"
-#include "../ext/bytecode/lib/cfg"
-#include "../ext/bytecode/lib/arp"
-#include "../ext/bytecode/lib/udp"
-#include "../ext/bytecode/lib/tcp"
-#include "../ext/bytecode/lib/dns"
-#include "../ext/bytecode/lib/http"
-#include "../ext/bytecode/lib/dhcp"
+proto evalTrame 1;;
+
+#include "src/lib/var"
+#include "src/lib/util"
+#include "src/lib/cfg"
+#include "src/lib/arp"
+#include "src/lib/udp"
+#include "src/lib/tcp"
+#include "src/lib/dns"
+#include "src/lib/http"
+#include "src/lib/dhcp"
+#include "src/lib/wav"
 #include "lib/data_helper"
 #include "lib/buffer"
-#include "../ext/bytecode/lib/wifi"
+#include "src/lib/wifi"
 
-//-------------------- HTTP
-fun playerUrl tag=
-  strcatlist confGetServerUrl::"/players/"::(webmac tag)::".jsp"::nil;;
+//-------------------- HTTP Endpoints
+fun logUrl=
+  strcatlist confGetServerUrl::"/api/log.jsp"::nil;;
 
-fun eventUrl data=
-  strcatlist confGetServerUrl::"/events.jsp"::"?event[data]="::data::nil;;
+fun buttonPressedUrl data=
+  strcatlist confGetServerUrl::"/api/button-pressed.jsp?duration="::(itoa data)::nil;;
 
-fun buttonUrl data=
-  strcatlist confGetServerUrl::"/vl/button.jsp?"::data::nil;;
+fun recordingFinishedUrl =
+  strcatlist confGetServerUrl::"/api/recording-finished.jsp"::nil;;
 
-fun logUrl=
-  strcatlist confGetServerUrl::"/vl/log.jsp"::nil;;
+fun playbackFinishedUrl =
+  strcatlist confGetServerUrl::"/api/playback-finished.jsp"::nil;;
+
+fun playbackLoadFinishedUrl =
+  strcatlist confGetServerUrl::"/api/playback-load-finished.jsp"::nil;;
+
+fun rfidUrl tag=
+  strcatlist confGetServerUrl::"/api/rfid.jsp?id="::(webmac tag)::nil;;
+
+fun pingUrl params=
+  strcatlist confGetServerUrl::"/api/ping.jsp?"::params::nil;;
+
+fun streamUrl filename=
+  strcatlist confGetServerUrl::"/streams/"::filename::nil;;
+
+//-------------------- HTTP
 
 fun _cbdummyhttp http res=
-  0
-;;
+  0;;
+
+fun _cbHttp http res=
+  evalTrame res;
+  0;;
+
+#include "lib/record"
+#include "lib/ping"
 
 fun evalTrame res=
   let parseResponse httpgetcontent res -> bufferlist in
@@ -81,17 +103,46 @@ fun evalTrame res=
           _bufferFill index+10 step loop val;
           0
         )
+        // recording start
+        else if code == 50 then
+        (
+          recordingStart 1000 * (strget val 0) //TODO only 1 - 9 possible??
+        )
+        // recording stop
+        else if code == 51 then
+        (
+          recordingStop
+        )
+        // play start
+        else if code == 60 then
+        (
+          // playbackStart
+          0
+        )
+        // play stop
+        else if code == 61 then
+        (
+          //  playbackStop
+          0
+        )
+        // play load
+        else if code == 62 then
+        (
+          // playbackLoad val
+          0
+        )
+        // play stream
+        else if code == 63 then
+        (
+          // playbackStream val
+          0
+        )
       )
     )
 ;;
 
-fun _cbHttp http res=
-  evalTrame res;
-  0
-;;
-
 //inputs
-#include "lib/rfid"
+// #include "lib/rfid"
 #include "lib/button"
 
 //outputs
@@ -104,11 +155,17 @@ fun loop=
   wifiRun;
   wifiCheck;
 
-  checkRFID;
+  // checkRFID;
   checkButton;
+
   setLeds;
   earRead 0;
   earRead 1;
+
+  pingCheck;
+  // wavtime;
+
+  recordingCheck;
 0;;
 
 //###############################################

data/{ext/bytecode → bytecode/src}/lib/http.mtl

@@ -30,7 +30,9 @@ fun httpsendreq ip x=
  	);
  	0;;
 
-fun httprequest verb url postdata cb type=
+fun httprequestRaw verb url header postdata cb type=
+  //set postdata = strcatlist "--AaB03x\13\ncontent-disposition: form-dataContent-Transfer-Encoding: binary\13\n\13\n"::postdata::"\13\n--AaB03x--"::nil;
+  // Content-Type:application/octet-stream\13\nContent-Disposition: attachment;filename=recording\13\nContent-Transfer-Encoding: binary\13\n
   let cuturl url ->[host port path] in
   //let if confGetProxy then strcatlist "http://"::host::":"::(itoa port)::path::nil else path -> path in //Icy-MetaData:1\13\n
   //let if confGetProxy then webip confGetProxyip else host -> host in
@@ -38,12 +40,11 @@ fun httprequest verb url postdata cb type=
 
   let strcatlist verb::" "::path::" HTTP/1.0\13\nUser-Agent: MTL\13\nPragma: no-cache\13\nIcy-MetaData:1\13\nHost: "::host::"\13\n"::
       if postdata==nil then "\13\n"::nil
-      else "Content-length: "::(itoa strlen postdata)::"\13\n\13\n"::postdata::nil
+      else header::"Content-length: "::(itoa strlen postdata)::"\13\n\13\n"::postdata::nil
     -> request in  // création de la chaîne requête
 
   let [outputH:request indexH:0 cbH:cb typeH:type stateH:HTTP_SOLVE aliveH:time_ms] -> httpreq in  // création de la structure requête
   (
-//    Secho "HTTPREQUEST host =";Secholn host;
     if isip host 0 then httpsendreq host [port httpreq]
     else
     (
@@ -53,6 +54,9 @@ fun httprequest verb url postdata cb type=
     httpreq  // on retourne la structure requête pour pouvoir éventuellement l'interrompre en cours de route
   );;
 
+fun httprequest verb url postdata cb type=
+  httprequestRaw verb url "" postdata cb type
+;;
 
 var http_sep="\13\n\13\n";;  // séparateur entre l'en-tête et le corps de la réponse à une requête
 
@@ -69,6 +73,14 @@ fun httpgetcontent res =
   if i==nil then nil
   else strsub res i+strlen http_sep strlen res;;
 
+fun httpabort httpreq=
+  closetcp httpreq.cnxH;; // on ferme la socket de la requête
+
+fun httpenable httpreq v=
+  enabletcp httpreq.cnxH v;;
+fun httpenabledP httpreq=
+  enabledtcpP httpreq.cnxH;;
+
 // Cryptage des trames
 fun bintoi3 s x=((strget s x)<<16)+((strget s x+1)<<8)+(strget s x+2);;
 

data/{ext/bytecode → bytecode/src}/lib/udp.mtl

@@ -19,7 +19,7 @@ fun mkudp ipsrc ipdst portsrc portdst content=
   );;
 
 fun udpSend2 mac udp=
-  Secho ">u";
+//  Secho ">u";
 //  dump udp;
   netSend udp 0 nil (/*MACecho*/ mac /*0 1*/) 0 1;;
 

data/{ext/bytecode → bytecode/src}/lib/util.mtl

@@ -4,6 +4,7 @@ fun setleds col= for i=0;i<5 do led i col;;
 fun strstr s p i=strfind s i p 0 nil;;
 fun listlen l=if l==nil then 0 else 1+listlen tl l;;
 fun listrem l x=if l!=nil then if x==hd l then tl l else (hd l)::listrem tl l x;;
+fun slistlen l= if l==nil then 0 else (strlen hd l)+slistlen tl l;;
 
 fun listtostr l=
   let strnew listlen l -> s in
@@ -71,4 +72,6 @@ fun useparamip val=
 	(
 		_useparamip ip 0 val 0;
 		ip
-	);;
+	);;
+
+fun conc p q=if p==nil then q else (hd p)::conc tl p q;;