Jim Morris [Mon, 2 Jan 2017 22:43:55 +0000 (14:43 -0800)]
update firmware.bin
Jim Morris [Mon, 2 Jan 2017 22:41:13 +0000 (14:41 -0800)]
Merge pull request #1084 from wolfmanjm/upstreammaster
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 [Thu, 15 Dec 2016 20:53:58 +0000 (12:53 -0800)]
update firmwarebins
Jim Morris [Thu, 15 Dec 2016 20:43:37 +0000 (12:43 -0800)]
Merge remote-tracking branch 'origin/edge'
Jim Morris [Thu, 15 Dec 2016 20:39:33 +0000 (12:39 -0800)]
update notes
Jim Morris [Thu, 15 Dec 2016 20:37:02 +0000 (12:37 -0800)]
update upgrade notes
Jim Morris [Thu, 15 Dec 2016 20:31:31 +0000 (12:31 -0800)]
Merge branch 'edge'
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: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 [Sun, 27 Nov 2016 22:18:44 +0000 (14:18 -0800)]
update firmware.bin
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 [Tue, 15 Nov 2016 19:08:03 +0000 (11:08 -0800)]
fix comment in laser
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: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 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 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: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: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, 2 Nov 2016 06:34:50 +0000 (23:34 -0700)]
update firmware.bin
Jim Morris [Mon, 31 Oct 2016 22:36:46 +0000 (15:36 -0700)]
Update ISSUE_TEMPLATE.md
Jim Morris [Fri, 28 Oct 2016 04:41:58 +0000 (21:41 -0700)]
Merge pull request #1053 from wolfmanjm/add/ssd1306-oled
Add/ssd1306 oled
Jim Morris [Thu, 27 Oct 2016 01:47:13 +0000 (18:47 -0700)]
make a0 optional
Jim Morris [Wed, 26 Oct 2016 22:39:48 +0000 (15:39 -0700)]
add the variant for ssd1306 oled support to the ST7565 which is almost identical
Jim Morris [Tue, 25 Oct 2016 22:00:51 +0000 (15:00 -0700)]
Merge pull request #1050 from michael-moore0/feature/extruder-display
modified watch screen to display extruder when printing.
Michael Moore [Tue, 25 Oct 2016 21:50:17 +0000 (17:50 -0400)]
added example configuration for Extruder Display.
Michael Moore [Tue, 25 Oct 2016 21:41:22 +0000 (17:41 -0400)]
added config option for extruder display on watch screen.
Michael Moore [Tue, 25 Oct 2016 01:06:46 +0000 (21:06 -0400)]
modified watch screen to display extruder when printing.
Jim Morris [Mon, 24 Oct 2016 02:15:48 +0000 (19:15 -0700)]
Merge pull request #1048 from wolfmanjm/upstreamedge
Make the nomsd build default to msd disabled
Jim Morris [Mon, 24 Oct 2016 02:06:12 +0000 (19:06 -0700)]
Make th enomsd build default to msd disabled
Jim Morris [Sun, 23 Oct 2016 23:18:18 +0000 (16:18 -0700)]
Merge pull request #1046 from Smoothieware/fix/simpler-temp-runaway-fix
simple fix for the runaway issue.
Jim Morris [Thu, 20 Oct 2016 22:43:04 +0000 (15:43 -0700)]
Update config samples with runaway detection examples
Jim Morris [Thu, 20 Oct 2016 21:50:00 +0000 (14:50 -0700)]
turn on runaway detection safety by default
Jim Morris [Thu, 20 Oct 2016 21:33:57 +0000 (14:33 -0700)]
Increase timeout max to 2040 secs or 34 minutes
Jim Morris [Thu, 20 Oct 2016 06:23:21 +0000 (23:23 -0700)]
add extra cooling down timeout for runaway
Pack more stuff in header so we do not have any net gain in memory usage (the 16 bits would have been padded to 32 before).
Add Cooling DOWN state so if temp is set lower it has a cooling down timeout (defaulkt is the same as heating up)
Jim Morris [Tue, 18 Oct 2016 06:56:47 +0000 (23:56 -0700)]
increase runaway_heating_timeout to a max of 511 seconds
decrease runaway_range to a max of 63 degrees
Jim Morris [Tue, 18 Oct 2016 04:42:50 +0000 (21:42 -0700)]
First pass at a simple fix for the runaway issue where changing the temp causes ON_HALT
Jim Morris [Sun, 16 Oct 2016 10:09:57 +0000 (03:09 -0700)]
Merge pull request #1043 from wolfmanjm/feature/Allow-relative-G10-L2
Allow relative mode to affect G10 L2
Jim Morris [Sun, 16 Oct 2016 10:07:26 +0000 (03:07 -0700)]
Allow relative mode to affect G10 L2
Jim Morris [Sun, 16 Oct 2016 05:23:03 +0000 (22:23 -0700)]
Merge pull request #1042 from wolfmanjm/feature/M18-allow-axis-parameter
Feature/m18 allow axis parameter
Jim Morris [Sun, 16 Oct 2016 05:18:36 +0000 (22:18 -0700)]
Add motor_id to stepper motors so they know what axis they are
Change MotorDriver Control so that the designator is actually the axis it is attached to.
Jim Morris [Sun, 16 Oct 2016 04:11:21 +0000 (21:11 -0700)]
Allow M18 E0 to act on currently selected extruder
Jim Morris [Sun, 16 Oct 2016 04:05:22 +0000 (21:05 -0700)]
Allow M18 to turn off selected motors
Jim Morris [Sun, 16 Oct 2016 03:25:36 +0000 (20:25 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Fri, 14 Oct 2016 07:41:33 +0000 (00:41 -0700)]
update firmware.bin
Jim Morris [Fri, 14 Oct 2016 07:38:54 +0000 (00:38 -0700)]
Merge pull request #1041 from wolfmanjm/upstreamedge
Better and correct fix for Kill hanging on E moving
Jim Morris [Fri, 14 Oct 2016 07:25:59 +0000 (00:25 -0700)]
Merge remote-tracking branch 'upstream/edge' into upstreamedge
Jim Morris [Fri, 14 Oct 2016 07:21:36 +0000 (00:21 -0700)]
update firmware.bin
Jim Morris [Fri, 14 Oct 2016 07:15:28 +0000 (00:15 -0700)]
Better and correct fix for Kill hanging on E moving
Jim Morris [Thu, 13 Oct 2016 22:56:15 +0000 (15:56 -0700)]
update firmware.bin
Jim Morris [Thu, 13 Oct 2016 22:53:12 +0000 (15:53 -0700)]
Merge pull request #1040 from wolfmanjm/upstreamedge
workaround to handle kill and not wait for motors to stop
Jim Morris [Thu, 13 Oct 2016 22:52:15 +0000 (15:52 -0700)]
change ERROR : to ERROR: for out of band temp errors
Jim Morris [Thu, 13 Oct 2016 09:00:52 +0000 (02:00 -0700)]
workaround to handle kill and not wait for motors to stop as that seems to hang
Jim Morris [Wed, 12 Oct 2016 21:13:39 +0000 (14:13 -0700)]
Merge pull request #1038 from michael-moore0/feature/time-format
modified timestamp format to HH:MM:SS.
Jim Morris [Wed, 12 Oct 2016 21:12:26 +0000 (14:12 -0700)]
Merge pull request #1039 from michael-moore0/feature/implement-mkdir
implemented the 'mkdir' command on the shell.
Michael Moore [Wed, 12 Oct 2016 20:46:59 +0000 (16:46 -0400)]
implemented the 'mkdir' command on the shell.
Michael Moore [Wed, 12 Oct 2016 13:35:13 +0000 (09:35 -0400)]
fixed whitespace issue and removed 'sd' to correct spacing.
Michael Moore [Wed, 12 Oct 2016 02:05:56 +0000 (22:05 -0400)]
modified timestamp format to HH:MM:SS.
- modified watch screen time format.
- modified 'progress' command time format.
Jim Morris [Sun, 9 Oct 2016 05:18:35 +0000 (22:18 -0700)]
Merge pull request #1036 from wolfmanjm/upstreamedge
Add fix to not recursively call refresh in ON_IDLE
Jim Morris [Sun, 9 Oct 2016 05:16:54 +0000 (22:16 -0700)]
Add fix to not recursively call refresh in ON_IDLE
Jim Morris [Wed, 5 Oct 2016 04:37:42 +0000 (21:37 -0700)]
Delete ZprobeGrid.config
Jim Morris [Sat, 24 Sep 2016 22:33:37 +0000 (15:33 -0700)]
Merge pull request #1033 from wolfmanjm/upstreamedge
add BS and DEL to the USB serial to delete last character entered
Jim Morris [Sat, 24 Sep 2016 22:31:53 +0000 (15:31 -0700)]
add BS and DEL to the USB serial to delete last chanracter entered, gives simple line editing to commands
Jim Morris [Sat, 24 Sep 2016 20:38:15 +0000 (13:38 -0700)]
Merge pull request #1031 from nallar/patch-1
Fix broken link in README (HowToFileIssues.md)
Arthur Wolf [Sat, 24 Sep 2016 18:22:31 +0000 (20:22 +0200)]
Making it clear issues are for issue ( Duh. )
Ross Allan [Sat, 24 Sep 2016 13:11:23 +0000 (14:11 +0100)]
Fix broken link in README (HowToFileIssues.md)
Was linking to HowToFileIssues.md which was renamed in these commits
7bb7936875 3fd39027e to ISSUE_TEMPLATE.md
Jim Morris [Fri, 23 Sep 2016 20:24:00 +0000 (13:24 -0700)]
Merge pull request #1030 from wolfmanjm/upstreamedge
add a set_g92 x,y,z to config
Jim Morris [Fri, 23 Sep 2016 20:22:11 +0000 (13:22 -0700)]
add a set_g92 x,y,z to config
Jim Morris [Thu, 22 Sep 2016 05:48:18 +0000 (22:48 -0700)]
Merge pull request #1029 from wolfmanjm/upstreamedge
fix modifyvalue screen, update laser screen
Jim Morris [Thu, 22 Sep 2016 05:41:07 +0000 (22:41 -0700)]
fix single entry ModifyValuesScreen when not immediate set
Jim Morris [Wed, 21 Sep 2016 07:54:59 +0000 (00:54 -0700)]
add set S value menu item to laser screen
Jim Morris [Wed, 21 Sep 2016 06:39:58 +0000 (23:39 -0700)]
update firmware.bin
Jim Morris [Wed, 21 Sep 2016 06:37:45 +0000 (23:37 -0700)]
Merge pull request #1028 from wolfmanjm/upstreamedge
fix watchscree
Jim Morris [Wed, 21 Sep 2016 06:36:09 +0000 (23:36 -0700)]
fix watchscree
Jim Morris [Thu, 15 Sep 2016 20:31:11 +0000 (13:31 -0700)]
Merge pull request #1025 from wolfmanjm/upstreamedge
Single entry ModifyValue menus go straight into value update mode and…
Jim Morris [Thu, 15 Sep 2016 20:27:52 +0000 (13:27 -0700)]
Single entry ModifyValue menus go straight into value update mode and exit direct to parent
No need to disolay a selection menu when only one entry.
Update laser power setting to use the above
Jim Morris [Wed, 14 Sep 2016 17:31:41 +0000 (10:31 -0700)]
Merge pull request #1023 from docdawning/patch-1
Update Readme.md
James [Wed, 14 Sep 2016 15:29:56 +0000 (09:29 -0600)]
Update Readme.md
s/alos/also
Jim Morris [Tue, 13 Sep 2016 20:49:28 +0000 (13:49 -0700)]
Merge pull request #1022 from wolfmanjm/features/laser-panel
Features/laser panel
Jim Morris [Tue, 13 Sep 2016 20:48:36 +0000 (13:48 -0700)]
add comments
Jim Morris [Tue, 13 Sep 2016 20:05:34 +0000 (13:05 -0700)]
add option to test fire menu to leave laser on when it exits, and disable the timeout
Jim Morris [Tue, 13 Sep 2016 07:28:23 +0000 (00:28 -0700)]
update control screen for both 3dprinter and cnc uses same file, fixes jogging in absolute mode for 3dprinter
added actual current laser power to watch screen
Jim Morris [Tue, 13 Sep 2016 06:20:20 +0000 (23:20 -0700)]
Add laser menu
sets power scaler
does test fire
Add Dynamic Menu class
Add Goto park position and set park position for CNC mode
Add current laser power value (S value) to watch screen
Jim Morris [Sat, 10 Sep 2016 19:07:17 +0000 (12:07 -0700)]
Update Readme.md
Jim Morris [Fri, 9 Sep 2016 05:15:21 +0000 (22:15 -0700)]
Merge remote-tracking branch 'upstream/edge' into features/laser-panel
Jim Morris [Thu, 8 Sep 2016 05:56:23 +0000 (22:56 -0700)]
Create PULL_REQUEST_TEMPLATE.md