Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-28 01:53:48 +08:00
Code Issues Actions 30 Packages Projects Releases Wiki Activity

[sdlog] Make compatible with PX4FMU_2.4

Browse Source
This commit is contained in:
Michal Podhradsky
2017-02-17 10:59:06 -08:00
parent 5539bc81ac
commit 4e8bbbf7c0
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/modules/loggers/sdlog_chibios.c
+1 -1
View File
@@ -205,7 +205,7 @@ static void thd_startlog(void *arg)
chThdSleepMilliseconds (sdOk == true ? 1000 : 200); chThdSleepMilliseconds (sdOk == true ? 1000 : 200);
static uint32_t timestamp = 0; static uint32_t timestamp = 0;
#if HAL_USE_RTC #if HAL_USE_RTC && USE_GPS
// FIXME this could be done somewhere else, like in sys_time // FIXME this could be done somewhere else, like in sys_time
// we sync gps time to rtc every 5 seconds // we sync gps time to rtc every 5 seconds
if (chVTGetSystemTime() - timestamp > 5000) { if (chVTGetSystemTime() - timestamp > 5000) {
sw/airborne/modules/loggers/sdlog_chibios/usbStorage.c
+5
View File
@@ -223,7 +223,11 @@ const USBConfig usbConfig = {
/* Turns on a LED when there is I/O activity on the USB port */ /* Turns on a LED when there is I/O activity on the USB port */
static void usbActivity(bool active) static void usbActivity(bool active)
{ {
#ifdef GPIOC_LED4
palWritePad(GPIOC, GPIOC_LED4, active); palWritePad(GPIOC, GPIOC_LED4, active);
#else
(void)active;
#endif
} }
/* USB mass storage configuration */ /* USB mass storage configuration */
@@ -279,6 +283,7 @@ static void thdUsbStorage(void *arg)
// used via libopencm3, ISR are routed on pprz/opencm3 and cannot // used via libopencm3, ISR are routed on pprz/opencm3 and cannot
// be used concurrently by chibios api // be used concurrently by chibios api
// Should be fixed when using chibios-rt branch // Should be fixed when using chibios-rt branch
// FIXME: Is the comment still relevant?
while (!chThdShouldTerminateX() && antiBounce) { while (!chThdShouldTerminateX() && antiBounce) {
const bool usbConnected = palReadPad(GPIOA, GPIOA_OTG_FS_VBUS); const bool usbConnected = palReadPad(GPIOA, GPIOA_OTG_FS_VBUS);
if (usbConnected) { if (usbConnected) {