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
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
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
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)
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
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
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
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
Oleg Semyonov
e5970ed25d
logfs: fix unit tests (requires MIN declaration from pios_math.h)
2013-05-12 03:51:00 +03:00
Alessio Morale
511283c608
Flash internal: writes optimization using 4 bytes parallelism
2013-05-11 22:04:47 +02:00
Richard Flay (Hyper)
04f59d5910
OP-950: Adds "higher priority task woken" logic to SPI and SPI bus resident
...
sensor device drivers. Based partly on code contributed by lilvinz.
+review OPReview
2013-05-11 16:18:34 +09:30
Corvus Corax
b76df471ee
bugfix on revo proto. STM32F4 A revision has a hardware bug and cannot do flash prefetching properly
2013-05-10 19:53:51 +02:00
Werner Backes
7c9d2ce9a5
Merge branch 'D-Lite/OP-934_rfm22b_rcvr_timeout_handling_next' into next
2013-05-10 09:59:30 +02:00
Richard Flay (Hyper)
cf14608ebe
Merge branch 'next' into hyper/OP-936_task-monitor-rework
2013-05-09 19:25:02 +09:30
Stacey Sheldon
8ab50bca13
flashfs: use uintptr_t instead of uint32_t in flashfs API
2013-05-08 19:42:01 +02:00
Stacey Sheldon
99e61dd617
logfs: support multiple instances of logfs
...
Conflicts:
flight/pios/common/pios_flashfs_logfs.c
flight/pios/inc/pios_flashfs_logfs_priv.h
flight/tests/logfs/pios.h
flight/tests/logfs/pios_config.h
flight/tests/logfs/unittest.cpp
2013-05-08 19:28:11 +02:00
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
Werner Backes
938ed58918
Corrected timout calculation formula.
2013-05-06 14:20:53 +02:00
Werner Backes
bb87e6390e
Update ppm_fresh if we receive a new PPM packet in order to keep the
...
rfm22b receiver supervisor happy.
2013-05-06 12:00:58 +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
Werner Backes
0005d643ca
Merge branch 'D-Lite/OP-934_rfm22b_rcvr_timeout_handling' into D-Lite/OP-934_rfm22b_rcvr_timeout_handling_next
2013-05-06 08:23:22 +02:00
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
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
Brian Webb
dc4455ff68
OP-932: Fixes a bug that was preventing setting of Tx power on remote modem.
2013-05-04 17:24:40 +01:00
Brian Webb
57552f4cc9
OP-932: Changed the clock syncronization to happen only on packts transmitted from the coordinator to the remote modem. The Tx finished time of the previous packet is now sent in the packet header. This is compared to the Rx complete time of that packet on the remote modem to calcualte the difference between two modems. This eliminates the need for ACKing, so ACKs were removed for PPM and status packet.
2013-05-04 16:50:08 +01:00
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
33cb06b1b0
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into OP-932-Modularize_Radio_Driver
2013-05-04 01:30:01 +01:00
Oleg Semyonov
137ddbf73a
Fix broken unit tests
2013-05-03 20:27:03 +02:00
Oleg Semyonov
7aa59f4573
pios.h: only include STM32xxx.h if particular STM32 MCU is defined
2013-05-03 20:25:48 +02:00
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
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
Werner Backes
b48665e59b
rfm22b receiver supervisor now properly indicates a timeout condition.
...
This allows upper layers to recognize control signal loss.
2013-05-02 12:57:00 +02:00
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
Brian Webb
d8b09f132f
OP-932: Removes requirement to ACK PPM packets.
2013-05-01 15:28:33 +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
Brian Webb
8c763c8ed3
OP-932: Improves the timing of channel changes on the radio device.
2013-05-01 14:37:47 +01:00
Oleg Semyonov
654dd051c7
Merge remote-tracking branch 'origin/next' into os/debug-pins
2013-05-01 11:13:30 +02:00
Brian Webb
a7d606dfe9
OP-932: Syncronize start of transmissions using the same coordinated clock as used by FHSS.
2013-05-01 03:46:46 +01:00
Brian Webb
2201d9d2bb
OP-932: Continued cleanup and modularization of radio code. Also fixed a bug that held the SPI lock when an error occured in an Rx.
2013-05-01 03:14:35 +01:00
Brian Webb
ef18319306
OP-932: Continued cleanup and modularization of the RFM22B radio code. Low-level radio driver has mostly been split out of the higher-level state machine.
2013-05-01 03:14:23 +01:00
Brian Webb
94cb92f410
OP-932: Additional restructuring of radio code.
2013-05-01 03:14:11 +01:00