From: Bastian Dehn Date: Tue, 18 Feb 2025 16:37:41 +0000 (+0100) Subject: change edge fill position X-Git-Tag: v1.1.0^2~3^2~6 X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=7b0387625f029baa27b935750ec73a45c4343e0e;p=sane-kds-s2000w-net.git change edge fill position --- diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index 64e8769..d3175ed 100644 --- a/src/kds_s2000w_handler_opts.c +++ b/src/kds_s2000w_handler_opts.c @@ -263,7 +263,7 @@ 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 37: - value_object = json_object_object_get(config, "MultifeedResponse"); + value_object = json_object_object_get(config, "EdgeFill"); _kds_s2000w_handler_opts_write_string_value(value_object, value); break; case 38: @@ -283,7 +283,7 @@ 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 42: - value_object = json_object_object_get(config, "EdgeFill"); + value_object = json_object_object_get(config, "MultifeedResponse"); _kds_s2000w_handler_opts_write_string_value(value_object, value); break; case 43: @@ -468,7 +468,7 @@ 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 37: - value_object = json_object_object_get(config, "MultifeedResponse"); + value_object = json_object_object_get(config, "EdgeFill"); _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); break; case 38: @@ -488,7 +488,7 @@ 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 42: - value_object = json_object_object_get(config, "EdgeFill"); + value_object = json_object_object_get(config, "MultifeedResponse"); _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); break; case 43: diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c index 6888a4e..f188198 100644 --- a/src/kds_s2000w_option_descriptors.c +++ b/src/kds_s2000w_option_descriptors.c @@ -1133,12 +1133,12 @@ void kds_s2000w_option_descriptors_init() 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_post_scan_rotation(); - descriptor_array[37] = _kds_s2000w_option_descriptor_multifeed_response(); + descriptor_array[37] = _kds_s2000w_option_descriptor_edge_fill(); 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_document_feeder_timeout(); - descriptor_array[42] = _kds_s2000w_option_descriptor_edge_fill(); + descriptor_array[42] = _kds_s2000w_option_descriptor_multifeed_response(); descriptor_array[43] = _kds_s2000w_option_descriptor_transport_handling(); descriptor_array[44] = _kds_s2000w_option_descriptor_multifeed_sensitivity(); descriptor_array[45] = _kds_s2000w_option_descriptor_jpeg_quality(); diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c index 8aa9139..4737a08 100644 --- a/tests/kds_s2000w_net_get_opt_tests.c +++ b/tests/kds_s2000w_net_get_opt_tests.c @@ -489,7 +489,7 @@ void sane_kds_s2000w_net_control_get_option_thirdyseven_test(void** state) sane_kds_s2000w_net_control_option(h, 37, SANE_ACTION_GET_VALUE, &value, NULL); - assert_string_equal(value, "Stop"); + assert_string_equal(value, "Automatic"); kds_s2000w_handler_free(h); h = NULL; @@ -564,7 +564,7 @@ void sane_kds_s2000w_net_control_get_option_fourtytwo_test(void** state) sane_kds_s2000w_net_control_option(h, 42, SANE_ACTION_GET_VALUE, &value, NULL); - assert_string_equal(value, "Automatic"); + assert_string_equal(value, "Stop"); 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 428814b..292b405 100644 --- a/tests/kds_s2000w_option_descriptor_tests.c +++ b/tests/kds_s2000w_option_descriptor_tests.c @@ -648,17 +648,18 @@ void kds_s2000w_option_get_descriptor_thirdyseven_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(37); - assert_string_equal("multifeed-response", option->name); - assert_string_equal("multifeed response", option->title); - assert_string_equal("multifeed response", option->desc); + assert_string_equal("edge-fill", option->name); + assert_string_equal("Edge Fill", option->title); + assert_string_equal("Edge Fill", option->desc); assert_int_equal(SANE_TYPE_STRING, option->type); assert_int_equal(SANE_UNIT_NONE, option->unit); - assert_int_equal(sizeof(SANE_String_Const*) * 3, option->size); + assert_int_equal(sizeof(SANE_String_Const*) * 4, 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("Stop", option->constraint.string_list[0]); - assert_string_equal("StopAndGenerateImage", option->constraint.string_list[1]); - assert_null(option->constraint.string_list[2]); + assert_string_equal("None", option->constraint.string_list[0]); + assert_string_equal("Automatic", option->constraint.string_list[1]); + assert_string_equal("AutomaticIncludeTears", option->constraint.string_list[2]); + assert_null(option->constraint.string_list[3]); } void kds_s2000w_option_get_descriptor_thirdyeight_test() @@ -735,18 +736,17 @@ void kds_s2000w_option_get_descriptor_fourtytwo_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(42); - assert_string_equal("edge-fill", option->name); - assert_string_equal("Edge Fill", option->title); - assert_string_equal("Edge Fill", option->desc); + assert_string_equal("multifeed-response", option->name); + assert_string_equal("multifeed response", option->title); + assert_string_equal("multifeed response", option->desc); assert_int_equal(SANE_TYPE_STRING, option->type); assert_int_equal(SANE_UNIT_NONE, option->unit); - assert_int_equal(sizeof(SANE_String_Const*) * 4, option->size); + assert_int_equal(sizeof(SANE_String_Const*) * 3, 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("AutomaticIncludeTears", option->constraint.string_list[2]); - assert_null(option->constraint.string_list[3]); + assert_string_equal("Stop", option->constraint.string_list[0]); + assert_string_equal("StopAndGenerateImage", option->constraint.string_list[1]); + assert_null(option->constraint.string_list[2]); } void kds_s2000w_option_get_descriptor_fourtythree_test()