reorg du code pour avoir des external imbriques

via un truc "a la" require.js

Author: piif

Makefile

@@ -6,7 +6,8 @@ export PROJECT_DIR := $(dir $(realpath ${MAKEFILE_LIST}))
 CORE_DIR := ${PROJECT_DIR}../ArduinoCore/
 
 # other arduino librairies project pathes this project depends on
-export DEPENDENCIES := ${CORE_DIR} ${CORE_DIR}../ArduinoLibs/ ${CORE_DIR}../ArduinoTools/
+export DEPENDENCIES := ${CORE_DIR} ${CORE_DIR}../ArduinoLibs/
+# ${CORE_DIR}../ArduinoTools/
 
 # generate assembler source code also
 export WITH_ASSEMBLY := yes
@@ -36,4 +37,4 @@ endif
 ifneq (${TARGET},)
 	rm -rf ${PROJECT_DIR}target/${TARGET}
 endif
-	
+	

README.md

@@ -9,14 +9,14 @@ TODO :
     => A TESTER
     + documenter comment la charger (appel d'un script manuel en attendant que
     le système d'extension soit ouvert)
-- 2'  idem en mode socket+nodejs comme passe plat
+* 2'  idem en mode socket+nodejs comme passe plat
 * 3 - ajouter un flag et consulter ce flag par un "?"
-- 3'  + faire son pendant scratch 
+* 3'  + faire son pendant scratch 
 * 4 - ajouter un bouton, qui envoie un caractère "!" quand on l'appuie une fois
-- 4'  + faire l'évènement associé coté scratch
+* 4'  + faire l'évènement associé coté scratch
 
 voir ensuite quelles interactions seraient plus sympa à mettre en place ?
 - moteurs pas à pas ? tortue ? jeu de lumière ? guirlande ?
 
 idéalement : le chargement d'une extension coté scratch déclenche l'appel
- à nodejs qui lance l'upload du code associé
+ à nodejs qui lance l'upload du code associé ?

ArduinoScratch.ino renamed to basic.ino

@@ -4,33 +4,48 @@
 #endif
 
 #define LED 13
+// PCMSK0:4 + Int PCI0
 #define BUTTON 12
 
 bool ledState = LOW;
-bool buttonState = HIGH;
-bool buttonLastChange = 0;
 
 void setup(void) {
 	pinMode(LED, OUTPUT);
 	digitalWrite(LED, LOW);
 
+	// enable interrupt for PCINT4 = D12
+	PCMSK0 |= 1 << 4;
+	// enable interrupt for PCI0 (pcint0-7)
+	PCICR |= 1;
+
 	// TODO : bind raising interrupt on this digital input
 	pinMode(BUTTON, INPUT_PULLUP);
 
 	Serial.begin(DEFAULT_BAUDRATE);
 }
 
-void loop() {
-	// test button
+volatile bool mustSendButton = false;
+volatile bool buttonState = HIGH;
+#define BOUND_DELAY 100
+volatile int buttonLastChange = 0;
+
+ISR(PCINT0_vect) {
 	bool b = digitalRead(BUTTON);
-	if (b != buttonState && millis() - buttonLastChange > 100) {
-		//Serial.println(millis() - buttonLastChange);
+	if (b != buttonState && millis() - buttonLastChange > BOUND_DELAY) {
 		buttonLastChange = millis();
 		buttonState = b;
 		if (buttonState == LOW) {
-			Serial.println('!');
+			mustSendButton = true;
 		}
 	}
+}
+
+void loop() {
+	// test button
+	if (mustSendButton) {
+		Serial.println('!');
+		mustSendButton = false;
+	}
 
 	// test input
 	int input = Serial.read();

extensions/basic.js

@@ -0,0 +1,135 @@
+// basic example, see http://scratch.mit.edu/projects/26016195/#editor
+// and load this file in browser with :
+// ScratchExtensions.loadExternalJS("http://localhost:8000/extensions/basic.websock.js")
+// after having launched "node server.js"
+
+var mode = /.*\?(\w*)$/.exec(MY_URL);
+if (!mode || mode[1] == "") {
+	mode = "websock";
+} else {
+	mode = mode[1];
+}
+var deps = {};
+deps[mode + "Gateway"] = "/extensions/lib/" + mode + "Gateway.js";
+
+declareModule("basic", deps, function(moduleName) {
+
+	//make accessible from outside, for debug
+	basicExtension = new (function() {
+		var ext = this;
+	
+		var gateway = new Gateway("basic");
+		var status = {
+			led: "off",
+			buttonPressed: false
+		};
+		// make accessible from outside, for debug
+		ext._myData = {
+			status : status,
+			gateway : gateway
+		};
+	
+		gateway.initialize(function () {
+			console.info("gateway init");
+			gateway.registerReceive(handleData);
+		});
+	
+		ext.getLed = function() {
+			if (gateway.ready()) {
+				return status.led;
+			} else {
+				return "???";
+			}
+		};
+	
+		ext.setLed = function(what) {
+			if (!gateway.ready()) {
+				return;
+			}
+			status.led = what;
+			gateway.send(what === "on" ? 1 : 0);
+		};
+	
+		ext.toggleLed = function() {
+			ext.setLed(status.led === "on" ? "off" : "on");
+		};
+	
+		ext.onButton = function() {
+			if (!gateway.ready()) {
+				return false;;
+			}
+		
+			if (status.buttonPressed === true) {
+				status.buttonPressed = false;
+				return true;
+			} else {
+				return false;
+			}
+		};
+	
+		// serial dialog methods
+		function handleData(rawData) {
+			for(i = 0; i < rawData.length; i++) {
+				switch (rawData[i]) {
+				case '\n':
+				case '\r':
+					break;
+				case '.': 
+					// ping => ok
+					clearWatchDog();
+					break;
+				case '!':
+					status.buttonPressed = true;
+					break;
+				case '0':
+					status.led = "off";
+					break;
+				case '1':
+					status.led = "on";
+					break;
+				default:
+					console.log("bad char '" + rawData[i] + "' ?");
+				}
+			}
+		}
+		
+		// Status reporting code
+		// Use this to report missing hardware, plugin or unsupported browser
+		// Value / status light Color / Meaning
+		// 0 	red 	error
+		// 1 	yellow 	not ready
+		// 2 	green 	ready
+		ext._getStatus = function() {
+			if(gateway.ready()) {
+				return {status: 2, msg: 'Ready'};
+			} else {
+				return {status: 1, msg: 'Not ready'};
+			}
+		}
+	
+		// Block and block menu descriptions
+		var descriptor = {
+			// each block begins by a Op Code :
+			// 	' ' (space)	Synchronous command
+			// 'w' 	Asynchronous command
+			// 'r' 	Synchronous reporter
+			// 'R' 	Asynchronous reporter
+			// 'h' 	Hat block (synchronous, returns boolean, true = run stack)
+			// then, a description with arguments marked by %... : %n for number, %s for string, and %m.menuName for menu
+			blocks: [
+				['', 'set led %m.led', 'setLed', 'on'],
+				['', 'toggle led state', 'toggleLed'],
+				['r', 'led state', 'getLed'],
+				['h', 'when button is pressed', 'onButton'],
+			],
+			menus: {
+				led: ['on', 'off']
+			}
+		};
+	
+		// Register the extension
+		ScratchExtensions.unregister('My first arduino extension');
+		ScratchExtensions.register('My first arduino extension', descriptor, ext);
+	})();
+	moduleExport(basicExtension, "basicExtension");
+});