3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,298 Commits 3 Branches 78 Tags 40 MiB
926e39d857
Commit Graph

962 Commits

Author SHA1 Message Date
Robert Pelnar
fcfb4cdcae New ML support - menu tunning, startup 
+config headers (bool - true/false replaced with 0/1)
+fixed include hierarchy
+removed comments
 2018-06-10 16:04:32 +02:00
Robert Pelnar
f098707021 New ML support - W25X20CL - update process UI tunning 2018-06-10 00:22:28 +02:00
Robert Pelnar
5de0a6437d New ML support - W25X20CL - lang switching 
+removed unused code
 2018-06-09 23:49:26 +02:00
Robert Pelnar
dcd58d002c New ML support - W25X20CL 
language selection from menu is working
 2018-06-09 19:16:36 +02:00
Robert Pelnar
a9446cc6b3 New ML support - W25x20CL 2018-06-09 18:26:53 +02:00
Robert Pelnar
ebd8375313 New ML support - external flash W25X20CL - upgrade is working!!! (hardcoded to german) 
+print test (LT_PRINT_TEST)
 2018-06-09 17:49:41 +02:00
Robert Pelnar
c0946d8f04 New ML support - w25x20cl spi external flash support 
+fixed some messages
+sec lang update test
 2018-06-09 01:23:04 +02:00
XPila
31357379ff
Merge branch 'MK3' into time_remaining 2018-06-08 18:31:32 +02:00
XPila
8963757c3c
Merge branch 'MK3' into crash_detection_stop 2018-06-08 18:28:43 +02:00
PavelSindler
5e120e6e52 power panic flow factor hotfix 2018-06-08 18:13:50 +02:00
PavelSindler
332a23bef5 Crash detection stops and waits for user if it fails multiple times in short time frame 2018-06-08 16:08:07 +02:00
Robert Pelnar
70bb851c62 New ML support - added missing file 2018-06-08 15:38:16 +02:00
XPila
739de5224e
Merge branch 'MK3' into MK3-new_lang 2018-06-08 14:38:00 +02:00
Robert Pelnar
e69fd05fce Optimized LiquidCrystal class 
removed dependecies to arduino Print and String classes
spared 522 bytes of flash and 84bytes of ram
 2018-06-08 14:35:47 +02:00
Robert Pelnar
37f82118c8 New ML support - lang select menu fix 2018-06-08 02:03:25 +02:00
Robert Pelnar
59e65b7f47 New ML support - language select menu 
+cond. translation for W25X20CL
 2018-06-08 01:19:49 +02:00
Robert Pelnar
bd1e410228 New ML support - W25X20CL external spi flash support 2018-06-08 00:20:28 +02:00
PavelSindler
877f8f2a61
Merge pull request #795 from 3d-gussner/MK3_fix5 
Fix warning: This is kind of important
 2018-06-07 22:22:54 +02:00
PavelSindler
a15f0138de show estimated time to end of the print if available in gcode: initial version 2018-06-07 20:50:30 +02:00
PavelSindler
42cfcb2601
Merge pull request #794 from stahlfabrik/M860-enhanced 
Improved M860 - now wait for cooling of PINDA, too
 2018-06-06 12:01:06 +02:00
Marek Bel
eb1d17c3c6 Compile without c++11. 2018-06-05 21:55:54 +02:00
XPila
1290326210
Merge pull request #790 from PavelSindler/power_panic_flow_rate 
power panic: extruder_multipliers added
 2018-06-05 20:58:15 +02:00
XPila
6a8425f62d
Merge pull request #809 from mkbel/Use_Timer 
Use timer
 2018-06-05 20:54:41 +02:00
XPila
7f7f1e4560
Merge pull request #808 from zavorka/MK3 
Eliminated the -Wliteral-suffix warnings from ultralcd.cpp
 2018-06-05 20:53:03 +02:00
PavelSindler
d49c4508a7 removing some debug code 2018-06-05 20:39:42 +02:00
PavelSindler
264daaf715 typo fixed 2018-06-05 20:33:05 +02:00
PavelSindler
aacaf67eaa Crash detection/filament sensor: restore print from stored line number in case that we are printing over USB, retraction fix; debug: cmd queue on LCD 2018-06-05 20:28:41 +02:00
Marek Bel
01af8a806b Merge branch 'MK3' into Use_Timer 2018-06-05 19:03:11 +02:00
Marek Bel
f819392d10 Do not create static object in function. Saves 8B RAM and 16B flash, because there is no need to guard constructor against concurrent calls. 2018-06-05 18:38:25 +02:00
Marek Bel
7cc8b743c2 Add .gitignore. Setup doxyfile. Create project documentation main page. Document property of static object constructors on gcc-avr. 2018-06-05 18:30:02 +02:00
Marek Bel
75f048ac4b Add default doxyfile. 2018-06-05 18:23:48 +02:00
Marek Bel
5f033d5a1a Do not create static object in global function. Saves 8B RAM and 14B flash, because there is no need to guard constructor against concurrent calls. 2018-06-05 17:47:18 +02:00
Roman Beránek
e25b869b5e
Eliminated the -Wliteral-suffix warnings from ultralcd.cpp 2018-06-05 13:49:58 +02:00
PavelSindler
746ac17e4e debugging 2018-06-04 16:40:56 +02:00
Robert Pelnar
47c68c884c New ML support - fixed duplicate strings 2018-06-01 14:35:03 +02:00
Robert Pelnar
53d9d8bd8a New ML support - lang codes 
+script tunning
 2018-06-01 10:47:47 +02:00
3d-gussner
5004433b20 Fix warning: This is kind of important 
Again another fix from https://github.com/prusa3d/Prusa-Firmware/pull/138 made by @Thess for the MK2 branch which i think is quite important.

Ardunio IDE 1.8.5 result with Compiler warnings set to "More" or "All"
```
sketch\Marlin_main.cpp:3265:44: warning: the address of 'retracted' will always evaluate as 'true' [-Waddress]

               if((echange<-MIN_RETRACT && !retracted) || (echange>MIN_RETRACT && retracted)) { //move appears to be an attempt to retract or recover

                                            ^

sketch\Marlin_main.cpp:3265:82: warning: the address of 'retracted' will always evaluate as 'true' [-Waddress]

               if((echange<-MIN_RETRACT && !retracted) || (echange>MIN_RETRACT && retracted)) { //move appears to be an attempt to retract or recover

                                                                                  ^

sketch\Marlin_main.cpp:3268:28: warning: the address of 'retracted' will always evaluate as 'true' [-Waddress]

                   retract(!retracted);

                            ^

sketch\Marlin_main.cpp:3870:15: warning: statement has no effect [-Wunused-value]
```

I don't know if that helps making small pull requests as they are easier to review or it would make sense to combine few more.

Prusa should really review this pull [request](https://github.com/prusa3d/Prusa-Firmware/pull/138) again for the MK3 branch, as it was one that made warnings disapear in the MK2 branch and made finding new flaws in the code much much easier.
 2018-06-01 10:17:03 +02:00
Robert Pelnar
5a2b056d47 Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang 2018-06-01 00:43:16 +02:00
Christoph Stahl
7c4fce7876 whitespace correction 2018-05-31 18:55:14 +02:00
Christoph Stahl
73708ec883 Improved M860 - now wait for cooling of PINDA, too 
The M860 - wait for PINDA temperature - gcode has been improved. Until now it could only wait until the PINDA has been warmed up to a set temperature. Now it also can wait until the PINDA has cooled down to a set temperature. The calling syntax has not been changed at all. The logic now looks if the bed or hotend have a target temperature different from 0. If so, the code waits until PINDA has warmed up. Otherwise it waits until PINDA has cooled down.

Applications:
- Possibility to start a Print at exactly the right PINDA temperature. (Do not start the heater until PINDA is cooled down)
- Much easier manual temperature calibration (automating the wait for cool down in between calibration runs)
- Possibility for temp calibration verification on one heat bed by printing multiple objects with different PINDA temperatures one after the other
 2018-05-31 16:41:59 +02:00
XPila
957b3cfac5
Merge pull request #783 from 3d-gussner/MK3_fix1 
Fixed redefined warning
 2018-05-31 14:21:41 +02:00
XPila
d70d38bb0c
Merge pull request #784 from 3d-gussner/MK3_fix2 
Fixed unused variable c as in pull request #138
 2018-05-31 14:15:17 +02:00
XPila
80c641ae5d
Merge pull request #789 from 3d-gussner/MK3_fix4 
Fixed warning: invalid suffix on literal; C++11 requires a space betw…
 2018-05-31 14:09:49 +02:00
tarikku
731fef3d32 Fix remaining forgotten comments 2018-05-30 23:15:01 +02:00
Robert Pelnar
77f3160531 language.h - debug output conditional translation 2018-05-30 20:15:43 +02:00
Robert Pelnar
37e575f4bc New ML support - debug output, bootloader 
bootapp - automaticaly erase flash when necessary
+test code
 2018-05-30 19:29:52 +02:00
PavelSindler
9104b0601a power panic: extruder_multipliers added 2018-05-30 18:59:33 +02:00
3d-gussner
eeca0f683b Fixed warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] 2018-05-30 16:06:22 +02:00
PavelSindler
3bf47d7f83 "run xyz cal first" message 2018-05-30 15:29:59 +02:00
PavelSindler
dcb77e8c7e Merge remote-tracking branch 'upstream/MK3' into temp_cal_coordinates_fix 2018-05-30 15:22:20 +02:00
PavelSindler
987f8969c0 Merge remote-tracking branch 'upstream/MK3' into temp_cal_coordinates_fix 2018-05-30 15:20:40 +02:00
PavelSindler
72a382b34d fix in macro definition 2018-05-30 15:07:24 +02:00
PavelSindler
2561ab9c7d
Merge pull request #786 from XPila/MK3-new_lang 
Mk3 new lang
 2018-05-30 14:54:47 +02:00
Robert Pelnar
3e29312b41 fixed compilation (c++11) 2018-05-30 14:53:14 +02:00
3d-gussner
d8706be8de Fixed forgotten comment 2018-05-30 13:39:24 +02:00
3d-gussner
dce2d45499 Fixed forgotten comment 2018-05-30 13:35:48 +02:00
3d-gussner
2f9b63275f Fixed unused variable c as in pull request #138 2018-05-30 13:26:31 +02:00
3d-gussner
167bc61ef9 Fixed redefined warning 2018-05-30 12:57:51 +02:00
Robert Pelnar
4746c77195 New ML support - bootloader support and update proces test 2018-05-29 21:03:47 +02:00
Robert Pelnar
0ddb31d4eb Removed hexfile 2018-05-29 17:28:33 +02:00
Robert Pelnar
b47a29b388 New ML support - fixed invalid characters, added some cz translations 2018-05-29 15:56:00 +02:00
PavelSindler
d307868a90 merge with upstream 2018-05-28 20:38:55 +02:00
PavelSindler
26724c4a48 removed message 2018-05-28 20:31:57 +02:00
PavelSindler
7e79ce8e53 MK3: crash detection for Z axis is active during auto home and mesh bed leveling (normal mode is forced for Z movents); temp cal coordintes corrections; temp cal: xy movents always in safe Z distance from heatbed, Z-axis homing improved 2018-05-28 20:26:15 +02:00
Robert Pelnar
b3f4e1f6e4 New ML support - language menu 2018-05-28 19:41:16 +02:00
Robert Pelnar
baa66a0887 New ML support - secondary language name, language selection 2018-05-28 17:14:55 +02:00
Robert Pelnar
3bf2552b6c fixed #761 from hzapper (#elif instead of #else if) 2018-05-28 13:41:36 +02:00
XPila
28a767b460
Merge pull request #760 from PavelSindler/safety_timer_fixes 
Safety timer not active during filament runout procedure
 2018-05-28 13:28:24 +02:00
PavelSindler
58ae70c4e1
Merge branch 'MK3' into MK3-new_lang 2018-05-28 13:22:14 +02:00
Robert Pelnar
15207e4d5e Linearity correction fix - (eeprom storage changed to byte instead of word) 
+enabled for XYZ axes
 2018-05-28 01:47:08 +02:00
Robert Pelnar
def9ab56f6 New ML support - language.c - fixed return origial string for zero length translation 2018-05-27 16:24:21 +02:00
Robert Pelnar
55157640c5 New ML support - czech version is working!!! 
postbuild.sh, make_lang.sh - fixed (id and offset calculation)
language.c, language.h - fixed (==||==)
config.h - reserved space for _SEC_LANG changed
Marlin_main.cpp - debug output + hardcoded lang_select(1) //means cz
 2018-05-27 15:14:04 +02:00
PavelSindler
2ffb95c72a bugfix: use absolute coordinates for steel sheet removal position, because there is no homing at the beginning of calibration in case that position is already known 2018-05-24 20:28:00 +02:00
PavelSindler
64f7272ea7 M27: returns print saved (fixes setting temperatures to zero during crash detection) 2018-05-24 18:49:35 +02:00
Robert Pelnar
2cf20c8c99 New ML support - migration - fix_source_1.sh script (replace 'MSG_xx' with '_T(MSG_xx)') 
+ output + fixed source
 2018-05-23 16:37:08 +02:00
Robert Pelnar
da3432e237 New ML support - changed _SEC_LANG reserved space to 10kb, added debug code 2018-05-23 16:11:12 +02:00
Robert Pelnar
f00a9ce636 New ML support - language.c, language.h - code fixed, Marlin_main.cpp - debug output 2018-05-23 15:46:08 +02:00
Robert Pelnar
d979c3dffc New ML support - messages.c - some strings fixed 2018-05-23 14:18:37 +02:00
PavelSindler
0091b41fb5
Merge pull request #744 from PavelSindler/M860_fix 
M860 fix: send busy messages
 2018-05-23 13:15:46 +02:00
Robert Pelnar
7e3f675469 New ML support - migration - fixed some messages 
all variants verified according to lang_en.txt (release only)
config.h updated (enabled ML support)
 2018-05-22 20:30:55 +02:00
PavelSindler
8c9b670c76
Merge pull request #746 from MRprusa3d/MK3 
menu returns corrections
 2018-05-22 16:08:08 +02:00
PavelSindler
137e1c5027 whitespace 2018-05-22 13:33:31 +02:00
PavelSindler
d63a17c696 Safety timer not active during filament runout detection 2018-05-22 13:31:21 +02:00
Robert Pelnar
bd587faab9 New ML support - migration - replaced source, removed original ML support files (backup) 2018-05-22 03:20:03 +02:00
Robert Pelnar
8573b65b05 _MIN_ENDSTOP_INVERTING redefinition in variant files (constant -> define) 2018-05-21 23:28:28 +02:00
XPila
a184d2b824
Merge pull request #756 from XPila/MK3-new_lang 
Mk3 new lang
 2018-05-20 13:26:28 +02:00
Robert Pelnar
a528f8837c Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang 2018-05-20 13:24:52 +02:00
Robert Pelnar
5b015907aa New localization - macro declarations fixed 2018-05-20 13:15:46 +02:00
Robert Pelnar
9b7eeaecaa version changed 2018-05-18 14:42:35 +02:00
Marek Bel
503d5551e6 Fix build of MK2. Global variable distance_from_min was removed, do not update it. 
Expression
float y = vec_x[1] * pgm_read_float(bed_ref_points_4+mesh_point*2) + vec_y[1] * pgm_read_float(bed_ref_points_4+mesh_point*2+1) + cntr[1];
is identical with expression in count_xyz_details().
 2018-05-16 18:40:36 +02:00
PavelSindler
3eb21b65ed wizard fix: don't reset calibration status when repeating first layer cal. 2018-05-15 23:19:23 +02:00
MRprusa3d
83aa710da6 menu returns corrections 
Settings::FilamentSensor & FilamentAutoload

removing Calibration::ShowEndStops @ MK3
 2018-05-15 20:23:22 +02:00
PavelSindler
c59e9bd6be M860 fix: send busy messages 2018-05-15 18:27:25 +02:00
PavelSindler
553779a65d
Merge pull request #723 from mkbel/refactor_bed_geometry 
Refactor bed geometry
 2018-05-14 17:18:03 +02:00
Marek Bel
b71a29ad96 Use ShortTimer instead of long_press_timer global variable. 2018-05-11 17:05:12 +02:00
Marek Bel
02ecd08786 Convert Time class to template, instantiate LongTimer for longer and ShortTimer for shorter periods. 2018-05-11 16:31:42 +02:00
Marek Bel
07a7ce1acf Remove unused lcd_ping_allert(). 2018-05-11 15:09:27 +02:00
Marek Bel
e8730c2899 Merge branch 'MK3' into read_xyz_cal 
# Conflicts:
#	Firmware/ultralcd.cpp
 2018-05-10 18:31:31 +02:00
Marek Bel
329ea199ec Show measured bed offset from expected position even if not homed. Remove redundant lcd_quick_feedback() calls. 2018-05-10 18:24:49 +02:00
PavelSindler
dd89226537
Merge pull request #722 from MRprusa3d/MK3 
build instructions update
 2018-05-10 14:44:55 +02:00