Skip to content

Controller Shield v1.8b Hardware Update #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Controller Shield v1.8b Hardware Update #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d2fac5c
Update System.cpp
Jul 25, 2022
f090ae2
Update cnc_ctrl_v1.ino
Jul 25, 2022
1d689e4
Update Maslow.h
Jul 25, 2022
12360f6
Update System.cpp
Jul 25, 2022
fad6ad3
Merge pull request #554 from redchairlabs/master
BarbourSmith Jul 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cnc_ctrl_v1/Maslow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#define maslow_h

// Maslow Firmware Version tracking
#define VERSIONNUMBER 1.28
#define VERSIONNUMBER 1.29

// Define standard libraries used by maslow.
#include <avr/io.h>
Expand Down
38 changes: 18 additions & 20 deletions cnc_ctrl_v1/System.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,33 +313,31 @@ void setupAxes(){
aux8 = 46;
aux9 = 47;
}
else if (pcbVersion == 8) { // CG_PCB TB6643 Detected
//MP1 - Right Motor
else if (pcbVersion == 8) { // MASLOW TB6643 PCB v1.8

//MP1 - Right Motor
encoder1A = 20; // INPUT
encoder1B = 21; // INPUT
in1 = 6; // OUTPUT
in2 = 4; // OUTPUT
enA = 5; // errorFlag (not used)
in2 = 5; // OUTPUT

//MP2 - Z-axis
encoder2A = 19; // INPUT
encoder2B = 18; // INPUT
in3 = 7; // OUTPUT
in4 = 9; // OUTPUT
enB = 8; // errorFlag (not used)
in3 = 8; // OUTPUT
in4 = 7; // OUTPUT

//MP3 - Left Motor
encoder3A = 2; // INPUT
encoder3B = 3; // INPUT
in5 = 11; // OUTPUT
in6 = 10; // OUTPUT
enC = 12; // errorFlag (not used)
encoder3A = 2; // INPUT
encoder3B = 3; // INPUT
in5 = 10; // OUTPUT
in6 = 9; // OUTPUT

//AUX pins
aux1 = 40;
aux1 = 40; // SPINDLE PWR OUTPUT (5v = HIGH = ON)
aux2 = 41;
aux3 = 42;
aux4 = 43;
aux4 = 43; // Z ZERO PROBE INPUT (5v = HIGH = TOUCH)
aux5 = 68;
aux6 = 69;
aux7 = 45;
Expand Down Expand Up @@ -489,28 +487,28 @@ int getPCBVersion(){
TB6643 = false;
break;
case B110100: case B000100: // some versions of board v1.4 don't strap VERS5-6 low
pinCheck &= B000111; // strip off the unstrapped bits
TB6643 = false;
pinCheck &= B000111; // strip off the unstrapped bits
TLE5206 = true;
TLE9201 = false;
TB6643 = false;
break;
case B000110: // v 5
pinCheck &= B000110; // 110 for 6
TB6643 = true;
TLE5206 = false;
TLE9201 = false;
TB6643 = true;
break;
case B000111: //v 1.6 AND V 1.7 (1.7 is a place holder and will not exist because 1.6 uses the same pins)
pinCheck &= B000111;
TB6643 = false;
TLE5206 = false;
TLE9201 = true;
TB6643 = false;
break;
case B001000: //v 1.8
case B001000: // v 1.8
pinCheck &= B001000;
TB6643 = true;
TLE5206 = false;
TLE9201 = false;
TB6643 = true;
break;
}
return pinCheck<8 ? pinCheck-1 : pinCheck;
Expand Down
2 changes: 1 addition & 1 deletion cnc_ctrl_v1/cnc_ctrl_v1.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* Edit the line "compiler.warning_level=none" to "compiler.warning_level=all"
* and restart the IDE.
*/
// v1.28
// v1.29

// TLE9201 version
// TLE5206 version
Expand Down