Merge branch 'pull' into FIXED-WEBAPP

README.md

@@ -315,7 +315,7 @@ sudo apt-get install libdbus-glib-1-dev libdbus-1-dev
 
 ### My controller disconnects after exiting the "Change Grip/Order" Menu
 
-This can occasionally occur due to timing sensitivites when transitioning off of the "Change Grip/Order" menu. To avoid disconnections when exiting this menu, please only press A (or B) a single time and wait until the menu has fully exited. If a disconnect still occurs, you should be able to reconnect your controller and use NXBT as normal.
+This can occasionally occur due to timing sensitivities when transitioning off of the "Change Grip/Order" menu. To avoid disconnections when exiting this menu, please only press A (or B) a single time and wait until the menu has fully exited. If a disconnect still occurs, you should be able to reconnect your controller and use NXBT as normal.
 
 ### "No Available Adapters"
 
@@ -324,7 +324,7 @@ This means that NXBT wasn't able to find a suitable Bluetooth adapter to use for
 1. **Cause:** All available adapters are currently emulating a controller.
   - **Solution:** End one of the other controller sessions (either through the webapp or command line) or plug in another Bluetooth adapter.
 2. **Cause:** No Bluetooth adapters are available to NXBT.
-  - **Solution:** Ensure that you've installed the relevant Bluetooth stack for your operating system (BlueZ on Linux) and check that your Bluetooh adapter is visible within to your OS.
+  - **Solution:** Ensure that you've installed the relevant Bluetooth stack for your operating system (BlueZ on Linux) and check that your Bluetooth adapter is visible within to your OS.
 
 ### "Address already in use"
 

docs/Macros.md

@@ -53,8 +53,34 @@ L_STICK@+000+000 0.75s
 1.0s
 ```
 
+
 Remember, each X and Y value must be 3 digits. If you want to tilt the Right Thumbstick 75% to the left, you must write it as `R_STICK@-075+000`. Another thing to keep in mind, the sum of your X and Y can be more than 100. For example, `L_STICK@+100+100` is a 45° angle. 
 
+
+### Loops
+
+A simple for-loop can be used to repeat a macro block a specified number of times. The below example loops through an indented macro block 100 times.
+
+```
+LOOP 100
+    B 0.1s
+    0.1s
+```
+
+Nested loops are also supported.
+
+```
+LOOP 100
+    B 0.1s
+    0.1s
+    # Nested loop
+    LOOP 5
+        A 0.1s
+        0.1s
+```
+
+Note, a macro line starting with `#` is ignored.
+
 ## Macro Control Values
 
 | Macro Value | Control Name |

nxbt/controller/input.py

@@ -250,9 +250,9 @@ class InputParser():
 
         # Shared byte
         if controller_input["MINUS"]:
-            shared[7] = '1'
-        if controller_input["PLUS"]:
             shared[6] = '1'
+        if controller_input["PLUS"]:
+            shared[7] = '1'
         if controller_input["R_STICK"]["PRESSED"]:
             shared[5] = '1'
         if controller_input["L_STICK"]["PRESSED"]:
@@ -307,6 +307,7 @@ class InputParser():
 
         parsed = macro.split("\n")
         parsed = list(filter(lambda s: not s.strip() == "", parsed))
+        parsed = list(filter(lambda s: not s.strip().startswith("#"), parsed))
         parsed = self.parse_loops(parsed)
 
         return parsed