From: Bastian Dehn <hhaalo@arcor.de>
Date: Sun, 16 Feb 2025 09:33:03 +0000 (+0100)
Subject: add option for document feeder timeout response
X-Git-Tag: v1.1.0^2~4^2~29
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=2ed78dbf5012986666c9e34202d51937d9fe1655;p=sane-kds-s2000w-net.git

add option for document feeder timeout response
---

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index 1781bae..6da7609 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 30
+#define OPTION_COUNT 31
 
 void _kds_s2000w_handler_opts_write_string_value(json_object* value_object, void* value)
 {
@@ -229,6 +229,10 @@ void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value
 			value_object = json_object_object_get(config, "JpegQuality");
 			_kds_s2000w_handler_opts_write_string_value(value_object, value);
 			break;
+		case 29:
+			value_object = json_object_object_get(config, "DocumentFeederTimeoutResponse");
+			_kds_s2000w_handler_opts_write_string_value(value_object, value);
+			break;
 		default:
 			break;
 	}
@@ -369,6 +373,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 29:
+			value_object = json_object_object_get(config, "DocumentFeederTimeoutResponse");
+			_kds_s2000w_handler_opts_write_string_value_to_json(value_object, value);
+			break;
+		case 30:
 			_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 c8d77a6..d14d794 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, 30);
+	assert_int_equal(value, 31);
 
 	kds_s2000w_handler_free(h);
 	h = NULL;
@@ -415,6 +415,21 @@ void sane_kds_s2000w_net_control_get_option_twentyeight_test(void** state)
 
 	assert_string_equal(value, "Good");
 
+	kds_s2000w_handler_free(h);
+	h = NULL;
+}
+
+void sane_kds_s2000w_net_control_get_option_twentynine_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, 29, SANE_ACTION_GET_VALUE, &value, NULL);
+
+	assert_string_equal(value, "Stop");
+
 	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 9906e3c..7cec045 100644
--- a/tests/kds_s2000w_net_get_opt_tests.h
+++ b/tests/kds_s2000w_net_get_opt_tests.h
@@ -33,5 +33,6 @@ void sane_kds_s2000w_net_control_get_option_twentyfive_test(void** state);
 void sane_kds_s2000w_net_control_get_option_twentysix_test(void** state);
 void sane_kds_s2000w_net_control_get_option_twentyseven_test(void** state);
 void sane_kds_s2000w_net_control_get_option_twentyeight_test(void** state);
+void sane_kds_s2000w_net_control_get_option_twentynine_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 ed168b1..b0bbad4 100644
--- a/tests/kds_s2000w_net_get_opt_tests_run.c
+++ b/tests/kds_s2000w_net_get_opt_tests_run.c
@@ -102,7 +102,8 @@ int main()
 		cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_twentyfive_test, setup_default_get_option, teardown_default_get_option),
 		cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_twentysix_test, setup_default_get_option, teardown_default_get_option),
 		cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_twentyseven_test, setup_default_get_option, teardown_default_get_option),
-		cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_twentyeight_test, setup_default_get_option, teardown_default_get_option)
+		cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_twentyeight_test, setup_default_get_option, teardown_default_get_option),
+		cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_twentynine_test, setup_default_get_option, teardown_default_get_option)
 	};
 
 	return cmocka_run_group_tests(net_tests, NULL, NULL);