@@ -14,14 +14,28 @@ _serial = theSerial;
1414void EasyTransferI2C::sendData (uint8_t i2c_address){
1515 uint8_t CS = size;
1616 _serial->beginTransmission (i2c_address);
17+ #if ARDUINO >= 100
18+ _serial->write (0x06 );
19+ _serial->write (0x85 );
20+ _serial->write (size);
21+ #else
1722 _serial->send (0x06 );
1823 _serial->send (0x85 );
1924 _serial->send (size);
25+ #endif
2026 for (int i = 0 ; i<size; i++){
2127 CS^=*(address+i);
28+ #if ARDUINO >= 100
29+ _serial->write (*(address+i));
30+ #else
2231 _serial->send (*(address+i));
32+ #endif
2333 }
34+ #if ARDUINO >= 100
35+ _serial->write (CS);
36+ #else
2437 _serial->send (CS);
38+ #endif
2539 _serial->endTransmission ();
2640}
2741
@@ -32,15 +46,24 @@ boolean EasyTransferI2C::receiveData(){
3246 // this size check may be redundant due to the size check below, but for now I'll leave it the way it is.
3347 if (_serial->available () >= 3 ){
3448// this will block until a 0x06 is found or buffer size becomes less then 3.
49+ #if ARDUINO >= 100
50+ while (_serial->read () != 0x06 ) {
51+ #else
3552 while (_serial->receive () != 0x06 ) {
53+ #endif
3654// This will trash any preamble junk in the serial buffer
3755// but we need to make sure there is enough in the buffer to process while we trash the rest
3856// if the buffer becomes too empty, we will escape and try again on the next call
3957if (_serial->available () < 3 )
4058return false ;
4159}
60+ #if ARDUINO >= 100
61+ if (_serial->read () == 0x85 ){
62+ rx_len = _serial->read ();
63+ #else
4264 if (_serial->receive () == 0x85 ){
4365 rx_len = _serial->receive ();
66+ #endif
4467// make sure the binary structs on both Arduinos are the same size.
4568 if (rx_len != size){
4669 rx_len = 0 ;
@@ -53,7 +76,11 @@ boolean EasyTransferI2C::receiveData(){
5376 // we get here if we already found the header bytes, the struct size matched what we know, and now we are byte aligned.
5477 if (rx_len != 0 ){
5578 while (_serial->available () && rx_array_inx <= rx_len){
79+ #if ARDUINO >= 100
80+ rx_array[rx_array_inx++] = _serial->read ();
81+ #else
5682 rx_array[rx_array_inx++] = _serial->receive ();
83+ #endif
5784 }
5885
5986 if (rx_len == (rx_array_inx-1 )){
0 commit comments