Commit 5902196a authored by Jake Read's avatar Jake Read
Browse files

back together

parent 478ff3e8
...@@ -151,7 +151,6 @@ void setup() { ...@@ -151,7 +151,6 @@ void setup() {
ERRLIGHT_SETUP; ERRLIGHT_SETUP;
CLKLIGHT_SETUP; CLKLIGHT_SETUP;
DEBUG1PIN_SETUP; DEBUG1PIN_SETUP;
/*
// limit switch // limit switch
//limitSetup(); //limitSetup();
// osap // osap
...@@ -176,10 +175,9 @@ void setup() { ...@@ -176,10 +175,9 @@ void setup() {
osapAddVertex(homeStateEp); // 8 osapAddVertex(homeStateEp); // 8
// stepper init // stepper init
stepper_hw->init(false, c_scale); stepper_hw->init(false, c_scale);
*/
// bare serial // bare serial
Serial.begin(9600); //Serial.begin(9600);
ucBusDrop_setup(true, 0); //ucBusDrop_setup(true, 0);
} }
// have available, // have available,
...@@ -193,6 +191,7 @@ uint8_t tstTx[14] = {1, 2, 3, 4, 5, 0, 7, 8, 9, 10, 11, 12, 13, 14}; ...@@ -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]; uint8_t tstRx[256];
void loop() { void loop() {
/*
if(ucBusDrop_ctrB()){ if(ucBusDrop_ctrB()){
ERRLIGHT_TOGGLE; ERRLIGHT_TOGGLE;
uint16_t len = ucBusDrop_readB(tstRx); uint16_t len = ucBusDrop_readB(tstRx);
...@@ -202,8 +201,9 @@ void loop() { ...@@ -202,8 +201,9 @@ void loop() {
ucBusDrop_transmitB(tstRx, len); ucBusDrop_transmitB(tstRx, len);
} }
} }
//osapLoop(); */
//stepper_hw->dacRefresh(); osapLoop();
stepper_hw->dacRefresh();
#ifdef TEST_TX #ifdef TEST_TX
if(millis() > lastTx + 500){ if(millis() > lastTx + 500){
lastTx = millis(); lastTx = millis();
......
Subproject commit 7d0be7a5c309aab2a3300116c7e9fd2c425fc6cb Subproject commit af5f9a0e004a6134b38f0f1996bebda271f9c655
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment