From 231c354cb1786d66179ca1dc042bc51da99efc07 Mon Sep 17 00:00:00 2001
From: mattmcw <matt@sixteenmillimeter.com>
Date: Tue, 21 Mar 2023 20:38:45 -0400
Subject: [PATCH] Update McopySerial usage in both scripts that use it.

---
 ino/components/mcopy_light/mcopy_light.ino | 8 ++++----
 ino/mcopy_cam_canon/mcopy_cam_canon.ino    | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ino/components/mcopy_light/mcopy_light.ino b/ino/components/mcopy_light/mcopy_light.ino
index 1862826..03609c2 100644
--- a/ino/components/mcopy_light/mcopy_light.ino
+++ b/ino/components/mcopy_light/mcopy_light.ino
@@ -7,7 +7,7 @@
 
 SoftwareSerial pixieSerial(-1, PIXIEPIN);
 Adafruit_Pixie light = Adafruit_Pixie(NUMPIXELS, &pixieSerial);
-McopySerial mc(McopySerial::LIGHT_IDENTIFIER);
+McopySerial mc;
 
 String color = "000,000,000";
 
@@ -28,7 +28,7 @@ volatile char cmd = 'z';
 
 
 void setup () {
-  mc.begin();
+  mc.begin(mc.LIGHT_IDENTIFIER);
 	pixieSerial.begin(115200); // Pixie REQUIRES this baud rate
 	light.setPixelColor(0, 0, 0, 0);
   light.show();
@@ -41,10 +41,10 @@ void loop () {
   now = millis();
   cmd = mc.loop();
 
-  if (cmd == McopySerial::LIGHT) {
+  if (cmd == mc.LIGHT) {
     color = mc.getString();
     parseColorString();
-    mc.confirm(McopySerial::LIGHT);
+    mc.confirm(mc.LIGHT);
   }
 
   //send light signal to pixie every second
diff --git a/ino/mcopy_cam_canon/mcopy_cam_canon.ino b/ino/mcopy_cam_canon/mcopy_cam_canon.ino
index 63e27f0..66106fa 100644
--- a/ino/mcopy_cam_canon/mcopy_cam_canon.ino
+++ b/ino/mcopy_cam_canon/mcopy_cam_canon.ino
@@ -33,7 +33,7 @@ volatile bool ledState;
 const String name_remote = "mcopy";
 CanonBLERemote canon_ble(name_remote);
 TickTwo blinker(blink, 500);
-McopySerial mc(McopySerial::CAMERA_IDENTIFIER);
+McopySerial mc;
 
 volatile boolean connected = false;
 
@@ -83,7 +83,7 @@ void loop()
     now = millis();
     cmd = mc.loop();
 
-    if (cmd == McopySerial::CAMERA && last + 1000 < now) {
+    if (cmd == mc.CAMERA && last + 1000 < now) {
         shutter();
     }
 
@@ -114,5 +114,5 @@ void shutter () {
     blinker.pause();
     digitalWrite(LED, HIGH);
     last = millis();
-    mc.confirm(McopySerial::CAMERA);
+    mc.confirm(mc.CAMERA);
 }
\ No newline at end of file