HCoop
/
clinton
/
Smoothieware.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove deprecated query format
[clinton/Smoothieware.git]
/
src
/
libs
/
Kernel.h
diff --git
a/src/libs/Kernel.h
b/src/libs/Kernel.h
index
4a2feb7
..
d30f0ec
100644
(file)
--- a/
src/libs/Kernel.h
+++ b/
src/libs/Kernel.h
@@
-53,6
+53,7
@@
class Kernel {
void set_feed_hold(bool f) { feed_hold= f; }
bool get_feed_hold() const { return feed_hold; }
void set_feed_hold(bool f) { feed_hold= f; }
bool get_feed_hold() const { return feed_hold; }
+ bool is_feed_hold_enabled() const { return enable_feed_hold; }
std::string get_query_string();
std::string get_query_string();
@@
-67,13
+68,11
@@
class Kernel {
Configurator* configurator;
SimpleShell* simpleshell;
Configurator* configurator;
SimpleShell* simpleshell;
- int debug;
SlowTicker* slow_ticker;
StepTicker* step_ticker;
Adc* adc;
std::string current_path;
uint32_t base_stepping_frequency;
SlowTicker* slow_ticker;
StepTicker* step_ticker;
Adc* adc;
std::string current_path;
uint32_t base_stepping_frequency;
- uint32_t acceleration_ticks_per_second;
private:
// When a module asks to be called for a specific event ( a hook ), this is where that request is remembered
private:
// When a module asks to be called for a specific event ( a hook ), this is where that request is remembered
@@
-84,6
+83,7
@@
class Kernel {
bool grbl_mode:1;
bool feed_hold:1;
bool ok_per_line:1;
bool grbl_mode:1;
bool feed_hold:1;
bool ok_per_line:1;
+ bool enable_feed_hold:1;
};
};
};
};