Skip to content

Commit

Permalink
MK2.5 sw reset at setup function
Browse files Browse the repository at this point in the history
  • Loading branch information
PavelSindler committed Oct 19, 2018
1 parent b8f92fd commit bc247ca
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Firmware/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

// Firmware version
#define FW_VERSION "3.4.2"
#define FW_COMMIT_NR 1358
#define FW_COMMIT_NR 1360
// FW_VERSION_UNKNOWN means this is an unofficial build.
// The firmware should only be checked into github with this symbol.
#define FW_DEV_VERSION FW_VERSION_UNKNOWN
Expand Down
3 changes: 3 additions & 0 deletions Firmware/Marlin_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1180,6 +1180,9 @@ void setup()
}
MYSERIAL.begin(BAUDRATE);
fdev_setup_stream(uartout, uart_putchar, NULL, _FDEV_SETUP_WRITE); //setup uart out stream
#ifndef W25X20CL
SERIAL_PROTOCOLLNPGM("start");
#endif //W25X20CL
stdout = uartout;
SERIAL_ECHO_START;
printf_P(PSTR(" " FW_VERSION_FULL "\n"));
Expand Down
5 changes: 4 additions & 1 deletion Firmware/mmu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@
#define MMU_CMD_TIMEOUT 300000ul //5min timeout for mmu commands (except P0)
#define MMU_P0_TIMEOUT 3000ul //timeout for P0 command: 3seconds

#define MMU_HWRESET
#ifdef MMU_HWRESET
#define MMU_RST_PIN 76
#endif //MMU_HWRESET

bool mmu_enabled = false;

Expand Down Expand Up @@ -92,8 +93,10 @@ int8_t mmu_rx_start(void)
//initialize mmu2 unit - first part - should be done at begining of startup process
void mmu_init(void)
{
#ifdef MMU_HWRESET
digitalWrite(MMU_RST_PIN, HIGH);
pinMode(MMU_RST_PIN, OUTPUT); //setup reset pin
#endif //MMU_HWRESET
uart2_init(); //init uart2
_delay_ms(10); //wait 10ms for sure
mmu_reset(); //reset mmu (HW or SW), do not wait for response
Expand Down
1 change: 1 addition & 0 deletions Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h
Original file line number Diff line number Diff line change
Expand Up @@ -614,6 +614,7 @@
//#define SUPPORT_VERBOSITY

#define MMU_REQUIRED_FW_BUILDNR 83
#define MMU_HWRESET
//#define MMU_DEBUG //print communication between MMU2 and printer on serial

#endif //__CONFIGURATION_PRUSA_H

0 comments on commit bc247ca

Please sign in to comment.