From 4b0d4953ffcf20f83da80c61f7936339afac71f1 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Mon, 17 Feb 2025 20:42:20 +0100 Subject: [PATCH] change color balance green position --- src/kds_s2000w_handler_opts.c | 16 ++++----- src/kds_s2000w_option_descriptors.c | 10 +++--- tests/kds_s2000w_net_get_opt_tests.c | 8 ++--- tests/kds_s2000w_option_descriptor_tests.c | 40 +++++++++++----------- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index ffa54a8..13e6058 100644 --- a/src/kds_s2000w_handler_opts.c +++ b/src/kds_s2000w_handler_opts.c @@ -231,8 +231,8 @@ void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value _kds_s2000w_handler_opts_write_int_value(value_object, value); break; case 27: - value_object = json_object_object_get(config, "TransportHandling"); - _kds_s2000w_handler_opts_write_string_value(value_object, value); + value_object = json_object_object_get(config, "ColorBalanceGreen"); + _kds_s2000w_handler_opts_write_int_value(value_object, value); break; case 28: value_object = json_object_object_get(config, "JpegQuality"); @@ -295,8 +295,8 @@ void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value _kds_s2000w_handler_opts_write_string_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); + value_object = json_object_object_get(config, "TransportHandling"); + _kds_s2000w_handler_opts_write_string_value(value_object, value); break; default: break; @@ -425,8 +425,8 @@ void kds_s2000w_handler_opts_set_option(handler* h, uint32_t option, void* value _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; case 27: - value_object = json_object_object_get(config, "TransportHandling"); - _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); + value_object = json_object_object_get(config, "ColorBalanceGreen"); + _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; case 28: value_object = json_object_object_get(config, "JpegQuality"); @@ -489,8 +489,8 @@ void kds_s2000w_handler_opts_set_option(handler* h, uint32_t option, void* value _kds_s2000w_handler_opts_write_string_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); + value_object = json_object_object_get(config, "TransportHandling"); + _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); break; case 44: _kds_s2000w_handler_opts_set_option_to_default(h); diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c index 3954397..31f2f7c 100644 --- a/src/kds_s2000w_option_descriptors.c +++ b/src/kds_s2000w_option_descriptors.c @@ -319,9 +319,9 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_color_balance_green() constraint->quant = 1; SANE_Option_Descriptor descriptor = { - "colorbalancegreen", - "colorbalancegreen", - "colorbalancegreen", + "color-balance-green", + "Color Balance Green", + "Color Balance Green", SANE_TYPE_INT, SANE_UNIT_NONE, sizeof(SANE_Int), @@ -1105,7 +1105,7 @@ void kds_s2000w_option_descriptors_init() descriptor_array[24] = _kds_s2000w_option_descriptor_color_balance_mode(); descriptor_array[25] = _kds_s2000w_option_descriptor_color_balancea_agressiveness(); descriptor_array[26] = _kds_s2000w_option_descriptor_color_balance_red(); - descriptor_array[27] = _kds_s2000w_option_descriptor_transport_handling(); + descriptor_array[27] = _kds_s2000w_option_descriptor_color_balance_green(); descriptor_array[28] = _kds_s2000w_option_descriptor_jpeg_quality(); descriptor_array[29] = _kds_s2000w_option_descriptor_document_feeder_timeout_response(); descriptor_array[30] = _kds_s2000w_option_descriptor_hole_fill(); @@ -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_post_scan_rotation(); descriptor_array[42] = _kds_s2000w_option_descriptor_edge_fill(); - descriptor_array[43] = _kds_s2000w_option_descriptor_color_balance_green(); + descriptor_array[43] = _kds_s2000w_option_descriptor_transport_handling(); 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 834d5d7..129a7e8 100644 --- a/tests/kds_s2000w_net_get_opt_tests.c +++ b/tests/kds_s2000w_net_get_opt_tests.c @@ -365,11 +365,11 @@ void sane_kds_s2000w_net_control_get_option_twentyseven_test(void** state) handler* h = kds_s2000w_handler_init(); response* resp = (response*) *state; h->current_scanner_config = json_tokener_parse(resp->data); - char* value[50] = {0}; + int32_t value = -1; sane_kds_s2000w_net_control_option(h, 27, SANE_ACTION_GET_VALUE, &value, NULL); - assert_string_equal(value, "Normal"); + assert_int_equal(value, 0); kds_s2000w_handler_free(h); h = NULL; @@ -605,11 +605,11 @@ 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; + char* value[50] = {0}; sane_kds_s2000w_net_control_option(h, 43, SANE_ACTION_GET_VALUE, &value, NULL); - assert_int_equal(value, 0); + assert_string_equal(value, "Normal"); kds_s2000w_handler_free(h); h = NULL; diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c index f85e005..5542cc7 100644 --- a/tests/kds_s2000w_option_descriptor_tests.c +++ b/tests/kds_s2000w_option_descriptor_tests.c @@ -485,19 +485,17 @@ void kds_s2000w_option_get_descriptor_twentyseven_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(27); - assert_string_equal("transport-handling", option->name); - assert_string_equal("Transport Handling", option->title); - assert_string_equal("Transport Handling", option->desc); - assert_int_equal(SANE_TYPE_STRING, option->type); + assert_string_equal("color-balance-green", option->name); + assert_string_equal("Color Balance Green", option->title); + assert_string_equal("Color Balance Green", option->desc); + assert_int_equal(SANE_TYPE_INT, option->type); assert_int_equal(SANE_UNIT_NONE, option->unit); - assert_int_equal(sizeof(SANE_String_Const*) * 5, option->size); + 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_STRING_LIST, option->constraint_type); - assert_string_equal("Normal", option->constraint.string_list[0]); - assert_string_equal("ImprovedStacking", option->constraint.string_list[1]); - assert_string_equal("BestStacking", option->constraint.string_list[2]); - assert_string_equal("Special", option->constraint.string_list[3]); - assert_null(option->constraint.string_list[4]); + 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_twentyeight_test() @@ -766,17 +764,19 @@ void kds_s2000w_option_get_descriptor_fourtythree_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(43); - 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("transport-handling", option->name); + assert_string_equal("Transport Handling", option->title); + assert_string_equal("Transport Handling", option->desc); + assert_int_equal(SANE_TYPE_STRING, option->type); assert_int_equal(SANE_UNIT_NONE, option->unit); - assert_int_equal(sizeof(SANE_Int), option->size); + assert_int_equal(sizeof(SANE_String_Const*) * 5, 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(SANE_CONSTRAINT_STRING_LIST, option->constraint_type); + assert_string_equal("Normal", option->constraint.string_list[0]); + assert_string_equal("ImprovedStacking", option->constraint.string_list[1]); + assert_string_equal("BestStacking", option->constraint.string_list[2]); + assert_string_equal("Special", option->constraint.string_list[3]); + assert_null(option->constraint.string_list[4]); } void kds_s2000w_option_get_descriptor_fourtyfour_test() -- 2.39.5