Alden Hart 11d39c93b5 Cleanup - interim commit

2017-04-23 08:30:26 -04:00

..

board

resolved merge conflicts between edge marlin-compatibility and dev-p24

2017-03-23 11:07:12 -04:00

device

…

g2core.xcodeproj

…

settings

Working on job kill bug

2017-03-31 14:10:39 -04:00

.gitattributes

…

.gitignore

…

alarm.cpp

Cleanup - interim commit

2017-04-23 08:30:26 -04:00

asciitable.txt

…

boards.mk

…

canonical_machine.cpp

Found segment fault in hold message preparation

2017-04-10 17:03:45 -04:00

canonical_machine.h

Cleanup - interim commit

2017-04-23 08:30:26 -04:00

config_app.cpp

Cleanup after very messy merge

2017-03-23 11:50:18 -04:00

config_app.h

…

config.cpp

Fix status reporting bug

2017-03-23 13:58:37 -04:00

config.h

Cleanup after very messy merge

2017-03-23 11:50:18 -04:00

controller.cpp

Fix case where hold buffer with remainder of move was not being forward planned (plan_exec.cpp line 1045); Added additional checks to prevent feedhold from being initiated during non-motion cycles. Still needs special handling for corner cases - to be described in header comments in cycle_feedhold.cpp

2017-04-11 09:46:59 -04:00

controller.h

resolved merge conflicts between edge marlin-compatibility and dev-p24

2017-03-23 11:07:12 -04:00

coolant.cpp

Comments and cleanup

2017-03-21 08:04:31 -04:00

coolant.h

…

cycle_feedhold.cpp

Cleanup - interim commit

2017-04-23 08:30:26 -04:00

cycle_homing.cpp

resolved merge conflicts between edge marlin-compatibility and dev-p24

2017-03-23 11:07:12 -04:00

cycle_jogging.cpp

…

cycle_probing.cpp

Some comments and naming changes to offsets for clarity

2017-03-21 06:32:45 -04:00

encoder.cpp

…

encoder.h

…

error.h

resolved merge conflicts between edge marlin-compatibility and dev-p24

2017-03-23 11:07:12 -04:00

g2core_info.h

resolved merge conflicts between edge marlin-compatibility and dev-p24

2017-03-23 11:07:12 -04:00

g2core.cppproj

Fixed a dumb mistake. Still working on the bumps, though.

2017-04-12 17:51:16 -04:00

g2core.h

…

gcode_parser.cpp

Interim commit - fixes JSON command queuing, sequencing job kill. Still has problems with embedded M30’s in the file. Which perhaps is as it should.

2017-04-10 12:59:57 -04:00

gcode_parser.h

…

gcode.h

resolved merge conflicts between edge marlin-compatibility and dev-p24

2017-03-23 11:07:12 -04:00

gpio.cpp

Removed overloading on get_int; shared some code on set_ints; removed set_flu()

2017-03-20 17:09:48 -04:00

gpio.h

Gpio changes and updates; removed some unused getters and setters

2017-03-20 16:20:23 -04:00

help.cpp

…

help.h

…

json_parser.cpp

resolved merge conflicts between edge marlin-compatibility and dev-p24

2017-03-23 11:07:12 -04:00

json_parser.h

resolved merge conflicts between edge marlin-compatibility and dev-p24

2017-03-23 11:07:12 -04:00

kinematics.cpp

…

kinematics.h

…

LICENSE-gpl-2.0.txt

…

main.cpp

…

Makefile

resolved merge conflicts between edge marlin-compatibility and dev-p24

2017-03-23 11:07:12 -04:00

marlin_compatibility.cpp

Notes

2017-03-24 11:11:53 -04:00

marlin_compatibility.h

Restored overrides to their stubbed settings; some cleanup

2017-03-24 08:34:54 -04:00

openocd.cfg.example

…

persistence.cpp

Big commit. Added nv->value_int, and changed nv_value to nv->value_flt. Many many things changed. Passes smoke test. Now on to some real regressions.

2017-03-19 20:27:53 -04:00

persistence.h

…

plan_arc.cpp

…

plan_arc.h

…

plan_exec.cpp

Cleanup - interim commit

2017-04-23 08:30:26 -04:00

plan_line.cpp

Cleanup

2017-04-12 19:31:06 -04:00

plan_zoid.cpp

No functional changes

2017-04-04 09:53:15 +02:00

planner.cpp

stuff

2017-04-10 15:19:43 -04:00

planner.h

Cleanup - interim commit

2017-04-23 08:30:26 -04:00

pwm.cpp

…

pwm.h

…

report.cpp

Found segment fault in hold message preparation

2017-04-10 17:03:45 -04:00

report.h

Fixed problem in sr_set_status_report(); fixed some compiler cast warnings

2017-03-20 06:31:38 -04:00

settings.h

Cleanup after very messy merge

2017-03-23 11:50:18 -04:00

spindle.cpp

resolved merge conflicts between edge marlin-compatibility and dev-p24

2017-03-23 11:07:12 -04:00

spindle.h

…

stepper.cpp

Cleanup - interim commit

2017-04-23 08:30:26 -04:00

stepper.h

…

temperature.cpp

resolved merge conflicts between edge marlin-compatibility and dev-p24

2017-03-23 11:07:12 -04:00

temperature.h

resolved merge conflicts between edge marlin-compatibility and dev-p24

2017-03-23 11:07:12 -04:00

text_parser.cpp

Removed overloading on get_int; shared some code on set_ints; removed set_flu()

2017-03-20 17:09:48 -04:00

text_parser.h

…

util.cpp

Moved some code. No changes.

2017-04-17 08:17:06 -04:00

util.h

Cleanup - interim commit

2017-04-23 08:30:26 -04:00

xio.cpp

Restored overrides to their stubbed settings; some cleanup

2017-03-24 08:34:54 -04:00

xio.h

resolved merge conflicts between edge marlin-compatibility and dev-p24

2017-03-23 11:07:12 -04:00