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

3226 commits

Author SHA1 Message Date
Scott Lahteine
8eaba020fb Merge pull request #2973 from thinkyhead/fix_splash_url 
Remove references to marlinfirmware.org
 2016-02-17 17:05:06 -08:00
Scott Lahteine
438a87eba8 Sanity check deprecated SDSLOW, SDEXTRASLOW 2016-02-17 14:54:10 -08:00
Scott Lahteine
b19b272172 Update configurations with SPI_SPEED 
- Include aligned comment about new SDSUPPORT behavior
 2016-02-17 14:54:09 -08:00
Scott Lahteine
7f30f85602 Merge pull request #2987 from thinkyhead/gcode_allow_no_initial_space 
Fix handling of spaces in GCode
 2016-02-17 14:51:19 -08:00
Scott Lahteine
b81d3b83cf Drop the experimental Configurator 
Development moved to https://github.com/thinkyhead/MarlinConfigurator
 2016-02-17 14:49:37 -08:00
Scott Lahteine
be691b51f1 Remove references to marlinfirmware.org 
The domain is gone and doesn’t redirect, so for now show no URL on the boot screen.
 2016-02-17 14:41:46 -08:00
Scott Lahteine
f3f58bd619 Merge pull request #2992 from thinkyhead/rc_rename_fpos_t 
Rename fpos_t to avoid libc conflict
 2016-02-17 14:40:33 -08:00
Scott Lahteine
83ffc9eb4f Show raw steps in M114 
This is a proposed change. This section of M114 output is a debug
extension according to RepRap wiki.
 2016-02-15 15:59:24 -08:00
Scott Lahteine
373e8a1ad4 Fixes for COREXY and COREXZ coordinates 2016-02-15 15:59:24 -08:00
unknown
31656e68bc Fix for homing X and Y before raising Z when Z_SAFE_HOMING is set. 2016-02-15 15:53:40 -06:00
unknown
8ea55323d8 Fix for not raising Z before homing X and Y 2016-02-15 14:52:04 -06:00
Scott Lahteine
b83e472bd3 Rename fpos_t to avoid libc conflict 2016-02-10 20:49:25 -08:00
Scott Lahteine
68457ee903 For Dual Y/Z use the next available extruder pins 2016-02-09 21:59:09 -08:00
Scott Lahteine
711e5db19a Tweak comment in process_next_command 2016-02-09 18:16:35 -08:00
Scott Lahteine
400e9329be Allow spaces after a code letter 2016-02-09 18:03:13 -08:00
Scott Lahteine
cdcb80f3c5 Allow no-space after initial command 
Addresses issue #2715
 2016-02-09 18:00:35 -08:00
AnHardt
6f473f7fc6 Repair N in ADVANCED_OK 
Send the correct line number.
If no N was in the command - non't send an N.
 2016-02-09 19:23:26 +01:00
AnHardt
efbd705eda Replace the "ok" in M280, M301, M304, M851 with output not including an "ok" 
Replace the "ok" in M280, M301, M304, M851 with output not including an "ok"
to avoid senting two "ok"s for a single g-code.

Doing the same for M105 would break the input filters of the hosts.
For M105 the other "ok" is omitted.
 2016-02-09 13:36:03 +01:00
Scott Lahteine
8e66028d25 Apply the ABL rotation matrix to the extruder offset. 2016-02-08 14:22:18 -08:00
esenapaj
ab5aa3fc92 Merge pull request #5 from MarlinFirmware/RCBugFix 
Rc bug fix
 2016-02-08 05:42:11 +09:00
esenapaj
27d918d836 Merge pull request #4 from MarlinFirmware/RCBugFix 
Rc bug fix
 2016-02-08 05:35:32 +09:00
Scott Lahteine
159ff94afd Remove obsolete HEATER_BED_DUTY_CYCLE_DIVIDER #2977 2016-02-07 08:02:11 -06:00
Ruwan J Egoda Gamage
1270fbfd38 Using SET_INPUT instead of pinMode 2016-02-07 07:58:52 -06:00
Ruwan J Egoda Gamage
b58083b0fa Getting rid of SDEXTRASLOW, SDSLOW variables. 2016-02-07 07:58:52 -06:00
Ruwan J Egoda Gamage
1833049b8a reusing millis() 2016-02-07 07:58:52 -06:00
Ruwan J Egoda Gamage
1b7c443628 Adding SDULTRASLOW variable. 
Instead of changing SDEXTRASLOW variable to a slower speed,  the new
SDULTRASLOW is used for rigidbot panel.
 2016-02-07 07:58:52 -06:00
Ruwan J Egoda Gamage
6f9e9c0e4f Cleaning up, getting rid of the fake encoder count variable. 2016-02-07 07:58:52 -06:00
Ruwan J Egoda Gamage
becbfe1065 Fixing Rigidbot LCD Panel Support 2016-02-07 07:58:52 -06:00
esenapaj
4882a7eded more suitable display format for delta printer 2016-01-29 18:38:25 +09:00
esenapaj
d7272e3f36 Merge pull request #3 from MarlinFirmware/RCBugFix 
Rc bug fix
 2016-01-29 05:43:22 +09:00
Scott Lahteine
62bad1b60f Merge pull request #2848 from japzi/RCBugFix 
Fixing Rigidbot LCD Panel Support
 2016-01-26 17:30:12 -08:00
esenapaj
59d345a3dd Update Configuration.h 2016-01-22 07:27:11 -06:00
esenapaj
b8f0c8a4c7 Update Configuration.h 2016-01-22 07:27:11 -06:00
esenapaj
df0d599c79 Update Configuration.h 2016-01-22 07:27:11 -06:00
esenapaj
a366697649 Update Configuration.h 2016-01-22 07:27:11 -06:00
Richard Wackerbarth
7c94c83765 Repair formula mangled by PR#1319 in Jan 2015 2016-01-15 10:06:27 -06:00
Naruto-kyun
2932602643 Update stepper.cpp 
Forgot Z2_MIN_PIN
 2016-01-15 16:50:43 +01:00
Ruwan J Egoda Gamage
06555febdd Using SET_INPUT instead of pinMode 2015-12-24 12:12:25 -05:00
esenapaj
8d2aa2368d Update Configuration_adv.h 2015-12-23 08:16:36 +09:00
esenapaj
0de5fcad0a Update Configuration_adv.h 2015-12-23 08:16:06 +09:00
esenapaj
1403b9acc0 Update Configuration_adv.h 2015-12-23 08:15:20 +09:00
esenapaj
5cf1c38ea1 Update Configuration_adv.h 2015-12-23 08:12:54 +09:00
esenapaj
04ab61bf40 Update Configuration_adv.h 2015-12-23 08:12:28 +09:00
esenapaj
39c62fbd6f Update Configuration_adv.h 2015-12-23 08:12:04 +09:00
esenapaj
efcb769003 Update Configuration_adv.h 2015-12-23 08:09:57 +09:00
esenapaj
992fbb831d Update Configuration_adv.h 2015-12-23 08:08:45 +09:00
esenapaj
5ee6fe6385 Update Configuration_adv.h 2015-12-23 08:07:12 +09:00
esenapaj
056daf00fc Update Configuration_adv.h 2015-12-23 08:06:15 +09:00
esenapaj
71aafb79a0 Update Configuration_adv.h 2015-12-23 08:03:54 +09:00
Ruwan J Egoda Gamage
2c9e0415c7 Getting rid of SDEXTRASLOW, SDSLOW variables. 2015-12-13 23:23:01 -05:00
Ruwan J Egoda Gamage
a64bcd53e9 reusing millis() 2015-12-13 22:06:03 -05:00
Ruwan J Egoda Gamage
e6cc232184 Adding SDULTRASLOW variable. 
Instead of changing SDEXTRASLOW variable to a slower speed,  the new
SDULTRASLOW is used for rigidbot panel.
 2015-12-13 15:47:10 -05:00
Ruwan J Egoda Gamage
83c4131ba3 Cleaning up, getting rid of the fake encoder count variable. 2015-12-13 15:28:40 -05:00
Ruwan J Egoda Gamage
5eeea2f611 Fixing Rigidbot LCD Panel Support 2015-12-13 15:28:40 -05:00
Richard Wackerbarth
f6950acb8e Residual unused variable — Backport 2015-12-10 19:48:08 -06:00
Richard Wackerbarth
7a670e3911 Improve planner & stepper PR #263 2015-12-10 07:24:37 -06:00
Richard Wackerbarth
58658c9279 Call the probe pin a probe pin and not a min endstop 2015-12-10 07:20:52 -06:00
Richard Wackerbarth
0fa3bac8ee If unused, just don’t define it. 2015-12-10 07:20:52 -06:00
Richard Wackerbarth
3b2973da6a Prepare Ramps for user redefinition 2015-12-10 07:20:52 -06:00
Richard Wackerbarth
1635613c25 Backport cosmetic 2015-12-10 07:20:52 -06:00
Richard Wackerbarth
0b429461d5 Back port Cosmetic changes 2015-12-10 07:20:52 -06:00
Richard Wackerbarth
0cebe85e65 Clean up spacing and duplicate entries 
• Removing trailing whitespace
• Adjusting indention for better readability
• Removing duplicated entries
 2015-12-10 07:20:52 -06:00
Richard Wackerbarth
e7b40bbe98 Change link to U8glib source 2015-12-10 06:33:29 -06:00
Richard Wackerbarth
e2da2b4105 Back port language translation 2015-12-10 06:31:41 -06:00
Richard Wackerbarth
4f314afaf0 Allow Thermistor #12 to be used on hotends also 
//100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)

Caveat Emptor —- 
I’m not sure that this really makes sense,
but why keep someone from using it?
 2015-12-10 06:31:31 -06:00
Scott Lahteine
60d5658da8 Revert nozzle_bed_fan_menu_items 
For some reason that I cannot determine, using a sub-function causes
the Tune sub-menu to act strangely, yet replacing the function call
with its code content works perfectly.
 2015-12-09 20:33:52 -06:00
AnHardt
57da1b8497 Host parseble output for M109, M190 and M303 
Make the output of M105 more similar to Repetier.
Make the text-print pert of M105 an extra function to make it reusable. `print_heaterstates()`
Use `print_heaterstates()` in M019, M190 and M303
 2015-12-07 15:37:53 -06:00
AnHardt
fcceb98191 Unglobalize no_wait_for_cooling 2015-12-07 15:34:26 -06:00
Wurstnase
78a347a01a change nx, ny, nz and ne from float to long 
st_set_position takes long
```void st_set_position(const long& x, const long& y, const long& z, const long& e)```
 2015-12-07 08:22:44 -06:00
Wurstnase
6d691aceee change dx, dy, dz and de from float to long 
anything is long, we don't need float there
 2015-12-07 08:22:24 -06:00
Richard Wackerbarth
6bfcb74c25 The probe stowing coordinates have changed 2015-12-05 19:31:59 -06:00
Wurstnase
0fbfb22506 Renaming delta speeds (PR2824) 
dx -> dsx
dy -> dsy
dz -> dsz
de -> dse
 2015-12-04 07:55:45 -06:00
AnHardt
8d1eeff021 Fix status LEDs update when reinitializing the display 
Fix status LEDs update when reinitializing the display

By using the regular update function during init.

Fixing #2683
 2015-12-03 07:18:35 -06:00
Richard Wackerbarth
5a54204f72 Marlin 1.1.0 Release Candidate 3 - 01 December 2015 2015-12-01 07:24:45 -06:00
AnHardt
bb4efcf603 Handle temp callbacks when THERMAL_PROTECTION_HOTENDS is not defined 
by alternate definition for the callback macros
 2015-12-01 07:21:52 -06:00
AnHardt
96d0d04b8f Update LCD buttons less frequently 
Move slow_buttons_update into the LCD_UPDATE_INTERVAL block
lcd_implementation_read_slow_buttons() will then be executed ~10 times a
second.
 2015-11-30 05:44:32 -06:00
Richard Wackerbarth
e293ea57f0 Unbalanced brackets in setPwmFrequency 
This is a back port of the correct in issue #248
 2015-11-30 05:44:32 -06:00
AnHardt
c956b52c4a Babystep Multiplier 
Analog to https://github.com/MarlinFirmware/MarlinDev/pull/250 by
@RicardoGA

Restore the Babystep Multiplicator functionality and now it's available
for X/Y/Z
 2015-11-30 05:43:10 -06:00
Richard Wackerbarth
956418c674 Kc is also a multi-PID parameter 2015-11-23 06:08:01 -06:00
AnHardt
33addc52a1 Suppress Z_MIN_PROBE_REPEATABILITY_TEST for DELTA and SCARA configurations (PR#2747) 
For now Z_MIN_PROBE_REPEATABILITY_TEST is not possible for DELTA or SCARA
configurations.
This PR comments the feature out, where it is commented in by default.
 2015-11-13 07:33:33 -06:00
AnHardt
8da2e98985 Split RAMPS 1.3 an 1.4 (PR#2741) 
because of hardware differences on the SERVO0_PIN
 2015-11-13 07:13:48 -06:00
AnHardt
be7167ed97 Change XY formatting on LCD (PR#2740) 
According to #123 negative values for XY at or below -100 are displaying incorrectly, dropping the first digit. Deltas can easily have XY values in this range. This PR adds a function to display floats/ints formatted like `_123`, `-123`, `_-12`, or `__-1` as appropriate and applies it to the XY coordinates on Hitachi displays. It also moves the Z value to the right to be consistent with the XY formatting.
 2015-11-13 06:46:11 -06:00
Luis Correia
e7099ea597 Fix Portuguese (Portugal) strings (PR#2700) 
Align strings with release
 2015-11-12 00:08:42 -06:00
Scott Lahteine
754b13d8fe Patch issue #2315 2015-11-12 00:03:22 -06:00
Scott Lahteine
dbd4c17096 Init Kp, Ki, Kd to 0 2015-11-12 00:03:22 -06:00
Scott Lahteine
644c376e84 Use binary OR with endstop bits 2015-11-12 00:03:22 -06:00
Scott Lahteine
54a39d8c1a Use a ternary in qr_solve.cpp 2015-11-12 00:03:22 -06:00
Scott Lahteine
17c23bbaf3 Shorten gcode_M221 yet function the same 2015-11-12 00:03:22 -06:00
Scott Lahteine
c0e791dbe9 Only look for "N" line number as first parameter 2015-11-12 00:03:22 -06:00
Scott Lahteine
b4af4441c5 Clean up watchdog impl. 2015-11-12 00:03:22 -06:00
Scott Lahteine
8f16563bbd Use "defined" with LCD_PIN_BL and LCD_PIN_RESET 2015-11-12 00:03:22 -06:00
Scott Lahteine
6fa7e24af3 Use "UNUSED" to squash compiler warnings 2015-11-12 00:03:22 -06:00
Scott Lahteine
d5b7c595ae Use static locals in utf_mapper.h 2015-11-12 00:03:21 -06:00
Scott Lahteine
9bdab4f3a8 Clean up "else" and other spacing 2015-11-12 00:03:21 -06:00
Scott Lahteine
9b23490f01 Clean up spacing in configs 2015-11-12 00:03:21 -06:00
esenapaj
c6c37abd41 Update language_kana.h 2015-11-12 00:00:51 -06:00
esenapaj
c24045475a Update language_kana_utf8.h 2015-11-12 00:00:32 -06:00
Richard Wackerbarth
25d636c9e0 Compiler issues (PR#2696) 2015-11-11 23:52:11 -06:00
AnHardt
47401ec97b MSG_EXTRUDER_SWITCHED_OFF was renamed to MSG_REDUNDANCY 
in language.h, but was not renamed here. If TEMP_SENSOR_1 is enabled as redundant then
an error is thrown that MSG_EXTRUDER_SWITCHED_OFF is not defined.

Originaly by @12dstring
 2015-10-08 10:45:11 -05:00
Scott Lahteine
ba6a243197 DEBUG message has no parameter (PR#2671) 2015-10-03 22:03:03 -05:00
Scott Lahteine
0c7f7ebcfb Styling adjustments (PR#2668 & PR#2670) 
Keep "astyled" reformatting
 2015-10-03 22:02:45 -05:00
Rafa Couto
b5fb7075b9 Galician (gl) language. 2015-09-30 14:46:01 -05:00
Richard Wackerbarth
7b4bdc0203 DUAL_X_CARRIAGE motor enabling 
As noted by @darkjavi et.al. in #103, the E1 motor was not being enabled in planner.cpp when using DUAL_X_CARRIAGE. This patch enables and disables E1 as it should.
 2015-09-30 04:31:19 -05:00
Richard Wackerbarth
91b5156b3e Marlin 1.1.0 Release Candidate 2 - 29 September 2015 2015-09-29 20:28:41 -05:00
Richard Wackerbarth
03f0edb57e Fix high LCD status screen update frequency (PR#2655) 2015-09-28 11:07:33 -05:00
KiteLab
0ad25c6665 Hint for changed behaviour of SDSUPPORT 2015-09-28 11:07:33 -05:00
Richard Wackerbarth
e01f5e1ef7 Cleanup 2015-09-17 10:44:23 -05:00
Mike Cochrane
5e36b64635 SDEXTRASLOW for some SD card readers (PR#176) 
Add SDEXTRASLOW which runs the SD card at SPI_QUARTER_SPEED. Quarter speed is needed for RIGIDBOT_PANEL
 2015-09-14 07:58:08 -05:00
Scott Lahteine
5d65a36dee Give lcd_sd_status an UNKNOWN state (PR#180) 2015-09-14 06:32:27 -05:00
fmalpartida
0f149ea0c6 LCD home button causes repeated homing (PR#175) 
Fix: increased debounce delay.
 2015-09-14 06:31:49 -05:00
Scott Lahteine
b825567e0f Drop www. from marlinfirmware.org (PR#175) 2015-09-14 06:28:53 -05:00
Scott Lahteine
db27e67580 Apply PID_ADD_EXTRUSION_RATE to extras 2015-09-12 07:53:20 -05:00
Scott Lahteine
bc50db9cf6 Implement PID_ADD_EXTRUSION_RATE 2015-09-12 07:53:20 -05:00
Scott Lahteine
cffb2d457e Cleanup file formatting 2015-09-12 07:48:27 -05:00
Scott Lahteine
7ac7ddbf20 Show nozzles, heaters, and extruders numbered 1-4 2015-09-12 07:40:18 -05:00
Scott Lahteine
5bc480fee8 Fix Move E menu items 2015-09-12 07:33:49 -05:00
Scott Lahteine
fc882c34a3 Init lcd_sd_status as false to force lcd_update test 
Replaces #145 which is way out of date
 2015-09-12 07:32:20 -05:00
Scott Lahteine
e27dd5c22d Conditionalize functions that rely on SDSUPPORT 2015-09-12 07:30:09 -05:00
Scott Lahteine
fabf3ae4a0 Add final Z raise after Delta probe 2015-09-12 07:23:24 -05:00
Petr Zahradnik
8c768a76a2 Create language_cz.h 
Czech language translation.
 2015-09-12 07:18:05 -05:00
Petr Zahradnik
5b9010965d Update language.h 
Added comment for Czech language (associated with file language_cz.h).
 2015-09-11 04:43:54 +02:00
Scott Lahteine
89fb778684 Fix up probe pin define and test 2015-09-10 10:54:03 -05:00
Scott Lahteine
558665cd90 Constrain Tune > Nozzle/Flow menu items 2015-09-10 08:47:11 -05:00
Scott Lahteine
9f462f0cf5 Hack to address stuttering caused by ISR not finishing in time 
(PR #138)

When the ISR does not finish in time, the timer will
wrap in the computation of the next interrupt time.

This hack replaces the correct (past) time with a time not far in the future.
 2015-09-10 08:26:17 -05:00
Scott Lahteine
8b3d63c423 Unify Delta XYZ homing rates 
As noted in #130 allen key probe stow rate is based on homing rates,
but homing rates were left out of most delta configs. This unifies the
XYZ homing rates and applies the unified rates to allen key movements.
 2015-09-08 13:11:55 -05:00
Scott Lahteine
7c72b57313 Unify manual feedrate and Fix LCD MANUAL_FEEDRATE (PR#128) 
As noted by @o-lampe at https://github.com/MarlinFirmware/MarlinDev/issues/114#issuecomment-136757614 the `MANUAL_FEEDRATE` for Delta Z should be the same as XY.
 2015-09-08 13:11:55 -05:00
Scott Lahteine
f690b82343 Remove extra MAX_FREQ_TIME define (PR#148) 2015-09-08 13:11:12 -05:00
Scott Lahteine
a4c78ae786 Add E1 pins to SENSITIVE_PINS for Dual Y or Dual Z 2015-09-07 09:41:06 -05:00
Scott Lahteine
a39fadf876 Update kossel-pro example config (again?) 2015-09-07 09:41:06 -05:00
Scott Lahteine
34e0a8d848 Move Y2 and Z2 pins defines to pins.h 2015-09-07 09:41:06 -05:00
Scott Lahteine
28599c51c7 Wrap Dual Y options in a conditional 2015-09-07 09:41:05 -05:00
Scott Lahteine
11a065c0ca Remove Z2 pins overrides from Configuration_adv.h 2015-09-07 09:41:05 -05:00
Scott Lahteine
f7f6b5faae Fix lcd_move_e compile error (PR#143) 
Fix a compile error introduced in #98
 2015-09-07 09:36:05 -05:00
Scott Lahteine
2b30e8ac99 Conditionals for ULTIPANEL without SDSUPPORT 2015-09-06 02:04:49 -05:00
Scott Lahteine
7c7a4051fe Disable SDSUPPORT by default 
As noted in #133 you can’t disable `SDSUPPORT` with `MAKRPANEL`,
`PANEL_ONE`, `MINIPANEL`, or `ULTIPANEL`. This patch makes it possible
to disable `SDSUPPORT` on these controllers and then disables it by
default.

Users of these controllers will now need to enable `SDSUPPORT` in their
configurations as others currently do.
 2015-09-06 02:04:49 -05:00
Eric Kuzmenko
b23d765991 Added Extrude From Multiple Extruders from LCD feature 2015-09-05 05:33:18 -05:00
Christian Lefrançois
8347a9d6e4 Fix HOMING_BUMP_DIVISOR for deltas configuration 
* Re-bump speed divisor should be the same for delta printer.
 2015-09-03 09:26:28 -05:00
Scott Lahteine
703df2cb6c Fix error message for probe region sanity check 2015-09-03 03:27:47 -05:00
Shane Francis
4c8330c15c Trim Adjustments for Delta Configurations 2015-09-03 01:05:33 -05:00
Scott Lahteine
962120d1d2 Fix spacing in some conditional blocks 2015-08-27 20:59:09 -05:00
Richard Wackerbarth
20b4772155 Create DEBUG_LEVELING_FEATURE 2015-08-27 20:52:08 -05:00
Scott Lahteine
194f98ff95 Debug messages for homing and leveling 2015-08-27 20:52:08 -05:00
Richard Wackerbarth
6292d9e815 Rename ENABLE_AUTO_BED_LEVELING 
With the introduction of the #if ENABLED(…)

reads better than
 2015-08-27 20:52:08 -05:00
Richard Marko
91fd66ffba add Lulzbot TAZ4 example configuration (PR#104) 2015-08-27 08:36:43 -05:00
Wurstnase
7a275773ee remove colon in utf_mapper.h (PR#106) 2015-08-27 07:15:23 -05:00
Chris Bruner
6b4b6fa315 update for newest version of U8glib_Arduino 2015-08-26 19:52:59 -05:00
Christian Lefrançois
9897a9147c Update ABL comments (PR#95) 
* Updates the auto bed leveling comments ONLY.
* Renames "Z probe" word usage in //comments and #errors properly.
 2015-08-26 05:51:38 -05:00
Christian Lefrançois
a7822e3ff7 Some renaming of Z_PROBE to Z_MIN_PROBE (PR#91) 
* Fix a couple of renames omission and macro expansion errors.
 2015-08-20 06:04:46 -05:00
Richard Wackerbarth
ad90e851b3 Use a small unsigned integer type 2015-08-16 06:56:47 -05:00
Richard Wackerbarth
29b456ae07 Suppress some compiler warnings 2015-08-16 06:56:47 -05:00