diff --git a/lib/common/cmp_data_types.c b/lib/common/cmp_data_types.c index 7c95c9a8ebd00499273426fafa0527d41d1be992..2cff95b24e8a6044b0114a841f45c3d963bffdce 100644 --- a/lib/common/cmp_data_types.c +++ b/lib/common/cmp_data_types.c @@ -405,11 +405,8 @@ enum cmp_data_type convert_subservice_to_cmp_data_type(uint8_t subservice) return DATA_TYPE_F_CAM_IMAGETTE; case SST_FCx_S_SCIENCE_OFFSET_VALUES: return DATA_TYPE_F_CAM_OFFSET; - /* TODO: SST_FCx_S_BACKGROUND_VALUES and SST_NCxx_S_SCIENCE_IMAGETTE has - * the same subservice number*/ - /* case SST_FCx_S_BACKGROUND_VALUES: */ - /* return DATA_TYPE_F_CAM_BACKGROUND; */ - /* break; */ + case SST_FCx_S_BACKGROUND_VALUES: + return DATA_TYPE_F_CAM_BACKGROUND; default: return DATA_TYPE_UNKNOWN; }; diff --git a/lib/common/cmp_data_types.h b/lib/common/cmp_data_types.h index f712a82584ac42c365d1026a7237c23866788c6e..267baf1487b59b0160e6395ee1fd77f367b1b993 100644 --- a/lib/common/cmp_data_types.h +++ b/lib/common/cmp_data_types.h @@ -63,7 +63,7 @@ /* subservice types for service 228 */ #define SST_FCx_S_SCIENCE_IMAGETTE 1 /* Imagettes from F-camera. */ #define SST_FCx_S_SCIENCE_OFFSET_VALUES 2 /* Offset values Mean of the pixels of offset windows */ -#define SST_FCx_S_BACKGROUND_VALUES 3 /* Background values. Mean of the pixels of background windows */ +#define SST_FCx_S_BACKGROUND_VALUES 25 /* TBC: Background values. Mean of the pixels of background windows */ /* size of a collection (multi entry) header */ #define COLLECTION_HDR_SIZE 12 diff --git a/lib/icu_compress/cmp_icu.c b/lib/icu_compress/cmp_icu.c index 1ec466d050e037d8926495fced5bfa4b0c20c3ec..ba3f8f46a0c039d14edae3ba4e2ffbb65e19dcbc 100644 --- a/lib/icu_compress/cmp_icu.c +++ b/lib/icu_compress/cmp_icu.c @@ -2479,6 +2479,11 @@ static enum chunk_type get_chunk_type(uint16_t subservice) case SST_NCxx_S_SCIENCE_L_FX_EFX_NCOB_ECOB: chunk_type = CHUNK_TYPE_LONG_CADENCE; break; + case SST_FCx_S_SCIENCE_IMAGETTE: + case SST_FCx_S_SCIENCE_OFFSET_VALUES: + case SST_FCx_S_BACKGROUND_VALUES: + chunk_type = CHUNK_TYPE_F_CHAIN; + break; case SST_NCxx_S_SCIENCE_F_FX: case SST_NCxx_S_SCIENCE_F_FX_EFX: case SST_NCxx_S_SCIENCE_F_FX_NCOB: