Compare commits

...

10551 Commits

Author SHA1 Message Date
Scott Lahteine
015c4e6fbd Version 2.0.5.3 2020-03-31 14:44:14 -05:00
Scott Lahteine
0f9a14dfda Merge latest patches 2020-03-31 14:43:42 -05:00
Scott Lahteine
e7f020f3f2 Shorten some internal pin names 2020-03-31 14:43:01 -05:00
Marcio T
d83ad6f321 Improve / fix FTDI EVE Touch UI (#17338)
- Fix timeout and debugging string
- Fix check for whether `LCD_TIMEOUT_TO_STATUS` is valid
- Fix incorrect debugging message
- Make capitalization of callbacks consistent.
- Allow Touch UI to use hardware SPI on Einsy boards
- Move print stats to About Printer page.
- More generic about screen with GPL license.
- Add missing handler for power loss event
- Less code duplication on status screen and main/advanced menu; more legible
- Reorganize advanced and main menu to add more features
- Hide home Z button when using Z_SAFE_HOMING
- Fix compilation errors when certain features enabled
- Fix missing labels in UI
- Improve color scheme
- Add new preheat menus
- Fix incorrect rendering of Marlin logo on boot
- Add Level X Axis and Auto calibrate buttons
2020-03-31 14:22:04 -05:00
Tanguy Pruvot
c759729478 STM32F1: Restore M43 build support (#17336) 2020-03-31 14:13:20 -05:00
Eric Ptak
ac0a7f2281 Fix Fysetc stm32flash usage (#17331) 2020-03-31 13:59:08 -05:00
Scott Lahteine
e0e87ca19a Fix last arc segment
Co-Authored-By: ellensp <ellensp@hotmail.com>
2020-03-31 12:50:48 -05:00
Scott Lahteine
528907cb16 Additional TERN macros 2020-03-31 12:50:48 -05:00
Scott Lahteine
96ab16a9dd Pulldown for all FastIO headers
Co-Authored-By: borsegbr <borsegbr@users.noreply.github.com>
2020-03-31 12:37:22 -05:00
thinkyhead
0ea26d538b [cron] Bump distribution date (2020-03-31) 2020-03-31 00:03:22 +00:00
thinkyhead
747a4bb623 [cron] Bump distribution date (2020-03-30) 2020-03-30 00:03:19 +00:00
Scott Lahteine
9b886c2ad4 Load balance some tests 2020-03-29 18:14:15 -05:00
Scott Lahteine
223aa5cc4e No unscaled_e_move for CNC 2020-03-29 17:20:26 -05:00
Scott Lahteine
d029a09810 Minor HAL cleanup 2020-03-29 17:14:23 -05:00
Scott Lahteine
765a9f3471 do_pause_e_move => unscaled_e_move 2020-03-29 16:26:55 -05:00
Scott Lahteine
fc11e72174 Fix extra unskew call
Fixes #17264
2020-03-29 16:11:03 -05:00
thisiskeithb
add34aa286 Fix STM32F1 USB Composite Dependency
Co-authored-by: Lord-Quake <Lord-Quake@users.noreply.github.com>
2020-03-29 13:55:14 -05:00
oscarsan1
b35dc5f0b4 Fix Trigorilla 1.4 missing spaces 2020-03-29 13:46:03 -05:00
thinkyhead
fc74c6a7b6 [cron] Bump distribution date (2020-03-29) 2020-03-29 00:03:23 +00:00
Roxy-3D
2f7e5cf7dd Fix typo... 2020-03-28 09:53:04 -05:00
Scott Lahteine
747b964295 Clean up user-wait, SD completion (#17315) 2020-03-28 03:18:53 -05:00
Scott Lahteine
a84990961a Simplify TWIBus debug 2020-03-28 01:20:15 -05:00
Scott Lahteine
53fe572bbd Limited backlash editing with Core kinematics (#17281) 2020-03-27 22:00:27 -05:00
InsanityAutomation
de648bfdc1 Add Funmat HT V4.0 board support (#17305)
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
2020-03-27 21:08:47 -05:00
thinkyhead
e71b25a555 [cron] Bump distribution date (2020-03-28) 2020-03-28 00:03:16 +00:00
Mathias Rasmussen
8752fbd92c Store case light brightness in EEPROM (#17307) 2020-03-27 17:38:28 -05:00
InsanityAutomation
bed41af868 Fix Stepper PWM menu (#17298) 2020-03-27 17:30:17 -05:00
Giuliano Zaro
129b270628 QSPI EEPROM for SAMD51 (#17292) 2020-03-27 17:29:17 -05:00
InsanityAutomation
3655e240f5 Fix SD finished ExtUI / host action (#17285) 2020-03-27 16:06:39 -05:00
thinkyhead
98ef161bfe [cron] Bump distribution date (2020-03-27) 2020-03-27 00:03:27 +00:00
Scott Lahteine
54a12ee1d6 Tweak eeprom storage type 2020-03-25 21:07:08 -05:00
Scott Lahteine
d6a4c3079d Tweak ui.finish_status 2020-03-25 21:07:08 -05:00
Giuliano Zaro
8122468a36 Update Italian language (#17293) 2020-03-25 21:05:36 -05:00
Acenotass
5c150c0c94 Update Russian language (#17290) 2020-03-25 21:04:57 -05:00
Scott Lahteine
5ec1a8bb2b Fix M0 unused var warning 2020-03-25 20:27:21 -05:00
Scott Lahteine
dd6781217a motion.cpp: HAS_DIST_MM_ARG 2020-03-25 19:21:48 -05:00
Scott Lahteine
0175189c34 Allow G2_PWM to be slimmer 2020-03-25 19:18:42 -05:00
Scott Lahteine
adb6334ba0 Use "dist" instead of "delta" for clarity 2020-03-25 19:18:42 -05:00
thinkyhead
4dea020050 [cron] Bump distribution date (2020-03-26) 2020-03-26 00:03:54 +00:00
Scott Lahteine
c86ee574ec Drop old comment 2020-03-25 15:11:12 -05:00
Scott Lahteine
f2ed18d150 M303 followup
- Put 'D' before other params for clean exit.
- Use serial on/off for debug status.
2020-03-25 15:08:52 -05:00
Roxy-3D
1986e1cdf8 Allow PID_DEBUG to be turned on and off (#17284)
M303 D will now toggle activation of PID_DEBUG output.   This allows the debug capability to be built into the firmware, but turned on and off as needed.
2020-03-24 19:38:09 -05:00
thinkyhead
0aeee64cca [cron] Bump distribution date (2020-03-25) 2020-03-25 00:03:18 +00:00
Roxy-3D
075a86b076 Update LCD timing on Formbot T-Rex 2+ machines
The code is slightly more optimized than it used to be and this has caused the setup and hold times on the Formbot T-Rex 2+ machines to be insufficient.   This change gives sufficient margin and the LCD Display is clean again.
2020-03-24 17:15:03 -05:00
Scott Lahteine
7124b2164d Version 2.0.5.2 2020-03-24 17:11:59 -05:00
Scott Lahteine
efc19260a7 Merge patches from bugfix-2.0.x 2020-03-24 17:10:53 -05:00
Roxy-3D
5d515c3a2f Adjust for timing shift on Max7219 displays on AVR's
Something has shifted.   The previous timing delays on the Max7219 debug displays is too tight without this correction.
I suspect something has been optimized and roughly 50ns of needed setup and hold time has disappeared.
This corrects the issue and the display results are clean again.
2020-03-24 17:08:31 -05:00
Scott Lahteine
68face848a Sanity check CONTROLLERFAN_SECS 2020-03-24 16:41:21 -05:00
Scott Lahteine
7455bb09b3 Add SoftwareSerialM for MKS Robin (#17207) 2020-03-24 16:14:30 -05:00
ellensp
41e944da00 Fix Emergency Parser on DUE (#17276)
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
2020-03-24 15:14:52 -05:00
MarkMan0
4113481c4e Fix limits on acceleration editing (#17280) 2020-03-24 15:13:37 -05:00
mkpfalz
3260228009 Sanity-check CORE backlash axes (#17279)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2020-03-24 14:08:55 -05:00
rado79
bef9b9b07e Delay after homing_backoff for CoreXY sensorless homing (#17273) 2020-03-23 20:32:36 -05:00
thinkyhead
edd6f6c5f2 [cron] Bump distribution date (2020-03-24) 2020-03-24 00:03:08 +00:00
Scott Lahteine
c87d73045b Fix extra M114 output line
Fixes #17255
2020-03-23 18:31:26 -05:00
George Fu
e3ebbe25e0 DGUS updates (#17260) 2020-03-23 18:00:22 -05:00
ellensp
cd4060a99c Add USB serial support to SERIAL_PORT_2 on DUE (#17245)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2020-03-23 17:55:21 -05:00
Scott Lahteine
adb7a88428 Fix an unused var warning 2020-03-23 17:35:43 -05:00
Scott Lahteine
580d314fbe Skip impossible PWM sanity-checks 2020-03-23 17:35:43 -05:00
Scott Lahteine
fe154fa5de Fix CONTROLLER_FAN options compile 2020-03-23 17:35:43 -05:00
RasmusAaen
717c216851 Fix Copymaster Y_MAX pin (#17267) 2020-03-23 17:34:38 -05:00
thinkyhead
27c281eec3 [cron] Bump distribution date (2020-03-23) 2020-03-23 00:03:08 +00:00
Scott Lahteine
e7a9f17371 Tweak serial port descriptions 2020-03-21 23:38:44 -05:00
Scott Lahteine
2460a3dfbb Fix custom version file include 2020-03-21 23:34:19 -05:00
Scott Lahteine
2c325c2a7d Format some pins files 2020-03-21 21:18:46 -05:00
Scott Lahteine
9340a33980 Add a pins formatting script 2020-03-21 21:18:46 -05:00
Scott Lahteine
e62b52da99 Use pin/port names for CHITU pins 2020-03-21 21:18:46 -05:00
Scott Lahteine
7988e31f5e whitespace 2020-03-21 21:16:15 -05:00
Scott Lahteine
1674df00b1 Stay at v0.91 of USBComposite for STM32F1 2020-03-21 20:56:14 -05:00
thinkyhead
29874b21b6 [cron] Bump distribution date (2020-03-22) 2020-03-22 00:03:15 +00:00
Scott Lahteine
04cea864bc Split up STM32 pins files (#17212) 2020-03-20 23:45:00 -05:00
thinkyhead
3151856e98 [cron] Bump distribution date (2020-03-21) 2020-03-21 00:03:28 +00:00
thinkyhead
1738c13bc2 [cron] Bump distribution date (2020-03-20) 2020-03-20 00:03:07 +00:00
George Fu
71db5c1605 Fix FYSETC mini 12864 init / glitches (#17209) 2020-03-19 14:11:55 -05:00
thinkyhead
14daf1ee5e [cron] Bump distribution date (2020-03-19) 2020-03-19 00:03:40 +00:00
InsanityAutomation
84dec5da10 Add M42 M, improve M43 (#17173) 2020-03-18 16:12:51 -05:00
Scott Lahteine
de45ac41ad Implement CONTROLLER_FAN_USE_Z_ONLY
Followup to #17149
2020-03-18 14:36:40 -05:00
Erkan Colak
83eec683c9 New Controller Fan options and M710 gcode (#17149) 2020-03-18 13:41:12 -05:00
Scott Lahteine
abea6d5787 Tweak some lambdas 2020-03-18 10:33:15 -05:00
thinkyhead
252178fe62 [cron] Bump distribution date (2020-03-18) 2020-03-18 00:04:28 +00:00
RasmusAaen
c768605bde Add Copymaster3D board (#17188) 2020-03-17 15:25:10 -05:00
Joe Prints
1f5824247f More decimal places for babystep / Z probe offset (#17195) 2020-03-17 15:12:52 -05:00
Scott Lahteine
e8205af6fb Apply HAS_TMC_UART to pins files 2020-03-17 15:06:01 -05:00
Karl Andersson
e5dcab8fd2 ARMED support for TMC UART, probe temp (#17186) 2020-03-17 15:05:12 -05:00
ellensp
40922c7da7 Fix MKS SBASE 1.6 E1 heater pin (#17191) 2020-03-17 14:51:57 -05:00
thinkyhead
c1672220fd [cron] Bump distribution date (2020-03-17) 2020-03-17 00:04:33 +00:00
Scott Lahteine
d37bfa3b4e Version 2.0.5.1 Release 2020-03-16 17:52:41 -05:00
Scott Lahteine
129b1bb8d4 Merge nightly patches 2020-03-16 17:50:43 -05:00
Scott Lahteine
f6e80d576d Fix Z_MIN_PROBE_PIN on SKR 1.4 (#17187) 2020-03-16 17:49:33 -05:00
Scott Lahteine
b14c933171 LPC1768 EEPROM fallback to flash, add overrides (#17184) 2020-03-16 15:59:05 -05:00
Pascal de Bruijn
2fc0df1b39 Shorter LCD remaining time to prevent overlap (#17181) 2020-03-16 14:11:55 -05:00
thinkyhead
a662079cbc [cron] Bump distribution date (2020-03-16) 2020-03-16 00:04:45 +00:00
InsanityAutomation
775a4294fc Configurable SLOWDOWN divisor (#17171) 2020-03-15 18:29:18 -05:00
Giuliano Zaro
3b987dfcec Fix G34 Z lower, extra "BLTOUCH" debug line (#17175) 2020-03-15 18:23:24 -05:00
Scott Lahteine
c39873759f Fix Z after ABL Bilinear G29 with fade
Co-Authored-By: Alan T <interstellarmisfit@users.noreply.github.com>
2020-03-15 18:18:38 -05:00
Karl Andersson
85187290a7 Fix incorrect type on ubl_storage_slot (#17170) 2020-03-15 18:03:10 -05:00
Scott Lahteine
695e014075 Do later mounting of LCD-based SD 2020-03-14 19:24:35 -05:00
Scott Lahteine
090a90a036 Add EEPROM_BOOT_SILENT option 2020-03-14 19:24:35 -05:00
Scott Lahteine
095a1123c1 Add a global machine state 2020-03-14 19:24:35 -05:00
Scott Lahteine
41ffe9851d Fix LCD progress bar
Fixes #17162
2020-03-14 19:24:33 -05:00
thinkyhead
5c1970a229 [cron] Bump distribution date (2020-03-15) 2020-03-15 00:04:39 +00:00
Roxy-3D
9f85165101 Allow Tool Offset adjustments to have another digit of precision
Some of the items in the Tool Offset Adjustment menu (in particular, the Z Offset!!!) were only adjustable with .1mm accuracy.
This is not enough.    So the edit menu is switched to float52 to fix the issue.
2020-03-14 18:12:29 -05:00
Scott Lahteine
8dbbcfd382 Version 2.0.5 Release 2020-03-14 00:49:12 -05:00
Scott Lahteine
fa48fbb9b8 Merge bugfix-2.0.x into 2.0.x 2020-03-14 00:35:11 -05:00
Scott Lahteine
8b2d55e345 Config version 020005 2020-03-13 23:22:46 -05:00
InsanityAutomation
cee07f3f6b Quad Z leveling, G34 (R)ecalculate (#17122) 2020-03-13 23:22:04 -05:00
Scott Lahteine
118bd2f8b2 Apply loop shorthand macros (#17159) 2020-03-13 23:18:16 -05:00
Scott Lahteine
a96be32fae Fix G26 corrupted position 2020-03-13 19:27:02 -05:00
thinkyhead
983a8cee45 [cron] Bump distribution date (2020-03-14) 2020-03-14 00:04:00 +00:00
Scott Lahteine
6bead0c1b0 Shorter paths to HAL, ExtUI (#17156) 2020-03-13 16:29:29 -05:00
Scott Lahteine
ad980a72f7 M0 Q preserve status 2020-03-13 14:42:42 -05:00
Scott Lahteine
7ec45f4382 Fix end of short (auto0.g) prints 2020-03-13 13:59:17 -05:00
Scott Lahteine
81b0548518 Fix Emergency Parser stuck state 2020-03-13 13:59:17 -05:00
Erkan Colak
aa32c47fb5 Shorten German BLTouch menu item names (#17151) 2020-03-13 12:34:03 -05:00
nick-diel
7070ea0b49 Add OnPidTuning event to Malyan LCD (#17143)
All ExtUI LCDs need to keep up with ExtUI API changes.
2020-03-12 19:48:33 -05:00
Scott Lahteine
59cb1466b7 Fix DUGS / DGUS typo 2020-03-12 19:30:18 -05:00
Jason Smith
9c759e5f74 Fix BAUD_RATE_GCODE, etc. (#17135) 2020-03-12 19:26:09 -05:00
Jason Smith
4e96a014a8 Use arduinoststm32 3.x for FYSETC S6 (#17131) 2020-03-12 19:20:22 -05:00
thinkyhead
8c11ecaf73 [cron] Bump distribution date (2020-03-13) 2020-03-13 00:04:16 +00:00
thinkyhead
1f55986ed2 [cron] Bump distribution date (2020-03-12) 2020-03-12 00:04:11 +00:00
Scott Lahteine
318a16637b Fix M810 macro multiple use
Fixes #17125
2020-03-11 17:15:39 -05:00
BigTreeTech
8bad6e11e2 Fix STM32 _WRITE macro parameter (#17121) 2020-03-11 16:42:28 -05:00
Scott Lahteine
112245ee48 More explicit EEPROM types (#17127) 2020-03-11 16:41:18 -05:00
Scott Lahteine
924fa6045c Non-const REMEMBER needed for RESTORE 2020-03-11 15:25:16 -05:00
Daniel Kreuzhofer (@danieldotnet)
f29d6f802f Revert Anet 1.x envs change (#17120) 2020-03-11 15:08:47 -05:00
George Fu
201c991cfa Fix and update DGUS displays (#17072) 2020-03-11 03:40:30 -05:00
Jamie
23c5701178 Apply soft limits to joystick jogging (#17114) 2020-03-10 22:59:49 -05:00
Scott Lahteine
eb6c992bfb Announce SD file open
Requested in #17110
2020-03-10 22:54:19 -05:00
Gurmeet Athwal
bd44f041e8 M220 print FR percentage (#17101) 2020-03-10 20:13:59 -05:00
Daniel Kreuzhofer (@danieldotnet)
d78fbce827 Fix pio environments for Anet 1.x (#17109) 2020-03-10 20:04:44 -05:00
jufimu12
627aa8db2d Fix G34, add HOME_AFTER_G34 option (#17108)
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
2020-03-10 20:00:26 -05:00
Scott Lahteine
e7004550c4 Tweaks to finishSDPrinting (#17082) 2020-03-10 19:42:57 -05:00
thinkyhead
a31b7339cd [cron] Bump distribution date (2020-03-11) 2020-03-11 00:04:19 +00:00
Scott Lahteine
4e3a793f1e Fix broken enqueue_P 2020-03-10 18:28:49 -05:00
Scott Lahteine
9bff67bc74 Always look for PLR file, but more quickly 2020-03-10 17:07:14 -05:00
Vert
8bbcbc528c Fix Z4 stepper indirection macros (#17107) 2020-03-10 15:57:10 -05:00
Scott Lahteine
8f66dbfcd5 SD_DETECT_INVERTED => SD_DETECT_STATE (#17112) 2020-03-10 15:43:06 -05:00
thinkyhead
8799f8bfdb [cron] Bump distribution date (2020-03-10) 2020-03-10 00:04:08 +00:00
Scott Lahteine
972d1bf5b4 Ensure welcome message 2020-03-09 18:19:37 -05:00
Scott Lahteine
b5530775c9 Add debug logging for setup() 2020-03-09 17:46:49 -05:00
Scott Lahteine
13118dbd8d Additional numtostr functions 2020-03-09 17:46:49 -05:00
Scott Lahteine
0f39386d9b Make BOOTSCREEN_TIMEOUT generally available 2020-03-09 17:46:49 -05:00
Scott Lahteine
7674befa47 DOGM SPI delay is less common 2020-03-09 17:46:49 -05:00
Scott Lahteine
b579f5dc99 Move 'last_pause_state' closer to usage 2020-03-09 17:46:49 -05:00
thinkyhead
7f490c08da [cron] Bump distribution date (2020-03-09) 2020-03-09 00:04:03 +00:00
Scott Lahteine
982197b162 Fixes for Z4 axis, CS pins (#17097) 2020-03-08 16:31:37 -05:00
MangaValk
57f488738b [ToolChanger] Lock the current tool at power-up (#17093) 2020-03-08 16:13:41 -05:00
Scott Lahteine
b21edce943 More general SD_DETECT_INVERTED override 2020-03-08 14:47:16 -05:00
Scott Lahteine
2a71e4f336 Revert that wack backoff 2020-03-07 23:10:56 -06:00
Scott Lahteine
64d092935b More useful ENABLED / DISABLED macros (#17054) 2020-03-07 22:20:41 -06:00
thinkyhead
5eb6fb1c2f [cron] Bump distribution date (2020-03-08) 2020-03-08 00:04:21 +00:00
Scott Lahteine
20f93404a7 Add / correct comments 2020-03-07 02:16:17 -06:00
Scott Lahteine
3db784f3c7 More pins debugging cleanup 2020-03-07 02:15:05 -06:00
Scott Lahteine
7b9eb233cb Emergency Parser dumb terminal compatibility 2020-03-07 02:15:05 -06:00
Scott Lahteine
c99773bae0 Max7219 suspend/resume 2020-03-07 01:18:26 -06:00
Scott Lahteine
8ff25a9566 Max7219 init last 2020-03-07 00:16:44 -06:00
Scott Lahteine
e9f451bffe Pins debug followup 2020-03-06 21:59:20 -06:00
thinkyhead
3b14158979 [cron] Bump distribution date (2020-03-07) 2020-03-07 00:04:33 +00:00
Scott Lahteine
913de024a9 Change PID dummy value to NAN
Fixes #17078
2020-03-06 13:55:27 -06:00
Scott Lahteine
1da49d0ac5 Non-blocking Max7219 test pattern 2020-03-06 13:19:38 -06:00
Scott Lahteine
ca4423ed2a Clean up pins debugging 2020-03-06 13:14:22 -06:00
Scott Lahteine
6cd99e6a77 Add pins to the pins debug list 2020-03-06 13:14:22 -06:00
Scott Lahteine
6d18f715e4 Fix M0/M1 message string 2020-03-06 13:14:22 -06:00
thinkyhead
459a0dae29 [cron] Bump distribution date (2020-03-06) 2020-03-06 00:04:16 +00:00
Scott Lahteine
3a72b0fd41 Update Chinese (TW) language (#17071) 2020-03-05 15:39:49 -06:00
Scott Lahteine
f0248c9ed9 Update Turkish language (#17070) 2020-03-05 15:37:02 -06:00
Scott Lahteine
c0801e900d Define Z_MIN_PROBE_PIN for Cohesion 3D Remix 2020-03-05 15:10:46 -06:00
Scott Lahteine
5a6daa7c54 Fix CI test for SENSORLESS_PROBING 2020-03-05 15:07:48 -06:00
Scott Lahteine
e3da86fb45 Fix SKR test for ONBOARD SD 2020-03-05 13:37:09 -06:00
Scott Lahteine
0578e9b16e Move SENSORLESS_PROBING to the probes section
Fixes a bug with HAS_BED_PROBE not being set before use.
2020-03-05 11:05:11 -06:00
thinkyhead
7e58739a1f [cron] Bump distribution date (2020-03-05) 2020-03-05 00:04:13 +00:00
Scott Lahteine
631addbbb4 SAMD51 SoftwareSerial (#17041) 2020-03-04 13:15:32 -06:00
Scott Lahteine
d4ac78535c Allow Z_STOP_PIN override on SKR 1.4 (#17063) 2020-03-04 13:12:48 -06:00
Scott Lahteine
70863fbd55 Avoid name conflict with 'UART' 2020-03-04 12:50:58 -06:00
Scott Lahteine
7709261ea9 Move shared code to wait_for_bed_heating 2020-03-04 12:50:57 -06:00
thinkyhead
ab1863ac48 [cron] Bump distribution date (2020-03-04) 2020-03-04 00:04:06 +00:00
Scott Lahteine
72b63e9520 Fix TEMP_PROBE_PIN for SKR 1.4
Co-Authored-By: Anthrix <anthrix@users.noreply.github.com>
2020-03-03 14:53:22 -06:00
George Fu
a698bfdc2a Update FYSETC S6 pins/variants (#17056) 2020-03-03 14:30:09 -06:00
thisiskeithb
efc739a880 Use BED_MAXTEMP for PTC_MAX_BED_TEMP (#17061) 2020-03-03 14:22:28 -06:00
Scott Lahteine
fd1af0189e mftest: Set machine name 2020-03-03 14:21:07 -06:00
Scott Lahteine
83a60f15ff Fix EEPROM compile errors 2020-03-03 14:21:07 -06:00
Scott Lahteine
c083728e4c General code cleanup 2020-03-03 14:20:37 -06:00
Scott Lahteine
5e28b0f471 Minor EEPROM cleanup 2020-03-02 21:56:21 -06:00
Scott Lahteine
3a07b4412d Asynchronous M114 and (R)ealtime position option (#17032) 2020-03-02 21:52:53 -06:00
Scott Lahteine
5171e9da93 No more direct G28 calls 2020-03-02 21:01:58 -06:00
Scott Lahteine
af62d7f937 Fix MMU test 2020-03-02 19:18:00 -06:00
thinkyhead
12d05e4835 [cron] Bump distribution date (2020-03-03) 2020-03-03 00:04:10 +00:00
Scott Lahteine
07e22d1d65 Neopixel on LPC uses GPIO toggling 2020-03-02 17:20:01 -06:00
Scott Lahteine
d3e232d1c1 Add single extruder LIN_ADVANCE test 2020-03-02 17:11:41 -06:00
Scott Lahteine
646599d0d9 Finish M900 updates 2020-03-02 17:10:51 -06:00
Scott Lahteine
eb4d5120bf Keep name around for old configs 2020-03-02 16:23:17 -06:00
thisiskeithb
e0c0173f73 Fix nested comment warning (#17045) 2020-03-02 16:08:26 -06:00
InsanityAutomation
552f7a91d0 Default on/off for Power Loss Recovery (#17051) 2020-03-02 16:07:53 -06:00
jufimu12
ad4a9eb73a Fix G34 probing range/error bug (#17052) 2020-03-02 13:35:02 -06:00
Scott Lahteine
5aa528781f Fix ambiguous type
Co-Authored-By: Andrew Kroll <xxxajk@gmail.com>
2020-03-02 13:23:07 -06:00
ellensp
af23c0480e Don't define 'valptr' if unused (#17048) 2020-03-02 13:17:52 -06:00
ellensp
624ab24a5c Suppress thisItemNr warning (#17049) 2020-03-02 13:14:08 -06:00
Jason Smith
66334820ca Add TMC micro-steps sanity check (#17044)
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
2020-03-02 13:13:04 -06:00
Scott Lahteine
2c4e054e9a Fix fastio pin comment 2020-03-02 13:11:30 -06:00
Scott Lahteine
49c5f614c6 Minor motion style changes 2020-03-02 12:54:18 -06:00
Scott Lahteine
6b5347ee39 Improved M900 2020-03-02 12:05:00 -06:00
Scott Lahteine
b1a50d54e2 HAS_TRINAMIC => HAS_TRINAMIC_CONFIG 2020-03-02 12:04:36 -06:00
Scott Lahteine
736521a3f1 Balance mega tests, shorten some env names 2020-03-01 21:20:22 -06:00
Scott Lahteine
870a1f753a Fix undefined STATUS_CHAMBER_WIDTH 2020-03-01 21:19:50 -06:00
Jason Smith
cc822bf70f Fix some 8 extruders issues, GTR build (#17043) 2020-03-01 21:19:02 -06:00
Jason Smith
5da6819277 Fix build issues with REPRAPWORLD_KEYPAD (#17038)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2020-03-01 19:54:22 -06:00
Scott Lahteine
362c9ae79a Clean up use of extra_xyjerk 2020-03-01 19:23:48 -06:00
thinkyhead
ac93df43cd [cron] Bump distribution date (2020-03-02) 2020-03-02 00:04:18 +00:00
ellensp
4b256a6fa8 Revert FYSETC Mini encoder change (#17040)
Reverting #17010
2020-03-01 17:59:00 -06:00
Jason Smith
45fae55929 Fix SKR nested comment warning (#17037) 2020-03-01 17:39:00 -06:00
Jason Smith
4a3fcd0bf9 Fix three extruder with auto-fan build (#17035) 2020-03-01 17:37:16 -06:00
Scott Lahteine
edd1b76a9a Fix set_current_from_steppers_for_axis(E_AXIS) bug 2020-03-01 14:36:21 -06:00
Scott Lahteine
c4db8e49a7 XYZ_CHAR macro 2020-03-01 14:36:06 -06:00
Scott Lahteine
3473b21710 Move millis_t includes 2020-03-01 09:50:53 -06:00
Scott Lahteine
5e9a10dbae Use PSTR for common labels 2020-03-01 08:39:47 -06:00
Scott Lahteine
f7d663c7db Improvements for MarlinMesh.scad 2020-03-01 05:58:26 -06:00
thinkyhead
1d609d2bbd [cron] Bump distribution date (2020-03-01) 2020-03-01 00:04:02 +00:00
Vert
6c9ca1bec2 Clarify GT2560 common pins (#17021) 2020-02-29 04:35:10 -06:00
Scott Lahteine
730804289c Catch more LPC1768 pin conflicts (#17019) 2020-02-29 04:14:40 -06:00
ManuelMcLure
39c34e4992 Use ADC resolution in AD595/8495 calculation (#17018)
Fixes thermocouple reading on LP1768 (which uses 12-bit resolution).
2020-02-28 23:28:17 -06:00
thinkyhead
b946530ef6 [cron] Bump distribution date (2020-02-29) 2020-02-29 00:03:54 +00:00
ellensp
9b145c7c73 Reverse encoder for FYSETC Mini 12864 2.1 + SKR 1.3 (#17010) 2020-02-28 12:26:54 -06:00
jufimu12
ac755fce82 Fix G34 "Decreasing accuracy" bug (#17013)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2020-02-28 11:42:51 -06:00
Scott Lahteine
97e87d8262 Fix G76 reachable test (#17005) 2020-02-27 22:47:44 -06:00
Anders Sahlman
c669420134 Pass along sanity_check for (G33) probing (#17006) 2020-02-27 19:58:35 -06:00
thinkyhead
f8497b8171 [cron] Bump distribution date (2020-02-28) 2020-02-28 00:03:53 +00:00
Scott Lahteine
bfbd976c09 General G76 cleanup 2020-02-27 07:53:24 -06:00
Scott Lahteine
a75a25cd7c Replace direct call to G28(true) 2020-02-27 07:48:34 -06:00
Scott Lahteine
4f55723527 RUMBA has 3 E plugs 2020-02-27 07:48:02 -06:00
Scott Lahteine
77b82d300a Add idle_no_sleep 2020-02-27 06:45:33 -06:00
Scott Lahteine
e5d39063a2 Cleanups for PTC 2020-02-27 06:45:23 -06:00
Scott Lahteine
be62ab2d02 Move reachable test to Probe class 2020-02-27 06:16:33 -06:00
Scott Lahteine
d6e767e36b Version 2.0.4.4 Release 2020-02-27 04:15:00 -06:00
Scott Lahteine
b29aae6c0c Merge 'bugfix-2.0.x' into 2.0.x 2020-02-27 04:14:33 -06:00
Roman Moravčík
9f8ee31144 Update Slovak language (#17002) 2020-02-27 03:38:46 -06:00
Makoto Schoppert
8164cac797 Fix planner.cpp compile (#16996) 2020-02-27 03:29:44 -06:00
thinkyhead
a80eda41bc [cron] Bump distribution date (2020-02-27) 2020-02-27 00:03:42 +00:00
Scott Lahteine
bafe8d920a Handle print completed LED event in M0 2020-02-26 12:02:54 -06:00
Scott Lahteine
633b716a3a Define DIAG pins for MKS SGen-L 2020-02-26 11:35:07 -06:00
Scott Lahteine
832951ec44 Case-insensitive g-code option (#16932) 2020-02-26 09:23:55 -06:00
Scott Lahteine
18b875dc9f Allow print recovery after parking 2020-02-26 08:16:46 -06:00
Scott Lahteine
6fd7f4fe1b Fix unified status bed temp display 2020-02-26 08:09:57 -06:00
Scott Lahteine
263a7beeb5 More extra travel jerk changes
Co-Authored-By: josedpedroso <josedpedroso@users.noreply.github.com>
2020-02-26 07:24:36 -06:00
Scott Lahteine
6913a4dfa8 Prevent park_point compile error 2020-02-26 07:10:35 -06:00
Scott Lahteine
025c50cc6d Quick-homing sensorless back-off (#16872) 2020-02-26 06:50:13 -06:00
Scott Lahteine
02cce7d4b4 Add TRAVEL_EXTRA_XYJERK option
See #16949

Co-Authored-By: josedpedroso <josedpedroso@users.noreply.github.com>
2020-02-26 06:43:07 -06:00
Scott Lahteine
0a7e7a6fa5 Allow servo features in combination (#16960) 2020-02-26 06:26:54 -06:00
Scott Lahteine
daa32013b1 Sanity check for LPC serial pin conflict (#16981) 2020-02-26 06:26:30 -06:00
Scott Lahteine
ec1b86d9cb Serial strings in macros 2020-02-26 05:38:33 -06:00
Scott Lahteine
cf597e2bb1 Allow weird probe values in G33 2020-02-26 05:33:57 -06:00
ellensp
e76f2ed4cb Fix Trinamic pulse rate auto-assignment (#16966) 2020-02-26 04:34:21 -06:00
Scott Lahteine
b5c2190b38 String optimize followup 2020-02-26 04:32:40 -06:00
InsanityAutomation
28008aced0 Correct SKR expansion port pins (#16974) 2020-02-26 04:18:34 -06:00
ellensp
70af080813 Add LPC1768 Serial ports for pinsDebug (#16980) 2020-02-26 04:12:53 -06:00
Scott Lahteine
5ebba4b19f More serial strings 2020-02-26 04:11:12 -06:00
InsanityAutomation
cdcd45d651 Set LCD status for EEPROM errors (#16977) 2020-02-26 03:04:02 -06:00
Scott Lahteine
e78f607ef3 Use a STR_ prefix for non-translated strings 2020-02-26 03:02:03 -06:00
Scott Lahteine
6b9a17be16 Language: "failsafe" => "Defaults" 2020-02-26 02:03:47 -06:00
InsanityAutomation
4250a98908 Toolchange improvements (#16979) 2020-02-26 00:12:14 -06:00
InsanityAutomation
ba4f49f4a2 Fix GTR10 overlapping defines (#16976) 2020-02-25 22:56:52 -06:00
Scott Lahteine
5b438fb20d HAS_SDCARD_CONNECTION is more obsolete 2020-02-25 22:30:30 -06:00
Scott Lahteine
5071fe82ab Ensure proper SD print completion (#16967) 2020-02-25 22:18:14 -06:00
thinkyhead
91cff02596 [cron] Bump distribution date (2020-02-26) 2020-02-26 00:03:52 +00:00
Scott Lahteine
454cbcce51 Fix the wait loop in M0 / M1 2020-02-25 12:20:54 -06:00
InsanityAutomation
6bfae5de6f Fix SKR 1.4 Turbo SD_DETECT_PIN (#16955) 2020-02-25 03:17:08 -06:00
InsanityAutomation
3e685777a8 Fix LCD cutter/bed icons overlapping (#16956) 2020-02-25 03:07:36 -06:00
Giuliano Zaro
d13b153230 Update Italian language (#16947) 2020-02-25 03:05:58 -06:00
InsanityAutomation
3a6f776c4b Update POWER_LOSS_PIN comment (#16957) 2020-02-24 23:51:10 -06:00
thinkyhead
ca305b03b7 [cron] Bump distribution date (2020-02-25) 2020-02-25 00:04:00 +00:00
Scott Lahteine
1955eea1b8 Version 2.0.4.3 Release 2020-02-24 11:01:52 -06:00
Scott Lahteine
42fa9fc570 Fix card_eof error 2020-02-24 11:01:52 -06:00
Marcio T
130d0395d0 Restore tabs in Makefile (#16944) 2020-02-24 11:01:52 -06:00
Marcio T
c5f1ff9ee1 Allow Z_SAFE_HOMING_POINT outside bed (#16945) 2020-02-24 11:01:52 -06:00
Scott Lahteine
9040394e8e Fix card_eof error 2020-02-24 11:00:01 -06:00
Marcio T
955ce393df Restore tabs in Makefile (#16944) 2020-02-24 10:42:12 -06:00
Marcio T
92278a45ed Allow Z_SAFE_HOMING_POINT outside bed (#16945) 2020-02-24 10:40:12 -06:00
Scott Lahteine
089cc68a04 Merge nightly patches 2020-02-24 06:12:15 -06:00
Scott Lahteine
a254354e68 BS_TOTAL_AXIS => BS_TOTAL_IND 2020-02-24 06:11:43 -06:00
Scott Lahteine
5e197df89a Fix Babystepping loop (again) 2020-02-24 05:48:42 -06:00
Scott Lahteine
8ba5ef8cae "Init. Media" => "Attach Media" 2020-02-24 05:33:23 -06:00
Scott Lahteine
9a51f29efa Simplified E_AXIS_HAS macro 2020-02-23 23:55:56 -06:00
Jason Smith
ebd2bcc177 Fix AXIS_HAS_SW_SERIAL 2020-02-23 21:59:31 -06:00
thinkyhead
9717b3044f [cron] Bump distribution date (2020-02-24) 2020-02-24 00:03:56 +00:00
Jason Smith
2bcc2ec7d1 Reduce default TMC baudrate to 57600 with Software Serial (#16930) 2020-02-23 07:48:56 -06:00
Giuliano Zaro
529d57bddf Sync Italian language (#16935) 2020-02-23 07:47:30 -06:00
Scott Lahteine
0ba18848af Allow USE_GCODE_SUBCODES for debugging 2020-02-22 22:50:03 -06:00
Scott Lahteine
b2328d089a Allow LCD_PIXEL_WIDTH/HEIGHT override 2020-02-22 21:36:21 -06:00
Scott Lahteine
29ec868c4b Commit last SD line before fileHasFinished 2020-02-22 20:46:52 -06:00
Scott Lahteine
1d431fe8d2 Suppress "packed member" warning 2020-02-22 19:28:24 -06:00
Scott Lahteine
2b759b9e8d Suppress "packed member" warning 2020-02-22 19:26:52 -06:00
Scott Lahteine
5f27f7de47 Version 2.0.4.2 Release 2020-02-22 18:49:59 -06:00
Scott Lahteine
282f4678cd Merge nightly patches 2020-02-22 18:47:09 -06:00
ZMiguel Alves
2471a8bb91 Define ANET_FULL_GRAPHICS_LCD pins for SKR 1.4 (#16928) 2020-02-22 18:45:10 -06:00
ellensp
7bf3581b02 Fix M0/M1 broken wait loop (#16921) 2020-02-22 18:37:39 -06:00
Scott Lahteine
b9b29bf4c0 Followup to babystep hotfix 2020-02-22 18:34:49 -06:00
thisiskeithb
20df64814e Finish Custom User Menu sanity-check (#16917) 2020-02-22 18:33:34 -06:00
thinkyhead
34c92bbc17 [cron] Bump distribution date (2020-02-23) 2020-02-23 00:03:55 +00:00
Scott Lahteine
c41f3f8582 Version 2.0.4.1 Release 2020-02-22 07:02:55 -06:00
Scott Lahteine
8670df08a2 CoreXY Babystepping hotfix 2020-02-22 07:02:55 -06:00
vivian-ng
eeec4c27e7 [ESP32] Allow user to define pins for hardware Serial1 and Serial2 (#16918) 2020-02-22 04:00:10 -06:00
Scott Lahteine
730690ea03 Hotfix for Babystepping 2020-02-22 02:55:26 -06:00
Scott Lahteine
3543873da7 Use moves_free in ok_to_send 2020-02-22 02:55:26 -06:00
thinkyhead
c505626c42 [cron] Bump distribution date (2020-02-22) 2020-02-22 02:55:26 -06:00
Scott Lahteine
484e1a624c CoreXY Babystepping hotfix 2020-02-22 02:52:59 -06:00
Scott Lahteine
ac3e27c026 Hotfix for Babystepping 2020-02-22 02:52:21 -06:00
Scott Lahteine
1ab6f910b6 Use moves_free in ok_to_send 2020-02-22 02:30:59 -06:00
thinkyhead
cfd49740eb [cron] Bump distribution date (2020-02-22) 2020-02-22 00:03:47 +00:00
Scott Lahteine
7e8505fc11 Version 2.0.4 Release 2020-02-21 08:38:14 -06:00
Scott Lahteine
f9aec2685c Merge remote-tracking branch 'upstream/bugfix-2.0.x' into 2.0.x 2020-02-21 08:37:02 -06:00
Scott Lahteine
5d16497bed Tweak pins spacing, comments 2020-02-21 08:33:11 -06:00
ellensp
9f53bbd791 Add PICA shields support (#16891) 2020-02-21 08:27:32 -06:00
Jamie
e1d367e05a Fix EEPROM errors with EXTRUDERS == 0 (#16898) 2020-02-21 07:42:13 -06:00
Karl Andersson
f30897500d Disable spreadcycle in tmc_enable_stallguard<2209> (#16890) 2020-02-21 07:40:55 -06:00
Tanguy Pruvot
68de12acbf Followup to autoreport patch (#16914)
See a1f026f57a
2020-02-21 07:36:59 -06:00
Scott Lahteine
6320f9795c More EEPROM cleanup 2020-02-20 20:56:13 -06:00
Scott Lahteine
22b974691e Tweak process_line_done for speed 2020-02-20 20:36:51 -06:00
Scott Lahteine
4ef627d79f Add a note on EEPROM todo 2020-02-20 20:36:50 -06:00
Scott Lahteine
19991e269b Show end prompt with Print Event LEDs 2020-02-20 20:36:50 -06:00
Scott Lahteine
b8b225c8b5 Function for CONFIG_ECHO_HEADING 2020-02-20 20:36:50 -06:00
Scott Lahteine
a1f026f57a Inline manage_inactivity, tweak autoreport_paused 2020-02-20 20:36:50 -06:00
Scott Lahteine
2b788e9aa6 Single envs for specific boards 2020-02-20 20:20:15 -06:00
thinkyhead
140e4ac507 [cron] Bump distribution date (2020-02-21) 2020-02-21 00:03:41 +00:00
Robby Candra
1c52d76668 Serial redirect for Move Command when stopping (#16906) 2020-02-20 02:22:07 -06:00
thinkyhead
178735b958 [cron] Bump distribution date (2020-02-20) 2020-02-20 00:03:52 +00:00
thinkyhead
4c179ba3f7 [cron] Bump distribution date (2020-02-19) 2020-02-19 00:03:54 +00:00
thinkyhead
05f51e9355 [cron] Bump distribution date (2020-02-18) 2020-02-18 00:03:31 +00:00
thinkyhead
75e3aa12c5 [cron] Bump distribution date (2020-02-17) 2020-02-17 00:03:58 +00:00
Scott Lahteine
99a5074372 Fix babystep include, typos in stepper.cpp
Fix #16881
2020-02-16 17:49:21 -06:00
vivian-ng
4c6f695bea Put ESP32 I2S stepper task and Marlin on the same core (#16874) 2020-02-16 16:44:36 -06:00
Tanguy Pruvot
8bc3e63871 Update French language (#16877) 2020-02-16 16:39:17 -06:00
Scott Lahteine
4d400910b4 Fix mftest -b -u line match 2020-02-16 15:30:20 -06:00
Giuliano Zaro
42208bc031 Fix unknown command on empty lines (#16867) 2020-02-16 01:10:20 -06:00
Giuliano Zaro
199a1ba0e5 Move SAMD51 Temperature timer to RTC (#16868) 2020-02-15 22:45:52 -06:00
Scott Lahteine
4360142bd1 Defer updated ADC 2020-02-15 22:37:16 -06:00
Scott Lahteine
ddce1c6ef2 Show '*' for zero 'stst' flag 2020-02-15 22:35:28 -06:00
Scott Lahteine
72fae2faa5 Require TMCStepper 0.6.2 2020-02-15 22:35:28 -06:00
Scott Lahteine
64a81f887a EXPERIMENTAL integrated BABYSTEPPING (#16829) 2020-02-15 21:42:28 -06:00
Scott Lahteine
64b96f3908 Double ADC read frequency (#16864) 2020-02-15 19:10:46 -06:00
thinkyhead
52a1268089 [cron] Bump distribution date (2020-02-16) 2020-02-16 00:04:09 +00:00
Scott Lahteine
5584da388c Conceal float rounding errors on display
Fix #16866
2020-02-15 02:55:41 -06:00
Scott Lahteine
efdaf940a5 Fix byte-to-percent display
Fixes #16866
2020-02-15 02:37:13 -06:00
Scott Lahteine
71ec89a112 Fix mftest -b and -u. Add --help. 2020-02-15 01:47:15 -06:00
Scott Lahteine
1087e318e5 Fix a BORG compile warning 2020-02-15 01:47:15 -06:00
thinkyhead
150237f712 [cron] Bump distribution date (2020-02-15) 2020-02-15 00:03:59 +00:00
George Fu
63dd0f249d Fysetc S6 pins / LCD updates (#16830) 2020-02-14 07:18:57 -06:00
Scott Lahteine
0b984519c3 Clean up stepper and babystep (#16857) 2020-02-14 05:14:37 -06:00
Scott Lahteine
073e4443e8 Optimize "Dismiss" string 2020-02-14 00:05:06 -06:00
Scott Lahteine
00ba053c90 Clean up host actions code (#16856) 2020-02-13 23:39:27 -06:00
Giuliano Zaro
ff0c931e47 Add RAMPS 1.4.4 to AGCM4 (#16606) 2020-02-13 23:28:18 -06:00
vivian-ng
a16f3baecc Add ESPAsyncTCP to lib_ignore (#16844) 2020-02-13 23:22:52 -06:00
Scott Lahteine
49a66bc4cc Fix ESP32 warning, specify supported version 2020-02-13 19:22:13 -06:00
Scott Lahteine
f3f692adf7 Don't assert safe homing for delta/scara 2020-02-13 19:22:13 -06:00
Robby Candra
af84e362cc Remove unused queue.stopped_N (#16850) 2020-02-13 18:59:32 -06:00
Gaston Dombiak
082117c4bb Ping the job timer in M140 (#16849) 2020-02-13 18:43:47 -06:00
Giuliano Zaro
0e17d10bf3 Fix G-code line parsing (#16840) 2020-02-13 18:30:47 -06:00
thinkyhead
68077149e2 [cron] Bump distribution date (2020-02-14) 2020-02-14 00:04:13 +00:00
thinkyhead
62d7d49719 [cron] Bump distribution date (2020-02-13) 2020-02-13 00:03:34 +00:00
Scott Lahteine
1d8d91afc6 No limit needed on this raise
Remove an extraneous limit from #16811.
2020-02-12 14:57:11 -06:00
Robby Candra
a83ad2d9d4 Define MarlinSerial instances for DGUS (#16841) 2020-02-11 20:30:20 -06:00
thinkyhead
0306c1bb0c [cron] Bump distribution date (2020-02-12) 2020-02-12 00:03:54 +00:00
Giuliano Zaro
4a733796bd Prevent pin glitches on out commutation (#16835)
Better for switching from pulled input to output and also set real output (with no input enabled).
2020-02-11 10:43:28 -06:00
Scott Lahteine
0fd0554b5f Simplify old safe homing sanity check 2020-02-11 10:07:45 -06:00
Scott Lahteine
fa6e7cb733 Function-style critical section macros 2020-02-11 09:37:04 -06:00
Scott Lahteine
7b02a62da8 Fix up tests 2020-02-11 09:37:04 -06:00
Scott Lahteine
189c101793 Use prior babystep delay method (#16833) 2020-02-11 08:52:11 -06:00
Scott Lahteine
1c556cd90d Recommend Z Safe Homing
Co-Authored-By: Vertabreaker <opyrus@hotmail.com>
2020-02-11 07:40:37 -06:00
Scott Lahteine
e442663e2a No Z sensorless req'd if homing with probe
Fixes #16674
2020-02-11 04:15:25 -06:00
Scott Lahteine
71539bcbeb Undo driver type auto-assignment for now
Good general concept but needs more time to develop and group with a stepper suite.
2020-02-11 02:32:01 -06:00
Giuliano Zaro
d5790e09a5 Update SAMD51 EEPROM repo link (#16832) 2020-02-11 02:05:58 -06:00
thinkyhead
b26f7fca3f [cron] Bump distribution date (2020-02-11) 2020-02-11 00:04:03 +00:00
Scott Lahteine
2836834d7e Unify step pulse timing of ISR / babystep (#16813) 2020-02-10 16:58:21 -06:00
darksiah
d8b2726fd3 Fix MKS Robin Nano platformio.ini entry (#16826) 2020-02-10 16:49:36 -06:00
proferabg
3f87f912c5 Enable hotend / bed PID separately in ExtUI (#16827) 2020-02-10 16:48:22 -06:00
Scott Lahteine
dd6a7ca197 Fix out-of-order M0 after SD printing
Fixes #14774

Co-Authored-By: tol2cj <tol2cj@users.noreply.github.com>
2020-02-10 16:36:31 -06:00
Scott Lahteine
fa4a6cdb5c Fix out-of-order M0 after SD printing
Fixes #14774

Co-Authored-By: tol2cj <tol2cj@users.noreply.github.com>
2020-02-10 16:33:40 -06:00
Scott Lahteine
3bef7a4450 Add g-code quoted strings, improve stream code (#16818) 2020-02-10 14:52:15 -06:00
Daniel Mazurkiewicz
e561f744fa Update MKS BASE and v1.6 pins (#16806) 2020-02-10 14:12:11 -06:00
Scott Lahteine
0b45493557 Add a caution to drivers.h 2020-02-09 21:58:12 -06:00
Scott Lahteine
18a7276909 Revert "Coolstep for TMC2130, 2209, 5130, 5160"
Reverting #16790 as not ready for primetime.
2020-02-09 21:22:26 -06:00
Scott Lahteine
28b48fc9bb Revert change to AXIS_DRIVER_TYPE_X2
- Revisit this to figure out why it breaks
2020-02-09 20:49:55 -06:00
Scott Lahteine
10b4fa91eb Add mftest -b (auto-build) and -u (upload)
- Implement the equivalent of auto-build for the shell environment by using the MOTHERBOARD setting to look up the env: entries.
2020-02-09 20:48:20 -06:00
Scott Lahteine
a33d08928a Tweak LPC1768 upload py script 2020-02-09 20:48:20 -06:00
thinkyhead
15e6ee6c7c [cron] Bump distribution date (2020-02-10) 2020-02-10 00:03:46 +00:00
InsanityAutomation
a9549f7a08 Add PID, probe offsets to ExtUI (#16792) 2020-02-09 12:22:53 -06:00
InsanityAutomation
cc1ff27256 Bump config version to 020004 (#16816) 2020-02-09 12:15:02 -06:00
Scott Lahteine
0ce83dee95 Show print time with PRINTER_EVENT_LEDS 2020-02-09 11:37:43 -06:00
Scott Lahteine
38873596ec Tweak parser warning 2020-02-09 11:37:43 -06:00
Scott Lahteine
ffcbba4447 Move MSG_MARLIN 2020-02-09 11:37:43 -06:00
Scott Lahteine
b9b07387d7 Minor HAL cleanup 2020-02-09 11:12:38 -06:00
Giuliano Zaro
90e2c42031 Adafruit Grand Central M4 fixes (#16812) 2020-02-09 09:57:22 -06:00
InsanityAutomation
84b6e11bd5 Better probe fail handling (#16811) 2020-02-09 07:46:38 -06:00
Fabio Santos
894762259b Coolstep for TMC2130, 2209, 5130, 5160 (#16790) 2020-02-08 21:01:57 -06:00
thinkyhead
f0cbc85a07 [cron] Bump distribution date (2020-02-09) 2020-02-09 00:03:30 +00:00
Scott Lahteine
130e36d766 Tweak ABL logging, document probing 2020-02-08 17:47:54 -06:00
Scott Lahteine
5d3cfbdc9b Add .editorconfig file 2020-02-08 17:43:25 -06:00
Scott Lahteine
f55abfeb95 Clean up Makefle indentation 2020-02-08 17:43:00 -06:00
thinkyhead
38bf5523e1 [cron] Bump distribution date (2020-02-08) 2020-02-08 00:02:22 +00:00
thinkyhead
12b3807a7f [cron] Bump distribution date (2020-02-07) 2020-02-07 00:02:48 +00:00
Robert Stein
3a3429b1ef Fix probe with multi-endstops (#16793) 2020-02-06 15:28:46 -06:00
Robby Candra
86812432f3 Remove extraneous Serial init (#16794) 2020-02-06 14:11:49 -06:00
Tanguy Pruvot
54aff83179 G26: Allow to set retraction for UBL mesh test (#16511) 2020-02-05 20:33:39 -06:00
Bob Kuhn
78fea4a9ca Split up MKS_RUMBA32 into two variants (#16781) 2020-02-05 20:28:28 -06:00
thinkyhead
bb68eaa69e [cron] Bump distribution date (2020-02-06) 2020-02-06 00:02:49 +00:00
Scott Lahteine
62b9d7dc73 Direct link to version configs 2020-02-05 00:47:24 -06:00
Scott Lahteine
00d71ff0eb Direct download link for configs 2020-02-05 00:45:43 -06:00
thisiskeithb
9b4192cdd0 Add MKS Base 1.6 board (#16783) 2020-02-04 23:21:05 -06:00
thinkyhead
0ebd2f44d4 [cron] Bump distribution date (2020-02-05) 2020-02-05 00:02:59 +00:00
Scott Lahteine
f312ddfa4f More updates for 8 extruders, REPEAT 2020-02-04 12:37:20 -06:00
Scott Lahteine
d83382eb55 Add "PR Bad Target" workflow action 2020-02-04 09:41:26 -06:00
Scott Lahteine
793939a365 Upgrade an ifdef 2020-02-04 08:46:37 -06:00
Scott Lahteine
7bf2190f03 Fix CALIBRATION_GCODE pin handling 2020-02-04 08:32:43 -06:00
Scott Lahteine
081ef46e76 Fix Arduino IDE compile for DUE
Fixes #16767
2020-02-04 08:32:20 -06:00
Scott Lahteine
15b6ad41bc Fix E stepper stays on bug
Fixes #16753
2020-02-04 02:39:37 -06:00
Bob Kuhn
0268c1d02c STM32duino - Use SDIO for onboard SD (#16756) 2020-02-04 01:24:11 -06:00
felixstorm
38a9706e16 Keep secure credentials in a separate config file (#16773) 2020-02-03 23:29:01 -06:00
InsanityAutomation
62d9e3f50e Force T0 in UBL G29 on all multi-hotend setups (#16774) 2020-02-03 20:58:44 -06:00
Scott Lahteine
3ded99b894 [cron] Bump distribution date 2020-02-03 19:53:30 -06:00
Scott Lahteine
4c76314c26 Scheduled action to bump the date on bugfix-2.0.x 2020-02-03 19:31:41 -06:00
felixstorm
f1dbfaf706 Fix warning for ESP32 (#16771) 2020-02-03 18:36:51 -06:00
ellensp
7d4fa9d504 Fix LCD Z Move character LCD display line (#16772) 2020-02-03 18:35:06 -06:00
Scott Lahteine
64ab254f26 Use a different Configurations branch for CI 2020-02-03 18:11:52 -06:00
Scott Lahteine
ff78f79762 Use a different Configurations branch for CI 2020-02-03 18:06:04 -06:00
Scott Lahteine
202840e750 Tweak mfqp script 2020-02-03 08:33:35 -06:00
Scott Lahteine
bfad23d3e2 (c) 2020 2020-02-03 08:00:57 -06:00
Scott Lahteine
7f9c62437e Corner Leveling: Add inset for each side (#16759) 2020-02-03 00:00:35 -06:00
Scott Lahteine
72b4d91d2e Add Z_AFTER_HOMING to raise Z more in G28 (#16755) 2020-02-02 00:02:30 -06:00
Scott Lahteine
ee6003be87 Revert breaking change to _FAN_PWM macro 2020-02-01 23:07:20 -06:00
Scott Lahteine
4716dac874 Apply REPEAT, RREPEAT, and loop macros (#16757) 2020-02-01 21:00:53 -06:00
Scott Lahteine
0e72c315a0 Minor string storage optimization 2020-02-01 20:29:31 -06:00
Scott Lahteine
4937519d51 Fix LPC build with USE_WATCHDOG off 2020-02-01 20:29:31 -06:00
Scott Lahteine
63469ed8f7 Add EXP labels to SKR pins 2020-02-01 19:06:32 -06:00
Scott Lahteine
22556a7bbf More 8-extruder fixups 2020-02-01 15:19:58 -06:00
Scott Lahteine
c4cbc54484 Suppress a compile warning 2020-02-01 10:38:07 -06:00
Scott Lahteine
7a4758a6a2 Fix RGB / Neopixel white color bug
See #16752
2020-02-01 10:11:36 -06:00
Scott Lahteine
995a9238b3 Probe singleton patch
Followup to #16751
2020-02-01 07:57:10 -06:00
Scott Lahteine
5296af94d2 Drop obsolete SD special char handling
See #14035
2020-02-01 06:49:56 -06:00
Scott Lahteine
0d342bac51 Fix CURRENT_STEP_DOWN compile error 2020-02-01 06:27:17 -06:00
Acenotass
832d33ce9d Update Russian language (#16750) 2020-02-01 04:53:18 -06:00
Jason Smith
c3cab37d7e Fix Temperature::over_autostart_threshold (#16749) 2020-02-01 04:51:57 -06:00
InsanityAutomation
e58d1bf974 G34 automatic point assignment (#16473) 2020-02-01 04:50:44 -06:00
Scott Lahteine
90b6324563 Encapsulate probe as singleton class (#16751) 2020-02-01 04:21:36 -06:00
Scott Lahteine
43d3463d5d Misc cleanup, whitespace 2020-02-01 03:50:42 -06:00
Scott Lahteine
e64b7a3ab2 Clean up i2c encoder, sanitize serial 2020-02-01 00:57:14 -06:00
Scott Lahteine
1af05797d7 Improve mfadd helper script
- Use the original branch name if none is supplied
- Set the remote tracking to the source
- Accept User/Branch or User:Branch syntax
2020-02-01 00:46:22 -06:00
Jason Smith
9a8de23858 Consistent M112 with Emergency Parser (#16747) 2020-01-31 23:08:37 -06:00
Jason Smith
5b3d968634 Option for Trigorilla 1.4 with add-on endstops board (#16737) 2020-01-31 21:51:59 -06:00
rebel1
300b81bfcb Fix BTT SKR 1.4 extra endstop pins (#16738) 2020-01-31 21:46:02 -06:00
Acenotass
0a6ae664bd Update Russian language (#16745) 2020-01-31 21:43:44 -06:00
Scott Lahteine
c4df5cf9a6 Include macros for delta ABC 2020-01-31 04:40:33 -06:00
Scott Lahteine
e6a7be922b Version 2.0.3 2020-01-31 04:24:05 -06:00
Scott Lahteine
1525c2530e Merge commit 'dabf3939209fd8ea7f6a6327d764c16743aa22aa' into look_at_201 2020-01-31 04:23:45 -06:00
Scott Lahteine
016e4c0193 Version 2.0.2 2020-01-31 04:22:34 -06:00
Scott Lahteine
be642610ae Merge commit '8bd6b60a0141fa892984f2d5b61f06eadbbf9a5f' into look_at_201 2020-01-31 04:22:09 -06:00
Scott Lahteine
02f61832c0 Add sanity-check for new Advanced Pause option
Followup to #16372
2020-01-30 23:24:40 -06:00
thinkyhead
dabf393920 [cron] Bump distribution date (2020-01-31) 2020-01-31 00:06:46 +00:00
Artur Petrzak
e4679c1b78 (21) PT100 for MCUs with 3.3v logic (#16731) 2020-01-30 18:00:37 -06:00
Scott Lahteine
62f52ebb3a Fix up, improve endstop pin auto-assignment
Followup for #16723
2020-01-30 14:09:33 -06:00
Scott Lahteine
e8e25b80d1 Extend RX/TX pins for up to 8 extruders 2020-01-30 13:29:19 -06:00
Robert Stein
2822c0890a Set up DIAG endstops for BTT SKR 1.4 / 1.4 Turbo (#16727) 2020-01-30 13:17:15 -06:00
Alexander Gavrilenko
c45d6b2017 Simultaneous use of rotary encoder and touch buttons (#16729) 2020-01-30 12:29:30 -06:00
felixstorm
8d4dd88bf9 Fix compile error in SdVolume on ESP32 (#16728) 2020-01-30 12:22:42 -06:00
Scott Lahteine
3c9464eea4 Tweak G60/G61 slots 2020-01-30 03:25:40 -06:00
Scott Lahteine
5b12627e14 Auto assign DIAG pins for multi-endstop (#16723) 2020-01-30 03:24:57 -06:00
Scott Lahteine
9caf5c05e7 Refactor heater watch, job timer auto-start (#16725) 2020-01-30 03:24:43 -06:00
Scott Lahteine
50889c0f94 Move L64XX index_to_axis to progmem (#16697) 2020-01-30 03:24:23 -06:00
chgi
99b6a132bc Fix G60/G61 slots > 8 and compile error (#16715) 2020-01-30 03:18:45 -06:00
Radek Pietruszewski
e6a675e6ec Fix missing string for M48 build (#16708) 2020-01-30 03:13:31 -06:00
Mauro
1bc6509d02 Support for E4d@BOX mainboard (#16716) 2020-01-30 03:06:17 -06:00
Neskik
1db9d9f76f Fix probe temp calibration (#16718) 2020-01-30 03:00:38 -06:00
0r31
8737c35ded Fix HAS_FAN macro (#16717) 2020-01-29 22:48:26 -06:00
Scott Lahteine
e8ed4329ea Cleanup of old includes, add comments 2020-01-29 22:41:18 -06:00
thinkyhead
a5f72330fb [cron] Bump distribution date (2020-01-30) 2020-01-30 00:06:48 +00:00
InsanityAutomation
9bb8176d34 Fix Toolchange (!no_move) return to status (#16699) 2020-01-29 00:06:06 -06:00
thinkyhead
9b45f342ee [cron] Bump distribution date (2020-01-29) 2020-01-29 00:07:02 +00:00
felixstorm
e4eaf32b4d Prevent SD access from resetting ESP32 (#16690) 2020-01-27 18:16:43 -06:00
thinkyhead
0c3cae59d9 [cron] Bump distribution date (2020-01-28) 2020-01-28 00:06:59 +00:00
Jason Smith
131acf304b Fix Manual Bed Leveling with multiple extruders (#16688) 2020-01-27 15:57:21 -06:00
Scott Lahteine
8bd6b60a01 Remove extraneous G60/G61 lines 2020-01-27 15:40:25 -06:00
Hans007a
e2eef1256a G60/G61 Position Save/Restore (#16557) 2020-01-26 23:19:05 -06:00
Robby Candra
a0a93e35ae Fix serial port redirection (index ≠ port num) (#16687) 2020-01-26 22:46:26 -06:00
Scott Lahteine
2325bede8a Fix Trigorilla 1.4 limit switches
See #16612
2020-01-26 21:08:55 -06:00
Scott Lahteine
56cd747c8b Rename some temperature members 2020-01-26 21:08:55 -06:00
Robby Candra
48098b1675 Preserve CWD for write/remove file (#16667) 2020-01-26 18:34:17 -06:00
thinkyhead
f6a6704b66 [cron] Bump distribution date (2020-01-27) 2020-01-27 00:06:35 +00:00
Scott Lahteine
5e3e8fcdb9 Fix PID F menu label 2020-01-26 17:07:18 -06:00
ellensp
0949c0f326 SKR 1.3 sensorless endstops hack (#16659) 2020-01-26 03:49:11 -06:00
Giuliano Zaro
81f31efaee Fix Spanish (swapped BLTouch strings) (#16637) 2020-01-26 03:34:58 -06:00
ellensp
c49e987b1e Fix M43 timer report on AVR (#16645) 2020-01-26 03:33:35 -06:00
Roman Moravčík
3572fa22a0 Update Slovak language (#16646) 2020-01-26 03:27:08 -06:00
Scott Lahteine
1d1dc8e339 More 8 extruder defines 2020-01-26 03:24:54 -06:00
Scott Lahteine
bbfbcb8a5d Clean up PID language defines 2020-01-26 03:24:54 -06:00
Jason Smith
44d400db83 Fix HOMING_BACKOFF_MM for DELTA (#16657) 2020-01-26 03:16:03 -06:00
ellensp
4a71285c34 Fix Serial defines for M43 on AVR (#16649) 2020-01-26 03:05:34 -06:00
Luc
6357619ab2 Add ESP3DLib idletask entry point (#16658) 2020-01-26 01:11:30 -06:00
0r31
e3611ad209 Fix MKS Base + Digipot compile error (#16636) 2020-01-26 01:08:40 -06:00
Jason Smith
95d5a0c480 Fix DELTA_CALIBRATION_MENU recursive call (#16656) 2020-01-26 00:02:06 -06:00
thinkyhead
838a420e27 [cron] Bump distribution date (2020-01-26) 2020-01-26 00:06:19 +00:00
yangwenxiong
248b7dfa59 BigTreeTech GTR V1.0 / Support 8 extruders, heaters, temp sensors, fans (#16595) 2020-01-25 02:13:39 -06:00
Bob Kuhn
0d166f9c7d Duet Smart Effector support (#16641) 2020-01-25 02:00:51 -06:00
Scott Lahteine
86c18ea6e0 Bring configs and drivers.h up to date 2020-01-24 23:17:52 -06:00
Scott Lahteine
b7a67f6f74 Extra debugging for leveling on/off 2020-01-24 23:17:49 -06:00
Scott Lahteine
1c042bbaea Convert chars only for enabled languages 2020-01-24 15:12:04 -06:00
thinkyhead
899db41a5c [cron] Bump distribution date (2020-01-24) 2020-01-24 00:07:21 +00:00
Artur Petrzak
2ef6b86ccd Enable use of latest TMCStepper on MKS Robin Nano (#16652) 2020-01-22 21:52:16 -06:00
thinkyhead
342f65eb8e [cron] Bump distribution date (2020-01-23) 2020-01-23 00:07:18 +00:00
Scott Lahteine
0eae26a7be Tweak mfpub stashing 2020-01-22 01:54:31 -06:00
thinkyhead
fd346c6cd1 [cron] Bump distribution date (2020-01-22) 2020-01-22 00:07:17 +00:00
Scott Lahteine
d3a8a81756 Update mfdoc, mfpub 2020-01-21 05:21:49 -06:00
Ryan
b7f86bffd5 Arc segment radius scaling (#16551) 2020-01-21 02:53:26 -06:00
InsanityAutomation
79810b7fcb G12 defaults per tool. Event G-code for post-toolchange (#16554) 2020-01-21 02:51:23 -06:00
Scott Lahteine
84c874c53b Tweak some config spacing 2020-01-21 02:43:34 -06:00
MaukCC
04d64351a2 Add HMS434 V15 ATSAM board (#16620) 2020-01-21 01:10:31 -06:00
Tanguy Pruvot
c8ac908db2 Release UI on G26 priming timeout (#16449) 2020-01-21 01:05:55 -06:00
0r31
b57ef4b261 Override for LPC1768 u8g/digipot I2C master ID (#16622) 2020-01-20 20:09:16 -06:00
Bob Kuhn
1a5cbc9052 Fix STM401/4xx/STM32F7xx timers, STEVAL_3DP001V1 warning (#16621) 2020-01-20 18:33:36 -06:00
thinkyhead
f36225c3e0 [cron] Bump distribution date (2020-01-21) 2020-01-21 00:07:07 +00:00
InsanityAutomation
97b5a5f469 Provide methods for M420 + MBL (#16602) 2020-01-20 01:44:36 -06:00
Bob Kuhn
a1f5245e27 L64xx M906 Fix status variable, formatting (#16597) 2020-01-20 01:15:00 -06:00
Giuliano Zaro
ef8f829513 Fix CHAMBER_MAXTEMP security margin (#16600) 2020-01-20 00:44:51 -06:00
InsanityAutomation
d9cdb4ae19 Move steps/mm out of slim menus (#16603) 2020-01-20 00:43:19 -06:00
0r31
451062553e LPC1768: Allow I2C master channel override (#16584) 2020-01-19 23:59:06 -06:00
InsanityAutomation
0fcf2b1110 Quad Z stepper support (#16277) 2020-01-19 23:35:07 -06:00
0r31
f36f084465 Fix Greek language string (#16601) 2020-01-19 23:03:19 -06:00
Bob Kuhn
f6468f0af3 STEVAL_3DP001V1: Easier Serial2 (for WIFI interface) (#16599) 2020-01-19 22:27:20 -06:00
Jason Smith
439e73d79c AVR sanity check for MONITOR_DRIVER_STATUS with SW Serial (#16421) 2020-01-19 22:25:38 -06:00
ellensp
0547d9d651 Reset shutdown timer on M85 (#16587) 2020-01-19 22:24:12 -06:00
thisiskeithb
3b34fbd4c4 Update BTT002 pins (#16591) 2020-01-19 22:21:32 -06:00
George Fu
a05a65e7d2 Update FYSETC S6 Peripheral Pins (#16593) 2020-01-19 22:21:09 -06:00
Giuliano Zaro
aec211fc80 SAMD51: ADC for probe temperature compensation (#16596) 2020-01-19 22:17:08 -06:00
Bob Kuhn
1084068a3e Simplify a drivers.h macro (#16589) 2020-01-19 20:59:47 -06:00
Scott Lahteine
e9ae585647 Patch for _STEP_INIT 2020-01-19 20:50:33 -06:00
Scott Lahteine
dda76e50a9 Use bool in pin compare 2020-01-19 20:05:53 -06:00
Scott Lahteine
37849969ad Function-like macros 2020-01-19 20:01:22 -06:00
Scott Lahteine
707349d492 Updates for L64XX 2020-01-19 19:53:12 -06:00
Scott Lahteine
f6a6839a82 Simplify TMC monitor code 2020-01-19 19:29:30 -06:00
Scott Lahteine
79c2f05e7d Fix M112 with Emergency Parser 2020-01-19 19:00:24 -06:00
thinkyhead
4dca6d50c0 [cron] Bump distribution date (2020-01-20) 2020-01-20 00:06:48 +00:00
thinkyhead
23fc81f1af [cron] Bump distribution date (2020-01-19) 2020-01-19 00:07:06 +00:00
Scott Lahteine
d035bfb1a9 Allow RRW Keypad with any LCD 2020-01-18 14:48:24 -06:00
thinkyhead
80400ab3f8 [cron] Bump distribution date (2020-01-18) 2020-01-18 00:04:25 +00:00
tompe-proj
a338dce83f PINDA v2 temperature sensor / compensation (#16293) 2020-01-17 17:16:45 -06:00
George Fu
4108c5d01f Update FYSETC S6 pins (#16559) 2020-01-17 13:16:05 -06:00
Scott Lahteine
9520e5121c More CI test updates 2020-01-17 03:21:31 -06:00
vivian-ng
e94f782f51 Shared SPI sanity check (#16581) 2020-01-17 02:54:22 -06:00
Vertabreaker
6d1f6a9516 Adjust GTM32 build flags (#16582) 2020-01-17 02:46:50 -06:00
Scott Lahteine
a578749622 Clean up HAL ADC, old test scripts 2020-01-17 02:44:01 -06:00
Bob-the-Kuhn
0d0dfba203 STM32 soft SPI. STEVAL_3DP001V1 SD read. M906 tweaks. (#16579) 2020-01-17 02:44:01 -06:00
thinkyhead
91a399ae7f [cron] Bump distribution date (2020-01-17) 2020-01-17 00:06:39 +00:00
felixstorm
2b9eb4437b ESP32 HAL: Fix random pauses during prints (#16548) 2020-01-16 05:57:14 -06:00
ellensp
5bd66241df Fix TOUCH_UI_FTDI_EVE bugs (#16540) 2020-01-16 05:50:00 -06:00
Scott Lahteine
1bb1ce7475 Move macros to stepper/indirection 2020-01-16 05:25:16 -06:00
Jason Smith
c305c2cc6b Fix some warnings, Melzi pins 2020-01-15 19:57:16 -06:00
Vertabreaker
b310047ded Fix GTM32 environment (to prevent a crash) 2020-01-15 19:25:36 -06:00
dagorel
bda4957f9b Fix I2C address of MCP4728 on LPC176x (#16578) 2020-01-15 19:15:54 -06:00
Pascal de Bruijn
f10d3564e1 STM32 RODATA LENGTH (#16580) 2020-01-15 19:13:28 -06:00
thinkyhead
bc483b2354 [cron] Bump distribution date (2020-01-16) 2020-01-16 00:08:10 +00:00
Dennis
2d7f94cae1 Adjustable ADC debounce delay (#16264) 2020-01-15 18:06:03 -06:00
gjdodd
7481563bd9 Nikon IR support for time lapse photos (#16539) 2020-01-15 17:59:41 -06:00
Scott Lahteine
bd550bb45a Get test configs from GitHub 2020-01-15 01:27:32 -06:00
Scott Lahteine
b419ca254b Fix typo 2020-01-15 01:27:32 -06:00
thisiskeithb
7eed008e8e Use Flash EEPROM on BTT002 (#16558) 2020-01-15 01:27:32 -06:00
Bob Kuhn
53dfeed6c0 Steval_3DP001V1 timers, analog inputs, etc. (#16565) 2020-01-14 23:19:13 -06:00
Lino Barreca
ef513ef7fb Fix build error with unsupported reset flags (#16562) 2020-01-14 23:19:13 -06:00
Scott Lahteine
7b304cee16 Move configurations to a separate repo 2020-01-14 19:11:47 -06:00
Scott Lahteine
ea7363a8f4 Update more configs 2020-01-14 18:48:29 -06:00
thinkyhead
8e1a21cf53 [cron] Bump distribution date (2020-01-15) 2020-01-15 00:08:21 +00:00
Jason Smith
fc773c2784 Fix Fysetc S6 FLASH_PAGE_SIZE and test build (#16560) 2020-01-14 15:36:47 -06:00
Scott Lahteine
bfe4ceedd1 Bring MP_SCARA config up to date 2020-01-14 14:55:47 -06:00
InsanityAutomation
ffd8b595d1 Fix PLR cancel with ExtUI (#16556) 2020-01-13 20:52:24 -06:00
Scott Lahteine
1457e40208 Make lcd_power_loss_recovery_cancel exportable 2020-01-13 20:25:12 -06:00
Bob Kuhn
1ad53cee1f Improved STMicro L64XX stepper driver support (#16452) 2020-01-13 18:47:30 -06:00
thinkyhead
53f1e5ff5b [cron] Bump distribution date (2020-01-14) 2020-01-14 00:08:54 +00:00
Scott Lahteine
0e6ef65aec Clean up whitespace 2020-01-13 16:56:56 -06:00
Scott Lahteine
ee17051933 Version 2.0.1 2020-01-13 16:49:49 -06:00
Bob Kuhn
c4ffe74d71 Add SERVO, TONE timers to variant for better STEVAL_3DP001V1 support (#16538) 2020-01-13 00:26:17 -06:00
David Klasinc
55b2af9464 Fix Linux upload path detection (#16514) 2020-01-13 00:23:55 -06:00
Vertabreaker
b4ee420a37 Geeetech G2Pro configuration (#16553) 2020-01-13 00:20:17 -06:00
Scott Lahteine
f926351fa8 Power options formatting 2020-01-13 00:15:24 -06:00
Vertabreaker
51f2733b7f Add GTM32 (STM32F103VET6) environment (#16454) 2020-01-12 22:27:58 -06:00
thinkyhead
fc4a42bbdc [cron] Bump distribution date (2020-01-13) 2020-01-13 00:08:17 +00:00
Scott Lahteine
89ccd463d7 Update auto_build.py paths for Atom/Sublime 2020-01-11 19:28:41 -06:00
Scott Lahteine
473d640e88 Restore test_builds action to bugfix 2020-01-11 18:38:47 -06:00
thinkyhead
57499291d3 [cron] Bump distribution date (2020-01-12) 2020-01-12 00:10:02 +00:00
Ryan V1
56e51efeea Use RECIPROCAL macro (not _RECIP) (#16530) 2020-01-11 17:16:16 -06:00
Jason Smith
d22eb261cf Fix probeless delta build (#16537) 2020-01-11 17:14:33 -06:00
FlyingSamson
fbf2f36cae Only constrain motion on homed axes (#16533)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2020-01-11 17:06:52 -06:00
Scott Lahteine
536778812f Migrate actions to default (2.0.x) branch 2020-01-10 18:16:52 -06:00
thinkyhead
e8941d2bd8 [cron] Bump distribution date (2020-01-11) 2020-01-11 00:08:42 +00:00
Luc
d854c8fa5f ESP3d integration for ESP32 (#16515) 2020-01-10 17:22:41 -06:00
Giuliano Zaro
e9a97127f7 Update Italian language (#16527) 2020-01-10 16:19:52 -06:00
Giuliano Zaro
0391e5bcc7 Prevent Z misaligment on tool change (#16518) 2020-01-10 16:12:21 -06:00
thinkyhead
d02a867424 [cron] Bump distribution date (2020-01-10) 2020-01-10 20:47:56 +00:00
Acenotass
2d820e6204 Update Russian language (#16522) 2020-01-10 13:06:02 -06:00
Tanguy Pruvot
f9f7697b96 Fix Probe Offset XY edit items (et Français) (#16523) 2020-01-10 13:04:59 -06:00
InsanityAutomation
409d7378d9 Add Probe Offsets menu (#16444) 2020-01-10 00:47:38 -06:00
ellensp
669fe74096 Fix compile error w/out LCD (#16502) 2020-01-09 04:51:41 -06:00
Jamie
36d08f8ad3 Add ARC_SEGMENTS_PER_SEC for finer G2/G3 arcs (#16510) 2020-01-09 04:48:00 -06:00
Mehdi Beyk Mohamadi
8a7661df89 Correct ESP32 CPU speed in README (#16472) 2020-01-09 04:16:51 -06:00
Scott Lahteine
6e658a7c04 Code style and comment tweaks 2020-01-08 20:00:26 -06:00
Scott Lahteine
95046c9047 Extend SERIAL_CHAR to take multiple arguments 2020-01-08 18:36:47 -06:00
thisiskeithb
5beca89412 Add menu item Tune > Advance K (#16488) 2020-01-08 17:43:36 -06:00
Scott Lahteine
5ac9d9754e Update workflow skip condition 2020-01-08 17:40:53 -06:00
meponderR
5e7943f19f Fix LCD for Tevo Tornado (#16474) 2020-01-08 16:32:08 -06:00
Alejandro Aguilera
5a5e1d0401 Fix Change Filament menu item with runout (#16485) 2020-01-08 16:03:23 -06:00
dagorel
a88b91b3ed Provide some missing Arduino macros (#16497) 2020-01-07 21:56:47 -06:00
Lino Barreca
5c4c052fd7 Fix SKR Pro BLTouch conflicting timers (#16499) 2020-01-07 21:54:26 -06:00
Vertabreaker
d26c32375e Fix EEPROM array size bug (#16475) 2020-01-07 21:49:27 -06:00
ellensp
994c695862 Fix MKS_SGEN sanity check (#16501) 2020-01-07 21:47:45 -06:00
Scott Lahteine
f154e94981 Move auto_build.py to 'vscode' folder 2020-01-07 19:38:15 -06:00
Tanguy Pruvot
b7f8163291 Update U20 config to help UBL toggle (#16471) 2020-01-05 02:54:15 -06:00
ManuelMcLure
675295692b Fix unused var warning (#16467) 2020-01-05 02:52:38 -06:00
Tanguy Pruvot
d1e55a2d1d Remove extra UBL map edit menu item (#16451) 2020-01-05 02:25:03 -06:00
Vertabreaker
5e1f0e5e90 Followup to EEPROM patch (#16470) 2020-01-05 02:19:50 -06:00
Tanguy Pruvot
bdcccee203 Improve French language (UBL) (#16453) 2020-01-05 02:09:27 -06:00
Justin
d70dad6807 Fix permyriad progress bar (#16460) 2020-01-05 02:08:24 -06:00
Acenotass
93e35880ce Update Russian language (#16461) 2020-01-05 02:04:28 -06:00
Jamie
9b970cf12f Add option to invert joystick axes (#16466) 2020-01-05 02:01:05 -06:00
Jamie
022b6b9067 Fix M115 cap with EXTRUDERS == 0 (#16459) 2020-01-05 01:54:30 -06:00
Jamie
fc07b0ea30 Fix EEPROM error with EXTRUDERS == 0 (#16464) 2020-01-05 01:54:30 -06:00
Scott Lahteine
a484adcb30 Update git helper usage 2020-01-05 01:54:30 -06:00
Scott Lahteine
31679640c0 Skip build tests on forks 2020-01-05 01:54:30 -06:00
Scott Lahteine
3469a0a1a0 Update maintainer funding links 2020-01-05 01:54:30 -06:00
Scott Lahteine
38c0f800d6 Action to check PRs 2020-01-05 01:54:30 -06:00
Scott Lahteine
57e37b6c24 Fix daily date bump action 2020-01-05 00:59:10 -06:00
Lino Barreca
07509febcd Fix serials available on SKR Pro 1.1 (#16439) 2020-01-03 21:01:42 -06:00
George Fu
e593da1c23 Update and fix DGUS (#16317) 2020-01-03 21:00:44 -06:00
greppp
7f87a044cd Fix Ender-2 display pins, add BTN_ENC (#16349) 2020-01-03 20:44:16 -06:00
Vertabreaker
b841b9bd01 Add example configs. Expand custom menu. (#16286)
- Anet E10
- Geeetech D200
- Geeetech M201
- JGAurora Magic
- MakerFarm Pegasus 12
2020-01-03 20:37:22 -06:00
George Fu
ceeba58dc9 FYSETC F6 v1.4 board support (#16321) 2020-01-03 20:29:25 -06:00
yedey
a49c6608c9 Fixed Creality CR-20 Pro configuration example (#16332) 2020-01-03 20:18:35 -06:00
thisiskeithb
9903bc8d36 Add EVNOVO (Artillery) Genius config (#16320) 2020-01-03 20:17:20 -06:00
Scott Lahteine
aa4db785f2 MSG_WATCH => MSG_INFO_SCREEN 2020-01-03 19:50:55 -06:00
Scott Lahteine
00e27503ce Use a default monitor_speed of 250000 2020-01-03 19:50:55 -06:00
Scott Lahteine
f7e3a5ad85 Temporary CI fix for STM32 2020-01-03 19:31:16 -06:00
Jason Smith
3cade6245e Fix MIN_PROBE_EDGE bug in default ABL G29 (#16367) 2020-01-03 17:46:26 -06:00
ellensp
d7aee3b7b6 Pins debugging AVR serial pins (#16437) 2020-01-03 17:40:56 -06:00
thisiskeithb
64fdc4f24b BTT002: Add runout, PLR, and RGB pins (#16442) 2020-01-03 17:38:15 -06:00
Acenotass
295aa3d60d Update Russian language (#16440) 2020-01-03 17:35:08 -06:00
Scott Lahteine
1d0452c41e Standardize drivers.h values, add class indirection (#16448) 2020-01-03 17:11:36 -06:00
Tanguy Pruvot
96a5e64bb8 Improve JGAurora A1/A5S touch buttons (#16394) 2020-01-02 22:04:46 -06:00
Jason Smith
595e684658 Add Leapfrog Xeed 2015 support (#16400) 2020-01-02 22:04:13 -06:00
thisiskeithb
21dc07c40a Sidewinder X1 Config Updates (#16315) 2020-01-02 21:28:54 -06:00
Tanguy Pruvot
cda363a15e Touch UI: Fix UBL mesh value editing (#16432) 2020-01-02 21:26:03 -06:00
Walt Sorensen
9f44452834 Enable MULTI_NOZZLE_DUPLICATION for BIBO (#16435) 2020-01-02 21:17:52 -06:00
ellensp
7a50dbc00d Add motherboard BIGTREE_SKR_V1.4_TURBO (#16374) 2020-01-02 21:15:34 -06:00
thisiskeithb
3162d378ff Add Ender-5 leadscrew README (#16424) 2020-01-02 20:41:50 -06:00
InsanityAutomation
d129ac1b37 Z-offset edit precision based on value limits (#16425) 2020-01-02 20:40:40 -06:00
Tanguy Pruvot
1ea529b9c1 STM32F1: Fix misleading indent / nullptr on FSMC (#16431) 2020-01-02 20:19:07 -06:00
Acenotass
5ffabd56eb Update Russian language (#16426) 2020-01-02 20:17:08 -06:00
Dirk O. Kaar
d0e1166cce Fix Visual Micro "Arduino IDE for Visual Studio" support (#16418) 2020-01-02 19:01:38 -06:00
Scott Lahteine
5b75a018b7 Misc patches preceding DGUS PR 2020-01-02 17:59:38 -06:00
randellhodges
c75b560604 PWM pin not needed for Neopixel brightness / submenu (#16345) 2020-01-02 17:50:19 -06:00
Scott Lahteine
a2cda631d9 Clean up trailing whitespace 2020-01-02 16:33:50 -06:00
Jason Smith
a7b0b390cd Fix PrintrBoard build (ignore TMC libraries) (#16346)
(In future try to get Teensy processors better supported by `TMCStepper`.)
2020-01-01 22:14:14 -06:00
Jason Smith
9ff2d34bf8 Fix warnings in stepper.cpp (#16364) 2020-01-01 22:06:50 -06:00
Jason Smith
92ad973729 Fix some DOGM warnings (#16363) 2020-01-01 21:58:16 -06:00
rado79
0be8b22d3c Add FILAMENT_UNLOAD_PURGE_FEEDRATE (#16372) 2020-01-01 21:56:58 -06:00
Jason Smith
4e1f2f89f6 Refactor TMC-related macros and sanity checks (#16384) 2020-01-01 21:51:15 -06:00
Lino Barreca
ac32ed74b4 Return from loop() on non-AVR boards (#16390) 2020-01-01 21:13:43 -06:00
swilkens
89f9902053 Disable PIDTEMPBED for SKR Mini E3 (#16396) 2020-01-01 20:59:14 -06:00
Alexander Gavrilenko
c6f7ea9f22 MKS Robin ILI9328 TFT support (#16401) 2020-01-01 20:55:37 -06:00
Bob Kuhn
747b2b9bf4 Improve STEVAL_3DP001V1 and future STEVAL_* support (#16404) 2020-01-01 20:52:56 -06:00
Pascal de Bruijn
23bdc1556d Permit ENDSTOP_INTERRUPTS_FEATURE on more STM32 (#16412) 2020-01-01 20:41:35 -06:00
Dirk O. Kaar
ec03e46ffa Improve Renkforce configs (#16417) 2020-01-01 20:40:01 -06:00
Giuliano Zaro
47edbd9220 Fix min limit for acc, feed, jerk (#16416) 2020-01-01 20:38:33 -06:00
Scott Lahteine
00c83e9ca6 Update comments re: NOZZLE_AS_PROBE 2020-01-01 19:41:23 -06:00
Scott Lahteine
832321f55d Fix games menu back item, titles 2019-12-31 16:06:16 -06:00
Scott Lahteine
941a09b6ac Fix Max7219 with 256 or more cels 2019-12-31 16:04:29 -06:00
Scott Lahteine
16787c94af Update mfpub for current MarlinDocumentation 2019-12-28 17:45:10 -06:00
Scott Lahteine
28d83b42e1 Split up HAL items 2019-12-25 19:25:05 -06:00
Scott Lahteine
23c5266076 Update README with status badge, etc. 2019-12-25 15:06:36 -06:00
Scott Lahteine
0673f335e1 Merge remote-tracking branch 'upstream/bugfix-2.0.x' into 2.0.x 2019-12-24 00:05:04 -06:00
InsanityAutomation
1c9ccce520 Add NOZZLE_AS_PROBE (no probe offsets) (#15929) 2019-12-24 00:03:08 -06:00
thisiskeithb
9c021158e5 Sync SKR E3 configs (#16301) 2019-12-23 18:16:11 -06:00
petrzjunior
254d352fca Update Czech language (#16305) 2019-12-23 18:14:51 -06:00
Luu Lac
baa101253a MKS Robin 2 (STM32F407ZE) base support (#16270) 2019-12-22 18:16:08 -06:00
thisiskeithb
a333bba725 Add Rumba32 support for PIO (#16202) 2019-12-22 18:08:52 -06:00
Scott Lahteine
ac7ee4b94a Release version 2.0.0 2019-12-22 18:03:36 -06:00
ferengi82
2230ef6e09 MKS SGen-L pins EEBF or EFBF scheme (#16296) 2019-12-22 17:11:49 -06:00
Luc
24eaf2d7e0 Some ESP32 patches (#16297) 2019-12-22 16:11:17 -06:00
randellhodges
f4196d394b Flash leveling (for some STM32) (#16174) 2019-12-22 16:04:09 -06:00
randellhodges
ebdf8b6b1a Fix STM32 flush of TX (used by UBL) (#16197) 2019-12-22 03:08:17 -06:00
FLYmaker
59f9bb2120 Add FLYBOARD (STM32F407ZG) (#16257) 2019-12-22 03:05:30 -06:00
thisiskeithb
f339a39654 Add Ender-5 Pro config (#16221) 2019-12-21 20:02:40 -06:00
Luc
a3d88aebed Add MRR_ESPA/_ESPE (ESP32) boards (#16238) 2019-12-21 18:58:00 -06:00
Jason Smith
d5bc5547ee Step timing cleanup and rounding fix (#16258) 2019-12-21 18:36:25 -06:00
Tanguy Pruvot
f8065da48f Reset runout.ran_out on resume (#16230) 2019-12-21 18:35:35 -06:00
Scott Lahteine
127fb9860c Don't test certain changes 2019-12-21 03:37:49 -06:00
thisiskeithb
c5179cffb4 Add Tevo Nereus (w/ Robin Nano) config (#16207) 2019-12-21 03:24:40 -06:00
Jason Smith
0d8c81b2a6 Fix axis CS sanity check (#16271) 2019-12-20 22:05:42 -06:00
Markus Towara
856013cc0f Fix planner compile error (#16272) 2019-12-20 22:04:49 -06:00
randellhodges
0b6c2d893e Fix G34 with Z_DUAL_STEPPER_DRIVERS compile (#16274) 2019-12-20 22:03:37 -06:00
Vertabreaker
b6d857f1d6 Improve Anet A6 config (#16280) 2019-12-20 21:59:33 -06:00
Jason Smith
2e235aff03 Fix HAL_STM32 + Arduino IDE SoftwareSerial conflict (#16266) 2019-12-20 19:14:27 -06:00
Scott Lahteine
87992f3669 Use Github Actions for CI, date bump (#16269) 2019-12-20 19:11:53 -06:00
Scott Lahteine
64ebec50dc Move pins debug condition 2019-12-20 10:19:41 -06:00
Vertabreaker
e3b02757d3 Kossel Clear configuration (#16198) 2019-12-19 21:47:15 -06:00
Jeff Eberl
70325a6a0f Update test scripts to error on unknown (#16229) 2019-12-19 21:03:42 -06:00
Scott Lahteine
d81de7f521 Tweak sanity checks 2019-12-19 21:02:14 -06:00
Scott Lahteine
deff538909 Fix broken M100_dump_routine 2019-12-19 21:02:14 -06:00
Scott Lahteine
a9a78f2831 Followup for step timing (#16128) 2019-12-19 19:55:37 -06:00
Scott Lahteine
10f7bbee32 Use MYSERIAL0 (not SerialUSB) for Malyan LCD 2019-12-19 19:53:06 -06:00
Scott Lahteine
b49a0e39d5 HOME_USING_SPREADCYCLE is obsolete
Co-Authored-By: teemuatlut <teemu.mantykallio@live.fi>
2019-12-19 16:02:57 -06:00
Scott Lahteine
53f77dfadf Remove obsolete TMC2209 comment 2019-12-19 15:56:52 -06:00
Scott Lahteine
937dca4432 Followup to TMC2209 spreadcycle patch 2019-12-19 15:54:44 -06:00
BigTreeTech
bbe0ffb2fa BigTreeTech SKR v1.4 support (#16236) 2019-12-19 02:41:35 -06:00
Jason Smith
1bad8f1b17 Improve pulse timing and step reliability (#16128) 2019-12-19 02:38:48 -06:00
Mario Costa
5f06f42ccd Spindle/Laser pins for RADDS (#16119) 2019-12-19 02:37:07 -06:00
elementfoundry
e5edbf9d35 Allow TMC2209 to save/restore spreadCycle (#16153)
Co-Authored-By: teemuatlut <teemu.mantykallio@live.fi>
2019-12-19 02:23:54 -06:00
Scott Lahteine
865071a946 Tweak code formatting 2019-12-19 02:16:17 -06:00
salami738
329f5b4df9 Improve SKR mini E3 + Ender 3 settings (#16247) 2019-12-19 01:22:17 -06:00
Moshi Binyamini
dcdaa2025f Sanity-check Z_STEPPER_AUTO_ALIGN coordinates (#16231) 2019-12-19 00:59:01 -06:00
Scott Lahteine
0400783444 Tweak G34, fix a declaration 2019-12-19 00:42:39 -06:00
Scott Lahteine
768a1d2713 [cron] Bump distribution date 2019-12-19 00:39:55 -06:00
Scott Lahteine
711fb26ae5 Move AutoBuildMarlin to its own repo 2019-12-17 19:35:38 -06:00
Scott Lahteine
7f15968ce7 Add dev-2.1.x to 'mfinfo' script 2019-12-16 03:33:22 -06:00
Scott Lahteine
262ff9584c [cron] Bump distribution date 2019-12-16 00:00:04 -06:00
Scott Lahteine
af4c62b422 Update product links 2019-12-15 20:58:31 -06:00
Scott Lahteine
4a6f625f86 Tweak E180 config 2019-12-15 20:56:10 -06:00
Vertabreaker
e0c71344ed Define more FAN pins for GT2560 (#16235) 2019-12-15 20:28:55 -06:00
chzj333
42a336f8bc Update BTT002 platform (fixing SD init) (#16217) 2019-12-15 12:24:54 -06:00
Tanguy Pruvot
a0badf572e STM32 Touch UI timings, Longer onboard pullups (#16219) 2019-12-15 12:03:39 -06:00
thisiskeithb
a358b72ec8 Add SKR Mini E3 + Zonestar LCD warning (#16214) 2019-12-15 12:02:20 -06:00
danym21
6e8dcba698 Fix G28 debug line, M569 calls (#16213) 2019-12-15 12:00:00 -06:00
Luc
9d6b2ebf50 Improve ESP32 HAL (EEPROM, watchdog) (#16228) 2019-12-15 11:39:39 -06:00
thisiskeithb
dc8d8cb39c Fix MKS SGen-L SD detect pin (#16224) 2019-12-15 11:25:07 -06:00
Luu Lac
509e1ab053 TOUCH_MI_DEPLOY_XPOS fallback to X_MIN_POS (#16226) 2019-12-15 11:21:39 -06:00
Luu Lac
e9dadacf7b Fix bad #ifdef (#16227) 2019-12-15 11:16:36 -06:00
Scott Lahteine
6a514a1e8e Move status screen defines 2019-12-12 22:20:03 -06:00
Scott Lahteine
1ea78cdd69 Improve A20M config 2019-12-12 22:18:04 -06:00
Scott Lahteine
303ddb862a Tweak some config names 2019-12-12 22:18:04 -06:00
Scott Lahteine
f3d64b7115 Cardreader read/write open methods 2019-12-12 18:46:49 -06:00
Bo Herrmannsen
98382fcea5 Include Z in SCARA steps feedrate (#16193) 2019-12-12 17:13:49 -06:00
iain MacDonnell
629c039eed Update M503 MBL G29 report (#16199) 2019-12-12 16:54:54 -06:00
randellhodges
2a7f1091ce Fix compile error (macro substitution typo) (#16194) 2019-12-12 16:51:35 -06:00
Anders Sahlman
3d4aa015a8 Add MKS Robin Mini EEPROM defines (#16203) 2019-12-12 16:35:46 -06:00
Anders Sahlman
6b53431116 Flsun QQ-S example config (#16204) 2019-12-12 16:19:28 -06:00
Scott Lahteine
e45c4d6aa3 Fix RAMBo CNC test 2019-12-12 16:12:17 -06:00
InsanityAutomation
7b512742f4 Tweak ExtUI Probeless Babystepping (#16177) 2019-12-12 15:51:56 -06:00
ManuelMcLure
b065a60dd0 Onboard (always-on) pullups support (#16144) 2019-12-12 15:49:14 -06:00
Jeff Eberl
ae3504594c Add a CI test for RAMBo + CNC (#16126) 2019-12-11 02:28:16 -06:00
thisiskeithb
edc671edea Disable SD_CHECK_AND_RETRY in BTT E3 configs (#16143) 2019-12-11 02:22:35 -06:00
Tobias Schürg
50688f03fb Invert E dir of Geeetech A10 (#16149) 2019-12-11 02:19:59 -06:00
thisiskeithb
98814e1c47 MKS 12864 OLED pins for SGEN-L (#16188) 2019-12-11 02:18:21 -06:00
Tanguy Pruvot
23d1801022 Update BTT comments for USB/SD Composite (#16130) 2019-12-11 01:47:21 -06:00
André Kjellstrup
c2342c3528 Use error message !! hints (#16145) 2019-12-11 01:46:11 -06:00
MangaValk
96cf556139 Fix multiple servos with STM32 (#16151) 2019-12-11 01:44:05 -06:00
MS1987
31fdaea269 Add MKS Robin Pro, MKS Robin Lite3 (#16163) 2019-12-11 00:23:47 -06:00
Scott Lahteine
1c48817a47 [cron] Bump distribution date 2019-12-11 00:00:04 -06:00
Scott Lahteine
0d52eaa875 Superscript 3 for mm3 2019-12-10 23:45:39 -06:00
Tanguy Pruvot
5ebef425ce Update french (objects, retract...) 2019-12-10 23:45:39 -06:00
Giuliano Zaro
5dfa152ba2 Update Italian language (#16147) 2019-12-10 23:38:14 -06:00
dagorel
1c4f672eae Formalize DAC percent strings (#16176) 2019-12-10 23:37:25 -06:00
Anders Sahlman
1bcd47e65f Correct MKS Robin Mini pins (#16178) 2019-12-10 23:32:11 -06:00
Antti Andreimann
1465fc0632 Fix controller and SD on Robin Nano (#16187) 2019-12-10 23:29:33 -06:00
Scott Lahteine
07a61057ba [cron] Bump distribution date 2019-12-10 00:11:19 -06:00
Alain Martel
39fcb5b5f8 Update 3DFabXYZ settings (#16139) 2019-12-07 18:10:28 -06:00
Scott Lahteine
bb5717c5b3 [cron] Bump distribution date 2019-12-07 00:00:05 -06:00
Luu Lac
f3155af444 Update AZSMZ LCD link (#16106) 2019-12-06 01:35:06 -06:00
Tanguy Pruvot
ab61c09bff Improve touch buttons behavior (#16109) 2019-12-06 00:47:50 -06:00
thisiskeithb
a087a653cd Wanhao D6 uses TINYBOY2 (#16117) 2019-12-05 20:52:20 -06:00
Antti Andreimann
b65ab21733 Fix compile error with disabled PIDTEMP (#16108) 2019-12-05 20:51:41 -06:00
Jason Smith
37df0c1f22 Disable PRINTCOUNTER in SKR Mini E3 examples (#16110) 2019-12-05 20:49:06 -06:00
randellhodges
7f8ca85e69 STM32F1 Flash-based EEPROM fixes (#16118) 2019-12-05 20:48:11 -06:00
Scott Lahteine
f64649933f [cron] Bump distribution date 2019-12-04 01:57:33 -06:00
ManuelMcLure
68da497f35 Remove debug_out.h '#pragma once' (again) (#16098) 2019-12-04 01:29:02 -06:00
thisiskeithb
afd865d8dd Melzi has a 1284 (#16090) 2019-12-04 01:26:27 -06:00
Vertabreaker
0832a60db3 EXP3D Imprimante Multifonction (#16079) 2019-12-03 06:52:38 -06:00
ellensp
cb4cd76086 Fix TMC_SW_MOSI for BTT_SKR_MINI_V1.1 (#16081) 2019-12-03 06:44:36 -06:00
Scott Lahteine
54f75ebbfe Rename platform, part 2 2019-12-03 06:42:49 -06:00
Scott Lahteine
454984376c Rename platform, part 1 2019-12-03 06:42:35 -06:00
Vertabreaker
0369929ffc Geeetech A10D & PI3A PRO configs (#16074) 2019-12-03 03:22:55 -06:00
Scott Lahteine
6134bff81b Expand environments in platformio.ini 2019-12-02 21:19:23 -06:00
Scott Lahteine
b2c670fd94 [cron] Bump distribution date 2019-12-02 00:00:04 -06:00
Vertabreaker
530e92e653 Geeetech: Add E180, clean up A30 (#16072) 2019-12-01 22:41:28 -06:00
Scott Lahteine
cb7817093f More serial macro cleanup 2019-12-01 22:23:36 -06:00
Scott Lahteine
9114a14eca Fix commas in EEPROM code 2019-12-01 21:59:58 -06:00
Vertabreaker
3874f4a097 Geeetech A30 / GTM32 support (#16071) 2019-12-01 21:25:45 -06:00
Luu Lac
01e4b0c067 Add Laser / Spindle bitmap for LCD (#16068) 2019-12-01 21:20:15 -06:00
Scott Lahteine
bdd0517a5b Tweak test labels 2019-12-01 21:12:38 -06:00
Scott Lahteine
3dc49fd1c6 Split up hotend / bed drawing 2019-12-01 20:52:59 -06:00
Chris Pepper
849ac80e90 Fix megaatmega2560 test (#16069) 2019-12-02 02:08:25 +00:00
InsanityAutomation
7126a5e5a7 Add Host Prompt Notification Method (#15942) 2019-12-01 17:39:28 -06:00
ManuelMcLure
c061656659 Use PSU powerup delay for all powerups (#16065) 2019-12-01 17:36:49 -06:00
Scott Lahteine
25a7ceabdb Fix missing step_current_down semicolons 2019-12-01 17:30:22 -06:00
Scott Lahteine
9b6d2da9bf Fix debug out macros 2019-12-01 17:28:18 -06:00
Felicia Hummel
709d037b8e Fysetc S6 PWM pins descriptions, fix servo timer (#16057) 2019-12-01 13:48:55 -06:00
Scott Lahteine
102c9595f2 Restore STM32F103RE environment 2019-12-01 13:42:00 -06:00
Scott Lahteine
4718b8ad02 Add _P variants to debug_out 2019-12-01 13:32:32 -06:00
Gustavo Alvarez
efc3873149 Reorder F103RE environments (#16054) 2019-12-01 13:17:45 -06:00
Felicia Hummel
6c2438deae Fix PSU_POWERUP_DELAY compile error (#16064) 2019-12-01 12:55:28 -06:00
brian park
b258cc85bf Mostly Printed SCARA (MPSCARA) support (#15573) 2019-11-30 08:57:34 -06:00
hammerhead2k2
19f840a9b5 BTT SKR 1.3 pins for Anet Full Graphics LCD (#16047) 2019-11-30 08:21:54 -06:00
Scott Lahteine
83a4e8559c Followup to "optimize common strings" 2019-11-30 08:18:23 -06:00
InsanityAutomation
b24b0f385f Add ExtUI Flow Rate method (#16048) 2019-11-30 07:23:53 -06:00
Felicia Hummel
690ed531b6 Configurable PSU power-on delay (#16050) 2019-11-30 07:17:24 -06:00
Scott Lahteine
27943f9e31 Multiple axis TMC OTPW step down (#16044) 2019-11-30 06:59:44 -06:00
Scott Lahteine
1ee648ecd2 Followup to "optimize common strings" 2019-11-30 06:55:32 -06:00
InsanityAutomation
6b4166e67f Add Modix Big 60 configs (#16049) 2019-11-30 06:47:56 -06:00
Scott Lahteine
0138c0b55b [cron] Bump distribution date 2019-11-30 00:00:04 -06:00
Scott Lahteine
8431af2bff Add -fmerge-all-constants flag 2019-11-29 22:56:59 -06:00
Scott Lahteine
f83bc0aa13 Optimize common strings
Saves 128 bytes in testing with `mftest mega 1 -y`
2019-11-29 22:54:42 -06:00
Scott Lahteine
4d8e7cdb30 Update SKR mini configs 2019-11-29 20:07:17 -06:00
Scott Lahteine
2d74c2042a Clean up whitespace, GTM32 pins 2019-11-29 20:05:32 -06:00
Chris Pepper
e585c37d7d Fix #16038 2019-11-29 16:44:11 +00:00
Vertabreaker
1803f672f8 Pins for GTM32 board variants (#16020) 2019-11-29 07:12:49 -06:00
Vertabreaker
74e5199808 A20, A10T, A20T example configs (#16019) 2019-11-29 07:11:43 -06:00
BigTreeTech
441ee3e53f Add 'M114 E' to get E position (M114_DETAIL) (#16026) 2019-11-29 06:53:32 -06:00
Chris Pepper
a63491e6eb Sanity check ADC pins and FAST_PWM_FAN with Servos (#16038) 2019-11-29 06:52:28 -06:00
Björn Wedi
3a88cfd992 Simplify platformio.ini with 'extends' (#16035)
- Add [env] with default settings
- Use 'extends' to shrink similar env entries
2019-11-29 05:05:46 -06:00
Bob
0f2ee414db Update thermistornames.h (#16027) 2019-11-29 02:06:11 -06:00
Scott Lahteine
0f14e0e978 [cron] Bump distribution date 2019-11-29 00:00:06 -06:00
Bob
5a98c83eef Use MAX6675 SPI pins for MAX31865 over SPI pins (#16024) 2019-11-27 01:45:03 -06:00
Jason Smith
752a1e76ab Float ABL mesh boundaries, no probe position rounding (#16018) 2019-11-27 01:29:25 -06:00
Jason Smith
ce9a4afe95 Better ST7920 timings for FYSETC S6 (#16022) 2019-11-27 01:26:21 -06:00
thisiskeithb
e0df35e6b5 Enable Filament Change on BTT SKR E3 boards (#16023) 2019-11-27 01:21:59 -06:00
Scott Lahteine
289c5dcccb Fix boot screen sanity check 2019-11-27 01:10:23 -06:00
Scott Lahteine
98f83dc756 Add comments to G29 2019-11-27 01:05:22 -06:00
Dirk O. Kaar
0550f30790 Renkforce configuration updates (#16017) 2019-11-26 20:22:17 -06:00
Scott Lahteine
077eeaa0f4 Fix mixing extruder feedrate (#15905) 2019-11-26 18:03:59 -06:00
Vertabreaker
12417d087b E2 pins for GT 2560 v3 (#16016) 2019-11-26 17:43:27 -06:00
timeburn
a5a143f944 Include host_actions.h in G34 (#16014) 2019-11-26 16:38:41 -06:00
George Fu
cf1e19d167 Fysetc S6 support (#15850) 2019-11-26 16:15:03 -06:00
Dirk O. Kaar
1cea1687f3 Renkforce RF100 (V1), V2, XL, and XL Plus (#15695) 2019-11-26 14:06:23 -06:00
thisiskeithb
f786cc5145 Revert default BTT STM32F103 environment (#16006) 2019-11-26 04:28:13 -06:00
madmattco
049e8d5963 Add VAKE / VAKE403D support (#15631) 2019-11-26 04:00:59 -06:00
Heilig Benedek
993802c404 Fix Ender 2 display SCK, BTN_ENC pins (#15997) 2019-11-26 03:48:21 -06:00
haschtl
ff6518c0a8 Add PID_FAN_SCALING option (#15585) 2019-11-26 03:34:43 -06:00
lukasmatena
8ccfdaca02 Add M220 B/R with PRUSA_MMU2 (#15739) 2019-11-26 03:34:18 -06:00
Bob
e7519c50b6 Include MAX31865 library (#15969) 2019-11-26 03:23:51 -06:00
Chris Pepper
c1aac3a0c9 Fix delta_mm.e with zero extruders (#15996) 2019-11-26 02:58:17 -06:00
Marcio T
43d0391d82 Fix Touch UI message strings (#16004) 2019-11-26 02:56:25 -06:00
Robby Candra
fc9f8d27eb Fix Progress / Remaining display on DOGM (#16005) 2019-11-26 02:55:22 -06:00
Jason Smith
d0282e5ba8 Allow slop in position_is_reachable for delta (#16003) 2019-11-26 02:53:28 -06:00
Scott Lahteine
1d150e41b6 Reduce MMU2 code, add test 2019-11-26 02:15:31 -06:00
Robby Candra
55595d444d Use LCD_WIDTH for indexed string (#15979) 2019-11-24 19:06:23 -06:00
InsanityAutomation
2142beb2e5 Fix UI compile error in UBL (#15981) 2019-11-24 17:04:19 -06:00
Jason Smith
c497a491f4 Fix a PID_EXTRUSION_SCALING menu item (#15988) 2019-11-24 17:01:14 -06:00
Scott Lahteine
b11551c767 Touch UI updates for Cocoa Press (#15986) 2019-11-24 06:08:05 -06:00
Scott Lahteine
441e822fb3 LULZBOT_TOUCH_UI => TOUCH_UI_FTDI_EVE 2019-11-23 17:04:17 -06:00
Scott Lahteine
47c19aa2b3 Clean up probe accessors 2019-11-23 17:02:04 -06:00
pfillion42
4a5dee6356 (SKR 1.3) Assign DIAG pins for homing dir (#15972) 2019-11-23 16:20:13 -06:00
Denis Semenov
0fcd1f4a49 Fix HAS_CLASSIC_E_JERK and related issues (#15968) 2019-11-23 15:56:07 -06:00
Chris Pepper
48e264e4e1 Update platformio.ini (env:LPC176x) (#15971) 2019-11-23 18:43:12 +00:00
Scott Lahteine
8f09d2e790 Add STM32F103RE_bigtree to Auto Build 2019-11-22 16:47:31 -06:00
Gustavo Alvarez
b2a275891c Support RET6 in BTT SKR Mini (#15957) 2019-11-21 05:09:01 -06:00
Scott Lahteine
bdd366b97c Update sensor -5 label 2019-11-21 04:57:57 -06:00
Scott Lahteine
20964ca7dc Bring configs up to date 2019-11-21 04:48:18 -06:00
Jason Smith
b904ba0f29 Improve Delta probing / calibration (#15887) 2019-11-21 03:26:00 -06:00
Jason Smith
4ede13e36a Fix G29 for updated meshCount type (#15960) 2019-11-21 03:19:56 -06:00
Bob
751cd1f533 MAX31865 temperature sensor (#15930) 2019-11-21 03:15:10 -06:00
Scott Lahteine
4cffee3ca3 Drop obsolete setting 2019-11-20 23:57:13 -06:00
Scott Lahteine
47e4e5f1db Update thermocouple comments 2019-11-20 23:51:51 -06:00
Roman Moravčík
5681017d0c Update Slovak language (#15953) 2019-11-20 17:41:14 -06:00
BigTreeTech
ab8b24fdba Power Loss Recovery with a UPS (#15943) 2019-11-20 17:40:21 -06:00
Scott Lahteine
ab9f0f2c4f Followup to meshCount patch 2019-11-20 04:57:04 -06:00
InsanityAutomation
e81b946f06 Better singlenozzle stored fan speed menus (#15921) 2019-11-20 00:14:56 -06:00
thisiskeithb
967f951789 SKR Mini E3 1.0/1.2 configs (#15941) 2019-11-20 00:12:57 -06:00
Daniel Negut
a3229b30ec Add Zonestar/Anet LCD for SKR mini E3 (#15931) 2019-11-20 00:06:26 -06:00
InsanityAutomation
798f34abcd Float XY probe offset followup (probe edge) (#15928) 2019-11-19 23:29:52 -06:00
Giuliano Zaro
31e329f143 Update Italian language (#15925) 2019-11-19 23:27:53 -06:00
Jason Smith
9906e96ffb Allow UBL G29 J1 with PAUSE_BEFORE_DEPLOY_STOW (#15934) 2019-11-19 23:26:38 -06:00
Evgeny-SPB
7116a8645c G34 logic / typo fix (#15938) 2019-11-19 23:25:07 -06:00
Jason Smith
2dab109baa Update Anycubic Kossel config (#15935) 2019-11-19 23:23:25 -06:00
Giuliano Zaro
aa89bb71f9 Fix MMU2 compile error (#15923) 2019-11-19 23:22:02 -06:00
TheAssassin
814d908a8a Ender-2 LCD on BTT SKR E3 (#15924) 2019-11-19 23:21:27 -06:00
InsanityAutomation
4d4e692c81 Match onMeshUpdate() index sign (#15920) 2019-11-19 23:16:43 -06:00
Luu Lac
4d9a5fef3b Update Vietnamese language (#15940) 2019-11-19 21:08:47 -06:00
swilkens
e9bd6ef9fe TMCStepper 0.6.x is now Marlin-compatible (#15950) 2019-11-19 21:06:11 -06:00
Scott Lahteine
865055e07a [cron] Bump distribution date 2019-11-18 00:00:08 -06:00
Scott Lahteine
2bd6dc02d6 [cron] Bump distribution date 2019-11-17 00:00:06 -06:00
Robby Candra
40bbe58371 Use lcd_uint_t in lcd_put_u8str_ind_P (#15909) 2019-11-16 16:37:21 -06:00
Scott Lahteine
d33ca3d058 Only TMCStepper 0.5.x is certified 2019-11-15 17:53:48 -06:00
Roxy-3D
f19fa64e98 Eliminate multiple settings to extruder_duplication_enabled in G28
If the IDEX mode was previously set (via GCode or the LCD Panel) to a duplication mode...   It was lost after a G28 due to this redundant setting of 'extruder_duplication_enabled'. 

It is very important to the various use cases of IDEX machines that extruder_duplication_enabled is preserved across a G28.   The reason is this allows a person to use the LCD Panel to put the machine into a duplication mode, and then send a 'normal' part file to the printer and get two parts out of the process.
2019-11-15 15:42:01 -06:00
thisiskeithb
0f57818f2d Support 512K "RCT6" in BTT SKR Mini (#15890) 2019-11-15 02:51:26 -06:00
Scott Lahteine
aa93e1f21a Update TMC_ADV examples 2019-11-15 02:15:10 -06:00
Scott Lahteine
27cb4db80e Reduced string storage using tokens (#15593) 2019-11-14 20:30:30 -06:00
Lino Barreca
d1d143781e SKR-PRO: Fix FAN0 PWM speed with Heater2 (#15889) 2019-11-14 05:23:24 -06:00
Lino Barreca
bd321d4b7c Don't compile STM32 SoftwareSerial unless STM32 (#15894) 2019-11-14 05:21:23 -06:00
Scott Lahteine
ac2d7ab14c Fix timers.h include 2019-11-14 04:47:53 -06:00
Tanguy Pruvot
94e18ce324 STM32F1: Remove extra py imports (#15898) 2019-11-14 04:24:55 -06:00
Scott Lahteine
a022defe06 [cron] Bump distribution date 2019-11-14 00:00:12 -06:00
Scott Lahteine
227951a4ec Tweak platformio.ini alignment 2019-11-13 04:29:23 -06:00
Scott Lahteine
3f4636e916 "nozzle_to_probe_offset" is obsolete 2019-11-13 03:07:54 -06:00
Scott Lahteine
602ca5dea6 No USE_M73_REMAINING_TIME without LCD_SET_PROGRESS_MANUALLY 2019-11-13 02:07:17 -06:00
Robby Candra
fcfde7c2f5 Only assign CS/RX/TX on extra axes with SPI/UART (#15886) 2019-11-13 02:03:34 -06:00
Scott Lahteine
a4709ba765 Store unscaled PID values in EEPROM (#15884) 2019-11-13 01:47:46 -06:00
Scott Lahteine
7e9c846ec3 Modify comment for unlimited E steppers 2019-11-13 01:45:50 -06:00
Jason Smith
9fd35c84ce SoftwareSerialM for SKR STM32F1 boards (#15875) 2019-11-12 22:16:54 -06:00
Chris Pepper
8e7d1004cf Update LPC176x platform version 2019-11-13 03:59:10 +00:00
Jamie
32028902c3 Use max feedrate for joystick motion (#15870) 2019-11-12 21:01:04 -06:00
Giuliano Zaro
bb93ea1be4 [SAMD51] Activate ADCs oversampled 12bits (#15874) 2019-11-12 20:59:17 -06:00
Roman Moravčík
e110f5abce M73 R : Set Remaining Time (#15549) 2019-11-12 19:36:54 -06:00
Lino Barreca
ac71cdc265 New HardwareTimer for STM32 5.7.0 (#15655) 2019-11-12 19:23:02 -06:00
Chris Pepper
4762dfe797 Fix lpc u8g i2c (#15876) 2019-11-12 01:59:36 +00:00
Chris Pepper
af61f37b65 Update lpc176x requirements (#15869) 2019-11-11 03:25:56 +00:00
ManuelMcLure
b9703fdf36 Ensure TMC + LIN_ADVANCE pulse length (#15807) 2019-11-10 19:04:28 -06:00
Scott Lahteine
5e5045c4ee Touch UI finishing touches 2019-11-10 18:52:53 -06:00
Marcio Teixeira
5639b8ca20 Touch UI fixes for Cocoa Press (#15847) 2019-11-10 18:49:41 -06:00
danym21
28e1614c2e Add Sensorless Homing current (#15690) 2019-11-10 18:45:06 -06:00
Chris Pepper
86d0bc1af5 Update lpc176x framework version requirement (#15868) 2019-11-10 23:30:28 +00:00
LinFor
48b7a1e66e Allow non-zero "fan off" PWM value (#15709) 2019-11-10 16:33:56 -06:00
Jason Smith
770adcfa15 Raise Z before homing X/Y on unknown Z (#15859) 2019-11-10 16:21:20 -06:00
Scott Lahteine
624336f453 Fix up Megatronics 3.2 test 2019-11-10 16:19:57 -06:00
ellensp
7b29c60c46 Fix compile with chamber enabled (#15862) 2019-11-10 16:15:08 -06:00
Scott Lahteine
534f2d69c1 [cron] Bump distribution date 2019-11-10 00:00:04 -06:00
Jademalo
37874a6472 Fix E0_SERIAL_RX_PIN typo (#15841) 2019-11-09 22:51:20 -06:00
Marcelo Cerri
b9d351899a Update SKR mini E3 1.2 Filament Runout pin (#15843) 2019-11-09 22:49:33 -06:00
Scott Lahteine
7010f92c4b Board-based LCD delays 2019-11-09 22:33:38 -06:00
Scott Lahteine
6e0bcb80a2 Tweak mega tests 2019-11-09 22:33:38 -06:00
Ivan Kravets
4ff708cb3a STM32 PIO: Override default LD Script using LINKFLAGS build scope (#15853) 2019-11-09 21:34:12 -06:00
Scott Lahteine
9ca25118d0 Whitespace cleanup 2019-11-09 21:17:52 -06:00
Jason Smith
b3f81eead5 Fix/improve TURBO_BACK_MENU_ITEM (#15856) 2019-11-09 19:27:30 -06:00
Scott Lahteine
776632c503 Add and apply REPEAT macro (#15829) 2019-11-09 17:59:04 -06:00
Scott Lahteine
8061836e74 Fix Lulzbot tag 30: "Heaters Off" 2019-11-08 03:57:34 -06:00
Scott Lahteine
249f600ceb [cron] Bump distribution date 2019-11-08 00:00:03 -06:00
Marvin Sinister
8d157a4520 Fix MKS MINI12864 on SKR 1.3 (#15836) 2019-11-07 19:39:08 -06:00
Luu Lac
ed6bbe012b Fix incomplete 'Homing XYZ' screen draw (#15830) 2019-11-07 19:14:02 -06:00
AnHardt
4db68d704f Update Display Throttling (#15837) 2019-11-07 19:04:19 -06:00
Scott Lahteine
bb5b1e19b0 Function-style stepper macros 2019-11-07 17:14:36 -06:00
thisiskeithb
47805e18f8 Makefile catch-up (#15823) 2019-11-07 02:14:40 -06:00
Scott Lahteine
0be9fdb455 Move single-use to lambdas 2019-11-07 00:28:33 -06:00
Scott Lahteine
84ce3a6bea LCD corner screen handler lambda 2019-11-07 00:24:16 -06:00
Scott Lahteine
711703dcd1 [cron] Bump distribution date 2019-11-07 00:00:06 -06:00
LinFor
a84e3d1b80 Use native ADC resolution where possible (#15719) 2019-11-06 17:49:17 -06:00
Miroslav Šustek
9201197878 Fix SKR E3 board BLTOUCH + SPEAKER timer conflict (#15781) 2019-11-06 17:34:29 -06:00
Jason Smith
814a2eaf8f Allow TMC baud rate override (#15773) 2019-11-06 17:08:12 -06:00
teemuatlut
d9b0b964be Fix TMC2208 HW Serial constructor (#15782) 2019-11-06 16:57:48 -06:00
Tanguy Pruvot
d13573c9cd STM32F1: restore latest ststm32 version (#15776) 2019-11-06 16:56:35 -06:00
Axel
786617e375 Fix RAMPS + VIKI i2c (#15811) 2019-11-06 16:52:28 -06:00
Scott Lahteine
e6dfc991ae Patch tabs, heater led tests 2019-11-06 16:28:36 -06:00
Scott Lahteine
a89f4703df Tweak permissions 2019-11-06 16:10:14 -06:00
Roman Moravčík
41b5d720e2 Fix filament Change heading on LCD (#15783) 2019-11-06 15:58:06 -06:00
Luu Lac
4ee3502c8f Fix "confused intellisense" (#15817) 2019-11-06 15:54:09 -06:00
Scott Lahteine
f5b5b9e8ec Bring filament menu up to speed 2019-11-05 17:16:12 -06:00
ellensp
f088c6a850 Add MKS_GEN_L_V2 controller support (#15793) 2019-11-04 16:31:27 -06:00
aleknest
cf87d3c700 More compatible uint8_t for Experimental i2c Bus buffer (#15788) 2019-11-04 16:28:16 -06:00
Scott Lahteine
e9805a0bcb Go to previous menu on object cancel 2019-11-04 16:13:10 -06:00
Scott Lahteine
51fd226a4d Unconfuse intellisense 2019-11-04 15:40:56 -06:00
Scott Lahteine
d80ef43c19 Followup to es int patch 2019-11-04 15:40:45 -06:00
Giuliano Zaro
35cd545106 Use prior endstop pin-to-interrupt macros (#15771) 2019-11-04 15:24:41 -06:00
Jason Smith
1fe0646d25 Use modified SoftwareSerialM which works with SKR Pro (#15796) 2019-11-04 15:17:42 -06:00
Scott Lahteine
328ddda654 Clean up whitespace 2019-11-04 13:23:26 -06:00
Scott Lahteine
55991962be Patch extra axis MS pins for debugging 2019-11-04 12:28:10 -06:00
Chris Pepper
b9116d4050 LPC176x Framework update (#15722)
Changes required for compatibility with framework-arduino-lpc176x 0.2.0
2019-11-03 02:34:09 +00:00
Scott Lahteine
15f94e5ee5 Add NUL_STR global 2019-11-02 07:31:07 -05:00
Scott Lahteine
ea3217cd46 Move 'draw' methods into Menu Item classes (#15760) 2019-11-02 07:28:20 -05:00
ManuelMcLure
76b861d759 Fix kill screen with null string (#15747) 2019-11-02 07:13:42 -05:00
Robby Candra
7360e9343a Minor DOGM status screen fix (#15746) 2019-11-02 07:04:31 -05:00
Robby Candra
bdb452ed81 Fix missing % on DOGM Status Screen (#15748) 2019-11-02 07:01:50 -05:00
Giuliano Zaro
65ef774e8d Fix mega Port J endstop interrupts (#15758) 2019-11-02 06:59:38 -05:00
Scott Lahteine
a920b10483 Fix true/false redefined warnings 2019-11-02 06:04:28 -05:00
Scott Lahteine
ed8f1ca9cf Revert Cortex delay for now 2019-11-02 04:12:18 -05:00
Scott Lahteine
ca6d00b862 Save some string flash 2019-11-02 00:48:05 -05:00
Scott Lahteine
23d21dd81c Tweak lambdas 2019-11-02 00:05:23 -05:00
Scott Lahteine
a7d7f36871 [cron] Bump distribution date 2019-11-02 00:00:05 -05:00
Scott Lahteine
a5df89eef7 Add HAL_IWDG_MODULE_ENABLED to generic F4/F7 2019-11-01 22:08:33 -05:00
Scott Lahteine
93db4f4535 Tweak backtrace.cpp include 2019-11-01 22:08:33 -05:00
Scott Lahteine
f0d952d33a Cortex M3-M7 can use DWT->CYCCNT (#15762)
Suggested by Alex Kenis at https://youtu.be/ZfyPcdhQnAA?t=502
2019-11-01 22:07:51 -05:00
Scott Lahteine
ad28da7eb4 Patch ABL G29 loop
Followup to e3ddf6e81a
2019-11-01 15:39:05 -05:00
Scott Lahteine
288af0ddf6 Whitespace 2019-11-01 15:39:05 -05:00
Scott Lahteine
e7d9db284e Followup to M240 patch 2019-10-31 17:27:19 -05:00
Raúl Lázaro Sánchez
7c60853219 Fix blocking delay in Photo G-code M240 (#15728) 2019-10-31 17:14:11 -05:00
The-Force
c6f694a247 Power Loss Recovery for volumetric extrusion (#15734) 2019-10-31 14:09:37 -05:00
Scott Lahteine
4e6e02bc3e Include pause.h for M701-702 2019-10-31 13:18:50 -05:00
Scott Lahteine
e3ddf6e81a Fix meshCount signed-ness 2019-10-31 13:18:50 -05:00
Scott Lahteine
899e0fcdbb [cron] Bump distribution date 2019-10-31 00:00:07 -05:00
Scott Lahteine
35b1149d96 Patch es int tests for Arduino 1.8.10 2019-10-30 15:52:02 -05:00
Scott Lahteine
c80eda073f M119 => report_states 2019-10-30 15:24:10 -05:00
LinFor
7d24f152d8 Fix a typo breaking the build (#15726) 2019-10-30 15:10:08 -05:00
Scott Lahteine
61225e685d Abort SD followup 2019-10-29 17:04:49 -05:00
Scott Lahteine
d5c1c72a76 Tweak CW/CCW bitmaps 2019-10-29 16:53:07 -05:00
Scott Lahteine
aaf018e5a0 Language changes 2019-10-29 16:20:35 -05:00
Scott Lahteine
583fc4ee2a Move abortSDPrinting with others 2019-10-29 16:00:28 -05:00
Scott Lahteine
55c3929359 Group AVRx4 boards together 2019-10-29 15:59:25 -05:00
Scott Lahteine
c5713b5e98 Clean Endstops::event_handler 2019-10-29 15:58:26 -05:00
Scott Lahteine
be498d6280 [cron] Bump distribution date 2019-10-29 00:00:05 -05:00
Aurawin
b09b469dd5 Add BIQU TANGO V1 support (#15682) 2019-10-28 18:21:59 -05:00
studiodyne
319e2b5760 Fan menus fix. FR cosmetic change. (#15714) 2019-10-28 16:49:31 -05:00
studiodyne
f139642e0f XY/Z Babystep Multiplicators (#15691) 2019-10-28 16:44:17 -05:00
thisiskeithb
abb44cf564 No boot-screen on Sidewinder X1 TFT28 (#15706) 2019-10-28 16:33:44 -05:00
Scott Lahteine
ade76e53de Fix A10M/A20M mixer display
Co-Authored-By: 3Dangel <3dangel@users.noreply.github.com>
2019-10-28 16:26:54 -05:00
InsanityAutomation
cc4d3a215e Fix ExtUI UBL method calls (#15704) 2019-10-28 15:50:27 -05:00
InsanityAutomation
d4f5821cd6 Fix 3-point sanity check (#15696) 2019-10-28 15:46:59 -05:00
Scott Lahteine
9aff30da0c Confirm object cancellation (#15660) 2019-10-27 19:50:21 -05:00
Scott Lahteine
78899fc241 Followup to E Total 2019-10-27 18:40:33 -05:00
Scott Lahteine
7a342ecb93 Show Total E during print (#15703) 2019-10-27 17:49:27 -05:00
Scott Lahteine
0f8c3ed29a Prevent extra "too long/cold" errors 2019-10-27 17:40:07 -05:00
Scott Lahteine
9720d21301 Clean up trailing whitespace 2019-10-27 15:32:29 -05:00
Scott Lahteine
c2cec563dc Followup to Cancel Objects 2019-10-27 15:26:24 -05:00
Scott Lahteine
9e8021d6a4 Fix pins debug of CS/MS pins 2019-10-26 18:46:39 -05:00
Scott Lahteine
e7b22a0ed4 Use 5.4.3 for STM32F407VE_black 2019-10-26 16:50:12 -05:00
Scott Lahteine
ab0fe1a7dd Tweak G29 faux point 2019-10-26 14:41:54 -05:00
Scott Lahteine
4fc000fe90 Disable broken platforms for now 2019-10-26 14:41:54 -05:00
Scott Lahteine
e0f68cda1e Use ststm32 5.6.0 for now 2019-10-26 14:41:54 -05:00
thisiskeithb
5d4e309dd3 CR-10/S/Mini & Ender-5 default TMC RMS currents (#15666) 2019-10-26 13:13:08 -05:00
Giuliano Zaro
6fd13879ae Update Italian language (#15676) 2019-10-26 12:54:59 -05:00
Scott Lahteine
600429a067 Cancel Objects followup 2019-10-25 20:08:45 -05:00
Roman Moravčík
e690471739 Print startup message after print statistics are loaded (#15664) 2019-10-25 19:46:56 -05:00
Scott Lahteine
732bf89878 Get 'cancelable' for gcode.cpp 2019-10-25 19:38:23 -05:00
Tanguy Pruvot
c58cc113dd MKS Robin: restore the TFT v2.0 support (ST7789V) (#15675) 2019-10-25 19:30:43 -05:00
Scott Lahteine
014b739bac Fix M486 int parameters 2019-10-25 19:19:33 -05:00
Scott Lahteine
f8ad15fde8 Rename BOARD_STM32F4 to fix use with MB() 2019-10-25 18:12:29 -05:00
J.C. Nelson
167ecd8620 Chitu board support (e.g., Tronxy X5s) (#15493) 2019-10-25 17:11:25 -05:00
Scott Lahteine
408751d5e0 Fix CANCEL_OBJECTS missing include 2019-10-25 15:45:55 -05:00
Evgeny Zyatkov
12a244f24f Fix #endif typo (#15661) 2019-10-25 12:27:23 -05:00
Scott Lahteine
f12285015a [cron] Bump distribution date 2019-10-25 12:18:21 -05:00
Scott Lahteine
93f0012959 Cancel Objects - As seen at ERRF2019 (#15590) 2019-10-24 15:35:40 -05:00
Marcio T
f6a799c7b3 Allow compile under Windows Subsystem for Linux (#15606) 2019-10-24 14:57:20 -05:00
InsanityAutomation
82fb046013 Allow suicide pin inverting (#15586) 2019-10-24 14:07:28 -05:00
Scott Lahteine
2a7e1d459f Option to rotate Percent, (E)lapsed, and (R)emaining time (#15578) 2019-10-24 14:00:59 -05:00
Scott Lahteine
464d98d178 Short time prefixes, no percent prefix 2019-10-24 14:00:32 -05:00
Scott Lahteine
ccf61eca84 Fix diplay elaspsed 2019-10-24 13:48:27 -05:00
Scott Lahteine
ff4301a422 Update status_screen_DOGM.cpp 2019-10-24 13:42:02 -05:00
Scott Lahteine
326d5b84e7 Update status_screen_DOGM.cpp 2019-10-24 13:39:32 -05:00
Scott Lahteine
5edd5d1e1f Clean up 2019-10-24 13:38:39 -05:00
Jacob Jordan
9895e6d766 Only use slow homing speed where applicable (#15640) 2019-10-24 13:14:45 -05:00
InsanityAutomation
b3d7d33faf Fix CUSTOM_VERSION_FILE has_include (#15635) 2019-10-24 13:07:29 -05:00
Robby Candra
cf8541a7a7 Fix G92.9 (thus PLR Z position) (#15625) 2019-10-24 13:05:50 -05:00
Scott Lahteine
cd3ec5a77b Add error-check to M422 2019-10-24 12:59:50 -05:00
Tanguy Pruvot
0737b1aecf env: SKRmini can't use STLink (#15645) 2019-10-24 12:30:10 -05:00
Timm
e02b06672c Increase MMU2 serial buffer size with USB serial (#15646) 2019-10-24 12:28:41 -05:00
Giuliano Zaro
0f5d457252 Allow redundant temp sensor with SINGLENOZZLE (#15650) 2019-10-24 12:23:06 -05:00
Daniel Callander
475041656c Reset position_shift on G28 (#15653) 2019-10-24 12:20:09 -05:00
Bo Herrmannsen
04a55c9188 Fix LPC176x build script for Python 3 (#15637)
Co-Authored-By: Sven Holzmann <powerprobot@users.noreply.github.com>
2019-10-24 12:16:02 -05:00
milkpirate
6bcd4eb12d Fix M420 (UBL) undefined variables (#15621) 2019-10-24 12:07:17 -05:00
Luu Lac
efeb6efe77 Set pullup on BTN_BACK pin (#15654) 2019-10-24 12:04:45 -05:00
Evgeny-SPB
b7db91c46d Fix apply_rotation function (#15636) 2019-10-24 12:02:27 -05:00
Luu Lac
0b0b822671 Add note: TMC2209 requires stealthChop for Sensorless Homing (#15658) 2019-10-24 11:58:37 -05:00
Scott Lahteine
77f500b857 Fix LPC1769 test 2019-10-24 11:55:48 -05:00
Roxy-3D
3642a12fc1 fix parameter order of mark, marked and unmark
The parameter order was wrong on mark(), marked() and unmark().    

This was breaking the G26 Mesh Validation algorithm.
2019-10-23 11:34:24 -05:00
Scott Lahteine
af214ff121 Fix up PSU_CONTROL checks 2019-10-22 16:16:12 -05:00
Scott Lahteine
62b875f918 Fix PLR condition saving retract 2019-10-22 16:16:12 -05:00
Robby Candra
2c42526763 FIx Estimation String Pos 2019-10-22 10:02:27 +07:00
Robby Candra
d64ab63026 Fix Estimation String Macro 2019-10-22 08:16:29 +07:00
Scott Lahteine
f00b48f9a8 Expand encoder value range 2019-10-21 18:56:24 -05:00
Scott Lahteine
160c8be191 Fix BABYSTEP_DISPLAY_TOTAL output 2019-10-21 13:53:19 -05:00
Scott Lahteine
7aaa8bc8bd Bring WDi3 example up to date 2019-10-21 13:33:40 -05:00
Robby Candra
52a8bbefcf Make sure estimate time = 0 not displayed 2019-10-20 23:44:05 +07:00
Robby Candra
6241bcf0c8 Fix Progress at the end of print. 2019-10-20 06:06:48 +07:00
Evgeny Zyatkov
9470554f63 Fix DUE HAL serial defines (#15594) 2019-10-19 12:30:38 -05:00
Robby Candra
f368c14a61 Fix Probe Manually Grid (#15598) 2019-10-19 12:29:50 -05:00
Scott Lahteine
f2ce4a25a3 Fix host_response_handler debug 2019-10-18 16:47:13 -05:00
Chris Pepper
11f1392026 Fix Python3 (Windows) compatibility (#15597) 2019-10-18 21:15:26 +01:00
Scott Lahteine
725ec68faa [cron] Bump distribution date 2019-10-18 00:00:04 -05:00
Robby Candra
16ae9ee88b Update Configuration_adv 2019-10-17 05:37:22 +07:00
Robby Candra
9b88c3e79b DOGM Progress Display, option to disable display rotation 2019-10-17 05:26:09 +07:00
Scott Lahteine
0652f19673 Fix M420 for moved probe methods 2019-10-16 15:56:34 -05:00
Scott Lahteine
bb381e22b2 Fix left-shift warning 2019-10-16 15:42:46 -05:00
Bo Herrmannsen
0d7736d663 Enable M191 (#15531) 2019-10-16 15:02:37 -05:00
Antti Andreimann
40de135d4d Fix CUSTOM_USER_MENU_TITLE non-translated string (#15575) 2019-10-16 13:53:12 -05:00
Francois Rainville
dd0c5de4c7 Provide LONG_FILENAME_LENGTH for headers (#15582) 2019-10-16 13:51:18 -05:00
Jason Smith
832cb7e1ac Z_STEPPER_AUTO_ALIGN — To align with Z stepper points (#15195) 2019-10-16 13:39:58 -05:00
Robby Candra
7af99d03d3 Don't show prefix if no elapsed time 2019-10-16 16:25:52 +07:00
Robby Candra
bf850827f7 Fix Progress Display 2019-10-16 16:18:20 +07:00
Scott Lahteine
e0e406dbcc [cron] Bump distribution date 2019-10-16 00:00:03 -05:00
InsanityAutomation
b2eda1af2f Fix typo in G34 configuration (#15572) 2019-10-15 17:22:13 -05:00
Scott Lahteine
0ff57c640c Fix compile warning 2019-10-15 17:13:07 -05:00
Scott Lahteine
3949d246df Fix ESP32 name conflict 2019-10-15 17:13:07 -05:00
Scott Lahteine
b7b303f4bf Spindle/Laser power in planner blocks (#14437) 2019-10-15 16:10:20 -05:00
Jason Smith
53abfdc2c3 Fix BLTOUCH and FAN PWM conflicts on SKR E3 boards (#15547) 2019-10-15 14:18:46 -05:00
Slawomir Ciunczyk
8668571bee Update Polish language (#15569) 2019-10-15 13:36:17 -05:00
Scott Lahteine
faacfe13c2 Tweak M105 layout 2019-10-15 13:35:13 -05:00
Antti Andreimann
d47f29bd4c Give a dummy response to M105 with zero thermistors (#15568) 2019-10-15 13:30:52 -05:00
Piotr
fe4c69b64a Poll *all* enabled endstop pins (#15525) 2019-10-15 13:28:04 -05:00
Tanguy Pruvot
93097af0ed U20: update config, ts, serial, jerk, limited edit values... (#15524) 2019-10-15 12:35:53 -05:00
Slawomir Ciunczyk
99f983d066 Update Polish language (#15541) 2019-10-15 12:34:18 -05:00
InsanityAutomation
0074d63962 Vendor version override (#14189)
Co-Authored-By: InsanityAutomation <insanityautomation@users.noreply.github.com>
2019-10-15 12:32:44 -05:00
Scott Lahteine
7622973a31 Fix elapsed time overflow warning 2019-10-15 11:47:24 -05:00
Scott Lahteine
d57a668097 Update Spanish Translation (#15556) 2019-10-15 11:38:57 -05:00
Markus Towara
437978d349 Bring SPI_SENSORLESS code up to date (#15560) 2019-10-15 11:34:45 -05:00
Tanguy Pruvot
a988f9304d reduce the required size with uint16_t modifiers 2019-10-14 20:11:59 +02:00
Tanguy Pruvot
21867c7fef elapsed time overflow warning fix
tried to fix it with snprintf in libs/duration_t.h but its worst... :/
2019-10-14 20:00:59 +02:00
sL1pKn07
d37bd33c31 Update Spanish Translation 2019-10-14 16:02:54 +02:00
Roman Moravčík
b4f82d1081 Update Slovak language (#15527) 2019-10-13 17:35:38 -05:00
Tanguy Pruvot
f06602ff7e Fix MKS Robin python script (for Travis CI) (#15523) 2019-10-13 17:34:31 -05:00
Tanguy Pruvot
ee20f21a24 Fix undefined max in multi-language (#15521) 2019-10-13 18:31:28 -04:00
Giuliano Zaro
7714152013 Update Italian language (#15533) 2019-10-13 17:28:03 -05:00
Bo Herrmannsen
5ad9257df4 Fix DUE HAL serial defines (#15536) 2019-10-13 17:06:15 -05:00
Krystian Booker
62aa137548 Fixed pid_autotune_menu made pid_label accessible (#15551) 2019-10-13 16:46:06 -05:00
Roxy-3D
37550e9d98 Allow 3-digit LCD Display of value
The LCD Display shows 3 digits of precision, not 4.   
So change the bounding value to something more rational.
2019-10-13 14:34:51 -05:00
Roxy-3D
05eed72b69 Allow LCD Menu to adjust Junction Deviation lower
Allow LCD Menu to adjust Junction Deviation lower than .01.   Some machines currently have a JUNCTION_DEVIATION_MM value as low as .005 mm.     In the case of non-Linear-Advance machines...   The upper limit is raised to .5 mm.

Probably more thought needs to be given to the Linear Advance case.   It maybe it doesn't need a special case and should just use the same bounds as the non-Linear Advance case.
2019-10-12 17:36:43 -05:00
Gustavo Alvarez
df09532a9c Reassign FIL_RUNOUT_PIN for ReARM boards (#15519)
Reassign FIL_RUNOUT_PIN from P1_18 to P1_19

P1_18 is connected to a buffer in order to output 5V making it unsuitable for input.
2019-10-12 21:02:20 +01:00
Roxy-3D
59378db7de Eliminate clutter in Formbot T-Rex 3 Configuration.h file
The extra clutter was making the Junction Deviation patch script calculate the wrong value.
(The script wasn't smart enough to see the extra lines were commented out and used the wrong values in the calculation.)

All fixed now with a JUNCTION_DEVIATION_MM calculated at .017
2019-10-11 17:11:24 -05:00
Roxy-3D
c8e348731f Correct Junction Deviation value for Formbot Raptors
Re-apply the formula .4 * V^2 / Default_Acceleration to work correctly in Raptor configuration.h file.
(The problem is there are multiple XJerk and YJerk values declared based on the step sticks used on the printer.)
This change should provide correct values for all setups.
2019-10-11 16:52:47 -05:00
Roxy-3D
7a1fa2177c Eliminate multiple DEFAULT_ACCELERATION declarations.
Re-calculate and fix the Junction Deviation value using correct DEFAULT_ACCELERATION number.
2019-10-11 16:31:24 -05:00
Haxk20
1df90aaf0e Followup to num2str update (#15518) 2019-10-11 08:45:15 -05:00
Matthew Piercey
ac8083588b Add config for Wanhao Duplicator i3 v2.1 2019-10-11 00:59:58 -05:00
Robby Candra
e79666a82b Followup to "Fix G2/G3 rounding" (#15510) 2019-10-10 21:16:37 -05:00
LinFor
b20d5a7cc6 Estimate Remaining Time (graphical display) (#15497) 2019-10-10 21:03:33 -05:00
Scott Lahteine
5641adb01b Clean up stray tabs 2019-10-10 20:16:16 -05:00
Ed Williams
d8aeeb8ff6 Fix G2/G3 rounding error (#15507) 2019-10-10 19:50:08 -05:00
Roxy-3D
2cf35267c4 Set Junction Deviation value from Jerk and Default Acceleration (#15509)
Formula: `0.4 * sq(min(xjerk, yjerk)) / (default accel)`
2019-10-10 19:44:15 -05:00
Robby Candra
6f60838736 Fix PAUSE_MODE_CHANGE_FILAMENT menu item (#15501) 2019-10-10 19:39:32 -05:00
Robby Candra
ac466ecf74 Change Junction Deviation to Classic Jerk (#15505) 2019-10-10 19:31:59 -05:00
Scott Lahteine
3664beec29 Don't refresh on status line changes 2019-10-10 19:29:17 -05:00
Scott Lahteine
13cf417a98 [cron] Bump distribution date 2019-10-10 00:00:04 -05:00
Scott Lahteine
541a9f2b85 Defer test of Lulzbot UI for now 2019-10-09 23:39:22 -05:00
ANMay-ru
b119c14017 Clean up LCD print, align (#15498) 2019-10-09 20:41:44 -05:00
Jason Smith
46763efb75 Fix tool-change move with hotend offset (#15491) 2019-10-09 19:48:00 -05:00
Marcio Teixeira
6a865a6146 Multi-language support (#15453) 2019-10-09 19:46:10 -05:00
Marcio Teixeira
dc14d4a13c Improvements and fixes to Lulzbot UI (#15490) 2019-10-09 19:44:49 -05:00
Scott Lahteine
e6055dce76 Followup to position refactor 2019-10-08 22:08:05 -05:00
Scott Lahteine
b4d48fdc91 Followup to #15481 2019-10-08 21:38:02 -05:00
Scott Lahteine
af80653f3f Always report all PIDs in M503
Fix #14474
2019-10-08 21:07:19 -05:00
Scott Lahteine
a525cc06c1 Add ARC_SUPPORT to DUE tests 2019-10-08 20:46:01 -05:00
Scott Lahteine
914605c89c gcc is forgiving of stray ; 2019-10-08 20:36:39 -05:00
Scott Lahteine
89490171ef Use "concatenatable" language codes 2019-10-08 20:17:23 -05:00
Scott Lahteine
c0005e939c Enable junction deviation by default (#15481) 2019-10-08 19:42:18 -05:00
Scott Lahteine
1df6c7a46c Work around a compiler bug
See #15478
2019-10-08 19:27:03 -05:00
Scott Lahteine
5becda25c5 Followup to E renumbering 2019-10-08 17:37:17 -05:00
Scott Lahteine
cb1cb72c76 Fix Move Z menu item 2019-10-08 17:24:40 -05:00
Luu Lac
e34aa1ff8f Add A8, A8 Plus, A6 logos to configs (#15489)
Co-Authored-By: Leo <leo@nutz.de>
2019-10-08 15:33:24 -05:00
LinFor
58f81f8e7e Followup to progress override (#15488) 2019-10-08 15:24:14 -05:00
Scott Lahteine
d45ab47139 [cron] Bump distribution date 2019-10-08 14:33:57 -05:00
Scott Lahteine
9dcccc11ba Fix extra condition 2019-10-07 22:36:49 -05:00
Scott Lahteine
cc822c1a05 Use lambdas in menus, where possible (#15452) 2019-10-07 19:44:33 -05:00
Scott Lahteine
cd791f1cba Move long tests to the end 2019-10-07 19:41:15 -05:00
Scott Lahteine
59508edf64 Suppress data[] array warning 2019-10-07 19:32:23 -05:00
Scott Lahteine
e84389c976 Fix G2/G3 workspace plane parameters (#15475) 2019-10-07 17:09:20 -05:00
LinFor
19b7be067c Allow M73 to override SD position (#15449) 2019-10-07 16:38:58 -05:00
chzj333
d04561805b Support for BTT SKR Mini E3 v1.2 (#15476) 2019-10-07 15:45:11 -05:00
InsanityAutomation
71526fa5ce Fix ExtUI onMeshUpdate event (#15477) 2019-10-07 15:39:52 -05:00
Scott Lahteine
56595a4c9c Improve G2/G3 precision
See https://github.com/MarlinFirmware/Marlin/issues/14745#issuecomment-538781253
2019-10-07 00:03:17 -05:00
Scott Lahteine
211ff67440 Patch blocking and manual moves 2019-10-06 23:58:19 -05:00
Tanguy Pruvot
c6ffa7f38d MKS Robin: SD pins not required (SDIO) (#15474) 2019-10-06 23:20:43 -05:00
Scott Lahteine
519cc1bc67 NUM_AXIS is now obsolete 2019-10-06 22:18:16 -05:00
Scott Lahteine
4134c6398a Update 'mftest' (local test build) script 2019-10-06 22:04:28 -05:00
Scott Lahteine
9188ce1a8d Add JOIN for simple append 2019-10-06 22:01:06 -05:00
Scott Lahteine
51ae13fc8c Compact MIN/MAXTEMP_ALL 2019-10-06 21:58:58 -05:00
Scott Lahteine
5449088a8e Fix Japanese language extra define 2019-10-06 21:58:58 -05:00
Me No Dev
fc6a0937b8 Improve Malyan M200 integration (#15462) 2019-10-05 22:37:22 -05:00
Giuliano Zaro
a1ad01e4ab Limit Case Light PWM (#15459) 2019-10-05 22:32:50 -05:00
Scott Lahteine
f8498d8a52 GET_TEXTF => GET_TEXT_F 2019-10-05 20:47:28 -05:00
LinFor
e854eb933d Allow pins overrides for SKR V1.3 (#15451) 2019-10-05 20:40:01 -05:00
Giuliano Zaro
8924c0f1ec AGCM4 link in README.md (#15461) 2019-10-05 20:36:20 -05:00
Jimmy Page
203d260a41 Update Japanese font and translation (#15470) 2019-10-05 20:35:20 -05:00
Daniel Andersen
0076e1e792 Fix CR10 Stock Display timing with SKR_PRO V1.1 (#15446) 2019-10-05 20:33:46 -05:00
Giuliano Zaro
a3ec573984 Uniform fan speed & case light 2019-10-05 18:34:11 -05:00
Giuliano Zaro
ff55601dc3 Update Italian language 2019-10-05 18:30:48 -05:00
Roman Moravčík
b90dff020e Update Slovak language 2019-10-05 18:29:17 -05:00
Giuliano Zaro
43aba9f918 Fix compile errors & temp range 2019-10-05 18:27:03 -05:00
Scott Lahteine
1ac629f919 [cron] Bump distribution date 2019-10-05 00:00:09 -05:00
Luu Lac
5d81d7cefe if no HOTENDS 2019-10-04 16:18:18 -05:00
Tanguy Pruvot
895f64fbab Add missing MKS Robin TOUCH_CS_PIN (#15445) 2019-10-04 01:51:07 -05:00
Scott Lahteine
b7dfbb6af5 [cron] Bump distribution date 2019-10-04 00:00:05 -05:00
Scott Lahteine
c83c2a5022 Patch compile glitches 2019-10-03 15:37:13 -05:00
Scott Lahteine
6b945eb548 Show "FILAMENT CHANGE" during filament change 2019-10-03 07:45:52 -05:00
Scott Lahteine
0322348924 Handle runout in runout.cpp 2019-10-03 06:27:30 -05:00
Scott Lahteine
72d791a736 Standardize active/paused functions 2019-10-03 06:27:30 -05:00
Scott Lahteine
719615a6b6 Simplify edit menu items
The `edit` part of menu items displaying values is not needed. Menu edit types can be modeled on sub-menus.
2019-10-03 06:27:30 -05:00
Scott Lahteine
273cbe931e Aliases for common menu item types 2019-10-03 06:15:21 -05:00
tonokip
df48ef6df3 Fix step timer on Archim1 (#15447) 2019-10-03 03:29:15 -05:00
Scott Lahteine
acbe84c8ef [cron] Bump distribution date 2019-10-03 00:00:05 -05:00
Scott Lahteine
b82c0978cc Patch up OPEN command in git scripts 2019-10-02 02:02:51 -05:00
Scott Lahteine
d0ef7b6588 [cron] Bump distribution date 2019-10-02 00:00:04 -05:00
Scott Lahteine
1952982c01 Rearrange configs for export 2019-10-01 22:20:32 -05:00
Oliver Jean Eifler
d52b908627 Fix coordinate size for G26 w/out arcs (#15443) 2019-10-01 20:02:27 -05:00
InsanityAutomation
438835f6a5 Configurable Max Accel, Max Feedrate, Max Jerk edit limits (#13929) 2019-10-01 19:59:48 -05:00
Scott Lahteine
f9400b6a3c [cron] Bump distribution date 2019-10-01 00:00:05 -05:00
Scott Lahteine
7cd72de8bc General cleanup, style 2019-09-30 22:57:23 -05:00
Scott Lahteine
806d64e1bf X_SENSORLESS includes AXIS_HAS_STALLGUARD 2019-09-30 22:56:22 -05:00
Scott Lahteine
e3fd0519b3 Reduce need for UNUSED 2019-09-30 22:56:22 -05:00
Marcio Teixeira
e3ff27c95a Prevent duplication of PSTRs to save memory (#15435) 2019-09-30 22:53:34 -05:00
LinFor
98f614ddb1 Use MAX_BED_POWER instead of BANG_MAX to heat outside PID_FUNCTIONAL_RANGE (#15431) 2019-09-30 22:19:12 -05:00
Marcio Teixeira
087fe0e9d6 Improve and fix LULZBOT_TOUCH_UI (#15434)
- Add start print confirmation dialog box
- Fix incorrect text colors in UI
- Adjust bio printer UI
2019-09-30 22:15:48 -05:00
Timm
b198f321c8 Add missing motion inline methods (#15433) 2019-09-30 19:57:22 -05:00
Giuliano Zaro
15efe8d839 Update Italian language (#15436) 2019-09-30 19:31:06 -05:00
Scott Lahteine
1e57c6e6e3 AutoBuild tweaks 2019-09-30 02:56:15 -05:00
Scott Lahteine
a9c259c77a Patch PrintrboardG2 build (on spec) 2019-09-30 02:47:55 -05:00
DrDitto
55b8547f04 Simplify MKS_MINI_12864 init (move 5ms to u8g seq.) (#15428) 2019-09-30 02:11:58 -05:00
Scott Lahteine
b7a9481e01 [cron] Bump distribution date 2019-09-30 00:00:04 -05:00
Scott Lahteine
139b7196a0 Watchdog cleanup (#15283) 2019-09-29 17:57:29 -05:00
Scott Lahteine
24706aedbd Fix Neopixel typos 2019-09-29 17:36:29 -05:00
Scott Lahteine
d0dd1a387e Require a newer Neopixel 2019-09-29 17:31:06 -05:00
Scott Lahteine
f307ff68f7 Multiply by float, not double 2019-09-29 17:25:27 -05:00
Scott Lahteine
74746c6573 Fix probe_offset EEPROM field test 2019-09-29 16:55:50 -05:00
Alex Somesan
10bbed7f69 Fix comma/semicolon typo (#15420) 2019-09-29 16:50:53 -05:00
Bob Kuhn
178dcd6fd8 SPI chaining with TMCStepper simplified interface (#15179) 2019-09-29 05:47:20 -05:00
Frederik Kemner
4564ad2920 Fix build if EXTRUDERS = 0 (#15417) 2019-09-29 04:32:24 -05:00
Scott Lahteine
50e4545255 Add custom types for position (#15204) 2019-09-29 04:25:39 -05:00
Tanguy Pruvot
43d6e9fa43 STM32F103.. reorganization, SKR mini fix (#15398) 2019-09-29 02:04:53 -05:00
Scott Lahteine
5e9898600b [cron] Bump distribution date 2019-09-29 00:00:07 -05:00
Scott Lahteine
f2d93f61c3 Revert errant const 2019-09-28 23:52:54 -05:00
Scott Lahteine
7c5e6900e1 Tweak comment 2019-09-28 22:08:02 -05:00
Tim Moore
7e72768433 Info Menu: Runaway Watch state (#14827) 2019-09-28 21:53:40 -05:00
Scott Lahteine
81b9c7c6ee No motion constraint before homing
Sensible approach to soft endstops before the machine is homed.

Ref: https://github.com/MarlinFirmware/Marlin/pull/15027#issuecomment-533301094
Co-Authored-By: comps <comps@nomail.dom>
2019-09-28 21:35:49 -05:00
Christian
ddded80ff3 Fix mixing for up to 6 steppers (#15374) 2019-09-28 19:12:23 -05:00
Scott Lahteine
8683d4abfd Improved list-oriented macros 2019-09-28 19:03:07 -05:00
InsanityAutomation
0ca6abce72 Add reporting to M290 (#15376) 2019-09-28 16:58:48 -05:00
InsanityAutomation
e942b352c6 Fix Photograph Pin Sanity Check (#15406) 2019-09-28 16:18:23 -05:00
Ludy
41ea2d8c31 Fix auto-fan compile error (#15402) 2019-09-28 15:37:41 -05:00
InsanityAutomation
be3c4a7930 Bring Raptor pins in parity with others (#15410) 2019-09-28 15:35:13 -05:00
Ludy
f28f191ebf Trailing whitespace (#15403) 2019-09-28 15:32:37 -05:00
Ludy
a628d77798 Fix compile error with 6 hot-ends (#15405) 2019-09-28 15:30:41 -05:00
Ludy
6509dc04f5 Fix German error (#15404) 2019-09-28 15:29:41 -05:00
Scott Lahteine
2277c6dffc Optimize SD card reader, sorting (#15395) 2019-09-28 15:28:05 -05:00
Scott Lahteine
1834d86df5 Fix sanity check typos 2019-09-28 15:26:21 -05:00
InsanityAutomation
a6b0223eea Revive and improve DELTA probe bounds, LRFB options (#15372) 2019-09-28 01:19:11 -05:00
Maxim
1b9fc64d8a Add M997 support for SKR PRO 1.1 (#15394) 2019-09-28 00:54:30 -05:00
Scott Lahteine
f57ce2b40a [cron] Bump distribution date 2019-09-28 00:00:04 -05:00
Scott Lahteine
ebfdf740bc EZBoard only knows stock display 2019-09-27 22:08:13 -05:00
Jason Smith
5f18f5bb90 Require TMCStepper >= 0.5.0 in platformio.ini (#15382) 2019-09-27 19:18:12 -05:00
InsanityAutomation
5221e2d991 Restore Host Prompt Info (#15387) 2019-09-27 17:06:26 -05:00
Marcio Teixeira
02bbc51195 Keep C extension for now, restore (void) arg (#15380) 2019-09-27 14:02:35 -05:00
Giuliano Zaro
a8aca59c04 Update Italian language (#15373) 2019-09-27 13:05:53 -05:00
Scott Lahteine
4c16661153 Use named styles in draw_menu_item_static 2019-09-27 04:45:01 -05:00
Scott Lahteine
d683f98019 Return buffer in duration.toString 2019-09-27 04:45:01 -05:00
Scott Lahteine
dc65788511 Shorthand for __VA_ARGS__ 2019-09-27 04:43:34 -05:00
Marcio Teixeira
a18d16fb8b Do not implicitly concatenate localized strings (#15383) 2019-09-27 04:38:43 -05:00
Scott Lahteine
62e4e05a19 [cron] Bump distribution date 2019-09-27 00:00:04 -05:00
Berezovskyi Oleksandr
c0d5b57cf9 Init i2c for all i2c EEPROM use (#15366) 2019-09-26 22:25:56 -05:00
Scott Lahteine
665e45e0ba Reduce string storage, use masking 'seen' 2019-09-26 04:30:55 -05:00
Scott Lahteine
455dabb183 Add a feedRate_t data type (#15349) 2019-09-26 01:28:09 -05:00
Scott Lahteine
ee7558a622 Tweaks to Z fade behavior 2019-09-26 01:15:47 -05:00
Scott Lahteine
1f48eaf03a Change AutoBuild button order 2019-09-26 00:18:53 -05:00
Scott Lahteine
d49d40f7b0 Home XYZ newline 2019-09-25 22:26:16 -05:00
Scott Lahteine
b72fd7ea9c Supply 'super' for servo subclasses 2019-09-25 22:07:14 -05:00
Scott Lahteine
b2e1f77f58 Fix extraneous "Home XYZ First" message 2019-09-25 21:57:20 -05:00
Scott Lahteine
9a209012b5 Improve M114_DETAIL comment 2019-09-25 20:29:29 -05:00
Scott Lahteine
39578a5919 Fix probe without leveling 2019-09-25 19:57:52 -05:00
Marcio Teixeira
8cbb5350ad Refactor joystick support in ExtUI (#15318) 2019-09-25 18:46:36 -05:00
DrDitto
04e4eb35be MKS_MINI, FYSETC RGB, backlight (#15334) 2019-09-25 18:41:04 -05:00
Scott Lahteine
ddd9d9032a Fix option / string name conflict 2019-09-25 17:12:13 -05:00
Robby Candra
c3f09e2b1b Set MAX_OVERSHOOT_PID_AUTOTUNE to 30 (#15257) 2019-09-25 09:43:00 -05:00
Jason Smith
f98999ca20 Fix includes in RAMPS_DUO and RAMPS_SMART (#15321) 2019-09-25 09:42:03 -05:00
Dave Johnson
f362dab7be Disable PIO extra_scripts for AT90USB (#15347) 2019-09-25 09:37:27 -05:00
Scott Lahteine
0b4aedf13e Less use of "this" 2019-09-25 09:29:58 -05:00
Scott Lahteine
661c3cfc99 Fix mesh bounds for MBL 2019-09-25 09:05:46 -05:00
Scott Lahteine
25c4c2f24e Fix bool in M851 2019-09-25 08:39:11 -05:00
Scott Lahteine
da1bda493e Apply Marlin conventions to M851 2019-09-25 03:57:16 -05:00
InsanityAutomation
e9cf46a9a5 M851 XY 3 point followup (incomplete) (#15361) 2019-09-25 02:43:41 -05:00
Jason Smith
66d0221077 Fix build with more than 2 Trinamic E steppers (#15329) 2019-09-25 02:30:07 -05:00
Robby Candra
9c288a682d Followup to probe_at_point change (#15342) 2019-09-25 02:29:10 -05:00
Marcio Teixeira
149e9b733e Simplified ExtUI language selection (#15359) 2019-09-25 01:25:21 -05:00
Jason Smith
53124ca6b7 Fix 32-bit crash due to fwretract_settings_t pack(1) (#15333) 2019-09-25 01:08:30 -05:00
Scott Lahteine
bd6d144cdb [cron] Bump distribution date 2019-09-25 00:00:04 -05:00
Scott Lahteine
5288c399ce Patch probe offset name, defines 2019-09-24 23:39:23 -05:00
Scott Lahteine
4e8d9fe59b zprobe_offset => probe_offset 2019-09-24 23:36:09 -05:00
Scott Lahteine
3819f79945 Fix pid_output declaration 2019-09-24 22:32:13 -05:00
InsanityAutomation
df1e51258a Add M851 X Y probe offsets (#15202) 2019-09-24 21:29:21 -05:00
Scott Lahteine
ebc9a8a0b0 ExtUI patch followup 2019-09-24 20:21:31 -05:00
Marcio Teixeira
4ff59d178d LULZBOT_TOUCH_UI extended character set (#15301) 2019-09-24 18:49:40 -05:00
Scott Lahteine
bd2b44c4ed Require newest TMCStepper 2019-09-24 18:00:06 -05:00
Marcio Teixeira
bafcd084cc LULZBOT_TOUCH_UI performance/cosmetic fixes (#15319) 2019-09-24 17:46:00 -05:00
Bo Herrmannsen
6fc4d4c3b7 Disable ARC_SUPPORT on Tevo Tornado (#15358) 2019-09-24 17:30:56 -05:00
Jason Smith
9aaa056286 Fix SCARA build from Arduino IDE (#15317) 2019-09-24 17:29:25 -05:00
Scott Lahteine
48e2f90304 Improve TMC sanity checks 2019-09-24 17:20:39 -05:00
Scott Lahteine
07eb213046 [cron] Bump distribution date 2019-09-24 00:00:11 -05:00
Scott Lahteine
5e13fe989f Rename some feedrate-oriented functions 2019-09-23 22:36:41 -05:00
Scott Lahteine
938a49f989 Update DUE-tests 2019-09-23 19:16:40 -05:00
Scott Lahteine
9e7e8e229c [cron] Bump distribution date 2019-09-23 00:00:08 -05:00
Scott Lahteine
6c62732ae1 Handle no Timer 3C 2019-09-22 21:50:18 -05:00
Scott Lahteine
f5092e92a4 Enhanced A20M config 2019-09-22 21:46:56 -05:00
Giuliano Zaro
4e5941fa57 AutoBuild compatibility with Python3 (#15331) 2019-09-22 15:38:07 -05:00
Scott Lahteine
7fc4f7b815 [cron] Bump distribution date 2019-09-21 00:00:13 -05:00
Scott Lahteine
97493dc62a AutoBuildMarlin re-use VSCode terminal 2019-09-20 23:35:23 -05:00
Scott Lahteine
13d725d24d Tweak debug messages 2019-09-20 23:35:22 -05:00
Scott Lahteine
58521fb0eb Force auto build output to top 2019-09-20 20:05:49 -05:00
Scott Lahteine
ed2c2bcd17 Blend Auto Build icons 2019-09-20 19:49:09 -05:00
Scott Lahteine
7d7404157a Update AutoBuild README.md 2019-09-20 03:38:13 -05:00
Jason Smith
6ed2bf631d Fix FILAMENT_RUNOUT_SCRIPT without ADVANCED_PAUSE_FEATURE build (#15313) 2019-09-20 00:50:11 -05:00
Jason Smith
514223f960 Fix BACKLASH_COMPENSATION compiler issues (#15307) 2019-09-20 00:48:41 -05:00
Scott Lahteine
1452e41ead Auto Build fixes, updates (#15315)
Co-Authored-By: shitcreek <luulac85@gmail.com>
2019-09-20 00:45:03 -05:00
Scott Lahteine
de78b61d35 [cron] Bump distribution date 2019-09-20 00:00:10 -05:00
InsanityAutomation
6a312fae80 Add before/after dir change delays (#15314) 2019-09-19 23:05:17 -05:00
Scott Lahteine
f412267766 Fix "Auto Build window hidden behind" 2019-09-19 16:22:48 -05:00
Scott Lahteine
1803c27afb Fix macros for overloaded comparisons 2019-09-19 02:16:40 -05:00
Scott Lahteine
86e0b9eb05 [cron] Bump distribution date 2019-09-19 00:00:08 -05:00
Marcio Teixeira
7f117bfc60 EXTENSIBLE_UI Joystick support (#15303) 2019-09-18 19:35:03 -05:00
Evgeny Zyatkov
12e0581f24 SKR Pro Neopixel support (#15274) 2019-09-18 17:06:01 -05:00
Jason Smith
252f31b6f1 Fix/improve backoff feedrates (#15300) 2019-09-18 17:04:13 -05:00
Scott Lahteine
bcf630d8d1 Clarify a sanity check 2019-09-18 16:43:30 -05:00
Scott Lahteine
c44b5fd13a Try to fit logo by narrowing icons 2019-09-18 16:43:30 -05:00
Bas Stottelaar
a7a5607c1b Clean up BIGTREE_BTT022 board definition (#15287) 2019-09-18 12:29:58 -05:00
Scott Lahteine
d5a34afa56 Undefine pins only in debug list 2019-09-18 11:53:42 -05:00
Scott Lahteine
712aaa26d5 Use provided 'constrain' 2019-09-18 04:07:14 -05:00
Scott Lahteine
1a1375964f Drop unused G26 function 2019-09-18 04:07:14 -05:00
Scott Lahteine
4bb17a55ac Add Travis test for M425 2019-09-18 04:07:13 -05:00
Robby Candra
787d522036 LCD Size Defines (#15297) 2019-09-18 02:58:58 -05:00
Marcio Teixeira
b590ae4875 LULZBOT_TOUCH_UI: Only use %S on AVR (#15292) 2019-09-18 02:33:26 -05:00
Scott Lahteine
ce74e4b3e4 Undefine… redux 2019-09-18 00:28:26 -05:00
Scott Lahteine
356b582a9f [cron] Bump distribution date 2019-09-18 00:00:05 -05:00
Scott Lahteine
b73744f9e7 Update ExtUI, add test under DUE (#15298) 2019-09-17 23:41:34 -05:00
Scott Lahteine
b39ab3db37 Sanity-check for SD reprint 2019-09-17 23:34:14 -05:00
Scott Lahteine
34d521234d Undefine pins to reduce warnings 2019-09-17 23:34:14 -05:00
Scott Lahteine
73ac213cdd Fix FileList::isAtRootDir 2019-09-17 23:34:14 -05:00
Scott Lahteine
b71a755a30 Add float suffix in G33 2019-09-17 23:30:27 -05:00
Scott Lahteine
c353eaa146 Misc changes from struct refactor (#15289) 2019-09-17 18:16:28 -05:00
Bas Stottelaar
c7acd5c45b Upgrade BigTrees to latest platform ststm32 (#15285) 2019-09-17 05:08:47 -05:00
Tanguy Pruvot
7c3d52cd6b HAL_DUE build fix (#15286) 2019-09-17 04:51:27 -05:00
Scott Lahteine
2405ccb7ef Patch use of UNUSED 2019-09-17 00:05:35 -05:00
Scott Lahteine
282c39e3d0 [cron] Bump distribution date 2019-09-17 00:00:06 -05:00
Tanguy Pruvot
d277e93f4d Configurable TOUCH_BUTTONS repeat delays (#15245) 2019-09-16 21:32:55 -05:00
Scott Lahteine
f01f0d1956 Drop C-style 'void' argument 2019-09-16 20:31:21 -05:00
Scott Lahteine
7d8c38693f Formatting 2019-09-16 20:31:21 -05:00
Scott Lahteine
a06010e08a Macrofy attachInterrupt 2019-09-16 20:31:20 -05:00
Marcio Teixeira
4c00ddae56 Remove obsolete LULZBOT_TOUCH_UI code (#15284) 2019-09-16 19:45:05 -05:00
Scott Lahteine
6282655d77 Separate STM32F103R_bigtree_USB environment 2019-09-16 19:17:28 -05:00
Robby Candra
98233b1de0 Add root flag to CardReader (#15275) 2019-09-16 17:49:55 -05:00
Tanguy Pruvot
eb1a368277 Fix Lerdge K typos (#15273) 2019-09-16 16:50:57 -05:00
Marcio Teixeira
7a569ad4d0 LULZBOT_TOUCH_UI fixes. Fix some warnings. (#15276) 2019-09-16 16:49:46 -05:00
Bas Stottelaar
847e4ced11 Fix M43 without watchdog (#15280) 2019-09-16 16:09:43 -05:00
Scott Lahteine
7e95ee9e4b Patch missing millis 2019-09-16 15:57:25 -05:00
Scott Lahteine
d63e0f6d98 Pending refactor tweaks 2019-09-16 15:10:14 -05:00
Scott Lahteine
9c218381c5 [cron] Bump distribution date 2019-09-16 00:00:05 -05:00
J.C. Nelson
896162b722 Add pins for Lerdge X and K. (#15271) 2019-09-15 15:23:04 -05:00
Giuliano Zaro
c96844fae2 [SAMD51] Remove RuRamps4D (#15264) 2019-09-15 14:17:20 -05:00
Tanguy Pruvot
02d400e413 STM32F1: Sync SPI changes from maple master (#15266) 2019-09-15 13:46:17 -05:00
Scott Lahteine
20fbb751f1 Tell externals it's Marlin 2019-09-15 03:12:44 -05:00
Scott Lahteine
d5f5203880 Use "mount" as card verb 2019-09-15 03:12:44 -05:00
Tanguy Pruvot
2386c147ad Mount the SD card early (#15255) 2019-09-15 03:05:01 -05:00
Scott Lahteine
c4090b1375 [cron] Bump distribution date 2019-09-15 00:00:05 -05:00
Scott Lahteine
85a7f8c5b4 Smaller animation example 2019-09-14 19:19:43 -05:00
Scott Lahteine
79635f8e94 Fix some debug out lines 2019-09-14 16:45:06 -05:00
Scott Lahteine
843a19102c Shorten an option description 2019-09-14 16:45:04 -05:00
Marcio Teixeira
18821f29d5 LULZBOT_TOUCH_UI: Localization, runtime language selection (#15249) 2019-09-14 06:51:49 -05:00
Tanguy Pruvot
15bea5043c Followup to SD menu optimization (#15252) 2019-09-14 06:42:28 -05:00
Evgeny Zyatkov
61e3f119f4 FYSETC_MINI_12864 pins for SKR PRO 1.1 (#15253) 2019-09-14 06:22:30 -05:00
Scott Lahteine
3d0ead7dcb Bring Configuration_adv.h up to date 2019-09-14 04:30:17 -05:00
Scott Lahteine
465c6d9230 Simpler Allen Key config. Fixes, cleanups from refactor (#15256) 2019-09-14 03:05:10 -05:00
Scott Lahteine
ffb418b226 Move some SD comments 2019-09-14 02:31:47 -05:00
Robby Candra
acd76e8609 Allow odd mm bed sizes (#15258) 2019-09-14 01:26:14 -05:00
Scott Lahteine
bbbfb0015b [cron] Bump distribution date 2019-09-14 00:00:14 -05:00
Scott Lahteine
ef8ce2e2e5 Allow TEMP_CHAMBER_PIN override 2019-09-13 18:45:59 -05:00
Scott Lahteine
f9961ddebb Optimize SERIAL_ECHOPAIR_F 2019-09-13 08:47:41 -05:00
Frederik Kemner
3348a7d223 Fix Info Menu with EXTRUDERS==0 (#15230) 2019-09-13 01:36:44 -05:00
Tanguy Pruvot
2435c6082a STM32F1: AUTO_BED_LEVELING_UBL build fixes (#15240) 2019-09-13 01:33:33 -05:00
Scott Lahteine
ae7ae89bb3 [cron] Bump distribution date 2019-09-13 00:00:04 -05:00
Robby Candra
3f129b6574 Touch Buttons variable repeat delay (#15236) 2019-09-12 22:14:24 -05:00
Tanguy Pruvot
5bf635cec2 STM32F1: Only include USBComposite if flagged (#15243) 2019-09-12 18:35:27 -05:00
Robby Candra
1ab3521351 Optimize Media Menu display/scrolling (#15233) 2019-09-12 18:06:07 -05:00
Tanguy Pruvot
f1162243f6 STM32F1: No USBSerial without USB-serial bridge (#15242) 2019-09-12 17:59:31 -05:00
Scott Lahteine
832be5dd36 Cosmetic: Align Z_STEPPER_ALIGN values 2019-09-12 00:02:44 -05:00
Scott Lahteine
7cf1befbec [cron] Bump distribution date 2019-09-12 00:01:23 -05:00
Scott Lahteine
69bd636f22 More mega shortcuts in 'mftest' script 2019-09-11 20:51:42 -05:00
Scott Lahteine
1d574b0f6a Tweak config spaces 2019-09-11 17:32:54 -05:00
Tanguy Pruvot
3eacc3bfce french update, g26, usb (#15229)
french update for G26 and USB.
2019-09-11 14:36:39 -05:00
Gustavo Alvarez
2b628553d3 Update Spanish language (#15189) 2019-09-11 12:14:10 -05:00
reloxx13
05cd483413 STM32F1: Support M997 - Reset and begin flash (#15209) 2019-09-11 12:12:58 -05:00
Scott Lahteine
f4b198a9f5 Fix G26 enable in tests 2019-09-11 08:17:00 -05:00
Scott Lahteine
e3278f22f3 General formatting 2019-09-11 03:29:00 -05:00
Scott Lahteine
f9992c5f33 Implausible 2019-09-11 02:52:14 -05:00
Scott Lahteine
3648bce886 Tweak NOZZLE_CLEAN_START_POINT spacing 2019-09-11 01:50:24 -05:00
Scott Lahteine
6091e6300a Fix G90, G91, M82, M83 rel/abs modes (#15218) 2019-09-11 01:29:33 -05:00
Scott Lahteine
41a3fbceac [cron] Bump distribution date 2019-09-11 00:00:04 -05:00
Marcio Teixeira
47d19bab40 Lulzbot ExtUI Western language support (#15208)
Fix #15134
2019-09-10 20:07:03 -05:00
Scott Lahteine
c590e8ac05 Improve Power-loss Recovery (#15135) 2019-09-10 18:52:41 -05:00
Scott Lahteine
75927e17dd Filament Width Sensor singleton (#15191) 2019-09-10 18:48:58 -05:00
Scott Lahteine
fe6ba4fd70 Tweak REMEMBER 2019-09-10 02:21:21 -05:00
Scott Lahteine
584c86bed1 More "zero extruders" changes (#15213) 2019-09-10 02:20:49 -05:00
Scott Lahteine
54abf3aeba [cron] Bump distribution date 2019-09-10 00:00:06 -05:00
InsanityAutomation
dcc39421c5 Minor Pin Updates (#15214) 2019-09-09 23:58:57 -05:00
thisiskeithb
66338ed515 CR-10 Stock Display for SKR Mini 1.1 (#15215) 2019-09-09 23:56:02 -05:00
Scott Lahteine
ff482a3247 M114 detail in more tests 2019-09-09 18:04:25 -05:00
Scott Lahteine
f055f7c535 Add emergency_parser.h dependency 2019-09-09 18:04:25 -05:00
Scott Lahteine
841c8ce0d9 Remove PROMPT_INFO / PROMPT_GCODE_INFO (#15210) 2019-09-09 15:43:06 -05:00
Ludy
3c3a956a17 Fix compiling error BIGTREE_SKR_MINI (#15197)
Let's get STM32F1 working again!
2019-09-09 10:34:54 -05:00
Scott Lahteine
565a0e11ed Prevent 'current' name conflict, if needed 2019-09-09 03:17:11 -05:00
Scott Lahteine
4f5e197c80 Move bezier curve test 2019-09-09 00:27:53 -05:00
Scott Lahteine
713157f712 Move L6470 enum 2019-09-09 00:27:53 -05:00
Scott Lahteine
5949c24afc [cron] Bump distribution date 2019-09-09 00:00:05 -05:00
Scott Lahteine
dbea6f0022 STM32F1 USB cdc/msc composite device (#15180)
Co-Authored-By: bigtreetech <38851044+bigtreetech@users.noreply.github.com>
2019-09-08 02:28:22 -05:00
Luu Lac
8bca3fcf2c Display chamber with HAS_TEMP_CHAMBER (#15194) 2019-09-08 02:20:18 -05:00
Roman Moravčík
ca0f47985b Update Slovak language (#15187) 2019-09-08 01:47:36 -05:00
InsanityAutomation
0693767efa ExtUI Pause/Stop on all Pause/Stop (#15188) 2019-09-08 01:47:07 -05:00
Scott Lahteine
1c3a1ab2c6 Use _MIN over MIN 2019-09-08 01:02:15 -05:00
Lucio Tarantino
8ac52aedff M118 multiserial support (#15176) 2019-09-08 00:57:59 -05:00
Jamie
dbee0e9c54 Analog joystick jogging control (#14648) 2019-09-08 00:55:34 -05:00
Ludy
068c303742 More translatable LCD strings (#15190) 2019-09-08 00:15:25 -05:00
Tanguy Pruvot
ec3f29a33a Fix linux_native long to int32 warnings (#15192) 2019-09-07 20:30:47 -05:00
ManuelMcLure
eed7c2fe2f Fix 'echo:' in TMC parameters M503 report (#15193) 2019-09-07 20:29:38 -05:00
Ludy
6172cd2528 CHAMBER integration to GLCD (#14981) 2019-09-07 04:52:57 -05:00
Scott Lahteine
94948d3dcb Compact some sanity conditions 2019-09-06 19:03:04 -05:00
Scott Lahteine
14573cb823 Update some configs 2019-09-06 18:24:40 -05:00
Scott Lahteine
a3052da703 Move manual move to lcd section 2019-09-06 18:24:39 -05:00
AnHardt
b7b0021b5c Fix Thermistor 75 (#15181) 2019-09-06 16:23:27 -05:00
Scott Lahteine
94d3153fb6 Remove obsolete TMC_USE_CHAIN 2019-09-06 15:48:08 -05:00
Scott Lahteine
ca1a3476cb [cron] Bump distribution date 2019-09-06 00:00:04 -05:00
Scott Lahteine
91c3b8e3ca Reformat ADC cases 2019-09-05 20:02:31 -05:00
Scott Lahteine
4cdf7a1b93 Add ADC helpers to temp_info_t 2019-09-05 19:48:52 -05:00
Scott Lahteine
72876d9045 Clean up u8g defines 2019-09-05 17:09:24 -05:00
Scott Lahteine
8d036e94bf Combine channel-based SPI headers 2019-09-05 17:09:24 -05:00
Scott Lahteine
70b3f4ded5 Pins error message 2019-09-05 15:44:13 -05:00
Ludy
01fd3f904f Drop extra include (#15171) 2019-09-05 13:21:06 -05:00
Tanguy Pruvot
50e1bf57b9 Fix RRD/CR10 LCD on STM32F1/F4 (#15172) 2019-09-05 13:20:03 -05:00
Scott Lahteine
18dd5cb46a Config comment patch 2019-09-05 01:48:12 -05:00
Scott Lahteine
bf3cd8e5aa Tweak var names 2019-09-05 01:40:09 -05:00
Scott Lahteine
37d3c7288f [cron] Bump distribution date 2019-09-05 00:00:04 -05:00
Scott Lahteine
7496e1cd67 whitespace 2019-09-04 21:55:41 -05:00
Scott Lahteine
060b360be3 Provide a good default contrast
In reference to #15139
2019-09-04 18:29:22 -05:00
kakou-fr
6b1c4dec46 Touch Mi: Add magnet Y position (#15166) 2019-09-04 18:09:12 -05:00
Tanguy Pruvot
85f0556118 Add XPT2046 calibration functions (#15140) 2019-09-04 17:32:20 -05:00
Scott Lahteine
cff502c6d4 Tweak REPRAPWORLD_KEYPAD config comment 2019-09-04 17:23:38 -05:00
Giuliano Zaro
53af7cad0a SAMD51 include u8g library (#15165) 2019-09-04 17:00:30 -05:00
Ludy
beffcd856b Update German language, (c) (#15164) 2019-09-04 16:59:26 -05:00
Karl Andersson
123ecfe613 Allow MINIMUM_STEPPER_PULSE override with LV8729 (#15162) 2019-09-04 16:57:13 -05:00
Scott Lahteine
2d2d9da9f2 Tweak u8g impl file includes 2019-09-04 14:52:22 -05:00
Scott Lahteine
a07c4af393 Tweak animated draw call 2019-09-04 14:47:08 -05:00
Scott Lahteine
7ad5208267 Fix up boot screen code
Followup to #15125

Co-Authored-By: Ludy <ludy87@users.noreply.github.com>
2019-09-04 14:43:32 -05:00
Robby Candra
6b05d5d65d Allow TOUCH_BUTTONS to be swapped (#15100) 2019-09-04 13:13:05 -05:00
George Fu
8e044ea898 Fix up Fysetc configs, pins. Fix menu type float5. (#15157) 2019-09-04 13:06:23 -05:00
Jamie
293b890940 Apply soft limits to G2/G3 final target (#15156) 2019-09-04 13:02:30 -05:00
Scott Lahteine
2563e32aa3 Format FWRETRACT config comments 2019-09-04 12:48:50 -05:00
Scott Lahteine
d9bbe0ff02 [cron] Bump distribution date 2019-09-04 00:00:03 -05:00
thisiskeithb
d577b3c21e Fix MKS SGEN-L Pins (#15153) 2019-09-03 20:02:30 -05:00
AnHardt
89a2161cac MINIMUM_STEPPER_DIR_DELAY in LA (#15154)
Add missed MINIMUM_STEPPER_DIR_DELAY after dir change in LinearAdvance interrupt.
2019-09-03 20:01:51 -05:00
Scott Lahteine
75efa3cdac Reorganize HAL (#14832) 2019-09-02 19:49:58 -05:00
thisiskeithb
cdd5056aba Increase MKS MINI 12864 default contrast (#15139) 2019-09-02 19:40:58 -05:00
Scott Lahteine
c97c393c4a Fix "unqualified id" warning (#15144) 2019-09-02 19:35:05 -05:00
Scott Lahteine
12344085c0 Update temperature.cpp 2019-09-02 19:21:47 -05:00
Giuliano Zaro
12c595c61f SAMD51 LCD support (#15113) 2019-09-02 05:45:02 -05:00
Scott Lahteine
23bb40d0ea Fix MKS_MINI_12864 init
See #13550

Co-Authored-By: DrDitto <drditto@users.noreply.github.com>
2019-09-02 05:24:36 -05:00
Giuliano Zaro
9958f5e322 Home on G34 if steppers slept (#15127) 2019-09-02 02:44:48 -05:00
thisiskeithb
59152f2671 Flash-based EEPROM on SKR Mini E3 DIP (#15128) 2019-09-02 02:42:11 -05:00
Tanguy Pruvot
c9817105fb Update French language (#15129) 2019-09-02 02:40:33 -05:00
Giuliano Zaro
e6a114b853 Update Italian language (#15130) 2019-09-02 02:39:40 -05:00
Tanguy Pruvot
b97bb14a7a Full-featured Alfawise U20 config (#15131) 2019-09-02 02:37:50 -05:00
Gustavo Alvarez
54069823a0 Update Spanish language (#15132) 2019-09-02 02:36:32 -05:00
thisiskeithb
f6505c8ee2 Fix Ender-3 Status Screen Y Offset (#15136) 2019-09-02 02:35:59 -05:00
Scott Lahteine
93dcc22aae Drop extra call to get_available_commands 2019-09-02 01:14:03 -05:00
Scott Lahteine
451a942e95 Suspend queue during wait_for_hotend 2019-09-02 01:14:03 -05:00
Scott Lahteine
b4715b29bb [cron] Bump distribution date 2019-09-02 00:00:04 -05:00
Scott Lahteine
34b73426e5 Apply #ifdef/#ifndef where possible 2019-09-01 23:54:50 -05:00
Scott Lahteine
4078f2672e Apply shorthand option macros 2019-09-01 23:43:48 -05:00
Scott Lahteine
a2e412c0ce Rename command buffer var 2019-09-01 20:43:31 -05:00
Tanguy Pruvot
d59d9b5973 Alfawise - LK1/LK2/LK4 and BLTouch (#15118) 2019-09-01 04:10:35 -05:00
weakset
ee240d21b9 Use Flash-based EEPROM on SKR mini-E3 (#15126) 2019-09-01 04:04:40 -05:00
Jason Smith
be051c890f Fix Z_STEPPER_ALIGN_[XY] sanity error (#15124) 2019-09-01 04:00:20 -05:00
Tanguy Pruvot
ee444d7d07 Fix SKRmini test required serial port(s) (#15117) 2019-08-31 21:10:50 -05:00
ETE-Design
c8e096785f Gantry: Enable Filament Change (#15122) 2019-08-31 20:54:36 -05:00
Scott Lahteine
8778e12342 Fix some missed misspellings 2019-08-31 20:50:10 -05:00
thisiskeithb
2747ab7643 Ender-3 default TMC currents (#15115) 2019-08-31 20:46:10 -05:00
Scott Lahteine
586b334c2a Split up stepper indirection (#15111) 2019-08-31 19:44:45 -05:00
Scott Lahteine
87b16ed5f6 Bring Configuration.h up to date 2019-08-31 07:03:51 -05:00
Scott Lahteine
8fca85042b Patch early env rename 2019-08-31 07:00:44 -05:00
thisiskeithb
25cf7dee40 Disable Tevo Tarantula Pro PIDTEMPBED (#15089) 2019-08-31 01:40:52 -05:00
Scott Lahteine
66f1da762f Use 'ui.' where possible 2019-08-31 01:07:01 -05:00
Robby Candra
26fa08548c Add RGB565 Color Definitions for TFT (#15099) 2019-08-30 22:49:24 -05:00
Scott Lahteine
944920176f Add more platform Travis tests 2019-08-30 22:37:28 -05:00
Scott Lahteine
0f4d3e1bca Fix ESP32 "DISABLED" name conflict 2019-08-30 22:37:28 -05:00
Scott Lahteine
1eeef30097 A single generate_click lambda 2019-08-30 19:17:59 -05:00
Tanguy Pruvot
c014f8dc78 Fix STM32F1 SPI warning (gcc 8.2.1) (#15104) 2019-08-30 18:15:04 -05:00
Tanguy Pruvot
d068470e18 Prevent Linux min/max error (#15107) 2019-08-30 17:46:09 -05:00
Bob Kuhn
ba91bca1eb TMC SPI daisy chain support (experimental) (#15081) 2019-08-30 17:39:45 -05:00
Scott Lahteine
0bcb64403c Revert _BV testing commit
This reverts commit 9223261ea9.
2019-08-30 16:11:16 -05:00
Scott Lahteine
05ef9b2f55 [cron] Bump distribution date 2019-08-30 14:44:39 -05:00
Scott Lahteine
2aef83ddcd Add a PlatformIO hook to alter CXXFLAGS 2019-08-29 18:06:24 -05:00
Scott Lahteine
23cffb2c21 Add an env to get the Include Tree 2019-08-29 18:06:24 -05:00
Scott Lahteine
9223261ea9 Only define _BV in Marduino.h 2019-08-29 18:06:24 -05:00
Scott Lahteine
d25231aea8 Spacing, defined(), #include tweaks 2019-08-29 18:06:24 -05:00
Karl Andersson
7ebfae27e3 Fix HAL_STM32 SPI regression (#15093)
Reference: 0b47558
2019-08-29 17:00:01 -05:00
thisiskeithb
f5a1fabd38 Clarify TMC2209 Sensitivity vs. Others (#15092) 2019-08-29 16:57:56 -05:00
Ludy
3f77d6a551 Fix expire_status warning (#15094) 2019-08-29 16:05:22 -05:00
Robby Candra
38983fdfa9 Add 'Back' Button for Touch TFT 320x240 (#15060) 2019-08-29 01:19:07 -05:00
Scott Lahteine
8196ced2de Leave LCD_PINS_Dn defined for other uses
Fix #14998
2019-08-29 00:57:20 -05:00
AlexandrZloy
0ebaea94be Add stallGuard threshold for X2 (#15042) 2019-08-29 00:15:31 -05:00
Scott Lahteine
e1d65b8937 [cron] Bump distribution date 2019-08-29 00:00:03 -05:00
Tanguy Pruvot
ca5da026d6 dogm: u8g prototypes cleanup (#15082) 2019-08-28 23:49:51 -05:00
Scott Lahteine
a61c91ae9e Use 'bugfix' branch of U8glib-HAL 2019-08-28 21:39:18 -05:00
Scott Lahteine
1d8ad7cf71 Safe changes from HAL cleanup 2019-08-28 21:21:47 -05:00
Scott Lahteine
95963121b0 Patch a u8g include 2019-08-28 20:09:02 -05:00
Scott Lahteine
7b99c26e80 Fix FTDI_EVE_LIB platform includes 2019-08-28 19:56:02 -05:00
Scott Lahteine
3ac76f0489 Invariant Marlin bootscreen (#15057) 2019-08-28 07:40:18 -05:00
Scott Lahteine
b2a4b6f34e Don't use board url as override 2019-08-28 04:44:40 -05:00
Scott Lahteine
b8e4b993d6 Separate board website URL 2019-08-28 04:44:40 -05:00
Scott Lahteine
6341aefda3 Info menu tweak style 2019-08-28 04:43:42 -05:00
Marcio Teixeira
0f386d06a1 Followup fixes to ExtUI (#15068) 2019-08-28 04:23:13 -05:00
Luu Lac
081e4506ca Fix G53 as prefix, G28 with CNC_COORDINATE_SYSTEMS (#15069) 2019-08-28 04:20:28 -05:00
Robby Candra
ca084dcfe8 Switch col vs row variable name (#15072) 2019-08-28 02:49:21 -05:00
Giuliano Zaro
604bdf0b43 Update Italian language (#15076) 2019-08-28 02:46:21 -05:00
InsanityAutomation
b7796bcce6 Disable steppers on M112 (#15065)
And change verbiage to not refer to "Emergency Stop."
2019-08-28 00:51:01 -05:00
Scott Lahteine
318356b6bc [cron] Bump distribution date 2019-08-26 00:00:07 -05:00
Scott Lahteine
d2f211c7e1 Gantry followup 2019-08-25 20:53:50 -05:00
ETE-Design
9d12788a9a ADIMLab Gantry - Spelling Correction (#15043) 2019-08-25 20:51:06 -05:00
thisiskeithb
1769f43226 Fix CR-10/10S/Mini/5S Bed Thermistor Types (#15040) 2019-08-25 04:47:02 -05:00
InsanityAutomation
f218405c36 Fix ExtUI invalid speed, timer (#15031) 2019-08-25 04:46:02 -05:00
Daniel Callander
155765646e Add warning when trying to use JD with kinematic systems (#15032) 2019-08-25 04:43:53 -05:00
Scott Lahteine
7183a586d9 Add EZBOARD PT100 pin 2019-08-25 04:31:00 -05:00
Scott Lahteine
c7825e6719 Contrast over 63 assume 255 max
This is closer to the prior behavior.
2019-08-25 04:31:00 -05:00
Tim Moore
1461ee4d36 Make LCD_CONTRAST_MAX >= _LCD_CONTRAST_INIT (#15046) 2019-08-25 04:25:07 -05:00
Scott Lahteine
9e9e578234 [cron] Bump distribution date 2019-08-25 00:00:03 -05:00
Tim Moore
8033bc87ea Turbo-back Info menu items (#15049) 2019-08-24 19:50:04 -05:00
Scott Lahteine
d6a16525c2 New Language: Vietnamese (#13892) 2019-08-24 03:40:28 -05:00
Scott Lahteine
f6b604ff49 Helper Script tweaks 2019-08-24 02:10:50 -05:00
Scott Lahteine
7fbf40c20c Add command-check to get-bdf2u8g.sh 2019-08-24 02:03:13 -05:00
Marcio Teixeira
da601d5114 Update USB_FLASH_DRIVE_SUPPORT (#15021) 2019-08-24 01:47:19 -05:00
Scott Lahteine
20fc66f875 ADIMLab Granty v1 / v2 (#15017)
* # This is a combination of 18 commits.
# This is the 1st commit message:

Add Support for ADIMLab Granty

# The commit message #2 will be skipped:

# Update Configuration.h

# The commit message #3 will be skipped:

# Add files via upload
#
# Add Support for ADIMLab Granty

# The commit message #4 will be skipped:

# Create Configuration.h

# The commit message #5 will be skipped:

# Delete Configuration.h

# The commit message #6 will be skipped:

# Create Test.h

# The commit message #7 will be skipped:

# Add files via upload

# The commit message #8 will be skipped:

# Delete Test.h

# The commit message #9 will be skipped:

# Delete Configuration.h

# The commit message #10 will be skipped:

# Delete Configuration_adv.h

# The commit message #11 will be skipped:

# Add files via upload
#
# Add ADIMLab Pins

# The commit message #12 will be skipped:

# Add files via upload
#
# Add Bootscreen

# The commit message #13 will be skipped:

# Update Configuration.h
#
# Add Bootscreen

# The commit message #14 will be skipped:

# Update pins.h
#
# Add ADIMLab Board

# The commit message #15 will be skipped:

# Update boards.h
#
# Add ADIMLab Granty

# The commit message #16 will be skipped:

# Update Makefile
#
# Add ADIMLab Granty

# The commit message #17 will be skipped:

# Update boards.h

# The commit message #18 will be skipped:

# Update Makefile

* Add Support for ADIMLab Granty

* Optimize bootscreen

* Update Makefile

Updated Description

* Update boards.h

Updated Description

* Update pins_HJC2560C_REV2.h

Updated Description

* Update Configuration.h

Added Author + Custom_Machine_Name

* Create _Bootscreen.h

Add Bootscreen

* Add files via upload

Add ADIMLab Granty v1

* Update boards.h

Add ADIMLab Granty v1

* Update Makefile

Add ADIMLab Granty v1

* Update pins_HJC2560C_REV2.h

* Consolidate Granty configs

* config updates
2019-08-24 01:45:11 -05:00
Scott Lahteine
750256948e Apply #ifdef 2019-08-24 01:42:48 -05:00
Scott Lahteine
d527c46481 Delta: Reduce default MIN_STEPS_PER_SEGMENT 2019-08-24 01:42:48 -05:00
BigTreeTech
848dd740ba Fix STM32F1 ADC read temperature error (#15026)
…after USB CDC connect.
2019-08-24 01:33:16 -05:00
Scott Lahteine
04a9962cb5 Fix: Contrast override in pins files
Move contrast handling to `Conditionals_post.h` so pins files can override the LCD defaults.
2019-08-24 00:58:05 -05:00
Scott Lahteine
334777c201 config updates 2019-08-24 00:24:48 -05:00
Scott Lahteine
8c73017a69 [cron] Bump distribution date 2019-08-24 00:00:04 -05:00
Scott Lahteine
62d2a65025 Consolidate Granty configs 2019-08-23 23:49:30 -05:00
Scott Lahteine
09ee5a5da1 Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bf2_granty_fix_15017 2019-08-23 23:45:37 -05:00
Tim Moore
efeea9bccf pca9632_buzz fix (#15020) 2019-08-23 22:30:11 -05:00
Marcio Teixeira
e61e54acfd Fix TURBO_BACK_MENU_ITEM compile error (#15019) 2019-08-23 22:29:00 -05:00
Tanguy Pruvot
0a280f00c2 Flag unused variables without buzzer (#15016) 2019-08-23 22:21:30 -05:00
Scott Lahteine
f2ad1ceb13 Update PT-BR 2019-08-23 21:13:14 -05:00
ManuelMcLure
9c87786464 Change default Re-ARM UART pin order (#15037) 2019-08-23 20:55:41 -05:00
Scott Lahteine
fdef32ce77 Shorten Website URLs 2019-08-22 19:37:04 -05:00
Scott Lahteine
7924e0d819 Add print at position shortcuts 2019-08-22 19:37:04 -05:00
Scott Lahteine
5c0e5c599f Fix boot screen warning 2019-08-22 18:58:11 -05:00
Scott Lahteine
dd6efe96e7 Restore documented M503 behavior 2019-08-22 18:58:11 -05:00
Scott Lahteine
6429b8bfb8 Fix EZBoard platform test 2019-08-22 17:38:32 -05:00
Tanguy Pruvot
e604f76703 Enable contrast via LCD_CONTRAST_INIT (#15006) 2019-08-21 18:56:39 -05:00
ETE-Design
9d8e3d4d6f Update pins_HJC2560C_REV2.h 2019-08-21 17:38:08 +02:00
ETE-Design
2526e2d32e Update Makefile
Add ADIMLab Granty v1
2019-08-21 17:36:15 +02:00
ETE-Design
d858f44b35 Update boards.h
Add ADIMLab Granty v1
2019-08-21 17:34:44 +02:00
ETE-Design
c3d1671b6d Add files via upload
Add ADIMLab Granty v1
2019-08-21 17:30:17 +02:00
ETE-Design
778466a2ed Create _Bootscreen.h
Add Bootscreen
2019-08-21 17:29:25 +02:00
ETE-Design
42f35491e0 Update Configuration.h
Added Author + Custom_Machine_Name
2019-08-21 16:33:36 +02:00
ETE-Design
0309a5f3af Update pins_HJC2560C_REV2.h
Updated Description
2019-08-21 16:30:08 +02:00
ETE-Design
9434b81a82 Update boards.h
Updated Description
2019-08-21 16:27:45 +02:00
ETE-Design
6b35951e92 Update Makefile
Updated Description
2019-08-21 16:26:25 +02:00
Tanguy Pruvot
012f577bb0 STM32F1: Import (rogerclarkmelbourne) SPI class (#15002) 2019-08-21 06:22:23 -05:00
ETE-Design
4be98221f6 ADIMLab Granty pins/config (#14919) 2019-08-21 05:33:17 -05:00
Scott Lahteine
1fb3c4055d Optimize bootscreen 2019-08-21 05:30:33 -05:00
Scott Lahteine
f7aac7a5b0 Add Support for ADIMLab Granty 2019-08-21 05:26:38 -05:00
ETE-Design
de122c9bbe # This is a combination of 18 commits.
# This is the 1st commit message:

Add Support for ADIMLab Granty

# The commit message #2 will be skipped:

# Update Configuration.h

# The commit message #3 will be skipped:

# Add files via upload
#
# Add Support for ADIMLab Granty

# The commit message #4 will be skipped:

# Create Configuration.h

# The commit message #5 will be skipped:

# Delete Configuration.h

# The commit message #6 will be skipped:

# Create Test.h

# The commit message #7 will be skipped:

# Add files via upload

# The commit message #8 will be skipped:

# Delete Test.h

# The commit message #9 will be skipped:

# Delete Configuration.h

# The commit message #10 will be skipped:

# Delete Configuration_adv.h

# The commit message #11 will be skipped:

# Add files via upload
#
# Add ADIMLab Pins

# The commit message #12 will be skipped:

# Add files via upload
#
# Add Bootscreen

# The commit message #13 will be skipped:

# Update Configuration.h
#
# Add Bootscreen

# The commit message #14 will be skipped:

# Update pins.h
#
# Add ADIMLab Board

# The commit message #15 will be skipped:

# Update boards.h
#
# Add ADIMLab Granty

# The commit message #16 will be skipped:

# Update Makefile
#
# Add ADIMLab Granty

# The commit message #17 will be skipped:

# Update boards.h

# The commit message #18 will be skipped:

# Update Makefile
2019-08-21 05:25:00 -05:00
Scott Lahteine
4581957d93 Clean up some pins 2019-08-21 05:15:48 -05:00
Marcio Teixeira
bd1ced14e7 LulzBot Touch UI Followup (#15007) 2019-08-21 04:48:05 -05:00
Scott Lahteine
8c2cfaa907 Fix BigTree_Btt002 build 2019-08-21 04:38:04 -05:00
Marcio Teixeira
69641f1420 Fix incompatible types error (#15009) 2019-08-21 04:15:37 -05:00
Marcio Teixeira
825c2c3dc4 Fix fan speed encoder scaling (#15010) 2019-08-21 03:49:43 -05:00
Scott Lahteine
f1942f6ec0 [cron] Bump distribution date 2019-08-21 00:00:04 -05:00
Scott Lahteine
5e777601f3 Add TURBO_BACK_MENU_ITEM option (#14991) 2019-08-20 19:37:03 -05:00
Scott Lahteine
0cc524b84f Prevent BOARD_NAME conflict with env 2019-08-20 19:10:36 -05:00
InsanityAutomation
33f6d77281 Adjust homing backoff feedrate (#14972) 2019-08-20 03:44:52 -05:00
InsanityAutomation
5a7c0216f7 Misc. ExtUI fixes (#14971) 2019-08-20 03:44:17 -05:00
InsanityAutomation
6039893981 Creality pins updates (#14979) 2019-08-20 03:42:30 -05:00
MaukCC
8664b8e97b Adding HMS434 machine (#14931) 2019-08-20 03:40:48 -05:00
Scott Lahteine
5c6e82743e Followup to STM32F407 2019-08-20 03:11:34 -05:00
chzj333
0b47558a09 New board STM32F407 (#14994) 2019-08-20 03:05:12 -05:00
BigTreeTech
bb4a252567 Fix Bigtreetech STM32F40x variants ADC (#14996) 2019-08-20 03:02:52 -05:00
Tim Moore
67f8ba6fed Allow pullup/downs on power loss pin (#14986) 2019-08-20 02:40:44 -05:00
thisiskeithb
19e21a8f10 Wanhao Duplicator i3 Mini config updates (#14908) 2019-08-20 02:38:31 -05:00
Ludy
05995d1fd6 Unify buzz methods as MarlinUI::buzz (#14803) 2019-08-20 02:01:37 -05:00
Scott Lahteine
29c12905f5 Minor HAL patches 2019-08-19 02:28:36 -05:00
Scott Lahteine
1432d44eed Patch circleci config 2019-08-19 01:30:36 -05:00
Scott Lahteine
94397dbdb4 [cron] Bump distribution date 2019-08-19 00:00:07 -05:00
Scott Lahteine
17cd1a4f26 Tweak TOUCH_MI_DEPLOY_XPOS block 2019-08-18 23:38:12 -05:00
Scott Lahteine
dfcd437486 Base HAS_LCD_CONTRAST on display type 2019-08-18 23:38:12 -05:00
Scott Lahteine
3f678b0be5 Remove some extra F4 conditions 2019-08-18 23:37:25 -05:00
Scott Lahteine
4d1a662571 Fix STM32F7 STEPPER_ENABLE_PIN 2019-08-18 23:25:15 -05:00
Scott Lahteine
08434b3605 Add TMC26XStepper, not ignore 2019-08-18 23:05:14 -05:00
Tim Moore
cd09e35f90 Remove extra M503 "M412" report (#14985) 2019-08-18 21:17:00 -05:00
InsanityAutomation
c5be59ddfe Fix runout trigger on "inactive" sensor (#14990) 2019-08-18 21:11:33 -05:00
InsanityAutomation
af5a7a2925 Add missing ExtUI user confirmation (#14992) 2019-08-18 21:03:26 -05:00
Robby Candra
33d54c0d5a Remove extra defines (#14983) 2019-08-18 21:00:20 -05:00
Scott Lahteine
403eefd272 Delete _Bootscreen.h 2019-08-18 20:18:58 -05:00
Scott Lahteine
bc93ac53b5 Fix #define typo in configs 2019-08-18 19:51:55 -05:00
Scott Lahteine
d2072f9ace Clean up PlatformIO lib_ignore (#14988)
Originally from #14832.

Users may need to delete platformio work folders before building.
2019-08-18 19:36:14 -05:00
Scott Lahteine
c8e476ad60 Embed some items in HAS_LCD_MENU 2019-08-18 18:41:51 -05:00
Scott Lahteine
9a3ee3be53 [cron] Bump distribution date 2019-08-18 00:00:04 -05:00
Scott Lahteine
9d9e2deb9b Tweak UBL G29 status print 2019-08-17 20:15:10 -05:00
Robby Candra
823178c272 Use u8g int type for screen coordinates (#14965) 2019-08-17 19:58:38 -05:00
Ludy
6715fd159c Animated Marlin boot screen (#14961) 2019-08-17 18:40:01 -05:00
Scott Lahteine
9e49f154d8 [cron] Bump distribution date 2019-08-17 15:47:17 -05:00
Marcio Teixeira
8bdb3d9970 Add CONTROLLERFAN_SPEED_Z_ONLY (#14956) 2019-08-16 21:57:19 -05:00
AnHardt
587d4a6373 Repair display throttling (#14960) 2019-08-16 21:17:09 -05:00
J.C. Nelson
fecf808d80 Fix lambda missing capture (#14969) 2019-08-16 21:15:27 -05:00
Bob Kuhn
66bfad3ced Fix missing U8glib.h include (#14966) 2019-08-16 20:06:32 -05:00
J.C. Nelson
1bcc5c98a9 MalyanLCD: Pause, resume, more ExtUI (#14852) 2019-08-16 20:02:35 -05:00
Scott Lahteine
c3ff53a61c STM32 u8g defines
Suggested by https://github.com/MarlinFirmware/Marlin/issues/14742#issuecomment-515753814
2019-08-16 18:48:29 -05:00
Tim Moore
4575978a1f Fix auto power for chamber fan (#14922) 2019-08-16 18:42:24 -05:00
Marcio Teixeira
274934ad81 Add LULZBOT_TOUCH_UI (#14967) 2019-08-16 18:34:13 -05:00
Marcio Teixeira
179d6c4ed1 Add STARTUP_SCRIPT option. M17 parity with M18. (#14953) 2019-08-14 21:05:15 -05:00
Marcio Teixeira
36dfbaea8c Add missing function declaration (#14955) 2019-08-14 17:52:57 -05:00
Marcio Teixeira
263d7d37af "SD card" => "Media" (#14951) 2019-08-14 17:52:14 -05:00
Scott Lahteine
24ce8beb48 [cron] Bump distribution date 2019-08-14 00:00:11 -05:00
Tanguy Pruvot
4cc103958e Alfawise Flash EEPROM, Z Servo Probe (#14877) 2019-08-13 23:41:17 -05:00
Joseph Bozarth
0fbb26c28f M16 - Expected Printer Check (#14924) 2019-08-13 23:38:45 -05:00
Scott Lahteine
a26b57a36d Minor pins cleanup 2019-08-13 19:40:08 -05:00
Acenotass
059f575d93 Update Russian language (#14940) 2019-08-13 19:19:44 -05:00
Timothy Hoogland
a67830bf67 TH3D EZBoard is LPC1769 (#14936) 2019-08-13 00:03:42 -05:00
Tanguy Pruvot
03df3f4a88 Fix Python scripts unhandled quotes (#14926) 2019-08-12 19:50:34 -05:00
Tanguy Pruvot
c6be989fca Store EEPROM config in flash (#14923)
Avoid confusion between the 2 possible SDs...
2019-08-12 19:48:46 -05:00
Marcio Teixeira
13d8dc0b79 Fix incorrect print stat in ExtUI (#14881) 2019-08-10 19:25:30 -05:00
Marcio Teixeira
dc21e2e691 Increase XY nozzle offset range (#14882) 2019-08-10 19:24:41 -05:00
Marcio Teixeira
fa533846a7 Bury easter egg deeper (#14883) 2019-08-10 19:23:37 -05:00
Giuliano Zaro
af4bcb629a SAMD51 typo fix (#14885) 2019-08-10 19:22:48 -05:00
Ludy
d7172a4558 Cleanup and conditions (#14886) 2019-08-10 19:22:18 -05:00
Johnny Eshak
03dbe16ccc Compiling M43 on invalid conversion (#14897) 2019-08-10 19:20:40 -05:00
Giuliano Zaro
f085199f5b SAMD51: Some LCD pin fixes (#14915) 2019-08-10 19:19:52 -05:00
Giuliano Zaro
d78086ccdc SAMD51: Neopixel pin mapping (#14913) 2019-08-10 19:18:32 -05:00
Eric Ptak
9c5086e6af [STM32F1] Simpler Flash EEPROM (#14829) 2019-08-10 19:14:31 -05:00
Tanguy Pruvot
0745d48993 Fix build with and without TOUCH_BUTTONS (#14912) 2019-08-10 18:22:11 -05:00
thisiskeithb
e7aba49c49 Update PB5 to correct pin number (#14891) 2019-08-10 01:53:55 -05:00
thisiskeithb
5ea5d71258 Tevo Michelangelo config updates (#14895) 2019-08-10 01:52:26 -05:00
Tanguy Pruvot
5d2519ed50 Allow use of Fysetc SoftwareSerialM (#14893) 2019-08-10 01:45:36 -05:00
Robby Candra
d2d71caa3b Clean up Touch pins. Better up/down touch response. (#14900) 2019-08-10 01:42:52 -05:00
Tanguy Pruvot
8cc0b4bf5e Revert "Edit STEPS_PER_MM integer only" (#14909)
This reverts commit 2d98bb39bd.
2019-08-10 00:58:21 -05:00
Giuliano Zaro
3129fd06f0 SAMD51: Update LCD pins (#14907) 2019-08-10 00:56:55 -05:00
Ludy
9479ec32f7 Fix Service Menu compile error (#14903) 2019-08-10 00:53:26 -05:00
Giuliano Zaro
a7f1021265 Fix SPI_ENDSTOPS compile error (#14906) 2019-08-09 17:00:20 -05:00
Chris Pepper
2971b48a12 Use PlatformIO 4 default dir structure (#14879) 2019-08-08 08:29:33 -05:00
Scott Lahteine
9624c90cfb Remove HAL.h dependency in SoftwareSerial.h 2019-08-08 07:43:57 -05:00
Scott Lahteine
a6f682d860 [cron] Bump distribution date 2019-08-08 06:39:53 -05:00
Scott Lahteine
f3e4e6c68f Create FUNDING.yml 2019-08-08 06:07:11 -05:00
Scott Lahteine
f9f20bb454 Allow py scripts to handle spaces in paths (#14876) 2019-08-08 05:38:24 -05:00
Fourmi
eb3a3d249e Fix TouchMI probe movement (left side) (#14875) 2019-08-08 02:40:48 -05:00
Tanguy Pruvot
535018ef0e STM32F1: Dummy SoftwareSerial (as TMCStepper fallback) (#14861) 2019-08-08 02:25:52 -05:00
Ludy
528c9885f2 Fix wait_for_user + PAUSE_BEFORE_DEPLOY_STOW issue (#14831) 2019-08-08 01:52:20 -05:00
Scott Lahteine
c8e30b6639 Fix code attempting to sprintf %f (#14869)
Arduino doesn't (always) support `float` formatting in strings. So either cast to `int` or use `dtostrf()` to fix these usages.
2019-08-08 01:51:37 -05:00
Giuliano Zaro
3e5620283e AGCM4 debug option (#14838) 2019-08-07 00:45:00 -05:00
Tanguy Pruvot
92c35d14a4 Non-fatal error from ps::access_start (#14845) 2019-08-07 00:43:00 -05:00
Scott Lahteine
f13fbafe31 Tweak python string comparisons 2019-08-07 00:27:26 -05:00
Bob Kuhn
5873b0b032 [2.0.x] Autobuild formatting (#14857) 2019-08-06 23:33:07 -05:00
Tim Moore
77f637763c Overlord configs. Fix buzzer, redundant temp. (#14833) 2019-08-06 23:25:47 -05:00
Giuliano Zaro
535eeace5f Fix Bed, Chamber ADC condition (#14866) 2019-08-06 22:57:54 -05:00
Acenotass
3914bcfbb1 Russian correction (#14862) 2019-08-06 22:56:51 -05:00
InsanityAutomation
922b597f94 Fix Ender 3 chopper setting (24V) (#14851) 2019-08-06 22:56:04 -05:00
Tim Moore
0fa7d86918 Fix thermistor names (info menu) (#14860) 2019-08-06 22:54:18 -05:00
Tanguy Pruvot
eecfcd124d Finish STM32F4 SD-based settings storage (#14844) 2019-08-06 22:53:11 -05:00
Scott Lahteine
a0d782e46e STM32F7xx is gone 2019-08-06 04:58:58 -05:00
Scott Lahteine
fd9f067a48 Robin FSMC / SPI pins 2019-08-06 04:57:49 -05:00
Scott Lahteine
4268c1f1a5 Tweak U20 config 2019-08-06 04:57:49 -05:00
Scott Lahteine
579e4396e2 Reduce STM32_F4_F7 pin warnings 2019-08-06 04:57:15 -05:00
Scott Lahteine
fb579212ea Reduce unused function warnings 2019-08-06 04:56:17 -05:00
Scott Lahteine
1fe195926f Update configs with new sensorless options
Followup to #14044
2019-08-06 01:03:50 -05:00
Scott Lahteine
fc39c925ca Grace period followup 2019-08-05 22:00:49 -05:00
Scott Lahteine
a9c5d524bb Followup to MAX7219 / KILL_PIN patch
Co-Authored-By: Roxy-3D <roxy-3d@users.noreply.github.com>
2019-08-05 21:42:33 -05:00
Chris Pepper
f499cecf0d Marlin Binary Protocol Mark II (#14817) 2019-08-05 20:41:53 -05:00
Robby Candra
5bc2fb022c THERMAL_PROTECTION_GRACE_PERIOD is obsolete (#14798) 2019-08-05 20:33:15 -05:00
Jason Smith
534c105a7a Fix 16-bit range check in TMenuItem::action_edit (#14834) 2019-08-05 20:02:29 -05:00
Acenotass
4af9908764 Update M48 command in the status line (#14816) 2019-08-05 20:01:40 -05:00
Scott Lahteine
8f0aedeead Reorder some language defines 2019-08-05 19:12:00 -05:00
Roxy-3D
6fdb0bec07 Resolve Kill pin & Max7219 Clock conflict on TREX-2+ 2019-08-05 14:36:50 -05:00
teemuatlut
d4974ea719 TMC SPI Endstops and Improved Sensorless Homing (#14044) 2019-08-04 22:22:58 -05:00
Giuliano Zaro
d493cafc4a Fix a memset pointer cast (#14823) 2019-08-04 22:06:36 -05:00
Scott Lahteine
4e58f9387a Onboard SD for MKS Robin
In response to #9771
2019-08-04 21:17:45 -05:00
Scott Lahteine
2d98bb39bd Edit STEPS_PER_MM integer only 2019-08-04 19:39:52 -05:00
Tim Moore
e3660bca25 Overlord printer thermistor (#14815) 2019-08-03 20:57:56 -05:00
Scott Lahteine
ab792d004c More PlatformIO aliases 2019-08-03 20:27:47 -05:00
George Fu
f89eb8bf35 Fysetc Cheetah updates (#14800) 2019-08-03 18:12:35 -05:00
Tanguy Pruvot
4bd1e55093 STM32F1: Init EEPROM SPI pin modes (#14810) 2019-08-03 18:11:06 -05:00
Scott Lahteine
52a7a8cb26 Fix HOST_PROMPT_SUPPORT without LCD 2019-08-02 11:35:04 -05:00
Scott Lahteine
6285776943 Fewer Teensy 3.1/3.2 tests 2019-08-02 11:35:04 -05:00
Scott Lahteine
18c9182903 Match up write_data signatures 2019-08-02 11:09:07 -05:00
Scott Lahteine
2e27e3ba04 Patch up Teensy 3.1/3.2 pins, tests 2019-08-02 10:01:55 -05:00
Ludy
337361d588 Update German language, (c) (#14804) 2019-08-02 09:21:28 -05:00
Scott Lahteine
8119e511a1 Patch some (c) messages 2019-08-02 07:47:33 -05:00
yangwenxiong
6132cf900b STM32F4x SD-based settings storage (#14808) 2019-08-02 07:40:27 -05:00
Giuliano Zaro
21993b75f4 SAMD51 Servo class (#14781) 2019-08-02 07:37:41 -05:00
Tanguy Pruvot
8efa3455c2 STM32F1: Reduce binary by 2K by dropping full path asserts (#14807) 2019-08-02 07:28:38 -05:00
Scott Lahteine
e85eca2630 HAL cleanup, Teensy 3.1 platform 2019-08-02 07:22:26 -05:00
Tim Moore
940c59d9da Overlord i2c LCD with LEDs and buzzer (#14801) 2019-08-02 06:19:45 -05:00
Scott Lahteine
e1942715ce HAL_STM32F1_EEPROM_SIZE => HAL_EEPROM_SIZE 2019-08-02 06:18:36 -05:00
Scott Lahteine
ee5e46b46b Patch PrintJobRecovery::filename 2019-08-02 05:21:55 -05:00
Scott Lahteine
fd945d1070 More generic EEPROM data array name 2019-08-02 04:40:34 -05:00
Tanguy Pruvot
3334163e73 STM32F1: Align SD EEPROM data for SDIO (#14809) 2019-08-02 04:12:46 -05:00
Scott Lahteine
70ce4f5b36 Move job recovery filename 2019-08-02 02:24:15 -05:00
Scott Lahteine
9ac348ef7b SDPOWER => SDPOWER_PIN 2019-08-02 02:24:15 -05:00
Scott Lahteine
5e2582a31b Comment spacing 2019-08-02 02:24:15 -05:00
mekius
7682751646 Fix HOME_BACKOFF_MM type (#14805) 2019-08-01 20:32:45 -05:00
Robby Candra
96a1c6540e Use title case for menu items (#14806) 2019-08-01 20:31:58 -05:00
InsanityAutomation
f59a7e8b07 Print/display ABL current probe point (#14788) 2019-08-01 20:11:26 -05:00
Tim Moore
3765e67434 Dreammaker Overlord pins (#14791) 2019-07-31 21:15:36 -05:00
InsanityAutomation
6f8b8c394d Homing backoff per-axis / delta Z (#14789) 2019-07-31 20:50:23 -05:00
Benjamin Reed
0c035c0a7a Fix 'pause_menu_response' compile error (#14792) 2019-07-31 17:21:25 -05:00
Tanguy Pruvot
3db1a80b4c Update French language (#14787) 2019-07-31 17:10:14 -05:00
Scott Lahteine
f8b8cbfc53 Press the big red button on PlatformIO 4.0 2019-07-31 15:02:11 -05:00
Scott Lahteine
c2b319360d Remove extra pragmas 2019-07-30 20:19:47 -05:00
Tanguy Pruvot
202d3ab3c9 Define STM32F1 GPIO for the preprocessor (#14785) 2019-07-30 18:58:03 -05:00
Eric Ptak
fdbc733376 Return 'false' on EEPROM connection fail (#14776) 2019-07-30 17:43:45 -05:00
Robby Candra
128eed6b57 Option to reverse select direction/buttons (#14693) 2019-07-30 17:42:57 -05:00
Gustavo Alvarez
27952648cf Fix M122 column alignment (#14779) 2019-07-30 17:11:17 -05:00
Giuliano Zaro
eb08aeab7d Update Italian language (#14782) 2019-07-30 17:09:01 -05:00
pinchies
d98b9d54f1 JGAurora A5S & A1 touch support (#14768) 2019-07-30 17:08:11 -05:00
Scott Lahteine
c1b99c43b6 [cron] Bump distribution date 2019-07-30 05:07:39 -05:00
InsanityAutomation
0b154c2d71 Enable runout sensor in EEPROM by default (#14771) 2019-07-30 05:01:56 -05:00
Scott Lahteine
bc58e678bd More general FSMC display option 2019-07-30 04:25:55 -05:00
Scott Lahteine
c942ca130f More general TOUCH_BUTTONS comment 2019-07-30 04:22:27 -05:00
Scott Lahteine
e349b1c920 Bring some configs up to date 2019-07-30 04:22:27 -05:00
Acenotass
659d06d9b9 M48 menu item, result to status (#14772) 2019-07-30 02:31:14 -05:00
rafaljot
e44fccf3d2 Add support for M575 (#14757) 2019-07-30 02:30:00 -05:00
MarcelMo
f8aa52346f Configurable Z move distance (#14593) 2019-07-30 02:16:26 -05:00
Scott Lahteine
842466f4d9 Mixer patch, etc. 2019-07-29 22:20:28 -05:00
Scott Lahteine
1165c26ab4 Trailing whitespace 2019-07-29 19:46:54 -05:00
Scott Lahteine
eae543adf3 Apply HAS_SPI_LCD as needed 2019-07-29 18:55:05 -05:00
Scott Lahteine
8837cd3b53 [cron] Bump distribution date 2019-07-29 18:46:40 -05:00
Marcio Teixeira
eb7840dabb Match select item to encoder direction (#14673) 2019-07-29 00:02:42 -05:00
Scott Lahteine
e5d73f68c8 HAL folder organization (#14763) 2019-07-28 23:55:24 -05:00
Marcio Teixeira
eefe3f595a New options: Bootscreen as Info, game Easter-egg (#13829) 2019-07-28 22:47:20 -05:00
Scott Lahteine
180f9a4c22 Remove obsolete info menu includes 2019-07-28 20:20:33 -05:00
Ludy
c4bb458763 BUZZ cleanup (#14760) 2019-07-28 19:14:50 -05:00
Scott Lahteine
6b02b89ab4 Update serial sub-unit descriptions 2019-07-28 17:38:37 -05:00
mikeshub
1579091c20 PID loop improvements (#14746)
* Fix macro evaluation in `temperature.cpp`
* Improve bed PID, PID debug output
* Add min PID power define
2019-07-28 15:50:25 -05:00
thisiskeithb
e8e81d3609 Fix MKS Robin Lite pins include (#14755) 2019-07-28 14:56:05 -05:00
Giuliano Zaro
290466578f Adafruit Grand Central M4 (#14749) 2019-07-28 14:48:29 -05:00
Marcio Teixeira
fec52e61ea Use shared memory space for game data (#14727) 2019-07-28 01:44:16 -05:00
Scott Lahteine
17abb94532 Whitespace patch 2019-07-28 01:29:23 -05:00
Ludy
97e9c95f47 Fix & clean up ExtUI (#14748) 2019-07-27 22:44:05 -05:00
Eric Ptak
59e97e5e52 FYSETC Cheetah 1.2 (#14723) 2019-07-27 21:21:54 -05:00
InsanityAutomation
2351592abf Overridable TMC serial pins, update TMC2209 docs (#14751) 2019-07-27 20:34:22 -05:00
thisiskeithb
d74efd9d46 MKS Robin Lite/Lite2 Board Support (#14729) 2019-07-27 04:43:37 -05:00
Benjamin Reed
7084f3647a Flag to reduce Melzi binary size (#14730) 2019-07-27 04:36:22 -05:00
Marcio Teixeira
1c3df51f87 vsnprintf patch redux (#14725) 2019-07-27 04:34:49 -05:00
Bo Herrmannsen
bf610d87f7 Fix a bad MKS SGen-L pin (#14735) 2019-07-27 04:18:49 -05:00
Fourmi
d34364a086 Default TOUCH_MI_DEPLOY_XPOS to min X (#14736) 2019-07-26 21:57:13 -05:00
Ludy
ead6bb267d Add Z3 SanityCheck, revert early sanity change (#14717) 2019-07-24 22:32:49 -05:00
Scott Lahteine
a3dc1e461b Update M7219 comment, tweak parameter code 2019-07-24 21:09:51 -05:00
Chris Pepper
b6095fd084 Reduce default LPC176x ADC lowpass filtering 2019-07-25 00:40:51 +01:00
Scott Lahteine
1088846cae Cosmetic updates from 14044 2019-07-24 01:52:36 -05:00
Scott Lahteine
05f4033a34 Prevent a name conflict in u8g impl file 2019-07-24 01:01:03 -05:00
Marcio Teixeira
585a8a96b4 Fix extraneous redefine of vsnprintf_P in Marduino.h (#14712) 2019-07-23 17:18:53 -05:00
Giuliano Zaro
7085781c71 Include configs in serial.h (#14714) 2019-07-23 16:40:54 -05:00
Marcio Teixeira
369fb2806d Fix compilation warnings, errors (#14704) 2019-07-22 20:08:54 -05:00
Scott Lahteine
a589456a14 Tweak mark/range/quantity conditions 2019-07-22 07:16:42 -05:00
Scott Lahteine
601b2d9f51 Send slightly less data to Max7219 2019-07-22 07:16:42 -05:00
Scott Lahteine
79f49040f1 Patch some Max7219 comments 2019-07-22 07:14:07 -05:00
Eric Ptak
a6bec53905 Fix FYSETC stm32flash usage (#14703) 2019-07-22 05:33:34 -05:00
Scott Lahteine
5c3ec6306f Max7219 side-by-side arrangement (#14702) 2019-07-22 05:22:21 -05:00
Scott Lahteine
a7c41d28af Max7219 non-functional tweaks 2019-07-22 04:24:16 -05:00
Giuliano Zaro
1005f225f3 Remove unused defines, fix typo (#14699) 2019-07-21 21:44:03 -05:00
mikeshub
d9303b2137 Fix MAX6675_SEPARATE_SPI boot loop (#14698) 2019-07-21 21:36:00 -05:00
Scott Lahteine
f96d2a5b4a Update pins_STEVAL.h 2019-07-21 21:25:14 -05:00
Tanguy Pruvot
dca0c3d02a Fix SPI comments, clean up U20 pins (#14700) 2019-07-21 20:23:41 -05:00
Scott Lahteine
7501e40e0b APB comment correction 2019-07-21 20:13:36 -05:00
InsanityAutomation
dc6fa04f68 Fix single nozzle temp change, do slower extra prime (#14696) 2019-07-21 19:33:37 -05:00
Tim Moore
e5aa453293 Add support for 2 Neopixel strips (#14667) 2019-07-20 23:14:09 -05:00
Scott Lahteine
6899ed2026 Update some platform includes 2019-07-20 22:20:09 -05:00
BigTreeTech
a38b9da672 STM32F1 SPI1 bugfix (#14679) 2019-07-20 20:35:41 -05:00
reloxx13
5b2fd3ad86 Add Discord link to issue template (#14690) 2019-07-20 17:22:33 -05:00
Scott Lahteine
93adb7e944 Some comment patches 2019-07-20 16:46:59 -05:00
InsanityAutomation
9cd66f6f77 Fix missing include & condition (#14682) 2019-07-20 01:55:34 -05:00
Tanguy Pruvot
977cfa4494 Fix a few recent (STM32F1 DOGM, SPI) warnings (#14669) 2019-07-20 01:54:01 -05:00
Ludy
39e1726498 Comments, includes (#14671) 2019-07-20 01:41:34 -05:00
Ludy
b714cfd4f0 MKS GEN v1.3/1.4 undef STAT_LED_*_PIN (#14644) 2019-07-19 06:12:57 -05:00
wookie666
00e2f6da8f Improve magnetic dock switching toolhead (#14663) 2019-07-19 06:07:26 -05:00
Robby Candra
71d8c6f742 Fix LCD sanity check (#14678) 2019-07-19 05:53:36 -05:00
Jamie
a80b1e6d5f Fix broken Flattr link (#14677) 2019-07-19 00:09:32 -05:00
Scott Lahteine
fd2bc3a212 [cron] Bump distribution date 2019-07-19 00:00:09 -05:00
Scott Lahteine
4cc83b6330 Allow THERMAL_PROTECTION_GRACE_PERIOD override
Co-Authored-By: MarcelMo <marcelmo@users.noreply.github.com>
2019-07-18 23:38:03 -05:00
Tanguy Pruvot
f0be92259b PIO env, Travis test for STM32F407VE (#14674) 2019-07-18 22:38:03 -05:00
Scott Lahteine
1ea9a36d11 FYSETC BLTouch config and more (#14668) 2019-07-18 05:54:50 -05:00
Scott Lahteine
92e513e76e Trailing whitespace 2019-07-18 05:51:36 -05:00
Msq001
6920b7fe91 BigTreeTech SKR E3 DIP (#14638) 2019-07-18 05:43:49 -05:00
Karl Andersson
d472934a70 FYSETC Mini 12864 for HAL_STM32 (#14639) 2019-07-18 05:42:16 -05:00
Scott Lahteine
ec13aa0dc1 Misc. whitespace 2019-07-18 05:13:55 -05:00
Scott Lahteine
3d153486da Fysetc rename Part 2 2019-07-18 04:36:08 -05:00
Scott Lahteine
5c15f6f64b Fysetc rename Part 1 2019-07-18 04:34:58 -05:00
Scott Lahteine
68108789d0 Add'l toolchange syncs 2019-07-18 02:44:21 -05:00
Scott Lahteine
fac0e63058 Clean up tool-change syncs (#14666) 2019-07-18 02:17:46 -05:00
Scott Lahteine
42b5ccafc9 Toss obsolete DEBUG_LEVELING_FEATURE tests 2019-07-17 20:26:48 -05:00
Marcio Teixeira
ca4d6f4470 Fix compile error (bad return type) (#14660) 2019-07-17 19:49:26 -05:00
thisiskeithb
522df57a45 Tevo Michelangelo configuration (#14577) 2019-07-17 19:47:14 -05:00
Robby Candra
c9aa68ef7a Encoder direction: Wrangle, Revert select screen change (#14628) 2019-07-17 19:41:15 -05:00
Chris Pepper
9e19f004d0 Update Travis to Ubuntu "Bionic" (#14664) 2019-07-17 19:12:40 -05:00
Marcio Teixeira
839255eed4 Fix for M504 changing filament runout value (#14661)
Fixes #14476
2019-07-17 19:11:45 -05:00
Scott Lahteine
305f277843 Drop old includes in serial.h 2019-07-17 05:49:20 -05:00
thisiskeithb
523feeee3c Tevo Tornado configuration (#14576) 2019-07-17 04:54:59 -05:00
Tanguy Pruvot
9dfa5ba3a5 XPT2046: Handle MKS touchscreen w/out PenIRQ pin (#14640) 2019-07-17 04:41:10 -05:00
Jason Smith
f2c5740d06 Add 'E' argument to G34 to allow stowing between probes (#14533)
- Use the return value from probe_pt during `G34`
  Eliminate the assumption that probe_pt leaves current_position set to values relative to the probed points. This is not always true, depending on the raise_after argument.
- Add '`E`' argument to `G34` command allowing stowing between each probe.
2019-07-17 04:23:19 -05:00
Robby Candra
2c5436e315 Fix HOST_PROMPT_SUPPORT include in ExtUI API (#14650) 2019-07-17 04:23:19 -05:00
InsanityAutomation
b8cc61262f Finish G12, update Nozzle::clean (#14642) 2019-07-17 04:23:19 -05:00
Marcio Teixeira
57ed063ba1 Fix unused variable warnings (#14643) 2019-07-17 03:16:10 -05:00
Scott Lahteine
06324df072 Apply some #ifndef 2019-07-17 03:14:44 -05:00
Marcio Teixeira
27c487bab7 Print progress enhancements (#14647) 2019-07-17 03:14:44 -05:00
Robby Candra
ebb1a7dc1f Fix EXT_UI example onFilamentChange Parameter (#14649) 2019-07-17 03:05:23 -05:00
Scott Lahteine
5ccf8c2c33 Fix serial.h indents 2019-07-17 02:03:25 -05:00
Scott Lahteine
ef2a2eb984 Temp tweak 2019-07-17 02:03:25 -05:00
Ludy
abc9b52692 Update copyright in header, etc. (#14645) 2019-07-16 22:42:36 -05:00
Scott Lahteine
5535a047d7 [cron] Bump distribution date 2019-07-16 00:00:08 -05:00
Tanguy Pruvot
bae8d0a4bd DOGM: Avoid white flash on TFT (re)init (#14631)
- Avoid white flash on TFT (re)init. Unlike Graphical LCD, the TFT init color may be full white if the backlight is on during init.

- Add a conditional for delayed backlight init which can be applied to any backlit display.
2019-07-15 17:36:16 -05:00
thisiskeithb
02859eb2b1 Remove Ender-3 README.md (#14632) 2019-07-15 17:19:19 -05:00
thisiskeithb
3d75490b6e Set correct Ender-5 bed size (#14633) 2019-07-15 17:18:27 -05:00
Scott Lahteine
93bc1b17f9 [cron] Bump distribution date 2019-07-15 00:00:08 -05:00
Simon Jouet
f0de56a797 ESP32 HAL - Dynamic ADC attenuation (#14623) 2019-07-14 23:32:48 -05:00
Tanguy Pruvot
81d629bc47 Robin & Longer3D SPI TFT driver (#14595) 2019-07-14 18:16:26 -05:00
Tanguy Pruvot
45bde333d5 Initial Longer3D LK1/2 (Alfawise U20/U20+/U30) support (#14597) 2019-07-14 18:05:24 -05:00
Jeonghwan Noh
475ccfad62 Oscar (by Thinknthings of Korea) board support (#14574) 2019-07-14 15:36:03 -05:00
Scott Lahteine
fdaa374490 Clean up pins self-checks 2019-07-14 15:34:14 -05:00
Scott Lahteine
77b4f23edc Update pins comments 2019-07-14 15:19:22 -05:00
Scott Lahteine
1204f2fca8 Fix some config spacing 2019-07-14 13:11:41 -05:00
Scott Lahteine
d4be970c8b Update DOGLCD conditions 2019-07-14 13:10:13 -05:00
Scott Lahteine
39a5e3ca6e mftest: Fix multi-line commands 2019-07-14 13:09:16 -05:00
Scott Lahteine
74e1573b14 Update megaatmega2560-tests 2019-07-14 13:09:16 -05:00
Scott Lahteine
2d84bcb4cd Simplify, update LCD sanity-check 2019-07-14 13:09:16 -05:00
Scott Lahteine
eaf1c0954e Update some precompiler tests 2019-07-14 13:09:16 -05:00
InsanityAutomation
ce02c6cee2 Variable tool change purge (#14618) 2019-07-14 11:40:58 -05:00
Marcio Teixeira
cbe4bf2ba8 Fix process_injected_command undefined behavior (#14602) 2019-07-14 10:12:48 -05:00
Ringel
e139c1d9d9 Fix ESP32 i2s stream, add PWM to extended pins (#14592) 2019-07-14 10:08:14 -05:00
Msq001
21e1148d98 Remove upload_protocol "cmsis-dap" (#14606) 2019-07-14 09:43:38 -05:00
Marcio Teixeira
a49478cefa Fix STATUS_MESSAGE_SCROLLING in LIGHTWEIGHT_UI (#14603) 2019-07-14 09:39:03 -05:00
thisiskeithb
bcbd2ff21c Fix Ender-5 Z axis settings (#14605) 2019-07-14 09:32:43 -05:00
InsanityAutomation
d2f20803ba Allow nozzle clean with limited Axis (#14619) 2019-07-14 06:58:53 -05:00
Ludy
6dcb85927a Update German language, &c. (#14613) 2019-07-14 04:34:55 -05:00
Robby Candra
e96468566d Fix Z_PROBE_END_SCRIPT in ABL (#14621) 2019-07-14 04:28:38 -05:00
Scott Lahteine
a85cd042d8 [cron] Bump distribution date 2019-07-14 00:00:09 -05:00
Scott Lahteine
91bb0f5439 [cron] Bump distribution date 2019-07-13 00:00:09 -05:00
Scott Lahteine
b2b7c583eb Pins cleanup 2019-07-12 23:07:52 -05:00
Karl Andersson
82cafc9b19 pins_ARMED overrides STM32 defines (#14587) 2019-07-12 06:06:04 -05:00
Giuliano Zaro
65a2903aab Upgrade Travis CI to Python 3.7 (#14588) 2019-07-12 05:59:14 -05:00
Scott Lahteine
d3add3c34f Init servo macro, j/b 2019-07-12 04:53:50 -05:00
InsanityAutomation
f1eaed7e98 Only init servo pins used for servos (#14589) 2019-07-12 04:30:15 -05:00
scotthsl
19b24a349c Fix M412 without HOST_ACTION_COMMANDS (#14591) 2019-07-12 04:23:33 -05:00
Giuliano Zaro
4a5f135c5d PIO 4 strict parser fix (1 => chain) (#14586) 2019-07-12 04:20:34 -05:00
Scott Lahteine
89964ec30d [cron] Bump distribution date 2019-07-12 00:00:08 -05:00
Giuliano Zaro
cd36809c06 Fix STM32F7 compile error (#14583) 2019-07-11 15:23:53 -05:00
Scott Lahteine
3cd9a92dcc Use REVERSE_ENCODER_DIRECTION in do_select_screen 2019-07-11 15:17:26 -05:00
Scott Lahteine
80c6f98d2f Fix nested _draw_chamber_status
Co-Authored-By: alexscarbro <alexscarbro@users.noreply.github.com>
2019-07-11 14:51:26 -05:00
Scott Lahteine
b0d8ba3894 Fix ANIM_CHAMBER
Co-Authored-By: alexscarbro <alexscarbro@users.noreply.github.com>
2019-07-11 14:36:02 -05:00
Ludy
70586d3a6c Update (c) comments (#14584) 2019-07-11 13:48:15 -05:00
Pavel4e5
8babf55b18 Init ADC keypad analog input (#14585) 2019-07-11 13:47:41 -05:00
Scott Lahteine
948c3f580b Clean up some LCD conditions 2019-07-11 06:11:19 -05:00
Scott Lahteine
3218c4b33f Shorten some config descriptions 2019-07-11 05:45:27 -05:00
Scott Lahteine
179095c387 Pins cleanup 2019-07-11 05:29:24 -05:00
thisiskeithb
42be684e69 Wanhao Duplicator i3 Mini support (#14559) 2019-07-11 04:36:51 -05:00
Scott Lahteine
340d827dc1 Fix mega/ subfolder pins
Followup to #14573
2019-07-11 02:59:02 -05:00
Scott Lahteine
7de605c5c3 Move pins files to subfolders #14573 2019-07-11 02:32:24 -05:00
Scott Lahteine
e5a5273edb [cron] Bump distribution date 2019-07-11 00:00:10 -05:00
Scott Lahteine
98c6c6f1aa Combine STM32F4 and STM32F7 (#14566)
* Serial assert (needs work)

* Bring STM32F4/F7 together

* Tweaks to STM32 headers

* More general 'stm32_timer_t'

* Move vsnprintf_P to Marduino.h
2019-07-10 22:05:34 -05:00
Giuliano Zaro
caa87d5fe1 SD2Card cleanup (#14571) 2019-07-10 22:04:16 -05:00
Scott Lahteine
ad1c061e7b Bring STM32F4/F7 together 2019-07-10 07:07:04 -05:00
Scott Lahteine
4e479caf61 Fix mis-use of LIMIT 2019-07-10 07:07:04 -05:00
Scott Lahteine
cf9ac4c847 Move vsnprintf_P to Marduino.h 2019-07-10 07:07:04 -05:00
Scott Lahteine
f7de453da8 More general 'stm32_timer_t' 2019-07-10 07:07:04 -05:00
Scott Lahteine
828cc71847 Tweaks to STM32 headers 2019-07-10 07:07:04 -05:00
Scott Lahteine
94f2e82897 Serial assert (needs work) 2019-07-10 07:07:04 -05:00
Tanguy Pruvot
881e5a48bc Fix M43 warning, XL density timers (#14555) 2019-07-10 06:30:57 -05:00
Scott Lahteine
d4c210f21b Fix and improve mftest 2019-07-10 05:56:01 -05:00
Scott Lahteine
44c8f29e47 More board name cleanup 2019-07-10 05:54:15 -05:00
Scott Lahteine
ed0e6afacb Apply LIMIT macro 2019-07-10 03:35:39 -05:00
Scott Lahteine
9817976375 [cron] Bump distribution date 2019-07-10 00:00:08 -05:00
Ludy
a7bb1fc322 Fix Dual X,Y,Z UART pins in relation to TMC2208/9 (#14554) 2019-07-09 22:52:48 -05:00
Scott Lahteine
f990ebfb09 Tweak STM32F4/7 eeprom emulation (#14563) 2019-07-09 22:49:58 -05:00
Scott Lahteine
056efaba91 Clean up section comments 2019-07-09 22:34:21 -05:00
Scott Lahteine
a23021b823 Add 'mfhelp' script
Not all scripts answer --help yet. This will be added to 'mfinfo' soon.
2019-07-09 21:40:20 -05:00
Scott Lahteine
5519054f50 Improve BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE (#13740) 2019-07-09 21:35:07 -05:00
Scott Lahteine
3ae3bf5d33 Get E2END from pins, fix Linux buffer 2019-07-09 21:32:13 -05:00
Scott Lahteine
01e8813286 EEPROM_EMULATED_WITH_SRAM => SRAM_EEPROM_EMULATION 2019-07-09 21:31:33 -05:00
Scott Lahteine
cb60001784 Clean up BOARD_NAME in pins 2019-07-09 21:31:06 -05:00
Scott Lahteine
c0e917ea83 DUE/usb should use platform min/max 2019-07-09 19:31:07 -05:00
gmarsh
ab99a80793 GMARSH X6 board support (#14550) 2019-07-09 00:30:08 -05:00
Scott Lahteine
84d0bc5c17 OLED LCD section 2019-07-08 23:58:04 -05:00
Scott Lahteine
a2ba0aaaac HAL include and other adjustments (#14525) 2019-07-08 23:42:29 -05:00
Emilio Moretti
be37c38aa2 Fix Ender-2 LCD contrast
Changed the default to overcome the changes in:
5018fdacbe
This commit exposed a bug because the Ender-2 was using a MINIPANEL lcd
and getting default values that were too low, so the text was too weak.
However, the panel should be MKS_MINI_12864, since it
explicitly sets the correct contrast without relying in the defaults.
2019-07-08 23:14:04 -05:00
Ludy
ba22857f93 Allow override of TMC_SW_* pins, etc. 2019-07-08 23:13:28 -05:00
Scott Lahteine
1a349c7522 Add HAS_TMC220x 2019-07-08 23:07:42 -05:00
Scott Lahteine
9821ec2afd Fix SKR Pro pins, STM32F1/4 sanity-check
Co-Authored-By: Msq001 <msq001@users.noreply.github.com>
2019-07-08 23:07:42 -05:00
Scott Lahteine
96d52649b8 mftest: Apply test changes and optionally build 2019-07-08 22:50:33 -05:00
Scott Lahteine
2b1c2a0db9 [cron] Bump distribution date 2019-07-08 00:00:11 -05:00
Tim Moore
8b81c0e88f LEDs to default on print completion (#14535) 2019-07-07 07:17:08 -05:00
Scott Lahteine
e7307af42d [cron] Bump distribution date 2019-07-07 00:09:53 -05:00
Msq001
439e28783b BigTree SKR Pro V1.1 board support (#14523) 2019-07-06 21:52:17 -05:00
Ludy
3a75342508 Allow override of TMC_SW_* pins (#14528) 2019-07-06 21:25:48 -05:00
igorepi
c1bb3278d4 Fix Russian grammar (#14527) 2019-07-06 21:24:57 -05:00
Ludy
c0497234b9 SanityCheck Biqu SKR 1.1 => BigTree SKR 1.1 (#14526) 2019-07-06 21:24:10 -05:00
Roxy-3D
cdf4ed87a1 Add back required precision for off printer mesh saves 2019-07-06 21:01:56 -05:00
Scott Lahteine
8916acf083 [cron] Bump distribution date 2019-07-06 00:00:09 -05:00
Tanguy Pruvot
8873c583d3 Prevent extra settings.load on boot (#14499) 2019-07-05 22:25:59 -05:00
Bob Kuhn
dc02d0720d Pins Debugging for STM32 — NEEDS TESTING (#14309) 2019-07-05 22:08:06 -05:00
Tanguy Pruvot
052aa23efe STM32F1: ignore output check for analogWrite() (#14498) 2019-07-05 21:13:32 -05:00
Alexander Amelkin
7a42132002 GTM32 Pro pins updates (#14505) 2019-07-05 21:09:17 -05:00
thisiskeithb
10a71e332d Biqu SKR 1.1 => BigTree SKR 1.1 (#14514) 2019-07-05 20:57:08 -05:00
Vanessa Dannenberg
4fa8053638 RPW-Ultra thermistor table (#14517) 2019-07-05 20:37:05 -05:00
Ludy
a210f80adc Sanity-check for CASE_LIGHT_PIN (#14518) 2019-07-05 20:18:43 -05:00
Scott Lahteine
253d0f9671 Some MIN/MAX rely on core 2019-07-05 20:07:48 -05:00
Scott Lahteine
535b70057e Oops. Don't undef MIN/MAX 2019-07-05 18:42:21 -05:00
Scott Lahteine
021c4ccf5f Fix SpindleLaser class
Fix #14465
2019-07-05 18:39:40 -05:00
Scott Lahteine
fe02241044 NONE on combined options 2019-07-05 18:20:24 -05:00
Scott Lahteine
67e0238c89 Reduce type warnings 2019-07-05 18:20:24 -05:00
Scott Lahteine
750a16ad38 Fix MIN/MAX function collision with macros 2019-07-05 18:14:02 -05:00
Scott Lahteine
b6546ea33a Add include guards to some headers 2019-07-05 04:02:08 -05:00
Scott Lahteine
8ff49d6b46 [cron] Bump distribution date 2019-07-05 03:48:50 -05:00
Scott Lahteine
f69e02ef04 Update generate_version 2019-07-05 03:45:49 -05:00
Tanguy Pruvot
31450d9d6b M43: spi channels are not pins (#14502) 2019-07-05 02:03:01 -05:00
Roman Moravčík
9736a21de2 Update Slovak language (#14503) 2019-07-05 02:02:20 -05:00
Giuliano Zaro
2bf11da5ab Fix pin based on SOFT_SPI_CS (#14504) 2019-07-05 02:01:52 -05:00
Giuliano Zaro
66e16af29d SPI defines cleanup (#14506) 2019-07-05 01:59:37 -05:00
Tim Moore
eb6dec03bd Simplify power supply naming logic (#14488)
Co-Authored-By: Tim Moore <tim.moore@lightbend.com>
Co-Authored-By: AnHardt <github@kitelab.de>
2019-07-05 01:58:34 -05:00
Scott Lahteine
44e4f853c8 Patch M_PI in Marduino.h 2019-07-04 19:58:08 -05:00
Scott Lahteine
c6e6365e15 [cron] Bump distribution date 2019-07-04 15:56:02 -05:00
Roxy-3D
41b7f16ab8 Fix grammar of comment for G29 T command 2019-07-03 19:26:43 -05:00
Scott Lahteine
ec4bfb0054 Fix LPC1768-tests labels 2019-07-03 19:11:59 -05:00
Scott Lahteine
de462f2b8a Revert "Sort out settings.load with SD EEPROM emulation (#14458)"
This reverts commit 108d0df565.
2019-07-03 19:11:30 -05:00
Giuliano Zaro
b7573c6e69 Remove unused WRITE_VAR, etc. (#14493) 2019-07-03 17:52:30 -05:00
GMagician
8be146642f Unused SPI PIN definitions 2019-07-03 17:49:55 -05:00
Scott Lahteine
6a2a10a154 Bump distribution date 2019-07-03 03:11:12 -05:00
Scott Lahteine
371969b531 Remove deprecated SCARA option 2019-07-03 02:43:33 -05:00
Scott Lahteine
ae9232962e Use heater index defines 2019-07-02 23:29:43 -05:00
Scott Lahteine
f7eeae8424 Indent a line 2019-07-02 21:34:40 -05:00
teemuatlut
8aad29fb6e Fix Prusa chopper timing preset 2019-07-02 20:51:33 -05:00
Scott Lahteine
1620738701 Home dir use < or > 2019-07-02 20:51:33 -05:00
Scott Lahteine
0f79fb9821 Generic stop pins (presume one endstop per axis end) 2019-07-02 20:30:26 -05:00
Scott Lahteine
ce2b4bc20c Conditionals tweak 2019-07-02 20:30:26 -05:00
Ludy
3358caed14 Update German/Italian language (#14482) 2019-07-02 19:25:20 -05:00
Scott Lahteine
720bc7c00b Named indices for Temperature class (#14479) 2019-07-02 08:39:55 -05:00
Scott Lahteine
274809aced Bump distribution date 2019-07-02 05:54:06 -05:00
Scott Lahteine
ff55088491 Fix Malyan LCD warnings 2019-07-02 04:36:02 -05:00
Scott Lahteine
d4415dcf59 Fix analogWrite ambiguity 2019-07-02 04:36:02 -05:00
thisiskeithb
d6265df962 115K baud for Ender-3 and -5 (#14471) 2019-07-02 03:14:01 -05:00
thisiskeithb
c6f74ba887 TH3D EZBoard v1.0 (#14473) 2019-07-02 03:12:32 -05:00
Marcio Teixeira
16409eb233 Suppress more UNUSED warnings (#14466) 2019-07-01 20:42:38 -05:00
GMagician
82ecaa767e Remove unused code in M100
queue.buffer is in bss area, start_free_memory starts from heap then above of bss
2019-07-01 20:38:49 -05:00
GMagician
54358fbe28 Update Italian language 2019-07-01 20:37:59 -05:00
Scott Lahteine
c28e08c849 Fix mintemp/maxtemp monitoring for thermocouples 2019-07-01 10:24:53 -05:00
Scott Lahteine
de8fee6aea Clarify ExtUI command injection 2019-07-01 09:23:00 -05:00
Scott Lahteine
448d482d3c Update motherboard numbering (#14460) 2019-07-01 09:10:55 -05:00
Tanguy Pruvot
108d0df565 Sort out settings.load with SD EEPROM emulation (#14458) 2019-07-01 09:10:17 -05:00
Scott Lahteine
18e396b102 Update motherboard numbering 2019-07-01 07:06:38 -05:00
Msq001
c9be936d4a BigTreeTech SKR Mini E3 (#14457) 2019-07-01 07:06:25 -05:00
Aliaksei Kvitsinski
2f932a11b3 Park heads with electromagnet (#14023) 2019-07-01 05:55:23 -05:00
Scott Lahteine
fb9d30673f platformio.ini compatible with PIO 3.x 2019-07-01 05:40:15 -05:00
Tanguy Pruvot
ca7f56e60b Add 0.025mm Manual Move for Z (#14456) 2019-07-01 03:17:50 -05:00
Scott Lahteine
56c4a96180 Bump distribution date 2019-07-01 01:21:31 -05:00
thisiskeithb
4b9f6d531b Add links to Junction Deviation heading (#14272) 2019-07-01 01:17:53 -05:00
Scott Lahteine
ced30b1054 Update ExtUI sanity checks 2019-07-01 00:50:22 -05:00
Scott Lahteine
10b85be405 status_message_level => alert_level 2019-07-01 00:47:08 -05:00
Tanguy Pruvot
24655a6bf3 Touch-MI Menu and Manual Deploy option (#14290) 2019-06-30 23:55:27 -05:00
Ludy
dab2f0c89c Mask unused var, update (c) comments (#14455) 2019-06-30 22:29:33 -05:00
Ludy
0ca64a0ea3 Fix compile error with Z_PROBE_END_SCRIPT (#14447) 2019-06-29 23:20:49 -05:00
Scott Lahteine
d16954dc88 Make KEEPALIVE_STATE a scoped auto-restore (#14446) 2019-06-29 22:49:50 -05:00
Tanguy Pruvot
19aafb9050 Fix STM32F1 motor shocks (stepper timer issue) (#14030) 2019-06-29 04:39:38 -05:00
Scott Lahteine
6550a222aa env_default => default_envs 2019-06-29 04:04:25 -05:00
Scott Lahteine
3ea073ace6 Slight reduction in serial.h file size 2019-06-29 04:04:25 -05:00
thisiskeithb
6978bb5ea5 Fix MKS Robin Nano FAN_PIN (#14444) 2019-06-29 02:11:26 -05:00
m0oml
688c53220d Creality3D CR-20 configurations (#14262) 2019-06-29 02:06:22 -05:00
th33xitus
fe2c710b39 Fix for Arduino Due + 12864 Full Graphic Display (#14181) 2019-06-29 01:37:02 -05:00
Phr3d13
34c8204d25 STM32F1 SD EEPROM Emulation Fixes (#14261) 2019-06-29 01:34:54 -05:00
Marcio Teixeira
e6cf7860e8 Improve ExtUI, fix compiler errors, warnings (#14441) 2019-06-29 00:23:57 -05:00
Scott Lahteine
14fb683682 Update examples 2019-06-29 00:14:27 -05:00
Scott Lahteine
e89a47c8b5 Bump distribution date 2019-06-29 00:13:59 -05:00
Scott Lahteine
b615b492ba Update some HAL comments 2019-06-28 23:10:40 -05:00
Scott Lahteine
f39d025a80 Update default/Configuration_adv.h 2019-06-28 23:10:12 -05:00
Scott Lahteine
49027721e9 Clean up some pinsDebug headers 2019-06-28 22:50:56 -05:00
thisiskeithb
7f05f5e002 Creality3D Ender-5 configuration (#14416) 2019-06-28 22:17:05 -05:00
Scott Lahteine
c9a8db33c3 Fix scaledFanSpeed 2019-06-28 21:24:47 -05:00
Darsey Litzenberger
946f6bdeaa Disable leveling during G12 (#14385) 2019-06-28 19:23:42 -05:00
Scott Lahteine
b3f42d2519 Update SD host config comment 2019-06-28 19:13:27 -05:00
Scott Lahteine
872e172bcd Remove bootscreen timeouts matching default 2019-06-28 19:13:27 -05:00
Roman Moravčík
77c67085bf Update Slovak language (#14433) 2019-06-28 18:57:43 -05:00
Giuliano Zaro
9174aa376f Update Italian language (#14440) 2019-06-28 18:56:10 -05:00
Giuliano Zaro
07c998afe5 Fix E2END on RURAMPS (#14438) 2019-06-28 18:55:17 -05:00
Giuliano Zaro
a9445d557e Remove extra #if (#14439) 2019-06-28 18:54:22 -05:00
Scott Lahteine
4d5a1984e2 Simplified fan handling code 2019-06-28 18:50:32 -05:00
Scott Lahteine
a8d68b7c8a Common method for scaled fan speed 2019-06-28 15:34:17 -05:00
Scott Lahteine
1a09c4dea5 Cutter class followup 2019-06-28 15:34:17 -05:00
Scott Lahteine
9da02d2114 Help syntax highlighting (Sublime, et. al.) 2019-06-28 15:04:17 -05:00
Martin
ae9afb333e Remove fwretract planner.synchronize calls (#14432) 2019-06-28 13:33:47 -05:00
Scott Lahteine
93cd66ac11 Tweaky change from (C) to (c) 2019-06-27 23:58:16 -05:00
Scott Lahteine
d7d80418ae Singleton for cutting tools (#14429) 2019-06-27 23:06:49 -05:00
Scott Lahteine
2fde1475cb Allow SD card sharing on SKR Mini 2019-06-27 22:30:13 -05:00
Scott Lahteine
7e16835c83 Use LCD conditionals in pins files (#14428) 2019-06-27 22:14:43 -05:00
thisiskeithb
8b63e3701f MKS Robin Nano board support (#14363) 2019-06-27 21:33:41 -05:00
Tim Moore
81209f5310 'M105 R' to report redundant temp sensor (#14324) 2019-06-27 21:29:52 -05:00
InsanityAutomation
39c0c2aebe Add TMCStepper libs to lib_ignore for Melzi (#14322) 2019-06-27 16:57:38 -05:00
Scott Lahteine
6664b90bbb Init servo pins in HAL_init (#14425) 2019-06-27 16:29:17 -05:00
Tim Moore
8ce84fa44f Add temperature-based auto power options (#14397) 2019-06-27 16:28:07 -05:00
Scott Lahteine
00cc1079af Add missing chamber auto fan options 2019-06-27 16:05:47 -05:00
InsanityAutomation
ce656e2a26 Update G-code injection, sub-commands (#14418) 2019-06-27 15:07:45 -05:00
Scott Lahteine
decfe3424f Helper script updates 2019-06-27 13:23:55 -05:00
InsanityAutomation
b961251899 Add Z_PROBE_END_SCRIPT to UBL (#14419) 2019-06-27 13:00:55 -05:00
Scott Lahteine
2580104c8b Revert recent probe changes
- Revert "Fix FIX_MOUNTED_PROBE compile error (#14393)"
- Revert "Fix G28 with non-BLTouch probes (#14381)"
- Revert "Fix BLTOUCH deploy/stow in HS mode (#14352)"
- Revert "Apply needed BLTouch patch (#14233)"

Co-Authored-By: AnHardt <github@kitelab.de>
2019-06-26 05:33:43 -05:00
thisiskeithb
cd302f9464 Add MKS SGen-L Board (#14411) 2019-06-26 04:17:06 -05:00
Andy Shaw
064177154c Update SD card connection / sharing options (#14325) 2019-06-26 03:55:57 -05:00
BigIronGuru
9f136a7c67 Low-priority homing in G34 (#14391) 2019-06-26 03:52:01 -05:00
Scott Lahteine
49627069a5 Shorthand for home-after-deactivate 2019-06-26 03:47:55 -05:00
J.C. Nelson
30a3db4f22 Fix Malyan M200 config and protocol (#14394) 2019-06-26 03:35:52 -05:00
oechslein
8c55bd5451 Update "StallGuard threshold" heading (#14395) 2019-06-26 03:33:07 -05:00
Scott Lahteine
98f3a3d5c3 Bump distribution date 2019-06-26 03:15:31 -05:00
Msq001
e3846ec7a1 SKR mini can use 128x64 LCD (#14388) 2019-06-26 01:12:41 -05:00
Eric Ptak
8934b32f1b Fysetc AIO II / Cheetah STM32F1 (#14407) 2019-06-26 00:40:29 -05:00
Marcio Teixeira
8e23e9b16c Fix FIX_MOUNTED_PROBE compile error (#14393) 2019-06-25 04:55:29 -05:00
Tanguy Pruvot
07dac315a9 Up-to-date STM32F1 README (#14386) 2019-06-24 03:44:26 -05:00
thisiskeithb
a4aa3621c0 MKS Robin Mini Board Support (#14366) 2019-06-24 03:42:22 -05:00
Scott Lahteine
cf762d2c73 Fix enqueueing bug 2019-06-23 23:02:07 -05:00
BigIronGuru
12d21e642f Update G34 for non-BLTouch probes (#14380) 2019-06-23 20:55:43 -05:00
BigIronGuru
5986194c36 Fix G28 with non-BLTouch probes (#14381) 2019-06-23 20:53:05 -05:00
InsanityAutomation
aa0383a83b Enhance IDEX toolchange auto-return w/ no park, full control (#14117) 2019-06-23 20:00:48 -05:00
Scott Lahteine
3d9d72e8db Include order, spacing, etc. 2019-06-23 04:02:52 -05:00
mikeshub
1b1a4677f5 Fix LCD.h compilation error (#14377) 2019-06-22 21:08:30 -05:00
sjasonsmith
07b41a8c3f Include SOLENOID_PROBE in leveling report (#14344) 2019-06-22 17:54:37 -05:00
thisiskeithb
71b2700c3c Anycubic Trigorilla 1.4 Rev. 1.1 (#14357) 2019-06-22 17:53:45 -05:00
BigIronGuru
f5afaaef5b Fix probe.cpp warning (#14367) 2019-06-22 17:27:33 -05:00
BigIronGuru
def4bb987d Reset, stow BLTouch before mode change (#14368) 2019-06-22 17:26:02 -05:00
Scott Lahteine
78557076ff Add planner.synchronize to UBL G29 2019-06-22 17:23:29 -05:00
BigIronGuru
6578aa4e1b Apply minimum timing to BLTouch commands (#14369) 2019-06-22 17:20:19 -05:00
teemuatlut
2247bf1ba5 Add missing dedge init for TMC2209 (#14370) 2019-06-22 17:00:15 -05:00
mikeshub
1db7013e3b Fix and improve PID loops (#14373)
- Windup guarding was missing. The kludge in place of windup guard is removed. D term filter calculations are simplified to require fewer `float` calculations. Sign change for D term output to make debugging output clearer.
- Use "no overshoot" for bed PID tuning.
2019-06-22 16:52:56 -05:00
Scott Lahteine
17778d1c2a Fix M916-918 subcommands 2019-06-22 16:18:42 -05:00
Tanguy Pruvot
be69ec5b32 Fix PLR/M43 warnings (#14333) 2019-06-22 00:48:47 -05:00
BigIronGuru
9c83135d40 Only home Z at the end of G34 (#14353) 2019-06-22 00:43:33 -05:00
InsanityAutomation
5df051fdee Fix Start SD Print bug (#14354)
Followup to the G-code parser injection update.
2019-06-22 00:37:21 -05:00
LinFor
0f6f5132c1 Fix variable conflict in ok_to_send (#14351) 2019-06-21 19:04:30 -05:00
MrMabulous
c41b005f33 Add Extra Probing option, discarding outliers (#14338) 2019-06-21 19:02:26 -05:00
BigIronGuru
8f99d45045 Fix BLTOUCH deploy/stow in HS mode (#14352) 2019-06-21 18:55:27 -05:00
Tobias Frost
eeaef2410a Support DGUS Display with DWIN OS (#13253) 2019-06-21 04:47:23 -05:00
Scott Lahteine
bb0bcbaec0 Suppress compiler warning 2019-06-21 02:20:40 -05:00
Tanguy Pruvot
52383633e7 STM32F1: M43 PINS_DEBUGGING (#14072) 2019-06-21 01:20:17 -05:00
Karl Andersson
81d550754a Fix "UNUSED" redefined warning on HAL_STM32 (#14342) 2019-06-21 00:48:10 -05:00
Karl Andersson
4b365552db Fix Marduino SBI/CBI redefine (#14341) 2019-06-21 00:46:23 -05:00
InsanityAutomation
a9acd2f497 G34 configurable angle limit (#14321) 2019-06-20 21:18:36 -05:00
Scott Lahteine
a31cb910f5 Tweak some config spacing 2019-06-20 21:08:47 -05:00
Marcio Teixeira
49ea1c635a Fix missing dependencies (#14339) 2019-06-20 16:37:20 -05:00
thisiskeithb
19d4a9ab77 Tevo Tarantula Pro configurations (#14335) 2019-06-20 16:09:30 -05:00
Scott Lahteine
4df4c47994 Add TMC2209 support (#14249) 2019-06-20 15:47:50 -05:00
Tanguy Pruvot
ed0c70f0a0 SKRmini followup - Fysetc config updates (#14327) 2019-06-20 05:49:27 -05:00
Scott Lahteine
c461af2f3a Reverse encoder/menu in configs 2019-06-20 05:31:18 -05:00
Scott Lahteine
dd06017f64 Bring configs up to date 2019-06-19 01:03:51 -05:00
Scott Lahteine
9131b11944 Games in Info menu, if enabled 2019-06-19 00:03:32 -05:00
Scott Lahteine
4c872a01f2 G-code queue singleton, front injection (#14236) 2019-06-19 00:00:19 -05:00
Tanguy Pruvot
75aeb41ab7 SKRmini support for Fysetc Mini Panel (#14319) 2019-06-18 19:34:16 -05:00
InsanityAutomation
bf64dd4db6 Improve G34, M422 (Z alignment) (#14142) 2019-06-18 07:02:18 -05:00
Tanguy Pruvot
391250b04f STM32F1: Don't toggle EEPROM SPI SS (#14299) 2019-06-18 06:48:20 -05:00
Giuliano Zaro
27d30c1be8 Update Italian language (#14302) 2019-06-18 06:45:34 -05:00
Scott Lahteine
3f6424076b Update M524 description 2019-06-18 05:04:55 -05:00
Scott Lahteine
cf3631226b Document G-code M290 2019-06-18 04:53:31 -05:00
Scott Lahteine
c12b6ba760 Add Dagoma F5 to Makefile 2019-06-18 04:40:00 -05:00
3DSmitty
5b13abcacb Fix SPI_SD Outside of HAL_STM32F1 (#14306) 2019-06-18 02:38:18 -05:00
Bob Kuhn
089d12df16 Fix duplicate board IDs (#14310) 2019-06-18 02:26:13 -05:00
Tanguy Pruvot
5307f42917 Include STM32F1 HAL in main README.md (#14285) 2019-06-18 00:23:35 -05:00
Ludy
2290b269dc Unused variable (#14301) 2019-06-18 00:15:41 -05:00
Scott Lahteine
6b2d42434c Wrap main menu external declarations 2019-06-17 21:44:56 -05:00
thisiskeithb
da5bdea324 Artillery X1 - Disable Linear Advance (#14311) 2019-06-17 20:36:09 -05:00
Scott Lahteine
aacb904e1f Adjust some config comments 2019-06-17 20:22:07 -05:00
Scott Lahteine
651f3eeed0 Clean up trailing whitespace 2019-06-17 20:22:07 -05:00
Ludy
35aabd1834 Fix Spindle/Laser compile error (#14312) 2019-06-17 18:38:43 -05:00
Scott Lahteine
21f377d94a STM32F1: various small changes (#14313)
- init the led pin as output (like other HALs)
- reduce sdio dma priority to normal.. highest is never the best...
- allow fsmc only on compatible STM32F1 (like HAL fsmc)
- fsmc: remove an useless C style cast
2019-06-17 17:48:50 -05:00
sensei73
ce5f94c8f4 Fix Touch-MI sanity checks (#14316) 2019-06-17 17:46:14 -05:00
Tanguy Pruvot
287df7a61f STM32F1: various small changes
- init the led pin as output (like other HALs)
- reduce sdio dma priority to normal.. highest is never the best...
- allow fsmc only on compatible STM32F1 (like HAL fsmc)
- fsmc: remove an useless C style cast
2019-06-17 10:27:30 +02:00
3DSmitty
66d51272af Fix SPI, SD for BIGTREETECH SKR Mini (#14287) 2019-06-15 18:12:05 -05:00
Scott Lahteine
903863dcb6 Suppress some warnings 2019-06-15 17:47:59 -05:00
Scott Lahteine
eb1c9113c2 Try to init SD with no detect pin 2019-06-15 15:36:48 -05:00
Scott Lahteine
9a56a88200 Use OUT_WRITE in SPI pin init 2019-06-15 15:36:43 -05:00
Scott Lahteine
24c23b60fa Use lambda, fix wrap pointer 2019-06-15 15:36:42 -05:00
Tanguy Pruvot
1aa60bce32 Travis CI: Update to Xenial (#14286)
(bionic doesn't include g++7 ppa)
2019-06-15 14:31:35 -05:00
pinchies
3021097888 Add JGAurora A5S and A1 (STM32F103ZET6) (#14291)
- Now compiles and works correctly with changes to HAL timers and watchdog.
- Does NOT include awesome work on touch screen function.
- Does have working LCD and SD-based EEPROM.
2019-06-15 14:28:22 -05:00
Ludy
6fb3db1633 Update German language (#14294) 2019-06-15 14:26:14 -05:00
Scott Lahteine
a17f057daa Fix word wrapping on select screens 2019-06-15 14:06:23 -05:00
Tanguy Pruvot
f2cfa408b7 Touch-MI probe by hotends.fr (#14101)
A simple Z probe using a magnet to deploy a probe. See https://youtu.be/E7Ik9PbKPl0 for the sensor description...
2019-06-14 22:19:48 -05:00
Scott Lahteine
26de051e92 HAL SPI pin init cleanup 2019-06-14 20:17:25 -05:00
Scott Lahteine
cfb44e4a26 Sublime project - add settings 2019-06-14 20:17:25 -05:00
Scott Lahteine
9722038ad3 Ender 3 baud to match Creality3D 2019-06-14 00:44:49 -05:00
Scott Lahteine
50c9b33ed7 !ENABLED => DISABLED 2019-06-14 00:44:49 -05:00
teemuatlut
29afd11cbf Updates for TMC2660 init (#14245) 2019-06-13 23:16:10 -05:00
Scott Lahteine
dfdbd1e75f Use TEST macro where possible 2019-06-13 20:59:12 -05:00
teemuatlut
12a270fd29 Fix TMC5160 and TMC2160 PWMCONF init 2019-06-13 20:57:12 -05:00
Scott Lahteine
fc73a8b004 Add AXIS_HAS_SQUARE_WAVE shorthand 2019-06-13 20:57:12 -05:00
mb300sd
bf8bfb5c66 Add Coolant Control M7/M8/M9 (#10745) 2019-06-13 18:43:11 -05:00
Aliaksei Kvitsinski
648a91bce8 Support for Z-Bold board (#14024) 2019-06-13 03:21:18 -05:00
MastS
18904c42f6 Fysetc LCD backlight timeout (#14265) 2019-06-12 21:59:39 -05:00
Scott Lahteine
8bc3b80176 Add MULTI_NOZZLE_DUPLICATION test 2019-06-12 20:06:25 -05:00
Scott Lahteine
bc2ff9b41f Fix M605 bugs
Fixes #14191
2019-06-12 20:01:08 -05:00
Scott Lahteine
f7792c0192 Group manual move options 2019-06-12 19:49:18 -05:00
Scott Lahteine
2a21a9a062 Update some configs 2019-06-12 19:48:41 -05:00
thisiskeithb
f93c60a6f0 Bring Sidewinder X1 config up to date (#14271) 2019-06-12 19:44:39 -05:00
Tanguy Pruvot
7d1eafc80a STM32F1: C++14 for static_assert, etc. (#14278) 2019-06-12 18:44:32 -05:00
Msq001
26e7e33698 Fix bug in STM32F1 WRITE macro (#14275) 2019-06-12 06:30:24 -05:00
Scott Lahteine
04715e04ee Minor M100 cleanup 2019-06-12 06:14:40 -05:00
Scott Lahteine
356410dcfc Move crc16 function to libs 2019-06-12 06:14:39 -05:00
Scott Lahteine
2a96d4e23a Move number-to-string functions to libs 2019-06-11 07:51:47 -05:00
Scott Lahteine
1ef95013f0 Update Marlin.cpp includes, defines 2019-06-11 07:30:51 -05:00
Kaushik Vemparala
c88d9ae282 Option to leave heaters set on SD abort (#14251) 2019-06-10 23:57:55 -05:00
thisiskeithb
892f0e75ea Initial EVNOVO (Artillery) Sidewinder X1 Configs (#14065) 2019-06-10 23:41:22 -05:00
Tanguy Pruvot
8cf5504a34 Redundant but faster recovery.enabled test (#14175) 2019-06-10 23:33:35 -05:00
Tanguy Pruvot
c3e5225531 Add SPI EEPROM to STM32F1 (#14239) 2019-06-10 23:30:23 -05:00
felixstorm
9439fab7fd Fix ESP32 servos, platformio.ini, etc. (#14247) 2019-06-10 23:22:19 -05:00
Phr3d13
a373d3f557 Geeetech A10 example (#14250) 2019-06-10 22:06:04 -05:00
yangwenxiong
b0a4ea79b8 BigTreeTech SKR Mini v1.1 (#14041) 2019-06-10 21:10:51 -05:00
Robby Candra
f30b89953d runout.distance_mm LCD edit item (#14066) 2019-06-10 20:18:06 -05:00
mikeshub
a3f034b95e FFCP updates. Update XY soft endstops on tool_change (#14125) 2019-06-10 18:01:42 -05:00
InsanityAutomation
b7eeb5b13b Move BLTouch options to adv config (#14131)
Plus other BLTouch and menu enhancements.
2019-06-10 17:46:42 -05:00
Scott Lahteine
0ca2073625 ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED => SD_ABORT_ON_ENDSTOP_HIT 2019-06-10 17:28:35 -05:00
thisiskeithb
662e7da8a4 Fix USE_BIG_EDIT_FONT bug (#14252) 2019-06-09 19:37:14 -05:00
teemuatlut
cccc51ee0e TMC Square Wave Stepping mode (#14195) 2019-06-09 05:08:05 -05:00
Scott Lahteine
80ce0d2bdb Whitespace cleanup 2019-06-08 06:40:44 -05:00
Scott Lahteine
455f0de817 Undefine sanity check tests when done 2019-06-08 06:29:28 -05:00
Robby Candra
7e07a3888b Fix PLR Z bug affecting Cartesians (#14230) 2019-06-08 05:27:58 -05:00
Robby Candra
5ca8d51e12 Ability to insert G-code in front of queue (#14229) 2019-06-08 05:23:53 -05:00
BigIronGuru
293018f76c Apply needed BLTouch patch (#14233) 2019-06-07 21:43:20 -05:00
Scott Lahteine
ffb76b75d7 fix TMC2208 boot loop with SW UART (#14135)
Need stepper .begin() before calling susbequent .push()
2019-06-07 07:27:10 -05:00
InsanityAutomation
4138b1f9ae Option to disable Case Light brightness control (#14165) 2019-06-07 07:23:42 -05:00
Tanguy Pruvot
764f0d9c1c STM32F1: Servo "soft" PWM via timer interrupt (#14187) 2019-06-07 07:11:48 -05:00
InsanityAutomation
66e22d9f5a ExtUI Heated Chamber support (#14198) 2019-06-07 07:08:41 -05:00
InsanityAutomation
fda8606388 Fix Travis test of Azteeg X3 Pro (#14235) 2019-06-07 03:07:38 -05:00
Scott Lahteine
950fd4aa4c Dagoma Disco Ultima pins, thermistor, config (#14223) 2019-06-05 22:32:35 -05:00
Scott Lahteine
9206c0e869 Use limit switch overrides 2019-06-05 22:27:06 -05:00
Scott Lahteine
34d2801bbe Rename pins file (2) 2019-06-05 21:41:58 -05:00
Scott Lahteine
fa3b5fb059 Uppercase pins filename 2019-06-05 21:41:58 -05:00
Scott Lahteine
858b2fa21a Fix thermistor table 2019-06-05 21:39:39 -05:00
InsanityAutomation
f6ec00d776 Update thermistor and working config 2019-06-04 20:25:00 -04:00
InsanityAutomation
bbcb61e042 Initial Commit - Add board 2019-06-03 23:49:19 -04:00
Tanguy Pruvot
e4260a41cb Fix a DEBUG_LEVELING_FEATURE string copy (#14200) 2019-05-31 18:52:11 -05:00
Ryan
9d9030a39c Fix Archim1 SD card (#14184) 2019-05-30 19:58:38 -05:00
InsanityAutomation
123e58d9c3 Heated Chamber for Graphical LCD (#14190) 2019-05-30 18:31:50 -05:00
Scott Lahteine
93ab16c6e4 Remove old mixing ISR comment 2019-05-30 17:05:16 -05:00
Scott Lahteine
6572848d7f Fix stepper timing bug 2019-05-30 16:58:53 -05:00
Bob Kuhn
688b54d66a DUE USB composite device field corrections (#14185) 2019-05-30 16:26:48 -05:00
InsanityAutomation
f889cc6ea6 ExtUI parity with SPI LCDs (#14172) 2019-05-30 16:24:13 -05:00
Scott Lahteine
07021c85c8 Tweak timer16_Sequence_t 2019-05-30 16:09:37 -05:00
Roman Moravčík
d70929f7c0 Update Slovak language (#14179) 2019-05-30 15:57:14 -05:00
Tanguy Pruvot
e3a468f2cd STM32F1: FSMC only on chips with 100/144 pins (#14180) 2019-05-30 15:51:02 -05:00
Ludy
8e8e48f900 Fix links in templates, gcode.h (#14160) 2019-05-28 21:39:55 -05:00
InsanityAutomation
34ae76025e Clear Pausing message after M600 park (#14171) 2019-05-28 21:36:14 -05:00
Ludy
bd494a6bd6 Update defines for patched temperature macros (#14161) 2019-05-28 17:43:31 -05:00
doggyfan
e09d8811c1 Apply grace period to thermistor failure testing (#14167) 2019-05-28 15:36:03 -05:00
InsanityAutomation
0f04ba016f Adjust tool offset menus (#14153) 2019-05-27 21:29:08 -05:00
teemuatlut
bf4a0db97f TMC LCD followup (#14134) 2019-05-27 21:24:20 -05:00
Scott Lahteine
6d92a0a33b Add 'ghpc' helper script 2019-05-27 21:06:43 -05:00
Minims
32afe1d102 Fix TOOLCHANGE_ZRAISE warning (#14156) 2019-05-27 19:51:29 -05:00
Robby Candra
5515f88452 Clarify SD longname string size (#14148) 2019-05-27 19:50:48 -05:00
Tanguy Pruvot
5f42d3a8b4 BLTouch French updates (#14137) 2019-05-27 01:02:35 -05:00
Scott Lahteine
d3bb5b69ba Apply NOLESS/NOMORE 2019-05-26 20:55:00 -05:00
Scott Lahteine
b315157053 Apply const to mcp4728 2019-05-26 20:54:24 -05:00
Scott Lahteine
3c179bbd47 Simpler G28 home axis conditions 2019-05-26 16:26:55 -05:00
Scott Lahteine
352734494b Reduce some M43 strings 2019-05-26 16:21:28 -05:00
Scott Lahteine
b14cc0d7c5 Remove extra gcode. prefix 2019-05-26 16:18:45 -05:00
Scott Lahteine
c6d39319de Fix some whitespace 2019-05-26 16:18:43 -05:00
InsanityAutomation
212860f090 Always change to Tool 0 on G29 (#14146) 2019-05-26 14:53:21 -05:00
Giuliano Zaro
7b838f31be DUE HAL cleanup (#14126) 2019-05-26 14:51:32 -05:00
Chris
36a0376c36 fix TMC2208 boot loop with SW UART
Need stepper .begin() before calling susbequent .push()
2019-05-26 13:07:12 +02:00
Robby Candra
df7733425c Shorten pause message for 4 line LCD (#14097) 2019-05-26 02:33:52 -05:00
Scott Lahteine
605ec0a478 Fix thermistor table warning 2019-05-26 01:30:20 -05:00
doggyfan
90121047d9 Fix thermal protection with user thermistor (#14130) 2019-05-25 23:37:08 -05:00
Scott Lahteine
81cee05476 Update some env in pins.h 2019-05-25 23:17:50 -05:00
Scott Lahteine
47fd74a98d Clean up fast_pwm.cpp 2019-05-25 23:05:01 -05:00
Scott Lahteine
49229d97db Consistent _useTimerX tests 2019-05-25 23:05:01 -05:00
Scott Lahteine
8924389dfc Tweak servo µs macros 2019-05-25 22:33:51 -05:00
InsanityAutomation
49e83dd7c8 BLTouch V3.1 changes (#14104) 2019-05-25 21:56:47 -05:00
Scott Lahteine
14fe41f6b2 Update Z probe offset comment 2019-05-25 19:41:15 -05:00
Scott Lahteine
f8bede6b5e Fix some HAL includes 2019-05-25 19:20:17 -05:00
Bryan
0ef5d667b6 Fixed M43 parameter bug (#14099) 2019-05-25 18:23:25 -05:00
teemuatlut
1c86fbc60b TMC updates, capture LCD changes (#14074) 2019-05-25 18:22:12 -05:00
felixstorm
74f44783ac ESP32 servo support (#14109) 2019-05-25 18:12:24 -05:00
felixstorm
bc5a1fe562 Various fixes for ESP32 (#14102) 2019-05-25 17:06:00 -05:00
Giuliano Zaro
e1bf34bdc9 Ruramps4d typo fix (#14096) 2019-05-25 16:41:08 -05:00
Scott Lahteine
7cce6b8d68 Bring configs up to date (MANUAL_FEEDRATE) 2019-05-25 16:31:13 -05:00
Scott Lahteine
1210b73530 Geeetech A10M/A20M example updates 2019-05-25 16:31:13 -05:00
Scott Lahteine
beb2ed145e List AZTEEG_X5_MINI SPI pins
Followup to earlier commit
2019-05-25 16:20:07 -05:00
Scott Lahteine
44caf70917 Improve editing, fix some small value editing 2019-05-25 15:29:00 -05:00
Scott Lahteine
612eaa87bd Fix "back" items in some sub-menus 2019-05-25 15:28:52 -05:00
Scott Lahteine
c5dc2e5a71 Update advanced BLTouch menu items 2019-05-25 15:26:25 -05:00
Scott Lahteine
48d1bd29cb Shift m before compare to 0 2019-05-25 15:22:15 -05:00
InsanityAutomation
9f69fbe5ee Move some menu items (#14118) 2019-05-25 15:16:00 -05:00
Scott Lahteine
fc52c43a26 Some documentation updates 2019-05-24 16:30:44 -05:00
Tanguy Pruvot
24b1818245 Secure STM32F1 servo code and M280 detach (#14085) 2019-05-22 16:57:19 -05:00
Scott Lahteine
a49919396a LPC1768 MarlinServo => libServo 2019-05-22 16:54:52 -05:00
Scott Lahteine
2b5046659a Tweak Marlin headers, comments 2019-05-22 16:54:52 -05:00
Scott Lahteine
cc862a8213 Replace some functions with lambdas 2019-05-22 16:54:35 -05:00
Ludy
fafd73a3af Update copyright in headers (#14092) 2019-05-22 16:24:13 -05:00
Giuliano Zaro
2298923a9b Update Italian language (#14095) 2019-05-22 16:23:41 -05:00
Ludy
41f61a12b8 Update German language (#14093) 2019-05-22 16:23:16 -05:00
doggyfan
594f6b14be Limit user thermistor to 999, fix thermistor table macro (#14080) 2019-05-21 21:31:05 -05:00
Giuliano Zaro
a74aad3b4a Clean up HALs / FastIO (#14082) 2019-05-21 18:28:12 -05:00
Scott Lahteine
4ef364a073 Sanity check probe offsets must be integers 2019-05-21 17:16:21 -05:00
Ivan Kravets
610abd7b88 Declare "teensy" platform, add ststm32 dev/platform (#14070) 2019-05-20 22:02:17 -05:00
Scott Lahteine
cfca07852a Backlash linker error workaround
Fix #14045
2019-05-20 21:52:56 -05:00
Scott Lahteine
aeec9ef76b Update backlash code 2019-05-20 21:34:08 -05:00
Scott Lahteine
7b4c3bd92a Fix call to synchronize in lcd_pause_job 2019-05-19 15:51:45 -05:00
Scott Lahteine
9bf65eacaa Remove old adv config heading 2019-05-19 15:24:01 -05:00
Pavel4e5
3cd19a8ec0 Improve Zonestar keypad responsiveness (#14056) 2019-05-18 20:52:55 -05:00
Tanguy Pruvot
402f1f7307 STM32F1: STM32_HIGH_DENSITY is auto defined in HAL (#14057)
- Fix the `fsmc` and `sdio` units which required hard defines for use.
2019-05-18 20:45:22 -05:00
Tanguy Pruvot
87e7193259 Fix M226 sign warning (for most platforms) (#14049) 2019-05-18 16:15:48 -05:00
Tanguy Pruvot
256f810df2 Add open-drain output mode to STM32F1 FastIO (#14050)
- This mode is often used/preferred to drive printer boards' MOSFETs.
- Can generally boost the allowed output power (for hotbed,nozzle and fans).
2019-05-18 16:12:00 -05:00
Bob Kuhn
1dad6e754b Neopixel background LED option (#14025) 2019-05-18 02:36:37 -05:00
InsanityAutomation
84ac5b360b Fix ExtUI mesh functions (#14027) 2019-05-17 20:37:23 -05:00
Scott Lahteine
9b5f9dda0e Update analog pins labels 2019-05-17 20:22:25 -05:00
FanDjango
85fb33a060 BLTOUCH tweaks, new v3.1 command (#14015) 2019-05-17 19:10:18 -05:00
GUEST.it
62ef54cb81 UBL: Log and display G29 progress (#14036) 2019-05-17 19:02:21 -05:00
GUEST.it
7907eec04c Fix power loss recovery with SINGLENOZZLE (#14033) 2019-05-17 18:47:15 -05:00
Scott Lahteine
efe651e749 Add THERMISTOR_NAME for 1000 2019-05-17 18:26:53 -05:00
Scott Lahteine
0b056970c6 Fix file.open in STM32 eeprom emu 2019-05-17 18:26:53 -05:00
InsanityAutomation
06f3273531 Fix DELTA pulse wait bug (#14028) 2019-05-17 16:16:56 -05:00
Marcio Teixeira
7ccbcf2eaa Fix TMC EEPROM regression (#14008)
Partially undo 15357af to ensure TMC code is initialized in the proper order.
2019-05-16 20:38:03 -05:00
Marcio Teixeira
9558962d59 Fix DUE HAL SW SPI compile error (#14005) 2019-05-16 20:36:19 -05:00
Martin Zeman
737d3d9283 Ender-3: Add feedrate for E manual move (#13996) 2019-05-16 20:34:01 -05:00
InsanityAutomation
07afe69cee Fix some bad AZTEEG_X5_MINI pins (#14011) 2019-05-16 20:33:00 -05:00
Chris Pepper
451ea996c9 [LPC176x] Fix switch fallthrough 2019-05-15 10:35:26 +01:00
Tanguy Pruvot
d7b0369e39 STM32: Fix SD EEPROM emulation conflict (#14012) 2019-05-15 02:42:10 -05:00
Scott Lahteine
785c01f2bc Use US spelling of 'behavior' 2019-05-15 01:49:17 -05:00
Sam Lane
7f1e0c5670 Update EXTRA_LINADV_K with Marlin bit macros (#13993) 2019-05-15 01:07:07 -05:00
Bob Kuhn
48bd8899bd Cohesion 3D Remix: Onboard SD card, Fysetc LCD (#13991) 2019-05-15 00:59:57 -05:00
FanDjango
dcaefc68a5 BLTouch.init should not deploy (#13988)
Low or unknown probe clearance on init (even at powerup) is a risk and therefore, a deploy should be avoided because dragging the pin is possible: A deploy goes into alarm if it can't extend fully and then the subsequent stow will fail.
2019-05-14 23:55:11 -05:00
Bob Kuhn
211563e533 Merge pull request #13985 from tpruvot/stm32_sdeeprom
STM32F1: fix sdcard filename conversion
2019-05-13 01:48:58 -05:00
Tanguy Pruvot
8075893352 STM32: fix sdcard filename conversion 2019-05-12 04:26:21 +02:00
chai-md
940ff8e7c8 Improve LV8729 stepping (#13776) 2019-05-11 19:02:19 -05:00
InsanityAutomation
991ee7552b Restore menu edit to 32bit value (#13976) 2019-05-11 18:44:35 -05:00
InsanityAutomation
3eee880967 Anet E16 example config (#13982) 2019-05-11 18:29:40 -05:00
Tanguy Pruvot
93dd097b1c Use E2END, if defined, for STM32F1 (SD) (#13981) 2019-05-11 18:22:31 -05:00
Tanguy Pruvot
3bf43b6c1e Re-enable STM32F1 Travis test (#13978) 2019-05-11 18:10:40 -05:00
Scott Lahteine
4e7187b926 Extended G-code syntax
- Parenthesized comments
- Multiple E values split by colons (RepRapFirmware)
2019-05-11 17:51:42 -05:00
InsanityAutomation
5108e4b6aa Cleaner EEPROM auto init (#13975) 2019-05-11 16:54:03 -05:00
Bob Kuhn
456a0ee76b Improve Due SW SPI, Fysetc sanity checks, &c. (#13939) 2019-05-11 16:51:39 -05:00
Robby Candra
7b78a20fb7 Fix: Debug Memory Dump size (#13957)
* Fix Memory Dump size

* Fix Compile error on Memory Dump
2019-05-11 11:44:39 -05:00
Scott Lahteine
a613bcad2d Fix some spelling 2019-05-10 20:39:19 -05:00
Tanguy Pruvot
62b36d1b98 Fix STM32 timer warnings (#13946) 2019-05-10 20:00:21 -05:00
Giuliano Zaro
f22c9a1ae1 Fix G-code parser with MMU2 (#13951) 2019-05-10 19:57:15 -05:00
Marcio Teixeira
746c38f4be Fix HAL_DUE multiple define error with graphical LCD (#13971) 2019-05-10 19:52:43 -05:00
Martin Zeman
529c111572 Fix A8 config author (#13974) 2019-05-10 19:46:32 -05:00
Bob Kuhn
75eca5c4f8 Fysetc pins updates for RAMPS and SKR 1.3 (#13963) 2019-05-10 19:29:28 -05:00
Martin Zeman
9cd9d39319 Add Anet A8 Plus example configuration (#13967) 2019-05-10 16:25:31 -05:00
Marcio Teixeira
227f29090d Add heater timeouts to ExtUI (#13970)
- Add local UI methods to get heater timeout state.
- Add methods to resume timed-out heaters.
- Re-enable heaters on UI temperature request.
- Make `ExtUI` show a dialog box if pause needs a button press after reheat.
2019-05-10 15:56:13 -05:00
Bob Kuhn
fa3739aa23 M100: LPC1768 and DUE compatibility (#13962) 2019-05-09 21:57:44 -05:00
Scott Lahteine
88bedf3a57 Better label for mfadd 2019-05-09 19:28:41 -05:00
InsanityAutomation
3f758d9e00 Fix some edit items for 16-bit encoder (#13948) 2019-05-09 18:28:47 -05:00
GUEST.it
beb9cc91f6 More fixes to Geeetech A10M/A20M standard config (#13958) 2019-05-09 18:23:26 -05:00
ManuelMcLure
51acbb2201 Prevent HOST_PROMPT_SUPPORT compile error (#13943) 2019-05-09 11:48:31 -05:00
Scott Lahteine
ad4ffa1d2f Use C++ language supported 'nullptr' (#13944) 2019-05-09 11:45:55 -05:00
Tanguy Pruvot
e53d7e5517 STM32: ADC warning fix (#13933) 2019-05-09 00:33:38 -05:00
GUEST.it
6b96eaa15b Fix E-steps/mm for Geeetech A10M/A20M (#13954) 2019-05-08 22:43:34 -05:00
Scott Lahteine
23ec650410 Consolidate Malyan LCD and ExtUI 2019-05-07 21:31:30 -05:00
InsanityAutomation
6811e2921b BLTouch v3 / 3DTouch Interoperability & performance (#13814) 2019-05-07 21:25:54 -05:00
Giuliano Zaro
40aff7e1f2 Remove extra MMU (non-12V) code (#13938)
`check_version` in state -5 should not be needed since it has already been called in state -4 and the tested build nr is only updated in state -4.
2019-05-07 21:02:08 -05:00
Scott Lahteine
059269d732 More python updates
Followup to #13931
2019-05-07 20:56:19 -05:00
Alexey Shvetsov
af725c81e3 Convert py scripts for py2 and py3 compatibility (#13931) 2019-05-07 20:45:01 -05:00
Tanguy Pruvot
11adcf1ce3 Add'l PLR options, AVR strstr_P compat (#13880) 2019-05-07 20:38:40 -05:00
InsanityAutomation
5dcb25664f Option to Auto-Initialize EEPROM (#13935) 2019-05-07 16:30:31 -05:00
Ludy
a504366138 Fix probe fan compiling error (#13930) 2019-05-07 14:14:12 -05:00
Tanguy Pruvot
24e956d168 Avoid int8_t underflow on filament runout (#13895) 2019-05-07 13:58:10 -05:00
Stephan
483822f3aa Fix some THERMAL_PROTECTION_CHAMBER issues (#13678) 2019-05-06 19:55:01 -05:00
doggyfan
23a8707ef1 Configurable Thermistor (#13888) 2019-05-06 18:51:06 -05:00
J.C. Nelson
172abc305b Malyan M200 core fixes (#13927) 2019-05-06 18:07:13 -05:00
Scott Lahteine
a36782ac1d Define more u8g command macros 2019-05-06 17:26:34 -05:00
Scott Lahteine
f9a50f451d Serial out cleanup 2019-05-06 17:26:34 -05:00
Scott Lahteine
9853331b34 Fix temp init, loosen ADC grace period 2019-05-05 22:55:03 -05:00
Tanguy Pruvot
a4c24511f7 STM32: Fix Marduino SBI/CBI redefine (#13912) 2019-05-05 22:06:30 -05:00
Ludy
c837e9250c Define tmc variables where needed (#13918) 2019-05-05 22:04:47 -05:00
Ludy
f96eaad1ea Unused variable cleanup (#13917) 2019-05-05 22:01:04 -05:00
Ludy
421d526ba7 Update German language (#13915) 2019-05-05 22:00:19 -05:00
Giuliano Zaro
b07360f32a Update Italian language (#13916) 2019-05-05 21:59:34 -05:00
Robby Candra
79955f0c89 Fix PLR file delete bug (#13860) 2019-05-04 23:30:47 -05:00
ManuelMcLure
09f1b58146 Fix HOST_PROMPT_SUPPORT compile issue (#13847) 2019-05-04 22:55:51 -05:00
Giuliano Zaro
e2a77ed881 Bring chamber temp to completion (#13837) 2019-05-04 22:51:47 -05:00
Robert Mendon
24177954dd Add missing AZSMZ Mini SPI pins (#13824) 2019-05-04 22:04:01 -05:00
kAdonis
ee73e17c9b Hide 'vsense' report row if not used (#13884) 2019-05-04 22:00:24 -05:00
jmdearras
68004174d9 Fix thermistor 501 name (#13839) 2019-05-04 21:40:41 -05:00
Tanguy Pruvot
7076d8706b Travis: Use platformio 'master' for stable testing (#13902) 2019-05-04 21:33:36 -05:00
Bob Kuhn
c48e6be366 Fysetc panel, RUMBA and ReARM pins, SPI mode 3 (#13900) 2019-05-04 17:59:36 -05:00
ushills
3cad0f08d9 Geeetech I3 Pro B DEFAULT_AXIS_STEPS_PER_UNIT options (#13896) 2019-05-04 17:45:40 -05:00
ushills
1ec9953e7e Update I3 Pro B calibration routine (#13907) 2019-05-04 17:28:23 -05:00
Chris
fd9d3ae181 Re-Arm 4x TMC2208 stepper improvement (#13819) 2019-05-04 17:26:13 -05:00
Tanguy Pruvot
e7b3720b81 Menu edit accel in increments of 25 (#13850) 2019-05-04 17:21:58 -05:00
Tanguy Pruvot
7da63fa03f Fix NOMORE() sign warning in stepper (#13894) 2019-05-04 15:59:38 -05:00
Roman Moravčík
6d0ce033c2 Update Slovak language. (#13840) 2019-05-04 15:58:01 -05:00
InsanityAutomation
3fcab8dbf1 Option to disable fans during pause (#13820) 2019-05-04 15:50:44 -05:00
Chris Pepper
66f7065248 [LPC176x] Update extra script to support Python3 (#13908) 2019-05-04 20:52:28 +01:00
Scott Lahteine
2f32a6612d Clean up Temperature::set_fans_paused 2019-05-04 14:36:59 -05:00
Andrei Pozolotin
c791d2abeb Add .gitignore for Eclipse (#13818) 2019-05-04 14:08:53 -05:00
Marcio Teixeira
15357af67c Backlash cleanup (#13659)
…And save backlash, fil. sensor, ExtUI userdata to EEPROM.
2019-05-03 23:53:15 -05:00
Robby Candra
0181e57417 Add a minimum Z change option to power-loss recovery (#13859) 2019-05-02 22:29:05 -05:00
Robby Candra
c369477cb0 Fix bug: diveToFile breaks M23 (#13865) 2019-05-02 15:54:24 -05:00
Tanguy Pruvot
e5438a9a03 settings: store runout sensor on/off (#13876) 2019-05-02 00:47:26 -05:00
Scott Lahteine
e7682eea42 Use Arduino.h include wrapper (#13877) 2019-05-02 00:45:50 -05:00
Tanguy Pruvot
51d1e0f1dd Auto-mount the SDIO SD card (#13879) 2019-05-02 00:45:21 -05:00
Thomas Moore
ee243e4edf Fix mixing extruder filament change (#13803) 2019-05-01 21:55:58 -05:00
Scott Lahteine
bf54251a10 Finish, improve, clean up FYSETC_MINI_12864 revisions (#13871) 2019-05-01 20:05:29 -05:00
Scott Lahteine
9372e2603c Simpler neopixel comment 2019-05-01 13:55:51 -05:00
Tanguy Pruvot
3272d0db01 Update French language (#13866) 2019-05-01 13:00:07 -05:00
Chris Pepper
95beafa9a2 Fix typo 2019-05-01 16:30:21 +01:00
Ludy
408a5f08dc Update German language (#13853) 2019-05-01 01:25:57 -05:00
Ludy
8a6308b498 Fix config regression
Fix bad commits from around db89fc03
2019-05-01 01:22:40 -05:00
Tanguy Pruvot
cf3c746029 Improve French language (#13851) 2019-05-01 01:12:25 -05:00
Clinton James
2740cc64d8 Add SD Release when no SD_DETECT_PIN exists (#13857) 2019-05-01 01:00:21 -05:00
Luu Lac
39ebca6b5f Fix FYSETC, MINIPANEL, MKS_MINI_12864 display (#13864) 2019-05-01 00:37:52 -05:00
Giuliano Zaro
93dcb537ef Update Italian language (#13809) 2019-04-30 20:31:40 -05:00
Roxy-3D
142c8e2fed Remove redundant Frivolous Game Options 2019-04-28 14:03:53 -05:00
Scott Lahteine
e43afb1a58 Clean up SKR pins 2019-04-27 14:56:12 +02:00
Scott Lahteine
9ccbd382e7 Update Watchdog description 2019-04-27 14:56:12 +02:00
Scott Lahteine
b6279abd30 Better THERMAL_PROTECTION_GRACE_PERIOD
See #13783
2019-04-27 14:40:09 +02:00
chai-md
ed9eaa1942 Fix a comment in fwretract.cpp (#13802) 2019-04-26 09:36:29 +02:00
InsanityAutomation
610fb46683 Fix some ExtUI issues (#13799) 2019-04-26 09:32:01 +02:00
Bob-the-Kuhn
db89fc0304 Revert "bring my copy up to date"
This reverts commit 503905c628.
2019-04-25 17:38:41 -05:00
Bob-the-Kuhn
503905c628 bring my copy up to date 2019-04-25 12:08:49 -05:00
Bob-the-Kuhn
73726d56b3 Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.0.x 2019-04-25 12:06:01 -05:00
Scott Lahteine
5051909c3c Update do_select_screen for general use (#13800) 2019-04-24 10:13:44 -05:00
Scott Lahteine
63f6ad3fd2 Basic RAMPS SD_DETECT_PIN override 2019-04-23 18:10:21 -05:00
InsanityAutomation
c6632925e3 Force no move on IDEX full control mode (#13797) 2019-04-23 15:20:59 -05:00
Giuliano Zaro
e2dd2268e8 Add a Z raise-between-probes to G34 (#13791) 2019-04-23 13:40:55 -05:00
Giuliano Zaro
0f9c49ccba Update Italian language (#13790) 2019-04-23 13:36:05 -05:00
Giuliano Zaro
d77ef437db Fix warning for redefined DEBUG_PRINT_P (#13789) 2019-04-23 13:35:02 -05:00
Marcio Teixeira
ca7f6ff287 Fix MSG_En messages for consistency (#13788) 2019-04-23 13:31:51 -05:00
Scott Lahteine
6ff81a33c1 Provide JSON values for SOFT_PWM_SCALE 2019-04-22 14:06:14 -05:00
Scott Lahteine
0c4d3e6622 Improve M906 description 2019-04-22 13:48:02 -05:00
Tanguy Pruvot
04ae3ba1fd Major update to French language (#13784) 2019-04-22 13:31:04 -05:00
chai-md
78d7349fd7 Remove extra Z raises in tool change (#13782) 2019-04-21 21:06:46 -05:00
Kajetan Rzepecki
875e673a8c Add HAL-based thermal protection grace period for all heaters (#13778) 2019-04-21 20:50:32 -05:00
Bob Kuhn
81ca5a4cd4 Fix and improve FYSETC LCD support (#13767) 2019-04-21 20:48:53 -05:00
felixstorm
4e35e6c705 Fix SS pin in ESP32 HW SPI (#13781) 2019-04-21 17:15:15 -05:00
felixstorm
4a48b70c0b Fix (re-)defines in HAL_ESP32 (#13780) 2019-04-21 17:14:38 -05:00
João Brázio
44216749c6 Update README.md
Fixes TravisCI shield to point to the correct branch buildroot, removes no longer used shield and adds some new shields.
2019-04-21 02:44:40 +01:00
Ludy
4228fd3e03 Update German language (#13769) 2019-04-20 15:01:56 -05:00
Kajetan Rzepecki
5f70c876ae Fix _temp_error-related compile error (#13768) 2019-04-20 13:57:38 -05:00
Kajetan Rzepecki
ea1ee02b53 Disable hardware PWM on ESP32 I2S expander (#13762) 2019-04-20 13:41:17 -05:00
Scott Lahteine
bddb776ddb Add chamber max-temp check
Followup to #13756
2019-04-19 22:18:55 -05:00
Marcio Teixeira
d0c1eee53b Add extra max-temp safety checks (#13756) 2019-04-19 21:37:12 -05:00
Marcio Teixeira
4ac28ba6b3 Add missing file (#13754) 2019-04-19 20:20:45 -05:00
jmdearras
b65cb5704d Fix, improve FYSETC_MINI_12864 support (#13730) 2019-04-19 20:11:51 -05:00
Scott Lahteine
69c333ead9 More universal Formbot pins
Replace `ROXYs_TRex` with pre-defines of the relevant pins at the configuration level.
2019-04-18 21:09:34 -05:00
Scott Lahteine
0a6835fbea More robust HAS_LCD_CONTRAST 2019-04-18 21:09:34 -05:00
Marcio Teixeira
2e3d121ac4 Squelch compiler warning (#13739) 2019-04-18 13:18:49 -05:00
Kajetan Rzepecki
d83a7924e6 Fix ESP32 TOGGLE() with I2S expander (#13743) 2019-04-18 13:15:35 -05:00
Jimmy Wennlund
e6f6ed76c8 Show UBL Activate/Deactivate menu for current state (#13744) 2019-04-18 13:13:05 -05:00
Marcio Teixeira
08f21335a6 Fix bad opcode in LIGHTWEIGHT_UI; add 32-bit HAL and Due compatibility (#13751) 2019-04-18 13:10:58 -05:00
Kajetan Rzepecki
7c8ee0cd5b Enable more ADC1 channels (pins 32-39) (#13742) 2019-04-18 13:01:24 -05:00
Bob-the-Kuhn
520585c5ed Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.0.x 2019-04-17 15:34:29 -05:00
Kajetan Rzepecki
e1acc09c6e Fix LPC1768 HAL SSD* screen init (#13741) 2019-04-17 14:57:50 -05:00
Marcio Teixeira
836435c5ef Fix action_edit int range bug (#13737) 2019-04-17 14:55:31 -05:00
Antonio Pérez
bf28ad4b6c Fix clear of Z position last digit (#13731) 2019-04-17 14:52:20 -05:00
Marcio Teixeira
866e2d41dc Correct range of LCD axis step editing (#13727) 2019-04-16 15:45:31 -05:00
Scott Lahteine
ab8052887f Add missing MSG_PAUSE_PRINT_INIT_1 for en 2019-04-16 13:54:20 -05:00
petrzjunior
12d340cf2a Update Czech language (#13729) 2019-04-16 13:53:14 -05:00
Robby Candra
e8dc87a2b7 Fix updated Allen Key pause probe logic (#13723) 2019-04-16 12:35:58 -05:00
Robby Candra
7ca1fea22b Option to pause probe deployment only when triggered, for manually-deployed allen-key probe (#13698) 2019-04-16 01:32:43 -05:00
Robby Candra
35160dfb7a Simplify PLR homing when Z homes to max (#13718) 2019-04-16 00:17:27 -05:00
Scott Lahteine
92ed9a2bb6 Fix is_M29
Followup for #13013
2019-04-15 23:47:06 -05:00
jmdearras
5f49b65c1f Move LPC SD options to configs, add MKS_MINI_DISPLAY to SKR boards (#13712) 2019-04-15 22:55:33 -05:00
Bob Kuhn
9b578ca343 Support FYSETC_MINI_12864 on Re-ARM, RAMPS_FD, MKS SBASE (#13717) 2019-04-15 22:54:11 -05:00
Scott Lahteine
9992c424f5 Patch G92.9 flags
Followup to #13703
2019-04-15 20:26:40 -05:00
ManuelMcLure
b1c13bce58 Fix EEPROM_CHITCHAT (and debug_out.h) (#13716) 2019-04-15 20:21:26 -05:00
Msq001
455ee23499 Fix, improve Power Loss Recovery (#13703)
- Save and restore workspace offsets
- Add retract and purge (hidden) options
- Always restore axis relative modes
- Use added `G92.9` to do position restores
2019-04-15 18:53:39 -05:00
Laurent
df75a606ff Support MKS SGen board (#13694) 2019-04-15 17:03:10 -05:00
Kajetan Rzepecki
20dc45bca7 Refactor, fix ESP32 WebSocketSerial (#13689) 2019-04-15 16:32:20 -05:00
Roman Moravčík
db373f130c Update Slovak language (#13692) 2019-04-15 16:14:49 -05:00
Kajetan Rzepecki
6fe90f0324 Define I2S pins for ESP32 (#13714) 2019-04-15 16:13:59 -05:00
InsanityAutomation
aa0f7afbe6 Fix call to uninitialized PWM pin, heater 2 overlap (#13674) 2019-04-15 15:57:34 -05:00
Bob-the-Kuhn
57aaa9110b Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.0.x 2019-04-13 21:14:52 -05:00
Scott Lahteine
6a71df2925 Tweak babystep add_steps 2019-04-13 14:14:26 -05:00
Bob-the-Kuhn
9dd4252b39 Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.0.x 2019-04-12 22:07:12 -05:00
Marcio Teixeira
bdfffee037 Modify Z-offset overlay for clarity (#13660) 2019-04-12 15:43:29 -05:00
Stephan
84273557f9 Move and update heated chamber settings (#13671)
Co-Authored-By: the-real-orca <stephan.veigl@gmail.com>
2019-04-12 15:38:10 -05:00
Ludy
62b4265410 Update German language (#13665) 2019-04-12 14:48:13 -05:00
Scott Lahteine
b18316dd37 Fix some spacing 2019-04-12 13:35:42 -05:00
Scott Lahteine
f2ba0a5ae7 Tweak some formatting 2019-04-12 13:15:37 -05:00
Scott Lahteine
7e58d33a2e Update some headers 2019-04-12 13:04:04 -05:00
ManuelMcLure
8bc5817559 Save files before starting AutoBuild (#13649) 2019-04-12 12:33:16 -05:00
Giuliano Zaro
64ee064ded Update Italian language (#13661) 2019-04-12 12:22:43 -05:00
Scott Lahteine
14b561f182 Extra AxisEnum values for E0-E5 2019-04-12 12:13:48 -05:00
Robby Candra
9e86fc3831 Require homing to toggle leveling (#13652) 2019-04-11 14:09:41 -05:00
Ludy
9fd3e64ba8 Fix compile error with EXTRUDER>1 (#13651) 2019-04-11 13:58:50 -05:00
Jamie
509dc283f2 Restore declarations of G53-G59 (#13654) 2019-04-11 13:51:05 -05:00
chai-md
2adc37becc MAGNETIC_SWITCHING_TOOLHEAD (#13629) 2019-04-11 13:29:17 -05:00
ManuelMcLure
492883859e Don't protect unused CS pins (#13647) 2019-04-10 21:57:57 -05:00
Scott Lahteine
9898f53361 Fix missing IS_SD_PRINTING 2019-04-10 21:48:16 -05:00
Scott Lahteine
1e59a2ac73 Hide pause/stop unless active printing 2019-04-10 19:46:59 -05:00
Scott Lahteine
ae42206500 Fix SD_REPRINT_LAST_SELECTED_FILE 2019-04-10 17:43:08 -05:00
Scott Lahteine
d72946a8d7 Fix LPC1768 build with no watchdog
Fix issue mentioned at https://github.com/MarlinFirmware/Marlin/pull/13587#issuecomment-481737509
2019-04-10 17:34:15 -05:00
Scott Lahteine
cee3b172b9 Fix Marlin splash screen logic (#13646) 2019-04-10 17:14:57 -05:00
ANMay-ru
052f2ac352 Fix RURAMPS4D baud rate (#13644) 2019-04-10 15:53:21 -05:00
Marcio Teixeira
e6ebd30f60 Fix LCD issue on stepper timeout (#13630)
- Remove a re-paint of the status screen on stepper timeout, which would cause a garbled LCD with `LIGHTWEIGHT_UI` and could interrupt whatever else the user might be doing in a submenu (such as playing games!)
- Use the helper function to reset stepper timeout.
2019-04-10 15:51:48 -05:00
klcjr89
a8edd4f6d4 Fix Azteeg X5 MINI BOARD_NAME (#13632)
Co-Authored-By: klcjr89 <klcjr89@users.noreply.github.com>
2019-04-10 15:46:12 -05:00
Scott Lahteine
ac81c007a6 Merge pull request #13634 from marcio-ao/pr-remove-extra-stm32-dir
Remove extra STM32 config dir #13622
2019-04-10 15:40:25 -05:00
Marcio Teixeira
610e9cf76a Fix SWITCHING_NOZZLE error (#13633) 2019-04-10 15:22:29 -05:00
Scott Lahteine
3656ef4a2d Rename, step 2 2019-04-10 15:17:38 -05:00
Scott Lahteine
6b8611ad56 Rename, step 1 2019-04-10 15:17:08 -05:00
Scott Lahteine
5018fdacbe Support FYSETC_MINI_12864_PANEL (#13365) 2019-04-09 18:34:29 -05:00
InsanityAutomation
4900c28bf6 Fix IDEX tool-change, and more (#13614) 2019-04-09 18:33:40 -05:00
InsanityAutomation
ba31d39f6d Azteeg X5 Mini support (#13425) 2019-04-08 23:10:45 -05:00
ManuelMcLure
f9b2b3e4f5 AutoBuild quality-of-life improvements (#13626)
- Assign helpful names to the terminals.
- Bring terminal forward so error messages are seen.
2019-04-08 23:07:57 -05:00
Scott Lahteine
9ea99b49be clean whitespace 2019-04-08 21:49:18 -05:00
Scott Lahteine
9cb5c57b84 Adjustments to ui8tostr_percent 2019-04-08 21:47:50 -05:00
Scott Lahteine
321a5e6580 Fix SD card reselect when scrolled (#13624)
- Change encoder position to 16-bit integer.
- Fix `SD_REPRINT_LAST_SELECTED_FILE` when the screen is scrolled.
2019-04-08 21:10:41 -05:00
Scott Lahteine
0e3c9e726d Set default Raptor runout/caselight pins 2019-04-08 18:18:08 -05:00
Scott Lahteine
5e38d70697 Fix M217 report label, general cleanup 2019-04-08 18:18:08 -05:00
Scott Lahteine
fae2b7edc3 Update MMU2 code style 2019-04-08 18:13:42 -05:00
Scott Lahteine
c8a83fb122 SPINDLE_LASER_ENABLE => SPINDLE_LASER_ENA 2019-04-08 18:13:41 -05:00
Scott Lahteine
9abe9aff56 Confirm before starting SD print (#13616) 2019-04-08 13:44:35 -05:00
Scott Lahteine
7e0008f5b3 Fix SETCURSOR_RJ 2019-04-07 20:25:54 -05:00
Robby Candra
81c2c3ec11 Continuous filename scrolling (#13609) 2019-04-07 16:58:32 -05:00
Ludy
c29820f649 Suppress compile warning (#13612) 2019-04-07 16:53:30 -05:00
Scott Lahteine
a2b3ad6d0a Don't override RGB LED pins, by default 2019-04-07 16:42:26 -05:00
swilkens
e9d9cf2b5b [2.0.x] Reduce all Creality homing speeds (#13595) 2019-04-06 19:50:02 -05:00
SmallSharky
1de6e7fb9d Fix MKS Robin section in platformio.ini (#13598)
Updated ststm32 version because the old version gives build errors. Added `U8glib-HAL` to ignore list because there are also build errors.
2019-04-06 18:07:21 -05:00
Bob Kuhn
9a56d90150 Fix M43 on LPC176x (#13587)
The real fix. PR #13568 was wrong.
2019-04-06 18:06:07 -05:00
Roxy-3D
9cee81d47e Option to show babysteps total since G28 (#13580) 2019-04-06 18:04:34 -05:00
Scott Lahteine
3221658a78 Adjust park position description 2019-04-05 20:40:50 -05:00
Scott Lahteine
028b78f623 Suppress a compile warning 2019-04-05 20:06:19 -05:00
Scott Lahteine
cf12fc8366 Expand on serial debugging (#13577) 2019-04-05 20:02:46 -05:00
Marcio Teixeira
bf7b28b456 Fix incorrect variable name (#13585) 2019-04-05 19:04:46 -05:00
Kajetan Rzepecki
27693cec29 Extend ESP32 HardwareSerial with flushTX. (#13588) 2019-04-05 19:04:02 -05:00
Alexander Gavrilenko
3c47e1b4d1 Support Black STM32F407VET6 with RAMPS-like shield (#13524) 2019-04-05 15:30:19 -05:00
VBen
0dfd76ba55 Fix Z hotend offset broken by parking extruder tool change (#13582) 2019-04-05 15:28:32 -05:00
Scott Lahteine
027a901bec Trim whitespace 2019-04-05 15:04:23 -05:00
Kajetan Rzepecki
692a0198f9 Fix SPISettings frequency parameters in ESP32 HW SPI (#13573) 2019-04-04 23:17:14 -05:00
Kajetan Rzepecki
63d95862fa Add FastIO TOGGLE for ESP32 (#13574) 2019-04-04 23:15:17 -05:00
drzejkopf
0992d1a4c8 Fix Invaders game compile error (#13575) 2019-04-04 23:13:11 -05:00
Robby Candra
cd1ef33c8c Drop extra PLR save test (#13554) 2019-04-04 22:47:00 -05:00
Scott Lahteine
72c7751768 Fix SERIAL_POS in use with DEBUG_OUT 2019-04-04 22:12:03 -05:00
Scott Lahteine
cacec5764a Clean up whitespace 2019-04-04 22:12:02 -05:00
Scott Lahteine
83e214478e Click-hold to exit Invaders, fix Brickout compile 2019-04-04 17:07:50 -05:00
Scott Lahteine
240ea1bbb3 Split up games into separate files 2019-04-04 03:06:19 -05:00
Marcio Teixeira
27a4927ed1 Add option to move away from endstop after homing. (#13557)
Add option to move away from endstop after homing.
- Add `ENDSTOP_BACKOFF` for printers with a recessed Z home button (Lulzbot TAZ 6).
- Also prevents chattering when sensorless homing with axes against bumpers.
2019-04-04 02:47:19 -05:00
InsanityAutomation
d44e5b1fde Fix stepper direction macros, multi-nozzle scope (#13569) 2019-04-04 02:44:07 -05:00
Scott Lahteine
10b9632bed Fix menu history item selection 2019-04-04 02:41:23 -05:00
Scott Lahteine
f1810689ff Fix bootscreen condition 2019-04-04 00:19:47 -05:00
reloxx13
2d5b93e850 Change to CHOPPER_DEFAULT_24V for Ender 3 (#13565) 2019-04-03 20:30:40 -05:00
Kajetan Rzepecki
b21ca53dfc SPIFFS-backed PersistentStore for ESP32 (#13566) 2019-04-03 20:28:26 -05:00
Scott Lahteine
af92ee9dd6 No PLR include needed in queue.cpp 2019-04-03 18:26:31 -05:00
Scott Lahteine
5d2c5877f7 DOGM bootscreen cleanup 2019-04-03 18:10:50 -05:00
Scott Lahteine
2aa35e95af More G26 arc cleanup
Followup to #13531
2019-04-03 16:03:21 -05:00
Scott Lahteine
20a41e2f7b SDCARD_RATHERRECENTFIRST with SDCARD_SORT_ALPHA 2019-04-02 22:25:18 -05:00
Robby Candra
46445a5a16 Event G-code for Stop SD Print (#13547)
Co-Authored-By: 7eggert <7eggert@gmx.de>
Co-Authored-By: robbycandra <robbycandra.mail@gmail.com>
2019-04-02 22:09:30 -05:00
Kajetan Rzepecki
2cfa9e9008 Fixed chamber-related compile error (#13552) 2019-04-01 17:53:56 -05:00
Scott Lahteine
a0a5c31c05 Power-Loss initialization fix (#13553)
- Only save to PLR file on moves with E and X or Y
- Save to PLR after any long-ish Z downward move
2019-04-01 17:52:45 -05:00
Scott Lahteine
8b7c3eec83 Games, for fun (and stress-testing) (#13464) 2019-04-01 17:48:54 -05:00
InsanityAutomation
fbc7b51a24 Use NO_FETCH for Dual X G28 (#13539) 2019-04-01 17:48:21 -05:00
Scott Lahteine
5de7b5b35e Games, for fun (and stress-testing) (#13464) 2019-04-01 15:43:48 -05:00
InsanityAutomation
4961d8aa3e Update G28.cpp (#13539) 2019-03-31 19:50:40 -05:00
Scott Lahteine
de0046fc8b Fix empty HAS_TIMER macros 2019-03-30 23:04:40 -05:00
Kajetan Rzepecki
c9079165ee Fix MAX6675 readout with Hardware SPI (#13530) 2019-03-30 22:31:49 -05:00
ManuelMcLure
04086fc455 Minor optimization to ARC_SUPPORT code (#13531) 2019-03-30 22:29:37 -05:00
Robby Candra
a3f67acd6d Fix Power Loss Recovery file delete (#13522) 2019-03-30 13:14:58 -05:00
Marcio Teixeira
d992dfe7d5 Use the percent util func in the string func. (#13523) 2019-03-30 13:00:31 -05:00
drzejkopf
b1f739e27b CR10_STOCKDISPLAY support in Bigtreetech SKR (#13516) 2019-03-29 14:19:18 -05:00
Marcio Teixeira
5679fae11e UltraLCD enhancements (lower fan resolution, backlash menu) (#13519) 2019-03-29 14:07:43 -05:00
pinchies
de0f35f2d9 Fix platformio.ini for MKS Robin (#13502) 2019-03-29 13:57:19 -05:00
Msq001
f0d14b83bc Save/restore Relative modes in Power-Loss Recovery (#13501) 2019-03-29 13:40:42 -05:00
Marcio Teixeira
c6466c23fe Silence signed/unsigned comparison warning. (#13508) 2019-03-29 13:33:45 -05:00
InsanityAutomation
7240e3a68f Allow G26 with no heated bed (#13511) 2019-03-29 13:32:43 -05:00
Alexander Gavrilenko
6d9aaca082 Fix compilation error for MKS Robin (#13506) 2019-03-29 12:40:24 -05:00
Scott Alfter
c6dbe6e9d6 Fix Teensy 3.5/3.6 __get_primask (#13514) 2019-03-29 12:23:09 -05:00
Alexander Amelkin
e40636a7c1 Replace digitalPinHasPWM with HAS_TIMER (#13520) 2019-03-29 12:21:14 -05:00
Scott Lahteine
5a2c68e995 Update BLTouch 3 text, don't call extraneous functions (#13495) 2019-03-26 19:22:25 -05:00
Scott Lahteine
b46ca9aa94 Less timely comment, tweak conditions 2019-03-26 19:20:13 -05:00
InsanityAutomation
eb91f08725 Update descriptions and dont call unneeded functions 2019-03-26 11:24:52 -04:00
Ludy
fe346cd4d1 Fix DEBUG_EEPROM_READWRITE compile error (#13492) 2019-03-26 04:12:22 -05:00
Sam Lane
e3ab54753b Add extra Linear Advance factors (#13490) 2019-03-26 04:02:27 -05:00
Chris Pepper
ffc2c2d7c5 Move FAST_PWM_FAN code to HALs (#13491) 2019-03-26 01:03:23 -05:00
Thomas Moore
263f8edff8 Disable volumetric extrusion during G26 (#13479) 2019-03-25 22:41:52 -05:00
Bob Kuhn
6bd0a0be97 Relocate DUE Stepper ISR to TC0,2 (#13481) 2019-03-25 22:39:51 -05:00
Thomas Moore
13a12f8a87 Fix UBL mesh editor on delta (#13478) 2019-03-25 22:04:57 -05:00
Scott Lahteine
d2e0c03afb Remove trailing whitespace 2019-03-25 20:51:38 -05:00
Marcio Teixeira
7462fe3068 Fix compile error, squelch warnings (#13487)
- Fix path to `bedlevel.h` include file
- Add default to `case` statements to suppress warnings
2019-03-25 20:41:38 -05:00
Yannik Sembritzki
0d3ea59bcf Add pins for Dual Z UART on SKR 1.3 (#13474)
Fix #13470
2019-03-24 20:09:00 -05:00
pinchies
ef3b93daa1 Fix STM32F1 SD-based EEPROM emulation (#13475)
If `openFile` is given `true`, then it has read-only access. Because all the writing occurs on the next line, this breaks SD card as EEPROM.
2019-03-24 20:07:31 -05:00
Chris Pepper
aacc1148b0 Fix M106 for index > extruders (#13473) 2019-03-24 20:03:53 -05:00
Thomas Moore
c5e96544b5 Fix vtool compiler warning (#13476) 2019-03-24 20:02:28 -05:00
Thomas Moore
02dc72acb6 Disable ABL when leveling corners (#13471) 2019-03-24 20:01:18 -05:00
7eggert
d96f7d6068 Minimum segments for G2/G3. Better for small arcs. (#13466) 2019-03-24 19:53:47 -05:00
Scott Lahteine
380c771988 Handle word-padded flash-based eeprom (STM32F1)
Fix #13445
2019-03-24 19:14:04 -05:00
Scott Alfter
32332bcd03 Proceed with Teensy 3.5/3.6 HAL (#13450) 2019-03-24 00:08:32 -05:00
Scott Alfter
407202cc0f Fix BLTouch pre-3.0 compatibility (#13454) 2019-03-23 23:28:15 -05:00
Marcio Teixeira
a0ca98f699 Additional ExtUI features (#13449) 2019-03-23 23:09:18 -05:00
Sam Lane
a8fa275dc6 Fix Fan 0 responding to all fan speeds (#13444) 2019-03-23 23:00:31 -05:00
InsanityAutomation
5eeffab5e5 Fix BLTouch Menus (#13441) 2019-03-23 22:58:34 -05:00
Scott Lahteine
d8329d858d Default argument to defer_status_screen 2019-03-23 16:33:37 -05:00
Giuliano Zaro
9562a02c5a Update Italian language (#13440) 2019-03-20 18:26:55 -05:00
drzejkopf
70e6a3db8a Add LEVEL_CORNERS_HEIGHT to LEVEL_BED_CORNERS (#13439) 2019-03-20 18:26:12 -05:00
Roman Moravčík
f3cf95a937 Update Slovak language. (#13435) 2019-03-20 16:37:34 -05:00
Scott Lahteine
144018736a Use USES_Z_MIN_PROBE_ENDSTOP 2019-03-18 16:58:31 -05:00
InsanityAutomation
5b2c37d6c1 Followup to BLTouch (#13422) 2019-03-18 16:31:11 -05:00
InsanityAutomation
3fb8489ae3 EXTUI and UBL compilation fixes (#13420) 2019-03-17 07:57:54 -05:00
Scott Lahteine
b376c7e374 Group DISABLED items 2019-03-17 07:56:35 -05:00
Scott Lahteine
58bca67883 Unify status scrolling further 2019-03-17 07:56:35 -05:00
Scott Lahteine
c4443f885e finishstatus => finish_status 2019-03-17 07:56:35 -05:00
Urja Rannikko
d9f0ed8247 readme: ATmega1284 has 16k of SRAM (#13421) 2019-03-17 06:36:25 -05:00
InsanityAutomation
691e5c3bb8 BLTouch V3.0 support (#13406) 2019-03-17 05:57:25 -05:00
Scott Lahteine
49cf92dc36 Extended condition macros (#13419)
Allow `ENABLED`, `DISABLED`, `PIN_EXISTS`, and `BUTTON_EXISTS` to take multiple arguments. Also add:
- Alias `ANY(...)` for `!DISABLED(...)`
- Alias `ANY_PIN(...)` for `PIN_EXISTS(a) || PIN_EXISTS(b) ...`
- Alias `EITHER(A,B)` for `ANY(...)`
- Alias `ALL(...)` and `BOTH(A,B)` for `ENABLED(...)`
- `NONE(...)` for `DISABLED(...)`
2019-03-16 23:43:06 -05:00
Tobias Frost
d20eab4f83 Fix macro in set_color() (#13417) 2019-03-16 19:05:59 -05:00
Ludy
59353546e8 Fix BUTTON_EXISTS and misplaced comma (#13411)
Fixes #13410 and redeclaration of `BUTTON_EXISTS`
2019-03-16 11:59:12 -05:00
InsanityAutomation
09eb30dc05 IDEX Mirror mode based on Formbot / Vivedino Symmetric mode (#13404) 2019-03-15 22:46:27 -05:00
Scott Lahteine
5c1aa5162d Adjust M206 output in M503 for DELTA 2019-03-15 19:20:40 -05:00
Scott Lahteine
ad8b82d054 Fix KILL_PIN assignment for MKS_MINI_12864
According to #13397
2019-03-15 19:20:40 -05:00
Scott Lahteine
3a916b4ef2 Create bresenham.h 2019-03-15 19:20:39 -05:00
Karl Andersson
5d3928cb01 PWM is not defined on Arduino Core STM32 (#13405) 2019-03-15 19:14:06 -05:00
Scott Lahteine
9a515cbd32 Fix Pause Print message and behavior (#13394) 2019-03-14 02:26:07 -05:00
Scott Lahteine
f5bcc00570 Unify debugging output with debug_out.h (#13388) 2019-03-14 02:25:42 -05:00
Andrei Pozolotin
cc8a871705 Add capability string CHAMBER_TEMPERATURE (#13391)
Reference: #13380
2019-03-13 18:09:22 -05:00
Scott Lahteine
67bee06e43 No patch needed for non-libmaple analogWrite
See https://github.com/pinchies/Marlin/pull/1#issuecomment-471388743
2019-03-13 07:21:10 -05:00
Scott Lahteine
f89b375fb9 Fixes and improvements for PWM pins (#13383) 2019-03-13 06:51:15 -05:00
Scott Lahteine
87162658c4 Fix and improve software endstops (#13386) 2019-03-13 05:48:36 -05:00
Scott Lahteine
6214c997c0 Remove includes of <binary.h> 2019-03-13 05:32:33 -05:00
Scott Lahteine
4555ae448f Fixups for ESP32 2019-03-13 05:32:33 -05:00
Scott Lahteine
a5ea3e2f15 Fix hotend offset on switching toolhead change
See commentary at #11623
2019-03-13 05:32:21 -05:00
jmz52
8e0ac93d60 Fix 'UNUSED redefined' compiler warning (#13387) 2019-03-13 04:34:02 -05:00
Hadrien Jouet
0278ad0a6d Add ESP32 WiFi interface (#11209) 2019-03-13 00:48:08 -05:00
InsanityAutomation
c03df89921 ExtUI Mesh Leveling Extensions (#13363) 2019-03-13 00:45:52 -05:00
InsanityAutomation
050eac03af Single X Duplication Extension (#13373)
* Multi-nozzle selective duplication
* Use a bit-mask, reduce stepper_indirection.h size
* Tweak the multi-nozzle duplication description
* Use 'S' as a bool in M605
* Add HAS_DUPLICATION_MODE conditional
* Remove '_MODE' from the option name
* M605 in the style of Stacker M280
* Also include direct mask style (P)
2019-03-13 00:42:50 -05:00
Scott Lahteine
ad91476d26 Fix USEABLE_HARDWARE_PWM 2019-03-13 00:12:46 -05:00
Scott Lahteine
d63da4592d Tweak to SCARA_move_to_cal 2019-03-12 22:06:50 -05:00
Scott Lahteine
51ff5b68fa Clean up fastIO ahead of PWM patch 2019-03-12 20:39:55 -05:00
Scott Lahteine
388babbcea Tweak SERIAL_PRINTF 2019-03-11 20:58:27 -05:00
Scott Lahteine
d94e077901 Apply HAS_HOTEND_OFFSET where needed 2019-03-11 20:58:27 -05:00
Scott Lahteine
11d6a939df Always define axis_unhomed_err 2019-03-11 20:58:27 -05:00
7eggert
10c8c034bd Allow both encoder and ADC keypad (#13355) 2019-03-11 18:10:56 -05:00
Andrei Pozolotin
31ff7da7ac Add missing CHAMBER options (for M141) (#13371) 2019-03-11 16:50:07 -05:00
Scott Lahteine
0375e92847 Followup to serial rework
As mentioned in #13370
2019-03-11 16:46:04 -05:00
jmz52
013bb469ca Fix compilation for STM32F1 with no SDIO (#13366) 2019-03-11 16:40:51 -05:00
Scott Lahteine
e52bcc9408 Limit top bed temp to BED_MAXTEMP - 10
The chances of a 10° overshoot is pretty minimal.
2019-03-11 16:32:34 -05:00
Scott Lahteine
98b55421a5 Clean up some temp config 2019-03-11 16:31:23 -05:00
InsanityAutomation
785a7028bf Followup to 'volatile' patch (#13369)
Originally #13344
2019-03-11 15:01:57 -05:00
Scott Lahteine
aa1d587128 Some LCD code cleanup 2019-03-11 05:07:31 -05:00
Scott Lahteine
fa11427ec6 Remove obsolete LCD_CONTRAST 2019-03-11 03:33:07 -05:00
pinchies
4df9509ead Add support for printers with inverted fan pins (#13362)
Add support for printers with inverted fan pins by adding `#define FAN_INVERTING 1` to `Configuration_adv.h` and modifying the fan write macros.
2019-03-10 20:51:21 -05:00
Scott Lahteine
1f7e220387 Make HAL ISR macros function-like 2019-03-10 20:44:27 -05:00
Scott Lahteine
e3ce346f24 Report position to host in Nozzle::park 2019-03-10 19:09:28 -05:00
Scott Lahteine
77b4176152 Use lib include for bit_constants.h 2019-03-10 19:09:28 -05:00
Scott Lahteine
3419099f0a Clean up whitespace 2019-03-10 19:09:28 -05:00
pinchies
4c43e6c48b Fix "spontaneous heating" issue (WRITE bug) on STM32 (#13356)
Should fix "spontanous heating" problems due to order of operations error. Error occurs at least with ststm32 v5.1.0 in PlatformIO.
2019-03-10 17:25:54 -05:00
Michiel Baird
b824a517aa Add G38.4 and G38.5 (#13348) 2019-03-10 17:22:09 -05:00
Bruce j Beare
e4d080e63c Reset after kill with a button on the KILL_PIN (#13091) 2019-03-10 09:57:38 -05:00
MoellerDi
c36989c39e Fix chamber temperature measurement (#13350) 2019-03-10 09:51:13 -05:00
Scott Lahteine
12503fce06 Followup to wait_for_user fix 2019-03-10 09:14:02 -05:00
Scott Lahteine
33a08fc6f7 Fix typos from temperature rework
Followup to #12201
2019-03-10 08:28:16 -05:00
Tobias Frost
2efbcc90c5 Fix wait_for_user compile error (#13352) 2019-03-10 08:07:41 -05:00
Tobias Frost
60e82e3929 Send notifications to ExtUI for M0/M1 (#13344)
- Send notifications to ExtUI for M0/M1

- wait_for_user can be non-volatile (not changed by interrupt)
  C / C++ compilers don't optimize away reads of non-volatile variables when a function call is used between accesses, because *any* variable could be changed by the function call. Since `wait_for_user` can't be changed without a function call, it should be non-volatile so the compiler can optimize away cases where it is read more than once without an intervening function call.
2019-03-09 14:20:37 -06:00
Marcio Teixeira
00fc43144a Follow up fixes to various PRs. (#13334)
- Ensure `MarlinUI:get_progress` is defined for `ExtUI`.
- Fix for `BACKLASH_SMOOTHING` with small segments.
  `BACKLASH_SMOOTHING` with extremely small segments failed to fully correct due to the correction factor being rounded down. Rounding up ensures the entire backlash will converge to zero even for small segments.
- Add pinout for the beta revision `EINSY_RETRO`.
- Update soft endstops with tool offsets (for toolchange et. al. move clamping) (#12568)
2019-03-09 14:20:37 -06:00
Scott Lahteine
c7d618b4d9 Fix SERIAL_ECHOLNPAIR
Fix #13333
2019-03-09 14:20:37 -06:00
InsanityAutomation
d54741eda8 Update some G26 plausible values. Add speed control. (#13330) 2019-03-08 03:13:44 -06:00
Msq001
fb3302feda Fix STM32F1 Serial and ADC pins (#13331) 2019-03-08 02:21:32 -06:00
Reece Kibble
dbead66988 Allows user to set (almost) any PWM frequency (#12638) 2019-03-08 02:15:42 -06:00
Tobias Frost
afbec5ff7e Have ExtUI::getProgress use ui.get_progress (#13328) 2019-03-07 18:00:38 -06:00
3dlabsio
645ca7af7a M141 Heated Chamber, Temperature rework (#12201) 2019-03-07 02:09:39 -06:00
Scott Lahteine
44571775bd Further support for 6 extruders 2019-03-07 01:00:56 -06:00
Chris Pepper
8d95019442 LPC176x NeoPixel Support (#13322) 2019-03-06 23:54:19 +00:00
Scott Lahteine
893ee68b52 Clean up trailing whitespace 2019-03-06 01:02:43 -06:00
Scott Lahteine
39f1222060 One fewer G29 error string 2019-03-05 23:04:52 -06:00
InsanityAutomation
543fc4c117 Mention 2.0.x 8-bit support earlier in README (#13317) 2019-03-05 23:03:00 -06:00
Scott Lahteine
cfdb38eda4 Allow SERIAL_ECHOPAIR to take up to 12 pairs (#13311) 2019-03-05 06:46:19 -06:00
Scott Lahteine
4771e372a1 Update criteria for PAUSE/RESUME/STOP menu items (#13294) 2019-03-05 06:46:06 -06:00
Tobias Frost
56fdcf93d1 Disallow SD_DETECT_INVERTED with FYSETC F6. (#13307) 2019-03-05 06:45:28 -06:00
Tobias Frost
7ce13a6ec1 Fix a print_job_timer compile error (#13304) 2019-03-05 06:39:15 -06:00
Tobias Frost
6df51201ae Include EXTENSIBLE_UI in single LCD sanity check (#13306) 2019-03-05 06:33:36 -06:00
Scott Lahteine
2e5a3b01fd Save Power Loss Recovery only on move commands 2019-03-05 02:43:29 -06:00
Scott Lahteine
15738ea506 Update a motion comment 2019-03-05 00:50:29 -06:00
Scott Lahteine
bc87e97357 Prevent a tool change move out of bounds 2019-03-05 00:50:29 -06:00
Scott Lahteine
2212da453a Distinguish between analog/digital auto fans (#13298) 2019-03-05 00:41:31 -06:00
Chris Pepper
2513f6b550 Fix multiport G28 with Binary Transfer (#13308) 2019-03-04 16:44:54 +00:00
Chris Pepper
38bef9da91 Report auto temp to both serial ports, if available (#13301) 2019-03-03 21:03:48 -06:00
Robert Mendon
367d392880 Init stepper current after stepper pins are set up (#13302) 2019-03-03 20:58:02 -06:00
InsanityAutomation
bf8b38e0f7 Relocate configs above Marlin/src folder (#13299) 2019-03-03 16:50:56 -06:00
Scott Lahteine
d71dc5cf42 Fix for Ender 4 fan/case light pin
See #12731
2019-03-03 07:43:27 -06:00
Anthony Rich
7640b328df Support for Tronxy X5S 2e (#13297) 2019-03-03 07:41:05 -06:00
Scott Lahteine
599cdc3f0f Remove dead code from get_pid_output
See #12981
2019-03-03 05:45:20 -06:00
Scott Lahteine
35ae5daf2d Split up sdcard G-codes 2019-03-03 01:52:15 -06:00
Scott Lahteine
3f36a38512 Clean up some pre-serial-redirect includes 2019-03-03 01:52:15 -06:00
Scott Lahteine
fa0d909dd3 Add FIL_RUNOUT_PIN for BIGTREE_SKR_V1.3
See #13267
2019-03-03 00:27:47 -06:00
Ludy
bd4160dbaf Unused CS_ACTUAL_sb (#13282) 2019-03-02 17:30:30 -06:00
Vasily Evseenko
71773b128d Fix stepper use before init. Add Ultimaker2+ Extended clone config (#13284) 2019-03-02 17:29:02 -06:00
Scott Lahteine
edc4e037c4 Add a note to G10 2019-03-02 17:19:36 -06:00
Tobias Frost
57afd0ab37 Fix range check bug in FileList::seek() (#13286)
When `count()` returns 0, `pos > (count()-1)` will always yield `true` due to integer underflow.
2019-03-02 16:43:08 -06:00
kAdonis
05c2f80826 Fix bug in wait-for-heatup (#13290) 2019-03-02 16:29:10 -06:00
Chris Pepper
b0553d2d97 Add M997 support and simple implementation for LPC176x (#13281) 2019-03-01 20:11:50 -06:00
Scott Lahteine
fa236e9718 General cleanup ahead of L64XX 2019-03-01 19:58:07 -06:00
Scott Lahteine
2f1e1dcb42 Gradual step towards EXTRUDERS 0 support 2019-03-01 01:51:24 -06:00
Scott Lahteine
99d0022fae Drop the Z_MIN_PROBE_ENDSTOP option (#13276) 2019-03-01 00:27:45 -06:00
Scott Lahteine
9a6b90f47d TMC2660.h comment tweaks 2019-03-01 00:25:22 -06:00
Scott Lahteine
a2e3226597 Init XYZ to configured home position 2019-02-28 22:10:26 -06:00
Scott Lahteine
4fbbce9a35 Marlin Dev Mode for DOGM status screen 2019-02-28 22:10:26 -06:00
Scott Lahteine
998ce55be0 Alternative fan bitmap 2019-02-28 22:08:20 -06:00
InsanityAutomation
e2e2a55d9b Add thermistor type 67 SliceEng (#13275) 2019-02-28 19:44:17 -06:00
Msq001
5b7ad3a5a0 Fix SKR onboard TF card CS pin (#13272) 2019-02-28 19:41:19 -06:00
Scott Lahteine
7fde3ed915 Skip hysteresis check when temp is already close to target
To eliminate a long delay during pause, park, and filament change
2019-02-28 14:35:19 -06:00
Chris Pepper
7de6476b3d Fix binary protocol error 2019-02-28 02:31:42 +00:00
Scott Lahteine
2c10222e87 card.transfer_port => transfer_port_index 2019-02-27 20:14:17 -06:00
Chris Pepper
4ab433d391 Fix binary protocol with one serial port (#13270)
- The `sdcard.transfer_port` variable is Marlin's internal serial port index, not the physical serial port number.
- Added packet number to "ok" response so hosts don't need to wait for the ACK.
- Renamed feature to `BINARY_FILE_TRANSFER`, as the speed up is only consequential to the ability to transfer binaries over serial.
2019-02-27 19:57:48 -06:00
Scott Lahteine
ab781de5a0 Fix opt_add to accept quotes 2019-02-27 05:53:09 -06:00
InsanityAutomation
eb4bf93ea4 Add more Babystep options (#13262) 2019-02-27 04:38:56 -06:00
Scott Lahteine
f37df28d17 UBL G29 T current position fix
Counterpart to #12845
2019-02-26 22:25:53 -06:00
Msq001
f8a39919fa Add Bigtree SKR 1.3 board (#13267)
Co-Authored-By: Msq001 <msq001@users.noreply.github.com>
2019-02-26 21:30:00 -06:00
Bob Kuhn
ddbe4cfa20 Printrboard G2 support (#13116) 2019-02-26 21:03:13 -06:00
Scott Lahteine
4200f9ed62 Hide freeMemory et.al. warnings 2019-02-26 18:03:00 -06:00
Scott Lahteine
dc88747770 Fix Due GET_ARRAY_IS_DIGITAL
Co-Authored-By: bob-the-kuhn <bob.kuhn@att.net>
2019-02-26 17:49:14 -06:00
Scott Lahteine
2356970a91 Disable STM32F1 Travis CI test for now 2019-02-26 17:49:14 -06:00
Scott Lahteine
a79b9bbe6b Cleanup whitespace, add a const 2019-02-26 17:49:14 -06:00
Giuliano Zaro
2616e4d4d9 Remove duplicated 'chitchat' defines (#13258) 2019-02-25 16:13:01 -06:00
Scott Lahteine
5d28575d4d Clean up some motion code 2019-02-25 16:01:42 -06:00
Scott Lahteine
808b076000 Update some ABL/UBL conditionals 2019-02-25 16:01:42 -06:00
Scott Lahteine
833c2e54a1 Add an empty flushTX to MarlinSerialUSB_Due 2019-02-25 13:48:14 -06:00
Scott Lahteine
38363902c7 Fix sanity checks for distinct E factor settings
Reference #13156
2019-02-25 00:20:36 -06:00
Scott Lahteine
64253e1a58 Followup to serial reform
Reference #13250
2019-02-25 00:20:36 -06:00
Minims
92a4984066 Fix G34 probe position (#13251) 2019-02-24 13:57:30 -06:00
Scott Lahteine
e15354e387 Simplify serial port redirect (#13234) 2019-02-23 22:53:01 -06:00
Chris Pepper
88cc1d1a31 Fix Preprocessor syntax in Re-ARM pins file (#13247) 2019-02-24 01:36:58 +00:00
Karl Andersson
76e9ee33aa Fix include order to make SERIAL_PORT_2 work (#13241) 2019-02-23 16:56:09 -06:00
Bruce j Beare
562f2321d2 Fix a G34 bug, allow negative Z corrections (#13240) 2019-02-23 02:41:52 -06:00
FernandoVelcic
edf025ed8d Update Spanish language (#13236) 2019-02-23 00:41:02 -06:00
Scott Lahteine
02fec89a0d Turn fans off in zero_fan_speeds
Addressing #13231
2019-02-22 21:00:44 -06:00
Scott Lahteine
15aa932aa6 HAL for Linux (#13146) 2019-02-22 19:09:10 -06:00
kwalters3
5eb82ca6a8 Change SSD1306_OLED_I2C_CONTROLLER to HAS_SSD1306_OLED_I2C (#13223) 2019-02-22 19:08:36 -06:00
Marcio Teixeira
109e67169c Define G21 as NOOP w/o INCH_MODE_SUPPORT (#13229)
Ticket #13228

If `INCH_MODE_SUPPORT` is undefined, G20 is an unknown command as it should be (Marlin is, by default, operating in metric mode). G21, however, is found in many slicers and printer start gcode sections and should be accepted (as a NOOP) to avoid the unknown commands.
2019-02-22 15:35:32 -06:00
AnHardt
31b0be74af Fix autotemp_factor menu setting (#13226)
Fix #12643
Only factors above 1 can have a 'positive' effect.
2019-02-22 15:30:17 -06:00
Evgeny-SPB
f6ab62bc13 Fix Creality CR-10 S5 filament change (#13219) 2019-02-21 05:40:49 -06:00
Thomas Moore
9f5e4e5ad8 Update LPC1769 Pins Files (#13183) 2019-02-21 00:54:05 -06:00
Greg Nutt
608a6810e7 Fix DOGLCD_A0 pin in pins_Smoothieboard.h (#13217) 2019-02-20 18:08:49 -06:00
Scott Lahteine
80359c9937 Add more parameters to M240
Co-Authored-By: shitcreek <45380455+shitcreek@users.noreply.github.com>
2019-02-20 14:51:36 -06:00
Scott Lahteine
a43e892fb5 Use 8-bit i2c address on LPC platform
Fix #9799 — hopefully not a unicorn
2019-02-20 06:27:26 -06:00
Scott Lahteine
631d867dc9 HAL cleanups 2019-02-20 06:27:26 -06:00
Scott Lahteine
89bbc30a09 Fix init of power supply pin
Fix #13184
2019-02-20 05:29:05 -06:00
Scott Lahteine
44c22e3935 Provide a default MAX6675_SS_PIN for ReARM
See #8010
2019-02-20 05:06:06 -06:00
Scott Lahteine
3c9a7926c2 Fix compile error with JUNCTION_DEVIATION
See #13000
2019-02-20 04:54:26 -06:00
Scott Lahteine
758c6c9464 Very minor SPI speedup 2019-02-20 04:36:23 -06:00
Scott Lahteine
422dd6666e Fix Due EEPROM write bug
See #13065
2019-02-20 04:36:23 -06:00
Scott Lahteine
03e109c4a3 FLASH_EEPROM => FLASH_EEPROM_EMULATION 2019-02-20 04:36:23 -06:00
Scott Lahteine
50917ccda6 Tweak some u8g interface code 2019-02-20 04:26:34 -06:00
LinFor
ba39186364 TMC_DEBUG optimization and improvements (#13135) 2019-02-20 02:22:42 -06:00
Scott Lahteine
1424b368cf Tweak M122 comment in configs 2019-02-19 16:20:18 -06:00
Scott Lahteine
3a1b6fe8c1 Coding standards 2019-02-19 14:58:39 -06:00
InsanityAutomation
19af90face Fix a host action compile error (#13208) 2019-02-19 14:47:31 -06:00
Marcio Teixeira
992cdc8d14 Fix host action / G-code ordering in event_probe_failure (#13207)
Observing from the console, it makes the most sense to do `//action:probe_retry` before executing commands.
2019-02-19 14:45:03 -06:00
InsanityAutomation
33a6d52965 Fix a RAPTOR2 pin conflict (#13205) 2019-02-19 14:42:02 -06:00
InsanityAutomation
52665f54ad Fix bad Purge More logic (#13193) 2019-02-19 14:37:18 -06:00
Scott Lahteine
18458ec42b Error in Smoothieboard for unsupported display 2019-02-19 14:17:33 -06:00
InsanityAutomation
d4ed9b3ef1 Babystep also requires homing (#13191) 2019-02-17 14:35:45 -06:00
InsanityAutomation
ca7b2f574f Fix condition on tool change filament swap menu (#13190) 2019-02-17 12:33:46 -06:00
Roman Moravčík
208ab8b366 Fix compilation with one service interval (#13185) 2019-02-17 12:32:47 -06:00
Roman Moravčík
567d03a269 Update Slovak language (#13187) 2019-02-17 12:29:49 -06:00
Scott Lahteine
c041eec699 Update G-code syntax for Sublime 2019-02-16 19:46:46 -06:00
Alain Martel
27203c62b8 Enable M240, set photo pins for 3DFabXYZ i3 (#13174) 2019-02-15 21:16:39 -06:00
Evgeny-SPB
3025ddf179 Support for Creality CR-10 5S (#13173) 2019-02-15 21:09:44 -06:00
Scott Lahteine
e00aad84af Add M240 parameters D I J R S 2019-02-14 20:00:40 -06:00
Marcio Teixeira
31c240a8db Enhancements to G425 (#13159)
- Turn off bed leveling prior to calibrating.
    - This prevents lateral probes from having a Z component that
      triggers the Z endstop and causes the motion to be aborted.
- Got rid of static const float arrays "dimension" and "true_center"
    - Frees up 24 bytes of SRAM
- Changed incorrect use of "bool" for float in backlash macros.
    - Replaced arguments with 0.0f and 1.0f for clarity.
- Now only disables soft endstops (since calibration cube is outside of bed)
    - Not necessary to disable global endstops
2019-02-14 16:45:31 -06:00
Andy Shaw
84fc400aba Update BIQU SKR V1.1 pins, add TMC2130 settings (#13166)
* Remove untested displays add TMC2130 configs.
* Remove references to the ReARM, delete untested displays. Add TMC2130 settings. Cleanup spacing, etc.
2019-02-14 16:43:56 -06:00
Scott Lahteine
ab2816c870 Patch for M240 2019-02-14 15:13:57 -06:00
Scott Lahteine
d2bdb71c13 Add PHOTO_GCODE option, photo trigger physical move (#13168) 2019-02-14 15:09:35 -06:00
Scott Lahteine
be9a409980 Fix M125 XY parameters, export get_homing_bump_feedrate 2019-02-14 05:25:46 -06:00
Scott Lahteine
ce40c2e87c Use do_blocking_move_to(ref, fr) 2019-02-14 02:22:08 -06:00
Giuliano Zaro
bdc2f10b90 Update Italian language, fix unused var warning (#13164) 2019-02-13 21:05:18 -06:00
Marcio Teixeira
9f0e1834ec Followup to #13039 (#13163)
- Fix compile error when accessing `process_subcommands_now_P`.
- Use `const` var eliminating double-negative (to make code more understandable).
2019-02-13 20:39:38 -06:00
Ludy
1ace97e946 [2.0.x] Update German language (#13150) 2019-02-13 20:31:50 -06:00
Scott Lahteine
7cf9b93f26 Add HAS_FILAMENT_SENSOR ahead of 12962 2019-02-12 20:13:20 -06:00
Giuliano Zaro
2c8d12d3ec Update Italian language (#13148) 2019-02-12 18:40:34 -06:00
Scott Lahteine
c2b90c44e4 Prettify some code comments 2019-02-12 17:43:37 -06:00
Scott Lahteine
a0dadc8c62 Smaller I2CPositionEncoder strings 2019-02-12 16:21:56 -06:00
Scott Lahteine
18996d2595 Fix some spelling 2019-02-12 16:21:56 -06:00
revilor
e56c13670d Service interval watchdog (#13105) 2019-02-12 15:58:56 -06:00
InsanityAutomation
7f1b69b0c8 Add HOST_PROMPT_SUPPORT (#13039) 2019-02-12 15:55:47 -06:00
Scott Lahteine
0feeef2604 Update copyright in headers 2019-02-12 15:30:11 -06:00
Scott Lahteine
894f5c24a8 Fix trailing whitespace 2019-02-12 14:25:57 -06:00
Roman Moravčík
bace52afd7 Fixed compilation with MMU2_MENUS disabled (#13140) 2019-02-12 12:55:49 -06:00
Ludy
584f9cd449 Update German language (#13137) 2019-02-12 12:54:57 -06:00
Scott Lahteine
d9a3fea022 Comments in HAL_spi_STM32F1.cpp 2019-02-11 18:06:33 -06:00
Giuliano Zaro
773fa5c40f Fix define used when PID is off (#13119)
Replaced `PID_MAX` with `BANG_MAX` since it should be the correct define to be used when PID is not enabled.
2019-02-11 17:29:17 -06:00
Giuliano Zaro
f7efe6f6c5 [2.0.x] Fix TEMP_STAT_LED startup init (#13120) 2019-02-11 17:27:59 -06:00
Ludy
2bd6ce4b62 Update German language (#13125) 2019-02-11 17:08:21 -06:00
Giuliano Zaro
27115ff7eb Update Italian language (#13123)
Incomplete.
2019-02-11 17:07:21 -06:00
Roman Moravčík
08a8bd10ca Updated Slovak translation (#13122) 2019-02-11 17:06:10 -06:00
Scott Lahteine
3e2a4c3b26 Show mixer and temperature menus while printing 2019-02-11 16:52:47 -06:00
Scott Lahteine
8d271f20fe C10mini E steps of 95
See https://www.patreon.com/posts/creality-cr10-24602624
2019-02-10 14:23:05 -06:00
Scott Lahteine
9737608f0a Enable gradient when alias is cleared 2019-02-10 06:39:12 -06:00
Simon Jouet
5cd0fa3ce1 Basic GPIO expander using the ESP32 I2S peripheral (#12959) 2019-02-10 05:40:31 -06:00
Scott Lahteine
3983cacbcf No extern needed for func decl 2019-02-10 05:38:27 -06:00
Scott Lahteine
43b29c093b Update pinsDebug_list.h with XY PWM pins 2019-02-10 05:13:05 -06:00
Scott Lahteine
166e567ab8 Fix HAS_MOTOR_CURRENT_PWM 2019-02-10 05:06:46 -06:00
Scott Lahteine
6de3d34378 M166 Gradients, LCD Menu for 2-channel Mixer (Geeetech A10M/A20M) (#13022) 2019-02-10 04:54:23 -06:00
LinFor
7ee35c2611 PID_MENU option to save PROGMEM in LCD menus (#13095) 2019-02-10 04:03:18 -06:00
Ludy
936f982392 Update German Language (#13110) 2019-02-10 03:55:08 -06:00
AnHardt
0e37fe8776 Apply minimum C in M303 (#13113)
Apply minimum `C` in `M303`. `PID_autotune()` needs to be called with a 'C'ycles-parameter >2 to give meaningful (different from 0) PID-factors. Therefore silently raise C to 3. Fixing one aspect of #13104
2019-02-10 03:54:45 -06:00
Scott Lahteine
5a316664e5 Update chopper timing 2019-02-10 03:12:20 -06:00
Scott Lahteine
fcb16ceb29 Update default config 2019-02-10 00:20:11 -06:00
Alain Martel
9ae7cca5e9 Disable RGB_LED for 3DFabXYZ (#13097) 2019-02-08 15:18:20 -06:00
Scott Lahteine
f3b6cb4d34 Clean up, update config comments 2019-02-08 15:13:52 -06:00
Scott Lahteine
ae03753ef1 Fix PCA9533 with PRINTER_EVENT_LEDS 2019-02-08 15:13:52 -06:00
Scott Lahteine
95d3f3953a DEFAULT_WEBSITE_URL => BOARD_WEBSITE_URL 2019-02-08 14:54:34 -06:00
Scott Lahteine
6ddd81c178 [2.0.x] Update German Language (#13100)
add MMU2
2019-02-08 14:25:24 -06:00
Giuliano Zaro
7c9ff322f3 Update Italian language (#13099) 2019-02-08 14:23:37 -06:00
Ludy
ce8cb6a5d9 [2.0.x] Update German Language
add MMU2
2019-02-07 20:04:34 +01:00
Scott Lahteine
f269766408 Put the MMU2 menu with the others 2019-02-06 17:38:46 -06:00
Marcio Teixeira
e1604198ff G425 — Auto-calibrate Backlash and Nozzle Offsets (#13050) 2019-02-06 17:20:17 -06:00
Marcio Teixeira
113af46a1b Add ExtUI methods to babystep probe/nozzle offsets (#12590) 2019-02-06 07:16:54 -06:00
InsanityAutomation
413e303ad5 More Advanced Pause options (#12984) 2019-02-06 06:39:42 -06:00
Mark Zachmann
19cf72e057 Support individual solenoid disable with M381 (#13008) 2019-02-06 06:34:53 -06:00
teemuatlut
d81342254a Support new TMC drivers (#13026) 2019-02-06 06:33:14 -06:00
Scott Lahteine
e1587da228 Clean up HAL_spi_Due.cpp (#13087) 2019-02-06 06:31:31 -06:00
Rolf Werum
524c6c10bf MAGNETIC_PARKING_EXTRUDER (#12351) 2019-02-06 06:30:53 -06:00
Scott Lahteine
1bd9a63049 Add HAS_EXTRA_ENDSTOPS macro 2019-02-06 05:10:05 -06:00
Scott Lahteine
3c49396370 Fix compile error with DUE + MAX6675 (#13086) 2019-02-05 22:56:13 -06:00
Roxy-3D
ab6908a513 Fix Probe Offset bug... 2019-02-05 20:30:20 -07:00
revilor
69aaf5d096 MMU2 fixes (#13082) 2019-02-05 20:56:22 -06:00
Scott Lahteine
2f8e89adc3 Remove extraneous ui. prefixes 2019-02-05 19:04:37 -06:00
Scott Lahteine
870757aa17 Tweaks to pins_GT2560_V3.h 2019-02-04 22:52:50 -06:00
Scott Lahteine
b96cc30cd0 HAL spacing tweak 2019-02-04 21:51:06 -06:00
Scott Lahteine
9e394139e5 Followup to 90911104 2019-02-04 10:46:52 -06:00
Sam Lane
b35a7c2c87 Fixed closed-loop planner stall (#13005) 2019-02-04 07:43:09 -06:00
Ludy
691e925adc Update German language (#13012) 2019-02-04 07:25:07 -06:00
Scott Lahteine
1497fb388a M29 match logic was reversed (#13013)
* M29 logic was reversed 

If in card-saving mode generate errors line errors for anything that's *NOT* "M29 ?"

* Update queue.cpp

* Update queue.cpp
2019-02-04 07:23:42 -06:00
Scott Lahteine
b5fd2fb58b Allow M29 to be processed late 2019-02-04 07:23:02 -06:00
Scott Lahteine
c03bac9ad4 Update queue.cpp 2019-02-04 07:17:40 -06:00
Scott Lahteine
a49f0205ea Update queue.cpp 2019-02-04 07:11:08 -06:00
Andy Shaw
9091110460 LPC1768 - Don't change CS pin state (#13015) 2019-02-04 07:08:39 -06:00
Scott Lahteine
10d855cb21 Sanity check USER_GCODE formatting 2019-02-04 06:36:41 -06:00
Scott Lahteine
d97bb4c41c Followup to e10943d0 2019-02-04 06:11:31 -06:00
jeffstaley
2f176d6fb8 Flush RX buffer on G-code line errors to prevent hang (#13018) 2019-02-04 06:03:49 -06:00
Scott Lahteine
ca73b2f465 Add static assert to catch errors in COPY(a,b) 2019-02-04 05:52:32 -06:00
Nathan
df1043516e Fix the delta homing issue (#12974) 2019-02-04 05:25:50 -06:00
Scott Lahteine
4200bd2fc1 Report on M92 with no arguments (#12833) 2019-02-04 05:24:15 -06:00
Scott Lahteine
e10943d0d8 Minor tweak to main menu 2019-02-04 04:58:31 -06:00
Scott Lahteine
d4d1b28a06 Fix some include paths 2019-02-04 03:57:15 -06:00
Scott Lahteine
0d720a6ff4 Tweak to emergency_parser.h 2019-02-04 03:56:56 -06:00
Scott Lahteine
0a7ea7063f Hide Resume Print when not relevant 2019-02-04 03:02:44 -06:00
Scott Lahteine
afe79ba22b Minor code cleanup 2019-02-04 02:23:06 -06:00
Scott Lahteine
fdb97a3e9c Add class and macro to save and auto-restore a variable 2019-02-04 02:23:06 -06:00
Scott Lahteine
433518de74 Prevent M420 error from disconnecting OctoPrint
Just echo the error instead of labeling it `Error:`.
2019-02-04 01:54:43 -06:00
Marcio Teixeira
5cfc1cdacc Support SWITCHING_NOZZLE with 2 servos (#13054) 2019-02-04 00:19:56 -06:00
Psycho
3c88cac2e9 Velleman Vertex Delta pins (#13072) 2019-02-04 00:15:08 -06:00
Nicolas G
6fb4001b58 Add option to disable fan speed slowing in M303 (#13066) 2019-02-04 00:12:41 -06:00
Scott Lahteine
ca1be02bf0 Tweak some pins formatting 2019-02-04 00:06:41 -06:00
Scott Lahteine
38c2ca9281 Clean up trailing whitespace 2019-02-03 23:00:57 -06:00
Mark Zachmann
4d1093b386 Fix init of last_direction_bits (#13067) 2019-02-03 01:29:00 -06:00
Scott Lahteine
4fa1c52688 Tweak serial output code 2019-02-03 01:09:14 -06:00
Scott Lahteine
a5e3384691 Pre-apply cosmetic changes to mixing 2019-02-03 01:09:14 -06:00
Scott Lahteine
0358ffcd4c Drop E element from homing_feedrate_mm_s 2019-02-02 15:55:00 -06:00
Scott Lahteine
95223cb28e Remove dead code from stepper.h
These values are always supplied by `Conditionals_post.h`.
2019-02-02 15:35:05 -06:00
Scott Lahteine
6fe39e6117 Add --quick option to mfqp, add BRANCH check to mfinfo 2019-02-02 14:06:01 -06:00
mattfredwill
c3cb449990 TMC2130 dual-stepper Sensorless Homing (#13061) 2019-02-01 18:09:01 -06:00
Marcio Teixeira
f6edd2c472 Move stepper settings to "Advanced Settings" menu (#13063) 2019-02-01 18:07:04 -06:00
InsanityAutomation
68bbac207e Update pins_FORMBOT_TREX3.h (#13058) 2019-02-01 18:06:02 -06:00
revilor
6a57d0b381 Prusa MMU2 (#12967) 2019-01-31 19:10:52 -06:00
Scott Lahteine
996f7d1642 Fix I2C_POSITION_ENCODERS commentary 2019-01-30 22:17:17 -06:00
raTmole
988b5aa4e6 Update GT2560 V3 pins (#13036) 2019-01-30 21:10:56 -06:00
InsanityAutomation
7d927b6691 Move Z Probe Z Offset from Advanced to basic Configuration (#13056) 2019-01-30 21:08:36 -06:00
Giuliano Zaro
31e213e427 Always show Tune sub-menu (#13049) 2019-01-30 21:05:55 -06:00
teemuatlut
f0503372d9 Revert E_AXIS_N cast (#13055) 2019-01-30 20:55:05 -06:00
InsanityAutomation
a1d03fe7ba Fix single nozzle fan (#13038) 2019-01-30 20:54:04 -06:00
Scott Lahteine
159d7eefda New boards entry for the A20M 2019-01-28 21:08:20 -06:00
Scott Lahteine
97da6c1da5 Use MIN/MAX for min/max 2019-01-28 20:36:13 -06:00
Scott Lahteine
17a8c37148 Label menu edit items 2019-01-28 20:20:46 -06:00
raTmole
ddeca7a358 Fix resume from power loss G-Code. (#13035) 2019-01-28 13:19:26 -06:00
Thomas Moore
02ab66fca3 Update Cohesion3D Pins Files (#13027) 2019-01-27 23:11:33 -06:00
Giuliano Zaro
a79d80c78e Minor cleanup of pause code (#13030) 2019-01-27 23:10:25 -06:00
jeffstaley
0da636e1a3 Set correct stepper direction on reset (#13032)
On a reset steppers were being initialized to incorrect direction. Original code wasn't respecting `INVERT_Z_DIR` define.
2019-01-27 23:02:38 -06:00
Scott Lahteine
3845baf398 Followup to #12982 2019-01-27 22:53:46 -06:00
InsanityAutomation
48a3502656 Remote streamer improvements (#12982) 2019-01-27 22:43:13 -06:00
Scott Lahteine
621fbe99de Followup to #12817 2019-01-27 20:48:58 -06:00
Marcio Teixeira
f214118e45 Action to notify host of filament runout. (#12817) 2019-01-27 20:18:05 -06:00
Scott Lahteine
aad770bce8 Bring default configs in sync 2019-01-26 16:44:42 -06:00
jeffstaley
3f91233f6d M29 logic was reversed
If in card-saving mode generate errors line errors for anything that's *NOT* "M29 ?"
2019-01-25 07:36:52 -08:00
jeffstaley
0e0cc13650 Fix M29 for Pronterface SD card upload (#13010) 2019-01-24 21:10:59 -06:00
Jiri
24fffb8d93 Fix undefined lcd_tmpfan_speed on NO_LCD_MENUS (#13006) 2019-01-24 16:34:40 -06:00
Scott Lahteine
8f9b246d0e Tweak some formatting, replace tabs 2019-01-24 13:18:56 -06:00
Bo Herrmannsen
808df82b36 Support for Anycubic I3 (#12972) 2019-01-24 12:40:49 -06:00
Scott Lahteine
ae91914260 Prevent name conflicts with mixed stepper drivers 2019-01-24 01:25:28 -06:00
Scott Lahteine
2b54e98f50 Remove L6470 test for LPC176x 2019-01-24 00:59:05 -06:00
Scott Lahteine
0eca236dcd Fix L6470 config comments 2019-01-24 00:58:16 -06:00
InsanityAutomation
f4d1f13358 Warn on cold extrusion, dont error 2019-01-24 00:16:14 -06:00
Scott Lahteine
aa74a900f5 Bring Rostock 301 and ArmEd configs up to date 2019-01-23 23:37:37 -06:00
Scott Lahteine
a073293b6a Add --quick option to mfrb 2019-01-23 23:10:32 -06:00
Scott Lahteine
2117a45d1a Tweak usage strings 2019-01-23 23:10:32 -06:00
Scott Lahteine
0f07ba4f09 Tweak some comments 2019-01-23 20:18:13 -06:00
Scott Lahteine
00cdd41b5f Clean up for recent changes 2019-01-23 20:08:58 -06:00
Roman Moravčík
7d53b79596 Update Slovak translation (#12991) 2019-01-23 19:48:16 -06:00
Giuliano Zaro
18c32996c1 [2.0.x] Updated Italian language (#12997) 2019-01-23 19:35:42 -06:00
Bob Kuhn
7c1a5e3c47 Fix TEMP_TIMER in pins_STEVAL.h (#12994) 2019-01-23 19:34:39 -06:00
Scott Lahteine
b4994ad12e Update language_it.h 2019-01-23 19:28:57 -06:00
Bob Kuhn
2f35747f29 L6470 SPI daisy chain support (#12895) 2019-01-23 19:06:54 -06:00
Scott Lahteine
6453b82a5e Clean up trailing whitespace 2019-01-23 15:57:01 -06:00
Scott Lahteine
48a581ba2e Tweak some HAL Due code 2019-01-23 00:53:20 -06:00
Scott Lahteine
f7d96c5b28 Update mfinfo to allow extra parameters 2019-01-23 00:03:47 -06:00
Marcio Teixeira
54fdf57b8c ExtUI: Fix fan wrapping around from 0 to 100 (#12987) 2019-01-22 23:33:10 -06:00
InsanityAutomation
dbe4126e07 Update language_en.h (#12988) 2019-01-22 23:32:01 -06:00
teemuatlut
e5801b75f8 Fix TMC-related compile issues. (#12971)
- `STEALTHOP_[XYZE]` configuration options now set the default state.
2019-01-20 23:54:57 -06:00
Gert-Jan Rodenburg
bb30927549 Fix pins for ZONESTAR_LCD with Zonestar ZRIB (#12956) 2019-01-20 23:52:51 -06:00
Ludy
dc65d96aca Fix TMC compile error (#12965) 2019-01-20 23:47:28 -06:00
InsanityAutomation
a1cf49935d Add laser control menu (#12883) 2019-01-20 23:41:47 -06:00
InsanityAutomation
75f2665f2e LCD SD Card items near top when not using wheel (#12926) 2019-01-20 23:24:53 -06:00
Scott Lahteine
e1f951813a Remove old block end comment 2019-01-20 02:30:03 -06:00
Scott Lahteine
52108192d1 Prevent L6470 class name conflict with drivers.h define
Fix #12824
2019-01-20 00:32:56 -06:00
Scott Lahteine
0495fcd475 Minor spacing fix 2019-01-20 00:10:50 -06:00
lanserge
c2cf8ffa82 Add support for Arduino DUE Shield Kit (#12950) 2019-01-19 23:43:32 -06:00
Scott Lahteine
4e5a915ef8 Fix some Makefile comments 2019-01-19 23:41:30 -06:00
Scott Lahteine
a5911765c3 Tweak some spacing 2019-01-19 20:27:57 -06:00
chrisly42
99e5e8362f Rapide Lite 200 config, pins_RL200 RUMBA clone (#12848) 2019-01-19 20:19:14 -06:00
Scott Lahteine
6411680364 Update some pins spacing 2019-01-19 19:21:52 -06:00
teemuatlut
8a3f1d6932 Fix chopper timing struct and initialization (#12943) 2019-01-19 18:57:02 -06:00
Ludy
c6991109b7 Update German language (#12953) 2019-01-19 18:50:24 -06:00
Giuliano Zaro
ca9eb14f6a Update Italian language (#12951) 2019-01-19 18:48:13 -06:00
Ludy
acf266fe78 Fix a compile warning, etc. (#12955) 2019-01-19 18:47:29 -06:00
Scott Lahteine
424aa05cc2 Fix some file endings 2019-01-19 18:19:12 -06:00
Scott Lahteine
ce563d7c2e Various general cleanups
Mostly from the L6470-oriented PR
2019-01-19 16:56:12 -06:00
Scott Lahteine
02cc63d6d4 Update CreatorPro Configuration_adv.h 2019-01-19 16:37:50 -06:00
Marcio Teixeira
f4c16e683b Follow up fixes to #12884 (#12940) 2019-01-17 18:48:29 -06:00
Scott Lahteine
712e23c383 Fix up some whitespace 2019-01-17 18:05:36 -06:00
Ziemowit
20c20dacb7 MKS SBASE needs DRV8825 (#12911) 2019-01-17 13:21:53 -06:00
Giuliano Zaro
7bb5d4bfe8 Small LED code reorganization (#12929) 2019-01-17 13:20:26 -06:00
teemuatlut
e6805582a6 M569 to change stepping mode. Add new TMC section to LCD. (#12884) 2019-01-17 13:17:16 -06:00
Bob Kuhn
d08f27e27b Add support for STEVAL 3DP001V1 (#12894) 2019-01-15 18:59:36 -06:00
Alain Martel
cdb562d558 Bring Migbot config up to date (#12916) 2019-01-15 18:53:07 -06:00
Giuliano Zaro
8f4c6e6d1a Fix case light on boot (#12919) 2019-01-15 18:50:56 -06:00
Marcio Teixeira
f11c6d5d02 Fix M107 when dual-nozzles share fan (#12819) (#12909) 2019-01-15 18:45:18 -06:00
Karl Andersson
64a4649290 STM32 - Fix SD write (#12897) 2019-01-15 18:44:22 -06:00
Ludy
294521439e Clean up Configuration_adv.h (#12900) 2019-01-15 18:42:10 -06:00
InsanityAutomation
59b18aaeef Allow resume from pause with parking enabled (#12893)
Currently, Pause of an SD-Memory card print does not work.    This has been verified to resolve the issue by multiple people.   

I understand more work needs to be done to resolve some of the concerns...
2019-01-15 07:58:54 -07:00
Giuliano Zaro
85f149befe Save some progmem (#12913) 2019-01-14 20:56:30 -06:00
mikeshub
7fde8d9d1e Add CreatorPro / Makerbot / QIDI / etc and Mightboard RevE support (#12855)
- Fix a bug in MAXxxxx thermocouple temp reporting.
- Add support for 3-wire HD44780.
- Add support for PCA9533 RGB driver.
- Add configuration examples for FlashForge CreatorPro.
2019-01-14 14:29:55 -06:00
Scott Lahteine
3644c940bf Tweak SD section of Main Menu 2019-01-13 18:00:07 -06:00
teemuatlut
1a79878dff Remove TMC_Z_CALIBRATION in favor of Z_STEPPER_AUTO_ALIGN 2019-01-12 18:07:28 -06:00
Scott Lahteine
7cfce20cd3 Update comments on M125 2019-01-12 17:52:44 -06:00
Jason
dc4786a504 Config files for PowerWASP Printer (#12889) 2019-01-12 16:57:45 -06:00
Scott Lahteine
3e867008f0 Fix some HAL_STM32F1 type declarations 2019-01-12 16:21:11 -06:00
Scott Lahteine
eb78aed863 Rename LCD menus according to variable types (#12892) 2019-01-12 16:01:04 -06:00
InsanityAutomation
ed3ab5e212 Fix M24 not starting new job (#12887) 2019-01-12 15:30:44 -06:00
Nils Hasenbanck
f9299c4461 Make timer definition in pin files for STM32 possible (#12874)
RemRam needs to redefine a particular timer to work correctly. The HAL did foresee this possibility and checks if the timer was already defined for either the stepper or temperature timer.

Prior to this commit the header file for the timers couldn't see those definitions in the pin file, but this commit will fix this.

Tested on an actual hardware to verify. (It wouldn't boot without it.)
2019-01-12 14:40:49 -06:00
InsanityAutomation
082f6a27de ADAPTIVE_FAN_SLOWING extension to hotend thermal protection (#12853) 2019-01-12 00:41:48 -06:00
Scott Lahteine
459f4fef60 Fix Temperature::init bug with HEATER_4_PIN 2019-01-11 22:54:26 -06:00
InsanityAutomation
a403d9a50c Improve menu pause / resume (#12876) 2019-01-11 20:42:11 -06:00
Alain Martel
432c21456f Add 3DFabXYZ Migbot example config (#12775)
Co-Authored-By: Alain Martel <alain74martel@gmail.com>
2019-01-11 20:41:20 -06:00
Scott Lahteine
fb8111553e getStatus => report_status 2019-01-11 19:51:00 -06:00
Chris Pepper
2919f3045d [LPC176x] Update PIO extrascript (#12878) 2019-01-11 19:45:33 -06:00
Scott Lahteine
19fea772e5 Use E_AXIS_N where it makes sense 2019-01-11 19:42:34 -06:00
Scott Lahteine
0d30ccf767 Tweaks to TMC26XStepper 2019-01-11 19:42:34 -06:00
HackingGulliver
1fd8e2c649 Fix: Junction Deviation calculates wrong cos(theta) on CoreXY (#12879) 2019-01-11 19:25:48 -06:00
Scott Lahteine
b402040059 Split bed size sanity check into two 2019-01-11 15:49:57 -06:00
Chris Barr
1d33784bf9 Add RUMBA32 Board (#12856) 2019-01-10 19:34:31 -06:00
Ondřej Nový
a0ef6198ff Level bed corners Z-hop height option (#12858) 2019-01-10 19:15:17 -06:00
Karl Andersson
8ae6f1e556 Fix errors and some compiler warnings with HAL_STM32 PlatformIO build (#12869) 2019-01-10 19:01:31 -06:00
Scott Lahteine
e6484d9dab Return to status when SD card is removed 2019-01-10 15:43:31 -06:00
Scott Lahteine
5f2d75f45b Move PINS_DEBUGGING to @section develop 2019-01-08 20:05:05 -06:00
Scott Lahteine
da42f27c9e Use maths macros for ceil/floor 2019-01-05 21:21:02 -06:00
Ludy
de4561c980 VORON Add LCD option BEEP_ON_FEEDRATE_CHANGE (#12822) 2019-01-05 14:12:05 -06:00
Adrian Cuzman
917cf3c7f0 Fix (broken) link to Install ReArm tutorial (#12823) 2019-01-05 14:04:34 -06:00
Giuliano Zaro
709a6356f7 Remove obsolete test conditions (#12829) 2019-01-05 14:02:45 -06:00
Luu Lac
bcf347403b Fix M106 extruder & fan count (#12820) 2019-01-05 14:01:35 -06:00
Kaushik Vemparala
ba7e35cbab Add LCD option BEEP_ON_FEEDRATE_CHANGE (#12774) 2019-01-04 19:30:08 -06:00
jmz52
d372e7e477 SDIO support for STM32F1 (#12782) 2019-01-04 13:38:07 -06:00
Marcio Teixeira
6a8fb0f25f Simplify backlash compensation code. (#12813)
- Use `TEST(dm,axis)` to determine directions instead of doing comparisons.
- Remove recomputation of `millimeters` and `delta_mm` since backlash compensation should not affect the distance over which material is extruded.
2019-01-04 13:30:56 -06:00
Scott Lahteine
a59d3d4323 Restore Flattr links to README 2019-01-03 17:07:29 -06:00
luxflow
7f244f9b9c Update LPC SD pins for BIQU SKR (#12767)
(Exactly matching the Azteeg X5 MINI Wifi)
2019-01-03 10:44:00 -06:00
jmz52
813a4ea107 Add support for Mks Robin TFT display (#12706)
* Add support for MKS Robin TFT display

- Add support for MKS Robin TFT display and encoder for MKS Robin board.
- Generic 128x64 UI with x2 upscale is used (for now).
- Tested on MKS Robin TFT V2.0 with ST7789V controller.
2019-01-03 10:38:39 -06:00
jmz52
c4237b529f Fix MKS Mini and SD card conflct over SPI mode (#12783) 2019-01-03 10:27:53 -06:00
Phr3d13
01f75591c6 Fix GTM32_PRO_VB Serial and HAL via watchdog (#12753)
Move `watchdog_reset` from `.h` to `.cpp` to eliminate the need to include `MarlinConfig.h` in a HAL-related file.
2019-01-03 09:46:49 -06:00
Scott Lahteine
288340cb6c Followup to VORON 2019-01-03 09:14:14 -06:00
Scott Lahteine
2aaa681dea Remove unused Cheaptronic pins 2019-01-03 08:58:55 -06:00
Marcio Teixeira
81e753064a Fix ExtUI compile warnings and error (#12799) 2019-01-03 08:36:43 -06:00
Ludy
74c47803f7 Add VORON printer (#12705) 2019-01-03 06:27:03 -06:00
kAdonis
637fb20c75 Allow 4 fan animation frames (#12772) 2019-01-03 06:03:06 -06:00
petieken
d9cf5e4883 Update pins_BIQU_SKR_V1.1.h (#12758) 2019-01-02 13:50:05 -06:00
TheLongAndOnly
cb643d87df Adding missing code for triple Z-stepper auto-align (#12786) 2019-01-01 18:22:04 -06:00
Ludy
14a7faf087 Fix compile warning comparison uint and int (#12788) 2019-01-01 18:20:12 -06:00
Marcio Teixeira
60cb36bef3 Misc. improvements (#12747)
* Make ExtUI respect MAXTEMP limits
  - Temperatures are now clamped by MAXTEMP limits rather than arbitrary values.
* Speed up USB init, add status
  - Speed up USB initialization
  - Show status message if init failed
* Enable status messages for EXTENSIBLE_UI
* Adjust max limit to MAX_TEMP - 15
* Misc. tweaks to formatting, const, etc.
2019-01-01 15:17:48 -06:00
InsanityAutomation
4f2473053c Fix M106 with SINGLENOZZLE 2018-12-31 20:10:18 -06:00
Reece Kibble
7557f8d68c Rename all Stm32f1 to STM32F1 (#12639) 2018-12-31 16:36:49 -06:00
Scott Lahteine
371d9a1acf Fix line-endings, formatting, whitespace
Followup to #12770
2018-12-30 15:38:20 -06:00
Ludy
135c74017c Fix compile DEBUG_EEPROM_READWRITE error (#12746) 2018-12-30 11:37:20 -06:00
Giuliano Zaro
54ba44ee37 Fix bad sanitycheck (#12748) 2018-12-30 10:44:15 -06:00
swilkens
b01a630bd0 [2.0.x] Correct Ender 3 bed size (#12769) 2018-12-30 10:42:47 -06:00
Alain Martel
44ed34475b Add MKS BASE 1.4 pins (#12770) 2018-12-30 10:40:22 -06:00
Roxy-3D
3a16cb6d7f Slightly Slower Max X Axis speed
On some T-Rex 2+ machines the previous max step rate could lose steps....
2018-12-28 09:14:48 -06:00
Ludy
814d93c7cf Fix G33 sprintf output warning (#12738) 2018-12-27 18:05:42 -06:00
Ludy
3877bf9704 Fix compile error with delta and sensorless homing (#12740) 2018-12-27 17:51:22 -06:00
Ludy
cfc5e96b4b Move JD to Config.h (and fix jerk->eeprom bug) (#12720) 2018-12-27 15:29:39 -06:00
Roman Moravčík
594898aea7 Limit hotend / bed temperature to maxtemp-15 (#12713) 2018-12-27 11:46:05 -06:00
InsanityAutomation
530ef5846f Make nomove=false for toolchange on filament swap (#12739) 2018-12-27 11:38:35 -06:00
InsanityAutomation
14ddda285c Confirmation on Abort SD print (#12717) 2018-12-27 11:36:39 -06:00
Msq001
f8c5d31864 Bugfix 2.0.x add motherboard pins define (#12689)
- `pins_BIQU_B300_V1.0.h` defines pins for B300, as found in the BIQU Thunder 3D printer.
- `pins_BIQU_SKR_V1.1.h` defines pins for bigtree/BIQU SKR V1.1 motherboard.
2018-12-27 10:52:35 -06:00
InsanityAutomation
b7a8dcc35d Update Formbot T-Rex 3 pins (#12662) 2018-12-20 17:32:39 -06:00
Ludy
f7127c44f8 Wanhao Duplicator i3 Plus pins create (#12701) 2018-12-20 17:30:36 -06:00
jmz52
33abb86b7e Add support for MKS Robin board (#12650)
Implement initial support for MKS Robin (STM32F103ZET6) board.
Custom build script is used to generate encrypted firmware compatible with original MSK Robin bootloader (i.e. safe firmware update from SD card and possibility to go back to original close-source firmware).
2018-12-20 17:23:27 -06:00
InsanityAutomation
367a9f65aa Add Formbot 350c Thermistor (#12661) 2018-12-20 17:04:17 -06:00
Ludy
33f3c75213 GTM32 Pro VB FAN-PIN correction (#12666) 2018-12-20 16:42:15 -06:00
Scott Lahteine
9d59a9c840 Followup to #12691 (typo) 2018-12-20 16:38:32 -06:00
Ludy
3829d6ccf8 FYSETC F6 13 - E2_SERIAL_TX_PIN correction (#12667) 2018-12-20 16:11:33 -06:00
Kadah
d35dcafa3d Added MKS MINI 12864 support to FYSETC F6 V1.3 (#12656) 2018-12-20 16:10:49 -06:00
Roman Moravčík
98cf546771 Limit set hotend temperature to maxtemp. (#12690) 2018-12-20 15:56:37 -06:00
Roman Moravčík
4dad489a50 [2.0.x] Limit PID autotune target to maxtemp-15 (#12691) 2018-12-20 15:55:30 -06:00
Marcio Teixeira
8dcc28c9ae Squelch warning mentioned in #11061 (#12676) 2018-12-20 15:34:24 -06:00
Ondřej Nový
4c8a6eee7b [2.0.x] Update Czech translation (#12683) 2018-12-20 15:28:46 -06:00
Ondřej Nový
fcaed685b2 [2.0.x] Set DEFAULT_NOMINAL_FILAMENT_DIA to 1.75 in Anet A6 config (#12664) 2018-12-18 13:35:59 -06:00
Ondřej Nový
0572be9439 [2.0.x] Enable PIDTEMPBED in Anet A8 example config (#12655) 2018-12-18 13:34:46 -06:00
Luc Van Daele
c6e09c2689 [2.0.x] G33 clean up (#12648)
Remove obsolete workarounds in G33 for the now fixed zprobe_zoffset bug
2018-12-18 12:43:38 -06:00
teemuatlut
7a5e637a37 Add spreadCycle parameter sets (#12645) 2018-12-18 12:42:14 -06:00
Marcio Teixeira
902d5b0f8b Allow ExtUI to use LCD_SET_PROGRESS_MANUALLY (#12628) 2018-12-12 17:21:37 -06:00
Dave Johnson
9a4a463ec4 Sanity-check LIGHTWEIGHT_UI, move comment up (#12630) 2018-12-12 16:59:20 -06:00
teemuatlut
55144284c2 TMC connection test, spreadCycle parameters, improved debugging (#12616) 2018-12-09 20:54:48 -06:00
Ludy
97de9d54a5 Fix broken pins file include (#12617) 2018-12-09 19:06:03 -06:00
Ludy
a7b3a61424 Improve some config comments readability (#12615) 2018-12-09 19:02:42 -06:00
Scott Lahteine
daf07e4200 Align classic bed icon consistently 2018-12-09 12:00:10 -06:00
MasterPIC
3bb8b3529a Center ABL grid on bed with H parameter. (#12610) 2018-12-09 11:24:48 -06:00
Scott Lahteine
6cf8d40f41 Fix some serial echos of pin states 2018-12-09 02:38:32 -06:00
Scott Lahteine
f6321f878a Simpler AVR + Trinamic + Soft Serial sanity-check (#12606) 2018-12-08 23:34:26 -06:00
Scott Lahteine
7d15854514 Add Z_MIN_PROBE_PIN to MKS SBASE pins 2018-12-08 15:31:59 -06:00
Scott Lahteine
e8bda62d2a Followup to servo angles patch
Fix #12594
2018-12-08 15:31:59 -06:00
Scott Lahteine
18fedafbc5 Refresh screen on SD Init 2018-12-08 15:31:59 -06:00
Marcio Teixeira
b22716e938 M425 Backlash Correction (#11061) 2018-12-08 14:36:46 -06:00
Scott Lahteine
fa47ce369a Sanity-check for negative steps, feedrate, accel 2018-12-07 19:38:15 -06:00
Scott Lahteine
ef81b5f03e Link to font docs in ultralcd_DOGM.cpp 2018-12-07 19:10:55 -06:00
Scott Lahteine
4388015f1a Tweak config formatting 2018-12-07 16:57:14 -06:00
Scott Lahteine
b7e38ea249 Signal an invalid mesh for M420 enable / load 2018-12-07 16:14:11 -06:00
teemuatlut
50b2fbd031 Trinamic: Split stealthChop, improve driver monitoring, etc. (#12582) 2018-12-07 15:34:21 -06:00
Scott Lahteine
055cb2b956 Update mfpub 2018-12-05 18:57:47 -06:00
Scott Lahteine
9fbd73d931 Fix up some delta settings 2018-12-05 18:57:47 -06:00
Dave Johnson
0947b92734 Build and CI fixes and optimizations (#12584)
-Disable LDF "deep+" mode on AT90USB platforms. Appears not needed any longer (likely due to fix 7322df26ad). Results in identical binary output and cuts compile time in half
-Disable Cartesio config from CircleCI (compile failure)
-Disable Geetech I3 Pro X GT2560 from CircleCI (compile failure)
-Enable EEPROM on Micromake example config (fix compile failure)
-Move FolgerTech/i3-2020 to AVR platform in CircleCI (fix CirculeCI build failure)
-Disable various examples failing to build in CircleCI
-Enable various examples no longer failing to build in CircleCI
2018-12-05 17:21:40 -06:00
mr-miky
11c7945365 Don't include STM32 Core code when compiling STM32 Generic (#12575) 2018-12-03 06:55:49 -06:00
Scott Lahteine
64389acdf1 Print a space after scrolling status 2018-12-03 06:17:09 -06:00
Scott Lahteine
7a361ad36a Alternative fan image option (#12579)
* Alternative fan bitmap
* Move bed over by 3px
2018-12-03 05:55:33 -06:00
Scott Lahteine
261c6f4b96 Fix pause/resume SD print
Followup to #12551, addressing #12566
2018-11-30 19:23:08 -06:00
Scott Lahteine
2224a4d61a Remove AVR-only MARLIN_DEV_MODE code 2018-11-30 17:54:24 -06:00
Scott Lahteine
e874f9664c Tweaks to endstops code 2018-11-30 14:25:55 -06:00
Scott Lahteine
3c58b16c9f Move stepper enable/disable to stepper_indirection.h (#12562) 2018-11-30 12:48:46 -06:00
Scott Lahteine
aaf862aef2 Fix angles for disabled EDITABLE_SERVO_ANGLES (#12559) 2018-11-30 12:31:42 -06:00
Scott Lahteine
c986239837 A single SERIAL_ECHO macro type (#12557) 2018-11-29 16:58:58 -06:00
Scott Lahteine
69d869c3d9 Tweak FR icon. Update font data. 2018-11-29 12:59:30 -06:00
Scott Lahteine
0c1cd9f590 Fix "No SD Card" indicator 2018-11-29 12:35:31 -06:00
Jacob Jordan
8be91677df Fix Skew factors (#12555)
- Ensure Skew factors are calculated from test square measurements
2018-11-29 11:39:31 -06:00
Scott Lahteine
03ef2d6c82 Fix "paused" message and M125 called by M25 (#12551) 2018-11-28 19:28:31 -06:00
Scott Lahteine
95d154a91f Fans loop macro 2018-11-28 16:45:08 -06:00
Scott Lahteine
61db0b65b6 Followup to heating progress 2018-11-28 14:47:43 -06:00
Scott Lahteine
4f9ec9ab45 Add heating progress bars (#12543) 2018-11-27 21:15:52 -06:00
Scott Lahteine
929a513a6b Add poll_runout_states, which returns 1 for runouts (#12547) 2018-11-27 20:13:24 -06:00
Scott Lahteine
01b5c810d5 Space out multiple edit lines a bit 2018-11-27 18:10:19 -06:00
Scott Lahteine
cd88ea2106 Fix runout debug output
Followup to #12544
2018-11-27 18:10:19 -06:00
Scott Lahteine
cecc238f68 Save recovery info on SD pause 2018-11-27 14:42:19 -06:00
Marcio Teixeira
439a3e8463 Improve runout sensor, fix LIGHTWEIGHT_UI screen size (#12544) 2018-11-27 13:45:25 -06:00
Scott Lahteine
5b24ce9024 Hide M217 compile warning 2018-11-26 16:52:16 -06:00
David Bates
d94b50a3d8 Add sample config for Delta with MKS SBASE (#10819) 2018-11-25 21:23:02 -06:00
InsanityAutomation
dec721c52b Add Formbot Raptor2 and Raise3D pins (#12532)
* Add Formbot Raptor2 board
* Add Raise3D Rumba board
2018-11-25 19:56:06 -06:00
Scott Lahteine
6aae199572 Add missing boards to Makefile 2018-11-25 19:11:09 -06:00
Scott Lahteine
0a638cc022 Adjust Formbot Raptor pins 2018-11-25 18:35:45 -06:00
Ludy
e5019a0481 Fix English special symbols (#12529) 2018-11-25 18:19:12 -06:00
skaaj4
1980931153 Add support for FYSETC F6 V1.3 board (#12527) 2018-11-25 18:16:25 -06:00
Scott Lahteine
09d6db491a Fix wait_for_bed compile error 2018-11-25 18:05:41 -06:00
Roman Moravčík
d545f984b0 Update Slovak translation (#12523) 2018-11-25 17:44:51 -06:00
Ludy
730f223100 Correct FANMUX2_PIN (#12538) 2018-11-25 17:27:41 -06:00
Yücel Temel
d857cdfb27 Update Turkish language (#12524) 2018-11-25 17:26:26 -06:00
Scott Lahteine
4a7c6f7241 NUM_ARRAY => COUNT 2018-11-24 00:27:45 -06:00
Giuliano Zaro
31113c5adf Update Italian language (#12512) 2018-11-24 00:26:54 -06:00
Scott Lahteine
b57343c255 Put status screen options in Configuration_adv.h 2018-11-23 23:15:07 -06:00
Scott Lahteine
1fcc13b011 Allow Serial Overrun Protection to be disabled 2018-11-23 21:07:38 -06:00
Scott Lahteine
29c53f2402 Hide some compile warnings 2018-11-23 21:07:38 -06:00
Scott Lahteine
caca3c8503 Use wait_for_bed with WAIT_FOR_BED_HEATER
Addressing #12517
2018-11-23 20:39:23 -06:00
Scott Lahteine
f1efcfed14 Fix backslash in language_test.h 2018-11-23 20:39:23 -06:00
Yücel Temel
3b186a55ac Don't show superscript ³ with NOT_EXTENDED_ISO10646_1_5X7 (#12513) 2018-11-23 20:16:51 -06:00
Scott Lahteine
02f8f4187a Clean up font data generation script 2018-11-23 20:02:34 -06:00
Scott Lahteine
82c96c971e Bring superscripts slightly lower in BDF fonts 2018-11-23 20:02:34 -06:00
Sinisa Culic
8a0992d921 Fast PWM for controller fan (#12485) 2018-11-23 16:03:39 -06:00
Ludy
e98d195901 Remove extra declarations in cardreader.cpp (#12520) 2018-11-23 15:58:20 -06:00
Scott Lahteine
fd2998efd5 Revert ADC_KEYPAD direction behavior (#12508) 2018-11-22 06:00:00 -06:00
Scott Lahteine
d29cb09b3e Fix a minor compile warning 2018-11-22 05:35:38 -06:00
Yücel Temel
5b1d52671c Use superscript 3 in language_en.h (#12504) 2018-11-22 02:27:28 -06:00
Marcio Teixeira
7109dadd21 Additional pin definitions for Archim 2 (#12500)
- Added GPIO pins to Archim 2
- Added new 108 pin to `fastio_Due.h`
2018-11-22 01:07:02 -06:00
Andy Shaw
4975b13b74 Fix problems with LPC1768 EEPROM flash emulation (#12503)
* Remove duplicate calls to PrepareSector

Some flash memory API calls require that a call to `PrepareSector` is done before use. However this call is already made by the LPC1768 framework so the calls in this code are not required.

* Ensure correct alignment of RAM buffer

The LPC176X flash API requires that the RAM buffer used for write operations must be word-aligned. This change ensures that this is the case.
2018-11-22 01:03:32 -06:00
Scott Lahteine
b738972e69 General cleanup of Re-ARM pins 2018-11-21 19:00:49 -06:00
Scott Lahteine
ee423dcdd0 Invert hotend bitmaps, by default 2018-11-21 01:02:06 -06:00
Scott Lahteine
c5642a894f Fix ADC_KEYPAD middle button (#12493) 2018-11-20 21:39:30 -06:00
Scott Lahteine
0946cbcdca Revert some const changes (for now) 2018-11-20 08:19:48 -06:00
Scott Lahteine
4def8b3b5e Expanded options for _Statusscreen.h (#12455)
See the PR for full details. The updated system will be documented on the website in the near future.
2018-11-20 07:50:37 -06:00
Scott Lahteine
d51e5690f4 Don't show updir with no card present 2018-11-20 07:01:46 -06:00
Scott Lahteine
ec9d21a234 Shift YZ on graphical display to fit Z+123.45 2018-11-20 06:58:18 -06:00
Scott Lahteine
817a37169a Apply/unapply const here and there 2018-11-20 06:44:21 -06:00
Scott Lahteine
643e0066a0 Followup to #12451 2018-11-20 06:27:19 -06:00
Dave Johnson
8ea4eeb785 Revert #12311 PIO LDF work-around (#12484) 2018-11-20 00:05:01 -06:00
Marcio Teixeira
4bcb63b705 Fix for #12482 (#12483)
Fix Z-move to uninitialized position in SWITCHING_EXTRUDERS tool_change (no_move=true)
2018-11-20 00:04:11 -06:00
Marcio Teixeira
50ee747787 Fix compilation errors. Followup to #12439 (#12481) 2018-11-20 00:02:13 -06:00
Ludy
90a58488b5 Corrected unused var, default switch, Travis tests (#12477) 2018-11-19 23:59:48 -06:00
Scott Lahteine
a4c15dc54f Modify MBL to use IJ instead of XY (#12478) 2018-11-19 09:08:15 -06:00
Scott Lahteine
fc3f1c4572 Get u8g reference for lcdprint 2018-11-19 06:23:15 -06:00
Scott Lahteine
88c57eaf55 Clean up some u8g code (#12476) 2018-11-19 01:33:59 -06:00
Ludy
1f93d2bcf7 Fix LCD compile error, etc. (#12472) 2018-11-18 20:39:49 -06:00
Scott Lahteine
826d570162 Combine Travis CI option-setting commands (#12474) 2018-11-18 19:58:02 -06:00
Scott Lahteine
9d13f07d09 GTM32 Pro VB changes from Markku Sinisalo 2018-11-18 19:56:38 -06:00
Roman Moravčík
5fbe5cabc8 Fixed displaying of kill MSG_OUTAGE_RECOVERY string. (#12470) 2018-11-18 18:05:29 -06:00
kAdonis
4ae9a06c60 Update M303.cpp (#12471) 2018-11-18 18:04:51 -06:00
Ludy
c0b75f49b6 Fix "no effect" and "unused variable" compile warnings (#12473) 2018-11-18 17:54:00 -06:00
Nils Hasenbanck
5a4fd8e0a6 Fix access to the DWT peripheral for STM32 HAL (#12434)
Access to the DWT peripheral for the `CYCCNT` register needs to happen before `main()`. The code needs to be called after the setup of the system clocks, so the right place is between the `premain()` and `main()` function of the STM32 Arduino core.

This patch moves the DWT access code to a new function, which is then placed between `premain()` and `main()`.
2018-11-18 01:30:46 -06:00
Scott Lahteine
7f225b9421 Fix MAX_MESSAGE_LENGTH 2018-11-18 01:11:26 -06:00
Scott Lahteine
06674a321a Remove extra include 2018-11-18 00:34:07 -06:00
Marcio Teixeira
c1e17037e5 Various fixes for MarlinUI and ExtUI (#12439) 2018-11-17 22:21:44 -06:00
Giuliano Zaro
d3605cfc26 Don't start watching heaters when target is 0 (#12453) 2018-11-17 21:53:52 -06:00
Ludy
93e958f695 Fix compile error with ZONESTAR_LCD+NO_LCD_MENUS (#12466) 2018-11-17 21:21:30 -06:00
Ludy
22d7fed60a Fix compile error with SD_FIRMWARE_UPDATE (#12462) 2018-11-17 21:13:36 -06:00
Nils Hasenbanck
779b2709ec Change temperature pin order for RemRam V1 (#12458)
Beta testers suggested to adopt the RAMPS order of temperature probe connectors. This commit fixes the order to the RAMPS order.
2018-11-17 16:51:06 -06:00
Scott Lahteine
8ebb4dc294 Followup to static CardReader 2018-11-17 07:52:35 -06:00
Scott Lahteine
7ee5894360 Allow float XY probe offsets
Responding to #12383

XY probe offsets should be integers because adding decimal points makes the code larger. But if decimals are very much wanted, this commit removes the old restriction.
2018-11-17 07:44:47 -06:00
Giuliano Zaro
43ecdb606f Fix a compile warning (#12452) 2018-11-17 07:08:25 -06:00
Ph0non
984c4ba8c7 Enable SD Card on RepRap Display and RADDS (#12446)
* Enable SD Card on RepRap Display and RADDS

Define the necessary pins in `pins_RADDS.h` (copied from the `RADDS_DISPLAY` section) for the use of the SD card slot on RRD.
2018-11-17 06:59:40 -06:00
Ludy
56a94c2a26 Use 'target_extruder' in M104 as with M109 (#12448) 2018-11-17 06:55:25 -06:00
Scott Lahteine
66580f32c2 Make CardReader class static (#12451)
* Make CardReader a static class
* Make CardReader flags into bitfields
2018-11-16 22:39:16 -06:00
Scott Lahteine
3e9ffaddb6 Consolidate, optimize some LCD menu code (#12450) 2018-11-16 21:44:48 -06:00
Scott Lahteine
d97e31db4c Optimize Power-Loss Recovery (#12440) 2018-11-16 20:47:07 -06:00
Mateusz Krawczuk
ca21ac6b9b Support two MAX6675 thermocouples (#8686) 2018-11-16 18:20:33 -06:00
Scott Lahteine
0e610815e4 No need for Cap:PAREN_COMMENTS 2018-11-16 04:28:40 -06:00
Scott Lahteine
7a075a5dc9 Tweak extruder errors 2018-11-16 01:32:21 -06:00
Scott Lahteine
2d92f333f5 Fix GcodeSuite::T active_extruder reference 2018-11-15 14:07:24 -06:00
Scott Lahteine
d2bb53702a Optimize target_extruder, ignore T with mixing (#12432)
* Optimize target_extruder, ignore T with mixing
* Give G-code Tn parity with tool_change
2018-11-14 17:33:04 -06:00
Marcio Teixeira
5e586a6b39 Fix to runout sensor code. (#12431)
- "old_state" is no longer a class static variable.
2018-11-14 16:54:05 -06:00
Scott Lahteine
d82c350de7 Miscellaneous LCD code renaming, reordering (#12430)
* Move special characters to language.h
* Apply some naming standards
* Clean up menu item draw functions
* Rename some Temperature methods
* UI => ExtUI
2018-11-14 13:13:51 -06:00
Scott Lahteine
edfd106bc5 Rejigger Filament Runout class (#12428) 2018-11-14 11:45:57 -06:00
Scott Lahteine
f4c128ecaa Move RRW keypad code to a common method (#12429) 2018-11-14 06:00:21 -06:00
Scott Lahteine
54ec5528a0 hasstatus => has_status 2018-11-14 01:34:28 -06:00
Scott Lahteine
ebf585b673 Fix an old sanity check 2018-11-14 01:15:35 -06:00
Ryan
052d102ded UltiMachine Archim 1 support (#12404) 2018-11-14 00:27:39 -06:00
Scott Lahteine
664e20754d Clean up pins files 2018-11-14 00:23:33 -06:00
Scott Lahteine
1eb5249598 Fix Formbot Trex-2+ configs
Followup to #12422
2018-11-13 21:53:54 -06:00
thiagodesacosta
075a22ed65 Update Portuguese-Brazilian translation (#12402) 2018-11-13 19:42:25 -06:00
Marcio Teixeira
3ceab8474c Add required "cardreader.h" include (#12419) 2018-11-13 17:12:44 -06:00
Giuliano Zaro
98c2fc4e42 Endstops fix followup (#12423)
Followup to #12413
2018-11-13 17:10:07 -06:00
Roxy-3D
f19fd642ce Updates to Formbot T-Rex 2+ configuration files (#12422)
Updates to Formbot T-Rex 2+ configuration files
2018-11-13 13:48:35 -06:00
Roxy-3D
cda5ef08fa Debug of G2-G3 for UBL (#12386)
Changes only affect UBL.  Everything else is left alone.
2018-11-13 11:20:21 -06:00
AnHardt
9ad3aed0ef Fix tool-change for MIXING_EXTRUDER with < 2 virtual tools (#12417)
Fix #12416

Better handling of `ENABLED(MIXING_EXTRUDER) && !MIXING_VIRTUAL_TOOLS > 1` -  to not fall through to the general case. Fix compiler warnings for `#elif EXTRUDERS < 2`.
2018-11-13 04:56:10 -06:00
Giuliano Zaro
d631267548 Refine endstops fixes (#12413)
When endstops/probe are enabled `ENDSTOP_NOISE_THRESHOLD` calls to `update` are required to properly re-sync endstops/probe status.
2018-11-13 04:31:58 -06:00
Scott Lahteine
0ee1a92971 Group status methods, share reset_status with Extensible UI (#12414)
* Group status methods, share reset_status with Extensible UI
* Move common DOGM code to headers
2018-11-13 01:47:45 -06:00
Scott Lahteine
690c4e8457 Clean TLM trailing whitespace 2018-11-13 00:03:34 -06:00
Scott Lahteine
143b2896e0 Add M412 to enable/disable filament runout detection (#12406) 2018-11-12 21:29:46 -06:00
Scott Lahteine
a163c89c6a Followup to 50af1d1 2018-11-12 20:31:53 -06:00
Scott Lahteine
fea2363a2e Clear old _site contents on regeneration 2018-11-12 19:52:25 -06:00
AnHardt
be6271767f Fix BABYSTEP_ZPROBE_OFFSET (#12408)
Fix #12399

Did not compile without  `WATCH_HOTENDS || WATCH_THE_BED`.
Add condition to include "../../module/temperature.h".
2018-11-12 17:44:21 -06:00
Scott Lahteine
50af1d1e08 Differentiate translated On/Off from Serial ON/OFF 2018-11-12 17:23:08 -06:00
Scott Lahteine
df907a905f Update UBL comments for debug change 2018-11-12 03:46:48 -06:00
Scott Lahteine
da17f8ad37 For now (!) don't synchronize in M204 and M205
See if this has any deleterious effect on motion planning by slicers that inser their own jerk and acceleration controls. The problem I see is that these settings can take effect on blocks already in the planner, and the only way around this would be to shadow these settings in planner blocks and use the shadowed settings in the planner.
2018-11-12 02:43:24 -06:00
Scott Lahteine
a3923424c7 Clean up LCD width/height determination 2018-11-12 02:37:40 -06:00
Scott Lahteine
a0c795b097 Encapsulate common display code in a singleton (#12395)
* Encapsulate common LCD code in a singleton
* Depend more UBL code on UBL_DEVEL_DEBUGGING
  - Since most users don't need the debugging on at all times, this helps reduce the default build size for UBL by over 2K, a little closer to fitting on 128K boards.
2018-11-11 12:16:24 -06:00
Scott Lahteine
9da6809ac3 Adjust some comment spacing 2018-11-11 11:28:50 -06:00
Scott Lahteine
471f403a67 Reduce code size with plain inlines 2018-11-11 08:36:10 -06:00
Scott Lahteine
30a49f5ee2 Apply extra condition to LCD_PROGRESS_BAR 2018-11-11 08:36:10 -06:00
Scott Lahteine
4e0c935959 Update HAL and libs formatting 2018-11-10 19:43:23 -06:00
Scott Lahteine
47483e8c17 Update Raptor config 2018-11-10 19:42:46 -06:00
Scott Lahteine
6093df11dc Allow G26 to use the active extruder (#12387)
* Make lcd_quick_feedback argument optional
* Add click_to_cancel option to wait_for_hotend/bed
* Have G26 use the active nozzle and wait_for_hotend/bed
* Use wait_for_release in UBL G29
* Add 'T' parameter to G26 for an initial tool-change
2018-11-10 18:07:38 -06:00
articide
4260282df7 Tevo Little Monster example configuration (#12370) 2018-11-10 03:36:01 -06:00
Scott Lahteine
bed15fcd81 Tweak 'echo_not_entered' used by MBL's G29 2018-11-10 01:32:51 -06:00
Scott Lahteine
c239131ff5 Use 'serial_spaces' in 'print_2d_array' 2018-11-10 01:32:51 -06:00
Scott Lahteine
8ab1c16ebd Break out of 'mfpub' if 'gh-pages' checkout fails 2018-11-10 01:32:51 -06:00
Scott Lahteine
56150ec030 Add reference comments to MeshLevelingState 2018-11-09 21:31:20 -06:00
Scott Lahteine
c4734b947b Have 'mfdoc' open the local site when it's ready 2018-11-09 21:31:20 -06:00
Ludy
24c5e57bb6 Update German language (#12379) 2018-11-09 15:25:29 -06:00
Giuliano Zaro
fd7fd55662 Solve endstops issues (#12382)
- Partially reverts #11900 and tries to solve #12336
2018-11-09 14:58:04 -06:00
Scott Lahteine
78ccedd6a8 Fix M91x sanity-check to permit TMC2660
Fix #12362
2018-11-09 05:48:15 -06:00
revilor
b60abc7c37 [2.0.x] Macro G-codes (#9365) 2018-11-09 05:25:08 -06:00
Giuliano Zaro
ccdbf20f60 Update Italian language (#12368) 2018-11-09 04:04:02 -06:00
Roman Moravčík
d08847b1a6 Update Slovak translation (#12376) 2018-11-09 04:03:07 -06:00
InsanityAutomation
7665dff58b No error on T0 with single-extruder and fix MIXING_EXTRUDER virtual tools (#12375) 2018-11-09 00:15:07 -06:00
Scott Lahteine
4ed6397e5d More comprehensive NO_LCD_MENUS (#12367) 2018-11-09 00:07:16 -06:00
Scott Lahteine
9c8f083d6c Extend pins errors to include the processor 2018-11-08 22:25:59 -06:00
Scott Lahteine
525ea554a1 Remove obsolete comments 2018-11-08 10:55:18 -06:00
Scott Lahteine
ef724edd80 Apply HAS_LCD_MENU in EEPROM code 2018-11-08 10:03:05 -06:00
Scott Lahteine
b169320a03 Clean trailing whitespace 2018-11-07 02:40:18 -06:00
Scott Lahteine
81b1e9d272 Fix up xdiff, ydiff, zdiff in tool change
Followup to #12137
2018-11-06 22:56:33 -06:00
InsanityAutomation
6471a75a22 Combine more tool-change variables (#12137) 2018-11-06 22:22:20 -06:00
Scott Lahteine
147e270208 Restore GTM32_PRO_VB temp and heater pins
Undo #12345
2018-11-06 21:41:30 -06:00
Scott Lahteine
8def25e475 Set CUSTOM_MACHINE_NAME for some configs 2018-11-06 21:41:30 -06:00
Scott Lahteine
812f6a7dd7 Fix Resume from SD Pause
In reference to https://github.com/MarlinFirmware/Marlin/pull/12098#issuecomment-436231690
2018-11-06 21:09:37 -06:00
Scott Lahteine
4f72e041f2 Use card.stopSDPrint() for completeness 2018-11-06 20:55:17 -06:00
Scott Lahteine
488a17b3f5 Use IS_SD_PRINTING() more 2018-11-06 20:55:17 -06:00
Marcio Teixeira
4dbaa6369f Fix const pointer assignment compile error (#12350) 2018-11-06 19:49:39 -06:00
Giuliano Zaro
959ed32636 Update Italian language (#12352) 2018-11-06 19:30:24 -06:00
Roman Moravčík
812bfec65e Update Slovak translation (#12354) 2018-11-06 19:29:28 -06:00
Ludy
1624722566 Update German translation (#12355) 2018-11-06 19:28:40 -06:00
Scott Lahteine
e574f01568 More advanced pause tweaks (#12356)
* Followup to LCD_TIMEOUT_TO_STATUS=0
* Make continuous purge screen fit 20x4
* Unify purge message modes
* Preserve last-set pause header mode
2018-11-06 19:25:57 -06:00
Scott Lahteine
5a470d4a49 Apply some tool-change cleanup 2018-11-06 18:20:01 -06:00
Roman Moravčík
34ea458667 Fixed advanced pause messages (#12353) 2018-11-06 15:27:19 -06:00
Scott Lahteine
4c5ca89d8c Show the appropriate pause message (#12348) 2018-11-06 04:13:48 -06:00
Marcio Teixeira
8517d5f915 LCD menu code refactoring and cleanup (#12308) 2018-11-05 22:51:10 -06:00
Scott Lahteine
b3b4e6dc45 Change Marlin debug flag names to fix conflicts (#12340)
In reference to #11000
2018-11-05 22:48:28 -06:00
Giuliano Zaro
f7e682eeee Update Italian language (#12344) 2018-11-05 22:46:59 -06:00
Phr3d13
a813900fce Add Geeetech Rostock 301 config, update GTM32 Pro VB pins (#12345) 2018-11-05 22:42:06 -06:00
Scott Lahteine
04f173790f Remove trailing whitespace 2018-11-05 22:38:20 -06:00
Scott Lahteine
c536ee1122 Clean up bq Zum Mega 3D pins 2018-11-05 22:38:20 -06:00
Scott Lahteine
c31e1735dd Restore LPC1768_PIN_INTERRUPT_M, apply to Z3
- In reference to #12166
2018-11-05 06:28:49 -06:00
Scott Lahteine
93d5b945dd Hide mesh editing until a valid mesh exists 2018-11-05 05:13:34 -06:00
Ludy
f34f09c821 Update German language (#12336) 2018-11-05 04:33:31 -06:00
Roman Moravčík
eefd7676a3 Updated slovak translation (#12338) 2018-11-05 04:31:12 -06:00
Scott Lahteine
486f2a66a9 Fix MBL XY parameter error messages
Fix #11522
2018-11-05 04:17:37 -06:00
Scott Lahteine
2613ddf61c Fix "circle" 2018-11-05 04:17:37 -06:00
Scott Lahteine
b779b42ffd Prevent current step-down going negative
Addressing #11348
2018-11-05 04:17:37 -06:00
Scott Lahteine
427bc64ba1 G28 O respects HOME_AFTER_DEACTIVATE
Addressing #11271
2018-11-05 04:17:37 -06:00
Scott Lahteine
3866aeac52 Clean up ENCODER_RATE_MULTIPLIER config 2018-11-05 04:17:37 -06:00
Scott Lahteine
498dfa291e Update and fix CHDK 2018-11-05 04:17:37 -06:00
Scott Lahteine
fed84f2961 Use multiplier edit item for mesh point editing 2018-11-05 04:17:37 -06:00
Scott Lahteine
d5ab4cd22a Provide a default for Z_PROBE_LOW_POINT 2018-11-05 04:17:37 -06:00
Scott Lahteine
3cbc3ecdd7 Fix 'M43 T' to use 'L' as last pin
- The documentation is correct. The code was wrong.
2018-11-05 04:17:37 -06:00
Scott Lahteine
1769249876 Recommend keeping endstops off 2018-11-05 04:17:37 -06:00
Scott Lahteine
5182eaf661 Fix endstops enable behavior during probing
Fix a bug introduced in #9582
2018-11-05 04:17:37 -06:00
Scott Lahteine
07a0822ebe M420 support in MARLIN_DEV_MODE 2018-11-04 20:54:38 -06:00
Scott Lahteine
b2ad2c8751 Merge pull request #10944 from KangDroid/bugfix-2.0.x
Add a menu to edit MBL/ABL mesh data
2018-11-04 19:09:49 -06:00
Scott Lahteine
63be48ada6 Add MESH_EDIT_MENU to example configs 2018-11-04 19:07:47 -06:00
KangDroid
82ff7c6542 Add a mesh edit menu for MBL / ABL-Bilinear 2018-11-04 19:07:47 -06:00
Scott Lahteine
44fa7fb18c Cleanups for leveling-related code 2018-11-04 19:07:47 -06:00
Scott Lahteine
cc2bc67440 ENABLED(NEWPANEL) => HAS_LCD_MENU 2018-11-04 19:06:10 -06:00
Scott Lahteine
fc84878cba MSG_UBL_EDIT_MESH_MENU => MSG_EDIT_MESH 2018-11-04 19:06:10 -06:00
Scott Lahteine
cd066bfeba Extend error messages for E factors sanity-checks 2018-11-04 18:42:56 -06:00
Ludy
c10edb0998 Update, correct sanity-checks for up to 6 extruders (#12333) 2018-11-04 18:36:45 -06:00
Chris Pepper
32880ff42a Turn PlatformIO LDF off for LPC176x builds (#12334) 2018-11-04 18:32:32 -06:00
Scott Lahteine
0c85869c26 Clean up file endings 2018-11-04 18:30:10 -06:00
Scott Lahteine
b99f0776d6 Clean up some U8G files 2018-11-04 18:30:10 -06:00
Scott Lahteine
8014e1cc9d Allow disable of LCD_TIMEOUT_TO_STATUS (when 0) 2018-11-04 18:30:10 -06:00
Giuliano Zaro
bd05816fd8 Update Italian language (#12327) 2018-11-04 16:43:02 -06:00
Scott Lahteine
3c21483c88 Provide DOGLCD SPI pins for MKS SBASE + VIKI 2018-11-04 16:20:22 -06:00
Scott Lahteine
e0956bb572 Drop 'register' storage specifier 2018-11-04 16:17:13 -06:00
Scott Lahteine
c04cf127f7 Fix EEPROM servo angles init, section grouping 2018-11-04 16:14:54 -06:00
Scott Lahteine
9c0e05552e Suppress some compile warnings 2018-11-04 15:25:31 -06:00
Karl Andersson
176654791e Use board-specific or platform SPI pins in HAL_STM32 (#12323) 2018-11-04 15:03:45 -06:00
Scott Lahteine
60dbd8161c Fix VMAX editing
Fix #12326
2018-11-04 07:06:14 -06:00
Scott Lahteine
b7ca93ba37 Remove dead comment 2018-11-04 06:10:35 -06:00
Scott Lahteine
608be966d7 Add servos to pins_FYSTEC_F6_13.h 2018-11-04 06:10:35 -06:00
Hannes Brandstätter-Müller
67b22760d9 Return to status to show manual deploy/stow messages (#12324) 2018-11-04 04:51:26 -06:00
tharts
f5e8e8b53d Fix broken LPC176x build (#12317)
* Fix broken LPC176x build
* Add UBL+HD44780 test for LPC1768
2018-11-04 04:25:03 -06:00
Scott Lahteine
f5eab912ed Apply #pragma once, misc cleanup (#12322)
* Apply #pragma once in headers
* Adjust some thermistors formatting
* Misc cleanup and formatting
2018-11-04 02:25:55 -06:00
Scott Lahteine
8696f882a9 Merge pull request #12313 from thinkyhead/bf2_scara_home_offset
Revive SCARA home offset (not fully implemented)
2018-11-03 07:05:24 -05:00
Scott Lahteine
56d2dcb184 Use first_page flag in place of page.page == 0 2018-11-03 06:59:21 -05:00
Scott Lahteine
d1ff22b983 Revive SCARA's home offset (unimplemented) 2018-11-03 06:24:41 -05:00
Scott Lahteine
2c9586be0c Clear up HAS_WORKSPACE_OFFSET meaning 2018-11-03 04:06:37 -05:00
Scott Lahteine
6e3caf23b6 IS_DELTA => ENABLED(DELTA) 2018-11-03 03:57:11 -05:00
Scott Lahteine
19f49db96f Tweak / reduce menu items 2018-11-03 01:18:59 -05:00
Dave Johnson
8d630362b7 Ignore ARM-based Teensy library on ATUSB90-based Teensy (#12311)
Works around PIO src_filter behavior (see https://github.com/platformio/platformio-core/issues/1905)
2018-11-03 01:17:51 -05:00
Scott Lahteine
e4cf175163 Synchronize on M204, M205 (#12302)
* Add parser.seen for multiple parameters
* Fix M666, use !seen for report
* Synchronize on M204, M205
2018-11-03 01:16:37 -05:00
Ludy
5ba6607181 Fix keypad-related compile error (#12306) 2018-11-02 22:29:32 -05:00
Scott Lahteine
2fb2e286ee Followup to #12256 2018-11-02 01:32:24 -05:00
Scott Lahteine
3eb9838dca Simplify TMC sanity-checks 2018-11-02 01:15:49 -05:00
Scott Lahteine
f5b31e218d Followup to #12082 2018-11-02 01:15:27 -05:00
Scott Lahteine
31c28d0dd2 Drop pgm_read_*_near and let headers choose (#12301)
- Drop `pgm_read_*_near` and let headers choose.
- Define `USE_EXECUTE_COMMANDS_IMMEDIATE` as a conditional.
- Add `process_subcommands_now` for SRAM-based commands.
2018-11-02 00:42:16 -05:00
Scott Lahteine
fce150f094 inline static => static inline 2018-11-01 23:15:17 -05:00
Giuliano Zaro
323c088356 Restore LED light color after pid tuning (#12082) 2018-11-01 22:04:19 -05:00
Ludy
9f77df2590 Followup to menu refactor. TMC warnings, sanity. (#12288)
- Followup fixes for menu refactor
- Fix TMC sanity checks, unused var warnings
2018-11-01 16:13:33 -05:00
Nils Hasenbanck
cafabf2055 Implement DELAY_NS with CYCCNT on Cortex-M7 (#12283) 2018-11-01 16:11:51 -05:00
Scott Lahteine
f5498168ae Ensure PENDING/ELAPSED use a 32-bit integer 2018-11-01 16:08:23 -05:00
MasterPIC
6e041b9c61 Use blink to show more info on LCD (#12256) 2018-11-01 15:56:12 -05:00
Scott Lahteine
eb5600acd2 Add parentheses to LCD_CLICKED 2018-11-01 15:06:14 -05:00
Scott Lahteine
42f8b6c530 Make M125 work with SDSUPPORT (#12289) 2018-11-01 15:03:45 -05:00
Scott Lahteine
f319087372 Followup to #12293 2018-11-01 14:41:03 -05:00
AnHardt
74bbb13008 Fix Mixer calculations for 32-bit processors (#12293) 2018-11-01 14:38:45 -05:00
Scott Lahteine
549d11225a Add to description of Z_STEPPER_AUTO_ALIGN
In response to #12272
2018-10-31 18:07:20 -05:00
Scott Lahteine
724c2ed9b4 Merge pull request #12286 from thinkyhead/bf2_menu_bed_corners
Fix LEVEL_BED_CORNERS menu not found
2018-10-31 18:06:25 -05:00
Scott Lahteine
2cff0d1f39 Move menu_level_bed_corners to its own file 2018-10-31 17:44:42 -05:00
Scott Lahteine
44f2a82a56 Move axis_homed, axis_known_position to motion.* 2018-10-31 17:44:42 -05:00
Scott Lahteine
946cf8b453 EEPROM read code grouping 2018-10-31 16:43:46 -05:00
Ludy
f2adb4b9cc Update German language (#12280) 2018-10-31 16:40:41 -05:00
Karl Andersson
484ca68228 Fix misplaced parentheses (#12284) 2018-10-31 15:34:37 -05:00
Scott Lahteine
1d366db764 Tweaks to CR-10S configuration 2018-10-30 23:36:32 -05:00
Scott Lahteine
b5d7f69b51 Followup to #12249 2018-10-30 22:51:45 -05:00
N95JPL
b780b69c62 Use font ascent and descent for line positioning (#12224) 2018-10-30 22:39:44 -05:00
Scott Lahteine
9cd3529108 Organize language data, fix Korean and Danish 2018-10-30 20:41:16 -05:00
Chris Pepper
66d44c72c3 Add fast binary file transfer to SD card option (#12249) 2018-10-30 19:44:12 -05:00
Marcio Teixeira
72d8adfd1e Cleanup and refactor EXTENSIBLE_UI (#12227)
- Add `axis_t`, `extruder_t`, `heater_t`, and `fan_t` to eliminate ambiguity, improve type safety.
- Regularized getter/setter argument order and naming.
- `setAxisPosition` no longer stacks moves in the buffer, allowing it to be called repeatedly on each touch ui tap.
- Implement better manual moves for `EXTENSIBLE_UI` (#12205)
- Calling `setAxisPosition_mm` no longer buffers the entire move to the new position, but instead causes small moves towards it to be made during the idle loop. This allows the user to adjust the destination even after the move has started and makes the UI feel much more responsive.
- As suggested by @ejtagle, the new code keeps the planner buffer full to ensure smooth motion without stops and starts.
- Change `En`, `Hn` and `FANn` to zero-based indices.
- Labels consistent with the rest of Marlin code.
2018-10-30 19:42:26 -05:00
Karl Andersson
1946f729fd STM32 FastIO using register access (#12276) 2018-10-30 19:25:44 -05:00
Scott Lahteine
56057bcecd Fix lcd_impl_status_screen_1 2018-10-30 19:24:16 -05:00
Scott Lahteine
4ed579cafc Americanized English spelling 2018-10-30 18:55:38 -05:00
Scott Lahteine
9e663a624b Apply #pragma once to configuration files 2018-10-30 18:35:12 -05:00
Scott Lahteine
98c32d8df1 Fix a config endif label 2018-10-30 18:28:16 -05:00
Scott Lahteine
3583e2b449 Followup to Menu Refactor (#12275) 2018-10-30 16:34:45 -05:00
TheLongAndOnly
5536228359 G34 Auto-align multi-stepper Z axis (#11302) 2018-10-29 14:01:36 -05:00
Scott Lahteine
f9b80e7217 Make getfilename_sorted standard for listings 2018-10-29 13:54:21 -05:00
Scott Lahteine
5ead026967 Fix menu_temp_xx_filament_change menu items 2018-10-28 20:43:33 -05:00
Scott Lahteine
d632e44c8c [Merge] Refactor LCD menus / screens (#12199) 2018-10-28 18:18:22 -05:00
Ludy
1f9806875c Update German language (#12261) 2018-10-28 18:11:55 -05:00
mholeys
63ce8baa55 Fix Teensy 3.5/3.6 ADC access for ADC1 (#12258) 2018-10-28 15:51:49 -05:00
Scott Lahteine
3a935fd72b Reduce repetition in menu edit items 2018-10-28 15:46:45 -05:00
Scott Lahteine
b063b1b722 Reorganize includes and declarations 2018-10-28 15:46:45 -05:00
Scott Lahteine
43cf913048 Move SD Card Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
0161d3f733 Move Custom User Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
3b0d2330b6 Move Delta Calibrate Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
6896847210 Move LED Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
9cd5471202 Move Job Recovery Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
9f11e0284c Move Filament Change Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
d87ab3ed20 Move Advanced Settings Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
587a64d80c Move Bed Leveling Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
96f313fb41 Move Info Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
423ab029b2 Move Temperature Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
489017995e Move UBL Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
a489c9fa52 Move Motion Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
3a9ad9f2b1 Move Configuration Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
143d4ec043 Move Tune Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
829effc1fe Move Main Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
37ff663b02 Convert LIGHTWEIGHT_UI to CPP 2018-10-28 15:46:45 -05:00
Scott Lahteine
a964f098b3 Make dogm status screen a CPP 2018-10-28 15:46:45 -05:00
Scott Lahteine
8055ed24ff Move font data to a subfolder 2018-10-28 15:46:45 -05:00
Scott Lahteine
774a6e8199 Drop TALL_FONT_CORRECTION 2018-10-28 15:46:45 -05:00
Scott Lahteine
c825c419d4 Convert DOGM / HD44780 impl to CPP files 2018-10-28 15:46:45 -05:00
Scott Lahteine
182b1405d9 LCD conditionals in configurations 2018-10-28 15:46:45 -05:00
Scott Lahteine
2bf18950ab Refactor LCD menus 2018-10-28 15:46:45 -05:00
Scott Lahteine
ac5f2762b7 Use E_AXIS_N where possible 2018-10-28 15:46:45 -05:00
MasterPIC
6fbc87301f 'G29 H' to set a centered square probe area (linear, bilinear) (#12242) 2018-10-27 20:30:21 -05:00
Karl Andersson
c1e8bd6add Remove STM32 board-specific delays (#12243)
...and replace with delays for all HAL_STM32 boards.
2018-10-27 17:26:12 -05:00
Scott Lahteine
3c9daf322a MSG_CNG_SDCARD => MSG_CHANGE_SDCARD 2018-10-27 13:56:29 -05:00
Scott Lahteine
4b7a0a5b39 Require TMCStepper 0.2.2 or newer
In reference to #12175
2018-10-27 11:15:28 -05:00
Scott Lahteine
ab8425f1b5 Clean up PROBE_TRIGGERED_WHEN_STOWED_TEST (#12232) 2018-10-26 19:18:20 -05:00
Chris Rigter
3028a620af Add RACK_AND_PINION_PROBE (#12218) 2018-10-26 18:24:24 -05:00
InsanityAutomation
ad60f0691c Add Creality3D RAMPS pins definitions (#12229) 2018-10-26 16:09:04 -05:00
Scott Lahteine
5580773191 Use FastIO, sanity-check LPC SD options, apply formatting (#12231) 2018-10-26 15:23:02 -05:00
Scott Lahteine
d015f746cc Fix some compile warnings (#12220) 2018-10-26 03:53:06 -05:00
Scott Lahteine
dacb5324e8 Fix display of Y on Graphical LCD 2018-10-26 01:43:47 -05:00
Scott Lahteine
bf9dd4f4cf Add helpers for custom text in menu items (#12214)
For some features it can be useful to write custom text in a menu item. This commit provides helpers to make this easier.
2018-10-25 15:17:53 -05:00
Scott Lahteine
e8031b1152 Add Custom Microstepping options 2018-10-25 11:26:32 -05:00
Scott Lahteine
fbfb48cce0 Indent a block 2018-10-25 10:52:27 -05:00
Marcio Teixeira
1a00d1bdaf Add pullup to USB interrupt line
- A pullup on the INT pin is required when the pin is level-active
2018-10-25 10:42:08 -05:00
TheSFReader
a07ac6312f G0 feedrate may be fixed or variable (#12172) 2018-10-25 10:35:16 -05:00
Scott Lahteine
53c535a0c1 Remove trailing whitespace 2018-10-25 09:46:33 -05:00
Roman Moravčík
55dec02ca1 Allow X, Y, Z manual move when cold. (#12209) 2018-10-25 09:13:52 -05:00
Luc Van Daele
7243101135 z_offset fix for deltas (#12210) 2018-10-25 09:11:26 -05:00
Scott Lahteine
9613f00877 Fix getProgress_seconds_elapsed to return seconds 2018-10-24 18:05:15 -05:00
gjdodd
5d487ef40e Fix null exception due to duration_t of zero (#12207) 2018-10-24 17:59:33 -05:00
Giuliano Zaro
a9061714f2 Update Italian language (#12196) 2018-10-24 16:40:48 -05:00
InsanityAutomation
aebbb2359d Fix IDEX homing X0 wrong direction (#12200) 2018-10-24 16:40:06 -05:00
gjdodd
0a549fd1f2 Fix EXTENSIBLE_UI compile errors (#12206) 2018-10-24 16:36:11 -05:00
Roman Moravčík
a80ba8fc6e Slovak translation update (#12202) 2018-10-24 16:02:38 -05:00
Roman Moravčík
e48cbff10d Fixed redefinition warnings of MSG_HOTEND_TOO_COLD. (#12203) 2018-10-24 15:00:07 -05:00
Scott Lahteine
7a04eb3a8b Fix some comment formatting 2018-10-23 22:35:44 -05:00
Scott Lahteine
2f873a119f Revert some UBL strings 2018-10-23 15:39:59 -05:00
Ludy
a93e9e6e9b Use preheat labels in place of PLA/ABS (#12194) 2018-10-23 15:38:17 -05:00
Karl Andersson
aa72884a6e Enable use of SERIAL_PORT_2 on HAL_STM32 (#12197) 2018-10-23 15:24:58 -05:00
Scott Lahteine
46360f18b4 Bring thermistor_75.h up to speed 2018-10-23 14:52:16 -05:00
Scott Lahteine
e229b831fa Customizable preheat labels 2018-10-23 00:57:50 -05:00
Scott Lahteine
a553ab82e0 Add e index to _lcd_move_distance_menu 2018-10-22 23:35:04 -05:00
Scott Lahteine
3a46212dd8 Better cold extrusion prevention in LCD menu (#12189) 2018-10-22 20:54:38 -05:00
Marcio Teixeira
fc31da1114 Implement custom delay/millis for EXTENSIBLE_UI (#12188) 2018-10-22 19:37:48 -05:00
forkoz
3a3ab3391f Return set_directions() to stepper.cpp (#12182)
Initial manual Z move can be negative if your stepper is inverted. Leads to bad situations for crashed or initially booted printers.
2018-10-22 19:30:51 -05:00
Scott Lahteine
e5ae7a07d1 Suppress compiler warning 2018-10-21 13:44:27 -05:00
Hannes Brandstätter-Müller
6ee2af5e2d Simplify pins_TRIGORILLA_14.h (#12162) 2018-10-21 03:23:20 -05:00
Roman Moravčík
d801f85963 Correct EEPROM read/write disparities. (#12169) 2018-10-21 02:56:31 -05:00
Scott Lahteine
8d3a92fc4a Followup to millis_t patch 2018-10-20 23:23:58 -05:00
Ludy
44369d536a Use millis_t where needed (#12152) 2018-10-20 23:21:27 -05:00
Scott Lahteine
b641571098 Replace types.h with millis_t.h 2018-10-20 23:07:12 -05:00
Scott Lahteine
eeef4e630a Fix compile error in leds.h 2018-10-20 23:07:12 -05:00
Scott Lahteine
9969c06cb5 Fix compiler warning 2018-10-20 17:16:59 -05:00
Farkas Péter
427c80119a Hide some menu items when busy: fix typo (#12164) 2018-10-20 15:55:31 -05:00
InsanityAutomation
55ac2f4c23 Fix filament runout for idex duplication modes (#12168) 2018-10-20 13:39:33 -05:00
Karl Andersson
b640b3b0d6 Define ST7920 delays for board ARMED (#12161) 2018-10-20 13:12:54 -05:00
Marcio Teixeira
2e5e689a7f Fix kill() and ExtensibleUI (#12160)
* Fix to isPrintingFromMedia()

  - isPrintingFromMedia() will now return true even if SD print is paused.
  - isPrintingFromMediaPaused() allows UI to determine if the print is paused.

* Don't use _delay_us in minkill (#12145)

  - In HAL_DUE, _delay_us is simply an alias for delay, which causes the board to hang and subsequently reboot due to the watchdog timer.

* Shorten code with IFSD macro
2018-10-20 01:44:46 -05:00
Scott Lahteine
b381cad399 Clean up trailing whitespace 2018-10-19 15:27:17 -05:00
Scott Lahteine
9090065e9f Move EXTRA_FAN_SPEED above FWRETRACT 2018-10-19 15:15:00 -05:00
Karl Andersson
4eb798dbdc Add support for Arm'ed (STM32F4) board (#12147) 2018-10-19 14:50:52 -05:00
TheSFReader
1fb9b299d4 Add M524 to abort SD printing (#12155) 2018-10-19 14:25:07 -05:00
Scott Lahteine
d26d9d5b81 Tweak IS_SD_INSERTED 2018-10-19 14:00:36 -05:00
Scott Lahteine
c6a5c74208 Add parentheses to SD macros 2018-10-19 13:52:57 -05:00
Giuliano Zaro
aa9202260d Fix endstop when no interrupt (#12158) 2018-10-19 13:45:39 -05:00
Scott Lahteine
8c02dd971b Move disable_all_steppers to minkill 2018-10-19 13:42:04 -05:00
Scott Lahteine
3847c08f7e Disable heaters/steppers before message 2018-10-19 13:30:46 -05:00
Marcio Teixeira
71e19baf69 Fix kill => disable_all_heaters => print_job_timer.stop (#12146)
- Remove `print_job_timer.stop()` from `disable_all_heaters`
- Call `print_job_timer.stop()` for relevant `disable_all_heaters()`.
- Split up `kill()` for watchdog interrupt safety
2018-10-18 21:20:56 -05:00
Ludy
4cc1c2627e Update German language (#12143) 2018-10-18 19:17:37 -05:00
Ludy
75a0d46edf Fix compile warning re: LCD_INFO_SCREEN_STYLE 2018-10-18 19:16:24 -05:00
Scott Lahteine
a81763c237 Pins E sanity check tweak 2018-10-18 18:48:23 -05:00
Giuliano Zaro
bc22641002 [2.0.x] Updated Italian Language (#12148) 2018-10-18 18:08:39 -05:00
Michael Triffon
eded90bf87 Updated Azteeg X5 Mini Wifi pins for onboard SD (#12133) 2018-10-18 11:52:55 -05:00
nhchiu
27a84fd021 Remove unused option in Anycubic Kossel config (#12138) 2018-10-18 11:47:59 -05:00
Scott Lahteine
67a3c5a16a Alternative info screen (Prusa-style) (#12132)
* Fix Z value display
* Add HAS_PRINT_PROGRESS
* Alternative Info Screen option
* Add LCD_INFO_SCREEN_STYLE to example configs
2018-10-18 11:34:52 -05:00
Marcio Teixeira
5b7dd553d3 Fix sd_mmc_spi_mem capacity; clean up USB code (#12134)
- Fix an error in the return value of `sd_mmc_spi_read_capacity` which was causing the host OS to read beyond the last sector in the card.
- Clean up the USB flashdrive code and add better debugging.
2018-10-18 11:34:07 -05:00
Scott Lahteine
df768e7d8f Followup to #12129 2018-10-18 11:29:49 -05:00
Chris Pepper
3c13c9e3e9 [LPC176x] Fix USEABLE_HARDWARE_PWM macro, cleanup multiple LED support (#12129) 2018-10-18 11:26:50 -05:00
InsanityAutomation
a768df83cb Remove stale variable (#12136) 2018-10-18 11:26:14 -05:00
Hannes Brandstätter-Müller
c36773bffb Update the Ender-4 example config (#12131)
- Enable filament change menu
- Enable bed-PID
- Enable s-curve acceleration
- Enable some menu items
- Update from Skorpi's new version
- Fix extruder steps, deactivate nozzle clean feature
2018-10-17 15:49:52 -05:00
Ludy
9c71bff5e8 Update German language (#12115) 2018-10-17 11:17:06 -05:00
Nils Hasenbanck
9deb23aa47 Add missing SerialUSB definition for STM32 HAL (#12124) 2018-10-17 11:14:10 -05:00
Nils Hasenbanck
0519ef0802 Update pins for final RemRam v1.3 board (#12125) 2018-10-17 11:13:38 -05:00
InsanityAutomation
3ec3872730 Single Z raise value for all tool-changing / parking (#12090)
* Universal tool-change Z lift
* Add TOOLCHANGE_ZRAISE to example configs
* Park/unpark changes to example configs
* Implement DEBUG_DXC_MODE
2018-10-17 11:11:41 -05:00
Scott Lahteine
6bdbe3299e Fix a comment 2018-10-17 10:33:54 -05:00
Scott Lahteine
bc75eb2c64 Cleanup for HAL_spi_Due.cpp 2018-10-17 10:33:54 -05:00
AnHardt
d82bcdeea1 Make PULSE_STOP(E) conditional (#12121) 2018-10-17 09:52:57 -05:00
Chris Pepper
c90e26dfa6 fix normal extruder stepping (#12118) 2018-10-17 02:47:31 -05:00
Hannes Brandstätter-Müller
96bbda5d48 remove confusing comment (#12120) 2018-10-17 02:47:03 -05:00
Marcio Teixeira
f98f4ac7ea Fix and improve EXTENSIBLE_UI (#12117)
- Add methods to access print counter data
- Clean up some inconsistent method names
- Clear lcd status after filament change
- Implement `lcd_reset_status` so it works like UltraLCD
2018-10-16 16:58:29 -05:00
Scott Lahteine
8bf596bd4c RETRACT_ZLIFT => RETRACT_ZRAISE 2018-10-16 16:46:40 -05:00
Marcio Teixeira
056561df93 [2.0.x] Enhancements to FILAMENT_RUNOUT_SENSOR (#12069)
- Added FILAMENT_RUNOUT_DISTANCE_MM option
- Added FILAMENT_MOTION_SENSOR option
2018-10-16 07:28:52 -05:00
Scott Lahteine
cce4931342 Clean up recent contribs 2018-10-16 06:45:44 -05:00
Karl Andersson
8b5e51c9aa STM32F4xx modifications for HAL_STM32 (#12080) 2018-10-16 06:42:41 -05:00
Scott Lahteine
bf0c809ff2 Update M165 comment 2018-10-16 06:10:27 -05:00
AnHardt
9ac9649183 Mixer - update descriptions (#12108) 2018-10-16 06:09:02 -05:00
Scott Lahteine
9bf5d4331c Clear up some compiler warnings 2018-10-16 05:47:02 -05:00
Scott Lahteine
0139762a96 Fix a sanity check 2018-10-16 05:46:33 -05:00
Scott Lahteine
2ecb124e42 Fix trailing whitespace 2018-10-16 03:50:16 -05:00
AnHardt
f56968ba0b New Continuous Filament Mixer (#12098) 2018-10-16 03:38:57 -05:00
Ludy
2d2cd628c6 Update German language (#12094) 2018-10-16 02:59:04 -05:00
Scott Lahteine
84b59d58fb Clean up whitespace 2018-10-16 02:02:20 -05:00
swilkens
06e2afe8e0 [2.0.x] Reduce HOMING_FEEDRATE_XY for Ender 3 (#12105)
Homing on the Ender 3 with HOMING_FEEDRATE_XY set to 50*60 was shown (#12074) to cause the end-stop micro-switches to bottom out, causing the carriage for both X and Y axis to physically crash into the micro switch. Reducing the homing speed prevents the switches from bottoming out.
2018-10-16 01:51:47 -05:00
TheSFReader
af939c158a Option for G0 to have a separate feedrate (#12089) 2018-10-16 01:49:51 -05:00
Scott Lahteine
3d5be2ea4b Merge pull request #12093 from p3p/pr_bf2_pulloutlpcframework
[HAL][LPC176x] Pull out framework, improve build, fix things
2018-10-14 17:57:21 -05:00
Christopher Pepper
e5b4bf22d4 Remove debug output from flash persistent store implementation 2018-10-14 18:43:48 +01:00
Christopher Pepper
42fb7c14b0 Update the sdcard usb sharing config and apply to Re-ARM 2018-10-14 18:43:48 +01:00
Christopher Pepper
61fbd0aa59 update lpc builds to use platformios ldf limited to strict mode
need to identify why incompatible libraries are still included without specifically disallowing them
2018-10-14 18:43:48 +01:00
Christopher Pepper
254b68fe2c servo update 2018-10-14 18:43:48 +01:00
Andy Shaw
870bfd08f5 usb and sdcard sharing improvements
* Add traceback after watchdog timeout

Add the cpability to perform a traceback following a watchdog timeout.

* Enhanced hardware SPI

Allow use of either SSP0 or SSP1.
Ensure that no data is left in I/O buffers after calls to enable sharing of SSP hardware.

* Make flash emulation of eeprom the default

Make use of flash for eeprom storage the default. This means that usage of eeprom will not cause USB drive mount/unmount operations.

* Allow sharing of SD card

SD card I/O operations from the USB stack take place in idle loop, rather than at interrupt time. Allowing sharing of the SPI bus.

New configuration options to allow usage of the SD card to be specified.

* Fix problem with hardware SPI pins
2018-10-14 18:43:48 +01:00
Christopher Pepper
5ddf52d58e [HAL][LPC176x] Pull out framework into separate repository
Framework and build platform now located at https://github.com/p3p/pio-framework-arduino-lpc176x and https://github.com/p3p/pio-nxplpc-arduino-lpc176x respectively

fix mkssbase leds

move hardware serial

remove hardware/software serial

Hardware Serial extraction

HardwareSerial ISRs

fix disabled serial2 causing Serial object to link

move usb devices out to framework

separate out adc/pwm peripheral function from hal.cpp

fix includes

remove unused pwm init

move adc

HAL header update

templated filtered adc

LPC1769 platform
2018-10-14 18:43:48 +01:00
Roman Moravčík
213e94bce2 [2.0.x] Updated slovak translation (#12059) 2018-10-14 02:15:15 -05:00
Karl Andersson
a40458405a Fix datasize error when FWRETRACT is disabled (#12086) 2018-10-14 02:14:34 -05:00
Scott Lahteine
951b25163e Extend M217 with configurable park/raise (#12076) 2018-10-13 23:08:20 -05:00
Kevin Velickovic
ea13a77dcb Fixed Z-Probes NO/NC for Anycubic Kossel (#12083) 2018-10-13 20:34:56 -05:00
N95JPL
ab9d5eb38d Add Bootscreen Animation (#12077) 2018-10-12 22:11:20 -05:00
Scott Lahteine
8653cedee4 Improve use_example_configs script 2018-10-12 21:54:09 -05:00
Scott Lahteine
26208a5c2f Clean up some boot screens 2018-10-12 18:56:39 -05:00
Scott Lahteine
9b6be0ae0f Fix lite status screen SD % 2018-10-12 17:02:59 -05:00
Scott Lahteine
af3bf6c956 Tweak config spacing 2018-10-12 16:09:27 -05:00
Scott Lahteine
a44ef27897 Outdent singlenozzle toolchange code 2018-10-12 15:19:03 -05:00
Scott Lahteine
d338e4d875 Fix singlenozzle toolchange cold extrusion test 2018-10-12 15:15:25 -05:00
Roxy-3D
25b980dddb Remove erroneous Pin 12 definition
There is no switchable Power Supply.   Don't put it on Pin 12.   
(Pin 12 is actually FAN1)
2018-10-12 13:45:04 -05:00
Scott Lahteine
ddaef1a60c Clean trailing whitespace 2018-10-11 21:40:55 -05:00
Scott Lahteine
49d4ed4d3f Merge pull request #12063 from thinkyhead/bf2_sensitive_pins
Add MS3 pins. Optimize SENSITIVE_PINS.
2018-10-11 01:10:34 -05:00
Scott Lahteine
1407afad73 Move SENSITIVE_PINS to its own file 2018-10-11 01:10:11 -05:00
Scott Lahteine
45e738876a Add stepper MS3 support
Co-Authored-By: TheLongAndOnly <thelongandonly@users.noreply.github.com>
2018-10-11 01:10:11 -05:00
Giuliano Zaro
d43d4e4219 Refactor PRINTER_EVENT_LEDS, apply to M303 (#12038)
Co-Authored-By: Giuliano Zaro <gmagician@users.noreply.github.com>
2018-10-10 21:25:43 -05:00
Giuliano Zaro
d8d76cd2ba [2.0.x] Italian language update (#12060) 2018-10-10 20:13:10 -05:00
Scott Lahteine
e8d2cf4fb5 EEPROM followup (tmc_stepper_current_t) 2018-10-10 17:25:45 -05:00
Scott Lahteine
50cbca4c55 Hide some menu items when busy 2018-10-10 17:18:33 -05:00
InsanityAutomation
3cb5517ddb Make singlenozzle tool-change honor no_move (#12056)
...Set no move earlier so it applies
2018-10-10 16:49:59 -05:00
InsanityAutomation
d332fcb8fa Fix firmware-retract compile errors (#12061) 2018-10-10 16:46:08 -05:00
Scott Lahteine
43940d59ed Fix trailing spaces 2018-10-10 16:24:35 -05:00
InsanityAutomation
b2c1cd7eda Allow cold change of active extruder (#12055)
Followup to #11994
2018-10-10 09:57:48 -05:00
Scott Lahteine
d556dc1865 Fix and improve EEPROM storage (#12054)
* Clean up Temperature PID
* Improve EEPROM read/write/validate
* Group `SINGLENOZZLE` saved settings
* Group planner saved settings
* Group filament change saved settings
* Group skew saved settings
* Group `FWRETRACT` saved settings
2018-10-10 09:45:20 -05:00
Scott Lahteine
9b5c1a5e77 Fix EEPROM checksum bug
Addressing #12048
2018-10-10 06:14:58 -05:00
Scott Lahteine
272d4a5167 Apply #pragma once 2018-10-10 02:57:01 -05:00
Scott Lahteine
07d33849b0 Fix unused var warning, apply ENABLED 2018-10-09 21:31:28 -05:00
Hannes Brandstätter-Müller
a3e8cb1e44 [2.0.x] Ender-4 small improvements in Configuration (#11843) 2018-10-09 20:58:22 -05:00
Scott Lahteine
cf5284cdf2 Add SD Firmware Update capability (#12043)
Co-Authored-By: timoxd7 <timoxd7@users.noreply.github.com>
2018-10-09 20:00:47 -05:00
Scott Lahteine
0bd54392b7 Use uint8_t in EEPROM code 2018-10-09 19:00:01 -05:00
Scott Lahteine
ce82015d5f Fix include in G80 2018-10-09 17:24:56 -05:00
Marcio Teixeira
cef1de89d0 Fixed incorrect axis index. (#12051) 2018-10-09 16:59:34 -05:00
Scott Lahteine
d52deeb15a Adjust Travis CI tests 2018-10-09 16:48:43 -05:00
Marcio Teixeira
d6d48e63fb Allow #defined TYPE arg to ultralcd menu macros (#12041)
Previously, it was not possible for the TYPE argument to ultralcd menu macros to itself be a #defined value. This made it difficult to create variables to set many related menu items to a common precision that could be easily changed.
2018-10-08 20:01:00 -05:00
Emilio Moretti
2ef7175b42 Update Ender-2 BED_MAXTEMP (#12042)
Also added details to the README to make sure the Ender-2 status is properly documented.
2018-10-08 19:57:44 -05:00
Scott Lahteine
7f94ca950e Add Marlin icons graphics file 2018-10-08 19:53:01 -05:00
Scott Lahteine
5f6aabccbe Tweak M48 spacing 2018-10-08 19:11:25 -05:00
Marcio Teixeira
ec9aa4f468 [2.0.x] Miscellaneous fixes (#12039)
* Allow override of soft SPI pins in `pins_*.h`
* Add default case to avoid compiler warning.
* Additional pin definitions for Archim 2.
* Einsy Retro has same timings as Einsy Rambo.
2018-10-08 18:14:52 -05:00
Marcio Teixeira
906a24fa81 Extensible user interface API (#11193) 2018-10-08 15:44:05 -05:00
InsanityAutomation
ee253991d4 Various fixups for single-nozzle filament swap (#12036) 2018-10-08 15:39:55 -05:00
Marcio Teixeira
8dbb305e8e Fix "Missing separator" errors. (#12035)
- Makefiles require tabs (not spaces) before shell commands.
- Other indentation can either be space or tabs.
2018-10-08 14:28:52 -05:00
Scott Lahteine
55e810d512 Fix G80 compilation 2018-10-08 13:11:36 -05:00
Scott Lahteine
d5017e2788 Add status screen with 4 nozzles 2018-10-08 01:27:21 -05:00
Scott Lahteine
7db0113b53 Improve E_AXIS_N macro 2018-10-07 18:22:05 -05:00
Nils Hasenbanck
191df5e17d Correct PWM_PIN behavior for STM32 HALs (#12027) 2018-10-07 17:08:01 -05:00
Sam Lane
f2ecf8d510 Add option to control Solenoids under PARKING_EXTRUDER (#12028) 2018-10-07 17:07:12 -05:00
InsanityAutomation
74cd6cb4fc Single nozzle filament change (#11994) 2018-10-07 17:06:14 -05:00
Scott Lahteine
bfcf570d68 Try ISR_ALIASOF for Endstop Interrupts 2018-10-07 17:05:32 -05:00
Giuliano Zaro
c0d9058e25 Shorten an Italian menu title (#12034)
…and change a multi-use "back" menu item.
2018-10-07 16:43:48 -05:00
teemuatlut
dffb4c63dc [2.0.x] TMC2660 followup (#12029)
* Don't react to s2g on TMC2660. False positives
* Init with sensorless probing as well
2018-10-07 15:37:44 -05:00
Scott Lahteine
d6b0fbd771 Use uint8_t for all fan speeds (#12032) 2018-10-07 15:34:41 -05:00
Scott Lahteine
cb7844c8d4 Save PROGMEM on serial prefixes (#12033)
With default config and `EEPROM_SETTINGS`, saves over 200 bytes of PROGMEM.
2018-10-07 15:32:15 -05:00
Scott Lahteine
07db08e39d Fix EXTRUDER_AUTO_FAN_SPEED comment 2018-10-06 19:51:17 -05:00
Scott Lahteine
ca0e308105 Fix up some units comments 2018-10-06 19:45:50 -05:00
Scott Lahteine
65b8f3821b Suppress temperature.h compile warning 2018-10-06 19:29:41 -05:00
teemuatlut
c447d75916 Add support for TMC2660 (#11998) 2018-10-06 17:18:10 -05:00
Scott Lahteine
cf0b9eb37c no need to use destination in do_pause_e_move 2018-10-06 16:43:21 -05:00
Scott Lahteine
e8d677620c Use NUM_SERVOS in EEPROM code
Fix #12015
2018-10-06 15:11:32 -05:00
Scott Lahteine
0fcdfdeed6 Followup to #12017 2018-10-06 13:23:58 -05:00
Phr3d13
acac2adfc8 Add support for MeCreator2 (#12017) 2018-10-06 12:26:49 -05:00
Thomas Moore
49823a4939 Fix broken jerk handling (#12019)
Fix #12004
2018-10-06 12:02:50 -05:00
Scott Lahteine
68bb75c847 Merge pull request #12013 from TheSFReader/CNCParser
CNC GCode dialect compatibility improvements
2018-10-06 00:32:58 -05:00
Scott Lahteine
52a37913c1 Extend and apply some corrections 2018-10-06 00:27:21 -05:00
Scott Lahteine
77b9a41f1f Add G-code extensions to example configs 2018-10-06 00:15:35 -05:00
thesfreader
e09c144674 Add CNC-like G-code options 2018-10-06 00:15:27 -05:00
Scott Lahteine
33056046a3 STM32 non-generic PWM_PIN and USEABLE_HARDWARE_PWM (#12016) 2018-10-06 00:14:12 -05:00
Scott Lahteine
d5141c4e03 Fix up leading/trailing whitespace 2018-10-05 18:19:59 -05:00
Marcio Teixeira
03fc4d31d0 Makefile support for 32-bit Archim board and new TMC library (#11997)
* Support new TMC library and 32-bit Archim board

- Added IS_MCU flag
  - When IS_MCU flag is 1, AVR compiler will be used
  - When IS_MCU flag is 0, ARM compiler will be used
- Added support for new TMC library
- Added support for a 32-bit Archim board, which could probably be used as a basis for other 32-bit boards.
2018-10-05 16:06:11 -05:00
Scott Lahteine
65b36642f8 Fix Anycubic Kossel config 2018-10-04 20:27:05 -05:00
Scott Lahteine
acb91b1b3f Merge pull request #11115 from marcio-ao/pr-usb-thumbstick-support
[2.0.x] Add support for USB thumbdrives/flashdrives
2018-10-04 20:03:21 -05:00
Scott Lahteine
fc326b3dde Add USB_FLASH_DRIVE_SUPPORT to examples
Co-Authored-By: marcio-ao <marcio@alephobjects.com>
2018-10-04 19:54:12 -05:00
Marcio Teixeira
2067619a26 Add USB_FLASH_DRIVE_SUPPORT 2018-10-04 19:54:12 -05:00
Giuliano Zaro
07fe8d28be [2.0.x] Partial Italian revert (#12008)
- Use a comma for decimals just in one message has not been a good idea.
- Full comments translation
2018-10-04 14:38:54 -05:00
Scott Lahteine
517b4f4cd4 Fix lightweight UI hotends display 2018-10-04 14:37:24 -05:00
Giuliano Zaro
72a750e0eb [2.0.x] Update Italian language (#11996) 2018-10-04 03:03:47 -05:00
Scott Lahteine
bb561baf9e Tweak some config comments 2018-10-04 02:42:12 -05:00
Nils Hasenbanck
fcf6d127fd STM32 timer simplification (#11995)
Prescalers aren't calculated for the given target frequency.
Stepper timer should run at 2 Mhz and temperature timer at 72 Khz.
2018-10-03 22:33:24 -05:00
Scott Lahteine
8daadd2c8c Fix TMC_DEBUG undefined report_tmc_status (#11993) 2018-10-03 11:56:49 -05:00
Scott Lahteine
c40ea1f0fd Update EEPROM_VERSION
And set EEPROM_OFFSET to 0, since the historical 100 skipped bytes are never used.
2018-10-03 11:34:34 -05:00
Scott Lahteine
1358bd9319 Make MAX_EXTRUDERS always 6 2018-10-03 11:32:19 -05:00
AnoNymous
001f26b642 Template struct simplification for serial (#11990) 2018-10-03 11:01:21 -05:00
Scott Lahteine
348004c34f STM32F7 HAL using the official STM32 Arduino Core (#11750) 2018-10-03 03:26:07 -05:00
Scott Lahteine
3e58b3a5d4 Followup to #11943 2018-10-03 02:55:10 -05:00
teemuatlut
c3229e1b34 Migrate to a new TMC library (#11943) 2018-10-03 02:48:49 -05:00
brian park
2abf3d258d Korean language translation support (#11987) 2018-10-03 01:53:34 -05:00
Eduardo José Tagle
d6955f25b2 Expand serial support in DUE/AVR hals exploiting the templated MarlinSerial classes (#11988) 2018-10-03 00:47:27 -05:00
Eduardo José Tagle
f6f2246f59 Templatized serial classes (#11982) 2018-10-02 22:15:30 -05:00
Scott Lahteine
ee53f7d813 Revert header reorg. 2018-10-02 22:09:41 -05:00
Scott Lahteine
d619ba2685 Tweak STM32F4 config 2018-10-02 22:03:00 -05:00
Chris Pepper
6b1967ed33 Add back in the Env backup restore around each platforms tests (#11980) 2018-10-02 21:36:18 -05:00
LineF
d777cef837 fixed minimum macro (#11986) 2018-10-02 21:35:34 -05:00
Scott Lahteine
e3f7b69105 Add PROBING_STEPPERS_OFF (#11984)
Co-Authored-By: houseofbugs <houseofbugs@gmail.com>
2018-10-02 05:13:58 -05:00
Scott Lahteine
0e5bcdf695 Make DISABLE_INACTIVE_EXTRUDER a simple switch 2018-10-02 04:57:03 -05:00
Scott Lahteine
0dedb3e139 Reorganize some core headers (#11983) 2018-10-02 04:25:46 -05:00
Thomas Moore
ab4549d2bc [2.0.x] Add simultaneous retraction for mixing extruder (#11941) 2018-10-01 23:32:02 -05:00
Scott Lahteine
80f9473fb4 Clean up some Travis tests 2018-10-01 19:03:25 -05:00
Scott Lahteine
c75f5a376b Tweak some comments 2018-10-01 18:34:14 -05:00
Scott Lahteine
366fae684c Merge pull request #11978 from thinkyhead/bf2_minmax_no_pragma
Ensure MIN/MAX override, reduce STM32F4 build warnings
2018-10-01 05:33:18 -05:00
Scott Lahteine
f4c625d3a1 Ensure MIN/MAX overrides 2018-10-01 05:32:55 -05:00
Scott Lahteine
3019713402 Reorganize some enums 2018-10-01 05:32:55 -05:00
Scott Lahteine
606a4362b3 Reduce STM32F4 compile warnings 2018-10-01 04:41:17 -05:00
Scott Lahteine
ccef14e2b2 Merge pull request #11191 from dot-bob/MOVE_Z_WHEN_IDLE-2.0.x
Add option to move Z on double-click when idle
2018-10-01 02:08:52 -05:00
Scott Lahteine
b3154b2120 Apply MOVE_Z_WHEN_IDLE to example configurations
Co-Authored-By: dot-bob <gibben@gmail.com>
2018-10-01 01:41:11 -05:00
dot-bob
b0fd8f2d74 Add option to move Z on double-click when idle 2018-10-01 01:41:11 -05:00
Scott Lahteine
389376c40e Clean up softspi.h 2018-10-01 01:29:48 -05:00
Scott Lahteine
e78bdd654d Clean up BABYSTEP options 2018-10-01 01:29:21 -05:00
InsanityAutomation
8ae113ff36 Show zprobe_zoffset when BABYSTEP_HOTEND_Z_OFFSET is disabled (#11973) 2018-10-01 00:30:10 -05:00
InsanityAutomation
2e98437392 Clean up main menu (#11972) 2018-10-01 00:15:06 -05:00
InsanityAutomation
6d862b2916 Home before level corners, if needed (#11976)
…and add a consistent homing screen for all LCD pre-homing.
2018-10-01 00:14:28 -05:00
Scott Lahteine
11ac75edcb Use PGM_P for PSTR pointers (#11977) 2018-09-30 23:44:33 -05:00
InsanityAutomation
4d5566a6b7 Add filament runout sensor menu item (#11971) 2018-09-30 21:33:46 -05:00
Scott Lahteine
8489673cea Adjust some HAL formatting 2018-09-30 21:24:37 -05:00
Scott Lahteine
fb8a07660a Followup to minmax patch
Co-Authored-By: Palatis <palatis@gmail.com>
2018-09-30 21:17:31 -05:00
Scott Lahteine
3c40933713 Remove trailing spaces, old comment 2018-09-30 20:47:06 -05:00
Hannes Brandstätter-Müller
a3ec805c97 Anycubic Kossel Linear+: corrected DELTA_DIAGONAL_ROD (#11964) 2018-09-30 05:41:26 -05:00
AnoNymous
b30ca652ae Replace MIN# / MAX# with variadic MIN / MAX (#11960) 2018-09-30 04:59:14 -05:00
Scott Lahteine
e10f730478 Tweak vector_3::apply_rotation 2018-09-30 01:51:33 -05:00
Scott Lahteine
e2ab78d876 Fix SERIAL_PORT_2 sanity check 2018-09-30 00:24:10 -05:00
AnoNymous
a644d8cb93 Avoid copies in vector and matrix (#11959) 2018-09-29 23:04:40 -05:00
Scott Lahteine
693865a649 Fix some whitespace 2018-09-29 22:36:36 -05:00
Scott Lahteine
9903305dda Merge pull request #9582 from tcm0116/2.0.x-sensorless_probing
[2.0.x] Add TMC2130 sensorless probing
2018-09-29 21:02:22 -05:00
Scott Lahteine
14df753086 Correction for block->mix_steps
Fix #11484
2018-09-29 19:13:17 -05:00
Alexander Amelkin
2ecfda80ac Improve support for JTAG/SWD pins reuse (#11963)
STM32 can reuse JTAG and SWD pins separately. Add `DISABLE_DEBUG` option to disable both interfaces and retain `DISABLE_JTAG` to disable JTAG only.
2018-09-29 19:00:49 -05:00
Scott Lahteine
bb47009656 Apply sensorless changes to example configs 2018-09-29 18:54:14 -05:00
Thomas Moore
3286325044 Add TMC2130 sensorless probing 2018-09-29 18:54:14 -05:00
Scott Lahteine
7d5c336c56 Corrections for dylsexic TMC 2018-09-29 18:51:11 -05:00
Scott Lahteine
71d06ef1b2 Make opt_set, opt_set_adv, pins_set also enable 2018-09-29 18:36:33 -05:00
Scott Lahteine
d89d8fe852 Fix Busy State in temperature.cpp
Fix #11954
2018-09-29 17:03:35 -05:00
Giuliano Zaro
70e7a465d8 [2.0.x] Fix compile error (#11951)
Fix compile error intruduced with M109 modification
2018-09-29 13:48:23 -05:00
Hannes Brandstätter-Müller
935b120949 Anycubic Kossel: probe closer to the edge (#11950) 2018-09-29 02:26:16 -05:00
Scott Lahteine
1410e79e7f Ensure M109 handles autotemp 2018-09-29 02:12:06 -05:00
Scott Lahteine
e4389f7d23 Standard methods to wait for heating (#11949) 2018-09-29 01:44:47 -05:00
Scott Lahteine
bdc9889d3a Fix a sanity check 2018-09-29 00:24:25 -05:00
Scott Lahteine
321f9140d1 Followup to #11904 2018-09-28 20:04:40 -05:00
InsanityAutomation
23114aeb81 Fix garbled M119 output. Honor NUM_RUNOUT_SENSORS (#11948) 2018-09-28 19:00:11 -05:00
Scott Lahteine
1667ed9d1c Pause should use ECHOLNPGM 2018-09-28 18:15:38 -05:00
Victor Tseng
93839e2f73 Add option to enable/disable autoretract altogether (#11904) 2018-09-28 16:52:56 -05:00
Scott Lahteine
ad21a4f07b Tweaks to HAL format and order 2018-09-28 15:59:50 -05:00
Scott Lahteine
b682a1961a Tweak STM32F7 TMC2660 class 2018-09-27 21:13:15 -05:00
Scott Lahteine
a0a3b23e35 Reduce Raptor bootscreen by 144 bytes 2018-09-27 18:24:40 -05:00
InsanityAutomation
95d793456b Add Formbot Raptor config, fix other Formbot configs (#11926) 2018-09-27 19:20:43 -04:00
Mitch Roote
d016b572e3 [2.0.x] Add pin configuration for Fysetc F6 (#11932) 2018-09-27 19:20:19 -04:00
Alexander Amelkin
84926b1d5a HAL general support for DISABLE_JTAG option (#11211)
Some STM32-based boards may use multiplexed JTAG pins as IO. Up to now the `DISABLE_JTAG` option (defined in pins files) was only supported for AT90-based boards. This commit generalizes the code and adds support for boards based on STM32F1 and STM32F4.
2018-09-27 19:02:50 -04:00
Scott Lahteine
c575c5d5f6 Bring example configs up to date (#11939) 2018-09-27 18:47:26 -04:00
Scott Lahteine
6b1a4f30a8 Fix case of T-Rex 3 _Statusscreen.h 2018-09-27 17:00:55 -05:00
Scott Lahteine
ab7bfa86e2 Fix case of T-Rex-3 _Statusscreen.h 2018-09-27 17:00:55 -05:00
Scott Lahteine
241168926d Update some configs 2018-09-27 16:42:59 -05:00
Scott Lahteine
cb6454118c Workaround for Pronterface M29 2018-09-27 16:27:02 -05:00
Victor Tseng
eeab4141db [2.0.x] Anycubic Trigorilla 14 pins tweak (#11869) 2018-09-27 16:06:21 -04:00
InsanityAutomation
cb9dc56630 Add GT2560 v3 support (#11914) 2018-09-27 15:13:15 -04:00
InsanityAutomation
f2e630a05e Stow probe on probing failed (#11936)
Prevents probe from being left down should probing fail and print job continue
2018-09-27 13:26:14 -04:00
Hannes Brandstätter-Müller
0b602ae101 [2.0.x] Fix Anycubic Kossel with Probe V1, stuck LCD message after stow (#11929) 2018-09-27 13:23:53 -04:00
Giuliano Zaro
dc11131656 [2.0.x] fix possible race condition (#11923)
Fix some commits done in #11900
2018-09-25 13:56:57 -04:00
Scott Lahteine
d6b9327c11 Followup for Endstop Noise Threshold
Followup to #11912
2018-09-25 13:50:49 -04:00
Scott Lahteine
aa6e8e9325 Tweak some config comments 2018-09-25 13:42:28 -04:00
Scott Lahteine
5490a664f5 Expose: Homing Validation and Endstop Noise Threshold (#11912) 2018-09-24 21:59:12 -04:00
Scott Lahteine
cee34f7290 Followup for BABYSTEP_HOTEND_Z_OFFSET (#11916) 2018-09-24 21:46:56 -04:00
teemuatlut
884ad75cb8 Update config files 2018-09-24 17:26:18 -04:00
Giuliano Zaro
18e456d38d [2.0.x] fix home endstop bug (DON'T MERGE, needs discussion) (#11900) 2018-09-24 16:56:01 -04:00
Scott Lahteine
6742026568 Followup for 6 extruders 2018-09-24 14:36:50 -04:00
Scott Lahteine
04bdff4115 Add a blank line 2018-09-24 12:49:02 -04:00
Marcio Teixeira
ccbd045f02 Fixed warning about comparing signed to unsigned (#11909) 2018-09-24 12:03:29 -04:00
InsanityAutomation
1104054d73 2.0 IDEX Independent z offset and other fixes (#11862)
* Add Formbot Raptor board

Co-Authored-By: InsanityAutomation <insanityautomation@users.noreply.github.com>

* Add a second Z probe Z offset

Co-Authored-By: InsanityAutomation <insanityautomation@users.noreply.github.com>

* Modify method to utilize live adjustment of hotend z offset

Should probably move config option to babystepping and rename as it may now apply to all multiextruder systems

* Move config item and catchup other code to current method
2018-09-24 09:40:48 -05:00
Scott Lahteine
217e0efd20 General option PAUSE_BEFORE_DEPLOY_STOW (#11905) 2018-09-24 00:43:43 -04:00
Scott Lahteine
849dea92a8 Move probe extras below probe types 2018-09-23 23:23:07 -04:00
Scott Lahteine
a2b0260f0f Update Sublime files 2018-09-23 19:59:08 -04:00
Hannes Brandstätter-Müller
a4cdffdd69 Support for manually deployed fixed probes (#11899) 2018-09-23 19:59:08 -04:00
Scott Lahteine
ddcbf80f23 Followup for Z_TRIPLE_ENDSTOPS 2018-09-23 12:22:31 -04:00
Marcio Teixeira
c411e7eb0d [2.0.x] Squelch compiler warnings seen with -Wall (#11889) 2018-09-23 12:00:34 -04:00
Roxy-3D
83105590a0 Better default values for Mesh Inset 2018-09-22 03:25:18 -04:00
Roxy-3D
4163c1a514 Fix end stop and Z-probe reporting logic 2018-09-22 03:25:18 -04:00
Scott Lahteine
ea9eb2fc8f Fix servo angles in config-store 2018-09-21 15:41:36 -04:00
Scott Lahteine
afdd4803f8 Fix mfpub syntax highlighting 2018-09-19 23:57:05 -05:00
Roxy-3D
d3d6be8210 Add MAX7219 reverse units option (#11860) 2018-09-19 18:54:51 -05:00
Scott Lahteine
beab9733f8 Remove extra clauses in config-store 2018-09-19 17:06:51 -05:00
Scott Lahteine
5a74b12b45 Followup to #11769 2018-09-19 16:40:32 -05:00
InsanityAutomation
f38570ac55 Add custom user menu title (#11769) 2018-09-19 15:04:34 -05:00
Scott Lahteine
17494099a9 Fix parking_extruder_tool_change
Fix #11872
2018-09-19 03:02:07 -05:00
Scott Alfter
140caf99b8 E0_CS_PIN moved from A13 to A15 on RAMPS-FD v2.2 (#11865) 2018-09-18 22:24:20 -05:00
Scott Lahteine
10590c2f80 Fix some fan conditionals 2018-09-18 21:23:33 -05:00
Scott Lahteine
e4ee607fc8 Fix Dual X FRS in M600
Co-Authored-By: InsanityAutomation <insanityautomation@users.noreply.github.com>
2018-09-18 21:23:33 -05:00
Scott Lahteine
bae8f82ba8 [2.0] Fix Mixing Extruder mixing factors (#11861) 2018-09-18 01:10:41 -05:00
Scott Lahteine
c5e5cc5e9f Fix some trailing whitespace, macros 2018-09-17 17:30:04 -05:00
AnHardt
54bd124665 2.0.x: Fix normalize_mix() (#11856)
Mix factors needed to be updated consistent with the recent Stepper/Planner code refactor.
2018-09-17 16:37:38 -05:00
Roxy-3D
5fbfbde532 Fix example file to pull in correct pins file 2018-09-17 10:41:30 -05:00
Roxy-3D
378f354939 IDEX Scaled Duplication is still under development
Take it out of the menu until it is tested and working.
2018-09-17 10:26:44 -05:00
Scott Lahteine
65045ba54b tmc_util fix part 2
Followup to 115abf9
2018-09-17 05:36:17 -05:00
Scott Lahteine
09a2bee8aa Support more filament runout sensors in M119 (#11851) 2018-09-17 03:27:13 -05:00
Scott Lahteine
115abf9c53 Fix syntax error in front of tmc_axes 2018-09-17 01:10:20 -05:00
Roxy-3D
0780913848 IDEX Improvements (#11848) 2018-09-17 01:06:22 -05:00
Scott Lahteine
39732838b4 Tweak indent of Chinese languages 2018-09-17 00:58:32 -05:00
Scott Lahteine
53bd0b55cb Followup for 6 extruders 2018-09-16 23:57:50 -05:00
Scott Lahteine
722d186ca0 Merge pull request #11841 from thinkyhead/bf2_radds_ext_board_v3
Support for RADDS Extension Board V3 (and 6 extruders)
2018-09-16 23:32:04 -05:00
Scott Lahteine
1718eff54a Code changes supporting up to 6 extruders 2018-09-16 22:32:53 -05:00
Scott Lahteine
f5c210d33d Config changes supporting up to 6 extruders 2018-09-16 22:22:35 -05:00
Scott Lahteine
d948c6e867 RADDS Extension Board V3 support 2018-09-16 22:22:35 -05:00
Thomas Moore
c437bb08f1 Overhaul of the planner (#11578)
- Move FWRETRACT to the planner
- Combine leveling, skew, etc. in a single modifier method
- Have kinematic and non-kinematic moves call one planner method
2018-09-16 21:24:15 -05:00
Scott Lahteine
8323a08642 Clean up some whitespace 2018-09-16 19:44:21 -05:00
Scott Lahteine
4d99f9d96a Merge pull request #11062 from TheLongAndOnly/triplez-2.0.x 2018-09-16 18:15:27 -05:00
Scott Lahteine
6286afd456 Add Triple-Z options to example configs 2018-09-16 00:35:58 -05:00
Holger Müller
1a6f2b29b8 Add support for Triple-Z steppers/endstops 2018-09-16 00:35:58 -05:00
Hannes Brandstätter-Müller
bc06406d7d Fix Anycubic Kossel config (probe crash) (#11832) 2018-09-15 23:27:21 -05:00
Scott Lahteine
66f83d33e6 Fix some config comments 2018-09-15 23:21:55 -05:00
Hannes Brandstätter-Müller
84ed9b5a63 Send "G33 S P1" for Delta Height Calibration (#11831) 2018-09-15 20:17:35 -05:00
Scott Lahteine
215eee4fe5 Use 'friend' to access set_directions 2018-09-15 20:11:10 -05:00
Cassiano Leal
ff51e7322d Fix for Stepper::set_directions() compilation error (#11838) 2018-09-15 19:31:51 -05:00
Scott Lahteine
809b232fa2 Fix stepper directions after M501/M502
See https://github.com/MarlinFirmware/Marlin/issues/11103#issuecomment-421387611

Co-Authored-By: tcm0116 <tcm0116@users.noreply.github.com>
2018-09-14 20:00:55 -05:00
Scott Lahteine
f79a5a9dee Tweak spacing of L6470 options 2018-09-12 23:18:11 -05:00
Hannes Brandstätter-Müller
c37d3ae97d [2.0.x] Fix NOZZLE_PARK_FEATURE for Anycubic Kossel (#11812) 2018-09-12 15:37:38 -05:00
HenningJW
4fb2134f00 Fix non-sensical values for Zonestar themistor table (#11817)
Values taken from Zonestar firmware for P802QA with a Melzi board. Timestamps from the firmware package are from April 2016.
2018-09-12 15:36:04 -05:00
Scott Lahteine
b220a825a7 Fix raw_filwidth_value error 2018-09-12 04:31:55 -05:00
Scott Lahteine
1933d5d6fb Fix SD autostart with no LCD 2018-09-12 03:49:59 -05:00
Roman Moravčík
8bce5370c7 Updated slovak translation (#11807) 2018-09-12 03:29:17 -05:00
Giuliano Zaro
64d629ba2a [2.0.x] Italian language fix (#11796) 2018-09-12 03:28:22 -05:00
Scott Lahteine
8584d3697d Fix servo count define conflict
`MAX_SERVOS` => `NUM_SERVO_PLUGS`
2018-09-11 16:20:31 -05:00
Scott Lahteine
06949ae510 Fix MSG_FILAMENT_CHANGE_HEAT_1 for small LCD 2018-09-10 23:21:37 -05:00
Scott Lahteine
d882717d98 Save some PROGMEM with constexpr (#11798)
When possible, make `active_extruder` a `constexpr` to save some PROGMEM.
2018-09-10 23:09:26 -05:00
Sam Lane
4f883d5971 [2.0.x] Extruder-Distinct Linear Advance K Factors (#11789) 2018-09-10 22:37:32 -05:00
Scott Lahteine
fe9f088d60 [2.0.x] Anycubic LinearPlus, Trigorilla 1.4 (#11730) 2018-09-10 21:25:40 -05:00
Scott Lahteine
b6aae2b322 Tweak RAMPS_FD_V1 pins 2018-09-10 15:43:03 -05:00
Scott Lahteine
7391e23332 Fix RigidBoard FAN_PIN collision 2018-09-10 05:29:00 -05:00
Scott Lahteine
5d5cd1332d Merge pull request #11772 from SJ-Innovation/bf2_ClosedLoopController_Support 2018-09-10 03:18:29 -05:00
Scott Lahteine
53b8c3bd66 Add EXTERNAL_CLOSED_LOOP_CONTROLLER to examples 2018-09-10 03:17:17 -05:00
Sam Lane
1b6bc19427 Add external closed loop controller support 2018-09-10 03:17:17 -05:00
Marcio Teixeira
2ebfe90be9 Add custom preheat temp to filament change (#11475) 2018-09-10 02:51:46 -05:00
Karl Andersson
69d0ed5791 [2.0.x] Fix ambiguous function call (SERIAL_PROTOCOL_F) when using Arduino_Core_STM32 (#11747) 2018-09-10 02:36:06 -05:00
Scott Lahteine
d32c4efc77 Fix some trailing whitespace 2018-09-10 01:26:20 -05:00
Alexander Amelkin
bc1ba998b2 [2.0.x] Fix undefined symbol 'g29_in_progress' (#11781) 2018-09-09 22:06:03 -05:00
InsanityAutomation
bad225dc04 Fix mesh leveling compile errors (#11768) 2018-09-09 04:19:48 -05:00
Dave Johnson
0f7d82bab1 [2.0.x] include AVR HAL in PIO src_filter for at90usb_dfu (#11778)
I missed this one
2018-09-09 04:15:23 -05:00
Sam Lane
d783400330 Updates to STM32F7 HAL, for completeness (#11770) 2018-09-09 03:26:15 -05:00
Scott Lahteine
72af8e0f02 Patch extruder_advance_K edit menu
Fix #11776
2018-09-09 03:21:08 -05:00
Sebastianv650
7e8c073fba Fix extruder stops extruding with LA (#11758) 2018-09-09 00:04:14 -05:00
Scott Lahteine
0c01099f17 hop_amount => current_hop 2018-09-08 21:20:37 -05:00
Scott Lahteine
eafd62308e Use TMC2208Stepper v0.2.5 (#11714) 2018-09-08 20:41:21 -05:00
Kevin
e25d2ae4a2 [2.0.x] SWITCHING_TOOLHEAD (#11623) 2018-09-08 01:43:24 -05:00
Alexander Amelkin
f417408df1 [STM32F1] Fix HAL for new PlatformIO (#11749) 2018-09-07 18:15:32 -05:00
Roxy-3D
3d7f2c1fde Fix directory name to be consistent (#11745) 2018-09-06 14:10:40 -05:00
Roxy-3D
a9c98a0e47 Create _Bootscreen.h 2018-09-06 10:24:03 -05:00
Roxy-3D
9f85d3a9cb Create _statusscreen.h 2018-09-06 10:23:20 -05:00
Roxy-3D
e2e7b1d705 Break out support of the T-Rex 3 2018-09-06 10:20:20 -05:00
Roxy-3D
67996c2b66 Break out support for the T-Rex 3 2018-09-06 10:19:05 -05:00
Roxy-3D
9c8d9d282f Break out support for Formbot T-Rex3 from previous versions 2018-09-06 09:49:04 -05:00
Roxy-3D
e3aac59637 Create pins_FORMBOT_TREX3.h 2018-09-06 09:46:23 -05:00
Roxy-3D
f580247581 Create pins_FORMBOT_TREX2.h 2018-09-06 09:45:29 -05:00
Roxy-3D
073857646b seperate the T-Rex2 and T-Rex3 support 2018-09-06 09:43:43 -05:00
Roxy-3D
fe4fc2883b Add support for Formbot T-Rex3 2018-09-06 09:41:59 -05:00
Scott Lahteine
2a61c9a939 Various fixups to configs, spacing, etc. 2018-09-06 06:44:31 -05:00
Scott Lahteine
b3efbc6e6e Add MANUAL_E_MOVES_RELATIVE to more configs 2018-09-06 02:09:14 -05:00
Scott Lahteine
3b2690ab02 Merge pull request #11733 from marcio-ao/pr-relative-manual-extrusion-moves
[2.0.x] Show manual extrusion moves as relative in LCD
2018-09-06 02:01:21 -05:00
Scott Lahteine
679e4602fe Add MANUAL_E_MOVES_RELATIVE to examples 2018-09-06 02:00:25 -05:00
Marcio Teixeira
beb51c2d58 Show manual extrusion moves as relative in LCD
- Implements FR#11724
- Old behavior can be restored by commenting out MANUAL_E_MOVES_RELATIVE
2018-09-06 02:00:25 -05:00
Scott Lahteine
d10f29ae2e Pass segment length in G2-G3 2018-09-06 01:43:27 -05:00
Scott Lahteine
dcfde2317f Pass segment length in prepare_kinematic_move_to (#11737) 2018-09-06 01:40:22 -05:00
Roxy-3D
d5379ee9d6 Fix search for white space in enqueued commands 2018-09-05 16:57:08 -05:00
Roxy-3D
8d5bea073b Assume one Max7219 unit if not specified 2018-09-05 14:18:13 -05:00
Roxy-3D
9651ceb36b Correct spelling of #endif 2018-09-05 10:46:08 -05:00
Scott Lahteine
b213a89ef5 Sanity-check NOZZLE_PARK_POINT 2018-09-05 06:18:08 -05:00
Scott Lahteine
86ee74731e Comment for RADDS + RRDFGSC 2018-09-05 05:45:17 -05:00
Kevin
ae1271b2ae RADDS: Update Full Graphic Display Pins (#11731) 2018-09-05 03:51:54 -05:00
Scott Lahteine
650d4313c4 Bring some configs up to date 2018-09-05 03:49:24 -05:00
AnHardt
530a13ab6c [2.0.x] SECURITYFIX missing max temp error when PID is used (#11717) 2018-09-05 01:41:45 -05:00
Scott Lahteine
12fded46c2 Correct some FR strings
Co-Authored-By: pipersw <pipersw@users.noreply.github.com>
2018-09-04 04:00:22 -05:00
Michael Triffon
aefc2f7cf9 Add Anet A2 and A2 Plus Configurations (#11677) 2018-09-03 23:38:51 -05:00
scott0122
72fdb6bab3 Fix SWITCHING_NOZZLE zdiff (#11683) 2018-09-03 23:24:40 -05:00
Scott Lahteine
8b837dc3ad No need for last \n in G-code items 2018-09-03 23:23:20 -05:00
Scott Lahteine
d1ceaf5550 [2.0.x] Followup to IDEX changes (#11707) 2018-09-03 23:15:31 -05:00
Roxy-3D
d62f4df0b7 Disable LCD Pins used by new Max7219 hook up if in that mode 2018-09-03 09:56:25 -05:00
Roxy-3D
fa772c31bf Provide more options for Max7219 connection on Formbot 2018-09-03 09:52:36 -05:00
Scott Lahteine
8e18e48d49 Merge pull request #11610 from Freeviv/bugfix-2.0.x
[2.0.x] Editable servo angles
2018-09-03 03:55:38 -05:00
Scott Lahteine
4668c71a75 Revert circleci oopsie 2018-09-03 01:59:49 -05:00
Giuliano Zaro
59e76e5fdf [2.0.x] Fix planner computation (#11708)
Fix #11697
2018-09-03 00:29:29 -05:00
Roxy-3D
509ee44611 Boot and status file should not have been added to main directory! 2018-09-02 10:25:36 -05:00
Roxy-3D
f8abe12a9c Boot and status file should not have been added to main directory! 2018-09-02 10:25:13 -05:00
Roxy-3D
7680b64aa6 IDEX clean up (#11690) 2018-09-02 10:18:59 -05:00
Scott Lahteine
8c11220042 [2.0.x] Debug Travis tests and scripts (#11704) 2018-09-02 03:27:39 -05:00
Scott Lahteine
d0c96ee83e Use TMC2208Stepper 0.2.1 for LPC1768 2018-09-01 20:03:41 -05:00
teemuatlut
49e107cea9 Restrict SW serial to AVR (#11696) 2018-09-01 15:24:44 -05:00
Scott Lahteine
92069f1422 Merge pull request #11692 from thinkyhead/bf2_teensy_and_servos
[2.0.x] Don't test servos for Teensy 3.5/3.6
2018-09-01 15:07:09 -05:00
Scott Lahteine
05dc79e78d Update platform tests to use '.test' folder 2018-09-01 06:57:55 -05:00
Scott Lahteine
18f1af2dca Fix up Teensy tests, servo sanity 2018-09-01 01:10:20 -05:00
Scott Lahteine
74a04aed55 Fix compile error with NO_LCD_MENUS 2018-08-31 19:16:04 -05:00
Scott Lahteine
509e1cf2bd Add *_DRIVER_TYPE to remaining configs 2018-08-31 19:07:17 -05:00
Scott Lahteine
e3debc796d Revert "Use TMC2208Stepper version 0.2.2"
This reverts commit 77efcad1df.
2018-08-31 17:48:41 -05:00
Scott Lahteine
d55f44edba Printcounter improvements (#11689) 2018-08-31 17:40:39 -05:00
Scott Lahteine
6a3207391f Remove obsolete HAL_timer_restrain 2018-08-31 16:17:22 -05:00
Scott Lahteine
77efcad1df Use TMC2208Stepper version 0.2.2 2018-08-31 16:13:23 -05:00
Scott Lahteine
e3fc9aa35f Update some config comments 2018-08-31 16:03:44 -05:00
Scott Lahteine
136860e8bb Sanity-check SERVO pin for servo probes 2018-08-31 15:47:47 -05:00
Roman Moravčík
66de50f5f8 Updated slovak translation (#11684) 2018-08-31 15:37:49 -05:00
scott0122
ada85d5585 Improve HOTEND OFFSET Z display precision to 3 (#11686) 2018-08-31 15:15:40 -05:00
scott0122
607c1e58d9 Improve HOTEND OFFSET Z display precision to 3 (#11685) 2018-08-31 15:14:33 -05:00
Scott Lahteine
3e81745e81 Fix issues, make optional 2018-08-29 17:58:02 -05:00
Jan
aa80e448e2 Store servo angles in EEPROM 2018-08-29 17:58:02 -05:00
Scott Lahteine
9953213513 Add EDITABLE_SERVO_ANGLES to example configs 2018-08-29 17:57:52 -05:00
Marcio Teixeira
0966bdcbc4 Reorganized ultralcd menu (10317) (#10360)
Replaced "Prepare" and "Control" menus with "Movement", "Temperature", "Configuration" and "Advanced Settings"
2018-08-29 16:51:14 -05:00
Scott Lahteine
e40a3eef04 Support for Anet A2 Plus 2018-08-29 03:39:43 -05:00
Scott Lahteine
199613a416 Merge pull request #11653 from neorex/add_support_E4
[2.0.x] Fix 5 mixing steppers
2018-08-29 02:00:23 -05:00
Scott Lahteine
32e38fee74 Update Controller Fan for Y2,Z2 2018-08-29 01:49:48 -05:00
Jeonghwan Roh
59cf217e77 Fix 5 mixing steppers 2018-08-29 01:49:48 -05:00
Scott Lahteine
2a2e8c314e Suppress emergency parser G-code errors
Co-Authored-By: srieche <srieche@users.noreply.github.com>
2018-08-29 01:04:55 -05:00
Ilya Bukhonin
7ecb8b4af5 [2.0.x] Teensy 3.1 and 3.2 support (#11460) 2018-08-27 21:49:49 -05:00
Pablo Crespo
409a0632af [2.0.x] Add Morpheus Board support (#11651) 2018-08-27 21:28:03 -05:00
Marcio Teixeira
0f14977b5d LIGHTWEIGHT_UI: Allow feedrate % to exceed 255% (#11656)
- Changed type of integer used for feedrate percentage from uint8_t to uint16_t.
2018-08-27 21:26:32 -05:00
scott0122
6dc9553aa5 Fix SWITCHING_NOZZLE compile error (#11657) 2018-08-27 21:25:25 -05:00
Scott Lahteine
a15e570d3b Fix SD progress with Lite Status Screen
Co-Authored-By: Lê Hoàng <icy.lord.love.angel@gmail.com>
2018-08-26 17:12:05 -05:00
Scott Lahteine
66966dbd69 Tweak comments for newer multiplexer 2018-08-25 17:00:49 -05:00
Scott Lahteine
933d833ec8 Tweak some Anet A6 comments 2018-08-24 21:50:53 -05:00
Scott Lahteine
d1c9517903 Followup to hotend_offset[Z] patch 2018-08-24 21:32:00 -05:00
Scott Lahteine
e2b8fc4f17 Reduce some debug strings 2018-08-24 21:11:39 -05:00
Chris Pepper
b71c2b8651 [2.0.x] Update LPC176x tests, fix clean script (#11617) 2018-08-24 18:53:24 -05:00
Scott Lahteine
a317bb4991 Remove stray tab 2018-08-24 17:35:13 -05:00
Scott Lahteine
acf5ae3083 !ENABLED => DISABLED 2018-08-24 16:36:37 -05:00
Scott Lahteine
ba1919c1eb HAL tweaks to LPC1768 main 2018-08-22 17:16:18 -05:00
Scott Lahteine
0987ed2a18 Use American English 2018-08-22 17:16:18 -05:00
Kevin
6483285bc5 HOTEND_OFFSET_Z always available (#11603) 2018-08-22 00:21:29 -05:00
Michael Triffon
f8c52c9c29 Azteeg X5 Mini WiFi support (#11601) 2018-08-21 23:58:26 -05:00
jneilliii
3671c63cde Einsy Full Graphic LCD Fix (#11604)
Fixed issue with LCD timings for Einsy RAMBo board.
2018-08-21 23:43:52 -05:00
Colin Gilgenbach
593d5375ea Fix G28 resetting DUAL_NOZZLE_DUPLICATION_MODE (#11605)
There's no reason for G28 to reset DUAL_NOZZLE_DUPLICATION_MODE, because it only affects the E stepper, unlike DUAL_X_CARRIAGE which affects the X steppers as well.
2018-08-21 23:42:55 -05:00
Scott Lahteine
f0dbe61692 Tweaks to motion.h reachable tests 2018-08-21 23:34:29 -05:00
Scott Lahteine
2d3317a35b Prettify Dual X Carriage description 2018-08-21 23:34:29 -05:00
Roxy-3D
cd9868f442 Make position_is_reachable() smarter about IDEX machines`
On many IDEX machines the allowed travel of the X1 carraige and X2 carraige does not perfectly overlap.

This helps the issue.   But more work needs to be done at the higher level.  (For example the X1_MAX_POS should probably be factored into G26's mesh validation pattern.)
2018-08-21 19:12:26 -05:00
Scott Lahteine
97f6396b25 Fix RE_ARM LCD pins to avoid #undef 2018-08-21 12:47:40 -05:00
Scott Lahteine
0e25f66c09 Fix Ultimaker servo pin
As pointed out at https://github.com/MarlinFirmware/Marlin/issues/7981#issuecomment-407116642
2018-08-21 11:39:53 -05:00
Scott Lahteine
ad12b9b46b Fix indentation, whitespace, spelling, formbot pins... 2018-08-21 09:47:57 -05:00
Scott Alfter
b5537dde7f need to add E2END to pins_RAMPS_FD_V2.h (#11564) 2018-08-21 02:16:31 -05:00
Scott Lahteine
8f0bbdcc9b Fix up Max7219 orientations (#11596) 2018-08-21 02:06:18 -05:00
Scott Lahteine
d05b23941d Tweak env build test scripts 2018-08-21 02:05:34 -05:00
jmz52
a77f8c6dd5 Implement servo support for STM32F1 (#11580)
Implement servo support for STM32F1. Original code was incomplete and depended on Servo library from stm32duino which conflicts with `module/servo.h`.
2018-08-20 21:13:51 -05:00
Dave Johnson
0456caf0ad Consolidate shared HALs and isolate HAL compile (#11552) 2018-08-20 21:11:12 -05:00
jmz52
dfe18ac633 Fix compilation error for STM32F1 with U8GLIB_SSD1306 or U8GLIB_SH1106 enabled (#11583)
The `binary.h` file required by `lcd/dogm/dogm_bitmaps.h` is not present in stm32duino environment. Binary macros are defined in `bit_constants.h` in stm32duino framework.
2018-08-20 20:37:56 -05:00
Roxy-3D
b0a8ce59bd Update Boards.h to include Formbot support 2018-08-20 16:46:27 -05:00
Roxy-3D
62ce937540 Update pins.h to include the Formbot board 2018-08-20 16:44:54 -05:00
Roxy-3D
a82be36d5d Create pins_FORMBOT.h 2018-08-20 16:43:42 -05:00
ghent360
00d24a8219 Don't call __delay_4cycles for 0 cycle delay - takes a really long time. (#11586) 2018-08-18 22:50:11 -05:00
Scott Lahteine
56f1e17a25 [2.0.x] Max7219 cleanup, simplify, and extend (#11575) 2018-08-18 01:33:13 -05:00
jmz52
0b2d686160 Fix "SD init fail" problem for STM32F1 (#11579)
Fix "SD init fail" problem for STM32F1 caused by incorrect SS pin state and incorrect SPI mode. Issue #11225
2018-08-17 23:27:10 -05:00
Scott Lahteine
a98f21ec5e Marlin assumes signed chars 2018-08-16 22:52:42 -05:00
Kevin
db30650731 Fix UBL/Homing (#11566) 2018-08-16 08:28:40 -05:00
Roxy-3D
aae4c67e5d Max7219 Clean Up (#11563)
Some of the Rotations did not do the right thing with setting and clearing pixels.
I think it is correct now.   But if not...  It is much closer to being correct.
2018-08-15 21:22:28 -05:00
InsanityAutomation
9de730b2bf Update tool_change.cpp (#11559) 2018-08-15 19:30:52 -05:00
InsanityAutomation
c2553f9888 2.0.x - Idex match119 (#11556)
* Update ubl_G29.cpp

* Update ultralcd.cpp
2018-08-15 13:26:11 -05:00
Roxy-3D
e9de321ac0 declare void Max7219_register_setup(); 2018-08-15 10:36:51 -05:00
Scott Lahteine
952a1bc9d5 Merge pull request #11551 from thinkyhead/bf2_trinamic_fixes
[2.0.x] Fix TMC2208 SW serial communication
2018-08-14 19:07:08 -05:00
petrzjunior
67613bf5bd Update Czech translations (#11510) 2018-08-14 18:45:16 -05:00
Scott Lahteine
bd6d032628 Update default driver configuration
Co-Authored-By: teemuatlut <teemu.mantykallio@live.fi>
2018-08-14 18:42:04 -05:00
Scott Lahteine
1561e61df7 New TMC2208 constructor
Co-Authored-By: teemuatlut <teemu.mantykallio@live.fi>
2018-08-14 18:41:51 -05:00
Nils Hasenbanck
b37bfeffeb [2.0.x] Use the new const functions of the persistentStore api (#11544) 2018-08-14 18:35:36 -05:00
Chris Pepper
5573ef62c6 [2.0.x] PersistentStore update followup (#11549) 2018-08-14 17:54:12 -05:00
Scott Lahteine
846bd24eb9 MALYAN_LCD is ok without SD 2018-08-14 05:31:47 -05:00
Scott Lahteine
834ea7fcea Remove 'const' from PersistentStore::capacity 2018-08-14 04:46:10 -05:00
Dave Johnson
c64199941e Compile only selected PIO environment (#11519) 2018-08-14 03:28:52 -05:00
Andy Shaw
5be2559eda Use flash memory to emulate EEPROM (#11500)
Use a sector of the LPC flash memory to emulate EEPROM storage, removing the need to have an SD card to store system parameters.
2018-08-14 01:19:34 -05:00
Scott Lahteine
6964e1a95a Clean up trailing whitespace 2018-08-14 00:55:37 -05:00
Scott Lahteine
ccf65c5397 Merge pull request #11542 from thinkyhead/bf2_misc_fixes_aug_6
Followup persistent store with heading, const
2018-08-14 00:19:45 -05:00
Scott Lahteine
865ee5985f Followup persistent store with heading, const 2018-08-13 23:55:33 -05:00
Scott Lahteine
a4b0148365 Easier to find 'static inline' 2018-08-13 23:55:33 -05:00
Scott Lahteine
cc0a60453f Merge pull request #11526 from hasenbanck/eeprom-cleanup
[2.0.x] Change direct eeprom access to HAL::PersistentStore
2018-08-13 19:45:10 -05:00
Roxy-3D
65c5227c29 Change M7219 I to setup Max7219 registers, but not do initialization pattern 2018-08-13 17:46:48 -05:00
Nils Hasenbanck
577aeb4aa9 All EEPROM access uses persistentStore 2018-08-13 17:43:35 -05:00
Scott Lahteine
6a8b906318 Followup for persistent_store_api.h 2018-08-13 17:43:35 -05:00
Chris Pepper
66d2b48b59 Update PersistentStore api (#11538)
- Clean up the API to use a `static` class instance to adhere to Marlin convention
- Add `const` position data access for read/write
- Add Storage capacity to the interface
2018-08-13 17:30:25 -05:00
Roxy-3D
60f1376798 Make M7219 I more robust and nice to look at
Make M2719 initialize the Max7219 registers and then run the initialization pattern (if one is specified).
2018-08-13 16:59:25 -05:00
Roxy-3D
fd15b1495a add I parameter to M42 to allow access to sensitive pins 2018-08-13 16:57:09 -05:00
Scott Lahteine
11b411a872 Improve AXIS_DRIVER_TYPE macros 2018-08-13 16:57:09 -05:00
Scott Lahteine
f1347f783d Optimize thermistor table 71
agData in Table 71 is extremely oversampled (see Issue #11220). I have removed the data points that perform *worse* than linearly interpolating the remaining points, and fixed up two points that were simply rounded incorrectly.

Co-Authored-By: Aaron Griffith <aargri@gmail.com>
2018-08-13 02:54:55 -05:00
Scott Lahteine
0bda22367b Allow Einsy RAMBo FAN1_PIN override 2018-08-13 02:49:30 -05:00
Scott Lahteine
1b921b246b Fix pca9632_set_led_color
…when used with an I2C screen.

Co-Authored-By: soimy <soimy@163.com>
2018-08-13 02:40:22 -05:00
Scott Lahteine
aa9d329560 Reduce max accel in Creality configs 2018-08-11 22:56:51 -05:00
Scott Lahteine
c93538e9f3 UBL/planner patch tweaks 2018-08-11 22:50:45 -05:00
Scott Lahteine
0af22549a6 Allow G33 to compile with no LCD 2018-08-11 22:32:09 -05:00
Thomas Moore
fc55f1da01 Account for UBL correction when setting the planner position (#11486) 2018-08-10 13:00:50 -05:00
Scott Lahteine
b328fb4dc9 Treat TMC2660 like non-TMC (#11508) 2018-08-10 00:30:28 -05:00
Scott Lahteine
42ffa58e35 Merge pull request #11488 from timeshell/bugfix-2.0.x
[2.0.x] Add Smoothieboard pins file
2018-08-10 00:24:22 -05:00
Scott Lahteine
72b086b90d Add A5984 to example configurations 2018-08-09 23:04:27 -05:00
Greg Nutt
a1a5367380 Smoothieboard V1.0/1.1 and A5984 support 2018-08-09 23:03:17 -05:00
Chris Pepper
b7e15a65e3 Target specific nxplpc and ststm32 pio platform versions to fix build (#11506) 2018-08-09 22:41:10 -05:00
Scott Lahteine
f891416e70 No raise on G28 after power-loss 2018-08-07 13:51:36 -05:00
Scott Lahteine
e4ecade8d4 Fix AUTO_POWER_CONTROL compile error
Counterpart to #11467

Co-Authored-By: lsellens <lsellens@users.noreply.github.com>
2018-08-06 23:20:51 -05:00
Giuliano
eee1b7c50c [2.0.x] Fix compile error (#11465)
Address #11463
2018-08-06 23:14:53 -05:00
Giuliano
e85feb2545 [2.0.x] Better timing handling (#11461) 2018-08-06 23:13:36 -05:00
Scott Lahteine
79835590e3 Easier to disable homing validation (#11458) 2018-08-06 23:11:37 -05:00
Scott Lahteine
131d216afa Fix drivers.h dependency, defer macro evaluation (#11450) 2018-08-03 21:49:04 -05:00
Scott Lahteine
9c62c47579 [2.0.x] Fix Dual X Carriage tool change crash (#11447) 2018-08-03 20:47:29 -05:00
Scott Lahteine
9bae413901 Add Bigtreetech/BIQU KFB 2.0 board (#11446) 2018-08-03 18:14:26 -05:00
Marcio Teixeira
f2224755ad Fix jumping progress bar. (#11439)
- When LCD_SET_PROGRESS_MANUALLY was disabled and an SD print was not active (i.e. the printer was idle), progress_bar_percent would read uninitialized memory from stack and cause progress bar to jump wildly.
- Also updated conditions in `#ifdef` to match `ultralcd.cpp`
2018-08-03 17:17:02 -05:00
Scott Lahteine
aae02827c0 Cosmetic pins changes 2018-08-03 17:03:19 -05:00
Scott Lahteine
64c493ad82 MKS_12864_OLED code cleanup 2018-07-30 23:22:40 -05:00
Scott Lahteine
b826bf4194 Fix initial safe_speed in jerk code (#11417) 2018-07-30 22:50:08 -05:00
forkoz
2cc950d67e [2.0.x] MKS SBASE Trinamic examples/support (#11402) 2018-07-30 22:48:58 -05:00
Roxy-3D
16432376ab Revert "[2.0.x]Idex and bl touch fixes" (#11407)
* Revert "[2.0.x] bltouch home refinements (#11397)"

This reverts commit 74900f7a70.

* Revert "[2.0.x]Idex and bl touch fixes (#11395)"

This reverts commit 6dafb90c01.
2018-07-28 23:14:46 -05:00
Giuliano
74900f7a70 [2.0.x] bltouch home refinements (#11397)
Just create  a better functions call logic flow
2018-07-28 19:30:14 -05:00
silentninja1
6dafb90c01 [2.0.x]Idex and bl touch fixes (#11395)
* Fix BLTouch homing

Deploy at start, dont call generic stow function at finish or raise goes too high before setting 0

* Update tool_change.cpp

* Update motion.cpp

* Update motion.cpp

* Update motion.cpp

* Update motion.cpp

* Change brackets to be more in align of Marlin coding standards
2018-07-28 10:33:31 -05:00
Giuliano
5ce5ff8e9b [2.0.x] fix bltouch homing (#11379)
Partially revert. Seems to solve the issue, but one report says G29 still fails.
2018-07-27 18:30:08 -05:00
Scott Lahteine
15d68cb496 Pre-override of ST7920 delays before HAL.h 2018-07-26 23:33:18 -05:00
Dave Johnson
8a24ff94d1 AT90USB1286 PIO cleanup and optimization (#11230)
-normalize `env` and `board` to lowercase naming convention.
-make board `name` follow descriptive convention.
-implement `-fsingle-precision-constant` compile optimization per https://github.com/MarlinFirmware/Marlin/pull/11178#issuecomment-401673901
-fix typo in 5DPRINT entry.
2018-07-26 05:58:28 -05:00
Lee Olivares
094e6d81a5 Add Einstart-S support (#11219)
Indeed the HAL does not need to be mucked around with to expose ATmega2560 pins not available as numbers on the MEGA board, I'll need to update the wiki with that tidbit and a reference to the pin-mapping comment in `fastio_1280.h`.
2018-07-26 05:52:22 -05:00
Scott Lahteine
244b9a8257 Better fastio 1280/2560 pin list
Co-Authored-By: bleughb <36889022+bleughb@users.noreply.github.com>
2018-07-26 05:23:51 -05:00
Scott Lahteine
955a7f0ae9 Improve driver.h macros (#11371) 2018-07-26 05:11:22 -05:00
MikeLud
aadcf08913 [2.0.x] add Calibrate Z (M915) to Prepare Menu (#11331) 2018-07-26 05:09:49 -05:00
Giuliano
4237c3d9f8 [2.0.x] different bltouch init (#11135) 2018-07-26 05:04:09 -05:00
Andy Shaw
624986d423 Ensure ADC conversion is complete before reading (#11336)
The current Marlin implementation relies on a timer interrupt to start the ADC conversion and read it. However in some circumstances the interrupt can be delayed resulting in insufficient time being available for the ADC conversion. This results in a bad reading and false temperature fluctuations. These changes make sure that the conversion is complete (by checking the ADC hardware via the HAL) before reading a value.

See: https://github.com/MarlinFirmware/Marlin/issues/11323
2018-07-26 03:59:19 -05:00
Scott Lahteine
e2aa635e70 Fix Anet A6 thermistors
Co-Authored-By: vitekn <vitekn@users.noreply.github.com>
2018-07-26 02:02:27 -05:00
Bo Herrmannsen
67b205fd45 Add support for board RuRAMPS4D v1.3 (#11363) 2018-07-25 19:32:27 -05:00
forkoz
d1c6687ecd Update MKS sBase pins (#11357) 2018-07-25 19:19:09 -05:00
Scott Lahteine
048dbf6eca Merge pull request #11275 from thinkyhead/bf2_pwm_adjustments
[2.0.x] Tweak some SoftPWM code
2018-07-25 19:02:28 -05:00
Scott Lahteine
e05e95cf97 Clean trailing whitespace 2018-07-25 18:49:47 -05:00
Scott Lahteine
22ebbc091f Tweak some SoftPWM code 2018-07-25 18:09:31 -05:00
Scott Lahteine
32de09f5c5 Specify some extra CR-10S pins 2018-07-25 18:08:09 -05:00
J.C. Nelson
9c2bfa2ab3 Remove extra parameter to enqueue. (#11364) 2018-07-25 18:02:02 -05:00
Giuliano
bd3ec66a78 [2.0.x] typo fix (#11365)
Typo fix
2018-07-25 18:00:47 -05:00
Scott Lahteine
4dfbae0e5c Merge pull request #11264 from teemuatlut/bf2_define_drivers
[2.0.x] Configure stepper drivers per axis
2018-07-25 04:05:04 -05:00
teemuatlut
fbcdf5eaeb Simplify stepper driver per-axis selection 2018-07-25 02:47:43 -05:00
Scott Lahteine
e5c0b490c8 Add *_DRIVER_TYPE to example configs
Co-Authored-By: teemuatlut <teemu.mantykallio@live.fi>
2018-07-25 02:47:30 -05:00
Eyal
fbdbe53290 Fix get_period_inverse(0) so it doesn't crash (#11334) 2018-07-25 01:58:40 -05:00
Scott Lahteine
14e2b11195 Fix spelling in configs 2018-07-24 21:03:38 -05:00
Scott Lahteine
4685c7d59f Followup to M91x I patch 2018-07-24 18:30:28 -05:00
Roxy-3D
62fa028155 Handle dual gantry machines better 2018-07-24 15:34:53 -05:00
Roxy-3D
09485f63e9 add missing ')' 2018-07-22 10:50:41 -05:00
Roxy-3D
a35abce1ac Fix missing ')' 2018-07-19 19:20:40 -05:00
Scott Lahteine
76d4cfb064 Tweak some Max7219 code 2018-07-19 18:49:39 -05:00
Scott Lahteine
4195757585 Merge pull request #11309 from thinkyhead/bf2_manual_probe_start_z
[2.0.x] Manual Z Start Height
2018-07-19 18:26:26 -05:00
Roxy-3D
03b01e2500 Folger Tech i3-2020 now defaults to 2 Max7219 units 2018-07-19 17:02:46 -05:00
Roxy-3D
db85ca93c4 Change Max7219_idle_task() to use a column instead of row if Y-Axis as 16 LED's 2018-07-19 17:01:31 -05:00
Roxy-3D
9660996cc3 Add Multi Unit Support for Max7219 to bugfix_2.0.0 (#11285)
* Add Multi Unit Support for Max7219 to bugfix_2.0.0

* Apply multi-MAX7219 to example configs

* Tweak some spacing, macros
2018-07-19 13:56:47 -05:00
Scott Lahteine
39c8aed8ba Add MANUAL_PROBE_START_Z to example configs 2018-07-18 21:49:20 -05:00
Scott Lahteine
2106fa26b1 Add MANUAL_PROBE_START_Z for manual probing 2018-07-18 21:49:20 -05:00
Scott Lahteine
17ed0f815c Fix tool_change call in UBL G29
Fix #11279, #11252
2018-07-18 20:30:30 -05:00
Scott Lahteine
6d2aff03bd Merge pull request #11306 from thinkyhead/bf2_power_loss_pin
[2.0.x] Add support for power loss detect pin
2018-07-18 20:13:20 -05:00
Scott Lahteine
63a146d424 planner.synchronize at start of tool_change
See https://github.com/MarlinFirmware/Marlin/issues/10949#issuecomment-398540498
2018-07-18 20:10:55 -05:00
Scott Lahteine
665ac1e4d0 Add POWER_LOSS_PIN support 2018-07-18 19:55:10 -05:00
Scott Lahteine
2243f72523 Add POWER_LOSS_PIN to example configs 2018-07-18 19:55:10 -05:00
Chris Pepper
47d5fcbbcc [2.0.x] Change MKS SBASE default serial port to avoid confusion (#11301) 2018-07-18 18:43:20 -05:00
Scott Lahteine
c83109c0ae Merge pull request #11238 from xC0000005/MalyanLCDUpdate
[2.0.x] Malyan LCD Feedrate + Better Temp Handling
2018-07-17 21:06:52 -05:00
Scott Lahteine
64f007580b Fix some header comments 2018-07-17 19:50:24 -05:00
Giuliano
aed1d17a2d Initialize default units (#11295)
When `INCH_MODE_SUPPORT` is enabled no default unit is set. This fixes it.
2018-07-17 19:37:30 -05:00
Scott Lahteine
8c40f0c6c7 Reduce TQ message code size 2018-07-17 18:18:52 -05:00
xC0000005
b04e0c0cbb Malyan LCD feedrate, better temp handling. 2018-07-17 18:18:52 -05:00
Scott Lahteine
065e9c3d66 Add card.longest_filename method 2018-07-17 18:18:52 -05:00
Roxy-3D
71df1f7f57 Don't display M421 information for UBL at startup
It takes too long to display the mesh data for large mesh's at startup.   We should consider ways to speed this up.
Perhaps it makes sense to display an entire row of the mesh instead of just one mesh point?
2018-07-17 17:19:52 -05:00
Roxy-3D
902167fa78 Revert "[2.0.x] Switch to PIO managed L6470 library (#11288)" (#11290)
This reverts commit a26fdf6b68.
2018-07-17 00:23:47 -05:00
Shen Yiming
a26fdf6b68 [2.0.x] Switch to PIO managed L6470 library (#11288)
On a leap of faith...  I'm merging...
2018-07-17 00:10:07 -05:00
Scott Lahteine
be7d1dfb3c Merge pull request #11267 from teemuatlut/bf2_lpc_spi
[2.0.x] LPC1768: Expand hardware SPI class
2018-07-16 21:52:18 -05:00
Giuliano
8f686aa449 [2.0.x] Fix change filament crash (#11269)
Prevent crash, on filament change, when printer is not homed
2018-07-16 21:49:29 -05:00
teemuatlut
f38c81cdde LPC176x: Expand HW SPI class 2018-07-14 19:06:27 +03:00
teemuatlut
3b5dec4b13 Add new LPC include folder 2018-07-14 18:58:56 +03:00
Chris Pepper
c43793aa1e Update Travis Tests to run platforms in parallel (#11256) 2018-07-13 23:42:15 -05:00
Scott Lahteine
e486326910 Vellemann K8400 Y bed size is 180
Co-Authored-By: kaimimue <kaimimue@users.noreply.github.com>
2018-07-13 23:19:46 -05:00
Giuliano
e5ea9d200f [2.0.x] fix kill printer (#11260)
This will fix kill message on dual printer with 0 alignment offset
2018-07-13 23:12:43 -05:00
Jamie Bainbridge
8c57cadbe7 Include stdlib in fontutils (#11251)
When `REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER` is defined and Re-ARM build is attempted, `u8g_fontutf8.cpp` includes `fontutils.h` which uses `abs()`.

However, `abs()` is defined in `stdlib.h` which is not included in `fontutils.h`, so compile fails with an error.

Include `stdlib.h` in `fontutils.h` so that `abs()` is defined before `u8g_fontutf8.cpp` needs to use it, resolving the compile error.

Signed-off-by: Jamie Bainbridge <jamie.bainbridge@gmail.com>
2018-07-13 00:02:38 -05:00
Scott Lahteine
fed68f29af Merge pull request #11257 from thinkyhead/bf2_misc_fixes_jun19
[2.0.x] Shorter Z raise between multiple probes
2018-07-12 23:55:37 -05:00
Scott Lahteine
bf7d0ba859 Assert that XY probe offsets are integers 2018-07-12 22:48:07 -05:00
Scott Lahteine
12854f1909 Add Z_CLEARANCE_MULTI_PROBE to example configs
Co-Authored-By: nightgryphon <ngryph@gmail.com>
2018-07-12 22:46:34 -05:00
Scott Lahteine
25e2ca8896 Add Z_CLEARANCE_MULTI_PROBE
Co-Authored-By: nightgryphon <ngryph@gmail.com>
2018-07-12 22:46:34 -05:00
Scott Lahteine
fd8a76493b Unify M91x parameter I meaning, simplify reports (#11249) 2018-07-12 22:31:51 -05:00
Scott Lahteine
c8d24a6412 Add Sublime G-code (RepRap) syntax 2018-07-12 22:23:55 -05:00
Scott Lahteine
566d05006d report_state > event_handler
Make the endstop report method track endstop changes on its own.
2018-07-11 21:08:07 -05:00
Scott Lahteine
6b521b6df2 Loosen thermistor table size limit
Co-Authored-By: Aaron Griffith <aargri@gmail.com>
2018-07-11 21:08:07 -05:00
Scott Lahteine
20761b88e0 Merge pull request #11212 from AlexanderAmelkin/2.0-HD44780-remove-unused-include
[2.0.x][HD44780] Remove unused include
2018-07-08 17:19:59 -05:00
Roxy-3D
603e136e87 Resolve issue where user can't edit UBL's mesh 2018-07-08 14:41:38 -05:00
Scott Lahteine
03fa05ab59 Travis CI test STM32F1 with HD44780 2018-07-06 23:45:47 -05:00
Alexander Amelkin
ed720194d2 [2.0.x][HD44780] Remove unused include
The <binary.h> header is not available in STM32 toolchain
and is not used anywhere in ultralcd_common_HD44780.h.
If it is used anywhere in HD44780 support for other platforms,
it must be included in the corresponding .cpp file directly
and put under appropriate conditional compilation directives
for the platform requiring it.

As I was unable to find such code, I consider the file unused
and hence remove the inclusion.
2018-07-06 23:45:47 -05:00
Scott Lahteine
d05e832f29 Add STM32F1 support for SD-based EEPROM 2018-07-06 23:45:47 -05:00
Scott Lahteine
63f4c9bdb9 Followup to float maths patch 2018-07-06 21:34:09 -05:00
Scott Lahteine
b143441251 Test CR-10S with status and bootscreen
Also fix use_example_configs
2018-07-06 21:10:27 -05:00
Scott Lahteine
dde009efdf Merge pull request #11178 from ejtagle/misc-fixes
[2.0.x] Use 'float' instead of 'double' maths
2018-07-06 18:53:40 -05:00
Scott Lahteine
2992112da0 Optimize delta kinematics
Co-Authored-By: ejtagle <ejtagle@hotmail.com>
2018-07-04 22:28:56 -05:00
etagle
1367df2875 Replace double with float, optimize calculation 2018-07-04 22:28:56 -05:00
Scott Lahteine
d960d448fa Optimize calculations with LROUND 2018-07-04 22:22:28 -05:00
Scott Lahteine
68e6650df7 Remove Quake Fast Inverse SQRT (it isn't faster) 2018-07-04 22:22:10 -05:00
etagle
e7e896e7d7 More tweaks to fastio_Due.h 2018-07-04 17:57:47 -05:00
Chris Pepper
55f4744e54 [LPC176x] Endstop Interrupts Feature (#11202)
Enable the endstop interrupts feature for LPC176x boards. Although Smoothieboard chose to use non-interrupt capable pins for their endstops, and this has been copied by clones, so they can't use it.
2018-07-04 17:51:45 -05:00
Chris Pepper
5abf5bc8a7 [LPC176x] Fix Interrupt forward declarations (#11200) 2018-07-04 17:43:14 -05:00
Chris Pepper
cbea385ed7 [2.0.x] Fix LCD_LANGUAGE options list formatting in config (#11198)
* Fix LCD_LANGUAGE options list formatting in config
* Remove 'cn' language option from list
2018-07-04 17:42:14 -05:00
Scott Lahteine
6837252fba Merge pull request #11196 from thinkyhead/bf2_fix_m914_sgt
[2.0.x] No M914 or SGT with non-sensorless axes
2018-07-04 02:34:48 -05:00
Scott Lahteine
5379c115c8 Fix Trigorilla include typo 2018-07-03 20:23:26 -05:00
Scott Lahteine
9c058091e9 No M914 or SGT set for non-sensorless axes 2018-07-03 20:09:13 -05:00
Scott Lahteine
c7ec6c68e7 Patch SCARA config to match 1.1.x 2018-07-03 20:09:13 -05:00
Scott Lahteine
480a3d3d0c Apply sensorless homing requirements only for specified axes 2018-07-03 19:16:09 -05:00
Scott Lahteine
47ee149dfd Merge pull request #11195 from thinkyhead/bf2_tronxy_x3a
[2.0.x] Tronxy X3A configurations and thermistor
2018-07-03 19:06:01 -05:00
Scott Lahteine
8c0ec81a19 Followup to #11187 2018-07-03 18:19:26 -05:00
Scott Lahteine
48c1f32b3e Add configurations for Tronxy X3A 2018-07-03 17:56:48 -05:00
Scott Lahteine
568cfe7caa Add thermistor 501 (100K Zonestar) 2018-07-03 17:52:06 -05:00
Scott Lahteine
1a0f4dedad Fix and improve POWER_LOSS_RECOVERY (#11187) 2018-07-02 23:21:28 -05:00
Scott Lahteine
e0ab8acf19 Add "Marlin Dev Mode" option 2018-07-02 22:55:21 -05:00
Scott Lahteine
4b2af6ab48 Minor patches to POWER_LOSS_RECOVERY 2018-07-02 17:26:53 -05:00
Scott Lahteine
1ea222e6fc Turn off DISABLE_INACTIVE_EXTRUDER with SWITCHING_NOZZLE
Fix #11183
2018-07-02 17:26:53 -05:00
Roman Moravčík
8299ac121d [2.0.x] Slovak translation update (#11175) 2018-07-01 23:15:51 -05:00
teemuatlut
3de0c85d41 Fix RRW graphical LCD constructor macro (#11171) 2018-07-01 23:14:23 -05:00
TheLongAndOnly
cedc158106 [2.0.x] Board specific init macro (#11170) 2018-07-01 23:11:42 -05:00
Chris Pepper
5616581eb1 [LPC176x] Update fastio _GET_INPUT, _GET_OUTPUT macros (#11168) 2018-07-01 23:02:38 -05:00
Scott Lahteine
8a8eae8d97 Implement more fastio_Due macros (#11165) 2018-07-01 01:24:06 -05:00
Scott Lahteine
c51e27d11d Do a hard kill for failed homing moves (#11161) 2018-06-30 21:54:07 -05:00
Scott Lahteine
90ba77ea0f Lose the old HOMEAXIS macro 2018-06-30 18:13:13 -05:00
Scott Lahteine
2421f3a47d Detect endstop hits in any direction 2018-06-30 17:27:37 -05:00
Scott Lahteine
f9a090b2cf Fix Trigorilla 1.4 pins
See #11097
2018-06-30 13:45:55 -05:00
Scott Lahteine
8eaac0dab3 Add delta feedrate scaling (#11153) 2018-06-30 13:44:27 -05:00
Scott Lahteine
444725ae9a Non-conflicting CS pins for MKS Gen L 2018-06-30 02:36:01 -05:00
J.C. Nelson
8c9f90153e Enable Malyan LCD Support for M200 printers. (#11051) 2018-06-30 00:35:54 -05:00
Scott Lahteine
fc10101b06 Tweaks to fastio_Due.h 2018-06-30 00:15:50 -05:00
Scott Lahteine
05518d6add Add newline to end of file 2018-06-29 23:54:16 -05:00
Scott Lahteine
d4fde91222 Fix serial.h including itself 2018-06-29 23:53:25 -05:00
Scott Lahteine
a431013eb7 Fix G33 compile warning 2018-06-29 23:17:51 -05:00
Scott Lahteine
bd7f5848f1 Remove JUNCTION_DEVIATION_INCLUDE_E option (#11147) 2018-06-29 22:42:05 -05:00
Scott Lahteine
fbf1c9b496 Fix and tweak POWER_LOSS_RECOVERY (#11151) 2018-06-29 22:41:02 -05:00
Colin Gilgenbach
0fff79c24b Fixes G29_with_retry behavior (#11045)
* Fix G29 (ABL) retry behavior
2018-06-29 20:48:11 -05:00
Scott Lahteine
c36efd3106 Don't hide deeper lib folders 2018-06-29 19:38:18 -05:00
Scott Lahteine
3349eb0020 Fix SKEW_CORRECTION compile error 2018-06-29 19:38:18 -05:00
Scott Lahteine
a264030526 Fix "G29" G29_MAX_RETRIES handling 2018-06-29 18:46:31 -05:00
Scott Lahteine
42f9921482 Ignore Z min endstop with separate Z-probe
To allow for the case where a Z endstop (e.g., hall effect) is higher than the probe trigger point, don't check the Z min endstop during probe moves. See #11134
2018-06-28 05:06:11 -05:00
Scott Lahteine
921685d12f Teensy++ 2.0 can truly go away 2018-06-28 04:51:42 -05:00
Scott Lahteine
1b8973eb1c Fix up microsteps conditionals 2018-06-27 23:41:32 -05:00
Scott Lahteine
aa4cd2e861 Eliminate stepper.* signed/unsigned warnings 2018-06-27 23:10:51 -05:00
Eduardo José Tagle
edb21f349a Fix stepper/planner block handling, race conditions (#11098)
- Allow planner to alter the deceleration phase of the currently executing block.
- Remove BUSY flag, as it is NON ATOMIC to set bits in the Stepper ISR and Planner at the same time.
2018-06-27 18:11:16 -05:00
Scott Lahteine
4d3a9930c5 Match ASM comment spacing to 1.1.x 2018-06-27 17:26:48 -05:00
Scott Lahteine
053438a3aa Poll all endstops, even when stationary (#11123) 2018-06-27 04:18:57 -04:00
Andy Shaw
3b3029c4bf Make max_e_jerk an array to reduce CPU usage (#11118) 2018-06-26 22:38:31 -04:00
Scott Lahteine
d13f76b7da Patch some loop macros 2018-06-26 20:30:52 -05:00
Scott Lahteine
229b26b02c Clear LED matrix without startup test 2018-06-26 18:54:01 -05:00
Dave Johnson
0ee34eb784 Add PIO board definitions for Malyan M200 (#11120)
Co-Authored-By: J.C. Nelson <xc0000005@users.noreply.github.com>
2018-06-26 15:22:30 -04:00
Alexander Amelkin
ffdbc1f42c STM32F1: Fix SD card persistent store API (#11090) 2018-06-26 14:41:23 -04:00
Giuliano
8d8f257384 [2.0.x] Fix advanced pause init values (#11095)
Fixed for cycle used to initialize default values
2018-06-26 14:37:52 -04:00
etagle
5b49fccf80 Add stepper driver DIR delay configuration option
...and recommended pulse width configuration for A4988
2018-06-26 13:28:04 -05:00
Scott Lahteine
d86f25ab63 Fix Serial ISR priority for LPC1768
Co-Authored-By: p3p <p3p@p3psoft.co.uk>
2018-06-25 12:15:41 -04:00
etagle
fb4e0b105b Fix endstops compilation error 2018-06-25 12:10:17 -04:00
Eduardo José Tagle
48a15d1c7e [2.0.x] Fix stepper/planner race condition and Stepper pulse timer (#11081)
* Planner: Removal of some race conditions between Stepper ISR and Planner, some of them pointed out by @AnHardt, some of my own findings
* Fixing timing on stepper pulses adding a compensation for the non-null time required to set ports.
2018-06-22 09:15:37 -05:00
Scott Lahteine
3fa9aeb5c7 Restore env:teensy20, for now
See https://github.com/MarlinFirmware/Marlin/pull/11079#issuecomment-399309709
2018-06-22 00:13:11 -04:00
Michael Triffon
7e802145cc [2.0.x] Add CR-10 stock display support for Re-Arm (EXP3) (#11068) 2018-06-21 23:08:17 -05:00
Dave Johnson
3b7c5a31a3 Enable local board repository for PIO (#11079)
-Enable boards_dir option in PIO INI
-Remove defunct custom board file operations for PIO auto-build environment
-Remove now-defunct Teensy++ 2.0 PIO entry, replaced by `at90USB1286_DFU` and `at90USB1286_DFU` (using this entry always put AT90USB board boot loaders in jeopardy of being overwritten due to the very small size of the official Teensy++ 2.0 bootloader)
-whitespace
2018-06-21 21:09:23 -05:00
Scott Lahteine
50b6204079 Fix LIN_ADVANCE max_e_jerk_factor
According to https://github.com/MarlinFirmware/Marlin/issues/9917#issuecomment-399204568
2018-06-21 22:02:34 -04:00
Scott Lahteine
99591dc20c Filter endstops state at all times (#11066) 2018-06-21 20:14:16 -05:00
Scott Lahteine
a5c11bf578 Merge pull request #11075 from thinkyhead/bf2_value_editing
[2.0.x] Fix value editing (with callback)
2018-06-21 20:13:58 -05:00
Roxy-3D
1d7dd0edfd Add the move_z_after_probing() functionality to UBL's G29 J 2018-06-21 13:26:20 -05:00
Scott Lahteine
383129728a Edit Z fade as whole numbers 2018-06-21 11:52:29 -04:00
Scott Lahteine
1239e8eda2 Fix value editing with callback 2018-06-21 11:52:03 -04:00
Scott Lahteine
7a84b03796 Use MIN/MAX in post-conditionals 2018-06-20 03:15:19 -05:00
Scott Lahteine
a2a30ff0ac Use Tool 0 for Dual X Axis G29
See https://github.com/MarlinFirmware/Marlin/issues/5597#issuecomment-397683325
2018-06-20 01:32:23 -05:00
Scott Lahteine
e366d55bc2 Don't reset stepper timeout for all g-codes 2018-06-19 21:48:28 -05:00
Scott Lahteine
7406f04029 Use MAX (not max) in stepper.h 2018-06-19 20:51:07 -05:00
Roxy-3D
7c54c4ed27 Tiny improvement to M7219
The registers within the Max7219 can get corrupted a number of ways.  This allows the Max7219 to be reset and fully initialized.
And...  it also allows the user to see the initialization pattern.
2018-06-19 14:46:30 -05:00
Giuliano
a65d15c905 [2.0.x] Fix Italian msg len (#11058)
Fix message to long for 12864 display
2018-06-18 22:04:55 -05:00
Scott Lahteine
d4795e5b8e [2.0.x] Tweaks and additions for MAX7219 (#11034) 2018-06-18 22:04:03 -05:00
Scott Lahteine
e23677a7b2 Update some G-code comments 2018-06-18 16:13:01 -05:00
Chris Pepper
0312c42f9d [2.0.x] LPC176x Serial cleanup (#11032) 2018-06-16 20:59:22 -05:00
Scott Lahteine
c1269c2ec1 Tweak AVR critical section defines 2018-06-16 17:42:32 -05:00
Scott Lahteine
da94e0bd27 Unsigned eeprom mesh addresses 2018-06-15 15:51:57 -05:00
Chris Pepper
f88adcbfd5 [2.0.x][LPC176x] Fix binary linking broken by pio update (#11026) 2018-06-15 15:32:51 -05:00
Scott Lahteine
fdd97e649d Merge pull request #11020 from simon-jouet/esp32
HAL for Espressif ESP32 WiFi
2018-06-13 19:35:01 -05:00
Simon Jouet
e2aeda61ed HAL for Espressif ESP32 Wifi 2018-06-13 19:33:35 -05:00
Scott Lahteine
091f742432 Add WIFISUPPORT to example configs 2018-06-13 19:27:33 -05:00
Scott Lahteine
19d4c7c1cd Tweak HAL header comments 2018-06-13 19:08:42 -05:00
Bob Kuhn
7e8d2d611d Auto Build for Visual Studio Code (#11014) 2018-06-13 18:49:47 -05:00
Giuliano
cce0523a95 [2.0.x] reset bltouch on home (#11018)
Added reset bltouch instead. This ensure properly stow even when in error.
2018-06-13 14:09:13 -05:00
Scott Lahteine
4c8d6df13c Extra insurance against endstop false positives (#11013) 2018-06-13 01:22:02 -05:00
Scott Lahteine
81edbfa665 Merge pull request #11004 from ejtagle/always_honor_maximum_step_rate
[2.0.x] Fix stepper pulse minimum period and timing calculations
2018-06-12 22:17:22 -05:00
Scott Lahteine
f3fed52348 Fix coolstep_min_speed / sensorless homing
Fix #8890
2018-06-12 22:12:46 -05:00
etagle
a215725df6 Fix stepper pulse timing
Always honor minimum period on stepper pulse generation, and fix timing calculations

Signed-off-by: etagle <ejtagle@hotmail.com>
2018-06-12 21:34:24 -05:00
Scott Lahteine
0d79128c8d Localize stepper-specific defines 2018-06-12 21:16:54 -05:00
Scott Lahteine
a9861a780e Tweak HAL heading 2018-06-12 19:40:17 -05:00
Scott Lahteine
cf53e502a2 No need to set input after attachInterrupt 2018-06-12 18:43:11 -05:00
Karl Andersson
e0276d2f32 Official STMicroelectronics Arduino Core STM32F4 HAL compatibility (#11006) 2018-06-12 18:38:00 -05:00
Scott Lahteine
4dbec774b5 HAL_*_TIMER_RATE => *_TIMER_RATE 2018-06-12 16:39:12 -05:00
Scott Lahteine
928e50e724 Try LiquidCrystal@1.3.4 2018-06-12 00:40:50 -05:00
Scott Lahteine
12689f2470 Merge pull request #11001 from thinkyhead/bf2_junction_deviation_fix
[2.0.x] Updates for junction_deviation_mm
2018-06-11 22:31:17 -05:00
Scott Lahteine
9b945c13a1 Fix STM32F1 ISR_ENABLED 2018-06-11 22:09:45 -05:00
Scott Lahteine
9d04f47d98 Improvements for junction_deviation_mm
- Drop `max_jerk` with `JUNCTION_DEVIATION`
- Add `max_e_jerk_factor` for use by `LIN_ADVANCE`
- Recalculate `max_e_jerk_factor` when `junction_deviation_mm` changes
- Fix LCD editing of `junction_deviation_mm`
2018-06-11 22:05:16 -05:00
Scott Lahteine
f2c3b0d476 Use bit flags for homed/known 2018-06-11 22:05:16 -05:00
Scott Lahteine
4832be52d7 Followup to G29 O 2018-06-11 21:57:26 -05:00
Robert Mendon
86170e6a66 [2.0.x] Add O (optional) flag to G28/G29 (#10913) 2018-06-11 21:51:48 -05:00
Alexey Shvetsov
2ddba201c0 STM32F1 HAL Fixes (#10999)
- Enable / disable interrupts with `__iSeiRetVal` / `__iCliRetVal`
- Add STM32F1 to Travis CI tests
2018-06-11 20:00:56 -05:00
Scott Lahteine
43bdd0bfe4 Fix indent in stepper.h 2018-06-11 19:17:46 -05:00
Scott Lahteine
b8f8dc72f0 Add travis helper update_defaults 2018-06-11 18:49:43 -05:00
Scott Lahteine
2ba198a624 Tweak M122 report spacing 2018-06-10 20:33:18 -05:00
Eduardo José Tagle
5590c8ffd0 Fix MarlinSerial (AVR) (#10991)
An undocumented hw bug makes the UART lose chars when RX ISR is disabled, even for a very small amount of time. This happens when RX_BUFFER > 256, and the result is corrupted received commands. Solved by implementing pseudo-atomic operations on 16bit indices.
2018-06-10 20:32:20 -05:00
Scott Lahteine
3fd1f32b73 Fix ADC key and chamber temp 2018-06-10 20:11:40 -05:00
Scott Lahteine
117fd007a9 Followup to pin error change 2018-06-10 19:28:45 -05:00
Scott Lahteine
ae07a3e4aa Multiplier edit large ranges 2018-06-10 18:22:12 -05:00
Scott Lahteine
20a5db03bb Junction Deviation limit (0.01 to 0.3) 2018-06-10 18:22:08 -05:00
Scott Lahteine
a2f521d34b Add Junction Deviation mm runtime setting (#10990) 2018-06-10 18:02:54 -05:00
Scott Lahteine
590ce1c33e Fix serial debug ouput 2018-06-10 17:54:22 -05:00
Scott Lahteine
968a5d2e63 Protected pin err for M226 2018-06-10 17:45:47 -05:00
Scott Lahteine
4b90cd8ead Merge pull request #10922 from ejtagle/bugfix-2.0.x
[2.0.x] Adaptive multiaxis step smoothing, and tons of fixes
2018-06-10 16:28:52 -05:00
Giuliano
f1cdfe3dfd [2.0.x] stow bltouch before start homing (#10987) 2018-06-10 16:27:14 -05:00
etagle
6f14bcaa3e Add MAXIMUM_STEPPER_RATE, enforce in multi-stepping
The timing value should be properly set for ALL boards. The compiler will check and set maximum step rate calculations based on those values.
2018-06-10 16:02:47 -05:00
etagle
39a7e7720d Adaptive multiaxis step smoothing
- Stepper bugs fixed
- Support MIXING_EXTRUDER with Linear Advance
- Miscellaneous cleanup
2018-06-10 16:02:47 -05:00
Scott Lahteine
ae15c5af88 Merge pull request #10983 from thinkyhead/bf2_xon_xoff_changes
[2.0.x] Serial handshaking fixes / debug
2018-06-10 04:33:51 -05:00
etagle
99af086cea Add hidden Serial overflow debug options 2018-06-10 04:25:42 -05:00
etagle
d90e8fcad9 Fix XON/XOFF implementation
Pointed out by @GMagician
2018-06-10 04:25:42 -05:00
Scott Lahteine
bbf80440bf Add sanity-check for MOTHERBOARD 2018-06-10 04:03:33 -05:00
Giuliano
b64cc9329e [2.0.x] Fix dual enstop home (#10980) 2018-06-10 02:08:47 -05:00
Scott Lahteine
8a376e6beb Update MINIMUM_STEPPER_PULSE description 2018-06-10 00:13:03 -05:00
Scott Lahteine
3701869e6c Add HAL_timer_start for AVR, use stepper timer to time pulses 2018-06-09 22:30:13 -05:00
Giuliano
e970e429b6 [2.0.x] Fix null check in lsDive (#10978) 2018-06-09 22:03:49 -05:00
etagle
d82704354f Increase the planner first block HOLD delay to 100mS 2018-06-09 21:12:37 -05:00
Scott Lahteine
779d4a17a0 Highlight 64128N and common ST7565 difference
Followup to #10920, addressing #10962
2018-06-09 19:18:41 -05:00
Scott Lahteine
b9418439b9 Prevent MB false-positive on bad board name 2018-06-08 19:58:43 -05:00
Scott Lahteine
88314b8910 CREALITY_ENDER is long gone
As noted in #10965
2018-06-08 19:53:21 -05:00
Scott Lahteine
334341c632 Hephestos config updates (#10960) 2018-06-07 21:23:55 -05:00
Scott Lahteine
f74278b8b1 Add -4 thermocouple to list in configs 2018-06-07 21:04:06 -05:00
Scott Lahteine
7ba5afff01 Allow FAN_PIN override, pins cleanup (#10956) 2018-06-07 16:46:13 -05:00
Scott Lahteine
55aedf036b Fix M503 ABL mesh report. (Zero-based IJ indices) 2018-06-07 16:36:50 -05:00
Scott Lahteine
e7623b5788 Restore Z_PROBE_PIN to pinsDebug_list.h 2018-06-07 15:39:24 -05:00
Scott Lahteine
a426986df8 Ensure pins set to INPUT after attachInterrupt (#10928) 2018-06-06 20:59:08 -05:00
Scott Lahteine
d8b983f624 More concise M503 output for M906, M913, M914 (#10947) 2018-06-06 20:58:28 -05:00
Giuliano
eb1026d438 [2.0.x] Fix compile warning (#10931) 2018-06-05 22:44:34 -05:00
Dave Johnson
a5b0bf86f1 [2.0.x] Correct PROGMEM on DFU-equiped AT90USB boards (#10943)
130048 is available on genuine Teensy2.0++ with Paul's "Halfkay" bootloader.  Atmel DFU-equiped boards have only 122880 available
2018-06-05 22:34:54 -05:00
Scott Lahteine
c2bdbdffaa Prevent a buffer overflow in diveToFile
Co-Authored-By: akunt
2018-06-05 22:13:17 -05:00
Giuliano
c9d1a620d4 [2.0.x] fix indentations (#10934) 2018-06-05 02:03:26 -05:00
Roxy-3D
d550da084f Fix Max7219 control pins for use with 32-bit platforms 2018-06-04 13:37:23 -05:00
Scott Lahteine
c16e41e9e6 STM32F4 pins cleanup 2018-06-03 19:08:04 -05:00
Scott Lahteine
c685c7b7dd STM32F4: All pins can do PWM 2018-06-03 04:30:15 -05:00
Scott Lahteine
85914423a1 Merge pull request #10920 from thinkyhead/bf2_misc_cleanups_jun2
[2.0.x] Clean up ST7565, dual endstops homing
2018-06-03 03:36:07 -05:00
Scott Lahteine
2fd9ba56da LED menu item bool (like Case Lights) 2018-06-03 00:34:29 -05:00
Scott Lahteine
ad8d3150aa Cleanup for dual endstops homing 2018-06-03 00:34:29 -05:00
Scott Lahteine
61181b7f24 Add macros for ST7565 commands 2018-06-02 20:48:44 -05:00
Eduardo José Tagle
d3c02410a8 [2.0.x] Small assorted collection of fixes and improvements (#10911)
* Misc fixes and improvements

- Get rid of most critical sections on the Serial port drivers for AVR and DUE. Proper usage of FIFOs should allow interrupts to stay enabled without harm to queuing and dequeuing.
  Also, with 8-bit indices (for AVR) and up to 32-bit indices (for ARM), there is no need to protect reads and writes to those indices.
- Simplify the XON/XOFF logic quite a bit. Much cleaner now (both for AVR and ARM)
- Prevent a race condition (edge case) that could happen when estimating the proper value for the stepper timer (by reading it) and writing the calculated value for the time to the next ISR by disabling interrupts in those critical and small sections of the code - The problem could lead to lost steps.
- Fix dual endstops not properly homing bug (maybe).

* Set position immediately when possible
2018-06-01 19:02:22 -05:00
Scott Lahteine
ae1be0fa53 Merge pull request #10910 from thinkyhead/bf2_fix_junction_deviation
[2.0.x] Fix / improve junction deviation
2018-06-01 00:12:41 -05:00
Scott Lahteine
2deff0d9b9 Fix/Improve junction deviation
- Respect axis max acceleration limits instead of forcing a fixed acceleration value.
- The `junction_unit_vec` ensures proper handling of entry and exit speeds even when the axes involved have different limits.
2018-05-31 20:09:53 -05:00
Scott Lahteine
6885ca606c Drop JUNCTION_ACCELERATION from example configs 2018-05-31 20:07:28 -05:00
Chris Pepper
d87257f63c [2.0.x][LPC176x] Fix PIO build flags (#10909)
Don't build and link with different flags, the binary may not work.
2018-05-31 19:08:31 -05:00
Axel
ae322e0c54 [2.0.x] Add GTM32 Pro VB support (#10898) 2018-05-31 00:11:38 -05:00
Scott Lahteine
d259070980 Clean up trailing spaces from vim, etc. 2018-05-31 00:09:41 -05:00
Scott Lahteine
21d812d502 Fix the Z un-hop on G11
Co-Authored-By: zarthcode <anthony.clay@zarthcode.com>
2018-05-29 23:41:36 -05:00
Scott Lahteine
d3c473002a For SCARA probe Y offset is proximal/distal 2018-05-29 21:55:53 -05:00
Scott Lahteine
b90f54b0fc Improve probe logging 2018-05-29 21:54:13 -05:00
Scott Lahteine
3f2a062a57 Fix M914 value range (-64...+63)
Fix #10896
2018-05-29 12:02:15 -05:00
Scott Lahteine
b6cd8d9cc6 Set deltas to park on the left 2018-05-29 11:44:31 -05:00
Scott Lahteine
9713538427 HOTENDS for Switching Nozzle with Switching Extruder 2018-05-29 11:05:52 -05:00
Scott Lahteine
c68b7b3913 Update Fan 2 and E0 Auto Fan pins for Trigorilla 2018-05-28 21:11:12 -05:00
Scott Lahteine
cbcb284f4a Allow libServo::attach to work on Teensy 3.5/3.6 2018-05-28 20:56:24 -05:00
Chris Pepper
f89f7c4a82 [2.0.x][LPC176x][Build] Force single precision constants, disable freestanding (#10892) 2018-05-28 19:38:22 -05:00
Scott Lahteine
4299e5dc8b Modify E-stepping macros for use in LINEAR_ADVANCE (#10885) 2018-05-28 19:34:08 -05:00
Scott Lahteine
8f14ef855d More concise commentary in planner.cpp 2018-05-28 19:25:18 -05:00
Scott Lahteine
6919e87656 Minor cleanup of multi-stepping logic 2018-05-28 17:44:33 -05:00
android444
16da5c62d0 Teensy 3.x fastio pullup (#10890) 2018-05-28 16:25:12 -05:00
Scott Lahteine
853a9056ac Long thermistor tables need special consideration 2018-05-28 06:28:34 -05:00
Scott Lahteine
a4f9c3373f Tweak thermistor spacing 2018-05-28 03:44:32 -05:00
Scott Lahteine
9b9b62b218 delay(SERVO_DELAY) => safe_delay(servo_delay[servo_index]) 2018-05-28 03:44:32 -05:00
Scott Lahteine
1ce97f1f6d Faster (bisect) search in thermistor tables (#10883) 2018-05-27 23:27:51 -05:00
Scott Lahteine
0ca9db7051 Correct HOTENDS for SWITCHING_EXTRUDER 2018-05-27 23:22:48 -05:00
Scott Lahteine
945139e328 Clean up some formatting 2018-05-27 17:58:40 -05:00
android444
9c235ef821 [HAL]Add support for ST7920 - Teensy 3.x (#10872) 2018-05-27 03:36:57 -05:00
Eduardo José Tagle
7b9f0302d4 Fix Bresenham rounding errors, add link to article (#10871) 2018-05-27 01:49:59 -05:00
Scott Lahteine
2566342979 Adjust some commentary 2018-05-27 00:10:25 -05:00
Scott Lahteine
1b200f3312 Sanity check SWITCHING_EXTRUDER with SINGLENOZZLE 2018-05-26 23:26:23 -05:00
Scott Lahteine
22771dd2dd Update 'board_f_cpu' to 'board_build.f_cpu' 2018-05-26 23:26:23 -05:00
Scott Lahteine
6775a16c97 Fix switching extruder stepping with LA 2018-05-26 19:07:01 -05:00
Scott Lahteine
05fc761929 Merge pull request #10858 from thinkyhead/bf2_rename_some_options
[2.0.x] Rename and document some configuration options
2018-05-26 18:42:39 -05:00
Scott Lahteine
2e139fe50f Tweak configuration spacing 2018-05-26 18:33:51 -05:00
Scott Lahteine
931ab4ec40 Rename Junction Deviation options 2018-05-26 18:33:51 -05:00
Scott Lahteine
aaaf09bda2 BEZIER_JERK_CONTROL => S_CURVE_ACCELERATION 2018-05-26 18:33:51 -05:00
Scott Lahteine
cf7d5a642a Fix manual moves for switching tools (#10868) 2018-05-26 18:30:53 -05:00
Eduardo José Tagle
1da2c4f1c1 Text LCD display routine fix. Coauthored with @MagoKimbra (#10864) 2018-05-26 18:13:33 -05:00
Bob Kuhn
498a328148 Merge pull request #10860 from Bob-the-Kuhn/upload-extra-script-fix
[2.0.x] LPC1768 upload_extra_script.py fix (wrong type of exit method)
2018-05-26 09:40:55 -05:00
Bob-the-Kuhn
1c0ad8bbae wrong type of exit method 2018-05-26 08:17:03 -05:00
Scott Lahteine
01d37e00af Fix up stepper ISR with linear advance timing (#10853)
Co-Authored-By: ejtagle <ejtagle@hotmail.com>
2018-05-26 01:00:13 -05:00
Eduardo José Tagle
6f330f397e [2.0.x] Buffer overflow and scroll fix, UTF8 cleanup (#10844) 2018-05-25 23:32:37 -05:00
Bob Kuhn
235facd545 install AVRDUDE 5.10, faster disk find for LPC1768 (#10849) 2018-05-25 20:26:48 -05:00
Scott Lahteine
645df23eb0 Fix warning with FASTER_GCODE_PARSER disabled 2018-05-25 06:45:42 -05:00
Scott Lahteine
d74e333c0f Make sure FAN_ANIM_FRAMES is defined 2018-05-25 05:28:50 -05:00
Bob Kuhn
e2db509d58 [2.0.x] Update/Fix LPC1768 extra script upload_extra_script.py (#10843)
* Use a different method to find the volume info in Windows
2018-05-25 04:31:18 -05:00
Scott Lahteine
7261f48872 Fix reset of endstops and move state 2018-05-24 19:33:36 -05:00
Scott Lahteine
50fa8e01c1 Minor optimization of axis_did_move bits 2018-05-24 19:08:07 -05:00
Scott Lahteine
a94506ada0 Fix K8400 Y min pos, M118 comment 2018-05-24 08:21:16 -05:00
Scott Lahteine
336a022529 Support Malyan LCD without SD 2018-05-24 05:01:18 -05:00
Scott Lahteine
f28e366b77 Followup for core endstops 2018-05-24 03:02:57 -05:00
Scott Lahteine
8b44745bc7 Clean up and consolidate SD-related code (#10831) 2018-05-24 01:18:56 -05:00
Scott Lahteine
9644d56b42 Patches for core motion tests 2018-05-24 00:49:01 -05:00
Scott Lahteine
5f8591528e Remove #pragmas that don't help c files 2018-05-23 23:47:16 -05:00
Scott Lahteine
230ae6a143 Default G30 to engage / disengage 2018-05-23 16:57:23 -05:00
Scott Lahteine
3e3789da85 Regression: Endstops Core compatibility (#10823)
Co-Authored-By: ejtagle <ejtagle@hotmail.com>
2018-05-23 03:45:25 -05:00
Scott Lahteine
c89649b46e Suppress U8glib build warnings 2018-05-23 02:47:36 -05:00
Axel
bbd09a99f1 32 bit boards classification cleanup (#10818)
- Ordering and match classification between `boards.h` and `pins.h`
- Check `pins.h` environments
2018-05-22 21:20:24 -05:00
Scott Lahteine
ee333f6be2 Followup to endstops tweaks 2018-05-22 20:41:03 -05:00
Axel
d98bc71af7 Boards classification arrangement (#10814)
STM32 ARM Cortex-M3 boards were listed as M4
2018-05-22 02:56:51 -05:00
Bob Kuhn
22e0691a70 [2.0.x] Add Sublime support for Auto build, minor Auto-build update (#10809) 2018-05-22 02:04:51 -05:00
Scott Lahteine
4b610b333e Tweak G38 formatting 2018-05-22 01:56:03 -05:00
Scott Lahteine
d2647c1f19 Fix G1 behaviour after tool unpark
Fix #10777 for 2.0.x

Co-Authored-By: Ante Vukorepa <o.orcinus@gmail.com>
2018-05-22 00:53:00 -05:00
Scott Lahteine
3bb950c69a Fix DEBUG_LEVELING_FEATURE for MBL
As noted in #10777
2018-05-22 00:49:15 -05:00
Scott Lahteine
1af98519cd Group and adjust LCD buttons code 2018-05-22 00:37:45 -05:00
Scott Lahteine
0c3773d724 Cleanup in stepper_indirection.h 2018-05-22 00:36:03 -05:00
Scott Lahteine
4118199ddd Tweaks to core headers 2018-05-21 20:32:18 -05:00
Scott Lahteine
4b2f6e3b2b [2.0.x] Add endstop noise filter (#10796) 2018-05-21 15:51:38 -05:00
Scott Lahteine
65a004564c Stepper::set_position needed for some applications 2018-05-21 15:21:33 -05:00
Scott Lahteine
435ecb6b67 Followup to stepper/planner refactor 2018-05-20 23:13:38 -05:00
Bob Kuhn
6dfbb39f83 [LPC1768] Add error-handling to upload script, update autobuild.py (#10802) 2018-05-20 21:22:04 -05:00
Scott Lahteine
68d7fcec83 Simplify and fix Z fade height edit
Fix #10761
2018-05-20 12:29:23 -05:00
Bob Kuhn
d557c84a71 [2.0.x] Error for FAST_PWM_FAN with 32 bit CPU (#10798) 2018-05-20 11:37:55 -05:00
Scott Lahteine
16f92dca44 Merge pull request #10688 from ejtagle/bugfix-2.0.x
[2.0.x] Refactor, optimization of core planner/stepper/endstops logic
2018-05-20 07:24:39 -05:00
etagle
569df3fc0c Fix interrupt-based endstop detection
- Also implemented real endstop reading on interrupt.
2018-05-20 07:10:24 -05:00
etagle
a4af975873 Fix planner block optimization
- Fixed the planner incorrectly avoiding optimization of the block following the active one.
- Added extra conditions to terminate planner early and avoid redundant computations.
2018-05-20 07:10:24 -05:00
etagle
e0ca627033 Planner block HOLD flag
Allows the Stepper ISR to wait until a given block is free for use. Allows Planner to plan the first move, which is split into two.
2018-05-20 06:23:58 -05:00
etagle
a11eb50a3e Refactor and optimize Stepper/Planner
Better encapsulation and considerably reduce stepper jitter
2018-05-20 06:23:58 -05:00
etagle
0566badcef Add memory barrier, optimal interrupt on-off
Disabling an ISR on ARM has 3 instructions of latency. A Memory barrier is REQUIRED to ensure proper and predictable disabling. Memory barriers are expensive, so avoid disabling if already disabled (See https://mcuoneclipse.com/2015/10/16/nvic-disabling-interrupts-on-arm-cortex-m-and-the-need-for-a-memory-barrier-instruction/)
2018-05-20 02:39:34 -05:00
Scott Lahteine
c2fb2f54a1 Use assembly for AVR ISR vectors
Co-Authored-By: ejtagle <ejtagle@hotmail.com>
2018-05-20 01:58:51 -05:00
Scott Lahteine
206014a957 Fix LPC176x timer functions
Co-Authored-By: ejtagle <ejtagle@hotmail.com>
2018-05-20 01:58:51 -05:00
Scott Lahteine
59f7861bcb Move backtrace to the HAL folder (#10790) 2018-05-20 01:33:21 -05:00
Scott Lahteine
228139eae6 Tweak some LCD comments 2018-05-19 21:00:08 -05:00
Scott Lahteine
7dc03ce721 Simplified fix for babystep pulse width
Alternative to the apparently superfluous double delay
2018-05-19 21:00:08 -05:00
Scott Lahteine
65270d6a96 Fix LIN_ADVANCE + SWITCHING_EXTRUDER
Followup to #10656
2018-05-19 18:32:00 -05:00
Bob Kuhn
62e2987488 add AT90USB support & add items to popup menu (#10779) 2018-05-19 17:39:26 -05:00
Bob Kuhn
9ad42d6617 add delay between pulse edges (#10778) 2018-05-19 17:12:16 -05:00
Scott Lahteine
fe7aea7bf6 Merge pull request #10772 from GMagician/2.0.x-address-#10766
[2.0.x] Fix switching extruder
2018-05-19 17:10:56 -05:00
Scott Lahteine
83d42f33e1 Add HAS_HOTEND_OFFSET_Z conditional 2018-05-19 17:05:15 -05:00
GMagician
3c76bda2d8 Fix switching extruder
`DONT_SWITCH` got lost along the way. Replace it with `DO_SWITCH_EXTRUDER` and adjust the code.
2018-05-19 17:05:15 -05:00
Scott Lahteine
8f18854d4d monitor_baud => monitor_speed 2018-05-19 16:59:23 -05:00
Scott Lahteine
c173a31060 Fix some compile warnings 2018-05-19 16:54:48 -05:00
Giuliano
e1d9046efc [2.0.x] Temperature reading fix (#10774) 2018-05-19 15:39:36 -05:00
Chris Pepper
9b64fdbc3a [LPC176x] HAL: Add missing program space definition (#10776) 2018-05-19 15:37:54 -05:00
Scott Lahteine
50270b53a0 Clear up some more compile warnings 2018-05-17 18:40:49 -05:00
etagle
06fd4d7b28 Improve NOMORE, NOLESS, and LIMIT macros 2018-05-17 18:23:14 -05:00
etagle
40d7e12827 Removing warnings from compilation 2018-05-17 18:04:22 -05:00
Scott Lahteine
b9079aa1b5 Merge pull request #10754 from comps/fan-max-pwm-scaling
[2.0.x] Add FAN_MAX_PWM
2018-05-15 22:23:47 -05:00
KangDroid
9a531da861 Support Darwin environment on buildroot/bin (#10751) 2018-05-15 22:22:03 -05:00
Scott Lahteine
0755fe8ba2 Add FAN_MAX_PWM to example configs 2018-05-15 21:18:47 -05:00
Jiri Jaburek
43ddb29f9e Add FAN_MAX_PWM for M106-controlled fans 2018-05-15 21:18:46 -05:00
Scott Lahteine
0ea60d506a Clear up LCD-related compile issues 2018-05-15 00:06:59 -05:00
Scott Lahteine
eb2eb72720 Modify UBL mesh_is_valid and use in leveling_is_valid (#10746) 2018-05-14 22:36:03 -05:00
Scott Lahteine
b7dfc79988 Disable SERIAL_PORT_2 by default and sanity-check it (#10748) 2018-05-14 21:38:24 -05:00
Scott Lahteine
3f6073e23a Followup tweak to lcdprint_u8g.cpp 2018-05-14 14:42:11 -05:00
Scott Lahteine
7edf5bcb7b Merge pull request #10742 from thinkyhead/bf2_u8g_code_cleanup
[2.0.x] Prevent compilation of unused u8g-oriented code
2018-05-14 14:40:44 -05:00
Scott Lahteine
ba100e9548 Clean up and reduce Travis CI tests 2018-05-14 13:47:56 -05:00
Scott Lahteine
fb608938f8 Prevent compilation of unused u8g-oriented code 2018-05-14 13:31:04 -05:00
Scott Lahteine
35258dd50b Consistent heating status and status reset
Fix #10699
2018-05-13 17:18:19 -05:00
Scott Lahteine
37b15fe4cf Reorder HAL timer header items 2018-05-13 16:50:39 -05:00
Scott Lahteine
836b0bbeee Fix MBL line_to_destination
Fix #10708
2018-05-13 16:50:39 -05:00
Scott Lahteine
ba4c32eec5 Followup to _AXIS patch 2018-05-13 10:43:35 -05:00
Scott Lahteine
d9154ebdf6 Followup to math patch 2018-05-13 09:30:27 -05:00
Scott Lahteine
f07260c33f Don't babystep on long click unless printing
As pointed out in #10731
2018-05-13 08:11:35 -05:00
Scott Lahteine
883b0c9880 Convert custom maths to inlines (#10728) 2018-05-13 08:10:08 -05:00
Scott Lahteine
8f3d313086 Merge pull request #10727 from thinkyhead/bf2_smarter_min_max_abs
[2.0.x] Smarter MIN, MAX, ABS macros
2018-05-13 08:09:48 -05:00
Scott Lahteine
08e36e264e Apply _AXIS macro 2018-05-13 06:51:01 -05:00
Scott Lahteine
083ec9963e Tweaks to heater / lcd conditions 2018-05-13 04:52:56 -05:00
Scott Lahteine
99ecdf59af Smarter MIN, MAX, ABS macros
Use macros that explicitly avoid double-evaluation and can be used for any datatype, replacing `min`, `max`, `abs`, `fabs`, `labs`, and `FABS`.

Co-Authored-By: ejtagle <ejtagle@hotmail.com>
2018-05-13 04:52:56 -05:00
etagle
9d98a62699 Followup to HAL optimizations and delays
- Cleanups, fixes for Due HAL code.
- TC_IER is write-only. Use TC_IMR to test ISR state.
2018-05-13 00:46:23 -05:00
Scott Lahteine
8f8c6a9bc4 Move get_axis_position_mm to Planner (#10718) 2018-05-12 09:59:11 -05:00
Scott Lahteine
a1062eec5b Better handling of DELAY_NS and DELAY_US (#10716)
Co-Authored-By: ejtagle <ejtagle@hotmail.com>
2018-05-12 08:34:04 -05:00
Scott Lahteine
f5aaa2d6c0 Fix some compiler warnings 2018-05-12 05:28:12 -05:00
Scott Lahteine
3614e6ce0f Fix Switching Extruder with Linear Advance 2018-05-12 02:26:14 -05:00
Scott Lahteine
625035a9ce Fix M301 access to lpq_len (#10714)
Co-Authored-By: Zwaubel
2018-05-12 02:13:40 -05:00
etagle
1b225a2809 DUE: Emergency parser for the USB CDC 2018-05-12 02:12:11 -05:00
Scott Lahteine
306f0f2135 Move Stepper::synchronize to Planner (#10713)
Co-Authored-By: ejtagle <ejtagle@hotmail.com>
2018-05-12 01:38:02 -05:00
Scott Lahteine
f2e3c9896e Fix compile warnings in backtrace
Part of #10688

Co-Authored-By: ejtagle <ejtagle@hotmail.com>
2018-05-11 23:38:29 -05:00
Scott Lahteine
acacee80a2 Add JUNCTION_ACCELERATION_FACTOR to configs
Part of #10688

Co-Authored-By: ejtagle <ejtagle@hotmail.com>
2018-05-11 23:13:27 -05:00
Giuliano
d99f1b2245 [2.0.x] EEPROM code cleanup (#10710) 2018-05-11 18:06:04 -05:00
ManuelMcLure
8679f671ed Remove dependency on PI. (#10701) 2018-05-11 17:55:56 -05:00
Scott Lahteine
7d78f3476b Use the latest L6470 library 2018-05-11 02:26:47 -05:00
Scott Lahteine
6671c064cd Use arc moves for G26 if enabled (#10696)
Co-Authored-By: ManuelMcLure <manuelmclure@users.noreply.github.com>
2018-05-11 02:15:14 -05:00
Scott Lahteine
325bbbc8c2 [2.0.x] Enable AD595 and AD8495 in concert (#10693)
* Allow both AD595 and AD8495 in concert
* General temperature code tweaks
2018-05-11 01:01:51 -05:00
Scott Lahteine
c43235dd39 Remove non-special comments 2018-05-11 00:36:04 -05:00
ManuelMcLure
613a3be167 Remove hidden dependencies on destination. Fixes #10686. (#10691) 2018-05-11 00:30:51 -05:00
Scott Lahteine
23a876b08d Update a comment in motion.cpp 2018-05-10 15:03:37 -05:00
Scott Lahteine
439e0cdd0f Patch up reverse_pass_kernel (and other planner code) (#10674) 2018-05-10 01:30:55 -05:00
Scott Lahteine
fe5c308872 Correction to Printrboard SDSS pin (#10677)
Co-Authored-By: Simon Swenson <simon-swenson-8351@users.noreply.github.com>
2018-05-10 01:28:55 -05:00
Scott Lahteine
265161ba30 Blink the value for unhomed/unknown axes (#10670) 2018-05-10 01:19:20 -05:00
Scott Lahteine
57c2f8d2f6 Trailing whitespace cleanup 2018-05-10 00:17:10 -05:00
Scott Lahteine
b76344c080 More Trinamic cleanup 2018-05-10 00:12:10 -05:00
Scott Lahteine
473c6d3a91 Drop extra RIGIDBOT_PANEL from D6 config 2018-05-09 18:02:07 -05:00
Giuliano
44f3a6dc3b [2.0.x] Add missing axes to M911, M912 (#10668) 2018-05-09 17:58:11 -05:00
Scott Lahteine
722aba77f3 Fix LIN_ADVANCE + SWITCHING_EXTRUDER stepper directions (#10656) 2018-05-09 14:36:09 -05:00
Scott Lahteine
a225d2e99e Fix compilation with UBL and Arc/Bézier
Fix #10660
2018-05-09 00:40:37 -05:00
Scott Lahteine
6d9ec1852a Fix compilation of say_units
Fixes #10663
2018-05-09 00:30:29 -05:00
Scott Lahteine
19f189b4e5 Add UBL support for G2/G3 and G5 (#10648) 2018-05-08 11:10:45 -05:00
Scott Lahteine
2cdaf76c40 Merge pull request #10651 from thinkyhead/bf2_junction_deviation
[2.0.x] Junction Deviation
2018-05-08 11:09:01 -05:00
Scott Lahteine
4c663b0216 Add JUNCTION_DEVIATION to example configs 2018-05-08 10:08:54 -05:00
Scott Lahteine
4d4bf7897d Junction Deviation jerk limiting option 2018-05-08 10:08:54 -05:00
Scott Lahteine
0436e16fb2 Apply shorthand Assembler macros 2018-05-08 10:08:54 -05:00
Scott Lahteine
d1b619be52 Standardize some hexadecimals 2018-05-08 09:19:18 -05:00
Scott Lahteine
ec05408453 Add 3-frame fan animation to bitmaps (#10654) 2018-05-08 09:06:01 -05:00
Scott Lahteine
55f1f8446b Show correct current units in M503 2018-05-08 06:29:53 -05:00
Giuliano
4e16e699c1 Fix sanity checks for dual axes (#10633) 2018-05-07 03:34:26 -05:00
Scott Lahteine
a1fab8336e Fix abort of SD printing 2018-05-07 02:52:26 -05:00
Scott Lahteine
e978e6e782 [2.0.x] Arrange LCD options by type (#10630) 2018-05-06 19:16:55 -05:00
Scott Lahteine
8c5bc77fb9 Fix the sanity-check for config versions 2018-05-06 09:37:00 -05:00
Scott Lahteine
1f11b0f612 Fully init planner sync block 2018-05-06 08:16:54 -05:00
Scott Lahteine
f30241bda5 Merge pull request #10614 from thinkyhead/bf2_synced_planner_set_position
[2.0.x] Improve sync of planner / stepper position, asynchronous G92
2018-05-06 03:10:43 -05:00
Scott Lahteine
840ff60952 Bring some configs up to date 2018-05-06 02:42:27 -05:00
Phr3d13
71cd681473 Add Geeetech i3 Pro C / W examples (#10626)
Added base example configs for Geeetech's Pro C and Pro W machines.
2018-05-06 02:07:54 -05:00
Scott Lahteine
62e7a9c671 Fix up fwretract handling 2018-05-06 01:24:14 -05:00
Scott Lahteine
bfe223e120 Adjust usage of stepper.synchronize 2018-05-06 01:24:14 -05:00
Scott Lahteine
af1950a63e Improve sync of stepper positions 2018-05-06 01:24:14 -05:00
Scott Lahteine
0c23792344 Apply int32_t to stepper 2018-05-05 18:21:03 -05:00
Roxy-3D
c2c02bdc67 Change Max7219 coordinates to traditional (X,Y) 2018-05-05 16:08:54 -05:00
Scott Lahteine
b337698f96 Additional patch for no heated bed 2018-05-04 00:15:37 -05:00
Scott Lahteine
0125e009d3 Fix Travis testing of jp-kana 2018-05-02 23:52:22 -05:00
Scott Lahteine
76da6cc544 Fix Ender 2 build volume 2018-05-02 19:03:29 -05:00
Scott Lahteine
d10cb46783 Merge pull request #10595 from nightdemonx/bugfix-2.0.x
[2.0.x] Add thermocouple with AD8495 support
2018-05-02 09:05:34 -05:00
Scott Lahteine
81b632c255 Additional temp-oriented improvements 2018-05-02 08:43:22 -05:00
nightdemonx
e911635fb1 Add thermocouple with AD8495 support 2018-05-02 08:43:16 -05:00
Scott Lahteine
00e86f1c2d Add Velleman RGB-LED strip support to K8400 2018-05-02 08:10:48 -05:00
Bob-the-Kuhn
410b023b50 [2.0.x] Add Viki support to RAMPS_FD_V1 (DUE) (#10598) 2018-05-02 07:54:06 -05:00
Scott Lahteine
fcc5baef52 Merge pull request #10589 from thinkyhead/bf2_lcd_bed_leveling_abl
[2.0.x] Sub-menu for ABL with LCD_BED_LEVELING
2018-05-02 06:22:42 -05:00
Scott Lahteine
b7e938a9fb LCD_BED_LEVELING enables a sub-menu for ABL 2018-05-01 07:13:56 -05:00
Scott Lahteine
a90d99c27c Rename float32 => float52, etc. 2018-05-01 07:08:47 -05:00
Scott Lahteine
d7b699ec34 Fewer includes of vector_3.h 2018-05-01 07:05:18 -05:00
thisiskeithb
9312636ee4 Ender-3 config files (#10585) 2018-05-01 06:44:50 -05:00
Scott Lahteine
05fca752d6 Clean up autostart handling 2018-05-01 01:35:57 -05:00
Scott Lahteine
c87b0e21be Add units to probe speed comments 2018-04-30 23:50:28 -05:00
Scott Lahteine
2c1205d8b1 Improve debug of homing move feedrate 2018-04-30 23:49:51 -05:00
Scott Lahteine
c8e4b7c8a6 Fix XY homing move away rate 2018-04-30 23:49:07 -05:00
Scott Lahteine
05c33833e7 [2.0.x] Add NO_LCD_MENUS option (#10582) 2018-04-30 21:16:31 -05:00
Scott Lahteine
524cc392f4 Fix sd_status comparison
Co-Authored-By: perkmeister <perkmeister@users.noreply.github.com>
2018-04-30 21:09:50 -05:00
MagoKimbra
1f92b9a4ed Fix do_probe_move with fr_mm_s (#10576) 2018-04-30 16:28:20 -05:00
Scott Lahteine
582dc7ef97 Add build notes to README 2018-04-30 05:01:29 -05:00
Scott Lahteine
a73cece360 Fix utility.cpp for DEBUG_LEVELING_FEATURE
As mentioned in https://github.com/MarlinFirmware/Marlin/issues/9429#issuecomment-385305597

Co-Authored-By: Jack Bradach <jack@bradach.net>
2018-04-30 03:40:50 -05:00
Scott Lahteine
4dfc011d86 Fix homing with probe feedrates 2018-04-30 03:35:07 -05:00
Scott Lahteine
59fda986ea Allow Z_AFTER_PROBING to be 0 2018-04-30 03:25:47 -05:00
Scott Lahteine
63e4afc910 Do rounding in integer (instead of FIXFLOAT)
Co-Authored-By: Bob-the-Kuhn <bob-the-kuhn@users.noreply.github.com>
2018-04-29 19:33:26 -05:00
Scott Lahteine
616651ff23 Add sanity check for LED_CONTROL_MENU
Addressing #10569
2018-04-29 18:34:57 -05:00
Scott Lahteine
9e0d99c0c6 Round all floats in string conversion functions (#10566) 2018-04-29 00:51:36 -05:00
Scott Lahteine
3f68203324 Modify FastIO error message 2018-04-28 20:27:36 -05:00
Scott Lahteine
1dab44213a Fix the TMC26X initializer CS pin argument
From #10531

Co-Authored-By: chriscg9 <chriscg9@users.noreply.github.com>
2018-04-28 12:02:45 -05:00
Scott Lahteine
cd08f01bb4 Fix M421 comment in gcode.h 2018-04-28 11:16:52 -05:00
Scott Lahteine
7546f87949 Allow a home bump of 0 when homing Z with probe 2018-04-28 10:26:31 -05:00
Scott Lahteine
d470a1234f Fix ENABLED/DISABLED for DUE
…and any other platforms where `false`/`true` are defined as `0x0`/`0x1`.

This fixes issue #10550.
2018-04-28 10:12:37 -05:00
Scott Lahteine
683dc24e0f When homing with Z probe bump at Z_PROBE_SPEED_SLOW 2018-04-28 08:50:23 -05:00
Scott Lahteine
8db7fb226a Fix M420 C for UBL 2018-04-28 08:14:20 -05:00
Scott Lahteine
ed8d2bc225 Clean up some endstop inverting examples 2018-04-28 08:04:43 -05:00
Scott Lahteine
c7305be4d2 Fix some endstop inverting settings 2018-04-28 08:04:33 -05:00
Bob-the-Kuhn
f973ff49ae [2.0.x] MKS SBASE - Separate SD_DETECT for LCD and on-board SD cards (#10557) 2018-04-28 07:24:07 -05:00
Scott Lahteine
5ac226aa93 Further cleanup of inline delays 2018-04-27 19:22:22 -05:00
Marcio Teixeira
724e9f56c8 Removed "const" to match parser. (#10548) 2018-04-27 17:48:52 -05:00
Giuliano
2e1939e85c [2.0.x] report error on unsupported commands (#10553)
Raise an error when an unknown/unsupported G/M command is requires.

This will address #10546
2018-04-27 17:40:27 -05:00
Scott Lahteine
a474a7e675 Correct AVR_ATmega328_FAMILY macro
…as with #10540

Co-Authored-By: per1234 <per1234@users.noreply.github.com>
2018-04-27 03:13:46 -05:00
Scott Lahteine
f790b4bc0a Reorganize some conditionals 2018-04-27 02:23:11 -05:00
Scott Lahteine
a51ba6e3f6 Fix ABL grid bounds test for Delta/SCARA
Addressing #10538
2018-04-27 02:23:10 -05:00
Scott Lahteine
df6bc812b5 Fix disable of Z_HOMING_SENSITIVITY for HOMING_Z_WITH_PROBE
As pointed out in #10532
2018-04-27 02:23:10 -05:00
Scott Lahteine
63e0b36f8b Fix G29_RECOVER_COMMANDS typo 2018-04-27 02:23:10 -05:00
Scott Lahteine
f83361a814 Apply const to tmc_sensorless_homing 2018-04-27 02:23:10 -05:00
Scott Lahteine
212e52e485 Basic delay for Max7219 on ARM 2018-04-27 00:41:29 -05:00
Scott Lahteine
7b6e742436 Wrap delay macros in do{}while(0) 2018-04-26 18:18:23 -05:00
Karl Andersson
58ca3be1ec delayMicroseconds() cannot be called in critical section (#10535)
on the STM32 platform
2018-04-26 14:31:01 -05:00
Bob-the-Kuhn
00dfaae8df [2.0.x] Platformio - automate build & environment selection (#10503) 2018-04-26 02:42:06 -05:00
Scott Lahteine
299c4fed42 Undefine PIDTEMPBED without a bed heater 2018-04-26 01:30:10 -05:00
Scott Lahteine
456cf971af HAL FastIO cleanup and fixes 2018-04-26 00:40:16 -05:00
J.C. Nelson
5b5e322356 Set Interrupt Priorities and Grouping for STM32F103. (#10517) 2018-04-26 00:21:16 -05:00
Scott Lahteine
0e450df6a2 MKS OLED support for RUMBA
Based on #10519

Co-Authored-By: Alex <alex18881@users.noreply.github.com>
2018-04-25 23:00:44 -05:00
Scott Lahteine
2578996631 [2.0.x] Emergency parser for multiple serial ports (#10524) 2018-04-25 20:58:00 -05:00
Scott Lahteine
8cc31d1b2e Cleanup to emergency parser
Followup to #10516
2018-04-25 06:54:37 -05:00
Chris Pepper
2242b98248 [LPC176x] Emergency Parser Feature (#10516) 2018-04-25 06:44:26 -05:00
Scott Lahteine
eef0248a1c Add M420 C to adjust the whole mesh (#10522) 2018-04-25 06:43:45 -05:00
Eduardo José Tagle
c1e5ebbc1e [2.0.x] AVR: Atomic bit set and clear of upper pin ports without critical section (#10502)
* AVR: Atomic bit set and clear

The critical section can be dropped, saving 3 cycles per access. Also simplified pin toggling for all ports.
2018-04-24 13:45:43 -05:00
Marcio Teixeira
02a711c4d6 [2.0.x] Fix crash upon repeated calls to process_subcommands_now_P (#10509) 2018-04-24 13:44:22 -05:00
Scott Lahteine
a3ce8a3fcd Add sanity checks for EMERGENCY_PARSER 2018-04-24 09:24:26 -05:00
Scott Lahteine
f06c3c38b9 Fix M0_M1 with no LCD 2018-04-24 09:22:05 -05:00
Scott Lahteine
c82dd5129f Revert potentially-not-redundant UBL test
Response to #10435
2018-04-24 08:04:13 -05:00
Scott Lahteine
9789c1c719 Fix current_temperature_chamber compile error
Fix #10505
2018-04-24 07:55:58 -05:00
Eduardo José Tagle
0c428a66d9 Proper AVR preemptive interrupt handling (#10496)
Also simplify logic on all ARM-based interrupts. Now, it is REQUIRED to properly configure interrupt priority. USART should have highest priority, followed by Stepper, and then all others.
2018-04-23 22:05:07 -05:00
Scott Lahteine
f423e54f77 Strip trailing spaces 2018-04-23 18:00:43 -05:00
Scott Lahteine
8177c4334e Merge pull request #10498 from xC0000005/MalyanLCDFix
Fix overridden Malyan LCD functions
2018-04-23 17:22:43 -05:00
Scott Lahteine
cb46cb8480 Add HAS_HEATED_BED conditional (#10495) 2018-04-23 17:13:01 -05:00
Marcio Teixeira
10a25f733e Add SENSORLESS_HOMING to Archim 2.0 (#10500) 2018-04-23 17:11:33 -05:00
xC0000005
24d23ce49b Fix function definitions for Malyan LCD 2018-04-23 16:56:37 -05:00
xC0000005
73022d3119 Add a PlatformIO environment for Malyan M200 2018-04-23 16:25:49 -05:00
Alexey Shvetsov
ad58b626a3 Fix pin mappings for Viki2 on Azteeg X5 GT (#10487) 2018-04-22 18:41:30 -05:00
Scott Lahteine
9e07df5c1b Extra options for LEVEL_BED_CORNERS (#10483) 2018-04-22 02:50:48 -05:00
Scott Lahteine
1c3d49afe0 Fix G28 with Z_AFTER_PROBING
Fix #10476
2018-04-22 01:23:26 -05:00
Scott Lahteine
b6747c742a Cleanup AZTEEG_X5_GT pins for VIKI
What should the SD detect and SDSS pins be? Followup soon on #8138
2018-04-22 01:19:43 -05:00
Scott Lahteine
023385ca59 Merge pull request #10479 from thinkyhead/bf2_creality_power_loss_resume
[2.0.x] Creality3D Power-Loss Recovery
2018-04-22 00:17:44 -05:00
Scott Lahteine
3396671011 [2.0.x] Reset LCD status to fallbacks (#10470)
* Remove obsolete strings
* Tweak some static consts
* Reset LCD status to fallbacks
2018-04-22 00:16:30 -05:00
Scott Lahteine
d58450c82a Russian language update
Co-Authored-By: anton-piliugin <34044202+anton-piliugin@users.noreply.github.com>
2018-04-22 00:14:20 -05:00
Scott Lahteine
11ab017dd0 Creality3D Power-Loss Recovery 2018-04-21 21:56:50 -05:00
Scott Lahteine
594d6f9efd Add POWER_LOSS_RECOVERY to example configs 2018-04-21 19:40:46 -05:00
Scott Lahteine
7dcd0a1cff Add R parameter to G28 to specify pre-raise 2018-04-21 19:07:48 -05:00
Scott Lahteine
2f4b4d6076 Add Stopwatch::resume method 2018-04-21 19:06:05 -05:00
Scott Lahteine
a90cbc6339 [2.0.x] Wait for bed heaters between probing (#10472) 2018-04-21 15:43:21 -05:00
Scott Lahteine
a0dac95d25 Merge pull request #10460 from thinkyhead/bf2_trigorilla_14
[2.0.x] Split TRIGORILLA into 1.3 and 1.4
2018-04-20 18:25:40 -05:00
Scott Lahteine
f0cbf3d432 Correction to sanity check 2018-04-20 18:16:27 -05:00
Scott Lahteine
d8a8eec6ea Add THERMAL_PROTECTION capability
Based on #10465

In response to `M115` the firmware reports if Thermal Protection is enabled (1) or not (0). This information can be used by software such as OctoPrint (more precisely the Printer Safety Check plugin) to warn users when Thermal Protection is not enabled in the firmware.

Co-Authored-By: andrivet <sebastien@advtools.com>
2018-04-20 16:50:50 -05:00
Scott Lahteine
186d71b361 Complete CREALITY_ENDER revert 2018-04-20 16:17:25 -05:00
Scott Lahteine
11ef432476 Match Makefile to boards.h 2018-04-20 16:13:50 -05:00
Scott Lahteine
2be5fe5ddf Split TRIGORILLA into 1.3 and 1.4 2018-04-20 16:12:25 -05:00
Scott Lahteine
80e29492c6 TRIGORILLA => TRIGORILLA_13 2018-04-20 16:12:25 -05:00
Scott Lahteine
dea686cf55 Define short pin names in fastio for STM32 (#10461) 2018-04-20 14:54:35 -05:00
Scott Lahteine
65a6a86d19 Don't report point 0 in MBL G29 2018-04-20 13:12:50 -05:00
Scott Lahteine
3cf7bac129 Merge pull request #10450 from marcio-ao/pr-2.0.x-advanced-g29-recovery-and-retry
[2.0.x] Advanced G29 probe fail recovery and retry
2018-04-19 21:22:06 -05:00
Scott Lahteine
78ea4871f9 Fix up enqueue now functions
…and apply to MALYAN_LCD.
2018-04-19 19:45:53 -05:00
Scott Lahteine
6faa93d787 Add G29_RETRY_AND_RECOVER to example configs 2018-04-19 19:45:53 -05:00
Marcio Teixeira
5cc7916e69 Add G29_RETRY_AND_RECOVER feature
- Add an option to retry G29, optionally executing a G-code procedure after each failed probe.
2018-04-19 19:45:53 -05:00
Roxy-3D
23635c2b64 Update ubl_motion.cpp
Restore necessary and needed loop termination logic.
2018-04-19 12:04:35 -05:00
Scott Lahteine
f36ddef9a7 Merge pull request #10417 from yhfudev/fix-fonts-merge-sk-cz 2018-04-19 08:51:32 -05:00
Scott Lahteine
dde941cac8 Updates to font scripts and fonts documentation 2018-04-19 06:19:47 -05:00
Scott Lahteine
8ca3c43d73 Updated language_data spacing, headers 2018-04-19 06:16:16 -05:00
Scott Lahteine
90765b1f72 Remove "find" lines from .travis.yml 2018-04-19 06:16:16 -05:00
Scott Lahteine
184c077c58 Correct includes (u8g.h) and spelling 2018-04-19 06:16:16 -05:00
Yunhui Fu
627348b46c move the TALL_FONT_CORRECTION to language files 2018-04-19 06:16:16 -05:00
Yunhui Fu
77bc653524 Use X windows 6x12 bitmap font to support western languages. 2018-04-19 06:16:15 -05:00
Scott Lahteine
a51b61b38c Remove old and obsolete .fon files 2018-04-19 06:15:46 -05:00
Scott Lahteine
9d06d9edc8 Fix up fonts scripts 2018-04-19 06:15:46 -05:00
Yunhui Fu
d81649b365 Update language data for sk. 2018-04-19 06:15:19 -05:00
Yunhui Fu
41839746a2 Removed unused macros 2018-04-19 06:15:19 -05:00
Yunhui Fu
3f71e951f1 Merge SK,CZ fonts to buildroot/share/fonts/ISO10646-0-2.bdf 2018-04-19 06:15:19 -05:00
Scott Lahteine
4f184ba5da [2.0.x] Add BOARD_MKS_BASE_15 with digital micro-stepping (#10454)
* Add BOARD_MKS_BASE_15 with digital micro-stepping
* Rename MKS_13 to MKS_GEN_13
2018-04-18 22:58:43 -05:00
Scott Lahteine
ad6baa5c9d Fix for UBL set_bed_leveling_enabled 2018-04-18 00:14:48 -05:00
Scott Lahteine
df2f24617b Use 0 as the bed position (not Z_MIN_POS) 2018-04-17 20:32:56 -05:00
Karl Andersson
428c54f2ad [2.0.x] HAL for STM32F4 (#10434) 2018-04-17 17:33:29 -05:00
Chris Pepper
744bcaee61 [2.0.x] Fix problems compiling with Arduino IDE (#10441)
* Fix problems compiling u8glib utf8 support on Arduino
* Change header in auto-generated font data
* Change include in font gen scripts
2018-04-17 17:28:55 -05:00
GMagician
20772492aa Fix compile warnings in AVR fastio.h (#10440) 2018-04-17 17:26:57 -05:00
Scott Lahteine
f57a008c58 Merge pull request #10443 from thinkyhead/bf2_fix_and_improve
[2.0.x] Improve UBL mesh report, M420 V T, M421 N, and…
2018-04-17 16:59:31 -05:00
Scott Lahteine
89b1580587 Fix compile error in tmc_status 2018-04-17 16:13:28 -05:00
Scott Lahteine
52c024e260 M221 with no parameters report flow 2018-04-17 16:06:25 -05:00
Scott Lahteine
01b01f6dfd Tweak fwretract.retract debug, comments 2018-04-17 16:05:25 -05:00
Scott Lahteine
e4acd2c40e One fewer compare in _lcd_move_xyz 2018-04-17 16:03:15 -05:00
Scott Lahteine
e05c825a05 Update position for UBL non-segmented activate/deactivate 2018-04-17 16:02:02 -05:00
Scott Lahteine
d462be6de6 Try FIXFLOAT rounding based on sign 2018-04-17 15:59:04 -05:00
Scott Lahteine
39c6f65ce7 Ignore LCD_BED_LEVELING with UBL 2018-04-17 15:57:44 -05:00
Scott Lahteine
0746aff595 Improve UBL mesh report. Add M420 T, M421 N 2018-04-17 15:52:56 -05:00
Scott Lahteine
3c826e5d05 Prevent delay when power is already on
Fix #10410
2018-04-17 04:34:31 -05:00
Scott Lahteine
5a064d0e94 Fix bug in planner.set_position_mm 2018-04-16 04:19:58 -05:00
Scott Lahteine
0945674ba2 Use H0 by default with UBL_MESH_EDIT_MOVES_Z (#10428) 2018-04-15 20:49:14 -05:00
Scott Lahteine
6cb83758d7 Fix Brazilian Portuguese language duplicates 2018-04-15 19:18:08 -05:00
Scott Lahteine
8f57e098de Use end-of-line comments in planner.cpp 2018-04-15 19:02:30 -05:00
Scott Lahteine
6c7a17dba6 Abort SD printing more safely (#10407)
Allow the current command to complete when aborting an SD print, otherwise some commands (G28, G29, etc.) will cause trouble.
2018-04-15 18:27:54 -05:00
Chris Pepper
c9aed73987 Fix missed includes from HAL macro patch (#10416) 2018-04-15 18:27:34 -05:00
Scott Lahteine
74f4eb8312 Drop utf8 tweaks in build files 2018-04-15 14:48:47 -05:00
Scott Lahteine
9f8a96fb8a Brazilian Portuguese update (#10409) 2018-04-15 13:13:46 -05:00
Yunhui Fu
93273a4c9e Fix u8g.h search path error (#10419)
Support env MARLIN_LANGS for user select generated language, and update doc; update script to generate dogm_font_data_ISO10646_1.h automatically.
2018-04-15 13:12:02 -05:00
Scott Lahteine
584735c994 u8g.h => clib/u8g.h 2018-04-14 12:26:01 -05:00
Scott Lahteine
29dda871cb Patch "upload_disk" to make python happy 2018-04-13 22:27:08 -05:00
Scott Lahteine
36b97bde9f clear_block_buffer, kill_current_block in quick_stop 2018-04-13 22:04:53 -05:00
Scott Lahteine
99282a46e9 Make sure ABL (manual) starts close to the bed 2018-04-13 20:19:30 -05:00
Roxy-3D
21f13f9e57 Stow Probe at end of G29 J3 2018-04-13 14:46:47 -05:00
KangDroid
6c535081ec [2.0.x] Add optional menu item to toggle software endstops (#10389) 2018-04-13 00:24:09 -05:00
Scott Lahteine
3c5c6d478a Prettify process_parsed_command 2018-04-13 00:23:11 -05:00
Scott Lahteine
0535ebc4d2 MESH_BED_LEVELING before PROBE_MANUALLY 2018-04-12 22:45:52 -05:00
Scott Lahteine
bb7064cc30 Tweak MBL move to bed code 2018-04-12 22:43:02 -05:00
Chris Pepper
cc6d41e1d3 Use a macro for HAL header redirection (#10380) 2018-04-12 20:25:08 -05:00
Luc Van Daele
12785583d0 [2.0.x] G33 MIN_STEPS_PER_SEGMENT (#10386) 2018-04-12 20:22:29 -05:00
Yunhui Fu
c96412a78f [2.0.x] UTF-8 language translation support (#10213) 2018-04-12 20:14:01 -05:00
Scott Lahteine
daa712455b Make sure MBL starts close to the bed
Fix #10390
2018-04-12 19:36:37 -05:00
Scott Lahteine
4c8751727a Fix M118 parameter handling
Fix #10388
2018-04-12 19:10:04 -05:00
Scott Lahteine
3bc179a16f Compress/update comments ubl_motion
…to fit more code on the screen and correct outdated commentary contrasting ABL.
2018-04-12 18:07:19 -05:00
Luc Van Daele
646aa20b43 Overhaul of G33 Delta Calibration (#8822) 2018-04-11 21:14:48 -05:00
Luc Van Daele
ac2e0afb62 Low Point for delta calibration (#10363) 2018-04-11 18:59:46 -05:00
Eduardo José Tagle
57a899a412 [2.0.x] 6th-order jerk-controlled motion planning in real-time for AVR (#10373) 2018-04-11 18:13:42 -05:00
Scott Lahteine
5676b187b4 Move etc/udev to buildroot/etc
Followup to #10375. This is the appropriate place for any system etc folder additions.
2018-04-11 17:38:14 -05:00
Bob-the-Kuhn
44a03ecfc9 Add Linux compatibility for Arduino boards (#10375) 2018-04-11 14:43:28 -05:00
Bob-the-Kuhn
85014cd132 [2.0.x] LPC1768 - automatic selection of upload disk (#10374) 2018-04-11 14:41:16 -05:00
Scott Lahteine
8669dba5e6 Merge pull request #10172 from noingwhat/2.0.x-Filament-Change-Acceleration
[2.0.x] Filament load/unload add acceleration for Bowden
2018-04-11 00:39:11 -05:00
Scott Lahteine
472ab0cc24 Tweak RAMPS SDSS pins 2018-04-10 16:47:48 -05:00
LichtiMC
b94c8defee Provide additional information about SMART-RAMPS board (#10353) 2018-04-10 04:02:55 -05:00
Scott Lahteine
6f8e228880 Add RESET_PIN to pins_RAMPS_SMART.h 2018-04-10 03:34:20 -05:00
Sean
2d9b0a66fe Add Filament Change accelerations 2018-04-09 23:57:27 -05:00
Scott Lahteine
71d3523254 Add Filament Change accelerations to example configs 2018-04-09 23:57:23 -05:00
Scott Lahteine
dcb1f1f452 Merge pull request #10351 from thinkyhead/bf2_z_probe_low_point
[2.0.x] Z_PROBE_LOW_POINT to prevent probe/bed damage
2018-04-09 18:24:50 -05:00
Scott Lahteine
8b8ad14178 Add Z_PROBE_LOW_POINT to prevent damage 2018-04-09 17:23:03 -05:00
Scott Lahteine
82dafbba33 Add Z_PROBE_LOW_POINT to example configs 2018-04-09 01:55:05 -05:00
Roxy-3D
a731a723e8 Better i3-2020 Z_PROBE_OFFSET_FROM_EXTRUDER 2018-04-08 21:26:36 -05:00
Roxy-3D
26cc12eaa4 Resolve corruption of Max7219 Debug LED Matrix 2018-04-08 21:26:36 -05:00
Scott Lahteine
72c15a5cc9 Add --no-track to mfnew git script 2018-04-08 06:52:29 -05:00
Scott Lahteine
dca69efc11 Update Bed PID comments 2018-04-08 06:44:47 -05:00
Scott Lahteine
56486c5c0e Apply const to manage_inactivity 2018-04-08 04:00:26 -05:00
Scott Lahteine
a6485456df Fix LIGHTWEIGHT_UI with UBL
See https://github.com/MarlinFirmware/Marlin/issues/10317#issuecomment-379100702
2018-04-08 03:24:22 -05:00
Scott Lahteine
e02fc4f1d6 Better RESTORE_LEVELING_AFTER_G28 sanity-check
As suggested by @GMagician
2018-04-08 03:24:15 -05:00
Scott Lahteine
44a697ab04 Set STM32F1 TEMP_TIMER_FREQUENCY to 1K
Responding to https://github.com/MarlinFirmware/Marlin/pull/8833#issuecomment-379426803
2018-04-08 01:08:05 -05:00
Scott Lahteine
cec6e19099 Add RepRapPro Huxley configuration
Based on #10343 by @indazoo
2018-04-08 00:37:18 -05:00
Scott Lahteine
9ff4e9e1e6 Patch _IS_HW_SPI so defined() works 2018-04-07 23:29:00 -05:00
Scott Lahteine
cea398849e Tweak to gcode_line_error/return 2018-04-07 21:25:49 -05:00
Scott Lahteine
4382f2124d Merge pull request #10337 from ejtagle/bugfix-2.0.x
[2.0.x] 6th-order jerk-controlled motion planning in real-time
2018-04-07 21:07:59 -05:00
etagle
a29adde5c0 Implement BEZIER_JERK_CONTROL
Enable 6th-order jerk-controlled motion planning in real-time.
Only for 32bit MCUs. (AVR simply does not have enough processing power for this!)
2018-04-07 21:03:28 -05:00
Scott Lahteine
5932df7ea1 Add BEZIER_JERK_CONTROL to example configs 2018-04-07 21:03:22 -05:00
Scott Lahteine
93524c1994 Merge pull request #10045 from Lenbok/2.0.x-monitor_chamber_temperature_and_auto_fan
[2.0.x] Monitor chamber temperature, with auto fan control.
2018-04-06 23:52:38 -05:00
Lenbok
0e8242180d Chamber temperature monitoring and auto fan control.
This is an initial cut for feedback, updated for 2.0.x.

Chamber temperature is currently reported along with hot end and bed
temperatures to serial. The format is just like that used for hot end
and bed temperatures, but using 'C' prefix. As there is no heater,
target is always 0. Is this appropriate, is there a better way to report
chamber temperatures?

Chamber temperatures are not reported on the LCD in any way.

When auto chamber fan is enabled, it currently just uses the same
temperature threshold as the other auto controlled fans.

As the chamber temperature is not connected to any heater, it doesn't
undergo mintemp/maxtemp monitoring. This would need to change in the
future if chamber heating became a feature.
2018-04-06 23:09:06 -05:00
Scott Lahteine
5b3bda1c16 Add Chamber Temp options to example configs 2018-04-06 23:09:06 -05:00
Bob-the-Kuhn
acda4ecb20 Fix DUE Trinamic SW/HW SPI sanity check (#10336) 2018-04-06 22:22:30 -05:00
Bob-the-Kuhn
ab715c70d1 TMC SPI sanity-check and pins debugging (#10324) 2018-04-06 20:24:54 -05:00
Scott Lahteine
4dc7e64789 Update Slovak language
Based on #10313 by @rmoravcik
2018-04-06 20:23:20 -05:00
Scott Lahteine
0dccf9ea6a Merge pull request #10318 from marcio-ao/pr-einsy-retro-tmc2130
[2.0.x] Fix TMC2130 DIAG1 active high, Einsy Retro
2018-04-06 20:18:34 -05:00
Marcio Teixeira
2efc072fdb Clear progress bar on completion (#10333)
Fix #10330
2018-04-06 20:13:19 -05:00
GMagician
6ce060cfe0 [2.0.x] Update language_it.h (#10322)
Updated to #10296
2018-04-06 20:07:46 -05:00
Marcio Teixeira
9356cf648f Added support for Einsy Retro
http://reprap.org/wiki/EinsyRetro
2018-04-06 19:48:46 -05:00
Marcio Teixeira
75037493fa Default active low for TMC2130 DIAG1 (#10294)
- Added sanity check to inform users to set the endstop to inverting
  when using SENSORLESS_HOMING
2018-04-06 19:48:46 -05:00
Scott Lahteine
e8e60263c8 Scale feedrate (mm/s to deg/s) for SCARA 2018-04-06 19:47:48 -05:00
Scott Lahteine
051303ad42 Russian language updates
From #10311 by @anton-piliugin
2018-04-05 00:46:46 -05:00
Scott Lahteine
386bc71d57 Merge pull request #10173 from noingwhat/2.0.x-Continuous-Purge
[2.0.x] Continuous Purge
2018-04-04 22:50:27 -05:00
Sean
2fa0a73c2c Implement filament change continuous purge 2018-04-04 20:57:51 -05:00
Scott Lahteine
d133ad61f3 Add continuous purge to example configs 2018-04-04 20:56:18 -05:00
Scott Lahteine
4b25543633 Backtrace formatting cleanup 2018-04-04 20:24:39 -05:00
Bob-the-Kuhn
902c885782 Switch to TMC2130 compatible hardware SPI & misc (#10299) 2018-04-04 20:13:27 -05:00
Scott Lahteine
1c36606886 Fix MSG_HEATING_FAILED_LCD_BED macro evaluation 2018-04-04 19:01:22 -05:00
Scott Lahteine
fe91514395 MBL should add z_offset regardless of fade (#10308) 2018-04-04 18:57:33 -05:00
Marcio Teixeira
8bc93c6f2b Improve heating/cooling LCD messages (#10293) 2018-04-04 18:29:27 -05:00
GMagician
21a47b50f4 Additional tool-change fixes (#10304)
Followup to #10257
2018-04-04 17:06:33 -05:00
Scott Lahteine
e6042a7c52 Tweak platformio debug_server options 2018-04-02 22:26:11 -05:00
Scott Lahteine
f68b4265a6 Fix a probe pin definition 2018-04-02 21:52:34 -05:00
Yunhui Fu
a019eebdd6 support utf8 unicode for test language (#10220) 2018-04-02 20:03:25 -05:00
Scott Lahteine
656219d867 Add configs for Creality CR-8 2018-04-02 20:02:04 -05:00
Karl Andersson
7cbbc2af7a [2.0.x] Optional heater signal inversion (#10260) 2018-04-02 19:37:41 -05:00
Marcio Teixeira
4d1a61335c [2.0.x] Fixed Makefile for Marlin 2.0 (#10255) (#10281)
* Fixed Makefile for Marlin 2.0 (#10255)

- Makefile now supports the new Marlin 2.0 directory hierarchy.
- RELOC_WORKAROUND is now automatically enabled based on avr-gcc version.

* Makefile support for U8glib and TMC2130Stepper

- Updated paths for oliver's U8glib 1.19.1
- Added option for teemuatlut's TMC2130Stepper 2.2.1
2018-04-02 19:36:27 -05:00
Scott Lahteine
241996d5d6 Merge pull request #10257 from thinkyhead/bf2_tool_change_debug 2018-04-02 19:33:45 -05:00
Scott Lahteine
4c79dc1093 Fix a Serial+EEPROM compile error
Fixes #10278
2018-04-02 03:11:20 -05:00
Scott Lahteine
93305a2d5e Fix some spellings 2018-04-02 03:03:37 -05:00
Scott Lahteine
adcb87f0db Z Endstop Servo => Z Probe Servo 2018-04-01 23:54:21 -05:00
Scott Lahteine
e3bbd70664 Merge pull request #10276 from thinkyhead/bf2_ender_4_cr_8
[2.0.x] Fix Ender 4 compilation, add more AVRs to Makefile
2018-04-01 19:01:04 -05:00
Scott Lahteine
4f0eafce8f Add more AVR boards to Makefile 2018-04-01 18:22:06 -05:00
Scott Lahteine
4a23069de9 Fix Ender 4 / CR-8 compilation
- Assign 243 (like EFB) as Ender-4/CR-8 board ID
- Add to `Makefile`
- Add to `pins.h`
2018-04-01 18:22:06 -05:00
Scott Lahteine
02f0f95d40 Handle disabled HYBRID_THRESHOLD in EEPROM (#10275) 2018-04-01 16:58:37 -05:00
Scott Lahteine
9ec2c03c5b Fix likely error in retract/recover
Addressing #10200
2018-03-31 23:01:13 -05:00
Scott Lahteine
49f384a2ab Note about MKS_MINI_12864 in sanitycheck 2018-03-31 22:52:23 -05:00
Scott Lahteine
2672120a97 Do a small raise for all move-back 2018-03-31 22:43:05 -05:00
Scott Lahteine
5acccbacc1 Simplified leveling-based tool change 2018-03-31 22:43:05 -05:00
Scott Lahteine
1a75165f35 For set_z_fade_height use set_bed_leveling_enabled 2018-03-31 22:43:05 -05:00
Scott Lahteine
d1734a089a Split up tool_change for some setups 2018-03-31 22:43:05 -05:00
Scott Lahteine
a9f94f260a Some RADDS pin updates 2018-03-31 22:15:24 -05:00
Scott Lahteine
31df43212c Use lcd_printPGM_utf in more places
Fix #10256
2018-03-31 20:49:20 -05:00
Scott Lahteine
7d8a46519f Output ABC for delta stepper counts 2018-03-31 20:13:32 -05:00
Scott Lahteine
6098efcc59 Use float62 for LCD edit of Z Fade 2018-03-31 20:03:09 -05:00
Scott Lahteine
f6d13e2295 Allow Z_SAFE_HOMING sanity checks to handle floats 2018-03-31 19:01:56 -05:00
Scott Lahteine
889fd5f71f Backtrace minor cleanup 2018-03-31 18:59:36 -05:00
Scott Lahteine
53f0c7522a Symmetrical FWRETRACT Z Hop
Do the Z lift normally before setting Z back to its prior value. But do the Z lower using spoofing. This should produce proper symmetrical movement.
2018-03-30 15:54:01 -05:00
Scott Lahteine
ac7e97f4fe Change order of inactive stepper disable/enable
This ensures that steppers that share an enable pin will only be disabled for a miniscule time.
2018-03-30 15:07:38 -05:00
Scott Lahteine
55e9b85ad6 Clear the "Wait for user" message set by M0/M1
See https://github.com/MarlinFirmware/Marlin/issues/10246#issuecomment-377146936
2018-03-29 18:38:12 -05:00
Scott Lahteine
b6a55f0891 Temporary workaround for tool-change compile error
Pending a more complete solution to tool-change Z deviation.
2018-03-29 17:55:57 -05:00
Scott Lahteine
b852781eba Fix BLTOUCH compile error
Followup to #10250
2018-03-29 17:55:57 -05:00
AnHardt
c1f58a238d No delay in sensorless quick homing (#10254) 2018-03-29 16:10:20 -05:00
Scott Lahteine
1be955e52a Alert users about low Z jerk values 2018-03-28 23:08:33 -05:00
Scott Lahteine
9e4c037cef Wait before turning off PRINTER_EVENT_LEDS at print end (#10248) 2018-03-28 22:59:28 -05:00
Scott Lahteine
568ae094f4 Merge pull request #10250 from thinkyhead/bf2_homing_move_adjustments
[2.0.x] Improvements to general and delta homing
2018-03-28 22:59:09 -05:00
Scott Lahteine
8b7381b626 Clear sensorless homing in home_delta after first move-to-top 2018-03-28 22:01:42 -05:00
Scott Lahteine
dbe2b6f7b0 Do moves towards endstops differently in do_homing_move 2018-03-28 22:01:42 -05:00
Scott Lahteine
d573a2cada Fix pins_RAMPS.h for 32-bit platforms
Followup to 436e5b7
2018-03-28 22:01:20 -05:00
Scott Lahteine
f04be05a14 "G28 Z Forbidden" => "Home XY first"
Some languages will need to be updated for proper phrasing
2018-03-28 21:51:15 -05:00
Scott Lahteine
a97624dd81 Allow pinsDebug "Analog in" long int 2018-03-28 20:40:28 -05:00
Scott Lahteine
7b8bb2519e Fix gcode_line_error call
Followup to 3007eee
2018-03-28 20:29:41 -05:00
Scott Lahteine
aa20b3ef7c Fix linear/3-point manual leveling buffer overrun
Fixes #10137
2018-03-28 18:41:22 -05:00
Alexey Shvetsov
cbdc78ec0f Fix STM32 compilation with PlatformIO (#10245) 2018-03-28 18:35:20 -04:00
Scott Lahteine
9d2ea5d64b Undo German changes
See 941e9bd329 (commitcomment-28262166)
2018-03-28 17:05:14 -05:00
Scott Lahteine
2bc7f416ee Fix missing comma in tmc_sgt
Fixes #10209
2018-03-28 17:05:14 -05:00
Scott Lahteine
38378cd0e8 M218 with DELTA needs planner.h
Fix #10232
2018-03-28 17:05:14 -05:00
Scott Lahteine
3007eee22e Require a checksum when writing to SD
From #10204 by @adriancuzman
2018-03-28 17:05:13 -05:00
Bob-the-Kuhn
9656a82609 Fix G53/CNC_COORDINATE_SYSTEMS compilation, Travis testing (#10227) 2018-03-28 14:14:39 -04:00
Eduardo José Tagle
749f19e502 [2.0.x] Move backtrace to a shared location (#10237)
- And implement the `backtrace()` function call
2018-03-28 14:13:20 -04:00
xC0000005
7dc256432f Restore STM32F1 series to working order. (#10229)
The `_O2` attribute is no longer needed on the malyanlcd function, and the macros have broken timer numbers - reset this to a function to return the right device. Also fix the bit order cast in SPI.
2018-03-28 14:07:52 -04:00
Rob Power
d1f14202a9 [2.0.x] NANODLP_Z_SYNC requires linear axes (#10240) 2018-03-28 14:03:34 -04:00
Scott Lahteine
b287560258 Fix say_M603 2018-03-28 12:54:58 -05:00
Scott Lahteine
436e5b7ea3 Apply spacing in pins files 2018-03-28 12:52:08 -05:00
Scott Lahteine
4d533b9baa Update bq Hephestos 2 probe offset
From #10234 by @thopiekar
2018-03-27 21:05:03 -05:00
Bob-the-Kuhn
78df07ac71 Merge pull request #10221 from ejtagle/bugfix-2.0.x
[2.0.x] DUE: Several fixes to the backtracker
2018-03-27 03:26:10 -05:00
etagle
8934a2c49b Added some missing Thumb instructions to the traceback follower, so now it is able to traceback through switch() statements 2018-03-27 04:30:38 -03:00
etagle
328edea03a Several fixes to the backtracer. Tested ant it works 2018-03-26 03:42:54 -03:00
Scott Lahteine
aa6dacbbdf German update
Based on #10216
2018-03-25 15:21:13 -04:00
Yunhui Fu
8322a79bb9 update the UTF-8 C strings for Chinsee languages, for Simplified and Traditional Chinese (#10211) 2018-03-25 12:37:54 -04:00
ejtagle
9a24c0ae3f Tons of fixes to the backtracker code, and also added an extra backtracker that does not require unwind tables to work and it is used if unwind tables are absent 2018-03-25 00:52:04 -03:00
Scott Lahteine
a891af2f7a Enforce minimum TMC2130 / TMC2208 libs 2018-03-24 15:57:22 -04:00
Bob-the-Kuhn
75b381cd28 Merge pull request #10203 from Bob-the-Kuhn/sanity-check-fix
[2.0.x] Fix TMC sanity checks that always fail
2018-03-24 14:06:34 -05:00
Bob-the-Kuhn
433e984d1f move comment to fix compile error 2018-03-24 13:44:54 -05:00
Bob-the-Kuhn
f7857ac8a8 Merge pull request #10185 from ejtagle/bugfix-2.0.x
[2.0.x] DUE debugging: Solve WDT startup delay, add traceback & crash report uses programming port baud rate
2018-03-24 13:32:34 -05:00
Bob-the-Kuhn
b756a15aba another needs to be deleted 2018-03-24 10:22:03 -05:00
Bob-the-Kuhn
50c81ebe0d remove check that always fails 2018-03-24 09:36:50 -05:00
Scott Lahteine
3ac135cef3 Enforce minimum TMC2130 / TMC2208 libs 2018-03-23 18:05:23 -04:00
Bob-the-Kuhn
8870f9b1da Fix M503 helper functions following TMC updates (#10197) 2018-03-23 16:43:43 -05:00
Scott Lahteine
bb7236a750 Z correction on tool-change for all HAS_MESH (#10199) 2018-03-23 13:12:00 -05:00
Bob-the-Kuhn
81d68b2180 Merge pull request #10195 from Bob-the-Kuhn/DUE-hw-SPI-to-mode-0
[2.0.x] DUE - change hardware SPI to mode 0change to mode 0
2018-03-23 09:46:26 -05:00
Bob-the-Kuhn
509227fd80 change to mode 0 2018-03-23 09:37:58 -05:00
etagle
c3b23974bd Added detection of case when no unwind tables are available 2018-03-23 05:22:45 -03:00
Scott Lahteine
ea1a83ce41 Use pgm_read_ptr for tables of pointers 2018-03-23 02:16:35 -04:00
Scott Lahteine
9da0797e29 Fix EEPROM size of tmc_hybrid_threshold
Followup to #10102
2018-03-23 02:08:35 -04:00
teemuatlut
daf643e1ce [2.0.x] TMC: Match axis label order (#10188) 2018-03-23 01:04:12 -05:00
Roxy-3D
1628a9e864 make data declarations consistent 2018-03-22 19:25:28 -05:00
etagle
b210bdf032 Now the Crash reporter uses the configured BAUDRATE to send the report through the Programming port. And also shows the traceback of functions as discussed. For that latest feature to work, you need to compile the project with -funwind-tables and -mpoke-function-name compiler flags 2018-03-22 03:34:03 -03:00
etagle
c5730cf711 As Bob-The-Khun suggested, resetting the USB peripheral solves the huge startup delays that happen when a WDT reset happens and we are connected through the native port 2018-03-22 03:31:25 -03:00
Scott Lahteine
1cb810ff1c [2.0.x] Automatically reset stepper timeout (#10179)
* Automatically reset stepper timeout in manage_inactivity

Any code that adds moves to the planner can skip resetting the stepper timeout. We can let `idle` / `manage_inactivity` reset the timer whenever it detects any moves in the planner.

* blocks_queued => has_blocks_queued
2018-03-21 19:30:06 -05:00
Eduardo José Tagle
97e8a6ebd9 Various fixes for DUE... (#10152)
- Watchdog reset during SD Card initialization.
- Move `DebugMonitor` to `DebugMonitor_Due.cpp`.
- Since the watchdog is enabled on boot do extra resets during init.
- Have `thermalManager` do watchdog reset before its ISR starts to prevent reset.
- Ensure that timers are stopped before reprogramming them to address tone issues.
- Improve SAM3XE reset when reflashed through the native port.
2018-03-21 19:04:45 -05:00
Roxy-3D
c3c264978f correct truncated comment 2018-03-21 16:54:45 -05:00
Scott Lahteine
9fd1016bb1 Trust the bootloader to clear globals 2018-03-21 05:49:39 -05:00
Scott Lahteine
045ee28c50 Tweaks to M915 2018-03-21 05:15:25 -05:00
Scott Lahteine
987597532c For MK2_MULTIPLEXER undef DISABLE_INACTIVE_EXTRUDER
Fix #10098
2018-03-21 04:34:50 -05:00
Scott Lahteine
ff304d3767 Allow G53 to go back to native space 2018-03-21 01:38:25 -05:00
Scott Lahteine
bc45fb6b13 Tweak use of move_z_after_probing 2018-03-21 01:25:08 -05:00
Scott Lahteine
c352954882 Allow no raise after run_z_probe in probe_pt 2018-03-21 01:24:51 -05:00
Scott Lahteine
ae39fbd646 Also suppress keepalive with suspend_auto_report 2018-03-21 00:29:09 -05:00
Scott Lahteine
8dfaf1539e Merge pull request #10102 from thinkyhead/bf2_eeprom_M913
[2.0.x] More complete Trinamic driver options
2018-03-20 23:14:19 -05:00
AnHardt
837ac2fdbd [2.0.x] Fix_Autotune_THERMAL_PROTECTION_BED_off (#10166)
- Fix Autotune Thermal Protection
- Make 2 constants in autotune configurable
2018-03-20 16:48:36 -05:00
Bob-the-Kuhn
785dbfc72d [2.0.x] FASTIO consistency (#10164) 2018-03-20 16:24:50 -05:00
Bob-the-Kuhn
7308ef7809 Add conditional, give DUE SPI a unique name, fix compiler warnings (#10168) 2018-03-20 15:53:21 -05:00
teemuatlut
b5b39af531 [2.0.x] TMC: Fix CURRENT_STEP_DOWN (#10170) 2018-03-20 15:16:05 -05:00
Scott Lahteine
a5c6d3c7b8 Prevent null pointer crash in Endstops::update
Thanks to Evgeny Kotsuba!
2018-03-20 04:21:18 -05:00
Scott Lahteine
a46bac3100 Add 'I' parameter to M906/M913/M914; 'T' to M906/M913 2018-03-19 22:05:16 -05:00
Scott Lahteine
cfc13ed7f3 Quiet M906/M913/M914 with axes. Patch for DISTINCT_E_FACTORS. 2018-03-19 22:05:16 -05:00
Scott Lahteine
c95450016b Improve Trinamic support in the EEPROM 2018-03-19 22:05:16 -05:00
Scott Lahteine
48d7036874 Consolidate smart stepper driver initialization 2018-03-19 22:05:16 -05:00
Bob-the-Kuhn
53362b81cc Tone fixes/changes (#10151) 2018-03-19 04:48:06 -05:00
Scott Lahteine
2f192dbcd6 Merge pull request #10154 from thinkyhead/bf2_fewer_options
[2.0.x] Consolidate 3-point probing, auto delta probe radius
2018-03-19 04:47:26 -05:00
Scott Lahteine
dd2949922b Consolidate 3-point leveling point options 2018-03-19 04:12:20 -05:00
Scott Lahteine
1d22609473 MIN_PROBE_EDGE replaces DELTA_PROBEABLE_RADIUS 2018-03-19 04:11:46 -05:00
Scott Lahteine
eaefc1e410 Add CorePQ support for BABYSTEPPING (#10155) 2018-03-19 02:51:40 -05:00
Scott Lahteine
72281c4ff9 Turn power off in kill instead of setting PS_ON to input 2018-03-19 02:37:55 -05:00
Scott Lahteine
9d99360912 Fix matrix.debug output 2018-03-18 20:02:20 -05:00
Eduardo José Tagle
bbfbf90797 Fix for DUE - no host support on native USB if SD card not enabled (#10148) 2018-03-18 19:49:51 -05:00
Scott Lahteine
772810fb24 Followup to PORTVAR patch 2018-03-18 19:23:58 -05:00
Scott Lahteine
978f342392 Reduce some tmc_util strings 2018-03-18 18:58:10 -05:00
Scott Lahteine
fbdc5ad962 Prevent lcd_update stack overflow on SD Card change 2018-03-18 18:58:10 -05:00
Scott Lahteine
c0d694d5d3 Squash UBL postscript comment 2018-03-18 18:58:10 -05:00
Scott Lahteine
93af8aa157 Fix home_delta for SENSORLESS_HOMING (#10145) 2018-03-17 20:52:06 -05:00
Scott Lahteine
883524056b Set default baudrate for the pio serial monitor 2018-03-17 19:48:06 -05:00
Scott Lahteine
73616d721a Use the latest L6470 library (v0.6) 2018-03-17 19:28:19 -05:00
Scott Lahteine
0543362b34 Don't init the tone timer if no BEEPER_PIN 2018-03-17 18:59:43 -05:00
Scott Lahteine
c6ff39cc14 Spacing cleanup 2018-03-17 16:49:08 -05:00
Scott Lahteine
9e9e29ddf8 Einsy: Regular endstops and BLTOUCH pins
Based on #10131
2018-03-17 16:43:09 -05:00
Bob-the-Kuhn
c79b53d406 Merge pull request #10140 from Bob-the-Kuhn/DUE-full-speed
[2.0.x] DUE - add full speed USB native port option
2018-03-17 13:41:45 -05:00
Bob-the-Kuhn
7f1afbfd60 can't type 2018-03-17 13:07:49 -05:00
Bob-the-Kuhn
23760d6c14 add full speed option 2018-03-17 12:56:44 -05:00
Bob-the-Kuhn
cbcd1ed42d full speed 2018-03-17 02:57:18 -05:00
Scott Lahteine
6689884910 Easier override of ST7920 LCD timing 2018-03-17 02:40:24 -05:00
Scott Lahteine
ab769590a1 Merge pull request #10121 from thinkyhead/bf2_misc_fixes_mar16
[2.0.x] Reduce size of "only one" sanity checks
2018-03-16 21:43:27 -05:00
Scott Lahteine
d603e655d3 Fix SWITCHING_EXTRUDER manual movement 2018-03-16 03:22:56 -05:00
Scott Lahteine
5f77816772 Reduce size of "only one" sanity checks 2018-03-16 02:43:02 -05:00
Scott Lahteine
8922b56b58 Fix some spelingz 2018-03-16 01:25:41 -05:00
Scott Lahteine
a6feb58837 Delta support for multiple hotends with offsets (#10118) 2018-03-16 00:46:42 -05:00
Scott Lahteine
899b4df7a3 Merge pull request #10055 from TheSFReader/getFilename
[2.0.x] Add 'C' to M27 to echo filename (plus long name, if any)
2018-03-16 00:02:27 -05:00
TheSFReader
2e43438e0c Add C parameter to M27 to include the long filename
In answer to #10001

Add an option to retrieve the currently open file name (long filename if possible).
2018-03-15 23:06:18 -05:00
Scott Lahteine
2168d6ac25 Allow NULL prepend in lsDive 2018-03-15 23:06:17 -05:00
Scott Lahteine
1e946d681d Update Marlin for newest TMC libraries
- TMC2130Stepper v2.2.0
- TMC2208Stepper v0.0.4
2018-03-15 22:23:31 -05:00
shaktee
63fc4a8521 BIBO2 default update and Cyclops config (#10108) 2018-03-15 00:16:55 -05:00
Bob-the-Kuhn
e5157dc63d Merge pull request #10110 from ejtagle/bugfix-2.0.x
[2.0.x] DUE - native port hang (USB CDC: Do not send any character if no program on the PC is listening)
2018-03-14 23:30:49 -05:00
etagle
404fc94705 DUE USB CDC: Do not send any character if no program on the PC is listening to them. This avoids Marlin waiting until the user actually opens a program that is able to consume the output of Marlin 2018-03-15 00:56:28 -03:00
Scott Lahteine
4aebe3d82e Pretty up EEPROM port args 2018-03-14 22:44:25 -05:00
Scott Lahteine
51bf3c9503 Fix E direction for MK2_MULTIPLEXER with LIN_ADVANCE 2018-03-14 07:56:18 -05:00
teemuatlut
e6dcfa64b0 Cast SERIAL_CHAR to void in M122 (#10086) 2018-03-14 07:09:06 -05:00
Marcio Teixeira
c24dbcbfe1 When STATUS_EXPIRE_SECONDS is 0, hide the position. (#10081)
Some users may prefer to hide the position updates on the `LIGHTWEIGHT_UI` altogether. This leads to an even less cluttered display (it also saves on SPI traffic and one byte of RAM).
2018-03-14 02:44:30 -05:00
Studiodyne
e7a61de8af [2.0] FWRetract Reset (Best way) (#10083) 2018-03-14 01:35:30 -05:00
Scott Lahteine
f894209de2 Merge pull request #10093 from thinkyhead/bf2_trinamic_config
[2.0.x] Clean up Trinamic config options, sanity check
2018-03-14 01:16:55 -05:00
Scott Lahteine
f1327fd5f9 Use lcd_goto_previous_menu_no_defer more 2018-03-14 00:50:15 -05:00
Scott Lahteine
e7570f3195 Improve TMC config organization, naming 2018-03-14 00:18:41 -05:00
Scott Lahteine
374ea49be9 Revert marlinAnalogInputToDigitalPin 2018-03-14 00:18:40 -05:00
Scott Lahteine
34f656decd Add TMC2208 include in tmc_util.h 2018-03-14 00:18:40 -05:00
Scott Lahteine
07cf2cd9c4 Fix sensorless_homing_per_axis compile warning 2018-03-14 00:18:40 -05:00
Scott Lahteine
4c3d7083c0 Fix DUE build in Travis CI
Followup to #10096
2018-03-14 00:18:40 -05:00
Scott Lahteine
b858c638ad Fix compiler warning for HAL_ANALOG_SELECT 2018-03-13 22:33:21 -05:00
Bob-the-Kuhn
c4467da53a Merge pull request #10063 from ejtagle/bugfix-2.0.x
[2.0.x] DUE - add programming capability to native port
2018-03-13 22:07:21 -05:00
Bob-the-Kuhn
9aac0c7333 Merge pull request #10096 from Bob-the-Kuhn/DUE-platform.ini
[2.0.x] platformio.ini - add DUE native port support
2018-03-13 15:45:40 -05:00
Bob-the-Kuhn
d194be8e8b platformio.ini DUE native port support 2018-03-13 15:31:17 -05:00
Scott Lahteine
65ce0303f8 Fix MKS_12864_OLED blank issue
Fixes #10071
2018-03-13 04:54:23 -05:00
Scott Lahteine
36452b4d6e Fix filename HAL/DUE/servotimers.h => ServoTimers.h 2018-03-13 01:38:37 -05:00
Scott Lahteine
14c03cb6f4 [2.0.x] Make MIN_PROBE_EDGE a general option (for electronic probes) (#10069)
Some probes don't work near the edges of the bed. This change promotes MIN_PROBE_EDGE to a general setting that applies to all probing functions.
2018-03-13 01:15:22 -05:00
Scott Lahteine
5dec828abc Add MKS_12864OLED to lcd_implementation_init
Followup to #7914
2018-03-12 08:54:17 -05:00
Scott Lahteine
468f34104b Patch do_blocking_move_to so 'destination' can be used 2018-03-12 08:16:17 -05:00
Scott Lahteine
5b45aab262 M218: report with no parameters 2018-03-12 08:14:35 -05:00
Scott Lahteine
18de11c1ea Followup to auto-assign of dual axis CS pins 2018-03-12 07:19:56 -05:00
ejtagle
703c8ac0ef Added Arduino-compatible kludge to the (ATMEL supplied) SAM3X USB stack we are now using so the Native port is also usable as a programming port on Arduino DUE and derived designs 2018-03-11 15:17:55 -03:00
Scott Lahteine
28f1276286 [2.0.x] Add Z_AFTER_PROBING option (#10058)
Some "fix-mounted" probes need manual stowing. And after probing some may prefer to raise or lower the nozzle. This restores an old option but tailors it to allow raise or lower as preferred.
2018-03-11 13:07:55 -05:00
Scott Lahteine
dd19e74476 Cleanup trailing whitespace
@Bob-the-Kuhn — Please set your git options to remove trailing whitespace on commit.
2018-03-11 10:29:00 -05:00
Scott Lahteine
d0ac0151b6 Fix typo in ubl.prepare_segmented_line_to 2018-03-11 10:20:50 -05:00
Scott Lahteine
d385b9aac7 Auto-assign CS pins for X2, Y2, Z2 (#10057)
Fixes #9211
2018-03-11 08:56:13 -05:00
Scott Lahteine
bae1cb859c Patch flush_and_request_resend for 1.1.x parity 2018-03-11 07:36:00 -05:00
Scott Lahteine
51ebdf3b7d Finish scroll_screen with menu direction/multiplier
Fixes #10041
2018-03-11 04:41:12 -05:00
Bob-the-Kuhn
e27fd269c1 Merge pull request #10051 from Bob-the-Kuhn/PR-9661-
[2.0.x] restore PR 9661 (DUE compatibility with shared SPI LCDs, USB mass storage, add pin defs & update examples\MakerParts\Configuration.h)
2018-03-10 23:26:08 -06:00
Bob-the-Kuhn
0d8c15c01f restore PR 9661 files & V1 fix 2018-03-10 22:46:32 -06:00
Scott Lahteine
751785fc97 Followup to recent patches
- `M666` is static, not inline
- Disambiguate some stepper macros
2018-03-10 21:41:17 -06:00
GMagician
3c8781e2e9 [2.0.x] visual studio gitignore update (#10044) 2018-03-10 19:58:31 -06:00
Scott Lahteine
a0211f5d6c Disambiguate else in stepper_indirection.h 2018-03-10 19:56:22 -06:00
Scott Lahteine
f003173752 Fixup M666
Followup to d6df032
2018-03-10 19:52:30 -06:00
Bob-the-Kuhn
6747225e02 Merge pull request #10046 from MarlinFirmware/revert-9961-DUE-SPI-4-MAR
Revert "[2.0.x] DUE compatibility with shared SPI LCDs, USB mass storage, add pin defs & update examples\MakerParts\Configuration.h"
2018-03-10 17:23:33 -06:00
Bob-the-Kuhn
bf59a4a6df Revert "[2.0.x] DUE compatibility with shared SPI LCDs, USB mass storage, add pin defs & update examples\MakerParts\Configuration.h" 2018-03-10 17:22:20 -06:00
Sebastianv650
fd1d590726 [2.0.x] Silence M204 (#10037)
`M204` is often used by slicers to set acceleration depending on perimeter, infill, etc., so Marlin's answers are flooding the serial windows. Silence `M204` according to the philosophy that setter commands should only send a reply if no parameter is given.
2018-03-10 07:16:55 -06:00
Scott Lahteine
f10c87b442 Update Endstops class for 1.1.x parity 2018-03-10 06:57:31 -06:00
Scott Lahteine
d6df0322c2 Update M666 for XYZ dual endstops 2018-03-10 06:57:31 -06:00
Scott Lahteine
fbc41c0e98 Update Marlin G-code summary 2018-03-10 06:57:31 -06:00
Scott Lahteine
239902f861 Fix E2END and add EEPROM to Smart RAMPS
Reference #9983
2018-03-10 06:57:31 -06:00
Scott Lahteine
ddce486360 Merge pull request #10032 from thinkyhead/bf2_unknown_z_no_raise
[2.0.x] Add UNKNOWN_Z_NO_RAISE to prevent Z grinding
2018-03-10 00:57:30 -06:00
Bob-the-Kuhn
fc32db300d Merge pull request #9961 from Bob-the-Kuhn/DUE-SPI-4-MAR
[2.0.x] DUE compatibility with shared SPI LCDs, USB mass storage, add pin defs & update examples\MakerParts\Configuration.h
2018-03-10 00:34:19 -06:00
Scott Lahteine
79e6d890d5 Add UNKNOWN_Z_NO_RAISE to example configs 2018-03-10 00:17:34 -06:00
Scott Lahteine
419d12ca1b Add UNKNOWN_Z_NO_RAISE option
With this option enabled, Z won't ever be raised until after `G28` has been completed, and it won't raise if Z becomes unknown. This is good for machines whose beds fall when Z is powered off.
2018-03-10 00:17:34 -06:00
Scott Lahteine
3b4c89e4b5 Move do_probe_raise closer to set_probe_deployed
…and limit the raise to Z_MAX_POS
2018-03-10 00:17:34 -06:00
Scott Lahteine
2908e76151 Fix position_is_reachable_by_probe typo, add comment
Fix #10029
2018-03-10 00:15:41 -06:00
Roxy-3D
26dc594ebb prevent steppers from turning off during manual probes 2018-03-10 00:15:41 -06:00
Bob-the-Kuhn
d8eadf3796 fix ubl_G29.cpp Travis error 2018-03-09 23:59:30 -06:00
Bob-the-Kuhn
914bb80bde removed SDSS init
added device & comm drivers for shared SPI LCDs

mistyped some updates in ultralcd_impl_DOGM.h

remove unwanted changes in onfiguration.h

still can't type

Update HAL_LCD_class_defines.h

include USB mass storage & misc
2018-03-09 23:06:11 -06:00
Scott Lahteine
6d9ea7e184 Fix position_is_reachable_by_probe typo, add comment
Fix #10029
2018-03-09 21:12:11 -06:00
Roxy-3D
646dd5554c prevent steppers from turning off during manual probes 2018-03-09 17:56:00 -07:00
Scott Lahteine
161ff9ff35 Fix UPDATE_ENDSTOP for CorePQ compatibility
Fixes #9939
2018-03-09 08:54:48 -06:00
Scott Lahteine
49ca67202f Patch configuration_store for extra serial port
Fix #9948
2018-03-09 07:42:27 -06:00
Scott Lahteine
cc59ac4603 Fix _tmc_say_axis string address
Fixes #10003
2018-03-09 06:10:11 -06:00
Scott Lahteine
16a8edc5f0 Add more delay before pulse off in Linear Advance ISR
A capital idea from https://github.com/MarlinFirmware/Marlin/pull/9914#issuecomment-371614153
2018-03-09 05:26:29 -06:00
Scott Lahteine
dfd5d2fe75 Have position_is_reachable_by_probe use the whole bed (#10020)
Previously `position_is_reachable_by_probe` was limited to the area specified for `G29` mesh leveling (even if leveling was disabled). This change will properly consider the entire bed area so that `G30` and other non-leveling probing may take place.
2018-03-09 03:37:30 -06:00
Bob-the-Kuhn
67a17446f2 Fix DUE incompatible enum type specification (#10017) 2018-03-09 02:17:57 -06:00
Bob-the-Kuhn
3c58ca181c [2.0.x] Correct step pulse width on LPC1768, DUE & Teensy35_36 (#10016) 2018-03-09 02:11:28 -06:00
Scott Lahteine
3707078ffc More VSCode droppings 2018-03-09 01:49:39 -06:00
Scott Lahteine
e297748b22 Apply const, safe_delay in servo.* 2018-03-08 19:31:32 -06:00
Scott Lahteine
3c2bfa5e53 Update powersupply_on in power_on/off (#10015)
Fix #10004
2018-03-08 18:56:47 -06:00
Scott Lahteine
42608b1925 Init old_red to 127 to ensure initial change
Fix #10012
2018-03-08 18:28:33 -06:00
Scott Lahteine
317673fec3 Init watchdog last in setup() 2018-03-08 17:34:50 -06:00
Scott Lahteine
8d32fd997f Wrap NORM_E_DIR/REV_E_DIR macros in do{}while(0) 2018-03-08 16:20:24 -06:00
Scott Lahteine
1913c37a91 Tweak to manual move eindex arg 2018-03-08 16:20:24 -06:00
Scott Lahteine
98d48fc731 Followup to HAL_timer_restrain
Followup to #9985
2018-03-07 22:18:37 -06:00
Scott Lahteine
03e3011332 Fix compile error with MAX_MESSAGE_LENGTH
Fix #9988
2018-03-07 21:57:01 -06:00
Bob-the-Kuhn
6b4a928145 2uS default step pulse (#9989) 2018-03-07 21:11:01 -06:00
Scott Lahteine
ca577c1638 Fix up various spacing, comments, and typos 2018-03-07 21:09:08 -06:00
Scott Lahteine
d45f19d385 Remove Unicode from var name 2018-03-07 19:08:44 -06:00
Scott Lahteine
224688cc3b Fix for unicode-ignorant gcc preprocessor 2018-03-07 18:34:07 -06:00
Chris Pepper
a1a88ebabc HAL function to ensure min stepper interrupt interval (#9985) 2018-03-07 17:53:25 -06:00
Scott Lahteine
be0e100fed Fix sd subdirectory encoder position
Followup to 7e386c7
2018-03-07 16:54:19 -06:00
Bob-the-Kuhn
04dedc7ed8 always completely initialize display (#9981) 2018-03-07 16:40:59 -06:00
Scott Lahteine
0149680f54 Fix compile error with char LCD 2018-03-07 16:25:37 -06:00
Scott Lahteine
9515e5aefb Fix LA_active_extruder (static) 2018-03-07 05:49:20 -06:00
Scott Lahteine
e5ec793f7e Wrap stepper indirection macros 2018-03-07 05:42:45 -06:00
Sebastianv650
5b85464791 Fix for LA (#9964)
Missed in the original LA 1.5 PR: eISR has to use a local copy of
current_block->use_advance_lead because it might still run wenn the last
block has been set to NULL.
2018-03-07 05:33:13 -06:00
Scott Lahteine
7e386c7e98 Fix encoder position for sddirectory 2018-03-07 05:23:03 -06:00
Scott Lahteine
9e97c13c6f Merge pull request #9979 from thinkyhead/bf2_suppress_autoreport
[2.0.x] Capability to suppress auto-reporting
2018-03-07 03:33:40 -06:00
Scott Lahteine
1d604be671 Suspend auto-report during UBL map output 2018-03-07 02:00:19 -06:00
Scott Lahteine
eb212ae073 Add suspend_auto_report flag to suppress auto-report 2018-03-07 01:57:09 -06:00
Scott Lahteine
ffbf63e6af Add HAS_TEMP_SENSOR conditional 2018-03-07 01:53:50 -06:00
Scott Lahteine
94f5204629 Move AUTO_REPORT_SD_STATUS to SDSUPPORT block 2018-03-07 01:50:30 -06:00
Scott Lahteine
22a017a856 Rebuild SD file sort array on Stop SD Print (#9976)
Thanks Chuck Hellebuyck.
2018-03-07 01:42:11 -06:00
Scott Lahteine
920d92aa46 Merge pull request #9974 from thinkyhead/bf2_tmc_util_progmem
[2.0.x] Move tmc_util.* extended_axis_codes to PROGMEM
2018-03-07 00:16:50 -06:00
Scott Lahteine
b198b49d15 Followup to AUTO_REPORT_SD_STATUS
Followup to #9832
2018-03-07 00:13:42 -06:00
Scott Lahteine
2057177184 Make enums into implicit char 2018-03-06 23:39:56 -06:00
Scott Lahteine
e28e3bb532 Move extended_axis_codes to PROGMEM 2018-03-06 22:21:24 -06:00
Scott Lahteine
d7aed2fe4f Merge pull request #9971 from thinkyhead/bf2_lin_advance_duplication
[2.0.x] Support duplication mode in LIN_ADVANCE
2018-03-06 21:59:59 -06:00
Scott Lahteine
ca0def766e LIN_ADVANCE single stepper optimization 2018-03-06 19:26:54 -06:00
Scott Lahteine
8291ae34f2 Support duplication mode in LIN_ADVANCE 2018-03-06 19:12:23 -06:00
Scott Lahteine
b08ec22fe1 Show E0-E4 in monitor_tmc_driver output (#9969)
Fix #9966
2018-03-06 19:01:07 -06:00
Marcio Teixeira
fd883c909a Improvements to Lightweight ST7920 status screen. (#9952)
- Show units on lightweight status screen.
- Fixed progress bar so it works with M73
2018-03-06 01:49:36 -06:00
Scott Lahteine
0dd1c4458d Put more code between pulse start and stop (#9959) 2018-03-05 23:06:57 -06:00
Scott Lahteine
f9cafc4001 Fix menu highlight glitch, tweak scrolling code (#9957) 2018-03-05 23:05:15 -06:00
Scott Lahteine
bf9fc8ac0e M851 - report only without parameters 2018-03-05 02:11:50 -06:00
Scott Lahteine
eb867817b5 Prevent filament runout false positives (#9946) 2018-03-05 01:49:30 -06:00
Scott Lahteine
36262a0479 Use static classes for job timers (#9938) 2018-03-04 21:23:43 -06:00
Scott Lahteine
930720bbbb Fix broken reverse planner (#9943)
From #9914 by @Sebastianv650
2018-03-04 21:19:06 -06:00
Bob-the-Kuhn
025118da3e Init print_job_timer in setup() instead of "early" (#9937) 2018-03-04 16:23:44 -06:00
Scott Lahteine
beeed580b8 Implement digipots for MKS SBASE (#9927)
Fix #9477
2018-03-04 15:14:47 -06:00
Scott Lahteine
07ae23fe14 No pulse delay on last e_steps in advance isr 2018-03-04 15:06:31 -06:00
Scott Lahteine
881529a401 Fix #9904 - toDigital should show 00-99 hours 2018-03-04 04:34:39 -06:00
Scott Lahteine
ed758de80d tweak comment in stepper.cpp 2018-03-04 04:03:23 -06:00
Scott Lahteine
e74a5829c7 Show .github folder in Sublime Text project 2018-03-03 23:36:03 -06:00
Scott Lahteine
d1dc863962 autotemp_factor is not value_celsius_diff
See https://github.com/MarlinFirmware/Marlin/issues/9852#issuecomment-369861822
2018-03-03 23:27:54 -06:00
Thomas Moore
f3914a432e Clear retracted status when homing the Z axis 2018-03-03 23:18:40 -06:00
Scott Lahteine
6d7f4f84e2 Add board MKS_BASE_HEROIC (#9926)
Followup to #9008

- Don't define micro-stepping pins for boards that lack them.
- Allow setting of 128 microsteps with `M350`.
2018-03-03 23:14:52 -06:00
Scott Lahteine
649f375494 Fix: M112 calling kill from interrupt (#9923)
Fix #9906
2018-03-03 23:14:01 -06:00
Scott Lahteine
c37b3f995a Sanity-check some graphical LCD-only options 2018-03-03 20:31:59 -06:00
Scott Lahteine
a2a672449a Updated boot screen description 2018-03-03 20:04:17 -06:00
Scott Lahteine
4d0584a828 Add templates, contributing, code of conduct 2018-03-03 19:43:09 -06:00
Scott Lahteine
61620cbd15 Tweak M211 2018-03-02 02:20:40 -06:00
Scott Lahteine
b9303b5577 Enhance github helper scripts (#9888) 2018-03-01 20:41:01 -06:00
Scott Lahteine
6e08ddce6e Correct M401 / M402 description 2018-03-01 19:10:36 -06:00
Studiodyne
23a576faf7 [2.0] Fix for FW retract (#9878) 2018-03-01 15:15:40 -06:00
Ben Lye
461c8ef834 Fix DIGITAL_PIN_TO_ANALOG_PIN macro for Atmega1284p (#9881) 2018-03-01 15:13:57 -06:00
Scott Lahteine
88b6a15b47 Update M900 verbiage 2018-03-01 15:11:31 -06:00
Ben Lye
e2df286444 Update pinsDebug.h (#9874)
Fix display of analog input value.
2018-03-01 04:51:36 -06:00
Scott Lahteine
91db7930dc Drop SCARA_FEEDRATE_SCALING
The updated planner takes the length of the move, so this pre-calculation is no longer needed.
2018-03-01 04:30:41 -06:00
Bob-the-Kuhn
c1f4112bdc [2.0.x] Add 1284 support & misc. bug fixes (#9864) 2018-03-01 03:07:39 -06:00
Scott Lahteine
118899357d Add sanity checks to Linear Advance 1.5 (#9873) 2018-03-01 02:10:43 -06:00
Scott Lahteine
1746749361 Followup to #9868 2018-03-01 01:53:12 -06:00
Scott Lahteine
a446433c87 Fix SENSORLESS_HOMING for Core Kinematics (#9868) 2018-03-01 01:37:31 -06:00
Scott Lahteine
2d1233b86c Fix lcd_quick_feedback call for BTN_BACK 2018-02-28 20:24:11 -06:00
AnHardt
eb8b758226 Fix some mapper, charsize problems (#9866) 2018-02-28 18:57:05 -06:00
Scott Lahteine
8bffb26c23 Fix manual move position display
Manual moves now correctly include the workspace offset.
2018-02-28 17:33:23 -06:00
Scott Lahteine
8c03ce4d80 Fix Z safe homing sanity check for no probe
Fix #9851
2018-02-28 05:28:35 -06:00
Scott Lahteine
c471389afb Add Einsy Rambo pins (#9850) 2018-02-28 04:16:12 -06:00
Zachary Hill
c22f8dd660 Get duration_t in printcounter.h for its clients (#9843) 2018-02-28 04:15:29 -06:00
Scott Lahteine
24b9c1923f ubl G29 tweaks 2018-02-28 03:40:06 -06:00
Scott Lahteine
bd0967ad87 Fix BTN_BACK
Followup to #9835
2018-02-28 03:26:28 -06:00
Scott Lahteine
d9a98b5814 Russian language update
From #9849
2018-02-28 03:07:39 -06:00
Scott Lahteine
13940268a2 Fix findMissingTranslations.sh for 2.0.x 2018-02-28 01:19:40 -06:00
Ben Lye
461cb22069 Fix Zonestar / ADC keypad with RAMPS. (#9840) 2018-02-28 00:07:50 -06:00
Scott Lahteine
35ec67885a Add support for BACK button (RADDS) (#9835) 2018-02-26 22:52:57 -06:00
Scott Lahteine
0bc4c216ac Patch up pinsDebug pins 2018-02-26 19:32:48 -06:00
Scott Lahteine
cd7dc49527 Fix CR-10 status screen missing commas
Fix #9660
2018-02-26 15:52:50 -06:00
geigerg
4817c78a65 Add files via upload (#9828) 2018-02-26 15:44:01 -06:00
TheSFReader
eb079959fb Report sd card progress [FR] #9751 (#9832)
* SD Status auto-report feature
Feature Request #9751
2018-02-26 15:38:27 -06:00
Scott Lahteine
7bdb98c946 Fix #9826. Solution by @gloomyandy 2018-02-26 15:02:19 -06:00
Scott Lahteine
02474a321a Fix SDSUPPORT (and indentation)
Based on https://github.com/MarlinFirmware/Marlin/issues/8746#issuecomment-368471901 by @benlye
2018-02-26 14:40:40 -06:00
Scott Lahteine
cfdcf91df5 Fix compile error with initTone 2018-02-26 01:49:48 -06:00
Scott Lahteine
ae1a2ff16f Pins parity with 1.1.x 2018-02-26 01:17:50 -06:00
Scott Lahteine
1c13cc9b48 Merge pull request #9810 from thinkyhead/bf2_better_M503
[2.0.x] Mesh export in Bilinear + UBL M503
2018-02-26 01:00:44 -06:00
Roxy-3D
306f44198e Prevent serial buffer overrun in Pronterface
75ms might  be excessive...    But I know people are seeing problems with PronterFace as the client...
2018-02-25 23:50:44 -06:00
Scott Lahteine
966d9af98a Mesh export in Bilinear + UBL M503 2018-02-25 23:25:39 -06:00
Scott Lahteine
8d5a77001e EEPROM parity with 1.1.x 2018-02-25 23:03:09 -06:00
Scott Lahteine
2228dff3ea ubl.h compile flags from 1.1.x 2018-02-25 23:03:08 -06:00
Sebastianv650
cb4cb86d80 Useless line removed (#9814)
nextAdvanceISR is set in the next if structure in every possible
situation, so it's useless to set it once more before.
2018-02-25 21:20:37 -06:00
Scott Lahteine
f2c0ed193d Add tone support for Due (#9807) 2018-02-25 10:48:14 -06:00
Scott Lahteine
0557ab5780 Fix CONFIG_ECHO_START bug
In reference to #9633
2018-02-25 05:34:52 -06:00
Scott Lahteine
61688233c7 HAL style tweak 2018-02-25 05:00:44 -06:00
Scott Lahteine
19ba91f77a Fix lcd_custom_bootscreen compiler warning 2018-02-25 04:38:17 -06:00
Scott Lahteine
f3dbe19669 Tweaks to HAL codestyle 2018-02-25 04:38:17 -06:00
Scott Lahteine
0e0f17be30 Sublime Text can ignore .vscode 2018-02-25 04:38:17 -06:00
Bob-the-Kuhn
f15d7bdbf2 [2.0.x] ELF improvement, fix lib_ignore (#9793)
- Compiler flags so ELF will include the original source.
- Use commit-id archives for a working `lib_ignore`.
2018-02-25 03:02:46 -06:00
Scott Lahteine
54c65fc3cb Standardize LCD buzz defaults 2018-02-24 22:58:22 -06:00
Scott Lahteine
4953fb1c88 Standardize encoder defaults 2018-02-24 22:34:45 -06:00
Scott Lahteine
078627f805 [2.0.x] Creality Ender-4 configuration (#9803)
* Move Creality Ender-2 configurations
* Add Creality Ender-4 configurations
2018-02-24 22:11:11 -06:00
Scott Lahteine
5684beae90 Bring some configs up to speed 2018-02-24 21:56:27 -06:00
UtterlyD
813f9f3082 [bugfix_2.0.x] - LIN_ADVANCE V1.5 stepper.cpp (#9797)
Removal of obsolete (i) from port of LIN_ADVANCE from V1.1.x to V2..0.x.
2018-02-24 16:37:23 -06:00
Scott Lahteine
3f89bbeab5 Drop a conditional only used once 2018-02-24 16:35:31 -06:00
Scott Lahteine
a01473d7a5 Extend .gitignore to make VSCode happy 2018-02-24 15:48:34 -06:00
Scott Lahteine
689bc99402 Correction to acceleration 2018-02-24 11:09:36 -06:00
Roxy-3D
92c8efdc96 Change Folger Tech i3-2020 defaults 2018-02-24 10:29:24 -06:00
Scott Lahteine
2024775e07 Spanish (UTF8) Language (#9786)
From #7314 by @MrAmericanMike
2018-02-23 20:24:02 -06:00
Scott Lahteine
43ff15244d Fix a progress bar condition 2018-02-23 19:43:44 -06:00
Scott Lahteine
b8485528b2 Prettify LCD_PROGRESS_BAR options 2018-02-23 19:19:57 -06:00
Zachary Hill
4d588b2d6a Further fix of LCD_PROGRESS_BAR (#9783) 2018-02-23 18:53:04 -06:00
Scott Lahteine
e0227f2110 Fix *_CS_PIN for RAMPS_FD
Fix #9778
2018-02-23 14:29:57 -06:00
Scott Lahteine
e65a853c59 Fix LCD_PROGRESS_BAR
Fix #9208
2018-02-23 14:05:10 -06:00
Scott Lahteine
07d7e8aa1b Merge pull request #9775 from thinkyhead/bf2_g28_restore_leveling
[2.0.x] Add RESTORE_LEVELING_AFTER_G28 option
2018-02-23 13:43:22 -06:00
Scott Lahteine
e749945317 Un-pause print on cancel (#9780) 2018-02-23 13:42:15 -06:00
Scott Lahteine
17d984eab3 Add RESTORE_LEVELING_AFTER_G28 to example configs 2018-02-23 13:38:54 -06:00
Scott Lahteine
b2cf253a13 Add RESTORE_LEVELING_AFTER_G28 option 2018-02-23 13:38:54 -06:00
Scott Lahteine
65519263f4 Fix broken LEVEL_BED_CORNERS
Fix #8805
2018-02-23 09:13:34 -06:00
Scott Lahteine
8f9262f3fe Fix path to _Statusscreen.h 2018-02-23 09:06:06 -06:00
Scott Lahteine
007c56f453 Fix HAL_STM32F1/endstop_interrupts.h
In response to https://github.com/MarlinFirmware/Marlin/issues/7076#issuecomment-367556982
2018-02-23 02:07:34 -06:00
Scott Lahteine
0542b03750 Fix bootscreen include path
Fix #9759
2018-02-23 01:59:35 -06:00
Scott Lahteine
2bd252b501 [2.0.x] LIN_ADVANCE v1.5 (#9712) 2018-02-23 00:53:29 -06:00
Scott Lahteine
90fa423737 Preliminary cleanup of #include structure (#9763) 2018-02-23 00:52:52 -06:00
Scott Lahteine
a6b7e721cf Slovak language update 2018-02-23 00:49:07 -06:00
Scott Lahteine
2c9775313a Fix Z position on HD44780
Fix #9732
2018-02-23 00:42:42 -06:00
Studiodyne
9c9cd54ef3 Add Z Fade Height edit to UBL and Tune submenus (#9738) 2018-02-23 00:29:58 -06:00
Scott Lahteine
3851ffce0f Merge pull request #9637 from marcio-ao/pr-lite-st7920-status
[2.0.x] Light-weight status screen for ST7920 based printers
2018-02-22 23:55:02 -06:00
Scott Lahteine
5f8b2c2ff0 More descriptive environment error message 2018-02-22 23:34:49 -06:00
Scott Lahteine
b17982bde9 Merge pull request #9769 from teemuatlut/bf2_compile_fixes
[2.0.x] Fix compiling with M600 and runout sensor
2018-02-22 22:52:31 -06:00
Scott Lahteine
799e3b2b40 LPC1768 HAL formatting/comments 2018-02-22 14:36:17 -06:00
teemuatlut
5968a3e60e Add ADVANCED_PAUSE_FEATURE include 2018-02-22 20:28:46 +02:00
teemuatlut
93cc3a8492 Make used methods public 2018-02-22 20:26:14 +02:00
Marcio Teixeira
13176dfe2f Merge remote-tracking branch 'origin/pr-lite-st7920-status' into pr-lite-st7920-status 2018-02-22 08:02:31 -07:00
Scott Lahteine
424b9a83cd Slovak language update
From @rmoravcik at #9760
2018-02-22 03:00:47 -06:00
Scott Lahteine
e75ccfd727 Hatchbox Alpha Config with E3Dv6 (#9762) 2018-02-22 02:57:48 -06:00
Scott Lahteine
556abc0888 Add LIGHTWEIGHT_UI to example configs 2018-02-22 00:10:43 -06:00
Marcio Teixeira
532bb3aaa1 Lightweight status screen for ST7920
- This status screen uses the ST7920 character generator to greatly
  reduce SPI traffic and MCU load when updating the status screen.

- Has been tested with the RepRapDiscount Full Graphics Smart Controller
  but should work with any LCD that uses an ST7920 or fully compatible
  controller.
2018-02-22 00:10:43 -06:00
Scott Lahteine
59c98d6fd5 Hephestos2 heated bed kit for all (#9757) 2018-02-21 22:27:09 -06:00
Scott Lahteine
8c1a82c327 Merge pull request #9753 from ldkraemer/BF2CR-10Bootscr
[2.0.x] Creality CR-10mini configuration
2018-02-21 20:29:36 -06:00
Scott Lahteine
72f63a4980 Fix DOGM progress bar with LCD_SET_PROGRESS_MANUALLY 2018-02-21 19:47:04 -06:00
ldkraemer
6c3162f9c6 Add CR-10 Mini configuration 2018-02-21 19:08:42 -06:00
ldkraemer
4431f4deb8 Add CR-10S _Bootscreen.h 2018-02-21 18:55:14 -06:00
Marcio Teixeira
e7f329edb2 Added bed corners to bed icon.
- This makes it look less like a dash (idea stolen from cjsoong).
2018-02-21 15:31:56 -07:00
Marcio Teixeira
e84a5545e1 Removed unnecessary extended mode switch.
- This will slightly reduce the SPI requirements for
  updating the progress bar.
2018-02-21 15:12:11 -07:00
Scott Lahteine
343c17d5b3 Reduce Creality3D bootscreens flash usage (#9752) 2018-02-21 16:08:52 -06:00
Scott Lahteine
63bc6ade4f Fix pinsDebug compile error 2018-02-21 14:28:58 -06:00
Roxy-3D
d504bbbfa4 Fix botched check for being off the mesh... 2018-02-21 14:28:58 -06:00
Marcio Teixeira
716a22498f Changed temp type from uint8_t to int16_t
- Also deleted old implementation files which had been renamed.
2018-02-21 10:15:55 -07:00
Scott Lahteine
7d8c6b3f3c Add 20x4 option for Sainsmart LCD (#9740) 2018-02-21 00:46:25 -06:00
Scott Lahteine
1d7f5be0ff quick_home_xy sensorless homing 2018-02-20 20:52:48 -06:00
Scott Lahteine
eb182c08af Merge pull request #9733 from thinkyhead/bf2_random_fixup_branch
[2.0.x] Drop HAL_timer_set_count
2018-02-20 17:03:18 -06:00
Kevin
03b48df7bb RADDS: Add EEPROM Size (#9737)
needed for UBL
2018-02-20 16:24:29 -06:00
Scott Lahteine
9f0907d40c Fix big edit font width calculation
Fix #9685
2018-02-20 16:24:23 -06:00
Marcio Teixeira
9d5968e8ec Fixed dual-extruder in Lightweight UI.
- Moved bed icon down when the machine is configured with two nozzles.
2018-02-20 13:34:34 -07:00
Scott Lahteine
4303f2e377 Fix MALYAN_LCD message bugs
Fix #9711
Replacing #9731
2018-02-20 05:40:19 -06:00
Scott Lahteine
12c5fdfdb5 Fix CYCLES_PER_MICROSECOND conflict on STM32F1 2018-02-20 03:10:39 -06:00
Scott Lahteine
a810e585db Drop HAL_timer_set_count 2018-02-20 03:10:39 -06:00
Bob-the-Kuhn
a823b801b8 Merge pull request #9729 from Bob-the-Kuhn/U8G-compile-error-2.0.x
[2.0.x] Move #include <U8glib.h> in ultralcd_st7920_u8glib_rrd_AVR.cpp (fix bug introduced in PR #9624)
2018-02-19 18:36:23 -06:00
Bob-the-Kuhn
47d529aac5 move #include <U8glib.h> 2018-02-19 17:39:40 -06:00
Marcio Teixeira
aada1e698f Removed unused configuration options. 2018-02-19 16:14:33 -07:00
Marcio Teixeira
c7513eb032 Merge branch 'pr-lite-st7920-status' of github.com:marcio-ao/Marlin into pr-lite-st7920-status 2018-02-19 15:38:13 -07:00
Scott Lahteine
73cd34b121 Finish AUTO_POWER_CONTROL implementation
Followup to #9503
2018-02-19 16:12:04 -06:00
Scott Lahteine
fc460fff94 Extend menu items for SWITCHING_EXTRUDER
Reference #5367
2018-02-19 11:12:42 -06:00
Scott Lahteine
c4ec01d59b Conditionals for SWITCHING_EXTRUDER
In reference to #5367. SWITCHING_EXTRUDER was not fully implemented for EXTRUDERS > 2.
2018-02-19 10:59:47 -06:00
Scott Lahteine
d4e4fe40e0 Add SENSORLESS_HOMING delay to quick_home_xy
Fix #9471
2018-02-19 10:12:16 -06:00
Scott Lahteine
25e3e62354 Null-terminate lcd_status_message 2018-02-19 10:12:16 -06:00
Scott Lahteine
a11fcd46a2 Merge pull request #9699 from Studiodyne/Studiodyne-filamentMulti
[2.0.x] Support multiple filament runout sensors
2018-02-19 08:42:39 -06:00
Scott Lahteine
b3deadd898 Don't raise FIX_MOUNTED_PROBE on stow
Reference #9336
2018-02-19 08:36:43 -06:00
Scott Lahteine
a74cece6d0 CR-10 Bootscreen
From @plainpylut in #9660
2018-02-19 08:07:08 -06:00
Scott Lahteine
8733d5a296 Add NUM_RUNOUT_SENSORS to example configs 2018-02-19 07:02:50 -06:00
Studiodyne
d3ca82d8c2 Support for multiple filament runout sensors 2018-02-19 07:02:50 -06:00
Scott Lahteine
0106c3e476 Style tweak in MarlinSerialUSB_Due.h 2018-02-19 06:58:26 -06:00
Scott Lahteine
3d1692d1fd Fix X2 enable with X_DUAL_STEPPER_DRIVERS
From #9286
2018-02-18 22:50:47 -06:00
Scott Lahteine
c241da32e8 stepper.h parity with 1.1.x 2018-02-18 22:50:38 -06:00
Scott Lahteine
3af988a7f3 Add sensorless homing delay to home_z_safely
Based on #9705
2018-02-18 19:28:40 -06:00
Scott Lahteine
ca55f2927a Pulldown pin mode support (#9701)
Implemented for LPC1768.
2018-02-18 19:26:23 -06:00
Scott Lahteine
aef9e036bf More overridable FIL_RUNOUT_PIN 2018-02-18 04:43:15 -06:00
Scott Lahteine
79272f98fc Proposed changes to ST7920 lightweight status screen 2018-02-18 02:47:31 -06:00
Marcio Teixeira
24eb275b99 Added a light-weight status screen for the ST7920
- The status screen uses the ST7920 character generator to greatly
  reduce SPI traffic and MCU load when updating the status screen.

- Has been tested with the RepRapDiscount Full Graphics Smart Controller
  but should work with any LCD that uses an ST7920 or fully compatible
  controller.
2018-02-18 02:29:45 -06:00
Scott Lahteine
a6563df705 Sync pinsDebug_list.h between 1.1.x and 2.0.x (#9693) 2018-02-18 02:25:32 -06:00
Scott Lahteine
bab0e975c8 The ENDER can use BOARD_MELZI_CREALITY (#9692) 2018-02-18 02:24:39 -06:00
Scott Lahteine
83d7e95de0 Add MSG_THERMAL_RUNAWAY_BED (#9691) 2018-02-18 02:23:55 -06:00
Scott Lahteine
6589f654b0 Merge pull request #9676 from smoki3/bugfix-2.0.x
[2.0.x] Option to force homing of a dependent axis
2018-02-18 02:22:03 -06:00
Scott Lahteine
8ffa0b24a4 Strip excess G28 debug logging 2018-02-18 01:11:41 -06:00
Kevin
9019ea0fce Option to force X or Y to home first when homing the other axis 2018-02-18 01:11:41 -06:00
Scott Lahteine
60fc372211 Add CODEPENDENT_XY_HOMING to example configs 2018-02-18 00:46:04 -06:00
Scott Lahteine
da7c51d820 Space out some pins lines 2018-02-17 22:53:58 -06:00
Bob-the-Kuhn
e05673a379 [2.0.x] VIKI2 & RE_ARM changes (#9686)
* VIKI2 & RE_ARM changes

1. Remove `DISABLED(SDSUPPORT)` from ST7565 in `ultralcd_impl_DOGM.h`. These LCDs share pins with the SD card and can run at the SD card rates.

2. Add SDSS definition to `pins_RAMPS_RE_ARM.h`.  Apparently the SDSS definition in `pins.h` is being processed before the one in `spi_pins.h` which resulted in not being able to read the SD card.
2018-02-17 16:41:36 -06:00
Scott Lahteine
7a381366aa Merge pull request #9208 from benlye/benlye-m73
[2.0.x] Allow M73 without SDSUPPORT
2018-02-17 15:50:11 -06:00
Scott Lahteine
7d093edc18 Add Tronxy XY100 configuration
Based on #9674
2018-02-17 15:48:32 -06:00
Scott Lahteine
472229b974 Fix #9681 2018-02-17 08:28:12 -06:00
Scott Lahteine
f6cc89ec7c LCD_PROGRESS_BAR w/out SDSUPPORT for character LCD 2018-02-17 08:17:22 -06:00
blye
330437ad7c Update LCD_SET_PROGRESS_MANUALLY in configs 2018-02-17 08:12:10 -06:00
blye
168af8bacb Allow LCD_SET_PROGRESS_MANUALLY without SDSUPPORT 2018-02-17 07:54:24 -06:00
Scott Lahteine
bf5df306e1 Fix compile error with SHOW_BOOTSCREEN disabled
Fix #9530
Fix #9524
2018-02-17 00:52:08 -06:00
Scott Lahteine
3021058e6d Fix non-UTF8 Czech language 2018-02-16 22:23:29 -06:00
Scott Lahteine
bd54ce830a Include utility.h in neopixel.cpp 2018-02-16 22:19:34 -06:00
Scott Lahteine
ff90cb409e No space for E2 with ReARM+RAMPS
Addressing #9474
2018-02-16 21:37:26 -06:00
Scott Lahteine
d7f82c8ddf Drop extra avr/pgmspace include in _Bootscreen.h
Addressing #9441
2018-02-16 18:36:35 -06:00
Scott Lahteine
1bf2b1e475 Use serial macro in sd_mmc_spi_mem.cpp for Due 2018-02-16 17:57:24 -06:00
Scott Lahteine
241e55ef3b Apply SERIAL_FLUSH macro 2018-02-16 17:32:12 -06:00
Scott Lahteine
1f8f8c9104 Merge pull request #9657 from petrzjunior/bugfix-2.0.x
[2.0.x][Language] Update Czech (Advanced pause...)
2018-02-16 02:54:06 -06:00
Thomas Moore
cff62042ee Fix LCD manual movement on kinematic machines (#9655) 2018-02-16 02:34:36 -06:00
teemuatlut
749bc42aa9 TMC SGT is int8 (#9651) 2018-02-16 02:19:33 -06:00
Bob-the-Kuhn
2d749d490b Fix / complete USE_CONTROLLER_FAN (#9666) 2018-02-16 02:18:50 -06:00
Scott Lahteine
08d685c97a Followup to 21e60fd 2018-02-16 02:09:17 -06:00
Scott Lahteine
c49844df66 !ENABLED => DISABLED 2018-02-16 01:51:34 -06:00
Scott Lahteine
304e0f8945 Followup to 21e60fd
`ENABLED` only works for flag-type options. Floats must use `#ifdef`.
2018-02-15 22:24:23 -06:00
Scott Lahteine
6a70a4fbb3 Fix G26 circles (#9627)
Easier to configure. Catch an odd divisor.
2018-02-15 22:11:26 -06:00
Bob-the-Kuhn
4ea7e723fe Merge pull request #9667 from Bob-the-Kuhn/USE_CONTROLLER_FAN-config-2.0.x
[2.0.x] Improved CONTROLLER_FAN_PIN example in Configuration_adv.h
2018-02-15 21:45:25 -06:00
Bob-the-Kuhn
349dafa728 config update (set to -1) 2018-02-15 21:42:54 -06:00
Roxy-3D
21e60fd3ed Allow user to control Z-Height correction for off mesh movements (#9661) 2018-02-15 15:07:42 -06:00
Petr Zahradník
d81e9ce7cb Add CHARSIZE to ignorelist 2018-02-15 20:23:02 +01:00
Petr Zahradník
5d9e16ea49 Update Czech advanced pause 2018-02-15 20:22:22 +01:00
Roxy-3D
c78e1c0f23 Fix G26 Circles... (#9641)
* Fix G26 Circles...
2018-02-15 11:15:15 -06:00
Bob-the-Kuhn
b648999528 Merge pull request #9624 from Bob-the-Kuhn/RRD-8-bit-code-to-2.0.x
[2.0.x] Add delays to AVR driver for RRD Full Graphic Smart Controller
2018-02-14 22:43:17 -06:00
Marcio Teixeira
8db67d1647 Fixed compilation when using avr-gcc
- avr-gcc is more strict than the Arduino IDE, it seems.
2018-02-14 15:51:25 -07:00
Marcio Teixeira
f05bd7f082 Added files missing from earlier commit. 2018-02-14 14:51:35 -07:00
Marcio Teixeira
4880ac6533 Added a light-weight status screen for the ST7920
- The status screen uses the ST7920 character generator to greatly
  reduce SPI traffic and MCU load when updating the status screen.

- Has been tested with the RepRapDiscount Full Graphics Smart Controller
  but should work with any LCD that uses an ST7920 or fully compatible
  controller.
2018-02-14 14:43:54 -07:00
Roxy-3D
3d74ff3c87 Cartesian UBL systems should not use SEGMENT_LEVELED_MOVES
There is significant downside to breaking up the long line segments on UBL Cartesian machines.   It adds a lot of extra computation but worse...  It cuts out all of UBL's off mesh Z-Height correction checks.    There have been a large number of people complaining about the nozzle going to infinity or crashing into the bed lately.   They are being caused by
```
void unified_bed_leveling::line_to_destination_cartesian()
```
not watching over the segments being queued up for movement.
2018-02-14 14:16:12 -06:00
Scott Lahteine
5dc04c5201 Fix #9361 2018-02-14 07:48:20 -06:00
AnHardt
133b38b93b Complete M48 description (#9631) 2018-02-14 05:17:58 -06:00
Scott Lahteine
93c0198b2d Init LCD welcome message programmatically 2018-02-14 05:09:44 -06:00
Scott Lahteine
f0debfd2fc See if this passes Travis CI 2018-02-14 04:26:10 -06:00
Scott Lahteine
67a4cc610b French update
Based on #9610
2018-02-14 04:15:47 -06:00
Scott Lahteine
e7b50c89b0 Fix #9201
FILAMENT_LCD_DISPLAY can work with SDSUPPORT
2018-02-14 03:29:47 -06:00
Scott Lahteine
8d71ad37cb flush comment to match 1.1.x 2018-02-14 02:56:18 -06:00
Scott Lahteine
272f132b82 Remove stray ` from STM32F1 HAL
As noted in #8585
2018-02-14 01:06:37 -06:00
Scott Lahteine
5b70d3da1c Update DIGIPOT_I2C_MOTOR_CURRENTS comments 2018-02-13 22:54:12 -06:00
Scott Lahteine
2ec65051fd Fix serial comment sp. 2018-02-13 22:40:56 -06:00
Bob-the-Kuhn
9a423e9a89 tested 2018-02-13 21:59:18 -06:00
Scott Lahteine
d741bcf8a9 Tweak boards spacing 2018-02-13 03:49:28 -06:00
Scott Lahteine
f8912bb19f French update
Based on #9590 by @studiodyne
2018-02-12 01:07:47 -06:00
Scott Lahteine
e6b8207b03 Restore welcome message 2018-02-12 01:02:30 -06:00
Scott Lahteine
89165326b4 Cleanup after vim and vigor 2018-02-11 06:07:30 -06:00
Scott Lahteine
423bf9955e Set Megatronics baud rate to 115200
Fix #9092
2018-02-11 03:43:36 -06:00
Scott Lahteine
377108619b Fix plan_arc clockwise (G2)
Fix #9482
2018-02-11 03:34:25 -06:00
Scott Lahteine
47e56afeeb Add 'mffp' to quickly push upstream (#9587) 2018-02-11 02:16:29 -06:00
Scott Lahteine
378867d894 Update PB Rev.F pins 2018-02-11 01:45:37 -06:00
Scott Lahteine
8e0c107545 Have Kossel Pro use Z_MIN_PROBE_ENDSTOP (#9586) 2018-02-11 01:41:40 -06:00
Scott Lahteine
03d790451f [2.0.x] HAL timer set/get count => set/get compare (#9581)
To reduce confusion over the current timer count vs. the compare (aka "top") value. Caution: this re-uses the function name, changing its meaning.
2018-02-10 20:42:00 -06:00
Scott Lahteine
7a4029d1b1 Correct MOTHERBOARD for Geeetech i3 Pro X 2018-02-10 20:29:29 -06:00
Scott Lahteine
451fb16f9b Fix CYCLES_PER_MICROSECOND conflict 2018-02-10 20:08:48 -06:00
Scott Lahteine
3e384b60ce Malyan M200 fix E0_AUTO_FAN_PIN (#9580)
Fixes #8794
2018-02-10 20:04:09 -06:00
Scott Lahteine
33752de12d Update some outdated configs 2018-02-10 19:48:16 -06:00
Scott Lahteine
38c7d53bf7 Repair some spacing 2018-02-10 19:33:26 -06:00
Scott Lahteine
e3043d7ac7 Fix #8744 2018-02-10 16:54:42 -06:00
Scott Lahteine
d3ddd5ffaa Merge pull request #9576 from thinkyhead/bf2_more_tests
[2.0.x] Fix Power class
2018-02-10 16:43:55 -06:00
Scott Lahteine
0749ce92b3 Merge pull request #9572 from thinkyhead/bf2_tronxy_x5s
[2.0.x] Tronxy X5S
2018-02-10 15:43:58 -06:00
Scott Lahteine
7280fa1e31 Patch Power class 2018-02-10 15:41:18 -06:00
Scott Lahteine
4311dd13ae Test POWER_SUPPLY and AUTO_POWER_CONTROL 2018-02-10 15:28:01 -06:00
Scott Lahteine
4aff6c1c32 Tronxy X5S pins and configuration 2018-02-10 15:07:04 -06:00
Scott Lahteine
4fef36966b Rename environment anet10 to melzi 2018-02-10 14:46:17 -06:00
Scott Lahteine
05aa75cecf Melzi boards use melzi pins 2018-02-10 14:44:14 -06:00
gege2b
5785bbb491 Updated french translation (#9556) 2018-02-10 14:15:41 -06:00
GMagician
299606e4ae [2.0.x] Memory overflow protection (#9562) 2018-02-10 14:14:34 -06:00
teemuatlut
5990266724 Init CS pins before loading settings (#9566) 2018-02-10 14:08:53 -06:00
teemuatlut
d3fdb44ad8 Update TMC section with SW SPI pins (#9554) 2018-02-09 22:54:34 -06:00
Scott Lahteine
3168f0e646 Merge pull request #9549 from thinkyhead/bf2_prevent_comments_resetting
[2.0.x] Prevent watchdog reset due to many comments
2018-02-09 07:13:26 -06:00
Scott Lahteine
9be6aa3f79 Merge pull request #9544 from thinkyhead/bf2_reliable_probe_heaters_off
[2.0.x] More reliable PROBING_HEATERS_OFF with BED_LIMIT_SWITCHING
2018-02-09 07:12:29 -06:00
Scott Lahteine
c0dd9ef9f2 Support for AnyCubic TriGorilla board (#9551) 2018-02-09 05:41:52 -06:00
Scott Lahteine
da693a636e Fix handling of escapes in serial input 2018-02-09 05:19:33 -06:00
Scott Lahteine
cc9cef7f7a Fix HAS_CONTROLLER_FAN in is_power_needed 2018-02-09 05:19:33 -06:00
Scott Lahteine
112917cfef No EXTRUDER_RUNOUT_PREVENT during print 2018-02-09 05:19:33 -06:00
Scott Lahteine
c30a8067ab Prevent watchdog reset due to many comments
Addressing #7449
2018-02-09 05:19:33 -06:00
Scott Lahteine
b7053156fe Minor comment/condition cleanup 2018-02-09 01:53:35 -06:00
Scott Lahteine
f64d300cfd Sanity check SERIAL_PORT
Addressing #7400
2018-02-09 00:44:15 -06:00
Scott Lahteine
5a70887467 Size lcd_status_message based on language (#9545) 2018-02-08 23:03:47 -06:00
Scott Lahteine
545cd8fa60 Tweak malyanlcd.cpp 2018-02-08 22:00:23 -06:00
Scott Lahteine
e698998343 More reliable PROBING_HEATERS_OFF with BED_LIMIT_SWITCHING 2018-02-08 21:10:11 -06:00
shaktee
27faeafc1b [2.0.x] BIBO Cyclops (#9541) 2018-02-08 21:01:31 -06:00
Scott Lahteine
2014d38e10 NEOPIXEL_BRIGHTNESS parity 2018-02-08 18:55:19 -06:00
Scott Lahteine
694d2ebec0 TMC SW SPI pins in Configuration_adv.h
Counterpart to #9632
2018-02-08 18:49:38 -06:00
GMagician
9854262334 [2.0.x] Fix compile warning (#9539) 2018-02-08 17:59:03 -06:00
Scott Lahteine
b639f1ad4b Correct some retract() comments 2018-02-08 17:57:48 -06:00
Thomas Moore
1541224a81 Enable Z axis and delta sensorless homing (#9516) 2018-02-08 04:20:44 -06:00
Scott Lahteine
b2f8b4ada5 I2C position encoders update (#9533)
Updating I2C position encoders to enable babystepping and Babystep XY when using the ecm microstep correction method. Also changed default method to ECM microstep.
2018-02-08 03:57:11 -06:00
Thomas Moore
93af0365e8 [2.0.x] Add support for Cohesion3D ReMix and Mini (#9512)
* Add support for Cohesion3D ReMix and Mini
* Two separate pins files for pedantic reasons
2018-02-08 03:14:39 -06:00
Johnny Eshak
852468ead7 [2.0.x] Fix compile Error Anet (#9509) 2018-02-08 03:02:16 -06:00
Scott Lahteine
23240f7986 Fix sw serial pins for TMC2208
From #9518 by @melvinisken
2018-02-08 02:54:49 -06:00
Scott Lahteine
d42a87cb31 Update language Italian
From #9508 by @tnw513
2018-02-08 02:10:15 -06:00
Scott Lahteine
2538f019d0 Update language Basque-Euskera
From #9514 by @1138-4EB
2018-02-08 02:08:41 -06:00
Scott Lahteine
d168ee9bed Drop leveling include from steppers.cpp 2018-02-08 01:32:19 -06:00
Scott Lahteine
09c8807a36 Minor formatting in queue.cpp 2018-02-08 01:31:19 -06:00
Scott Lahteine
704d33c374 Special override of LCD_WIDTH 2018-02-08 01:30:56 -06:00
Scott Lahteine
e6c32b3a14 Add sublime-project file (#9526) 2018-02-07 15:50:10 -06:00
Scott Lahteine
b3f115fa0a Marlin.ino needs no content (#9506) 2018-02-06 02:28:18 -06:00
Scott Lahteine
ca8fdff1af Comment G26 properly 2018-02-06 00:58:28 -06:00
Scott Lahteine
8558264514 Configs for Prusa i3 Pro B GT2560 Rev.A Plus (#9505)
One without probe and one with BLTOUCH.
2018-02-06 00:24:21 -06:00
Scott Lahteine
b5e92f4f90 [2.0.x] Enable / disable PSU automatically (#9503) 2018-02-06 00:22:30 -06:00
Scott Lahteine
db1ace5e82 Merge pull request #9501 from thinkyhead/bf2_ulticontroller_v21
[2.0.x] UltiController v2.1 support
2018-02-05 23:06:32 -06:00
Scott Lahteine
eecb0188c0 Add ULTI_CONTROLLER to example configs 2018-02-05 22:30:03 -06:00
Scott Lahteine
16739264d3 Add UltiController v2.1 support
Add compatibility with the original screen bord from Ultimaker 2 printer (UltiController v2.1 with the PG-2864ALBP I2C display)
2018-02-05 22:30:03 -06:00
Scott Lahteine
a8c4174a13 M100 comment 2018-02-05 21:54:50 -06:00
Scott Lahteine
38d62494ef Adjustment to DOG_CHAR_*_EDIT 2018-02-05 20:25:45 -06:00
Scott Lahteine
8a6feab1c4 Num-to-string functions for DEBUG_LEVELING_FEATURE 2018-02-05 19:08:27 -06:00
Scott Lahteine
766faa05a9 sp 2018-02-05 15:57:29 -06:00
GMagician
f27c89980a [2.0.x] Simplify bltouch configuration (#9488) 2018-02-05 14:38:09 -06:00
GMagician
338dac258b [2.0.x] Fix compiler error when G26 is enabled (#9492) 2018-02-05 14:27:39 -06:00
Scott Lahteine
4ddb6a3a1f Merge pull request #9470 from thinkyhead/bf2_malyan_clueless
[2.0.x] Malyan M200 LCD
2018-02-05 05:03:18 -06:00
Scott Lahteine
03bfc0d7c8 Merge pull request #9439 from thinkyhead/bf2_fix_G26_circle_bumps
[2.0.x] Change G26 circle angles
2018-02-04 19:05:18 -06:00
Scott Lahteine
e5ee0b6f6c Implement MALYAN_LCD 2018-02-04 18:52:44 -06:00
Scott Lahteine
b939a2e88c Watchdog conditional for LPC 2018-02-04 18:52:44 -06:00
Scott Lahteine
4925f60cff Add MALYAN_LCD to configs 2018-02-04 18:52:44 -06:00
Scott Lahteine
3a1225e438 Sanity check SENSORLESS_HOMING 2018-02-04 18:52:44 -06:00
Scott Lahteine
2ea4e74ed3 Misc. comments 2018-02-04 17:40:39 -06:00
Scott Lahteine
aecf0c9bb9 Allow override of CS pins generally 2018-02-04 16:36:30 -06:00
Scott Lahteine
0891b58c30 #ifdef tweaks 2018-02-04 16:36:30 -06:00
Bob-the-Kuhn
428f164d02 [2.0.x] Bug fix - "M114 D" and Due (dtostrf C linkage) (#9481) 2018-02-04 16:11:27 -06:00
Scott Lahteine
693843f1fa Allow override of RAMPS CS Pins (#9472) 2018-02-04 16:00:16 -06:00
ABH10
ac6bf7226a Update of comments in thermistor files. No functional changes. (#8986) 2018-02-04 06:06:21 -06:00
Alexey Shvetsov
da3a0d619c Add Selena Compact board (#9407)
5-axis, high performance, powerful board with Smoothieware opensource firmware. Designed for 3D printer, Laser cutter or CNC mill. Five changed independent drivers on board. Two extruders 3d printer support.
2018-02-04 03:15:09 -06:00
Thomas Moore
786746404b [2.0.x] Apply feedrate to nozzle movement for kinematic machines (#8778) 2018-02-04 00:26:05 -06:00
Scott Lahteine
5364b92c37 Drop obsolete string 2018-02-03 23:58:31 -06:00
shaktee
34624cf399 [2.0.x] BIBO TouchX configuration (#9469) 2018-02-03 23:21:02 -06:00
Bob-the-Kuhn
d08597c65a Merge pull request #9468 from Bob-the-Kuhn/remove--/src
[2.0.x] Cleanup - remove not needed "../src"
2018-02-03 21:57:49 -06:00
Bob-the-Kuhn
3d72fe0730 snapshot 2018-02-03 21:28:05 -06:00
Scott Lahteine
33ec599ca0 Tweaky LPC1768 SPI spacing/style 2018-02-03 20:25:57 -06:00
Scott Lahteine
dbd2189945 Pretty up Print.* within CMSIS 2018-02-03 20:06:52 -06:00
Scott Lahteine
c46de340b7 Clean up trailing whitespace 2018-02-03 20:05:23 -06:00
Thomas Moore
e1fd9c08b3 [2.0.x] Add support for LPC1769 at 120 MHz (#9423) 2018-02-03 19:33:26 -06:00
GMagician
6ace57e1b0 [2.0.x] remove duplicated include (#9445)
This was present in #9357 but lost
2018-02-03 19:32:05 -06:00
GMagician
9e13d1fad5 [2.0.x] Fix temperature out of LCD (#9461)
Fix bug introduced in #9415
2018-02-03 19:25:04 -06:00
Scott Lahteine
e6cdc438fd Change G26 circle angles
To prevent the nozzle from colliding with the printed pattern.
2018-02-03 19:17:49 -06:00
Scott Lahteine
a8764ac5d5 G26 parity with 1.1.x 2018-02-02 05:19:14 -06:00
Manuel Valentino
374f2a5e16 [2.0.x] Fixed wrong information about TMC2208 wiring (#9335) 2018-02-02 04:45:55 -06:00
Bob-the-Kuhn
a0570ff1eb Fix caselight on Due (#9364) 2018-02-02 04:13:33 -06:00
Scott Lahteine
b13099de3f General cleanup of HAL code 2018-02-02 03:37:15 -06:00
Scott Lahteine
9b9350e010 Fix jerky Z motion between probes
Suggested by #9375
2018-02-02 02:32:11 -06:00
Scott Lahteine
d6e29e9597 Update French language
Based on #9373 by @nikkoura
2018-02-02 01:56:25 -06:00
GMagician
e1117a8492 [2.0.x] fix compile errors when CNC_COORDINATE_SYSTEMS is enabled (#9380) 2018-02-02 01:45:46 -06:00
GMagician
ea9ad4e46d [2.0.x] Fix compile error on delta when NO_WORKSPACE_OFFSETS (#9388) 2018-02-02 01:44:48 -06:00
Scott Lahteine
ca00fed827 Merge pull request #9415 from thinkyhead/bf2_enhance_boot_status
[2.0.x] Enhance Boot and Status screens
2018-02-02 01:41:07 -06:00
Scott Lahteine
79796b22ad Fix up _Bootscreen.h and _Statusscreen.h 2018-02-02 00:57:16 -06:00
Scott Lahteine
434a2dcbf2 Merge pull request #9393 from Bob-the-Kuhn/revert-parser-to-array-2.0.x
[2.0.x] Fix compile error when FASTER_GCODE_PARSER is disabled
2018-02-02 00:56:50 -06:00
Bob-the-Kuhn
21179f8300 Fix the "slow" version of the G-code parser 2018-02-02 00:35:58 -06:00
Scott Lahteine
c251601916 Simplified SET_BIT, moved to endstops.cpp 2018-02-02 00:34:23 -06:00
Scott Lahteine
eb18ae9003 Define LSBFIRST / MSBFIRST for LPC 2018-02-02 00:34:23 -06:00
Scott Lahteine
f8227abf1c Merge pull request #9384 from tcm0116/2.0.x-retract
[2.0.x] Clear retracted status when homing the Z axis
2018-02-01 23:36:36 -06:00
Scott Lahteine
ea5f91737f Merge pull request #9392 from studiodyne/studiodyne-pause
[2.0.x] Pause resuming fix
2018-02-01 23:32:24 -06:00
teemuatlut
5c69d45f5b [2.0.x] TMC2130 support for LPC platform (#9114) 2018-02-01 21:49:40 -06:00
Scott Lahteine
34160806c0 Fix broken G29 W I J 2018-02-01 21:37:35 -06:00
Scott Lahteine
f5cfdf6efe Use _BV32 to avoid name conflict 2018-02-01 21:37:35 -06:00
Scott Lahteine
6339b506c0 Make sure binary.h is included as needed 2018-02-01 21:37:35 -06:00
Scott Lahteine
6e3519abae Try to use an Neopixel library for Travis CI 2018-02-01 04:14:27 -06:00
studiodyne
51d080d2c1 Update Pause 2018-01-29 21:57:37 +01:00
Thomas Moore
7035471982 Clear retracted status when homing the Z axis 2018-01-29 19:40:04 +00:00
GMagician
6d4bc9a1f8 [2.0.x] Fix SD wrong filename list (#9342)
If last file in directory has short filename and is preceded by a deleted long file name. SD menu will wrongly report long deleted file name as last entry
2018-01-26 14:03:51 -06:00
Bob-the-Kuhn
5bd23db0ee Merge pull request #9351 from Bob-the-Kuhn/Fix-USEABLE_HARDWARE_PWM-for-Due
[2.0.x] fix USEABLE_HARDWARE_PWM for DUE
2018-01-25 22:56:28 -06:00
Bob-the-Kuhn
c6e01ebd52 never mind ... 2018-01-25 22:13:32 -06:00
Bob-the-Kuhn
571ca72824 Merge pull request #9345 from Bob-the-Kuhn/Due-compile-issue-2.0.x
[2.0.x] DUE - add USEABLE_HARDWARE_PWM & clear up some compiler warnings
2018-01-24 22:14:12 -06:00
Bob-the-Kuhn
ab709ccac1 add USEABLE_HARDWARE_PWM & clear up some compiler warnings 2018-01-24 21:42:36 -06:00
Scott Lahteine
70e4f12d2f Merge pull request #9327 from thinkyhead/bf2_fix_parser_M118
[2.0.x] Fix parser.has_value, M118 parameters
2018-01-24 00:57:41 -06:00
Scott Lahteine
fc5c1a28d8 Fix M118 parameter parsing 2018-01-24 00:30:13 -06:00
Scott Lahteine
399bca316a Fix has_value with FASTER_GCODE_PARSER 2018-01-24 00:30:13 -06:00
Scott Lahteine
80d3ded895 Change parser codebits from array to int32_t 2018-01-24 00:30:13 -06:00
Scott Lahteine
053b1371c7 Simplify G-code debug option 2018-01-24 00:06:07 -06:00
Scott Lahteine
608f8b10da Parser val method parity with 1.1.x 2018-01-24 00:06:07 -06:00
Scott Lahteine
2bea1bda56 Move more strings to PROGMEM 2018-01-24 00:06:06 -06:00
Scott Lahteine
58671e1bc1 Marlin must override _BV for 32-bit masks! 2018-01-23 23:52:35 -06:00
Scott Lahteine
45cfb16424 Merge pull request #8355 from tcm0116/2.0.x-TwoWire
[2.0.x] Master-only TwoWire (I2C) class for LPC1768
2018-01-23 20:14:02 -06:00
Scott Lahteine
c19327f1bb Merge pull request #9325 from thinkyhead/bf2_simple_patches
[2.0.x] Optimize some strings, arc length calculation
2018-01-23 19:27:52 -06:00
Scott Lahteine
1dcfe193ac Optimize some serial strings 2018-01-23 19:14:00 -06:00
Scott Lahteine
9644fe1839 Lightly optimize arc length calculation 2018-01-23 19:13:59 -06:00
Scott Lahteine
c9bda932fe Patch M114 D logical output 2018-01-23 18:50:37 -06:00
Scott Lahteine
4eb41031e9 Merge pull request #9312 from thinkyhead/bf2_fade_info_too
[2.0.x] Include Z Fade in log_machine_info
2018-01-23 14:32:20 -06:00
Scott Lahteine
e5ca60acf5 Patch G29 no_action for A and Q 2018-01-23 14:00:06 -06:00
Scott Lahteine
696f8eb4c6 Include Z Fade in log_machine_info 2018-01-23 14:00:06 -06:00
Scott Lahteine
3217da6fa5 Followup patch for TMC stepper init 2018-01-23 14:00:06 -06:00
Scott Lahteine
db031d5d76 Add missing SoftwareSerial begin for TMC2208
Based on #9299
2018-01-22 10:43:24 -06:00
Thomas Moore
3db35ba9be [2.0.x] Fix change filament for delta machines (#9295) 2018-01-22 10:21:42 -06:00
Scott Lahteine
62ecc74e76 Merge pull request #9297 from thinkyhead/bf2_fix_skew_factor
[2.0.x] Fix Skew Correction pre-calculation overflow error
2018-01-22 08:45:11 -06:00
Scott Lahteine
f7f8569bbf Fix skew settings report precision
Followup to changes from #8843
2018-01-22 08:32:47 -06:00
Scott Lahteine
2ebf52e57d Fix Skew Correction pre-calculation overflow error 2018-01-22 08:20:21 -06:00
Scott Lahteine
adb2ac4747 Fix skew settings report precision 2018-01-22 08:09:36 -06:00
Scott Lahteine
205c5fa078 Merge pull request #9277 from oysteinkrog/fix/DualX_Endstops
[2.0.x] Fix DUAL_X_CARRIAGE endstop tests
2018-01-22 07:42:49 -06:00
Scott Lahteine
90d011cc48 Use ADD_PORT_ARG for all cases 2018-01-22 06:27:22 -06:00
Scott Lahteine
51c7b5d46f Fix set_home_offset bug from bad porting 2018-01-22 06:16:21 -06:00
Scott Lahteine
a19656e7cb Merge pull request #9290 from thinkyhead/bf2_print_start_fix
[2.0.x] Minor filament change improvements
2018-01-22 06:10:58 -06:00
Scott Lahteine
b1cd012aa6 Clean up and document load/unload/pause/resume 2018-01-22 05:45:46 -06:00
Scott Lahteine
266086670b Better LCD message when heating needed 2018-01-22 04:38:37 -06:00
Scott Lahteine
a718f5bdf3 Don't run M600 on filament runout if the nozzle is cold 2018-01-22 04:38:37 -06:00
Scott Lahteine
61bf8478a2 Add hotEnough methods 2018-01-22 04:38:37 -06:00
Scott Lahteine
7a52dfad55 Merge pull request #9283 from thinkyhead/bf2_jgaurora_configs
[2.0.x] Add JGAurora A5 support
2018-01-22 02:21:56 -06:00
Chris Pepper
f875f49caa [2.0.x] LPC1768: Fix: Serial pins disabled correctly when in use (#9193) 2018-01-22 01:54:41 -06:00
Scott Lahteine
c63cffca7f Add example configs for JGAurora A5 2018-01-22 01:27:11 -06:00
Scott Lahteine
7d6c009104 Add thermistor 15 tuned for JGAurora A5 2018-01-22 01:27:11 -06:00
Scott Lahteine
582d073de1 Patch up digital microstepping and SPI CS pins 2018-01-22 01:27:11 -06:00
Scott Lahteine
ab8a1a2a0d Sync gCreate gMax1.5+ config with 1.1.x 2018-01-22 01:05:12 -06:00
Scott Lahteine
f9dbd4d9f4 Updated FolgerTech i3-2020 config 2018-01-22 01:05:12 -06:00
Scott Lahteine
348b454401 Probe bounds based on bed size 2018-01-22 01:05:11 -06:00
Bob-the-Kuhn
a440522f84 Merge pull request #9284 from Bob-the-Kuhn/DUE-pins-debug
[2.0.x] PINS_DEBUGGING maintenance
2018-01-21 18:40:39 -06:00
Scott Lahteine
58ed9901d7 Consistent NEOPIXEL_TYPE options 2018-01-21 17:19:38 -06:00
Scott Lahteine
382a5e3318 Clean up trailing whitespace 2018-01-21 17:19:38 -06:00
Øystein Krog
441517bbe1 Fix DUAL_X_CARRIAGE endstops
\#8170 fixed
2018-01-21 15:32:19 +01:00
Scott Lahteine
b46932f0c0 Merge pull request #9273 from thinkyhead/bf2_creality_tuneup
[2.0.x] Fix and improve Creality configs
2018-01-21 02:53:16 -06:00
Scott Lahteine
49bcb5ce2d Merge pull request #9220 from benlye/lcd-timer
[2.0.x] Fix LCD timer string length
2018-01-21 02:47:59 -06:00
Scott Lahteine
07db5638e2 Add a heating indicator X offset 2018-01-21 02:04:14 -06:00
Scott Lahteine
c68ce8667d Fix and improve Creality configs 2018-01-21 02:04:14 -06:00
Scott Lahteine
8190fdb260 [2.0.x] Option to use Neopixel as case light (#9270)
* Add option to use Neopixel as case light

* Apply CASE_LIGHT_USE_NEOPIXEL to example configs
2018-01-20 16:58:41 -06:00
GMagician
9b519864bf [2.0.x] Relative movements fix (#9259) 2018-01-20 15:22:03 -06:00
Scott Lahteine
887664aa61 Restore broken Dual X Carriage 2018-01-20 15:08:50 -06:00
Scott Lahteine
fb044b6a64 Fix HAL_timer_set_current_count for STM32F1 2018-01-20 14:57:17 -06:00
Scott Lahteine
a8638aa20d Update STM32F1 timer code to use libmaple bb_perip 2018-01-20 14:56:57 -06:00
Scott Lahteine
2e2fd8fd79 Merge pull request #9261 from tcm0116/2.0.x-delta_softstops
[2.0.x] Allow DELTA to compile with soft endstops disabled
2018-01-20 14:16:30 -06:00
Scott Lahteine
750cc02b3a Use delay() in serial temp report 2018-01-20 14:13:17 -06:00
Scott Lahteine
9de8c04945 Allow FIL_RUNOUT_PIN override on RAMPS-based boards 2018-01-20 12:00:59 -06:00
Scott Lahteine
57b61491d3 Set FIL_RUNOUT_PIN for Creality CR10-S
Tested with M43 and found to be connected to DIO 2
2018-01-20 11:56:57 -06:00
Scott Lahteine
4a4d832344 Use standard encoder pulses/steps for CR-10S 2018-01-20 11:35:52 -06:00
Thomas Moore
44239b1062 Allow DELTA to compile with soft endstops disabled 2018-01-20 09:40:36 -06:00
Scott Lahteine
4bc4351250 Date refresh 2018-01-20 09:17:57 -06:00
Scott Lahteine
303d792b9f Merge pull request #9253 from tcm0116/2.0.x-mks_sbase
[2.0.x] Cleanup MKS-SBASE compile warnings
2018-01-19 22:37:38 -06:00
Scott Lahteine
afec16e644 Merge pull request #9240 from tcm0116/2.0.x-eeprom
[2.0.x] Follow-on to #9161
2018-01-19 22:36:24 -06:00
Scott Lahteine
f2ea8a0529 Merge pull request #9197 from p3p/pr_bf2_operation_freemem
[2.0.x] LPC1768: Free up some RAM
2018-01-19 22:35:45 -06:00
Scott Lahteine
5367a1f51f Merge pull request #9216 from benlye/update-gitignore
[2.0.x] Additional .gitignore entry for VS Code
2018-01-19 22:33:41 -06:00
Scott Lahteine
0c176c677e Merge pull request #9231 from GMagician/2.0.x-ramps-pins-fixup
[2.0.x] Expand RAMP case light possibilities
2018-01-19 22:29:32 -06:00
Scott Lahteine
f2d09f27bb Merge pull request #9246 from GMagician/2.0.x-bed-temp-limit-fix
[2.0.x] Standardized max temp values
2018-01-19 22:27:19 -06:00
Bob-the-Kuhn
16eb966ee3 PINS_DEBUGGING cleanup for DUE 2018-01-19 21:12:24 -06:00
Thomas Moore
63fd23ab1c Cleanup MKS-SBASE compile warnings 2018-01-19 15:46:34 -06:00
Bob-the-Kuhn
11e68541b0 Merge pull request #9245 from Bob-the-Kuhn/TMC2208-sanity-check-2.0.x
[2.0.x] add TMC2208 sanity check to AVR
2018-01-19 15:42:53 -06:00
Thomas Moore
429e6ba8a6 Fix lcd_preheat dummy variable types 2018-01-19 15:24:13 -06:00
GMagician
719cd53e09 Standardized max temp values
Everywhere in menu items temperatures are "defined value" subtracted by 15.
In one place is subtracted by 5
2018-01-19 19:32:46 +01:00
Bob-the-Kuhn
0ea9cdf4f2 TMC2208 sanity check 2018-01-19 12:19:34 -06:00
Roxy-3D
7c469c0712 Suggested change to fix Due compile problem 2018-01-18 23:00:03 -06:00
Roxy-3D
bfd9728cf4 Serial buffer over run work around for v2.0.0 (#9236)
* Work around for serial buffer over run

PronterFace sends a lot of M105 commands.  During long operations such
as UBL's G29 P1, G29 P2, G29 P4 and G26 this can over run the serial
buffer.   This results (very often) in a M1 (actually a M1M105) ending
up in the command queue.

Until we figure out a better way to resolve this issue, this will keep
the UBL commands from experiencing bogus commands at thier completion.
2018-01-18 19:57:18 -06:00
GMagician
c371bdc499 Expand RAMP case light possibilities
Pin 6 is only used by servos when 2 or more of them are used
2018-01-18 18:31:08 +01:00
blye
7c18c2ea5f Fix LCD timer string length 2018-01-17 21:10:45 +00:00
Roxy-3D
9d0cf02fef Correct mesh size calculations 2018-01-17 09:36:12 -06:00
Ben Lye
2af3541880 Additional .gitignore entry for VS Code
Add .vscode/launch.json to .gitignore
2018-01-17 14:28:53 +00:00
Scott Lahteine
c7bad74d8f Merge pull request #9202 from benlye/m73-bugfix
[2.0.x] Fix progress bar duration when time is exactly 86400s
2018-01-16 21:14:58 -06:00
Roxy-3D
af9b32e3b9 Give PronterFace time to print the UBL What information...
Give PronterFace time to print the UBL What information...
2018-01-16 18:00:57 -06:00
Roxy-3D
acb1e31374 Fix UBL Mesh Size regression 2018-01-16 17:58:15 -06:00
Roxy-3D
f5f1b069ad Convert UBL mesh tilting to all use the same algorithm (#9204)
A number of regressions were patched also. The UBL G29 P2 and P4 Press and Hold had stopped working. It is very possible this is broken in the bugfix_v1.1.x branch also.

The main purpose of the Pull Request is to get the 3-Point mesh tilting to use the LSF algorithm just like the grid based mesh tilt. This simplifies the logic and reduces the code size some what. But the real reason to do it is the 3-Point case can be solved exactly. And by feeding these numbers into the LSF algorithm it provides a way to check all that code for 'correctness'.
2018-01-16 11:08:00 -06:00
blye
554d849827 Fix duration when time is exactly 86400s 2018-01-16 08:12:00 +00:00
Christopher Pepper
6f1bf5d212 LPC1768: Config: default to SDSORT_LIMIT = 64 instead of 256 2018-01-15 22:02:21 +00:00
Christopher Pepper
1e65562d55 LPC1768: HAL: only initialise used HardwareSerial ports
Misc formatting
2018-01-15 22:00:59 +00:00
Roxy-3D
9dacd54a50 Get FT-i3-2020 configuration files into compliance with ?_BED_SIZE 2018-01-15 15:33:51 -06:00
Scott Lahteine
d178d6e921 M503 patch for EEPROM_CHITCHAT off
Fix #9155
2018-01-15 06:09:25 -06:00
Scott Lahteine
fa432508b0 Followup to Ender config 2018-01-15 06:00:21 -06:00
Scott Lahteine
72b7331f5f Merge pull request #8806 from fiveangle/bf-circleci_config
[2.0.x] Validate example configs with CircleCI
2018-01-15 05:26:30 -06:00
Thomas Moore
6856eccc77 Master-only TwoWire class for LPC1768 2018-01-15 05:22:03 -06:00
Scott Lahteine
d5bf9e74c4 Merge pull request #8996 from p3p/pr_bf2_more_adc_filter
[2.0.x] PID control fix and more LPC1768 ADC filtering
2018-01-15 05:14:25 -06:00
Scott Lahteine
4d2f277d43 Merge pull request #9189 from psavva/tmc_debug_compile_fix
[2.0.x] Fixes TMC_DEBUG compilation error
2018-01-15 04:52:21 -06:00
Scott Lahteine
43d3d024ac Update tmc_util.cpp 2018-01-15 04:51:59 -06:00
Panayiotis Savva
ad500b01e0 Fixes TMC compilation error 2018-01-15 12:43:22 +02:00
Scott Lahteine
f4e4c7a7c8 Merge pull request #9188 from thinkyhead/bf2_creality_ender
[2.0.x] Add Creality Ender config/board
2018-01-15 04:33:09 -06:00
Scott Lahteine
d743d96886 Merge pull request #9150 from Spawn32/bugfix-2.0.x
Bugfix 2.0.x New board and MCU for Marlin.
2018-01-15 03:51:00 -06:00
Scott Lahteine
2038722c52 LARGE_FLASH obsolete 2018-01-15 03:42:24 -06:00
Scott Lahteine
f887719a40 Creality Ender board support 2018-01-15 03:42:24 -06:00
Scott Lahteine
9a2dd0bc5a Creality Ender 2/4 configuration 2018-01-15 03:42:23 -06:00
Scott Lahteine
2c18faf3e4 General cleanups for HAL 2018-01-15 02:46:37 -06:00
Scott Lahteine
42933c804a Cleanups for STM32F7 2018-01-15 02:46:37 -06:00
Morten
a0246c5c96 Add support for STM32F7 MCU 2018-01-15 01:13:03 -06:00
Scott Lahteine
a27fa80a7e More featureful CR-10S configuration 2018-01-15 01:06:06 -06:00
Scott Lahteine
1a3d2ad275 Merge pull request #9168 from marvin-sinister/rename-M100-2.0.x
[2.0.x] Rename M200 pins file to uppercase
2018-01-15 00:49:06 -06:00
Scott Lahteine
a408209d24 More reliable temperature serial report? 2018-01-15 00:43:51 -06:00
Scott Lahteine
5f807e37c5 A second rename saves nine 2018-01-14 23:44:19 -06:00
Scott Lahteine
3ae41e5f7f Merge pull request #9152 from thinkyhead/bf2_anti_stutter
[2.0.x] Ensure smooth printer movements
2018-01-14 23:34:01 -06:00
Scott Lahteine
02ff12d491 More up front option to show SD percentage 2018-01-14 23:32:39 -06:00
Scott Lahteine
3b15c88225 Merge pull request #9153 from thinkyhead/bf2_malyan_support
[2.0.x] Fix support for Malyan M150
2018-01-14 22:54:00 -06:00
Scott Lahteine
e753d6298f FLSUN Kossel example configs 2018-01-14 22:52:35 -06:00
Scott Lahteine
77c2d810f9 Bring configs up to date 2018-01-14 22:52:06 -06:00
Scott Lahteine
3952070800 Link to marlinfw.org boot screen tool 2018-01-14 22:41:05 -06:00
Scott Lahteine
0cd397a3f8 Add instructions for Malyan M150 2018-01-14 21:15:03 -06:00
Scott Lahteine
344ebc3bd2 Create and use pins_MELZI_MALYAN.h for Malyan M150 2018-01-14 21:14:58 -06:00
Scott Lahteine
094e9b1dab Remove ARDUINO_ARCH_SAM from serial.h too? 2018-01-14 21:07:10 -06:00
Scott Lahteine
c37d38886c Fix serial.h avr block
Followup to #8148
2018-01-14 21:07:10 -06:00
Scott Lahteine
4f5e087ff4 Planner anti-stutter by Sebastian Popp 2018-01-14 21:07:10 -06:00
Scott Lahteine
ac368f2788 Add STEPPER_ISR_ENABLED() to HALs
Some also get a `HAL_timer_interrupt_enabled` function.
2018-01-14 21:07:10 -06:00
Scott Lahteine
5578dccaa0 Merge pull request #9161 from tcm0116/2.0.x-eeprom
[2.0.x] Fix EEPROM SettingsData for 32-bit architectures
2018-01-14 20:50:37 -06:00
Scott Lahteine
6ba8cf8405 Merge pull request #9163 from GMagician/2.0.x-SD-issues-fix
[2.0.x] sd issue fix
2018-01-14 20:48:52 -06:00
Marvin Sinister
50c55b25f7 Renamed to upercase 2018-01-13 15:02:07 +01:00
GMagician
6667a916a4 Indentation fix 2018-01-13 09:48:26 +01:00
GMagician
be717b3c07 Save some program memory
This will save some program memory with no speed lose
2018-01-13 08:56:51 +01:00
GMagician
f37c64ee5b Fix unsupported CMD59
It seems that some SD cards don't support CRC_ON_OFF command. This fix will permit to use also these cards but leaving CRC check active on the system
2018-01-13 08:53:12 +01:00
Thomas Moore
cfd989d7c5 Fix EEPROM SettingsData for 32-bit architectures 2018-01-12 19:38:23 -06:00
Bob-the-Kuhn
da600e5fbe Merge pull request #9132 from Bob-the-Kuhn/add-VIKI2-to-Travis
[2.0.x] add VIKI2 test to Travis & fix LCD contrast (again)
2018-01-12 00:42:04 -06:00
Scott Lahteine
742cff5f3c Followup to #9141 2018-01-11 22:15:01 -06:00
Thomas Moore
84de428d30 [2.0.x] Fix compile errors (#9141)
* Update persistent_store_impl.cpp
* Remove define BYTE from serial functions since Arduino docs typically show 0 for the normal case.
2018-01-11 21:43:26 -06:00
Bob-the-Kuhn
e633ce06c7 LCD contrast type mismatch is back
WORKS!
2018-01-11 10:32:58 -06:00
Scott Lahteine
e654ea1e1a Merge pull request #9130 from thinkyhead/bf2_tmc_followup
[2.0.x] More TMC followup
2018-01-11 03:40:45 -06:00
Scott Lahteine
06eb46b1d4 Merge pull request #9144 from thinkyhead/bf2_Creality_CR-10S
[2.0.x] Creality CR-10S configurations
2018-01-11 01:33:52 -06:00
Scott Lahteine
8ac246162e Creality CR-10S configurations
Provided by printedsolid.com
2018-01-11 01:10:17 -06:00
Scott Lahteine
048486390e Bring some configs up to date 2018-01-11 01:10:17 -06:00
Scott Lahteine
6a043eee55 Various updates for TMC support 2018-01-10 23:04:48 -06:00
Scott Lahteine
2c2cf5e856 Use dev version of platformio 2018-01-10 23:04:48 -06:00
Scott Lahteine
d7fd78cb91 Merge pull request #8148 from tcm0116/2.0.x-multi_host
[2.0.x] Add multi-host support
2018-01-10 02:38:59 -06:00
teemuatlut
a8c446c3bc [2.0.x]DUE: Fix includes for SDSUPPORT (#9112) 2018-01-10 00:46:34 -06:00
Thomas Moore
f7efac57b7 Multi-host support 2018-01-10 00:14:47 -06:00
Thomas Moore
dabb75034c Update example configurations 2018-01-10 00:01:20 -06:00
Scott Lahteine
cf654b9a1a Merge pull request #9131 from Bob-the-Kuhn/LPC-formatted-prints
[2.0.x] LPC1768 formatted print statements
2018-01-09 23:44:10 -06:00
Bob-the-Kuhn
6a50adb4d5 works 2018-01-09 22:15:33 -06:00
Scott Lahteine
5c076a6d93 Improved M915 description 2018-01-09 18:56:27 -06:00
Scott Lahteine
a94104dbb5 Merge pull request #9113 from teemuatlut/TMC_followup
[2.0.x]TMC followup
2018-01-09 18:46:35 -06:00
Dave Johnson
554e577676 SERIAL_STATS_* features not supported on USBCON targets (#9127) 2018-01-09 18:42:55 -06:00
Dave Johnson
2db666e99a Enable USE_ZMIN_PLUG on SCARA example (#9126) 2018-01-09 18:41:28 -06:00
Scott Lahteine
7e000e6af4 More EEPROM field debugging (#9123) 2018-01-09 18:33:44 -06:00
Ivan Kravets
6c0fae15f8 Update cached @PlatformIO packages (#9124)
11 line caches PIO packages (toolchains, libs) which is very good! This PR will force PIO to find updates for installed libs and packages.
2018-01-09 18:32:22 -06:00
Ivan Kravets
a994eec513 Cleanup unused options (#9115) 2018-01-09 18:25:16 -06:00
GMagician
3a99dc7c5c 2.0.x Fix compiler warning (#9116)
Fix duplicate language define warning
2018-01-09 16:54:41 -06:00
GMagician
5295b4713d [2.0.x] add semitec 104NT-4 (#9119)
Table is very very similar to old 104-GT2 so I added only the name and recycled old ID
2018-01-09 16:53:12 -06:00
teemuatlut
cdc61ebf53 Add M915 configuration option 2018-01-09 18:28:48 +02:00
teemuatlut
9d923c6c03 Fix TMC gcode commands 2018-01-08 18:45:05 +02:00
Scott Lahteine
99516572b1 Fix TMC current read from EEPROM 2018-01-07 20:48:46 -06:00
Tannoo
f26805e862 [2.0.x] UBL Mesh Storage Message (#9095) 2018-01-07 20:33:53 -06:00
Scott Lahteine
e180b7a460 Merge pull request #9087 from thinkyhead/bf2_mbl_localize
[2.0.x] MBL cleanup, has_mesh() method
2018-01-07 20:10:22 -06:00
Christopher Pepper
14dcad6bbc LPC1768: Increase ADC median filter from 3 values to 23
Clarify the HAL_adc_get_result method to make sure correct values enter the filters

HAL: Fix the PID control loop for non-AVR platforms
2018-01-07 22:15:20 +00:00
Scott Lahteine
60d07f20e7 Make mbl.has_mesh() a method 2018-01-07 00:13:36 -06:00
Scott Lahteine
86818c9a89 Move MBL functions into the class 2018-01-07 00:13:36 -06:00
Scott Lahteine
95065791b3 Merge pull request #9086 from fiveangle/bf2-hasmesh_on_g29s3
[2.0.x] Set has_mesh if user issues G9 S3 with MBL
2018-01-06 23:27:53 -06:00
Unknown
bbb8d4c802 Set has_mesh if user issues G9 S3
Prevents user from having to manually run through entire manual leveling process only to enable mesh so they can manually restore their offline mesh backup
2018-01-06 21:07:07 -08:00
Scott Lahteine
2b5a9be49c Fix M503 skew output
Followup to 19e75ccf86
2018-01-06 20:55:57 -06:00
Bob-the-Kuhn
082d161a75 Merge pull request #9069 from Bob-the-Kuhn/broken-teensy
[2.0.x] fix Teensy2 compile error (PlatformIO LDF problem)
2018-01-06 16:42:59 -06:00
Scott Lahteine
cf2922f164 Laser/spindle PWM off on M5 2018-01-06 15:29:22 -06:00
Scott Lahteine
cf3fd21234 Merge pull request #9077 from GMagician/2.0.x-bmp-fix
[2.0.x] Clockwise bmp fix
2018-01-06 13:53:48 -06:00
GMagician
5fb6dd1424 Bmp fix
Clockwise arrow fixed
2018-01-06 19:02:36 +01:00
Bob-the-Kuhn
760dbbb734 works
root cause identified
2018-01-06 11:11:29 -06:00
Bob-the-Kuhn
cb0e826c5d Merge pull request #9068 from Bob-the-Kuhn/SD-detect
[2.0.x] SD card detect improvement
2018-01-05 21:09:57 -06:00
Bob-the-Kuhn
f72b0a7b04 1234 2018-01-05 20:36:05 -06:00
Scott Lahteine
702c8acdd5 Settings FIELD_TEST fix 2018-01-05 19:13:30 -06:00
Scott Lahteine
013c911a82 Merge pull request #9056 from thinkyhead/bf2_new_eeprom_powers
[2.0.x] New EEPROM powers
2018-01-05 18:19:35 -06:00
Scott Lahteine
e89f1453ab UBL G29 works without settings.load() 2018-01-05 15:48:34 -06:00
Scott Lahteine
950be70a33 Add FIELD_TEST to validate storage 2018-01-05 15:48:34 -06:00
Scott Lahteine
760c912ab9 Add data size validation 2018-01-05 15:48:34 -06:00
Scott Lahteine
b91ca168fb Add a struct defining EEPROM storage 2018-01-05 15:48:34 -06:00
Scott Lahteine
51e0f2bee3 Add MarlinSettings::validate() 2018-01-05 14:35:24 -06:00
Scott Lahteine
878f54c27b Write filler with NO_VOLUMETRICS 2018-01-05 10:29:49 -06:00
Scott Lahteine
3ea6745b36 Pretty up TMC current write 2018-01-05 10:29:49 -06:00
Scott Lahteine
3319765034 Detab some HAL files 2018-01-05 10:28:17 -06:00
Scott Lahteine
1c41de16d4 Trailing whitespace clean 2018-01-05 10:11:31 -06:00
Scott Lahteine
1746a7352e Merge pull request #9042 from thinkyhead/bf2_M701_M702
[2.0.x] Improved Pause/Load/Unload, M701-M702
2018-01-04 19:41:58 -06:00
Scott Lahteine
048d8a0158 CheapTRONIC v2.0 additions/revisions
Based on #9030
2018-01-04 18:00:25 -06:00
Roxy-3D
3a4e107b6b use SERIAL_EOL(); instead of new line string 2018-01-04 16:20:18 -06:00
Roxy-3D
a5dfe08a81 Add precision to planner.xy_skew_factor so it doesn't print as 0.00 2018-01-04 16:14:09 -06:00
Roxy-3D
19e75ccf86 Add enough precision so planner.xy_skew_factor doesn't print as 0.00 2018-01-04 16:02:22 -06:00
Scott Lahteine
4fb60e1562 M702.cpp => M701_M702.cpp 2018-01-04 15:07:37 -06:00
Scott Lahteine
7541316bb4 Add M701/M702 Filament Load/Unload, M603 2018-01-04 15:07:37 -06:00
Scott Lahteine
81211da7b4 M701 / M702 language changes 2018-01-04 05:05:28 -06:00
Scott Lahteine
8704e533da Apply FILAMENT_LOAD_UNLOAD_GCODES to example configs 2018-01-04 03:56:36 -06:00
Scott Lahteine
455592eee8 Improvements to LCD menu macros 2018-01-04 03:56:36 -06:00
Scott Lahteine
a80f2eea23 Group leveling reports for folding 2018-01-04 03:56:36 -06:00
Scott Lahteine
190cd0a111 Nozzle park args 2018-01-04 03:56:36 -06:00
revilor
0e93506985 Fix for issue #9005, #8942 - Bed PID autotuning (#9036) 2018-01-04 03:26:14 -06:00
Bob-the-Kuhn
016e46a3c0 Merge pull request #9009 from Bob-the-Kuhn/Due-RRDFG-power-up-garbage
[2.0.x] Due - fix power up garbage on RRDFG LCD
2018-01-03 23:19:29 -06:00
studiodyne
31582caa07 2.0 Fix for bad Pause extruder position resuming (#9029) 2018-01-03 23:18:27 -06:00
Scott Lahteine
41246b45f1 Merge pull request #9040 from thinkyhead/bf2_m303_bughunt
[2.0.x] M303 pid autotune cleanup, comment
2018-01-03 23:17:59 -06:00
Bob-the-Kuhn
4626d04067 as good as i can get it
minor edits to force new Travis test (last one timed out)

Update u8g_com_HAL_DUE_st7920_sw_spi.cpp

initial power up display garbage gone
2018-01-03 22:46:31 -06:00
Scott Lahteine
4af3d436b2 M303 pid autotune cleanup, commentary 2018-01-03 21:30:45 -06:00
Bob-the-Kuhn
f968b41f63 Merge pull request #9028 from Bob-the-Kuhn/Due-SDSUPPORT
[2.0.x] Due - allow compile without SD card enabled & misc improvements (replaces PR #9007)
2018-01-03 15:25:40 -06:00
Bob-the-Kuhn
e5b71af8c9 snapshot
found a few more nasties
2018-01-03 10:41:23 -06:00
Scott Lahteine
724e3f33bc Merge pull request #9001 from Tannoo/(2.0.x)_LCD_EEPROM_init_fix
[2.0.x] EEPROM init fix
2018-01-03 05:47:01 -06:00
revilor
959a2d2527 Add beginTransaction to HAL SPI (#9019) 2018-01-03 05:12:25 -06:00
Tannoo
e43f3ac989 EEPROM init fix 2018-01-03 04:31:01 -06:00
Scott Lahteine
fc67c64b8f Merge pull request #8989 from tcm0116/2.0.x_ubl
[2.0.x] Fix UBL compilation warnings
2018-01-02 21:38:45 -06:00
Thomas Moore
8afc4f8d9d Fix UBL compilation warnings 2018-01-02 21:00:06 -06:00
Bob-the-Kuhn
eca5cc8669 Merge pull request #9003 from Bob-the-Kuhn/Due-PINS_DEBUG-&-related
[2.0.x] add Due PINS_DEBUG support & misc improvements (replaces PR #8990)
2018-01-02 18:47:53 -06:00
Bob-the-Kuhn
e9fc7bc69c Merge pull request #9000 from Bob-the-Kuhn/2.0-LCD-contrast
[2.0.x] lcd_contrast type mismatch work around
2018-01-02 18:46:31 -06:00
Bob-the-Kuhn
448b0a0014 Merge pull request #9004 from Bob-the-Kuhn/PWM-for-any-pin-(LPC1768)
[2.0.x] LPC1768 - PWM for any pin (replaces PR #8991)
2018-01-02 11:42:27 -06:00
Bob-the-Kuhn
5574fad69c copy of PR #8991 code
Formatting tweaks

correct array initialization & remove test code
2018-01-02 11:17:46 -06:00
Scott Lahteine
d190c702de Add MKS_BASE Microstepping pins
Based on #9008
2018-01-01 18:49:21 -06:00
Scott Lahteine
5e01ee8adf Temperature updates for parity with 1.1.x 2018-01-01 18:29:08 -06:00
Bob-the-Kuhn
adb9ecf3cc copy of PR #8990 2018-01-01 16:11:56 -06:00
Roxy-3D
39e5fabfa9 Z BabyStepping should not be dependent on a bed leveling system being active 2018-01-01 14:46:50 -06:00
Bob-the-Kuhn
ef911a2d12 works 2018-01-01 14:35:16 -06:00
Scott Lahteine
d80c4f1a6e Fix typo in delta call to buffer_line
Fix #8901
2017-12-31 01:40:07 -06:00
Scott Lahteine
9312ee63b0 Merge pull request #8979 from thinkyhead/bf2_sync_up_configs
[2.0.x] Synchronize configs with 1.1.x
2017-12-31 01:15:43 -06:00
Scott Lahteine
41dfb229ec Merge pull request #8978 from thinkyhead/bf2_slimming_option
[2.0.x] SLIM_LCD_MENUS option
2017-12-31 00:56:29 -06:00
Scott Lahteine
3dd04736c0 Update M17_M18_M84.cpp 2017-12-31 00:26:45 -06:00
Scott Lahteine
2929c9e56f A specific option to SLIM_LCD_MENUS 2017-12-31 00:11:22 -06:00
Scott Lahteine
10edb469bb Apply SLIM_LCD_MENUS to example configs 2017-12-31 00:11:21 -06:00
Scott Lahteine
5294fd132f Merge pull request #8924 from ejtagle/bugfix-2.0.x
[2.0.x] Improve SW SPI for DUE a bit more
2017-12-30 23:32:46 -06:00
Scott Lahteine
0b4a46fa6c Bring configs up to date with 1.1.x 2017-12-30 23:28:53 -06:00
Scott Lahteine
7cc2193bce Add Tronxy X1 example config (#8972) 2017-12-30 17:25:31 -06:00
etagle
729a9f55fc Improved Sw SPI on DUE HAL a bit more.
Now the USB MSD can transfer at 750k/s. Previously, it was 500k/s. I think this is the maximum achievable speed using Sw SPI.
2017-12-30 17:24:38 -06:00
Scott Lahteine
2b1e6829b3 Merge pull request #8966 from thinkyhead/bf2_better_no_reentry
[2.0.x] ultralcd.cpp: Better no_reentry, use in queuing G-code
2017-12-30 16:33:24 -06:00
Scott Lahteine
615146c069 Enqueue commands better in ultralcd.cpp 2017-12-30 04:44:59 -06:00
Scott Lahteine
9686ffedef Single pause flag also indicates SD print pause 2017-12-30 04:44:59 -06:00
Scott Lahteine
6d94bbf618 Apply some PGM_P pointers 2017-12-30 04:03:17 -06:00
Bob-the-Kuhn
9bfabc1f13 Merge pull request #8955 from Bob-the-Kuhn/bugfix-2.0.x
[2.0.x] fix include in pins_RAMPS_FD_V2.h
2017-12-29 10:35:23 -06:00
Bob-the-Kuhn
cba44128d5 fix include 2017-12-29 10:08:30 -06:00
Scott Lahteine
427df8792d Fix Capabilities Report 2017-12-28 21:08:59 -06:00
Scott Lahteine
8274369522 Merge pull request #8945 from thinkyhead/bf2_better_char_lcd
[2.0.x] Display up to 3 extruders on char LCD
2017-12-28 20:48:14 -06:00
Scott Lahteine
2526ac6500 Display up to 3 extruders on char LCD
…and show bed level indicator at the position of the [H] icon, when a heated bed exists.
2017-12-28 20:17:42 -06:00
Scott Lahteine
db32c185ae Merge pull request #8860 from Bob-the-Kuhn/2.0.x-DUE-RRDFGSC
[2.0.x] DUE - update for Reprap Discount Full Graphic Smart Controller
2017-12-27 05:06:49 -06:00
Scott Lahteine
f8156d2d2c Merge pull request #8913 from thinkyhead/bf2_multitool_M600
[2.0.x] Multi extruder support for M600 / LCD
2017-12-27 04:40:50 -06:00
Scott Lahteine
9ecdd1f4c7 Multi extruder support for M600 and LCD 2017-12-27 04:33:25 -06:00
Scott Lahteine
a1ce6e8ff4 Clear lcd_clicked immediately on use 2017-12-26 22:26:04 -06:00
Scott Lahteine
5effe1590c Fix NO_VOLUMETRICS bug 2017-12-26 20:04:44 -06:00
Scott Lahteine
fb6966f2b5 Merge pull request #8912 from thinkyhead/bf2_no_vol_fix
[2.0.x] No sub-menu if NO_VOLUMETRICS
2017-12-26 18:46:39 -06:00
Scott Lahteine
f163eede78 No sub-menu if NO_VOLUMETRICS
For parity with #8911
2017-12-26 18:28:42 -06:00
Scott Lahteine
2c4e03d2cf Indentation of a SW SPI file 2017-12-25 09:34:43 -06:00
Scott Lahteine
1a827d5b68 Opening brace tweaks 2017-12-25 09:34:43 -06:00
Bob-the-Kuhn
a142fab155 Enable RRDFGSC on Due 2017-12-25 09:22:14 -06:00
Scott Lahteine
b259bb4670 Fix tmc_util global vars 2017-12-25 09:05:31 -06:00
Scott Lahteine
4ef965cc40 Fix compiler warnings 2017-12-25 08:53:01 -06:00
Scott Lahteine
95b82ae5e3 Merge pull request #8893 from thinkyhead/bf2_action_on_action
[2.0.x] Fixes for G29, esp. 3POINT
2017-12-25 08:45:53 -06:00
Scott Lahteine
9e8008c49c Fixes for G29, esp. 3POINT 2017-12-25 08:37:27 -06:00
Scott Lahteine
026e301307 lcd_map_control deps on ULTIPANEL 2017-12-25 07:46:25 -06:00
Scott Lahteine
68438b0d4e Merge pull request #8889 from thinkyhead/bf2_action_on_action
[2.0.x] //Actions on Pause / Resume (M600, M125, etc.)
2017-12-25 07:30:24 -06:00
Scott Lahteine
f2731c9f93 Allow consecutive uses of G29 2017-12-25 06:32:33 -06:00
Scott Lahteine
4b49ea1e92 General cleanup of config-store, reset_bed_level 2017-12-25 05:16:01 -06:00
Scott Lahteine
2925852244 Fix GT2560 A+ servo pin 2017-12-25 02:18:56 -06:00
Scott Lahteine
c6354fa153 Tweak M125 code 2017-12-25 01:39:55 -06:00
Scott Lahteine
3b51f5c67e Add pause/resume action to example configs 2017-12-25 01:39:18 -06:00
Scott Lahteine
f704f405af Add pause/resume actions on M600, M125 2017-12-25 01:39:18 -06:00
Thomas Moore
f0a8a1a853 [2.0.x] Use NOZZLE_PARK_FEATURE for ADVANCED_PAUSE_FEATURE (#8866)
* Use NOZZLE_PARK_FEATURE for ADVANCED_PAUSE_FEATURE
2017-12-25 01:38:06 -06:00
Scott Lahteine
705ea98fd3 Comment return false in motion functions 2017-12-24 22:57:15 -06:00
Scott Lahteine
f218eb0ddf Merge pull request #8887 from thinkyhead/bf2_reduce_jerk_default
[2.0.x] Reduce default jerk. XY by half. Z by 1/4
2017-12-24 21:48:35 -06:00
Scott Lahteine
50366b00d5 Tweak cleaning buffer / SD finished command 2017-12-24 20:35:05 -06:00
Scott Lahteine
28fc8741d6 Reduce default jerk. XY by half. Z by 1/4 2017-12-24 19:54:11 -06:00
Scott Lahteine
723da1d7a5 Merge pull request #8872 from Bob-the-Kuhn/2.0.x-deglitch
[2.0.x] remove SET_OUTPUT glitch - LPC1768 & DUE
2017-12-24 19:39:00 -06:00
Bob-the-Kuhn
1a948cbd93 Fix SET_OUTPUT glitch - LPC1768 & DUE 2017-12-24 19:25:32 -06:00
Scott Lahteine
869c89d83f Merge pull request #8865 from thinkyhead/bf2_more_scara_scaling
[2.0.x] SCARA Feedrate Scaling for G2/G3 - using HYPOT
2017-12-24 19:18:13 -06:00
Scott Lahteine
737561c1b3 Merge pull request #8876 from subdancer/bugfix-2.0.x
[2.0.x] RADDS LCD Display
2017-12-24 19:17:14 -06:00
Scott Lahteine
1cf1cf8759 Add RADDS_DISPLAY to example configs 2017-12-24 19:00:23 -06:00
Even
ea1a8d1223 add original RADDS LCD + Controller
adds setup for the original Radds Display+Controller+SD Card Reader PCB
http://doku.radds.org/dokumentation/lcd-display/
2017-12-24 19:00:23 -06:00
Scott Lahteine
4a8fd8ae92 Merge pull request #8853 from ejtagle/bugfix-2.0.x
USB Mass Storage Implementation / CDC with HW flow control and misc fixes and improvements for Arduino DUE/RE-ARM based boards
2017-12-24 18:50:28 -06:00
Scott Lahteine
2d75b540e2 Merge pull request #8867 from tcm0116/2.0.x_pio_errors
[2.0.x][PlatformIO] Stop compiling after first five errors
2017-12-24 18:49:43 -06:00
Scott Lahteine
aa97cd6e9b Merge pull request #8871 from petrzjunior/bugfix-2.0.x
[2.0.x][Language] Update Czech for Dec 2017
2017-12-24 18:48:59 -06:00
Scott Lahteine
2b0165e90c Merge pull request #8878 from tcm0116/2.0.x_revert
[2.0.x] Revert "Followup to #8698"
2017-12-24 18:46:02 -06:00
Thomas Moore
2917d1217d Revert "Followup to #8698"
This reverts commit 4e891e9fb7.
2017-12-23 17:00:33 -06:00
Petr Zahradník
69a51a426c Update Czech language Dec 2017 2017-12-22 19:35:09 +01:00
Thomas Moore
45e73b72a5 Stop compiling after first five errors 2017-12-21 22:44:56 -06:00
Scott Lahteine
caa5093498 General DELTA_IK macro 2017-12-21 22:41:57 -06:00
Scott Lahteine
c694608450 Apply SCARA_FEEDRATE_SCALING to G2/G3 2017-12-21 22:33:27 -06:00
Scott Lahteine
ca145643bd Merge pull request #8863 from thinkyhead/bf2_restore_position_float
[2.0.x] Restore position_float to LIN_ADVANCE
2017-12-21 17:12:28 -06:00
Scott Lahteine
97d509d4d2 Revert "Improved Core-compatible jerk code"
Reverting commit 3cd7659
2017-12-21 16:54:30 -06:00
Scott Lahteine
5bc2acc072 Restore position_float to fix LIN_ADVANCE 2017-12-21 16:45:46 -06:00
etagle
33a6fc70e4 Adding USB MSD implementation to the HAL: Now, when you plug the Native USB port of the Arduino DUE to your PC, it will be detected as a composite USB device: One of the devices is a USB CDC (Serial port over USB) with native USB handshake (no more overflows!!) (set SERIAL_PORT to -1 to use it as main serial port) and also, a MSD (USB Mass Storage Device) will be detected, and the SD card present on the socket will be reflected as a Removable disk on your PC) 2017-12-21 02:42:46 -03:00
etagle
d8a4db72ac Reimplemented SW SPI for DUE in assembler. This allows to reach 12Mhz as SPI Clock and improves 4x the transfer speed to the SD card. This is REQUIRED so access to SD from USB is usable (allows 600Kbytes/second transfer speeds) 2017-12-21 02:35:49 -03:00
etagle
99b2fc2066 Adjusted timings on the ST7290 u8glib so RE-ARM and RAMPS4DUE have no problems when writing to the graphics LCD. This fixes Issue #8787 - Special thanks to Bergerac56 for testinf this out !!! 2017-12-21 02:33:22 -03:00
etagle
498ea7512a Exposed SDCard interface to the public, to USB MSD is able to read/write sectors on the SD card 2017-12-21 02:30:18 -03:00
etagle
9aff55ed1f Backported latest improvements and fixes from the SdFat liibrary to our own version. This includes support for CRC7 validation on commands and also, made sure that even if using software SPI implementations, SD card speed is properly adjusted when transitioning from INITIALIZATION to DATA TRANSFER mode. ALL HALs implement spiInit, even in SW SPI mode, and we NEED this change to improve 25x the transfer speed of the SD card and allow implementations of USB MSD 2017-12-21 02:29:00 -03:00
etagle
7447979110 Fixed some warnings on the MakerParts configuration, when compiling using the AVR toolchain (integer overflow on the preprocessor calculations) 2017-12-21 02:23:24 -03:00
etagle
b6f9c333d4 Adding hooks into the idle loop so HALs can execute 2nd plane tasks, such as serving SD card read/writes requested from the USB MSD layer 2017-12-21 02:22:08 -03:00
victorpv
2ec4113cb2 Changes to STM32F1 HAL (#8833)
Some to correct missing files from previous PR to completely avoid
HardwareTimer Class (reduce overhead). Some changes to formatting.
Changes to DMA ADC to work correctly.
Change to F1 sanity check.
2017-12-20 16:16:36 -06:00
Scott Lahteine
913d9e9a59 Matching sign across filwidth vars 2017-12-20 00:17:19 -06:00
Scott Lahteine
3cde4c78b2 Use wildcard *.cpp in Makefile
Based on #8738
Addressing #8731
2017-12-19 23:44:46 -06:00
Scott Lahteine
63cc34f632 Merge pull request #8846 from thinkyhead/bf2_no_volumetrics
[2.0.x] One setting to validate filament width
2017-12-19 23:31:23 -06:00
Scott Lahteine
fdc5e72720 A single setting to validate filament width 2017-12-19 21:33:25 -06:00
Scott Lahteine
5a0f9605e3 Merge pull request #8842 from thinkyhead/bf2_no_volumetrics
[2.0.x] Add option for NO_VOLUMETRICS
2017-12-19 21:14:35 -06:00
Scott Lahteine
93a6a4e1a8 Add VOLUMETRIC capability item 2017-12-19 20:11:23 -06:00
Scott Lahteine
af1d6acb7e Travis test NO_VOLUMETRICS 2017-12-19 20:07:53 -06:00
Scott Lahteine
933f76fda3 Option to disable all volumetric extrusion 2017-12-19 19:51:25 -06:00
Scott Lahteine
31e33d2acd Add NO_VOLUMETRICS to example configs 2017-12-19 19:51:25 -06:00
Scott Lahteine
fc9ee1a4de Fix up serial sanity check 2017-12-19 19:11:43 -06:00
Scott Lahteine
de5ca96654 More parity with 1.1.x, plus whitespace 2017-12-19 18:36:16 -06:00
Scott Lahteine
a891d8d738 Merge pull request #8820 from thinkyhead/bf2_mks_sbase_spi
[2.0.x] Fix SDSUPPORT for MKS SBASE
2017-12-17 21:15:49 -06:00
Scott Lahteine
029333a8eb Merge pull request #8819 from thinkyhead/bf2_reverting_XXXX
[2.0.x] Revert "Initial step correction"
2017-12-17 20:59:41 -06:00
Scott Lahteine
097a26007f Fix SDSUPPORT for MKS SBASE
Fix supplied by @cjsoong in https://github.com/MarlinFirmware/Marlin/issues/8750#issuecomment-350779983
2017-12-17 03:05:33 -06:00
Scott Lahteine
8df5955da4 Revert "Reset timer count before first block step"
This reverts commit 5cf6a062e3.
2017-12-17 02:37:35 -06:00
Scott Lahteine
957bbab57f Update inc files for parity with 1.1.x 2017-12-16 20:20:06 -06:00
Scott Lahteine
f79026acc1 Apply MKS_12864OLED_SSD1306 to examples
Followup to #8814
2017-12-16 20:15:36 -06:00
Unknown
502258aa5f Validate example configs with CircleCI
Runs in parallel to TravisCI and runs *much* faster on same jobs.  Finishes all examples configs in <8 min on cache hit; <10 min on cache miss.  Cache miss is triggered on platformio.ini change. I'd suggest move to it entirely, but it is limited to just 1500 min of runtime per month and it isn't clear yet how much Marlin would need so suggest we implement in parallel like this, then observe.  If the example builds don't catch issues, and 1500 min turns out to be plenty, we can switch to implimenting standard arsenal of tests in CircleCI and ditch TravisCI to gain speed improvement (although I do like seeing the varied Travis avatars staring at me ;).

I agree that hand-crafted tests would be better, but until we have that, this can't hurt.

After merging, you'll need to add Marlin project to CircleCI at: https://circleci.com
Example results at: https://github.com/fiveangle/Marlin/commits/bf-circleci_config
2017-12-16 19:32:50 -06:00
Dan Delaney
b055d8c39c [2.0.x] Adding support for using the MKS_12864OLED with the SSD1306 controller (#8814)
* Adding support for using the MKS_12864OLED with the SSD1306 controller

* Update comment for correct controller type
2017-12-16 18:47:04 -06:00
Scott Lahteine
2690ce7a96 Fix use_example_configs to handle spaces in path 2017-12-16 17:29:35 -06:00
Scott Lahteine
1de7c75590 Merge pull request #8799 from thinkyhead/bf2_zonestar_tronxy
[2.0.x] Support for Tronxy and Zonestar LCD
2017-12-15 19:55:36 -06:00
Scott Lahteine
15d05748df Adding support for the Tronxy and Zonestar LCD 2017-12-15 19:13:52 -06:00
Scott Lahteine
9abbcc3ee0 Apply ZONESTAR_LCD to example configs 2017-12-15 19:11:02 -06:00
Scott Lahteine
20008b72a8 Merge pull request #8784 from fiveangle/bf2-travis_examples_squashed
[2.0.x] Fix example configs and add to TravisCI tests - squashed
2017-12-15 17:34:34 -06:00
Dave Johnson
aed0cfa3d1 Various fixes for 2.0.x configs 2017-12-15 17:09:46 -06:00
Scott Lahteine
f9aa1daa0d Merge pull request #8793 from robpower/NanoDLP_Sync_improvement_2
[2.0.x] V2 Extended NanoDLP_Z_Move_Sync to G4 & G28,Added all axis option.
2017-12-15 16:42:29 -06:00
Scott Lahteine
674deaf223 Add NANODLP_ALL_AXIS to config examples 2017-12-15 16:22:56 -06:00
robpower
5595098063 V2 Extended NanoDLP_Z_Move_Sync to G4 & G28,Added all axis option. 2017-12-15 16:22:55 -06:00
Scott Lahteine
2b7db90340 Bring Malyan M200 config up to date 2017-12-15 15:47:22 -06:00
Scott Lahteine
8b12371e45 Change some hex case 2017-12-15 15:47:22 -06:00
Scott Lahteine
4782acf60e Merge pull request #8780 from fiveangle/bf2-typo
[2.0.x] typo in Marlin.cpp
2017-12-15 15:25:41 -06:00
teemuatlut
0cd1e91056 [2.0.x] TMC driver update (#8769) 2017-12-15 15:03:14 -06:00
Scott Lahteine
09d13f186f Correct unskew, after all 2017-12-15 14:24:20 -06:00
Scott Lahteine
c5632bb91b Merge pull request #8792 from fiveangle/bf2-HAS_HEAT_BED_conditional
[2.0.x] Missing HAS_HEAT_BED conditional
2017-12-15 14:18:48 -06:00
Dave Johnson
0d531d9655 Missing HAS_HEAT_BED conditional
Fixes issue found in #8779
2017-12-15 11:33:37 -08:00
Dave Johnson
69efb87d19 typo in Marlin.cpp 2017-12-14 08:20:45 -08:00
Scott Lahteine
368c124de8 Fix Planner::unskew parity with skew 2017-12-13 17:46:48 -06:00
Scott Lahteine
21a7b4f26d Merge pull request #8773 from thinkyhead/bf2_filwidth_refinement
[2.0.x] Comment, fix filament width sensor
2017-12-13 16:26:11 -06:00
Scott Lahteine
cf2193c07f Comment, fix filament width sensor 2017-12-13 02:32:34 -06:00
Scott Lahteine
a641992c1d Merge pull request #8762 from victorpv/patch-2
[2.0.x] STM32F1 HAL: Fix issue #8585. Updates to readme.
2017-12-12 18:28:18 -06:00
Eduardo José Tagle
ac168a03c8 Fixes for the Arduino DUE HAL (Serial Port, Graphics Display, EEPROM emulation) (#8651)
* Fixing the DUE serial port assignments: Now -1 means the SAM3x USB Device emulating a serial port, and 0 means the USB to serial adapter included as a programming port

* Improving the Fast IO port access implementation on Arduino DUE

* Implemented EEPROM emulation on Due by storing data on the internal FLASH (with wear leveling)

* Implemented a Software SPI for the ST7920 graphics display for the Arduino RAMPS for DUE, as the default one in u8glib is clocking data too fast on ARM, and the display does not understand it.

* Fixing the case where the serial port selected is the USB device

* Adding configuration for the Makerparts 3D printer (www.makerparts.net)

* Tuned MakerParts acceleration on X and Y axis so it never loses steps. Also adjusted pulses per mm to match default hw configuration

* Fine tuned Maximum acceleration for MakerParts printer

* Style cleanup

* Style cleanup (2)

* Style fixes (3)

* Fixing the DUE serial port assignments: Now -1 means the SAM3x USB Device emulating a serial port, and 0 means the USB to serial adapter included as a programming port

* Improving the Fast IO port access implementation on Arduino DUE

* Implemented EEPROM emulation on Due by storing data on the internal FLASH (with wear leveling)

* Implemented a Software SPI for the ST7920 graphics display for the Arduino RAMPS for DUE, as the default one in u8glib is clocking data too fast on ARM, and the display does not understand it.

* Fixing the case where the serial port selected is the USB device

* Adding configuration for the Makerparts 3D printer (www.makerparts.net)

* Tuned MakerParts acceleration on X and Y axis so it never loses steps. Also adjusted pulses per mm to match default hw configuration

* Fine tuned Maximum acceleration for MakerParts printer

* Style cleanup

* Style changes to u8g_dev_st7920_128_64_sw_spi.cpp

* Even more improvements to the FastIO HAL for DUE. Now WRITE() is 2 ASM instructions, if value is constant, and 5 cycles if value is not constant. Previously, it was 7..8 cycles

* After some problems and debugging, seems we need to align the interrupt vector table to 256 bytes, otherwise, the program sometimes stops working

* Moved comments out of macro, otherwise, token pasting does not properly work sometimes

* Improved Software SPI implementation on DUE: Now it honors the selected speed passed to spiInit(). This allows much faster SDCARD access, improving SDCARD menus and reducing latency

* Update u8g_dev_st7920_128_64_sw_spi.cpp

* Disabling EEPROM over FLASH emulatiion if an I2C or SPI EEPROM is present
2017-12-12 17:51:36 -06:00
victorpv
084f2434a7 Update readme.md 2017-12-11 23:14:13 -06:00
victorpv
7c7ae5ebef Delete duplicated file. 2017-12-11 23:10:44 -06:00
victorpv
4feffca178 fix for issue #8585
As reported in this issue:
https://github.com/MarlinFirmware/Marlin/issues/8585
I have it working fine in my local copy like that change.
2017-12-11 23:07:39 -06:00
Scott Lahteine
c555a214d2 Merge pull request #8730 from thinkyhead/bf2_fixup_ubl
[2.0.x] UBL - Skew and Dual X Carriage
2017-12-11 03:37:13 -06:00
Scott Lahteine
d568e586b7 Fix up ubl_motion indentation 2017-12-11 03:08:45 -06:00
Scott Lahteine
24f9bec6f4 UBL + DUAL_X_CARRIAGE compatibility 2017-12-11 03:08:18 -06:00
Scott Lahteine
6d0678d963 Omit unused UBL motion code 2017-12-11 03:08:18 -06:00
Scott Lahteine
3255712343 Skew Correction for UBL
Also remove unused grid slicing function when using UBL segmented.
2017-12-11 03:08:15 -06:00
Scott Lahteine
3d796d8040 Move debug code 2017-12-11 00:27:06 -06:00
Scott Lahteine
3db5303bfe _buffer_line => buffer_segment 2017-12-11 00:27:06 -06:00
Scott Lahteine
a71d2f3f40 UBL_DELTA => UBL_SEGMENTED 2017-12-11 00:27:06 -06:00
Scott Lahteine
73e32925e4 References are better for array args 2017-12-11 00:27:06 -06:00
Scott Lahteine
125c572d97 Tweak M114 detail 2017-12-11 00:27:06 -06:00
victorpv
a5150c83a2 [2.0.x] Multiple updates to STM32F1 HAL (#8733)
* STM32F1 HAL

Adding files for STM32F1 HAL based on libmaple/stm32duino core.
Current persistent_store uses cardreader changes to be sent in separate
commit, but could be changed to use i2c eeprom.
There is another persistent_store implementation that uses the MCU flash memory
to emulate eeprom
Adding readme with some information about the stm32 HAL.

* Switch to Timer4 to avoid a hard reset on STM32F103C6 boards

On bluepill STM32F103C6 boards, using Timer5 results in a error() vector call. Switch to 4 since these are both general purpose, 16 bit timers.

* Add support for EEPROM emulation using Flash

Some low end machines doe not have EEPROM support. Simulate it using the last two pages of flash. Flash does not allow rewrite between erases, so skip writing the working version if that's enabled.

* Basic Pins for a malyan M200

This is a work in progress to go hand in hand with the STM32 work.

* Add support for ADC with DMA. This work has exposed a problem with the pin enumerations in STM boards vs what marlin expects (i.e, try defining PA0 as a temp pin). The hack can be removed with we go to fastio completely. To see this work, set something in adc_pins to a value like PA0 and connect your pullup resistor'd thermistor.

* Missing file - change HAL_adc_init to actually do something

We have an actual ADC init function now.

* Remove pinmode hack

Remove the pin mode hack that I was using to init PA0.

Updated Readme.md

* Several changes to timers and GPIO

Faster GPIO, and faster timer functions by accesing registers and
libmaple.
Still more changes pending for the Timer's code to skip using the
HardwareTimer class altogether.

Switch all enums to be within #defines

This change allows a user to have, for instance, TEMP_4 and TEMP_BED definied but nothing else. The enums which are not defined move "out", allowing the first ones to take the slots in the enum, and since the array is sized on ADC_PIN_COUNT, we always have the right size data and in order.

* Update Malyan M200 pins

Update Malyan M200 pins with correct fan values.

* Test all pins on actual hardware, update definitions

Some of the pin definitions were from knowlege base/pdfs. Now they've been tested against actual hardware. This should be very close to final.

* Update HAL_timers_Stm32f1.cpp

* Add sample configurations for Malyan M200

Add sample configuration for Malyan M200 without bed leveling, and move fan to auto cool E0 since this printer by default has only one fan.


Choose the timer based on MCU defintion. Timer5 is not valid on C8/CB class boards, so use Timer4 for the step timer.


readme.md update

* Updates to timers, and some stm32 boards definitiions

* Correct pin toggle macro.

* Remove duplicated Malyan M200 entry from pins.h

* Update configuration_store.cpp

* Formatting, indentation

* Formatting in HAL_Stm32f1.cpp
2017-12-10 23:12:45 -06:00
Scott Lahteine
204199e1ce Only compare XYZ to check motion 2017-12-10 23:00:00 -06:00
Scott Lahteine
f53e0702fc Merge pull request #8747 from thinkyhead/bf2_sync_M420_M852
[2.0.x] M852 changes position. Position change reporting.
2017-12-10 22:40:32 -06:00
Scott Lahteine
6686d937fb Always report position on config load/reset 2017-12-10 21:47:14 -06:00
Scott Lahteine
117fc872a7 Update current position in M852 2017-12-10 21:39:49 -06:00
Scott Lahteine
7d2e850577 Have M420 report a changed position 2017-12-10 21:39:49 -06:00
Scott Lahteine
03ba79f144 Sync and report changed position 2017-12-10 21:39:49 -06:00
Scott Lahteine
11f9c253e0 Merge pull request #8736 from thinkyhead/bf2_first_step_fix
[2.0.x] Reset timer count before first block step
2017-12-10 19:02:22 -06:00
Scott Lahteine
5cf6a062e3 Reset timer count before first block step 2017-12-10 18:38:53 -06:00
Scott Lahteine
6149b82119 Allow setting current timer counter 2017-12-10 18:38:53 -06:00
Scott Lahteine
82ef6b5242 Add an option to specify "pulse" timer 2017-12-10 18:38:53 -06:00
Scott Lahteine
b8bc965414 General cleanup HAL timers 2017-12-10 18:38:52 -06:00
Scott Lahteine
69d49a2438 Shorter segments may be better 2017-12-09 06:29:14 -06:00
Scott Lahteine
9b800b7fbe Merge pull request #8726 from thinkyhead/bf2_minirambo_10a
[2.0.x] Add board Mini RAMBo 1.0a
2017-12-09 00:06:05 -06:00
Scott Lahteine
d576f5408e Add MiniRAMBo 1.0a board 2017-12-08 23:42:16 -06:00
Scott Lahteine
c40cb52342 Use MB() for Megatronics 3.1 2017-12-08 23:42:16 -06:00
Scott Lahteine
a2ac452ef9 Merge pull request #8725 from thinkyhead/bf2_hal_timer_for_advance
[2.0.x] TCNT0 => HAL_timer_get_current_count
2017-12-08 23:05:06 -06:00
Scott Lahteine
4fa65a5c25 TCNT0 => HAL_timer_get_current_count
Fix #8710
2017-12-08 22:35:28 -06:00
AnHardt
b3daf6b5db [2.0.x] better reverse pass (#8722)
* repair reverse_pass()

And make it readeble.
This was broken a long time ago.
Not competely unfunctional but far from optimal.

* Minor speedup when calling calculate_trapezoid_for_block

2 float / to 1 foat / and 2 float *

* Various style changes
2017-12-08 21:38:45 -06:00
Roxy-3D
f58eb391aa [2.0.0] Better off mesh behavior for UBL (#8714)
* Better off mesh behaviour for UBL

* Suggested ubl.h changes
2017-12-08 19:00:59 -06:00
Jonathan Barchi
cffd052fee [2.0.x] Fix for #8604 (#8717)
* Nozzle.cpp: replace incorrect M_2_PI (2/pi) with 2.0 * M_PI

* Use RADIANS(360) instead of 2 * M_PI
2017-12-08 18:50:05 -06:00
Bob-the-Kuhn
79c402b052 Merge pull request #8719 from Bob-the-Kuhn/2.0.x-planner-speed-improvement
[bugfix-2.0.x] minor planner.cpp speed improvement (follow up to COREXY stutter changes PR #8698)
2017-12-08 18:40:36 -06:00
Bob-the-Kuhn
65d0f32f82 divide only when required 2017-12-08 18:14:27 -06:00
Scott Lahteine
728acf521c Followup to #8706 2017-12-08 03:49:33 -06:00
Scott Lahteine
206866ebb3 Merge pull request #8708 from thinkyhead/bf2_splits_are_expendable
[2.0.x] Discard "continued" blocks on interrupted move
2017-12-08 03:35:09 -06:00
Scott Lahteine
85c6ffbe0d Discard all "continued" blocks on interrupted move 2017-12-08 02:32:58 -06:00
Scott Lahteine
4e891e9fb7 Followup to #8698 2017-12-08 01:01:12 -06:00
Scott Lahteine
de3d3b9cb1 Put FORCE_INLINE before static 2017-12-08 00:46:22 -06:00
Scott Lahteine
43ea265b78 Merge pull request #8685 from MateuszKrawczuk/patch-3
Update TEMP_BED_PIN in MIGHTYBOARD_REVE
2017-12-07 21:50:35 -06:00
Scott Lahteine
9d65e61f39 Merge pull request #8706 from thinkyhead/bf2_multi_probe
[2.0.x] MULTIPLE_PROBING — Why stop at 2?
2017-12-07 21:21:38 -06:00
Scott Lahteine
ae663a4198 PROBE_DOUBLE_TOUCH => MULTIPLE_PROBING 2017-12-07 16:44:13 -06:00
Scott Lahteine
d7800e7975 Apply MULTIPLE_PROBING to example configs 2017-12-07 16:44:12 -06:00
Scott Lahteine
542efda7db Merge pull request #8698 from thinkyhead/bf2_replace_jerk_code
[2.0.x] Improved Core-compatible jerk code
2017-12-07 00:17:00 -06:00
Scott Lahteine
438c21ad5c Merge pull request #8693 from GMagician/2.x-address-#8644
[2.x] Address #8644
2017-12-07 00:05:02 -06:00
Scott Lahteine
3cd7659924 Improved Core-compatible jerk code 2017-12-06 23:57:57 -06:00
GMagician
99fcf60977 [2.x] addressing #8644
Removed missing include file
2017-12-06 23:49:30 -06:00
Scott Lahteine
81c0a918af feed_factor => inverse_secs 2017-12-06 23:03:33 -06:00
Scott Lahteine
f206b81cf7 Sanity check skew+UBL 2017-12-06 22:56:58 -06:00
Scott Lahteine
60e7951312 Merge pull request #8691 from thinkyhead/bf2_clean_blocks_on_trigger
[2.0.x] Purge blocks on endstop/probe hit
2017-12-06 22:39:43 -06:00
Scott Lahteine
9898b96992 No lcd_map_control flag in quick_stop 2017-12-06 22:23:34 -06:00
Scott Lahteine
840289e7cc Use block cleaning instead of split flag 2017-12-06 22:22:58 -06:00
Scott Lahteine
d163c4b530 Merge pull request #8695 from thinkyhead/bf2_fixes_DEC6
[2.0.x] Cleanup, bugfixes, parity with 1.1.x
2017-12-06 22:22:35 -06:00
Scott Lahteine
90cf6a06be Simplify G26 user_canceled 2017-12-06 22:02:54 -06:00
Scott Lahteine
cdfabbc507 Shorten error text in G29 2017-12-06 21:50:54 -06:00
Scott Lahteine
c846388a65 Standardize LCD interface code for UBL a little 2017-12-06 21:50:54 -06:00
Scott Lahteine
2fde60da12 Changes for parity with 1.1.x 2017-12-06 21:50:54 -06:00
Scott Lahteine
6040d4080e Cleanup stepper ISR. Allow cleaning for endstops. 2017-12-06 21:23:37 -06:00
Scott Lahteine
a4e1d83599 Fix M503 S parameter 2017-12-06 21:23:37 -06:00
Scott Lahteine
a3b098b4be Whitespace clean 2017-12-06 14:02:44 -06:00
Scott Lahteine
466f2761cb Merge pull request #8688 from AnHardt/2_first_move_probing_homing
[2.0.x] Don't split first_move while homing or probing
2017-12-06 11:52:50 -06:00
AnHardt
a993c5227d Don't split first_move while homing or probing
While homing or probing it might be bad if the stop/trobe triggers during the first part and the second is still in the buffer.
2017-12-06 14:13:05 +01:00
Mateusz Krawczuk
5320906b0b Update TEMP_BED_PIN in MIGHTYBOARD_REVE
Pin K7 number in fastio1280.h is 69, but it's also ADC15 pin. 
To get correct value from ADC reading it should be set as 15.
2017-12-06 12:07:20 +01:00
Scott Lahteine
aeb5c623c1 Show "Level Bed Corners" with UBL too
Addressing #8676
2017-12-05 21:58:43 -06:00
Scott Lahteine
5fbb2f121e Remove skew warning that could crash the planner 2017-12-05 20:27:20 -06:00
Scott Lahteine
1da2b2dd74 Merge pull request #8667 from Wackerbarth/PID_on_bed_only
[2.0.x] Compilation errors with PIDTEMPBED only
2017-12-05 20:15:05 -06:00
Richard Wackerbarth
c1184552ac Change K1 to required option PID_K1 2017-12-05 19:59:59 -06:00
revilor
9e3fbcf35c fix for #8669 (#8679)
* fix for #8669

* Update G28.cpp
2017-12-05 19:40:36 -06:00
Scott Lahteine
d8b444c144 Cleanup constextpr in planner.cpp 2017-12-05 18:55:57 -06:00
Scott Lahteine
a2372cfab5 Fix SKEW_CORRECTION without leveling 2017-12-05 18:48:34 -06:00
Scott Lahteine
4d3c3d0b73 Some ST7920 parity with 1.1.x
Possibly more should be brought over? Discussion at #8471
2017-12-05 02:22:36 -06:00
Scott Lahteine
3748c28924 Fix MBL G29 without LCD
Addressing https://github.com/MarlinFirmware/Marlin/pull/8575#discussion_r154536617
2017-12-05 01:57:45 -06:00
Scott Lahteine
772298257b Creality pins spacing, MINIPANEL CS pin 2017-12-05 01:57:45 -06:00
Scott Lahteine
b27bc67271 Set initial endstops state 2017-12-05 01:10:31 -06:00
Scott Lahteine
cb8b9950af Merge pull request #8663 from thinkyhead/bf2_rampsplus
[2.0.x] Support for RAMPS Plus (3DYMY)
2017-12-05 01:07:25 -06:00
Scott Lahteine
b6ba32ce75 Support for RAMPS Plus (3DYMY) 2017-12-05 00:42:21 -06:00
Scott Lahteine
53694ebaa1 Folllwup to planner splitting 2017-12-04 18:55:23 -06:00
Scott Lahteine
37fff608b0 Merge pull request #8652 from fiveangle/bf2_usbcon_xonxoff
[2.0.x] SERIAL_XON_XOFF not supported on USB-native AVR devices
2017-12-04 16:46:18 -06:00
Scott Lahteine
02dd621ac7 Merge pull request #8659 from thinkyhead/backup_2_split_first
[2.0.x] Split first move to planner for better chaining
2017-12-04 16:17:27 -06:00
Scott Lahteine
4b612f590c Split first move to planner for better chaining 2017-12-04 15:27:47 -06:00
Unknown
91b63f6d69 SERIAL_XON_XOFF not supported on USB-native AVR devices
User could enable SERIAL_XON_XOFF on USB-native devices and it would not be enabled without warning, but M115 would report the capability as available.
2017-12-04 03:57:01 -08:00
Bob-the-Kuhn
cff886ba12 Merge pull request #8650 from Bob-the-Kuhn/2.0.x-comment
[2.0.x] LPC1768 - add explanations in spi_pins.h
2017-12-03 20:56:04 -06:00
Bob-the-Kuhn
57fac33a74 add explanations
1) add explanations as to why software SPIs are selected

2) remove unused flag/option
2017-12-03 20:32:22 -06:00
Bob-the-Kuhn
3e2a515d27 Merge pull request #8646 from Bob-the-Kuhn/2.0.x-RRDFGSC-&-MKS-Sbase
[2.0.x] MKS Sbase support for RepRap Discount Full Graphic Smart Controller
2017-12-03 20:16:51 -06:00
Bob-the-Kuhn
bb23286383 add README & modify spi_pins.h
still trying to fix file name
2017-12-03 20:00:56 -06:00
Scott Lahteine
f125ba7eb6 Merge pull request #8647 from thinkyhead/bf2_planner_split_first
[2.0.x] Revert PR #8611 — split first planner move
2017-12-03 18:15:01 -06:00
Scott Lahteine
dd8febca1a Revert "Merge pull request #8611 from thinkyhead/bf2_planner_split_first"
This reverts commit 824980e70e, reversing
changes made to aa7efb96bf.
2017-12-03 17:50:19 -06:00
Bob-the-Kuhn
fb44f8e50f Merge pull request #8616 from hg42/bugfix-2.0.x
[2.0.x][LPC1768][FIX] NUM_DIGITAL_PINS was negative, fixes PWM, arduino io functions, M42, M43, M226, probably also Servo, some LCD, soft spi, SoftwareSerial, ... may be others
2017-12-03 14:48:00 -06:00
Bob-the-Kuhn
4c5356f77a Merge pull request #8622 from hg42/implement-LPC1768-GET_TIMER
[2.0.x][LPC1768][fix] Implement GET_TIMER and other GET_xxx, fixes PWM
2017-12-03 14:46:22 -06:00
Harald Gutsche
f5b4e1ef4f as a workaround enable PWM for any pin, see PR #8622 2017-12-03 20:37:02 +01:00
Scott Lahteine
6e944a413c Merge pull request #8607 from benlye/patch-1
[2.0.x] Fix M49 so that it does not hang the terminal console
2017-12-03 03:41:33 -06:00
Scott Lahteine
967522b95e Merge pull request #8615 from dot-bob/Duplicator_6-2.0.x
[2.0.x] Example configurations for Wanhao Duplicator 6
2017-12-03 03:37:48 -06:00
Scott Lahteine
f4b16a3bac Update M49.cpp 2017-12-03 03:34:56 -06:00
Scott Lahteine
f9327534f8 Merge pull request #8634 from fiveangle/bf2_report_xonxoff
[2.0.x] Report SERIAL_XON_XOFF in M115
2017-12-03 02:18:50 -06:00
Scott Lahteine
da9f140829 Merge pull request #8637 from thinkyhead/bf2_ubl_uses_LSL
[2.0.x] Use custom segment length for UBL Cartesian
2017-12-03 01:57:49 -06:00
Scott Lahteine
824980e70e Merge pull request #8611 from thinkyhead/bf2_planner_split_first
[2.0.x] Split first planner move for better chaining
2017-12-03 01:50:46 -06:00
Scott Lahteine
3a97de52ef Split first move to planner for better chaining
Address #8573, #8595
2017-12-03 01:27:14 -06:00
Scott Lahteine
24437de591 Use custom segment length for UBL Cartesian 2017-12-03 00:10:54 -06:00
Unknown
4c5ffd2349 [2.0.x] Report SERIAL_XON_XOFF in M115
-Report SERIAL_XON_XOFF in Extended Capabilites M115 report for hosts
-Remove outdated 256 size limitation from comments on RX_BUFFER_SIZE defines
-Update error message conditions
2017-12-02 21:08:06 -08:00
Scott Lahteine
aa7efb96bf Bring configurations up to date 2017-12-02 21:50:51 -06:00
Scott Lahteine
63a91cd37a Fix a homing comment 2017-12-02 21:02:37 -06:00
Scott Lahteine
8056120195 Rename inverse_mm_s => inverse_secs 2017-12-02 20:28:09 -06:00
Scott Lahteine
23557f8e77 Remove obsolete de_float 2017-12-02 20:23:10 -06:00
Jonathan Barchi
05f8e98c4a Fix for issue #8629 - mismatch between number of stored and loaded dummy items on non-delta machines. (#8631) 2017-12-02 19:04:58 -06:00
Roxy-3D
48fb4e0932 Get Bi-Linear to work with G26
More corrections to make that happen...
2017-12-02 14:14:24 -06:00
Roxy-3D
0850b38b45 Get Bi-Linear working with G26
G26 uses logic that looks like:
```
ex = _GET_MESH_X(i + 1) - (SIZE_OF_INTERSECTION_CIRCLES - (SIZE_OF_CROSSHAIRS));
```
The Bi-Linear macros need parenthesis to work correctly.
2017-12-02 14:10:30 -06:00
Scott Lahteine
000b3b3117 Comment/cleanup of motion code 2017-12-02 01:09:55 -06:00
Scott Lahteine
046a1ad331 Merge pull request #8625 from tcm0116/2.0.x-G33
[2.0.x] Fix missing return values in G33_auto_tune
2017-12-02 00:51:19 -06:00
Scott Lahteine
98aba6a534 Merge pull request #8624 from thinkyhead/bf2_skew_correction
[2.0] Skew Correction
2017-12-02 00:43:48 -06:00
Thomas Moore
b35c3b5eb8 Fix missing return values in G33_auto_tune 2017-12-01 21:29:16 -06:00
Scott Lahteine
45c2388a58 Apply const to thermal_runaway_protection args 2017-12-01 19:42:44 -06:00
Scott Lahteine
0154e3480c New feature: BED_SKEW_CORRECTION 2017-12-01 19:39:49 -06:00
Scott Lahteine
082ab8fcab Add SKEW_CORRECTION to example configs 2017-12-01 19:22:27 -06:00
Unknown
d1f11e9c10 fix missing GET_TIMER (used by PWM for Ex_AUTO_FAN) 2017-12-01 22:28:55 +01:00
Harald Gutsche
dd1b503f64 fix NUM_DIGITAL_PINS being negative for more than 127 digital pins 2017-12-01 07:39:46 +01:00
dot-bob
bd45d0363d Add default configurations for the Wanhao Duplicator 6. 2017-11-30 23:24:33 -07:00
Scott Lahteine
91fb6231b2 Fix EEPROM V45 header, layout 2017-11-30 22:45:17 -06:00
Roxy-3D
94e6b2976e Restore correct G26 values for gMax 1.5+ printer 2017-11-30 18:12:17 -06:00
Scott Lahteine
e3948d8582 Merge pull request #8612 from thinkyhead/bf2_planner_parity
[2.0.x] Fix some planner bugs
2017-11-30 17:58:53 -06:00
Scott Lahteine
dd3ce40826 Drop Planner::position_float, use int types 2017-11-30 17:43:31 -06:00
Scott Lahteine
ec6ca37ed3 Fix (un)apply_leveling fade bug 2017-11-30 17:25:44 -06:00
Scott Lahteine
a52fec6ac4 Planner class parity with 1.1.x 2017-11-30 15:55:08 -06:00
Ben Lye
1f3ad461bc Update M49.cpp
Fix M49 so that it does not hang the terminal console.
2017-11-30 20:17:44 +00:00
Scott Lahteine
bee2b5eea4 Merge pull request #8388 from Tannoo/2.0.x-led_control_menu
[2.0] led_control_menu
2017-11-30 00:18:21 -06:00
Scott Lahteine
e37dd64548 Apply LEDColor, language fixes 2017-11-29 23:58:12 -06:00
Scott Lahteine
8f90642eea LED_CONTROL_MENU config changes 2017-11-29 21:02:56 -06:00
Tannoo
cf0f78336b New Feature: LED_CONTROL_MENU 2017-11-29 21:02:55 -06:00
Scott Lahteine
23e45fa3c4 Apply const to some planner vars 2017-11-29 21:02:55 -06:00
Scott Lahteine
fd78446b2b Merge pull request #8600 from thinkyhead/bf2_cartesian_segments
[2.0.x] Segmented mesh moves
2017-11-29 17:25:36 -06:00
Scott Lahteine
7c61bcb058 Apply SEGMENT_LEVELED_MOVES to example configs 2017-11-29 16:57:31 -06:00
Scott Lahteine
ef2531558c Add an option to segment leveled moves 2017-11-29 16:57:30 -06:00
Scott Lahteine
ca80564a78 Travis platformio hack no longer needed 2017-11-29 15:25:19 -06:00
Scott Lahteine
285b868e9b Tweak planner code style 2017-11-29 15:22:18 -06:00
Scott Lahteine
eede8679e7 Fix up git helper scripts 2017-11-28 19:01:47 -06:00
Scott Lahteine
1f2acc33bc Tweaks for check_axes_activity 2017-11-28 18:41:13 -06:00
Vitaliy Sapyanov
7f88334aa3 Done cleanup and removed duplicates in pins_RuRAMPS4D.h (#8582)
Remove duplicates, with followup fixes
2017-11-28 18:33:12 -06:00
Scott Lahteine
a038c10f66 #8588 followup 2017-11-28 17:59:58 -06:00
Scott Lahteine
4f32786cf7 Merge pull request #8588 from fiveangle/bf20_babystepping_travis_options
[2.0.x] Additional Travis BABYSTEPPING tests
2017-11-28 17:56:55 -06:00
Dave Johnson
f5f72b2009 Additional Travis BABYSTEPPING options for AVR 2017-11-28 17:46:40 -06:00
Scott Lahteine
a8aa43ce2d Merge pull request #8587 from AnHardt/2_Fix_WDTO_during_long_DELTA_moves
[2.0.x] Fix WDTO during long delta moves
2017-11-28 17:29:18 -06:00
Scott Lahteine
4793c34c53 Fix M290 boolval bug
Fix #8577
2017-11-28 17:21:33 -06:00
Scott Lahteine
16baa48699 Fix #8579
Fan speed code fell into a curly brace
2017-11-28 16:12:14 -06:00
AnHardt
02aa93a6ad Fix Watchdog time out during long lasting DELTA moves
During long lasting moves of a delta machine neither the temperatures are maintained nor buttons checked nor ... .
The fix is to call 'manage_heater()' and 'idle()' every now and then in the loop where the move is segmented. 
The code is abot the same as in G2_G3 wher we had the same problem with too large circles lasting too long.
Fixing #7510
2017-11-28 17:03:51 +01:00
Scott Lahteine
fadf9eb2d7 Simplify midpos calculation 2017-11-27 14:00:35 -06:00
Scott Lahteine
0880031e8e Satisfy M702 dependencies 2017-11-27 13:39:59 -06:00
Scott Lahteine
0786b61ce7 Followup to #8575 2017-11-27 12:58:40 -06:00
Scott Lahteine
47099af3ec Merge pull request #8575 from thinkyhead/kuru_to_upstream
[2.0.x] Make MBL work more like PROBE_MANUALLY
2017-11-27 12:55:05 -06:00
Scott Lahteine
276271e72f Make MBL work more like PROBE_MANUALLY 2017-11-27 02:12:29 -06:00
Scott Lahteine
94cb412e45 Allow override of probe bounds 2017-11-26 20:55:27 -06:00
Scott Lahteine
c8718aa111 Spacing, macros in LPC1768_PWM 2017-11-26 20:20:05 -06:00
Scott Lahteine
a67cf78c6b Clean up whitespace, spacing 2017-11-26 20:18:52 -06:00
Scott Lahteine
f0dd4e3fa0 Bootscreen parity with 1.1.x 2017-11-26 20:07:17 -06:00
Scott Lahteine
b634bfe1b1 Tweak to readDir code 2017-11-26 18:25:00 -06:00
Scott Lahteine
7be4857ab9 Tweak BLOCK_BUFFER_SIZE description 2017-11-26 17:36:40 -06:00
Bob-the-Kuhn
7d8b66e207 Merge pull request #8570 from Bob-the-Kuhn/Sbase-PWM
[2.0.x] MKS Sbase - add servo pin definitions and add directly controlled PWM
2017-11-26 09:36:18 -06:00
Bob-the-Kuhn
59b32c25b5 MKS Sbase changes 2017-11-26 07:47:06 -06:00
Scott Lahteine
f90c075d1f SD Menu patches 2017-11-26 01:14:18 -06:00
Scott Lahteine
9b64be0bc5 Fixes for leveling sub-menus 2017-11-26 00:05:36 -06:00
Scott Lahteine
25674da90c Tweaks to do_blocking_move 2017-11-25 23:31:16 -06:00
Scott Lahteine
22b897e77d Show M211 output with workspace offset 2017-11-25 20:48:20 -06:00
Scott Lahteine
d06e29846d Loosen HAS_BED_PROBE definition 2017-11-25 20:11:21 -06:00
Scott Lahteine
2f837ce9b7 Merge pull request #8565 from Roxy-3D/bugfix-2.0.x
Change G26 and G29 bit function names to avoid HAL name collision
2017-11-25 20:02:53 -06:00
Roxy-3D
e48fcad615 change G26 and G29 bit function names to avoid HAL collision 2017-11-25 19:58:45 -06:00
Scott Lahteine
41ec449960 Fix G26 error return 2017-11-25 19:53:14 -06:00
Scott Lahteine
9badf5dc0d Fix Micromake C1 config 2017-11-25 18:41:07 -06:00
Scott Lahteine
7576ad7fc2 Merge pull request #8554 from tcm0116/2.0.x-cleanup
[2.0.x] Fix for #8525 and other cleanup
2017-11-25 18:19:54 -06:00
Scott Lahteine
27c5692b13 Syntax tweaks 2017-11-25 18:13:36 -06:00
Scott Lahteine
a9adc2c2f6 Merge pull request #8558 from LVD-AC/2.0.x]-probe-error-handling
[2.0.x] G33 probe error handling
2017-11-25 17:16:58 -06:00
Scott Lahteine
d18d40e1d6 M290 report on change, P0 to leave Probe Z Offset alone 2017-11-25 16:47:39 -06:00
LVD-AC
65f365333f [2.0.x] G33 probe error handling 2017-11-25 16:19:10 -06:00
Scott Lahteine
d3ed0f53cd Merge pull request #8563 from thinkyhead/bf2_functools_lru_cache
Fix #8561. Fix #8562
2017-11-25 14:35:59 -06:00
Bob-the-Kuhn
8c69adba8b Merge pull request #8553 from Bob-the-Kuhn/2.0.x-U8Glib-follow-up
[2.0.X] U8Glib follow up
2017-11-25 14:26:32 -06:00
Scott Lahteine
ba5ff1a838 Try manual install of backports.functools_lru_cache 2017-11-25 14:14:36 -06:00
Scott Lahteine
be00e421a7 Patch up M290, M851 2017-11-25 14:11:57 -06:00
Bob-the-Kuhn
fc40d56131 fixed error, updated defaults, added notes
Travis fix - only allow ultralcd_st7920_u8glib_rrd_AVR.cpp to compile when ST7920 selected
2017-11-25 12:35:03 -06:00
Roxy-3D
d29cb646e3 Fix erroneous reference to temperature in time calculations
Travis is having problems at:  https://github.com/MarlinFirmware/Marlin/pull/8560   

So...   doing a direct commit to get things correct.   Bugfix_v1.1.x does not have this bug.  Nothing needs to be done to that branch.
2017-11-25 10:40:56 -06:00
Thomas Moore
7bb1721f35 Fix _BV already defined warnings for Teensy 2017-11-24 22:34:39 -06:00
Thomas Moore
5f9592a523 Cleanup narrowing warning in pin_is_protected 2017-11-24 22:15:56 -06:00
Thomas Moore
34eaaab5fb Fix _BV already defined warnings 2017-11-24 21:59:31 -06:00
Thomas Moore
2ea779e560 Allow bed probe sanity checks to run 2017-11-24 21:59:01 -06:00
Scott Lahteine
d24b1190bd Don't use Z_MIN_PROBE_ENDSTOP on DELTA 2017-11-24 18:24:22 -06:00
Scott Lahteine
e34c6827ea Init MIXING virtual tools as switching 2017-11-24 18:02:09 -06:00
Scott Lahteine
a9ecb975b2 Apply LINEAR_UNIT to M503 output for M200 2017-11-24 17:32:48 -06:00
Scott Lahteine
d95ee0f003 Merge pull request #8551 from revilor/bugfix-2.0.x
MK2_MULTIPLEXER does not require E2/E3 stepper pins
2017-11-24 17:16:23 -06:00
Scott Lahteine
80ada58818 One fewer function call in probe_pt 2017-11-24 17:10:38 -06:00
oliver
92a0dc552a MK2_MULTIPLEXER does not require E2/E3 stepper pins 2017-11-24 23:56:39 +01:00
Scott Lahteine
a81df268fd Merge pull request #8547 from thinkyhead/bf2_babystep_gfx_overlay
[2.0.x] Followup for MESH_EDIT_GFX_OVERLAY
2017-11-24 16:18:01 -06:00
Scott Lahteine
b49acce035 Tweaks for lcd_external_control 2017-11-24 15:53:25 -06:00
Scott Lahteine
1ef1052ae1 Phatter arrows for Z offset overlay 2017-11-24 15:53:25 -06:00
Scott Lahteine
5926c9c97b Followup for MESH_EDIT_GFX_OVERLAY 2017-11-24 15:53:25 -06:00
Scott Lahteine
ab03a31cc9 Patch G0/G1 for NANODLP_Z_SYNC 2017-11-24 14:11:12 -06:00
Scott Lahteine
a766dfb3b1 Merge pull request #8536 from thinkyhead/bf2_nanodlp_z_move_sync
[2.0.x] Implement NANODLP_Z_SYNC for 2.0.x
2017-11-24 13:11:14 -06:00
Scott Lahteine
fd13489a8a Combine some Travis tests 2017-11-24 13:10:54 -06:00
Scott Lahteine
01e207213f Fix MK2_MULTIPLEXER stepper indirection 2017-11-24 12:49:28 -06:00
Roxy-3D
ec04cf27d3 Fix the G26 out of scope identifiers in the v2.0.0 branch (#8543)
These changes may need to be warmed over.  I tried to fix things with
the least amount of disruption.   I just wanted to get the bugfix_v2.0.0
branch working for people again.
2017-11-24 10:39:56 -06:00
Scott Lahteine
dc82babe8e Implement NANODLP_Z_SYNC for 2.0.x 2017-11-24 00:28:06 -06:00
Scott Lahteine
4d517d169a Merge pull request #8535 from thinkyhead/bf2_more_mesh_G26
[2.0.x]  Adapt G26 to work for all meshes
2017-11-23 23:17:06 -06:00
Scott Lahteine
c6b0c104bb Adapt G26 to work for all meshes 2017-11-23 22:31:37 -06:00
Scott Lahteine
5ce7f23afa Config option G26_MESH_VALIDATION for all meshes 2017-11-23 21:43:23 -06:00
Scott Lahteine
c19eb33408 Move G26 to gcode sub-folder 2017-11-23 21:43:23 -06:00
Scott Lahteine
a03f93bab4 Fix fan kickstart 2017-11-23 21:42:45 -06:00
Scott Lahteine
9e3c41f9e8 Tweak fan kickstart / speed code 2017-11-23 15:20:35 -06:00
Scott Lahteine
8602461da8 Merge pull request #8523 from GMagician/2.0-Tool-change-bad-behaviour-fix
[2.0.x] Tool change bad behaviour fix
2017-11-22 21:29:33 -06:00
GMagician
118ac61e59 [2.0.x] Tool change bad behaviour fix
Previous fix did not work as expected when axeis not homed. It raise Z but never return to original position
2017-11-22 20:24:03 -06:00
Scott Lahteine
c35d27f77c Merge pull request #8299 from tcm0116/2.0.x-BIQU_BQ111-A4
[2.0.x] Add BIQU BQ111-A4 board
2017-11-22 19:16:04 -06:00
Scott Lahteine
1685cd193b Tweak char_mode init 2017-11-22 19:12:08 -06:00
Scott Lahteine
7533ccfa83 Merge pull request #8527 from thinkyhead/bf2_lcd_init_charset
[2.0.x] Fix up LCD init / charset
2017-11-22 19:06:29 -06:00
Scott Lahteine
9406c87a97 Fix up LCD init / charset 2017-11-22 18:22:55 -06:00
Thomas Moore
fa577392b2 Add BIQU BQ111-A4 board 2017-11-22 16:34:59 -06:00
Scott Lahteine
c2fc78c3a8 #ifndef => #if !PIN_EXISTS 2017-11-22 16:28:52 -06:00
Scott Lahteine
001ce7a2fd Merge pull request #8521 from teemuatlut/Ultratronics
[2.0.x] Add support for Ultratronics Pro v1.0 and fix compiling for Due HAL
2017-11-22 16:18:59 -06:00
Scott Lahteine
c613a1ed38 Fix indentation, stepper.h dependency, etc. 2017-11-22 14:55:30 -06:00
teemuatlut
f011a32771 Board definitions for Ultratronics Pro v1.0 2017-11-22 14:55:24 -06:00
Bob-the-Kuhn
0c95262b9e Merge pull request #8518 from Bob-the-Kuhn/temp-test-servo-2
[2.0.x] LP1768 - fix PWMs
2017-11-21 21:54:25 -06:00
Bob-the-Kuhn
9dad534f02 fixed 2017-11-21 21:37:20 -06:00
Scott Lahteine
4371345cbe Don't re-init graphical LCD after boot screen
Followup to 13a3fb1acc
2017-11-21 18:23:39 -06:00
Scott Lahteine
8d0a45f5d4 Merge pull request #8512 from thinkyhead/bf2_debouncer
[2.0.x] General code clean/comment
2017-11-21 17:46:20 -06:00
Scott Lahteine
56c02b7f59 Shift register buttons question
Can LCD shift registers keep up with faster MCUs?
2017-11-21 16:12:40 -06:00
Scott Lahteine
3994d3b935 General cosmetic LCD 2017-11-21 16:12:40 -06:00
Scott Lahteine
617993d0ea Patch for !!TEST (was _BV once?) 2017-11-21 16:12:08 -06:00
Scott Lahteine
3269d8dd62 Tweak M42 var 2017-11-21 16:12:08 -06:00
Scott Lahteine
cf2c5266ed Merge pull request #8514 from MateuszKrawczuk/patch-1
Remove pin count check for MIGHTYBOARD_REVE
2017-11-21 15:44:59 -06:00
Mateusz Krawczuk
bb1a6eea88 Remove pin count check for MIGTHYBOARD_REVE
Remove assert and unused code since it is implemented in pinsDebug_plus_70.h
2017-11-21 14:38:02 +01:00
Scott Lahteine
1ce0fb336b Patch Max7219_LED_Set input args 2017-11-20 21:15:15 -06:00
Scott Lahteine
63e135732c Merge pull request #8495 from GMagician/Tool-change-fix
[2.0.x] tool change bad behaviours
2017-11-20 20:36:46 -06:00
GMagician
a61127a421 [2.0.x] tool change bad behaviours
This will solve 2 issues on tool change.
1) when no home is done ("no_move" is set) tool change should never move X & Y because... I don't know where I am...only Z should be adjusted to avoid bed collision if other nozzle is lower than current.
Since no move no bed level matrix should be applied
2) When SWITCHING_NOZZLE is enabled and system is homed there are two movements to go to destination, but first can move Z to older position and then crash on the bed
2017-11-20 16:34:55 -06:00
Scott Lahteine
5cfdb76186 Merge pull request #8425 from Vynt-1/bugfix-2.0.x
Update pins_RuRAMPS
2017-11-20 16:18:16 -06:00
Vitaliy Sapyanov
e2724c68ab Update pins_RURAMPS4D.h
Add and bugfix pins
2017-11-20 15:36:13 -06:00
Scott Lahteine
9770062309 Merge pull request #8463 from thinkyhead/bf2_32bit_M42
[2.0.x] Updates to Anet A8 configurations
2017-11-20 15:12:30 -06:00
Scott Lahteine
586c1e4e73 Merge pull request #8484 from Bob-the-Kuhn/P1.02-P1.20
2.0.x LPC1768 - M42 compatibility with Repetier Host
2017-11-20 15:03:00 -06:00
Scott Lahteine
37a8d0b809 Merge pull request #8464 from tcm0116/2.0.x-pio_lib_deps
[2.0.x] Update PlatformIO lib_deps
2017-11-20 15:02:27 -06:00
Scott Lahteine
3066655727 Try port*100+pin, fix config dependency 2017-11-20 13:58:23 -06:00
Scott Lahteine
ba8bc7ea80 Cosmetic tweaks 2017-11-20 13:58:02 -06:00
Scott Lahteine
f409147116 Fix P2_04, P2_05 2017-11-20 13:58:02 -06:00
Bob-the-Kuhn
a28ccabe2a M42 P1.20 fix 2017-11-20 13:58:02 -06:00
Bob-the-Kuhn
5060195e8a Merge pull request #8502 from fiveangle/bf_sync_tempurature_h
[2.0.x] Fix Temperature::setPwmFrequency() prototype to match source
2017-11-20 10:36:24 -06:00
Unknown
33912fa7e8 Update Temperature::setPwmFrequency prototype to match source
Introduced with #8446
2017-11-20 01:50:41 -08:00
Scott Lahteine
5a52cf6a71 Merge pull request #8499 from thinkyhead/bf2_workaround_sq
[2.0.x] Dependency adjustments (e.g., sq macro)
2017-11-19 16:08:09 -06:00
Scott Lahteine
b9327a4d16 Misc. general cleanup 2017-11-19 15:43:39 -06:00
Scott Lahteine
8836623e0f Fix sq/min/max macros after platform headers 2017-11-19 15:43:39 -06:00
Scott Lahteine
fe4f009fdd 32-bit unless… 2017-11-19 15:43:38 -06:00
Scott Lahteine
25af9decfe Remove enum.h include of MarlinConfig.h 2017-11-19 15:43:38 -06:00
Scott Lahteine
1d4571b88d Dependency adjustments 2017-11-19 15:43:38 -06:00
Scott Lahteine
550f1025f0 Try using <Arduino.h> everywhere 2017-11-19 14:23:02 -06:00
Scott Lahteine
c0000a0cdc Move servo code to modules/servo.* 2017-11-19 14:23:02 -06:00
Scott Lahteine
81bc428b48 Don't compile custom u8g without DOGLCD 2017-11-19 13:58:38 -06:00
Scott Lahteine
3af7fc07e7 Merge pull request #8446 from Bob-the-Kuhn/LPC1768-PWM-rewrite
2.0.x FAST_PWM_FAN updates & make LPC1768 PWM use fewer CPU cycles
2017-11-18 07:07:30 -06:00
Bob-the-Kuhn
c14000775b PWM fixes, slow down fan update
include LPC1768 syntax for M42

couple more pin_t changes

consistency

change M42 to R, P format

Revert "change M42 to R, P format"

This reverts commit 01f12f579ec9ccc1bb9126e68d2c86449e9b7edf.
2017-11-18 07:05:50 -06:00
Scott Lahteine
60adc6ff02 Display filwidth ratio in terms of E mm 2017-11-18 07:01:49 -06:00
Scott Lahteine
6e533748eb Fixes #8472 2017-11-18 05:15:55 -06:00
Scott Lahteine
485abb023b Merge pull request #8456 from thinkyhead/bf2_wednesday_tweaks
[2.0] No retroactive adjustment with M851 Z
2017-11-18 04:49:53 -06:00
Scott Lahteine
ca6d408549 Merge pull request #8477 from thinkyhead/bf2_some_formatting
[2.0.x] Apply some formatting
2017-11-18 03:45:51 -06:00
Scott Lahteine
3bba7d60f3 No retroactive changes with M851 Z
If using babystep to adjust the Z probe offset, the axis will move and the mesh will be updated at the same time, causing a doubling of the Z offset over the rest of the print.

To correct for this, the current Z position would need to be modified in the opposite direction, canceling out the additional Z offset added to the mesh. This would be confusing to users, and moreover it would not be accurate without also taking the current Z fade level and current Z height into account.

It might make sense to change the mesh in the case where no babystepping is taking place, but this could be considered an undesirable side-effect of changing the `zprobe_zoffset`.

One way to remedy this would be to return to storing the mesh with `zprobe_zoffset` included, then subtracting `zprobe_zoffset` from the returned Z value. Thus, a babystep moving the Z axis up 1mm would subtract 1 from `zprobe_zoffset` while adding 1 to all mesh Z values.

Without including the `zprobe_zoffset` in the `z_values` there is no safe way to alter the mesh in conjunction with babystepping, although it's fine without it.
2017-11-18 03:36:39 -06:00
Scott Lahteine
32512332df Apply some formatting 2017-11-18 03:12:30 -06:00
Scott Lahteine
7dacc999b9 Remove obsolete show_bootscreen var 2017-11-17 17:01:43 -06:00
Roxy-3D
9729528d13 Update UBL's Delta Probable locations
This is a non-intuitive change.   @oldmcg says in this post https://github.com/MarlinFirmware/Marlin/issues/7572#issuecomment-340641207 that using DELTA_PRINTABLE_RADIUS is better than DELTA_PROBABLE_RADIUS for setting the probe limits.   This is because the automatic probe code checks all locations for being reachable by the probe prior to doing the probe.
2017-11-17 16:44:57 -06:00
Scott Lahteine
d48cb6bf41 Apply coding standards to Max7219 2017-11-17 15:32:21 -06:00
Thomas Moore
50a5bb77d2 Update PlatformIO lib_deps 2017-11-16 23:23:07 -06:00
Scott Lahteine
bd8bcf06e7 Updates to Anet A8 configurations
Based on #8426
2017-11-16 23:19:36 -06:00
Bob-the-Kuhn
1502b6ad8a Merge pull request #8460 from Bob-the-Kuhn/E0-autofan
2.0.x E0 auto fan fixes for LP1768
2017-11-16 18:44:56 -06:00
Bob-the-Kuhn
7eea000f4b E0 auto fan fixes 2017-11-16 18:42:56 -06:00
Scott Lahteine
a7ff4f5799 Merge pull request #8455 from thinkyhead/bf2_filwidth_fix
[2.0] Fix Filament Width Sensor LCD display
2017-11-16 17:58:42 -06:00
Scott Lahteine
b2dda096fe Fix FILAMENT_LCD_DISPLAY for disabled state 2017-11-16 16:57:48 -06:00
Scott Lahteine
1e8afb66b7 Fix a planner comment 2017-11-16 16:57:47 -06:00
Scott Lahteine
50f09cc029 Miscellaneous cleanup 2017-11-16 00:47:16 -06:00
Scott Lahteine
63257dc083 Fix M503 output for M145
Fixes #7978
2017-11-15 04:00:18 -06:00
Scott Lahteine
166dbada91 Merge pull request #8438 from thinkyhead/bf2_thermistor_ov
[2.0] Add OV() macro for use in thermistor tables
2017-11-15 03:50:50 -06:00
Scott Lahteine
0918dae66e Add OV() macro for use in thermistor tables 2017-11-15 03:15:18 -06:00
Scott Lahteine
24057270a3 Merge pull request #8420 from RowanMeara/rm-dithering-2.0.x
[2.0.x] Fix Software Fan PWM
2017-11-15 02:30:19 -06:00
Scott Lahteine
5079a02c90 Add HAL_SERVO_LIB to HAL_Due.h 2017-11-15 02:07:01 -06:00
Scott Lahteine
9c3761047e Merge pull request #8434 from thinkyhead/bf2_fix_M32_subroutines
[2.0] Fix 'M32 P' subroutines
2017-11-15 01:15:02 -06:00
Scott Lahteine
1c7b9f6d5d Merge pull request #8433 from thinkyhead/bf2_fix_parser_value
[2.0] Fix parser value handling
2017-11-15 00:49:47 -06:00
Scott Lahteine
e0d367f1fb Fix M32 P subroutine handling 2017-11-15 00:44:21 -06:00
Scott Lahteine
9f8b4c5ee8 Patch SD lib files for readability 2017-11-15 00:44:21 -06:00
Scott Lahteine
2c8c30437e Fix parser parameter value handling 2017-11-14 23:20:33 -06:00
RowanMeara
6131533157 Change dithering behavior to intended. 2017-11-14 00:47:07 -08:00
Scott Lahteine
e70b44dc0b Make sure leveled[] is defined for later use 2017-11-14 02:13:38 -06:00
Scott Lahteine
54774841ba Merge pull request #8416 from thinkyhead/bf2_M114_DETAIL
[2.0] Add M114_DETAIL to Configuration_adv.h
2017-11-14 00:28:55 -06:00
Scott Lahteine
009e3a7aa7 Add M114_DETAIL to Configuration_adv.h 2017-11-14 00:03:17 -06:00
Scott Lahteine
0c7a17a312 Merge pull request #8414 from thinkyhead/bf2_anet_cleanup
[2.0] Fix up REPRAPWORLD_KEYPAD defines
2017-11-13 22:44:43 -06:00
Scott Lahteine
6d6c3b1e97 Fix up REPRAPWORLD_KEYPAD defines 2017-11-13 22:14:54 -06:00
Scott Lahteine
d8199b5db9 Merge pull request #8410 from thinkyhead/bf2_fix_printrboard_pins
[2.0] Move test extrusion options under G26
2017-11-13 21:22:34 -06:00
Scott Lahteine
3f0a982b8c Move Filament Width Sensor to Configuration_adv.h 2017-11-13 21:05:57 -06:00
Scott Lahteine
b76e173205 Move test extrusion options under G26 2017-11-13 21:05:57 -06:00
Scott Lahteine
705801880b Merge pull request #8408 from thinkyhead/bf2_fix_printrboard_pins
[2.0] Support for Extrudrboard in Printrboard Rev.F
2017-11-13 16:07:58 -06:00
Scott Lahteine
14ebedca27 Drop unused LARGE_FLASH option 2017-11-13 15:44:24 -06:00
Scott Lahteine
b7feb53e8a Support for Extrudrboard in Printrboard Rev.F 2017-11-13 15:44:23 -06:00
Scott Lahteine
1b6c25a5e6 Merge pull request #8400 from thinkyhead/bf2_travis_tweaks
[2.0] Update Travis CI, fix compiler warnings
2017-11-13 05:39:14 -06:00
Scott Lahteine
202a9b06d9 Update Travis CI to match 1.1.x
As modified in #8395
2017-11-13 04:43:47 -06:00
Scott Lahteine
91baca6abb Patches for compiler warnings/errors 2017-11-13 04:43:47 -06:00
Scott Lahteine
98efc18f2c Merge pull request #8399 from thinkyhead/bf2_fix_M428
[2.0] Improve and clarify M428 code
2017-11-13 03:06:41 -06:00
Scott Lahteine
2f73dec077 Apply native workspace fixes for G92, G53-59 2017-11-13 02:09:12 -06:00
Scott Lahteine
04abd8d459 Improve and clarify M428 code 2017-11-13 02:09:11 -06:00
Dave Johnson
c009a990e4 [2.0.x] Fix some 8-bit Teensyduino compile warnings (#8385)
* Fix some 8-bit Teensyduino compile warnings

-Override Teensyduino legacy NOT_A_PIN 127 define
-some fixups for Printrboard_RevF pins

* Proper cleanup of Printrboard Rev.F pins

* Apply LCD fixes to Printrboard v1
2017-11-13 01:07:59 -06:00
Scott Lahteine
e8e92f8969 No leveling data in M114 if no leveling is enabled 2017-11-12 23:03:38 -06:00
Scott Lahteine
f5d210c35c Fix report_current_position 2017-11-12 23:02:53 -06:00
Roxy-3D
faaae7a1b2 Provide more clearance for BL-Touch probe 2017-11-12 13:11:22 -06:00
Scott Lahteine
e1e68e4c95 Merge pull request #8382 from thinkyhead/bf2_native_followup
[2.0] Remove offsets from soft endstops, tool change
2017-11-11 23:13:45 -06:00
Scott Lahteine
06ee6584fd Remove offsets from soft endstops, tool change 2017-11-11 22:47:38 -06:00
Scott Lahteine
c938273bd5 Coding standard patch of M290 2017-11-11 22:14:21 -06:00
Scott Lahteine
98c1265e3b Disable laser power when PWM goes to 0 2017-11-11 22:00:22 -06:00
Scott Lahteine
68f2d95f76 Merge pull request #8366 from thinkyhead/bf2_renormalize_pause_e_move
[2.0] Use do_blocking_move_to where possible
2017-11-10 21:26:26 -06:00
Scott Lahteine
d4a1154c25 Use do_blocking_move_to where possible 2017-11-10 20:55:23 -06:00
Scott Lahteine
36426af564 Merge pull request #8356 from tcm0116/2.0.x-M600
[2.0.x] Normalize load/unload length in M600
2017-11-10 19:44:08 -06:00
Scott Lahteine
c0fe6cc34d Merge pull request #8324 from LVD-AC/2.0.x-manual-probe
[2.0.x] PROBE_SELECTED etc.
2017-11-10 19:43:13 -06:00
Scott Lahteine
1ed86adf9c Cleanup around updatePID 2017-11-10 19:27:34 -06:00
Scott Lahteine
75a58ee4b8 Fix position_is_reachable bug in waiting 2017-11-10 19:27:33 -06:00
LVD-AC
e334efb2a7 PROBE_MANUALLY etc. 2017-11-10 19:27:33 -06:00
Bob-the-Kuhn
a886e98967 Merge pull request #8364 from Bob-the-Kuhn/temp-sd-card
2.0.x - LPC1768 - update file to new pin numbering system
2017-11-10 14:59:53 -06:00
Bob-the-Kuhn
b6415dc169 finish 2017-11-10 14:39:55 -06:00
Scott Lahteine
60153b0e3b Merge pull request #8359 from thinkyhead/bf2_chinese_update
[2.0.x] Updates to Traditional Chinese
2017-11-10 04:54:44 -06:00
Scott Lahteine
0efa66be0b Updates to Traditional Chinese
From @cheton at #8347
2017-11-10 04:52:20 -06:00
Scott Lahteine
cba9c1cf9e Add pre-calculated planner.e_factor 2017-11-10 03:14:24 -06:00
Thomas Moore
600c85226e Normalize load/unload length in M600 2017-11-10 02:31:46 -06:00
Scott Lahteine
81b91b3f9d Clean up some trailing white-space 2017-11-10 02:31:04 -06:00
Roxy-3D
2f9848ede3 Correct gMax 1.5+ example file
And...   Keep both branches in synchronization.
2017-11-09 23:44:14 -06:00
Scott Lahteine
450c5f0814 Merge pull request #8326 from Vynt-1/bugfix-2.0.x
[2.0] Add new board from Russia
2017-11-09 21:55:53 -06:00
Scott Lahteine
006dad4b52 Add pins_RURAMPS4D.h & change pins.h
http://3dtoday.ru/blogs/svs0724/ruramps4d-ramps-for-adruino-due-the-pilot-shipment-available-for-zack/
2017-11-09 21:51:06 -06:00
Scott Lahteine
00514857e9 SBASE serial port -1, RAMPS spacing 2017-11-09 21:41:07 -06:00
Scott Lahteine
c66696c507 Merge pull request #8344 from tcm0116/2.0.x-delta_height
[2.0.x] Add delta_height variable in lieu of using home_offset
2017-11-09 01:21:53 -06:00
Scott Lahteine
02e91ffa02 Merge pull request #8343 from thinkyhead/bf2_movement_fixes
[2.0] Fix PROBE_MANUALLY on kinematic bots
2017-11-08 23:20:15 -06:00
Scott Lahteine
22e18fe832 Patch _manual_goto_xy for kinematics 2017-11-08 22:21:38 -06:00
Scott Lahteine
0cfb936dd1 Clarify some motion code 2017-11-08 22:15:55 -06:00
Thomas Moore
f34c3597dc Add delta_height variable in lieu of using home_offset 2017-11-08 22:10:08 -06:00
Bob-the-Kuhn
10896b9431 Merge pull request #8341 from Bob-the-Kuhn/u8g-try-4-Arduino-IDE-compatibility
2.0.x - U8G HAL LCD support - Arduino IDE compatibility
2017-11-08 21:15:50 -06:00
Bob-the-Kuhn
d47fbf791b Arduini IDE compatibility changes
changed includes to make Arduino IDE happy
2017-11-08 20:49:49 -06:00
Scott Lahteine
95ea43bde4 Update XYZ dual stepper configurations 2017-11-08 20:31:43 -06:00
Scott Lahteine
b0b4a20930 Tweaks to core motion code 2017-11-08 20:09:09 -06:00
Scott Lahteine
8805e24cc7 Fix tilt_mesh_based_on_probed_grid output bug 2017-11-08 20:06:20 -06:00
Scott Lahteine
24437fbb13 Fix G26 Y argument bug 2017-11-08 19:20:10 -06:00
Bob-the-Kuhn
5a88e9bc4b Merge pull request #8338 from Bob-the-Kuhn/u8g-try-4-fix-platformio.ini
2.0.x - U8G HAL LCD support - platformio.ini correction
2017-11-08 15:44:26 -06:00
Bob-the-Kuhn
7c274d249b Revert "pins add old names"
This reverts commit 6f70e5618e.
2017-11-08 14:12:47 -06:00
Bob-the-Kuhn
c388dce2b5 move U8glib-HAL 2017-11-08 14:08:09 -06:00
Scott Lahteine
09b05c9d79 Merge pull request #8321 from Bob-the-Kuhn/pins_re-arm
2.0.x - pins_RAMPS_RE_ARM.h - add mega2560 pin numbers
2017-11-08 13:11:13 -06:00
Scott Lahteine
1e555dfcc2 Merge pull request #8336 from thinkyhead/bf2_fix_get_destination
[2.0] Fix get_destination_from_command for E
2017-11-08 13:06:40 -06:00
Scott Lahteine
e6788bb6ae Fix get_destination_from_command for E 2017-11-08 12:54:00 -06:00
Roxy-3D
967104e1ce Default Extrusion Settings were off a few lines in some of the example config files. (#8333) 2017-11-08 11:56:00 -06:00
Bob-the-Kuhn
8875885a15 pins add old names
fix typo

re-write PWM section, add "not on Re-ARM" list
2017-11-08 11:11:38 -06:00
Roxy-3D
1c6e83c137 if !HAS_MESH we still need to do some motion! (#8328)
* if !HAS_MESH we still need to do some motion!

Thank You MagoKimbra !

* Ooops....   need #else and not #elif
2017-11-08 09:42:21 -06:00
Scott Lahteine
004fc55eaf Merge pull request #8317 from thinkyhead/bf2_sprintf_p_fix
[2.0] Patch G33's use of the term PROBE_MANUALLY
2017-11-08 00:59:44 -06:00
Scott Lahteine
82f45c3e6a Patch G33 misuse of PROBE_MANUALLY 2017-11-08 00:36:06 -06:00
Bob-the-Kuhn
6f70e5618e pins add old names 2017-11-07 23:37:57 -06:00
Scott Lahteine
064e6fe60e Remove debugging pin toggle from LCD code 2017-11-07 23:00:54 -06:00
Bob-the-Kuhn
29fb48799d Merge pull request #8262 from Bob-the-Kuhn/u8g-try-4
2.0.x - U8G HAL LCD support
2017-11-07 19:57:00 -06:00
Bob-the-Kuhn
0483a7df91 AVR RRD works
LPC1768 VIKI2 & RRDFG are working

looks like all SPIs are working

library change

sh1106 locks up

fixed lockup, started I2C SW com

pretty

re-org

restore a few files

make library happy

switched HAL version of rrd

fix travis error

travis error fixes

another travis fix

cleanup

minor update

one more

correct spacing in platformio.ini
2017-11-07 18:40:29 -06:00
Scott Lahteine
a34b5a2bfa Merge pull request #8314 from thinkyhead/bf2_sprintf_p_fix
[2.0] Patch abuse of sprintf_P in G33
2017-11-07 17:50:55 -06:00
Scott Lahteine
96c9d715f3 Patch abuse of sprintf_P in G33 2017-11-07 17:33:50 -06:00
Roxy-3D
ed62c621d7 Fix G26 Circle Drawing. Add Default Extrusion Settings (#8313)
- Fix G26 Circle Drawing.
- Add default extrusion settings so machine can print lines on print bed
- Yet to be done: Get LCD Menu's to use these settings.
2017-11-07 17:13:53 -06:00
Scott Lahteine
efa8f20b2f Merge pull request #8312 from thinkyhead/bf2_thermal_docs
[2.0.x] Update Thermal Protection Documentation
2017-11-07 16:32:25 -06:00
Scott Lahteine
8fea26aa9d Fix PID_autotune watch temp increase value 2017-11-07 15:51:48 -06:00
Scott Lahteine
2c099fd4c2 Update Thermal Protection Documentation 2017-11-07 15:46:44 -06:00
Colten Edwards
a6160916b0 [2.0] Fix M48 for delta printers/ABL compile issue (#8286)
* fix M48 for delta printers

fix M48 for delta printers. home printer if not already homed.

* remove ENABLED(DELTA)

remove ENABLED(DELTA) as it is not needed.

* Update M48.cpp

* abl needs queue.h

without queue.h abl will not compile since there is a script that runs at the end of it and we need to queue it up.
2017-11-07 15:36:33 -06:00
Scott Lahteine
776cb52629 Merge pull request #8310 from thinkyhead/bf2_fixes_for_117
[2.0] Fix G92 for native workspace
2017-11-07 13:23:03 -06:00
Scott Lahteine
17ef0a513b Update G92 for native workspace 2017-11-07 13:07:16 -06:00
Scott Lahteine
b4bf8928aa German language updates
Corresponding to #8306
2017-11-07 12:10:29 -06:00
Scott Lahteine
e54881c408 Merge pull request #8304 from tcm0116/2.0.x-delta_eeprom
[2.0.x] Fix Delta EEPROM
2017-11-07 12:04:13 -06:00
Thomas Moore
73ca5345e1 Fix Delta EEPROM 2017-11-07 16:48:21 +00:00
Scott Lahteine
714d2b9bbc Merge pull request #8297 from thinkyhead/bf2_M118_and_others
[2.0] Fix M118, compiler warnings, etc.
2017-11-06 23:25:49 -06:00
Alexey Shvetsov
83555933aa Add platformio support for stm32 (#8246)
[2.0] Add platformio support for stm32
2017-11-06 23:03:59 -06:00
Scott Lahteine
85a62bbf46 Misc. fixes to compiler warnings, etc. 2017-11-06 22:57:05 -06:00
Scott Lahteine
e6aba99f16 Fix M118 parameters, with strict guideline 2017-11-06 22:57:01 -06:00
Scott Lahteine
6718579ccf Merge pull request #8294 from thinkyhead/bf2_fix_fallback_font
[2.0] Patch non-extended font option
2017-11-06 22:01:08 -06:00
Scott Lahteine
e9b1944a67 Patch non-extended font option 2017-11-06 21:42:21 -06:00
Roxy-3D
6324b09934 Revert "Fix EEPROM crc (#8284)" (#8292)
This reverts commit 172c36f517.
2017-11-06 19:52:05 -06:00
Rowan Meara
172c36f517 Fix EEPROM crc (#8284) 2017-11-06 19:19:30 -06:00
Scott Lahteine
cc4d28b73c Update bilinear for native workspace 2017-11-06 17:04:41 -06:00
Scott Lahteine
94c7205d64 Merge pull request #8281 from thinkyhead/bf2_alligator_dac
[2.0] Use fastio for Alligator dac084s085, etc.
2017-11-06 12:16:18 -06:00
Scott Lahteine
2246316605 Fix name collision. timer_t => hal_timer_t 2017-11-05 19:31:07 -06:00
Jason Hitesman
4efaef7039 [2.0.x] Fix archim2 SSDS define (#8278)
* Fix SSDS define

* Update pins_ARCHIM2.h
2017-11-05 19:23:19 -06:00
Scott Lahteine
c8dfa26bc8 Use fastio for STM32F1 endstop interrupts 2017-11-05 19:20:28 -06:00
Scott Lahteine
185dec800b Use fastio for HAL SPI EEPROM 2017-11-05 19:20:03 -06:00
Scott Lahteine
297666ea14 Use fastio for Alligator dac084s085 2017-11-05 19:14:42 -06:00
Scott Lahteine
c5d95d318b Merge pull request #8249 from thinkyhead/bf2_nozzle_cleanup
[2.0] Cleanup Nozzle class, fix XY vs Z move order
2017-11-05 18:51:11 -06:00
Scott Lahteine
7e2fee9d56 Merge pull request #8274 from tcm0116/2.0.x-re_arm_D8
[2.0.x] Correct RAMPS_D8_PIN for Re-ARM
2017-11-05 18:39:28 -06:00
Scott Lahteine
59c558d612 Merge pull request #8275 from GMagician/2.0.x-Typo-fix
[2.0.x] typo fix (removed spaces)
2017-11-05 18:39:04 -06:00
Scott Lahteine
be73d5cc08 Cleanup Nozzle class, fix XY vs Z move order 2017-11-05 18:31:07 -06:00
Scott Lahteine
2e33c3bdc2 Merge pull request #8270 from studiodyne/studiodyne-fw
fwretract bug/mistake + suggestion
2017-11-05 18:21:22 -06:00
GMagician
9e93b7ccbd [2.0.x] removed spaces
Removed spaces in array declaration
2017-11-05 20:42:48 +01:00
Thomas Moore
b91a822d7a Correct RAMPS_D8_PIN for Re-ARM 2017-11-05 13:03:42 -06:00
studiodyne
d295f984e3 Update fwretract.cpp 2017-11-05 15:42:30 +01:00
Scott Lahteine
7de8a66780 Merge pull request #8256 from thinkyhead/bf2_cnc_coordinate_sys
[2.0.x] CNC_COORDINATE_SYSTEMS
2017-11-04 22:49:31 -05:00
Scott Lahteine
1b40e9c464 Implement CNC_COORDINATE_SYSTEMS 2017-11-04 22:28:46 -05:00
Scott Lahteine
1b42fba39b Add CNC_COORDINATE_SYSTEMS to configs 2017-11-04 22:28:46 -05:00
Scott Lahteine
a22434508f Match tweaks to G33 from 1.1 2017-11-04 22:28:46 -05:00
Scott Lahteine
c07bbd4154 Prettify some EEPROM code 2017-11-04 22:28:46 -05:00
Scott Lahteine
d6aa127c76 Remove I2CPEM workspace offset 2017-11-04 22:28:46 -05:00
Scott Lahteine
79772219ae Fix Fan Multiplexer init 2017-11-04 22:28:46 -05:00
Scott Lahteine
47e0ee8eff Merge pull request #8260 from thinkyhead/bf2_anet_keypad_ramps
[2.0] RAMPS pins for ANET_KEYPAD_LCD
2017-11-04 21:49:13 -05:00
Scott Lahteine
ca7d36d9ed RAMPS pins for ANET_KEYPAD_LCD 2017-11-04 21:22:53 -05:00
Scott Lahteine
52aec32f3a Merge pull request #8258 from thinkyhead/bf2_git_scripts
[2.0] Update git helper scripts
2017-11-04 21:03:17 -05:00
Scott Lahteine
ca21367dde Update git helper scripts 2017-11-04 18:35:34 -05:00
Colten Edwards
e0a6ee8da5 [2.0] Fix up G33, LPC1768 + SDCARD_SORT_ALPHA (#8250)
* Update Conditionals_post.h

* Add a cast to round() to convert to a unsigned int

Add's a cast to round() so that it will compile properly. round() returns a float which must be cast to a integer for the following % operation. Use a unsigned int as a negative index to an array is wrong. Should never be more than 255 points allowing us to use a 8 bit cast.

* Update G33.cpp
2017-11-04 18:04:18 -05:00
Scott Lahteine
46c0b73578 Merge pull request #8252 from PaoloP74/patch-1
Update README.md
2017-11-04 15:12:23 -05:00
Scott Lahteine
dac1f6fe74 Tweaks to cubic_b_spline code style 2017-11-04 14:46:10 -05:00
Scott Lahteine
4df024d7b9 Merge pull request #8234 from thinkyhead/bf2_native_operation
[2.0.x] Operate in Native Machine Space
2017-11-04 14:31:44 -05:00
Scott Lahteine
601ccded89 Fix case-insensitive config issue 2017-11-04 14:10:13 -05:00
Paolo Paolucci
944b67b0b8 Update README.md 2017-11-04 16:23:12 +01:00
Scott Lahteine
f8393a0908 Operate in Native Machine Space 2017-11-04 00:05:38 -05:00
Scott Lahteine
d83a9a53e8 Merge pull request #8220 from thinkyhead/bf2_serial_port_-1
[2.0] Add SERIAL_PORT -1 option for configurators
2017-11-03 15:25:12 -05:00
Scott Lahteine
93ba72ea83 Add SERIAL_PORT -1, set on SBASE, STM32F103RET6 2017-11-03 15:22:45 -05:00
Scott Lahteine
b561ee2738 Merge pull request #8244 from thinkyhead/bf2_probes_link
[2.0] Fix probes configuration url
2017-11-03 13:45:53 -05:00
Scott Lahteine
7e43dd1d23 Fix probes configuration url
Based on #8241 by @machaj
2017-11-03 13:35:40 -05:00
Scott Lahteine
f606ebf8ee Merge pull request #8238 from AnHardt/2.0_boot/kill_screen_cleanup
[2.0] Some cleanup around 'lcd_bootscreen()' and 'lcd_kill_screen()'
2017-11-03 13:31:49 -05:00
AnHardt
ca0e4b4e96 Some cleanup around 'lcd_bootscreen()' and 'lcd_kill_screen()'
Move 'lcd_bootscreen()' from `lcd_init()` to 'setup()' where it is cexecute exactly once. Saves 'bool show_bootscreen'.
Move the call of 'lcd_custom_bootscreen()' to the begin of 'lcd_bootscreen()'.
Move the delays into the related functions.
Move the picture loop around 'lcd_kill_screen()' into the function.
2017-11-03 12:02:48 +01:00
Scott Lahteine
84b93d941f Merge pull request #8178 from thinkyhead/bf2_config_tweak
[2.0.x] Faster menu navigation for Anet A8
2017-11-03 04:49:17 -05:00
teemuatlut
70be4d206e [2.0.x] UltiMachine Archim2 (#8190)
* UltiMachine Archim2 support

* SPI gets included by the library

* Invert TMC2130 diag pin state

* Clean up Archim2 pins

* Update Archim2 config

* FAN2 -> FAN1

* Cleanup

* Add brief Archim installation instructions

* Bring pins into compliance

* Update 1.0 SD Detect pin for 1.1

* Update Configuration.h

* Update pins_ARCHIM2.h
2017-11-03 04:48:15 -05:00
Scott Lahteine
f3deb37bdf Merge pull request #8236 from thinkyhead/bf2_protect_M303
[2.0.x] M303 thermal runaway protection
2017-11-03 04:42:14 -05:00
Scott Lahteine
31f112cf58 Cleanup trailing whitespace 2017-11-03 04:07:45 -05:00
Scott Lahteine
2f9e42feb9 M303 thermal runaway protection 2017-11-03 03:57:46 -05:00
Scott Lahteine
e5ae545647 Remove ADCKey steps acceleration 2017-11-03 03:41:55 -05:00
Luc Van Daele
6827e243a0 [2.0.x] G33 magic numbers (#8171)
* [2.0.x] G33 magic numbers

* oops

* Comments

* oops

* warning

* better comment section

* remarks

* extra grids
2017-11-03 03:36:16 -05:00
Scott Lahteine
8735ae984b Merge pull request #8227 from tcm0116/2.0.x-pin_mapping
LPC1768: updates to use the new pin_t typedef
2017-11-03 03:10:19 -05:00
Scott Lahteine
3749a746f1 Merge pull request #8231 from AnHardt/2.0_watchdog
[2.0] Fix watchdog in WATCHDOG_RESET_MANUAL mode AVR
2017-11-03 03:06:28 -05:00
AnHardt
c72a0610b4 Fix watchdog in WATCHDOG_RESET_MANUAL mode AVR 2017-11-03 04:43:00 +01:00
Thomas Moore
13d839795c LPC1768: updates to use the new pin_t typedef 2017-11-02 18:43:57 -05:00
Scott Lahteine
676a564610 Merge pull request #8225 from thinkyhead/bf2_mks_gen_l
[2.0.x] Add MKS Gen L board
2017-11-02 17:07:59 -05:00
Scott Lahteine
eb13b8d985 Add MKS Gen L board 2017-11-02 17:06:08 -05:00
Morten
063e957fc4 Update pins_MKS_SBASE.h (#8188)
* Update pins_MKS_SBASE.h

Deleted E_MUX2, not used.
Changed #define LCD_PINS_D4      P0_14  // EXP1.5 to #define LCD_PINS_D4      P0_15  // EXP1.5, wrong in MKS's pinout schematic.
Swapped TEMP_BED_PIN and TEMP_0_PIN port's, request from user, more logical...

* Update pins_MKS_SBASE.h

Moved MUX signals to J8 and re added MUX2, cleaner wiring..
2017-11-02 13:50:23 -05:00
Scott Lahteine
f7133e53fd Fix case light off
Addressing #8205
2017-11-01 21:22:15 -05:00
Alexey Shvetsov
fd8f433cc2 Add Azteeg X5 GT to supported list (#8185)
* Add Azteeg X5 GT to supported list

Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>

* Update README.md
2017-11-01 11:49:51 -05:00
Scott Lahteine
32a9db3e93 Merge pull request #8197 from thinkyhead/bf2_asterisk_not_special
Allow asterisks in G-Code commands
2017-10-31 21:53:43 -05:00
Scott Lahteine
0108d5181f Allow asterisks in G-Code commands
Addressing #6655
2017-10-31 21:20:41 -05:00
Scott Lahteine
3a81646c9a Merge pull request #8192 from thinkyhead/bf2_silver_gate
[2.0.x] Support for SilverGate Board
2017-10-31 16:30:14 -05:00
Scott Lahteine
34745b2183 Organize boards.h by architecture 2017-10-31 16:10:38 -05:00
android444
9cc1d8e312 [2.0.x] Support for SilverGate Board 2017-10-31 15:27:26 -05:00
Scott Lahteine
03e5369411 Faster menu navigation for Anet A8
Addressing #8166
2017-10-31 14:46:55 -05:00
Scott Lahteine
f1edf83720 Merge pull request #8187 from rafaljot/patch-5
Update InterruptVectors_Due.cpp
2017-10-31 14:14:08 -05:00
Scott Lahteine
b2bd77c40a Merge pull request #8191 from thinkyhead/bf2_rearm_more
[2.0.x] Add SDCARD_SORT_ALPHA options for LPC1768
2017-10-31 14:12:14 -05:00
Scott Lahteine
571ced712d Add SDCARD_SORT_ALPHA options for LPC1768 2017-10-31 14:05:40 -05:00
rafaljot
778e4e4c23 Update InterruptVectors_Due.cpp
const pfnISR_Handler *isrtab = get_relocated_table_addr();

What compiler do you use? Arduino 1.8.5 can't compile this "const".
2017-10-31 15:00:06 +01:00
Scott Lahteine
cae8703e0d Merge pull request #8181 from thinkyhead/bf2_fix_bootscreen_repeat
[2.0.x] Only show custom bootscreen once
2017-10-31 02:37:40 -05:00
Scott Lahteine
a516856df9 Only show custom bootscreen once 2017-10-31 01:47:30 -05:00
GMagician
727a403ba1 [2.0.x] Fix NO_MOTION_BEFORE_HOMING unwanted behaviour (#8176)
* [2.0.x] Fix NO_MOTION_BEFORE_HOMING unwanted behaviour

NO_MOTION_BEFORE_HOMING should prevent XYZ movements only when homing is not done.
E axes should be allowed

* Update G0_G1.cpp

* Update G0_G1.cpp
2017-10-30 22:50:22 -05:00
Alexey Shvetsov
577659cacf Basic support for Azteeg_X5_GT (#8139)
* Basic support for Azteeg_X5_GT

Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>

* Add fan pins for AZTEEG X5 GT

Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>

* Fix endstop pins

* Add servo0 pin
2017-10-30 16:01:20 -05:00
Scott Lahteine
0b02f9cc33 Merge pull request #8168 from thinkyhead/bf2_config_tweak
[2.0.x] Apply Re-ARM SPI review items
2017-10-30 15:49:50 -05:00
Scott Lahteine
1f38761da2 Merge pull request #8169 from thinkyhead/bf2_kinematic_soft_endstops
[2.0.x] Kinematic clamp_to_software_endstops
2017-10-30 15:49:10 -05:00
Scott Lahteine
04c0d9f3c3 Implement kinematic software endstops 2017-10-30 15:16:30 -05:00
Scott Lahteine
9f89b5d876 Fix for MAX_VFAT_ENTRIES sanity check 2017-10-30 15:11:47 -05:00
Scott Lahteine
2cdde08339 Apply items specified in code review
Followup to #8122
2017-10-30 15:03:07 -05:00
Scott Lahteine
34be5d33c0 The plural of 'axis' is 'axes' 2017-10-30 14:21:43 -05:00
Bob-the-Kuhn
6e5f13a5c2 Merge pull request #8122 from Bob-the-Kuhn/2.0.x-restore-Re-ARM-RepRap-Discount-Full-Graphics-fix-(partial-solution)
2.0.x - Restore fix for garbaged display on Re-ARM with RepRap Full Graphics Smart Controller
2017-10-30 13:16:16 -05:00
Bob-the-Kuhn
b7a66742dd tested
add sort alpha section to other LPC1768 boards
2017-10-30 13:01:19 -05:00
Scott Lahteine
f505a04043 Merge pull request #8162 from jeffyl/fix_azsmz
[2.0.x] Fix AZSMZ Mini pins for new LPC1768 pinmapping
2017-10-30 12:47:21 -05:00
Jeffrey Li
bbc2e66634 Fix AZSMZ MINI pins for new LPC1768 pinmapping 2017-10-30 04:19:06 -07:00
Scott Lahteine
31e96935f7 Fix EXTRA_FAN_SPEED
Addressing #8158
2017-10-30 00:10:00 -05:00
Scott Lahteine
c94dce6b32 Merge pull request #8113 from thinkyhead/bf2_fixup_sd_reprint
[2.0.x] Cleanup after SD Print Again, whitespace, tabs
2017-10-29 23:57:51 -05:00
Scott Lahteine
ce1c9c0808 Tweak QUICK_HOME description 2017-10-29 23:48:13 -05:00
Scott Lahteine
12458cefc4 Remove 5s timer hack. Encoder pos is saved on print start! 2017-10-29 22:45:19 -05:00
Scott Lahteine
9a4cf11835 Remove return_to_status_ms hack, just use defer... 2017-10-29 22:45:18 -05:00
Scott Lahteine
8949c8c0a5 Move SD_REPRINT_LAST_SELECTED_FILE to ultralcd.cpp 2017-10-29 22:45:18 -05:00
Scott Lahteine
817175613a Merge pull request #8157 from thinkyhead/bf2_anet_10_servo
[2.0.x] Define a default SERVO0_PIN for Anet 1.0
2017-10-29 19:55:00 -05:00
Scott Lahteine
233ddf80da Merge pull request #8141 from thinkyhead/bf2_dual_xyz_endstops
[2.0.x] Dual endstops XYZ
2017-10-29 19:50:04 -05:00
Scott Lahteine
723f2a77f6 Implement support for Dual X and Y endstops 2017-10-29 18:56:04 -05:00
Scott Lahteine
7465ede058 Add scripts for .travis.yml to append config options 2017-10-29 18:56:04 -05:00
Scott Lahteine
e04425281d Add Dual Steppers / Endstops to configs 2017-10-29 18:56:04 -05:00
Scott Lahteine
edff2c917b Cleanup for DIGIPOTS settings 2017-10-29 18:56:03 -05:00
Scott Lahteine
3e8754a38a Add/correct time units on planner vars / M205 B 2017-10-29 18:47:21 -05:00
Scott Lahteine
b2a48f1a04 Provide a SERVO0_PIN for non-standard LCD 2017-10-29 18:36:16 -05:00
Scott Lahteine
10a1f07684 Add mfup to mfpub to get upstream changes 2017-10-29 18:36:16 -05:00
Scott Lahteine
b232f39341 AVR: Hidden option to use 8s watchdog 2017-10-29 18:36:16 -05:00
Scott Lahteine
9d4cfd2013 Merge pull request #8142 from thinkyhead/bf2_fix_m303
[2.0.x] Fix M303 thermal protection
2017-10-29 04:46:34 -05:00
Scott Lahteine
eae0aea1e0 Fix M303 thermal protection 2017-10-29 04:30:50 -05:00
Luc Van Daele
a1a4fc277e (2.0.x) serious bug G33 (#8136)
* (2.0.x) serious bug G33

* Revert config changes

This reverts commit 74b5a98223b7b7fb970d05b8541f4a079c3cfe56.
2017-10-29 04:12:33 -05:00
Thomas Moore
325233b454 Fix automatic stepper assignment for X/Y/Z dual stepper drivers (#8130) 2017-10-28 19:45:07 -05:00
Thomas Moore
50b4f9cbf7 LPC1768 Pin Mapping and M43 cleanup (#8119)
* LPC1768 M43 cleanup

* Update pinmapping.h to #define pins
2017-10-28 19:44:54 -05:00
Scott Lahteine
630677bec6 Merge pull request #8129 from thinkyhead/bf2_revert_babystep_mult
[2.0.x] Revert default BABYSTEP_MULTIPLICATOR to 1
2017-10-27 20:04:22 -05:00
Scott Lahteine
6b1d1a818b Revert default BABYSTEP_MULTIPLICATOR to 1 2017-10-27 19:45:44 -05:00
Scott Lahteine
c1c3ca6f8a Merge pull request #8082 from thinkyhead/bf2_xon_xoff_due
[2.0.x] Arduino Due XON/XOFF implementation
2017-10-27 19:23:35 -05:00
etagle
ba8dc678f5 Arduino Due XON/XOFF implementation
Alos includes emergency parser and configurable TX/RX buffers for Arduino Due.
2017-10-27 03:24:23 -05:00
etagle
8d9c3cc2b7 Add a module for Due SRAM-based Interrupt Vector Table
This is the ONLY way to be able to override ISRs stolen by the Arduino Runtime, such as Serial or USB device interrupts. This feature is needed so Arduino modules can be replaced and enhanced.
2017-10-27 03:24:23 -05:00
etagle
c9bbef6380 Cosmetic fix for HAL_AVR/MarlinSerial.cpp
Instead of using const char, it is better to use uint8_t
2017-10-27 03:24:23 -05:00
Scott Lahteine
203f2923a1 Cleanup, apply standards to debug_frmwrk.c
Although this is an external contribution, clean up anyway to stop seeing it in global searches for typical flaws.
2017-10-27 03:24:23 -05:00
Scott Lahteine
55653dce63 Merge pull request #8115 from thinkyhead/bf2_autotune_G33
[2.0.x] G33 Autotune calibration update
2017-10-27 02:42:17 -05:00
LVD-AC
dcfc2503c2 G33 Autotune calibration update #10 2017-10-27 02:11:24 -05:00
Scott Lahteine
b338cafc65 Merge pull request #8111 from thinkyhead/bf2_fwretract_fix_oct26
[2.0.x] Improved Firmware Retraction logic
2017-10-27 02:02:06 -05:00
Scott Lahteine
ada90f7335 Clean up trailing spaces 2017-10-26 23:33:43 -05:00
Scott Lahteine
7fad26549b Concise SD_REPRINT_LAST_SELECTED_FILE description 2017-10-26 23:33:02 -05:00
Scott Lahteine
33f379fe88 Add some Polish language
Thanks @SCiunczyk
2017-10-26 22:49:04 -05:00
Scott Lahteine
daeff5a11a Tweak neopixel self-test 2017-10-26 22:47:07 -05:00
Scott Lahteine
0ceec1f166 Fix leveling_active_at_z warning 2017-10-26 22:22:54 -05:00
studiodyne
eb02f8c719 Improve FWRETRACT logic, add common sense 2017-10-26 22:22:54 -05:00
Scott Lahteine
3f827758d7 Merge pull request #8047 from thinkyhead/bf2_babystepping_M290
[2.0.x] Add M290 Babystepping (extended)
2017-10-26 21:02:21 -05:00
Scott Lahteine
bd78ca0ee3 Add M290 Babystepping 2017-10-26 20:44:43 -05:00
Chris Pepper
636c3bbc4e LPC1768: Travis lpc1768 default config test (#8109)
Add a single default travis test for lpc1768 to catch build errors
2017-10-26 17:49:32 -05:00
Scott Lahteine
ce5f0ec85a Bring STM32 example config up to date 2017-10-26 17:25:44 -05:00
Scott Lahteine
46e9eae159 Tweak to M100 config comment 2017-10-26 17:25:44 -05:00
Scott Lahteine
c45514f811 Merge pull request #8094 from thinkyhead/bf2_neopixel_led_parity
[2.0.x] Bring NEOPIXEL_LED into parity with 1.1.x
2017-10-26 17:24:38 -05:00
Bob-the-Kuhn
cc72db2636 Merge pull request #8092 from Bob-the-Kuhn/2.0.x-reduce-font-size-
2.0.x - save 1400 bytes of FLASH by using reduced font for some languages
2017-10-26 16:35:53 -05:00
Bob-the-Kuhn
229a27a1c7 save FLASH by using reduced font for some languages 2017-10-26 16:08:17 -05:00
Roxy-3D
3f5f39576b Reprint option for last SD Memory card file (#8106)
* Re-Print of same SD Memory Card file with single click

* Re-Print of same SD Memory Card file with single click
* This is the bugfix-v2.0.0 version of  https://github.com/MarlinFirmware/Marlin/pull/8104
2017-10-26 15:50:18 -05:00
Thomas Moore
9e699811d2 Make LPC1768 pinmapping not specific to Re-ARM (#8063)
* Merging early because of build failures.  See #8105

* Make LPC1768 pinmapping not specific to Re-ARM

* Add HAL_PIN_TYPE and LPC1768 pin features

* M43 Updates

* Move pin map into pinsDebug_LPC1768.h

* Incorporate comments and M226

* Fix persistent store compilation issues

* Update pin features

* Update MKS SBASE pins

* Use native LPC1768 pin numbers in M42, M43, and M226
2017-10-26 13:37:26 -05:00
Scott Lahteine
3ac581eac9 Neopixel changes for parity with 1.1.x 2017-10-25 18:40:04 -05:00
Scott Lahteine
e4266d0fde Merge pull request #8093 from GMagician/gitignore-duplicate-entry-remove
Removed duplicate entry in gitignore
2017-10-25 18:36:00 -05:00
GMagician
49f8c8fd7b Removed duplicate entry in gitignore 2017-10-25 23:17:16 +02:00
Scott Lahteine
da2dc2bfa4 README: MKS SBASE to the "supported" list 2017-10-25 15:35:24 -05:00
jeffyl
7b3098bbd5 Add AZSMZ Mini (#8005)
* Add AZSMZ Mini

* Remove tabs, adjust spacing

* Renumber boards to group by family

* Patch up spacing

* Tweak
2017-10-25 01:16:54 -05:00
Scott Lahteine
e00ed10c4c GT2560 config MKS_MINI_12864 => SDSUPPORT 2017-10-25 01:12:48 -05:00
Scott Lahteine
10a5e4d80f Merge pull request #8078 from thinkyhead/bf2_mks_mini_lcd
[2.0.x] Add MKS MINI 12864 support to GT2560
2017-10-25 01:10:03 -05:00
Scott Lahteine
6b1eddda06 Merge pull request #8009 from GMagician/gitignore-update
gitignore update
2017-10-24 19:16:17 -05:00
Scott Lahteine
ee9b8bf0f1 Add MKS MINI 12864 support to GT2560 2017-10-24 19:15:41 -05:00
Scott Lahteine
f65fc7ffab Merge pull request #8044 from thinkyhead/bf2_mesh_consolidate
[2.0.x] Simplify mesh bounds config
2017-10-24 18:56:43 -05:00
Scott Lahteine
070cd34fe8 Merge pull request #8077 from thinkyhead/bf2_MKS_BASE_followup
Clean up HAL trailing spaces, MKS SBASE pins
2017-10-24 18:38:48 -05:00
Scott Lahteine
7f55d82fd1 Move UBL_SAVE_ACTIVE_ON_M500 to Configuration.h 2017-10-24 18:26:43 -05:00
Scott Lahteine
90a14b4f5b Clean up HAL trailing spaces, MKS SBASE pins 2017-10-24 18:20:23 -05:00
Thomas Moore
51fafccc16 [2.0.x] Enable hardware serial ports on LPC1768 (#8004)
* Enable hardware serial ports on LPC1768

* Fix compilation errors with other HALs

* FIx order of includes in LPC1768 HAL main.cpp

* Add support for RX_BUFFER_SIZE and TX_BUFFER_SIZE options in Configuration_adv.h
2017-10-24 17:28:33 -05:00
Scott Lahteine
580b6e9089 Apply physical limits to mesh bounds 2017-10-24 16:54:07 -05:00
Scott Lahteine
4e2baeb3e1 Update indentation, file-wrapping for Marlin 2.0.x 2017-10-24 16:54:06 -05:00
Scott Lahteine
60af705e6d Relocate SPI.h to the HAL folder 2017-10-24 16:54:06 -05:00
Scott Lahteine
46aae4c6e7 Merge pull request #8074 from thinkyhead/bf2_verbiage_like_8061
Fix some config verbiage
2017-10-24 15:25:12 -05:00
Scott Lahteine
3356d5a72d Merge pull request #8072 from thinkyhead/bf2_fix_M600
[2.0.x] Fix position sync in M600 pause/resume
2017-10-24 14:55:46 -05:00
Scott Lahteine
5f87324536 Fix some config verbiage 2017-10-24 14:53:42 -05:00
Scott Lahteine
272f9f65dc Fix some typos 2017-10-24 14:29:15 -05:00
studiodyne
8181220bfd Fix position sync in M600 pause/resume 2017-10-24 14:29:15 -05:00
cdedwards
6296ab2173 Add GFX overlay to UBL mesh edit (#8038)
* Add GFX overlay to UBL mesh edit

Fixed misplaced HAS_TEMP_BED in dogm_bitmaps.h

rename _lcd_babystep_zoffset_overlay to _lcd_zoffset_overlay_gfx and move it out of BABYSTEP_ZPROBE_OFFSET to we can use it for over things. Add this function into UBL mesh edit screen.

update all Configuration.h to add ENABLE_MESH_EDIT_GFX_OVERLAY

* Add Sanity to UBL  insanity

Need to check for DOGLCD  otherwise error out.
2017-10-24 14:14:03 -05:00
Roxy-3D
72156a2029 change to better (more clear) names (#8050)
set_destination_to_current() changed to set_destination_from_current()

set_current_to_destination() changed to set_current_from_destination()
2017-10-21 11:42:26 -05:00
Scott Lahteine
adf168e68f Merge pull request #8046 from thinkyhead/bf2_fix_micromake_endstops
[2.0.x] Add Makeboard MINI pins to fix Micromake C1
2017-10-21 01:04:29 -05:00
Scott Lahteine
0cb423b5b3 Apply consistency for other configs 2017-10-21 00:41:51 -05:00
Scott Lahteine
8c78f8f790 Add Makeboard MINI for Micromake C1 2017-10-21 00:41:51 -05:00
Scott Lahteine
1fbb307aaf Merge pull request #8021 from thinkyhead/bf2_scroll_longnames
[2.0.x] Add SCROLL_LONG_FILENAMES to reveal longer filenames
2017-10-20 21:33:54 -05:00
Scott Lahteine
3d2b2eb1ca Prevent SDCARD_SORT_ALPHA from exploding 2017-10-20 19:13:21 -05:00
Scott Lahteine
783ddf9691 Add SCROLL_LONG_FILENAMES option 2017-10-20 19:13:21 -05:00
Roxy-3D
5439358281 Basic UBL operations working on 32-bit platforms (#8024)
* 32-bit work for UBL

* Update FT i3-2020 reference file
2017-10-19 10:44:45 -05:00
Scott Lahteine
9e5cbf0198 BQ should set this in its config, and does 2017-10-18 22:56:03 -05:00
Scott Lahteine
348e5e3109 Simplify Cartesian probing boundaries
Followup to #8012
2017-10-18 17:14:32 -05:00
Luc Van Daele
3986a84f77 boolval revisited (#8016) 2017-10-18 14:03:17 -05:00
Roxy-3D
572cf0ec95 UBL able to generate mesh and save and load it on 32-bit platforms (#8015)
* Get UBL Mesh Generation, Mesh Save & Mesh Load working with 32-Bit platforms

* clean up read_data() and write_data() for non-LPC1768 HAL's

* Get read_data() and write_data() return codes consistent

All HAL's read_data() and write_data() return false if they succeed.

* Get read_data() and write_data() return codes to be consistent

Make read_data() and write_data() return true if an error happens.

* Say UBL is now checked out on machine types in default Configuration.h file.
2017-10-18 14:00:29 -05:00
Thomas Moore
67cc29cd3c Update UBL mesh boundaries to accomidate beds centered at 0, 0 (#8012) 2017-10-18 10:03:30 -05:00
GMagician
9736c962fe gitignore update
This is needed by thirdy part extension
This extension automatically regenerate filters to get a layout divided by folders and not by "sources" and "headers"
2017-10-17 23:43:22 +02:00
Roxy-3D
6cb26c98c8 Fix Baby Stepping on 32-Bit platforms (#8001)
Also, Max7219 debug code was used for this effort.   It has been
improved and hardened.
2017-10-16 16:29:37 -05:00
Scott Lahteine
3b7b0492f8 Merge pull request #7993 from jeffyl/bugfix-2.0.x
[2.0.x] Proper support for AZSMZ 12864 LCD on SmartRAMPS
2017-10-16 14:12:29 -05:00
Jeffrey Li
26531f2715 Add lcd to all sample configs 2017-10-16 03:24:25 -07:00
Scott Lahteine
02f2979760 Merge pull request #7992 from thinkyhead/bf2_M106_memorize
[2.0.x] Add EXTRA_FAN_SPEED feature
2017-10-16 05:19:40 -05:00
Scott Lahteine
ce48403a0b Add EXTRA_FAN_SPEED feature
Based on #7883 by @studiodyne
2017-10-16 02:34:13 -05:00
Jeffrey Li
eeb4611606 Add proper support for the AZSMZ 12864 LCD on a SMART RAMPS 2017-10-16 00:33:07 -07:00
Scott Lahteine
3e7b24278f Fix usage line in temperature table script 2017-10-16 00:17:32 -05:00
Scott Lahteine
bacea22a26 Update thermistor table script for current format 2017-10-16 00:15:48 -05:00
Scott Lahteine
c46189e429 Fix UBL+Delta segmented feedrate
Based on #7948
2017-10-15 16:31:09 -05:00
Scott Lahteine
a12ab611ae Merge pull request #7987 from thinkyhead/bf2_progress_percentage
[2.0.x] Add M73 (LCD_SET_PROGRESS_MANUALLY)
2017-10-15 16:13:23 -05:00
Scott Lahteine
5c4f3e0107 Add LCD_SET_PROGRESS_MANUALLY 2017-10-15 03:05:29 -05:00
Scott Lahteine
014a83fe09 Merge pull request #7984 from thinkyhead/bf2_micromake_c1
[2.0.x] Micromake C1 Configurations, Unaccented French
2017-10-14 21:19:32 -05:00
Scott Lahteine
bc7df0188e Add Micromake C1 configurations 2017-10-14 20:28:12 -05:00
Scott Lahteine
34a261416f Add unaccented French language 2017-10-14 20:28:12 -05:00
Scott Lahteine
af2397d581 Merge pull request #7979 from thinkyhead/bf2_granular_sw_endstops
[2.0.x] Software endstop options by axis
2017-10-14 19:57:16 -05:00
Scott Lahteine
e587f0893c Define AVR_ATmega2560_FAMILY_PLUS_70 in Conditionals 2017-10-14 19:05:32 -05:00
Scott Lahteine
fd128b3c93 Fix some AVR HAL code style 2017-10-14 19:05:10 -05:00
Scott Lahteine
799360c576 Enhance Teensy/RAMPS pins files 2017-10-14 18:44:20 -05:00
Scott Lahteine
d3e5a22a5d Add MIN_SOFTWARE_ENDSTOP_[XYZ] to example configs 2017-10-14 18:44:20 -05:00
Jeff Eberl
b206f70693 Split the software endstop capability by axis. 2017-10-14 18:44:20 -05:00
Scott Lahteine
ec69e97bda Merge pull request #7974 from jeffyl/bugfix-2.0.x
Fix include path for VIKI
2017-10-14 17:38:42 -05:00
Morten
91e28edda6 [2.0.x] Add new board: MKS Sbase (#7945)
* Add files via upload

* Add files via upload

* Add files via upload

* Checked LCD / edited / revised pins_MKS_BASE.h

As requested :)

* Delete Configuration_adv.h

* Delete Configuration.h

* Deleted /Marlin/Marlin/src/config/examples/MksSbase/*.* and moved them to /Marlin/Marlin/src/config/examples/Mks/Sbase/*.*

* Add files via upload
2017-10-14 09:44:18 -05:00
Jeffrey Li
3c8a3a02ba Fix include path for VIKI 2017-10-14 04:06:17 -07:00
Scott Lahteine
4586acad8c Merge pull request #7959 from alexxy/bugfix-2.0.x
Python isnt always python2
2017-10-14 05:02:07 -05:00
Scott Lahteine
497f86453e Merge pull request #7964 from gallynero/patch-2
fix 'axis_unhomed_error' not defined error
2017-10-14 05:00:58 -05:00
Scott Lahteine
85b2e7e764 Merge pull request #7966 from thinkyhead/bf2_ubl_remove_z_offset
[2.0.x] Unify Z fade factor
2017-10-14 03:15:16 -05:00
Scott Lahteine
c0dddd4233 Tweaks to tool_change, GcodeSuite::T() 2017-10-14 02:53:19 -05:00
Scott Lahteine
ca66574062 ADC sensor fix inspired by 'Evgen2' on Twitter 2017-10-14 02:28:13 -05:00
Scott Lahteine
1344ca4b2f UBL no longer needs ubl_state 2017-10-14 02:18:32 -05:00
Scott Lahteine
8dd08425fd Improve LCD leveling edits 2017-10-14 02:18:31 -05:00
Scott Lahteine
3e3911fb81 Use planner.leveling_active for all leveling systems 2017-10-14 02:18:31 -05:00
Scott Lahteine
32c607ffe2 Ensure fade factor is recalculated if fade height changes 2017-10-14 02:18:31 -05:00
Scott Lahteine
ca1e47375c Move fade_scaling_factor_for_z to Planner 2017-10-14 02:18:31 -05:00
Scott Lahteine
9a930ebec2 Make leveling_is_active a macro 2017-10-14 02:18:31 -05:00
Scott Lahteine
58abc66c1d Tweak bed leveling conditionals 2017-10-14 02:18:31 -05:00
Scott Lahteine
72ef508d55 Merge pull request #7962 from thinkyhead/bf2_ubl_remove_z_offset
[2.0.x] Remove obsolete UBL z_offset
2017-10-13 09:06:19 -05:00
Scott Lahteine
1adb5a6a48 Remove obsolete UBL z_offset 2017-10-13 08:22:46 -05:00
gallynero
3619a4cbea fix 'axis_unhomed_error' not defined error
Fix 'axis_unhomed_error' not defined error when pause with unhomed status
2017-10-13 09:08:02 +02:00
Alexey Shvetsov
12d212d1b4 Python isnt always python2
So now this script is compatible with both python versions 2 and 3

Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
2017-10-13 01:39:06 +03:00
Scott Lahteine
cc01a36363 Merge pull request #7947 from thinkyhead/bf2_more_READMEs
[2.0.x] Add a README.h file for Arduino IDE users
2017-10-12 06:56:41 -05:00
Scott Lahteine
4764710b11 Add a README.h file for Arduino IDE users 2017-10-11 18:10:15 -05:00
Bob-the-Kuhn
4e3ee845b9 config_adv (#7941)
get rid of twi.h

move to board files
2017-10-11 15:42:24 -05:00
Roxy-3D
0e260c6c1d Get FolgerTech i3-2020 working again with 32-bit platforms (#7944)
Setup FolgerTech i3-2020 Configuration files as a reference platform for
32-Bit work.

Also fix MAX7219 debug lights on 32-bit platforms.
2017-10-11 15:23:04 -05:00
Bob-the-Kuhn
e9cf9ad3f3 Merge pull request #7935 from Bob-the-Kuhn/Digipot-MCP4451
2.0.x - MPC4451 I2C support
2017-10-11 00:36:51 -05:00
Bob-the-Kuhn
26bfae58d4 MPC4451 I2C support 2017-10-11 00:30:41 -05:00
Scott Lahteine
1f5c432e29 Merge pull request #7920 from thinkyhead/bf2_neopixel_full
[2.0.x] Move FILAMENT_RUNOUT_SENSOR to a feature
2017-10-10 03:05:00 -05:00
Scott Lahteine
732e87e83c Merge pull request #7892 from GMagician/Serial-double-echo-fix
[2.0.x] Serial double echo fix
2017-10-10 02:42:16 -05:00
Scott Lahteine
f8e8fcb978 Move FILAMENT_RUNOUT_SENSOR to a feature 2017-10-10 02:37:42 -05:00
Scott Lahteine
10124f39d9 Merge pull request #7919 from thinkyhead/bf2_neopixel_full
[2.0.x] Different NEOPIXEL types
2017-10-10 02:35:39 -05:00
Slawomir Ciunczyk
a11e6a1022 Different NEOPIXEL types
Same as #7728 but for 2.0.x,
Lot of cleanup and remove references in whole code to other "LED files" than leds.h. Now will be much easier to add next drivers/libraries. e.g. FastLED. But bad news, currently FastLED is suporting only RGB devices (no RGBW)
2017-10-10 02:17:36 -05:00
Scott Lahteine
b30b55307c Merge pull request #7909 from thinkyhead/bf2_goodbye_legacy_advance
[2.0.x] Remove legacy ADVANCE feature
2017-10-10 00:31:18 -05:00
Scott Lahteine
1d04197f2f Merge pull request #7916 from thinkyhead/bf2_probeless_ubl
[2.0.x] Allow UBL G29 and G26 to build without a probe
2017-10-10 00:30:27 -05:00
Scott Lahteine
1f05f10346 Merge pull request #7894 from tcm0116/2.0.x-lcd_segmented_moves
[2.0.x] Use segmented moves when moving axis from LCD
2017-10-10 00:28:34 -05:00
Thomas Moore
9b0ee53b12 Use segmented moves when moving axis from LCD 2017-10-09 23:25:43 -05:00
Scott Lahteine
442669d23c Allow UBL to build without a probe 2017-10-09 18:57:41 -05:00
Scott Lahteine
5ad8f5c306 Merge pull request #7914 from thinkyhead/bf2_add_some_lcds
[2.0.x] Add support for 4 new LCDs
2017-10-09 17:39:41 -05:00
Scott Lahteine
20ebe218c8 Tweaks to VIKI lcd support 2017-10-09 17:01:07 -05:00
Scott Lahteine
09fa34a9e1 Modernize configs 2017-10-09 16:18:10 -05:00
Scott Lahteine
560d366b80 Move VIKI SCK/MOSI pins fix to Conditionals_POST.h 2017-10-09 16:13:49 -05:00
Scott Lahteine
e9bcb9d048 Add 4 new LCD displays 2017-10-09 15:58:02 -05:00
Scott Lahteine
03f4891fb9 Remove legacy ADVANCE feature 2017-10-09 04:25:18 -05:00
Scott Lahteine
e31385ecf6 Merge pull request #7904 from GMagician/Addressing-#7896
[2.0.x] Addressing #7896
2017-10-08 19:35:45 -05:00
GMagician
546f02c6f4 [2.0.x] Addressing #7896
Compiler error, added char c variable
2017-10-08 23:16:35 +02:00
GMagician
eb96d37da0 Serial double echo fix
Fix double character sent when TX buffer size is 0 on mega2560
2017-10-07 22:20:00 +02:00
Scott Lahteine
deeea98d22 LCD filename already concatenated 2017-10-07 15:16:05 -05:00
Scott Lahteine
a058638d11 Merge pull request #7875 from thinkyhead/bf2_fill_eeprom_dat_ff
[2.0.x] Update LPC persistent store to initialize eeprom.dat with FF
2017-10-07 15:13:21 -05:00
Scott Lahteine
ae1a18d0a1 LCD filename already concatentated 2017-10-07 15:10:15 -05:00
Scott Lahteine
12aa1b999a Fix display issue with SD_SORT_ALPHA cached names 2017-10-07 15:08:08 -05:00
Dave Johnson
9d0e4ea3d5 [2.0.x] Auto-enable DISABLE_REDUCED_ACCURACY_WARNING if HOME_AFTER_DEACTIVATE enabled (#7879)
* Auto-enable DISABLE_REDUCED_ACCURACY_WARNING if HOME_AFTER_DEACTIVATE enabled

If HOME_AFTER_DEACTIVATE, there is no need to warn on LCD since printer will home prior to starting print.  Saves 60 bytes PROGMEM on AVR with U8g panel.

* Reduce lines used

* Reduce lines used
2017-10-07 15:02:55 -05:00
Scott Lahteine
f63e546b3e Merge pull request #7890 from thinkyhead/bf2_integer_HAL_TIMER_RATE
[2.0.x] Apply fixes for DUE
2017-10-07 14:52:41 -05:00
Scott Lahteine
8315a8a716 Apply fixes for DUE
Alternative to #7882. If F_CPU is greater than 1000 it can be evenly divided by 8. Over 10000, 16; over 100000, 32; over 1 million, 64; etc.
2017-10-07 14:31:18 -05:00
Scott Lahteine
4b36a542e0 Merge pull request #7876 from thinkyhead/bf2_hotend_messages
[2.0.x] Addressing #7612
2017-10-07 13:37:43 -05:00
Scott Lahteine
81a1e69a4a Merge pull request #7877 from fiveangle/bf2-controller_fan_includes
[2.0.x] Resolve USE_CONTROLLER_FAN compile errors
2017-10-07 13:08:55 -05:00
Unknown
12730c1303 [2.0.0] Resolve USE_CONTROLLER_FAN compile errors
Add to controllerfan.cpp:
#include "../module/stepper_indirection.h"
#include "../module/temperature.h"
2017-10-07 05:26:36 -07:00
Scott Lahteine
7fb3343bda [2.0.x] Addressing #7612
Change "extruder" to HOTEND in sanity error messages
2017-10-07 02:27:26 -05:00
victorpv
8998f31ee1 Update LPC persistent store to initialize eeprom.dat with FF
This change initialize any data in eeprom.dat beyond the current file size to FF.
That way if eeprom.dat is deleted and created again, it doesn't take the old values or random ones, but rather starts with FF in all positions as a real brand new or erased eeprom.dat
Currently if you delete eeprom.dat and restart the board, the new file is created in the same sector with the same content, since FAT does not actually delete the data, just marks the sector as free. I tested by deleting the file, and then rebooting the board, and checking the file content.
The change can be tested in the same way, deleting, rebooting the board, and then the new content should be all FF.

If an eeprom file already exist with data on it, but smaller than E2END, it will be padded with FF on first access, so it will not have random or old content appended.
2017-10-07 02:18:42 -05:00
Scott Lahteine
2aa22c5a5e Merge pull request #7874 from thinkyhead/bf2_anet_encoder_pulses
[2.0.x] Fixing ANET encoder pulses
2017-10-07 01:21:23 -05:00
Scott Lahteine
db8ded90c2 Merge pull request #7872 from thinkyhead/bf2_fix_sd_listing_bug
[2.0.x] Fix sd file list display bug
2017-10-07 00:13:20 -05:00
Scott Lahteine
f99d1dedae Fixing #7833
Derived from #7873
2017-10-07 00:10:05 -05:00
Scott Lahteine
de84f57a9c Patch SD file draw bug 2017-10-06 23:57:11 -05:00
Scott Lahteine
ef90b49fff Remove extra NEWPANEL settings in Conditionals_LCD.h 2017-10-06 23:56:58 -05:00
Scott Lahteine
67a7dd9792 Merge pull request #7866 from thinkyhead/bf2_finally_G33_is_done
[2.0.x] Apply G33 updates
2017-10-06 16:03:26 -05:00
Scott Lahteine
030c266811 Merge pull request #7863 from thinkyhead/bf2_mapper_c2c3c4_sk
[2.0.x] Add UTF-8 mapper for Slovak language
2017-10-06 16:00:30 -05:00
Scott Lahteine
b220bc7521 Apply G33 updates
Adapted from #7865
2017-10-06 15:47:51 -05:00
Scott Lahteine
9fe7f53216 Misc general spacing cleanup 2017-10-06 15:14:01 -05:00
Scott Lahteine
c0382cd8cd Add UTF-8 mapper for Slovak language
Based on #7862, #7846 by @rmoravcik
2017-10-06 15:14:01 -05:00
Scott Lahteine
c81843a414 Set TEMP_SENSOR_0 to 1 in CR-10 example config
As pointed out in #7692 by @totalitarian
2017-10-06 14:30:53 -05:00
android444
72693a7e87 [2.0.x] Fixed RAMPS FD V1 pins.h file (#7852)
* test only

test

* Fixed RAMPS FD V1 pins.h file

* Fix typo
2017-10-06 13:27:15 -05:00
Chris Pepper
aa51a02b8f LPC1768: fix serial buffer underrun (#7854)
When the buffer is empty index_write == index_read, but they needed constrained by buffer_mask
2017-10-05 17:19:43 -05:00
Chris Pepper
46b2773e13 General fixes for LPC1768 (#7834)
* fixed some include paths

* LPC1768: Fix Serial API

Add missing serial methods used if TX_BUFFER_SIZE is set
Change return value of HalSerial:read to match Arduino API

* LPC1768: add filters to ADC

This is to try and compensate for hardware issue and oversensitivity to noise

* LPC1768: remove the polling section of delayMicroseconds

* LPC1768: lock usb mass storage device while device accesses it.

Currently only applicable to persistent store,
The device always has priority and will unmount the sd card from the host, Windows then tries to automount again so it can look like the explorer window freezes. Linux Mint, by default, just closes the Nemo window.

* Add timeout to make sure if Serial never connects that Marlin still boots

* Remove unneeded ifdef CPU_32_BIT

In general the need for ifdef CPU_32_BIT blocks means that something is missing from the HAL API or a Platform, in this case HAL_TICKS_PER_US was missing from the AVR Platform

* LPC1768: relocate RE-ARM debug_extra_script.py
2017-10-04 15:40:54 -05:00
Scott Lahteine
7258218f89 Fix xon_xoff_state initialization 2017-10-04 12:11:56 -05:00
Scott Lahteine
bf596fb039 Merge pull request #7818 from thinkyhead/bf2_xon_xoff
[2.0.x] Add XON/XOFF serial handshaking
2017-10-02 23:52:30 -05:00
Scott Lahteine
ab4943e24c Merge pull request #7829 from thinkyhead/bf2_fix_dualx_manual
[2.0.x] Fix DUAL_X_CARRIAGE manual move
2017-10-02 23:50:00 -05:00
Scott Lahteine
ca3c9baf1b Fix DUAL_X_CARRIAGE manual moves, add T0/T1 menu item 2017-10-02 23:35:55 -05:00
Scott Lahteine
a8b8d4e85e Add a typedef for MENU_ITEM(function,…) functions 2017-10-02 23:33:57 -05:00
Scott Lahteine
6ea2cc0293 Make prepare_move_to_destination_dualx a proper move function 2017-10-02 23:32:28 -05:00
Scott Lahteine
e472a7569b Remove extra auto_current_control call 2017-10-02 23:32:05 -05:00
Scott Lahteine
200f971ef7 Reduce Teensy++ 2.0 to a single entry
Followup to #7750, #7826
2017-10-02 22:55:43 -05:00
Ralph Schmidt
1ae208395c Remove MOTHERBOARD from "due" entry
Also reformat and document
2017-10-02 22:21:51 -05:00
Scott Lahteine
508d764d63 Add serial XON/XOFF handshaking
From @ejtagle, originally #7459
2017-10-02 04:12:30 -05:00
Scott Lahteine
af15383578 Add XON/XOFF options to example configs 2017-10-02 04:05:49 -05:00
Scott Lahteine
33c4d45f2f Merge pull request #7812 from thinkyhead/bf2_fix_resume_print
[2.0.x] Fix broken M600 resume_print
2017-10-01 22:55:28 -05:00
Scott Lahteine
f3677e077c Merge pull request #7816 from thinkyhead/bf2_inhibit_option
[2.0.x] Option to disallow motion before homing
2017-10-01 22:52:54 -05:00
Scott Lahteine
a03e70d46c Fix M600 resume_print
Derived from #7811 and #7779
2017-10-01 21:59:42 -05:00
Scott Lahteine
2d41c59320 Tweak some spacing 2017-10-01 21:59:42 -05:00
Scott Lahteine
5ae390e240 Apply NO_MOTION_BEFORE_HOMING to examples 2017-10-01 21:58:50 -05:00
Scott Lahteine
90af1fe5ee Implement NO_MOTION_BEFORE_HOMING option 2017-10-01 21:58:50 -05:00
Scott Lahteine
965b0ab53e Spacing adjustments 2017-10-01 21:58:50 -05:00
Scott Lahteine
ac41eb5871 Merge pull request #7722 from tcm0116/2.0.x-warnings
Cleanup 2.0.x compiler warnings
2017-10-01 21:56:54 -05:00
Scott Lahteine
c0b365fdb4 Merge pull request #7775 from GMagician/Fix-gitignore-for-Visualstudio-&-platformio
gitignorefix
2017-10-01 18:15:12 -05:00
Scott Lahteine
26d4c01660 Merge pull request #7802 from thinkyhead/bf2_fwretract_fixes
Fix G10/G11 with synchronize
2017-09-30 17:50:38 -05:00
Thomas Moore
ae2173cd52 Synchronize retractions 2017-09-30 17:28:46 -05:00
Thomas Moore
0cb00f52d9 Cleanup warnings 2017-09-30 16:47:17 -05:00
Bob-the-Kuhn
f0d34ca4f5 Merge pull request #7799 from Bob-the-Kuhn/Marlin-2.0.x-fix-LPC1768-stepper-hang-and-limit-maximum-stepper-ISR-spacing
Marlin 2.0.x - fix LPC1768 stepper hang and limit maximum stepper ISR spacing
2017-09-30 10:47:15 -05:00
Bob-the-Kuhn
1beaef0452 fix 3S hang & enable SPLIT 2017-09-30 10:27:41 -05:00
Scott Lahteine
6904561fd5 Merge pull request #7793 from tcm0116/2.0.x-servo
[2.0.x] Fix Servo class compile errors
2017-09-29 17:51:21 -05:00
Scott Lahteine
92389e4236 Merge pull request #7794 from tcm0116/2.0.x-usb_interrupt
[2.0.x] Fix LPC1768 USB interrupt priority
2017-09-29 17:50:02 -05:00
Thomas Moore
f1b6b4bdaa Fix LPC1768 USB interrupt priority 2017-09-29 08:21:33 -05:00
Thomas Moore
020ce176c4 Fix Servo class compile errors 2017-09-29 08:17:30 -05:00
Bob-the-Kuhn
de05b2b309 Merge pull request #7786 from Bob-the-Kuhn/2.0-compile-issue-fix
2.0.x Re-ARM compile issues - work around
2017-09-28 10:41:26 -05:00
Bob-the-Kuhn
62054af6eb 2.0 compile issues 2017-09-28 10:16:25 -05:00
Bob-the-Kuhn
17dddda024 Merge pull request #7746 from Bob-the-Kuhn/M355-&-LCD
Marlin 2.0.x - M355 fixes & LCD improvements
2017-09-27 19:39:04 -05:00
Christopher Pepper
bea3ec2724 M355 S0, S1 fixes & faster LCD, SD card
fix Travis error
2017-09-27 19:26:00 -05:00
Scott Lahteine
8c622a59cf Merge pull request #7774 from thinkyhead/bf2_lcd_leveling_status
[2.0.x] Show leveling status on character LCD
2017-09-27 13:10:25 -05:00
GMagician
c47e2abefb gitignorefix 2017-09-27 19:49:05 +02:00
Scott Lahteine
56c05a7015 Show leveling status on character LCD 2017-09-27 12:21:15 -05:00
Scott Lahteine
2ee4eef25c Merge pull request #7748 from GMagician/Addressing-#7730
[bugfix-2.0.x] Fix compiler error (issue #7730)
2017-09-27 12:06:55 -05:00
Scott Lahteine
ffed785656 Merge pull request #7768 from thinkyhead/bf2_HAL_STM32F1
[2.0.x] HAL for STM32F1
2017-09-27 11:52:34 -05:00
Scott Lahteine
88f9194168 Merge pull request #7771 from thinkyhead/bf2_user_menu_return
[2.0.x] User menu return-to-status option
2017-09-27 11:51:57 -05:00
Scott Lahteine
604b804125 Add confirmation step to Init EEPROM 2017-09-27 11:31:38 -05:00
Tannoo
c869dc9745 User script return-to-status option 2017-09-27 11:31:38 -05:00
victorpv
e9acb63290 STM32F1 HAL
Adding files for STM32F1 HAL based on libmaple/stm32duino core.
Current persistent_store uses cardreader changes to be sent in separate
commit, but could be changed to use i2c eeprom.
2017-09-27 11:20:10 -05:00
Scott Lahteine
baf0bd2b24 Merge pull request #7770 from thinkyhead/bf2_HAL_cleanups_etc
Some HAL formatting cleanup
2017-09-27 11:11:12 -05:00
Scott Lahteine
c2b1d51f16 HAL whitespace and style cleanup 2017-09-27 10:55:36 -05:00
Scott Lahteine
c272f2c84e Cleanup pins spacing 2017-09-27 10:55:36 -05:00
Scott Lahteine
dff2904c0f Marlin code whitespace cleanup 2017-09-27 10:55:36 -05:00
Scott Lahteine
9dd5390d7d frameworks whitespace cleanup 2017-09-27 10:41:27 -05:00
Scott Lahteine
599f2ad983 Define pin accessors more like <Arduino.h> 2017-09-27 10:41:27 -05:00
Scott Lahteine
358656acc3 Tweak HAL_adc_start_conversion 2017-09-27 10:41:27 -05:00
Scott Lahteine
0cb4d25431 Tweaks to Servo classes 2017-09-27 10:41:27 -05:00
Scott Lahteine
f582f1bf4e Merge pull request #7769 from thinkyhead/bf2_GT2560
Fixes for GT2560, ANET A8
2017-09-27 10:32:50 -05:00
Phr3d13
10c1b442ca Fixes for Anet10 and gt2560
Fixes for 2 "... not declared in this scope" compiler errors.
2017-09-27 07:34:02 -05:00
Phr3d13
5a3a53379f Update pins for GT2560_Rev_A_Plus
For PR #7738
2017-09-27 06:34:51 -05:00
Scott Lahteine
afe77bd138 Merge pull request #7763 from thinkyhead/bf2_fixes_from_bf1
[2.0.x] Fix G3D_PANEL encoder steps, babystep label #7762
2017-09-27 03:20:47 -05:00
Scott Lahteine
fdf1b8a7b8 Fix sanity check for LCD_FOR_MELZI
Comes from #7760
2017-09-27 03:04:19 -05:00
Scott Lahteine
b93a55e15f Fix ST7920_DELAY_2 potentially being unset
Comes from #7760
2017-09-27 03:04:01 -05:00
Scott Lahteine
ce1638e32f Add Babystep Z graphic overlay
See PR #7593
2017-09-27 01:25:05 -05:00
Scott Lahteine
49c693c85b Tweak to serial macros 2017-09-27 01:25:05 -05:00
Scott Lahteine
46709ed7e0 More featureful CR-10 configurations
See #7725
2017-09-27 01:25:05 -05:00
Scott Lahteine
2b112143fa Update Sanguinololu config version 2017-09-27 00:48:59 -05:00
Scott Lahteine
7cd5eb6d42 Update LEVEL_BED_CORNERS config option 2017-09-27 00:48:59 -05:00
Scott Lahteine
981a610f75 Disable BABYSTEP_XY, add to SDSORT comment 2017-09-27 00:48:59 -05:00
Scott Lahteine
4c5be9bb05 Fix a PARKING_EXTRUDER comment 2017-09-27 00:48:58 -05:00
Scott Lahteine
494b0eba2d Config spacing fix 2017-09-27 00:48:47 -05:00
Scott Lahteine
2281154025 Increase BABYSTEP_MULTIPLICATOR to 100 2017-09-27 00:48:46 -05:00
Scott Lahteine
92dbf5f148 Fix babystep edit label, allowing translation 2017-09-26 23:43:05 -05:00
Scott Lahteine
37eb6d1732 Babystepping code tweak 2017-09-26 23:43:05 -05:00
Scott Lahteine
7a29f802d0 Fix ENCODER_PULSES_PER_STEP for G3D_PANEL 2017-09-26 23:43:05 -05:00
Scott Lahteine
5972251b17 No need for unused LCD_PINS_Dn 2017-09-26 23:27:53 -05:00
Scott Lahteine
7239ab231c Fix ADVANCED_PAUSE_FEATURE in .travis.yml 2017-09-26 17:12:46 -05:00
GMagician
c508e9adec Fix compiler error
Added missing include file,
called 'leveling_is_active()' with no prototipe defined.
2017-09-25 23:18:26 +02:00
Scott Lahteine
c4e4a0688c Fix bug in SD Autostart
As pointed out by @marcio-ao in #7638
2017-09-24 17:53:39 -05:00
Scott Lahteine
88407727ec Merge pull request #7727 from thinkyhead/apply_7697_from_1.1.x
G33 changes from 1.1.x
2017-09-24 17:48:16 -05:00
Scott Lahteine
6d5fcac54a G33 changes from 1.1.x 2017-09-24 14:16:23 -05:00
Scott Lahteine
1ab679b1d2 Merge pull request #7723 from fiveangle/bf20-improve_avr_arch_detection
[bf20ng] Improve AVR arch detection
2017-09-24 00:48:59 -05:00
Dave Johnson
f58ba3a64e Improve AVR arch detection
Replace ARDUINO_ARCH_AVR with __AVR__ to better detect architecture for non-Arduino dev environments.  Resolves compile failure in PIO for 8-bit Teensduino targets

More info:
https://forum.pjrc.com/threads/33234-Using-Teensyduino-Selecting-Teensy-3-2-3-1-board-has-incorrect-platform-define
http://www.atmel.com/webdoc/avrlibcreferencemanual/using_tools_1using_avr_gcc_mach_opt.html
2017-09-23 21:36:40 -07:00
Scott Lahteine
8089f73549 Merge pull request #7721 from thinkyhead/bugfix_refactor_work
Apply LCD changes from 1.1.x
2017-09-23 22:10:37 -05:00
Scott Lahteine
71d63fcafb Apply LCD changes from 1.1.x
Changes from #7720
2017-09-23 21:50:44 -05:00
Scott Lahteine
6da97ebdd1 Merge pull request #7719 from thinkyhead/bugfix_refactor_work
[2.0.x] Group G-codes to fix command-line overflow
2017-09-23 19:18:33 -05:00
Scott Lahteine
1587962547 Combine G-code files into fewer units
Addressing #7707
2017-09-23 18:12:04 -05:00
Scott Lahteine
bfd1e75c04 Patch for caselight + lcd compile issues 2017-09-23 18:12:04 -05:00
Scott Lahteine
ff1f211eb4 Merge pull request #7695 from tcm0116/move_framework
Move LPC1768 framework out of Marlin source folder
2017-09-23 17:12:48 -05:00
Thomas Moore
ddbd4b73e0 Move LPC1768 framework out of Marlin source folder 2017-09-23 16:59:31 -05:00
Scott Lahteine
9a03f758cd Merge pull request #7715 from GMagician/bugfix-2.0.x
[PR] [Marlin 2.0] Fix compiler warning message
2017-09-23 16:55:28 -05:00
GMagician
00b1b33816 Fix compiler warning 2017-09-23 15:31:51 +02:00
Scott Lahteine
f37ed314e0 Friendly layout for Arduino IDE 2017-09-21 16:27:13 -05:00
Scott Lahteine
06a02dd200 Workaround for SCK/MOSI pins on VIKI 2017-09-21 16:27:12 -05:00
Scott Lahteine
2f14eaf6a3 .gitignore: Workaround for Deviot/platformio 2017-09-21 16:27:12 -05:00
Scott Lahteine
f9ef446fb5 Clean up after refactor 2017-09-21 16:27:12 -05:00
Scott Lahteine
64dfb46461 Move z_endstop_adj to Endstops 2017-09-21 16:27:11 -05:00
Scott Lahteine
2e20c53c9d Move endstop debug to Endstops 2017-09-21 16:27:11 -05:00
Scott Lahteine
a10451ceed Move Volumetric methods to Planner 2017-09-21 16:27:11 -05:00
Scott Lahteine
6f92ab7eed Move Controller Fan to feature 2017-09-21 16:27:11 -05:00
Scott Lahteine
07cf75883f Move T (tool change) to cpp 2017-09-21 16:27:10 -05:00
Scott Lahteine
927524af6b Move M999 to cpp 2017-09-21 16:27:10 -05:00
Scott Lahteine
1a37ebc76d Move M163-M165 MIXING_EXTRUDER to cpp 2017-09-21 16:27:10 -05:00
Scott Lahteine
8ca0b2fd68 Move M355 caselight to cpp 2017-09-21 16:27:09 -05:00
Scott Lahteine
59608086e6 Move M350_M351 to cpp 2017-09-21 16:27:09 -05:00
Scott Lahteine
6e0503eab2 Move M907-M910 to cpp 2017-09-21 16:27:09 -05:00
Scott Lahteine
2e89685154 Move TMC2130 g-codes to cpp 2017-09-21 16:27:09 -05:00
Scott Lahteine
19dde5be03 Move M900 to cpp 2017-09-21 16:27:08 -05:00
Scott Lahteine
1b0acbff72 Move M605 to cpp 2017-09-21 16:27:08 -05:00
Scott Lahteine
75cf17d816 Move M702 MK2_MULTIPLEXER to cpp 2017-09-21 16:27:08 -05:00
Scott Lahteine
7ba2ab4fb3 Move M540 to cpp 2017-09-21 16:27:07 -05:00
Scott Lahteine
a90c7dbf64 Move M500-M503 to cpp 2017-09-21 16:27:07 -05:00
Scott Lahteine
aab5489962 Move M428 to cpp 2017-09-21 16:27:07 -05:00
Scott Lahteine
1fe25271e4 Move M401_M402 to cpp 2017-09-21 16:27:07 -05:00
Scott Lahteine
0589884d26 Move M400 to cpp 2017-09-21 16:27:06 -05:00
Scott Lahteine
4a220a8b79 Move M380_M381 to cpp, solenoid feature 2017-09-21 16:27:06 -05:00
Scott Lahteine
9be8cb0ac9 Move M360-M364 to cpp 2017-09-21 16:27:06 -05:00
Scott Lahteine
828405cac8 Move M302 to cpp 2017-09-21 16:27:06 -05:00
Scott Lahteine
8584f7e390 Move M250 to cpp 2017-09-21 16:27:05 -05:00
Scott Lahteine
ebb9bd5419 Move M240 to cpp 2017-09-21 16:27:05 -05:00
Scott Lahteine
d4aaa0f1c8 Move M304 to cpp 2017-09-21 16:27:05 -05:00
Scott Lahteine
609c4eea32 Move M301 to cpp 2017-09-21 16:27:04 -05:00
Scott Lahteine
4f14849675 Move M300 to cpp 2017-09-21 16:27:04 -05:00
Scott Lahteine
6ed5252884 Move M280 to cpp 2017-09-21 16:27:04 -05:00
Scott Lahteine
d4d3d92f8a Move M260_M261 to cpp 2017-09-21 16:27:04 -05:00
Scott Lahteine
3e761696a0 Move M226 to cpp 2017-09-21 16:27:03 -05:00
Scott Lahteine
0e319104c2 Move M220 to cpp 2017-09-21 16:27:03 -05:00
Scott Lahteine
234de3547c Move M211 to cpp 2017-09-21 16:27:03 -05:00
Scott Lahteine
6c7bad8bc3 Move M666 to cpp 2017-09-21 16:27:03 -05:00
Scott Lahteine
f5877aa93e Move M665 to cpp 2017-09-21 16:27:02 -05:00
Scott Lahteine
33861d4e04 Move M206 to cpp 2017-09-21 16:27:02 -05:00
Scott Lahteine
7aca9fe2f7 Move M203-M205 to cpp 2017-09-21 16:27:02 -05:00
Scott Lahteine
b3822b9242 M202 is unused 2017-09-21 16:27:02 -05:00
Scott Lahteine
5e63efc1d9 Move M201 to cpp 2017-09-21 16:27:01 -05:00
Scott Lahteine
92c15f5578 Move M150 to cpp 2017-09-21 16:27:01 -05:00
Scott Lahteine
eef4a54778 Move M119-M121 to cpp 2017-09-21 16:27:01 -05:00
Scott Lahteine
379f16558e Move M118 to cpp 2017-09-21 16:27:00 -05:00
Scott Lahteine
811c32b85a Move M117 to cpp 2017-09-21 16:27:00 -05:00
Scott Lahteine
1d2061c935 Move M115 to cpp 2017-09-21 16:27:00 -05:00
Scott Lahteine
81b8fbf4d6 Move M114 to cpp 2017-09-21 16:27:00 -05:00
Scott Lahteine
5d2681a105 Move M100 to cpp 2017-09-21 16:26:59 -05:00
Scott Lahteine
beb346e49f Move M92 to cpp 2017-09-21 16:26:59 -05:00
Scott Lahteine
381b17e6a9 Move M18_M84, M85 to cpp 2017-09-21 16:26:59 -05:00
Scott Lahteine
a911215b0e Move M82_M83 to cpp 2017-09-21 16:26:59 -05:00
Scott Lahteine
4b9d1b9f26 Move M80-M81 to cpp 2017-09-21 16:26:58 -05:00
Scott Lahteine
0c7ba52451 Move M149 to cpp 2017-09-21 16:26:58 -05:00
Scott Lahteine
cbf40f7ee9 Move M145 to cpp 2017-09-21 16:26:58 -05:00
Scott Lahteine
b464887ea1 Make BARICUDA a feature 2017-09-21 16:26:57 -05:00
Scott Lahteine
14a5d2a273 Move M113 to cpp 2017-09-21 16:26:57 -05:00
Scott Lahteine
06f3c8029e Move M111 to cpp 2017-09-21 16:26:57 -05:00
Scott Lahteine
a831977dee Move M110 to cpp 2017-09-21 16:26:57 -05:00
Scott Lahteine
7479ff98b7 Move M140, M190 to cpp 2017-09-21 16:26:56 -05:00
Scott Lahteine
5b3e49babd Move M108, M112, M410 to cpp 2017-09-21 16:26:56 -05:00
Scott Lahteine
df0432c7c8 Move M155 to cpp, auto-report to Temperature 2017-09-21 16:26:56 -05:00
Scott Lahteine
df031ab100 Move M106_M107 to cpp 2017-09-21 16:26:56 -05:00
Scott Lahteine
99c4b9050a Move M105 to cpp 2017-09-21 16:26:55 -05:00
Scott Lahteine
a41130f854 Temp stat LEDs 2017-09-21 16:26:55 -05:00
Scott Lahteine
2c1eda9e00 Move M75-M78 to cpp 2017-09-21 16:26:55 -05:00
Scott Lahteine
fc52fc72ac Move M48 to cpp 2017-09-21 16:26:54 -05:00
Scott Lahteine
be8d913484 Move M43 to cpp 2017-09-21 16:26:54 -05:00
Scott Lahteine
10fab24e50 Move M42 to cpp 2017-09-21 16:26:54 -05:00
Scott Lahteine
69b664b6fe Move M31 to cpp 2017-09-21 16:26:54 -05:00
Scott Lahteine
a442c34a1a Move SD commands to cpp 2017-09-21 16:26:53 -05:00
Scott Lahteine
be0e4a4ad0 Consolidate pause, apply to M125, M600, M24 2017-09-21 16:26:53 -05:00
Scott Lahteine
adca4a9b79 Move M17 to cpp 2017-09-21 16:26:53 -05:00
Scott Lahteine
33e00b6cd6 Move M3-M5 to cpp 2017-09-21 16:26:53 -05:00
Scott Lahteine
04583d46af Move M0_M1 to cpp 2017-09-21 16:26:52 -05:00
Scott Lahteine
04376975ce Move G92 to cpp 2017-09-21 16:26:52 -05:00
Scott Lahteine
931aa79d85 Move G42 to cpp 2017-09-21 16:26:52 -05:00
Scott Lahteine
84ddae56a8 Move G38 to cpp 2017-09-21 16:26:51 -05:00
Scott Lahteine
b8adae0785 Move G31_G32 to cpp 2017-09-21 16:26:51 -05:00
Scott Lahteine
9db5d21837 Move G30 to cpp 2017-09-21 16:26:51 -05:00
Scott Lahteine
13136376ee Move G27 to cpp 2017-09-21 16:26:51 -05:00
Scott Lahteine
a1ee1628e5 Move G20_G21 to cpp 2017-09-21 16:26:50 -05:00
Scott Lahteine
9b4aa5ea8b Move G17-G19 to cpp 2017-09-21 16:26:50 -05:00
Scott Lahteine
94d9def81c Move G12 to cpp 2017-09-21 16:26:50 -05:00
Scott Lahteine
56f4a43535 Move G5 to cpp 2017-09-21 16:26:50 -05:00
Scott Lahteine
760f29a88e Move G4 to cpp 2017-09-21 16:26:49 -05:00
Scott Lahteine
4007cbfe9e Move G2_G3 to cpp 2017-09-21 16:26:49 -05:00
Scott Lahteine
27f7e3fe6f Hide problem pins in pin debug list 2017-09-21 16:26:49 -05:00
Scott Lahteine
9c21191f74 Rename SPI class to avoid conflict (good?) 2017-09-21 16:26:49 -05:00
Scott Lahteine
51f195e698 Move dwell to gcode 2017-09-21 16:26:48 -05:00
Scott Lahteine
4f1eadf41f FILAMENT_WIDTH_SENSOR feature 2017-09-21 16:26:48 -05:00
Scott Lahteine
d5fe0fb02b Consolidate PrintCounter 2017-09-21 16:26:48 -05:00
Scott Lahteine
551752eac7 Consolidate "bedlevel" code 2017-09-21 16:26:47 -05:00
Scott Lahteine
71aefc2e22 Move heater output to Temperature class 2017-09-21 16:26:47 -05:00
Scott Lahteine
63228fc453 Move volumetric flag to GCodeParser 2017-09-21 16:26:47 -05:00
Scott Lahteine
bf7af95db3 Move flow_percentage to Planner 2017-09-21 16:26:46 -05:00
Scott Lahteine
8dc2838d98 Move host keepalive to GcodeSuite 2017-09-21 16:26:46 -05:00
Scott Lahteine
8fbb833de9 Encapsulate RGB(W) LEDs 2017-09-21 16:26:46 -05:00
Scott Lahteine
a98e9874db FWRETRACT as a feature 2017-09-21 16:26:46 -05:00
Scott Lahteine
722786966a Add gcode.cpp, motion.*, queue.* - Apply to some G-codes. 2017-09-21 16:26:45 -05:00
Scott Lahteine
4231faf779 Initial split-up of G-code handlers by category 2017-09-21 16:26:45 -05:00
Scott Lahteine
e0a189a481 Consolidate Buzzer 2017-09-21 16:26:45 -05:00
Scott Lahteine
bca67a5b79 Main controller updates 2017-09-21 16:26:44 -05:00
Scott Lahteine
142d8aae56 Move debugging to serial.* 2017-09-21 16:26:44 -05:00
Scott Lahteine
a1e2b5da70 Fix LCD_PINS_Dn tests in pinsDebug_list.h 2017-09-21 16:26:44 -05:00
Scott Lahteine
038f82cc38 Fix L6470 init and options 2017-09-21 16:26:43 -05:00
Scott Lahteine
42e2dd9251 Build file updates 2017-09-21 16:26:43 -05:00
Scott Lahteine
614a86a380 SD file updates 2017-09-21 16:26:43 -05:00
Scott Lahteine
82fff87e16 Pins updates 2017-09-21 16:26:43 -05:00
Scott Lahteine
3d8a0ab4b2 Module updates 2017-09-21 16:26:42 -05:00
Scott Lahteine
0fcec02db5 LCD updates 2017-09-21 16:26:42 -05:00
Scott Lahteine
7dd0a46732 Language updates 2017-09-21 16:26:41 -05:00
Scott Lahteine
4a82e95c3e Feature file updates 2017-09-21 16:26:41 -05:00
Scott Lahteine
d7ee81202f Libs updates 2017-09-21 16:26:41 -05:00
Scott Lahteine
34101224c4 Inc updates 2017-09-21 16:26:41 -05:00
Scott Lahteine
f52a31a275 Core updates 2017-09-21 16:26:40 -05:00
Scott Lahteine
479652073b Config updates 2017-09-21 15:52:17 -05:00
Scott Lahteine
54326fb06a HAL updates 2017-09-21 15:52:17 -05:00
Scott Lahteine
65996e4235 Support file updates 2017-09-20 19:48:21 -05:00
Scott Lahteine
7e42c7563c Move build files into place 2017-09-12 14:51:06 -05:00
Scott Lahteine
b66d65f865 Move 'sd' files 2017-09-12 14:51:05 -05:00
Scott Lahteine
0b9a88d6ce Move 'pins' files 2017-09-12 14:51:05 -05:00
Scott Lahteine
2b3b7d5d7f Move 'thermistor' files 2017-09-12 14:51:05 -05:00
Scott Lahteine
0c9231fd04 Move 'module' files 2017-09-12 14:51:05 -05:00
Scott Lahteine
efa578d6b0 Move 'libs' files 2017-09-12 14:51:04 -05:00
Scott Lahteine
cc92e544a5 Move 'lcd' files 2017-09-12 14:51:04 -05:00
Scott Lahteine
5be07b5db2 Move 'inc' files 2017-09-07 07:42:55 -05:00
Scott Lahteine
9ea2ff950a Move 'gcode' files 2017-09-07 07:42:55 -05:00
Scott Lahteine
4e4d16c92e Move 'core' files 2017-09-07 07:42:55 -05:00
Scott Lahteine
fa5f9c2aec Move 'feature' files 2017-09-07 07:42:54 -05:00
Scott Lahteine
f536c4dccb Move configs 2017-09-06 06:28:30 -05:00
Scott Lahteine
48351fd6d5 Move root sources 2017-09-06 06:28:29 -05:00
Scott Lahteine
27cbb939b2 Clean up some HAL code 2017-08-31 18:36:53 -05:00
Christopher Pepper
b29b66feda Temporary fix for odd stepper behaviour with servos 2017-08-31 18:33:07 -05:00
Christopher Pepper
8afe13b1a2 Fix compile issue when watchdog was disabled 2017-08-31 18:33:07 -05:00
Christopher Pepper
b908e38d08 Add needed platform defined gaurds to compile with Arduino IDE
Also removed explicit platform HAL directory inclusion from platformio.ini to make sure these errors are caught by Travis in the future
2017-08-31 18:33:07 -05:00
Scott Lahteine
a037ddbf7b Other spacing tweaks 2017-08-31 18:33:07 -05:00
Scott Lahteine
2af62a5d8d Apply spacing, const to some HAL code 2017-08-31 18:33:07 -05:00
kfazz
fa9ff6be6e try to fix LIN_ADVANCE for 32bit 2017-08-31 18:33:07 -05:00
kfazz
18f97c4013 add HardwareSerial and SoftwareSerial for Re-ARM.
HardwareSerial has been tested on Uart0 (debug header) and Uart3 (i2c connector)
Software Serial has been tested to work bi-directionally at 9600 and 115200
using pins 6 and 63 on J5, and unidirectionally (write only) at 250000.
The code used to test was Teemuatlut's tmc2208 patch, and a few small changes to main used to echo recieved chars back to a host pc.
2017-08-31 18:33:07 -05:00
Bob-the-Kuhn
01fb45b4f8 hybrid PWM system
Uses PWM1 to directly control pins 4, 6 & 11 (servo 0, 1 & 3) and PWM1
generated interrupts to control other pins.

Interupt control of the servo pins had too much jitter so switched all
that we could to PWM1 direct control.  The PWM1 direct control pins have
less than 1 microsecond pulse width jitter while the interrupt
controlled ones can have 20+ microseconds of jitter.

Also added insurance to the servo code in the "disable servo after move"
section.
2017-08-31 18:33:07 -05:00
Tannoo
94dd39b3b7 LCD_UBL_memory_slot_corrections (#7516)
* LCD_UBL_memory_slot_corrections

Changed the memory slot edit function to work with the
`settings.calc_num_meshes()`

* Add a little more safety margin...

* More corrections

Error handling when the EEPROM is not available.
2017-08-31 18:33:07 -05:00
Roxy-3D
8587c4e1ec Minor corrections to 32-bit branch (#7514)
Mostly...  clean up some compile time warnings for the 20x4 LCD Display.
2017-08-31 18:32:09 -05:00
Bob-the-Kuhn
7342d5c07a ST7565 2017-08-31 18:31:43 -05:00
Bob-the-Kuhn
97444391e0 Servo & PWM support for LPC1768 (#7500) 2017-08-31 18:31:43 -05:00
Tannoo
859fa35287 Re-Arm bugfixes (#7495)
* UBL_correction

* RGB Map function
2017-08-31 18:31:43 -05:00
Scott Lahteine
622b80974c Add VSCode to .gitignore 2017-08-31 18:31:43 -05:00
Bob-the-Kuhn
d80877d570 Set pinMode with every digitalWrite (legacy compatibility) 2017-08-31 18:31:07 -05:00
Chris Pepper
9a950e3a5a Update the delay functions and change the default pinmap for character displays (#7434) 2017-08-31 18:31:07 -05:00
Scott Lahteine
105324b85b Match the license headers in other files 2017-08-31 18:31:07 -05:00
Dave Johnson
d5e5735679 Support travis new "trusty" build environment
move from legacy precise to trusty build image
fix PATH not including buildroot/bin
remove symolic link to ~/bin as trusty travis image doesn't include it in PATH anyway
2017-08-31 18:31:07 -05:00
Dave Johnson
8f5a576b08 pristine != precise (#7424) 2017-08-31 18:31:07 -05:00
Dave Johnson
419e575808 Force legacy "pristine" build dist for TravisCI
TravisCI "trusty" build dist isn't picking up build path causing travis checks to fail.  Reverting to legacy "pristine" dist while we investigate
2017-08-31 18:31:07 -05:00
Bob-the-Kuhn
69704b93f2 ultralcd.cpp fix compile error - switch to int16_t 2017-08-31 18:31:07 -05:00
Chris Pepper
61c0a10efe Revert "SPI API platform implementation stubs" (#7416)
This reverts commit 2dfa6ca72a2e8d43caf4932ca0d35792f0638917.

Revert "Base HAL SPI Changes"

This reverts commit 2afc521b8b6a81b2281a038f1b99a69f4a008e64.

Revert "Initial HAL SPI API"

This reverts commit 58f7ffe09ab5bc034b6510f5204f8d342138abaa.
2017-08-31 18:31:07 -05:00
Chris Pepper
a5cf3a190c bugfix-2.0.x critical fix (#7401)
* Fix mistake in gitignore file and add in missing core files.

The missing leading slash on "lib" meant all folders names lib in the directory tree are ignored, rather than just the top level PlatformIO lib folder

* Add LiquidCrystal Library and associated headers modified to compile.
2017-08-31 18:23:44 -05:00
Bob-the-Kuhn
76da81c1de minimize SD card reads when using SDCARD_SORT_ALPHA (Re-ARM board)
Because of the Re-ARM card's pinout there is only one SPI connected to
the RepRap Discount Full Graphic LCD display.  The LCD responds to ANY
SCK transitions no matter if it's enable is inactive.  The result is
garbage (usually bars) on the LCD display whenever there is SD card
activity.

This code minimizes this by only accessing the SD card when changing
directory levels if :
SDCARD_SORT_ALPHA is enabled
SDSORT_USES_RAM is true
SDSORT_CACHE_NAMES is true

The code changes result in file names being pulled from the ALPHA SORT
memory array rather than the SD card.

The code also gives the file count and file index functions their own
variables.  When they shared a common variable the index function
sometimes resulted in the file count being short by 1.

=======================================================================

cardreader.cpp & pins_RAMPS_RE_ARM.h changes

Added another condition to cardreader.cpp to enable getting file names
only from RAM.

pins_RAMPS_RE_ARM.h :
Added comments about the SD card accesses and the LCD display
Combined all versions into this one.
2017-08-31 18:23:44 -05:00
Bob-the-Kuhn
84a11cfedc HAL compatible pinsDebug & misc
Re-ARM has been tested.  AVR has not been tested.

1) moved all cpu specific items to files in the low level HAL directory
for that CPU (pinDebug_Re-ARM.h & pinsDebug_AVR_8_bit.h

2) added pinsDebug.h to the top level directory

3) modified HAL_pinsDebug.h to select the correct support file for the
selected CPU

4) Patched sanitycheck to stop throwing false errors.  A long term
solution will be done

5) misc changes & bug fixes
arduino.cpp - included macros.h to fix a missing definition
pinmap_re-arm.h - removed a duplicated line.
pinmapping.h - changed from "ENABLED" to "defined" to fix a compile
error

======================================================================

split SanityCheck up, improve pinsDebug system

======================================================================

switch to latest pins_RAMPS_RE_ARM.h
2017-08-31 18:23:44 -05:00
Christopher Pepper
32e759c928 SPI API platform implementation stubs 2017-08-31 18:23:44 -05:00
Christopher Pepper
4183a249b6 Moved CMSIS and other LPC1768 dependencies
Fixes Arduino IDE builds for 8-bit AVR,
misc: Adafruit NeoPixel currently incompatible with Teensy 3.5-6, blacklisted
2017-08-31 18:23:44 -05:00
Christopher Pepper
b55295ad33 Post merge fix
Add macros.h to allow Enabled macro, also need to reference include files directly
2017-08-31 18:23:44 -05:00
Christopher Pepper
d2fb3215da PlatformIO Travis test
spi.h renamed to avoid conflicts with base libraries
2017-08-31 18:23:44 -05:00
Christopher Pepper
c66d1ac651 Debug Pins Support 2017-08-31 18:21:38 -05:00
Christopher Pepper
a31e32969f Base HAL SPI Changes 2017-08-31 18:21:38 -05:00
Christopher Pepper
bcd050f33b Initial HAL SPI API 2017-08-31 18:21:38 -05:00
Christopher Pepper
44b0c186a6 HAL for Re:ARM (LPC1768) architecture 2017-08-31 18:21:38 -05:00
teemuatlut
f3e562e46e HAL for 32-bit Teensy (3.5, 3.6) architecture 2017-08-31 18:15:07 -05:00
Christopher Pepper
cfef925559 HAL for DUE architecture 2017-08-31 18:15:07 -05:00
Christopher Pepper
4b16fa3272 Implement HAL and apply macros across code-base
Implement AVR Platform
2017-08-31 18:14:31 -05:00
Christopher Pepper
fb04dfcda8 Apply Travis update workaround while a permanent solution is found 2017-08-31 17:56:08 -05:00
Scott Lahteine
e4fcf460e7 Marlin bugfix-2.0.x Version/README 2017-08-31 17:56:08 -05:00
Scott Lahteine
367e1b54ba Merge pull request #7591 from thinkyhead/bf1_misc_patches
M111: no args reports current flags
2017-08-31 15:19:29 -05:00
Scott Lahteine
41e4de62b3 Merge pull request #7592 from thinkyhead/bf1_workspace_planes
CNC workspace planes for G5
2017-08-31 15:18:15 -05:00
Scott Lahteine
8a184a526a Marlin: Patch G33, allow M111 to give status 2017-08-31 14:35:00 -05:00
Scott Lahteine
353c23b16e Enforce BED_CENTER_AT_0_0 on Delta, SCARA 2017-08-31 14:34:59 -05:00
Scott Lahteine
898f48e331 CNC workspace planes for G5
According to LinuxCNC, G5 should throw an error if the current plane mode isn't XY.
2017-08-31 14:29:29 -05:00
Scott Lahteine
5851c2d36f MAX7219 followup (#7564)
* Add MAX7219_DEBUG to Travis CI testing

* Tweak config and use standard pin naming for MAX7219_DEBUG

* MAX7219: Apply coding standards, use macros, etc.

* Make code work...
2017-08-31 11:44:43 -05:00
Scott Lahteine
52073f21c5 Merge pull request #7556 from thinkyhead/bf1_slovak_language
Slovak UTF-8 translation
2017-08-27 21:05:53 -05:00
Scott Lahteine
321f98f867 Fix servo delay in Folgertech config 2017-08-27 20:53:27 -05:00
Scott Lahteine
9721c77fb9 Merge pull request #7577 from thinkyhead/bf1_creality_fix
Fixes required for Creality CR-10
2017-08-27 20:51:15 -05:00
jneilliii
36771e9492 Fixes required for Creality CR-10 2017-08-27 20:39:16 -05:00
Roxy-3D
3f0b38ed5d Add Max7219 LED Matrix Debug Support (#7563)
* Add Max7219 LED Matrix Debug Support

The Max7219 8x8 LED Matrix's are very helpful for debugging new code.
And for that matter, just trying to maximize printer settings without
causing stuttering.

The displays are very inexpensive (under $2.00 with shipping) and
provide a lot of help when trying to debug complicated code.

* Try to keep Makefile up to date.
2017-08-25 17:03:07 -05:00
Scott Lahteine
ca9734805c Merge pull request #7560 from thinkyhead/bf1_m406_patch
Addressing #7552
2017-08-25 03:38:41 -05:00
GMagician
0067bb2840 Addressing #7552
When M405 is used it changes 'volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]' value. When M406 disables M405 it leaves the value unchanged.
This PR applies 'calculate_volumetric_multipliers' in M406 instead of resetting it to 1.0 because M200 may not be compatible with M405 hence I'm sure to restore anyway with correct value.
2017-08-25 03:23:16 -05:00
Scott Lahteine
2b12093589 Merge pull request #7532 from thinkyhead/bf1_fan_mux_vben
New feature: Part-Cooling Fan Multiplexer
2017-08-25 03:16:40 -05:00
Scott Lahteine
ddfe527ff2 Merge pull request #7554 from thinkyhead/bf1_sanguino_config
Sanguinololu example config
2017-08-23 19:58:05 -05:00
Michal Holes
54d48130f3 Slovak UTF-8 translation
Slovak UTF-8 translation
2017-08-23 19:14:35 -05:00
Scott Lahteine
86c024ce98 Organize, document pins.h include lines 2017-08-23 18:33:00 -05:00
Scott Lahteine
c7b07d20f2 Minor patches to pins files 2017-08-23 18:32:59 -05:00
Scott Lahteine
356af7dcb0 Tweak Sanguinololu-related pins files 2017-08-23 18:32:59 -05:00
Scott Lahteine
11a724d8fc Sanguinololu example configuration 2017-08-23 18:32:59 -05:00
Scott Lahteine
d29bf49b66 Add Sanguino 644p to ENV for PlatformIO 2017-08-23 18:32:58 -05:00
Scott Lahteine
e337df2e98 Miscellaneous tweaks to serial outputs, code cleanups 2017-08-23 18:32:58 -05:00
Vben
c0409b85e7 New feature: Part-Cooling Fan Multiplexer 2017-08-18 15:59:04 -05:00
Scott Lahteine
e82e9073d6 Merge pull request #7530 from GMagician/Code-reduction
Code reduction with some configurations
2017-08-18 13:57:59 -05:00
Scott Lahteine
69d1052010 Merge pull request #7529 from GMagician/My-bugfix-1.1.x
#7528 fix
2017-08-18 13:57:22 -05:00
GMagician
6127154af3 Fix identation by tab
There was a tab instead of spaces
2017-08-18 11:34:55 +02:00
GMagician
b94a1c6b9f Code reduction this some configurations
When switching noozle and extruder but these operations are done by the same servo in 'setup' function there is a unnecessary call
2017-08-18 11:11:00 +02:00
GMagician
405a2132f3 #7529 compile fix
I made an error in previous fix
2017-08-17 22:04:28 +02:00
GMagician
869d7f3703 #7504 missing part
#7504 integration has missed this part.
When more than 1 servo is used with bltouch it's impossible to predefine default servo delay for it.
In my original fix I completely removed this part but maybe this is a better compromise
2017-08-17 21:43:47 +02:00
Scott Lahteine
101ba70517 Merge pull request #7505 from thinkyhead/bf1_anet_1_pio
Add Anet 1.0 to Platformio.ini
2017-08-17 00:33:20 -05:00
Scott Lahteine
5e14bb61de Merge pull request #7506 from thinkyhead/bf1_dual_parking_extruder
AutoParking Extruder (APE)
2017-08-17 00:32:20 -05:00
Vben
4817b39d98 Added new feature for AutoParking Extruder (APE) 2017-08-16 17:33:11 -05:00
Scott Lahteine
6772e33ef6 Use [XY]_CENTER for error correction
Followup to #7512
2017-08-16 16:13:09 -05:00
Scott Lahteine
385f1bb9e5 Merge pull request #7504 from thinkyhead/bf1_servo_delays
Individual servo delays
2017-08-16 16:05:22 -05:00
Scott Lahteine
2a31c9f2ce Merge pull request #7515 from cdedwards/bugfix-1.1.x
Fix for G26 spam output
2017-08-16 16:01:10 -05:00
MTrab
5fa61c0ad3 Add Anet 1.0 to Platformio.ini
Added env:anet10 to platformio.ini for easy compile and upload to this board
2017-08-16 15:59:20 -05:00
Scott Lahteine
b3f59ec945 Merge pull request #7519 from thinkyhead/bf1_cleanups_aug_16
Add "Level Corners" menu item
2017-08-16 15:58:15 -05:00
Tannoo
b33739d493 UBL_Language_Update (#7520)
* UBL_Language_Update

Translatable strings

* Use slightly better wording...

* Use slightly better wording...
2017-08-16 09:49:04 -05:00
Scott Lahteine
a1878cd1c0 Add "Level Corners" menu option 2017-08-16 02:54:33 -05:00
Scott Lahteine
0a18fb735e Use "PSU" label to fit on screen 2017-08-16 02:51:00 -05:00
Scott Lahteine
30887feae3 Tweak some formatting in ABL G29 2017-08-16 02:51:00 -05:00
Thomas Moore
257b693ab0 Advanced pause fixes (#7518)
* Disallow filament change while paused

* Use kinematic movemements in pause_print and resume_print
2017-08-15 22:57:13 -05:00
Tannoo
ab2ac1af71 UBL_LCD_storage_corrections (#7517)
Correcting the storage selection.
Also EEPROM error handling on the LCD.
2017-08-15 21:01:11 -05:00
cdedwards
f1843211e6 Fix for G26 spam output
while heating, G26 will continuously spam the heater states instead of printing it out every 5000ms.
2017-08-15 17:04:53 -06:00
Roxy-3D
be5ca34215 Allow G29 to work correctly even if nozzle is off the mesh. (#7512)
* work around previous regressions...
2017-08-15 17:04:52 -05:00
Scott Lahteine
06541ec885 Merge pull request #7448 from thinkyhead/bf1_delta_fixes
Prevent damage if DELTA_HEIGHT is set badly
2017-08-15 16:35:09 -05:00
GMagician
e9c72978c7 Implement SERVO_DELAY as array
This modify give SERVO_DELAY x servo basis
2017-08-15 00:28:47 -05:00
Scott Lahteine
96ae53cf41 Use MOVE_SERVO macro where possible 2017-08-15 00:28:39 -05:00
Scott Lahteine
6172f150c2 Merge pull request #7471 from thinkyhead/bf1_cleanups_aug9
Miscellaneous style tweaks
2017-08-15 00:12:37 -05:00
Scott Lahteine
3be9c19f12 Hold on move axis screens 2017-08-14 22:51:47 -05:00
Scott Lahteine
8fd58cd6dc Patch goto labels for consistency 2017-08-14 22:51:47 -05:00
Scott Lahteine
75e6f72c89 Fix hexadecimal number formatting 2017-08-14 22:50:44 -05:00
Scott Lahteine
ac76101ec3 Eliminate goto in gcode_M48 2017-08-11 17:00:40 -05:00
Scott Lahteine
75e6ead5fd Eliminate goto in gcode_G33 2017-08-11 17:00:40 -05:00
Scott Lahteine
6bd63d27b5 Updates to G29 for probe error handling 2017-08-11 17:00:40 -05:00
Thomas Moore
f54e0fc90f Prevent damage if DELTA_HEIGHT is incorrect 2017-08-11 16:09:14 -05:00
Scott Lahteine
0938c62b48 Neater position_is_reachable call 2017-08-11 15:55:32 -05:00
Scott Lahteine
9d95b1b4df Tweak Conditionals_post.h 2017-08-11 15:55:32 -05:00
Scott Lahteine
35d5a7bdff Tweak CR-10 config/pins 2017-08-11 15:55:31 -05:00
Scott Lahteine
419c8969a7 Merge pull request #7479 from thinkyhead/bf1_fix_italian
Fix Italian string length
2017-08-10 18:42:35 -05:00
Frederik Kemner
25a11cd485 Use bed size and inset instead of travel limits to define mesh area\n\nAs proposed in #7435 (#7480) 2017-08-10 16:53:04 -05:00
Scott Lahteine
7f3406d47b Fix Italian string length
Addressing #7264
2017-08-10 15:41:35 -05:00
Scott Lahteine
6440904c1c Merge pull request #7442 from thinkyhead/bf1_geeetech_gt2560_revs
Support for Geeetech GT2560 Rev.A/Rev.A+
2017-08-06 00:45:12 -05:00
Jozsef Kiraly
97c21e9007 Support for Geeetech GT2560 Rev.A/Rev.A+ 2017-08-06 00:42:54 -05:00
Scott Lahteine
82cfdd4d8f Merge pull request #7437 from thinkyhead/bf1_geeetech_config
Geeetech I3 Pro X + GT2560 Config
2017-08-05 03:58:47 -05:00
Scott Lahteine
b2822a59f9 Add a sanity check for valid bed size 2017-08-05 03:49:04 -05:00
Scott Lahteine
a7e5c1bf19 Use float to init TMC2133 steps-per-mm 2017-08-05 03:48:52 -05:00
Scott Lahteine
dd66d21749 Extend DEACTIVATE_SERVOS_AFTER_MOVE sanity-check
As proposed in #7429
2017-08-05 03:48:52 -05:00
richarddeweerd
b370906031 Example config for Geeetech I3 Pro X with GT2560 controller 2017-08-05 03:48:52 -05:00
Scott Lahteine
804818b4d9 Bring configs up to date 2017-08-05 03:48:52 -05:00
Scott Lahteine
dd841a3675 Merge pull request #7410 from benlye/user-script-feedback
Make audible user script feedback optional
2017-08-05 02:59:56 -05:00
Florian Heilmann
0fd2923a9f Fix compilation with ADVANCED_PAUSE_FEATURE without SDSUPPORT (#7412)
* Fix compilation of ADVANCED_PAUSE_FEATURE without SDSUPPORT

* Fix Identation

* Make use of IS_SD_PRINTING macro

as per @MagoKimbra
2017-08-05 02:58:38 -05:00
Scott Lahteine
8b97da0e3d Merge pull request #7420 from benlye/patch-1
Add VScode directory to .gitignore
2017-08-05 02:57:07 -05:00
Scott Lahteine
db188934d1 Merge pull request #7432 from FHeilmann/bf_update_de_translation
Update language_de.h v2
2017-08-05 02:53:32 -05:00
benlye
24af9e1bf4 Make audible user script feedback optional
Add a parameter to enable/disable audible user script feedback
2017-08-04 17:24:10 +01:00
Ben Lye
8443872d10 Ignore VScode directory
PlatformIO can be used with VSCode.  VSCode creates a .vscode directory which should be ignored.
2017-08-04 08:50:03 +01:00
Florian Heilmann
6827a162bb Update language_de.h
Add
MSG_BLTOUCH                    
MSG_DELTA_SETTINGS            
MSG_UBL_MESH_EDIT                
MSG_UBL_OUTPUT_MAP_BACKUP        
MSG_UBL_STEP_BY_STEP_MENU       
MSG_Z_FADE_HEIGHT
2017-08-04 09:35:21 +02:00
Scott Lahteine
43d298a324 Merge pull request #7430 from thinkyhead/bf1_fix_dualx
Followup cleanup patch
2017-08-03 16:41:49 -05:00
Scott Lahteine
3497153cf1 Followup cleanup patch
Fix regression in #7428
2017-08-03 14:55:22 -05:00
Scott Lahteine
16f8c4865a Merge pull request #7409 from FHeilmann/bf_update_ru_translation
Update Russian Translation
2017-08-03 14:54:40 -05:00
Scott Lahteine
50bfcf4c3e Merge pull request #7428 from thinkyhead/bf1_cleanup_aug_3
Clean up whitespace, trailing space, bad tab conversion, etc.
2017-08-03 14:30:33 -05:00
Scott Lahteine
622048ffb0 Clean up whitespace, trailing space, bad tab conversion, etc. 2017-08-03 11:20:03 -05:00
Dave Johnson
65a36948c0 Support travis new build environment (#7425)
move from legacy precise to trusty build image
fix PATH not including buildroot/bin
remove symolic link to ~/bin
enable sudo

trusty travis image doesn't source ~/bin by default
avr requires sude
2017-08-03 10:33:53 -05:00
Dave Johnson
c6509076c4 Force legacy "precise" build dist for TravisCI (#7422)
TravisCI "trusty" build dist isn't picking up build path causing travis checks to fail.  Reverting to legacy "precise" dist while we investigate

pristine != precise
2017-08-03 09:06:59 -05:00
Roxy-3D
2cbdc0ebb6 Fix large Z corrections when nozzle moves off of UBL mesh (#7415) 2017-08-02 16:51:04 -05:00
Florian Heilmann
650e5274c4 Update Russian Translation 2017-08-02 21:19:15 +02:00
Scott Lahteine
ce65c13a97 Merge pull request #7398 from fiveangle/bf_lcd_bed_level_requirements
Clarify LCD_BED_LEVELING requirements
2017-08-01 17:46:07 -05:00
Scott Lahteine
6ef71c3d5f Merge pull request #7397 from Kaibob2/patch-4
Fix for #7395
2017-08-01 17:40:59 -05:00
Dave Johnson
936dfb965c Clarify LCD_BED_LEVELING requirements
LCD_BED_LEVELING requires PROBE_MANUALLY with auto bed leveling enabled.  See #7396
2017-08-01 14:13:54 -07:00
Kai
ffe3013bb5 Fix for #7395
Filament change causes freeze during paused print. This PR disables Filament change in the prepare menu when a print from SD Card is paused. See #7395
2017-08-01 21:45:41 +02:00
Scott Lahteine
7ef0650504 Merge pull request #7386 from oysteinkrog/fix/DualX
Fix DUAL_X_CARRIAGE movement
2017-07-31 20:30:06 -05:00
Øystein Krog
e948f77cf9 Fix DUAL_X_CARRIAGE not moving at all
Axis would only move when homing.
Bug introduced in 91841d75c9.
Fixes #6956, fixes #7050 and fixes #7291
2017-07-31 18:44:26 +02:00
Scott Lahteine
08b0456d91 Merge pull request #7379 from thinkyhead/bf_manual_bed_level_floor
Manual Bed Leveling: Goto previous Z height at each probe point
2017-07-30 05:41:12 -05:00
Scott Lahteine
850e404838 Merge pull request #7380 from thinkyhead/bf_touchy_probe_delay
Implement probing delay for piezo sensors
2017-07-30 05:39:45 -05:00
teemuatlut
936d00dda8 Implement probing delay for piezo sensors 2017-07-29 21:46:40 -05:00
Scott Lahteine
29eef360d0 Merge pull request #7308 from thinkyhead/bf_cleanup_config_adv
Fixes for FWRETRACT
2017-07-29 21:20:19 -05:00
Wilfried Chauveau
894608f8a3 Manual Bed Leveling: Goto previous Z height at each probe point 2017-07-29 21:15:37 -05:00
Scott Lahteine
ff06e1a030 Merge pull request #7372 from tcm0116/delta_calib_menu
Move Delta Calibration menu to the Prepare menu
2017-07-29 21:05:03 -05:00
Thomas Moore
15e009b6ca Move Delta Calibration menu to the Prepare menu 2017-07-28 08:33:18 -05:00
Scott Lahteine
8b0bd44b1e Merge pull request #7368 from thinkyhead/bf_fix_warnings
Patch to fix some compiler warnings
2017-07-28 02:53:13 -05:00
Scott Lahteine
bfd396c13a Patch to fix some compiler warnings 2017-07-28 02:27:16 -05:00
Scott Lahteine
48c5f3dddf Tweak kill action #ifdef 2017-07-27 23:42:01 -05:00
Scott Lahteine
be7a9a07c5 Don't reset grid with G29 Q + PROBE_MANUALLY 2017-07-27 22:47:43 -05:00
Scott Lahteine
dfe670247d Merge pull request #7363 from marcio-ao/bugfix-1.1.x
Makefile fixes and U8G support.
2017-07-27 21:31:56 -05:00
Marcio Teixeira
af83c512b8 Added support for U8G. 2017-07-27 07:49:25 -06:00
Scott Lahteine
4eff18854b Rename options with swap_ prefix 2017-07-27 04:14:29 -05:00
Scott Lahteine
14482d2f2a Strip auto-retract for impossible M(IN|AX)_AUTORETRACT combo 2017-07-27 04:14:29 -05:00
Scott Lahteine
9fc72422e4 Don't let the flow multiplier affect retract/recover length 2017-07-27 04:14:29 -05:00
Scott Lahteine
fee696db5d Improve retract() for G10/G11/autoretract 2017-07-27 04:14:29 -05:00
Scott Lahteine
423b0f3a1e Replace MIN_RETRACT with MIN_AUTORETRACT, MAX_AUTORETRACT 2017-07-27 04:14:29 -05:00
Scott Lahteine
283d15a8d0 Add a Travis CI test for FWRETRACT 2017-07-27 04:14:29 -05:00
Scott Lahteine
e52c1a0882 Merge pull request #7341 from thinkyhead/bf_bed_size
Add X_BED_SIZE, Y_BED_SIZE to configurations
2017-07-27 04:05:24 -05:00
Scott Lahteine
5b69d67da9 Merge pull request #7359 from fiveangle/pio_printrboard_revf
Add PIO entry for PRINTRBOARD_REVF
2017-07-26 23:09:06 -05:00
Scott Lahteine
51864fd365 Add bed size as a configuration option 2017-07-26 23:04:54 -05:00
Scott Lahteine
dc7c95e07b Remove @ section fwretract 2017-07-26 22:46:16 -05:00
Scott Lahteine
a972c060d7 Merge pull request #7347 from fiveangle/at90usb_usbcon_unification
Remove extraneous USBCON defines for AT90USB boards
2017-07-26 21:44:18 -05:00
Unknown
42aa10d263 Add PIO entry for PRINTRBOARD_REVF
fix from PIO corruption
2017-07-25 19:09:08 -07:00
Dave Johnson
4718c09c48 Remove extraneous USBCON defines for AT90USB boards
USBCON is definied by serial.h pullikng in MarlinConfig.h which in turn pulls in Arduino.h.  Defining in later includes has shown to cause compile issues so removing all extraneous calls for and potentially easier future linker troubleshooting.
more USBCON unification
2017-07-23 16:41:48 -07:00
Scott Lahteine
21591352d7 Merge pull request #7340 from thinkyhead/bf_neopixel_rgbw
Add support for Printrbot Neopixel RGBW strip.
2017-07-22 16:19:12 -05:00
C. Scott Ananian
890e7a16a9 Add support for Printrbot Neopixel RGBW strip.
Connected as described at http://printrbot.com/shop/led-strip/

Based on patch by Kelly Anderson <kelly@xilka.com> at
http://www.xilka.com/printrbot/marlin/1.1.4/20170707/
2017-07-22 16:07:55 -05:00
Scott Lahteine
a059e95463 Bring Infitary i3 config up to date 2017-07-21 20:49:19 -05:00
Scott Lahteine
d6d6043548 Merge pull request #7338 from thinkyhead/bf_mks_ps_on_pin
MKS 1.3+: Add pin mapping for PS_ON
2017-07-21 20:00:26 -05:00
Scott Lahteine
03989824fa Merge pull request #7339 from thinkyhead/bf_russian_part_1
Update Russian translation - Part 1
2017-07-21 19:57:18 -05:00
Alexey Shvetsov
851f9f5399 Update Russian translation - Part 1
Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
2017-07-21 19:32:37 -05:00
Scott Lahteine
b7a16e4468 Merge pull request #7315 from fixoid/patch-1
Fixing SWITCHING_EXTRUDER feature to work with HOTENDS > 1
2017-07-21 19:10:54 -05:00
Alexey Shvetsov
f38b8c5bf8 MKS 1.3+: Add pin mapping for PS_ON
This allows the use of D4 as PS_ON since MKS Gen doesn't have a PS_ON pin. However this effectively allows only 3 servos (instead of 4).

Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
2017-07-21 18:50:05 -05:00
Scott Lahteine
60cb2bd4e7 Merge pull request #7332 from thinkyhead/bf_before_fwretract
Improve FWRETRACT comments
2017-07-21 00:20:56 -05:00
Scott Lahteine
8a3bc6be4d Improve FWRETRACT config options and commentary
Add more details as requested in #7198
2017-07-20 22:57:50 -05:00
Scott Lahteine
b0173ccdb9 Drop extra initializers for vars initialized by EEPROM code 2017-07-20 22:57:49 -05:00
Scott Lahteine
7afafb05b8 Split G10/G11 into separate functions 2017-07-20 02:24:13 -05:00
Scott Lahteine
c45798694f Add some more requirements to the G-code list 2017-07-20 02:24:13 -05:00
Scott Lahteine
72de280c1e BARICUDA valve pressure consistently uint8_t 2017-07-20 02:21:40 -05:00
Scott Lahteine
4d98e3f0a7 General cleanup 2017-07-20 02:21:40 -05:00
fixoid
e530c67349 Fixing SWITCHING_EXTRUDER feature 2017-07-19 21:15:26 +03:00
Tannoo
2ad3ca5d8a Bugfix (#7310) 2017-07-18 22:55:14 -05:00
Roxy-3D
37a6833d7e Allow the sampled point to be added into the Least Squares Best Fit (#7289)
Without this...  The LSF won't work because none of the sampled points
in this code block get added.
2017-07-13 16:33:02 -05:00
C. Scott Ananian
a519b093b9 Fix build by replacing qr_solve by least_squares_fit. (#7285)
This was broken by 9af67e2446.
2017-07-13 12:02:15 -05:00
Scott Lahteine
b9809ea86c Merge pull request #7281 from thinkyhead/bf_seen_not_volatile
Fixes for recent merges
2017-07-13 00:54:10 -05:00
Scott Lahteine
0873c667fa Apply coding standards to recent merges 2017-07-13 00:46:16 -05:00
Scott Lahteine
8c2907d10f Fix ABL broken by recent change 2017-07-12 22:56:18 -05:00
Roxy-3D
9af67e2446 Save 7714 bytes of program memory when doing AUTO_BED_LEVELING_LINEAR (#7276)
We can save more and a pile of RAM by eleminating the eqnBVector and
EqnAMatrix arrays next.
2017-07-10 19:05:11 -05:00
Scott Lahteine
e5904c4df8 Merge pull request #7275 from thinkyhead/bf_seen_not_volatile
Volatile keyword not needed for parser.seen
2017-07-10 16:11:08 -05:00
Scott Lahteine
76e90b93b7 Volatile keyword not needed for parser.seen 2017-07-10 15:38:54 -05:00
Scott Lahteine
f63f1ff12c Merge pull request #7272 from thinkyhead/bf_user_menu_stay
Stay in User Menu after command. Add feedback.
2017-07-10 15:10:07 -05:00
Jamie Bainbridge
00e4ced58e Stay in User Menu after command. Add feedback.
When a user executes a User Menu command, the LCD returns to the main menu. If the user has multiple menu items they want to run, such as one menu item per bed leveling corner, then it's better to stay in the User Menu rather than return to the main menu.

This PR modifies Marlin to stay in the User Menu after a command.
2017-07-10 13:47:12 -05:00
Scott Lahteine
1066b17457 Merge pull request #7260 from thinkyhead/bf_G33_update_27
Updates to G33 and its LCD code
2017-07-10 13:39:36 -05:00
Tannoo
e927941c06 Bugfix (#7265)
Fix compile error when UBL is enabled but there is no LCD Panel.
2017-07-08 09:44:50 -05:00
Scott Lahteine
68aea9c01d Merge pull request #7261 from thinkyhead/bf_configs_by_vendor
Arrange more example configs by vendor
2017-07-07 15:46:22 -05:00
Tannoo
aaacef9441 Corrections (#7231)
20x4 map integration.    Also some minor changes to the UBL Menu layout.     Both 20x4 LCD's and Graphical LCD panels should have similar functionality now.
2017-07-07 11:05:08 -05:00
LVD-AC
4bc79ec877 Updates for G33-LCD interface 2017-07-07 05:00:59 -05:00
Scott Lahteine
186580b55f Arrange example configurations by vendor 2017-07-07 04:48:23 -05:00
Scott Lahteine
6be369f3ea Add some config names to AUTHOR 2017-07-07 04:46:33 -05:00
Scott Lahteine
7fc31a7940 Merge pull request #7258 from thinkyhead/bf_cleanups_jbrazio
Add support for BQ heated bed kit with Hephestos 2
2017-07-07 04:11:07 -05:00
Scott Lahteine
11e376e920 Merge pull request #7256 from thinkyhead/bf_cleanup_july_6
Assign -1 to LCD_PINS_D4-7 if not defined
2017-07-07 03:22:47 -05:00
Scott Lahteine
a3aa798f6d Merge pull request #7257 from thinkyhead/bf_Creality_CR10
Support for Creality CR-10
2017-07-07 03:22:27 -05:00
João Brázio
2065591daf Add support for BQ heated bed kit with Hephestos 2 2017-07-07 03:10:38 -05:00
essgcee
61be28133d Support for Creality CR-10
Creality board is a Melzi / Sanguinololu variant, but using different pins for LCD control (and maybe other minor variations)
2017-07-06 23:08:10 -05:00
Scott Lahteine
9248a90a4c Assign -1 to LCD_PINS_D4-7 if not defined 2017-07-06 22:47:51 -05:00
Scott Lahteine
ce834bb78e Merge pull request #7255 from thinkyhead/bf_cleanup_july_6
Use FastIO for spindle, probe test, and case light
2017-07-06 22:03:27 -05:00
Scott Lahteine
5ef1e5ef60 Tweaks for M43 2017-07-06 21:47:50 -05:00
Scott Lahteine
c7732db99d Fix: Use of digitalRead, digitalWrite breaks on AT90USB 2017-07-06 21:25:56 -05:00
Scott Lahteine
f713f25fa5 Clean up excess whitespace 2017-07-06 21:24:30 -05:00
Scott Lahteine
2cb308fb53 Merge pull request #7253 from thinkyhead/bf_busy_protocol
"Keepalive" is now "Busy protocol"
2017-07-06 16:39:50 -05:00
Scott Lahteine
fc9ce65095 Add BUSY_WHILE_HEATING for hosts that need it 2017-07-06 16:28:57 -05:00
Scott Lahteine
504d26341a Merge pull request #7251 from thinkyhead/bf_simplify3d_workaround
Patch M23 to work around Simplify3D bug
2017-07-06 14:45:04 -05:00
Scott Lahteine
c6d430670a Clear SHOW_BOOTSCREEN with no LCD 2017-07-06 14:21:27 -05:00
Scott Lahteine
11c589c3ec Fix compile issue with G38
Fixes #7250
2017-07-06 14:21:27 -05:00
Scott Lahteine
678914be25 Patch M23 to work around Simplify3D bug
Addressing #7227
2017-07-06 14:00:58 -05:00
Scott Lahteine
ef94ddf53c Merge pull request #7238 from thinkyhead/bf_probe_manual_G33
Add PROBE_MANUALLY support to G33
2017-07-04 18:18:32 -05:00
LVD-AC
3efe4aeef8 Add PROBE_MANUALLY support to G33 2017-07-04 18:06:54 -05:00
Scott Lahteine
28deff01b8 Fix a bug in mfup 2017-07-04 17:38:45 -05:00
Scott Lahteine
cca1cca3a5 Merge pull request #7237 from thinkyhead/bf_cz_mapper
UTF-8 mapper for Czech
2017-07-04 16:45:13 -05:00
Scott Lahteine
a2babb532d Merge pull request #7217 from benlye/add-kill-action
Add configurable action command to send when printer is killed
2017-07-04 16:44:08 -05:00
Petr Zahradník
8c34233452 UTF-8 mapper for Czech 2017-07-04 15:51:23 -05:00
Scott Lahteine
b8066fb36f Merge pull request #7232 from fiveangle/disable_xyz_compatibility_check
DISABLE_[XYZ] compatibility check
2017-07-04 13:26:56 -05:00
Dave Johnson
20f6676d63 DISABLE_[XYZ] compatibility check
DISABLE_[XYZ] is incompatible with HOME_AFTER_DEACTIVATE and Z_SAFE_HOMING
2017-07-03 17:23:53 -07:00
Ben Lye
c28749a567 Add kill action
Sends pre-defined string as action command when printer is kill.
2017-07-03 23:45:19 +01:00
Scott Lahteine
df87278fce Add "CAP:PRINT_JOB:1" (M75 / M76 / M77) to M115 output 2017-07-03 15:59:06 -05:00
Scott Lahteine
4be8d7720e Fix spelling of "Chinese" 2017-07-03 15:24:49 -05:00
Scott Lahteine
760bf49a00 Merge pull request #7221 from thinkyhead/bf_fix_reachable
Fix for issues #6997 and #7152
2017-07-03 03:40:42 -05:00
LVD-AC
567941e341 Fix for issues #6997 and #7152
Probing with the effector in the printing area, but an eccentric probe (e.g. allen key) outside it but still touching the bed gives meaninfull information for calibration. Since calibration is most accurate when probing as close to the towers as possible the testing was way to restrictive hence this fix.
2017-07-03 02:53:49 -05:00
Scott Lahteine
57fff2e95e Merge pull request #7219 from thinkyhead/bf_update_git_scripts
Update Marlin+git helper scripts
2017-07-03 01:49:27 -05:00
Scott Lahteine
94c965fad6 Merge pull request #7220 from thinkyhead/bf_fix_eeprom_opts
Make all EEPROM optimization options available
2017-07-03 01:39:01 -05:00
Scott Lahteine
6a3967ee33 Corrections for probe_pt parameters 2017-07-03 01:34:27 -05:00
Scott Lahteine
534bffa7a9 Correct comment on ABL G29 2017-07-03 01:13:07 -05:00
Scott Lahteine
e1e1a0c344 Provide a default CUSTOM_BOOTSCREEN_TIMEOUT 2017-07-03 01:13:07 -05:00
Scott Lahteine
ab79933d1f Update Marlin+Github helper scripts 2017-07-03 01:13:07 -05:00
Scott Lahteine
69297b2d7b Make all EEPROM optimization options available 2017-07-02 20:47:03 -05:00
Scott Lahteine
015839fc50 Merge pull request #7212 from thinkyhead/bf_m48_real_probe
M48 needs a real probe
2017-07-02 16:22:47 -05:00
Scott Lahteine
d609489b22 Drop setup_homepin 2017-07-02 02:27:09 -05:00
Scott Lahteine
167169e1bf Sanity check for a real probe with M48 2017-07-02 02:27:09 -05:00
Scott Lahteine
395a9f59ac Merge pull request #7211 from thinkyhead/bf_lcd_bootscreen
Use lcd_bootscreen for both
2017-07-02 02:11:07 -05:00
Scott Lahteine
14663efe0d Merge pull request #7210 from fiveangle/printrboard_revf_cleanup
Printrboard RevF cleanup
2017-07-02 01:02:26 -05:00
Scott Lahteine
ae5923a3d0 Make lcd_bootscreen common to both 2017-07-02 00:47:36 -05:00
Scott Lahteine
859248433f Patch for gcode debug 2017-07-02 00:47:35 -05:00
Dave Johnson
09c90c2f6c Printrboard RevF Cleanup
-Update Arduino IDE extension descriptions
-Set default motor currents if not defined in Configuration_adv.h
-Support for MINIPANEL LCD
-Support for choosing internal or panel SD
2017-07-01 22:33:39 -07:00
Scott Lahteine
41e0955c27 Merge pull request #7208 from thinkyhead/bf_lcd_for_melzi
LCD for Melzi support
2017-07-02 00:32:13 -05:00
Scott Lahteine
232a10410d LCD_FOR_MELZI 2017-07-01 22:32:20 -05:00
Scott Lahteine
76c92a1fab Clean up some trailing spaces 2017-07-01 22:32:20 -05:00
Scott Lahteine
312f63dbe8 Merge pull request #7207 from thinkyhead/bf_update_ubl_lcd
Expose DISABLE_M503 option as a test option
2017-07-01 22:10:34 -05:00
Scott Lahteine
cf96109056 Implement the EEPROM_CHITCHAT option 2017-07-01 21:48:18 -05:00
Scott Lahteine
dcec7178d1 Expose DISABLE_M503 option as a test option 2017-07-01 21:31:28 -05:00
Scott Lahteine
3e78a01262 Merge pull request #7204 from thinkyhead/bf_update_ubl_lcd
UBL radar map corrections
2017-07-01 20:59:03 -05:00
Scott Lahteine
2ff967f3e6 Merge pull request #7205 from thinkyhead/bf_infitary_m508
Add configuration for Infitary M508 (i3 clone)
2017-07-01 20:11:02 -05:00
Tom
1ff7d10c80 Add configuration for Infitary M508 (i3 clone)
Based on Infitary's own firmware settings.
2017-07-01 20:04:08 -05:00
Scott Lahteine
4cb45c10dd Patch ubl lcd mesh map indentation 2017-07-01 19:47:52 -05:00
Scott Lahteine
abd6ba62b4 Some cleanups for ubl lcd mesh map 2017-07-01 19:47:49 -05:00
Scott Lahteine
f17bae1f70 Changes for ubl_lcd_map_control patch 2017-07-01 19:47:02 -05:00
Tannoo
8e0f3b7eba UBL radar map corrections 2017-07-01 19:00:44 -05:00
Scott Lahteine
009a6104c5 Merge pull request #7201 from Bob-the-Kuhn/intermittent_Teensy2++_G26_compile_issue
intermittent AT90USB & G26 compile problem (proposal)
2017-07-01 18:54:36 -05:00
Bob-the-Kuhn
fcceed5be6 intermittent Teensy & G26 compile problem
===============================================

also an issue with ubl_motion.cpp
2017-07-01 14:41:24 -05:00
Scott Lahteine
457489d7ac Merge pull request #7187 from thinkyhead/bf_sanitycheck_G33
Add a sanity check for DELTA_AUTO_CALIBRATION
2017-06-30 11:39:09 -05:00
Scott Lahteine
30b327d24c Finish the solution for #7166 2017-06-29 15:17:39 -05:00
Scott Lahteine
6c97c5595c Add a sanity check for DELTA_AUTO_CALIBRATION 2017-06-29 15:03:19 -05:00
Bob-the-Kuhn
553d5ca283 Merge pull request #7183 from Bob-the-Kuhn/Fix_LETTER_OFF_in_gcode.h
Fix LETTER_OFF in gcode.h (make LETTTER_OFF return values that match param indices range)
2017-06-29 09:07:46 -05:00
Bob-the-Kuhn
e6e3132f79 make LETTTER_OFF return values that match param indices range 2017-06-29 09:01:58 -05:00
Bob-the-Kuhn
cd2ac3b759 Merge pull request #7182 from Bob-the-Kuhn/has__value_fix_
Correct has_value() when FASTER_GCODE_PARSER is enabled
2017-06-28 21:16:52 -05:00
Bob-the-Kuhn
bfbf5f8200 correct value_bool() when FASTER_GCODE_PARSER is enabled
Also corrected compile issue when DEBUG_GCODE_PARSER and
AUTO_BED_LEVELING_UBL are both enabled.
2017-06-28 19:51:08 -05:00
Scott Lahteine
814925d692 Merge pull request #7179 from thinkyhead/bf_anet_a6
Add ANET A6 example configuration
2017-06-28 17:06:04 -05:00
Scott Lahteine
406ef69702 Move Anet A8 config to subfolder 2017-06-28 16:58:57 -05:00
Scott Lahteine
379926961c Add Anet A6 config, edit Anet A8 config 2017-06-28 16:58:57 -05:00
Scott Lahteine
5b03f23fa2 Bring configurations up to date, fix some comments 2017-06-28 16:41:49 -05:00
Scott Lahteine
e3cedfa0ec Fix a compiler warning 2017-06-28 16:41:46 -05:00
Scott Lahteine
bb0508b6cf Fix comment in M115 code 2017-06-28 13:08:33 -05:00
Scott Lahteine
5c1888467f Merge pull request #7170 from thinkyhead/bf_M217_echo_to_serial
Add A (action) and E (echo) parameters to M118
2017-06-28 02:13:13 -05:00
Scott Lahteine
85777a56c6 Add A (action) and E (echo) parameters to M118 2017-06-28 02:07:59 -05:00
Scott Lahteine
d1e8d4cd9d Merge pull request #7167 from thinkyhead/bf_20x4_lcd_update
UBL Map Cleanup and LCD display
2017-06-28 01:20:22 -05:00
Scott Lahteine
797d6a97e7 Merge pull request #7168 from thinkyhead/bf_M217_echo_to_serial
M118 echo to serial
2017-06-28 01:12:09 -05:00
Scott Lahteine
b492e0878d Changes to reduce and simplify 2017-06-28 01:10:30 -05:00
Ben Lye
98d362c2da Adding M118 command to send text to serial
Allows the user to send text to the serial console in order to
communicate with a host - sending debuging information or action
commands, for example.  Text must begin with '//' and this is added if
it is not already present at the beginning of the string.
2017-06-28 00:55:20 -05:00
Tannoo
80abc872f3 Updated to better support the coming "radar" 2017-06-27 22:51:58 -05:00
Tannoo
e90cbf5c16 UBL Map Cleanup 2017-06-27 22:51:58 -05:00
Scott Lahteine
ada836db29 Merge pull request #7007 from thinkyhead/bf_followups_friday
Followups for I2C_POSITION_ENCODERS
2017-06-27 22:51:24 -05:00
Scott Lahteine
fc140c4962 Followup for I2C_POSITION_ENCODERS 2017-06-27 20:46:40 -05:00
Scott Lahteine
f4246dc8ff Merge pull request #7165 from thinkyhead/bf_parser_shorthand
Use parser.seenval, add shorthand functions
2017-06-27 18:57:48 -05:00
Scott Lahteine
66faedb2b8 Merge pull request #6938 from thinkyhead/bf_prusa_multiplexer
Initial support for the Průša MK2 Multiplexer
2017-06-27 18:54:30 -05:00
Scott Lahteine
bd776df8c1 Optimize seen_axis by moving 'X' to index 24 2017-06-27 18:47:11 -05:00
Scott Lahteine
05449cf6ee Add shorthand value accessors to gcode.h 2017-06-27 18:39:41 -05:00
Scott Lahteine
12f092c812 Cleanups to gcode.h, use seenval() 2017-06-27 17:57:00 -05:00
Scott Lahteine
941943c167 Apply const, spacing, etc. 2017-06-27 05:23:49 -05:00
Scott Lahteine
5b11b33854 Add support for Průša MK2 Multiplexer 2017-06-27 04:55:30 -05:00
Scott Lahteine
a4a587a897 Fix spelling of Průša 2017-06-27 04:46:46 -05:00
Scott Lahteine
ba1706a265 Fix spacing in gcode.cpp
Followup to #6940
2017-06-27 04:46:46 -05:00
Scott Lahteine
c2c8aafda2 Merge pull request #7157 from thinkyhead/bf_g33_f_parameter
G33 F and Height bug fix
2017-06-27 04:36:22 -05:00
Scott Lahteine
627afb29df Merge pull request #7109 from tnw513/fix-italian
added missing italian translation
2017-06-27 04:12:30 -05:00
Scott Lahteine
61d00d8990 Merge pull request #7156 from benlye/benlye-fix-pinsdebug
Fix #ifdef AVR_AT90USB1286_FAMILY in pinsDebug
2017-06-27 04:11:46 -05:00
Scott Lahteine
f0f9fb7465 Remove line that does nothing 2017-06-27 04:08:50 -05:00
LVD-AC
99592c8458 Update G33: Add F, fix height bug 2017-06-27 04:02:02 -05:00
Ben Lye
31514f453a Fix #ifdef AVR_AT90USB1286_FAMILY in pinsDebug
Can't compile with PINS_DEBUGING enabled on Atmega1284p because it tries
to enumerate pins 46 and 47 (which don't exist) because `#ifdef
AVR_AT90USB1286_FAMILY ` doesn't work as expected.
2017-06-27 08:04:40 +01:00
Scott Lahteine
134116b874 Merge pull request #7153 from thinkyhead/bf_czech_update
Updated Czech language
2017-06-26 17:34:15 -05:00
Scott Lahteine
89c6e92b66 Merge pull request #7144 from thinkyhead/bf_ubl_g26_p4_surface
Added option 'H' to G29 P4.
2017-06-26 16:34:48 -05:00
Petr Zahradník
e80958b631 CZ Translate BLTouch and UBL
Fixup length
2017-06-26 16:15:31 -05:00
Scott Lahteine
fe7e890b09 Fix issues with ADC_KEYPAD
Fixes #7150
2017-06-26 16:08:31 -05:00
dot-bob
a1632cfa0a Added option 'H' to G29 P4.
- Added `H` to set a nozzle height adjustment to surface of the bed.
- Updated G29 P4 comments to reflect changes.
2017-06-25 17:14:08 -05:00
Scott Lahteine
e687782875 Merge pull request #7134 from thinkyhead/bf_skynet_a3_ready
Add Skynet/ANET A10 support
2017-06-25 14:35:22 -05:00
Scott Lahteine
1446b5f01d Allow more avr variants with build_marlin* 2017-06-25 14:16:28 -05:00
Scott Lahteine
efc6a9c1b8 Merge pull request #7136 from thinkyhead/bf_digipot_save
Edit digipot currents via LCD, save to EEPROM
2017-06-25 04:01:54 -05:00
dot-bob
b3c36c98fd Edit digipot currents via LCD, save to EEPROM 2017-06-25 01:02:36 -05:00
Scott Lahteine
3c7bfe798d Various cleanups ahead of digipot save 2017-06-24 23:56:24 -05:00
Bob-the-Kuhn
9651d01e1a Add Skynet/ANET A10 support 2017-06-24 19:07:03 -05:00
Scott Lahteine
eb314373bb Config spacing & consistency, group custom LCDs 2017-06-24 14:33:40 -05:00
Scott Lahteine
6c45fa7dcc Apply #elif in LCD conditionals 2017-06-24 13:56:33 -05:00
Scott Lahteine
ece89bcf7a Merge pull request #7119 from thinkyhead/bf_vref_MCP4018
Fix: set digipot mcp4018 Vrefmax to 1.666V
2017-06-24 13:27:17 -05:00
Scott Lahteine
afbc6e3e2f Update DELTA/SCARA config comments 2017-06-24 12:47:17 -05:00
Paweł Stawicki
1e47c17b46 Fix: set digipot mcp4018 Vrefmax to 1.666V 2017-06-24 12:35:34 -05:00
Scott Lahteine
ebe6719e12 Merge pull request #7128 from thinkyhead/bf_enhanced_arcs
Enhance G2/G3 with 'P' and G17/G18/G19 Plane Select
2017-06-23 15:12:15 -05:00
Scott Lahteine
80a232419d CNC workspace planes and 'P' argument for G2/G3 2017-06-23 14:53:03 -05:00
Scott Lahteine
5fb0d401eb Formatting tweaks 2017-06-23 14:53:02 -05:00
Scott Lahteine
ed04d0b6be Label DualXMode enums 2017-06-23 14:53:02 -05:00
Scott Lahteine
786cdea124 Ensure REPRAPWORLD_KEYPAD_MOVE_STEP is defined 2017-06-23 14:53:01 -05:00
Scott Lahteine
ee7163fd3a Fix pinsDebug compile errors 2017-06-23 14:53:01 -05:00
Scott Lahteine
a9f8e518bf Fix FILAMENT_WIDTH_SENSOR infinite loop issue
Addressing #6992 and #5851
2017-06-23 14:53:01 -05:00
Scott Lahteine
a18324bc8d Give a more detailed issue template 2017-06-22 18:17:02 -05:00
Scott Lahteine
254a11b083 Merge pull request #7120 from thinkyhead/bf_sainsmart_link
Add link to F. Malpartida LiquidCrystal library
2017-06-22 14:04:23 -05:00
Scott Lahteine
aeb6d465a4 Merge pull request #7118 from thinkyhead/bf_french_update
French update
2017-06-22 13:10:07 -05:00
Bob-the-Kuhn
325f09ea6c Add link to custom LiquidCrystal library by F. Malpartida 2017-06-22 13:07:08 -05:00
MagoKimbra
d26c8cc5c8 fix_planner_refresh_e_positioning (#7103)
* fix_planner_refresh_e_positioning

* Fix
2017-06-22 12:59:22 -05:00
Gege2B
c7f04fbcc7 French translation 2017-06-22 12:49:23 -05:00
Silvio Didonna
4171520729 added missing italian translation 2017-06-21 11:08:39 +02:00
Bob-the-Kuhn
41bfff14e2 Merge pull request #6991 from Bob-the-Kuhn/Mesh-with-babystepping
Mesh with BABYSTEP_ZPROBE_OFFSET: add sanity check
2017-06-20 16:36:22 -05:00
Scott Lahteine
424d0bae8b Merge pull request #7100 from thinkyhead/bf_HAL_prepare
Apply maths macros and type changes ahead of HAL
2017-06-20 01:15:23 -05:00
Scott Lahteine
5c59ee4e93 Use current (raw) Z if omitted from G29 WXY or G29 WIJ. 2017-06-20 00:10:52 -05:00
Scott Lahteine
37bc0fce62 Make G29 compatible with M206 Z and G92 Z
Use the raw position for mesh measurement. Otherwise the `M206` and
`M92` Z offsets will get canceled out by bed leveling. The downside is
`G29` will not compensate for a poorly set small `M206` fudge value.

To elaborate on this issue, imagine you are probing with a Z home
offset of -0.1, meaning when Z homes, -0.1 is the current position,
implying the ideal bed zero for the nozzle is 0.1mm higher than the Z
endstop. Ordinarily when printing, Z would raise 0.1mm higher.

What happens when we probe is that all points are measured with that
-0.1 included. So when bed leveling is enabled the `M206 Z` offset gets
exactly canceled out by the bed readings.
2017-06-20 00:09:59 -05:00
Scott Lahteine
d5368461f9 Merge pull request #7098 from thinkyhead/bf_ubl_steps
Step-by-Step Menu addition
2017-06-19 23:12:52 -05:00
Scott Lahteine
e907654d6a Do two or three fewer test builds 2017-06-19 23:08:45 -05:00
Scott Lahteine
6c45d0fd81 Apply maths macros and type changes ahead of HAL 2017-06-19 22:57:42 -05:00
Scott Lahteine
8a51e2960c Improve the experience of editing steps_per_mm 2017-06-19 22:17:15 -05:00
Scott Lahteine
725d9d9a56 Fix and improve LCD value editing display
- Fix: When "100.0" changes to "99.0" the LCD shows "199.0"
- Use 2 rows if needed on character LCD, (allowing longer labels…
Germany, et. al.)
- Known issue: A certain length label combined with a certain value
drawing function could, for example, display 99.0 on 1 line, but 100.0
on two lines. Workaround would be to pass a nominal value size argument.
2017-06-19 22:17:15 -05:00
Scott Lahteine
499bb85a95 Clean up, put ubl menu itemization closer at hand 2017-06-19 22:17:14 -05:00
Tannoo
90f5f82926 Step-by-Step Menu addition 2017-06-19 20:15:11 -05:00
Scott Lahteine
0c616700f3 Merge pull request #7097 from thinkyhead/bf_dac_percents_fix
Convert DAC percent to uint8_t
2017-06-19 17:58:55 -05:00
Florian Heilmann
6dcf42f1a7 Add Z Fade Height to M420 output if it is enabled (#7042)
* Add Z Fade Height to M420 Output

Echo the z-fade height when M420 is called, if it is enabled.

* Fix Whitespace

* Fix Compiler complaint

* Missing semi-colon
2017-06-19 17:53:07 -05:00
Bob-the-Kuhn
a1c65fd3d5 convert DAC percent to uint8_t
=====================

add test to Travis
2017-06-19 17:46:41 -05:00
Scott Lahteine
7b79f443ef Merge pull request #7096 from thinkyhead/redo_DSE
Support for two switching extruders
2017-06-19 17:32:24 -05:00
Scott Lahteine
907cafcbfd Support for two switching extruders 2017-06-19 17:20:59 -05:00
Scott Lahteine
17f69f8ca2 Merge pull request #7094 from thinkyhead/bf_fix_advance_rate
Fix #5699 - LIN_ADVANCE freeze when ADV_RATE returns 0
2017-06-19 16:38:41 -05:00
Ross Allan
cfcd069501 Fix #5699 - LIN_ADVANCE freeze when ADV_RATE returns 0 2017-06-19 14:02:17 -05:00
Scott Lahteine
b8b7ef1902 Merge pull request #7090 from thinkyhead/bf_italian_refix
Fix Italian language mapper
2017-06-19 09:27:13 -05:00
Scott Lahteine
42f7f9e013 Merge pull request #7060 from bgort/i2cpefix
I2C Position Encoders Example Configs
2017-06-19 01:08:42 -05:00
Scott Lahteine
0b49bddec2 Fix Italian language mapper 2017-06-19 01:01:40 -05:00
Scott Lahteine
7e028ec429 Merge pull request #7089 from thinkyhead/bf_italian_update
Added missing Italian translations
2017-06-19 00:16:14 -05:00
Silvio Didonna
2e26a7c752 Added missing Italian translations 2017-06-18 23:37:48 -05:00
Scott Lahteine
2e1b7d3a22 Merge pull request #7079 from thinkyhead/bf_m600_fixes
M600 fixes
2017-06-18 23:32:07 -05:00
Scott Lahteine
4c3dc8bf07 Remove set_current_to_destination from resume_print
Addressing #7057
2017-06-18 23:01:13 -05:00
Scott Lahteine
4857a3ba48 Formatting and spelling 2017-06-18 23:01:12 -05:00
Thomas Moore
3d24c329af M600 fixes 2017-06-18 23:00:56 -05:00
Scott Lahteine
311f6aff72 Merge pull request #7078 from thinkyhead/bf_cleanups_fixes
Move lcd_refresh_zprobe_zoffset definition
2017-06-18 17:24:57 -05:00
Bob-the-Kuhn
8fb30aaed6 warn user of an invalid combination 2017-06-17 15:04:47 -05:00
Bob-the-Kuhn
6cb9bb27fe Move lcd_refresh_zprobe_zoffset definition 2017-06-16 21:46:33 -05:00
Scott Lahteine
43a95ae5ad Merge pull request #7071 from thinkyhead/bf_cleanups_fixes
Fix status message, apply #7058
2017-06-16 17:29:28 -05:00
Scott Lahteine
dd1a84b23f Add Travis test for scrolling on DOGM 2017-06-16 14:48:01 -05:00
Scott Lahteine
d4270f15a9 Spacing tweak in setup() 2017-06-16 14:21:05 -05:00
Scott Lahteine
c61c0a9aeb Fix status message missing "blink" 2017-06-16 14:18:19 -05:00
Scott Lahteine
062131554f Followup to #7045 2017-06-16 14:18:19 -05:00
Jim Brown
3d043976f7 Add option to disallow filament change without homing first 2017-06-16 13:32:17 -05:00
Scott Lahteine
93da4e83f7 One more space on a short status message 2017-06-16 12:58:25 -05:00
Scott Lahteine
43c96eb31f Merge pull request #7070 from thinkyhead/bf_cleanups_fixes
Thursday cleanup / bugfixes
2017-06-15 15:43:46 -05:00
Scott Lahteine
7c95f762f2 Show LCD bed options even without thermal protection 2017-06-15 15:29:56 -05:00
Scott Lahteine
92eb55f246 Reject generous donation of trailing whitespace 2017-06-15 15:25:24 -05:00
Scott Lahteine
428be27893 Formatting adjustments 2017-06-15 15:25:24 -05:00
Scott Lahteine
8d5a37fb3d Support for a 5th stepper in stepper code 2017-06-15 15:25:23 -05:00
Scott Lahteine
7769a22064 Tweaks to temperature code 2017-06-15 15:25:23 -05:00
Scott Lahteine
d9da126776 Cleanups for UBL / ultralcd.cpp 2017-06-15 15:22:36 -05:00
Scott Lahteine
499d5c3b24 Fix scrolling lcd message for DOGM 2017-06-15 15:07:39 -05:00
Scott Lahteine
7164fd499e Tweak to G33 P error 2017-06-15 14:43:40 -05:00
Scott Lahteine
c10d763d98 Simpler prepare move conditions 2017-06-15 14:43:40 -05:00
Scott Lahteine
4ebff8eaa5 Drop fastio timer cruft 2017-06-15 14:43:40 -05:00
Scott Lahteine
09bc34f4dc Allow arbitrarily long retraction 2017-06-15 14:43:30 -05:00
Scott Lahteine
4414825e0d Merge pull request #7038 from thinkyhead/bf_PCA9632
PCA9632 PWM color LED support
2017-06-15 14:41:24 -05:00
Scott Lahteine
50c2702ba5 Merge pull request #7062 from Bob-the-Kuhn/AT90USB---UBL-compile-error
Fix two UBL compile errors (one is AT90USB only and one affects all)
2017-06-15 14:22:27 -05:00
Bob-the-Kuhn
9dda022705 fix compile errors
================================

Changed to conditional compile for AT90USB issue
2017-06-15 13:18:14 -05:00
Bob-the-Kuhn
b3338ccb01 Merge pull request #6954 from Bob-the-Kuhn/Software-SPI-for-all-CPUs
SD card soft SPI - allow all CPU families to use it
2017-06-15 01:03:39 -05:00
Brian
40bb0cbf7a example configurations, etc. 2017-06-14 18:04:28 -04:00
Jim Brown
26d20ebcfc Don't allow filament change without homing first (#7054) 2017-06-13 17:11:37 -05:00
Roxy-3D
824f71d503 LCD Panel Interactive Mesh Editing (#7045)
Original Mesh Bed Leveling replacement put at top of UBL Menu Options to
help facilitate the removal of the Original Mesh Bed Leveling.

Radar display (and control) of the UBL Interactive Mesh Editing.
2017-06-12 18:26:49 -05:00
Scott Lahteine
445227c807 Fix missing LCD_STR_REFRESH 2017-06-12 01:28:52 -05:00
Scott Lahteine
699aa35df6 Code cleanup for G33 2017-06-12 01:25:40 -05:00
Scott Lahteine
570722a0fe Combine Travis tests to shorten required time 2017-06-12 01:09:24 -05:00
dot-bob
0bc66bf22c PCA9632 PWM color LED support
Add support for the PCA9632 PWM color LED driver used on the Ultimaker 2 and Wanhao Duplicator 6.
2017-06-12 01:09:24 -05:00
Luc Van Daele
896dfa0577 G33 eccentric probe fixes (#6850)
* excentric probe config fix

* undo last commit

* eccentric probe fix

* oops

* !stow after each probe

* deploy/stow fix

* E parameter + bit of cleanup

* comment

* LCD menu fix
2017-06-12 01:07:19 -05:00
Thomas Moore
e47029199e Remove ADVANCED_PAUSE_FEATURE requirement for PROBING_HEATERS_OFF (#7000)
* Remove ADVANCED_PAUSE_FEATURE requirement for PROBING_HEATERS_OFF

* Add HEATER_IDLE_HANDLER conditional
2017-06-12 00:22:31 -05:00
Scott Lahteine
8326c1c279 Merge pull request #7005 from Diederikvanderpant/bugfix-1.1.x
added shift register pins for reprapworld keypad v1.1
2017-06-11 23:12:11 -05:00
Scott Lahteine
979a6a6459 Merge pull request #7037 from thinkyhead/bf_config_CL-260
CL-260 configs
2017-06-11 19:55:37 -05:00
Scott Lahteine
07f8da36d2 CL-260 configs 2017-06-11 19:40:13 -05:00
Scott Lahteine
dce665a083 Merge pull request #7025 from magnuspub/patch-1
Mod in language_it.h
2017-06-11 19:09:46 -05:00
Scott Lahteine
7b09ab6bda Merge pull request #7033 from Bob-the-Kuhn/pinsDebug-&-dac_mcp4728-fixes
Fix pinsDebug problem & add capability to display more than 70 pins
2017-06-11 19:09:09 -05:00
Scott Lahteine
5bdb4bbc5e Merge pull request #7030 from thinkyhead/bf_circular_scroll
Circular scrolling of the status message
2017-06-11 19:07:38 -05:00
Scott Lahteine
634b7fa7d4 Merge pull request #7031 from thinkyhead/bf_save_218_bytes
Reduce Marlin by ~218 bytes
2017-06-11 19:05:45 -05:00
Federico
772275ab0c Create language_it.h 2017-06-11 10:37:34 +02:00
Bob-the-Kuhn
11e28f389e fix pinsDebug.h error, add capability to display more than 70 pins. 2017-06-10 22:01:15 -05:00
Scott Lahteine
21217d53df Circular scrolling of the status message 2017-06-10 20:56:00 -05:00
Scott Lahteine
da8e946efb Reduce size of heater state print code 2017-06-10 20:26:17 -05:00
Scott Lahteine
dde8bb7c8b Fix extrude_min_temp compiler warning 2017-06-10 20:07:36 -05:00
Scott Lahteine
83263076dc Merge pull request #7014 from fiveangle/fix_get-set_DrvPct_declarations
fix get/setDrvPct declarations
2017-06-10 19:06:50 -05:00
Scott Lahteine
ec61b07836 Merge pull request #7027 from thinkyhead/bf_water_is_wet
Followup to German language update
2017-06-10 19:04:19 -05:00
Scott Lahteine
57a51fd5db Tweak some else clauses 2017-06-10 16:40:10 -05:00
Scott Lahteine
fc89de6d8b Followup to German language update 2017-06-10 16:27:39 -05:00
Scott Lahteine
6c9b5ab8e8 Merge pull request #6929 from p3p/pr_issue_template
Add template for github issues
2017-06-10 16:16:20 -05:00
Federico
92011e3d8c Create language_it.h 2017-06-10 21:50:14 +02:00
Dave Johnson
7864b133a8 Fix get/setDrvPct declarations 2017-06-09 20:21:28 -07:00
Scott Lahteine
0b6b7c9c7e Merge pull request #7013 from thinkyhead/bf_german_update
Update language_de.h
2017-06-09 21:41:19 -05:00
Scott Lahteine
f17a3c2474 Merge pull request #6889 from thinkyhead/bf_at90usb_mapping
Unify all AVR90USB pin mappings
2017-06-09 21:00:13 -05:00
Kai
5a72b6818e update language_de.h
Following #6990 some more translations and some grammar fixes
2017-06-09 19:45:09 -05:00
Scott Lahteine
4cc5444144 Merge pull request #7008 from Bob-the-Kuhn/Z_MIN_PROBE_ENDSTOP-and-Z_MAX_PIN
Can't use "#define Z_MIN_PROBE_PIN Z_MAX_PIN" in configuration.h
2017-06-09 19:42:56 -05:00
Scott Lahteine
51bc50214a Save 8 bytes of SRAM 2017-06-09 19:20:16 -05:00
Scott Lahteine
748bf32388 Unify AVR90USB: pinsDebug changes 2017-06-09 19:20:16 -05:00
Scott Lahteine
5426fc1735 Unify AVR90USB: Pins cleanup 2017-06-09 18:48:12 -05:00
Scott Lahteine
87d8223251 Unify AVR90USB: Pins remap to Arduino 2017-06-09 18:48:12 -05:00
Scott Lahteine
b378deaf89 Unify AVR90USB: fastio changes 2017-06-09 18:21:57 -05:00
Scott Lahteine
f4b76b1ee7 Merge pull request #7011 from thinkyhead/bf_serial_macros
Tweak serial macros
2017-06-09 17:58:20 -05:00
Scott Lahteine
e94f79ccea Patch some serial macros 2017-06-09 17:17:23 -05:00
Scott Lahteine
d91710e9aa Followup for UBL translated strings 2017-06-09 16:59:26 -05:00
Scott Lahteine
761df686bd Minor cleanup in gcode.h 2017-06-09 16:59:26 -05:00
Thomas Moore
897bc2ac1f Updates for ensure_safe_temperature (#6963)
* Updates for ensure_safe_temperature

* M600 fixes
2017-06-09 15:19:08 -05:00
Bob-the-Kuhn
1c107b3949 delete problem line 2017-06-09 11:53:36 -05:00
Diederik van der Pant
5b270417ed added shift register pins for reprapworld keypad v1.1
I recently upgraded my Marlin to V1.1.x and decided to publish my fix to make marlin compile properly when #define board megatronics 2 in combination with #define reprapworld keypad v1.1. It was previously described in the comments of a closed pull request. MarlinFirmware#472. All the buttons on the keypad are now operational.
2017-06-09 14:17:47 +02:00
bgort
2f55870edb [New Feature] I2C position encoder support (#6946)
* [New Feature] I2C position encoder support

I plan to continue improving/cleaning this up, as there areas that need work.

* let the cleanups begin.

* progress

* more progress

* comments, rename files, etc.

* clean

* Cleanups per thinkyhead

* a few more cleanups

* cleanups, bugfixes, etc.

* remove unnecessary passes_test(), additional cleanups/optimizations

* cleanups

* misc.

* Fix up I2CPEM.init() and a few other things.

* organize, fix, rename, etc.

* more optimization

* a few more tweaks
2017-06-09 08:06:23 -04:00
Bob-the-Kuhn
f7dacd1f50 Merge pull request #6996 from Bob-the-Kuhn/change-to-DWORD
Fix type for max_acceleration_mm_per_s2 in configuration_store.cpp
2017-06-08 16:32:40 -05:00
Bob-the-Kuhn
28d72f48f1 change to DWORD 2017-06-08 16:15:02 -05:00
Bob-the-Kuhn
76a610cf81 Merge pull request #6995 from Bob-the-Kuhn/add-static
Add "static"
2017-06-08 15:01:00 -05:00
Bob-the-Kuhn
8d1d9040b6 add static 2017-06-08 14:59:21 -05:00
Bob-the-Kuhn
a17ffe1ece Merge pull request #6985 from Kaibob2/patch-1
Fix for #6980 (case_light compile problem when EXTENDED_CAPABILITIES_REPORT is enabled)
2017-06-08 11:18:56 -05:00
Tannoo
731c8e6372 Translatable Strings for ubl_G29 (#6990) 2017-06-08 10:09:39 -05:00
Kai
abb6b8ad54 update language_de.h (#6986)
There was quite a lot to translate this time. I'm not absolutely confident with the whole UBL stuff and it's a PITA to translate. I don't use any kind of levelling myself as i just have a perfectly level cast aluminium plate as bed.
So maybe someone who really uses it might take a closer look at it after it's merged.
2017-06-08 10:04:52 -05:00
Kai
c2eff60d3f Fix for #6980
Line 7830 prevented successfull compilation when #define CASE_LIGHT_ENABLE is uncommented
2017-06-08 09:19:04 +02:00
Scott Lahteine
1419126721 Merge pull request #6965 from thinkyhead/bf_save_more_sram
Use createChar_P to save SRAM in bootscreen
2017-06-07 17:34:19 -05:00
Scott Lahteine
a453be7357 Merge pull request #6973 from bgort/autoreportT
Enable AUTO_REPORT_TEMPERATURES by default
2017-06-07 17:33:40 -05:00
Scott Lahteine
1d615e0a67 Merge pull request #6976 from Tannoo/Leveling_in_About_Printer
Leveling type in About Printer
2017-06-07 17:26:21 -05:00
Scott Lahteine
707707d71a Fix LCD status message padding 2017-06-07 16:07:38 -05:00
Scott Lahteine
e556ab1dff Find three-point leveling points on Delta 2017-06-07 16:07:38 -05:00
Scott Lahteine
a27b08e6af Various code style tweaks 2017-06-07 16:07:38 -05:00
Scott Lahteine
dac29e0f75 Cleaner failure of UBL without EEPROM 2017-06-07 16:07:38 -05:00
Scott Lahteine
9128d9ab45 Improve sanity checks with static_assert, organize 2017-06-07 16:07:38 -05:00
Scott Lahteine
6bb05c4543 Save 20b in smart_fill_mesh with PROGMEM 2017-06-07 16:07:38 -05:00
Scott Lahteine
b7dc4d9973 Save 92b PROGMEM, 14b SRAM with extruder auto fan 2017-06-07 16:07:38 -05:00
Scott Lahteine
c9e3caf928 Save lots of PROGMEM, ~20b SRAM with DIGIPOT_I2C 2017-06-07 16:07:38 -05:00
Scott Lahteine
4134a6b526 Save 88b PROGMEM, 48 bytes SRAM in settings.reset 2017-06-07 16:07:38 -05:00
Scott Lahteine
36cc03a9b4 Save 224b PROGMEM, 48b SRAM in get_homing_bump_feedrate 2017-06-07 16:07:38 -05:00
Scott Lahteine
2a41f0ff84 Save 28b PROGMEM in ultralcd.cpp (line_to_current) 2017-06-07 16:07:38 -05:00
Scott Lahteine
e6d10f6ddd Spend 48b PROGMEM to save 16b SRAM
...by moving `homing_feedrate_mm_s` to PROGMEM.
2017-06-07 16:07:38 -05:00
Scott Lahteine
97e13a30ba Save over 100 bytes SRAM in pin_is_protected 2017-06-07 16:07:38 -05:00
Scott Lahteine
45c74406cf Recover 32 bytes of SRAM in Marlin bootscreen code 2017-06-07 16:07:38 -05:00
Scott Lahteine
e1c5a43247 Cleanup stepper current control config options 2017-06-07 16:07:38 -05:00
Scott Lahteine
efc198f952 Spacing, const, comments 2017-06-07 16:07:38 -05:00
Scott Lahteine
7f0945d2b1 Merge pull request #6978 from thinkyhead/fix_z_endstop_adj
Fix z_endstop_adj initializer
2017-06-07 16:07:21 -05:00
Scott Lahteine
4406fba994 Fixes #6975 2017-06-07 11:14:30 -05:00
Scott Lahteine
19b62c14f0 Add a script so Travis can test for intentional failure 2017-06-07 10:35:54 -05:00
Scott Lahteine
d28f5d8a78 Fix: z_endstop_adj is never initialized 2017-06-07 10:29:56 -05:00
Scott Lahteine
5d5ff36446 Fix a compile error with _lcd_set_z_fade_height 2017-06-07 10:29:56 -05:00
Tannoo
b88957e0d4 Leveling type in About Printer
Show the Leveling system in use on the About Printer screen.
2017-06-07 06:28:33 -06:00
Brian
dd071a4a65 Enable AUTO_REPORT_TEMPERATURES by default 2017-06-07 02:52:35 -04:00
bgort
8db1197c9b Enable extended capabilities report by default (#6969)
Ref #5139
2017-06-07 02:36:34 -04:00
bgort
82e662fc69 Remove requirement for LCD when UBL is used. (#6971)
* Remove requirement for LCD when UBL is used.

* fix previous oversights

* further refinement - error messages for P2 & P4

* require R on G26 when not using LCD; default to all points
2017-06-07 02:24:36 -04:00
Tannoo
2c2b991b59 UBL Manual Build Menu Option (#6972)
One click option to manually build UBL mesh.
2017-06-06 22:14:18 -05:00
Roxy-3D
0dd0033b33 Save up to 94 bytes of RAM on 20x4 LCD Display machines (#6964)
* Save up to 94 bytes of RAM on 20x4 LCD Display machines

Moved the custom screen characters out of RAM into Program Memory.  With
SD-Card support and the Progress Bar enabled, this saves 94 bytes of RAM
memory.

This was tested using the example_configurations/FolgerTech-i3-2020
files.  So a couple small changes to those files snuck into this Pull
Request.

Probably...  We can find similar savings in the Graphics LCD code it we
comb through it.   And if so...  That is the place we really need to
save RAM memory!

* Tidy up white space and indentation
2017-06-05 17:02:00 -05:00
Bob-the-Kuhn
ba0bd33c38 Removed check for 2560 family 2017-06-04 22:16:27 -05:00
Scott Lahteine
04b07a6ecc Unused var in Stepper 2017-06-04 17:25:16 -05:00
Scott Lahteine
eb8af486d2 Ensure safe temperature for M600 2017-06-04 17:25:16 -05:00
Scott Lahteine
bfe7fbe5c0 Maintain message scroll rate 2017-06-04 17:25:15 -05:00
Scott Lahteine
6411d65c48 Fix Morgan SCARA S2 calculation 2017-06-04 12:24:09 -05:00
Scott Lahteine
46752588b9 Merge pull request #6948 from Bob-the-Kuhn/redundant_temperature
fix redefinition errors for redundant_temperature
2017-06-04 12:16:09 -05:00
Scott Lahteine
5938dae200 Merge pull request #6950 from MagoKimbra/fix_g29_3_point
Fix G29 with 3 point
2017-06-04 12:15:44 -05:00
Scott Lahteine
c5e0f08e35 Merge pull request #6951 from fixoid/patch-4
Initializing extruder/nozzle servo when turning on the printer
2017-06-04 12:13:05 -05:00
Scott Lahteine
1e2ccca063 Merge pull request #6952 from thinkyhead/bf_final_fixups_123
General cleanup before release
2017-06-04 11:51:07 -05:00
Scott Lahteine
e4937b0285 Cleanup of spacing and formatting 2017-06-04 11:31:43 -05:00
fixoid
1aab9906e6 Initializing extruder/nozzle servo when when turning on the printer 2017-06-04 16:57:24 +03:00
MagoKimbra
663ff7f92a Fix G29 with 3 point 2017-06-04 14:39:31 +02:00
oldmcg
9f295581f0 Ubl delta fixes and improvements (#6941)
* Change all direct changes of ubl.state.active to
  set_bed_leveling_enabled() which handles apply/unapply
  leveling to maintain current_position consistency.

Fix invalidation of UBL mesh to invalid unreachable
  mesh points as well (delta corners).

Fix UBL_DELTA unapply_leveling logic and when
it gets applied, including fade_height changes.

Add optional M114 D for detailed position information,
disabled from compilation by default (M114_DETAIL).

* UBL_DELTA raw and inline kinematics

* UBL planner fall through fix

* consistent variable names

* Cleanup orphaned code and whitespace changes.
Use _O2.

* compile warnings cleanup

* Remove redundant #ifdef condition
2017-06-03 17:11:43 -05:00
Bob-the-Kuhn
c34d7a29a6 fix redefinition errors for redundant_temperature
Removing redundant_temperature from public section and leaving it in the
private section
2017-06-03 16:40:14 -05:00
Bob-the-Kuhn
862def2ef4 Merge pull request #6947 from Bob-the-Kuhn/allow-GCODE_DEBUG-when-UBL-enabled
Allow DEBUG_GCODE_PARSER when UBL is enabled
2017-06-03 13:34:46 -05:00
Bob-the-Kuhn
6a5d3b580d fix "hex_address not defined" when UBL is enabled 2017-06-03 13:19:55 -05:00
Scott Lahteine
d336e413aa Merge pull request #6942 from thinkyhead/bf_cleanups_friday
General cleanup after recent commits
2017-06-03 00:48:57 -05:00
Scott Lahteine
789b2928a8 Tweak scrolling message code 2017-06-02 23:45:53 -05:00
Scott Lahteine
fc7d7f87b4 Init probe test pin with FastIO 2017-06-02 23:45:52 -05:00
Scott Lahteine
0282452cea Make Parser::seen volatile 2017-06-02 23:45:52 -05:00
Scott Lahteine
9a305a467b Patch LCD Contrast menu item 2017-06-02 23:45:52 -05:00
Scott Lahteine
90ccac4bcf Clean up after recent commits 2017-06-02 23:45:52 -05:00
Bob-the-Kuhn
fff50d3958 Merge pull request #6940 from Bob-the-Kuhn/Gcode---allow-XY
Gcode.cpp - spaces and parameters
2017-06-02 21:21:32 -05:00
Bob-the-Kuhn
2130f10de8 allow space between parameter and value 2017-06-02 19:57:22 -05:00
Bob-the-Kuhn
ebda4663c3 for discusion 2017-06-02 19:42:43 -05:00
Scott Lahteine
e2c3695e11 Merge pull request #6932 from thinkyhead/bf_zrib_2.0
Support for ZRIB v2.0 Control Board
2017-06-02 16:54:34 -05:00
FATALHERMIT
911079104e Support for ZRIB v2.0 Control Board 2017-06-02 12:05:46 -05:00
Scott Lahteine
65a0212866 Easier override of FILWIDTH_PIN 2017-06-02 12:05:46 -05:00
Scott Lahteine
147d9d76fc Merge pull request #6928 from Bob-the-Kuhn/Fix-case-light-logic-on-Azteeg-X3-boards
Fix case light logic on Azteeg_X3 boards.
2017-06-01 20:14:15 -05:00
Scott Lahteine
9118e135f9 Merge pull request #6931 from thinkyhead/bf_malyan_m150
Malyan m150 configurations
2017-06-01 19:52:38 -05:00
guntherv73
4288c4fb4f Configurations for Malyan M150 2017-06-01 19:26:29 -05:00
Scott Lahteine
1919cb0d1e Config cleanups 2017-06-01 19:26:16 -05:00
Scott Lahteine
e800743268 Merge pull request #6921 from tcm0116/pause_flash
Fix issues with advanced pause
2017-06-01 18:04:25 -05:00
Christopher Pepper
61db0fd102 Add issue template for github 2017-06-01 20:33:39 +01:00
Bob-the-Kuhn
9a9bbfc57c Fix case light logic on Azteeg_X3 boards. 2017-06-01 12:33:24 -05:00
Thomas Moore
a32f7b329c Fix heater status display for advanced pause 2017-06-01 12:29:47 -05:00
Scott Lahteine
ac33a378c0 Merge pull request #6922 from thinkyhead/bf_probe_options
Prevent illegal leveling combinations
2017-06-01 11:12:02 -05:00
Scott Lahteine
445865ea03 REPRAPWORLD_KEYPAD is NEWPANEL but not ULTIPANEL 2017-05-31 23:48:03 -05:00
Scott Lahteine
4296a8b74e For status scrolling, pad a short message 2017-05-31 23:48:03 -05:00
Scott Lahteine
4a96433b7e Simplify counting of printable characters 2017-05-31 23:45:41 -05:00
Scott Lahteine
8d69394ae1 Fix LCD printing of progmem strings 2017-05-31 23:36:57 -05:00
Scott Lahteine
c74d4dede6 Prevent illegal leveling combinations
Addressing issue #6901
2017-05-31 23:36:57 -05:00
Scott Lahteine
155aa62fb0 Merge pull request #6912 from thinkyhead/bf_better_pulse_delay
Account for dual XYZ in pulse delay cycles estimate
2017-05-31 22:21:47 -05:00
Scott Lahteine
a5fa586642 Preferred patch to gcode.h 2017-05-31 21:18:16 -05:00
Bob-the-Kuhn
4ecd41ef90 Merge pull request #6915 from Bob-the-Kuhn/gcode.h-2
gcode.h - another compile error
2017-05-31 14:03:33 -05:00
Bob-the-Kuhn
1b41e1f645 another compile error
only seen if

#if ENABLED(TEMPERATURE_UNITS_SUPPORT)
      ...
    #if
ENABLED(ULTIPANEL) && DISABLED(DISABLE_M503)
2017-05-31 13:59:49 -05:00
Bob-the-Kuhn
65bd4c8c94 Merge pull request #6797 from Bob-the-Kuhn/M355-case-lightimprovements-(1.1.x)
M355 case light improvements (replaces PR #5685)
2017-05-31 13:33:59 -05:00
Bob-the-Kuhn
7ed0761e09 Merge pull request #6914 from Bob-the-Kuhn/Gcode.h-bug-fix
gcode.h - fix compile error
2017-05-31 13:29:19 -05:00
Bob-the-Kuhn
9657e7d3ee copied file changes from PR #5685
==============================

Configuration_adv.h changes

==============================

add "live" LCD update

==============================

P & S version

==============================

final (hopefully) tested version

==============================

update M115 capabilities print

==============================

Menu changes portion of the requested changes

==============================

changed USEABLE_HARDWARE_PWM from a function to a series of macros

==============================

changes per review
2017-05-31 13:22:38 -05:00
Bob-the-Kuhn
8206bb9bb9 fix compile error
invalid conversion from 'const char*' to 'char*' [-fpermissive]
2017-05-31 13:17:01 -05:00
Scott Lahteine
df91346188 Account for dual XYZ in pulse delay cycles estimate 2017-05-31 12:23:28 -05:00
Scott Lahteine
6354b40231 Merge pull request #6903 from thinkyhead/bf_fix_delta_m24_m125
Patch M24 / M125 for delta
2017-05-31 00:03:20 -05:00
Scott Lahteine
7236109f2a Patch M24 / M125 for delta 2017-05-30 23:07:29 -05:00
Scott Lahteine
be17033762 Fix case light menu toggle 2017-05-30 14:03:45 -05:00
Scott Lahteine
89b93058e3 Merge pull request #6887 from christianh17/PR-sanitycheck
enable DEACTIVATE_SERVOS_AFTER_MOVE with switching nozzle
2017-05-30 13:43:39 -05:00
Scott Lahteine
05b66234ae Merge pull request #6895 from thinkyhead/bf_user_commands
Custom user commands menu
2017-05-30 13:40:50 -05:00
Scott Lahteine
84a0a77c59 Merge pull request #6852 from tcm0116/mixing_extruder_lin_advance
Generate error if MIXING_EXTRUDER and LIN_ADVANCE are both enabled
2017-05-30 13:37:51 -05:00
Scott Lahteine
d33ae33103 Merge pull request #6897 from thinkyhead/bf_fix_lcd_scrolling
Fix LCD scrolling character counting
2017-05-30 03:45:59 -05:00
Scott Lahteine
266ae8912a Formatting in _draw_heater_status 2017-05-30 03:32:16 -05:00
Scott Lahteine
6b9ca16f36 Patch lcd_print edge limit code 2017-05-30 03:32:15 -05:00
Tannoo
74d6dee920 User Command (Script) Menu
The menu (commands / scripts) is configurable in `Configuration_adv.h`.

- Added conditionals.
- Changed script handling.
- Slimmed and working!
- Added Status message.
- Returning to lcd status screen now!
- Example Configs Updated.
- Cleanups by @thinkyhead
2017-05-30 02:33:57 -05:00
Scott Lahteine
d9c8072037 Edit PROPORTIONAL_FONT_RATIO comment 2017-05-30 01:29:39 -05:00
Scott Lahteine
bad432add7 Merge pull request #6894 from thinkyhead/bf_lcd_draw_order
Fix LCD to draw after value changes
2017-05-30 00:02:00 -05:00
Scott Lahteine
46b32e4548 Cleanup LCD interface, add lcd_reset_status 2017-05-29 22:16:13 -05:00
Scott Lahteine
ca99d67ede Fix UBL "Info screen" menu items 2017-05-29 19:55:26 -05:00
Scott Lahteine
2c7a39bc0e Fix LCD print aborted message 2017-05-29 19:52:01 -05:00
Scott Lahteine
0f1e8c195d Draw on LCD after value has changed 2017-05-29 19:42:30 -05:00
Scott Lahteine
5d6366d4e6 Merge pull request #6893 from thinkyhead/bf_lcd_leveling_fixes
Patch PROBE_MANUALLY + LCD_BED_LEVELING
2017-05-29 18:15:22 -05:00
Scott Lahteine
51587c4b43 Rename Feedrate to Velocity to match prior naming 2017-05-29 17:54:15 -05:00
Scott Lahteine
9677f3f2f5 Patch up LCD Bed Leveling menu 2017-05-29 17:51:11 -05:00
Scott Lahteine
fc2eaab7f3 Show home option in level bed menu 2017-05-29 17:51:10 -05:00
Scott Lahteine
c6a7adc293 Patch G29 A and Q arguments to bypass setup 2017-05-29 17:51:10 -05:00
Scott Lahteine
4cece2d72e Use NAN for G29 W omitted parameters 2017-05-29 17:51:10 -05:00
Scott Lahteine
2d71569138 Fix spacing in JSON output 2017-05-29 17:51:10 -05:00
Scott Lahteine
b2d3c8aedd Have G28 do a refresh of the display 2017-05-29 17:51:10 -05:00
Scott Lahteine
50ab9c2e04 General cleanup of spacing, comments 2017-05-29 15:34:14 -05:00
Scott Lahteine
f1e33afda4 Return to Bed Leveling menu when done 2017-05-29 15:31:02 -05:00
Scott Lahteine
78d8c598e1 Fix lcd_synchronize with message 2017-05-29 15:31:02 -05:00
Scott Lahteine
eb39d6e3e2 Don't draw progress bar until it has 1% 2017-05-29 15:31:01 -05:00
Scott Lahteine
194f8b2f55 Start at Z=0 in manual probing 2017-05-29 15:31:01 -05:00
Scott Lahteine
6f89db11f0 Allow lcd_setstatusPGM to reset the alert level 2017-05-29 15:31:00 -05:00
Scott Lahteine
25114414cd Merge pull request #6860 from thinkyhead/bf_case_light_toggle
Case light as a toggle menu item
2017-05-28 18:30:55 -05:00
Scott Lahteine
3fe333143c Case light as a toggle menu item 2017-05-28 14:32:07 -05:00
Scott Lahteine
d013bddfa8 Merge pull request #6876 from thinkyhead/bf_extend_leveling_menu
Extend the ABL/MBL Bed Leveling menu
2017-05-28 14:19:02 -05:00
Scott Lahteine
58556991da Merge pull request #6877 from thinkyhead/bf_scrolling_status
Scrolling status message (option)
2017-05-28 14:12:36 -05:00
Scott Lahteine
01e7e234c6 Add more options to the Bed Leveling menu 2017-05-28 14:04:28 -05:00
Scott Lahteine
0cbe448edf Split up Control > Motion submenu 2017-05-28 12:52:24 -05:00
Scott Lahteine
a3645ec921 Reference op with variable name 2017-05-28 11:33:22 -05:00
Scott Lahteine
71367fd518 Scrolling status message option 2017-05-28 11:26:28 -05:00
Scott Lahteine
b0eae68f57 Prevent bed temperature being set too high 2017-05-28 11:11:17 -05:00
Scott Lahteine
493f0b0c62 Fix some compiler warnings 2017-05-28 11:06:33 -05:00
christianh17
f379a326cc enable DEACTIVATE_SERVOS_AFTER_MOVE with switching nozzle
When using switching nozzle it should be possible to disable the servo after move. Do it only if you do not need the servo power to keep the position.
2017-05-28 15:33:28 +02:00
Scott Lahteine
33279a1e02 Code style tweak to gcode.h 2017-05-27 19:47:26 -05:00
Ernesto Martinez
ac959b12ee Updates to language_es.h based on latest updates. (#6871)
Spanish language updates
2017-05-27 19:08:39 -05:00
Scott Lahteine
55c700d537 Tweak to gcode.h 2017-05-26 22:11:31 -05:00
Bob-the-Kuhn
f0d545b950 Merge pull request #6866 from Bob-the-Kuhn/Parser-fix
Parser fix
2017-05-26 15:12:59 -05:00
Bob-the-Kuhn
868e7db4ae value check was looking at the code 2017-05-26 14:49:42 -05:00
Thomas Moore
fb5e0ffe16 Unify M600 and M125 pause features (#6407)
* Unify M600 and M125 pause features
* Cleanup per thinkyhead's comments
* Rename filament_change_menu_response to advanced_pause_menu_response
* Include HAS_BED_PROBE in QUIET_PROBING
* Update gMax example file
* is_idle() is out of scope without the braces
* Convert FT-i3-2020 to Advance Pause names...
* Allow pause even if not printing
2017-05-26 13:01:02 -05:00
Scott Lahteine
73ed0c63b4 Merge pull request #6858 from thinkyhead/bf_leveling_patch
Fixes for PROBE_MANUALLY and LCD_BED_LEVELING
2017-05-26 12:13:43 -05:00
Scott Lahteine
b3a97b5013 Patch up LCD level bed menus 2017-05-25 23:53:31 -05:00
Scott Lahteine
78af2b1444 Fix PROBE_MANUALLY via G-code 2017-05-25 23:53:31 -05:00
Scott Lahteine
082da23391 One fewer EOL in M503 output 2017-05-25 23:53:31 -05:00
Scott Lahteine
b1a4788593 Add .ino.cpp to .gitignore 2017-05-25 23:28:42 -05:00
Scott Lahteine
b15e531464 Fix screen change on character display 2017-05-25 15:29:14 -05:00
Thomas Moore
44e657766e Add incompatibility error to Sanity Check for MIXING_EXTRUDER and LIN_ADVANCE 2017-05-25 08:06:27 -05:00
Scott Lahteine
735405b2a4 Merge pull request #6848 from thinkyhead/bf_scara_M665
Add M665 for SCARA
2017-05-24 20:51:51 -05:00
Scott Lahteine
ffa901f373 Merge pull request #6839 from thinkyhead/bf_day_ending_in_y
UBL ultralcd.cpp patches
2017-05-24 17:55:44 -05:00
Scott Lahteine
361cbba113 Use M665 to set SCARA angle offsets 2017-05-24 17:49:24 -05:00
Scott Lahteine
5ed63a5724 Apply const in prepare_kinematic_move_to 2017-05-24 17:49:24 -05:00
Scott Lahteine
5cbe0244c5 Fixes for spindle/laser and SCARA probe bounds 2017-05-24 17:49:23 -05:00
Scott Lahteine
1f52c9f5df Neater Megatronics 3 pins 2017-05-24 17:49:23 -05:00
Scott Lahteine
af81cb4cbb Patch for M503 output 2017-05-24 17:49:09 -05:00
Scott Lahteine
0392329cb9 Merge pull request #6634 from thinkyhead/bf_fresh_gcode_parser
New GCode Parser
2017-05-24 16:16:50 -05:00
Scott Lahteine
1d167a6874 Some cleanup, fixes for ultralcd.cpp UBL code
- Free up 30 bytes of SRAM in UBL LCD code
- Fix BUILD_ABS_MESH temperature
- Fix UBL indentation in ultralcd.cpp
- UBL vars lowercase, "convert to positive" sensibly
2017-05-24 01:10:42 -05:00
Scott Lahteine
f4028fe088 New GCode Parser - Implementation 2017-05-23 14:15:10 -05:00
Scott Lahteine
002a06c507 New GCode Parser - Configuration 2017-05-23 14:15:07 -05:00
Scott Lahteine
2dfb7c212c Merge pull request #6836 from thinkyhead/bf_fix_ubl_motion
One more mesh_index_to_npos update
2017-05-23 13:21:36 -05:00
Scott Lahteine
ad915b667e One more mesh_index_to_npos update
Followup to #6827
2017-05-23 13:02:50 -05:00
Scott Lahteine
4ce228f2a0 Merge pull request #6833 from thinkyhead/bf_move_g7
G42: Fix and extend
2017-05-23 11:49:50 -05:00
Scott Lahteine
2881f0a48d Fix, extend G42 with P (probe) parameter
- Also fix handling of SCARA and misuse of `codenum`.
2017-05-23 04:55:42 -05:00
Scott Lahteine
d252d1b6a2 Merge pull request #6831 from thinkyhead/bf_move_g7
Move G7 to G42
2017-05-23 03:02:57 -05:00
Scott Lahteine
6d574883a0 Merge pull request #6830 from thinkyhead/bf_redraw_flags
Use redraw flag for both types of LCD
2017-05-23 03:02:13 -05:00
Brian
82ca6248e2 Move G7 to G42
See: #6777
2017-05-22 23:21:35 -05:00
Scott Lahteine
26ffa558a3 Use redraw flag for both types of LCD 2017-05-22 18:34:54 -05:00
Scott Lahteine
3ff7515527 Merge pull request #6817 from cbusillo/patch-1
missing enable for M605 for duplication mode
2017-05-22 18:07:11 -05:00
Scott Lahteine
62d8e35adc Merge pull request #6827 from thinkyhead/bf_day_ending_in_y
Make UBL a complete singleton
2017-05-22 17:51:03 -05:00
Scott Lahteine
34cfbc90cd Use new attribute macros in more places 2017-05-22 17:38:58 -05:00
Scott Lahteine
85b967657e Embed G26/G29 in ubl class, with enhancements 2017-05-22 17:38:58 -05:00
Scott Lahteine
c99bd69889 Apply const float & more 2017-05-22 17:38:36 -05:00
Scott Lahteine
ad5638f78c Cleanup some fastio code 2017-05-22 17:38:36 -05:00
Scott Lahteine
e271521c39 Single user_canceled function in G26 2017-05-22 17:38:36 -05:00
Scott Lahteine
c2ea22da49 Clean up whitespace 2017-05-22 17:38:36 -05:00
Scott Lahteine
ceb62fc7e1 Fixes #6828: M428 bug 2017-05-22 17:34:03 -05:00
oldmcg
48f7652143 UBL G29 -P3.1 smart fill (#6823)
* UBL G29 -P3.1 mesh fill with distance-weighted least squares fit.

* Back to original -O0 on G29 for now.
2017-05-22 12:33:50 -05:00
Scott Lahteine
850203fb3a Merge pull request #6816 from thinkyhead/bf_lcd_live_editing
Constrain LCD status message rendering
2017-05-22 11:15:35 -05:00
Roxy-3D
3129260c44 Misc. Clean Up (#6822)
* Misc. Clean Up

Mostly UBL related clean up.
- But fixed a bug in the thermistortables.
- Made G26 more responsive to user aborts.
- Added sanity checks for older name for UBL_MESH_VALIDATION.
- Made G29 P4 able to edit invalidated mesh points
- Restore a reasonable Fade Height for UBL when creating new state information
- Get UBL's Topology Map to look a little bit better
- Make sure the user doesn't see a blank screen when doing Mesh Editing.

* Huh???   GitHub Desktop screwed up!

* get the planner object in scope

* Fix out of scope z_fade_height

* Travis timed out...

I need a change so I can force a new commit and sync.
2017-05-21 22:09:51 -05:00
cbusillo
3b4116e73b missing enable for M605 for duplication mode
I believe gcode_M605 will not be called when using DUAL_NOZZLE_DUPLICATION_MODE without this change.
2017-05-21 13:54:20 -04:00
Scott Lahteine
5e8892d6b5 Show Restore Failsafe item with EEPROM off 2017-05-21 12:52:44 -05:00
Scott Lahteine
76af9ac7c5 tweaks 2017-05-21 12:51:58 -05:00
Scott Lahteine
ba5910ab6c Constrain LCD status message rendering 2017-05-21 12:35:16 -05:00
Scott Lahteine
a83f6db679 Merge pull request #6815 from MagoKimbra/fix_ultralcd_lcd_contrast
Fix set_lcd_contrast
2017-05-21 12:10:02 -05:00
MagoKimbra
2c309a8f7c Fix set_lcd_contrast 2017-05-21 19:01:44 +02:00
Scott Lahteine
22dbb2117c Merge pull request #6812 from thinkyhead/bf_day_ending_in_y
Cleanup code, organize & document fastio pin mappings
2017-05-21 11:39:04 -05:00
Roxy-3D
364f8fb613 Update Configuration.h files to better names (#6814)
Changed UBL_G26_MESH_EDITING to UBL_G26_MESH_VALIDATION
Added UBL_MESH_EDIT_MOVES_Z to prepare for that change (coming next)
2017-05-21 11:10:22 -05:00
Scott Lahteine
d7fda2fe49 Formatting, const in G33 2017-05-21 10:40:05 -05:00
Scott Lahteine
1519b0e7c1 Split up fastio.h, document pin mappings 2017-05-21 10:33:27 -05:00
Scott Lahteine
49599caade General cleanup to utf_mapper.h 2017-05-21 10:33:27 -05:00
Scott Lahteine
02f15f6775 UBL-related cleanup, spacing, standards
Reference: #6804
2017-05-21 10:33:26 -05:00
Scott Lahteine
52e20aeab3 Pins-related cleanup, formatting 2017-05-21 07:18:03 -05:00
Scott Lahteine
ea906e4da7 Merge pull request #6810 from thinkyhead/bf_lcd_live_editing
Add "live editing" option to LCD menus
2017-05-21 06:11:52 -05:00
Scott Lahteine
c2ca85aeb2 Merge pull request #6811 from thinkyhead/bf_temp_float_stuff
Restore current temp accessors to float
2017-05-21 06:10:31 -05:00
Scott Lahteine
11fc9564c9 Add live editing option to LCD menu 2017-05-21 05:29:46 -05:00
Scott Lahteine
8a0a5cfccc Temp-related cosmetic changes 2017-05-21 04:49:25 -05:00
Scott Lahteine
b29dbbd5e4 Use uint16_t for temps 2017-05-21 04:48:53 -05:00
Scott Lahteine
ebcd1aaf88 Access hotend/bed temperatures as float 2017-05-21 04:46:31 -05:00
Scott Lahteine
0e1f0efc4b Merge pull request #6809 from thinkyhead/bf_G33_evolves
G33 updates
2017-05-20 20:12:36 -05:00
Scott Lahteine
6ce2b1ff4a G33 evolutionary changes 2017-05-20 19:23:39 -05:00
Scott Lahteine
b3a38fd300 Clean up bugfix readme 2017-05-20 19:20:53 -05:00
Scott Lahteine
3c061a9f9a UBL tabs, whitespace, spelling, etc. 2017-05-19 14:16:50 -05:00
Scott Lahteine
dc2d215355 Merge pull request #6791 from thinkyhead/bf_ubl_pringle
Disable PROBE_MANUALLY for UBL
2017-05-19 07:50:58 -05:00
Scott Lahteine
75badae2f8 Disable PROBE_MANUALLY for UBL
Plus some other UBL tweaks.
2017-05-19 07:13:18 -05:00
Scott Lahteine
94a4af1d7f Merge pull request #6773 from thinkyhead/bf_lcd_patch_e5
Patch LCD code for 5th extruder
2017-05-18 15:26:55 -05:00
Scott Lahteine
5970fe72d1 Merge pull request #6782 from bgort/azteegtweak
Tweak Azteeg X3 PRO _pins.h so Viki2 will work for those without a case light
2017-05-18 15:26:16 -05:00
Brian
01f452c37c Tweak Azteeg X3 PRO _pins.h so Viki2 will work for those without a case light.
- add comment explaining that the Panucatt Viki2 wiring diagram uses pin 44
2017-05-18 13:00:13 -04:00
bgort
47245675fc Merge pull request #6777 from bgort/g7
Add `G7` gcode command to move between UBL mesh points
2017-05-18 06:44:13 -04:00
Brian
e09b4ce4a5 Add checking 2017-05-17 19:46:16 -04:00
Brian
13599a73c7 Add G7 gcode command to move between UBL mesh points
- can be augmented in the future to enable for other leveling systems

Quite simple, but did not want to modify `G1` as the additional checking would slow it down.

Tested & working.
2017-05-17 19:05:36 -04:00
bgort
e16743da45 Merge pull request #6775 from bgort/m421fix
Fix recent regressions, &c.
2017-05-17 17:42:35 -04:00
Brian
43c24f0027 Fix recent regressions, &c.
- fix broken `M421` due to less-than-careful optimization
- add HOME_AFTER_DEACTIVATE define to advanced config so not everyone has to rehome after steppers are deactivated
- misc. cleanups (remove unused label, unused variables)
2017-05-17 17:21:46 -04:00
Scott Lahteine
3843a5151a Patch LCD code for 5th extruder, EEPROM reset 2017-05-17 15:33:51 -05:00
Scott Lahteine
6c064bb7d6 Some probe_pt error-handling 2017-05-17 15:33:51 -05:00
bgort
aad1acc418 Merge pull request #6772 from bgort/meshstor
Fix broken EEPROM save/load
2017-05-17 12:42:14 -04:00
Brian
3370329751 Fix broken EEPROM save/load 2017-05-17 12:41:27 -04:00
Scott Lahteine
f0fe26c411 Ensure Arduino.h and configs are included for serial.cpp 2017-05-17 05:07:35 -05:00
Scott Lahteine
ffb5353294 Merge pull request #6738 from thinkyhead/bf_config_crc_rebase
Implement CRC16, develop mesh allocation table
2017-05-17 04:44:00 -05:00
Scott Lahteine
e806e6419a Merge pull request #6768 from thinkyhead/rc_spindle_m3_m5
Spindle / Laser support
2017-05-17 04:39:32 -05:00
Scott Lahteine
d6f49c6626 Merge pull request #6752 from jdelahayes/bugfix-1.1.x
Update french language
2017-05-17 04:32:28 -05:00
Scott Lahteine
55a87da036 SPINDLE/LASER implementation 2017-05-17 04:26:15 -05:00
Scott Lahteine
ffe0e2d19a SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
Scott Lahteine
99c4900a98 SPINDLE/LASER config changes 2017-05-17 04:23:06 -05:00
Scott Lahteine
a3abfeac47 Mark strings needing translation 2017-05-17 03:49:33 -05:00
Scott Lahteine
7f4e4b1212 UBL name/state methods 2017-05-17 03:49:32 -05:00
Brian
7852369987 Implement CRC16, develop mesh allocation table
- Add crc16 utility function
 - Implement CRC16 for config store, remove old checksum, increment layout version
 - Move UBL mesh store/load to MarlinSettings; increment UBL_VERSION
 - Begin to lay out MAT structure, prototype functions, etc.
 - Rename ubl.state.eeprom_storage_slot to .storage_slot
 - Misc. optimization
 - Cleanup/standardize/improve some messages

This is a work in progress!
2017-05-17 03:49:19 -05:00
Scott Lahteine
00d358d92d Fix a PROBE_MANUALLY bug in ultralcd.cpp 2017-05-17 03:49:19 -05:00
Scott Lahteine
13a06711ad Add a Travis test for UBL + DELTA 2017-05-17 03:49:19 -05:00
Scott Lahteine
4dc49f8424 Merge pull request #6762 from thinkyhead/bf_noz_vs_ext_servo
Separate SWITCHING_NOZZLE and SWITCHING_EXTRUDER
2017-05-16 19:53:07 -05:00
fixoid
c2321b1cdd Separate SWITCHING_NOZZLE and SWITCHING_EXTRUDER 2017-05-16 19:25:17 -05:00
Scott Lahteine
455a24f6ff Merge pull request #6764 from thinkyhead/bf_cleanups_tuesday
Prevent home_all_axes picking up XYZ parameters from command
2017-05-16 19:13:15 -05:00
Scott Lahteine
238fb53617 Patch home_all_axes to ignore G28 XYZ parameters 2017-05-16 16:18:38 -05:00
Scott Lahteine
6b6630e11b Clean up trailing whitespace and tabs 2017-05-16 16:06:18 -05:00
Roxy-3D
d30e478f97 Fix incorrectly optimized find_closest_mesh_point_of_type() function (#6761) 2017-05-16 15:24:24 -05:00
oldmcg
5a9e52a3e0 Use COPY_XYZE macro to copy exactly 4 elements (#6758)
Fix undefined DELTA_PROBEABLE_RADIUS for UBL_DELTA
2017-05-16 11:47:51 -05:00
Roxy-3D
8606644343 M48 Fix for Delta Configuration Files & UBL G29 only homes when necessary (#6757)
* Fix M48 for Delta's  There was a scope issue: DELTA_PROBEABLE_RADIUS wasn't getting defined.

* Check if the specified G29 command requires homing
2017-05-16 11:23:50 -05:00
Tannoo
0cd398c25d UBL Menu Updates (#6751)
Things should be pretty stable for a while.   
But it wouldn't surprise me if the Delta people have a need for a few special commands.
2017-05-16 08:45:31 -05:00
Johann Delahayes
a5737cba7c Update french language 2017-05-16 12:27:42 +02:00
Scott Lahteine
0fef9a2983 Remove "ubl." prefix from calls within ubl method 2017-05-16 01:19:45 -05:00
Scott Lahteine
14a4257c7b UBL tabs, whitespace, spelling, etc. 2017-05-16 01:19:45 -05:00
Scott Lahteine
56e2e331ed UBL G29: replace 'O' with 'T'
Since we already used 'T' for `G29` Topology Report in the past, and since 'T' is available…
2017-05-16 01:18:41 -05:00
Scott Lahteine
091f94a6bf Fix up M421 and some comments 2017-05-16 01:14:03 -05:00
Scott Lahteine
4ec4ecff1a Reduce find_closest_mesh_point_of_type a little 2017-05-16 01:14:03 -05:00
Scott Lahteine
f1a1c6873e Patch lcd_implementation_status_screen compiler warning 2017-05-16 00:59:50 -05:00
moebyusDev
2266c0780d fixed spanish lang
It was missing MSG_FILAMENT_CHANGE_HEAT_2 and MSG_FILAMENT_CHANGE_HEATING_2
2017-05-16 00:35:36 -05:00
oldmcg
b213a45efb UBL_DELTA post merge cleanup (#6705)
* UBL_DELTA post merge cleanup:
   fix fade_height, lost during some previous merge
   fix float cx,cy which are not const
   move repeated z_cxcy calc line inside loop
   style fixes and comment fixes/alignment

* Update ubl_motion.cpp

remove unnecessary parentheses

* Update Conditionals_post.h

Change name of define to more accurate meaning:
UBL_GRANULAR_SEGMENTATION_FOR_CARTESIAN
which is not and should not be the default for cartesians with UBL.
2017-05-16 00:30:29 -05:00
Roxy-3D
6f86c46fa6 Fix typo that caused scope issues for DELTA (#6750) 2017-05-15 23:13:45 -05:00
Roxy-3D
1fbcbc05f6 UBL no longer flout's the sacred GCode standard (#6745)
Also clean up ubl_motion.cpp debug info and fix declaration of cx & cy
2017-05-15 16:25:01 -05:00
Scott Lahteine
c262ea92e0 Merge pull request #6733 from abusca/Euskera
Updated Basque translation
2017-05-15 02:30:11 -05:00
Scott Lahteine
b17bcd56da Merge pull request #6736 from thinkyhead/bf_axis_unhomed
More constraint on axis_unhomed_error
2017-05-14 17:20:04 -05:00
Scott Lahteine
267f77b18b More constraint on axis_unhomed_error 2017-05-14 16:03:02 -05:00
Aaron Busca
645096b87a Updated Basque translation
Updated Basque translation with new strings.
2017-05-14 18:29:50 +02:00
Roxy-3D
40d95a4e23 Update the gMax files to display better with Proportional Fonts (#6727)
Update the gMax files to display better with Proportional Fonts
2017-05-13 16:33:04 -05:00
Roxy-3D
c06af63f87 G26's default behaviour ought to be the entire mesh (#6726)
Adding the capability to specify ahead of time how much of the validation pattern to print made it so by default G26 only did one circle and no connecting lines.

It is more natural for the unsophisticated user to just do the entire mesh (bed).   We default the repetition count to GRID_MAX_POINTS+1 to insure we get every last one of them!
2017-05-13 15:53:44 -05:00
Roxy-3D
15040821e0 Setup FolgerTech-i3-2020 files better for the user (#6724)
UltiPanel was enabled, but technically, it is a REPRAP_DISCOUNT_SMART_CONTROLLER
Either configuration works on the machine.  But we want it 'Right'.

Setup the Proportional Font spacing so columns line up nicer on PronterFace and Repetier Host.
2017-05-13 15:14:03 -05:00
Scott Lahteine
2da4398fb5 Merge pull request #6716 from thinkyhead/bf_ubl_prepare_move
Fix prepare_move... for UBL
2017-05-13 06:22:03 -05:00
Scott Lahteine
67c9b1e332 Update M665 comment, fix M665 code_value code. 2017-05-13 05:11:29 -05:00
Scott Lahteine
37399e3cb5 Fix prepare_move_to_destination_cartesian for UBL 2017-05-13 04:13:19 -05:00
Scott Lahteine
a7fb55ea6d Use GRID_MAX_POINTS. Some formatting 2017-05-12 06:57:19 -05:00
Scott Lahteine
e51b5774db Merge pull request #6699 from mtowara/patch-1
Bugfix PRINTER_EVENT_LEDS
2017-05-12 05:58:25 -05:00
Scott Lahteine
056350d9bf Merge pull request #6656 from FHeilmann/fix_fwretract_pos_z_move
Fix FWRetract with positive z-moves during retracted state
2017-05-12 05:56:08 -05:00
Scott Lahteine
0d48fd4b6b Merge pull request #6697 from thinkyhead/bf_wednesday_cleanup
Wednesday-Thursday cleaning up after
2017-05-12 05:33:21 -05:00
Scott Lahteine
0e582bcfb7 Fix #6691 - redundant line in M665 2017-05-12 05:17:38 -05:00
Markus Towara
68ae7c8d7a Bugfix PRINTER_EVENT_LEDS
Extra closing curly bracket terminates while loop early if PRINTER_EVENT_LEDS defined
2017-05-12 12:13:23 +02:00
Scott Lahteine
ba29da56e0 Add disclaimer for verboten parameters 2017-05-12 02:34:53 -05:00
Scott Lahteine
0696dda470 Cleanups to UBL_DELTA 2017-05-12 02:34:53 -05:00
Scott Lahteine
cbfca29522 M421 tweaks, just to use const 2017-05-12 01:32:34 -05:00
Scott Lahteine
233f824dd6 Define GRID_MAX_POINTS 2017-05-12 01:32:34 -05:00
Scott Lahteine
b17e2d3dcd Apply const in Marlin_main.cpp 2017-05-12 01:32:33 -05:00
Scott Lahteine
92fbea2906 Add some GCodes to the header of Marlin_main.cpp 2017-05-12 01:32:33 -05:00
Scott Lahteine
94e90ca26c Tweak M80/M81 descriptions 2017-05-12 01:32:33 -05:00
Scott Lahteine
301958b3e0 Simplify mfdoc, mfpub 2017-05-12 01:32:33 -05:00
Scott Lahteine
ee50dfaaf3 Adjust G26 arguments 2017-05-12 01:32:33 -05:00
Scott Lahteine
b0ba5cae73 Fix a spelling boo 2017-05-12 01:32:33 -05:00
oldmcg
91841d75c9 UBL_DELTA (#6695)
UBL on Delta's....     Should be close!    Should not affect any Cartesian printer.
2017-05-11 22:33:47 -05:00
bgort
445003dbb8 Merge pull request #6694 from bgort/g29p2b
UBL:  Minor improvement to G29 P2
2017-05-11 20:44:43 -04:00
bgort
f01a14e7d0 Merge pull request #6689 from bgort/m421mod
M421:  Add 'adjust closest point' capability
2017-05-11 19:08:42 -04:00
Brian
5a5dba6fc8 UBL: Minor improvement to G29 P2
- allow H code value to override probing height
- minor cleanups
2017-05-11 18:54:34 -04:00
Brian
ae676490c9 M421: Add 'adjust closest point' capability
- Split M421 into separate versions for bilinear and ubl
- Fix minor issue in G26
2017-05-11 12:10:38 -04:00
Scott Lahteine
2819228d4f Merge pull request #6681 from thinkyhead/bf_better_mfpub
Better mfpub
2017-05-10 23:05:47 -05:00
Scott Lahteine
9a688d1456 Merge pull request #6682 from thinkyhead/bf_M80_s_arg
"M80 S" to report the state of the PSU pin
2017-05-10 20:29:01 -05:00
Roxy-3D
b63e82f309 M421 Mesh Point Offset and misc. UBL clean up (#6685)
* M421 Mesh Point Offset and misc. UBL clean up

Allow M421 to accept an offset as well as absolute value for a specified
mesh point.
And misc. UBL clean up to reduce redundent code.

* Better error checking for M421

* Fix M421 Y index bug

I just noticed....  We've had a Y index bug for who knows how long?
2017-05-10 18:54:10 -05:00
Pablo Ventura
539e0c2f31 "M80 S" to report the state of the PSU pin 2017-05-10 17:58:58 -05:00
Scott Lahteine
60a4ca1182 Better mfpub 2017-05-10 17:45:58 -05:00
bgort
df42428281 Merge pull request #6665 from bgort/font
Add proportional font adjustment ratio
2017-05-10 17:30:51 -04:00
Brian
2604742191 Add proportional font adjustment ratio
- update example configs
2017-05-10 17:19:03 -04:00
bgort
b3407a371b Merge pull request #6676 from bgort/g26zhop
G26: Add 0.5mm Z-bump between circles to minimize pattern scraping
2017-05-10 17:12:05 -04:00
bgort
c33d99c5b2 Merge pull request #6680 from bgort/g26repeat
G26:  Add 'Repeat' Option
2017-05-10 17:11:34 -04:00
Bob-the-Kuhn
7325035aac Merge pull request #6637 from Tannoo/UBL_Menu_System_1.1
UBL Menu System 1.1
2017-05-10 15:54:48 -05:00
Brian
f7a201b0d0 G26: Add 'Repeat' Option
- Allows for specifying number of points to print/validate, using 'R' code like with G29 P4 Rx
- Moved the code for Random to 'M' so we could be consistent with G29 P4
- G26 instructions indenting/cleanup
2017-05-10 16:52:08 -04:00
Brian
9c5957fc77 G26: Add 0.5mm Z-bump between circles to minimize pattern scraping 2017-05-10 16:11:59 -04:00
bgort
bbb2b86c34 Merge pull request #6672 from bgort/ublmotion
UBL Cleanup/Bugfix
2017-05-10 14:23:07 -04:00
Brian
4da14b14f4 UBL Cleanup/Bugfix
- Fix bug in ubl_line_to_destination
- Improve/fix output of some ubl.h functions
2017-05-10 13:56:17 -04:00
Tannoo
66db6c3acc UBL Menu System 1.1
/**
     * UBL System submenu
     *
     *  Prepare
     * - Unified Bed Leveling
     *   - Activate UBL
     *   - Deactivate UBL
     *   - Mesh Storage
     *       Memory Slot:
     *       Load Bed Mesh
     *       Save Bed Mesh
     *   - Output Map
     *       Map Type:
     *       Output Bed Mesh Host / Output Bed Mesh CSV
     *   - UBL Tools
     *     - Build Mesh
     *         Build PLA Mesh
     *         Build ABS Mesh
     *       - Build Custom Mesh
     *           Hotend Temp:
     *           Bed Temp:
     *           Build Custom Mesh
     *         Info Screen
     *       - Build Cold Mesh
     *       - Fill-in Mesh
     *           Fill-in Mesh
     *           Smart Fill-in
     *           Manual Fill-in
     *           Info Screen
     *         Continue Bed Mesh
     *         Invalidate All
     *         Invalidate Closest
     *     - Validate Mesh
     *         PLA Mesh Validation
     *         ABS Mesh Validation
     *       - Custom Mesh Validation
     *           Hotend Temp:
     *           Bed Temp:
     *           Validate Mesh
     *         Info Screen
     *     - Edit Mesh
     *         Fine Tune All
     *         Fine Tune Closest
     *       - Adjust Mesh Height
     *           Height Amount:
     *           Adjust Mesh Height
     *         Info Screen
     *     - Mesh Leveling
     *         3-Point Mesh Leveling
     *       - Grid Mesh Leveling
     *           Side points:
     *           Level Mesh
     *         Info Screen
     *   - Output UBL Info
     */
2017-05-10 12:14:43 -05:00
bgort
efd93169e5 Merge pull request #6668 from bgort/pio3
PIO Cleanup
2017-05-10 07:25:19 -04:00
Brian
f1cccd65c2 platformio.ini env_default=xxxxx has to match one of the labels in the env:xxxxx, otherwise nothing happens when you pio run 2017-05-10 07:11:13 -04:00
bgort
192db2ab1b Merge pull request #6666 from bgort/M100fix
Fix compiler complaint related to M100
2017-05-10 07:03:59 -04:00
Brian
3b0127cf8e Fix compiler complaint related to M100 2017-05-09 21:45:44 -04:00
Scott Lahteine
59ab971f81 Merge pull request #6658 from thinkyhead/bf_cleanup_tuesday
Patch spacing, const, .gitignore
2017-05-09 16:22:48 -05:00
Scott Lahteine
11104f177b Apply const in BABYSTEPPING 2017-05-09 12:37:23 -05:00
Scott Lahteine
081bf1f879 Patch #else / #endif comments 2017-05-09 12:37:23 -05:00
Scott Lahteine
9a364990d9 Update .gitignore 2017-05-09 12:37:22 -05:00
Scott Lahteine
e1e043d0d0 Merge pull request #6657 from thinkyhead/bf_cleanup_tuesday
Fix M100 compiler warnings, general patches
2017-05-09 12:05:01 -05:00
Scott Lahteine
a9487c9443 Reduce redundancy in BLTOUCH conditionals 2017-05-09 11:52:24 -05:00
Scott Lahteine
8d961b51cc Eliminate M100 compiler warnings? 2017-05-09 11:32:15 -05:00
Scott Lahteine
fe1fce5f56 DevIoT patch 2 2017-05-09 11:28:39 -05:00
bgort
efb9ce24d9 Merge pull request #6645 from tcm0116/bltouch_config
Automatically define Z_MIN_PROBE_ENDSTOP_INVERTING for BLTouch
2017-05-09 09:49:16 -04:00
bgort
e2f07917ab Merge pull request #6644 from tcm0116/bltouch_menu
Move BLTouch LCD menu from Main to Main/Control
2017-05-09 09:49:02 -04:00
Florian Heilmann
fe96376a73 Fix FWRetract with positive z-moves during retracted state 2017-05-09 13:54:57 +02:00
Scott Lahteine
47cae2929f Patch platformio.ini to fix build error in DevIoT
For compatibility with DevIoT, until that can be solved.
2017-05-08 20:27:14 -05:00
Scott Lahteine
5402eaf9bd Merge pull request #6647 from thinkyhead/bf_pwm_cleanup
Rename software PWM variables for clarity
2017-05-08 18:53:23 -05:00
Scott Lahteine
911a87e006 Disable SCARA feedrate scaling by default 2017-05-08 14:41:03 -05:00
Scott Lahteine
f04d1096d4 Link to users in README.md 2017-05-08 14:23:01 -05:00
Scott Lahteine
71396f77d3 Cleanups following recent commits 2017-05-08 14:23:01 -05:00
Scott Lahteine
dca48f0e63 Move platformio.ini back to Marlin folder - it works there 2017-05-08 14:23:01 -05:00
Scott Lahteine
a6dafb058e Small reduction in error code size 2017-05-08 13:58:09 -05:00
Scott Lahteine
a1e04942a2 Cleanup to software PWM variables 2017-05-08 13:51:45 -05:00
Thomas Moore
a20d0794e6 Automatically define Z_MIN_PROBE_ENDSTOP_INVERTING for BLTouch 2017-05-08 16:28:44 +00:00
Thomas Moore
3279337f47 Move BLTouch LCD menu from Main to Main/Control 2017-05-08 15:21:01 +00:00
bgort
83b6bc8e05 Merge pull request #6638 from bgort/silentprobing2
Cleanup previous implementation of new quiet probing
2017-05-08 10:21:36 -04:00
Brian
6cb0fa4128 Cleanup previous implementation of new quiet probing
Saves a few lines of code.
2017-05-08 08:13:46 -04:00
bgort
4b7f8ad9c6 Merge pull request #6610 from bgort/pio-improvements2
PlatformIO-related changes
2017-05-08 07:52:42 -04:00
Scott Lahteine
232e8682d1 Merge pull request #6633 from thinkyhead/bf_temp_units
Minor patches and cleanup
2017-05-07 21:56:52 -05:00
Scott Lahteine
56ca47ab9d Patch configuration temp units 2017-05-07 21:32:01 -05:00
Scott Lahteine
421dd62800 Adjust spacing of "spaces" 2017-05-07 21:28:54 -05:00
Scott Lahteine
26dba44cd3 Patch redundant lcd settings 2017-05-07 21:28:54 -05:00
Scott Lahteine
34b5041576 Spacing adjustment, ubl_G29 2017-05-07 21:28:54 -05:00
Scott Lahteine
6c2e6ea38e Patch mfqp for use directly with MarlinDocumentation 2017-05-07 21:28:54 -05:00
Scott Lahteine
1c4ed8b106 Note 5 extruders in config comments 2017-05-07 21:28:54 -05:00
Scott Lahteine
6e4a5cc8c6 Patch missing const in temp_abs 2017-05-07 21:13:44 -05:00
bgort
d35e2fda10 Merge pull request #6622 from bgort/silentprobing
Improve BLTOUCH_HEATERS_OFF functionality
2017-05-07 21:33:44 -04:00
Scott Lahteine
6ed52fb765 Adjust spacing in LSF 2017-05-07 19:11:52 -05:00
Roxy-3D
110afff415 More misc UBL fixes and update gMax examples (#6632)
I think I forgot to Sync before I committed last time.   Some UBL
changes did not stick.

Also, update the gMax configuaration.h file so other than unique numbers
and settings, it exactly matches the default configuration.h file.
2017-05-07 19:02:24 -05:00
Roxy-3D
d92fa40c62 misc. UBL fixes (#6631)
* Restore LSF functionality

Some of the typo's persisted...   Hopefully this gets them all fixed.

* Restore user's expectations of how G28 should behave

* Allow Nozzle size control with ornery host programs
2017-05-07 18:23:48 -05:00
Brian
faa270071d Improve BLTOUCH_HEATERS_OFF functionality
- rename to PROBING_HEATERS_OFF
 - move heater pausing functionality into thermalManager
   - add variables, pause(), ispaused(), other functions
 - add fan pausing functionality -> PROBING_FANS_OFF
 - add probing_pause() wrapper
 - move pausing into do_homing_move() and do_probe_move() to minimize quiet time and so other probe types can benefit
 - example configs
2017-05-07 16:22:08 -04:00
bgort
787fdc95bb Merge pull request #6623 from lrpirlet/AllowUBLG29ToWork
G29 P1 stops reporting Invalid location with this patch
2017-05-07 09:42:42 -04:00
lrpirlet
d66e9efac5 G29 P1 stops reporting Invalid location with this patch 2017-05-07 15:07:26 +02:00
Scott Lahteine
8908b15471 Merge pull request #6614 from thinkyhead/bf_temp_units
Support temperature units in M503
2017-05-06 20:41:04 -05:00
Scott Lahteine
ce507deb9f Support temperature units in M503 2017-05-06 20:24:51 -05:00
bgort
a59066bca9 Various improvements - mostly UBL-related (#6607)
UBL Clean up.
2017-05-06 18:59:16 -05:00
Brian
0446dd3ad8 PlatformIO-related changes
- move platformio.ini out of source directory to be more consistent with 'normal' PlatformIO usage
  - facilitates IDE integration
- add related .gitignores
2017-05-06 06:22:10 -04:00
Scott Lahteine
bef9791ea3 Fix mfrb and mfpub 2017-05-05 14:32:16 -05:00
Scott Lahteine
66bedc1a24 Merge pull request #6600 from thinkyhead/bugfix_first_fixes
Update git helper scripts, config comments
2017-05-05 13:48:16 -05:00
Scott Lahteine
77769e284f Edit configuration comments 2017-05-05 13:32:31 -05:00
Scott Lahteine
d14b068147 Tweak git helper scripts 2017-05-05 13:32:31 -05:00
Scott Lahteine
6876e79d42 Tweak command index increment 2017-05-05 13:32:31 -05:00
Scott Lahteine
7fcb5c1424 Minor fix in K8200 readme 2017-05-05 11:25:11 -05:00
Scott Lahteine
0cc4b08b93 Merge pull request #6587 from zlowred/bugfix-1.1.x
Fixed USE_CONTROLLER_FAN #define usage
2017-05-05 01:02:09 -05:00
Max Matveev
267f3a03d9 Fixed USE_CONTROLLER_FAN #define usage 2017-05-04 23:38:29 +02:00
bgort
ae7c602031 fix error in M105 output -- use SERIAL_PROTOCOL for ints instead of SERIAL_PROTOCOL_F (#6584)
also removed wayward 'address of' ampersand in setTargetHotend and setTargetBed parameters
2017-05-04 16:09:45 -05:00
Scott Lahteine
3cd9af2409 bugfix-1.1.x ReadMe, Version, helper scripts 2017-05-04 07:17:10 -05:00
Scott Lahteine
c095ee9ce9 Readme Version 1.1.0 2017-05-04 07:17:10 -05:00
Scott Lahteine
28e597f945 Merge pull request #6570 from FHeilmann/patch-2
Fix broken fwretract recovery extruder feedrate
2017-05-04 07:15:19 -05:00
Florian Heilmann
15268770f5 Fix broken fwretract recovery extruder feedrate
When both lowering and recovery are performed using the same "prepare_move_to_destination()" the extruder recovery feedrate ends up being ignored and, instead, is only capped by either the maximum e-speed or the time it takes to perform the z-lowering. 
Performing the two moves separately from each other ensures a correct recovery feedrate.
2017-05-04 11:34:28 +02:00
Scott Lahteine
58210c3a19 Merge pull request #6568 from thinkyhead/rc_bilinear_extension
Add EXTRAPOLATE_BEYOND_GRID option to bilinear leveling
2017-05-04 00:46:05 -05:00
Scott Lahteine
da08e11acd Add EXTRAPOLATE_BEYOND_GRID option to bilinear leveling 2017-05-04 00:19:07 -05:00
Scott Lahteine
6834e36871 Merge pull request #6567 from thinkyhead/rc_sdcard_stop
Shutdown heaters, autotemp on SD Cancel
2017-05-03 23:54:29 -05:00
Scott Lahteine
399efd66ed Click to resume 2017-05-03 22:26:06 -05:00
Scott Lahteine
1196e3ca59 SDCard print completion can use "M0" 2017-05-03 22:24:03 -05:00
Scott Lahteine
6854f08d22 Shut down autotemp in disable_all_heaters 2017-05-03 20:54:26 -05:00
Thomas Moore
acec237092 Shutdown heaters and fan after canceling a print from the SD card 2017-05-03 20:43:09 -05:00
Scott Lahteine
11b6a3cbb6 Fix regression in least_squares_fit.cpp 2017-05-03 19:21:44 -05:00
Scott Lahteine
e1b85ff67b Merge pull request #6559 from thinkyhead/rc_more_optimal
Compact smart_fill_mesh slightly
2017-05-03 19:07:36 -05:00
Scott Lahteine
9890141f7b M100 tweak 2017-05-03 17:28:09 -05:00
Scott Lahteine
2658cc707a Treat temperature as integer, when possible 2017-05-03 17:27:25 -05:00
Scott Lahteine
1b2c7ec20a Make G26 compatible with inches and thermal unit modes 2017-05-03 17:12:48 -05:00
Scott Lahteine
241bdffe65 Dress up Bilinear Leveling code 2017-05-03 17:12:35 -05:00
Scott Lahteine
67ecf06cc4 Patch issue in gcode_M900
Noted in #6550
2017-05-03 15:26:00 -05:00
Scott Lahteine
de5e485ed7 Explicit upward angle solution 2017-05-03 01:19:44 -05:00
Scott Lahteine
ecdf68735f Compact smart_fill_mesh slightly 2017-05-03 01:06:58 -05:00
Scott Lahteine
628391304f Merge pull request #6552 from thinkyhead/rc_more_ubl_cleanup
Further cleanup of UBL
2017-05-02 22:46:04 -05:00
Scott Lahteine
902fe76db9 Merge pull request #6556 from thinkyhead/rc_use_controller_fan
Implement USE_CONTROLLER_FAN as a feature
2017-05-02 22:43:26 -05:00
Scott Lahteine
7ba7474a73 Drop extra parens from address-of operator 2017-05-02 22:22:23 -05:00
Scott Lahteine
0bf5add075 Use UBL_MESH_(MIN|MAX)_[XY] for G29 move limits 2017-05-02 22:22:23 -05:00
Scott Lahteine
b8ba3b7647 Use 'sq' macro where possible 2017-05-02 22:22:23 -05:00
Scott Lahteine
66eba3346b Remove G29 lcd control debugging 2017-05-02 22:22:23 -05:00
Scott Lahteine
3517154135 Reduce code size, fix bug in smart_fill_mesh 2017-05-02 22:22:23 -05:00
Scott Lahteine
c4e34adcf1 Apply formatting, coding standards to UBL 2017-05-02 22:22:23 -05:00
Scott Lahteine
f4239e62b1 Merge pull request #6557 from thinkyhead/rc_hotend_status_item
Keep refreshing LCD if hotend status is on-screen
2017-05-02 22:04:21 -05:00
Scott Lahteine
fc857c5b78 Merge pull request #6549 from thinkyhead/rc_bltouch_refix
Fix BLTOUCH_HEATERS_OFF bug
2017-05-02 21:53:09 -05:00
Thomas Moore
b39f634252 Continuously update LCD when hotend status is displayed in Filament Change screens 2017-05-02 21:49:40 -05:00
Scott Lahteine
2c13922c46 Implement USE_CONTROLLER_FAN as a feature 2017-05-02 20:18:52 -05:00
Scott Lahteine
492bc536bf Modify debug methods to take PSTR 2017-05-02 17:53:40 -05:00
Bob-the-Kuhn
e5a27d9f36 G29 P2 & P4 bug fixes & improvements 2017-05-02 17:53:40 -05:00
Scott Lahteine
b93be716cf Remove trailing whitespace 2017-05-02 17:53:40 -05:00
Scott Lahteine
76eca9732d Fix mis-named language string define in Dutch 2017-05-02 16:08:09 -05:00
Scott Lahteine
806f670092 Merge pull request #6511 from Bob-the-Kuhn/UBL--G26-minor-improvements
UBL: G26 minor improvements
2017-05-02 16:06:22 -05:00
Scott Lahteine
0803c9d997 Merge pull request #6533 from thinkyhead/rc_autocal_patches
General cleanup of G33
2017-05-02 16:01:02 -05:00
Scott Lahteine
46a5cab6fb Merge pull request #6548 from thinkyhead/rc_fix_dual_z_endstops
Fix Dual-Z endstop conditional test
2017-05-02 16:00:49 -05:00
Brian
ff5fed137f Fix BLTOUCH_HEATERS_OFF bug 2017-05-02 15:53:52 -05:00
Scott Lahteine
ca1dd739a3 Organize ubl.h defines by the files they serve 2017-05-02 15:47:06 -05:00
Scott Lahteine
0449f69179 Cleanup patch to recent merge 2017-05-02 15:47:06 -05:00
LVD-AC
da2abad636 Various cleanups of G33
- update comment section
- redefined P5 grid
- minor clean to probe radius routine
- updated EEPROM version to V37 according remark in #6517
2017-05-02 15:47:06 -05:00
Bob-the-Kuhn
7ce613db0a Fix Conditionals test for endstop plug used by Z2 or probe. 2017-05-02 15:41:47 -05:00
Scott Lahteine
ef750ae86b Towards supporting Z2 in Endstops::report_state 2017-05-02 15:39:32 -05:00
Scott Lahteine
c03c623951 Sanity-check Z2 endstop assigned to a nonexistent pin. 2017-05-02 15:39:00 -05:00
Scott Lahteine
70f31b6c76 Throw an error if no E stepper is free for X2, Y2, Z2 2017-05-02 15:13:47 -05:00
Scott Lahteine
ac69eca586 Merge pull request #6538 from bgort/ubl_gridlbls
Fix, cleanup, prettify `G29 O` output
2017-05-02 14:09:18 -05:00
Scott Lahteine
99b11db1a1 Merge pull request #6537 from thinkyhead/rc_cleanup_sunday
Various leveling-related patches
2017-05-02 00:59:59 -05:00
Roxy-3D
41e63bbb7c Fix Horizontal and Vertical UBL optimization bug. (#6540)
* Fix Horizontal and Vertical optimization bug.

And drastically reduce the debug code foot print....

* Yeah Baby!

The debug print is going A - OK !
2017-05-01 23:52:33 -05:00
Scott Lahteine
e79b335367 Patches for leveling reactivation in G28 / M48 2017-05-01 17:38:57 -05:00
Brian
92e22c3bf2 Fix, cleanup, prettify G29 O output 2017-05-01 18:19:57 -04:00
Scott Lahteine
7d5cd7e0d7 Tweak set_bed_leveling_enabled 2017-05-01 16:46:52 -05:00
Scott Lahteine
ed81e9b3d3 Adjust leveling conditionals 2017-05-01 16:46:48 -05:00
Scott Lahteine
a64e5659ce Clean up G26 external references, private vars 2017-05-01 15:17:52 -05:00
Scott Lahteine
2887c20788 Add a function to home all axes (i.e., gcode_G28) 2017-05-01 15:03:37 -05:00
Scott Lahteine
8f895d5e01 Merge pull request #6530 from thinkyhead/rc_cleanups_2
Fixes for DUAL_NOZZLE_DUPLICATION_MODE
2017-05-01 12:34:11 -05:00
Scott Lahteine
8002672938 Fixes for DUAL_NOZZLE_DUPLICATION_MODE 2017-05-01 12:20:25 -05:00
Scott Lahteine
f69acde966 Merge pull request #6528 from MarlinFirmware/revert-6416-negative-mesh-fix
Revert "Fix for Meshpositions if printer has negative endstop positions"
2017-05-01 11:51:13 -05:00
Scott Lahteine
8bd63aafb9 Merge pull request #6527 from thinkyhead/rc_cleanups_2
Patch DELTA_HEIGHT, BLTOUCH init
2017-05-01 11:28:43 -05:00
Scott Lahteine
4803a4322e Revert "Fix for Meshpositions if printer has negative endstop positions" 2017-05-01 11:25:07 -05:00
Scott Lahteine
4f74c416a4 Patch for BLTOUCH_HEATERS_OFF 2017-05-01 11:13:40 -05:00
Scott Lahteine
1823a6ea29 Patch for missing DELTA_HEIGHT 2017-05-01 11:05:35 -05:00
Scott Lahteine
984c210dec Merge pull request #6519 from thinkyhead/rc_cleanups_2
Various fixes for compiler warnings
2017-05-01 02:46:34 -05:00
Scott Lahteine
d814e468d2 Fix set_heaters_for_bltouch and usage
- Only call `set_heaters_for_bltouch` when actually deploying/stowing
- Clear `next_emi_protection` when re-enabling heaters
2017-05-01 02:27:52 -05:00
Brian
4e1448e75a Various fixes for compiler warnings
add BLTouch-related messages in english and (rusty) french;
add missing endstops.h in ultralcd.cpp;
fix misc. compiler warnings;
fix lsf_reset - ZERO macro can't handle a pointer as it would only memset the size of the pointer, not the size of the entire struct
2017-05-01 02:12:40 -05:00
Scott Lahteine
fc9919b749 Merge pull request #6515 from thinkyhead/rc_cleanup_sunday
Some minor cleanups to code formatting
2017-04-30 22:58:16 -05:00
Scott Lahteine
c12bc51a59 cardreader.cpp spacing tweak 2017-04-30 22:27:47 -05:00
Scott Lahteine
46b714a52f Cleanup spacing in pinsDebug.h 2017-04-30 22:27:26 -05:00
Scott Lahteine
88141ca717 Remove things that aren't pins from pinsDebug_list.h 2017-04-30 22:24:51 -05:00
Scott Lahteine
ff35b11d08 Resolve compiler complaint about memset volatile * 2017-04-30 22:24:03 -05:00
Scott Lahteine
ff95a9850a Merge pull request #6516 from thinkyhead/rc_meaningful_branch_name
Need to define this for Rigidboard V2
2017-04-30 22:17:41 -05:00
Scott Lahteine
0b421e97c9 Rename some (unused) OMCA pins 2017-04-30 22:16:44 -05:00
Scott Lahteine
c2c9f01c8e Patch newly-introduced bug in IS_Z2_OR_PROBE 2017-04-30 20:17:10 -05:00
Scott Lahteine
819df5e06d Cleanups to pins debugging 2017-04-30 20:17:10 -05:00
Scott Lahteine
42824b0e1f Use new serial spacing function to save PROGMEM 2017-04-30 20:14:42 -05:00
Scott Lahteine
cd72901fb7 Cleanups to UBL code 2017-04-30 20:14:42 -05:00
Bob-the-Kuhn
ce87c7803e implement G26 changes per review 2017-04-30 19:05:25 -05:00
jaysonkelly
769817ce5e Need to define this for Rigidboard V2
Motor current defaults need to be defined for Rigidboard
2017-04-30 19:04:27 -05:00
Scott Lahteine
39c6c5621b Merge pull request #6416 from SkyNet3D/negative-mesh-fix
Fix for Meshpositions if printer has negative endstop positions
2017-04-30 17:38:41 -05:00
Scott Lahteine
671a44b8aa Merge pull request #6410 from teemuatlut/LVD-Delta
Delta auto-calibration updates
2017-04-30 16:39:51 -05:00
Scott Lahteine
5d5c9a040a Merge pull request #6509 from thinkyhead/rc_config_patches
Configuration cleanup
2017-04-30 16:10:27 -05:00
Scott Lahteine
d480b6f75a Enable E1 stepper for DUAL_NOZZLE_DUPLICATION_MODE 2017-04-30 16:01:01 -05:00
Bob-the-Kuhn
dcde202157 Add startup notice & update host temperatures while waiting
Right now G26 doesn't send a notice to the host that it's running.  It's
not until the heaters are at temperature that you know for sure if it's
running or not.

Added host temperature prints so that someone watching the host
interface will see the temperatures change during the warm up period.
Updates are sent every 5 seconds.
2017-04-30 15:51:58 -05:00
Scott Lahteine
54751e8557 Put DISTINCT_E_FACTORS adjacent to the affected settings 2017-04-30 15:30:31 -05:00
Scott Lahteine
0dbe4b3e54 Edit configurations to reduce verbosity, arrange logically 2017-04-30 15:30:31 -05:00
Scott Lahteine
0750933bc6 Merge pull request #6490 from Bob-the-Kuhn/Missing-X-stop
Endstop not enabled if pin is zero
2017-04-30 15:09:36 -05:00
bgort
5ace3699b1 Output (commented) coordinates on G29 S-1; helps identify the x/y points that correspond with i/j coordinates, which eases manual tweaking of z values (#6507) 2017-04-30 14:59:34 -05:00
Scott Lahteine
d7d4378481 Remove inaccurate version description 2017-04-30 14:57:19 -05:00
Scott Lahteine
f169c04604 Merge pull request #6491 from thinkyhead/rc_cleanup_wednesday
Various cleanups for recent merges
2017-04-30 14:56:48 -05:00
Scott Lahteine
6d63255ddc Merge pull request #6508 from bgort/pio_improvements
PlatformIO-related improvement
2017-04-30 14:53:22 -05:00
LVD-AC
cafc48dff8 little oops 2017-04-30 22:17:49 +03:00
Brian
627730948d Add U8glib as a dependency to platformio.ini for those who use PlatformIO; this makes compiling even easier as u8glib will be downloaded and included automatically.
Also added the new .pio-related directory to .gitignore, and a few ignores for those who use cmake.
2017-04-30 15:13:51 -04:00
bgort
5974d8e168 change G26 default nozzle size to 0.4, consistent with instructions (#6506) 2017-04-30 13:23:46 -05:00
LVD-AC
471a321624 leaner code for probe routine 2017-04-30 19:15:16 +03:00
bgort
3c0d5ba0a1 allow idle() to be called - fixes sometimes crash/hang in G29 I; (#6505) 2017-04-30 10:22:31 -05:00
Roxy-3D
2509587b5a Correct over optimization of pre-initialized variables (#6500)
* Correct over optimization of pre-initialized variables

NEAR_ZERO() works most of the time...  But it leaves corner cases
uncovered.  We need to explicitly check if these variables are +/-
infinity.

* Correct over optimization of pre-initialized variables
2017-04-29 22:01:29 -05:00
LVD-AC
585c00a728 Proposed changes
This is what I did yesterday:

- basicly gave the tests more comprehensive names; put all the
declarations at the top; got rid of the magic negative C-value (renamed
to P + A, O, T)

- "cos(RADIANS(180 + 30 * axis)) * (1 + circles * 0.1 * ((zig_zag) ? 1 :
-1)) * delta_calibration_radius" compiles wrong is zig_zag statement is
without brackets

- DELTA_TOWER_ANGLE_TRIM reset to 3 values (the calcs use the 3th value
to normalize will not compile otherwise)

-Wrote 3 dummies to keep EEPROM lenght the same

-Reset the configs to the 'original' with autocal + menu disabled (but
can be enabled of course)
2017-04-29 18:53:14 +03:00
Scott Lahteine
29fa241617 Initial patches to G33 2017-04-29 15:29:49 +03:00
Scott Lahteine
12ce051b55 Add a function to output spaces to serial 2017-04-29 15:29:49 +03:00
Scott Lahteine
42f4c53254 Starting on G33 rewrite 2017-04-29 15:29:49 +03:00
Scott Lahteine
baf3b91460 DELTA_TOWER_ANGLE_TRIM only needs AB 2017-04-29 15:29:49 +03:00
Scott Lahteine
6424068412 Merge pull request #6495 from emartinez167/Spanish-language-changes
Last three Spanish language strings
2017-04-29 05:43:04 -05:00
emartinez167
27cd165adf Last three Spanish language strings
Updates as per @thinkyhead request.
2017-04-29 11:33:30 +08:00
Scott Lahteine
2cc9774f34 Apply bltouch_menu
As proffered in #6252
2017-04-28 18:43:03 -05:00
Scott Lahteine
1a111180de Clean up set_heaters_for_bltouch 2017-04-28 18:32:39 -05:00
Scott Lahteine
7db805930a Cleanup configurations 2017-04-28 18:32:39 -05:00
Scott Lahteine
8bf3a3fcdb Remove inaccurate comments from ubl.h 2017-04-28 18:32:38 -05:00
Scott Lahteine
47557d5a19 Fix up formatting in ubl.h 2017-04-28 18:32:38 -05:00
Scott Lahteine
0a8e09c723 Clean up excess whitespace, comment formatting 2017-04-28 18:32:38 -05:00
Scott Lahteine
a35c681453 Clean up least_squares_fit 2017-04-28 17:33:28 -05:00
Bob-the-Kuhn
40089249c3 add PIN_EXISTS to HAS_xyz_MIN macro 2017-04-28 16:47:59 -05:00
Scott Lahteine
8020069371 Apply coding standards for indentation 2017-04-28 15:43:06 -05:00
Scott Lahteine
dabca83742 Merge pull request #6437 from Kaibob2/patch-1
Update language_de.h
2017-04-28 14:47:47 -05:00
Kai
3d0a4c4ea9 Update language_de.h 2017-04-28 21:09:10 +02:00
Silvio
6bf1d50188 Added missing translations (#6458) 2017-04-28 13:49:16 -05:00
Mehmet Sutas
404f767d44 Update language_tr.h (#6463) 2017-04-28 13:48:31 -05:00
Petr Zahradnik
5e701524f8 Update language_cz.h for new translations (#6465)
* Update language_cz.h for new translations

* Correction translate

* Revert correction back to hotend
2017-04-28 13:47:43 -05:00
gege2b
0a92ce7a98 Completed french translation (#6475) 2017-04-28 13:46:09 -05:00
Ernesto Martinez
ff4fb42e7d Add new strings as per recent changes in RCBugFix (#6482)
Adding missing strings to Spanish language, as per changes recently
done to the RCBugFix branch.
2017-04-28 13:45:22 -05:00
paulusjacobus
67d1fc5556 Update language_nl.h (#6478)
updated the RCbugfix release with additional Dutch translations
2017-04-28 13:42:39 -05:00
benlye
8c6b4537a6 Fix issue in itostr4sign with numbers <100 (#6487)
The first character in the string wasn't blanked if the number went from >= 100 to <100, resulting in artefacts in the displayed string.
2017-04-28 13:35:11 -05:00
LVD-AC
4ea8d0f89b Solved "The Travis CI build failed " 2017-04-28 19:55:21 +03:00
LVD-AC
ed6b361e27 cleanup ready to squash 2017-04-28 18:09:18 +03:00
LVD-AC
7a6a1ef583 M666 normalize positive values to <=0
M666

+ tower radians absolute value
2017-04-28 18:05:24 +03:00
Roxy-3D
4075b95519 Allow BL-Touch users to control heaters during probe event (#6485)
The Configuration.h file entries for BL-Touch have been updated to:
```cpp
//#define BLTOUCH
//#define BLTOUCH_DELAY 375      // (ms) Enable and increase if needed
//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are
turned off during probe event
```
2017-04-28 09:19:55 -05:00
Roxy-3D
6e8ecb908a Shut down heaters during BL-Touch probe event
The electro-magnetic interference from the bed and nozzle are affecting
the BL-Touch repeatability for some users.   This problem can be helped
by shutting down the heaters during the actual probe event and then
quickly turning them back on.

Because this code is messing with the heaters, it is written in a
paranoid manner.  It only turns the heaters back on if everything is
EXACTLY as it expects things to be.  The BL-Touch probe must have been
put into a deployed state less than 20 seconds prior, or the stow()
function will NOT turn the heaters on.

This code has been tested and works for both G28 and probing functions.
2017-04-27 18:52:58 -05:00
LVD-AC
d8102aeca8 Cn negative : no tower angle calibration
Giving a negative number of probe points disables the tower angle
correction calibration ('4point' instead of '7point' solution)

EEPROM version updated
2017-04-27 21:13:07 +03:00
Roxy-3D
3601f08e87 Better tuned FolgerTech i3-2020 example file 2017-04-27 11:16:38 -05:00
Roxy-3D
a20b7d9581 Better tuned Example file for FolgerTech i3-2020
Also setting up Z-Probe on the machine.
2017-04-27 11:16:38 -05:00
Kai
bf2fe46062 Update language_de.h 2017-04-27 10:13:02 +02:00
Kai
11d34be060 Update language_de.h 2017-04-27 10:06:26 +02:00
Scott Lahteine
817ecb9ff4 Merge pull request #6453 from thinkyhead/rc_cleanup_wednesday
Minor cleanups, work-in-progress
2017-04-26 19:41:52 -05:00
Roxy-3D
22f6e277af Get example files fully into compliance
Change to support new name GRID_MAX_POINTS_XY
Start UBL at version 1.0 in the CUSTOM_MACHINE_NAME
2017-04-26 16:22:17 -05:00
LVD-AC
a9bc1d30cc z_offset change
Avoids to have to recalibrate the delta_height after a z_offset change
2017-04-26 21:57:11 +03:00
Roxy-3D
ec26e23e7e Add my two 'Nice' machines as example configurations
These are my two 'Nice' machines.  Both are good example machines.  The
FolgerTech i3-2020 is probably the best value kit on the market right
now.  And it has developed a 'Cult Following' of hobbiests.  I'll always
have an up to date Configuration.h file set for it, so it may as well be
an example configuration.

And the gCreate gMax 1.5+ is the best printer I've ever seen that runs
Marlin.  For sure, I'll always have up to the minute Configuration.h
files for this printer also.   I've moved over to using the gMax as my
primary development machine for Marlin.   So...  Besides being a good
machine, it is a nice convienience for me to have this Configuration.h
file as an 'Example'.
2017-04-26 12:46:12 -05:00
Scott Lahteine
adb8e68592 Fix stuck "Print Aborted" LCD message
Fixes #6393
2017-04-26 06:24:23 -05:00
Scott Lahteine
096b927102 Minor optimization of FILAMENT_WIDTH_SENSOR 2017-04-26 06:24:23 -05:00
Scott Lahteine
5bdb0b567d Cosmetic patches 2017-04-26 06:24:23 -05:00
Kai
38ae7f4238 Added more translation strings
There are some quite tricky ones which are hardly translateable.
Maybe @Sebastianv650 can review this
2017-04-26 11:58:11 +02:00
Scott Lahteine
4d96d3eab1 Bootscreen delay after clear, then set chars
Fixes #6426
2017-04-25 23:37:28 -05:00
Scott Lahteine
5512130d6c Only set Compare Mode for channel A
Fixes #6445
2017-04-25 23:14:16 -05:00
Roxy-3D
d467e97679 Smart-Fill and Mesh-Tilting (both 3-point and grid) working!
Also...   The memory corruption issue may be fixed.   The GCC compiler
was inlining static functions and this caused the G29() stack frame to
become much larger than the AVR could handle.
2017-04-25 21:03:41 -05:00
Scott Lahteine
a699967ec8 Merge pull request #6443 from thinkyhead/rc_interrupt_fastio
Patch fastio.h with Timer 2 interrupt support
2017-04-24 20:09:41 -05:00
Scott Lahteine
2823bf0874 Update fastio.h with special handling for Timer 2 2017-04-24 16:58:22 -05:00
Scott Lahteine
fd535e111a Fix up XYZ_CONSTS_FROM_CONFIG macro 2017-04-24 14:05:11 -05:00
Kai
03c2f756b9 Update language_de.h 2017-04-24 13:32:16 +02:00
LVD-AC
dcf30a69d6 Allowing #define DELTA_TOWER_ANGLE_TRIM[C_AXIS]
More consistent with M665 where C-value is allowed as well, then
normalized
2017-04-23 14:51:24 +03:00
Brian
f41fb2b635 Numerous UBL-related changes:
* relocated ubl state to config. store:
 * removed a number of ubl state variables and padding which were largely unused - saved 58 bytes of both SRAM and EEPROM;
 * modified ubl sanity_check - no longer checks removed state variables that were otherwise unused, where checking didn't seem to accomplish anything, ultimately;
 * removed pre_initialized state, saving 64 bytes of SRAM;
 * removed automatic saving of UBL state after UBL activation/deactivation;
* consolidated multiple GRID_MAX_POINTS_X/Y to 'Global Leveling' section of EEPROM;
* minor update to G29 Sx notes/instructions;
* renamed mesh load and save parameter to 'slot' from 'm' for clarity;
2017-04-22 18:44:39 -05:00
Brian
f1a4758cef use progmem instead of sram for mesh_index_to_x/ypos array;
fix maximum mesh_index_ array size at 16 (15+1);
2017-04-22 18:34:49 -05:00
Scott Lahteine
d5ec34e7ed Merge pull request #6431 from thinkyhead/rc_bilinear_super_optimize
Minor cleanup, optimize number-to-string
2017-04-22 17:05:24 -05:00
Scott Lahteine
87d240042a Optimize number-to-string functions, no-fan display 2017-04-22 16:23:15 -05:00
Scott Lahteine
959566cf0a Update note about M163 / M164 2017-04-22 16:23:15 -05:00
Scott Lahteine
830851df13 Spend some SRAM to optimize bilinear leveling 2017-04-22 16:19:31 -05:00
Scott Lahteine
091179d960 bed_level_grid => z_values (also *_virt array) 2017-04-22 16:19:31 -05:00
Scott Lahteine
23cdbbb2d3 Add a method to refresh bilinear bed level after a change 2017-04-22 16:19:30 -05:00
Scott Lahteine
ccda63c473 Drop the accessor form for LCD value editing 2017-04-22 16:19:30 -05:00
Scott Lahteine
10da175be5 Fix a pair of compiler complaints 2017-04-22 16:19:30 -05:00
Scott Lahteine
ff0018e287 Format hex values as uppercase 2017-04-21 21:42:41 -05:00
android444
77aa16005d Polish font
Add polish font for GLCD displays only.
HD44780 work properly without polish character.
Update language_pl.h.
2017-04-21 21:42:41 -05:00
teemuatlut
244f67590e Delta probe height bug solved 2017-04-22 02:23:56 +03:00
Hans Raaf
406a83ff2d Fix for Meshpositions if printer has negative endstop positions 2017-04-22 00:16:16 +02:00
benlye
3ed737425d Fix typo in new SET_COM macro 2017-04-21 15:08:18 -05:00
Brian
88649b06a6 use planner.z_fade_height, etc. instead of private, ubl-specific g29 fade height 2017-04-21 09:09:09 -05:00
LVD-AC
004928148c Tower angles
Adding '7-point' tower angle correction calibration
2017-04-21 12:48:45 +03:00
LVD-AC
76ec7a0f80 Adding upto 7*7 probe grids
- adding Cn 5, 6 and 7
2017-04-21 11:58:39 +03:00
LVD-AC
d4f593d200 Delete 'expert level'
and getting rid off verbose level 3 and configuration_adv settings
2017-04-21 11:58:39 +03:00
LVD-AC
13c8493878 M665 rework and related issues (all delta's)
- Making M665 compatible with repetier (see
http://reprap.org/wiki/G_code#M665:_Set_delta_configuration)

- M665 B also sets the radius for manual calibration menu

- Converting tower ajustment definitions to arrays - tower angle
corrections compatible with Esher 3D wizzard

- Only tower angles need to be adjustable with M665 and stored to EEPROM
- tower radius and diag rod can be adjusted in the FW only with #define
2017-04-21 11:58:39 +03:00
Scott Lahteine
e66d9f1313 Merge pull request #6406 from thinkyhead/test_remote
Refresh Marlin git helper scripts
2017-04-20 23:45:24 -05:00
Scott Lahteine
dd436ceeb7 Add 'mfdoc' and 'mfpub' scripts to help with documentation 2017-04-20 21:37:26 -05:00
Scott Lahteine
78308b1c0b New git helper scripts 'mfadd' and 'mfqp'
- `mfadd` adds and fetches a user’s fork of Marlin
- `mfqp` invokes `git commit -m`, `mfrb`, `git push -f`
2017-04-20 21:37:25 -05:00
Scott Lahteine
7b4c245de3 Improve existing git helper scripts 2017-04-20 21:37:25 -05:00
Scott Lahteine
06f4776be4 mfprune: fetch remotes, offer checkout option 2017-04-20 21:37:25 -05:00
Scott Lahteine
c73b62447c Merge pull request #6403 from thinkyhead/rc_flsun_clean
FLSUN and trailing whitespace cleanup
2017-04-20 20:48:41 -05:00
Scott Lahteine
e0e069c6d8 Clean up trailing whitespace 2017-04-20 17:52:07 -05:00
Scott Lahteine
9b94210394 Bring FLSUN config more up to date 2017-04-20 17:52:06 -05:00
Scott Lahteine
b0aa256bc0 Updates for all configs 2017-04-20 17:52:05 -05:00
Scott Lahteine
b6ed69571a Merge pull request #6400 from thinkyhead/rc_interrupt_macros
Add and apply interrupt helper macros
2017-04-20 17:17:21 -05:00
Scott Lahteine
ee46ce1743 Add and apply interrupt helper macros 2017-04-20 16:04:29 -05:00
Scott Lahteine
6131c62499 General cleanup 2017-04-20 16:04:29 -05:00
benlye
2c86dfd3b5 Fix compiler type conversion errors after LCD changes 2017-04-20 16:04:29 -05:00
Scott Lahteine
55f9e76610 Merge pull request #6367 from thinkyhead/rc_cleanup_followup
Cleanup after some direct commits
2017-04-20 15:13:24 -05:00
Scott Lahteine
d38a792a91 Merge pull request #6382 from MagoKimbra/fix_configuration_store
Fix double definition in configuration_store
2017-04-20 15:06:58 -05:00
Scott Lahteine
b98bc034ae Replace c_assert hack with static_assert 2017-04-19 13:07:35 -05:00
Scott Lahteine
5eb2b1a790 Clear up G29 compiler warnings 2017-04-19 13:07:35 -05:00
Scott Lahteine
4ce2a63db0 Apply const, spacing to Marlin_main.cpp 2017-04-19 13:07:34 -05:00
Scott Lahteine
e97f1284c1 Cleanup of pins testing code 2017-04-19 13:07:34 -05:00
Scott Lahteine
e9b53ae00c Cleanup after some direct commits
https://github.com/MarlinFirmware/Marlin/commit/5e9726530ff21d3bc62beaa6
ac1b9437c276130a
2017-04-19 13:07:34 -05:00
Scott Lahteine
e05d050a1e Add hex routine to print an address 2017-04-19 13:07:34 -05:00
Scott Lahteine
4542282f5e Fix broken TOGGLE macro in fastio.h 2017-04-19 12:38:13 -05:00
MagoKimbra
ed52275a14 Fix double definition in configuration_store 2017-04-18 17:57:40 +02:00
Scott Lahteine
de569e3d4e Merge pull request #6327 from Bob-the-Kuhn/M43-toggle-&-Z-probe-fixes
M43 Toggle & Z servo test - fix bug & add another check
2017-04-18 03:21:57 -05:00
Scott Lahteine
f33a650ecc Merge pull request #6368 from thinkyhead/rc_linear_advance_eeprom
Add Linear Advance values to EEPROM and LCD
2017-04-18 02:54:12 -05:00
Scott Lahteine
a00ae4790a Replace M905 with unique code M900 2017-04-17 16:39:37 -05:00
Scott Lahteine
1286d9603d Clean up and organize ultralcd.cpp 2017-04-17 16:39:36 -05:00
Scott Lahteine
3cdf78a79f MSG_VOLUMETRIC => MSG_FILAMENT 2017-04-17 16:39:36 -05:00
Thomas Moore
f8e77d6545 Add Linear Advance values to EEPROM and enable configuration of K via LCD 2017-04-17 16:39:36 -05:00
Scott Lahteine
eb2d073dae Add M905 R for setting the E/D ratio directly 2017-04-17 16:39:36 -05:00
Scott Lahteine
69dfa54a84 Use code_value_linear_units for known-linear axes 2017-04-17 16:39:36 -05:00
Scott Lahteine
b956f2642b Show M503 report with current linear units 2017-04-17 16:39:36 -05:00
Scott Lahteine
ba4a005ceb Merge pull request #6373 from mtowara/mt_makefile_fix
Fix Makefile build
2017-04-17 16:16:37 -05:00
towara
150b15c311 fix compiler errors generated by more stringent flags in Makefile:
- use volatile for registers
- avoid implicit casts
2017-04-17 11:59:47 +02:00
towara
f6095c9325 fix missing serial.cpp in Makefile 2017-04-17 11:59:03 +02:00
Scott Lahteine
871f92378c Tweak headings in EEPROM structure 2017-04-16 18:42:33 -05:00
Scott Lahteine
bf2548be4a Merge pull request #6362 from tcm0116/babystepping
Only queue babysteps if axis is in a known position
2017-04-16 17:46:06 -05:00
Scott Lahteine
bddd75aa5c Merge pull request #6363 from dot-bob/display_reset
Identifed a display initialization issue.
2017-04-16 17:44:44 -05:00
dot-bob
9c410ddf68 Fixed an issue where a display with a hardware reset pin (LCD_RESET) may not get initialized properly. 2017-04-15 22:45:15 -06:00
Thomas Moore
72a7fac461 Only queue babysteps if axis is in a known position 2017-04-15 23:19:43 -05:00
Roxy-3D
5e9726530f Setup to find data corruption and general clean up
This data corruption problem is very difficult.  Just changing the code
a little bit changes whether the problem even happens and what is
affected.  I need these changes in the main branch so I can operate with
the extra debug code always available and turned on.

Everything is setup such that if M100 is turned off or DEBUG(ECHO) is
turned off, the code is not affected.   M100 has been made a little bit
more inteligent so it can display the serial command buffers in a more
meaningful way (because the data corruption seems to often times end up
in that area).
2017-04-15 19:26:43 -05:00
Scott Lahteine
e519e95953 Merge pull request #6358 from thinkyhead/rc_doubleclick_fix
Show Cancel/Continue screen for ABL "Level Bed"
2017-04-15 17:25:37 -05:00
Scott Lahteine
a81606c680 Show Cancel/Continue screen for ABL "Level Bed" 2017-04-15 16:51:03 -05:00
Scott Lahteine
51021bc7b8 Merge pull request #6353 from thinkyhead/rc_endstop_coolness
Clean up endstop triggering code
2017-04-15 16:49:54 -05:00
Scott Lahteine
857dec0990 Merge pull request #6342 from benlye/benlye-fix-softspi
Fix softspi variant conditional for 1284p
2017-04-15 16:33:50 -05:00
Scott Lahteine
4e04383d18 Merge pull request #6354 from thinkyhead/rc_doubleclick_fix
Fix undefined symbol if DOUBLECLICK_FOR_Z_BABYSTEPPING and HAS_BED_PROBE defined
2017-04-15 16:06:29 -05:00
Thomas Moore
8dd0492e68 Show lcd_babystep_zoffset screen if DOUBLECLICK_FOR_Z_BABYSTEPPING is enabled and HAS_BED_PROBE is defined 2017-04-15 14:44:50 -05:00
benlye
0a2f60fab4 Make spi.h inclusion conditional
spi.h is only needed if HEATER_0_USES_MAX6675 is defined, so making its inclusion conditional on HEATER_0_USES_MAX6675 being defined.
2017-04-15 16:22:42 +01:00
Bob-the-Kuhn
60471b7592 minor improvements
Configuration_store.cpp - changed a couple of print statements so the
values were printed.  The old method resulted in the formula being
printed.

ubl_G29
1) added support for R option to P4.  Now probes all points unless R is
present and the number is greater than 0.

2) P2 - moved map print statement so it showed the point that was
currently being probed,  The old location did this only for the first
point.

3) P4 - Moved the map print for the same reason.

ultralcd.cpp - changed "Mesh Editor :" to "Mesh Editor" because the LCD
draw routine puts a ":" in automatically so you end up with an extra ":"
using the old message.
2017-04-15 09:31:55 -05:00
Scott Lahteine
25a61e9061 Improve motion-based endstop triggering code 2017-04-15 06:16:50 -05:00
Scott Lahteine
5a97a7be97 Merge pull request #6352 from thinkyhead/rc_patch_menu_bug
Fix compiler warning about z-offset callback
2017-04-15 03:35:16 -05:00
Scott Lahteine
a2356c2825 Fix compiler warning about z-offset callback 2017-04-15 02:50:27 -05:00
Scott Lahteine
3a40e637cd Merge pull request #6350 from thinkyhead/rc_more_dualx_logging
Add more Dual X logging
2017-04-15 02:02:54 -05:00
Scott Lahteine
037c964d26 Reverse bools on prepare_move sub-functions 2017-04-15 01:08:19 -05:00
Scott Lahteine
d9c4333806 Extra logging of Dual X modes 2017-04-15 01:08:19 -05:00
Scott Lahteine
8cccf69ef7 Merge pull request #6348 from thinkyhead/rc_tmc2130_clean_clean
TMC2130 update. Fixes, tune-ups, new features
2017-04-14 23:40:56 -05:00
Scott Lahteine
4067d15c92 Cleanup, extend TMC2130 implementation 2017-04-14 23:00:00 -05:00
Scott Lahteine
d60c02c5b1 Cleanup, extend TMC2130 configuration 2017-04-14 22:43:56 -05:00
Scott Lahteine
0e97b3d6d0 Fix some configuration spacing 2017-04-14 22:36:10 -05:00
Scott Lahteine
cf6f483378 Merge pull request #6187 from thinkyhead/rc_flsun_delta_autocal
Delta: DELTA_HEIGHT, G33 Auto-Calibrate, drop M206/M428, add M665 H
2017-04-14 22:32:12 -05:00
Scott Lahteine
24882adfbf Allow NO_WORKSPACE_OFFSETS with DELTA_AUTO_CALIBRATION
- On `DELTA` the `M665 H` option supplants `M206`
- On `DELTA` `NO_WORKSPACE_OFFSETS` only reverts `G92` behavior
- Spawn 4 conditionals based on `NO_WORKSPACE_OFFSETS`
- Optimize coordinate space conversion for `DELTA` workspace
- To keep EEPROM version, retain `home_offset[XYZ]`, just ignore XY
2017-04-14 21:56:49 -05:00
Bob-the-Kuhn
1acb84ba02 fix 1 bug, add error messages
===============================================

make changes requested by reviewers

===============================================

add M43 test to Travis, fix EOL, remove trailing spaces
2017-04-14 20:57:45 -05:00
Scott Lahteine
40dfafbe89 Add Travis CI test for FLSUN config 2017-04-14 19:46:31 -05:00
LVD-AC
8821963873 Implement delta auto-calibration and delta_height 2017-04-14 19:46:31 -05:00
Scott Lahteine
b305699046 Merge pull request #6341 from benlye/benlye-lcd_babystep_zoffset
Fix lcd_babystep_zoffset()
2017-04-14 19:11:46 -05:00
LVD-AC
03bda24d19 Add delta auto-calibration and configuration for Flsun AC 2017-04-14 19:08:14 -05:00
Scott Lahteine
396bd7b377 Update "firstpush" to open branch commits on Github 2017-04-14 19:06:31 -05:00
Scott Lahteine
1bd25fd2b3 Clean up config spacing, section headings, etc. 2017-04-14 19:06:31 -05:00
Scott Lahteine
153b0ae967 Tweak Delta Printer configuration note 2017-04-14 19:06:06 -05:00
Scott Lahteine
81ffd98dd9 Allow faux leveling 2017-04-14 19:06:06 -05:00
Scott Lahteine
2355d87e11 Merge pull request #6346 from thinkyhead/rc_broken_abl_test
Add support for SOLENOID_PROBE
2017-04-14 18:36:32 -05:00
Scott Lahteine
f4685c28b7 Reorder Conditionals_post.h and add comments 2017-04-14 18:18:21 -05:00
Scott Lahteine
5135be14ea Include Travis CI tests for 5 extruders / e-steppers 2017-04-14 18:18:20 -05:00
Scott Lahteine
0ac2b5c045 Additional 5 extruders support (solenoids, microstepping) 2017-04-14 18:18:20 -05:00
Scott Lahteine
fd2a0784ba Add support for SOLENOID_PROBE 2017-04-14 17:24:36 -05:00
Scott Lahteine
5803ba43a9 Expose EXT_SOLENOID as an advanced option 2017-04-14 17:24:36 -05:00
Scott Lahteine
ea734f910b Use direct pin manipulation whenever possible 2017-04-14 16:55:35 -05:00
Scott Lahteine
19d0c6a0c0 Patch to init W with RGBW_LED 2017-04-14 16:55:23 -05:00
Scott Lahteine
3e079660b0 Never define SLED_PIN 2017-04-14 16:36:32 -05:00
Scott Lahteine
76765a8279 Merge pull request #6337 from thinkyhead/rc_core_endstop_fix
CORExx endstop detection fixes
2017-04-14 14:24:58 -05:00
benlye
1a447d0047 Fix variant conditional for 1284p 2017-04-14 18:46:09 +01:00
benlye
1f9ee42750 Fix lcd_babystep_zoffset()
Resolve 'steps_to_mm was not declared in this scope' compilation error after recent changes to merge babystepping with M851
2017-04-14 18:38:35 +01:00
Bob-the-Kuhn
445d39e95a CORExx endstop detection fixes
1. The CORExx printers were checking more endstop axis than needed.

2. Removed all the CORE_xx_NOT logic.  The motor_direction(xx) routine
always returns the correct data so it is not needed.  It was actually
cause the wrong direction to be checked in some cases.

3. Made the logic/defines for X, Y & Z axis all the same.  The old logic
checked inappropriate configurations for Y and didn't check all the
correct configurations on Z.

4. Added a check for zero steps before the X, Y & Z axis.  Previously
would check the they axis even if there were no movement.
2017-04-13 21:43:37 -05:00
Roxy-3D
28fec61f92 M100 Fixes and Features
All the memory accesses need to be unsigned char in  order to avoid
false errors being detected.   Two new features are available for
developers to call into the M100 functionality to look for data
corruption.
2017-04-13 18:20:53 -05:00
Scott Lahteine
2f2835e622 Merge pull request #6332 from thinkyhead/rc_babystep_zprobe
Make BABYSTEP_ZPROBE_OFFSET an optional feature
2017-04-13 16:50:08 -05:00
Scott Lahteine
52c3ace102 Add BABYSTEP_ZPROBE_OFFSET as an optional feature 2017-04-13 16:29:43 -05:00
Scott Lahteine
cd4e6abec8 Group BABYSTEPPING options together 2017-04-13 16:26:45 -05:00
Scott Lahteine
972c9655e9 Merge pull request #6245 from thinkyhead/rc_babystep_zprobe
BABYSTEPPING updates Z probe offset
2017-04-13 16:06:07 -05:00
Scott Lahteine
60ac41a32c Add code to handle changes to zprobe_zoffset 2017-04-13 15:46:35 -05:00
Scott Lahteine
8fa4209916 Movement/adjustment should be reverse of probe offset change 2017-04-13 15:46:05 -05:00
Thomas Moore
361655828f Use babystepping to adjust bed probe z-offset 2017-04-13 15:46:05 -05:00
Scott Lahteine
36e5c7c389 Merge pull request #6330 from thinkyhead/rc_improvements
Sanity check per-axis options' array sizes
2017-04-13 13:08:44 -05:00
Scott Lahteine
02fca543bb Merge pull request #6272 from thinkyhead/rc_adc_variable_rate
Make ADC sensor reading frequency adjustable
2017-04-13 12:49:31 -05:00
Scott Lahteine
34308368c0 Sanity check per-axis settings for size 2017-04-13 11:35:20 -05:00
Scott Lahteine
ac96ae89f9 Apply const in Stepper::isr 2017-04-13 06:20:36 -05:00
Scott Lahteine
2fa1e882d0 Merge pull request #6325 from thinkyhead/rc_M20_with_size
Simplified M20 with size
2017-04-13 05:06:52 -05:00
Bob-the-Kuhn
1b12fea0fa simplified M20 with size 2017-04-13 04:56:58 -05:00
Scott Lahteine
4022b971db Merge pull request #6315 from thinkyhead/rc_unify_M421
Unify M421
2017-04-12 19:43:28 -05:00
Scott Lahteine
b236562354 Merge pull request #6306 from thinkyhead/cleanup_after_6302
Adjustments to M100
2017-04-12 19:12:27 -05:00
Scott Lahteine
5e4f4d387f Swap MBL z_values dimensions to [X][Y] 2017-04-12 17:24:05 -05:00
Scott Lahteine
f81b518a03 Add Travis tests for optional M100 features 2017-04-12 17:07:22 -05:00
Scott Lahteine
063f641651 Unify M421 2017-04-11 15:46:13 -05:00
Scott Lahteine
6d5400dc31 Merge pull request #6240 from thinkyhead/rebuild_rgb_led
Extend RGB LED with Printer Events
2017-04-11 15:16:57 -05:00
Scott Lahteine
dac21ec680 Add support for an RGBW LED 2017-04-11 12:58:55 -05:00
Scott Lahteine
e7746ffee4 Extend RGB LED support, adding Printer Events 2017-04-11 12:15:41 -05:00
Scott Lahteine
c7063eb55c theTarget => target_temp 2017-04-11 12:15:41 -05:00
Scott Lahteine
36bda2bade Add HAS_RESUME_CONTINUE shorthand macro 2017-04-11 12:15:40 -05:00
Scott Lahteine
53e6c33c37 2 is DXC_DUPLICATION_MODE 2017-04-11 12:15:40 -05:00
Scott Lahteine
a2cb0a3d54 Use multiply for delta probe constraint 2017-04-11 12:15:40 -05:00
Scott Lahteine
6487c96a4a Merge pull request #6313 from Kaibob2/patch-10
Allow 10mm Movements for Z-Axis
2017-04-11 12:04:10 -05:00
Scott Lahteine
944218f7da Merge pull request #6309 from thinkyhead/rc_fix_minimum_pulse
Fix MINIMUM_STEPPER_PULSE calculations
2017-04-11 11:54:26 -05:00
Kai
001bc14255 Allow 10mm Movements for Z-Axis
I use the movement options via LCD quite often. Especially to get the nozzle out of the way. I see no reason, why the 10mm option is disabled for the Z-Axis, this is why i always delete this line when i compile a new version.
If this is unwanted, please just close this PR
2017-04-11 18:39:26 +02:00
Scott Lahteine
6a9b008044 Fix MINIMUM_STEPPER_PULSE maths 2017-04-11 11:11:17 -05:00
Scott Lahteine
68773f4486 Simplify stepper macros by renaming enable/disable macros 2017-04-11 11:10:26 -05:00
Scott Lahteine
e02a5a6371 Add macros for delays by machine cycle 2017-04-11 09:18:32 -05:00
Scott Lahteine
4ea447959e Merge pull request #6311 from thinkyhead/rc_bare_M109_M190
Have M109 / M190 do nothing with no parameters
2017-04-11 06:10:31 -05:00
Scott Lahteine
ecc537015a Have M109 / M190 do nothing with no parameters 2017-04-11 05:06:25 -05:00
Scott Lahteine
03aa9a390e Apply coding standards to M100, break up into functions 2017-04-10 21:09:43 -05:00
Scott Lahteine
48c16fc6ef Merge pull request #6307 from thinkyhead/rc_less_no_reentrance
Only lcd_synchronize needs no_reentry
2017-04-10 20:58:32 -05:00
Scott Lahteine
4fcfe926d6 Only lcd_synchronize needs no_reentry 2017-04-10 20:13:23 -05:00
Scott Lahteine
67fb7f82ac Merge pull request #6283 from thinkyhead/rc_eeprom_z_fade
Save / restore z_fade_height in EEPROM
2017-04-10 20:05:20 -05:00
Scott Lahteine
eff5af569b Merge pull request #6300 from MagoKimbra/rc_fix_mesh_report
Fix mbl_mesh_report
2017-04-10 19:37:19 -05:00
Scott Lahteine
4a18968c10 Merge pull request #6297 from Kaibob2/patch-9
Fix EPROM -> EEPROM
2017-04-10 19:35:30 -05:00
Roxy-3D
ba85faabc0 Fix M100 Free Memory Checker
M100 had numerious changes and quit working.   Part of the problem is
the overloading of the SERIAL_PROTOCOL functions.   Also, some of the
address arithmatic was changed to use char *ptr and passing ptr into the
SERIAL_PROTOCOL functions caused them to try to print a string instead
of a number.     M100 is working again.   Let's keep it that way!

M100 has been expanded to now have a function  int
free_memory_is_corrupted()  that can be called from other code to see if
the free space is still contiguous.  It may make sense to add a flag to
control its verbose nature but right now, the extra chit chat is very
helpful to know int free_memory_is_corrupted()  is doing the right thing
and what it found at various points when it was called.     A 'Show &
Tell' is coming up with int free_memory_is_corrupted().
2017-04-10 15:33:55 -05:00
Kai
3b82db5fe9 Missing semicolon in ultralcd.cpp
When PARK_HEAD_ON_PAUSE is defined Marlin won't compile because of two missing semicolon.
2017-04-10 14:45:51 -05:00
MagoKimbra
7d2e637867 Fix mbl_mesh_report 2017-04-10 20:50:19 +02:00
Kai
afeb0452ef Fix EPROM -> EEPROM
These fixes are neede because before it showed the englisch text even if language = de was selected
2017-04-10 18:37:00 +02:00
Scott Lahteine
7f950a80c0 Make ADC sensor reading frequency adjustable 2017-04-09 22:18:21 -05:00
Scott Lahteine
dad907b923 Merge pull request #6293 from thinkyhead/rc_move_toshiba
Put TOSHIBA with other stepper driver options
2017-04-09 22:08:36 -05:00
Scott Lahteine
786af73e24 Convert config code to a static class 2017-04-09 22:06:41 -05:00
james94jeans2
5b9476fe78 Added z_fade_height to EEPROM-Settings
Firmware was forgetting the z_fade_height in Planner, set by M420 Z<f>,
after each reset or loading settings from EEPROM. Added the float
z_fade_height to EEPROM-Storage, now remembers the value.
2017-04-09 21:16:58 -05:00
Scott Lahteine
9343f6a95f Put TOSHIBA with other stepper driver options 2017-04-09 20:52:49 -05:00
Scott Lahteine
7a704af5e6 Merge pull request #6284 from thinkyhead/rc_wt150_rebase
wt150 (Mightyboard Rev E) & RRD Full Graphic Smart Controller
2017-04-09 20:27:44 -05:00
Scott Lahteine
2bde7940e0 Merge pull request #6289 from zlowred/RCBugFix
Fixed comparison of float values to NaN
2017-04-09 19:39:04 -05:00
Max Matveev
2031fb913b Fixed comparison of float values to NaN 2017-04-09 20:28:46 +02:00
Scott Lahteine
e48a52a530 Patch a display issue with LCD_DECIMAL_SMALL_XY
The `ftostr4sign` function got munged by the `WITHIN` patch
2017-04-09 10:25:35 -05:00
Scott Lahteine
1a3cd6a090 Merge pull request #6213 from thinkyhead/rc_gitattributes
Init bed_level_virt_interpolate on EEPROM load
2017-04-09 08:13:11 -05:00
Scott Lahteine
314a02e2d5 Toggle with XOR 2017-04-09 07:58:47 -05:00
Scott Lahteine
cfad4736cd Merge pull request #6285 from thinkyhead/rc_cheaptronic_v2
Cheaptronic V2
2017-04-09 07:09:23 -05:00
Scott Lahteine
8bc0d90b00 Init bed_level_virt_interpolate on EEPROM load 2017-04-09 07:04:20 -05:00
MD
20dd5376b8 Cheaptronic V2
Add support for new electronics
www.reprapobchod.cz
2017-04-09 06:57:43 -05:00
Scott Lahteine
4cdda5615b Bring other configs up to date with wt150 changes 2017-04-09 06:45:42 -05:00
Paweł Stawicki
9b0885f4f6 Allow boards without a thermistor 2017-04-09 06:45:41 -05:00
Paweł Stawicki
64cfcebe66 Update SlowSoftI2CMaster link. MightyBoard digipots I2C bus has no resistors. 2017-04-09 06:45:03 -05:00
Paweł Stawicki
0eb16d9ff7 Add example config for the wt150 printer with RepRapDiscount Full Graphic Smart Controller 2017-04-09 06:44:54 -05:00
Paweł Stawicki
652bedfa18 Add RepRapDiscount Full Graphic Smart Controller support to MIGHTYBOARD REVE 2017-04-09 06:44:53 -05:00
Paweł Stawicki
44cdebb8f1 Add software spi support for max6675 2017-04-09 06:44:53 -05:00
Paweł Stawicki
191fec009f Add digipot i2c control for MCP4018 2017-04-09 06:44:53 -05:00
Scott Lahteine
e5b16081cb Update TinyBoy2 configurations 2017-04-09 06:44:53 -05:00
Scott Lahteine
1855534f20 Config files cleanup 2017-04-09 06:44:52 -05:00
Scott Lahteine
2f5e934a19 Merge pull request #6282 from thinkyhead/rc_cleanup_and_5_extruders
Additional missed patches
2017-04-09 04:35:08 -05:00
Scott Lahteine
c26a315d0b Additional missed patches 2017-04-09 04:24:23 -05:00
Scott Lahteine
635f182478 Merge pull request #6281 from thinkyhead/rc_cleanup_and_5_extruders
More patches for 5 extruders
2017-04-09 04:07:22 -05:00
Scott Lahteine
39617e10b8 Patch configs comment formatting 2017-04-09 03:49:16 -05:00
Scott Lahteine
c54f6cf23d Updates to support 5 extruders 2017-04-09 03:49:16 -05:00
Scott Lahteine
2b88ccd0aa Apply UBL mesh bounds to remaining configs 2017-04-09 03:49:15 -05:00
Scott Lahteine
60be3d264b Macros to print floats, hiding imprecision 2017-04-09 03:48:40 -05:00
Scott Lahteine
b356d73239 Merge pull request #6278 from thinkyhead/pr_delta_angles
Followup to additional delta trim options
2017-04-08 22:25:57 -05:00
Jimmy Envall
f78d44e91a Added support for delta tower angle corrections. 2017-04-08 21:13:44 -05:00
Scott Lahteine
d3b4d84586 Merge pull request #6277 from thinkyhead/pr_roxy3d_rcbugfix
Unify UBL Command Parsing
2017-04-08 20:17:46 -05:00
Scott Lahteine
98c9de11e1 Merge pull request #6266 from thinkyhead/rc_cleanup_after
Cleanup after recent merges
2017-04-08 20:08:15 -05:00
Scott Lahteine
d4ce839351 Cleanup following Pins Debug update 2017-04-08 18:59:57 -05:00
Scott Lahteine
c7a8f7970b Formatting / cleanup 2017-04-08 18:59:57 -05:00
Scott Lahteine
29d4ec8257 Support 5 extruder auto fans 2017-04-08 18:59:57 -05:00
Scott Lahteine
824f3c1c0d Fix up configuration comments 2017-04-08 18:59:56 -05:00
Scott Lahteine
995ed90248 Clean up Filament Width Sensor comments 2017-04-08 18:59:56 -05:00
Scott Lahteine
5a7b810fdd General comment cleanup 2017-04-08 18:58:33 -05:00
Scott Lahteine
0027c22839 Drop extraneous calls to lcd_update 2017-04-08 18:58:33 -05:00
Scott Lahteine
d6db7a9b03 patch "step_remaining" 2017-04-08 18:13:20 -05:00
Scott Lahteine
cbc2331187 Use LCD_MESSAGEPGM over lcd_setstatuspgm 2017-04-08 18:04:39 -05:00
Scott Lahteine
3729510b1e Set and check main parameter values, report all errors 2017-04-08 17:15:55 -05:00
Roxy-3D
34d3ed9ab1 These items were removed from the UBL Command Parsing
Having these items randomly (and errorniously) disappear cost me several
hours of work yesterday.
2017-04-08 15:30:20 -05:00
Scott Lahteine
15edb41cee Patches to UBL 2017-04-08 14:59:14 -05:00
Roxy-3D
14cf527bb8 Getting setup for debugging 2017-04-08 14:59:14 -05:00
Scott Lahteine
f8408036f2 Merge pull request #6264 from thinkyhead/rc_five_extruders
Support up to 5 extruders in Marlin
2017-04-07 12:48:56 -05:00
Bob-the-Kuhn
5212cb8304 Merge pull request #6271 from Bob-the-Kuhn/MCP4728-consistency-2
MCP4728 consistency ... Finish name change
2017-04-07 11:31:19 -05:00
Bob-the-Kuhn
f7fc49c3a3 Finish name change
DAC_STEPPER_DFLT wasn't changed to DAC_MOTOR_CURRENT_DEFAULT in all
places on PR #6124
2017-04-07 11:05:24 -05:00
Scott Lahteine
832064e4f2 Implementation changes to support 5 extruders 2017-04-07 10:46:37 -05:00
Scott Lahteine
04050237f0 Header and pins changes to support 5 extruders 2017-04-07 10:46:36 -05:00
Scott Lahteine
2a84122edd Configuration changes to support 5 extruders 2017-04-07 10:46:35 -05:00
Scott Lahteine
edf18977c1 Patch pins files hotends/e-steppers sanity check 2017-04-07 10:46:33 -05:00
Scott Lahteine
dc84678fc1 Fix HOTEND_STATUS_ITEM for graphical display 2017-04-06 23:07:30 -05:00
Scott Lahteine
a0de5d94e2 Merge pull request #6258 from benlye/benlye-bilinearfix2
Better fix for bilinear Z offset and G29 Z (update to #6251)
2017-04-06 20:51:57 -05:00
Scott Lahteine
b23aef5b8d Merge pull request #6190 from Bob-the-Kuhn/Stop-and-Kill-prints---round-2
Message for every KILL and STOP (also need delays)
2017-04-06 20:40:12 -05:00
Roxy-3D
945303c0d5 eleminate bootscreen.h 2017-04-06 19:55:41 -05:00
Roxy-3D
ef3da3971e Update ubl.h 2017-04-06 19:55:41 -05:00
Roxy-3D
8644dc170b get synchronized to current file names 2017-04-06 19:55:41 -05:00
Roxy-3D
1451b7eacf UBL's Grid Based Leveling code
Pretty much...  The code is in place.  Still more work to do.    But it
has a lot of hooks and variables in other code, so commit and merge
before I pick up a million 'Conflicts'.
2017-04-06 19:55:41 -05:00
Bob-the-Kuhn
549055f20c Merge pull request #6124 from Bob-the-Kuhn/MCP4728-consistency
MCP4728 consistency & fix ultralcd.cpp (PRINTRBOARD Rev F and RIGIDBOARD V2)
2017-04-06 16:35:50 -05:00
Bob-the-Kuhn
a77875c9d2 Merge pull request #6114 from Bob-the-Kuhn/try2-add-BLTouch-retry
Another BLTouch retry place (replaces PR #6108)
2017-04-06 16:25:55 -05:00
Bob-the-Kuhn
3b9ff2cb12 Merge pull request #5676 from Bob-the-Kuhn/configuration.h
Configuration.h - reword Z PROBE section
2017-04-06 16:18:34 -05:00
Bob-the-Kuhn
6643d553f6 # This is a combination of 2 commits.
# This is the 1st commit message:

MCP4728 consistency & fix ultralcd.cpp

The MCP4728 DAC controls the stepper motor current strenth on the
PRINTRBOARD Rev F and RIGIDBOARD V2 boards.

PR #5792 on 9 FEB 2017 implemented default drive percentages but only on
the RIGIDBOARD V2.

This change moves the default settings to Configuration_adv.h.

Also, ultralcd.cpp won't compile because of a type def conflict.
Changed it to match the one in stepper_dac.cpp

===========================================================

reword stepper curent section for clarity

===========================================================

change name & improve comments

===========================================================

changed name from A4JP to SCOOVO_X9H per PR #6139

# This is the commit message #2:

fix typo
2017-04-06 16:16:27 -05:00
Bob-the-Kuhn
a44b3432c1 add BLTouch retry to a second place & add/update delays
=================================================

implement requested changes

=================================================

remove delays (they're in another PR) & move return
2017-04-06 16:13:07 -05:00
Bob-the-Kuhn
a5abc61fb9 Merge pull request #6219 from Bob-the-Kuhn/Servo-probe-and-toggle-pins
M43 - add Toggle utility and Z servo utility (replaces PR #5864)
2017-04-06 16:10:50 -05:00
Bob-the-Kuhn
f87012a063 Merge pull request #5762 from Bob-the-Kuhn/Z_DUAL_ENDSTOP-make-offset-a-configuration-item
Z_DUAL_ENDSTOPS -  make offset a configuration item
2017-04-06 16:09:15 -05:00
Bob-the-Kuhn
3b8926bd09 improved wording, consolidation of info, BLTouch warning
==============================================

clarified BLTouch calculation & changed comment delimitters/flags

I found it hard to pickout the various sections in this area so I
changed most comments from // style to /** ... */

Made the BLTouch calculation simpler and clarified the units of measure
for the result.

============================================

add changes to example configurations

============================================

add TinyBoy2 to this PR & add BLTouch Delay
2017-04-06 16:06:01 -05:00
Scott Lahteine
55d296aaf0 pinsDebug with more features, uses less RAM
I've just uploaded a major change to pinsDebug.
The big change was creating an array in FLASH that contained every
active pin definition. That reduced the RAM memory usage considerably
but increased the FLASH usage.
Creating the array requires going through the pin list twice. Rather
than having two copies of it in the code I moved the list out to another
file (pinsDebug_list.h) and then just did two #includes.
From the user’s view they’ll see the following changes:
1. Now reports all the names assigned to a pin
2. The port is now reported in addition to the pin number.
3. When PWM0A & PWM1C share a pin, both PWMs are reported
4. More PWM/Timer info is reported
One new item that may cause some concern is the usage of the LINE
predefined preprocessor macro. It may not be available if the Arduino
IDE goes to a different compiler.

Includes support for 1284 & 1286 families.

Memory usage changes when enabling PINS_DEBUGGING:
ATmega2560
FLASH
.           without   52576
.           with new  64592
.           with old  62826
.           new-out   12016
.           old-out   10250
.           new-old   1766
.
RAM
.           without   2807
.           with new  2875
.           with old  3545
.           new-out   68
.           old-out   738
.           new-old   -670

==================================================================

minor changes - mostly formatting

1) added newline to end of teensyduino file

2) changed flag name from TEENSYDUINO to TEENSYDUINO_IDE.  Got warnings
about redefining TEENSYDUINO

3) removed some trailing spaces

reduce PROGMEM size & update pin list

Reduced PROGMEM usage by
1) converting often used macro to a function
2) moved as much as possible into the function

This required creating two arrays of address pointers for the PWM
registers.

==================================================================

update with new M3, M4, M5 pin names

==================================================================

report I/O status for unused/unknown pins
2017-04-06 16:06:01 -05:00
Scott Lahteine
e116723b8b Adjust indentation in ubl.h 2017-04-06 16:06:00 -05:00
Scott Lahteine
1b3a26f2f5 Rename all UBL files with a ubl_ prefix 2017-04-06 16:06:00 -05:00
Scott Lahteine
d13991ae18 Use same config name for all mesh dimensions 2017-04-06 16:05:59 -05:00
Bob-the-Kuhn
f9686a108c add Z servo test and toggle pins to M43 2017-04-06 15:59:38 -05:00
Scott Lahteine
62cbaa302e Z_DUAL_ENDSTOP - make offset a configuration item
The offset for Z_DUAL_ENDSTOP (z_endstop_adj) is already in Marlin.
This PR just makes it a configuration item.

z_endstop_adj is initialized in two places so both had to be modified.
2017-04-06 15:57:10 -05:00
Bob-the-Kuhn
3b6333c613 Merge pull request #5668 from Bob-the-Kuhn/pinsDebug-PROGMEM
pinsDebug with more features, uses less RAM
2017-04-06 15:51:45 -05:00
Scott Lahteine
c9e35004e7 pinsDebug with more features, uses less RAM
I've just uploaded a major change to pinsDebug.
The big change was creating an array in FLASH that contained every
active pin definition. That reduced the RAM memory usage considerably
but increased the FLASH usage.
Creating the array requires going through the pin list twice. Rather
than having two copies of it in the code I moved the list out to another
file (pinsDebug_list.h) and then just did two #includes.
From the user’s view they’ll see the following changes:
1. Now reports all the names assigned to a pin
2. The port is now reported in addition to the pin number.
3. When PWM0A & PWM1C share a pin, both PWMs are reported
4. More PWM/Timer info is reported
One new item that may cause some concern is the usage of the LINE
predefined preprocessor macro. It may not be available if the Arduino
IDE goes to a different compiler.

Includes support for 1284 & 1286 families.

Memory usage changes when enabling PINS_DEBUGGING:
ATmega2560
FLASH
.           without   52576
.           with new  64592
.           with old  62826
.           new-out   12016
.           old-out   10250
.           new-old   1766
.
RAM
.           without   2807
.           with new  2875
.           with old  3545
.           new-out   68
.           old-out   738
.           new-old   -670

==================================================================

minor changes - mostly formatting

1) added newline to end of teensyduino file

2) changed flag name from TEENSYDUINO to TEENSYDUINO_IDE.  Got warnings
about redefining TEENSYDUINO

3) removed some trailing spaces

reduce PROGMEM size & update pin list

Reduced PROGMEM usage by
1) converting often used macro to a function
2) moved as much as possible into the function

This required creating two arrays of address pointers for the PWM
registers.

==================================================================

update with new M3, M4, M5 pin names

==================================================================

report I/O status for unused/unknown pins
2017-04-06 14:46:28 -05:00
Scott Lahteine
7dfe2cc132 Merge pull request #6254 from thinkyhead/rc_ubl_rename
Group all UBL files via a common prefix
2017-04-06 05:46:18 -05:00
Scott Lahteine
4abd53f65a Adjust indentation in ubl.h 2017-04-06 05:36:16 -05:00
Scott Lahteine
f5c5c1f771 Rename all UBL files with a ubl_ prefix 2017-04-06 05:33:27 -05:00
Scott Lahteine
11430b6d33 Merge pull request #6256 from thinkyhead/rc_unify_grid_size
Use same config name for all mesh dimensions
2017-04-06 05:30:28 -05:00
benlye
f1d50ac1dc Fixing bilinear Z offset and G29 Z
The fix in #6251 for bilinear Z offset was flawed and broke the Z parameter of G29 for bilinear levelling.  This is reverted and a different fix is used for the double-addition of the Z-probe offset to the bilinear correction grid.
2017-04-06 07:41:46 +01:00
Scott Lahteine
eb1e6aa29b Use same config name for all mesh dimensions 2017-04-06 00:42:52 -05:00
Scott Lahteine
034e912c85 Merge pull request #6248 from thinkyhead/rc_marlin_scad_mesh
Add hidden option to output Bilinear grids in JSON
2017-04-06 00:36:45 -05:00
Scott Lahteine
c961dd084d Add hidden option to output Bilinear grids in JSON 2017-04-05 23:43:17 -05:00
Scott Lahteine
bc09e862a9 Re-enable .cpp as LF in .gitattributes 2017-04-05 22:30:30 -05:00
Scott Lahteine
df7b4252fd Reduce M420 code for UBL slightly 2017-04-05 22:30:29 -05:00
Scott Lahteine
8866158d03 Add LEVELING_DATA as a capability 2017-04-05 22:30:28 -05:00
benlye
0a2b4f3486 Fix bilinear levelling z offset
Since run_probe was altered to return the probe Z position rather than the nozzle Z position bilinear levelling has been broken because the Z-offset has been applied twice - once in the run_probe function, and then again in the G29 code for bilinear levelling.
2017-04-05 22:01:40 -05:00
Scott Lahteine
44a849bdce Fix broken M206/M428/G92 offsets 2017-04-05 22:01:37 -05:00
Roxy-3D
52978e5ba5 Fix spelling mistake when UBL's mesh is Inactive 2017-04-02 20:07:09 -05:00
Roxy-3D
0423e93c42 Fix M421 AUTO_BED_LEVELING_BILINEAR and AUTO_BED_LEVELING_UBL
M421 was not connected up for AUTO_BED_LEVELING_BILINEAR.
M421 needed to migrate mesh data to new UBL EEPROM layout.
2017-04-02 16:46:37 -05:00
Scott Lahteine
3412950abc Merge pull request #6209 from thinkyhead/rc_psu_zero
Power Supply 0 as "General"
2017-04-02 16:44:42 -05:00
Roxy-3D
3e9e94801f Fix problem described in issue # 6175
As it turns out...   an unsigned int can not go to less than 0,  so the
loop never terminates.
2017-04-02 13:00:27 -05:00
Scott Lahteine
a37a605fee Merge pull request #6217 from thinkyhead/rc_fix_invisibles_to_most
Patch .gitattributes till UBL line endings are fixed
2017-04-02 12:52:26 -05:00
Scott Lahteine
01a293b6e3 Patch .gitattributes till UBL line endings are fixed 2017-04-02 12:50:02 -05:00
Scott Lahteine
289e3d6844 Merge pull request #6215 from thinkyhead/rc_bed_false_alarm
Fix thermal runaway when nonexistent bed temp is set
2017-04-02 11:59:58 -05:00
Scott Lahteine
1c69a155cf Merge pull request #6214 from thinkyhead/rc_bltouch_delay_opt
Configurable delay for BLTouch servo emulation
2017-04-02 11:59:34 -05:00
Scott Lahteine
948728e63b Fix line-endings in UBL_G29 2017-04-02 11:48:26 -05:00
Scott Lahteine
699310d1d2 Fix: Thermal runaway if nonexistent bed's temp is set 2017-04-02 11:48:10 -05:00
Scott Lahteine
c56eec29f0 Configurable delay for BLTouch servo emulation 2017-04-02 11:14:53 -05:00
Scott Lahteine
deaad78df9 Merge pull request #5678 from Bob-the-Kuhn/G38-optional-double-tap
G38 bug fix, made double touch optional & reverted to Z_MIN_PROBE
2017-04-02 10:32:04 -05:00
Scott Lahteine
b3e9977f97 Merge pull request #6212 from thinkyhead/rc_gitattributes
Fix LCD preheat menus
2017-04-02 09:54:13 -05:00
Scott Lahteine
5bce731962 Fix LCD preheat menus 2017-04-02 09:32:22 -05:00
Scott Lahteine
9faa8c4704 Merge pull request #6210 from thinkyhead/rc_gitattributes
Add .gitattributes to normalize line endings
2017-04-02 08:56:51 -05:00
Scott Lahteine
4c72167af3 Prevent a warning on echo_command 2017-04-02 08:36:58 -05:00
Scott Lahteine
9b5fd9522e Fix formatting, order for a UBL change 2017-04-02 07:15:40 -05:00
Scott Lahteine
f0ef8a1cbd Add .gitattributes to normalize line endings 2017-04-02 06:47:52 -05:00
Tannoo
54173c80ad Power Supply 0 as "General" 2017-04-02 06:21:34 -05:00
Scott Lahteine
883c6762c4 Merge pull request #6208 from thinkyhead/rc_parity_with_32bit
Patch MarlinSerial to match up with 32-bit version
2017-04-02 05:13:03 -05:00
Scott Lahteine
a2775d0c70 can wstring be removed? 2017-04-02 04:43:33 -05:00
Scott Lahteine
de4e19f17e Patch MarlinSerial to match up with 32-bit version 2017-04-02 04:39:18 -05:00
Scott Lahteine
34b23ff312 Merge pull request #6202 from thinkyhead/rc_fix_broken_ubl
Patching up UBL, vetting recent commits
2017-04-02 03:51:38 -05:00
Scott Lahteine
2cbc7b4b73 Relocate serial macros and functions 2017-04-02 01:05:25 -05:00
Scott Lahteine
eaa66f3c46 Indent MarlinSerial code 2017-04-02 01:05:25 -05:00
Scott Lahteine
7a7a80e6c5 status_printf => lcd_status_printf_P 2017-04-02 01:05:25 -05:00
Scott Lahteine
0e6ec34228 Use PSTR versions of lcd_status... to save SRAM 2017-04-02 00:45:39 -05:00
Scott Lahteine
34e2420b9b Apply const args, clean up find_closest_circle_to_print 2017-04-01 23:15:41 -05:00
Scott Lahteine
e19fbd27ce Minor spelling patch 2017-04-01 23:08:00 -05:00
Scott Lahteine
790a3e9a8c Remove extraneous check of UBL_G26_MESH_EDITING 2017-04-01 23:03:40 -05:00
Scott Lahteine
7310110ec0 Fix logic of UBL::fade_scaling_factor_for_z 2017-04-01 22:52:48 -05:00
Scott Lahteine
a7aa70e79a Merge pull request #6201 from thinkyhead/rc_fix_broken_ubl
Fix broken auto#.g, some other regressions
2017-04-01 22:14:04 -05:00
Scott Lahteine
1a775cecac Revert behavior of enqueue_and_echo_commands_P 2017-04-01 21:53:46 -05:00
Scott Lahteine
79d42d87c1 Syntax cleanup 2017-04-01 21:53:46 -05:00
Scott Lahteine
b47fd31c37 Revert some changes to UBL 2017-04-01 21:53:45 -05:00
Bob-the-Kuhn
185337e787 add delays to allow stop & kill messages to get out 2017-04-01 00:23:14 -05:00
Scott Lahteine
63abb65146 Update description of PINS_DEBUGGING 2017-03-31 18:57:48 -05:00
Scott Lahteine
f75aa4d5be Merge pull request #6050 from thinkyhead/rc_probe_manually
Add PROBE_MANUALLY — ABL without a probe
2017-03-31 12:27:33 -05:00
Scott Lahteine
73e193da1d Implement LCD_BED_LEVELING for PROBE_MANUALLY 2017-03-31 11:50:18 -05:00
Scott Lahteine
fcadc7bb1a Implement the "manual" option for ABL 2017-03-31 11:50:18 -05:00
Scott Lahteine
9e22184936 Add a "manual" option for ABL 2017-03-31 11:50:18 -05:00
Scott Lahteine
541165e878 Merge pull request #6181 from thinkyhead/rc_ubl_further_fixes
Further adjustments to UBL code
2017-03-31 11:35:02 -05:00
Scott Lahteine
b19a15fa7f Within applied to UBL 2017-03-31 11:12:57 -05:00
Scott Lahteine
342ee458ae Additional UBL fixes, optimizations 2017-03-31 11:12:57 -05:00
Scott Lahteine
a5e085cbea Have run_probe() return probe Z, not nozzle Z 2017-03-31 09:27:49 -05:00
Scott Lahteine
4487d22d56 Apply FIXFLOAT macro 2017-03-31 09:27:48 -05:00
Scott Lahteine
6cac0f43eb MBL fiddle 2017-03-31 09:27:48 -05:00
Scott Lahteine
25a6bfa7ed Add and apply WITHIN macro 2017-03-31 09:27:48 -05:00
Scott Lahteine
81136c1e82 Merge pull request #6177 from thinkyhead/rc_tinyboy
Support for TinyBoy 2 3D printer (and its OLED display)
2017-03-31 04:31:47 -05:00
Scott Lahteine
93aad54dc1 Clean up code, remove _now command function 2017-03-31 04:17:31 -05:00
Stefan Brüns
6ba6c92a81 Add example configuration for TinyBoy L10/L16
The TB2 is a Indiegogo funded 3d printer. It uses a MKS SMELZI V1.0
main board (based on MELZI, i.e. Sanguinololu). I comes as a complete kit,
including display and panel.
Two variants exists, L10 and L16, with a height of 100 and 160 mm.
The heating function of the provided bed can enabled by soldering a
thermistor and some wires to it.

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2017-03-31 04:05:35 -05:00
Stefan Brüns
0fe57ad4f5 Add Support TinyBoy2 OLED/Encoder panel
The OLED is driven by an SSD1306, connected to the board via
I2C, the rotary encoder is connected to 3 GPIO pins.

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2017-03-31 04:05:34 -05:00
Scott Lahteine
baadb11536 Merge pull request #6174 from thinkyhead/rc_ubl_continued
UBL additional cleanup
2017-03-31 03:39:50 -05:00
Scott Lahteine
65ca6472ba Make G26 compatible with G92 and M206 2017-03-31 02:20:20 -05:00
Scott Lahteine
4902fd4e95 More data in UBL class, make it a static class
- Make all `unified_bed_leveling` data/methods static
- Move some UBL-related variables into the class
- Replace `map_[xy]_index_to_bed_location` with `mesh_index_to_[xy]pos`
2017-03-31 02:20:20 -05:00
Scott Lahteine
edbc024d76 Disable UBL_G26_MESH_EDITING by default 2017-03-31 02:20:20 -05:00
Scott Lahteine
9e4bd6b3b5 Further repairs to UBL, comments, spacing 2017-03-31 02:20:20 -05:00
Bob-the-Kuhn
f3618c3337 Reduce UBL RAM usage by making G26/G29 optional 2017-03-31 02:20:19 -05:00
Scott Lahteine
e746d68a12 Merge pull request #6176 from thinkyhead/rc_mbl_abl_optimize
Make MBL a static class, use lookup for index-to-point conversion
2017-03-31 02:12:49 -05:00
Scott Lahteine
c9eb1d6ab7 Make MBL a static class, use lookup for index-to-point conversion 2017-03-31 01:28:07 -05:00
Scott Lahteine
de9d2cddc3 Merge pull request #6152 from thinkyhead/rc_cleanup_6150_etc
UBL cleanup, optimization
2017-03-30 17:40:29 -05:00
Scott Lahteine
9217e4b8ec Various UBL cleanups and bug fixes 2017-03-30 17:09:49 -05:00
Scott Lahteine
9924199802 Merge pull request #5908 from thinkyhead/rc_fix_slowdown
General minor cleanup
2017-03-29 21:43:33 -05:00
Scott Lahteine
0e71e7b2fb Cleanup to planner.cpp 2017-03-29 06:48:07 -05:00
Scott Lahteine
f105cad43c Marlin: Slight cleanup to Marlin_main.cpp 2017-03-29 06:40:29 -05:00
Scott Lahteine
499f9e04e1 Marlin: Temperature soft-PWM cleanup 2017-03-29 06:37:27 -05:00
Scott Lahteine
7ddd94dc61 Merge pull request #5994 from StefanBruens/fix_Makefile_errors
Fix makefile errors, cleanup
2017-03-29 06:32:08 -05:00
Scott Lahteine
af09095f03 Merge pull request #6154 from thinkyhead/rc_fil_sensor_vs_sd
Show Filament Width on LCD when SD is disabled
2017-03-29 05:24:48 -05:00
Remo Kallio
d38b1bc4b1 Show filament width sensor values in LCD constantly if SD card support is not enabled. 2017-03-29 04:03:08 -05:00
Scott Lahteine
e3459ec178 Merge pull request #5989 from MagoKimbra/rc_fix_delta_angles
Fix delta_angles
2017-03-29 03:35:18 -05:00
Scott Lahteine
592300922c Merge pull request #6149 from thinkyhead/rc_scara_feedrate
Convert feedrate on SCARA from mm/s to deg/s
2017-03-29 03:31:44 -05:00
Scott Lahteine
f49aec057f Tweak "can not" => "can't" in RUMBA pins 2017-03-29 01:04:50 -05:00
Scott Lahteine
0a23a1bb3b Dynamic feedrate on SCARA, converting target mm/s to deg/s 2017-03-28 17:21:07 -05:00
Roxy-3D
d8724bb546 Get G29's P1 (Automated Probing) working again.
Incorrect optimizations of data types and ternary operators caused some
issues.
2017-03-28 17:11:02 -05:00
Scott Lahteine
8d53298a6d Merge pull request #6139 from thinkyhead/rc_a4jp_scoovo
Board A4JP should be SCOOVO_X9H
2017-03-28 14:06:39 -05:00
Scott Lahteine
c7f6ee9c93 Board A4JP should be SCOOVO_X9H 2017-03-27 22:22:13 -05:00
Scott Lahteine
8c07ac7f7c Merge pull request #6133 from thinkyhead/rc_use_safe_delay
Use safe_delay to ensure watchdog reset
2017-03-27 00:18:02 -05:00
Scott Lahteine
a9fc30ae2e Use safe_delay to ensure watchdog reset 2017-03-26 23:49:56 -05:00
Roxy-3D
171904b6c7 Make G29 What command print reliably and fix G29 P1 bug Waldo found 2017-03-26 17:05:58 -05:00
Roxy-3D
9d3ac66f73 Map clean up of UBL
UBL's maps are cleaner.   And with a 1 value, G29 O 1  will generate a
map suitable to be Cut & Pasted into Excel so a Suface Map can be
generated.
2017-03-25 18:55:05 -05:00
Roxy-3D
9a1949a91e Cleaned up G26 ready to replace existing one at MarlinFirmware/Marlin 2017-03-25 10:15:40 -05:00
Roxy-3D
aec85ad45a Start of process to get UBL running again.
The wait_for_user change totally broke UBL.   But there is stuff wrong
now in the thermal code and/or LCD Panel code.
2017-03-24 18:38:27 -05:00
Scott Lahteine
b47eaf14ae Merge pull request #6109 from thinkyhead/rc_soft_pwm_dither
PWM dithering followup
2017-03-24 18:21:07 -05:00
Scott Lahteine
34d1c41b5f Merge pull request #6111 from benlye/benlye-patch-echo_command
Fix type conversion issue with echo_command
2017-03-24 17:57:28 -05:00
Scott Lahteine
7d65911c00 Merge pull request #6110 from thinkyhead/rc_bilinear_and_m851
Adjust bilinear grid in M851
2017-03-24 17:51:25 -05:00
benlye
6a601aca35 Fix type conversion issue with echo_command
With the the current definition of echo_command I cannot compile RCBugFix (Arduino IDE 1.8.1) with the error "invalid conversion from 'const char*' to 'char*'".  This change resolves that.
2017-03-24 17:23:02 +00:00
Scott Lahteine
009a6ddd39 Adjust bilinear grid in M851 2017-03-24 06:28:59 -05:00
Scott Lahteine
eab7854a73 Merge pull request #6074 from thinkyhead/rc_immediate_shove
Immediate commands take precedence
2017-03-24 05:52:27 -05:00
Stefan Brüns
5699e2b881 Add SOFT_PWM_DITHER to other configurations 2017-03-24 05:02:24 -05:00
Scott Lahteine
5a2abeca78 Merge pull request #6100 from thinkyhead/rc_soft_pwm_dither
Enhancement of PWM, with dithering
2017-03-24 04:57:40 -05:00
Scott Lahteine
043be2856b Use "& 0x3F" instead of "% 64" 2017-03-24 04:13:50 -05:00
Stefan Brüns
6a040a6967 SOFT_PWM: Do not switch off heaters twice on pwm_count wraparound
After wraparound, pwm_count <= pwm_mask holds, thus soft_pwm_X <= pwm_count
guarantees soft_pwm_X < pwm_mask is true, and the heater will be switched
off in the first branch.
Do not evaluate the pwm conditions a second time, this reduces the
instruction count (4 instructions per PWM) and text size (6 byte).

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2017-03-24 04:13:50 -05:00
Stefan Brüns
0a74774af1 soft_pwm: avoid useless refetches of pwm_count
The compiler is not able to reuse the value of pwm_count, but reloads it
on every evaluation, if is stored in a static variable, as it cannot prove
it will be unchanged. A variable with local scope may not be modified from
the outside, so its value can be reused.
Doing so reduces text size and instruction count.

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2017-03-24 04:13:50 -05:00
Stefan Brüns
35a55d5757 SOFT_PWM: Implement dithering if SOFT_PWM_SCALE is 1 or more
If dithering is enabled, the remainder of the soft_pwm_X duty value at
turnoff time is added to the next cycle. If e.g. the duty is set to 9 and
SCALE is set to 2, the PWM will be active for 8 counts for 3 cycles and
12 counts on each fourth cycle, i.e. the average is 9 cycles.

This compensates the resolution loss at higher scales and allows running
fans with SOFT_PWM with significantly reduced noise.

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2017-03-24 04:13:36 -05:00
Stefan Brüns
2aed66a955 temperature: Fix SOFT_PWM off by one
A 128 step PWM has 127 intervals (0/127 ... 127/127 duty). Currently, a
PWM setting of 1/127 is active for 2/128, i.e. double the expected time,
or, in general n+1/128 instead of n/127.
Fixes issue#6003.

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2017-03-24 04:13:36 -05:00
Scott Lahteine
4433b63d7a Merge pull request #6099 from thinkyhead/rc_cleanup_ubl_1
Patch till UBL is integrated with planner-based leveling
2017-03-24 02:07:55 -05:00
Scott Lahteine
b5711a99a2 Patches to bring UBL closer to compliance 2017-03-24 01:37:52 -05:00
Scott Lahteine
d076c1b604 Apply some general cleanup to code 2017-03-24 01:37:51 -05:00
Scott Lahteine
d1e6b0e21a Reduce STEP_PULSE_CYCLES code slightly 2017-03-24 00:50:05 -05:00
Scott Lahteine
783338a0b8 Add UBL_MESH_EDIT_ENABLED to configs 2017-03-24 00:44:55 -05:00
Scott Lahteine
8d54ffbf05 Adjust vector_3 code with const, some optimization 2017-03-23 19:41:42 -05:00
Roxy-3D
8ee2612ebb The hex nibble routine can print again!
The code to print a hex nibble got broke.   SERIAL_ECHO( (char) ) isn't
suitable for its use.
2017-03-23 16:08:37 -05:00
Roxy-3D
b8e4a6970b Get UBL up and running again
All the changes to get the code into compliance with Marlin coding
standards made UBL sick.   This pretty much gets UBL back up and
running.
2017-03-23 16:08:37 -05:00
Roxy-3D
5de1da2b3c Make UBL honor the #define ENABLE_LEVELING_FADE_HEIGHT option 2017-03-23 16:08:37 -05:00
Scott Lahteine
8f9face956 Merge pull request #6088 from rafaljot/patch-3
Update Marlin_main.cpp
2017-03-23 01:51:51 -05:00
Scott Lahteine
782634b6c9 Merge pull request #6081 from Sebastianv650/MIN_STEPPER_PULSE_for_Babystepping
Add MINIMUM_STEPPER_PULSE ability to babystepping
2017-03-22 21:57:36 -05:00
Scott Lahteine
d29ab8f2a6 Merge pull request #6075 from thinkyhead/rc_cleanup_ubl_1
Additional cleanup of UBL code
2017-03-22 21:45:59 -05:00
Scott Lahteine
af2ea23e9c EXTRUDER_RUNOUT_PREVENT uses buffer_line_kinematic 2017-03-22 20:51:12 -05:00
Scott Lahteine
cd882b88db #if defined => #ifdef / PIN_EXISTS 2017-03-22 20:51:11 -05:00
Scott Lahteine
e244399766 Additional cleanup of UBL code 2017-03-22 20:51:10 -05:00
Bob-the-Kuhn
0934563b97 G38 optional double touch
Made the double touch portion a conditional compile based on the
PROBE_DOUBLE_TOUCH flag.

==============================================

Bugfix

The current G38 only stopped a move if it involved the Z axis.

Moved all the G38 code to it's own section and put it where it would
always be executed no matter what axis was moving or if the endstop was
enabled.

Also added a comment to configuration_adv to alert the user the double
tap had to be turned on.

==============================================

Change G38 back to using Z_MIN_PROBE

There's no Z_MIN endstop if Z_DUAL_ENDSTOPS is enabled and you have them
set to the top of the gantry.

G38 started out as using the Z_MIN_PROBE pin.  I don't remember why we
changed it to the Z_MIN endstop.
2017-03-22 15:08:49 -05:00
Scott Lahteine
cc3204509c UBL patch from Bob-the-Kuhn 2017-03-22 07:54:20 -05:00
Scott Lahteine
100c9bc52d Merge pull request #6079 from thinkyhead/rc_audio_feedback
Standard audio feedback. Use for settings store/load/reset
2017-03-22 07:35:57 -05:00
Scott Lahteine
b904b5ae8d Audible feedback for settings store/load/reset 2017-03-22 02:15:21 -05:00
Sebastianv650
bf57eb2447 Protect Babystepping against other ISRs
Especialy against stepper ISR.
This is even more important when a minimum pulse width is set,
increasing the runtime of a babystep.
2017-03-21 18:05:44 +01:00
Sebastianv650
80830919dc Add MINIMUM_STEPPER_PULSE ability to babystepping 2017-03-21 17:50:38 +01:00
rafaljot
6da949bbf0 Update Marlin_main.cpp
Sometimes after killing heaters are still on.
2017-03-21 15:06:01 +01:00
Roxy-3D
72f7b14e66 Make G29's Interactive Mesh Editor Work 2017-03-20 12:52:51 -05:00
Roxy-3D
3fd74b121f Get G29's Interactive Mesh Editor running
G29 P4 R O  should work now.
2017-03-20 12:52:51 -05:00
Roxy-3D
1d58558bec Spelling fix 2017-03-20 12:52:51 -05:00
Scott Lahteine
2573f4dd05 Merge pull request #6052 from thinkyhead/rc_lift_on_pause
Add PARK_HEAD_ON_PAUSE feature / M125
2017-03-20 03:36:31 -05:00
Scott Lahteine
48c6284c91 Immediate commands take precedence 2017-03-19 21:50:48 -05:00
Scott Lahteine
786fe2ba2a Include PARK_HEAD_ON_PAUSE in Travis testing 2017-03-19 18:34:58 -05:00
Roxy-3D
b3c4f71c6f Merge pull request #6071 from Roxy-3D/RCBugFix
Allow FWRETRACT with UBL Enabled
2017-03-19 16:54:57 -05:00
Roxy-3D
76c270fdf2 Allow FWRETRACT with UBL Enabled
The retraction flag in UBL's G26 was conflicting with the FWRETRACT option.

All fixed!
2017-03-19 15:43:12 -06:00
Roxy-3D
06c31daa53 Merge pull request #6070 from Roxy-3D/RCBugFix
Allow G29 P1 R to generate the mesh
2017-03-19 16:34:48 -05:00
Roxy-3D
c377c59d47 Allow G29 P1 R to generate the mesh
Fix the logic change that happened when UBL got merged.
2017-03-19 15:13:33 -06:00
Scott Lahteine
ff0dd162b7 PARK_HEAD_ON_PAUSE implementation 2017-03-19 07:27:35 -05:00
Scott Lahteine
26473cab6d Add PARK_HEAD_ON_PAUSE feature 2017-03-19 05:06:55 -05:00
Scott Lahteine
4cf51157b3 Use XYZE rather than NUM_AXIS 2017-03-19 01:14:39 -05:00
Scott Lahteine
4c7f14752a Add disable_e_steppers function 2017-03-19 01:14:39 -05:00
Scott Lahteine
8eb29f91e6 Patch filament change options and beep code 2017-03-19 01:14:39 -05:00
Scott Lahteine
56c9dfc83b Merge pull request #6066 from thinkyhead/rc_felix_fix
Update Felix config for UBL
2017-03-19 01:11:02 -05:00
Scott Lahteine
9b2b53f63a Merge pull request #6042 from thinkyhead/rc_fix_toolchange_z
Move Z last in tool-change for SWITCHING_EXTRUDER
2017-03-19 00:34:41 -05:00
Scott Lahteine
f98fb6b38e Update Felix config for UBL 2017-03-19 00:28:48 -05:00
Scott Lahteine
7cabe81373 Merge pull request #6057 from thinkyhead/rc_followup_6054
Followup 6054 with some cleanup
2017-03-18 13:49:20 -05:00
Scott Lahteine
4bca27ab89 Fix Kelvin conversion
Thanks to @ospalh -- #6056
2017-03-18 13:23:08 -05:00
Scott Lahteine
143ab8f329 Remove Roxy's personal configurations 2017-03-18 12:35:02 -05:00
Scott Lahteine
2512871a36 Patch configs UBL followup 2017-03-18 12:32:03 -05:00
Scott Lahteine
27b5666e15 Move Allen Key probe definition to the top 2017-03-18 12:27:37 -05:00
Scott Lahteine
77cf648ed3 Move menu selection past static items in 1 screen 2017-03-18 12:26:21 -05:00
Scott Lahteine
2c630a1b5c Merge pull request #6054 from thinkyhead/rc_ubl_renewal
UBL for RCBugFix — cleanup, rebase, patch
2017-03-18 12:07:57 -05:00
Scott Lahteine
0492a3a8f1 Merge pull request #6027 from Bob-the-Kuhn/add_kill_info
Message for every KILL and STOP
2017-03-18 11:49:35 -05:00
Scott Lahteine
fba22652fc Add UBL testing to Travis 2017-03-18 11:35:21 -05:00
Scott Lahteine
6618346148 Patches to work around "register spill" compiler bug 2017-03-18 11:35:21 -05:00
Scott Lahteine
be7dd90382 Add Thermistor 75: MGB18 silicon pad 2017-03-18 11:35:20 -05:00
Scott Lahteine
f890ceba9e Add 'tags' to .gitignore 2017-03-18 11:35:20 -05:00
Scott Lahteine
b0a9c82c31 Fix single-char echo and pinMode usage 2017-03-18 11:35:20 -05:00
Scott Lahteine
fb60aa3736 UBL implementation 2017-03-18 11:35:20 -05:00
Scott Lahteine
238b8fd2a3 UBL core and support files 2017-03-18 11:35:19 -05:00
Scott Lahteine
cf94688925 Univeral Bed Leveling - configuration 2017-03-18 11:35:19 -05:00
Scott Lahteine
03aa424ccb Merge pull request #6053 from thinkyhead/rc_clean
Remove extraneous whitespace
2017-03-18 03:26:45 -05:00
Scott Lahteine
af644871bf Merge pull request #6045 from thinkyhead/rc_remove_raw_kinematics
Remove delta optimization concepts… for now
2017-03-18 03:26:24 -05:00
Scott Lahteine
77491dd924 Remove extraneous whitespace 2017-03-18 03:17:39 -05:00
Scott Lahteine
ed4f9d7e1c Merge pull request #6046 from robbycandra/RCBugFix-ignore_visual_studio_files
Ignore Visual Studio Files
2017-03-17 22:25:01 -05:00
Scott Lahteine
d15f25539b Merge pull request #6031 from thinkyhead/rc_mbl_z_unhack
MBL: Disable sw endstops instead of altering Z
2017-03-17 17:20:35 -05:00
Robby Candra
0dada36e5a Ignore Visual Studio Files 2017-03-17 22:13:46 +07:00
Scott Lahteine
b865b21d32 Can't use Z fade height with DELTA 2017-03-17 08:34:47 -05:00
Scott Lahteine
1e57b0c269 Remove delta interpolation concept 2017-03-17 06:32:11 -05:00
Scott Lahteine
e46898f8e5 Remove kinematic optimizations 2017-03-17 06:30:22 -05:00
Scott Lahteine
11f1fdfab4 _lcd_level_bed_position => manual_probe_index 2017-03-17 06:05:17 -05:00
Scott Lahteine
0e410c9dfd Software endstop options as simple switches 2017-03-17 06:05:17 -05:00
Scott Lahteine
d01b915085 Implement soft_endstops_enabled for clamping 2017-03-17 06:05:17 -05:00
Scott Lahteine
e4649c9044 Add HAS_SOFTWARE_ENDSTOPS macro 2017-03-17 06:05:17 -05:00
Scott Lahteine
3e927ff204 Replace MBL Z hacking 2017-03-17 06:05:17 -05:00
Scott Lahteine
4e53124681 Merge pull request #6039 from Bob-the-Kuhn/M114-sync-with-stepper
M114 - wait for move completion before reporting position
2017-03-17 05:22:46 -05:00
Scott Lahteine
734f9ea133 Merge pull request #6040 from thinkyhead/rc_sanity_use_assert
Simplify some sanity checks with static_assert
2017-03-17 05:22:17 -05:00
Scott Lahteine
f02af83d42 Remove some extraneous spaces 2017-03-16 23:59:11 -05:00
Scott Lahteine
672e45652e Improved solution to tool-change bug 2017-03-16 23:59:10 -05:00
Scott Lahteine
23f1cfb46f Fix stuck CHDK pin as suggested in #6041 2017-03-16 21:49:39 -05:00
Scott Lahteine
0b22069e82 Merge pull request #6021 from Bob-the-Kuhn/BUG-FIX--Switching-extruder-tool-change-Z-height
Bug Fix: Switching extruder tool change leaves Z in wrong position
2017-03-16 21:15:20 -05:00
Scott Lahteine
e7e4500629 Simplify some sanity checks with static_assert 2017-03-16 16:31:34 -05:00
Bob-the-Kuhn
34ff0c3439 M114 - wait for move completion before reporting position 2017-03-16 15:10:45 -05:00
Bob-the-Kuhn
b31604a492 Message for every KILL and STOP
No more mystery halts & resets

Moved messages to language.h

Added current command to inactive timeout message
2017-03-15 21:05:11 -05:00
Roxy-3D
48925b7298 Merge pull request #6032 from Kaibob2/patch-7
Update language_de.h
2017-03-15 10:31:09 -05:00
Kai
13b44d019b Update language_de.h
Addition of missing strings to match language_en.h
2017-03-15 16:06:52 +01:00
Bob-the-Kuhn
685ed5393a Bug Fix: Switching extruder tool change leaves Z in wrong position
The tool_change function saves the current_position to the destination
array soon after starting.  Later in the switching extruder section, the
destination array is modified when moving the Z axis up & down.  A later
section of tool_change moves the head back to the “original location”
using the destination array.  This later section assumes that the
destination array hasn’t been modified.

The fix is to save the destination Z position and then restore it after
the Z movements have completed.

Going back to using the current_position array for the switching
extruder Z axis moves (and  leaving the destination array untouched)
doesn’t fix the problem.

This bug was introduced by the “Make tool_change kinematic compatible”
commit # 847429eff4 which was merged on 10
Oct 2016 as part of PR 4982.

This bug was discovered in Issue 5966.
2017-03-14 02:36:24 -05:00
Scott Lahteine
51353f8fea Merge pull request #6000 from trivalik/NoWorkspaceWarning
prevent warning with define of NO_WORKSPACE_OFFSETS
2017-03-12 00:00:51 -06:00
Scott Lahteine
54dada56a7 Merge pull request #6010 from MagoKimbra/rc_fix_bug_set_position_mm
Fix BUG set_position_mm
2017-03-12 00:00:16 -06:00
MagoKimbra
a4a9bd8bc9 Fix BUG set_position_mm
Set postion must have axis and not E_AXIS + active_extruder.
2017-03-11 14:13:39 +01:00
Trivalik
71ac6f9d42 prevent warning with define of NO_WORKSPACE_OFFSETS 2017-03-09 23:49:57 +01:00
Stefan Brüns
9ba6c051a1 Makefile: add nozzle.cpp too CXXSRC list
The file is required by the optional NOZZLE_PARK_FEATURE.

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2017-03-09 03:08:49 +01:00
Stefan Brüns
9cc8d495b8 Makefile: remove no longer existing search paths
ArduinoAddons has been removed from Marlin, remove any references to it.
Replace HARDWARE_SRC and HARDWARE_DIR with its expanded equivalents.

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2017-03-09 01:46:47 +01:00
Stefan Brüns
bf563e62c1 Makefile: add printcounter.cpp too CXXSRC list
The file is required by the optional PRINTCOUNTER feature.

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2017-03-09 01:45:54 +01:00
Stefan Brüns
ddecc1441d Makefile: Fix linker error
Instantiation of the static singleton instance thermalManager in general
requires locking, but we know its safe to do without.

Add -fno-threadsafe-statics to avoid using locking primitives, which
result in linking errors:
	undefined reference to `__cxa_guard_acquire'
	undefined reference to `__cxa_guard_release'

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2017-03-09 01:45:38 +01:00
MagoKimbra
37a26dfc09 Fix delta_angles 2017-03-08 09:23:30 +01:00
Scott Lahteine
6caf0830ae Merge pull request #5985 from thinkyhead/rc_better_endstops_init
Use SET_INPUT_PULLUP where appropriate
2017-03-08 00:08:30 -06:00
Scott Lahteine
2defb1d748 Use SET_INPUT_PULLUP where appropriate 2017-03-07 23:43:33 -06:00
Scott Lahteine
deb9d0dabd Merge pull request #5984 from thinkyhead/rc_delta_angles
Add delta_tower_angle_trim
2017-03-07 19:41:24 -06:00
Scott Lahteine
58b3e98878 Use arrays for delta tower parameters 2017-03-07 19:00:22 -06:00
Scott Lahteine
47242a40bb Apply updated changes for delta_tower_angle_trim 2017-03-07 18:15:11 -06:00
Jimmy Envall
00b6b3da79 Added support for delta tower angle corrections. 2017-03-07 16:35:58 -06:00
Scott Lahteine
7c9e2e2a1a Merge pull request #5981 from thinkyhead/rc_tmc2130_redo
TMC2130 Library: @teemuatlut replaces @makertum
2017-03-07 16:23:52 -06:00
Scott Lahteine
5a456c832a Apply TMC2130 to example configurations 2017-03-07 04:22:06 -06:00
Scott Lahteine
45f949d833 TMC2130 Library: @teemuatlut replaces @makertum 2017-03-07 04:22:06 -06:00
Scott Lahteine
33f8a8a344 Merge pull request #5973 from thinkyhead/rc_circle_pattern
Add circle pattern to nozzle clean
2017-03-06 04:47:01 -06:00
Scott Lahteine
94b3e0a483 Merge pull request #5959 from benlye/benlye-fixm48
Remove extra carriage return in M48 V1 output
2017-03-06 04:24:28 -06:00
Scott Lahteine
a9a1971295 Merge pull request #5972 from thinkyhead/rc_cooldown_before
Fix preheat menu formatting
2017-03-06 03:21:29 -06:00
Scott Lahteine
6aa81255a9 Patch and clean up "flsun" kossel. Followup to #5911. 2017-03-06 03:15:00 -06:00
Scott Lahteine
b2270b3f3e Apply prior nozzle clean update 2017-03-06 03:14:59 -06:00
Marek Pikuła
7698c5617a Added circle nozzle cleaning parameters to example configurations 2017-03-06 03:04:58 -06:00
Marek Pikuła
6836b94eea Added circle pattern for nozzle cleaning feature 2017-03-06 03:03:00 -06:00
Scott Lahteine
3b75518ef6 Merge pull request #5911 from aphex3k/flsun_kossel_mini
Configuration.h and Configuration_adv.h for the kossel mini by flsun
2017-03-06 02:26:01 -06:00
Scott Lahteine
3830778852 Apply NO_WORKSPACE_OFFSETS to lcd menu 2017-03-06 02:21:42 -06:00
Scott Lahteine
7e3aab889d Fix preheat menu formatting 2017-03-06 02:07:07 -06:00
Scott Lahteine
fea0d3f20f Endstop and temp-isr general cleanup 2017-03-06 02:07:07 -06:00
Scott Lahteine
aef08e8780 Compact some macro substitutions 2017-03-06 02:07:07 -06:00
Scott Lahteine
2f620f86d9 Merge pull request #5970 from thinkyhead/rc_cooldown_before
Preheat Hotend Only menu items
2017-03-06 01:56:05 -06:00
Scott Lahteine
02de8e6f18 Merge pull request #5957 from MagoKimbra/rc_stepper_indirection_fix
Stepper indirection fix tmc driver
2017-03-06 01:16:40 -06:00
Scott Lahteine
6c5312559c Menu item to preheat only the hotend 2017-03-06 01:14:54 -06:00
Scott Lahteine
9d0142e8ae Move Change Filament above Cooldown 2017-03-06 01:13:12 -06:00
Scott Lahteine
0c55095c5e Move Cooldown above Preheat 2017-03-06 01:13:12 -06:00
Scott Lahteine
c15c65f18a Merge pull request #5971 from thinkyhead/rc_fix_e_factors
Patch DISTINCT_E_FACTORS bug
2017-03-06 01:11:17 -06:00
Scott Lahteine
bfb0007573 Patch DISTINCT_E_FACTORS bug 2017-03-05 23:19:31 -06:00
Scott Lahteine
be98016674 Merge pull request #5963 from thinkyhead/rc_no_offsets_optim
New option: NO_WORKSPACE_OFFSETS
2017-03-05 21:46:49 -06:00
Scott Lahteine
8e89a802f7 Document PROTOCOL_VERSION 2017-03-05 04:43:46 -06:00
Scott Lahteine
87b03b16bd Use a macro for array copies 2017-03-05 04:43:46 -06:00
Scott Lahteine
e141f3a03f Optimize coordinate transformation
Pre-compute the combined position shift and home offset to save a
single float fetch-and-add per conversion. Great for delta/scara and
bed leveling.
2017-03-05 04:43:16 -06:00
Scott Lahteine
5f7e85398b Implement NO_WORKSPACE_OFFSETS 2017-03-05 04:43:15 -06:00
Scott Lahteine
05abe853f9 New option: NO_WORKSPACE_OFFSETS 2017-03-05 04:43:15 -06:00
Scott Lahteine
20addc6e32 Merge pull request #5955 from thinkyhead/rc_eeprom_fail_better
Display a message for EEPROM version mismatch
2017-03-04 17:15:07 -06:00
benlye
dead89062a Update Marlin_main.cpp
Remove unnecessary line break from M48 V1 output.
2017-03-04 17:58:10 +00:00
MagoKimbra
ae277aebc6 Stepper indirection fix tmc driver 2017-03-04 12:17:39 +01:00
Scott Lahteine
8f4e4b1995 Display a message for EEPROM version mismatch 2017-03-04 01:20:36 -06:00
Scott Lahteine
177ad245f6 Merge pull request #5953 from thinkyhead/fix_fc_e_index
Fix submenu hotend status display
2017-03-04 00:12:29 -06:00
Scott Lahteine
cea3ea772c Fix submenu hotend status display 2017-03-03 22:12:22 -06:00
Scott Lahteine
b27f69ba51 Merge pull request #5813 from thinkyhead/rc_fix_makrpanel
Fix MAKRPANEL assignments
2017-03-03 21:40:49 -06:00
Scott Lahteine
1ef6ccd919 Merge pull request #5951 from thinkyhead/rc_print_2d_array
Reduce code size (40b, or 166b with bilinear subdivision)
2017-03-03 21:27:44 -06:00
Scott Lahteine
b9b203bfb2 Merge pull request #5950 from thinkyhead/rc_cleanup_mar3
General cleanup, const usage, var naming
2017-03-03 21:25:34 -06:00
Scott Lahteine
53f5086905 Fix MAKRPANEL assignments
MAKRPANEL is a DOGLCD+ULTRA_LCD+NEWPANEL so customize its pins within
that block.
2017-03-03 21:22:21 -06:00
Scott Lahteine
98c7b682ca General cleanup, const usage, var naming 2017-03-03 20:57:49 -06:00
jes
369bfc8a1e Reduce code size (40b, or 166b with bilinear subdivision) 2017-03-03 20:36:32 -06:00
Scott Lahteine
21fb347eee Merge pull request #5948 from thinkyhead/rc_fix_status_printf
Fix "Heating..." message
2017-03-03 12:28:27 -06:00
Scott Lahteine
0d13412105 Fix "Heating..." message 2017-03-03 12:12:51 -06:00
Scott Lahteine
5065636023 Merge pull request #5934 from thinkyhead/rc_advance_ed_ratio
LIN_ADVANCE: Fixed E/D ratio option
2017-03-03 03:24:41 -06:00
Scott Lahteine
903808bb97 Merge pull request #5943 from thinkyhead/catalan_march_2017
Update Catalan language
2017-03-03 03:13:51 -06:00
divendres
75ad82baab Update Catalan language 2017-03-02 20:40:06 -06:00
Scott Lahteine
34253497d4 Babysteps code tweak
As suggested by https://github.com/MarlinFirmware/Marlin/pull/5887#issuecomment-283832163
2017-03-02 20:35:45 -06:00
Scott Lahteine
e309e980ce Merge pull request #5942 from thinkyhead/rc_cleanup_finish_5887
Clean up and finish #5887
2017-03-02 20:26:13 -06:00
Scott Lahteine
fb4aead2b1 Clean up and finish #5887 2017-03-02 20:16:29 -06:00
Scott Lahteine
b3e2bd6f29 Reduce E_D_ratio code 2017-03-02 01:00:37 -06:00
Sebastianv650
de6c40ed8f Add option to fix E/D ratio
Work around for slicers producing buggy gcode.
2017-03-02 01:00:37 -06:00
Scott Lahteine
eeb490221f Remove BEEPER_PIN override in pins_RIGIDBOARD.h
Resolves #5926. This override is no longer needed since the RAMPS LCD controller pins were fixed.
2017-03-01 18:26:29 -06:00
Roxy-3D
11e892bd84 Merge pull request #5887 from Roxy-3D/RCBugFix
Double Click of Encoder Wheel Jumps to Z-BabyStepping
2017-03-01 17:15:02 -07:00
Scott Lahteine
cbeff12f8a Merge pull request #5933 from teemuatlut/lcd_days_hours
Fix formatting of SD print time hours above one day
2017-03-01 15:44:10 -06:00
Scott Lahteine
8a4e9d08a3 Merge pull request #5931 from thinkyhead/rc_core_endstop_fix
Fix CoreYX / YZ / ZX endstop logic
2017-03-01 15:32:11 -06:00
teemuatlut
9175d16660 Fix formatting of print time hours above one day 2017-03-01 18:55:25 +02:00
Scott Lahteine
b6d9eb229f Extend Core endstop commentary 2017-03-01 10:01:50 -06:00
Bob-the-Kuhn
c5e08e8761 CoreYX/YZ/ZX needs different endstop logic than CoreXY/YZ/XZ
In the endstop testing section, add the "reverse" logic in addition to "normal" core handling.

In CoreXY/YZ/XZ steppers rotating the same direction gives X movement. Opposing directions produces Y movement.

In CoreYX/ZY/ZX this is reversed. Same = Y, Opposite = X.

----

Fixes the issue where the Y endstop was being checked when moving in the X direction, etc.
2017-03-01 09:40:24 -06:00
Scott Lahteine
05b217c0d0 Merge pull request #5930 from thinkyhead/rc_lcd_timeout_config
Make LCD_TIMEOUT_TO_STATUS configurable
2017-02-28 19:42:27 -06:00
Scott Lahteine
c759c26cca Make LCD_TIMEOUT_TO_STATUS configurable
As suggested in
https://github.com/MarlinFirmware/Marlin/issues/5570#issuecomment-283059
065
2017-02-28 19:02:50 -06:00
Michael Henke
47729918fc enable ENSURE_SMOOTH_MOVES 2017-02-27 20:42:49 -08:00
Michael Henke
330b981912 created Configuration.h and Configuration_adv.h for the kossel mini sold by flsun 2017-02-25 21:31:37 -08:00
Scott Lahteine
493e738575 Merge pull request #5910 from thinkyhead/rc_more_nozzle_wipe
Bidirectional Zig-Zag Nozzle Wipe
2017-02-25 22:03:33 -06:00
Colin Gilgenbach
48b7e0f8d8 Nozzle Wipe Vertical Zig-Zag
- Add configuration support for zigzags in either the X or Y axis, for
wipe pads significantly longer in one dimension.
- Add configuration for default number of zig-zag triangles, vs. a
magic number in `Marlin_main.cpp`.
- Update description of auto nozzle wiping to match functionality
2017-02-25 21:52:43 -06:00
Scott Lahteine
f17b81b765 Add MAPPER_C2C3 to French language 2017-02-25 18:49:00 -06:00
Roxy-3D
7e607b06eb Better comments on DOUBLE_CLICK_TIME_WINDOW 2017-02-23 13:13:57 -07:00
Scott Lahteine
f9e4717f5b Merge pull request #5892 from thinkyhead/rc_msg_heating_pstr
Use PSTR for MSG_HEATING
2017-02-22 12:26:08 -06:00
Scott Lahteine
34cba42104 Use PSTR for MSG_HEATING 2017-02-22 11:30:19 -06:00
Roxy-3D
584d147a02 fixup the indentation 2017-02-22 07:23:54 -07:00
Roxy-3D
e443e0e2a9 Fix scoping issues for double click to Z-Babystepping 2017-02-21 18:15:28 -07:00
Roxy-3D
17d1cd7c09 Double Click of Encoder Wheel Jumps to Z-BabyStepping 2017-02-21 18:08:19 -07:00
Roxy-3D
48d862377a Double Click of Encoder Wheel Jumps to Z-BabyStepping 2017-02-21 18:04:31 -07:00
Scott Lahteine
cfdc189796 Merge pull request #5856 from thinkyhead/rc_fix_bad_comment
Remove non-applicable comment on MANUAL_Z_HOME_POS
2017-02-20 17:54:30 -06:00
Scott Lahteine
2efdc72aa5 Merge pull request #5876 from thinkyhead/rc_hotend_status
Add status_printf to print messages to the lcd status line.
2017-02-20 17:29:27 -06:00
dot-bob
cd68380ce6 Add status_printf to print messages to the lcd status line.
Also add a hotend indicator to the heating message displayed on the lcd status line.
2017-02-20 15:26:54 -06:00
Scott Lahteine
012aff6823 Merge pull request #5862 from thinkyhead/rc_fix_a_thing
Finish reducing of ABL_BILINEAR_SUBDIVISION
2017-02-18 21:36:28 -06:00
Scott Lahteine
b9187020c4 Finish reducing of ABL_BILINEAR_SUBDIVISION 2017-02-18 20:01:19 -06:00
Scott Lahteine
e282b72151 Remove non-applicable comment on MANUAL_Z_HOME_POS 2017-02-18 05:14:43 -06:00
Scott Lahteine
49d562d23d Merge pull request #5855 from thinkyhead/rc_followup_5840
Apply DISTINCT_E_FACTORS to sync_from_steppers
2017-02-18 04:51:01 -06:00
Scott Lahteine
57f92a4632 Apply DISTINCT_E_FACTORS to sync_from_steppers
Followup to #5840
2017-02-18 04:36:41 -06:00
Scott Lahteine
4da8b1494b Merge pull request #5854 from thinkyhead/rc_fixup_m600
M600 cleanup and bugfix
2017-02-18 04:27:13 -06:00
Scott Lahteine
dd02dba6e6 Merge pull request #5840 from MagoKimbra/rc_fix_lin_advanced_step_to_mm
Fix steps_to_mm for active extruders
2017-02-18 04:25:53 -06:00
Scott Lahteine
6e0b3fcc08 Optimize M600 heater status LCD items 2017-02-18 04:08:00 -06:00
Scott Lahteine
44b4e116bd Commentary / style in gcode_M600 2017-02-18 04:08:00 -06:00
Scott Lahteine
561904345f Tweak config ordering for M600 2017-02-18 00:01:31 -06:00
Scott Lahteine
7fdc620ef7 Merge pull request #5850 from thinkyhead/drop_some_comments
Remove some old code comments
2017-02-17 16:45:44 -06:00
Scott Lahteine
284d6de9da Remove some old code comments 2017-02-17 15:25:56 -06:00
MagoKimbra
3685224c1a Fix steps_to_mm for active extruders 2017-02-15 21:45:39 +01:00
Scott Lahteine
babe1d211c Merge pull request #5794 from thinkyhead/rc_m600_improve
M600 wait for heatup, prevent stepper timeout, etc.
2017-02-15 05:38:06 -06:00
Scott Lahteine
4578c573fe Pause the print job timer while in M600 2017-02-15 05:29:34 -06:00
Scott Lahteine
bfe6f71794 Simplify filament_change_beep function 2017-02-15 05:29:34 -06:00
Scott Lahteine
8289ea1316 Use a short name for the filament "endstop" 2017-02-15 05:29:34 -06:00
Scott Lahteine
d9dcef8a87 Spacing, coding standards 2017-02-15 05:29:34 -06:00
Scott Lahteine
931914e679 Apply M600 updates to all configs 2017-02-15 05:29:34 -06:00
Roxy-3D
8bf0b496b9 Improve M600 with timeout, wait for heatup. 2017-02-15 05:29:34 -06:00
Scott Lahteine
58b8e0cae7 Merge pull request #5837 from thinkyhead/rc_fix_mbl_homing
Fix broken homing in MBL
2017-02-15 04:48:30 -06:00
Tannoo
c40fe2113c Fix for broken MBL
LCD call was waiting forever, causing the system to hang.
2017-02-15 04:39:22 -06:00
Scott Lahteine
4d4745c0eb Parenthesize some menu defines for safety 2017-02-14 23:12:27 -06:00
Scott Lahteine
20ef0a6e27 Merge pull request #3152 from thinkyhead/sd_alpha_sort
SD files alphabetical sort in LCD menus
2017-02-14 21:48:57 -06:00
Scott Lahteine
47f9883b0f Dynamic allocation for SDCARD_SORT_ALPHA 2017-02-14 21:37:25 -06:00
Scott Lahteine
a561bd5e3a New feature: SDCARD_SORT_ALPHA 2017-02-14 21:37:24 -06:00
Scott Lahteine
c04d6b5aa6 Merge pull request #5829 from thinkyhead/rc_fix_isr_reentry
Combine fixes for LIN_ADVANCE and temperature ISR
2017-02-14 20:36:58 -06:00
Scott Lahteine
467f01435f Merge pull request #5816 from thinkyhead/rc_abl_virt_reduce
Reduce memory use by ABL_BILINEAR_SUBDIVISION slightly
2017-02-14 08:41:44 -06:00
Scott Lahteine
97b6fb6381 Reduce / optimize LIN_ADVANCE code 2017-02-14 07:52:03 -06:00
Sebastianv650
271ced7341 Prevent re-entering of temperature ISR
If Marlin is inside the temperature ISR, the stepper ISR is enabled. If
a stepper event is now happening Marlin will proceed with the stepper
ISR. Now, at the end of the stepper ISR, the temperatre ISR gets enabled
again. While Marlin proceed the rest of the temperature ISR, it's now
vulnerable to a second ISR call.
2017-02-14 07:52:03 -06:00
Sebastianv650
1b59766fcb Cleanup position_float
Hopefully fixes Marlin #5481
2017-02-12 13:09:06 +01:00
Scott Lahteine
a950c31e2d Merge pull request #5815 from thinkyhead/rc_pulses_per_step
Give encoder pulse/steps conditionals their own block
2017-02-12 04:14:00 -06:00
Scott Lahteine
7176de8605 Merge pull request #5814 from thinkyhead/hotend_loop_always
Make HOTEND_LOOP more consistent, let compiler optimize it
2017-02-12 04:13:14 -06:00
Scott Lahteine
adec219ca5 Merge pull request #5811 from thinkyhead/fix_two_strings
No space after X: or A: in M114 output
2017-02-12 04:11:51 -06:00
jes
eaa829b58c Reduce memory use by ABL_BILINEAR_SUBDIVISION slightly 2017-02-12 04:09:48 -06:00
Scott Lahteine
1c99ca82d8 Give encoder pulse/steps conditionals their own block 2017-02-12 03:57:57 -06:00
Scott Lahteine
e44294bb4d Make HOTEND_LOOP more consistent, let compiler optimize it 2017-02-12 02:50:38 -06:00
Scott Lahteine
701f4a6d9d Merge pull request #5729 from Bob-the-Kuhn/guaranteed-BLTouch-detection
guaranteed BLTouch detection
2017-02-12 01:13:35 -06:00
Scott Lahteine
c15b9a6a06 No space after X: or A: in M114 output 2017-02-12 00:10:03 -06:00
Scott Lahteine
e1702816f6 Fix SD_CHECK_AND_RETRY condition
Addressing #5806
2017-02-11 23:55:56 -06:00
Scott Lahteine
c64ecf95e2 Merge pull request #5808 from thinkyhead/rc_delta_float_radius
Cast DELTA_PRINTABLE_RADIUS to float in sq()
2017-02-11 23:43:46 -06:00
Scott Lahteine
1bc5be3bdf Cast DELTA_PRINTABLE_RADIUS to float in sq()
Addressing #5625
2017-02-11 23:28:39 -06:00
Bob-the-Kuhn
0369f97ec1 guaranteed BLTouch detection
To guarantee that the 5mS pulse from a BLTouch is recognized you need to
have the endstops.update() routine run twice in that 5mS period.

At 200 steps per mm, my system has problems  below a feedrate of 120 mm
per minute.

Two things were done to guarantee the two updates within 5mS:
1) In interrupt mode, a check was added to the temperature ISR.  If the
endstop interrupt flag/counter is active then it'll kick off the endstop
update routine every 1mS until the flag/counter is zero.  This
flag/counter is decremented by the temperature ISR AND by the stepper
ISR.

2) In poling mode, code was added to the stepper ISR that will make sure
the ISR runs about every 1.5mS.  The "extra" ISR runs only check the
endstops.  This was done by grabbing the intended ISR delay and, if it's
over 2.0mS, splitting the intended delay into multiple smaller delays.
The first delay can be up to 2.0mS, the next ones 1.5mS (as needed) and
the last no less than 0.5mS.

=========================================

BLTouch error state recovery

If BLTouch already active when deploying the probe then try to reset it
& clear the probe.

If that doesn't fix it then declare an error.

Also added BLTouch init routine to startup section
2017-02-11 12:01:34 -06:00
Scott Lahteine
1e4d4e5915 Fix typo in language_uk
Thanks to @pavlus for this one
2017-02-10 15:34:31 -06:00
Scott Lahteine
7fe7a0c8be Merge pull request #5793 from thinkyhead/rc_adjust_probe_output
Adjust probe_pt() terminal output to respect probe z-offset
2017-02-09 23:05:02 -06:00
Scott Lahteine
633c253bc1 Merge pull request #5792 from thinkyhead/rc_default_dac_vals
Default DAC values for RigidBoard V2
2017-02-09 22:56:03 -06:00
Florian Heilmann
7bbc31704c Adjust probe_pt() terminal output to respect probe z-offset 2017-02-09 22:54:22 -06:00
Scott Lahteine
6dac1fe07e Merge pull request #5701 from tohara/RCBugFixCmake
Updated CMakeLists
2017-02-09 22:45:05 -06:00
Scott Lahteine
a245656db3 Merge pull request #5713 from gege2b/RCBF-French
French translation : Added missing strings as well as missing accents
2017-02-09 22:43:56 -06:00
jaysonkelly
713931338a Default DAC values for RigidBoard V2 2017-02-09 22:39:00 -06:00
Scott Lahteine
fb11e52cd2 Merge pull request #5787 from thinkyhead/rc_bob_pins_added
pinsDebug for 644/1284 & USB646/1286 families
2017-02-09 15:07:55 -06:00
Bob-the-Kuhn
ae706233a8 pinsDebug for 644/1284 & USB646/1286 families
added conditional compilation for PWMs 1C & 3C

add Teensyduino compatibility

==========================================

changes per review - minor formatting changes

1) remove non-printable character at the end of line 687

2) split a really long comment into two lines

3) got rid of some trailing spaces

============================================

Made pinsDebug_Teensyduino.h the same between this PR and PR 5668 which
is for a re-written pinsDebug.h file.

The changes were:
1) added copyright @ GNU license header
2) a blank line crept in.
2017-02-09 07:24:02 -06:00
Gege2B
22dfcc9a71 French translation : Added missing strings as well as missing accents 2017-01-17 23:29:23 +01:00
Tom Haraldseid
1d65b4b316 Updated CMakeLists 2017-01-15 13:39:26 +08:00
Scott Lahteine
9b5515926a Merge pull request #5696 from thinkyhead/rc_volumetric_default
Allow enabling volumetric filament on config load
2017-01-14 05:48:51 -08:00
Robert Kirk
0d147ead66 Allow enabling volumetric filament on config load 2017-01-14 04:37:49 -08:00
Scott Lahteine
d3cb1a86be Merge pull request #5691 from AnHardt/fix5677
Fix M110 without leading N
2017-01-14 03:22:26 -08:00
AnHardt
fa26767efe Replace all remaining 'boolean' with 'bool' 2017-01-13 13:03:52 +01:00
AnHardt
f6858d9974 Fix M110 without leading N
Store N in the right variable.
This is too rarely used.

"mea culpa, mea culpa, mea maxima culpa"
2017-01-13 12:33:50 +01:00
Scott Lahteine
0c0c840ba8 Merge pull request #5683 from emartinez167/EMartinez-Changes
Updates to some incorrectly ended strings in the Spanish translation
2017-01-12 07:49:15 -08:00
Scott Lahteine
738b87091a Merge pull request #5684 from Kaibob2/patch-6
Update language_de.h
2017-01-12 07:48:41 -08:00
Kai
25dae3bccc Update language_de.h
Small corrections
2017-01-12 16:06:58 +01:00
emartinez167
7292145f4e Fix for some wrong strings
On last commit, some strings were ended with the incorrect character.
This fixes it.
2017-01-12 22:35:04 +08:00
emartinez167
3dee35888e Merge remote-tracking branch 'MarlinFirmware/RCBugFix' into EMartinez-Changes 2017-01-12 22:22:52 +08:00
Scott Lahteine
93a9aa6b76 Merge pull request #5682 from thinkyhead/rc_spanish_jan
Updates to Spanish language
2017-01-12 06:14:10 -08:00
Scott Lahteine
7a9c1a279b Merge pull request #5681 from thinkyhead/rc_prevent_boot_loop
Reset watchdog in SD init to prevent reboot
2017-01-12 06:13:56 -08:00
Scott Lahteine
e409c7f9e8 Merge pull request #5645 from esenapaj/From-microseconds-to-milliseconds
From "microseconds" to "milliseconds"
2017-01-12 06:02:55 -08:00
emartinez167
020c6af7b0 Updates to Spanish language
Add missing Spanish language definitions.
2017-01-12 05:53:39 -08:00
Hans Raaf
d29cc8f7bc Reset watchdog in SD init to prevent reboot
If the watchdog is enabled and bootscreen + SD card checks take too long, Marlin may hang at boot time because of the reset loop. We have this happen all the time with the Anet board if no SD card is inserted.
2017-01-12 05:33:38 -08:00
Scott Lahteine
7743849608 Merge pull request #5680 from thinkyhead/rc_configs_puhlease
code_value_float tweak
2017-01-12 05:22:47 -08:00
Scott Lahteine
16357fbfdf Merge pull request #5619 from Ocarthon/RCBugFix
Disable SD Detect for K8400
2017-01-12 05:22:03 -08:00
Scott Lahteine
e57c0fce66 Move MOSFET changes above #include for RIGIDBOARD
Correction to #5629
2017-01-12 04:46:49 -08:00
Scott Lahteine
c376f6a2cb code_value_float tweak 2017-01-12 04:38:09 -08:00
Scott Lahteine
fb3c30e24c Fix lcd_wait_for_homing causing menu to block
As a showcase function for how to do waiting in the lcd menu, this function should be preserved.
2017-01-12 04:37:23 -08:00
Scott Lahteine
f8ae0fd29f Merge pull request #5647 from manianac/RCBugFix-PrepareMenuFix
Fix empty Prepare menu
2017-01-12 04:20:18 -08:00
Robert Kirk
aab5118c6a Remove error causing break command
Use index macro instead of e
2017-01-01 17:47:01 -05:00
esenapaj
d38e335272 From "microseconds" to "milliseconds"
delay() is milliseconds
2017-01-02 01:19:33 +09:00
Scott Lahteine
34d5eb5201 Merge pull request #5589 from thinkyhead/rc_configs_puhlease
Better sanity check for FILAMENT_CHANGE_FEATURE, FILAMENT_RUNOUT_SCRIPT
2016-12-30 04:56:30 -08:00
emartinez167
a2fe24f319 Fix some errors and update a message 2016-12-29 23:34:42 +08:00
Philip Standt
8ae2bc7e2e Disable SD Detect for K8400 2016-12-28 23:21:18 +01:00
emartinez167
0844da794d Updates to Spanish language
Add missing Spanish language definitions.
2016-12-24 22:11:14 +08:00
Scott Lahteine
4061fca1ad Sanity checks for FILAMENT_CHANGE_FEATURE and FILAMENT_RUNOUT_SCRIPT 2016-12-23 19:55:12 -08:00
Scott Lahteine
5ab7b91615 Comment on filament runout sensor config 2016-12-23 19:50:27 -08:00
Scott Lahteine
922c67f17d Merge pull request #5588 from thinkyhead/rc_remove_biv25
Drop biv2.5 delta configurations
2016-12-23 19:14:50 -08:00
Scott Lahteine
78459d5de1 Merge pull request #5587 from thinkyhead/rc_never
Define ADV_NEVER, ADV_RATE
2016-12-23 19:00:57 -08:00
Scott Lahteine
8c6c048551 drop biv2.5 delta configurations 2016-12-23 18:56:07 -08:00
Scott Lahteine
92dbeebf40 Define ADV_NEVER, ADV_RATE 2016-12-23 18:43:23 -08:00
Scott Lahteine
71378f72af Merge pull request #5577 from manianac/RCBugFix-M600Dryrun
Allow M600 when dryrun debugging
2016-12-22 19:07:05 -08:00
Robert Kirk
306c184b1a Allow M600 when dryrun debugging 2016-12-21 20:30:51 -05:00
Scott Lahteine
fe2ea2906f Merge pull request #5573 from thinkyhead/rc_unify_stepper_isr
LIN_ADVANCE with unified stepper ISR
2016-12-21 02:53:32 -08:00
Sebastianv650
84c685f8b5 First draft of Unified Stepper / E Advance ISR 2016-12-21 01:34:39 -08:00
Scott Lahteine
83021d82c6 Merge pull request #5502 from AnHardt/symbol-strings
Add symbol-strings
2016-12-21 00:51:59 -08:00
Scott Lahteine
036eccfd6e Merge pull request #5572 from Kaibob2/patch-5
Update language_de.h
2016-12-21 00:50:40 -08:00
Scott Lahteine
b794b76836 Merge pull request #5567 from AnHardt/fix5194
Fix 5194
2016-12-21 00:49:52 -08:00
Scott Lahteine
451ba5df01 Merge pull request #5516 from esenapaj/Suppress-warning
Suppress warning
2016-12-21 00:00:35 -08:00
Scott Lahteine
92dbc63949 Merge pull request #5571 from esenapaj/Update-Japanese-translation
Update Japanese translation
2016-12-20 23:59:55 -08:00
Kai
ade72535c4 Update language_de.h
Added tarnslation for
```
#define MSG_DEBUG_MENU 
#define MSG_PROGRESS_BAR_TEST
```
2016-12-21 08:57:39 +01:00
Scott Lahteine
06153add6b Merge pull request #5565 from thinkyhead/rc_negative_retract_in_menu
Followup to #5550 - spacing before "mm"
2016-12-20 18:42:37 -08:00
esenapaj
ab6b005867 Suppress warning 2016-12-21 09:13:03 +09:00
AnHardt
61f15ef7e7 Fix 5194
I have been a bit too radical in cleaning up this section.
2016-12-21 00:45:29 +01:00
esenapaj
60515ff700 Update Japanese translation
・Add new translation
2016-12-21 08:44:07 +09:00
Scott Lahteine
1e419655f3 Followup to #5550 - spacing before "mm" 2016-12-20 02:27:54 -08:00
Scott Lahteine
1a26ce1cdc Merge pull request #5550 from FHeilmann/patch-2
Allow negative retract values in the LCD
2016-12-20 02:10:22 -08:00
Scott Lahteine
bec30c89e7 Merge pull request #5522 from esenapaj/Add-description-for-dual-x
Add description for choice of DEFAULT_DUAL_X_CARRIAGE_MODE
2016-12-20 01:31:53 -08:00
Florian Heilmann
780dabf32b Merge pull request #8 from thinkyhead/rc_negative_retract_in_menu
Replace "+mm" with "mm." Allow negative recover-swap length.
2016-12-20 10:31:07 +01:00
Scott Lahteine
7739c0affa Change "+mm" to "mm" in most languages
- Japanese and Chinese still need update
2016-12-20 01:16:51 -08:00
Scott Lahteine
1cba425308 Allow negative recover-swap length from LCD 2016-12-20 01:16:08 -08:00
Scott Lahteine
298a8c6a3c Merge pull request #5561 from thinkyhead/rc_no_case_light
Support for M335 case light "no case light"
2016-12-20 01:06:59 -08:00
Scott Lahteine
644f45cbd8 Merge pull request #5563 from akaJes/m600
FILAMENT_CHANGE_FEATURE allowed in idle mode
2016-12-20 01:06:10 -08:00
Scott Lahteine
4213330d22 Merge pull request #5562 from thinkyhead/rc_char_lcd_tweaks
Fix various LCD-related issues
2016-12-20 01:03:38 -08:00
Scott Lahteine
0d2fc13516 Place "Level Bed" closer to "Auto Home" 2016-12-20 00:51:03 -08:00
Scott Lahteine
b031d28ebf Encoder events should not skip stripes 2016-12-20 00:21:51 -08:00
Scott Lahteine
22881f38b9 Fix updating of "bool" menu items 2016-12-20 00:21:51 -08:00
Scott Lahteine
eb68715b94 No "Cooldown" menu if heaters are off 2016-12-20 00:21:51 -08:00
Jesus
4ed976b5ff m600 fixes 2016-12-20 09:47:46 +02:00
Damien
4e2639942b Support for M335 case light "no case light" 2016-12-19 23:23:08 -08:00
Scott Lahteine
18ba31e9b5 Add Debug Menu with LCD_PROGRESS_BAR_TEST as an example 2016-12-19 22:57:14 -08:00
Scott Lahteine
03af5961b0 Hide (or remove) custom character change on boot screen 2016-12-19 22:27:28 -08:00
Scott Lahteine
1642f5ed31 Add macro to some en strings 2016-12-19 22:27:28 -08:00
Scott Lahteine
dbb2d56c89 Correct comment on watchdog timer 2016-12-19 22:27:28 -08:00
Scott Lahteine
41a30923f3 Merge pull request #5559 from thinkyhead/rc_minimum_gcc_version
Throw an error for gcc before 4.7
2016-12-19 19:50:44 -08:00
Scott Lahteine
04f77df6c0 Merge pull request #5560 from thinkyhead/rc_bl_status
Have bed leveling status output current status, not requested.
2016-12-19 19:18:06 -08:00
Scott Lahteine
6d6a1db6ec Apply const to _EEPROM_writeData value param 2016-12-19 18:50:43 -08:00
Robert Kirk
f724ef5820 Have bed leveling status output current status, not requested. 2016-12-19 18:47:45 -08:00
Scott Lahteine
20218e553d Merge pull request #5527 from MagoKimbra/rc_configuration_store_fix_size
Fix size
2016-12-19 18:47:28 -08:00
Scott Lahteine
dcfbe2bd3c Throw an error for gcc before 4.7 2016-12-19 18:30:51 -08:00
Scott Lahteine
82fde7df2e Merge pull request #5512 from AnHardt/speed-compare-bbr
Optimize handling of block_buffer_runtime()
2016-12-19 18:21:06 -08:00
Scott Lahteine
64a44f697c Merge pull request #5557 from thinkyhead/rc_thermistor_breakup
Split up thermistor tables
2016-12-19 15:01:18 -08:00
Scott Lahteine
8986225752 Spacing, cleanup in speed_lookuptable.h 2016-12-19 14:52:45 -08:00
Scott Lahteine
e12c8e5cac Split up thermistor tables 2016-12-19 14:47:54 -08:00
Florian Heilmann
a7334fd2a0 Allow negative retract values in the LCD
This can already be done via G-Code, so adding the capability to the LCD should be straight forward.
2016-12-19 14:19:06 +01:00
AnHardt
292eb365c6 Optimize handling of block_buffer_runtime()
millis_t is long - divisions take for ever.

Return a kind of millisecond instead of microsecond -
divided by 1024 instead of 1000 for speed. (2.4% error)

That does not matter because block_buffer_runtime is
already a too short estimation.
Shrink the return-type.
2016-12-19 11:47:28 +01:00
esenapaj
6854f44bf2 Add description for choice of DEFAULT_DUAL_X_CARRIAGE_MODE 2016-12-19 02:21:10 +09:00
Scott Lahteine
3f6f036f7c Merge pull request #5524 from thinkyhead/rc_optional_dogm_splitup
Report EEPROM data size, not final index
2016-12-16 18:55:48 -08:00
MagoKimbra
86ba7e4542 Fix size
Fix size for writeData and readData.
For bilinear grid 11 x 11 for example, size is 4 (float) x 11 x 11 = 484. uint8_t max is 255.
2016-12-16 14:49:33 +01:00
Scott Lahteine
f9f75c8016 Fix USE_RAW_KINEMATICS in prepare_kinematic_move_to 2016-12-15 23:15:38 -08:00
Scott Lahteine
87921f390a Clarify what are "logical" positions in the planner 2016-12-15 23:15:38 -08:00
Scott Lahteine
a4f10f59c3 Write the E parameter length correctly 2016-12-15 23:15:38 -08:00
Scott Lahteine
2e904cb4f9 Merge pull request #5514 from esenapaj/Update-Japanese-translation
Update Japanese translation
2016-12-15 21:38:40 -08:00
Scott Lahteine
0b6817e0f9 Merge pull request #5505 from android444/patch-4
Update for translations language_pl.h
2016-12-15 21:38:18 -08:00
Scott Lahteine
3bd76f60e4 Report EEPROM data size, not final index 2016-12-15 20:26:28 -08:00
Scott Lahteine
78d6d6e076 Merge pull request #5452 from thinkyhead/rc_save_your_mesh
Save Bed Leveling to EEPROM
2016-12-15 20:23:01 -08:00
Scott Lahteine
0d0aa6c20d Patch type for max_acceleration_mm_per_s2 save/restore 2016-12-15 20:05:42 -08:00
Scott Lahteine
d4f5418802 Merge pull request #5517 from esenapaj/Fix-for-PR-#5255
Fix for the PR #5255 (Case light menu (3rd attempt))
2016-12-15 20:01:22 -08:00
Scott Lahteine
fa7010b0a1 Merge pull request #5515 from esenapaj/Remove-unnecessary-tabs-and-spaces
Remove unnecessary tabs and spaces
2016-12-15 19:58:32 -08:00
Scott Lahteine
6d7b1cdf6c Add M421 for ABL Bilinear 2016-12-15 19:39:11 -08:00
Scott Lahteine
32e65dc429 Extend M420 to print state and, with V, the matrix / mesh 2016-12-15 19:39:11 -08:00
Scott Lahteine
d04258753b Don't throw away the bed level matrix on G28 2016-12-15 19:21:18 -08:00
Scott Lahteine
8f0f225d10 Save ABL Planar Matrix to EEPROM 2016-12-15 19:21:15 -08:00
Scott Lahteine
e2429a9da1 Generalize Bed Leveling flag in EEPROM 2016-12-15 19:20:52 -08:00
Scott Lahteine
e42fd7813a Save ABL Bilinear Grid to EEPROM 2016-12-15 19:20:48 -08:00
Scott Lahteine
492b68f8e3 Better EEPROM read/write error handling 2016-12-15 19:08:44 -08:00
Scott Lahteine
55722c09da Use "UNPROBED" for un-probed bed_level_grid points 2016-12-15 19:08:44 -08:00
Scott Lahteine
2643404ac8 Throw an error in M420 if can't enable 2016-12-15 19:08:43 -08:00
Scott Lahteine
b1539394fd Use planner.unapply_leveling to undo tilt in G29 2016-12-15 19:08:43 -08:00
Scott Lahteine
04636f78eb Re-enable MBL/ABL after M48 2016-12-15 19:08:43 -08:00
Scott Lahteine
9b41638672 Minor tweak to G29 grid points 2016-12-15 19:08:42 -08:00
Scott Lahteine
daa2cad21f Fix comment on G29 to include 'Z' 2016-12-15 19:08:42 -08:00
Scott Lahteine
8244fefcc2 Tweak call to reset_bed_level in G29 2016-12-15 19:08:42 -08:00
Scott Lahteine
0995a5d734 Fixup reset_bed_level 2016-12-15 19:08:42 -08:00
Scott Lahteine
1b2fb2bdc7 ABL_GRID_POINTS_* => ABL_GRID_MAX_POINTS_* 2016-12-15 19:08:41 -08:00
Scott Lahteine
b091c9ceb7 Merge pull request #5520 from esenapaj/Fix-for-commented-section
Fix for commented section of Config_RetrieveSettings()
2016-12-15 18:16:30 -08:00
esenapaj
d486361c69 Fix for commented section of Config_RetrieveSettings() 2016-12-16 04:34:47 +09:00
esenapaj
88157ba529 Fix for the PR #5255 (Case light menu (3rd attempt)) 2016-12-16 00:57:32 +09:00
esenapaj
069c6b38dd Remove unnecessary tabs and spaces 2016-12-16 00:21:32 +09:00
esenapaj
9c8116aedf Update Japanese translation
・Add new translation
2016-12-16 00:06:58 +09:00
AnHardt
57b1275cde Add symbol-string to _de
Add symbol-string for _de
to reduce the frquencey of regenerating 'mappers' and 'fonts'
with the new utf-system.
2016-12-15 14:37:18 +01:00
android444
3363d2c937 Update for translations language_pl.h 2016-12-14 17:32:33 +01:00
Scott Lahteine
7ca4f16a5c Merge pull request #5430 from thinkyhead/rc_optional_dogm_splitup
Move Hollow Frame options to config-adv
2016-12-14 04:55:15 -08:00
Scott Lahteine
06af3b62ba Move HOLLOW_FRAME options to config_adv 2016-12-14 04:31:27 -08:00
Scott Lahteine
67ca6c7bfe Codestyle tweaks to ultralcd.cpp 2016-12-14 04:20:33 -08:00
Scott Lahteine
8d9fcd8e6f Merge pull request #5495 from AnHardt/autoadjusting_display-updates
Adaptive screen updates for all kinds of displays
2016-12-14 04:16:26 -08:00
Scott Lahteine
77a360912d Merge pull request #5491 from yhfudev/devel-rcbugfix-language-headers
UTF-8 language header files
2016-12-14 02:23:09 -08:00
Scott Lahteine
efb8b8425c Merge pull request #5493 from thinkyhead/rc_fix_recover_unhop
Prevent retract un-hop at wrong height
2016-12-14 02:20:08 -08:00
AnHardt
d0e24e0876 Adaptive screen updates for all kinds of displays
The target here is to update the screens of graphical and char base
displays as fast as possible, without draining the planner buffer too much.

For that measure the time it takes to draw and transfer one
(partial) screen to the display. Build a max. value from that.
Because ther can be large differences, depending on how much the display
updates are interrupted, the max value is decreased by one ms/s. This way
it can shrink again.
On the other side we keep track on how much time it takes to empty the
planner buffer.
Now we draw the next (partial) display update only then, when we do not
drain the planner buffer to much. We draw only when the time in the
buffer is two times larger than a update takes, or the buffer is empty anyway.

When we have begun to draw a screen we do not wait until the next 100ms
time slot comes. We draw the next partial screen as fast as possible, but
give the system a chance to refill the buffers a bit.

When we see, during drawing a screen, the screen contend has changed,
we stop the current draw and begin to draw the new content from the top.
2016-12-13 18:44:34 +01:00
yhfudev
2dbd38ce16 tag the utf-8 strings 2016-12-13 11:54:35 -05:00
Scott Lahteine
94ffb58da7 Prevent retract un-hop at wrong height 2016-12-13 08:24:12 -08:00
Scott Lahteine
0772c8e55f Merge pull request #5487 from thinkyhead/rc_easier_move_axis
Rearrange Move Menu, Fix up Delta Calibration
2016-12-13 07:07:05 -08:00
Scott Lahteine
b2c8de856b Merge pull request #5478 from AnHardt/stepspermm
Replace ftostr62sign with ftostr62rj
2016-12-13 07:05:42 -08:00
Scott Lahteine
1fd8185d37 Merge pull request #5492 from thinkyhead/rc_fix_language_es
Fix multiple definitions of message macros in the language-es.h
2016-12-13 06:57:52 -08:00
yhfudev
1cdffdede7 fix multiple definitions of message macros in the language-es.h 2016-12-13 06:48:38 -08:00
Scott Lahteine
b67f8cb499 Merge pull request #5490 from jbrazio/update-bqhp2
Update the bq Hephestos 2 example configuration
2016-12-13 05:04:24 -08:00
Scott Lahteine
93b2833347 Move Menu: Select axis first, resolution after 2016-12-13 03:11:14 -08:00
Scott Lahteine
48aa0f6475 Merge pull request #5475 from AnHardt/utf-mapper-tr
utf8-mapper for Turkish
2016-12-13 03:03:22 -08:00
Scott Lahteine
b9ee0d7bd3 Merge pull request #5488 from thinkyhead/rc_fade_compiler_warn
Patch fade_factor compiler warning
2016-12-13 03:00:47 -08:00
Scott Lahteine
641e0936d4 Patch up Delta Calibration Menu 2016-12-13 02:42:28 -08:00
Scott Lahteine
b4dbf4d18a Non-reentrant "Moving..." screen to safely wait in LCD 2016-12-13 02:42:27 -08:00
Scott Lahteine
7b625e0048 Patch fade_factor compiler warning 2016-12-13 02:29:01 -08:00
Scott Lahteine
6fa8fd15e2 Add negative temperatures for Thermistor 1
Changes from #5485 by @AndKe
2016-12-13 02:06:16 -08:00
Scott Lahteine
2b5d424394 Use handle_reprapworld_keypad for keypad handling 2016-12-13 01:41:08 -08:00
Scott Lahteine
887ed73c9b Expose delta_clip_start_height for use by others 2016-12-13 01:41:08 -08:00
João Brázio
3f75edb1d6 Updated bq Hephestos 2 example configuration 2016-12-13 09:26:07 +00:00
Scott Lahteine
6080ac566a Merge pull request #5483 from thinkyhead/rc_aragonese_fixup
Update Aragonese translation
2016-12-12 18:26:07 -08:00
Daniel Martinez
b796e7031d Update Aragonese translation 2016-12-12 17:36:33 -08:00
AnHardt
cd2b74e88d Replace ftostr62sign with ftostr62rj
`ftostr62sign()` is used only when displaing/editing
Steps/mm. A sign is not needed - the value is always positive.
Because the number part is long there is no't much place for the values name.
With this PR the is one more char for the name possible.
2016-12-12 20:25:20 +01:00
AnHardt
795541f87e utf8-mapper for Turkish
The non utf8 version of turkish is a bit unhandy.

Delete `language_tr.h`
Rename `language_tr_utf.h` to `language_tr.h`
Provide a propper utf8-mapper for Turkish and use it.
2016-12-12 15:56:59 +01:00
Scott Lahteine
7c71bb2900 Merge pull request #5471 from thinkyhead/rc_planner_report_m503
Patch to show E factors in M503
2016-12-11 17:47:41 -08:00
Scott Lahteine
39401b7472 Patch to show E factors in M503 2016-12-11 17:37:29 -08:00
Scott Lahteine
6b50230022 Merge pull request #5447 from thinkyhead/rc_update_dutch
Dutch cleanup, ordering, placeholders
2016-12-10 22:13:20 -08:00
Scott Lahteine
2c97c11731 Merge pull request #5454 from thinkyhead/rc_fix_delta_g29
Fix G29 starting height on DELTA
2016-12-10 22:10:33 -08:00
Scott Lahteine
8239c45b30 Merge pull request #5448 from thinkyhead/rc_eeprom_bump
EEPROM: Prolong life. Better support for `DISTINCT_E_FACTORS`.
2016-12-10 22:06:00 -08:00
Scott Lahteine
21ed43df5f New Dutch terms 2016-12-10 21:59:45 -08:00
Scott Lahteine
4bc6536f54 Move to safe zone on DELTA if using do_blocking_move_to* 2016-12-10 21:28:24 -08:00
Scott Lahteine
6f389158d7 Compile less code with EEPROM off 2016-12-09 06:05:32 -08:00
Scott Lahteine
f2301a2a04 Add e-stepper count to EEPROM (for planner vars) 2016-12-09 06:05:31 -08:00
Scott Lahteine
53c9fca0f6 Only write to EEPROM when a byte changes 2016-12-09 06:05:31 -08:00
Scott Lahteine
72fe995c42 Merge pull request #5449 from AnHardt/volatile-bbru
Make block_buffer_runtime_us volatile
2016-12-09 05:57:45 -08:00
AnHardt
13eebd11cf volatile_block_buffer_runtime_us
`block_buffer_runtime_us` is mangled in the planner and in the stepper-ISR.
So it needs to be volatile and interrupt protected.
2016-12-09 14:49:02 +01:00
Scott Lahteine
8383f35b40 Merge pull request #5445 from thinkyhead/rc_reduce_jerk_code
Slightly shrink jerk and advance code
2016-12-09 02:54:03 -08:00
Scott Lahteine
52f8924f6e Merge pull request #5446 from gege2b/RCBugFix-french
Update french translation (LIGHTS str)
2016-12-09 02:49:32 -08:00
Gege2B
40453c1b9a Update french translation (LIGHTS str) 2016-12-09 11:18:29 +01:00
Scott Lahteine
fc2fc828b3 Prettify LIN_ADVANCE code with the positive condition 2016-12-09 00:29:07 -08:00
Scott Lahteine
1929502e15 Add const to some variables 2016-12-09 00:29:06 -08:00
Scott Lahteine
2da4d22520 Pretty up ADVANCE code 2016-12-08 22:51:28 -08:00
Scott Lahteine
af024e1d7c Pretty up coast / reverse jerk code 2016-12-08 22:50:25 -08:00
Scott Lahteine
3f3b5c86d8 Slightly shrink code for jerk-based reduction of safe_speed 2016-12-08 22:24:29 -08:00
Scott Lahteine
dfdb180db4 Merge pull request #5440 from AnHardt/simplify-long_move
Simplify long_move()
2016-12-08 18:03:20 -08:00
AnHardt
87fe20b5f5 Simplify long_move()
We are not really interested in, if there are blocks.
All information we need is in `block_buffer_runtime_us`.
2016-12-09 00:13:35 +01:00
Scott Lahteine
574d9c7d3d Merge pull request #5432 from Kaibob2/patch-2
Update language_de.h
2016-12-08 13:14:04 -08:00
Scott Lahteine
f089279263 Merge pull request #5431 from esenapaj/Suppress-warnings,-etc
Suppress warnings, etc
2016-12-08 13:10:12 -08:00
Scott Lahteine
d92ccb230c Merge pull request #5438 from AnHardt/patch-long_move
Patch long_move()
2016-12-08 13:08:36 -08:00
Scott Lahteine
a1e0842c8b Merge pull request #5436 from esenapaj/Remove-redundant-E,-etc-plan-B
Remove redundant "E", etc plan B
2016-12-08 13:06:07 -08:00
AnHardt
706b240251 Patch long_move()
While the last move in the planner_buffer is running
it's duration is already subtracted from block_buffer_runtime_us.
2016-12-08 21:03:26 +01:00
esenapaj
a298a58684 Remove redundant "E" 2016-12-09 02:27:34 +09:00
Kai
390a6d976a Update language_de.h
#define MSG_ENDSTOP_ABORT  doesn't fit in Display 
See https://github.com/MarlinFirmware/Marlin/issues/5401#issuecomment-265714487
2016-12-08 12:18:19 +01:00
esenapaj
e9393c3634 Suppress warnings, etc
・Suppress warnings
・Remove unused variable "did_update"
2016-12-08 17:47:59 +09:00
Scott Lahteine
4ea87b8f34 Merge pull request #5414 from thinkyhead/rc_sanitycheck_inverting
Sanity-check inverting for Z probe and Z endstop
2016-12-08 00:28:33 -08:00
Scott Lahteine
da6a094424 Sanity-check inverting and pullups for Z probe and Z endstop
`Z_MIN_ENDSTOP_INVERTING` must match `Z_MIN_PROBE_ENDSTOP_INVERTING`
when using `Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN`.
This is easy to overlook.
2016-12-08 00:12:19 -08:00
Scott Lahteine
a9f64537ff Merge pull request #5429 from thinkyhead/rc_mention_M205
Fix compile error with LCD_I2C_VIKI
2016-12-07 22:16:57 -08:00
Scott Lahteine
3fb43c11fc Fix compile error with LCD_I2C_VIKI 2016-12-07 23:29:45 -06:00
Scott Lahteine
c1e1f63ffa Merge pull request #5424 from thinkyhead/rc_mention_M205
Include M205 note in configurations
2016-12-07 18:18:59 -06:00
Scott Lahteine
aa241c63b3 Include M205 note in configurations 2016-12-07 14:45:44 -06:00
Scott Lahteine
c8a95ec514 Merge pull request #5413 from MagoKimbra/rc_fix_mesh
Fix Mesh without Fade Height
2016-12-07 03:16:02 -06:00
Scott Lahteine
35ad9626f1 Merge pull request #5410 from thinkyhead/rc_polish_update
Update Polish language, reduce filament change messages
2016-12-07 03:15:53 -06:00
Scott Lahteine
01e5d46ea7 Patch some planner compile errors 2016-12-07 02:26:24 -06:00
MagoKimbra
5383212a28 Fix Mesh without Fade Height 2016-12-07 09:23:42 +01:00
Scott Lahteine
dbe1dc1452 Merge pull request #5406 from Rigid3D/RCBugFix
Turkish Translation Update
2016-12-07 00:56:08 -06:00
Scott Lahteine
66f1b7cce3 Merge pull request #5409 from thinkyhead/rc_croatian_update
Updates to Croatian language
2016-12-07 00:55:45 -06:00
Scott Lahteine
4783a59249 Remove filament-change empty lines from languages 2016-12-07 00:53:03 -06:00
Scott Lahteine
1705099c3e Save space by not defining unused filament change message lines 2016-12-07 00:53:03 -06:00
Scott Lahteine
29bc83ead8 Optimize findMissingTranslations.sh 2016-12-07 00:53:02 -06:00
android444
9b1f4b514b Update Polish language
Translation of messages in English to Polish.
2016-12-06 22:28:33 -06:00
Robert Marko
84f7e1de04 Updates to Croatian language 2016-12-06 22:24:12 -06:00
Scott Lahteine
b6bb4daea9 Merge pull request #5408 from esenapaj/README-and-Version-for-1.1.0-RCBugFix
README and Version for 1.1.0-RCBugFix
2016-12-06 22:21:19 -06:00
esenapaj
08cdaaf19b README and Version for 1.1.0-RCBugFix
Sync with RC8
2016-12-07 10:43:58 +09:00
Mehmet Sutas
f4663cb677 Update language_tr_utf8.h 2016-12-07 00:21:56 +03:00
Mehmet Sutas
b4fd115d4e Update language_tr.h 2016-12-07 00:20:07 +03:00
Scott Lahteine
83c5026db1 Ignore homing button when SD printing
As suggested in #5404 by @android444
2016-12-06 14:22:34 -06:00
Scott Lahteine
312caef472 Merge pull request #5398 from thinkyhead/rc_croatian_cleanup
Fix Croatian spacing, extra #endif
2016-12-06 03:22:19 -06:00
Scott Lahteine
46b65773ea Fix Croatian spacing, extra #endif 2016-12-06 03:10:37 -06:00
Scott Lahteine
3f2faac9d1 Merge pull request #5388 from thinkyhead/rc_subdivide_bilinear
Subdivide Bilinear Grid with Catmull Rom Splines
2016-12-05 20:28:50 -06:00
Scott Lahteine
b5b5edd9ad Merge pull request #5394 from thinkyhead/rc_drop_board_99
Remove mystery-board 99
2016-12-05 20:28:35 -06:00
Scott Lahteine
c48901f355 Remove mystery-board 99 2016-12-05 20:16:50 -06:00
akaJes
d7b948610a Experimental bilinear subdivision option 2016-12-05 20:11:24 -06:00
Scott Lahteine
6253b765aa Merge pull request #5389 from thinkyhead/distribute_screen_updates
Distribute GLCD screen updates in time
2016-12-05 20:08:33 -06:00
Scott Lahteine
b203901143 Merge pull request #5393 from AnHardt/Fix-auto_report_temperatures
Fix auto_report_temperatures()
2016-12-05 19:38:23 -06:00
AnHardt
59a27ed27d Fix auto_report_temperatures()
The `auto_report_temperatures` needs a linefeed to be recognized by Repetier Host.
2016-12-06 01:26:44 +01:00
AnHardt
a6fbd4a5d8 Distribute GLCD screen updates in time
Currently we draw and send the screens for a graphical LCD all at once.
We draw in two or four parts but draw them directly behind each other.
For the tested status screen this takes 59-62ms in a single block.
During this time nothing else (except the interrupts) can be done.
When printing a sequence of very short moves the buffer drains - sometimes until it's empty.

This PR splits the screen update into parts.
Currently we have 10 time slots. During the first one the complete screen is drawn. (60,0,0,0,0,0,0,0,0,0,0)
Here i introduce pauses for doing other things. (30,30,0,0,0,0,0,0) or (15,15,15,15,0,0,0,0,0,0)
Drawing in consecutive time slots prevents from lagging too much. Even with a 4 stripe display all the drawing is done after 400ms.
Previous experiments with a even better distribution of the time slots like
(30,0,0,0,0,30,0,0,0,0) and (15,0,15,0,15,0,15,0,0,0) did not feel good when using the menu, because of too much lag.

Because of the previous PRs to speed up the display updates and especially reducing the difference between drawing 2 or 4 stripes,
it now makes sense for the REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER to go from 2 to 4 stripes. This costs about 1-2ms per complete
screen update, but is payed back by having partial updates lasting only the half time and two additional brakes. Also ~256 byte of
framebuffer are saved in RAM.

13:45:59.213 : echo: #:17 >:13 s:30;   #:16 >:13 s:29;   S#:33 S>:26 S:59
13:46:00.213 : echo: #:16 >:14 s:30;   #:17 >:13 s:30;   S#:33 S>:27 S:60
13:46:01.215 : echo: #:17 >:13 s:30;   #:16 >:13 s:29;   S#:33 S>:26 S:59
13:46:02.215 : echo: #:16 >:13 s:29;   #:16 >:14 s:30;   S#:32 S>:27 S:59
13:46:03.214 : echo: #:17 >:13 s:30;   #:17 >:13 s:30;   S#:34 S>:26 S:60
13:46:04.214 : echo: #:16 >:13 s:29;   #:16 >:14 s:30;   S#:32 S>:27 S:59
13:46:05.212 : echo: #:16 >:14 s:30;   #:17 >:13 s:30;   S#:33 S>:27 S:60
13:46:06.212 : echo: #:17 >:13 s:30;   #:16 >:13 s:29;   S#:33 S>:26 S:59

03:30:36.779 : echo: #:8 >:7 s:15;   #:10 >:7 s:17;   #:8 >:6 s:14;   #:8 >:7 s:15;   S#:34 S>:27 S:61
03:30:37.778 : echo: #:8 >:6 s:14;   #:10 >:7 s:17;   #:9 >:7 s:16;   #:8 >:6 s:14;   S#:35 S>:26 S:61
03:30:38.778 : echo: #:8 >:6 s:14;   #:11 >:7 s:18;   #:8 >:6 s:14;   #:8 >:7 s:15;   S#:35 S>:26 S:61
03:30:39.777 : echo: #:8 >:6 s:14;   #:10 >:7 s:17;   #:8 >:8 s:16;   #:8 >:6 s:14;   S#:34 S>:27 S:61
03:30:40.780 : echo: #:8 >:6 s:14;   #:11 >:7 s:18;   #:8 >:6 s:14;   #:8 >:6 s:14;   S#:35 S>:25 S:60
03:30:41.780 : echo: #:9 >:6 s:15;   #:10 >:7 s:17;   #:8 >:6 s:14;   #:9 >:6 s:15;   S#:36 S>:25 S:61
03:30:42.779 : echo: #:8 >:6 s:14;   #:10 >:8 s:18;   #:8 >:6 s:14;   #:8 >:6 s:14;   S#:34 S>:26 S:60
03:30:43.778 : echo: #:9 >:6 s:15;   #:10 >:7 s:17;   #:8 >:7 s:15;   #:9 >:6 s:15;   S#:36 S>:26 S:62

#: draw a stripe
>: transfer a stripe
s: sum of of draw and transfer for one stripe
S#: sum of draws for a complete screen
S>: sum of transfers for a complete screen
S: time to draw and transfer a complete screen
2016-12-05 12:22:54 -06:00
Scott Lahteine
f882355994 Merge pull request #5318 from Sebastianv650/Account_for_LCD_improvements
Account for LCD improvements in ENSURE_SMOOTH_MOVES
2016-12-05 11:23:58 -06:00
Scott Lahteine
20e834461d Merge pull request #5385 from thinkyhead/rc_ftostr4sign_decimal
Show decimal for small numbers in ftostr4sign
2016-12-05 11:22:45 -06:00
Scott Lahteine
b6b100c471 Merge pull request #5371 from thinkyhead/rc_extruders_can_differ
Allow distinct factors for multiple extruders
2016-12-05 11:22:31 -06:00
Scott Lahteine
1aca2dfe0c Merge pull request #5387 from thinkyhead/rc_polish_update
Polish language update – plus placeholders
2016-12-05 10:52:20 -06:00
Scott Lahteine
449d9cbf60 Add placeholders for Polish translatable strings 2016-12-05 10:37:00 -06:00
c64pl
643dc4b64e Update language_pl.h
Fixed translations
2016-12-05 10:37:00 -06:00
Scott Lahteine
0974b75fb6 Merge pull request #5386 from thinkyhead/rc_galician_update
Galician language update.
2016-12-05 10:36:26 -06:00
Rafa Couto
2b9115330d Galician language update. 2016-12-05 10:11:28 -06:00
Scott Lahteine
1f3e2440bc Merge pull request #5175 from thinkyhead/rc_dualx_homing
Unpark when using Z_SAFE_HOMING with Dual X
2016-12-05 10:02:56 -06:00
Scott Lahteine
d5bf1684fe Implement as optional feature LCD_DECIMAL_SMALL_XY
And reduce the function size to simplify
2016-12-05 09:26:05 -06:00
Guthenberg
bfb8d3b53e Show more decimals in Display, if possible
_123, -123, _-12, __-1  plus  1234, 12.3, -1.2
2016-12-05 09:05:46 -06:00
Scott Lahteine
1e30d1da47 Simplify itostr4sign
- This function becomes obsolete if ftostr4sign is re-written.
2016-12-05 09:05:46 -06:00
Scott Lahteine
82a187acae Merge pull request #5359 from AnHardt/update-de
Add missing translations to lang-de
2016-12-05 07:31:28 -06:00
Scott Lahteine
4bafdf4b66 Support DISTINCT_E_FACTORS in LCD Motion Menu 2016-12-05 07:26:18 -06:00
Scott Lahteine
3391c785c6 Support for distinct E factors 2016-12-05 07:26:18 -06:00
Scott Lahteine
0dfe95eaba Adjust formatting in Planner 2016-12-05 07:26:17 -06:00
Scott Lahteine
c9c6e084ce Merge pull request #5383 from thinkyhead/rc_fixup_5378
Fix rows error in DOGM
2016-12-05 07:24:44 -06:00
Scott Lahteine
09587f7c0d Fix rows error in DOGM 2016-12-05 07:14:11 -06:00
Scott Lahteine
c47e07d129 Fix Dual X software endstops 2016-12-05 06:51:41 -06:00
Scott Lahteine
4217e9653e Adjust park code in tool_change 2016-12-05 06:51:41 -06:00
Scott Lahteine
b20405db31 Only DXC_AUTO_PARK_MODE should auto-move in tool_change 2016-12-05 06:48:43 -06:00
Scott Lahteine
ca24af7d5d Dual X with home_z_safely is not parked 2016-12-05 06:43:26 -06:00
Scott Lahteine
0e15b4f434 Dual X set_axis_is_at_home can use x_home_pos for both 2016-12-05 06:43:26 -06:00
Scott Lahteine
54109dfaec Reduce code size for Dual X un-park 2016-12-05 06:43:26 -06:00
Scott Lahteine
fe96f74db1 Use const arguments in Dual X helper functions 2016-12-05 06:43:26 -06:00
Scott Lahteine
41278c1e8b Apply LOGICAL_POSITION to home positions on Dual X 2016-12-05 06:43:26 -06:00
Scott Lahteine
053fb55af6 Fix modes ordering in prepare_move_to_destination_dualx 2016-12-05 06:43:26 -06:00
Scott Lahteine
ee50928eee Make LOGICAL and RAW position macros ternary-compatible 2016-12-05 06:43:26 -06:00
Scott Lahteine
56dd15c0ad Use SET_INPUT for PS_ON_PIN in kill 2016-12-05 06:43:26 -06:00
Scott Lahteine
200cf3e9f9 Merge pull request #5381 from thinkyhead/rc_fix_fade_factor
Properly apply fade_factor to MBL
2016-12-05 06:06:13 -06:00
Scott Lahteine
84ff78c1e3 Pass the fade factor to mbl.get_z 2016-12-05 03:01:51 -06:00
Scott Lahteine
85c2b96685 Apply const to MBL class methods 2016-12-05 02:50:59 -06:00
Scott Lahteine
c06161b773 Use apply_leveling, not MBL directly 2016-12-05 01:53:36 -06:00
Scott Lahteine
818f8b93d3 Merge pull request #5378 from thinkyhead/rc_duration_rj
Better alignment of elapsed print time
2016-12-04 22:42:23 -06:00
Scott Lahteine
9d88a61d52 Better alignment of elapsed print time 2016-12-04 21:30:49 -06:00
Scott Lahteine
21c7b7ef87 Merge pull request #5374 from thinkyhead/rc_lcd_edit_tweaks
Fix garbled negative values on LCD
2016-12-04 16:32:12 -06:00
Scott Lahteine
0b53d78046 Tweak editable items for debugging 2016-12-04 03:51:10 -06:00
Scott Lahteine
0b9b529745 Merge pull request #5368 from thinkyhead/rc_croatian_update
Save PROGMEM with string changes
2016-12-03 19:37:23 -06:00
Scott Lahteine
fccc97de6d Save PROGMEM with string changes
Unlike RAM-based strings, PROGMEM strings aren’t consolidated by the
compiler.
2016-12-03 19:21:46 -06:00
AnHardt
e7fc353f08 Add missing translations to lang-de 2016-12-03 20:51:49 +01:00
Scott Lahteine
ea13c68515 Merge pull request #5365 from thinkyhead/rc_croatian_update
Add placeholders for Bulgarian translation
2016-12-03 12:30:22 -06:00
Scott Lahteine
3f2cb376e0 Add placeholders for Bulgarian translation 2016-12-03 12:14:02 -06:00
Scott Lahteine
b22d37ba52 Merge pull request #5364 from thinkyhead/rc_croatian_update
Update Croatian to include missing strings
2016-12-03 11:37:42 -06:00
Robert Marko
b796a687ca Update Croatian to include missing strings
Added all missing strings according to English
2016-12-03 11:15:41 -06:00
Scott Lahteine
3bb76b254d Merge pull request #5363 from thinkyhead/rc_fix_hotend_offset_M503
Fix hotend offset report in M503
2016-12-03 10:28:49 -06:00
Scott Lahteine
255ed80164 Fix hotend offset report in M503 2016-12-03 10:17:35 -06:00
Scott Lahteine
7273a18c8d Merge pull request #5358 from thinkyhead/rc_fixup_scripts
Enhance findMissingTranslations, format the output
2016-12-03 09:37:32 -06:00
Scott Lahteine
b44f06a296 Extend findMissingTranslations, reformat output 2016-12-03 08:48:51 -06:00
Scott Lahteine
1dfe39f0d7 Merge pull request #5351 from petrzjunior/RCBugFix
[LANGUAGE] Update Czech (Case light)
2016-12-03 03:52:18 -06:00
Petr Zahradník
c66f3ed34b Update Czech 2016-12-03 10:32:34 +01:00
Scott Lahteine
cbf208ea1f Merge pull request #5348 from Kaibob2/patch-1
Update language_de.h
2016-12-03 01:53:24 -06:00
Scott Lahteine
a2660cf688 Merge pull request #5347 from tnw513/fix-italian
Added missing translations
2016-12-03 01:52:45 -06:00
Scott Lahteine
27dd5acc22 Fix set_led_color for BLINKM
Follow-up to #5330
2016-12-03 01:51:11 -06:00
Kai
8530c32309 Update language_de.h
Grammar corrections
2016-12-02 19:40:36 +01:00
Silvio Didonna
f1d5ffa211 Added missing translations 2016-12-02 18:49:39 +01:00
Scott Lahteine
b0361ebe4f Merge pull request #5343 from thinkyhead/rc_invert_case_light
Allow case light pin to be active low
2016-12-02 01:17:11 -06:00
Scott Lahteine
f60b4f8659 Allow case light pin to be active low 2016-12-01 23:32:34 -06:00
Scott Lahteine
3f4c02e42f Merge pull request #5259 from Sebastianv650/Allow_UART-ISR_inside_Stepper
Allow UART ISRs inside the stepper ISR
2016-12-01 23:17:42 -06:00
Scott Lahteine
115f81840b Merge pull request #5342 from thinkyhead/rc_reliable_redraw
Fix redraw in SD Card menus
2016-12-01 22:42:24 -06:00
Scott Lahteine
d07229f185 Fix redraw in SD Card menus 2016-12-01 18:15:58 -06:00
Scott Lahteine
47b4b21308 Merge pull request #5331 from esenapaj/Fix-for-the-PR-#5072
Fix for the PR #5072 (Add predefined AUTO_FAN_PINs to pins files), etc
2016-12-01 13:37:02 -06:00
Scott Lahteine
14b1500525 Merge pull request #5338 from thinkyhead/rc_fix_fade_factor
Fix compile without ENABLE_LEVELING_FADE_HEIGHT
2016-12-01 12:06:39 -06:00
Scott Lahteine
8d14420331 Fix compile without ENABLE_LEVELING_FADE_HEIGHT 2016-12-01 11:37:24 -06:00
Scott Lahteine
415294801f Merge pull request #5330 from thinkyhead/rc_rgb_led
Support for an RGB LED using 3 pins
2016-11-30 14:14:00 -06:00
esenapaj
0909cf3d46 Adjust spacing 2016-11-30 19:39:39 +09:00
esenapaj
8e9e9c17b0 Follow-up the PR #5323 (Adding ukrainian language support)
・Update forgotten Configuration_adv.h of Felix\DUAL and K8400\Dual-head
2016-11-30 19:39:39 +09:00
esenapaj
d92ce8849b Fix for the PR #5072 (Add predefined AUTO_FAN_PINs to pins files), etc
・Make descriptions the same as others
2016-11-30 19:39:38 +09:00
Scott Lahteine
e00b380489 Merge pull request #5323 from akaJes/lang-ua
Adding ukrainian language support
2016-11-30 01:10:40 -06:00
Scott Lahteine
862e3c93d9 Merge pull request #5328 from esenapaj/Suppress-warning
Suppress warning
2016-11-30 01:05:20 -06:00
Scott Lahteine
65c50e062e Support for an RGB LED using 3 pins 2016-11-30 00:02:31 -06:00
esenapaj
3047f3c85c Suppress warning 2016-11-30 00:32:56 +09:00
jes
f674246397 extend Configurations files 2016-11-29 15:04:36 +02:00
jes
c90191faaf adding ukrainian laguage support 2016-11-29 14:49:45 +02:00
Sebastianv650
912704a0d8 Enable ISRs inside temperature ISR
to capture chars at UART at 250000 baud.
2016-11-28 20:08:50 +01:00
Sebastianv650
f62f4006af Account for LCD improvements in ENSURE_SMOOTH_MOVES
.. and give the hint to try lower values if possible.
2016-11-28 17:44:19 +01:00
Scott Lahteine
092e949b58 Merge pull request #5169 from thinkyhead/rc_core_inverted
Support for COREYX, COREZX, COREZY
2016-11-28 02:26:41 -06:00
Scott Lahteine
e9e4208ff1 Merge pull request #5274 from Sebastianv650/improve_smooth_moves
Improvement for ENSURE_SMOOTH_MOVES
2016-11-28 02:22:08 -06:00
Scott Lahteine
c7935bb0d2 Merge pull request #5299 from thinkyhead/rc_bed_correction_fade
Add a fade factor for mesh leveling
2016-11-28 02:07:51 -06:00
Scott Lahteine
a69b1ee691 Merge pull request #5313 from thinkyhead/rc_fix_menu_actions
Keep drawing menu unless screen changes
2016-11-28 02:01:39 -06:00
Scott Lahteine
32ee3acf86 Merge pull request #5315 from thinkyhead/rc_fixup_material_menus
Refine material heatup menu items
2016-11-28 01:46:51 -06:00
Scott Lahteine
c70a06daf1 lcd_save_previous_menu => lcd_save_previous_screen 2016-11-28 01:46:18 -06:00
Scott Lahteine
13ea43cc8d Only exit menu handler when the screen changes 2016-11-28 01:46:18 -06:00
Scott Lahteine
f45b6a7762 Merge pull request #5314 from thinkyhead/case_light_menu_fix
Fix and optimize case-light code
2016-11-28 01:45:27 -06:00
Scott Lahteine
59fafb93b2 Merge pull request #5304 from AnHardt/pixel-shifting
MENU_HOLLOW_FRAME for the menu screens
2016-11-28 01:41:47 -06:00
Scott Lahteine
0951d385ce Don't set heater temperature above its maximum 2016-11-28 01:37:24 -06:00
Scott Lahteine
c9193e856d Limit preheat parameters based on all nozzles 2016-11-28 01:37:24 -06:00
Scott Lahteine
bb4529f7d2 PLA / ABS => Material 1 / 2 2016-11-28 01:37:24 -06:00
Scott Lahteine
61437d988a Fix and optimize case-light code 2016-11-28 01:34:52 -06:00
AnHardt
7a9fa78822 MENU_HOLLOW_FRAME for the menu screens
MENU_HOLLOW_FRAME for the menu screens and
some pixel shifting to optimize the look with tall fonts. (cn)
2016-11-27 22:59:05 +01:00
Scott Lahteine
20b0889602 Merge pull request #5303 from AnHardt/reduce-sripes
Not more then 4 stripes for u8g-devices
2016-11-26 18:47:43 -06:00
AnHardt
24ca1a6289 Not more then 4 stripes for u8g-devices
To optimise speed.
Costs well invested 128Byte of RAM.
2016-11-26 19:08:33 +01:00
Scott Lahteine
668e737893 Merge pull request #5288 from thinkyhead/rc_selective_rendering
Optimize graphical display with selective rendering
2016-11-26 06:54:41 -06:00
Scott Lahteine
aee71c543e Minor formatting in language.h 2016-11-26 06:53:52 -06:00
Scott Lahteine
05d8d189f6 Adjust spacing in utf_mapper.h 2016-11-26 06:53:52 -06:00
Scott Lahteine
5460a529da Add option DOGM_SPI_DELAY_US 2016-11-26 06:53:52 -06:00
Scott Lahteine
71842b6a17 Apply const to LCD arguments and locals 2016-11-26 06:53:52 -06:00
Scott Lahteine
b1abd7edef Optimize graphical display with selective rendering 2016-11-26 06:53:52 -06:00
Scott Lahteine
23935dd23a Merge pull request #5301 from AnHardt/fix-USE_BIG_EDIT_FONT
Fix USE_BIG_EDIT_FONT
2016-11-26 06:53:21 -06:00
AnHardt
b91fab2d7d Fix USE_BIG_EDIT_FONT 2016-11-26 13:50:25 +01:00
Scott Lahteine
4cd73e183d Hide hidden files and folders 2016-11-26 06:26:28 -06:00
Scott Lahteine
f6f77d34a1 Add a fade factor for mesh leveling 2016-11-26 03:41:26 -06:00
Scott Lahteine
679d37f83f Merge pull request #5298 from AnHardt/fonts-unterlaengen
Change font decent to -1 for tr and gr
2016-11-25 20:01:11 -06:00
AnHardt
75fdcc14b7 Activate font and mapper for el-gr 2016-11-26 02:30:37 +01:00
AnHardt
a0004e7cd3 Change font decent to -1 for tt and gr
For speeding up font drawing unify font decent.
Tr and Gr have ben the only fonts with a font decent of -2.
Sorry for some, a bit compressd, but hopefully still readeble symbols.
2016-11-26 02:29:23 +01:00
Scott Lahteine
307f263f89 Merge pull request #5292 from esenapaj/Update-Japanese-translation
Update Japanese translation
2016-11-25 16:56:49 -06:00
Scott Lahteine
9d177c93a2 Merge pull request #5291 from esenapaj/Follow-up-the-PR-#5255
Follow-up the PR #5255 (Case light menu (3rd attempt))
2016-11-25 16:56:15 -06:00
esenapaj
7070143042 Update Japanese translation
・Add new translation
2016-11-24 21:10:40 +09:00
esenapaj
ef97645002 Follow-up the PR #5255 (Case light menu (3rd attempt)) 2016-11-24 19:42:05 +09:00
Scott Lahteine
2a9b3376a9 Merge pull request #5289 from thinkyhead/rc_which_menu_actions
Drop "static" keyword in ultralcd.cpp function declarations
2016-11-23 23:04:05 -06:00
Scott Lahteine
b97dafe4b8 Drop "static" keyword in ultralcd.cpp function declarations 2016-11-23 20:43:01 -06:00
Scott Lahteine
2e966f8e5b Patch Capabilities Report for "PROGRESS" 2016-11-23 19:31:46 -06:00
Scott Lahteine
f60321d3e3 Merge pull request #5284 from thinkyhead/rc_turkish_update
Turkish update (squashed)
2016-11-23 14:57:52 -06:00
Mehmet Sutas
a26668b10c Add UTF8 Turkish Translation 2016-11-23 14:19:16 -06:00
Mehmet Sutas
61aa796307 Added Human Readable Comments 2016-11-23 14:19:16 -06:00
Mehmet Sutas
6fb9c6fe07 Follow-up for #5167 Turkish Language
Add check for Turkish Font before setting better font for graphic displays
2016-11-23 14:19:15 -06:00
Scott Lahteine
d891324830 Merge pull request #5258 from mosh1/mbl_speed_fix
Fix z feedrate value when doing mesh bed leveling. probe feedrate use…
2016-11-23 14:15:01 -06:00
Scott Lahteine
7f8133a51f Merge pull request #5255 from Kaibob2/CaseLightMenu
Case light menu (3rd attempt)
2016-11-23 13:46:33 -06:00
Kai
e9b42f4f47 Update language_de.h 2016-11-23 19:29:19 +01:00
Kai
0c341f0c50 Added Menu entry for Case light 2016-11-23 19:29:15 +01:00
Scott Lahteine
3bc2273ac9 Comment M540 2016-11-21 18:08:00 -06:00
Scott Lahteine
14b74181f5 Merge pull request #5179 from thinkyhead/rc_TMC2130
TMC2130 "Silent StepStick" support
2016-11-21 14:10:52 -06:00
Scott Lahteine
bb2114a060 Merge pull request #5264 from thinkyhead/rc_delta_safe_zone
Add an option for delta to home to the top
2016-11-21 13:56:44 -06:00
Scott Lahteine
38466b1d2f Merge pull request #5271 from esenapaj/Fix-for-the-PR-#5267
Fix for thePR #5267 (Introduce a +1234.56 format for over 999 steps/mm)
2016-11-21 13:55:56 -06:00
Scott Lahteine
9b96a4a53b Merge pull request #5246 from thinkyhead/rc_some_cleanup
Minor stepper cleanup
2016-11-21 13:55:25 -06:00
Sebastianv650
8190483eeb Improvement for ENSURE_SMOOTH_MOVES
Instead of waiting for a single long block, compare the complete block
buffer runtime for the long_move() check.
2016-11-21 17:58:24 +01:00
esenapaj
da67037550 Fix for thePR #5267 (Introduce a +1234.56 format for over 999 steps/mm)
・Fix memory leak
2016-11-21 22:31:01 +09:00
Scott Lahteine
0f891e848b Merge pull request #5268 from esenapaj/Update-Japanese-translation
Update Japanese translation
2016-11-21 03:18:36 -06:00
Scott Lahteine
c91325e904 Merge pull request #5267 from esenapaj/Introduce-a-+1234.56-format
Introduce a +1234.56 format for over 999 steps/mm
2016-11-21 03:17:52 -06:00
esenapaj
190a04c467 Update Japanese translation
・Change translation for 16 width LCD
2016-11-21 17:51:43 +09:00
esenapaj
7b836a4000 Introduce a +1234.56 format for over 999 steps/mm 2016-11-21 17:45:07 +09:00
Scott Lahteine
76f47aebb6 Travis test TMC2130 options 2016-11-21 00:52:19 -06:00
Scott Lahteine
3e0376b45e Reorder M114 and M119 gcode cases 2016-11-21 00:52:19 -06:00
Scott Lahteine
644fac5d34 Reduce all stepper_indirection init code with macros 2016-11-21 00:52:18 -06:00
Scott Lahteine
4e4f37b6c2 Code formatting for TMC and L6470 config options 2016-11-21 00:52:18 -06:00
Scott Lahteine
127e21ae00 Extend M122 for all steppers 2016-11-21 00:52:18 -06:00
Scott Lahteine
bf5f5f44cc Make TMC2130 init code auto-configure
Simply apply enabled settings instead of requiring users to edit
stepper_indirection.cpp
2016-11-21 00:52:17 -06:00
Moritz
d67c1d825f Add TMC2130 support 2016-11-21 00:17:45 -06:00
Scott Lahteine
11effeee2c Add an option for delta to home to the top 2016-11-20 23:12:07 -06:00
Sebastianv650
50059690e0 Allow UART ISRs inside the stepper ISR
If the stepper ISR takes too long, chars are lost which leads to serial
communication errors like "Line number not +1" or "Wrong checksum". In
worst case, the printer can even do crazy moves.

With this changes, UART interrupts are handled inside the stepper ISR.
This way, no chars should be lost.
2016-11-20 13:09:12 +01:00
Scott Lahteine
8bf07684d2 Merge pull request #5256 from AnHardt/e-interrupts-2
Endstop interrupt refinement
2016-11-20 02:27:02 -06:00
Moshen Chan
29b174bfb9 Fix z feedrate value when doing mesh bed leveling. probe feedrate uses XY_PROBE_SPEED 2016-11-19 16:34:41 -08:00
AnHardt
88b38eafd8 Endstop interrupt refinement
At the start of a move, check if the endstops are already triggered.
The 'change' interrupts will not see a change if already triggered.
2016-11-19 13:30:49 +01:00
Scott Lahteine
79c8591192 Merge pull request #5253 from thinkyhead/rc_smooth_move_ex-lax
Ensure smooth print moves even with LCD enabled
2016-11-19 01:38:41 -06:00
Scott Lahteine
0215cacb30 Merge pull request #5247 from esenapaj/Re-follow-the-PR-#4634
Re-follow the PR #4634 (Set language display charset in language.h)
2016-11-19 01:32:40 -06:00
Scott Lahteine
2cc32d85a3 Adjust ENSURE_SMOOTH_MOVES coding style 2016-11-19 01:28:48 -06:00
Scott Lahteine
072541f286 Update ENSURE_SMOOTH_MOVES in all configs 2016-11-19 01:28:47 -06:00
Sebastianv650
de89dc9f04 Ensure smooth print moves even with LCD enabled
lcd_update can take so much time that the block buffer gets drained if
there are only short segments. This leads to jerky printer movements for
example in circles and a bad print quality.

This change implements a simple check: Only if the block currently
executed is long enough, run lcd_update.
This also means the printer will not show actual values on the LCD nor
will it respond to buttons pressed. A option that keeps the menu
accessible is also available.
Aditionaly, slow down if a block would be so fast that adding a new
block to the buffer would take more time. In this case, the buffer would
drain until it's empty in worst case.
2016-11-19 01:28:47 -06:00
Scott Lahteine
7b95918e84 Merge pull request #5251 from thinkyhead/rc_cmake_support
Added CMake support
2016-11-18 23:53:09 -06:00
Scott Lahteine
87b6b19256 Patch CASE_LIGHT typo 2016-11-18 23:49:12 -06:00
Scott Lahteine
0be6167f14 Merge pull request #5250 from CONSULitAS/RCBugFix_K8200_backinsync_2016-11-18
K8200: Example configuration back in sync
2016-11-18 22:49:18 -06:00
Scott Lahteine
de3eea920d Merge pull request #5252 from thinkyhead/rc_endstop_interrupt_followup
Endstop interrupts followup
2016-11-18 22:35:25 -06:00
Scott Lahteine
eb714ee873 Move dummy thermistor opts, fix redundant sensor comment 2016-11-18 22:24:48 -06:00
Scott Lahteine
7a99c6ce4f Reformat temp sensor listing 2016-11-18 22:24:47 -06:00
Scott Lahteine
181cdb3cfe Move GCode list above include lines 2016-11-18 22:24:46 -06:00
Scott Lahteine
25d0c167bd More detailed static_assert messages 2016-11-18 22:24:46 -06:00
Scott Lahteine
eb120e518c Followup to new endstop interrupts feature
- Fix typos, verbiage
- Fix naming of `setup_endstop_interrupts`
- Some formatting, indentation, spacing
2016-11-18 21:53:45 -06:00
Scott Lahteine
832fe284b4 Merge pull request #5184 from AnHardt/endstop_interrupts
Introduce endstop interrupts
2016-11-18 20:50:24 -06:00
tohara
f579ec2e7a Added CMake support 2016-11-18 20:18:34 -06:00
CONSULitAS
cbae44df64 K8200: Example configuration back in sync
Configuration.h: back in sync, new features configured
Configuration_adv.h: back in sync, new features configured
README.md: text updated
2016-11-18 22:55:02 +01:00
esenapaj
5db3738fe7 Re-follow the PR #4634 (Set language display charset in language.h) 2016-11-18 17:44:49 +09:00
Scott Lahteine
32247c1b80 Merge pull request #5244 from thinkyhead/rc_danish_nov_2016
Update to Danish language 10/11-2016
2016-11-18 01:29:25 -06:00
Scott Lahteine
6eb6f12c64 Patch up some language formatting 2016-11-18 01:16:58 -06:00
Bo Herrmannsen
8cffa60cc5 Update to Danish language 10/11-2016 2016-11-18 01:16:57 -06:00
Scott Lahteine
98600e1433 Minor stepper cleanup 2016-11-18 01:15:57 -06:00
Florian Heilmann
d08867986e Add autotemp capabilities to M104
This allows M104 to pass the F and B parameters to enable autotemp as well
2016-11-17 11:28:19 -06:00
Sebastianv650
c11b2bb777 Bugfix LIN_ADV
Advance has nothing todo with Z_AXIS, strange copy&paste error?
2016-11-17 11:28:19 -06:00
Scott Lahteine
ee0765e872 Merge pull request #5233 from esenapaj/Update-Japanese-translation
Update Japanese translation
2016-11-17 03:38:19 -06:00
Scott Lahteine
2330619da0 Merge pull request #5191 from petrzjunior/const
Replace const bool with #define for consistency
2016-11-17 03:37:32 -06:00
esenapaj
b278b7a395 Update Japanese translation
Only adjust spacing
2016-11-17 09:05:51 +09:00
Petr Zahradník junior
d7ce5d271b Replace const bool with #define for consistency 2016-11-16 18:55:21 +01:00
Scott Lahteine
d63230d73e Merge pull request #5192 from Kaibob2/patch-7
Printer Stats / Completed prints line doesn't fit in display (when german)
2016-11-16 00:16:36 -06:00
Scott Lahteine
548b45026d Merge pull request #5214 from Sebastianv650/RCBugFix_planner_opt
Save some cycle inside the planner
2016-11-16 00:06:55 -06:00
Scott Lahteine
5d23e52d75 Merge pull request #5228 from thinkyhead/rc_keep_last_mix
Fix DIRECT_MIXING_IN_G1 to preserve the previous mix
2016-11-15 19:12:01 -06:00
Scott Lahteine
db47aa983d Merge pull request #5226 from mtowara/RCBugFix
bump -std in Makefile to c++11
2016-11-15 16:13:32 -06:00
Scott Lahteine
99b0c1fe56 Fix DIRECT_MIXING_IN_G1 to preserve the previous mix 2016-11-15 16:12:26 -06:00
Scott Lahteine
a0aad8d686 Merge pull request #5224 from thinkyhead/rc_limit_G30_xy
Fix G30 with limits, print correct probe XY
2016-11-15 15:20:12 -06:00
Markus Towara
23a675f621 reduce binary size of .hex
still a few bytes bigger than with arduino but nothing major
2016-11-15 21:57:15 +01:00
Markus Towara
5b6e2cecf5 bump c/c++ standard to gnu11
needed for constexpr
2016-11-15 21:54:12 +01:00
Scott Lahteine
410657b050 Fix G30 with limits, print correct probe XY 2016-11-15 14:10:28 -06:00
AnHardt
f3eee02596 Introduce endstop interrupts
If ENDSTOP_INTERRUPTS_FEATURE is enabled this tries to set up interrupt routines
for all used endstop pins. If this worked without errors, `endstops.update()` is called
only if one of the endstops changed its state.

The new interrupt routines do not really check the endstops and react upon them. All what they
do, is to set a flag if it makes sense to call the endstop test we are used to.

This can be used on:
* ARM (DUE) based boards - all pins can raise interrupts,
* RAMPS - all 6 endstop pins plus some other on EXT-2 can raise interrupts,
* RAMPS based boards - as long the designers did not change the pins for the endstops or at least left enough,
* all boards, if there are enough pins that can raise interrupts, and you are willing/able to swap with pins dedicated to other purpose.
2016-11-15 12:07:41 +01:00
Sebastianv650
e3ffb58fbd Save some cycle inside the planner
planner.h:
fan speed is used to set integer variables, so no need for long.
Basicaly a byte should be enough for all the fan things, as it's 0-255?

planner.cpp:
Save some float multiplications.
We could squeeze out even more by defining feedrate_percentage,
saved_feedrate_percentage and flow_percentage as float instead of int.
Everytime they are used in the time-critical planner, they are casted to
float and multiplied by 0.01. Not done jet, as they are used in LCD menu
functions I don't know well enough.
2016-11-13 13:34:12 +01:00
Scott Lahteine
665b7f3893 Merge pull request #5212 from thinkyhead/rc_mixing_faster
Store mix factors as reciprocals and multiply
2016-11-12 18:47:11 -06:00
Scott Lahteine
60cc9342a4 Merge pull request #5188 from thinkyhead/rc_extended_host_support
Extended host support: M155 Auto temp report, M115 capabilities
2016-11-12 15:38:06 -06:00
Scott Lahteine
f663220e87 Store Mix factors as reciprocals and multiply 2016-11-12 15:19:18 -06:00
Scott Lahteine
ea3c08d249 Merge pull request #5186 from esenapaj/Follow-up-the-PR-#5167-etc
Follow up the PR #5167 (Add Turkish Language) again, etc
2016-11-12 13:11:54 -06:00
Scott Lahteine
c488378532 Merge pull request #5205 from Sebastianv650/RCBugFix_stepperpatch
Remove useless line from stepper ISR
2016-11-12 12:43:07 -06:00
Scott Lahteine
7972378828 Merge pull request #5209 from floyd871/RCBugFix
Megatronics 3.0 has no SD-Card detect
2016-11-12 12:42:02 -06:00
Michael Neumann
8bdf303da0 Update pins_MEGATRONICS_3.h 2016-11-12 12:26:07 +01:00
Michael Neumann
3890366c83 Update pins.h 2016-11-12 12:25:45 +01:00
Michael Neumann
c0d45ca7f2 Update boards.h 2016-11-12 12:24:47 +01:00
Sebastianv650
cdc18f8c22 Remove useless line from stepper ISR
The flag is already set inside planner.get_current_block(). Doing it
twice isn't making it better..
2016-11-11 19:35:03 +01:00
Kai
8e8b4398f3 Printer Stats / Completed prints line doesn't fit in display (when german) 2016-11-09 22:03:25 +01:00
Scott Lahteine
b31a07e261 Stateful M355 with separate P parameter 2016-11-09 03:28:18 -06:00
Scott Lahteine
c8d4cd35d8 Include more features in Travis testing 2016-11-09 02:32:59 -06:00
Scott Lahteine
3c9a838651 Extended capabilities report in M115 2016-11-09 02:32:58 -06:00
Scott Lahteine
68b866b5dd Add M155 - Auto-report temperature with interval 2016-11-09 02:32:58 -06:00
Scott Lahteine
68b46fb2c9 Allow send to i2c address 0 (broadcast) 2016-11-08 17:54:55 -06:00
Scott Lahteine
75bfde9945 M155=>M260, M156=>M261 2016-11-08 17:54:54 -06:00
esenapaj
2ae72b0491 Follow up the PR #5167 (Add Turkish Language) again, etc
・Update forgotten K8400\Dual-head\Configuration.h
・Adjust spacing
2016-11-09 06:31:21 +09:00
Scott Lahteine
06f2282f82 Merge pull request #5176 from thinkyhead/rc_filchange_feedback
Give instant feedback for filament change
2016-11-07 12:11:54 -06:00
Scott Lahteine
dcfd7c69e8 Merge pull request #5163 from nzinov/RCBugFix
Improve G30 probing command - add optional arguments
2016-11-07 11:37:13 -06:00
Scott Lahteine
e765eebfb0 Patch spacing in bilinear grid report 2016-11-07 04:08:25 -06:00
Scott Lahteine
7780052fb3 Give instant feedback for filament change 2016-11-07 03:48:16 -06:00
Scott Lahteine
de6f2ef2a3 Merge pull request #5171 from esenapaj/Follow-up-the-PR-#5167-etc
Follow up the PR #5167 (Add Turkish Language), etc
2016-11-07 00:05:44 -06:00
esenapaj
24e3f7abe7 Update Turkish translation
・Add new translation
2016-11-07 04:59:18 +09:00
esenapaj
be48792e9c Follow up the PR #5167 (Add Turkish Language), etc
・Remove all the #ifndef
・Follow the PR #4603 (Strip never-translated strings from language
files)
・Follow the PR #4634 (Set language display charset in language.h)
・Follow the PR #4936 (Put max_jerk vars in array, clean up jerk code)
・Adjust spacing
2016-11-06 23:59:02 +09:00
Scott Lahteine
1864b282c5 Implement reversed CORE options 2016-11-05 23:47:51 -05:00
Scott Lahteine
e3c8318504 Add reversed CORE options 2016-11-05 23:47:46 -05:00
Scott Lahteine
5aee8d892c Merge pull request #5167 from thinkyhead/rc_turkish_squashed
Add Turkish Language
2016-11-05 21:31:34 -05:00
Rigid3D
2327764980 Add Turkish Language 2016-11-05 21:06:16 -05:00
Nikolay Zinov
dea00bbcf1 improve G30 probing
Add optional parameters
X, Y for probe point
S sets stowing on and off
2016-11-05 13:22:45 +03:00
Scott Lahteine
1614c9d207 Merge pull request #5155 from thinkyhead/rc_core_babystepping
BABYSTEPPING-oriented cleanup
2016-11-03 23:46:04 -05:00
Scott Lahteine
00662b8635 Minor babystep cleanup patches 2016-11-03 23:31:45 -05:00
Scott Lahteine
cad792e702 Reduce code for invariant lcd_detected 2016-11-03 23:31:45 -05:00
Scott Lahteine
b23d255491 Move macros above Stepper::babystep 2016-11-03 23:31:45 -05:00
Scott Lahteine
cc57d46158 Fix set_position for CoreYZ 2016-11-03 23:31:45 -05:00
Scott Lahteine
0269347682 Merge pull request #5141 from thinkyhead/rc_old_slowdown_what
OLD_SLOWDOWN does nothing, so remove it
2016-11-03 23:30:43 -05:00
Scott Lahteine
e92e2b2446 Merge pull request #5144 from Sebastianv650/RCBugFix_LIN_ADV_wipe
Account for wipe moves
2016-11-03 23:19:25 -05:00
Scott Lahteine
28a039c0e1 Merge pull request #5154 from thinkyhead/rc_bilinear_splits
Don't define bilinear_line_to_destination on kinematic setups
2016-11-03 15:29:31 -05:00
Scott Lahteine
176aeafc19 Don't define bilinear_line_to_destination on kinematic setups 2016-11-03 14:10:07 -05:00
Sebastianv650
d448500643 Account for moves with negative E movements
Added a rule so that LIN_ADVANCE isn't used for moves with negative E movements (de_float will be negative in this cases).
I also added a more detailed comment to make it more clear what the if statement does.
2016-11-03 17:01:17 +01:00
Scott Lahteine
2185973e39 Merge pull request #5150 from thinkyhead/rc_bilinear_splits
Corrections to bilinear_line_to_destination
2016-11-03 04:54:39 -05:00
Scott Lahteine
236853df22 Corrections to bilinear_line_to_destination
- Allow more than 9x9 probe points
- Account for the probe starting position
2016-11-03 04:43:59 -05:00
Scott Lahteine
3b6a43f7ad Merge pull request #5148 from thinkyhead/rc_dual_tool_z_limit
Fix Z raise with DXC_AUTO_PARK_MODE
2016-11-02 21:52:44 -05:00
Scott Lahteine
0115e495fe Fix up Dual X switch blocks 2016-11-02 21:38:50 -05:00
Scott Lahteine
2495ab7af2 Make dual_x_carriage_mode an enumeration 2016-11-02 21:38:49 -05:00
Scott Lahteine
d6c36f5bb9 Fix Z raise with DXC_AUTO_PARK_MODE 2016-11-02 21:36:50 -05:00
Scott Lahteine
0c79553fc5 Cast int to AxisEnum for some accessors 2016-11-02 17:42:24 -05:00
Scott Lahteine
adbf1f7dca Add M355 to the GCodes list. 2016-11-02 16:43:52 -05:00
Scott Lahteine
63efc10599 Merge pull request #5134 from thinkyhead/rc_bilinear_split_lines
Split cartesian moves on grid boundaries with bilinear ABL
2016-11-02 16:14:55 -05:00
Scott Lahteine
12167bc8f3 OLD_SLOWDOWN does nothing, so remove it 2016-11-02 01:28:19 -05:00
Scott Lahteine
1ee0fdcad7 Merge pull request #5140 from esenapaj/Follow-up-the-PR-#5089
Follow-up the PR #5089 (Centralize click-handling in the LCD loop)
2016-11-02 01:13:56 -05:00
esenapaj
c8c1a28f6f Follow-up the PR #5089 (Centralize click-handling in the LCD loop)
bool feedback is no longer used
2016-11-02 08:36:02 +09:00
Scott Lahteine
b0be2e41ff Merge pull request #5136 from esenapaj/Follow-up-the-PR-#5133
Follow-up the PR  #5133 (M355 Case light)
2016-11-01 11:04:48 -05:00
esenapaj
c3a105186d Follow-up the PR #5133 (M355 Case light)
・Add CASE_LIGHT_PIN into pinsDebug.h
2016-11-02 00:31:50 +09:00
Scott Lahteine
ee5b8d6dc8 Split moves on grid boundaries with bilinear ABL on cartesian 2016-11-01 08:25:47 -05:00
Scott Lahteine
66744a6076 Merge pull request #5133 from thinkyhead/rc_M355_case_light
M355 Case light
2016-11-01 07:51:27 -05:00
Scott Lahteine
955d14acb0 Patch photo pin code style 2016-11-01 06:30:14 -05:00
Stanley
ab3f966f5f Case light G-code M355
implemented G-Code M355 into Marlin
2016-11-01 06:30:14 -05:00
Scott Lahteine
8b44413498 Merge pull request #5124 from Sebastianv650/RCBugFix_LIN_ADV-Patch
BugFix for incorrect E-speed calculation
2016-11-01 05:13:17 -05:00
Scott Lahteine
f418e82b15 Remove redundant definition of EN_C 2016-11-01 05:10:07 -05:00
Sebastianv650
f9bea7968f BugFix for incorrect E-speed calculation
The extrusion speed was wrong due to a not high enough precision of
esteps to XY steps, therefore now the target float values are used to
calculate the ratio between XY movement and extrusion speed.
The e_speed_multiplier8 was replaced by an absolute multiplier called
abs_adv_steps_multiplier8, therefore one multiplication and bitshift can
be saved inside the stepper ISR. Due to this, also extruder_advance_k is
better suited inside the planner and not the stepper files any more.
2016-11-01 08:08:47 +01:00
Scott Lahteine
9c108aea18 Merge pull request #5132 from thinkyhead/rc_fix_M43
Followup to #5118 - pins debugging cleanup
2016-11-01 02:05:21 -05:00
Bob-the-Kuhn
c20b4098be 2 bug fixes & some minor changes
see detailed  description in PR #5118
2016-11-01 01:29:41 -05:00
Scott Lahteine
fa6bf12697 Merge pull request #5118 from thinkyhead/rc_expanded_M43
Enhancements to M43 pins debugging
2016-10-31 08:29:53 -05:00
Scott Lahteine
3a107e280d Developer note in pins_MIGHTYBOARD_REVE.h 2016-10-31 08:22:39 -05:00
Scott Lahteine
85e307dcd8 No FAN0_PIN 2016-10-31 08:08:03 -05:00
Scott Lahteine
ff3a8ca0d1 Use NUM_DIGITAL_PINS instead of custom DIO_COUNT 2016-10-31 08:08:03 -05:00
Scott Lahteine
04a1fac029 Some cleanup to M43 2016-10-31 08:08:03 -05:00
Scott Lahteine
24f6612551 Reduce and optimize endstop_monitor code 2016-10-31 08:08:03 -05:00
Scott Lahteine
b4444e91ae Reduce code and build size of PWM_details 2016-10-31 08:08:02 -05:00
Scott Lahteine
dbe414ef03 Squash redundant code in PWM_status 2016-10-31 08:08:02 -05:00
Scott Lahteine
af26d22741 Clean up some spacing and semantics 2016-10-31 08:08:02 -05:00
Bob-the-Kuhn
81397d7a9a EXTRUDER_x_AUTO_FAN name change to Ex_AUTO_FAN
I stumbled across a name change that'll be used a lot so I'm updateing
the name list.
2016-10-31 08:08:02 -05:00
Bob-the-Kuhn
c7f1f0dae6 Add endstop monitor & make pins report pretty 2016-10-31 08:08:02 -05:00
Scott Lahteine
d567b426d5 Merge pull request #4894 from thinkyhead/rc_mightyboard_rev_e
Mightyboard Revision E preliminary support
2016-10-31 08:01:41 -05:00
Scott Lahteine
43df9ace4e Merge pull request #5110 from thinkyhead/rc_z2_min_allowed
Support Z2 min in M119 report
2016-10-31 07:59:45 -05:00
Scott Lahteine
8a4c51f313 Merge pull request #5115 from thinkyhead/rc_buffer_line_wait_later
Optimize buffer_line by calculating before wait-for-free-block
2016-10-30 16:46:18 -05:00
Scott Lahteine
23f05f8be7 Use bit-length types in block_t 2016-10-30 16:16:29 -05:00
Scott Lahteine
8dc7807d85 Add support for CoreYZ to planner.buffer_line 2016-10-30 16:16:28 -05:00
Scott Lahteine
1cf878fdb1 Calculate dm and e-steps earlier in planner 2016-10-30 16:16:28 -05:00
Scott Lahteine
75dbb71dd7 Replace block.busy with a block.flag bit 2016-10-30 16:16:28 -05:00
Scott Lahteine
c7f22f688f buffer_line can calculate while it's waiting 2016-10-29 17:08:42 -05:00
Scott Lahteine
3c3fe1a1ba Merge pull request #5089 from thinkyhead/rc_break_m1_fix
Centralize click-handling in the LCD loop
2016-10-29 16:07:08 -05:00
Scott Lahteine
f3720f4e81 const arguments to test_dual_z_endstops 2016-10-29 16:01:27 -05:00
Scott Lahteine
8cebd2a7db Arrange Z2 min before Z2 max 2016-10-29 01:54:19 -05:00
Scott Lahteine
accabf088a Add support for Z2 min endstop to M119 2016-10-29 01:54:02 -05:00
Scott Lahteine
396434a445 Fix compiler warning in M145 2016-10-28 20:57:36 -05:00
Scott Lahteine
8e787304c9 const float ref args in planner.h 2016-10-28 20:57:36 -05:00
Scott Lahteine
07bfc45df8 Adjust spacing in gcode_M149 2016-10-28 20:57:36 -05:00
Scott Lahteine
1a2310c494 Make LCD preheat vars an array to reduce code size 2016-10-28 20:57:36 -05:00
Scott Lahteine
1226ae1912 Some cleanup in ultralcd.h 2016-10-28 20:57:21 -05:00
Scott Lahteine
50ee749082 Centralize click-handling in the LCD loop 2016-10-28 20:57:21 -05:00
Scott Lahteine
47ad97c35e Merge pull request #5109 from thinkyhead/rc_eeprom_M218_tool_offset
Save hotend_offset array (M218) in EEPROM
2016-10-28 20:08:29 -05:00
Scott Lahteine
d095c7933b Merge pull request #5108 from MagoKimbra/Fix_M420
Fix Command M420
2016-10-28 19:23:40 -05:00
Scott Lahteine
bff6bbdb12 Indentation in configuration_store.cpp 2016-10-28 18:55:42 -05:00
Scott Lahteine
97115d56f9 Print error for M500 with disabled EEPROM 2016-10-28 18:53:48 -05:00
Scott Lahteine
67ab54185b Save hotend_offset array (M218) in EEPROM 2016-10-28 18:45:23 -05:00
MagoKimbra
dfcdbb437b Fix Command M420 2016-10-28 20:53:48 +02:00
Scott Lahteine
c34dbfb248 Merge pull request #5072 from thinkyhead/rc_preset_auto_fans
Add predefined AUTO_FAN_PINs to pins files
2016-10-27 17:12:11 -05:00
Scott Lahteine
1e00f5a4bd Merge pull request #5097 from thinkyhead/rc_fix_endstop_issue
Don't trigger endstops that are actually Z2 or probe
2016-10-27 08:32:48 -05:00
Scott Lahteine
9a23f73765 Don't trigger endstops that are actually Z2 or probe 2016-10-27 08:12:17 -05:00
Scott Lahteine
c07cc9e3f1 Revert changes made to z dual endstop test
#3631 broke z dual endstops. Solved by @Nocturnal42 in https://github.com/MarlinFirmware/Marlin/issues/5078#issuecomment-256572248
2016-10-27 07:41:39 -05:00
Scott Lahteine
c4c53856a4 Merge pull request #5094 from esenapaj/Fix-for-the-PR-#5088
Fix for the PR #5088 (Handle M108 in M1 also with ULTIPANEL)
2016-10-26 21:51:18 -05:00
Scott Lahteine
2e3110539b Merge pull request #5095 from thinkyhead/rc_fix_bilinear_math
Fix bilinear grid constraints
2016-10-26 21:48:19 -05:00
Scott Lahteine
4ec7ed554d Merge pull request #5093 from esenapaj/Follow-up-the-PR-#5087-etc
Follow-up the PR #5087 (Fixed SERVO pins on Azteeg X3), etc
2016-10-26 21:23:34 -05:00
esenapaj
d5a5042d23 Fix for the PR #5088 (Handle M108 in M1 also with ULTIPANEL) 2016-10-27 10:32:20 +09:00
Scott Lahteine
9cbedab91b Use DPM where possible 2016-10-26 18:38:32 -05:00
Scott Lahteine
ad38d91692 Sanity check that auto fan pins can do PWM 2016-10-26 18:38:32 -05:00
Scott Lahteine
95275eb9b3 Predefine auto fan pins in some pins files 2016-10-26 18:38:32 -05:00
Scott Lahteine
3f94b15cef Fix bilinear grid constraints
Followup to #5090
2016-10-26 18:11:26 -05:00
Scott Lahteine
d439fb95f7 Sanity check for the renamed options 2016-10-26 17:51:26 -05:00
Scott Lahteine
b6aa894893 Rename auto fan pins and add auto fan flags 2016-10-26 17:51:26 -05:00
Scott Lahteine
ada935de87 Allow TEMP_STAT_LEDS with only one LED defined 2016-10-26 17:51:26 -05:00
Scott Lahteine
4b056d8184 Fix warning in ultralcd.cpp 2016-10-26 17:51:26 -05:00
Scott Lahteine
9dfd029911 Fix bug in fastio.h _GET_TIMER 2016-10-26 17:51:25 -05:00
esenapaj
8b1d90e281 Follow-up the PR #5087 (Fixed SERVO pins on Azteeg X3), etc
・Add header
・Adjust spacing
2016-10-27 06:46:03 +09:00
Scott Lahteine
bfd3b3c604 Merge pull request #5087 from Fulg/azteeg-x3-pins
Fixed SERVO pins on Azteeg X3
2016-10-26 06:01:16 -05:00
Scott Lahteine
208d720614 Merge pull request #5082 from Fulg/RCBugFix
Only issue MAXTEMP when heating
2016-10-26 05:55:33 -05:00
Scott Lahteine
b5d9639dd0 Merge pull request #5090 from thinkyhead/rc_fix_bilinear_math
Fix for bilinear grid outside bounds
2016-10-26 05:45:17 -05:00
Scott Lahteine
f0d673561f Fix for bilinear grid outside bounds 2016-10-26 05:00:03 -05:00
Scott Lahteine
24bcea6c02 Merge pull request #5088 from thinkyhead/rc_break_m1_fix
Handle M108 in M1 also with ULTIPANEL
2016-10-26 00:44:01 -05:00
Scott Lahteine
1ba1ec0db9 Handle M108 in M1 also with ULTIPANEL 2016-10-25 23:25:47 -05:00
Scott Lahteine
7ad33422e3 Clear dir_t size, not pointer size 2016-10-25 22:59:40 -05:00
Benoit Miller
1c716034ec Fixed SERVO pins on Azteeg X3 2016-10-25 17:11:26 -04:00
Benoit Miller
2aa12d78dc Only issue MAXTEMP when heating 2016-10-24 17:09:29 -04:00
Scott Lahteine
3fcf915808 Fix uninitialized var in reset_acceleration_rates 2016-10-24 11:55:41 -05:00
Scott Lahteine
14f824c3de Merge pull request #5071 from esenapaj/Extend-measuring-range-of-thermocouple
Extend measuring range of thermocouple for MAX31855
2016-10-24 02:00:12 -05:00
Scott Lahteine
1097a50694 Merge pull request #5070 from gcormier/rcbugfix
Fix #4995 - M48/G29 on CoreXY maybe others?
2016-10-24 00:56:36 -05:00
Scott Lahteine
fed6cfc5f5 Merge pull request #5074 from Sebastianv650/Accel_calc_v2
Planner acceleration bugfix and speedup v2
2016-10-23 16:42:57 -05:00
Sebastianv650
c397b9d60a Planner acceleration bugfix and speedup v2
.) Use already existing inverse_millimeters instead of /
block->millimeters.
.) Prevent overflow during acceleration calculation by checking if float
is necessary. Idea modified from Sailfish.
.) Save two uint32_t or even float multiplications by checking if
step[AXIS] has steps and if max acceleration is lower than accel. If
not, there is no need to check this axis.
2016-10-23 12:47:46 +02:00
Scott Lahteine
aa99bd8d13 Merge pull request #5068 from esenapaj/Fix-for-PR-#5066
Fix for the PR #5066 (Updated french translation)
2016-10-23 02:56:36 -05:00
esenapaj
70e287ca8c Extend measuring range of thermocouple for MAX31855 2016-10-23 10:22:39 +09:00
Greg Cormier
f0aed9dac7 Fix #4995 - M48/G29 on CoreXY maybe others? 2016-10-22 20:45:13 -04:00
esenapaj
e50992694f Fix for the PR #5066 (Updated french translation)
MSG_INFO_PRINT_TIME is still being used
2016-10-23 06:09:56 +09:00
Scott Lahteine
483082387c Merge pull request #5022 from esenapaj/Fix-for-the-PR-#4553
Fix for the PR #4553 (Save bytes for custom chars (Hitachi LCD))
2016-10-22 13:54:09 -05:00
Scott Lahteine
8b967a9ff0 Merge pull request #5058 from thinkyhead/rc_reverse_arrow_buttons
Apply encoder reverse options to keypad arrows
2016-10-22 13:52:35 -05:00
esenapaj
523c7eaa6c Fix for the PR #4553 (Save bytes for custom chars (Hitachi LCD)) 2016-10-23 03:29:00 +09:00
Scott Lahteine
ca48a49fdb Merge pull request #5065 from petrzjunior/transl
[LANGUAGE] Update Czech (BLTOUCH and DAC strings)
2016-10-22 12:46:10 -05:00
Scott Lahteine
f0744fc815 Merge pull request #5066 from thinkyhead/rc_french_update
Updated french translation
2016-10-22 12:45:51 -05:00
Gege2B
88b7f6eb46 Updated french translation 2016-10-22 12:30:22 -05:00
Scott Lahteine
3544c3632f Merge pull request #5062 from thinkyhead/rc_warnings_fix
Warnings fixed redux
2016-10-22 12:21:36 -05:00
Petr Zahradník junior
8323d78ed7 Translated BLTOUCH and DAC strings 2016-10-22 19:12:21 +02:00
Scott Lahteine
e151f952a3 Apply encoder reverse options to keypad arrows 2016-10-22 11:51:33 -05:00
Scott Lahteine
cfb47929ca Merge pull request #5060 from thinkyhead/rc_fix_ugly_code
Reduce, clean up MINTEMP / MAXTEMP test code
2016-10-22 11:27:30 -05:00
Josef Pavlik
dca50737f5 fixed warning: ISO C++ forbids compound-literals 2016-10-22 11:23:16 -05:00
Josef Pavlik
0bd66807b2 fixed warning: extra ; 2016-10-22 11:12:29 -05:00
Josef Pavlik
d35dc407a8 fixed warning: ISO C99 requires rest arguments to be used 2016-10-22 11:12:29 -05:00
Josef Pavlik
c2b51af3ba fixed warning: ISO C does not permit named variadic macros 2016-10-22 11:12:29 -05:00
Scott Lahteine
0d3fc7dd89 Merge pull request #5059 from gcormier/fixbaby
Set defer delay back to false when exiting babystepping.
2016-10-22 10:59:17 -05:00
Scott Lahteine
f888597197 Reduce, clean up code for mintemp/maxtemp tests 2016-10-22 10:31:03 -05:00
Scott Lahteine
ad64723354 Move MAX_EXTRUDERS to pins.h 2016-10-22 10:07:51 -05:00
Scott Lahteine
5f5a55a0de Add a ZERO macro to clear arrays 2016-10-22 10:07:18 -05:00
Greg Cormier
0009725637 Set defer delay back to false when exiting babystepping. 2016-10-22 09:43:30 -04:00
Scott Lahteine
627f9d5285 Merge pull request #5056 from thinkyhead/rc_lin_adv_opt
LIN_ADVANCE optimizations
2016-10-22 07:06:39 -05:00
Scott Lahteine
0908329d96 Merge pull request #5057 from thinkyhead/rc_mbl_lcd_logical
Fix manual leveling coordinates
2016-10-22 06:31:02 -05:00
Scott Lahteine
14e60f0d3b Correct typo in configs
As pointed out by #5044
2016-10-22 05:56:32 -05:00
Scott Lahteine
1165e83263 MBL coordinates are logical 2016-10-22 05:55:44 -05:00
Scott Lahteine
dbfabb4c0a Merge pull request #5043 from Kaibob2/patch-5
Correct grammar and translation in language_de.h
2016-10-22 05:52:54 -05:00
Scott Lahteine
b19bba275f No LCD timeout during babystepping
As requested in #5031
2016-10-22 05:26:07 -05:00
Scott Lahteine
b9109b2875 Improve LIN_ADVANCE commentary (all configs) 2016-10-22 05:03:09 -05:00
Sebastianv650
9818d97587 Fix Z-hops during retract/prime lead to blobs
We don't want to have retract/prime movements done with LIN_ADVANCE, that's also true with simultaneously executed Z-hops.
2016-10-22 04:54:59 -05:00
Sebastianv650
599649e45d Add formula for LIN_ADVANCE_K
With this formula, a start value for K for further fine-calibration can be calculated.
2016-10-22 04:54:59 -05:00
Scott Lahteine
be7d245eff Merge pull request #5008 from thinkyhead/test_endstop_hits
Save some PROGMEM in MBL G28
2016-10-22 03:35:52 -05:00
Scott Lahteine
7c0e52256d Merge pull request #5053 from thinkyhead/rc_fix_baud_config
Patch BAUDRATE line in configs
2016-10-22 03:27:45 -05:00
Scott Lahteine
2783dcb4cc Save some RAM in MBL's G29 2016-10-22 02:52:56 -05:00
Scott Lahteine
4f5a8c05d5 Tweaks to endstops macros 2016-10-22 02:52:56 -05:00
Scott Lahteine
083d41a2c2 Remove redundant estep rate code from LIN_ADVANCE
As noted by https://github.com/MarlinFirmware/Marlin/pull/4971#issuecomment-252503295
2016-10-22 02:19:14 -05:00
Scott Lahteine
4f6bfabaad Patch BAUDRATE line in configs 2016-10-22 00:48:52 -05:00
Kai
2bfedb74d5 Correct grammar and translation in language_de.h
Made Filament change Text sound like correct german.
2016-10-19 14:56:46 +02:00
Roxy-3D
8ddd039e68 Merge pull request #5037 from esenapaj/Fix-for-the-commit-dc2cb84
Fix for the commit dc2cb84 (Revert acceleration limiting to avoid overflow)
2016-10-18 15:33:06 -05:00
esenapaj
1e1edeadd3 Fix for the commit dc2cb84 (Revert acceleration limiting to avoid overflow)
・Add forgotten '\'
2016-10-18 18:07:20 +09:00
Scott Lahteine
dc2cb8454c Revert acceleration limiting to avoid overflow 2016-10-17 17:08:41 -05:00
Scott Lahteine
6ae5cf17a9 Merge pull request #5033 from esenapaj/Fix-freezing-with-MAX31855
Fix freezing and MINTEMP Error with MAX31855 thermocouple
2016-10-17 16:22:20 -05:00
Scott Lahteine
f257c4bcae Merge pull request #5036 from thinkyhead/rc_dac_code_deps
Fix DAC current code
2016-10-17 16:19:00 -05:00
Scott Lahteine
b80cc0cbb5 Fix DAC current code 2016-10-17 15:17:57 -05:00
esenapaj
385bd8a4a3 Fix freezing and MINTEMP Error with MAX31855 thermocouple 2016-10-16 07:33:14 +09:00
Scott Lahteine
ca7275a67a Disable EXTRAPOLATE_FROM_EDGE by default 2016-10-14 14:44:28 -05:00
Scott Lahteine
0921c7da84 Merge pull request #4997 from thinkyhead/rc_jerk_from_mk2
Adapt Jerk / Speed code from Prusa MK2
2016-10-12 06:38:50 -05:00
Scott Lahteine
4d89652bc2 Apply minor optimizations to planner.cpp 2016-10-12 04:42:15 -05:00
Scott Lahteine
1092319b19 Adapt speed/jerk code based on Prusa MK2 branch 2016-10-12 04:42:14 -05:00
Scott Lahteine
37643fef63 Merge pull request #4972 from bgort/platformio-improvements
Move platformio directories out of source tree
2016-10-12 03:42:33 -05:00
Scott Lahteine
8e1cc9332a Replace block flag bools with flag bits
…and apply const to some method parameters
2016-10-10 23:17:49 -05:00
Scott Lahteine
d41f2bdbd8 Merge pull request #4991 from thinkyhead/rc_max31855_fix
Patches for Stepper DAC and MAX31855
2016-10-10 20:12:06 -05:00
Scott Lahteine
d2da14459f Merge pull request #4993 from thinkyhead/rc_planner_deps
Sort out some header dependencies
2016-10-10 20:11:27 -05:00
Scott Lahteine
e7cf566fc5 Do kinematic segments with buffer_line_kinematic
This breaks the raw option, but in the future perhaps all planner moves
will be sent in raw form instead of logical.
2016-10-10 17:14:03 -05:00
Scott Lahteine
a10e81dc2a Minor cleanup of set_bed_leveling_enabled 2016-10-10 17:14:03 -05:00
Scott Lahteine
029824bc49 Patch ADJUST_DELTA macro for SCARA 2016-10-10 17:14:03 -05:00
Scott Lahteine
5ce5a9c822 Marlin: planner.h tweak 2016-10-10 17:14:03 -05:00
Scott Lahteine
d963020532 Sort out some header dependencies 2016-10-10 17:14:03 -05:00
Scott Lahteine
e17f9b8b99 DAC patches
As suggested by #4985
2016-10-10 14:08:04 -05:00
Scott Lahteine
2cb5df8a56 Merge pull request #4984 from esenapaj/Small-fix-for-PR-#4980
Small fix for the PR #4980 (LIN_ADVANCE bug fix and optimization)
2016-10-10 13:30:47 -05:00
Scott Lahteine
b6221df3f3 Merge pull request #4983 from MarlinFirmware/revert-4933-rc_drop_pid_func_range
Revert "Removal of PID functional range"
2016-10-10 13:29:54 -05:00
Scott Lahteine
a07033a6c1 Merge pull request #4974 from esenapaj/Follow-up-the-PR-#4955
Fix and follow-up the PR #4955 (PINS_DEBUGGING and M43: Read pin states), etc
2016-10-10 13:27:52 -05:00
Scott Lahteine
f8199b2cc1 Merge pull request #4982 from thinkyhead/rc_abl_bugfix
Fix planner with kinematics, delta ABL
2016-10-10 13:24:22 -05:00
esenapaj
f41c60d4a4 Follow-up the PR #4955, etc
・More ANALOG NUMBERING to Analog Input
・Add comment header to all the section of all the pins files

・Sort sections as follows:
1. Some special definitions (USBCON, LARGE_FLASH, etc)
2. Servos
3. Limit Switches
4. Z Probe
5. Steppers
6. Temperature Sensors
7. Heaters / Fans
8. Misc. Functions
9. LCD / Controller

・Move MAX6675_SS into "Temperature Sensors" section
・Adjust spacing
2016-10-10 14:22:43 +09:00
esenapaj
00456b0cb3 Fix compilation errors 2016-10-10 14:22:43 +09:00
esenapaj
cfb5c24bc9 Small fix for the PR #4980 (LIN_ADVANCE bug fix and optimization)
・Fix a comment about timer
2016-10-10 07:48:42 +09:00
Scott Lahteine
149b8d9e4b Handle MAX31855 error conditions 2016-10-09 17:12:50 -05:00
Scott Lahteine
f4ec265363 Fix a typo 2016-10-09 16:45:29 -05:00
Scott Lahteine
4ec2d459e6 Fix mcp4728_setVref_all as followup to #4967 2016-10-09 16:45:00 -05:00
Scott Lahteine
1e551c0688 Revert "Squashed - Removal of PID functional range" 2016-10-09 16:27:45 -05:00
Scott Lahteine
4037df82b0 Merge pull request #4981 from esenapaj/Update-Japanese-language
Update Japanese translation, etc
2016-10-09 16:11:53 -05:00
Scott Lahteine
e4e290d957 Make EXTRUDER_RUNOUT_PREVENT kinematic compatible 2016-10-09 15:58:33 -05:00
Scott Lahteine
847429eff4 Make tool_change kinematic compatible 2016-10-09 15:58:32 -05:00
Scott Lahteine
a4a7ca10ca Make USE_DELTA_IK_INTERPOLATION compatible with ABL 2016-10-09 15:58:32 -05:00
Scott Lahteine
c5cac486f5 Use a, b, c instead of lx, ly, lz 2016-10-09 14:34:24 -05:00
Scott Lahteine
bbeaca5839 Merge pull request #4980 from thinkyhead/rc_lin_update
LIN_ADVANCE bug fix and optimization
2016-10-09 14:29:09 -05:00
Josef Pavlik
f8c2473a71 Improve planner kinematics, fix delta ABL 2016-10-09 13:32:46 -05:00
Scott Lahteine
48761f2021 Patch delta endstop adjustment config 2016-10-09 13:32:45 -05:00
Josef Pavlik
28d41b48e3 delta endstop adjustment configurable 2016-10-09 13:09:34 -05:00
Scott Lahteine
ff6b23cb0f Fix an issue with shifted LCD lines 2016-10-09 13:00:00 -05:00
Scott Lahteine
e4d2662d81 Use some macros in M48 2016-10-09 12:21:05 -05:00
Scott Lahteine
3752d9aca8 Fix timer comments 2016-10-09 12:11:00 -05:00
Sebastianv650
a448cedbc5 LIN_ADVANCE bug fix and optimization
.) long to int: Extruder stalls at 10kHz / 20kHz step limits with long.
.) Take the delta_adv_steps calculation out of the step_loops loop. Wasted calculation performance if done inside.
.) >> 2 replaced by 3: Is divide by 8. Reason: Timer 0 runs at 16/8=2MHz, Timer 1 at 16/64=0.25MHz. ==> 2/0.25=8.
2016-10-09 11:55:02 -05:00
esenapaj
b27080c1dd Update Japanese translation
・Add new translation
2016-10-10 01:52:51 +09:00
esenapaj
0780146034 Move DAC section from inside of the changing filament section 2016-10-10 01:17:46 +09:00
Scott Lahteine
fc93796e42 Merge pull request #4967 from thinkyhead/rc_dac_menu
Revised DAC Drive Strength Menu
2016-10-09 00:52:48 -05:00
Brian
9c0404eae4 Move platformio directories out of source tree 2016-10-08 13:45:26 -04:00
Scott Lahteine
a1b50f1102 Cleanup of code style 2016-10-07 15:57:24 -05:00
jaysonkelly
13c9dcc600 Add LCD menu for DAC 2016-10-07 15:13:03 -05:00
Scott Lahteine
00261cbfcb Merge pull request #4933 from thinkyhead/rc_drop_pid_func_range
Squashed - Removal of PID functional range
2016-10-07 15:07:55 -05:00
Scott Lahteine
ee01def16d Merge pull request #4955 from thinkyhead/rc_debug_pins
PINS_DEBUGGING and M43: Read pin states
2016-10-07 14:47:34 -05:00
Scott Lahteine
a0df34fd4c Add PINS_DEBUGGING advanced config option 2016-10-07 14:20:13 -05:00
Scott Lahteine
e21bab5243 PINS_DEBUGGING and M43 Read Pins 2016-10-07 14:11:48 -05:00
Scott Lahteine
3c97fa6e29 Merge pull request #4963 from esenapaj/Fix-for-advance-algorithm
Move routine of direction signal of ADVANCE and LIN_ADVANCE from Stepper::isr() to Stepper::advance_isr()
2016-10-07 00:33:42 -05:00
Scott Lahteine
48e63c4730 Comment some globals 2016-10-06 22:06:33 -05:00
Scott Lahteine
9a6c66602f Fix formatting of extrapolate debug output 2016-10-06 17:04:22 -05:00
Scott Lahteine
cd77eb5c40 Clear grid for bilinear G29 2016-10-06 17:00:53 -05:00
Scott Lahteine
53a0856f5c Print Y as int in print_bed_level 2016-10-06 16:46:54 -05:00
esenapaj
f8df88f271 Move routine of direction signal of ADVANCE and LIN_ADVANCE from Stepper::isr() to Stepper::advance_isr() 2016-10-07 02:01:29 +09:00
Roxy-3D
30fee51e86 Merge pull request #4958 from bgort/m48_improvements
Improve M48 output; Add min, max, range, etc.
2016-10-06 10:02:22 -05:00
Brian
357854a7ef tweak variables; 2016-10-05 19:49:05 -04:00
Brian
48cf19151a Improve M48 output; Add min, max, range, etc. 2016-10-05 16:09:39 -04:00
Scott Lahteine
c63cb45268 Fix thermal runaway timeout 2016-10-05 08:42:39 -05:00
Scott Lahteine
e6164d254d Clean up GCode command short comments 2016-10-05 06:13:30 -05:00
Scott Lahteine
47bd142b29 Should marlinAnalogInputToDigitalPin use analogInputToDigitalPin? 2016-10-05 06:13:30 -05:00
Scott Lahteine
bd8520e61d Label analog pins in a similar way
Some other pins formatting also
2016-10-05 06:13:30 -05:00
Scott Lahteine
0c0deb5194 Common pin_is_protected function 2016-10-05 04:41:27 -05:00
Scott Lahteine
49d77720d5 More support for 4th extruder or heater 2016-10-05 04:40:22 -05:00
Scott Lahteine
9dd56e61bd Merge pull request #4954 from thinkyhead/rc_more_debug_homing
Fix buzzer when both i2c and beeper pin are set
2016-10-05 03:39:47 -05:00
Scott Lahteine
46839c222a Comment and clean up some vars 2016-10-04 23:40:45 -05:00
Scott Lahteine
8910bb7c97 Fix buzzer conditional compile 2016-10-04 21:38:41 -05:00
Scott Lahteine
de7e798e6f Replace single-char S_ECHOs with S_CHAR 2016-10-04 21:38:41 -05:00
Scott Lahteine
0e83f34174 Tweak debugging of probe_pt 2016-10-04 21:38:00 -05:00
Scott Lahteine
cc02f6edf8 Merge pull request #4943 from esenapaj/Small-update-of-language_kana_h
Small update of language_kana.h
2016-10-04 03:21:57 -05:00
Scott Lahteine
ca26011e3c Merge pull request #4941 from MagoKimbra/rc_fix_M205
Add note for M205
2016-10-04 03:21:20 -05:00
Scott Lahteine
9485aa8f13 Include negative Z probe offset in clearance move 2016-10-03 16:18:04 -05:00
Scott Lahteine
5c1eb595e6 Fix for G2/G3 negative radius
As suggested in #4940
2016-10-03 14:48:44 -05:00
esenapaj
f09ae96f28 Small update of language_kana.h 2016-10-03 23:41:39 +09:00
MagoKimbra
7b37539fe7 Add note for M205 2016-10-03 08:54:15 +02:00
Scott Lahteine
d5f598cd82 Tweak probe debug, add newline 2016-10-02 17:35:40 -05:00
Scott Lahteine
c592ccb6f5 Patch max_jerk[Z] menu item 2016-10-02 10:12:47 -05:00
Scott Lahteine
d80a79eb77 Use right-shift instead of / 2, why not? 2016-10-02 07:01:40 -05:00
Rerouter
02fe9cf558 Removal of functional range constraint
Also lined up the >> 1 and / 2 mentioned earlier in the unconstrained I term issue,
2016-10-02 07:01:40 -05:00
Rerouter
5f5d87cad3 Update Configuration.h 2016-10-02 07:01:40 -05:00
Scott Lahteine
6abfc96165 Merge pull request #4936 from thinkyhead/rc_more_debug_homing
Put max_jerk vars in array, clean up jerk code
2016-10-02 06:54:54 -05:00
Scott Lahteine
761593b74b Cleanup some vars, use of min/max 2016-10-02 06:34:56 -05:00
Scott Lahteine
d19cfcfc1d max_jerk array, DEFAULT_XYJERK => DEFAULT_[XY]JERK 2016-10-02 06:34:56 -05:00
Scott Lahteine
911f7e436c Merge pull request #4934 from thinkyhead/rc_more_debug_homing
More detailed debugging of G28 delta
2016-10-02 03:17:58 -05:00
Scott Lahteine
e7dc174f30 More detailed debugging of G28 delta 2016-10-02 02:18:57 -05:00
Scott Lahteine
473f4a17a8 Merge pull request #4914 from Rerouter/PID-Unconstrained-Itemp
Pid unconstrained itemp
2016-10-01 06:58:07 -05:00
Scott Lahteine
bad8899ebc Merge pull request #4900 from thinkyhead/rc_g38_changes
Cleanup of G38.2 / G38.3
2016-10-01 06:57:17 -05:00
Scott Lahteine
73ce3a61c7 Cleanup, comment zigzag 2016-10-01 05:21:52 -05:00
Scott Lahteine
0d538f3db6 Add to all configurations 2016-10-01 05:00:53 -05:00
Scott Lahteine
919fe3e4b8 Rename feature to G38_PROBE_TARGET 2016-10-01 05:00:53 -05:00
Scott Lahteine
a2864ab7fe Patched up, cleaned up 2016-10-01 05:00:53 -05:00
Bob-the-Kuhn
2911aa7ffa code changes to implement G38 commands
1) modified 3 code files
Marlin.h
Marlin_main.cpp
endstops.cpp

2) modified config files so I could test on my machine

Testing was done on an AzteegX3pro based machine.

The probe was hooked to the Z_MIN endstop.

My controller doesn't have a dedicated Z_PROBE input so I couldn't test
that functionality.

Verified that a large file (without any G38 commands) executed the same
before and after the changes.

Verified that the head moves as expected when G38.2 and G38.3 commands
are issued. Single & multiple axis moves were tested along with + and -
directions.

Code was added to the main ISR. In normal operation only one extra IF
statement is evaluated. I didn't notice any performance degradation
because of the added code.

The G38 commands are expected to be issued manually by the operator
during machine setup. The G38 commands wait until the machine is idle
before proceeding. That way the other commands are minimally impacted
by the extra ISR overhead when a G38 command is in the queue.

The G38 commands are very similar to the G28 commands except 1) only the
Z_PROBE is used and movement can be in the + or - direction.

See issue 4677 for a discussion on adding G38 commands to Marlin.
Feature request: add ability to use G38.2 command (CNC)
MarlinFirmware/Marlin#4677
2016-10-01 05:00:53 -05:00
Scott Lahteine
74d048e77e Merge pull request #4927 from thinkyhead/rc_bltouch_noraise
Don't check Z_MAX on raise when the probe pwns the pin
2016-10-01 04:52:56 -05:00
Scott Lahteine
4afa293289 Say "BLTOUCH" in machine info report 2016-09-30 17:13:27 -05:00
Scott Lahteine
ed7d2694fc Don't check Z_MAX on raise when the probe pwns the pin 2016-09-30 16:41:30 -05:00
Rerouter
638b809d90 Merge pull request #3 from thinkyhead/rc_unconstrain_pid
Apply changes to all configs
2016-09-30 17:41:32 +10:00
Scott Lahteine
3bbdd48a4d Merge pull request #4918 from thinkyhead/rc_abl_patchups
Fix up ABL - Add PROBE_Y_FIRST option. Arduino 1.6.8 required.
2016-09-29 15:29:01 -05:00
Scott Lahteine
dac7a75054 Merge pull request #4919 from thinkyhead/rc_k8400_stops
K8400 has 1xXY an 2xZ endstop plugs
2016-09-29 15:24:57 -05:00
Scott Lahteine
fffc9fefa8 Apply changes to all configs 2016-09-29 02:17:33 -05:00
Scott Lahteine
587cb6c283 K8400 has 1xXY an 2xZ endstop plugs 2016-09-29 02:07:22 -05:00
Scott Lahteine
d234bc160e Require Arduino 1.6.8 to compile 2016-09-29 02:00:27 -05:00
Scott Lahteine
2d2c9bdf92 Add PROBE_Y_FIRST option for probe order 2016-09-29 02:00:27 -05:00
Scott Lahteine
c8c57e59fc Patch the end of G29 to sync plan position 2016-09-29 02:00:27 -05:00
Scott Lahteine
81b8c9f8ec Add XY parameters to G29 for mesh dimensions 2016-09-29 02:00:27 -05:00
Scott Lahteine
56cf674150 M420 can now enable/disable ABL 2016-09-29 02:00:26 -05:00
Scott Lahteine
06790977c4 Use updated position methods 2016-09-29 01:31:05 -05:00
Scott Lahteine
e8f2604a6f Patch print_bed_level numbering 2016-09-29 01:31:05 -05:00
Scott Lahteine
d066610514 Patch up bilinear_z_offset 2016-09-29 01:31:05 -05:00
Scott Lahteine
850e38d013 G30 will only disable bed leveling 2016-09-29 01:31:04 -05:00
Scott Lahteine
510ef5d14a Standard function to turn bed leveling on/off 2016-09-29 01:27:37 -05:00
Scott Lahteine
ecf7cdde65 Augment planner/stepper getters/setters 2016-09-29 01:27:37 -05:00
Scott Lahteine
2febd8ec82 Double-touch debugging 2016-09-29 01:27:37 -05:00
Scott Lahteine
b331077c32 Use stepper.get_axis_position_degrees 2016-09-29 01:27:37 -05:00
Scott Lahteine
0d9efb24f3 Fix up bilinear_z_offset 2016-09-29 01:26:22 -05:00
jaysonkelly
3b3d282f8e Adjusted values for Rigidboard Configuration
Rigidboard differs a little in configuration from the PrinterBoardRevF we modeled the code after.
2016-09-28 14:14:04 -05:00
Scott Lahteine
850259bb25 Watch bed temp also for Control menu item 2016-09-28 14:14:04 -05:00
esenapaj
92c03a44a9 Fix the PR #4899 (ABL: Enable by type. Bilinear for all.) etc.
About Configuration.h:
・Fix the PR #4899 (ABL: Enable by type. Bilinear for all.)
Remove Duplicated contents

・Fix the PR #4305 (Custom boot screen feature improvement)
Revert from "during boot" to "during bootup" in all the example
Configuration.h

・Fix the PR #4207 (Clean up, simplify and generalize the Allen-key-probe
code.)
Resolve and relocate the duplicated definitions in Z_PROBE_ALLEN_KEY
section

・Follow-up the PR #4805 (Additional documentation of Configuration.h)
Add forgotten changes to all the example Configuration.h

Adjust spacing

About Configuration_adv.h:
Add missing description of SLOWDOWN for DELTA

Adjust spacing
2016-09-28 14:14:04 -05:00
Rerouter
50e5ee4de4 Update Configuration.h 2016-09-28 17:38:09 +10:00
Rerouter
1a2f1d4974 Update temperature.cpp 2016-09-28 17:36:53 +10:00
Rerouter
a765c98850 Removal of the constraints of the Iterm 2016-09-28 17:26:49 +10:00
Scott Lahteine
8b46eb3766 Fix bilinear interpolation 2016-09-27 03:18:49 -05:00
Scott Lahteine
5100bdac81 Improve Bilinear Grid
- Extrapolate properly for even numbered grid points
- Extrapolate using average, not median
- Improve bilinear grid report output
- Add debug output for bilinear extrapolation
- Add option to extrapolate from edge, not center
2016-09-27 00:03:19 -05:00
Scott Lahteine
a3e91ec65e Add 'Q' option to G29 when debug leveling is on 2016-09-27 00:03:19 -05:00
Scott Lahteine
1fceda4fb0 Add leveling type and details to machine_info 2016-09-27 00:03:19 -05:00
Scott Lahteine
e0e0166075 Fix auto bed leveling - turn on after successful G29 2016-09-27 00:03:19 -05:00
Scott Lahteine
f4b9052529 Merge pull request #4899 from thinkyhead/rc_nonlinear_grid
ABL: Enable by type. Bilinear for all.
2016-09-26 15:25:09 -05:00
Scott Lahteine
18e40de39c Adjust final Z after bilinear G29 2016-09-26 00:22:22 -05:00
Scott Lahteine
ea0dbee3c9 Enable ABL by type, support bilinear on cartesian 2016-09-25 23:35:37 -05:00
Scott Lahteine
9cebbabd05 Merge pull request #4893 from thinkyhead/rc_stat_led_check
Define status LED pins without condition
2016-09-25 18:50:47 -05:00
Scott Lahteine
fd64233182 Merge pull request #4895 from thinkyhead/rc_implemented_codes
Include requirements in "Implemented Codes"
2016-09-25 11:49:31 -05:00
Scott Lahteine
5fff8d148b Clean up digital pots and microsteps 2016-09-25 11:16:22 -05:00
Scott Lahteine
570676d265 Include requirements in "Implemented Codes" 2016-09-25 07:50:33 -05:00
Scott Lahteine
cb48292338 Use fastio for literal pins 2016-09-25 06:33:38 -05:00
Scott Lahteine
07703d2bd6 Use _PIN suffix on some pins 2016-09-25 06:33:38 -05:00
Scott Lahteine
203e519bf4 Sanity check for status LED pins 2016-09-25 06:33:38 -05:00
Scott Lahteine
ba43277429 Always define status LED pins 2016-09-25 06:33:37 -05:00
Scott Lahteine
ad691022d7 Fix up spacing in A4JP pins 2016-09-25 06:33:37 -05:00
Scott Lahteine
fba0b67f7d Rename status led pins 2016-09-25 06:33:37 -05:00
Scott Lahteine
9d86c07702 Clean up some fastio.h spacing 2016-09-25 06:33:37 -05:00
Scott Lahteine
ab84ed22ca No such thing as G6 and G7 pins 2016-09-25 05:28:22 -05:00
Scott Lahteine
c2f13be750 Mightyboard Revision E 2016-09-25 05:28:04 -05:00
Scott Lahteine
041d127cd3 Match bltouch test in do_homing_move with new code 2016-09-24 23:58:08 -05:00
Scott Lahteine
eb4fa8adf8 Merge pull request #4889 from thinkyhead/rc_tweaky_fix
Fix HEATERS_PARALLEL
2016-09-24 14:46:00 -05:00
Scott Lahteine
16461900c2 Fix for HEATERS_PARALLEL 2016-09-24 05:34:40 -05:00
Scott Lahteine
1583d37edd Comment on M851 case 2016-09-24 05:34:36 -05:00
Scott Lahteine
076f3a8284 unsigned char => uint8_t 2016-09-24 05:23:40 -05:00
Scott Lahteine
8935bed594 MIDDLE_DEAD_ZONE => MIDDLE_DEAD_ZONE_R 2016-09-24 05:18:36 -05:00
Scott Lahteine
6cf0952bf9 Merge pull request #4887 from thinkyhead/rc_autumn_fixups
Improve MINIMUM_STEPPER_PULSE
2016-09-24 03:23:42 -05:00
Scott Lahteine
8061f1fac9 Merge pull request #4888 from thinkyhead/fix_warnings_etc
Suppress warnings, fix nonlinear_z_offset
2016-09-24 03:22:49 -05:00
esenapaj
7bdc58a818 Suppress warnings, fix nonlinear_z_offset 2016-09-24 03:06:08 -05:00
Scott Lahteine
9ecea6f445 Merge pull request #4885 from esenapaj/Update-Japanese-translation
Update Japanese translation
2016-09-24 02:49:18 -05:00
Scott Lahteine
eabff30e75 Improve MINIMUM_STEPPER_PULSE 2016-09-24 02:23:43 -05:00
esenapaj
3ed8f8331c Update Japanese translation
・Add new translation
2016-09-24 09:24:38 +09:00
Scott Lahteine
da1644313d Merge pull request #4883 from esenapaj/Follow-up-the-PR-#4860
Follow-up the PR #4860 (Fix BLTOUCH string and SERVO_DELAY)
2016-09-23 16:39:37 -05:00
Scott Lahteine
903b8bb60c No need for auto_bed_leveling_was_enabled 2016-09-23 16:38:22 -05:00
esenapaj
ee60225c07 Follow-up the PR #4860 (Fix BLTOUCH string and SERVO_DELAY) 2016-09-24 06:18:27 +09:00
Scott Lahteine
d0796fc54c Merge pull request #4868 from thinkyhead/rc_autumn_fixups
Cleanups for the Autumn release
2016-09-23 16:11:37 -05:00
Scott Lahteine
0951bffcc0 Sanity check homing bumps 2016-09-23 15:39:02 -05:00
Scott Lahteine
a9a21db39f No homing bump if bump distance is 0 (or less) 2016-09-23 15:39:02 -05:00
Scott Lahteine
2b4da57ea7 Patch Z safe homing for probe Z homing 2016-09-23 15:39:02 -05:00
Scott Lahteine
c6dd539c84 Print error for M42 bad pin 2016-09-23 15:39:02 -05:00
Scott Lahteine
8b399610fb Skip raw moves to current position 2016-09-23 15:39:02 -05:00
Scott Lahteine
22ece0081e Pass array pointer to unapply_leveling 2016-09-23 15:39:01 -05:00
Scott Lahteine
cbc158eb62 Add a proper flag for ABL enabled 2016-09-23 15:39:01 -05:00
Scott Lahteine
666e944336 Init xProbe/yProbe for compiler 2016-09-23 15:39:01 -05:00
Scott Lahteine
2c52e6ecf4 Clean up G28 MBL code 2016-09-23 15:39:01 -05:00
Scott Lahteine
0bf1054bb2 Patch do_homing_move for SCARA 2016-09-23 15:39:00 -05:00
Scott Lahteine
6ad0da661c Report position in G92 2016-09-23 15:39:00 -05:00
Scott Lahteine
199a7b5dd5 Tweak SCARA debugging 2016-09-23 15:39:00 -05:00
Scott Lahteine
865ad25781 Fix prepare_kinematic_move_to precision 2016-09-23 15:39:00 -05:00
Scott Lahteine
85e607153b Improve kinematic optimization options 2016-09-23 03:03:15 -05:00
Scott Lahteine
2846531f0b const argument in do_homing_move 2016-09-23 03:03:15 -05:00
Scott Lahteine
cc639d7d9c Less indentation in Stepper::isr 2016-09-23 03:03:14 -05:00
Scott Lahteine
7dec8071b2 Always synchronize in Stepper::set_position 2016-09-23 03:03:14 -05:00
Scott Lahteine
c6142aa2a1 Minor cleanups in Marlin_main.cpp 2016-09-23 03:03:14 -05:00
Scott Lahteine
0427f3cc3b Use memcpy/memset in planner 2016-09-23 03:03:14 -05:00
Scott Lahteine
6b9bf8e8fe Add Planner::sync_from_steppers
Use to sync the planner after an interrupted move (when not overriding
the logical position).
2016-09-23 03:03:14 -05:00
Scott Lahteine
be11a8a938 Fix debug in Planner::buffer_line 2016-09-23 03:03:13 -05:00
Scott Lahteine
b211df818e Make movement functions more available 2016-09-23 03:03:13 -05:00
Scott Lahteine
6335acbf5c Patch bug in linear unapply_leveling 2016-09-23 03:03:13 -05:00
Scott Lahteine
1370d9a52b Merge pull request #4875 from thinkyhead/rc_bltouch_update
Use probe clearance for bump when homing Z with probe
2016-09-22 16:57:08 -05:00
Scott Lahteine
e8d5073a90 Use probe clearance for bump when homing Z with probe 2016-09-22 15:41:28 -05:00
Scott Lahteine
dbe41245f1 Merge pull request #4821 from thinkyhead/rc_revert_to_raises
Z Raise/Clearance rather than Height
2016-09-22 15:30:07 -05:00
Scott Lahteine
747a2257dd Only deploy/stow BLTOUCH on downward move 2016-09-22 15:26:19 -05:00
Scott Lahteine
e242946ac3 Patch G29 for linear leveling, reachable with probe 2016-09-22 15:26:19 -05:00
Scott Lahteine
b800eb0fed Add probe option to position_is_reachable 2016-09-22 15:26:19 -05:00
Scott Lahteine
fafafcf9d1 Use unapply_leveling in set_current_from_steppers_for_axis 2016-09-22 15:26:18 -05:00
Scott Lahteine
e69d1e2879 Homing/probing feedrate, comments 2016-09-22 15:26:18 -05:00
Scott Lahteine
7d72ed688c Revert motor_current_setting to constexpr
We should use `constexpr` wherever it makes sense, for its added benefits. See http://stackoverflow.com/questions/13346879/const-vs-constexpr-on-variables
2016-09-22 15:26:18 -05:00
Scott Lahteine
145d9005d1 Fix BLTOUCH string and SERVO_DELAY 2016-09-21 01:45:23 -05:00
Scott Lahteine
2b7cc27c37 Merge pull request #4840 from thinkyhead/rc_G2_G3_arc_r_method
Add support for G2/G3 with R parameter
2016-09-21 01:30:37 -05:00
Scott Lahteine
e0e10e0e45 Merge pull request #4859 from thinkyhead/rc_kinematic_and_scara
Kinematic and SCARA patches
2016-09-21 01:21:49 -05:00
Scott Lahteine
31f03c838a Only deploy/stow BLTouch for Z axis 2016-09-21 00:54:54 -05:00
Scott Lahteine
0c951436e4 Extend SCARA test, stress-test ABL_GRID_POINTS_* 2016-09-20 18:48:06 -05:00
Scott Lahteine
3913e04ac7 Add Delta kinematic optimization options 2016-09-20 18:48:06 -05:00
Scott Lahteine
8e31640229 Optimize prepare_kinematic_move_to 2016-09-20 18:48:06 -05:00
Scott Lahteine
fd9b8ae4d4 Use position_is_reachable in G29, M48 2016-09-20 18:48:06 -05:00
Scott Lahteine
7194e4434f SCARA support in position_is_reachable 2016-09-20 18:48:06 -05:00
Scott Lahteine
1c5f9821c4 SCARA support in homeaxis 2016-09-20 18:48:05 -05:00
Scott Lahteine
92b4459f6c Simpler G92 for SCARA 2016-09-20 18:48:05 -05:00
Scott Lahteine
46cc2e3f6a Fix get_cartesian_from_steppers 2016-09-20 18:31:36 -05:00
Scott Lahteine
435c3ed404 Patch SCARA_move_to_cal for coordinate space 2016-09-20 18:31:36 -05:00
Scott Lahteine
5efb12e889 Simpler report_current_position for SCARA 2016-09-20 18:31:36 -05:00
Scott Lahteine
83fc5e1540 No line_to_* functions with IS_KINEMATIC 2016-09-20 18:31:36 -05:00
Scott Lahteine
59d39d7655 G0 direct move for SCARA 2016-09-20 18:31:36 -05:00
Scott Lahteine
ad9d6870ed SCARA support in do_blocking_move_to 2016-09-20 18:31:36 -05:00
Scott Lahteine
8542ebcecd prepare_move_to_destination_raw => prepare_uninterpolated_move_to_destination 2016-09-20 18:31:36 -05:00
Scott Lahteine
f900f97611 Update sw endstops in set_axis_is_at_home 2016-09-20 18:31:36 -05:00
Scott Lahteine
0d43cef1de M206 for MORGAN_SCARA 2016-09-20 18:31:36 -05:00
Scott Lahteine
e94cb7a380 MORGAN_SCARA kinematics 2016-09-20 18:31:36 -05:00
Scott Lahteine
890bade2fa Additions, mods to SCARA config 2016-09-20 18:31:36 -05:00
Scott Lahteine
01f1028510 Try on "CLEARANCE" for size 2016-09-20 18:29:49 -05:00
Scott Lahteine
0e7d638a7a Revert to Probe Raise rather than Probe Height 2016-09-20 18:29:49 -05:00
Scott Lahteine
82b0014f5e Merge pull request #4856 from thinkyhead/rc_bltouch_update
Fix and extend BLTouch support
2016-09-20 17:13:52 -05:00
Scott Lahteine
51e42a2d77 Adjust BLTouch probe behavior
Addressing #4855
- Have the pin deploy only immediately before probing
- Have the pin retract immediately after every probe
2016-09-20 16:20:36 -05:00
Scott Lahteine
13523cbf29 Fix and extend BLTouch support 2016-09-20 16:20:36 -05:00
Scott Lahteine
5cbed13f41 'constexpr' => 'const' for PWM_MOTOR_CURRENT 2016-09-20 15:57:48 -05:00
Scott Lahteine
be3a8f4126 Merge pull request #4857 from thinkyhead/rc_fix_travis_u8glib
Arduino 1.6.10, direct download U8glib in Travis CI
2016-09-20 15:52:53 -05:00
Scott Lahteine
ed759626fe Arduino 1.6.10, direct download U8glib in Travis CI 2016-09-20 15:35:33 -05:00
Scott Lahteine
7ae351c92f Merge pull request #4842 from thinkyhead/rc_DISABLE_Z_MIN_PROBE_ENDSTOP_whassup
Drop DISABLE_Z_MIN_PROBE_ENDSTOP, clean up probe config
2016-09-20 12:16:51 -05:00
Scott Lahteine
ba94c89e21 Merge pull request #4852 from esenapaj/Fix-for-advance-extrusion-algorithms
Fix for advance extrusion algorithms
2016-09-20 11:33:14 -05:00
Scott Lahteine
e87ad155cc Merge pull request #4851 from thinkyhead/rc_linear_grid
Patch G29 for 3-point leveling
2016-09-20 11:29:59 -05:00
esenapaj
954563d603 Adjust spacing 2016-09-20 19:35:44 +09:00
esenapaj
7e9576dc5b Extend the e_steps[] from int to long for allowing more than 32,767 E steps
Probably needed for long straight lines when using high microstepping
2016-09-20 19:35:44 +09:00
esenapaj
b04ed8f9c3 Fix inverted stepper signal of ADVANCED and LIN_ADVANCED 2016-09-20 19:35:44 +09:00
esenapaj
8692748ecd Fix broken direction signal of ADVANCED and LIN_ADVANCED
Remove a setting proccess of E direction in advance_isr()
2016-09-20 19:35:44 +09:00
Scott Lahteine
e9ce42353e Patch G29 for 3-point leveling 2016-09-20 04:46:41 -05:00
Scott Lahteine
c2744d8a8b Add support for G2/G3 with R parameter 2016-09-19 00:35:09 -05:00
Scott Lahteine
e05af606a8 Clean up probe config options 2016-09-19 00:26:16 -05:00
Scott Lahteine
153e240cdd Probe conditionals to Conditionals_LCD.h 2016-09-19 00:25:53 -05:00
Scott Lahteine
ff38a3c3b1 Use SD Detect Pin 53 for 3DRAG, K8200, and K8400
See #4316
2016-09-18 23:46:09 -05:00
Scott Lahteine
9a9e9afcf8 Merge pull request #4839 from thinkyhead/rc_bltouch_servo_nr
Better BLTOUCH support
2016-09-18 23:42:16 -05:00
Scott Lahteine
f38a33a5d8 Add handling of BLTouch error state 2016-09-18 22:00:32 -05:00
Scott Lahteine
c4dcfa254e Allow override of Z_ENDSTOP_SERVO_NR with BLTOUCH 2016-09-18 22:00:32 -05:00
Scott Lahteine
7d9ebda478 Remove redundant servo probe sanity check 2016-09-18 21:46:18 -05:00
Scott Lahteine
f0beae7641 Fix stupid, stupid, stupid oversight in G29 update
Mea culpa!
2016-09-18 16:24:47 -05:00
Scott Lahteine
127d796420 Merge pull request #4837 from thinkyhead/rc_nonlinear_in_planner
Handle nonlinear bed-leveling in Planner
2016-09-18 15:31:51 -05:00
Scott Lahteine
77639672d7 Move NONLINEAR bed leveling to planner
This is in advance of moving non-linear bed leveling to the planner
class.
2016-09-18 13:50:38 -05:00
Scott Lahteine
9429c7db89 Use ABC indices in delta[] 2016-09-18 13:50:38 -05:00
Scott Lahteine
5f2f991192 Use 'logical' rather than 'target' or 'cartesian' 2016-09-18 13:50:38 -05:00
Scott Lahteine
40d3e854f6 Remove redundant extern delta[] 2016-09-18 13:39:47 -05:00
Scott Lahteine
2ebfbc4c8d Merge pull request #4836 from thinkyhead/rc_some_comments
Some comments, const args, debug output tweaks
2016-09-18 13:38:07 -05:00
Scott Lahteine
48fe2fdc9e Merge pull request #4835 from thinkyhead/rc_abl_non_square_grid
Allow non-square Auto Bed Leveling grid
2016-09-18 13:37:43 -05:00
Scott Lahteine
e5505e3b33 Allow non-square leveling grid 2016-09-18 13:11:20 -05:00
Scott Lahteine
2fc9ad6657 Use const ref args in probe_pt 2016-09-18 12:58:43 -05:00
Scott Lahteine
2c2688d7ad Adjust comments, spacing 2016-09-18 12:58:42 -05:00
Scott Lahteine
b9d19b0008 Tweak extrapolate_one_point 2016-09-18 12:58:42 -05:00
Scott Lahteine
3c0b591935 Fix nozzle position description 2016-09-18 12:58:42 -05:00
Scott Lahteine
18d8dd4c0f set_current_from_steppers_for_axis const arg 2016-09-18 12:58:42 -05:00
Scott Lahteine
edfaf1c582 Stepper::report_positions patch 2016-09-18 12:58:42 -05:00
Scott Lahteine
d1f4c3d73b Patch sync_plan_position comment 2016-09-18 12:58:41 -05:00
Scott Lahteine
0c25af30d4 Document homeaxis 2016-09-18 12:58:41 -05:00
Scott Lahteine
e7882e45e3 Document set_axis_is_at_home 2016-09-18 12:58:40 -05:00
Scott Lahteine
fef959c31a Merge pull request #4834 from thinkyhead/rc_code_bool
Standardize code_value_bool
2016-09-18 12:44:20 -05:00
Scott Lahteine
07ac9a1152 Merge pull request #4822 from blubbfish/patch-3
Tweak some german language strings
2016-09-18 11:38:22 -05:00
Scott Lahteine
661fe09ce7 Standardize code_value_bool 2016-09-18 11:32:32 -05:00
Scott Lahteine
20e5140e75 Merge pull request #4833 from thinkyhead/rc_no_scara_axis_scaling
Remove SCARA axis_scaling
2016-09-18 11:31:50 -05:00
Scott Lahteine
37258956d5 Merge pull request #4832 from thinkyhead/rc_fix_M0_M1
Enable M0/M1 with Emergency Parser
2016-09-18 11:31:36 -05:00
Scott Lahteine
a501f430eb Enable M0/M1 with Emergency Parser 2016-09-18 11:14:10 -05:00
Philip Schell
cd8b22b527 Tweak some german language strings
Change some string to get a better wording in german
2016-09-16 22:29:39 +02:00
Scott Lahteine
83a41c7ceb Remove SCARA axis_scaling 2016-09-16 15:21:18 -05:00
Scott Lahteine
d41eeb62af Merge pull request #4781 from thinkyhead/rc_final_z_correction
Use simplified Z correction in G29 when possible
2016-09-16 15:14:19 -05:00
Scott Lahteine
502150046c Merge pull request #4805 from thinkyhead/rc_config_adjustment
Additional documentation of Configuration.h
2016-09-16 15:13:20 -05:00
Scott Lahteine
a1812b55f6 Space out array values 2016-09-16 14:41:05 -05:00
Scott Lahteine
d4599fd8ed Comment patches to Configuration.h 2016-09-16 14:41:05 -05:00
Scott Lahteine
723e983073 Default EXTRUDE_MAXLENGTH to 200mm 2016-09-16 14:41:04 -05:00
Scott Lahteine
b08bd84f8e Merge pull request #4806 from blubbfish/patch-2
Update language_de.h
2016-09-16 14:39:20 -05:00
Scott Lahteine
939bf1057c Merge pull request #4820 from darrelhunt/RCBugFix
Fixing Pin Definition Files to Define USBCON
2016-09-16 14:33:38 -05:00
darrelhunt
7b8bfa4358 Update pins_TEENSYLU.h 2016-09-16 11:26:37 -07:00
darrelhunt
829c8592f2 Update pins_TEENSY2.h 2016-09-16 11:26:09 -07:00
darrelhunt
e0aee20327 Update pins_SAV_MKI.h 2016-09-16 11:25:42 -07:00
darrelhunt
88d3fc0bcf Update pins_PRINTRBOARD.h 2016-09-16 11:25:14 -07:00
darrelhunt
4277221abb Update pins_BRAINWAVE_PRO.h 2016-09-16 11:24:32 -07:00
darrelhunt
b8ecbe9116 Update pins_BRAINWAVE.h 2016-09-16 11:23:52 -07:00
darrelhunt
60f757077e Update pins_5DPRINT.h 2016-09-16 11:22:52 -07:00
Scott Lahteine
4ca837b6cf Merge pull request #4815 from tnw513/fix-italian
Added missing translation (Italian)
2016-09-15 19:08:28 -05:00
Silvio Didonna
ff2b2d5939 Added missing translations 2016-09-16 01:17:58 +02:00
Philip Schell
2b11c3274c Update language_de.h 2016-09-15 15:16:11 +02:00
Philip Schell
54e6d12382 Update language_de.h
@MarlinFirmware/language-team updated german languagefile to the latest english version
2016-09-14 14:17:21 +02:00
Scott Lahteine
57564ae576 Use last probe point to correct Z when possible 2016-09-14 02:03:43 -05:00
Scott Lahteine
e40646de42 Merge pull request #4803 from thinkyhead/rc_lcd_button_fix
Clear LCD button state, apply timer to all
2016-09-13 18:03:39 -05:00
Scott Lahteine
2fce217576 Merge pull request #4804 from thinkyhead/rc_fix_broken_G29
Fix some regressive typos in G29
2016-09-13 17:51:38 -05:00
Scott Lahteine
29f224594c Fix some regressive typos in G29 2016-09-13 17:31:02 -05:00
Scott Lahteine
5ecc7d9f25 Clear LCD button state, apply timer to all
Addressing #3007
2016-09-13 16:10:27 -05:00
Scott Lahteine
94d5cf8721 Merge pull request #4789 from thinkyhead/rc_better_leveling_etc
Various cleanups ahead of more…
2016-09-13 05:21:17 -05:00
Scott Lahteine
9b0931ef74 Apply fixed EXTRUDER_RUNOUT_PREVENT 2016-09-13 03:33:04 -05:00
Scott Lahteine
b1a60e8954 Reformat, rearrange, tweak, and document
- Add comments to several functions
- Add an option to use Fast SQRT for Delta IK
- Group related functions together
- Outdent some leveling-related functions
2016-09-13 03:33:04 -05:00
Scott Lahteine
61284cbd8c Various code style adjustments 2016-09-13 03:33:04 -05:00
Scott Lahteine
788a16fc46 Clean up serial out code 2016-09-13 03:33:03 -05:00
Scott Lahteine
0e38bea79d Shrink 3-point leveling code 2016-09-13 03:33:03 -05:00
Scott Lahteine
4f75ce6957 Unify reset_bed_level for linear/non-linear 2016-09-13 03:33:03 -05:00
Scott Lahteine
41d8149bce Sanity check for more than 1 controller 2016-09-13 03:33:02 -05:00
Scott Lahteine
40785ce8ac Use count method for kinematic sanity check 2016-09-13 03:33:02 -05:00
Scott Lahteine
3236762e07 Clean up sanity check for LCD_PROGRESS_BAR 2016-09-13 03:33:02 -05:00
Scott Lahteine
a9ed23225f bed_level => bed_level_grid 2016-09-13 03:33:02 -05:00
Scott Lahteine
82be65065c Fix up untilted_stepper_position and set_current_from_steppers_for_axis 2016-09-13 03:33:01 -05:00
Scott Lahteine
d65f5d816f Patch to fix kinematics 2016-09-13 03:33:01 -05:00
Scott Lahteine
e529c6407e Rename set_cartesian_from_steppers, cartesian_position 2016-09-13 03:33:01 -05:00
Scott Lahteine
c109399bf6 Fix planner leveling and rename arguments
Use lx, ly, lz for “logical” positions
2016-09-13 03:33:01 -05:00
Scott Lahteine
d4f21af6b3 sync_plan_position_delta => sync_plan_position_kinematic 2016-09-13 03:33:01 -05:00
Scott Lahteine
acd1b6e9c0 Rename delta_grid spacing for general nonlinear 2016-09-13 03:33:00 -05:00
Scott Lahteine
c5fa70809b Implement M0/M1 for EMERGENCY_PARSER 2016-09-13 03:33:00 -05:00
Scott Lahteine
786d1afb72 Add position_is_reachable, use in home_z_safely 2016-09-13 03:33:00 -05:00
Scott Lahteine
b4034915f8 Move z safe homing to its own function 2016-09-13 03:33:00 -05:00
Scott Lahteine
c84b14c77a Move delta homing to its own function 2016-09-13 03:32:59 -05:00
Scott Lahteine
f9a192c7e3 Move setup() and loop() to the end 2016-09-13 03:32:59 -05:00
Scott Lahteine
8ff338c2b9 Patch stepper.h for SCARA 2016-09-13 03:32:59 -05:00
Scott Lahteine
74d7f5e57b Patch SCARA example config 2016-09-13 03:32:59 -05:00
Scott Lahteine
6ab54c60b1 Add conditionals for kinematics, leveling 2016-09-13 03:32:59 -05:00
Scott Lahteine
21514568fd Add enum for ALL_AXES 2016-09-13 03:32:58 -05:00
Scott Lahteine
413b61e64a Add HYPOT2 and float comparison macros 2016-09-13 03:32:58 -05:00
Scott Lahteine
0ea7ed6db6 Merge pull request #4797 from thinkyhead/rc_runout_comments
Fix comment on FILAMENT_RUNOUT_SENSOR
2016-09-13 02:25:26 -05:00
Scott Lahteine
a6f6ed352b Fix comment on FILAMENT_RUNOUT_SENSOR 2016-09-13 02:14:34 -05:00
Scott Lahteine
48e14d049a Merge pull request #4710 from thinkyhead/rc_fix_leveling_maths
Bed leveling that accounts for home XYZ
2016-09-10 15:47:39 -05:00
Scott Lahteine
416821a71c Merge pull request #4765 from thinkyhead/rc_endstop_direction
Sanitycheck endstop plugs based on homing direction
2016-09-10 14:49:50 -05:00
Scott Lahteine
9248cfb0ad Bed leveling that accounts for home XYZ 2016-09-10 13:47:21 -05:00
Scott Lahteine
2e8fd70fb1 Merge pull request #4779 from thinkyhead/rc_cleanups_1
Minor code cleanup, tweak M109/M190
2016-09-10 13:47:05 -05:00
Scott Lahteine
6ac9d895ca Tweak Filament Width variables 2016-09-10 13:29:25 -05:00
Scott Lahteine
68ba45572e Don't say "heating complete" unless done 2016-09-10 13:29:25 -05:00
Scott Lahteine
2bfc6fe1b0 Move XYZ constants closer to the top 2016-09-10 13:25:44 -05:00
Scott Lahteine
12b94e419f Sanitycheck endstop plugs based on homing direction 2016-09-08 13:56:32 -05:00
Scott Lahteine
29c4f67a29 Additional path - followup to #4743 2016-09-07 15:08:12 -05:00
Scott Lahteine
8a8d6e00b7 Merge pull request #4756 from thinkyhead/rc_makefilefix
makefile fix for arduino 1.6.9 unzipped
2016-09-03 20:24:26 -05:00
Robert Bartl
494d5770b8 makefile fix for arduino 1.6.9 unzipped 2016-09-03 19:45:27 -05:00
Scott Lahteine
6f71bd7372 Merge pull request #4754 from thinkyhead/rc_mixing_regression
Unify counter_m and counter_M
2016-09-02 12:27:43 -05:00
Scott Lahteine
9bf78ef465 Fix capitalization of counter_m 2016-09-02 11:31:45 -05:00
Scott Lahteine
42b5616327 Try bool for direction instead of long 2016-09-02 11:28:48 -05:00
Scott Lahteine
cbe9ab902c Merge pull request #4747 from thinkyhead/rc_sd_show_percent
Option to show SD percent on Graphical LCD
2016-09-02 07:44:42 -05:00
Scott Lahteine
f20b2b21eb Optimize LCD string/char printing 2016-09-02 06:41:24 -05:00
Scott Lahteine
3b2f7ba225 Merge pull request #4748 from thinkyhead/rc_sd_print_timer
Patch duration_t toDigital method
2016-09-02 04:41:11 -05:00
Scott Lahteine
dad94d2fef Merge pull request #4749 from thinkyhead/rc_minumum_minimum
Fix a misspelling of minimum
2016-09-02 04:41:00 -05:00
Kai
445d8215e4 Option to show SD percent on Graphical LCD 2016-09-02 02:17:36 -05:00
Scott Lahteine
d07a913f21 Tweak to stepper advance e_steps update 2016-09-02 02:06:17 -05:00
Scott Lahteine
aaef7c6b89 Fix a misspelling of minimum 2016-09-02 01:42:38 -05:00
Scott Lahteine
ad659b5f91 Merge pull request #4725 from thinkyhead/rc_log_machine_info
Log machine info in G28 and G29
2016-09-01 23:58:59 -05:00
Scott Lahteine
c6859a1e54 Handle hours >= 100 2016-09-01 23:54:48 -05:00
Kai
9f706a9635 Patch duration_t toDigital method 2016-09-01 23:34:15 -05:00
Scott Lahteine
c3caa42630 Merge pull request #4738 from thinkyhead/rc_ensure_floats
Optimize stepper ISRs, plus cleanup, shorthand
2016-09-01 14:36:22 -05:00
Scott Lahteine
3ff657e729 Merge pull request #4727 from thinkyhead/rc_homing_together
Add heading for movement settings
2016-09-01 14:26:46 -05:00
Scott Lahteine
426f662586 Apply MINIMUM_STEPPER_PULSE in stepper advance_isr 2016-08-30 14:31:48 -05:00
Scott Lahteine
8c7ee4599e Optimize stepper advance_isr 2016-08-30 14:31:48 -05:00
Scott Lahteine
9725bcd099 Minor "optimizations" in stepper ISR 2016-08-30 14:21:43 -05:00
Scott Lahteine
4ec3d1ea58 Add some commentary to stepper ISR 2016-08-30 14:21:15 -05:00
Scott Lahteine
d9bcc7bb45 Set a bool when a stepper block is done 2016-08-30 14:20:48 -05:00
Scott Lahteine
08f717e5f7 Use bit-size typedefs for some stepper vars 2016-08-30 14:19:49 -05:00
Scott Lahteine
d554c1dda8 Clean up planner kernel pass methods 2016-08-30 14:16:13 -05:00
Scott Lahteine
b2e5ec85d7 Add [XYZ]_CENTER conditionals 2016-08-30 14:15:41 -05:00
Scott Lahteine
7e20448a2d Add HOMING_Z_WITH_PROBE conditional 2016-08-30 13:29:26 -05:00
Scott Lahteine
0e4107da34 Minor cleanup of homeaxis, etc. 2016-08-30 13:29:26 -05:00
Scott Lahteine
f1201e11c7 Improve the Jerk description 2016-08-29 12:39:21 -05:00
Scott Lahteine
3f038bef00 Heading for movement settings 2016-08-29 02:01:34 -05:00
Scott Lahteine
fd2269f489 Log machine info in G28 and G29 2016-08-28 20:48:28 -05:00
Scott Lahteine
6eaf4f4909 Fix spacing of debug output in homeaxis 2016-08-28 19:43:33 -05:00
Scott Lahteine
1e6d1c39ea Improve verbiage of dropsegments sanity error 2016-08-28 19:40:32 -05:00
Scott Lahteine
0729a8f08d Use the probe travel height for pre-probe move
Instead of using the home_bump for Z to move close to the bed before doing a slow probe, use the probe travel height.
2016-08-28 19:13:08 -05:00
Scott Lahteine
dd94d0b9d5 Fix bed probing bug without PROBE_DOUBLE_TOUCH
If `PROBE_DOUBLE_TOUCH` wasn't enabled, the probe move could be way too short! See #4701 for example.
2016-08-28 19:00:25 -05:00
Scott Lahteine
35a0c46f16 Tweak debug output for probe in G29 2016-08-28 18:44:44 -05:00
Scott Lahteine
a82a89bc58 Merge pull request #4722 from thinkyhead/rc_minimum_stepper_pulse
MINIMUM_STEPPER_PULSE option
2016-08-28 10:03:32 -05:00
Scott Lahteine
73c5c312c9 Merge pull request #4723 from thinkyhead/rc_fix_some_text
Fix Danish encoding and an error message
2016-08-28 10:02:46 -05:00
Scott Lahteine
a2572d2854 Fix Danish encoding and an error message 2016-08-28 09:51:06 -05:00
Scott Lahteine
759234af60 MINIMUM_STEPPER_PULSE option 2016-08-27 23:58:40 -05:00
Scott Lahteine
2cb63f0bf7 Merge pull request #4719 from thinkyhead/rc_delta_homing_patch
Marlin patches for homing, esp. Delta
2016-08-27 20:46:50 -05:00
Scott Lahteine
8241cf9901 Merge pull request #4720 from thinkyhead/rc_allow_stepper_omission
Patch stepper.cpp to allow omitting steppers
2016-08-27 20:36:22 -05:00
Scott Lahteine
7e893f4309 Merge pull request #4721 from thinkyhead/rc_temperature_isr_comments
Rc temperature isr comments
2016-08-27 20:36:03 -05:00
Scott Lahteine
73d86098b7 Marlin patches for homing, esp. Delta 2016-08-27 20:32:05 -05:00
Scott Lahteine
338bc768b1 Merge pull request #4717 from thinkyhead/rc_log_the_probe
Debug logging of nozzle type and offsets
2016-08-27 20:24:19 -05:00
Scott Lahteine
fae92e3f3c Merge pull request #4718 from thinkyhead/rc_twibus_patch_20160827
TWIBus patch for proper use of Wire.requestFrom
2016-08-27 20:22:53 -05:00
Scott Lahteine
a485a19052 Added optional planner logging 2016-08-27 20:12:22 -05:00
Scott Lahteine
e9bfca5870 Additional comments for Temperature::isr 2016-08-27 20:12:22 -05:00
Scott Lahteine
a255945f29 Add DEBUG_ALL enum 2016-08-27 20:12:22 -05:00
Scott Lahteine
a28e15399f Patch stepper.cpp to allow omitting steppers 2016-08-27 20:11:17 -05:00
Scott Lahteine
2b226bc5c2 TWIBus patch for proper use of Wire.requestFrom 2016-08-27 20:09:28 -05:00
Scott Lahteine
d641344d3a Remove redundant probe offset in homing 2016-08-27 19:58:56 -05:00
Scott Lahteine
fb19a3cdec Merge pull request #4649 from thinkyhead/rc_boelle_danish_update
Danish update (18 Aug 2016)
2016-08-27 19:06:05 -05:00
Scott Lahteine
00638131e5 Debug logging of nozzle type and offsets 2016-08-27 15:21:01 -05:00
Scott Lahteine
8e9ac72191 Merge pull request #4709 from thinkyhead/rc_log_the_reason
Log whether homing with probe or endstop
2016-08-26 17:05:55 -05:00
Scott Lahteine
991a34aff2 Log whether homing with probe or endstop 2016-08-26 15:50:10 -05:00
Scott Lahteine
3b93b79f5c Merge pull request #4703 from bgort/RCBugFix
Add note suggesting RAMBo users use the RAMBo board type or platformio environment
2016-08-26 14:53:56 -05:00
Scott Lahteine
00cdb15cec Move invariant LCD strings to language.h 2016-08-26 02:48:57 -05:00
Bo Herrmannsen
d2ae5b00d9 Danish up to date (18 Aug 2016) 2016-08-26 02:48:57 -05:00
Scott Lahteine
0c892357a7 Merge pull request #4693 from thinkyhead/rc_pins_cleanup_aug23
Cleanup of pins files, Conditionals
2016-08-25 21:35:36 -05:00
Scott Lahteine
e78274a7f4 Consistent order/formatting of pins files 2016-08-25 20:59:45 -05:00
Scott Lahteine
11e9530111 Properly handle probe pin for BQ printers 2016-08-25 20:59:44 -05:00
Scott Lahteine
1968983f35 Move PROBE_SELECTED to an earlier point 2016-08-25 20:59:44 -05:00
Brian
2fae32f35f Add note suggesting RAMBo users use the RAMBo board type or platformio environment;
Add note that Viki 2.0 wiring diagram v1.2 has a mistake in it;
2016-08-25 15:05:29 -04:00
Scott Lahteine
2c3de5ee46 Merge pull request #4691 from esenapaj/Suppress-warnings
Suppress warnings
2016-08-24 21:35:18 -05:00
Scott Lahteine
37ac540a26 Fix unsigned/signed comparison in fanPin loop 2016-08-24 21:34:30 -05:00
esenapaj
1749a7fae3 Suppress warning 2016-08-24 00:18:06 +09:00
Scott Lahteine
d07d85ac9f Ensure probe points at the delta edge are kept 2016-08-23 05:09:56 -05:00
Scott Lahteine
13e337ac4b Merge pull request #4688 from AnHardt/crittical_section
Repair MarlinSerial with TX-buffer
2016-08-23 03:31:12 -05:00
AnHardt
7e36b76af2 Repair MarlinSerial with TX-buffer
These '{' are important to avoid the redefinition of `unsigned char _sreg = SREG;`
at the same level.
Used in
```
#define CRITICAL_SECTION_START  unsigned char _sreg = SREG; cli();
```
2016-08-22 23:40:09 +02:00
Scott Lahteine
6b274e563d Merge pull request #4685 from thinkyhead/rc_gege2b_french
Update french language
2016-08-22 14:20:54 -05:00
Gege2B
1e65f1a1d8 Update french language 2016-08-22 12:46:58 -05:00
Scott Lahteine
d8f4f263e0 Merge pull request #4673 from thinkyhead/rc_segments_steps_move
MIN_SEGMENTS_FOR_MOVE => MIN_STEPS_PER_SEGMENT
2016-08-21 09:34:06 -05:00
Scott Lahteine
ab59280075 MIN_SEGMENTS_FOR_MOVE => MIN_STEPS_PER_SEGMENT
Follow-up to #4666
2016-08-21 08:56:03 -05:00
Scott Lahteine
27b80b1dd1 Merge pull request #4667 from thinkyhead/rc_M211_sw_endstop_switch
M211: Enable/Disable Software Endstops
2016-08-21 06:44:00 -05:00
Scott Lahteine
f9e3347d6f Merge pull request #4669 from thinkyhead/rc_config_descriptions
PREVENT_DANGEROUS_EXTRUDE => PREVENT_COLD_EXTRUSION
2016-08-21 06:41:57 -05:00
Scott Lahteine
14a03727e1 Tweak serialprintPGM 2016-08-21 00:10:09 -05:00
Scott Lahteine
2f223b8c79 Use ABC and XYZ for "3" 2016-08-21 00:10:08 -05:00
Scott Lahteine
4cd1ad8f28 Adjustments to M209, G28, M605 2016-08-21 00:10:08 -05:00
Scott Lahteine
e354cf5884 Apply sw_endstops_enabled to manual move 2016-08-21 00:10:08 -05:00
Scott Lahteine
280534c06f Add M211: Enable/Disable Software Endstops 2016-08-21 00:10:08 -05:00
Scott Lahteine
01d4703429 PREVENT_DANGEROUS_EXTRUDE => PREVENT_COLD_EXTRUSION
Also improve the documentation of this and related options, and set
EXTRUDE_MINTEMP to 170 everywhere.
2016-08-20 23:35:27 -05:00
Scott Lahteine
a1f6cf1e5d Merge pull request #4665 from thinkyhead/rc_lcd_not_ultipanel
Clean up ultralcd code, dependencies on ULTIPANEL
2016-08-20 22:43:17 -05:00
Scott Lahteine
1a255afa36 Merge pull request #4666 from thinkyhead/rc_dropsegments_adj
dropsegments => MIN_SEGMENTS_FOR_MOVE
2016-08-20 22:42:16 -05:00
Scott Lahteine
374f8d2014 dropsegments => MIN_SEGMENTS_FOR_MOVE 2016-08-20 18:52:15 -05:00
Scott Lahteine
76c3f326ff Clean up DOGM code, comments 2016-08-20 18:33:12 -05:00
Scott Lahteine
71319adbb8 Wrap ULTIPANEL-dependent code 2016-08-20 18:33:11 -05:00
Scott Lahteine
305913545e Move number-to-string function to utility.* 2016-08-20 18:33:11 -05:00
Scott Lahteine
394c80c87b Merge pull request #4655 from thinkyhead/rc_serial_static
Optimize, reduce size of MarlinSerial
2016-08-20 15:51:57 -05:00
Scott Lahteine
b15f8ca641 Merge pull request #4660 from MagoKimbra/Fix_Zig_Zag
Fix_Zig_Zag
2016-08-20 15:44:25 -05:00
MagoKimbra
28d1e5a946 Fix_Zig_Zag 2016-08-20 11:28:08 +02:00
Scott Lahteine
14395a1a96 Optimize, reduce size of MarlinSerial 2016-08-19 16:53:20 -05:00
Scott Lahteine
4d4c00d69c Merge pull request #4651 from thinkyhead/rc_homing_vs_leveling_z
Improvements to homing / leveling
2016-08-19 15:45:49 -05:00
Scott Lahteine
f3a54316e6 Merge pull request #4652 from bgort/RCBugFix
Add Rambo support/env to platformio.ini; properly maps extended pins
2016-08-19 09:30:59 -05:00
Brian Gortney
8fae3e1f9f Add Rambo support/env to platformio.ini; properly maps extended pins 2016-08-19 07:11:23 -04:00
Scott Lahteine
12d72363cb Do Delta radius check without sqrt 2016-08-19 05:05:48 -05:00
Scott Lahteine
044f800be9 Use SERIAL_PROTOCOLLNPGM in G28 2016-08-19 04:45:33 -05:00
Scott Lahteine
d309a9647d Include probe offset for moving "close to the bed" 2016-08-19 04:45:33 -05:00
Scott Lahteine
35a08eeaeb Use Z_HOME_DIR over axis_home_dir where we can 2016-08-19 04:45:32 -05:00
Scott Lahteine
99b22d5785 Default AUTO_BED_LEVELING_GRID_POINTS to 3 2016-08-19 04:45:32 -05:00
Scott Lahteine
9b1f3f7d12 Sanity-check DELTA + AUTO_BED_LEVELING_GRID_POINTS 2016-08-19 04:45:32 -05:00
Scott Lahteine
733453569b Merge pull request #4650 from thinkyhead/rc_percent_is_percent
extruder_multiplier => flow_percentage
2016-08-19 04:38:18 -05:00
Scott Lahteine
55355a4fb8 Make probed points more symmetrical 2016-08-19 04:32:03 -05:00
Scott Lahteine
1f776f6034 Tweak some code comments 2016-08-19 04:32:02 -05:00
Scott Lahteine
748228cf40 Use named indices for delta_grid_spacing 2016-08-19 04:32:02 -05:00
Scott Lahteine
ead333e7da line_to_axis_pos => do_homing_move 2016-08-19 04:32:02 -05:00
Scott Lahteine
7a4ccd7967 Add do_probe_move with Z fixes 2016-08-19 04:32:02 -05:00
Scott Lahteine
a1bad589c9 Augment debug/homing logging 2016-08-19 04:32:02 -05:00
Scott Lahteine
41b5c48129 Update software endstops if EEPROM is loaded 2016-08-19 04:32:01 -05:00
Scott Lahteine
628dcbc764 extruder_multiplier => flow_percentage 2016-08-18 22:13:47 -05:00
Scott Lahteine
6970c24ee6 Merge pull request #4642 from zenmetsu/ru-Lang
Ru lang updated
2016-08-18 17:11:46 -05:00
Jason Westervelt
d222ee4de2 Update language_ru.h
Updated missing translations.  Caught up on change to MSG_HOME.
2016-08-17 13:55:44 -07:00
Scott Lahteine
464d594450 Merge pull request #4608 from thinkyhead/rc_more_twibus_tweaks
Additional details for I2C_SLAVE_ADDRESS
2016-08-15 19:37:03 -07:00
Scott Lahteine
d63b8e2b2b Additional details for I2C_SLAVE_ADDRESS 2016-08-15 19:27:53 -07:00
Scott Lahteine
7427290d3a Merge pull request #4634 from thinkyhead/rc_lang_disp_char
Set language display charset in language.h
2016-08-15 19:25:56 -07:00
Scott Lahteine
aa30550b21 Keep SIMULATE_ROMFONT only language.h 2016-08-15 19:11:31 -07:00
Scott Lahteine
cec61c350d Set language display charset in language.h 2016-08-15 19:01:12 -07:00
Scott Lahteine
165d7abb1b Merge pull request #4625 from thinkyhead/rc_i2c_request_capture_flush
Add request, capture, flush to TWIBus
2016-08-15 18:15:43 -07:00
Scott Lahteine
0e6b41a34a Merge pull request #4624 from RicardoGA/RCBugFix
Update Spanish Lenguage
2016-08-15 18:15:23 -07:00
RicardoGA
507784b846 Fix Messages length 2016-08-15 10:30:51 -05:00
Scott Lahteine
bd928a69ec Add request, capture, flush to TWIBus 2016-08-15 00:04:20 -07:00
RicardoGA
7b7f319ed5 Update Spanish Lenguage
Adds missing messages
2016-08-14 23:30:43 -05:00
Scott Lahteine
132322e4d9 Fix #4614: currentScreen only defined with ULTIPANEL 2016-08-14 00:29:46 -07:00
Scott Lahteine
dcd26b0403 Merge pull request #4621 from thinkyhead/rc_fan_set_output
Init PWM-able AUTO_FAN pins with SET_OUTPUT
2016-08-13 21:22:27 -07:00
Scott Lahteine
79ba983782 Allow reply() to use const string with no warning 2016-08-13 21:05:44 -07:00
Scott Lahteine
27570c08ba Merge pull request #4620 from thinkyhead/rc_twibus_further
Further refinements of TWIBus
2016-08-13 20:56:09 -07:00
Scott Lahteine
3a0a94b21a Always init configured fan pins 2016-08-13 20:38:40 -07:00
Scott Lahteine
c63003ed3e Use matching auto-fan flags 2016-08-13 20:38:40 -07:00
Scott Lahteine
3475fd7b0f Init PWM-able auto fan pins with SET_OUTPUT 2016-08-13 20:38:40 -07:00
Scott Lahteine
abf9696db1 Loop fan-pins based on array size 2016-08-13 20:05:32 -07:00
Scott Lahteine
e88575c8ec Init next_auto_fan_check_ms to zero 2016-08-13 20:05:32 -07:00
Scott Lahteine
7272ec5608 Update HAS_FAN flags for 4 auto fans 2016-08-13 20:05:32 -07:00
Scott Lahteine
7b21811a9a Flags for matching auto-fans 2016-08-13 20:05:32 -07:00
Scott Lahteine
97e0aed304 Further refinements of TWIBus 2016-08-13 18:32:41 -07:00
Scott Lahteine
38fa1b1939 Merge pull request #4196 from cimbalo/Platformio_support
Add working PlatformIO support
2016-08-12 17:32:09 -07:00
Scott Lahteine
d7edc039af Merge pull request #4605 from thinkyhead/rc_3drag_fan_is_8
Fixup 3DRAG pins based on updated RAMPS pins
2016-08-12 17:30:27 -07:00
Scott Lahteine
7147c86e9f Merge pull request #4611 from tnw513/patch-2
Fix acceleration and feedrate following bq/Marlin
2016-08-12 17:30:02 -07:00
Silvio
923388e0c7 Fix acceleration and feedrate following bq/Marlin 2016-08-12 15:42:20 +02:00
Scott Lahteine
405afec393 Include decimeters in filamentUsed display 2016-08-12 05:16:43 -07:00
Scott Lahteine
fef0e8ba86 Merge pull request #4610 from thinkyhead/rc_sd_pause_and_stop
Fix stopSDPrint so it works when paused
2016-08-12 04:09:22 -07:00
Scott Lahteine
192ac2dfd7 Squish some CardReader code 2016-08-12 03:32:42 -07:00
Scott Lahteine
61932b859e Fix bug in CardReader::stopSDPrint
If the SD print is paused, it cannot be stopped
2016-08-12 03:21:10 -07:00
Scott Lahteine
9e5d5a3b7c Merge pull request #4597 from tnw513/italian_fix
Added hyphenated strings for full graphic display
2016-08-12 02:37:53 -07:00
Silvio Didonna
f999292eea added hyphenated letters for full graphic display and fixed some strings 2016-08-12 08:57:22 +02:00
Scott Lahteine
11027a56b6 Merge pull request #4606 from thinkyhead/rc_more_i2c_slave
Add an i2c request handler
2016-08-11 23:51:56 -07:00
Scott Lahteine
67f119d18b Add an i2c request handler 2016-08-11 18:09:18 -07:00
Scott Lahteine
2d3db5b5bd Fixup pins_3DRAG based on updated RAMPS pins 2016-08-11 15:49:47 -07:00
Scott Lahteine
d29a64d4b3 Merge pull request #4603 from thinkyhead/rc_less_MSG_MOVE
Strip never-translated strings from language files
2016-08-11 14:21:58 -07:00
Scott Lahteine
d6a7ca6553 Merge pull request #4584 from thinkyhead/rc_delta_cal_more
Use configured feedrates, center in DELTA_CALIBRATION_MENU
2016-08-11 14:04:05 -07:00
Scott Lahteine
64f15ac451 Merge pull request #4602 from thinkyhead/rc_marlinserial_clean
Minor cleanup of SdFatUtil.h, MarlinSerial.cpp
2016-08-11 13:42:16 -07:00
Scott Lahteine
d3b432adca Strip never-translated strings from language files 2016-08-11 13:41:07 -07:00
Scott Lahteine
1a558ef486 Tweak MarlinSerial precursor 2016-08-11 12:47:06 -07:00
Scott Lahteine
802818f7ab Cleanup SdFatUtil.h 2016-08-11 12:47:06 -07:00
Scott Lahteine
52560e257f Merge pull request #4595 from thinkyhead/rc_i2c_slave
Add support for i2c slave address
2016-08-11 12:39:26 -07:00
Scott Lahteine
432e9a1f50 Use configured feedrates, center for DELTA_CALIBRATION_MENU 2016-08-11 12:05:55 -07:00
Scott Lahteine
cd496dd9bd do_blocking_move_to can't be 'inline', takes const ref args 2016-08-11 12:05:55 -07:00
Scott Lahteine
dd75fca4d9 Make M155 / M156 a bit more flexible 2016-08-11 00:52:01 -07:00
Scott Lahteine
30afac64c4 Merge pull request #4594 from thinkyhead/rc_fix_serial_output
Fix serial output for MBL, M303
2016-08-11 00:05:30 -07:00
Scott Lahteine
e3efb04295 Shoehorn EXPERIMENTAL_I2CBUS into Travis test 2016-08-10 23:35:46 -07:00
Scott Lahteine
a99ecf71d8 Add support for i2c slave address 2016-08-10 23:30:35 -07:00
Scott Lahteine
b63d70b186 Fix serial output for MBL, M303 2016-08-10 18:49:52 -07:00
Scott Lahteine
a36a168af2 Use the truly configured middle on Delta 2016-08-10 00:03:22 -07:00
Scott Lahteine
58c8e6cef2 Fixes #4576: Convert filamentUsed to long for display 2016-08-09 23:57:28 -07:00
Scott Lahteine
01f1f779a5 Followup to #4574, specify L for long 2016-08-09 23:43:37 -07:00
Scott Lahteine
fa2467a834 Merge pull request #4578 from Kaibob2/patch-2
Update language_de.h with MSG_MOVE_E1 - E4
2016-08-09 23:04:15 -07:00
Kaibob2
1c7bd17e60 Update language_de.h with MSG_MOVE_E1 - E4
MSG_MOVE_E1 was missing
MSG_MOVE_E2 was missing
MSG_MOVE_E3 was missing
MSG_MOVE_E4 was missing

I assigned "0" to "MSG_MOVE_E1", "1" to "MSG_MOVE_E2" and so on, as this is what i assume to be the standard naming for the first (E0) and second (E1) extruder. This would have to be changed inthe other languages too :(
2016-08-09 20:49:26 +02:00
Scott Lahteine
bd8ea21abe Merge pull request #4574 from thinkyhead/rc_graphical_days
Include days in Graphical LCD print timer
2016-08-08 23:53:31 -07:00
Scott Lahteine
880cdb553b Include days in Graphical LCD print timer 2016-08-08 23:21:36 -07:00
Scott Lahteine
f4ac8c15e3 Merge pull request #4573 from thinkyhead/rc_mintemp_bed_later
Throw MINTEMP BED error only if heating
2016-08-08 23:02:42 -07:00
Scott Lahteine
b7b5b50a84 Throw bed min temp error only if heating 2016-08-08 22:49:22 -07:00
Scott Lahteine
d3ba878f70 Drop intermediate float in HEATER_0_USES_MAX6675 test 2016-08-08 22:49:22 -07:00
Scott Lahteine
3e8f9ecd1c Extend min/max_temp_error for the bed 2016-08-08 22:49:21 -07:00
Scott Lahteine
1f15f0df5f Merge pull request #4572 from thinkyhead/rc_digital_clock_100h
Show up to 99:59 in digital time
2016-08-08 22:28:29 -07:00
Scott Lahteine
b772172c84 Merge pull request #4571 from thinkyhead/rc_proper_delta_calibration
Patch command order in delta calibration menu
2016-08-08 21:50:42 -07:00
Scott Lahteine
8100a4dace Fix a compile error in EMERGENCY_PARSER sanity check 2016-08-08 21:49:57 -07:00
Scott Lahteine
45f67164b6 Simplify the delay in kill() 2016-08-08 21:49:34 -07:00
Scott Lahteine
30b1c731b5 Show up to 99:59 in digital time 2016-08-08 21:26:34 -07:00
Scott Lahteine
3be4511230 Patch command order in delta calibration menu 2016-08-08 21:15:25 -07:00
Scott Lahteine
9afa060ed6 Merge pull request #4570 from thinkyhead/rc_proper_delta_calibration
Make DELTA_CALIBRATION_MENU more universal
2016-08-08 21:11:40 -07:00
Scott Lahteine
46c8862635 Merge pull request #4564 from AnHardt/max-spi-setup
MISO is an input
2016-08-08 21:01:15 -07:00
Scott Lahteine
dad4702e85 Merge pull request #4569 from thinkyhead/rc_disable_slowdown_on_delta
Always disable SLOWDOWN for DELTA/SCARA
2016-08-08 20:58:40 -07:00
Scott Lahteine
88540d8ecf Fix: LCD displays SD status at startup 2016-08-08 20:53:18 -07:00
Scott Lahteine
b16ea09498 Make DELTA_CALIBRATION_MENU more universal 2016-08-08 20:42:58 -07:00
Scott Lahteine
85c4d5d2b5 Include DELTA_CALIBRATION_MENU in DELTA travis test 2016-08-08 20:35:04 -07:00
Scott Lahteine
3a56836ead Always disable SLOWDOWN for DELTA/SCARA 2016-08-08 18:06:46 -07:00
AnHardt
aa9b52b2e7 MISO is an input 2016-08-08 20:09:57 +02:00
Scott Lahteine
67c4acf750 Merge pull request #4562 from thinkyhead/rc_fix_z_dual_endstops
Fix Z_DUAL_ENDSTOPS with Z MIN Homing
2016-08-07 19:23:09 -07:00
Scott Lahteine
1edbea0fcb Merge pull request #4563 from thinkyhead/rc_explain_probe_heights
Explain that Z_PROBE_*_HEIGHT options are nozzle-relative
2016-08-07 19:22:19 -07:00
Scott Lahteine
e113740fa3 Specify that Z_PROBE_*_HEIGHT is nozzle-relative 2016-08-07 17:54:17 -07:00
Scott Lahteine
462e189edd Move pullups after Z_DUAL_ENDSTOPS block 2016-08-07 17:43:02 -07:00
Scott Lahteine
367dad5902 Sanity check Z_DUAL_ENDSTOPS with DELTA 2016-08-07 17:08:41 -07:00
Scott Lahteine
5fca110e0d Fix Z_DUAL_ENDSTOPS with MIN homing 2016-08-07 17:08:41 -07:00
Scott Lahteine
fc11f05c11 Merge pull request #4556 from thinkyhead/rc_all_feedrates_mm_s
Within Marlin, maintain most feed rates in mm/s
2016-08-07 16:14:16 -07:00
Scott Lahteine
7b2abe6fc8 Use steps_to_mm in extruder runout prevent 2016-08-07 00:28:52 -07:00
Scott Lahteine
d320065320 Within Marlin, maintain most feed rates in mm/s 2016-08-07 00:28:52 -07:00
Scott Lahteine
ed0b50ebee Merge pull request #4555 from thinkyhead/rc_mbl_index_rounding
Remove premature int-cast from MBL cell index methods
2016-08-06 23:34:01 -07:00
Scott Lahteine
bad286d52f Save CPU by multiplying by pre-compiled values 2016-08-06 23:24:07 -07:00
Scott Lahteine
dce6026e0e Remove premature cast to int 2016-08-06 23:01:29 -07:00
Scott Lahteine
cffe77c537 Merge pull request #4553 from thinkyhead/rc_lcd_chars_save_ram
Save bytes for custom chars (Hitachi LCD)
2016-08-06 18:29:16 -07:00
Scott Lahteine
0a1a2fea30 Merge pull request #4554 from thinkyhead/rc_anhardt_rep-max6675
Repair SPI-pins, some other pins
2016-08-06 18:10:55 -07:00
Scott Lahteine
42927530fe Explicitly clear the screen in lcd_goto_screen 2016-08-06 18:10:39 -07:00
Scott Lahteine
a6d2c2479f Minor cleanup of lcd_goto_screen calls 2016-08-06 18:10:39 -07:00
Scott Lahteine
e47c8b9829 Save bytes for custom chars (Hitachi LCD) 2016-08-06 18:10:39 -07:00
Scott Lahteine
0ff5005c9b Allow connector flexibility for BQ ZUM Mega 2016-08-06 17:19:12 -07:00
Scott Lahteine
98437bd488 Allow override of CONTROLLERFAN_PIN with RAMPS EFF 2016-08-06 17:19:12 -07:00
Scott Lahteine
93eafa1785 Use DISABLED to check TEENSY pin option 2016-08-06 17:19:12 -07:00
AnHardt
98392abb78 Clean warnings for pins_BQ_ZUM_MEGA_3D.h 2016-08-06 17:19:12 -07:00
AnHardt
1f239ac9a7 Extend travis test to check MAX6675 2016-08-06 17:19:11 -07:00
Scott Lahteine
31cad77ba9 Chmod a+x opt_disable_adv 2016-08-06 17:19:11 -07:00
AnHardt
020cd32d28 Update restore_configs
for travis builds.
2016-08-06 17:19:11 -07:00
AnHardt
98e96feee9 Repair SPI-pins
SCK_PIN can't be defined as DIO[number] they mus be defined as pure number.
So rebuilding the structure of fastio.h in pins.h.
2016-08-06 17:19:11 -07:00
Scott Lahteine
7145bd085d Merge pull request #4551 from thinkyhead/rc_anhardt_rep_stow_allen
Make Allen Key Probe stow
2016-08-06 16:31:51 -07:00
Scott Lahteine
a00783c41f Format probe stowed test code 2016-08-06 14:31:07 -07:00
AnHardt
f37e8a31d7 Make Allen Key Probe stow
by switching off the tests for the probe before the stow move.
2016-08-06 14:30:38 -07:00
Scott Lahteine
5347f39fce Merge pull request #4542 from AnHardt/rep-de
Repair-language.de
2016-08-05 23:50:35 -07:00
Scott Lahteine
5ef4a5577c Merge pull request #4537 from thinkyhead/rc_fix_some_flaws
Patch up some flaws here and there
2016-08-05 23:49:57 -07:00
AnHardt
0d3b67a580 Repair-language.de 2016-08-06 01:00:40 +02:00
Scott Lahteine
938e6d15c4 Patch up some flaws, here and there 2016-08-05 08:17:37 -07:00
Scott Lahteine
3a3984e67a Merge pull request #4535 from thinkyhead/rc_old_symbols_first
Move tests for old symbols to the top of sanity check
2016-08-04 21:24:02 -07:00
Scott Lahteine
d7b882e430 Move tests for old symbols to the top of sanity check 2016-08-04 21:03:55 -07:00
Scott Lahteine
479107d04f Merge pull request #4530 from Kaibob2/patch-1
Added / Update language_de.h
2016-08-04 16:58:50 -07:00
Scott Lahteine
dddaeb3f8c Merge pull request #4528 from thinkyhead/rc_make_it_so
Z-Height options replace Z-Raise options
2016-08-04 13:46:44 -07:00
Kaibob2
1abd7fa670 Update language_de.h
Added german translation for MSG_INFO_PRINT_LONGEST and  MSG_INFO_PRINT_FILAMENT.
MSG_HEATING_COMPLETE changed from "Aufgeheizt" to "Extr. aufgeheizt"
MSG_HEATING changed from "Aufheizen" to "Extr. aufheizen"
2016-08-04 09:40:38 +02:00
Scott Lahteine
7e2bd9a233 Z_RAISE_PROBE_* => Z_PROBE_*_HEIGHT 2016-08-03 21:18:38 -07:00
Scott Lahteine
445458c221 Don't include zprobe_zoffset in do_probe_raise 2016-08-03 21:12:02 -07:00
Scott Lahteine
4cf66cfa62 Merge pull request #4522 from rafacouto/RCBugFix
Update of Galician language
2016-08-03 14:41:33 -07:00
Rafa Couto
0114676953 Update of Galician language 2016-08-03 2016-08-03 15:00:18 +02:00
Rafa Couto
433a22189b Merge pull request #1 from MarlinFirmware/RCBugFix
Update August
2016-08-03 08:43:22 +02:00
Scott Lahteine
bd7a96ed42 Merge pull request #4517 from thinkyhead/rc_min_probe_pin
Define Z_MIN_PROBE_PIN always, allowing override
2016-08-02 21:35:59 -07:00
Scott Lahteine
704ae1b737 Merge pull request #4516 from thinkyhead/rc_short_prints_quiet
Only report finished prints longer than 1 min
2016-08-02 21:14:30 -07:00
Scott Lahteine
7ed70305df Merge pull request #4515 from thinkyhead/rc_fix_speaker_tone
Prevent the 'tone(f,d)' function from being interrupted
2016-08-02 21:13:47 -07:00
Scott Lahteine
f1be87a85c Move probe pin sanity checks out of ABL block 2016-08-02 20:55:17 -07:00
Scott Lahteine
9cb596e88c Define Z_MIN_PROBE_PIN always, allowing override 2016-08-02 20:31:44 -07:00
Scott Lahteine
229f70f194 Only report finished prints longer than 1 min 2016-08-02 19:58:12 -07:00
Scott Lahteine
e040e00ae9 Merge pull request #4514 from thinkyhead/rc_cleanup_circularqueue
Patch up CircularQueue
2016-08-02 19:42:38 -07:00
Scott Lahteine
6110d57c16 Prevent the 'tone(f,d)' function from being interrupted 2016-08-02 19:37:47 -07:00
Scott Lahteine
b73203a0b7 Move some includes around to uncover missing deps 2016-08-02 19:37:46 -07:00
Scott Lahteine
52b6b8e36b Merge pull request #4512 from thinkyhead/rc_encoder_flex
Improved SCREEN / MENU macros
2016-08-02 18:59:42 -07:00
Scott Lahteine
f26d5425bf Patch up CircularQueue
- Use `size` and `count` instead of `length` and `size`
- Fix bug: `peek` should return the item
- Clean up comments, spacing, spelling
2016-08-02 18:57:15 -07:00
Scott Lahteine
c9123adc59 Improved SCREEN / MENU macros 2016-08-02 18:05:34 -07:00
Scott Lahteine
cebeb48005 Merge pull request #4511 from thinkyhead/rc_encoder_flex
Allow encoder pulse/step override for more LCDs
2016-08-02 16:50:50 -07:00
Scott Lahteine
3cccaa9885 Allow encoder pulse/step override for more LCDs 2016-08-02 15:57:26 -07:00
Scott Lahteine
58749cae94 Merge pull request #4510 from thinkyhead/rc_buzzer_needs_beeper
Patch for COREYZ, tweak to scaled feedrate macro
2016-08-02 15:55:06 -07:00
Scott Lahteine
14c5a46ee9 Use multiplication for MMM_SCALED 2016-08-02 15:05:17 -07:00
Scott Lahteine
d8945e8464 Fix Z_HEAD index for COREYZ 2016-08-02 15:05:17 -07:00
Scott Lahteine
0f030aface Merge pull request #4503 from AnHardt/fix-retract
Correct typo in retract()
2016-08-02 15:04:55 -07:00
Scott Lahteine
fbd8f06951 Merge pull request #4506 from thinkyhead/rc_buzzer_needs_beeper
Buzzer requires BEEPER_PIN
2016-08-02 14:40:43 -07:00
Scott Lahteine
330f82971b Buzzer requires BEEPER_PIN 2016-08-02 14:05:37 -07:00
Scott Lahteine
e0d7b8bf27 Fix Azteeg X3 servo pin / Viki i2c 2016-08-02 14:05:37 -07:00
Scott Lahteine
7cceb15925 Merge pull request #4505 from thinkyhead/rc_auto_select_dplugs
Auto-select power plugs for RAMPS derivatives
2016-08-02 12:56:52 -07:00
Scott Lahteine
1967e4216e Merge pull request #4504 from AnHardt/fix-baybystepping
Fix babystepping dependency
2016-08-02 12:46:50 -07:00
Scott Lahteine
593b37519a Boards with 4 power outputs are EFBF or EFBE 2016-08-02 12:34:28 -07:00
AnHardt
9ab94bd2c1 fix-babysrepping 2016-08-02 21:06:42 +02:00
AnHardt
39c4603598 Correct typo in retract. 2016-08-02 21:06:08 +02:00
Scott Lahteine
cebd2bfff0 Auto-select power plugs for RAMPS derivatives 2016-08-02 11:59:25 -07:00
Scott Lahteine
34c60f1b55 Merge pull request #4491 from thinkyhead/rc_fix_lcd_move_e
Use a default argument in _lcd_move_e
2016-08-01 16:45:25 -07:00
Scott Lahteine
38af251b91 Use a default argument in _lcd_move_e 2016-08-01 16:09:26 -07:00
Scott Lahteine
374ae6c099 Fix pins for RAMBO plus VIKI 2016-08-01 16:09:26 -07:00
Scott Lahteine
7594138740 Merge pull request #4493 from jbrazio/buildroot-cleanup
Move font folder
2016-08-01 15:57:23 -07:00
João Brázio
b15ef35568 Update the font README to link to marlinfw.org 2016-08-01 13:53:51 +01:00
Scott Lahteine
6eed37aafb Merge pull request #4486 from thinkyhead/rc_pid_add_extrusion_rate_off
PID_EXTRUSION_SCALING, disabled by default
2016-07-31 18:23:51 -07:00
Scott Lahteine
4bf3526d00 Merge pull request #4463 from thinkyhead/rc_azteeg_x3_eeb
Wrangle RAMPS variants and derivatives
2016-07-31 18:22:49 -07:00
Scott Lahteine
1993c45759 Merge pull request #4487 from thinkyhead/rc_refresh_pos_fix
Update refresh_positioning - no need for obj ref
2016-07-31 18:22:38 -07:00
Scott Lahteine
f83369b79c Update refresh_positioning - no need for obj ref 2016-07-31 18:01:13 -07:00
Scott Lahteine
63fd1f49a6 PID_EXTRUSION_SCALING, disabled by default 2016-07-31 17:49:34 -07:00
Scott Lahteine
49997e2e22 HI_VOLT_PIN => "RAMPS_Dn_PIN" 2016-07-31 15:42:52 -07:00
Scott Lahteine
f7da37002c Merge pull request #4482 from AnHardt/rep-s-spi
repair-software-spi
2016-07-31 15:25:44 -07:00
AnHardt
60ad365e21 repair-software-spi 2016-07-31 15:50:42 +02:00
Scott Lahteine
f388beafa1 Merge pull request #4476 from otvald/RCBugFix
FIX for endstop adjustemt on delta is offset
2016-07-31 01:09:54 -07:00
Scott Lahteine
3633d4978b Merge pull request #4475 from esenapaj/Fix-for-PR-#4452
Fix for PR #4452 (Additional heater-state output changes)
2016-07-31 01:08:27 -07:00
Scott Lahteine
448e5252c3 Merge pull request #4474 from esenapaj/Update-distribution-date-and-readme
Update distribution date and readme
2016-07-31 01:07:43 -07:00
Thomas Otvald Jensen
fe059f1221 During homing, line_to_axis_pos will make a path which moves across the
endstop trigger point. The move is stopped at endstop, so current_position
should also be adjusted to reflect this!

Caused error in subsequent call in endstop adjustment, since the movement
would assume a wrong starting position.
2016-07-30 16:50:31 +02:00
esenapaj
bd73e6d3c8 Fix for PR #4452 (Additional heater-state output changes)
・Add missing ';'
2016-07-30 22:49:30 +09:00
esenapaj
cd5b03d88f Update distribution date and readme 2016-07-30 21:27:29 +09:00
Scott Lahteine
f575e92f2e Merge pull request #4473 from esenapaj/Follow-up-the-PR-#4408-etc
Follow-up the PR #4408 (Add support for reprapworld LCD), etc
2016-07-30 04:45:27 -07:00
Scott Lahteine
a406b176b0 Merge pull request #4472 from thinkyhead/rc_old_conditional
Make Conditionals.h a catch-all for old configs
2016-07-30 04:34:43 -07:00
esenapaj
657ef8aded Follow-up the PR #4408 (Add support for reprapworld LCD), etc
・Put #define REPRAPWORLD_GRAPHICAL_LCD into all the example
configuration files
・Adjust spacing
2016-07-30 20:32:57 +09:00
Scott Lahteine
83d341c394 Make Conditionals.h a catch-all for old configs 2016-07-30 04:25:30 -07:00
Scott Lahteine
de951c64f1 Make pins for EFF a consistent order 2016-07-30 04:17:21 -07:00
Scott Lahteine
49f75b7891 pins_RAMPS_14.h => pins_RAMPS.h 2016-07-30 04:17:21 -07:00
Scott Lahteine
d3b713cebc Set flags for RAMPS "type" in pins.h 2016-07-30 04:17:21 -07:00
Scott Lahteine
223b7e473f RAMPS assignment for derivatives 2016-07-30 04:17:21 -07:00
Scott Lahteine
3865843283 Consolidate setting of RAMPS High Voltage PWM outputs 2016-07-30 04:17:21 -07:00
Scott Lahteine
bdac2eb13a Don't set non-existent SLED_PIN 2016-07-30 04:17:21 -07:00
Scott Lahteine
bfbd01e29a Merge pull request #4470 from thinkyhead/rc_fix_manual_move
Followup to #4468
2016-07-30 04:17:05 -07:00
Scott Lahteine
802d873fc1 Merge pull request #4469 from esenapaj/Fix-for-PR-#4453
Fix for PR #4453 (Improved MANUAL_[XYZ]_HOME_POS)
2016-07-30 04:08:54 -07:00
Scott Lahteine
8e2f095dde Merge pull request #4456 from jbrazio/speaker-type3
Improvement to non-blocking speaker
2016-07-30 04:07:08 -07:00
Scott Lahteine
ad68b4cb8b Followup to #4468 2016-07-30 03:49:42 -07:00
esenapaj
b8c112c490 Fix for PR #4453 (Improved MANUAL_[XYZ]_HOME_POS) 2016-07-30 19:37:43 +09:00
Scott Lahteine
2f76138645 Merge pull request #4468 from thinkyhead/rc_fix_manual_move
Specify manual-movable E axes by extruder type
2016-07-30 03:21:43 -07:00
Scott Lahteine
696b63e300 Specify manual-movable E axes by extruder type 2016-07-30 00:36:48 -07:00
Scott Lahteine
46c33f1cfa Merge pull request #4467 from jbrazio/safe_delay-millis_t
Makes safe_delay() to be fully compatible with delay()
2016-07-29 20:23:44 -07:00
Scott Lahteine
9e21b2e51d Merge pull request #4455 from AnHardt/double-bump-feature
double bump probing as a feature
2016-07-29 20:00:10 -07:00
Scott Lahteine
db4d03bc81 Merge pull request #4452 from thinkyhead/rc_fix_heaterstates_part_2
Additional heater-state output changes
2016-07-29 19:58:00 -07:00
Scott Lahteine
c68ca95345 Merge pull request #4464 from thinkyhead/rc_fix_steps_per_mm_handling
Account for DELTA in Planner::refresh_positioning
2016-07-29 19:34:59 -07:00
João Brázio
226e74a438 Fixes safe_delay() to be fully compatible with delay() 2016-07-30 02:56:26 +01:00
João Brázio
8e79e8cdb3 Adds types.h 2016-07-30 02:55:52 +01:00
Scott Lahteine
844a4e799e Account for DELTA in Planner::refresh_positioning 2016-07-29 18:41:11 -07:00
AnHardt
7188ce0ad6 double bump probing as a feature
Why double touch probing is not a good thing.

It's widely believed we can get better __probing__ results when using a double touch when probing.

Let's compare to double touch __homing__.
Or better let's begin with single touch __homing__.
We home to find out out position, so our position is unknown.
To find the endstop we have to move into the direction of the endstop.
The maximum way we have to move is a bit longer than the axis length.
When we arrive at the endstop - when it triggers, the stepper pulses are stopped immediately.
It's a sudden stop. No smooth deacceleration is possible.
Depending on the speed and the moving mass we lose steps here.
Only if we approached slow enough (below jerk speed?) we will not lose steps.

Moving a complete axis length, that slow, takes for ever.
To speed up homing, we now make the first approach faster, get a guess about our position,
back up a bit and make a second slower approach to get a exact result without losing steps.

What we do in double touch probing is the same. But the difference here is:
a. we already know where we are
b. if the first approach is to fast we will lose steps here to.
But this time there is no second approach to set the position to 0. We are measuring only.
The lost steps are permanent until we home the next time.

So if you experienced permanently rising values in M48 you now know why. (Too fast, suddenly stopped, first approach)

What can we do to improve probing?
We can use the information about our current position.
We can make a really fast, but deaccelerated, move to a place we know it is a bit before the trigger point.
And then move the rest of the way really slow.
2016-07-30 03:00:49 +02:00
Scott Lahteine
c31f56a38c Deprecate EXTRUDER_WATTS and BED_WATTS 2016-07-29 17:34:14 -07:00
Scott Lahteine
e1970b4b28 Show power output in same order as temp output 2016-07-29 14:55:22 -07:00
Scott Lahteine
74df828acc Show ADC values inline rather than after 2016-07-29 14:55:18 -07:00
João Brázio
2b5faa61e2 Consolidates Buzzer and Speaker into a single object 2016-07-29 19:25:39 +01:00
João Brázio
8093c5f534 Non-blocking speaker now uses arduino's tone() 2016-07-29 18:45:50 +01:00
João Brázio
3367e79fec Merge pull request #4458 from jbrazio/followup-4448
Fixes a compilation error introduced by #4448
2016-07-29 18:44:30 +01:00
João Brázio
8896f08074 Fixes a compilation error introduced by #4448 2016-07-29 18:33:42 +01:00
Scott Lahteine
c677d2ac56 Merge pull request #4453 from thinkyhead/rc_better_manual_home
Improved MANUAL_[XYZ]_HOME_POS
2016-07-28 20:09:33 -07:00
Scott Lahteine
ea5ac94804 Improved MANUAL_[XYZ]_HOME_POS
No need for `MANUAL_HOME_POSITIONS`. Just set each one as-needed to
override the automatic behavior.
2016-07-28 19:51:48 -07:00
Scott Lahteine
1734de4d4e Merge pull request #4447 from thinkyhead/rc_fix_heaterstates
Fix output of heater states
2016-07-28 17:51:11 -07:00
Scott Lahteine
b40661cb18 Fix output of heater states 2016-07-28 17:40:01 -07:00
Scott Lahteine
9083e5420a Merge pull request #4419 from AnHardt/sd2pinmap
Switch Sd2CardLib to fastio
2016-07-28 17:38:46 -07:00
Scott Lahteine
6f59560526 Merge pull request #4448 from jbrazio/speaker-followup
A little cleanup at speaker.h
2016-07-28 17:37:36 -07:00
Scott Lahteine
5d8d18d03d Merge pull request #4451 from thinkyhead/rc_arduino_160_minimum
Prevent compiling with old Arduino sooner
2016-07-28 17:37:10 -07:00
Scott Lahteine
c94b6dd3e7 Revert to SanityCheck on every .cpp file 2016-07-28 17:17:50 -07:00
Scott Lahteine
256b03598d Merge pull request #4450 from thinkyhead/rc_fix_delta_optimization
Fix DELTA speed calculation
2016-07-28 16:50:04 -07:00
Scott Lahteine
753283e020 inverse_second => inverse_mm_s 2016-07-28 16:35:18 -07:00
Scott Lahteine
83e1d90ca3 Undo errant optimization of block->millimeters 2016-07-28 16:26:52 -07:00
João Brázio
909e98b1af A little cleanup at speaker.h 2016-07-29 00:03:25 +01:00
Scott Lahteine
ae1c7bca1b Merge pull request #4445 from thinkyhead/rc_fix_rdfgsc_mega3
Fix for R.D.F.G.S.C. with MEGATRONICS 3 board
2016-07-28 15:55:30 -07:00
Scott Lahteine
03fdb26cd2 Wrangle encoder bits, LCD_CLICKED 2016-07-28 14:44:37 -07:00
Scott Lahteine
155def24c6 BLEN_A, B, C are defined in ultralcd headers 2016-07-28 14:38:50 -07:00
Scott Lahteine
42dcc3bf50 Remove "the click" comments 2016-07-28 14:38:50 -07:00
Scott Lahteine
0eba65f96b Fix for R.D.F.G.S.C. with MINITRONICS board 2016-07-28 14:38:50 -07:00
fabtopia
83d0d59303 Fix for R.D.F.G.S.C. with MEGATRONICS 3 board
The support for reprapworld LCD boke the code for the REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER. See Full Grapics Display does not work any more after #4408  #4439
2016-07-28 13:12:19 -07:00
João Brázio
4f191a384b Moves the font folder into the buildroot 2016-07-28 19:56:41 +01:00
Scott Lahteine
5367d56f87 Merge pull request #4434 from thinkyhead/rc_delta_safe_homing
DELTA should ignore Z_SAFE_HOMING
2016-07-27 23:41:52 -07:00
Scott Lahteine
2525528fb2 DELTA should ignore Z_SAFE_HOMING 2016-07-27 23:25:56 -07:00
Scott Lahteine
dc3d2b50cd Merge pull request #4426 from thinkyhead/rc_probeless_safe_homing
Allow Z_SAFE_HOMING without a probe
2016-07-27 05:12:33 -07:00
Scott Lahteine
ab4b2a66ff Allow zero Z_RAISE_BETWEEN_PROBINGS 2016-07-27 05:00:58 -07:00
Scott Lahteine
8953e3e984 Allow Z_SAFE_HOMING without a probe 2016-07-27 04:33:56 -07:00
AnHardt
e4942d2163 Switch SD2cadrLib to fastio
Replace all fastDigitalRead/Write() with READ/WRITE()

Define SCK_PIN, MISO_PIN, MOSI_PIN in pins.h if not already defined in the pins_*.h files.

Remove these conditional pin definitions from the pin-files. They are now always defined.

Define separate sets of SPI-pins for AT90USB with and without Teensy support in fastio.h.
Likely this was the main reason for all that confusion about the AT90USB-SPI pins.
2016-07-27 12:40:44 +02:00
Scott Lahteine
9f1dd6d431 Merge pull request #4420 from thinkyhead/rc_allow_no_deploy_raise
Allow zero raise for deploy/stow
2016-07-26 17:21:51 -07:00
Scott Lahteine
21e744c454 Allow zero raise for deploy/stow 2016-07-26 17:19:25 -07:00
Scott Lahteine
54084612fd Merge pull request #4415 from petrzjunior/transl
[LANGUAGE] Update Czech (Info screen strings)
2016-07-26 13:20:20 -07:00
Scott Lahteine
5597400cda Merge pull request #4414 from thinkyhead/rc_split_conditionals
Split up Conditionals.h into two files
2016-07-26 13:16:52 -07:00
Scott Lahteine
24ee50f4d9 Merge pull request #4417 from thinkyhead/rc_remove_old_lang
Remove MSG_PRINT_TIME from languages
2016-07-26 13:01:35 -07:00
Scott Lahteine
4be635ec6e Remove MSG_PRINT_TIME from languages 2016-07-26 12:47:45 -07:00
Scott Lahteine
3be49881c0 Make SanityCheck.h a catch-all for obsolete configs 2016-07-26 12:41:40 -07:00
Scott Lahteine
fa647cca23 Do the sanity check just once per build 2016-07-26 12:37:14 -07:00
Scott Lahteine
24a1a16e5d Move versioning to MarlinConfig.h 2016-07-26 12:37:14 -07:00
Scott Lahteine
7e70a0b05d Move pins / Arduino includes to MarlinConfig.h 2016-07-26 12:37:14 -07:00
Scott Lahteine
d9f7ed9a3c Move some macros from Marlin.h to macros.h 2016-07-26 12:37:13 -07:00
Scott Lahteine
277899c175 Move include _Bootscreen.h where needed 2016-07-26 12:37:13 -07:00
Scott Lahteine
83c4653c71 Include boards and macros ahead of configs 2016-07-26 12:19:50 -07:00
Scott Lahteine
5f4702ecb2 Make Conditionals.h a catch-all for old configs 2016-07-26 12:19:50 -07:00
Scott Lahteine
8a44928df3 Make Conditionals.h a catch-all for old configs 2016-07-26 12:19:50 -07:00
Petr Zahradník junior
3d9b878cf0 Czech update 2016-07-26 13:48:27 +02:00
Scott Lahteine
c6226bb0aa Unify config in a single include without nested includes 2016-07-25 23:04:19 -07:00
Scott Lahteine
2d378fac1b No need to include thermistortables.h in Configuration.h 2016-07-25 22:43:50 -07:00
Scott Lahteine
df27d01cd9 Arrange needed includes in Marlin.h 2016-07-25 20:53:36 -07:00
Scott Lahteine
93ea281061 Split up Conditionals.h into two files
Rather than include twice, which is tricky but may confuse
2016-07-25 20:30:45 -07:00
Scott Lahteine
8684570f68 Merge pull request #4412 from thinkyhead/rc_followup_4402
Followup #4402 fixing 3-point leveling
2016-07-25 16:10:50 -07:00
Scott Lahteine
c55b7d0750 Merge pull request #4405 from thinkyhead/rc_theres_always_something
Move HAS_DIGIPOTSS to Conditionals.h
2016-07-25 15:58:42 -07:00
Scott Lahteine
42eebcd518 Merge pull request #4409 from thinkyhead/rc_cleanup_comment
Clean up Transfer Buffer Size comment
2016-07-25 15:58:34 -07:00
Scott Lahteine
5272147f7c Followup #4402 fixing 3-point leveling 2016-07-25 15:56:34 -07:00
Scott Lahteine
fcc39e2b5f Clean up Transfer Buffer Size comment 2016-07-25 12:54:55 -07:00
Scott Lahteine
7e37c20839 Merge pull request #4408 from thinkyhead/rc_reprapworld_lcd
Add support for reprapworld LCD
2016-07-25 12:37:58 -07:00
Scott Lahteine
0c0a63322b Patches to prepare REPRAPWORLD_GRAPHICAL_LCD 2016-07-25 12:10:25 -07:00
brupje
a60a668f6b Support for REPRAPWORLD_GRAPHICAL_LCD 2016-07-25 12:10:25 -07:00
Scott Lahteine
4f2ff46ab9 Move HAS_DIGIPOTSS to conditionals 2016-07-25 00:10:46 -07:00
Scott Lahteine
54f4f80077 Merge pull request #4404 from thinkyhead/rc_better_stepper_indirection
Arrange stepper_indirection by axis
2016-07-24 19:26:39 -07:00
Scott Lahteine
169c21b477 Merge pull request #4402 from thinkyhead/rc_consistent_positioning
Account for coordinate space offsets
2016-07-24 19:23:20 -07:00
Scott Lahteine
750a1e5116 Arrange stepper_indirection by axis 2016-07-24 19:00:51 -07:00
Scott Lahteine
7c27f34996 Merge pull request #4397 from thinkyhead/rc_tweak_eeprom
Neaten up EEPROM read/write functions
2016-07-24 18:45:54 -07:00
Scott Lahteine
2595a40a61 Account for coordinate space more in G28 / G29 / M48 2016-07-24 18:34:05 -07:00
Scott Lahteine
060dc6d95a Neaten up EEPROM read/write functions 2016-07-24 18:19:39 -07:00
Scott Lahteine
b7b7c90477 Merge pull request #4389 from thinkyhead/rc_optimize_planner
Optimize planner with precalculation, etc.
2016-07-24 17:48:23 -07:00
Scott Lahteine
6900bb2286 Merge pull request #4395 from tnw513/italian_fix
Update Italian translations. Remove trailing spaces.
2016-07-24 17:47:48 -07:00
Scott Lahteine
e4816293a8 serial_echopair_P for uint16_t 2016-07-24 17:46:37 -07:00
Scott Lahteine
d8e5af6834 Use RAW_POSITION for MBL in planner.set_position_mm 2016-07-24 17:20:36 -07:00
Scott Lahteine
b183442c61 Fix inactive_extruder_x_pos for coordinate space 2016-07-24 17:20:36 -07:00
Scott Lahteine
f75b0c2ee1 Make POSITION macros global 2016-07-24 17:20:36 -07:00
Scott Lahteine
101b60ef42 Tweak Dual X Carriage data spacing 2016-07-24 17:20:35 -07:00
Scott Lahteine
1fe60b723f Merge pull request #4400 from thinkyhead/rc_sanity_check_temp_sensor
Sanity check for too many temp sensors
2016-07-24 15:38:41 -07:00
Scott Lahteine
bedda3be61 Patch generic delta error caught by sanity check 2016-07-24 15:24:40 -07:00
Scott Lahteine
a5212bf277 Sanity check for too many temp sensors 2016-07-24 13:47:27 -07:00
Scott Lahteine
d8f2876753 Replace some float division with multiplication 2016-07-24 13:27:50 -07:00
Scott Lahteine
ddde785b37 Code formatting in planner.cpp 2016-07-24 13:27:50 -07:00
Scott Lahteine
f8b5749235 Replace division in planner with multiplication 2016-07-24 13:27:49 -07:00
Scott Lahteine
b921f6b69d Optimize calculation of block->millimeters for DELTA 2016-07-24 13:27:49 -07:00
Scott Lahteine
db5df9500b Move sync_plan_position closer to the top 2016-07-24 13:27:49 -07:00
Scott Lahteine
2839c56f5a Merge pull request #4390 from jbrazio/duration_t
Renamed timestamp_t to duration_t
2016-07-24 13:24:05 -07:00
Scott Lahteine
450fe8134d Merge pull request #4398 from thinkyhead/rc_z_safe_sanity
Sanity checks for Z_SAFE_HOMING
2016-07-24 12:21:10 -07:00
Scott Lahteine
d6c50671d3 Sanitycheck: Z_SAFE_HOMING points are reachable 2016-07-24 10:54:47 -07:00
Scott Lahteine
a6203366b6 Sanitycheck: Z_SAFE_HOMING requires a probe 2016-07-24 10:54:25 -07:00
Scott Lahteine
bbe5b80492 Always define probe limits if there is a probe 2016-07-24 10:53:58 -07:00
Silvio Didonna
950397f2a0 Added missing translations. Removed trailing spaces for consistency (#4376) 2016-07-24 17:22:30 +02:00
João Brázio
50fb0f7cec M31 serial output is now always in EN 2016-07-24 15:52:03 +01:00
João Brázio
62d96d72f3 Renamed timestamp_t to duration_t 2016-07-24 03:16:02 +01:00
Scott Lahteine
3e2b3353b0 Fix axis indices for COREYZ 2016-07-23 19:02:14 -07:00
Scott Lahteine
c287846f46 Merge pull request #4387 from thinkyhead/rc_anhardt_more_4370
Update Z in a unified way in run_z_probe
2016-07-23 16:47:10 -07:00
Scott Lahteine
22d0654fe6 Merge pull request #4382 from esenapaj/Update-Japanese-translation
Update Japanese translation
2016-07-23 16:31:38 -07:00
Scott Lahteine
bb93b6822a Use set_current_from_steppers_for_axis 2016-07-23 15:25:54 -07:00
AnHardt
96a162beda Use implications from #4370 in run_z_probe()
See also https://github.com/MarlinFirmware/Marlin/pull/4370#issuecomment-234713680
2016-07-23 13:09:28 -07:00
Scott Lahteine
4e67a85a5d Macros to loop over axes 2016-07-23 13:09:28 -07:00
Scott Lahteine
a3b5d5eb65 Merge pull request #4383 from esenapaj/Follow-up-the-PR-#4353
Follow-up the PR #4353 (General cleanup: enum)
2016-07-23 12:17:45 -07:00
esenapaj
784be56e99 Follow-up the PR #4353 (General cleanup: enum)
・Update description of M111
2016-07-24 00:53:35 +09:00
esenapaj
3c11977558 Update Japanese translation
・Add translation
・Change translation
・Remove translation
2016-07-23 22:07:20 +09:00
Scott Lahteine
5167cb424a Merge pull request #4381 from thinkyhead/rc_blocking_move_logging
Banish do_blocking_move_to_axis_pos
2016-07-23 01:33:17 -07:00
Scott Lahteine
08459a003f Undo the self-sabotage that is do_blocking_move_to_axis_pos 2016-07-23 00:59:11 -07:00
Scott Lahteine
13387ac302 Merge pull request #4380 from esenapaj/Fix-the-PR-#4379
Fix for the PR #4379 (Additional logging of do_blocking_move_to)
2016-07-23 00:43:01 -07:00
esenapaj
d32c4056ad Fix for the PR #4379 (Additional logging of do_blocking_move_to)
・Remove unneeded PSTR()
2016-07-23 16:38:57 +09:00
Scott Lahteine
8099ee51a5 Merge pull request #4379 from thinkyhead/rc_blocking_move_logging
Additional logging of do_blocking_move_to
2016-07-23 00:10:55 -07:00
Scott Lahteine
8633b644cf Merge pull request #4378 from thinkyhead/rc_debug_leveling_docs
Document DEBUG_LEVELING_FEATURE
2016-07-22 23:57:01 -07:00
Scott Lahteine
ad16d5019e Additional logging of do_blocking_move_to 2016-07-22 23:53:08 -07:00
Scott Lahteine
bb9da6ebdd Document DEBUG_LEVELING_FEATURE 2016-07-22 23:37:41 -07:00
Scott Lahteine
652fd8a826 Merge pull request #4362 from thinkyhead/rc_duplication_mode
DUAL_NOZZLE_DUPLICATION_MODE
2016-07-22 21:17:59 -07:00
Scott Lahteine
1766b990b8 Merge pull request #4376 from jbrazio/timestamp_t-short
Adds short format to timestamp_t
2016-07-22 21:17:17 -07:00
Scott Lahteine
6da3729531 Merge pull request #4370 from thinkyhead/rc_delta_fwd_kinematics
Delta Forward Kinematics (and LOGICAL_POSITION)
2016-07-22 21:16:00 -07:00
Scott Lahteine
6b8b458106 Travis for ABL+SCARA, Z_MIN_PROBE_REPEATABILITY_TEST 2016-07-22 21:02:08 -07:00
João Brázio
9e5dbf67e8 Update the stats menu to include longest job and extruded filament 2016-07-23 03:05:45 +01:00
João Brázio
86d9311495 Rework LCD implementation to use timestamp_t 2016-07-23 03:05:36 +01:00
Scott Lahteine
b3eb0c8569 Add LOGICAL_POSITION macro, apply to kinematics 2016-07-22 18:38:13 -07:00
Scott Lahteine
35a610abf9 const arg to inverse_kinematics 2016-07-22 17:42:48 -07:00
João Brázio
b4aad85c9a Rework stats menu to use timestamp_t 2016-07-23 01:42:21 +01:00
João Brázio
ecd48027fa Adds short timestamp format to timestamp_t 2016-07-23 01:41:25 +01:00
Scott Lahteine
b6afa028f4 Don't call adjust_delta on SCARA 2016-07-22 16:36:34 -07:00
Scott Lahteine
d5e2d523c7 Generalize kinematics function names 2016-07-22 16:36:34 -07:00
Scott Lahteine
9c4ad7d7ef Clean up delta declarations in Marlin_main.cpp 2016-07-22 16:36:33 -07:00
Scott Lahteine
4b1725628b Move kinematic functions to "private" scope 2016-07-22 16:36:33 -07:00
Scott Lahteine
cde068ea42 Use set_current_from_steppers in quickstop_stepper 2016-07-22 16:36:33 -07:00
Scott Lahteine
9f30cc84ce Use set_current_from_steppers for other kinematics 2016-07-22 16:36:33 -07:00
AnHardt
5db9b940ee Use forwardKinematics in DELTA run_z_probe() 2016-07-22 16:36:33 -07:00
Scott Lahteine
b5a9647fec Use ENABLED in stepper_indirection.h 2016-07-22 16:26:06 -07:00
Scott Lahteine
cbc7f22ad9 Implement DUAL_NOZZLE_DUPLICATION_MODE 2016-07-22 16:23:58 -07:00
Scott Lahteine
91777dd76c Add DUAL_NOZZLE_DUPLICATION_MODE option 2016-07-22 16:22:56 -07:00
Scott Lahteine
260bbb3109 Fix a couple of simple typos 2016-07-22 16:22:56 -07:00
Scott Lahteine
179e091473 Merge pull request #4374 from thinkyhead/rc_jbrazio_timestamp_t
Implements timestamp_t structure
2016-07-22 16:08:10 -07:00
AnHardt
499e404fbf forwardKinematics for Delta printers 2016-07-22 16:01:51 -07:00
João Brázio
23043a1e05 Rework some code to use timestamp_t struct (saves 72 bytes) 2016-07-22 15:53:31 -07:00
João Brázio
9388dcfa49 Implements timestamp_t structure 2016-07-22 15:53:31 -07:00
Scott Lahteine
0b2c608d2f Merge pull request #4372 from jbrazio/gcc-bark
Fix minor gcc warning
2016-07-22 15:18:53 -07:00
Scott Lahteine
5655f8b331 Merge pull request #4373 from thinkyhead/rc_homing_leveling_wtf
Fix, cleanup DELTA G28 / G29 support functions
2016-07-22 14:34:23 -07:00
Scott Lahteine
311c7dadb6 Cleanup do_blocking_move_to for DELTA 2016-07-22 14:18:45 -07:00
Scott Lahteine
b78590e63d Patch and cleanup run_z_probe 2016-07-22 14:18:45 -07:00
João Brázio
2f7716987d Fix minor gcc warning 2016-07-22 16:08:56 +01:00
João Brázio
efd3aabda8 Adds missing documentation to the point_t structure 2016-07-22 15:19:20 +01:00
Scott Lahteine
39caef4279 Merge pull request #4361 from AnHardt/imp-dbmt-for-delta
DELTA do_blocking_move_to() more like the Chartesian one
2016-07-21 20:05:04 -07:00
Scott Lahteine
7d869ad98b Merge pull request #4365 from thinkyhead/rc_shrink_planner_accel
Adjustments to planner acceleration limit
2016-07-21 18:18:15 -07:00
AnHardt
376a57232e DELTA do_blocking_move_to() more like the Chartesian one 2016-07-22 03:12:46 +02:00
Scott Lahteine
824c6859e2 Merge pull request #4369 from thinkyhead/rc_no_static_moves
inline to fix warnings, smaller build size (sometimes)
2016-07-21 14:46:09 -07:00
Scott Lahteine
2c239b1bd3 Merge pull request #4368 from AnHardt/run-z-probe-delta
Revert to position-difference method in run_z_probe()
2016-07-21 14:03:28 -07:00
Scott Lahteine
976c31235d inline to fix warnings, smaller build size (sometimes) 2016-07-21 13:49:37 -07:00
AnHardt
6ef26a85d8 Back to the differences method in run_z_probe() 2016-07-21 18:16:38 +02:00
Scott Lahteine
4226f56f53 Revert the planner acceleration logic somewhat 2016-07-20 19:19:47 -07:00
Scott Lahteine
16e5348659 Merge pull request #4360 from thinkyhead/rc_toolchange_for_G28
Always switch to tool 0 for G28
2016-07-20 19:07:35 -07:00
Scott Lahteine
209f5c03d0 Fewer temporary vars in planner accel limit 2016-07-20 18:29:29 -07:00
Scott Lahteine
62ecd107ba Patch ultralcd_impl header conditional names 2016-07-20 09:36:55 -07:00
Scott Lahteine
d2e9a9c188 Always switch to tool 0 for G28 2016-07-20 09:36:55 -07:00
Scott Lahteine
194d9521c3 Merge pull request #4356 from thinkyhead/rc_simpler_run_z_probe
Unify run_z_probe
2016-07-19 19:02:39 -07:00
Scott Lahteine
4a6ed5e221 Use HOMING_FEEDRATE_Z for Z_PROBE_SPEED_FAST 2016-07-19 18:42:48 -07:00
AnHardt
09a3cc33e6 Unify run_z_probe
Unify run_z_probe
Add double touch for DELTAs.
Introduce Z_PROBE_SPEED_FAST and Z_PROBE_SPEED_SLOW
  defaulting to homing_feedrate_mm_m[Z_AXIS] and homing_feedrate_mm_m[Z_AXIS]/2
2016-07-19 18:42:48 -07:00
Scott Lahteine
6137a1d934 Merge pull request #4359 from thinkyhead/rc_wrangle_movement_etc
Use ENABLED(MAPPER_NON)
2016-07-19 18:22:55 -07:00
Scott Lahteine
792fff5771 Merge pull request #4358 from thinkyhead/rc_individual_homing_rates
Set homing feedrates individually
2016-07-19 18:20:30 -07:00
Scott Lahteine
0432613ad7 use enabled macro for mapper setting 2016-07-19 18:08:56 -07:00
Scott Lahteine
e44b37cdc2 motion section marker below homing speeds 2016-07-19 17:31:58 -07:00
Scott Lahteine
204fd6ec44 Set homing feedrates individually 2016-07-19 17:31:58 -07:00
Scott Lahteine
e6e4d4062d Merge pull request #4357 from thinkyhead/rc_fix_keypad_issues
Fix some Reprapworld Keypad issues
2016-07-19 17:31:37 -07:00
Scott Lahteine
2bad02e60d Reprapworld Keypad: F1 opens the Move Axis menu 2016-07-19 16:40:39 -07:00
Scott Lahteine
eaa6f568ee Prevent re-entrant call of Reprapworld Keypad handler 2016-07-19 16:40:39 -07:00
Scott Lahteine
6abf916575 Reprapworld Keypad move step is 1mm 2016-07-19 16:40:39 -07:00
Scott Lahteine
06ac1f3bcf Reduce Reprapworld Keypad move code size 2016-07-19 16:40:39 -07:00
Scott Lahteine
5d5affdfca Merge pull request #4355 from thinkyhead/rc_rename_ultralcd_files
Rename ultralcd implementation files for consistency
2016-07-19 16:14:27 -07:00
Scott Lahteine
bb225dedc6 Merge pull request #4354 from thinkyhead/rc_jbrazio_rework_g12
NOZZLE_CLEAN_FEATURE with no dependency on HAS_BED_PROBE
2016-07-19 15:26:59 -07:00
Scott Lahteine
8a2efd1155 Rename ultralcd implementation files for consistency 2016-07-19 15:26:14 -07:00
João Brázio
0149fc189a Update travis config so NOZZLE_CLEAN_FEATURE no longer depends on AUTO_BED_LEVELING_FEATURE 2016-07-19 15:07:03 -07:00
João Brázio
b869fbc05e Update all config files with the new G12 options 2016-07-19 15:07:03 -07:00
João Brázio
47fef80848 Nozzle::clean() no longer requires HAS_BED_PROBE 2016-07-19 15:07:02 -07:00
Scott Lahteine
f1f1bac0e1 Merge pull request #4341 from esenapaj/Update-Japanese-translation
Update Japanese translation
2016-07-19 15:04:22 -07:00
João Brázio
5cdd6f02ec Update travis config not to send email notifications 2016-07-19 13:44:24 -07:00
Scott Lahteine
6c899bb520 Merge pull request #4349 from jbrazio/gcc-bark-bark
Removes some minor GCC warnings
2016-07-19 13:42:33 -07:00
Scott Lahteine
ef0a22871e Merge pull request #4350 from jbrazio/followup-a875861
Adds utility.h
2016-07-19 13:40:52 -07:00
Scott Lahteine
9eba58a031 Merge pull request #4351 from jbrazio/u8glib-converter
Updates u8glib's bmp2hex converter
2016-07-19 13:39:33 -07:00
Scott Lahteine
c502018eab Merge pull request #4353 from jbrazio/global-enum-file
General cleanup: enum
2016-07-19 13:37:56 -07:00
Scott Lahteine
0f9953b031 Merge pull request #4342 from AnHardt/rep-cons-g28
Introduce line_to_axis_pos() for use in homeaxis()
2016-07-19 12:56:58 -07:00
Scott Lahteine
d76389b4d1 Merge pull request #4340 from esenapaj/Follow-up-the-PR-#4335
Follow-up the PR #4335 (Debug char, fix compile errors for lcd pins)
2016-07-19 12:43:50 -07:00
AnHardt
11c075c6b2 Introduce line_to_axis_pos(axis_codes axis, float where, float feed_rate = 0.0)
and use it in `homeaxis()` instead of `do_blocking_move_to_axis_pos()`.
`do_blocking_move_to_axis_pos` was wrong because it performed subdivided, delta-corrected moves for x- and y-axis.

The first common move for delta homing is like quick_home but for 3 towers.

Fix two warnings.
2016-07-19 17:24:44 +02:00
João Brázio
3ebad4e020 Moves all global enums to a central file 2016-07-19 14:31:09 +01:00
João Brázio
238fefcb00 Updates Stopwatch class to use internal state enum 2016-07-19 14:30:44 +01:00
João Brázio
30ac0782a9 Comment section style correction 2016-07-19 03:27:42 +01:00
João Brázio
8ecee431c4 Updates u8glib's bmp2hex converter 2016-07-19 03:16:30 +01:00
João Brázio
79e7721b76 Removes some minor GCC warnings 2016-07-19 03:03:11 +01:00
João Brázio
f4d63796b2 Adds utility.h 2016-07-19 02:55:23 +01:00
esenapaj
361307831e Follow-up the PR #4335 (Debug char, fix compile errors for lcd pins)
・Solve a flickering when SD card is inserted or removed at using a ASCII
LCD + language_kana.h
2016-07-18 20:09:24 +09:00
esenapaj
ff48bbb86a Update Japanese translation
・Add new translation
2016-07-18 17:01:56 +09:00
Scott Lahteine
46117593b9 Merge pull request #4185 from esenapaj/Update-Japanese-translation
Update Japanese translation (work in progress)
2016-07-17 18:36:34 -07:00
Scott Lahteine
3422103863 Merge pull request #4310 from thinkyhead/rc_mbl_position_shift
Fix position shift with MBL
2016-07-17 18:31:25 -07:00
Scott Lahteine
92757bd7b3 Merge pull request #4339 from esenapaj/Follow-up-the-PR-#4163
Follow-up the PR #4163 (Mixing and Switching Extruders)
2016-07-17 18:15:23 -07:00
Scott Lahteine
cbf9fa7995 Merge pull request #4338 from thinkyhead/rc_anhardt_58
Use blocking_move, current_position in G28 homing
2016-07-17 18:12:40 -07:00
Scott Lahteine
493d30cd97 Drop intermediate nx, ny, and set destination directly 2016-07-17 17:59:52 -07:00
Scott Lahteine
07a735ad22 We always use destination so modify mesh_buffer_line 2016-07-17 17:57:33 -07:00
Scott Lahteine
04a5b7b257 A macro to normalize positions 2016-07-17 17:57:32 -07:00
esenapaj
5c8e87a866 Follow-up the PR #4163 (Mixing and Switching Extruders)
・Update forgotten K8400 files
2016-07-18 09:48:13 +09:00
Scott Lahteine
86eb5251c5 Fix some debug messages 2016-07-17 17:10:02 -07:00
Scott Lahteine
1e57a6af73 Use blocking_move, current_position in G28 homing 2016-07-17 16:56:13 -07:00
Scott Lahteine
f6a3a1da09 nz and ne are always set, so drop them down 2016-07-17 14:12:39 -07:00
Scott Lahteine
d0009e013b Rename cell index vars 2016-07-17 14:12:39 -07:00
Scott Lahteine
697373b071 Reduce code size of mesh_buffer_line 2016-07-17 14:11:25 -07:00
Scott Lahteine
103d312f6d MBL can actually do up to 9 x 9 2016-07-17 14:11:25 -07:00
Scott Lahteine
f4a69281fc Only call mesh_buffer_line when MBL is active 2016-07-17 14:11:25 -07:00
Scott Lahteine
799a31cd30 Include the position_shift when splitting mesh lines 2016-07-17 14:08:20 -07:00
Scott Lahteine
f242aea032 Merge pull request #4319 from thinkyhead/rc_feedrates_to_mess_with_you
Wrangle feed rate variables
2016-07-17 14:07:52 -07:00
Scott Lahteine
0342661b3f Merge pull request #4335 from thinkyhead/rc_status_pad_jp
Debug char, fix compile errors for lcd pins
2016-07-17 14:07:08 -07:00
Scott Lahteine
81e01152bb Merge pull request #4336 from thinkyhead/rc_bltouch_sensor
BLTouch probe sensor
2016-07-17 14:06:32 -07:00
Scott Lahteine
d8c8d0a6a2 Merge pull request #4337 from thinkyhead/rc_inverts_as_macros
Endstop invert flags as macros instead of const bool
2016-07-17 14:06:10 -07:00
Scott Lahteine
1583177ef4 BLTOUCH probe config option 2016-07-17 13:55:38 -07:00
Scott Lahteine
176b9627c7 Some cleanup ahead of BLTOUCH support 2016-07-17 13:55:38 -07:00
Scott Lahteine
39706f3e57 Endstop invert flags as macros instead of const bool 2016-07-17 13:51:02 -07:00
Scott Lahteine
253f843da5 Merge pull request #4306 from thinkyhead/rc_stupid_name_okbai
ENDSTOPS_ONLY_FOR_HOMING is confusing
2016-07-17 13:50:19 -07:00
Scott Lahteine
7242d44810 Endstops vars already initialized 2016-07-17 13:38:48 -07:00
Scott Lahteine
5ed1e7a464 codenum => dwell_ms 2016-07-17 13:35:21 -07:00
Scott Lahteine
69d6016941 Revert default state of endstops in M502 2016-07-17 13:35:21 -07:00
Scott Lahteine
0fcd3706dd Replace ENDSTOPS_ONLY_FOR_HOMING with ENDSTOPS_ALWAYS_ON_DEFAULT 2016-07-17 13:35:21 -07:00
Scott Lahteine
671634bf11 Fix spacing after section header 2016-07-17 13:35:21 -07:00
Scott Lahteine
f38553b482 fix a debug message 2016-07-17 13:29:42 -07:00
Scott Lahteine
3d78b8f929 Use HYPOT macro instead of hypot function 2016-07-17 13:29:42 -07:00
Scott Lahteine
9f9fe043ba Apply sq macro throughout 2016-07-17 13:29:41 -07:00
Scott Lahteine
93ba5bddd7 Append units to feedrate variables 2016-07-17 13:29:41 -07:00
Scott Lahteine
889570029a Merge pull request #4332 from esenapaj/Update-URL
Update URL in createTemperatureLookupMarlin.py
2016-07-17 12:29:55 -07:00
Scott Lahteine
5e3d3918b6 Patch compile error for RAMPS LCD pins 2016-07-17 12:27:37 -07:00
Scott Lahteine
94955a8bf7 pad string in lcd_finishstatus 2016-07-17 12:27:37 -07:00
Scott Lahteine
21ee0612e3 Debug char 2016-07-17 12:27:36 -07:00
Scott Lahteine
c3cc24242c Merge pull request #4330 from thinkyhead/rc_debug_g28_more
Debugging of MBL in G28
2016-07-17 11:36:19 -07:00
Scott Lahteine
8f24e0a556 Debugging of MBL in G28 2016-07-17 11:08:30 -07:00
Scott Lahteine
f8973a7cec Merge pull request #4163 from thinkyhead/rc_new_extruders_diff
Mixing and Switching Extruders
2016-07-17 11:05:03 -07:00
Scott Lahteine
05da02f0a2 Implement MIXING_EXTRUDER and SWITCHING_EXTRUDER 2016-07-17 10:53:10 -07:00
esenapaj
ce2814ed60 Update URL in createTemperatureLookupMarlin.py 2016-07-17 21:08:09 +09:00
Scott Lahteine
22b4cff423 New extruder type configuration options 2016-07-17 00:13:56 -07:00
Scott Lahteine
9730a9355c Travis test for Mixing and Switching extruders 2016-07-17 00:13:56 -07:00
esenapaj
601015b73e Update Japanese translation 2016-07-17 16:04:12 +09:00
Scott Lahteine
9766e24504 Merge pull request #4277 from thinkyhead/rc_mks_13_viki2
Support for VIKI2 with MKS 1.3 / 1.4
2016-07-16 23:49:33 -07:00
Scott Lahteine
02285662f5 Merge pull request #4298 from jbrazio/feature/filament-counter
Adds filamentUsed and longestPrint stats to PrintCounter
2016-07-16 23:48:46 -07:00
Scott Lahteine
bf16ae5a70 Merge pull request #4299 from jbrazio/feature/g27-park-nozzle
Implements park nozzle feature
2016-07-16 23:47:12 -07:00
Scott Lahteine
aaa0d298b9 Merge pull request #4326 from thinkyhead/rc_no_static_items_fix
Suppress compiler warnings in ultralcd.cpp
2016-07-16 23:38:08 -07:00
Scott Lahteine
cc3ef73583 Merge pull request #4327 from thinkyhead/rc_petrzjr_long_print
LCD Longer print
2016-07-16 23:37:34 -07:00
Scott Lahteine
77c8fb627f Merge pull request #4329 from thinkyhead/rc_italian_fix
Added missing Italian translations
2016-07-16 23:37:15 -07:00
Scott Lahteine
b14888501b Merge pull request #4301 from Ingramz/RCBugFix
Add Cartesio CN Controls V11
2016-07-16 22:35:07 -07:00
Silvio Didonna
32e0d71729 Added missing translations 2016-07-16 22:26:46 -07:00
Scott Lahteine
0f3232065e Merge pull request #4305 from jbrazio/feature/splash-improvement
Custom boot screen feature improvement
2016-07-16 21:59:39 -07:00
Petr Zahradník junior
2d7fe9dc78 LCD Longer print 2016-07-16 18:21:06 -07:00
Scott Lahteine
eee903bd4b Format some DAC lines 2016-07-16 17:59:13 -07:00
Scott Lahteine
d53dcaa796 Suppress some compiler warnings 2016-07-16 17:59:01 -07:00
João Brázio
9775af0c24 Update travis to handle custom_bootscreen.h files 2016-07-17 01:31:44 +01:00
João Brázio
fa4274cf4c Improves the custom bootscreen logo feature 2016-07-17 01:31:44 +01:00
João Brázio
1f3283e3a5 Adds custom boot logos for bq Hephestos 2 and Cartesio 2016-07-17 01:31:36 +01:00
João Brázio
dfa1c45075 Adds a notice to vendors about the SHOW_CUSTOM_BOOTSCREEN directive 2016-07-17 01:15:17 +01:00
Scott Lahteine
ed468e848f Merge pull request #4321 from esenapaj/Follow-up-the-PR-#4287
Follow-up and fix the PR #4287 (Allow stopwatch and printcounter to go over 18:12:15)
2016-07-16 17:14:21 -07:00
João Brázio
a8758619ec The safe_delay() is now globaly accessible 2016-07-16 12:28:06 +01:00
João Brázio
9a00108cb6 Adds the WEBSITE_URL as the boot screen line 2 2016-07-16 12:24:37 +01:00
João Brázio
f5234b0695 Adds a customizable screen timeout for the default boot screen 2016-07-16 12:24:36 +01:00
João Brázio
2f26bc2153 Adds filamentUsed and longestPrint stats to PrintCounter 2016-07-16 12:12:27 +01:00
João Brázio
336481ea81 Added G27 configuration options to all configs 2016-07-16 12:07:59 +01:00
João Brázio
c711701626 Implements a nozzle parking command (G27) 2016-07-16 12:07:59 +01:00
João Brázio
7202383695 Merge pull request #4323 from jbrazio/followup-4320
Followup for #4320
2016-07-16 12:07:31 +01:00
João Brázio
5f368d1bc3 Followup for #4320 2016-07-16 11:57:35 +01:00
João Brázio
d7c51bc4b9 Merge pull request #4320 from jbrazio/followup/4307
Moves do_blocking_move_to_xy() out of the HAS_BED_PROBE define
2016-07-16 11:48:00 +01:00
esenapaj
af9b1d79b1 Follow-up and fix the PR #4287 (Allow stopwatch and printcounter to go over 18:12:15)
・Remove MSG_END_HOUR and MSG_END_MINUTE from all the language files
・Change from MSG_INFO_TOTAL_PRINTS to MSG_INFO_PRINT_COUNT in German
file
2016-07-16 18:39:22 +09:00
Scott Lahteine
e563634a25 Merge pull request #4314 from AnHardt/use-d_b_m_t-in-g28
Use do_blicking_move_to*() in G28
2016-07-15 20:22:02 -07:00
Scott Lahteine
59ae1811c2 Merge pull request #4303 from AnHardt/delta-g28
DELTA: Move out of the clip-zone after G28
2016-07-15 20:20:22 -07:00
Scott Lahteine
ead155399f Merge pull request #4311 from jbrazio/bugfix/print_xyz-overflow
Fixes an PSTR overflow with print_xyz()
2016-07-15 20:08:09 -07:00
João Brázio
fdea8b6e6a Moves do_blocking_move_to_xy() out of the HAS_BED_PROBE define 2016-07-16 03:59:49 +01:00
AnHardt
d2a49c016d DELTA: Move out of the clip-zone after G28
Move down to a safe height after G28 for DELTAs.
2016-07-15 15:22:44 +02:00
AnHardt
46994fd17d Use do_blicking_move_to*() in G28 2016-07-15 15:02:15 +02:00
João Brázio
ffbb31b235 Fixes an PSTR overflow with print_xyz() 2016-07-15 11:25:34 +01:00
Indrek Ardel
ecb23c1b65 Add Cartesio CN Controls V11 board 2016-07-15 12:55:47 +03:00
Indrek Ardel
c8f2dd7cd5 Fix CN Controls 12 styling 2016-07-15 09:54:09 +03:00
Scott Lahteine
cec7110409 Merge pull request #4308 from thinkyhead/rc_debug_gcode_t
Added logging related to gcode_T
2016-07-14 19:46:33 -07:00
Scott Lahteine
6446d3939a Merge pull request #4309 from thinkyhead/rc_static_item_fix_77
Fix skipping of static items
2016-07-14 19:28:49 -07:00
Scott Lahteine
84bf58db72 Merge pull request #4307 from jbrazio/feature/movement-unleash
Remove do_blocking_move_*() dependency on HAS_BED_PROBE
2016-07-14 19:23:30 -07:00
Scott Lahteine
95ab2fd3ae Fix skipping of static items 2016-07-14 19:16:16 -07:00
Scott Lahteine
166f19251e Add more debugging for leveling
- Especially in `gcode_T`
- In `update_software_endstops`
- Some tweaks to observe
2016-07-14 19:04:13 -07:00
Scott Lahteine
7ac0b91a45 Collapsible long comment in gcode_T 2016-07-14 18:28:41 -07:00
João Brázio
e71a631f8f do_blocking_move_*() no longer depend on HAS_BED_PROBE 2016-07-15 01:54:14 +01:00
Scott Lahteine
8bf6861af8 Merge pull request #4054 from jbrazio/feature/g12-clean-tool
Implements clean nozzle feature (Lulzbot's REWIPE)
2016-07-14 14:38:38 -07:00
Scott Lahteine
75901b616c Merge pull request #4287 from thinkyhead/rc_long_print_times
Allow stopwatch and printcounter to go over 18:12:15
2016-07-14 12:14:15 -07:00
Scott Lahteine
c5e51f6b96 finished => completed 2016-07-14 11:46:35 -07:00
Scott Lahteine
1618870c84 card.printingHasFinished does print_job_timer.stop 2016-07-14 11:39:58 -07:00
Scott Lahteine
34da77dad3 Simply run M31 at the end of an SD print 2016-07-14 11:39:58 -07:00
Scott Lahteine
23d2bc5ab0 Patch Greek for new strings 2016-07-14 11:39:58 -07:00
Scott Lahteine
a8d71f0ac6 Support longer print times in M31 2016-07-14 11:39:58 -07:00
Scott Lahteine
e481b79af1 Allow stopwatch and printcounter to go over 18 hours 2016-07-14 11:39:57 -07:00
João Brázio
68c343a09a Added G12 configuration options to all configs 2016-07-14 00:38:42 +01:00
João Brázio
4937f9ada4 Minor G12 tweaks and point_t struct extension 2016-07-14 00:07:36 +01:00
Scott Lahteine
6080924589 Merge pull request #4296 from jbrazio/feature/bqh2-update
Update the bq Hephestos 2 configuration
2016-07-13 13:18:09 -07:00
Scott Lahteine
ed89c71e53 Merge pull request #4291 from esenapaj/Follow-up-the-PR-#4278
Follow-up the PR #4278 (Fixups for PID_ADD_EXTRUSION_RATE and HOTENDS==1)
2016-07-13 13:17:03 -07:00
Scott Lahteine
f23689d9f1 Merge pull request #4292 from esenapaj/Follow-up-the-PR-#4252
Follow-up the PR #4252 (Replace PLA/ABS preheating with generic)
2016-07-13 13:16:30 -07:00
João Brázio
021544f572 Improves G12 zig-zag pattern 2016-07-13 21:14:56 +01:00
João Brázio
b05a75655a Implements a nozzle cleaning pattern generator (G12) 2016-07-13 21:14:19 +01:00
João Brázio
005af84140 Update the bq Hephestos 2 configuration 2016-07-13 21:06:31 +01:00
esenapaj
8f03f0be9b Follow-up the PR #4252 (Replace PLA/ABS preheating with generic) 2016-07-13 22:42:16 +09:00
esenapaj
c2c8ab4698 Follow-up the PR #4278 (Fixups for PID_ADD_EXTRUSION_RATE and HOTENDS==1) 2016-07-13 22:24:31 +09:00
Scott Lahteine
4f77adddbe Merge pull request #4286 from thinkyhead/rc_debug_clean
Prefix and suffix in debug output
2016-07-12 20:49:15 -07:00
Scott Lahteine
e5c7af5ddc Merge pull request #4222 from thinkyhead/rc_allow_cold_extrude
M302: Add "P" parameter, status output
2016-07-12 20:40:14 -07:00
Scott Lahteine
2224032568 Merge pull request #4285 from thinkyhead/rc_manual_move_fast_fine
No delay for the smallest LCD moves
2016-07-12 20:16:38 -07:00
Scott Lahteine
cdd77d23bb Neaten up temperature member data 2016-07-12 20:04:15 -07:00
Scott Lahteine
d4c68279c8 Add "P" parameter to M302 2016-07-12 20:04:15 -07:00
Scott Lahteine
a5bae3c7d5 Merge pull request #4229 from blubbfish/patch-1
Update language_de.h for German translation
2016-07-12 20:01:46 -07:00
Scott Lahteine
a8b6b6a128 Merge pull request #4252 from thinkyhead/rc_rename_hpb
Replace PLA/ABS preheating with generic
2016-07-12 20:00:33 -07:00
Scott Lahteine
1e14df876d Use varname as prefix in DEBUG_POS, string as suffix 2016-07-12 19:58:09 -07:00
Scott Lahteine
9e8b3e5ee6 Homing direction is irrelevant in probe raise! 2016-07-12 18:09:02 -07:00
Scott Lahteine
ecd5e810ac No delay for the smallest LCD moves 2016-07-12 18:09:01 -07:00
Scott Lahteine
2b9515d60f Merge pull request #4281 from AnHardt/lang-system
Don't use UTF-strlen() if the text is not UTF
2016-07-12 17:21:28 -07:00
Scott Lahteine
973a669aa3 Merge pull request #4264 from thinkyhead/rc_ultralcd_encoder_pos
Remove extraneous conditions for encoder position
2016-07-12 16:54:13 -07:00
Scott Lahteine
e9f62d8fdb Remove extraneous conditions for encoder position 2016-07-12 16:41:00 -07:00
Scott Lahteine
7c81398f95 Merge pull request #4279 from esenapaj/Follow-up-the-PR-#4271
Follow-up the PR #4271 (X_DUAL_STEPPER_DRIVERS)
2016-07-12 16:39:37 -07:00
Scott Lahteine
0554b65d22 Merge pull request #4284 from thinkyhead/rc_serial_ln_macros
Sled-probe sanity fix, conditionals for remaining types of leveling
2016-07-12 16:36:33 -07:00
Scott Lahteine
655c3fd55f Move delta ABL sanity checks up 2016-07-12 16:10:16 -07:00
Scott Lahteine
db0882d068 AUTO_BED_LEVELING_3POINT and DELTA_BED_LEVELING_GRID 2016-07-12 16:10:11 -07:00
Scott Lahteine
e974ac63ef Init matrix in planner.init 2016-07-12 15:55:27 -07:00
Scott Lahteine
47d55513ec Merge pull request #4280 from AnHardt/msg-file-upload
Finalalize MSG_SD_WRITE_TO_FILE message with a \n
2016-07-12 13:02:52 -07:00
AnHardt
b273736962 Make MAPPER_NON the fall back mapper
Make MAPPER_NON the fall back mapper - if no other is defined.
One list less to maintain.
2016-07-12 19:59:14 +02:00
AnHardt
54d35230df Don't use UTF-strlen() if the text is not UTF 2016-07-12 19:59:03 +02:00
Scott Lahteine
a1de96d152 Merge pull request #4278 from thinkyhead/rc_more_hotends_1
Fixups for PID_ADD_EXTRUSION_RATE and HOTENDS==1
2016-07-12 10:36:13 -07:00
AnHardt
87957c7b44 Finalalize MSG_SD_WRITE_TO_FILE message with a \n
Finalalize MSG_SD_WRITE_TO_FILE message with a \n
else RH hangs.
2016-07-12 13:13:04 +02:00
esenapaj
9b5cbf2423 Follow-up the PR #4271 (X_DUAL_STEPPER_DRIVERS)
・Update a forgotten Configuration_adv.h of K8400
2016-07-12 17:50:49 +09:00
Scott Lahteine
809da999dc Apply HOTEND_INDEX in preheat methods 2016-07-11 22:27:25 -07:00
Scott Lahteine
3d78b690e5 Single PID dataset with HOTENDS == 1 2016-07-11 22:27:24 -07:00
Scott Lahteine
bf9967c65d Apply HOTEND_INDEX in MILLISECONDS_PREHEAT_TIME 2016-07-11 22:27:24 -07:00
Scott Lahteine
11dcbae7a2 Only a single E axis. Can tool-change reseed position[E_AXIS]? 2016-07-11 22:27:24 -07:00
Scott Lahteine
4865447830 Merge pull request #4276 from esenapaj/Suppress-warnings
Suppress warnings
2016-07-11 19:08:59 -07:00
Scott Lahteine
815df28b0b Merge pull request #4274 from esenapaj/Follow-up-the-PR-#4024
Follow-up the PR #4024 (Greek Language by @psavva)
2016-07-11 19:04:44 -07:00
Scott Lahteine
44f739a5eb Merge pull request #4273 from esenapaj/Fix-for-the-PR-#4256
Fix for the PR #4256 (Additional tweaks for HOTENDS == 1)
2016-07-11 19:02:45 -07:00
Scott Lahteine
02f711fe00 Merge pull request #4275 from AnHardt/dont-deploy
Don't deploy/stow the probe if z-min-endstop is used for homing
2016-07-11 18:46:23 -07:00
Scott Lahteine
6a45aad893 Merge pull request #4272 from AnHardt/m100-rep
Repair M100
2016-07-11 18:45:13 -07:00
Scott Lahteine
243ad4312a Merge pull request #4271 from thinkyhead/rc_X_DUAL_STEPPER_DRIVERS
X_DUAL_STEPPER_DRIVERS
2016-07-11 18:38:45 -07:00
Scott Lahteine
6e68dd292b Merge pull request #4243 from thinkyhead/rc_fix_static_scrolling
Improve STATIC_ITEM implementation
2016-07-11 18:25:00 -07:00
Scott Lahteine
d17b161832 Don't draw current screen if simply changing screens 2016-07-11 18:14:04 -07:00
Scott Lahteine
096f9981d1 Scroll to the top when changing screens 2016-07-11 18:14:04 -07:00
Scott Lahteine
7ae84d768e Tweak conditionals for REPRAPWORLD_KEYPAD 2016-07-11 18:14:04 -07:00
Scott Lahteine
155af6b861 Rename vars, add comments for menu macros 2016-07-11 18:14:04 -07:00
Scott Lahteine
31f2cf5f6f Make encoderLine signed for proper compares 2016-07-11 18:14:03 -07:00
Scott Lahteine
d9f75f62c0 START_ROW => START_COL 2016-07-11 18:14:03 -07:00
Scott Lahteine
d2099fef0d Left-justify thermistor info 2016-07-11 18:14:03 -07:00
Scott Lahteine
85aeb02aa6 Invert headings on Graphical LCD 2016-07-11 18:14:03 -07:00
Scott Lahteine
3a67fb77b0 Concatenate LCD static strings 2016-07-11 18:14:02 -07:00
Scott Lahteine
13dc619f43 Scroll static screens more simply 2016-07-11 18:14:02 -07:00
Scott Lahteine
5051723c2e Redraw after cursor correction in STATIC_ITEM 2016-07-11 18:14:02 -07:00
esenapaj
58177a1602 Suppress warnings 2016-07-12 08:22:24 +09:00
Scott Lahteine
10ebf28ee3 Allow override of ENCODER_FEEDRATE_DEADZONE, lower default for Viki 2016-07-11 15:43:08 -07:00
Scott Lahteine
9b1ba1012a Support for VIKI2 with MKS Gen 1.3 / 1.4 2016-07-11 15:43:08 -07:00
Scott Lahteine
55dc8051d8 Cleanup of RAMPS LCD pins 2016-07-11 15:38:55 -07:00
AnHardt
7bcab26f2a Don't deploy/stow the probe if z-min-endstop is used for homing
Don't deploy/stow the probe if z-min-endstop is used for homing.
Don't apply `zprobe_zoffset` if probe was not used.
2016-07-11 22:01:44 +02:00
esenapaj
84ded1f659 Follow-up the PR #4024 (Greek Language by @psavva)
・Update forgotten Configuration.h of K8400
2016-07-12 04:19:09 +09:00
esenapaj
6af525e252 Fix for the PR #4256 (Additional tweaks for HOTENDS == 1) 2016-07-12 03:51:29 +09:00
AnHardt
23e0134596 Repair M100
M100 D was running too long - caused watchdog resets.
M100 I showed more free memory than a Arduino Mega has RAM.
2016-07-11 20:44:30 +02:00
Scott Lahteine
4b4a582c4f X_DUAL_STEPPER_DRIVERS implementation 2016-07-11 10:22:19 -07:00
Scott Lahteine
91bd6eade7 X_DUAL_STEPPER_DRIVERS configuration option 2016-07-11 10:22:19 -07:00
Scott Lahteine
6121c9018a Merge pull request #4265 from thinkyhead/rc_buzzer_patchup
Two strategies to address a stuck buzzer
2016-07-10 19:46:15 -07:00
Scott Lahteine
4a100c6832 Merge pull request #4250 from AnHardt/wait-for-cooling-slope
Adjust wait_for_cooling slope
2016-07-10 19:45:23 -07:00
Scott Lahteine
ed018c98d5 Merge pull request #4024 from thinkyhead/rc_greek_language
Greek Language by @psavva
2016-07-10 19:42:09 -07:00
Scott Lahteine
d1dffc7ad1 timestamp => endtime 2016-07-10 19:36:46 -07:00
Scott Lahteine
71674059c3 Two strategies to address a stuck buzzer 2016-07-10 19:25:23 -07:00
Scott Lahteine
928ff6487a Greek language pack from @psavva 2016-07-10 18:59:04 -07:00
AnHardt
e92e58df1f Adjust wait_for_cooling slope
Adjust wait_for_cooling slope
and drop mintemp for cooling.

See
https://github.com/MarlinFirmware/Marlin/pull/4169#issuecomment-231544532
2016-07-11 03:36:23 +02:00
Scott Lahteine
167f4aa0cc Merge pull request #4259 from clexpert/patch-3
Update language_cz.h
2016-07-10 18:26:23 -07:00
Scott Lahteine
8dda05e92a Merge pull request #4258 from clexpert/patch-2
Total print time for LCD correction (hours:minutes format)
2016-07-10 18:25:18 -07:00
Scott Lahteine
0ccc5d1dd9 Merge pull request #4244 from thinkyhead/rc_dyze_thermistor_diff
Dyze High Temp Thermistor Support
2016-07-10 18:08:44 -07:00
Scott Lahteine
182c8d7f8f Dyze High Temp Thermistor Support 2016-07-10 17:59:05 -07:00
Scott Lahteine
5b0e46c986 Merge pull request #4256 from thinkyhead/rc_fix_singlenozzle_temp
Additional tweaks for HOTENDS == 1
2016-07-10 17:57:00 -07:00
Scott Lahteine
5b87deebb6 Merge pull request #4257 from esenapaj/Follow-up-the-PR-#4253-etc
Follow-up the PR #4253 (Runout Sensor without SD Card, Print Timer support in M104), etc
2016-07-10 16:59:24 -07:00
Scott Lahteine
ee0983ab57 Further reduction when HOTENDS == 1 2016-07-10 16:54:30 -07:00
Scott Lahteine
3e1bbd5e27 Indentation in gcode_M100 2016-07-10 16:33:51 -07:00
Scott Lahteine
b72238f406 Invariant get_pid_output with HOTENDS < 2 2016-07-10 16:33:51 -07:00
Petr Zahradnik
66602f4af6 Update language_cz.h
New strings:
#define MSG_HALTED
#define MSG_PLEASE_RESET
Some texts shortened for smaller displays.
2016-07-10 13:25:50 +02:00
Petr Zahradnik
eaf9e615ce Total print time for LCD correction (hours:minutes format) 2016-07-10 13:08:05 +02:00
esenapaj
9e56d5825e Adjust spacing 2016-07-10 14:25:29 +09:00
esenapaj
5832f4b848 Follow-up the PR #4253 (Runout Sensor without SD Card, Print Timer support in M104)
・Update forgotten example configuration files
2016-07-10 14:24:57 +09:00
Scott Lahteine
77283f5bf0 Merge pull request #4245 from thinkyhead/rc_simpler_therm_check
Simpler/extensible thermistor test in thermistortables.h
2016-07-09 21:13:42 -07:00
Scott Lahteine
f9e08b1fcd Merge pull request #4254 from AnHardt/killscreen
Add a kill-screen
2016-07-09 20:44:42 -07:00
AnHardt
faac2bcfdb Add a kill-screen 2016-07-10 04:50:45 +02:00
Scott Lahteine
3b3e52616c Merge pull request #4253 from thinkyhead/rc_clexpert_runout
Runout Sensor without SD Card, Print Timer support in M104
2016-07-09 19:10:36 -07:00
Scott Lahteine
aa3ab93971 Merge pull request #4240 from AnHardt/sampler-8-7-16
Today's fix and cleanup collection
2016-07-09 19:09:45 -07:00
Scott Lahteine
4cd045791c Reduce code size by trusting the compiler 2016-07-09 18:17:44 -07:00
Scott Lahteine
a8538bd7ce General cleanup, code reduction in Marlin_main.cpp 2016-07-09 18:17:44 -07:00
Scott Lahteine
1026e5b071 Replace PLA/ABS preheating with generic 2016-07-09 18:06:51 -07:00
Petr Zahradnik
e282d69f63 Print job timer comment changed 2016-07-09 17:57:54 -07:00
Petr Zahradnik
a2159cfbc3 Error message change in SanityCheck.h 2016-07-09 17:57:54 -07:00
Petr Zahradník junior
315b4c2153 Runout sensor without SD Card 2016-07-09 17:57:53 -07:00
Scott Lahteine
51c9c3fe2c Indentation in MarlinSerial.cpp 2016-07-09 17:57:53 -07:00
Scott Lahteine
e03414b2dd Simpler/extensible thermistor test in thermistortables.h 2016-07-08 19:54:45 -07:00
Scott Lahteine
c23dd7eefc Merge pull request #4241 from AnHardt/adTXbuffer3
Add TX-buffer for MarlinSerial
2016-07-08 18:34:53 -07:00
AnHardt
4b44a23a36 Add TX-buffer for MarlinSerial
Similar to the current Arduino HardwareSerial
but with max. 256 byte buffer-size.

Deactivated by default.

The boards with AT90USB processor (USBCON) already use a TX-buffer.
2016-07-08 17:25:21 +02:00
AnHardt
468f7f03a2 homeaxis() can leave early
when no known axis needs to be homed.

Most changes are only caused from altering the indentation.
```
if (axis == X_AXIS ? HOMEAXIS_DO(X) : axis == Y_AXIS ? HOMEAXIS_DO(Y) : axis == Z_AXIS ? HOMEAXIS_DO(Z) : 0) {
  ...
}

to

if (!(axis == X_AXIS ? HOMEAXIS_DO(X) : axis == Y_AXIS ? HOMEAXIS_DO(Y) : axis == Z_AXIS ? HOMEAXIS_DO(Z) : 0)) return;
...

```
2016-07-08 15:59:33 +02:00
AnHardt
eff7912243 Ensble/disable hardware endstops in G28 globally.
For moving away from the endstops we do not have to disable them.
They are not tested anyway.
2016-07-08 15:49:10 +02:00
AnHardt
f69434d81c Eliminate void setup_for_endstop_move() 2016-07-08 15:23:20 +02:00
AnHardt
0ea6247fc2 Use logic in Z_SAFE_HOMING
Use logic in Z_SAFE_HOMING

From
```
if (home_all_axis || homeZ) {
  if (home_all_axis) {
  ...
  home z
  }
  else if (homeZ) { // Don't need to Home Z twice
  home z
  }
}

```
to
```
if (home_all_axis || homeZ) {
  if (home_all_axis) {
  ...
  }
  home z
}
```
2016-07-08 15:08:50 +02:00
AnHardt
de3a169336 Always define MIN_Z_HEIGHT_FOR_HOMING even if 0
Always define MIN_Z_HEIGHT_FOR_HOMING even if 0
Always make a potential rise to `home_offset[Z_AXIS]` possible in G28.
Get rid of some very ugly constructs in MBL (ultralcd.cpp).
2016-07-08 15:08:32 +02:00
AnHardt
88ed232f53 Remove HAS_BED_PROBE case in first raise in G28
Differentiating made sense here when we could save a dozen lines of code,
but not for one line.
2016-07-08 14:59:44 +02:00
AnHardt
653eff3b31 Clean up quick_home_xy()
Since we do the actual homing now in the 'normal' routines `quick_home_xy()`
can be simplified to a relative simple diagonal move.
2016-07-08 14:59:27 +02:00
Scott Lahteine
98d0167a57 Merge pull request #4226 from thinkyhead/rc_emergency_command_parser
MarlinSerial emergency-command parser (with M108)
2016-07-07 16:53:55 -07:00
Scott Lahteine
2ee4e4f791 Make wait_for_heatup volatile 2016-07-07 16:37:23 -07:00
Scott Lahteine
bd5a825b8b Wait for end of line before invoking action 2016-07-07 16:37:23 -07:00
Scott Lahteine
ea47803ae2 Simplify emergency parser (only parse initial command) 2016-07-07 16:37:22 -07:00
Scott Lahteine
834ad14c8d Add quickstop_stepper to update current position with stepper.quick_stop() 2016-07-07 16:37:22 -07:00
Scott Lahteine
ecffe92e20 Group EMERGENCY_PARSER commands 2016-07-07 16:37:22 -07:00
AnHardt
a129078927 Add an emergency-command parser to MarlinSerial (supporting M108)
Add an emergency-command parser to MarlinSerial's RX interrupt.

The parser tries to find and execute M108,M112,M410 before the commands disappear in the RX-buffer.

To avoid false positives for M117, comments and commands followed by filenames (M23, M28, M30, M32, M33) are filtered.

This enables Marlin to receive and react on the Emergency command at all times - regardless of whether the buffers are full or not. It remains to convince hosts to send the commands. To inform the hosts about the new feature a new entry in the M115-report was made. "`EMERGENCY_CODES:M112,M108,M410;`".

The parser is fast. It only ever needs two switch decisions and one assignment of the new state for every character.

One problem remains. If the host has sent an incomplete line before sending an emergency command the emergency command could be omitted when the parser is in `state_IGNORE`.
In that case the host should send "\ncommand\n"

Also introduces M108 to break the waiting for the heaters in M109, M190 and M303.

Rename `cancel_heatup` to `wait_for_heatup` to better see the purpose.
2016-07-07 16:37:22 -07:00
Scott Lahteine
9f42b1a075 Merge pull request #4235 from thinkyhead/rc_revert_quickhome_test
Fix quick homing, tweak MIN_Z_HEIGHT_FOR_HOMING
2016-07-07 13:37:14 -07:00
Scott Lahteine
ad968f2325 Merge pull request #4234 from thinkyhead/rc_better_position_logging
Move XYZ in print_xyz and DEBUG_POS to the front
2016-07-07 12:31:15 -07:00
Scott Lahteine
4036c73cdd Don't raise Z if only homing Z 2016-07-07 12:28:37 -07:00
Scott Lahteine
0b6f8f8244 Apply MIN_Z_HEIGHT_FOR_HOMING raise literally 2016-07-07 12:25:02 -07:00
Scott Lahteine
177ec20bf0 Revert quick-home changes 2016-07-07 12:17:34 -07:00
Scott Lahteine
9c5b462ef2 Move XYZ in print_xyz and DEBUG_POS to the front 2016-07-07 11:42:19 -07:00
Scott Lahteine
4e84c803a3 Merge pull request #4232 from thinkyhead/rc_no_axis_codes_needed
Don't use axis_codes if a literal will do
2016-07-06 20:05:16 -07:00
Scott Lahteine
e2f7cb0905 Don't use axis_codes if a literal will do 2016-07-06 18:37:21 -07:00
Scott Lahteine
e76aa9d79a Merge pull request #4231 from thinkyhead/rc_fix_homing_raise
Fix comment on Z raise for homing, save a few bytes
2016-07-06 16:23:29 -07:00
Scott Lahteine
6559f7359f Fix comment on Z raise for homing, save a few bytes 2016-07-06 16:21:51 -07:00
Scott Lahteine
799c60cadc Merge pull request #4217 from thinkyhead/rc_fix_homing_raise
Don't do_probe_raise with MIN_Z_HEIGHT_FOR_HOMING
2016-07-06 14:39:37 -07:00
Scott Lahteine
99a5a5dd65 Merge pull request #4228 from petrzjunior/patch-1
[LANGUAGE] Update Czech (filament change and info)
2016-07-06 14:00:31 -07:00
Scott Lahteine
d7e9647505 Sanity Check for probe raises 2016-07-06 13:46:06 -07:00
Scott Lahteine
d0b29cabf3 Don't re-home X and Y if you quick homed 2016-07-06 13:46:06 -07:00
Scott Lahteine
e0a6b978f5 Don't do_probe_raise with MIN_Z_HEIGHT_FOR_HOMING 2016-07-06 13:46:05 -07:00
Philip Schell
cf8ec1216a Update language_de.h for German translation
@MarlinFirmware/language-team my changes for the German language. Feel free to improve :)
2016-07-06 21:44:16 +02:00
petrzjunior
b81b77111b Update language_cz.h 2016-07-06 21:04:34 +02:00
Scott Lahteine
7735ec5e7a Merge pull request #4223 from thinkyhead/rc_rename_heatup
Change cancel_heatup to wait_for_heatup
2016-07-06 11:25:44 -07:00
Scott Lahteine
160a2be117 Change cancel_heatup to wait_for_heatup 2016-07-06 09:17:50 -07:00
Scott Lahteine
cb17871a48 Merge pull request #4207 from AnHardt/AllenKey2
Clean up, simplify and generalize the Allen-key-probe code.
2016-07-05 19:34:36 -07:00
AnHardt
16c83d203b Make use of the good features of a sled probe for all probes.
Move and extend axis_unhomed test to deploy/stow_z_probe().
Move and extend position store/restore to deploy/stow_z_probe().

Now all kinds of probes can use the 'E' parameter in G29/M48.
Allen key probes can be used now for grid and 3-point levelling.

Deploying the Allen Key probe uses big moves in z direction.
Too dangerous for an unhomed z-axis.
Throw a compile time error when we try to configure an
Allen Key probe homing to z-min and having no other z-min-endstop.
2016-07-06 04:11:04 +02:00
AnHardt
8555816a11 Generalize and simplify 'triggered when stowed test`
The `PROBE_IS_TRIGGERED_WHEN_STOWED_TEST` is able to detect if a probe is
successfully deployed/stowed.
It was part of the Allen Key probes code only.
Now the function is generally available.

Currently this test is compulsory for Allen Key probes to not alter the used behaviour
If you want to add the test for an other type of probe simply add
```
#define PROBE_IS_TRIGGERED_WHEN_STOWED_TEST
```
to your config.
2016-07-06 03:56:17 +02:00
AnHardt
5126cce7fd Move Allen Key probe move scripts to their own functions
There was an hidden extra move after the scripts. This is configurable now.
Added the extra moves to the relevant configs.
2016-07-06 03:46:40 +02:00
AnHardt
7d063c111c Add a optional feedrate parameter to do_blocking_move()
Add a optional feedrate parameter to `do_blocking_move()` and its companions.
2016-07-06 03:46:34 +02:00
Scott Lahteine
90d8bb53e8 Merge pull request #4214 from thinkyhead/fix_clear_command_queue
Allow the command queue to be cleared by commands, lcd menus
2016-07-05 16:35:55 -07:00
Scott Lahteine
b114b6a0b3 Save 152 bytes using uint8_t for command indices 2016-07-05 16:29:28 -07:00
Scott Lahteine
0d4ff0c48b Allow the queue to be cleared from within commands 2016-07-05 16:25:20 -07:00
Scott Lahteine
c450851401 Merge pull request #4209 from AnHardt/too-high-G28
Make raise for probe deploy relative in homeaxis()
2016-07-05 11:07:42 -07:00
Roxy-3D
a3f350e728 Merge pull request #4212 from AnHardt/MBL-typo
MBL typo
2016-07-05 11:49:29 -05:00
AnHardt
f799f18388 MBL typo 2016-07-05 18:19:53 +02:00
AnHardt
8b02e68cb6 Make raise for probe deploy relative in homeaxis()
Make raise for probe deploy relative in homeaxis()
by setting `current_position[axis]` to zero later.
2016-07-05 10:42:33 +02:00
Scott Lahteine
e48502866b Merge pull request #3611 from alephobjects/M108_cancel_heatup
Introduce M108 cancel wait for heatup/cooldown of the hotend and bed
2016-07-04 01:19:31 -07:00
Scott Lahteine
d70197f514 Merge pull request #4204 from thinkyhead/rc_fix_gcode_t_position
Additional patches for gcode_T position change
2016-07-04 01:16:22 -07:00
Scott Lahteine
869b517589 Merge pull request #4205 from thinkyhead/rc_fixup_unit_references
References to millimeters in code comments need an update
2016-07-04 01:15:34 -07:00
Scott Lahteine
e104b91ea6 References to millimeters in code comments need an update 2016-07-03 20:13:29 -07:00
Scott Lahteine
e604c0955e Merge pull request #4203 from AnHardt/rem_wants_to_cool_warning
Remove wants_to_cool uninitialized warning
2016-07-03 18:24:23 -07:00
AnHardt
ff91d28a3a Remove wants_to_cool warning
Remove wants_to_cool warning
2016-07-04 03:12:11 +02:00
Scott Lahteine
c9e536cf87 Additional patches for gcode_T position change 2016-07-03 18:11:02 -07:00
Scott Lahteine
60865fc45b Merge pull request #4202 from thinkyhead/rc_fix_gcode_t_position
Fix position adjustment with gcode_T and MBL
2016-07-03 17:55:43 -07:00
Scott Lahteine
f841038313 Merge pull request #4201 from thinkyhead/rc_info_fit
Shorter labels for Print Stats info
2016-07-03 17:47:00 -07:00
Scott Lahteine
f31af61ee2 Fix position adjustment with gcode_T and MBL 2016-07-03 17:44:04 -07:00
Scott Lahteine
a8f5c2bf96 Merge pull request #4192 from birkett/k8400
Add Velleman K8400 board support.
2016-07-03 17:41:13 -07:00
Scott Lahteine
ef8980bfa0 Shorter labels for Print Stats info 2016-07-03 16:00:24 -07:00
Scott Lahteine
4fff9872b9 Merge pull request #4200 from thinkyhead/rc_cleanup_m600
Fix compiler warnings for static screens
2016-07-03 15:44:20 -07:00
Scott Lahteine
2ed625dafa Fix compiler warnings for static screens 2016-07-03 15:26:17 -07:00
Anthony Birkett
e77844594d readme.md -> README.md 2016-07-03 22:15:24 +01:00
Anthony Birkett
a0b00d29e3 Add a ported example configuration for the Velleman K8400 (Vertex) printer.
Supports both dual and single head printers (with the correct config).
Includes community sourced feed rate fix.

Rename / move files.

Remove redundant definitions.
2016-07-03 22:09:08 +01:00
Scott Lahteine
5a81c132a2 Merge pull request #4199 from lrpirlet/G28_X_drills_a_hole_in_printed_part
apply correction when swtiching from MBL to physical in G28 X
2016-07-03 13:37:38 -07:00
lrpirlet
9b42c6b44b apply correction when swtiching from MBL to physical in G28 X 2016-07-03 21:43:42 +02:00
Andrea Cimbalo
46196e9ee5 Add working PlatformIO support 2016-07-03 15:33:24 +02:00
Scott Lahteine
1236a3b3ab Merge pull request #4189 from esenapaj/Follow-up-the-PR-#3662
Follow-up the PR #3662 (Rewritten FILAMENT_CHANGE_ENABLE feature)
2016-07-02 17:16:09 -07:00
esenapaj
95347fc650 Follow-up the PR #3662 (Rewritten FILAMENT_CHANGE_ENABLE feature)
・Update a forgotten Configuration_adv.h of Cartesio
2016-07-03 09:04:29 +09:00
Scott Lahteine
b37e727072 Merge pull request #3662 from thinkyhead/rc_fixup_auto_filament_change
Rewritten FILAMENT_CHANGE_ENABLE feature
2016-07-02 16:20:20 -07:00
Scott Lahteine
a06c5165a7 Shorter strings for smaller LCDs 2016-07-02 15:47:16 -07:00
Scott Lahteine
982f10e6a0 Use STATIC_ITEM for LCD message display 2016-07-02 15:47:15 -07:00
Petr Zahradnik
43ff0ce35f Rewritten FILAMENT_CHANGE_ENABLE feature 2016-07-02 15:34:33 -07:00
Scott Lahteine
4a8e191cec Merge pull request #4188 from thinkyhead/rc_birkett_info_menu_jul2
Printer information menu
2016-07-02 15:30:00 -07:00
Scott Lahteine
b77069de01 Add a Travis test for LCD_INFO_MENU 2016-07-02 15:22:34 -07:00
Scott Lahteine
51b7820686 Patch up About Printer sub-menus 2016-07-02 15:22:34 -07:00
Scott Lahteine
439e78147d Static menu items take an optional string, LJ by default 2016-07-02 15:22:34 -07:00
Scott Lahteine
fa9b2a925d Tweak spacing in printcounter.cpp 2016-07-02 15:22:33 -07:00
Scott Lahteine
dbfc87cdcf Squish sanity check for build info 2016-07-02 15:22:33 -07:00
Anthony Birkett
7a377c1d75 Add "About Printer" information menu.
Includes:
  *firmware version / branch / date.
  *extruder count
  *board information (name, serial details, power supply type)
  *thermistors (names, min/max temperatures)
  *printer statistics (PRINTCOUNTER details)

Thanks to @thinkyhead for contributions.
2016-07-02 15:22:26 -07:00
Scott Lahteine
77a923d8ce Merge pull request #4186 from thinkyhead/rc_array_macros
Simplified variable-size array macros
2016-07-01 20:48:12 -07:00
Scott Lahteine
e650a75b88 Simplified variable-size array macros 2016-07-01 20:36:05 -07:00
Scott Lahteine
ac4f235912 Merge pull request #4167 from thinkyhead/rc_eeprom_checksum
EEPROM Checksum
2016-07-01 19:22:49 -07:00
Scott Lahteine
ba00615aa4 Merge pull request #4184 from esenapaj/Tab-to-Space
Tab to Space
2016-07-01 16:34:12 -07:00
esenapaj
03b8f88092 Tab to Space 2016-07-02 08:07:33 +09:00
Scott Lahteine
b4fee31a84 Merge pull request #4183 from AnHardt/do_probe_raise-asymetry
Unconditional do_probe_raise() in probe_pt()
2016-07-01 12:50:47 -07:00
AnHardt
cb1b31f69b Unconditional do_probe_raise() in probe_pt()
If Z_RAISE_BETWEEN_PROBINGS is null or undefined the probe is currently not raised by home_offset[Z_AXIS] and zprobe_zoffset.
But when different from 0 is.

If an undefined Z_RAISE_BETWEEN_PROBINGS expands to 0 (and it does) this is the solution.


A similar asymmetry exists with the newly introduced 'short-cut' in G28 - but its the rise before anything is probed - so should not make a difference.
2016-07-01 15:28:41 +02:00
Scott Lahteine
7ef7843fd4 Merge pull request #4181 from thinkyhead/rc_rename_a_move_func
Do interpolated moves for Allen Key deploy/stow
2016-06-30 16:30:09 -07:00
Scott Lahteine
6b2a7b30af Extra comments to clarify EEPROM code 2016-06-30 16:28:01 -07:00
Scott Lahteine
787f394676 MAX_EXTRUDERS replaces mysterious "4" 2016-06-30 16:27:37 -07:00
Scott Lahteine
bc3748b7bc Add shared Config_Postprocess for Read and Reset 2016-06-30 16:25:29 -07:00
Scott Lahteine
adcd0f5de3 Some formatting in configuration_store.cpp 2016-06-30 16:25:29 -07:00
Scott Lahteine
5e370006fc EEPROM Checksum 2016-06-30 16:20:25 -07:00
Scott Lahteine
725fde8b26 Merge pull request #4169 from thinkyhead/rc_wait_but_break
Allow wait-for-cooling, break at threshold or if cooling stalls
2016-06-30 16:13:51 -07:00
Scott Lahteine
da6b0dab5f Use prepare_move_to_destination for Allen Key deploy/stow 2016-06-30 16:09:43 -07:00
Scott Lahteine
c42f8fb8dd Rename some movement sub-functions 2016-06-30 15:50:00 -07:00
Scott Lahteine
b6b3a4afbf Merge pull request #4168 from thinkyhead/rc_viki2_for_ramps
Support for VIKI2 in RAMPS and derivatives
2016-06-30 01:48:50 -07:00
Scott Lahteine
3d9472f305 Merge pull request #4173 from thinkyhead/rc_cleanup_runout
Cleanup extruder runout configs
2016-06-30 01:47:40 -07:00
Scott Lahteine
f84d85f761 Cleanup extruder runout configs 2016-06-30 01:40:41 -07:00
Scott Lahteine
5e14a528dd Always wait for cooling in M109/M190, break at low temp or if cooling stalls 2016-06-29 14:07:54 -07:00
Scott Lahteine
bf216bd78f Merge pull request #4165 from thinkyhead/rc_rumba_temp_pins
Always define temp sensor, heater pins for RUMBA
2016-06-28 18:20:37 -07:00
Scott Lahteine
0b0b7aac6e Support for VIKI2 in RAMPS and derivatives 2016-06-28 18:19:18 -07:00
Scott Lahteine
abda4ab427 Clean up CNControls pins 2016-06-28 16:56:48 -07:00
Scott Lahteine
683975cf90 Fix spelling in a config comment 2016-06-28 16:49:13 -07:00
Scott Lahteine
8268c0a9a0 Always define temp sensor, heater pins for RUMBA 2016-06-28 16:28:05 -07:00
Scott Lahteine
db19959735 Merge pull request #4161 from thinkyhead/rc_general_cleanup
Reduce storage requirements for strings, make some PGM
2016-06-27 20:46:26 -07:00
Scott Lahteine
2e96276bf4 More debug message cleanup 2016-06-27 20:36:19 -07:00
Scott Lahteine
dc2c0e5e24 Simpler debug output for deploy/stow 2016-06-27 20:36:18 -07:00
Scott Lahteine
bd491818d6 Reduce storage requirements for strings, make some PGM 2016-06-27 20:36:18 -07:00
Scott Lahteine
ee876dcd7a Merge pull request #4159 from thinkyhead/rc_rigidbot_diff
Rigidbot V2 support - has MCP4728 digipot
2016-06-27 20:35:22 -07:00
Scott Lahteine
fdb6533730 Merge pull request #4162 from thinkyhead/rc_anhardt_sled3
Simplify dock_sled() and some more probe tweaks
2016-06-27 20:25:36 -07:00
Scott Lahteine
0c24e0e445 Support for newer Wire library 2016-06-27 20:25:03 -07:00
Scott Lahteine
ddb386c139 Init DAC_DISABLE_PIN in dac_init 2016-06-27 20:25:03 -07:00
AnHardt
e480ee0054 Further cleanup of G28 for probes 2016-06-27 20:19:51 -07:00
AnHardt
39883d03fc universalize axis_unhomed_error() 2016-06-27 20:19:51 -07:00
AnHardt
e616093d4c Simplify dock_sled()
`dock_sled()` is never called with offset parameter - remove it.
We move x only - so only that needs to be homed. Consequence is - we can home to z-min now with a sled probe!
Feedrates are set and restored in `do_blocking_move()`.
We already checked if the probe is deployed/stowed in deploy/stow_probe.
```
if (z_loc < _Z_RAISE_PROBE_DEPLOY_STOW + 5) z_loc = _Z_RAISE_PROBE_DEPLOY_STOW;
```
makes no sense - remove.
Now the raise is the same for deploy/stow -> move before the if.
Replace the if with a ternary.
Instead writing LOW/HIGH use the boolean `stow` we already have.

There is no reason for not using the sled probe in G29/M48 with 'E'.
It takes a while but works. (tested!)
2016-06-27 20:19:51 -07:00
Scott Lahteine
6c60869409 Support DAC_OR_ADDRESS in Printrboard too 2016-06-27 12:36:21 -07:00
Scott Lahteine
593c8bf286 Support for Rigidbot V2 2016-06-27 12:35:20 -07:00
Scott Lahteine
1df63b7ef4 Merge pull request #4158 from thinkyhead/rc_has_lcd_contrast
CARTESIO_UI has lcd contrast
2016-06-27 12:24:02 -07:00
Scott Lahteine
511503ede9 CARTESIO_UI has lcd contrast 2016-06-27 12:04:49 -07:00
Scott Lahteine
71a693b3ec Merge pull request #4154 from thinkyhead/rc_probe_raise_options
Use Z_RAISE_BETWEEN_PROBINGS with MBL
2016-06-26 16:03:42 -07:00
Scott Lahteine
829c92f1ba Use Z_RAISE_BETWEEN_PROBINGS with MBL 2016-06-26 15:39:11 -07:00
Scott Lahteine
eb1755208f Merge pull request #4153 from thinkyhead/rc_probe_raise_options
Combine Z raise before/after options
2016-06-26 15:30:08 -07:00
Scott Lahteine
10da7ac86c Combine Z raise before/after options 2016-06-26 13:56:30 -07:00
Scott Lahteine
9caa8941e2 Merge pull request #4149 from thinkyhead/rc_minimum_raise_in_probe_pt
Ensure a minimum height before XY move in probe_pt
2016-06-25 19:35:58 -07:00
Scott Lahteine
3fa631130f Ensure a minimum height before XY move in probe_pt 2016-06-25 19:19:31 -07:00
Scott Lahteine
815000ff32 Merge pull request #4148 from thinkyhead/3drag_delay_anhardt
Fix up delays in ST7920_SWSPI_SND_8BIT
2016-06-25 19:16:37 -07:00
Scott Lahteine
a7684eef7a Squish code in ST7920 2016-06-25 18:35:15 -07:00
AnHardt
b4076883cc Set testet delays for K8200, RAMBO, MINIRAMBO and ST7920 2016-06-25 18:35:15 -07:00
AnHardt
4454d80276 Decrease the needed nops to 1
by shitfing the left shift into the high phase.

```
2	cbi 0x2,1 ;set CLK                      //
1	in r18,__SREG__                         //1
1-3	sbrc r24,7                              //2-4
2	rjmp .L19                               //4
1	cli                  .L19:              //5
2	lds r25,258          lds r25,258        //7
1	andi r25,lo8(-2)     ori r25,lo8(1)     //8
2	sts 258,r25          sts 258,r25        //10
1	out __SREG__,r18     out __SREG__,r18   //11
2	.L3:                 rjmp .L3           //13     //2
2	sbi 0x2,1 ;reset CLK //                 //13-15  //2-4
1	lsl r24	 ;  val      //1
1	nop                  //2
2	cbi 0x2,1 ;set CLK   //4
...
```
2016-06-25 18:35:15 -07:00
AnHardt
56c42b572c 3 ms speedup for ST7920 and delay for BOARD_3DRAG
and saving ~1k memory
by limiting the `#pragma GCC optimize (3)` optimisation to `ultralcd_st7920_u8glib_rrd.h`. These optimisation was and is not done for all the other displays, is the reason for the big additionally use of memory, because the complete 'ultralcd.cpp' and 'dogm_lcd_implementation.h' was optimised (sadly i did not observe a change in speed).

Unrolling the loop in `ST7920_SWSPI_SND_8BIT()`, what i expected the optimiser to do, by hand, saved some speed by eliminating the loop variable (i) compares and increases. Every CPU cycle in this loop costs at least 0.5ms per display update because it's executed more than 1k times/s.

The delays are now pre-filled with the calculated values for 4.5V driven ST7920.
A way to simply add __your__ timing into the configuration was made.

At 4.5V
1.) The CLK signal needs to be at least 200ns high and 200ns low.
2.) The DAT pin needs to be set at least 40ns before CLK goes high and must stay at this value until 40ns after CLK went high.

A nop takes one processor cycle.
For 16MHz one nop lasts 62.5ns.
For 20MHz one not lasts 50ns.

To fulfill condition 1.) we need 200/62.5 = 3.2 => 4 cycles (200/50 = 4 => 4). For the low phase, setting the pin takes much longer. For the high phase we (theoretically) have to throw in 2 nops, because changing the CLK takes only 2 cycles.

Condition 2.) is always fulfilled because the processor needs two cycles (100 - 125ns) for switching the CLK pin.


Needs tests and feedback.
Especially i cant test 20MHz, 3DRAG and displays supplied wit less than 5V.
Are the delays right? Please experiment with longer or shorter delays. And give feedback.

Already tested are 5 displays with 4.9V - 5.1V at 16MHz where no delays are needed.
2016-06-25 18:35:15 -07:00
Scott Lahteine
ca184d3d72 Merge pull request #4147 from thinkyhead/rc_fix_M48_raise
Fix debug output in probe_pt
2016-06-25 18:15:33 -07:00
Scott Lahteine
e72bd68eaf Merge pull request #4146 from epatel/epatel/max_z_endstop
MBL: Add support for max z endstop
2016-06-25 18:05:02 -07:00
Scott Lahteine
b4161cbd98 Fix debug output in probe_pt 2016-06-25 17:59:03 -07:00
Edward Patel
da88b00585 MBL: Add support for max z endstop
See https://github.com/MarlinFirmware/Marlin/issues/4088
2016-06-25 21:58:02 +02:00
Scott Lahteine
c8a9829387 Merge pull request #4140 from thinkyhead/rc_button_reliability
Always do a brief delay in `lcd_quick_feedback`
2016-06-24 20:05:56 -07:00
Scott Lahteine
74878d1f16 Always do a brief delay in lcd_quick_feedback 2016-06-24 14:46:10 -07:00
Scott Lahteine
7de7552069 Merge pull request #4133 from MagoKimbra/Single_home_axis_delta
Single home Axis Delta need simple sync_plan_position
2016-06-23 21:14:22 -07:00
Scott Lahteine
de0e6d5f13 Merge pull request #4134 from thinkyhead/rc_followup_4021
Additional cleanup to probing/leveling
2016-06-23 20:55:49 -07:00
Scott Lahteine
15a6b49f37 Simplified probe_pt (in G30) 2016-06-23 20:25:46 -07:00
Scott Lahteine
6a7045b9bf Remove clean_up_after_endstop_move 2016-06-23 20:23:19 -07:00
Scott Lahteine
2a4f866561 Simplified probe_pt (in G29) 2016-06-23 20:22:28 -07:00
Scott Lahteine
89a2aa026b Simplified probe_pt (in M48) 2016-06-23 19:22:45 -07:00
Scott Lahteine
f8530c5d1f Simplified probe_pt function (G28 grid) 2016-06-23 19:09:32 -07:00
Scott Lahteine
c376c08042 Simplified probe_pt function (part 1) 2016-06-23 19:00:29 -07:00
Scott Lahteine
9a71b7f8ad Fix debug message for 3-point leveling 2016-06-23 18:17:31 -07:00
Scott Lahteine
550c03a5a9 Drop raise_z_after_probing function 2016-06-23 18:11:54 -07:00
Scott Lahteine
bb38c816af Always raise in deploy_z_probe / stow_z_probe 2016-06-23 18:00:20 -07:00
Scott Lahteine
68f3350050 Cleanup M401 / M402 2016-06-23 17:04:41 -07:00
Scott Lahteine
3afda99adf Regular handlers for G31 / G32 2016-06-23 17:04:13 -07:00
Scott Lahteine
6803c8e37e Move Z up before, or down after XY, for "blocking move" 2016-06-23 15:50:13 -07:00
Scott Lahteine
03c70c1990 SERVO_DEACTIVATION_DELAY => SERVO_DELAY 2016-06-23 14:33:29 -07:00
MagoKimbra
570f3bbc07 Single home Axis Delta need simple sync_plan_position 2016-06-23 23:09:47 +02:00
Scott Lahteine
61f34eec03 Merge pull request #4125 from jbrazio/bugfix/planner-warning
Fixes some compiler warnings
2016-06-22 19:34:37 -07:00
Scott Lahteine
bdcd628896 Merge pull request #4126 from thinkyhead/rc_lin_timing_patch
Patch LIN_ADVANCE timing issue
2016-06-22 19:24:44 -07:00
João Brázio
664232140d Fixes somes compiler warnings 2016-06-23 03:12:55 +01:00
Scott Lahteine
6e5e388861 Merge pull request #4021 from thinkyhead/rc_raise_z_for_servos
Make probes independent of leveling
2016-06-22 19:10:37 -07:00
Sebastianv650
0c5192b288 Patch LIN_ADVANCE timing issue
Also the extruder stepper ISR has to keep an eye on step_loops count.
2016-06-22 19:05:14 -07:00
Scott Lahteine
d4134e6901 Define Z_SAFE_HOMING point when Z_PROBE_SLED is activated alone 2016-06-22 17:51:32 -07:00
Scott Lahteine
7b2fadd598 Apply some fixes from Andreas
Derived from
https://github.com/AnHardt/Marlin/commit/6e8ede8c694fa4d9e3c769840b09d56
7f8d8e0dd
2016-06-22 17:35:59 -07:00
Scott Lahteine
bd01592816 Goodbye MECHANICAL_PROBE 2016-06-22 17:13:33 -07:00
Scott Lahteine
2640d13a9f Simplify initial raise in M48 2016-06-22 16:53:04 -07:00
Scott Lahteine
3763d45656 Return Z position in run_z_probe 2016-06-22 16:52:32 -07:00
Scott Lahteine
1f48b5c30f Pass a raise to probe_pt, not a Z position 2016-06-22 16:40:21 -07:00
Scott Lahteine
6fdd5ba246 Save and restore feedrate in more places 2016-06-22 16:40:20 -07:00
Scott Lahteine
fe173c2bc6 Generalized probe raise, use for after probing 2016-06-22 14:44:30 -07:00
Scott Lahteine
7da3080761 Simpler cleanup in G28 / G29 2016-06-22 14:44:30 -07:00
Scott Lahteine
15229d988b Fix compile error for bed matrix in M48 2016-06-22 14:04:46 -07:00
Scott Lahteine
c01352cbd5 Add a dependency for z servo macros 2016-06-22 14:04:23 -07:00
Scott Lahteine
c3794bd695 Add HAS_PROBING_PROCEDURE conditional 2016-06-22 14:03:22 -07:00
Scott Lahteine
42ce60c5cc Make sure NUM_SERVOS is set for Z servo endstop 2016-06-22 14:01:19 -07:00
Scott Lahteine
b590a7dee0 Make Z_RAISE_BETWEEN_PROBINGS a more general option 2016-06-22 14:00:44 -07:00
Scott Lahteine
bb9c67b4b5 Tweak some feedrate vars 2016-06-22 03:27:31 -07:00
Scott Lahteine
5158bd6e93 Screen out G29 E for sled and allen key, allow single probe 2016-06-22 03:20:33 -07:00
Scott Lahteine
ccae92588d Cleanup debug in G28 and G29 2016-06-22 03:20:33 -07:00
Scott Lahteine
b4a9d2366c Use a macro for kinematic sync_plan_position 2016-06-22 03:20:33 -07:00
Scott Lahteine
bfccf26294 Use sync_plan_position_delta where needed 2016-06-22 03:20:33 -07:00
Scott Lahteine
a6b8c67df4 Move probe deploy after setup call in G29 2016-06-22 03:20:33 -07:00
Scott Lahteine
e69916d1bd Split up endstop_move functions 2016-06-22 03:20:33 -07:00
Scott Lahteine
0e18a4897b Simpler handling of sled/allen-key in probe_pt 2016-06-22 03:20:33 -07:00
Scott Lahteine
1a92e2ef18 Comment on run_z_probe 2016-06-22 03:20:33 -07:00
Scott Lahteine
68e0e5855e For all probes, at the end of G29 simply raise and stow 2016-06-22 03:20:33 -07:00
Scott Lahteine
c3023f8cc5 Make M401/M402 available with HAS_BED_PROBE 2016-06-22 03:20:33 -07:00
Scott Lahteine
9f0c255c69 Show uncorrected position in set_bed_level_equation_3pts 2016-06-22 03:20:33 -07:00
Scott Lahteine
07298ac992 Initialize current_position to home_offset on boot 2016-06-22 03:20:33 -07:00
Scott Lahteine
f30df89ee1 Merge pull request #4122 from thinkyhead/rc_xy_travel_feedrate
Make XY Probe (travel) Speed available in G28
2016-06-22 03:18:54 -07:00
Scott Lahteine
bd99a2bcff Add a Travis test of Z Safe Homing without ABL 2016-06-22 03:06:54 -07:00
Scott Lahteine
d50539583a Make XY_PROBE_SPEED a general probe option 2016-06-22 03:04:47 -07:00
Scott Lahteine
2798499b71 XY_TRAVEL_SPEED => XY_PROBE_SPEED 2016-06-22 02:45:25 -07:00
Scott Lahteine
88dc543584 Add a macro for XY_TRAVEL_FEEDRATE 2016-06-22 02:23:50 -07:00
Scott Lahteine
937123ab32 Merge pull request #4119 from thinkyhead/fix_stepper_compile_error
Fix stepper compile error with motor_current_setting
2016-06-21 20:25:27 -07:00
Scott Lahteine
528df1b02d Travis test for MINIRAMBO and PWM_MOTOR_CURRENT 2016-06-21 19:50:09 -07:00
Scott Lahteine
117db77c55 make motor_current_setting static and constexpr 2016-06-21 19:50:08 -07:00
Scott Lahteine
111260f407 Merge pull request #4118 from thinkyhead/bq_update_rebase
Update bq Hephestos 2 config
2016-06-21 18:18:48 -07:00
João Brázio
19fb04d761 Update bq Hephestos 2 config 2016-06-21 18:15:51 -07:00
Scott Lahteine
b0e47608e6 Merge pull request #4108 from esenapaj/Fix-for-PR-#4093
Fix for PR #4093 (Make Z Probe options independent of ABL), etc
2016-06-21 18:12:08 -07:00
Scott Lahteine
c84732e605 Merge pull request #4111 from esenapaj/Cosmetic-changes-and-small-fix-for-thermistortables.h
Cosmetic changes and small fix for thermistortables.h
2016-06-21 18:05:32 -07:00
Scott Lahteine
cdc661ea5e Merge pull request #4110 from esenapaj/Small-cosmetic-changes-for-language-files
Small cosmetic changes for language files
2016-06-21 18:04:12 -07:00
Scott Lahteine
c8186e9423 Merge pull request #4109 from esenapaj/Enclose-#error-string-by-double-quotes
Enclose #error string by double-quotes
2016-06-21 18:03:30 -07:00
Scott Lahteine
d8dcc4ac57 Merge pull request #4117 from thinkyhead/rc_i2c_comment_fix
Fix comments on EXPERIMENTAL_I2CBUS
2016-06-21 18:00:36 -07:00
Scott Lahteine
40cd20a236 Fix comments on EXPERIMENTAL_I2CBUS 2016-06-21 17:58:44 -07:00
Scott Lahteine
67750d73ef Merge pull request #4107 from thinkyhead/rc_fixup_M48_config
Clean up configs for Z_MIN_PROBE_REPEATABILITY_TEST
2016-06-21 14:56:35 -07:00
esenapaj
385945ca31 Cosmetic changes and small fix for thermistortables.h
・Adjust spacing
・Standardize comments position
・Remove ',' at the tail of array
2016-06-21 21:19:47 +09:00
esenapaj
fac58f0291 Cosmetic changes for language files 2016-06-21 21:13:25 +09:00
esenapaj
14b661b9e5 Enclose #error string by double-quotes 2016-06-21 21:06:14 +09:00
esenapaj
d583ea852d Standardize format description of Panel 2016-06-21 20:51:27 +09:00
esenapaj
aa6d35bd49 Move code block of probe to appropriate position 2016-06-21 20:36:46 +09:00
esenapaj
740fb2ce39 Adjust spacing 2016-06-21 19:37:45 +09:00
esenapaj
f77f3ffa70 Remove duplicated Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX 2016-06-21 19:33:45 +09:00
Scott Lahteine
19fe93a5a9 Clean up configs for Z_MIN_PROBE_REPEATABILITY_TEST 2016-06-21 03:10:46 -07:00
Scott Lahteine
71a7408012 Merge pull request #4106 from thinkyhead/rc_temp_compile_err
Fix compile error with watch_bed_next_ms
2016-06-21 02:48:46 -07:00
Scott Lahteine
5e469622c9 Merge pull request #4105 from thinkyhead/rc_combine_probe_blocks
Move raise_z_after_probing into earlier block
2016-06-21 02:14:38 -07:00
Scott Lahteine
dcb8ec32ee Fix compile error with watch_bed_next_ms 2016-06-21 02:13:41 -07:00
Scott Lahteine
3996242e9d Allow Z_MIN_PROBE_REPEATABILITY_TEST solo 2016-06-21 01:56:40 -07:00
Scott Lahteine
26a9cd0b08 Move run_z_probe to earlier block 2016-06-21 01:25:23 -07:00
Scott Lahteine
7f8a2025af Move raise_z_after_probing into earlier block 2016-06-21 01:03:40 -07:00
Scott Lahteine
71534dc11f Merge pull request #4100 from thinkyhead/rc_z_deploy
Use deploy/stow with FIX_MOUNTED_PROBE too
2016-06-21 00:40:48 -07:00
Scott Lahteine
6563b07879 Test for mechanical and fix mounted probes 2016-06-20 16:40:44 -07:00
Scott Lahteine
2530371516 Always disable probe at the end of G29 2016-06-20 16:40:44 -07:00
Scott Lahteine
6aba98e470 Comment on setup_for_endstop_move 2016-06-20 16:40:44 -07:00
Scott Lahteine
04e88d008e Clear up ordering in G30 2016-06-20 16:40:44 -07:00
Scott Lahteine
ed75b0ea11 Make clean_up function available for probes 2016-06-20 16:28:45 -07:00
Scott Lahteine
51d52cb52a Make run_z_probe available for any bed probe 2016-06-20 16:02:36 -07:00
Scott Lahteine
f6b09cf465 Always use deploy/stow for dock_sled 2016-06-20 15:51:01 -07:00
Scott Lahteine
3b457c2dd3 Use deploy/stow with FIX_MOUNTED_PROBE too 2016-06-20 15:25:01 -07:00
Scott Lahteine
524f6d9bd6 Merge pull request #4096 from thinkyhead/rc_always_raise_servo
Always raise Z (if needed) for servo deploy/stow
2016-06-19 20:40:06 -07:00
Scott Lahteine
7e9d4a68d4 Always raise Z (if needed) for servo deploy/stow 2016-06-19 20:17:13 -07:00
Scott Lahteine
9beb3f2f5e Merge pull request #4097 from thinkyhead/rc_fil_runout_cleanup
FIL_RUNOUT_INVERTING false by default
2016-06-19 19:46:14 -07:00
Scott Lahteine
f215b30932 Merge pull request #4093 from thinkyhead/rc_probe_without_abl
Make Z Probe options independent of ABL
2016-06-19 19:44:25 -07:00
Scott Lahteine
2fd2301928 FILRUNOUT => FIL_RUNOUT 2016-06-19 19:25:26 -07:00
Scott Lahteine
dfbf8b3c2c FIL_RUNOUT_INVERTING false by default 2016-06-19 19:25:26 -07:00
Scott Lahteine
7b5cd314a5 Merge pull request #4095 from thinkyhead/rc_fil_runout_cleanup
Improve FILAMENT_RUNOUT_SENSOR, FILRUNOUT_PIN
2016-06-19 18:48:18 -07:00
Scott Lahteine
42ccb5b0df Travis test a servo probe without ABL 2016-06-19 18:47:27 -07:00
Scott Lahteine
de12228758 Make Z Probe options independent of ABL 2016-06-19 18:47:27 -07:00
Scott Lahteine
add0032820 Improve FILAMENT_RUNOUT_SENSOR, FILRUNOUT_PIN 2016-06-19 18:13:33 -07:00
Scott Lahteine
15a5eeb740 Merge pull request #4094 from thinkyhead/rc_cartesio_config
Cartesio UI display option in all configs
2016-06-19 17:43:25 -07:00
Scott Lahteine
f8c278ce4d Cartesio UI display option in all configs 2016-06-19 17:39:46 -07:00
Scott Lahteine
43ec24158e Merge pull request #4092 from thinkyhead/rc_sd_error
Output a message for SD read errors
2016-06-19 17:30:29 -07:00
Scott Lahteine
400e13d136 Output a message for SD read errors 2016-06-19 17:14:56 -07:00
Roxy-3D
96b8bcca84 Merge pull request #4081 from thinkyhead/rc_tweaky_m48_tweaks
Cleanup of M48
2016-06-18 22:21:16 -05:00
Scott Lahteine
b7e3c1bbc4 Tweak M48 output conditions 2016-06-18 16:17:53 -07:00
Scott Lahteine
b714fb644c Merge pull request #4085 from thinkyhead/rc_fix_M851
Fix M851
2016-06-18 15:42:52 -07:00
Scott Lahteine
1dad912b03 Adjust M48 raise / move handling 2016-06-18 15:38:24 -07:00
Scott Lahteine
46d3ef2223 Simplify sample_set probe_pt call in M48 2016-06-18 15:38:23 -07:00
Scott Lahteine
a647b05f82 Shrink some debug code in G28 2016-06-18 15:38:23 -07:00
Scott Lahteine
4edf813bde Just-in-time declaration style in M48 2016-06-18 15:38:23 -07:00
Juan Ricardo Gomez Anaya
c475291e19 Fix M851
Minor change missing in the process of standardize the gcode M851
2016-06-18 15:19:07 -07:00
Scott Lahteine
e35583888c Merge pull request #4082 from esenapaj/Follow-up-the-PR-#4065
Follow-up the PR #4065 (Remove support for XY servo endstops)
2016-06-18 03:31:12 -07:00
Scott Lahteine
6dff52d920 Merge pull request #4078 from RicardoGA/Language_Spanish
Update Spanish Language
2016-06-18 03:28:46 -07:00
Scott Lahteine
da526f6ba9 Merge pull request #4080 from thinkyhead/rc_probe_feedrates
Save / restore feedrate in probing functions
2016-06-18 02:44:52 -07:00
esenapaj
d55b94d606 Follow-up the PR #4065 (Remove support for XY servo endstops)
・Update a forgotten Configuration.h of Cartesio
2016-06-18 18:01:58 +09:00
Scott Lahteine
4e860babbc Allow setting xy_travel_speed for delta leveling also 2016-06-18 01:40:49 -07:00
Scott Lahteine
d36d4edd80 Tweak partial homing code 2016-06-18 01:16:50 -07:00
Scott Lahteine
d3a05de96e Save and restore feedrate in probe functions 2016-06-18 01:16:26 -07:00
Juan Ricardo Gomez Anaya
5991eb428f Update Spanish Language
Spanish language update and also add missing messages
2016-06-18 00:27:04 -05:00
Scott Lahteine
f33bd0bb10 Merge pull request #4077 from thinkyhead/rc_delete_old_macros
Delete some obsolete Z servo macros
2016-06-17 18:59:16 -07:00
Scott Lahteine
599154f9e2 Merge pull request #4076 from thinkyhead/rc_stop_print
Add an SD Card stop function, use in ultralcd
2016-06-17 18:53:29 -07:00
Scott Lahteine
defcacc1a9 Delete some obsolete Z servo macros 2016-06-17 18:49:17 -07:00
Scott Lahteine
bbf5b486c3 Add an SD Card stop function, use in ultralcd 2016-06-17 18:27:14 -07:00
Scott Lahteine
3a150f07c2 Merge pull request #4073 from thinkyhead/rc_temp_mystery
Minor tweaks to M109 / M190
2016-06-17 17:49:50 -07:00
Scott Lahteine
c53d6441d1 Merge pull request #4074 from thinkyhead/rc_fix_gitignore
.gitignore comments in correct format
2016-06-17 17:48:23 -07:00
Scott Lahteine
17bd77031f .gitignore comments in correct format 2016-06-17 17:47:07 -07:00
Scott Lahteine
bd4ec727e7 Merge pull request #4066 from thinkyhead/rc_M851_with_probe
Make M851 standard with a bed probe
2016-06-17 17:32:55 -07:00
Scott Lahteine
692a6e7c91 Merge pull request #4065 from thinkyhead/rc_goodbye_xy_servos
Remove support for XY servo endstops
2016-06-17 17:32:08 -07:00
Scott Lahteine
de177ba6c9 Minor tweaks to M109 / M190 2016-06-17 17:26:21 -07:00
Scott Lahteine
eab44b30d4 Safety and serial sections 2016-06-17 15:19:43 -07:00
Scott Lahteine
fc56a547d1 Rename movement section to motion 2016-06-17 15:19:43 -07:00
Scott Lahteine
a8b8796cd7 Define probe offsets when a probe exists 2016-06-17 15:19:42 -07:00
Scott Lahteine
1000563d80 Make M851 standard with a bed probe 2016-06-17 15:19:42 -07:00
Scott Lahteine
f66a194159 Merge pull request #4062 from jbrazio/bugfix/compiler-warnings
Fixes misc gcc warnings
2016-06-17 14:23:28 -07:00
Scott Lahteine
e189f6a842 Patch Travis test for bed leveling 2016-06-17 14:20:18 -07:00
Scott Lahteine
1bed392c68 HAS_Z_ENDSTOP_SERVO => HAS_Z_SERVO_ENDSTOP 2016-06-17 14:20:17 -07:00
Scott Lahteine
47ce810f52 Remove support for XY servo endstops 2016-06-17 14:19:17 -07:00
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
Scott Lahteine
738f414d2b Merge pull request #4029 from tnw513/FixLangIt
Update to language_it.h
2016-06-13 18:01:51 -07:00
AnHardt
b4fedec0d1 Show bootscreen later
Init display and show bootscreen later, but init display in `kill()`
to init outputs before the bootscreen delays but being able to display
kill errors.
2016-06-14 01:59:50 +02:00
Silvio Didonna
08e2c5a6ea Added and translated some strings from language_en 2016-06-13 13:04:09 +02:00
Silvio
29337db206 Merge pull request #3 from MarlinFirmware/RCBugFix
update to latest rcbugfix
2016-06-13 12:47:42 +02:00
Scott Lahteine
17c86349c0 Merge pull request #4020 from thinkyhead/rc_test_M600
Fix Travis test for FILAMENTCHANGEENABLE
2016-06-12 18:50:26 -07:00
Scott Lahteine
b4c37a676f Merge pull request #4025 from thinkyhead/rc_fix_ultralcd_move_e
Fix manual move for multiple extruders
2016-06-12 17:27:36 -07:00
Scott Lahteine
4d2119f83a _lcd_move => _lcd_move_xyz 2016-06-12 17:14:19 -07:00
Scott Lahteine
811967923a Fix manual_move to move the correct E stepper 2016-06-12 17:14:19 -07:00
Scott Lahteine
0d0b751498 Merge pull request #4023 from thinkyhead/rc_servo_macros
Add macros to move servos
2016-06-12 15:45:39 -07:00
Scott Lahteine
4fbe818163 Add macros to move servos 2016-06-12 15:38:30 -07:00
Scott Lahteine
9a1dfd0f5f Fix Travis test for FILAMENTCHANGEENABLE 2016-06-12 14:24:56 -07:00
Scott Lahteine
e51f8df097 Merge pull request #4014 from thinkyhead/rc_one_less_ultipanel_cond
No need to check ULTIPANEL with DOGLCD
2016-06-11 17:39:42 -07:00
Scott Lahteine
b322ac4417 No need to check ULTIPANEL with DOGLCD 2016-06-11 16:50:06 -07:00
João Brázio
8ccd97e7cc Updated all example configuration files 2016-06-12 00:36:15 +01:00
Scott Lahteine
c7eeb09e8f Merge pull request #4012 from Blue-Marlin/watchdoghealing
Heal the watchdog
2016-06-11 16:18:22 -07:00
Scott Lahteine
7fb69e24fb Use "Tn S1" to change tools without moving 2016-06-11 15:58:45 -07:00
Scott Lahteine
2f1bf8373b Merge pull request #4005 from thinkyhead/rc_prepare_move_destination
Clarify names of prepare_move functions
2016-06-11 15:51:58 -07:00
João Brázio
de8108648f Added a versioning system to the config files 2016-06-11 23:48:10 +01:00
Blue-Marlin
efe719f898 Heal the watchgog 2016-06-12 00:34:31 +02:00
Scott Lahteine
b75e648f2c Clarify names of prepare_move functions 2016-06-11 15:32:49 -07:00
Scott Lahteine
d50ba08246 Merge pull request #4011 from thinkyhead/rc_manual_move_cond
Wrap all items depending on ULTIPANEL
2016-06-11 15:26:52 -07:00
Scott Lahteine
ae9b09fe94 menu => screen 2016-06-11 14:53:39 -07:00
Scott Lahteine
45ea8749d3 Wrap all items depending on ULTIPANEL 2016-06-11 14:27:34 -07:00
Scott Lahteine
ddbb05fd8d Merge pull request #3998 from jbrazio/bugfix/better-regex
Improves travis buildroot regexp
2016-06-11 13:40:58 -07:00
João Brázio
9b3a0895fd Upgrades travis Arduino IDE version to 1.6.9 2016-06-11 02:55:09 +01:00
João Brázio
280af07b4c Improves travis buildroot regexp 2016-06-11 02:55:09 +01:00
Scott Lahteine
0e2bfd0769 Use linear feedrate in gcode_T, not volumetric 2016-06-10 18:27:01 -07:00
Scott Lahteine
bf8710d522 Merge pull request #4001 from Blue-Marlin/manage_manual_move-ULTIPANEL
manage_manual_move(); -> ULTIPANEL
2016-06-10 17:17:57 -07:00
Scott Lahteine
93ffa0288c Merge pull request #4003 from jbrazio/bugfix/3999
Closes #3999: Compilation error with BEEPER_PIN -1
2016-06-10 17:15:23 -07:00
João Brázio
2c34ec2bac Closes #3999: Compilation error with BEEPER_PIN -1 2016-06-11 00:12:49 +01:00
Blue-Marlin
378ff92e98 manage_manual_move(); -> ULTIPANEL
Makr the call of   `manage_manual_move() ` depandent of `ULTIPANEL`
2016-06-10 23:36:57 +02:00
Scott Lahteine
45b701d38c Travis test for LIN_ADVANCE 2016-06-09 21:03:27 -07:00
Scott Lahteine
aad9c0ed8d Apply updated ISR timing code 2016-06-09 21:03:27 -07:00
Scott Lahteine
506d78b2f8 Run the advance_isr faster instead of doing multiple e-steps per interrupt 2016-06-09 21:03:27 -07:00
Scott Lahteine
6d62a4ffc8 Patch LIN_ADVANCE for style and forward-compatibility 2016-06-09 21:03:27 -07:00
Sebastianv650
fb8e880734 Add LIN_ADVANCE 2016-06-09 21:03:27 -07:00
Scott Lahteine
e2d4919c01 Merge pull request #3991 from thinkyhead/rc_axis_units
Rename some vars to clarify their relationship to acceleration
2016-06-09 20:57:01 -07:00
Scott Lahteine
4a212f707b Merge pull request #3993 from jbrazio/feature/update-travis
Update travis to test for ULTRA and DOG LCD options
2016-06-09 20:56:07 -07:00
Scott Lahteine
74060f17b7 Merge pull request #3995 from thinkyhead/rc_nonblocking_buzzer
New feature: Non blocking tone queue
2016-06-09 20:55:29 -07:00
João Brázio
d13c86f6f6 Adds travis test for SPEAKER 2016-06-09 20:38:23 -07:00
Scott Lahteine
a82c755a35 Fix BQ_LCD_SMART_CONTROLLER pin compiler warnings 2016-06-09 20:38:23 -07:00
João Brázio
5b5aa1572b Non-blocking buzzer 2016-06-09 20:20:05 -07:00
Scott Lahteine
27d5794298 Merge pull request #3992 from thinkyhead/rc_pid_autotune_e_range
Throw an error in PID_autotune for E < -1
2016-06-09 20:07:27 -07:00
João Brázio
24e70c915d Update travis to test for ULTRA and DOG LCD options 2016-06-10 02:25:37 +01:00
Scott Lahteine
72c6f2923f axis_steps_per_unit => axis_steps_per_mm 2016-06-09 17:04:51 -07:00
Scott Lahteine
446515ab79 Adjust spacing in block_t 2016-06-09 17:04:51 -07:00
Scott Lahteine
80ab749563 Rename acceleration locals for clarity 2016-06-09 17:04:51 -07:00
Scott Lahteine
3b08eb1eeb acceleration_st => acceleration_steps_per_s2 2016-06-09 17:04:51 -07:00
Scott Lahteine
cb4704e07a Rename some planner acceleration vars
- `per_sq_second` => `per_s2`
- `per_sqr_second` => `per_s2`
- `axis_steps_per_sqr_second` => `max_acceleration_steps_per_s2`
2016-06-09 17:04:50 -07:00
Scott Lahteine
3c68be79dc Throw an error in PID_autotune for E < -1 2016-06-09 16:41:53 -07:00
Scott Lahteine
26f8f54c56 Merge pull request #3985 from thinkyhead/rc_inch_fahrenheit_kelvin
Support inches, fahrenheit, and kelvin
2016-06-08 20:10:33 -07:00
Scott Lahteine
f0a5b7f0bc Merge pull request #3986 from thinkyhead/rc_mbl_forward_iteration
Use memset in mbl.reset to save 58 bytes
2016-06-08 17:33:41 -07:00
Scott Lahteine
38279a02b2 Travis tests for Inch, Fahrenheit, Kelvin, M100 2016-06-08 17:12:54 -07:00
Scott Lahteine
0b3142b45b Remove redundant declarations from M100 code 2016-06-08 17:09:34 -07:00
Scott Lahteine
4980ecc1f7 Smaller binary using inline gcode argument getters 2016-06-08 17:03:28 -07:00
Reid Rankin
16212432c9 G20/21 and M149 support, and code_value() refactor
This is an update of MarlinDev PR #196.

G20/21: support for switching input units between millimeters and
inches.
M149: support for changing input temperature units.

In support of these changes, code_value() and code_value_short() are
replaced with an array of functions which handle converting to the
proper types and/or units.
2016-06-08 16:51:10 -07:00
Scott Lahteine
a569e89775 Merge pull request #3978 from thinkyhead/rc_planner_local_rename
Rename some auto/locals to avoid name conflict
2016-06-08 16:41:57 -07:00
Scott Lahteine
2d55862499 Use memset in mbl.reset to save 58 bytes 2016-06-08 16:05:18 -07:00
Scott Lahteine
9b42658faf Merge pull request #3983 from thinkyhead/rc_fix_ftostr
Cleanup and naming for number-to-string functions
2016-06-08 14:21:16 -07:00
Scott Lahteine
b23f710034 Cleanup and naming for num-to-string functions 2016-06-08 13:12:27 -07:00
Scott Lahteine
3d56b9d127 Merge pull request #3979 from thinkyhead/mbl_cell
MBL: cel => cell
2016-06-07 19:12:46 -07:00
Scott Lahteine
cca047424d MBL: cel => cell 2016-06-07 19:10:39 -07:00
Scott Lahteine
08a9bd017b Merge pull request #3976 from petrzjunior/rc_lang_cz_160607
[Language] Update Czech 2016/06/07
2016-06-07 18:05:44 -07:00
Scott Lahteine
49ecaf774d Rename some auto/locals to avoid name conflict 2016-06-07 15:38:45 -07:00
petrzjunior
9171a3d94f Update Czech language 2016/06/07 2016-06-07 19:25:15 +02:00
Scott Lahteine
5e6fdbb4cb Merge pull request #3963 from thinkyhead/rc_advance_steppers
Use e_steps[EXTRUDERS] instead of e_steps[4]
2016-06-05 02:46:06 -07:00
Scott Lahteine
4b3d5aec7a Merge pull request #3110 from thinkyhead/rc_manual_moves
Alternative impl. of LCD-based manual movement
2016-06-05 02:45:39 -07:00
Scott Lahteine
47b5c55c29 Implement the delayed-move technique 2016-06-05 02:29:49 -07:00
Scott Lahteine
a3e25a0fca Instead of trying to move now, set a flag to move asap 2016-06-05 02:29:48 -07:00
Scott Lahteine
e2a8961635 Use e_steps[EXTRUDERS] instead of e_steps[4] 2016-06-05 01:44:53 -07:00
Scott Lahteine
43947072d5 Merge pull request #3895 from thinkyhead/rc_singlenozzle_part_2
SINGLENOZZLE: EXTRUDERS versus HOTENDS
2016-06-04 15:23:17 -07:00
Scott Lahteine
05868de195 Merge pull request #3958 from thinkyhead/rc_fix_3955
Fix a typo in #3955
2016-06-04 02:10:26 -07:00
Scott Lahteine
d7e4e8e9be Fix a typo in #3955 2016-06-04 02:09:58 -07:00
Scott Lahteine
4bdcf3afe4 Merge pull request #3956 from thinkyhead/rc_mbl_single_axis_fix
MBL: Keep active when homing single axes (#3750)
2016-06-03 21:56:12 -07:00
Scott Lahteine
c2362c1b3c Apply Marlin coding standards to MBL class 2016-06-03 21:43:32 -07:00
Edward Patel
c06de0f097 MBL: Added keeping MBL active when homing single axises for #3750 2016-06-03 21:42:29 -07:00
Scott Lahteine
f2fb66c00d With SINGLENOZZLE only set temperature for the active tool 2016-06-03 17:38:03 -07:00
Scott Lahteine
cd441ce652 SINGLENOZZLE: EXTRUDERS versus HOTENDS 2016-06-03 17:38:03 -07:00
Scott Lahteine
32f8300cc6 Merge pull request #3944 from thinkyhead/rc_eboston_lcd_contrast
Improved LCD contrast handling
2016-06-03 17:08:41 -07:00
Scott Lahteine
9c87bf835c Merge pull request #3947 from thinkyhead/rc_statics_stepper
Apply static to remaining Stepper methods
2016-06-03 17:08:15 -07:00
Scott Lahteine
08871d4d6e Merge pull request #3950 from boelle/patch-3
last of missing defines added
2016-06-03 17:07:02 -07:00
Scott Lahteine
4e13cd3f35 Merge pull request #3955 from MagoKimbra/RCBugFix
Fix M428 width DELTA & SCARA
2016-06-03 15:50:37 -07:00
Scott Lahteine
2403a1cf9c Merge pull request #3952 from rafacouto/RCBugFix
Galician language update.
2016-06-03 15:46:03 -07:00
Scott Lahteine
8529122af1 Merge pull request #3946 from thinkyhead/rc_g28_servo_raise_before_stow
Raise the servo probe before stow outside ABL context
2016-06-03 15:45:36 -07:00
MagoKimbra
f499be084a Fix M428 width DELTA & SCARA 2016-06-03 23:23:23 +02:00
Rafa Couto
5f759a2200 Merge branch 'RCBugFix' of https://github.com/rafacouto/Marlin into RCBugFix 2016-06-03 18:27:02 +02:00
Rafa Couto
5f8db3f574 Galician language update. 2016-06-03 18:24:53 +02:00
Rafa Couto
e1591befee Galician language update. 2016-06-03 14:24:35 +02:00
Bo Herrmannsen
8532bf4087 last of missing defines added
need to check line 101-103
2016-06-03 11:20:46 +02:00
Scott Lahteine
81384dfd36 Apply static to remaining stepper methods 2016-06-02 18:00:31 -07:00
Scott Lahteine
0d793fb2be Merge pull request #3939 from thinkyhead/rc_resume_get_position
set_current_position_from_planner() after stepper.quick_stop()
2016-06-02 17:25:51 -07:00
Scott Lahteine
664b299a51 This fix is not DELTA compatible 2016-06-02 17:16:19 -07:00
Scott Lahteine
064efb20e0 Also call clear_command_queue for lcd_sdcard_stop 2016-06-02 17:16:19 -07:00
Scott Lahteine
6277395e1e set_current_position_from_planner() after stepper.quick_stop() 2016-06-02 17:16:19 -07:00
Scott Lahteine
381bc6f0b0 set_position => set_position_mm 2016-06-02 17:16:19 -07:00
Scott Lahteine
663d2463dc Merge pull request #3922 from thinkyhead/rc_statics_stepper
Apply static to Stepper class
2016-06-02 17:14:24 -07:00
Scott Lahteine
194185539d Merge pull request #3925 from thinkyhead/rc_statics_planner
Apply static to Planner class
2016-06-02 17:14:04 -07:00
Scott Lahteine
3fd9b331f0 Merge pull request #3924 from thinkyhead/rc_statics_temperature
Apply static to Temperature class
2016-06-02 17:13:17 -07:00
Scott Lahteine
5b5270ab50 Merge pull request #3943 from thinkyhead/rc_contrast_adjust
Combine ST7565 / U8GLIB_NHD_C12864 items in dogm
2016-06-02 17:05:04 -07:00
Scott Lahteine
db0fd021d0 Z raise options independent of ABL so G28 can use them 2016-06-02 16:56:49 -07:00
Scott Lahteine
9eecb4404b Make raise_z_after_probing null sometimes 2016-06-02 16:56:49 -07:00
Scott Lahteine
28fb1f8994 Tweak #endif comment for ABL GRID 2016-06-02 16:56:49 -07:00
Scott Lahteine
b3a37b493d Patch G28 servo stow to use Conditionals, raise_z_after_probing 2016-06-02 16:56:49 -07:00
Scott Lahteine
5390c846a5 Positive conditions for HAS_LCD_CONTRAST 2016-06-02 16:17:34 -07:00
Scott Lahteine
efa7209acf Improved LCD contrast handling
Based on MarlinFirmware/MarlinDev#200 from @eboston
2016-06-02 16:17:34 -07:00
Scott Lahteine
b703fa9538 Add sanity check for SAV_3DGLCD display types 2016-06-02 15:21:17 -07:00
lrpirlet
3aefa04386 Raise the servo probe before stow outside ABL context 2016-06-01 21:53:45 +02:00
Scott Lahteine
9729e9c450 Combine ST7565 / U8GLIB_NHD_C12864 items in dogm 2016-06-01 01:42:14 -07:00
Scott Lahteine
f331763eca Merge pull request #3829 from thinkyhead/rc_fix_T_command
Fix bad movement in gcode_T when switching extruders
2016-05-31 19:36:18 -07:00
Scott Lahteine
67f816ff79 Merge pull request #3926 from thinkyhead/rc_statics_endstops
Drop FORCE_INLINE from endstops.h
2016-05-31 19:35:41 -07:00
Scott Lahteine
2bd4f33369 Merge pull request #3928 from thinkyhead/rc_allen_key_cleanup
Remove excess allen key probe examples from configs
2016-05-31 19:18:21 -07:00
Scott Lahteine
d698c89971 Fix bad movement in gcode_T when switching 2016-05-31 19:14:33 -07:00
Scott Lahteine
1a01a44a94 Merge pull request #3936 from thinkyhead/rc_sav_mk1
Support for SAV_3DGLCD OLED LCD controller
2016-05-31 18:46:25 -07:00
Scott Lahteine
4770d7c346 Merge pull request #3933 from boelle/patch-2
added defines present in en but not in da
2016-05-31 18:42:38 -07:00
Scott Lahteine
c6c01eaaac Merge pull request #3888 from thinkyhead/rc_slower_max31855
Slower SPI speed for MAX31855
2016-05-31 18:40:38 -07:00
Scott Lahteine
a0b000d752 Support for SAV_3DGLCD OLED LCD controller 2016-05-31 14:41:16 -07:00
Scott Lahteine
bd97bbc52a Make HAS_LCD_CONTRAST a boolean flag 2016-05-31 11:47:02 -07:00
Scott Lahteine
bc77670673 Merge pull request #3929 from thinkyhead/rc_fix_printrboard_dac
Need to call dac_init() in setup() for DAC_STEPPER_CURRENT
2016-05-31 10:29:37 -07:00
Bo Herrmannsen
a1a8240606 added defines present in en but not in da 2016-05-31 14:57:52 +02:00
Roxy-3DPrintBoard
3d7d034fad Merge pull request #3932 from boelle/patch-1
initial changes to DA
2016-05-31 07:34:29 -05:00
Bo Herrmannsen
5eb7a79d93 initial changes to DA 2016-05-31 14:24:33 +02:00
Scott Lahteine
55ef04a566 Need to call dac_init() in setup() for DAC_STEPPER_CURRENT
As reported by https://github.com/MarlinFirmware/Marlin/pull/3182#issuecomment-222595488
2016-05-30 23:35:06 -07:00
Scott Lahteine
43a71ef226 Remove excess allen key probe examples from configs 2016-05-30 18:26:53 -07:00
Scott Lahteine
1582ed43bf Merge pull request #3918 from epatel/marlin/mbl_negative_xy_adv
MBL: Move border macros to Configuration_adv.h
2016-05-30 18:15:50 -07:00
Scott Lahteine
ff53819856 Drop FORCE_INLINE in planner.h
This change actually does increase the binary size by about 12 bytes,
but how does it affect performance?
2016-05-30 17:18:28 -07:00
Scott Lahteine
e60224a943 Drop FORCE_INLINE from endstops.h
`FORCE_INLINE` seems to have no effect with standard optimization.
2016-05-30 17:08:56 -07:00
Scott Lahteine
85512e9372 Drop FORCE_INLINE from temperature.h
`FORCE_INLINE` seems to have no effect on code generation with standard
optimization.
2016-05-30 17:06:50 -07:00
Scott Lahteine
78fb02a5ad Apply static to Temperature class 2016-05-30 16:50:51 -07:00
Scott Lahteine
c3df293fc6 Merge pull request #3923 from thinkyhead/rc_statics_endstops
Apply static to Endstops class
2016-05-30 16:48:23 -07:00
Scott Lahteine
02735fd500 Merge pull request #3921 from thinkyhead/rc_calc_timer_tweak
Tiny calc_timer speedup
2016-05-30 16:47:03 -07:00
Scott Lahteine
668d50f68e Keep Stepper encapsulation, use static data and methods 2016-05-30 16:24:04 -07:00
Scott Lahteine
26f866b908 Apply static to Endstops class 2016-05-30 16:23:43 -07:00
Scott Lahteine
470d5ac09f Apply static to Planner class 2016-05-30 16:22:41 -07:00
Scott Lahteine
ecfdcf7250 Tiny calc_timer speedup 2016-05-30 16:17:02 -07:00
Edward Patel
06593833ff MBL: Move border macros to Configuration_adv.h 2016-05-30 20:50:16 +02:00
Scott Lahteine
ffe55c230d Merge pull request #3914 from thinkyhead/rc_fix_lcd_contrast
Patch conditionals for DEFAULT_LCD_CONTRAST, MINIPANEL
2016-05-30 11:20:14 -07:00
Scott Lahteine
d3efc96289 Patch conditionals for DEFAULT_LCD_CONTRAST, MINIPANEL
- `DEFAULT_LCD_CONTRAST` was incorrectly overriding all `DOGLCD`
- `MINIPANEL` conditionals are identical to `MAKRPANEL`
2016-05-30 01:10:47 -07:00
Scott Lahteine
5a8918c9ec Merge pull request #3911 from epatel/marlin/mbl_3903_example_configs
MBL: Apply PR 3903 to example_configurations
2016-05-30 01:01:04 -07:00
Edward Patel
92a27c37b3 MBL: Apply https://github.com/MarlinFirmware/Marlin/pull/3903 to example_configurations 2016-05-30 09:50:11 +02:00
Scott Lahteine
7ba8f2dbc3 Merge pull request #3906 from thinkyhead/rc_fix_travis_helpers
Less greedy regex in travis helper scripts
2016-05-30 00:27:41 -07:00
Scott Lahteine
2805bf3d82 Less greedy regex in travis helper scripts 2016-05-30 00:26:52 -07:00
Scott Lahteine
3861f1e0da Merge pull request #3908 from jbrazio/bugfix/3826
Closes #3826: SD printing will now pause and stop the print counter
2016-05-30 00:08:57 -07:00
Scott Lahteine
8806c7bbcc Merge pull request #3903 from epatel/marlin/mbl_negative_xy
MBL: Fix for negative x/y positions
2016-05-29 22:07:35 -07:00
Scott Lahteine
189e60db55 Merge pull request #3909 from thinkyhead/fix_array_inits
Fix some array initializations
2016-05-29 21:02:20 -07:00
Scott Lahteine
dc22097b3a Fix some of array initializations
- In `stepper.h` init `count_direction` array
- In `ultralcd.cpp` init `autotune_temp` array
2016-05-29 20:55:13 -07:00
João Brázio
40e64b36de Closes #3826: SD printing will now pause and stop the print counter
The LCD menu items for SD printing pause/stop have been updated to control
also the print job timer. This commit also fixes a small output bug with
M78, the failed print counter was displaying the wrong value.
2016-05-30 00:56:39 +01:00
Edward Patel
eb2746a34f MBL: Fix for negative x/y positions 2016-05-28 21:05:43 +02:00
Scott Lahteine
fe3122774a Merge pull request #3806 from thinkyhead/rc_coreyz_support
Support for COREYZ. Fixes for COREXY, COREXZ
2016-05-26 18:50:43 -07:00
Scott Lahteine
fad7680605 Slower SPI speed for MAX31855 2016-05-25 18:15:36 -07:00
Scott Lahteine
30f6b84561 Merge pull request #3812 from thinkyhead/rc_mbl_index_finders
Two index finding functions for MBL
2016-05-23 15:54:37 -07:00
Scott Lahteine
89e630b2fb Merge pull request #3808 from thinkyhead/rc_singlenozzle
SINGLENOZZLE
2016-05-23 15:52:19 -07:00
Scott Lahteine
827738a790 set_z parameters marked const 2016-05-23 14:25:43 -07:00
Scott Lahteine
9049f4084b EEPROM report uses G29 S3 2016-05-23 14:25:43 -07:00
Scott Lahteine
4955163959 Propose simpler probe index methods 2016-05-23 14:25:43 -07:00
Scott Lahteine
a1a5cb5393 Propose simpler cel index methods 2016-05-23 14:25:42 -07:00
Scott Lahteine
360adc6a3b Small reduction in M421 code 2016-05-23 14:25:42 -07:00
Scott Lahteine
a4ed988c60 Two index finding functions for MBL 2016-05-23 14:25:42 -07:00
Scott Lahteine
0e55c06f7d Rename CORE_AXIS_3 to NORMAL_AXIS 2016-05-23 13:58:40 -07:00
Scott Lahteine
5172d4ba40 COREYZ stepper, planner, endstop, babysteps 2016-05-23 13:58:40 -07:00
Scott Lahteine
6c7f4909b1 COREYZ Conditionals, SanityCheck for only a single kinematic 2016-05-23 13:58:40 -07:00
Scott Lahteine
95fee8ca81 Add option for CoreYZ kinematics 2016-05-23 13:58:40 -07:00
Scott Lahteine
678cbad76a Merge pull request #3819 from jbrazio/bugfix/followup-3813
Followup for #3813
2016-05-23 13:56:11 -07:00
Scott Lahteine
6cdae35261 Merge pull request #3822 from jbrazio/cleanup/hires-logo
Cleanup the Marlin logo with a hires svg version
2016-05-23 13:55:42 -07:00
Scott Lahteine
714d526614 Merge pull request #3828 from AnHardt/hw-endstops-default
Correct hardware endstops default
2016-05-23 13:55:02 -07:00
João Brázio
05a041cb13 Cleanup the Marlin logo with a hires svg version 2016-05-23 14:50:54 +01:00
AnHardt
bb66ffb2ae Correct hardware endstops default
All credits to RicardoGA
2016-05-23 10:54:22 +02:00
João Brázio
75221fa673 Followup for #3813 2016-05-22 13:14:58 +01:00
Scott Lahteine
f9b4b90058 Merge pull request #3813 from jbrazio/bugfix/3809
Stopwatch and PrintCounter improvements
2016-05-21 18:33:57 -07:00
João Brázio
8c0edb2de4 Fixes #3809 and adds several improvements to the Stopwatch and
PrintCounter classes
2016-05-22 01:59:59 +01:00
Scott Lahteine
03e44e0f83 Merge pull request #3807 from thinkyhead/rc_reverse_options_doc
Additional instructions for controller reverse options
2016-05-20 20:36:31 -07:00
Scott Lahteine
c5130fd23b Additional instructions for controller reverse options 2016-05-20 18:14:50 -07:00
Scott Lahteine
cadf441059 Merge pull request #3798 from AnHardt/extend-M421
Extend M421 with I and J parameters
2016-05-20 16:17:23 -07:00
Scott Lahteine
0c7c45063b PID_ADD_EXTRUSION_RATE based on MarlinKimbra 2016-05-20 16:15:05 -07:00
Scott Lahteine
92ac133f2b Conditionals and Sanity Check for SINGLENOZZLE 2016-05-20 15:48:27 -07:00
Scott Lahteine
69abfef82e Add "SINGLENOZZLE" extruder option 2016-05-20 15:45:11 -07:00
AnHardt
f5a036510f Extend M421 with I and J parameters
Extend M421 with I and J parameters
2016-05-21 00:18:09 +02:00
Scott Lahteine
2f6e7b7b9b Merge pull request #3805 from MatixYo/patch-7
Update language_pl.h to the latest strings
2016-05-20 14:50:49 -07:00
Scott Lahteine
88291d1656 Merge pull request #3802 from thinkyhead/rc_epatel_g28_rest_pos
MBL: Add option to configure G28 resting position for all axes
2016-05-20 12:10:52 -07:00
Scott Lahteine
f69b5afe4c Travis CI test for MBL 2016-05-20 11:52:27 -07:00
Scott Lahteine
1a6c72cb57 Apply to the rest of the configs 2016-05-20 11:52:27 -07:00
Scott Lahteine
37c6d0f4ed Reword MESH_G28_REST_ORIGIN comment 2016-05-20 11:52:27 -07:00
Edward Patel
c7d90dc5ec Add option to configure G28 all axis resting position for MBL 2016-05-20 11:52:27 -07:00
Mateusz Juszczyk
bbe4c20ef6 Update language_pl.h 2016-05-20 13:24:34 +02:00
Scott Lahteine
319d184999 Merge pull request #3803 from jbrazio/feature/buildroot-cleanup
Buildroot cleanup
2016-05-19 21:34:11 -07:00
João Brázio
3d3a919059 Moves the Marlin logo into the buildroot 2016-05-20 03:43:30 +01:00
João Brázio
08b485a310 Travis will now generate and use the custom version header file 2016-05-20 03:22:04 +01:00
Scott Lahteine
a469341555 Merge pull request #3800 from jbrazio/feature/move-felix-cfg
Moves Felix's dual configuration to a folder
2016-05-19 18:53:39 -07:00
João Brázio
66fb23edb5 Makes buildroot bin scripts executable 2016-05-20 02:26:13 +01:00
João Brázio
14652bb141 Moves shared helper scripts to the buildroot 2016-05-20 02:25:13 +01:00
Scott Lahteine
61de6daf1d Merge pull request #3761 from thinkyhead/rc_plan_arc_idle
Apply config changes, tweak comments, next_ping_ms => next_idle_ms
2016-05-19 17:10:17 -07:00
João Brázio
80f05920c5 Moves Felix's dual configuration to a folder 2016-05-20 00:49:16 +01:00
Scott Lahteine
8218558953 Update comments, rename next_ping_ms, followup to #3797 2016-05-19 16:44:57 -07:00
Scott Lahteine
6d68b12e28 Merge pull request #3797 from AnHardt/fix-screen-updatedelay
Rework intermediate idle() and manage_heater() calls in G2/G3 and G5
2016-05-19 16:29:27 -07:00
Scott Lahteine
aaaf4febaf Merge pull request #3794 from esenapaj/RCBugFix
Update Galician language to 1.1.0-RCBugFix.
2016-05-19 16:22:10 -07:00
AnHardt
e761bdbb4b Remove SF_ARC_FIX from G5 (Cubic B-spline)
Remove SF_ARC_FIX from G5 (Cubic B-spline).
SF_ARC_FIX is a fix for G2/G3 (arcs) where Skeinforge always produced relative instead of absolute coordinates for the endpoint of an arc.
It's very unlikely this is also a problem with Cubic B-splines. More likely is copying from the G2/G3 code.
2016-05-19 21:00:12 +02:00
AnHardt
2207001333 No compromises for the manage_heater()
No compromises for the manage_heater(). manage_heater() will return immediately when there is nothing to do, but needs a constant detaT to work proper.
Calling idle() only every 200ms results in a display update every ~2 seconds - that should be enough.
For the other functionalities in idle() and manage_inactivity() 200ms is a lot but hopefully works.
2016-05-19 20:52:11 +02:00
AnHardt
0c4d885d5b Speedup sreen update delay
Speedup sreen update delay
and correct a comment.

A module division by 10 is slooooow. (powers of 2 are fast - but then you can AND a bitmask with the same result)
2016-05-19 15:41:09 +02:00
Rafa Couto
9d416289cc Update Galician language to 1.1.0-RCBugFix. 2016-05-19 19:33:40 +09:00
Scott Lahteine
b422e39016 Merge pull request #3779 from thinkyhead/rc_x2_automatic_pins
Automatically set X2 stepper pins
2016-05-18 19:27:34 -07:00
Scott Lahteine
07c9a11c3c Automatically set X2 stepper pins 2016-05-18 19:09:09 -07:00
Scott Lahteine
8aa591ca09 Merge pull request #3789 from jbrazio/feature/m999-s-arg
Implements S1 argument in M999
2016-05-18 16:58:09 -07:00
Scott Lahteine
138c5c8378 Merge pull request #3788 from thinkyhead/rc_dual_x_compile_fix
DUAL_X_CARRIAGE fixes, improvements, Travis test
2016-05-18 16:56:54 -07:00
Scott Lahteine
7527fdec0b Add Travis test for DUAL_X_CARRIAGE 2016-05-18 16:32:34 -07:00
João Brázio
e6effb8f35 Implements S1 argument in M999 2016-05-19 00:13:33 +01:00
Scott Lahteine
2a7b1a85f7 Improve DUAL_X_CARRIAGE sanity check errors 2016-05-18 15:59:28 -07:00
Scott Lahteine
516e79bbda Declare extruder_duplication_enabled in Marlin.h 2016-05-18 15:51:44 -07:00
Scott Lahteine
bffa928954 Merge pull request #3785 from esenapaj/update-japanese-translation
Update Japanese trasration
2016-05-18 15:21:35 -07:00
esenapaj
56d5ae596c Update Japanese trasration
・Add new translation
・Change translation
2016-05-18 20:42:50 +09:00
Scott Lahteine
3bdc03667e Merge pull request #3784 from thinkyhead/rc_funcs_not_extern
Function declarations in headers don't need "extern"
2016-05-17 18:43:25 -07:00
Scott Lahteine
4041508ffb Function decl. in headers don't need "extern" 2016-05-17 18:35:01 -07:00
Scott Lahteine
82c2d308dc Merge pull request #3783 from thinkyhead/rc_bezier_delta_fix
Bezier style and DELTA patch
2016-05-17 18:27:48 -07:00
Scott Lahteine
ecec5c5e58 Bezier style and DELTA patch 2016-05-17 18:06:10 -07:00
Scott Lahteine
d66e53c42b Merge pull request #3782 from thinkyhead/rc_home_z_before_g29
Require homing of Z before G29
2016-05-17 17:53:56 -07:00
Scott Lahteine
552516ddf5 Merge pull request #3781 from AnHardt/minor-delta-segmenting-speedup
Minor DELTA segmentation speedup
2016-05-17 17:17:38 -07:00
Scott Lahteine
a28970784c XYZ unhomed 2016-05-17 17:02:53 -07:00
Scott Lahteine
a9926b71a4 Require homing of Z before G29 2016-05-17 16:57:12 -07:00
AnHardt
41e9569dbc Minor DELTA segmentation speedup
Minor DELTA segmentation speedup by pulling calculations out of the loop.
2016-05-18 01:49:30 +02:00
Scott Lahteine
3016dfe484 Merge pull request #3744 from thinkyhead/rc_bezier_curves
Add BEZIER_CURVE_SUPPORT — G5 command
2016-05-17 13:57:38 -07:00
Scott Lahteine
d0ac4541d3 Merge pull request #3775 from jbrazio/bugfix/followup-3770
G29: Report final position back to host when using MBL
2016-05-17 13:55:26 -07:00
Scott Lahteine
ce1d6981c2 Merge pull request #3725 from esenapaj/patch-1
Separate Z_PROBE_ALLEN_KEY from MECHANICAL_PROBE
2016-05-16 20:23:03 -07:00
João Brázio
b6a3aef297 G29: Report final position back to host when using MBL 2016-05-17 01:27:59 +01:00
esenapaj
95f30529a6 Add stowing process for MECHANICAL_PROBE 2016-05-16 18:12:10 +09:00
esenapaj
e2b87f6c85 Separate Z_PROBE_ALLEN_KEY from MECHANICAL_PROBE 2016-05-16 18:12:10 +09:00
Scott Lahteine
58339aea5f Merge pull request #3769 from jbrazio/bugfix/iteration-invokes-undef-behavior
Bugfix: iteration invokes undefined behavior
2016-05-15 20:36:25 -07:00
Scott Lahteine
26b4cb5b42 Merge pull request #3771 from thinkyhead/rc_auto_fans_again
Fix checkExtruderAutoFans
2016-05-15 20:32:31 -07:00
Scott Lahteine
c9271e610b Merge pull request #3762 from jbrazio/bugfix/lcd-hide-bed-icon
Remove the hotbed icon from the status screen
2016-05-15 19:11:05 -07:00
Scott Lahteine
2f14934c65 Fix checkExtruderAutoFans
Make sure to only set the fan state once when extruders share a fan
2016-05-15 18:54:37 -07:00
João Brázio
ecd490ed49 Bugfix: iteration invokes undefined behavior 2016-05-15 22:45:08 +01:00
Scott Lahteine
abdfd914f8 Merge pull request #3763 from esenapaj/patch-4
Follow-up for #3720 and #3759
2016-05-15 12:37:51 -07:00
Scott Lahteine
388a58ec02 Merge pull request #3767 from thinkyhead/rc_fix_zigzag_calls
Fix MBL zigzag calls
2016-05-15 12:35:36 -07:00
Scott Lahteine
754b0152f5 Fix MBL zigzag calls 2016-05-15 12:35:01 -07:00
Scott Lahteine
86ac48a374 Merge pull request #3760 from thinkyhead/rc_fix_mbl_m503_output
Fix various issues with MBL command M421
2016-05-15 11:49:49 -07:00
Scott Lahteine
1fcc9ec721 Merge pull request #3715 from jbrazio/feature/buildroot
Cleanup the buildroot
2016-05-15 11:44:10 -07:00
esenapaj
6d722716f7 Follow-up the PR #3720 and #3759
Update forgotten Configuration_DUAL.h
2016-05-15 14:08:45 +09:00
João Brázio
451000387d Remove the hotbed icon when HAS_TEMP_BED is false 2016-05-15 03:00:05 +01:00
Scott Lahteine
a058226799 Prevent watchdog timeout in bezier moves 2016-05-14 17:41:16 -07:00
Scott Lahteine
13175ce7da Fix error checking in M421 2016-05-14 17:12:44 -07:00
Scott Lahteine
bc5a547d55 More robust MBL index / point conversion 2016-05-14 16:45:56 -07:00
Scott Lahteine
a3520b6f01 More precision in M503 output for MBL's M421 2016-05-14 16:19:37 -07:00
Scott Lahteine
1b90682617 Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins
Remove need to define unused pins as -1 in pins files
2016-05-14 15:49:22 -07:00
Scott Lahteine
c8a40f06a6 Merge pull request #3759 from thinkyhead/rc_more_printcounter
Printcounter bugfix and some new features
2016-05-14 15:36:31 -07:00
Scott Lahteine
585c8a918f Merge pull request #3758 from thinkyhead/rc_verbiage
Tweaks to some verbiage
2016-05-14 15:27:11 -07:00
João Brázio
f9a62f6a8e Added PRINTJOB_TIMER_AUTOSTART section to example config files 2016-05-14 15:22:45 -07:00
João Brázio
8a18c52002 Adds an option to disable print job timer auto start 2016-05-14 15:22:44 -07:00
João Brázio
a79267217b M78 now allows stats reset using the S78 argument 2016-05-14 15:22:44 -07:00
João Brázio
b660f1bdb8 Bugfix: Multiple M77 no longer increment the print counter 2016-05-14 15:22:43 -07:00
Scott Lahteine
c63f95f2fe Merge pull request #3748 from clexpert/patch-1
Lastest changes in Czech translate
2016-05-14 15:12:39 -07:00
Scott Lahteine
e01e52969e Merge pull request #3757 from thinkyhead/rc_fix_auto_fans
Don't try to enable unused auto fans
2016-05-14 15:09:24 -07:00
Scott Lahteine
ddf3e1e22d Tweaks to some verbiage 2016-05-14 15:06:09 -07:00
Scott Lahteine
a713043acd Merge pull request #3749 from esenapaj/patch-3
Enclose all #error strings by double-quotes
2016-05-14 15:01:56 -07:00
Scott Lahteine
3cfea3ff12 Merge pull request #3752 from AnHardt/fix-FIX_MOUNTED_PROBE
G29 missing FIX_MOUNTED_PROBE condition
2016-05-14 15:00:42 -07:00
Scott Lahteine
08dfe08f9a Merge pull request #3754 from jbrazio/feature/update-pt_PT
Updated pt_PT language pack
2016-05-14 15:00:12 -07:00
Scott Lahteine
596ebccd54 Merge pull request #3753 from jbrazio/feature/followup-3740
Warn user about useless of individual axis homing and DELTA kinematics
2016-05-14 14:59:49 -07:00
Scott Lahteine
6e3556cb75 Merge pull request #3746 from esenapaj/patch-2
Update Japanese translation
2016-05-14 14:57:43 -07:00
Scott Lahteine
ddac17a195 Add BEZIER_CURVE_SUPPORT (G5 XYZEFIJPQ) 2016-05-14 14:52:08 -07:00
Scott Lahteine
b4c891dfd2 Remove obsolete reference to prepare_arc_move 2016-05-14 14:51:09 -07:00
Scott Lahteine
9f6b8f7d5b Remove extra @section directive from configs 2016-05-14 14:51:09 -07:00
Scott Lahteine
4d6bb52b26 Don't try to enable unused auto fans
Addressing #3743
2016-05-14 14:46:14 -07:00
Scott Lahteine
f13c4a9ec4 Merge pull request #3720 from jbrazio/feature/host-keepalive
Removes the DISABLE from HOST_KEEPALIVE
2016-05-14 14:39:31 -07:00
Scott Lahteine
6903eb1c5b Merge pull request #3751 from AnHardt/fix-arcs
Idle during long arcs
2016-05-14 14:33:56 -07:00
João Brázio
596f15348d Updated pt_PT language pack 2016-05-14 01:45:15 +01:00
João Brázio
d7522152e1 Warn user about useless of individual axis homing and DELTA kinematics 2016-05-14 01:35:05 +01:00
AnHardt
8a4376d51f Idle during long arcs
Idle during long arcs
to prevent from watchdog resets during high segmented fast arcs.
2016-05-14 00:29:13 +02:00
esenapaj
888443ca1e Enclose all #error strings with apostrophes 2016-05-13 21:10:23 +09:00
Petr Zahradnik
50b1a6bb2b Lastest changes in Czech translate 2016-05-13 13:51:13 +02:00
AnHardt
b74af78736 Make arc support (G2/G3) configurable
Saves about 2669 bytes when deactivated. (About 1% for a AT2560, about __4%__ for a AT644!)
2016-05-13 13:27:45 +02:00
AnHardt
aef2559bd8 fix-FIX_MOUNTED_PROBE
Add a forgotten condition
2016-05-13 12:07:17 +02:00
esenapaj
e9d851137d Update Japanese translation
・Add new translation
2016-05-13 18:52:35 +09:00
Scott Lahteine
14cd0f4c92 Merge pull request #3740 from thinkyhead/rc_lcd_home_options
Individual Axis Homing LCD menu items
2016-05-12 11:59:46 -07:00
Scott Lahteine
ddf8f5eb10 Merge pull request #3741 from esenapaj/patch-2
Follow-up the PR #3719(Harmonize LCD comment section)
2016-05-12 11:59:24 -07:00
esenapaj
69511b5e5e Follow-up the PR #3719(Harmonize LCD comment section)
It update forgotten Configuration_DUAL.h.
2016-05-12 19:16:36 +09:00
Scott Lahteine
675e92ab1f Merge pull request #3738 from thinkyhead/rc_limit_i2c_request
Print an error on bad i2c request
2016-05-11 19:36:49 -07:00
Scott Lahteine
a42655b9ac Merge pull request #3739 from thinkyhead/rc_reverse_encoder
Add REVERSE_ENCODER_DIRECTION option
2016-05-11 19:32:23 -07:00
João Brázio
09150cae79 Individual Axis Homing LCD menu items 2016-05-11 19:28:19 -07:00
Scott Lahteine
4dc4e2063f Add REVERSE_ENCODER_DIRECTION option 2016-05-11 15:39:28 -07:00
Scott Lahteine
aaeadf0cbd If no "B" parameter given, get 1 byte 2016-05-11 15:30:08 -07:00
Scott Lahteine
a6d594665b Print an error on bad i2c request
Reference: https://github.com/MarlinFirmware/Marlin/pull/3713#issuecomment-218333678
2016-05-11 15:30:02 -07:00
João Brázio
85b2c80838 Updated example configurations 2016-05-11 01:45:49 +01:00
João Brázio
ac7f634956 Removed the DISABLE from HOST_KEEPALIVE_FEATURE option 2016-05-11 01:45:49 +01:00
Scott Lahteine
a454a88f9c Merge pull request #3722 from jbrazio/bugfix/printcounter
Minor #warning fix for PrintCounter
2016-05-10 17:17:04 -07:00
Scott Lahteine
03bda5c141 Merge pull request #3719 from jbrazio/feature/update-configs
Harmonize LCD comment section
2016-05-10 17:16:23 -07:00
Scott Lahteine
5085892204 Merge pull request #3728 from thinkyhead/rc_mention_allen_key
Mention Z_PROBE_ALLEN_KEY in probe sanity checks
2016-05-10 14:06:14 -07:00
Scott Lahteine
c827671299 Mention Z_PROBE_ALLEN_KEY in probe sanity checks 2016-05-10 13:50:20 -07:00
Scott Lahteine
be5d17de17 Merge pull request #3713 from thinkyhead/rc_file_offset_long
Use code_value_long for potentially large values
2016-05-10 09:15:53 -07:00
Scott Lahteine
56dd31ea3c Use code_value_long for potentially large values
Addressing #3711
2016-05-10 09:15:31 -07:00
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
Torsten Kurbad
aae2f502e0 Revisited German translation 2016-05-02 15:18:12 +02:00
esenapaj
a82cfcff2d Follow-up the PR #3631(Encapsulate Stepper, ...
Follow-up the PR #3631(Encapsulate Stepper, Planner, Endstops in singleton classes)

plan_bed_level_matrix -> planner.bed_level_matrix in multi extruders section of Marlin_main.cpp
It probably fix the Issue #3658(plan_bed_level_matrix not declarate).

movesplanned() -> planner.movesplanned() in ADVANCED_OK section of Marlin_main.cpp
It fix compilation error when ADVANCED_OK is enabled
2016-05-02 22:04:26 +09:00
esenapaj
2fa4bc344c Some clean-up for example configuration files
Some clean-up for example configuration files

Follow-up and fix the PR #3253(Make the Autotune item(s) in the LCD menu optional):
・Update forgotten file(Felix/Configuration_DUAL.h)

Follow-up the PR #3526(Configuration.h LCD & SDCard section rewrite):
・Add section of RigidBot Panel to RepRapWorld/Megatronics/Configuration.h

Follow-up the PR #3576(Z Safe Homing for all):
・Adjust spacing

Follow-up and fix the PR #3625(Print job statistics):
・Update forgotten file(Felix/Configuration_DUAL.h)
・Remove ambiguous character "f" in top of RigidBot/Configuration.h
2016-05-02 21:16:00 +09:00
Scott Lahteine
f7185fba08 Merge pull request #3651 from jbrazio/feature/generate_version_header_for_marlin
Update version header generation script
2016-05-01 20:30:01 -07:00
Scott Lahteine
11b56a31ab Merge pull request #3657 from thinkyhead/rc_revert_3648_fix_sd_printing
Revert PR 3648 to fix SD printing
2016-05-01 20:02:23 -07:00
Scott Lahteine
da47b83b3d Revert PR 3648 to fix SD printing
The character 0x7E is common in 8.3 filenames. Maybe the last condition
should be removed completely instead.
2016-05-01 18:04:04 -07:00
Scott Lahteine
60c6efb75c Merge pull request #3653 from thinkyhead/rc_bed_temp_watch_merge
Introduce temp watch protection for the bed
2016-05-01 13:58:28 -07:00
Scott Lahteine
196af30467 Merge pull request #3654 from thinkyhead/rc_cleanup_pins
Pins cleanups
2016-05-01 13:56:04 -07:00
Scott Lahteine
5b7a6c217a Include more fans in sensitive pins list 2016-05-01 13:49:32 -07:00
Scott Lahteine
f508c54c6c Use #undef in AZTEEG_X3_PRO for RAMPS overrides 2016-05-01 13:49:32 -07:00
Scott Lahteine
c6f1337f5c NOOP macro for do-nothing macros 2016-05-01 13:49:32 -07:00
Scott Lahteine
c2145566c7 Merge pull request #3631 from thinkyhead/rc_singletons
Encapsulate Stepper, Planner, Endstops in singleton classes
2016-05-01 13:47:47 -07:00
Scott Lahteine
fbf69081b4 Updated comment for THERMAL_PROTECTION_BED 2016-05-01 13:12:51 -07:00
gralco
908229dbb3 Introduce temp watch protection for the bed
When setting the bed temp via M140/M190 if the thermistor does not read an increase of WATCH_BED_TEMP_INCREASE degrees by WATCH_BED_TEMP_PERIOD seconds then it will throw "Error:Heating failed, system stopped! Heater_ID: bed" and call the kill() function.

Conflicts:
	Marlin/Configuration_adv.h
2016-05-01 13:12:51 -07:00
João Brázio
ff7a303a0e Updated version header gen script 2016-05-01 03:31:19 +01:00
Scott Lahteine
77d6e5283b Merge pull request #3648 from Blue-Marlin/83filenames
Don't reject 8.3-filenames with chars > 0x7f
2016-04-30 17:48:03 -07:00
Scott Lahteine
24a15332b3 Encapsulate dual Z endstop handling 2016-04-30 17:26:50 -07:00
Scott Lahteine
462a8a951e A little extra gcode_T spacing 2016-04-30 17:26:50 -07:00
Scott Lahteine
96f51f400f Planner singleton class 2016-04-30 17:26:50 -07:00
Scott Lahteine
5076d12344 Localize M119 in Endstops class 2016-04-30 17:26:50 -07:00
Scott Lahteine
5e4e535ce8 Stepper and Endstops as singleton objects 2016-04-30 17:26:50 -07:00
Scott Lahteine
98f30283fa Merge pull request #3650 from thinkyhead/rc_temp_change_during_m109_m190
Prevent stuck M109/M190 when target is changed
2016-04-30 17:24:51 -07:00
Scott Lahteine
6d3e4e1f8f Prevent stuck M109/M190 when target is changed 2016-04-30 17:03:54 -07:00
Blue-Marlin
ac4caab8f1 Don't mangel 8.3-filenames with chars > 0x7f
Don't mangel 8.3-filenames with chars > 0x7f

Windows produces 8.3filenames wit chars > 0x7f. Those have been rejected
by Marlin until now.

With these 'malformed' filenames can now be worked with:
In the LCD menue
With RepetierHost (V1.6.1 tested) - full support. Characters are
displayed as '?'
With Octoprint (1.2.10 tested) the files do not appear in the files
area. At the console, listed with M20 they appear with a '�'.
With Pronterface the files appear in the sd-window but you can't start
them. They are mangled by pronterface. The names are altered and than
recected by Marlin. In the console they apper with differen but not the
correct characters.

All in all a little step forward.

Fix for #3593
2016-04-30 17:37:22 +02:00
Scott Lahteine
eeef571be2 Merge pull request #3613 from thinkyhead/rc_acceleration_fix1
Fix an acceleration anomaly by making locals signed
2016-04-29 16:39:31 -07:00
Scott Lahteine
c3ef9993b9 Merge pull request #3625 from jbrazio/feature/print-counter
Print job statistics
2016-04-29 15:31:14 -07:00
Scott Lahteine
96b2b3f4fe Merge pull request #3642 from thinkyhead/rc_quieter_wait_for_temps
Keepalive not needed while waiting for temperatures
2016-04-29 15:20:12 -07:00
João Brázio
e34f4653ef Fixed a typo on the configuration files 2016-04-29 23:13:59 +01:00
João Brázio
1491d682fb Miscellaneous tweaks on PrintCounter 2016-04-29 23:13:59 +01:00
João Brázio
27088e356f Updated example configuration files 2016-04-29 23:13:59 +01:00
João Brázio
8fb23e899f PrintCounter EEPROM read/write optimizations 2016-04-29 23:13:59 +01:00
João Brázio
9589e51810 Disable DEBUG_PRINTCOUNTER 2016-04-29 23:13:59 +01:00
João Brázio
484de24e22 Updated travis to test for PRINTCOUNTER 2016-04-29 23:13:58 +01:00
João Brázio
e2da7e5000 Updated the default configuration and fixed a printcounter.h typo 2016-04-29 23:13:58 +01:00
João Brázio
d6cfcc9c8b Added new G-Code: M78 2016-04-29 23:13:58 +01:00
João Brázio
4f541c5bb5 Added a new object: PrintCounter 2016-04-29 23:13:58 +01:00
João Brázio
26b166d7cf Made all stopwatch::debug() calls static 2016-04-29 23:13:58 +01:00
Scott Lahteine
5897b58a70 Merge pull request #3634 from esenapaj/patch-2
Update distribution date and readme again
2016-04-28 21:19:08 -07:00
Scott Lahteine
f4706bb90e Keepalive not needed while waiting for temperatures 2016-04-28 21:11:15 -07:00
Scott Lahteine
924285afa6 Merge pull request #3641 from thinkyhead/rc_reverse_menu_doc
Correct the REVERSE_MENU_DIRECTION comment
2016-04-28 20:28:46 -07:00
Scott Lahteine
f1b00eb12b Correct the REVERSE_MENU_DIRECTION comment 2016-04-28 20:27:17 -07:00
Scott Lahteine
8905908081 Merge pull request #3632 from thinkyhead/i3_millie_language_fun
Simplified LCD Language settings
2016-04-28 19:52:10 -07:00
esenapaj
c7e4b3044b Change "RC6" to "RCBugFix" on top part of the readme, etc
・Change "RC6" to "RCBugFix" on top part of the readme
・Unify distribution date of RCBugFix and RC6
・Move comments about IDE version from RCBugFix section to RC6 section
2016-04-28 20:30:39 +09:00
Scott Lahteine
6c48852b20 Update distribution date 2016-04-28 18:06:53 +09:00
Scott Lahteine
2142d5a62e Merge pull request #3627 from Blue-Marlin/German-again-and-again-and-agin
Correct an error in lang_de
2016-04-27 20:14:15 -07:00
Scott Lahteine
0c11566f42 Replace LANGUAGE_INCLUDE with LCD_LANGUAGE 2016-04-27 20:06:40 -07:00
Scott Lahteine
259794c0be Make DISPLAY_CHARSET_HD44780 a single setting 2016-04-27 20:06:40 -07:00
Scott Lahteine
a5d00f755b Merge pull request #3619 from esenapaj/patch-2
Update distribution date and readme
2016-04-27 19:52:30 -07:00
Blue-Marlin
e89f01d044 Correct an error in lang_de
There is no way to translate "A-travel" to "A Rückzug". Thats simply
wrong.
2016-04-27 12:59:48 +02:00
esenapaj
ee2f37f3cc Update distribution date and readme
It sync with the RC.
2016-04-27 11:21:51 +09:00
Paul Philippov
2d89b5527f fixed link to wiki 2016-04-27 11:19:46 +09:00
Scott Lahteine
ad0f70f2f3 Merge pull request #3620 from Blue-Marlin/feedrate_atfer_toolchange 2016-04-26 17:33:15 -07:00
Scott Lahteine
d58c5ac446 Merge pull request #3618 from esenapaj/patch-1 2016-04-26 17:20:04 -07:00
Scott Lahteine
2bb5cf5291 Merge pull request #3622 from floyd871/patch-1 2016-04-26 17:14:36 -07:00
Scott Lahteine
6d98f47d1c Merge pull request #3623 from jbrazio/cleanup/convert2unix 2016-04-26 17:13:22 -07:00
Blue-Marlin
e58e281473 Fix feedrate after toolchange
The fix is simple. Most changes are because of changed indendation,
bacause of leaving early for wrong tool number
2016-04-27 00:57:45 +02:00
João Brázio
32d798fcc7 Converted all files on src to Unix file format 2016-04-26 21:23:39 +01:00
Michael Neumann
59cfc84dad German "Umlaute"
We don't have to  avoid German "Umlaute" any more.
2016-04-26 21:52:05 +02:00
Matt Keveney
4dfc496965 added recalc_delta_settings() call in Config_RetrieveSettings. Appears to be necessary any time delta-related parameters (M665) are modified 2016-04-26 20:01:53 +09:00
Scott Lahteine
ec82e1e05d Merge pull request #3616 from thinkyhead/rc_fixup_some_movement
General cleanup around high level move functions
2016-04-25 20:23:38 -07:00
Scott Lahteine
abeab792cb General cleanup around high level move functions
- Use new `DEBUG_POS` macro for `DELTA` debug
- Neaten up `prepare_move` a smidgen
- Remove an old commented `prepare_move()` line
2016-04-25 20:02:24 -07:00
Scott Lahteine
66540f8b84 Merge pull request #3615 from thinkyhead/rc_whats_up_with_M112
Report current position to host after M206 / M428
2016-04-25 18:58:41 -07:00
Scott Lahteine
68d0347e67 Call report_current_position after M206 / M428 2016-04-25 18:43:28 -07:00
Scott Lahteine
dcb4cdaa9e Call report_current_position instead of gcode_M114 directly 2016-04-25 18:43:27 -07:00
Scott Lahteine
e38baaa23e Fix an acceleration anomaly by making locals signed 2016-04-25 14:17:20 -07:00
Scott Lahteine
dd26c67bab Merge pull request #3612 from jbrazio/feature/stopwatch-misc
Renamed stopwatch::status to stopwatch::state
2016-04-25 12:36:34 -07:00
João Brázio
739dcda0f1 Renamed stopwatch::status to stopwatch::state 2016-04-25 17:40:43 +01:00
gralco
840e13f664 Introduce M108 cancel heatup for the hotend and bed
This G-code is asynchronously handled in the get_serial_commands() parser.
2016-04-25 08:33:33 -06:00
Scott Lahteine
df2d0eb37c Merge pull request #3608 from thinkyhead/rcbugfix_merge_rc
Merge RC => RCBugFix changes since RC5
2016-04-24 20:28:25 -07:00
esenapaj
db56ff5881 follow-up to commit 200b248(Update README.md)
follow-up to commit 200b2487c2

Update release date in another place
2016-04-24 20:16:37 -07:00
Jochen Groppe
0ed43ec34b Update README.md
Oops! at least 1.6.0
2016-04-24 20:16:37 -07:00
Jochen Groppe
b899338c32 Update README.md
* Description for RC5
* Hint for deprecated Arduino versions
2016-04-24 20:16:36 -07:00
Scott Lahteine
735f1f5bfa Merge pull request #3606 from thinkyhead/rc_step_sec_comments
Patch steps rate comment in trapezoid function
2016-04-24 19:48:41 -07:00
Scott Lahteine
fce1e843b9 Patch steps rate comment in trapezoid function 2016-04-24 19:38:58 -07:00
Scott Lahteine
266ae90861 Merge pull request #3594 from jbrazio/feature/rework-versioning
Rework Marlin's versioning system
2016-04-24 17:42:45 -07:00
João Brázio
aa7a65e613 Updated travis config 2016-04-24 05:57:14 +01:00
João Brázio
7de0161204 Updated example config files 2016-04-24 05:21:17 +01:00
João Brázio
3b6f75511f Updated multiple pins files 2016-04-24 05:21:17 +01:00
João Brázio
170f7e8a45 Rework Marlin's versioning system 2016-04-24 05:21:17 +01:00
Scott Lahteine
c86d092ef3 Merge pull request #3598 from esenapaj/patch1
Cleanup for language files
2016-04-22 21:55:42 -07:00
esenapaj
8d0b2f358a Cleanup for language files
・Remove abolished strings (MSG_NOZZLE1, MSG_NOZZLE2)
・Remove duplicated strings 
・Arrange the strings in unified order
・Adjust spacing
・Remove some comments in Japanese files(follow-up the PR #3560)

The most part of these changes were salvaged from closed my PR#3550.
2016-04-23 13:27:05 +09:00
Scott Lahteine
2bb56ef6de Merge pull request #3597 from thinkyhead/rc_fix_g29_debug
Move G29 debug output before matrix.set_to_identity()
2016-04-22 21:21:00 -07:00
João Brázio
a901555da4 Moved G29 debug output before matrix.set_to_identity() 2016-04-22 20:57:22 -07:00
Scott Lahteine
d28db67ca9 Merge pull request #3596 from thinkyhead/rc_fix_typo_in_mbl
Fix a typo in #3586 to fix MBL
2016-04-22 20:16:28 -07:00
Scott Lahteine
88c6693b9e Fix a typo in #3586 to fix MBL 2016-04-22 20:04:08 -07:00
Scott Lahteine
8620024130 Merge pull request #3588 from thinkyhead/rc_z_safe_homing_deps
Allow Z_SAFE_HOMING to compile without a probe
2016-04-21 17:51:18 -07:00
Scott Lahteine
aaf9d19954 Allow Z_SAFE_HOMING to compile without a probe 2016-04-21 15:55:49 -07:00
Scott Lahteine
92ab2c7dd8 Merge pull request #3587 from thinkyhead/rc_z_safe_homing_deps
Define dependencies for Z_SAFE_HOMING if left out
2016-04-21 15:46:24 -07:00
Scott Lahteine
63142eef40 Define dependencies for Z_SAFE_HOMING if left out 2016-04-21 15:22:19 -07:00
Scott Lahteine
173334e535 Merge pull request #3418 from jbrazio/translate/danish
Missing Danish translation
2016-04-21 14:56:43 -07:00
João Brázio
fe4fc88494 Closes #3351: missing Danish translation 2016-04-21 21:31:47 +01:00
Scott Lahteine
ce141deba2 Merge pull request #3586 from thinkyhead/rc_revert_mbl_menu_hack
Revert MBL menus to "known" working point
2016-04-21 13:30:08 -07:00
Scott Lahteine
003aab6dfd Revert MBL menus to "known" working point 2016-04-21 12:59:55 -07:00
Scott Lahteine
6fac4d9211 Merge pull request #3579 from thinkyhead/rc_fix_dogm_and_mbl_menus
Fix menu redraw for DOGLCD, improve MBL
2016-04-20 20:52:56 -07:00
Scott Lahteine
7ddaa79ffe Merge pull request #3578 from thinkyhead/rc_fix_twibus_less_debug_code
Reduce PROGMEM usage by TWIBus, stopwatch
2016-04-20 20:52:16 -07:00
Scott Lahteine
cfd10fcba1 Merge pull request #3577 from thinkyhead/rc_fix_G92_set_e_twice
Fix G92 setting E twice
2016-04-20 20:52:09 -07:00
Scott Lahteine
fa81b01033 Merge pull request #3576 from thinkyhead/rc_heres_your_z_safe_homing
Z Safe Homing for all
2016-04-20 20:52:01 -07:00
Scott Lahteine
dc2281d2f4 Add nextMenu, nextEncoderPosition to change menus after handler loop 2016-04-20 20:19:12 -07:00
Scott Lahteine
7fa2bda1b9 Give the "alive dot" its own blink 2016-04-20 18:57:17 -07:00
Scott Lahteine
9d5e1f32fd Use axis_homed in _lcd_level_bed_homing, item in Prepare before homing 2016-04-20 18:53:33 -07:00
Scott Lahteine
0c2aa92b07 Z Safe Homing for all
The `Z_SAFE_HOMING` feature is coupled with probes and not leveling, so
make it available for general use.
2016-04-20 17:04:52 -07:00
Scott Lahteine
9bcb72e7f8 Further patches to MBL - break up into more handlers 2016-04-20 16:37:35 -07:00
Scott Lahteine
3f6ae85748 Fix some MBL display issues for DOGLCD 2016-04-20 16:36:45 -07:00
Scott Lahteine
71b4f189bf lcd_implementation_drawedit can take 1 arg 2016-04-20 16:36:45 -07:00
Scott Lahteine
1caa2628da Use sync_plan_position_e function elsewhere 2016-04-20 13:02:19 -07:00
Scott Lahteine
c7df961144 Fix G92 so it only sets the plan position once 2016-04-20 13:01:58 -07:00
Scott Lahteine
1addb50b62 Shrink debug code in TWIBus and disable by default 2016-04-20 12:44:30 -07:00
Scott Lahteine
21a6b66807 Shrink debug code in Stopwatch and disable by default 2016-04-20 12:44:30 -07:00
Scott Lahteine
e523a0dc61 Fix bug in TWIBus ctor declaration 2016-04-20 12:37:46 -07:00
Scott Lahteine
ee9bd66a68 Add comments to debug bit flags 2016-04-20 12:37:22 -07:00
Scott Lahteine
3db5a75f30 Merge pull request #3568 from thinkyhead/rc_various_fixes
General code cleanup, improved naming, etc.
2016-04-19 20:53:38 -07:00
Scott Lahteine
8a2587f017 Read size for MAX6675 from sizeof(max6675_temp) 2016-04-19 19:57:32 -07:00
Scott Lahteine
ac69fad96d lowercase "stop" function 2016-04-19 19:43:54 -07:00
Scott Lahteine
39ee9c526b setTargetedHotend => get_target_extruder_from_command 2016-04-19 19:43:54 -07:00
Scott Lahteine
cafa8b8ce3 Rename filament runout items 2016-04-19 19:43:39 -07:00
Scott Lahteine
27b2e2e786 Document some variables 2016-04-19 19:43:39 -07:00
Scott Lahteine
a4062a47ac Rename baricuda variables 2016-04-19 19:43:38 -07:00
Scott Lahteine
78747b1328 min_pos/max_pos => sw_endstop_min/sw_endstop_max 2016-04-19 19:43:38 -07:00
Scott Lahteine
3b0bf88233 Merge pull request #3571 from thinkyhead/rc_m303_with_pidtempbed
Allow setting PIDTEMP and PIDTEMPBED together or apart
2016-04-19 18:26:59 -07:00
Scott Lahteine
ba84d8d091 Allow setting PIDTEMP and PIDTEMPBED together or apart 2016-04-19 18:09:29 -07:00
Scott Lahteine
5cb8ec68ae Merge pull request #3566 from thinkyhead/rc_babystep_show_steps
Show steps done in the babystep display
2016-04-18 21:52:55 -07:00
Scott Lahteine
3083ee49f3 Merge pull request #3567 from thinkyhead/rc_mf_bash_scripts
Git helper shell scripts for MarlinFirmware
2016-04-18 21:41:24 -07:00
Scott Lahteine
00d36d10e2 Merge pull request #3560 from thinkyhead/rc_better_graphical_lcd
Aesthetic, functional improvements for Graphical Display
2016-04-18 21:38:02 -07:00
Scott Lahteine
dd94ce5bd5 Merge pull request #3565 from thinkyhead/rc_look_at_3563
Output error message for M303 if PIDTEMP is disabled
2016-04-18 21:22:50 -07:00
Scott Lahteine
9a12054e0e Git helper shell scripts for MarlinFirmware 2016-04-18 21:18:35 -07:00
Scott Lahteine
4f04bf7fe8 Show steps done in the babystep display 2016-04-18 20:52:38 -07:00
Scott Lahteine
d988708ceb Merge pull request #3559 from esenapaj/patch-1
Update and change Japanese translation
2016-04-18 20:17:54 -07:00
Scott Lahteine
026ae8f2f0 Call lcd_setFont only when needed 2016-04-18 20:09:04 -07:00
Scott Lahteine
90c97c8185 Add _draw_axis_label function to reduce source 2016-04-18 20:09:04 -07:00
Scott Lahteine
34b17d4a8a Reduce heater status code if no bed 2016-04-18 20:09:04 -07:00
Scott Lahteine
fc30aa9d88 Aesthetic and functional improvements for graphical LCD 2016-04-18 20:09:04 -07:00
Scott Lahteine
b281001329 Use MSG_X, etc., on Hitachi LCD 2016-04-18 20:09:04 -07:00
Scott Lahteine
f90a8661cb Uppercase XYZE on Graphical LCD 2016-04-18 20:09:03 -07:00
Scott Lahteine
3613c550fa Rename README file for fonts 2016-04-18 20:09:03 -07:00
esenapaj
1110814ecf Update and change Japanese translation
Update and change Japanese translation

・Follow-up the PR #3411(Update Readme.fonts about Kana), Remove "who really..." strings. I had forgotten it.
・Add readable translated strings in comment
・Add Japanese translation.
  MSG_LCD_ENDSTOPS "エンドストップ"
  (utf8 version only. Because non-utf8 version ("エンドストップ") over 8 characters)
・Change translation.
  MSG_ACC "カソクド mm/s2"
  MSG_ACC "\xb6\xbf\xb8\xc4\xde mm/s2" ("カソクド mm/s2")
2016-04-19 11:28:26 +09:00
Scott Lahteine
a26d70e932 Apply indentation to gcode_M303, PID_autotune 2016-04-18 19:04:45 -07:00
Scott Lahteine
ba66336503 Output error for disabled M303 2016-04-18 19:03:45 -07:00
Scott Lahteine
eda821ca1c Merge pull request #3556 from philfifi/fix_pullup
Fix bug in pullups handling for Z_MIN_PROBE
2016-04-18 18:04:26 -07:00
Scott Lahteine
25b1556a94 Merge pull request #3552 from tnw513/fix_endstops_witbox
Endstop settings modified (witbox). Issue #3547
2016-04-18 18:03:22 -07:00
Scott Lahteine
3479a07cb5 Merge pull request #3546 from thinkyhead/rc_oxivanisher_kossel_config
Update Kossel XL config for 1.1.x
2016-04-18 17:59:12 -07:00
Scott Lahteine
2bc2485313 Update font remarks in Conditionals.h 2016-04-18 17:33:41 -07:00
Philippe LUC
86c868771b Fix bug in pullups handling for Z_MIN_PROBE 2016-04-18 21:16:23 +02:00
Silvio Didonna
91de69bb6e Endstop settings modified. Witbox have max endstops for X and Y. 2016-04-18 16:46:19 +02:00
Scott Lahteine
f2558b1f2c Additional delta config updates 2016-04-17 20:04:52 -07:00
Marc Urben
9a661bdd59 Updated Kossel XL config files for the latest Marlin 2016-04-17 20:04:19 -07:00
Scott Lahteine
09c6323b68 Merge pull request #3543 from thinkyhead/rc_better_bootscreen
Better splash screen consolidation
2016-04-17 17:20:13 -07:00
Scott Lahteine
5905ec5ba8 Merge pull request #3541 from thinkyhead/rc_mbl_one_last_lift
Add a final lift, if configured, in Manual Bed Leveling
2016-04-17 17:20:02 -07:00
Scott Lahteine
af1711365b Merge pull request #3538 from jbrazio/bugfix/endtop-hit-redeclared
_ENDSTOP_HIT redeclared
2016-04-17 17:12:56 -07:00
Scott Lahteine
daade35253 Merge pull request #3544 from manianac/RCBugFix
Fixed Positional_Shift array overrun
2016-04-17 17:07:29 -07:00
Scott Lahteine
ed622ac796 Better splash screen consolidator 2016-04-17 17:06:07 -07:00
Jeff K
90c49f5a14 Fixed invalid addressing (overflow) of position_shift / software endstops
Signed-off-by: Jeff K
2016-04-17 19:28:50 -04:00
João Brázio
bcf1e027bb Fix the redeclaration of _ENDSTOP_HIT 2016-04-17 18:37:37 +01:00
Scott Lahteine
c242bee449 Add a final lift, if configured, in Manual Bed Leveling 2016-04-17 00:12:46 -07:00
Scott Lahteine
b6227932f5 Merge pull request #3530 from thinkyhead/rc_set_rcbugfix_for_now
Set version for RCBugFix
2016-04-16 21:40:55 -07:00
Scott Lahteine
19741a0ba6 Merge pull request #3503 from thinkyhead/rc_lcd_endstop_msg
Show all endstops on LCD in checkHitEndstops
2016-04-16 21:32:25 -07:00
Scott Lahteine
7aaff371b0 Set version for RCBugFix 2016-04-16 21:30:52 -07:00
Scott Lahteine
db86aaf385 Merge pull request #3528 from thinkyhead/rc_fix_bed_level_equation_oopsie
Fix borked set_bed_level_equation_lsq
2016-04-16 21:01:06 -07:00
Scott Lahteine
5847738bf9 Merge pull request #3527 from thinkyhead/rc_sd_readblock_cleanup
Improve code in Sd2Card::readBlock
2016-04-16 20:50:37 -07:00
Scott Lahteine
837df6108c Fix borked set_bed_level_equation_lsq 2016-04-16 20:35:42 -07:00
Scott Lahteine
7c16e774ca Show all endstops on LCD in checkHitEndstops 2016-04-16 20:08:42 -07:00
Scott Lahteine
40050db210 Improve code in Sd2Card::readBlock 2016-04-16 20:03:39 -07:00
Scott Lahteine
8429ae6beb Merge pull request #3525 from thinkyhead/rc_fix_pid_params_per_extruder
Fix broken PID_PARAMS_PER_EXTRUDER
2016-04-16 19:49:42 -07:00
Scott Lahteine
c7353d7929 Merge pull request #3526 from thinkyhead/rc_lcd_config_comments
Configuration.h LCD & SDCard section rewrite
2016-04-16 19:39:53 -07:00
Scott Lahteine
339b5b3e34 Patch more configs with new changes 2016-04-16 19:35:02 -07:00
Scott Lahteine
ef2fd620e9 Suggested fixups for LCD/SD config comments 2016-04-16 19:35:02 -07:00
João Brázio
7b5d6ba315 Rebase & feedback 2016-04-16 19:35:02 -07:00
João Brázio
d7cc2c0847 Moved some conditionals to Conditionals.h 2016-04-16 19:32:41 -07:00
João Brázio
36a49eab1c Improved the LCD and SD comments blocks in Configuration.h 2016-04-16 19:32:41 -07:00
Scott Lahteine
d4a848c72a Fix broken PID_PARAMS_PER_EXTRUDER
As noted by @FalloutBe in #3519
2016-04-16 19:19:40 -07:00
Scott Lahteine
0fc84b75f4 Merge pull request #3522 from esenapaj/patch-1
Follow-up and fix for the PR #3453(ELAPSED / PENDING for rollover-safe time checking)
2016-04-16 19:03:27 -07:00
Scott Lahteine
04fdb4de7d Merge pull request #3524 from thinkyhead/rc_fix_mbl_oopsie_1
Oops! Fix MBL move Z to MESH_HOME_SEARCH_Z between probes
2016-04-16 18:47:32 -07:00
Scott Lahteine
4b75b11a53 Wrap defines in parentheses in configs, M48 2016-04-16 18:21:09 -07:00
esenapaj
832e1c1f2a Follow-up and fix for the PR #3453(ELAPSED / PENDING for rollover-safe time checking)
・Add more "UL" suffix
・Restore removed "UL" suffix
2016-04-17 07:50:02 +09:00
Scott Lahteine
234987ee2f Fix MBL lift 2016-04-16 14:17:06 -07:00
Scott Lahteine
a5452902a6 Merge pull request #3516 from thinkyhead/rc_lcd_alert_only_on_error
Don't use LCD alert unless error or alert level is reset later
2016-04-15 19:56:24 -07:00
Scott Lahteine
e0830bf8f1 Don't use LCD alert unless error or alert level is reset later 2016-04-15 18:48:49 -07:00
Scott Lahteine
773229b020 Merge pull request #3515 from thinkyhead/rc_wider_splash
On wider screens show a wider splash page, if possible
2016-04-15 17:26:01 -07:00
Scott Lahteine
86467c24be On wider screens show a wider splash page, if possible 2016-04-15 16:42:29 -07:00
Scott Lahteine
a8e4d7c135 Merge pull request #3477 from alephobjects/BedTempHysteresis
Implementation of M190 bed temp hysteresis
2016-04-15 16:20:58 -07:00
Scott Lahteine
e06931495a Merge pull request #3514 from esenapaj/patch-1
Fix for PR #3502(General cleanup of arc code)
2016-04-15 16:14:04 -07:00
esenapaj
5ecd75eeb3 Fix for PR #3502(General cleanup of arc code) 2016-04-16 07:22:07 +09:00
gralco
8ec8d59df8 Use #if TEMP_RESIDENCY_TIME > 0 rather than #ifdef TEMP_RESIDENCY_TIME 2016-04-15 11:20:32 -06:00
Scott Lahteine
404c36c3bd Merge pull request #3505 from thinkyhead/rc_more_than_this
Fix minor spelling in comments
2016-04-14 21:42:32 -07:00
Scott Lahteine
1cc622b167 Fix minor spelling in comments 2016-04-14 20:06:59 -07:00
Scott Lahteine
866c5be395 Merge pull request #3500 from thinkyhead/rc_shrink_menu_macros
Reduce redundancy in MENU_ITEM code
2016-04-14 19:09:14 -07:00
Scott Lahteine
6e52b0b723 Merge pull request #3504 from thinkyhead/rc_fix_debugging
Fix debugging of vector_3
2016-04-14 19:08:30 -07:00
Scott Lahteine
88367a37f7 Merge pull request #3227 from thinkyhead/rc_home_offsets_and_limits
Relating current_position, min_pos, max_pos, and home_offset
2016-04-14 18:50:43 -07:00
Scott Lahteine
b20bf1826d Fix debugging of vector_3 2016-04-14 18:45:26 -07:00
Scott Lahteine
4fb8013be1 Reduce redundancy in MENU_ITEM code 2016-04-14 18:42:06 -07:00
Scott Lahteine
b243844690 Merge pull request #3502 from thinkyhead/rc_fix_arcs_bugs
General cleanup of arc code
2016-04-14 18:19:44 -07:00
Scott Lahteine
f2abfd6d48 Merge pull request #3501 from thinkyhead/rc_config_comment_cleanup
Update some comments in Configuration.h
2016-04-14 18:19:29 -07:00
Scott Lahteine
5da7de8431 Merge pull request #3488 from thinkyhead/rc_more_manual_level_fix
Mesh Bed Leveling – Add lift between probes, comments, cleanup
2016-04-14 17:59:16 -07:00
Scott Lahteine
2129db581e Simplify MBL movement, zigzag 2016-04-14 16:58:42 -07:00
Scott Lahteine
0493fccc0b mbl.active is a bool now 2016-04-14 16:58:42 -07:00
Scott Lahteine
b05f448317 Comments on MBL menu items 2016-04-14 16:58:42 -07:00
Scott Lahteine
e08dd0d831 Merge pull request #3498 from thinkyhead/rc_preheat_abs_both_3489
Fix bug in lcd_preheat_pla0123 and lcd_preheat_abs0123
2016-04-14 16:57:38 -07:00
Scott Lahteine
9e95f30de0 Merge pull request #3495 from jbrazio/bugfix/followup-3485
Throw an error if ENCODER_PULSES_PER_STEP < -1
2016-04-14 16:56:36 -07:00
Scott Lahteine
8e5099fa0c Update software endstop positions with M206, M428, G92, etc. 2016-04-14 16:47:22 -07:00
Scott Lahteine
5cfb2533d6 Initial cleaning up of arc code 2016-04-14 16:43:49 -07:00
Scott Lahteine
de8c0baf8b Update some comments in Configuration.h 2016-04-14 16:41:20 -07:00
Scott Lahteine
fda8f96f00 Fix bug in lcd_preheat_pla0123 and lcd_preheat_abs0123
Trying to preheat a non-existent extruder causes a crash.
2016-04-14 15:48:43 -07:00
João Brázio
9a3f676709 Throw an error if ENCODER_PULSES_PER_STEP < -1 2016-04-14 16:20:17 +01:00
gralco
69c00aea4c Include bed hysteresis setting in the example configs 2016-04-14 08:03:38 -06:00
Scott Lahteine
9ce4264fda Merge pull request #3490 from thinkyhead/rc_mbl_adjustments
Document some movement functions, rename a local
2016-04-13 20:55:20 -07:00
Scott Lahteine
f8e10ff1d8 Merge pull request #3491 from thinkyhead/rc_mechanical_probe
Support for "mechanical probe" with Allen Key as a special case
2016-04-13 20:55:14 -07:00
Scott Lahteine
50d083c3e6 Merge pull request #3492 from thinkyhead/rc_config_comment_cleanup
Update some comments in Configuration.h
2016-04-13 20:55:09 -07:00
Scott Lahteine
7eb476597f Update some comments in Configuration.h 2016-04-13 20:34:42 -07:00
esenapaj
2eb1b102f8 Support for "mechanical probe" with Allen Key as a special case 2016-04-13 20:34:12 -07:00
Scott Lahteine
cfcd3d7b3e Rename z_offset local to zoffset 2016-04-13 20:09:20 -07:00
Scott Lahteine
5fd20ecac3 Comments on some movement functions 2016-04-13 20:09:20 -07:00
Scott Lahteine
c1b953d38f Merge pull request #3487 from thinkyhead/rc_redo_esenpaj_3479
Apply esenapaj 3479 and delta/scara position bugfix
2016-04-13 18:11:33 -07:00
Scott Lahteine
bb56b1e74c Merge pull request #3435 from thinkyhead/rc_lcd_leveling_home_etc
More fine-grained control of LCD redraw
2016-04-13 17:59:19 -07:00
Scott Lahteine
a781a6f955 Apply esenapaj 3479 and delta/scara position bugfix 2016-04-13 17:41:20 -07:00
Scott Lahteine
2ae7394640 More fine-grained control of LCD redraw 2016-04-12 21:34:34 -07:00
Scott Lahteine
525d8256d4 Merge pull request #3481 from thinkyhead/rc_extruder_offset_array
Fix: gcode_T using non-existent Z offset
2016-04-12 18:23:08 -07:00
Scott Lahteine
b9301e6c62 Merge pull request #3482 from thinkyhead/rc_fix_HAS_Z_MIN_PROBE
Patch conditions for HAS_Z_MIN_PROBE
2016-04-12 18:23:02 -07:00
Scott Lahteine
dc0a3e37be Patch conditions for HAS_Z_MIN_PROBE 2016-04-12 18:11:36 -07:00
Scott Lahteine
46881c846c Add comments for extruder offset options 2016-04-12 17:16:58 -07:00
Scott Lahteine
edf376ce0d Fix: gcode_T using non-existent Z offset
As noted by @snowzach in #3461
2016-04-12 17:15:10 -07:00
gralco
178aeb79c8 Implementation of M190 bed temp hysteresis 2016-04-12 08:56:14 -06:00
Scott Lahteine
0439483bc8 Merge pull request #3476 from thinkyhead/rc_debug_leveling_gcode_t
Add DEBUG_LEVELING output for gcode_T
2016-04-11 21:03:15 -07:00
Scott Lahteine
c03e5f5efd Merge pull request #3475 from thinkyhead/rc_language_cleanup
General cleanup of language files
2016-04-11 20:50:57 -07:00
Scott Lahteine
910d3648bb Merge pull request #3474 from thinkyhead/rc_russian_apr2016
Additional Russian translations
2016-04-11 20:50:50 -07:00
Scott Lahteine
63d8893f5d Add DEBUG_LEVELING output for gcode_T 2016-04-11 20:45:10 -07:00
Scott Lahteine
081cfc5cf3 Merge pull request #3472 from thinkyhead/fix_issue_3375
Initialize stepper counts for Delta/SCARA
2016-04-11 19:59:12 -07:00
Scott Lahteine
fe0fe184aa Replace some tabs with spaces 2016-04-11 19:42:20 -07:00
Scott Lahteine
e773d081c0 General language file cleanup 2016-04-11 19:42:09 -07:00
Scott Lahteine
b63c79b5ff Merge pull request #3473 from thinkyhead/rc_one_more_elapse
Fix a messed up ELAPSED instance
2016-04-11 19:30:59 -07:00
Scott Lahteine
068bc980ce Additional Russian translations
Thanks to @gans-AD – #3363
2016-04-11 19:30:14 -07:00
Scott Lahteine
f840c7de4d Initialize stepper counts for Delta/SCARA 2016-04-11 19:02:35 -07:00
Scott Lahteine
c5a8755cc0 Fix a messed up ELAPSED instance 2016-04-11 18:48:27 -07:00
Scott Lahteine
bc33016efc Merge pull request #3471 from thinkyhead/rc_follow_3431
Fix Deutsch string errors, redundancies
2016-04-11 18:46:50 -07:00
Scott Lahteine
81918657f4 Fix Deutsch string errors, redundancies 2016-04-11 18:12:32 -07:00
Scott Lahteine
56acaf3594 Merge pull request #3469 from thinkyhead/rc_aleph_cooldownfix
Fix for M109 and M190 cooldown
2016-04-11 18:01:01 -07:00
gralco
c218db136a Fix for M109 and M190 cooldown
Also removes the re-definition of now inside M190's while loop
2016-04-11 17:12:23 -07:00
Scott Lahteine
e2a197ab71 Merge pull request #3467 from AnHardt/Fix-Servo-without-endstop-probe
Fix-Servo-without-endstop/probe
2016-04-11 17:04:54 -07:00
Scott Lahteine
3a1ac14bbc Merge pull request #3437 from thinkyhead/rc_lcd_encoder_movement
More bits when encoderPosition is cast as signed
2016-04-11 17:03:23 -07:00
Scott Lahteine
c5a2ce4366 Merge pull request #3446 from thinkyhead/rc_fixup_M206_and_mesh
Fix home_offset handling and account for it in G29
2016-04-11 16:49:01 -07:00
Scott Lahteine
b1bb1c7989 Merge pull request #3466 from thinkyhead/rc_look_for_leveling_bug
Add CORE support to st_set_position and plan_set_position
2016-04-11 16:45:00 -07:00
AnHardt
9cc571b312 Fix-Servo-without-endstop-probe
Sorry for not having realized someone (me) redefined not existing servo pinns to -1, some lines above.
This is a simple error - not a feature.
2016-04-12 01:01:11 +02:00
Scott Lahteine
3e5312f116 CORE support for st_set_position & plan_set_position 2016-04-11 15:13:42 -07:00
Scott Lahteine
e087a99a10 Some cleanup of st_get_pos functions 2016-04-11 15:13:42 -07:00
Roxy-3DPrintBoard
47e3564bbd Merge pull request #3462 from jbrazio/bugfix/old-ide-warning-followup
Versions of Arduino IDE prior to 1.6.0 are no longer supported
2016-04-11 15:58:05 -05:00
João Brázio
ca6c6ec4ca Versions of Arduino IDE prior to 1.6.0 are no longer supported 2016-04-11 19:03:06 +01:00
Scott Lahteine
fdee2be49c More logging of matrix behavior 2016-04-11 00:06:33 -07:00
Scott Lahteine
7f265db3ef Move sync_plan_position after DEBUG_LEVELING 2016-04-10 23:40:11 -07:00
Scott Lahteine
02550af7c3 Merge pull request #3453 from thinkyhead/rc_jbrazio_m190
ELAPSED / PENDING for rollover-safe time checking
2016-04-10 20:25:02 -07:00
Scott Lahteine
7c770f039c Merge pull request #3456 from thinkyhead/rc_MSG_ERR_REDUNDANT_TEMP
Remove redundant text from MSG_ERR_REDUNDANT_TEMP
2016-04-10 20:23:55 -07:00
Scott Lahteine
925cc305ce Merge pull request #3455 from michos-conradt/RCBugFix
Add missing translations for German
2016-04-10 19:18:42 -07:00
Scott Lahteine
011f4736f1 Remove redundant text from MSG_ERR_REDUNDANT_TEMP 2016-04-10 19:14:46 -07:00
Scott Lahteine
906c1c066f Merge pull request #3423 from jbrazio/translate/pt_BR
Added missing pt_BR translation
2016-04-10 19:13:52 -07:00
Scott Lahteine
b30e4528f1 Merge pull request #3454 from thinkyhead/rc_host_timeout_mods
Add a case for M113 to process_next_command
2016-04-10 19:00:40 -07:00
Scott Lahteine
803845ec18 Add a case for M113 to process_next_command 2016-04-10 18:53:03 -07:00
Michael Conradt
f3a7a5c99b Merge branch 'RCBugFix' into translations 2016-04-11 03:50:23 +02:00
Michael Conradt
8b923039e2 Add missing german translations. 2016-04-11 03:20:21 +02:00
Scott Lahteine
386140f361 Test time difference in safe way 2016-04-10 18:09:31 -07:00
Scott Lahteine
1b7356b3a1 Account for home_offset in G29 handler 2016-04-10 15:35:02 -07:00
Scott Lahteine
f3562dd895 Have M206 alter current_position, M428 use new function 2016-04-10 15:35:01 -07:00
Scott Lahteine
562e281c73 Merge pull request #3443 from thinkyhead/rc_host_timeout_tweak
Adjust timeout code in host_keepalive
2016-04-09 17:45:36 -07:00
Scott Lahteine
2925eb0b59 Merge pull request #3440 from floyd871/patch-1
Wrong Pin Assignment Megatronics 3
2016-04-09 17:01:23 -07:00
Scott Lahteine
6d465321b5 Adjust timeout code in host_keepalive 2016-04-09 16:58:17 -07:00
Scott Lahteine
8198cc30b5 More bits when encoderPosition is cast as signed 2016-04-09 14:22:12 -07:00
Michael Neumann
95acba2cfa Wrong Pin Assignment Megatronics 3
SERVO2 is doubled defined and causes compiler errors
2016-04-09 11:23:22 +02:00
Scott Lahteine
50c3140040 Merge pull request #3414 from thinkyhead/rc_host_timeout_mods
Host Keepalive configurable timeout with 2s default
2016-04-08 21:45:45 -07:00
Scott Lahteine
6bd20371f0 Merge pull request #3438 from thinkyhead/rc_M109_residency_loop_fix
Fix bug which can cause an infinite M109 loop
2016-04-08 21:36:30 -07:00
Scott Lahteine
96e37bb70a Merge pull request #3419 from DavidBjerreBjoerklund/patch-2
Update language_da.h
2016-04-08 21:35:58 -07:00
Scott Lahteine
13d758c651 Merge pull request #3420 from DavidBjerreBjoerklund/patch-3
Update language_da.h
2016-04-08 21:31:14 -07:00
Scott Lahteine
518068a5a8 Merge pull request #3425 from tnw513/FixLangIt
Optimized Italian strings to fit in 16 character display
2016-04-08 21:29:28 -07:00
Scott Lahteine
1b81e5adc7 Merge pull request #3431 from AnHardt/lang-de
de-language additions
2016-04-08 21:25:00 -07:00
Scott Lahteine
1acf901b63 Adjustments to residency_start_ms handling 2016-04-08 21:20:23 -07:00
gralco
907aed57db Fix bug which can cause an infinite M109 loop
Since residency_start_ms is -1 when entering the heatup while loop whilst the hotend temp is close to the target them already then it may not escape.

Hence "Start the TEMP_RESIDENCY_TIME timer when we reach target temp for the first time."
2016-04-08 21:20:23 -07:00
Scott Lahteine
3ecf38d32e Merge pull request #3436 from thinkyhead/rc_experimental_twibus
M155 and M156, a generic TWI/I2C interface for Marlin
2016-04-08 20:35:53 -07:00
jbrazio
dd3a06a95a Implemented M155 and M156, a generic TWI/I2C interface for Marlin 2016-04-08 20:14:37 -07:00
Scott Lahteine
843aa90b5a Merge pull request #3434 from thinkyhead/rc_more_debug_leveling
Additional debug leveling output
2016-04-08 18:57:18 -07:00
Scott Lahteine
a644ab1de4 Minor patch ups to G29
This may fix a subtle bug caused by doing `G29` more than once without
`G28` between.
2016-04-08 17:53:15 -07:00
Scott Lahteine
cba2698871 Additional DEBUG_LEVELING output 2016-04-08 17:53:15 -07:00
AnHardt
c3d1b7db2d de-language additions 2016-04-08 22:51:04 +02:00
Scott Lahteine
4e17187c96 Merge pull request #3426 from thinkyhead/rc_no_unhomed_lcd_move_on_delta_scara
No LCD Move for unhomed Delta/SCARA
2016-04-07 19:29:45 -07:00
Scott Lahteine
5e18d650c4 Merge pull request #3427 from thinkyhead/rc_better_SERIAL_ECHOPAIR
No casting needed for SERIAL_ECHOPAIR
2016-04-07 19:29:18 -07:00
Scott Lahteine
e0b0d1eb6b Add M113 to get/set Host Keepalive 2016-04-07 19:25:56 -07:00
Scott Lahteine
85883da90c Implement basic HOST_KEEPALIVE_INTERVAL 2016-04-07 19:25:56 -07:00
Scott Lahteine
2eca8d63b3 Add DEFAULT_KEEPALIVE_INTERVAL setting 2016-04-07 19:25:56 -07:00
Scott Lahteine
098fb8f8c9 Merge pull request #3413 from thinkyhead/rc_probe_G30_position
Report the probe position in G30
2016-04-07 19:25:33 -07:00
Scott Lahteine
3460d01441 Merge pull request #3422 from jbrazio/translate/pt_PT
Update pt_PT translation
2016-04-07 19:18:56 -07:00
Scott Lahteine
c9c7c66b95 Merge pull request #3421 from jbrazio/bugfix/m109-EXTRUDE_MINTEMP-expansion
M109: Protect against EXTRUDE_MINTEMP expansion
2016-04-07 19:18:34 -07:00
Scott Lahteine
d7cbb2eec9 Merge pull request #3403 from jbrazio/feature/stopwatch
Print job timer rework
2016-04-07 19:18:03 -07:00
Scott Lahteine
f834bcd43a Merge pull request #3415 from thinkyhead/rc_filwidth_issue
Fix FILAMENT_WIDTH_SENSOR measurement
2016-04-07 19:08:42 -07:00
Scott Lahteine
047c412df6 Merge pull request #3428 from thinkyhead/rc_consolidate_reprap_keypad
Consolidate REPRAPWORLD_KEYPAD, disallow moves for unhomed Delta/SCARA
2016-04-07 19:06:57 -07:00
Scott Lahteine
5fc6daba2b Disallow REPRAPWORLD_KEYPAD moves on Delta/SCARA until homed 2016-04-07 18:40:54 -07:00
Scott Lahteine
7bb15a1c57 Consolidate REPRAPWORLD_KEYPAD definitions 2016-04-07 18:40:54 -07:00
Scott Lahteine
dc19b69697 No casting needed for SERIAL_ECHOPAIR 2016-04-07 16:33:21 -07:00
Scott Lahteine
165e73794a Tweak encoderPosition non-zero test 2016-04-07 16:09:42 -07:00
Scott Lahteine
479d307a44 Disable LCD Move XYZ for unhomed Delta/SCARA 2016-04-07 16:09:42 -07:00
Silvio Didonna
9088802da1 Optimized Italian strings to fit in 16 character display 2016-04-07 19:18:22 +02:00
Silvio
cc4bb5aa09 Merge pull request #2 from MarlinFirmware/RCBugFix
Rc bug fix
2016-04-07 19:14:17 +02:00
João Brázio
801cd48a72 Added missing pt_BR translation 2016-04-07 13:07:57 +01:00
João Brázio
013f19054b Update pt_PT translation 2016-04-07 13:00:08 +01:00
João Brázio
471d30cc1c M109: Protected against EXTRUDE_MINTEMP expansion 2016-04-07 12:50:57 +01:00
DavidBjerreBjoerklund
5f840d2e30 Update language_da.h
Corrected:
MSG_KILLED
MSG_NO_MOVE
MSG_STOPPED
MSG_PRINT_ABORTED
MSG_ON
MSG_OFF
2016-04-07 13:42:27 +02:00
João Brázio
7c7e30f4cc Adherence to the new OOP coding standards 2016-04-07 12:41:09 +01:00
DavidBjerreBjoerklund
b80b40a578 Update language_da.h
Added translation mentioned in issue #3351:
Homing would be best tranlated homing, or "Kører til udgangsposition".

#define MSG_SET_HOME_OFFSETS
#define MSG_LEVEL_BED_HOMING
#define MSG_LEVEL_BED_WAITING 
#define MSG_LEVEL_BED_DONE
#define MSG_LEVEL_BED_CANCEL 
#define MSG_HOME_OFFSETS_APPLIED
2016-04-07 12:52:31 +02:00
Scott Lahteine
573d772c92 Merge pull request #3416 from paulusjacobus/RCBugFix
Optimised Ducth messages to fit in 16 Char display Update language_nl.h
2016-04-06 20:41:14 -07:00
paulusjacobus
3f7ae9a7ce Update language_nl.h
Optimised all added messages to fit within 16 Characters
2016-04-07 13:15:00 +10:00
Scott Lahteine
865dcf3fb4 Fix FILAMENT_WIDTH_SENSOR measurement
Only measure and store filament width when E is going forward.
2016-04-06 19:48:04 -07:00
Scott Lahteine
2f6c5fe2da Report the probe position in G30 2016-04-06 16:55:21 -07:00
Scott Lahteine
74effedbf5 Merge pull request #3412 from paulusjacobus/RCBugFix
rebased my fork with RCBugFix release in order to push language_nl.h
2016-04-06 16:53:35 -07:00
Scott Lahteine
bba1f16589 Merge pull request #3411 from esenapaj/patch-1
Update Readme.fonts about Kana
2016-04-06 16:19:19 -07:00
Scott Lahteine
c506743f63 Merge pull request #3406 from tnw513/FixLangIt
Update to language_it.h
2016-04-06 16:18:58 -07:00
Paul de Groot
48a4410f02 rebased my fork with RCBugFix release in order to push language_nl.h 2016-04-07 08:17:59 +10:00
esenapaj
ff9511b870 Update Readme.fonts about Kana
I think that that sentence has been completed its part. 
Because Kana fonts were revised by me the other day(PR #3289), who am a native Japanese.

And for @AnHardt,
I'd like to take this opportunity to express one's heartfelt gratitude as a far eastern person,
about you has been maintaining the resource of Japanese despite you are a far western person.
2016-04-07 07:13:46 +09:00
Silvio Didonna
e215c7100d fixed mistranslations and minor changes for consistency between "it" and "en" files. 2016-04-06 16:45:04 +02:00
Silvio Didonna
6208db3b00 fixed mistranslations and minor changes for consistency between "it" and "en" files. 2016-04-06 16:40:01 +02:00
Silvio
62612580ef Merge pull request #1 from MarlinFirmware/RCBugFix
Rc bug fix
2016-04-06 16:04:09 +02:00
João Brázio
e48d0263bf Bugfix: M32 was still using the old print timer 2016-04-06 04:41:36 +01:00
João Brázio
e8b80d8c20 Implemented M75, M76, M77 to control the print timer 2016-04-06 04:38:42 +01:00
João Brázio
eb61051556 Rework the print job timer to use the stopwatch class 2016-04-06 04:34:03 +01:00
João Brázio
399101fff3 Implemented the stopwatch class and methods 2016-04-06 04:23:45 +01:00
Scott Lahteine
2988147880 Merge pull request #3400 from thinkyhead/rc_sensor_per_extruder
Add more leveling-debug output
2016-04-05 19:38:03 -07:00
Scott Lahteine
98f2e9fc83 Reduce string storage required for DEBUG_LEVELING 2016-04-05 19:04:42 -07:00
Scott Lahteine
1af5d7b35f Add more leveling-debug output 2016-04-05 18:31:10 -07:00
Scott Lahteine
d5b19a49f6 Merge pull request #3384 from thinkyhead/rc_adjust_M111_output
Final tweaks to M111 output
2016-04-05 16:48:59 -07:00
Scott Lahteine
9536e28978 Merge pull request #3398 from thinkyhead/rc_sensor_per_extruder
Catch a TEMP_SENSOR error before a pins issue
2016-04-05 16:36:50 -07:00
Scott Lahteine
da2ff4a6d3 Catch a TEMP_SENSOR error before a pins issue 2016-04-05 16:17:28 -07:00
Scott Lahteine
90f6f02aca Merge pull request #3397 from thinkyhead/rc_menu_issues_fixer
Revert #3388, clean up lcd_move code
2016-04-05 15:45:35 -07:00
Scott Lahteine
fb38d698db Add feedback after "Click to Begin" 2016-04-05 15:35:05 -07:00
Scott Lahteine
d5f0db26dc Merge pull request #3390 from jbrazio/docs/update-source-url
Update DEFAULT_SOURCE_URL comment
2016-04-05 15:17:07 -07:00
Scott Lahteine
ce58d1d4d5 Merge pull request #3392 from barus93/patch-2
Update language_it.h
2016-04-05 15:16:24 -07:00
Scott Lahteine
bd5ca62290 Merge pull request #3393 from gege2b/RCBugFix
Some omitted french translation
2016-04-05 15:14:48 -07:00
Scott Lahteine
582b58e660 Add audio feedback to edit items 2016-04-05 14:51:11 -07:00
Scott Lahteine
a70c3ffc21 Minor syntax tweak with encoderPosition 2016-04-05 14:51:11 -07:00
Scott Lahteine
0f247187b8 Drop extra setting of currentMenu 2016-04-05 14:51:11 -07:00
Scott Lahteine
24cde86a4f Fix syntax highlighting of menu_edit_type lines 2016-04-05 14:51:11 -07:00
Scott Lahteine
86372cd394 Add underscore to internal lcd move function names 2016-04-05 14:51:11 -07:00
Scott Lahteine
aa97328cd3 Use min_pos/max_pos for _lcd_move 2016-04-05 14:51:10 -07:00
Scott Lahteine
f936df9507 Small cleanup of feedrate dead-zone 2016-04-05 14:51:10 -07:00
Scott Lahteine
f5c2fb27cd Handle defer_return_to_status in lcd_goto_menu 2016-04-05 14:51:10 -07:00
Scott Lahteine
8459f7fa5c Use ms where possible. 2016-04-05 14:51:10 -07:00
Scott Lahteine
34ce9c4c1c Restore save previous for menu edit items 2016-04-05 14:26:36 -07:00
Gege2B
03d5c9a482 Merge remote-tracking branch 'upstream/RCBugFix' into RCBugFix 2016-04-05 12:14:15 +02:00
Gege2B
4ea45d5c56 Some omitted french translation 2016-04-05 12:04:29 +02:00
barus93
f43e37bb0c Update language_it.h
New messages translated:
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
#define MSG_LEVEL_BED_WAITING "Click to Begin"
#define MSG_LEVEL_BED_DONE "Leveling Done!"
#define MSG_LEVEL_BED_CANCEL "Cancel"
. . .
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
2016-04-05 07:24:07 +02:00
João Brázio
9240682630 Followup #3326: Update DEFAULT_SOURCE_URL comment 2016-04-05 02:21:23 +01:00
Scott Lahteine
6c48b4e006 Merge pull request #3387 from thinkyhead/travis_readability
Comments for legibility, include DEBUG_LEVELING, SDSUPPORT
2016-04-04 17:05:58 -07:00
Scott Lahteine
4b8a71055e Merge pull request #3388 from thinkyhead/rc_fix_move_menu_bug
Fix: menu edit items saving position twice
2016-04-04 17:05:15 -07:00
Scott Lahteine
1220dfd5d6 Fix: menu edit items saving position twice 2016-04-04 16:36:04 -07:00
Scott Lahteine
ad61a8684a Comments for legibility, test DEBUG_LEVELING 2016-04-04 16:31:37 -07:00
Scott Lahteine
b5920837ea Merge pull request #3370 from esenapaj/patch-1
Drop DISABLE_M(IN|AX)_ENDSTOPS, replace with individual endstop flags
2016-04-04 16:12:50 -07:00
Scott Lahteine
53b397ab14 Merge pull request #3364 from jbrazio/script/find-missing-translations
Added a script to check all language files for missing translations
2016-04-04 16:10:36 -07:00
Scott Lahteine
d6fe454a13 Merge pull request #3386 from thinkyhead/rc_spanish_rebase
Add Missing Spanish translation
2016-04-04 16:07:34 -07:00
Scott Lahteine
2abea41c41 Merge pull request #3385 from thinkyhead/rc_dutch_translation
Update language_nl.h
2016-04-04 16:02:11 -07:00
RicardoGA
1bfaf57ee5 Add Missing Spanish translation
Add the missing translation (Spanish) issue #3353
2016-04-04 15:55:59 -07:00
paulusjacobus
4a4b797dca Update language_nl.h
Added these messages with Dutch translation
#define MSG_BED_Z
#define MSG_A_TRAVEL
#define MSG_HEATING_FAILED_LCD
#define MSG_ERR_REDUNDANT_TEMP
#define MSG_THERMAL_RUNAWAY
#define MSG_ERR_MAXTEMP
#define MSG_ERR_MINTEMP
#define MSG_ERR_MAXTEMP_BED
#define MSG_ERR_MINTEMP_BED
#define MSG_HEATING
#define MSG_HEATING_COMPLETE
#define MSG_BED_HEATING
#define MSG_BED_DONE
2016-04-04 15:46:50 -07:00
Scott Lahteine
1ee903f30d Merge pull request #3376 from gege2b/RCBugFix
French translation
2016-04-04 15:40:00 -07:00
Scott Lahteine
c5ff2c7d32 Merge pull request #3377 from clexpert/patch-1
Update language_cz.h
2016-04-04 15:39:44 -07:00
Scott Lahteine
99898ea652 Merge pull request #3379 from barus93/patch-2
Update language_it.h
2016-04-04 15:39:15 -07:00
Scott Lahteine
56e8e2b0eb Final tweaks to M111 output 2016-04-04 15:36:07 -07:00
Scott Lahteine
d5ccc9c70a Merge pull request #3374 from jbrazio/bugfix/m111-corrupted-output
M111: Add static keyword to PROGMEM debug variables
2016-04-04 15:31:57 -07:00
barus93
040a0c49db Update language_it.h
ADD missing translation
2016-04-04 20:22:34 +02:00
Petr Zahradnik
8b843e997a Update language_cz.h 2016-04-04 17:26:19 +02:00
Petr Zahradnik
3cd2beb750 Update language_cz.h 2016-04-04 16:54:26 +02:00
Gege2B
34bf9530c0 French translation 2016-04-04 16:45:06 +02:00
João Brázio
d819a4aff9 Fixes #3346, followup #3343: variables must defined with the static keyword to work with PROGMEM when defined inside functions 2016-04-04 15:02:18 +01:00
esenapaj
1326dc7258 Drop DISABLE_M(IN|AX)_ENDSTOPS, replace with individual endstop flags
This is follow-up the commit e5771346a4.
Update unnoticed files.
2016-04-04 17:49:25 +09:00
Scott Lahteine
0433df3835 Merge pull request #3366 from jbrazio/translate/pt_PT
Added missing translations for pt_PT
2016-04-03 21:02:13 -07:00
Scott Lahteine
1d6f90b0b1 Merge pull request #3365 from thinkyhead/fix_fancy_new_endstop_config
Fix bug in new endstop pullups handling
2016-04-03 20:58:52 -07:00
João Brázio
dff6adfbca Fixes #3361: Added missing translations for pt_PT 2016-04-04 04:57:32 +01:00
Scott Lahteine
c0e7257932 Fix bug in new endstop pullups handling 2016-04-03 20:52:32 -07:00
João Brázio
f94900ee79 Added a script to check all language files for missing translations 2016-04-04 04:46:04 +01:00
Scott Lahteine
de39056f68 Merge pull request #3343 from thinkyhead/rc_fix_m111_output
Fix M111 output using pgm_read_word, as required
2016-04-03 17:44:38 -07:00
Scott Lahteine
e0bef7dfcc Merge pull request #3342 from esenapaj/patch-1
Update Japanese translation
2016-04-03 17:38:28 -07:00
Scott Lahteine
fd0ac371b0 Fix M111 output using pgm_read_word as required
As noted by @taratata2016 in https://github.com/MarlinFirmware/Marlin/issues/3300#issuecomment-204687275
2016-04-03 17:33:06 -07:00
esenapaj
c4d7e0307c Update Japanese translation 2016-04-04 09:11:23 +09:00
Scott Lahteine
c045ec8cb3 Merge pull request #3065 from thinkyhead/rc_doc_tweaks
Simplified endstop configuration
2016-04-03 17:05:47 -07:00
Scott Lahteine
d771174797 Merge pull request #3337 from esenapaj/patch-2
suppress warnings
2016-04-03 17:01:22 -07:00
Scott Lahteine
f2032cfcf6 Merge pull request #3341 from thinkyhead/rc_english_patch
Fix English definition for MSG_LEVEL_BED_CANCEL
2016-04-03 16:58:51 -07:00
Scott Lahteine
fa97ba6230 Merge pull request #3340 from thinkyhead/japanese_accent_sanitize
Update Japanese translation
2016-04-03 16:48:30 -07:00
Scott Lahteine
09c6f80c1e Fix MSG_LEVEL_BED_CANCEL english 2016-04-03 16:41:27 -07:00
esenapaj
afe7d26543 Update Japanese translation 2016-04-03 16:39:37 -07:00
Scott Lahteine
3aee89b93a Merge pull request #3338 from thinkyhead/rc_patches_april_3
Add history to LCD Menus, fix up Manual Bed Leveling
2016-04-03 16:37:39 -07:00
Scott Lahteine
22a43980e8 Merge pull request #3339 from thinkyhead/rc_has_temp_hotend
Add HAS_TEMP_HOTEND, account for MAX31855 in conditionals
2016-04-03 16:35:54 -07:00
Scott Lahteine
7a2f73c6db Remove extra comma from LCDHandlerAction 2016-04-03 16:27:30 -07:00
Scott Lahteine
3fbf67e5ce Patch MBL feedback and event handling 2016-04-03 16:27:30 -07:00
Scott Lahteine
ef2fbaec98 Headings for menu sub-items, actions, etc. 2016-04-03 16:27:29 -07:00
Scott Lahteine
dc109ac4e2 Move MBL code to its logical place 2016-04-03 16:27:29 -07:00
Scott Lahteine
6730408ec1 Move lcd_autostart_sd to its logical place 2016-04-03 16:27:29 -07:00
Scott Lahteine
056b80dc53 Have "back" menu items go to the previous item 2016-04-03 16:27:29 -07:00
Scott Lahteine
c94482168b Add MSG_LEVEL_BED_CANCEL for MBL 2016-04-03 16:27:29 -07:00
Scott Lahteine
877fb1f588 Account for MAX31855 in conditionals 2016-04-03 16:19:17 -07:00
Scott Lahteine
d24f14a799 Add HAS_TEMP_HOTEND define 2016-04-03 16:18:49 -07:00
esenapaj
f9e1a0ee6c suppress warnings 2016-04-04 06:48:53 +09:00
Scott Lahteine
cf9a171aa9 Merge pull request #3330 from thinkyhead/rc_mbl_lcdDrawUpdate
Improvements to MBL, general LCD menu handling
2016-04-02 19:20:23 -07:00
Scott Lahteine
783e0122d6 Merge pull request #3331 from thinkyhead/rc_default_info
Split DEFAULT_MACHINE_NAME from DEFAULT_SOURCE_URL
2016-04-02 19:11:48 -07:00
Scott Lahteine
2b01649533 Move default machine info to pins files 2016-04-02 18:53:05 -07:00
Scott Lahteine
4f24323817 Split DEFAULT_MACHINE_NAME from DEFAULT_SOURCE_URL
Addressing #3325 – Avoid undefined symbol errors in the compiler.
2016-04-02 18:41:01 -07:00
Scott Lahteine
771ee1c1a9 Update MBL menu sub-function names 2016-04-02 18:20:47 -07:00
Scott Lahteine
d659777e70 Fix MBL to handle re-entrant calls 2016-04-02 18:14:49 -07:00
Scott Lahteine
5719fcba51 Add MSG_LEVEL_BED_DONE and MSG_LEVEL_BED_WAITING 2016-04-02 18:14:49 -07:00
Scott Lahteine
80b8fd1cad Add MSG_HOME_OFFSETS_APPLIED 2016-04-02 18:14:49 -07:00
Scott Lahteine
d1c45ff80b More user interaction in MBL 2016-04-02 18:14:49 -07:00
Scott Lahteine
240b71ee1c Give names to lcdDrawUpdate values 2016-04-02 18:14:48 -07:00
Scott Lahteine
b0a3c7a91c Add feedback sounds to MBL items 2016-04-02 17:08:43 -07:00
Scott Lahteine
782c598e66 Use ftostr43 with '+' option in MBL Z adjuster 2016-04-02 17:08:43 -07:00
Scott Lahteine
f08b0d034f Merge pull request #3328 from RicardoGA/RC_Babystepping_fix
Babystepping Fix
2016-04-02 16:48:45 -07:00
Scott Lahteine
09437466b1 Merge pull request #3324 from tnw513/fix_filament_dia
changed DEFAULT_NOMINAL_FILAMENT_DIA for consistency between example config files
2016-04-02 16:40:24 -07:00
Scott Lahteine
2b4c42610c Adjust SanityCheck messages 2016-04-02 16:39:23 -07:00
Scott Lahteine
a617d12f70 Account for Z_DUAL_ENDSTOPS in sanity checking of endstops 2016-04-02 16:39:23 -07:00
Scott Lahteine
868eebfdee Simplify configuration of Z2 endstops 2016-04-02 16:39:23 -07:00
Scott Lahteine
e5771346a4 Drop DISABLE_M(IN|AX)_ENDSTOPS, replace with individual endstop flags 2016-04-02 16:39:23 -07:00
Scott Lahteine
071c742b8a Move STRINGIFY to macros.h, use in language.h 2016-04-02 16:38:43 -07:00
Scott Lahteine
2ee599d873 Merge pull request #3321 from tnw513/fix_max_endstop
Max endstops disabled for stock Prusa i3 Hephestos.
2016-04-02 16:38:10 -07:00
Scott Lahteine
4e1bbdb89f Merge pull request #3320 from alhirzel/RCBugFix
Fix manual Y movement on delta (regression).
2016-04-02 16:37:14 -07:00
Scott Lahteine
5fb88a2754 Merge pull request #3314 from jbrazio/bugfix/followup-3235
Fixes missing icons from status screen
2016-04-02 16:36:18 -07:00
Scott Lahteine
3c14c01a3a Merge pull request #3310 from esenapaj/patch-2
Follow-up the commit a393941
2016-04-02 16:35:31 -07:00
Scott Lahteine
93f690afdb Merge pull request #3317 from jbrazio/bugfix/followup-3305
Wrong board def in pins.h
2016-04-02 16:34:39 -07:00
RicardoGA
6b1d2263a2 Babystepping Fix 2016-04-02 14:53:57 -06:00
Silvio Didonna
dfe891fe11 changed filament diameter for consistency between all example config files. 2016-04-02 21:05:25 +02:00
Alexander Hirzel
6e0d627c8c Unbreak the Delta radius clipping 2016-04-02 12:58:39 -04:00
Silvio Didonna
6c528e63eb max endstops disabled. Stock Prusa i3 Hephestos have min endstops. 2016-04-02 16:54:59 +02:00
Alexander Hirzel
949172606f Fix manual Y movement on delta (regression). 2016-04-02 10:48:13 -04:00
João Brázio
55a248d6b4 Fixes #3313 : Wrong board def in pins.h 2016-04-02 09:28:58 +01:00
João Brázio
04b2abb6aa Fixes #3312: Missing all icons from status screen 2016-04-02 06:50:02 +01:00
esenapaj
81593cb3cb Follow-up the commit a393941 2016-04-02 11:23:33 +09:00
Scott Lahteine
4d0d37aab7 Merge pull request #3309 from thinkyhead/rc_release_RC5
Release 1.1.0-RC5
2016-04-01 19:23:30 -07:00
Scott Lahteine
6a245fe4f7 Release 1.1.0-RC5 2016-04-01 19:14:49 -07:00
Scott Lahteine
e8f8a46ef5 Merge pull request #3303 from thinkyhead/rc_various_fixes
Various patches for LCD menu issues
2016-04-01 18:02:25 -07:00
Scott Lahteine
b98f72b483 Small optimization for ftostr43 2016-04-01 17:54:16 -07:00
Scott Lahteine
a393941d2d Combine "XYZ" with MSG_LEVEL_BED_HOMING 2016-04-01 17:51:03 -07:00
Scott Lahteine
097cc75ba8 Patch _lcd_level_bed draw to fix flicker, show proper offset 2016-04-01 17:51:03 -07:00
Scott Lahteine
1e1a18e091 Remove extra semicolon in ultralcd.cpp 2016-04-01 17:51:03 -07:00
Scott Lahteine
0b4f65dca8 Always limit blink to ~1 second intervals 2016-04-01 17:51:03 -07:00
Scott Lahteine
8e05b0037b Merge pull request #3307 from thinkyhead/rc_host_keepalive_comment
Fix comment about host keepalive interval
2016-04-01 17:48:17 -07:00
Scott Lahteine
ffe054c129 Fix comment about host keepalive interval 2016-04-01 17:28:08 -07:00
Scott Lahteine
0d6609c3c5 lcd_goto_menu should set lcdDrawUpdate to 2 2016-04-01 17:07:40 -07:00
Scott Lahteine
af89ccf96a Use flag to defer lcd return-to-status 2016-04-01 17:07:39 -07:00
Scott Lahteine
641b30217e Patch prevEncoderPosition compile issue
Thanks to @jbrazio #3301
2016-04-01 17:07:39 -07:00
Scott Lahteine
41aa4bdf1f Use XYZ translated strings in dogm 2016-04-01 17:07:39 -07:00
Scott Lahteine
92882fcc51 Allow lcd_implementation_drawedit to draw a message 2016-04-01 17:04:33 -07:00
Scott Lahteine
0114cf1101 RCBugFix version string 2016-04-01 17:04:33 -07:00
Scott Lahteine
9c43369ebb Merge pull request #3306 from thinkyhead/rc_fix_num2str
Clean up num2str functions, extend ftostr43
2016-04-01 17:04:03 -07:00
Scott Lahteine
6791401ca7 Merge pull request #3305 from thinkyhead/rc_emart_patch_3297
Support for MKS v1.3/1.4 and Sainsmart RAMPS 1.4 variants
2016-04-01 17:03:54 -07:00
Scott Lahteine
1da9d10173 Support for MKS v1.3/1.4 and Sainsmart RAMPS 1.4 variants 2016-04-01 16:54:35 -07:00
Scott Lahteine
fcedfd6e99 Clean up num2str functions, extend ftostr43 2016-04-01 16:52:59 -07:00
Scott Lahteine
2512d8fd5e Merge pull request #3304 from thinkyhead/rc_slow_buttons
Macros for buttons, some cleanup for slow buttons
2016-04-01 15:31:54 -07:00
Scott Lahteine
f543aaa54e Apply standard pin test to buttons
This is the easiest way to make button pin testing consistent without
renaming all the button pins. Just make a macro especially for testing
if button pins are set, since they are named consistently in the pins
files.
2016-04-01 15:12:12 -07:00
Scott Lahteine
f2ffc8b28b Rename local slow_buttons for clarity 2016-04-01 15:06:33 -07:00
Scott Lahteine
26279fa43c Merge pull request #3289 from esenapaj/patch-1
Update Kana font
2016-04-01 14:31:32 -07:00
Scott Lahteine
0bee67e5f1 Merge pull request #3294 from jbrazio/bugfix/mandatory-extrude-mintemp
Fix an error when EXTRUDE_MINTEMP is not defined
2016-04-01 14:23:32 -07:00
João Brázio
709dd5aa4d Fix an error when EXTRUDE_MINTEMP is not defined 2016-03-31 16:25:48 +01:00
Scott Lahteine
4f85226106 Merge pull request #3288 from thinkyhead/rc_servo_plus_delta
Fix servo deploy/stow issues with G29 and Delta
2016-03-30 19:01:00 -07:00
Scott Lahteine
bc86ee0271 Simplify homeaxis with some macros 2016-03-30 18:44:05 -07:00
esenapaj
cc5059478a Update Kana font 2016-03-31 10:02:47 +09:00
Scott Lahteine
82ef101ed5 Deploy & Stow in G29 for Delta + Z Servo Endstop 2016-03-30 16:41:16 -07:00
Scott Lahteine
33a9d32800 Merge pull request #3285 from thinkyhead/rc_fix_drawedit
Fix string issues in ultralcd.cpp
2016-03-30 13:01:07 -07:00
Scott Lahteine
6a4d394fff Fix pointer-to-string issues with set_home_offsets and _lcd_level_bed_homing 2016-03-30 12:32:25 -07:00
Scott Lahteine
de333c4fea Merge pull request #3279 from thinkyhead/rc_filament_width_sensor
FILAMENT_SENSOR -> FILAMENT_WIDTH_SENSOR
2016-03-30 12:16:27 -07:00
Scott Lahteine
0f835c0c4e Merge pull request #3259 from jbrazio/bugfix/old-ide-warning
Show a warning message when Arduino IDE is prior to 1.5
2016-03-30 12:15:51 -07:00
Scott Lahteine
8def2c31db Merge pull request #3284 from thinkyhead/rc_stop_watchheat_lcdset0
Fix temperature checking conditions (backwards!)
2016-03-30 12:10:39 -07:00
Scott Lahteine
b919a6f182 Merge pull request #3280 from esenapaj/patch-1
Update U8glib URL
2016-03-30 12:06:53 -07:00
Scott Lahteine
8bf5f7c676 Merge pull request #3282 from jbrazio/bugfix/m104-timer-wont-start
M104 not starting the print timer
2016-03-30 11:54:16 -07:00
Scott Lahteine
31450ad498 Fix temperature checking conditions (backwards!) 2016-03-30 11:52:03 -07:00
João Brázio
187c183c20 M104 was not starting the print timer 2016-03-30 11:33:24 +01:00
esenapaj
352294b5f5 Update U8glib URL 2016-03-30 14:26:28 +09:00
Scott Lahteine
507aef055f Patch broken M404 2016-03-29 20:54:31 -07:00
Scott Lahteine
1a79b13b7a FILAMENT_SENSOR -> FILAMENT_WIDTH_SENSOR 2016-03-29 20:54:31 -07:00
Scott Lahteine
7f81aa7ff3 Pins should always be defined (even for disabled features) 2016-03-29 20:44:14 -07:00
Scott Lahteine
5f32184254 Merge pull request #3278 from thinkyhead/rc_cleanup_m111_redo
Echo all debug levels in M111, default to DEBUG_NONE
2016-03-29 20:34:31 -07:00
Scott Lahteine
05765fb570 Add DEBUGGING macro 2016-03-29 19:50:01 -07:00
Scott Lahteine
4402760739 Echo all debug levels in M111, default to DEBUG_NONE
Redo of #3268 by @jbrazio
2016-03-29 19:18:45 -07:00
Scott Lahteine
f0b96f5cae Merge pull request #3276 from thinkyhead/rc_sdprint_and_lcd_sleuth
Refinements, fixes, reduced stack usage in CardReader
2016-03-29 18:30:18 -07:00
Scott Lahteine
12c0bf9521 Merge pull request #3277 from jbrazio/bugfix/m190-temp-never-reached
M190 bed temp is never reached
2016-03-29 18:28:51 -07:00
João Brázio
c6577aea60 M190 bed temp was never reached 2016-03-30 01:03:20 +01:00
Scott Lahteine
ce0a9d3dc6 A picky fix of indentation in cardreader.cpp 2016-03-29 16:23:12 -07:00
Scott Lahteine
4ed8351e3d Revert use of enqueue_and_echo_command_now 2016-03-29 16:23:12 -07:00
Scott Lahteine
70d1d4de5f Small code spacing adjustments 2016-03-29 03:19:27 -07:00
Scott Lahteine
0385acea7a Fix workDirParents -> getAbsFilename relationship 2016-03-29 03:18:53 -07:00
Scott Lahteine
27d70599d4 Change openFile default to "not-push" instead of "do-replace" 2016-03-29 03:16:35 -07:00
Scott Lahteine
372f93cc7a Rename "filenames" to "proc_filenames" 2016-03-29 03:15:01 -07:00
Scott Lahteine
6b01cf07c2 Use only as much stack as needed for the M23 command 2016-03-29 02:34:33 -07:00
Scott Lahteine
9e520ae319 Merge pull request #3272 from thinkyhead/rc_filament_sensor_scope
Minor cleanup to filament sensor code
2016-03-28 20:51:46 -07:00
Scott Lahteine
f83c03f594 Merge pull request #3271 from thinkyhead/rc_blink_limiter
Keep blinking limited to LCD_UPDATE_INTERVAL
2016-03-28 20:05:56 -07:00
Scott Lahteine
3252df7998 Minor cleanup to filament sensor code 2016-03-28 20:04:34 -07:00
Scott Lahteine
b60ea95adf Keep blinking limited to LCD_UPDATE_INTERVAL 2016-03-28 19:41:13 -07:00
Scott Lahteine
e0ab06cfae Merge pull request #3267 from thinkyhead/rc_command_args_null_oooops
Cleanup, simplification of command dispatcher code
2016-03-28 18:54:00 -07:00
Scott Lahteine
0b8ef5eba6 Split get_command into units, rename to get_available_commands 2016-03-28 06:00:04 -07:00
Scott Lahteine
545f7997ea Continue on empty lines instead of returning 2016-03-28 05:37:36 -07:00
Scott Lahteine
3dcf6d42ff Don't store escaped serial characters if comment_mode 2016-03-28 05:37:36 -07:00
Scott Lahteine
5f8e52aefb Minor cleanup to command dispatcher 2016-03-28 05:37:36 -07:00
jbrazio
0880fecbd4 Show a warning message when Arduino IDE is prior to 1.5 2016-03-28 11:55:42 +01:00
Scott Lahteine
f1ed310322 Add NUMERIC compare macros to simplify code 2016-03-28 03:52:49 -07:00
Scott Lahteine
4b697938e6 Merge pull request #3262 from thinkyhead/rc_less_uptight_temps
Relax the test for "Heating failed" errors
2016-03-27 09:52:50 -07:00
Scott Lahteine
3b2d159abd Relax the test for "Heating failed" errors 2016-03-27 07:02:10 -07:00
Scott Lahteine
2e4ddd5c22 Merge pull request #3260 from jbrazio/cleanup/standardize-comment-style
Formatted multi-line comments
2016-03-26 21:42:33 -07:00
jbrazio
443e6d26fe Formatted multi-line comments 2016-03-27 04:36:36 +01:00
Scott Lahteine
ee71f5a320 Merge pull request #3255 from esenapaj/patch-1
Use SBI macro
2016-03-26 17:49:20 -07:00
esenapaj
7950b5268a Use SBI macro 2016-03-26 20:17:52 +09:00
Scott Lahteine
e4039a9b5b Merge pull request #3250 from esenapaj/patch-1
Fix typo
2016-03-26 00:41:31 -07:00
Scott Lahteine
1d987cd280 Merge pull request #3253 from thinkyhead/rc_autotune_menu_optional
Make the Autotune option(s) in the LCD menu optional
2016-03-26 00:32:05 -07:00
Scott Lahteine
d6f92f9efe Remove Tonokip remnant from recent PR 2016-03-25 23:50:29 -07:00
Scott Lahteine
ab412a2153 PIDTEMPBED on #endif 2016-03-25 23:50:28 -07:00
Scott Lahteine
53cc6cca46 Formalize some dependencies on PIDTEMPBED 2016-03-25 23:50:28 -07:00
Scott Lahteine
5955a3063f Sanity check PIDTEMPBED plus BED_LIMIT_SWITCHING 2016-03-25 23:50:28 -07:00
Scott Lahteine
67fabb6044 Merge pull request #3252 from thinkyhead/rc_keepalive_less
Host Keepalive: Reduce frequency of "busy" messages
2016-03-25 23:37:02 -07:00
Scott Lahteine
d1bdd25b84 Merge pull request #3249 from esenapaj/patch-2
Update Japanese translation
2016-03-25 22:53:00 -07:00
Scott Lahteine
0d554c10ac Merge pull request #3244 from ch100/RCBugFix
Fixed backlight for PCF8575.
2016-03-25 22:50:20 -07:00
Scott Lahteine
cd4c3e90bc Send a busy signal every 10 seconds instead of every 2 2016-03-25 22:15:40 -07:00
Scott Lahteine
8cb04816b5 Apply PID_AUTOTUNE_MENU option to ultralcd.cpp 2016-03-25 19:31:56 -07:00
Scott Lahteine
4b31c67dce Add PID_AUTOTUNE_MENU option 2016-03-25 19:31:56 -07:00
Scott Lahteine
e08915a723 Fix comments in Configuration_adv.h 2016-03-25 19:31:31 -07:00
Scott Lahteine
26168676e7 Merge pull request #3246 from thinkyhead/rc_fix_numeric_filenames
Fix: current_command_args skips digits at the front
2016-03-25 16:38:36 -07:00
esenapaj
f54315c728 Fix typo
These are salvaged from closed-PR #3216.
2016-03-26 08:37:17 +09:00
esenapaj
37a0806420 Update Japanese trasration
Follow the PR #3242.
2016-03-26 08:21:17 +09:00
Scott Lahteine
f423716c6a Fix: current_command_args skips digits at the front
Closes #3245
2016-03-25 16:12:41 -07:00
Christian Inci
627f39e1e3 Fixed backlight for PCF8575.
Fixed backlight for PCF8575.

Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com>
2016-03-25 14:49:55 +01:00
Scott Lahteine
fc0baec991 Merge pull request #3240 from esenapaj/patch-1
Fix distribution date
2016-03-25 06:49:42 -07:00
Scott Lahteine
18de9f55ac Merge pull request #3242 from thinkyhead/rc_epatel_mesh_fixes
Updated Mesh Bed Leveling
2016-03-25 06:48:12 -07:00
Scott Lahteine
3a1e6b1752 Merge pull request #3243 from AnHardt/homed
axis_known_position -> axis_homed
2016-03-25 06:36:46 -07:00
Scott Lahteine
1ee76fa981 Merge pull request #3241 from thinkyhead/rc_general_clean
Code cleanup around MOTOR_CURRENT_PWM options
2016-03-25 06:13:35 -07:00
AnHardt
94962ee678 axis_known_position -> axis_homed
In all these cases we want the axis to be homed. If we could have lost
some steps is secondary.

Reenables homing seperate axis with DISABLE_X / DISABLE_Y true.
2016-03-25 14:05:20 +01:00
Edward Patel
14afe1a017 Move to Z=0 for G28 when using Manual Bed Leveling
copy of 406992f9dd
2016-03-25 04:58:44 -07:00
Edward Patel
c606ed447a Add "G29 S4" to fine tune Z level for Mesh Bed Leveling.
Also add mbl.z_offset to the EEPROM, bumping the version to V23.
2016-03-25 04:58:43 -07:00
Scott Lahteine
5d8036e554 Code cleanup around MOTOR_CURRENT_PWM options 2016-03-25 04:23:46 -07:00
esenapaj
bec112de87 Fix distribution date 2016-03-25 18:56:16 +09:00
Scott Lahteine
122bdd187f Merge branch 'RCBugFix' into RC 2016-03-25 01:15:38 -07:00
Scott Lahteine
f394c0639e Merge pull request #3230 from jbrazio/bugfix/ultra-lcd-warning
Fix a compiler warning in ultralcd.cpp
2016-03-25 01:14:54 -07:00
Scott Lahteine
9045ea3adf Merge branch 'RCBugFix' into RC 2016-03-25 01:12:37 -07:00
Scott Lahteine
f52f388bda Merge pull request #3239 from thinkyhead/rc_jbrazio_fanerr
Closes #3235. Fix dogm lcd error when FAN_PIN is defined as -1
2016-03-25 01:11:06 -07:00
João Brázio
f077c7abbf Fix dogm lcd error when FAN_PIN is defined as -1 2016-03-25 01:09:09 -07:00
Scott Lahteine
6f9442afca Merge branch 'RCBugFix' into RC 2016-03-25 01:01:03 -07:00
Scott Lahteine
080c85a4c9 Merge pull request #3236 from thinkyhead/rc_followup_3231
Further cleanup of comments, partial Doxygen-style
2016-03-25 00:53:10 -07:00
Scott Lahteine
0da744b7b0 Further cleanup of comments, partial Doxygen-style
Following up on #3231
2016-03-25 00:45:56 -07:00
Scott Lahteine
4823791eb0 Merge pull request #3228 from esenapaj/patch-1
Fix spelling
2016-03-25 00:40:51 -07:00
Scott Lahteine
af6049c6c2 Merge pull request #3231 from jbrazio/license/add-gpl3-header
Added GPLv3 header to all Marlin files
2016-03-24 22:40:40 -07:00
jbrazio
80f221ed11 Fixed: warning: extra tokens at end of #endif directive 2016-03-24 19:33:25 +00:00
jbrazio
5e5d250832 Added gplv3 header to all Marlin files 2016-03-24 18:01:20 +00:00
esenapaj
89a845659a Fix spelling
PROBABLE ->PROBEABLE
This is follow-up to #3069?
2016-03-25 02:13:37 +09:00
Scott Lahteine
e12a481e35 Prettier summaries in README 2016-03-24 07:47:59 -07:00
Scott Lahteine
c80e5aca30 New README for 1.1.0-RC4 2016-03-24 06:52:14 -07:00
Scott Lahteine
dd4d860ad7 Merge branch 'Release-1.1.0-RC4' into RC 2016-03-24 05:33:32 -07:00
Scott Lahteine
a6e39c1005 Release 1.1.0-RC4 2016-03-24 05:32:33 -07:00
Scott Lahteine
42ec1f39e7 Merge pull request #3207 from jbrazio/bugfix/toshiba-sdhc-flashair
Toshiba Flash Air Wifi SD card support
2016-03-24 05:28:48 -07:00
Scott Lahteine
b6ca86b974 Merge pull request #3197 from PheiPheiPhei/RCBugFix
Enabling servo usage on boards with PWM current control
2016-03-24 05:27:57 -07:00
Scott Lahteine
515c8d4fe9 Merge pull request #3226 from yarda/fix-use-arduino-protocol-for-programming
Use arduino programming protocol by default for sanguino
2016-03-24 05:26:02 -07:00
Scott Lahteine
a6805ddf30 Merge pull request #3225 from yarda/fix-melzi-makr3d
Fix MELZI_MAKR3D to use correct motherboard
2016-03-24 05:24:57 -07:00
Scott Lahteine
d62ba3d87e Merge pull request #3222 from thinkyhead/rc_persist_endstop_enabling
M120/M121 also set endstops non-homing state
2016-03-24 04:41:42 -07:00
Scott Lahteine
af32a7d5d6 M120/M121 also set endstops non-homing state 2016-03-24 03:24:23 -07:00
Scott Lahteine
02f466e633 Merge pull request #3202 from thinkyhead/rc_menu_item_M303_redo
Add Menu Items to initiate M303
2016-03-24 02:41:16 -07:00
Scott Lahteine
04fa9d4f47 Make Autotune options into Menu Edit Items 2016-03-24 02:00:08 -07:00
WPBack
e3f583a3be Fixes for PID AutoTune from menu
Fixes for #3189

Setting a temp is still missing
2016-03-24 01:47:30 -07:00
WPBack
3b3e8a02b5 Initial implementation of PID Autotune Menu Items
Adds the parameter U to M303. If U1 is included , it will use the
PID-values from the auto-tune.
2016-03-24 01:46:37 -07:00
Scott Lahteine
da9d4c4caf Merge pull request #3206 from esenapaj/patch-5
Follow-up the PR #3082, etc
2016-03-24 00:20:25 -07:00
Scott Lahteine
c5857f96c8 Merge pull request #3182 from thinkyhead/rcbugfix_printrboard_revf
Add support for Printrboard RevF
2016-03-24 00:12:06 -07:00
Scott Lahteine
f774420488 Merge pull request #3196 from thinkyhead/rc_controllerfan_bug
Make DISABLE_INACTIVE_X, etc., true if missing
2016-03-24 00:11:46 -07:00
Scott Lahteine
7d55d86081 Merge pull request #3219 from AnHardt/RH-pos-update
Send position updates to RH
2016-03-23 23:20:24 -07:00
Scott Lahteine
7ea4e095ad Merge pull request #3220 from thinkyhead/rc_tori_spelling
Patch minor spelling error in cn, en, gl language file headings
2016-03-23 22:43:11 -07:00
Scott Lahteine
bcbac698f2 Patch minor spelling issue in cn, en, gl language file headings 2016-03-23 22:30:07 -07:00
Scott Lahteine
49ed4696ea Merge pull request #3218 from AnHardt/lost-pin-undef
Fix lost undef Y_MAX_PIN in pins.h
2016-03-23 21:37:51 -07:00
Scott Lahteine
7112f2e41a Merge pull request #3204 from esenapaj/patch-3
Change link to the document
2016-03-23 20:56:52 -07:00
Scott Lahteine
041fc639d7 Merge pull request #3215 from AnHardt/fix-kickstart
Fix Fan KICKSTART
2016-03-23 20:54:58 -07:00
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[]`.
2016-03-23 13:30:50 +01:00
AnHardt
1b336971ae Fix lost undef Y_MAX_PIN in pins.h 2016-03-23 12:48:06 +01:00
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.
2016-03-23 12:08:02 +01:00
Scott Lahteine
cbce025248 Merge pull request #3217 from thinkyhead/rc_updated_kana
Patch-up to commits for Kana #3203.
Closes #3203.
2016-03-23 02:46:26 -07:00
esenapaj
665338bb69 Update Japanese translation 2016-03-23 02:43:53 -07:00
Scott Lahteine
97ed8abd3f Merge pull request #3213 from AnHardt/extend-gitignore
Extend .gitignore
2016-03-23 00:34:30 -07:00
Scott Lahteine
b705ae0cb0 Merge pull request #3210 from thinkyhead/rc_cleanup_travis_ci
Improve Travis CI test
2016-03-23 00:32:45 -07:00
Scott Lahteine
1cd1ccbf86 Enable/disable multiple options on a single line. 2016-03-22 22:33:00 -07:00
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
2016-03-22 22:23:07 -07:00
AnHardt
0c8e747f88 extend .gitignore 2016-03-22 17:05:45 +01:00
Scott Lahteine
815943ceed Merge pull request #3209 from AnHardt/call-buzz-direct
Call buzz() directly from M428
2016-03-22 08:04:30 -07:00
AnHardt
6486e8b74a Call buzz() directly from M428 2016-03-22 15:05:04 +01:00
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
Scott Lahteine
09ef955191 Merge pull request #3086 from thinkyhead/rc_two_fans
Support for multiple PWM fans
2016-03-19 03:19:18 -07:00
Scott Lahteine
38b0082bf2 Additional tweaks to M42 exit conditions 2016-03-19 03:10:18 -07:00
Scott Lahteine
4bbea5124d Support for multiple PWM fans 2016-03-19 03:10:18 -07:00
Scott Lahteine
637cc03686 Fix M109 so it won't wait for cooling
Addressing issue #2767
2016-03-19 03:00:58 -07:00
AnHardt
3f45a1acf9 Check probes only when deployed
Aim: Test probes in update_endstops only when activated

Changes:
Configurations
 Add define for FIX_MOUNTED_PROBE to handle the situation where formerly ENDSTOPS_ONLY_FOR_HOMING had to be set, or lowering the nozzle below Z_PROBE_OFFSET_FROM_EXTRUDER could give an "endstop hit" message.
 Add define for Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to indicate a common situation, that we have a probe but it is connected to an endstop pin
 Add some comments
 Shift some entries to have related things together.

Conditionals.h
 We have a probe (HAS_Z_MIN_PROBE) if one of the pins is defined AND one of the probes is defined.

SanityCheck.h
 Add some tests if the probe is connected and if we have defined a probe.

stepper.cpp
 Changes to test the probe only when it is deployed (z_probe_is_active).
 Test update_endstops() when the probe is deployed.

MarlinMain.cpp
 a. set and reset z_probe_is_active in deploy_z_probe(), stow_z_probe() and dock_sled()
 b. set and reset z_probe_is_active in the case a z-servo is moved to a defined position. The only remaining unhandled servo move is in M280 where we do not end in a defined position. If you want to handle a probe use M401/402
 c. skip deploying/stowing when already deployed/stowed in the dedicated deploy/stow functions.
 d. Handle the new FIX_MOUNTED_PROBE in parallel to a servo driven probe/endstop.

 To do: In another PR. handle all probes in deploy/stow_z_probe.
 Sort out SERVO_LEVELING vs. HAS_SERVO_ENDSTOPS.
2016-03-19 02:00:08 -07:00
Scott Lahteine
4634feaeab Merge pull request #3012 from thinkyhead/fix_command_injection
Use a serial line buffer to prevent queue corruption
2016-03-19 01:43:54 -07:00
Scott Lahteine
9bf87aac6a Merge pull request #3127 from thinkyhead/rc_core_babystepping
Implement BABYSTEPPING for COREXY and COREXZ
2016-03-18 23:25:26 -07:00
Scott Lahteine
4ae03df5c2 Merge pull request #3109 from thinkyhead/rc_host_keepalive
Provide feedback to hosts when busy
2016-03-18 23:22:29 -07:00
Scott Lahteine
963a92ceda Patch idle forevermore 2016-03-18 22:38:35 -07:00
Scott Lahteine
7ec7bb31c4 Send a Busy signal to hosts during long processes, wait for input, etc
If Marlin is blocking the serial input or command queue for any length
of time (for example more than 2 seconds), it needs to send a message
to serial out to inform the host that it is busy. Marlin should only
send these messages out when busy, and preferably not when trying to
print formatted output.
2016-03-18 22:38:35 -07:00
Scott Lahteine
861391d530 Merge pull request #3175 from esenapaj/patch-2
follow-up the PR #3114
2016-03-18 22:10:50 -07:00
esenapaj
8d580ea7e8 follow-up the PR #3114
follow-up the commit d56c6af24e
2016-03-19 13:17:34 +09:00
Scott Lahteine
d9e1f22682 BABYSTEPPING requires ULTRA_LCD 2016-03-18 18:22:53 -07:00
Scott Lahteine
e5fd43f343 Implement BABYSTEPPING for COREXY and COREXZ 2016-03-18 18:22:53 -07:00
Scott Lahteine
80277cc9c8 drain_queued_commands_P now returns true if there are more 2016-03-18 17:56:48 -07:00
Scott Lahteine
8fe7420310 Use a separate serial line buffer 2016-03-18 16:46:20 -07:00
Scott Lahteine
7d25c107a8 Merge pull request #3149 from esenapaj/patch-1
suppress warnings
2016-03-18 15:40:14 -07:00
Scott Lahteine
d56c6af24e Merge pull request #3114 from thinkyhead/rc_reverse_lcd_menu
Option to reverse the click-wheel direction in menus
2016-03-18 15:39:29 -07:00
Scott Lahteine
cc291aeb3c Move definition of "blink" to main ultralcd file 2016-03-17 18:19:05 -07:00
Scott Lahteine
e7e1866589 Merge pull request #3161 from Alex9779/fix_InitialExtruderDirection
Fix initial extruder direction for second/third/fourth extruder if they run inverted to the first
2016-03-16 12:58:10 -07:00
Scott Lahteine
57e82cacc9 Merge pull request #3156 from esenapaj/patch-3
Fix CardReader::lsDive()
2016-03-16 12:48:22 -07:00
Alexander Leisentritt
4338813814 save last extruder and set stepper directions too in case the extruder changed
fixes MarlinFirmware/Marlin#3144 and MarlinFirmware/Marlin#3083
2016-03-16 20:20:34 +01:00
Scott Lahteine
8f24475e02 Simplify limiting encoderLine in END_MENU 2016-03-16 04:05:41 -07:00
Scott Lahteine
fbef2f5b61 Implement reverse menu direction in ultralcd.cpp 2016-03-16 04:03:49 -07:00
Scott Lahteine
b8b51d8da8 Add the REVERSE_MENU_DIRECTION option 2016-03-16 04:02:40 -07:00
Scott Lahteine
999a76dbdf Merge pull request #3157 from esenapaj/patch-4
Use variable in lcd_erase_line()
2016-03-16 02:46:42 -07:00
Scott Lahteine
e8fa843c2d Merge pull request #3164 from epatel/epatel/RCBugFix
Fix for #3160 MESH_BED_LEVELING broke correct G1 movement in Z
2016-03-16 02:40:54 -07:00
Scott Lahteine
fc04b587cf Merge pull request #3147 from thinkyhead/rc_stringify_macro
Promote STRINGIFY to macros.h
2016-03-15 17:37:03 -07:00
Scott Lahteine
d7c6fd5c2f Merge pull request #3146 from thinkyhead/rc_enabled_true_false
Support "true" and "false" in the ENABLED macro
2016-03-15 17:35:55 -07:00
Edward Patel
cb0dbfa3b5 Fix for #3160 MESH_BED_LEVELING broke correct G1 movement in Z 2016-03-16 01:26:00 +01:00
esenapaj
a15c5d222a Use variable in lcd_erase_line()
lcd_erase_line() is called with argument, but the argument is ignored by lcd_erase_line().
2016-03-16 02:59:06 +09:00
esenapaj
609c0d46d9 Fix CardReader::lsDive()
If comparison between signed char(-128 ~ +127) and DIR_NAME_DELETED(uint8_t const 0XE5, it's +229),
it makes incorrect result.
2016-03-16 02:47:58 +09:00
Roxy-3DPrintBoard
3ba9b06b79 Update README.md 2016-03-15 09:12:06 -05:00
Roxy-3DPrintBoard
5286e73f29 Update README.md 2016-03-15 09:10:57 -05:00
Scott Lahteine
2ef49a9d53 Wrap DEFAULT_Ki, DEFAULT_Kd, PID_dT
Addition to #3140
2016-03-15 03:49:44 -07:00
Scott Lahteine
eb8cf29464 Merge pull request #3151 from hydrocat/RCBugFix
Uptades the pt-br translation
2016-03-15 02:46:46 -07:00
Scott Lahteine
91cdea4022 Merge pull request #3153 from thinkyhead/rc_fix_macro_expansion
Additional macro wrapping, patches for #3140
2016-03-15 01:37:28 -07:00
Scott Lahteine
6e1bc03d3b Additional wrapping for #3140 2016-03-15 01:18:58 -07:00
Scott Lahteine
cc9968f893 Patch spacing in #3140 2016-03-15 01:18:58 -07:00
Scott Lahteine
1c384930f3 Merge pull request #3140 from thinkyhead/rc_fix_macro_expansion
Wrap macros to prevent bad expansions
2016-03-15 00:25:34 -07:00
Scott Lahteine
ff30a18d9c Merge pull request #3150 from esenapaj/patch-2
Use local variable in recalc_delta_settings()
2016-03-14 18:55:57 -07:00
VITORIO MIGUEL PRIETO CILIA
de2cca73ac Uptades the pt-br translation 2016-03-14 21:16:57 -03:00
esenapaj
a4314c4907 Use local variable in recalc_delta_settings()
diagonal_rod hadn't been used anywhere.
2016-03-15 06:47:27 +09:00
esenapaj
8de7a6f9b1 suppress warnings 2016-03-15 06:34:02 +09:00
Scott Lahteine
21be07a6f6 Merge pull request #3126 from Blue-Marlin/stackoverflow-with-e
Extend stack_overflow_protection for lcd_move_e and _lcd_level_bed
2016-03-14 00:04:13 -07:00
Scott Lahteine
9418b4f2f3 Promote STRINGIFY to macros.h 2016-03-13 23:15:17 -07:00
Scott Lahteine
4b648793f2 Use ENABLED with DISABLE_[INACTIVE_][XYZ] 2016-03-13 22:15:45 -07:00
Scott Lahteine
73a59a4e45 Allow ENABLED(b) to work with "true" and "false" 2016-03-13 22:15:01 -07:00
Blue-Marlin
c73f1b2471 Extend stack_overflow_protection for lcd_move_e and _lcd_level_bed
Extend stack_overflow_protection for lcd_move_e() and _lcd_level_bed() with
a refined method of 3050.
2016-03-13 13:59:44 +01:00
Scott Lahteine
f4a3efd35e Merge pull request #3116 from thinkyhead/rc_fix_value_edit_bug
Fix value edit click bug
2016-03-13 04:08:43 -07:00
Scott Lahteine
3f5fbbd398 Merge pull request #3124 from jbrazio/bugfix/update-g29-auto-level-bed-topography
Update the bed topography output done by G29
2016-03-13 03:51:43 -07:00
Scott Lahteine
c16c47954c Merge pull request #3141 from esenapaj2/RCBugFix
follow-up the PR #3131
2016-03-13 03:37:39 -07:00
Scott Lahteine
30c3a21d1f Merge pull request #3112 from thinkyhead/rc_support_MAX31855 2016-03-13 03:30:48 -07:00
Scott Lahteine
81d759efb6 Merge pull request #3138 from jbrazio/bugfix/m109-r-could-wait-forever 2016-03-13 03:26:34 -07:00
Scott Lahteine
2179f598bf Merge pull request #3122 from thinkyhead/rc_group_filament_change 2016-03-13 03:25:38 -07:00
Scott Lahteine
62a9b9902d Merge pull request #3133 from thinkyhead/rc_machine_uuid_in_m115 2016-03-13 03:23:54 -07:00
Scott Lahteine
f928894c38 Merge pull request #3132 from thinkyhead/rc_heating_failed_err 2016-03-13 03:23:14 -07:00
esenapaj2
236a44c83b follow-up the PR #3131
follow-up the commit 7326d63ce0
update Configration_adv.h of Hephestos2
delete unnecessary spaces
2016-03-13 19:12:39 +09:00
Scott Lahteine
7326d63ce0 Merge pull request #3131 from thinkyhead/pwm_motor_current_config
PWM_MOTOR_CURRENT Flag
2016-03-13 00:03:03 -08:00
Scott Lahteine
f9ded2a7c4 Wrap macros to prevent bad expansions 2016-03-12 22:38:55 -08:00
jbrazio
a645860431 All print timer related activity now uses print_job_start(), print_job_timer() or print_job_stop() 2016-03-12 07:16:39 +00:00
jbrazio
1981e53d68 M109 R option if misused could cause a wait-forever situation 2016-03-12 06:24:24 +00:00
Scott Lahteine
7976e29399 Use MACHINE_UUID in M115
Addressing #2879. The M115 report should display `MACHINE_UUID` but it
always displays `UUID`.
2016-03-11 05:34:48 -08:00
Scott Lahteine
81aab828e2 Fix a "Heating failed" error
Addressing #3085. If the target_temperature is set directly it never invokes or disables the timer set in `start_watching_heater`, so after _stopping a print_ or turning off _all heaters_ you could get a “Heating failed” error.
2016-03-11 05:07:48 -08:00
Scott Lahteine
0c48eaf3de Expose motor current in more configs, disable by default 2016-03-11 02:25:36 -08:00
Elijah Snyder
e8b10d2836 Adding PWM_MOTOR_CURRENT flag to help expose PWM_MOTOR_CURRENTS in Configuration_adv.h similar to DIGIPOT_MOTOR_CURRENT 2016-03-11 02:25:36 -08:00
Scott Lahteine
7bb7ac8353 Merge pull request #3123 from thinkyhead/rc_move_stepper_macros
Move step macros to stepper_indirection.h
2016-03-10 18:31:01 -08:00
Scott Lahteine
cd2ef25032 Merge pull request #3119 from AnHardt/extend-Travis-for-SDSUPPORT 2016-03-10 05:38:35 -08:00
João Brázio
4d4a842cfb Update the bed topography output done by G29 2016-03-10 13:24:17 +00:00
Scott Lahteine
89838cdb10 Move step macros to stepper_indirection.h 2016-03-10 04:34:55 -08:00
Scott Lahteine
70a41a8532 Merge pull request #3121 from thinkyhead/rc_stepper_cleanup
Reduce code in stepper.cpp with some macros
2016-03-10 03:55:37 -08:00
João Brázio
793cd0ae3b Clean up the code a bit 2016-03-10 11:52:43 +00:00
Scott Lahteine
27f244ba2c Support MAX31855 as Temperature Sensor -3 2016-03-10 02:49:54 -08:00
Scott Lahteine
ce639b8b03 Group FILAMENT_SENSOR options together 2016-03-10 02:41:37 -08:00
Scott Lahteine
3fd31976c3 Reduce code in stepper.cpp with macros 2016-03-10 01:42:58 -08:00
Scott Lahteine
b45a0c4c60 Fix bugs in edit submenus so they return to origin
Expected behavior: After editing a value the menu should return to the
previous place with the edited item selected.
Actual behavior: Either the top (back) item from the previous screen is
selected, or the menu jumps up another level.
Solution: Pass the correct arguments to `lcd_goto_menu` on click when
editing a value.
2016-03-09 21:06:56 -08:00
AnHardt
25d1c94fa8 Add SDSUPPORT test to TRAVIS 2016-03-10 03:06:00 +01:00
Scott Lahteine
bedd4dab6a Merge pull request #3107 from AnHardt/z_raise_before_homing
Z_RAISE_BEFORE_HOMING -> MIN_Z_HEIGHT_FOR_HOMING
2016-03-08 19:21:43 -08:00
jbrazio
986b508ff7 Print timer now stops when it sees the last extruder temperature being shutdown 2016-03-08 18:11:02 +00:00
AnHardt
fd5414c6ea Z_RAISE_BEFORE_HOMING -> MIN_Z_HEIGHT_FOR_HOMING
rebased
corrected spelling
changed to #elif for error

Still with MIN_Z_HEIGHT_FOR_HOMING but con be done with (folder wide) search-replace when we have a better name.
2016-03-08 17:50:23 +01:00
Scott Lahteine
b7928a000a Merge pull request #3108 from AnHardt/M110+
M110 and M29 rework
2016-03-08 03:54:07 -08:00
Scott Lahteine
5cba0b4187 Merge pull request #3111 from thinkyhead/rc_drop_old_condition
Drop obsolete test for leading "N"
2016-03-08 03:07:25 -08:00
Scott Lahteine
302d1bfbc4 Drop obsolete test for leading "N" 2016-03-08 02:25:11 -08:00
Scott Lahteine
04b147645d Merge pull request #3105 from esenapaj2/esenapaj2-patch-1
update example configurations
2016-03-08 00:43:48 -08:00
AnHardt
37b857e8ec M110 ang M29 rework
Add 'ok' output for G29 actually closing the file.
Handle M110 when received without linenumber/checksumm.
2016-03-07 22:27:01 +01:00
esenapaj2
29e09c7c3e update example configurations
update old comments
update or delete deprecated definitions
complement forgotten updates
adjust spacing
some cosmetic changes
2016-03-07 22:03:33 +09:00
Scott Lahteine
fac85f6fa1 Merge pull request #3102 from jbrazio/bugfix-g28-multiple-z-movements
Bugfix: G28 was lifting Z-axis multiple times
2016-03-07 03:52:00 -08:00
jbrazio
642e3699ce Z-axis was being lift multiple times if Z_SAFE_HOMING was enabled and Z_RAISE_BEFORE_HOMING was greater than zero 2016-03-07 03:49:11 +00:00
Scott Lahteine
501f63802a Merge pull request #3077 from Blue-Marlin/watchdogreset-in-kill
Add Watchdog timer reset in kill()
2016-03-06 16:21:39 -08:00
Scott Lahteine
c23db208d9 Merge pull request #3101 from thinkyhead/rc_fix_stepper_func
Update name of st_get_axis_position_mm in stepper.h
2016-03-06 15:52:57 -08:00
Scott Lahteine
1002eb67c8 Update name of st_get_axis_position_mm in stepper.h 2016-03-06 15:46:39 -08:00
Jaroslav Škarvada
2cbcba1808 Use arduino programming protocol by default for sanguino
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2016-03-06 20:26:09 +01:00
Jaroslav Škarvada
d229c58df6 Fixed Makefile to work with Melzi2 boards on arduino-1.6.x
- also by default use ${HOME}/Arduino as install directory which may be more
sane, especially with arduino packages provided by distributions
- bump arduino version to 106 (this seems to be useless)
- program firmware through the USB serial which is more comfortable way how
to program the firmware
- use 57600 programing speed by default which seems to be more reliable
with arduino bootloaders (at least with those shipped with the Melzi2 boards)

Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2016-03-06 20:12:01 +01:00
Jaroslav Škarvada
7dde761aa6 Fix MELZI_MAKR3D to use correct motherboard
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2016-03-06 19:33:33 +01:00
Scott Lahteine
eafbc5e0cc Add AJ4P pins and fix RAMBO pins 2016-03-06 05:52:01 -08:00
Scott Lahteine
cf792fd8d8 Update configurations to use RAMPS 1.4 2016-03-06 05:52:01 -08:00
Scott Lahteine
cacf04f8a7 Base RAMPS-like boards on RAMPS 1.4 2016-03-06 05:52:00 -08:00
Scott Lahteine
50e3482e0a Handle RAMPS 1.3 as the special case 2016-03-06 05:52:00 -08:00
Scott Lahteine
679be3294f Rename RAMPS 1.3 pins for RAMPS 1.4 2016-03-06 05:52:00 -08:00
Scott Lahteine
f18d3f451a Limit LCD move_to_x/y coordinates for deltas
Related to MarlinFirmware/MarlinDev#270
2016-03-06 05:52:00 -08:00
Scott Lahteine
988332c67a Cosmetic tweaks from dev 2016-03-06 05:52:00 -08:00
Scott Lahteine
2690d8568e DOGLCD width/height in Conditionals.h 2016-03-06 05:51:59 -08:00
Scott Lahteine
614febaaf3 Fix acceleration limits
See: https://github.com/Ultimaker/Marlin/pull/7
2016-03-06 05:51:59 -08:00
Scott Lahteine
13ef12ad3f Fix power calculations
As suggested by @max-pau in #3073 - #3074
2016-03-06 05:51:59 -08:00
Scott Lahteine
e2b022cce2 Include #3053 2016-03-06 05:51:59 -08:00
Scott Lahteine
5cba0210f2 Small patch to Z_SAFE_HOMING comment 2016-03-06 05:51:58 -08:00
Scott Lahteine
6165fd41a5 Fix Hephestos 2 and other configs 2016-03-06 05:51:58 -08:00
Scott Lahteine
71718d888a Fix typos in check_axes_activity 2016-03-06 05:51:58 -08:00
Lukas Abfalterer
83795d3e63 deleted double used comments 2016-03-06 05:51:58 -08:00
jbrazio
143ad74db7 Update PROBE_OFFSET_FROM_EXTRUDER comment section in all example config
files.
2016-03-06 05:51:58 -08:00
jbrazio
b0f5ba0232 Update the PROBE_OFFSET_FROM_EXTRUDE comment section
This changes have being discussed at MarlinFirmware/Marlin#2849.
2016-03-06 05:51:57 -08:00
jbrazio
02b131b552 Replaced stock BQ PID values with fine tuned ones generated using M303 2016-03-06 05:51:57 -08:00
jbrazio
45dc8a51f3 Added readme file for bqh2 and disabled the SLOWDOWN config flag 2016-03-06 05:51:57 -08:00
Scott Lahteine
6a21180bd4 Implemented BQ ZUM Mega 3D board layout as an override to RAMPS 1.3 2016-03-06 05:51:57 -08:00
jbrazio
b18816fcbf Fine tuned XYJERK.
Disallowed the Z_PROBE_OFFSET_RANGE_MAX to be greater than zero.
2016-03-06 05:51:57 -08:00
jbrazio
be83036212 Applying suggestions by @thinkyhead at MarlinFirmware/Marlin#3049.
- Remove the forced activation of SDSUPPORT, I guess people may use the ZUM
3D board and not the LCD module.
 - Fixed the tab issue within boards.h file.
2016-03-06 05:51:56 -08:00
jbrazio
b82d91eca6 Added configuration example for the BQ Hephestos 2 3D printer.
Added support for BQ ZUM Mega 3D board and stock Hephestos 2 thermistor.
2016-03-06 05:51:56 -08:00
Scott Lahteine
45bcc43e48 Don't override SOURCE_CODE_URL in Default_Version.h
- Defining `SOURCE_CODE_URL` in `Default_Version.h` overrides it
elsewhere. So don’t define it there.
- Also fix up `language.h` so no `#undef` will be needed.
2016-03-06 05:51:56 -08:00
Scott Lahteine
ef68c1910c Check that the temperature is close to target 2016-03-06 05:51:56 -08:00
Scott Lahteine
ea9fd1200b Fix M109 so it won't wait for cooling
Addressing issue #2767
2016-03-06 05:51:56 -08:00
Scott Lahteine
e4945b30d2 sbi and cbi are deprecated 2016-03-06 05:51:55 -08:00
Scott Lahteine
ff13070b59 Use _BV macros, patch up others 2016-03-06 05:51:55 -08:00
Scott Lahteine
209f5f21e0 Use macros where possible
Apply `constrain`, `NOMORE`, `NOLESS` and `CRITICAL_SECTION` macros
wherever possible.
2016-03-06 05:51:55 -08:00
Scott Lahteine
c8f76bb8aa Create BITSET/BITCLR macros 2016-03-06 05:51:55 -08:00
Scott Lahteine
adc25db8c4 Merge pull request #3005 from thinkyhead/rcbugfix_eeprom
Fix layout descr. in configuration_store.cpp
2016-03-06 00:31:44 -08:00
Scott Lahteine
e7cf85b922 Merge pull request #3013 from thinkyhead/esenapaj-patch-1
Enhanced #3010 - formal Mesh/Manual dependency
2016-03-06 00:30:02 -08:00
Scott Lahteine
6e64895c30 Merge pull request #3001 from AlwaysTinkering/RCBugFix
Rc bug fix - Fix for issue #2931
2016-03-06 00:20:29 -08:00
Scott Lahteine
34b8b9f0f5 Merge pull request #2995 from thinkyhead/rcbugfix_corexy_corexz
Add CORE support to st_get_position_mm (and elsewhere)
2016-03-06 00:17:03 -08:00
Scott Lahteine
1e20949afb Merge pull request #3092 from thinkyhead/rc_2860_printrbot_lcd
Fix Printrboard with LCD (redo)
2016-03-06 00:14:29 -08:00
Scott Lahteine
f5972c4d2c Merge pull request #2994 from AnHardt/Inerrup-save-serial
Interrupt safe serial --- Guard against non-atomic variable changes from interrupt routines
2016-03-05 22:25:12 -08:00
Scott Lahteine
3a3d358df9 Fix Printrboard with LCD (redo)
Based on #2860 - rebased for RCBugFix
2016-03-05 22:13:00 -08:00
Scott Lahteine
eb85342fd9 Merge pull request #2989 from AnHardt/fix2661
Pre home display - Stepper release
2016-03-05 21:30:17 -08:00
Scott Lahteine
14f3ca1b2e Merge pull request #2978 from thinkyhead/tool_offset_abl_rcbugfix
Apply bed leveling matrix when switching extruders
2016-03-05 21:23:25 -08:00
Scott Lahteine
91fcdc2b99 Merge pull request #3090 from thinkyhead/rc_spelling
Various minor spelling corrections
2016-03-05 20:50:34 -08:00
Scott Lahteine
772460a7b8 Various minor spelling corrections
Redo of #2939 rebased against RCBugFix
2016-03-05 20:41:15 -08:00
Scott Lahteine
aa0b0483f4 Merge pull request #3089 from thinkyhead/rc_apply_2924
Correct raise_z_for_servo for Z offsets below the nozzle
2016-03-05 20:23:14 -08:00
lrpirlet
0fb507a75d correct raise_z_for_servo 2016-03-05 20:19:53 -08:00
Scott Lahteine
04a0d45c22 Merge pull request #2821 from MarlinFirmware/ReinitializeDisplay
Fix status LEDs update when reinitializing the display
2016-03-05 15:31:49 -08:00
Blue-Marlin
b4e5e0f11d Add Watchdog reset in kill()
Add watchdog reset in the kill loop to simplify recovering.
2016-03-04 00:35:18 +01:00
Scott Lahteine
547d35a921 Merge pull request #3067 from Blue-Marlin/ALARM_PIN
Remove unused ALARM_PIN
2016-03-02 20:20:26 -08:00
Scott Lahteine
79778d46d9 Merge pull request #3066 from Blue-Marlin/Fix-disable_all_heaters()
Fix disable_all_heaters() for MAX6675
2016-03-02 17:35:08 -08:00
Blue-Marlin
a68228bf55 Remove unused ALARM_PIN
Remove unused ALARM_PIN from all the Configuration.h's
2016-03-02 14:29:49 +01:00
Scott Lahteine
9eb4aceee4 Merge pull request #2986 from thinkyhead/enable_watchdog
Enable USE_WATCHDOG by default
2016-03-02 05:29:42 -08:00
Blue-Marlin
0631541166 Fix disable_all_heaters() for MAX6675 2016-03-02 14:17:23 +01:00
Scott Lahteine
222d13d5ed Merge pull request #3051 from thinkyhead/rcbugfix_dual_axis_offset
Code cleanup in gcode_T
2016-03-02 03:45:40 -08:00
Scott Lahteine
186629aee8 Merge pull request #3057 from jbrazio/3034-z_raise_after_probing_fix
Fix Z_RAISE_AFTER_PROBING for non DELTA printers
2016-03-02 03:14:27 -08:00
Scott Lahteine
a42fb35c56 Merge pull request #3050 from Blue-Marlin/fix-1166
Temporary workaround for stack overflow
2016-03-01 11:33:19 -08:00
jbrazio
67e15aac3d As pointed out by @Blue-Marlin the previous code would raise the Z axis
twice for a servo based probe.
2016-03-01 00:22:48 +00:00
jbrazio
17cc2a9663 Z_RAISE_AFTER_PROBING value was being ignored by Marlin because
raise_z_after_probing() was only called if the printer type was set to a
DELTA or if the printer had a docking sled for the probe.
2016-02-29 15:48:26 +00:00
Scott Lahteine
252f4a75cd Merge pull request #3043 from oxivanisher/RCBugFix
Example configuration for Kossel XL
2016-02-28 23:57:13 -08:00
Scott Lahteine
fd1243c184 Merge pull request #3052 from thinkyhead/rc_fix_m145_eeprom_output
Fix "M145" output in M503 report
2016-02-28 23:43:08 -08:00
Scott Lahteine
0bc648353f Merge pull request #3031 from tnw513/RCBugFix
Fix board type for Hephestos: RAMPS 1.4
2016-02-28 23:23:01 -08:00
AnHardt
f27c2b6b4b Reimplement #2892
Include #2892 to fix the isHeating symbol in the extruder graphics
2016-02-28 23:20:30 +01:00
AnHardt
615bec2329 Activate warning about possible reduced accuracy by default
Renamed `WARN_REDUCED_ACCURACY` to `DISABLE_REDUCED_ACCURACY_WARNING`

Changed the condition for blinking from
```
#if ENABLED(WARN_REDUCED_ACCURACY)
```
to
```
#if DISABLED(DISABLE_REDUCED_ACCURACY_WARNING)
```
2016-02-28 23:20:21 +01:00
AnHardt
1c889cd303 Refresh previous_cmd_ms during run_z_probe()
Refresh previous_cmd_ms during run_z_probe() to prevent:
stepper shutdown for expired DEFAULT_STEPPER_DEACTIVE_TIME
and extrudes for expired EXTRUDER_RUNOUT_SECONDS
(https://github.com/MarlinFirmware/MarlinDev/issues/238)
2016-02-28 23:20:12 +01:00
AnHardt
4b02f33e69 Distribute config-changes to the other configurations 2016-02-28 23:20:04 +01:00
AnHardt
be24fdacea The same changes to the axis-letters now for the char-displays
Exactly the same - copy/paste.
2016-02-28 23:19:54 +01:00
AnHardt
5b0f659355 Changes for graphics displays
Replaced displaying "---" instead of the value of a coordinate when
unhomed or with reduced precision
with blinking the coordinate-prefix-character ('X','Y','Z').
For "unhomed" a '?' is shown every second second - until that axis is
homed. The value displayed is, as before the "---" where displayed, the
relative to the reset position coordinate value.
When the axis stepper was disabled, now we can display a hint on that,
by showing a blinking ' ' instead of the axis letter, when
WARN_REDUCED_ACCURACY is defined.

I suppose the code itself is here the better documentation.

A '+/-' character is in non of our charsets so i decided for a '?' for
now to reduce the work.
There is no additional space on the displays one could use to display
the information, so replacing something is the only option. As the axis
letters are totally redundant with their positions on the display they
contain the least information.
So my decision was to overwrite them.
2016-02-28 23:19:32 +01:00
AnHardt
32ae9f9ab7 Fix stepper shutdown during waiting for temperatures
In the wait loops of M109 M190 idle() is called, what checks
stepper_inactive_time against previous_cmd_ms.
Because we can be several minutes inside the loop, resetting
previous_cmd_ms only outside the loop caused stepper shutdowns.

The name of previous_cmd_ms does not really reflect its use. It's set
not only when a new command was received or executed but also in many of
the movement routines. For that the little extension of using it during
the wait will (hopefully) not hurt.

# Conflicts:
#	Marlin/Configuration_adv.h
2016-02-28 16:58:50 +01:00
AnHardt
b6e69e71ce Make stepper shutdown after inactivity dependent
Make stepper shutdown after inactivity dependent on a new set of
#defines.
DISABLE_INACTIV_X
DISABLE_INACTIV_Y
DISABLE_INACTIV_Z
DISABLE_INACTIV_E

And make exemplaric Configuration.
Names can be discussed.

This makes the disabling of the steppers independent from the DISABLE_?
settings witch shut down the steppers immediately.
2016-02-28 16:58:42 +01:00
AnHardt
051325ccd7 Introduce axis_homed
Introduce additional variable axis_homed to replace axix_known_position
when the coordinate display should indicate the axis is not homed.
This is to distinguish between "not homed" and "inexact position possible
because stepper was disabled".

# Conflicts:
#	Marlin/ultralcd_implementation_hitachi_HD44780.h
solved
2016-02-28 16:58:28 +01:00
AnHardt
e736779d7e blink for char-lcds
Implement and test blinking for char-lcds

# Conflicts:
#	Marlin/ultralcd_implementation_hitachi_HD44780.h
solved
2016-02-28 16:58:19 +01:00
Scott Lahteine
7253a1971d Fix "M145" output in M503 report 2016-02-27 22:28:08 -08:00
Scott Lahteine
d118e3f985 Merge pull request #3044 from thinkyhead/rc_gcode_spaces
Fix GCode handling of spaces between command letter and first digit
2016-02-27 22:21:28 -08:00
Scott Lahteine
100271e6ac minor cleanup in gcode_T 2016-02-27 19:56:56 -08:00
Blue-Marlin
fd9e94e5a4 Fix crashes when the Z axis is moved via LCD
Fix crashes when the Z axis is moved via LCD
by calling `plan_buffer_line` only when there is enough room in the
planner buffer, to avoid endless recursion.
A brief description about what went wrong is in #1166
2016-02-28 00:59:47 +01:00
Scott Lahteine
8dccd5a7ea Merge pull request #3018 from CONSULitAS/RCBugFix_K8200_backinsync
K8200: sample config back in sync
2016-02-27 05:22:12 -08:00
Scott Lahteine
6a4f06d35d Fix GCode handling of spaces between command letter and first digit 2016-02-26 18:42:59 -08:00
Marc Urben
68eae2b5a8 added kossel xl example configuration 2016-02-27 01:48:45 +01:00
Silvio Didonna
eb5817675d Fix board type: RAMPS 1.4 2016-02-25 15:52:41 +01:00
Scott Lahteine
8006684c19 Merge pull request #3027 from CONSULitAS/RCBugFix_current_command
Fix: current_command_args contains command
2016-02-24 17:43:38 -08:00
AnHardt
cb88fdd242 Protect MarlinSerial against interrupts
Protect MarlinSerial against interrupts
by shielding the CRITICAL_SECTIONs

Now with a test if RX_BUFFER_SIZE is in the required range.
Code in peek() and read() is now optimized for readability and showing the similarity between the two.

Maybe a bit overprotected in checkRx() and store_char(), but now some days without detected errors from this source.
2016-02-24 17:18:12 +01:00
AnHardt
dc0f41868e Make rx tail/head atomic 2016-02-24 15:51:34 +01:00
CONSULitAS
ea8409ad5d Fix: current_command_args contains command
@thinkyhead
Hi Scott,
your code from a0f362c@thinkyhead is great, but you forgot to skip the
command.
Symptom `M117 Test`shows `M117 Test` on LCD instead of `Test`.

see also
https://github.com/MarlinFirmware/Marlin/commit/a0f362c735401ebbcd95de3f
6f8e3c2f17ecc770 lines 941, 2851 and so on

Greetings and welcome back

Jochen
2016-02-24 09:35:04 +01:00
Scott Lahteine
9a3408e58f Merge pull request #3024 from thinkyhead/rc_remove_steps_mm_e
Remove obsolete STEPS_MM_E setting
2016-02-23 23:37:09 -08:00
Scott Lahteine
1093c780c8 Remove obsolete STEPS_MM_E setting 2016-02-23 01:11:58 -08:00
CONSULitAS
a4fe6a45ae K8200: sample config back in sync
* Configuration.h:
  * updated header comment
  * new UUID feature used
  * sync to default config
  * typos fixed
  * changes better documented
  * reflect change in SDSUPPORT feature
* Configuration_adv.h
  * updated header comment
  * thermal protection tuned to work with K8200
  * homing tuned
  * sync to default config
  * typos fixed
  * changes better documented
  * reflect change in LCD features
  * use long filenames
  * use Watchdog
  * use Babystepping
  * use Auto Filament Change
2016-02-21 16:06:25 +01:00
Scott Lahteine
c2e5c6c12c Nest Manual Bed Leveling options
This formalizes the dependency of MANUAL_BED_LEVELING on
MESH_BED_LEVELING
2016-02-20 20:35:10 -08:00
Scott Lahteine
042a6a0a37 Extend existing MESH_BED_LEVELING test 2016-02-20 20:35:10 -08:00
esenapaj
08b3147791 sanity check for MANUAL_BED_LEVELING 2016-02-20 20:35:10 -08:00
Scott Lahteine
9f8e6dce20 Merge pull request #2942 from esenapaj/esenapaj-patch-2
more suitable display format for delta printer
2016-02-18 17:59:35 -08:00
Scott Lahteine
e1beaf61eb Merge pull request #2985 from AnHardt/adv-ok
Repair N in ADVANCED_OK
2016-02-18 17:06:26 -08:00
esenapaj
34cde1b77c Merge pull request #14 from MarlinFirmware/RCBugFix
Rc bug fix
2016-02-19 09:19:23 +09:00
Scott Lahteine
f00ca3fd89 Fix layout descr. in configuration_store.cpp 2016-02-17 19:44:04 -08:00
Scott Lahteine
0c9db67273 Merge pull request #2983 from AnHardt/ok-echo
Replace the "ok" in M280, M301, M304, M851 with output not including …
2016-02-17 19:09:41 -08:00
Scott Lahteine
fbfbc5e330 Enable USE_WATCHDOG by default 2016-02-17 17:14:57 -08:00
Scott Lahteine
d4e7c2d694 Merge pull request #2976 from thinkyhead/drop_configurator
Drop the experimental Configurator
2016-02-17 17:08:08 -08:00
Scott Lahteine
9df0e0e0cc Merge pull request #2974 from thinkyhead/sanitycheck_spi_speed
Sanity-check deprecated options replaced by SPI_SPEED
2016-02-17 17:07:58 -08:00
Scott Lahteine
3e2473e695 Merge pull request #2988 from thinkyhead/z2_more_extruders
Use next open E connector for Y2/Z2
2016-02-17 17:07:07 -08:00
Scott Lahteine
8eaba020fb Merge pull request #2973 from thinkyhead/fix_splash_url
Remove references to marlinfirmware.org
2016-02-17 17:05:06 -08:00
Scott Lahteine
438a87eba8 Sanity check deprecated SDSLOW, SDEXTRASLOW 2016-02-17 14:54:10 -08:00
Scott Lahteine
b19b272172 Update configurations with SPI_SPEED
- Include aligned comment about new SDSUPPORT behavior
2016-02-17 14:54:09 -08:00
Scott Lahteine
7f30f85602 Merge pull request #2987 from thinkyhead/gcode_allow_no_initial_space
Fix handling of spaces in GCode
2016-02-17 14:51:19 -08:00
Scott Lahteine
b81d3b83cf Drop the experimental Configurator
Development moved to https://github.com/thinkyhead/MarlinConfigurator
2016-02-17 14:49:37 -08:00
Scott Lahteine
be691b51f1 Remove references to marlinfirmware.org
The domain is gone and doesn’t redirect, so for now show no URL on the boot screen.
2016-02-17 14:41:46 -08:00
Scott Lahteine
f3f58bd619 Merge pull request #2992 from thinkyhead/rc_rename_fpos_t
Rename fpos_t to avoid libc conflict
2016-02-17 14:40:33 -08:00
Scott Lahteine
b03787262a Merge pull request #2868 from esenapaj/esenapaj-patch-1
Fix AUTOTEMP documentation in configs
2016-02-17 14:15:29 -08:00
Scott Lahteine
83ffc9eb4f Show raw steps in M114
This is a proposed change. This section of M114 output is a debug
extension according to RepRap wiki.
2016-02-15 15:59:24 -08:00
Scott Lahteine
373e8a1ad4 Fixes for COREXY and COREXZ coordinates 2016-02-15 15:59:24 -08:00
unknown
31656e68bc Fix for homing X and Y before raising Z when Z_SAFE_HOMING is set. 2016-02-15 15:53:40 -06:00
unknown
8ea55323d8 Fix for not raising Z before homing X and Y 2016-02-15 14:52:04 -06:00
Scott Lahteine
b83e472bd3 Rename fpos_t to avoid libc conflict 2016-02-10 20:49:25 -08:00
Scott Lahteine
68457ee903 For Dual Y/Z use the next available extruder pins 2016-02-09 21:59:09 -08:00
Scott Lahteine
711e5db19a Tweak comment in process_next_command 2016-02-09 18:16:35 -08:00
Scott Lahteine
400e9329be Allow spaces after a code letter 2016-02-09 18:03:13 -08:00
Scott Lahteine
cdcb80f3c5 Allow no-space after initial command
Addresses issue #2715
2016-02-09 18:00:35 -08:00
AnHardt
6f473f7fc6 Repair N in ADVANCED_OK
Send the correct line number.
If no N was in the command - non't send an N.
2016-02-09 19:23:26 +01:00
AnHardt
efbd705eda Replace the "ok" in M280, M301, M304, M851 with output not including an "ok"
Replace the "ok" in M280, M301, M304, M851 with output not including an "ok"
to avoid senting two "ok"s for a single g-code.

Doing the same for M105 would break the input filters of the hosts.
For M105 the other "ok" is omitted.
2016-02-09 13:36:03 +01:00
Scott Lahteine
8e66028d25 Apply the ABL rotation matrix to the extruder offset. 2016-02-08 14:22:18 -08:00
esenapaj
ab5aa3fc92 Merge pull request #5 from MarlinFirmware/RCBugFix
Rc bug fix
2016-02-08 05:42:11 +09:00
esenapaj
27d918d836 Merge pull request #4 from MarlinFirmware/RCBugFix
Rc bug fix
2016-02-08 05:35:32 +09:00
Scott Lahteine
159ff94afd Remove obsolete HEATER_BED_DUTY_CYCLE_DIVIDER #2977 2016-02-07 08:02:11 -06:00
Richard Wackerbarth
1112dcd3c2 Merge Slow SD Handling #2848 2016-02-07 08:00:14 -06:00
Ruwan J Egoda Gamage
1270fbfd38 Using SET_INPUT instead of pinMode 2016-02-07 07:58:52 -06:00
Ruwan J Egoda Gamage
b58083b0fa Getting rid of SDEXTRASLOW, SDSLOW variables. 2016-02-07 07:58:52 -06:00
Ruwan J Egoda Gamage
1833049b8a reusing millis() 2016-02-07 07:58:52 -06:00
Ruwan J Egoda Gamage
1b7c443628 Adding SDULTRASLOW variable.
Instead of changing SDEXTRASLOW variable to a slower speed,  the new
SDULTRASLOW is used for rigidbot panel.
2016-02-07 07:58:52 -06:00
Ruwan J Egoda Gamage
6f9e9c0e4f Cleaning up, getting rid of the fake encoder count variable. 2016-02-07 07:58:52 -06:00
Ruwan J Egoda Gamage
becbfe1065 Fixing Rigidbot LCD Panel Support 2016-02-07 07:58:52 -06:00
esenapaj
4882a7eded more suitable display format for delta printer 2016-01-29 18:38:25 +09:00
esenapaj
d7272e3f36 Merge pull request #3 from MarlinFirmware/RCBugFix
Rc bug fix
2016-01-29 05:43:22 +09:00
esenapaj
9ed1275a37 Merge pull request #1 from MarlinFirmware/RCBugFix
Rc bug fix
2016-01-29 05:40:33 +09:00
Scott Lahteine
62bad1b60f Merge pull request #2848 from japzi/RCBugFix
Fixing Rigidbot LCD Panel Support
2016-01-26 17:30:12 -08:00
esenapaj
59d345a3dd Update Configuration.h 2016-01-22 07:27:11 -06:00
esenapaj
b8f0c8a4c7 Update Configuration.h 2016-01-22 07:27:11 -06:00
esenapaj
df0d599c79 Update Configuration.h 2016-01-22 07:27:11 -06:00
esenapaj
a366697649 Update Configuration.h 2016-01-22 07:27:11 -06:00
Richard Wackerbarth
7c94c83765 Repair formula mangled by PR#1319 in Jan 2015 2016-01-15 10:06:27 -06:00
Richard Wackerbarth
51aa7d93eb Merge pull request #2902 from Naruto-kyun/patch-1
Update stepper.cpp
2016-01-15 10:04:15 -06:00
Naruto-kyun
2932602643 Update stepper.cpp
Forgot Z2_MIN_PIN
2016-01-15 16:50:43 +01:00
Ruwan J Egoda Gamage
06555febdd Using SET_INPUT instead of pinMode 2015-12-24 12:12:25 -05:00
esenapaj
8d2aa2368d Update Configuration_adv.h 2015-12-23 08:16:36 +09:00
esenapaj
0de5fcad0a Update Configuration_adv.h 2015-12-23 08:16:06 +09:00
esenapaj
1403b9acc0 Update Configuration_adv.h 2015-12-23 08:15:20 +09:00
esenapaj
5cf1c38ea1 Update Configuration_adv.h 2015-12-23 08:12:54 +09:00
esenapaj
04ab61bf40 Update Configuration_adv.h 2015-12-23 08:12:28 +09:00
esenapaj
39c62fbd6f Update Configuration_adv.h 2015-12-23 08:12:04 +09:00
esenapaj
efcb769003 Update Configuration_adv.h 2015-12-23 08:09:57 +09:00
esenapaj
992fbb831d Update Configuration_adv.h 2015-12-23 08:08:45 +09:00
esenapaj
5ee6fe6385 Update Configuration_adv.h 2015-12-23 08:07:12 +09:00
esenapaj
056daf00fc Update Configuration_adv.h 2015-12-23 08:06:15 +09:00
esenapaj
71aafb79a0 Update Configuration_adv.h 2015-12-23 08:03:54 +09:00
Ruwan J Egoda Gamage
2c9e0415c7 Getting rid of SDEXTRASLOW, SDSLOW variables. 2015-12-13 23:23:01 -05:00
Ruwan J Egoda Gamage
a64bcd53e9 reusing millis() 2015-12-13 22:06:03 -05:00
Ruwan J Egoda Gamage
e6cc232184 Adding SDULTRASLOW variable.
Instead of changing SDEXTRASLOW variable to a slower speed,  the new
SDULTRASLOW is used for rigidbot panel.
2015-12-13 15:47:10 -05:00
Ruwan J Egoda Gamage
83c4131ba3 Cleaning up, getting rid of the fake encoder count variable. 2015-12-13 15:28:40 -05:00
Ruwan J Egoda Gamage
5eeea2f611 Fixing Rigidbot LCD Panel Support 2015-12-13 15:28:40 -05:00
Richard Wackerbarth
f6950acb8e Residual unused variable — Backport 2015-12-10 19:48:08 -06:00
Richard Wackerbarth
7a670e3911 Improve planner & stepper PR #263 2015-12-10 07:24:37 -06:00
Richard Wackerbarth
58658c9279 Call the probe pin a probe pin and not a min endstop 2015-12-10 07:20:52 -06:00
Richard Wackerbarth
0fa3bac8ee If unused, just don’t define it. 2015-12-10 07:20:52 -06:00
Richard Wackerbarth
3b2973da6a Prepare Ramps for user redefinition 2015-12-10 07:20:52 -06:00
Richard Wackerbarth
1635613c25 Backport cosmetic 2015-12-10 07:20:52 -06:00
Richard Wackerbarth
0b429461d5 Back port Cosmetic changes 2015-12-10 07:20:52 -06:00
Richard Wackerbarth
0cebe85e65 Clean up spacing and duplicate entries
• Removing trailing whitespace
• Adjusting indention for better readability
• Removing duplicated entries
2015-12-10 07:20:52 -06:00
Richard Wackerbarth
e7b40bbe98 Change link to U8glib source 2015-12-10 06:33:29 -06:00
Richard Wackerbarth
e2da2b4105 Back port language translation 2015-12-10 06:31:41 -06:00
Richard Wackerbarth
4f314afaf0 Allow Thermistor #12 to be used on hotends also
//100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)

Caveat Emptor —- 
I’m not sure that this really makes sense,
but why keep someone from using it?
2015-12-10 06:31:31 -06:00
Scott Lahteine
60d5658da8 Revert nozzle_bed_fan_menu_items
For some reason that I cannot determine, using a sub-function causes
the Tune sub-menu to act strangely, yet replacing the function call
with its code content works perfectly.
2015-12-09 20:33:52 -06:00
Richard Wackerbarth
ae4acc42ec Merge ConformingHostMessages (PR#2822) 2015-12-07 16:12:46 -06:00
AnHardt
57da1b8497 Host parseble output for M109, M190 and M303
Make the output of M105 more similar to Repetier.
Make the text-print pert of M105 an extra function to make it reusable. `print_heaterstates()`
Use `print_heaterstates()` in M019, M190 and M303
2015-12-07 15:37:53 -06:00
AnHardt
fcceb98191 Unglobalize no_wait_for_cooling 2015-12-07 15:34:26 -06:00
Wurstnase
78a347a01a change nx, ny, nz and ne from float to long
st_set_position takes long
```void st_set_position(const long& x, const long& y, const long& z, const long& e)```
2015-12-07 08:22:44 -06:00
Wurstnase
6d691aceee change dx, dy, dz and de from float to long
anything is long, we don't need float there
2015-12-07 08:22:24 -06:00
Richard Wackerbarth
6bfcb74c25 The probe stowing coordinates have changed 2015-12-05 19:31:59 -06:00
Wurstnase
0fbfb22506 Renaming delta speeds (PR2824)
dx -> dsx
dy -> dsy
dz -> dsz
de -> dse
2015-12-04 07:55:45 -06:00
AnHardt
8d1eeff021 Fix status LEDs update when reinitializing the display
Fix status LEDs update when reinitializing the display

By using the regular update function during init.

Fixing #2683
2015-12-03 07:18:35 -06:00
AnHardt
e19fe4054d Update README.md 2015-12-03 00:38:27 +01:00
Richard Wackerbarth
5a54204f72 Marlin 1.1.0 Release Candidate 3 - 01 December 2015 2015-12-01 07:24:45 -06:00
AnHardt
bb4efcf603 Handle temp callbacks when THERMAL_PROTECTION_HOTENDS is not defined
by alternate definition for the callback macros
2015-12-01 07:21:52 -06:00
AnHardt
96d0d04b8f Update LCD buttons less frequently
Move slow_buttons_update into the LCD_UPDATE_INTERVAL block
lcd_implementation_read_slow_buttons() will then be executed ~10 times a
second.
2015-11-30 05:44:32 -06:00
Richard Wackerbarth
e293ea57f0 Unbalanced brackets in setPwmFrequency
This is a back port of the correct in issue #248
2015-11-30 05:44:32 -06:00
AnHardt
c956b52c4a Babystep Multiplier
Analog to https://github.com/MarlinFirmware/MarlinDev/pull/250 by
@RicardoGA

Restore the Babystep Multiplicator functionality and now it's available
for X/Y/Z
2015-11-30 05:43:10 -06:00
Richard Wackerbarth
956418c674 Kc is also a multi-PID parameter 2015-11-23 06:08:01 -06:00
Richard Wackerbarth
8cea79a81d Update reference to our wiki 2015-11-15 12:23:37 -06:00
AnHardt
33addc52a1 Suppress Z_MIN_PROBE_REPEATABILITY_TEST for DELTA and SCARA configurations (PR#2747)
For now Z_MIN_PROBE_REPEATABILITY_TEST is not possible for DELTA or SCARA
configurations.
This PR comments the feature out, where it is commented in by default.
2015-11-13 07:33:33 -06:00
AnHardt
8da2e98985 Split RAMPS 1.3 an 1.4 (PR#2741)
because of hardware differences on the SERVO0_PIN
2015-11-13 07:13:48 -06:00
AnHardt
6dfc7124a1 Add Travis check for ALLEN_KEY (PR#2748)
Tests DELTA, AUTO_BED_LEVELING_FEATURE and ALLEN_KEY
2015-11-13 07:09:05 -06:00
AnHardt
be7167ed97 Change XY formatting on LCD (PR#2740)
According to #123 negative values for XY at or below -100 are displaying incorrectly, dropping the first digit. Deltas can easily have XY values in this range. This PR adds a function to display floats/ints formatted like `_123`, `-123`, `_-12`, or `__-1` as appropriate and applies it to the XY coordinates on Hitachi displays. It also moves the Z value to the right to be consistent with the XY formatting.
2015-11-13 06:46:11 -06:00
vogtmann
9acdc6c234 Update LICENSE 2015-11-12 13:09:59 -06:00
Luis Correia
e7099ea597 Fix Portuguese (Portugal) strings (PR#2700)
Align strings with release
2015-11-12 00:08:42 -06:00
Richard Wackerbarth
a0f6407d6a Merge corrections from dev branch (PR#2704) 2015-11-12 00:04:18 -06:00
Scott Lahteine
754b13d8fe Patch issue #2315 2015-11-12 00:03:22 -06:00
Scott Lahteine
dbd4c17096 Init Kp, Ki, Kd to 0 2015-11-12 00:03:22 -06:00
Scott Lahteine
644c376e84 Use binary OR with endstop bits 2015-11-12 00:03:22 -06:00
Scott Lahteine
54a39d8c1a Use a ternary in qr_solve.cpp 2015-11-12 00:03:22 -06:00
Scott Lahteine
17c23bbaf3 Shorten gcode_M221 yet function the same 2015-11-12 00:03:22 -06:00
Scott Lahteine
c0e791dbe9 Only look for "N" line number as first parameter 2015-11-12 00:03:22 -06:00
Scott Lahteine
b4af4441c5 Clean up watchdog impl. 2015-11-12 00:03:22 -06:00
Scott Lahteine
8f16563bbd Use "defined" with LCD_PIN_BL and LCD_PIN_RESET 2015-11-12 00:03:22 -06:00
Scott Lahteine
6fa7e24af3 Use "UNUSED" to squash compiler warnings 2015-11-12 00:03:22 -06:00
Scott Lahteine
d5b7c595ae Use static locals in utf_mapper.h 2015-11-12 00:03:21 -06:00
Scott Lahteine
9bdab4f3a8 Clean up "else" and other spacing 2015-11-12 00:03:21 -06:00
Scott Lahteine
9b23490f01 Clean up spacing in configs 2015-11-12 00:03:21 -06:00
esenapaj
c6c37abd41 Update language_kana.h 2015-11-12 00:00:51 -06:00
esenapaj
c24045475a Update language_kana_utf8.h 2015-11-12 00:00:32 -06:00
Richard Wackerbarth
25d636c9e0 Compiler issues (PR#2696) 2015-11-11 23:52:11 -06:00
AnHardt
47401ec97b MSG_EXTRUDER_SWITCHED_OFF was renamed to MSG_REDUNDANCY
in language.h, but was not renamed here. If TEMP_SENSOR_1 is enabled as redundant then
an error is thrown that MSG_EXTRUDER_SWITCHED_OFF is not defined.

Originaly by @12dstring
2015-10-08 10:45:11 -05:00
Scott Lahteine
ba6a243197 DEBUG message has no parameter (PR#2671) 2015-10-03 22:03:03 -05:00
Scott Lahteine
0c7f7ebcfb Styling adjustments (PR#2668 & PR#2670)
Keep "astyled" reformatting
2015-10-03 22:02:45 -05:00
Rafa Couto
b5fb7075b9 Galician (gl) language. 2015-09-30 14:46:01 -05:00
Richard Wackerbarth
7b4bdc0203 DUAL_X_CARRIAGE motor enabling
As noted by @darkjavi et.al. in #103, the E1 motor was not being enabled in planner.cpp when using DUAL_X_CARRIAGE. This patch enables and disables E1 as it should.
2015-09-30 04:31:19 -05:00
2633 changed files with 1362708 additions and 581426 deletions

19
.editorconfig Normal file
View File

@@ -0,0 +1,19 @@
# editorconfig.org
root = true
[{*.patch,syntax_test_*}]
trim_trailing_whitespace = false
[{*.c,*.cpp,*.h}]
charset = utf-8
[{*.c,*.cpp,*.h,Makefile}]
trim_trailing_whitespace = true
insert_final_newline = true
end_of_line = lf
indent_style = space
indent_size = 2
[{*.py,*.conf,*.sublime-project}]
indent_style = tab
indent_size = 4

19
.gitattributes vendored Normal file
View File

@@ -0,0 +1,19 @@
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto
# Files with Unix line endings
*.c text eol=lf
*.cpp text eol=lf
*.h text eol=lf
*.ino text eol=lf
*.py text eol=lf
*.sh text eol=lf
*.scad text eol=lf
# Files with native line endings
# *.sln text
# Binary files
*.png binary
*.jpg binary
*.fon binary

3
.github/FUNDING.yml vendored Normal file
View File

@@ -0,0 +1,3 @@
github: [thinkyhead]
patreon: thinkyhead
custom: ["http://www.thinkyhead.com/donate-to-marlin"]

43
.github/ISSUE_TEMPLATE/bug_report.md vendored Normal file
View File

@@ -0,0 +1,43 @@
---
name: Bug report
about: Report a bug in Marlin
title: "[BUG] (short description)"
labels: ''
assignees: ''
---
<!--
Have you read Marlin's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/MarlinFirmware/Marlin/blob/master/.github/code_of_conduct.md
Do you want to ask a question? Are you looking for support? Please don't post here. Instead please use one of the support links at https://github.com/MarlinFirmware/Marlin/issues/new/choose
Before filing an issue be sure to test the "bugfix" branches to see whether the issue has been resolved.
-->
### Bug Description
<!-- Description of the bug -->
### My Configurations
**Required:** Please include a ZIP file containing your `Configuration.h` and `Configuration_adv.h` files.
### Steps to Reproduce
<!-- Please describe the steps needed to reproduce the issue -->
1. [First Step]
2. [Second Step]
3. [and so on...]
**Expected behavior:** [What you expect to happen]
**Actual behavior:** [What actually happens]
#### Additional Information
* Provide pictures or links to videos that clearly demonstrate the issue.
* See [How Can I Contribute](#how-can-i-contribute) for additional guidelines.

17
.github/ISSUE_TEMPLATE/config.yml vendored Normal file
View File

@@ -0,0 +1,17 @@
blank_issues_enabled: false
contact_links:
- name: Marlin Documentation
url: http://marlinfw.org/
about: Lots of documentation on installing and using Marlin.
- name: MarlinFirmware Facebook group
url: https://www.facebook.com/groups/1049718498464482
about: Please ask and answer questions here.
- name: Marlin on Discord
url: https://discord.gg/n5NJ59y
about: Join the Discord server for support and discussion.
- name: Marlin Discussion Forum
url: http://forums.reprap.org/list.php?415
about: A searchable web forum hosted by RepRap dot org.
- name: Marlin Videos on YouTube
url: https://www.youtube.com/results?search_query=marlin+firmware
about: Tutorials and more from Marlin users all around the world. Great for new users!

View File

@@ -0,0 +1,35 @@
---
name: Feature request
about: Request a Feature
title: "[FR] (feature request title)"
labels: ''
assignees: ''
---
<!--
Have you read Marlin's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/MarlinFirmware/Marlin/blob/master/.github/code_of_conduct.md
Do you want to ask a question? Are you looking for support? Please don't post here. Instead please use one of the support links at https://github.com/MarlinFirmware/Marlin/issues/new/choose
Before filing an issue be sure to test the "bugfix" branches to see whether the issue has been resolved.
-->
### Description
<!-- Description of the requested feature -->
### Feature Workflow
<!-- Please describe the feature's behavior, user interaction, etc. -->
1. [First Action]
2. [Second Action]
3. [and so on...]
#### Additional Information
* Provide pictures or links that demonstrate a similar feature or concept.
* See [How Can I Contribute](#how-can-i-contribute) for additional guidelines.

46
.github/code_of_conduct.md vendored Normal file
View File

@@ -0,0 +1,46 @@
# Contributor Covenant Code of Conduct
## Our Pledge
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
## Our Standards
Examples of behavior that contributes to creating a positive environment include:
* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members
Examples of unacceptable behavior by participants include:
* The use of sexualized language or imagery and unwelcome sexual attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting
## Our Responsibilities
Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
## Scope
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
## Enforcement
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [marlinfirmware@github.com](mailto:marlinfirmware@github.com). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
## Attribution
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [https://contributor-covenant.org/version/1/4][version]
[homepage]: https://contributor-covenant.org
[version]: https://contributor-covenant.org/version/1/4/

144
.github/contributing.md vendored Normal file
View File

@@ -0,0 +1,144 @@
# Contributing to Marlin
Thanks for your interest in contributing to Marlin Firmware!
The following is a set of guidelines for contributing to Marlin, hosted by the [MarlinFirmware Organization](https://github.com/MarlinFirmware) on GitHub. These are mostly guidelines, not rules. Use your best judgment, and feel free to propose changes to this document in a Pull Request.
#### Table Of Contents
[Code of Conduct](#code-of-conduct)
[I don't want to read this whole thing, I just have a question!!!](#i-dont-want-to-read-this-whole-thing-i-just-have-a-question)
[How Can I Contribute?](#how-can-i-contribute)
* [Reporting Bugs](#reporting-bugs)
* [Suggesting Features or Changes](#suggesting-features-or-changes)
* [Your First Code Contribution](#your-first-code-contribution)
* [Pull Requests](#pull-requests)
[Styleguides](#styleguides)
* [Git Commit Messages](#git-commit-messages)
* [C++ Coding Standards](#c++-coding-standards)
* [Documentation Styleguide](#documentation)
[Additional Notes](#additional-notes)
* [Issue and Pull Request Labels](#issue-and-pull-request-labels)
## Code of Conduct
This project and everyone participating in it is governed by the [Marlin Code of Conduct](code_of_conduct.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [marlinfirmware@github.com](mailto:marlinfirmware@github.com).
## I don't want to read this whole thing I just have a question!!!
> **Note:** Please don't file an issue to ask a question. You'll get faster results by using the resources below.
We have a Message Board and a Facebook group where our knowledgable user community can provide helpful advice if you have questions.
* [Marlin RepRap forum](http://forums.reprap.org/list.php?415)
* [MarlinFirmware on Facebook](https://www.facebook.com/groups/1049718498464482/)
If chat is more your speed, you can join the MarlinFirmware Slack team:
* Join the Marlin Slack Team
* To obtain group access, please [send a request](http://www.thinkyhead.com/contact/9) to @thinkyhead.
* Even though Slack is a chat service, sometimes it takes several hours for community members to respond &mdash; please be patient!
* Use the `#general` channel for general questions or discussion about Marlin.
* Other channels exist for certain topics. Check the channel list.
## How Can I Contribute?
### Reporting Bugs
This section guides you through submitting a Bug Report for Marlin. Following these guidelines helps maintainers and the community understand your report, reproduce the behavior, and find related reports.
Before creating a Bug Report, please test the "nightly" development branch, as you might find out that you don't need to create one. When you are creating a Bug Report, please [include as many details as possible](#how-do-i-submit-a-good-bug-report). Fill out [the required template](issue_template.md), the information it asks for helps us resolve issues faster.
> **Note:** Regressions can happen. If you find a **Closed** issue that seems like your issue, go ahead and open a new issue and include a link to the original issue in the body of your new one. All you need to create a link is the issue number, preceded by #. For example, #8888.
#### How Do I Submit A (Good) Bug Report?
Bugs are tracked as [GitHub issues](https://guides.github.com/features/issues/). Use the New Issue button to create an issue and provide the following information by filling in [the template](issue_template.md).
Explain the problem and include additional details to help maintainers reproduce the problem:
* **Use a clear and descriptive title** for the issue to identify the problem.
* **Describe the exact steps which reproduce the problem** in as many details as possible. For example, start by explaining how you started Marlin, e.g. which command exactly you used in the terminal, or how you started Marlin otherwise. When listing steps, **don't just say what you did, but explain how you did it**. For example, if you moved the cursor to the end of a line, explain if you used the mouse, or a keyboard shortcut or an Marlin command, and if so which one?
* **Provide specific examples to demonstrate the steps**. Include links to files or GitHub projects, or copy/pasteable snippets, which you use in those examples. If you're providing snippets or log output in the issue, use [Markdown code blocks](https://help.github.com/articles/markdown-basics/#multiple-lines).
* **Describe the behavior you observed after following the steps** and point out what exactly is the problem with that behavior.
* **Explain which behavior you expected to see instead and why.**
* **Include detailed log output** especially for probing and leveling. See below for usage of `DEBUG_LEVELING_FEATURE`.
* **Include screenshots, links to videos, etc.** which clearly demonstrate the problem.
* **Include G-code** (if relevant) that reliably causes the problem to show itself.
* **If the problem wasn't triggered by a specific action**, describe what you were doing before the problem happened and share more information using the guidelines below.
Provide more context:
* **Can you reproduce the problem with a minimum of options enabled?**
* **Did the problem start happening recently** (e.g. after updating to a new version of Marlin) or was this always a problem?
* If the problem started happening recently, **can you reproduce the problem in an older version of Marlin?** What's the most recent version in which the problem doesn't happen? You can download older versions of Marlin from [the releases page](https://github.com/MarlinFirmware/Marlin/releases).
* **Can you reliably reproduce the issue?** If not, provide details about how often the problem happens and under which conditions it normally happens.
Include details about your configuration and environment:
* **Which version of Marlin are you using?** Marlin's exact version and build date can be seen in the startup message when a host connects to Marlin, or in the LCD Info menu (if enabled).
* **What kind of 3D Printer and electronics are you using**?
* **What kind of add-ons (probe, filament sensor) do you have**?
* **Include your Configuration files.** Make a ZIP file containing `Configuration.h` and `Configuration_adv.h` and drop it on your reply.
### Suggesting Features or Changes
This section guides you through submitting a suggestion for Marlin, including completely new features and minor improvements to existing functionality. Following these guidelines helps maintainers and the community understand your suggestion and find related suggestions.
Before creating a suggestion, please check [this list](#before-submitting-a-suggestion) as you might find out that you don't need to create one. When you are creating an enhancement suggestion, please [include as many details as possible](#how-do-i-submit-a-good-enhancement-suggestion). Fill in [the template](issue_template.md), including the steps that you imagine you would take if the feature you're requesting existed.
#### Before Submitting a Feature Request
* **Check the [Marlin website](http://marlinfw.org/)** for tips — you might discover that the feature is already included. Most importantly, check if you're using [the latest version of Marlin](https://github.com/MarlinFirmware/Marlin/releases) and if you can get the desired behavior by changing [Marlin's config settings](http://marlinfw.org/docs/configuration/configuration.html).
* **Perform a [cursory search](https://github.com/MarlinFirmware/Marlin/issues?q=is%3Aissue)** to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
#### How Do I Submit A (Good) Feature Request?
Feature Requests are tracked as [GitHub issues](https://guides.github.com/features/issues/). Please follow these guidelines in your request:
* **Use a clear and descriptive title** for the issue to identify the suggestion.
* **Provide a step-by-step description of the requested feature** in as much detail as possible.
* **Provide specific examples to demonstrate the steps**.
* **Describe the current behavior** and **explain which behavior you expected to see instead** and why.
* **Include screenshots and links to videos** which demonstrate the feature or point out the part of Marlin to which the request is related.
* **Explain why this feature would be useful** to most Marlin users.
* **Name other firmwares that have this feature, if any.**
### Your First Code Contribution
Unsure where to begin contributing to Marlin? You can start by looking through these `good-first-issue` and `help-wanted` issues:
* [Beginner issues][good-first-issue] - issues which should only require a few lines of code, and a test or two.
* [Help Wanted issues][help-wanted] - issues which should be a bit more involved than `beginner` issues.
### Pull Requests
Pull Requests should always be targeted to working branches (e.g., `bugfix-1.1.x` and/or `bugfix-2.0.x`) and never to release branches (e.g., `1.1.x`). If this is your first Pull Request, please read our [Guide to Pull Requests](http://marlinfw.org/docs/development/getting_started_pull_requests.html) and Github's [Pull Request](https://help.github.com/articles/creating-a-pull-request/) documentation.
* Fill in [the required template](pull_request_template.md).
* Don't include issue numbers in the PR title.
* Include pictures, diagrams, and links to videos in your Pull Request to demonstrate your changes, if needed.
* Follow the [Coding Standards](http://marlinfw.org/docs/development/coding_standards.html) posted on our website.
* Document new code with clear and concise comments.
* End all files with a newline.
## Styleguides
### Git Commit Messages
* Use the present tense ("Add feature" not "Added feature").
* Use the imperative mood ("Move cursor to..." not "Moves cursor to...").
* Limit the first line to 72 characters or fewer.
* Reference issues and Pull Requests liberally after the first line.
### C++ Coding Standards
* Please read and follow the [Coding Standards](http://marlinfw.org/docs/development/coding_standards.html) posted on our website. Failure to follow these guidelines will delay evaluation and acceptance of Pull Requests.
### Documentation
* Guidelines for documentation are still under development. In-general, be clear, concise, and to-the-point.

16
.github/issue_template.md vendored Normal file
View File

@@ -0,0 +1,16 @@
# NO SUPPORT REQUESTS PLEASE
Support Requests posted here will be automatically closed!
This Issue Queue is for Marlin bug reports and development-related issues, and we prefer not to handle user-support questions here. See https://github.com/MarlinFirmware/Marlin/blob/1.1.x/.github/contributing.md#i-dont-want-to-read-this-whole-thing-i-just-have-a-question.
For best results getting help with configuration and troubleshooting, please use the following resources:
- RepRap.org Marlin Forum http://forums.reprap.org/list.php?415
- Tom's 3D Forums https://discuss.toms3d.org/
- Facebook Group "Marlin Firmware" https://www.facebook.com/groups/1049718498464482/
- Facebook Group "Marlin Firmware for 3D Printers" https://www.facebook.com/groups/3Dtechtalk/
- Marlin Configuration https://www.youtube.com/results?search_query=marlin+configuration on YouTube
- Marlin Discord server. Join link: https://discord.gg/n5NJ59y
After seeking help from the community, if the consensus points to to a bug in Marlin, then you should post a Bug Report at https://github.com/MarlinFirmware/Marlin/issues/new/choose).

19
.github/pull_request_template.md vendored Normal file
View File

@@ -0,0 +1,19 @@
### Requirements
* Filling out this template is required. Pull Requests without a clear description may be closed at the maintainers' discretion.
### Description
<!--
We must be able to understand your proposed change from this description. If we can't understand what the code will do from this description, the Pull Request may be closed at the maintainers' discretion. Keep in mind that the maintainer reviewing this PR may not be familiar with or have worked with the code recently, so please walk us through the concepts.
-->
### Benefits
<!-- What does this fix or improve? -->
### Related Issues
<!-- Whether this fixes a bug or fulfills a feature request, please list any related Issues here. -->

7
.github/workflows/bad-target.md vendored Normal file
View File

@@ -0,0 +1,7 @@
Thanks for your contribution! Unfortunately we can't accept PRs directed at release branches. We make patches to the bugfix branches and only later do we push them out as releases.
Please redo this PR starting with the `bugfix-2.0.x` branch and be careful to target `bugfix-2.0.x` when resubmitting the PR.
It may help to set your fork's default branch to `bugfix-2.0.x`.
See [this page](http://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions.

34
.github/workflows/bump-date.yml vendored Normal file
View File

@@ -0,0 +1,34 @@
#
# bump-date.yml
# Bump the distribution date once per day
#
name: Bump Distribution Date
on:
schedule:
- cron: '0 0 * * *'
jobs:
bump_date:
runs-on: ubuntu-latest
steps:
- name: Check out bugfix-2.0.x
uses: actions/checkout@v2
with:
ref: bugfix-2.0.x
- name: Bump Distribution Date
run: |
# Inline Bump Script
[[ "$GITHUB_REPOSITORY" == "MarlinFirmware/Marlin" ]] || exit 0
DIST=$( date +"%Y-%m-%d" )
eval "sed -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/src/inc/Version.h" && \
git config user.name "${GITHUB_ACTOR}" && \
git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" && \
git add . && \
git commit -m "[cron] Bump distribution date ($DIST)" && \
git push

27
.github/workflows/check-pr.yml vendored Normal file
View File

@@ -0,0 +1,27 @@
#
# comment-pr.yml
# Add a comment to any PR directed to a release branch
#
name: PR Bad Target
on:
pull_request:
branches:
- 1.0.x
- 1.1.x
- 2.0.x
jobs:
bad_target:
name: PR Bad Target
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: harupy/comment-on-pr@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
filename: bad-target.md

104
.github/workflows/test-builds.yml vendored Normal file
View File

@@ -0,0 +1,104 @@
#
# test-builds.yml
# Do test builds to catch compile errors
#
name: CI
on:
pull_request:
branches:
- bugfix-2.0.x
- dev-2.1.x
paths-ignore:
- config/**
- data/**
- docs/**
- '**/*.md'
jobs:
test_builds:
runs-on: ubuntu-latest
strategy:
matrix:
test-platform:
# Base Environments
- DUE
- esp32
- linux_native
- mega2560
- teensy31
- teensy35
- SAMD51_grandcentral_m4
# Extended AVR Environments
- FYSETC_F6_13
- mega1280
- rambo
- sanguino1284p
- sanguino644p
# Extended STM32 Environments
- STM32F103RC_btt
- STM32F103RC_btt_USB
- STM32F103RE_btt
- STM32F103RE_btt_USB
- STM32F103RC_fysetc
- jgaurora_a5s_a1
- STM32F103VE_longer
- STM32F407VE_black
- BIGTREE_SKR_PRO
- BIGTREE_GTR_V1_0
- mks_robin
- ARMED
- FYSETC_S6
# Put lengthy tests last
- LPC1768
- LPC1769
# STM32 with non-STM framework. both broken for now. they should use HAL_STM32 which is working.
#- STM32F4
#- STM32F7
# Non-working environment tests
#- BIGTREE_BTT002
#- at90usb1286_cdc
#- at90usb1286_dfu
#- STM32F103CB_malyan
#- mks_robin_lite
#- mks_robin_mini
#- mks_robin_nano
steps:
- name: Select Python 3.7
uses: actions/setup-python@v1
with:
python-version: '3.7' # Version range or exact version of a Python version to use, using semvers version range syntax.
architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
- name: Install PlatformIO
run: |
pip install -U https://github.com/platformio/platformio-core/archive/master.zip
platformio update
- name: Check out the PR
uses: actions/checkout@v2
- name: Run ${{ matrix.test-platform }} Tests
run: |
# Inline tests script
[[ "$GITHUB_REPOSITORY" == "MarlinFirmware/Marlin" ]] || exit 0
chmod +x buildroot/bin/*
chmod +x buildroot/share/tests/*
export PATH=./buildroot/bin/:./buildroot/share/tests/:${PATH}
run_tests . ${{ matrix.test-platform }}

187
.gitignore vendored Normal file → Executable file
View File

@@ -1,17 +1,186 @@
// Our automatic versioning scheme generates the following file
// NEVER put it in the repository
#
# Marlin 3D Printer Firmware
# Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
#
# Based on Sprinter and grbl.
# Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# Our automatic versioning scheme generates the following file
# NEVER put it in the repository
_Version.h
// All of the following OS, IDE and compiler generated file
// references should be moved from this file
// They are needed, but they belong in your global .gitignore
// rather than in a per-project file such as this
*.o
#
# OS
#
applet/
*.DS_Store
#
# Misc
#
*~
*.orig
*.rej
*.bak
*.DS_Store
*.idea
*.s
*.i
*.ii
*.swp
tags
#
# C++
#
# Compiled Object files
*.slo
*.lo
*.o
*.obj
*.ino.cpp
# Precompiled Headers
*.gch
*.pch
# Compiled Dynamic libraries
*.so
*.dylib
*.dll
# Fortran module files
*.mod
*.smod
# Compiled Static libraries
*.lai
*.la
*.a
*.lib
# Executables
*.exe
*.out
*.app
#
# C
#
# Object files
*.o
*.ko
*.obj
*.elf
# Precompiled Headers
*.gch
*.pch
# Libraries
*.lib
*.a
*.la
*.lo
# Shared objects (inc. Windows DLLs)
*.dll
*.so
*.so.*
*.dylib
# Executables
*.exe
*.out
*.app
*.i*86
*.x86_64
*.hex
# Debug files
*.dSYM/
*.su
# PlatformIO files/dirs
.pio*
.pioenvs
.piolibdeps
.clang_complete
.gcc-flags.json
/lib/
# Workaround for Deviot+platformio quirks
Marlin/lib
Marlin/platformio.ini
Marlin/*/platformio.ini
Marlin/*/*/platformio.ini
Marlin/*/*/*/platformio.ini
Marlin/*/*/*/*/platformio.ini
Marlin/.travis.yml
Marlin/*/.travis.yml
Marlin/*/*/.travis.yml
Marlin/*/*/*/.travis.yml
Marlin/*/*/*/*/.travis.yml
Marlin/.gitignore
Marlin/*/.gitignore
Marlin/*/*/.gitignore
Marlin/*/*/*/.gitignore
Marlin/*/*/*/*/.gitignore
Marlin/readme.txt
Marlin/*/readme.txt
Marlin/*/*/readme.txt
Marlin/*/*/*/readme.txt
Marlin/*/*/*/*/readme.txt
# Secure Credentials
Configuration_Secure.h
#Visual Studio
*.sln
*.vcxproj
*.vcxproj.user
*.vcxproj.filters
Release/
Debug/
__vm/
.vs/
vc-fileutils.settings
#Visual Studio Code
.vscode
.vscode/.browse.c_cpp.db*
.vscode/c_cpp_properties.json
.vscode/launch.json
.vscode/*.db
#cmake
CMakeLists.txt
src/CMakeLists.txt
CMakeListsPrivate.txt
#CLion
cmake-build-*
#Eclipse
.project
.cproject
.pydevproject
.settings
.classpath
#Python
__pycache__

View File

@@ -1,206 +0,0 @@
---
language: c
before_install:
# Travis runs a detached head. We need to find the current branch
- git checkout `git branch --contains HEAD | grep -v '*'`
# Also tags for the root(s) of the minor version(s)
- git fetch origin --tags
- mkdir ~/bin
install:
# Install arduino 1.6.4
- wget http://downloads-02.arduino.cc/arduino-1.6.4-linux64.tar.xz
- tar Jxf arduino-1.6.4-linux64.tar.xz
- sudo mv arduino-1.6.4 /usr/local/share/arduino
- ln -s /usr/local/share/arduino/arduino ~/bin/arduino
# Our custom build commands
- mv LinuxAddons/bin/* ~/bin/
- ls -la ~/bin
# install our platform
- cp -r ArduinoAddons/Arduino_1.6.x/hardware/* /usr/local/share/arduino/hardware
# copy libraries to arduino dir, as conditional includes do not work in .ino files
- cp -r /usr/local/share/arduino/hardware/marlin/avr/libraries/* /usr/local/share/arduino/libraries/
- cp -r ArduinoAddons/Arduino_1.6.x/libraries/* /usr/local/share/arduino/libraries/
# add LiquidCrystal_I2C & LiquidTWI2 libraries
- git clone https://github.com/kiyoshigawa/LiquidCrystal_I2C.git
- mv LiquidCrystal_I2C/LiquidCrystal_I2C /usr/local/share/arduino/libraries/LiquidCrystal_I2C
- git clone https://github.com/lincomatic/LiquidTWI2.git
- mv LiquidTWI2 /usr/local/share/arduino/libraries/LiquidTWI2
# Install astyle
- wget https://github.com/timonwong/astyle-mirror/archive/master.zip
- unzip master.zip
- cd astyle-mirror-master/build/gcc/
- make prefix=$HOME astyle install
before_script:
# arduino requires an X server even with command line
# https://github.com/arduino/Arduino/issues/1981
- Xvfb :1 -screen 0 1024x768x16 &> xvfb.log &
# change back to home directory for compiling
- cd $TRAVIS_BUILD_DIR
# Check style
# ~/bin/astyle --recursive --options=.astylerc "Marlin/*.h" "Marlin/*.cpp"
script:
# Abort on style errors
# if [ "0" != `find . -name "*.orig" | wc -l` ] ; then echo "Improperly styled source -- run astyle" ; exit -999; fi
# Relaxed Travis check
# if [ "0" != `find . -name "*.orig" | wc -l` ] ; then echo "Improperly styled source -- run astyle" ; fi
# build default config
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# backup configuration.h
- cp Marlin/Configuration.h Marlin/Configuration.h.backup
- cp Marlin/Configuration_adv.h Marlin/Configuration_adv.h.backup
- cp Marlin/pins_RAMPS_13.h Marlin/pins_RAMPS_13.h.backup
# add sensor for bed
- sed -i 's/#define TEMP_SENSOR_BED 0/#define TEMP_SENSOR_BED 1/g' Marlin/Configuration.h
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# change extruder numbers from 1 to 2
- sed -i 's/#define MOTHERBOARD BOARD_RAMPS_13_EFB/#define MOTHERBOARD BOARD_RAMPS_13_EEB/g' Marlin/Configuration.h
- sed -i 's/#define EXTRUDERS 1/#define EXTRUDERS 2/g' Marlin/Configuration.h
- sed -i 's/#define TEMP_SENSOR_1 0/#define TEMP_SENSOR_1 1/g' Marlin/Configuration.h
#- cat Marlin/Configuration.h
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# change extruder numbers from 2 to 3, needs to be a board with 3 extruders defined in pins.h
- sed -i 's/#define MOTHERBOARD BOARD_RAMPS_13_EEB/#define MOTHERBOARD BOARD_RUMBA/g' Marlin/Configuration.h
- sed -i 's/#define EXTRUDERS 2/#define EXTRUDERS 3/g' Marlin/Configuration.h
- sed -i 's/#define TEMP_SENSOR_2 0/#define TEMP_SENSOR_2 1/g' Marlin/Configuration.h
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# enable PIDTEMPBED
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define PIDTEMPBED/#define PIDTEMPBED/g' Marlin/Configuration.h
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# enable AUTO_BED_LEVELING
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define ENABLE_AUTO_BED_LEVELING/#define ENABLE_AUTO_BED_LEVELING/g' Marlin/Configuration.h
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# enable AUTO_BED_LEVELING with servos
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define ENABLE_AUTO_BED_LEVELING/#define ENABLE_AUTO_BED_LEVELING/g' Marlin/Configuration.h
- sed -i 's/\/\/#define NUM_SERVOS/#define NUM_SERVOS/g' Marlin/Configuration.h
- sed -i 's/\/\/#define Z_ENDSTOP_SERVO_NR/#define Z_ENDSTOP_SERVO_NR/g' Marlin/Configuration.h
- sed -i 's/\/\/#define SERVO_ENDSTOP_ANGLES/#define SERVO_ENDSTOP_ANGLES/g' Marlin/Configuration.h
- sed -i 's/\/\/#define DEACTIVATE_SERVOS_AFTER_MOVE/#define DEACTIVATE_SERVOS_AFTER_MOVE/g' Marlin/Configuration.h
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# enable EEPROM_SETTINGS & EEPROM_CHITCHAT
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define EEPROM_SETTINGS/#define EEPROM_SETTINGS/g' Marlin/Configuration.h
- sed -i 's/\/\/#define EEPROM_CHITCHAT/#define EEPROM_CHITCHAT/g' Marlin/Configuration.h
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
### LCDS ###
# ULTIMAKERCONTROLLER
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define ULTIMAKERCONTROLLER/#define ULTIMAKERCONTROLLER/g' Marlin/Configuration.h
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# MAKRPANEL
# Needs to use melzi and sanguino hardware
#- cp Marlin/Configuration.h.backup Marlin/Configuration.h
#- sed -i 's/\/\/#define MAKRPANEL/#define MAKRPANEL/g' Marlin/Configuration.h
#- rm -rf .build/
#- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# REPRAP_DISCOUNT_SMART_CONTROLLER
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define REPRAP_DISCOUNT_SMART_CONTROLLER/#define REPRAP_DISCOUNT_SMART_CONTROLLER/g' Marlin/Configuration.h
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# G3D_PANE
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define G3D_PANEL/#define G3D_PANEL/g' Marlin/Configuration.h
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER/#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER/g' Marlin/Configuration.h
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# REPRAPWORLD_KEYPAD
# Cant find configuration details to get it to compile
#- cp Marlin/Configuration.h.backup Marlin/Configuration.h
#- sed -i 's/\/\/#define ULTRA_LCD/#define ULTRA_LCD/g' Marlin/Configuration.h
#- sed -i 's/\/\/#define REPRAPWORLD_KEYPAD/#define REPRAPWORLD_KEYPAD/g' Marlin/Configuration.h
#- sed -i 's/\/\/#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0/#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0/g' Marlin/Configuration.h
#- rm -rf .build/
#- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# RA_CONTROL_PANEL
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define RA_CONTROL_PANEL/#define RA_CONTROL_PANEL/g' Marlin/Configuration.h
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
### I2C PANELS ###
# LCD_I2C_SAINSMART_YWROBOT
# Failing at the moment needs different library
#- cp Marlin/Configuration.h.backup Marlin/Configuration.h
#- sed -i 's/\/\/#define LCD_I2C_SAINSMART_YWROBOT/#define LCD_I2C_SAINSMART_YWROBOT/g' Marlin/Configuration.h
#- rm -rf .build/
#- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# LCD_I2C_PANELOLU2
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define LCD_I2C_PANELOLU2/#define LCD_I2C_PANELOLU2/g' Marlin/Configuration.h
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# LCD_I2C_VIKI
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define LCD_I2C_VIKI/#define LCD_I2C_VIKI/g' Marlin/Configuration.h
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# Enable filament sensor
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define FILAMENT_SENSOR/#define FILAMENT_SENSOR/g' Marlin/Configuration.h
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# Enable filament sensor with LCD display
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define ULTIMAKERCONTROLLER/#define ULTIMAKERCONTROLLER/g' Marlin/Configuration.h
- sed -i 's/\/\/#define FILAMENT_SENSOR/#define FILAMENT_SENSOR/g' Marlin/Configuration.h
- sed -i 's/\/\/#define FILAMENT_LCD_DISPLAY/#define FILAMENT_LCD_DISPLAY/g' Marlin/Configuration.h
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# Enable COREXY
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define COREXY/#define COREXY/g' Marlin/Configuration.h
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# Enable COREXZ
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define COREXZ/#define COREXZ/g' Marlin/Configuration.h
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# Enable Z_DUAL_STEPPER_DRIVERS, Z_DUAL_ENDSTOPS
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define Z_DUAL_STEPPER_DRIVERS/#define Z_DUAL_STEPPER_DRIVERS/g' Marlin/Configuration_adv.h
- sed -i 's/\ \ \/\/\ \#define Z_DUAL_ENDSTOPS/#define Z_DUAL_ENDSTOPS/g' Marlin/Configuration_adv.h
- sed -i 's/#define X_MAX_PIN 2/#define X_MAX_PIN -1/g' Marlin/pins_RAMPS_13.h
- sed -i 's/\ \ \ \ \#define Z2_MAX_PIN 36/#define Z2_MAX_PIN 2/g' Marlin/Configuration_adv.h
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- cp Marlin/Configuration_adv.h.backup Marlin/Configuration_adv.h
- cp Marlin/pins_RAMPS_13.h.backup Marlin/pins_RAMPS_13.h
######## Example Configurations ##############
# Delta Config (generic)
- cp Marlin/example_configurations/delta/generic/Configuration* Marlin/
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# Delta Config (Mini Kossel)
- cp Marlin/example_configurations/delta/kossel_mini/Configuration* Marlin/
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# Makibox Config need to check board type for Teensy++ 2.0
#- cp Marlin/example_configurations/makibox/Configuration* Marlin/
#- rm -rf .build/
#- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# SCARA Config
- cp Marlin/example_configurations/SCARA/Configuration* Marlin/
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# tvrrug Config need to check board type for sanguino atmega644p
#- cp Marlin/example_configurations/tvrrug/Round2/Configuration* Marlin/
#- rm -rf .build/
#- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
######## Board Types #############

View File

@@ -1,23 +0,0 @@
##############################################################
omc.name=OMC with Atmega644 at 20Mhz
omc.upload.maximum_size=63488
omc.upload.maximum_data_size=4096
omc.upload.protocol=stk500v2
omc.upload.speed=115200
omc.bootloader.path=OMC
omc.bootloader.file=bootloader-644-20MHz.hex
omc.bootloader.low_fuses=0xE7
omc.bootloader.high_fuses=0xD4
omc.bootloader.extended_fuses=0xFC
omc.bootloader.unlock_bits=0x3F
omc.bootloader.lock_bits=0x0F
omc.build.mcu=atmega644
omc.build.f_cpu=20000000L
omc.build.board=AVR_OMC
omc.build.core=arduino:arduino
omc.build.variant=sanguino

View File

@@ -1,75 +0,0 @@
:10F800008FEF90E19EBF8DBF11241FBE5A9A00C09A
:10F81000CDB7DEB7CD51D140DEBFCDBF1092C50010
:10F820008AE08093C40088E18093C100EE24FF2425
:10F8300020E0552400E010E039E0432E9BE0292E23
:10F84000312C2C0E3D1ECFC14150504060407040C5
:10F8500011F43FE206C08091C00087FFF5CF3091E0
:10F86000C600933021F1943028F4913099F0923011
:10F87000C8F407C0953049F1953000F19630D1F5C4
:10F8800035C03B3119F491E02BE134C03F3291F5A2
:10F890003983BBC1313011F0351559F52327532E6B
:10F8A00092E028C0B32FA0E0232793E023C0832F4A
:10F8B00090E0A82BB92B232794E01CC03E30C9F45C
:10F8C000232795E0EE24FF2415C0E1E0F0E0EC0FE3
:10F8D000FD1FEE0DFF1D30830894E11CF11C232752
:10F8E000EA16FB0639F4D70196E004C0321709F492
:10F8F0008CC190E041ED5AE363E570E0ACCF90E05D
:10F9000044C08D81803311F090E00AC08F8188233C
:10F9100011F49EE105C0813011F099E001C096E933
:10F920001A821B828D818C838E818D839E831F82A0
:10F9300047E050E0F4C01A8288E08B8381E48C8336
:10F9400086E58D8382E58E8389E48F8383E58887CE
:10F9500080E589878FE58A8782E38B874BE050E0DB
:10F96000DEC08A81813941F0823941F0803911F459
:10F970008FE005C080E003C082E001C08AE01A8207
:10F980008B8343E050E0CBC091E01A8242E050E02C
:10F99000C7C08D81882311F48EE124C0813011F01D
:10F9A00089E020C086E91EC01A82E1E0F0E04092C2
:10F9B0005700849118C08B81803579F48C81883010
:10F9C00031F4E2E0F0E04092570084910BC0E0E0B7
:10F9D000F0E040925700849105C0E3E0F0E04092EF
:10F9E000570084911A828B831C8244E050E097C0B8
:10F9F000BC80AA248D81082F10E00A291B29000F42
:10FA0000111F1A828AC09A8088248B81682F70E027
:10FA100068297929933109F033C0F7EF0F3F1F07A9
:10FA200010F0A8013FC023E0F80120935700E895AB
:10FA300007B600FCFDCFA801D1018C9111962C9145
:10FA400011971296D22ECC2490E08C299D2921E08A
:10FA5000FA010C0120935700E89511244E5F5F4F87
:10FA60006250704051F725E0F80120935700E89567
:10FA700007B600FCFDCF81E180935700E89512C0E6
:10FA8000A801FB01D10141BD52BD4F5F5F4F8D9178
:10FA900080BDFA9AF99AF999FECF3197A1F7A8019A
:10FAA000460F571F1A828A0138C07A8066248B81DC
:10FAB000A82FB0E0A629B7291A828981843191F450
:10FAC000BD019E012D5F3F4FF80185919491F90191
:10FAD000808391832E5F3F4F0E5F1F4F62507040B7
:10FAE00099F713C0A801BD019E012D5F3F4F41BD95
:10FAF00052BD4F5F5F4FF89A80B5F90181939F0126
:10FB000061507040A1F70A0F1B1FAD014D5F5F4FA1
:10FB1000F901108204C080EC8A8342E050E090E05A
:10FB2000FBE1F093C6008091C00086FFFCCF80917E
:10FB3000C00080648093C0005092C6008091C000D5
:10FB400086FFFCCF8091C00080648093C000652F49
:10FB50005093C6008091C00086FFFCCF8091C0000A
:10FB600080648093C000342F4093C6008091C00011
:10FB700086FFFCCF8091C00080648093C0008EE03F
:10FB80008093C6008091C00086FFFCCF8091C000AA
:10FB900080648093C00025E1252523272627FE01C8
:10FBA000319610C030813093C6008091C00086FF2E
:10FBB000FCCF31968091C00080648093C0002327E1
:10FBC000415050404115510569F72093C60080917E
:10FBD000C00086FFFCCF8091C00080648093C0008D
:10FBE000992349F4539441ED5AE363E570E090E0C2
:10FBF000A0E0B0E030CE5A9881E180935700E895BC
:10FC000011241F921F920895FFCF9981933109F417
:10FC1000FACE9431C8F4963009F4EACE973050F415
:10FC2000923009F46CCE933009F49BCE913009F0F8
:10FC300072CF81CE913109F4A7CE923108F0E1CE96
:10FC4000903109F068CF5BCE983109F4B4CE993188
:10FC500050F4953109F4D7CE953108F426CF96317A
:10FC600009F059CF22CF9B3109F493CE9C3120F477
:10FC70009A3109F050CF98CE9D3109F442CE9F328F
:06FC800009F049CFB8CFE6
:040000030000F80001
:00000001FF

View File

@@ -1,713 +0,0 @@
/**********************************************************/
/* Serial Bootloader for Atmel megaAVR Controllers */
/* */
/* tested with ATmega644 and ATmega644P */
/* should work with other mega's, see code for details */
/* */
/* ATmegaBOOT.c */
/* */
/* 20090131: Added 324P support from Alex Leone */
/* Marius Kintel */
/* 20080915: applied ADABoot mods for Sanguino 644P */
/* Brian Riley */
/* 20080711: hacked for Sanguino by Zach Smith */
/* and Justin Day */
/* 20070626: hacked for Arduino Diecimila (which auto- */
/* resets when a USB connection is made to it) */
/* by D. Mellis */
/* 20060802: hacked for Arduino by D. Cuartielles */
/* based on a previous hack by D. Mellis */
/* and D. Cuartielles */
/* */
/* Monitor and debug functions were added to the original */
/* code by Dr. Erik Lins, chip45.com. (See below) */
/* */
/* Thanks to Karl Pitrich for fixing a bootloader pin */
/* problem and more informative LED blinking! */
/* */
/* For the latest version see: */
/* http://www.chip45.com/ */
/* */
/* ------------------------------------------------------ */
/* */
/* based on stk500boot.c */
/* Copyright (c) 2003, Jason P. Kyle */
/* All rights reserved. */
/* see avr1.org for original file and information */
/* */
/* This program is free software; you can redistribute it */
/* and/or modify it under the terms of the GNU General */
/* Public License as published by the Free Software */
/* Foundation; either version 2 of the License, or */
/* (at your option) any later version. */
/* */
/* This program is distributed in the hope that it will */
/* be useful, but WITHOUT ANY WARRANTY; without even the */
/* implied warranty of MERCHANTABILITY or FITNESS FOR A */
/* PARTICULAR PURPOSE. See the GNU General Public */
/* License for more details. */
/* */
/* You should have received a copy of the GNU General */
/* Public License along with this program; if not, write */
/* to the Free Software Foundation, Inc., */
/* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/* */
/* Licence can be viewed at */
/* http://www.fsf.org/licenses/gpl.txt */
/* */
/* Target = Atmel AVR m128,m64,m32,m16,m8,m162,m163,m169, */
/* m8515,m8535. ATmega161 has a very small boot block so */
/* isn't supported. */
/* */
/* Tested with m168 */
/**********************************************************/
/* $Id$ */
/* some includes */
#include <inttypes.h>
#include <avr/io.h>
#include <avr/pgmspace.h>
#include <avr/interrupt.h>
#include <avr/wdt.h>
#include <avr/boot.h>
#ifdef ADABOOT
#define NUM_LED_FLASHES 3
#define ADABOOT_VER 1
#endif
/* 20070707: hacked by David A. Mellis - after this many errors give up and launch application */
#define MAX_ERROR_COUNT 5
/* set the UART baud rate */
/* 20080711: hack by Zach Hoeken */
#define BAUD_RATE 38400
/* SW_MAJOR and MINOR needs to be updated from time to time to avoid warning message from AVR Studio */
/* never allow AVR Studio to do an update !!!! */
#define HW_VER 0x02
#define SW_MAJOR 0x01
#define SW_MINOR 0x10
/* onboard LED is used to indicate, that the bootloader was entered (3x flashing) */
/* if monitor functions are included, LED goes on after monitor was entered */
#define LED_DDR DDRB
#define LED_PORT PORTB
#define LED_PIN PINB
#define LED PINB0
/* define various device id's */
/* manufacturer byte is always the same */
#define SIG1 0x1E // Yep, Atmel is the only manufacturer of AVR micros. Single source :(
#if defined(__AVR_ATmega644P__)
#define SIG2 0x96
#define SIG3 0x0A
#elif defined(__AVR_ATmega644__)
#define SIG2 0x96
#define SIG3 0x09
#elif defined(__AVR_ATmega324P__)
#define SIG2 0x95
#define SIG3 0x08
#endif
#define PAGE_SIZE 0x080U //128 words
#define PAGE_SIZE_BYTES 0x100U //256 bytes
/* function prototypes */
void putch(char);
char getch(void);
void getNch(uint8_t);
void byte_response(uint8_t);
void nothing_response(void);
char gethex(void);
void puthex(char);
void flash_led(uint8_t);
/* some variables */
union address_union
{
uint16_t word;
uint8_t byte[2];
} address;
union length_union
{
uint16_t word;
uint8_t byte[2];
} length;
struct flags_struct
{
unsigned eeprom : 1;
unsigned rampz : 1;
} flags;
uint8_t buff[256];
uint8_t error_count = 0;
uint8_t sreg;
void (*app_start)(void) = 0x0000;
/* main program starts here */
int main(void)
{
uint8_t ch,ch2;
uint16_t w;
uint16_t i;
asm volatile("nop\n\t");
#ifdef ADABOOT // BBR/LF 10/8/2007 & 9/13/2008
ch = MCUSR;
MCUSR = 0;
WDTCSR |= _BV(WDCE) | _BV(WDE);
WDTCSR = 0;
// Check if the WDT was used to reset, in which case we dont bootload and skip straight to the code. woot.
if (! (ch & _BV(EXTRF))) // if its a not an external reset...
app_start(); // skip bootloader
#endif
//initialize our serial port.
UBRR0L = (uint8_t)(F_CPU/(BAUD_RATE*16L)-1);
UBRR0H = (F_CPU/(BAUD_RATE*16L)-1) >> 8;
UCSR0B = (1<<RXEN0) | (1<<TXEN0);
UCSR0C = (1<<UCSZ00) | (1<<UCSZ01);
/* Enable internal pull-up resistor on pin D0 (RX), in order
to supress line noise that prevents the bootloader from
timing out (DAM: 20070509) */
DDRD &= ~_BV(PIND0);
PORTD |= _BV(PIND0);
/* set LED pin as output */
LED_DDR |= _BV(LED);
/* flash onboard LED to signal entering of bootloader */
/* ADABOOT will do two series of flashes. first 4 - signifying ADABOOT */
/* then a pause and another flash series signifying ADABOOT sub-version */
flash_led(NUM_LED_FLASHES);
#ifdef ADABOOT
flash_led(ADABOOT_VER); // BBR 9/13/2008
#endif
/* forever loop */
for (;;)
{
/* get character from UART */
ch = getch();
/* A bunch of if...else if... gives smaller code than switch...case ! */
/* Hello is anyone home ? */
if(ch=='0')
nothing_response();
/* Request programmer ID */
/* Not using PROGMEM string due to boot block in m128 being beyond 64kB boundry */
/* Would need to selectively manipulate RAMPZ, and it's only 9 characters anyway so who cares. */
else if(ch=='1')
{
if (getch() == ' ')
{
putch(0x14);
putch('A');
putch('V');
putch('R');
putch(' ');
putch('I');
putch('S');
putch('P');
putch(0x10);
}
else
{
if (++error_count == MAX_ERROR_COUNT)
app_start();
}
}
/* AVR ISP/STK500 board commands DON'T CARE so default nothing_response */
else if(ch=='@')
{
ch2 = getch();
if (ch2 > 0x85)
getch();
nothing_response();
}
/* AVR ISP/STK500 board requests */
else if(ch=='A')
{
ch2 = getch();
if(ch2 == 0x80)
byte_response(HW_VER); // Hardware version
else if(ch2==0x81)
byte_response(SW_MAJOR); // Software major version
else if(ch2==0x82)
byte_response(SW_MINOR); // Software minor version
else if(ch2==0x98)
byte_response(0x03); // Unknown but seems to be required by avr studio 3.56
else
byte_response(0x00); // Covers various unnecessary responses we don't care about
}
/* Device Parameters DON'T CARE, DEVICE IS FIXED */
else if(ch=='B')
{
getNch(20);
nothing_response();
}
/* Parallel programming stuff DON'T CARE */
else if(ch=='E')
{
getNch(5);
nothing_response();
}
/* Enter programming mode */
else if(ch=='P')
{
nothing_response();
}
/* Leave programming mode */
else if(ch=='Q')
{
nothing_response();
#ifdef ADABOOT
// autoreset via watchdog (sneaky!) BBR/LF 9/13/2008
WDTCSR = _BV(WDE);
while (1); // 16 ms
#endif
}
/* Erase device, don't care as we will erase one page at a time anyway. */
else if(ch=='R')
{
nothing_response();
}
/* Set address, little endian. EEPROM in bytes, FLASH in words */
/* Perhaps extra address bytes may be added in future to support > 128kB FLASH. */
/* This might explain why little endian was used here, big endian used everywhere else. */
else if(ch=='U')
{
address.byte[0] = getch();
address.byte[1] = getch();
nothing_response();
}
/* Universal SPI programming command, disabled. Would be used for fuses and lock bits. */
else if(ch=='V')
{
getNch(4);
byte_response(0x00);
}
/* Write memory, length is big endian and is in bytes */
else if(ch=='d')
{
length.byte[1] = getch();
length.byte[0] = getch();
flags.eeprom = 0;
if (getch() == 'E')
flags.eeprom = 1;
for (i=0; i<PAGE_SIZE; i++)
buff[i] = 0;
for (w = 0; w < length.word; w++)
{
// Store data in buffer, can't keep up with serial data stream whilst programming pages
buff[w] = getch();
}
if (getch() == ' ')
{
if (flags.eeprom)
{
//Write to EEPROM one byte at a time
for(w=0;w<length.word;w++)
{
while(EECR & (1<<EEPE));
EEAR = (uint16_t)(void *)address.word;
EEDR = buff[w];
EECR |= (1<<EEMPE);
EECR |= (1<<EEPE);
address.word++;
}
}
else
{
//address * 2 -> byte location
address.word = address.word << 1;
//Even up an odd number of bytes
if ((length.byte[0] & 0x01))
length.word++;
// HACKME: EEPE used to be EEWE
//Wait for previous EEPROM writes to complete
//while(bit_is_set(EECR,EEPE));
while(EECR & (1<<EEPE));
asm volatile(
"clr r17 \n\t" //page_word_count
"lds r30,address \n\t" //Address of FLASH location (in bytes)
"lds r31,address+1 \n\t"
"ldi r28,lo8(buff) \n\t" //Start of buffer array in RAM
"ldi r29,hi8(buff) \n\t"
"lds r24,length \n\t" //Length of data to be written (in bytes)
"lds r25,length+1 \n\t"
"length_loop: \n\t" //Main loop, repeat for number of words in block
"cpi r17,0x00 \n\t" //If page_word_count=0 then erase page
"brne no_page_erase \n\t"
"wait_spm1: \n\t"
"lds r16,%0 \n\t" //Wait for previous spm to complete
"andi r16,1 \n\t"
"cpi r16,1 \n\t"
"breq wait_spm1 \n\t"
"ldi r16,0x03 \n\t" //Erase page pointed to by Z
"sts %0,r16 \n\t"
"spm \n\t"
"wait_spm2: \n\t"
"lds r16,%0 \n\t" //Wait for previous spm to complete
"andi r16,1 \n\t"
"cpi r16,1 \n\t"
"breq wait_spm2 \n\t"
"ldi r16,0x11 \n\t" //Re-enable RWW section
"sts %0,r16 \n\t"
"spm \n\t"
"no_page_erase: \n\t"
"ld r0,Y+ \n\t" //Write 2 bytes into page buffer
"ld r1,Y+ \n\t"
"wait_spm3: \n\t"
"lds r16,%0 \n\t" //Wait for previous spm to complete
"andi r16,1 \n\t"
"cpi r16,1 \n\t"
"breq wait_spm3 \n\t"
"ldi r16,0x01 \n\t" //Load r0,r1 into FLASH page buffer
"sts %0,r16 \n\t"
"spm \n\t"
"inc r17 \n\t" //page_word_count++
"cpi r17,%1 \n\t"
"brlo same_page \n\t" //Still same page in FLASH
"write_page: \n\t"
"clr r17 \n\t" //New page, write current one first
"wait_spm4: \n\t"
"lds r16,%0 \n\t" //Wait for previous spm to complete
"andi r16,1 \n\t"
"cpi r16,1 \n\t"
"breq wait_spm4 \n\t"
"ldi r16,0x05 \n\t" //Write page pointed to by Z
"sts %0,r16 \n\t"
"spm \n\t"
"wait_spm5: \n\t"
"lds r16,%0 \n\t" //Wait for previous spm to complete
"andi r16,1 \n\t"
"cpi r16,1 \n\t"
"breq wait_spm5 \n\t"
"ldi r16,0x11 \n\t" //Re-enable RWW section
"sts %0,r16 \n\t"
"spm \n\t"
"same_page: \n\t"
"adiw r30,2 \n\t" //Next word in FLASH
"sbiw r24,2 \n\t" //length-2
"breq final_write \n\t" //Finished
"rjmp length_loop \n\t"
"final_write: \n\t"
"cpi r17,0 \n\t"
"breq block_done \n\t"
"adiw r24,2 \n\t" //length+2, fool above check on length after short page write
"rjmp write_page \n\t"
"block_done: \n\t"
"clr __zero_reg__ \n\t" //restore zero register
: "=m" (SPMCSR) : "M" (PAGE_SIZE) : "r0","r16","r17","r24","r25","r28","r29","r30","r31"
);
}
putch(0x14);
putch(0x10);
}
else
{
if (++error_count == MAX_ERROR_COUNT)
app_start();
}
}
/* Read memory block mode, length is big endian. */
else if(ch=='t')
{
length.byte[1] = getch();
length.byte[0] = getch();
if (getch() == 'E')
flags.eeprom = 1;
else
{
flags.eeprom = 0;
address.word = address.word << 1; // address * 2 -> byte location
}
// Command terminator
if (getch() == ' ')
{
putch(0x14);
for (w=0; w<length.word; w++)
{
// Can handle odd and even lengths okay
if (flags.eeprom)
{
// Byte access EEPROM read
while(EECR & (1<<EEPE));
EEAR = (uint16_t)(void *)address.word;
EECR |= (1<<EERE);
putch(EEDR);
address.word++;
}
else
{
if (!flags.rampz)
putch(pgm_read_byte_near(address.word));
address.word++;
}
}
putch(0x10);
}
}
/* Get device signature bytes */
else if(ch=='u')
{
if (getch() == ' ')
{
putch(0x14);
putch(SIG1);
putch(SIG2);
putch(SIG3);
putch(0x10);
}
else
{
if (++error_count == MAX_ERROR_COUNT)
app_start();
}
}
/* Read oscillator calibration byte */
else if(ch=='v')
byte_response(0x00);
else if (++error_count == MAX_ERROR_COUNT)
app_start();
}
/* end of forever loop */
}
char gethex(void)
{
char ah,al;
ah = getch();
putch(ah);
al = getch();
putch(al);
if(ah >= 'a')
ah = ah - 'a' + 0x0a;
else if(ah >= '0')
ah -= '0';
if(al >= 'a')
al = al - 'a' + 0x0a;
else if(al >= '0')
al -= '0';
return (ah << 4) + al;
}
void puthex(char ch)
{
char ah,al;
ah = (ch & 0xf0) >> 4;
if(ah >= 0x0a)
ah = ah - 0x0a + 'a';
else
ah += '0';
al = (ch & 0x0f);
if(al >= 0x0a)
al = al - 0x0a + 'a';
else
al += '0';
putch(ah);
putch(al);
}
void putch(char ch)
{
while (!(UCSR0A & _BV(UDRE0)));
UDR0 = ch;
}
char getch(void)
{
uint32_t count = 0;
#ifdef ADABOOT
LED_PORT &= ~_BV(LED); // toggle LED to show activity - BBR/LF 10/3/2007 & 9/13/2008
#endif
while(!(UCSR0A & _BV(RXC0)))
{
/* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/
/* HACKME:: here is a good place to count times*/
count++;
if (count > MAX_TIME_COUNT)
app_start();
}
#ifdef ADABOOT
LED_PORT |= _BV(LED); // toggle LED to show activity - BBR/LF 10/3/2007 & 9/13/2008
#endif
return UDR0;
}
void getNch(uint8_t count)
{
uint8_t i;
for(i=0;i<count;i++)
{
while(!(UCSR0A & _BV(RXC0)));
UDR0;
}
}
void byte_response(uint8_t val)
{
if (getch() == ' ')
{
putch(0x14);
putch(val);
putch(0x10);
}
else
{
if (++error_count == MAX_ERROR_COUNT)
app_start();
}
}
void nothing_response(void)
{
if (getch() == ' ')
{
putch(0x14);
putch(0x10);
}
else
{
if (++error_count == MAX_ERROR_COUNT)
app_start();
}
}
#ifdef ADABOOT
void flash_led(uint8_t count)
{
/* flash onboard LED count times to signal entering of bootloader */
/* l needs to be volatile or the delay loops below might get */
/* optimized away if compiling with optimizations (DAM). */
volatile uint32_t l;
if (count == 0) {
count = ADABOOT;
}
int8_t i;
for (i = 0; i < count; ++i) {
LED_PORT |= _BV(LED); // LED on
for(l = 0; l < (F_CPU / 1000); ++l); // delay NGvalue was 1000 for both loops - BBR
LED_PORT &= ~_BV(LED); // LED off
for(l = 0; l < (F_CPU / 250); ++l); // delay asymmteric for ADA BOOT BBR
}
for(l = 0; l < (F_CPU / 100); ++l); // pause ADA BOOT BBR
}
#else
void flash_led(uint8_t count)
{
/* flash onboard LED three times to signal entering of bootloader */
/* l needs to be volatile or the delay loops below might get
optimized away if compiling with optimizations (DAM). */
volatile uint32_t l;
if (count == 0) {
count = 3;
}
int8_t i;
for (i = 0; i < count; ++i) {
LED_PORT |= _BV(LED);
for(l = 0; l < (F_CPU / 1000); ++l);
LED_PORT &= ~_BV(LED);
for(l = 0; l < (F_CPU / 1000); ++l);
}
}
#endif
/* end of file ATmegaBOOT.c */

View File

@@ -1,121 +0,0 @@
:10F800000C943E7C0C945B7C0C945B7C0C945B7C39
:10F810000C945B7C0C945B7C0C945B7C0C945B7C0C
:10F820000C945B7C0C945B7C0C945B7C0C945B7CFC
:10F830000C945B7C0C945B7C0C945B7C0C945B7CEC
:10F840000C945B7C0C945B7C0C945B7C0C945B7CDC
:10F850000C945B7C0C945B7C0C945B7C0C945B7CCC
:10F860000C945B7C0C945B7C0C945B7C0C945B7CBC
:10F870000C945B7C0C945B7C0C945B7C11241FBE11
:10F88000CFEFD8E0DEBFCDBF11E0A0E0B1E0E6E60B
:10F89000FFEF02C005900D92A030B107D9F712E03A
:10F8A000A0E0B1E001C01D92A930B107E1F70E94CC
:10F8B000537D0C94B27F0C94007CCF93DF93CDB733
:10F8C000DEB724970FB6F894DEBF0FBECDBF8823F6
:10F8D00009F481E020E0482F55274115510509F42E
:10F8E0003DC0289A19821A821B821C820BC0898112
:10F8F0009A81AB81BC810196A11DB11D89839A8338
:10F90000AB83BC8389819A81AB81BC8180589E4343
:10F91000A040B04060F3289819821A821B821C8292
:10F920000BC089819A81AB81BC810196A11DB11D5B
:10F9300089839A83AB83BC8389819A81AB81BC81A3
:10F9400080509A4FA040B04060F32F5F822F9927DC
:10F9500087FD9095841795070CF4C3CF19821A82FE
:10F960001B821C8289819A81AB81BC818050914726
:10F97000A240B040A0F489819A81AB81BC810196FC
:10F98000A11DB11D89839A83AB83BC8389819A8130
:10F99000AB81BC8180509147A240B04060F3249677
:10F9A0000FB6F894DEBF0FBECDBFDF91CF910895A3
:10F9B000EF92FF920F931F93EE24FF248701289864
:10F9C0008091C00087FD17C00894E11CF11C011D47
:10F9D000111D81E0E81689E0F8068DE3080780E054
:10F9E000180770F3E0910001F091010109958091F1
:10F9F000C00087FFE9CF289A8091C600992787FD2C
:10FA000090951F910F91FF90EF900895982F8091FE
:10FA1000C00085FFFCCF9093C60008950E94D87C5B
:10FA2000803271F0809102018F5F809302018530F6
:10FA300009F00895E0910001F09101010995089500
:10FA400084E10E94067D80E10E94067D0895CF93A7
:10FA5000C82F0E94D87C803241F0809102018F5FD4
:10FA600080930201853081F40AC084E10E94067D02
:10FA70008C2F0E94067D80E10E94067D05C0E091EA
:10FA80000001F09101010995CF910895282F90E090
:10FA900007C08091C0008823E4F78091C6009F5F73
:10FAA0009217B8F30895CFEFD8E0DEBFCDBF0000C6
:10FAB00094B714BE809160008861809360001092BA
:10FAC000600091FF74C189E18093C4001092C50069
:10FAD00088E18093C10086E08093C2005098589AD4
:10FAE000209A83E00E945D7C81E00E945D7C0E9400
:10FAF000D87C8033B9F18133C1F1803409F456C028
:10FB0000813409F45CC0823409F46EC0853409F490
:10FB100071C0803539F1813509F4F3C0823511F1B6
:10FB2000853509F4D3C0863509F4CBC0843609F491
:10FB300065C0843709F4EBC0853709F4D2C0863735
:10FB400009F44AC0809102018F5F809302018530E1
:10FB500071F6E0910001F091010109950E94D87CB5
:10FB6000803349F60E940E7DC2CF0E94D87CC82FF8
:10FB7000803241F784E10E94067D81E40E94067D87
:10FB800086E50E94067D82E50E94067D8C2F0E94FC
:10FB9000067D89E40E94067D83E50E94067D80E55E
:10FBA0000E94067D80E10E94067DA1CF0E94D87C44
:10FBB0008638C0F20E94D87C0E940E7D98CF0E94A9
:10FBC000D87C803809F407C1813809F400C1823833
:10FBD00009F4F9C0883921F080E00E94277D87CFA1
:10FBE00083E00E94277D83CF84E10E94467D0E94AE
:10FBF0000E7D7DCF85E00E94467DF9CF0E94D87CA6
:10FC0000809306020E94D87C8093050280910802AE
:10FC10008E7F809308020E94D87C853409F44BC003
:10FC2000E5E0F1E0119281E0E438F807D9F3D0F390
:10FC3000C0E0D0E0809105029091060218161906E6
:10FC400078F405E011E00E94D87CF80181938F01DF
:10FC500021968091050290910602C817D90798F362
:10FC60000E94D87C803209F06DCF8091080280FF1D
:10FC7000B6C0C0E0D0E02091050230910602121615
:10FC80001306B8F4E0910301F0910401A5E0B1E09E
:10FC9000F999FECFF2BDE1BD8D9180BDFA9AF99A36
:10FCA00031962196C217D30798F3F0930401E0939D
:10FCB000030184E175CF809108028160809308027E
:10FCC000AFCF84E00E94467D80E087CF0E94D87C41
:10FCD000809303010E94D87C809304010E940E7DD2
:10FCE00006CF0E94D87C803209F02CCF84E10E949C
:10FCF000067D8EE10E94067D85E90E94067D88E0F2
:10FD00004FCF0E940E7D88E080936000FFCF0E945D
:10FD1000D87C809306020E94D87C809305020E94C2
:10FD2000D87C853409F449C0809108028E7F809385
:10FD300008028091030190910401880F991F90930C
:10FD40000401809303010E94D87C803209F0CFCE59
:10FD500084E10E94067DC0E0D0E020910502309150
:10FD600006021216130608F01DCFE0910301F09170
:10FD700004018091080280FF96C0F999FECFF2BD80
:10FD8000E1BDF89A80B50E94067DE0910301F091F3
:10FD900004013196F0930401E093030120910502E0
:10FDA000309106022196C217D30718F3FBCEE091DB
:10FDB0000001F0910101099586CE809108028160D1
:10FDC00080930802C0CF80E10E94277D90CE81E021
:10FDD0000E94277D8CCE82E00E94277D88CE809174
:10FDE000030190910401880F991F9093040180935F
:10FDF00003018091050280FF09C080910502909166
:10FE0000060201969093060280930502F999FECFAF
:10FE10001127E0910301F0910401C5E0D1E0809148
:10FE2000050290910602103091F400915700017084
:10FE30000130D9F303E000935700E8950091570093
:10FE400001700130D9F301E100935700E895099062
:10FE500019900091570001700130D9F301E000932F
:10FE60005700E8951395103898F011270091570026
:10FE700001700130D9F305E000935700E895009137
:10FE8000570001700130D9F301E100935700E89564
:10FE90003296029709F0C7CF103011F00296E5CFE5
:10FEA000112484E17DCE869580FF06C03196F093C3
:10FEB0000401E093030176CF84910E94067D209196
:10FEC000050230910602E0910301F0910401EECFAA
:10FED0001F93CF930E94D87CC82F0E94067D0E945A
:10FEE000D87C182F0E94067DC1362CF0C7551136DC
:10FEF0003CF0175508C0C033D4F3C0531136CCF7CB
:10FF000010330CF01053C295C07FC10F8C2F99276E
:10FF100087FD9095CF911F910895CF93282F992712
:10FF200087FD9095807F907095958795959587959D
:10FF300095958795959587958A303CF0895AC22F7B
:10FF4000CF70CA303CF0C95A06C0805DC22FCF7056
:10FF5000CA30CCF7C05D0E94067D8C2F0E94067DC2
:06FF6000CF910895FFCFD0
:040000030000F80001
:00000001FF

View File

@@ -1,120 +0,0 @@
:10F800000C94387C0C94557C0C94557C0C94557C51
:10F810000C94557C0C94557C0C94557C0C94557C24
:10F820000C94557C0C94557C0C94557C0C94557C14
:10F830000C94557C0C94557C0C94557C0C94557C04
:10F840000C94557C0C94557C0C94557C0C94557CF4
:10F850000C94557C0C94557C0C94557C0C94557CE4
:10F860000C94557C0C94557C0C94557C0C94557CD4
:10F8700011241FBECFEFD0E1DEBFCDBF11E0A0E06D
:10F88000B1E0EAE5FFEF02C005900D92A030B107AC
:10F89000D9F712E0A0E0B1E001C01D92A930B10794
:10F8A000E1F70E944D7D0C94AC7F0C94007CCF93CB
:10F8B000DF93CDB7DEB724970FB6F894DEBF0FBE47
:10F8C000CDBF882309F481E020E0482F552741155A
:10F8D000510509F43DC0289A19821A821B821C82A4
:10F8E0000BC089819A81AB81BC810196A11DB11D9C
:10F8F00089839A83AB83BC8389819A81AB81BC81E4
:10F9000080589E43A040B04060F3289819821A8224
:10F910001B821C820BC089819A81AB81BC810196BC
:10F92000A11DB11D89839A83AB83BC8389819A8190
:10F93000AB81BC8180509A4FA040B04060F32F5FF4
:10F94000822F992787FD9095841795070CF4C3CFD4
:10F9500019821A821B821C8289819A81AB81BC81A7
:10F9600080509147A240B040A0F489819A81AB8138
:10F97000BC810196A11DB11D89839A83AB83BC8391
:10F9800089819A81AB81BC8180509147A240B0406F
:10F9900060F324960FB6F894DEBF0FBECDBFDF91A3
:10F9A000CF910895EF92FF920F931F93EE24FF24BF
:10F9B000870128988091C00087FD17C00894E11C3A
:10F9C000F11C011D111D81E0E81689E0F8068DE3A8
:10F9D000080780E0180770F3E0910001F091010141
:10F9E00009958091C00087FFE9CF289A8091C600D1
:10F9F000992787FD90951F910F91FF90EF900895A3
:10FA0000982F8091C00085FFFCCF9093C600089589
:10FA10000E94D27C803271F0809102018F5F8093CE
:10FA20000201853009F00895E0910001F091010193
:10FA30000995089584E10E94007D80E10E94007D87
:10FA40000895CF93C82F0E94D27C803241F08091DC
:10FA500002018F5F80930201853081F40AC084E146
:10FA60000E94007D8C2F0E94007D80E10E94007D1D
:10FA700005C0E0910001F09101010995CF91089531
:10FA8000282F90E007C08091C0008823E4F7809180
:10FA9000C6009F5F9217B8F30895CFEFD0E1DEBFA5
:10FAA000CDBF000094B714BE809160008861809340
:10FAB00060001092600091FF74C189E18093C400DE
:10FAC0001092C50088E18093C10086E08093C20057
:10FAD0005098589A209A83E00E94577C81E00E94B7
:10FAE000577C0E94D27C8033B9F18133C1F18034DC
:10FAF00009F456C0813409F45CC0823409F46EC044
:10FB0000853409F471C0803539F1813509F4F3C0C9
:10FB1000823511F1853509F4D3C0863509F4CBC09F
:10FB2000843609F465C0843709F4EBC0853709F4DD
:10FB3000D2C0863709F44AC0809102018F5F80935A
:10FB40000201853071F6E0910001F0910101099503
:10FB50000E94D27C803349F60E94087DC2CF0E9469
:10FB6000D27CC82F803241F784E10E94007D81E47D
:10FB70000E94007D86E50E94007D82E50E94007D56
:10FB80008C2F0E94007D89E40E94007D83E50E9405
:10FB9000007D80E50E94007D80E10E94007DA1CF74
:10FBA0000E94D27C8638C0F20E94D27C0E94087DDE
:10FBB00098CF0E94D27C803809F407C1813809F4BB
:10FBC00000C1823809F4F9C0883921F080E00E9430
:10FBD000217D87CF83E00E94217D83CF84E10E9435
:10FBE000407D0E94087D7DCF85E00E94407DF9CF59
:10FBF0000E94D27C809306020E94D27C80930502F0
:10FC0000809108028E7F809308020E94D27C853406
:10FC100009F44BC0E5E0F1E0119281E0E438F80727
:10FC2000D9F3D0F3C0E0D0E08091050290910602B4
:10FC30001816190678F405E011E00E94D27CF8014C
:10FC400081938F0121968091050290910602C81739
:10FC5000D90798F30E94D27C803209F06DCF809151
:10FC6000080280FFB6C0C0E0D0E0209105023091CC
:10FC7000060212161306B8F4E0910301F091040194
:10FC8000A5E0B1E0F999FECFF2BDE1BD8D9180BD57
:10FC9000FA9AF99A31962196C217D30798F3F093FE
:10FCA0000401E093030184E175CF80910802816033
:10FCB00080930802AFCF84E00E94407D80E087CF30
:10FCC0000E94D27C809303010E94D27C8093040125
:10FCD0000E94087D06CF0E94D27C803209F02CCF92
:10FCE00084E10E94007D8EE10E94007D86E90E94F1
:10FCF000007D89E04FCF0E94087D88E080936000FE
:10FD0000FFCF0E94D27C809306020E94D27C809317
:10FD100005020E94D27C853409F449C08091080212
:10FD20008E7F809308028091030190910401880FD7
:10FD3000991F90930401809303010E94D27C80322A
:10FD400009F0CFCE84E10E94007DC0E0D0E0209198
:10FD50000502309106021216130608F01DCFE0913D
:10FD60000301F09104018091080280FF96C0F99987
:10FD7000FECFF2BDE1BDF89A80B50E94007DE09112
:10FD80000301F09104013196F0930401E093030123
:10FD900020910502309106022196C217D30718F36D
:10FDA000FBCEE0910001F0910101099586CE809192
:10FDB0000802816080930802C0CF80E10E94217D0B
:10FDC00090CE81E00E94217D8CCE82E00E94217D38
:10FDD00088CE8091030190910401880F991F909320
:10FDE0000401809303018091050280FF09C0809186
:10FDF00005029091060201969093060280930502F7
:10FE0000F999FECF1127E0910301F0910401C5E0BB
:10FE1000D1E08091050290910602103091F400919A
:10FE2000570001700130D9F303E000935700E895C3
:10FE30000091570001700130D9F301E100935700A0
:10FE4000E895099019900091570001700130D9F39D
:10FE500001E000935700E8951395103898F01127AA
:10FE60000091570001700130D9F305E0009357006D
:10FE7000E8950091570001700130D9F301E100933A
:10FE80005700E8953296029709F0C7CF103011F06D
:10FE90000296E5CF112484E17DCE869580FF06C0D1
:10FEA0003196F0930401E093030176CF84910E9490
:10FEB000007D2091050230910602E0910301F0914E
:10FEC0000401EECF1F93CF930E94D27CC82F0E94D3
:10FED000007D0E94D27C182F0E94007DC1362CF03C
:10FEE000C75511363CF0175508C0C033D4F3C05382
:10FEF0001136CCF710330CF01053C295C07FC10FF0
:10FF00008C2F992787FD9095CF911F910895CF93BE
:10FF1000282F992787FD9095807F907095958795DC
:10FF20009595879595958795959587958A303CF019
:10FF3000895AC22FCF70CA303CF0C95A06C0805DC2
:10FF4000C22FCF70CA30CCF7C05D0E94007D8C2FCD
:0AFF50000E94007DCF910895FFCFBD
:040000030000F80001
:00000001FF

View File

@@ -1,121 +0,0 @@
:10F800000C943E7C0C945B7C0C945B7C0C945B7C39
:10F810000C945B7C0C945B7C0C945B7C0C945B7C0C
:10F820000C945B7C0C945B7C0C945B7C0C945B7CFC
:10F830000C945B7C0C945B7C0C945B7C0C945B7CEC
:10F840000C945B7C0C945B7C0C945B7C0C945B7CDC
:10F850000C945B7C0C945B7C0C945B7C0C945B7CCC
:10F860000C945B7C0C945B7C0C945B7C0C945B7CBC
:10F870000C945B7C0C945B7C0C945B7C11241FBE11
:10F88000CFEFD0E1DEBFCDBF11E0A0E0B1E0E6E612
:10F89000FFEF02C005900D92A030B107D9F712E03A
:10F8A000A0E0B1E001C01D92A930B107E1F70E94CC
:10F8B000537D0C94B27F0C94007CCF93DF93CDB733
:10F8C000DEB724970FB6F894DEBF0FBECDBF8823F6
:10F8D00009F481E020E0482F55274115510509F42E
:10F8E0003DC0289A19821A821B821C820BC0898112
:10F8F0009A81AB81BC810196A11DB11D89839A8338
:10F90000AB83BC8389819A81AB81BC8180589E4343
:10F91000A040B04060F3289819821A821B821C8292
:10F920000BC089819A81AB81BC810196A11DB11D5B
:10F9300089839A83AB83BC8389819A81AB81BC81A3
:10F9400080509A4FA040B04060F32F5F822F9927DC
:10F9500087FD9095841795070CF4C3CF19821A82FE
:10F960001B821C8289819A81AB81BC818050914726
:10F97000A240B040A0F489819A81AB81BC810196FC
:10F98000A11DB11D89839A83AB83BC8389819A8130
:10F99000AB81BC8180509147A240B04060F3249677
:10F9A0000FB6F894DEBF0FBECDBFDF91CF910895A3
:10F9B000EF92FF920F931F93EE24FF248701289864
:10F9C0008091C00087FD17C00894E11CF11C011D47
:10F9D000111D81E0E81689E0F8068DE3080780E054
:10F9E000180770F3E0910001F091010109958091F1
:10F9F000C00087FFE9CF289A8091C600992787FD2C
:10FA000090951F910F91FF90EF900895982F8091FE
:10FA1000C00085FFFCCF9093C60008950E94D87C5B
:10FA2000803271F0809102018F5F809302018530F6
:10FA300009F00895E0910001F09101010995089500
:10FA400084E10E94067D80E10E94067D0895CF93A7
:10FA5000C82F0E94D87C803241F0809102018F5FD4
:10FA600080930201853081F40AC084E10E94067D02
:10FA70008C2F0E94067D80E10E94067D05C0E091EA
:10FA80000001F09101010995CF910895282F90E090
:10FA900007C08091C0008823E4F78091C6009F5F73
:10FAA0009217B8F30895CFEFD0E1DEBFCDBF0000CD
:10FAB00094B714BE809160008861809360001092BA
:10FAC000600091FF74C189E18093C4001092C50069
:10FAD00088E18093C10086E08093C2005098589AD4
:10FAE000209A83E00E945D7C81E00E945D7C0E9400
:10FAF000D87C8033B9F18133C1F1803409F456C028
:10FB0000813409F45CC0823409F46EC0853409F490
:10FB100071C0803539F1813509F4F3C0823511F1B6
:10FB2000853509F4D3C0863509F4CBC0843609F491
:10FB300065C0843709F4EBC0853709F4D2C0863735
:10FB400009F44AC0809102018F5F809302018530E1
:10FB500071F6E0910001F091010109950E94D87CB5
:10FB6000803349F60E940E7DC2CF0E94D87CC82FF8
:10FB7000803241F784E10E94067D81E40E94067D87
:10FB800086E50E94067D82E50E94067D8C2F0E94FC
:10FB9000067D89E40E94067D83E50E94067D80E55E
:10FBA0000E94067D80E10E94067DA1CF0E94D87C44
:10FBB0008638C0F20E94D87C0E940E7D98CF0E94A9
:10FBC000D87C803809F407C1813809F400C1823833
:10FBD00009F4F9C0883921F080E00E94277D87CFA1
:10FBE00083E00E94277D83CF84E10E94467D0E94AE
:10FBF0000E7D7DCF85E00E94467DF9CF0E94D87CA6
:10FC0000809306020E94D87C8093050280910802AE
:10FC10008E7F809308020E94D87C853409F44BC003
:10FC2000E5E0F1E0119281E0E438F807D9F3D0F390
:10FC3000C0E0D0E0809105029091060218161906E6
:10FC400078F405E011E00E94D87CF80181938F01DF
:10FC500021968091050290910602C817D90798F362
:10FC60000E94D87C803209F06DCF8091080280FF1D
:10FC7000B6C0C0E0D0E02091050230910602121615
:10FC80001306B8F4E0910301F0910401A5E0B1E09E
:10FC9000F999FECFF2BDE1BD8D9180BDFA9AF99A36
:10FCA00031962196C217D30798F3F0930401E0939D
:10FCB000030184E175CF809108028160809308027E
:10FCC000AFCF84E00E94467D80E087CF0E94D87C41
:10FCD000809303010E94D87C809304010E940E7DD2
:10FCE00006CF0E94D87C803209F02CCF84E10E949C
:10FCF000067D8EE10E94067D86E90E94067D8AE0EF
:10FD00004FCF0E940E7D88E080936000FFCF0E945D
:10FD1000D87C809306020E94D87C809305020E94C2
:10FD2000D87C853409F449C0809108028E7F809385
:10FD300008028091030190910401880F991F90930C
:10FD40000401809303010E94D87C803209F0CFCE59
:10FD500084E10E94067DC0E0D0E020910502309150
:10FD600006021216130608F01DCFE0910301F09170
:10FD700004018091080280FF96C0F999FECFF2BD80
:10FD8000E1BDF89A80B50E94067DE0910301F091F3
:10FD900004013196F0930401E093030120910502E0
:10FDA000309106022196C217D30718F3FBCEE091DB
:10FDB0000001F0910101099586CE809108028160D1
:10FDC00080930802C0CF80E10E94277D90CE81E021
:10FDD0000E94277D8CCE82E00E94277D88CE809174
:10FDE000030190910401880F991F9093040180935F
:10FDF00003018091050280FF09C080910502909166
:10FE0000060201969093060280930502F999FECFAF
:10FE10001127E0910301F0910401C5E0D1E0809148
:10FE2000050290910602103091F400915700017084
:10FE30000130D9F303E000935700E8950091570093
:10FE400001700130D9F301E100935700E895099062
:10FE500019900091570001700130D9F301E000932F
:10FE60005700E8951395103898F011270091570026
:10FE700001700130D9F305E000935700E895009137
:10FE8000570001700130D9F301E100935700E89564
:10FE90003296029709F0C7CF103011F00296E5CFE5
:10FEA000112484E17DCE869580FF06C03196F093C3
:10FEB0000401E093030176CF84910E94067D209196
:10FEC000050230910602E0910301F0910401EECFAA
:10FED0001F93CF930E94D87CC82F0E94067D0E945A
:10FEE000D87C182F0E94067DC1362CF0C7551136DC
:10FEF0003CF0175508C0C033D4F3C0531136CCF7CB
:10FF000010330CF01053C295C07FC10F8C2F99276E
:10FF100087FD9095CF911F910895CF93282F992712
:10FF200087FD9095807F907095958795959587959D
:10FF300095958795959587958A303CF0895AC22F7B
:10FF4000CF70CA303CF0C95A06C0805DC22FCF7056
:10FF5000CA30CCF7C05D0E94067D8C2F0E94067DC2
:06FF6000CF910895FFCFD0
:040000030000F80001
:00000001FF

View File

@@ -1,56 +0,0 @@
# Makefile for ATmegaBOOT
# E.Lins, 18.7.2005
# $Id$
# program name should not be changed...
PROGRAM = ATmegaBOOT_644P
# enter the target CPU frequency
AVR_FREQ = 16000000L
MCU_TARGET = atmega644p
LDSECTION = --section-start=.text=0xF800
OBJ = $(PROGRAM).o
OPTIMIZE = -O2
DEFS =
LIBS =
CC = avr-gcc
# Override is only needed by avr-lib build system.
override CFLAGS = -g -Wall $(OPTIMIZE) -mmcu=$(MCU_TARGET) -DF_CPU=$(AVR_FREQ) $(DEFS)
override LDFLAGS = -Wl,$(LDSECTION)
#override LDFLAGS = -Wl,-Map,$(PROGRAM).map,$(LDSECTION)
OBJCOPY = avr-objcopy
OBJDUMP = avr-objdump
all: CFLAGS += '-DMAX_TIME_COUNT=8000000L>>1' -DADABOOT
all: $(PROGRAM).hex
$(PROGRAM).hex: $(PROGRAM).elf
$(OBJCOPY) -j .text -j .data -O ihex $< $@
$(PROGRAM).elf: $(OBJ)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
$(OBJ): ATmegaBOOT.c
avr-gcc $(CFLAGS) $(LDFLAGS) -c -g -O2 -Wall -mmcu=$(MCU_TARGET) ATmegaBOOT.c -o $(PROGRAM).o
%.lst: %.elf
$(OBJDUMP) -h -S $< > $@
%.srec: %.elf
$(OBJCOPY) -j .text -j .data -O srec $< $@
%.bin: %.elf
$(OBJCOPY) -j .text -j .data -O binary $< $@
clean:
rm -rf *.o *.elf *.lst *.map *.sym *.lss *.eep *.srec *.bin *.hex

View File

@@ -1,3 +0,0 @@
Note: This bootloader support ATmega644, ATmega644P and ATmega324P.
To build, set PROGRAM and MCU_TARGET in the Makefile according to your target device.

View File

@@ -1,269 +0,0 @@
/*
pins_arduino.h - Pin definition functions for Arduino
Part of Arduino - http://www.arduino.cc/
Copyright (c) 2007 David A. Mellis
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General
Public License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA
$Id: wiring.h 249 2007-02-03 16:52:51Z mellis $
Changelog
-----------
11/25/11 - ryan@ryanmsutton.com - Add pins for Sanguino 644P and 1284P
07/15/12 - ryan@ryanmsutton.com - Updated for arduino0101
Improvements by Kristian Lauszus, kristianl@tkjelectronics.dk
*/
#ifndef Pins_Arduino_h
#define Pins_Arduino_h
#include <avr/pgmspace.h>
const static uint8_t SS = 4;
const static uint8_t MOSI = 5;
const static uint8_t MISO = 6;
const static uint8_t SCK = 7;
static const uint8_t SDA = 17;
static const uint8_t SCL = 16;
#define LED_BUILTIN 0
static const uint8_t A0 = 31;
static const uint8_t A1 = 30;
static const uint8_t A2 = 29;
static const uint8_t A3 = 28;
static const uint8_t A4 = 27;
static const uint8_t A5 = 26;
static const uint8_t A6 = 25;
static const uint8_t A7 = 24;
// ATMEL ATMEGA644/ATMEGA1284 / SANGUINO
//
// +---\/---+
// (D 0) PB0 1| |40 PA0 (AI 0 / D31)
// (D 1) PB1 2| |39 PA1 (AI 1 / D30)
// INT2 (D 2) PB2 3| |38 PA2 (AI 2 / D29)
// PWM (D 3) PB3 4| |37 PA3 (AI 3 / D28)
// SS PWM (D 4) PB4 5| |36 PA4 (AI 4 / D27)
// MOSI (D 5) PB5 6| |35 PA5 (AI 5 / D26)
// MISO (D 6) PB6 7| |34 PA6 (AI 6 / D25)
// SCK (D 7) PB7 8| |33 PA7 (AI 7 / D24)
// RST 9| |32 AREF
// VCC 10| |31 GND
// GND 11| |30 AVCC
// XTAL2 12| |29 PC7 (D 23)
// XTAL1 13| |28 PC6 (D 22)
// RX0 (D 8) PD0 14| |27 PC5 (D 21) TDI
// TX0 (D 9) PD1 15| |26 PC4 (D 20) TDO
// INT0 RX1 (D 10) PD2 16| |25 PC3 (D 19) TMS
// INT1 TX1 (D 11) PD3 17| |24 PC2 (D 18) TCK
// PWM (D 12) PD4 18| |23 PC1 (D 17) SDA
// PWM (D 13) PD5 19| |22 PC0 (D 16) SCL
// PWM (D 14) PD6 20| |21 PD7 (D 15) PWM
// +--------+
//
#define NUM_DIGITAL_PINS 24
#define NUM_ANALOG_INPUTS 8
#define analogInputToDigitalPin(p) ((p < 8) ? 31 - (p): -1)
#define analogPinToChannel(p) ((p < 8) ? (p) : 31 - (p))
#define digitalPinHasPWM(p) ((p) == 3 || (p) == 4 || (p) == 12 || (p) == 13 || (p) == 14 || (p) == 15 )
#define digitalPinToPCICR(p) ( (((p) >= 0) && ((p) <= 31)) ? (&PCICR) : ((uint8_t *)0) )
#define digitalPinToPCICRbit(p) ( (((p) >= 24) && ((p) <= 31)) ? 0 : \
( (((p) >= 0) && ((p) <= 7)) ? 1 : \
( (((p) >= 16) && ((p) <= 23)) ? 2 : \
( (((p) >= 8) && ((p) <= 15)) ? 3 : \
0 ) ) ) )
#define digitalPinToPCMSK(p) ( (((p) >= 24) && ((p) <= 31)) ? (&PCMSK0) : \
( (((p) >= 0) && ((p) <= 7)) ? (&PCMSK1) : \
( (((p) >= 16) && ((p) <= 23)) ? (&PCMSK2) : \
( (((p) >= 8) && ((p) <= 15)) ? (&PCMSK3) : \
((uint8_t *)0) ) ) ) )
#define digitalPinToPCMSKbit(p) ( (((p) >= 24) && ((p) <= 31)) ? (31 - (p)) : \
( (((p) >= 0) && ((p) <= 7)) ? (p) : \
( (((p) >= 16) && ((p) <= 23)) ? ((p) - 16) : \
( (((p) >= 8) && ((p) <= 15)) ? ((p) - 8) : \
0 ) ) ) )
#define digitalPinToInterrupt(p) ((p) == 10 ? 0 : ((p) == 11 ? 1 : ((p) == 2 ? 2 : NOT_AN_INTERRUPT)))
#ifdef ARDUINO_MAIN
// these arrays map port names (e.g. port B) to the
// appropriate addresses for various functions (e.g. reading
// and writing)
const uint16_t PROGMEM port_to_mode_PGM[] =
{
NOT_A_PORT,
(uint16_t) &DDRA,
(uint16_t) &DDRB,
(uint16_t) &DDRC,
(uint16_t) &DDRD,
};
const uint16_t PROGMEM port_to_output_PGM[] =
{
NOT_A_PORT,
(uint16_t) &PORTA,
(uint16_t) &PORTB,
(uint16_t) &PORTC,
(uint16_t) &PORTD,
};
const uint16_t PROGMEM port_to_input_PGM[] =
{
NOT_A_PORT,
(uint16_t) &PINA,
(uint16_t) &PINB,
(uint16_t) &PINC,
(uint16_t) &PIND,
};
const uint8_t PROGMEM digital_pin_to_port_PGM[] =
{
PB, /* 0 */
PB,
PB,
PB,
PB,
PB,
PB,
PB,
PD, /* 8 */
PD,
PD,
PD,
PD,
PD,
PD,
PD,
PC, /* 16 */
PC,
PC,
PC,
PC,
PC,
PC,
PC,
PA, /* 24 */
PA,
PA,
PA,
PA,
PA,
PA,
PA /* 31 */
};
const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[] =
{
_BV(0), /* 0, port B */
_BV(1),
_BV(2),
_BV(3),
_BV(4),
_BV(5),
_BV(6),
_BV(7),
_BV(0), /* 8, port D */
_BV(1),
_BV(2),
_BV(3),
_BV(4),
_BV(5),
_BV(6),
_BV(7),
_BV(0), /* 16, port C */
_BV(1),
_BV(2),
_BV(3),
_BV(4),
_BV(5),
_BV(6),
_BV(7),
_BV(7), /* 24, port A */
_BV(6),
_BV(5),
_BV(4),
_BV(3),
_BV(2),
_BV(1),
_BV(0)
};
const uint8_t PROGMEM digital_pin_to_timer_PGM[] =
{
NOT_ON_TIMER, /* 0 - PB0 */
NOT_ON_TIMER, /* 1 - PB1 */
NOT_ON_TIMER, /* 2 - PB2 */
TIMER0A, /* 3 - PB3 */
TIMER0B, /* 4 - PB4 */
NOT_ON_TIMER, /* 5 - PB5 */
NOT_ON_TIMER, /* 6 - PB6 */
NOT_ON_TIMER, /* 7 - PB7 */
NOT_ON_TIMER, /* 8 - PD0 */
NOT_ON_TIMER, /* 9 - PD1 */
NOT_ON_TIMER, /* 10 - PD2 */
NOT_ON_TIMER, /* 11 - PD3 */
TIMER1B, /* 12 - PD4 */
TIMER1A, /* 13 - PD5 */
TIMER2B, /* 14 - PD6 */
TIMER2A, /* 15 - PD7 */
NOT_ON_TIMER, /* 16 - PC0 */
NOT_ON_TIMER, /* 17 - PC1 */
NOT_ON_TIMER, /* 18 - PC2 */
NOT_ON_TIMER, /* 19 - PC3 */
NOT_ON_TIMER, /* 20 - PC4 */
NOT_ON_TIMER, /* 21 - PC5 */
NOT_ON_TIMER, /* 22 - PC6 */
NOT_ON_TIMER, /* 23 - PC7 */
NOT_ON_TIMER, /* 24 - PA0 */
NOT_ON_TIMER, /* 25 - PA1 */
NOT_ON_TIMER, /* 26 - PA2 */
NOT_ON_TIMER, /* 27 - PA3 */
NOT_ON_TIMER, /* 28 - PA4 */
NOT_ON_TIMER, /* 29 - PA5 */
NOT_ON_TIMER, /* 30 - PA6 */
NOT_ON_TIMER /* 31 - PA7 */
};
#endif
// These serial port names are intended to allow libraries and architecture-neutral
// sketches to automatically default to the correct port name for a particular type
// of use. For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
// the first hardware serial port whose RX/TX pins are not dedicated to another use.
//
// SERIAL_PORT_MONITOR Port which normally prints to the Arduino Serial Monitor
//
// SERIAL_PORT_USBVIRTUAL Port which is USB virtual serial
//
// SERIAL_PORT_LINUXBRIDGE Port which connects to a Linux system via Bridge library
//
// SERIAL_PORT_HARDWARE Hardware serial port, physical RX & TX pins.
//
// SERIAL_PORT_HARDWARE_OPEN Hardware serial ports which are open for use. Their RX & TX
// pins are NOT connected to anything by default.
#define SERIAL_PORT_MONITOR Serial
#define SERIAL_PORT_HARDWARE Serial
#define SERIAL_PORT_HARDWARE1 Serial1
#define SERIAL_PORT_HARDWARE_OPEN Serial1
#endif

View File

@@ -1,83 +0,0 @@
############################################################
atmega644.name=Sanguino W/ ATmega644P
atmega644.upload.protocol=stk500
atmega644.upload.maximum_size=63488
atmega644.upload.speed=57600
atmega644.bootloader.low_fuses=0xFF
atmega644.bootloader.high_fuses=0x9A
atmega644.bootloader.extended_fuses=0xFF
atmega644.bootloader.path=atmega
atmega644.bootloader.file=ATmegaBOOT_168_atmega644p.hex
#atmega644.bootloader.file=ATmegaBOOT_644P.hex
atmega644.bootloader.unlock_bits=0x3F
atmega644.bootloader.lock_bits=0x0F
atmega644.build.mcu=atmega644p
atmega644.build.f_cpu=16000000L
atmega644.build.core=arduino
atmega644.build.variant=standard
##############################################################
atmega12848m.name=Sanguino W/ ATmega1284p 8mhz
atmega12848m.upload.protocol=stk500
atmega12848m.upload.maximum_size=131072
atmega12848m.upload.speed=19200
atmega1284.bootloader.low_fuses=0xD6
atmega1284.bootloader.high_fuses=0xDA
atmega1284.bootloader.extended_fuses=0xFD
atmega12848m.bootloader.path=atmega
atmega12848m.bootloader.file=ATmegaBOOT_168_atmega1284p_8m.hex
atmega12848m.bootloader.unlock_bits=0x3F
atmega12848m.bootloader.lock_bits=0x0F
atmega12848m.build.mcu=atmega1284p
atmega12848m.build.f_cpu=8000000L
atmega12848m.build.core=arduino
atmega12848m.build.variant=standard
##############################################################
atmega1284.name=Sanguino W/ ATmega1284p 16mhz
atmega1284.upload.protocol=stk500
atmega1284.upload.maximum_size=131072
atmega1284.upload.speed=57600
atmega1284.bootloader.low_fuses=0xD6
atmega1284.bootloader.high_fuses=0xDA
atmega1284.bootloader.extended_fuses=0xFD
atmega1284.bootloader.path=atmega
atmega1284.bootloader.file=ATmegaBOOT_168_atmega1284p.hex
atmega1284.bootloader.unlock_bits=0x3F
atmega1284.bootloader.lock_bits=0x0F
atmega1284.build.mcu=atmega1284p
atmega1284.build.f_cpu=16000000L
atmega1284.build.core=arduino
atmega1284.build.variant=standard
##############################################################
atmega1284m.name=Sanguino W/ ATmega1284p 20mhz
atmega1284m.upload.protocol=stk500
atmega1284m.upload.maximum_size=131072
atmega1284m.upload.speed=57600
atmega1284m.bootloader.low_fuses=0xD6
atmega1284m.bootloader.high_fuses=0xDA
atmega1284m.bootloader.extended_fuses=0xFD
atmega1284m.bootloader.path=atmega
atmega1284m.bootloader.file=ATmegaBOOT_168_atmega1284p.hex
atmega1284m.bootloader.unlock_bits=0x3F
atmega1284m.bootloader.lock_bits=0x0F
atmega1284m.build.mcu=atmega1284p
atmega1284m.build.f_cpu=20000000L
atmega1284m.build.core=arduino
atmega1284m.build.variant=standard
#

View File

@@ -1,130 +0,0 @@
:020000021000EC
:10F000000C9446F80C9465F80C9465F80C9465F82B
:10F010000C9465F80C9465F80C9465F80C9465F8FC
:10F020000C9465F80C9465F80C9465F80C9465F8EC
:10F030000C9465F80C9465F80C9465F80C9465F8DC
:10F040000C9465F80C9465F80C9465F80C9465F8CC
:10F050000C9465F80C9465F80C9465F80C9465F8BC
:10F060000C9465F80C9465F80C9465F80C9465F8AC
:10F070000C9465F80C9465F80C9465F80C9465F89C
:10F080000C9465F80C9465F80C9465F811241FBE77
:10F09000CFEFD0E4DEBFCDBF11E0A0E0B1E0E8EDFE
:10F0A000F7EF01E00BBF02C007900D92A230B1074D
:10F0B000D9F712E0A2E0B1E001C01D92AD30B10776
:10F0C000E1F70E947EF90C94EAFB0C9400F8909111
:10F0D0000201913019F0923041F008959091C000F2
:10F0E00095FFFCCF8093C60008959091C80095FFCE
:10F0F000FCCF8093CE0008951F93982F95959595FA
:10F1000095959595905D182F1F701A304CF4105DF1
:10F11000892F0E9467F8812F0E9467F81F91089538
:10F12000195A892F0E9467F8812F0E9467F81F9152
:10F130000895EF92FF920F931F9380910201813007
:10F1400069F1823031F080E01F910F91FF90EF90D4
:10F150000895EE24FF2487018091C80087FD17C021
:10F160000894E11CF11C011D111D81E4E81682E4E4
:10F17000F8068FE0080780E0180770F3E0910401BB
:10F18000F091050109958091C80087FFE9CF809132
:10F19000CE001F910F91FF90EF900895EE24FF2471
:10F1A00087018091C00087FD17C00894E11CF11C05
:10F1B000011D111D81E4E81682E4F8068FE00807BE
:10F1C00080E0180770F3E0910401F09105010995C2
:10F1D0008091C00087FFE9CF8091C6001F910F91F9
:10F1E000FF90EF9008951F930E9499F8182F0E94A6
:10F1F00067F8113634F410330CF01053812F1F913F
:10F2000008951755812F1F9108951F930E94F3F8B9
:10F21000182F0E94F3F81295107F810F1F91089507
:10F2200020910201882339F0213031F0223061F041
:10F2300081508823C9F708959091C00097FFFCCFB3
:10F240009091C6008150F5CF9091C80097FFFCCFF8
:10F250009091CE008150EDCF1F93182F0E9499F806
:10F26000803281F0809103018F5F809303018530AC
:10F2700011F01F910895E0910401F09105010995A5
:10F280001F91089584E10E9467F8812F0E9467F81A
:10F2900080E10E9467F8EDCF0E9499F8803271F00A
:10F2A000809103018F5F80930301853009F00895F9
:10F2B000E0910401F09105010995089584E10E940F
:10F2C00067F880E10E9467F8089515C0289A2FEF2B
:10F2D00031EE44E0215030404040E1F700C00000F2
:10F2E00028982FEF31EE44E0215030404040E1F7C4
:10F2F00000C000008150882349F70895EF92FF92E3
:10F300000F931F93CF93DF93000081E0809302015E
:10F3100080E18093C4001092C5001092C00086E086
:10F320008093C20088E18093C100209A81E00E940E
:10F3300065F90E9499F88033B1F18133B9F18034D5
:10F3400009F454C0813409F45AC0823409F469C004
:10F35000853409F46CC0803531F1823521F1813575
:10F3600011F1853509F469C0863509F471C0843618
:10F3700009F47AC0843709F4E1C0853709F43FC144
:10F38000863709F44AC0809103018F5F809303019F
:10F39000853079F6E0910401F091050109950E940C
:10F3A00099F8803351F60E944CF9C3CF0E9499F826
:10F3B000803249F784E10E9467F881E40E9467F88F
:10F3C00086E50E9467F882E50E9467F880E20E9465
:10F3D00067F889E40E9467F883E50E9467F880E592
:10F3E0000E9467F880E10E9467F8A3CF0E9499F815
:10F3F0008638C8F20E9499F80E944CF99ACF0E9470
:10F4000099F8803809F414C1813809F415C182389B
:10F4100009F416C1883909F407C180E00E942CF96B
:10F4200088CF84E10E9410F90E944CF982CF85E0D8
:10F430000E9410F90E944CF97CCF0E9499F88093A9
:10F4400006010E9499F8809307010E944CF971CF40
:10F450000E9499F8803309F405C183E00E9410F9F5
:10F4600080E00E942CF965CF0E9499F880930902F0
:10F470000E9499F88093080280910C028E7F8093FD
:10F480000C020E9499F8853409F4FDC080910802AD
:10F49000909109020097A1F068E0E62E61E0F62E57
:10F4A00000E010E00E9499F8F70181937F010F5F5F
:10F4B0001F4F80910802909109020817190790F3D5
:10F4C0000E9499F8803209F05ECF80910C0280FF93
:10F4D000ECC08091060190910701880F991F9093CD
:10F4E000070180930601209108023091090221153D
:10F4F0003105E9F048E0E42E41E0F42E00E010E0B0
:10F50000F70161917F010E94DCFB809106019091DF
:10F510000701019690930701809306010F5F1F4F2B
:10F5200020910802309109020217130748F384E181
:10F530000E9467F880E10E9467F8FBCE0E9499F86C
:10F54000809309020E9499F8809308028091060135
:10F550009091070197FDA3C020910C022D7F20936D
:10F560000C02880F991F90930701809306010E9457
:10F5700099F8853409F48DC080910C028E7F8093B8
:10F580000C020E9499F8803209F0D3CE84E10E94E7
:10F5900067F88091080290910902009709F440C031
:10F5A00000E010E0809106019091070116C0FC0177
:10F5B00084910E9467F8809106019091070101965D
:10F5C00090930701809306010F5F1F4F209108025F
:10F5D000309109020217130718F520910C0220FD43
:10F5E00033C021FFE4CFA0E0B0E080509040AF4FA7
:10F5F000BF4FABBFFC0187910E9467F8DCCF0E9430
:10F6000099F8803209F0BFCE84E10E9467F88EE15C
:10F610000E9467F887E90E9467F885E00E9467F812
:10F6200080E10E9467F885CE83E00E942CF981CEAC
:10F6300082E00E942CF97DCE81E00E942CF979CEE7
:10F6400080E10E942CF975CE0E94D4FB0E9467F8DD
:10F650008091060190910701019690930701809394
:10F660000601B2CF0E9499F80E9499F8082F0E94D3
:10F6700099F8002309F48BC0013009F48CC085E0AF
:10F680000E942CF956CE80910C02816080930C026E
:10F69000FDCE80910C02816080930C0272CF20918C
:10F6A0000C02226020930C025CCF8091070187FD41
:10F6B00076C010920B0280E08BBF80910601909182
:10F6C0000701880F991F909307018093060180918D
:10F6D000080280FF09C080910802909109020196FA
:10F6E0009093090280930802F894F999FECF1127AC
:10F6F000E0910601F0910701C8E0D1E08091080295
:10F7000090910902103091F400915700017001307E
:10F71000D9F303E000935700E8950091570001707A
:10F720000130D9F301E100935700E8950990199051
:10F730000091570001700130D9F301E000935700A8
:10F74000E8951395103898F0112700915700017033
:10F750000130D9F305E000935700E8950091570078
:10F7600001700130D9F301E100935700E89532961A
:10F77000029709F0C7CF103011F00296E5CF11249F
:10F7800084E10E9467F880E10E9467F8D2CD8EE1A3
:10F790000E942CF9CECD87E90E942CF9CACDF1E068
:10F7A000F0930B0281E088CFF999FECF92BD81BD25
:10F7B000F89A992780B50895262FF999FECF1FBA98
:10F7C00092BD81BD20BD0FB6F894FA9AF99A0FBE8A
:08F7D00001960895F894FFCFA3
:02F7D8008000AF
:040000031000F000F9
:00000001FF

View File

@@ -1,130 +0,0 @@
:020000021000EC
:10F000000C9446F80C9465F80C9465F80C9465F82B
:10F010000C9465F80C9465F80C9465F80C9465F8FC
:10F020000C9465F80C9465F80C9465F80C9465F8EC
:10F030000C9465F80C9465F80C9465F80C9465F8DC
:10F040000C9465F80C9465F80C9465F80C9465F8CC
:10F050000C9465F80C9465F80C9465F80C9465F8BC
:10F060000C9465F80C9465F80C9465F80C9465F8AC
:10F070000C9465F80C9465F80C9465F80C9465F89C
:10F080000C9465F80C9465F80C9465F811241FBE77
:10F09000CFEFD0E4DEBFCDBF11E0A0E0B1E0E8EDFE
:10F0A000F7EF01E00BBF02C007900D92A230B1074D
:10F0B000D9F712E0A2E0B1E001C01D92AD30B10776
:10F0C000E1F70E947EF90C94EAFB0C9400F8909111
:10F0D0000201913019F0923041F008959091C000F2
:10F0E00095FFFCCF8093C60008959091C80095FFCE
:10F0F000FCCF8093CE0008951F93982F95959595FA
:10F1000095959595905D182F1F701A304CF4105DF1
:10F11000892F0E9467F8812F0E9467F81F91089538
:10F12000195A892F0E9467F8812F0E9467F81F9152
:10F130000895EF92FF920F931F9380910201813007
:10F1400069F1823031F080E01F910F91FF90EF90D4
:10F150000895EE24FF2487018091C80087FD17C021
:10F160000894E11CF11C011D111D81E2E81681EAE1
:10F17000F80687E0080780E0180770F3E0910401C3
:10F18000F091050109958091C80087FFE9CF809132
:10F19000CE001F910F91FF90EF900895EE24FF2471
:10F1A00087018091C00087FD17C00894E11CF11C05
:10F1B000011D111D81E2E81681EAF80687E00807C3
:10F1C00080E0180770F3E0910401F09105010995C2
:10F1D0008091C00087FFE9CF8091C6001F910F91F9
:10F1E000FF90EF9008951F930E9499F8182F0E94A6
:10F1F00067F8113634F410330CF01053812F1F913F
:10F2000008951755812F1F9108951F930E94F3F8B9
:10F21000182F0E94F3F81295107F810F1F91089507
:10F2200020910201882339F0213031F0223061F041
:10F2300081508823C9F708959091C00097FFFCCFB3
:10F240009091C6008150F5CF9091C80097FFFCCFF8
:10F250009091CE008150EDCF1F93182F0E9499F806
:10F26000803281F0809103018F5F809303018530AC
:10F2700011F01F910895E0910401F09105010995A5
:10F280001F91089584E10E9467F8812F0E9467F81A
:10F2900080E10E9467F8EDCF0E9499F8803271F00A
:10F2A000809103018F5F80930301853009F00895F9
:10F2B000E0910401F09105010995089584E10E940F
:10F2C00067F880E10E9467F8089515C0289A2FEF2B
:10F2D00030E742E0215030404040E1F700C00000FC
:10F2E00028982FEF30E742E0215030404040E1F7CE
:10F2F00000C000008150882349F70895EF92FF92E3
:10F300000F931F93CF93DF93000081E0809302015E
:10F3100089E18093C4001092C5001092C00086E07D
:10F320008093C20088E18093C100209A81E00E940E
:10F3300065F90E9499F88033B1F18133B9F18034D5
:10F3400009F454C0813409F45AC0823409F469C004
:10F35000853409F46CC0803531F1823521F1813575
:10F3600011F1853509F469C0863509F471C0843618
:10F3700009F47AC0843709F4E1C0853709F43FC144
:10F38000863709F44AC0809103018F5F809303019F
:10F39000853079F6E0910401F091050109950E940C
:10F3A00099F8803351F60E944CF9C3CF0E9499F826
:10F3B000803249F784E10E9467F881E40E9467F88F
:10F3C00086E50E9467F882E50E9467F880E20E9465
:10F3D00067F889E40E9467F883E50E9467F880E592
:10F3E0000E9467F880E10E9467F8A3CF0E9499F815
:10F3F0008638C8F20E9499F80E944CF99ACF0E9470
:10F4000099F8803809F414C1813809F415C182389B
:10F4100009F416C1883909F407C180E00E942CF96B
:10F4200088CF84E10E9410F90E944CF982CF85E0D8
:10F430000E9410F90E944CF97CCF0E9499F88093A9
:10F4400006010E9499F8809307010E944CF971CF40
:10F450000E9499F8803309F405C183E00E9410F9F5
:10F4600080E00E942CF965CF0E9499F880930902F0
:10F470000E9499F88093080280910C028E7F8093FD
:10F480000C020E9499F8853409F4FDC080910802AD
:10F49000909109020097A1F068E0E62E61E0F62E57
:10F4A00000E010E00E9499F8F70181937F010F5F5F
:10F4B0001F4F80910802909109020817190790F3D5
:10F4C0000E9499F8803209F05ECF80910C0280FF93
:10F4D000ECC08091060190910701880F991F9093CD
:10F4E000070180930601209108023091090221153D
:10F4F0003105E9F048E0E42E41E0F42E00E010E0B0
:10F50000F70161917F010E94DCFB809106019091DF
:10F510000701019690930701809306010F5F1F4F2B
:10F5200020910802309109020217130748F384E181
:10F530000E9467F880E10E9467F8FBCE0E9499F86C
:10F54000809309020E9499F8809308028091060135
:10F550009091070197FDA3C020910C022D7F20936D
:10F560000C02880F991F90930701809306010E9457
:10F5700099F8853409F48DC080910C028E7F8093B8
:10F580000C020E9499F8803209F0D3CE84E10E94E7
:10F5900067F88091080290910902009709F440C031
:10F5A00000E010E0809106019091070116C0FC0177
:10F5B00084910E9467F8809106019091070101965D
:10F5C00090930701809306010F5F1F4F209108025F
:10F5D000309109020217130718F520910C0220FD43
:10F5E00033C021FFE4CFA0E0B0E080509040AF4FA7
:10F5F000BF4FABBFFC0187910E9467F8DCCF0E9430
:10F6000099F8803209F0BFCE84E10E9467F88EE15C
:10F610000E9467F887E90E9467F885E00E9467F812
:10F6200080E10E9467F885CE83E00E942CF981CEAC
:10F6300082E00E942CF97DCE81E00E942CF979CEE7
:10F6400080E10E942CF975CE0E94D4FB0E9467F8DD
:10F650008091060190910701019690930701809394
:10F660000601B2CF0E9499F80E9499F8082F0E94D3
:10F6700099F8002309F48BC0013009F48CC085E0AF
:10F680000E942CF956CE80910C02816080930C026E
:10F69000FDCE80910C02816080930C0272CF20918C
:10F6A0000C02226020930C025CCF8091070187FD41
:10F6B00076C010920B0280E08BBF80910601909182
:10F6C0000701880F991F909307018093060180918D
:10F6D000080280FF09C080910802909109020196FA
:10F6E0009093090280930802F894F999FECF1127AC
:10F6F000E0910601F0910701C8E0D1E08091080295
:10F7000090910902103091F400915700017001307E
:10F71000D9F303E000935700E8950091570001707A
:10F720000130D9F301E100935700E8950990199051
:10F730000091570001700130D9F301E000935700A8
:10F74000E8951395103898F0112700915700017033
:10F750000130D9F305E000935700E8950091570078
:10F7600001700130D9F301E100935700E89532961A
:10F77000029709F0C7CF103011F00296E5CF11249F
:10F7800084E10E9467F880E10E9467F8D2CD8EE1A3
:10F790000E942CF9CECD87E90E942CF9CACDF1E068
:10F7A000F0930B0281E088CFF999FECF92BD81BD25
:10F7B000F89A992780B50895262FF999FECF1FBA98
:10F7C00092BD81BD20BD0FB6F894FA9AF99A0FBE8A
:08F7D00001960895F894FFCFA3
:02F7D8008000AF
:040000031000F000F9
:00000001FF

View File

@@ -1,126 +0,0 @@
:10F800000C943E7C0C945B7C0C945B7C0C945B7C39
:10F810000C945B7C0C945B7C0C945B7C0C945B7C0C
:10F820000C945B7C0C945B7C0C945B7C0C945B7CFC
:10F830000C945B7C0C945B7C0C945B7C0C945B7CEC
:10F840000C945B7C0C945B7C0C945B7C0C945B7CDC
:10F850000C945B7C0C945B7C0C945B7C0C945B7CCC
:10F860000C945B7C0C945B7C0C945B7C0C945B7CBC
:10F870000C945B7C0C945B7C0C945B7C11241FBE11
:10F88000CFEFD0E1DEBFCDBF11E0A0E0B1E0EAEA0A
:10F89000FFEF02C005900D92A230B107D9F712E038
:10F8A000A2E0B1E001C01D92AD30B107E1F70E94C6
:10F8B000747D0C94D37F0C94007C90910201913064
:10F8C00019F0923041F008959091C00095FFFCCF5F
:10F8D0008093C60008959091C80095FFFCCF809357
:10F8E000CE0008951F93982F95959595959595958C
:10F8F000905D182F1F701A304CF4105D892F0E94F4
:10F900005D7C812F0E945D7C1F910895195A892F7B
:10F910000E945D7C812F0E945D7C1F910895EF9273
:10F92000FF920F931F9380910201813069F1823021
:10F9300031F080E01F910F91FF90EF900895EE2439
:10F94000FF2487018091C80087FD17C00894E11C3F
:10F95000F11C011D111D81E4E81682E4F8068FE018
:10F96000080780E0180770F3E0910401F0910501A9
:10F9700009958091C80087FFE9CF8091CE001F9143
:10F980000F91FF90EF900895EE24FF24870180915E
:10F99000C00087FD17C00894E11CF11C011D111D5A
:10F9A00081E4E81682E4F8068FE0080780E0180793
:10F9B00070F3E0910401F091050109958091C00078
:10F9C00087FFE9CF8091C6001F910F91FF90EF90C4
:10F9D00008951F930E948F7C182F0E945D7C113622
:10F9E00034F410330CF01053812F1F9108951755E4
:10F9F000812F1F9108951F930E94E97C182F0E9468
:10FA0000E97C1295107F810F1F91089520910201CA
:10FA1000882339F0213031F0223061F08150882381
:10FA2000C9F708959091C00097FFFCCF9091C60050
:10FA30008150F5CF9091C80097FFFCCF9091CE00F8
:10FA40008150EDCF1F93182F0E948F7C803281F060
:10FA5000809103018F5F80930301853011F01F9126
:10FA60000895E0910401F091050109951F91089511
:10FA700084E10E945D7C812F0E945D7C80E10E9478
:10FA80005D7CEDCF0E948F7C803271F0809103010C
:10FA90008F5F80930301853009F00895E0910401A0
:10FAA000F09105010995089584E10E945D7C80E153
:10FAB0000E945D7C089515C0289A2FEF31EE44E036
:10FAC000215030404040E1F700C0000028982FEF5F
:10FAD00031EE44E0215030404040E1F700C00000EA
:10FAE0008150882349F70895EF92FF920F931F9357
:10FAF000CF93DF93000081E08093020180E1809347
:10FB0000C4001092C5001092C00086E08093C2002D
:10FB100088E18093C100209A81E00E945B7D0E9471
:10FB20008F7C8033B1F18133B9F1803409F454C052
:10FB3000813409F45AC0823409F469C0853409F467
:10FB40006CC0803531F1823521F1813511F1853577
:10FB500009F469C0863509F471C0843609F47AC0A5
:10FB6000843709F4E1C0853709F439C1863709F4CF
:10FB70004AC0809103018F5F80930301853079F63D
:10FB8000E0910401F091050109950E948F7C80337A
:10FB900051F60E94427DC3CF0E948F7C803249F78C
:10FBA00084E10E945D7C81E40E945D7C86E50E9488
:10FBB0005D7C82E50E945D7C80E20E945D7C89E440
:10FBC0000E945D7C83E50E945D7C80E50E945D7CF7
:10FBD00080E10E945D7CA3CF0E948F7C8638C8F2B2
:10FBE0000E948F7C0E94427D9ACF0E948F7C803839
:10FBF00009F40EC1813809F40FC1823809F410C12B
:10FC0000883909F401C180E00E94227D88CF84E117
:10FC10000E94067D0E94427D82CF85E00E94067D83
:10FC20000E94427D7CCF0E948F7C809306010E94BF
:10FC30008F7C809307010E94427D71CF0E948F7C50
:10FC4000803309F4F1C083E00E94067D80E00E94C9
:10FC5000227D65CF0E948F7C809309020E948F7C59
:10FC60008093080280910C028E7F80930C020E9488
:10FC70008F7C853409F4E9C08091080290910902D3
:10FC80000097A1F068E0E62E61E0F62E00E010E0BB
:10FC90000E948F7CF70181937F010F5F1F4F80913E
:10FCA0000802909109020817190790F30E948F7CAF
:10FCB000803209F05ECF80910C0280FFE5C0809118
:10FCC000060190910701880F991F90930701809377
:10FCD0000601209108023091090221153105E9F051
:10FCE00048E0E42E41E0F42E00E010E0F7016191DD
:10FCF0007F010E94C57F80910601909107010196C6
:10FD000090930701809306010F5F1F4F2091080217
:10FD1000309109020217130748F384E10E945D7CC9
:10FD200080E10E945D7CFBCE0E948F7C8093090263
:10FD30000E948F7C809308028091060190910701B8
:10FD400097FD9CC020910C022D7F20930C02880F00
:10FD5000991F90930701809306010E948F7C853440
:10FD600009F486C080910C028E7F80930C020E9461
:10FD70008F7C803209F0D3CE84E10E945D7C20919B
:10FD800008023091090221153105D1F100E010E09F
:10FD900080910601909107010CC041FF5CC0019663
:10FDA00090930701809306010F5F1F4F02171307FF
:10FDB00038F540910C0240FFF0CF0E94BD7F0E94B9
:10FDC0005D7C809106019091070101969093070157
:10FDD000809306012091080230910902E5CF0E942C
:10FDE0008F7C803209F0C5CE84E10E945D7C8EE17B
:10FDF0000E945D7C86E90E945D7C8AE00E945D7CB9
:10FE000080E10E945D7C8BCE83E00E94227D87CEC4
:10FE100082E00E94227D83CE81E00E94227D7FCEFF
:10FE200080E10E94227D7BCE0E948F7C0E948F7C8D
:10FE3000082F0E948F7C002309F497C0013009F439
:10FE400098C08AE00E94227D6ACE80910C02816077
:10FE500080930C0211CFFC0184910E945D7C209163
:10FE6000080230910902809106019091070197CF15
:10FE700080910C02816080930C0279CF20910C025A
:10FE8000226020930C0263CF80910701880F880BBA
:10FE9000817080930B028091060190910701880F79
:10FEA000991F90930701809306018091080280FFBB
:10FEB00009C080910802909109020196909309026D
:10FEC00080930802F894F999FECF1127E09106017A
:10FED000F0910701C8E0D1E08091080290910902F9
:10FEE000103091F40091570001700130D9F303E014
:10FEF00000935700E8950091570001700130D9F345
:10FF000001E100935700E89509901990009157007E
:10FF100001700130D9F301E000935700E895139583
:10FF2000103898F011270091570001700130D9F373
:10FF300005E000935700E8950091570001700130EB
:10FF4000D9F301E100935700E8953296029709F042
:10FF5000C7CF103011F00296E5CF112484E10E9442
:10FF60005D7C80E10E945D7CDACD8EE10E94227D85
:10FF7000D6CD86E90E94227DD2CDF999FECF92BDE1
:10FF800081BDF89A992780B50895262FF999FECF5B
:10FF90001FBA92BD81BD20BD0FB6F894FA9AF99AA6
:0AFFA0000FBE01960895F894FFCFFC
:02FFAA008000D5
:040000030000F80001
:00000001FF

View File

@@ -1,254 +0,0 @@
# Makefile for ATmegaBOOT
# E.Lins, 18.7.2005
# $Id$
#
# Instructions
#
# To make bootloader .hex file:
# make diecimila
# make lilypad
# make ng
# etc...
#
# To burn bootloader .hex file:
# make diecimila_isp
# make lilypad_isp
# make ng_isp
# etc...
# program name should not be changed...
PROGRAM = ATmegaBOOT_168
# enter the parameters for the avrdude isp tool
ISPTOOL = stk500v2
ISPPORT = usb
ISPSPEED = -b 115200
MCU_TARGET = atmega168
LDSECTION = --section-start=.text=0x3800
# the efuse should really be 0xf8; since, however, only the lower
# three bits of that byte are used on the atmega168, avrdude gets
# confused if you specify 1's for the higher bits, see:
# http://tinker.it/now/2007/02/24/the-tale-of-avrdude-atmega168-and-extended-bits-fuses/
#
# similarly, the lock bits should be 0xff instead of 0x3f (to
# unlock the bootloader section) and 0xcf instead of 0x0f (to
# lock it), but since the high two bits of the lock byte are
# unused, avrdude would get confused.
ISPFUSES = avrdude -c $(ISPTOOL) -p $(MCU_TARGET) -P $(ISPPORT) $(ISPSPEED) \
-e -u -U lock:w:0x3f:m -U efuse:w:0x$(EFUSE):m -U hfuse:w:0x$(HFUSE):m -U lfuse:w:0x$(LFUSE):m
ISPFLASH = avrdude -c $(ISPTOOL) -p $(MCU_TARGET) -P $(ISPPORT) $(ISPSPEED) \
-U flash:w:$(PROGRAM)_$(TARGET).hex -U lock:w:0x0f:m
STK500 = "C:\Program Files\Atmel\AVR Tools\STK500\Stk500.exe"
STK500-1 = $(STK500) -e -d$(MCU_TARGET) -pf -vf -if$(PROGRAM)_$(TARGET).hex \
-lFF -LFF -f$(HFUSE)$(LFUSE) -EF8 -ms -q -cUSB -I200kHz -s -wt
STK500-2 = $(STK500) -d$(MCU_TARGET) -ms -q -lCF -LCF -cUSB -I200kHz -s -wt
OBJ = $(PROGRAM).o
OPTIMIZE = -O2
DEFS =
LIBS =
CC = avr-gcc
# Override is only needed by avr-lib build system.
override CFLAGS = -g -Wall $(OPTIMIZE) -mmcu=$(MCU_TARGET) -DF_CPU=$(AVR_FREQ) $(DEFS)
override LDFLAGS = -Wl,$(LDSECTION)
#override LDFLAGS = -Wl,-Map,$(PROGRAM).map,$(LDSECTION)
OBJCOPY = avr-objcopy
OBJDUMP = avr-objdump
all:
lilypad: TARGET = lilypad
lilypad: CFLAGS += '-DMAX_TIME_COUNT=F_CPU>>1' '-DNUM_LED_FLASHES=3'
lilypad: AVR_FREQ = 8000000L
lilypad: $(PROGRAM)_lilypad.hex
lilypad_isp: lilypad
lilypad_isp: TARGET = lilypad
lilypad_isp: HFUSE = DD
lilypad_isp: LFUSE = E2
lilypad_isp: EFUSE = 00
lilypad_isp: isp
lilypad_resonator: TARGET = lilypad_resonator
lilypad_resonator: CFLAGS += '-DMAX_TIME_COUNT=F_CPU>>4' '-DNUM_LED_FLASHES=3'
lilypad_resonator: AVR_FREQ = 8000000L
lilypad_resonator: $(PROGRAM)_lilypad_resonator.hex
lilypad_resonator_isp: lilypad_resonator
lilypad_resonator_isp: TARGET = lilypad_resonator
lilypad_resonator_isp: HFUSE = DD
lilypad_resonator_isp: LFUSE = C6
lilypad_resonator_isp: EFUSE = 00
lilypad_resonator_isp: isp
pro8: TARGET = pro_8MHz
pro8: CFLAGS += '-DMAX_TIME_COUNT=F_CPU>>4' '-DNUM_LED_FLASHES=1' '-DWATCHDOG_MODS'
pro8: AVR_FREQ = 8000000L
pro8: $(PROGRAM)_pro_8MHz.hex
pro8_isp: pro8
pro8_isp: TARGET = pro_8MHz
pro8_isp: HFUSE = DD
pro8_isp: LFUSE = C6
pro8_isp: EFUSE = 00
pro8_isp: isp
pro16: TARGET = pro_16MHz
pro16: CFLAGS += '-DMAX_TIME_COUNT=F_CPU>>4' '-DNUM_LED_FLASHES=1' '-DWATCHDOG_MODS'
pro16: AVR_FREQ = 16000000L
pro16: $(PROGRAM)_pro_16MHz.hex
pro16_isp: pro16
pro16_isp: TARGET = pro_16MHz
pro16_isp: HFUSE = DD
pro16_isp: LFUSE = C6
pro16_isp: EFUSE = 00
pro16_isp: isp
pro20: TARGET = pro_20mhz
pro20: CFLAGS += '-DMAX_TIME_COUNT=F_CPU>>4' '-DNUM_LED_FLASHES=1' '-DWATCHDOG_MODS'
pro20: AVR_FREQ = 20000000L
pro20: $(PROGRAM)_pro_20mhz.hex
pro20_isp: pro20
pro20_isp: TARGET = pro_20mhz
pro20_isp: HFUSE = DD
pro20_isp: LFUSE = C6
pro20_isp: EFUSE = 00
pro20_isp: isp
diecimila: TARGET = diecimila
diecimila: CFLAGS += '-DMAX_TIME_COUNT=F_CPU>>4' '-DNUM_LED_FLASHES=1'
diecimila: AVR_FREQ = 16000000L
diecimila: $(PROGRAM)_diecimila.hex
diecimila_isp: diecimila
diecimila_isp: TARGET = diecimila
diecimila_isp: HFUSE = DD
diecimila_isp: LFUSE = FF
diecimila_isp: EFUSE = 00
diecimila_isp: isp
ng: TARGET = ng
ng: CFLAGS += '-DMAX_TIME_COUNT=F_CPU>>1' '-DNUM_LED_FLASHES=3'
ng: AVR_FREQ = 16000000L
ng: $(PROGRAM)_ng.hex
ng_isp: ng
ng_isp: TARGET = ng
ng_isp: HFUSE = DD
ng_isp: LFUSE = FF
ng_isp: EFUSE = 00
ng_isp: isp
atmega328: TARGET = atmega328
atmega328: MCU_TARGET = atmega328p
atmega328: CFLAGS += '-DMAX_TIME_COUNT=F_CPU>>4' '-DNUM_LED_FLASHES=1' -DBAUD_RATE=57600
atmega328: AVR_FREQ = 16000000L
atmega328: LDSECTION = --section-start=.text=0x7800
atmega328: $(PROGRAM)_atmega328.hex
atmega328_isp: atmega328
atmega328_isp: TARGET = atmega328
atmega328_isp: MCU_TARGET = atmega328p
atmega328_isp: HFUSE = DA
atmega328_isp: LFUSE = FF
atmega328_isp: EFUSE = 05
atmega328_isp: isp
atmega328_pro8: TARGET = atmega328_pro_8MHz
atmega328_pro8: MCU_TARGET = atmega328p
atmega328_pro8: CFLAGS += '-DMAX_TIME_COUNT=F_CPU>>4' '-DNUM_LED_FLASHES=1' -DBAUD_RATE=57600 -DDOUBLE_SPEED
atmega328_pro8: AVR_FREQ = 8000000L
atmega328_pro8: LDSECTION = --section-start=.text=0x7800
atmega328_pro8: $(PROGRAM)_atmega328_pro_8MHz.hex
atmega328_pro8_isp: atmega328_pro8
atmega328_pro8_isp: TARGET = atmega328_pro_8MHz
atmega328_pro8_isp: MCU_TARGET = atmega328p
atmega328_pro8_isp: HFUSE = DA
atmega328_pro8_isp: LFUSE = FF
atmega328_pro8_isp: EFUSE = 05
atmega328_pro8_isp: isp
mega: TARGET = atmega1280
mega: MCU_TARGET = atmega1280
mega: CFLAGS += '-DMAX_TIME_COUNT=F_CPU>>4' '-DNUM_LED_FLASHES=0' -DBAUD_RATE=57600
mega: AVR_FREQ = 16000000L
mega: LDSECTION = --section-start=.text=0x1F000
mega: $(PROGRAM)_atmega1280.hex
mega_isp: mega
mega_isp: TARGET = atmega1280
mega_isp: MCU_TARGET = atmega1280
mega_isp: HFUSE = DA
mega_isp: LFUSE = FF
mega_isp: EFUSE = F5
mega_isp: isp
atmega1284p: TARGET = atmega1284p
atmega1284p: MCU_TARGET = atmega1284p
atmega1284p: CFLAGS += '-DMAX_TIME_COUNT=F_CPU>>4' '-DNUM_LED_FLASHES=0' '-DBAUD_RATE=57600'
atmega1284p: AVR_FREQ = 16000000L
atmega1284p: LDSECTION = --section-start=.text=0x1F000
atmega1284p: $(PROGRAM)_atmega1284p.hex
atmega1284p_8m: TARGET = atmega1284p
atmega1284p_8m: MCU_TARGET = atmega1284p
atmega1284p_8m: CFLAGS += '-DMAX_TIME_COUNT=F_CPU>>4' '-DNUM_LED_FLASHES=0' '-DBAUD_RATE=19200'
atmega1284p_8m: AVR_FREQ = 8000000L
atmega1284p_8m: LDSECTION = --section-start=.text=0x1F000
atmega1284p_8m: $(PROGRAM)_atmega1284p_8m.hex
atmega644p: TARGET = atmega644p
atmega644p: MCU_TARGET = atmega644p
atmega644p: CFLAGS += '-DMAX_TIME_COUNT=F_CPU>>4' '-DNUM_LED_FLASHES=0' '-DBAUD_RATE=57600'
atmega644p: AVR_FREQ = 16000000L
atmega644p: LDSECTION = --section-start=.text=0xF800
atmega644p: $(PROGRAM)_atmega644p.hex
atmega1284p_isp: atmega1284p
atmega1284p_isp: TARGET = atmega1284p
atmega1284p_isp: MCU_TARGET = atmega1284p
atmega1284p_isp: HFUSE = DC
atmega1284p_isp: LFUSE = FF
atmega1284p_isp: EFUSE = FD
atmega1284p_isp: isp
isp: $(TARGET)
$(ISPFUSES)
$(ISPFLASH)
isp-stk500: $(PROGRAM)_$(TARGET).hex
$(STK500-1)
$(STK500-2)
%.elf: $(OBJ)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
clean:
rm -rf *.o *.elf *.lst *.map *.sym *.lss *.eep *.srec *.bin *.hex
%.lst: %.elf
$(OBJDUMP) -h -S $< > $@
%.hex: %.elf
$(OBJCOPY) -j .text -j .data -O ihex $< $@
%.srec: %.elf
$(OBJCOPY) -j .text -j .data -O srec $< $@
%.bin: %.elf
$(OBJCOPY) -j .text -j .data -O binary $< $@

View File

@@ -1,717 +0,0 @@
/**********************************************************/
/* Serial Bootloader for Atmel megaAVR Controllers */
/* */
/* tested with ATmega644 and ATmega644P */
/* should work with other mega's, see code for details */
/* */
/* ATmegaBOOT.c */
/* */
/* 20090131: Added 324P support from Alex Leone */
/* Marius Kintel */
/* 20080915: applied ADABoot mods for Sanguino 644P */
/* Brian Riley */
/* 20080711: hacked for Sanguino by Zach Smith */
/* and Justin Day */
/* 20070626: hacked for Arduino Diecimila (which auto- */
/* resets when a USB connection is made to it) */
/* by D. Mellis */
/* 20060802: hacked for Arduino by D. Cuartielles */
/* based on a previous hack by D. Mellis */
/* and D. Cuartielles */
/* */
/* Monitor and debug functions were added to the original */
/* code by Dr. Erik Lins, chip45.com. (See below) */
/* */
/* Thanks to Karl Pitrich for fixing a bootloader pin */
/* problem and more informative LED blinking! */
/* */
/* For the latest version see: */
/* http://www.chip45.com/ */
/* */
/* ------------------------------------------------------ */
/* */
/* based on stk500boot.c */
/* Copyright (c) 2003, Jason P. Kyle */
/* All rights reserved. */
/* see avr1.org for original file and information */
/* */
/* This program is free software; you can redistribute it */
/* and/or modify it under the terms of the GNU General */
/* Public License as published by the Free Software */
/* Foundation; either version 2 of the License, or */
/* (at your option) any later version. */
/* */
/* This program is distributed in the hope that it will */
/* be useful, but WITHOUT ANY WARRANTY; without even the */
/* implied warranty of MERCHANTABILITY or FITNESS FOR A */
/* PARTICULAR PURPOSE. See the GNU General Public */
/* License for more details. */
/* */
/* You should have received a copy of the GNU General */
/* Public License along with this program; if not, write */
/* to the Free Software Foundation, Inc., */
/* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/* */
/* Licence can be viewed at */
/* http://www.fsf.org/licenses/gpl.txt */
/* */
/* Target = Atmel AVR m128,m64,m32,m16,m8,m162,m163,m169, */
/* m8515,m8535. ATmega161 has a very small boot block so */
/* isn't supported. */
/* */
/* Tested with m168 */
/**********************************************************/
/* $Id$ */
/* some includes */
#include <inttypes.h>
#include <avr/io.h>
#include <avr/pgmspace.h>
#include <avr/interrupt.h>
#include <avr/wdt.h>
#include <avr/boot.h>
#ifdef ADABOOT
#define NUM_LED_FLASHES 3
#define ADABOOT_VER 1
#endif
/* 20070707: hacked by David A. Mellis - after this many errors give up and launch application */
#define MAX_ERROR_COUNT 5
/* set the UART baud rate */
/* 20080711: hack by Zach Hoeken */
#define BAUD_RATE 38400
/* SW_MAJOR and MINOR needs to be updated from time to time to avoid warning message from AVR Studio */
/* never allow AVR Studio to do an update !!!! */
#define HW_VER 0x02
#define SW_MAJOR 0x01
#define SW_MINOR 0x10
/* onboard LED is used to indicate, that the bootloader was entered (3x flashing) */
/* if monitor functions are included, LED goes on after monitor was entered */
#define LED_DDR DDRB
#define LED_PORT PORTB
#define LED_PIN PINB
#define LED PINB0
/* define various device id's */
/* manufacturer byte is always the same */
#define SIG1 0x1E // Yep, Atmel is the only manufacturer of AVR micros. Single source :(
#if defined(__AVR_ATmega1284P__)
#define SIG2 0x97
#define SIG3 0x05
#elif defined(__AVR_ATmega644P__)
#define SIG2 0x96
#define SIG3 0x0A
#elif defined(__AVR_ATmega644__)
#define SIG2 0x96
#define SIG3 0x09
#elif defined(__AVR_ATmega324P__)
#define SIG2 0x95
#define SIG3 0x08
#endif
#define PAGE_SIZE 0x080U //128 words
#define PAGE_SIZE_BYTES 0x100U //256 bytes
/* function prototypes */
void putch(char);
char getch(void);
void getNch(uint8_t);
void byte_response(uint8_t);
void nothing_response(void);
char gethex(void);
void puthex(char);
void flash_led(uint8_t);
/* some variables */
union address_union
{
uint16_t word;
uint8_t byte[2];
} address;
union length_union
{
uint16_t word;
uint8_t byte[2];
} length;
struct flags_struct
{
unsigned eeprom : 1;
unsigned rampz : 1;
} flags;
uint8_t buff[256];
uint8_t error_count = 0;
uint8_t sreg;
void (*app_start)(void) = 0x0000;
/* main program starts here */
int main(void)
{
uint8_t ch,ch2;
uint16_t w;
uint16_t i;
asm volatile("nop\n\t");
#ifdef ADABOOT // BBR/LF 10/8/2007 & 9/13/2008
ch = MCUSR;
MCUSR = 0;
WDTCSR |= _BV(WDCE) | _BV(WDE);
WDTCSR = 0;
// Check if the WDT was used to reset, in which case we dont bootload and skip straight to the code. woot.
if (! (ch & _BV(EXTRF))) // if it's a not an external reset...
app_start(); // skip bootloader
#endif
//initialize our serial port.
UBRR0L = (uint8_t)(F_CPU/(BAUD_RATE*16L)-1);
UBRR0H = (F_CPU/(BAUD_RATE*16L)-1) >> 8;
UCSR0B = (1<<RXEN0) | (1<<TXEN0);
UCSR0C = (1<<UCSZ00) | (1<<UCSZ01);
/* Enable internal pull-up resistor on pin D0 (RX), in order
to supress line noise that prevents the bootloader from
timing out (DAM: 20070509) */
DDRD &= ~_BV(PIND0);
PORTD |= _BV(PIND0);
/* set LED pin as output */
LED_DDR |= _BV(LED);
/* flash onboard LED to signal entering of bootloader */
/* ADABOOT will do two series of flashes. first 4 - signifying ADABOOT */
/* then a pause and another flash series signifying ADABOOT sub-version */
flash_led(NUM_LED_FLASHES);
#ifdef ADABOOT
flash_led(ADABOOT_VER); // BBR 9/13/2008
#endif
/* forever loop */
for (;;)
{
/* get character from UART */
ch = getch();
/* A bunch of if...else if... gives smaller code than switch...case ! */
/* Hello is anyone home ? */
if(ch=='0')
nothing_response();
/* Request programmer ID */
/* Not using PROGMEM string due to boot block in m128 being beyond 64kB boundry */
/* Would need to selectively manipulate RAMPZ, and it's only 9 characters anyway so who cares. */
else if(ch=='1')
{
if (getch() == ' ')
{
putch(0x14);
putch('A');
putch('V');
putch('R');
putch(' ');
putch('I');
putch('S');
putch('P');
putch(0x10);
}
else
{
if (++error_count == MAX_ERROR_COUNT)
app_start();
}
}
/* AVR ISP/STK500 board commands DON'T CARE so default nothing_response */
else if(ch=='@')
{
ch2 = getch();
if (ch2 > 0x85)
getch();
nothing_response();
}
/* AVR ISP/STK500 board requests */
else if(ch=='A')
{
ch2 = getch();
if(ch2 == 0x80)
byte_response(HW_VER); // Hardware version
else if(ch2==0x81)
byte_response(SW_MAJOR); // Software major version
else if(ch2==0x82)
byte_response(SW_MINOR); // Software minor version
else if(ch2==0x98)
byte_response(0x03); // Unknown but seems to be required by avr studio 3.56
else
byte_response(0x00); // Covers various unnecessary responses we don't care about
}
/* Device Parameters DON'T CARE, DEVICE IS FIXED */
else if(ch=='B')
{
getNch(20);
nothing_response();
}
/* Parallel programming stuff DON'T CARE */
else if(ch=='E')
{
getNch(5);
nothing_response();
}
/* Enter programming mode */
else if(ch=='P')
{
nothing_response();
}
/* Leave programming mode */
else if(ch=='Q')
{
nothing_response();
#ifdef ADABOOT
// autoreset via watchdog (sneaky!) BBR/LF 9/13/2008
WDTCSR = _BV(WDE);
while (1); // 16 ms
#endif
}
/* Erase device, don't care as we will erase one page at a time anyway. */
else if(ch=='R')
{
nothing_response();
}
/* Set address, little endian. EEPROM in bytes, FLASH in words */
/* Perhaps extra address bytes may be added in future to support > 128kB FLASH. */
/* This might explain why little endian was used here, big endian used everywhere else. */
else if(ch=='U')
{
address.byte[0] = getch();
address.byte[1] = getch();
nothing_response();
}
/* Universal SPI programming command, disabled. Would be used for fuses and lock bits. */
else if(ch=='V')
{
getNch(4);
byte_response(0x00);
}
/* Write memory, length is big endian and is in bytes */
else if(ch=='d')
{
length.byte[1] = getch();
length.byte[0] = getch();
flags.eeprom = 0;
if (getch() == 'E')
flags.eeprom = 1;
for (i=0; i<PAGE_SIZE; i++)
buff[i] = 0;
for (w = 0; w < length.word; w++)
{
// Store data in buffer, can't keep up with serial data stream whilst programming pages
buff[w] = getch();
}
if (getch() == ' ')
{
if (flags.eeprom)
{
//Write to EEPROM one byte at a time
for(w=0;w<length.word;w++)
{
while(EECR & (1<<EEPE));
EEAR = (uint16_t)(void *)address.word;
EEDR = buff[w];
EECR |= (1<<EEMPE);
EECR |= (1<<EEPE);
address.word++;
}
}
else
{
//address * 2 -> byte location
address.word = address.word << 1;
//Even up an odd number of bytes
if ((length.byte[0] & 0x01))
length.word++;
// HACKME: EEPE used to be EEWE
//Wait for previous EEPROM writes to complete
//while(bit_is_set(EECR,EEPE));
while(EECR & (1<<EEPE));
asm volatile(
"clr r17 \n\t" //page_word_count
"lds r30,address \n\t" //Address of FLASH location (in bytes)
"lds r31,address+1 \n\t"
"ldi r28,lo8(buff) \n\t" //Start of buffer array in RAM
"ldi r29,hi8(buff) \n\t"
"lds r24,length \n\t" //Length of data to be written (in bytes)
"lds r25,length+1 \n\t"
"length_loop: \n\t" //Main loop, repeat for number of words in block
"cpi r17,0x00 \n\t" //If page_word_count=0 then erase page
"brne no_page_erase \n\t"
"wait_spm1: \n\t"
"lds r16,%0 \n\t" //Wait for previous spm to complete
"andi r16,1 \n\t"
"cpi r16,1 \n\t"
"breq wait_spm1 \n\t"
"ldi r16,0x03 \n\t" //Erase page pointed to by Z
"sts %0,r16 \n\t"
"spm \n\t"
"wait_spm2: \n\t"
"lds r16,%0 \n\t" //Wait for previous spm to complete
"andi r16,1 \n\t"
"cpi r16,1 \n\t"
"breq wait_spm2 \n\t"
"ldi r16,0x11 \n\t" //Re-enable RWW section
"sts %0,r16 \n\t"
"spm \n\t"
"no_page_erase: \n\t"
"ld r0,Y+ \n\t" //Write 2 bytes into page buffer
"ld r1,Y+ \n\t"
"wait_spm3: \n\t"
"lds r16,%0 \n\t" //Wait for previous spm to complete
"andi r16,1 \n\t"
"cpi r16,1 \n\t"
"breq wait_spm3 \n\t"
"ldi r16,0x01 \n\t" //Load r0,r1 into FLASH page buffer
"sts %0,r16 \n\t"
"spm \n\t"
"inc r17 \n\t" //page_word_count++
"cpi r17,%1 \n\t"
"brlo same_page \n\t" //Still same page in FLASH
"write_page: \n\t"
"clr r17 \n\t" //New page, write current one first
"wait_spm4: \n\t"
"lds r16,%0 \n\t" //Wait for previous spm to complete
"andi r16,1 \n\t"
"cpi r16,1 \n\t"
"breq wait_spm4 \n\t"
"ldi r16,0x05 \n\t" //Write page pointed to by Z
"sts %0,r16 \n\t"
"spm \n\t"
"wait_spm5: \n\t"
"lds r16,%0 \n\t" //Wait for previous spm to complete
"andi r16,1 \n\t"
"cpi r16,1 \n\t"
"breq wait_spm5 \n\t"
"ldi r16,0x11 \n\t" //Re-enable RWW section
"sts %0,r16 \n\t"
"spm \n\t"
"same_page: \n\t"
"adiw r30,2 \n\t" //Next word in FLASH
"sbiw r24,2 \n\t" //length-2
"breq final_write \n\t" //Finished
"rjmp length_loop \n\t"
"final_write: \n\t"
"cpi r17,0 \n\t"
"breq block_done \n\t"
"adiw r24,2 \n\t" //length+2, fool above check on length after short page write
"rjmp write_page \n\t"
"block_done: \n\t"
"clr __zero_reg__ \n\t" //restore zero register
: "=m" (SPMCSR) : "M" (PAGE_SIZE) : "r0","r16","r17","r24","r25","r28","r29","r30","r31"
);
}
putch(0x14);
putch(0x10);
}
else
{
if (++error_count == MAX_ERROR_COUNT)
app_start();
}
}
/* Read memory block mode, length is big endian. */
else if(ch=='t')
{
length.byte[1] = getch();
length.byte[0] = getch();
if (getch() == 'E')
flags.eeprom = 1;
else
{
flags.eeprom = 0;
address.word = address.word << 1; // address * 2 -> byte location
}
// Command terminator
if (getch() == ' ')
{
putch(0x14);
for (w=0; w<length.word; w++)
{
// Can handle odd and even lengths okay
if (flags.eeprom)
{
// Byte access EEPROM read
while(EECR & (1<<EEPE));
EEAR = (uint16_t)(void *)address.word;
EECR |= (1<<EERE);
putch(EEDR);
address.word++;
}
else
{
if (!flags.rampz)
putch(pgm_read_byte_near(address.word));
address.word++;
}
}
putch(0x10);
}
}
/* Get device signature bytes */
else if(ch=='u')
{
if (getch() == ' ')
{
putch(0x14);
putch(SIG1);
putch(SIG2);
putch(SIG3);
putch(0x10);
}
else
{
if (++error_count == MAX_ERROR_COUNT)
app_start();
}
}
/* Read oscillator calibration byte */
else if(ch=='v')
byte_response(0x00);
else if (++error_count == MAX_ERROR_COUNT)
app_start();
}
/* end of forever loop */
}
char gethex(void)
{
char ah,al;
ah = getch();
putch(ah);
al = getch();
putch(al);
if(ah >= 'a')
ah = ah - 'a' + 0x0a;
else if(ah >= '0')
ah -= '0';
if(al >= 'a')
al = al - 'a' + 0x0a;
else if(al >= '0')
al -= '0';
return (ah << 4) + al;
}
void puthex(char ch)
{
char ah,al;
ah = (ch & 0xf0) >> 4;
if(ah >= 0x0a)
ah = ah - 0x0a + 'a';
else
ah += '0';
al = (ch & 0x0f);
if(al >= 0x0a)
al = al - 0x0a + 'a';
else
al += '0';
putch(ah);
putch(al);
}
void putch(char ch)
{
while (!(UCSR0A & _BV(UDRE0)));
UDR0 = ch;
}
char getch(void)
{
uint32_t count = 0;
#ifdef ADABOOT
LED_PORT &= ~_BV(LED); // toggle LED to show activity - BBR/LF 10/3/2007 & 9/13/2008
#endif
while(!(UCSR0A & _BV(RXC0)))
{
/* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/
/* HACKME:: here is a good place to count times*/
count++;
if (count > MAX_TIME_COUNT)
app_start();
}
#ifdef ADABOOT
LED_PORT |= _BV(LED); // toggle LED to show activity - BBR/LF 10/3/2007 & 9/13/2008
#endif
return UDR0;
}
void getNch(uint8_t count)
{
uint8_t i;
for(i=0;i<count;i++)
{
while(!(UCSR0A & _BV(RXC0)));
UDR0;
}
}
void byte_response(uint8_t val)
{
if (getch() == ' ')
{
putch(0x14);
putch(val);
putch(0x10);
}
else
{
if (++error_count == MAX_ERROR_COUNT)
app_start();
}
}
void nothing_response(void)
{
if (getch() == ' ')
{
putch(0x14);
putch(0x10);
}
else
{
if (++error_count == MAX_ERROR_COUNT)
app_start();
}
}
#ifdef ADABOOT
void flash_led(uint8_t count)
{
/* flash onboard LED count times to signal entering of bootloader */
/* l needs to be volatile or the delay loops below might get */
/* optimized away if compiling with optimizations (DAM). */
volatile uint32_t l;
if (count == 0) {
count = ADABOOT;
}
int8_t i;
for (i = 0; i < count; ++i) {
LED_PORT |= _BV(LED); // LED on
for(l = 0; l < (F_CPU / 1000); ++l); // delay NGvalue was 1000 for both loops - BBR
LED_PORT &= ~_BV(LED); // LED off
for(l = 0; l < (F_CPU / 250); ++l); // delay asymmteric for ADA BOOT BBR
}
for(l = 0; l < (F_CPU / 100); ++l); // pause ADA BOOT BBR
}
#else
void flash_led(uint8_t count)
{
/* flash onboard LED three times to signal entering of bootloader */
/* l needs to be volatile or the delay loops below might get
optimized away if compiling with optimizations (DAM). */
volatile uint32_t l;
if (count == 0) {
count = 3;
}
int8_t i;
for (i = 0; i < count; ++i) {
LED_PORT |= _BV(LED);
for(l = 0; l < (F_CPU / 1000); ++l);
LED_PORT &= ~_BV(LED);
for(l = 0; l < (F_CPU / 1000); ++l);
}
}
#endif
/* end of file ATmegaBOOT.c */

View File

@@ -1,388 +0,0 @@
/**********************************************************/
/* Serial Bootloader for Atmel megaAVR Controllers */
/* */
/* tested with ATmega644 and ATmega644P */
/* should work with other mega's, see code for details */
/* */
/* ATmegaBOOT.c */
/* */
/* 20090131: Added 324P support from Alex Leone */
/* Marius Kintel */
/* 20080915: applied ADABoot mods for Sanguino 644P */
/* Brian Riley */
/* 20080711: hacked for Sanguino by Zach Smith */
/* and Justin Day */
/* 20070626: hacked for Arduino Diecimila (which auto- */
/* resets when a USB connection is made to it) */
/* by D. Mellis */
/* 20060802: hacked for Arduino by D. Cuartielles */
/* based on a previous hack by D. Mellis */
/* and D. Cuartielles */
/* */
/* Monitor and debug functions were added to the original */
/* code by Dr. Erik Lins, chip45.com. (See below) */
/* */
/* Thanks to Karl Pitrich for fixing a bootloader pin */
/* problem and more informative LED blinking! */
/* */
/* For the latest version see: */
/* http://www.chip45.com/ */
/* */
/* ------------------------------------------------------ */
/* */
/* based on stk500boot.c */
/* Copyright (c) 2003, Jason P. Kyle */
/* All rights reserved. */
/* see avr1.org for original file and information */
/* */
/* This program is free software; you can redistribute it */
/* and/or modify it under the terms of the GNU General */
/* Public License as published by the Free Software */
/* Foundation; either version 2 of the License, or */
/* (at your option) any later version. */
/* */
/* This program is distributed in the hope that it will */
/* be useful, but WITHOUT ANY WARRANTY; without even the */
/* implied warranty of MERCHANTABILITY or FITNESS FOR A */
/* PARTICULAR PURPOSE. See the GNU General Public */
/* License for more details. */
/* */
/* You should have received a copy of the GNU General */
/* Public License along with this program; if not, write */
/* to the Free Software Foundation, Inc., */
/* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/* */
/* Licence can be viewed at */
/* http://www.fsf.org/licenses/gpl.txt */
/* */
/* Target = Atmel AVR m128,m64,m32,m16,m8,m162,m163,m169, */
/* m8515,m8535. ATmega161 has a very small boot block so */
/* isn't supported. */
/* */
/* Tested with m168 */
/**********************************************************/
/* $Id$ */
/* some includes */
#include <inttypes.h>
#include <avr/io.h>
#include <avr/pgmspace.h>
#include <avr/interrupt.h>
#include <avr/wdt.h>
#include <avr/boot.h>
#include <util/delay.h>
#ifdef ADABOOT
#define NUM_LED_FLASHES 3
#define ADABOOT_VER 1
#endif
/* 20070707: hacked by David A. Mellis - after this many errors give up and launch application */
#define MAX_ERROR_COUNT 5
/* set the UART baud rate */
/* 20080711: hack by Zach Hoeken */
#define BAUD_RATE 38400
/* SW_MAJOR and MINOR needs to be updated from time to time to avoid warning message from AVR Studio */
/* never allow AVR Studio to do an update !!!! */
#define HW_VER 0x02
#define SW_MAJOR 0x01
#define SW_MINOR 0x10
/* onboard LED is used to indicate, that the bootloader was entered (3x flashing) */
/* if monitor functions are included, LED goes on after monitor was entered */
#define LED_DDR DDRB
#define LED_PORT PORTB
#define LED_PIN PINB
#define LED PINB0
/* define various device id's */
/* manufacturer byte is always the same */
#define SIG1 0x1E // Yep, Atmel is the only manufacturer of AVR micros. Single source :(
#if defined(__AVR_ATmega1284P__)
#define SIG2 0x97
#define SIG3 0x05
#elif defined(__AVR_ATmega644P__)
#define SIG2 0x96
#define SIG3 0x0A
#elif defined(__AVR_ATmega644__)
#define SIG2 0x96
#define SIG3 0x09
#elif defined(__AVR_ATmega324P__)
#define SIG2 0x95
#define SIG3 0x08
#endif
#define PAGE_SIZE 0x080U //128 words
#define PAGE_SIZE_BYTES 0x100U //256 bytes
/* function prototypes */
void putch(char);
char getch(void);
void getNch(uint8_t);
void byte_response(uint8_t);
void nothing_response(void);
char gethex(void);
void puthex(char);
void flash_led(uint8_t);
/* some variables */
union address_union
{
uint16_t word;
uint8_t byte[2];
} address;
union length_union
{
uint16_t word;
uint8_t byte[2];
} length;
struct flags_struct
{
unsigned eeprom : 1;
unsigned rampz : 1;
} flags;
uint8_t buff[256];
uint8_t error_count = 0;
uint8_t sreg;
void (*app_start)(void) = 0x0000;
/* main program starts here */
int main(void)
{
uint8_t ch,ch2;
uint16_t w;
uint16_t i;
asm volatile("nop\n\t");
#ifdef ADABOOT // BBR/LF 10/8/2007 & 9/13/2008
ch = MCUSR;
MCUSR = 0;
WDTCSR |= _BV(WDCE) | _BV(WDE);
WDTCSR = 0;
// Check if the WDT was used to reset, in which case we dont bootload and skip straight to the code. woot.
if (! (ch & _BV(EXTRF))) // if it's a not an external reset...
app_start(); // skip bootloader
#endif
//initialize our serial port.
UBRR0L = (uint8_t)(F_CPU/(BAUD_RATE*16L)-1);
UBRR0H = (F_CPU/(BAUD_RATE*16L)-1) >> 8;
UCSR0B = (1<<RXEN0) | (1<<TXEN0);
UCSR0C = (1<<UCSZ00) | (1<<UCSZ01);
/* Enable internal pull-up resistor on pin D0 (RX), in order
to supress line noise that prevents the bootloader from
timing out (DAM: 20070509) */
DDRD &= ~_BV(PIND0);
PORTD |= _BV(PIND0);
/* set LED pin as output */
LED_DDR |= _BV(LED);
/* flash onboard LED to signal entering of bootloader */
/* ADABOOT will do two series of flashes. first 4 - signifying ADABOOT */
/* then a pause and another flash series signifying ADABOOT sub-version */
flash_led(NUM_LED_FLASHES);
#ifdef ADABOOT
flash_led(ADABOOT_VER); // BBR 9/13/2008
#endif
/* forever loop */
for (;;)
{
putch('\r');
_delay_ms(500);
}
/* end of forever loop */
}
char gethex(void)
{
char ah,al;
ah = getch();
putch(ah);
al = getch();
putch(al);
if(ah >= 'a')
ah = ah - 'a' + 0x0a;
else if(ah >= '0')
ah -= '0';
if(al >= 'a')
al = al - 'a' + 0x0a;
else if(al >= '0')
al -= '0';
return (ah << 4) + al;
}
void puthex(char ch)
{
char ah,al;
ah = (ch & 0xf0) >> 4;
if(ah >= 0x0a)
ah = ah - 0x0a + 'a';
else
ah += '0';
al = (ch & 0x0f);
if(al >= 0x0a)
al = al - 0x0a + 'a';
else
al += '0';
putch(ah);
putch(al);
}
void putch(char ch)
{
while (!(UCSR0A & _BV(UDRE0)));
UDR0 = ch;
}
char getch(void)
{
uint32_t count = 0;
#ifdef ADABOOT
LED_PORT &= ~_BV(LED); // toggle LED to show activity - BBR/LF 10/3/2007 & 9/13/2008
#endif
while(!(UCSR0A & _BV(RXC0)))
{
/* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/
/* HACKME:: here is a good place to count times*/
count++;
if (count > MAX_TIME_COUNT)
app_start();
}
#ifdef ADABOOT
LED_PORT |= _BV(LED); // toggle LED to show activity - BBR/LF 10/3/2007 & 9/13/2008
#endif
return UDR0;
}
void getNch(uint8_t count)
{
uint8_t i;
for(i=0;i<count;i++)
{
while(!(UCSR0A & _BV(RXC0)));
UDR0;
}
}
void byte_response(uint8_t val)
{
if (getch() == ' ')
{
putch(0x14);
putch(val);
putch(0x10);
}
else
{
if (++error_count == MAX_ERROR_COUNT)
app_start();
}
}
void nothing_response(void)
{
if (getch() == ' ')
{
putch(0x14);
putch(0x10);
}
else
{
if (++error_count == MAX_ERROR_COUNT)
app_start();
}
}
#ifdef ADABOOT
void flash_led(uint8_t count)
{
/* flash onboard LED count times to signal entering of bootloader */
/* l needs to be volatile or the delay loops below might get */
/* optimized away if compiling with optimizations (DAM). */
volatile uint32_t l;
if (count == 0) {
count = ADABOOT;
}
int8_t i;
for (i = 0; i < count; ++i) {
LED_PORT |= _BV(LED); // LED on
for(l = 0; l < (F_CPU / 1000); ++l); // delay NGvalue was 1000 for both loops - BBR
LED_PORT &= ~_BV(LED); // LED off
for(l = 0; l < (F_CPU / 250); ++l); // delay asymmteric for ADA BOOT BBR
}
for(l = 0; l < (F_CPU / 100); ++l); // pause ADA BOOT BBR
}
#else
void flash_led(uint8_t count)
{
/* flash onboard LED three times to signal entering of bootloader */
/* l needs to be volatile or the delay loops below might get
optimized away if compiling with optimizations (DAM). */
volatile uint32_t l;
if (count == 0) {
count = 3;
}
int8_t i;
for (i = 0; i < count; ++i) {
LED_PORT |= _BV(LED);
for(l = 0; l < (F_CPU / 1000); ++l);
LED_PORT &= ~_BV(LED);
for(l = 0; l < (F_CPU / 1000); ++l);
}
}
#endif
/* end of file ATmegaBOOT.c */

View File

@@ -1,110 +0,0 @@
:020000021000EC
:10F000000C943EF80C9450F80C9450F80C9450F872
:10F010000C9450F80C9450F80C9450F80C9450F850
:10F020000C9450F80C9450F80C9450F80C9450F840
:10F030000C9450F80C9450F80C9450F80C9450F830
:10F040000C9450F80C9450F80C9450F80C9450F820
:10F050000C9450F80C9450F80C9450F80C9450F810
:10F060000C9450F80C9450F80C9450F80C9450F800
:10F070000C9450F80C9450F80C9450F811241FBEC6
:10F08000CFEFD0E1DEBFCDBF12E0A0E0B1E001C024
:10F090001D92A930B107E1F70E9471F90C944FFB62
:10F0A0000C9400F89091C00095FFFCCF8093C600AF
:10F0B00008951F93282F332727FD3095207F307028
:10F0C00094E0359527959A95E1F72A3014F0295A5E
:10F0D00001C0205D182F1F701A3014F0195A01C09A
:10F0E000105D822F0E9452F8812F0E9452F81F91CA
:10F0F0000895EF92FF920F931F932898EE24FF2418
:10F10000870113C00894E11CF11C011D111D81E051
:10F11000E81689E0F8068DE3080780E0180728F074
:10F12000E0910101F091020109958091C00087FFF3
:10F13000E9CF289A8091C6001F910F91FF90EF9020
:10F1400008950F931F930E9479F8082F0E9452F898
:10F150000E9479F8182F0E9452F8013614F00755D2
:10F1600003C000330CF00053113614F0175503C0E0
:10F1700010330CF01053802F8295807F810F1F91E8
:10F180000F91089590E007C02091C00027FFFCCFA9
:10F190002091C6009F5F9817B8F308951F93182F0A
:10F1A0000E9479F8803251F484E10E9452F8812F54
:10F1B0000E9452F880E10E9452F80CC08091000138
:10F1C0008F5F80930001853029F4E0910101F09177
:10F1D000020109951F9108950E9479F8803239F44F
:10F1E00084E10E9452F880E10E9452F808958091D3
:10F1F00000018F5F80930001853029F4E0910101C7
:10F20000F091020109950895DF93CF9300D000D0CB
:10F21000CDB7DEB7882309F481E090E03DC0289A9D
:10F2200019821A821B821C820CC029813A814B816F
:10F230005C812F5F3F4F4F4F5F4F29833A834B8352
:10F240005C8329813A814B815C8120386EE33607EB
:10F2500060E0460760E0560740F3289819821A825A
:10F260001B821C820CC029813A814B815C812F5FFB
:10F270003F4F4F4F5F4F29833A834B835C832981F4
:10F280003A814B815C8120306AEF360760E04607A7
:10F2900060E0560740F39F5F981709F619821A82BB
:10F2A0001B821C820BC089819A81AB81BC81019633
:10F2B000A11DB11D89839A83AB83BC8389819A8107
:10F2C000AB81BC81803021E7920722E0A20720E0D9
:10F2D000B20748F30F900F900F900F90CF91DF91EE
:10F2E0000895CF92DF92EF92FF920F931F93CF93E7
:10F2F000DF93000094B714BE809160008861809312
:10F3000060001092600091FD05C0E0910101F09154
:10F310000201099589E18093C4001092C50088E13B
:10F320008093C10086E08093C2005098589A209A3A
:10F3300083E00E9404F981E00E9404F90E9479F8B8
:10F34000803309F441C08133E1F40E9479F88032BE
:10F3500009F097C184E10E9452F881E40E9452F8BA
:10F3600086E50E9452F882E50E9452F880E20E94EF
:10F3700052F889E40E9452F883E50E9452F880E531
:10F380000BC1803439F40E9479F88638E8F00E9485
:10F3900079F81AC0813499F40E9479F8803811F410
:10F3A00082E06CC1813811F481E068C1823811F4C7
:10F3B00080E164C1883909F060C183E05FC18234B3
:10F3C00031F484E10E94C2F80E94ECF8B7CF853492
:10F3D00011F485E0F7CF8035B9F3813531F40E941F
:10F3E000ECF888E080936000FFCF823569F38535C3
:10F3F00049F40E9479F8809303010E9479F8809380
:10F400000401E2CF863521F484E00E94C2F835C1C0
:10F41000843609F0C7C00E9479F8809306020E94E2
:10F4200079F880930502809108028E7F809308020C
:10F430000E9479F8853429F48091080281608093D4
:10F44000080205E011E0F801119281E0E538F807C3
:10F45000D9F745E0C42E41E0D42EEE24FF2408C0A5
:10F460000E9479F8F60181936F010894E11CF11C68
:10F470008091050290910602E816F90688F30E9431
:10F4800079F8803209F0FDC08091080280FD17C034
:10F4900020C0F999FECF209103013091040132BDC3
:10F4A00021BDF80141918F0140BDFA9AF99A2F5F71
:10F4B0003F4F3093040120930301019602C080E086
:10F4C00090E020910502309106028217930708F31D
:10F4D00062C08091030190910401880F991F90935D
:10F4E0000401809303018091050280FF09C080918F
:10F4F0000502909106020196909306028093050200
:10F50000F999FECF1127E0910301F0910401C5E0C4
:10F51000D1E08091050290910602103091F40091A3
:10F52000570001700130D9F303E000935700E895CC
:10F530000091570001700130D9F301E100935700A9
:10F54000E895099019900091570001700130D9F3A6
:10F5500001E000935700E8951395103898F01127B3
:10F560000091570001700130D9F305E00093570076
:10F57000E8950091570001700130D9F301E1009343
:10F580005700E8953296029709F0C7CF103011F076
:10F590000296E5CF112484E10E9452F880E10E9496
:10F5A00052F8CCCE843709F055C00E9479F8809388
:10F5B00006020E9479F8809305020E9479F89091E2
:10F5C0000802853421F49160909308020DC09E7F5B
:10F5D000909308028091030190910401880F991F74
:10F5E00090930401809303010E9479F8803209F01E
:10F5F000A5CE84E10E9452F800E010E023C0809183
:10F60000080280FF0BC0F999FECF80910301909111
:10F61000040192BD81BDF89A80B507C081FD07C085
:10F62000E0910301F091040184910E9452F88091CD
:10F6300003019091040101969093040180930301CA
:10F640000F5F1F4F8091050290910602081719075E
:10F65000B0F2A4CF853779F40E9479F8803289F42A
:10F6600084E10E9452F88EE10E9452F886E90E94DD
:10F6700052F88AE091CF863721F480E00E94CEF8DC
:10F680005DCE809100018F5F80930001853009F08D
:10F6900055CEE0910101F091020109954FCEF89409
:02F6A000FFCF9A
:040000031000F000F9
:00000001FF

View File

@@ -1,56 +0,0 @@
#Makefile for ATmegaBOOT
# E.Lins, 18.7.2005
# $Id$
# program name should not be changed...
PROGRAM = ATmegaBOOT_644P
# enter the target CPU frequency
AVR_FREQ = 16000000L
MCU_TARGET = atmega644p
LDSECTION = --section-start=.text=0x1F000
OBJ = $(PROGRAM).o
OPTIMIZE = -Os
DEFS =
LIBS =
CC = avr-gcc
# Override is only needed by avr-lib build system.
override CFLAGS = -g -Wall $(OPTIMIZE) -mmcu=$(MCU_TARGET) -DF_CPU=$(AVR_FREQ) $(DEFS)
override LDFLAGS = -Wl,$(LDSECTION)
#override LDFLAGS = -Wl,-Map,$(PROGRAM).map,$(LDSECTION)
OBJCOPY = avr-objcopy
OBJDUMP = avr-objdump
all: CFLAGS += '-DMAX_TIME_COUNT=8000000L>>1' -DADABOOT
all: $(PROGRAM).hex
$(PROGRAM).hex: $(PROGRAM).elf
$(OBJCOPY) -j .text -j .data -O ihex $< $@
$(PROGRAM).elf: $(OBJ)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
$(OBJ): ATmegaBOOT.c
avr-gcc $(CFLAGS) $(LDFLAGS) -c -g -Os -Wall -mmcu=$(MCU_TARGET) ATmegaBOOT.c -o $(PROGRAM).o
%.lst: %.elf
$(OBJDUMP) -h -S $< > $@
%.srec: %.elf
$(OBJCOPY) -j .text -j .data -O srec $< $@
%.bin: %.elf
$(OBJCOPY) -j .text -j .data -O binary $< $@
clean:
rm -rf *.o *.elf *.lst *.map *.sym *.lss *.eep *.srec *.bin *.hex

View File

@@ -1,3 +0,0 @@
Note: This bootloader support ATmega644, ATmega644P and ATmega324P.
To build, set PROGRAM and MCU_TARGET in the Makefile according to your target device.

View File

@@ -1,215 +0,0 @@
#ifndef Arduino_h
#define Arduino_h
#include <stdlib.h>
#include <string.h>
#include <math.h>
#include <avr/pgmspace.h>
#include <avr/io.h>
#include <avr/interrupt.h>
#include "binary.h"
#ifdef __cplusplus
extern "C"{
#endif
#define HIGH 0x1
#define LOW 0x0
#define INPUT 0x0
#define OUTPUT 0x1
#define INPUT_PULLUP 0x2
#define true 0x1
#define false 0x0
#define PI 3.1415926535897932384626433832795
#define HALF_PI 1.5707963267948966192313216916398
#define TWO_PI 6.283185307179586476925286766559
#define DEG_TO_RAD 0.017453292519943295769236907684886
#define RAD_TO_DEG 57.295779513082320876798154814105
#define SERIAL 0x0
#define DISPLAY 0x1
#define LSBFIRST 0
#define MSBFIRST 1
#define CHANGE 1
#define FALLING 2
#define RISING 3
#if defined(__AVR_ATtiny24__) || defined(__AVR_ATtiny44__) || defined(__AVR_ATtiny84__) || defined(__AVR_ATtiny25__) || defined(__AVR_ATtiny45__) || defined(__AVR_ATtiny85__)
#define DEFAULT 0
#define EXTERNAL 1
#define INTERNAL 2
#else
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega644P__)
#define INTERNAL1V1 2
#define INTERNAL2V56 3
#else
#define INTERNAL 3
#endif
#define DEFAULT 1
#define EXTERNAL 0
#endif
// undefine stdlib's abs if encountered
#ifdef abs
#undef abs
#endif
#define min(a,b) ((a)<(b)?(a):(b))
#define max(a,b) ((a)>(b)?(a):(b))
#define abs(x) ((x)>0?(x):-(x))
#define constrain(amt,low,high) ((amt)<(low)?(low):((amt)>(high)?(high):(amt)))
#define round(x) ((x)>=0?(long)((x)+0.5):(long)((x)-0.5))
#define radians(deg) ((deg)*DEG_TO_RAD)
#define degrees(rad) ((rad)*RAD_TO_DEG)
#define sq(x) ((x)*(x))
#define interrupts() sei()
#define noInterrupts() cli()
#define clockCyclesPerMicrosecond() ( F_CPU / 1000000L )
#define clockCyclesToMicroseconds(a) ( (a) / clockCyclesPerMicrosecond() )
#define microsecondsToClockCycles(a) ( (a) * clockCyclesPerMicrosecond() )
#define lowByte(w) ((uint8_t) ((w) & 0xff))
#define highByte(w) ((uint8_t) ((w) >> 8))
#define bitRead(value, bit) (((value) >> (bit)) & 0x01)
#define bitSet(value, bit) ((value) |= (1UL << (bit)))
#define bitClear(value, bit) ((value) &= ~(1UL << (bit)))
#define bitWrite(value, bit, bitvalue) (bitvalue ? bitSet(value, bit) : bitClear(value, bit))
typedef unsigned int word;
#define bit(b) (1UL << (b))
typedef uint8_t boolean;
typedef uint8_t byte;
void init(void);
void pinMode(uint8_t, uint8_t);
void digitalWrite(uint8_t, uint8_t);
int digitalRead(uint8_t);
int analogRead(uint8_t);
void analogReference(uint8_t mode);
void analogWrite(uint8_t, int);
unsigned long millis(void);
unsigned long micros(void);
void delay(unsigned long);
void delayMicroseconds(unsigned int us);
unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout);
void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val);
uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);
void attachInterrupt(uint8_t, void (*)(void), int mode);
void detachInterrupt(uint8_t);
void setup(void);
void loop(void);
// Get the bit location within the hardware port of the given virtual pin.
// This comes from the pins_*.c file for the active board configuration.
#define analogInPinToBit(P) (P)
// On the ATmega1280, the addresses of some of the port registers are
// greater than 255, so we can't store them in uint8_t's.
extern const uint16_t PROGMEM port_to_mode_PGM[];
extern const uint16_t PROGMEM port_to_input_PGM[];
extern const uint16_t PROGMEM port_to_output_PGM[];
extern const uint8_t PROGMEM digital_pin_to_port_PGM[];
// extern const uint8_t PROGMEM digital_pin_to_bit_PGM[];
extern const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[];
extern const uint8_t PROGMEM digital_pin_to_timer_PGM[];
// Get the bit location within the hardware port of the given virtual pin.
// This comes from the pins_*.c file for the active board configuration.
//
// These perform slightly better as macros compared to inline functions
//
#define digitalPinToPort(P) ( pgm_read_byte( digital_pin_to_port_PGM + (P) ) )
#define digitalPinToBitMask(P) ( pgm_read_byte( digital_pin_to_bit_mask_PGM + (P) ) )
#define digitalPinToTimer(P) ( pgm_read_byte( digital_pin_to_timer_PGM + (P) ) )
#define analogInPinToBit(P) (P)
#define portOutputRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_output_PGM + (P))) )
#define portInputRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_input_PGM + (P))) )
#define portModeRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_mode_PGM + (P))) )
#define NOT_A_PIN 0
#define NOT_A_PORT 0
#ifdef ARDUINO_MAIN
#define PA 1
#define PB 2
#define PC 3
#define PD 4
#define PE 5
#define PF 6
#define PG 7
#define PH 8
#define PJ 10
#define PK 11
#define PL 12
#endif
#define NOT_ON_TIMER 0
#define TIMER0A 1
#define TIMER0B 2
#define TIMER1A 3
#define TIMER1B 4
#define TIMER2 5
#define TIMER2A 6
#define TIMER2B 7
#define TIMER3A 8
#define TIMER3B 9
#define TIMER3C 10
#define TIMER4A 11
#define TIMER4B 12
#define TIMER4C 13
#define TIMER4D 14
#define TIMER5A 15
#define TIMER5B 16
#define TIMER5C 17
#ifdef __cplusplus
} // extern "C"
#endif
#ifdef __cplusplus
#include "WCharacter.h"
#include "WString.h"
#include "HardwareSerial.h"
uint16_t makeWord(uint16_t w);
uint16_t makeWord(byte h, byte l);
#define word(...) makeWord(__VA_ARGS__)
unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout = 1000000L);
void tone(uint8_t _pin, unsigned int frequency, unsigned long duration = 0);
void noTone(uint8_t _pin);
// WMath prototypes
long random(long);
long random(long, long);
void randomSeed(unsigned int);
long map(long, long, long, long, long);
#endif
#include "pins_arduino.h"
#endif

View File

@@ -1,239 +0,0 @@
/* Copyright (c) 2011, Peter Barrett
**
** Permission to use, copy, modify, and/or distribute this software for
** any purpose with or without fee is hereby granted, provided that the
** above copyright notice and this permission notice appear in all copies.
**
** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
** WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
** WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
** BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
** OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
** WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
** ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
** SOFTWARE.
*/
#include "Platform.h"
#include "USBAPI.h"
#include <avr/wdt.h>
#if defined(USBCON)
#ifdef CDC_ENABLED
#if (RAMEND < 1000)
#define SERIAL_BUFFER_SIZE 16
#else
#define SERIAL_BUFFER_SIZE 64
#endif
struct ring_buffer
{
unsigned char buffer[SERIAL_BUFFER_SIZE];
volatile int head;
volatile int tail;
};
ring_buffer cdc_rx_buffer = { { 0 }, 0, 0};
typedef struct
{
u32 dwDTERate;
u8 bCharFormat;
u8 bParityType;
u8 bDataBits;
u8 lineState;
} LineInfo;
static volatile LineInfo _usbLineInfo = { 57600, 0x00, 0x00, 0x00, 0x00 };
#define WEAK __attribute__ ((weak))
extern const CDCDescriptor _cdcInterface PROGMEM;
const CDCDescriptor _cdcInterface =
{
D_IAD(0,2,CDC_COMMUNICATION_INTERFACE_CLASS,CDC_ABSTRACT_CONTROL_MODEL,1),
// CDC communication interface
D_INTERFACE(CDC_ACM_INTERFACE,1,CDC_COMMUNICATION_INTERFACE_CLASS,CDC_ABSTRACT_CONTROL_MODEL,0),
D_CDCCS(CDC_HEADER,0x10,0x01), // Header (1.10 bcd)
D_CDCCS(CDC_CALL_MANAGEMENT,1,1), // Device handles call management (not)
D_CDCCS4(CDC_ABSTRACT_CONTROL_MANAGEMENT,6), // SET_LINE_CODING, GET_LINE_CODING, SET_CONTROL_LINE_STATE supported
D_CDCCS(CDC_UNION,CDC_ACM_INTERFACE,CDC_DATA_INTERFACE), // Communication interface is master, data interface is slave 0
D_ENDPOINT(USB_ENDPOINT_IN (CDC_ENDPOINT_ACM),USB_ENDPOINT_TYPE_INTERRUPT,0x10,0x40),
// CDC data interface
D_INTERFACE(CDC_DATA_INTERFACE,2,CDC_DATA_INTERFACE_CLASS,0,0),
D_ENDPOINT(USB_ENDPOINT_OUT(CDC_ENDPOINT_OUT),USB_ENDPOINT_TYPE_BULK,0x40,0),
D_ENDPOINT(USB_ENDPOINT_IN (CDC_ENDPOINT_IN ),USB_ENDPOINT_TYPE_BULK,0x40,0)
};
int WEAK CDC_GetInterface(u8* interfaceNum)
{
interfaceNum[0] += 2; // uses 2
return USB_SendControl(TRANSFER_PGM,&_cdcInterface,sizeof(_cdcInterface));
}
bool WEAK CDC_Setup(Setup& setup)
{
u8 r = setup.bRequest;
u8 requestType = setup.bmRequestType;
if (REQUEST_DEVICETOHOST_CLASS_INTERFACE == requestType)
{
if (CDC_GET_LINE_CODING == r)
{
USB_SendControl(0,(void*)&_usbLineInfo,7);
return true;
}
}
if (REQUEST_HOSTTODEVICE_CLASS_INTERFACE == requestType)
{
if (CDC_SET_LINE_CODING == r)
{
USB_RecvControl((void*)&_usbLineInfo,7);
return true;
}
if (CDC_SET_CONTROL_LINE_STATE == r)
{
_usbLineInfo.lineState = setup.wValueL;
// auto-reset into the bootloader is triggered when the port, already
// open at 1200 bps, is closed. this is the signal to start the watchdog
// with a relatively long period so it can finish housekeeping tasks
// like servicing endpoints before the sketch ends
if (1200 == _usbLineInfo.dwDTERate) {
// We check DTR state to determine if host port is open (bit 0 of lineState).
if ((_usbLineInfo.lineState & 0x01) == 0) {
*(uint16_t *)0x0800 = 0x7777;
wdt_enable(WDTO_120MS);
} else {
// Most OSs do some intermediate steps when configuring ports and DTR can
// twiggle more than once before stabilizing.
// To avoid spurious resets we set the watchdog to 250ms and eventually
// cancel if DTR goes back high.
wdt_disable();
wdt_reset();
*(uint16_t *)0x0800 = 0x0;
}
}
return true;
}
}
return false;
}
int _serialPeek = -1;
void Serial_::begin(uint16_t baud_count)
{
}
void Serial_::end(void)
{
}
void Serial_::accept(void)
{
ring_buffer *buffer = &cdc_rx_buffer;
int i = (unsigned int)(buffer->head+1) % SERIAL_BUFFER_SIZE;
// if we should be storing the received character into the location
// just before the tail (meaning that the head would advance to the
// current location of the tail), we're about to overflow the buffer
// and so we don't write the character or advance the head.
// while we have room to store a byte
while (i != buffer->tail) {
int c = USB_Recv(CDC_RX);
if (c == -1)
break; // no more data
buffer->buffer[buffer->head] = c;
buffer->head = i;
i = (unsigned int)(buffer->head+1) % SERIAL_BUFFER_SIZE;
}
}
int Serial_::available(void)
{
ring_buffer *buffer = &cdc_rx_buffer;
return (unsigned int)(SERIAL_BUFFER_SIZE + buffer->head - buffer->tail) % SERIAL_BUFFER_SIZE;
}
int Serial_::peek(void)
{
ring_buffer *buffer = &cdc_rx_buffer;
if (buffer->head == buffer->tail) {
return -1;
} else {
return buffer->buffer[buffer->tail];
}
}
int Serial_::read(void)
{
ring_buffer *buffer = &cdc_rx_buffer;
// if the head isn't ahead of the tail, we don't have any characters
if (buffer->head == buffer->tail) {
return -1;
} else {
unsigned char c = buffer->buffer[buffer->tail];
buffer->tail = (unsigned int)(buffer->tail + 1) % SERIAL_BUFFER_SIZE;
return c;
}
}
void Serial_::flush(void)
{
USB_Flush(CDC_TX);
}
size_t Serial_::write(uint8_t c)
{
/* only try to send bytes if the high-level CDC connection itself
is open (not just the pipe) - the OS should set lineState when the port
is opened and clear lineState when the port is closed.
bytes sent before the user opens the connection or after
the connection is closed are lost - just like with a UART. */
// TODO - ZE - check behavior on different OSes and test what happens if an
// open connection isn't broken cleanly (cable is yanked out, host dies
// or locks up, or host virtual serial port hangs)
if (_usbLineInfo.lineState > 0) {
int r = USB_Send(CDC_TX,&c,1);
if (r > 0) {
return r;
} else {
setWriteError();
return 0;
}
}
setWriteError();
return 0;
}
// This operator is a convenient way for a sketch to check whether the
// port has actually been configured and opened by the host (as opposed
// to just being connected to the host). It can be used, for example, in
// setup() before printing to ensure that an application on the host is
// actually ready to receive and display the data.
// We add a short delay before returning to fix a bug observed by Federico
// where the port is configured (lineState != 0) but not quite opened.
Serial_::operator bool() {
bool result = false;
if (_usbLineInfo.lineState > 0)
result = true;
delay(10);
return result;
}
Serial_ Serial;
#endif
#endif /* if defined(USBCON) */

View File

@@ -1,26 +0,0 @@
#ifndef client_h
#define client_h
#include "Print.h"
#include "Stream.h"
#include "IPAddress.h"
class Client : public Stream {
public:
virtual int connect(IPAddress ip, uint16_t port) =0;
virtual int connect(const char *host, uint16_t port) =0;
virtual size_t write(uint8_t) =0;
virtual size_t write(const uint8_t *buf, size_t size) =0;
virtual int available() = 0;
virtual int read() = 0;
virtual int read(uint8_t *buf, size_t size) = 0;
virtual int peek() = 0;
virtual void flush() = 0;
virtual void stop() = 0;
virtual uint8_t connected() = 0;
virtual operator bool() = 0;
protected:
uint8_t* rawIPAddress(IPAddress& addr) { return addr.raw_address(); };
};
#endif

View File

@@ -1,520 +0,0 @@
/* Copyright (c) 2011, Peter Barrett
**
** Permission to use, copy, modify, and/or distribute this software for
** any purpose with or without fee is hereby granted, provided that the
** above copyright notice and this permission notice appear in all copies.
**
** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
** WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
** WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
** BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
** OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
** WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
** ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
** SOFTWARE.
*/
#include "Platform.h"
#include "USBAPI.h"
#include "USBDesc.h"
#if defined(USBCON)
#ifdef HID_ENABLED
//#define RAWHID_ENABLED
// Singletons for mouse and keyboard
Mouse_ Mouse;
Keyboard_ Keyboard;
//================================================================================
//================================================================================
// HID report descriptor
#define LSB(_x) ((_x) & 0xFF)
#define MSB(_x) ((_x) >> 8)
#define RAWHID_USAGE_PAGE 0xFFC0
#define RAWHID_USAGE 0x0C00
#define RAWHID_TX_SIZE 64
#define RAWHID_RX_SIZE 64
extern const u8 _hidReportDescriptor[] PROGMEM;
const u8 _hidReportDescriptor[] = {
// Mouse
0x05, 0x01, // USAGE_PAGE (Generic Desktop) // 54
0x09, 0x02, // USAGE (Mouse)
0xa1, 0x01, // COLLECTION (Application)
0x09, 0x01, // USAGE (Pointer)
0xa1, 0x00, // COLLECTION (Physical)
0x85, 0x01, // REPORT_ID (1)
0x05, 0x09, // USAGE_PAGE (Button)
0x19, 0x01, // USAGE_MINIMUM (Button 1)
0x29, 0x03, // USAGE_MAXIMUM (Button 3)
0x15, 0x00, // LOGICAL_MINIMUM (0)
0x25, 0x01, // LOGICAL_MAXIMUM (1)
0x95, 0x03, // REPORT_COUNT (3)
0x75, 0x01, // REPORT_SIZE (1)
0x81, 0x02, // INPUT (Data,Var,Abs)
0x95, 0x01, // REPORT_COUNT (1)
0x75, 0x05, // REPORT_SIZE (5)
0x81, 0x03, // INPUT (Cnst,Var,Abs)
0x05, 0x01, // USAGE_PAGE (Generic Desktop)
0x09, 0x30, // USAGE (X)
0x09, 0x31, // USAGE (Y)
0x09, 0x38, // USAGE (Wheel)
0x15, 0x81, // LOGICAL_MINIMUM (-127)
0x25, 0x7f, // LOGICAL_MAXIMUM (127)
0x75, 0x08, // REPORT_SIZE (8)
0x95, 0x03, // REPORT_COUNT (3)
0x81, 0x06, // INPUT (Data,Var,Rel)
0xc0, // END_COLLECTION
0xc0, // END_COLLECTION
// Keyboard
0x05, 0x01, // USAGE_PAGE (Generic Desktop) // 47
0x09, 0x06, // USAGE (Keyboard)
0xa1, 0x01, // COLLECTION (Application)
0x85, 0x02, // REPORT_ID (2)
0x05, 0x07, // USAGE_PAGE (Keyboard)
0x19, 0xe0, // USAGE_MINIMUM (Keyboard LeftControl)
0x29, 0xe7, // USAGE_MAXIMUM (Keyboard Right GUI)
0x15, 0x00, // LOGICAL_MINIMUM (0)
0x25, 0x01, // LOGICAL_MAXIMUM (1)
0x75, 0x01, // REPORT_SIZE (1)
0x95, 0x08, // REPORT_COUNT (8)
0x81, 0x02, // INPUT (Data,Var,Abs)
0x95, 0x01, // REPORT_COUNT (1)
0x75, 0x08, // REPORT_SIZE (8)
0x81, 0x03, // INPUT (Cnst,Var,Abs)
0x95, 0x06, // REPORT_COUNT (6)
0x75, 0x08, // REPORT_SIZE (8)
0x15, 0x00, // LOGICAL_MINIMUM (0)
0x25, 0x65, // LOGICAL_MAXIMUM (101)
0x05, 0x07, // USAGE_PAGE (Keyboard)
0x19, 0x00, // USAGE_MINIMUM (Reserved (no event indicated))
0x29, 0x65, // USAGE_MAXIMUM (Keyboard Application)
0x81, 0x00, // INPUT (Data,Ary,Abs)
0xc0, // END_COLLECTION
#if RAWHID_ENABLED
// RAW HID
0x06, LSB(RAWHID_USAGE_PAGE), MSB(RAWHID_USAGE_PAGE), // 30
0x0A, LSB(RAWHID_USAGE), MSB(RAWHID_USAGE),
0xA1, 0x01, // Collection 0x01
0x85, 0x03, // REPORT_ID (3)
0x75, 0x08, // report size = 8 bits
0x15, 0x00, // logical minimum = 0
0x26, 0xFF, 0x00, // logical maximum = 255
0x95, 64, // report count TX
0x09, 0x01, // usage
0x81, 0x02, // Input (array)
0x95, 64, // report count RX
0x09, 0x02, // usage
0x91, 0x02, // Output (array)
0xC0 // end collection
#endif
};
extern const HIDDescriptor _hidInterface PROGMEM;
const HIDDescriptor _hidInterface =
{
D_INTERFACE(HID_INTERFACE,1,3,0,0),
D_HIDREPORT(sizeof(_hidReportDescriptor)),
D_ENDPOINT(USB_ENDPOINT_IN (HID_ENDPOINT_INT),USB_ENDPOINT_TYPE_INTERRUPT,0x40,0x01)
};
//================================================================================
//================================================================================
// Driver
u8 _hid_protocol = 1;
u8 _hid_idle = 1;
#define WEAK __attribute__ ((weak))
int WEAK HID_GetInterface(u8* interfaceNum)
{
interfaceNum[0] += 1; // uses 1
return USB_SendControl(TRANSFER_PGM,&_hidInterface,sizeof(_hidInterface));
}
int WEAK HID_GetDescriptor(int i)
{
return USB_SendControl(TRANSFER_PGM,_hidReportDescriptor,sizeof(_hidReportDescriptor));
}
void WEAK HID_SendReport(u8 id, const void* data, int len)
{
USB_Send(HID_TX, &id, 1);
USB_Send(HID_TX | TRANSFER_RELEASE,data,len);
}
bool WEAK HID_Setup(Setup& setup)
{
u8 r = setup.bRequest;
u8 requestType = setup.bmRequestType;
if (REQUEST_DEVICETOHOST_CLASS_INTERFACE == requestType)
{
if (HID_GET_REPORT == r)
{
//HID_GetReport();
return true;
}
if (HID_GET_PROTOCOL == r)
{
//Send8(_hid_protocol); // TODO
return true;
}
}
if (REQUEST_HOSTTODEVICE_CLASS_INTERFACE == requestType)
{
if (HID_SET_PROTOCOL == r)
{
_hid_protocol = setup.wValueL;
return true;
}
if (HID_SET_IDLE == r)
{
_hid_idle = setup.wValueL;
return true;
}
}
return false;
}
//================================================================================
//================================================================================
// Mouse
Mouse_::Mouse_(void) : _buttons(0)
{
}
void Mouse_::begin(void)
{
}
void Mouse_::end(void)
{
}
void Mouse_::click(uint8_t b)
{
_buttons = b;
move(0,0,0);
_buttons = 0;
move(0,0,0);
}
void Mouse_::move(signed char x, signed char y, signed char wheel)
{
u8 m[4];
m[0] = _buttons;
m[1] = x;
m[2] = y;
m[3] = wheel;
HID_SendReport(1,m,4);
}
void Mouse_::buttons(uint8_t b)
{
if (b != _buttons)
{
_buttons = b;
move(0,0,0);
}
}
void Mouse_::press(uint8_t b)
{
buttons(_buttons | b);
}
void Mouse_::release(uint8_t b)
{
buttons(_buttons & ~b);
}
bool Mouse_::isPressed(uint8_t b)
{
if ((b & _buttons) > 0)
return true;
return false;
}
//================================================================================
//================================================================================
// Keyboard
Keyboard_::Keyboard_(void)
{
}
void Keyboard_::begin(void)
{
}
void Keyboard_::end(void)
{
}
void Keyboard_::sendReport(KeyReport* keys)
{
HID_SendReport(2,keys,sizeof(KeyReport));
}
extern
const uint8_t _asciimap[128] PROGMEM;
#define SHIFT 0x80
const uint8_t _asciimap[128] =
{
0x00, // NUL
0x00, // SOH
0x00, // STX
0x00, // ETX
0x00, // EOT
0x00, // ENQ
0x00, // ACK
0x00, // BEL
0x2a, // BS Backspace
0x2b, // TAB Tab
0x28, // LF Enter
0x00, // VT
0x00, // FF
0x00, // CR
0x00, // SO
0x00, // SI
0x00, // DEL
0x00, // DC1
0x00, // DC2
0x00, // DC3
0x00, // DC4
0x00, // NAK
0x00, // SYN
0x00, // ETB
0x00, // CAN
0x00, // EM
0x00, // SUB
0x00, // ESC
0x00, // FS
0x00, // GS
0x00, // RS
0x00, // US
0x2c, // ' '
0x1e|SHIFT, // !
0x34|SHIFT, // "
0x20|SHIFT, // #
0x21|SHIFT, // $
0x22|SHIFT, // %
0x24|SHIFT, // &
0x34, // '
0x26|SHIFT, // (
0x27|SHIFT, // )
0x25|SHIFT, // *
0x2e|SHIFT, // +
0x36, // ,
0x2d, // -
0x37, // .
0x38, // /
0x27, // 0
0x1e, // 1
0x1f, // 2
0x20, // 3
0x21, // 4
0x22, // 5
0x23, // 6
0x24, // 7
0x25, // 8
0x26, // 9
0x33|SHIFT, // :
0x33, // ;
0x36|SHIFT, // <
0x2e, // =
0x37|SHIFT, // >
0x38|SHIFT, // ?
0x1f|SHIFT, // @
0x04|SHIFT, // A
0x05|SHIFT, // B
0x06|SHIFT, // C
0x07|SHIFT, // D
0x08|SHIFT, // E
0x09|SHIFT, // F
0x0a|SHIFT, // G
0x0b|SHIFT, // H
0x0c|SHIFT, // I
0x0d|SHIFT, // J
0x0e|SHIFT, // K
0x0f|SHIFT, // L
0x10|SHIFT, // M
0x11|SHIFT, // N
0x12|SHIFT, // O
0x13|SHIFT, // P
0x14|SHIFT, // Q
0x15|SHIFT, // R
0x16|SHIFT, // S
0x17|SHIFT, // T
0x18|SHIFT, // U
0x19|SHIFT, // V
0x1a|SHIFT, // W
0x1b|SHIFT, // X
0x1c|SHIFT, // Y
0x1d|SHIFT, // Z
0x2f, // [
0x31, // bslash
0x30, // ]
0x23|SHIFT, // ^
0x2d|SHIFT, // _
0x35, // `
0x04, // a
0x05, // b
0x06, // c
0x07, // d
0x08, // e
0x09, // f
0x0a, // g
0x0b, // h
0x0c, // i
0x0d, // j
0x0e, // k
0x0f, // l
0x10, // m
0x11, // n
0x12, // o
0x13, // p
0x14, // q
0x15, // r
0x16, // s
0x17, // t
0x18, // u
0x19, // v
0x1a, // w
0x1b, // x
0x1c, // y
0x1d, // z
0x2f|SHIFT, //
0x31|SHIFT, // |
0x30|SHIFT, // }
0x35|SHIFT, // ~
0 // DEL
};
uint8_t USBPutChar(uint8_t c);
// press() adds the specified key (printing, non-printing, or modifier)
// to the persistent key report and sends the report. Because of the way
// USB HID works, the host acts like the key remains pressed until we
// call release(), releaseAll(), or otherwise clear the report and resend.
size_t Keyboard_::press(uint8_t k)
{
uint8_t i;
if (k >= 136) { // it's a non-printing key (not a modifier)
k = k - 136;
} else if (k >= 128) { // it's a modifier key
_keyReport.modifiers |= (1<<(k-128));
k = 0;
} else { // it's a printing key
k = pgm_read_byte(_asciimap + k);
if (!k) {
setWriteError();
return 0;
}
if (k & 0x80) { // it's a capital letter or other character reached with shift
_keyReport.modifiers |= 0x02; // the left shift modifier
k &= 0x7F;
}
}
// Add k to the key report only if it's not already present
// and if there is an empty slot.
if (_keyReport.keys[0] != k && _keyReport.keys[1] != k &&
_keyReport.keys[2] != k && _keyReport.keys[3] != k &&
_keyReport.keys[4] != k && _keyReport.keys[5] != k) {
for (i=0; i<6; i++) {
if (_keyReport.keys[i] == 0x00) {
_keyReport.keys[i] = k;
break;
}
}
if (i == 6) {
setWriteError();
return 0;
}
}
sendReport(&_keyReport);
return 1;
}
// release() takes the specified key out of the persistent key report and
// sends the report. This tells the OS the key is no longer pressed and that
// it shouldn't be repeated any more.
size_t Keyboard_::release(uint8_t k)
{
uint8_t i;
if (k >= 136) { // it's a non-printing key (not a modifier)
k = k - 136;
} else if (k >= 128) { // it's a modifier key
_keyReport.modifiers &= ~(1<<(k-128));
k = 0;
} else { // it's a printing key
k = pgm_read_byte(_asciimap + k);
if (!k) {
return 0;
}
if (k & 0x80) { // it's a capital letter or other character reached with shift
_keyReport.modifiers &= ~(0x02); // the left shift modifier
k &= 0x7F;
}
}
// Test the key report to see if k is present. Clear it if it exists.
// Check all positions in case the key is present more than once (which it shouldn't be)
for (i=0; i<6; i++) {
if (0 != k && _keyReport.keys[i] == k) {
_keyReport.keys[i] = 0x00;
}
}
sendReport(&_keyReport);
return 1;
}
void Keyboard_::releaseAll(void)
{
_keyReport.keys[0] = 0;
_keyReport.keys[1] = 0;
_keyReport.keys[2] = 0;
_keyReport.keys[3] = 0;
_keyReport.keys[4] = 0;
_keyReport.keys[5] = 0;
_keyReport.modifiers = 0;
sendReport(&_keyReport);
}
size_t Keyboard_::write(uint8_t c)
{
uint8_t p = press(c); // Keydown
uint8_t r = release(c); // Keyup
return (p); // just return the result of press() since release() almost always returns 1
}
#endif
#endif /* if defined(USBCON) */

View File

@@ -1,519 +0,0 @@
/*
HardwareSerial.cpp - Hardware serial library for Wiring
Copyright (c) 2006 Nicholas Zambetti. All right reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Modified 23 November 2006 by David A. Mellis
Modified 28 September 2010 by Mark Sproul
Modified 14 August 2012 by Alarus
*/
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <inttypes.h>
#include "Arduino.h"
#include "wiring_private.h"
// this next line disables the entire HardwareSerial.cpp,
// this is so I can support Attiny series and any other chip without a uart
#if defined(UBRRH) || defined(UBRR0H) || defined(UBRR1H) || defined(UBRR2H) || defined(UBRR3H)
#include "HardwareSerial.h"
/*
* on ATmega8, the uart and its bits are not numbered, so there is no "TXC0"
* definition.
*/
#if !defined(TXC0)
#if defined(TXC)
#define TXC0 TXC
#elif defined(TXC1)
// Some devices have uart1 but no uart0
#define TXC0 TXC1
#else
#error TXC0 not definable in HardwareSerial.h
#endif
#endif
// Define constants and variables for buffering incoming serial data. We're
// using a ring buffer (I think), in which head is the index of the location
// to which to write the next incoming character and tail is the index of the
// location from which to read.
#if (RAMEND < 1000)
#define SERIAL_BUFFER_SIZE 16
#else
#define SERIAL_BUFFER_SIZE 64
#endif
struct ring_buffer
{
unsigned char buffer[SERIAL_BUFFER_SIZE];
volatile unsigned int head;
volatile unsigned int tail;
};
#if defined(USBCON)
ring_buffer rx_buffer = { { 0 }, 0, 0};
ring_buffer tx_buffer = { { 0 }, 0, 0};
#endif
#if defined(UBRRH) || defined(UBRR0H)
ring_buffer rx_buffer = { { 0 }, 0, 0 };
ring_buffer tx_buffer = { { 0 }, 0, 0 };
#endif
#if defined(UBRR1H)
ring_buffer rx_buffer1 = { { 0 }, 0, 0 };
ring_buffer tx_buffer1 = { { 0 }, 0, 0 };
#endif
#if defined(UBRR2H)
ring_buffer rx_buffer2 = { { 0 }, 0, 0 };
ring_buffer tx_buffer2 = { { 0 }, 0, 0 };
#endif
#if defined(UBRR3H)
ring_buffer rx_buffer3 = { { 0 }, 0, 0 };
ring_buffer tx_buffer3 = { { 0 }, 0, 0 };
#endif
inline void store_char(unsigned char c, ring_buffer *buffer)
{
int i = (unsigned int)(buffer->head + 1) % SERIAL_BUFFER_SIZE;
// if we should be storing the received character into the location
// just before the tail (meaning that the head would advance to the
// current location of the tail), we're about to overflow the buffer
// and so we don't write the character or advance the head.
if (i != buffer->tail) {
buffer->buffer[buffer->head] = c;
buffer->head = i;
}
}
#if !defined(USART0_RX_vect) && defined(USART1_RX_vect)
// do nothing - on the 32u4 the first USART is USART1
#else
#if !defined(USART_RX_vect) && !defined(SIG_USART0_RECV) && \
!defined(SIG_UART0_RECV) && !defined(USART0_RX_vect) && \
!defined(SIG_UART_RECV)
#error "Don't know what the Data Received vector is called for the first UART"
#else
void serialEvent() __attribute__((weak));
void serialEvent() {}
#define serialEvent_implemented
#if defined(USART_RX_vect)
SIGNAL(USART_RX_vect)
#elif defined(SIG_USART0_RECV)
SIGNAL(SIG_USART0_RECV)
#elif defined(SIG_UART0_RECV)
SIGNAL(SIG_UART0_RECV)
#elif defined(USART0_RX_vect)
SIGNAL(USART0_RX_vect)
#elif defined(SIG_UART_RECV)
SIGNAL(SIG_UART_RECV)
#endif
{
#if defined(UDR0)
if (bit_is_clear(UCSR0A, UPE0)) {
unsigned char c = UDR0;
store_char(c, &rx_buffer);
} else {
unsigned char c = UDR0;
};
#elif defined(UDR)
if (bit_is_clear(UCSRA, PE)) {
unsigned char c = UDR;
store_char(c, &rx_buffer);
} else {
unsigned char c = UDR;
};
#else
#error UDR not defined
#endif
}
#endif
#endif
#if defined(USART1_RX_vect)
void serialEvent1() __attribute__((weak));
void serialEvent1() {}
#define serialEvent1_implemented
SIGNAL(USART1_RX_vect)
{
if (bit_is_clear(UCSR1A, UPE1)) {
unsigned char c = UDR1;
store_char(c, &rx_buffer1);
} else {
unsigned char c = UDR1;
};
}
#elif defined(SIG_USART1_RECV)
#error SIG_USART1_RECV
#endif
#if defined(USART2_RX_vect) && defined(UDR2)
void serialEvent2() __attribute__((weak));
void serialEvent2() {}
#define serialEvent2_implemented
SIGNAL(USART2_RX_vect)
{
if (bit_is_clear(UCSR2A, UPE2)) {
unsigned char c = UDR2;
store_char(c, &rx_buffer2);
} else {
unsigned char c = UDR2;
};
}
#elif defined(SIG_USART2_RECV)
#error SIG_USART2_RECV
#endif
#if defined(USART3_RX_vect) && defined(UDR3)
void serialEvent3() __attribute__((weak));
void serialEvent3() {}
#define serialEvent3_implemented
SIGNAL(USART3_RX_vect)
{
if (bit_is_clear(UCSR3A, UPE3)) {
unsigned char c = UDR3;
store_char(c, &rx_buffer3);
} else {
unsigned char c = UDR3;
};
}
#elif defined(SIG_USART3_RECV)
#error SIG_USART3_RECV
#endif
void serialEventRun(void)
{
#ifdef serialEvent_implemented
if (Serial.available()) serialEvent();
#endif
#ifdef serialEvent1_implemented
if (Serial1.available()) serialEvent1();
#endif
#ifdef serialEvent2_implemented
if (Serial2.available()) serialEvent2();
#endif
#ifdef serialEvent3_implemented
if (Serial3.available()) serialEvent3();
#endif
}
#if !defined(USART0_UDRE_vect) && defined(USART1_UDRE_vect)
// do nothing - on the 32u4 the first USART is USART1
#else
#if !defined(UART0_UDRE_vect) && !defined(UART_UDRE_vect) && !defined(USART0_UDRE_vect) && !defined(USART_UDRE_vect)
#error "Don't know what the Data Register Empty vector is called for the first UART"
#else
#if defined(UART0_UDRE_vect)
ISR(UART0_UDRE_vect)
#elif defined(UART_UDRE_vect)
ISR(UART_UDRE_vect)
#elif defined(USART0_UDRE_vect)
ISR(USART0_UDRE_vect)
#elif defined(USART_UDRE_vect)
ISR(USART_UDRE_vect)
#endif
{
if (tx_buffer.head == tx_buffer.tail) {
// Buffer empty, so disable interrupts
#if defined(UCSR0B)
cbi(UCSR0B, UDRIE0);
#else
cbi(UCSRB, UDRIE);
#endif
}
else {
// There is more data in the output buffer. Send the next byte
unsigned char c = tx_buffer.buffer[tx_buffer.tail];
tx_buffer.tail = (tx_buffer.tail + 1) % SERIAL_BUFFER_SIZE;
#if defined(UDR0)
UDR0 = c;
#elif defined(UDR)
UDR = c;
#else
#error UDR not defined
#endif
}
}
#endif
#endif
#ifdef USART1_UDRE_vect
ISR(USART1_UDRE_vect)
{
if (tx_buffer1.head == tx_buffer1.tail) {
// Buffer empty, so disable interrupts
cbi(UCSR1B, UDRIE1);
}
else {
// There is more data in the output buffer. Send the next byte
unsigned char c = tx_buffer1.buffer[tx_buffer1.tail];
tx_buffer1.tail = (tx_buffer1.tail + 1) % SERIAL_BUFFER_SIZE;
UDR1 = c;
}
}
#endif
#ifdef USART2_UDRE_vect
ISR(USART2_UDRE_vect)
{
if (tx_buffer2.head == tx_buffer2.tail) {
// Buffer empty, so disable interrupts
cbi(UCSR2B, UDRIE2);
}
else {
// There is more data in the output buffer. Send the next byte
unsigned char c = tx_buffer2.buffer[tx_buffer2.tail];
tx_buffer2.tail = (tx_buffer2.tail + 1) % SERIAL_BUFFER_SIZE;
UDR2 = c;
}
}
#endif
#ifdef USART3_UDRE_vect
ISR(USART3_UDRE_vect)
{
if (tx_buffer3.head == tx_buffer3.tail) {
// Buffer empty, so disable interrupts
cbi(UCSR3B, UDRIE3);
}
else {
// There is more data in the output buffer. Send the next byte
unsigned char c = tx_buffer3.buffer[tx_buffer3.tail];
tx_buffer3.tail = (tx_buffer3.tail + 1) % SERIAL_BUFFER_SIZE;
UDR3 = c;
}
}
#endif
// Constructors ////////////////////////////////////////////////////////////////
HardwareSerial::HardwareSerial(ring_buffer *rx_buffer, ring_buffer *tx_buffer,
volatile uint8_t *ubrrh, volatile uint8_t *ubrrl,
volatile uint8_t *ucsra, volatile uint8_t *ucsrb,
volatile uint8_t *ucsrc, volatile uint8_t *udr,
uint8_t rxen, uint8_t txen, uint8_t rxcie, uint8_t udrie, uint8_t u2x)
{
_rx_buffer = rx_buffer;
_tx_buffer = tx_buffer;
_ubrrh = ubrrh;
_ubrrl = ubrrl;
_ucsra = ucsra;
_ucsrb = ucsrb;
_ucsrc = ucsrc;
_udr = udr;
_rxen = rxen;
_txen = txen;
_rxcie = rxcie;
_udrie = udrie;
_u2x = u2x;
}
// Public Methods //////////////////////////////////////////////////////////////
void HardwareSerial::begin(unsigned long baud)
{
uint16_t baud_setting;
bool use_u2x = true;
#if F_CPU == 16000000UL
// hardcoded exception for compatibility with the bootloader shipped
// with the Duemilanove and previous boards and the firmware on the 8U2
// on the Uno and Mega 2560.
if (baud == 57600) {
use_u2x = false;
}
#endif
try_again:
if (use_u2x) {
*_ucsra = 1 << _u2x;
baud_setting = (F_CPU / 4 / baud - 1) / 2;
} else {
*_ucsra = 0;
baud_setting = (F_CPU / 8 / baud - 1) / 2;
}
if ((baud_setting > 4095) && use_u2x)
{
use_u2x = false;
goto try_again;
}
// assign the baud_setting, a.k.a. ubbr (USART Baud Rate Register)
*_ubrrh = baud_setting >> 8;
*_ubrrl = baud_setting;
transmitting = false;
sbi(*_ucsrb, _rxen);
sbi(*_ucsrb, _txen);
sbi(*_ucsrb, _rxcie);
cbi(*_ucsrb, _udrie);
}
void HardwareSerial::begin(unsigned long baud, byte config)
{
uint16_t baud_setting;
uint8_t current_config;
bool use_u2x = true;
#if F_CPU == 16000000UL
// hardcoded exception for compatibility with the bootloader shipped
// with the Duemilanove and previous boards and the firmware on the 8U2
// on the Uno and Mega 2560.
if (baud == 57600) {
use_u2x = false;
}
#endif
try_again:
if (use_u2x) {
*_ucsra = 1 << _u2x;
baud_setting = (F_CPU / 4 / baud - 1) / 2;
} else {
*_ucsra = 0;
baud_setting = (F_CPU / 8 / baud - 1) / 2;
}
if ((baud_setting > 4095) && use_u2x)
{
use_u2x = false;
goto try_again;
}
// assign the baud_setting, a.k.a. ubbr (USART Baud Rate Register)
*_ubrrh = baud_setting >> 8;
*_ubrrl = baud_setting;
//set the data bits, parity, and stop bits
#if defined(__AVR_ATmega8__)
config |= 0x80; // select UCSRC register (shared with UBRRH)
#endif
*_ucsrc = config;
sbi(*_ucsrb, _rxen);
sbi(*_ucsrb, _txen);
sbi(*_ucsrb, _rxcie);
cbi(*_ucsrb, _udrie);
}
void HardwareSerial::end()
{
// wait for transmission of outgoing data
while (_tx_buffer->head != _tx_buffer->tail)
;
cbi(*_ucsrb, _rxen);
cbi(*_ucsrb, _txen);
cbi(*_ucsrb, _rxcie);
cbi(*_ucsrb, _udrie);
// clear any received data
_rx_buffer->head = _rx_buffer->tail;
}
int HardwareSerial::available(void)
{
return (unsigned int)(SERIAL_BUFFER_SIZE + _rx_buffer->head - _rx_buffer->tail) % SERIAL_BUFFER_SIZE;
}
int HardwareSerial::peek(void)
{
if (_rx_buffer->head == _rx_buffer->tail) {
return -1;
} else {
return _rx_buffer->buffer[_rx_buffer->tail];
}
}
int HardwareSerial::read(void)
{
// if the head isn't ahead of the tail, we don't have any characters
if (_rx_buffer->head == _rx_buffer->tail) {
return -1;
} else {
unsigned char c = _rx_buffer->buffer[_rx_buffer->tail];
_rx_buffer->tail = (unsigned int)(_rx_buffer->tail + 1) % SERIAL_BUFFER_SIZE;
return c;
}
}
void HardwareSerial::flush()
{
// UDR is kept full while the buffer is not empty, so TXC triggers when EMPTY && SENT
while (transmitting && ! (*_ucsra & _BV(TXC0)));
transmitting = false;
}
size_t HardwareSerial::write(uint8_t c)
{
int i = (_tx_buffer->head + 1) % SERIAL_BUFFER_SIZE;
// If the output buffer is full, there's nothing for it other than to
// wait for the interrupt handler to empty it a bit
// ???: return 0 here instead?
while (i == _tx_buffer->tail)
;
_tx_buffer->buffer[_tx_buffer->head] = c;
_tx_buffer->head = i;
sbi(*_ucsrb, _udrie);
// clear the TXC bit -- "can be cleared by writing a one to its bit location"
transmitting = true;
sbi(*_ucsra, TXC0);
return 1;
}
HardwareSerial::operator bool() {
return true;
}
// Preinstantiate Objects //////////////////////////////////////////////////////
#if defined(UBRRH) && defined(UBRRL)
HardwareSerial Serial(&rx_buffer, &tx_buffer, &UBRRH, &UBRRL, &UCSRA, &UCSRB, &UCSRC, &UDR, RXEN, TXEN, RXCIE, UDRIE, U2X);
#elif defined(UBRR0H) && defined(UBRR0L)
HardwareSerial Serial(&rx_buffer, &tx_buffer, &UBRR0H, &UBRR0L, &UCSR0A, &UCSR0B, &UCSR0C, &UDR0, RXEN0, TXEN0, RXCIE0, UDRIE0, U2X0);
#elif defined(USBCON)
// do nothing - Serial object and buffers are initialized in CDC code
#else
#error no serial port defined (port 0)
#endif
#if defined(UBRR1H)
HardwareSerial Serial1(&rx_buffer1, &tx_buffer1, &UBRR1H, &UBRR1L, &UCSR1A, &UCSR1B, &UCSR1C, &UDR1, RXEN1, TXEN1, RXCIE1, UDRIE1, U2X1);
#endif
#if defined(UBRR2H)
HardwareSerial Serial2(&rx_buffer2, &tx_buffer2, &UBRR2H, &UBRR2L, &UCSR2A, &UCSR2B, &UCSR2C, &UDR2, RXEN2, TXEN2, RXCIE2, UDRIE2, U2X2);
#endif
#if defined(UBRR3H)
HardwareSerial Serial3(&rx_buffer3, &tx_buffer3, &UBRR3H, &UBRR3L, &UCSR3A, &UCSR3B, &UCSR3C, &UDR3, RXEN3, TXEN3, RXCIE3, UDRIE3, U2X3);
#endif
#endif // whole file

View File

@@ -1,115 +0,0 @@
/*
HardwareSerial.h - Hardware serial library for Wiring
Copyright (c) 2006 Nicholas Zambetti. All right reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Modified 28 September 2010 by Mark Sproul
Modified 14 August 2012 by Alarus
*/
#ifndef HardwareSerial_h
#define HardwareSerial_h
#include <inttypes.h>
#include "Stream.h"
struct ring_buffer;
class HardwareSerial : public Stream
{
private:
ring_buffer *_rx_buffer;
ring_buffer *_tx_buffer;
volatile uint8_t *_ubrrh;
volatile uint8_t *_ubrrl;
volatile uint8_t *_ucsra;
volatile uint8_t *_ucsrb;
volatile uint8_t *_ucsrc;
volatile uint8_t *_udr;
uint8_t _rxen;
uint8_t _txen;
uint8_t _rxcie;
uint8_t _udrie;
uint8_t _u2x;
bool transmitting;
public:
HardwareSerial(ring_buffer *rx_buffer, ring_buffer *tx_buffer,
volatile uint8_t *ubrrh, volatile uint8_t *ubrrl,
volatile uint8_t *ucsra, volatile uint8_t *ucsrb,
volatile uint8_t *ucsrc, volatile uint8_t *udr,
uint8_t rxen, uint8_t txen, uint8_t rxcie, uint8_t udrie, uint8_t u2x);
void begin(unsigned long);
void begin(unsigned long, uint8_t);
void end();
virtual int available(void);
virtual int peek(void);
virtual int read(void);
virtual void flush(void);
virtual size_t write(uint8_t);
inline size_t write(unsigned long n) { return write((uint8_t)n); }
inline size_t write(long n) { return write((uint8_t)n); }
inline size_t write(unsigned int n) { return write((uint8_t)n); }
inline size_t write(int n) { return write((uint8_t)n); }
using Print::write; // pull in write(str) and write(buf, size) from Print
operator bool();
};
// Define config for Serial.begin(baud, config);
#define SERIAL_5N1 0x00
#define SERIAL_6N1 0x02
#define SERIAL_7N1 0x04
#define SERIAL_8N1 0x06
#define SERIAL_5N2 0x08
#define SERIAL_6N2 0x0A
#define SERIAL_7N2 0x0C
#define SERIAL_8N2 0x0E
#define SERIAL_5E1 0x20
#define SERIAL_6E1 0x22
#define SERIAL_7E1 0x24
#define SERIAL_8E1 0x26
#define SERIAL_5E2 0x28
#define SERIAL_6E2 0x2A
#define SERIAL_7E2 0x2C
#define SERIAL_8E2 0x2E
#define SERIAL_5O1 0x30
#define SERIAL_6O1 0x32
#define SERIAL_7O1 0x34
#define SERIAL_8O1 0x36
#define SERIAL_5O2 0x38
#define SERIAL_6O2 0x3A
#define SERIAL_7O2 0x3C
#define SERIAL_8O2 0x3E
#if defined(UBRRH) || defined(UBRR0H)
extern HardwareSerial Serial;
#elif defined(USBCON)
#include "USBAPI.h"
// extern HardwareSerial Serial_;
#endif
#if defined(UBRR1H)
extern HardwareSerial Serial1;
#endif
#if defined(UBRR2H)
extern HardwareSerial Serial2;
#endif
#if defined(UBRR3H)
extern HardwareSerial Serial3;
#endif
extern void serialEventRun(void) __attribute__((weak));
#endif

View File

@@ -1,56 +0,0 @@
#include <Arduino.h>
#include <IPAddress.h>
IPAddress::IPAddress()
{
memset(_address, 0, sizeof(_address));
}
IPAddress::IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet)
{
_address[0] = first_octet;
_address[1] = second_octet;
_address[2] = third_octet;
_address[3] = fourth_octet;
}
IPAddress::IPAddress(uint32_t address)
{
memcpy(_address, &address, sizeof(_address));
}
IPAddress::IPAddress(const uint8_t *address)
{
memcpy(_address, address, sizeof(_address));
}
IPAddress& IPAddress::operator=(const uint8_t *address)
{
memcpy(_address, address, sizeof(_address));
return *this;
}
IPAddress& IPAddress::operator=(uint32_t address)
{
memcpy(_address, (const uint8_t *)&address, sizeof(_address));
return *this;
}
bool IPAddress::operator==(const uint8_t* addr)
{
return memcmp(addr, _address, sizeof(_address)) == 0;
}
size_t IPAddress::printTo(Print& p) const
{
size_t n = 0;
for (int i =0; i < 3; i++)
{
n += p.print(_address[i], DEC);
n += p.print('.');
}
n += p.print(_address[3], DEC);
return n;
}

View File

@@ -1,76 +0,0 @@
/*
*
* MIT License:
* Copyright (c) 2011 Adrian McEwen
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* adrianm@mcqn.com 1/1/2011
*/
#ifndef IPAddress_h
#define IPAddress_h
#include <Printable.h>
// A class to make it easier to handle and pass around IP addresses
class IPAddress : public Printable {
private:
uint8_t _address[4]; // IPv4 address
// Access the raw byte array containing the address. Because this returns a pointer
// to the internal structure rather than a copy of the address this function should only
// be used when you know that the usage of the returned uint8_t* will be transient and not
// stored.
uint8_t* raw_address() { return _address; };
public:
// Constructors
IPAddress();
IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet);
IPAddress(uint32_t address);
IPAddress(const uint8_t *address);
// Overloaded cast operator to allow IPAddress objects to be used where a pointer
// to a four-byte uint8_t array is expected
operator uint32_t() { return *((uint32_t*)_address); };
bool operator==(const IPAddress& addr) { return (*((uint32_t*)_address)) == (*((uint32_t*)addr._address)); };
bool operator==(const uint8_t* addr);
// Overloaded index operator to allow getting and setting individual octets of the address
uint8_t operator[](int index) const { return _address[index]; };
uint8_t& operator[](int index) { return _address[index]; };
// Overloaded copy operators to allow initialisation of IPAddress objects from other types
IPAddress& operator=(const uint8_t *address);
IPAddress& operator=(uint32_t address);
virtual size_t printTo(Print& p) const;
friend class EthernetClass;
friend class UDP;
friend class Client;
friend class Server;
friend class DhcpClass;
friend class DNSClient;
};
const IPAddress INADDR_NONE(0,0,0,0);
#endif

View File

@@ -1,23 +0,0 @@
#ifndef __PLATFORM_H__
#define __PLATFORM_H__
#include <inttypes.h>
#include <avr/pgmspace.h>
#include <avr/eeprom.h>
#include <avr/interrupt.h>
#include <util/delay.h>
typedef unsigned char u8;
typedef unsigned short u16;
typedef unsigned long u32;
#include "Arduino.h"
#if defined(USBCON)
#include "USBDesc.h"
#include "USBCore.h"
#include "USBAPI.h"
#endif /* if defined(USBCON) */
#endif

View File

@@ -1,268 +0,0 @@
/*
Print.cpp - Base class that provides print() and println()
Copyright (c) 2008 David A. Mellis. All right reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Modified 23 November 2006 by David A. Mellis
*/
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <math.h>
#include "Arduino.h"
#include "Print.h"
// Public Methods //////////////////////////////////////////////////////////////
/* default implementation: may be overridden */
size_t Print::write(const uint8_t *buffer, size_t size)
{
size_t n = 0;
while (size--) {
n += write(*buffer++);
}
return n;
}
size_t Print::print(const __FlashStringHelper *ifsh)
{
const char PROGMEM *p = (const char PROGMEM *)ifsh;
size_t n = 0;
while (1) {
unsigned char c = pgm_read_byte(p++);
if (c == 0) break;
n += write(c);
}
return n;
}
size_t Print::print(const String &s)
{
size_t n = 0;
for (uint16_t i = 0; i < s.length(); i++) {
n += write(s[i]);
}
return n;
}
size_t Print::print(const char str[])
{
return write(str);
}
size_t Print::print(char c)
{
return write(c);
}
size_t Print::print(unsigned char b, int base)
{
return print((unsigned long) b, base);
}
size_t Print::print(int n, int base)
{
return print((long) n, base);
}
size_t Print::print(unsigned int n, int base)
{
return print((unsigned long) n, base);
}
size_t Print::print(long n, int base)
{
if (base == 0) {
return write(n);
} else if (base == 10) {
if (n < 0) {
int t = print('-');
n = -n;
return printNumber(n, 10) + t;
}
return printNumber(n, 10);
} else {
return printNumber(n, base);
}
}
size_t Print::print(unsigned long n, int base)
{
if (base == 0) return write(n);
else return printNumber(n, base);
}
size_t Print::print(double n, int digits)
{
return printFloat(n, digits);
}
size_t Print::println(const __FlashStringHelper *ifsh)
{
size_t n = print(ifsh);
n += println();
return n;
}
size_t Print::print(const Printable& x)
{
return x.printTo(*this);
}
size_t Print::println(void)
{
size_t n = print('\r');
n += print('\n');
return n;
}
size_t Print::println(const String &s)
{
size_t n = print(s);
n += println();
return n;
}
size_t Print::println(const char c[])
{
size_t n = print(c);
n += println();
return n;
}
size_t Print::println(char c)
{
size_t n = print(c);
n += println();
return n;
}
size_t Print::println(unsigned char b, int base)
{
size_t n = print(b, base);
n += println();
return n;
}
size_t Print::println(int num, int base)
{
size_t n = print(num, base);
n += println();
return n;
}
size_t Print::println(unsigned int num, int base)
{
size_t n = print(num, base);
n += println();
return n;
}
size_t Print::println(long num, int base)
{
size_t n = print(num, base);
n += println();
return n;
}
size_t Print::println(unsigned long num, int base)
{
size_t n = print(num, base);
n += println();
return n;
}
size_t Print::println(double num, int digits)
{
size_t n = print(num, digits);
n += println();
return n;
}
size_t Print::println(const Printable& x)
{
size_t n = print(x);
n += println();
return n;
}
// Private Methods /////////////////////////////////////////////////////////////
size_t Print::printNumber(unsigned long n, uint8_t base) {
char buf[8 * sizeof(long) + 1]; // Assumes 8-bit chars plus zero byte.
char *str = &buf[sizeof(buf) - 1];
*str = '\0';
// prevent crash if called with base == 1
if (base < 2) base = 10;
do {
unsigned long m = n;
n /= base;
char c = m - base * n;
*--str = c < 10 ? c + '0' : c + 'A' - 10;
} while(n);
return write(str);
}
size_t Print::printFloat(double number, uint8_t digits)
{
size_t n = 0;
if (isnan(number)) return print("nan");
if (isinf(number)) return print("inf");
if (number > 4294967040.0) return print ("ovf"); // constant determined empirically
if (number <-4294967040.0) return print ("ovf"); // constant determined empirically
// Handle negative numbers
if (number < 0.0)
{
n += print('-');
number = -number;
}
// Round correctly so that print(1.999, 2) prints as "2.00"
double rounding = 0.5;
for (uint8_t i=0; i<digits; ++i)
rounding /= 10.0;
number += rounding;
// Extract the integer part of the number and print it
unsigned long int_part = (unsigned long)number;
double remainder = number - (double)int_part;
n += print(int_part);
// Print the decimal point, but only if there are digits beyond
if (digits > 0) {
n += print(".");
}
// Extract digits from the remainder one at a time
while (digits-- > 0)
{
remainder *= 10.0;
int toPrint = int(remainder);
n += print(toPrint);
remainder -= toPrint;
}
return n;
}

View File

@@ -1,81 +0,0 @@
/*
Print.h - Base class that provides print() and println()
Copyright (c) 2008 David A. Mellis. All right reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef Print_h
#define Print_h
#include <inttypes.h>
#include <stdio.h> // for size_t
#include "WString.h"
#include "Printable.h"
#define DEC 10
#define HEX 16
#define OCT 8
#define BIN 2
class Print
{
private:
int write_error;
size_t printNumber(unsigned long, uint8_t);
size_t printFloat(double, uint8_t);
protected:
void setWriteError(int err = 1) { write_error = err; }
public:
Print() : write_error(0) {}
int getWriteError() { return write_error; }
void clearWriteError() { setWriteError(0); }
virtual size_t write(uint8_t) = 0;
size_t write(const char *str) {
if (str == NULL) return 0;
return write((const uint8_t *)str, strlen(str));
}
virtual size_t write(const uint8_t *buffer, size_t size);
size_t print(const __FlashStringHelper *);
size_t print(const String &);
size_t print(const char[]);
size_t print(char);
size_t print(unsigned char, int = DEC);
size_t print(int, int = DEC);
size_t print(unsigned int, int = DEC);
size_t print(long, int = DEC);
size_t print(unsigned long, int = DEC);
size_t print(double, int = 2);
size_t print(const Printable&);
size_t println(const __FlashStringHelper *);
size_t println(const String &s);
size_t println(const char[]);
size_t println(char);
size_t println(unsigned char, int = DEC);
size_t println(int, int = DEC);
size_t println(unsigned int, int = DEC);
size_t println(long, int = DEC);
size_t println(unsigned long, int = DEC);
size_t println(double, int = 2);
size_t println(const Printable&);
size_t println(void);
};
#endif

View File

@@ -1,40 +0,0 @@
/*
Printable.h - Interface class that allows printing of complex types
Copyright (c) 2011 Adrian McEwen. All right reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef Printable_h
#define Printable_h
#include <new.h>
class Print;
/** The Printable class provides a way for new classes to allow themselves to be printed.
By deriving from Printable and implementing the printTo method, it will then be possible
for users to print out instances of this class by passing them into the usual
Print::print and Print::println methods.
*/
class Printable
{
public:
virtual size_t printTo(Print& p) const = 0;
};
#endif

View File

@@ -1,9 +0,0 @@
#ifndef server_h
#define server_h
class Server : public Print {
public:
virtual void begin() =0;
};
#endif

View File

@@ -1,270 +0,0 @@
/*
Stream.cpp - adds parsing methods to Stream class
Copyright (c) 2008 David A. Mellis. All right reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Created July 2011
parsing functions based on TextFinder library by Michael Margolis
*/
#include "Arduino.h"
#include "Stream.h"
#define PARSE_TIMEOUT 1000 // default number of milli-seconds to wait
#define NO_SKIP_CHAR 1 // a magic char not found in a valid ASCII numeric field
// private method to read stream with timeout
int Stream::timedRead()
{
int c;
_startMillis = millis();
do {
c = read();
if (c >= 0) return c;
} while(millis() - _startMillis < _timeout);
return -1; // -1 indicates timeout
}
// private method to peek stream with timeout
int Stream::timedPeek()
{
int c;
_startMillis = millis();
do {
c = peek();
if (c >= 0) return c;
} while(millis() - _startMillis < _timeout);
return -1; // -1 indicates timeout
}
// returns peek of the next digit in the stream or -1 if timeout
// discards non-numeric characters
int Stream::peekNextDigit()
{
int c;
while (1) {
c = timedPeek();
if (c < 0) return c; // timeout
if (c == '-') return c;
if (c >= '0' && c <= '9') return c;
read(); // discard non-numeric
}
}
// Public Methods
//////////////////////////////////////////////////////////////
void Stream::setTimeout(unsigned long timeout) // sets the maximum number of milliseconds to wait
{
_timeout = timeout;
}
// find returns true if the target string is found
bool Stream::find(char *target)
{
return findUntil(target, NULL);
}
// reads data from the stream until the target string of given length is found
// returns true if target string is found, false if timed out
bool Stream::find(char *target, size_t length)
{
return findUntil(target, length, NULL, 0);
}
// as find but search ends if the terminator string is found
bool Stream::findUntil(char *target, char *terminator)
{
return findUntil(target, strlen(target), terminator, strlen(terminator));
}
// reads data from the stream until the target string of the given length is found
// search terminated if the terminator string is found
// returns true if target string is found, false if terminated or timed out
bool Stream::findUntil(char *target, size_t targetLen, char *terminator, size_t termLen)
{
size_t index = 0; // maximum target string length is 64k bytes!
size_t termIndex = 0;
int c;
if( *target == 0)
return true; // return true if target is a null string
while( (c = timedRead()) > 0){
if(c != target[index])
index = 0; // reset index if any char does not match
if( c == target[index]){
//////Serial.print("found "); Serial.write(c); Serial.print("index now"); Serial.println(index+1);
if(++index >= targetLen){ // return true if all chars in the target match
return true;
}
}
if(termLen > 0 && c == terminator[termIndex]){
if(++termIndex >= termLen)
return false; // return false if terminate string found before target string
}
else
termIndex = 0;
}
return false;
}
// returns the first valid (long) integer value from the current position.
// initial characters that are not digits (or the minus sign) are skipped
// function is terminated by the first character that is not a digit.
long Stream::parseInt()
{
return parseInt(NO_SKIP_CHAR); // terminate on first non-digit character (or timeout)
}
// as above but a given skipChar is ignored
// this allows format characters (typically commas) in values to be ignored
long Stream::parseInt(char skipChar)
{
boolean isNegative = false;
long value = 0;
int c;
c = peekNextDigit();
// ignore non numeric leading characters
if(c < 0)
return 0; // zero returned if timeout
do{
if(c == skipChar)
; // ignore this charactor
else if(c == '-')
isNegative = true;
else if(c >= '0' && c <= '9') // is c a digit?
value = value * 10 + c - '0';
read(); // consume the character we got with peek
c = timedPeek();
}
while( (c >= '0' && c <= '9') || c == skipChar );
if(isNegative)
value = -value;
return value;
}
// as parseInt but returns a floating point value
float Stream::parseFloat()
{
return parseFloat(NO_SKIP_CHAR);
}
// as above but the given skipChar is ignored
// this allows format characters (typically commas) in values to be ignored
float Stream::parseFloat(char skipChar){
boolean isNegative = false;
boolean isFraction = false;
long value = 0;
char c;
float fraction = 1.0;
c = peekNextDigit();
// ignore non numeric leading characters
if(c < 0)
return 0; // zero returned if timeout
do{
if(c == skipChar)
; // ignore
else if(c == '-')
isNegative = true;
else if (c == '.')
isFraction = true;
else if(c >= '0' && c <= '9') { // is c a digit?
value = value * 10 + c - '0';
if(isFraction)
fraction *= 0.1;
}
read(); // consume the character we got with peek
c = timedPeek();
}
while( (c >= '0' && c <= '9') || c == '.' || c == skipChar );
if(isNegative)
value = -value;
if(isFraction)
return value * fraction;
else
return value;
}
// read characters from stream into buffer
// terminates if length characters have been read, or timeout (see setTimeout)
// returns the number of characters placed in the buffer
// the buffer is NOT null terminated.
//
size_t Stream::readBytes(char *buffer, size_t length)
{
size_t count = 0;
while (count < length) {
int c = timedRead();
if (c < 0) break;
*buffer++ = (char)c;
count++;
}
return count;
}
// as readBytes with terminator character
// terminates if length characters have been read, timeout, or if the terminator character detected
// returns the number of characters placed in the buffer (0 means no valid data found)
size_t Stream::readBytesUntil(char terminator, char *buffer, size_t length)
{
if (length < 1) return 0;
size_t index = 0;
while (index < length) {
int c = timedRead();
if (c < 0 || c == terminator) break;
*buffer++ = (char)c;
index++;
}
return index; // return number of characters, not including null terminator
}
String Stream::readString()
{
String ret;
int c = timedRead();
while (c >= 0)
{
ret += (char)c;
c = timedRead();
}
return ret;
}
String Stream::readStringUntil(char terminator)
{
String ret;
int c = timedRead();
while (c >= 0 && c != terminator)
{
ret += (char)c;
c = timedRead();
}
return ret;
}

View File

@@ -1,96 +0,0 @@
/*
Stream.h - base class for character-based streams.
Copyright (c) 2010 David A. Mellis. All right reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
parsing functions based on TextFinder library by Michael Margolis
*/
#ifndef Stream_h
#define Stream_h
#include <inttypes.h>
#include "Print.h"
// compatability macros for testing
/*
#define getInt() parseInt()
#define getInt(skipChar) parseInt(skipchar)
#define getFloat() parseFloat()
#define getFloat(skipChar) parseFloat(skipChar)
#define getString( pre_string, post_string, buffer, length)
readBytesBetween( pre_string, terminator, buffer, length)
*/
class Stream : public Print
{
private:
unsigned long _timeout; // number of milliseconds to wait for the next char before aborting timed read
unsigned long _startMillis; // used for timeout measurement
int timedRead(); // private method to read stream with timeout
int timedPeek(); // private method to peek stream with timeout
int peekNextDigit(); // returns the next numeric digit in the stream or -1 if timeout
public:
virtual int available() = 0;
virtual int read() = 0;
virtual int peek() = 0;
virtual void flush() = 0;
Stream() {_timeout=1000;}
// parsing methods
void setTimeout(unsigned long timeout); // sets maximum milliseconds to wait for stream data, default is 1 second
bool find(char *target); // reads data from the stream until the target string is found
// returns true if target string is found, false if timed out (see setTimeout)
bool find(char *target, size_t length); // reads data from the stream until the target string of given length is found
// returns true if target string is found, false if timed out
bool findUntil(char *target, char *terminator); // as find but search ends if the terminator string is found
bool findUntil(char *target, size_t targetLen, char *terminate, size_t termLen); // as above but search ends if the terminate string is found
long parseInt(); // returns the first valid (long) integer value from the current position.
// initial characters that are not digits (or the minus sign) are skipped
// integer is terminated by the first character that is not a digit.
float parseFloat(); // float version of parseInt
size_t readBytes( char *buffer, size_t length); // read chars from stream into buffer
// terminates if length characters have been read or timeout (see setTimeout)
// returns the number of characters placed in the buffer (0 means no valid data found)
size_t readBytesUntil( char terminator, char *buffer, size_t length); // as readBytes with terminator character
// terminates if length characters have been read, timeout, or if the terminator character detected
// returns the number of characters placed in the buffer (0 means no valid data found)
// Arduino String functions to be added here
String readString();
String readStringUntil(char terminator);
protected:
long parseInt(char skipChar); // as above but the given skipChar is ignored
// as above but the given skipChar is ignored
// this allows format characters (typically commas) in values to be ignored
float parseFloat(char skipChar); // as above but the given skipChar is ignored
};
#endif

View File

@@ -1,616 +0,0 @@
/* Tone.cpp
A Tone Generator Library
Written by Brett Hagman
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Version Modified By Date Comments
------- ----------- -------- --------
0001 B Hagman 09/08/02 Initial coding
0002 B Hagman 09/08/18 Multiple pins
0003 B Hagman 09/08/18 Moved initialization from constructor to begin()
0004 B Hagman 09/09/26 Fixed problems with ATmega8
0005 B Hagman 09/11/23 Scanned prescalars for best fit on 8 bit timers
09/11/25 Changed pin toggle method to XOR
09/11/25 Fixed timer0 from being excluded
0006 D Mellis 09/12/29 Replaced objects with functions
0007 M Sproul 10/08/29 Changed #ifdefs from cpu to register
0008 S Kanemoto 12/06/22 Fixed for Leonardo by @maris_HY
*************************************************/
#include <avr/interrupt.h>
#include <avr/pgmspace.h>
#include "Arduino.h"
#include "pins_arduino.h"
#if defined(__AVR_ATmega8__) || defined(__AVR_ATmega128__)
#define TCCR2A TCCR2
#define TCCR2B TCCR2
#define COM2A1 COM21
#define COM2A0 COM20
#define OCR2A OCR2
#define TIMSK2 TIMSK
#define OCIE2A OCIE2
#define TIMER2_COMPA_vect TIMER2_COMP_vect
#define TIMSK1 TIMSK
#endif
// timerx_toggle_count:
// > 0 - duration specified
// = 0 - stopped
// < 0 - infinitely (until stop() method called, or new play() called)
#if !defined(__AVR_ATmega8__)
volatile long timer0_toggle_count;
volatile uint8_t *timer0_pin_port;
volatile uint8_t timer0_pin_mask;
#endif
volatile long timer1_toggle_count;
volatile uint8_t *timer1_pin_port;
volatile uint8_t timer1_pin_mask;
volatile long timer2_toggle_count;
volatile uint8_t *timer2_pin_port;
volatile uint8_t timer2_pin_mask;
#if defined(TIMSK3)
volatile long timer3_toggle_count;
volatile uint8_t *timer3_pin_port;
volatile uint8_t timer3_pin_mask;
#endif
#if defined(TIMSK4)
volatile long timer4_toggle_count;
volatile uint8_t *timer4_pin_port;
volatile uint8_t timer4_pin_mask;
#endif
#if defined(TIMSK5)
volatile long timer5_toggle_count;
volatile uint8_t *timer5_pin_port;
volatile uint8_t timer5_pin_mask;
#endif
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
#define AVAILABLE_TONE_PINS 1
#define USE_TIMER2
const uint8_t PROGMEM tone_pin_to_timer_PGM[] = { 2 /*, 3, 4, 5, 1, 0 */ };
static uint8_t tone_pins[AVAILABLE_TONE_PINS] = { 255 /*, 255, 255, 255, 255, 255 */ };
#elif defined(__AVR_ATmega8__)
#define AVAILABLE_TONE_PINS 1
#define USE_TIMER2
const uint8_t PROGMEM tone_pin_to_timer_PGM[] = { 2 /*, 1 */ };
static uint8_t tone_pins[AVAILABLE_TONE_PINS] = { 255 /*, 255 */ };
#elif defined(__AVR_ATmega32U4__)
#define AVAILABLE_TONE_PINS 1
#define USE_TIMER3
const uint8_t PROGMEM tone_pin_to_timer_PGM[] = { 3 /*, 1 */ };
static uint8_t tone_pins[AVAILABLE_TONE_PINS] = { 255 /*, 255 */ };
#else
#define AVAILABLE_TONE_PINS 1
#define USE_TIMER2
// Leave timer 0 to last.
const uint8_t PROGMEM tone_pin_to_timer_PGM[] = { 2 /*, 1, 0 */ };
static uint8_t tone_pins[AVAILABLE_TONE_PINS] = { 255 /*, 255, 255 */ };
#endif
static int8_t toneBegin(uint8_t _pin)
{
int8_t _timer = -1;
// if we're already using the pin, the timer should be configured.
for (int i = 0; i < AVAILABLE_TONE_PINS; i++) {
if (tone_pins[i] == _pin) {
return pgm_read_byte(tone_pin_to_timer_PGM + i);
}
}
// search for an unused timer.
for (int i = 0; i < AVAILABLE_TONE_PINS; i++) {
if (tone_pins[i] == 255) {
tone_pins[i] = _pin;
_timer = pgm_read_byte(tone_pin_to_timer_PGM + i);
break;
}
}
if (_timer != -1)
{
// Set timer specific stuff
// All timers in CTC mode
// 8 bit timers will require changing prescalar values,
// whereas 16 bit timers are set to either ck/1 or ck/64 prescalar
switch (_timer)
{
#if defined(TCCR0A) && defined(TCCR0B)
case 0:
// 8 bit timer
TCCR0A = 0;
TCCR0B = 0;
bitWrite(TCCR0A, WGM01, 1);
bitWrite(TCCR0B, CS00, 1);
timer0_pin_port = portOutputRegister(digitalPinToPort(_pin));
timer0_pin_mask = digitalPinToBitMask(_pin);
break;
#endif
#if defined(TCCR1A) && defined(TCCR1B) && defined(WGM12)
case 1:
// 16 bit timer
TCCR1A = 0;
TCCR1B = 0;
bitWrite(TCCR1B, WGM12, 1);
bitWrite(TCCR1B, CS10, 1);
timer1_pin_port = portOutputRegister(digitalPinToPort(_pin));
timer1_pin_mask = digitalPinToBitMask(_pin);
break;
#endif
#if defined(TCCR2A) && defined(TCCR2B)
case 2:
// 8 bit timer
TCCR2A = 0;
TCCR2B = 0;
bitWrite(TCCR2A, WGM21, 1);
bitWrite(TCCR2B, CS20, 1);
timer2_pin_port = portOutputRegister(digitalPinToPort(_pin));
timer2_pin_mask = digitalPinToBitMask(_pin);
break;
#endif
#if defined(TCCR3A) && defined(TCCR3B) && defined(TIMSK3)
case 3:
// 16 bit timer
TCCR3A = 0;
TCCR3B = 0;
bitWrite(TCCR3B, WGM32, 1);
bitWrite(TCCR3B, CS30, 1);
timer3_pin_port = portOutputRegister(digitalPinToPort(_pin));
timer3_pin_mask = digitalPinToBitMask(_pin);
break;
#endif
#if defined(TCCR4A) && defined(TCCR4B) && defined(TIMSK4)
case 4:
// 16 bit timer
TCCR4A = 0;
TCCR4B = 0;
#if defined(WGM42)
bitWrite(TCCR4B, WGM42, 1);
#elif defined(CS43)
#warning this may not be correct
// atmega32u4
bitWrite(TCCR4B, CS43, 1);
#endif
bitWrite(TCCR4B, CS40, 1);
timer4_pin_port = portOutputRegister(digitalPinToPort(_pin));
timer4_pin_mask = digitalPinToBitMask(_pin);
break;
#endif
#if defined(TCCR5A) && defined(TCCR5B) && defined(TIMSK5)
case 5:
// 16 bit timer
TCCR5A = 0;
TCCR5B = 0;
bitWrite(TCCR5B, WGM52, 1);
bitWrite(TCCR5B, CS50, 1);
timer5_pin_port = portOutputRegister(digitalPinToPort(_pin));
timer5_pin_mask = digitalPinToBitMask(_pin);
break;
#endif
}
}
return _timer;
}
// frequency (in hertz) and duration (in milliseconds).
void tone(uint8_t _pin, unsigned int frequency, unsigned long duration)
{
uint8_t prescalarbits = 0b001;
long toggle_count = 0;
uint32_t ocr = 0;
int8_t _timer;
_timer = toneBegin(_pin);
if (_timer >= 0)
{
// Set the pinMode as OUTPUT
pinMode(_pin, OUTPUT);
// if we are using an 8 bit timer, scan through prescalars to find the best fit
if (_timer == 0 || _timer == 2)
{
ocr = F_CPU / frequency / 2 - 1;
prescalarbits = 0b001; // ck/1: same for both timers
if (ocr > 255)
{
ocr = F_CPU / frequency / 2 / 8 - 1;
prescalarbits = 0b010; // ck/8: same for both timers
if (_timer == 2 && ocr > 255)
{
ocr = F_CPU / frequency / 2 / 32 - 1;
prescalarbits = 0b011;
}
if (ocr > 255)
{
ocr = F_CPU / frequency / 2 / 64 - 1;
prescalarbits = _timer == 0 ? 0b011 : 0b100;
if (_timer == 2 && ocr > 255)
{
ocr = F_CPU / frequency / 2 / 128 - 1;
prescalarbits = 0b101;
}
if (ocr > 255)
{
ocr = F_CPU / frequency / 2 / 256 - 1;
prescalarbits = _timer == 0 ? 0b100 : 0b110;
if (ocr > 255)
{
// can't do any better than /1024
ocr = F_CPU / frequency / 2 / 1024 - 1;
prescalarbits = _timer == 0 ? 0b101 : 0b111;
}
}
}
}
#if defined(TCCR0B)
if (_timer == 0)
{
TCCR0B = prescalarbits;
}
else
#endif
#if defined(TCCR2B)
{
TCCR2B = prescalarbits;
}
#else
{
// dummy place holder to make the above ifdefs work
}
#endif
}
else
{
// two choices for the 16 bit timers: ck/1 or ck/64
ocr = F_CPU / frequency / 2 - 1;
prescalarbits = 0b001;
if (ocr > 0xffff)
{
ocr = F_CPU / frequency / 2 / 64 - 1;
prescalarbits = 0b011;
}
if (_timer == 1)
{
#if defined(TCCR1B)
TCCR1B = (TCCR1B & 0b11111000) | prescalarbits;
#endif
}
#if defined(TCCR3B)
else if (_timer == 3)
TCCR3B = (TCCR3B & 0b11111000) | prescalarbits;
#endif
#if defined(TCCR4B)
else if (_timer == 4)
TCCR4B = (TCCR4B & 0b11111000) | prescalarbits;
#endif
#if defined(TCCR5B)
else if (_timer == 5)
TCCR5B = (TCCR5B & 0b11111000) | prescalarbits;
#endif
}
// Calculate the toggle count
if (duration > 0)
{
toggle_count = 2 * frequency * duration / 1000;
}
else
{
toggle_count = -1;
}
// Set the OCR for the given timer,
// set the toggle count,
// then turn on the interrupts
switch (_timer)
{
#if defined(OCR0A) && defined(TIMSK0) && defined(OCIE0A)
case 0:
OCR0A = ocr;
timer0_toggle_count = toggle_count;
bitWrite(TIMSK0, OCIE0A, 1);
break;
#endif
case 1:
#if defined(OCR1A) && defined(TIMSK1) && defined(OCIE1A)
OCR1A = ocr;
timer1_toggle_count = toggle_count;
bitWrite(TIMSK1, OCIE1A, 1);
#elif defined(OCR1A) && defined(TIMSK) && defined(OCIE1A)
// this combination is for at least the ATmega32
OCR1A = ocr;
timer1_toggle_count = toggle_count;
bitWrite(TIMSK, OCIE1A, 1);
#endif
break;
#if defined(OCR2A) && defined(TIMSK2) && defined(OCIE2A)
case 2:
OCR2A = ocr;
timer2_toggle_count = toggle_count;
bitWrite(TIMSK2, OCIE2A, 1);
break;
#endif
#if defined(TIMSK3)
case 3:
OCR3A = ocr;
timer3_toggle_count = toggle_count;
bitWrite(TIMSK3, OCIE3A, 1);
break;
#endif
#if defined(TIMSK4)
case 4:
OCR4A = ocr;
timer4_toggle_count = toggle_count;
bitWrite(TIMSK4, OCIE4A, 1);
break;
#endif
#if defined(OCR5A) && defined(TIMSK5) && defined(OCIE5A)
case 5:
OCR5A = ocr;
timer5_toggle_count = toggle_count;
bitWrite(TIMSK5, OCIE5A, 1);
break;
#endif
}
}
}
// XXX: this function only works properly for timer 2 (the only one we use
// currently). for the others, it should end the tone, but won't restore
// proper PWM functionality for the timer.
void disableTimer(uint8_t _timer)
{
switch (_timer)
{
case 0:
#if defined(TIMSK0)
TIMSK0 = 0;
#elif defined(TIMSK)
TIMSK = 0; // atmega32
#endif
break;
#if defined(TIMSK1) && defined(OCIE1A)
case 1:
bitWrite(TIMSK1, OCIE1A, 0);
break;
#endif
case 2:
#if defined(TIMSK2) && defined(OCIE2A)
bitWrite(TIMSK2, OCIE2A, 0); // disable interrupt
#endif
#if defined(TCCR2A) && defined(WGM20)
TCCR2A = (1 << WGM20);
#endif
#if defined(TCCR2B) && defined(CS22)
TCCR2B = (TCCR2B & 0b11111000) | (1 << CS22);
#endif
#if defined(OCR2A)
OCR2A = 0;
#endif
break;
#if defined(TIMSK3)
case 3:
TIMSK3 = 0;
break;
#endif
#if defined(TIMSK4)
case 4:
TIMSK4 = 0;
break;
#endif
#if defined(TIMSK5)
case 5:
TIMSK5 = 0;
break;
#endif
}
}
void noTone(uint8_t _pin)
{
int8_t _timer = -1;
for (int i = 0; i < AVAILABLE_TONE_PINS; i++) {
if (tone_pins[i] == _pin) {
_timer = pgm_read_byte(tone_pin_to_timer_PGM + i);
tone_pins[i] = 255;
}
}
disableTimer(_timer);
digitalWrite(_pin, 0);
}
#ifdef USE_TIMER0
ISR(TIMER0_COMPA_vect)
{
if (timer0_toggle_count != 0)
{
// toggle the pin
*timer0_pin_port ^= timer0_pin_mask;
if (timer0_toggle_count > 0)
timer0_toggle_count--;
}
else
{
disableTimer(0);
*timer0_pin_port &= ~(timer0_pin_mask); // keep pin low after stop
}
}
#endif
#ifdef USE_TIMER1
ISR(TIMER1_COMPA_vect)
{
if (timer1_toggle_count != 0)
{
// toggle the pin
*timer1_pin_port ^= timer1_pin_mask;
if (timer1_toggle_count > 0)
timer1_toggle_count--;
}
else
{
disableTimer(1);
*timer1_pin_port &= ~(timer1_pin_mask); // keep pin low after stop
}
}
#endif
#ifdef USE_TIMER2
ISR(TIMER2_COMPA_vect)
{
if (timer2_toggle_count != 0)
{
// toggle the pin
*timer2_pin_port ^= timer2_pin_mask;
if (timer2_toggle_count > 0)
timer2_toggle_count--;
}
else
{
// need to call noTone() so that the tone_pins[] entry is reset, so the
// timer gets initialized next time we call tone().
// XXX: this assumes timer 2 is always the first one used.
noTone(tone_pins[0]);
// disableTimer(2);
// *timer2_pin_port &= ~(timer2_pin_mask); // keep pin low after stop
}
}
#endif
#ifdef USE_TIMER3
ISR(TIMER3_COMPA_vect)
{
if (timer3_toggle_count != 0)
{
// toggle the pin
*timer3_pin_port ^= timer3_pin_mask;
if (timer3_toggle_count > 0)
timer3_toggle_count--;
}
else
{
disableTimer(3);
*timer3_pin_port &= ~(timer3_pin_mask); // keep pin low after stop
}
}
#endif
#ifdef USE_TIMER4
ISR(TIMER4_COMPA_vect)
{
if (timer4_toggle_count != 0)
{
// toggle the pin
*timer4_pin_port ^= timer4_pin_mask;
if (timer4_toggle_count > 0)
timer4_toggle_count--;
}
else
{
disableTimer(4);
*timer4_pin_port &= ~(timer4_pin_mask); // keep pin low after stop
}
}
#endif
#ifdef USE_TIMER5
ISR(TIMER5_COMPA_vect)
{
if (timer5_toggle_count != 0)
{
// toggle the pin
*timer5_pin_port ^= timer5_pin_mask;
if (timer5_toggle_count > 0)
timer5_toggle_count--;
}
else
{
disableTimer(5);
*timer5_pin_port &= ~(timer5_pin_mask); // keep pin low after stop
}
}
#endif

View File

@@ -1,196 +0,0 @@
#ifndef __USBAPI__
#define __USBAPI__
#if defined(USBCON)
//================================================================================
//================================================================================
// USB
class USBDevice_
{
public:
USBDevice_();
bool configured();
void attach();
void detach(); // Serial port goes down too...
void poll();
};
extern USBDevice_ USBDevice;
//================================================================================
//================================================================================
// Serial over CDC (Serial1 is the physical port)
class Serial_ : public Stream
{
private:
ring_buffer *_cdc_rx_buffer;
public:
void begin(uint16_t baud_count);
void end(void);
virtual int available(void);
virtual void accept(void);
virtual int peek(void);
virtual int read(void);
virtual void flush(void);
virtual size_t write(uint8_t);
using Print::write; // pull in write(str) and write(buf, size) from Print
operator bool();
};
extern Serial_ Serial;
//================================================================================
//================================================================================
// Mouse
#define MOUSE_LEFT 1
#define MOUSE_RIGHT 2
#define MOUSE_MIDDLE 4
#define MOUSE_ALL (MOUSE_LEFT | MOUSE_RIGHT | MOUSE_MIDDLE)
class Mouse_
{
private:
uint8_t _buttons;
void buttons(uint8_t b);
public:
Mouse_(void);
void begin(void);
void end(void);
void click(uint8_t b = MOUSE_LEFT);
void move(signed char x, signed char y, signed char wheel = 0);
void press(uint8_t b = MOUSE_LEFT); // press LEFT by default
void release(uint8_t b = MOUSE_LEFT); // release LEFT by default
bool isPressed(uint8_t b = MOUSE_LEFT); // check LEFT by default
};
extern Mouse_ Mouse;
//================================================================================
//================================================================================
// Keyboard
#define KEY_LEFT_CTRL 0x80
#define KEY_LEFT_SHIFT 0x81
#define KEY_LEFT_ALT 0x82
#define KEY_LEFT_GUI 0x83
#define KEY_RIGHT_CTRL 0x84
#define KEY_RIGHT_SHIFT 0x85
#define KEY_RIGHT_ALT 0x86
#define KEY_RIGHT_GUI 0x87
#define KEY_UP_ARROW 0xDA
#define KEY_DOWN_ARROW 0xD9
#define KEY_LEFT_ARROW 0xD8
#define KEY_RIGHT_ARROW 0xD7
#define KEY_BACKSPACE 0xB2
#define KEY_TAB 0xB3
#define KEY_RETURN 0xB0
#define KEY_ESC 0xB1
#define KEY_INSERT 0xD1
#define KEY_DELETE 0xD4
#define KEY_PAGE_UP 0xD3
#define KEY_PAGE_DOWN 0xD6
#define KEY_HOME 0xD2
#define KEY_END 0xD5
#define KEY_CAPS_LOCK 0xC1
#define KEY_F1 0xC2
#define KEY_F2 0xC3
#define KEY_F3 0xC4
#define KEY_F4 0xC5
#define KEY_F5 0xC6
#define KEY_F6 0xC7
#define KEY_F7 0xC8
#define KEY_F8 0xC9
#define KEY_F9 0xCA
#define KEY_F10 0xCB
#define KEY_F11 0xCC
#define KEY_F12 0xCD
// Low level key report: up to 6 keys and shift, ctrl etc at once
typedef struct
{
uint8_t modifiers;
uint8_t reserved;
uint8_t keys[6];
} KeyReport;
class Keyboard_ : public Print
{
private:
KeyReport _keyReport;
void sendReport(KeyReport* keys);
public:
Keyboard_(void);
void begin(void);
void end(void);
virtual size_t write(uint8_t k);
virtual size_t press(uint8_t k);
virtual size_t release(uint8_t k);
virtual void releaseAll(void);
};
extern Keyboard_ Keyboard;
//================================================================================
//================================================================================
// Low level API
typedef struct
{
uint8_t bmRequestType;
uint8_t bRequest;
uint8_t wValueL;
uint8_t wValueH;
uint16_t wIndex;
uint16_t wLength;
} Setup;
//================================================================================
//================================================================================
// HID 'Driver'
int HID_GetInterface(uint8_t* interfaceNum);
int HID_GetDescriptor(int i);
bool HID_Setup(Setup& setup);
void HID_SendReport(uint8_t id, const void* data, int len);
//================================================================================
//================================================================================
// MSC 'Driver'
int MSC_GetInterface(uint8_t* interfaceNum);
int MSC_GetDescriptor(int i);
bool MSC_Setup(Setup& setup);
bool MSC_Data(uint8_t rx,uint8_t tx);
//================================================================================
//================================================================================
// CSC 'Driver'
int CDC_GetInterface(uint8_t* interfaceNum);
int CDC_GetDescriptor(int i);
bool CDC_Setup(Setup& setup);
//================================================================================
//================================================================================
#define TRANSFER_PGM 0x80
#define TRANSFER_RELEASE 0x40
#define TRANSFER_ZERO 0x20
int USB_SendControl(uint8_t flags, const void* d, int len);
int USB_RecvControl(void* d, int len);
uint8_t USB_Available(uint8_t ep);
int USB_Send(uint8_t ep, const void* data, int len); // blocking
int USB_Recv(uint8_t ep, void* data, int len); // non-blocking
int USB_Recv(uint8_t ep); // non-blocking
void USB_Flush(uint8_t ep);
#endif
#endif /* if defined(USBCON) */

View File

@@ -1,684 +0,0 @@
/* Copyright (c) 2010, Peter Barrett
**
** Permission to use, copy, modify, and/or distribute this software for
** any purpose with or without fee is hereby granted, provided that the
** above copyright notice and this permission notice appear in all copies.
**
** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
** WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
** WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
** BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
** OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
** WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
** ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
** SOFTWARE.
*/
#include "Platform.h"
#include "USBAPI.h"
#include "USBDesc.h"
#if defined(USBCON)
#define EP_TYPE_CONTROL 0x00
#define EP_TYPE_BULK_IN 0x81
#define EP_TYPE_BULK_OUT 0x80
#define EP_TYPE_INTERRUPT_IN 0xC1
#define EP_TYPE_INTERRUPT_OUT 0xC0
#define EP_TYPE_ISOCHRONOUS_IN 0x41
#define EP_TYPE_ISOCHRONOUS_OUT 0x40
/** Pulse generation counters to keep track of the number of milliseconds remaining for each pulse type */
#define TX_RX_LED_PULSE_MS 100
volatile u8 TxLEDPulse; /**< Milliseconds remaining for data Tx LED pulse */
volatile u8 RxLEDPulse; /**< Milliseconds remaining for data Rx LED pulse */
//==================================================================
//==================================================================
extern const u16 STRING_LANGUAGE[] PROGMEM;
extern const u16 STRING_IPRODUCT[] PROGMEM;
extern const u16 STRING_IMANUFACTURER[] PROGMEM;
extern const DeviceDescriptor USB_DeviceDescriptor PROGMEM;
extern const DeviceDescriptor USB_DeviceDescriptorA PROGMEM;
const u16 STRING_LANGUAGE[2] = {
(3<<8) | (2+2),
0x0409 // English
};
const u16 STRING_IPRODUCT[17] = {
(3<<8) | (2+2*16),
#if USB_PID == 0x8036
'A','r','d','u','i','n','o',' ','L','e','o','n','a','r','d','o'
#elif USB_PID == 0x8037
'A','r','d','u','i','n','o',' ','M','i','c','r','o',' ',' ',' '
#elif USB_PID == 0x803C
'A','r','d','u','i','n','o',' ','E','s','p','l','o','r','a',' '
#elif USB_PID == 0x9208
'L','i','l','y','P','a','d','U','S','B',' ',' ',' ',' ',' ',' '
#else
'U','S','B',' ','I','O',' ','B','o','a','r','d',' ',' ',' ',' '
#endif
};
const u16 STRING_IMANUFACTURER[12] = {
(3<<8) | (2+2*11),
#if USB_VID == 0x2341
'A','r','d','u','i','n','o',' ','L','L','C'
#elif USB_VID == 0x1b4f
'S','p','a','r','k','F','u','n',' ',' ',' '
#else
'U','n','k','n','o','w','n',' ',' ',' ',' '
#endif
};
#ifdef CDC_ENABLED
#define DEVICE_CLASS 0x02
#else
#define DEVICE_CLASS 0x00
#endif
// DEVICE DESCRIPTOR
const DeviceDescriptor USB_DeviceDescriptor =
D_DEVICE(0x00,0x00,0x00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
const DeviceDescriptor USB_DeviceDescriptorA =
D_DEVICE(DEVICE_CLASS,0x00,0x00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
//==================================================================
//==================================================================
volatile u8 _usbConfiguration = 0;
static inline void WaitIN(void)
{
while (!(UEINTX & (1<<TXINI)));
}
static inline void ClearIN(void)
{
UEINTX = ~(1<<TXINI);
}
static inline void WaitOUT(void)
{
while (!(UEINTX & (1<<RXOUTI)))
;
}
static inline u8 WaitForINOrOUT()
{
while (!(UEINTX & ((1<<TXINI)|(1<<RXOUTI))))
;
return (UEINTX & (1<<RXOUTI)) == 0;
}
static inline void ClearOUT(void)
{
UEINTX = ~(1<<RXOUTI);
}
void Recv(volatile u8* data, u8 count)
{
while (count--)
*data++ = UEDATX;
RXLED1; // light the RX LED
RxLEDPulse = TX_RX_LED_PULSE_MS;
}
static inline u8 Recv8()
{
RXLED1; // light the RX LED
RxLEDPulse = TX_RX_LED_PULSE_MS;
return UEDATX;
}
static inline void Send8(u8 d)
{
UEDATX = d;
}
static inline void SetEP(u8 ep)
{
UENUM = ep;
}
static inline u8 FifoByteCount()
{
return UEBCLX;
}
static inline u8 ReceivedSetupInt()
{
return UEINTX & (1<<RXSTPI);
}
static inline void ClearSetupInt()
{
UEINTX = ~((1<<RXSTPI) | (1<<RXOUTI) | (1<<TXINI));
}
static inline void Stall()
{
UECONX = (1<<STALLRQ) | (1<<EPEN);
}
static inline u8 ReadWriteAllowed()
{
return UEINTX & (1<<RWAL);
}
static inline u8 Stalled()
{
return UEINTX & (1<<STALLEDI);
}
static inline u8 FifoFree()
{
return UEINTX & (1<<FIFOCON);
}
static inline void ReleaseRX()
{
UEINTX = 0x6B; // FIFOCON=0 NAKINI=1 RWAL=1 NAKOUTI=0 RXSTPI=1 RXOUTI=0 STALLEDI=1 TXINI=1
}
static inline void ReleaseTX()
{
UEINTX = 0x3A; // FIFOCON=0 NAKINI=0 RWAL=1 NAKOUTI=1 RXSTPI=1 RXOUTI=0 STALLEDI=1 TXINI=0
}
static inline u8 FrameNumber()
{
return UDFNUML;
}
//==================================================================
//==================================================================
u8 USBGetConfiguration(void)
{
return _usbConfiguration;
}
#define USB_RECV_TIMEOUT
class LockEP
{
u8 _sreg;
public:
LockEP(u8 ep) : _sreg(SREG)
{
cli();
SetEP(ep & 7);
}
~LockEP()
{
SREG = _sreg;
}
};
// Number of bytes, assumes a rx endpoint
u8 USB_Available(u8 ep)
{
LockEP lock(ep);
return FifoByteCount();
}
// Non Blocking receive
// Return number of bytes read
int USB_Recv(u8 ep, void* d, int len)
{
if (!_usbConfiguration || len < 0)
return -1;
LockEP lock(ep);
u8 n = FifoByteCount();
len = min(n,len);
n = len;
u8* dst = (u8*)d;
while (n--)
*dst++ = Recv8();
if (len && !FifoByteCount()) // release empty buffer
ReleaseRX();
return len;
}
// Recv 1 byte if ready
int USB_Recv(u8 ep)
{
u8 c;
if (USB_Recv(ep,&c,1) != 1)
return -1;
return c;
}
// Space in send EP
u8 USB_SendSpace(u8 ep)
{
LockEP lock(ep);
if (!ReadWriteAllowed())
return 0;
return 64 - FifoByteCount();
}
// Blocking Send of data to an endpoint
int USB_Send(u8 ep, const void* d, int len)
{
if (!_usbConfiguration)
return -1;
int r = len;
const u8* data = (const u8*)d;
u8 zero = ep & TRANSFER_ZERO;
u8 timeout = 250; // 250ms timeout on send? TODO
while (len)
{
u8 n = USB_SendSpace(ep);
if (n == 0)
{
if (!(--timeout))
return -1;
delay(1);
continue;
}
if (n > len)
n = len;
len -= n;
{
LockEP lock(ep);
if (ep & TRANSFER_ZERO)
{
while (n--)
Send8(0);
}
else if (ep & TRANSFER_PGM)
{
while (n--)
Send8(pgm_read_byte(data++));
}
else
{
while (n--)
Send8(*data++);
}
if (!ReadWriteAllowed() || ((len == 0) && (ep & TRANSFER_RELEASE))) // Release full buffer
ReleaseTX();
}
}
TXLED1; // light the TX LED
TxLEDPulse = TX_RX_LED_PULSE_MS;
return r;
}
extern const u8 _initEndpoints[] PROGMEM;
const u8 _initEndpoints[] =
{
0,
#ifdef CDC_ENABLED
EP_TYPE_INTERRUPT_IN, // CDC_ENDPOINT_ACM
EP_TYPE_BULK_OUT, // CDC_ENDPOINT_OUT
EP_TYPE_BULK_IN, // CDC_ENDPOINT_IN
#endif
#ifdef HID_ENABLED
EP_TYPE_INTERRUPT_IN // HID_ENDPOINT_INT
#endif
};
#define EP_SINGLE_64 0x32 // EP0
#define EP_DOUBLE_64 0x36 // Other endpoints
static
void InitEP(u8 index, u8 type, u8 size)
{
UENUM = index;
UECONX = 1;
UECFG0X = type;
UECFG1X = size;
}
static
void InitEndpoints()
{
for (u8 i = 1; i < sizeof(_initEndpoints); i++)
{
UENUM = i;
UECONX = 1;
UECFG0X = pgm_read_byte(_initEndpoints+i);
UECFG1X = EP_DOUBLE_64;
}
UERST = 0x7E; // And reset them
UERST = 0;
}
// Handle CLASS_INTERFACE requests
static
bool ClassInterfaceRequest(Setup& setup)
{
u8 i = setup.wIndex;
#ifdef CDC_ENABLED
if (CDC_ACM_INTERFACE == i)
return CDC_Setup(setup);
#endif
#ifdef HID_ENABLED
if (HID_INTERFACE == i)
return HID_Setup(setup);
#endif
return false;
}
int _cmark;
int _cend;
void InitControl(int end)
{
SetEP(0);
_cmark = 0;
_cend = end;
}
static
bool SendControl(u8 d)
{
if (_cmark < _cend)
{
if (!WaitForINOrOUT())
return false;
Send8(d);
if (!((_cmark + 1) & 0x3F))
ClearIN(); // Fifo is full, release this packet
}
_cmark++;
return true;
};
// Clipped by _cmark/_cend
int USB_SendControl(u8 flags, const void* d, int len)
{
int sent = len;
const u8* data = (const u8*)d;
bool pgm = flags & TRANSFER_PGM;
while (len--)
{
u8 c = pgm ? pgm_read_byte(data++) : *data++;
if (!SendControl(c))
return -1;
}
return sent;
}
// Does not timeout or cross fifo boundaries
// Will only work for transfers <= 64 bytes
// TODO
int USB_RecvControl(void* d, int len)
{
WaitOUT();
Recv((u8*)d,len);
ClearOUT();
return len;
}
int SendInterfaces()
{
int total = 0;
u8 interfaces = 0;
#ifdef CDC_ENABLED
total = CDC_GetInterface(&interfaces);
#endif
#ifdef HID_ENABLED
total += HID_GetInterface(&interfaces);
#endif
return interfaces;
}
// Construct a dynamic configuration descriptor
// This really needs dynamic endpoint allocation etc
// TODO
static
bool SendConfiguration(int maxlen)
{
// Count and measure interfaces
InitControl(0);
int interfaces = SendInterfaces();
ConfigDescriptor config = D_CONFIG(_cmark + sizeof(ConfigDescriptor),interfaces);
// Now send them
InitControl(maxlen);
USB_SendControl(0,&config,sizeof(ConfigDescriptor));
SendInterfaces();
return true;
}
u8 _cdcComposite = 0;
static
bool SendDescriptor(Setup& setup)
{
u8 t = setup.wValueH;
if (USB_CONFIGURATION_DESCRIPTOR_TYPE == t)
return SendConfiguration(setup.wLength);
InitControl(setup.wLength);
#ifdef HID_ENABLED
if (HID_REPORT_DESCRIPTOR_TYPE == t)
return HID_GetDescriptor(t);
#endif
u8 desc_length = 0;
const u8* desc_addr = 0;
if (USB_DEVICE_DESCRIPTOR_TYPE == t)
{
if (setup.wLength == 8)
_cdcComposite = 1;
desc_addr = _cdcComposite ? (const u8*)&USB_DeviceDescriptorA : (const u8*)&USB_DeviceDescriptor;
}
else if (USB_STRING_DESCRIPTOR_TYPE == t)
{
if (setup.wValueL == 0)
desc_addr = (const u8*)&STRING_LANGUAGE;
else if (setup.wValueL == IPRODUCT)
desc_addr = (const u8*)&STRING_IPRODUCT;
else if (setup.wValueL == IMANUFACTURER)
desc_addr = (const u8*)&STRING_IMANUFACTURER;
else
return false;
}
if (desc_addr == 0)
return false;
if (desc_length == 0)
desc_length = pgm_read_byte(desc_addr);
USB_SendControl(TRANSFER_PGM,desc_addr,desc_length);
return true;
}
// Endpoint 0 interrupt
ISR(USB_COM_vect)
{
SetEP(0);
if (!ReceivedSetupInt())
return;
Setup setup;
Recv((u8*)&setup,8);
ClearSetupInt();
u8 requestType = setup.bmRequestType;
if (requestType & REQUEST_DEVICETOHOST)
WaitIN();
else
ClearIN();
bool ok = true;
if (REQUEST_STANDARD == (requestType & REQUEST_TYPE))
{
// Standard Requests
u8 r = setup.bRequest;
if (GET_STATUS == r)
{
Send8(0); // TODO
Send8(0);
}
else if (CLEAR_FEATURE == r)
{
}
else if (SET_FEATURE == r)
{
}
else if (SET_ADDRESS == r)
{
WaitIN();
UDADDR = setup.wValueL | (1<<ADDEN);
}
else if (GET_DESCRIPTOR == r)
{
ok = SendDescriptor(setup);
}
else if (SET_DESCRIPTOR == r)
{
ok = false;
}
else if (GET_CONFIGURATION == r)
{
Send8(1);
}
else if (SET_CONFIGURATION == r)
{
if (REQUEST_DEVICE == (requestType & REQUEST_RECIPIENT))
{
InitEndpoints();
_usbConfiguration = setup.wValueL;
} else
ok = false;
}
else if (GET_INTERFACE == r)
{
}
else if (SET_INTERFACE == r)
{
}
}
else
{
InitControl(setup.wLength); // Max length of transfer
ok = ClassInterfaceRequest(setup);
}
if (ok)
ClearIN();
else
{
Stall();
}
}
void USB_Flush(u8 ep)
{
SetEP(ep);
if (FifoByteCount())
ReleaseTX();
}
// General interrupt
ISR(USB_GEN_vect)
{
u8 udint = UDINT;
UDINT = 0;
// End of Reset
if (udint & (1<<EORSTI))
{
InitEP(0,EP_TYPE_CONTROL,EP_SINGLE_64); // init ep0
_usbConfiguration = 0; // not configured yet
UEIENX = 1 << RXSTPE; // Enable interrupts for ep0
}
// Start of Frame - happens every millisecond so we use it for TX and RX LED one-shot timing, too
if (udint & (1<<SOFI))
{
#ifdef CDC_ENABLED
USB_Flush(CDC_TX); // Send a tx frame if found
if (USB_Available(CDC_RX)) // Handle received bytes (if any)
Serial.accept();
#endif
// check whether the one-shot period has elapsed. if so, turn off the LED
if (TxLEDPulse && !(--TxLEDPulse))
TXLED0;
if (RxLEDPulse && !(--RxLEDPulse))
RXLED0;
}
}
// VBUS or counting frames
// Any frame counting?
u8 USBConnected()
{
u8 f = UDFNUML;
delay(3);
return f != UDFNUML;
}
//=======================================================================
//=======================================================================
USBDevice_ USBDevice;
USBDevice_::USBDevice_()
{
}
void USBDevice_::attach()
{
_usbConfiguration = 0;
UHWCON = 0x01; // power internal reg
USBCON = (1<<USBE)|(1<<FRZCLK); // clock frozen, usb enabled
#if F_CPU == 16000000UL
PLLCSR = 0x12; // Need 16 MHz xtal
#elif F_CPU == 8000000UL
PLLCSR = 0x02; // Need 8 MHz xtal
#endif
while (!(PLLCSR & (1<<PLOCK))) // wait for lock pll
;
// Some tests on specific versions of macosx (10.7.3), reported some
// strange behaviuors when the board is reset using the serial
// port touch at 1200 bps. This delay fixes this behaviour.
delay(1);
USBCON = ((1<<USBE)|(1<<OTGPADE)); // start USB clock
UDIEN = (1<<EORSTE)|(1<<SOFE); // Enable interrupts for EOR (End of Reset) and SOF (start of frame)
UDCON = 0; // enable attach resistor
TX_RX_LED_INIT;
}
void USBDevice_::detach()
{
}
// Check for interrupts
// TODO: VBUS detection
bool USBDevice_::configured()
{
return _usbConfiguration;
}
void USBDevice_::poll()
{
}
#endif /* if defined(USBCON) */

View File

@@ -1,303 +0,0 @@
// Copyright (c) 2010, Peter Barrett
/*
** Permission to use, copy, modify, and/or distribute this software for
** any purpose with or without fee is hereby granted, provided that the
** above copyright notice and this permission notice appear in all copies.
**
** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
** WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
** WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
** BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
** OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
** WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
** ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
** SOFTWARE.
*/
#ifndef __USBCORE_H__
#define __USBCORE_H__
// Standard requests
#define GET_STATUS 0
#define CLEAR_FEATURE 1
#define SET_FEATURE 3
#define SET_ADDRESS 5
#define GET_DESCRIPTOR 6
#define SET_DESCRIPTOR 7
#define GET_CONFIGURATION 8
#define SET_CONFIGURATION 9
#define GET_INTERFACE 10
#define SET_INTERFACE 11
// bmRequestType
#define REQUEST_HOSTTODEVICE 0x00
#define REQUEST_DEVICETOHOST 0x80
#define REQUEST_DIRECTION 0x80
#define REQUEST_STANDARD 0x00
#define REQUEST_CLASS 0x20
#define REQUEST_VENDOR 0x40
#define REQUEST_TYPE 0x60
#define REQUEST_DEVICE 0x00
#define REQUEST_INTERFACE 0x01
#define REQUEST_ENDPOINT 0x02
#define REQUEST_OTHER 0x03
#define REQUEST_RECIPIENT 0x03
#define REQUEST_DEVICETOHOST_CLASS_INTERFACE (REQUEST_DEVICETOHOST + REQUEST_CLASS + REQUEST_INTERFACE)
#define REQUEST_HOSTTODEVICE_CLASS_INTERFACE (REQUEST_HOSTTODEVICE + REQUEST_CLASS + REQUEST_INTERFACE)
// Class requests
#define CDC_SET_LINE_CODING 0x20
#define CDC_GET_LINE_CODING 0x21
#define CDC_SET_CONTROL_LINE_STATE 0x22
#define MSC_RESET 0xFF
#define MSC_GET_MAX_LUN 0xFE
#define HID_GET_REPORT 0x01
#define HID_GET_IDLE 0x02
#define HID_GET_PROTOCOL 0x03
#define HID_SET_REPORT 0x09
#define HID_SET_IDLE 0x0A
#define HID_SET_PROTOCOL 0x0B
// Descriptors
#define USB_DEVICE_DESC_SIZE 18
#define USB_CONFIGUARTION_DESC_SIZE 9
#define USB_INTERFACE_DESC_SIZE 9
#define USB_ENDPOINT_DESC_SIZE 7
#define USB_DEVICE_DESCRIPTOR_TYPE 1
#define USB_CONFIGURATION_DESCRIPTOR_TYPE 2
#define USB_STRING_DESCRIPTOR_TYPE 3
#define USB_INTERFACE_DESCRIPTOR_TYPE 4
#define USB_ENDPOINT_DESCRIPTOR_TYPE 5
#define USB_DEVICE_CLASS_COMMUNICATIONS 0x02
#define USB_DEVICE_CLASS_HUMAN_INTERFACE 0x03
#define USB_DEVICE_CLASS_STORAGE 0x08
#define USB_DEVICE_CLASS_VENDOR_SPECIFIC 0xFF
#define USB_CONFIG_POWERED_MASK 0x40
#define USB_CONFIG_BUS_POWERED 0x80
#define USB_CONFIG_SELF_POWERED 0xC0
#define USB_CONFIG_REMOTE_WAKEUP 0x20
// bMaxPower in Configuration Descriptor
#define USB_CONFIG_POWER_MA(mA) ((mA)/2)
// bEndpointAddress in Endpoint Descriptor
#define USB_ENDPOINT_DIRECTION_MASK 0x80
#define USB_ENDPOINT_OUT(addr) ((addr) | 0x00)
#define USB_ENDPOINT_IN(addr) ((addr) | 0x80)
#define USB_ENDPOINT_TYPE_MASK 0x03
#define USB_ENDPOINT_TYPE_CONTROL 0x00
#define USB_ENDPOINT_TYPE_ISOCHRONOUS 0x01
#define USB_ENDPOINT_TYPE_BULK 0x02
#define USB_ENDPOINT_TYPE_INTERRUPT 0x03
#define TOBYTES(x) ((x) & 0xFF),(((x) >> 8) & 0xFF)
#define CDC_V1_10 0x0110
#define CDC_COMMUNICATION_INTERFACE_CLASS 0x02
#define CDC_CALL_MANAGEMENT 0x01
#define CDC_ABSTRACT_CONTROL_MODEL 0x02
#define CDC_HEADER 0x00
#define CDC_ABSTRACT_CONTROL_MANAGEMENT 0x02
#define CDC_UNION 0x06
#define CDC_CS_INTERFACE 0x24
#define CDC_CS_ENDPOINT 0x25
#define CDC_DATA_INTERFACE_CLASS 0x0A
#define MSC_SUBCLASS_SCSI 0x06
#define MSC_PROTOCOL_BULK_ONLY 0x50
#define HID_HID_DESCRIPTOR_TYPE 0x21
#define HID_REPORT_DESCRIPTOR_TYPE 0x22
#define HID_PHYSICAL_DESCRIPTOR_TYPE 0x23
// Device
typedef struct {
u8 len; // 18
u8 dtype; // 1 USB_DEVICE_DESCRIPTOR_TYPE
u16 usbVersion; // 0x200
u8 deviceClass;
u8 deviceSubClass;
u8 deviceProtocol;
u8 packetSize0; // Packet 0
u16 idVendor;
u16 idProduct;
u16 deviceVersion; // 0x100
u8 iManufacturer;
u8 iProduct;
u8 iSerialNumber;
u8 bNumConfigurations;
} DeviceDescriptor;
// Config
typedef struct {
u8 len; // 9
u8 dtype; // 2
u16 clen; // total length
u8 numInterfaces;
u8 config;
u8 iconfig;
u8 attributes;
u8 maxPower;
} ConfigDescriptor;
// String
// Interface
typedef struct
{
u8 len; // 9
u8 dtype; // 4
u8 number;
u8 alternate;
u8 numEndpoints;
u8 interfaceClass;
u8 interfaceSubClass;
u8 protocol;
u8 iInterface;
} InterfaceDescriptor;
// Endpoint
typedef struct
{
u8 len; // 7
u8 dtype; // 5
u8 addr;
u8 attr;
u16 packetSize;
u8 interval;
} EndpointDescriptor;
// Interface Association Descriptor
// Used to bind 2 interfaces together in CDC compostite device
typedef struct
{
u8 len; // 8
u8 dtype; // 11
u8 firstInterface;
u8 interfaceCount;
u8 functionClass;
u8 funtionSubClass;
u8 functionProtocol;
u8 iInterface;
} IADDescriptor;
// CDC CS interface descriptor
typedef struct
{
u8 len; // 5
u8 dtype; // 0x24
u8 subtype;
u8 d0;
u8 d1;
} CDCCSInterfaceDescriptor;
typedef struct
{
u8 len; // 4
u8 dtype; // 0x24
u8 subtype;
u8 d0;
} CDCCSInterfaceDescriptor4;
typedef struct
{
u8 len;
u8 dtype; // 0x24
u8 subtype; // 1
u8 bmCapabilities;
u8 bDataInterface;
} CMFunctionalDescriptor;
typedef struct
{
u8 len;
u8 dtype; // 0x24
u8 subtype; // 1
u8 bmCapabilities;
} ACMFunctionalDescriptor;
typedef struct
{
// IAD
IADDescriptor iad; // Only needed on compound device
// Control
InterfaceDescriptor cif; //
CDCCSInterfaceDescriptor header;
CMFunctionalDescriptor callManagement; // Call Management
ACMFunctionalDescriptor controlManagement; // ACM
CDCCSInterfaceDescriptor functionalDescriptor; // CDC_UNION
EndpointDescriptor cifin;
// Data
InterfaceDescriptor dif;
EndpointDescriptor in;
EndpointDescriptor out;
} CDCDescriptor;
typedef struct
{
InterfaceDescriptor msc;
EndpointDescriptor in;
EndpointDescriptor out;
} MSCDescriptor;
typedef struct
{
u8 len; // 9
u8 dtype; // 0x21
u8 addr;
u8 versionL; // 0x101
u8 versionH; // 0x101
u8 country;
u8 desctype; // 0x22 report
u8 descLenL;
u8 descLenH;
} HIDDescDescriptor;
typedef struct
{
InterfaceDescriptor hid;
HIDDescDescriptor desc;
EndpointDescriptor in;
} HIDDescriptor;
#define D_DEVICE(_class,_subClass,_proto,_packetSize0,_vid,_pid,_version,_im,_ip,_is,_configs) \
{ 18, 1, 0x200, _class,_subClass,_proto,_packetSize0,_vid,_pid,_version,_im,_ip,_is,_configs }
#define D_CONFIG(_totalLength,_interfaces) \
{ 9, 2, _totalLength,_interfaces, 1, 0, USB_CONFIG_BUS_POWERED, USB_CONFIG_POWER_MA(500) }
#define D_INTERFACE(_n,_numEndpoints,_class,_subClass,_protocol) \
{ 9, 4, _n, 0, _numEndpoints, _class,_subClass, _protocol, 0 }
#define D_ENDPOINT(_addr,_attr,_packetSize, _interval) \
{ 7, 5, _addr,_attr,_packetSize, _interval }
#define D_IAD(_firstInterface, _count, _class, _subClass, _protocol) \
{ 8, 11, _firstInterface, _count, _class, _subClass, _protocol, 0 }
#define D_HIDREPORT(_descriptorLength) \
{ 9, 0x21, 0x1, 0x1, 0, 1, 0x22, _descriptorLength, 0 }
#define D_CDCCS(_subtype,_d0,_d1) { 5, 0x24, _subtype, _d0, _d1 }
#define D_CDCCS4(_subtype,_d0) { 4, 0x24, _subtype, _d0 }
#endif

View File

@@ -1,63 +0,0 @@
/* Copyright (c) 2011, Peter Barrett
**
** Permission to use, copy, modify, and/or distribute this software for
** any purpose with or without fee is hereby granted, provided that the
** above copyright notice and this permission notice appear in all copies.
**
** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
** WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
** WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
** BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
** OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
** WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
** ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
** SOFTWARE.
*/
#define CDC_ENABLED
#define HID_ENABLED
#ifdef CDC_ENABLED
#define CDC_INTERFACE_COUNT 2
#define CDC_ENPOINT_COUNT 3
#else
#define CDC_INTERFACE_COUNT 0
#define CDC_ENPOINT_COUNT 0
#endif
#ifdef HID_ENABLED
#define HID_INTERFACE_COUNT 1
#define HID_ENPOINT_COUNT 1
#else
#define HID_INTERFACE_COUNT 0
#define HID_ENPOINT_COUNT 0
#endif
#define CDC_ACM_INTERFACE 0 // CDC ACM
#define CDC_DATA_INTERFACE 1 // CDC Data
#define CDC_FIRST_ENDPOINT 1
#define CDC_ENDPOINT_ACM (CDC_FIRST_ENDPOINT) // CDC First
#define CDC_ENDPOINT_OUT (CDC_FIRST_ENDPOINT+1)
#define CDC_ENDPOINT_IN (CDC_FIRST_ENDPOINT+2)
#define HID_INTERFACE (CDC_ACM_INTERFACE + CDC_INTERFACE_COUNT) // HID Interface
#define HID_FIRST_ENDPOINT (CDC_FIRST_ENDPOINT + CDC_ENPOINT_COUNT)
#define HID_ENDPOINT_INT (HID_FIRST_ENDPOINT)
#define INTERFACE_COUNT (MSC_INTERFACE + MSC_INTERFACE_COUNT)
#ifdef CDC_ENABLED
#define CDC_RX CDC_ENDPOINT_OUT
#define CDC_TX CDC_ENDPOINT_IN
#endif
#ifdef HID_ENABLED
#define HID_TX HID_ENDPOINT_INT
#endif
#define IMANUFACTURER 1
#define IPRODUCT 2

View File

@@ -1,88 +0,0 @@
/*
* Udp.cpp: Library to send/receive UDP packets.
*
* NOTE: UDP is fast, but has some important limitations (thanks to Warren Gray for mentioning these)
* 1) UDP does not guarantee the order in which assembled UDP packets are received. This
* might not happen often in practice, but in larger network topologies, a UDP
* packet can be received out of sequence.
* 2) UDP does not guard against lost packets - so packets *can* disappear without the sender being
* aware of it. Again, this may not be a concern in practice on small local networks.
* For more information, see http://www.cafeaulait.org/course/week12/35.html
*
* MIT License:
* Copyright (c) 2008 Bjoern Hartmann
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* bjoern@cs.stanford.edu 12/30/2008
*/
#ifndef udp_h
#define udp_h
#include <Stream.h>
#include <IPAddress.h>
class UDP : public Stream {
public:
virtual uint8_t begin(uint16_t) =0; // initialize, start listening on specified port. Returns 1 if successful, 0 if there are no sockets available to use
virtual void stop() =0; // Finish with the UDP socket
// Sending UDP packets
// Start building up a packet to send to the remote host specific in ip and port
// Returns 1 if successful, 0 if there was a problem with the supplied IP address or port
virtual int beginPacket(IPAddress ip, uint16_t port) =0;
// Start building up a packet to send to the remote host specific in host and port
// Returns 1 if successful, 0 if there was a problem resolving the hostname or port
virtual int beginPacket(const char *host, uint16_t port) =0;
// Finish off this packet and send it
// Returns 1 if the packet was sent successfully, 0 if there was an error
virtual int endPacket() =0;
// Write a single byte into the packet
virtual size_t write(uint8_t) =0;
// Write size bytes from buffer into the packet
virtual size_t write(const uint8_t *buffer, size_t size) =0;
// Start processing the next available incoming packet
// Returns the size of the packet in bytes, or 0 if no packets are available
virtual int parsePacket() =0;
// Number of bytes remaining in the current packet
virtual int available() =0;
// Read a single byte from the current packet
virtual int read() =0;
// Read up to len bytes from the current packet and place them into buffer
// Returns the number of bytes read, or 0 if none are available
virtual int read(unsigned char* buffer, size_t len) =0;
// Read up to len characters from the current packet and place them into buffer
// Returns the number of characters read, or 0 if none are available
virtual int read(char* buffer, size_t len) =0;
// Return the next byte from the current packet without moving on to the next byte
virtual int peek() =0;
virtual void flush() =0; // Finish reading the current packet
// Return the IP address of the host who sent the current incoming packet
virtual IPAddress remoteIP() =0;
// Return the port of the host who sent the current incoming packet
virtual uint16_t remotePort() =0;
protected:
uint8_t* rawIPAddress(IPAddress& addr) { return addr.raw_address(); };
};
#endif

View File

@@ -1,168 +0,0 @@
/*
WCharacter.h - Character utility functions for Wiring & Arduino
Copyright (c) 2010 Hernando Barragan. All right reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef Character_h
#define Character_h
#include <ctype.h>
// WCharacter.h prototypes
inline boolean isAlphaNumeric(int c) __attribute__((always_inline));
inline boolean isAlpha(int c) __attribute__((always_inline));
inline boolean isAscii(int c) __attribute__((always_inline));
inline boolean isWhitespace(int c) __attribute__((always_inline));
inline boolean isControl(int c) __attribute__((always_inline));
inline boolean isDigit(int c) __attribute__((always_inline));
inline boolean isGraph(int c) __attribute__((always_inline));
inline boolean isLowerCase(int c) __attribute__((always_inline));
inline boolean isPrintable(int c) __attribute__((always_inline));
inline boolean isPunct(int c) __attribute__((always_inline));
inline boolean isSpace(int c) __attribute__((always_inline));
inline boolean isUpperCase(int c) __attribute__((always_inline));
inline boolean isHexadecimalDigit(int c) __attribute__((always_inline));
inline int toAscii(int c) __attribute__((always_inline));
inline int toLowerCase(int c) __attribute__((always_inline));
inline int toUpperCase(int c)__attribute__((always_inline));
// Checks for an alphanumeric character.
// It is equivalent to (isalpha(c) || isdigit(c)).
inline boolean isAlphaNumeric(int c)
{
return ( isalnum(c) == 0 ? false : true);
}
// Checks for an alphabetic character.
// It is equivalent to (isupper(c) || islower(c)).
inline boolean isAlpha(int c)
{
return ( isalpha(c) == 0 ? false : true);
}
// Checks whether c is a 7-bit unsigned char value
// that fits into the ASCII character set.
inline boolean isAscii(int c)
{
return ( isascii (c) == 0 ? false : true);
}
// Checks for a blank character, that is, a space or a tab.
inline boolean isWhitespace(int c)
{
return ( isblank (c) == 0 ? false : true);
}
// Checks for a control character.
inline boolean isControl(int c)
{
return ( iscntrl (c) == 0 ? false : true);
}
// Checks for a digit (0 through 9).
inline boolean isDigit(int c)
{
return ( isdigit (c) == 0 ? false : true);
}
// Checks for any printable character except space.
inline boolean isGraph(int c)
{
return ( isgraph (c) == 0 ? false : true);
}
// Checks for a lower-case character.
inline boolean isLowerCase(int c)
{
return (islower (c) == 0 ? false : true);
}
// Checks for any printable character including space.
inline boolean isPrintable(int c)
{
return ( isprint (c) == 0 ? false : true);
}
// Checks for any printable character which is not a space
// or an alphanumeric character.
inline boolean isPunct(int c)
{
return ( ispunct (c) == 0 ? false : true);
}
// Checks for white-space characters. For the avr-libc library,
// these are: space, formfeed ('\f'), newline ('\n'), carriage
// return ('\r'), horizontal tab ('\t'), and vertical tab ('\v').
inline boolean isSpace(int c)
{
return ( isspace (c) == 0 ? false : true);
}
// Checks for an uppercase letter.
inline boolean isUpperCase(int c)
{
return ( isupper (c) == 0 ? false : true);
}
// Checks for a hexadecimal digits, i.e. one of 0 1 2 3 4 5 6 7
// 8 9 a b c d e f A B C D E F.
inline boolean isHexadecimalDigit(int c)
{
return ( isxdigit (c) == 0 ? false : true);
}
// Converts c to a 7-bit unsigned char value that fits into the
// ASCII character set, by clearing the high-order bits.
inline int toAscii(int c)
{
return toascii (c);
}
// Warning:
// Many people will be unhappy if you use this function.
// This function will convert accented letters into random
// characters.
// Converts the letter c to lower case, if possible.
inline int toLowerCase(int c)
{
return tolower (c);
}
// Converts the letter c to upper case, if possible.
inline int toUpperCase(int c)
{
return toupper (c);
}
#endif

View File

@@ -1,322 +0,0 @@
/* -*- mode: jde; c-basic-offset: 2; indent-tabs-mode: nil -*- */
/*
Part of the Wiring project - http://wiring.uniandes.edu.co
Copyright (c) 2004-05 Hernando Barragan
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General
Public License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA
Modified 24 November 2006 by David A. Mellis
Modified 1 August 2010 by Mark Sproul
*/
#include <inttypes.h>
#include <avr/io.h>
#include <avr/interrupt.h>
#include <avr/pgmspace.h>
#include <stdio.h>
#include "wiring_private.h"
static volatile voidFuncPtr intFunc[EXTERNAL_NUM_INTERRUPTS];
// volatile static voidFuncPtr twiIntFunc;
void attachInterrupt(uint8_t interruptNum, void (*userFunc)(void), int mode) {
if(interruptNum < EXTERNAL_NUM_INTERRUPTS) {
intFunc[interruptNum] = userFunc;
// Configure the interrupt mode (trigger on low input, any change, rising
// edge, or falling edge). The mode constants were chosen to correspond
// to the configuration bits in the hardware register, so we simply shift
// the mode into place.
// Enable the interrupt.
switch (interruptNum) {
#if defined(__AVR_ATmega32U4__)
// I hate doing this, but the register assignment differs between the 1280/2560
// and the 32U4. Since avrlib defines registers PCMSK1 and PCMSK2 that aren't
// even present on the 32U4 this is the only way to distinguish between them.
case 0:
EICRA = (EICRA & ~((1<<ISC00) | (1<<ISC01))) | (mode << ISC00);
EIMSK |= (1<<INT0);
break;
case 1:
EICRA = (EICRA & ~((1<<ISC10) | (1<<ISC11))) | (mode << ISC10);
EIMSK |= (1<<INT1);
break;
case 2:
EICRA = (EICRA & ~((1<<ISC20) | (1<<ISC21))) | (mode << ISC20);
EIMSK |= (1<<INT2);
break;
case 3:
EICRA = (EICRA & ~((1<<ISC30) | (1<<ISC31))) | (mode << ISC30);
EIMSK |= (1<<INT3);
break;
#elif defined(EICRA) && defined(EICRB) && defined(EIMSK)
case 2:
EICRA = (EICRA & ~((1 << ISC00) | (1 << ISC01))) | (mode << ISC00);
EIMSK |= (1 << INT0);
break;
case 3:
EICRA = (EICRA & ~((1 << ISC10) | (1 << ISC11))) | (mode << ISC10);
EIMSK |= (1 << INT1);
break;
case 4:
EICRA = (EICRA & ~((1 << ISC20) | (1 << ISC21))) | (mode << ISC20);
EIMSK |= (1 << INT2);
break;
case 5:
EICRA = (EICRA & ~((1 << ISC30) | (1 << ISC31))) | (mode << ISC30);
EIMSK |= (1 << INT3);
break;
case 0:
EICRB = (EICRB & ~((1 << ISC40) | (1 << ISC41))) | (mode << ISC40);
EIMSK |= (1 << INT4);
break;
case 1:
EICRB = (EICRB & ~((1 << ISC50) | (1 << ISC51))) | (mode << ISC50);
EIMSK |= (1 << INT5);
break;
case 6:
EICRB = (EICRB & ~((1 << ISC60) | (1 << ISC61))) | (mode << ISC60);
EIMSK |= (1 << INT6);
break;
case 7:
EICRB = (EICRB & ~((1 << ISC70) | (1 << ISC71))) | (mode << ISC70);
EIMSK |= (1 << INT7);
break;
#else
case 0:
#if defined(EICRA) && defined(ISC00) && defined(EIMSK)
EICRA = (EICRA & ~((1 << ISC00) | (1 << ISC01))) | (mode << ISC00);
EIMSK |= (1 << INT0);
#elif defined(MCUCR) && defined(ISC00) && defined(GICR)
MCUCR = (MCUCR & ~((1 << ISC00) | (1 << ISC01))) | (mode << ISC00);
GICR |= (1 << INT0);
#elif defined(MCUCR) && defined(ISC00) && defined(GIMSK)
MCUCR = (MCUCR & ~((1 << ISC00) | (1 << ISC01))) | (mode << ISC00);
GIMSK |= (1 << INT0);
#else
#error attachInterrupt not finished for this CPU (case 0)
#endif
break;
case 1:
#if defined(EICRA) && defined(ISC10) && defined(ISC11) && defined(EIMSK)
EICRA = (EICRA & ~((1 << ISC10) | (1 << ISC11))) | (mode << ISC10);
EIMSK |= (1 << INT1);
#elif defined(MCUCR) && defined(ISC10) && defined(ISC11) && defined(GICR)
MCUCR = (MCUCR & ~((1 << ISC10) | (1 << ISC11))) | (mode << ISC10);
GICR |= (1 << INT1);
#elif defined(MCUCR) && defined(ISC10) && defined(GIMSK) && defined(GIMSK)
MCUCR = (MCUCR & ~((1 << ISC10) | (1 << ISC11))) | (mode << ISC10);
GIMSK |= (1 << INT1);
#else
#warning attachInterrupt may need some more work for this cpu (case 1)
#endif
break;
case 2:
#if defined(EICRA) && defined(ISC20) && defined(ISC21) && defined(EIMSK)
EICRA = (EICRA & ~((1 << ISC20) | (1 << ISC21))) | (mode << ISC20);
EIMSK |= (1 << INT2);
#elif defined(MCUCR) && defined(ISC20) && defined(ISC21) && defined(GICR)
MCUCR = (MCUCR & ~((1 << ISC20) | (1 << ISC21))) | (mode << ISC20);
GICR |= (1 << INT2);
#elif defined(MCUCR) && defined(ISC20) && defined(GIMSK) && defined(GIMSK)
MCUCR = (MCUCR & ~((1 << ISC20) | (1 << ISC21))) | (mode << ISC20);
GIMSK |= (1 << INT2);
#endif
break;
#endif
}
}
}
void detachInterrupt(uint8_t interruptNum) {
if(interruptNum < EXTERNAL_NUM_INTERRUPTS) {
// Disable the interrupt. (We can't assume that interruptNum is equal
// to the number of the EIMSK bit to clear, as this isn't true on the
// ATmega8. There, INT0 is 6 and INT1 is 7.)
switch (interruptNum) {
#if defined(__AVR_ATmega32U4__)
case 0:
EIMSK &= ~(1<<INT0);
break;
case 1:
EIMSK &= ~(1<<INT1);
break;
case 2:
EIMSK &= ~(1<<INT2);
break;
case 3:
EIMSK &= ~(1<<INT3);
break;
#elif defined(EICRA) && defined(EICRB) && defined(EIMSK)
case 2:
EIMSK &= ~(1 << INT0);
break;
case 3:
EIMSK &= ~(1 << INT1);
break;
case 4:
EIMSK &= ~(1 << INT2);
break;
case 5:
EIMSK &= ~(1 << INT3);
break;
case 0:
EIMSK &= ~(1 << INT4);
break;
case 1:
EIMSK &= ~(1 << INT5);
break;
case 6:
EIMSK &= ~(1 << INT6);
break;
case 7:
EIMSK &= ~(1 << INT7);
break;
#else
case 0:
#if defined(EIMSK) && defined(INT0)
EIMSK &= ~(1 << INT0);
#elif defined(GICR) && defined(ISC00)
GICR &= ~(1 << INT0); // atmega32
#elif defined(GIMSK) && defined(INT0)
GIMSK &= ~(1 << INT0);
#else
#error detachInterrupt not finished for this cpu
#endif
break;
case 1:
#if defined(EIMSK) && defined(INT1)
EIMSK &= ~(1 << INT1);
#elif defined(GICR) && defined(INT1)
GICR &= ~(1 << INT1); // atmega32
#elif defined(GIMSK) && defined(INT1)
GIMSK &= ~(1 << INT1);
#else
#warning detachInterrupt may need some more work for this cpu (case 1)
#endif
break;
#endif
}
intFunc[interruptNum] = 0;
}
}
/*
void attachInterruptTwi(void (*userFunc)(void) ) {
twiIntFunc = userFunc;
}
*/
#if defined(__AVR_ATmega32U4__)
SIGNAL(INT0_vect) {
if(intFunc[EXTERNAL_INT_0])
intFunc[EXTERNAL_INT_0]();
}
SIGNAL(INT1_vect) {
if(intFunc[EXTERNAL_INT_1])
intFunc[EXTERNAL_INT_1]();
}
SIGNAL(INT2_vect) {
if(intFunc[EXTERNAL_INT_2])
intFunc[EXTERNAL_INT_2]();
}
SIGNAL(INT3_vect) {
if(intFunc[EXTERNAL_INT_3])
intFunc[EXTERNAL_INT_3]();
}
#elif defined(EICRA) && defined(EICRB)
SIGNAL(INT0_vect) {
if(intFunc[EXTERNAL_INT_2])
intFunc[EXTERNAL_INT_2]();
}
SIGNAL(INT1_vect) {
if(intFunc[EXTERNAL_INT_3])
intFunc[EXTERNAL_INT_3]();
}
SIGNAL(INT2_vect) {
if(intFunc[EXTERNAL_INT_4])
intFunc[EXTERNAL_INT_4]();
}
SIGNAL(INT3_vect) {
if(intFunc[EXTERNAL_INT_5])
intFunc[EXTERNAL_INT_5]();
}
SIGNAL(INT4_vect) {
if(intFunc[EXTERNAL_INT_0])
intFunc[EXTERNAL_INT_0]();
}
SIGNAL(INT5_vect) {
if(intFunc[EXTERNAL_INT_1])
intFunc[EXTERNAL_INT_1]();
}
SIGNAL(INT6_vect) {
if(intFunc[EXTERNAL_INT_6])
intFunc[EXTERNAL_INT_6]();
}
SIGNAL(INT7_vect) {
if(intFunc[EXTERNAL_INT_7])
intFunc[EXTERNAL_INT_7]();
}
#else
SIGNAL(INT0_vect) {
if(intFunc[EXTERNAL_INT_0])
intFunc[EXTERNAL_INT_0]();
}
SIGNAL(INT1_vect) {
if(intFunc[EXTERNAL_INT_1])
intFunc[EXTERNAL_INT_1]();
}
#if defined(EICRA) && defined(ISC20)
SIGNAL(INT2_vect) {
if(intFunc[EXTERNAL_INT_2])
intFunc[EXTERNAL_INT_2]();
}
#endif
#endif
/*
SIGNAL(SIG_2WIRE_SERIAL) {
if(twiIntFunc)
twiIntFunc();
}
*/

View File

@@ -1,60 +0,0 @@
/* -*- mode: jde; c-basic-offset: 2; indent-tabs-mode: nil -*- */
/*
Part of the Wiring project - http://wiring.org.co
Copyright (c) 2004-06 Hernando Barragan
Modified 13 August 2006, David A. Mellis for Arduino - http://www.arduino.cc/
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General
Public License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA
$Id$
*/
extern "C" {
#include "stdlib.h"
}
void randomSeed(unsigned int seed)
{
if (seed != 0) {
srandom(seed);
}
}
long random(long howbig)
{
if (howbig == 0) {
return 0;
}
return random() % howbig;
}
long random(long howsmall, long howbig)
{
if (howsmall >= howbig) {
return howsmall;
}
long diff = howbig - howsmall;
return random(diff) + howsmall;
}
long map(long x, long in_min, long in_max, long out_min, long out_max)
{
return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
}
unsigned int makeWord(unsigned int w) { return w; }
unsigned int makeWord(unsigned char h, unsigned char l) { return (h << 8) | l; }

View File

@@ -1,645 +0,0 @@
/*
WString.cpp - String library for Wiring & Arduino
...mostly rewritten by Paul Stoffregen...
Copyright (c) 2009-10 Hernando Barragan. All rights reserved.
Copyright 2011, Paul Stoffregen, paul@pjrc.com
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "WString.h"
/*********************************************/
/* Constructors */
/*********************************************/
String::String(const char *cstr)
{
init();
if (cstr) copy(cstr, strlen(cstr));
}
String::String(const String &value)
{
init();
*this = value;
}
#ifdef __GXX_EXPERIMENTAL_CXX0X__
String::String(String &&rval)
{
init();
move(rval);
}
String::String(StringSumHelper &&rval)
{
init();
move(rval);
}
#endif
String::String(char c)
{
init();
char buf[2];
buf[0] = c;
buf[1] = 0;
*this = buf;
}
String::String(unsigned char value, unsigned char base)
{
init();
char buf[9];
utoa(value, buf, base);
*this = buf;
}
String::String(int value, unsigned char base)
{
init();
char buf[18];
itoa(value, buf, base);
*this = buf;
}
String::String(unsigned int value, unsigned char base)
{
init();
char buf[17];
utoa(value, buf, base);
*this = buf;
}
String::String(long value, unsigned char base)
{
init();
char buf[34];
ltoa(value, buf, base);
*this = buf;
}
String::String(unsigned long value, unsigned char base)
{
init();
char buf[33];
ultoa(value, buf, base);
*this = buf;
}
String::~String()
{
free(buffer);
}
/*********************************************/
/* Memory Management */
/*********************************************/
inline void String::init(void)
{
buffer = NULL;
capacity = 0;
len = 0;
flags = 0;
}
void String::invalidate(void)
{
if (buffer) free(buffer);
buffer = NULL;
capacity = len = 0;
}
unsigned char String::reserve(unsigned int size)
{
if (buffer && capacity >= size) return 1;
if (changeBuffer(size)) {
if (len == 0) buffer[0] = 0;
return 1;
}
return 0;
}
unsigned char String::changeBuffer(unsigned int maxStrLen)
{
char *newbuffer = (char *)realloc(buffer, maxStrLen + 1);
if (newbuffer) {
buffer = newbuffer;
capacity = maxStrLen;
return 1;
}
return 0;
}
/*********************************************/
/* Copy and Move */
/*********************************************/
String & String::copy(const char *cstr, unsigned int length)
{
if (!reserve(length)) {
invalidate();
return *this;
}
len = length;
strcpy(buffer, cstr);
return *this;
}
#ifdef __GXX_EXPERIMENTAL_CXX0X__
void String::move(String &rhs)
{
if (buffer) {
if (capacity >= rhs.len) {
strcpy(buffer, rhs.buffer);
len = rhs.len;
rhs.len = 0;
return;
} else {
free(buffer);
}
}
buffer = rhs.buffer;
capacity = rhs.capacity;
len = rhs.len;
rhs.buffer = NULL;
rhs.capacity = 0;
rhs.len = 0;
}
#endif
String & String::operator = (const String &rhs)
{
if (this == &rhs) return *this;
if (rhs.buffer) copy(rhs.buffer, rhs.len);
else invalidate();
return *this;
}
#ifdef __GXX_EXPERIMENTAL_CXX0X__
String & String::operator = (String &&rval)
{
if (this != &rval) move(rval);
return *this;
}
String & String::operator = (StringSumHelper &&rval)
{
if (this != &rval) move(rval);
return *this;
}
#endif
String & String::operator = (const char *cstr)
{
if (cstr) copy(cstr, strlen(cstr));
else invalidate();
return *this;
}
/*********************************************/
/* concat */
/*********************************************/
unsigned char String::concat(const String &s)
{
return concat(s.buffer, s.len);
}
unsigned char String::concat(const char *cstr, unsigned int length)
{
unsigned int newlen = len + length;
if (!cstr) return 0;
if (length == 0) return 1;
if (!reserve(newlen)) return 0;
strcpy(buffer + len, cstr);
len = newlen;
return 1;
}
unsigned char String::concat(const char *cstr)
{
if (!cstr) return 0;
return concat(cstr, strlen(cstr));
}
unsigned char String::concat(char c)
{
char buf[2];
buf[0] = c;
buf[1] = 0;
return concat(buf, 1);
}
unsigned char String::concat(unsigned char num)
{
char buf[4];
itoa(num, buf, 10);
return concat(buf, strlen(buf));
}
unsigned char String::concat(int num)
{
char buf[7];
itoa(num, buf, 10);
return concat(buf, strlen(buf));
}
unsigned char String::concat(unsigned int num)
{
char buf[6];
utoa(num, buf, 10);
return concat(buf, strlen(buf));
}
unsigned char String::concat(long num)
{
char buf[12];
ltoa(num, buf, 10);
return concat(buf, strlen(buf));
}
unsigned char String::concat(unsigned long num)
{
char buf[11];
ultoa(num, buf, 10);
return concat(buf, strlen(buf));
}
/*********************************************/
/* Concatenate */
/*********************************************/
StringSumHelper & operator + (const StringSumHelper &lhs, const String &rhs)
{
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
if (!a.concat(rhs.buffer, rhs.len)) a.invalidate();
return a;
}
StringSumHelper & operator + (const StringSumHelper &lhs, const char *cstr)
{
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
if (!cstr || !a.concat(cstr, strlen(cstr))) a.invalidate();
return a;
}
StringSumHelper & operator + (const StringSumHelper &lhs, char c)
{
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
if (!a.concat(c)) a.invalidate();
return a;
}
StringSumHelper & operator + (const StringSumHelper &lhs, unsigned char num)
{
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
if (!a.concat(num)) a.invalidate();
return a;
}
StringSumHelper & operator + (const StringSumHelper &lhs, int num)
{
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
if (!a.concat(num)) a.invalidate();
return a;
}
StringSumHelper & operator + (const StringSumHelper &lhs, unsigned int num)
{
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
if (!a.concat(num)) a.invalidate();
return a;
}
StringSumHelper & operator + (const StringSumHelper &lhs, long num)
{
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
if (!a.concat(num)) a.invalidate();
return a;
}
StringSumHelper & operator + (const StringSumHelper &lhs, unsigned long num)
{
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
if (!a.concat(num)) a.invalidate();
return a;
}
/*********************************************/
/* Comparison */
/*********************************************/
int String::compareTo(const String &s) const
{
if (!buffer || !s.buffer) {
if (s.buffer && s.len > 0) return 0 - *(unsigned char *)s.buffer;
if (buffer && len > 0) return *(unsigned char *)buffer;
return 0;
}
return strcmp(buffer, s.buffer);
}
unsigned char String::equals(const String &s2) const
{
return (len == s2.len && compareTo(s2) == 0);
}
unsigned char String::equals(const char *cstr) const
{
if (len == 0) return (cstr == NULL || *cstr == 0);
if (cstr == NULL) return buffer[0] == 0;
return strcmp(buffer, cstr) == 0;
}
unsigned char String::operator<(const String &rhs) const
{
return compareTo(rhs) < 0;
}
unsigned char String::operator>(const String &rhs) const
{
return compareTo(rhs) > 0;
}
unsigned char String::operator<=(const String &rhs) const
{
return compareTo(rhs) <= 0;
}
unsigned char String::operator>=(const String &rhs) const
{
return compareTo(rhs) >= 0;
}
unsigned char String::equalsIgnoreCase( const String &s2 ) const
{
if (this == &s2) return 1;
if (len != s2.len) return 0;
if (len == 0) return 1;
const char *p1 = buffer;
const char *p2 = s2.buffer;
while (*p1) {
if (tolower(*p1++) != tolower(*p2++)) return 0;
}
return 1;
}
unsigned char String::startsWith( const String &s2 ) const
{
if (len < s2.len) return 0;
return startsWith(s2, 0);
}
unsigned char String::startsWith( const String &s2, unsigned int offset ) const
{
if (offset > len - s2.len || !buffer || !s2.buffer) return 0;
return strncmp( &buffer[offset], s2.buffer, s2.len ) == 0;
}
unsigned char String::endsWith( const String &s2 ) const
{
if ( len < s2.len || !buffer || !s2.buffer) return 0;
return strcmp(&buffer[len - s2.len], s2.buffer) == 0;
}
/*********************************************/
/* Character Access */
/*********************************************/
char String::charAt(unsigned int loc) const
{
return operator[](loc);
}
void String::setCharAt(unsigned int loc, char c)
{
if (loc < len) buffer[loc] = c;
}
char & String::operator[](unsigned int index)
{
static char dummy_writable_char;
if (index >= len || !buffer) {
dummy_writable_char = 0;
return dummy_writable_char;
}
return buffer[index];
}
char String::operator[]( unsigned int index ) const
{
if (index >= len || !buffer) return 0;
return buffer[index];
}
void String::getBytes(unsigned char *buf, unsigned int bufsize, unsigned int index) const
{
if (!bufsize || !buf) return;
if (index >= len) {
buf[0] = 0;
return;
}
unsigned int n = bufsize - 1;
if (n > len - index) n = len - index;
strncpy((char *)buf, buffer + index, n);
buf[n] = 0;
}
/*********************************************/
/* Search */
/*********************************************/
int String::indexOf(char c) const
{
return indexOf(c, 0);
}
int String::indexOf( char ch, unsigned int fromIndex ) const
{
if (fromIndex >= len) return -1;
const char* temp = strchr(buffer + fromIndex, ch);
if (temp == NULL) return -1;
return temp - buffer;
}
int String::indexOf(const String &s2) const
{
return indexOf(s2, 0);
}
int String::indexOf(const String &s2, unsigned int fromIndex) const
{
if (fromIndex >= len) return -1;
const char *found = strstr(buffer + fromIndex, s2.buffer);
if (found == NULL) return -1;
return found - buffer;
}
int String::lastIndexOf( char theChar ) const
{
return lastIndexOf(theChar, len - 1);
}
int String::lastIndexOf(char ch, unsigned int fromIndex) const
{
if (fromIndex >= len) return -1;
char tempchar = buffer[fromIndex + 1];
buffer[fromIndex + 1] = '\0';
char* temp = strrchr( buffer, ch );
buffer[fromIndex + 1] = tempchar;
if (temp == NULL) return -1;
return temp - buffer;
}
int String::lastIndexOf(const String &s2) const
{
return lastIndexOf(s2, len - s2.len);
}
int String::lastIndexOf(const String &s2, unsigned int fromIndex) const
{
if (s2.len == 0 || len == 0 || s2.len > len) return -1;
if (fromIndex >= len) fromIndex = len - 1;
int found = -1;
for (char *p = buffer; p <= buffer + fromIndex; p++) {
p = strstr(p, s2.buffer);
if (!p) break;
if ((unsigned int)(p - buffer) <= fromIndex) found = p - buffer;
}
return found;
}
String String::substring( unsigned int left ) const
{
return substring(left, len);
}
String String::substring(unsigned int left, unsigned int right) const
{
if (left > right) {
unsigned int temp = right;
right = left;
left = temp;
}
String out;
if (left > len) return out;
if (right > len) right = len;
char temp = buffer[right]; // save the replaced character
buffer[right] = '\0';
out = buffer + left; // pointer arithmetic
buffer[right] = temp; //restore character
return out;
}
/*********************************************/
/* Modification */
/*********************************************/
void String::replace(char find, char replace)
{
if (!buffer) return;
for (char *p = buffer; *p; p++) {
if (*p == find) *p = replace;
}
}
void String::replace(const String& find, const String& replace)
{
if (len == 0 || find.len == 0) return;
int diff = replace.len - find.len;
char *readFrom = buffer;
char *foundAt;
if (diff == 0) {
while ((foundAt = strstr(readFrom, find.buffer)) != NULL) {
memcpy(foundAt, replace.buffer, replace.len);
readFrom = foundAt + replace.len;
}
} else if (diff < 0) {
char *writeTo = buffer;
while ((foundAt = strstr(readFrom, find.buffer)) != NULL) {
unsigned int n = foundAt - readFrom;
memcpy(writeTo, readFrom, n);
writeTo += n;
memcpy(writeTo, replace.buffer, replace.len);
writeTo += replace.len;
readFrom = foundAt + find.len;
len += diff;
}
strcpy(writeTo, readFrom);
} else {
unsigned int size = len; // compute size needed for result
while ((foundAt = strstr(readFrom, find.buffer)) != NULL) {
readFrom = foundAt + find.len;
size += diff;
}
if (size == len) return;
if (size > capacity && !changeBuffer(size)) return; // XXX: tell user!
int index = len - 1;
while (index >= 0 && (index = lastIndexOf(find, index)) >= 0) {
readFrom = buffer + index + find.len;
memmove(readFrom + diff, readFrom, len - (readFrom - buffer));
len += diff;
buffer[len] = 0;
memcpy(buffer + index, replace.buffer, replace.len);
index--;
}
}
}
void String::toLowerCase(void)
{
if (!buffer) return;
for (char *p = buffer; *p; p++) {
*p = tolower(*p);
}
}
void String::toUpperCase(void)
{
if (!buffer) return;
for (char *p = buffer; *p; p++) {
*p = toupper(*p);
}
}
void String::trim(void)
{
if (!buffer || len == 0) return;
char *begin = buffer;
while (isspace(*begin)) begin++;
char *end = buffer + len - 1;
while (isspace(*end) && end >= begin) end--;
len = end + 1 - begin;
if (begin > buffer) memcpy(buffer, begin, len);
buffer[len] = 0;
}
/*********************************************/
/* Parsing / Conversion */
/*********************************************/
long String::toInt(void) const
{
if (buffer) return atol(buffer);
return 0;
}

View File

@@ -1,205 +0,0 @@
/*
WString.h - String library for Wiring & Arduino
...mostly rewritten by Paul Stoffregen...
Copyright (c) 2009-10 Hernando Barragan. All right reserved.
Copyright 2011, Paul Stoffregen, paul@pjrc.com
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef String_class_h
#define String_class_h
#ifdef __cplusplus
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <avr/pgmspace.h>
// When compiling programs with this class, the following gcc parameters
// dramatically increase performance and memory (RAM) efficiency, typically
// with little or no increase in code size.
// -felide-constructors
// -std=c++0x
class __FlashStringHelper;
#define F(string_literal) (reinterpret_cast<const __FlashStringHelper *>(PSTR(string_literal)))
// An inherited class for holding the result of a concatenation. These
// result objects are assumed to be writable by subsequent concatenations.
class StringSumHelper;
// The string class
class String
{
// use a function pointer to allow for "if (s)" without the
// complications of an operator bool(). for more information, see:
// http://www.artima.com/cppsource/safebool.html
typedef void (String::*StringIfHelperType)() const;
void StringIfHelper() const {}
public:
// constructors
// creates a copy of the initial value.
// if the initial value is null or invalid, or if memory allocation
// fails, the string will be marked as invalid (i.e. "if (s)" will
// be false).
String(const char *cstr = "");
String(const String &str);
#ifdef __GXX_EXPERIMENTAL_CXX0X__
String(String &&rval);
String(StringSumHelper &&rval);
#endif
explicit String(char c);
explicit String(unsigned char, unsigned char base=10);
explicit String(int, unsigned char base=10);
explicit String(unsigned int, unsigned char base=10);
explicit String(long, unsigned char base=10);
explicit String(unsigned long, unsigned char base=10);
~String(void);
// memory management
// return true on success, false on failure (in which case, the string
// is left unchanged). reserve(0), if successful, will validate an
// invalid string (i.e., "if (s)" will be true afterwards)
unsigned char reserve(unsigned int size);
inline unsigned int length(void) const {return len;}
// creates a copy of the assigned value. if the value is null or
// invalid, or if the memory allocation fails, the string will be
// marked as invalid ("if (s)" will be false).
String & operator = (const String &rhs);
String & operator = (const char *cstr);
#ifdef __GXX_EXPERIMENTAL_CXX0X__
String & operator = (String &&rval);
String & operator = (StringSumHelper &&rval);
#endif
// concatenate (works w/ built-in types)
// returns true on success, false on failure (in which case, the string
// is left unchanged). if the argument is null or invalid, the
// concatenation is considered unsucessful.
unsigned char concat(const String &str);
unsigned char concat(const char *cstr);
unsigned char concat(char c);
unsigned char concat(unsigned char c);
unsigned char concat(int num);
unsigned char concat(unsigned int num);
unsigned char concat(long num);
unsigned char concat(unsigned long num);
// if there's not enough memory for the concatenated value, the string
// will be left unchanged (but this isn't signalled in any way)
String & operator += (const String &rhs) {concat(rhs); return (*this);}
String & operator += (const char *cstr) {concat(cstr); return (*this);}
String & operator += (char c) {concat(c); return (*this);}
String & operator += (unsigned char num) {concat(num); return (*this);}
String & operator += (int num) {concat(num); return (*this);}
String & operator += (unsigned int num) {concat(num); return (*this);}
String & operator += (long num) {concat(num); return (*this);}
String & operator += (unsigned long num) {concat(num); return (*this);}
friend StringSumHelper & operator + (const StringSumHelper &lhs, const String &rhs);
friend StringSumHelper & operator + (const StringSumHelper &lhs, const char *cstr);
friend StringSumHelper & operator + (const StringSumHelper &lhs, char c);
friend StringSumHelper & operator + (const StringSumHelper &lhs, unsigned char num);
friend StringSumHelper & operator + (const StringSumHelper &lhs, int num);
friend StringSumHelper & operator + (const StringSumHelper &lhs, unsigned int num);
friend StringSumHelper & operator + (const StringSumHelper &lhs, long num);
friend StringSumHelper & operator + (const StringSumHelper &lhs, unsigned long num);
// comparison (only works w/ Strings and "strings")
operator StringIfHelperType() const { return buffer ? &String::StringIfHelper : 0; }
int compareTo(const String &s) const;
unsigned char equals(const String &s) const;
unsigned char equals(const char *cstr) const;
unsigned char operator == (const String &rhs) const {return equals(rhs);}
unsigned char operator == (const char *cstr) const {return equals(cstr);}
unsigned char operator != (const String &rhs) const {return !equals(rhs);}
unsigned char operator != (const char *cstr) const {return !equals(cstr);}
unsigned char operator < (const String &rhs) const;
unsigned char operator > (const String &rhs) const;
unsigned char operator <= (const String &rhs) const;
unsigned char operator >= (const String &rhs) const;
unsigned char equalsIgnoreCase(const String &s) const;
unsigned char startsWith( const String &prefix) const;
unsigned char startsWith(const String &prefix, unsigned int offset) const;
unsigned char endsWith(const String &suffix) const;
// character acccess
char charAt(unsigned int index) const;
void setCharAt(unsigned int index, char c);
char operator [] (unsigned int index) const;
char& operator [] (unsigned int index);
void getBytes(unsigned char *buf, unsigned int bufsize, unsigned int index=0) const;
void toCharArray(char *buf, unsigned int bufsize, unsigned int index=0) const
{getBytes((unsigned char *)buf, bufsize, index);}
// search
int indexOf( char ch ) const;
int indexOf( char ch, unsigned int fromIndex ) const;
int indexOf( const String &str ) const;
int indexOf( const String &str, unsigned int fromIndex ) const;
int lastIndexOf( char ch ) const;
int lastIndexOf( char ch, unsigned int fromIndex ) const;
int lastIndexOf( const String &str ) const;
int lastIndexOf( const String &str, unsigned int fromIndex ) const;
String substring( unsigned int beginIndex ) const;
String substring( unsigned int beginIndex, unsigned int endIndex ) const;
// modification
void replace(char find, char replace);
void replace(const String& find, const String& replace);
void toLowerCase(void);
void toUpperCase(void);
void trim(void);
// parsing/conversion
long toInt(void) const;
protected:
char *buffer; // the actual char array
unsigned int capacity; // the array length minus one (for the '\0')
unsigned int len; // the String length (not counting the '\0')
unsigned char flags; // unused, for future features
protected:
void init(void);
void invalidate(void);
unsigned char changeBuffer(unsigned int maxStrLen);
unsigned char concat(const char *cstr, unsigned int length);
// copy and move
String & copy(const char *cstr, unsigned int length);
#ifdef __GXX_EXPERIMENTAL_CXX0X__
void move(String &rhs);
#endif
};
class StringSumHelper : public String
{
public:
StringSumHelper(const String &s) : String(s) {}
StringSumHelper(const char *p) : String(p) {}
StringSumHelper(char c) : String(c) {}
StringSumHelper(unsigned char num) : String(num) {}
StringSumHelper(int num) : String(num) {}
StringSumHelper(unsigned int num) : String(num) {}
StringSumHelper(long num) : String(num) {}
StringSumHelper(unsigned long num) : String(num) {}
};
#endif // __cplusplus
#endif // String_class_h

View File

@@ -1,515 +0,0 @@
#ifndef Binary_h
#define Binary_h
#define B0 0
#define B00 0
#define B000 0
#define B0000 0
#define B00000 0
#define B000000 0
#define B0000000 0
#define B00000000 0
#define B1 1
#define B01 1
#define B001 1
#define B0001 1
#define B00001 1
#define B000001 1
#define B0000001 1
#define B00000001 1
#define B10 2
#define B010 2
#define B0010 2
#define B00010 2
#define B000010 2
#define B0000010 2
#define B00000010 2
#define B11 3
#define B011 3
#define B0011 3
#define B00011 3
#define B000011 3
#define B0000011 3
#define B00000011 3
#define B100 4
#define B0100 4
#define B00100 4
#define B000100 4
#define B0000100 4
#define B00000100 4
#define B101 5
#define B0101 5
#define B00101 5
#define B000101 5
#define B0000101 5
#define B00000101 5
#define B110 6
#define B0110 6
#define B00110 6
#define B000110 6
#define B0000110 6
#define B00000110 6
#define B111 7
#define B0111 7
#define B00111 7
#define B000111 7
#define B0000111 7
#define B00000111 7
#define B1000 8
#define B01000 8
#define B001000 8
#define B0001000 8
#define B00001000 8
#define B1001 9
#define B01001 9
#define B001001 9
#define B0001001 9
#define B00001001 9
#define B1010 10
#define B01010 10
#define B001010 10
#define B0001010 10
#define B00001010 10
#define B1011 11
#define B01011 11
#define B001011 11
#define B0001011 11
#define B00001011 11
#define B1100 12
#define B01100 12
#define B001100 12
#define B0001100 12
#define B00001100 12
#define B1101 13
#define B01101 13
#define B001101 13
#define B0001101 13
#define B00001101 13
#define B1110 14
#define B01110 14
#define B001110 14
#define B0001110 14
#define B00001110 14
#define B1111 15
#define B01111 15
#define B001111 15
#define B0001111 15
#define B00001111 15
#define B10000 16
#define B010000 16
#define B0010000 16
#define B00010000 16
#define B10001 17
#define B010001 17
#define B0010001 17
#define B00010001 17
#define B10010 18
#define B010010 18
#define B0010010 18
#define B00010010 18
#define B10011 19
#define B010011 19
#define B0010011 19
#define B00010011 19
#define B10100 20
#define B010100 20
#define B0010100 20
#define B00010100 20
#define B10101 21
#define B010101 21
#define B0010101 21
#define B00010101 21
#define B10110 22
#define B010110 22
#define B0010110 22
#define B00010110 22
#define B10111 23
#define B010111 23
#define B0010111 23
#define B00010111 23
#define B11000 24
#define B011000 24
#define B0011000 24
#define B00011000 24
#define B11001 25
#define B011001 25
#define B0011001 25
#define B00011001 25
#define B11010 26
#define B011010 26
#define B0011010 26
#define B00011010 26
#define B11011 27
#define B011011 27
#define B0011011 27
#define B00011011 27
#define B11100 28
#define B011100 28
#define B0011100 28
#define B00011100 28
#define B11101 29
#define B011101 29
#define B0011101 29
#define B00011101 29
#define B11110 30
#define B011110 30
#define B0011110 30
#define B00011110 30
#define B11111 31
#define B011111 31
#define B0011111 31
#define B00011111 31
#define B100000 32
#define B0100000 32
#define B00100000 32
#define B100001 33
#define B0100001 33
#define B00100001 33
#define B100010 34
#define B0100010 34
#define B00100010 34
#define B100011 35
#define B0100011 35
#define B00100011 35
#define B100100 36
#define B0100100 36
#define B00100100 36
#define B100101 37
#define B0100101 37
#define B00100101 37
#define B100110 38
#define B0100110 38
#define B00100110 38
#define B100111 39
#define B0100111 39
#define B00100111 39
#define B101000 40
#define B0101000 40
#define B00101000 40
#define B101001 41
#define B0101001 41
#define B00101001 41
#define B101010 42
#define B0101010 42
#define B00101010 42
#define B101011 43
#define B0101011 43
#define B00101011 43
#define B101100 44
#define B0101100 44
#define B00101100 44
#define B101101 45
#define B0101101 45
#define B00101101 45
#define B101110 46
#define B0101110 46
#define B00101110 46
#define B101111 47
#define B0101111 47
#define B00101111 47
#define B110000 48
#define B0110000 48
#define B00110000 48
#define B110001 49
#define B0110001 49
#define B00110001 49
#define B110010 50
#define B0110010 50
#define B00110010 50
#define B110011 51
#define B0110011 51
#define B00110011 51
#define B110100 52
#define B0110100 52
#define B00110100 52
#define B110101 53
#define B0110101 53
#define B00110101 53
#define B110110 54
#define B0110110 54
#define B00110110 54
#define B110111 55
#define B0110111 55
#define B00110111 55
#define B111000 56
#define B0111000 56
#define B00111000 56
#define B111001 57
#define B0111001 57
#define B00111001 57
#define B111010 58
#define B0111010 58
#define B00111010 58
#define B111011 59
#define B0111011 59
#define B00111011 59
#define B111100 60
#define B0111100 60
#define B00111100 60
#define B111101 61
#define B0111101 61
#define B00111101 61
#define B111110 62
#define B0111110 62
#define B00111110 62
#define B111111 63
#define B0111111 63
#define B00111111 63
#define B1000000 64
#define B01000000 64
#define B1000001 65
#define B01000001 65
#define B1000010 66
#define B01000010 66
#define B1000011 67
#define B01000011 67
#define B1000100 68
#define B01000100 68
#define B1000101 69
#define B01000101 69
#define B1000110 70
#define B01000110 70
#define B1000111 71
#define B01000111 71
#define B1001000 72
#define B01001000 72
#define B1001001 73
#define B01001001 73
#define B1001010 74
#define B01001010 74
#define B1001011 75
#define B01001011 75
#define B1001100 76
#define B01001100 76
#define B1001101 77
#define B01001101 77
#define B1001110 78
#define B01001110 78
#define B1001111 79
#define B01001111 79
#define B1010000 80
#define B01010000 80
#define B1010001 81
#define B01010001 81
#define B1010010 82
#define B01010010 82
#define B1010011 83
#define B01010011 83
#define B1010100 84
#define B01010100 84
#define B1010101 85
#define B01010101 85
#define B1010110 86
#define B01010110 86
#define B1010111 87
#define B01010111 87
#define B1011000 88
#define B01011000 88
#define B1011001 89
#define B01011001 89
#define B1011010 90
#define B01011010 90
#define B1011011 91
#define B01011011 91
#define B1011100 92
#define B01011100 92
#define B1011101 93
#define B01011101 93
#define B1011110 94
#define B01011110 94
#define B1011111 95
#define B01011111 95
#define B1100000 96
#define B01100000 96
#define B1100001 97
#define B01100001 97
#define B1100010 98
#define B01100010 98
#define B1100011 99
#define B01100011 99
#define B1100100 100
#define B01100100 100
#define B1100101 101
#define B01100101 101
#define B1100110 102
#define B01100110 102
#define B1100111 103
#define B01100111 103
#define B1101000 104
#define B01101000 104
#define B1101001 105
#define B01101001 105
#define B1101010 106
#define B01101010 106
#define B1101011 107
#define B01101011 107
#define B1101100 108
#define B01101100 108
#define B1101101 109
#define B01101101 109
#define B1101110 110
#define B01101110 110
#define B1101111 111
#define B01101111 111
#define B1110000 112
#define B01110000 112
#define B1110001 113
#define B01110001 113
#define B1110010 114
#define B01110010 114
#define B1110011 115
#define B01110011 115
#define B1110100 116
#define B01110100 116
#define B1110101 117
#define B01110101 117
#define B1110110 118
#define B01110110 118
#define B1110111 119
#define B01110111 119
#define B1111000 120
#define B01111000 120
#define B1111001 121
#define B01111001 121
#define B1111010 122
#define B01111010 122
#define B1111011 123
#define B01111011 123
#define B1111100 124
#define B01111100 124
#define B1111101 125
#define B01111101 125
#define B1111110 126
#define B01111110 126
#define B1111111 127
#define B01111111 127
#define B10000000 128
#define B10000001 129
#define B10000010 130
#define B10000011 131
#define B10000100 132
#define B10000101 133
#define B10000110 134
#define B10000111 135
#define B10001000 136
#define B10001001 137
#define B10001010 138
#define B10001011 139
#define B10001100 140
#define B10001101 141
#define B10001110 142
#define B10001111 143
#define B10010000 144
#define B10010001 145
#define B10010010 146
#define B10010011 147
#define B10010100 148
#define B10010101 149
#define B10010110 150
#define B10010111 151
#define B10011000 152
#define B10011001 153
#define B10011010 154
#define B10011011 155
#define B10011100 156
#define B10011101 157
#define B10011110 158
#define B10011111 159
#define B10100000 160
#define B10100001 161
#define B10100010 162
#define B10100011 163
#define B10100100 164
#define B10100101 165
#define B10100110 166
#define B10100111 167
#define B10101000 168
#define B10101001 169
#define B10101010 170
#define B10101011 171
#define B10101100 172
#define B10101101 173
#define B10101110 174
#define B10101111 175
#define B10110000 176
#define B10110001 177
#define B10110010 178
#define B10110011 179
#define B10110100 180
#define B10110101 181
#define B10110110 182
#define B10110111 183
#define B10111000 184
#define B10111001 185
#define B10111010 186
#define B10111011 187
#define B10111100 188
#define B10111101 189
#define B10111110 190
#define B10111111 191
#define B11000000 192
#define B11000001 193
#define B11000010 194
#define B11000011 195
#define B11000100 196
#define B11000101 197
#define B11000110 198
#define B11000111 199
#define B11001000 200
#define B11001001 201
#define B11001010 202
#define B11001011 203
#define B11001100 204
#define B11001101 205
#define B11001110 206
#define B11001111 207
#define B11010000 208
#define B11010001 209
#define B11010010 210
#define B11010011 211
#define B11010100 212
#define B11010101 213
#define B11010110 214
#define B11010111 215
#define B11011000 216
#define B11011001 217
#define B11011010 218
#define B11011011 219
#define B11011100 220
#define B11011101 221
#define B11011110 222
#define B11011111 223
#define B11100000 224
#define B11100001 225
#define B11100010 226
#define B11100011 227
#define B11100100 228
#define B11100101 229
#define B11100110 230
#define B11100111 231
#define B11101000 232
#define B11101001 233
#define B11101010 234
#define B11101011 235
#define B11101100 236
#define B11101101 237
#define B11101110 238
#define B11101111 239
#define B11110000 240
#define B11110001 241
#define B11110010 242
#define B11110011 243
#define B11110100 244
#define B11110101 245
#define B11110110 246
#define B11110111 247
#define B11111000 248
#define B11111001 249
#define B11111010 250
#define B11111011 251
#define B11111100 252
#define B11111101 253
#define B11111110 254
#define B11111111 255
#endif

View File

@@ -1,20 +0,0 @@
#include <Arduino.h>
int main(void)
{
init();
#if defined(USBCON)
USBDevice.attach();
#endif
setup();
for (;;) {
loop();
if (serialEventRun) serialEventRun();
}
return 0;
}

View File

@@ -1,18 +0,0 @@
#include <new.h>
void * operator new(size_t size)
{
return malloc(size);
}
void operator delete(void * ptr)
{
free(ptr);
}
int __cxa_guard_acquire(__guard *g) {return !*(char *)(g);};
void __cxa_guard_release (__guard *g) {*(char *)g = 1;};
void __cxa_guard_abort (__guard *) {};
void __cxa_pure_virtual(void) {};

View File

@@ -1,22 +0,0 @@
/* Header to define new/delete operators as they aren't provided by avr-gcc by default
Taken from http://www.avrfreaks.net/index.php?name=PNphpBB2&file=viewtopic&t=59453
*/
#ifndef NEW_H
#define NEW_H
#include <stdlib.h>
void * operator new(size_t size);
void operator delete(void * ptr);
__extension__ typedef int __guard __attribute__((mode (__DI__)));
extern "C" int __cxa_guard_acquire(__guard *);
extern "C" void __cxa_guard_release (__guard *);
extern "C" void __cxa_guard_abort (__guard *);
extern "C" void __cxa_pure_virtual(void);
#endif

View File

@@ -1,324 +0,0 @@
/*
wiring.c - Partial implementation of the Wiring API for the ATmega8.
Part of Arduino - http://www.arduino.cc/
Copyright (c) 2005-2006 David A. Mellis
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General
Public License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA
$Id$
*/
#include "wiring_private.h"
// the prescaler is set so that timer0 ticks every 64 clock cycles, and the
// the overflow handler is called every 256 ticks.
#define MICROSECONDS_PER_TIMER0_OVERFLOW (clockCyclesToMicroseconds(64 * 256))
// the whole number of milliseconds per timer0 overflow
#define MILLIS_INC (MICROSECONDS_PER_TIMER0_OVERFLOW / 1000)
// the fractional number of milliseconds per timer0 overflow. we shift right
// by three to fit these numbers into a byte. (for the clock speeds we care
// about - 8 and 16 MHz - this doesn't lose precision.)
#define FRACT_INC ((MICROSECONDS_PER_TIMER0_OVERFLOW % 1000) >> 3)
#define FRACT_MAX (1000 >> 3)
volatile unsigned long timer0_overflow_count = 0;
volatile unsigned long timer0_millis = 0;
static unsigned char timer0_fract = 0;
#if defined(__AVR_ATtiny24__) || defined(__AVR_ATtiny44__) || defined(__AVR_ATtiny84__)
SIGNAL(TIM0_OVF_vect)
#else
SIGNAL(TIMER0_OVF_vect)
#endif
{
// copy these to local variables so they can be stored in registers
// (volatile variables must be read from memory on every access)
unsigned long m = timer0_millis;
unsigned char f = timer0_fract;
m += MILLIS_INC;
f += FRACT_INC;
if (f >= FRACT_MAX) {
f -= FRACT_MAX;
m += 1;
}
timer0_fract = f;
timer0_millis = m;
timer0_overflow_count++;
}
unsigned long millis()
{
unsigned long m;
uint8_t oldSREG = SREG;
// disable interrupts while we read timer0_millis or we might get an
// inconsistent value (e.g. in the middle of a write to timer0_millis)
cli();
m = timer0_millis;
SREG = oldSREG;
return m;
}
unsigned long micros() {
unsigned long m;
uint8_t oldSREG = SREG, t;
cli();
m = timer0_overflow_count;
#if defined(TCNT0)
t = TCNT0;
#elif defined(TCNT0L)
t = TCNT0L;
#else
#error TIMER 0 not defined
#endif
#ifdef TIFR0
if ((TIFR0 & _BV(TOV0)) && (t < 255))
m++;
#else
if ((TIFR & _BV(TOV0)) && (t < 255))
m++;
#endif
SREG = oldSREG;
return ((m << 8) + t) * (64 / clockCyclesPerMicrosecond());
}
void delay(unsigned long ms)
{
uint16_t start = (uint16_t)micros();
while (ms > 0) {
if (((uint16_t)micros() - start) >= 1000) {
ms--;
start += 1000;
}
}
}
/* Delay for the given number of microseconds. Assumes a 8 or 16 MHz clock. */
void delayMicroseconds(unsigned int us)
{
// calling avrlib's delay_us() function with low values (e.g. 1 or
// 2 microseconds) gives delays longer than desired.
//delay_us(us);
#if F_CPU >= 20000000L
// for the 20 MHz clock on rare Arduino boards
// for a one-microsecond delay, simply wait 2 cycle and return. The overhead
// of the function call yields a delay of exactly a one microsecond.
__asm__ __volatile__ (
"nop" "\n\t"
"nop"); //just waiting 2 cycle
if (--us == 0)
return;
// the following loop takes a 1/5 of a microsecond (4 cycles)
// per iteration, so execute it five times for each microsecond of
// delay requested.
us = (us<<2) + us; // x5 us
// account for the time taken in the preceeding commands.
us -= 2;
#elif F_CPU >= 16000000L
// for the 16 MHz clock on most Arduino boards
// for a one-microsecond delay, simply return. the overhead
// of the function call yields a delay of approximately 1 1/8 us.
if (--us == 0)
return;
// the following loop takes a quarter of a microsecond (4 cycles)
// per iteration, so execute it four times for each microsecond of
// delay requested.
us <<= 2;
// account for the time taken in the preceeding commands.
us -= 2;
#else
// for the 8 MHz internal clock on the ATmega168
// for a one- or two-microsecond delay, simply return. the overhead of
// the function calls takes more than two microseconds. can't just
// subtract two, since us is unsigned; we'd overflow.
if (--us == 0)
return;
if (--us == 0)
return;
// the following loop takes half of a microsecond (4 cycles)
// per iteration, so execute it twice for each microsecond of
// delay requested.
us <<= 1;
// partially compensate for the time taken by the preceeding commands.
// we can't subtract any more than this or we'd overflow w/ small delays.
us--;
#endif
// busy wait
__asm__ __volatile__ (
"1: sbiw %0,1" "\n\t" // 2 cycles
"brne 1b" : "=w" (us) : "0" (us) // 2 cycles
);
}
void init()
{
// this needs to be called before setup() or some functions won't
// work there
sei();
// on the ATmega168, timer 0 is also used for fast hardware pwm
// (using phase-correct PWM would mean that timer 0 overflowed half as often
// resulting in different millis() behavior on the ATmega8 and ATmega168)
#if defined(TCCR0A) && defined(WGM01)
sbi(TCCR0A, WGM01);
sbi(TCCR0A, WGM00);
#endif
// set timer 0 prescale factor to 64
#if defined(__AVR_ATmega128__)
// CPU specific: different values for the ATmega128
sbi(TCCR0, CS02);
#elif defined(TCCR0) && defined(CS01) && defined(CS00)
// this combination is for the standard atmega8
sbi(TCCR0, CS01);
sbi(TCCR0, CS00);
#elif defined(TCCR0B) && defined(CS01) && defined(CS00)
// this combination is for the standard 168/328/1280/2560
sbi(TCCR0B, CS01);
sbi(TCCR0B, CS00);
#elif defined(TCCR0A) && defined(CS01) && defined(CS00)
// this combination is for the __AVR_ATmega645__ series
sbi(TCCR0A, CS01);
sbi(TCCR0A, CS00);
#else
#error Timer 0 prescale factor 64 not set correctly
#endif
// enable timer 0 overflow interrupt
#if defined(TIMSK) && defined(TOIE0)
sbi(TIMSK, TOIE0);
#elif defined(TIMSK0) && defined(TOIE0)
sbi(TIMSK0, TOIE0);
#else
#error Timer 0 overflow interrupt not set correctly
#endif
// timers 1 and 2 are used for phase-correct hardware pwm
// this is better for motors as it ensures an even waveform
// note, however, that fast pwm mode can achieve a frequency of up
// 8 MHz (with a 16 MHz clock) at 50% duty cycle
#if defined(TCCR1B) && defined(CS11) && defined(CS10)
TCCR1B = 0;
// set timer 1 prescale factor to 64
sbi(TCCR1B, CS11);
#if F_CPU >= 8000000L
sbi(TCCR1B, CS10);
#endif
#elif defined(TCCR1) && defined(CS11) && defined(CS10)
sbi(TCCR1, CS11);
#if F_CPU >= 8000000L
sbi(TCCR1, CS10);
#endif
#endif
// put timer 1 in 8-bit phase correct pwm mode
#if defined(TCCR1A) && defined(WGM10)
sbi(TCCR1A, WGM10);
#elif defined(TCCR1)
#warning this needs to be finished
#endif
// set timer 2 prescale factor to 64
#if defined(TCCR2) && defined(CS22)
sbi(TCCR2, CS22);
#elif defined(TCCR2B) && defined(CS22)
sbi(TCCR2B, CS22);
#else
#warning Timer 2 not finished (may not be present on this CPU)
#endif
// configure timer 2 for phase correct pwm (8-bit)
#if defined(TCCR2) && defined(WGM20)
sbi(TCCR2, WGM20);
#elif defined(TCCR2A) && defined(WGM20)
sbi(TCCR2A, WGM20);
#else
#warning Timer 2 not finished (may not be present on this CPU)
#endif
#if defined(TCCR3B) && defined(CS31) && defined(WGM30)
sbi(TCCR3B, CS31); // set timer 3 prescale factor to 64
sbi(TCCR3B, CS30);
sbi(TCCR3A, WGM30); // put timer 3 in 8-bit phase correct pwm mode
#endif
#if defined(TCCR4A) && defined(TCCR4B) && defined(TCCR4D) /* beginning of timer4 block for 32U4 and similar */
sbi(TCCR4B, CS42); // set timer4 prescale factor to 64
sbi(TCCR4B, CS41);
sbi(TCCR4B, CS40);
sbi(TCCR4D, WGM40); // put timer 4 in phase- and frequency-correct PWM mode
sbi(TCCR4A, PWM4A); // enable PWM mode for comparator OCR4A
sbi(TCCR4C, PWM4D); // enable PWM mode for comparator OCR4D
#else /* beginning of timer4 block for ATMEGA1280 and ATMEGA2560 */
#if defined(TCCR4B) && defined(CS41) && defined(WGM40)
sbi(TCCR4B, CS41); // set timer 4 prescale factor to 64
sbi(TCCR4B, CS40);
sbi(TCCR4A, WGM40); // put timer 4 in 8-bit phase correct pwm mode
#endif
#endif /* end timer4 block for ATMEGA1280/2560 and similar */
#if defined(TCCR5B) && defined(CS51) && defined(WGM50)
sbi(TCCR5B, CS51); // set timer 5 prescale factor to 64
sbi(TCCR5B, CS50);
sbi(TCCR5A, WGM50); // put timer 5 in 8-bit phase correct pwm mode
#endif
#if defined(ADCSRA)
// set a2d prescale factor to 128
// 16 MHz / 128 = 125 KHz, inside the desired 50-200 KHz range.
// XXX: this will not work properly for other clock speeds, and
// this code should use F_CPU to determine the prescale factor.
sbi(ADCSRA, ADPS2);
sbi(ADCSRA, ADPS1);
sbi(ADCSRA, ADPS0);
// enable a2d conversions
sbi(ADCSRA, ADEN);
#endif
// the bootloader connects pins 0 and 1 to the USART; disconnect them
// here so they can be used as normal digital i/o; they will be
// reconnected in Serial.begin()
#if defined(UCSRB)
UCSRB = 0;
#elif defined(UCSR0B)
UCSR0B = 0;
#endif
}

View File

@@ -1,282 +0,0 @@
/*
wiring_analog.c - analog input and output
Part of Arduino - http://www.arduino.cc/
Copyright (c) 2005-2006 David A. Mellis
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General
Public License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA
Modified 28 September 2010 by Mark Sproul
$Id: wiring.c 248 2007-02-03 15:36:30Z mellis $
*/
#include "wiring_private.h"
#include "pins_arduino.h"
uint8_t analog_reference = DEFAULT;
void analogReference(uint8_t mode)
{
// can't actually set the register here because the default setting
// will connect AVCC and the AREF pin, which would cause a short if
// there's something connected to AREF.
analog_reference = mode;
}
int analogRead(uint8_t pin)
{
uint8_t low, high;
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
if (pin >= 54) pin -= 54; // allow for channel or pin numbers
#elif defined(__AVR_ATmega32U4__)
if (pin >= 18) pin -= 18; // allow for channel or pin numbers
#elif defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega644P__)
if (pin >= 24) pin -= 24; // allow for channel or pin numbers
#else
if (pin >= 14) pin -= 14; // allow for channel or pin numbers
#endif
#if defined(__AVR_ATmega32U4__)
pin = analogPinToChannel(pin);
ADCSRB = (ADCSRB & ~(1 << MUX5)) | (((pin >> 3) & 0x01) << MUX5);
#elif defined(ADCSRB) && defined(MUX5)
// the MUX5 bit of ADCSRB selects whether we're reading from channels
// 0 to 7 (MUX5 low) or 8 to 15 (MUX5 high).
ADCSRB = (ADCSRB & ~(1 << MUX5)) | (((pin >> 3) & 0x01) << MUX5);
#endif
// set the analog reference (high two bits of ADMUX) and select the
// channel (low 4 bits). this also sets ADLAR (left-adjust result)
// to 0 (the default).
#if defined(ADMUX)
ADMUX = (analog_reference << 6) | (pin & 0x07);
#endif
// without a delay, we seem to read from the wrong channel
//delay(1);
#if defined(ADCSRA) && defined(ADCL)
// start the conversion
sbi(ADCSRA, ADSC);
// ADSC is cleared when the conversion finishes
while (bit_is_set(ADCSRA, ADSC));
// we have to read ADCL first; doing so locks both ADCL
// and ADCH until ADCH is read. reading ADCL second would
// cause the results of each conversion to be discarded,
// as ADCL and ADCH would be locked when it completed.
low = ADCL;
high = ADCH;
#else
// we dont have an ADC, return 0
low = 0;
high = 0;
#endif
// combine the two bytes
return (high << 8) | low;
}
// Right now, PWM output only works on the pins with
// hardware support. These are defined in the appropriate
// pins_*.c file. For the rest of the pins, we default
// to digital output.
void analogWrite(uint8_t pin, int val)
{
// We need to make sure the PWM output is enabled for those pins
// that support it, as we turn it off when digitally reading or
// writing with them. Also, make sure the pin is in output mode
// for consistenty with Wiring, which doesn't require a pinMode
// call for the analog output pins.
pinMode(pin, OUTPUT);
if (val == 0)
{
digitalWrite(pin, LOW);
}
else if (val == 255)
{
digitalWrite(pin, HIGH);
}
else
{
switch(digitalPinToTimer(pin))
{
// XXX fix needed for atmega8
#if defined(TCCR0) && defined(COM00) && !defined(__AVR_ATmega8__)
case TIMER0A:
// connect pwm to pin on timer 0
sbi(TCCR0, COM00);
OCR0 = val; // set pwm duty
break;
#endif
#if defined(TCCR0A) && defined(COM0A1)
case TIMER0A:
// connect pwm to pin on timer 0, channel A
sbi(TCCR0A, COM0A1);
OCR0A = val; // set pwm duty
break;
#endif
#if defined(TCCR0A) && defined(COM0B1)
case TIMER0B:
// connect pwm to pin on timer 0, channel B
sbi(TCCR0A, COM0B1);
OCR0B = val; // set pwm duty
break;
#endif
#if defined(TCCR1A) && defined(COM1A1)
case TIMER1A:
// connect pwm to pin on timer 1, channel A
sbi(TCCR1A, COM1A1);
OCR1A = val; // set pwm duty
break;
#endif
#if defined(TCCR1A) && defined(COM1B1)
case TIMER1B:
// connect pwm to pin on timer 1, channel B
sbi(TCCR1A, COM1B1);
OCR1B = val; // set pwm duty
break;
#endif
#if defined(TCCR2) && defined(COM21)
case TIMER2:
// connect pwm to pin on timer 2
sbi(TCCR2, COM21);
OCR2 = val; // set pwm duty
break;
#endif
#if defined(TCCR2A) && defined(COM2A1)
case TIMER2A:
// connect pwm to pin on timer 2, channel A
sbi(TCCR2A, COM2A1);
OCR2A = val; // set pwm duty
break;
#endif
#if defined(TCCR2A) && defined(COM2B1)
case TIMER2B:
// connect pwm to pin on timer 2, channel B
sbi(TCCR2A, COM2B1);
OCR2B = val; // set pwm duty
break;
#endif
#if defined(TCCR3A) && defined(COM3A1)
case TIMER3A:
// connect pwm to pin on timer 3, channel A
sbi(TCCR3A, COM3A1);
OCR3A = val; // set pwm duty
break;
#endif
#if defined(TCCR3A) && defined(COM3B1)
case TIMER3B:
// connect pwm to pin on timer 3, channel B
sbi(TCCR3A, COM3B1);
OCR3B = val; // set pwm duty
break;
#endif
#if defined(TCCR3A) && defined(COM3C1)
case TIMER3C:
// connect pwm to pin on timer 3, channel C
sbi(TCCR3A, COM3C1);
OCR3C = val; // set pwm duty
break;
#endif
#if defined(TCCR4A)
case TIMER4A:
//connect pwm to pin on timer 4, channel A
sbi(TCCR4A, COM4A1);
#if defined(COM4A0) // only used on 32U4
cbi(TCCR4A, COM4A0);
#endif
OCR4A = val; // set pwm duty
break;
#endif
#if defined(TCCR4A) && defined(COM4B1)
case TIMER4B:
// connect pwm to pin on timer 4, channel B
sbi(TCCR4A, COM4B1);
OCR4B = val; // set pwm duty
break;
#endif
#if defined(TCCR4A) && defined(COM4C1)
case TIMER4C:
// connect pwm to pin on timer 4, channel C
sbi(TCCR4A, COM4C1);
OCR4C = val; // set pwm duty
break;
#endif
#if defined(TCCR4C) && defined(COM4D1)
case TIMER4D:
// connect pwm to pin on timer 4, channel D
sbi(TCCR4C, COM4D1);
#if defined(COM4D0) // only used on 32U4
cbi(TCCR4C, COM4D0);
#endif
OCR4D = val; // set pwm duty
break;
#endif
#if defined(TCCR5A) && defined(COM5A1)
case TIMER5A:
// connect pwm to pin on timer 5, channel A
sbi(TCCR5A, COM5A1);
OCR5A = val; // set pwm duty
break;
#endif
#if defined(TCCR5A) && defined(COM5B1)
case TIMER5B:
// connect pwm to pin on timer 5, channel B
sbi(TCCR5A, COM5B1);
OCR5B = val; // set pwm duty
break;
#endif
#if defined(TCCR5A) && defined(COM5C1)
case TIMER5C:
// connect pwm to pin on timer 5, channel C
sbi(TCCR5A, COM5C1);
OCR5C = val; // set pwm duty
break;
#endif
case NOT_ON_TIMER:
default:
if (val < 128) {
digitalWrite(pin, LOW);
} else {
digitalWrite(pin, HIGH);
}
}
}
}

View File

@@ -1,178 +0,0 @@
/*
wiring_digital.c - digital input and output functions
Part of Arduino - http://www.arduino.cc/
Copyright (c) 2005-2006 David A. Mellis
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General
Public License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA
Modified 28 September 2010 by Mark Sproul
$Id: wiring.c 248 2007-02-03 15:36:30Z mellis $
*/
#define ARDUINO_MAIN
#include "wiring_private.h"
#include "pins_arduino.h"
void pinMode(uint8_t pin, uint8_t mode)
{
uint8_t bit = digitalPinToBitMask(pin);
uint8_t port = digitalPinToPort(pin);
volatile uint8_t *reg, *out;
if (port == NOT_A_PIN) return;
// JWS: can I let the optimizer do this?
reg = portModeRegister(port);
out = portOutputRegister(port);
if (mode == INPUT) {
uint8_t oldSREG = SREG;
cli();
*reg &= ~bit;
*out &= ~bit;
SREG = oldSREG;
} else if (mode == INPUT_PULLUP) {
uint8_t oldSREG = SREG;
cli();
*reg &= ~bit;
*out |= bit;
SREG = oldSREG;
} else {
uint8_t oldSREG = SREG;
cli();
*reg |= bit;
SREG = oldSREG;
}
}
// Forcing this inline keeps the callers from having to push their own stuff
// on the stack. It is a good performance win and only takes 1 more byte per
// user than calling. (It will take more bytes on the 168.)
//
// But shouldn't this be moved into pinMode? Seems silly to check and do on
// each digitalread or write.
//
// Mark Sproul:
// - Removed inline. Save 170 bytes on atmega1280
// - changed to a switch statment; added 32 bytes but much easier to read and maintain.
// - Added more #ifdefs, now compiles for atmega645
//
//static inline void turnOffPWM(uint8_t timer) __attribute__ ((always_inline));
//static inline void turnOffPWM(uint8_t timer)
static void turnOffPWM(uint8_t timer)
{
switch (timer)
{
#if defined(TCCR1A) && defined(COM1A1)
case TIMER1A: cbi(TCCR1A, COM1A1); break;
#endif
#if defined(TCCR1A) && defined(COM1B1)
case TIMER1B: cbi(TCCR1A, COM1B1); break;
#endif
#if defined(TCCR2) && defined(COM21)
case TIMER2: cbi(TCCR2, COM21); break;
#endif
#if defined(TCCR0A) && defined(COM0A1)
case TIMER0A: cbi(TCCR0A, COM0A1); break;
#endif
#if defined(TIMER0B) && defined(COM0B1)
case TIMER0B: cbi(TCCR0A, COM0B1); break;
#endif
#if defined(TCCR2A) && defined(COM2A1)
case TIMER2A: cbi(TCCR2A, COM2A1); break;
#endif
#if defined(TCCR2A) && defined(COM2B1)
case TIMER2B: cbi(TCCR2A, COM2B1); break;
#endif
#if defined(TCCR3A) && defined(COM3A1)
case TIMER3A: cbi(TCCR3A, COM3A1); break;
#endif
#if defined(TCCR3A) && defined(COM3B1)
case TIMER3B: cbi(TCCR3A, COM3B1); break;
#endif
#if defined(TCCR3A) && defined(COM3C1)
case TIMER3C: cbi(TCCR3A, COM3C1); break;
#endif
#if defined(TCCR4A) && defined(COM4A1)
case TIMER4A: cbi(TCCR4A, COM4A1); break;
#endif
#if defined(TCCR4A) && defined(COM4B1)
case TIMER4B: cbi(TCCR4A, COM4B1); break;
#endif
#if defined(TCCR4A) && defined(COM4C1)
case TIMER4C: cbi(TCCR4A, COM4C1); break;
#endif
#if defined(TCCR4C) && defined(COM4D1)
case TIMER4D: cbi(TCCR4C, COM4D1); break;
#endif
#if defined(TCCR5A)
case TIMER5A: cbi(TCCR5A, COM5A1); break;
case TIMER5B: cbi(TCCR5A, COM5B1); break;
case TIMER5C: cbi(TCCR5A, COM5C1); break;
#endif
}
}
void digitalWrite(uint8_t pin, uint8_t val)
{
uint8_t timer = digitalPinToTimer(pin);
uint8_t bit = digitalPinToBitMask(pin);
uint8_t port = digitalPinToPort(pin);
volatile uint8_t *out;
if (port == NOT_A_PIN) return;
// If the pin that support PWM output, we need to turn it off
// before doing a digital write.
if (timer != NOT_ON_TIMER) turnOffPWM(timer);
out = portOutputRegister(port);
uint8_t oldSREG = SREG;
cli();
if (val == LOW) {
*out &= ~bit;
} else {
*out |= bit;
}
SREG = oldSREG;
}
int digitalRead(uint8_t pin)
{
uint8_t timer = digitalPinToTimer(pin);
uint8_t bit = digitalPinToBitMask(pin);
uint8_t port = digitalPinToPort(pin);
if (port == NOT_A_PIN) return LOW;
// If the pin that support PWM output, we need to turn it off
// before getting a digital reading.
if (timer != NOT_ON_TIMER) turnOffPWM(timer);
if (*portInputRegister(port) & bit) return HIGH;
return LOW;
}

View File

@@ -1,71 +0,0 @@
/*
wiring_private.h - Internal header file.
Part of Arduino - http://www.arduino.cc/
Copyright (c) 2005-2006 David A. Mellis
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General
Public License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA
$Id: wiring.h 239 2007-01-12 17:58:39Z mellis $
*/
#ifndef WiringPrivate_h
#define WiringPrivate_h
#include <avr/io.h>
#include <avr/interrupt.h>
#include <stdio.h>
#include <stdarg.h>
#include "Arduino.h"
#ifdef __cplusplus
extern "C"{
#endif
#ifndef cbi
#define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit))
#endif
#ifndef sbi
#define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit))
#endif
#define EXTERNAL_INT_0 0
#define EXTERNAL_INT_1 1
#define EXTERNAL_INT_2 2
#define EXTERNAL_INT_3 3
#define EXTERNAL_INT_4 4
#define EXTERNAL_INT_5 5
#define EXTERNAL_INT_6 6
#define EXTERNAL_INT_7 7
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
#define EXTERNAL_NUM_INTERRUPTS 8
#elif defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega644P__)
#define EXTERNAL_NUM_INTERRUPTS 3
#elif defined(__AVR_ATmega32U4__)
#define EXTERNAL_NUM_INTERRUPTS 4
#else
#define EXTERNAL_NUM_INTERRUPTS 2
#endif
typedef void (*voidFuncPtr)(void);
#ifdef __cplusplus
} // extern "C"
#endif
#endif

View File

@@ -1,69 +0,0 @@
/*
wiring_pulse.c - pulseIn() function
Part of Arduino - http://www.arduino.cc/
Copyright (c) 2005-2006 David A. Mellis
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General
Public License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA
$Id: wiring.c 248 2007-02-03 15:36:30Z mellis $
*/
#include "wiring_private.h"
#include "pins_arduino.h"
/* Measures the length (in microseconds) of a pulse on the pin; state is HIGH
* or LOW, the type of pulse to measure. Works on pulses from 2-3 microseconds
* to 3 minutes in length, but must be called at least a few dozen microseconds
* before the start of the pulse. */
unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout)
{
// cache the port and bit of the pin in order to speed up the
// pulse width measuring loop and achieve finer resolution. calling
// digitalRead() instead yields much coarser resolution.
uint8_t bit = digitalPinToBitMask(pin);
uint8_t port = digitalPinToPort(pin);
uint8_t stateMask = (state ? bit : 0);
unsigned long width = 0; // keep initialization out of time critical area
// convert the timeout from microseconds to a number of times through
// the initial loop; it takes 16 clock cycles per iteration.
unsigned long numloops = 0;
unsigned long maxloops = microsecondsToClockCycles(timeout) / 16;
// wait for any previous pulse to end
while ((*portInputRegister(port) & bit) == stateMask)
if (numloops++ == maxloops)
return 0;
// wait for the pulse to start
while ((*portInputRegister(port) & bit) != stateMask)
if (numloops++ == maxloops)
return 0;
// wait for the pulse to stop
while ((*portInputRegister(port) & bit) == stateMask) {
if (numloops++ == maxloops)
return 0;
width++;
}
// convert the reading to microseconds. The loop has been determined
// to be 20 clock cycles long and have about 16 clocks between the edge
// and the start of the loop. There will be some error introduced by
// the interrupt handlers.
return clockCyclesToMicroseconds(width * 21 + 16);
}

View File

@@ -1,55 +0,0 @@
/*
wiring_shift.c - shiftOut() function
Part of Arduino - http://www.arduino.cc/
Copyright (c) 2005-2006 David A. Mellis
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General
Public License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA
$Id: wiring.c 248 2007-02-03 15:36:30Z mellis $
*/
#include "wiring_private.h"
uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder) {
uint8_t value = 0;
uint8_t i;
for (i = 0; i < 8; ++i) {
digitalWrite(clockPin, HIGH);
if (bitOrder == LSBFIRST)
value |= digitalRead(dataPin) << i;
else
value |= digitalRead(dataPin) << (7 - i);
digitalWrite(clockPin, LOW);
}
return value;
}
void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val)
{
uint8_t i;
for (i = 0; i < 8; i++) {
if (bitOrder == LSBFIRST)
digitalWrite(dataPin, !!(val & (1 << i)));
else
digitalWrite(dataPin, !!(val & (1 << (7 - i))));
digitalWrite(clockPin, HIGH);
digitalWrite(clockPin, LOW);
}
}

View File

@@ -1,285 +0,0 @@
/*
pins_arduino.h - Pin definition functions for Arduino
Part of Arduino - http://www.arduino.cc/
Copyright (c) 2007 David A. Mellis
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General
Public License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA
$Id: wiring.h 249 2007-02-03 16:52:51Z mellis $
Changelog
-----------
11/25/11 - ryan@ryanmsutton.com - Add pins for Sanguino 644P and 1284P
07/15/12 - ryan@ryanmsutton.com - Updated for arduino0101
*/
#ifndef Pins_Arduino_h
#define Pins_Arduino_h
#include <avr/pgmspace.h>
#define NOT_A_PIN 0
#define NOT_A_PORT 0
#define NOT_ON_TIMER 0
#define TIMER0A 1
#define TIMER0B 2
#define TIMER1A 3
#define TIMER1B 4
#define TIMER2 5
#define TIMER2A 6
#define TIMER2B 7
#define TIMER3A 8
#define TIMER3B 9
#define TIMER3C 10
#define TIMER4A 11
#define TIMER4B 12
#define TIMER4C 13
#define TIMER5A 14
#define TIMER5B 15
#define TIMER5C 16
const static uint8_t SS = 4;
const static uint8_t MOSI = 5;
const static uint8_t MISO = 6;
const static uint8_t SCK = 7;
static const uint8_t SDA = 17;
static const uint8_t SCL = 16;
static const uint8_t LED_BUILTIN = 13;
static const uint8_t A0 = 31;
static const uint8_t A1 = 30;
static const uint8_t A2 = 29;
static const uint8_t A3 = 28;
static const uint8_t A4 = 27;
static const uint8_t A5 = 26;
static const uint8_t A6 = 25;
static const uint8_t A7 = 24;
// On the ATmega1280, the addresses of some of the port registers are
// greater than 255, so we can't store them in uint8_t's.
// extern const uint16_t PROGMEM port_to_mode_PGM[];
// extern const uint16_t PROGMEM port_to_input_PGM[];
// extern const uint16_t PROGMEM port_to_output_PGM[];
// extern const uint8_t PROGMEM digital_pin_to_port_PGM[];
// extern const uint8_t PROGMEM digital_pin_to_bit_PGM[];
// extern const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[];
// extern const uint8_t PROGMEM digital_pin_to_timer_PGM[];
// ATMEL ATMEGA644P / SANGUINO
//
// +---\/---+
// INT0 (D 0) PB0 1| |40 PA0 (AI 0 / D31)
// INT1 (D 1) PB1 2| |39 PA1 (AI 1 / D30)
// INT2 (D 2) PB2 3| |38 PA2 (AI 2 / D29)
// PWM (D 3) PB3 4| |37 PA3 (AI 3 / D28)
// PWM (D 4) PB4 5| |36 PA4 (AI 4 / D27)
// MOSI (D 5) PB5 6| |35 PA5 (AI 5 / D26)
// MISO (D 6) PB6 7| |34 PA6 (AI 6 / D25)
// SCK (D 7) PB7 8| |33 PA7 (AI 7 / D24)
// RST 9| |32 AREF
// VCC 10| |31 GND
// GND 11| |30 AVCC
// XTAL2 12| |29 PC7 (D 23)
// XTAL1 13| |28 PC6 (D 22)
// RX0 (D 8) PD0 14| |27 PC5 (D 21) TDI
// TX0 (D 9) PD1 15| |26 PC4 (D 20) TDO
// RX1 (D 10) PD2 16| |25 PC3 (D 19) TMS
// TX1 (D 11) PD3 17| |24 PC2 (D 18) TCK
// PWM (D 12) PD4 18| |23 PC1 (D 17) SDA
// PWM (D 13) PD5 19| |22 PC0 (D 16) SCL
// PWM (D 14) PD6 20| |21 PD7 (D 15) PWM
// +--------+
//
#define NUM_DIGITAL_PINS 24
#define NUM_ANALOG_INPUTS 8
#define analogInputToDigitalPin(p) ((p < 7) ? (p) + 24 : -1)
#define digitalPinHasPWM(p) ((p) == 3 || (p) == 4 || (p) == 12 || (p) == 13 || (p) == 14 || (p) == 15 )
#define digitalPinToPCICR(p) ( (((p) >= 0) && ((p) <= 31)) ? (&PCICR) : ((uint8_t *)0) )
#define digitalPinToPCICRbit(p) ( (((p) >= 24) && ((p) <= 31)) ? 0 : \
( (((p) >= 0) && ((p) <= 7)) ? 1 : \
( (((p) >= 16) && ((p) <= 23)) ? 2 : \
( (((p) >= 8) && ((p) <= 15)) ? 3 : \
0 ) ) ) )
#define digitalPinToPCMSK(p) ( (((p) >= 24) && ((p) <= 31)) ? (&PCMSK0) : \
( (((p) >= 0) && ((p) <= 7)) ? (&PCMSK1) : \
( (((p) >= 16) && ((p) <= 23)) ? (&PCMSK2) : \
( (((p) >= 8) && ((p) <= 15)) ? (&PCMSK3) : \
((uint8_t *)0) ) ) ) )
#define digitalPinToPCMSKbit(p) ( (((p) >= 24) && ((p) <= 31)) ? (31 - (p)) : \
( (((p) >= 0) && ((p) <= 7)) ? (p) : \
( (((p) >= 16) && ((p) <= 23)) ? ((p) - 16) : \
( (((p) >= 8) && ((p) <= 15)) ? ((p) - 8) : \
0 ) ) ) )
#define PA 1
#define PB 2
#define PC 3
#define PD 4
#define PE 5
#define PF 6
#define PG 7
#define PH 8
#define PJ 10
#define PK 11
#define PL 12
#ifdef ARDUINO_MAIN
// these arrays map port names (e.g. port B) to the
// appropriate addresses for various functions (e.g. reading
// and writing)
const uint16_t PROGMEM port_to_mode_PGM[] =
{
NOT_A_PORT,
(uint16_t) &DDRA,
(uint16_t) &DDRB,
(uint16_t) &DDRC,
(uint16_t) &DDRD,
};
const uint16_t PROGMEM port_to_output_PGM[] =
{
NOT_A_PORT,
(uint16_t) &PORTA,
(uint16_t) &PORTB,
(uint16_t) &PORTC,
(uint16_t) &PORTD,
};
const uint16_t PROGMEM port_to_input_PGM[] =
{
NOT_A_PORT,
(uint16_t) &PINA,
(uint16_t) &PINB,
(uint16_t) &PINC,
(uint16_t) &PIND,
};
const uint8_t PROGMEM digital_pin_to_port_PGM[] =
{
PB, /* 0 */
PB,
PB,
PB,
PB,
PB,
PB,
PB,
PD, /* 8 */
PD,
PD,
PD,
PD,
PD,
PD,
PD,
PC, /* 16 */
PC,
PC,
PC,
PC,
PC,
PC,
PC,
PA, /* 24 */
PA,
PA,
PA,
PA,
PA,
PA,
PA /* 31 */
};
const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[] =
{
_BV(0), /* 0, port B */
_BV(1),
_BV(2),
_BV(3),
_BV(4),
_BV(5),
_BV(6),
_BV(7),
_BV(0), /* 8, port D */
_BV(1),
_BV(2),
_BV(3),
_BV(4),
_BV(5),
_BV(6),
_BV(7),
_BV(0), /* 16, port C */
_BV(1),
_BV(2),
_BV(3),
_BV(4),
_BV(5),
_BV(6),
_BV(7),
_BV(7), /* 24, port A */
_BV(6),
_BV(5),
_BV(4),
_BV(3),
_BV(2),
_BV(1),
_BV(0)
};
const uint8_t PROGMEM digital_pin_to_timer_PGM[] =
{
NOT_ON_TIMER, /* 0 - PB0 */
NOT_ON_TIMER, /* 1 - PB1 */
NOT_ON_TIMER, /* 2 - PB2 */
TIMER0A, /* 3 - PB3 */
TIMER0B, /* 4 - PB4 */
NOT_ON_TIMER, /* 5 - PB5 */
NOT_ON_TIMER, /* 6 - PB6 */
NOT_ON_TIMER, /* 7 - PB7 */
NOT_ON_TIMER, /* 8 - PD0 */
NOT_ON_TIMER, /* 9 - PD1 */
NOT_ON_TIMER, /* 10 - PD2 */
NOT_ON_TIMER, /* 11 - PD3 */
TIMER1B, /* 12 - PD4 */
TIMER1A, /* 13 - PD5 */
TIMER2B, /* 14 - PD6 */
TIMER2A, /* 15 - PD7 */
NOT_ON_TIMER, /* 16 - PC0 */
NOT_ON_TIMER, /* 17 - PC1 */
NOT_ON_TIMER, /* 18 - PC2 */
NOT_ON_TIMER, /* 19 - PC3 */
NOT_ON_TIMER, /* 20 - PC4 */
NOT_ON_TIMER, /* 21 - PC5 */
NOT_ON_TIMER, /* 22 - PC6 */
NOT_ON_TIMER, /* 23 - PC7 */
NOT_ON_TIMER, /* 24 - PA0 */
NOT_ON_TIMER, /* 25 - PA1 */
NOT_ON_TIMER, /* 26 - PA2 */
NOT_ON_TIMER, /* 27 - PA3 */
NOT_ON_TIMER, /* 28 - PA4 */
NOT_ON_TIMER, /* 29 - PA5 */
NOT_ON_TIMER, /* 30 - PA6 */
NOT_ON_TIMER /* 31 - PA7 */
};
#endif
#endif

View File

@@ -1,22 +0,0 @@
# See: http://code.google.com/p/arduino/wiki/Platforms
##############################################################
mega2560.name=RAMBo
mega2560.upload.protocol=wiring
mega2560.upload.maximum_size=258048
mega2560.upload.speed=115200
mega2560.bootloader.low_fuses=0xFF
mega2560.bootloader.high_fuses=0xD8
mega2560.bootloader.extended_fuses=0xFD
mega2560.bootloader.path=stk500v2
mega2560.bootloader.file=stk500boot_v2_mega2560.hex
mega2560.bootloader.unlock_bits=0x3F
mega2560.bootloader.lock_bits=0x0F
mega2560.build.mcu=atmega2560
mega2560.build.f_cpu=16000000L
mega2560.build.core=arduino
mega2560.build.variant=standard

View File

@@ -1,215 +0,0 @@
#ifndef Arduino_h
#define Arduino_h
#include <stdlib.h>
#include <string.h>
#include <math.h>
#include <avr/pgmspace.h>
#include <avr/io.h>
#include <avr/interrupt.h>
#include "binary.h"
#ifdef __cplusplus
extern "C"{
#endif
#define HIGH 0x1
#define LOW 0x0
#define INPUT 0x0
#define OUTPUT 0x1
#define INPUT_PULLUP 0x2
#define true 0x1
#define false 0x0
#define PI 3.1415926535897932384626433832795
#define HALF_PI 1.5707963267948966192313216916398
#define TWO_PI 6.283185307179586476925286766559
#define DEG_TO_RAD 0.017453292519943295769236907684886
#define RAD_TO_DEG 57.295779513082320876798154814105
#define SERIAL 0x0
#define DISPLAY 0x1
#define LSBFIRST 0
#define MSBFIRST 1
#define CHANGE 1
#define FALLING 2
#define RISING 3
#if defined(__AVR_ATtiny24__) || defined(__AVR_ATtiny44__) || defined(__AVR_ATtiny84__) || defined(__AVR_ATtiny25__) || defined(__AVR_ATtiny45__) || defined(__AVR_ATtiny85__)
#define DEFAULT 0
#define EXTERNAL 1
#define INTERNAL 2
#else
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega644P__)
#define INTERNAL1V1 2
#define INTERNAL2V56 3
#else
#define INTERNAL 3
#endif
#define DEFAULT 1
#define EXTERNAL 0
#endif
// undefine stdlib's abs if encountered
#ifdef abs
#undef abs
#endif
#define min(a,b) ((a)<(b)?(a):(b))
#define max(a,b) ((a)>(b)?(a):(b))
#define abs(x) ((x)>0?(x):-(x))
#define constrain(amt,low,high) ((amt)<(low)?(low):((amt)>(high)?(high):(amt)))
#define round(x) ((x)>=0?(long)((x)+0.5):(long)((x)-0.5))
#define radians(deg) ((deg)*DEG_TO_RAD)
#define degrees(rad) ((rad)*RAD_TO_DEG)
#define sq(x) ((x)*(x))
#define interrupts() sei()
#define noInterrupts() cli()
#define clockCyclesPerMicrosecond() ( F_CPU / 1000000L )
#define clockCyclesToMicroseconds(a) ( (a) / clockCyclesPerMicrosecond() )
#define microsecondsToClockCycles(a) ( (a) * clockCyclesPerMicrosecond() )
#define lowByte(w) ((uint8_t) ((w) & 0xff))
#define highByte(w) ((uint8_t) ((w) >> 8))
#define bitRead(value, bit) (((value) >> (bit)) & 0x01)
#define bitSet(value, bit) ((value) |= (1UL << (bit)))
#define bitClear(value, bit) ((value) &= ~(1UL << (bit)))
#define bitWrite(value, bit, bitvalue) (bitvalue ? bitSet(value, bit) : bitClear(value, bit))
typedef unsigned int word;
#define bit(b) (1UL << (b))
typedef uint8_t boolean;
typedef uint8_t byte;
void init(void);
void pinMode(uint8_t, uint8_t);
void digitalWrite(uint8_t, uint8_t);
int digitalRead(uint8_t);
int analogRead(uint8_t);
void analogReference(uint8_t mode);
void analogWrite(uint8_t, int);
unsigned long millis(void);
unsigned long micros(void);
void delay(unsigned long);
void delayMicroseconds(unsigned int us);
unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout);
void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val);
uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);
void attachInterrupt(uint8_t, void (*)(void), int mode);
void detachInterrupt(uint8_t);
void setup(void);
void loop(void);
// Get the bit location within the hardware port of the given virtual pin.
// This comes from the pins_*.c file for the active board configuration.
#define analogInPinToBit(P) (P)
// On the ATmega1280, the addresses of some of the port registers are
// greater than 255, so we can't store them in uint8_t's.
extern const uint16_t PROGMEM port_to_mode_PGM[];
extern const uint16_t PROGMEM port_to_input_PGM[];
extern const uint16_t PROGMEM port_to_output_PGM[];
extern const uint8_t PROGMEM digital_pin_to_port_PGM[];
// extern const uint8_t PROGMEM digital_pin_to_bit_PGM[];
extern const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[];
extern const uint8_t PROGMEM digital_pin_to_timer_PGM[];
// Get the bit location within the hardware port of the given virtual pin.
// This comes from the pins_*.c file for the active board configuration.
//
// These perform slightly better as macros compared to inline functions
//
#define digitalPinToPort(P) ( pgm_read_byte( digital_pin_to_port_PGM + (P) ) )
#define digitalPinToBitMask(P) ( pgm_read_byte( digital_pin_to_bit_mask_PGM + (P) ) )
#define digitalPinToTimer(P) ( pgm_read_byte( digital_pin_to_timer_PGM + (P) ) )
#define analogInPinToBit(P) (P)
#define portOutputRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_output_PGM + (P))) )
#define portInputRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_input_PGM + (P))) )
#define portModeRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_mode_PGM + (P))) )
#define NOT_A_PIN 0
#define NOT_A_PORT 0
#ifdef ARDUINO_MAIN
#define PA 1
#define PB 2
#define PC 3
#define PD 4
#define PE 5
#define PF 6
#define PG 7
#define PH 8
#define PJ 10
#define PK 11
#define PL 12
#endif
#define NOT_ON_TIMER 0
#define TIMER0A 1
#define TIMER0B 2
#define TIMER1A 3
#define TIMER1B 4
#define TIMER2 5
#define TIMER2A 6
#define TIMER2B 7
#define TIMER3A 8
#define TIMER3B 9
#define TIMER3C 10
#define TIMER4A 11
#define TIMER4B 12
#define TIMER4C 13
#define TIMER4D 14
#define TIMER5A 15
#define TIMER5B 16
#define TIMER5C 17
#ifdef __cplusplus
} // extern "C"
#endif
#ifdef __cplusplus
#include "WCharacter.h"
#include "WString.h"
#include "HardwareSerial.h"
uint16_t makeWord(uint16_t w);
uint16_t makeWord(byte h, byte l);
#define word(...) makeWord(__VA_ARGS__)
unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout = 1000000L);
void tone(uint8_t _pin, unsigned int frequency, unsigned long duration = 0);
void noTone(uint8_t _pin);
// WMath prototypes
long random(long);
long random(long, long);
void randomSeed(unsigned int);
long map(long, long, long, long, long);
#endif
#include "pins_arduino.h"
#endif

View File

@@ -1,239 +0,0 @@
/* Copyright (c) 2011, Peter Barrett
**
** Permission to use, copy, modify, and/or distribute this software for
** any purpose with or without fee is hereby granted, provided that the
** above copyright notice and this permission notice appear in all copies.
**
** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
** WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
** WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
** BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
** OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
** WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
** ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
** SOFTWARE.
*/
#include "Platform.h"
#include "USBAPI.h"
#include <avr/wdt.h>
#if defined(USBCON)
#ifdef CDC_ENABLED
#if (RAMEND < 1000)
#define SERIAL_BUFFER_SIZE 16
#else
#define SERIAL_BUFFER_SIZE 64
#endif
struct ring_buffer
{
unsigned char buffer[SERIAL_BUFFER_SIZE];
volatile int head;
volatile int tail;
};
ring_buffer cdc_rx_buffer = { { 0 }, 0, 0};
typedef struct
{
u32 dwDTERate;
u8 bCharFormat;
u8 bParityType;
u8 bDataBits;
u8 lineState;
} LineInfo;
static volatile LineInfo _usbLineInfo = { 57600, 0x00, 0x00, 0x00, 0x00 };
#define WEAK __attribute__ ((weak))
extern const CDCDescriptor _cdcInterface PROGMEM;
const CDCDescriptor _cdcInterface =
{
D_IAD(0,2,CDC_COMMUNICATION_INTERFACE_CLASS,CDC_ABSTRACT_CONTROL_MODEL,1),
// CDC communication interface
D_INTERFACE(CDC_ACM_INTERFACE,1,CDC_COMMUNICATION_INTERFACE_CLASS,CDC_ABSTRACT_CONTROL_MODEL,0),
D_CDCCS(CDC_HEADER,0x10,0x01), // Header (1.10 bcd)
D_CDCCS(CDC_CALL_MANAGEMENT,1,1), // Device handles call management (not)
D_CDCCS4(CDC_ABSTRACT_CONTROL_MANAGEMENT,6), // SET_LINE_CODING, GET_LINE_CODING, SET_CONTROL_LINE_STATE supported
D_CDCCS(CDC_UNION,CDC_ACM_INTERFACE,CDC_DATA_INTERFACE), // Communication interface is master, data interface is slave 0
D_ENDPOINT(USB_ENDPOINT_IN (CDC_ENDPOINT_ACM),USB_ENDPOINT_TYPE_INTERRUPT,0x10,0x40),
// CDC data interface
D_INTERFACE(CDC_DATA_INTERFACE,2,CDC_DATA_INTERFACE_CLASS,0,0),
D_ENDPOINT(USB_ENDPOINT_OUT(CDC_ENDPOINT_OUT),USB_ENDPOINT_TYPE_BULK,0x40,0),
D_ENDPOINT(USB_ENDPOINT_IN (CDC_ENDPOINT_IN ),USB_ENDPOINT_TYPE_BULK,0x40,0)
};
int WEAK CDC_GetInterface(u8* interfaceNum)
{
interfaceNum[0] += 2; // uses 2
return USB_SendControl(TRANSFER_PGM,&_cdcInterface,sizeof(_cdcInterface));
}
bool WEAK CDC_Setup(Setup& setup)
{
u8 r = setup.bRequest;
u8 requestType = setup.bmRequestType;
if (REQUEST_DEVICETOHOST_CLASS_INTERFACE == requestType)
{
if (CDC_GET_LINE_CODING == r)
{
USB_SendControl(0,(void*)&_usbLineInfo,7);
return true;
}
}
if (REQUEST_HOSTTODEVICE_CLASS_INTERFACE == requestType)
{
if (CDC_SET_LINE_CODING == r)
{
USB_RecvControl((void*)&_usbLineInfo,7);
return true;
}
if (CDC_SET_CONTROL_LINE_STATE == r)
{
_usbLineInfo.lineState = setup.wValueL;
// auto-reset into the bootloader is triggered when the port, already
// open at 1200 bps, is closed. this is the signal to start the watchdog
// with a relatively long period so it can finish housekeeping tasks
// like servicing endpoints before the sketch ends
if (1200 == _usbLineInfo.dwDTERate) {
// We check DTR state to determine if host port is open (bit 0 of lineState).
if ((_usbLineInfo.lineState & 0x01) == 0) {
*(uint16_t *)0x0800 = 0x7777;
wdt_enable(WDTO_120MS);
} else {
// Most OSs do some intermediate steps when configuring ports and DTR can
// twiggle more than once before stabilizing.
// To avoid spurious resets we set the watchdog to 250ms and eventually
// cancel if DTR goes back high.
wdt_disable();
wdt_reset();
*(uint16_t *)0x0800 = 0x0;
}
}
return true;
}
}
return false;
}
int _serialPeek = -1;
void Serial_::begin(uint16_t baud_count)
{
}
void Serial_::end(void)
{
}
void Serial_::accept(void)
{
ring_buffer *buffer = &cdc_rx_buffer;
int i = (unsigned int)(buffer->head+1) % SERIAL_BUFFER_SIZE;
// if we should be storing the received character into the location
// just before the tail (meaning that the head would advance to the
// current location of the tail), we're about to overflow the buffer
// and so we don't write the character or advance the head.
// while we have room to store a byte
while (i != buffer->tail) {
int c = USB_Recv(CDC_RX);
if (c == -1)
break; // no more data
buffer->buffer[buffer->head] = c;
buffer->head = i;
i = (unsigned int)(buffer->head+1) % SERIAL_BUFFER_SIZE;
}
}
int Serial_::available(void)
{
ring_buffer *buffer = &cdc_rx_buffer;
return (unsigned int)(SERIAL_BUFFER_SIZE + buffer->head - buffer->tail) % SERIAL_BUFFER_SIZE;
}
int Serial_::peek(void)
{
ring_buffer *buffer = &cdc_rx_buffer;
if (buffer->head == buffer->tail) {
return -1;
} else {
return buffer->buffer[buffer->tail];
}
}
int Serial_::read(void)
{
ring_buffer *buffer = &cdc_rx_buffer;
// if the head isn't ahead of the tail, we don't have any characters
if (buffer->head == buffer->tail) {
return -1;
} else {
unsigned char c = buffer->buffer[buffer->tail];
buffer->tail = (unsigned int)(buffer->tail + 1) % SERIAL_BUFFER_SIZE;
return c;
}
}
void Serial_::flush(void)
{
USB_Flush(CDC_TX);
}
size_t Serial_::write(uint8_t c)
{
/* only try to send bytes if the high-level CDC connection itself
is open (not just the pipe) - the OS should set lineState when the port
is opened and clear lineState when the port is closed.
bytes sent before the user opens the connection or after
the connection is closed are lost - just like with a UART. */
// TODO - ZE - check behavior on different OSes and test what happens if an
// open connection isn't broken cleanly (cable is yanked out, host dies
// or locks up, or host virtual serial port hangs)
if (_usbLineInfo.lineState > 0) {
int r = USB_Send(CDC_TX,&c,1);
if (r > 0) {
return r;
} else {
setWriteError();
return 0;
}
}
setWriteError();
return 0;
}
// This operator is a convenient way for a sketch to check whether the
// port has actually been configured and opened by the host (as opposed
// to just being connected to the host). It can be used, for example, in
// setup() before printing to ensure that an application on the host is
// actually ready to receive and display the data.
// We add a short delay before returning to fix a bug observed by Federico
// where the port is configured (lineState != 0) but not quite opened.
Serial_::operator bool() {
bool result = false;
if (_usbLineInfo.lineState > 0)
result = true;
delay(10);
return result;
}
Serial_ Serial;
#endif
#endif /* if defined(USBCON) */

View File

@@ -1,26 +0,0 @@
#ifndef client_h
#define client_h
#include "Print.h"
#include "Stream.h"
#include "IPAddress.h"
class Client : public Stream {
public:
virtual int connect(IPAddress ip, uint16_t port) =0;
virtual int connect(const char *host, uint16_t port) =0;
virtual size_t write(uint8_t) =0;
virtual size_t write(const uint8_t *buf, size_t size) =0;
virtual int available() = 0;
virtual int read() = 0;
virtual int read(uint8_t *buf, size_t size) = 0;
virtual int peek() = 0;
virtual void flush() = 0;
virtual void stop() = 0;
virtual uint8_t connected() = 0;
virtual operator bool() = 0;
protected:
uint8_t* rawIPAddress(IPAddress& addr) { return addr.raw_address(); };
};
#endif

View File

@@ -1,520 +0,0 @@
/* Copyright (c) 2011, Peter Barrett
**
** Permission to use, copy, modify, and/or distribute this software for
** any purpose with or without fee is hereby granted, provided that the
** above copyright notice and this permission notice appear in all copies.
**
** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
** WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
** WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
** BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
** OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
** WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
** ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
** SOFTWARE.
*/
#include "Platform.h"
#include "USBAPI.h"
#include "USBDesc.h"
#if defined(USBCON)
#ifdef HID_ENABLED
//#define RAWHID_ENABLED
// Singletons for mouse and keyboard
Mouse_ Mouse;
Keyboard_ Keyboard;
//================================================================================
//================================================================================
// HID report descriptor
#define LSB(_x) ((_x) & 0xFF)
#define MSB(_x) ((_x) >> 8)
#define RAWHID_USAGE_PAGE 0xFFC0
#define RAWHID_USAGE 0x0C00
#define RAWHID_TX_SIZE 64
#define RAWHID_RX_SIZE 64
extern const u8 _hidReportDescriptor[] PROGMEM;
const u8 _hidReportDescriptor[] = {
// Mouse
0x05, 0x01, // USAGE_PAGE (Generic Desktop) // 54
0x09, 0x02, // USAGE (Mouse)
0xa1, 0x01, // COLLECTION (Application)
0x09, 0x01, // USAGE (Pointer)
0xa1, 0x00, // COLLECTION (Physical)
0x85, 0x01, // REPORT_ID (1)
0x05, 0x09, // USAGE_PAGE (Button)
0x19, 0x01, // USAGE_MINIMUM (Button 1)
0x29, 0x03, // USAGE_MAXIMUM (Button 3)
0x15, 0x00, // LOGICAL_MINIMUM (0)
0x25, 0x01, // LOGICAL_MAXIMUM (1)
0x95, 0x03, // REPORT_COUNT (3)
0x75, 0x01, // REPORT_SIZE (1)
0x81, 0x02, // INPUT (Data,Var,Abs)
0x95, 0x01, // REPORT_COUNT (1)
0x75, 0x05, // REPORT_SIZE (5)
0x81, 0x03, // INPUT (Cnst,Var,Abs)
0x05, 0x01, // USAGE_PAGE (Generic Desktop)
0x09, 0x30, // USAGE (X)
0x09, 0x31, // USAGE (Y)
0x09, 0x38, // USAGE (Wheel)
0x15, 0x81, // LOGICAL_MINIMUM (-127)
0x25, 0x7f, // LOGICAL_MAXIMUM (127)
0x75, 0x08, // REPORT_SIZE (8)
0x95, 0x03, // REPORT_COUNT (3)
0x81, 0x06, // INPUT (Data,Var,Rel)
0xc0, // END_COLLECTION
0xc0, // END_COLLECTION
// Keyboard
0x05, 0x01, // USAGE_PAGE (Generic Desktop) // 47
0x09, 0x06, // USAGE (Keyboard)
0xa1, 0x01, // COLLECTION (Application)
0x85, 0x02, // REPORT_ID (2)
0x05, 0x07, // USAGE_PAGE (Keyboard)
0x19, 0xe0, // USAGE_MINIMUM (Keyboard LeftControl)
0x29, 0xe7, // USAGE_MAXIMUM (Keyboard Right GUI)
0x15, 0x00, // LOGICAL_MINIMUM (0)
0x25, 0x01, // LOGICAL_MAXIMUM (1)
0x75, 0x01, // REPORT_SIZE (1)
0x95, 0x08, // REPORT_COUNT (8)
0x81, 0x02, // INPUT (Data,Var,Abs)
0x95, 0x01, // REPORT_COUNT (1)
0x75, 0x08, // REPORT_SIZE (8)
0x81, 0x03, // INPUT (Cnst,Var,Abs)
0x95, 0x06, // REPORT_COUNT (6)
0x75, 0x08, // REPORT_SIZE (8)
0x15, 0x00, // LOGICAL_MINIMUM (0)
0x25, 0x65, // LOGICAL_MAXIMUM (101)
0x05, 0x07, // USAGE_PAGE (Keyboard)
0x19, 0x00, // USAGE_MINIMUM (Reserved (no event indicated))
0x29, 0x65, // USAGE_MAXIMUM (Keyboard Application)
0x81, 0x00, // INPUT (Data,Ary,Abs)
0xc0, // END_COLLECTION
#if RAWHID_ENABLED
// RAW HID
0x06, LSB(RAWHID_USAGE_PAGE), MSB(RAWHID_USAGE_PAGE), // 30
0x0A, LSB(RAWHID_USAGE), MSB(RAWHID_USAGE),
0xA1, 0x01, // Collection 0x01
0x85, 0x03, // REPORT_ID (3)
0x75, 0x08, // report size = 8 bits
0x15, 0x00, // logical minimum = 0
0x26, 0xFF, 0x00, // logical maximum = 255
0x95, 64, // report count TX
0x09, 0x01, // usage
0x81, 0x02, // Input (array)
0x95, 64, // report count RX
0x09, 0x02, // usage
0x91, 0x02, // Output (array)
0xC0 // end collection
#endif
};
extern const HIDDescriptor _hidInterface PROGMEM;
const HIDDescriptor _hidInterface =
{
D_INTERFACE(HID_INTERFACE,1,3,0,0),
D_HIDREPORT(sizeof(_hidReportDescriptor)),
D_ENDPOINT(USB_ENDPOINT_IN (HID_ENDPOINT_INT),USB_ENDPOINT_TYPE_INTERRUPT,0x40,0x01)
};
//================================================================================
//================================================================================
// Driver
u8 _hid_protocol = 1;
u8 _hid_idle = 1;
#define WEAK __attribute__ ((weak))
int WEAK HID_GetInterface(u8* interfaceNum)
{
interfaceNum[0] += 1; // uses 1
return USB_SendControl(TRANSFER_PGM,&_hidInterface,sizeof(_hidInterface));
}
int WEAK HID_GetDescriptor(int i)
{
return USB_SendControl(TRANSFER_PGM,_hidReportDescriptor,sizeof(_hidReportDescriptor));
}
void WEAK HID_SendReport(u8 id, const void* data, int len)
{
USB_Send(HID_TX, &id, 1);
USB_Send(HID_TX | TRANSFER_RELEASE,data,len);
}
bool WEAK HID_Setup(Setup& setup)
{
u8 r = setup.bRequest;
u8 requestType = setup.bmRequestType;
if (REQUEST_DEVICETOHOST_CLASS_INTERFACE == requestType)
{
if (HID_GET_REPORT == r)
{
//HID_GetReport();
return true;
}
if (HID_GET_PROTOCOL == r)
{
//Send8(_hid_protocol); // TODO
return true;
}
}
if (REQUEST_HOSTTODEVICE_CLASS_INTERFACE == requestType)
{
if (HID_SET_PROTOCOL == r)
{
_hid_protocol = setup.wValueL;
return true;
}
if (HID_SET_IDLE == r)
{
_hid_idle = setup.wValueL;
return true;
}
}
return false;
}
//================================================================================
//================================================================================
// Mouse
Mouse_::Mouse_(void) : _buttons(0)
{
}
void Mouse_::begin(void)
{
}
void Mouse_::end(void)
{
}
void Mouse_::click(uint8_t b)
{
_buttons = b;
move(0,0,0);
_buttons = 0;
move(0,0,0);
}
void Mouse_::move(signed char x, signed char y, signed char wheel)
{
u8 m[4];
m[0] = _buttons;
m[1] = x;
m[2] = y;
m[3] = wheel;
HID_SendReport(1,m,4);
}
void Mouse_::buttons(uint8_t b)
{
if (b != _buttons)
{
_buttons = b;
move(0,0,0);
}
}
void Mouse_::press(uint8_t b)
{
buttons(_buttons | b);
}
void Mouse_::release(uint8_t b)
{
buttons(_buttons & ~b);
}
bool Mouse_::isPressed(uint8_t b)
{
if ((b & _buttons) > 0)
return true;
return false;
}
//================================================================================
//================================================================================
// Keyboard
Keyboard_::Keyboard_(void)
{
}
void Keyboard_::begin(void)
{
}
void Keyboard_::end(void)
{
}
void Keyboard_::sendReport(KeyReport* keys)
{
HID_SendReport(2,keys,sizeof(KeyReport));
}
extern
const uint8_t _asciimap[128] PROGMEM;
#define SHIFT 0x80
const uint8_t _asciimap[128] =
{
0x00, // NUL
0x00, // SOH
0x00, // STX
0x00, // ETX
0x00, // EOT
0x00, // ENQ
0x00, // ACK
0x00, // BEL
0x2a, // BS Backspace
0x2b, // TAB Tab
0x28, // LF Enter
0x00, // VT
0x00, // FF
0x00, // CR
0x00, // SO
0x00, // SI
0x00, // DEL
0x00, // DC1
0x00, // DC2
0x00, // DC3
0x00, // DC4
0x00, // NAK
0x00, // SYN
0x00, // ETB
0x00, // CAN
0x00, // EM
0x00, // SUB
0x00, // ESC
0x00, // FS
0x00, // GS
0x00, // RS
0x00, // US
0x2c, // ' '
0x1e|SHIFT, // !
0x34|SHIFT, // "
0x20|SHIFT, // #
0x21|SHIFT, // $
0x22|SHIFT, // %
0x24|SHIFT, // &
0x34, // '
0x26|SHIFT, // (
0x27|SHIFT, // )
0x25|SHIFT, // *
0x2e|SHIFT, // +
0x36, // ,
0x2d, // -
0x37, // .
0x38, // /
0x27, // 0
0x1e, // 1
0x1f, // 2
0x20, // 3
0x21, // 4
0x22, // 5
0x23, // 6
0x24, // 7
0x25, // 8
0x26, // 9
0x33|SHIFT, // :
0x33, // ;
0x36|SHIFT, // <
0x2e, // =
0x37|SHIFT, // >
0x38|SHIFT, // ?
0x1f|SHIFT, // @
0x04|SHIFT, // A
0x05|SHIFT, // B
0x06|SHIFT, // C
0x07|SHIFT, // D
0x08|SHIFT, // E
0x09|SHIFT, // F
0x0a|SHIFT, // G
0x0b|SHIFT, // H
0x0c|SHIFT, // I
0x0d|SHIFT, // J
0x0e|SHIFT, // K
0x0f|SHIFT, // L
0x10|SHIFT, // M
0x11|SHIFT, // N
0x12|SHIFT, // O
0x13|SHIFT, // P
0x14|SHIFT, // Q
0x15|SHIFT, // R
0x16|SHIFT, // S
0x17|SHIFT, // T
0x18|SHIFT, // U
0x19|SHIFT, // V
0x1a|SHIFT, // W
0x1b|SHIFT, // X
0x1c|SHIFT, // Y
0x1d|SHIFT, // Z
0x2f, // [
0x31, // bslash
0x30, // ]
0x23|SHIFT, // ^
0x2d|SHIFT, // _
0x35, // `
0x04, // a
0x05, // b
0x06, // c
0x07, // d
0x08, // e
0x09, // f
0x0a, // g
0x0b, // h
0x0c, // i
0x0d, // j
0x0e, // k
0x0f, // l
0x10, // m
0x11, // n
0x12, // o
0x13, // p
0x14, // q
0x15, // r
0x16, // s
0x17, // t
0x18, // u
0x19, // v
0x1a, // w
0x1b, // x
0x1c, // y
0x1d, // z
0x2f|SHIFT, //
0x31|SHIFT, // |
0x30|SHIFT, // }
0x35|SHIFT, // ~
0 // DEL
};
uint8_t USBPutChar(uint8_t c);
// press() adds the specified key (printing, non-printing, or modifier)
// to the persistent key report and sends the report. Because of the way
// USB HID works, the host acts like the key remains pressed until we
// call release(), releaseAll(), or otherwise clear the report and resend.
size_t Keyboard_::press(uint8_t k)
{
uint8_t i;
if (k >= 136) { // it's a non-printing key (not a modifier)
k = k - 136;
} else if (k >= 128) { // it's a modifier key
_keyReport.modifiers |= (1<<(k-128));
k = 0;
} else { // it's a printing key
k = pgm_read_byte(_asciimap + k);
if (!k) {
setWriteError();
return 0;
}
if (k & 0x80) { // it's a capital letter or other character reached with shift
_keyReport.modifiers |= 0x02; // the left shift modifier
k &= 0x7F;
}
}
// Add k to the key report only if it's not already present
// and if there is an empty slot.
if (_keyReport.keys[0] != k && _keyReport.keys[1] != k &&
_keyReport.keys[2] != k && _keyReport.keys[3] != k &&
_keyReport.keys[4] != k && _keyReport.keys[5] != k) {
for (i=0; i<6; i++) {
if (_keyReport.keys[i] == 0x00) {
_keyReport.keys[i] = k;
break;
}
}
if (i == 6) {
setWriteError();
return 0;
}
}
sendReport(&_keyReport);
return 1;
}
// release() takes the specified key out of the persistent key report and
// sends the report. This tells the OS the key is no longer pressed and that
// it shouldn't be repeated any more.
size_t Keyboard_::release(uint8_t k)
{
uint8_t i;
if (k >= 136) { // it's a non-printing key (not a modifier)
k = k - 136;
} else if (k >= 128) { // it's a modifier key
_keyReport.modifiers &= ~(1<<(k-128));
k = 0;
} else { // it's a printing key
k = pgm_read_byte(_asciimap + k);
if (!k) {
return 0;
}
if (k & 0x80) { // it's a capital letter or other character reached with shift
_keyReport.modifiers &= ~(0x02); // the left shift modifier
k &= 0x7F;
}
}
// Test the key report to see if k is present. Clear it if it exists.
// Check all positions in case the key is present more than once (which it shouldn't be)
for (i=0; i<6; i++) {
if (0 != k && _keyReport.keys[i] == k) {
_keyReport.keys[i] = 0x00;
}
}
sendReport(&_keyReport);
return 1;
}
void Keyboard_::releaseAll(void)
{
_keyReport.keys[0] = 0;
_keyReport.keys[1] = 0;
_keyReport.keys[2] = 0;
_keyReport.keys[3] = 0;
_keyReport.keys[4] = 0;
_keyReport.keys[5] = 0;
_keyReport.modifiers = 0;
sendReport(&_keyReport);
}
size_t Keyboard_::write(uint8_t c)
{
uint8_t p = press(c); // Keydown
uint8_t r = release(c); // Keyup
return (p); // just return the result of press() since release() almost always returns 1
}
#endif
#endif /* if defined(USBCON) */

View File

@@ -1,519 +0,0 @@
/*
HardwareSerial.cpp - Hardware serial library for Wiring
Copyright (c) 2006 Nicholas Zambetti. All right reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Modified 23 November 2006 by David A. Mellis
Modified 28 September 2010 by Mark Sproul
Modified 14 August 2012 by Alarus
*/
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <inttypes.h>
#include "Arduino.h"
#include "wiring_private.h"
// this next line disables the entire HardwareSerial.cpp,
// this is so I can support Attiny series and any other chip without a uart
#if defined(UBRRH) || defined(UBRR0H) || defined(UBRR1H) || defined(UBRR2H) || defined(UBRR3H)
#include "HardwareSerial.h"
/*
* on ATmega8, the uart and its bits are not numbered, so there is no "TXC0"
* definition.
*/
#if !defined(TXC0)
#if defined(TXC)
#define TXC0 TXC
#elif defined(TXC1)
// Some devices have uart1 but no uart0
#define TXC0 TXC1
#else
#error TXC0 not definable in HardwareSerial.h
#endif
#endif
// Define constants and variables for buffering incoming serial data. We're
// using a ring buffer (I think), in which head is the index of the location
// to which to write the next incoming character and tail is the index of the
// location from which to read.
#if (RAMEND < 1000)
#define SERIAL_BUFFER_SIZE 16
#else
#define SERIAL_BUFFER_SIZE 64
#endif
struct ring_buffer
{
unsigned char buffer[SERIAL_BUFFER_SIZE];
volatile unsigned int head;
volatile unsigned int tail;
};
#if defined(USBCON)
ring_buffer rx_buffer = { { 0 }, 0, 0};
ring_buffer tx_buffer = { { 0 }, 0, 0};
#endif
#if defined(UBRRH) || defined(UBRR0H)
ring_buffer rx_buffer = { { 0 }, 0, 0 };
ring_buffer tx_buffer = { { 0 }, 0, 0 };
#endif
#if defined(UBRR1H)
ring_buffer rx_buffer1 = { { 0 }, 0, 0 };
ring_buffer tx_buffer1 = { { 0 }, 0, 0 };
#endif
#if defined(UBRR2H)
ring_buffer rx_buffer2 = { { 0 }, 0, 0 };
ring_buffer tx_buffer2 = { { 0 }, 0, 0 };
#endif
#if defined(UBRR3H)
ring_buffer rx_buffer3 = { { 0 }, 0, 0 };
ring_buffer tx_buffer3 = { { 0 }, 0, 0 };
#endif
inline void store_char(unsigned char c, ring_buffer *buffer)
{
int i = (unsigned int)(buffer->head + 1) % SERIAL_BUFFER_SIZE;
// if we should be storing the received character into the location
// just before the tail (meaning that the head would advance to the
// current location of the tail), we're about to overflow the buffer
// and so we don't write the character or advance the head.
if (i != buffer->tail) {
buffer->buffer[buffer->head] = c;
buffer->head = i;
}
}
#if !defined(USART0_RX_vect) && defined(USART1_RX_vect)
// do nothing - on the 32u4 the first USART is USART1
#else
#if !defined(USART_RX_vect) && !defined(SIG_USART0_RECV) && \
!defined(SIG_UART0_RECV) && !defined(USART0_RX_vect) && \
!defined(SIG_UART_RECV)
#error "Don't know what the Data Received vector is called for the first UART"
#else
void serialEvent() __attribute__((weak));
void serialEvent() {}
#define serialEvent_implemented
#if defined(USART_RX_vect)
SIGNAL(USART_RX_vect)
#elif defined(SIG_USART0_RECV)
SIGNAL(SIG_USART0_RECV)
#elif defined(SIG_UART0_RECV)
SIGNAL(SIG_UART0_RECV)
#elif defined(USART0_RX_vect)
SIGNAL(USART0_RX_vect)
#elif defined(SIG_UART_RECV)
SIGNAL(SIG_UART_RECV)
#endif
{
#if defined(UDR0)
if (bit_is_clear(UCSR0A, UPE0)) {
unsigned char c = UDR0;
store_char(c, &rx_buffer);
} else {
unsigned char c = UDR0;
};
#elif defined(UDR)
if (bit_is_clear(UCSRA, PE)) {
unsigned char c = UDR;
store_char(c, &rx_buffer);
} else {
unsigned char c = UDR;
};
#else
#error UDR not defined
#endif
}
#endif
#endif
#if defined(USART1_RX_vect)
void serialEvent1() __attribute__((weak));
void serialEvent1() {}
#define serialEvent1_implemented
SIGNAL(USART1_RX_vect)
{
if (bit_is_clear(UCSR1A, UPE1)) {
unsigned char c = UDR1;
store_char(c, &rx_buffer1);
} else {
unsigned char c = UDR1;
};
}
#elif defined(SIG_USART1_RECV)
#error SIG_USART1_RECV
#endif
#if defined(USART2_RX_vect) && defined(UDR2)
void serialEvent2() __attribute__((weak));
void serialEvent2() {}
#define serialEvent2_implemented
SIGNAL(USART2_RX_vect)
{
if (bit_is_clear(UCSR2A, UPE2)) {
unsigned char c = UDR2;
store_char(c, &rx_buffer2);
} else {
unsigned char c = UDR2;
};
}
#elif defined(SIG_USART2_RECV)
#error SIG_USART2_RECV
#endif
#if defined(USART3_RX_vect) && defined(UDR3)
void serialEvent3() __attribute__((weak));
void serialEvent3() {}
#define serialEvent3_implemented
SIGNAL(USART3_RX_vect)
{
if (bit_is_clear(UCSR3A, UPE3)) {
unsigned char c = UDR3;
store_char(c, &rx_buffer3);
} else {
unsigned char c = UDR3;
};
}
#elif defined(SIG_USART3_RECV)
#error SIG_USART3_RECV
#endif
void serialEventRun(void)
{
#ifdef serialEvent_implemented
if (Serial.available()) serialEvent();
#endif
#ifdef serialEvent1_implemented
if (Serial1.available()) serialEvent1();
#endif
#ifdef serialEvent2_implemented
if (Serial2.available()) serialEvent2();
#endif
#ifdef serialEvent3_implemented
if (Serial3.available()) serialEvent3();
#endif
}
#if !defined(USART0_UDRE_vect) && defined(USART1_UDRE_vect)
// do nothing - on the 32u4 the first USART is USART1
#else
#if !defined(UART0_UDRE_vect) && !defined(UART_UDRE_vect) && !defined(USART0_UDRE_vect) && !defined(USART_UDRE_vect)
#error "Don't know what the Data Register Empty vector is called for the first UART"
#else
#if defined(UART0_UDRE_vect)
ISR(UART0_UDRE_vect)
#elif defined(UART_UDRE_vect)
ISR(UART_UDRE_vect)
#elif defined(USART0_UDRE_vect)
ISR(USART0_UDRE_vect)
#elif defined(USART_UDRE_vect)
ISR(USART_UDRE_vect)
#endif
{
if (tx_buffer.head == tx_buffer.tail) {
// Buffer empty, so disable interrupts
#if defined(UCSR0B)
cbi(UCSR0B, UDRIE0);
#else
cbi(UCSRB, UDRIE);
#endif
}
else {
// There is more data in the output buffer. Send the next byte
unsigned char c = tx_buffer.buffer[tx_buffer.tail];
tx_buffer.tail = (tx_buffer.tail + 1) % SERIAL_BUFFER_SIZE;
#if defined(UDR0)
UDR0 = c;
#elif defined(UDR)
UDR = c;
#else
#error UDR not defined
#endif
}
}
#endif
#endif
#ifdef USART1_UDRE_vect
ISR(USART1_UDRE_vect)
{
if (tx_buffer1.head == tx_buffer1.tail) {
// Buffer empty, so disable interrupts
cbi(UCSR1B, UDRIE1);
}
else {
// There is more data in the output buffer. Send the next byte
unsigned char c = tx_buffer1.buffer[tx_buffer1.tail];
tx_buffer1.tail = (tx_buffer1.tail + 1) % SERIAL_BUFFER_SIZE;
UDR1 = c;
}
}
#endif
#ifdef USART2_UDRE_vect
ISR(USART2_UDRE_vect)
{
if (tx_buffer2.head == tx_buffer2.tail) {
// Buffer empty, so disable interrupts
cbi(UCSR2B, UDRIE2);
}
else {
// There is more data in the output buffer. Send the next byte
unsigned char c = tx_buffer2.buffer[tx_buffer2.tail];
tx_buffer2.tail = (tx_buffer2.tail + 1) % SERIAL_BUFFER_SIZE;
UDR2 = c;
}
}
#endif
#ifdef USART3_UDRE_vect
ISR(USART3_UDRE_vect)
{
if (tx_buffer3.head == tx_buffer3.tail) {
// Buffer empty, so disable interrupts
cbi(UCSR3B, UDRIE3);
}
else {
// There is more data in the output buffer. Send the next byte
unsigned char c = tx_buffer3.buffer[tx_buffer3.tail];
tx_buffer3.tail = (tx_buffer3.tail + 1) % SERIAL_BUFFER_SIZE;
UDR3 = c;
}
}
#endif
// Constructors ////////////////////////////////////////////////////////////////
HardwareSerial::HardwareSerial(ring_buffer *rx_buffer, ring_buffer *tx_buffer,
volatile uint8_t *ubrrh, volatile uint8_t *ubrrl,
volatile uint8_t *ucsra, volatile uint8_t *ucsrb,
volatile uint8_t *ucsrc, volatile uint8_t *udr,
uint8_t rxen, uint8_t txen, uint8_t rxcie, uint8_t udrie, uint8_t u2x)
{
_rx_buffer = rx_buffer;
_tx_buffer = tx_buffer;
_ubrrh = ubrrh;
_ubrrl = ubrrl;
_ucsra = ucsra;
_ucsrb = ucsrb;
_ucsrc = ucsrc;
_udr = udr;
_rxen = rxen;
_txen = txen;
_rxcie = rxcie;
_udrie = udrie;
_u2x = u2x;
}
// Public Methods //////////////////////////////////////////////////////////////
void HardwareSerial::begin(unsigned long baud)
{
uint16_t baud_setting;
bool use_u2x = true;
#if F_CPU == 16000000UL
// hardcoded exception for compatibility with the bootloader shipped
// with the Duemilanove and previous boards and the firmware on the 8U2
// on the Uno and Mega 2560.
if (baud == 57600) {
use_u2x = false;
}
#endif
try_again:
if (use_u2x) {
*_ucsra = 1 << _u2x;
baud_setting = (F_CPU / 4 / baud - 1) / 2;
} else {
*_ucsra = 0;
baud_setting = (F_CPU / 8 / baud - 1) / 2;
}
if ((baud_setting > 4095) && use_u2x)
{
use_u2x = false;
goto try_again;
}
// assign the baud_setting, a.k.a. ubbr (USART Baud Rate Register)
*_ubrrh = baud_setting >> 8;
*_ubrrl = baud_setting;
transmitting = false;
sbi(*_ucsrb, _rxen);
sbi(*_ucsrb, _txen);
sbi(*_ucsrb, _rxcie);
cbi(*_ucsrb, _udrie);
}
void HardwareSerial::begin(unsigned long baud, byte config)
{
uint16_t baud_setting;
uint8_t current_config;
bool use_u2x = true;
#if F_CPU == 16000000UL
// hardcoded exception for compatibility with the bootloader shipped
// with the Duemilanove and previous boards and the firmware on the 8U2
// on the Uno and Mega 2560.
if (baud == 57600) {
use_u2x = false;
}
#endif
try_again:
if (use_u2x) {
*_ucsra = 1 << _u2x;
baud_setting = (F_CPU / 4 / baud - 1) / 2;
} else {
*_ucsra = 0;
baud_setting = (F_CPU / 8 / baud - 1) / 2;
}
if ((baud_setting > 4095) && use_u2x)
{
use_u2x = false;
goto try_again;
}
// assign the baud_setting, a.k.a. ubbr (USART Baud Rate Register)
*_ubrrh = baud_setting >> 8;
*_ubrrl = baud_setting;
//set the data bits, parity, and stop bits
#if defined(__AVR_ATmega8__)
config |= 0x80; // select UCSRC register (shared with UBRRH)
#endif
*_ucsrc = config;
sbi(*_ucsrb, _rxen);
sbi(*_ucsrb, _txen);
sbi(*_ucsrb, _rxcie);
cbi(*_ucsrb, _udrie);
}
void HardwareSerial::end()
{
// wait for transmission of outgoing data
while (_tx_buffer->head != _tx_buffer->tail)
;
cbi(*_ucsrb, _rxen);
cbi(*_ucsrb, _txen);
cbi(*_ucsrb, _rxcie);
cbi(*_ucsrb, _udrie);
// clear any received data
_rx_buffer->head = _rx_buffer->tail;
}
int HardwareSerial::available(void)
{
return (unsigned int)(SERIAL_BUFFER_SIZE + _rx_buffer->head - _rx_buffer->tail) % SERIAL_BUFFER_SIZE;
}
int HardwareSerial::peek(void)
{
if (_rx_buffer->head == _rx_buffer->tail) {
return -1;
} else {
return _rx_buffer->buffer[_rx_buffer->tail];
}
}
int HardwareSerial::read(void)
{
// if the head isn't ahead of the tail, we don't have any characters
if (_rx_buffer->head == _rx_buffer->tail) {
return -1;
} else {
unsigned char c = _rx_buffer->buffer[_rx_buffer->tail];
_rx_buffer->tail = (unsigned int)(_rx_buffer->tail + 1) % SERIAL_BUFFER_SIZE;
return c;
}
}
void HardwareSerial::flush()
{
// UDR is kept full while the buffer is not empty, so TXC triggers when EMPTY && SENT
while (transmitting && ! (*_ucsra & _BV(TXC0)));
transmitting = false;
}
size_t HardwareSerial::write(uint8_t c)
{
int i = (_tx_buffer->head + 1) % SERIAL_BUFFER_SIZE;
// If the output buffer is full, there's nothing for it other than to
// wait for the interrupt handler to empty it a bit
// ???: return 0 here instead?
while (i == _tx_buffer->tail)
;
_tx_buffer->buffer[_tx_buffer->head] = c;
_tx_buffer->head = i;
sbi(*_ucsrb, _udrie);
// clear the TXC bit -- "can be cleared by writing a one to its bit location"
transmitting = true;
sbi(*_ucsra, TXC0);
return 1;
}
HardwareSerial::operator bool() {
return true;
}
// Preinstantiate Objects //////////////////////////////////////////////////////
#if defined(UBRRH) && defined(UBRRL)
HardwareSerial Serial(&rx_buffer, &tx_buffer, &UBRRH, &UBRRL, &UCSRA, &UCSRB, &UCSRC, &UDR, RXEN, TXEN, RXCIE, UDRIE, U2X);
#elif defined(UBRR0H) && defined(UBRR0L)
HardwareSerial Serial(&rx_buffer, &tx_buffer, &UBRR0H, &UBRR0L, &UCSR0A, &UCSR0B, &UCSR0C, &UDR0, RXEN0, TXEN0, RXCIE0, UDRIE0, U2X0);
#elif defined(USBCON)
// do nothing - Serial object and buffers are initialized in CDC code
#else
#error no serial port defined (port 0)
#endif
#if defined(UBRR1H)
HardwareSerial Serial1(&rx_buffer1, &tx_buffer1, &UBRR1H, &UBRR1L, &UCSR1A, &UCSR1B, &UCSR1C, &UDR1, RXEN1, TXEN1, RXCIE1, UDRIE1, U2X1);
#endif
#if defined(UBRR2H)
HardwareSerial Serial2(&rx_buffer2, &tx_buffer2, &UBRR2H, &UBRR2L, &UCSR2A, &UCSR2B, &UCSR2C, &UDR2, RXEN2, TXEN2, RXCIE2, UDRIE2, U2X2);
#endif
#if defined(UBRR3H)
HardwareSerial Serial3(&rx_buffer3, &tx_buffer3, &UBRR3H, &UBRR3L, &UCSR3A, &UCSR3B, &UCSR3C, &UDR3, RXEN3, TXEN3, RXCIE3, UDRIE3, U2X3);
#endif
#endif // whole file

View File

@@ -1,115 +0,0 @@
/*
HardwareSerial.h - Hardware serial library for Wiring
Copyright (c) 2006 Nicholas Zambetti. All right reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Modified 28 September 2010 by Mark Sproul
Modified 14 August 2012 by Alarus
*/
#ifndef HardwareSerial_h
#define HardwareSerial_h
#include <inttypes.h>
#include "Stream.h"
struct ring_buffer;
class HardwareSerial : public Stream
{
private:
ring_buffer *_rx_buffer;
ring_buffer *_tx_buffer;
volatile uint8_t *_ubrrh;
volatile uint8_t *_ubrrl;
volatile uint8_t *_ucsra;
volatile uint8_t *_ucsrb;
volatile uint8_t *_ucsrc;
volatile uint8_t *_udr;
uint8_t _rxen;
uint8_t _txen;
uint8_t _rxcie;
uint8_t _udrie;
uint8_t _u2x;
bool transmitting;
public:
HardwareSerial(ring_buffer *rx_buffer, ring_buffer *tx_buffer,
volatile uint8_t *ubrrh, volatile uint8_t *ubrrl,
volatile uint8_t *ucsra, volatile uint8_t *ucsrb,
volatile uint8_t *ucsrc, volatile uint8_t *udr,
uint8_t rxen, uint8_t txen, uint8_t rxcie, uint8_t udrie, uint8_t u2x);
void begin(unsigned long);
void begin(unsigned long, uint8_t);
void end();
virtual int available(void);
virtual int peek(void);
virtual int read(void);
virtual void flush(void);
virtual size_t write(uint8_t);
inline size_t write(unsigned long n) { return write((uint8_t)n); }
inline size_t write(long n) { return write((uint8_t)n); }
inline size_t write(unsigned int n) { return write((uint8_t)n); }
inline size_t write(int n) { return write((uint8_t)n); }
using Print::write; // pull in write(str) and write(buf, size) from Print
operator bool();
};
// Define config for Serial.begin(baud, config);
#define SERIAL_5N1 0x00
#define SERIAL_6N1 0x02
#define SERIAL_7N1 0x04
#define SERIAL_8N1 0x06
#define SERIAL_5N2 0x08
#define SERIAL_6N2 0x0A
#define SERIAL_7N2 0x0C
#define SERIAL_8N2 0x0E
#define SERIAL_5E1 0x20
#define SERIAL_6E1 0x22
#define SERIAL_7E1 0x24
#define SERIAL_8E1 0x26
#define SERIAL_5E2 0x28
#define SERIAL_6E2 0x2A
#define SERIAL_7E2 0x2C
#define SERIAL_8E2 0x2E
#define SERIAL_5O1 0x30
#define SERIAL_6O1 0x32
#define SERIAL_7O1 0x34
#define SERIAL_8O1 0x36
#define SERIAL_5O2 0x38
#define SERIAL_6O2 0x3A
#define SERIAL_7O2 0x3C
#define SERIAL_8O2 0x3E
#if defined(UBRRH) || defined(UBRR0H)
extern HardwareSerial Serial;
#elif defined(USBCON)
#include "USBAPI.h"
// extern HardwareSerial Serial_;
#endif
#if defined(UBRR1H)
extern HardwareSerial Serial1;
#endif
#if defined(UBRR2H)
extern HardwareSerial Serial2;
#endif
#if defined(UBRR3H)
extern HardwareSerial Serial3;
#endif
extern void serialEventRun(void) __attribute__((weak));
#endif

View File

@@ -1,56 +0,0 @@
#include <Arduino.h>
#include <IPAddress.h>
IPAddress::IPAddress()
{
memset(_address, 0, sizeof(_address));
}
IPAddress::IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet)
{
_address[0] = first_octet;
_address[1] = second_octet;
_address[2] = third_octet;
_address[3] = fourth_octet;
}
IPAddress::IPAddress(uint32_t address)
{
memcpy(_address, &address, sizeof(_address));
}
IPAddress::IPAddress(const uint8_t *address)
{
memcpy(_address, address, sizeof(_address));
}
IPAddress& IPAddress::operator=(const uint8_t *address)
{
memcpy(_address, address, sizeof(_address));
return *this;
}
IPAddress& IPAddress::operator=(uint32_t address)
{
memcpy(_address, (const uint8_t *)&address, sizeof(_address));
return *this;
}
bool IPAddress::operator==(const uint8_t* addr)
{
return memcmp(addr, _address, sizeof(_address)) == 0;
}
size_t IPAddress::printTo(Print& p) const
{
size_t n = 0;
for (int i =0; i < 3; i++)
{
n += p.print(_address[i], DEC);
n += p.print('.');
}
n += p.print(_address[3], DEC);
return n;
}

View File

@@ -1,76 +0,0 @@
/*
*
* MIT License:
* Copyright (c) 2011 Adrian McEwen
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* adrianm@mcqn.com 1/1/2011
*/
#ifndef IPAddress_h
#define IPAddress_h
#include <Printable.h>
// A class to make it easier to handle and pass around IP addresses
class IPAddress : public Printable {
private:
uint8_t _address[4]; // IPv4 address
// Access the raw byte array containing the address. Because this returns a pointer
// to the internal structure rather than a copy of the address this function should only
// be used when you know that the usage of the returned uint8_t* will be transient and not
// stored.
uint8_t* raw_address() { return _address; };
public:
// Constructors
IPAddress();
IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet);
IPAddress(uint32_t address);
IPAddress(const uint8_t *address);
// Overloaded cast operator to allow IPAddress objects to be used where a pointer
// to a four-byte uint8_t array is expected
operator uint32_t() { return *((uint32_t*)_address); };
bool operator==(const IPAddress& addr) { return (*((uint32_t*)_address)) == (*((uint32_t*)addr._address)); };
bool operator==(const uint8_t* addr);
// Overloaded index operator to allow getting and setting individual octets of the address
uint8_t operator[](int index) const { return _address[index]; };
uint8_t& operator[](int index) { return _address[index]; };
// Overloaded copy operators to allow initialisation of IPAddress objects from other types
IPAddress& operator=(const uint8_t *address);
IPAddress& operator=(uint32_t address);
virtual size_t printTo(Print& p) const;
friend class EthernetClass;
friend class UDP;
friend class Client;
friend class Server;
friend class DhcpClass;
friend class DNSClient;
};
const IPAddress INADDR_NONE(0,0,0,0);
#endif

View File

@@ -1,23 +0,0 @@
#ifndef __PLATFORM_H__
#define __PLATFORM_H__
#include <inttypes.h>
#include <avr/pgmspace.h>
#include <avr/eeprom.h>
#include <avr/interrupt.h>
#include <util/delay.h>
typedef unsigned char u8;
typedef unsigned short u16;
typedef unsigned long u32;
#include "Arduino.h"
#if defined(USBCON)
#include "USBDesc.h"
#include "USBCore.h"
#include "USBAPI.h"
#endif /* if defined(USBCON) */
#endif

View File

@@ -1,268 +0,0 @@
/*
Print.cpp - Base class that provides print() and println()
Copyright (c) 2008 David A. Mellis. All right reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Modified 23 November 2006 by David A. Mellis
*/
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <math.h>
#include "Arduino.h"
#include "Print.h"
// Public Methods //////////////////////////////////////////////////////////////
/* default implementation: may be overridden */
size_t Print::write(const uint8_t *buffer, size_t size)
{
size_t n = 0;
while (size--) {
n += write(*buffer++);
}
return n;
}
size_t Print::print(const __FlashStringHelper *ifsh)
{
const char PROGMEM *p = (const char PROGMEM *)ifsh;
size_t n = 0;
while (1) {
unsigned char c = pgm_read_byte(p++);
if (c == 0) break;
n += write(c);
}
return n;
}
size_t Print::print(const String &s)
{
size_t n = 0;
for (uint16_t i = 0; i < s.length(); i++) {
n += write(s[i]);
}
return n;
}
size_t Print::print(const char str[])
{
return write(str);
}
size_t Print::print(char c)
{
return write(c);
}
size_t Print::print(unsigned char b, int base)
{
return print((unsigned long) b, base);
}
size_t Print::print(int n, int base)
{
return print((long) n, base);
}
size_t Print::print(unsigned int n, int base)
{
return print((unsigned long) n, base);
}
size_t Print::print(long n, int base)
{
if (base == 0) {
return write(n);
} else if (base == 10) {
if (n < 0) {
int t = print('-');
n = -n;
return printNumber(n, 10) + t;
}
return printNumber(n, 10);
} else {
return printNumber(n, base);
}
}
size_t Print::print(unsigned long n, int base)
{
if (base == 0) return write(n);
else return printNumber(n, base);
}
size_t Print::print(double n, int digits)
{
return printFloat(n, digits);
}
size_t Print::println(const __FlashStringHelper *ifsh)
{
size_t n = print(ifsh);
n += println();
return n;
}
size_t Print::print(const Printable& x)
{
return x.printTo(*this);
}
size_t Print::println(void)
{
size_t n = print('\r');
n += print('\n');
return n;
}
size_t Print::println(const String &s)
{
size_t n = print(s);
n += println();
return n;
}
size_t Print::println(const char c[])
{
size_t n = print(c);
n += println();
return n;
}
size_t Print::println(char c)
{
size_t n = print(c);
n += println();
return n;
}
size_t Print::println(unsigned char b, int base)
{
size_t n = print(b, base);
n += println();
return n;
}
size_t Print::println(int num, int base)
{
size_t n = print(num, base);
n += println();
return n;
}
size_t Print::println(unsigned int num, int base)
{
size_t n = print(num, base);
n += println();
return n;
}
size_t Print::println(long num, int base)
{
size_t n = print(num, base);
n += println();
return n;
}
size_t Print::println(unsigned long num, int base)
{
size_t n = print(num, base);
n += println();
return n;
}
size_t Print::println(double num, int digits)
{
size_t n = print(num, digits);
n += println();
return n;
}
size_t Print::println(const Printable& x)
{
size_t n = print(x);
n += println();
return n;
}
// Private Methods /////////////////////////////////////////////////////////////
size_t Print::printNumber(unsigned long n, uint8_t base) {
char buf[8 * sizeof(long) + 1]; // Assumes 8-bit chars plus zero byte.
char *str = &buf[sizeof(buf) - 1];
*str = '\0';
// prevent crash if called with base == 1
if (base < 2) base = 10;
do {
unsigned long m = n;
n /= base;
char c = m - base * n;
*--str = c < 10 ? c + '0' : c + 'A' - 10;
} while(n);
return write(str);
}
size_t Print::printFloat(double number, uint8_t digits)
{
size_t n = 0;
if (isnan(number)) return print("nan");
if (isinf(number)) return print("inf");
if (number > 4294967040.0) return print ("ovf"); // constant determined empirically
if (number <-4294967040.0) return print ("ovf"); // constant determined empirically
// Handle negative numbers
if (number < 0.0)
{
n += print('-');
number = -number;
}
// Round correctly so that print(1.999, 2) prints as "2.00"
double rounding = 0.5;
for (uint8_t i=0; i<digits; ++i)
rounding /= 10.0;
number += rounding;
// Extract the integer part of the number and print it
unsigned long int_part = (unsigned long)number;
double remainder = number - (double)int_part;
n += print(int_part);
// Print the decimal point, but only if there are digits beyond
if (digits > 0) {
n += print(".");
}
// Extract digits from the remainder one at a time
while (digits-- > 0)
{
remainder *= 10.0;
int toPrint = int(remainder);
n += print(toPrint);
remainder -= toPrint;
}
return n;
}

View File

@@ -1,81 +0,0 @@
/*
Print.h - Base class that provides print() and println()
Copyright (c) 2008 David A. Mellis. All right reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef Print_h
#define Print_h
#include <inttypes.h>
#include <stdio.h> // for size_t
#include "WString.h"
#include "Printable.h"
#define DEC 10
#define HEX 16
#define OCT 8
#define BIN 2
class Print
{
private:
int write_error;
size_t printNumber(unsigned long, uint8_t);
size_t printFloat(double, uint8_t);
protected:
void setWriteError(int err = 1) { write_error = err; }
public:
Print() : write_error(0) {}
int getWriteError() { return write_error; }
void clearWriteError() { setWriteError(0); }
virtual size_t write(uint8_t) = 0;
size_t write(const char *str) {
if (str == NULL) return 0;
return write((const uint8_t *)str, strlen(str));
}
virtual size_t write(const uint8_t *buffer, size_t size);
size_t print(const __FlashStringHelper *);
size_t print(const String &);
size_t print(const char[]);
size_t print(char);
size_t print(unsigned char, int = DEC);
size_t print(int, int = DEC);
size_t print(unsigned int, int = DEC);
size_t print(long, int = DEC);
size_t print(unsigned long, int = DEC);
size_t print(double, int = 2);
size_t print(const Printable&);
size_t println(const __FlashStringHelper *);
size_t println(const String &s);
size_t println(const char[]);
size_t println(char);
size_t println(unsigned char, int = DEC);
size_t println(int, int = DEC);
size_t println(unsigned int, int = DEC);
size_t println(long, int = DEC);
size_t println(unsigned long, int = DEC);
size_t println(double, int = 2);
size_t println(const Printable&);
size_t println(void);
};
#endif

View File

@@ -1,40 +0,0 @@
/*
Printable.h - Interface class that allows printing of complex types
Copyright (c) 2011 Adrian McEwen. All right reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef Printable_h
#define Printable_h
#include <new.h>
class Print;
/** The Printable class provides a way for new classes to allow themselves to be printed.
By deriving from Printable and implementing the printTo method, it will then be possible
for users to print out instances of this class by passing them into the usual
Print::print and Print::println methods.
*/
class Printable
{
public:
virtual size_t printTo(Print& p) const = 0;
};
#endif

View File

@@ -1,9 +0,0 @@
#ifndef server_h
#define server_h
class Server : public Print {
public:
virtual void begin() =0;
};
#endif

View File

@@ -1,270 +0,0 @@
/*
Stream.cpp - adds parsing methods to Stream class
Copyright (c) 2008 David A. Mellis. All right reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Created July 2011
parsing functions based on TextFinder library by Michael Margolis
*/
#include "Arduino.h"
#include "Stream.h"
#define PARSE_TIMEOUT 1000 // default number of milli-seconds to wait
#define NO_SKIP_CHAR 1 // a magic char not found in a valid ASCII numeric field
// private method to read stream with timeout
int Stream::timedRead()
{
int c;
_startMillis = millis();
do {
c = read();
if (c >= 0) return c;
} while(millis() - _startMillis < _timeout);
return -1; // -1 indicates timeout
}
// private method to peek stream with timeout
int Stream::timedPeek()
{
int c;
_startMillis = millis();
do {
c = peek();
if (c >= 0) return c;
} while(millis() - _startMillis < _timeout);
return -1; // -1 indicates timeout
}
// returns peek of the next digit in the stream or -1 if timeout
// discards non-numeric characters
int Stream::peekNextDigit()
{
int c;
while (1) {
c = timedPeek();
if (c < 0) return c; // timeout
if (c == '-') return c;
if (c >= '0' && c <= '9') return c;
read(); // discard non-numeric
}
}
// Public Methods
//////////////////////////////////////////////////////////////
void Stream::setTimeout(unsigned long timeout) // sets the maximum number of milliseconds to wait
{
_timeout = timeout;
}
// find returns true if the target string is found
bool Stream::find(char *target)
{
return findUntil(target, NULL);
}
// reads data from the stream until the target string of given length is found
// returns true if target string is found, false if timed out
bool Stream::find(char *target, size_t length)
{
return findUntil(target, length, NULL, 0);
}
// as find but search ends if the terminator string is found
bool Stream::findUntil(char *target, char *terminator)
{
return findUntil(target, strlen(target), terminator, strlen(terminator));
}
// reads data from the stream until the target string of the given length is found
// search terminated if the terminator string is found
// returns true if target string is found, false if terminated or timed out
bool Stream::findUntil(char *target, size_t targetLen, char *terminator, size_t termLen)
{
size_t index = 0; // maximum target string length is 64k bytes!
size_t termIndex = 0;
int c;
if( *target == 0)
return true; // return true if target is a null string
while( (c = timedRead()) > 0){
if(c != target[index])
index = 0; // reset index if any char does not match
if( c == target[index]){
//////Serial.print("found "); Serial.write(c); Serial.print("index now"); Serial.println(index+1);
if(++index >= targetLen){ // return true if all chars in the target match
return true;
}
}
if(termLen > 0 && c == terminator[termIndex]){
if(++termIndex >= termLen)
return false; // return false if terminate string found before target string
}
else
termIndex = 0;
}
return false;
}
// returns the first valid (long) integer value from the current position.
// initial characters that are not digits (or the minus sign) are skipped
// function is terminated by the first character that is not a digit.
long Stream::parseInt()
{
return parseInt(NO_SKIP_CHAR); // terminate on first non-digit character (or timeout)
}
// as above but a given skipChar is ignored
// this allows format characters (typically commas) in values to be ignored
long Stream::parseInt(char skipChar)
{
boolean isNegative = false;
long value = 0;
int c;
c = peekNextDigit();
// ignore non numeric leading characters
if(c < 0)
return 0; // zero returned if timeout
do{
if(c == skipChar)
; // ignore this charactor
else if(c == '-')
isNegative = true;
else if(c >= '0' && c <= '9') // is c a digit?
value = value * 10 + c - '0';
read(); // consume the character we got with peek
c = timedPeek();
}
while( (c >= '0' && c <= '9') || c == skipChar );
if(isNegative)
value = -value;
return value;
}
// as parseInt but returns a floating point value
float Stream::parseFloat()
{
return parseFloat(NO_SKIP_CHAR);
}
// as above but the given skipChar is ignored
// this allows format characters (typically commas) in values to be ignored
float Stream::parseFloat(char skipChar){
boolean isNegative = false;
boolean isFraction = false;
long value = 0;
char c;
float fraction = 1.0;
c = peekNextDigit();
// ignore non numeric leading characters
if(c < 0)
return 0; // zero returned if timeout
do{
if(c == skipChar)
; // ignore
else if(c == '-')
isNegative = true;
else if (c == '.')
isFraction = true;
else if(c >= '0' && c <= '9') { // is c a digit?
value = value * 10 + c - '0';
if(isFraction)
fraction *= 0.1;
}
read(); // consume the character we got with peek
c = timedPeek();
}
while( (c >= '0' && c <= '9') || c == '.' || c == skipChar );
if(isNegative)
value = -value;
if(isFraction)
return value * fraction;
else
return value;
}
// read characters from stream into buffer
// terminates if length characters have been read, or timeout (see setTimeout)
// returns the number of characters placed in the buffer
// the buffer is NOT null terminated.
//
size_t Stream::readBytes(char *buffer, size_t length)
{
size_t count = 0;
while (count < length) {
int c = timedRead();
if (c < 0) break;
*buffer++ = (char)c;
count++;
}
return count;
}
// as readBytes with terminator character
// terminates if length characters have been read, timeout, or if the terminator character detected
// returns the number of characters placed in the buffer (0 means no valid data found)
size_t Stream::readBytesUntil(char terminator, char *buffer, size_t length)
{
if (length < 1) return 0;
size_t index = 0;
while (index < length) {
int c = timedRead();
if (c < 0 || c == terminator) break;
*buffer++ = (char)c;
index++;
}
return index; // return number of characters, not including null terminator
}
String Stream::readString()
{
String ret;
int c = timedRead();
while (c >= 0)
{
ret += (char)c;
c = timedRead();
}
return ret;
}
String Stream::readStringUntil(char terminator)
{
String ret;
int c = timedRead();
while (c >= 0 && c != terminator)
{
ret += (char)c;
c = timedRead();
}
return ret;
}

View File

@@ -1,96 +0,0 @@
/*
Stream.h - base class for character-based streams.
Copyright (c) 2010 David A. Mellis. All right reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
parsing functions based on TextFinder library by Michael Margolis
*/
#ifndef Stream_h
#define Stream_h
#include <inttypes.h>
#include "Print.h"
// compatability macros for testing
/*
#define getInt() parseInt()
#define getInt(skipChar) parseInt(skipchar)
#define getFloat() parseFloat()
#define getFloat(skipChar) parseFloat(skipChar)
#define getString( pre_string, post_string, buffer, length)
readBytesBetween( pre_string, terminator, buffer, length)
*/
class Stream : public Print
{
private:
unsigned long _timeout; // number of milliseconds to wait for the next char before aborting timed read
unsigned long _startMillis; // used for timeout measurement
int timedRead(); // private method to read stream with timeout
int timedPeek(); // private method to peek stream with timeout
int peekNextDigit(); // returns the next numeric digit in the stream or -1 if timeout
public:
virtual int available() = 0;
virtual int read() = 0;
virtual int peek() = 0;
virtual void flush() = 0;
Stream() {_timeout=1000;}
// parsing methods
void setTimeout(unsigned long timeout); // sets maximum milliseconds to wait for stream data, default is 1 second
bool find(char *target); // reads data from the stream until the target string is found
// returns true if target string is found, false if timed out (see setTimeout)
bool find(char *target, size_t length); // reads data from the stream until the target string of given length is found
// returns true if target string is found, false if timed out
bool findUntil(char *target, char *terminator); // as find but search ends if the terminator string is found
bool findUntil(char *target, size_t targetLen, char *terminate, size_t termLen); // as above but search ends if the terminate string is found
long parseInt(); // returns the first valid (long) integer value from the current position.
// initial characters that are not digits (or the minus sign) are skipped
// integer is terminated by the first character that is not a digit.
float parseFloat(); // float version of parseInt
size_t readBytes( char *buffer, size_t length); // read chars from stream into buffer
// terminates if length characters have been read or timeout (see setTimeout)
// returns the number of characters placed in the buffer (0 means no valid data found)
size_t readBytesUntil( char terminator, char *buffer, size_t length); // as readBytes with terminator character
// terminates if length characters have been read, timeout, or if the terminator character detected
// returns the number of characters placed in the buffer (0 means no valid data found)
// Arduino String functions to be added here
String readString();
String readStringUntil(char terminator);
protected:
long parseInt(char skipChar); // as above but the given skipChar is ignored
// as above but the given skipChar is ignored
// this allows format characters (typically commas) in values to be ignored
float parseFloat(char skipChar); // as above but the given skipChar is ignored
};
#endif

View File

@@ -1,616 +0,0 @@
/* Tone.cpp
A Tone Generator Library
Written by Brett Hagman
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Version Modified By Date Comments
------- ----------- -------- --------
0001 B Hagman 09/08/02 Initial coding
0002 B Hagman 09/08/18 Multiple pins
0003 B Hagman 09/08/18 Moved initialization from constructor to begin()
0004 B Hagman 09/09/26 Fixed problems with ATmega8
0005 B Hagman 09/11/23 Scanned prescalars for best fit on 8 bit timers
09/11/25 Changed pin toggle method to XOR
09/11/25 Fixed timer0 from being excluded
0006 D Mellis 09/12/29 Replaced objects with functions
0007 M Sproul 10/08/29 Changed #ifdefs from cpu to register
0008 S Kanemoto 12/06/22 Fixed for Leonardo by @maris_HY
*************************************************/
#include <avr/interrupt.h>
#include <avr/pgmspace.h>
#include "Arduino.h"
#include "pins_arduino.h"
#if defined(__AVR_ATmega8__) || defined(__AVR_ATmega128__)
#define TCCR2A TCCR2
#define TCCR2B TCCR2
#define COM2A1 COM21
#define COM2A0 COM20
#define OCR2A OCR2
#define TIMSK2 TIMSK
#define OCIE2A OCIE2
#define TIMER2_COMPA_vect TIMER2_COMP_vect
#define TIMSK1 TIMSK
#endif
// timerx_toggle_count:
// > 0 - duration specified
// = 0 - stopped
// < 0 - infinitely (until stop() method called, or new play() called)
#if !defined(__AVR_ATmega8__)
volatile long timer0_toggle_count;
volatile uint8_t *timer0_pin_port;
volatile uint8_t timer0_pin_mask;
#endif
volatile long timer1_toggle_count;
volatile uint8_t *timer1_pin_port;
volatile uint8_t timer1_pin_mask;
volatile long timer2_toggle_count;
volatile uint8_t *timer2_pin_port;
volatile uint8_t timer2_pin_mask;
#if defined(TIMSK3)
volatile long timer3_toggle_count;
volatile uint8_t *timer3_pin_port;
volatile uint8_t timer3_pin_mask;
#endif
#if defined(TIMSK4)
volatile long timer4_toggle_count;
volatile uint8_t *timer4_pin_port;
volatile uint8_t timer4_pin_mask;
#endif
#if defined(TIMSK5)
volatile long timer5_toggle_count;
volatile uint8_t *timer5_pin_port;
volatile uint8_t timer5_pin_mask;
#endif
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
#define AVAILABLE_TONE_PINS 1
#define USE_TIMER2
const uint8_t PROGMEM tone_pin_to_timer_PGM[] = { 2 /*, 3, 4, 5, 1, 0 */ };
static uint8_t tone_pins[AVAILABLE_TONE_PINS] = { 255 /*, 255, 255, 255, 255, 255 */ };
#elif defined(__AVR_ATmega8__)
#define AVAILABLE_TONE_PINS 1
#define USE_TIMER2
const uint8_t PROGMEM tone_pin_to_timer_PGM[] = { 2 /*, 1 */ };
static uint8_t tone_pins[AVAILABLE_TONE_PINS] = { 255 /*, 255 */ };
#elif defined(__AVR_ATmega32U4__)
#define AVAILABLE_TONE_PINS 1
#define USE_TIMER3
const uint8_t PROGMEM tone_pin_to_timer_PGM[] = { 3 /*, 1 */ };
static uint8_t tone_pins[AVAILABLE_TONE_PINS] = { 255 /*, 255 */ };
#else
#define AVAILABLE_TONE_PINS 1
#define USE_TIMER2
// Leave timer 0 to last.
const uint8_t PROGMEM tone_pin_to_timer_PGM[] = { 2 /*, 1, 0 */ };
static uint8_t tone_pins[AVAILABLE_TONE_PINS] = { 255 /*, 255, 255 */ };
#endif
static int8_t toneBegin(uint8_t _pin)
{
int8_t _timer = -1;
// if we're already using the pin, the timer should be configured.
for (int i = 0; i < AVAILABLE_TONE_PINS; i++) {
if (tone_pins[i] == _pin) {
return pgm_read_byte(tone_pin_to_timer_PGM + i);
}
}
// search for an unused timer.
for (int i = 0; i < AVAILABLE_TONE_PINS; i++) {
if (tone_pins[i] == 255) {
tone_pins[i] = _pin;
_timer = pgm_read_byte(tone_pin_to_timer_PGM + i);
break;
}
}
if (_timer != -1)
{
// Set timer specific stuff
// All timers in CTC mode
// 8 bit timers will require changing prescalar values,
// whereas 16 bit timers are set to either ck/1 or ck/64 prescalar
switch (_timer)
{
#if defined(TCCR0A) && defined(TCCR0B)
case 0:
// 8 bit timer
TCCR0A = 0;
TCCR0B = 0;
bitWrite(TCCR0A, WGM01, 1);
bitWrite(TCCR0B, CS00, 1);
timer0_pin_port = portOutputRegister(digitalPinToPort(_pin));
timer0_pin_mask = digitalPinToBitMask(_pin);
break;
#endif
#if defined(TCCR1A) && defined(TCCR1B) && defined(WGM12)
case 1:
// 16 bit timer
TCCR1A = 0;
TCCR1B = 0;
bitWrite(TCCR1B, WGM12, 1);
bitWrite(TCCR1B, CS10, 1);
timer1_pin_port = portOutputRegister(digitalPinToPort(_pin));
timer1_pin_mask = digitalPinToBitMask(_pin);
break;
#endif
#if defined(TCCR2A) && defined(TCCR2B)
case 2:
// 8 bit timer
TCCR2A = 0;
TCCR2B = 0;
bitWrite(TCCR2A, WGM21, 1);
bitWrite(TCCR2B, CS20, 1);
timer2_pin_port = portOutputRegister(digitalPinToPort(_pin));
timer2_pin_mask = digitalPinToBitMask(_pin);
break;
#endif
#if defined(TCCR3A) && defined(TCCR3B) && defined(TIMSK3)
case 3:
// 16 bit timer
TCCR3A = 0;
TCCR3B = 0;
bitWrite(TCCR3B, WGM32, 1);
bitWrite(TCCR3B, CS30, 1);
timer3_pin_port = portOutputRegister(digitalPinToPort(_pin));
timer3_pin_mask = digitalPinToBitMask(_pin);
break;
#endif
#if defined(TCCR4A) && defined(TCCR4B) && defined(TIMSK4)
case 4:
// 16 bit timer
TCCR4A = 0;
TCCR4B = 0;
#if defined(WGM42)
bitWrite(TCCR4B, WGM42, 1);
#elif defined(CS43)
#warning this may not be correct
// atmega32u4
bitWrite(TCCR4B, CS43, 1);
#endif
bitWrite(TCCR4B, CS40, 1);
timer4_pin_port = portOutputRegister(digitalPinToPort(_pin));
timer4_pin_mask = digitalPinToBitMask(_pin);
break;
#endif
#if defined(TCCR5A) && defined(TCCR5B) && defined(TIMSK5)
case 5:
// 16 bit timer
TCCR5A = 0;
TCCR5B = 0;
bitWrite(TCCR5B, WGM52, 1);
bitWrite(TCCR5B, CS50, 1);
timer5_pin_port = portOutputRegister(digitalPinToPort(_pin));
timer5_pin_mask = digitalPinToBitMask(_pin);
break;
#endif
}
}
return _timer;
}
// frequency (in hertz) and duration (in milliseconds).
void tone(uint8_t _pin, unsigned int frequency, unsigned long duration)
{
uint8_t prescalarbits = 0b001;
long toggle_count = 0;
uint32_t ocr = 0;
int8_t _timer;
_timer = toneBegin(_pin);
if (_timer >= 0)
{
// Set the pinMode as OUTPUT
pinMode(_pin, OUTPUT);
// if we are using an 8 bit timer, scan through prescalars to find the best fit
if (_timer == 0 || _timer == 2)
{
ocr = F_CPU / frequency / 2 - 1;
prescalarbits = 0b001; // ck/1: same for both timers
if (ocr > 255)
{
ocr = F_CPU / frequency / 2 / 8 - 1;
prescalarbits = 0b010; // ck/8: same for both timers
if (_timer == 2 && ocr > 255)
{
ocr = F_CPU / frequency / 2 / 32 - 1;
prescalarbits = 0b011;
}
if (ocr > 255)
{
ocr = F_CPU / frequency / 2 / 64 - 1;
prescalarbits = _timer == 0 ? 0b011 : 0b100;
if (_timer == 2 && ocr > 255)
{
ocr = F_CPU / frequency / 2 / 128 - 1;
prescalarbits = 0b101;
}
if (ocr > 255)
{
ocr = F_CPU / frequency / 2 / 256 - 1;
prescalarbits = _timer == 0 ? 0b100 : 0b110;
if (ocr > 255)
{
// can't do any better than /1024
ocr = F_CPU / frequency / 2 / 1024 - 1;
prescalarbits = _timer == 0 ? 0b101 : 0b111;
}
}
}
}
#if defined(TCCR0B)
if (_timer == 0)
{
TCCR0B = prescalarbits;
}
else
#endif
#if defined(TCCR2B)
{
TCCR2B = prescalarbits;
}
#else
{
// dummy place holder to make the above ifdefs work
}
#endif
}
else
{
// two choices for the 16 bit timers: ck/1 or ck/64
ocr = F_CPU / frequency / 2 - 1;
prescalarbits = 0b001;
if (ocr > 0xffff)
{
ocr = F_CPU / frequency / 2 / 64 - 1;
prescalarbits = 0b011;
}
if (_timer == 1)
{
#if defined(TCCR1B)
TCCR1B = (TCCR1B & 0b11111000) | prescalarbits;
#endif
}
#if defined(TCCR3B)
else if (_timer == 3)
TCCR3B = (TCCR3B & 0b11111000) | prescalarbits;
#endif
#if defined(TCCR4B)
else if (_timer == 4)
TCCR4B = (TCCR4B & 0b11111000) | prescalarbits;
#endif
#if defined(TCCR5B)
else if (_timer == 5)
TCCR5B = (TCCR5B & 0b11111000) | prescalarbits;
#endif
}
// Calculate the toggle count
if (duration > 0)
{
toggle_count = 2 * frequency * duration / 1000;
}
else
{
toggle_count = -1;
}
// Set the OCR for the given timer,
// set the toggle count,
// then turn on the interrupts
switch (_timer)
{
#if defined(OCR0A) && defined(TIMSK0) && defined(OCIE0A)
case 0:
OCR0A = ocr;
timer0_toggle_count = toggle_count;
bitWrite(TIMSK0, OCIE0A, 1);
break;
#endif
case 1:
#if defined(OCR1A) && defined(TIMSK1) && defined(OCIE1A)
OCR1A = ocr;
timer1_toggle_count = toggle_count;
bitWrite(TIMSK1, OCIE1A, 1);
#elif defined(OCR1A) && defined(TIMSK) && defined(OCIE1A)
// this combination is for at least the ATmega32
OCR1A = ocr;
timer1_toggle_count = toggle_count;
bitWrite(TIMSK, OCIE1A, 1);
#endif
break;
#if defined(OCR2A) && defined(TIMSK2) && defined(OCIE2A)
case 2:
OCR2A = ocr;
timer2_toggle_count = toggle_count;
bitWrite(TIMSK2, OCIE2A, 1);
break;
#endif
#if defined(TIMSK3)
case 3:
OCR3A = ocr;
timer3_toggle_count = toggle_count;
bitWrite(TIMSK3, OCIE3A, 1);
break;
#endif
#if defined(TIMSK4)
case 4:
OCR4A = ocr;
timer4_toggle_count = toggle_count;
bitWrite(TIMSK4, OCIE4A, 1);
break;
#endif
#if defined(OCR5A) && defined(TIMSK5) && defined(OCIE5A)
case 5:
OCR5A = ocr;
timer5_toggle_count = toggle_count;
bitWrite(TIMSK5, OCIE5A, 1);
break;
#endif
}
}
}
// XXX: this function only works properly for timer 2 (the only one we use
// currently). for the others, it should end the tone, but won't restore
// proper PWM functionality for the timer.
void disableTimer(uint8_t _timer)
{
switch (_timer)
{
case 0:
#if defined(TIMSK0)
TIMSK0 = 0;
#elif defined(TIMSK)
TIMSK = 0; // atmega32
#endif
break;
#if defined(TIMSK1) && defined(OCIE1A)
case 1:
bitWrite(TIMSK1, OCIE1A, 0);
break;
#endif
case 2:
#if defined(TIMSK2) && defined(OCIE2A)
bitWrite(TIMSK2, OCIE2A, 0); // disable interrupt
#endif
#if defined(TCCR2A) && defined(WGM20)
TCCR2A = (1 << WGM20);
#endif
#if defined(TCCR2B) && defined(CS22)
TCCR2B = (TCCR2B & 0b11111000) | (1 << CS22);
#endif
#if defined(OCR2A)
OCR2A = 0;
#endif
break;
#if defined(TIMSK3)
case 3:
TIMSK3 = 0;
break;
#endif
#if defined(TIMSK4)
case 4:
TIMSK4 = 0;
break;
#endif
#if defined(TIMSK5)
case 5:
TIMSK5 = 0;
break;
#endif
}
}
void noTone(uint8_t _pin)
{
int8_t _timer = -1;
for (int i = 0; i < AVAILABLE_TONE_PINS; i++) {
if (tone_pins[i] == _pin) {
_timer = pgm_read_byte(tone_pin_to_timer_PGM + i);
tone_pins[i] = 255;
}
}
disableTimer(_timer);
digitalWrite(_pin, 0);
}
#ifdef USE_TIMER0
ISR(TIMER0_COMPA_vect)
{
if (timer0_toggle_count != 0)
{
// toggle the pin
*timer0_pin_port ^= timer0_pin_mask;
if (timer0_toggle_count > 0)
timer0_toggle_count--;
}
else
{
disableTimer(0);
*timer0_pin_port &= ~(timer0_pin_mask); // keep pin low after stop
}
}
#endif
#ifdef USE_TIMER1
ISR(TIMER1_COMPA_vect)
{
if (timer1_toggle_count != 0)
{
// toggle the pin
*timer1_pin_port ^= timer1_pin_mask;
if (timer1_toggle_count > 0)
timer1_toggle_count--;
}
else
{
disableTimer(1);
*timer1_pin_port &= ~(timer1_pin_mask); // keep pin low after stop
}
}
#endif
#ifdef USE_TIMER2
ISR(TIMER2_COMPA_vect)
{
if (timer2_toggle_count != 0)
{
// toggle the pin
*timer2_pin_port ^= timer2_pin_mask;
if (timer2_toggle_count > 0)
timer2_toggle_count--;
}
else
{
// need to call noTone() so that the tone_pins[] entry is reset, so the
// timer gets initialized next time we call tone().
// XXX: this assumes timer 2 is always the first one used.
noTone(tone_pins[0]);
// disableTimer(2);
// *timer2_pin_port &= ~(timer2_pin_mask); // keep pin low after stop
}
}
#endif
#ifdef USE_TIMER3
ISR(TIMER3_COMPA_vect)
{
if (timer3_toggle_count != 0)
{
// toggle the pin
*timer3_pin_port ^= timer3_pin_mask;
if (timer3_toggle_count > 0)
timer3_toggle_count--;
}
else
{
disableTimer(3);
*timer3_pin_port &= ~(timer3_pin_mask); // keep pin low after stop
}
}
#endif
#ifdef USE_TIMER4
ISR(TIMER4_COMPA_vect)
{
if (timer4_toggle_count != 0)
{
// toggle the pin
*timer4_pin_port ^= timer4_pin_mask;
if (timer4_toggle_count > 0)
timer4_toggle_count--;
}
else
{
disableTimer(4);
*timer4_pin_port &= ~(timer4_pin_mask); // keep pin low after stop
}
}
#endif
#ifdef USE_TIMER5
ISR(TIMER5_COMPA_vect)
{
if (timer5_toggle_count != 0)
{
// toggle the pin
*timer5_pin_port ^= timer5_pin_mask;
if (timer5_toggle_count > 0)
timer5_toggle_count--;
}
else
{
disableTimer(5);
*timer5_pin_port &= ~(timer5_pin_mask); // keep pin low after stop
}
}
#endif

View File

@@ -1,196 +0,0 @@
#ifndef __USBAPI__
#define __USBAPI__
#if defined(USBCON)
//================================================================================
//================================================================================
// USB
class USBDevice_
{
public:
USBDevice_();
bool configured();
void attach();
void detach(); // Serial port goes down too...
void poll();
};
extern USBDevice_ USBDevice;
//================================================================================
//================================================================================
// Serial over CDC (Serial1 is the physical port)
class Serial_ : public Stream
{
private:
ring_buffer *_cdc_rx_buffer;
public:
void begin(uint16_t baud_count);
void end(void);
virtual int available(void);
virtual void accept(void);
virtual int peek(void);
virtual int read(void);
virtual void flush(void);
virtual size_t write(uint8_t);
using Print::write; // pull in write(str) and write(buf, size) from Print
operator bool();
};
extern Serial_ Serial;
//================================================================================
//================================================================================
// Mouse
#define MOUSE_LEFT 1
#define MOUSE_RIGHT 2
#define MOUSE_MIDDLE 4
#define MOUSE_ALL (MOUSE_LEFT | MOUSE_RIGHT | MOUSE_MIDDLE)
class Mouse_
{
private:
uint8_t _buttons;
void buttons(uint8_t b);
public:
Mouse_(void);
void begin(void);
void end(void);
void click(uint8_t b = MOUSE_LEFT);
void move(signed char x, signed char y, signed char wheel = 0);
void press(uint8_t b = MOUSE_LEFT); // press LEFT by default
void release(uint8_t b = MOUSE_LEFT); // release LEFT by default
bool isPressed(uint8_t b = MOUSE_LEFT); // check LEFT by default
};
extern Mouse_ Mouse;
//================================================================================
//================================================================================
// Keyboard
#define KEY_LEFT_CTRL 0x80
#define KEY_LEFT_SHIFT 0x81
#define KEY_LEFT_ALT 0x82
#define KEY_LEFT_GUI 0x83
#define KEY_RIGHT_CTRL 0x84
#define KEY_RIGHT_SHIFT 0x85
#define KEY_RIGHT_ALT 0x86
#define KEY_RIGHT_GUI 0x87
#define KEY_UP_ARROW 0xDA
#define KEY_DOWN_ARROW 0xD9
#define KEY_LEFT_ARROW 0xD8
#define KEY_RIGHT_ARROW 0xD7
#define KEY_BACKSPACE 0xB2
#define KEY_TAB 0xB3
#define KEY_RETURN 0xB0
#define KEY_ESC 0xB1
#define KEY_INSERT 0xD1
#define KEY_DELETE 0xD4
#define KEY_PAGE_UP 0xD3
#define KEY_PAGE_DOWN 0xD6
#define KEY_HOME 0xD2
#define KEY_END 0xD5
#define KEY_CAPS_LOCK 0xC1
#define KEY_F1 0xC2
#define KEY_F2 0xC3
#define KEY_F3 0xC4
#define KEY_F4 0xC5
#define KEY_F5 0xC6
#define KEY_F6 0xC7
#define KEY_F7 0xC8
#define KEY_F8 0xC9
#define KEY_F9 0xCA
#define KEY_F10 0xCB
#define KEY_F11 0xCC
#define KEY_F12 0xCD
// Low level key report: up to 6 keys and shift, ctrl etc at once
typedef struct
{
uint8_t modifiers;
uint8_t reserved;
uint8_t keys[6];
} KeyReport;
class Keyboard_ : public Print
{
private:
KeyReport _keyReport;
void sendReport(KeyReport* keys);
public:
Keyboard_(void);
void begin(void);
void end(void);
virtual size_t write(uint8_t k);
virtual size_t press(uint8_t k);
virtual size_t release(uint8_t k);
virtual void releaseAll(void);
};
extern Keyboard_ Keyboard;
//================================================================================
//================================================================================
// Low level API
typedef struct
{
uint8_t bmRequestType;
uint8_t bRequest;
uint8_t wValueL;
uint8_t wValueH;
uint16_t wIndex;
uint16_t wLength;
} Setup;
//================================================================================
//================================================================================
// HID 'Driver'
int HID_GetInterface(uint8_t* interfaceNum);
int HID_GetDescriptor(int i);
bool HID_Setup(Setup& setup);
void HID_SendReport(uint8_t id, const void* data, int len);
//================================================================================
//================================================================================
// MSC 'Driver'
int MSC_GetInterface(uint8_t* interfaceNum);
int MSC_GetDescriptor(int i);
bool MSC_Setup(Setup& setup);
bool MSC_Data(uint8_t rx,uint8_t tx);
//================================================================================
//================================================================================
// CSC 'Driver'
int CDC_GetInterface(uint8_t* interfaceNum);
int CDC_GetDescriptor(int i);
bool CDC_Setup(Setup& setup);
//================================================================================
//================================================================================
#define TRANSFER_PGM 0x80
#define TRANSFER_RELEASE 0x40
#define TRANSFER_ZERO 0x20
int USB_SendControl(uint8_t flags, const void* d, int len);
int USB_RecvControl(void* d, int len);
uint8_t USB_Available(uint8_t ep);
int USB_Send(uint8_t ep, const void* data, int len); // blocking
int USB_Recv(uint8_t ep, void* data, int len); // non-blocking
int USB_Recv(uint8_t ep); // non-blocking
void USB_Flush(uint8_t ep);
#endif
#endif /* if defined(USBCON) */

View File

@@ -1,684 +0,0 @@
/* Copyright (c) 2010, Peter Barrett
**
** Permission to use, copy, modify, and/or distribute this software for
** any purpose with or without fee is hereby granted, provided that the
** above copyright notice and this permission notice appear in all copies.
**
** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
** WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
** WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
** BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
** OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
** WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
** ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
** SOFTWARE.
*/
#include "Platform.h"
#include "USBAPI.h"
#include "USBDesc.h"
#if defined(USBCON)
#define EP_TYPE_CONTROL 0x00
#define EP_TYPE_BULK_IN 0x81
#define EP_TYPE_BULK_OUT 0x80
#define EP_TYPE_INTERRUPT_IN 0xC1
#define EP_TYPE_INTERRUPT_OUT 0xC0
#define EP_TYPE_ISOCHRONOUS_IN 0x41
#define EP_TYPE_ISOCHRONOUS_OUT 0x40
/** Pulse generation counters to keep track of the number of milliseconds remaining for each pulse type */
#define TX_RX_LED_PULSE_MS 100
volatile u8 TxLEDPulse; /**< Milliseconds remaining for data Tx LED pulse */
volatile u8 RxLEDPulse; /**< Milliseconds remaining for data Rx LED pulse */
//==================================================================
//==================================================================
extern const u16 STRING_LANGUAGE[] PROGMEM;
extern const u16 STRING_IPRODUCT[] PROGMEM;
extern const u16 STRING_IMANUFACTURER[] PROGMEM;
extern const DeviceDescriptor USB_DeviceDescriptor PROGMEM;
extern const DeviceDescriptor USB_DeviceDescriptorA PROGMEM;
const u16 STRING_LANGUAGE[2] = {
(3<<8) | (2+2),
0x0409 // English
};
const u16 STRING_IPRODUCT[17] = {
(3<<8) | (2+2*16),
#if USB_PID == 0x8036
'A','r','d','u','i','n','o',' ','L','e','o','n','a','r','d','o'
#elif USB_PID == 0x8037
'A','r','d','u','i','n','o',' ','M','i','c','r','o',' ',' ',' '
#elif USB_PID == 0x803C
'A','r','d','u','i','n','o',' ','E','s','p','l','o','r','a',' '
#elif USB_PID == 0x9208
'L','i','l','y','P','a','d','U','S','B',' ',' ',' ',' ',' ',' '
#else
'U','S','B',' ','I','O',' ','B','o','a','r','d',' ',' ',' ',' '
#endif
};
const u16 STRING_IMANUFACTURER[12] = {
(3<<8) | (2+2*11),
#if USB_VID == 0x2341
'A','r','d','u','i','n','o',' ','L','L','C'
#elif USB_VID == 0x1b4f
'S','p','a','r','k','F','u','n',' ',' ',' '
#else
'U','n','k','n','o','w','n',' ',' ',' ',' '
#endif
};
#ifdef CDC_ENABLED
#define DEVICE_CLASS 0x02
#else
#define DEVICE_CLASS 0x00
#endif
// DEVICE DESCRIPTOR
const DeviceDescriptor USB_DeviceDescriptor =
D_DEVICE(0x00,0x00,0x00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
const DeviceDescriptor USB_DeviceDescriptorA =
D_DEVICE(DEVICE_CLASS,0x00,0x00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
//==================================================================
//==================================================================
volatile u8 _usbConfiguration = 0;
static inline void WaitIN(void)
{
while (!(UEINTX & (1<<TXINI)));
}
static inline void ClearIN(void)
{
UEINTX = ~(1<<TXINI);
}
static inline void WaitOUT(void)
{
while (!(UEINTX & (1<<RXOUTI)))
;
}
static inline u8 WaitForINOrOUT()
{
while (!(UEINTX & ((1<<TXINI)|(1<<RXOUTI))))
;
return (UEINTX & (1<<RXOUTI)) == 0;
}
static inline void ClearOUT(void)
{
UEINTX = ~(1<<RXOUTI);
}
void Recv(volatile u8* data, u8 count)
{
while (count--)
*data++ = UEDATX;
RXLED1; // light the RX LED
RxLEDPulse = TX_RX_LED_PULSE_MS;
}
static inline u8 Recv8()
{
RXLED1; // light the RX LED
RxLEDPulse = TX_RX_LED_PULSE_MS;
return UEDATX;
}
static inline void Send8(u8 d)
{
UEDATX = d;
}
static inline void SetEP(u8 ep)
{
UENUM = ep;
}
static inline u8 FifoByteCount()
{
return UEBCLX;
}
static inline u8 ReceivedSetupInt()
{
return UEINTX & (1<<RXSTPI);
}
static inline void ClearSetupInt()
{
UEINTX = ~((1<<RXSTPI) | (1<<RXOUTI) | (1<<TXINI));
}
static inline void Stall()
{
UECONX = (1<<STALLRQ) | (1<<EPEN);
}
static inline u8 ReadWriteAllowed()
{
return UEINTX & (1<<RWAL);
}
static inline u8 Stalled()
{
return UEINTX & (1<<STALLEDI);
}
static inline u8 FifoFree()
{
return UEINTX & (1<<FIFOCON);
}
static inline void ReleaseRX()
{
UEINTX = 0x6B; // FIFOCON=0 NAKINI=1 RWAL=1 NAKOUTI=0 RXSTPI=1 RXOUTI=0 STALLEDI=1 TXINI=1
}
static inline void ReleaseTX()
{
UEINTX = 0x3A; // FIFOCON=0 NAKINI=0 RWAL=1 NAKOUTI=1 RXSTPI=1 RXOUTI=0 STALLEDI=1 TXINI=0
}
static inline u8 FrameNumber()
{
return UDFNUML;
}
//==================================================================
//==================================================================
u8 USBGetConfiguration(void)
{
return _usbConfiguration;
}
#define USB_RECV_TIMEOUT
class LockEP
{
u8 _sreg;
public:
LockEP(u8 ep) : _sreg(SREG)
{
cli();
SetEP(ep & 7);
}
~LockEP()
{
SREG = _sreg;
}
};
// Number of bytes, assumes a rx endpoint
u8 USB_Available(u8 ep)
{
LockEP lock(ep);
return FifoByteCount();
}
// Non Blocking receive
// Return number of bytes read
int USB_Recv(u8 ep, void* d, int len)
{
if (!_usbConfiguration || len < 0)
return -1;
LockEP lock(ep);
u8 n = FifoByteCount();
len = min(n,len);
n = len;
u8* dst = (u8*)d;
while (n--)
*dst++ = Recv8();
if (len && !FifoByteCount()) // release empty buffer
ReleaseRX();
return len;
}
// Recv 1 byte if ready
int USB_Recv(u8 ep)
{
u8 c;
if (USB_Recv(ep,&c,1) != 1)
return -1;
return c;
}
// Space in send EP
u8 USB_SendSpace(u8 ep)
{
LockEP lock(ep);
if (!ReadWriteAllowed())
return 0;
return 64 - FifoByteCount();
}
// Blocking Send of data to an endpoint
int USB_Send(u8 ep, const void* d, int len)
{
if (!_usbConfiguration)
return -1;
int r = len;
const u8* data = (const u8*)d;
u8 zero = ep & TRANSFER_ZERO;
u8 timeout = 250; // 250ms timeout on send? TODO
while (len)
{
u8 n = USB_SendSpace(ep);
if (n == 0)
{
if (!(--timeout))
return -1;
delay(1);
continue;
}
if (n > len)
n = len;
len -= n;
{
LockEP lock(ep);
if (ep & TRANSFER_ZERO)
{
while (n--)
Send8(0);
}
else if (ep & TRANSFER_PGM)
{
while (n--)
Send8(pgm_read_byte(data++));
}
else
{
while (n--)
Send8(*data++);
}
if (!ReadWriteAllowed() || ((len == 0) && (ep & TRANSFER_RELEASE))) // Release full buffer
ReleaseTX();
}
}
TXLED1; // light the TX LED
TxLEDPulse = TX_RX_LED_PULSE_MS;
return r;
}
extern const u8 _initEndpoints[] PROGMEM;
const u8 _initEndpoints[] =
{
0,
#ifdef CDC_ENABLED
EP_TYPE_INTERRUPT_IN, // CDC_ENDPOINT_ACM
EP_TYPE_BULK_OUT, // CDC_ENDPOINT_OUT
EP_TYPE_BULK_IN, // CDC_ENDPOINT_IN
#endif
#ifdef HID_ENABLED
EP_TYPE_INTERRUPT_IN // HID_ENDPOINT_INT
#endif
};
#define EP_SINGLE_64 0x32 // EP0
#define EP_DOUBLE_64 0x36 // Other endpoints
static
void InitEP(u8 index, u8 type, u8 size)
{
UENUM = index;
UECONX = 1;
UECFG0X = type;
UECFG1X = size;
}
static
void InitEndpoints()
{
for (u8 i = 1; i < sizeof(_initEndpoints); i++)
{
UENUM = i;
UECONX = 1;
UECFG0X = pgm_read_byte(_initEndpoints+i);
UECFG1X = EP_DOUBLE_64;
}
UERST = 0x7E; // And reset them
UERST = 0;
}
// Handle CLASS_INTERFACE requests
static
bool ClassInterfaceRequest(Setup& setup)
{
u8 i = setup.wIndex;
#ifdef CDC_ENABLED
if (CDC_ACM_INTERFACE == i)
return CDC_Setup(setup);
#endif
#ifdef HID_ENABLED
if (HID_INTERFACE == i)
return HID_Setup(setup);
#endif
return false;
}
int _cmark;
int _cend;
void InitControl(int end)
{
SetEP(0);
_cmark = 0;
_cend = end;
}
static
bool SendControl(u8 d)
{
if (_cmark < _cend)
{
if (!WaitForINOrOUT())
return false;
Send8(d);
if (!((_cmark + 1) & 0x3F))
ClearIN(); // Fifo is full, release this packet
}
_cmark++;
return true;
};
// Clipped by _cmark/_cend
int USB_SendControl(u8 flags, const void* d, int len)
{
int sent = len;
const u8* data = (const u8*)d;
bool pgm = flags & TRANSFER_PGM;
while (len--)
{
u8 c = pgm ? pgm_read_byte(data++) : *data++;
if (!SendControl(c))
return -1;
}
return sent;
}
// Does not timeout or cross fifo boundaries
// Will only work for transfers <= 64 bytes
// TODO
int USB_RecvControl(void* d, int len)
{
WaitOUT();
Recv((u8*)d,len);
ClearOUT();
return len;
}
int SendInterfaces()
{
int total = 0;
u8 interfaces = 0;
#ifdef CDC_ENABLED
total = CDC_GetInterface(&interfaces);
#endif
#ifdef HID_ENABLED
total += HID_GetInterface(&interfaces);
#endif
return interfaces;
}
// Construct a dynamic configuration descriptor
// This really needs dynamic endpoint allocation etc
// TODO
static
bool SendConfiguration(int maxlen)
{
// Count and measure interfaces
InitControl(0);
int interfaces = SendInterfaces();
ConfigDescriptor config = D_CONFIG(_cmark + sizeof(ConfigDescriptor),interfaces);
// Now send them
InitControl(maxlen);
USB_SendControl(0,&config,sizeof(ConfigDescriptor));
SendInterfaces();
return true;
}
u8 _cdcComposite = 0;
static
bool SendDescriptor(Setup& setup)
{
u8 t = setup.wValueH;
if (USB_CONFIGURATION_DESCRIPTOR_TYPE == t)
return SendConfiguration(setup.wLength);
InitControl(setup.wLength);
#ifdef HID_ENABLED
if (HID_REPORT_DESCRIPTOR_TYPE == t)
return HID_GetDescriptor(t);
#endif
u8 desc_length = 0;
const u8* desc_addr = 0;
if (USB_DEVICE_DESCRIPTOR_TYPE == t)
{
if (setup.wLength == 8)
_cdcComposite = 1;
desc_addr = _cdcComposite ? (const u8*)&USB_DeviceDescriptorA : (const u8*)&USB_DeviceDescriptor;
}
else if (USB_STRING_DESCRIPTOR_TYPE == t)
{
if (setup.wValueL == 0)
desc_addr = (const u8*)&STRING_LANGUAGE;
else if (setup.wValueL == IPRODUCT)
desc_addr = (const u8*)&STRING_IPRODUCT;
else if (setup.wValueL == IMANUFACTURER)
desc_addr = (const u8*)&STRING_IMANUFACTURER;
else
return false;
}
if (desc_addr == 0)
return false;
if (desc_length == 0)
desc_length = pgm_read_byte(desc_addr);
USB_SendControl(TRANSFER_PGM,desc_addr,desc_length);
return true;
}
// Endpoint 0 interrupt
ISR(USB_COM_vect)
{
SetEP(0);
if (!ReceivedSetupInt())
return;
Setup setup;
Recv((u8*)&setup,8);
ClearSetupInt();
u8 requestType = setup.bmRequestType;
if (requestType & REQUEST_DEVICETOHOST)
WaitIN();
else
ClearIN();
bool ok = true;
if (REQUEST_STANDARD == (requestType & REQUEST_TYPE))
{
// Standard Requests
u8 r = setup.bRequest;
if (GET_STATUS == r)
{
Send8(0); // TODO
Send8(0);
}
else if (CLEAR_FEATURE == r)
{
}
else if (SET_FEATURE == r)
{
}
else if (SET_ADDRESS == r)
{
WaitIN();
UDADDR = setup.wValueL | (1<<ADDEN);
}
else if (GET_DESCRIPTOR == r)
{
ok = SendDescriptor(setup);
}
else if (SET_DESCRIPTOR == r)
{
ok = false;
}
else if (GET_CONFIGURATION == r)
{
Send8(1);
}
else if (SET_CONFIGURATION == r)
{
if (REQUEST_DEVICE == (requestType & REQUEST_RECIPIENT))
{
InitEndpoints();
_usbConfiguration = setup.wValueL;
} else
ok = false;
}
else if (GET_INTERFACE == r)
{
}
else if (SET_INTERFACE == r)
{
}
}
else
{
InitControl(setup.wLength); // Max length of transfer
ok = ClassInterfaceRequest(setup);
}
if (ok)
ClearIN();
else
{
Stall();
}
}
void USB_Flush(u8 ep)
{
SetEP(ep);
if (FifoByteCount())
ReleaseTX();
}
// General interrupt
ISR(USB_GEN_vect)
{
u8 udint = UDINT;
UDINT = 0;
// End of Reset
if (udint & (1<<EORSTI))
{
InitEP(0,EP_TYPE_CONTROL,EP_SINGLE_64); // init ep0
_usbConfiguration = 0; // not configured yet
UEIENX = 1 << RXSTPE; // Enable interrupts for ep0
}
// Start of Frame - happens every millisecond so we use it for TX and RX LED one-shot timing, too
if (udint & (1<<SOFI))
{
#ifdef CDC_ENABLED
USB_Flush(CDC_TX); // Send a tx frame if found
if (USB_Available(CDC_RX)) // Handle received bytes (if any)
Serial.accept();
#endif
// check whether the one-shot period has elapsed. if so, turn off the LED
if (TxLEDPulse && !(--TxLEDPulse))
TXLED0;
if (RxLEDPulse && !(--RxLEDPulse))
RXLED0;
}
}
// VBUS or counting frames
// Any frame counting?
u8 USBConnected()
{
u8 f = UDFNUML;
delay(3);
return f != UDFNUML;
}
//=======================================================================
//=======================================================================
USBDevice_ USBDevice;
USBDevice_::USBDevice_()
{
}
void USBDevice_::attach()
{
_usbConfiguration = 0;
UHWCON = 0x01; // power internal reg
USBCON = (1<<USBE)|(1<<FRZCLK); // clock frozen, usb enabled
#if F_CPU == 16000000UL
PLLCSR = 0x12; // Need 16 MHz xtal
#elif F_CPU == 8000000UL
PLLCSR = 0x02; // Need 8 MHz xtal
#endif
while (!(PLLCSR & (1<<PLOCK))) // wait for lock pll
;
// Some tests on specific versions of macosx (10.7.3), reported some
// strange behaviuors when the board is reset using the serial
// port touch at 1200 bps. This delay fixes this behaviour.
delay(1);
USBCON = ((1<<USBE)|(1<<OTGPADE)); // start USB clock
UDIEN = (1<<EORSTE)|(1<<SOFE); // Enable interrupts for EOR (End of Reset) and SOF (start of frame)
UDCON = 0; // enable attach resistor
TX_RX_LED_INIT;
}
void USBDevice_::detach()
{
}
// Check for interrupts
// TODO: VBUS detection
bool USBDevice_::configured()
{
return _usbConfiguration;
}
void USBDevice_::poll()
{
}
#endif /* if defined(USBCON) */

View File

@@ -1,303 +0,0 @@
// Copyright (c) 2010, Peter Barrett
/*
** Permission to use, copy, modify, and/or distribute this software for
** any purpose with or without fee is hereby granted, provided that the
** above copyright notice and this permission notice appear in all copies.
**
** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
** WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
** WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
** BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
** OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
** WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
** ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
** SOFTWARE.
*/
#ifndef __USBCORE_H__
#define __USBCORE_H__
// Standard requests
#define GET_STATUS 0
#define CLEAR_FEATURE 1
#define SET_FEATURE 3
#define SET_ADDRESS 5
#define GET_DESCRIPTOR 6
#define SET_DESCRIPTOR 7
#define GET_CONFIGURATION 8
#define SET_CONFIGURATION 9
#define GET_INTERFACE 10
#define SET_INTERFACE 11
// bmRequestType
#define REQUEST_HOSTTODEVICE 0x00
#define REQUEST_DEVICETOHOST 0x80
#define REQUEST_DIRECTION 0x80
#define REQUEST_STANDARD 0x00
#define REQUEST_CLASS 0x20
#define REQUEST_VENDOR 0x40
#define REQUEST_TYPE 0x60
#define REQUEST_DEVICE 0x00
#define REQUEST_INTERFACE 0x01
#define REQUEST_ENDPOINT 0x02
#define REQUEST_OTHER 0x03
#define REQUEST_RECIPIENT 0x03
#define REQUEST_DEVICETOHOST_CLASS_INTERFACE (REQUEST_DEVICETOHOST + REQUEST_CLASS + REQUEST_INTERFACE)
#define REQUEST_HOSTTODEVICE_CLASS_INTERFACE (REQUEST_HOSTTODEVICE + REQUEST_CLASS + REQUEST_INTERFACE)
// Class requests
#define CDC_SET_LINE_CODING 0x20
#define CDC_GET_LINE_CODING 0x21
#define CDC_SET_CONTROL_LINE_STATE 0x22
#define MSC_RESET 0xFF
#define MSC_GET_MAX_LUN 0xFE
#define HID_GET_REPORT 0x01
#define HID_GET_IDLE 0x02
#define HID_GET_PROTOCOL 0x03
#define HID_SET_REPORT 0x09
#define HID_SET_IDLE 0x0A
#define HID_SET_PROTOCOL 0x0B
// Descriptors
#define USB_DEVICE_DESC_SIZE 18
#define USB_CONFIGUARTION_DESC_SIZE 9
#define USB_INTERFACE_DESC_SIZE 9
#define USB_ENDPOINT_DESC_SIZE 7
#define USB_DEVICE_DESCRIPTOR_TYPE 1
#define USB_CONFIGURATION_DESCRIPTOR_TYPE 2
#define USB_STRING_DESCRIPTOR_TYPE 3
#define USB_INTERFACE_DESCRIPTOR_TYPE 4
#define USB_ENDPOINT_DESCRIPTOR_TYPE 5
#define USB_DEVICE_CLASS_COMMUNICATIONS 0x02
#define USB_DEVICE_CLASS_HUMAN_INTERFACE 0x03
#define USB_DEVICE_CLASS_STORAGE 0x08
#define USB_DEVICE_CLASS_VENDOR_SPECIFIC 0xFF
#define USB_CONFIG_POWERED_MASK 0x40
#define USB_CONFIG_BUS_POWERED 0x80
#define USB_CONFIG_SELF_POWERED 0xC0
#define USB_CONFIG_REMOTE_WAKEUP 0x20
// bMaxPower in Configuration Descriptor
#define USB_CONFIG_POWER_MA(mA) ((mA)/2)
// bEndpointAddress in Endpoint Descriptor
#define USB_ENDPOINT_DIRECTION_MASK 0x80
#define USB_ENDPOINT_OUT(addr) ((addr) | 0x00)
#define USB_ENDPOINT_IN(addr) ((addr) | 0x80)
#define USB_ENDPOINT_TYPE_MASK 0x03
#define USB_ENDPOINT_TYPE_CONTROL 0x00
#define USB_ENDPOINT_TYPE_ISOCHRONOUS 0x01
#define USB_ENDPOINT_TYPE_BULK 0x02
#define USB_ENDPOINT_TYPE_INTERRUPT 0x03
#define TOBYTES(x) ((x) & 0xFF),(((x) >> 8) & 0xFF)
#define CDC_V1_10 0x0110
#define CDC_COMMUNICATION_INTERFACE_CLASS 0x02
#define CDC_CALL_MANAGEMENT 0x01
#define CDC_ABSTRACT_CONTROL_MODEL 0x02
#define CDC_HEADER 0x00
#define CDC_ABSTRACT_CONTROL_MANAGEMENT 0x02
#define CDC_UNION 0x06
#define CDC_CS_INTERFACE 0x24
#define CDC_CS_ENDPOINT 0x25
#define CDC_DATA_INTERFACE_CLASS 0x0A
#define MSC_SUBCLASS_SCSI 0x06
#define MSC_PROTOCOL_BULK_ONLY 0x50
#define HID_HID_DESCRIPTOR_TYPE 0x21
#define HID_REPORT_DESCRIPTOR_TYPE 0x22
#define HID_PHYSICAL_DESCRIPTOR_TYPE 0x23
// Device
typedef struct {
u8 len; // 18
u8 dtype; // 1 USB_DEVICE_DESCRIPTOR_TYPE
u16 usbVersion; // 0x200
u8 deviceClass;
u8 deviceSubClass;
u8 deviceProtocol;
u8 packetSize0; // Packet 0
u16 idVendor;
u16 idProduct;
u16 deviceVersion; // 0x100
u8 iManufacturer;
u8 iProduct;
u8 iSerialNumber;
u8 bNumConfigurations;
} DeviceDescriptor;
// Config
typedef struct {
u8 len; // 9
u8 dtype; // 2
u16 clen; // total length
u8 numInterfaces;
u8 config;
u8 iconfig;
u8 attributes;
u8 maxPower;
} ConfigDescriptor;
// String
// Interface
typedef struct
{
u8 len; // 9
u8 dtype; // 4
u8 number;
u8 alternate;
u8 numEndpoints;
u8 interfaceClass;
u8 interfaceSubClass;
u8 protocol;
u8 iInterface;
} InterfaceDescriptor;
// Endpoint
typedef struct
{
u8 len; // 7
u8 dtype; // 5
u8 addr;
u8 attr;
u16 packetSize;
u8 interval;
} EndpointDescriptor;
// Interface Association Descriptor
// Used to bind 2 interfaces together in CDC compostite device
typedef struct
{
u8 len; // 8
u8 dtype; // 11
u8 firstInterface;
u8 interfaceCount;
u8 functionClass;
u8 funtionSubClass;
u8 functionProtocol;
u8 iInterface;
} IADDescriptor;
// CDC CS interface descriptor
typedef struct
{
u8 len; // 5
u8 dtype; // 0x24
u8 subtype;
u8 d0;
u8 d1;
} CDCCSInterfaceDescriptor;
typedef struct
{
u8 len; // 4
u8 dtype; // 0x24
u8 subtype;
u8 d0;
} CDCCSInterfaceDescriptor4;
typedef struct
{
u8 len;
u8 dtype; // 0x24
u8 subtype; // 1
u8 bmCapabilities;
u8 bDataInterface;
} CMFunctionalDescriptor;
typedef struct
{
u8 len;
u8 dtype; // 0x24
u8 subtype; // 1
u8 bmCapabilities;
} ACMFunctionalDescriptor;
typedef struct
{
// IAD
IADDescriptor iad; // Only needed on compound device
// Control
InterfaceDescriptor cif; //
CDCCSInterfaceDescriptor header;
CMFunctionalDescriptor callManagement; // Call Management
ACMFunctionalDescriptor controlManagement; // ACM
CDCCSInterfaceDescriptor functionalDescriptor; // CDC_UNION
EndpointDescriptor cifin;
// Data
InterfaceDescriptor dif;
EndpointDescriptor in;
EndpointDescriptor out;
} CDCDescriptor;
typedef struct
{
InterfaceDescriptor msc;
EndpointDescriptor in;
EndpointDescriptor out;
} MSCDescriptor;
typedef struct
{
u8 len; // 9
u8 dtype; // 0x21
u8 addr;
u8 versionL; // 0x101
u8 versionH; // 0x101
u8 country;
u8 desctype; // 0x22 report
u8 descLenL;
u8 descLenH;
} HIDDescDescriptor;
typedef struct
{
InterfaceDescriptor hid;
HIDDescDescriptor desc;
EndpointDescriptor in;
} HIDDescriptor;
#define D_DEVICE(_class,_subClass,_proto,_packetSize0,_vid,_pid,_version,_im,_ip,_is,_configs) \
{ 18, 1, 0x200, _class,_subClass,_proto,_packetSize0,_vid,_pid,_version,_im,_ip,_is,_configs }
#define D_CONFIG(_totalLength,_interfaces) \
{ 9, 2, _totalLength,_interfaces, 1, 0, USB_CONFIG_BUS_POWERED, USB_CONFIG_POWER_MA(500) }
#define D_INTERFACE(_n,_numEndpoints,_class,_subClass,_protocol) \
{ 9, 4, _n, 0, _numEndpoints, _class,_subClass, _protocol, 0 }
#define D_ENDPOINT(_addr,_attr,_packetSize, _interval) \
{ 7, 5, _addr,_attr,_packetSize, _interval }
#define D_IAD(_firstInterface, _count, _class, _subClass, _protocol) \
{ 8, 11, _firstInterface, _count, _class, _subClass, _protocol, 0 }
#define D_HIDREPORT(_descriptorLength) \
{ 9, 0x21, 0x1, 0x1, 0, 1, 0x22, _descriptorLength, 0 }
#define D_CDCCS(_subtype,_d0,_d1) { 5, 0x24, _subtype, _d0, _d1 }
#define D_CDCCS4(_subtype,_d0) { 4, 0x24, _subtype, _d0 }
#endif

View File

@@ -1,63 +0,0 @@
/* Copyright (c) 2011, Peter Barrett
**
** Permission to use, copy, modify, and/or distribute this software for
** any purpose with or without fee is hereby granted, provided that the
** above copyright notice and this permission notice appear in all copies.
**
** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
** WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
** WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
** BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
** OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
** WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
** ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
** SOFTWARE.
*/
#define CDC_ENABLED
#define HID_ENABLED
#ifdef CDC_ENABLED
#define CDC_INTERFACE_COUNT 2
#define CDC_ENPOINT_COUNT 3
#else
#define CDC_INTERFACE_COUNT 0
#define CDC_ENPOINT_COUNT 0
#endif
#ifdef HID_ENABLED
#define HID_INTERFACE_COUNT 1
#define HID_ENPOINT_COUNT 1
#else
#define HID_INTERFACE_COUNT 0
#define HID_ENPOINT_COUNT 0
#endif
#define CDC_ACM_INTERFACE 0 // CDC ACM
#define CDC_DATA_INTERFACE 1 // CDC Data
#define CDC_FIRST_ENDPOINT 1
#define CDC_ENDPOINT_ACM (CDC_FIRST_ENDPOINT) // CDC First
#define CDC_ENDPOINT_OUT (CDC_FIRST_ENDPOINT+1)
#define CDC_ENDPOINT_IN (CDC_FIRST_ENDPOINT+2)
#define HID_INTERFACE (CDC_ACM_INTERFACE + CDC_INTERFACE_COUNT) // HID Interface
#define HID_FIRST_ENDPOINT (CDC_FIRST_ENDPOINT + CDC_ENPOINT_COUNT)
#define HID_ENDPOINT_INT (HID_FIRST_ENDPOINT)
#define INTERFACE_COUNT (MSC_INTERFACE + MSC_INTERFACE_COUNT)
#ifdef CDC_ENABLED
#define CDC_RX CDC_ENDPOINT_OUT
#define CDC_TX CDC_ENDPOINT_IN
#endif
#ifdef HID_ENABLED
#define HID_TX HID_ENDPOINT_INT
#endif
#define IMANUFACTURER 1
#define IPRODUCT 2

View File

@@ -1,88 +0,0 @@
/*
* Udp.cpp: Library to send/receive UDP packets.
*
* NOTE: UDP is fast, but has some important limitations (thanks to Warren Gray for mentioning these)
* 1) UDP does not guarantee the order in which assembled UDP packets are received. This
* might not happen often in practice, but in larger network topologies, a UDP
* packet can be received out of sequence.
* 2) UDP does not guard against lost packets - so packets *can* disappear without the sender being
* aware of it. Again, this may not be a concern in practice on small local networks.
* For more information, see http://www.cafeaulait.org/course/week12/35.html
*
* MIT License:
* Copyright (c) 2008 Bjoern Hartmann
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* bjoern@cs.stanford.edu 12/30/2008
*/
#ifndef udp_h
#define udp_h
#include <Stream.h>
#include <IPAddress.h>
class UDP : public Stream {
public:
virtual uint8_t begin(uint16_t) =0; // initialize, start listening on specified port. Returns 1 if successful, 0 if there are no sockets available to use
virtual void stop() =0; // Finish with the UDP socket
// Sending UDP packets
// Start building up a packet to send to the remote host specific in ip and port
// Returns 1 if successful, 0 if there was a problem with the supplied IP address or port
virtual int beginPacket(IPAddress ip, uint16_t port) =0;
// Start building up a packet to send to the remote host specific in host and port
// Returns 1 if successful, 0 if there was a problem resolving the hostname or port
virtual int beginPacket(const char *host, uint16_t port) =0;
// Finish off this packet and send it
// Returns 1 if the packet was sent successfully, 0 if there was an error
virtual int endPacket() =0;
// Write a single byte into the packet
virtual size_t write(uint8_t) =0;
// Write size bytes from buffer into the packet
virtual size_t write(const uint8_t *buffer, size_t size) =0;
// Start processing the next available incoming packet
// Returns the size of the packet in bytes, or 0 if no packets are available
virtual int parsePacket() =0;
// Number of bytes remaining in the current packet
virtual int available() =0;
// Read a single byte from the current packet
virtual int read() =0;
// Read up to len bytes from the current packet and place them into buffer
// Returns the number of bytes read, or 0 if none are available
virtual int read(unsigned char* buffer, size_t len) =0;
// Read up to len characters from the current packet and place them into buffer
// Returns the number of characters read, or 0 if none are available
virtual int read(char* buffer, size_t len) =0;
// Return the next byte from the current packet without moving on to the next byte
virtual int peek() =0;
virtual void flush() =0; // Finish reading the current packet
// Return the IP address of the host who sent the current incoming packet
virtual IPAddress remoteIP() =0;
// Return the port of the host who sent the current incoming packet
virtual uint16_t remotePort() =0;
protected:
uint8_t* rawIPAddress(IPAddress& addr) { return addr.raw_address(); };
};
#endif

View File

@@ -1,168 +0,0 @@
/*
WCharacter.h - Character utility functions for Wiring & Arduino
Copyright (c) 2010 Hernando Barragan. All right reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef Character_h
#define Character_h
#include <ctype.h>
// WCharacter.h prototypes
inline boolean isAlphaNumeric(int c) __attribute__((always_inline));
inline boolean isAlpha(int c) __attribute__((always_inline));
inline boolean isAscii(int c) __attribute__((always_inline));
inline boolean isWhitespace(int c) __attribute__((always_inline));
inline boolean isControl(int c) __attribute__((always_inline));
inline boolean isDigit(int c) __attribute__((always_inline));
inline boolean isGraph(int c) __attribute__((always_inline));
inline boolean isLowerCase(int c) __attribute__((always_inline));
inline boolean isPrintable(int c) __attribute__((always_inline));
inline boolean isPunct(int c) __attribute__((always_inline));
inline boolean isSpace(int c) __attribute__((always_inline));
inline boolean isUpperCase(int c) __attribute__((always_inline));
inline boolean isHexadecimalDigit(int c) __attribute__((always_inline));
inline int toAscii(int c) __attribute__((always_inline));
inline int toLowerCase(int c) __attribute__((always_inline));
inline int toUpperCase(int c)__attribute__((always_inline));
// Checks for an alphanumeric character.
// It is equivalent to (isalpha(c) || isdigit(c)).
inline boolean isAlphaNumeric(int c)
{
return ( isalnum(c) == 0 ? false : true);
}
// Checks for an alphabetic character.
// It is equivalent to (isupper(c) || islower(c)).
inline boolean isAlpha(int c)
{
return ( isalpha(c) == 0 ? false : true);
}
// Checks whether c is a 7-bit unsigned char value
// that fits into the ASCII character set.
inline boolean isAscii(int c)
{
return ( isascii (c) == 0 ? false : true);
}
// Checks for a blank character, that is, a space or a tab.
inline boolean isWhitespace(int c)
{
return ( isblank (c) == 0 ? false : true);
}
// Checks for a control character.
inline boolean isControl(int c)
{
return ( iscntrl (c) == 0 ? false : true);
}
// Checks for a digit (0 through 9).
inline boolean isDigit(int c)
{
return ( isdigit (c) == 0 ? false : true);
}
// Checks for any printable character except space.
inline boolean isGraph(int c)
{
return ( isgraph (c) == 0 ? false : true);
}
// Checks for a lower-case character.
inline boolean isLowerCase(int c)
{
return (islower (c) == 0 ? false : true);
}
// Checks for any printable character including space.
inline boolean isPrintable(int c)
{
return ( isprint (c) == 0 ? false : true);
}
// Checks for any printable character which is not a space
// or an alphanumeric character.
inline boolean isPunct(int c)
{
return ( ispunct (c) == 0 ? false : true);
}
// Checks for white-space characters. For the avr-libc library,
// these are: space, formfeed ('\f'), newline ('\n'), carriage
// return ('\r'), horizontal tab ('\t'), and vertical tab ('\v').
inline boolean isSpace(int c)
{
return ( isspace (c) == 0 ? false : true);
}
// Checks for an uppercase letter.
inline boolean isUpperCase(int c)
{
return ( isupper (c) == 0 ? false : true);
}
// Checks for a hexadecimal digits, i.e. one of 0 1 2 3 4 5 6 7
// 8 9 a b c d e f A B C D E F.
inline boolean isHexadecimalDigit(int c)
{
return ( isxdigit (c) == 0 ? false : true);
}
// Converts c to a 7-bit unsigned char value that fits into the
// ASCII character set, by clearing the high-order bits.
inline int toAscii(int c)
{
return toascii (c);
}
// Warning:
// Many people will be unhappy if you use this function.
// This function will convert accented letters into random
// characters.
// Converts the letter c to lower case, if possible.
inline int toLowerCase(int c)
{
return tolower (c);
}
// Converts the letter c to upper case, if possible.
inline int toUpperCase(int c)
{
return toupper (c);
}
#endif

View File

@@ -1,322 +0,0 @@
/* -*- mode: jde; c-basic-offset: 2; indent-tabs-mode: nil -*- */
/*
Part of the Wiring project - http://wiring.uniandes.edu.co
Copyright (c) 2004-05 Hernando Barragan
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General
Public License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA
Modified 24 November 2006 by David A. Mellis
Modified 1 August 2010 by Mark Sproul
*/
#include <inttypes.h>
#include <avr/io.h>
#include <avr/interrupt.h>
#include <avr/pgmspace.h>
#include <stdio.h>
#include "wiring_private.h"
static volatile voidFuncPtr intFunc[EXTERNAL_NUM_INTERRUPTS];
// volatile static voidFuncPtr twiIntFunc;
void attachInterrupt(uint8_t interruptNum, void (*userFunc)(void), int mode) {
if(interruptNum < EXTERNAL_NUM_INTERRUPTS) {
intFunc[interruptNum] = userFunc;
// Configure the interrupt mode (trigger on low input, any change, rising
// edge, or falling edge). The mode constants were chosen to correspond
// to the configuration bits in the hardware register, so we simply shift
// the mode into place.
// Enable the interrupt.
switch (interruptNum) {
#if defined(__AVR_ATmega32U4__)
// I hate doing this, but the register assignment differs between the 1280/2560
// and the 32U4. Since avrlib defines registers PCMSK1 and PCMSK2 that aren't
// even present on the 32U4 this is the only way to distinguish between them.
case 0:
EICRA = (EICRA & ~((1<<ISC00) | (1<<ISC01))) | (mode << ISC00);
EIMSK |= (1<<INT0);
break;
case 1:
EICRA = (EICRA & ~((1<<ISC10) | (1<<ISC11))) | (mode << ISC10);
EIMSK |= (1<<INT1);
break;
case 2:
EICRA = (EICRA & ~((1<<ISC20) | (1<<ISC21))) | (mode << ISC20);
EIMSK |= (1<<INT2);
break;
case 3:
EICRA = (EICRA & ~((1<<ISC30) | (1<<ISC31))) | (mode << ISC30);
EIMSK |= (1<<INT3);
break;
#elif defined(EICRA) && defined(EICRB) && defined(EIMSK)
case 2:
EICRA = (EICRA & ~((1 << ISC00) | (1 << ISC01))) | (mode << ISC00);
EIMSK |= (1 << INT0);
break;
case 3:
EICRA = (EICRA & ~((1 << ISC10) | (1 << ISC11))) | (mode << ISC10);
EIMSK |= (1 << INT1);
break;
case 4:
EICRA = (EICRA & ~((1 << ISC20) | (1 << ISC21))) | (mode << ISC20);
EIMSK |= (1 << INT2);
break;
case 5:
EICRA = (EICRA & ~((1 << ISC30) | (1 << ISC31))) | (mode << ISC30);
EIMSK |= (1 << INT3);
break;
case 0:
EICRB = (EICRB & ~((1 << ISC40) | (1 << ISC41))) | (mode << ISC40);
EIMSK |= (1 << INT4);
break;
case 1:
EICRB = (EICRB & ~((1 << ISC50) | (1 << ISC51))) | (mode << ISC50);
EIMSK |= (1 << INT5);
break;
case 6:
EICRB = (EICRB & ~((1 << ISC60) | (1 << ISC61))) | (mode << ISC60);
EIMSK |= (1 << INT6);
break;
case 7:
EICRB = (EICRB & ~((1 << ISC70) | (1 << ISC71))) | (mode << ISC70);
EIMSK |= (1 << INT7);
break;
#else
case 0:
#if defined(EICRA) && defined(ISC00) && defined(EIMSK)
EICRA = (EICRA & ~((1 << ISC00) | (1 << ISC01))) | (mode << ISC00);
EIMSK |= (1 << INT0);
#elif defined(MCUCR) && defined(ISC00) && defined(GICR)
MCUCR = (MCUCR & ~((1 << ISC00) | (1 << ISC01))) | (mode << ISC00);
GICR |= (1 << INT0);
#elif defined(MCUCR) && defined(ISC00) && defined(GIMSK)
MCUCR = (MCUCR & ~((1 << ISC00) | (1 << ISC01))) | (mode << ISC00);
GIMSK |= (1 << INT0);
#else
#error attachInterrupt not finished for this CPU (case 0)
#endif
break;
case 1:
#if defined(EICRA) && defined(ISC10) && defined(ISC11) && defined(EIMSK)
EICRA = (EICRA & ~((1 << ISC10) | (1 << ISC11))) | (mode << ISC10);
EIMSK |= (1 << INT1);
#elif defined(MCUCR) && defined(ISC10) && defined(ISC11) && defined(GICR)
MCUCR = (MCUCR & ~((1 << ISC10) | (1 << ISC11))) | (mode << ISC10);
GICR |= (1 << INT1);
#elif defined(MCUCR) && defined(ISC10) && defined(GIMSK) && defined(GIMSK)
MCUCR = (MCUCR & ~((1 << ISC10) | (1 << ISC11))) | (mode << ISC10);
GIMSK |= (1 << INT1);
#else
#warning attachInterrupt may need some more work for this cpu (case 1)
#endif
break;
case 2:
#if defined(EICRA) && defined(ISC20) && defined(ISC21) && defined(EIMSK)
EICRA = (EICRA & ~((1 << ISC20) | (1 << ISC21))) | (mode << ISC20);
EIMSK |= (1 << INT2);
#elif defined(MCUCR) && defined(ISC20) && defined(ISC21) && defined(GICR)
MCUCR = (MCUCR & ~((1 << ISC20) | (1 << ISC21))) | (mode << ISC20);
GICR |= (1 << INT2);
#elif defined(MCUCR) && defined(ISC20) && defined(GIMSK) && defined(GIMSK)
MCUCR = (MCUCR & ~((1 << ISC20) | (1 << ISC21))) | (mode << ISC20);
GIMSK |= (1 << INT2);
#endif
break;
#endif
}
}
}
void detachInterrupt(uint8_t interruptNum) {
if(interruptNum < EXTERNAL_NUM_INTERRUPTS) {
// Disable the interrupt. (We can't assume that interruptNum is equal
// to the number of the EIMSK bit to clear, as this isn't true on the
// ATmega8. There, INT0 is 6 and INT1 is 7.)
switch (interruptNum) {
#if defined(__AVR_ATmega32U4__)
case 0:
EIMSK &= ~(1<<INT0);
break;
case 1:
EIMSK &= ~(1<<INT1);
break;
case 2:
EIMSK &= ~(1<<INT2);
break;
case 3:
EIMSK &= ~(1<<INT3);
break;
#elif defined(EICRA) && defined(EICRB) && defined(EIMSK)
case 2:
EIMSK &= ~(1 << INT0);
break;
case 3:
EIMSK &= ~(1 << INT1);
break;
case 4:
EIMSK &= ~(1 << INT2);
break;
case 5:
EIMSK &= ~(1 << INT3);
break;
case 0:
EIMSK &= ~(1 << INT4);
break;
case 1:
EIMSK &= ~(1 << INT5);
break;
case 6:
EIMSK &= ~(1 << INT6);
break;
case 7:
EIMSK &= ~(1 << INT7);
break;
#else
case 0:
#if defined(EIMSK) && defined(INT0)
EIMSK &= ~(1 << INT0);
#elif defined(GICR) && defined(ISC00)
GICR &= ~(1 << INT0); // atmega32
#elif defined(GIMSK) && defined(INT0)
GIMSK &= ~(1 << INT0);
#else
#error detachInterrupt not finished for this cpu
#endif
break;
case 1:
#if defined(EIMSK) && defined(INT1)
EIMSK &= ~(1 << INT1);
#elif defined(GICR) && defined(INT1)
GICR &= ~(1 << INT1); // atmega32
#elif defined(GIMSK) && defined(INT1)
GIMSK &= ~(1 << INT1);
#else
#warning detachInterrupt may need some more work for this cpu (case 1)
#endif
break;
#endif
}
intFunc[interruptNum] = 0;
}
}
/*
void attachInterruptTwi(void (*userFunc)(void) ) {
twiIntFunc = userFunc;
}
*/
#if defined(__AVR_ATmega32U4__)
SIGNAL(INT0_vect) {
if(intFunc[EXTERNAL_INT_0])
intFunc[EXTERNAL_INT_0]();
}
SIGNAL(INT1_vect) {
if(intFunc[EXTERNAL_INT_1])
intFunc[EXTERNAL_INT_1]();
}
SIGNAL(INT2_vect) {
if(intFunc[EXTERNAL_INT_2])
intFunc[EXTERNAL_INT_2]();
}
SIGNAL(INT3_vect) {
if(intFunc[EXTERNAL_INT_3])
intFunc[EXTERNAL_INT_3]();
}
#elif defined(EICRA) && defined(EICRB)
SIGNAL(INT0_vect) {
if(intFunc[EXTERNAL_INT_2])
intFunc[EXTERNAL_INT_2]();
}
SIGNAL(INT1_vect) {
if(intFunc[EXTERNAL_INT_3])
intFunc[EXTERNAL_INT_3]();
}
SIGNAL(INT2_vect) {
if(intFunc[EXTERNAL_INT_4])
intFunc[EXTERNAL_INT_4]();
}
SIGNAL(INT3_vect) {
if(intFunc[EXTERNAL_INT_5])
intFunc[EXTERNAL_INT_5]();
}
SIGNAL(INT4_vect) {
if(intFunc[EXTERNAL_INT_0])
intFunc[EXTERNAL_INT_0]();
}
SIGNAL(INT5_vect) {
if(intFunc[EXTERNAL_INT_1])
intFunc[EXTERNAL_INT_1]();
}
SIGNAL(INT6_vect) {
if(intFunc[EXTERNAL_INT_6])
intFunc[EXTERNAL_INT_6]();
}
SIGNAL(INT7_vect) {
if(intFunc[EXTERNAL_INT_7])
intFunc[EXTERNAL_INT_7]();
}
#else
SIGNAL(INT0_vect) {
if(intFunc[EXTERNAL_INT_0])
intFunc[EXTERNAL_INT_0]();
}
SIGNAL(INT1_vect) {
if(intFunc[EXTERNAL_INT_1])
intFunc[EXTERNAL_INT_1]();
}
#if defined(EICRA) && defined(ISC20)
SIGNAL(INT2_vect) {
if(intFunc[EXTERNAL_INT_2])
intFunc[EXTERNAL_INT_2]();
}
#endif
#endif
/*
SIGNAL(SIG_2WIRE_SERIAL) {
if(twiIntFunc)
twiIntFunc();
}
*/

View File

@@ -1,60 +0,0 @@
/* -*- mode: jde; c-basic-offset: 2; indent-tabs-mode: nil -*- */
/*
Part of the Wiring project - http://wiring.org.co
Copyright (c) 2004-06 Hernando Barragan
Modified 13 August 2006, David A. Mellis for Arduino - http://www.arduino.cc/
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General
Public License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA
$Id$
*/
extern "C" {
#include "stdlib.h"
}
void randomSeed(unsigned int seed)
{
if (seed != 0) {
srandom(seed);
}
}
long random(long howbig)
{
if (howbig == 0) {
return 0;
}
return random() % howbig;
}
long random(long howsmall, long howbig)
{
if (howsmall >= howbig) {
return howsmall;
}
long diff = howbig - howsmall;
return random(diff) + howsmall;
}
long map(long x, long in_min, long in_max, long out_min, long out_max)
{
return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
}
unsigned int makeWord(unsigned int w) { return w; }
unsigned int makeWord(unsigned char h, unsigned char l) { return (h << 8) | l; }

View File

@@ -1,645 +0,0 @@
/*
WString.cpp - String library for Wiring & Arduino
...mostly rewritten by Paul Stoffregen...
Copyright (c) 2009-10 Hernando Barragan. All rights reserved.
Copyright 2011, Paul Stoffregen, paul@pjrc.com
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "WString.h"
/*********************************************/
/* Constructors */
/*********************************************/
String::String(const char *cstr)
{
init();
if (cstr) copy(cstr, strlen(cstr));
}
String::String(const String &value)
{
init();
*this = value;
}
#ifdef __GXX_EXPERIMENTAL_CXX0X__
String::String(String &&rval)
{
init();
move(rval);
}
String::String(StringSumHelper &&rval)
{
init();
move(rval);
}
#endif
String::String(char c)
{
init();
char buf[2];
buf[0] = c;
buf[1] = 0;
*this = buf;
}
String::String(unsigned char value, unsigned char base)
{
init();
char buf[9];
utoa(value, buf, base);
*this = buf;
}
String::String(int value, unsigned char base)
{
init();
char buf[18];
itoa(value, buf, base);
*this = buf;
}
String::String(unsigned int value, unsigned char base)
{
init();
char buf[17];
utoa(value, buf, base);
*this = buf;
}
String::String(long value, unsigned char base)
{
init();
char buf[34];
ltoa(value, buf, base);
*this = buf;
}
String::String(unsigned long value, unsigned char base)
{
init();
char buf[33];
ultoa(value, buf, base);
*this = buf;
}
String::~String()
{
free(buffer);
}
/*********************************************/
/* Memory Management */
/*********************************************/
inline void String::init(void)
{
buffer = NULL;
capacity = 0;
len = 0;
flags = 0;
}
void String::invalidate(void)
{
if (buffer) free(buffer);
buffer = NULL;
capacity = len = 0;
}
unsigned char String::reserve(unsigned int size)
{
if (buffer && capacity >= size) return 1;
if (changeBuffer(size)) {
if (len == 0) buffer[0] = 0;
return 1;
}
return 0;
}
unsigned char String::changeBuffer(unsigned int maxStrLen)
{
char *newbuffer = (char *)realloc(buffer, maxStrLen + 1);
if (newbuffer) {
buffer = newbuffer;
capacity = maxStrLen;
return 1;
}
return 0;
}
/*********************************************/
/* Copy and Move */
/*********************************************/
String & String::copy(const char *cstr, unsigned int length)
{
if (!reserve(length)) {
invalidate();
return *this;
}
len = length;
strcpy(buffer, cstr);
return *this;
}
#ifdef __GXX_EXPERIMENTAL_CXX0X__
void String::move(String &rhs)
{
if (buffer) {
if (capacity >= rhs.len) {
strcpy(buffer, rhs.buffer);
len = rhs.len;
rhs.len = 0;
return;
} else {
free(buffer);
}
}
buffer = rhs.buffer;
capacity = rhs.capacity;
len = rhs.len;
rhs.buffer = NULL;
rhs.capacity = 0;
rhs.len = 0;
}
#endif
String & String::operator = (const String &rhs)
{
if (this == &rhs) return *this;
if (rhs.buffer) copy(rhs.buffer, rhs.len);
else invalidate();
return *this;
}
#ifdef __GXX_EXPERIMENTAL_CXX0X__
String & String::operator = (String &&rval)
{
if (this != &rval) move(rval);
return *this;
}
String & String::operator = (StringSumHelper &&rval)
{
if (this != &rval) move(rval);
return *this;
}
#endif
String & String::operator = (const char *cstr)
{
if (cstr) copy(cstr, strlen(cstr));
else invalidate();
return *this;
}
/*********************************************/
/* concat */
/*********************************************/
unsigned char String::concat(const String &s)
{
return concat(s.buffer, s.len);
}
unsigned char String::concat(const char *cstr, unsigned int length)
{
unsigned int newlen = len + length;
if (!cstr) return 0;
if (length == 0) return 1;
if (!reserve(newlen)) return 0;
strcpy(buffer + len, cstr);
len = newlen;
return 1;
}
unsigned char String::concat(const char *cstr)
{
if (!cstr) return 0;
return concat(cstr, strlen(cstr));
}
unsigned char String::concat(char c)
{
char buf[2];
buf[0] = c;
buf[1] = 0;
return concat(buf, 1);
}
unsigned char String::concat(unsigned char num)
{
char buf[4];
itoa(num, buf, 10);
return concat(buf, strlen(buf));
}
unsigned char String::concat(int num)
{
char buf[7];
itoa(num, buf, 10);
return concat(buf, strlen(buf));
}
unsigned char String::concat(unsigned int num)
{
char buf[6];
utoa(num, buf, 10);
return concat(buf, strlen(buf));
}
unsigned char String::concat(long num)
{
char buf[12];
ltoa(num, buf, 10);
return concat(buf, strlen(buf));
}
unsigned char String::concat(unsigned long num)
{
char buf[11];
ultoa(num, buf, 10);
return concat(buf, strlen(buf));
}
/*********************************************/
/* Concatenate */
/*********************************************/
StringSumHelper & operator + (const StringSumHelper &lhs, const String &rhs)
{
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
if (!a.concat(rhs.buffer, rhs.len)) a.invalidate();
return a;
}
StringSumHelper & operator + (const StringSumHelper &lhs, const char *cstr)
{
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
if (!cstr || !a.concat(cstr, strlen(cstr))) a.invalidate();
return a;
}
StringSumHelper & operator + (const StringSumHelper &lhs, char c)
{
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
if (!a.concat(c)) a.invalidate();
return a;
}
StringSumHelper & operator + (const StringSumHelper &lhs, unsigned char num)
{
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
if (!a.concat(num)) a.invalidate();
return a;
}
StringSumHelper & operator + (const StringSumHelper &lhs, int num)
{
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
if (!a.concat(num)) a.invalidate();
return a;
}
StringSumHelper & operator + (const StringSumHelper &lhs, unsigned int num)
{
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
if (!a.concat(num)) a.invalidate();
return a;
}
StringSumHelper & operator + (const StringSumHelper &lhs, long num)
{
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
if (!a.concat(num)) a.invalidate();
return a;
}
StringSumHelper & operator + (const StringSumHelper &lhs, unsigned long num)
{
StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
if (!a.concat(num)) a.invalidate();
return a;
}
/*********************************************/
/* Comparison */
/*********************************************/
int String::compareTo(const String &s) const
{
if (!buffer || !s.buffer) {
if (s.buffer && s.len > 0) return 0 - *(unsigned char *)s.buffer;
if (buffer && len > 0) return *(unsigned char *)buffer;
return 0;
}
return strcmp(buffer, s.buffer);
}
unsigned char String::equals(const String &s2) const
{
return (len == s2.len && compareTo(s2) == 0);
}
unsigned char String::equals(const char *cstr) const
{
if (len == 0) return (cstr == NULL || *cstr == 0);
if (cstr == NULL) return buffer[0] == 0;
return strcmp(buffer, cstr) == 0;
}
unsigned char String::operator<(const String &rhs) const
{
return compareTo(rhs) < 0;
}
unsigned char String::operator>(const String &rhs) const
{
return compareTo(rhs) > 0;
}
unsigned char String::operator<=(const String &rhs) const
{
return compareTo(rhs) <= 0;
}
unsigned char String::operator>=(const String &rhs) const
{
return compareTo(rhs) >= 0;
}
unsigned char String::equalsIgnoreCase( const String &s2 ) const
{
if (this == &s2) return 1;
if (len != s2.len) return 0;
if (len == 0) return 1;
const char *p1 = buffer;
const char *p2 = s2.buffer;
while (*p1) {
if (tolower(*p1++) != tolower(*p2++)) return 0;
}
return 1;
}
unsigned char String::startsWith( const String &s2 ) const
{
if (len < s2.len) return 0;
return startsWith(s2, 0);
}
unsigned char String::startsWith( const String &s2, unsigned int offset ) const
{
if (offset > len - s2.len || !buffer || !s2.buffer) return 0;
return strncmp( &buffer[offset], s2.buffer, s2.len ) == 0;
}
unsigned char String::endsWith( const String &s2 ) const
{
if ( len < s2.len || !buffer || !s2.buffer) return 0;
return strcmp(&buffer[len - s2.len], s2.buffer) == 0;
}
/*********************************************/
/* Character Access */
/*********************************************/
char String::charAt(unsigned int loc) const
{
return operator[](loc);
}
void String::setCharAt(unsigned int loc, char c)
{
if (loc < len) buffer[loc] = c;
}
char & String::operator[](unsigned int index)
{
static char dummy_writable_char;
if (index >= len || !buffer) {
dummy_writable_char = 0;
return dummy_writable_char;
}
return buffer[index];
}
char String::operator[]( unsigned int index ) const
{
if (index >= len || !buffer) return 0;
return buffer[index];
}
void String::getBytes(unsigned char *buf, unsigned int bufsize, unsigned int index) const
{
if (!bufsize || !buf) return;
if (index >= len) {
buf[0] = 0;
return;
}
unsigned int n = bufsize - 1;
if (n > len - index) n = len - index;
strncpy((char *)buf, buffer + index, n);
buf[n] = 0;
}
/*********************************************/
/* Search */
/*********************************************/
int String::indexOf(char c) const
{
return indexOf(c, 0);
}
int String::indexOf( char ch, unsigned int fromIndex ) const
{
if (fromIndex >= len) return -1;
const char* temp = strchr(buffer + fromIndex, ch);
if (temp == NULL) return -1;
return temp - buffer;
}
int String::indexOf(const String &s2) const
{
return indexOf(s2, 0);
}
int String::indexOf(const String &s2, unsigned int fromIndex) const
{
if (fromIndex >= len) return -1;
const char *found = strstr(buffer + fromIndex, s2.buffer);
if (found == NULL) return -1;
return found - buffer;
}
int String::lastIndexOf( char theChar ) const
{
return lastIndexOf(theChar, len - 1);
}
int String::lastIndexOf(char ch, unsigned int fromIndex) const
{
if (fromIndex >= len) return -1;
char tempchar = buffer[fromIndex + 1];
buffer[fromIndex + 1] = '\0';
char* temp = strrchr( buffer, ch );
buffer[fromIndex + 1] = tempchar;
if (temp == NULL) return -1;
return temp - buffer;
}
int String::lastIndexOf(const String &s2) const
{
return lastIndexOf(s2, len - s2.len);
}
int String::lastIndexOf(const String &s2, unsigned int fromIndex) const
{
if (s2.len == 0 || len == 0 || s2.len > len) return -1;
if (fromIndex >= len) fromIndex = len - 1;
int found = -1;
for (char *p = buffer; p <= buffer + fromIndex; p++) {
p = strstr(p, s2.buffer);
if (!p) break;
if ((unsigned int)(p - buffer) <= fromIndex) found = p - buffer;
}
return found;
}
String String::substring( unsigned int left ) const
{
return substring(left, len);
}
String String::substring(unsigned int left, unsigned int right) const
{
if (left > right) {
unsigned int temp = right;
right = left;
left = temp;
}
String out;
if (left > len) return out;
if (right > len) right = len;
char temp = buffer[right]; // save the replaced character
buffer[right] = '\0';
out = buffer + left; // pointer arithmetic
buffer[right] = temp; //restore character
return out;
}
/*********************************************/
/* Modification */
/*********************************************/
void String::replace(char find, char replace)
{
if (!buffer) return;
for (char *p = buffer; *p; p++) {
if (*p == find) *p = replace;
}
}
void String::replace(const String& find, const String& replace)
{
if (len == 0 || find.len == 0) return;
int diff = replace.len - find.len;
char *readFrom = buffer;
char *foundAt;
if (diff == 0) {
while ((foundAt = strstr(readFrom, find.buffer)) != NULL) {
memcpy(foundAt, replace.buffer, replace.len);
readFrom = foundAt + replace.len;
}
} else if (diff < 0) {
char *writeTo = buffer;
while ((foundAt = strstr(readFrom, find.buffer)) != NULL) {
unsigned int n = foundAt - readFrom;
memcpy(writeTo, readFrom, n);
writeTo += n;
memcpy(writeTo, replace.buffer, replace.len);
writeTo += replace.len;
readFrom = foundAt + find.len;
len += diff;
}
strcpy(writeTo, readFrom);
} else {
unsigned int size = len; // compute size needed for result
while ((foundAt = strstr(readFrom, find.buffer)) != NULL) {
readFrom = foundAt + find.len;
size += diff;
}
if (size == len) return;
if (size > capacity && !changeBuffer(size)) return; // XXX: tell user!
int index = len - 1;
while (index >= 0 && (index = lastIndexOf(find, index)) >= 0) {
readFrom = buffer + index + find.len;
memmove(readFrom + diff, readFrom, len - (readFrom - buffer));
len += diff;
buffer[len] = 0;
memcpy(buffer + index, replace.buffer, replace.len);
index--;
}
}
}
void String::toLowerCase(void)
{
if (!buffer) return;
for (char *p = buffer; *p; p++) {
*p = tolower(*p);
}
}
void String::toUpperCase(void)
{
if (!buffer) return;
for (char *p = buffer; *p; p++) {
*p = toupper(*p);
}
}
void String::trim(void)
{
if (!buffer || len == 0) return;
char *begin = buffer;
while (isspace(*begin)) begin++;
char *end = buffer + len - 1;
while (isspace(*end) && end >= begin) end--;
len = end + 1 - begin;
if (begin > buffer) memcpy(buffer, begin, len);
buffer[len] = 0;
}
/*********************************************/
/* Parsing / Conversion */
/*********************************************/
long String::toInt(void) const
{
if (buffer) return atol(buffer);
return 0;
}

Some files were not shown because too many files have changed in this diff Show More