From: Bastian Dehn Date: Sat, 15 Feb 2025 20:37:04 +0000 (+0100) Subject: add get option multifeed sensitivity X-Git-Tag: v1.1.0^2~4^2~45 X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=32d89241437f696bc96955a20b4db3e93169735e;p=sane-kds-s2000w-net.git add get option multifeed sensitivity --- diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index da1a42d..125b8fa 100644 --- a/src/kds_s2000w_handler_opts.c +++ b/src/kds_s2000w_handler_opts.c @@ -5,7 +5,7 @@ #include "kds_s2000w_debug.h" #define AUTOSTART_ON 1 -#define OPTION_COUNT 23 +#define OPTION_COUNT 24 void _kds_s2000w_handler_opts_write_string_value(json_object* value_object, void* value) { @@ -201,6 +201,10 @@ void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value value_object = json_object_object_get(config, "BinarizationContrast"); _kds_s2000w_handler_opts_write_int_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); + break; default: break; } @@ -312,7 +316,7 @@ void kds_s2000w_handler_opts_set_option(handler* h, uint32_t option, void* value value_object = json_object_object_get(config, "BinarizationContrast"); _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; - case 22: + case 23: _kds_s2000w_handler_opts_set_option_to_default(h); _kds_s2000w_handler_opts_set_autostart_on(h); diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c index 00fbf46..6139e48 100644 --- a/tests/kds_s2000w_net_get_opt_tests.c +++ b/tests/kds_s2000w_net_get_opt_tests.c @@ -22,7 +22,7 @@ void sane_kds_s2000w_net_control_get_option_zero_test(void** state) sane_kds_s2000w_net_control_option(h, 0, SANE_ACTION_GET_VALUE, &value, NULL); - assert_int_equal(value, 23); + assert_int_equal(value, 24); kds_s2000w_handler_free(h); h = NULL; @@ -313,3 +313,18 @@ void sane_kds_s2000w_net_control_get_option_twentyone_test(void** state) kds_s2000w_handler_free(h); h = NULL; } + +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}; + + sane_kds_s2000w_net_control_option(h, 22, SANE_ACTION_GET_VALUE, &value, NULL); + + assert_string_equal(value, "None"); + + kds_s2000w_handler_free(h); + h = NULL; +} diff --git a/tests/kds_s2000w_net_get_opt_tests.h b/tests/kds_s2000w_net_get_opt_tests.h index f8b485c..034b5aa 100644 --- a/tests/kds_s2000w_net_get_opt_tests.h +++ b/tests/kds_s2000w_net_get_opt_tests.h @@ -26,5 +26,6 @@ void sane_kds_s2000w_net_control_get_option_eightteen_test(void** state); void sane_kds_s2000w_net_control_get_option_nineteen_test(void** state); void sane_kds_s2000w_net_control_get_option_twenty_test(void** state); void sane_kds_s2000w_net_control_get_option_twentyone_test(void** state); +void sane_kds_s2000w_net_control_get_option_twentytwo_test(void** state); #endif \ No newline at end of file diff --git a/tests/kds_s2000w_net_get_opt_tests_run.c b/tests/kds_s2000w_net_get_opt_tests_run.c index 1729d2c..75d89ac 100644 --- a/tests/kds_s2000w_net_get_opt_tests_run.c +++ b/tests/kds_s2000w_net_get_opt_tests_run.c @@ -95,7 +95,8 @@ int main() cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_eightteen_test, setup_default_get_option, teardown_default_get_option), cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_nineteen_test, setup_default_get_option, teardown_default_get_option), cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_twenty_test, setup_default_get_option, teardown_default_get_option), - cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_twentyone_test, setup_default_get_option, teardown_default_get_option) + cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_twentyone_test, setup_default_get_option, teardown_default_get_option), + cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_twentytwo_test, setup_default_get_option, teardown_default_get_option) }; return cmocka_run_group_tests(net_tests, NULL, NULL);