diff --git a/README.md b/README.md index a4d47ad..b54c8da 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,6 @@ DroneCAN DSDL definitions This repository contains the DSDL definitions of the standard DroneCAN messages and services. -This DSDL is based on UAVCAN-v0 +This DSDL is originally based on UAVCAN-v0, but was forked Oct 2021. * [**DroneCAN website**](http://dronecan.org) diff --git a/ardupilot/README.md b/ardupilot/README.md index d3eeb37..a910041 100644 --- a/ardupilot/README.md +++ b/ardupilot/README.md @@ -1,8 +1,8 @@ This directory contains the DSDL for the ArduPilot vendor specific -UAVCAN messages. +DroneCAN messages. For service messages we use IDs starting at 200 For non-service messages we use IDs starting at 20000 -https://uavcan.org/Specification/5._Application_level_conventions/#id-distribution +https://dronecan.org/Specification/5._Application_level_conventions/#id-distribution diff --git a/ardupilot/equipment/power/20004.BatteryInfoAux.uavcan b/ardupilot/equipment/power/20004.BatteryInfoAux.dronecan similarity index 92% rename from ardupilot/equipment/power/20004.BatteryInfoAux.uavcan rename to ardupilot/equipment/power/20004.BatteryInfoAux.dronecan index 9cb4f73..5ab23e1 100644 --- a/ardupilot/equipment/power/20004.BatteryInfoAux.uavcan +++ b/ardupilot/equipment/power/20004.BatteryInfoAux.dronecan @@ -1,11 +1,11 @@ # # Auxilary Single battery info. # -# This message is to be used in conjunction with uavcan/equipment/power/1092.BatteryInfo.uavcan +# This message is to be used in conjunction with dronecan/equipment/power/1092.BatteryInfo.dronecan # Please ensure that this message is sent before the BatteryInfo which doesn't # include the timestamp. The following fields should contain the timestamp of the last current measurement. -uavcan.Timestamp timestamp +dronecan.Timestamp timestamp # Battery individual cell voltages # length of following field also used as cell count diff --git a/ardupilot/equipment/trafficmonitor/20790.TrafficReport.uavcan b/ardupilot/equipment/trafficmonitor/20790.TrafficReport.dronecan similarity index 98% rename from ardupilot/equipment/trafficmonitor/20790.TrafficReport.uavcan rename to ardupilot/equipment/trafficmonitor/20790.TrafficReport.dronecan index 281b309..63c8e77 100644 --- a/ardupilot/equipment/trafficmonitor/20790.TrafficReport.uavcan +++ b/ardupilot/equipment/trafficmonitor/20790.TrafficReport.dronecan @@ -1,5 +1,5 @@ # Network-synchronized timestamp, 0 if not available. Note: not necessarily a UTC time. -uavcan.Timestamp timestamp +dronecan.Timestamp timestamp # icao address uint32 icao_address diff --git a/ardupilot/gnss/20002.Heading.uavcan b/ardupilot/gnss/20002.Heading.dronecan similarity index 100% rename from ardupilot/gnss/20002.Heading.uavcan rename to ardupilot/gnss/20002.Heading.dronecan diff --git a/ardupilot/gnss/20003.Status.uavcan b/ardupilot/gnss/20003.Status.dronecan similarity index 100% rename from ardupilot/gnss/20003.Status.uavcan rename to ardupilot/gnss/20003.Status.dronecan diff --git a/ardupilot/gnss/20005.MovingBaselineData.uavcan b/ardupilot/gnss/20005.MovingBaselineData.dronecan similarity index 100% rename from ardupilot/gnss/20005.MovingBaselineData.uavcan rename to ardupilot/gnss/20005.MovingBaselineData.dronecan diff --git a/ardupilot/gnss/20006.RelPosHeading.uavcan b/ardupilot/gnss/20006.RelPosHeading.dronecan similarity index 86% rename from ardupilot/gnss/20006.RelPosHeading.uavcan rename to ardupilot/gnss/20006.RelPosHeading.dronecan index c399f17..79dbbbb 100644 --- a/ardupilot/gnss/20006.RelPosHeading.uavcan +++ b/ardupilot/gnss/20006.RelPosHeading.dronecan @@ -1,5 +1,5 @@ # timestamp on the gps message -uavcan.Timestamp timestamp +dronecan.Timestamp timestamp bool reported_heading_acc_available float32 reported_heading_deg diff --git a/ardupilot/indication/20000.SafetyState.uavcan b/ardupilot/indication/20000.SafetyState.dronecan similarity index 71% rename from ardupilot/indication/20000.SafetyState.uavcan rename to ardupilot/indication/20000.SafetyState.dronecan index e647900..c1f8006 100644 --- a/ardupilot/indication/20000.SafetyState.uavcan +++ b/ardupilot/indication/20000.SafetyState.dronecan @@ -1,5 +1,5 @@ # -# support for Safety LED on UAVCAN +# support for Safety LED on DroneCAN uint8 STATUS_SAFETY_ON = 0 uint8 STATUS_SAFETY_OFF = 255 diff --git a/ardupilot/indication/20001.Button.uavcan b/ardupilot/indication/20001.Button.dronecan similarity index 86% rename from ardupilot/indication/20001.Button.uavcan rename to ardupilot/indication/20001.Button.dronecan index 879da48..2c9729c 100644 --- a/ardupilot/indication/20001.Button.uavcan +++ b/ardupilot/indication/20001.Button.dronecan @@ -1,5 +1,5 @@ # -# support for buttons on UAVCAN +# support for buttons on DroneCAN # while a button is being pressed this message should be sent at 10Hz uint8 BUTTON_SAFETY = 1 diff --git a/ardupilot/indication/20007.NotifyState.uavcan b/ardupilot/indication/20007.NotifyState.dronecan similarity index 100% rename from ardupilot/indication/20007.NotifyState.uavcan rename to ardupilot/indication/20007.NotifyState.dronecan diff --git a/com/hex/equipment/flow/20200.Measurement.uavcan b/com/hex/equipment/flow/20200.Measurement.dronecan similarity index 100% rename from com/hex/equipment/flow/20200.Measurement.uavcan rename to com/hex/equipment/flow/20200.Measurement.dronecan diff --git a/cuav/equipment/power/20300.CBAT.uavcan b/cuav/equipment/power/20300.CBAT.dronecan similarity index 98% rename from cuav/equipment/power/20300.CBAT.uavcan rename to cuav/equipment/power/20300.CBAT.dronecan index 2c9ff56..d49fbb0 100755 --- a/cuav/equipment/power/20300.CBAT.uavcan +++ b/cuav/equipment/power/20300.CBAT.dronecan @@ -1,5 +1,5 @@ # -# support for CUAV Smart Battery on UAVCAN +# support for CUAV Smart Battery on DroneCAN # float32 temperature # The surface temperature of the battery diff --git a/uavcan/CoarseOrientation.uavcan b/dronecan/CoarseOrientation.dronecan similarity index 100% rename from uavcan/CoarseOrientation.uavcan rename to dronecan/CoarseOrientation.dronecan diff --git a/uavcan/README.md b/dronecan/README.md similarity index 94% rename from uavcan/README.md rename to dronecan/README.md index ac2fd4e..383970b 100644 --- a/uavcan/README.md +++ b/dronecan/README.md @@ -1,7 +1,7 @@ -UAVCAN namespace +DroneCAN namespace ================ -For details, please refer to the [UAVCAN specification](http://uavcan.org/). +For details, please refer to the [DroneCAN specification](http://dronecan.org/). ## Standard ID grouping diff --git a/uavcan/Timestamp.uavcan b/dronecan/Timestamp.dronecan similarity index 84% rename from uavcan/Timestamp.uavcan rename to dronecan/Timestamp.dronecan index 152808e..0d054fa 100644 --- a/uavcan/Timestamp.uavcan +++ b/dronecan/Timestamp.dronecan @@ -2,7 +2,7 @@ # Global timestamp in microseconds, 7 bytes. # # Use this data type for timestamp fields in messages, like follows: -# uavcan.Timestamp timestamp +# dronecan.Timestamp timestamp # uint56 UNKNOWN = 0 diff --git a/uavcan/equipment/actuator/1010.ArrayCommand.uavcan b/dronecan/equipment/actuator/1010.ArrayCommand.dronecan similarity index 100% rename from uavcan/equipment/actuator/1010.ArrayCommand.uavcan rename to dronecan/equipment/actuator/1010.ArrayCommand.dronecan diff --git a/uavcan/equipment/actuator/1011.Status.uavcan b/dronecan/equipment/actuator/1011.Status.dronecan similarity index 100% rename from uavcan/equipment/actuator/1011.Status.uavcan rename to dronecan/equipment/actuator/1011.Status.dronecan diff --git a/uavcan/equipment/actuator/Command.uavcan b/dronecan/equipment/actuator/Command.dronecan similarity index 100% rename from uavcan/equipment/actuator/Command.uavcan rename to dronecan/equipment/actuator/Command.dronecan diff --git a/uavcan/equipment/ahrs/1000.Solution.uavcan b/dronecan/equipment/ahrs/1000.Solution.dronecan similarity index 91% rename from uavcan/equipment/ahrs/1000.Solution.uavcan rename to dronecan/equipment/ahrs/1000.Solution.dronecan index aa78a24..a8552f4 100644 --- a/uavcan/equipment/ahrs/1000.Solution.uavcan +++ b/dronecan/equipment/ahrs/1000.Solution.dronecan @@ -2,7 +2,7 @@ # Inertial data and orientation in body frame. # -uavcan.Timestamp timestamp +dronecan.Timestamp timestamp # # Normalized quaternion diff --git a/uavcan/equipment/ahrs/1001.MagneticFieldStrength.uavcan b/dronecan/equipment/ahrs/1001.MagneticFieldStrength.dronecan similarity index 90% rename from uavcan/equipment/ahrs/1001.MagneticFieldStrength.uavcan rename to dronecan/equipment/ahrs/1001.MagneticFieldStrength.dronecan index 47be0ae..6db563e 100644 --- a/uavcan/equipment/ahrs/1001.MagneticFieldStrength.uavcan +++ b/dronecan/equipment/ahrs/1001.MagneticFieldStrength.dronecan @@ -1,7 +1,7 @@ # # Magnetic field readings, in Gauss, in body frame. # SI units are avoided because of float16 range limitations. -# This message is deprecated. Use the newer 1002.MagneticFieldStrength2.uavcan message. +# This message is deprecated. Use the newer 1002.MagneticFieldStrength2.dronecan message. # float16[3] magnetic_field_ga diff --git a/uavcan/equipment/ahrs/1002.MagneticFieldStrength2.uavcan b/dronecan/equipment/ahrs/1002.MagneticFieldStrength2.dronecan similarity index 100% rename from uavcan/equipment/ahrs/1002.MagneticFieldStrength2.uavcan rename to dronecan/equipment/ahrs/1002.MagneticFieldStrength2.dronecan diff --git a/uavcan/equipment/ahrs/1003.RawIMU.uavcan b/dronecan/equipment/ahrs/1003.RawIMU.dronecan similarity index 98% rename from uavcan/equipment/ahrs/1003.RawIMU.uavcan rename to dronecan/equipment/ahrs/1003.RawIMU.dronecan index 1380f25..8344e1b 100644 --- a/uavcan/equipment/ahrs/1003.RawIMU.uavcan +++ b/dronecan/equipment/ahrs/1003.RawIMU.dronecan @@ -7,7 +7,7 @@ # # Data acquisition timestamp in the bus shared time base. # -uavcan.Timestamp timestamp +dronecan.Timestamp timestamp # # Integration interval, seconds. diff --git a/uavcan/equipment/air_data/1020.TrueAirspeed.uavcan b/dronecan/equipment/air_data/1020.TrueAirspeed.dronecan similarity index 100% rename from uavcan/equipment/air_data/1020.TrueAirspeed.uavcan rename to dronecan/equipment/air_data/1020.TrueAirspeed.dronecan diff --git a/uavcan/equipment/air_data/1021.IndicatedAirspeed.uavcan b/dronecan/equipment/air_data/1021.IndicatedAirspeed.dronecan similarity index 100% rename from uavcan/equipment/air_data/1021.IndicatedAirspeed.uavcan rename to dronecan/equipment/air_data/1021.IndicatedAirspeed.dronecan diff --git a/uavcan/equipment/air_data/1025.AngleOfAttack.uavcan b/dronecan/equipment/air_data/1025.AngleOfAttack.dronecan similarity index 100% rename from uavcan/equipment/air_data/1025.AngleOfAttack.uavcan rename to dronecan/equipment/air_data/1025.AngleOfAttack.dronecan diff --git a/uavcan/equipment/air_data/1026.Sideslip.uavcan b/dronecan/equipment/air_data/1026.Sideslip.dronecan similarity index 100% rename from uavcan/equipment/air_data/1026.Sideslip.uavcan rename to dronecan/equipment/air_data/1026.Sideslip.dronecan diff --git a/uavcan/equipment/air_data/1027.RawAirData.uavcan b/dronecan/equipment/air_data/1027.RawAirData.dronecan similarity index 100% rename from uavcan/equipment/air_data/1027.RawAirData.uavcan rename to dronecan/equipment/air_data/1027.RawAirData.dronecan diff --git a/uavcan/equipment/air_data/1028.StaticPressure.uavcan b/dronecan/equipment/air_data/1028.StaticPressure.dronecan similarity index 100% rename from uavcan/equipment/air_data/1028.StaticPressure.uavcan rename to dronecan/equipment/air_data/1028.StaticPressure.dronecan diff --git a/uavcan/equipment/air_data/1029.StaticTemperature.uavcan b/dronecan/equipment/air_data/1029.StaticTemperature.dronecan similarity index 100% rename from uavcan/equipment/air_data/1029.StaticTemperature.uavcan rename to dronecan/equipment/air_data/1029.StaticTemperature.dronecan diff --git a/uavcan/equipment/camera_gimbal/1040.AngularCommand.uavcan b/dronecan/equipment/camera_gimbal/1040.AngularCommand.dronecan similarity index 100% rename from uavcan/equipment/camera_gimbal/1040.AngularCommand.uavcan rename to dronecan/equipment/camera_gimbal/1040.AngularCommand.dronecan diff --git a/uavcan/equipment/camera_gimbal/1041.GEOPOICommand.uavcan b/dronecan/equipment/camera_gimbal/1041.GEOPOICommand.dronecan similarity index 100% rename from uavcan/equipment/camera_gimbal/1041.GEOPOICommand.uavcan rename to dronecan/equipment/camera_gimbal/1041.GEOPOICommand.dronecan diff --git a/uavcan/equipment/camera_gimbal/1044.Status.uavcan b/dronecan/equipment/camera_gimbal/1044.Status.dronecan similarity index 81% rename from uavcan/equipment/camera_gimbal/1044.Status.uavcan rename to dronecan/equipment/camera_gimbal/1044.Status.dronecan index 0af0550..10313c5 100644 --- a/uavcan/equipment/camera_gimbal/1044.Status.uavcan +++ b/dronecan/equipment/camera_gimbal/1044.Status.dronecan @@ -8,7 +8,7 @@ Mode mode # # Camera axis orientation in body frame (not in fixed frame). -# Please refer to the UAVCAN coordinate frame conventions. +# Please refer to the DroneCAN coordinate frame conventions. # float16[4] camera_orientation_in_body_frame_xyzw float16[<=9] camera_orientation_in_body_frame_covariance # +inf for non-existent axes diff --git a/uavcan/equipment/camera_gimbal/Mode.uavcan b/dronecan/equipment/camera_gimbal/Mode.dronecan similarity index 100% rename from uavcan/equipment/camera_gimbal/Mode.uavcan rename to dronecan/equipment/camera_gimbal/Mode.dronecan diff --git a/uavcan/equipment/device/1110.Temperature.uavcan b/dronecan/equipment/device/1110.Temperature.dronecan similarity index 100% rename from uavcan/equipment/device/1110.Temperature.uavcan rename to dronecan/equipment/device/1110.Temperature.dronecan diff --git a/uavcan/equipment/esc/1030.RawCommand.uavcan b/dronecan/equipment/esc/1030.RawCommand.dronecan similarity index 100% rename from uavcan/equipment/esc/1030.RawCommand.uavcan rename to dronecan/equipment/esc/1030.RawCommand.dronecan diff --git a/uavcan/equipment/esc/1031.RPMCommand.uavcan b/dronecan/equipment/esc/1031.RPMCommand.dronecan similarity index 100% rename from uavcan/equipment/esc/1031.RPMCommand.uavcan rename to dronecan/equipment/esc/1031.RPMCommand.dronecan diff --git a/uavcan/equipment/esc/1034.Status.uavcan b/dronecan/equipment/esc/1034.Status.dronecan similarity index 100% rename from uavcan/equipment/esc/1034.Status.uavcan rename to dronecan/equipment/esc/1034.Status.dronecan diff --git a/uavcan/equipment/gnss/1060.Fix.uavcan b/dronecan/equipment/gnss/1060.Fix.dronecan similarity index 86% rename from uavcan/equipment/gnss/1060.Fix.uavcan rename to dronecan/equipment/gnss/1060.Fix.dronecan index d65ce5e..9b61ae4 100644 --- a/uavcan/equipment/gnss/1060.Fix.uavcan +++ b/dronecan/equipment/gnss/1060.Fix.dronecan @@ -1,15 +1,15 @@ # # GNSS navigation solution with uncertainty. -# This message is deprecated. Use the newer 1063.Fix2.uavcan message. +# This message is deprecated. Use the newer 1063.Fix2.dronecan message. # -uavcan.Timestamp timestamp # Global network-synchronized time, if available, otherwise zero +dronecan.Timestamp timestamp # Global network-synchronized time, if available, otherwise zero # # Time solution. # Time standard (GPS, UTC, TAI, etc) is defined in the field below. # -uavcan.Timestamp gnss_timestamp +dronecan.Timestamp gnss_timestamp # # Time standard used in the GNSS timestamp field. diff --git a/uavcan/equipment/gnss/1061.Auxiliary.uavcan b/dronecan/equipment/gnss/1061.Auxiliary.dronecan similarity index 100% rename from uavcan/equipment/gnss/1061.Auxiliary.uavcan rename to dronecan/equipment/gnss/1061.Auxiliary.dronecan diff --git a/uavcan/equipment/gnss/1062.RTCMStream.uavcan b/dronecan/equipment/gnss/1062.RTCMStream.dronecan similarity index 100% rename from uavcan/equipment/gnss/1062.RTCMStream.uavcan rename to dronecan/equipment/gnss/1062.RTCMStream.dronecan diff --git a/uavcan/equipment/gnss/1063.Fix2.uavcan b/dronecan/equipment/gnss/1063.Fix2.dronecan similarity index 98% rename from uavcan/equipment/gnss/1063.Fix2.uavcan rename to dronecan/equipment/gnss/1063.Fix2.dronecan index 5738576..1098f7a 100644 --- a/uavcan/equipment/gnss/1063.Fix2.uavcan +++ b/dronecan/equipment/gnss/1063.Fix2.dronecan @@ -5,14 +5,14 @@ # # Global network-synchronized time, if available, otherwise zero. # -uavcan.Timestamp timestamp +dronecan.Timestamp timestamp # # Time solution. # The method and number of leap seconds which were in use for deriving the timestamp are # defined in the fields below. # -uavcan.Timestamp gnss_timestamp +dronecan.Timestamp gnss_timestamp # # Method used for deriving the GNSS timestamp field. diff --git a/uavcan/equipment/gnss/ECEFPositionVelocity.uavcan b/dronecan/equipment/gnss/ECEFPositionVelocity.dronecan similarity index 100% rename from uavcan/equipment/gnss/ECEFPositionVelocity.uavcan rename to dronecan/equipment/gnss/ECEFPositionVelocity.dronecan diff --git a/uavcan/equipment/hardpoint/1070.Command.uavcan b/dronecan/equipment/hardpoint/1070.Command.dronecan similarity index 100% rename from uavcan/equipment/hardpoint/1070.Command.uavcan rename to dronecan/equipment/hardpoint/1070.Command.dronecan diff --git a/uavcan/equipment/hardpoint/1071.Status.uavcan b/dronecan/equipment/hardpoint/1071.Status.dronecan similarity index 100% rename from uavcan/equipment/hardpoint/1071.Status.uavcan rename to dronecan/equipment/hardpoint/1071.Status.dronecan diff --git a/uavcan/equipment/ice/1129.FuelTankStatus.uavcan b/dronecan/equipment/ice/1129.FuelTankStatus.dronecan similarity index 100% rename from uavcan/equipment/ice/1129.FuelTankStatus.uavcan rename to dronecan/equipment/ice/1129.FuelTankStatus.dronecan diff --git a/uavcan/equipment/ice/README.md b/dronecan/equipment/ice/README.md similarity index 100% rename from uavcan/equipment/ice/README.md rename to dronecan/equipment/ice/README.md diff --git a/uavcan/equipment/ice/reciprocating/1120.Status.uavcan b/dronecan/equipment/ice/reciprocating/1120.Status.dronecan similarity index 100% rename from uavcan/equipment/ice/reciprocating/1120.Status.uavcan rename to dronecan/equipment/ice/reciprocating/1120.Status.dronecan diff --git a/uavcan/equipment/ice/reciprocating/CylinderStatus.uavcan b/dronecan/equipment/ice/reciprocating/CylinderStatus.dronecan similarity index 100% rename from uavcan/equipment/ice/reciprocating/CylinderStatus.uavcan rename to dronecan/equipment/ice/reciprocating/CylinderStatus.dronecan diff --git a/uavcan/equipment/indication/1080.BeepCommand.uavcan b/dronecan/equipment/indication/1080.BeepCommand.dronecan similarity index 100% rename from uavcan/equipment/indication/1080.BeepCommand.uavcan rename to dronecan/equipment/indication/1080.BeepCommand.dronecan diff --git a/uavcan/equipment/indication/1081.LightsCommand.uavcan b/dronecan/equipment/indication/1081.LightsCommand.dronecan similarity index 100% rename from uavcan/equipment/indication/1081.LightsCommand.uavcan rename to dronecan/equipment/indication/1081.LightsCommand.dronecan diff --git a/uavcan/equipment/indication/RGB565.uavcan b/dronecan/equipment/indication/RGB565.dronecan similarity index 100% rename from uavcan/equipment/indication/RGB565.uavcan rename to dronecan/equipment/indication/RGB565.dronecan diff --git a/uavcan/equipment/indication/SingleLightCommand.uavcan b/dronecan/equipment/indication/SingleLightCommand.dronecan similarity index 100% rename from uavcan/equipment/indication/SingleLightCommand.uavcan rename to dronecan/equipment/indication/SingleLightCommand.dronecan diff --git a/uavcan/equipment/power/1090.PrimaryPowerSupplyStatus.uavcan b/dronecan/equipment/power/1090.PrimaryPowerSupplyStatus.dronecan similarity index 100% rename from uavcan/equipment/power/1090.PrimaryPowerSupplyStatus.uavcan rename to dronecan/equipment/power/1090.PrimaryPowerSupplyStatus.dronecan diff --git a/uavcan/equipment/power/1091.CircuitStatus.uavcan b/dronecan/equipment/power/1091.CircuitStatus.dronecan similarity index 100% rename from uavcan/equipment/power/1091.CircuitStatus.uavcan rename to dronecan/equipment/power/1091.CircuitStatus.dronecan diff --git a/uavcan/equipment/power/1092.BatteryInfo.uavcan b/dronecan/equipment/power/1092.BatteryInfo.dronecan similarity index 100% rename from uavcan/equipment/power/1092.BatteryInfo.uavcan rename to dronecan/equipment/power/1092.BatteryInfo.dronecan diff --git a/uavcan/equipment/range_sensor/1050.Measurement.uavcan b/dronecan/equipment/range_sensor/1050.Measurement.dronecan similarity index 87% rename from uavcan/equipment/range_sensor/1050.Measurement.uavcan rename to dronecan/equipment/range_sensor/1050.Measurement.dronecan index 306d1d0..d057729 100644 --- a/uavcan/equipment/range_sensor/1050.Measurement.uavcan +++ b/dronecan/equipment/range_sensor/1050.Measurement.dronecan @@ -2,11 +2,11 @@ # Generic narrow-beam range sensor data. # -uavcan.Timestamp timestamp +dronecan.Timestamp timestamp uint8 sensor_id -uavcan.CoarseOrientation beam_orientation_in_body_frame +dronecan.CoarseOrientation beam_orientation_in_body_frame float16 field_of_view # Radians diff --git a/uavcan/equipment/safety/1100.ArmingStatus.uavcan b/dronecan/equipment/safety/1100.ArmingStatus.dronecan similarity index 100% rename from uavcan/equipment/safety/1100.ArmingStatus.uavcan rename to dronecan/equipment/safety/1100.ArmingStatus.dronecan diff --git a/uavcan/navigation/2000.GlobalNavigationSolution.uavcan b/dronecan/navigation/2000.GlobalNavigationSolution.dronecan similarity index 98% rename from uavcan/navigation/2000.GlobalNavigationSolution.uavcan rename to dronecan/navigation/2000.GlobalNavigationSolution.dronecan index 69ab2bb..59f9576 100644 --- a/uavcan/navigation/2000.GlobalNavigationSolution.uavcan +++ b/dronecan/navigation/2000.GlobalNavigationSolution.dronecan @@ -8,7 +8,7 @@ # Global network synchronized timestamp, if known. # Set to zero if the timestamp is not known. # -uavcan.Timestamp timestamp +dronecan.Timestamp timestamp # # Geo location [angular degree]. diff --git a/uavcan/protocol/1.GetNodeInfo.uavcan b/dronecan/protocol/1.GetNodeInfo.dronecan similarity index 100% rename from uavcan/protocol/1.GetNodeInfo.uavcan rename to dronecan/protocol/1.GetNodeInfo.dronecan diff --git a/uavcan/protocol/2.GetDataTypeInfo.uavcan b/dronecan/protocol/2.GetDataTypeInfo.dronecan similarity index 91% rename from uavcan/protocol/2.GetDataTypeInfo.uavcan rename to dronecan/protocol/2.GetDataTypeInfo.dronecan index dd92cf8..a089a47 100644 --- a/uavcan/protocol/2.GetDataTypeInfo.uavcan +++ b/dronecan/protocol/2.GetDataTypeInfo.dronecan @@ -10,7 +10,7 @@ uint16 id # Ignored if 'name' is non-empty DataTypeKind kind # Ignored if 'name' is non-empty -uint8[<=80] name # Full data type name, e.g. "uavcan.protocol.GetDataTypeInfo" +uint8[<=80] name # Full data type name, e.g. "dronecan.protocol.GetDataTypeInfo" --- diff --git a/uavcan/protocol/341.NodeStatus.uavcan b/dronecan/protocol/341.NodeStatus.dronecan similarity index 96% rename from uavcan/protocol/341.NodeStatus.uavcan rename to dronecan/protocol/341.NodeStatus.dronecan index bed661f..97824e6 100644 --- a/uavcan/protocol/341.NodeStatus.uavcan +++ b/dronecan/protocol/341.NodeStatus.dronecan @@ -1,7 +1,7 @@ # # Abstract node status information. # -# All UAVCAN nodes are required to publish this message periodically. +# All DroneCAN nodes are required to publish this message periodically. # # diff --git a/uavcan/protocol/4.GetTransportStats.uavcan b/dronecan/protocol/4.GetTransportStats.dronecan similarity index 83% rename from uavcan/protocol/4.GetTransportStats.uavcan rename to dronecan/protocol/4.GetTransportStats.dronecan index 5f41b2d..bff5826 100644 --- a/uavcan/protocol/4.GetTransportStats.uavcan +++ b/dronecan/protocol/4.GetTransportStats.dronecan @@ -5,11 +5,11 @@ --- # -# UAVCAN transport layer statistics. +# DroneCAN transport layer statistics. # uint48 transfers_tx # Number of transmitted transfers. uint48 transfers_rx # Number of received transfers. -uint48 transfer_errors # Number of errors detected in the UAVCAN transport layer. +uint48 transfer_errors # Number of errors detected in the DroneCAN transport layer. # # CAN bus statistics, for each interface independently. diff --git a/uavcan/protocol/4.GlobalTimeSync.uavcan b/dronecan/protocol/4.GlobalTimeSync.dronecan similarity index 100% rename from uavcan/protocol/4.GlobalTimeSync.uavcan rename to dronecan/protocol/4.GlobalTimeSync.dronecan diff --git a/uavcan/protocol/5.Panic.uavcan b/dronecan/protocol/5.Panic.dronecan similarity index 100% rename from uavcan/protocol/5.Panic.uavcan rename to dronecan/protocol/5.Panic.dronecan diff --git a/uavcan/protocol/5.RestartNode.uavcan b/dronecan/protocol/5.RestartNode.dronecan similarity index 100% rename from uavcan/protocol/5.RestartNode.uavcan rename to dronecan/protocol/5.RestartNode.dronecan diff --git a/uavcan/protocol/6.AccessCommandShell.uavcan b/dronecan/protocol/6.AccessCommandShell.dronecan similarity index 100% rename from uavcan/protocol/6.AccessCommandShell.uavcan rename to dronecan/protocol/6.AccessCommandShell.dronecan diff --git a/uavcan/protocol/CANIfaceStats.uavcan b/dronecan/protocol/CANIfaceStats.dronecan similarity index 100% rename from uavcan/protocol/CANIfaceStats.uavcan rename to dronecan/protocol/CANIfaceStats.dronecan diff --git a/uavcan/protocol/DataTypeKind.uavcan b/dronecan/protocol/DataTypeKind.dronecan similarity index 100% rename from uavcan/protocol/DataTypeKind.uavcan rename to dronecan/protocol/DataTypeKind.dronecan diff --git a/uavcan/protocol/HardwareVersion.uavcan b/dronecan/protocol/HardwareVersion.dronecan similarity index 100% rename from uavcan/protocol/HardwareVersion.uavcan rename to dronecan/protocol/HardwareVersion.dronecan diff --git a/uavcan/protocol/SoftwareVersion.uavcan b/dronecan/protocol/SoftwareVersion.dronecan similarity index 100% rename from uavcan/protocol/SoftwareVersion.uavcan rename to dronecan/protocol/SoftwareVersion.dronecan diff --git a/uavcan/protocol/debug/16370.KeyValue.uavcan b/dronecan/protocol/debug/16370.KeyValue.dronecan similarity index 100% rename from uavcan/protocol/debug/16370.KeyValue.uavcan rename to dronecan/protocol/debug/16370.KeyValue.dronecan diff --git a/uavcan/protocol/debug/16383.LogMessage.uavcan b/dronecan/protocol/debug/16383.LogMessage.dronecan similarity index 100% rename from uavcan/protocol/debug/16383.LogMessage.uavcan rename to dronecan/protocol/debug/16383.LogMessage.dronecan diff --git a/uavcan/protocol/debug/LogLevel.uavcan b/dronecan/protocol/debug/LogLevel.dronecan similarity index 100% rename from uavcan/protocol/debug/LogLevel.uavcan rename to dronecan/protocol/debug/LogLevel.dronecan diff --git a/uavcan/protocol/dynamic_node_id/1.Allocation.uavcan b/dronecan/protocol/dynamic_node_id/1.Allocation.dronecan similarity index 100% rename from uavcan/protocol/dynamic_node_id/1.Allocation.uavcan rename to dronecan/protocol/dynamic_node_id/1.Allocation.dronecan diff --git a/uavcan/protocol/dynamic_node_id/server/30.AppendEntries.uavcan b/dronecan/protocol/dynamic_node_id/server/30.AppendEntries.dronecan similarity index 100% rename from uavcan/protocol/dynamic_node_id/server/30.AppendEntries.uavcan rename to dronecan/protocol/dynamic_node_id/server/30.AppendEntries.dronecan diff --git a/uavcan/protocol/dynamic_node_id/server/31.RequestVote.uavcan b/dronecan/protocol/dynamic_node_id/server/31.RequestVote.dronecan similarity index 100% rename from uavcan/protocol/dynamic_node_id/server/31.RequestVote.uavcan rename to dronecan/protocol/dynamic_node_id/server/31.RequestVote.dronecan diff --git a/uavcan/protocol/dynamic_node_id/server/390.Discovery.uavcan b/dronecan/protocol/dynamic_node_id/server/390.Discovery.dronecan similarity index 100% rename from uavcan/protocol/dynamic_node_id/server/390.Discovery.uavcan rename to dronecan/protocol/dynamic_node_id/server/390.Discovery.dronecan diff --git a/uavcan/protocol/dynamic_node_id/server/Entry.uavcan b/dronecan/protocol/dynamic_node_id/server/Entry.dronecan similarity index 100% rename from uavcan/protocol/dynamic_node_id/server/Entry.uavcan rename to dronecan/protocol/dynamic_node_id/server/Entry.dronecan diff --git a/uavcan/protocol/enumeration/15.Begin.uavcan b/dronecan/protocol/enumeration/15.Begin.dronecan similarity index 100% rename from uavcan/protocol/enumeration/15.Begin.uavcan rename to dronecan/protocol/enumeration/15.Begin.dronecan diff --git a/uavcan/protocol/enumeration/380.Indication.uavcan b/dronecan/protocol/enumeration/380.Indication.dronecan similarity index 91% rename from uavcan/protocol/enumeration/380.Indication.uavcan rename to dronecan/protocol/enumeration/380.Indication.dronecan index 0c146c8..98ef0e5 100644 --- a/uavcan/protocol/enumeration/380.Indication.uavcan +++ b/dronecan/protocol/enumeration/380.Indication.dronecan @@ -7,7 +7,7 @@ void6 # # This field is unused; keep it empty # -uavcan.protocol.param.NumericValue value +dronecan.protocol.param.NumericValue value # # Name of the enumerated parameter. diff --git a/uavcan/protocol/file/40.BeginFirmwareUpdate.uavcan b/dronecan/protocol/file/40.BeginFirmwareUpdate.dronecan similarity index 96% rename from uavcan/protocol/file/40.BeginFirmwareUpdate.uavcan rename to dronecan/protocol/file/40.BeginFirmwareUpdate.dronecan index 00155c2..86d36d2 100644 --- a/uavcan/protocol/file/40.BeginFirmwareUpdate.uavcan +++ b/dronecan/protocol/file/40.BeginFirmwareUpdate.dronecan @@ -10,7 +10,7 @@ # If the slave node accepts this request, the initiator will get a response immediately, before the update process # actually begins. # -# While the firmware is being updated, the slave should set its mode (uavcan.protocol.NodeStatus.mode) to +# While the firmware is being updated, the slave should set its mode (dronecan.protocol.NodeStatus.mode) to # MODE_SOFTWARE_UPDATE. # diff --git a/uavcan/protocol/file/45.GetInfo.uavcan b/dronecan/protocol/file/45.GetInfo.dronecan similarity index 100% rename from uavcan/protocol/file/45.GetInfo.uavcan rename to dronecan/protocol/file/45.GetInfo.dronecan diff --git a/uavcan/protocol/file/46.GetDirectoryEntryInfo.uavcan b/dronecan/protocol/file/46.GetDirectoryEntryInfo.dronecan similarity index 100% rename from uavcan/protocol/file/46.GetDirectoryEntryInfo.uavcan rename to dronecan/protocol/file/46.GetDirectoryEntryInfo.dronecan diff --git a/uavcan/protocol/file/47.Delete.uavcan b/dronecan/protocol/file/47.Delete.dronecan similarity index 100% rename from uavcan/protocol/file/47.Delete.uavcan rename to dronecan/protocol/file/47.Delete.dronecan diff --git a/uavcan/protocol/file/48.Read.uavcan b/dronecan/protocol/file/48.Read.dronecan similarity index 100% rename from uavcan/protocol/file/48.Read.uavcan rename to dronecan/protocol/file/48.Read.dronecan diff --git a/uavcan/protocol/file/49.Write.uavcan b/dronecan/protocol/file/49.Write.dronecan similarity index 100% rename from uavcan/protocol/file/49.Write.uavcan rename to dronecan/protocol/file/49.Write.dronecan diff --git a/uavcan/protocol/file/EntryType.uavcan b/dronecan/protocol/file/EntryType.dronecan similarity index 100% rename from uavcan/protocol/file/EntryType.uavcan rename to dronecan/protocol/file/EntryType.dronecan diff --git a/uavcan/protocol/file/Error.uavcan b/dronecan/protocol/file/Error.dronecan similarity index 100% rename from uavcan/protocol/file/Error.uavcan rename to dronecan/protocol/file/Error.dronecan diff --git a/uavcan/protocol/file/Path.uavcan b/dronecan/protocol/file/Path.dronecan similarity index 100% rename from uavcan/protocol/file/Path.uavcan rename to dronecan/protocol/file/Path.dronecan diff --git a/uavcan/protocol/param/10.ExecuteOpcode.uavcan b/dronecan/protocol/param/10.ExecuteOpcode.dronecan similarity index 100% rename from uavcan/protocol/param/10.ExecuteOpcode.uavcan rename to dronecan/protocol/param/10.ExecuteOpcode.dronecan diff --git a/uavcan/protocol/param/11.GetSet.uavcan b/dronecan/protocol/param/11.GetSet.dronecan similarity index 100% rename from uavcan/protocol/param/11.GetSet.uavcan rename to dronecan/protocol/param/11.GetSet.dronecan diff --git a/uavcan/protocol/param/Empty.uavcan b/dronecan/protocol/param/Empty.dronecan similarity index 100% rename from uavcan/protocol/param/Empty.uavcan rename to dronecan/protocol/param/Empty.dronecan diff --git a/uavcan/protocol/param/NumericValue.uavcan b/dronecan/protocol/param/NumericValue.dronecan similarity index 100% rename from uavcan/protocol/param/NumericValue.uavcan rename to dronecan/protocol/param/NumericValue.dronecan diff --git a/uavcan/protocol/param/Value.uavcan b/dronecan/protocol/param/Value.dronecan similarity index 100% rename from uavcan/protocol/param/Value.uavcan rename to dronecan/protocol/param/Value.dronecan diff --git a/uavcan/tunnel/2010.Broadcast.uavcan b/dronecan/tunnel/2010.Broadcast.dronecan similarity index 100% rename from uavcan/tunnel/2010.Broadcast.uavcan rename to dronecan/tunnel/2010.Broadcast.dronecan diff --git a/uavcan/tunnel/63.Call.uavcan b/dronecan/tunnel/63.Call.dronecan similarity index 100% rename from uavcan/tunnel/63.Call.uavcan rename to dronecan/tunnel/63.Call.dronecan diff --git a/uavcan/tunnel/Protocol.uavcan b/dronecan/tunnel/Protocol.dronecan similarity index 100% rename from uavcan/tunnel/Protocol.uavcan rename to dronecan/tunnel/Protocol.dronecan diff --git a/test.py b/test.py index bbec9bf..09f29d1 100755 --- a/test.py +++ b/test.py @@ -5,8 +5,8 @@ logging.basicConfig(stream=sys.stderr, level='DEBUG', format='%(levelname)s: %(message)s') -from uavcan import dsdl +from dronecan import dsdl -parsed = dsdl.parse_namespaces(['uavcan','com','ardupilot']); +parsed = dsdl.parse_namespaces(['dronecan','com','ardupilot']); if parsed: logging.info('%d data types parsed successfully', len(parsed))