Alessio Morale
3fc3b5b01b
OP-1026 replace idle time calculation with task monitor API
2014-02-22 00:30:03 +01:00
Corvus Corax
0ebc92d9f5
Merge branch 'corvuscorax/OP-942_task-diagnostics-for-callbacks' into corvuscorax/OP-1216_flight-control-refurbishment
...
Conflicts:
flight/modules/AltitudeHold/altitudehold.c
2014-02-16 19:08:39 +01:00
Corvus Corax
1898d0ad35
OP-1217 create new receiver module
...
This module includes all the receiver IO and parsing/failsafe
functionality of ManualControl, but does none of the interpretations in
regards to flight mode / actuator control or arming that was included in
the old ManualControl
In a second step the old ManualControl module needs to be adapted to do
only these ommitted things in a modular way - as a delayed callback
2014-02-16 15:09:08 +01:00
Corvus Corax
b5a27d05e7
OP-1197 configurable failsafes OP-1219 thrust control OP-1217 separate manualcontrolsettings apart
2014-02-09 19:37:22 +01:00
Corvus Corax
9a6072d58c
Merge branch 'next' into corvuscorax/OP-942_task-diagnostics-for-callbacks
...
Conflicts:
flight/targets/boards/simposix/firmware/Makefile
2014-02-07 00:31:32 +01:00
Corvus Corax
216ec095e4
OP-1211 removed unneeded define
2014-02-06 19:34:34 +01:00
Corvus Corax
723e22aa1a
OP-1211 time_measurement_helper
2014-02-04 19:05:17 +01:00
Corvus Corax
49a1c4c28f
OP-942 refactored callback scheduler to fit into PiOS naming scheme
2014-02-02 22:08:16 +01:00
Corvus Corax
5b9a17f630
OP-942 moved DelayedCallbackScheduler into pios/common
2014-02-02 20:31:37 +01:00
Corvus Corax
b076ba02a1
OP-942 API change to CallbackScheduler - include unique ID for each callback for a taskinfo like UAVObject
2014-02-02 19:54:17 +01:00
Alessio Morale
02c7084196
Merge remote-tracking branch 'origin/next' into amorale/OP-1149_gyro_accel_thermal_calibration
...
Conflicts:
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2014-01-23 01:02:13 +01:00
Alessio Morale
3ef980aa89
OP-1188 fix stack for coptercontrol
2014-01-22 00:01:58 +01:00
Alessio Morale
1f61676d0a
Merge branch 'amorale/OP-1152_stack_verification' into next
...
Conflicts:
flight/targets/boards/coptercontrol/firmware/inc/pios_config.h
2014-01-18 13:54:06 +01:00
Corvus Corax
41202a0227
Merge branch 'corvuscorax/OP-1022_AH_improvements_amorale' into next
2014-01-15 22:47:42 +01:00
Philippe Renon
694747cd27
Merge remote-tracking branch 'origin/next' into filnet/OP-1122_gcs_waypoint_editor_stabilization
...
Conflicts:
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
2014-01-15 20:12:08 +01:00
Philippe Renon
3f66d656ca
OP-1122 OP-1158 - renamed uavobject FlightPlan to PathPlan
2014-01-15 20:04:54 +01:00
Corvus Corax
9997f14d68
Merge remote-tracking branch 'origin/next' into corvuscorax/OP-1022_AH_improvements_amorale
2014-01-15 18:45:09 +01:00
Corvus Corax
92beb54e2d
OP-1022 some small cosmetic fixes for AltitudeHold as suggested by Alessio
2014-01-15 18:43:47 +01:00
Philippe Renon
7f2c24db2b
OP-1122 OP-1158 - renamed uavobject FlightPlan to PathPlan
...
+review OPReview-609
2014-01-14 21:05:16 +01:00
Corvus Corax
3d5e27f5f2
OP-1122 fixed simposix so it will compile with new objects
2014-01-12 21:06:41 +01:00
Philippe Renon
aa24f2193a
OP-1122 OP-1158 renamed FlightPlanInfo uavobject to FlightPlan
2014-01-12 15:23:21 +01:00
Philippe Renon
bcb59a3dca
OP-1122 OP-1120 Added missing FligthPlanInfo uavobject to revoproto/firmware/UAVObjects.inc
2014-01-09 21:46:50 +01:00
Philippe Renon
8c7792b6e5
OP-1122 OP-1120 Added a new FligthPlanInfo uavobject
...
- FligthPlanInfo contains the number of waypoints and action pathes
- FligthPlanInfo contains a CRC of all waypoints and action pathes
- The CRC is not yet implemented
- These informations will be used to check the consistency of a flight plan
2014-01-09 01:06:00 +01:00
Philippe Renon
772c395e67
OP-1122 OP-1145 fixed handling of ground messages done by OPLM
...
- OPLM used to receive and relay all messages
- OPLM will now reveice only specific messages and relay others as required (needs to be reviewed...)
- add RadioComBridgeStats uavobject to collect and report tx/rx statistics
- made error handling more robust
- added a few FIXMEs
2014-01-06 21:35:00 +01:00
Alessio Morale
3aa7a1d352
OP-1152 change stack size to accomodate recent changes in dispatcher, telemetry for former CC (hw rev 1)
...
+review OPReview
2014-01-05 23:13:06 +01:00
Alessio Morale
260db3446c
OP-1149 changes in CC/CC3D code to use AccelGyroSettings for bias/scale instead of AttitudeSettings.
...
Bias units of measure are now normalized between CC/CC3D/Revo.
2013-12-29 14:08:53 +01:00
Corvus Corax
1cccd152bd
added AltitudeHold to simposix
2013-12-27 16:50:30 +01:00
Alessio Morale
7ac2f9f87f
OP-1149 Move accel/gyro calibration setting to a separate object, to be reused also for CC3D
2013-12-26 16:55:57 +01:00
Les Newell
0afe6afd11
OP-984 Fixed insufficient stack for stabilization
2013-12-11 19:24:13 +00:00
Les Newell
b7cfc503ea
OP-984 Updated makefiles and inc files for multiple pid bank objects
2013-12-11 17:09:00 +00:00
Les Newell
e4bcd87ddd
OP-984 Added stabilizationbank to inc files
2013-12-11 17:08:35 +00:00
Corvus Corax
4ad0e730da
added status uavobject for easier debugging
2013-12-08 12:23:16 +01:00
Corvus Corax
a4d53c18ac
got rid of altholdsmoothed uavobject
2013-12-07 20:14:02 +01:00
Corvus Corax
3e1b0fd114
Merge branch 'next' into corvuscorax/OP-1022_AH_improvements_amorale
2013-12-07 16:33:57 +01:00
Corvus Corax
be9faabe92
Merge branch 'next' into corvuscorax/onboardlogging
2013-11-26 00:34:01 +01:00
Alessio Morale
bacc4d3d79
Merge branch 'master' into next
...
Conflicts:
flight/targets/boards/oplinkmini/firmware/pios_board.c
ground/openpilotgcs/copydata.pro
2013-11-25 01:12:10 +01:00
Corvus Corax
18ad56d4ed
removed identical files from pios/posix (use files from common instead)
2013-11-24 15:40:32 +01:00
Corvus Corax
32b5ff22cf
cleanup defect in OP-Review-586
2013-11-24 15:27:33 +01:00
Corvus Corax
d235a24e23
Merge branch 'next' into corvuscorax/onboardlogging
2013-11-19 18:49:58 +01:00
Corvus Corax
7a6c0b61e8
Merge branch 'next' into corvuscorax/callbackeventdispatcher2
2013-11-19 18:36:20 +01:00
Corvus Corax
9414f3513f
adapted telemetry stack sizes for flight firmware to include more space needed for logging feature
2013-11-17 22:39:39 +01:00
Corvus Corax
c6031ed963
fixed usr flash system definition
2013-11-17 21:03:08 +01:00
Corvus Corax
c7431623af
changed hardware definition for revolution to have usr space in just one arena
...
(no flash garbage collection since used primarily for logging where there are no deletes)
2013-11-17 20:43:53 +01:00
Corvus Corax
fcc479f5cb
more intelligent log interfacing, including flash formatting option
2013-11-17 20:14:50 +01:00
Corvus Corax
3d8625abaf
Enabled logging on revolution (added module and uavobjects)
2013-11-17 18:50:51 +01:00
Corvus Corax
9dbac5d060
Enabled printf-stdarg on all targets, implemented vsnprintf() (needed for logging)
2013-11-17 18:49:50 +01:00
Corvus Corax
a0746d87fa
Logging facility: logs debug data to logfs and exports it through container UAVObject
2013-11-17 02:54:26 +01:00
Corvus Corax
00321b09dc
Modified uavobjectmanager to only use logfs calls for UAVObject flash transactions, abstracted dosfs calls to use logfs wrapper class for simpiosix and SD-card access
2013-11-16 17:30:40 +01:00
Alessio Morale
b003109eea
OP-1104: Update BL to version 6, raise to 0xA0000 so 640Kbyte program size.
...
+review OPReview
#resolve
2013-11-05 19:07:36 +01:00
Alessio Morale
e91bc28667
OP-1058 Get rid of Unions.
...
They caused stack usage increase with -fstrict-aliasing as stack slots are not reused when dealing with unions.
It has now been added the cast_struct_to_array macro in pios_struct_helper.h to handle such case where it is useful to access those homogeneous structs as arrays
+review OPReview-552
2013-09-01 12:10:55 +02:00
Alessio Morale
11b269f898
Merge remote-tracking branch 'origin/next' into amorale/OP-1058_uavo_named_accessors
2013-08-31 16:03:30 +02:00
Alessio Morale
8351e97faa
OP-1058: fix needed for fw_revoproto code compilation
2013-08-01 01:18:53 +02:00
Brian Webb
2340f4f0d9
OP-1050: Moves LED configuration above settings erase in OPLink pios_board.c to prevent crashing when settings are erased.
2013-07-29 20:37:00 -07:00
Corvus Corax
9537cac701
Merge branch 'next' into corvuscorax/callbackeventdispatcher2
2013-07-28 17:10:20 +02:00
Brian Webb
e246ecf536
Moves pios_led functionality to pios_gpio and makes pios_led a thin layer over pios_gpio. Supports configuring multiple sets of GPIOs.
2013-07-28 07:01:08 -07:00
Corvus Corax
be583dd8bf
fixes to gps airspeed sensor
2013-07-19 15:30:33 +02:00
Werner Backes
7708aab313
Added vertical velocity as a control loop input to improve dynamics during
...
commanded ascend/decent.
Conflicts:
flight/modules/AltitudeHold/altitudehold.c
flight/modules/ManualControl/manualcontrol.c
shared/uavobjectdefinition/altitudeholdsettings.xml
2013-07-16 21:17:32 +00:00
Alessio Morale
11bc7804d0
Merge branch 'amorale/OP-994_adc_cleanup' into next
2013-07-16 12:23:25 +00:00
Corvus Corax
27eadc200b
Merge branch 'corvuscorax/lla2nedfilter' into next
...
Conflicts:
flight/modules/StateEstimation/stateestimation.c
2013-07-10 14:38:12 +02:00
Corvus Corax
551780c74b
Merge branch 'corvuscorax/complementary_altitude_filter' into next
...
Conflicts:
flight/targets/boards/revolution/firmware/UAVObjects.inc
2013-07-10 14:27:25 +02:00
Brian Webb
c2df59498b
Merge remote-tracking branch 'origin/master' into next
2013-07-06 07:08:30 -07:00
Brian Webb
0d02df4d02
Uncrustified OPLink code.
2013-07-05 18:49:26 -07:00
Brian Webb
6dbecca7a5
OP-932 Fixes erasing settings on OPLink and blocks OPLinkSettings objects from being transmitted over the radio.
2013-07-05 18:25:52 -07:00
Brian Webb
d0d8a0aadd
OP-932 Adds PWM outputs to OPLinkMini. Both gpio pins on the main and/or flexi port can be configured to output PWM for a total of up to 4 PWM outputs.
2013-07-03 18:58:34 -07:00
Alessio Morale
89cb294218
OP-994 Move pios_architecture,h include in pios,h
...
+review OPReview-506
2013-07-02 19:26:39 +02:00
Corvus Corax
51a4b16af5
New Filter to calculate NED from LLA as part of StateEstimation
2013-06-30 18:49:29 +02:00
Corvus Corax
2a16c0dbd7
removed GPS module ability to calculate NED coordinate (not its job)
2013-06-30 16:31:19 +02:00
Brian Webb
491e5fe685
Adds a failsafe on PPM output on OPLink that kicks in when the link goes down. Also updates all air datarate settings and adds new 64 and 100 kbps modes.
2013-06-29 15:00:38 -07:00
Corvus Corax
7745f93935
changed default coefficients and exposed them to a settings uavobject as they should be
2013-06-29 01:16:02 +02:00
Corvus Corax
b19a74613a
uncrustification
2013-06-28 19:20:39 +02:00
Brian Webb
bab69401b9
OP-932 Allows configuring the Revo as coordinator.
2013-06-27 19:55:01 -07:00
Corvus Corax
cd2cc821d6
made event dispatcher a callback
2013-06-27 18:51:35 +02:00
Brian Webb
2aea2342ab
OP-932 Adds a direct PPM channel on each Tx packet when in PPM mode, and adds a PPM only mode that uses a 9600 bps air datarate. Also updates the OPLink configuration tab and moves all OPLink configuration to the OPLink configuration tab on the Revo, and customizes the OPLink configuration tab for the Revo.
2013-06-26 18:01:54 -07:00
Brian Webb
774a74884a
OP-932 Replaces the RFM22B PPM/receiver code with an OPLinkReceiver UAVObject. This object is generated on a coordinator OPLink, and is used by both the OPLink to generate PPM output, and the OPLinkReceiver on the Revo.
2013-06-26 17:57:11 -07:00
Brian Webb
8c370df319
OP-932 A significant re-work of the OPLink and configuration of the OPLink. Auto-configuration is removed, and remote modems are bound the coordinator, rather than the other way around. Timing of the radio link is also significantly changed. The rfm22b code is also simplified so that it only sends packet, and has no notion about what those packets are, so the rfm22b is converteded to simply a com type device.
2013-06-26 17:56:56 -07:00
Brian Webb
08efc8d152
OP-932: Adds an oplink receiver device, which is based on the gcs receiver device, but uses the OPLinkReceiver UAVObject. The OPLinkReceiver packets are generated on the OPLink modem.
2013-06-26 17:56:20 -07:00
Corvus Corax
0c43346292
Merge branch 'corvuscorax/OP-947_stateestimator-module' into next
...
Thanks everyone for helping getting this together, especially Alessio
and DLite :-)
2013-06-25 23:48:12 +02:00
Alessio Morale
0b8d18ae49
OP-994 Move common defines to architecture specific header
...
+review OPReview-506
2013-06-24 18:50:44 +02:00
Oleg Semyonov
7f84307714
OP-997: fix release notes. This change was reverted but not documented
2013-06-22 18:29:40 +02:00
Alessio Morale
840e6aa4f7
OP-994 Move temp calculation to a macro defined in pios_board.h as it is achitecture dependant
...
+review OPReview-506
2013-06-15 18:47:33 +02:00
Corvus Corax
1d17d08cca
Merge branch 'next' into corvuscorax/OP-947_stateestimator-module
2013-06-12 18:32:01 +02:00
Alessio Morale
2c0f7794a9
Merge remote-tracking branch 'origin/amorale/OP-997_revolution_settings_to_ext_flash' into next
2013-06-11 15:39:13 +02:00
Brian Webb
789930db45
Moved PIOS_TASK_MONITOR_Initialize to before EventDispatcherInitialize. The event dispatcher creates a task that registers itself with the task monitor. It is unlikely that the task will start before the task monitor is initialized, but not impossible (at least on the F4 targets, I don't think).
2013-06-09 20:16:40 -07:00
Alessio Morale
e9b3ee52f3
OP-997: add fields to SystemStatsUavo to monitor storage status
2013-06-09 19:20:00 +02:00
Alessio Morale
1cb69e6a0e
OP-997: Revert Revolution settings storage to external flash to prevent freezes during sector erase/garbage collection
2013-06-09 19:17:12 +02:00
Alessio Morale
bdd80a63c9
OP-994: Refactor/Cleanup of cpu temp measurement: fixed declarations for Voltage Scale constants
2013-06-08 13:46:57 +02:00
Alessio Morale
ab1c9c157f
OP-995: Fixes for correct battery monitor readout
2013-06-08 13:40:01 +02:00
Alessio Morale
6671a404ca
OP-994 Refactor/Cleanup of cpu temp measurement
2013-06-08 13:36:18 +02:00
Corvus Corax
6fdf554d4a
Merge branch 'next' into corvuscorax/OP-947_stateestimator-module
...
Conflicts:
flight/modules/Attitude/revolution/attitude.c
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
shared/uavobjectdefinition/attitudesettings.xml
2013-06-06 19:25:54 +02:00
Corvus Corax
5e306250a5
Enabled simulated sensors in SimPosix for debugging of EKF behaviour including:
...
- SimPosix again stores and reads UAVObjects to disk (was disabled by someone)
- simulated sensors moved to allow automated module initialisation in simposix
- fixed a categorization bug in a uavobject
2013-06-05 19:34:48 +02:00
Brian Webb
50162333d8
Merge remote-tracking branch 'origin/dankers/minor-modem-renames' into next
2013-05-27 09:44:17 -07:00
David Ankers
69ede538c9
Update date bu just an easy ay to start review +review OPReview-485
2013-05-26 17:50:44 +10:00
David Ankers
2f9c9df736
Increase the size of the USB Descriptor array to take extra char
2013-05-26 17:03:48 +10:00
David Ankers
7a9466bbf9
State in the header which board this is for
2013-05-26 16:12:35 +10:00
David Ankers
f7a9f94a36
Missing file header
2013-05-26 16:09:55 +10:00
David Ankers
a5b856d1bc
Change board description name to OPLink Mini
2013-05-26 16:04:55 +10:00
David Ankers
d5eccea78f
Comment and header renames, change PipX to OPLink Mini
2013-05-26 15:48:02 +10:00
Corvus Corax
9b95af2006
refaktored GPS Sensor UAVObjects
2013-05-22 22:36:23 +02:00
Corvus Corax
b56de3b66b
filterchain rework
2013-05-22 21:26:18 +02:00
Brian Webb
ac4847c8ac
OP-932 Moves the configuration of the com ports on the coordinator OPLink to startup.
2013-05-21 19:48:21 -07:00
Corvus Corax
ecc4a529a3
some fixes to filtercf and stateestimation and filterekf - Thanks Werner for help :-)
2013-05-21 20:06:33 +02:00
Corvus Corax
3cb4f59c94
failsafe, fallback to attitude for now until StateEstimation works reliably
2013-05-20 20:49:34 +02:00
Corvus Corax
8a36959d39
OP-945: Filter refaktoring - last fixes to make it compile
2013-05-20 17:04:52 +02:00
Corvus Corax
e7c35a94f6
added EKF filter
2013-05-20 16:31:10 +02:00
Corvus Corax
d258caad3f
Merge branch 'corvuscorax/OP-946_refaktor_sensor_and_state' into corvuscorax/OP-947_stateestimator-module
2013-05-20 10:34:40 +02:00
Corvus Corax
1236bf3ed9
renamed Magneto to Mag
2013-05-20 10:33:02 +02:00
Corvus Corax
49b8e0d699
Merge branch 'next' into corvuscorax/OP-946_refaktor_sensor_and_state
2013-05-20 10:07:55 +02:00
Corvus Corax
bf80b3f103
readded missing header
2013-05-19 22:40:50 +02:00
Corvus Corax
bc6f06e943
first filter implemented and some bugs fixed
2013-05-19 22:24:12 +02:00
Corvus Corax
d97934cf86
Merge branch 'next' into corvuscorax/OP-946_refaktor_sensor_and_state
2013-05-19 22:05:48 +02:00
Brian Webb
649667d338
Addes ifdef PIOS_INCLUDE_WDG around several calls to the wathdog functions for the Revolution firmware (allows you to turn off the watchdog).
2013-05-19 12:56:23 -07:00
Sexy Pony
900f643bbd
Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES
2013-05-19 17:37:30 +03:00
Alessio Morale
ab7af16be3
Merge branch 'amorale/OP-901_lib_udates-usb_fixes' into HEAD
...
Conflicts:
flight/pios/stm32f10x/library.mk
flight/targets/boards/revoproto/firmware/pios_board.c
2013-05-19 15:01:08 +02:00
Corvus Corax
f630351c75
Merge branch 'next' ...
2013-05-19 12:17:40 +02:00
Corvus Corax
daf329d8f5
uncrustification (again)
2013-05-19 11:38:18 +02:00
Alessio Morale
88a39a81d8
Enable ComUsbBridge Optional Module and fix CDC support for RevoProto
2013-05-19 10:07:01 +02:00
Corvus Corax
5284195c29
Refaktored sensor and state UAVObjects consistently into XXYSensor and XXYState
2013-05-18 19:36:45 +02:00
Alessio Morale
e8dc7509f9
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2013-05-18 17:18:48 +02:00
Oleg Semyonov
80ce4fc995
Fix weird error of running python script with extra --verbose option as a part of script name
...
This error of building any EF targets was found on Windows if used with
make V=1 verbose output option. The '--verbose' python script option was
used by the Windows make as a part of python script file name with
'file not found' error. Now it works. Still can't get the cause of that
error, though...
2013-05-18 17:25:26 +03:00
Alessio Morale
c1f767b12d
Merge remote-tracking branch 'origin/amorale/OP-954_logfs_settings_in_internal_flash' into next
...
Conflicts:
flight/pios/common/pios_flashfs_logfs.c
2013-05-18 15:53:25 +02:00
Alessio Morale
66da2796e0
Merge remote-tracking branch 'origin/amorale/OP-905_revolution_watchdog_next' into next
2013-05-18 15:00:50 +02:00
Corvus Corax
80caceb984
make uncrustify_all;make uncrustify_all;
2013-05-18 14:17:26 +02:00
Brian Webb
bc4f615c25
Adds setting HSE_VALUE on all F1 targets (should only be necessary if the HSE clock is not 8MHz).
...
Moves the CMSIS system_stm3210x.c from library.mk to the individual Makefiles for the F1 targets. This allows for custom SystemInit functions where necessary.
2013-05-17 22:01:48 -07:00
Alessio Morale
67e41c34fc
Merge remote-tracking branch 'origin/next' into amorale/usb_fixes
2013-05-17 22:46:42 +02:00
Richard Flay (Hyper)
a6aedee9fa
Merge branch 'next' into brian/support_inverted_USB_vsense
2013-05-17 05:54:42 +09:30
Alessio Morale
6ba15ebc53
OP-954 Fixes from review:
...
- CopterControl target fix
- tabs in Nakefiles
- Removed duplicate stale settings and clean empty lines in osd Makefile
+review OPReview-470
2013-05-15 23:18:50 +02:00
Alessio Morale
c80f01dff9
OP-954 Rename the legacy PIOS_INCLUDE_FLASH_SECTOR_SETTINGS to PIOS_INCLUDE_FLASH_LOGFS_SETTINGS
...
+review OPReview-470
2013-05-15 23:16:34 +02:00
Brian Webb
156109bb88
Added support for an active low USB vsense line.
2013-05-14 20:37:13 -07:00
Alessio Morale
71cae382ae
OP-954 Update OPLink to support the "UAVObject on a specific LogFS instance" updates
2013-05-14 23:54:50 +02:00
Alessio Morale
07af6b5c80
Added LogFS support for OPLinkMini with internal flash
2013-05-14 23:00:45 +02:00
Alessio Morale
8d57d8ff76
Internal flash settings for F1
...
Conflicts:
flight/pios/stm32f10x/pios_flash_internal.c
2013-05-14 22:58:05 +02:00
Alessio Morale
742ea6f6b8
Merge branch 'amorale/OP-905_revolution_watchdog' into next
...
Conflicts:
flight/targets/RevoMini/System/pios_board.c
2013-05-14 18:42:02 +02:00
Richard Flay (Hyper)
ed68fbe68d
OP-951: Adds -Wshadow to flight CFLAGS and fixes resulting compilation breakage.
...
+review OPReview
2013-05-14 07:01:45 +09:30
Alessio Morale
535b53cb1c
Raised priority for USB interrupt to high, changed subriority to 0 (PriorityGroup is 0)
2013-05-11 22:41:05 +02:00
Stacey Sheldon
441e9e7b84
f4 usb: always init HID and CDC devices
...
This is required so that we can always respond to HID and
CDC requests via the control endpoint (ep0). The F1/F3
implementation gets away with disabling these interfaces
because all of the ep0 handling is in the usbhook code
rather than (properly) split out into class-specific
drivers like it is done on the F4 implementation.
Conflicts:
flight/targets/DiscoveryF4/System/pios_board.c
flight/targets/FlyingF4/System/pios_board.c
flight/targets/Freedom/System/pios_board.c
flight/targets/Quanton/System/pios_board.c
2013-05-11 22:41:04 +02:00
Stacey Sheldon
565de5fd4e
f4 usb: ensure correct interface numbers for BL and FW
...
The interface numbers differ for the HID interface between
the BL and FW. This is required to keep windows happy.
In HID+CDC, the CDC interfaces must come first with HID last
which makes it #2 . In HID only mode, we can't use #2 for HID
since windows doesn't like the first/only interface to be
anything other than #0 .
Conflicts:
flight/targets/board_hw_defs/discoveryf4/board_hw_defs.c
flight/targets/board_hw_defs/flyingf4/board_hw_defs.c
flight/targets/board_hw_defs/freedom/board_hw_defs.c
flight/targets/board_hw_defs/quanton/board_hw_defs.c
2013-05-11 22:41:02 +02:00
Stacey Sheldon
9cc70695d7
f4 usb cdc: add support for USB CDC to RevoMini
...
Conflicts:
flight/targets/RevoMini/System/inc/pios_config.h
flight/targets/RevoMini/System/pios_board.c
2013-05-11 22:40:56 +02:00
Stacey Sheldon
c6e893e1e5
usb: fix interfaces in USB HW defs for OSD
2013-05-11 22:38:28 +02:00
Stacey Sheldon
207bd671ac
usb: fix interfaces in USB HW defs for RevoMini
2013-05-11 22:38:27 +02:00
Alessio Morale
d555bd0673
Uses Internal flash for system settings storage repourposing external flash for "User" storage
2013-05-11 22:06:30 +02:00
Alessio Morale
687e75b2e2
Changes to board specific files to support UAVObject on a specific LogFS instance
2013-05-11 17:15:07 +02:00
Richard Flay (Hyper)
cf14608ebe
Merge branch 'next' into hyper/OP-936_task-monitor-rework
2013-05-09 19:25:02 +09:30
Alessio Morale
93bad2e8c2
Merge branch 'amorale/OP-917_f4_bootloader_updater' into next
...
***** PLEASE NOTE ***** From this revision all F4 based boards (Revolution/OSD) needs bootloader version 5 to boot properly
Conflicts:
flight/pios/stm32f4xx/libraries/CMSIS2/Device/ST/STM32F4xx/Source/osd/system_stm32f4xx.c
flight/targets/boards/osd/board-info.mk
make/boot-defs.mk
make/common-defs.mk
2013-05-07 21:02:41 +02:00
Richard Flay (Hyper)
fbc8bc698f
OP-936: Merges branch 'next' into hyper/OP-936_task-monitor-rework, fixes damage/conflicts,
...
and brings the callback scheduler into the fold.
+review OPReview-461
2013-05-06 19:11:14 +09:30
Brian Webb
ae8286e99a
OP-932: Fixes a bug that was preventing setting of Tx power on remote modem.
2013-05-06 01:03:15 +01:00
Corvus Corax
39fe6beb4b
Merge branch 'corvuscorax/Attitude-fixes' into next
...
Conflicts:
flight/libraries/insgps13state.c
flight/modules/Attitude/revolution/attitude.c
2013-05-05 23:09:07 +02:00
Corvus Corax
946105cbe3
Merge branch 'next' into corvuscorax/Attitude-fixes
2013-05-05 17:44:59 +02:00
Alessio Morale
5a2c53804f
OP-917 Make reboot over telemetry link works. UserDFU timeouts to the user application when no USB connection is found.
...
+review OPReview-456
2013-05-05 15:15:44 +02:00
Richard Flay (Hyper)
a2d8544931
OP-931: adds -Wextra compiler option for the flight code, and makes the bazillion code changes required
...
to make the flight code compile again. Needs careful review, particularly all the fixes for the
signed vs unsigned comparisons.
+review OPReview-459
2013-05-05 16:32:24 +09:30
Richard Flay (Hyper)
87fcf9fa8b
Merge branch 'next' into hyper/OP-931_extra_compiler_warnings and update as necessary.
...
Hopefully properly fixes conflicts:
flight/modules/Attitude/attitude.c
flight/modules/ManualControl/manualcontrol.c
flight/modules/Osd/WavPlayer/wavplayer.c
flight/modules/Osd/osdgen/osdgen.c
flight/modules/System/systemmod.c
ground/uavobjgenerator/generators/flight/uavobjectgeneratorflight.cpp
2013-05-04 11:12:44 +09:30
Brian Webb
12e8adbdc4
OP-932: Fixes vitual com port and (not tested) raw comms over a UART on the OPLink.
2013-05-03 14:46:01 +01:00
Brian Webb
84a0f981e0
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into OP-932-Modularize_Radio_Driver
2013-05-03 14:08:40 +01:00
Corvus Corax
25c58ff074
Put all EKF initialisation values in a separate UAVObject EKFConfiguration,
...
adapted insgps13state.c/.h,
modules/Attitude/revolution,
configrevowidget.cpp,
accordingly.
2013-05-03 02:17:44 +02:00
Richard Flay (Hyper)
84e1a81f8b
OP-936: Moves the task monitor code out of the flight library and into PiOS.
...
This move and rework also breaks the dependency of the task monitor on the UAVO subsystem,
and pushes the responsibility for updating the TaskInfo UAVO into the System module.
+review OPReview
2013-05-03 07:01:14 +09:30
Sambas
f7b9223827
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
...
Conflicts:
flight/modules/System/systemmod.c
shared/uavobjectdefinition/taskinfo.xml
2013-05-02 09:00:12 +03:00
Brian Webb
80cef9dbcc
OP-932: Fixes vitual com port and (not tested) raw comms over a UART on the OPLink.
2013-05-02 04:23:26 +01:00
Corvus Corax
e7dc665c14
Reworked Variance Objects, Setting for initial EKF variance
2013-05-01 19:16:29 +02:00
Corvus Corax
d77c690fe3
Merge branch 'next' into corvuscorax/Attitude-fixes
...
Conflicts:
flight/modules/Attitude/revolution/attitude.c
2013-05-01 17:51:05 +02:00
Brian Webb
3b5bec167e
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into OP-932-Modularize_Radio_Driver
2013-05-01 15:30:24 +01:00
Brian Webb
344e5cbb66
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into OP-932-Modularize_Radio_Driver
2013-05-01 14:38:28 +01:00
Corvus Corax
a0ca66b0cd
Merge branch 'corvuscorax/delayed_callbacks_with_delay' into next
2013-05-01 15:34:16 +02:00
Oleg Semyonov
7032d2a9d6
Merge remote-tracking branch 'origin/next' into os/uncrustify-config
2013-05-01 13:31:38 +02:00
Brian Webb
c3ea1bf3c0
OP-932: Fixed GPIO debugging on RevoMini (both V1 and V2)
2013-05-01 03:13:36 +01:00
Alessio Morale
37a0d2c99e
OP-917 included a "compatibility" linker script used by the bootloader updater to ensure its compatibility with previous bootloader versions
...
+review OPReview-456
2013-05-01 01:14:30 +02:00
Alessio Morale
e1fdc41d7f
OP-917 add Bootloader support for IRQStack to reside in CCSRAM
...
+review OPReview-456
2013-05-01 01:03:27 +02:00
Alessio Morale
1eef6a7f06
OP-917 Extended the program flash size to 3 128k sectors for F4 targets
...
+review OPReview-456
2013-05-01 01:00:48 +02:00
Oleg Semyonov
7c6da1df65
OPLinkMini: remove duplicated pvPortMalloc defines, fix #ifdef macro name
...
When the #define is reformatted by uncrustify, it differs from the same
in FreeRTOS default config and gives error. So the removal of it serves
to 2 purposes: removes the duplication and fixes uncrustified builds.
2013-04-30 16:54:30 +02:00
Oleg Semyonov
0394a3511c
Rename template files to *.template to screen from uncrustify processing
2013-04-30 16:54:27 +02:00
Richard Flay (Hyper)
7937ae6296
OP-931: Makes flight code compile with -Wfloat-equal and -Wunsuffixed-float-constants enabled.
...
Also fixes warnings (and bugs) in F4 STM32_USB_OTG_Driver code, allowing -Werror to be enabled for all flight code.
Fixes all other compiler warnings that would otherwise cause the flight code to not compile with -Werror enabled.
Along the way, this also adds some uses of isnan() to various places rather than questionable tests for x != x and
x == x to check for NaNs.
+review OPReview
2013-04-30 20:36:42 +09:30
Corvus Corax
6e2c9b3c46
New EKFStateVariance UAVObject with EKF state variance information
2013-04-28 19:38:37 +02:00
Oleg Semyonov
19e374e8d1
OP-917: Minor fix for indents and spacing
2013-04-28 15:35:28 +03:00
Alessio Morale
41ecc09c3f
OP-917 Various review fixes:
...
-Fixed casing for PIOS_BL_HELPER_FLASH_ERASE_BOOTLOADER
-fixed wrong condition in f1 bl_helper
-other cosmetic changes and use of stdbool in f1 pios_bl_helper
-remove now unused macros
+review OPReview-456
2013-04-28 10:19:08 +02:00
Alessio Morale
9f56fe9a1e
OP-917 Makefiles cleanup. Get rid of ALL_BOARDS_BU as not all boards have one
...
+review OPReview-456
2013-04-28 10:14:50 +02:00
Corvus Corax
8d1baa2ceb
OP-929: disable OveroSync module while its broken
2013-04-27 23:20:23 +02:00
Alessio Morale
78498910cf
OP-917 Moved all the flash architecture related code to pios_bl_helper, get the flash addresses from board defines, major cleanup.
...
+review OPReview
2013-04-27 15:15:28 +02:00
Corvus Corax
e1233c7780
Merge branch 'next' into corvuscorax/delayed_callbacks_with_delay
...
Conflicts:
flight/targets/Revolution/System/inc/openpilot.h
flight/targets/SimPosix/System/inc/openpilot.h
flight/targets/boards/coptercontrol/firmware/inc/openpilot.h
flight/targets/boards/oplinkmini/firmware/inc/openpilot.h
flight/targets/boards/revolution/firmware/inc/openpilot.h
flight/targets/boards/revoproto/firmware/inc/openpilot.h
2013-04-27 13:26:03 +02:00
Alessio Morale
b21146b8e3
OP-917 bootloader updater for F4 targets. Initial commit
2013-04-27 00:56:47 +02:00
Oleg Semyonov
45f456580f
Fix pios debug pin functions and defines (thanks to Mathieu for the patch)
2013-04-26 18:18:31 +03:00
Oleg Semyonov
e2fd821e97
Merge remote-tracking branch 'origin/next' into sambas/diffnext
...
Conflicts:
make/common-defs.mk
2013-04-26 16:31:19 +03:00
sambas
e94c00e671
Fix revo BL compile error
2013-04-25 19:51:52 +03:00
sambas
abe3742217
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
...
Conflicts:
flight/Libraries/CoordinateConversions.c
flight/Libraries/paths.c
flight/Modules/System/systemmod.c
flight/PiOS/STM32F4xx/pios_sys.c
flight/targets/boards/coptercontrol/pios_board.h
flight/targets/boards/revolution/pios_board.h
flight/targets/boards/revoproto/pios_board.h
2013-04-25 17:26:49 +03:00
Oleg Semyonov
25d0e8fcab
Rename PiOS/STM32F10x->PiOS/stm32f10x, PiOS/STM32F4xx->PiOS/stm32f4xx
2013-04-25 13:13:39 +03:00
Oleg Semyonov
f20f89da35
Rename PiOS/Common->PiOS/common
2013-04-25 13:13:39 +03:00
Oleg Semyonov
66db978244
Rename Libraries->libraries, Modules->modules
2013-04-25 13:13:36 +03:00
Oleg Semyonov
748b28f4f4
Move doxygen config from flight to make/doxygen/
2013-04-24 22:44:40 +03:00
Oleg Semyonov
8f784ac6cb
flight: remove unnecessary #include "systemmod.h" from boards
2013-04-24 22:35:34 +03:00
Oleg Semyonov
fb207bdaf7
OP-896: rename SensorTest to RevoProto
2013-04-24 00:57:33 +03:00
Oleg Semyonov
406339eb49
Merge branch 'amorale/next_precheck' into os/OP-899_board-config-rework-rebased-3
...
Conflicts:
flight/Libraries/inc/op_dfu.h
flight/Libraries/op_dfu.c
flight/targets/Bootloaders/CopterControl/inc/op_dfu.h
flight/targets/Bootloaders/OSD/op_dfu.c
flight/targets/boards/coptercontrol/bootloader/inc/op_dfu.h
flight/targets/boards/coptercontrol/bootloader/op_dfu.c
flight/targets/boards/oplinkmini/bootloader/inc/op_dfu.h
flight/targets/boards/oplinkmini/bootloader/op_dfu.c
flight/targets/boards/osd/bootloader/inc/op_dfu.h
flight/targets/boards/osd/bootloader/op_dfu.c
flight/targets/boards/revolution/bootloader/inc/op_dfu.h
flight/targets/boards/revolution/bootloader/op_dfu.c
flight/targets/boards/sensortest/bootloader/inc/op_dfu.h
flight/targets/boards/sensortest/bootloader/op_dfu.c
make/boot-defs.mk
2013-04-24 00:37:39 +03:00
Alessio Morale
57ca1639cc
Merge branch 'amorale/amorale/OP-874_gcs_rescue_erase_settings_merged' into next
...
Conflicts:
flight/Libraries/op_dfu.c
flight/PiOS/STM32F10x/pios_iap.c
flight/PiOS/inc/pios_iap.h
flight/targets/BootloaderUpdater/main.c
flight/targets/Bootloaders/CopterControl/inc/op_dfu.h
flight/targets/Bootloaders/CopterControl/op_dfu.c
flight/targets/Bootloaders/OSD/inc/op_dfu.h
flight/targets/Bootloaders/PipXtreme/op_dfu.c
flight/targets/Bootloaders/RevoMini/inc/op_dfu.h
flight/targets/Bootloaders/RevoMini/op_dfu.c
flight/targets/Bootloaders/Revolution/inc/op_dfu.h
flight/targets/Bootloaders/Revolution/op_dfu.c
ground/openpilotgcs/src/plugins/uploader/uploader.ui
make/apps-defs.mk
make/boot-defs.mk
2013-04-23 23:14:11 +02:00
Oleg Semyonov
27195b7327
OP-899: move UAVObjects and UAVTalk one level up from targets
2013-04-24 00:07:07 +03:00
Oleg Semyonov
3f2431c04f
OP-899: move board-specific pios_board.h files into board directories
2013-04-24 00:07:06 +03:00
Oleg Semyonov
f7332f6905
OP-899: remove extra copy of pios_usb_data.c and move it level up
2013-04-24 00:07:06 +03:00
Oleg Semyonov
1dd20eca33
OP-899: move board_hw_defs.c under board directories and fix some includes
2013-04-24 00:07:06 +03:00
Oleg Semyonov
393b37fa7a
OP-899: move board-info.mk from make/boards to board directories
2013-04-24 00:07:06 +03:00
Oleg Semyonov
f7f842687a
OP-899: rename System to firmware and move Makefile into it
2013-04-24 00:07:06 +03:00
Oleg Semyonov
fce12662bc
OP-899: move bootloaders under board directories
2013-04-24 00:07:06 +03:00
Oleg Semyonov
f01655efed
OP-899: get rid of board_friendly names
2013-04-24 00:07:06 +03:00
Oleg Semyonov
c33ff12faa
OP-899: rename targets/common/CamelStyle to unix_style
2013-04-24 00:07:05 +03:00
Oleg Semyonov
63573fac16
OP-899: move EF and BU to targets/common
2013-04-24 00:07:05 +03:00
Oleg Semyonov
fc845888d3
OP-899: move board targets under targets/boards
2013-04-24 00:07:05 +03:00
Oleg Semyonov
399cafe7d7
OP-896: rename RevoMini to Revolution
2013-04-24 00:07:05 +03:00
Oleg Semyonov
6afbef01eb
OP-896: rename Revo to SensorTest
2013-04-24 00:07:04 +03:00
Oleg Semyonov
1ded536056
OP-896: rename OPLink to OPLinkMini
2013-04-24 00:07:04 +03:00
Oleg Semyonov
6cd963e423
OP-896: fix a conflict resolution typo
2013-04-24 00:07:04 +03:00
Brian Webb
ba7b712cf1
Changed all references to PipXtreme on flight side to OPLink.
2013-04-24 00:07:03 +03:00
Alessio Morale
b4a4ada1b0
Merge branch 'amorale/OP-900_update_freertos_740' into next
...
Conflicts:
flight/PiOS/Common/Libraries/FreeRTOS/Source/croutine.c
flight/PiOS/Common/Libraries/FreeRTOS/Source/include/FreeRTOS.h
flight/PiOS/Common/Libraries/FreeRTOS/Source/include/StackMacros.h
flight/PiOS/Common/Libraries/FreeRTOS/Source/include/croutine.h
flight/PiOS/Common/Libraries/FreeRTOS/Source/include/list.h
flight/PiOS/Common/Libraries/FreeRTOS/Source/include/mpu_wrappers.h
flight/PiOS/Common/Libraries/FreeRTOS/Source/include/portable.h
flight/PiOS/Common/Libraries/FreeRTOS/Source/include/projdefs.h
flight/PiOS/Common/Libraries/FreeRTOS/Source/include/queue.h
flight/PiOS/Common/Libraries/FreeRTOS/Source/include/semphr.h
flight/PiOS/Common/Libraries/FreeRTOS/Source/include/task.h
flight/PiOS/Common/Libraries/FreeRTOS/Source/include/timers.h
flight/PiOS/Common/Libraries/FreeRTOS/Source/list.c
flight/PiOS/Common/Libraries/FreeRTOS/Source/queue.c
flight/PiOS/Common/Libraries/FreeRTOS/Source/tasks.c
flight/PiOS/Common/Libraries/FreeRTOS/Source/timers.c
flight/PiOS/STM32F10x/Libraries/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c
flight/PiOS/STM32F10x/Libraries/FreeRTOS/Source/portable/GCC/ARM_CM3/portmacro.h
flight/PiOS/STM32F10x/Libraries/FreeRTOS/Source/portable/MemMang/heap_1.c
flight/PiOS/STM32F10x/Libraries/FreeRTOS/Source/portable/MemMang/heap_2.c
flight/PiOS/STM32F10x/Libraries/FreeRTOS/Source/portable/MemMang/heap_3.c
flight/PiOS/STM32F10x/library.mk
flight/PiOS/STM32F4xx/Libraries/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.c
flight/PiOS/STM32F4xx/Libraries/FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h
flight/PiOS/posix/Libraries/FreeRTOS/Source/include/FreeRTOS.h
flight/PiOS/posix/Libraries/FreeRTOS/Source/include/StackMacros.h
flight/PiOS/posix/Libraries/FreeRTOS/Source/include/croutine.h
flight/PiOS/posix/Libraries/FreeRTOS/Source/include/list.h
flight/PiOS/posix/Libraries/FreeRTOS/Source/include/mpu_wrappers.h
flight/PiOS/posix/Libraries/FreeRTOS/Source/include/portable.h
flight/PiOS/posix/Libraries/FreeRTOS/Source/include/projdefs.h
flight/PiOS/posix/Libraries/FreeRTOS/Source/include/queue.h
flight/PiOS/posix/Libraries/FreeRTOS/Source/include/semphr.h
flight/PiOS/posix/Libraries/FreeRTOS/Source/include/task.h
flight/PiOS/posix/Libraries/FreeRTOS/Source/list.c
flight/PiOS/posix/Libraries/FreeRTOS/Source/queue.c
2013-04-23 21:57:50 +02:00
sambas
01df38008f
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
...
Conflicts:
flight/Libraries/sanitycheck.c
flight/Modules/System/systemmod.c
2013-04-20 21:25:22 +03:00
sambas
074b391cc0
spring cleaning
2013-04-20 18:07:19 +03:00
Oleg Semyonov
cb068f507b
Merge remote-tracking branch 'origin/next' into amorale/OP-886_sanitychecks
2013-04-19 23:43:42 +02:00
Corvus Corax
6cb2d2b39d
updated in code documentation, use of some enums in callbackscheduler.h
2013-04-19 17:25:42 +02:00
Corvus Corax
4d1729c415
syntax cleanup and betterheader comments
2013-04-19 09:07:35 +02:00
Alessio Morale
61be4811f5
OP-900 Various fixes from OPReview-435
...
+review OPReview-435
2013-04-19 00:00:28 +02:00
Corvus Corax
17e8268e81
typo fix in callback scheduler
2013-04-18 18:35:57 +02:00
Corvus Corax
6f1bb94718
Delayed Callback Scheduler is now able to schedule delayed execution at an arbitrary time in the future
2013-04-18 14:17:29 +02:00
sambas
ab8ab4bcc6
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
2013-04-15 17:41:06 +03:00
sambas
388489226d
typo fix, fix EE_BANK usage
2013-04-14 13:08:09 +03:00
sambas
0c13fbbee6
flashsettings and WDG for osd, revert the uavobjectmanager revert.
2013-04-14 12:43:37 +03:00
sambas
bb4aa08a15
Merge remote-tracking branch 'origin/sambas/diffnext' into amorale/osd_settings_on_flash
2013-04-14 12:32:26 +03:00
sambas
6989468d17
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
...
Conflicts:
.gitignore
2013-04-14 10:13:51 +03:00
Corvus Corax
87ed9a8be2
reimplemented delayed callback scheduler to allow dispatching from ISR's and multiple schedulers with different task priorities
2013-04-14 04:16:34 +02:00
Corvus Corax
bbb83752f7
rebased delayed callback scheduler
2013-04-13 21:50:47 +02:00
Oleg Semyonov
03a4ca545f
Remove stray '}' in a makefile
2013-04-12 11:51:18 +02:00
Oleg Semyonov
8ab580ae82
Remove stray '}' in a makefile
2013-04-12 12:50:12 +03:00
Oleg Semyonov
34b15fedaf
OP-719: make python_install (Windows)
2013-04-12 10:56:10 +02:00
Oleg Semyonov
bc4d25242f
makefile: use the same coding style for all make variables
2013-04-12 10:55:23 +02:00
Brian Webb
28bfc2725c
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-04-11 14:42:49 +01:00
Alessio Morale
81156ad132
OP-900 Changed memory allocation strategy for F1 to use portBYTE_ALIGNMENT alignment for stacks and portBYTE_HEAP_ALIGNMENT for generic mallocs
...
+review OPReview-435
2013-04-08 22:55:49 +02:00
Alessio Morale
09d2ba1d25
OP-874 merge of amorale/OP-874_gcs_rescue_erase_settings in next.
...
+review OPReview-421
2013-04-08 01:10:37 +02:00
sambas
e87d7f2202
Merge branch 'sambas/diffnext' of ssh://git.openpilot.org/OpenPilot into sambas/diffnext
2013-04-07 14:57:21 +03:00
sambas
fb8273459f
Normalize line endings
2013-04-07 09:49:13 +03:00
Brian Webb
90b0987e43
Fixed setting max Tx power on Revo.
2013-04-07 02:17:09 +01:00
Alessio Morale
c801ca681c
OP-900 update FreeRTOS to 7.4.0
...
also added an howto_update.txt file that list the necessary modifications to FreeRTOS files
+review OPReview
2013-04-06 15:05:39 +02:00
Brian Webb
4564718708
Added setting of max RF power and initial frequency on Revo.
2013-04-06 04:28:25 +01:00
Brian Webb
c330db3a28
Added setting of min/max frequencies on OPLink coordinator.
2013-04-06 01:32:15 +01:00
Oleg Semyonov
5bb6b56b4a
OP-772: Normalize line endings
2013-04-05 23:46:56 +03:00
sambas
47a7659147
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
2013-04-02 20:40:41 +03:00
sambas
d776d82518
Does this fix simposix and make bamboo happy
2013-04-02 19:57:40 +03:00
Brian Webb
4778a12070
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-04-01 14:30:46 +01:00
Alessio Morale
9264c8b4e2
Merge remote-tracking branch 'origin/amorale/OP-881_flashautodetect' into next
2013-03-31 18:06:52 +02:00
Brian Webb
538d854627
Changed test for GCSRECEIVER in OPLink to PIOS_INCLUDE_GCSRCVR to match new define in pios_config.
2013-03-31 16:37:14 +01:00
Alessio Morale
45b0e787a4
OP-886 Improvements to sanitychecks
...
Added an Extensions to Alarm for detailed status/substatus reporting.
Extended Alarms are the first in the Alarm structure and have corresponding fields in Status and Substatus structures.
Also added a filter to the HWsettings update to prevent to block arming when actual settings have not changed.
+review OPReview
2013-03-30 19:57:16 +01:00
Alessio Morale
8698bcfb84
Moved OSD settings from SDCard to mcu internal flash memory
2013-03-30 15:47:22 +01:00
sambas
e43e5c5028
Add missing flightmodes into sanitycheck, pathfollower needs to be running before sanitycheck runs
2013-03-30 14:57:43 +02:00
Brian Webb
1cac81b3e8
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
...
Conflicts:
flight/targets/PipXtreme/System/inc/pios_config.h
flight/targets/RevoMini/System/inc/pios_config.h
2013-03-29 17:17:55 -07:00
Oleg Semyonov
ca0910370f
OP-881: flashfs: coding style fixes according to OPReview-423
...
+review OPReview-423
2013-03-29 11:26:56 +02:00
sambas
2557600257
uavobjects thing that fixes sdcard settings save on osd. Can be reverted when fix found.
2013-03-28 18:35:42 +02:00
sambas
5ded8c6dfc
VTOL path fixes
...
Flight mode fixes
POI mode
AutoLand Tests
Simple stabilization Shortest way yaw fix
GCS map and pathplanner fixes
2013-03-28 18:29:26 +02:00
sambas
77cae9ffc3
MagBaro Extension board module
...
OSD update
OSD output module for FC
Sonar update
Flight mode fixes + poi
2013-03-28 18:20:50 +02:00
Alessio Morale
e68aeb0c8e
OP-881 Make PIOS_Flash_Jedec_Init able to configure the flash chip based on Jedec Id returned using a catalog of known flash chips.
...
+review OPReview
2013-03-27 00:26:47 +01:00
Oleg Semyonov
17600ed09f
PyMite: remove from simposix Makefile and use library instead
2013-03-25 02:59:40 +02:00
Oleg Semyonov
8e7712a13f
PyMite: fix nasty build bug with open file problem on Windows
...
In fact, the cause of that error was badly written makefile rule which
generated 5 same files 5 times. If used with make -j, it tried to open
the same files for writing at the same time. Windows doesn't like this.
This is fixed now.
2013-03-25 02:03:35 +02:00
Brian Webb
1979e8b57f
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-03-24 16:57:59 +01:00
Oleg Semyonov
30b362a5fa
entire-flash.py: fix comment
2013-03-24 14:12:08 +02:00
Oleg Semyonov
8f977a4411
Final step: lot of small fixes, last commit in this commit series
...
This is the first cleanup pass through makefiles and pios.
Probably it is difficult to track changes due to the nature of them.
I would recommend to look at resulting files and compiled code instead.
NOTE: original branch was rebased and lot of conflicts were fixed on
the way. So do not expect that every commit in this series will be
buildable (unlike original branch). Only final result was tested.
The main goal was to remove as much duplication of code (and copy/paste
errors) as possible, moving common parts out of Makefiles. It still is
not perfect, and mostly no code changes made - Makefiles and #ifdefs only.
But please while testing make sure that all code works as before, and no
modules/options are missed by accident.
Brief list of changes:
- Moved common parts of Makefiles into the set of *.mk files.
- Changed method of passing common vars from top Makefile to lower ones.
- Some pios cleanup, mostly #ifdefs, and all pios_config.h files.
- Many obsolete files removed (for instance, AHRS files, op_config.h).
- Many obsolete or unused macros removed or fixed/renamed (ALL_DIGNOSTICS).
- Unified pios_config.h template. Please don't remove lines for board
configs, only comment/uncomment them. Adding new PIOS options, please
propagate them to all board files keeping the same order.
- Some formatting, spacing, indentation (no line endings change yet).
- Some cosmetic fixes (no more C:\X\Y\filename.c printings on Windows).
- Added some library.mk files to move libs into AR achives later.
- EntireFlash target now uses cross-platform python script to generate bin
files. So it works on all supported platforms: Linux, OSX, Windows.
- Top level packaging is completely rewritten. Now it is a part of top
Makefile. As such, all dependencies are checked and accounted, no
more 'make -j' problems should occur.
- Default GCS_BUILD_CONF is release now, may be changed if necessary
using 'make GCS_BUILD_CONF=debug gcs'.
- GCS build paths are separated into debug and release, so no more obj
file clashes. Packaging system supports only release builds.
- New target is introduced: 'clean_package'. Now 'make package' does not
clean build directory. Use clean_package instead for distributable builds.
- Targets like 'all', 'opfw_resource', etc now will print extra contex
in parallel builds too.
- If any of 'package', 'clean_package', 'opfw_resource' targets are given
on command line, GCS build will depend on the resource, so all fw_*.opfw
targets will be built and embedded into GCS. By default GCS does not
depend on resource, and will be built w/o firmware (unless the resource
files already exist and the Qt resource file is generated).
- fw_simposix (ELF executable) is now packaged for linux. Run'n'play!
- Make help is refined and is now up to date.
Still broken:
- UnitTests, should be fixed
- SimPosix: buildable, but should be reworked.
Next planned passes to do:
- toolchain bootstrapping and packaging (including windows - WIP)
- CMSIS/StdPeriph lib cleanup
- more PIOS cleanup
- move libs into AR archives to save build time
- sim targets refactir and cleanup
- move android-related directories under <top>/android
- unit test targets fix
- source code line ending changes (there are many different, were not changed)
- coding style
Merging this, please use --no-ff git option to make it the real commit point
Conflicts:
A lot of... :-)
2013-03-24 13:06:24 +02:00
Oleg Semyonov
2eff6f5f3c
Posix compile-only fix (still needs a lot of rework)
...
This is a patch to make simposix buildable. It does not use new
makefiles and should be reworked.
Conflicts:
flight/targets/SimPosix/Makefile
2013-03-24 13:06:21 +02:00
Oleg Semyonov
bd033badb9
BootloaderUpdater: move one level up, now next to EntireFlash and Bootloaders
2013-03-24 13:06:18 +02:00
Oleg Semyonov
5f24378a4f
EntireFlash: now works on all supported platforms
2013-03-24 13:06:17 +02:00
Oleg Semyonov
38d822d2f5
Makefile: rework OSD Makefile and target to use new make system
...
Conflicts:
flight/targets/OSD/Makefile
2013-03-24 13:06:07 +02:00
Oleg Semyonov
404ba00f70
Makefile: rework Revolution Makefile to use new make system
...
Conflicts:
flight/targets/Revolution/Makefile
2013-03-24 13:06:05 +02:00
Oleg Semyonov
f465a04b88
pios: add new options from Revolution to pios.h and pios_config.h
2013-03-24 13:06:04 +02:00
Oleg Semyonov
886c6b8775
Makefile: rework RevoMini Makefile to use new make system
...
Conflicts:
flight/targets/RevoMini/Makefile
flight/targets/RevoMini/UAVObjects.inc
2013-03-24 13:06:03 +02:00
Oleg Semyonov
c518a58215
Makefile: remove hardly used make options from CopterControl Makefile
...
It was reasonable to use "USE_FEATURE" on the make level when we didn't
have optional modules. Now is better to add them using += make operator.
Conflicts:
flight/targets/CopterControl/Makefile
2013-03-24 13:06:02 +02:00
Oleg Semyonov
5c13162824
Makefile: some rearrangements between apps-defs.mk and target Makefiles
...
Conflicts:
flight/targets/PipXtreme/Makefile
make/apps-defs.mk
2013-03-24 13:06:00 +02:00
Oleg Semyonov
3c97b5a7c6
Clean up pios_config.h for BL, BU, some FW (not all yet)
...
Conflicts:
flight/targets/Bootloaders/CopterControl/inc/pios_config.h
2013-03-24 13:05:57 +02:00
Oleg Semyonov
446abf6190
pios: add more global config options used by Revo
...
Conflicts:
flight/PiOS/pios.h
flight/targets/RevoMini/System/inc/pios_config.h
2013-03-24 13:05:55 +02:00
Oleg Semyonov
9bcbcbeb34
Remove never used op_config.h files (all occurences were empty)
2013-03-24 13:05:53 +02:00
Oleg Semyonov
9b3d3e62ab
Makefile: fix Makefile for BootloaderUpdater (STM32F10x only targets)
...
Conflicts:
flight/targets/Bootloaders/BootloaderUpdater/Makefile
2013-03-24 13:05:52 +02:00
Oleg Semyonov
ce4b2f4446
pios_debug: use PIOS_INCLUDE_DEBUG_CONSOLE to DEBUG_PRINTF(level, ...)
...
Inconsistent use of debug macros in board definition files resulted in
BU compilation error. It was attempted to use PIOS_COM_SendFormattedStringNonBlocking()
directly even if PIOS_COM was not included (like for BootloaderUpdater).
So this function in pios_debug.c was replaced by DEBUG_PRINTF() macro.
The macro itself is defined in pios_debug.h file. Its definitions are
removed from board files. And to use it one has to define in pios_config.h:
#define PIOS_INCLUDE_DEBUG_CONSOLE
#define DEBUG_LEVEL <number>
in addition to PIOS_INCLUDE_COM with aux port.
Conflicts:
flight/PiOS/Boards/STM32103CB_PIPXTREME_Rev1.h
flight/PiOS/Boards/STM32F4xx_RevoMini.h
2013-03-24 13:05:51 +02:00
Oleg Semyonov
91f14768db
Makefile: fix mk files, now both CC and PipX are buildable using common defs
...
Conflicts:
make/apps-defs.mk
2013-03-24 13:05:50 +02:00
Oleg Semyonov
f65ff0585f
Makefile: add make/common-defs.mk and use it to build bootloaders (STM32F10x)
...
Conflicts:
make/boot-defs.mk
2013-03-24 13:04:15 +02:00
Oleg Semyonov
448a07fe57
pios_config.h: remove non-existent option PIOS_NO_GPS
2013-03-24 13:04:10 +02:00
Oleg Semyonov
27822d0cd4
Makefile and pios_config.h cleanup for PipXtreme
...
Now PipXtreme uses the same apps-defs.mk file as CopterControl.
Next steps are F4 boards.
Conflicts:
flight/targets/PipXtreme/Makefile
flight/targets/PipXtreme/System/inc/pios_config.h
2013-03-24 13:04:08 +02:00
Oleg Semyonov
30128517b5
Makefile: remove unused USE_I2C option from makefiles
2013-03-24 13:04:07 +02:00
Oleg Semyonov
a1e17eccf3
pios: fix packet handler #ifdef guards and Makefile
...
Conflicts:
flight/Libraries/packet_handler.c
flight/targets/CopterControl/System/inc/pios_config.h
2013-03-24 13:04:04 +02:00
Oleg Semyonov
f7bdcdb782
Makefile: firmware makefiles cleanup (CC)
...
Conflicts:
flight/targets/CopterControl/Makefile
2013-03-24 13:04:03 +02:00
Oleg Semyonov
75ef685c6e
Makefile: bootloader makefiles cleanup
...
Conflicts:
flight/targets/Bootloaders/CopterControl/Makefile
flight/targets/Bootloaders/OSD/Makefile
flight/targets/Bootloaders/PipXtreme/Makefile
flight/targets/Bootloaders/RevoMini/Makefile
flight/targets/Bootloaders/Revolution/Makefile
2013-03-24 13:04:01 +02:00
Oleg Semyonov
8a98920f3d
Makefile: use exported variables in firmware-defs.mk
...
Note that $(QUOTE) variable is uppercased. Windows make does not
export lowercased variables with export keyword (even if must do).
Conflicts:
make/firmware-defs.mk
2013-03-24 13:04:00 +02:00
Oleg Semyonov
00a0ef430d
pios: fix pios_config.h (now PIOS_INCLUDE_COM_MSG requires PIOS_INCLUDE_COM)
2013-03-24 13:03:57 +02:00
Alessio Morale
1a38b7eb46
Merge remote-tracking branch 'origin/amorale/02_os-stac_logfs-unittests' into next
...
Conflicts:
flight/targets/RevoMini/Makefile
flight/targets/Revolution/Makefile
2013-03-23 15:13:05 +01:00
Alessio Morale
e06ab7f706
Merge remote-tracking branch 'origin/amorale/01-directory_move_sanity_simposix' into next
...
Conflicts:
Makefile
flight/PiOS.posix/inc/pios_com.h
flight/targets/RevoMini/UAVObjects.inc
flight/targets/Revolution/Makefile
2013-03-23 14:37:19 +01:00
Stacey Sheldon
b6eeb59b26
flash: verify JEDEC ID during flash init
...
Verify that the flash component on the board matches exactly
what we're expecting. This is a simple way to verify that we
are communicating properly with the JEDEC flash chip.
Conflicts:
flight/targets/board_hw_defs/freedom/board_hw_defs.c
flight/targets/board_hw_defs/quanton/board_hw_defs.c
2013-03-03 14:33:02 +01:00
Stacey Sheldon
17b8696261
flash: use uintptr_t to hold opaque pointers
...
When storing an opaque pointer value in a uint, the
appropriate type is uintptr_t which is guaranteed to
be wide enough to hold a pointer.
This is particularly important when the code can be
compiled in a sim or unit test environment which is
intended to run on a 64-bit machine.
Conflicts:
flight/PiOS/Common/pios_flash_jedec.c
flight/targets/DiscoveryF4/System/pios_board.c
flight/targets/FlyingF4/System/pios_board.c
flight/targets/Freedom/System/pios_board.c
flight/targets/Quanton/System/pios_board.c
2013-03-03 14:33:02 +01:00
Stacey Sheldon
dd5f4b949c
logfs: use uintptr_t to hold opaque pointers
...
When storing an opaque pointer value in a uint, the
appropriate type is uintptr_t which is guaranteed to
be wide enough to hold a pointer.
This is particularly important when the code can be
compiled in a sim or unit test environment which is
intended to run on a 64-bit machine.
Conflicts:
flight/targets/DiscoveryF4/System/pios_board.c
flight/targets/FlyingF4/System/pios_board.c
flight/targets/Freedom/System/pios_board.c
flight/targets/Quanton/System/pios_board.c
2013-03-03 14:33:02 +01:00
Alessio Morale
cc2d5f8eae
Fixes for missing openpilot.h include, previously coming from flashfs_objlist
2013-03-03 14:33:02 +01:00
Stacey Sheldon
7726b9e2a9
logfs: use f3-safe slot and arena states for all chips
...
Filesystem magic value has been updated to deal with the
format change.
Conflicts:
flight/targets/board_hw_defs/discoveryf4/board_hw_defs.c
flight/targets/board_hw_defs/flyingf4/board_hw_defs.c
flight/targets/board_hw_defs/freedom/board_hw_defs.c
flight/targets/board_hw_defs/quanton/board_hw_defs.c
2013-03-03 14:33:01 +01:00
Stacey Sheldon
81059c41f7
flashfs: remove API dependency on uavobjmanager types
...
The flashfs layer is now entirely decoupled from the UAVO
data types. All UAVO related calls are now properly
contained within uavobjectmanager.c.
This will make the flashfs layer more portable as well as
more testable in a standalone environment. Eventually,
this layer could be used to store arbitrary files.
Also fixed all of the doxygen headers for the flashfs API.
2013-03-03 14:33:01 +01:00
Stacey Sheldon
bcb66764e2
logfs: use logfs on all targets that have serial flash
...
Conflicts:
flight/targets/FlyingF4/Makefile
flight/targets/FlyingF4/System/pios_board.c
flight/targets/Freedom/Makefile
flight/targets/Freedom/System/pios_board.c
flight/targets/Quanton/Makefile
flight/targets/Quanton/System/pios_board.c
flight/targets/board_hw_defs/flyingf4/board_hw_defs.c
flight/targets/board_hw_defs/freedom/board_hw_defs.c
flight/targets/board_hw_defs/quanton/board_hw_defs.c
2013-03-03 14:33:01 +01:00
Alessio Morale
5fdaccc1fa
sim_posix: unified inc files with the rest of PiOS .h, some dir moves/cleanup, fixed some compilation issues.
2013-03-03 09:50:20 +01:00
Corvus Corax
7642f44cad
Merge remote branch 'origin/corvuscorax/sanity_additions' into corvus/directory_and_sanity
...
Conflicts:
flight/Modules/FirmwareIAP/firmwareiap.c
flight/Modules/ManualControl/manualcontrol.c
flight/targets/SimPosix/Makefile
shared/uavobjectdefinition/systemalarms.xml
2013-02-03 14:57:54 +01:00
Stacey Sheldon
f500ac1e23
rename: move UAVObjects and UAVTalk directories under targets
2013-01-28 02:33:06 +02:00
Stacey Sheldon
dbcf440bb9
makefile: factor out paths for major flight components
...
Conflicts:
flight/targets/CopterControl/Makefile
2013-01-28 02:01:39 +02:00
Stacey Sheldon
69a2691bc2
rename: move board-specific dirs into flight/targets
...
Conflicts:
flight/targets/Bootloaders/Revolution/Makefile
flight/targets/CopterControl/Makefile
2013-01-28 01:52:44 +02:00