bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fix at90usb1286 build (#19687)

Browse Source 
* Skip check for USBCON during dependency detection
* Ignore incompatible Teensy_ADC library, which requires Teensy >= 3
* Add IS_AT90USB

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
Jason Smith
2020-10-11 16:13:01 -07:00
committed by Scott Lahteine
parent a30e8baf3e
commit 2c7b5fe1f2
10 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/gcode/control/M111.cpp
View File

@ -55,7 +55,7 @@ void GcodeSuite::M111() {
}
else {
SERIAL_ECHOPGM(STR_DEBUG_OFF);
#if !defined(__AVR__) || !defined(USBCON)
#if !IS_AT90USB
#if ENABLED(SERIAL_STATS_RX_BUFFER_OVERRUNS)
SERIAL_ECHOPAIR("\nBuffer Overruns: ", MYSERIAL0.buffer_overruns());
#endif
@ -71,7 +71,7 @@ void GcodeSuite::M111() {
#if ENABLED(SERIAL_STATS_MAX_RX_QUEUED)
SERIAL_ECHOPAIR("\nMax RX Queue Size: ", MYSERIAL0.rxMaxEnqueued());
#endif
#endif // !defined(__AVR__) || !defined(USBCON)
#endif // !IS_AT90USB
}
SERIAL_EOL();
}

2
Marlin/src/gcode/queue.cpp
View File

@ -624,7 +624,7 @@ void GCodeQueue::advance() {
card.closefile();
SERIAL_ECHOLNPGM(STR_FILE_SAVED);
#if !defined(__AVR__) || !defined(USBCON)
#if !IS_AT90USB
#if ENABLED(SERIAL_STATS_DROPPED_RX)
SERIAL_ECHOLNPAIR("Dropped bytes: ", MYSERIAL0.dropped());
#endif