Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removed old firmware options that no longer works or are being used. #2582

Merged
merged 1 commit into from
Aug 2, 2024
Merged

Removed old firmware options that no longer works or are being used. #2582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 0 additions & 110 deletions ugs-core/src/com/willwinder/universalgcodesender/GrblEsp32Controller.java
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions ugs-core/src/com/willwinder/universalgcodesender/communicator/LoopBackCommunicator.java
View file
Open in desktop

This file was deleted.

148 changes: 0 additions & 148 deletions ugs-core/src/com/willwinder/universalgcodesender/connection/LoopBackConnection.java
View file
Open in desktop

This file was deleted.

26 changes: 12 additions & 14 deletions ugs-core/src/com/willwinder/universalgcodesender/utils/ControllerSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,13 @@ This file is part of Universal Gcode Sender (UGS).

import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.willwinder.universalgcodesender.firmware.fluidnc.FluidNCController;
import com.willwinder.universalgcodesender.G2CoreController;
import com.willwinder.universalgcodesender.GrblController;
import com.willwinder.universalgcodesender.GrblEsp32Controller;
import com.willwinder.universalgcodesender.IController;
import com.willwinder.universalgcodesender.communicator.LoopBackCommunicator;
import com.willwinder.universalgcodesender.firmware.smoothie.SmoothieController;
import com.willwinder.universalgcodesender.TinyGController;
import com.willwinder.universalgcodesender.communicator.XLCDCommunicator;
import com.willwinder.universalgcodesender.firmware.fluidnc.FluidNCController;
import com.willwinder.universalgcodesender.firmware.smoothie.SmoothieController;
import com.willwinder.universalgcodesender.gcode.processors.CommandProcessor;
import com.willwinder.universalgcodesender.gcode.util.CommandProcessorLoader;

Expand All @@ -44,19 +42,21 @@ This file is part of Universal Gcode Sender (UGS).
public class ControllerSettings {
String Name;
Integer Version = 0;

/**
* If the config file should be deleted
*/
Boolean Deleted = false;
ControllerConfig Controller;
ProcessorConfigGroups GcodeProcessors;

public enum CONTROLLER {
GRBL("GRBL"),
GRBL_ESP32("GRBL ESP32"),
FLUIDNC("FluidNC"),
SMOOTHIE("SmoothieBoard"),
TINYG("TinyG"),
G2CORE("g2core"),
XLCD("XLCD"),
LOOPBACK("Loopback"),
LOOPBACK_SLOW("Loopback_Slow");
XLCD("XLCD");

final String name;
CONTROLLER(String name) {
Expand All @@ -81,6 +81,10 @@ public Integer getVersion() {
return Version;
}

public boolean isDeleted() {
return Deleted;
}

/**
* Parse the "Controller" object in the firmware config json.
* <p>
Expand All @@ -99,8 +103,6 @@ public Optional<IController> getController() {
switch (controller) {
case GRBL:
return Optional.of(new GrblController());
case GRBL_ESP32:
return Optional.of(new GrblEsp32Controller());
case SMOOTHIE:
return Optional.of(new SmoothieController());
case TINYG:
Expand All @@ -109,10 +111,6 @@ public Optional<IController> getController() {
return Optional.of(new G2CoreController());
case XLCD:
return Optional.of(new GrblController(new XLCDCommunicator()));
case LOOPBACK:
return Optional.of(new GrblController(new LoopBackCommunicator()));
case LOOPBACK_SLOW:
return Optional.of(new GrblController(new LoopBackCommunicator(100)));
case FLUIDNC:
return Optional.of(new FluidNCController());
default:
Expand Down
Loading
Loading