move buton to pin 16

dride · Nov 30, 2017 · 5b807a7 · 5b807a7
1 parent 2b6f567
commit 5b807a7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/daemons/bluetooth/characteristic.js b/daemons/bluetooth/characteristic.js
@@ -6,11 +6,8 @@ var bleno = require('bleno');
 
 var BlenoCharacteristic = bleno.Characteristic;
 
-var exec = require('child_process').exec;
-
-
 var gpio = require('rpi-gpio');
-gpio.setup(29, gpio.DIR_IN, gpio.EDGE_BOTH);
+gpio.setup(16, gpio.DIR_IN, gpio.EDGE_BOTH);
 
 var ex = null;
 
@@ -36,6 +33,7 @@ buttonStream.prototype.onReadRequest = function (offset, callback) {
 
 buttonStream.prototype.onSubscribe = function (maxValueSize, updateValueCallback) {
   ex = updateValueCallback
+  spawn('python',["/home/Cardigan/modules/indicators/python/states/standalone.py", "isPaired"]);
 }
 
 gpio.on('change', function (channel, value) {
@@ -52,7 +50,7 @@ gpio.on('change', function (channel, value) {
 
 	// push videoId to app
 	if (ex){
-		var process = spawn('python',["/home/Cardigan/modules/indicators/python/states/standalone.py", "buttonPress"]);
+		spawn('python',["/home/Cardigan/modules/indicators/python/states/standalone.py", "buttonPress"]);
 
 		var data = new Buffer(Buffer.byteLength(currentTimeStamp, 'utf8') + 2);
 
@@ -61,7 +59,7 @@ gpio.on('change', function (channel, value) {
 		console.log('NotifyOnlyCharacteristic update value: ' + currentTimeStamp);
 		ex(data);
 	}else{
-		var process = spawn('python',["/home/Cardigan/modules/indicators/python/states/standalone.py", "buttonPressOffline"]);
+		spawn('python',["/home/Cardigan/modules/indicators/python/states/standalone.py", "buttonPressOffline"]);
 	}
 
   }

diff --git a/dride-ws b/dride-ws
diff --git a/modules/indicators b/modules/indicators
+2 −2		server/api/indicator/indicator.controller.js
+1 −0		server/routes.js
+0 −1		python/states/adas.py
+0 −1		python/states/carAheadRed.py
+56 −16		python/states/indicators.py
+0 −1		python/states/leftLaneDeparture.py
+0 −1		python/states/loading.py
+0 −1		python/states/rightLaneDeparture.py
+21 −0		python/states/standalone.py
+0 −0		python/states/standalone/__init__.py
+37 −0		python/states/standalone/buttonPress.py
+14 −0		python/states/standalone/done.py
+38 −0		python/states/standalone/isDownloading.py
+50 −0		python/states/standalone/isPaired.py
+38 −0		python/states/standalone/isWaiting.py
+5 −14		python/states/standalone/needToLogin.py
+34 −0		python/states/standalone/needToPair.py
+34 −0		python/states/standalone/uploadSuccessfully.py
+0 −1		python/states/talking.py
+0 −1		python/states/wakeWord.py