Remove unnecessary Wire.endTransmission()

Remove unnecessary Wire.endTransmission()

Author: loricrotser

sparkfun/avr/Qduino/Qduino.cpp

@@ -7,7 +7,7 @@
  * mattnewberry@me.com                                                     *
  *                                                                         *
  ***************************************************************************
- *                                                                         * 
+ *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
  * it under the terms of the GNU License.                                  *
  * This program is distributed in the hope that it will be useful,         *
@@ -22,7 +22,7 @@
 #include "Wire.h"
 
 void qduino::setup(){
-    
+
   pinMode(13, OUTPUT);
   digitalWrite(13, HIGH);
   pinMode(11, OUTPUT);
@@ -32,21 +32,21 @@ void qduino::setup(){
 }
 
 void qduino::setRGB(uint8_t r, uint8_t g, uint8_t b){
-    
+
   // ratio for R:G:B is 4:7:7 for forward voltage
-    
+
   r = 255 - r; // set all values to opposite values
   g = 255 - g; // because LED is common anode
   b = 255 - b;
-    
+
   int newr = map(r, 0, 255, 0, 146);
-    
+
   analogWrite(10, newr);
   analogWrite(11, g);
   analogWrite(13, b);
 }
 
-void qduino::setRGB(COLORS color){    
+void qduino::setRGB(COLORS color){
   switch (color) {
   case RED:
     analogWrite(10, 0);
@@ -97,31 +97,31 @@ void qduino::setRGB(COLORS color){
 }
 
 void qduino::rainbow(uint8_t duration)
-{    
+{
   uint8_t rgbColor[3];
 
   // Keep values for duration bounded
   if (duration < 1) duration = 1;
   if (duration > 5) duration = 5;
- 
+
   int newDuration = map(duration, 1, 5, 500, 3000);
-    
+
   // Start off with red.
   rgbColor[0] = 255;
   rgbColor[1] = 0;
-  rgbColor[2] = 0;  
- 
+  rgbColor[2] = 0;
+
   // Choose the colours to increment and decrement.
   for (uint8_t decColor = 0; decColor < 3; decColor += 1)
   {
     int incColor = decColor == 2 ? 0 : decColor + 1;
- 
+
     // cross-fade the two colours.
     for(uint8_t i = 0; i < 255; i += 1)
     {
       rgbColor[decColor] -= 1;
       rgbColor[incColor] += 1;
-      
+
       analogWrite(10, rgbColor[0]);
       analogWrite(11, rgbColor[1]);
       analogWrite(13, rgbColor[2]);
@@ -131,7 +131,7 @@ void qduino::rainbow(uint8_t duration)
 }
 
 void qduino::ledOff()
-{    
+{
   analogWrite(10, 255);
   analogWrite(11, 255);
   analogWrite(13, 255);
@@ -167,7 +167,7 @@ char fuelGauge::getVersion()
   byte msb = 0;
   byte lsb = 0;
   readFrom(MAX1704_VERSION, msb, lsb);
-  
+
   value  = 0xFF00 & (msb<<8);
   value |=   0xFF & lsb;
 
@@ -211,7 +211,7 @@ boolean fuelGauge::inSleep()
   byte lsb = 0;
 
   readFrom(MAX1704_CONFIG,msb,lsb);
-  byte sleep = (lsb >>7) & 0x01; 
+  byte sleep = (lsb >>7) & 0x01;
 
   return int(sleep) == 1;
 }
@@ -256,7 +256,7 @@ void fuelGauge::wakeUp()
   Wire.endTransmission();
 
   // This delay is here to ensure it's fully awake before moving on
-  delay(150); 
+  delay(150);
 }
 
 void fuelGauge::performCommand(byte address, int value)
@@ -281,6 +281,5 @@ void fuelGauge::readFrom(byte address, byte &msb, byte &lsb)
     msb = Wire.read();
     lsb = Wire.read();
   }
-  Wire.endTransmission();
+  //Wire.endTransmission();
 }
-

sparkfun/avr/libraries/Qduino/Qduino.cpp

@@ -7,7 +7,7 @@
  * mattnewberry@me.com                                                     *
  *                                                                         *
  ***************************************************************************
- *                                                                         * 
+ *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
  * it under the terms of the GNU License.                                  *
  * This program is distributed in the hope that it will be useful,         *
@@ -22,7 +22,7 @@
 #include "Wire.h"
 
 void qduino::setup(){
-    
+
   pinMode(13, OUTPUT);
   digitalWrite(13, HIGH);
   pinMode(11, OUTPUT);
@@ -32,21 +32,21 @@ void qduino::setup(){
 }
 
 void qduino::setRGB(uint8_t r, uint8_t g, uint8_t b){
-    
+
   // ratio for R:G:B is 4:7:7 for forward voltage
-    
+
   r = 255 - r; // set all values to opposite values
   g = 255 - g; // because LED is common anode
   b = 255 - b;
-    
+
   int newr = map(r, 0, 255, 0, 146);
-    
+
   analogWrite(10, newr);
   analogWrite(11, g);
   analogWrite(13, b);
 }
 
-void qduino::setRGB(COLORS color){    
+void qduino::setRGB(COLORS color){
   switch (color) {
   case RED:
     analogWrite(10, 0);
@@ -97,31 +97,31 @@ void qduino::setRGB(COLORS color){
 }
 
 void qduino::rainbow(uint8_t duration)
-{    
+{
   uint8_t rgbColor[3];
 
   // Keep values for duration bounded
   if (duration < 1) duration = 1;
   if (duration > 5) duration = 5;
- 
+
   int newDuration = map(duration, 1, 5, 500, 3000);
-    
+
   // Start off with red.
   rgbColor[0] = 255;
   rgbColor[1] = 0;
-  rgbColor[2] = 0;  
- 
+  rgbColor[2] = 0;
+
   // Choose the colours to increment and decrement.
   for (uint8_t decColor = 0; decColor < 3; decColor += 1)
   {
     int incColor = decColor == 2 ? 0 : decColor + 1;
- 
+
     // cross-fade the two colours.
     for(uint8_t i = 0; i < 255; i += 1)
     {
       rgbColor[decColor] -= 1;
       rgbColor[incColor] += 1;
-      
+
       analogWrite(10, rgbColor[0]);
       analogWrite(11, rgbColor[1]);
       analogWrite(13, rgbColor[2]);
@@ -131,7 +131,7 @@ void qduino::rainbow(uint8_t duration)
 }
 
 void qduino::ledOff()
-{    
+{
   analogWrite(10, 255);
   analogWrite(11, 255);
   analogWrite(13, 255);
@@ -167,7 +167,7 @@ char fuelGauge::getVersion()
   byte msb = 0;
   byte lsb = 0;
   readFrom(MAX1704_VERSION, msb, lsb);
-  
+
   value  = 0xFF00 & (msb<<8);
   value |=   0xFF & lsb;
 
@@ -211,7 +211,7 @@ boolean fuelGauge::inSleep()
   byte lsb = 0;
 
   readFrom(MAX1704_CONFIG,msb,lsb);
-  byte sleep = (lsb >>7) & 0x01; 
+  byte sleep = (lsb >>7) & 0x01;
 
   return int(sleep) == 1;
 }
@@ -256,7 +256,7 @@ void fuelGauge::wakeUp()
   Wire.endTransmission();
 
   // This delay is here to ensure it's fully awake before moving on
-  delay(150); 
+  delay(150);
 }
 
 void fuelGauge::performCommand(byte address, int value)
@@ -281,6 +281,5 @@ void fuelGauge::readFrom(byte address, byte &msb, byte &lsb)
     msb = Wire.read();
     lsb = Wire.read();
   }
-  Wire.endTransmission();
+  //Wire.endTransmission();
 }
-