From bea4ade99e75be88af10e802d53256f7c0ab7056 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Tue, 18 Feb 2025 17:34:34 +0100 Subject: [PATCH] change post scan rotation position --- src/kds_s2000w_handler_opts.c | 16 ++++----- src/kds_s2000w_option_descriptors.c | 4 +-- tests/kds_s2000w_net_get_opt_tests.c | 8 ++--- tests/kds_s2000w_option_descriptor_tests.c | 42 +++++++++++----------- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index 2e49055..64e8769 100644 --- a/src/kds_s2000w_handler_opts.c +++ b/src/kds_s2000w_handler_opts.c @@ -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 36: - value_object = json_object_object_get(config, "DocumentFeederTimeout"); - _kds_s2000w_handler_opts_write_int_value(value_object, value); + value_object = json_object_object_get(config, "PostScanRotation"); + _kds_s2000w_handler_opts_write_string_value(value_object, value); break; case 37: value_object = json_object_object_get(config, "MultifeedResponse"); @@ -279,8 +279,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 41: - value_object = json_object_object_get(config, "PostScanRotation"); - _kds_s2000w_handler_opts_write_string_value(value_object, value); + value_object = json_object_object_get(config, "DocumentFeederTimeout"); + _kds_s2000w_handler_opts_write_int_value(value_object, value); break; case 42: value_object = json_object_object_get(config, "EdgeFill"); @@ -464,8 +464,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 36: - value_object = json_object_object_get(config, "DocumentFeederTimeout"); - _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); + value_object = json_object_object_get(config, "PostScanRotation"); + _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); break; case 37: value_object = json_object_object_get(config, "MultifeedResponse"); @@ -484,8 +484,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 41: - value_object = json_object_object_get(config, "PostScanRotation"); - _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); + value_object = json_object_object_get(config, "DocumentFeederTimeout"); + _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; case 42: value_object = json_object_object_get(config, "EdgeFill"); diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c index 9c373eb..6888a4e 100644 --- a/src/kds_s2000w_option_descriptors.c +++ b/src/kds_s2000w_option_descriptors.c @@ -1132,12 +1132,12 @@ void kds_s2000w_option_descriptors_init() descriptor_array[33] = _kds_s2000w_option_descriptor_skip_blank_pages(); descriptor_array[34] = _kds_s2000w_option_descriptor_skip_blank_page_content(); descriptor_array[35] = _kds_s2000w_option_descriptor_hole_fill(); - descriptor_array[36] = _kds_s2000w_option_descriptor_document_feeder_timeout(); + descriptor_array[36] = _kds_s2000w_option_descriptor_post_scan_rotation(); descriptor_array[37] = _kds_s2000w_option_descriptor_multifeed_response(); descriptor_array[38] = _kds_s2000w_option_descriptor_image_border(); descriptor_array[39] = _kds_s2000w_option_descriptor_max_document_length(); descriptor_array[40] = _kds_s2000w_option_descriptor_document_feeder_timeout_response(); - descriptor_array[41] = _kds_s2000w_option_descriptor_post_scan_rotation(); + descriptor_array[41] = _kds_s2000w_option_descriptor_document_feeder_timeout(); descriptor_array[42] = _kds_s2000w_option_descriptor_edge_fill(); descriptor_array[43] = _kds_s2000w_option_descriptor_transport_handling(); descriptor_array[44] = _kds_s2000w_option_descriptor_multifeed_sensitivity(); diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c index 17f9054..8aa9139 100644 --- a/tests/kds_s2000w_net_get_opt_tests.c +++ b/tests/kds_s2000w_net_get_opt_tests.c @@ -470,11 +470,11 @@ void sane_kds_s2000w_net_control_get_option_thirdysix_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, 36, SANE_ACTION_GET_VALUE, &value, NULL); - assert_int_equal(value, 2); + assert_string_equal(value, "Automatic"); kds_s2000w_handler_free(h); h = NULL; @@ -545,11 +545,11 @@ void sane_kds_s2000w_net_control_get_option_fourtyone_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, 41, SANE_ACTION_GET_VALUE, &value, NULL); - assert_string_equal(value, "Automatic"); + assert_int_equal(value, 2); 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 a73850d..428814b 100644 --- a/tests/kds_s2000w_option_descriptor_tests.c +++ b/tests/kds_s2000w_option_descriptor_tests.c @@ -628,17 +628,20 @@ void kds_s2000w_option_get_descriptor_thirdysix_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(36); - assert_string_equal("document-feeder-timeout", option->name); - assert_string_equal("Document feeder timeout", option->title); - assert_string_equal("Document feeder timeout", option->desc); - assert_int_equal(SANE_TYPE_INT, option->type); + assert_string_equal("post-scan-rotation", option->name); + assert_string_equal("Post Scan Rotation", option->title); + assert_string_equal("Post Scan Rotation", 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*) * 6, option->size); assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED, option->cap); - assert_int_equal(SANE_CONSTRAINT_RANGE, option->constraint_type); - assert_int_equal(option->constraint.range->min, 0); - assert_int_equal(option->constraint.range->max, 120); - 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("Automatic", option->constraint.string_list[1]); + assert_string_equal("Automatic90", option->constraint.string_list[2]); + assert_string_equal("Automatic180", option->constraint.string_list[3]); + assert_string_equal("Automatic270", option->constraint.string_list[4]); + assert_null(option->constraint.string_list[5]); } void kds_s2000w_option_get_descriptor_thirdyseven_test() @@ -715,20 +718,17 @@ void kds_s2000w_option_get_descriptor_fourtyone_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(41); - assert_string_equal("post-scan-rotation", option->name); - assert_string_equal("Post Scan Rotation", option->title); - assert_string_equal("Post Scan Rotation", option->desc); - assert_int_equal(SANE_TYPE_STRING, option->type); + assert_string_equal("document-feeder-timeout", option->name); + assert_string_equal("Document feeder timeout", option->title); + assert_string_equal("Document feeder timeout", 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*) * 6, option->size); + assert_int_equal(sizeof(SANE_Int), option->size); assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED, option->cap); - assert_int_equal(SANE_CONSTRAINT_STRING_LIST, option->constraint_type); - assert_string_equal("None", option->constraint.string_list[0]); - assert_string_equal("Automatic", option->constraint.string_list[1]); - assert_string_equal("Automatic90", option->constraint.string_list[2]); - assert_string_equal("Automatic180", option->constraint.string_list[3]); - assert_string_equal("Automatic270", option->constraint.string_list[4]); - assert_null(option->constraint.string_list[5]); + assert_int_equal(SANE_CONSTRAINT_RANGE, option->constraint_type); + assert_int_equal(option->constraint.range->min, 0); + assert_int_equal(option->constraint.range->max, 120); + assert_int_equal(option->constraint.range->quant, 1); } void kds_s2000w_option_get_descriptor_fourtytwo_test() -- 2.39.5