From 584ce86ceb8f2c9e3031cf9835de14fba544c083 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Sun, 16 Feb 2025 19:00:00 +0100 Subject: [PATCH] add option image offset y --- src/kds_s2000w_handler_opts.c | 10 +++++++++- tests/kds_s2000w_net_get_opt_tests.c | 17 ++++++++++++++++- tests/kds_s2000w_net_get_opt_tests.h | 1 + tests/kds_s2000w_net_get_opt_tests_run.c | 3 ++- 4 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index 6b95dc2..20b1e5d 100644 --- a/src/kds_s2000w_handler_opts.c +++ b/src/kds_s2000w_handler_opts.c @@ -6,7 +6,7 @@ #include "kds_s2000w_debug.h" #define AUTOSTART_ON 1 -#define OPTION_COUNT 40 +#define OPTION_COUNT 41 void _kds_s2000w_handler_opts_write_string_value(json_object* value_object, void* value) { @@ -286,6 +286,10 @@ void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value value_object = json_object_object_get(config, "ImageOffsetX"); _kds_s2000w_handler_opts_write_int_value(value_object, value); break; + case 39: + value_object = json_object_object_get(config, "ImageOffsetY"); + _kds_s2000w_handler_opts_write_int_value(value_object, value); + break; default: break; } @@ -469,6 +473,10 @@ 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 39: + value_object = json_object_object_get(config, "ImageOffsetY"); + _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); + break; + case 40: _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 cf2cdec..95e7eea 100644 --- a/tests/kds_s2000w_net_get_opt_tests.c +++ b/tests/kds_s2000w_net_get_opt_tests.c @@ -21,7 +21,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, 40); + assert_int_equal(value, 41); kds_s2000w_handler_free(h); h = NULL; @@ -564,6 +564,21 @@ void sane_kds_s2000w_net_control_get_option_thirdyeight_test(void** state) assert_int_equal(value, 0); + kds_s2000w_handler_free(h); + h = NULL; +} + +void sane_kds_s2000w_net_control_get_option_thirdynine_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; + + sane_kds_s2000w_net_control_option(h, 39, SANE_ACTION_GET_VALUE, &value, NULL); + + assert_int_equal(value, 0); + 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 742db47..9de7f96 100644 --- a/tests/kds_s2000w_net_get_opt_tests.h +++ b/tests/kds_s2000w_net_get_opt_tests.h @@ -43,5 +43,6 @@ void sane_kds_s2000w_net_control_get_option_thirdyfive_test(void** state); void sane_kds_s2000w_net_control_get_option_thirdysix_test(void** state); void sane_kds_s2000w_net_control_get_option_thirdyseven_test(void** state); void sane_kds_s2000w_net_control_get_option_thirdyeight_test(void** state); +void sane_kds_s2000w_net_control_get_option_thirdynine_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 5c5d245..adc63b9 100644 --- a/tests/kds_s2000w_net_get_opt_tests_run.c +++ b/tests/kds_s2000w_net_get_opt_tests_run.c @@ -112,7 +112,8 @@ int main() cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_thirdyfive_test, setup_default_get_option, teardown_default_get_option), cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_thirdysix_test, setup_default_get_option, teardown_default_get_option), cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_thirdyseven_test, setup_default_get_option, teardown_default_get_option), - cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_thirdyeight_test, setup_default_get_option, teardown_default_get_option) + cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_thirdyeight_test, setup_default_get_option, teardown_default_get_option), + cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_thirdynine_test, setup_default_get_option, teardown_default_get_option) }; return cmocka_run_group_tests(net_tests, NULL, NULL); -- 2.39.5