melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,722 Commits 2 Branches 0 Tags 2 GiB
8684570f68
Commit Graph

5722 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Lahteine
7641f414cf Merge pull request #4069 from esenapaj/Follow-up-the-PR-#4055 
Follow-up the PR #4055 (Croatian language support)
 2016-06-17 14:13:37 -07:00
Scott Lahteine
dbb6d1ef45 Merge pull request #4071 from token47/patch-1 
Update README.md
 2016-06-17 14:11:32 -07:00
Andre Ruiz
d087ae0b9f Update README.md 2016-06-17 17:02:18 -03:00
João Brázio
d1e5dc6319
Fixes misc gcc warnings 2016-06-17 20:24:24 +01:00
esenapaj
c5eecb11b2 Follow-up the PR #4055 (Croatian language support) 
・Update a forgotten Configuration.h of Cartesio
 2016-06-17 21:20:15 +09:00
Scott Lahteine
cabb71ff38 Merge pull request #4064 from jbrazio/feature/update-gitignore 
Updates .gitignore
 2016-06-16 18:24:23 -07:00
João Brázio
e7ab26dc9c
Updates .gitignore 2016-06-17 01:50:51 +01:00
Scott Lahteine
d991a4c24a Merge pull request #4063 from thinkyhead/rc_remove_swp_files 
Delete mysterious .swp files from #3609
 2016-06-16 17:22:48 -07:00
Scott Lahteine
8d8cbef1de Merge pull request #4055 from thinkyhead/rc_croatian_language 
Croatian language support
 2016-06-16 17:22:25 -07:00
Scott Lahteine
ebbed2975e Delete mysterious .swp files from #3609 2016-06-16 16:42:03 -07:00
Scott Lahteine
c42b1364b2 Merge pull request #4045 from thinkyhead/rc_max_feedrate_is_mm_s 
Fix feedrate in gcode_T (max_feedrate is mm/s)
 2016-06-16 16:23:22 -07:00
Scott Lahteine
02e5dad29a Include Croatian in language listings 2016-06-16 16:18:26 -07:00
Scott Lahteine
2015aad867 Tweak Croatian language file heading 2016-06-16 16:09:57 -07:00
Robert Marko
884bc63fbe Add Croatian language 2016-06-16 16:09:57 -07:00
Scott Lahteine
ef3bef6b9e Fix feedrate in gcode_T (max_feedrate is mm/s) 2016-06-16 16:03:14 -07:00
Scott Lahteine
9030ceec1d Merge pull request #4056 from thinkyhead/rc_mfinit 
Script to init the upstream remote for Marlin
 2016-06-16 15:44:14 -07:00
Scott Lahteine
4640974e1b Merge pull request #4060 from esenapaj/Follow-up-the-PR-#4053 
Follow-up and improvement the PR #4053 (CNControls Cartesio UI Support)
 2016-06-16 15:44:00 -07:00
Scott Lahteine
340f97d635 Add ghtp script to set remotes to HTTP or SSL 2016-06-16 12:56:39 -07:00
Scott Lahteine
55edb37b52 Merge pull request #4058 from MagoKimbra/gcode_T 
Fix gcode_T
 2016-06-16 12:54:21 -07:00
esenapaj
106227540e Follow-up and improvement the PR #4053 (CNControls Cartesio UI Support) 
・Add implimantation of PR #3609 to configuration files of Cartesio
・Standardize macro names
 2016-06-16 19:22:31 +09:00
MagoKimbra
008d0637dd Fix gcode_T 2016-06-16 09:05:36 +02:00
Scott Lahteine
cd9ecfdcb1 Merge pull request #4057 from thinkyhead/rc_babysteps_mm 
Babystepping show millimeters on LCD
 2016-06-15 23:03:46 -07:00
edwilliams16
114d9db7d0 Show babysteps on the LCD in mm, not steps 2016-06-15 23:03:24 -07:00
Scott Lahteine
b410bf933b Merge pull request #4053 from thinkyhead/rc_cartesio_redo 
CNControls Cartesio UI Support
 2016-06-15 22:33:45 -07:00
Scott Lahteine
4fa05913c3 Script to init the upstream remote for Marlin 2016-06-15 22:24:10 -07:00
Scott Lahteine
f639044c24 Merge pull request #3609 from jbrazio/feature/config-version 
Adds versioning for Configuration.h & Configuration_adv.h
 2016-06-15 22:09:47 -07:00
Scott Lahteine
4d2cb70152 Cartesio UI Support 2016-06-15 21:46:54 -07:00
Scott Lahteine
da90bbe0eb Merge pull request #4010 from thinkyhead/rc_toolchange_adjust 
Fixup position adjustment on toolchange
 2016-06-15 21:10:33 -07:00
Scott Lahteine
948c467e16 Merge pull request #4043 from AnHardt/save_delay 
Introduce save_delay()
 2016-06-15 21:06:43 -07:00
Scott Lahteine
4b93989a77 MBL Z adjustment on toolchange 2016-06-15 20:49:36 -07:00
Scott Lahteine
9c800d1f8c Position adjustment for bed leveling 2016-06-15 20:49:36 -07:00
Scott Lahteine
8c7babb70f Merge pull request #4049 from esenapaj/Fix-for-the-PR-#4023 
Fix for the PR #4023(Add macros to move servos)
 2016-06-15 20:39:46 -07:00
Scott Lahteine
2d6de3e592 Merge pull request #4047 from Alex9779/Fix/ultralcd_move_e 
RCBugFix with UltraLCD active does not compile
 2016-06-15 20:38:41 -07:00
AnHardt
1219310622 Introduce save_delay() 
Introduce save_delay() for long delays what otherwise would cause
watchdog resets

Explizit lcd_set_custom_characters(false) at the end of bootscreen().
Else the charset is not proper set in case of LCD_PROGRESS_BAR.
 2016-06-15 18:11:55 +02:00
esenapaj
44f091a413 Fix for the PR #4023(Add macros to move servos) 
・Add missing ')'
 2016-06-15 22:34:55 +09:00
Alexander Leisentritt
c2b7ef1e7e "e" was renamed to "eindex" in a previous commit 2016-06-15 11:11:16 +02:00
Scott Lahteine
52ac2a62ee Merge pull request #4013 from thinkyhead/rc_toolchange_no_move 
Use "Tn S1" to change tools without moving
 2016-06-14 20:13:01 -07:00
Scott Lahteine
d2a00b74e3 Merge pull request #4004 from thinkyhead/rc_feedrate_in_gcode_T 
Use linear feedrate in gcode_T, not volumetric
 2016-06-14 20:10:08 -07:00
Scott Lahteine
0ad26d0de8 Merge pull request #4034 from AnHardt/custom-splash-screen 
Custom Splash Screen
 2016-06-14 18:51:39 -07:00
Jochen Groppe
574c938ab9 Merge pull request #4040 from esenapaj/Follow-up-the-PR-#3676 
Follow-up the PR #3676(Advance extrusion algorithm – LIN_ADVANCE)
 2016-06-14 19:22:49 +02:00
esenapaj
741cda0e47 Follow-up the PR #3676(Advance extrusion algorithm – LIN_ADVANCE) 
・Update forgotten example configurations
 2016-06-15 00:10:15 +09:00
AnHardt
02b3d6b8d3 Custom Splash Screen 
Custom Splash Screen for full graphic displays.

Too complicated for the hitachis without knowing what exactly to display.

On top of #4032
Realisation of an idea from #3996
 2016-06-14 09:39:28 +02:00
Scott Lahteine
78a48d7e3c Merge pull request #4038 from thinkyhead/rc_fix_heater_off 
Fix broken DISABLE_HEATER macro
 2016-06-13 20:58:34 -07:00
Scott Lahteine
ee5be92206 Fix broken DISABLE_HEATER macro 2016-06-13 20:57:58 -07:00
Scott Lahteine
fc4fb9eba1 Merge pull request #4036 from thinkyhead/rc_lin_advance_feature 
Parse M905 args in Marlin_main.cpp
 2016-06-13 19:26:29 -07:00
Scott Lahteine
8d8180e028 Parse M905 args in Marlin_main.cpp 2016-06-13 19:25:28 -07:00
Scott Lahteine
e7e57f0eb4 Merge pull request #4035 from thinkyhead/rc_lin_advance_feature 
Patch LIN_ADVANCE to use code_value_float
 2016-06-13 18:55:14 -07:00
Scott Lahteine
2b340f5acb patch LIN_ADVANCE to use code_value_float 2016-06-13 18:54:25 -07:00
Scott Lahteine
b708196770 Merge pull request #4032 from AnHardt/bootscreen-delay 
Show bootscreen later
 2016-06-13 18:27:05 -07:00
Scott Lahteine
587de1b6b6 Merge pull request #3676 from thinkyhead/rc_lin_advance_feature 
Advance extrusion algorithm – LIN_ADVANCE
 2016-06-13 18:04:58 -07:00