3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Compiler defines USBCON for USB devices (PR#2433)

Browse source
This commit is contained in:
Richard Wackerbarth 2015-05-24 11:32:34 -05:00
parent 7268d46508
commit e83575537a
12 changed files with 12 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Marlin/MarlinSerial.cpp
View file

@ -23,7 +23,7 @@
#include "Marlin.h"
#include "MarlinSerial.h"
#ifndef AT90USB
#ifndef USBCON
// this next line disables the entire HardwareSerial.cpp,
// this is so I can support Attiny series and any other chip without a UART
#if defined(UBRRH) || defined(UBRR0H) || defined(UBRR1H) || defined(UBRR2H) || defined(UBRR3H)
@ -284,9 +284,9 @@ void MarlinSerial::printFloat(double number, uint8_t digits) {
MarlinSerial MSerial;
#endif // whole file
#endif // !AT90USB
#endif // !USBCON
// For AT90USB targets use the UART for BT interfacing
#if defined(AT90USB) && defined(BTENABLED)
#if defined(USBCON) && defined(BTENABLED)
HardwareSerial bt;
#endif