MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,180 Commits 1 Branch 0 Tags 96 MiB
c7a97e18b7
Commit Graph

2180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
Tommi Lamberg
07a9165ca2 Merge remote-tracking branch 'upstream/Development' into Development 2015-02-13 21:09:52 +02:00
alexborro
afc737ca0c Fix CoreXY Homing Routine. 
Fixed how stepper ISR figure it out when the head (extruder) is going to
Min or Max direction.
Added Homing to Max Endstops.
 2015-02-13 14:38:05 -02:00
Scott Lahteine
7866fa161f Merge pull request #1476 from Natealus/Development 
Compiling errors with 4 Extruders defined and Viki 2 Implementation
 2015-02-12 16:56:55 -08:00
Scott Lahteine
8cfdd3e8a4 Merge pull request #1423 from MoonCactus/Development 
Multi-line G-code commands
 2015-02-12 16:29:30 -08:00
Natealus
ea9e49b20d ARRAY_BY_EXTRUDERS 4th hotend PID parameters 2015-02-12 00:56:47 -07:00
Scott Lahteine
d0ad8a978c Megatronics 3 servo pins 
- Naive implementation, assuming the data sheet pin numbers correspond
to Arduino pin numbers.
 2015-02-11 23:46:27 -08:00
Tommi Lamberg
622a531d9c Fixed error in translation 2015-02-11 08:50:48 +02:00
Tommi Lamberg
290ab42d22 Updated Finnish translations 2015-02-11 08:37:07 +02:00
Jérémie FRANCOIS
22a7985445 reverted to upstream 2015-02-11 07:12:55 +01:00
Jérémie FRANCOIS
b3bda57ca2 reverted to upstream 2015-02-11 07:12:02 +01:00
Jérémie FRANCOIS
9d75a56b56 Merge remote-tracking branch 'upstream/Development' into Development 
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
 2015-02-11 06:38:36 +01:00
Tommi Lamberg
0a59fee763 Merge remote-tracking branch 'upstream/Development' into Development 2015-02-11 06:53:43 +02:00
Scott Lahteine
d75cd69de4 Merge pull request #1488 from Wurstnase/Development 
Bedleveling: X and Y must be Integers not Float!
 2015-02-10 16:02:55 -08:00
Scott Lahteine
eb5889b3da Merge pull request #1479 from AnHardt/en_first 
#include "language_en.h" before the national language in language.h
 2015-02-10 15:33:45 -08:00
Tommi Lamberg
a4f939cc27 Updated Finnish language file 2015-02-10 10:48:33 +02:00
Wurstnase
4546c92f5b X and Y must be Integers not Float! 
https://github.com/Wurstnase/Marlin/blob/Development/Marlin/Configuration.h#L427
 2015-02-10 09:00:48 +01:00
Scott Lahteine
32d4dd073f Merge pull request #1487 from AnHardt/iss1485 
Fix for #1485
 2015-02-09 21:41:07 -08:00
Scott Lahteine
f92b0dc6c7 Merge pull request #1486 from Souko/patch-1 
Update ultralcd_st7920_u8glib_rrd.h
 2015-02-09 21:32:54 -08:00
AnHardt
c246026bda Sorry. 2015-02-10 00:23:39 +01:00
AnHardt
07e488cfae Fix for #1485 2015-02-10 00:13:46 +01:00