Merge branch 'ia' into clients

Conflicts: conf_jsdoc.json hokuyo/main.js ia/actions.class.js ia/ia.class.js ia/pr.class.js lidar/main.js server/server.class.js webclient/index.js webclient/index.tpl.html webclient/pages/telecommande/telecommande.js webclient/pages/telecommande/telecommande.tpl.html webclient/webclient.html
utcoupe · May 8, 2017 · c676856 · c676856
2 parents 2e6f7cf + 61bc525
commit c676856
Show file tree

Hide file tree

Showing 99 changed files with 3,681 additions and 129,006 deletions.
diff --git a/.gitignore b/.gitignore
@@ -33,6 +33,10 @@ cmake-build-debug/
 bin/
 doc/
 
+# UTCoupe files
+tmp.bmp
+config.js
+
 # Some other files
 *get_distance
 *get_distance_intensity

diff --git a/config.js b/config.js
@@ -1,12 +1,12 @@
 /**
  * Server config
- * 
+ *
  * @module config
  * @type {Object}
  */
 
 module.exports = {
 	"server": "127.0.0.1:3128",
-	//"server": "192.168.0.100:3128",
+	// "server": "192.168.1.131:3128",
 	"hokuyo_command": "$UTCOUPE_WORKSPACE/bin/hokuyo"
 }
diff --git a/hokuyo/client_hok_old.js b/hokuyo/client_hok_old.js
diff --git a/hokuyo/config.js b/hokuyo/config.js