HCoop
/
clinton
/
Smoothieware.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9d63ea0
b26e004
)
Merge pull request #955 from Bouni/feature/spindle-refactor
author
Jim Morris
<morris@wolfman.com>
Wed, 9 Nov 2016 05:22:49 +0000
(21:22 -0800)
committer
GitHub
<noreply@github.com>
Wed, 9 Nov 2016 05:22:49 +0000
(21:22 -0800)
Feature/spindle refactor
1
2
src/main.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/main.cpp
index
ad84021
,
d0f2647
..
d3bbee4
---
1
/
src/main.cpp
---
2
/
src/main.cpp
+++ b/
src/main.cpp
@@@
-161,10
-158,13
+161,13
@@@
void init()
delete tp;
#endif
#ifndef NO_TOOLS_LASER
-
//
kernel->add_module( new Laser() );
+ kernel->add_module( new Laser() );
#endif
#ifndef NO_TOOLS_SPINDLE
- kernel->add_module( new(AHB0) Spindle() );
+ SpindleMaker *sm= new SpindleMaker();
+ sm->load_spindle();
+ delete sm;
+ //kernel->add_module( new(AHB0) Spindle() );
#endif
#ifndef NO_UTILS_PANEL
kernel->add_module( new(AHB0) Panel() );