Scott Lahteine
637babb99b
Merge pull request #1915 from elgambitero/Development
...
Some minor translations to spanish
2015-04-14 19:59:39 -07:00
Scott Lahteine
71f183a3a2
Merge pull request #1913 from CONSULitAS/Development_Update_K8200_Config
...
Example Configuration for K8200 back in sync
2015-04-14 19:52:47 -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
d57b23b1e3
Merge pull request #1912 from thinkyhead/some_fixes
...
Enable all old_z_*_endstop vars for Z_DUAL_ENDSTOPS
2015-04-14 05:12:49 -07: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
639ffc341e
Merge pull request #1910 from thinkyhead/some_fixes
...
Rename servos[] array in Marlin to servo[]
2015-04-14 03:44:20 -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
dee6840c50
Merge pull request #1907 from thinkyhead/some_fixes
...
Fix type of code_has_value
2015-04-13 18:04:53 -07:00
Scott Lahteine
642f6a92bc
fix type of code_has_value
2015-04-13 18:02:17 -07:00
Scott Lahteine
6b51305c4b
Merge pull request #1906 from thinkyhead/some_fixes
...
Naming and code comments
2015-04-13 17:59:48 -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
Scott Lahteine
c05b347617
Merge pull request #1902 from msutas/Development
...
Fix Syntax Error Filament Runout Statement
2015-04-13 14:31:57 -07:00
Mehmet Sutas
5a9e45cc4a
Fix Syntax Error Filament Runout Statement
2015-04-13 22:37:18 +03:00
Scott Lahteine
0908c41156
Merge pull request #1899 from thinkyhead/squash_fixups
...
Several fixups
2015-04-12 23:31:31 -07: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
cfa60bdb97
Merge branch 'Development' into squash_fixups
...
Conflicts:
Marlin/ultralcd.cpp
2015-04-12 22:51:18 -07:00
Scott Lahteine
ccddc280be
Apply three more commits
2015-04-12 22:47:44 -07:00
Scott Lahteine
666f9cd7b4
Merge pull request #1897 from epatel/Development
...
Manual bed leveling menu fixes.
2015-04-12 21:26:36 -07:00
Scott Lahteine
e7aae314de
Merge pull request #1896 from thinkyhead/cold_extrude
...
Homing fixes
2015-04-12 17:50:19 -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
Edward Patel
a37c7ff16d
Manual bed leveling menu fixes.
...
lcdDrawUpdate = 2 helped a lot!
2015-04-12 16:56:17 +02: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
b089eb42eb
Merge pull request #1893 from thinkyhead/cold_extrude
...
Fix doubled lcd_quick_feedback
2015-04-11 04:57:00 -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
f8b4ee079b
Merge pull request #1891 from thinkyhead/cold_extrude
...
machine name for hephestos too
2015-04-11 01:37:07 -07:00
Scott Lahteine
c6bb98abad
machine name for hephestos too
2015-04-11 01:36:24 -07:00
Scott Lahteine
79a5b14eb7
Merge pull request #1890 from thinkyhead/cold_extrude
...
Apply CUSTOM_MACHINE_NAME to configs
2015-04-11 00:04:46 -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
