Merge branch 'master' of https://github.com/BPI-STEAM/BPI-BIT-MicroPython

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_FALLING, 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):

11.app/artec.py

@@ -10,42 +10,43 @@
 
 music.play(music.POWER_UP)
 
-import display
+import pins
 
-Image = display.Image
-display = display.Display()
+led1 = pins.Pins(12)
+led2 = pins.Pins(14)
 
-display.clear()
+led1.write_digital(1)
+led2.write_digital(1)
 
-all_boats = [
-    Image("00000:" "00000:" "00000:" "00000:" "00000"),
-    Image("11111:" "00000:" "00000:" "00000:" "00000"),
-    Image("11111:" "11111:" "00000:" "00000:" "00000"),
-    Image("11111:" "11111:" "11111:" "00000:" "00000"),
-    Image("11111:" "11111:" "11111:" "11111:" "00000"),
-    Image("11111:" "11111:" "11111:" "11111:" "11111"),
-    Image("00000:" "11111:" "11111:" "11111:" "11111"),
-    Image("00000:" "00000:" "11111:" "11111:" "11111"),
-    Image("00000:" "00000:" "00000:" "11111:" "11111"),
-    Image("00000:" "00000:" "00000:" "00000:" "11111"),
-    Image("00000:" "00000:" "00000:" "00000:" "00000"),
-]
-
-display.show(all_boats, color=(10, 10, 10), delay=150)
+import display
+Image = display.Image
+display = display.Display()
 
+time.sleep(0.5)
 music.play(music.JUMP_UP)
 display.show('A', color=(20, 0, 0))
 while 0 == button_a.was_pressed():
     time.sleep(0.1)
 time.sleep(0.5)
 display.show('O', color=(0, 20, 0))
 
-music.play(music.JUMP_UP)
-display.show('B', color=(20, 0, 0))
-while 0 == button_b.was_pressed():
-    time.sleep(0.1)
 time.sleep(0.5)
-display.show('O', color=(0, 20, 0))
+music.play(music.JUMP_UP)
+display.show('D', color=(20, 0, 0))
+display.clear()
+time.sleep(1)
+display.show(Image("33333:" "33333:" "33333:" "33333:" "33333"), color=(10, 0, 0), delay=150)
+time.sleep(1)
+display.show(Image("33333:" "33333:" "33333:" "33333:" "33333"), color=(0, 10, 0), delay=150)
+time.sleep(1)
+display.show(Image("33333:" "33333:" "33333:" "33333:" "33333"), color=(0, 0, 10), delay=150)
+time.sleep(1)
+display.show(Image("33333:" "33333:" "33333:" "33333:" "33333"), color=(10, 10, 10), delay=150)
+time.sleep(1)
+display.clear()
+
+led1.write_digital(0)
+led2.write_digital(0)
 
 music.play(music.JUMP_UP)
 display.show('T', color=(20, 0, 0))
@@ -86,6 +87,13 @@
         break
 display.show('O', color=(0, 20, 0))
 
+music.play(music.JUMP_UP)
+display.show('B', color=(20, 0, 0))
+while 0 == button_b.was_pressed():
+    time.sleep(0.1)
+time.sleep(0.5)
+display.show('O', color=(0, 20, 0))
+
 music.play(music.POWER_DOWN)
 time.sleep(0.5)
 display.clear()

12.network/server_base.py

@@ -9,6 +9,17 @@
 
     # in your code
 
+    while True:
+        cl, addr = server.accept()
+        print('client connected from', addr)
+        
+        buf = cl.recv()
+
+        if b'open' in buf:
+            print(b'open')
+
+        cl.send(buf)
+        cl.close()
 finally:
     # it will throw error OSError: [Errno 12] ENOMEM if your dont exec the code.
     server.close()

12.network/zhiwu.py

@@ -56,18 +56,19 @@ def core(self, pack):
 
     def parse(self, pack):
         res = self.core(pack)
-        if (pack[0] == TYPE_COLLECT):
-            # return [TYPE_COLLECT, res[1:ord(res[0]) + 1], res[ord(res[0]) + 2:]]
-            src = 1+res[0]
-            dt = 1 + src
-            return [TYPE_COLLECT, res[1:src], res[dt:dt+res[src]]]
-        elif (pack[0] == TYPE_COMMAND):
-            result = [TYPE_COMMAND, res[1:res[0] + 1]]
-            # print(result)
-            if (result[1] == b'TimeSysn'):
-                # print(decode_parse(self.de))
-                set_time(decode_parse(self.de)[0])
-            return result
+        if (res != None):
+            if (pack[0] == TYPE_COLLECT):
+                # return [TYPE_COLLECT, res[1:ord(res[0]) + 1], res[ord(res[0]) + 2:]]
+                src = 1+res[0]
+                dt = 1 + src
+                return [TYPE_COLLECT, res[1:src], res[dt:dt+res[src]]]
+            elif (pack[0] == TYPE_COMMAND):
+                result = [TYPE_COMMAND, res[1:res[0] + 1]]
+                # print(result)
+                if (result[1] == b'TimeSysn'):
+                    # print(decode_parse(self.de))
+                    set_time(decode_parse(self.de)[0])
+                return result
         return None
 
 if __name__ == '__main__':

13.system/watchdog.py

@@ -0,0 +1,8 @@
+
+import machine
+
+t = machine.WDT(0, 5) # init wdt 0, timeout 5s
+
+t.feed() # feed it
+
+t.delete() # close it

15.algorithm/crc16.py

@@ -1,38 +1,35 @@
-
 CRC_LENGTH = 0x02
 
 CRC16_TABLE = (
-    0x0000,0xC0C1,0xC181,0x0140,0xC301,0x03C0,0x0280,0xC241,0xC601,
-    0x06C0,0x0780,0xC741,0x0500,0xC5C1,0xC481,0x0440,0xCC01,0x0CC0,
-    0x0D80,0xCD41,0x0F00,0xCFC1,0xCE81,0x0E40,0x0A00,0xCAC1,0xCB81,
-    0x0B40,0xC901,0x09C0,0x0880,0xC841,0xD801,0x18C0,0x1980,0xD941,
-    0x1B00,0xDBC1,0xDA81,0x1A40,0x1E00,0xDEC1,0xDF81,0x1F40,0xDD01,
-    0x1DC0,0x1C80,0xDC41,0x1400,0xD4C1,0xD581,0x1540,0xD701,0x17C0,
-    0x1680,0xD641,0xD201,0x12C0,0x1380,0xD341,0x1100,0xD1C1,0xD081,
-    0x1040,0xF001,0x30C0,0x3180,0xF141,0x3300,0xF3C1,0xF281,0x3240,
-    0x3600,0xF6C1,0xF781,0x3740,0xF501,0x35C0,0x3480,0xF441,0x3C00,
-    0xFCC1,0xFD81,0x3D40,0xFF01,0x3FC0,0x3E80,0xFE41,0xFA01,0x3AC0,
-    0x3B80,0xFB41,0x3900,0xF9C1,0xF881,0x3840,0x2800,0xE8C1,0xE981,
-    0x2940,0xEB01,0x2BC0,0x2A80,0xEA41,0xEE01,0x2EC0,0x2F80,0xEF41,
-    0x2D00,0xEDC1,0xEC81,0x2C40,0xE401,0x24C0,0x2580,0xE541,0x2700,
-    0xE7C1,0xE681,0x2640,0x2200,0xE2C1,0xE381,0x2340,0xE101,0x21C0,
-    0x2080,0xE041,0xA001,0x60C0,0x6180,0xA141,0x6300,0xA3C1,0xA281,
-    0x6240,0x6600,0xA6C1,0xA781,0x6740,0xA501,0x65C0,0x6480,0xA441,
-    0x6C00,0xACC1,0xAD81,0x6D40,0xAF01,0x6FC0,0x6E80,0xAE41,0xAA01,
-    0x6AC0,0x6B80,0xAB41,0x6900,0xA9C1,0xA881,0x6840,0x7800,0xB8C1,
-    0xB981,0x7940,0xBB01,0x7BC0,0x7A80,0xBA41,0xBE01,0x7EC0,0x7F80,
-    0xBF41,0x7D00,0xBDC1,0xBC81,0x7C40,0xB401,0x74C0,0x7580,0xB541,
-    0x7700,0xB7C1,0xB681,0x7640,0x7200,0xB2C1,0xB381,0x7340,0xB101,
-    0x71C0,0x7080,0xB041,0x5000,0x90C1,0x9181,0x5140,0x9301,0x53C0,
-    0x5280,0x9241,0x9601,0x56C0,0x5780,0x9741,0x5500,0x95C1,0x9481,
-    0x5440,0x9C01,0x5CC0,0x5D80,0x9D41,0x5F00,0x9FC1,0x9E81,0x5E40,
-    0x5A00,0x9AC1,0x9B81,0x5B40,0x9901,0x59C0,0x5880,0x9841,0x8801,
-    0x48C0,0x4980,0x8941,0x4B00,0x8BC1,0x8A81,0x4A40,0x4E00,0x8EC1,
-    0x8F81,0x4F40,0x8D01,0x4DC0,0x4C80,0x8C41,0x4400,0x84C1,0x8581,
-    0x4540,0x8701,0x47C0,0x4680,0x8641,0x8201,0x42C0,0x4380,0x8341,
-    0x4100,0x81C1,0x8081,0x4040
-)
-
+    0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241, 0xC601,
+    0x06C0, 0x0780, 0xC741, 0x0500, 0xC5C1, 0xC481, 0x0440, 0xCC01, 0x0CC0,
+    0x0D80, 0xCD41, 0x0F00, 0xCFC1, 0xCE81, 0x0E40, 0x0A00, 0xCAC1, 0xCB81,
+    0x0B40, 0xC901, 0x09C0, 0x0880, 0xC841, 0xD801, 0x18C0, 0x1980, 0xD941,
+    0x1B00, 0xDBC1, 0xDA81, 0x1A40, 0x1E00, 0xDEC1, 0xDF81, 0x1F40, 0xDD01,
+    0x1DC0, 0x1C80, 0xDC41, 0x1400, 0xD4C1, 0xD581, 0x1540, 0xD701, 0x17C0,
+    0x1680, 0xD641, 0xD201, 0x12C0, 0x1380, 0xD341, 0x1100, 0xD1C1, 0xD081,
+    0x1040, 0xF001, 0x30C0, 0x3180, 0xF141, 0x3300, 0xF3C1, 0xF281, 0x3240,
+    0x3600, 0xF6C1, 0xF781, 0x3740, 0xF501, 0x35C0, 0x3480, 0xF441, 0x3C00,
+    0xFCC1, 0xFD81, 0x3D40, 0xFF01, 0x3FC0, 0x3E80, 0xFE41, 0xFA01, 0x3AC0,
+    0x3B80, 0xFB41, 0x3900, 0xF9C1, 0xF881, 0x3840, 0x2800, 0xE8C1, 0xE981,
+    0x2940, 0xEB01, 0x2BC0, 0x2A80, 0xEA41, 0xEE01, 0x2EC0, 0x2F80, 0xEF41,
+    0x2D00, 0xEDC1, 0xEC81, 0x2C40, 0xE401, 0x24C0, 0x2580, 0xE541, 0x2700,
+    0xE7C1, 0xE681, 0x2640, 0x2200, 0xE2C1, 0xE381, 0x2340, 0xE101, 0x21C0,
+    0x2080, 0xE041, 0xA001, 0x60C0, 0x6180, 0xA141, 0x6300, 0xA3C1, 0xA281,
+    0x6240, 0x6600, 0xA6C1, 0xA781, 0x6740, 0xA501, 0x65C0, 0x6480, 0xA441,
+    0x6C00, 0xACC1, 0xAD81, 0x6D40, 0xAF01, 0x6FC0, 0x6E80, 0xAE41, 0xAA01,
+    0x6AC0, 0x6B80, 0xAB41, 0x6900, 0xA9C1, 0xA881, 0x6840, 0x7800, 0xB8C1,
+    0xB981, 0x7940, 0xBB01, 0x7BC0, 0x7A80, 0xBA41, 0xBE01, 0x7EC0, 0x7F80,
+    0xBF41, 0x7D00, 0xBDC1, 0xBC81, 0x7C40, 0xB401, 0x74C0, 0x7580, 0xB541,
+    0x7700, 0xB7C1, 0xB681, 0x7640, 0x7200, 0xB2C1, 0xB381, 0x7340, 0xB101,
+    0x71C0, 0x7080, 0xB041, 0x5000, 0x90C1, 0x9181, 0x5140, 0x9301, 0x53C0,
+    0x5280, 0x9241, 0x9601, 0x56C0, 0x5780, 0x9741, 0x5500, 0x95C1, 0x9481,
+    0x5440, 0x9C01, 0x5CC0, 0x5D80, 0x9D41, 0x5F00, 0x9FC1, 0x9E81, 0x5E40,
+    0x5A00, 0x9AC1, 0x9B81, 0x5B40, 0x9901, 0x59C0, 0x5880, 0x9841, 0x8801,
+    0x48C0, 0x4980, 0x8941, 0x4B00, 0x8BC1, 0x8A81, 0x4A40, 0x4E00, 0x8EC1,
+    0x8F81, 0x4F40, 0x8D01, 0x4DC0, 0x4C80, 0x8C41, 0x4400, 0x84C1, 0x8581,
+    0x4540, 0x8701, 0x47C0, 0x4680, 0x8641, 0x8201, 0x42C0, 0x4380, 0x8341,
+    0x4100, 0x81C1, 0x8081, 0x4040)
 """ Code to generate the CRC-16 lookup table:
 def generate_crc16_table():
     crc_table = []
@@ -50,17 +47,21 @@ def generate_crc16_table():
 
 import struct
 
+
 def crc16(data):
     crc = 0xFFFF
     for char in data:
         crc = (crc >> 8) ^ CRC16_TABLE[((crc) ^ char) & 0xFF]
     return struct.pack('<H', crc)
+
+
 #
 # test_bytes = b"\x01\x05\x00\x00\xFF\x00"
 # print(test_bytes)
 # crc = crc16(test_bytes)
 # print(hex(crc[0]), hex(crc[1]))
 
+
 def PrintHex(string):
     tmp = string.split(" ")
     data = bytearray()
@@ -72,6 +73,7 @@ def PrintHex(string):
     data.append(crc[1])
     return data
 
+
 test_strs = "01 05 00 00 FF 00"
 
 print(test_strs)
@@ -80,7 +82,7 @@ def PrintHex(string):
 
 print(b'\x01\x05\x00\x00\xff\x00\x8c\x3a')
 
-test_strs = "01 05 00 0B FF 00" #  FD F8
+test_strs = "01 05 00 0B FF 00"  #  FD F8
 
 print(test_strs)