Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-09-23 21:38:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'edge-preview' of https://github.com/synthetos/g2 into edge-preview

Browse Source
This commit is contained in:
Rob Giseburt
2020-10-27 16:01:15 -05:00
parent 6faaf92c10 441003f36e
commit 39c3d88905
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
g2core/Makefile
+1
View File
@@ -65,6 +65,7 @@ endif
# DEVICE_DEFINES += DEBUG=1 IN_DEBUGGER=1 DEBUG_SEMIHOSTING=1
#endif
#Switch this to 9m if you are compiling the g2core binary on a Raspberry Pi
TOOLS_VERSION = 7u2
# TOOLS_VERSION = 9m
g2core/cycle_homing.cpp
+1 -1
View File
@@ -100,7 +100,7 @@ static stat_t _set_homing_func(stat_t (*func)(int8_t axis)) {
* Will be registered only during homing mode - see gpio.h for more info
*/
gpioDigitalInputHandler _homing_handler {
[&](const bool state, const inputEdgeFlag edge, const uint8_t triggering_pin_number) {
[](const bool state, const inputEdgeFlag edge, const uint8_t triggering_pin_number) {
if (cm->cycle_type != CYCLE_HOMING) { return GPIO_NOT_HANDLED; }
if (triggering_pin_number != hm.homing_input) { return GPIO_NOT_HANDLED; }
if (edge != INPUT_EDGE_LEADING) { return GPIO_NOT_HANDLED; }
g2core/cycle_probing.cpp
+1 -1
View File
@@ -129,7 +129,7 @@ static void _motion_end_callback(float* vect, bool* flag)
* Will be registered only during homing mode - see gpio.h for more info
*/
gpioDigitalInputHandler _probing_handler {
[&](const bool state, const inputEdgeFlag edge, const uint8_t triggering_pin_number) {
[](const bool state, const inputEdgeFlag edge, const uint8_t triggering_pin_number) {
if (cm->cycle_type != CYCLE_PROBE) { return GPIO_NOT_HANDLED; }
if (triggering_pin_number != pb.probe_input) { return GPIO_NOT_HANDLED; }