3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Conditional translation for SYSTEM_TIMER_2 because we want to have posibility to switch between old/new implementation.

Browse source 
Timing functions (millis, micros and delay) replaced in whole source, defined in Marlin.h.
This commit enables original implementation (SYSTEM_TIMER_2 undefined)
Verified with passed complete wizard process.
This commit is contained in:
Robert Pelnar 2019-01-27 22:48:51 +01:00
parent 9a1e914637
commit eea755496b
19 changed files with 320 additions and 264 deletions
Firmware
mmu.cpp

22
Firmware/mmu.cpp
View file

@ -74,7 +74,7 @@ int mmu_puts_P(const char* str)
{
mmu_clr_rx_buf(); //clear rx buffer
int r = fputs_P(str, uart2io); //send command
mmu_last_request = millis();
mmu_last_request = _millis();
return r;
}
@ -86,7 +86,7 @@ int mmu_printf_P(const char* format, ...)
mmu_clr_rx_buf(); //clear rx buffer
int r = vfprintf_P(uart2io, format, args); //send command
va_end(args);
mmu_last_request = millis();
mmu_last_request = _millis();
return r;
}
@ -94,7 +94,7 @@ int mmu_printf_P(const char* format, ...)
int8_t mmu_rx_ok(void)
{
int8_t res = uart2_rx_str_P(PSTR("ok\n"));
if (res == 1) mmu_last_response = millis();
if (res == 1) mmu_last_response = _millis();
return res;
}
@ -102,7 +102,7 @@ int8_t mmu_rx_ok(void)
int8_t mmu_rx_start(void)
{
int8_t res = uart2_rx_str_P(PSTR("start\n"));
if (res == 1) mmu_last_response = millis();
if (res == 1) mmu_last_response = _millis();
return res;
}
@ -158,7 +158,7 @@ void mmu_loop(void)
mmu_puts_P(PSTR("S1\n")); //send 'read version' request
mmu_state = -2;
}
else if (millis() > 30000) //30sec after reset disable mmu
else if (_millis() > 30000) //30sec after reset disable mmu
{
puts_P(PSTR("MMU not responding - DISABLED"));
mmu_state = 0;
@ -300,7 +300,7 @@ void mmu_loop(void)
mmu_last_cmd = mmu_cmd;
mmu_cmd = 0;
}
else if ((mmu_last_response + 300) < millis()) //request every 300ms
else if ((mmu_last_response + 300) < _millis()) //request every 300ms
{
if(check_for_idler_sensor()) mmu_idler_sensor_detected = true;
#if defined MMU_DEBUG && defined MMU_FINDA_DEBUG
@ -335,7 +335,7 @@ void mmu_loop(void)
if (mmu_cmd == 0)
mmu_ready = true;
}
else if ((mmu_last_request + MMU_P0_TIMEOUT) < millis())
else if ((mmu_last_request + MMU_P0_TIMEOUT) < _millis())
{ //resend request after timeout (30s)
mmu_state = 1;
}
@ -365,7 +365,7 @@ void mmu_loop(void)
mmu_ready = true;
mmu_state = 1;
}
else if ((mmu_last_request + MMU_CMD_TIMEOUT) < millis())
else if ((mmu_last_request + MMU_CMD_TIMEOUT) < _millis())
{ //resend request after timeout (5 min)
if (mmu_last_cmd)
{
@ -395,7 +395,7 @@ void mmu_loop(void)
mmu_ready = true;
mmu_state = 1;
}
else if ((mmu_last_request + MMU_CMD_TIMEOUT) < millis())
else if ((mmu_last_request + MMU_CMD_TIMEOUT) < _millis())
{ //resend request after timeout (5 min)
mmu_state = 1;
}
@ -815,7 +815,7 @@ void change_extr(int
) { //switches multiplexer for extruders
#ifdef SNMM
st_synchronize();
delay2(100);
_delay(100);
disable_e0();
disable_e1();
@ -848,7 +848,7 @@ void change_extr(int
break;
}
delay2(100);
_delay(100);
#endif
}