From 5902196acb56b2af18443b2350a592df174c5d38 Mon Sep 17 00:00:00 2001
From: Jake Read <jake.read@cba.mit.edu>
Date: Mon, 9 Aug 2021 15:16:44 -0400
Subject: [PATCH] back together
---
firmware/stepper-drop/src/main.cpp | 12 ++++++------
firmware/stepper-drop/src/osape-d51 | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/firmware/stepper-drop/src/main.cpp b/firmware/stepper-drop/src/main.cpp
index cd3f8f8..8debd5a 100644
--- a/firmware/stepper-drop/src/main.cpp
+++ b/firmware/stepper-drop/src/main.cpp
@@ -151,7 +151,6 @@ void setup() {
ERRLIGHT_SETUP;
CLKLIGHT_SETUP;
DEBUG1PIN_SETUP;
- /*
// limit switch
//limitSetup();
// osap
@@ -176,10 +175,9 @@ void setup() {
osapAddVertex(homeStateEp); // 8
// stepper init
stepper_hw->init(false, c_scale);
- */
// bare serial
- Serial.begin(9600);
- ucBusDrop_setup(true, 0);
+ //Serial.begin(9600);
+ //ucBusDrop_setup(true, 0);
}
// have available,
@@ -193,6 +191,7 @@ uint8_t tstTx[14] = {1, 2, 3, 4, 5, 0, 7, 8, 9, 10, 11, 12, 13, 14};
uint8_t tstRx[256];
void loop() {
+ /*
if(ucBusDrop_ctrB()){
ERRLIGHT_TOGGLE;
uint16_t len = ucBusDrop_readB(tstRx);
@@ -202,8 +201,9 @@ void loop() {
ucBusDrop_transmitB(tstRx, len);
}
}
- //osapLoop();
- //stepper_hw->dacRefresh();
+ */
+ osapLoop();
+ stepper_hw->dacRefresh();
#ifdef TEST_TX
if(millis() > lastTx + 500){
lastTx = millis();
diff --git a/firmware/stepper-drop/src/osape-d51 b/firmware/stepper-drop/src/osape-d51
index 7d0be7a..af5f9a0 160000
--- a/firmware/stepper-drop/src/osape-d51
+++ b/firmware/stepper-drop/src/osape-d51
@@ -1 +1 @@
-Subproject commit 7d0be7a5c309aab2a3300116c7e9fd2c425fc6cb
+Subproject commit af5f9a0e004a6134b38f0f1996bebda271f9c655
--
GitLab