Browse Source

Revert "Revert "USB_BAUDRATE 230400""

This reverts commit 676c8733c4.
pull/15/head
X-Dron 4 years ago
parent
commit
c4f9f67605
  1. 4
      Marlin/Configuration.h
  2. 2
      Marlin/src/MarlinCore.cpp

4
Marlin/Configuration.h

@ -123,7 +123,7 @@
* :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000] * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000]
*/ */
#define BAUDRATE 115200 #define BAUDRATE 115200
//#define BAUDRATE 250000 #define USB_BAUDRATE 230400
// Enable the Bluetooth serial interface on AT90USB devices // Enable the Bluetooth serial interface on AT90USB devices
//#define BLUETOOTH //#define BLUETOOTH
@ -428,7 +428,7 @@
#define TEMP_SENSOR_7 0 #define TEMP_SENSOR_7 0
#define TEMP_SENSOR_BED 1 #define TEMP_SENSOR_BED 1
#define TEMP_SENSOR_PROBE 0 #define TEMP_SENSOR_PROBE 0
#define TEMP_SENSOR_CHAMBER 0 #define TEMP_SENSOR_CHAMBER 1
// Dummy thermistor constant temperature readings, for use with 998 and 999 // Dummy thermistor constant temperature readings, for use with 998 and 999
#define DUMMY_THERMISTOR_998_VALUE 25 #define DUMMY_THERMISTOR_998_VALUE 25

2
Marlin/src/MarlinCore.cpp

@ -909,7 +909,7 @@ void setup() {
#endif #endif
#if NUM_SERIAL > 0 #if NUM_SERIAL > 0
MYSERIAL0.begin(BAUDRATE); MYSERIAL0.begin(USB_BAUDRATE);
uint32_t serial_connect_timeout = millis() + 1000UL; uint32_t serial_connect_timeout = millis() + 1000UL;
while (!MYSERIAL0 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ } while (!MYSERIAL0 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
#if HAS_MULTI_SERIAL #if HAS_MULTI_SERIAL

Loading…
Cancel
Save