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

9507 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard Marko
dd22cbbfb8 makefile: add buzzer.cpp (PR#2479) 2015-07-30 07:56:44 -05:00
Scott Lahteine
9f48798ffd Replace ENABLED with DEFINED for SERVO_ENDSTOPS (PR#2542) 2015-07-30 07:55:29 -05:00
Scott Lahteine
22b9fd97b2 Remove usage restriction to comply with GPL 
Discussion at #2541
 2015-07-30 07:54:09 -05:00
Richard Wackerbarth
3c1653207c Merge Memory Watcher (PR#2398) 2015-07-27 20:33:20 -05:00
Richard Wackerbarth
ae00fad75b Rename as M100 2015-07-27 20:31:59 -05:00
Richard Wackerbarth
a401d738df There is an echo in here 2015-07-27 20:31:59 -05:00
Richard Wackerbarth
ed7d45e8f5 Memory watcher 2015-07-27 20:31:59 -05:00
AnHardt
d17f7ebc8a Multiply WATCH_TEMP_PERIOD by 1000UL (PR#2535) 
instead of 1000.  Else we get errors with times over 32 seconds.
 2015-07-27 20:30:53 -05:00
Scott Lahteine
bea6739774 Don't include Z_RAISE_AFTER_PROBING if not used (PR#2527) 2015-07-27 20:24:33 -05:00
Scott Lahteine
81bba7ed88 More sanity checking for extruder requirements (PR#2531) 2015-07-27 10:14:43 -05:00
Richard Wackerbarth
78b7c486fd Merge Translate additional Displays (PR#2529) 2015-07-26 20:42:11 -05:00
AnHardt
87a97f3724 Fix conditions for display strings 2015-07-26 20:41:21 -05:00
AnHardt
aaccea0260 Shift some display only strings from language.h to lenguage_en.h 
and translate them to German.
 2015-07-26 20:41:15 -05:00
Scott Lahteine
e4c01f1c7e Simplify init with ARRAY_BY_EXTRUDERS1 macro (PR#2507) 2015-07-26 20:40:27 -05:00
Scott Lahteine
ab6f1fdf8b Move & document ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED (PR#2528) 
As suggested in #2521
- Move `ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED` because `SDSUPPORT` is
also required.
- Add a note that endstops must be enabled for the feature to have any
effect
 2015-07-26 20:36:37 -05:00
Richard Wackerbarth
096046c09f Merge Improve Makefile use of avrdude (PR#2477) 2015-07-26 20:32:10 -05:00
Richard Marko
1183c10a2e makefile: drop -q -q (much quiet) from avrdude flags 
Annoying when trying to figure out if uploading
actually does something.
 2015-07-26 20:31:31 -05:00
Richard Marko
0e064357f4 makefile: use /etc/avrdude/avrdude.conf on linux 
No need to look for arduino specific avrdude configuration
as distributions ship their own avrdude.conf file that
is compatible with arduino.
 2015-07-26 20:31:31 -05:00
Richard Wackerbarth
960de3411b Merge Temp Sanity Checks (PR#2514) 2015-07-25 21:18:32 -05:00
Scott Lahteine
bcb7d5a149 Improve sanitycheck for TEMP_SENSOR_1 2015-07-25 21:17:36 -05:00
Scott Lahteine
5b24f59401 Add sanity checks for temp sensors 2015-07-25 21:17:36 -05:00
AnHardt
fd0e81b0c7 Distinguish between BUZZER and SPEAKER (PR#2513) 
A speaker needs a AC or a pulsed DC to make a sound, a buzzer only needs a DC.
A buzzer has it's own resonator. It works in most cases to feed the buzzer with a pulsed DC, but the sound will not be as loud as with pure DC.

There seem to be boards where the BEEPER-pin is not able to handle a PWM. Obviously intended for a buzzer.
To make these board able to handle a speaker

* replace the PWM based tone()-function again with a on-delay-off-delay loop.

Hopefully the last time I touch the beeper code.
 2015-07-24 22:10:04 -05:00
Richard Wackerbarth
53d9c9ff23 Merge G29 Ending Position (PR#2498) 2015-07-24 22:08:30 -05:00
Scott Lahteine
e2957df05c Shorthand for do_blocking_move_to 2015-07-24 22:07:41 -05:00
Scott Lahteine
819c5b9b50 Adjust comment on Z adjustment 2015-07-24 22:07:41 -05:00
Scott Lahteine
5a7356b6fc Patch for G29 final Z position 
Include all the necessary pieces to get the final Z position after
probing the bed, and add commentary about other possible changes.
 2015-07-24 22:07:41 -05:00
Richard Wackerbarth
d233976737 Merge Servo Corrections (PR#2510) 2015-07-24 22:05:53 -05:00
AnHardt
088e09e052 Add forgotten Marlin_main.cpp 2015-07-24 22:04:49 -05:00
AnHardt
8b876241bd Some more servo code tweaks 
Just set up the pin. Don't move to a random position.

Simplify servo::move()
* servo::move() does not need the pin parameter - The pin is set during servo_init() with attach().
* servo::move() does not need a return value.

SERVO_LEVELING is the wrong condition to deactivate the servos.

Remove some temporary (Servo *) variables.
SanityCheck for the servo indexes.
 2015-07-24 22:04:49 -05:00
Scott Lahteine
b116c096bd Reduce set_homing_bump_feedrate, save 42 bytes (PR#2512) 
Updates to `set_homing_bump_feedrate`:
- Move the string into Program Memory, reduce length by 31 bytes
- Use an auto to get the divisor, adjust it on error
- Set feedrate once, at the end
 2015-07-24 22:00:25 -05:00
Scott Lahteine
f7e7862588 Better Sanguinololu & Graphical Controller (PR#2504) 
- Change suggested at
https://github.com/MarlinFirmware/Marlin/issues/2482#issuecomment-123553
266
 2015-07-23 23:47:07 -05:00
Scott Lahteine
a1154d4a20 Enable Y and sanity-check CoreXZ (PR#2509) 2015-07-23 23:46:27 -05:00
Richard Wackerbarth
0a7f2a8be7 Merge MegaController & MINIPANEL (PR#2508) 2015-07-23 22:52:51 -05:00
Scott Lahteine
932f1c109e Move servos to the top in pins_MEGACONTROLLER.h 2015-07-23 22:51:41 -05:00
Scott Lahteine
90f8ddfc1e Apply MINIPANEL to other configs 2015-07-23 22:51:41 -05:00
AndySze
00dbf69b6d add MINIPANEL defines 2015-07-23 22:51:40 -05:00
AndySze
8ac5e56934 fixed some format problems and cleaned code 2015-07-23 22:51:40 -05:00
AndySze
eef595aa64 add makerlab mega controller pin configs 2015-07-23 22:51:40 -05:00
Richard Wackerbarth
a0120a533c Merge CORE_XZ (PR#2503) 2015-07-23 19:53:33 -05:00
AnHardt
4e14e152fa Add Travis tests for CORXY and COREXZ 2015-07-23 19:52:48 -05:00
AnHardt
27d7d2ccab Correct bracketing for COREXY-XZ 2015-07-23 19:52:21 -05:00
Scott Lahteine
469843427d Reduce code in gcode_M81 (PR#2497) 2015-07-23 08:14:00 -05:00
Scott Lahteine
c66955aaf9 Mark unchanging arrays as const (PR#2494) 
The compiler may be able to optimize if it knows an array won’t be
changing.
 2015-07-22 21:37:37 -05:00
Richard Wackerbarth
72b9e3a6ac Merge Configuration Macros (PR#2495) 2015-07-22 18:17:27 -05:00
Scott Lahteine
278aa15301 Add COUNT macro and apply 2015-07-22 18:16:05 -05:00
Scott Lahteine
d85861d296 Move macros, add ENABLED/DISABLED, add includes 2015-07-22 18:16:05 -05:00
Scott Lahteine
17960fd2b0 Neaten up pins_MEGATRONICS.h (PR#2493) 2015-07-22 17:23:22 -05:00
Scott Lahteine
aac2b9aa9d Reduce code in gcode_M84 (PR#2492) 
`gcode_M84` only needs to call `finishAndDisableSteppers`, which calls
all the other functions.
 2015-07-22 17:22:01 -05:00
Scott Lahteine
4971fa73f9 Add a sanitycheck error for old servo settings (PR#2491) 
- Documentation solution for #2476
 2015-07-22 16:35:10 -05:00
Scott Lahteine
96ace72ddc Servos attach/detach based only on servo config 
Assuming #2470 fixed up the main issue.
 2015-07-22 16:34:26 -05:00