From 899b52777a877cd71a32dfda1258565085fda755 Mon Sep 17 00:00:00 2001 From: mattmcw Date: Wed, 14 Feb 2024 22:24:18 -0500 Subject: [PATCH] Assign pins to the correct pins for motor control --- ino/contact_printer/ContactPrinter.h | 14 +++++++------- ino/contact_printer/contact_printer.ino | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ino/contact_printer/ContactPrinter.h b/ino/contact_printer/ContactPrinter.h index b970ee5..f47f955 100644 --- a/ino/contact_printer/ContactPrinter.h +++ b/ino/contact_printer/ContactPrinter.h @@ -13,20 +13,20 @@ class ContactPrinter { const uint16_t serial_delay = 5; const uint16_t baud = 115200; - const uint8_t takeup_picture_pin_enable = 7; - const uint8_t takeup_picture_pin_cw = 8; - const uint8_t takeup_picture_pin_ccw = 9; + const uint8_t takeup_picture_pin_enable = 23; + const uint8_t takeup_picture_pin_cw = 22; + const uint8_t takeup_picture_pin_ccw = 21; - const uint8_t takeup_stock_pin_enable = 12; - const uint8_t takeup_stock_pin_cw = 10; - const uint8_t takeup_stock_pin_ccw = 11; + const uint8_t takeup_stock_pin_enable = 19; + const uint8_t takeup_stock_pin_cw = 18; + const uint8_t takeup_stock_pin_ccw = 5; const uint32_t pwm_frequency = 30000; const uint8_t takeup_picture_pwm_channel = 1; const uint8_t takeup_stock_pwm_channel = 2; const uint8_t pwm_resolution = 8; - volatile float drive_speed = 1.0; //calculated rpm + volatile float drive_speed = 1.0; //calculated rpm volatile float takeup_speed = 1.0; //estimated rpm volatile uint16_t takeup_pwm_duty_cycle = 255; diff --git a/ino/contact_printer/contact_printer.ino b/ino/contact_printer/contact_printer.ino index bdcff7a..4380d84 100644 --- a/ino/contact_printer/contact_printer.ino +++ b/ino/contact_printer/contact_printer.ino @@ -7,13 +7,13 @@ * * Pins * - * 7 Takeup Picture Enable - * 8 Takeup Picture Clockwise - * 9 Takeup Picture Counter Clockwise + * 23 Takeup Picture Enable - set duty rate + * 22 Takeup Picture Clockwise + * 21 Takeup Picture Counter Clockwise * - * 12 Takeup Stock Enable - set duty speed - * 10 Takeup Stock Clockwise - * 11 Takeup Stock Counter Clockwise + * 19 Takeup Stock Enable - set duty rate + * 18 Takeup Stock Clockwise + * 5 Takeup Stock Counter Clockwise * * 13 Drive Enable * 12 Drive Forward (Clockwise)