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

3645 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
d5bfbf5a59 Added correct dutch translation for calibrate. 2015-06-25 09:12:44 -05:00
Scott Lahteine
149c474e55 Updated Russian language (PR#2325) 
Gleaned from
https://github.com/MarlinFirmware/Marlin/commit/4ac14a7e5fa8e6e395436664
8976eafd1ae220ae
 2015-06-22 23:07:19 -04:00
AnHardt
722829b058 Move buzzing code to buzzr.h & buzzer.cpp (PR#2307) 
at least the lcd independent part from Marlin_main.cpp.
 2015-06-22 22:31:48 -04:00
AnHardt
c461975140 Rename and repair MELZI_1284 (PR#2301) 
to MELZI_MAKR3D.

Fix for #2288
As the normal MELZI also can have a 1284.
 2015-06-22 22:30:07 -04:00
schlotzz
1e9cf905c7 Enable ZigZag AutoBedLeveling on Deltas (PR#2273) 
ZigZag has been disabled by fault due to do_topography_map
 2015-06-15 20:26:25 -05:00
Scott Lahteine
ec93383ec8 Add SanityCheck for bed probe position settings (PR#2282) 2015-06-15 20:22:44 -05:00
Richard Wackerbarth
c2cef42f8e Merge (PR#2285) 2015-06-15 20:21:01 -05:00
Scott Lahteine
dc40a5f6e0 Patch up more outdated config lines 2015-06-15 20:20:32 -05:00
Scott Lahteine
98c9111a7d Update delta configs with latest settings 2015-06-15 20:20:32 -05:00
Scott Lahteine
e6baf8afd9 Fix up allen key settings in delta configs 2015-06-15 20:20:31 -05:00
Scott Lahteine
3b293fc5d1 Move Delta settings lower in delta files 2015-06-15 20:20:31 -05:00
Scott Lahteine
df21857583 Move extruder offset settings next to extruders setting 2015-06-15 20:20:31 -05:00
Scott Lahteine
2dd1859247 Cleanup spaces and comments in configs and conditionals 2015-06-15 20:20:31 -05:00
Scott Lahteine
a274769f4f Clean up spacing and comments 
Also clean up some trailing spaces in a few other sources
 2015-06-15 20:20:31 -05:00
Scott Lahteine
d3bce05d54 Fix up spacing for filament sensor values 2015-06-15 20:20:31 -05:00
Scott Lahteine
b4b10a57fe Fix configurator section directives and values lists 2015-06-15 20:20:31 -05:00
Scott Lahteine
bba14dcbe6 Move Z Safe Homing point to the middle of the movement range 2015-06-15 20:20:31 -05:00
Richard Wackerbarth
06906bc1c8 Merge (PR#2295) 2015-06-15 20:18:21 -05:00
Scott Lahteine
318318b02f Add pins_RAMPS_13_EFB.h to reduce redundancy 2015-06-15 20:17:09 -05:00
Scott Lahteine
346c8b339b Remove a test from pins_RAMPS_13.h 
- Add 3 new lines to `pins.h` to remove 2 redundant tests in
`pins_RAMPS_13.h`
 2015-06-15 20:15:38 -05:00
AnHardt
b93cddfcc9 Add lost MKS_BASE to pins.h (PR#2297) 2015-06-15 10:23:46 -05:00
AnHardt
6ab7b560af Rework buzzing (PR#2296) 
by:
Moving HAS_LCD_BUZZ macro to Coditionals.h
Renaming HAS_LCD_BUZZ to HAS_BUZZER to make clear is has nothing to do with the lcd.
Removing the ULTRALCD condition.

Moving declaration of lcd_buzz() out of the ULTRA_LCD block in ultralcd.h
Moving definition of lcd_buzz() out of the ULTIPANEL block in ultralcd.cpp
Renaming lcd_buzz() to buzz() to make clear is has nothing to do with the lcd.

All buzzing code is now only dependent on the existence of a BEEPER-pin or the definition of a LCD_USE_I2C_BUZZER.

To do: Check the conditions for the BEEPER-pin in all pin-files.
 2015-06-15 06:13:26 -05:00
Scott Lahteine
29122db2fa Fix ULTRA_LCD spelling in HAS_LCD_BUZZ 2015-06-15 06:12:34 -05:00
Richard Wackerbarth
1418470ae9 Merge PR(#2271) 2015-06-14 20:01:40 -05:00
Scott Lahteine
1d94d098bf Formatting tweaks as part of fixing issue 1497 2015-06-14 19:57:27 -05:00
Scott Lahteine
e602c28ad9 Set auto fan pins to OUTPUT during init 
Fixes the problem of these pins being left in INPUT state, as described
in #1497
 2015-06-14 19:57:27 -05:00
Scott Lahteine
90f858aa85 Use translated strings for axis movement (PR#2280) 
Suggest we use the translated strings here. They use (except for
German) the phrasing “Move X” instead of just the axis letter, but they
should fit the available space. The “Extruder” string would be the
same, except it will be translated.
 2015-06-14 08:16:00 -05:00
Scott Lahteine
e2a4a83586 Don't re-apply Z_RAISE_BETWEEN_PROBINGS in probe_pt (PR #2281) 2015-06-12 22:39:35 -05:00
Scott Lahteine
6b1b3adaf0 Consistent punctuation in SanityCheck errors (PR#2283) 2015-06-12 09:31:02 -05:00
MagoKimbra
eb81982fcd Fix error next command in autotune (PR#2274) 
Now send only temperature for T or B, but not send OK.
Host interprets the line to show the right temperature, but not in
response to M105 then stop and send commands until it ends the autotune.
 2015-06-12 07:10:38 -05:00
AnHardt
55b23c896a Optimise out_of_range_error() (PR#2265) 
by avoiding the strncopy()
 2015-06-12 02:20:40 -05:00
filipmu
b0860adab6 Fix volumetric multiplier display for filament sensor (PR#2264) 
The volumetric multiplier display needs to be multiplied by 100 in order to make it an integer for display purposes.
 2015-06-12 02:19:27 -05:00
AnHardt
45642b7fe8 Respect DISABLE_AXIS settings (PR#2216) 
when DEFAULT_STEPPER_DEACTIVE_TIME is over
instead of simply turn off all.
 2015-06-11 11:35:05 -05:00
wurstnase
c85a486445 make the dual z-endstop optional (PR#2277) 
it's disabled by default
 2015-06-10 15:45:59 -05:00
Scott Lahteine
962b107341 Prevent current_command_args from bypassing nul (PR#2270) 2015-06-09 16:07:10 -05:00
Richard Wackerbarth
4061279218 Merge pull request #2260 from Wackerbarth/DropArduino0.x.x 
Deprecate Support for Arduino IDE < 1.0.5
 2015-06-08 17:16:25 -05:00
Richard Wackerbarth
06ae832276 Deprecate Support for Arduino IDE < 1.0.5 
Note that newer versions of the IDE can still
be made to support compilation for the older boards.
 2015-06-08 17:15:28 -05:00
Richard Wackerbarth
4c3ca0b5b6 Deprecate Support for Arduino IDE < 1.0.5 
Note that newer versions of the IDE can still
be made to support compilation for the older boards.
 2015-06-08 17:15:28 -05:00
Scott Lahteine
ff6081be3a Parse N[0-9]+[ ]* differently (PR #2263) 
More general solution to skip N[0-9]+[ ]* in the parser as in #2218
 2015-06-08 17:06:49 -05:00
Richard Wackerbarth
d8e2f5d333 Merge pull request #2167 from thinkyhead/reverse_zoffset_sign 
Reverse the sign of zprobe_zoffset
 2015-06-08 05:10:05 -05:00
Scott Lahteine
aad121864e Include "Z" in M851 report 2015-06-08 05:09:27 -05:00
Scott Lahteine
96a3fba8ac Reverse the sign of zprobe_zoffset 
- When editing on the LCD, minus now means below the nozzle
- Stores the opposite sign in EEPROM, so bumped to “V20”
 2015-06-08 05:09:27 -05:00
Richard Wackerbarth
1ad2c5bfc0 Merge pull request #2257 from fmalpartida/bugFixing 
Updated SAV MkI extension module header connector.
 2015-06-08 05:07:48 -05:00
fmalpartida
f92907183c Updated SAV MkI pin header. 2015-06-08 05:07:11 -05:00
Richard Wackerbarth
58941e543e ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED removed 
#defining something just to define something else doesn’t
make sense

If you want SDCARDDETECTINVERTED, just define it yourself.

If the previous code was intended to define, undefined and then again define the term, that code is improper.
 2015-06-06 21:44:59 -05:00
Richard Wackerbarth
cf5d64d940 Merge PR #2118 2015-06-06 20:14:50 -05:00
CONSULitAS
788eb6e647 planner.cpp: remove tab 
planner.cpp: single evil and hidden tab removed ♻️ 😏
 2015-06-06 20:13:56 -05:00
CONSULitAS
3a5963c0e7 Configuration_adv.h: Add FAN_MIN_PWM for slow fan stopping issue … 
* all Configuration_adv.h: Add #define FAN_MIN_PWM for slow fan stopping
issue
* for K8200: uncommented with tested (and working) values
 2015-06-06 20:13:56 -05:00
CONSULitAS
e55e65d1e4 planner.cpp: Add FAN_MIN_PWM for slow fan stopping issue … 
@CONSULitAS

planner.cpp: Add FAN_MIN_PWM for slow fan stopping issue (V2.1 with
macro and linear scaling)

@thinkyhead thanks for idea on linear scaling
 2015-06-06 20:13:56 -05:00
Richard Wackerbarth
5239a4e839 Merge bPR #1882 2015-06-06 19:47:07 -05:00