Commit graph

2172 commits

Author SHA1 Message Date
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 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 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
Souko e7ecf14d0c Update ultralcd_st7920_u8glib_rrd.h
Fixed delay-times during Init. REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER won't get initialized on some Boards because delay was to short.
2015-02-09 21:46:06 +01:00
Scott Lahteine 8be25389f2 Merge pull request #1477 from AnHardt/languagetoconfig
Make display language configurable in Configuration.h
2015-02-09 05:36:57 -08:00
Natealus f4b0a40abb Additional fixes to temperature.cpp and found another missing line
Looks like INVERT_E3_DIR was missing in the configuration.h also as I
did a test compile with 4 extruders and Azteeg X3 Pro defined. So I also
added those lines too. Additional formatting to make the comments line
up better in that section.
2015-02-08 15:43:58 -07:00
AnHardt 3aac2df057 Now the oter way around.
Include of language_en.h now behind national language.

All "#define MSG_STR_*" now surrounded by #ifndef and #endif.
2015-02-08 20:41:20 +01:00
AnHardt 488633bf44 #include "language_en.h" before the national language in language.h
+ May decrease the workload for feature developers. They may omit to
update all the language files but "language_en.h". When loading _en
first, all new features give some display, but the new in English.

- May throw some additional warnings about redefinition during compile.
2015-02-08 14:26:24 +01:00
AnHardt 8e92729141 Make display language configurable in Configuration.h 2015-02-08 13:45:22 +01:00
Natealus 38a500d05c Viki 2 Implementation
I've insert the define and pointer entries for the Viki 2 and miniViki
from Panucatt in all of the example configs and main config. With these
additions and with pins done in the old single pin.h style...I was able
to get the display working fine save for needing to turn Delta Segments
per Second down. But that's a common graphics lcd issue being looked
into right now.

I need assistance in understanding how the new divided pins files fit
together because my previous attempts at trying to get it to work
appropriately didn't seem successful. This originally came from trying
to find out how to swap the XYZ Min and Max Endstop pins in the Azteeg
X3 Pro. It only comes with one set of connectors and they're Min
Endstops. My previous experience didn't turn out well trying to tell the
firmware to home to the Min Endstops so the best solution I found was to
swap the pins in the firmware. If I'm missing a conflict with a setup
other than delta please let me know, but it makes sense in my setup.
2015-02-08 03:14:59 -07:00
Natealus 697ee2dc50 Compiling errors with 4 Extruders defined
Here were a few changes that I had to make/add lines for the 4th hotend.
A compiling problem in the Temperature.cpp and missing lines in
configuration.h and configuration_adv.h. I added these lines in all of
the example configs too.
2015-02-08 01:05:05 -07:00