DigistumpMirror/DigistumpArduino
1
0
Fork 0
mirror of https://github.com/digistump/DigistumpArduino.git synced 2025-04-27 23:29:01 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #25 from e-moe/fix/LiquidCrystal_I2C

Browse Source 
fix #if defined checks - Thanks @e-moe - merging for todays release
This commit is contained in:
Erik Tylek Kettenburg 2016-02-12 11:03:13 -08:00
commit 92260e2acd
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
digistump-avr/libraries/DigisparkLCD/LiquidCrystal_I2C.cpp
View File

@ -2,13 +2,13 @@
#include "LiquidCrystal_I2C.h" #include "LiquidCrystal_I2C.h"
#include <inttypes.h> #include <inttypes.h>
#if defined(__AVR_ATtiny85__) || (__AVR_ATtiny2313__) || (__AVR_ATtiny167__) #include "Arduino.h"
#if defined(__AVR_ATtiny85__) || defined(__AVR_ATtiny2313__) || defined(__AVR_ATtiny167__)
#include "TinyWireM.h" // include this if ATtiny85 or ATtiny2313 #include "TinyWireM.h" // include this if ATtiny85 or ATtiny2313
#else #else
#include <Wire.h> // original lib include #include <Wire.h> // original lib include
#endif #endif
#include "Arduino.h"
// When the display powers up, it is configured as follows: // When the display powers up, it is configured as follows:
// //
@ -43,7 +43,7 @@ void LiquidCrystal_I2C::init(){
void LiquidCrystal_I2C::init_priv() void LiquidCrystal_I2C::init_priv()
{ {
#if defined (__AVR_ATtiny85__) || (__AVR_ATtiny2313__) || (__AVR_ATtiny167__) #if defined(__AVR_ATtiny85__) || defined(__AVR_ATtiny2313__) || defined(__AVR_ATtiny167__)
TinyWireM.begin(); // initialize I2C lib TinyWireM.begin(); // initialize I2C lib
#else // original call #else // original call
Wire.begin(); Wire.begin();
@ -250,7 +250,7 @@ void LiquidCrystal_I2C::write4bits(uint8_t value) {
} }
void LiquidCrystal_I2C::expanderWrite(uint8_t _data){ void LiquidCrystal_I2C::expanderWrite(uint8_t _data){
#if defined(__AVR_ATtiny85__) || (__AVR_ATtiny2313__)|| (__AVR_ATtiny167__) // Replaced Wire calls with ATtiny TWI calls #if defined(__AVR_ATtiny85__) || defined(__AVR_ATtiny2313__) || defined(__AVR_ATtiny167__) // Replaced Wire calls with ATtiny TWI calls
TinyWireM.beginTransmission(_Addr); TinyWireM.beginTransmission(_Addr);
TinyWireM.send(((int)(_data) | _backlightval)); TinyWireM.send(((int)(_data) | _backlightval));
TinyWireM.endTransmission(); TinyWireM.endTransmission();

7
digistump-avr/libraries/DigisparkLCD/LiquidCrystal_I2C.h
View File

@ -8,13 +8,6 @@
#include <inttypes.h> #include <inttypes.h>
#include "Print.h" #include "Print.h"
#if defined(__AVR_ATtiny85__) || (__AVR_ATtiny2313__) || (__AVR_ATtiny167__)
#include "TinyWireM.h" // include this if ATtiny85 or ATtiny2313
#else
#include <Wire.h> // original lib include
#endif
// commands // commands
#define LCD_CLEARDISPLAY 0x01 #define LCD_CLEARDISPLAY 0x01
#define LCD_RETURNHOME 0x02 #define LCD_RETURNHOME 0x02