0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
5036 commits 3 branches 0 tags 230 MiB
Commit graph

5036 commits

This branch
This branch
All branches
Author SHA1 Message Date
João Brázio eafa16a781
Minor #warning fix for PrintCounter 2016-05-10 14:14:54 +01:00
João Brázio 5373ac6373
Updated example configurations 2016-05-10 13:42:00 +01:00
João Brázio aa5a4716cf
Update default config 2016-05-10 13:37:21 +01:00
João Brázio a878c09614
Cleanup of the buildroot 2016-05-10 03:37:17 +01:00
Scott Lahteine c4e6e41b05 Merge pull request #3712 from esenapaj/patch-1 
Update Japanese translation, etc
 2016-05-09 12:30:47 -07:00
esenapaj 1a75509a3c Cleanup for Danish file 
・Arrange the strings in unified order
・Remove "#ifdef DELTA_CALIBRATION_MENU" directive
・Adjust spacing
 2016-05-10 02:43:25 +09:00
esenapaj cf6c607425 Update Japanese translation 
・Add new translation
・Add translation for 16 width ASCII LCD
・Change translation
・Revert translation from Japanese to English
・Fix typo
 2016-05-10 02:43:24 +09:00
Scott Lahteine 6f36b7c1cd Merge pull request #3224 from yarda/fix-melzi2-arduino-1.6.x 
Fixed Makefile to work with Melzi2 boards on arduino-1.6.x
 2016-05-08 19:33:37 -07:00
Scott Lahteine 050e0bd2af Merge pull request #3705 from thinkyhead/rc_runaway_logic 
Fallthru in thermal runaway test when TRState changes
 2016-05-08 19:00:24 -07:00
Scott Lahteine 5f7ad16b19 Merge pull request #3707 from thinkyhead/rc_fix_delta_blocking_move 
Fix dipping on DELTA robots during G29
 2016-05-08 18:42:57 -07:00
Scott Lahteine 96b71e62c0 Fix dipping on DELTA robots during G29 
- Addressing #3689, et. al.
 2016-05-08 18:28:46 -07:00
Scott Lahteine 3b9c5404a4 Merge pull request #3706 from thinkyhead/rc_fix_sanity_closure 
Enclose #error strings with apostrophes in quotes
 2016-05-08 18:09:31 -07:00
Scott Lahteine ea1dd31851 Enclose #error strings with apostrophes in quotes 2016-05-08 18:08:39 -07:00
Scott Lahteine 9b92bb8f31 Set the initial state based on target temperature 2016-05-08 17:25:44 -07:00
Scott Lahteine 6b13c430ae The TRReset state is not needed with fall-through 2016-05-08 17:01:46 -07:00
Scott Lahteine c2522ce1f5 Fallthru in thermal runaway test when TRState changes 2016-05-08 16:51:33 -07:00
Scott Lahteine d32d9a3c5c Merge pull request #3672 from thinkyhead/rc_consolidate_probe_flags 
Cleanup and consolidate probe conditionals for clarity
 2016-05-08 16:42:22 -07:00
Scott Lahteine 77e25043a9 Merge pull request #3701 from esenapaj/patch-2 
Fix compilation error in debugging  code
 2016-05-08 13:06:59 -07:00
Scott Lahteine 15fc93d742 Cleanup and consolidate probe conditionals for clarity 2016-05-08 12:59:43 -07:00
Scott Lahteine 5ca6334fd2 Cleanup pins files, fixup analogtodigitalpin, etc. 2016-05-08 12:38:00 -07:00
esenapaj 9186be7b83 Fix compilation error in debugging code 
Fix compilation error in Thermal Runaway debugging code
 2016-05-09 01:57:21 +09:00
Scott Lahteine d7819298ca Merge pull request #3687 from thinkyhead/rc_localize_babystepping 
Use AxisEnum with _lcd_babystep()
 2016-05-05 21:15:52 -07:00
Scott Lahteine 51109d4af7 Use AxisEnum with _lcd_babystep() 2016-05-05 21:04:30 -07:00
Scott Lahteine 58ea246f98 Merge pull request #3685 from thinkyhead/rc_localize_babystepping 
Localize babystepping in the Temperature class
 2016-05-05 20:56:04 -07:00
Scott Lahteine b65ea98d6b Localize babystepping in the Temperature class 
So that `ultralcd.cpp` doesn’t need to worry about the details.
 2016-05-05 15:00:31 -07:00
Scott Lahteine 0c7beb832c Merge pull request #3681 from esenapaj/patch-1 
Follow-up the PR #3643(Temperature singleton)
 2016-05-05 12:47:06 -07:00
Scott Lahteine fc5fe2cc22 Merge pull request #3678 from jbrazio/rework/delta-diagonal-rod-timmers 
Moved DELTA radius/rod default trimmer values to Conditionals.h
 2016-05-05 11:38:14 -07:00
esenapaj 1a97442d19 Follow-up the PR #3643(Temperature singleton) 
Follow-up the PR #3643(Temperature singleton)

・Change from fanSpeedSoftPwm[0] to thermalManager.fanSpeedSoftPwm[0] in planner.cpp
It fix compilation error when FAN_SOFT_PWM is enabled.

・Remove declaration of setExtruderAutoFanState() in temperature.h
Because that function was abolished.

・Change from babystepsTodo to thermalManager.babystepsTodo in ultralcd.cpp
It fix compilation errors when BABYSTEPPING is enabled.
 2016-05-05 18:01:39 +09:00
Scott Lahteine 4f6120f70f Merge pull request #3643 from thinkyhead/rc_singletons_plus_temperature 
Temperature singleton
 2016-05-04 20:41:46 -07:00
Scott Lahteine 084f6b5b44 Temperature singleton class 2016-05-04 19:42:12 -07:00
Scott Lahteine 142bd3f3e7 Disable THERMAL_PROTECTION_BED with no sensor 2016-05-04 19:36:51 -07:00
Scott Lahteine a5a6b86898 Merge pull request #3679 from thinkyhead/rc_fix_3677 
Can't use the ENABLED macro as a boolean
 2016-05-04 16:49:50 -07:00
Scott Lahteine 13f85a2b50 Can't use the ENABLED macro as a boolean 2016-05-04 16:33:57 -07:00
João Brázio 23567a1d8b
Moved DELTA radius/rod default trimmer values to Conditionals.h 2016-05-05 00:18:32 +01:00
Scott Lahteine b4b5c7a6b7 Merge pull request #3670 from thinkyhead/rc_scoovo_controller 
Use directional buttons when defined
 2016-05-03 17:42:18 -07:00
Scott Lahteine 5ff10991c0 Merge pull request #3671 from thinkyhead/rc_ultimate_stepper_planner_patch 
Ultimate followup to Stepper/Planner patch
 2016-05-03 17:09:23 -07:00
Scott Lahteine 6398d497b3 Ultimate followup to Stepper/Planner patch 
- Search all symbols and apply prefixes where needed
- Encapsulate some private methods
- Inline some setters
- Make `microstep_mode` a public method
 2016-05-03 17:07:37 -07:00
Scott Lahteine ddafb859e2 Use directional buttons when defined 2016-05-03 12:50:49 -07:00
Scott Lahteine b959020532 Merge pull request #3667 from esenapaj/patch-1 
Additional follow-up the PR #3631(Encapsulate S...
 2016-05-03 09:36:09 -07:00
Scott Lahteine 4e1a91caa1 Merge pull request #3669 from esenapaj/patch-2 
Fix for PR #3526(Configuration.h LCD & SDCard s...
 2016-05-03 09:33:27 -07:00
esenapaj 212b17d510 Fix for PR #3526(Configuration.h LCD & SDCard s... 
Fix for PR #3526(Configuration.h LCD & SDCard section rewrite)

It removes duplicated BQ_LCD_SMART_CONTROLLER.
 2016-05-03 21:35:02 +09:00
esenapaj 605808fe37 Additional follow-up the PR #3631(Encapsulate S... 
Additional follow-up the PR #3631(Encapsulate Stepper, Planner, Endstops in singleton classes)

・Change from abort_on_endstop_hit to stepper.abort_on_endstop_hit in endstop.cpp, Marlin_main.cpp, and ultralcd.cpp
・Add include path to cardreader.h and temperature.h in endstop.cpp(for CardReader class and disable_all_heaters())
It fix compilation error when ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED and SDSUPPORT are enabled.

・Change from digipot_current() to stepper.digipot_current() in Marlin_main.cpp
・Change from digitalPotWrite() to stepper.digitalPotWrite() in Marlin_main.cpp
It fix compilation errors when HAS_DIGIPOTSS is enabled.

・Change from microstep_mode() to stepper.microstep_mode() in Marlin_main.cpp
・Change attribute of microstep_mode() from private to public in stepper.h
・Change from microstep_readings() to stepper.microstep_readings() in Marlin_main.cpp
・Change from microstep_ms() to stepper.microstep_ms() in Marlin_main.
It fix compilation errors when HAS_MICROSTEPS is enabled.
 2016-05-03 18:28:37 +09:00
Scott Lahteine 6bb664c690 Merge pull request #3665 from thinkyhead/rc_stepper_babystep 
Fix BABYSTEPPING, add it to Travis test
 2016-05-02 20:44:04 -07:00
Scott Lahteine 7fd0243048 Cleanup, debug strings in Planner::adjusted_position 2016-05-02 20:11:27 -07:00
Scott Lahteine 85e732d5fd Fix BABYSTEPPING, add it to Travis test 2016-05-02 20:01:00 -07:00
Scott Lahteine 37c4970d87 Merge pull request #3660 from esenapaj/patch-2 
Follow-up the PR #3631(Encapsulate Stepper, ...
 2016-05-02 15:23:38 -07:00
Scott Lahteine ad27d3c523 Merge pull request #3659 from esenapaj/patch-1 
Some clean-up for example configuration files
 2016-05-02 15:22:29 -07:00
Scott Lahteine f1c1a8dc59 Merge pull request #3661 from Blue-Marlin/83filen2 
8.3-filenames second try
 2016-05-02 14:47:26 -07:00
Jochen Groppe 0bae00c1ed Merge pull request #3644 from tkurbad/german_translation 
Revisited German translation
 2016-05-02 16:46:19 +02:00
Blue-Marlin 5ad7d263e9 8.3-filenames second try 
Fix for #6 3593, #3648
this time excludung 'DEL' instead of accidently '~'.
 2016-05-02 15:58:04 +02:00