Diff: mcp4725.cpp

Revision:

6:e83ec147be06

Parent:

5:fa31978934fd

Child:

7:05ccdd6cebf8

diff -r fa31978934fd -r e83ec147be06 mcp4725.cpp
--- a/mcp4725.cpp	Fri Apr 01 08:40:34 2016 +0000
+++ b/mcp4725.cpp	Wed May 18 11:22:16 2016 +0000
@@ -39,16 +39,11 @@
     result = _i2c_interface->read(_device_address, data, sizeof(data)/sizeof(*data), false);
     
     // Parse the raw data, extracting our fields. Refer to MCP4725 ref manual, section 6.2
-    if (result == 0)
-    {
-        eeprom_write_in_progress = (data[0] & 0x80)? false:true;
-        
+    if (result == 0) {
+        eeprom_write_in_progress = (data[0] & 0x80) ? false : true;
         mode = (enum PowerMode) ((data[0] & 0x06)>>1);
-        
         dac_value  = (data[1]<<4) + (data[2]>>4);
-        
         mode_eeprom = (enum PowerMode)((data[3] & 0x60)>>5);
-        
         dac_value_eeprom = ((data[3] & 0x0F) <<8) + data[4];
     }
      
@@ -62,7 +57,7 @@
  
  
 int MCP4725::setVoltage (float voltage, int ch){
-    int value = 4096 * voltage /Vdd; 
+    int value = 4096 * voltage / Vdd; 
     return write( Normal, value, false);
 }    
     
@@ -76,13 +71,10 @@
     int write_command;
     
     //Which write command are we to use?
-    if (writeToEeprom == true)
-    {
+    if (writeToEeprom == true)     {
         //Write DAC Register and EEPROM
         write_command = 3;
-    }
-    else
-    {
+    } else {
         //Write DAC Register
         write_command = 2;
     }