Skip to content

Commit

Permalink
Fixes for last commit
Browse files Browse the repository at this point in the history
  • Loading branch information
@chrishamm
chrishamm committed Apr 18, 2023
1 parent 7794118 commit b0ae79b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion __tests__/update.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { MachineStatus, MessageBox } from "../src/state";
import { LaserFilamentMonitor, RotatingMagnetFilamentMonitor } from "../src/sensors";
import Volume from "../src/volumes";

export const fullModel = { "boards": [], "directories": { "filaments": "0:/filaments", "firmware": "0:/firmware", "gCodes": "0:/gcodes", "macros": "0:/macros", "menu": "0:/menu", "scans": "0:/scans", "system": "0:/sys", "web": "0:/www" }, "fans": [], "global": {}, "heat": { "bedHeaters": [], "chamberHeaters": [], "coldExtrudeTemperature": 160, "coldRetractTemperature": 90, "heaters": [] }, "httpEndpoints": [], "inputs": [{ "axesRelative": false, "compatibility": "RepRapFirmware", "distanceUnit": "mm", "drivesRelative": true, "feedRate": 50, "inMacro": false, "macroRestartable": false, "name": "HTTP", "stackDepth": 0, "state": "idle", "lineNumber": 0, "volumetric": false }, { "axesRelative": false, "compatibility": "RepRapFirmware", "distanceUnit": "mm", "drivesRelative": true, "feedRate": 50, "inMacro": false, "macroRestartable": false, "name": "Telnet", "stackDepth": 0, "state": "idle", "lineNumber": 0, "volumetric": false }, { "axesRelative": false, "compatibility": "RepRapFirmware", "distanceUnit": "mm", "drivesRelative": true, "feedRate": 50, "inMacro": false, "macroRestartable": false, "name": "File", "stackDepth": 0, "state": "idle", "lineNumber": 0, "volumetric": false }, { "axesRelative": false, "compatibility": "RepRapFirmware", "distanceUnit": "mm", "drivesRelative": true, "feedRate": 50, "inMacro": false, "macroRestartable": false, "name": "USB", "stackDepth": 0, "state": "idle", "lineNumber": 0, "volumetric": false }, { "axesRelative": false, "compatibility": "RepRapFirmware", "distanceUnit": "mm", "drivesRelative": true, "feedRate": 50, "inMacro": false, "macroRestartable": false, "name": "Aux", "stackDepth": 0, "state": "idle", "lineNumber": 0, "volumetric": false }, { "axesRelative": false, "compatibility": "RepRapFirmware", "distanceUnit": "mm", "drivesRelative": true, "feedRate": 50, "inMacro": false, "macroRestartable": false, "name": "Trigger", "stackDepth": 0, "state": "idle", "lineNumber": 0, "volumetric": false }, { "axesRelative": false, "compatibility": "RepRapFirmware", "distanceUnit": "mm", "drivesRelative": true, "feedRate": 50, "inMacro": false, "macroRestartable": false, "name": "Queue", "stackDepth": 0, "state": "idle", "lineNumber": 0, "volumetric": false }, { "axesRelative": false, "compatibility": "RepRapFirmware", "distanceUnit": "mm", "drivesRelative": true, "feedRate": 50, "inMacro": false, "macroRestartable": false, "name": "LCD", "stackDepth": 0, "state": "idle", "lineNumber": 0, "volumetric": false }, { "axesRelative": false, "compatibility": "RepRapFirmware", "distanceUnit": "mm", "drivesRelative": true, "feedRate": 50, "inMacro": false, "macroRestartable": false, "name": "SBC", "stackDepth": 0, "state": "idle", "lineNumber": 0, "volumetric": false }, { "axesRelative": false, "compatibility": "RepRapFirmware", "distanceUnit": "mm", "drivesRelative": true, "feedRate": 50, "inMacro": false, "macroRestartable": false, "name": "Daemon", "stackDepth": 0, "state": "idle", "lineNumber": 0, "volumetric": false }, { "axesRelative": false, "compatibility": "RepRapFirmware", "distanceUnit": "mm", "drivesRelative": true, "feedRate": 50, "inMacro": false, "macroRestartable": false, "name": "Autopause", "stackDepth": 0, "state": "idle", "lineNumber": 0, "volumetric": false }, { "axesRelative": false, "compatibility": "RepRapFirmware", "distanceUnit": "mm", "drivesRelative": true, "feedRate": 50, "inMacro": false, "macroRestartable": false, "name": "Unknown", "stackDepth": 0, "state": "idle", "lineNumber": 0, "volumetric": false }], "job": { "build": null, "duration": null, "file": { "filament": [], "fileName": null, "firstLayerHeight": 0, "generatedBy": null, "height": 0, "lastModified": null, "layerHeight": 0, "numLayers": 0, "printTime": null, "simulatedTime": null, "size": 0, "thumbnails": [] }, "filePosition": null, "lastDuration": null, "lastFileName": null, "lastFileAborted": false, "lastFileCancelled": false, "lastFileSimulated": false, "layer": null, "layers": [], "layerTime": null, "pauseDuration": null, "rawExtrusion": null, "timesLeft": { "filament": null, "file": null, "slicer": null }, "warmUpDuration": null }, "limits": { "axes": null, "axesPlusExtruders": null, "bedHeaters": null, "boards": null, "chamberHeaters": null, "drivers": null, "driversPerAxis": null, "extruders": null, "extrudersPerTool": null, "fans": null, "gpInPorts": null, "gpOutPorts": null, "heaters": null, "heatersPerTool": null, "monitorsPerHeater": null, "restorePoints": null, "sensors": null, "spindles": null, "tools": null, "trackedObjects": null, "triggers": null, "volumes": null, "workplaces": null, "zProbeProgramBytes": null, "zProbes": null }, "messages": [], "move": { "axes": [], "calibration": { "final": { "deviation": 0, "mean": 0 }, "initial": { "deviation": 0, "mean": 0 }, "numFactors": 0 }, "compensation": { "fadeHeight": 0, "file": null, "liveGrid": null, "meshDeviation": null, "probeGrid": { "axes": ["X", "Y"], "maxs": [-1, -1], "mins": [0, 0], "radius": 0, "spacings": [0, 0] }, "skew": { "compensateXY": true, "tanXY": 0, "tanXZ": 0, "tanYZ": 0 }, "type": "none" }, "currentMove": { "acceleration": 0, "deceleration": 0, "laserPwm": null, "requestedSpeed": 0, "topSpeed": 0 }, "extruders": [], "idle": { "factor": 0.3, "timeout": 30 }, "kinematics": { "name": "unknown", "segmentation": null }, "printingAcceleration": 10000, "queue": [], "rotation": { "angle": 0, "centre": [0, 0] }, "shaping": { "amplitudes": [], "damping": 0.2, "durations": [], "frequency": 0, "minAcceleration": 10, "type": "none" }, "speedFactor": 1, "travelAcceleration": 10000, "virtualEPos": 0, "workplaceNumber": 0 }, "network": { "corsSite": null, "hostname": "test", "interfaces": [{ "activeProtocols": [], "actualIP": "192.168.1.122", "configuredIP": "192.168.1.122", "dnsServer": null, "firmwareVersion": null, "gateway": "192.168.1.254", "mac": "DC:A6:32:04:59:E3", "numReconnects": null, "signal": null, "speed": null, "subnet": "255.255.255.0", "type": "wifi" }], "name": "My Duet" }, "plugins": {}, "scanner": { "progress": 0, "status": "D" }, "sensors": { "analog": [], "endstops": [], "filamentMonitors": [], "gpIn": [], "probes": [] }, "spindles": [], "state": { "atxPower": null, "atxPowerPort": null, "beep": null, "currentTool": -1, "displayMessage": "", "dsfVersion": "1.2.5.0", "dsfPluginSupport": false, "dsfRootPluginSupport": false, "gpOut": [], "laserPwm": -1, "logFile": null, "logLevel": "off", "messageBox": { "axisControls": 0, "message": "message", "mode": 2, "seq": -1, "timeout": 0, "title": "title" }, "machineMode": "FFF", "macroRestarted": false, "msUpTime": 0, "nextTool": -1, "pluginsStarted": false, "powerFailScript": "", "previousTool": -1, "restorePoints": [], "status": "idle", "time": null, "upTime": 0 }, "tools": [], "userSessions": [], "volumes": [{ "capacity": 58851373056, "freeSpace": 55021527040, "mounted": true, "name": null, "openFiles": null, "path": "/", "speed": null }, { "capacity": 2143281152, "freeSpace": 2087972864, "mounted": true, "name": null, "openFiles": null, "path": "/boot", "speed": null }] };
export const fullModel = { "boards": [], "directories": { "filaments": "0:/filaments", "firmware": "0:/firmware", "gCodes": "0:/gcodes", "macros": "0:/macros", "menu": "0:/menu", "scans": "0:/scans", "system": "0:/sys", "web": "0:/www" }, "fans": [], "global": {}, "heat": { "bedHeaters": [], "chamberHeaters": [], "coldExtrudeTemperature": 160, "coldRetractTemperature": 90, "heaters": [] }, "httpEndpoints": [], "inputs": [{ "axesRelative": false, "compatibility": "RepRapFirmware", "distanceUnit": "mm", "drivesRelative": true, "feedRate": 50, "inMacro": false, "macroRestartable": false, "name": "HTTP", "stackDepth": 0, "state": "idle", "lineNumber": 0, "volumetric": false }, { "axesRelative": false, "compatibility": "RepRapFirmware", "distanceUnit": "mm", "drivesRelative": true, "feedRate": 50, "inMacro": false, "macroRestartable": false, "name": "Telnet", "stackDepth": 0, "state": "idle", "lineNumber": 0, "volumetric": false }, { "axesRelative": false, "compatibility": "RepRapFirmware", "distanceUnit": "mm", "drivesRelative": true, "feedRate": 50, "inMacro": false, "macroRestartable": false, "name": "File", "stackDepth": 0, "state": "idle", "lineNumber": 0, "volumetric": false }, { "axesRelative": false, "compatibility": "RepRapFirmware", "distanceUnit": "mm", "drivesRelative": true, "feedRate": 50, "inMacro": false, "macroRestartable": false, "name": "USB", "stackDepth": 0, "state": "idle", "lineNumber": 0, "volumetric": false }, { "axesRelative": false, "compatibility": "RepRapFirmware", "distanceUnit": "mm", "drivesRelative": true, "feedRate": 50, "inMacro": false, "macroRestartable": false, "name": "Aux", "stackDepth": 0, "state": "idle", "lineNumber": 0, "volumetric": false }, { "axesRelative": false, "compatibility": "RepRapFirmware", "distanceUnit": "mm", "drivesRelative": true, "feedRate": 50, "inMacro": false, "macroRestartable": false, "name": "Trigger", "stackDepth": 0, "state": "idle", "lineNumber": 0, "volumetric": false }, { "axesRelative": false, "compatibility": "RepRapFirmware", "distanceUnit": "mm", "drivesRelative": true, "feedRate": 50, "inMacro": false, "macroRestartable": false, "name": "Queue", "stackDepth": 0, "state": "idle", "lineNumber": 0, "volumetric": false }, { "axesRelative": false, "compatibility": "RepRapFirmware", "distanceUnit": "mm", "drivesRelative": true, "feedRate": 50, "inMacro": false, "macroRestartable": false, "name": "LCD", "stackDepth": 0, "state": "idle", "lineNumber": 0, "volumetric": false }, { "axesRelative": false, "compatibility": "RepRapFirmware", "distanceUnit": "mm", "drivesRelative": true, "feedRate": 50, "inMacro": false, "macroRestartable": false, "name": "SBC", "stackDepth": 0, "state": "idle", "lineNumber": 0, "volumetric": false }, { "axesRelative": false, "compatibility": "RepRapFirmware", "distanceUnit": "mm", "drivesRelative": true, "feedRate": 50, "inMacro": false, "macroRestartable": false, "name": "Daemon", "stackDepth": 0, "state": "idle", "lineNumber": 0, "volumetric": false }, { "axesRelative": false, "compatibility": "RepRapFirmware", "distanceUnit": "mm", "drivesRelative": true, "feedRate": 50, "inMacro": false, "macroRestartable": false, "name": "Autopause", "stackDepth": 0, "state": "idle", "lineNumber": 0, "volumetric": false }, { "axesRelative": false, "compatibility": "RepRapFirmware", "distanceUnit": "mm", "drivesRelative": true, "feedRate": 50, "inMacro": false, "macroRestartable": false, "name": "Unknown", "stackDepth": 0, "state": "idle", "lineNumber": 0, "volumetric": false }], "job": { "build": null, "duration": null, "file": { "filament": [], "fileName": null, "firstLayerHeight": 0, "generatedBy": null, "height": 0, "lastModified": null, "layerHeight": 0, "numLayers": 0, "printTime": null, "simulatedTime": null, "size": 0, "thumbnails": [] }, "filePosition": null, "lastDuration": null, "lastFileName": null, "lastFileAborted": false, "lastFileCancelled": false, "lastFileSimulated": false, "layer": null, "layers": [], "layerTime": null, "pauseDuration": null, "rawExtrusion": null, "timesLeft": { "filament": null, "file": null, "slicer": null }, "warmUpDuration": null }, "limits": { "axes": null, "axesPlusExtruders": null, "bedHeaters": null, "boards": null, "chamberHeaters": null, "drivers": null, "driversPerAxis": null, "extruders": null, "extrudersPerTool": null, "fans": null, "gpInPorts": null, "gpOutPorts": null, "heaters": null, "heatersPerTool": null, "monitorsPerHeater": null, "restorePoints": null, "sensors": null, "spindles": null, "tools": null, "trackedObjects": null, "triggers": null, "volumes": null, "workplaces": null, "zProbeProgramBytes": null, "zProbes": null }, "messages": [], "move": { "axes": [], "calibration": { "final": { "deviation": 0, "mean": 0 }, "initial": { "deviation": 0, "mean": 0 }, "numFactors": 0 }, "compensation": { "fadeHeight": 0, "file": null, "liveGrid": null, "meshDeviation": null, "probeGrid": { "axes": ["X", "Y"], "maxs": [-1, -1], "mins": [0, 0], "radius": 0, "spacings": [0, 0] }, "skew": { "compensateXY": true, "tanXY": 0, "tanXZ": 0, "tanYZ": 0 }, "type": "none" }, "currentMove": { "acceleration": 0, "deceleration": 0, "laserPwm": null, "requestedSpeed": 0, "topSpeed": 0 }, "extruders": [], "idle": { "factor": 0.3, "timeout": 30 }, "kinematics": { "name": "cartesian", "segmentation": null }, "printingAcceleration": 10000, "queue": [], "rotation": { "angle": 0, "centre": [0, 0] }, "shaping": { "amplitudes": [], "damping": 0.2, "durations": [], "frequency": 0, "minAcceleration": 10, "type": "none" }, "speedFactor": 1, "travelAcceleration": 10000, "virtualEPos": 0, "workplaceNumber": 0 }, "network": { "corsSite": null, "hostname": "test", "interfaces": [{ "activeProtocols": [], "actualIP": "192.168.1.122", "configuredIP": "192.168.1.122", "dnsServer": null, "firmwareVersion": null, "gateway": "192.168.1.254", "mac": "DC:A6:32:04:59:E3", "numReconnects": null, "signal": null, "speed": null, "subnet": "255.255.255.0", "type": "wifi" }], "name": "My Duet" }, "plugins": {}, "scanner": { "progress": 0, "status": "D" }, "sensors": { "analog": [], "endstops": [], "filamentMonitors": [], "gpIn": [], "probes": [] }, "spindles": [], "state": { "atxPower": null, "atxPowerPort": null, "beep": null, "currentTool": -1, "displayMessage": "", "dsfVersion": "1.2.5.0", "dsfPluginSupport": false, "dsfRootPluginSupport": false, "gpOut": [], "laserPwm": -1, "logFile": null, "logLevel": "off", "messageBox": { "axisControls": 0, "message": "message", "mode": 2, "seq": -1, "timeout": 0, "title": "title" }, "machineMode": "FFF", "macroRestarted": false, "msUpTime": 0, "nextTool": -1, "pluginsStarted": false, "powerFailScript": "", "previousTool": -1, "restorePoints": [], "status": "idle", "time": null, "upTime": 0 }, "tools": [], "userSessions": [], "volumes": [{ "capacity": 58851373056, "freeSpace": 55021527040, "mounted": true, "name": null, "openFiles": null, "path": "/", "speed": null }, { "capacity": 2143281152, "freeSpace": 2087972864, "mounted": true, "name": null, "openFiles": null, "path": "/boot", "speed": null }] };

export const patch = {
"boards": [
Expand Down
4 changes: 2 additions & 2 deletions src/move/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import MoveCalibration from "./MoveCalibration";
import MoveCompensation from "./MoveCompensation";
import Extruder from "./Extruder";
import InputShaping from "./InputShaping";
import Kinematics from "./kinematics";
import Kinematics, { CoreKinematics, KinematicsName } from "./kinematics";

export class CurrentMove extends ModelObject {
acceleration: number = 0;
Expand Down Expand Up @@ -38,7 +38,7 @@ export class Move extends ModelObject {
readonly currentMove: CurrentMove = new CurrentMove();
readonly extruders: ModelCollection<Extruder> = new ModelCollection(Extruder);
readonly idle: MotorsIdleControl = new MotorsIdleControl();
kinematics: Kinematics = new Kinematics();
kinematics: Kinematics = new CoreKinematics(KinematicsName.cartesian);
limitAxes: boolean = true;
noMovesBeforeHoming: boolean = true;
printingAcceleration: number = 10000;
Expand Down
2 changes: 1 addition & 1 deletion src/move/kinematics/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export function getKinematics(name: KinematicsName): KinematicsBase {
default:
const _exhaustiveCheck: never = name;
console.warn(`Kinematics '${name}' is not supported, falling back to cartesian`);
return new CoreKinematics(KinematicsName.cartesian);
return new CoreKinematics(name);
}
}

Expand Down

0 comments on commit b0ae79b

Please sign in to comment.