From 0343dae17589c75e9380af12b19922f05e7b52d8 Mon Sep 17 00:00:00 2001 From: Jake Read <jake.read@cba.mit.edu> Date: Sat, 3 Jul 2021 23:09:16 -0400 Subject: [PATCH] minor config changes, d51 osape up to date --- firmware/osape-smoothieroll-drop-stepper/src/config.h | 5 ++++- firmware/osape-smoothieroll-drop-stepper/src/main.cpp | 2 +- firmware/osape-smoothieroll-drop-stepper/src/osape-d51 | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/firmware/osape-smoothieroll-drop-stepper/src/config.h b/firmware/osape-smoothieroll-drop-stepper/src/config.h index 93d31e3..cd39823 100644 --- a/firmware/osape-smoothieroll-drop-stepper/src/config.h +++ b/firmware/osape-smoothieroll-drop-stepper/src/config.h @@ -4,6 +4,9 @@ //#define UCBUS_IS_HEAD #define UCBUS_IS_DROP -#define IS_OG_MODULE +// if you're using the 'module board' https://gitlab.cba.mit.edu/jakeread/ucbus-module +// the first (og) revision has an SMT header, and some of the RS485 pins are varied, +// set this flag. otherwise, if you have thru-hole JTAG header, comment it out +// #define IS_OG_MODULE #endif \ No newline at end of file diff --git a/firmware/osape-smoothieroll-drop-stepper/src/main.cpp b/firmware/osape-smoothieroll-drop-stepper/src/main.cpp index 40e6786..590a1e2 100644 --- a/firmware/osape-smoothieroll-drop-stepper/src/main.cpp +++ b/firmware/osape-smoothieroll-drop-stepper/src/main.cpp @@ -12,7 +12,7 @@ uint8_t axis_pick = 0; float spu = 400.0F; float old_spu = 400.0F; volatile boolean spu_was_set = false; -float c_scale = 0.05F; +float c_scale = 0.00F; #define TICKS_PER_PACKET 25.0F #define TICKS_PER_SECOND 50000.0F diff --git a/firmware/osape-smoothieroll-drop-stepper/src/osape-d51 b/firmware/osape-smoothieroll-drop-stepper/src/osape-d51 index e0c9987..4b8fbfd 160000 --- a/firmware/osape-smoothieroll-drop-stepper/src/osape-d51 +++ b/firmware/osape-smoothieroll-drop-stepper/src/osape-d51 @@ -1 +1 @@ -Subproject commit e0c99875e43b267a4565cb92ebc74907ee6e1b79 +Subproject commit 4b8fbfdf4ae987c291b24be77ac4ddab157a545a -- GitLab