From 379a19c1b8f47dd67309a2d820dd0c711da8af4f Mon Sep 17 00:00:00 2001 From: Pavel Kirienko Date: Tue, 25 Mar 2014 21:10:19 +0400 Subject: [PATCH] DSDL definitions for file transfer support were removed. This functionality is certainly needed for the protocol, but it is not going to be implemented in the first order, so there is no point in keeping these (unfinished) types now. --- dsdl/uavcan/protocol/file/570.GetInfo.uavcan | 11 ----------- dsdl/uavcan/protocol/file/571.List.uavcan | 17 ----------------- dsdl/uavcan/protocol/file/572.Delete.uavcan | 9 --------- dsdl/uavcan/protocol/file/573.Read.uavcan | 15 --------------- .../protocol/file/574.BeginTransfer.uavcan | 11 ----------- .../file/575.BeginFirmwareUpdate.uavcan | 16 ---------------- dsdl/uavcan/protocol/file/Crc.uavcan | 6 ------ dsdl/uavcan/protocol/file/Errno.uavcan | 5 ----- dsdl/uavcan/protocol/file/Path.uavcan | 7 ------- .../dsdl_test/dsdl_uavcan_compilability.cpp | 9 --------- 10 files changed, 106 deletions(-) delete mode 100644 dsdl/uavcan/protocol/file/570.GetInfo.uavcan delete mode 100644 dsdl/uavcan/protocol/file/571.List.uavcan delete mode 100644 dsdl/uavcan/protocol/file/572.Delete.uavcan delete mode 100644 dsdl/uavcan/protocol/file/573.Read.uavcan delete mode 100644 dsdl/uavcan/protocol/file/574.BeginTransfer.uavcan delete mode 100644 dsdl/uavcan/protocol/file/575.BeginFirmwareUpdate.uavcan delete mode 100644 dsdl/uavcan/protocol/file/Crc.uavcan delete mode 100644 dsdl/uavcan/protocol/file/Errno.uavcan delete mode 100644 dsdl/uavcan/protocol/file/Path.uavcan diff --git a/dsdl/uavcan/protocol/file/570.GetInfo.uavcan b/dsdl/uavcan/protocol/file/570.GetInfo.uavcan deleted file mode 100644 index 3a7977fe76..0000000000 --- a/dsdl/uavcan/protocol/file/570.GetInfo.uavcan +++ /dev/null @@ -1,11 +0,0 @@ -# -# Remote file info. -# - -Path path - ---- - -Crc crc -int64 size -Errno result diff --git a/dsdl/uavcan/protocol/file/571.List.uavcan b/dsdl/uavcan/protocol/file/571.List.uavcan deleted file mode 100644 index 2c14a25e3c..0000000000 --- a/dsdl/uavcan/protocol/file/571.List.uavcan +++ /dev/null @@ -1,17 +0,0 @@ -# -# Remote directory contents. -# - -uint32 entry_index -Path directory_path - ---- - -Errno result - -uint4 ENTRY_TYPE_NONE = 0 -uint4 ENTRY_TYPE_FILE = 1 -uint4 ENTRY_TYPE_DIR = 2 -uint4 entry_type - -Path entry_abs_path diff --git a/dsdl/uavcan/protocol/file/572.Delete.uavcan b/dsdl/uavcan/protocol/file/572.Delete.uavcan deleted file mode 100644 index c972d381a0..0000000000 --- a/dsdl/uavcan/protocol/file/572.Delete.uavcan +++ /dev/null @@ -1,9 +0,0 @@ -# -# Remote file deletion request. -# - -Path path - ---- - -Errno result diff --git a/dsdl/uavcan/protocol/file/573.Read.uavcan b/dsdl/uavcan/protocol/file/573.Read.uavcan deleted file mode 100644 index 293d68868c..0000000000 --- a/dsdl/uavcan/protocol/file/573.Read.uavcan +++ /dev/null @@ -1,15 +0,0 @@ -# -# Read contents of the file from a remote node. -# Use cases: Firmware update, log download. -# - -int64 offset -Path path - ---- - -Errno result - -# Empty data means the offset is out of file boundaries. -# Non-empty data means the end of file is not reached yet, even if the length is less than max. -truncated uint8[<256] data diff --git a/dsdl/uavcan/protocol/file/574.BeginTransfer.uavcan b/dsdl/uavcan/protocol/file/574.BeginTransfer.uavcan deleted file mode 100644 index ac2f5c6a61..0000000000 --- a/dsdl/uavcan/protocol/file/574.BeginTransfer.uavcan +++ /dev/null @@ -1,11 +0,0 @@ -# -# Initiates file transfer between two nodes. -# Use cases: Configuration file replacement, executable update. -# - -Path src # On the requesting node -Path dst # On the serving node - ---- - -Errno result diff --git a/dsdl/uavcan/protocol/file/575.BeginFirmwareUpdate.uavcan b/dsdl/uavcan/protocol/file/575.BeginFirmwareUpdate.uavcan deleted file mode 100644 index 4aa260966f..0000000000 --- a/dsdl/uavcan/protocol/file/575.BeginFirmwareUpdate.uavcan +++ /dev/null @@ -1,16 +0,0 @@ -# -# This service initiates the firmware update procedure. -# -# Nodes are allowed to explicitly reject this request under some circumstances -# (e.g. ESC should reject this if the motor is running). -# -# If the node accepts the request, initiator will get the response immediately, -# before the update process actually begins. -# - -Path image_file_remote_path - ---- - -Errno result -uint8[<64] error_message diff --git a/dsdl/uavcan/protocol/file/Crc.uavcan b/dsdl/uavcan/protocol/file/Crc.uavcan deleted file mode 100644 index d1e57fd542..0000000000 --- a/dsdl/uavcan/protocol/file/Crc.uavcan +++ /dev/null @@ -1,6 +0,0 @@ -# -# File CRC. -# Algorithm: CRC-64-WE. -# - -uint64 value diff --git a/dsdl/uavcan/protocol/file/Errno.uavcan b/dsdl/uavcan/protocol/file/Errno.uavcan deleted file mode 100644 index 8c8e5c2af2..0000000000 --- a/dsdl/uavcan/protocol/file/Errno.uavcan +++ /dev/null @@ -1,5 +0,0 @@ -# -# File operation result - UNIX errno. -# - -int16 value diff --git a/dsdl/uavcan/protocol/file/Path.uavcan b/dsdl/uavcan/protocol/file/Path.uavcan deleted file mode 100644 index 27b1558a25..0000000000 --- a/dsdl/uavcan/protocol/file/Path.uavcan +++ /dev/null @@ -1,7 +0,0 @@ -# -# Encoded FS path (ASCII/UTF8). -# - -uint8 SEPARATOR = 47 # ASCII '/' - -uint8[<128] value diff --git a/libuavcan/test/dsdl_test/dsdl_uavcan_compilability.cpp b/libuavcan/test/dsdl_test/dsdl_uavcan_compilability.cpp index ddc7524979..d8b0e05e74 100644 --- a/libuavcan/test/dsdl_test/dsdl_uavcan_compilability.cpp +++ b/libuavcan/test/dsdl_test/dsdl_uavcan_compilability.cpp @@ -20,15 +20,6 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include