diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c2e51c1..7c2cb979 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.12) project(icub_firmware_shared - VERSION 1.37.2) + VERSION 1.37.3) find_package(YCM 0.11.0 REQUIRED) diff --git a/eth/embobj/plus/comm-v2/icub/EoAnalogSensors.h b/eth/embobj/plus/comm-v2/icub/EoAnalogSensors.h index 5af7de00..f70d1004 100644 --- a/eth/embobj/plus/comm-v2/icub/EoAnalogSensors.h +++ b/eth/embobj/plus/comm-v2/icub/EoAnalogSensors.h @@ -96,15 +96,14 @@ typedef enum eoas_entity_strain = 0, eoas_entity_mais = 1, eoas_entity_temperature = 2, - eoas_entity_inertial = 3, - eoas_entity_inertial3 = 4, - eoas_entity_psc = 5, - eoas_entity_pos = 6, - eoas_entity_ft = 7, - eoas_entity_battery = 8 + eoas_entity_inertial3 = 3, + eoas_entity_psc = 4, + eoas_entity_pos = 5, + eoas_entity_ft = 6, + eoas_entity_battery = 7 } eOas_entity_t; -enum { eoas_entities_numberof = 9 }; +enum { eoas_entities_numberof = 8 }; // -- all the possible enum @@ -368,79 +367,6 @@ typedef struct // size is: 4+20+4 = 28 eOas_temperature_commands_t cmmnds; } eOas_temperature_t; EO_VERIFYsizeof(eOas_temperature_t, 28) - -// -- the definition of a inertial sensor - -typedef enum -{ - eoas_inertial_accel_mtb_int = eoas_accel_mtb_int, - eoas_inertial_accel_mtb_ext = eoas_accel_mtb_ext, - eoas_inertial_gyros_mtb_ext = eoas_gyros_mtb_ext, - eoas_inertial_accel_ems_st_lis3x = eoas_accel_st_lis3x, - eoas_inertial_gyros_ems_st_l3g4200d = eoas_gyros_st_l3g4200d, - eoas_inertial_unknown = eoas_unknown, - eoas_inertial_none = eoas_none -} eOas_inertial_type_t; - - - -// this struct describes a single inertial sensor -typedef struct -{ - eObrd_location_t on; - uint8_t type; // use relevant entry of eOas_inertial_type_t -} eOas_inertial_descriptor_t; EO_VERIFYsizeof(eOas_inertial_descriptor_t, 2) - - -// we use this struct to send activate-verify command to the board -enum { eOas_inertials_maxnumber = 48 }; -typedef struct -{ - eOarray_head_t head; - eOas_inertial_descriptor_t data[eOas_inertials_maxnumber]; -} eOas_inertial_arrayof_sensors_t; EO_VERIFYsizeof(eOas_inertial_arrayof_sensors_t, 100) - - -// this struct describes the data acquired by a single intertial sensor -typedef struct -{ - uint64_t timestamp; // the time in usec of reception of this data - uint16_t id; // an id which is shared by transmitter and receiver. it can be a unique number or an index inside the array-of-sensors - int16_t x; /**< x value */ - int16_t y; /**< y value */ - int16_t z; /**< z value */ -} eOas_inertial_data_t; EO_VERIFYsizeof(eOas_inertial_data_t, 16) - - -typedef struct -{ - uint8_t datarate; /**< it specifies the acquisition rate in ms with accepted range [10, 200]. bug: if 250 the mtb emits every 35 */ - uint8_t filler[7]; - uint64_t enabled; // bitmask of enabled sensors with reference to array-of-sensors -} eOas_inertial_config_t; EO_VERIFYsizeof(eOas_inertial_config_t, 16) - - -typedef struct -{ - eOas_inertial_data_t data; /**< it is the most recent reading of the inertial sensors which are related to this entity */ -} eOas_inertial_status_t; EO_VERIFYsizeof(eOas_inertial_status_t, 16) - - -typedef struct -{ - uint8_t enable; /**< use 0 or 1*/ - uint8_t filler[7]; -} eOas_inertial_commands_t; EO_VERIFYsizeof(eOas_inertial_commands_t, 8) - - -typedef struct // size is: 16+16+8 = 40 -{ - eOas_inertial_config_t config; - eOas_inertial_status_t status; - eOas_inertial_commands_t cmmnds; -} eOas_inertial_t; EO_VERIFYsizeof(eOas_inertial_t, 40) - - // -- the definition of a inertial3 sensor // inertial3 sensor contains the new inertial sensors generated by a imu, plus the old ones diff --git a/eth/embobj/plus/comm-v2/icub/EoError.c b/eth/embobj/plus/comm-v2/icub/EoError.c index 205f425e..9c090436 100644 --- a/eth/embobj/plus/comm-v2/icub/EoError.c +++ b/eth/embobj/plus/comm-v2/icub/EoError.c @@ -265,9 +265,6 @@ const eoerror_valuestring_t eoerror_valuestrings_CFG[] = {eoerror_value_CFG_encoders_ok, "CFG: EOtheEncoderReader can be correctly configured"," par16&0xf000: number of joint; primary encs: failure mask in par16&0x000f and errorcodes in par64&0x0000ffff; secondary encs: failure mask in par16&0x00f0 and errorcodes in par64&0xffff0000"}, {eoerror_value_CFG_encoders_failed_verify, "CFG: EOtheEncoderReader cannot be configured: verification fails", "par16&0xf000: number of joint; primary encs: failure mask in par16&0x000f and errorcodes in par64&0x0000ffff; secondary encs: failure mask in par16&0x00f0 and errorcodes in par64&0xffff0000"}, - {eoerror_value_CFG_inertials_ok, "CFG: EOtheInertial can be correctly configured.", ""}, - {eoerror_value_CFG_inertials_failed_toomanyboards, "CFG: EOtheInertial cannot be configured", "In par16: number of requested boards in 0xff00, max number in 0x00ff. In par64: mask of requested boards in 0x00000000ffff0000 (can2) and 0x000000000000ffff (can1)."}, - {eoerror_value_CFG_inertials_failed_candiscovery, "CFG: EOtheInertial cannot be configured. CANdiscovery fails", "In par64 from lsb to msb masks of: missing can1, can2, found but incompatible can1, can2"}, {eoerror_value_CFG_comm_cannotloadaregularrop, "CFG: cannot load a regular rop.", ""}, @@ -280,18 +277,13 @@ const eoerror_valuestring_t eoerror_valuestrings_CFG[] = {eoerror_value_CFG_strain_not_verified_yet, "CFG: EOtheSTRAIN service was not verified yet, thus it cannot start.", ""}, {eoerror_value_CFG_mais_not_verified_yet, "CFG: EOtheMAIS service was not verified yet, thus it cannot start.", ""}, {eoerror_value_CFG_skin_not_verified_yet, "CFG: EOtheSKIN service was not verified yet, thus it cannot start.", ""}, - {eoerror_value_CFG_inertials_not_verified_yet, "CFG: EOtheInertials service was not verified yet, thus it cannot start.", ""}, {eoerror_value_CFG_inertials3_not_verified_yet, "CFG: EOtheInertials3 service was not verified yet, thus it cannot start.", ""}, {eoerror_value_CFG_encoders_not_verified_yet, "CFG: EOtheEncoderReader service was not verified yet, thus it cannot start.", ""}, {eoerror_value_CFG_mc_using_onboard_config, "CFG: EOtheMotionController service is using the local default configuration based on its IP address.", ""}, {eoerror_value_CFG_strain_using_onboard_config, "CFG: EOtheSTRAIN service is using the local default configuration based on its IP address.", ""}, {eoerror_value_CFG_mais_using_onboard_config, "CFG: EOtheMAIS service is using the local default configuration based on its IP address.", ""}, - {eoerror_value_CFG_inertials_using_onboard_config, "CFG: EOtheInertials service is using the local default configuration based on its IP address.", ""}, {eoerror_value_CFG_inertials3_using_onboard_config, "CFG: EOtheInertials3 service is using the local default configuration based on its IP address.", ""}, {eoerror_value_CFG_skin_using_onboard_config, "CFG: EOtheSKIN service is using the local default configuration based on its IP address.", ""}, - - {eoerror_value_CFG_inertials_failed_unsupportedsensor, "CFG: EOtheInertial cannot be configured. some sensors are not supported", "In par16 their number."}, - {eoerror_value_CFG_inertials_changed_requestedrate, "CFG: EOtheInertial has changed the requested rate", "In par16 the requested (MSB) and the assigned (LSB)."}, {eoerror_value_CFG_inertials3_failed_unsupportedsensor, "CFG: EOtheInertial3 cannot be configured. some sensors are not supported", "In par16 their number."}, {eoerror_value_CFG_inertials3_changed_requestedrate, "CFG: EOtheInertial3 has changed the requested rate", "In par16 the requested (MSB) and the assigned (LSB)."}, @@ -320,7 +312,6 @@ const eoerror_valuestring_t eoerror_valuestrings_CFG[] = {eoerror_value_CFG_mc_mc2pluspsc_failed_encoders_verify, "CFG: EOtheMotionController cannot be configured. verification of encoder fails for mc2pluspsc. see other messages for more details", ""}, {eoerror_value_CFG_mc_mc2pluspsc_failed_candiscovery_of_pscs, "CFG: EOtheMotionController cannot be configured. verification of pscs for mc2pluspsc fails. see other messages for more details", ""}, - {eoerror_value_CFG_inertials_failed_notsupported, "CFG: EOtheInertials cannot be configured. This board does not support this service.", ""}, {eoerror_value_CFG_inertials3_failed_notsupported, "CFG: EOtheInertials3 cannot be configured. This board does not support this service.", ""}, {eoerror_value_CFG_temperatures_failed_notsupported, "CFG: EOtheTemperatures cannot be configured. This board does not support this service.", ""}, {eoerror_value_CFG_mais_failed_notsupported, "CFG: EOtheMAIS cannot be configured. This board does not support this service.", ""}, diff --git a/eth/embobj/plus/comm-v2/icub/EoError.h b/eth/embobj/plus/comm-v2/icub/EoError.h index cc90dd59..f19dcf5e 100644 --- a/eth/embobj/plus/comm-v2/icub/EoError.h +++ b/eth/embobj/plus/comm-v2/icub/EoError.h @@ -315,105 +315,95 @@ typedef enum eoerror_value_CFG_encoders_ok = 21, eoerror_value_CFG_encoders_failed_verify = 22, - - eoerror_value_CFG_inertials_ok = 23, - eoerror_value_CFG_inertials_failed_toomanyboards = 24, - eoerror_value_CFG_inertials_failed_candiscovery = 25, - - eoerror_value_CFG_comm_cannotloadaregularrop = 26, - eoerror_value_CFG_mc_mc4plusmais_ok = 27, - eoerror_value_CFG_mc_mc4plusmais_failed_encoders_verify = 28, - eoerror_value_CFG_mc_mc4plusmais_failed_candiscovery_of_mais = 29, - - eoerror_value_CFG_services_not_verified_yet = 30, - eoerror_value_CFG_mc_not_verified_yet = 31, - eoerror_value_CFG_strain_not_verified_yet = 32, - eoerror_value_CFG_mais_not_verified_yet = 33, - eoerror_value_CFG_skin_not_verified_yet = 34, - eoerror_value_CFG_inertials_not_verified_yet = 35, - eoerror_value_CFG_inertials3_not_verified_yet = 36, - eoerror_value_CFG_encoders_not_verified_yet = 37, - - eoerror_value_CFG_mc_using_onboard_config = 38, - eoerror_value_CFG_strain_using_onboard_config = 39, - eoerror_value_CFG_mais_using_onboard_config = 40, - eoerror_value_CFG_inertials_using_onboard_config = 41, - eoerror_value_CFG_inertials3_using_onboard_config = 42, - eoerror_value_CFG_skin_using_onboard_config = 43, + eoerror_value_CFG_comm_cannotloadaregularrop = 23, - eoerror_value_CFG_inertials_failed_unsupportedsensor= 44, - eoerror_value_CFG_inertials_changed_requestedrate = 45, - - eoerror_value_CFG_inertials3_failed_unsupportedsensor= 46, - eoerror_value_CFG_inertials3_changed_requestedrate = 47, + eoerror_value_CFG_mc_mc4plusmais_ok = 24, + eoerror_value_CFG_mc_mc4plusmais_failed_encoders_verify = 25, + eoerror_value_CFG_mc_mc4plusmais_failed_candiscovery_of_mais = 26, + + eoerror_value_CFG_services_not_verified_yet = 27, + eoerror_value_CFG_mc_not_verified_yet = 28, + eoerror_value_CFG_strain_not_verified_yet = 29, + eoerror_value_CFG_mais_not_verified_yet = 30, + eoerror_value_CFG_skin_not_verified_yet = 31, + eoerror_value_CFG_inertials3_not_verified_yet = 32, + eoerror_value_CFG_encoders_not_verified_yet = 33, + + eoerror_value_CFG_mc_using_onboard_config = 34, + eoerror_value_CFG_strain_using_onboard_config = 35, + eoerror_value_CFG_mais_using_onboard_config = 36, + eoerror_value_CFG_inertials3_using_onboard_config = 37, + eoerror_value_CFG_skin_using_onboard_config = 38, + + eoerror_value_CFG_inertials3_failed_unsupportedsensor= 39, + eoerror_value_CFG_inertials3_changed_requestedrate = 40, - eoerror_value_CFG_inertials3_ok = 48, - eoerror_value_CFG_inertials3_failed_toomanyboards = 49, - eoerror_value_CFG_inertials3_failed_candiscovery = 50, - eoerror_value_CFG_inertials3_failed_generic = 51, + eoerror_value_CFG_inertials3_ok = 41, + eoerror_value_CFG_inertials3_failed_toomanyboards = 42, + eoerror_value_CFG_inertials3_failed_candiscovery = 43, + eoerror_value_CFG_inertials3_failed_generic = 44, - eoerror_value_CFG_temperatures_not_verified_yet = 52, - eoerror_value_CFG_temperatures_ok = 53, - eoerror_value_CFG_temperatures_failed_toomanyboards = 54, - eoerror_value_CFG_temperatures_failed_candiscovery = 55, - eoerror_value_CFG_temperatures_failed_generic = 56, - eoerror_value_CFG_temperatures_changed_requestedrate = 57, - eoerror_value_CFG_temperatures_using_onboard_config = 58, + eoerror_value_CFG_temperatures_not_verified_yet = 45, + eoerror_value_CFG_temperatures_ok = 46, + eoerror_value_CFG_temperatures_failed_toomanyboards = 47, + eoerror_value_CFG_temperatures_failed_candiscovery = 48, + eoerror_value_CFG_temperatures_failed_generic = 49, + eoerror_value_CFG_temperatures_changed_requestedrate = 50, + eoerror_value_CFG_temperatures_using_onboard_config = 51, - eoerror_value_CFG_psc_ok = 59, - eoerror_value_CFG_psc_failed_candiscovery = 60, - eoerror_value_CFG_psc_failed_verify_because_active = 61, - eoerror_value_CFG_psc_not_verified_yet = 62, - eoerror_value_CFG_psc_using_onboard_config = 63, - eoerror_value_CFG_psc_changed_requestedrate = 64, + eoerror_value_CFG_psc_ok = 52, + eoerror_value_CFG_psc_failed_candiscovery = 53, + eoerror_value_CFG_psc_failed_verify_because_active = 54, + eoerror_value_CFG_psc_not_verified_yet = 55, + eoerror_value_CFG_psc_using_onboard_config = 56, + eoerror_value_CFG_psc_changed_requestedrate = 57, - eoerror_value_CFG_mc_mc2pluspsc_ok = 65, - eoerror_value_CFG_mc_mc2pluspsc_failed_encoders_verify = 66, - eoerror_value_CFG_mc_mc2pluspsc_failed_candiscovery_of_pscs = 67, + eoerror_value_CFG_mc_mc2pluspsc_ok = 58, + eoerror_value_CFG_mc_mc2pluspsc_failed_encoders_verify = 59, + eoerror_value_CFG_mc_mc2pluspsc_failed_candiscovery_of_pscs = 60, - eoerror_value_CFG_inertials_failed_notsupported = 68, - eoerror_value_CFG_inertials3_failed_notsupported = 69, - eoerror_value_CFG_temperatures_failed_notsupported = 70, - eoerror_value_CFG_mais_failed_notsupported = 71, - eoerror_value_CFG_strain_failed_notsupported = 72, - eoerror_value_CFG_skin_failed_notsupported = 73, - eoerror_value_CFG_psc_failed_notsupported = 74, - eoerror_value_CFG_mc_failed_notsupported = 75, - eoerror_value_CFG_encoders_failed_notsupported = 76, + eoerror_value_CFG_inertials3_failed_notsupported = 61, + eoerror_value_CFG_temperatures_failed_notsupported = 62, + eoerror_value_CFG_mais_failed_notsupported = 63, + eoerror_value_CFG_strain_failed_notsupported = 64, + eoerror_value_CFG_skin_failed_notsupported = 65, + eoerror_value_CFG_psc_failed_notsupported = 66, + eoerror_value_CFG_mc_failed_notsupported = 67, + eoerror_value_CFG_encoders_failed_notsupported = 68, - eoerror_value_CFG_pos_ok = 77, - eoerror_value_CFG_pos_failed_candiscovery = 78, - eoerror_value_CFG_pos_failed_verify_because_active = 79, - eoerror_value_CFG_pos_not_verified_yet = 80, - eoerror_value_CFG_pos_using_onboard_config = 81, - eoerror_value_CFG_pos_changed_requestedrate = 82, - eoerror_value_CFG_pos_failed_notsupported = 83, + eoerror_value_CFG_pos_ok = 69, + eoerror_value_CFG_pos_failed_candiscovery = 70, + eoerror_value_CFG_pos_failed_verify_because_active = 71, + eoerror_value_CFG_pos_not_verified_yet = 72, + eoerror_value_CFG_pos_using_onboard_config = 73, + eoerror_value_CFG_pos_changed_requestedrate = 74, + eoerror_value_CFG_pos_failed_notsupported = 75, - eoerror_value_CFG_mc_mc4plusfaps_ok = 84, - eoerror_value_CFG_mc_mc4plusfaps_failed_encoders_verify = 85, - eoerror_value_CFG_mc_mc4plusfaps_failed_candiscovery = 86, - - eoerror_value_CFG_mc_mc4pluspmc_ok = 87, - eoerror_value_CFG_mc_mc4pluspmc_failed_encoders_verify = 88, - eoerror_value_CFG_mc_mc4pluspmc_failed_candiscovery_of_pmc = 89, - - eoerror_value_CFG_ft_ok = 90, - eoerror_value_CFG_ft_failed_candiscovery = 91, - eoerror_value_CFG_ft_not_verified_yet = 92, - eoerror_value_CFG_ft_using_onboard_config = 93, - eoerror_value_CFG_ft_failed_notsupported = 94, - eoerror_value_CFG_ft_failed_fullscales = 95, - - eoerror_value_CFG_bat_ok = 96, - eoerror_value_CFG_bat_failed_candiscovery = 97, - eoerror_value_CFG_bat_not_verified_yet = 98, - eoerror_value_CFG_bat_using_onboard_config = 99, - eoerror_value_CFG_bat_failed_notsupported = 100, + eoerror_value_CFG_mc_mc4plusfaps_ok = 76, + eoerror_value_CFG_mc_mc4plusfaps_failed_encoders_verify = 77, + eoerror_value_CFG_mc_mc4plusfaps_failed_candiscovery = 78, + + eoerror_value_CFG_mc_mc4pluspmc_ok = 79, + eoerror_value_CFG_mc_mc4pluspmc_failed_encoders_verify = 80, + eoerror_value_CFG_mc_mc4pluspmc_failed_candiscovery_of_pmc = 81, + + eoerror_value_CFG_ft_ok = 82, + eoerror_value_CFG_ft_failed_candiscovery = 83, + eoerror_value_CFG_ft_not_verified_yet = 84, + eoerror_value_CFG_ft_using_onboard_config = 85, + eoerror_value_CFG_ft_failed_notsupported = 86, + eoerror_value_CFG_ft_failed_fullscales = 87, + + eoerror_value_CFG_bat_ok = 88, + eoerror_value_CFG_bat_failed_candiscovery = 89, + eoerror_value_CFG_bat_not_verified_yet = 90, + eoerror_value_CFG_bat_using_onboard_config = 91, + eoerror_value_CFG_bat_failed_notsupported = 92, } eOerror_value_CFG_t; -enum { eoerror_value_CFG_numberof = 101 }; +enum { eoerror_value_CFG_numberof = 93 }; /** @typedef typedef enum eOerror_value_ETHMON_t diff --git a/eth/embobj/plus/comm-v2/icub/EoManagement.c b/eth/embobj/plus/comm-v2/icub/EoManagement.c index a057e313..cae327f9 100644 --- a/eth/embobj/plus/comm-v2/icub/EoManagement.c +++ b/eth/embobj/plus/comm-v2/icub/EoManagement.c @@ -76,7 +76,6 @@ static const char * s_mn_servicetype_strings[] = "eomn_serv_MC_mc4plusmais", "eomn_serv_AS_mais", "eomn_serv_AS_strain", - "eomn_serv_AS_inertials", "eomn_serv_SK_skin", "eomn_serv_AS_inertials3", "eomn_serv_AS_temperature", @@ -99,7 +98,6 @@ static const char * s_mn_servicecategory_strings[] = "eomn_serv_category_mc", "eomn_serv_category_strain" "eomn_serv_category_mais", - "eomn_serv_category_inertials", "eomn_serv_category_skin", "eomn_serv_category_inertials3", "eomn_serv_category_temperatures", diff --git a/eth/embobj/plus/comm-v2/icub/EoManagement.h b/eth/embobj/plus/comm-v2/icub/EoManagement.h index 67b940af..e1728b30 100644 --- a/eth/embobj/plus/comm-v2/icub/EoManagement.h +++ b/eth/embobj/plus/comm-v2/icub/EoManagement.h @@ -430,20 +430,19 @@ typedef enum eomn_serv_category_mc = 0, eomn_serv_category_strain = 1, eomn_serv_category_mais = 2, - eomn_serv_category_inertials = 3, - eomn_serv_category_skin = 4, - eomn_serv_category_inertials3 = 5, - eomn_serv_category_temperatures = 6, - eomn_serv_category_psc = 7, - eomn_serv_category_pos = 8, - eomn_serv_category_ft = 9, - eomn_serv_category_battery = 10, + eomn_serv_category_skin = 3, + eomn_serv_category_inertials3 = 4, + eomn_serv_category_temperatures = 5, + eomn_serv_category_psc = 6, + eomn_serv_category_pos = 7, + eomn_serv_category_ft = 8, + eomn_serv_category_battery = 9, eomn_serv_category_all = 128, eomn_serv_category_unknown = 254, eomn_serv_category_none = 255 } eOmn_serv_category_t; -enum { eomn_serv_categories_numberof = 11 }; +enum { eomn_serv_categories_numberof = 10 }; typedef enum { @@ -454,23 +453,22 @@ typedef enum eomn_serv_MC_mc4plusmais = 4, eomn_serv_AS_mais = 5, eomn_serv_AS_strain = 6, - eomn_serv_AS_inertials = 7, - eomn_serv_SK_skin = 8, - eomn_serv_AS_inertials3 = 9, - eomn_serv_AS_temperatures = 10, - eomn_serv_MC_mc2plus = 11, - eomn_serv_MC_mc2pluspsc = 12, - eomn_serv_AS_psc = 13, - eomn_serv_AS_pos = 14, - eomn_serv_MC_mc4plusfaps = 15, - eomn_serv_MC_mc4pluspmc = 16, - eomn_serv_AS_ft = 17, - eomn_serv_AS_battery = 18, + eomn_serv_SK_skin = 7, + eomn_serv_AS_inertials3 = 8, + eomn_serv_AS_temperatures = 9, + eomn_serv_MC_mc2plus = 10, + eomn_serv_MC_mc2pluspsc = 11, + eomn_serv_AS_psc = 12, + eomn_serv_AS_pos = 13, + eomn_serv_MC_mc4plusfaps = 14, + eomn_serv_MC_mc4pluspmc = 15, + eomn_serv_AS_ft = 16, + eomn_serv_AS_battery = 17, eomn_serv_UNKNOWN = 254, eomn_serv_NONE = 255 } eOmn_serv_type_t; -enum { eomn_serv_types_numberof = 19 }; +enum { eomn_serv_types_numberof = 18 }; typedef enum { @@ -503,15 +501,6 @@ typedef struct } eOmn_serv_config_data_as_strain_t; EO_VERIFYsizeof(eOmn_serv_config_data_as_strain_t, 7) -typedef struct -{ // 5+3+100=108 - eObrd_version_t mtbversion; - uint8_t filler[3]; - eOas_inertial_arrayof_sensors_t arrayofsensors; -} eOmn_serv_config_data_as_inertial_t; EO_VERIFYsizeof(eOmn_serv_config_data_as_inertial_t, 108) - - - typedef struct { // 36+132=166 eOas_inertial3_setof_boardinfos_t setofboardinfos; @@ -556,7 +545,6 @@ typedef union eOmn_serv_config_data_as_mais_t mais; eOmn_serv_config_data_as_strain_t strain; eOmn_serv_config_data_as_temperature_t temperature; - eOmn_serv_config_data_as_inertial_t inertial; eOmn_serv_config_data_as_inertial3_t inertial3; eOmn_serv_config_data_as_psc_t psc; eOmn_serv_config_data_as_pos_t pos; @@ -755,9 +743,9 @@ typedef struct typedef struct -{ // 32 + 32 +{ // 16 + 32 uint8_t stateofservice[eomn_serv_categories_numberof]; // use eOmn_serv_state_t - uint8_t filler[5]; + uint8_t filler[6]; eOmn_service_command_result_t commandresult; } eOmn_service_status_t; EO_VERIFYsizeof(eOmn_service_status_t, 48) diff --git a/eth/embobj/plus/comm-v2/protocol/api/EoProtocol.h b/eth/embobj/plus/comm-v2/protocol/api/EoProtocol.h index 432cc70c..e838177e 100644 --- a/eth/embobj/plus/comm-v2/protocol/api/EoProtocol.h +++ b/eth/embobj/plus/comm-v2/protocol/api/EoProtocol.h @@ -212,7 +212,6 @@ typedef enum eoprot_entity_as_strain = eoas_entity_strain, /**< */ eoprot_entity_as_mais = eoas_entity_mais, /**< */ eoprot_entity_as_temperature = eoas_entity_temperature, /**< */ - eoprot_entity_as_inertial = eoas_entity_inertial, /**< */ eoprot_entity_as_inertial3 = eoas_entity_inertial3, /**< */ eoprot_entity_as_psc = eoas_entity_psc, /**< */ eoprot_entity_as_pos = eoas_entity_pos, /**< */ @@ -222,7 +221,7 @@ typedef enum eoprot_entity_none = EOK_uint08dummy } eOprot_entity_t; -enum { eoprot_entities_numberof = 17 }; // it does not count the eoprot_entity_none. +enum { eoprot_entities_numberof = 16 }; // it does not count the eoprot_entity_none. /** @typedef typedef enum eOprot_index_t @@ -272,7 +271,7 @@ typedef struct } eOprot_callbacks_endpoint_descriptor_t; -enum { eoprot_maxvalueof_entity = 8 }; // must be higher equal than the values inside eOprot_entity_t +enum { eoprot_maxvalueof_entity = 7 }; // must be higher equal than the values inside eOprot_entity_t enum { eoprot_entities_maxnumberofsupported = eoprot_maxvalueof_entity+1 }; // it is used to shape data structures // it is what is enough to configure an endpoint typedef struct diff --git a/eth/embobj/plus/comm-v2/protocol/api/EoProtocolAS.h b/eth/embobj/plus/comm-v2/protocol/api/EoProtocolAS.h index 974df94c..75e779b7 100644 --- a/eth/embobj/plus/comm-v2/protocol/api/EoProtocolAS.h +++ b/eth/embobj/plus/comm-v2/protocol/api/EoProtocolAS.h @@ -57,7 +57,7 @@ extern "C" { // - declaration of public user-defined types ------------------------------------------------------------------------- -enum { eoprot_version_as_major = 1, eoprot_version_as_minor = 9 }; +enum { eoprot_version_as_major = 1, eoprot_version_as_minor = 10 }; enum { eoprot_entities_as_numberof = eoas_entities_numberof }; @@ -174,45 +174,6 @@ typedef enum enum { eoprot_rwms_as_temperature_numberof = 4 }; // it MUST be equal to the number of rw modes. - -// - entity inertial - - -/** @typedef typedef enum eOprot_tag_as_inertial_t - @brief It contains the tags for all variables of the inertial entity. - See definition of eOas_inertial_t (and its fields) in file EoAnalogSensors.h for explanation of the variables. - **/ -typedef enum -{ - eoprot_tag_as_inertial_wholeitem = 0, - eoprot_tag_as_inertial_config = 1, - eoprot_tag_as_inertial_config_datarate = 2, - eoprot_tag_as_inertial_config_enabled = 3, - eoprot_tag_as_inertial_status = 4, - eoprot_tag_as_inertial_cmmnds_enable = 5 -} eOprot_tag_as_inertial_t; - -enum { eoprot_tags_as_inertial_numberof = 6 }; // it MUST be equal to the number of tags. - - -/** @typedef typedef enum eOprot_rwm_as_inertial_t - @brief It contains the rw modes for all variables of the inertial entity. There must be a one-to-one - correspondence to the values in eOprot_tag_as_inertial_t. - **/ -typedef enum -{ - eoprot_rwm_as_inertial_wholeitem = eo_nv_rwmode_RO, - eoprot_rwm_as_inertial_config = eo_nv_rwmode_RW, - eoprot_rwm_as_inertial_config_datarate = eo_nv_rwmode_RW, - eoprot_rwm_as_inertial_config_enabled = eo_nv_rwmode_RW, - eoprot_rwm_as_inertial_status = eo_nv_rwmode_RO, - eoprot_rwm_as_inertial_cmmnds_enable = eo_nv_rwmode_RW -} eOprot_rwm_as_inertial_t; - -enum { eoprot_rwms_as_inertial_numberof = 6 }; // it MUST be equal to the number of rw modes. - - - // - entity inertial3 @@ -386,18 +347,17 @@ enum { eoprot_rwms_as_battery_numberof = 4 }; // it MUST be equal to the number @brief It is a template for the organisation of strain, mais etc entities in the analog sensors endpoint. The effective number depends on the board. **/ -typedef struct // 56*1+48*1+8*1 = 112 +typedef struct { eOas_strain_t strain[1]; eOas_mais_t mais[1]; eOas_temperature_t temperature[1]; - eOas_inertial_t inertial[1]; eOas_inertial3_t inertial3[1]; eOas_psc_t psc[1]; eOas_pos_t pos[1]; - eOas_ft_t ft[1]; - eOas_battery_t battery[1]; -} eOprot_template_as_t; //EO_VERIFYsizeof(eOprot_template_as_t, 112); + eOas_ft_t ft[eOas_ft_sensors_maxnumber]; + eOas_battery_t battery[1]; +} eOprot_template_as_t; @@ -473,31 +433,6 @@ extern void eoprot_fun_UPDT_as_temperature_status(const EOnv* nv, const eOropdes extern void eoprot_fun_INIT_as_temperature_cmmnds_enable(const EOnv* nv); extern void eoprot_fun_UPDT_as_temperature_cmmnds_enable(const EOnv* nv, const eOropdescriptor_t* rd); -// -- inertial - -extern void eoprot_fun_INIT_as_inertial_wholeitem(const EOnv* nv); -extern void eoprot_fun_UPDT_as_inertial_wholeitem(const EOnv* nv, const eOropdescriptor_t* rd); - -extern void eoprot_fun_INIT_as_inertial_config(const EOnv* nv); -extern void eoprot_fun_UPDT_as_inertial_config(const EOnv* nv, const eOropdescriptor_t* rd); - -extern void eoprot_fun_INIT_as_inertial_config_datarate(const EOnv* nv); -extern void eoprot_fun_UPDT_as_inertial_config_datarate(const EOnv* nv, const eOropdescriptor_t* rd); - -extern void eoprot_fun_INIT_as_inertial_config_enabled(const EOnv* nv); -extern void eoprot_fun_UPDT_as_inertial_config_enabled(const EOnv* nv, const eOropdescriptor_t* rd); - - - -extern void eoprot_fun_INIT_as_inertial_status(const EOnv* nv); -extern void eoprot_fun_UPDT_as_inertial_status(const EOnv* nv, const eOropdescriptor_t* rd); - - -extern void eoprot_fun_INIT_as_inertial_cmmnds_enable(const EOnv* nv); -extern void eoprot_fun_UPDT_as_inertial_cmmnds_enable(const EOnv* nv, const eOropdescriptor_t* rd); - - - // -- inertial3 extern void eoprot_fun_INIT_as_inertial3_wholeitem(const EOnv* nv); diff --git a/eth/embobj/plus/comm-v2/protocol/src/EoProtocol.c b/eth/embobj/plus/comm-v2/protocol/src/EoProtocol.c index 4fdeb06e..e4dbaf39 100644 --- a/eth/embobj/plus/comm-v2/protocol/src/EoProtocol.c +++ b/eth/embobj/plus/comm-v2/protocol/src/EoProtocol.c @@ -132,7 +132,7 @@ const eOprot_EPcfg_t eoprot_arrayof_stdEPcfg[eoprot_endpoints_numberof] = }, { EO_INIT(.endpoint) eoprot_endpoint_analogsensors, - EO_INIT(.numberofentities) {1, 1, 1, 1, 1, 1, 1, eOas_ft_sensors_maxnumber, 1} + EO_INIT(.numberofentities) {1, 1, 1, 1, 1, 1, eOas_ft_sensors_maxnumber, 1} }, { EO_INIT(.endpoint) eoprot_endpoint_skin, @@ -153,7 +153,7 @@ const eOprot_EPcfg_t eoprot_arrayof_maxEPcfg[eoprot_endpoints_numberof] = }, { EO_INIT(.endpoint) eoprot_endpoint_analogsensors, - EO_INIT(.numberofentities) {1, 1, 1, 1, 1, 1, 1, eOas_ft_sensors_maxnumber, 1} + EO_INIT(.numberofentities) {1, 1, 1, 1, 1, 1, eOas_ft_sensors_maxnumber, 1} }, { EO_INIT(.endpoint) eoprot_endpoint_skin, @@ -170,7 +170,7 @@ const eOprot_EPcfg_t eoprot_arrayof_maxEPcfgOthers[eoprot_endpoints_numberof-1] }, { EO_INIT(.endpoint) eoprot_endpoint_analogsensors, - EO_INIT(.numberofentities) {1, 1, 1, 1, 1, 1, 1, eOas_ft_sensors_maxnumber, 1} + EO_INIT(.numberofentities) {1, 1, 1, 1, 1, 1, eOas_ft_sensors_maxnumber, 1} }, { EO_INIT(.endpoint) eoprot_endpoint_skin, diff --git a/eth/embobj/plus/comm-v2/protocol/src/EoProtocolAS_fun.c b/eth/embobj/plus/comm-v2/protocol/src/EoProtocolAS_fun.c index ad38883e..61ed37a5 100644 --- a/eth/embobj/plus/comm-v2/protocol/src/EoProtocolAS_fun.c +++ b/eth/embobj/plus/comm-v2/protocol/src/EoProtocolAS_fun.c @@ -234,53 +234,7 @@ EO_weak extern void eoprot_fun_INIT_as_temperature_cmmnds_enable(const EOnv* nv) #endif #if !defined(OVERRIDE_eoprot_fun_UPDT_as_temperature_cmmnds_enable) EO_weak extern void eoprot_fun_UPDT_as_temperature_cmmnds_enable(const EOnv* nv, const eOropdescriptor_t* rd) {} -#endif - -// -- inertial - -#if !defined(OVERRIDE_eoprot_fun_INIT_as_inertial_wholeitem) -EO_weak extern void eoprot_fun_INIT_as_inertial_wholeitem(const EOnv* nv) {} -#endif -#if !defined(OVERRIDE_eoprot_fun_UPDT_as_inertial_wholeitem) -EO_weak extern void eoprot_fun_UPDT_as_inertial_wholeitem(const EOnv* nv, const eOropdescriptor_t* rd) {} -#endif - -#if !defined(OVERRIDE_eoprot_fun_INIT_as_inertial_config) -EO_weak extern void eoprot_fun_INIT_as_inertial_config(const EOnv* nv) {} -#endif -#if !defined(OVERRIDE_eoprot_fun_UPDT_as_inertial_config) -EO_weak extern void eoprot_fun_UPDT_as_inertial_config(const EOnv* nv, const eOropdescriptor_t* rd) {} -#endif - -#if !defined(OVERRIDE_eoprot_fun_INIT_as_inertial_config_datarate) -EO_weak extern void eoprot_fun_INIT_as_inertial_config_datarate(const EOnv* nv) {} -#endif -#if !defined(OVERRIDE_eoprot_fun_UPDT_as_inertial_config_datarate) -EO_weak extern void eoprot_fun_UPDT_as_inertial_config_datarate(const EOnv* nv, const eOropdescriptor_t* rd) {} -#endif - -#if !defined(OVERRIDE_eoprot_fun_INIT_as_inertial_config_enabled) -EO_weak extern void eoprot_fun_INIT_as_inertial_config_enabled(const EOnv* nv) {} -#endif -#if !defined(OVERRIDE_eoprot_fun_UPDT_as_inertial_config_enabled) -EO_weak extern void eoprot_fun_UPDT_as_inertial_config_enabled(const EOnv* nv, const eOropdescriptor_t* rd) {} -#endif - -#if !defined(OVERRIDE_eoprot_fun_INIT_as_inertial_status) -EO_weak extern void eoprot_fun_INIT_as_inertial_status(const EOnv* nv) {} -#endif -#if !defined(OVERRIDE_eoprot_fun_UPDT_as_inertial_status) -EO_weak extern void eoprot_fun_UPDT_as_inertial_status(const EOnv* nv, const eOropdescriptor_t* rd) {} -#endif - - -#if !defined(OVERRIDE_eoprot_fun_INIT_as_inertial_cmmnds_enable) -EO_weak extern void eoprot_fun_INIT_as_inertial_cmmnds_enable(const EOnv* nv) {} -#endif -#if !defined(OVERRIDE_eoprot_fun_UPDT_as_inertial_cmmnds_enable) -EO_weak extern void eoprot_fun_UPDT_as_inertial_cmmnds_enable(const EOnv* nv, const eOropdescriptor_t* rd) {} -#endif - +#endif // -- inertial3 diff --git a/eth/embobj/plus/comm-v2/protocol/src/EoProtocolAS_rom.c b/eth/embobj/plus/comm-v2/protocol/src/EoProtocolAS_rom.c index 474814c6..7517f17f 100644 --- a/eth/embobj/plus/comm-v2/protocol/src/EoProtocolAS_rom.c +++ b/eth/embobj/plus/comm-v2/protocol/src/EoProtocolAS_rom.c @@ -74,9 +74,6 @@ EO_VERIFYproposition(eoprot_as_tagsmax_ma, eoprot_tags_as_mais_numberof <= eopro EO_VERIFYproposition(eoprot_as_tagsnum_et, eoprot_tags_as_temperature_numberof == eoprot_rwms_as_temperature_numberof) EO_VERIFYproposition(eoprot_as_tagsmax_et, eoprot_tags_as_temperature_numberof <= eoprot_tags_maxnumberof) -EO_VERIFYproposition(eoprot_as_tagsnum_in, eoprot_tags_as_inertial_numberof == eoprot_rwms_as_inertial_numberof) -EO_VERIFYproposition(eoprot_as_tagsmax_in, eoprot_tags_as_inertial_numberof <= eoprot_tags_maxnumberof) - // -------------------------------------------------------------------------------------------------------------------- // - declaration of static functions // -------------------------------------------------------------------------------------------------------------------- @@ -96,9 +93,6 @@ static const eOas_mais_t eoprot_as_rom_mais_defaultvalue = { 0 }; // - default value of a temperature sensor static const eOas_temperature_t eoprot_as_rom_temperature_defaultvalue = { 0 }; -// - default value of a inertial -static const eOas_inertial_t eoprot_as_rom_inertial_defaultvalue = { 0 }; - // - default value of a inertial3 static const eOas_inertial3_t eoprot_as_rom_inertial3_defaultvalue = { 0 }; @@ -375,103 +369,6 @@ static EOPROT_ROMmap EOnv_rom_t eoprot_as_rom_descriptor_temperature_cmmnds_enab #endif }; - -// - descriptors for the variables of an inertial - -static EOPROT_ROMmap EOnv_rom_t eoprot_as_rom_descriptor_inertial_wholeitem = -{ - EO_INIT(.capacity) sizeof(eoprot_as_rom_inertial_defaultvalue), - EO_INIT(.rwmode) eoprot_rwm_as_inertial_wholeitem, - EO_INIT(.dummy) 0, - EO_INIT(.resetval) (const void*)&eoprot_as_rom_inertial_defaultvalue, -#ifdef EOPROT_CFG_OVERRIDE_CALLBACKS_IN_RUNTIME - EO_INIT(.init) NULL, - EO_INIT(.update) NULL -#else - EO_INIT(.init) eoprot_fun_INIT_as_inertial_wholeitem, - EO_INIT(.update) eoprot_fun_UPDT_as_inertial_wholeitem -#endif -}; - -static EOPROT_ROMmap EOnv_rom_t eoprot_as_rom_descriptor_inertial_config = -{ - EO_INIT(.capacity) sizeof(eoprot_as_rom_inertial_defaultvalue.config), - EO_INIT(.rwmode) eoprot_rwm_as_inertial_config, - EO_INIT(.dummy) 0, - EO_INIT(.resetval) (const void*)&eoprot_as_rom_inertial_defaultvalue.config, -#ifdef EOPROT_CFG_OVERRIDE_CALLBACKS_IN_RUNTIME - EO_INIT(.init) NULL, - EO_INIT(.update) NULL -#else - EO_INIT(.init) eoprot_fun_INIT_as_inertial_config, - EO_INIT(.update) eoprot_fun_UPDT_as_inertial_config -#endif -}; - - -static EOPROT_ROMmap EOnv_rom_t eoprot_as_rom_descriptor_inertial_config_datarate = -{ - EO_INIT(.capacity) sizeof(eoprot_as_rom_inertial_defaultvalue.config.datarate), - EO_INIT(.rwmode) eoprot_rwm_as_inertial_config_datarate, - EO_INIT(.dummy) 0, - EO_INIT(.resetval) (const void*)&eoprot_as_rom_inertial_defaultvalue.config.datarate, -#ifdef EOPROT_CFG_OVERRIDE_CALLBACKS_IN_RUNTIME - EO_INIT(.init) NULL, - EO_INIT(.update) NULL -#else - EO_INIT(.init) eoprot_fun_INIT_as_inertial_config_datarate, - EO_INIT(.update) eoprot_fun_UPDT_as_inertial_config_datarate -#endif -}; - - -static EOPROT_ROMmap EOnv_rom_t eoprot_as_rom_descriptor_inertial_config_enabled = -{ - EO_INIT(.capacity) sizeof(eoprot_as_rom_inertial_defaultvalue.config.enabled), - EO_INIT(.rwmode) eoprot_rwm_as_inertial_config_enabled, - EO_INIT(.dummy) 0, - EO_INIT(.resetval) (const void*)&eoprot_as_rom_inertial_defaultvalue.config.enabled, -#ifdef EOPROT_CFG_OVERRIDE_CALLBACKS_IN_RUNTIME - EO_INIT(.init) NULL, - EO_INIT(.update) NULL -#else - EO_INIT(.init) eoprot_fun_INIT_as_inertial_config_enabled, - EO_INIT(.update) eoprot_fun_UPDT_as_inertial_config_enabled -#endif -}; - -static EOPROT_ROMmap EOnv_rom_t eoprot_as_rom_descriptor_inertial_status = -{ - EO_INIT(.capacity) sizeof(eoprot_as_rom_inertial_defaultvalue.status), - EO_INIT(.rwmode) eoprot_rwm_as_inertial_status, - EO_INIT(.dummy) 0, - EO_INIT(.resetval) (const void*)&eoprot_as_rom_inertial_defaultvalue.status, -#ifdef EOPROT_CFG_OVERRIDE_CALLBACKS_IN_RUNTIME - EO_INIT(.init) NULL, - EO_INIT(.update) NULL -#else - EO_INIT(.init) eoprot_fun_INIT_as_inertial_status, - EO_INIT(.update) eoprot_fun_UPDT_as_inertial_status -#endif -}; - - -static EOPROT_ROMmap EOnv_rom_t eoprot_as_rom_descriptor_inertial_cmmnds_enable = -{ - EO_INIT(.capacity) sizeof(eoprot_as_rom_inertial_defaultvalue.cmmnds.enable), - EO_INIT(.rwmode) eoprot_rwm_as_inertial_cmmnds_enable, - EO_INIT(.dummy) 0, - EO_INIT(.resetval) (const void*)&eoprot_as_rom_inertial_defaultvalue.cmmnds.enable, -#ifdef EOPROT_CFG_OVERRIDE_CALLBACKS_IN_RUNTIME - EO_INIT(.init) NULL, - EO_INIT(.update) NULL -#else - EO_INIT(.init) eoprot_fun_INIT_as_inertial_cmmnds_enable, - EO_INIT(.update) eoprot_fun_UPDT_as_inertial_cmmnds_enable -#endif -}; - - // - descriptors for the variables of an inertial3 static EOPROT_ROMmap EOnv_rom_t eoprot_as_rom_descriptor_inertial3_wholeitem = @@ -851,16 +748,6 @@ static EOPROT_ROMmap EOnv_rom_t * const s_eoprot_as_rom_temperature_descriptors[ &eoprot_as_rom_descriptor_temperature_cmmnds_enable }; EO_VERIFYsizeof(s_eoprot_as_rom_temperature_descriptors, sizeof(EOPROT_ROMmap EOnv_rom_t* const)*(eoprot_tags_as_temperature_numberof)) -static EOPROT_ROMmap EOnv_rom_t * const s_eoprot_as_rom_inertial_descriptors[] = -{ // here are eoprot_tags_as_inertial_numberof descriptors for the inertial entity - &eoprot_as_rom_descriptor_inertial_wholeitem, - &eoprot_as_rom_descriptor_inertial_config, - &eoprot_as_rom_descriptor_inertial_config_datarate, - &eoprot_as_rom_descriptor_inertial_config_enabled, - &eoprot_as_rom_descriptor_inertial_status, - &eoprot_as_rom_descriptor_inertial_cmmnds_enable -}; EO_VERIFYsizeof(s_eoprot_as_rom_inertial_descriptors, sizeof(EOPROT_ROMmap EOnv_rom_t* const)*(eoprot_tags_as_inertial_numberof)) - static EOPROT_ROMmap EOnv_rom_t * const s_eoprot_as_rom_inertial3_descriptors[] = { // here are eoprot_tags_as_inertial3_numberof descriptors for the inertial entity &eoprot_as_rom_descriptor_inertial3_wholeitem, @@ -909,7 +796,6 @@ EOPROT_ROMmap EOnv_rom_t * const * const eoprot_as_rom_descriptors[] = (EOPROT_ROMmap EOnv_rom_t **)&s_eoprot_as_rom_strain_descriptors, (EOPROT_ROMmap EOnv_rom_t **)&s_eoprot_as_rom_mais_descriptors, (EOPROT_ROMmap EOnv_rom_t **)&s_eoprot_as_rom_temperature_descriptors, - (EOPROT_ROMmap EOnv_rom_t **)&s_eoprot_as_rom_inertial_descriptors, (EOPROT_ROMmap EOnv_rom_t **)&s_eoprot_as_rom_inertial3_descriptors, (EOPROT_ROMmap EOnv_rom_t **)&s_eoprot_as_rom_psc_descriptors, (EOPROT_ROMmap EOnv_rom_t **)&s_eoprot_as_rom_pos_descriptors, @@ -924,7 +810,6 @@ const uint8_t eoprot_as_rom_tags_numberof[] = eoprot_tags_as_strain_numberof, eoprot_tags_as_mais_numberof, eoprot_tags_as_temperature_numberof, - eoprot_tags_as_inertial_numberof, eoprot_tags_as_inertial3_numberof, eoprot_tags_as_psc_numberof, eoprot_tags_as_pos_numberof, @@ -937,7 +822,6 @@ const uint16_t eoprot_as_rom_entities_sizeof[] = sizeof(eOas_strain_t), sizeof(eOas_mais_t), sizeof(eOas_temperature_t), - sizeof(eOas_inertial_t), sizeof(eOas_inertial3_t), sizeof(eOas_psc_t), sizeof(eOas_pos_t), @@ -950,7 +834,6 @@ const void* const eoprot_as_rom_entities_defval[] = (const void*)&eoprot_as_rom_strain_defaultvalue, (const void*)&eoprot_as_rom_mais_defaultvalue, (const void*)&eoprot_as_rom_temperature_defaultvalue, - (const void*)&eoprot_as_rom_inertial_defaultvalue, (const void*)&eoprot_as_rom_inertial3_defaultvalue, (const void*)&eoprot_as_rom_psc_defaultvalue, (const void*)&eoprot_as_rom_pos_defaultvalue, @@ -966,7 +849,6 @@ const char * const eoprot_as_strings_entity[] = "eoprot_entity_as_strain", "eoprot_entity_as_mais", "eoprot_entity_as_temperature", - "eoprot_entity_as_inertial", "eoprot_entity_as_inertial3", "eoprot_entity_as_psc", "eoprot_entity_as_pos", @@ -1004,16 +886,6 @@ static const char * const s_eoprot_as_strings_tags_temperature[] = "eoprot_tag_as_temperature_cmmnds_enable" }; EO_VERIFYsizeof(s_eoprot_as_strings_tags_temperature, eoprot_tags_as_temperature_numberof*sizeof(const char*)) -static const char * const s_eoprot_as_strings_tags_inertial[] = -{ - "eoprot_tag_as_inertial_wholeitem", - "eoprot_tag_as_inertial_config", - "eoprot_tag_as_inertial_config_datarate", - "eoprot_tag_as_inertial_config_enabled", - "eoprot_tag_as_inertial_status", - "eoprot_tag_as_inertial_cmmnds_enable" -}; EO_VERIFYsizeof(s_eoprot_as_strings_tags_inertial, eoprot_tags_as_inertial_numberof*sizeof(const char*)) - static const char * const s_eoprot_as_strings_tags_inertial3[] = { "eoprot_tag_as_inertial3_wholeitem", @@ -1062,7 +934,6 @@ const char ** const eoprot_as_strings_tags[] = (const char**)&s_eoprot_as_strings_tags_strain, (const char**)&s_eoprot_as_strings_tags_mais, (const char**)&s_eoprot_as_strings_tags_temperature, - (const char**)&s_eoprot_as_strings_tags_inertial, (const char**)&s_eoprot_as_strings_tags_inertial3, (const char**)&s_eoprot_as_strings_tags_psc, (const char**)&s_eoprot_as_strings_tags_pos,