From: Bastian Dehn <hhaalo@arcor.de>
Date: Sat, 15 Feb 2025 20:08:17 +0000 (+0100)
Subject: add color sharp option get set
X-Git-Tag: v1.1.0^2~4^2~47
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=0b1b694a8ba8185860843b8aa54134cff343a29a;p=sane-kds-s2000w-net.git

add color sharp option get set
---

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index 3976aa5..da1a42d 100644
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -158,42 +158,46 @@ void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value
 			_kds_s2000w_handler_opts_write_string_value(value_object, value);
 			break;
 		case 11:
-			value_object = json_object_object_get(config, "ColorBalanceMode");
+			value_object = json_object_object_get(config, "ColorSharpen");
 			_kds_s2000w_handler_opts_write_string_value(value_object, value);
 			break;
 		case 12:
+			value_object = json_object_object_get(config, "ColorBalanceMode");
+			_kds_s2000w_handler_opts_write_string_value(value_object, value);
+			break;
+		case 13:
 			value_object = json_object_object_get(config, "ColorBalanceAggressiveness");
 			_kds_s2000w_handler_opts_write_int_value(value_object, value);
 			break;
-		case 13:
+		case 14:
 			value_object = json_object_object_get(config, "ColorBalanceRed");
 			_kds_s2000w_handler_opts_write_int_value(value_object, value);
 			break;
-		case 14:
+		case 15:
 			value_object = json_object_object_get(config, "ColorBalanceGreen");
 			_kds_s2000w_handler_opts_write_int_value(value_object, value);
 			break;
-		case 15:
+		case 16:
 			value_object = json_object_object_get(config, "ColorBalanceBlue");
 			_kds_s2000w_handler_opts_write_int_value(value_object, value);
 			break;
-		case 16:
+		case 17:
 			value_object = json_object_object_get(config, "ForegroundBoldnessMode");
 			_kds_s2000w_handler_opts_write_string_value(value_object, value);
 			break;
-		case 17:
+		case 18:
 			value_object = json_object_object_get(config, "ForegroundBoldnessAggressiveness");
 			_kds_s2000w_handler_opts_write_int_value(value_object, value);
 			break;
-		case 18:
+		case 19:
 			value_object = json_object_object_get(config, "BackgroundSmoothingMode");
 			_kds_s2000w_handler_opts_write_string_value(value_object, value);
 			break;
-		case 19:
+		case 20:
 			value_object = json_object_object_get(config, "BackgroundSmoothingAggressiveness");
 			_kds_s2000w_handler_opts_write_int_value(value_object, value);
 			break;
-		case 20:
+		case 21:
 			value_object = json_object_object_get(config, "BinarizationContrast");
 			_kds_s2000w_handler_opts_write_int_value(value_object, value);
 			break;
@@ -265,46 +269,50 @@ 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 11:
-			value_object = json_object_object_get(config, "ColorBalanceMode");
+			value_object = json_object_object_get(config, "ColorSharpen");
 			_kds_s2000w_handler_opts_write_string_value_to_json(value_object, value);
 			break;
 		case 12:
+			value_object = json_object_object_get(config, "ColorBalanceMode");
+			_kds_s2000w_handler_opts_write_string_value_to_json(value_object, value);
+			break;
+		case 13:
 			value_object = json_object_object_get(config, "ColorBalanceAggressiveness");
 			_kds_s2000w_handler_opts_write_int_value_to_json(value_object, value);
 			break;
-		case 13:
+		case 14:
 			value_object = json_object_object_get(config, "ColorBalanceRed");
 			_kds_s2000w_handler_opts_write_int_value_to_json(value_object, value);
 			break;
-		case 14:
+		case 15:
 			value_object = json_object_object_get(config, "ColorBalanceGreen");
 			_kds_s2000w_handler_opts_write_int_value_to_json(value_object, value);
 			break;
-		case 15:
+		case 16:
 			value_object = json_object_object_get(config, "ColorBalanceBlue");
 			_kds_s2000w_handler_opts_write_int_value_to_json(value_object, value);
 			break;
-		case 16:
+		case 17:
 			value_object = json_object_object_get(config, "ForegroundBoldnessMode");
 			_kds_s2000w_handler_opts_write_string_value_to_json(value_object, value);
 			break;
-		case 17:
+		case 18:
 			value_object = json_object_object_get(config, "ForegroundBoldnessAggressiveness");
 			_kds_s2000w_handler_opts_write_int_value_to_json(value_object, value);
 			break;
-		case 18:
+		case 19:
 			value_object = json_object_object_get(config, "BackgroundSmoothingMode");
 			_kds_s2000w_handler_opts_write_string_value_to_json(value_object, value);
 			break;
-		case 19:
+		case 20:
 			value_object = json_object_object_get(config, "BackgroundSmoothingAggressiveness");
 			_kds_s2000w_handler_opts_write_int_value_to_json(value_object, value);
 			break;
-		case 20:
+		case 21:
 			value_object = json_object_object_get(config, "BinarizationContrast");
 			_kds_s2000w_handler_opts_write_int_value_to_json(value_object, value);
 			break;
-		case 21:
+		case 22:
 			_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 a74549d..00fbf46 100644
--- a/tests/kds_s2000w_net_get_opt_tests.c
+++ b/tests/kds_s2000w_net_get_opt_tests.c
@@ -158,7 +158,7 @@ void sane_kds_s2000w_net_control_get_option_eleven_test(void** state)
 
 	sane_kds_s2000w_net_control_option(h, 11, SANE_ACTION_GET_VALUE, &value, NULL);
 
-	assert_string_equal(value, "Automatic");
+	assert_string_equal(value, "Normal");
 
 	kds_s2000w_handler_free(h);
 	h = NULL;
@@ -169,11 +169,11 @@ void sane_kds_s2000w_net_control_get_option_twelve_test(void** state)
 	handler* h = kds_s2000w_handler_init();
 	response* resp = (response*) *state;
 	h->current_scanner_config = json_tokener_parse(resp->data);
-	int32_t value = -1;
+	char value[50] = {0};
 
 	sane_kds_s2000w_net_control_option(h, 12, SANE_ACTION_GET_VALUE, &value, NULL);
 
-	assert_int_equal(value, 0);
+	assert_string_equal(value, "Automatic");
 
 	kds_s2000w_handler_free(h);
 	h = NULL;
@@ -229,11 +229,11 @@ void sane_kds_s2000w_net_control_get_option_sixteen_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};
+	int32_t value = -1;
 
 	sane_kds_s2000w_net_control_option(h, 16, SANE_ACTION_GET_VALUE, &value, NULL);
 
-	assert_string_equal(value, "None");
+	assert_int_equal(value, 0);
 
 	kds_s2000w_handler_free(h);
 	h = NULL;
@@ -244,11 +244,11 @@ void sane_kds_s2000w_net_control_get_option_seventeen_test(void** state)
 	handler* h = kds_s2000w_handler_init();
 	response* resp = (response*) *state;
 	h->current_scanner_config = json_tokener_parse(resp->data);
-	int32_t value = -1;
+	char* value[50] = {0};
 
 	sane_kds_s2000w_net_control_option(h, 17, SANE_ACTION_GET_VALUE, &value, NULL);
 
-	assert_int_equal(value, 0);
+	assert_string_equal(value, "None");
 
 	kds_s2000w_handler_free(h);
 	h = NULL;
@@ -259,11 +259,11 @@ void sane_kds_s2000w_net_control_get_option_eightteen_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};
+	int32_t value = -1;
 
 	sane_kds_s2000w_net_control_option(h, 18, SANE_ACTION_GET_VALUE, &value, NULL);
 
-	assert_string_equal(value, "None");
+	assert_int_equal(value, 0);
 
 	kds_s2000w_handler_free(h);
 	h = NULL;
@@ -274,11 +274,11 @@ void sane_kds_s2000w_net_control_get_option_nineteen_test(void** state)
 	handler* h = kds_s2000w_handler_init();
 	response* resp = (response*) *state;
 	h->current_scanner_config = json_tokener_parse(resp->data);
-	int32_t value = -1;
+	char* value[50] = {0};
 
 	sane_kds_s2000w_net_control_option(h, 19, SANE_ACTION_GET_VALUE, &value, NULL);
 
-	assert_int_equal(value, 0);
+	assert_string_equal(value, "None");
 
 	kds_s2000w_handler_free(h);
 	h = NULL;
@@ -298,3 +298,18 @@ void sane_kds_s2000w_net_control_get_option_twenty_test(void** state)
 	kds_s2000w_handler_free(h);
 	h = NULL;
 }
+
+void sane_kds_s2000w_net_control_get_option_twentyone_test(void** state)
+{
+	handler* h = kds_s2000w_handler_init();
+	response* resp = (response*) *state;
+	h->current_scanner_config = json_tokener_parse(resp->data);
+	int32_t value = -1;
+
+	sane_kds_s2000w_net_control_option(h, 21, SANE_ACTION_GET_VALUE, &value, NULL);
+
+	assert_int_equal(value, 0);
+
+	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 3782fa6..f8b485c 100644
--- a/tests/kds_s2000w_net_get_opt_tests.h
+++ b/tests/kds_s2000w_net_get_opt_tests.h
@@ -25,5 +25,6 @@ void sane_kds_s2000w_net_control_get_option_seventeen_test(void** state);
 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);
 
 #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 9aa3b39..1729d2c 100644
--- a/tests/kds_s2000w_net_get_opt_tests_run.c
+++ b/tests/kds_s2000w_net_get_opt_tests_run.c
@@ -95,6 +95,7 @@ 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)
 	};
 
 	return cmocka_run_group_tests(net_tests, NULL, NULL);