@@ -923,13 +923,13 @@ void ffOptionsGenerateDisplayJsonConfig(FFdata* data, FFOptionsDisplay* options)
923923 yyjson_mut_obj_add_str (doc , temperature , "unit" , "D" );
924924 break ;
925925 case FF_TEMPERATURE_UNIT_CELSIUS :
926- yyjson_mut_obj_add_str (doc , obj , "unit" , "C" );
926+ yyjson_mut_obj_add_str (doc , temperature , "unit" , "C" );
927927 break ;
928928 case FF_TEMPERATURE_UNIT_FAHRENHEIT :
929- yyjson_mut_obj_add_str (doc , obj , "unit" , "F" );
929+ yyjson_mut_obj_add_str (doc , temperature , "unit" , "F" );
930930 break ;
931931 case FF_TEMPERATURE_UNIT_KELVIN :
932- yyjson_mut_obj_add_str (doc , obj , "unit" , "K" );
932+ yyjson_mut_obj_add_str (doc , temperature , "unit" , "K" );
933933 break ;
934934 }
935935 yyjson_mut_obj_add_uint (doc , temperature , "ndigits" , options -> tempNdigits );
@@ -960,7 +960,7 @@ void ffOptionsGenerateDisplayJsonConfig(FFdata* data, FFOptionsDisplay* options)
960960 yyjson_mut_arr_add_str (doc , type , "num" );
961961 }
962962 if (options -> percentType & FF_PERCENTAGE_TYPE_BAR_BIT ) {
963- yyjson_mut_arr_add_str (doc , type , "var " );
963+ yyjson_mut_arr_add_str (doc , type , "bar " );
964964 }
965965 if (options -> percentType & FF_PERCENTAGE_TYPE_HIDE_OTHERS_BIT ) {
966966 yyjson_mut_arr_add_str (doc , type , "hide-others" );
@@ -1022,6 +1022,18 @@ void ffOptionsGenerateDisplayJsonConfig(FFdata* data, FFOptionsDisplay* options)
10221022 } else {
10231023 yyjson_mut_obj_add_uint (doc , fraction , "ndigits" , (uint8_t ) options -> fractionNdigits );
10241024 }
1025+
1026+ switch (options -> fractionTrailingZeros ) {
1027+ case FF_FRACTION_TRAILING_ZEROS_TYPE_DEFAULT :
1028+ yyjson_mut_obj_add_str (doc , fraction , "trailingZeros" , "default" );
1029+ break ;
1030+ case FF_FRACTION_TRAILING_ZEROS_TYPE_ALWAYS :
1031+ yyjson_mut_obj_add_str (doc , fraction , "trailingZeros" , "always" );
1032+ break ;
1033+ case FF_FRACTION_TRAILING_ZEROS_TYPE_NEVER :
1034+ yyjson_mut_obj_add_str (doc , fraction , "trailingZeros" , "never" );
1035+ break ;
1036+ }
10251037 }
10261038
10271039 yyjson_mut_obj_add_bool (doc , obj , "noBuffer" , options -> noBuffer );
@@ -1039,9 +1051,21 @@ void ffOptionsGenerateDisplayJsonConfig(FFdata* data, FFOptionsDisplay* options)
10391051 case FF_MODULE_KEY_TYPE_ICON :
10401052 yyjson_mut_obj_add_str (doc , key , "type" , "icon" );
10411053 break ;
1042- case FF_MODULE_KEY_TYPE_BOTH :
1054+ case FF_MODULE_KEY_TYPE_BOTH_0 :
1055+ yyjson_mut_obj_add_str (doc , key , "type" , "both-0" );
1056+ break ;
1057+ case FF_MODULE_KEY_TYPE_BOTH_1 : // alias: both
10431058 yyjson_mut_obj_add_str (doc , key , "type" , "both" );
10441059 break ;
1060+ case FF_MODULE_KEY_TYPE_BOTH_2 :
1061+ yyjson_mut_obj_add_str (doc , key , "type" , "both-2" );
1062+ break ;
1063+ case FF_MODULE_KEY_TYPE_BOTH_3 :
1064+ yyjson_mut_obj_add_str (doc , key , "type" , "both-3" );
1065+ break ;
1066+ case FF_MODULE_KEY_TYPE_BOTH_4 :
1067+ yyjson_mut_obj_add_str (doc , key , "type" , "both-4" );
1068+ break ;
10451069 }
10461070
10471071 yyjson_mut_obj_add_uint (doc , key , "paddingLeft" , options -> keyPaddingLeft );
@@ -1050,7 +1074,7 @@ void ffOptionsGenerateDisplayJsonConfig(FFdata* data, FFOptionsDisplay* options)
10501074 {
10511075 yyjson_mut_val * freq = yyjson_mut_obj_add_obj (doc , obj , "freq" );
10521076 yyjson_mut_obj_add_int (doc , freq , "ndigits" , options -> freqNdigits );
1053- switch (options -> percentSpaceBeforeUnit ) {
1077+ switch (options -> freqSpaceBeforeUnit ) {
10541078 case FF_SPACE_BEFORE_UNIT_DEFAULT :
10551079 yyjson_mut_obj_add_str (doc , freq , "spaceBeforeUnit" , "default" );
10561080 break ;
0 commit comments