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

3016 commits

Author SHA1 Message Date
RicardoGA
e09ff79635 Update pins_RAMPS_13.h (PR#64) 
Now all ramps configuration can enable Filament sensor not only EEB
 2015-08-10 05:53:01 -05:00
Fourmi
e6aed7bb4e Update thermistortables for Hisens Thermistor (PR#2588) 2015-08-09 18:11:14 -05:00
Richard Wackerbarth
9d8cc24abf Continue from the line following the M999 (PR#60) 
If the printer is going to accept the M999,
then it should continue from that line number.
 2015-08-08 08:08:02 -05:00
wurstnase
f3ab1dba54 Z babystepping for coreXY (PR#47) 
only X and Y were not implemented
 2015-08-04 20:10:09 -05:00
Richard Wackerbarth
35afea1c0e Restore test 
PR#2572 Changed this because of faulty Boolean Logic

NOT(A OR (NOT B) OR (NOT C)) !=

(NOT A) AND ((NOT B) OR C))


Besides, the compiler should be smart enough to
optimize this without help from the programmer
 2015-08-04 15:22:56 -05:00
Scott Lahteine
6af75f4b5d Squish down deprecated tests in sanity check 2015-08-03 16:04:48 -05:00
Scott Lahteine
edeb58288e Use PIN_EXISTS in sanity check 2015-08-03 16:04:48 -05:00
Scott Lahteine
c30b7693e0 Clean up RUMBA pins conditions 2015-08-03 16:04:48 -05:00
Scott Lahteine
46453905d6 Apply remaining ENABLED/DISABLED conditionals 2015-08-03 16:04:48 -05:00
Richard Wackerbarth
b227d8c128 Supply a VERSION in a short form for displays 
The long descriptor will still be available in M115
 2015-08-03 08:21:09 -05:00
Richard Wackerbarth
cd7828a928 This will be the 1.1.0 Release rather than 1.0.3 2015-08-03 08:08:38 -05:00
Richard Wackerbarth
4e2f5618c1 Pick up Default_version when needed 2015-08-03 08:08:37 -05:00
Richard Wackerbarth
329acc852e Canonize Option flag USE_AUTOMATIC_VERSION 2015-08-03 08:08:37 -05:00
Richard Wackerbarth
5a11d32a85 Move deprecation test to SanityCheck.h 2015-08-03 08:08:37 -05:00
Richard Wackerbarth
7bb7a52940 Bring config up-to-date 2015-08-03 07:35:33 -05:00
AnHardt
244ea2014a Boot-screen for text-displays improvements 
Centred the logo for 16x4 and 20 x4.
Moved version to the bottom line
Code shrink to 704 bytes.
 2015-08-03 07:13:00 -05:00
AnHardt
80f2a20842 Enable bootscreen in all Configurations 2015-08-03 07:13:00 -05:00
AnHardt
2684d061ed Scroll too long strings on bootscreen 2015-08-03 07:13:00 -05:00
AnHardt
4f46df5dab Make bootscreen configurable for the graphic displays 
Saves about 473 byte of progmem and 28 bytes of RAM.
 2015-08-03 07:13:00 -05:00
AnHardt
09571b7753 Boot-screen for the character displays 
Uses about 488 byte of progmem and 32 byte of RAM.
For that configurable.
 2015-08-03 07:13:00 -05:00
Richard Wackerbarth
866efc14fe Add Danish translations 2015-08-03 07:06:17 -05:00
Scott Lahteine
267f3479d7 Adjust spacing in pins_RAMPS_13.h 2015-08-02 23:26:58 -05:00
Scott Lahteine
56702e7bb9 Define servo pins just like other pins 2015-08-02 23:26:58 -05:00
Richard Wackerbarth
4b9d5cd352 Use lowercase names for serial instances 2015-08-02 23:01:39 -05:00
Scott Lahteine
1e2deff4fd Rename BTENABLED to BLUETOOTH 
- For some reason it’s easy to forget what BT stands for, but it
doesn’t need an abbreviation.
 2015-08-02 22:56:50 -05:00
Scott Lahteine
68055a5959 Include RIGIDBOT_PANEL in Conditionals 2015-08-02 22:26:41 -05:00
George Djabarov
f8ed3a835d Added comment with the RigidBot Big bed size 2015-08-02 22:13:37 -05:00
George Djabarov
7deae6b6be Updated RigidBot example configuration 
- The default serial baud rate of 115200
- The regular RigitBot bed size 254mm/248mm/254mm
- Single stock extruder
- Stock termistors for extruder and hotbed
- Stock Min X/Y/Z stops. Max stops not connected
- Stock 32 teth tooleys (stock axis steps)
- No auto bed leveling
- No screen
 2015-08-02 22:13:37 -05:00
Scott Lahteine
5418faa1f9 Add sanity checks for old names 2015-08-02 22:09:08 -05:00
Scott Lahteine
f03e063750 Rename BEEPER to BEEPER_PIN 
For consistency with other pins, allowing use of `PIN_EXISTS` macro.
 2015-08-02 22:09:08 -05:00
Scott Lahteine
270c766de2 SDCARDDETECT -> SD_DETECT, added docs 
- `SD_DETECT_PIN` replaces `SDCARDDETECT`
- `SD_DETECT_INVERTED` replaces `SDCARDDETECTINVERTED`
- Revise the description of `SD_DETECT_INVERTED`
- Add a note about the override of `SD_DETECT_INVERTED` in
`Conditionals.h`
 2015-08-02 21:59:41 -05:00
Scott Lahteine
496fc28dc3 Tweaks to pins comments 2015-08-02 21:34:13 -05:00
Scott Lahteine
8d3b74cc6e Rename SDCARDDETECT to SDCARDDETECT_PIN 
- Rename the pin so it can be tested with `PIN_EXISTS`
- Fix some incorrect tests for `SDCARDDETECT`
 2015-08-02 21:34:13 -05:00
Scott Lahteine
0f5ada8cbd Group the fail case in one negation (PR#2572) 2015-08-01 18:55:50 -05:00
AnHardt
7ddf1cda1d Improve condition for SERVO_LEVELING (PR#2570) 2015-07-31 22:41:34 -05:00
Richard Wackerbarth
f32048b8f5 In for a penny, in for a pound 2015-07-31 17:13:53 -05:00
Scott Lahteine
e944f960de Add a sanity check for old name "BEEPER" 2015-07-31 17:13:53 -05:00
Scott Lahteine
8ebf0b92be Spacing adjustments in some pins files 2015-07-31 17:13:53 -05:00
Scott Lahteine
94a796c8cc Rename BEEPER to BEEPER_PIN 
For consistency with other pins, allowing use of `PIN_EXISTS` macro.
 2015-07-31 17:13:53 -05:00
Richard Wackerbarth
b217474eab Compiler Complaints about concatenated tokens (PR#2566) 2015-07-31 17:08:44 -05:00
Scott Lahteine
2460f82d8b Make proper distinction between BEEPER and HAS_BUZZER 2015-07-31 01:24:33 -05:00
Scott Lahteine
58cfcd4239 Overridable Options - Part 5 
Apply `ENABLED` / `DISABLED` macros to files needing only a small
number of changes.
 2015-07-31 01:24:20 -05:00
Scott Lahteine
5e834352a9 Overridable Options - Part 11 (PR#2563) 
Apply `ENABLED` / `DISABLED` macros to EEPROM-related files.
 2015-07-31 01:07:04 -05:00
Scott Lahteine
bf6eb93c61 Overridable Options - Part 10 (PR#2562) 
Apply `ENABLED` / `DISABLED` macros to planner files.
 2015-07-31 01:06:29 -05:00
Scott Lahteine
51e89a269c Overridable Options - Part 9 (PR#2561) 
Apply `ENABLED` / `DISABLED` macros to temperature-related files.
 2015-07-31 01:05:55 -05:00
Scott Lahteine
c35fb88094 Overridable Options - Part 8 (PR#2560) 
Apply `ENABLED` / `DISABLED` macros to stepper-related files.
 2015-07-31 01:05:22 -05:00
Scott Lahteine
0d8989fc14 Overridable Options - Part 7 (PR#2559) 
Apply `ENABLED` / `DISABLED` macros to LCD-related files.
 2015-07-31 01:04:37 -05:00
Scott Lahteine
b4abb0ae7f Apply ENABLED / DISABLED to Marlin core files (PR#2558) 2015-07-31 01:03:58 -05:00
Scott Lahteine
c0d7ea3e7e Overridable Options - Part 4 (PR#2556) 
Apply `ENABLED` / `DISABLED` / `HAS_SERVOS` macros to pins files.
 2015-07-31 00:44:53 -05:00
Scott Lahteine
4b40964064 Overridable Options - Part 3 (PR#2555) 
Apply `ENABLED` / `DISABLED` macros to language-related files.
 2015-07-31 00:19:13 -05:00
Scott Lahteine
32683b282b Include configurator copies of configs 2015-07-31 00:03:36 -05:00
Scott Lahteine
37d1879386 Apply overridables to Configuration files 2015-07-31 00:03:36 -05:00
Scott Lahteine
9d151bb61b servo_endstop_angles -> servo_endstop_angle 2015-07-30 23:35:57 -05:00
Scott Lahteine
9334479aeb Minor cleanup of Conditionals.h 2015-07-30 23:35:57 -05:00
Scott Lahteine
1f63293624 servo_endstops -> servo_endstop_id 2015-07-30 23:35:57 -05:00
Scott Lahteine
edaaead7e0 Fix comment about SERVO_ENDSTOP_ANGLES 2015-07-30 23:35:57 -05:00
Scott Lahteine
ed4a6371ad Add HAS_SERVO_ENDSTOPS to simplify conditonals 2015-07-30 23:35:57 -05:00
Scott Lahteine
70be61d416 Reset filament_size with a loop 2015-07-30 23:31:58 -05:00
Scott Lahteine
ae9274be05 Fix minor compiler warnings in for loops 2015-07-30 23:31:58 -05:00
Scott Lahteine
c7c8cfed6f Complete M200 output with M503 
- The contents of EEPROM include filament diameters even with
Volumetric disabled. This change makes `M503` display the full
volumetric settings so that playing back the output of `M503 S0` will
fully restore them.
 2015-07-30 23:31:58 -05:00
Scott Lahteine
4a58e447a1 Add array size to servo_endstop_angles (PR#2553) 2015-07-30 23:27:38 -05:00
Andrew Lenharth
a0ae9e30df don't pass integer by reference, inefficient. (PR#2547) 2015-07-30 17:51:12 -05:00
AnHardt
d03f037a92 Get rid of malloc() and free() (PR#2549) 
Just the minimal changes to qr_solve.cpp and .h to get rid of malloc() and free().

Saves about 656 bytes of progmem (library-code)
and 22 bytes for static variables.

Should use exactly the same amount of stack as it did before on the heap.
 2015-07-30 17:50:31 -05:00
Scott Lahteine
3b2b2313ff Combine if block related to SERVO_ENDSTOPS 2015-07-30 16:39:05 -05:00
Scott Lahteine
0af2a80e06 Make SERVO_ENDSTOP_ANGLES 2-dimensional 2015-07-30 16:38:56 -05:00
Richard Wackerbarth
525d0dc239 Configurator is out-of-date AGAIN (PR#2550) 2015-07-30 16:36:01 -05:00
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
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
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 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
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
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
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
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
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