fix #44 fix #45

Author: previ

sonar.py

@@ -16,6 +16,7 @@ class Sonar:
 
    MICROSECONDS =  1000000.0
    SOUND_SPEED = 34030.0
+   ECHO_TIMEOUT = 0.1
 
    def __init__(self, pi, trigger, echo):
       """
@@ -44,7 +45,7 @@ def __init__(self, pi, trigger, echo):
       self._inited = True
 
    def _cbf(self, gpio, level, tick):
-      if gpio == self._trig:
+      if gpio == self._trig and self._triggered == False:
          if level == 0: # trigger sent
             self._triggered = True
             self._high = None
@@ -57,7 +58,8 @@ def _cbf(self, gpio, level, tick):
                   self._time = tick - self._high
                   self._high = None
                   self._ping = True
-
+                  self._triggered = False
+                  print "elapsed: " + str(self._time)
    def read(self):
       """
       Triggers a reading.  The returned reading is the number
@@ -70,7 +72,7 @@ def read(self):
          self.pi.gpio_trigger(self._trig)
          start = time.time()
          while not self._ping:
-            if (time.time()-start) > 5.0:
+            if (time.time()-start) > self.ECHO_TIMEOUT:
                return 20000
             time.sleep(0.001)
          return self._time

static/js/blockly/blocks.js

@@ -802,9 +802,9 @@ Blockly.Blocks['coderbot_sonar_get_distance'] = {
     this.setColour(250);
     this.appendDummyInput()
         .appendField(Blockly.Msg.CODERBOT_SONAR_GET_DISTANCE)
-        .appendField(new Blockly.FieldDropdown([[Blockly.Msg.CODERBOT_SONAR_SENSOR_1, 0],
-                                                [Blockly.Msg.CODERBOT_SONAR_SENSOR_2, 1],
-                                                [Blockly.Msg.CODERBOT_SONAR_SENSOR_3, 2]]), 'SONAR');
+        .appendField(new Blockly.FieldDropdown([[Blockly.Msg.CODERBOT_SONAR_SENSOR_1, "0"],
+                                                [Blockly.Msg.CODERBOT_SONAR_SENSOR_2, "1"],
+                                                [Blockly.Msg.CODERBOT_SONAR_SENSOR_3, "2"]]), 'SONAR');
     this.setOutput(true, 'Number');
     this.setTooltip(Blockly.Msg.LOGIC_BOOLEAN_TOOLTIP);
   }

static/js/blockly/bot_en.js

@@ -71,7 +71,7 @@ Blockly.Msg.CODERBOT_AUDIO_LISTEN = "listen";
 Blockly.Msg.CODERBOT_AUDIO_LISTEN_MODEL_SIMPLE = "simple commands";
 Blockly.Msg.CODERBOT_AUDIO_LISTEN_MODEL_MEDIUM = "medium commands";
 Blockly.Msg.CODERBOT_AUDIO_LISTEN_MODEL_ADV = "advance commands";
-Blockly.Msg.CODERBOT_SONAR_GET_DISTANCE = "get distance with";
-Blockly.Msg.CODERBOT_SONAR_SENSOR_1 = "sonar 1";
-Blockly.Msg.CODERBOT_SONAR_SENSOR_2 = "sonar 2";
-Blockly.Msg.CODERBOT_SONAR_SENSOR_3 = "sonar 3";
+Blockly.Msg.CODERBOT_SONAR_GET_DISTANCE = "get distance with sonar";
+Blockly.Msg.CODERBOT_SONAR_SENSOR_1 = "1";
+Blockly.Msg.CODERBOT_SONAR_SENSOR_2 = "2";
+Blockly.Msg.CODERBOT_SONAR_SENSOR_3 = "3";

static/js/blockly/bot_it.js

@@ -71,7 +71,7 @@ Blockly.Msg.CODERBOT_AUDIO_LISTEN = "ascolta";
 Blockly.Msg.CODERBOT_AUDIO_LISTEN_MODEL_SIMPLE = "commandi semplici";
 Blockly.Msg.CODERBOT_AUDIO_LISTEN_MODEL_MEDIUM = "commandi medi";
 Blockly.Msg.CODERBOT_AUDIO_LISTEN_MODEL_ADV = "comandi avanzati";
-Blockly.Msg.CODERBOT_SONAR_GET_DISTANCE = "leggi distanza con";
-Blockly.Msg.CODERBOT_SONAR_SENSOR_1 = "sonar 1";
-Blockly.Msg.CODERBOT_SONAR_SENSOR_2 = "sonar 2";
-Blockly.Msg.CODERBOT_SONAR_SENSOR_3 = "sonar 3";
+Blockly.Msg.CODERBOT_SONAR_GET_DISTANCE = "leggi distanza con sonar";
+Blockly.Msg.CODERBOT_SONAR_SENSOR_1 = "1";
+Blockly.Msg.CODERBOT_SONAR_SENSOR_2 = "2";
+Blockly.Msg.CODERBOT_SONAR_SENSOR_3 = "3";