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

4790 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Richard Wackerbarth
b80a6a8d31 Correct Kossel Pro Configuration_adv (PR#2473) 2015-07-22 16:32:08 -05:00
Scott Lahteine
000a6fce46 Extract update_endstops from stepper ISR (PR#2474) 2015-07-19 18:33:18 -05:00
Richard Wackerbarth
adfcfcba95 Merge G2/G3 for Delta (PR#2469) 2015-07-19 16:19:37 -05:00
Scott Lahteine
e83eac312e Move plan_arc next to prepare_move 2015-07-19 16:18:46 -05:00
Scott Lahteine
5c5936508d G2/G3 Arcs for Delta 
- Update prepare_move_delta to take a target argument
- Add Delta support to plan_arc
 2015-07-19 16:18:46 -05:00
Richard Wackerbarth
39092efe88 Merge CORE_XZ (PR#2300) 2015-07-19 16:17:55 -05:00
Scott Lahteine
9f53e2f0c9 Implement COREXZ in stepper.cpp and planner.cpp 2015-07-19 16:17:03 -05:00
Scott Lahteine
fa00e1d97f Explode conditions common to corexy and cartesian 2015-07-19 16:17:03 -05:00
Scott Lahteine
c7dd5527b4 Add a C_AXIS and Z_HEAD to support COREXZ 2015-07-19 16:17:03 -05:00
Scott Lahteine
129f986ccf Add COREXZ option to configurations 2015-07-19 16:17:03 -05:00
Scott Lahteine
69b0490b77 Show minimal preheat options in menus (PR#2471) 2015-07-19 16:14:59 -05:00
Scott Lahteine
9d1d590f43 Merge pull request #2470 from thinkyhead/patch_servo_move 
Patch servos code for move
 2015-07-19 12:10:10 -07:00
Scott Lahteine
eacfe132aa Change the name of servos[] and servo_t 2015-07-19 11:35:48 -07:00
Scott Lahteine
3b23ccd366 Patch servos code for move 
- Have `Servo::attach` explicitly return -1 if it fails
- Check for -1 in `Servo::move` because `servoIndex` might be 0
- Make `attach` / `detach` calls conditional on `SERVO_LEVELING`
- Move `SERVO_LEVELING` define to `Conditionals.h`
 2015-07-19 11:24:23 -07:00
Richard Wackerbarth
54ddc1d417 Simplify DRY RUN (PR#2358) 
Elsewhere DRYRUN turns off the heating elements
and ignores constraints on them.

Here, whenever motion is entered into the planner,
if DRY RUN is set, we instantly act as if the E_AXIS
is in the desired final position.
 2015-07-19 10:15:53 -05:00
Richard Wackerbarth
c2760c3cac Merge Reduce IsDive memory usage (PR#2455) 2015-07-19 10:14:42 -05:00
Scott Lahteine
944090c19c Optimize lsDive logic 2015-07-19 10:13:40 -05:00