From aa5b5f826782a15432fe5c4677e0326ff8dac240 Mon Sep 17 00:00:00 2001 From: Anders Sandstrom Date: Thu, 20 Jan 2022 13:45:18 +0100 Subject: [PATCH] Prefix all grbl files with grbl to avoid conflicts.. --- grbl/grbl.h | 40 +++++++++---------- grbl/{config.h => grbl_config.h} | 0 ...olant_control.c => grbl_coolant_control.c} | 0 ...olant_control.h => grbl_coolant_control.h} | 0 grbl/{cpu_map.h => grbl_cpu_map.h} | 0 grbl/{defaults.h => grbl_defaults.h} | 0 grbl/{eeprom.c => grbl_eeprom.c} | 0 grbl/{eeprom.h => grbl_eeprom.h} | 0 grbl/{gcode.c => grbl_gcode.c} | 0 grbl/{gcode.h => grbl_gcode.h} | 0 grbl/{jog.c => grbl_jog.c} | 0 grbl/{jog.h => grbl_jog.h} | 2 +- ...motion_control.c => grbl_motion_control.c} | 0 ...motion_control.h => grbl_motion_control.h} | 0 grbl/{nuts_bolts.c => grbl_nuts_bolts.c} | 0 grbl/{nuts_bolts.h => grbl_nuts_bolts.h} | 0 grbl/{planner.c => grbl_planner.c} | 0 grbl/{planner.h => grbl_planner.h} | 0 grbl/{print.c => grbl_print.c} | 0 grbl/{print.h => grbl_print.h} | 0 grbl/{probe.c => grbl_probe.c} | 0 grbl/{probe.h => grbl_probe.h} | 0 grbl/{protocol.c => grbl_protocol.c} | 0 grbl/{protocol.h => grbl_protocol.h} | 0 grbl/{report.c => grbl_report.c} | 0 grbl/{report.h => grbl_report.h} | 0 grbl/{serial.c => grbl_serial.c} | 0 grbl/{serial.h => grbl_serial.h} | 0 grbl/{settings.c => grbl_settings.c} | 0 grbl/{settings.h => grbl_settings.h} | 0 ...indle_control.c => grbl_spindle_control.c} | 0 ...indle_control.h => grbl_spindle_control.h} | 0 grbl/{stepper.c => grbl_stepper.c} | 0 grbl/{stepper.h => grbl_stepper.h} | 0 grbl/{system.c => grbl_system.c} | 0 grbl/{system.h => grbl_system.h} | 0 36 files changed, 21 insertions(+), 21 deletions(-) rename grbl/{config.h => grbl_config.h} (100%) rename grbl/{coolant_control.c => grbl_coolant_control.c} (100%) rename grbl/{coolant_control.h => grbl_coolant_control.h} (100%) rename grbl/{cpu_map.h => grbl_cpu_map.h} (100%) rename grbl/{defaults.h => grbl_defaults.h} (100%) rename grbl/{eeprom.c => grbl_eeprom.c} (100%) rename grbl/{eeprom.h => grbl_eeprom.h} (100%) rename grbl/{gcode.c => grbl_gcode.c} (100%) rename grbl/{gcode.h => grbl_gcode.h} (100%) rename grbl/{jog.c => grbl_jog.c} (100%) rename grbl/{jog.h => grbl_jog.h} (97%) rename grbl/{motion_control.c => grbl_motion_control.c} (100%) rename grbl/{motion_control.h => grbl_motion_control.h} (100%) rename grbl/{nuts_bolts.c => grbl_nuts_bolts.c} (100%) rename grbl/{nuts_bolts.h => grbl_nuts_bolts.h} (100%) rename grbl/{planner.c => grbl_planner.c} (100%) rename grbl/{planner.h => grbl_planner.h} (100%) rename grbl/{print.c => grbl_print.c} (100%) rename grbl/{print.h => grbl_print.h} (100%) rename grbl/{probe.c => grbl_probe.c} (100%) rename grbl/{probe.h => grbl_probe.h} (100%) rename grbl/{protocol.c => grbl_protocol.c} (100%) rename grbl/{protocol.h => grbl_protocol.h} (100%) rename grbl/{report.c => grbl_report.c} (100%) rename grbl/{report.h => grbl_report.h} (100%) rename grbl/{serial.c => grbl_serial.c} (100%) rename grbl/{serial.h => grbl_serial.h} (100%) rename grbl/{settings.c => grbl_settings.c} (100%) rename grbl/{settings.h => grbl_settings.h} (100%) rename grbl/{spindle_control.c => grbl_spindle_control.c} (100%) rename grbl/{spindle_control.h => grbl_spindle_control.h} (100%) rename grbl/{stepper.c => grbl_stepper.c} (100%) rename grbl/{stepper.h => grbl_stepper.h} (100%) rename grbl/{system.c => grbl_system.c} (100%) rename grbl/{system.h => grbl_system.h} (100%) diff --git a/grbl/grbl.h b/grbl/grbl.h index 2e07c23..cbb5141 100644 --- a/grbl/grbl.h +++ b/grbl/grbl.h @@ -40,27 +40,27 @@ #include // Define the Grbl system include files. NOTE: Do not alter organization. -#include "config.h" -#include "nuts_bolts.h" -#include "settings.h" -#include "system.h" -#include "defaults.h" -#include "cpu_map.h" -#include "planner.h" -#include "coolant_control.h" -#include "eeprom.h" -#include "gcode.h" +#include "grbl_config.h" +#include "grbl_nuts_bolts.h" +#include "grbl_settings.h" +#include "grbl_system.h" +#include "grbl_defaults.h" +#include "grbl_cpu_map.h" +#include "grbl_planner.h" +#include "grbl_coolant_control.h" +#include "grbl_eeprom.h" +#include "grbl_gcode.h" #include "grbl_limits.h" -#include "motion_control.h" -#include "planner.h" -#include "print.h" -#include "probe.h" -#include "protocol.h" -#include "report.h" -#include "serial.h" -#include "spindle_control.h" -#include "stepper.h" -#include "jog.h" +#include "grbl_motion_control.h" +#include "grbl_planner.h" +#include "grbl_print.h" +#include "grbl_probe.h" +#include "grbl_protocol.h" +#include "grbl_report.h" +#include "grbl_serial.h" +#include "grbl_spindle_control.h" +#include "grbl_stepper.h" +#include "grbl_jog.h" // --------------------------------------------------------------------------------------- // COMPILE-TIME ERROR CHECKING OF DEFINE VALUES: diff --git a/grbl/config.h b/grbl/grbl_config.h similarity index 100% rename from grbl/config.h rename to grbl/grbl_config.h diff --git a/grbl/coolant_control.c b/grbl/grbl_coolant_control.c similarity index 100% rename from grbl/coolant_control.c rename to grbl/grbl_coolant_control.c diff --git a/grbl/coolant_control.h b/grbl/grbl_coolant_control.h similarity index 100% rename from grbl/coolant_control.h rename to grbl/grbl_coolant_control.h diff --git a/grbl/cpu_map.h b/grbl/grbl_cpu_map.h similarity index 100% rename from grbl/cpu_map.h rename to grbl/grbl_cpu_map.h diff --git a/grbl/defaults.h b/grbl/grbl_defaults.h similarity index 100% rename from grbl/defaults.h rename to grbl/grbl_defaults.h diff --git a/grbl/eeprom.c b/grbl/grbl_eeprom.c similarity index 100% rename from grbl/eeprom.c rename to grbl/grbl_eeprom.c diff --git a/grbl/eeprom.h b/grbl/grbl_eeprom.h similarity index 100% rename from grbl/eeprom.h rename to grbl/grbl_eeprom.h diff --git a/grbl/gcode.c b/grbl/grbl_gcode.c similarity index 100% rename from grbl/gcode.c rename to grbl/grbl_gcode.c diff --git a/grbl/gcode.h b/grbl/grbl_gcode.h similarity index 100% rename from grbl/gcode.h rename to grbl/grbl_gcode.h diff --git a/grbl/jog.c b/grbl/grbl_jog.c similarity index 100% rename from grbl/jog.c rename to grbl/grbl_jog.c diff --git a/grbl/jog.h b/grbl/grbl_jog.h similarity index 97% rename from grbl/jog.h rename to grbl/grbl_jog.h index c726246..ca44e7d 100644 --- a/grbl/jog.h +++ b/grbl/grbl_jog.h @@ -21,7 +21,7 @@ #ifndef jog_h #define jog_h -#include "gcode.h" +#include "grbl_gcode.h" // System motion line numbers must be zero. #define JOG_LINE_NUMBER 0 diff --git a/grbl/motion_control.c b/grbl/grbl_motion_control.c similarity index 100% rename from grbl/motion_control.c rename to grbl/grbl_motion_control.c diff --git a/grbl/motion_control.h b/grbl/grbl_motion_control.h similarity index 100% rename from grbl/motion_control.h rename to grbl/grbl_motion_control.h diff --git a/grbl/nuts_bolts.c b/grbl/grbl_nuts_bolts.c similarity index 100% rename from grbl/nuts_bolts.c rename to grbl/grbl_nuts_bolts.c diff --git a/grbl/nuts_bolts.h b/grbl/grbl_nuts_bolts.h similarity index 100% rename from grbl/nuts_bolts.h rename to grbl/grbl_nuts_bolts.h diff --git a/grbl/planner.c b/grbl/grbl_planner.c similarity index 100% rename from grbl/planner.c rename to grbl/grbl_planner.c diff --git a/grbl/planner.h b/grbl/grbl_planner.h similarity index 100% rename from grbl/planner.h rename to grbl/grbl_planner.h diff --git a/grbl/print.c b/grbl/grbl_print.c similarity index 100% rename from grbl/print.c rename to grbl/grbl_print.c diff --git a/grbl/print.h b/grbl/grbl_print.h similarity index 100% rename from grbl/print.h rename to grbl/grbl_print.h diff --git a/grbl/probe.c b/grbl/grbl_probe.c similarity index 100% rename from grbl/probe.c rename to grbl/grbl_probe.c diff --git a/grbl/probe.h b/grbl/grbl_probe.h similarity index 100% rename from grbl/probe.h rename to grbl/grbl_probe.h diff --git a/grbl/protocol.c b/grbl/grbl_protocol.c similarity index 100% rename from grbl/protocol.c rename to grbl/grbl_protocol.c diff --git a/grbl/protocol.h b/grbl/grbl_protocol.h similarity index 100% rename from grbl/protocol.h rename to grbl/grbl_protocol.h diff --git a/grbl/report.c b/grbl/grbl_report.c similarity index 100% rename from grbl/report.c rename to grbl/grbl_report.c diff --git a/grbl/report.h b/grbl/grbl_report.h similarity index 100% rename from grbl/report.h rename to grbl/grbl_report.h diff --git a/grbl/serial.c b/grbl/grbl_serial.c similarity index 100% rename from grbl/serial.c rename to grbl/grbl_serial.c diff --git a/grbl/serial.h b/grbl/grbl_serial.h similarity index 100% rename from grbl/serial.h rename to grbl/grbl_serial.h diff --git a/grbl/settings.c b/grbl/grbl_settings.c similarity index 100% rename from grbl/settings.c rename to grbl/grbl_settings.c diff --git a/grbl/settings.h b/grbl/grbl_settings.h similarity index 100% rename from grbl/settings.h rename to grbl/grbl_settings.h diff --git a/grbl/spindle_control.c b/grbl/grbl_spindle_control.c similarity index 100% rename from grbl/spindle_control.c rename to grbl/grbl_spindle_control.c diff --git a/grbl/spindle_control.h b/grbl/grbl_spindle_control.h similarity index 100% rename from grbl/spindle_control.h rename to grbl/grbl_spindle_control.h diff --git a/grbl/stepper.c b/grbl/grbl_stepper.c similarity index 100% rename from grbl/stepper.c rename to grbl/grbl_stepper.c diff --git a/grbl/stepper.h b/grbl/grbl_stepper.h similarity index 100% rename from grbl/stepper.h rename to grbl/grbl_stepper.h diff --git a/grbl/system.c b/grbl/grbl_system.c similarity index 100% rename from grbl/system.c rename to grbl/grbl_system.c diff --git a/grbl/system.h b/grbl/grbl_system.h similarity index 100% rename from grbl/system.h rename to grbl/grbl_system.h