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

2689 commits

Author SHA1 Message Date
Scott Lahteine
0e70511381 Merge pull request #2036 from brupje/mainline 
Fixes for reprapworld's keypad
 2015-05-08 18:19:31 -07:00
Wurstnase
0cb87795a3 advanced 'ok' 
ok N(linenumber) P(bufferremaining)
the host can use this to send the data much faster.

Some pseudo code:
If (bufferremaining > 0)  send command
## as long there is free buffer send command

Also
if (linenumber > lastsend - bufferremaining) send command
## as long last linenumber received is bigger than lastsend (host) - last bufferremaining received
 2015-05-08 22:28:51 +02:00
Wurstnase
182e0d99c9 Merge remote-tracking branch 'Marlin8bit/Development' into serial_wait 2015-05-08 21:27:18 +02:00
brupje
d1148a0198 Rename Configuration_megatronics.h to Configuration.h 2015-05-08 14:36:23 +02:00
Scott Lahteine
7f3252eea9 Merge pull request #1999 from paclema/Filrunout_configurable_script 
Added configurable script for filrunout from configuration.h
 2015-05-08 04:39:59 -07:00
Scott Lahteine
181ccc884c Edit thermal runaway description 2015-05-07 20:46:03 -07:00
Wurstnase
073e4af7e2 We don't need the old standard one. The STEP_ADD and STEP_IF_COUNTER are also good for non-Toshiba stepper driver. 2015-05-07 18:55:47 +02:00
brupje
b7fcb11580 Added example configuration for Megatronics 2015-05-07 13:18:05 +02:00
brupje
8f8174dc93 Revert "Default configuration for megatronics." 
This reverts commit 22e0d2afcb.
 2015-05-07 13:12:17 +02:00
Scott Lahteine
79633a74ab Fix MBL compile error 2015-05-06 14:25:13 -07:00
brupje
ba9741139e Clean up pins file for megatronics 2015-05-05 14:01:52 +02:00
brupje
22e0d2afcb Default configuration for megatronics. 2015-05-05 14:01:20 +02:00
brupje
816aa19861 Up/down buttons were reversed, swapped the assignments 2015-05-05 13:04:46 +02:00
brupje
df4d50579a This is conflicting with the settings in ultralcd.h. Not sure why it' s redefined here anyway. 2015-05-05 12:47:24 +02:00
brupje
8f8bf3a897 Make Marlin actually compile when #define REPRAPWORLD_KEYPAD is uncommented 2015-05-05 11:03:20 +02:00
Scott Lahteine
777f2d3820 Merge pull request #2018 from fmalpartida/bugFixing 
Bug corrected: persistent HOMING message when HOME button pressed for homing.
 2015-05-05 00:12:32 -07:00
Scott Lahteine
ecb46de349 Merge pull request #2013 from bq/Fix_lowercase 
Fixed lowercase change missing on commit a22a228b.
 2015-05-04 23:50:56 -07:00
fmalpartida
150a35eff8 Bug corrected: 
Persistent homing message.
Message was declared as an alert, therefore it was persistent.
Updated to message.
 2015-05-04 19:48:49 +02:00
Gina Häußge
ab246ab032 Reverting changes to error messages on serial console 
This reverts the changes done to the error message for line number mismatches done in commit d43cc2dd5f
 2015-05-04 15:03:00 +02:00
Ivan Galvez Junquera
59529b755d Fixed lowercase change missing on commit a22a228b. 
Servo.cpp and Servo.h were changed to lowercase in Makefile but not their actual filenames.
 2015-05-04 09:44:34 +02:00
Scott Lahteine
df4c104637 Merge pull request #2012 from BrianGilbert/Development 
Add example configuration for Boots Industries V2.5 Delta Printer
 2015-05-03 20:42:32 -07:00
Scott Lahteine
1f039cde61 Merge pull request #1992 from thinkyhead/too_many_probes 
Stow Z probe on M402 without extra raise
 2015-05-03 20:40:26 -07:00
Brian Gilbert
1285784a49 Add Boots Industries V2.5 example configuration 2015-05-04 09:10:42 +10:00
Scott Lahteine
35493e1af9 Tweak to planner.cpp position.debug 2015-05-03 16:03:05 -07:00
paclema
26015b02d8 Fixed typo and updated Configuration.h of configurator 2015-05-03 02:39:34 +02:00
paclema
aedd580911 Updated all configuration.h examples 2015-05-03 02:28:43 +02:00
Scott Lahteine
2c892fca6a Cleanup of language.h 2015-05-01 21:38:32 -07:00
Scott Lahteine
2db384a21d Fix compile error in configuration_store.cpp 2015-05-01 21:15:26 -07:00
Scott Lahteine
ca8cec8e8a Merge pull request #1998 from paclema/Filament_runout_fix 
Fixed sintaxis error of filament runout
 2015-04-29 19:53:25 -07:00
Scott Lahteine
425cd46c12 Merge pull request #1993 from AnHardt/TRP-bed 
Enable TRP for the bed
 2015-04-29 19:44:50 -07:00
Scott Lahteine
d4c74b8f8c Don't apply M428 if an error occurs 
- Also move audio feedback into the command
- Added shorthand for `lcd_buzz` availability
 2015-04-29 19:05:48 -07:00
Scott Lahteine
d065d37822 Add M428 to set home_offset logically 2015-04-29 18:26:16 -07:00
paclema
013a09dbe6 Added configurable script for filrunout form configuration.h 2015-04-29 21:38:40 +02:00
paclema
4dcc0fd55a Fixed sintaxis error of filament runout 2015-04-29 21:32:27 +02:00
AnHardt
514d8ac460 Enable TRP for the bed 
in all Configurations.
 2015-04-29 08:47:01 +02:00
Scott Lahteine
ce3caf447b Tweak how homeaxis deploys and stows 2015-04-28 19:17:48 -07:00
Scott Lahteine
a235dca79c Stow z on M402 without extra raise 2015-04-28 19:10:07 -07:00
Scott Lahteine
2610b8d047 Enable thermal runaway protection by default 2015-04-28 17:40:29 -07:00
AnHardt
b4b19a6cbd Merge https://github.com/MarlinFirmware/Marlin into Bulgarian 
Conflicts:
	Marlin/Configuration.h
	Marlin/configurator/config/Configuration.h
	Marlin/example_configurations/Felix/Configuration.h
	Marlin/example_configurations/Felix/Configuration_DUAL.h
	Marlin/example_configurations/Hephestos/Configuration.h
	Marlin/example_configurations/K8200/Configuration.h
	Marlin/example_configurations/SCARA/Configuration.h
	Marlin/example_configurations/WITBOX/Configuration.h
	Marlin/example_configurations/delta/generic/Configuration.h
	Marlin/example_configurations/delta/kossel_mini/Configuration.h
	Marlin/example_configurations/makibox/Configuration.h
	Marlin/example_configurations/tvrrug/Round2/Configuration.h

Conflicts with my Chinese implementation resolved.
 2015-04-28 09:24:32 +02:00
Scott Lahteine
7548a56f64 Merge pull request #1886 from ex-nerd/pins_BRAINWAVE_PRO 
Add pin configuration for Brainwave Pro
 2015-04-27 23:13:26 -07:00
Scott Lahteine
02acf0641a Merge pull request #1983 from CONSULitAS/Development_Update_language_de.h 
language_de.h: updated translation and minor typos
 2015-04-27 22:45:24 -07:00
Scott Lahteine
a120bf3fe4 Latest upstream commits 2015-04-27 22:40:19 -07:00
Scott Lahteine
3688256f86 Merge pull request #1974 from thinkyhead/eeprom_in_gcode 
Make EEPROM reproducible in GCode
 2015-04-27 22:35:41 -07:00
Scott Lahteine
ae53b3cdc3 Fix the M303 S-1 report text 2015-04-27 22:25:00 -07:00
Scott Lahteine
c1fbef1722 Merge pull request #1988 from thinkyhead/bye_string_url 
Remove obsolete STRING_URL
 2015-04-27 22:12:05 -07:00
Scott Lahteine
31516e2a3b Merge pull request #1985 from Arengorn/Development 
Update of servo.h
 2015-04-27 22:10:02 -07:00
Scott Lahteine
185f8a0a66 Merge pull request #1917 from CONSULitAS/Development_Update_K8200_Config 
Example Configuration for K8200: comments/URL/readme
 2015-04-27 21:59:56 -07:00
Scott Lahteine
0970102950 Remove obsolete STRING_URL 2015-04-27 21:59:14 -07:00
Scott Lahteine
0f687b5dda Merge branch 'Development' into eeprom_in_gcode 
Latest upstream commits
 2015-04-27 21:47:47 -07:00
Scott Lahteine
28aef684b4 Merge pull request #1957 from Voxel8/sjk/home_y_before_x 
Allow Y to home before X with option in Configuration_adv.h.
 2015-04-27 21:41:14 -07:00
Scott Lahteine
c1dd9bda7f Merge pull request #1987 from thinkyhead/fix_homing_zpos 
Disable endstops between homing bumps
 2015-04-27 21:16:47 -07:00
Scott Lahteine
71a0b1a5bb Disable endstops between homing bumps 2015-04-27 21:14:30 -07:00
Scott Lahteine
8c28e36e75 Merge pull request #1986 from thinkyhead/fix_homing_zpos 
Fix homing Z position
 2015-04-27 20:58:14 -07:00
Scott Lahteine
c36226c4dc Fix homing Z position 
Add `sync_plan_position()` after `axis_is_at_home(axis)` to keep the
planner position in sync when homing.
 2015-04-27 20:55:19 -07:00
Scott Lahteine
2bc1d70a31 Merge pull request #1977 from AnHardt/Cinese2 
We mark this historic day, when Marlin went to China.
 2015-04-27 20:37:00 -07:00
Scott Lahteine
ff178d8cf7 Change M421 to take coordinates 
This makes `M421` more amenable for irregular matrices
 2015-04-27 19:48:34 -07:00
Bernardo
e449659338 Update Servo.cpp 
Updated "servo.h" to "Servo.h"
 2015-04-27 23:30:11 -03:00
Bernardo
ff67ee73fc Update Marlin_main.cpp 
Corrected "servo.h" to "Servo.h" because of the updated filename.
 2015-04-27 23:29:16 -03:00
Scott Lahteine
5b248757c7 Level Bed in Prepare submenu 
- Add “Level Bed” menu item for auto bed leveling
- Hide the option if homing has not been done yet
- Arrange the Prepare submenu more logically (?)
- Add documentation comments, some white-space
- Apply some coding standards here and there
- Move old encoder multiplier debug option to `ultralcd.cpp`
 2015-04-27 19:11:25 -07:00
CONSULitAS
c5dfb35597 language_de.h: updated translation and minor typos 
language_de.h: updated translation and minor typos
 2015-04-28 01:03:54 +02:00
CONSULitAS
6423fe7601 language.h: update documentation / URL für K8200 
language.h: update documentation for LANGUAGE_INCLUDE
language.h: URL für K8200 github repository
 2015-04-28 01:01:57 +02:00
CONSULitAS
6af40e9dc0 K8200 example Configuration.h: STRING_URL removed 
K8200 example Configuration.h:
* STRING_URL removed: like proposed by thinkyhead in #1917
 2015-04-27 23:59:10 +02:00
CONSULitAS
d1c1f766d5 Merge remote-tracking branch 'upstream/Development' into K8200_2015-04-23_TEST 
Conflicts:
	Marlin/example_configurations/K8200/Configuration.h
 2015-04-27 23:54:47 +02:00
Steve Kelly
98ca46006c Allow Y to home before X with option in Configuration_adv.h. 
This addresses comments in #1956 and #1079. In particular, this is useful
when both endstops are stationary on a CoreXY system, and the Y axis needs
to be homed before the X so the flags are aligned.
 2015-04-27 16:17:30 -04:00
AnHardt
6cba6bcd82 Add 'cn' to the other 'Configuration.h's 2015-04-27 13:24:51 +02:00
AnHardt
1d9699be0f Add some doku 2015-04-27 13:16:20 +02:00
AnHardt
76b12edecf Give TALL_FONT_CORRECTION a default 2015-04-27 12:47:11 +02:00
AnHardt
6b1b71837c Intit. commit for Chinese 
Edited the European part of 'ISO10646_CN.fon' to match the existing fonts.
Added Chinese font to make_fonts.bat
Created 'dogm_font_data_ISO10646_CN.h'
Added Chinese to 'language.h'
Added 'language_cn.h' with some minor edits.
Added Chinese font in 'language_en.h' to not fall back to European font.
Added cn to 'Configuration.h'
Changed WIDTH to LCD_PIXEL_WIDTH and HEIGHT to LCD_PIXEL_HEIGHT to have more descriptive names.

In 'dogm_lcd_implementation.h'
Added Chinese Font
Made 1 pixel more room for the larger Chinese font on the status line.
Changed geometry of the 'select bar' by one pixel.
Changed the way the position for values and postcars are set.
 2015-04-27 12:15:36 +02:00
Scott Lahteine
fb379384ee Reduce MBL eeprom read code 2015-04-26 21:06:04 -07:00
Scott Lahteine
0fca084ea6 Make EEPROM reproducible in GCode 
With these changes the output of `M503 S0` is all you need to restore
the EEPROM. Building on this it is straightforward to save and restore
the EEPROM state using the SD card or external GCode file.

- Added `M145` to set “heatup states” for the LCD menu
- Added `M420` to toggle Mesh Bed Leveling
- Added `M421` to set a single Mesh coordinate
- Extended `Config_PrintSettings` with added M codes
- Cleaned up some comments here and there
 2015-04-26 20:56:33 -07:00
Scott Lahteine
d43cc2dd5f M111 - Debug Level 
- Add `M111` as a standard option to set the debug level
- Implement `DEBUG_ECHO` in `process_commands`
- Other debug levels (e.g., `DEBUG_DRYRUN`) need more work
 2015-04-26 20:08:45 -07:00
Scott Lahteine
0ec444720f Rename blinkm files 2015-04-25 21:06:19 -07:00
Scott Lahteine
a22a228bcc Rename files to move them in the IDE 2015-04-25 21:04:54 -07:00
Scott Lahteine
a932e7490f No noTone needed, but delay is 2015-04-25 03:25:30 -07:00
Scott Lahteine
9c5d14ea68 Fix BEEPER duration 2015-04-25 03:12:49 -07:00
Scott Lahteine
5c29fda167 Add a warning for DISABLE_[XYZ] options 2015-04-25 00:46:33 -07:00
Scott Lahteine
0438f0d835 Merge pull request #1924 from thinkyhead/raise_z_for_m401_m402 
Raise Z for M401 and M402
 2015-04-24 22:41:12 -07:00
Scott Lahteine
a640cad139 Merge pull request #1967 from thinkyhead/g4_dwell_message 
Use millis_t for progress_bar_ms and expire_status_ms
 2015-04-24 22:17:28 -07:00
Scott Lahteine
c92b59952a Use millis_t for progress_bar_ms and expire_status_ms 2015-04-24 22:16:09 -07:00
Scott Lahteine
b275946a52 Merge pull request #1966 from thinkyhead/g4_dwell_message 
G4 shows status message only if no message is set already
 2015-04-24 22:02:37 -07:00
Scott Lahteine
97dfa0365d Rename expireStatusMillis to expire_status_ms 2015-04-24 21:51:10 -07:00
Scott Lahteine
7295640f44 Remove extraneous ; 2015-04-24 21:37:27 -07:00
Scott Lahteine
0d8c00d3f6 Define lcd_hasstatus for no lcd also 2015-04-24 21:36:04 -07:00
Scott Lahteine
182f2cda35 Minor cleanup of M48 2015-04-24 21:26:36 -07:00
Scott Lahteine
3a6fd912cd Latest upstream commits, merged 2015-04-24 21:14:13 -07:00
Scott Lahteine
3c9e94e035 Merge pull request #1964 from AnHardt/Max6675again 
Add variant for MAX6675 in M104
 2015-04-24 20:44:45 -07:00
Scott Lahteine
56ff46eb8b Improve code_has_value test 2015-04-24 20:43:16 -07:00
Scott Lahteine
ce142afdda G4 shows status message only if no message is set already 
- Address issue raised in #1961
 2015-04-24 20:13:01 -07:00
Scott Lahteine
35e79d56a5 Remove set-coordinate extension of G28 2015-04-24 19:23:12 -07:00
Scott Lahteine
3a74bb5039 Merge pull request #1945 from Wurstnase/max_endstopp 
Max endstopp
 2015-04-24 19:17:38 -07:00
AnHardt
0fed46360c Add variant for MAX6675 in M104 
Else will throw error:
@:0 B@:0
Error:No thermistors - no temperature
[ERROR] Error:No thermistors - no temperature

when no bed is defined
 2015-04-24 16:43:19 +02:00
Wurstnase
79a44a9de3 stepper.cpp macros rework 
delete some tabs
 2015-04-24 08:03:17 +02:00
Scott Lahteine
588ed70d4a Latest upstream commits, merged 2015-04-23 21:18:48 -07:00
Scott Lahteine
0165560333 Apply zprobe_zoffset in axis_is_at_home 
Ensure the probe offset will always be included when homing Z.
 2015-04-23 21:12:38 -07:00
Scott Lahteine
075386e7fe Merge pull request #1959 from thinkyhead/lcd_move_rate 
Include axis parameter to ultralcd's line_to_current
 2015-04-23 21:06:57 -07:00
Scott Lahteine
2558c10c6c Use the slower feedrate for XY axes 2015-04-23 20:06:17 -07:00
Scott Lahteine
31932912dd Use AxisEnum instead of int for _lcd_move 2015-04-23 19:32:37 -07:00
Scott Lahteine
c2e11daf66 Merge pull request #1958 from thinkyhead/redo_1937 
Fix homing of YZ with DUAL_X_CARRIAGE
 2015-04-23 19:12:51 -07:00
Scott Lahteine
c3560e0288 Include axis parameter to ultralcd's line_to_current 2015-04-23 19:10:09 -07:00
Scott Lahteine
a0a5ff61c4 Merge pull request #1951 from AnHardt/Azteeg_x3 
Fix for #1946
 2015-04-23 18:40:00 -07:00
Scott Lahteine
0094481e55 Merge pull request #1955 from AnHardt/langlang 
Add DISPLAY_CHARSET_HD44780_CYRILLIC as alternative in SanityCheck.h
 2015-04-23 18:36:06 -07:00
Scott Lahteine
64268f3312 Fixup axis_is_at_home a little 2015-04-23 18:16:44 -07:00
Scott Lahteine
996d0a9185 Squish the code down a little 2015-04-23 18:06:36 -07:00
Scott Lahteine
8534bc376c Fix homing of YZ with DUAL_X_CARRIAGE 2015-04-23 17:56:37 -07:00
Scott Lahteine
3b97a7d446 Merge pull request #1944 from AnHardt/beep2 
More Beeper clean up
 2015-04-23 17:50:02 -07:00
Wurstnase
be9e4ceddc fix typo 
c'n'p ftw :/
 2015-04-23 10:35:14 +02:00
unknown
c26d816839 filter any 0 2015-04-22 12:09:57 +02:00
AnHardt
f2c94b3298 tone will end automaticly 2015-04-22 01:49:55 +02:00
AnHardt
c5e0e29d23 Add DISPLAY_CHARSET_HD44780_CYRILLIC as alternative in SanityCheck.h 
and add some documentation - how to integrate a new font.
 2015-04-21 21:42:00 +02:00
AnHardt
b59e92ab99 Fix for #1946 
Syntax error.
 2015-04-21 13:50:28 +02:00
Wurstnase
61ae43f35e v <-> code_value 2015-04-20 23:31:10 +02:00
Wurstnase
da0d91a79b max endstopp 
no user will home to 0 with a max endstopp
 2015-04-20 23:28:46 +02:00
AnHardt
3a27a78f9e Commented REPRAP_DISCOUNT_SMART_CONTROLLER again 
and removed some tabs.
 2015-04-20 15:01:43 +02:00
AnHardt
064f2b37d0 More Beeper clean up. 
Centralised beep code to lcd_buzz().
From gcode_M300() and lcd_quick_feedback().

Enforced max. duration for M300 to 5 seconds.

Corrected description in 'Configuration.h'

LCD_FEEDBACK_FREQUENCY_HZ 0 gives now a silent delay of
LCD_FEEDBACK_FREQUENCY_DURATION_MS.
 2015-04-20 11:11:13 +02:00
Wurstnase
92575cecca new timout/add adv_ok 2015-04-20 00:22:40 +02:00
AnHardt
671aaf2dc9 Minor fix for M300 
Corrected wrong order of parameters.
 2015-04-19 13:25:20 +02:00
Scott Lahteine
d931220a65 Tweak comments 2015-04-18 23:12:29 -07:00
Scott Lahteine
47847765e2 Add M410 QuickStop command 2015-04-18 23:07:48 -07:00
Scott Lahteine
a4ca87ba99 Merge pull request #1933 from bq/Fix_stray_in_configuration 
Fixed compilation error "error: stray ‘\357’ in program"
 2015-04-18 03:56:31 -07:00
Scott Lahteine
5e3bb4bdf3 Merge pull request #1931 from paclema/M303_echo 
Added new PID autotune info, to make easy copy & paste results to marlin
 2015-04-18 03:49:31 -07:00
Ivan Galvez Junquera
b99e63a7bf Fixed compilation error "error: stray ‘\357’ in program" in several configuration files. 
Introduced in commit 697ee2dc and later spread to other files.
 2015-04-17 16:10:58 +02:00
paclema
581685a231 Added new PID autotune info, to make easy copy & paste results to marlin 2015-04-17 11:15:09 +02:00
Chris Palmer
483384aaa4 Fixed faulty comment merge 2015-04-17 09:31:53 +01:00
Chris Palmer
cc6b7cf3ce Fixed some comment spellings. 2015-04-17 09:28:08 +01:00
Chris Palmer
e4595fa24a Fixed jump in speed when using high accelerations on axes with lots of steps. 
I.e., when acceleration * steps per mm > 2,000,000.
This was done by changing MultiU24X24toH16 to take a 32b bit operand.
Removed the claim that stepper.cpp uses the Leib algorithm.
 2015-04-16 23:04:38 +01:00
Wurstnase
b09a957fce make 'wait' optional and mark as workaround 2015-04-16 21:42:54 +02:00
Scott Lahteine
63b98b8280 Raise Z for M401 and M402 2015-04-16 07:24:33 -07:00
wurstnase
d69da22f7c last_command_time inside get_command() 2015-04-16 16:20:23 +02:00
Scott Lahteine
53be0f3399 Babystep delay 2us 2015-04-16 04:16:36 -07:00
wurstnase
574e2d856e remove config 2015-04-16 13:07:20 +02:00
paclema
cde5eee2a5 Removed unnecessary comments 2015-04-15 19:01:09 +02:00
paclema
e1b69db6d1 Fixed M48 mismatch between n and P parameter on documentation 2015-04-15 18:17:58 +02:00
CONSULitAS
1de9b568db Example Configuration for K8200: comments/URL/readme 
Example Configuration for K8200 : comments/URL/readme

example_configurations\K8200\Configuration.h:
* add machine specific header
* change STRING_URL to K8200 fork (@thinkyhead: What do you think?)

example_configurations\K8200\readme.md:
* updated documentation
* added URLs and links
 2015-04-15 10:02:13 +02:00
CONSULitAS
0af5e3a04f Example Configuration for K8200: comments/URL/readme 
Example Configuration for K8200 : comments/URL/readme

example_configurations\K8200\Configuration.h:
* add machine specific header
* change STRING_URL to K8200 fork (@thinkyhead: What do you think?)

example_configurations\K8200\readme.md:
* updated documentation
* added URLs and links
 2015-04-15 10:00:41 +02:00
Scott Lahteine
637babb99b Merge pull request #1915 from elgambitero/Development 
Some minor translations to spanish
 2015-04-14 19:59:39 -07:00
elgambitero
cb9ac490d4 Some minor translations to spanish 2015-04-14 23:14:52 +02:00
CONSULitAS
3851ac6226 Example Configuration for K8200 back in sync 
example_configurations\K8200\Configuration.h:
* merge upstream changes from default Configuration.h manually
* add some machine specific comments
 2015-04-14 17:12:42 +02:00
CONSULitAS
b447a4ffab Merge remote-tracking branch 'upstream/Development' into Development 2015-04-14 15:35:08 +02:00
Scott Lahteine
7336e6df07 Always define old_z, not always z2 2015-04-14 04:55:20 -07:00
Scott Lahteine
5dd87d2e74 Enable all old_z_*_endstop vars for Z_DUAL_ENDSTOPS 
- Potentially addressing #1911
 2015-04-14 04:05:51 -07:00
Scott Lahteine
3f02da646c Make sure axis_active is cleared for #1908 2015-04-14 03:41:37 -07:00
Scott Lahteine
e0e68c5cbc Rename servos[] array in Marlin to servo[] 2015-04-14 03:13:25 -07:00
Chris Petersen
ffaf1b4f22 Add pin configuration for Brainwave Pro 
Copied from jcrocholl's contributions to the OpenBeamUSA Marlin fork
 2015-04-13 23:46:57 -07:00
Scott Lahteine
642f6a92bc fix type of code_has_value 2015-04-13 18:02:17 -07:00
Scott Lahteine
17ad80c1e1 Spacing in XYZ_CONSTS 2015-04-13 17:58:47 -07:00
Scott Lahteine
09d60e0128 Naming and code comments 2015-04-13 17:17:36 -07:00
Mehmet Sutas
5a9e45cc4a Fix Syntax Error Filament Runout Statement 2015-04-13 22:37:18 +03:00
Scott Lahteine
257a907456 Fix typo in next_bed_check_ms 2015-04-12 23:17:28 -07:00
Scott Lahteine
e4b1e8651b next_ vars faster than previous_ 
- Change some `previous_` time vars to `next_` so an add only happens
at intervals
- Fix `HEATER_0_USES_MAX6675` polling too frequently, or not at all
 2015-04-12 23:06:50 -07:00
Scott Lahteine
ccddc280be Apply three more commits 2015-04-12 22:47:44 -07:00
Scott Lahteine
74e4b42f7e Default MACHINE_NAME to "3D Printer" 2015-04-12 17:17:41 -07:00
Scott Lahteine
8857b9e921 Use the extruder argument in plan_buffer_line 2015-04-12 16:57:00 -07:00
Scott Lahteine
ac2b23f574 Homing fixes 
- Prevent `Z_SAFE_HOMING` from homing Z twice in some cases
- Allow `G28` with XYZ values of 0 to explicitly set the position
- Don’t add `home_offset` when setting XYZ explicitly in `G28`
- Add `code_has_value` function to check for the presence of a numeric
value (could just test for space or nul to allow other types of values)
 2015-04-11 20:06:48 -07:00
Scott Lahteine
055b11814a Additional cleanup of ultralcd.cpp 2015-04-11 04:56:08 -07:00
Scott Lahteine
388dd0cfa5 Fix doubled lcd_quick_feedback 
- MENU_ITEM causes lcd_quick_feedback to be called, so only those calls
to `lcd_goto_menu` outside of the `MENU_ITEM` macro need to set the
`feedback` flag when calling `lcd_goto_menu`.
 2015-04-11 04:45:04 -07:00
Scott Lahteine
c6bb98abad machine name for hephestos too 2015-04-11 01:36:24 -07:00
Scott Lahteine
ccbe2c4ea3 Apply CUSTOM_MACHINE_NAME to configurations 
- Replace “Mendel” with “RepRap”
 2015-04-10 21:29:42 -07:00
Scott Lahteine
5fe382949b Some G-Codes comment cleanup 2015-04-10 16:16:13 -07:00
Scott Lahteine
8b16ebe705 Break out prevent_dangerous_extrude feature 
- It’s inline here, but could be a macro and duplicated for
`planner.cpp`
 2015-04-09 22:40:37 -07:00
Scott Lahteine
740152ee70 Merge branch 'Development' into cold_extrude 
Latest upstream commits
 2015-04-09 20:23:47 -07:00
Scott Lahteine
5914d9d7de Shuffling declarations.. 2015-04-09 20:21:30 -07:00
Scott Lahteine
b328c6e6b6 Shuffling declarations. 2015-04-09 20:05:10 -07:00
Scott Lahteine
fb4cefc91d Define lcd_move_[xyz] ahead of lcd_move_menu_axis 2015-04-09 19:33:16 -07:00
Richard Miles
4c3736ed43 Feature: Add RAMPS CNC Controller Board 
Created a new board to make using RAMPS as a CNC machine controller
easier. It maps pin 8 to the spindle and pin 9 to the controller fan.
 2015-04-09 16:32:56 +01:00
Scott Lahteine
9189cc66ab Fix moves for DELTA for MANUAL_BED_LEVELING 
- Use `line_to_current` in place of `plan_buffer_line`
 2015-04-09 04:32:14 -07:00
AnHardt
56fc3a4835 bgr -> bg 
+ update in documentation
 2015-04-09 13:09:18 +02:00
Scott Lahteine
7a1aef1450 Merge pull request #1877 from AnHardt/display-only 
Made encoderPosition and quick_feedback dependant on NEWPANEL
 2015-04-09 03:54:05 -07:00
Scott Lahteine
6096164d79 Merge pull request #1878 from thinkyhead/cold_extrude 
Cold extrude
 2015-04-09 03:41:54 -07:00
Scott Lahteine
a488445cbe Fix spelling of "too" 2015-04-09 03:41:31 -07:00
Scott Lahteine
b1950a7f25 Merge pull request #1875 from Natealus/Development 
Z Probe inverting not present in example configs, causes error
 2015-04-09 03:37:24 -07:00
AnHardt
df50523605 Made encoderPosition and quick_feedback dependant on NEWPANEL 
where the hardware is available.
Fix for #1873
 2015-04-09 12:26:45 +02:00
Scott Lahteine
2ca099d1e7 Merge pull request #1876 from thinkyhead/cold_extrude 
Catch dangerous extrude before trying several
 2015-04-09 03:21:19 -07:00
Scott Lahteine
837ceb9abb Merge pull request #1867 from epatel/Development 
Added sanity check for MESH_NUM_X_POINTS and MESH_NUM_Y_POINTS
 2015-04-09 02:29:47 -07:00
Scott Lahteine
a95544f92a Spell adjustment 2015-04-09 02:04:06 -07:00
Scott Lahteine
a00ebf03d4 Merge pull request #1868 from AnHardt/LCD_STR 
Moved the definitions of the LCD_STR_* to Conditionals.h
 2015-04-09 01:56:23 -07:00
Scott Lahteine
1269c445ab Catch dangerous extrude before trying several 2015-04-09 01:40:48 -07:00
Natealus
585eee6549 Z Probe inverting not present in example configs, causes error 
The line const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to
invert the logic of the endstop is in the main configuration.h but
wasn't present in the example configuration.h's. Causes a compiling
error with Z Probe enabled. Just added it to all the configs. :)
 2015-04-08 18:57:30 -06:00
AnHardt
c5961892e3 Bulgarian for all the Configuration.h's 2015-04-09 01:52:13 +02:00
AnHardt
6248c93f37 Introduction of Bulgarian - language_bgr.h 
Thank you @Nprod!
 2015-04-09 01:26:48 +02:00
AnHardt
540dbb35e2 And an other MSG_BED in Marlin_main.cpp 2015-04-09 01:16:06 +02:00
AnHardt
14d4419e16 Replaced SERIAL_PROTOCOLPGM(MSG_BED) with SERIAL_PROTOCOLPGM("Bed") 
Resolved some warnings in Marlin_main.cpp regarding compares of signed and unsigned integers by replacing 'int' or 'uint16_t' with 'uint8_t'.
 2015-04-08 23:59:01 +02:00
AnHardt
ea897654a4 Moved the definitions of the LCD_STR_* to Conditionals.h 
to avoid errors in Marlin_main.cpp. #1860

In the include tree of Marlin_main.cpp the decision between the display types is not made.
To include the right LCD_STR_* ether 'dogm_lcd_implementation.h' or 'ultralcd_implementation_hitachi_HD44780.h' with all their code.
A 'dogm_lcd_implementation.h.h' would be a curiosity.
So i moved both of the definition blocks to conditionals.h

On the long term it could make sense to use the same numbering for the u8glib and the hitachi symbols.
 2015-04-08 21:53:58 +02:00
Edward Patel
7dc64efe67 Added sanity check for MESH_NUM_X_POINTS and MESH_NUM_Y_POINTS 2015-04-08 20:52:48 +02:00
AnHardt
6a514f3dc9 Aplied HAS_LCD_CONTRAST also to Marlin_main.cpp 
and cleaned typo.
 2015-04-08 13:26:29 +02:00
AnHardt
a76fb42ca6 Merge https://github.com/MarlinFirmware/Marlin into contrast 2015-04-08 13:05:21 +02:00
AnHardt
bcc04192fc Remove Contrast Menu for U8GLIB_ST7920 
The other two devices we use in u8glib have more than only dummy code.
Checked this in the library code.
 2015-04-08 12:56:38 +02:00
Scott Lahteine
4788b59300 Thermistor values for configurator 2015-04-08 03:12:21 -07:00
Scott Lahteine
bb917ecda8 Merge pull request #1853 from thinkyhead/dev_version 
Set version to "1.0.3 dev"
 2015-04-08 01:57:51 -07:00
Scott Lahteine
caa7734402 Merge pull request #1864 from thinkyhead/is_running 
IsStopped / IsRunning inline
 2015-04-08 01:10:36 -07:00
Scott Lahteine
3162971cd6 current_position not static 2015-04-08 01:05:39 -07:00
Scott Lahteine
27cb90da8b IsStopped / IsRunning inline 2015-04-08 00:56:19 -07:00
Max
07fc2b5b70 Update language_ru.h 2015-04-08 13:18:45 +06:00
Scott Lahteine
756bb5e268 Cleanup formatting in hitachi & dogm lcd 2015-04-07 22:04:10 -07:00
Scott Lahteine
7431ef7e2d Merge branch 'Development' into dev_version 
Latest upstream commits
 2015-04-07 21:14:00 -07:00
Scott Lahteine
43773ff735 Formatting and lcd contrast masking 2015-04-07 21:11:03 -07:00
Scott Lahteine
eb6e3886f4 Set version to "1.0.3 dev" 2015-04-07 20:38:43 -07:00
Scott Lahteine
cf9b58452c Minimum delay in menu click feedback 
Squished #1849
 2015-04-07 20:20:30 -07:00
Scott Lahteine
1d291be2ba Fix de after PREVENT_DANGEROUS_EXTRUDE 
- Set `de` to 0 when `position[E] = target[E]`
- Address regression mention in #1846
 2015-04-07 20:01:08 -07:00
Scott Lahteine
e03da4805b Merge pull request #1774 from epatel/Development 
Mesh bed leveling: Added G29 S3 + finer display steps during manual input + bug fix
 2015-04-07 19:24:46 -07:00
Scott Lahteine
f7c4e7e19f Fix G29 not deploying in some instances 2015-04-07 15:38:29 -07:00