16mm
/
mcopy
1
0
Fork 0
Code Issues 14 Pull Requests Projects 2 Releases 13 Wiki Activity

Accidentally modified an autogenerated part of McopySerial. Fixed

This commit is contained in:
Matt McWilliams 2024-06-30 12:10:30 -04:00
parent 966f67882a
commit 84fe1b71be
19 changed files with 16 additions and 265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ino/components/mcopy_light/McopySerial.h
View File

@ -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);

2
ino/lib/EndstopCameraShield/EndstopCameraShield.cpp
View File

@ -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) {
}

6
ino/lib/EndstopCameraShield/EndstopCameraShield.h
View File

@ -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();

21
ino/lib/McopySerial/McopySerial.h
View File

@ -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);

21
ino/mcopy_ACME_Trebes_Nanolab/McopySerial.h
View File

@ -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);

21
ino/mcopy_JKMM100/McopySerial.h
View File

@ -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);

21
ino/mcopy_JKMM100_second_projector/McopySerial.h
View File

@ -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);

21
ino/mcopy_JKMM100_work/McopySerial.h
View File

@ -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);

21
ino/mcopy_arri_s_firmware/McopySerial.h
View File

@ -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);

21
ino/mcopy_cam_canon_ble_nano/McopySerial.h
View File

@ -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);

21
ino/mcopy_cam_relay/McopySerial.h
View File

@ -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);

2
ino/mcopy_mitchell_camera/EndstopCameraShield.cpp
View File

@ -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) {
}

6
ino/mcopy_mitchell_camera/EndstopCameraShield.h
View File

@ -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();

21
ino/mcopy_mitchell_camera/McopySerial.h
View File

@ -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);

2
ino/mcopy_oxberry_camera/EndstopCameraShield.cpp
View File

@ -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) {
}

6
ino/mcopy_oxberry_camera/EndstopCameraShield.h
View File

@ -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();

21
ino/mcopy_oxberry_camera/McopySerial.h
View File

@ -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);

5
ino/mcopy_oxberry_camera/mcopy_oxberry_camera.ino
View File

@ -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();

21
ino/mcopy_projector_firmware/McopySerial.h
View File

@ -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);