Alessio Morale
107b930573
Merge remote-tracking branch 'origin/amorale/OP-980_revolution_usb_reconnect' into next
2013-06-09 09:07:24 +02:00
Alessio Morale
59eaf01089
OP-990 Change initial delay before calibration to 4 seconds to allow to put the craft on the ground after battery connection
...
+review OPReview-505
2013-06-09 08:59:35 +02:00
Alessio Morale
cea6496866
OP-995: Cleanup of Battery Module
2013-06-08 13:53:19 +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
51a7f27b99
OP-994 Add an API to PIOS_ADC to get directly the Voltage value
2013-06-08 13:36:54 +02:00
Alessio Morale
6671a404ca
OP-994 Refactor/Cleanup of cpu temp measurement
2013-06-08 13:36:18 +02:00
Alessio Morale
7a6b5c5681
OP-990 Fixed the main cause of wrong bias calculation:
...
The initial bias calculation done between 1 and 7 seconds
since power on was completely skipped due to a wrong condition.
2013-06-08 13:10:23 +02:00
Alessio Morale
3ad123718e
Revert "OP-990 zeroed the rollpitch bias rate at startup and incremented at arming."
...
This reverts commit c0b926a2d5
.
2013-06-08 13:10:23 +02:00
Corvus Corax
f79c227def
Merge branch 'corvuscorax/uavobjmanagerfix' into corvuscorax/OP-947_stateestimator-module
2013-06-06 22:41:31 +02:00
Corvus Corax
115b991f86
Bugfix in UAVObjectmanager. LoadFromFile() is not allowed to use GetByID since its called from Register, where the uavobject is not registered yet.
2013-06-06 21:22:17 +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
fcc3f519d8
filterekf: Remember critical divergence and set error flag to prevent (re)arming so the user will notice
2013-06-06 17:59:27 +02:00
Corvus Corax
b0db191703
Divide mag variance by Be squared to cope with normalization correctly
2013-06-06 17:54:59 +02:00
Alessio Morale
ee7887c406
OP-980 Extended the memory barrier macros and fixed barrier kind in pios_usb_hid
...
+review OPReview-501
2013-06-06 10:26:41 +02:00
Mathieu Rondonneau
45391abd55
OP-976: RE-run uncrustify
2013-06-05 19:48:56 -07:00
Mathieu Rondonneau
a8c946dcb2
OP-976: Fix uncrustify changes that put a space before the ";" in the macro
2013-06-05 19:46:55 -07:00
Mathieu Rondonneau
89273146df
Merge branch 'next' into Mathieu/OP-976_module_macro
2013-06-05 19:17:54 -07:00
Mathieu Rondonneau
d2fae1abed
OP-976: fixing function name in the macro although don't have any effect since the linker directives are local.
2013-06-05 19:15:47 -07:00
Alessio Morale
c340bfc294
OP-980 Insert locking while checking status in PIOS_USB_CheckAvailable
...
+review OPReview-501
2013-06-06 01:42:26 +02:00
Alessio Morale
5fa73624da
OP-980 Added memory barrier to preserve sequence to ensure callback validation
...
+review OPReview-501
2013-06-06 01:39:45 +02:00
Corvus Corax
bab95e7ca8
check variances for validity and reinitialize if invalid
2013-06-06 00:07:11 +02:00
Corvus Corax
f22a0d299e
EKF: Averaging term for dT
...
- prevent scheduling jitter from screwing with the filter while keeping dT accurate
2013-06-06 00:06:12 +02:00
Alessio Morale
c0b926a2d5
OP-990 zeroed the rollpitch bias rate at startup and incremented at arming.
2013-06-05 22:19:20 +02:00
Corvus Corax
6f6ca2481e
Changed CoordinateConversion to use doubles for LLA2NED conversion, so coordinates can be represented in ECEF with sufficient resolution
2013-06-05 20:40:49 +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
Alessio Morale
b4f8b02a42
Revert "some optimizations, use real rx and tx buffer size instead of max buffer leghts"
...
It does not work in Windows so need further investigation prior to undo this revert
This reverts commit 901db6f828
.
+review OPReview-501
2013-06-05 19:01:01 +02:00
Corvus Corax
dc68d7d94e
changed insgps, removed unnecessary gain representation
2013-06-05 17:52:49 +02:00
Brian Webb
f9706132f7
Fixed setting of timestampLength in UAVTalk parsing when the UAVObject is not initialize in the firmware. This mostly affects the OPLink, which doesn't initialize most of the UAVObjects, but does need to parse them.
2013-06-04 20:37:51 -07:00
Alessio Morale
8fb81ae17b
OP-980 uncrustify
...
+review OPReview-501
2013-06-05 01:02:37 +02:00
Alessio Morale
f1f48b0ec6
OP-980 Fix usb reconnection issue for Revolution target.
...
step 3: add a timeout on rx_active to prevent rx locks
2013-06-05 00:54:08 +02:00
Alessio Morale
901db6f828
some optimizations, use real rx and tx buffer size instead of max buffer leghts
2013-06-05 00:53:50 +02:00
Alessio Morale
ce2bce353f
OP-980 Fix usb reconnection issue for Revolution target.
...
step 2: check for cable disconnection (vbus) and issue a SW reconnection
2013-06-05 00:04:26 +02:00
Mathieu Rondonneau
23b2907d08
OP-976: Add the ';' back
...
This compile successfuly with make all_flight
2013-06-03 20:37:40 -07:00
Alessio Morale
14b87383b9
OP-980 Fix usb reconnection issue for Revolution target.
...
step 1: reset tx/rx_active flags on disconnection/reconnection
2013-06-04 01:52:44 +02:00
Alessio Morale
cfe057c573
OP-988 Raise SYSTEMALARMS_ALARM_CRITICAL when no gps port is configured, the same alarm as no gps case.
...
+review OPReview
2013-06-03 20:30:41 +02:00
Oleg Semyonov
65c463bf03
Update Windows USB driver file
2013-06-03 16:39:41 +03:00
Richard Flay (Hyper)
8c494dce00
OP-982: Further updates to Strings in response to review feedback.
...
+review OPReview-493
2013-06-02 18:43:37 +09:30
Richard Flay (Hyper)
3e6389d9b6
OP-982: Updates to spacing and Strings in response to review feedback.
...
+review OPReview-493
2013-06-02 18:11:04 +09:30
Richard Flay (Hyper)
35b580a34e
OP-982: Adds Revolution related entries to OpenPilot-CDC.inf for Windows.
...
+review OPReview
2013-06-02 08:44:54 +09:30
Corvus Corax
6435604182
some fixes and corrections as suggested in review
2013-05-29 22:18:08 +02:00
Corvus Corax
e82a52e8ff
filterekf: changed mag variance to 1/1000000 to compensate for normalization, as it was done on old AHRS
2013-05-29 22:02:39 +02:00
Alessio Morale
6b2218d1df
Merge remote-tracking branch 'origin/amorale/OP-925_Cyr_patches_for_revo_cf' into next
2013-05-28 18:39:42 +02:00
Alessio Morale
a286a20cb0
OP-925 Changed dT to comply with revo sensor rate
...
+review OPReview-484
2013-05-27 21:05:39 +02:00
Fredrik Arvidsson
d9d2b7d167
Merge remote-tracking branch 'origin/os/OP-770_version_info_stuff' into thread/OP-770_UAV_Export_Version_Info_Fix
2013-05-27 19:30:18 +02:00
Brian Webb
50162333d8
Merge remote-tracking branch 'origin/dankers/minor-modem-renames' into next
2013-05-27 09:44:17 -07:00
Brian Webb
16b787179c
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2013-05-26 08:37:05 -07:00
Brian Webb
e9f83bcc80
Fixes a bug in the rfm22b driver that was reading past the end of the bindings list when receiving a status message. Also adds some formatting changes that came about after doing a make uncrustify_all.
2013-05-26 08:36:38 -07:00
Alessio Morale
9bfce1bcd6
Merge remote-tracking branch 'origin/amorale/OP-925_Cyr_patches_for_revo_cf' into next
2013-05-26 16:18:05 +02: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
Oleg Semyonov
444431579e
OP-770: add/rename some version-info.py template variables
2013-05-25 23:02:29 +02:00
Corvus Corax
7bf58f09c5
filterekf gyro bias adjustment bugfix
2013-05-25 16:18:18 +02:00
Brian Webb
4036e95bd5
Merge remote-tracking branch 'origin/next' into OP-932-Modularize_Radio_Driver
2013-05-25 06:56:13 -07:00
Corvus Corax
6c25e82633
fixed bugs in GPS, corrected zeroing of updated flags in stateestimation
2013-05-25 12:28:32 +02:00
Richard Flay (Hyper)
bd538703ea
OP-962: Tweaked C2U_STACK_SIZE_BYTES to be a multiple of 4.
...
+review OPReview-480
2013-05-25 17:10:41 +09:30
Corvus Corax
87b1b4873c
bugfix in baro alt filter plugin
2013-05-25 02:02:53 +02:00
Corvus Corax
902bf29c92
some small bugfixes to filterekf
2013-05-25 00:05:06 +02:00
Corvus Corax
b916df5448
ported cyr's patch to new CF
2013-05-24 23:59:12 +02:00
Corvus Corax
259eeecbbc
Put Macros in StateEstimation into the file header after request in review.
...
Author expresses concernes about the code readability in this layout
(Commit message edited, was: "HATE THIS")
2013-05-24 19:19:40 +02:00
Corvus Corax
40864b2d3b
some cleanups
2013-05-23 21:21:14 +02:00
Alessio Morale
711f1ad35b
Fix indentation
2013-05-23 00:47:38 +02:00
Corvus Corax
53ba3f4b74
removed GPS check from ekf and put into GPS
2013-05-22 23:20:31 +02:00
Alessio Morale
697874b315
Port of OP-754 On Revo. Fixed signs on bias calculation. Added rate zeroing at startup to yaw
2013-05-22 23:17:09 +02:00
Corvus Corax
843db63cf6
some last issues from review
2013-05-22 23:08:48 +02: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
Corvus Corax
8fe159c457
some changes...
2013-05-22 19:05:28 +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
Brian Webb
dbce08a151
OP-932 Changes the radio task loop to loop every 1ms, and reduces the tx transmit period back down to 8ms. Also reduces the Tx windows to 1ms for each modem, and reserves the latter half of the Tx window for channel changing.
2013-05-21 17:40:05 -07:00
Alessio Morale
294a295510
Port CF patch from Cyr that filters accel to reduce attitude drift due to vibrations
2013-05-22 00:55:10 +02:00
Alessio Morale
0b5a28f19e
Port OP-754 to Revolution attitude estimation module: subtract GyroBIAS to work on raw value
...
Added MagKp and MagKi to AttitudeSetting UAVO
2013-05-21 23:44:12 +02:00
a*morale
464d2be9f7
Port OP-754 to Revolution attitude estimation module
2013-05-21 22:40:35 +02:00
Corvus Corax
ecc4a529a3
some fixes to filtercf and stateestimation and filterekf - Thanks Werner for help :-)
2013-05-21 20:06:33 +02:00
Brian Webb
d4a4588011
OP-932 Changes the RFM22 frequency hopping to change channels every Tx period. Also increases the Tx clock period from 8ms to 16ms, and adds a check on calculation the the time delta that it doesn't change the previous estimated time delta by too much. If the delta between the current time delta and the previously estimated time delta is too large it could indicate that there was a delay somewhere that makes the calculated time delta inaccurate.
...
Rearanges the packet send priority in the rfm22b driver so that PPM packets are top priority.
2013-05-20 20:49:24 -07:00
Alessio Morale
8e7e7e052a
OP-962 Fix Stack size for ComUSBBridge
...
+review OPReview
2013-05-21 00:45:45 +02:00
Corvus Corax
3dda543608
Merge branch 'corvuscorax/OP-946_refaktor_sensor_and_state' into corvuscorax/OP-947_stateestimator-module
2013-05-20 20:53:46 +02:00
Corvus Corax
fb433a97d7
Bugfix: add gyro bias to correct axis
2013-05-20 20:52:45 +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
a04b76f836
some bugfixes to make it boot on revo
2013-05-20 20:25:20 +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
a286cc6b24
update settings during initialisation only
2013-05-20 15:28:18 +02:00
Corvus Corax
a03f87efb5
Complementary filter added
2013-05-20 15:04:36 +02:00
Corvus Corax
741c70cda4
barometric bias filter added
2013-05-20 12:56:40 +02:00
Corvus Corax
7ea258a895
airspeed filter added
2013-05-20 12:45:39 +02:00
Corvus Corax
2f082dbf87
added filter for magnetometer bias drift compensation
2013-05-20 11:24:57 +02:00
Corvus Corax
1bd9cdafab
added missing attitude state variable ;)
2013-05-20 10:43:40 +02:00
Corvus Corax
34294d2635
Magneto to Mag fix
2013-05-20 10:35:54 +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
Oleg Semyonov
0798d8e330
OP-891: move firmware_info template under flight directory
2013-05-20 01:12:45 +03:00
Corvus Corax
46e7d2121f
fake filter for stationary position data added
2013-05-19 22:49:11 +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
b62c758831
statefilter main file almost complete, time to start work on filter classes
2013-05-19 22:24:12 +02:00
Corvus Corax
2ab9f938c9
ongoing dev work, incomplete
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
Alessio Morale
37eabb0931
Pointed type is explicitly used with sizeof when dealing with struct pointers.
...
+review OPReview-474
2013-05-19 12:00:16 +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
39cde8947c
removed forgotten commented out code
2013-05-18 22:19:22 +02:00
Corvus Corax
9c3a8369cd
OP-946: State And Sensor Refaktoring: Moved Filtering for Magnetometers, Gyros and Accels into Attitude
2013-05-18 21:55:47 +02:00
Alessio Morale
2e458b5652
OP-901 USB OTG/Device Drivers are not targeted for f103 (they are targeted at f105) so move again to F4 library folder instead of common
2013-05-18 20:53:28 +02:00
Alessio Morale
3ec9447fdc
OP-901 Update CMSIS to r3p2-00rel1
2013-05-18 20:29:06 +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
Alessio Morale
aba64689a6
OP-901 removed stale core_cm3.c file
2013-05-18 14:25:37 +02:00
Corvus Corax
80caceb984
make uncrustify_all;make uncrustify_all;
2013-05-18 14:17:26 +02:00
Alessio Morale
976ad90211
OP-901 Updated F4 CMSIS startup files, Moved USB OTG and USB Device library to common
2013-05-18 14:03:03 +02:00
Alessio Morale
f0c01d0eff
OP-901 Updated F4 StdPeriph Driver Library to V1.1.0
2013-05-18 13:57:45 +02:00
Alessio Morale
448e98b336
OP-901 Updated F1 StdPeriph Driver Library to v3.5.0
2013-05-18 13:55:43 +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
09e241e8bd
OP-901 removed old stale files in PiOS folder
2013-05-18 00:25:07 +02:00
Alessio Morale
67e41c34fc
Merge remote-tracking branch 'origin/next' into amorale/usb_fixes
2013-05-17 22:46:42 +02:00
Alessio Morale
2735f8a620
OP-901 Updated common CMSIS files
2013-05-17 22:41:34 +02:00
Alessio Morale
13ee42a42a
OP-901 Fixed errors due to unused parameter
2013-05-17 22:39:16 +02:00
Alessio Morale
a7460bfd3c
OP-954 Fixes for UT
...
+review OPReview-470
2013-05-17 21:51:12 +02:00
Corvus Corax
e0de2083af
Merge branch 'next' into corvuscorax/OP-944_EKF-improvements
...
Conflicts:
flight/libraries/insgps13state.c
2013-05-16 23:29:15 +02:00
Corvus Corax
667f46ceb1
removed non ASCII characters in comment line
2013-05-16 23:21:32 +02:00
Richard Flay (Hyper)
a6aedee9fa
Merge branch 'next' into brian/support_inverted_USB_vsense
2013-05-17 05:54:42 +09:30
Richard Flay (Hyper)
031ea3e069
Merge branch 'next' into brian/code_cleanup_130514
2013-05-17 05:49:38 +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
Richard Flay (Hyper)
ae14c13195
Merge branch 'next' into hyper/OP-951_add--Wshadow-to-flight-CFLAGS
...
Conflicts:
flight/modules/ManualControl/manualcontrol.c
2013-05-16 06:28:56 +09:30
Richard Flay (Hyper)
9572a156ce
Merge branch 'next' into corvuscorax/o3fixes
2013-05-16 05:56:45 +09:30
Richard Flay (Hyper)
ef5bb6f6fe
Merge branch 'next' into OP-950_spi_fixes_FreeRTOS
2013-05-16 05:41:09 +09:30
Brian Webb
156109bb88
Added support for an active low USB vsense line.
2013-05-14 20:37:13 -07:00
Brian Webb
1608d11416
Cleans up some compiler warnings/erros and adds missing ifdefs around some e.g. WDG calls.
2013-05-14 20:22:54 -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
Stacey Sheldon
280f537644
f4 usb: ensure that we NAK on unused OUT endpoints
...
The ST USB code will automatically receive on any
endpoint that is opened but not in the NAK state.
Make sure we set OUT endpoints to NAK initially.
It also happily writes via a NULL pointer in ep->xfer_buff
which writes to address 0x0000_0000. Since address
0x0 is aliased onto the internal flash by the BOOT0/1 pins
and the internal flash is (normally) in the LOCKED state,
this write puts the internal flash into an errored state.
This errored state means that writes to internal flash
are no longer allowed and all further writes fail.
2013-05-14 23:50:17 +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
sambas
da23fd6784
Added F1 internal flash driver
...
Conflicts:
flight/pios/stm32f10x/pios_flash_internal.c
Conflicts:
flight/pios/stm32f10x/pios_flash_internal.c
2013-05-14 22:56:12 +02:00
Alessio Morale
707e648457
OP-905: Fixes. Prevent LogFS from triggering watchdog
2013-05-14 18:43:39 +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
ff16dd03e7
Merge branch 'amorale/OP-938_ah_improvements' into next
...
Conflicts:
flight/modules/AltitudeHold/altitudehold.c
flight/modules/ManualControl/manualcontrol.c
2013-05-13 23:30:46 +02:00