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

initial

This commit is contained in:
PavelSindler 2017-10-15 09:40:35 +02:00
parent 06e2782ad3
commit 8dd9a4308e
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Firmware/MarlinSerial.cpp
View File

@ -67,6 +67,8 @@ FORCE_INLINE void store_char(unsigned char c)
#ifndef SNMM #ifndef SNMM
SIGNAL(USART2_RX_vect) SIGNAL(USART2_RX_vect)
{ {
SERIAL_ECHOPGM("Debug:");
MYSERIAL.println(1);
if (selectedSerialPort == 1) { if (selectedSerialPort == 1) {
// Test for a framing error. // Test for a framing error.
if (UCSR2A & (1<<FE2)) { if (UCSR2A & (1<<FE2)) {
@ -108,6 +110,8 @@ void MarlinSerial::begin(long baud)
#endif #endif
// set up the first (original serial port) // set up the first (original serial port)
if (useU2X) { if (useU2X) {
SERIAL_ECHOPGM("Debug:");
MYSERIAL.println(3);
M_UCSRxA = 1 << M_U2Xx; M_UCSRxA = 1 << M_U2Xx;
baud_setting = (F_CPU / 4 / baud - 1) / 2; baud_setting = (F_CPU / 4 / baud - 1) / 2;
} else { } else {
@ -145,6 +149,8 @@ void MarlinSerial::begin(long baud)
void MarlinSerial::end() void MarlinSerial::end()
{ {
SERIAL_ECHOPGM("Debug:");
MYSERIAL.println(4);
cbi(M_UCSRxB, M_RXENx); cbi(M_UCSRxB, M_RXENx);
cbi(M_UCSRxB, M_TXENx); cbi(M_UCSRxB, M_TXENx);
cbi(M_UCSRxB, M_RXCIEx); cbi(M_UCSRxB, M_RXCIEx);

4
Firmware/Marlin_main.cpp
View File

@ -1030,8 +1030,12 @@ void setup()
if ((farm_mode == 0xFF && farm_no == 0) || ((uint16_t)farm_no == 0xFFFF)) if ((farm_mode == 0xFF && farm_no == 0) || ((uint16_t)farm_no == 0xFFFF))
farm_mode = false; //if farm_mode has not been stored to eeprom yet and farm number is set to zero or EEPROM is fresh, deactivate farm mode farm_mode = false; //if farm_mode has not been stored to eeprom yet and farm number is set to zero or EEPROM is fresh, deactivate farm mode
if ((uint16_t)farm_no == 0xFFFF) farm_no = 0; if ((uint16_t)farm_no == 0xFFFF) farm_no = 0;
SERIAL_ECHOPGM("Farm mode:");
MYSERIAL.println(farm_mode);
if (farm_mode) if (farm_mode)
{ {
SERIAL_ECHOPGM("Debug:");
MYSERIAL.println(0);
prusa_statistics(8); prusa_statistics(8);
no_response = true; //we need confirmation by recieving PRUSA thx no_response = true; //we need confirmation by recieving PRUSA thx
important_status = 8; important_status = 8;