From 7f54ec1d37f04e960c5dae3f543d0bcb3dff77d8 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Mon, 17 Feb 2025 19:35:25 +0100 Subject: [PATCH] change color ooption group position --- src/kds_s2000w_handler_opts.c | 17 ++++++----- src/kds_s2000w_option_descriptors.c | 4 +-- tests/kds_s2000w_net_get_opt_tests.c | 30 +++++++++---------- tests/kds_s2000w_net_get_opt_tests.h | 2 +- tests/kds_s2000w_net_get_opt_tests_run.c | 4 +-- tests/kds_s2000w_option_descriptor_tests.c | 34 +++++++++++----------- 6 files changed, 46 insertions(+), 45 deletions(-) diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index 6ed465f..f0bfc1b 100644 --- a/src/kds_s2000w_handler_opts.c +++ b/src/kds_s2000w_handler_opts.c @@ -198,10 +198,6 @@ void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value value_object = json_object_object_get(config, "BackgroundSmoothingAggressiveness"); _kds_s2000w_handler_opts_write_int_value(value_object, value); break; - case 18: - value_object = json_object_object_get(config, "ColorBalanceGreen"); - _kds_s2000w_handler_opts_write_int_value(value_object, value); - break; case 19: value_object = json_object_object_get(config, "ColorBalanceBlue"); _kds_s2000w_handler_opts_write_int_value(value_object, value); @@ -298,6 +294,10 @@ void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value value_object = json_object_object_get(config, "ColorBalanceAggressiveness"); _kds_s2000w_handler_opts_write_int_value(value_object, value); break; + case 43: + value_object = json_object_object_get(config, "ColorBalanceGreen"); + _kds_s2000w_handler_opts_write_int_value(value_object, value); + break; default: break; } @@ -392,10 +392,7 @@ void kds_s2000w_handler_opts_set_option(handler* h, uint32_t option, void* value value_object = json_object_object_get(config, "BackgroundSmoothingAggressiveness"); _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; - case 18: - value_object = json_object_object_get(config, "ColorBalanceGreen"); - _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); - break; + case 19: value_object = json_object_object_get(config, "ColorBalanceBlue"); _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); @@ -492,6 +489,10 @@ void kds_s2000w_handler_opts_set_option(handler* h, uint32_t option, void* value value_object = json_object_object_get(config, "ColorBalanceAggressiveness"); _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; + case 43: + value_object = json_object_object_get(config, "ColorBalanceGreen"); + _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); + break; case 44: _kds_s2000w_handler_opts_set_option_to_default(h); _kds_s2000w_handler_opts_set_autostart_on(h); diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c index 8c7a344..fd4ea48 100644 --- a/src/kds_s2000w_option_descriptors.c +++ b/src/kds_s2000w_option_descriptors.c @@ -1096,7 +1096,7 @@ void kds_s2000w_option_descriptors_init() descriptor_array[15] = _kds_s2000w_option_descriptor_foreground_boldness_aggressiveness(); descriptor_array[16] = _kds_s2000w_option_descriptor_background_smoothing_mode(); descriptor_array[17] = _kds_s2000w_option_descriptor_background_smoothing_aggressiveness(); - descriptor_array[18] = _kds_s2000w_option_descriptor_color_balance_green(); + descriptor_array[18] = _kds_s2000w_option_descriptor_boldness_color_group(); descriptor_array[19] = _kds_s2000w_option_descriptor_color_balance_blue(); descriptor_array[20] = _kds_s2000w_option_descriptor_color_balance_red(); descriptor_array[21] = _kds_s2000w_option_descriptor_binarization_contrast(); @@ -1121,7 +1121,7 @@ void kds_s2000w_option_descriptors_init() descriptor_array[40] = _kds_s2000w_option_descriptor_color_sharpen(); descriptor_array[41] = _kds_s2000w_option_descriptor_color_balance_mode(); descriptor_array[42] = _kds_s2000w_option_descriptor_color_balancea_agressiveness(); - descriptor_array[43] = _kds_s2000w_option_descriptor_boldness_color_group(); + descriptor_array[43] = _kds_s2000w_option_descriptor_color_balance_green(); descriptor_array[44] = _kds_s2000w_option_descriptor_config_reset(); } diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c index 877015f..739ad74 100644 --- a/tests/kds_s2000w_net_get_opt_tests.c +++ b/tests/kds_s2000w_net_get_opt_tests.c @@ -240,21 +240,6 @@ void sane_kds_s2000w_net_control_get_option_seventeen_test(void** state) h = NULL; } -void sane_kds_s2000w_net_control_get_option_eightteen_test(void** state) -{ - handler* h = kds_s2000w_handler_init(); - response* resp = (response*) *state; - h->current_scanner_config = json_tokener_parse(resp->data); - int32_t value = -1; - - sane_kds_s2000w_net_control_option(h, 18, SANE_ACTION_GET_VALUE, &value, NULL); - - assert_int_equal(value, 0); - - kds_s2000w_handler_free(h); - h = NULL; -} - void sane_kds_s2000w_net_control_get_option_nineteen_test(void** state) { @@ -612,6 +597,21 @@ void sane_kds_s2000w_net_control_get_option_fourtytwo_test(void** state) assert_int_equal(value, 0); + kds_s2000w_handler_free(h); + h = NULL; +} + +void sane_kds_s2000w_net_control_get_option_fourtythree_test(void** state) +{ + handler* h = kds_s2000w_handler_init(); + response* resp = (response*) *state; + h->current_scanner_config = json_tokener_parse(resp->data); + int32_t value = -1; + + sane_kds_s2000w_net_control_option(h, 43, SANE_ACTION_GET_VALUE, &value, NULL); + + assert_int_equal(value, 0); + kds_s2000w_handler_free(h); h = NULL; } \ No newline at end of file diff --git a/tests/kds_s2000w_net_get_opt_tests.h b/tests/kds_s2000w_net_get_opt_tests.h index bcf09bb..180ec83 100644 --- a/tests/kds_s2000w_net_get_opt_tests.h +++ b/tests/kds_s2000w_net_get_opt_tests.h @@ -21,7 +21,6 @@ void sane_kds_s2000w_net_control_get_option_fourteen_test(void** state); void sane_kds_s2000w_net_control_get_option_fifteen_test(void** state); void sane_kds_s2000w_net_control_get_option_sixteen_test(void** state); void sane_kds_s2000w_net_control_get_option_seventeen_test(void** state); -void sane_kds_s2000w_net_control_get_option_eightteen_test(void** state); void sane_kds_s2000w_net_control_get_option_nineteen_test(void** state); void sane_kds_s2000w_net_control_get_option_twenty_test(void** state); void sane_kds_s2000w_net_control_get_option_twentyone_test(void** state); @@ -46,5 +45,6 @@ void sane_kds_s2000w_net_control_get_option_thirdynine_test(void** state); void sane_kds_s2000w_net_control_get_option_fourty_test(void** state); void sane_kds_s2000w_net_control_get_option_fourtyone_test(void** state); void sane_kds_s2000w_net_control_get_option_fourtytwo_test(void** state); +void sane_kds_s2000w_net_control_get_option_fourtythree_test(void** state); #endif \ No newline at end of file diff --git a/tests/kds_s2000w_net_get_opt_tests_run.c b/tests/kds_s2000w_net_get_opt_tests_run.c index 199a2bc..9716f58 100644 --- a/tests/kds_s2000w_net_get_opt_tests_run.c +++ b/tests/kds_s2000w_net_get_opt_tests_run.c @@ -95,7 +95,6 @@ int main() cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_fifteen_test, setup_default_get_option, teardown_default_get_option), cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_sixteen_test, setup_default_get_option, teardown_default_get_option), cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_seventeen_test, setup_default_get_option, teardown_default_get_option), - cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_eightteen_test, setup_default_get_option, teardown_default_get_option), cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_nineteen_test, setup_default_get_option, teardown_default_get_option), cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_twenty_test, setup_default_get_option, teardown_default_get_option), cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_twentyone_test, setup_default_get_option, teardown_default_get_option), @@ -119,7 +118,8 @@ int main() cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_thirdynine_test, setup_default_get_option, teardown_default_get_option), cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_fourty_test, setup_default_get_option, teardown_default_get_option), cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_fourtyone_test, setup_default_get_option, teardown_default_get_option), - cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_fourtytwo_test, setup_default_get_option, teardown_default_get_option) + cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_fourtytwo_test, setup_default_get_option, teardown_default_get_option), + cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_fourtythree_test, setup_default_get_option, teardown_default_get_option) }; return cmocka_run_group_tests(net_tests, NULL, NULL); diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c index 57b931e..a8d6d73 100644 --- a/tests/kds_s2000w_option_descriptor_tests.c +++ b/tests/kds_s2000w_option_descriptor_tests.c @@ -326,17 +326,14 @@ void kds_s2000w_option_get_descriptor_eightteen_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(18); - assert_string_equal("colorbalancegreen", option->name); - assert_string_equal("colorbalancegreen", option->title); - assert_string_equal("colorbalancegreen", option->desc); - assert_int_equal(SANE_TYPE_INT, option->type); + assert_string_equal("color-options", option->name); + assert_string_equal("Color Options", option->title); + assert_string_equal("Color Options", option->desc); + assert_int_equal(SANE_TYPE_GROUP, option->type); assert_int_equal(SANE_UNIT_NONE, option->unit); - assert_int_equal(sizeof(SANE_Int), option->size); - assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT, option->cap); - assert_int_equal(SANE_CONSTRAINT_RANGE, option->constraint_type); - assert_int_equal(-50, option->constraint.range->min); - assert_int_equal(50, option->constraint.range->max); - assert_int_equal(1, option->constraint.range->quant); + assert_int_equal(0, option->size); + assert_int_equal(SANE_CAP_SOFT_DETECT, option->cap); + assert_int_equal(SANE_CONSTRAINT_NONE, option->constraint_type); } void kds_s2000w_option_get_descriptor_nineteen_test() @@ -769,14 +766,17 @@ void kds_s2000w_option_get_descriptor_fourtythree_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(43); - assert_string_equal("color-options", option->name); - assert_string_equal("Color Options", option->title); - assert_string_equal("Color Options", option->desc); - assert_int_equal(SANE_TYPE_GROUP, option->type); + assert_string_equal("colorbalancegreen", option->name); + assert_string_equal("colorbalancegreen", option->title); + assert_string_equal("colorbalancegreen", option->desc); + assert_int_equal(SANE_TYPE_INT, option->type); assert_int_equal(SANE_UNIT_NONE, option->unit); - assert_int_equal(0, option->size); - assert_int_equal(SANE_CAP_SOFT_DETECT, option->cap); - assert_int_equal(SANE_CONSTRAINT_NONE, option->constraint_type); + assert_int_equal(sizeof(SANE_Int), option->size); + assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT, option->cap); + assert_int_equal(SANE_CONSTRAINT_RANGE, option->constraint_type); + assert_int_equal(-50, option->constraint.range->min); + assert_int_equal(50, option->constraint.range->max); + assert_int_equal(1, option->constraint.range->quant); } void kds_s2000w_option_get_descriptor_fourtyfour_test() -- 2.39.5