6 years ago · 71fc3315df
--- a/ArduinoOutput/Hauptprojekt.ino.elf
+++ b/ArduinoOutput/Hauptprojekt.ino.elf
--- a/ArduinoOutput/Hauptprojekt.ino.hex
+++ b/ArduinoOutput/Hauptprojekt.ino.hex
--- a/ArduinoOutput/Hauptprojekt.ino.with_bootloader.hex
+++ b/ArduinoOutput/Hauptprojekt.ino.with_bootloader.hex
--- a/ArduinoOutput/core/CDC.cpp.o
+++ b/ArduinoOutput/core/CDC.cpp.o
--- a/ArduinoOutput/core/HardwareSerial.cpp.o
+++ b/ArduinoOutput/core/HardwareSerial.cpp.o
--- a/ArduinoOutput/core/HardwareSerial0.cpp.o
+++ b/ArduinoOutput/core/HardwareSerial0.cpp.o
--- a/ArduinoOutput/core/HardwareSerial1.cpp.o
+++ b/ArduinoOutput/core/HardwareSerial1.cpp.o
--- a/ArduinoOutput/core/HardwareSerial2.cpp.o
+++ b/ArduinoOutput/core/HardwareSerial2.cpp.o
--- a/ArduinoOutput/core/HardwareSerial3.cpp.o
+++ b/ArduinoOutput/core/HardwareSerial3.cpp.o
--- a/ArduinoOutput/core/IPAddress.cpp.o
+++ b/ArduinoOutput/core/IPAddress.cpp.o
--- a/ArduinoOutput/core/PluggableUSB.cpp.o
+++ b/ArduinoOutput/core/PluggableUSB.cpp.o
--- a/ArduinoOutput/core/Print.cpp.o
+++ b/ArduinoOutput/core/Print.cpp.o
--- a/ArduinoOutput/core/Stream.cpp.o
+++ b/ArduinoOutput/core/Stream.cpp.o
--- a/ArduinoOutput/core/Tone.cpp.o
+++ b/ArduinoOutput/core/Tone.cpp.o
--- a/ArduinoOutput/core/USBCore.cpp.o
+++ b/ArduinoOutput/core/USBCore.cpp.o
--- a/ArduinoOutput/core/WInterrupts.c.o
+++ b/ArduinoOutput/core/WInterrupts.c.o
--- a/ArduinoOutput/core/WMath.cpp.o
+++ b/ArduinoOutput/core/WMath.cpp.o
--- a/ArduinoOutput/core/WString.cpp.o
+++ b/ArduinoOutput/core/WString.cpp.o
--- a/ArduinoOutput/core/abi.cpp.o
+++ b/ArduinoOutput/core/abi.cpp.o
--- a/ArduinoOutput/core/core.a
+++ b/ArduinoOutput/core/core.a
--- a/ArduinoOutput/core/hooks.c.o
+++ b/ArduinoOutput/core/hooks.c.o
--- a/ArduinoOutput/core/main.cpp.o
+++ b/ArduinoOutput/core/main.cpp.o
--- a/ArduinoOutput/core/new.cpp.o
+++ b/ArduinoOutput/core/new.cpp.o
--- a/ArduinoOutput/core/wiring.c.o
+++ b/ArduinoOutput/core/wiring.c.o
--- a/ArduinoOutput/core/wiring_analog.c.o
+++ b/ArduinoOutput/core/wiring_analog.c.o
--- a/ArduinoOutput/core/wiring_digital.c.o
+++ b/ArduinoOutput/core/wiring_digital.c.o
--- a/ArduinoOutput/core/wiring_pulse.c.o
+++ b/ArduinoOutput/core/wiring_pulse.c.o
--- a/ArduinoOutput/core/wiring_shift.c.o
+++ b/ArduinoOutput/core/wiring_shift.c.o
--- a/ArduinoOutput/libraries/Wire/Wire.cpp.o
+++ b/ArduinoOutput/libraries/Wire/Wire.cpp.o
--- a/ArduinoOutput/libraries/Wire/utility/twi.c.o
+++ b/ArduinoOutput/libraries/Wire/utility/twi.c.o
--- a/ArduinoOutput/libraries/Zumo32U4/L3G.cpp.o
+++ b/ArduinoOutput/libraries/Zumo32U4/L3G.cpp.o
--- a/ArduinoOutput/libraries/Zumo32U4/LSM303.cpp.o
+++ b/ArduinoOutput/libraries/Zumo32U4/LSM303.cpp.o
--- a/ArduinoOutput/libraries/Zumo32U4/PololuBuzzer.cpp.o
+++ b/ArduinoOutput/libraries/Zumo32U4/PololuBuzzer.cpp.o
--- a/ArduinoOutput/libraries/Zumo32U4/PololuHD44780.cpp.o
+++ b/ArduinoOutput/libraries/Zumo32U4/PololuHD44780.cpp.o
--- a/ArduinoOutput/libraries/Zumo32U4/Pushbutton.cpp.o
+++ b/ArduinoOutput/libraries/Zumo32U4/Pushbutton.cpp.o
--- a/ArduinoOutput/libraries/Zumo32U4/QTRSensors.cpp.o
+++ b/ArduinoOutput/libraries/Zumo32U4/QTRSensors.cpp.o
--- a/ArduinoOutput/libraries/Zumo32U4/Zumo32U4Encoders.cpp.o
+++ b/ArduinoOutput/libraries/Zumo32U4/Zumo32U4Encoders.cpp.o
--- a/ArduinoOutput/libraries/Zumo32U4/Zumo32U4IRPulses.cpp.o
+++ b/ArduinoOutput/libraries/Zumo32U4/Zumo32U4IRPulses.cpp.o
--- a/ArduinoOutput/libraries/Zumo32U4/Zumo32U4Motors.cpp.o
+++ b/ArduinoOutput/libraries/Zumo32U4/Zumo32U4Motors.cpp.o
--- a/ArduinoOutput/libraries/Zumo32U4/Zumo32U4ProximitySensors.cpp.o
+++ b/ArduinoOutput/libraries/Zumo32U4/Zumo32U4ProximitySensors.cpp.o
--- a/ArduinoOutput/preproc/ctags_target_for_gcc_minus_e.cpp
+++ b/ArduinoOutput/preproc/ctags_target_for_gcc_minus_e.cpp
 
															 {
														
 
															   Serial1.begin(9600); //Initialisierung mit Datengeschwindigkeit(Baud)
														
 
															   Serial1.setTimeout(10); //verkürzt Serial(1).read auf 10 ms statt 1000 ms
														
 
															-  if(Serial.available()) Serial.println("Bluetoothverbindung hergestellt");
														
 
															+  if(Serial1.available()) Serial.println("Bluetoothverbindung hergestellt");
														
 
															 }
														
 
															 //Setup Liniensensoren
														
 
															     ledRed(1);
														
 
															     while(1)
														
 
															     {
														
 
															-      Serial1.println("Fehler Beschleunigungssensors");
														
 
															+      //Serial1.println("Fehler Beschleunigungssensors");
														
 
															       delay(1000);
														
 
															     }
														
 
															   }
														
--- a/ArduinoOutput/sketch/Hauptprojekt.ino.cpp
+++ b/ArduinoOutput/sketch/Hauptprojekt.ino.cpp
 
															 {
														
 
															   Serial1.begin(9600);                      //Initialisierung mit Datengeschwindigkeit(Baud)
														
 
															   Serial1.setTimeout(10);                   //verkürzt Serial(1).read auf 10 ms statt 1000 ms
														
 
															-  if(Serial.available()) Serial.println("Bluetoothverbindung hergestellt");     
														
 
															+  if(Serial1.available()) Serial.println("Bluetoothverbindung hergestellt");      
														
 
															 }           
														
 
															 //Setup Liniensensoren
														
 
															     ledRed(1);
														
 
															     while(1)
														
 
															     {
														
 
															-      Serial1.println("Fehler Beschleunigungssensors");
														
 
															+      //Serial1.println("Fehler Beschleunigungssensors");
														
 
															       delay(1000);
														
 
															     }
														
 
															   }
														
--- a/ArduinoOutput/sketch/Hauptprojekt.ino.cpp.o
+++ b/ArduinoOutput/sketch/Hauptprojekt.ino.cpp.o
--- a/Zumo32U4/Hauptprojekt/Hauptprojekt.ino
+++ b/Zumo32U4/Hauptprojekt/Hauptprojekt.ino
 
															 {
														
 
															   Serial1.begin(9600);                      //Initialisierung mit Datengeschwindigkeit(Baud)
														
 
															   Serial1.setTimeout(10);                   //verkürzt Serial(1).read auf 10 ms statt 1000 ms
														
 
															-  if(Serial.available()) Serial.println("Bluetoothverbindung hergestellt");     
														
 
															+  if(Serial1.available()) Serial.println("Bluetoothverbindung hergestellt");      
														
 
															 }           
														
 
															 //Setup Liniensensoren
														
 
															     ledRed(1);
														
 
															     while(1)
														
 
															     {
														
 
															-      Serial1.println("Fehler Beschleunigungssensors");
														
 
															+      //Serial1.println("Fehler Beschleunigungssensors");
														
 
															       delay(1000);
														
 
															     }
														
 
															   }