bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity
12,782 Commits 1 Branch 4 Tags
9434b81a82f17d4908ff9f5823fad0cf9b78e30c
Commit Graph

12782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Lahteine
422582da71 Prep formatting for upcoming PR 2015-02-21 18:24:16 -08:00
Scott Lahteine
27ac3e985d Add options to example_configurations 2015-02-21 18:17:37 -08:00
Scott Lahteine
0d6a7a2df0 Merge with latest upstream changes 2015-02-21 18:13:31 -08:00
Scott Lahteine
c7a97e18b7 Merge branch 'Development' into cleanup_ultralcd 
Latest upstream changes
 2015-02-21 18:04:08 -08:00
Scott Lahteine
6d5c13df74 Merge pull request #1520 from thinkyhead/fixup_temperature 
Fix typos in checkExtruderAutoFans
 2015-02-21 17:53:26 -08:00
Scott Lahteine
5b9e341222 Merge pull request #1516 from thinkyhead/fixup_ramps 
Cleanup ramps boards
 2015-02-21 17:51:57 -08:00
Scott Lahteine
57bc28b42c Cleanup and fix ultralcd.cpp 
- Fix bug in lcd_control_temperature_menu
- Remove test menu-item left in from multi-line command feature
- Replace literals with translatable strings
- Reduce lcd_preheat code redundancy
- Reduce menu macro redundancy
- Clean up formatting
 2015-02-21 17:38:56 -08:00
Scott Lahteine
4fcd4b444e Merge pull request #1519 from thinkyhead/fix_recent_issues 
Fix implementation of PID menu items
 2015-02-21 16:43:11 -08:00
Scott Lahteine
9c35ed149d Merge pull request #1508 from AnHardt/iss1492 
Fix iss#1492
 2015-02-21 16:26:37 -08:00
Scott Lahteine
430c4b6538 Replace missing backslash 2015-02-20 02:17:16 -08:00
Scott Lahteine
3aa5f98b64 Download all as ZIP, adjust layout on resize 2015-02-20 02:12:00 -08:00
Scott Lahteine
a8939eec28 Readability of MENU_MULTIPLIER_ITEM 
Last commit before bed.
 2015-02-20 02:08:41 -08:00
Scott Lahteine
09e09b308e Tweaky spacing adjustments 2015-02-20 01:22:56 -08:00
Scott Lahteine
e3fd3e8fa4 Fix typos in checkExtruderAutoFans 2015-02-20 00:08:59 -08:00
Scott Lahteine
c610471b0c Add PID_PARAMS_PER_EXTRUDER conditional 2015-02-20 00:00:19 -08:00
Scott Lahteine
2d6fa9ce80 Proper implementation of PID menu items 
- Make this work per #1344
 2015-02-19 23:54:06 -08:00
wgm4321
b8e79dce89 Fix compilation errors when encoder multiplier is disabled 2015-02-19 21:51:23 -05:00
wgm4321
65e1fc71be Add encoder rate multiplier 2015-02-19 21:42:57 -05:00
Scott Lahteine
c9465c33cf Merge branch 'thinkyhead-fixup_ramps_boards' into Development 
Merge resolving conflicts
 2015-02-19 17:36:49 -08:00
Scott Lahteine
623119619c Merge branch 'fixup_ramps_boards' of https://github.com/thinkyhead/Marlin into thinkyhead-fixup_ramps_boards 
Merge commit
 2015-02-19 17:36:00 -08:00
Scott Lahteine
859c8d3fef Azteeg X3 overrides too 2015-02-19 17:28:38 -08:00
Scott Lahteine
7891eacf21 Merge branch 'Development' into fixup_ramps_boards 
- Also apply cleanup for #1514
 2015-02-19 17:26:22 -08:00
Scott Lahteine
b12cd1f841 Merge pull request #1514 from 2PrintBeta/Development 
Initial definitions for the Boards BAM&DICE + BAM&DICE Due
 2015-02-19 17:17:34 -08:00
Scott Lahteine
1600506545 Merge remote-tracking branch 'upstream/Development' into marlin_configurator 2015-02-19 15:15:55 -08:00
Scott Lahteine
5d0c93ae10 Keep config boxes in view on wide screen 2015-02-19 03:41:41 -08:00
Scott Lahteine
335b7680c9 Tooltip code, widescreen layout, hide auto-expands 
Slightly better layout for wide screens.
 2015-02-19 03:11:16 -08:00
domonoky
15b73386b5 Add pin definitions for the Boards BAM&DICE + BAM&DICE Due 2015-02-19 11:53:31 +01:00
Scott Lahteine
08c236059e Merge pull request #1505 from thinkyhead/issue_1499 
Bed leveling probe behavior issue?
 2015-02-19 01:24:17 -08:00
Scott Lahteine
ab419795b3 Merge pull request #1511 from MagoKimbra/Reset_Alert_message_M600 
Reset Alert message when finish M600 command
 2015-02-19 01:19:56 -08:00
Scott Lahteine
f238c7428d Merge branch 'Development' into marlin_configurator 
Latest upstream changes
 2015-02-18 21:56:17 -08:00
Scott Lahteine
da275c72ab Cleanup Github reply.data.content before atob() 2015-02-18 21:45:38 -08:00
MagoKimbra
159196d1e9 Reset Alert message when finish M600 command 2015-02-18 21:33:38 +01:00
daid
266ff227cf Merge pull request #1510 from docdawning/Development 
Trivial spelling correction
 2015-02-17 20:59:32 +01:00
DocDawning
dfd4e74a5c Trivial spelling correction 2015-02-17 12:37:05 -07:00
AnHardt
6cdcd6c6d1 Fix iss#1492 
Introduced lcd_strlen() and lcd_strlen_P().
Replaced the old functions where necessary.
Reworked language_ru.h.

Speeded up test for zero length string in cardreader.cpp
 2015-02-16 13:53:58 +01:00
Scott Lahteine
c033904693 Updated config file section markers 2015-02-15 23:25:57 -08:00
Scott Lahteine
84a87a5b1c Fix up configs a little 2015-02-15 23:19:22 -08:00
Scott Lahteine
63a5ff7ab9 Merge pull request #1489 from tommil/Development 
Updated Finnish language file
 2015-02-15 23:02:11 -08:00
Scott Lahteine
efb0491d40 Merge branch 'Development' into issue_1499 
Merging latest upstream changes
 2015-02-15 22:59:07 -08:00
Scott Lahteine
8309b4f408 Merge branch 'Development' into marlin_configurator 
Merging latest upstream changes
 2015-02-15 22:58:04 -08:00
Scott Lahteine
961998cf91 Merge pull request #1496 from thinkyhead/issue_1493 
Megatronics 3 servo pins
 2015-02-15 22:00:14 -08:00
Scott Lahteine
59e92a2db4 Merge pull request #1506 from thinkyhead/issue_1504 
Issue #1504 – K8200 Z_ENABLE_PIN
 2015-02-15 21:59:30 -08:00
Scott Lahteine
b71322e793 Issue #1504 – K8200 Z_ENABLE_PIN 
- K8200 uses a non-standard RAMPS with Z_ENABLE=63 ??
- Assuming from previous input that 3DRAG is the same.
 2015-02-15 21:56:23 -08:00
Scott Lahteine
978d114c73 Bed leveling probe behavior issue? 
The `float` keyword should not be on these vars because they conceal
the outer vars, preventing them from obtaining known values before
being passed in `set_bed_level_equation_3pts`. Possibly related to
`Z_RAISE_BETWEEN_PROBING` not functioning.
 2015-02-15 20:51:27 -08:00
Scott Lahteine
7c6236761a Merge branch 'Development' into issue_1493 
Merging latest upstream changes
 2015-02-15 20:45:35 -08:00
Scott Lahteine
9875352dd8 Merge branch 'Development' into marlin_configurator 
Merging latest upstream changes
 2015-02-15 20:44:21 -08:00
MarcelMo
d28f5b9e82 Support for simple customisable AutoZProbing area 
When probing PCB´s I had the problem that i needed auto-leveling for specific areas (it´s never the same size).
Not much code, but very useful.
Now I use simply G29 L5 R55 F5 B35 P3 to probe a 4x6cm PCB before milling.
I used int for values... might be wrong...
I hope this time I got the right development tree. (tried first with https://github.com/MarlinFirmware/Marlin/pull/1130/commits)
 2015-02-15 15:58:29 +01:00
Tommi Lamberg
3e6ae25481 Merge branch 'Development' of https://github.com/tommil/Marlin into Development 2015-02-15 12:21:57 +02:00
Tommi Lamberg
513ff94b89 Merge remote-tracking branch 'upstream/Development' into Development 2015-02-15 12:21:45 +02:00
Scott Lahteine
83cb702e72 Config sections, multi-field values, toggles, etc 
- Auto-detect “switchable” items where possible
- Handle switchable multi-value fields
- Add standard sections to config form
- Add section markers to configurations
- Add value options to configurations
- Remove and re-add fields for loaded configs
- Preserve sections across configs
- Preserve non-added fields
- Style added fields wider & newline by default
 2015-02-14 23:44:01 -08:00