From 7b556d2e96b3ac9504c74951b9e795c5dd1fa91b Mon Sep 17 00:00:00 2001 From: fmalpartida Date: Sun, 3 Nov 2013 19:57:06 +0100 Subject: [PATCH] Added BT support on AT90USB devices Added AT90USB device BT connectivity support using second UART. --- Marlin/Configuration.h | 14 ++++---------- Marlin/Marlin.h | 7 ------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 39032f1fb0..129cf74778 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -22,20 +22,13 @@ // This allows the connection of wireless adapters (for instance) to non-default port pins. // Serial port 0 is still used by the Arduino bootloader regardless of this setting. #define SERIAL_PORT 0 -//#define SERIAL_PORT 1 // Define serial port 1 for bluetooth configuration in AT90USB configurations // This determines the communication speed of the printer // This determines the communication speed of the printer #define BAUDRATE 250000 // This enables the serial port associated to the Bluetooth interface -//#define BTENABLED // Enable BT interface - - -// SERIAL_PORT selects which serial port should be used for communication with the host. -// This allows the connection of wireless adapters (for instance) to non-default port pins. -// Serial port 0 is still used by the Arduino bootloader regardless of this setting. -#define SERIAL_PORT 0 +//#define BTENABLED // Enable BT interface on AT90USB devices //// The following define selects which electronics board you have. Please choose the one that matches your setup @@ -76,8 +69,7 @@ // 21 = Elefu Ra Board (v3) #ifndef MOTHERBOARD -//[FMC]#define MOTHERBOARD 7 -#define MOTHERBOARD 83 +//#define MOTHERBOARD 7 #endif // Define this to set a custom name for your generic Mendel, @@ -522,6 +514,8 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of // Shift register panels // --------------------- +// 2 wire Non-latching LCD SR from: +// https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/schematics#!shiftregister-connection //#define SR_LCD #ifdef SR_LCD #define SR_LCD_2W_NL // Non latching 2 wire shiftregister diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h index ef0fa70836..ef59f3f3f4 100644 --- a/Marlin/Marlin.h +++ b/Marlin/Marlin.h @@ -51,19 +51,12 @@ #ifdef AT90USB #ifdef BTENABLED - extern HardwareSerial bt; #define MYSERIAL bt #else #define MYSERIAL Serial #endif // BTENABLED #endif -#ifdef AT90USB - #define MYSERIAL Serial -#else - #define MYSERIAL MSerial -#endif - #define SERIAL_PROTOCOL(x) (MYSERIAL.print(x)) #define SERIAL_PROTOCOL_F(x,y) (MYSERIAL.print(x,y)) #define SERIAL_PROTOCOLPGM(x) (serialprintPGM(PSTR(x)))