diff --git a/ino/components/mcopy_light/McopySerial.h b/ino/components/mcopy_light/McopySerial.h index 6ea8e11..17c7f73 100644 --- a/ino/components/mcopy_light/McopySerial.h +++ b/ino/components/mcopy_light/McopySerial.h @@ -76,27 +76,6 @@ class McopySerial { const char TAKEUP_FORWARD = 'D'; /* END CMD FLAGS */ - /* IDENTIFIERS FLAGS */ - const char MCOPY_IDENTIFIER = 'm'; - const char CAMERA_IDENTIFIER = 'k'; - const char PROJECTOR_IDENTIFIER = 'j'; - const char PROJECTOR_CAMERA_IDENTIFIER = 's'; - const char CAMERA_PROJECTORS_IDENTIFIER = '5'; - const char CAMERA_CAPPER_IDENTIFIER = '8'; - const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; - const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; - const char PROJECTOR_LIGHT_IDENTIFIER = 'q'; - const char PROJECTORS_IDENTIFIER = 'd'; - const char PROJECTOR_SECOND_IDENTIFIER = 't'; - const char PROJECTOR_CAMERA_LIGHT_IDENTIFIER = 'r'; - const char CAMERA_SECOND_IDENTIFIER = 'y'; - const char CAMERAS_IDENTIFIER = 'a'; - const char CAMERAS_PROJECTOR_IDENTIFIER = '6'; - const char CAMERAS_PROJECTORS_IDENTIFIER = '7'; - const char CAPPER_IDENTIFIER = 'C'; - const char LIGHT_IDENTIFIER = 'o'; - /* END IDENTIFIERS FLAGS */ - McopySerial(); void begin(char identity); diff --git a/ino/lib/EndstopCameraShield/EndstopCameraShield.cpp b/ino/lib/EndstopCameraShield/EndstopCameraShield.cpp index b9ea84c..980c93b 100644 --- a/ino/lib/EndstopCameraShield/EndstopCameraShield.cpp +++ b/ino/lib/EndstopCameraShield/EndstopCameraShield.cpp @@ -1,6 +1,6 @@ #include "EndstopCameraShield.h" -EndstopCameraShield::EndstopCameraShield () : motor(motorEnablePin, motorDirectionPin, motorPulsePin, motorUsPulse, motorMicrosteps) { +EndstopCameraShield::EndstopCameraShield (uint32_t usPulse, uint8_t microsteps) : motorUsPulse(usPulse), motorMicrosteps(microsteps), motor(motorEnablePin, motorDirectionPin, motorPulsePin, motorUsPulse, motorMicrosteps) { } diff --git a/ino/lib/EndstopCameraShield/EndstopCameraShield.h b/ino/lib/EndstopCameraShield/EndstopCameraShield.h index 214a643..880d384 100644 --- a/ino/lib/EndstopCameraShield/EndstopCameraShield.h +++ b/ino/lib/EndstopCameraShield/EndstopCameraShield.h @@ -23,14 +23,14 @@ class EndstopCameraShield { const uint8_t motorDirectionPin = 7; const uint8_t motorPulsePin = 8; - const uint32_t motorUsPulse = 300; - const uint8_t motorMicrosteps = 2; //half stepping + volatile uint32_t motorUsPulse = 300; + volatile uint8_t motorMicrosteps = 2; //half stepping TB6600MotorDriver motor; public: - EndstopCameraShield(); + EndstopCameraShield(uint32_t usPulse, uint8_t microsteps); void setup(); void loop(); diff --git a/ino/lib/McopySerial/McopySerial.h b/ino/lib/McopySerial/McopySerial.h index 6ea8e11..17c7f73 100644 --- a/ino/lib/McopySerial/McopySerial.h +++ b/ino/lib/McopySerial/McopySerial.h @@ -76,27 +76,6 @@ class McopySerial { const char TAKEUP_FORWARD = 'D'; /* END CMD FLAGS */ - /* IDENTIFIERS FLAGS */ - const char MCOPY_IDENTIFIER = 'm'; - const char CAMERA_IDENTIFIER = 'k'; - const char PROJECTOR_IDENTIFIER = 'j'; - const char PROJECTOR_CAMERA_IDENTIFIER = 's'; - const char CAMERA_PROJECTORS_IDENTIFIER = '5'; - const char CAMERA_CAPPER_IDENTIFIER = '8'; - const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; - const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; - const char PROJECTOR_LIGHT_IDENTIFIER = 'q'; - const char PROJECTORS_IDENTIFIER = 'd'; - const char PROJECTOR_SECOND_IDENTIFIER = 't'; - const char PROJECTOR_CAMERA_LIGHT_IDENTIFIER = 'r'; - const char CAMERA_SECOND_IDENTIFIER = 'y'; - const char CAMERAS_IDENTIFIER = 'a'; - const char CAMERAS_PROJECTOR_IDENTIFIER = '6'; - const char CAMERAS_PROJECTORS_IDENTIFIER = '7'; - const char CAPPER_IDENTIFIER = 'C'; - const char LIGHT_IDENTIFIER = 'o'; - /* END IDENTIFIERS FLAGS */ - McopySerial(); void begin(char identity); diff --git a/ino/mcopy_ACME_Trebes_Nanolab/McopySerial.h b/ino/mcopy_ACME_Trebes_Nanolab/McopySerial.h index 6ea8e11..17c7f73 100644 --- a/ino/mcopy_ACME_Trebes_Nanolab/McopySerial.h +++ b/ino/mcopy_ACME_Trebes_Nanolab/McopySerial.h @@ -76,27 +76,6 @@ class McopySerial { const char TAKEUP_FORWARD = 'D'; /* END CMD FLAGS */ - /* IDENTIFIERS FLAGS */ - const char MCOPY_IDENTIFIER = 'm'; - const char CAMERA_IDENTIFIER = 'k'; - const char PROJECTOR_IDENTIFIER = 'j'; - const char PROJECTOR_CAMERA_IDENTIFIER = 's'; - const char CAMERA_PROJECTORS_IDENTIFIER = '5'; - const char CAMERA_CAPPER_IDENTIFIER = '8'; - const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; - const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; - const char PROJECTOR_LIGHT_IDENTIFIER = 'q'; - const char PROJECTORS_IDENTIFIER = 'd'; - const char PROJECTOR_SECOND_IDENTIFIER = 't'; - const char PROJECTOR_CAMERA_LIGHT_IDENTIFIER = 'r'; - const char CAMERA_SECOND_IDENTIFIER = 'y'; - const char CAMERAS_IDENTIFIER = 'a'; - const char CAMERAS_PROJECTOR_IDENTIFIER = '6'; - const char CAMERAS_PROJECTORS_IDENTIFIER = '7'; - const char CAPPER_IDENTIFIER = 'C'; - const char LIGHT_IDENTIFIER = 'o'; - /* END IDENTIFIERS FLAGS */ - McopySerial(); void begin(char identity); diff --git a/ino/mcopy_JKMM100/McopySerial.h b/ino/mcopy_JKMM100/McopySerial.h index 6ea8e11..17c7f73 100644 --- a/ino/mcopy_JKMM100/McopySerial.h +++ b/ino/mcopy_JKMM100/McopySerial.h @@ -76,27 +76,6 @@ class McopySerial { const char TAKEUP_FORWARD = 'D'; /* END CMD FLAGS */ - /* IDENTIFIERS FLAGS */ - const char MCOPY_IDENTIFIER = 'm'; - const char CAMERA_IDENTIFIER = 'k'; - const char PROJECTOR_IDENTIFIER = 'j'; - const char PROJECTOR_CAMERA_IDENTIFIER = 's'; - const char CAMERA_PROJECTORS_IDENTIFIER = '5'; - const char CAMERA_CAPPER_IDENTIFIER = '8'; - const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; - const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; - const char PROJECTOR_LIGHT_IDENTIFIER = 'q'; - const char PROJECTORS_IDENTIFIER = 'd'; - const char PROJECTOR_SECOND_IDENTIFIER = 't'; - const char PROJECTOR_CAMERA_LIGHT_IDENTIFIER = 'r'; - const char CAMERA_SECOND_IDENTIFIER = 'y'; - const char CAMERAS_IDENTIFIER = 'a'; - const char CAMERAS_PROJECTOR_IDENTIFIER = '6'; - const char CAMERAS_PROJECTORS_IDENTIFIER = '7'; - const char CAPPER_IDENTIFIER = 'C'; - const char LIGHT_IDENTIFIER = 'o'; - /* END IDENTIFIERS FLAGS */ - McopySerial(); void begin(char identity); diff --git a/ino/mcopy_JKMM100_second_projector/McopySerial.h b/ino/mcopy_JKMM100_second_projector/McopySerial.h index 6ea8e11..17c7f73 100644 --- a/ino/mcopy_JKMM100_second_projector/McopySerial.h +++ b/ino/mcopy_JKMM100_second_projector/McopySerial.h @@ -76,27 +76,6 @@ class McopySerial { const char TAKEUP_FORWARD = 'D'; /* END CMD FLAGS */ - /* IDENTIFIERS FLAGS */ - const char MCOPY_IDENTIFIER = 'm'; - const char CAMERA_IDENTIFIER = 'k'; - const char PROJECTOR_IDENTIFIER = 'j'; - const char PROJECTOR_CAMERA_IDENTIFIER = 's'; - const char CAMERA_PROJECTORS_IDENTIFIER = '5'; - const char CAMERA_CAPPER_IDENTIFIER = '8'; - const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; - const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; - const char PROJECTOR_LIGHT_IDENTIFIER = 'q'; - const char PROJECTORS_IDENTIFIER = 'd'; - const char PROJECTOR_SECOND_IDENTIFIER = 't'; - const char PROJECTOR_CAMERA_LIGHT_IDENTIFIER = 'r'; - const char CAMERA_SECOND_IDENTIFIER = 'y'; - const char CAMERAS_IDENTIFIER = 'a'; - const char CAMERAS_PROJECTOR_IDENTIFIER = '6'; - const char CAMERAS_PROJECTORS_IDENTIFIER = '7'; - const char CAPPER_IDENTIFIER = 'C'; - const char LIGHT_IDENTIFIER = 'o'; - /* END IDENTIFIERS FLAGS */ - McopySerial(); void begin(char identity); diff --git a/ino/mcopy_JKMM100_work/McopySerial.h b/ino/mcopy_JKMM100_work/McopySerial.h index 6ea8e11..17c7f73 100644 --- a/ino/mcopy_JKMM100_work/McopySerial.h +++ b/ino/mcopy_JKMM100_work/McopySerial.h @@ -76,27 +76,6 @@ class McopySerial { const char TAKEUP_FORWARD = 'D'; /* END CMD FLAGS */ - /* IDENTIFIERS FLAGS */ - const char MCOPY_IDENTIFIER = 'm'; - const char CAMERA_IDENTIFIER = 'k'; - const char PROJECTOR_IDENTIFIER = 'j'; - const char PROJECTOR_CAMERA_IDENTIFIER = 's'; - const char CAMERA_PROJECTORS_IDENTIFIER = '5'; - const char CAMERA_CAPPER_IDENTIFIER = '8'; - const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; - const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; - const char PROJECTOR_LIGHT_IDENTIFIER = 'q'; - const char PROJECTORS_IDENTIFIER = 'd'; - const char PROJECTOR_SECOND_IDENTIFIER = 't'; - const char PROJECTOR_CAMERA_LIGHT_IDENTIFIER = 'r'; - const char CAMERA_SECOND_IDENTIFIER = 'y'; - const char CAMERAS_IDENTIFIER = 'a'; - const char CAMERAS_PROJECTOR_IDENTIFIER = '6'; - const char CAMERAS_PROJECTORS_IDENTIFIER = '7'; - const char CAPPER_IDENTIFIER = 'C'; - const char LIGHT_IDENTIFIER = 'o'; - /* END IDENTIFIERS FLAGS */ - McopySerial(); void begin(char identity); diff --git a/ino/mcopy_arri_s_firmware/McopySerial.h b/ino/mcopy_arri_s_firmware/McopySerial.h index 6ea8e11..17c7f73 100644 --- a/ino/mcopy_arri_s_firmware/McopySerial.h +++ b/ino/mcopy_arri_s_firmware/McopySerial.h @@ -76,27 +76,6 @@ class McopySerial { const char TAKEUP_FORWARD = 'D'; /* END CMD FLAGS */ - /* IDENTIFIERS FLAGS */ - const char MCOPY_IDENTIFIER = 'm'; - const char CAMERA_IDENTIFIER = 'k'; - const char PROJECTOR_IDENTIFIER = 'j'; - const char PROJECTOR_CAMERA_IDENTIFIER = 's'; - const char CAMERA_PROJECTORS_IDENTIFIER = '5'; - const char CAMERA_CAPPER_IDENTIFIER = '8'; - const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; - const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; - const char PROJECTOR_LIGHT_IDENTIFIER = 'q'; - const char PROJECTORS_IDENTIFIER = 'd'; - const char PROJECTOR_SECOND_IDENTIFIER = 't'; - const char PROJECTOR_CAMERA_LIGHT_IDENTIFIER = 'r'; - const char CAMERA_SECOND_IDENTIFIER = 'y'; - const char CAMERAS_IDENTIFIER = 'a'; - const char CAMERAS_PROJECTOR_IDENTIFIER = '6'; - const char CAMERAS_PROJECTORS_IDENTIFIER = '7'; - const char CAPPER_IDENTIFIER = 'C'; - const char LIGHT_IDENTIFIER = 'o'; - /* END IDENTIFIERS FLAGS */ - McopySerial(); void begin(char identity); diff --git a/ino/mcopy_cam_canon_ble_nano/McopySerial.h b/ino/mcopy_cam_canon_ble_nano/McopySerial.h index 6ea8e11..17c7f73 100644 --- a/ino/mcopy_cam_canon_ble_nano/McopySerial.h +++ b/ino/mcopy_cam_canon_ble_nano/McopySerial.h @@ -76,27 +76,6 @@ class McopySerial { const char TAKEUP_FORWARD = 'D'; /* END CMD FLAGS */ - /* IDENTIFIERS FLAGS */ - const char MCOPY_IDENTIFIER = 'm'; - const char CAMERA_IDENTIFIER = 'k'; - const char PROJECTOR_IDENTIFIER = 'j'; - const char PROJECTOR_CAMERA_IDENTIFIER = 's'; - const char CAMERA_PROJECTORS_IDENTIFIER = '5'; - const char CAMERA_CAPPER_IDENTIFIER = '8'; - const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; - const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; - const char PROJECTOR_LIGHT_IDENTIFIER = 'q'; - const char PROJECTORS_IDENTIFIER = 'd'; - const char PROJECTOR_SECOND_IDENTIFIER = 't'; - const char PROJECTOR_CAMERA_LIGHT_IDENTIFIER = 'r'; - const char CAMERA_SECOND_IDENTIFIER = 'y'; - const char CAMERAS_IDENTIFIER = 'a'; - const char CAMERAS_PROJECTOR_IDENTIFIER = '6'; - const char CAMERAS_PROJECTORS_IDENTIFIER = '7'; - const char CAPPER_IDENTIFIER = 'C'; - const char LIGHT_IDENTIFIER = 'o'; - /* END IDENTIFIERS FLAGS */ - McopySerial(); void begin(char identity); diff --git a/ino/mcopy_cam_relay/McopySerial.h b/ino/mcopy_cam_relay/McopySerial.h index 6ea8e11..17c7f73 100644 --- a/ino/mcopy_cam_relay/McopySerial.h +++ b/ino/mcopy_cam_relay/McopySerial.h @@ -76,27 +76,6 @@ class McopySerial { const char TAKEUP_FORWARD = 'D'; /* END CMD FLAGS */ - /* IDENTIFIERS FLAGS */ - const char MCOPY_IDENTIFIER = 'm'; - const char CAMERA_IDENTIFIER = 'k'; - const char PROJECTOR_IDENTIFIER = 'j'; - const char PROJECTOR_CAMERA_IDENTIFIER = 's'; - const char CAMERA_PROJECTORS_IDENTIFIER = '5'; - const char CAMERA_CAPPER_IDENTIFIER = '8'; - const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; - const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; - const char PROJECTOR_LIGHT_IDENTIFIER = 'q'; - const char PROJECTORS_IDENTIFIER = 'd'; - const char PROJECTOR_SECOND_IDENTIFIER = 't'; - const char PROJECTOR_CAMERA_LIGHT_IDENTIFIER = 'r'; - const char CAMERA_SECOND_IDENTIFIER = 'y'; - const char CAMERAS_IDENTIFIER = 'a'; - const char CAMERAS_PROJECTOR_IDENTIFIER = '6'; - const char CAMERAS_PROJECTORS_IDENTIFIER = '7'; - const char CAPPER_IDENTIFIER = 'C'; - const char LIGHT_IDENTIFIER = 'o'; - /* END IDENTIFIERS FLAGS */ - McopySerial(); void begin(char identity); diff --git a/ino/mcopy_mitchell_camera/EndstopCameraShield.cpp b/ino/mcopy_mitchell_camera/EndstopCameraShield.cpp index b9ea84c..980c93b 100644 --- a/ino/mcopy_mitchell_camera/EndstopCameraShield.cpp +++ b/ino/mcopy_mitchell_camera/EndstopCameraShield.cpp @@ -1,6 +1,6 @@ #include "EndstopCameraShield.h" -EndstopCameraShield::EndstopCameraShield () : motor(motorEnablePin, motorDirectionPin, motorPulsePin, motorUsPulse, motorMicrosteps) { +EndstopCameraShield::EndstopCameraShield (uint32_t usPulse, uint8_t microsteps) : motorUsPulse(usPulse), motorMicrosteps(microsteps), motor(motorEnablePin, motorDirectionPin, motorPulsePin, motorUsPulse, motorMicrosteps) { } diff --git a/ino/mcopy_mitchell_camera/EndstopCameraShield.h b/ino/mcopy_mitchell_camera/EndstopCameraShield.h index 214a643..880d384 100644 --- a/ino/mcopy_mitchell_camera/EndstopCameraShield.h +++ b/ino/mcopy_mitchell_camera/EndstopCameraShield.h @@ -23,14 +23,14 @@ class EndstopCameraShield { const uint8_t motorDirectionPin = 7; const uint8_t motorPulsePin = 8; - const uint32_t motorUsPulse = 300; - const uint8_t motorMicrosteps = 2; //half stepping + volatile uint32_t motorUsPulse = 300; + volatile uint8_t motorMicrosteps = 2; //half stepping TB6600MotorDriver motor; public: - EndstopCameraShield(); + EndstopCameraShield(uint32_t usPulse, uint8_t microsteps); void setup(); void loop(); diff --git a/ino/mcopy_mitchell_camera/McopySerial.h b/ino/mcopy_mitchell_camera/McopySerial.h index 6ea8e11..17c7f73 100644 --- a/ino/mcopy_mitchell_camera/McopySerial.h +++ b/ino/mcopy_mitchell_camera/McopySerial.h @@ -76,27 +76,6 @@ class McopySerial { const char TAKEUP_FORWARD = 'D'; /* END CMD FLAGS */ - /* IDENTIFIERS FLAGS */ - const char MCOPY_IDENTIFIER = 'm'; - const char CAMERA_IDENTIFIER = 'k'; - const char PROJECTOR_IDENTIFIER = 'j'; - const char PROJECTOR_CAMERA_IDENTIFIER = 's'; - const char CAMERA_PROJECTORS_IDENTIFIER = '5'; - const char CAMERA_CAPPER_IDENTIFIER = '8'; - const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; - const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; - const char PROJECTOR_LIGHT_IDENTIFIER = 'q'; - const char PROJECTORS_IDENTIFIER = 'd'; - const char PROJECTOR_SECOND_IDENTIFIER = 't'; - const char PROJECTOR_CAMERA_LIGHT_IDENTIFIER = 'r'; - const char CAMERA_SECOND_IDENTIFIER = 'y'; - const char CAMERAS_IDENTIFIER = 'a'; - const char CAMERAS_PROJECTOR_IDENTIFIER = '6'; - const char CAMERAS_PROJECTORS_IDENTIFIER = '7'; - const char CAPPER_IDENTIFIER = 'C'; - const char LIGHT_IDENTIFIER = 'o'; - /* END IDENTIFIERS FLAGS */ - McopySerial(); void begin(char identity); diff --git a/ino/mcopy_oxberry_camera/EndstopCameraShield.cpp b/ino/mcopy_oxberry_camera/EndstopCameraShield.cpp index b9ea84c..980c93b 100644 --- a/ino/mcopy_oxberry_camera/EndstopCameraShield.cpp +++ b/ino/mcopy_oxberry_camera/EndstopCameraShield.cpp @@ -1,6 +1,6 @@ #include "EndstopCameraShield.h" -EndstopCameraShield::EndstopCameraShield () : motor(motorEnablePin, motorDirectionPin, motorPulsePin, motorUsPulse, motorMicrosteps) { +EndstopCameraShield::EndstopCameraShield (uint32_t usPulse, uint8_t microsteps) : motorUsPulse(usPulse), motorMicrosteps(microsteps), motor(motorEnablePin, motorDirectionPin, motorPulsePin, motorUsPulse, motorMicrosteps) { } diff --git a/ino/mcopy_oxberry_camera/EndstopCameraShield.h b/ino/mcopy_oxberry_camera/EndstopCameraShield.h index 214a643..880d384 100644 --- a/ino/mcopy_oxberry_camera/EndstopCameraShield.h +++ b/ino/mcopy_oxberry_camera/EndstopCameraShield.h @@ -23,14 +23,14 @@ class EndstopCameraShield { const uint8_t motorDirectionPin = 7; const uint8_t motorPulsePin = 8; - const uint32_t motorUsPulse = 300; - const uint8_t motorMicrosteps = 2; //half stepping + volatile uint32_t motorUsPulse = 300; + volatile uint8_t motorMicrosteps = 2; //half stepping TB6600MotorDriver motor; public: - EndstopCameraShield(); + EndstopCameraShield(uint32_t usPulse, uint8_t microsteps); void setup(); void loop(); diff --git a/ino/mcopy_oxberry_camera/McopySerial.h b/ino/mcopy_oxberry_camera/McopySerial.h index 6ea8e11..17c7f73 100644 --- a/ino/mcopy_oxberry_camera/McopySerial.h +++ b/ino/mcopy_oxberry_camera/McopySerial.h @@ -76,27 +76,6 @@ class McopySerial { const char TAKEUP_FORWARD = 'D'; /* END CMD FLAGS */ - /* IDENTIFIERS FLAGS */ - const char MCOPY_IDENTIFIER = 'm'; - const char CAMERA_IDENTIFIER = 'k'; - const char PROJECTOR_IDENTIFIER = 'j'; - const char PROJECTOR_CAMERA_IDENTIFIER = 's'; - const char CAMERA_PROJECTORS_IDENTIFIER = '5'; - const char CAMERA_CAPPER_IDENTIFIER = '8'; - const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; - const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; - const char PROJECTOR_LIGHT_IDENTIFIER = 'q'; - const char PROJECTORS_IDENTIFIER = 'd'; - const char PROJECTOR_SECOND_IDENTIFIER = 't'; - const char PROJECTOR_CAMERA_LIGHT_IDENTIFIER = 'r'; - const char CAMERA_SECOND_IDENTIFIER = 'y'; - const char CAMERAS_IDENTIFIER = 'a'; - const char CAMERAS_PROJECTOR_IDENTIFIER = '6'; - const char CAMERAS_PROJECTORS_IDENTIFIER = '7'; - const char CAPPER_IDENTIFIER = 'C'; - const char LIGHT_IDENTIFIER = 'o'; - /* END IDENTIFIERS FLAGS */ - McopySerial(); void begin(char identity); diff --git a/ino/mcopy_oxberry_camera/mcopy_oxberry_camera.ino b/ino/mcopy_oxberry_camera/mcopy_oxberry_camera.ino index 1bb6bb7..a6cf122 100644 --- a/ino/mcopy_oxberry_camera/mcopy_oxberry_camera.ino +++ b/ino/mcopy_oxberry_camera/mcopy_oxberry_camera.ino @@ -1,7 +1,10 @@ #include "EndstopCameraShield.h" #include "McopySerial.h" -EndstopCameraShield cam(); +const uint32_t usPulse = 300; +const uint8_t microsteps = 2; + +EndstopCameraShield cam(usPulse, microsteps); void setup () { cam.setup(); diff --git a/ino/mcopy_projector_firmware/McopySerial.h b/ino/mcopy_projector_firmware/McopySerial.h index 6ea8e11..17c7f73 100644 --- a/ino/mcopy_projector_firmware/McopySerial.h +++ b/ino/mcopy_projector_firmware/McopySerial.h @@ -76,27 +76,6 @@ class McopySerial { const char TAKEUP_FORWARD = 'D'; /* END CMD FLAGS */ - /* IDENTIFIERS FLAGS */ - const char MCOPY_IDENTIFIER = 'm'; - const char CAMERA_IDENTIFIER = 'k'; - const char PROJECTOR_IDENTIFIER = 'j'; - const char PROJECTOR_CAMERA_IDENTIFIER = 's'; - const char CAMERA_PROJECTORS_IDENTIFIER = '5'; - const char CAMERA_CAPPER_IDENTIFIER = '8'; - const char CAMERA_CAPPER_PROJECTOR_IDENTIFIER = '9'; - const char CAMERA_CAPPER_PROJECTORS_IDENTIFIER = '0'; - const char PROJECTOR_LIGHT_IDENTIFIER = 'q'; - const char PROJECTORS_IDENTIFIER = 'd'; - const char PROJECTOR_SECOND_IDENTIFIER = 't'; - const char PROJECTOR_CAMERA_LIGHT_IDENTIFIER = 'r'; - const char CAMERA_SECOND_IDENTIFIER = 'y'; - const char CAMERAS_IDENTIFIER = 'a'; - const char CAMERAS_PROJECTOR_IDENTIFIER = '6'; - const char CAMERAS_PROJECTORS_IDENTIFIER = '7'; - const char CAPPER_IDENTIFIER = 'C'; - const char LIGHT_IDENTIFIER = 'o'; - /* END IDENTIFIERS FLAGS */ - McopySerial(); void begin(char identity);