Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Master mavlink parameter integration #37

Merged
merged 40 commits into from Mar 30, 2013
Commits on Dec 31, 2012
Commits on Jan 1, 2013
Commits on Jan 2, 2013
  1. Fehler beseitigt + getestet

    Dennis committed Jan 2, 2013
    Achtung: serial.h Buffer_Size auf 127 erhöht. Muss das?!
Commits on Jan 3, 2013
  1. Mavlink attitude message

    EmbeddedFiedel committed Jan 3, 2013
    blind gecoded
  2. 2. Message gefixt + getestet

    Dennis committed Jan 3, 2013
Commits on Jan 5, 2013
  1. Kleine Fehler behoben & Warnungen reduziert

    EmbeddedFiedel committed Jan 5, 2013
    "last line ends without a new line"
  2. Merge pull request #22 from EmbeddedFiedel/master_mavlink_integration

    EmbeddedFiedel committed Jan 5, 2013
    Update Fernsteuerung.cpp chanX_scaled for mavlink
Commits on Jan 19, 2013
  1. Merge remote-tracking branch 'origin/master_LED' into master_mavlink_…

    EmbeddedFiedel committed Jan 19, 2013
    …parameter_integration
    
    Conflicts:
    	Project/ARMCM4-STM32F407-DISCOVERY/main.c
Commits on Jan 20, 2013
Commits on Jan 22, 2013
  1. Mavlink Statustext

    EmbeddedFiedel committed Jan 22, 2013
Commits on Jan 23, 2013
  1. cherry pick Repair

    derhesse committed with EmbeddedFiedel Jan 6, 2013
    Conflicts:
    	Project/ARMCM4-STM32F407-DISCOVERY/keil/ch.uvopt
    	Project/ARMCM4-STM32F407-DISCOVERY/keil/ch_Demo.dep
    	Project/ARMCM4-STM32F407-DISCOVERY/keil/lst/ch.map
    	Project/ARMCM4-STM32F407-DISCOVERY/keil/lst/chcoreasm_v7m.lst
    	Project/ARMCM4-STM32F407-DISCOVERY/keil/lst/cstartup.lst
    	Project/ARMCM4-STM32F407-DISCOVERY/keil/lst/vectors.lst
    	Project/ARMCM4-STM32F407-DISCOVERY/main.c
  2. merge Anpassungen Kalibration in Fernsteuerung.cpp

    derhesse committed with EmbeddedFiedel Jan 10, 2013
    Bei Kalibration aktiv werden LEDs eingeschaltet; Vorgabewerte _max und
    _min werden bei Starten der Kalibration auch auf Nullwert gesetzt,
    Bugfix in setup_Fernsteuerung() (16 Bit Register!)
    
    Conflicts:
    	Project/ARMCM4-STM32F407-DISCOVERY/keil/ch.uvopt
    	Project/ARMCM4-STM32F407-DISCOVERY/keil/lst/ch.map
  3. merge Kalibration auf alle Kanäle ausgeweitet

    derhesse committed with EmbeddedFiedel Jan 10, 2013
    Conflicts:
    	Project/ARMCM4-STM32F407-DISCOVERY/keil/ch.uvopt
    	Project/ARMCM4-STM32F407-DISCOVERY/keil/lst/ch.map
    	Project/ARMCM4-STM32F407-DISCOVERY/main.c
  4. merge Taster-Softwareentprellung implementiert

    derhesse committed with EmbeddedFiedel Jan 15, 2013
    Conflicts:
    	Project/ARMCM4-STM32F407-DISCOVERY/keil/ch.uvopt
    	Project/ARMCM4-STM32F407-DISCOVERY/keil/lst/ch.map
    	Project/ARMCM4-STM32F407-DISCOVERY/main.c
  5. RC Calib over Mavlink

    EmbeddedFiedel committed Jan 23, 2013
Commits on Jan 27, 2013
  1. cherry-pick: Virtueller Timer für Entprellung implementiert

    derhesse committed with EmbeddedFiedel Jan 27, 2013
    Conflicts:
    	Project/ARMCM4-STM32F407-DISCOVERY/keil/ch.uvopt
    	Project/ARMCM4-STM32F407-DISCOVERY/keil/ch_Demo.dep
    	Project/ARMCM4-STM32F407-DISCOVERY/keil/lst/ch.map
Commits on Jan 29, 2013
  1. Regelung auf PID umgestellt und integriert.

    slagon committed Jan 29, 2013
    Roll-Teil aufgeräumt und einigermaßen funktionierende Parameter eingestellt.
  2. Zugriff auf die Parameter der mavlink-Schnittstelle in der Regelung.c…

    slagon committed Jan 29, 2013
    …pp umgesetzt.
    
    PID-Parameter in Variablen geändert und über mavlink setzbar gemacht.
    PWM-Periodenzeit reduziert
    Regelung verhält sich trotzdem scheiße
    Fernsteuerung.cpp zusammengepfuscht weil die neue KACKE IST!
Commits on Feb 1, 2013
  1. GCS.cpp: Parameternamen und Werte gesetzt

    slagon committed Feb 1, 2013
    Motoren.cpp: PWM Frequenz erhöht
    Regelung.cpp Bugfix
Commits on Feb 2, 2013
Commits on Feb 15, 2013
  1. Merge remote-tracking branch 'origin/master' into master_mavlink_para…

    EmbeddedFiedel committed Feb 15, 2013
    …meter_integration
    
    Conflicts:
    	Quad/Lage.cpp
    	Quad/Lage.h
  2. UpdateIMU Thread

    EmbeddedFiedel committed Feb 15, 2013
    To get rid of Data Delay because of Mavlink Initialization
  3. Update Quad/Lage.cpp

    EmbeddedFiedel committed Feb 15, 2013
Commits on Feb 16, 2013
  1. LageRead Schleife

    EmbeddedFiedel committed Feb 16, 2013
  2. 5th Param & Cleanup

    EmbeddedFiedel committed Feb 16, 2013
Commits on Feb 17, 2013
Commits on Feb 18, 2013
  1. Merge pull request #32 from EmbeddedFiedel/master

    EmbeddedFiedel committed Feb 18, 2013
    merge Datalog till 99
Commits on Feb 20, 2013
  1. Remove Dummys

    EmbeddedFiedel committed Feb 20, 2013
  2. LED blinken statt leuchten

    EmbeddedFiedel committed Feb 20, 2013
    Zur Bestätigung, dass Mainthread noch läuft
Commits on Mar 10, 2013
Commits on Mar 21, 2013
  1. Merge pull request #35 from EmbeddedFiedel/master

    EmbeddedFiedel committed Mar 21, 2013
    Merge Regelung Überlauf Fix