agent_imager: configurable dithering time limit added

kkretzschmar · Oct 3, 2020 · fbdf8a9 · fbdf8a9
1 parent 0aae7fc
commit fbdf8a9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/indigo_drivers/agent_imager/indigo_agent_imager.c b/indigo_drivers/agent_imager/indigo_agent_imager.c
@@ -62,6 +62,7 @@
 
 #define AGENT_IMAGER_DITHERING_PROPERTY				(DEVICE_PRIVATE_DATA->agent_imager_dithering_property)
 #define AGENT_IMAGER_DITHERING_AGGRESSIVITY_ITEM (AGENT_IMAGER_DITHERING_PROPERTY->items+0)
+#define AGENT_IMAGER_DITHERING_TIME_LIMIT_ITEM (AGENT_IMAGER_DITHERING_PROPERTY->items+1)
 
 #define AGENT_IMAGER_DOWNLOAD_FILE_PROPERTY		(DEVICE_PRIVATE_DATA->agent_imager_download_file_property)
 #define AGENT_IMAGER_DOWNLOAD_FILE_ITEM    		(AGENT_IMAGER_DOWNLOAD_FILE_PROPERTY->items+0)
@@ -467,7 +468,8 @@ static bool exposure_batch(indigo_device *device) {
 							if (DEVICE_PRIVATE_DATA->dithering_started) {
 								INDIGO_DRIVER_DEBUG(DRIVER_NAME, "Dithering started");
 								DEVICE_PRIVATE_DATA->dithering_finished = false;
-								for (int i = 0; i < 300; i++) { // wait up to 60s to finish dithering
+								double time_limit = AGENT_IMAGER_DITHERING_TIME_LIMIT_ITEM->number.value * 5;
+								for (int i = 0; i < time_limit; i++) { // wait up to time limit to finish dithering
 									if (DEVICE_PRIVATE_DATA->dithering_finished) {
 										INDIGO_DRIVER_DEBUG(DRIVER_NAME, "Dithering finished");
 										break;
@@ -753,7 +755,6 @@ static void autofocus_process(indigo_device *device) {
 	indigo_update_property(device, AGENT_START_PROCESS_PROPERTY, NULL);
 }
 
-
 static void park_mount(indigo_device *device) {
 	indigo_property *list = FILTER_DEVICE_CONTEXT->filter_related_agent_list_property;
 	for (int i = 0; i < list->count; i++) {
@@ -1075,10 +1076,11 @@ static indigo_result agent_device_attach(indigo_device *device) {
 		indigo_init_number_item(AGENT_IMAGER_FOCUS_BACKLASH_ITEM, AGENT_IMAGER_FOCUS_BACKLASH_ITEM_NAME, "Backlash", 0, 0xFFFF, 1, 0);
 		indigo_init_number_item(AGENT_IMAGER_FOCUS_STACK_ITEM, AGENT_IMAGER_FOCUS_STACK_ITEM_NAME, "Stacking", 1, 5, 1, 3);
 		// -------------------------------------------------------------------------------- Dithering properties
-		AGENT_IMAGER_DITHERING_PROPERTY = indigo_init_number_property(NULL, device->name, AGENT_IMAGER_DITHERING_PROPERTY_NAME, "Agent", "Dithering settings", INDIGO_OK_STATE, INDIGO_RW_PERM, 1);
+		AGENT_IMAGER_DITHERING_PROPERTY = indigo_init_number_property(NULL, device->name, AGENT_IMAGER_DITHERING_PROPERTY_NAME, "Agent", "Dithering settings", INDIGO_OK_STATE, INDIGO_RW_PERM, 2);
 		if (AGENT_IMAGER_DITHERING_PROPERTY == NULL)
 			return INDIGO_FAILED;
 		indigo_init_number_item(AGENT_IMAGER_DITHERING_AGGRESSIVITY_ITEM, AGENT_IMAGER_DITHERING_AGGRESSIVITY_ITEM_NAME, "Aggressivity (px)", -10, 10, 1, 1);
+		indigo_init_number_item(AGENT_IMAGER_DITHERING_TIME_LIMIT_ITEM, AGENT_IMAGER_DITHERING_TIME_LIMIT_ITEM_NAME, "Time limit (s)", 0, 600, 1, 60);
 		// -------------------------------------------------------------------------------- Process properties
 		AGENT_START_PROCESS_PROPERTY = indigo_init_switch_property(NULL, device->name, AGENT_START_PROCESS_PROPERTY_NAME, "Agent", "Start process", INDIGO_OK_STATE, INDIGO_RW_PERM, INDIGO_ANY_OF_MANY_RULE, 5);
 		if (AGENT_START_PROCESS_PROPERTY == NULL)

diff --git a/indigo_libs/indigo/indigo_names.h b/indigo_libs/indigo/indigo_names.h
@@ -2321,6 +2321,7 @@
 
 #define AGENT_IMAGER_DITHERING_PROPERTY_NAME 					"AGENT_IMAGER_DITHERING"
 #define AGENT_IMAGER_DITHERING_AGGRESSIVITY_ITEM_NAME "AGGRESSIVITY"
+#define AGENT_IMAGER_DITHERING_TIME_LIMIT_ITEM_NAME 	"TIME_LIMIT"
 
 #define AGENT_IMAGER_STARS_PROPERTY_NAME							"AGENT_IMAGER_STARS"
 #define AGENT_IMAGER_STARS_REFRESH_ITEM_NAME					"REFRESH"