branch fixed

control/src/Makefile

@@ -40,7 +40,7 @@ OBJECTS_CLI   = cli.o ui/view.o ui/view_selection.o ui/view_promt.o ui/view_info
 
 .PHONY: $(OUT_TMP_DRV) clean help
 
-all: drv cli style
+all: drv cli
 
 drv: $(OBJECTS_DRV) $(OUT_TMP_DRV)
 	
@@ -51,14 +51,14 @@ cli: drv $(OBJECTS_CLI)
 	$(PATH_COMPILER) $(CFLAGS) $(OBJECTS_CLI) -L $(PATH_TMP_LIB) -o $(OUT_TMP_CLI) $(LDFLAGS_CLI)
 	@bash -c 'if [ ! -f "$(OUT_DRV)" ]; then echo -e "\n*** Warning ***: driver not installed\nType \"sudo make install\" to install or update b15fdrv."; fi'
 
-doc:
+doc: style
 	@echo "Creating documentation with doxygen..."
 	$(PATH_DOXYGEN) doxygen-cfg
 	@echo problems found: `($(PATH_DOXYGEN) doxygen-cfg 3>&2 2>&1 1>&3) 2>/dev/null | wc -l`
 	
 style:
 	@echo "Formatting source code with astyle..."
-	astyle --recursive --style=allman *.cpp,*.h,*.c,*.hpp
+	-astyle --recursive --style=allman *.cpp,*.h,*.c,*.hpp
 	
 install:
 	@echo "Installing driver..."
@@ -83,9 +83,9 @@ help:
 
 clean:
 	@echo "Cleaning..."
-	rm -f $(OBJECTS_DRV) $(OBJECTS_CLI) $(OUT_TMP_CLI) $(OUT_TMP_DRV)
-	rm -rf $(OUT_DOC)
-	find . -type f -name '*.orig' -delete
+	-rm -f $(OBJECTS_DRV) $(OBJECTS_CLI) $(OUT_TMP_CLI) $(OUT_TMP_DRV)
+	-rm -rf $(OUT_DOC)
+	-find . -type f -name '*.orig' -delete
 
 .cpp.o:
 	$(PATH_COMPILER) $(CFLAGS) -c $< -o $@

control/src/README.md

@@ -16,7 +16,7 @@ Außerdem wird eine Bibliothek (*b15fdrv*) installiert, die eine einfache Entwic
 
 ### 1. Abhängigkeiten installieren
  (a) **sudo apt-get update**  
- (b) **sudo apt-get install git avr-libc avrdude libncurses5-dev g++**  
+ (b) **sudo apt-get install git avr-libc avrdude libncurses5-dev g++ astyle**  
 
 ### 2. Das Repository klonen
  (a) **cd /home/famulus/**  
@@ -89,7 +89,7 @@ PlottyFile pf;
 pf.setUnitX("V");  
 pf.setUnitY("V");  
 pf.setUnitPara("V");  
-pf.setDescX("U_{OUT}");  
+pf.setDescX("U_{OUT}"); // Markdown wird unterstuetzt  
 pf.setDescY("U_{IN}");  
 pf.setDescPara("");  
 pf.setRefX(5);