CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,352 Commits 1 Branch 0 Tags 107 MiB
a448cedbc5
Commit Graph

6352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Lahteine
15a2351675 No need for +1 on initial seen_pointer 2015-05-22 15:31:30 -07:00
Scott Lahteine
8cba3bd811 Merge pull request #2141 from thinkyhead/fix_command_parser_M110 
Set seen_pointer before calling code_value
 2015-05-22 15:29:15 -07:00
Scott Lahteine
550dd87b2a Set seen_pointer before calling code_value 2015-05-22 15:11:48 -07:00
Scott Lahteine
38cc0b93c6 Merge pull request #1874 from AnHardt/Bulgarian 
Introduction of Bulgarian - language_bg.h
 2015-05-22 13:59:50 -07:00
Scott Lahteine
04a1622172 Merge pull request #2127 from Wackerbarth/Kossel_Pro 
Kossel Pro
 2015-05-21 18:43:26 -07:00
Scott Lahteine
81c2ca3e10 Merge pull request #2131 from thinkyhead/bq_is_ramps_13_efb 
Witbox and Hephestos are RAMPS EFB
 2015-05-21 18:39:02 -07:00
Scott Lahteine
f919a2fed1 Merge pull request #2134 from AnHardt/preheat-all 
Shift call of start_watching_heater() into setTargetHotend()
 2015-05-21 18:36:28 -07:00
Scott Lahteine
65343e8ae8 Merge pull request #2138 from thinkyhead/tweak_swh 
Fix a couple of doubled semicolons
 2015-05-21 18:36:04 -07:00
Scott Lahteine
063881b5bd Fix a couple of doubled semicolons 2015-05-21 18:15:29 -07:00
AnHardt
94dff5b36a Merge pull request #2137 from thinkyhead/tweak_swh 
Move millis call in start_watching_heater
 2015-05-22 02:02:07 +02:00
Scott Lahteine
70d2f48d4e Merge pull request #2136 from thinkyhead/M303_suppress_error 
Suppress the line mismatch error after M303
 2015-05-21 16:46:30 -07:00
AnHardt
0c0ace2a04 Remove start_watching_heater() fom M104 and M109 2015-05-22 01:44:50 +02:00
Scott Lahteine
00716d0ca0 Small start_watching_heater adjustment 2015-05-21 16:44:49 -07:00
Scott Lahteine
834747deb7 Merge pull request #2135 from Wurstnase/new_endstop_bits 
new endstop bits
 2015-05-21 16:35:54 -07:00
Scott Lahteine
bde9c70d42 Suppress the line mismatch error after M303 2015-05-21 16:27:22 -07:00
Scott Lahteine
50bd7493cc Merge pull request #2108 from thinkyhead/m33_long_filename_host_support 
M33 LONG_FILENAME_HOST_SUPPORT
 2015-05-21 16:22:47 -07:00
Scott Lahteine
4d11b29959 Merge pull request #2113 from thinkyhead/command_sanitizer 
Command sanitizer
 2015-05-21 16:21:58 -07:00
Scott Lahteine
71ff9adb12 Merge pull request #2132 from thinkyhead/fix_M120_M121 
M120 and M121 are reversed
 2015-05-21 16:20:03 -07:00
wurstnase
ff98b8632b new endstop bits 2015-05-21 23:16:43 +02:00
AnHardt
9b0fa9c309 Changed dependency of start_watching_heater() in setTargetHotend() to THERMAL_PROTECTION_HOTENDS 2015-05-21 21:07:37 +02:00
AnHardt
bc0764894a Shift call of start_watching_heater() into setTargetHotend() 
to warrant watching is set or reset.

Make setTargetBed() in _lcd_preheat() dependant of TEMP_SENSOR_BED.
Use disable_all_heaters() in lcd_cooldown() and abort_on_endstop_hit.
 2015-05-21 20:36:11 +02:00
Richard Wackerbarth
b878bc5620 Introducing the Kossel Pro Build Configuration 2015-05-21 11:47:34 -05:00
Richard Wackerbarth
3004359191 Libraries supporting Marlin platform 2015-05-21 11:47:34 -05:00
Richard Wackerbarth
6c86266fb6 Brainwave Bootloaders 2015-05-21 11:47:34 -05:00
Richard Wackerbarth
3eee09cb6c Brainwave Variants 2015-05-21 11:47:34 -05:00
Richard Wackerbarth
945fd2cf82 Brainwave Core from Arduino 1.0.1 (In 1.5 file structure) 2015-05-21 11:47:34 -05:00
Richard Wackerbarth
1b707a7cf7 Platform and Boards 2015-05-21 11:47:34 -05:00
Richard Wackerbarth
1d8f61ca8a AT90USB is defined in pins.h 2015-05-21 11:46:54 -05:00
Richard Wackerbarth
735bf2d35f Describe Custom M Code 2015-05-21 08:06:33 -05:00
Scott Lahteine
f39658c822 M120 and M121 are reversed 2015-05-21 00:17:44 -07:00
Scott Lahteine
6eb4f90ce7 Also synchronize configurator copies of configs 2015-05-20 21:34:00 -07:00
Scott Lahteine
9d1961ebe3 Witbox and Hephestos are just RAMPS_13_EFB 2015-05-20 21:33:23 -07:00
AnHardt
d6c1285ab5 Merge pull request #2115 from AnHardt/_temp_error 
Use _temp_error() for all errors thrown by different heater sanity check mechanisms
 2015-05-21 00:36:30 +02:00
AnHardt
4422365a53 Merge branch 'Development' of https://github.com/MarlinFirmware/Marlin into _temp_error 2015-05-20 23:34:39 +02:00
AnHardt
4113762062 Merge pull request #2130 from AnHardt/kill2 
Add a string parameter to kill()
 2015-05-20 23:32:51 +02:00
AnHardt
89d2ee6f13 Make output on display dependant of ULTRA_LCD 2015-05-20 22:03:16 +02:00
AnHardt
120d4c7a8c Merge remote-tracking branch 'origin/kill2' into _temp_error 2015-05-20 21:25:32 +02:00
AnHardt
cb6e82dc60 Change from kill() to kill(const char *) 
in temperature.cpp
 2015-05-20 21:22:48 +02:00
AnHardt
9d13942278 Use new kill() with parameter. 2015-05-20 21:18:52 +02:00
AnHardt
6398c5e28d Merge remote-tracking branch 'origin/kill2' into _temp_error 2015-05-20 21:08:19 +02:00
AnHardt
f4a93ed997 Add a string parameter to kill() 
Makes the output on the LCD adjustable.
 2015-05-20 20:53:48 +02:00
AnHardt
2990c6c45f Use new kill_() for _temp_error() 
instead of stop(). We really want to require a reset and no chance to set a new temperature.
 2015-05-20 14:03:14 +02:00
AnHardt
9b8c6ed254 Merge pull request #2120 from chris-bo/dogm_config 
move dogm font selection to configuration_adv.h
 2015-05-20 10:11:34 +02:00
AnHardt
06513565e9 Merge pull request #2105 from eboston/Development 
Add  ELB_FULL_GRAPHIC_CONTROLLER with ADAFRUIT_ST7565 display.
 2015-05-20 09:56:21 +02:00
Ed Boston
082ed3beed Propagate Configuration.h changes 
Updated all the example Configuration.h files for the new display type.
 2015-05-19 14:04:57 -07:00
Ed Boston
152b681bb5 Added link to controller github 
Added the link to the github information about the
ELB_FULL_GRAPHIC_CONTROLLER
 2015-05-19 04:14:55 -07:00
AnHardt
995b84944b Merge pull request #1982 from CONSULitAS/Development_Update_language.h 
language.h: update documentation / URL für K8200
 2015-05-19 12:13:35 +02:00
Scott Lahteine
7bc5fd8193 Merge pull request #2123 from AnHardt/Duemilanove 
Remove Duemilanove
 2015-05-18 20:36:05 -07:00
Scott Lahteine
94de1e0d93 Merge pull request #2116 from AnHardt/wording 
transpire -> expire
 2015-05-18 20:34:46 -07:00
AnHardt
23ee57c1c1 Remove DUEMILANOVE from Travis too. 2015-05-19 03:17:56 +02:00