SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

sbi and cbi are deprecated

Browse source
This commit is contained in:
Scott Lahteine 2016-02-27 04:52:13 -08:00
parent ff13070b59
commit e4945b30d2
2 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Marlin/Marlin.h
View file

@ -45,13 +45,6 @@ typedef unsigned long millis_t;
#include "MarlinSerial.h" #include "MarlinSerial.h"
#ifndef cbi
#define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit))
#endif
#ifndef sbi
#define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit))
#endif
#include "WString.h" #include "WString.h"
#ifdef USBCON #ifdef USBCON

12
Marlin/MarlinSerial.cpp
View file

@ -91,15 +91,15 @@ void MarlinSerial::begin(long baud) {
M_UBRRxH = baud_setting >> 8; M_UBRRxH = baud_setting >> 8;
M_UBRRxL = baud_setting; M_UBRRxL = baud_setting;
sbi(M_UCSRxB, M_RXENx); SBI(M_UCSRxB, M_RXENx);
sbi(M_UCSRxB, M_TXENx); SBI(M_UCSRxB, M_TXENx);
sbi(M_UCSRxB, M_RXCIEx); SBI(M_UCSRxB, M_RXCIEx);
} }
void MarlinSerial::end() { void MarlinSerial::end() {
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);
} }