SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
9746 commits 1 branch 0 tags 119 MiB
Commit graph

8069 commits

Author SHA1 Message Date
Scott Lahteine
4ddb6a3a1f
Merge pull request #9470 from thinkyhead/bf2_malyan_clueless 
[2.0.x] Malyan M200 LCD
 2018-02-05 05:03:18 -06:00
Scott Lahteine
03bfc0d7c8
Merge pull request #9439 from thinkyhead/bf2_fix_G26_circle_bumps 
[2.0.x] Change G26 circle angles
 2018-02-04 19:05:18 -06:00
Scott Lahteine
e5ee0b6f6c Implement MALYAN_LCD 2018-02-04 18:52:44 -06:00
Scott Lahteine
b939a2e88c Watchdog conditional for LPC 2018-02-04 18:52:44 -06:00
Scott Lahteine
4925f60cff Add MALYAN_LCD to configs 2018-02-04 18:52:44 -06:00
Scott Lahteine
3a1225e438 Sanity check SENSORLESS_HOMING 2018-02-04 18:52:44 -06:00
Scott Lahteine
2ea4e74ed3 Misc. comments 2018-02-04 17:40:39 -06:00
Scott Lahteine
aecf0c9bb9 Allow override of CS pins generally 2018-02-04 16:36:30 -06:00
Scott Lahteine
0891b58c30 #ifdef tweaks 2018-02-04 16:36:30 -06:00
Bob-the-Kuhn
428f164d02 [2.0.x] Bug fix - "M114 D" and Due (dtostrf C linkage) (#9481) 2018-02-04 16:11:27 -06:00
Scott Lahteine
693843f1fa
Allow override of RAMPS CS Pins (#9472) 2018-02-04 16:00:16 -06:00
ABH10
ac6bf7226a Update of comments in thermistor files. No functional changes. (#8986) 2018-02-04 06:06:21 -06:00
Alexey Shvetsov
da3a0d619c Add Selena Compact board (#9407) 
5-axis, high performance, powerful board with Smoothieware opensource firmware. Designed for 3D printer, Laser cutter or CNC mill. Five changed independent drivers on board. Two extruders 3d printer support.
 2018-02-04 03:15:09 -06:00
Thomas Moore
786746404b [2.0.x] Apply feedrate to nozzle movement for kinematic machines (#8778) 2018-02-04 00:26:05 -06:00
Scott Lahteine
5364b92c37 Drop obsolete string 2018-02-03 23:58:31 -06:00
shaktee
34624cf399 [2.0.x] BIBO TouchX configuration (#9469) 2018-02-03 23:21:02 -06:00
Bob-the-Kuhn
3d72fe0730 snapshot 2018-02-03 21:28:05 -06:00
Scott Lahteine
33ec599ca0 Tweaky LPC1768 SPI spacing/style 2018-02-03 20:25:57 -06:00
Scott Lahteine
c46de340b7 Clean up trailing whitespace 2018-02-03 20:05:23 -06:00
Thomas Moore
e1fd9c08b3 [2.0.x] Add support for LPC1769 at 120 MHz (#9423) 2018-02-03 19:33:26 -06:00
GMagician
6ace57e1b0 [2.0.x] remove duplicated include (#9445) 
This was present in #9357 but lost
 2018-02-03 19:32:05 -06:00
GMagician
9e13d1fad5 [2.0.x] Fix temperature out of LCD (#9461) 
Fix bug introduced in #9415
 2018-02-03 19:25:04 -06:00
Scott Lahteine
e6cdc438fd Change G26 circle angles 
To prevent the nozzle from colliding with the printed pattern.
 2018-02-03 19:17:49 -06:00
Scott Lahteine
a8764ac5d5 G26 parity with 1.1.x 2018-02-02 05:19:14 -06:00
Manuel Valentino
374f2a5e16 [2.0.x] Fixed wrong information about TMC2208 wiring (#9335) 2018-02-02 04:45:55 -06:00
Bob-the-Kuhn
a0570ff1eb Fix caselight on Due (#9364) 2018-02-02 04:13:33 -06:00
Scott Lahteine
b13099de3f General cleanup of HAL code 2018-02-02 03:37:15 -06:00
Scott Lahteine
9b9350e010 Fix jerky Z motion between probes 
Suggested by #9375
 2018-02-02 02:32:11 -06:00
Scott Lahteine
d6e29e9597 Update French language 
Based on #9373 by @nikkoura
 2018-02-02 01:56:25 -06:00
GMagician
e1117a8492 [2.0.x] fix compile errors when CNC_COORDINATE_SYSTEMS is enabled (#9380) 2018-02-02 01:45:46 -06:00
GMagician
ea9ad4e46d [2.0.x] Fix compile error on delta when NO_WORKSPACE_OFFSETS (#9388) 2018-02-02 01:44:48 -06:00
Scott Lahteine
79796b22ad Fix up _Bootscreen.h and _Statusscreen.h 2018-02-02 00:57:16 -06:00
Bob-the-Kuhn
21179f8300 Fix the "slow" version of the G-code parser 2018-02-02 00:35:58 -06:00
Scott Lahteine
c251601916 Simplified SET_BIT, moved to endstops.cpp 2018-02-02 00:34:23 -06:00
Scott Lahteine
eb18ae9003 Define LSBFIRST / MSBFIRST for LPC 2018-02-02 00:34:23 -06:00
Scott Lahteine
f8227abf1c
Merge pull request #9384 from tcm0116/2.0.x-retract 
[2.0.x] Clear retracted status when homing the Z axis
 2018-02-01 23:36:36 -06:00
Scott Lahteine
ea5f91737f
Merge pull request #9392 from studiodyne/studiodyne-pause 
[2.0.x] Pause resuming fix
 2018-02-01 23:32:24 -06:00
teemuatlut
5c69d45f5b [2.0.x] TMC2130 support for LPC platform (#9114) 2018-02-01 21:49:40 -06:00
Scott Lahteine
34160806c0 Fix broken G29 W I J 2018-02-01 21:37:35 -06:00
Scott Lahteine
f5cfdf6efe Use _BV32 to avoid name conflict 2018-02-01 21:37:35 -06:00
Scott Lahteine
6339b506c0 Make sure binary.h is included as needed 2018-02-01 21:37:35 -06:00
studiodyne
51d080d2c1
Update Pause 2018-01-29 21:57:37 +01:00
Thomas Moore
7035471982 Clear retracted status when homing the Z axis 2018-01-29 19:40:04 +00:00
GMagician
6d4bc9a1f8 [2.0.x] Fix SD wrong filename list (#9342) 
If last file in directory has short filename and is preceded by a deleted long file name. SD menu will wrongly report long deleted file name as last entry
 2018-01-26 14:03:51 -06:00
Bob-the-Kuhn
c6e01ebd52 never mind ... 2018-01-25 22:13:32 -06:00
Bob-the-Kuhn
ab709ccac1 add USEABLE_HARDWARE_PWM & clear up some compiler warnings 2018-01-24 21:42:36 -06:00
Scott Lahteine
fc5c1a28d8 Fix M118 parameter parsing 2018-01-24 00:30:13 -06:00
Scott Lahteine
399bca316a Fix has_value with FASTER_GCODE_PARSER 2018-01-24 00:30:13 -06:00
Scott Lahteine
80d3ded895 Change parser codebits from array to int32_t 2018-01-24 00:30:13 -06:00
Scott Lahteine
053b1371c7 Simplify G-code debug option 2018-01-24 00:06:07 -06:00
Scott Lahteine
608f8b10da Parser val method parity with 1.1.x 2018-01-24 00:06:07 -06:00
Scott Lahteine
2bea1bda56 Move more strings to PROGMEM 2018-01-24 00:06:06 -06:00
Scott Lahteine
58671e1bc1 Marlin must override _BV for 32-bit masks! 2018-01-23 23:52:35 -06:00
Scott Lahteine
45cfb16424
Merge pull request #8355 from tcm0116/2.0.x-TwoWire 
[2.0.x] Master-only TwoWire (I2C) class for LPC1768
 2018-01-23 20:14:02 -06:00
Scott Lahteine
1dcfe193ac Optimize some serial strings 2018-01-23 19:14:00 -06:00
Scott Lahteine
9644fe1839 Lightly optimize arc length calculation 2018-01-23 19:13:59 -06:00
Scott Lahteine
c9bda932fe
Patch M114 D logical output 2018-01-23 18:50:37 -06:00
Scott Lahteine
e5ca60acf5 Patch G29 no_action for A and Q 2018-01-23 14:00:06 -06:00
Scott Lahteine
696f8eb4c6 Include Z Fade in log_machine_info 2018-01-23 14:00:06 -06:00
Scott Lahteine
3217da6fa5 Followup patch for TMC stepper init 2018-01-23 14:00:06 -06:00
Scott Lahteine
db031d5d76 Add missing SoftwareSerial begin for TMC2208 
Based on #9299
 2018-01-22 10:43:24 -06:00
Thomas Moore
3db35ba9be [2.0.x] Fix change filament for delta machines (#9295) 2018-01-22 10:21:42 -06:00
Scott Lahteine
2ebf52e57d Fix Skew Correction pre-calculation overflow error 2018-01-22 08:20:21 -06:00
Scott Lahteine
adb2ac4747 Fix skew settings report precision 2018-01-22 08:09:36 -06:00
Scott Lahteine
205c5fa078
Merge pull request #9277 from oysteinkrog/fix/DualX_Endstops 
[2.0.x] Fix DUAL_X_CARRIAGE endstop tests
 2018-01-22 07:42:49 -06:00
Scott Lahteine
90d011cc48 Use ADD_PORT_ARG for all cases 2018-01-22 06:27:22 -06:00
Scott Lahteine
51c7b5d46f Fix set_home_offset bug from bad porting 2018-01-22 06:16:21 -06:00
Scott Lahteine
b1cd012aa6 Clean up and document load/unload/pause/resume 2018-01-22 05:45:46 -06:00
Scott Lahteine
266086670b Better LCD message when heating needed 2018-01-22 04:38:37 -06:00
Scott Lahteine
a718f5bdf3 Don't run M600 on filament runout if the nozzle is cold 2018-01-22 04:38:37 -06:00
Scott Lahteine
61bf8478a2 Add hotEnough methods 2018-01-22 04:38:37 -06:00
Scott Lahteine
7a52dfad55
Merge pull request #9283 from thinkyhead/bf2_jgaurora_configs 
[2.0.x] Add JGAurora A5 support
 2018-01-22 02:21:56 -06:00
Chris Pepper
f875f49caa [2.0.x] LPC1768: Fix: Serial pins disabled correctly when in use (#9193) 2018-01-22 01:54:41 -06:00
Scott Lahteine
c63cffca7f Add example configs for JGAurora A5 2018-01-22 01:27:11 -06:00
Scott Lahteine
7d6c009104 Add thermistor 15 tuned for JGAurora A5 2018-01-22 01:27:11 -06:00
Scott Lahteine
582d073de1 Patch up digital microstepping and SPI CS pins 2018-01-22 01:27:11 -06:00
Scott Lahteine
ab8a1a2a0d Sync gCreate gMax1.5+ config with 1.1.x 2018-01-22 01:05:12 -06:00
Scott Lahteine
f9dbd4d9f4 Updated FolgerTech i3-2020 config 2018-01-22 01:05:12 -06:00
Scott Lahteine
348b454401 Probe bounds based on bed size 2018-01-22 01:05:11 -06:00
Bob-the-Kuhn
a440522f84
Merge pull request #9284 from Bob-the-Kuhn/DUE-pins-debug 
[2.0.x] PINS_DEBUGGING maintenance
 2018-01-21 18:40:39 -06:00
Scott Lahteine
58ed9901d7 Consistent NEOPIXEL_TYPE options 2018-01-21 17:19:38 -06:00
Scott Lahteine
382a5e3318 Clean up trailing whitespace 2018-01-21 17:19:38 -06:00
Øystein Krog
441517bbe1 Fix DUAL_X_CARRIAGE endstops 
\#8170 fixed
 2018-01-21 15:32:19 +01:00
Scott Lahteine
b46932f0c0
Merge pull request #9273 from thinkyhead/bf2_creality_tuneup 
[2.0.x] Fix and improve Creality configs
 2018-01-21 02:53:16 -06:00
Scott Lahteine
49bcb5ce2d
Merge pull request #9220 from benlye/lcd-timer 
[2.0.x] Fix LCD timer string length
 2018-01-21 02:47:59 -06:00
Scott Lahteine
07db5638e2 Add a heating indicator X offset 2018-01-21 02:04:14 -06:00
Scott Lahteine
c68ce8667d Fix and improve Creality configs 2018-01-21 02:04:14 -06:00
Scott Lahteine
8190fdb260
[2.0.x] Option to use Neopixel as case light (#9270) 
* Add option to use Neopixel as case light

* Apply CASE_LIGHT_USE_NEOPIXEL to example configs
 2018-01-20 16:58:41 -06:00
GMagician
9b519864bf [2.0.x] Relative movements fix (#9259) 2018-01-20 15:22:03 -06:00
Scott Lahteine
887664aa61 Restore broken Dual X Carriage 2018-01-20 15:08:50 -06:00
Scott Lahteine
fb044b6a64 Fix HAL_timer_set_current_count for STM32F1 2018-01-20 14:57:17 -06:00
Scott Lahteine
a8638aa20d Update STM32F1 timer code to use libmaple bb_perip 2018-01-20 14:56:57 -06:00
Scott Lahteine
2e2fd8fd79
Merge pull request #9261 from tcm0116/2.0.x-delta_softstops 
[2.0.x] Allow DELTA to compile with soft endstops disabled
 2018-01-20 14:16:30 -06:00
Scott Lahteine
750cc02b3a
Use delay() in serial temp report 2018-01-20 14:13:17 -06:00
Scott Lahteine
9de8c04945
Allow FIL_RUNOUT_PIN override on RAMPS-based boards 2018-01-20 12:00:59 -06:00
Scott Lahteine
57b61491d3
Set FIL_RUNOUT_PIN for Creality CR10-S 
Tested with M43 and found to be connected to DIO 2
 2018-01-20 11:56:57 -06:00
Scott Lahteine
4a4d832344
Use standard encoder pulses/steps for CR-10S 2018-01-20 11:35:52 -06:00
Thomas Moore
44239b1062 Allow DELTA to compile with soft endstops disabled 2018-01-20 09:40:36 -06:00
Scott Lahteine
4bc4351250
Date refresh 2018-01-20 09:17:57 -06:00
Scott Lahteine
303d792b9f
Merge pull request #9253 from tcm0116/2.0.x-mks_sbase 
[2.0.x] Cleanup MKS-SBASE compile warnings
 2018-01-19 22:37:38 -06:00
Scott Lahteine
afec16e644
Merge pull request #9240 from tcm0116/2.0.x-eeprom 
[2.0.x] Follow-on to #9161
 2018-01-19 22:36:24 -06:00
Scott Lahteine
f2ea8a0529
Merge pull request #9197 from p3p/pr_bf2_operation_freemem 
[2.0.x] LPC1768: Free up some RAM
 2018-01-19 22:35:45 -06:00
Scott Lahteine
0c176c677e
Merge pull request #9231 from GMagician/2.0.x-ramps-pins-fixup 
[2.0.x] Expand RAMP case light possibilities
 2018-01-19 22:29:32 -06:00
Scott Lahteine
f2d09f27bb
Merge pull request #9246 from GMagician/2.0.x-bed-temp-limit-fix 
[2.0.x] Standardized max temp values
 2018-01-19 22:27:19 -06:00
Bob-the-Kuhn
16eb966ee3 PINS_DEBUGGING cleanup for DUE 2018-01-19 21:12:24 -06:00
Thomas Moore
63fd23ab1c Cleanup MKS-SBASE compile warnings 2018-01-19 15:46:34 -06:00
Bob-the-Kuhn
11e68541b0
Merge pull request #9245 from Bob-the-Kuhn/TMC2208-sanity-check-2.0.x 
[2.0.x] add TMC2208 sanity check to AVR
 2018-01-19 15:42:53 -06:00
Thomas Moore
429e6ba8a6 Fix lcd_preheat dummy variable types 2018-01-19 15:24:13 -06:00
GMagician
719cd53e09 Standardized max temp values 
Everywhere in menu items temperatures are "defined value" subtracted by 15.
In one place is subtracted by 5
 2018-01-19 19:32:46 +01:00
Bob-the-Kuhn
0ea9cdf4f2 TMC2208 sanity check 2018-01-19 12:19:34 -06:00
Roxy-3D
7c469c0712
Suggested change to fix Due compile problem 2018-01-18 23:00:03 -06:00
Roxy-3D
bfd9728cf4
Serial buffer over run work around for v2.0.0 (#9236) 
* Work around for serial buffer over run

PronterFace sends a lot of M105 commands.  During long operations such
as UBL's G29 P1, G29 P2, G29 P4 and G26 this can over run the serial
buffer.   This results (very often) in a M1 (actually a M1M105) ending
up in the command queue.

Until we figure out a better way to resolve this issue, this will keep
the UBL commands from experiencing bogus commands at thier completion.
 2018-01-18 19:57:18 -06:00
GMagician
c371bdc499 Expand RAMP case light possibilities 
Pin 6 is only used by servos when 2 or more of them are used
 2018-01-18 18:31:08 +01:00
blye
7c18c2ea5f Fix LCD timer string length 2018-01-17 21:10:45 +00:00
Roxy-3D
9d0cf02fef
Correct mesh size calculations 2018-01-17 09:36:12 -06:00
Scott Lahteine
c7bad74d8f
Merge pull request #9202 from benlye/m73-bugfix 
[2.0.x] Fix progress bar duration when time is exactly 86400s
 2018-01-16 21:14:58 -06:00
Roxy-3D
af9b32e3b9
Give PronterFace time to print the UBL What information... 
Give PronterFace time to print the UBL What information...
 2018-01-16 18:00:57 -06:00
Roxy-3D
acb1e31374
Fix UBL Mesh Size regression 2018-01-16 17:58:15 -06:00
Roxy-3D
f5f1b069ad
Convert UBL mesh tilting to all use the same algorithm (#9204) 
A number of regressions were patched also. The UBL G29 P2 and P4 Press and Hold had stopped working. It is very possible this is broken in the bugfix_v1.1.x branch also.

The main purpose of the Pull Request is to get the 3-Point mesh tilting to use the LSF algorithm just like the grid based mesh tilt. This simplifies the logic and reduces the code size some what. But the real reason to do it is the 3-Point case can be solved exactly. And by feeding these numbers into the LSF algorithm it provides a way to check all that code for 'correctness'.
 2018-01-16 11:08:00 -06:00
blye
554d849827 Fix duration when time is exactly 86400s 2018-01-16 08:12:00 +00:00
Christopher Pepper
6f1bf5d212 LPC1768: Config: default to SDSORT_LIMIT = 64 instead of 256 2018-01-15 22:02:21 +00:00
Christopher Pepper
1e65562d55 LPC1768: HAL: only initialise used HardwareSerial ports 
Misc formatting
 2018-01-15 22:00:59 +00:00
Roxy-3D
9dacd54a50
Get FT-i3-2020 configuration files into compliance with ?_BED_SIZE 2018-01-15 15:33:51 -06:00
Scott Lahteine
d178d6e921 M503 patch for EEPROM_CHITCHAT off 
Fix #9155
 2018-01-15 06:09:25 -06:00
Scott Lahteine
fa432508b0 Followup to Ender config 2018-01-15 06:00:21 -06:00
Thomas Moore
6856eccc77 Master-only TwoWire class for LPC1768 2018-01-15 05:22:03 -06:00
Scott Lahteine
d5bf9e74c4
Merge pull request #8996 from p3p/pr_bf2_more_adc_filter 
[2.0.x] PID control fix and more LPC1768 ADC filtering
 2018-01-15 05:14:25 -06:00
Scott Lahteine
4d2f277d43
Merge pull request #9189 from psavva/tmc_debug_compile_fix 
[2.0.x] Fixes TMC_DEBUG compilation error
 2018-01-15 04:52:21 -06:00
Scott Lahteine
43d3d024ac
Update tmc_util.cpp 2018-01-15 04:51:59 -06:00
Panayiotis Savva
ad500b01e0 Fixes TMC compilation error 2018-01-15 12:43:22 +02:00
Scott Lahteine
f4e4c7a7c8
Merge pull request #9188 from thinkyhead/bf2_creality_ender 
[2.0.x] Add Creality Ender config/board
 2018-01-15 04:33:09 -06:00
Scott Lahteine
2038722c52 LARGE_FLASH obsolete 2018-01-15 03:42:24 -06:00
Scott Lahteine
f887719a40 Creality Ender board support 2018-01-15 03:42:24 -06:00
Scott Lahteine
9a2dd0bc5a Creality Ender 2/4 configuration 2018-01-15 03:42:23 -06:00
Scott Lahteine
2c18faf3e4 General cleanups for HAL 2018-01-15 02:46:37 -06:00
Scott Lahteine
42933c804a Cleanups for STM32F7 2018-01-15 02:46:37 -06:00
Morten
a0246c5c96 Add support for STM32F7 MCU 2018-01-15 01:13:03 -06:00
Scott Lahteine
a27fa80a7e More featureful CR-10S configuration 2018-01-15 01:06:06 -06:00
Scott Lahteine
1a3d2ad275
Merge pull request #9168 from marvin-sinister/rename-M100-2.0.x 
[2.0.x] Rename M200 pins file to uppercase
 2018-01-15 00:49:06 -06:00
Scott Lahteine
a408209d24 More reliable temperature serial report? 2018-01-15 00:43:51 -06:00
Scott Lahteine
5f807e37c5 A second rename saves nine 2018-01-14 23:44:19 -06:00
Scott Lahteine
3ae41e5f7f
Merge pull request #9152 from thinkyhead/bf2_anti_stutter 
[2.0.x] Ensure smooth printer movements
 2018-01-14 23:34:01 -06:00
Scott Lahteine
02ff12d491 More up front option to show SD percentage 2018-01-14 23:32:39 -06:00
Scott Lahteine
3b15c88225
Merge pull request #9153 from thinkyhead/bf2_malyan_support 
[2.0.x] Fix support for Malyan M150
 2018-01-14 22:54:00 -06:00
Scott Lahteine
e753d6298f FLSUN Kossel example configs 2018-01-14 22:52:35 -06:00
Scott Lahteine
77c2d810f9 Bring configs up to date 2018-01-14 22:52:06 -06:00
Scott Lahteine
3952070800 Link to marlinfw.org boot screen tool 2018-01-14 22:41:05 -06:00
Scott Lahteine
0cd397a3f8 Add instructions for Malyan M150 2018-01-14 21:15:03 -06:00
Scott Lahteine
344ebc3bd2 Create and use pins_MELZI_MALYAN.h for Malyan M150 2018-01-14 21:14:58 -06:00
Scott Lahteine
094e9b1dab Remove ARDUINO_ARCH_SAM from serial.h too? 2018-01-14 21:07:10 -06:00