LibrePilot/flight at 5e01617cbdaf64681989e21cc91be3e022b747ae - LibrePilot - Rooty - Git Service

rooty/LibrePilot

mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00

History

James Cotton 5e01617cbd Merge branch 'next' into MikeL

Conflicts:
	ground/openpilotgcs/src/plugins/config/airframe.ui
	ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
	ground/openpilotgcs/src/plugins/config/configoutputwidget.h
	ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
	ground/openpilotgcs/src/plugins/config/configvehicletypewidget.h

2012-06-06 11:58:06 -05:00

..

Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into next

2012-05-25 20:37:23 -05:00

Merge branch 'next' into MikeL

2012-06-04 16:59:31 -07:00

Add the chip size to the flashfs configuration (should probably go in the chip

2012-06-02 11:00:42 -05:00

Merged latest origin/next.

2012-05-05 09:40:44 -07:00

ef: pad any gaps between the BL bank and the FW bank

2012-04-01 22:39:27 -04:00

Added PPM input to the PipXtreme. Also added configurable GCSReceiver timeout.

2012-05-20 18:30:37 -07:00

Merge branch 'next' into MikeL

2012-06-06 11:58:06 -05:00

OpenPilot/System

Merged latest origin/next.

2012-05-05 09:40:44 -07:00

Merge branch 'next' into MikeL

2012-06-06 11:58:06 -05:00

Merge branch 'next' into MikeL

2012-06-04 16:59:31 -07:00

Fix win32 sim macro problem

2011-09-01 21:50:13 -04:00

Updated USB on PipX to latest CDC changes.

2012-05-20 19:34:43 -07:00

Added PipX to Windows .inf file and updated ppm port definitions.

2012-05-21 19:22:46 -07:00

RemoteSystemsTempFiles

Merge branch 'next' into MikeL

2012-06-04 16:59:31 -07:00

Merge branch 'next' into MikeL

2012-06-06 11:58:06 -05:00

Merge branch 'next' into MikeL

2012-06-04 16:59:31 -07:00

Need to add a small delay after save for the load to work correctly. Odd.

2012-06-03 17:26:10 -05:00

Exposed the Send ACK/NACK function in UAVTalk.

2012-05-02 20:42:37 -07:00

README.txt

Says all it needs to say for now.

2009-12-22 05:07:27 +00:00

README.txt

Check the wiki