fix to scratch3

Author: junhuanchen

10.microbit/button.py

@@ -2,30 +2,30 @@
 
 class Button:
 
-    def __init__(self, pin):
+    def __init__(self, pin_id):
         from machine import Pin
-        self.pin = Pin(pin, Pin.IN)
-
-    def get_presses(self, delay = 1):
-        last_time, last_state, presses = time(), 0, 0
-        while time() < last_time + delay:
-            sleep_ms(50)
-            if last_state == 0 and self.pin.value() == 1:
-                last_state= 1
-            if last_state == 1 and self.pin.value() == 0:
-                last_state, presses = 0, presses + 1
-        return presses
+        self.pin = Pin(pin_id, Pin.IN)
+        self.irq = self.pin.irq(trigger=Pin.IRQ_RISING, handler=self.__irq_sc)
+        self.presses = 0
+
+    def __irq_sc(self, p):
+        # print(self, p)
+        self.presses += 1
+
+    def close(self):
+       self.irq.trigger(0) 
+
+    def reset(self):
+       self.presses = 0
+
+    def get_presses(self):
+        return self.presses
 
     def is_pressed(self):
         return self.pin.value() == 0
 
-    def was_pressed(self, delay = 1):
-        last_time, last_state = time(), self.pin.value()
-        while time() < last_time + delay:
-            sleep_ms(50)
-            if last_state != self.pin.value():
-                return True
-        return False
+    def was_pressed(self):
+        return self.presses != 0
 
 def unit_test():
     print('The unit test code is as follows')
@@ -36,11 +36,15 @@ def unit_test():
             print(\'button_a is_pressed \', button_a.is_pressed())\n\
             print(\'button_a get_presses \', button_a.get_presses())\n\
         ')
-    button_a = Button(35)
-    while True:
-        print('button_a was_pressed ', button_a.was_pressed())
-        print('button_a is_pressed ', button_a.is_pressed())
-        print('button_a get_presses ', button_a.get_presses())
+    try:
+        button_a = Button(35)
+        while True:
+            sleep_ms(100)
+            print('button_a was_pressed ', button_a.was_pressed())
+            print('button_a is_pressed ', button_a.is_pressed())
+            print('button_a get_presses ', button_a.get_presses())
+    finally:
+        button_a.close()
 
 if __name__ == '__main__':
     unit_test()

10.microbit/display.py

@@ -360,6 +360,7 @@ def _scroll(self, val, color=Red, delay=150):
         _thread.exit()
 
     def clear(self):
+        self.stop()
         self.Led.fill((0, 0, 0))
         self.Led.Show()
 

10.microbit/pins.py

@@ -15,17 +15,17 @@ def read_digital(self):
 
     def read_analog(self, ATTN = ADC.ATTN_0DB):
         if self.pin not in range(32,40):
-            print("This pin feature is not supported")
-            return 0
+            # print("This pin feature is not supported")
+            return None
         if self.adc is None:
             self.adc = ADC(Pin(self.pin, Pin.IN))
             self.adc.atten(ATTN)  
         return self.adc.read()
 
     def write_analog(self, value):
         if self.pin not in [25,26]:
-            print("This pin feature is not supported")
-            return 0
+            # print("This pin feature is not supported")
+            return None
         DAC(Pin(self.pin)).write(value)
 
     def is_touched(self):