mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-09-02 10:53:01 +02:00
Code Issues Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
bdring
2021-03-11 15:40:31 -06:00
parent 1d86f200fa
commit 1f85c32ff0
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Grbl_Esp32/Custom/user_gcode_example.cpp
View File

@@ -6,7 +6,7 @@
Used to add simple G or M codes to the firmware Used to add simple G or M codes to the firmware
If in doubt use an M code If in doubt use an M code
You can pass letter values like You can pass letter values like "M115 E15"
see the definiitons of parser_block_t and gc_values_t see the definiitons of parser_block_t and gc_values_t
Note: letters have different types like unit32_t and float Note: letters have different types like unit32_t and float

11
Grbl_Esp32/src/GCode.h
View File

@@ -48,8 +48,7 @@ enum class ModalGroup : uint8_t {
MM7 = 12, // [M3,M4,M5] Spindle turning MM7 = 12, // [M3,M4,M5] Spindle turning
MM8 = 13, // [M7,M8,M9] Coolant control MM8 = 13, // [M7,M8,M9] Coolant control
MM9 = 14, // [M56] Override control MM9 = 14, // [M56] Override control
MM10 = 15, // [M62, M63, M64, M65, M67, M68] User Defined http://linuxcnc.org/docs/html/gcode/overview.html#_modal_groups MM10 = 15, // [M62, M63, M64, M65, M67, M68] User Defined http://linuxcnc.org/docs/html/gcode/overview.html#_modal_groups
}; };
// Command actions for within execution-type modal groups (motion, stopping, non-modal). Used // Command actions for within execution-type modal groups (motion, stopping, non-modal). Used
@@ -236,9 +235,9 @@ enum GCParserFlags {
// Various places in the code access saved coordinate system data // Various places in the code access saved coordinate system data
// by a small integer index according to the values below. // by a small integer index according to the values below.
enum CoordIndex : uint8_t{ enum CoordIndex : uint8_t {
Begin = 0, Begin = 0,
G54 = Begin, G54 = Begin,
G55, G55,
G56, G56,
G57, G57,
@@ -258,7 +257,7 @@ enum CoordIndex : uint8_t{
}; };
// Allow iteration over CoordIndex values // Allow iteration over CoordIndex values
CoordIndex& operator ++ (CoordIndex& i); CoordIndex& operator++(CoordIndex& i);
// NOTE: When this struct is zeroed, the 0 values in the above types set the system defaults. // NOTE: When this struct is zeroed, the 0 values in the above types set the system defaults.
typedef struct { typedef struct {
@@ -335,5 +334,5 @@ Error gc_execute_line(char* line, uint8_t client);
// Set g-code parser position. Input in steps. // Set g-code parser position. Input in steps.
void gc_sync_position(); void gc_sync_position();
bool user_validate_gcode(char letter, uint8_t code_num, uint32_t &value_words); bool user_validate_gcode(char letter, uint8_t code_num, uint32_t& value_words);
bool user_execute_gcode(parser_block_t parser_block); bool user_execute_gcode(parser_block_t parser_block);