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

Removed dead code

Browse Source
This commit is contained in:
Mitch Bradley
2021-05-25 08:31:32 -10:00
parent d997f7c4f0
commit e6688384c6
3 changed files with 0 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
Grbl_Esp32/src/PinSettingsDefinitions.cpp
View File

@@ -50,78 +50,6 @@
# define SDCARD_DET_PIN UNDEFINED_PIN
#endif
const char* SDCARD_DET_PIN_DEFAULT = SDCARD_DET_PIN;
#ifndef CONTROL_SAFETY_DOOR_PIN
# define CONTROL_SAFETY_DOOR_PIN UNDEFINED_PIN
#endif
const char* CONTROL_SAFETY_DOOR_PIN_DEFAULT = CONTROL_SAFETY_DOOR_PIN;
#ifndef CONTROL_RESET_PIN
# define CONTROL_RESET_PIN UNDEFINED_PIN
#endif
const char* CONTROL_RESET_PIN_DEFAULT = CONTROL_RESET_PIN;
#ifndef CONTROL_FEED_HOLD_PIN
# define CONTROL_FEED_HOLD_PIN UNDEFINED_PIN
#endif
const char* CONTROL_FEED_HOLD_PIN_DEFAULT = CONTROL_FEED_HOLD_PIN;
#ifndef CONTROL_CYCLE_START_PIN
# define CONTROL_CYCLE_START_PIN UNDEFINED_PIN
#endif
const char* CONTROL_CYCLE_START_PIN_DEFAULT = CONTROL_CYCLE_START_PIN;
#ifndef MACRO_BUTTON_0_PIN
# define MACRO_BUTTON_0_PIN UNDEFINED_PIN
#endif
const char* MACRO_BUTTON_0_PIN_DEFAULT = MACRO_BUTTON_0_PIN;
#ifndef MACRO_BUTTON_1_PIN
# define MACRO_BUTTON_1_PIN UNDEFINED_PIN
#endif
const char* MACRO_BUTTON_1_PIN_DEFAULT = MACRO_BUTTON_1_PIN;
#ifndef MACRO_BUTTON_2_PIN
# define MACRO_BUTTON_2_PIN UNDEFINED_PIN
#endif
const char* MACRO_BUTTON_2_PIN_DEFAULT = MACRO_BUTTON_2_PIN;
#ifndef MACRO_BUTTON_3_PIN
# define MACRO_BUTTON_3_PIN UNDEFINED_PIN
#endif
const char* MACRO_BUTTON_3_PIN_DEFAULT = MACRO_BUTTON_3_PIN;
#ifndef USER_DIGITAL_PIN_0
# define USER_DIGITAL_PIN_0 UNDEFINED_PIN
#endif
const char* USER_DIGITAL_PIN_0_DEFAULT = USER_DIGITAL_PIN_0;
#ifndef USER_DIGITAL_PIN_1
# define USER_DIGITAL_PIN_1 UNDEFINED_PIN
#endif
const char* USER_DIGITAL_PIN_1_DEFAULT = USER_DIGITAL_PIN_1;
#ifndef USER_DIGITAL_PIN_2
# define USER_DIGITAL_PIN_2 UNDEFINED_PIN
#endif
const char* USER_DIGITAL_PIN_2_DEFAULT = USER_DIGITAL_PIN_2;
#ifndef USER_DIGITAL_PIN_3
# define USER_DIGITAL_PIN_3 UNDEFINED_PIN
#endif
const char* USER_DIGITAL_PIN_3_DEFAULT = USER_DIGITAL_PIN_3;
#ifndef USER_ANALOG_PIN_0
# define USER_ANALOG_PIN_0 UNDEFINED_PIN
#endif
const char* USER_ANALOG_PIN_0_DEFAULT = USER_ANALOG_PIN_0;
#ifndef USER_ANALOG_PIN_1
# define USER_ANALOG_PIN_1 UNDEFINED_PIN
#endif
const char* USER_ANALOG_PIN_1_DEFAULT = USER_ANALOG_PIN_1;
#ifndef USER_ANALOG_PIN_2
# define USER_ANALOG_PIN_2 UNDEFINED_PIN
#endif
const char* USER_ANALOG_PIN_2_DEFAULT = USER_ANALOG_PIN_2;
#ifndef USER_ANALOG_PIN_3
# define USER_ANALOG_PIN_3 UNDEFINED_PIN
#endif
const char* USER_ANALOG_PIN_3_DEFAULT = USER_ANALOG_PIN_3;
// We need settings.h for the settings classes
#include "Grbl.h"
@@ -130,42 +58,11 @@ const char* USER_ANALOG_PIN_3_DEFAULT = USER_ANALOG_PIN_3;
// Define the pins:
PinSetting* ControlSafetyDoorPin; // CONTROL_SAFETY_DOOR_PIN
PinSetting* ControlResetPin; // CONTROL_RESET_PIN
PinSetting* ControlFeedHoldPin; // CONTROL_FEED_HOLD_PIN
PinSetting* ControlCycleStartPin; // CONTROL_CYCLE_START_PIN
PinSetting* MacroButton0Pin; // MACRO_BUTTON_0_PIN
PinSetting* MacroButton1Pin; // MACRO_BUTTON_1_PIN
PinSetting* MacroButton2Pin; // MACRO_BUTTON_2_PIN
PinSetting* MacroButton3Pin; // MACRO_BUTTON_3_PIN
PinSetting* UserDigitalPin[4];
PinSetting* UserAnalogPin[4];
PinSetting* SDCardDetPin; // SDCARD_DET_PIN
#include "Pin.h"
// Initialize the pin settings
void make_pin_settings() {
ControlSafetyDoorPin = new PinSetting("Control/SafetyDoor/Pin", CONTROL_SAFETY_DOOR_PIN_DEFAULT);
ControlResetPin = new PinSetting("Control/Reset/Pin", CONTROL_RESET_PIN_DEFAULT);
ControlFeedHoldPin = new PinSetting("Control/FeedHold/Pin", CONTROL_FEED_HOLD_PIN_DEFAULT);
ControlCycleStartPin = new PinSetting("Control/CycleStart/Pin", CONTROL_CYCLE_START_PIN_DEFAULT);
MacroButton0Pin = new PinSetting("Macro/0/Pin", MACRO_BUTTON_0_PIN_DEFAULT);
MacroButton1Pin = new PinSetting("Macro/1/Pin", MACRO_BUTTON_1_PIN_DEFAULT);
MacroButton2Pin = new PinSetting("Macro/2/Pin", MACRO_BUTTON_2_PIN_DEFAULT);
MacroButton3Pin = new PinSetting("Macro/3/Pin", MACRO_BUTTON_3_PIN_DEFAULT);
// User pins:
UserDigitalPin[0] = new PinSetting("UserDigital/0/Pin", USER_DIGITAL_PIN_0_DEFAULT);
UserAnalogPin[0] = new PinSetting("UserAnalog/0/Pin", USER_ANALOG_PIN_0_DEFAULT);
UserDigitalPin[1] = new PinSetting("UserDigital/1/Pin", USER_DIGITAL_PIN_1_DEFAULT);
UserAnalogPin[1] = new PinSetting("UserAnalog/1/Pin", USER_ANALOG_PIN_1_DEFAULT);
UserDigitalPin[2] = new PinSetting("UserDigital/2/Pin", USER_DIGITAL_PIN_2_DEFAULT);
UserAnalogPin[2] = new PinSetting("UserAnalog/2/Pin", USER_ANALOG_PIN_2_DEFAULT);
UserDigitalPin[3] = new PinSetting("UserDigital/3/Pin", USER_DIGITAL_PIN_3_DEFAULT);
UserAnalogPin[3] = new PinSetting("UserAnalog/3/Pin", USER_ANALOG_PIN_3_DEFAULT);
SDCardDetPin = new PinSetting("SDCardDet/Pin", SDCARD_DET_PIN_DEFAULT);
}

21
Grbl_Esp32/src/SettingsDefinitions.cpp
View File

@@ -40,17 +40,6 @@ StringSetting* user_macro1;
StringSetting* user_macro2;
StringSetting* user_macro3;
// Construct e.g. X_MAX_RATE from axisName "X" and tail "_MAX_RATE"
// in dynamically allocated memory that will not be freed.
static const char* makename(const char* axisName, const char* tail) {
char* retval = (char*)malloc(strlen(axisName) + strlen(tail) + 2);
strcpy(retval, axisName);
strcat(retval, "/");
return strcat(retval, tail);
}
static bool checkStartupLine(char* value) {
if (!value) { // No POST functionality
return true;
@@ -79,16 +68,6 @@ static bool checkSpindleChange(char* val) {
return true;
}
// Generates a string like "122" from axisNum 2 and base 120
static const char* makeGrblName(int axisNum, int base) {
// To omit A,B,C axes:
// if (axisNum > 2) return NULL;
char buf[4];
snprintf(buf, 4, "%d", axisNum + base);
char* retval = (char*)malloc(strlen(buf));
return strcpy(retval, buf);
}
void make_coordinate(CoordIndex index, const char* name) {
float coord_data[MAX_N_AXIS] = { 0.0 };
auto coord = new Coordinates(name);

12
Grbl_Esp32/src/SettingsDefinitions.h
View File

@@ -16,16 +16,4 @@ extern StringSetting* user_macro3;
extern EnumSetting* message_level;
// Pins:
extern PinSetting* ControlSafetyDoorPin; // CONTROL_SAFETY_DOOR_PIN
extern PinSetting* ControlResetPin; // CONTROL_RESET_PIN
extern PinSetting* ControlFeedHoldPin; // CONTROL_FEED_HOLD_PIN
extern PinSetting* ControlCycleStartPin; // CONTROL_CYCLE_START_PIN
extern PinSetting* MacroButton0Pin; // MACRO_BUTTON_0_PIN
extern PinSetting* MacroButton1Pin; // MACRO_BUTTON_1_PIN
extern PinSetting* MacroButton2Pin; // MACRO_BUTTON_2_PIN
extern PinSetting* MacroButton3Pin; // MACRO_BUTTON_3_PIN
extern PinSetting* UserDigitalPin[4];
extern PinSetting* UserAnalogPin[4];
extern PinSetting* SDCardDetPin; // SDCARD_DET_PIN