josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added MK3 Versioning and link to MMU2-FW

This commit is contained in:
Rob McKenzie 2018-11-05 11:19:45 +10:00
parent 537db0ee12
commit 54a69d7444
4 changed files with 14214 additions and 14214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Firmware/Configuration.h
View File

@ -7,8 +7,8 @@
#define STR(x) STR_HELPER(x) #define STR(x) STR_HELPER(x)
// Firmware version // Firmware version
#define FW_VERSION "3.4.2" #define FW_VERSION "5.0.0"
#define FW_COMMIT_NR 1360 #define FW_COMMIT_NR 2107
// FW_VERSION_UNKNOWN means this is an unofficial build. // FW_VERSION_UNKNOWN means this is an unofficial build.
// The firmware should only be checked into github with this symbol. // The firmware should only be checked into github with this symbol.
#define FW_DEV_VERSION FW_VERSION_UNKNOWN #define FW_DEV_VERSION FW_VERSION_UNKNOWN

28417
Firmware/Firmware.ino.rambo.hex
View File

File diff suppressed because it is too large Load Diff

4
Firmware/mmu.cpp
View File

@ -338,10 +338,10 @@ void mmu_loop(void)
} else if (mmu_rx_not_ok() > 0) { } else if (mmu_rx_not_ok() > 0) {
printf_P(PSTR("MMU => 'Waiting'\n")); printf_P(PSTR("MMU => 'Waiting'\n"));
} }
else if ((mmu_last_request + MMU_CMD_TIMEOUT) < millis()) /*else if ((mmu_last_request + MMU_CMD_TIMEOUT) < millis())
{ //resend request after timeout (5 min) { //resend request after timeout (5 min)
mmu_state = 1; mmu_state = 1;
} }*/
return; return;
} }
} }

3
README.md
View File

@ -7,6 +7,9 @@
* [Documentation](#4-documentation) * [Documentation](#4-documentation)
<!--te--> <!--te-->
This FW is for use with MMU2, in combination with MMU2-FW https://github.com/TheZeroBeast/MM-control-01
# 1. Development environment preparation # 1. Development environment preparation
1. install `"Arduino Software IDE"` for your preferred operating system 1. install `"Arduino Software IDE"` for your preferred operating system