Merge branch 'develop'

.editorconfig

@@ -19,6 +19,11 @@ charset = utf-8
 indent_style = space
 indent_size = 4
 
+# 4 space indentation
+[*.bas,*.inc]
+indent_style = space
+indent_size = 4
+
 [*.md]
 trim_trailing_whitespace = false
 

Makefile

-PIPFLAGS = -r requirements.txt --extra-index-url https://las-nq-serv.physnet.uni-hamburg.de/pypiserver
+PIPFLAGS = -r requirements.txt
 
 
 all: requirements test doc package

compile_in_vm.sh

@@ -28,5 +28,5 @@ do
   inotifywait -e modify src/adbasic/*
   echo $vb
   VBoxManage guestcontrol Win7 --username Chris --password 'z' run --exe "$vbox_compiler"
-  rsync -u src/adbasic/nqontrol.TC1 src/nqontrol/
+  # rsync -u src/adbasic/nqontrol.TC1 src/nqontrol/
 done

doc/Makefile

@@ -58,7 +58,7 @@ $(AUTODOCDIR): $(MODULEDIR)
 	# $(AUTODOCBUILD) -f -o $@ $^
 
 doc-requirements: $(AUTODOCDIR)
-	jupyter nbconvert documentation.ipynb --to rst
+	@cd jupyter; sh jupyter2markdown.sh; cd ..
 
 
 html: doc-requirements

doc/gui.md

@@ -40,7 +40,7 @@ After starting the server you will see something like this, depending on how you
 
 ![GUI](_static/entry.png)  
 
-The GUI will dynamically create as many components as you need. E.g. if you changed the `NUMBER_OF_SERVOS` variable in the `servo.py` module it will provide input sections accordingly.  
+The GUI will dynamically create as many components as you need. E.g. if you changed the `settings.NUMBER_OF_SERVOS` variable it will provide input sections accordingly.  
 
 If you are running the GUI with multiple devices (which might be implemented in the future), the GUIs are just displayed one after the other. So each GUI comes with its own sections etc...  
 

doc/jupyter/jupyter2markdown.sh

+#!/usr/bin/env bash
+jupyter nbconvert *.ipynb --to rst --output-dir=..