Alessio Morale
3ec9447fdc
OP-901 Update CMSIS to r3p2-00rel1
2013-05-18 20:29:06 +02:00
Oleg Semyonov
5274a6c6fa
OP-955: rename version_info related files an directories
2013-05-18 20:28:52 +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
bff47dfa0e
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 16:26:35 +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
Fredrik Arvidsson
62ee55fbb8
OP-955 Moved generated version info to its own lib. Updated code using version info in all referenced places.
2013-05-18 14:28:46 +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
c23ca3046b
Merge remote-tracking branch 'temp/amorale/usb_fixes' into amorale/OP-901_lib_udates-usb_fixes
2013-05-18 14:13:23 +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
Oleg Semyonov
76be45242c
OP-955: replace gcs_version_info.h by version_info.h and version_info.cpp
...
This commit breaks the build. Other files should be updated accordingly.
2013-05-17 21:44:11 +03: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
Fredrik Arvidsson
eedfb7081c
Merge remote-tracking branch 'origin/next' into thread/OP-935_Changes_Basic_Stab
2013-05-14 20:54:44 +02:00
Fredrik Arvidsson
d6d45a860e
Merge remote-tracking branch 'origin/next' into thread/OP-952_Scope_Polish
2013-05-14 19:48:15 +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
Fredrik Arvidsson
c4adede7ac
OP-952 Adds settings per scope-plot if to draw the plot anti-aliased. Default setting is true. Adds a fix to not render the plots when they are not visible. Saves CPU.
2013-05-13 21:24:19 +02:00
Fredrik Arvidsson
0bc589956b
OP-935 Removed a chewing gum that was stuck under the about dialog ;)
2013-05-12 16:00:02 +02:00
Fredrik Arvidsson
8b8dc916f2
Merge remote-tracking branch 'origin/next' into thread/OP-935_Changes_Basic_Stab
2013-05-12 15:44:37 +02:00
Fredrik Arvidsson
49af941813
OP-935 Sets the correct background color of some configuration pages.
2013-05-12 15:44:15 +02:00
Oleg Semyonov
b9601c3ad6
Add fake board name to display unit test names with make all_ut_run
2013-05-12 15:13:39 +03:00
Fredrik Arvidsson
9797471d05
Merge remote-tracking branch 'origin/next' into thread/OP-935_Changes_Basic_Stab
2013-05-12 11:55:30 +02:00