From 2cb8159470c837cc54312c8caaf18933765fcef9 Mon Sep 17 00:00:00 2001 From: "r.koeppe" Date: Wed, 12 Jun 2024 19:47:42 +0200 Subject: [PATCH] update intermediate solution --- IMU_Kikad/IMU.kicad_pro | 1 + INS-VN-200/.settings/language.settings.xml | 4 +- vn-interface/include/vn-interface/registers.h | 69 +- vn200/.cproject | 12 +- vn200/.settings/language.settings.xml | 4 +- vn200/Converter/Inc/Converter.h | 17 +- vn200/Converter/Inc/can1.h | 959 +- vn200/Converter/Inc/endec.hpp | 291 +- vn200/Converter/Src/can1.cpp | 1030 +- vn200/Core/Src/main.cpp | 4 +- vn200/Debug/Converter/Src/Converter.su | 17 + vn200/Debug/Converter/Src/can1.su | 92 + vn200/Debug/Converter/Src/canhalal.su | 2 + vn200/Debug/Converter/Src/subdir.mk | 33 + vn200/Debug/Core/Src/main.cyclo | 25 - vn200/Debug/Core/Src/main.su | 35 +- vn200/Debug/Core/Src/stm32f3xx_hal_msp.cyclo | 5 - vn200/Debug/Core/Src/stm32f3xx_it.cyclo | 10 - vn200/Debug/Core/Src/subdir.mk | 6 +- vn200/Debug/Core/Src/syscalls.cyclo | 18 - vn200/Debug/Core/Src/sysmem.cyclo | 1 - vn200/Debug/Core/Src/system_stm32f3xx.cyclo | 2 - vn200/Debug/Core/Startup/subdir.mk | 2 +- .../Src/stm32f3xx_hal.cyclo | 25 - .../Src/stm32f3xx_hal_can.cyclo | 36 - .../Src/stm32f3xx_hal_can.su | 2 +- .../Src/stm32f3xx_hal_cortex.cyclo | 32 - .../Src/stm32f3xx_hal_cortex.su | 4 +- .../Src/stm32f3xx_hal_dma.cyclo | 14 - .../Src/stm32f3xx_hal_exti.cyclo | 9 - .../Src/stm32f3xx_hal_flash.cyclo | 14 - .../Src/stm32f3xx_hal_flash_ex.cyclo | 16 - .../Src/stm32f3xx_hal_flash_ex.su | 4 +- .../Src/stm32f3xx_hal_gpio.cyclo | 8 - .../Src/stm32f3xx_hal_i2c.cyclo | 81 - .../Src/stm32f3xx_hal_i2c_ex.cyclo | 6 - .../Src/stm32f3xx_hal_pwr.cyclo | 12 - .../Src/stm32f3xx_hal_pwr.su | 6 +- .../Src/stm32f3xx_hal_pwr_ex.cyclo | 5 - .../Src/stm32f3xx_hal_rcc.cyclo | 14 - .../Src/stm32f3xx_hal_rcc.su | 18 +- .../Src/stm32f3xx_hal_rcc_ex.cyclo | 4 - .../Src/stm32f3xx_hal_rcc_ex.su | 4 +- .../Src/stm32f3xx_hal_spi.cyclo | 56 - .../Src/stm32f3xx_hal_spi_ex.cyclo | 1 - .../Src/stm32f3xx_hal_tim.cyclo | 0 .../Src/stm32f3xx_hal_tim_ex.cyclo | 0 .../STM32F3xx_HAL_Driver/Src/subdir.mk | 4 +- vn200/Debug/makefile | 7 +- vn200/Debug/objects.list | 3 + vn200/Debug/objects.mk | 2 +- vn200/Debug/sources.mk | 3 +- vn200/Debug/vn200.elf | Bin 0 -> 1105620 bytes vn200/Debug/vn200.list | 12481 +++++++++------- vn200/Debug/vn200.map | 7202 ++++----- vn200/vn200 Debug.launch | 4 +- 56 files changed, 13176 insertions(+), 9540 deletions(-) create mode 100644 vn200/Debug/Converter/Src/Converter.su create mode 100644 vn200/Debug/Converter/Src/can1.su create mode 100644 vn200/Debug/Converter/Src/canhalal.su create mode 100644 vn200/Debug/Converter/Src/subdir.mk delete mode 100644 vn200/Debug/Core/Src/main.cyclo delete mode 100644 vn200/Debug/Core/Src/stm32f3xx_hal_msp.cyclo delete mode 100644 vn200/Debug/Core/Src/stm32f3xx_it.cyclo delete mode 100644 vn200/Debug/Core/Src/syscalls.cyclo delete mode 100644 vn200/Debug/Core/Src/sysmem.cyclo delete mode 100644 vn200/Debug/Core/Src/system_stm32f3xx.cyclo delete mode 100644 vn200/Debug/Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal.cyclo delete mode 100644 vn200/Debug/Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_can.cyclo delete mode 100644 vn200/Debug/Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_cortex.cyclo delete mode 100644 vn200/Debug/Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_dma.cyclo delete mode 100644 vn200/Debug/Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_exti.cyclo delete mode 100644 vn200/Debug/Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_flash.cyclo delete mode 100644 vn200/Debug/Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_flash_ex.cyclo delete mode 100644 vn200/Debug/Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_gpio.cyclo delete mode 100644 vn200/Debug/Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_i2c.cyclo delete mode 100644 vn200/Debug/Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_i2c_ex.cyclo delete mode 100644 vn200/Debug/Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_pwr.cyclo delete mode 100644 vn200/Debug/Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_pwr_ex.cyclo delete mode 100644 vn200/Debug/Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_rcc.cyclo delete mode 100644 vn200/Debug/Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_rcc_ex.cyclo delete mode 100644 vn200/Debug/Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_spi.cyclo delete mode 100644 vn200/Debug/Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_spi_ex.cyclo delete mode 100644 vn200/Debug/Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_tim.cyclo delete mode 100644 vn200/Debug/Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_tim_ex.cyclo create mode 100755 vn200/Debug/vn200.elf diff --git a/IMU_Kikad/IMU.kicad_pro b/IMU_Kikad/IMU.kicad_pro index 45be948..baa135e 100644 --- a/IMU_Kikad/IMU.kicad_pro +++ b/IMU_Kikad/IMU.kicad_pro @@ -74,6 +74,7 @@ "footprint_type_mismatch": "ignore", "hole_clearance": "error", "hole_near_hole": "error", + "holes_co_located": "warning", "invalid_outline": "error", "isolated_copper": "warning", "item_on_disabled_layer": "error", diff --git a/INS-VN-200/.settings/language.settings.xml b/INS-VN-200/.settings/language.settings.xml index 74c3e65..5fbb3bf 100644 --- a/INS-VN-200/.settings/language.settings.xml +++ b/INS-VN-200/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/vn-interface/include/vn-interface/registers.h b/vn-interface/include/vn-interface/registers.h index 0604dde..8b66364 100644 --- a/vn-interface/include/vn-interface/registers.h +++ b/vn-interface/include/vn-interface/registers.h @@ -435,7 +435,7 @@ typedef struct { } GpsConfigurationRegister; /** \brief Structure representing the GPS Solution - LLA register. */ -typedef struct { +typedef struct GpsSolutionLlaRegister{ /** \brief The Time field. */ double time; @@ -463,7 +463,18 @@ typedef struct { /** \brief The TimeAcc field. */ float timeAcc; -} GpsSolutionLlaRegister; + /** \brief The Constructor for GPS LLA Solution. */ + GpsSolutionLlaRegister(){ + time = 0.0; + week = 0; + gpsFix = 0; + numSats = 0; + speedAcc = 0.0; + timeAcc = 0.0; + } +}; + +const uint16_t GpsSolutionLlaRegisterID = 58; /** \brief Structure representing the GPS Solution - ECEF register. */ typedef struct { @@ -496,36 +507,48 @@ typedef struct { } GpsSolutionEcefRegister; -/** \brief Structure representing the INS Solution - LLA register. */ -typedef struct { - /** \brief The Time field. */ - double time; +typedef struct InsSolutionLla { - /** \brief The Week field. */ - uint16_t week; + const uint16_t InsSolutionLlaRegisterID = 64; - /** \brief The Status field. */ - uint16_t status; + /** \brief Structure representing the INS Solution - LLA register. */ + typedef struct Register { + /** \brief The Time field. */ + double time; - /** \brief The YawPitchRoll field. */ - vec3f yawPitchRoll; + /** \brief The Week field. */ + uint16_t week; - /** \brief The Position field. */ - vec3d position; + /** \brief The Status field. */ + uint16_t status; - /** \brief The NedVel field. */ - vec3f nedVel; + /** \brief The YawPitchRoll field. */ + vec3f yawPitchRoll; - /** \brief The AttUncertainty field. */ - float attUncertainty; + /** \brief The Position field. */ + vec3d position; - /** \brief The PosUncertainty field. */ - float posUncertainty; + /** \brief The NedVel field. */ + vec3f nedVel; - /** \brief The VelUncertainty field. */ - float velUncertainty; + /** \brief The AttUncertainty field. */ + float attUncertainty; -} InsSolutionLlaRegister; + /** \brief The PosUncertainty field. */ + float posUncertainty; + + /** \brief The VelUncertainty field. */ + float velUncertainty; + + InsSolutionLlaRegister(){ + time = 0.0; + week = 0; + status = 0; + attUncertainty = 0.0; + posUncertainty = 0.0; + } + }; +}; /** \brief Structure representing the INS Solution - ECEF register. */ typedef struct { diff --git a/vn200/.cproject b/vn200/.cproject index cdf05e8..c0074ce 100644 --- a/vn200/.cproject +++ b/vn200/.cproject @@ -51,6 +51,7 @@ + +