Scott Lahteine
ab419795b3
Merge pull request #1511 from MagoKimbra/Reset_Alert_message_M600
Reset Alert message when finish M600 command
10 years ago
MagoKimbra
159196d1e9
Reset Alert message when finish M600 command
10 years ago
daid
266ff227cf
Merge pull request #1510 from docdawning/Development
Trivial spelling correction
10 years ago
DocDawning
dfd4e74a5c
Trivial spelling correction
10 years ago
Scott Lahteine
63a5ff7ab9
Merge pull request #1489 from tommil/Development
Updated Finnish language file
10 years ago
Scott Lahteine
961998cf91
Merge pull request #1496 from thinkyhead/issue_1493
Megatronics 3 servo pins
10 years ago
Scott Lahteine
59e92a2db4
Merge pull request #1506 from thinkyhead/issue_1504
Issue #1504 – K8200 Z_ENABLE_PIN
10 years ago
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.
10 years ago
Scott Lahteine
7c6236761a
Merge branch 'Development' into issue_1493
Merging latest upstream changes
10 years ago
Tommi Lamberg
3e6ae25481
Merge branch 'Development' of https://github.com/tommil/Marlin into Development
10 years ago
Tommi Lamberg
513ff94b89
Merge remote-tracking branch 'upstream/Development' into Development
10 years ago
Tommi Lamberg
07a9165ca2
Merge remote-tracking branch 'upstream/Development' into Development
10 years ago
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.
10 years ago
Scott Lahteine
7866fa161f
Merge pull request #1476 from Natealus/Development
Compiling errors with 4 Extruders defined and Viki 2 Implementation
10 years ago
Scott Lahteine
8cfdd3e8a4
Merge pull request #1423 from MoonCactus/Development
Multi-line G-code commands
10 years ago
Natealus
ea9e49b20d
ARRAY_BY_EXTRUDERS 4th hotend PID parameters
10 years ago
Scott Lahteine
d0ad8a978c
Megatronics 3 servo pins
- Naive implementation, assuming the data sheet pin numbers correspond
to Arduino pin numbers.
10 years ago
Tommi Lamberg
622a531d9c
Fixed error in translation
10 years ago
Tommi Lamberg
290ab42d22
Updated Finnish translations
10 years ago
Jérémie FRANCOIS
22a7985445
reverted to upstream
10 years ago
Jérémie FRANCOIS
b3bda57ca2
reverted to upstream
10 years ago
Jérémie FRANCOIS
9d75a56b56
Merge remote-tracking branch 'upstream/Development' into Development
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
10 years ago
Tommi Lamberg
0a59fee763
Merge remote-tracking branch 'upstream/Development' into Development
10 years ago
Scott Lahteine
d75cd69de4
Merge pull request #1488 from Wurstnase/Development
Bedleveling: X and Y must be Integers not Float!
10 years ago
Scott Lahteine
eb5889b3da
Merge pull request #1479 from AnHardt/en_first
#include "language_en.h" before the national language in language.h
10 years ago
Tommi Lamberg
a4f939cc27
Updated Finnish language file
10 years ago
Wurstnase
4546c92f5b
X and Y must be Integers not Float!
https://github.com/Wurstnase/Marlin/blob/Development/Marlin/Configuration.h#L427
10 years ago
Scott Lahteine
32d4dd073f
Merge pull request #1487 from AnHardt/iss1485
Fix for #1485
10 years ago
Scott Lahteine
f92b0dc6c7
Merge pull request #1486 from Souko/patch-1
Update ultralcd_st7920_u8glib_rrd.h
10 years ago
AnHardt
c246026bda
Sorry.
10 years ago
AnHardt
07e488cfae
Fix for #1485
10 years ago
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.
10 years ago
Scott Lahteine
8be25389f2
Merge pull request #1477 from AnHardt/languagetoconfig
Make display language configurable in Configuration.h
10 years ago
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.
10 years ago
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.
10 years ago
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.
10 years ago
AnHardt
8e92729141
Make display language configurable in Configuration.h
10 years ago
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.
10 years ago
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.
10 years ago
Jérémie FRANCOIS
85e5aa4011
Generalized enqueue_commands_P, and moved them to Marlin_main as they should
10 years ago
Scott Lahteine
c093ea36e6
Merge pull request #1472 from thinkyhead/issue_1471_fix
Fan speed and 4th extruder on graphical LCD
10 years ago
Scott Lahteine
aa67b38a44
Fan speed and 4th extruder on graphical LCD
- Display fan speed 0-1 as “—“ and 254-255 as “100%”.
- Display 4th extruder instead of the heated bed
10 years ago
Scott Lahteine
1a3c7d91f1
Merge pull request #1470 from thinkyhead/fix_eeprom_typo
Fix bad typo in ConfigurationStore.cpp
10 years ago
Scott Lahteine
72856166a9
Fix bad typo in ConfigurationStore.cpp
10 years ago
Scott Lahteine
3490a19103
Merge pull request #1466 from CONSULitAS/Development_K8200_de
K8200: Example Configuration.h fixed
10 years ago
CONSULitAS
cfbb94a2a8
K8200: Example Configuration.h fixed
Example Configuration.h: fixed strange white characters preventing
compilation in lines 1 and 3 - oops
10 years ago
Scott Lahteine
b65c5d8ec6
Merge pull request #1464 from AnHardt/iss1448-Menu
Unified menu selection - by hilighting - made first column avilable
10 years ago
Scott Lahteine
6250cc9a8d
Merge pull request #1465 from CONSULitAS/Development_K8200_de
K8200: Example Configurations back in sync and readme update
10 years ago
CONSULitAS
0de5083aff
K8200: Example Configurations readme.md updated
Example Configurations for K8200 readme.md updated
* readme.md: added description for german umlaut support on LCD
10 years ago
CONSULitAS
c421ffd520
K8200: Example Configuration_adv.h back in sync
Example Configuration_adv.h for K8200 back in sync
* Configuration_adv.h: rebased and added missing changes for 4th
extruder
10 years ago