From 2c815abdd375f82d6b3123e1a1d37149407b0ec0 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Sun, 16 Feb 2025 09:03:47 +0100 Subject: [PATCH] add option for edge fill --- src/kds_s2000w_handler_opts.c | 10 +++++++++- tests/kds_s2000w_net_get_opt_tests.c | 19 +++++++++++++++++-- tests/kds_s2000w_net_get_opt_tests.h | 3 ++- tests/kds_s2000w_net_get_opt_tests_run.c | 3 ++- 4 files changed, 30 insertions(+), 5 deletions(-) diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index 25a103f..cb59652 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 26 +#define OPTION_COUNT 27 void _kds_s2000w_handler_opts_write_string_value(json_object* value_object, void* value) { @@ -213,6 +213,10 @@ void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value value_object = json_object_object_get(config, "PostScanRotation"); _kds_s2000w_handler_opts_write_string_value(value_object, value); break; + case 25: + value_object = json_object_object_get(config, "EdgeFill"); + _kds_s2000w_handler_opts_write_string_value(value_object, value); + break; default: break; } @@ -337,6 +341,10 @@ 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 25: + value_object = json_object_object_get(config, "EdgeFill"); + _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); + break; + case 26: _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 03cca14..2fa02d9 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, 26); + assert_int_equal(value, 27); kds_s2000w_handler_free(h); h = NULL; @@ -344,7 +344,7 @@ void sane_kds_s2000w_net_control_get_option_twentythree_test(void** state) h = NULL; } -void sane_kds_s2000w_net_control_get_option_twentyfoure_test(void** state) +void sane_kds_s2000w_net_control_get_option_twentyfour_test(void** state) { handler* h = kds_s2000w_handler_init(); response* resp = (response*) *state; @@ -355,6 +355,21 @@ void sane_kds_s2000w_net_control_get_option_twentyfoure_test(void** state) assert_string_equal(value, "Automatic"); + kds_s2000w_handler_free(h); + h = NULL; +} + +void sane_kds_s2000w_net_control_get_option_twentyfive_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, 25, SANE_ACTION_GET_VALUE, &value, NULL); + + assert_string_equal(value, "Automatic"); + kds_s2000w_handler_free(h); h = NULL; } \ No newline at end of file diff --git a/tests/kds_s2000w_net_get_opt_tests.h b/tests/kds_s2000w_net_get_opt_tests.h index 1186f63..7ada635 100644 --- a/tests/kds_s2000w_net_get_opt_tests.h +++ b/tests/kds_s2000w_net_get_opt_tests.h @@ -28,6 +28,7 @@ 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); void sane_kds_s2000w_net_control_get_option_twentythree_test(void** state); -void sane_kds_s2000w_net_control_get_option_twentyfoure_test(void** state); +void sane_kds_s2000w_net_control_get_option_twentyfour_test(void** state); +void sane_kds_s2000w_net_control_get_option_twentyfive_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 aeb5be4..73a61c1 100644 --- a/tests/kds_s2000w_net_get_opt_tests_run.c +++ b/tests/kds_s2000w_net_get_opt_tests_run.c @@ -98,7 +98,8 @@ int main() 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), cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_twentythree_test, setup_default_get_option, teardown_default_get_option), - cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_twentyfoure_test, setup_default_get_option, teardown_default_get_option) + cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_twentyfour_test, setup_default_get_option, teardown_default_get_option), + cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_twentyfive_test, setup_default_get_option, teardown_default_get_option) }; return cmocka_run_group_tests(net_tests, NULL, NULL); -- 2.39.5