From 617f196178f55274310ca311b1210e2356c2e461 Mon Sep 17 00:00:00 2001 From: Stepan Usatiuk Date: Wed, 29 May 2019 15:25:52 +0300 Subject: [PATCH] eggs seem to be bigger than i thought Signed-off-by: Stepan Usatyuk --- Firmware/MotorControl/include/Globals.h | 4 ++-- Firmware/MotorControl/src/main.cpp | 4 ++-- Utils/egg.svg | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Firmware/MotorControl/include/Globals.h b/Firmware/MotorControl/include/Globals.h index 9907ded..45d321d 100644 --- a/Firmware/MotorControl/include/Globals.h +++ b/Firmware/MotorControl/include/Globals.h @@ -5,11 +5,11 @@ #ifndef GLOBALS_H #define GLOBALS_H -#define EGG_DIA 35.0 +#define EGG_DIA 45.0 #define Y_DEGREES_PER_MM (360 / (PI * EGG_DIA)) #define X_LIMIT 90.0 -#define EGG_LENGTH 50.0 +#define EGG_LENGTH 60.0 #define X_DEGREES_PER_MM (X_LIMIT / EGG_LENGTH) #define STEPS_PER_REVOLUTION (360/1.8) * 32 diff --git a/Firmware/MotorControl/src/main.cpp b/Firmware/MotorControl/src/main.cpp index 525ec58..6fe0215 100644 --- a/Firmware/MotorControl/src/main.cpp +++ b/Firmware/MotorControl/src/main.cpp @@ -79,7 +79,7 @@ void requestEvent() { } } -void execCommand(float *command) { +void execCommand() { executing = true; cli(); if (command[0] == G01 || command[0] == G00) { @@ -156,7 +156,7 @@ void loop() { } if (newCommand) { newCommand = false; - execCommand(command); + execCommand(); } updateExecution(); } diff --git a/Utils/egg.svg b/Utils/egg.svg index df02b92..1655f6f 100644 --- a/Utils/egg.svg +++ b/Utils/egg.svg @@ -34,7 +34,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.7" - inkscape:cx="661.33551" + inkscape:cx="487.0498" inkscape:cy="332.89105" inkscape:document-units="mm" inkscape:current-layer="layer2" @@ -409,11 +409,11 @@ id="layer2" inkscape:label="Layer 2"> + width="59.81332" + height="141.18332" + x="0.093339927" + y="155.72331" />