From: Bastian Dehn <hhaalo@arcor.de>
Date: Sun, 16 Feb 2025 09:53:00 +0000 (+0100)
Subject: add option hole fill
X-Git-Tag: v1.1.0^2~4^2~27
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=33c459fe31abd0b481d33e0d3e7c55c1a5295dd5;p=sane-kds-s2000w-net.git

add option hole fill
---

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index 6da7609..7aef458 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 31
+#define OPTION_COUNT 32
 
 void _kds_s2000w_handler_opts_write_string_value(json_object* value_object, void* value)
 {
@@ -233,6 +233,10 @@ void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value
 			value_object = json_object_object_get(config, "DocumentFeederTimeoutResponse");
 			_kds_s2000w_handler_opts_write_string_value(value_object, value);
 			break;
+		case 30:
+			value_object = json_object_object_get(config, "HoleFill");
+			_kds_s2000w_handler_opts_write_int_value(value_object, value);
+			break;
 		default:
 			break;
 	}
@@ -377,6 +381,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 30:
+			value_object = json_object_object_get(config, "HoleFill");
+			_kds_s2000w_handler_opts_write_int_value_to_json(value_object, value);
+			value_object = NULL;
+			break;
+		case 31:
 			_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 d14d794..a23b5e7 100644
--- a/tests/kds_s2000w_net_get_opt_tests.c
+++ b/tests/kds_s2000w_net_get_opt_tests.c
@@ -1,4 +1,3 @@
-
 #include <stdlib.h>
 #include <sane/sane.h>
 #include <string.h>
@@ -22,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, 31);
+	assert_int_equal(value, 32);
 
 	kds_s2000w_handler_free(h);
 	h = NULL;
@@ -430,6 +429,21 @@ void sane_kds_s2000w_net_control_get_option_twentynine_test(void** state)
 
 	assert_string_equal(value, "Stop");
 
+	kds_s2000w_handler_free(h);
+	h = NULL;
+}
+
+void sane_kds_s2000w_net_control_get_option_thirdy_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, 30, 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 7cec045..1510b4e 100644
--- a/tests/kds_s2000w_net_get_opt_tests.h
+++ b/tests/kds_s2000w_net_get_opt_tests.h
@@ -34,5 +34,6 @@ 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);
+void sane_kds_s2000w_net_control_get_option_thirdy_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 b0bbad4..36bcbba 100644
--- a/tests/kds_s2000w_net_get_opt_tests_run.c
+++ b/tests/kds_s2000w_net_get_opt_tests_run.c
@@ -103,7 +103,8 @@ int main()
 		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_twentynine_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),
+		cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_control_get_option_thirdy_test, setup_default_get_option, teardown_default_get_option)
 	};
 
 	return cmocka_run_group_tests(net_tests, NULL, NULL);