Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-09 22:49:53 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

SPI SD Logger: download over other serial link (#2632)

Browse Source 
* Make sd logger listen to settings on download port

* Improve compilation conditions for download port listener

* Rename SDLOGGER_DOWNLINK_DEVICE to DOWNLOAD_DEVICE

Co-authored-by: Tom van Dijk <tomvand@users.noreply.github.com>
This commit is contained in:
Tom van Dijk
2021-01-11 14:13:29 +01:00
committed by GitHub
parent 26cde5c700
commit da8818b090
2 changed files with 66 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/modules/logger_sd_spi_direct.xml
+6 -5
View File
@@ -24,7 +24,7 @@ Downloading of the data occurs over the configured serial device using sw/logali
<configure name="SDLOGGER_DIRECT_SPI_SLAVE" value="SPI_SLAVE1|SPI_SLAVE2|SPI_SLAVE3|SPI_SLAVE4|SPI_SLAVE5|SPI_SLAVE6" description="Port to which the SD Card is connected."/>
<configure name="SDLOGGER_DIRECT_CONTROL_SWITCH" value="RADIO_AUX2"/>
<define name="SDLOGGER_ON_ARM" value="TRUE" description="Start/stop SD logger with motor arming"/>
<configure name="SDLOGGER_DOWNLINK_DEVICE" value="DOWNLINK_DEVICE|uartX|usb_serial|..." description="Note: case sensitive!"/>
<configure name="SDLOGGER_DOWNLOAD_DEVICE" value="DOWNLINK_DEVICE|uartX|usb_serial|..." description="Note: case sensitive!"/>
<configure name="LOGGER_LED" value="none"/>
</doc>
<settings>
@@ -63,10 +63,11 @@ Downloading of the data occurs over the configured serial device using sw/logali
<define name="USE_$(SDLOGGER_DIRECT_SPI_SLAVE_UPPER)" value="1" />
<define name="SDLOGGER_SPI_LINK_SLAVE_NUMBER" value="$(SDLOGGER_DIRECT_SPI_SLAVE_UPPER)" />
<configure name="SDLOGGER_DOWNLINK_DEVICE" default="DOWNLINK_DEVICE" case="upper"/>
<define name="SDLOGGER_DOWNLINK_DEVICE" value="$(SDLOGGER_DOWNLINK_DEVICE)"/>
<define name="USE_$(SDLOGGER_DOWNLINK_DEVICE_UPPER)" cond="ifneq ($(SDLOGGER_DOWNLINK_DEVICE_UPPER),DOWNLINK_DEVICE)"/>
<file_arch name="usb_ser_hw.c" dir="." cond="ifeq ($(SDLOGGER_DOWNLINK_DEVICE_UPPER),USB_SERIAL)"/>
<configure name="SDLOGGER_DOWNLOAD_DEVICE" default="DOWNLINK_DEVICE" case="upper"/>
<define name="SDLOGGER_DOWNLOAD_DEVICE" value="$(SDLOGGER_DOWNLOAD_DEVICE)"/>
<define name="USE_$(SDLOGGER_DOWNLOAD_DEVICE_UPPER)" cond="ifneq ($(SDLOGGER_DOWNLOAD_DEVICE_UPPER),DOWNLINK_DEVICE)"/>
<file_arch name="usb_ser_hw.c" dir="." cond="ifeq ($(SDLOGGER_DOWNLOAD_DEVICE_UPPER),USB_SERIAL)"/>
<define name="SDLOGGER_DOWNLOAD_DEVICE_LISTEN" cond="ifneq ($(SDLOGGER_DOWNLOAD_DEVICE_UPPER),DOWNLINK_DEVICE)"/>
</makefile>
</module>
sw/airborne/modules/loggers/sdlogger_spi_direct.c
+60 -6
View File
@@ -35,6 +35,8 @@
#include "subsystems/datalink/telemetry.h"
#include "led.h"
#include <stdbool.h>
#if SDLOGGER_ON_ARM
#include "autopilot.h"
#endif
@@ -58,10 +60,57 @@
#error "You need to use a telemetry xml file with Logger process!"
#endif
#ifndef SDLOGGER_DOWNLINK_DEVICE
#ifndef SDLOGGER_DOWNLOAD_DEVICE
#error No downlink device defined for SD Logger
#endif
#ifdef SDLOGGER_DOWNLOAD_DEVICE_LISTEN
// Listen for setting commands on download port
#include "pprzlink/dl_protocol.h"
#include "generated/settings.h"
#include <string.h>
PRINT_CONFIG_MSG("Listening to SETTING on SD logger download port.");
static struct download_port_t {
struct link_device *device;
struct pprz_transport transport;
bool msg_available;
uint8_t msg_buf[256];
} download_port;
static void sdlogger_spi_direct_download_port_init(void) {
download_port.device = &((SDLOGGER_DOWNLOAD_DEVICE).device);
pprz_transport_init(&download_port.transport);
}
static void sdlogger_spi_direct_download_port_parse_msg(void) {
switch (IdOfPprzMsg(download_port.msg_buf)) {
case DL_SETTING: {
uint8_t index = DL_SETTING_index(download_port.msg_buf);
uint8_t ac_id = DL_SETTING_ac_id(download_port.msg_buf);
float value = DL_SETTING_value(download_port.msg_buf);
if (ac_id == AC_ID) {
DlSetting(index, value);
pprz_msg_send_DL_VALUE(&download_port.transport.trans_tx, download_port.device, AC_ID, &index, &value);
sdlogger_spi_direct_command();
}
break; }
default:
break;
}
}
static void sdlogger_spi_direct_download_port_periodic(void) {
pprz_check_and_parse(download_port.device, &download_port.transport, download_port.msg_buf, &download_port.msg_available);
if (download_port.msg_available) {
sdlogger_spi_direct_download_port_parse_msg();
download_port.msg_available = false;
}
}
#endif // SDLOGGER_DOWNLOAD_DEVICE_LISTEN
struct sdlogger_spi_periph sdlogger_spi;
/**
@@ -101,6 +150,9 @@ void sdlogger_spi_direct_init(void)
sdlogger_spi.device.get_byte = (get_byte_t)sdlogger_spi_direct_get_byte;
sdlogger_spi.device.periph = &sdlogger_spi;
#ifdef SDLOGGER_DOWNLOAD_DEVICE_LISTEN
sdlogger_spi_direct_download_port_init();
#endif
}
/**
@@ -109,6 +161,10 @@ void sdlogger_spi_direct_init(void)
*/
void sdlogger_spi_direct_periodic(void)
{
#ifdef SDLOGGER_DOWNLOAD_DEVICE_LISTEN
sdlogger_spi_direct_download_port_periodic();
#endif
sdcard_spi_periodic(&sdcard1);
#if SDLOGGER_ON_ARM
@@ -193,8 +249,8 @@ void sdlogger_spi_direct_periodic(void)
long fd = 0;
uint16_t chunk_size = 64;
for (uint16_t i = sdlogger_spi.sdcard_buf_idx; i < SD_BLOCK_SIZE && chunk_size > 0; i++, chunk_size--) {
if ((SDLOGGER_DOWNLINK_DEVICE).device.check_free_space(&(SDLOGGER_DOWNLINK_DEVICE), &fd, 1)) {
(SDLOGGER_DOWNLINK_DEVICE).device.put_byte(&(SDLOGGER_DOWNLINK_DEVICE), fd, sdcard1.input_buf[i]);
if ((SDLOGGER_DOWNLOAD_DEVICE).device.check_free_space(&(SDLOGGER_DOWNLOAD_DEVICE), &fd, 1)) {
(SDLOGGER_DOWNLOAD_DEVICE).device.put_byte(&(SDLOGGER_DOWNLOAD_DEVICE), fd, sdcard1.input_buf[i]);
} else {
/* No free space left, abort for-loop */
break;
@@ -203,7 +259,7 @@ void sdlogger_spi_direct_periodic(void)
}
/* Request next block if entire buffer was written to uart */
if (sdlogger_spi.sdcard_buf_idx >= SD_BLOCK_SIZE) {
(SDLOGGER_DOWNLINK_DEVICE).device.send_message(&(SDLOGGER_DOWNLINK_DEVICE), fd); // Flush buffers
(SDLOGGER_DOWNLOAD_DEVICE).device.send_message(&(SDLOGGER_DOWNLOAD_DEVICE), fd); // Flush buffers
if (sdlogger_spi.download_length > 0) {
sdcard_spi_read_block(&sdcard1, sdlogger_spi.download_address, NULL);
sdlogger_spi.download_address++;
@@ -419,5 +475,3 @@ uint8_t sdlogger_spi_direct_get_byte(void *p)
return 0;
}