melch
/
Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,533 Commits
2 Branches
0 Tags
2.0 GiB
x301
2.0.x
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'de8c0baf8b'
${ noResults }
Commit Graph

4533 Commits (de8c0baf8b103ea6c28b00fe4e0261d72eb4bfa5)
 

Author SHA1 Message Date
Scott Lahteine 7ea4e095ad Merge pull request #3220 from thinkyhead/rc_tori_spelling 
Patch minor spelling error in cn, en, gl language file headings
 9 years ago
Scott Lahteine bcbac698f2 Patch minor spelling issue in cn, en, gl language file headings 9 years ago
Scott Lahteine 49ed4696ea Merge pull request #3218 from AnHardt/lost-pin-undef 
Fix lost undef Y_MAX_PIN in pins.h
 9 years ago
Scott Lahteine 7112f2e41a Merge pull request #3204 from esenapaj/patch-3 
Change link to the document
 9 years ago
Scott Lahteine 041fc639d7 Merge pull request #3215 from AnHardt/fix-kickstart 
Fix Fan KICKSTART
 9 years ago
AnHardt 1c6a16d5bb Send position updates to RH 
Send position updates to RH where RH can not know the end position.

For example after G28 RepetierHost assumes to be at the homing-point,
but with a servo probe we are much higher. Now the RH-software-endstops
will prevent us from going down (if activated). With this patch the
internal position of RH is updated with `current_position[]`.
 9 years ago
AnHardt 1b336971ae Fix lost undef Y_MAX_PIN in pins.h 9 years ago
AnHardt ba4eebad2f Fix Fan KICKSTART 
Sorting ot what else belongs to what if was not so hard.
But the static `ms = ms = millis();` was a bit surpising.
 9 years ago
Scott Lahteine cbce025248 Merge pull request #3217 from thinkyhead/rc_updated_kana 
Patch-up to commits for Kana #3203.
Closes #3203.
 9 years ago
esenapaj 665338bb69 Update Japanese translation 9 years ago
Scott Lahteine 97ed8abd3f Merge pull request #3213 from AnHardt/extend-gitignore 
Extend .gitignore
 9 years ago
Scott Lahteine b705ae0cb0 Merge pull request #3210 from thinkyhead/rc_cleanup_travis_ci 
Improve Travis CI test
 9 years ago
Scott Lahteine 1cd1ccbf86 Enable/disable multiple options on a single line. 9 years ago
Scott Lahteine ff272c7b69 Improve Travis CI test 
- Add shell scripts to help with managing configs
- Clean up .travis.yml file by using shell scripts
- Don’t download “astyle” – not needed and delays Travis results
 9 years ago
AnHardt 0c8e747f88 extend .gitignore 9 years ago
Scott Lahteine 815943ceed Merge pull request #3209 from AnHardt/call-buzz-direct 
Call buzz() directly from M428
 9 years ago
AnHardt 6486e8b74a Call buzz() directly from M428 9 years ago
jbrazio 757661b299 Toshiba Flash Air Wifi SD card support 9 years ago
esenapaj fc75e6f92d Follow-up the PR #3082, etc 
Follow-up the PR #3082
Follow-up the commit 143ad74: unnoticed updates
Fix for commit b0f5ba0: Z offset: -front [of the nozzle] +behind -> Y offset: -front [of the nozzle] +behind
Standardize the writing method: Z-probe, z-probe -> Z Probe
Adjust spacing
 9 years ago
esenapaj 22299c13c1 Change link to the document 
documentation/LCDLanguageFont.md moved to http://www.marlinfirmware.org/ at commit 12d0983757,
but http://www.marlinfirmware.org/ isn't working.
 9 years ago
PheiPheiPhei adb5375a09 Enabling servo usage on boards with PWM current control 
Enabling servo usage on boards with PWM current control
timer5 is used by some boards like the Mini Rambo for controlling motor current via PWM, see stepper.cpp.
```cpp
  #ifdef MOTOR_CURRENT_PWM_XY_PIN
    pinMode(MOTOR_CURRENT_PWM_XY_PIN, OUTPUT);
    pinMode(MOTOR_CURRENT_PWM_Z_PIN, OUTPUT);
    pinMode(MOTOR_CURRENT_PWM_E_PIN, OUTPUT);
    digipot_current(0, motor_current_setting[0]);
    digipot_current(1, motor_current_setting[1]);
    digipot_current(2, motor_current_setting[2]);
    //Set timer5 to 31khz so the PWM of the motor power is as constant as possible. (removes a buzzing noise)
    TCCR5B = (TCCR5B & ~(_BV(CS50) | _BV(CS51) | _BV(CS52))) | _BV(CS50);
  #endif
}
```
Using the same timer for controlling servos results in loss of motor control. So use timer4/3 for those boards instead.
[See discussion here.](http://shop.prusa3d.com/forum/software-f13/enabling-auto-leveling-in-firmware-t416-s40.html)
 9 years ago
Scott Lahteine cadded1e21 Merge pull request #3201 from jbrazio/feature/update-hephestos2-default-config 
Update the Hephestos 2 default config
 9 years ago
jbrazio 04e57e2b5e Update the Hephestos 2 default config 9 years ago
Scott Lahteine 40c7e5d4e7 Merge pull request #3199 from esenapaj/patch-2 
fix spelling
 9 years ago
esenapaj f260e00a72 fix spelling 
Thermister -> Thermistor
 9 years ago
Scott Lahteine b1a3a95ad4 Tweak controllerFan to save a cycle or two 9 years ago
Scott Lahteine 04a6924633 Make DISABLE_INACTIVE_X, etc., the same as DISABLE_X (etc.) if missing 9 years ago
Scott Lahteine 15fccd43ee Fix spacing of an #endif 9 years ago
Scott Lahteine be08eb6153 Merge pull request #3194 from jbrazio/feature/add-pt_pt-utf8 
Add pt_pt-utf8 language pack and fix some minor compiler warnings
 9 years ago
Scott Lahteine d1ff7959b7 Merge pull request #3188 from esenapaj/patch-1 
follow-up the commit b82d91e
 9 years ago
Scott Lahteine 10caee2b7c Merge pull request #3187 from AnHardt/target_extruder_number 
Fix extrudernum in MSG_INVALID_EXTRUDER
 9 years ago
Scott Lahteine 1cc316f1fd Merge pull request #3082 from thinkyhead/updated_2820 
This is quite comprehensive. If probes are disabled in any case when they shouldn't be, I'm sure we will hear about it soon.
 9 years ago
Scott Lahteine 7bf5d117e7 Merge pull request #3069 from thinkyhead/rc_delta_compat_m48 
Delta-compatible extensions to M48
 9 years ago
Scott Lahteine db8ab50c66 Merge pull request #3192 from tnw513/fix_lang 
Added missing translations.
 9 years ago
Scott Lahteine 06332f20be Merge pull request #3113 from jbrazio/bugfix/3061-stop-print-time-counter 
Stop print timer with M105/M109
 9 years ago
Scott Lahteine ac4e461901 Merge pull request #3186 from AnHardt/Fix-KEEPALIVE_STATE 
Fix KEEPALIVE_STATE
 9 years ago
jbrazio 92a7d4515a Missing coma comment correction for the default cofig file 9 years ago
jbrazio 1aa531a3db Missing coma comment correction for all config files 9 years ago
jbrazio 68dda08fff Added pt_pt-utf8 language pack; Fixed some minor compiler warnings; Harmonize file suffix for the current existing UTF8 language packs; Updated all configuration files to reflect the new language packs 9 years ago
Silvio Didonna f8c10d6b0e Added missing translations. 9 years ago
esenapaj 468df96b0f follow-up the commit b82d91e 
follow-up the commit b82d91eca6
 9 years ago
AnHardt 338b69c24b Fix extrudernum in MSG_INVALID_EXTRUDER 
SERIAL_ECHO is not very good in printing uint8_t - so cast. to int.
 9 years ago
AnHardt b39b54031b Fix KEEPALIVE_STATE 
Add return to NOT_BUSY for M105
Replace WAIT_FOR_USER with PAUSED_FOR_USER

Add Travis test for FILAMENTCHANGEENABLE
 9 years ago
Scott Lahteine 32f75749e4 Merge pull request #3117 from Blue-Marlin/thermal-protection 
Improve the descriptions for THERMAL_PROTECTION
 9 years ago
Scott Lahteine 7aafee3003 Merge pull request #3185 from esenapaj/patch-1 
follow-up the PR #3180, #3183
 9 years ago
esenapaj 37eaa1406b follow-up the PR #3180 9 years ago
esenapaj 198d5d56fd follow-up the PR #3183 9 years ago
Scott Lahteine 4119cef32f Merge pull request #3180 from clexpert/RCBugFix 
Czech language specific changes
 9 years ago
Scott Lahteine da94bcfebb Merge pull request #3184 from thinkyhead/fix_command_injection 
Patch drain_queued_commands_P
 9 years ago
Scott Lahteine 41145e6e81 Patch drain_queued_commands_P 
Fix a SNAFU that should have been caught in #3012
 9 years ago