From 9bbf2393b7a65941a2ce27905bd3f2271b37226f Mon Sep 17 00:00:00 2001
From: M McWilliams <hi@mmcwilliams.com>
Date: Tue, 30 Jan 2018 05:05:04 -0500
Subject: [PATCH] Adjust timings in the jkfirmware

---
 app/data/cfg.json                           | 34 +++++++++++++++++++++
 ino/mcopy_jk_firmware/mcopy_jk_firmware.ino | 12 ++++----
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/app/data/cfg.json b/app/data/cfg.json
index 46b7bf2..a30ab43 100644
--- a/app/data/cfg.json
+++ b/app/data/cfg.json
@@ -6,6 +6,40 @@
 		"board" : "uno",
 		"serialDelay" : 20,
 		"sequenceDelay" : 100,
+		"profiles" : {
+			"jk_original" : {
+				"cam" : {
+					"time" : 750,
+					"delay" : 50,
+					"momentary" : 300
+				},
+				"proj" : {
+					"time" : 1300,
+					"delay" : 50,
+					"momentary" : 300
+				},
+				"black" : {
+					"before" : 250,
+					"after" : 250
+				}
+			},
+			"jk103" : {
+				"cam" : {
+					"time" : 600,
+					"delay" : 50,
+					"momentary" : 240
+				},
+				"proj" : {
+					"time" : 950,
+					"delay" : 50,
+					"momentary" : 240
+				},
+				"black" : {
+					"before" : 0,
+					"after" : 0
+				}
+			}
+		},
 		"cam" : {
 			"time" : 750,
 			"delay" : 50,
diff --git a/ino/mcopy_jk_firmware/mcopy_jk_firmware.ino b/ino/mcopy_jk_firmware/mcopy_jk_firmware.ino
index 4261619..adc416a 100644
--- a/ino/mcopy_jk_firmware/mcopy_jk_firmware.ino
+++ b/ino/mcopy_jk_firmware/mcopy_jk_firmware.ino
@@ -22,8 +22,8 @@ boolean debug_state = false;
 const int CAMERA = 2;
 const int CAMERA_FWD = 3;
 const int CAMERA_BWD = 4;
-const int CAMERA_MOMENT = 200;
-const int CAMERA_FRAME = 800;
+const int CAMERA_MOMENT = 240;
+const int CAMERA_FRAME = 600;
 //CAMERA VARIABLES
 boolean cam_dir = true; 
 
@@ -31,8 +31,8 @@ boolean cam_dir = true;
 const int PROJECTOR = 8;
 const int PROJECTOR_FWD = 9;
 const int PROJECTOR_BWD = 10;
-const int PROJECTOR_MOMENT = 200;
-const int PROJECTOR_FRAME = 800;
+const int PROJECTOR_MOMENT = 240;
+const int PROJECTOR_FRAME = 950;
 //PROJECTOR VARIABLES
 boolean proj_dir = true;
 
@@ -152,7 +152,7 @@ void proj_start () {
   digitalWrite(PROJECTOR, HIGH);
   delay(PROJECTOR_MOMENT);
   digitalWrite(PROJECTOR, LOW);
-  delay(PROJECTOR_FRAME);
+  delay(PROJECTOR_FRAME - PROJECTOR_MOMENT);
   proj_stop();
 }
 
@@ -160,7 +160,7 @@ void cam_start () {
   digitalWrite(CAMERA, HIGH);
   delay(CAMERA_MOMENT);
   digitalWrite(CAMERA, LOW);
-  delay(CAMERA_FRAME);
+  delay(CAMERA_FRAME - CAMERA_MOMENT);
   cam_stop();
 }