Fixed merge conflicts

AllskyTeam · Aug 15, 2021 · 8a316d7 · 8a316d7
1 parent 663a39f
commit 8a316d7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/capture_RPiHQ.cpp b/capture_RPiHQ.cpp
@@ -1274,7 +1274,7 @@ displayDebugText(debugText, 3);
 			displayDebugText(debugText, 0);
 
 			// Sleep for a moment
-			usleep(currentDelay * US_IN_SEC);
+			usleep(currentDelay * US_IN_MS);
 
 			// Check for day or night based on location and angle
 			calculateDayOrNight(latitude, longitude, angle);

diff --git a/scripts/copy_notification_image.sh b/scripts/copy_notification_image.sh