Jim Morris [Tue, 2 Dec 2014 06:27:19 +0000 (22:27 -0800)]
fix actuator position inaccuracy on pause
Jim Morris [Mon, 1 Dec 2014 21:44:08 +0000 (13:44 -0800)]
Use AppendFIleStream for M500 to avoid fatlib/sdcard write bug
Jim Morris [Sat, 29 Nov 2014 04:50:48 +0000 (20:50 -0800)]
update firmware.bin
Jim Morris [Mon, 24 Nov 2014 22:22:11 +0000 (14:22 -0800)]
Merge pull request #549 from PetteriAimonen/edge
Added spindle speed control module using PID feedback
Petteri Aimonen [Mon, 24 Nov 2014 18:29:05 +0000 (20:29 +0200)]
Fix SysTick_Config() so that one can set LOAD = SYSTICK_MAXCOUNT
Petteri Aimonen [Mon, 24 Nov 2014 16:48:22 +0000 (18:48 +0200)]
Move systick initialization from main.cpp to Spindle.cpp
Petteri Aimonen [Mon, 24 Nov 2014 16:47:27 +0000 (18:47 +0200)]
Fix mixed CRLF/LF line ends in score_cm3.h
Petteri Aimonen [Sun, 23 Nov 2014 19:43:04 +0000 (21:43 +0200)]
Fix spindle PID D-term scaling
Petteri Aimonen [Sun, 23 Nov 2014 19:12:25 +0000 (21:12 +0200)]
Add PID-loopback spindle speed control
Petteri Aimonen [Sun, 23 Nov 2014 19:11:18 +0000 (21:11 +0200)]
Add hardware_pwm() function to smoothie Pins
Jim Morris [Sat, 15 Nov 2014 23:14:46 +0000 (15:14 -0800)]
Merge pull request #548 from ssloy/fix/parse_ip_str
mac address hexadecimal parsing bugfix
ssloy [Sat, 15 Nov 2014 22:59:30 +0000 (23:59 +0100)]
mac address hexadecimal parsing bugfix
Jim Morris [Tue, 11 Nov 2014 05:22:19 +0000 (21:22 -0800)]
update firmware.bin
Jim Morris [Tue, 11 Nov 2014 05:12:07 +0000 (21:12 -0800)]
Merge pull request #546 from Smoothieware/add/z_junction_deviation
Add/z junction deviation
Jim Morris [Tue, 11 Nov 2014 05:09:56 +0000 (21:09 -0800)]
add M205 settings for z junction deviation
Jim Morris [Mon, 10 Nov 2014 10:35:40 +0000 (02:35 -0800)]
add a junctin deviation for Z only moves, and allow it to be totally disabled for z only moves
default is use the junction deviation for z moves
Jim Morris [Sun, 9 Nov 2014 23:06:07 +0000 (15:06 -0800)]
Merge pull request #545 from Smoothieware/add/P1.23-to-laser-pwm
Add/p1.23 to laser pwm
Jim Morris [Wed, 5 Nov 2014 07:51:48 +0000 (23:51 -0800)]
Merge pull request #542 from wolfmanjm/add/clear-block-queue
Add/clear block queue
Jim Morris [Wed, 5 Nov 2014 07:21:19 +0000 (23:21 -0800)]
Don't disable extruder on on_halt if old style config
Jim Morris [Wed, 5 Nov 2014 07:00:29 +0000 (23:00 -0800)]
fix potential issue with endstop homing hanging
Jim Morris [Wed, 5 Nov 2014 06:38:16 +0000 (22:38 -0800)]
clean up some code, save some more ram
cap temp reading for panel to 999 to avoid wrap around
Jim Morris [Tue, 4 Nov 2014 21:47:20 +0000 (13:47 -0800)]
update config example for kill button
Jim Morris [Tue, 4 Nov 2014 21:33:59 +0000 (13:33 -0800)]
allow slected M codes even when in halted state (like get temp and get pos)
Jim Morris [Tue, 4 Nov 2014 10:31:40 +0000 (02:31 -0800)]
Add a debounce count to the reset triggered state
Jim Morris [Tue, 4 Nov 2014 08:35:26 +0000 (00:35 -0800)]
try to fix liit swiches still activating after M999
Jim Morris [Tue, 4 Nov 2014 08:02:10 +0000 (00:02 -0800)]
add ability to see exactly where actuator currently is
add ABC to M114
Jim Morris [Tue, 4 Nov 2014 07:19:23 +0000 (23:19 -0800)]
fix issues with timing of when flush happens
on abort do not issue flush when queue is full
when halted and waiting for soace in queue discard waiting block
make On_HALT indicate if it is halted or released
Jim Morris [Mon, 3 Nov 2014 20:26:03 +0000 (12:26 -0800)]
move the on_halt call into on_idle instead of from ISR
Jim Morris [Mon, 3 Nov 2014 10:05:24 +0000 (02:05 -0800)]
make flush queue on abort optional
Jim Morris [Mon, 3 Nov 2014 09:24:44 +0000 (01:24 -0800)]
leave player in halted state until M999
Jim Morris [Mon, 3 Nov 2014 08:19:19 +0000 (00:19 -0800)]
abort flushes block queue
Jim Morris [Mon, 3 Nov 2014 08:13:33 +0000 (00:13 -0800)]
can;t do anythng nasty on on_halt as it may be from interrupt
Jim Morris [Mon, 3 Nov 2014 07:58:05 +0000 (23:58 -0800)]
fast flash play led when halted
Jim Morris [Mon, 3 Nov 2014 07:44:35 +0000 (23:44 -0800)]
clear killed flag on M999
Jim Morris [Mon, 3 Nov 2014 07:38:31 +0000 (23:38 -0800)]
Add halt status to panel and a way to clear it
ON_HALT aborts sd play file
Jim Morris [Mon, 3 Nov 2014 06:37:03 +0000 (22:37 -0800)]
clear limit triggered if no limit switches still triggered
Jim Morris [Mon, 3 Nov 2014 06:28:29 +0000 (22:28 -0800)]
Merge branch 'feature/kill-button' into add/clear-block-queue
Conflicts:
src/modules/communication/GcodeDispatch.cpp
src/modules/communication/GcodeDispatch.h
Jim Morris [Mon, 3 Nov 2014 06:21:25 +0000 (22:21 -0800)]
Merge remote-tracking branch 'upstream/edge' into feature/kill-button
Conflicts:
ConfigSamples/Smoothieboard/config
Jim Morris [Mon, 3 Nov 2014 06:16:48 +0000 (22:16 -0800)]
Implement triffid hunters flush queue code in Conveyor
Change things that call ON_HALT to not take pause
ON_HALT will set a state in gcodedispatch to reject all incoming commands until M999
ON_HALT will flush block queue
Logxen [Fri, 31 Oct 2014 20:11:07 +0000 (13:11 -0700)]
Added P1.24, P1.26, P3.25, P3.26 to Laser config
Logxen [Fri, 31 Oct 2014 20:09:24 +0000 (13:09 -0700)]
Added P1.24, P1.26, P3.25, and P3.26 to Laser
Jim Morris [Fri, 31 Oct 2014 04:26:54 +0000 (21:26 -0700)]
update config
Jim Morris [Fri, 31 Oct 2014 04:20:50 +0000 (21:20 -0700)]
add P1.18, P1.20, P1.21, P1.23 as laser PWM pins
Jim Morris [Thu, 30 Oct 2014 23:50:38 +0000 (16:50 -0700)]
Merge pull request #538 from wolfmanjm/upstreamedge
add StepperMotor::get_last_milestone()
Jim Morris [Thu, 30 Oct 2014 23:49:34 +0000 (16:49 -0700)]
add StepperMotor::get_last_milestone()
Jim Morris [Tue, 28 Oct 2014 20:25:24 +0000 (13:25 -0700)]
update firmware.bin
Jim Morris [Sun, 26 Oct 2014 05:40:25 +0000 (22:40 -0700)]
Merge pull request #537 from wolfmanjm/upstreamedge
add icons for hotends 2 and 3
Jim Morris [Sun, 26 Oct 2014 05:39:04 +0000 (22:39 -0700)]
add icons for hotends 2 and 3
Jim Morris [Sun, 26 Oct 2014 02:17:05 +0000 (19:17 -0700)]
Merge pull request #536 from wolfmanjm/feature/more-temps-in-watchscreen
Add multiple temps to panel watchscreen if there are more than two enabl...
Jim Morris [Sun, 26 Oct 2014 02:13:26 +0000 (19:13 -0700)]
Add multiple temps to panel watchscreen if there are more than two enabled, top line cycles through different temps every 5 seconds
Jim Morris [Thu, 23 Oct 2014 07:15:32 +0000 (00:15 -0700)]
update firmware.bin
Arthur Wolf [Tue, 21 Oct 2014 11:46:01 +0000 (13:46 +0200)]
Merge pull request #535 from Smoothieware/max-temp
Confirmed to work
Arthur Wolf [Mon, 20 Oct 2014 21:18:18 +0000 (23:18 +0200)]
fix typo
Arthur Wolf [Mon, 20 Oct 2014 21:12:17 +0000 (23:12 +0200)]
added max_temp config option to temperaturecontrol
Jim Morris [Sun, 19 Oct 2014 04:40:07 +0000 (21:40 -0700)]
Merge pull request #534 from wolfmanjm/add/mv_and_upload_commands
added mv command to simpleshell
Jim Morris [Sun, 19 Oct 2014 04:05:25 +0000 (21:05 -0700)]
added mv command to simpleshell
added rename() to stdio.cpp
added ready() to StreamOutput
add upload command to SimpleShell
Jim Morris [Thu, 16 Oct 2014 19:33:33 +0000 (12:33 -0700)]
Update config
Jim Morris [Fri, 10 Oct 2014 20:12:17 +0000 (13:12 -0700)]
Merge pull request #532 from wolfmanjm/upstreamedge
fix ls
Jim Morris [Fri, 10 Oct 2014 20:11:26 +0000 (13:11 -0700)]
fix ls
Jim Morris [Thu, 9 Oct 2014 20:14:06 +0000 (13:14 -0700)]
add a disablemsd version of firmware.bin
Jim Morris [Thu, 9 Oct 2014 19:58:42 +0000 (12:58 -0700)]
Merge pull request #531 from wolfmanjm/upstreamedge
add DISABLEMSD to options allowed on make command line
Jim Morris [Thu, 9 Oct 2014 19:57:24 +0000 (12:57 -0700)]
add DISABLEMSD to options allowed on make command line
Jim Morris [Thu, 9 Oct 2014 07:03:03 +0000 (00:03 -0700)]
update firmware.bin with dfu disabled
Jim Morris [Thu, 9 Oct 2014 07:00:14 +0000 (00:00 -0700)]
Merge pull request #530 from wolfmanjm/feature/disable-dfu-option
Feature/disable dfu option
Jim Morris [Thu, 9 Oct 2014 06:55:38 +0000 (23:55 -0700)]
add dfu_enable to config
Jim Morris [Thu, 9 Oct 2014 06:40:21 +0000 (23:40 -0700)]
allocate secind serial to AHBO
disable DFU by default
Jim Morris [Mon, 6 Oct 2014 19:53:00 +0000 (12:53 -0700)]
Merge branch 'edge' of github.com:Smoothieware/Smoothieware into edge
Jim Morris [Mon, 6 Oct 2014 19:52:34 +0000 (12:52 -0700)]
add md5sum for bootloader hex
Jim Morris [Sun, 5 Oct 2014 22:12:31 +0000 (15:12 -0700)]
Merge pull request #529 from wolfmanjm/upstreamedge
fix M306 as per qharley (with improvements)
Jim Morris [Sun, 5 Oct 2014 22:11:16 +0000 (15:11 -0700)]
fix M306 as per qharley (with improvements)
Jim Morris [Sun, 5 Oct 2014 01:26:58 +0000 (18:26 -0700)]
Merge pull request #528 from wolfmanjm/upstreamedge
add an additional offset to M306 if Z has a value other than 0
Jim Morris [Sun, 5 Oct 2014 01:25:38 +0000 (18:25 -0700)]
add an additional offset to M306 if Z has a value other than 0
Jim Morris [Sat, 4 Oct 2014 23:10:18 +0000 (16:10 -0700)]
Merge pull request #527 from wolfmanjm/feature/modify-new_m206-changes
Move M206 improvements to M306 and leave M206 as is
Jim Morris [Sat, 4 Oct 2014 23:07:27 +0000 (16:07 -0700)]
Move M206 improvements to M306 and leave M206 as is
Jim Morris [Sat, 4 Oct 2014 22:58:55 +0000 (15:58 -0700)]
Merge pull request #524 from RepRapMorgan/M206_improvements
Added automatic end-stop offset calbration to M206:
Jim Morris [Sat, 4 Oct 2014 21:01:32 +0000 (14:01 -0700)]
Merge pull request #525 from RepRapMorgan/scara_updates
Repairs issues surrounding homing for scara systems
Quentin Harley [Sat, 4 Oct 2014 10:51:46 +0000 (12:51 +0200)]
Repairs issues surrounding homing for scara systems
Scara systems are not deltas, and just specifying delta homing will cause
issues in other mudules, such as zprobe
Quentin Harley [Sat, 4 Oct 2014 10:38:44 +0000 (12:38 +0200)]
Added automatic end-stop offset calbration to M206:
M206 P X Y Z
When P is available in the line, every named axis will be assumed to be zero,
and the calculated offset inserted into memory.
Jim Morris [Sat, 4 Oct 2014 04:39:19 +0000 (21:39 -0700)]
Merge pull request #523 from wolfmanjm/feature/add-size-to-ls
add -s to ls comamnd to print the file size
Jim Morris [Sat, 4 Oct 2014 04:35:55 +0000 (21:35 -0700)]
add -s to ls comamnd to print the file size
added d_fsize to the dirent in mbed library to get fsize
Jim Morris [Sat, 4 Oct 2014 03:29:45 +0000 (20:29 -0700)]
update the sample thermistor sample to point to wiki
add example beta setting
Jim Morris [Fri, 3 Oct 2014 07:46:35 +0000 (00:46 -0700)]
u[date firmware.bin
Jim Morris [Fri, 3 Oct 2014 07:37:43 +0000 (00:37 -0700)]
Merge pull request #521 from wolfmanjm/fix/issue-520
Fix/issue 520
Jim Morris [Fri, 3 Oct 2014 07:35:32 +0000 (00:35 -0700)]
remove FIXME comment
Jim Morris [Fri, 3 Oct 2014 07:32:16 +0000 (00:32 -0700)]
Implement a workaround to the bug reported in issues #520
where an absolute move inbetween a G10 and G11 with zlift returns to the wrong Z
Jim Morris [Fri, 3 Oct 2014 05:42:37 +0000 (22:42 -0700)]
update config sample
Jim Morris [Thu, 2 Oct 2014 22:30:11 +0000 (15:30 -0700)]
update firmware.bin
Jim Morris [Tue, 30 Sep 2014 22:12:17 +0000 (15:12 -0700)]
Merge pull request #519 from wolfmanjm/upstreamedge
fix race when external card is already inserted
Jim Morris [Tue, 30 Sep 2014 22:11:21 +0000 (15:11 -0700)]
fix race when external card is already inserted
Arthur Wolf [Tue, 30 Sep 2014 12:21:35 +0000 (14:21 +0200)]
Merge branch 'edge' of https://github.com/Smoothieware/Smoothieware into edge
Arthur Wolf [Tue, 30 Sep 2014 12:20:57 +0000 (14:20 +0200)]
add CORS support for web interfaces
Jim Morris [Tue, 30 Sep 2014 05:17:18 +0000 (22:17 -0700)]
Merge pull request #518 from wolfmanjm/add/external-sdcard
Add/external sdcard
Jim Morris [Tue, 30 Sep 2014 05:11:49 +0000 (22:11 -0700)]
Merge pull request #517 from wolfmanjm/add/viki2
Add/viki2
Jim Morris [Tue, 30 Sep 2014 05:07:14 +0000 (22:07 -0700)]
update pins for viki2 on an azteeg X5 mini V2
Jim Morris [Mon, 29 Sep 2014 00:29:03 +0000 (17:29 -0700)]
fix white space changes
Jim Morris [Sun, 28 Sep 2014 23:28:28 +0000 (16:28 -0700)]
fix a bug in readdir that casued stack overrun (fixed in upstream mbed already)
move extern sdcard detect to panel
allow configure of where extern sdcard is plugged in
when extern sdcard is inserted jump to that directory in play screen
switch SDCard to use mbed::SPI as it remembers the frequency to use for each device
Jim Morris [Sun, 28 Sep 2014 08:12:17 +0000 (01:12 -0700)]
fix opendir bug for multiple FAT volumes
Add sd card insertion detection and mount exernal sd
Jim Morris [Sat, 27 Sep 2014 08:36:23 +0000 (01:36 -0700)]
specify variant in ctor
add mini_viki2 as it needs different contrast and encoder resolution
Jim Morris [Sat, 27 Sep 2014 05:35:31 +0000 (22:35 -0700)]
add a LED_HOT that gets set if the temp of hotend or bed is > 50C
viki2 set red led if hot blue led if not
Jim Morris [Fri, 26 Sep 2014 22:36:20 +0000 (15:36 -0700)]
add buzz and red/blue leds for viki2 panel
add example coinfig for viki2