Arthur Wolf [Thu, 19 Jan 2017 15:24:01 +0000 (16:24 +0100)]
*PROPOSAL*, remove panel example
I get on a very regular basis, users who do not go to the wiki for their panel information, and try to get it to work by editing the example in the example config file, leading to much confusion.
I think removing the example from the example config file would force users to actually go to the wiki to find their configuration, and would prevent a lot of confusion from happening.
This is only a proposal, looking for opinions on the matter.
Arthur Wolf [Thu, 19 Jan 2017 15:14:26 +0000 (16:14 +0100)]
Updating laser config to the latest format in delta config
Arthur Wolf [Thu, 19 Jan 2017 15:13:38 +0000 (16:13 +0100)]
Updating laser config to the latest format
Arthur Wolf [Thu, 19 Jan 2017 15:08:09 +0000 (16:08 +0100)]
Adapting config changes from cartesian to delta
Changes ( cosmetic ones ) were made to the cartesian config, I am porting them to the delta file. This was done using diff software, and does not change the content of the file just it's appearance.
I also added a delta grid configuration example.
Jim Morris [Thu, 19 Jan 2017 04:25:10 +0000 (20:25 -0800)]
update firmware.bin
Jim Morris [Thu, 19 Jan 2017 04:23:08 +0000 (20:23 -0800)]
Merge pull request #1095 from wolfmanjm/upstreamedge
Fix bug that did not allow the enable pin for a motor to be set to nc…
Jim Morris [Thu, 19 Jan 2017 04:19:53 +0000 (20:19 -0800)]
Fix bug that did not allow the enable pin for a motor to be set to nc (as needed with SPI drivers)
Fix error messages in SPI drivers module
Fix HALT setting enable in SPI drivers in on_idle so it does not crash
Arthur Wolf [Tue, 17 Jan 2017 12:51:34 +0000 (13:51 +0100)]
Merge pull request #1093 from Smoothieware/feature/config-minor-rework
Minor cosmetic config changes
Jim Morris [Mon, 16 Jan 2017 21:22:43 +0000 (13:22 -0800)]
Merge pull request #1094 from FluffyKaon/edge
Fix the z-probe delta grid code for cartesian printers.
laetitia [Mon, 16 Jan 2017 20:48:38 +0000 (13:48 -0700)]
Fix the z-probe delta grid code for cartesian printers.
Arthur Wolf [Sun, 15 Jan 2017 12:33:53 +0000 (13:33 +0100)]
Minor cosmetic config changes
Added some config option informations, made a few minor cosmetic changes, added some links, removed a few options users shouldn't mess with anyway
Jim Morris [Wed, 11 Jan 2017 05:11:57 +0000 (21:11 -0800)]
Merge pull request #1091 from wolfmanjm/upstreamedge
fix make clean for windows
Jim Morris [Wed, 11 Jan 2017 04:36:34 +0000 (20:36 -0800)]
fix make clean for windows
Jim Morris [Mon, 9 Jan 2017 03:29:19 +0000 (19:29 -0800)]
Merge pull request #1088 from wolfmanjm/upstreamedge
Fix max actuator speed checking in robot to exclude extruders
Jim Morris [Mon, 9 Jan 2017 03:26:41 +0000 (19:26 -0800)]
FIx max actuator speed checking in robot to exclude extruders
Jim Morris [Mon, 9 Jan 2017 03:12:35 +0000 (19:12 -0800)]
update firmware.bin
Jim Morris [Mon, 9 Jan 2017 03:09:39 +0000 (19:09 -0800)]
Merge pull request #1087 from wolfmanjm/upstreamedge
Fix M92, M203, M204 for extruders in a n-axis world
Jim Morris [Mon, 9 Jan 2017 03:07:17 +0000 (19:07 -0800)]
Fix M92, M203, M204 for extruders in a n-axis world
Jim Morris [Sun, 8 Jan 2017 22:19:55 +0000 (14:19 -0800)]
update firmware.bin
Jim Morris [Sun, 8 Jan 2017 22:13:13 +0000 (14:13 -0800)]
fix typo
Jim Morris [Tue, 3 Jan 2017 07:51:18 +0000 (23:51 -0800)]
update firmware.bin
Jim Morris [Tue, 3 Jan 2017 04:28:19 +0000 (20:28 -0800)]
Merge pull request #1085 from wolfmanjm/upstreamedge
Modify axis designator for the advanced motordriver controlller
Jim Morris [Tue, 3 Jan 2017 04:24:55 +0000 (20:24 -0800)]
issue Error: for message on alarm
Jim Morris [Tue, 3 Jan 2017 04:20:55 +0000 (20:20 -0800)]
Change the advanced motor config setting from designator to axis
Jim Morris [Mon, 2 Jan 2017 21:56:52 +0000 (13:56 -0800)]
update firmware.bin
Jim Morris [Mon, 2 Jan 2017 21:53:11 +0000 (13:53 -0800)]
Merge pull request #1083 from wolfmanjm/upstreamedge
Fix very old bug in Panel menu
Jim Morris [Mon, 2 Jan 2017 21:49:07 +0000 (13:49 -0800)]
Fix very old bug in Panel menu
Jim Morris [Wed, 28 Dec 2016 05:21:04 +0000 (21:21 -0800)]
Merge pull request #1082 from wolfmanjm/upstreamedge
add a configurable range for the runaway temp checks
Jim Morris [Wed, 28 Dec 2016 01:00:35 +0000 (17:00 -0800)]
Change G4 Pxxx in grbl mode to be float seconds not milliseconds to be compatible with grbl and linuxcnc. No change when in 3d printer mode.
Jim Morris [Tue, 27 Dec 2016 08:48:42 +0000 (00:48 -0800)]
add a configurable range for the runaway temp checks
Jim Morris [Mon, 26 Dec 2016 21:54:57 +0000 (13:54 -0800)]
Merge pull request #1081 from wolfmanjm/upstreamedge
update configs
Jim Morris [Mon, 26 Dec 2016 21:53:49 +0000 (13:53 -0800)]
update configs
Jim Morris [Mon, 26 Dec 2016 21:40:57 +0000 (13:40 -0800)]
update firmware.bin
Jim Morris [Mon, 26 Dec 2016 21:35:59 +0000 (13:35 -0800)]
Merge pull request #1080 from wolfmanjm/upstreamedge
Change the default for cooling timeout to 0 (disabled), as it causes …
Jim Morris [Mon, 26 Dec 2016 21:34:06 +0000 (13:34 -0800)]
Change the default for cooling timeout to 0 (disabled), as it causes a lot of confusion.
Jim Morris [Thu, 22 Dec 2016 05:06:59 +0000 (21:06 -0800)]
Merge pull request #1079 from wolfmanjm/upstreamedge
add thermistor Semitec-104NT4
Jim Morris [Thu, 22 Dec 2016 05:04:33 +0000 (21:04 -0800)]
add thermistor Semitec-104NT4 used by hotends.com
Jim Morris [Wed, 21 Dec 2016 06:12:40 +0000 (22:12 -0800)]
Merge pull request #1078 from wolfmanjm/upstreamedge
pow -> powf
Jim Morris [Tue, 20 Dec 2016 23:38:15 +0000 (15:38 -0800)]
pow -> powf
Jim Morris [Fri, 16 Dec 2016 21:41:22 +0000 (13:41 -0800)]
Merge pull request #1076 from RepRapMorgan/fix/scara_homing
Repair SCARA homing on new ABC endstops.cpp
Quentin Harley [Fri, 16 Dec 2016 21:38:30 +0000 (23:38 +0200)]
else
Quentin Harley [Fri, 16 Dec 2016 21:21:04 +0000 (23:21 +0200)]
changes as requested
Jim Morris [Fri, 16 Dec 2016 20:30:03 +0000 (12:30 -0800)]
Merge pull request #1077 from RepRapMorgan/fix/morgancal
Improve Scara Calibration
Quentin Harley [Fri, 16 Dec 2016 13:43:20 +0000 (15:43 +0200)]
remove redundant commented section
Quentin Harley [Fri, 16 Dec 2016 12:34:12 +0000 (14:34 +0200)]
Improve SCARA calibration
Adds the ability to individually calibrate steps per degree in Theta and Psi
Quentin Harley [Fri, 16 Dec 2016 12:01:18 +0000 (14:01 +0200)]
fix parenthesis
Quentin Harley [Fri, 16 Dec 2016 11:59:31 +0000 (13:59 +0200)]
add parenthesis to match style rules
Quentin Harley [Fri, 16 Dec 2016 10:47:21 +0000 (12:47 +0200)]
Repair SCARA homing on new ABC endstops.cpp
Jim Morris [Thu, 15 Dec 2016 21:45:33 +0000 (13:45 -0800)]
Update upgrade-notes.md
Jim Morris [Thu, 15 Dec 2016 21:38:31 +0000 (13:38 -0800)]
update firmware.bin
Jim Morris [Thu, 15 Dec 2016 21:33:48 +0000 (13:33 -0800)]
Merge pull request #1055 from wolfmanjm/merge-abc-with-homing
Add ABC axis and homing for ABC or E axis. Some other changes improving homing and zprobing.
Jim Morris [Thu, 15 Dec 2016 21:29:36 +0000 (13:29 -0800)]
update upgrade-notes
Jim Morris [Thu, 15 Dec 2016 21:23:40 +0000 (13:23 -0800)]
update upgrade notes for ABC axis and homing of ABC axis (or E axis)
Jim Morris [Thu, 15 Dec 2016 07:04:24 +0000 (23:04 -0800)]
Merge remote-tracking branch 'upstream/edge' into merge-abc-with-homing
Jim Morris [Thu, 15 Dec 2016 06:57:57 +0000 (22:57 -0800)]
Merge pull request #1072 from wolfmanjm/upstreamedge
Fix to allow temperature switch to turn on a fan even if blocked with…
Jim Morris [Thu, 15 Dec 2016 06:54:45 +0000 (22:54 -0800)]
Fix to allow temperature switch to turn on a fan even if blocked with heat and wait
turns fan on in on_idle, but there must be no output_on_command or output_off_command defined in the switch
Jim Morris [Tue, 13 Dec 2016 20:29:21 +0000 (12:29 -0800)]
Update upgrade-notes.md
Jim Morris [Sun, 11 Dec 2016 01:39:46 +0000 (17:39 -0800)]
update firmware.bin
Jim Morris [Sun, 11 Dec 2016 01:37:46 +0000 (17:37 -0800)]
Merge remote-tracking branch 'upstream/edge' into merge-abc-with-homing
Jim Morris [Sun, 11 Dec 2016 01:37:14 +0000 (17:37 -0800)]
Merge pull request #1071 from wolfmanjm/upstreamedge
ignore ! and ~ as pause and resume do not work
Jim Morris [Sun, 11 Dec 2016 01:35:28 +0000 (17:35 -0800)]
ignore ! and ~ as pause and resume do not work
Jim Morris [Sat, 10 Dec 2016 21:51:10 +0000 (13:51 -0800)]
Update ISSUE_TEMPLATE.md
Jim Morris [Thu, 8 Dec 2016 22:30:09 +0000 (14:30 -0800)]
remove SPI class from libs/spi as everything now uses mbed::spi
Jim Morris [Wed, 7 Dec 2016 06:47:53 +0000 (22:47 -0800)]
allow PAXIS on make command line to set N_PRIMARY_AXIS
determine primary axis correctly in planner
Jim Morris [Wed, 7 Dec 2016 06:27:54 +0000 (22:27 -0800)]
Prepare for allowing ABC to be primary (cartesian) axis
Jim Morris [Sun, 27 Nov 2016 22:18:44 +0000 (14:18 -0800)]
update firmware.bin
Jim Morris [Sun, 27 Nov 2016 22:15:16 +0000 (14:15 -0800)]
Merge remote-tracking branch 'upstream/edge' into merge-abc-with-homing
Jim Morris [Sun, 27 Nov 2016 22:14:38 +0000 (14:14 -0800)]
Merge pull request #1068 from wolfmanjm/upstreamedge
fix G38 for X and Y probes
Jim Morris [Sun, 27 Nov 2016 22:13:27 +0000 (14:13 -0800)]
fix G38 for X and Y probes
Jim Morris [Sat, 26 Nov 2016 22:30:55 +0000 (14:30 -0800)]
add ABC axis to test raw
Jim Morris [Tue, 15 Nov 2016 20:26:26 +0000 (12:26 -0800)]
clean up some uses of using std::string
Jim Morris [Tue, 15 Nov 2016 19:08:03 +0000 (11:08 -0800)]
fix comment in laser
Jim Morris [Tue, 15 Nov 2016 19:04:55 +0000 (11:04 -0800)]
Merge remote-tracking branch 'upstream/edge' into merge-abc-with-homing
Jim Morris [Tue, 15 Nov 2016 19:03:45 +0000 (11:03 -0800)]
Merge pull request #1065 from dwrobel/fix-isnan
Fix error: 'isnan' was not declared in this scope
Damian Wrobel [Tue, 15 Nov 2016 12:43:47 +0000 (13:43 +0100)]
Fix error: 'isnan' was not declared in this scope
Log excerpt from compilation using default arm toolset available on Fedora:
$ arm-none-eabi-g++ --version
arm-none-eabi-g++ (Fedora 6.1.0-2.fc24) 6.1.0
compiling modules/tools/zprobe/DeltaCalibrationStrategy.cpp
modules/tools/zprobe/DeltaCalibrationStrategy.cpp: In member function 'bool DeltaCalibrationStrategy::probe_delta_points(Gcode*)':
modules/tools/zprobe/DeltaCalibrationStrategy.cpp:99:19: error: 'isnan' was not declared in this scope
if(isnan(bedht)) return false;
^
modules/tools/zprobe/DeltaCalibrationStrategy.cpp:117:19: error: 'NAN' was not declared in this scope
float last_z= NAN;
^~~
modules/tools/zprobe/DeltaCalibrationStrategy.cpp:137:24: error: 'isnan' was not declared in this scope
if(isnan(last_z)) {
^
modules/tools/zprobe/DeltaCalibrationStrategy.cpp:140:58: error: 'fabsf' was not declared in this scope
max_delta= std::max(max_delta, fabsf(z-last_z));
^
modules/tools/zprobe/DeltaCalibrationStrategy.cpp: In member function 'float DeltaCalibrationStrategy::findBed()':
modules/tools/zprobe/DeltaCalibrationStrategy.cpp:156:30: error: 'NAN' was not declared in this scope
zprobe->coordinated_move(NAN, NAN, -deltaz, zprobe->getFastFeedrate(), true);
^~~
modules/tools/zprobe/DeltaCalibrationStrategy.cpp: In member function 'bool DeltaCalibrationStrategy::calibrate_delta_endstops(Gcode*)':
modules/tools/zprobe/DeltaCalibrationStrategy.cpp:214:19: error: 'isnan' was not declared in this scope
if(isnan(bedht)) return false;
^
modules/tools/zprobe/DeltaCalibrationStrategy.cpp:222:16: error: 'fabsf' was not declared in this scope
if(fabsf(dz) > target) {
Jim Morris [Sun, 13 Nov 2016 20:37:04 +0000 (12:37 -0800)]
Merge remote-tracking branch 'upstream/edge' into merge-abc-with-homing
Jim Morris [Sun, 13 Nov 2016 20:36:36 +0000 (12:36 -0800)]
Merge pull request #1064 from wolfmanjm/upstreamedge
fix bug in G38.2/3 for feedrate
Jim Morris [Sun, 13 Nov 2016 20:35:39 +0000 (12:35 -0800)]
fix bug in G38.2/3 for feedrate
Jim Morris [Sat, 12 Nov 2016 06:34:10 +0000 (22:34 -0800)]
Merge remote-tracking branch 'upstream/edge' into merge-abc-with-homing
Jim Morris [Sat, 12 Nov 2016 05:03:59 +0000 (21:03 -0800)]
Merge pull request #1063 from wolfmanjm/upstreamedge
Increase temp runaway timeout to 64 minutes.
Jim Morris [Sat, 12 Nov 2016 04:17:29 +0000 (20:17 -0800)]
Add 1 bit to temo runaway making max setting > 60 minutes
Reset tick on state change
Jim Morris [Fri, 11 Nov 2016 21:33:04 +0000 (13:33 -0800)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Fri, 11 Nov 2016 21:32:04 +0000 (13:32 -0800)]
Merge remote-tracking branch 'upstream/edge' into merge-abc-with-homing
Jim Morris [Fri, 11 Nov 2016 20:49:16 +0000 (12:49 -0800)]
Merge pull request #1062 from nmaggioni/edge
Support for signed commit in versioning script
Niccolò Maggioni [Fri, 11 Nov 2016 07:33:06 +0000 (08:33 +0100)]
Support for signed commit in versioning script
Closes #1057
Jim Morris [Wed, 9 Nov 2016 05:26:58 +0000 (21:26 -0800)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Wed, 9 Nov 2016 05:23:28 +0000 (21:23 -0800)]
Merge remote-tracking branch 'upstream/edge' into merge-abc-with-homing
Jim Morris [Wed, 9 Nov 2016 05:22:49 +0000 (21:22 -0800)]
Merge pull request #955 from Bouni/feature/spindle-refactor
Feature/spindle refactor
Jim Morris [Wed, 9 Nov 2016 03:27:31 +0000 (19:27 -0800)]
Merge pull request #1060 from wolfmanjm/upstreamedge
Add the following default module excludes...
Jim Morris [Wed, 9 Nov 2016 03:24:44 +0000 (19:24 -0800)]
Merge branch 'upstreamedge' into merge-abc-with-homing
Jim Morris [Wed, 9 Nov 2016 03:24:29 +0000 (19:24 -0800)]
Merge remote-tracking branch 'upstream/edge' into merge-abc-with-homing
Jim Morris [Wed, 9 Nov 2016 03:23:40 +0000 (19:23 -0800)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Wed, 9 Nov 2016 03:19:01 +0000 (19:19 -0800)]
Add the following default module excludes...
CNC build
tools/filamentdetector tools/scaracal tools/temperaturecontrol tools/extruder
3D Printer build
tools/drillingcycles tools/spindle
Conflicts:
src/makefile
Jim Morris [Wed, 9 Nov 2016 03:19:01 +0000 (19:19 -0800)]
Add the following default module excludes...
CNC build
tools/filamentdetector tools/scaracal tools/temperaturecontrol tools/extruder
3D Printer build
tools/drillingcycles tools/spindle
Jim Morris [Mon, 7 Nov 2016 05:41:04 +0000 (21:41 -0800)]
minor fix for homing order config
Jim Morris [Sat, 5 Nov 2016 20:58:43 +0000 (13:58 -0700)]
Fix homing order if X is last one
Jim Morris [Fri, 4 Nov 2016 23:42:38 +0000 (16:42 -0700)]
fix homing order bug
Jim Morris [Fri, 4 Nov 2016 22:48:48 +0000 (15:48 -0700)]
fix potential array overrun
Jim Morris [Wed, 2 Nov 2016 06:34:50 +0000 (23:34 -0700)]
update firmware.bin
Jim Morris [Wed, 2 Nov 2016 01:43:49 +0000 (18:43 -0700)]
Allow homing_order to specify ABC as well