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 @@ + +