15ef4175b7
resolving conflicts with upstream
2017-09-14 15:54:28 +02:00
f9153d4417
dont enque M84 function at the end of print, changed to function; added defines to config files
2017-09-14 15:27:01 +02:00
7cf8920c0a
typo fixed
2017-09-14 14:41:51 +02:00
026e3ecaac
getter function for filesize
2017-09-14 14:21:16 +02:00
0a8572bfbe
fullscreen message confirm char displayed imidiately, different changes in wizard
2017-09-14 13:28:15 +02:00
362ffa1585
storing calibration status after v2 cal. changed, changed some axes moves during cal. proces
2017-09-13 19:18:31 +02:00
ff73fbc562
code simplified
2017-09-13 18:38:46 +02:00
0f8468bef2
comments added
2017-09-13 16:57:53 +02:00
827a9ce6cb
added confirm character for messages which waits for user to press the knob
2017-09-13 15:41:19 +02:00
c3e01dd449
wizard: loading filament for SNMM, saving calibration status in xyz cal. updated
2017-09-13 13:50:32 +02:00
7e7a562ee0
v2 cal. for multi material added, "Is PLA filament loaded?" question added when run v2 cal. from menu
2017-09-13 11:49:54 +02:00
77937ab4bb
wizard :checking if PLA is loaded, user can repeat v2 cal., M117 and M1 hotfix
2017-09-12 17:34:28 +02:00
26cd35a8cb
reverting few changes,
2017-09-11 17:31:06 +02:00
7d7b617442
linear advance using allowed in config file, version changed
2017-09-11 16:11:49 +02:00
fe04b9f467
cleanup
2017-09-11 14:42:23 +02:00
10e183c97e
Merge remote-tracking branch 'refs/remotes/prusa3d/MK2' into MK2-ALL_IN_ONE
2017-09-11 11:28:45 +02:00
34a1a4d4c7
messages corrected
2017-09-11 11:27:32 +02:00
c443992b3c
Merge remote-tracking branch 'refs/remotes/prusa3d/MK2' into MK2-DE
2017-09-11 11:26:49 +02:00
61592f9bfa
initial version
2017-09-11 02:55:06 +02:00
dba7d51fc2
version changed, wizard moved to calibration menu
2017-09-08 17:27:38 +02:00
92d09efb01
start using CALIBRATION_STATUS_XYZ_CALIBRATION
2017-09-08 17:20:16 +02:00
7b407b2aba
run wizard after printer startup just in case, that it is freshly build machine
2017-09-08 15:22:42 +02:00
70544f1cea
min temp error message on serial updated
2017-09-08 14:47:51 +02:00
54083e28ac
farm mode: sending status every 10 seconds, printer can response on serial communication when in confirm mode
2017-09-08 14:10:28 +02:00
2322830c89
changed version
2017-09-08 13:26:33 +02:00
2f7ef212b0
farm mode: confirm print has lower sensitivity, changed items order in color selection menu
2017-09-08 13:25:13 +02:00
29f6033bdb
message added
2017-09-08 11:20:41 +02:00
e52e8e21b1
initial version of wizard
2017-09-07 20:06:23 +02:00
a9e02eb23b
added messages
2017-09-05 11:19:10 +02:00
a056d11af0
Don't use the serial number when multimaterial
2017-09-05 11:10:08 +02:00
bf2c5ae310
info on serial added
2017-09-04 18:17:28 +02:00
1f2f0ab35c
changed version
2017-09-04 14:43:06 +02:00
1ed4dcfca1
removed duplicit code in setup function, G98 stores farm number to eeprom, shipping prep: fixed typo
2017-09-04 14:41:31 +02:00
64efc982d2
Merge pull request #187 from PavelSindler/HostKeepAlive
...
Host keep alive
2017-09-04 11:27:13 +02:00
5017cdeaa4
farm number and farm mode initialization duplicity removed, prepare for shipping typo (reseting farm mode)
2017-09-04 11:26:18 +02:00
aa2dc723a1
fixed serial communication on PORT1, reduced "enqueing command" messages on serial in farm mode
2017-09-01 14:23:04 +02:00
6eeea402e4
initial
2017-09-01 14:06:54 +02:00
33168bedbd
Show filename during print fixed, sorting files on Sd card in farm mode fixed
2017-08-31 16:12:52 +02:00
df79ea94a7
merging with upstream
2017-08-30 18:38:46 +02:00
0f4e08d51d
M113 updated
2017-08-30 17:19:34 +02:00
71b313cf26
timer reset after processing current command
2017-08-30 16:18:43 +02:00
a9cbd91321
Merge pull request #182 from 3d-gussner/MK2-Cleanup
...
Cleanup E_MUX2_PIN and disabled max end stop
2017-08-30 13:11:27 +02:00
4f4d354892
Merge pull request #186 from PavelSindler/MK2
...
farm mode: improved statistics, "PRUSA thx" gcode, connection to monitoring is forced
2017-08-29 17:40:34 +02:00
41ebb0384a
config files updated
2017-08-29 17:21:43 +02:00
864321fc4a
removed "Printer disconnected" message
2017-08-29 17:13:55 +02:00
00569fea6a
sorting files disabled in farm mode, start printer status needs reponse from monitoring
2017-08-29 16:52:14 +02:00
87cadb1f68
statistics improved, initial version of function which forces user to connect printer to monitoring
2017-08-29 15:52:53 +02:00
faeafa1100
host keep alive multi material messages, load filament for multi material
2017-08-28 14:52:15 +02:00
436a79aa8d
add a software reset GCODE
2017-08-25 14:21:11 +02:00
d46e6809aa
Activate Linear Advance function
2017-08-25 13:38:14 +02:00
fffd8e3bbb
Merge pull request #12 from 3d-gussner/MK2-PLA_1st
...
Switch to PLA 1st in preheat menu
2017-08-25 13:35:25 +02:00
7498375186
Switch to PLA 1st in preheat menu
2017-08-25 13:34:25 +02:00
21c45c592f
Revert "Moved SD sort under settings"
2017-08-25 12:44:11 +02:00
978d7f78f0
Merge pull request #10 from 3d-gussner/MK2-250000_baud
...
Mk2 250000 baud
2017-08-25 11:56:25 +02:00
bdfbe1a4fc
Merge branch 'MK2-ALL_IN_ONE' into MK2-SD_SETTINGS
2017-08-25 11:54:59 +02:00
72aaeea462
Merge branch 'MK2-ALL_IN_ONE' into MK2-FRS
2017-08-25 11:51:20 +02:00
bd1404c5e1
Merge branch 'MK2-ALL_IN_ONE' into MK2-PID_BED
2017-08-25 11:48:04 +02:00
2d0f62da94
Merge pull request #6 from 3d-gussner/MK2-DE
...
Mk2 de
2017-08-25 11:45:08 +02:00
0a0cd7d2f7
Moved SD sort under settings
...
With the limited 4 lines of the LCD screen i moved the new SD sort function under the 'Settings' menu. I think you don't switch that often the sort order.
- 'Settings' submenu contains now 'SD card settings'
- 'SD card settings' contains 'SD card [normal]/[FlshAir]' and 'Sort: [Time]/[Alphabet]/[None]'
This is beta and has to be tested.
2017-08-25 11:34:38 +02:00
4eb8964a8d
PID bed part 2
2017-08-23 18:18:26 +02:00
4c3fe205db
Filament Runout Sensor part 2
2017-08-23 18:17:10 +02:00
dd1931261c
Filamen Runout Sensor
...
- modified filament change position from x=211, y=0, z-add=2 to x=0,y=-2.2 and z-add=20. Changing z-add makes filament changes easier with low layer heights. Moving to front left corner also help to grab the oozing filament during change bit easier.
- added filament runout sensor to LCD screen 'Settings' menu
- 'Sens Runou [ON]/[OFF]' en-, disables filament runout sensor detection
- 'FR_Sens[S to GND]/[S to VCC]' is to select what kind of sensor you connect to y-max pin 24
- 'FR Pullup [ON]/[OFF]' defines internal pullup. A sensor to GND, like a endstop switch, normally doesn't have a pullup resistor and need 'FR Pullup [ON]' to get valid readings when filament run out. On the other hand most optical sensor have a pullup resistor.
- the status can be checken under 'Calibration->Show end stops' or using M119 gcode command
2017-08-23 18:16:32 +02:00
8d8250aa1f
2nd file changing baud rate from 115200 to 250000
2017-08-23 17:39:45 +02:00
144b83138c
Cleanup unused pins and connectors
...
- removed E_MUX2_PIN and updated function
- unmarked #define DISABLE_MAX_ENDSTOPS, Prusa i3 MK2(s) doesn't use these end stops ... M119 shows now just used end stops
2017-08-23 17:26:27 +02:00
1870ac1b15
run bash le.sh lf
2017-08-23 17:21:03 +02:00
5e0d1b952e
Updated German translation
...
modified few things in language.en to get less warnings with length of the messages
2017-08-23 17:13:04 +02:00
16bfa6c08b
Added PID tuning for heated bed
2017-08-23 15:51:11 +02:00
0ea4cad961
Changed baud rate from 115200 to 250000
...
Check for more info http://shop.prusa3d.com/forum/original-prusa-i3-mk2-f23/can-octoprint-connect-to-mk2-at-250k-baud-rate--t2026.html#p22216
2017-08-23 15:36:58 +02:00
9e73c96223
Host keep alive messages
2017-08-17 19:07:38 +02:00
2b657ba786
Merge remote-tracking branch 'GurliGebis/HostKeepAlive' into HostKeepAlive
2017-08-15 16:44:25 +02:00
9753446e2e
Merge pull request #174 from PavelSindler/MK2
...
Sorting files in SD card menu; xyz cal. details menu updated show real skew even if axes were orthogonalized during cal.
2017-08-15 16:31:00 +02:00
8685c428a6
Revert "merging with upstream"
...
This reverts commit cdb4cb7864
2017-08-15 16:27:55 +02:00
cdb4cb7864
merging with upstream
2017-08-15 15:24:32 +02:00
6b2470fa4b
added defines for sorting types, removed unused variables
2017-08-15 13:09:50 +02:00
7d2d6c6fdc
run a reasonable LCD message on boot asap, support the second serial port (enabled only in farm mode)
2017-08-15 10:13:08 +02:00
59efb311c8
version changed
2017-08-14 17:37:36 +02:00
6a4e5df2ce
using ram/stack with and without folders for time sorting, progress bar improved
2017-08-14 16:34:00 +02:00
881a055a41
saving skew to eeprom prior orthogonalizing
2017-08-10 15:55:15 +02:00
d56db4638c
sorting by creation time, progress bar, sorting type swith
2017-08-10 11:53:37 +02:00
9c7de9292a
Ported the remaining HOST_KEEPALIVE commits from Marlin
2017-08-09 10:24:19 +02:00
e878572b93
Ported MarlinFirmware/#3109 - Provide feedback to hosts when busy
2017-08-07 16:39:00 +02:00
16d0a870c5
Alphabetical sorting imported from Marlin - initial version
2017-08-06 09:52:55 +02:00
ba636f175c
Fan kick improvement - long pulse (800ms) when starting, short pulse (50ms) every 4s when speed < 25.
...
Debug macros, debug codes (D0 - reset, D1 - clear eeprom, D2 - get/set pin).
2017-08-01 17:24:19 +02:00
1acadcc31c
Merge pull request #133 from Sebastianv650/MK2-LIN_ADV-PR
...
Port from Marlin LIN_ADVANCE
2017-08-01 10:20:13 +02:00
fe44e60e5f
version changed
2017-07-21 20:26:16 +02:00
2a7c4f0926
Farm mode: when print finishes, ask which filament was used for print; statistics modified
2017-07-21 20:17:00 +02:00
6bbbf3f88e
removed redundant code
2017-07-21 17:39:36 +02:00
b3ff1fd947
M110 fix (PR #137 from thess)
2017-07-21 17:30:19 +02:00
c3fb6e43fd
fan kickstart enabled
2017-07-21 16:51:36 +02:00
df342c646d
dont show message that default settings are used if user has never run M500
2017-07-19 20:59:38 +02:00
f2d34d4cd9
changed multimaterial eeprom version
2017-07-19 17:05:36 +02:00
63847b5b16
changed version
2017-07-19 17:00:15 +02:00
625b8acc8e
eeprom version for multimaterial changed, show message that hardcoded default settings were loaded during printer setup, improved scrolling in sd card menu
2017-07-19 16:59:53 +02:00
d1d3949717
Add SNMM functionality to LIN_ADVANCE
2017-07-16 15:41:27 +02:00
d5fba084e2
LIN_ADVANCE basic port from Marlin
...
This integrates LIN_ADVANCE into the Prusa FW. Note that further checks or updates may be necessary for MM printing!
2017-07-16 15:41:26 +02:00
2ace5fc827
tranlations of support menu, retrieving settings from eeprom changed to exclude E steps per unit
2017-07-11 16:28:43 +02:00
f89ba2c46a
axis steps per unit excluded from M500, version changed
2017-07-10 17:30:47 +02:00
2e57e48227
long beep in multimaterial colorprint fixed
2017-07-04 14:35:58 +02:00
5611852e1b
Fix/implement M110 command. Allow colons in command - don't treat as EOL.
2017-07-03 11:09:52 -04:00
1d561601c7
comments added
2017-06-29 13:32:17 +02:00
PavelSindler
3d-gussner
Andre Sklenar
PavelSindler
3d-gussner
Bjarke Istrup Pedersen
Robert Pelnar
Sebastianv650
Ted Hess