SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
7067 commits 1 branch 0 tags 118 MiB
Commit graph

7067 commits

This branch
This branch
All branches
Author SHA1 Message Date
jbrazio
757661b299 Toshiba Flash Air Wifi SD card support 2016-03-22 11:42:11 +00:00
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
 2016-03-22 20:22:01 +09:00
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.
 2016-03-22 19:58:41 +09:00
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)
 2016-03-22 00:56:31 +01:00
Scott Lahteine
cadded1e21 Merge pull request #3201 from jbrazio/feature/update-hephestos2-default-config 
Update the Hephestos 2 default config
 2016-03-21 14:35:00 -07:00
jbrazio
04e57e2b5e Update the Hephestos 2 default config 2016-03-21 18:20:29 +00:00
Scott Lahteine
40c7e5d4e7 Merge pull request #3199 from esenapaj/patch-2 
fix spelling
 2016-03-21 05:49:59 -07:00
esenapaj
f260e00a72 fix spelling 
Thermister -> Thermistor
 2016-03-21 20:57:03 +09:00
Scott Lahteine
b1a3a95ad4 Tweak controllerFan to save a cycle or two 2016-03-20 22:11:09 -07:00
Scott Lahteine
04a6924633 Make DISABLE_INACTIVE_X, etc., the same as DISABLE_X (etc.) if missing 2016-03-20 22:10:52 -07:00
Scott Lahteine
15fccd43ee Fix spacing of an #endif 2016-03-20 20:32:55 -07:00
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
 2016-03-20 17:42:45 -07:00
Scott Lahteine
d1ff7959b7 Merge pull request #3188 from esenapaj/patch-1 
follow-up the commit b82d91e
 2016-03-20 17:39:52 -07:00
Scott Lahteine
10caee2b7c Merge pull request #3187 from AnHardt/target_extruder_number 
Fix extrudernum in MSG_INVALID_EXTRUDER
 2016-03-20 17:15:22 -07:00
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.
 2016-03-20 17:10:38 -07:00
Scott Lahteine
7bf5d117e7 Merge pull request #3069 from thinkyhead/rc_delta_compat_m48 
Delta-compatible extensions to M48
 2016-03-20 17:09:18 -07:00
Scott Lahteine
db8ab50c66 Merge pull request #3192 from tnw513/fix_lang 
Added missing translations.
 2016-03-20 17:07:00 -07:00
Scott Lahteine
06332f20be Merge pull request #3113 from jbrazio/bugfix/3061-stop-print-time-counter 
Stop print timer with M105/M109
 2016-03-20 17:05:07 -07:00
Scott Lahteine
ac4e461901 Merge pull request #3186 from AnHardt/Fix-KEEPALIVE_STATE 
Fix KEEPALIVE_STATE
 2016-03-20 16:29:19 -07:00
jbrazio
92a7d4515a Missing coma comment correction for the default cofig file 2016-03-20 23:23:11 +00:00
jbrazio
1aa531a3db Missing coma comment correction for all config files 2016-03-20 23:21:45 +00:00
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 2016-03-20 23:14:24 +00:00
Silvio Didonna
f8c10d6b0e Added missing translations. 2016-03-20 22:34:00 +01:00
esenapaj
468df96b0f follow-up the commit b82d91e 
follow-up the commit b82d91eca6
 2016-03-20 20:57:14 +09:00
AnHardt
338b69c24b Fix extrudernum in MSG_INVALID_EXTRUDER 
SERIAL_ECHO is not very good in printing uint8_t - so cast. to int.
 2016-03-20 11:39:06 +01:00
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
 2016-03-20 10:41:56 +01:00
Scott Lahteine
32f75749e4 Merge pull request #3117 from Blue-Marlin/thermal-protection 
Improve the descriptions for THERMAL_PROTECTION
 2016-03-19 23:41:05 -07:00
Scott Lahteine
7aafee3003 Merge pull request #3185 from esenapaj/patch-1 
follow-up the PR #3180, #3183
 2016-03-19 23:36:55 -07:00
esenapaj
37eaa1406b follow-up the PR #3180 2016-03-20 15:33:02 +09:00
esenapaj
198d5d56fd follow-up the PR #3183 2016-03-20 13:58:05 +09:00
Scott Lahteine
4119cef32f Merge pull request #3180 from clexpert/RCBugFix 
Czech language specific changes
 2016-03-19 20:18:05 -07:00
Scott Lahteine
da94bcfebb Merge pull request #3184 from thinkyhead/fix_command_injection 
Patch drain_queued_commands_P
 2016-03-19 20:12:16 -07:00
Scott Lahteine
41145e6e81 Patch drain_queued_commands_P 
Fix a SNAFU that should have been caught in #3012
 2016-03-19 20:10:41 -07:00
Scott Lahteine
3ce0c5063f Merge pull request #3183 from thinkyhead/rc_lcm1602_support 
Also closes #3181.
 2016-03-19 19:28:50 -07:00
CoderSquirrel
eda95d8bed Add support for LCM1602 16x2 I2C LCD adapter 2016-03-19 19:26:44 -07:00
Scott Lahteine
59483221d5 Move stepper DAC to a separate file 2016-03-19 19:24:26 -07:00
Scott Lahteine
5d0570cea0 Make digitalPotWrite depend on HAS_DIGIPOTSS 2016-03-19 19:24:26 -07:00
Scott Lahteine
f96bc03081 Add M907-M910 g-codes support for Printrbot Rev. F 2016-03-19 19:24:26 -07:00
Scott Lahteine
8d9cf72db0 Merge pull request #3177 from thinkyhead/rc_finish_M665 
Include M665 "ABC" parameters in EEPROM
 2016-03-19 18:08:33 -07:00
Stephanie
6843b78f99 Add support for Printrboard RevF 
The PrintrBoard Rev F utilizes a mcp4728 DAC to set motor current. Printrbot's implementation utilizes 2 new M-codes to set and write the DAC settings to the DAC EEPROM: `M909` (Read DAC) and `M910` (Write DAC). `M907` is re-used to set value, `M908` for direct control.

The Pins file for the RevF board is included.
 2016-03-19 16:43:37 -07:00
Petr Zahradnik
98392782ea Update Configuration.h 2016-03-19 20:45:13 +01:00
Petr Zahradnik
daa52124b0 Update language_cz.h 2016-03-19 20:43:28 +01:00
Blue-Marlin
3166aed087 Improve the descriptions for THERMAL_PROTECTION 2016-03-19 14:08:59 +01:00
Scott Lahteine
a02ae36ae8 Include M65 "ABC" parameters in EEPROM 
Addressing #2773
 2016-03-19 05:52:20 -07:00
Scott Lahteine
7f2375ab46 Merge pull request #3176 from thinkyhead/rc_patch_3149_part_ii 
Use const parameters in lcd_implementation_drawedit (etc.)
 2016-03-19 05:18:25 -07:00
Scott Lahteine
cf7c444aff Apply unknown_position_error elsewhere 2016-03-19 05:13:40 -07:00
Scott Lahteine
eda5190581 Check for known position in M48 2016-03-19 05:13:40 -07:00
Scott Lahteine
68085ca855 Updated M48 friendly for DELTA 
Partial implementation with reference to MarlinFirmware/Marlin#3011
 2016-03-19 05:13:40 -07:00
Scott Lahteine
6a3529247f "Homing" as a translatable string 2016-03-19 04:41:03 -07:00
Scott Lahteine
c97c2dcaf7 Use const parameters instead of static casting 
Alternative fix to #3149
 2016-03-19 03:36:53 -07:00