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

Fucked up the merge

This commit is contained in:
Matt McWilliams 2023-08-29 23:33:42 -04:00
parent 6714374639
commit 03f2b55762
10 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/data/cfg.json
View File

@ -1,5 +1,5 @@
{ {
"version": "1.8.14", "version": "1.8.15",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {

2
app/package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "mcopy-app", "name": "mcopy-app",
"version": "1.8.14", "version": "1.8.15",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {

2
app/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "mcopy-app", "name": "mcopy-app",
"version": "1.8.14", "version": "1.8.15",
"description": "GUI for the mcopy small gauge film optical printer platform", "description": "GUI for the mcopy small gauge film optical printer platform",
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {

2
data/cfg.json
View File

@ -1,5 +1,5 @@
{ {
"version": "1.8.14", "version": "1.8.15",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {

2
ino/mcopy_projector_firmware/McopyProjector.h
View File

@ -13,7 +13,7 @@ class McopyProjector {
uint8_t _motorSteps = 1600; //microstepped uint8_t _motorSteps = 1600; //microstepped
uint8_t _frames = 8; uint8_t _frames = 8;
uint8_t _stepsPerFrame = 50; //round(_motorSteps / _frames); uint8_t _stepsPerFrame = 25; //round(_motorSteps / _frames);
float _speed = 500.0; float _speed = 500.0;
int64_t _posTakeup = 0; int64_t _posTakeup = 0;

21
ino/mcopy_projector_firmware/mcopy_projector_firmware.ino
View File

@ -31,20 +31,16 @@
#define FEED_DIR_PIN 7 #define FEED_DIR_PIN 7
#define FEED_STEP_PIN 6 #define FEED_STEP_PIN 6
#define TAKEUP_SETTING_A 4
#define TAKEUP_SETTING_B 5
#define FEED_SETTING_A 8
#define FEED_SETTING_B 9
AccelStepper takeup(AccelStepper::DRIVER, TAKEUP_STEP_PIN, TAKEUP_DIR_PIN); AccelStepper takeup(AccelStepper::DRIVER, TAKEUP_STEP_PIN, TAKEUP_DIR_PIN);
AccelStepper feed(AccelStepper::DRIVER, FEED_STEP_PIN, FEED_DIR_PIN); AccelStepper feed(AccelStepper::DRIVER, FEED_STEP_PIN, FEED_DIR_PIN);
//PROJECTOR CONSTANTS //CAMERA CONSTANTS
const int BUTTON = 10; const int BUTTON = 7;
const int LED_FWD = 11; const int LED_FWD = 8;
const int LED_BWD = 12; const int LED_BWD = 9;
const int PROJECTOR_MOMENT = 240; const int PROJECTOR_MOMENT = 240;
const int PROJECTOR_STEPS = 25;
//VARIABLES //VARIABLES
volatile int projectorFrame = -1; volatile int projectorFrame = -1;
@ -54,7 +50,7 @@ volatile bool direction = true;
volatile long start; volatile long start;
McopySerial mcopy; McopySerial mcopy;
McopyProjector projector(takeup, feed, TAKEUP_SETTING_A, TAKEUP_SETTING_B, FEED_SETTING_A, FEED_SETTING_B); McopyProjector projector(takeup, feed);
void setup () { void setup () {
pins(); pins();
@ -82,11 +78,6 @@ void pins () {
pinMode(LED_BWD, OUTPUT); pinMode(LED_BWD, OUTPUT);
pinMode(BUTTON, INPUT_PULLUP); pinMode(BUTTON, INPUT_PULLUP);
pinMode(TAKEUP_SETTING_A, OUTPUT);
pinMode(TAKEUP_SETTING_B, OUTPUT);
pinMode(FEED_SETTING_A, OUTPUT);
pinMode(FEED_SETTING_B, OUTPUT);
digitalWrite(LED_FWD, LOW); digitalWrite(LED_FWD, LOW);
digitalWrite(LED_BWD, LOW); digitalWrite(LED_BWD, LOW);
} }

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "mcopy", "name": "mcopy",
"version": "1.8.14", "version": "1.8.15",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "mcopy", "name": "mcopy",
"version": "1.8.14", "version": "1.8.15",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"arduino": "file:app/lib/arduino", "arduino": "file:app/lib/arduino",

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "mcopy", "name": "mcopy",
"version": "1.8.14", "version": "1.8.15",
"description": "Small gauge film optical printer platform", "description": "Small gauge film optical printer platform",
"main": "build.js", "main": "build.js",
"directories": { "directories": {

2
processing/mcopy/cfg.json
View File

@ -1,5 +1,5 @@
{ {
"version": "1.8.14", "version": "1.8.15",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {

2
scad/mcopy_projector.scad
View File

@ -348,7 +348,7 @@ module debug () {
} }
PART = "gate_keyx"; PART = "gate_key";
if (PART == "gate_key") { if (PART == "gate_key") {
gate_key(); gate_key();