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

2792 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marek Bel
1a78bd53ba Fix compiler warning 
sketch/Marlin_main.cpp: In function 'void marlin_wait_for_click()':
sketch/Marlin_main.cpp:9646:12: warning: unused variable 'busy_state_backup' [-Wunused-variable]
 2019-05-14 19:11:46 +02:00
Marek Bel
91e72a79f0 Fix compiler warning 
sketch/Marlin_main.cpp:871:13: warning: unused variable 'ir_detected' [-Wunused-variable]
 2019-05-14 19:07:50 +02:00
Marek Bel
acfcd59369 Fix compiler warning: 
sketch/menu.cpp: In function 'int menu_draw_item_puts_P(char, const char*, char)':
sketch/menu.cpp:184:1: warning: no return statement in function returning non-void [-Wreturn-type]
 2019-05-14 18:32:40 +02:00
Marek Bel
89fc9e7f92 sketch/menu.h:90:115: warning: invalid conversion from 'void (*)(int)' to 'void (*)(uint8_t) {aka void (*)(unsigned char)}' [-fpermissive] 
#define MENU_ITEM_FUNCTION_NR_P(str, number, func, fn_par) do { if (menu_item_function_P(str, number, func, fn_par)) return; } while (0)
                                                                                                                   ^
sketch/ultralcd.cpp:5926:5: note: in expansion of macro 'MENU_ITEM_FUNCTION_NR_P'
     MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '1', extr_adj, 0); ////MSG_LOAD_FILAMENT_1 c=16
 2019-05-14 18:25:43 +02:00
Marek Bel
ec1a979656 Enable compiler warnings. 2019-05-14 18:16:53 +02:00
Marek Běl
a095b37088
Merge pull request #1832 from mkbel/refactor_filament_menu 
Refactor filament menu
 2019-05-14 17:18:37 +02:00
Marek Bel
66d20f0297 Fix code formatting (indentation). 2019-05-14 16:45:15 +02:00
Marek Bel
4de93ca19c Fix eject filament menu items numbering. 2019-05-14 16:43:33 +02:00
Marek Bel
150787efbd Generate menu item texts Cut filament <nr.> during runtime to conserve flash. 2019-05-14 16:25:29 +02:00
Marek Bel
6495a8fa58 Decrease flash reserved for secondary language. 2019-05-14 16:10:04 +02:00
Marek Bel
7c4f66181f Generate menu item texts Load filament <nr.> and Eject filament <nr.> during runtime to conserve flash. 2019-05-14 15:47:25 +02:00
Marek Běl
dddc1b84e6
Merge pull request #1825 from prusa3d/MK3_3.7.1 
Increase version 3.7.1 final.
 2019-05-13 17:29:30 +02:00
Marek Běl
efa8e6e6ba
Merge pull request #1658 from Harpalyke/save-ustep-res-with-M500 
Allow save of uStep resolution with M500
 2019-05-13 17:08:34 +02:00
Marek Bel
e93f043fee Increase version 3.7.1 final. 2019-05-13 15:09:58 +02:00
Marek Běl
bbd1b60229
Merge pull request #1437 from craiglink/memory-overrun 
set array size correctly to 4
 2019-05-11 03:01:52 +02:00
Marek Běl
12b801fa1f
Merge pull request #1397 from jhoblitt/plumbing/sh-chmod 
make all shell scripts executable
 2019-05-11 02:37:09 +02:00
Marek Běl
0a343d4d66
Merge pull request #1806 from NotaRobotexe/fw_check 
check if firmware is on right type of printer
 2019-05-11 02:11:54 +02:00
Marek Běl
176b28bc83
Merge pull request #1813 from prusa3d/MK3_3.7.1 
Enable watchdog for all variants.
 2019-05-10 17:33:44 +00:00
Marek Běl
ffa97c7b43
Merge pull request #1814 from prusa3d/fix_move_extruder_menu_overflow 
Fix a number overflow to last line of LCD when doing large extruder move
 2019-05-10 17:31:24 +00:00
Marek Bel
a9d6ae296b Enable watchdog for all variants. 2019-05-10 16:30:08 +02:00
Marek Běl
2a39fad400
Merge branch 'MK3' into bugfixes 2019-05-10 13:43:36 +00:00
Marek Běl
084c6f2700
Merge pull request #1805 from DRracer/MK3 
PFW-844
 2019-05-10 13:41:59 +00:00
Marek Bel
5707d4b85c Set all target hot ends to 0 deg. Celsius instead of just hotend nr. 0 to be more safe with custom modifications. 2019-05-10 15:27:25 +02:00
DRracer
dc4f30530d Fix a number overflow to last line of LCD when doing large extruder in 
menu Settings -> Move axis -> Extruder
 2019-05-09 13:44:35 +02:00
DRracer
714fb23de6 Merge remote-tracking branch 'upstream/MK3' into MK3 2019-05-09 13:40:28 +02:00
NotaRobotexe
e7dd5c60d3 check if firmware is on right type of printer 2019-05-07 18:10:44 +02:00
Marek Běl
8692565cf0
Merge pull request #1802 from XPila/MK3 
Variable bed PWM resolution/frequency (adjusted to 5bits/32Hz)
 2019-05-07 15:13:02 +00:00
DRracer
f431d24762 Merge branch 'MK3' of https://github.com/DRracer/Prusa-Firmware into MK3 2019-05-07 16:17:14 +02:00
DRracer
0124fbf9ee Fix: display target extruder temperature on the main screen when doing 
PID calibration
 2019-05-07 16:15:42 +02:00
Robert Pelnar
85806a0f38 variable bed pwm frequency fix (input value is 7bit, not 8bit) 2019-05-07 15:35:34 +02:00
Marek Běl
744e48272b
Merge pull request #1804 from ondratu/MK3 
PFW-688
 2019-05-07 13:24:49 +00:00
Ondrej Tuma
0ba2f39216 Check translation dictionary files to display definition 2019-05-07 12:57:31 +02:00
Ondrej Tuma
b7fe43bf68 Deleted bad cols/rows definitions for translation. 2019-05-07 12:52:23 +02:00
Robert Pelnar
58683da2fb Variable bed PWM resolution/frequency (adjusted to 5bits/32Hz) 2019-05-06 18:07:42 +02:00
Marek Běl
e56be687bb
Merge pull request #1800 from XPila/MK3 
return with exitcode 1 if any language not generated properly
 2019-05-06 15:58:34 +00:00
Marek Běl
c3376ad854
Merge pull request #1801 from DRracer/MK3 
Fix for linearity correction not being stored to EEPROM when doing MENU-
 2019-05-06 15:43:55 +00:00
Marek Bel
1a0370e1c7 Make macro ON_MENU_LEAVE() usage similar to macros MENU_ITEM_BACK_P() and MENU_ITEM_FUNCTION_P(). 2019-05-06 17:39:00 +02:00
Robert Pelnar
fa1bdd6ab1 Lang - decreased reserved space for secondary language (10496 bytes) 2019-05-06 17:29:47 +02:00
DRracer
ffbdb43881 Remove commented code 2019-05-06 17:26:42 +02:00
Robert Pelnar
41a827fa00 Removed unused texts, increased reserved space to 0x2e00 (11776 bytes) 2019-05-06 17:24:06 +02:00
DRracer
0794430208 Fix for linearity correction not being stored to EEPROM when doing MENU- 
UP
 2019-05-06 15:33:13 +02:00
Robert Pelnar
1c9d134c62 return with exitcode 1 if any language not generated properly 
fix - include system_timer.h
 2019-05-06 15:29:57 +02:00
Marek Běl
5beb337c56
Merge pull request #1798 from DRracer/MK3 
limit printed menu text to max 18 characters
 2019-05-06 12:38:54 +00:00
DRracer
e5911c42da limit printed menu text to max 18 characters 2019-05-06 12:44:36 +02:00
XPila
ca965aba7b
Merge pull request #1784 from XPila/MK3 
Different secondary language reserved space for MK3 and MK25
 2019-04-30 12:46:50 +02:00
Robert Pelnar
3852aa4275 Different secondary language reserved space for MK3 and MK25 2019-04-30 12:42:18 +02:00
Marek Běl
177c123b4d
Merge pull request #1780 from MRprusa3d/PFW-841 
"stop" immediately after "pause" patch
 2019-04-29 14:49:49 +00:00
Marek Běl
95beb33924
Merge pull request #1778 from XPila/MK3 
MK2.5 - watchdog enabled + test (command "D-1")
 2019-04-29 14:48:16 +00:00
Marek Bel
8fadbf1b44 Do not call watchdog reset from updateTemperaturesFromRawValues(). 2019-04-29 16:41:38 +02:00
MRprusa3d
b93f37ee02 "stop" immediately after "pause" patch 2019-04-29 14:39:19 +02:00