From: Bastian Dehn Date: Tue, 18 Feb 2025 17:11:10 +0000 (+0100) Subject: change multifeeder sensitivity position X-Git-Tag: v1.1.0^2~3^2 X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=2da2ce38dde573bf2df2f3f9fa41c08dd63de042;p=sane-kds-s2000w-net.git change multifeeder sensitivity position --- diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index f677d0c..19cf5c8 100644 --- a/src/kds_s2000w_handler_opts.c +++ b/src/kds_s2000w_handler_opts.c @@ -283,11 +283,11 @@ 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, "MultifeedResponse"); + value_object = json_object_object_get(config, "MultifeedSensitivity"); _kds_s2000w_handler_opts_write_string_value(value_object, value); break; case 44: - value_object = json_object_object_get(config, "MultifeedSensitivity"); + value_object = json_object_object_get(config, "MultifeedResponse"); _kds_s2000w_handler_opts_write_string_value(value_object, value); break; case 45: @@ -488,11 +488,11 @@ 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, "MultifeedResponse"); + value_object = json_object_object_get(config, "MultifeedSensitivity"); _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); break; case 44: - value_object = json_object_object_get(config, "MultifeedSensitivity"); + value_object = json_object_object_get(config, "MultifeedResponse"); _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); break; case 45: diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c index 29a92d6..931f34f 100644 --- a/src/kds_s2000w_option_descriptors.c +++ b/src/kds_s2000w_option_descriptors.c @@ -561,8 +561,8 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_multifeed_sensitivity() SANE_Option_Descriptor descriptor = { "multifeed-sensitivity", - "multifeed sensitivity", - "multifeed sensitivity", + "Multifeed Sensitivity", + "Multifeed Sensitivity", SANE_TYPE_STRING, SANE_UNIT_NONE, sizeof(SANE_String_Const*) * 5, @@ -585,8 +585,8 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_multifeed_response() SANE_Option_Descriptor descriptor = { "multifeed-response", - "multifeed response", - "multifeed response", + "Multifeed Response", + "Multifeed Response", SANE_TYPE_STRING, SANE_UNIT_NONE, sizeof(SANE_String_Const*) * 3, @@ -740,8 +740,8 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_document_feeder_timeout_res SANE_Option_Descriptor descriptor = { "document-feeder-timeout-response", - "Document feeder timeout respone", - "Document feeder timeout respone", + "Document Feeder Timeout Response", + "Document Feeder Timeout Response", SANE_TYPE_STRING, SANE_UNIT_NONE, sizeof(SANE_String_Const*) * 4, @@ -904,8 +904,8 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_document_feeder_timeout() SANE_Option_Descriptor descriptor = { "document-feeder-timeout", - "Document feeder timeout", - "Document feeder timeout", + "Document Feeder Timeout", + "Document Feeder Timeout", SANE_TYPE_INT, SANE_UNIT_NONE, sizeof(SANE_Int), @@ -1157,8 +1157,8 @@ void kds_s2000w_option_descriptors_init() descriptor_array[40] = _kds_s2000w_option_descriptor_feeder_group(); descriptor_array[41] = _kds_s2000w_option_descriptor_max_document_length(); descriptor_array[42] = _kds_s2000w_option_descriptor_transport_handling(); - descriptor_array[43] = _kds_s2000w_option_descriptor_multifeed_response(); - descriptor_array[44] = _kds_s2000w_option_descriptor_multifeed_sensitivity(); + descriptor_array[43] = _kds_s2000w_option_descriptor_multifeed_sensitivity(); + descriptor_array[44] = _kds_s2000w_option_descriptor_multifeed_response(); descriptor_array[45] = _kds_s2000w_option_descriptor_document_feeder_timeout(); descriptor_array[46] = _kds_s2000w_option_descriptor_document_feeder_timeout_response(); } diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c index 806a005..5bd3374 100644 --- a/tests/kds_s2000w_net_get_opt_tests.c +++ b/tests/kds_s2000w_net_get_opt_tests.c @@ -564,12 +564,13 @@ void sane_kds_s2000w_net_control_get_option_fourtythree_test(void** state) sane_kds_s2000w_net_control_option(h, 43, SANE_ACTION_GET_VALUE, &value, NULL); - assert_string_equal(value, "Stop"); + assert_string_equal(value, "None"); kds_s2000w_handler_free(h); h = NULL; } + void sane_kds_s2000w_net_control_get_option_fourtyfour_test(void** state) { handler* h = kds_s2000w_handler_init(); @@ -579,7 +580,7 @@ void sane_kds_s2000w_net_control_get_option_fourtyfour_test(void** state) sane_kds_s2000w_net_control_option(h, 44, SANE_ACTION_GET_VALUE, &value, NULL); - assert_string_equal(value, "None"); + 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 e1abc1d..4e27599 100644 --- a/tests/kds_s2000w_option_descriptor_tests.c +++ b/tests/kds_s2000w_option_descriptor_tests.c @@ -755,36 +755,36 @@ void kds_s2000w_option_get_descriptor_fourtythree_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(43); - assert_string_equal("multifeed-response", option->name); - assert_string_equal("multifeed response", option->title); - assert_string_equal("multifeed response", option->desc); + 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_String_Const*) * 3, option->size); + assert_int_equal(sizeof(SANE_String_Const*) * 5, 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("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_fourtyfour_test() { SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(44); - assert_string_equal("multifeed-sensitivity", option->name); - assert_string_equal("multifeed sensitivity", option->title); - assert_string_equal("multifeed sensitivity", 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*) * 5, 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("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_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_fourtyfive_test() @@ -792,8 +792,8 @@ void kds_s2000w_option_get_descriptor_fourtyfive_test() SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(45); 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_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_Int), option->size); @@ -809,8 +809,8 @@ void kds_s2000w_option_get_descriptor_fourtysix_test() SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(46); assert_string_equal("document-feeder-timeout-response", option->name); - assert_string_equal("Document feeder timeout respone", option->title); - assert_string_equal("Document feeder timeout respone", option->desc); + assert_string_equal("Document Feeder Timeout Response", option->title); + assert_string_equal("Document Feeder Timeout 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);