ManuelW/grbl-LPC-CoreXY
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Merge pull request #27 from tscofield/probe

Browse Source 
changes to allow probing on pin 1.27
This commit is contained in:
Claudio Prezzi 2019-07-26 15:17:32 +02:00 committed by GitHub
commit 04f8621ef9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
grbl/cpu_map.h
View File

@ -534,10 +534,11 @@
#define CONTROL_INVERT_MASK CONTROL_MASK // May be re-defined to only invert certain control pins. #define CONTROL_INVERT_MASK CONTROL_MASK // May be re-defined to only invert certain control pins.
// Define probe switch input pin. // Define probe switch input pin.
#define PROBE_DDR NotUsed // Borrow Y Max limit port for probe
#define PROBE_PIN NotUsed #define PROBE_DDR LPC_GPIO1->FIODIR
#define PROBE_PORT NotUsed #define PROBE_PIN LPC_GPIO1->FIOPIN
#define PROBE_BIT 5 // Uno Analog Pin 5 #define PROBE_PORT LPC_GPIO1->FIOPIN
#define PROBE_BIT 27 // borrowing y-max pin
#define PROBE_MASK (1<<PROBE_BIT) #define PROBE_MASK (1<<PROBE_BIT)
// The LPC17xx has 6 PWM channels. Each channel has 2 pins. It can drive both pins simultaneously to the same value. // The LPC17xx has 6 PWM channels. Each channel has 2 pins. It can drive both pins simultaneously to the same value.

10
grbl/probe.c
View File

@ -22,7 +22,7 @@
// Inverts the probe pin state depending on user settings and probing cycle mode. // Inverts the probe pin state depending on user settings and probing cycle mode.
uint8_t probe_invert_mask; uint32_t probe_invert_mask;
// Probe pin initialization routine. // Probe pin initialization routine.
@ -50,7 +50,13 @@ void probe_configure_invert_mask(uint8_t is_probe_away)
// Returns the probe pin state. Triggered = true. Called by gcode parser and probe state monitor. // Returns the probe pin state. Triggered = true. Called by gcode parser and probe state monitor.
uint8_t probe_get_state() { return((PROBE_PIN & PROBE_MASK) ^ probe_invert_mask); } uint8_t probe_get_state() {
if ((PROBE_PIN & PROBE_MASK) ^ probe_invert_mask) {
return 1;
} else {
return 0;
}
}
// Monitors probe pin state and records the system position when detected. Called by the // Monitors probe pin state and records the system position when detected. Called by the