From 44ca2b20344ea2fe80108bbec68fd2571e3fc035 Mon Sep 17 00:00:00 2001 From: isaac879 Date: Tue, 1 Sep 2020 01:45:54 +0100 Subject: [PATCH] Add files via upload --- .../panTiltMount.cpp | 2 +- .../panTiltMount.h | 22 ++----------------- .../pan_tilt_mount_nano_code_tmc2208.ino | 8 +++---- 3 files changed, 7 insertions(+), 25 deletions(-) diff --git a/pan_tilt_mount_nano_code_tmc2208/panTiltMount.cpp b/pan_tilt_mount_nano_code_tmc2208/panTiltMount.cpp index 97712da..27e027e 100644 --- a/pan_tilt_mount_nano_code_tmc2208/panTiltMount.cpp +++ b/pan_tilt_mount_nano_code_tmc2208/panTiltMount.cpp @@ -884,7 +884,7 @@ void interpolateTargetPoint(FloatCoordinate targetPoint, int repeat){ //The firs printi(F("Not enough keyframes recorded\n")); return; //check there are posions to move to } - + float sliderStartPos = sliderStepsToMillimetres(keyframe_array[0].sliderStepCount); //slider start position float sliderEndPos = sliderStepsToMillimetres(keyframe_array[1].sliderStepCount); float panAngle = 0; diff --git a/pan_tilt_mount_nano_code_tmc2208/panTiltMount.h b/pan_tilt_mount_nano_code_tmc2208/panTiltMount.h index d1c9ba9..6d9fea9 100644 --- a/pan_tilt_mount_nano_code_tmc2208/panTiltMount.h +++ b/pan_tilt_mount_nano_code_tmc2208/panTiltMount.h @@ -5,22 +5,14 @@ #define BAUD_RATE 57600 -#define PIN_LED_DATA A0 #define PIN_SHUTTER_TRIGGER A1 #define PIN_PAN_HALL A3 #define PIN_TILT_HALL A4 +#define PIN_SLIDER_HALL 2 #define PIN_INPUT_VOLTAGE A5 #define PIN_ENABLE 12 #define PIN_MS1 11 #define PIN_MS2 10 - -//#define PIN_STEP_SLIDER 8 -//#define PIN_DIRECTION_SLIDER 7 -//#define PIN_STEP_TILT 6 -//#define PIN_DIRECTION_TILT 5 -//#define PIN_STEP_PAN 4 -//#define PIN_DIRECTION_PAN 3 - #define PIN_STEP_SLIDER 4 #define PIN_DIRECTION_SLIDER 3 #define PIN_STEP_TILT 6 @@ -28,8 +20,6 @@ #define PIN_STEP_PAN 8 #define PIN_DIRECTION_PAN 7 -#define PIN_SLIDER_HALL 2 - #define HALF_STEP 2 #define QUARTER_STEP 4 #define EIGHTH_STEP 8 @@ -48,7 +38,6 @@ #define INSTRUCTION_STEP_MODE 'm' #define INSTRUCTION_PAN_DEGREES 'p' #define INSTRUCTION_TILT_DEGREES 't' -#define INSTRUCTION_SET_HOME 'h' #define INSTRUCTION_ENABLE 'e' #define INSTRUCTION_SET_PAN_SPEED 's' #define INSTRUCTION_SET_TILT_SPEED 'S' @@ -60,8 +49,6 @@ #define INSTRUCTION_TRIGGER_SHUTTER 'c' #define INSTRUCTION_AUTO_HOME 'A' #define INSTRUCTION_DEBUG_STATUS 'R' -#define INSTRUCTION_PAN_RUN_SPEED 'k' -#define INSTRUCTION_TILT_RUN_SPEED 'K' #define INSTRUCTION_EXECUTE_MOVES ';' #define INSTRUCTION_ADD_POSITION '#' #define INSTRUCTION_STEP_FORWARD '>' @@ -106,12 +93,7 @@ #define EEPROM_ADDRESS_TILT_ACCEL_INCREMENT_DELAY 82 #define EEPROM_ADDRESS_SLIDER_ACCEL_INCREMENT_DELAY 84 -#define LED_TYPE WS2812B -#define COLOR_ORDER GRB -#define NUM_LEDS 1 -#define BRIGHTNESS 255 - -#define VERSION_NUMBER "Version: 3.9.7\n" +#define VERSION_NUMBER "Version: 3.9.8\n" /*------------------------------------------------------------------------------------------------------------------------------------------------------*/ diff --git a/pan_tilt_mount_nano_code_tmc2208/pan_tilt_mount_nano_code_tmc2208.ino b/pan_tilt_mount_nano_code_tmc2208/pan_tilt_mount_nano_code_tmc2208.ino index 3d63c15..7f1bb0e 100644 --- a/pan_tilt_mount_nano_code_tmc2208/pan_tilt_mount_nano_code_tmc2208.ino +++ b/pan_tilt_mount_nano_code_tmc2208/pan_tilt_mount_nano_code_tmc2208.ino @@ -5,10 +5,10 @@ * The code is developed for a 3D printed pan/tilt/slider mount for a Canon EOS 250D DSLR. It is controlled by an Arduino Nano, JDY-31 Bluetooth module, * TMC2208 stepper motor drivers and some custom circuitry. * - * Pan Tilt Mount STL files: https://www.thingiverse.com/thing:4316563 + * Pan Tilt Mount STL files: https://www.thingiverse.com/thing:4547074 * - * Project videos: https://youtu.be/uJO7mv4-0PY - * https://youtu.be/v1b7Wvu87-U + * Project video: https://youtu.be/1FfB7cLkUyQ + * * All measurements are in SI units unless otherwise specified. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, @@ -18,7 +18,7 @@ * * Code written by isaac879 * - * Last modified: 17/08/2020 + * Last modified: 01/09/2020 * *--------------------------------------------------------------------------------------------------------------------------------------------------------*/