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
71adb1ee59
Merge branch 'Development' into cold_extrude
...
Latest upstream commits
2015-04-10 21:13:50 -07:00
Scott Lahteine
f1a03c5447
Merge pull request #1887 from thinkyhead/cold_extrude
...
Break out prevent_dangerous_extrude feature
2015-04-10 16:16:52 -07:00
Scott Lahteine
5fe382949b
Some G-Codes comment cleanup
2015-04-10 16:16:13 -07:00
Scott Lahteine
8f164f4c83
Clean up M85 in GCodes.md
2015-04-10 16:04:32 -07:00
Scott Lahteine
a327d876fe
Document G92 arguments in GCodes.md
2015-04-10 16:02:00 -07:00
Scott Lahteine
652d59cd80
Spacing of g-codes in GCodes.md
2015-04-10 15:59:55 -07:00
Scott Lahteine
fe912f44dc
Smaller headings
2015-04-10 15:58:32 -07:00
Scott Lahteine
93eb63238f
Move G Codes into categories with M Codes
2015-04-10 15:57:54 -07:00
Scott Lahteine
a3b13eb5ac
Organize M Codes by Category
...
- In GCodes.md
2015-04-10 15:54:36 -07:00
Scott Lahteine
3105ebc562
Restore M928, M999
2015-04-10 15:05:00 -07:00
Scott Lahteine
01654bdec1
Cleanup formatting of some M codes
2015-04-10 15:03:41 -07:00
Scott Lahteine
907e8e98e5
Add GCodes from Marlin 1.0.3 dev, format as pre
2015-04-10 14:55:21 -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
67c0e8323e
Merge pull request #1879 from thinkyhead/cold_extrude
...
Fix moves for DELTA for MANUAL_BED_LEVELING
2015-04-09 22:06:06 -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
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
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
dcde09fdff
Merge remote-tracking branch 'upstream/Development' into Development
...
Latest upstream commits
2015-04-09 03:21:36 -07: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
7f22464353
Merge remote-tracking branch 'upstream/Development' into Development
...
Latest upstream commits
2015-04-09 01:41:10 -07:00
Scott Lahteine
1269c445ab
Catch dangerous extrude before trying several
2015-04-09 01:40:48 -07:00
Scott Lahteine
4abd23ae9e
Merge pull request #1866 from AnHardt/contrast
...
Remove Contrast Menu for device U8GLIB_ST7920
2015-04-09 00:34:25 -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
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
98f3130a5c
Merge pull request #1865 from thinkyhead/configurator_values
...
Thermistor values for configurator
2015-04-08 03:13:27 -07: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
c82da64d10
Merge pull request #1863 from lcfm1/patch-3
...
Update language_ru.h
2015-04-08 01:07:12 -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
