lib/blynk: Re-name pin names grom GPIO to GP.

pumelo · Aug 6, 2015 · d5a5510 · d5a5510
1 parent 6ff177f
commit d5a5510
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/lib/blynk/WiPy.json b/lib/blynk/WiPy.json
@@ -3,26 +3,26 @@
     "map": {
         "digital": {
             "pins": {
-                "GPIO0":  0,   "GPIO1":  1,   "GPIO2":   2,   "GPIO3":   3,   "GPIO4":   4,
-                "GPIO5":  5,   "GPIO6":  6,   "GPIO7":   7,   "GPIO8":   8,   "GPIO9":   9,
-                "GPIO10": 10,  "GPIO11": 11,  "GPIO12":  12,  "GPIO13":  13,  "GPIO14":  14,
-                "GPIO15": 15,  "GPIO16": 16,  "GPIO17":  17,
-                                              "GPIO22":  22,  "GPIO23":  23,  "GPIO24":  24,
-                "GPIO25": 25,                                 "GPIO28":  28,
-                "GPIO30": 30,  "GPIO31": 31
+                "GP0":  0,   "GP1":  1,   "GP2":   2,   "GP3":   3,   "GP4":   4,
+                "GP5":  5,   "GP6":  6,   "GP7":   7,   "GP8":   8,   "GP9":   9,
+                "GP10": 10,  "GP11": 11,  "GP12":  12,  "GP13":  13,  "GP14":  14,
+                "GP15": 15,  "GP16": 16,  "GP17":  17,
+                                          "GP22":  22,  "GP23":  23,  "GP24":  24,
+                "GP25": 25,                             "GP28":  28,
+                "GP30": 30,  "GP31": 31
             },
             "ops": [ "dr", "dw" ]
         },
         "analog": {
             "pins": {
-                "GPIO2":  2, "GPIO3":  3, "GPIO4":  4, "GPIO5":  5
+                "GP2":  2, "GP3":  3, "GP4":  4, "GP5":  5
             },
             "ops": [ "dr", "dw", "ar" ],
             "arRange": [0, 4095]
         },
         "pwm": {
             "pins": [
-                "GPIO9", "GPIO10", "GPIO11", "GPIO24", "GPIO25"
+                "GP9", "GP10", "GP11", "GP24", "GP25"
             ],
             "ops": [ "aw" ],
             "awRange": [0, 100]

diff --git a/lib/blynk/blynk.py b/lib/blynk/blynk.py
@@ -91,10 +91,10 @@ def sleep_from_until (start, delay):
     return start + delay
 
 class HwPin:
-    _ADCMap = {'GPIO2': 1, 'GPIO3': 2, 'GPIO4': 3, 'GPIO5': 4}
-    _PWMMap = {'GPIO9': 3, 'GPIO10': 3, 'GPIO11': 3, 'GPIO24': 5, 'GPIO25': 9}
-    _TimerMap = {'GPIO9': (3, pyb.Timer.B), 'GPIO10': (4, pyb.Timer.A), 'GPIO11': (4, pyb.Timer.B),
-                 'GPIO24': (1, pyb.Timer.A), 'GPIO25': (2, pyb.Timer.A)}
+    _ADCMap = {'GP2': 1, 'GP3': 2, 'GP4': 3, 'GP5': 4}
+    _PWMMap = {'GP9': 3, 'GP10': 3, 'GP11': 3, 'GP24': 5, 'GP25': 9}
+    _TimerMap = {'GP9': (3, pyb.Timer.B), 'GP10': (4, pyb.Timer.A), 'GP11': (4, pyb.Timer.B),
+                 'GP24': (1, pyb.Timer.A), 'GP25': (2, pyb.Timer.A)}
 
     _HBPin = 25 if 'WiPy' in os.uname().machine else 9
 
@@ -106,7 +106,7 @@ def __init__(self, pin_num, mode, pull):
         self._adc = None
         self._pwm = None
         pin_num = int(pin_num)
-        self._name = 'GPIO' + str(pin_num)
+        self._name = 'GP' + str(pin_num)
         if pin_num == HwPin._HBPin:
             pyb.HeartBeat().disable()