From 4698b09cedeb543cd56e763531b61d9b1783b5d7 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Mon, 17 Feb 2025 20:12:40 +0100 Subject: [PATCH] change color brightness position --- src/kds_s2000w_handler_opts.c | 16 ++++----- src/kds_s2000w_option_descriptors.c | 8 ++--- tests/kds_s2000w_net_get_opt_tests.c | 8 ++--- tests/kds_s2000w_option_descriptor_tests.c | 40 +++++++++++----------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index 817e03a..b3e8243 100644 --- a/src/kds_s2000w_handler_opts.c +++ b/src/kds_s2000w_handler_opts.c @@ -211,8 +211,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 22: - value_object = json_object_object_get(config, "MultifeedSensitivity"); - _kds_s2000w_handler_opts_write_string_value(value_object, value); + value_object = json_object_object_get(config, "ColorBrightness"); + _kds_s2000w_handler_opts_write_int_value(value_object, value); break; case 23: value_object = json_object_object_get(config, "MultifeedResponse"); @@ -259,8 +259,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 34: - value_object = json_object_object_get(config, "ColorBrightness"); - _kds_s2000w_handler_opts_write_int_value(value_object, value); + value_object = json_object_object_get(config, "MultifeedSensitivity"); + _kds_s2000w_handler_opts_write_string_value(value_object, value); break; case 35: value_object = json_object_object_get(config, "MaxDocumentLength"); @@ -405,8 +405,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 22: - value_object = json_object_object_get(config, "MultifeedSensitivity"); - _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); + value_object = json_object_object_get(config, "ColorBrightness"); + _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; case 23: value_object = json_object_object_get(config, "MultifeedResponse"); @@ -453,8 +453,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 34: - value_object = json_object_object_get(config, "ColorBrightness"); - _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); + value_object = json_object_object_get(config, "MultifeedSensitivity"); + _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); break; case 35: value_object = json_object_object_get(config, "MaxDocumentLength"); diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c index 784b06a..34cad49 100644 --- a/src/kds_s2000w_option_descriptors.c +++ b/src/kds_s2000w_option_descriptors.c @@ -856,8 +856,8 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_color_brightness() SANE_Option_Descriptor descriptor = { "color-brightness", - "Color brightness", - "Color brightness", + "Color Brightness", + "Color Brightness", SANE_TYPE_INT, SANE_UNIT_NONE, sizeof(SANE_Int), @@ -1100,7 +1100,7 @@ void kds_s2000w_option_descriptors_init() descriptor_array[19] = _kds_s2000w_option_descriptor_color_drop(); descriptor_array[20] = _kds_s2000w_option_descriptor_color_drop_out_aggressiveness(); descriptor_array[21] = _kds_s2000w_option_descriptor_color_auto_brightness_mode(); - descriptor_array[22] = _kds_s2000w_option_descriptor_multifeed_sensitivity(); + descriptor_array[22] = _kds_s2000w_option_descriptor_color_brightness(); descriptor_array[23] = _kds_s2000w_option_descriptor_multifeed_response(); descriptor_array[24] = _kds_s2000w_option_descriptor_post_scan_rotation(); descriptor_array[25] = _kds_s2000w_option_descriptor_edge_fill(); @@ -1112,7 +1112,7 @@ void kds_s2000w_option_descriptors_init() descriptor_array[31] = _kds_s2000w_option_descriptor_skip_blank_pages(); descriptor_array[32] = _kds_s2000w_option_descriptor_color_balance_blue(); descriptor_array[33] = _kds_s2000w_option_descriptor_skip_blank_page_content(); - descriptor_array[34] = _kds_s2000w_option_descriptor_color_brightness(); + descriptor_array[34] = _kds_s2000w_option_descriptor_multifeed_sensitivity(); descriptor_array[35] = _kds_s2000w_option_descriptor_max_document_length(); descriptor_array[36] = _kds_s2000w_option_descriptor_document_feeder_timeout(); descriptor_array[37] = _kds_s2000w_option_descriptor_color_contrast(); diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c index 59d4527..6c60ebb 100644 --- a/tests/kds_s2000w_net_get_opt_tests.c +++ b/tests/kds_s2000w_net_get_opt_tests.c @@ -290,11 +290,11 @@ void sane_kds_s2000w_net_control_get_option_twentytwo_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}; + uint32_t value = -1; sane_kds_s2000w_net_control_option(h, 22, SANE_ACTION_GET_VALUE, &value, NULL); - assert_string_equal(value, "None"); + assert_int_equal(value, 0); kds_s2000w_handler_free(h); h = NULL; @@ -470,11 +470,11 @@ void sane_kds_s2000w_net_control_get_option_thirdyfour_test(void** state) handler* h = kds_s2000w_handler_init(); response* resp = (response*) *state; h->current_scanner_config = json_tokener_parse(resp->data); - uint32_t value = -1; + char* value[50] = {0}; sane_kds_s2000w_net_control_option(h, 34, SANE_ACTION_GET_VALUE, &value, NULL); - assert_int_equal(value, 0); + assert_string_equal(value, "None"); 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 26e0532..2c0cd1d 100644 --- a/tests/kds_s2000w_option_descriptor_tests.c +++ b/tests/kds_s2000w_option_descriptor_tests.c @@ -398,19 +398,17 @@ void kds_s2000w_option_get_descriptor_twentytwo_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(22); - assert_string_equal("multifeed-sensitivity", option->name); - assert_string_equal("multifeed sensitivity", option->title); - assert_string_equal("multifeed sensitivity", option->desc); - assert_int_equal(SANE_TYPE_STRING, option->type); + assert_string_equal("color-brightness", option->name); + assert_string_equal("Color Brightness", option->title); + assert_string_equal("Color Brightness", 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("None", option->constraint.string_list[0]); - assert_string_equal("Low", option->constraint.string_list[1]); - assert_string_equal("Medium", option->constraint.string_list[2]); - assert_string_equal("High", option->constraint.string_list[3]); - assert_null(option->constraint.string_list[4]); + assert_int_equal(SANE_CONSTRAINT_RANGE, option->constraint_type); + assert_int_equal(option->constraint.range->min, -50); + assert_int_equal(option->constraint.range->max, 50); + assert_int_equal(option->constraint.range->quant, 1); } void kds_s2000w_option_get_descriptor_twentythree_test() @@ -609,17 +607,19 @@ void kds_s2000w_option_get_descriptor_thirdyfour_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(34); - assert_string_equal("color-brightness", option->name); - assert_string_equal("Color brightness", option->title); - assert_string_equal("Color brightness", option->desc); - assert_int_equal(SANE_TYPE_INT, option->type); + assert_string_equal("multifeed-sensitivity", option->name); + assert_string_equal("multifeed sensitivity", option->title); + assert_string_equal("multifeed sensitivity", 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(option->constraint.range->min, -50); - assert_int_equal(option->constraint.range->max, 50); - assert_int_equal(option->constraint.range->quant, 1); + assert_int_equal(SANE_CONSTRAINT_STRING_LIST, option->constraint_type); + assert_string_equal("None", option->constraint.string_list[0]); + assert_string_equal("Low", option->constraint.string_list[1]); + assert_string_equal("Medium", option->constraint.string_list[2]); + assert_string_equal("High", option->constraint.string_list[3]); + assert_null(option->constraint.string_list[4]); } void kds_s2000w_option_get_descriptor_thirdyfive_test() -- 2.39.5