+ 0.1.04

+ fixed powerDownMode (still experimental,use with care) + added corrections to powerOnReset() + added corrections to powerOnWakeUp() + changed interface + behavior of writePowerDownMode() + added conditional code where needed + added testcode for powerDownMode()

Author: RobTillaart

libraries/MCP4725/MCP4725.cpp

@@ -2,7 +2,7 @@
 // FILE: MCP4725.cpp
 // AUTHOR: Rob Tillaart
 // PURPOSE: Simple MCP4725 DAC library for Arduino
-// VERSION: 1.0.03
+// VERSION: 1.0.04
 // HISTORY: See MCP4725.cpp
 // URL:
 //
@@ -11,6 +11,7 @@
 // 0.1.01 - 2013-11-30 added readDAC() & writeDAC (registerwrite)
 // 0.1.02 - 2013-12-01 added readEEPROM() & RDY()
 // 0.1.03 - 2013-12-01 added powerDownMode code
+// 0.1.04 - 2013-12-04 improved the generalCall code (still experimental)
 //
 // Released to the public domain
 //
@@ -32,8 +33,17 @@ void MCP4725::begin()
  // 12=400KHz 24=250 32=200 72=100 152=50
  // F_CPU/16+(2*TWBR) // TWBR is a uint8_t
 
+ #ifdef MCP4725_EXTENDED
  _lastValue = readDAC();
- _powerDownMode = readPowerDownModeEEPROM();
+ #else
+ _lastValue = 0;
+ #endif
+
+ #ifdef MCP4725_POWERDOWNMODE
+ _powerDownMode = readPowerDownModeDAC();
+ #else
+ _powerDownMode = 0;
+ #endif
 }
 
 int MCP4725::setValue(uint16_t value)
@@ -88,26 +98,21 @@ uint16_t MCP4725::readEEPROM()
 
 #ifdef MCP4725_POWERDOWNMODE
 //
-// PDmode can be written to DAC or to DAC&EEPROM,
-// for now the lib only support DAC&EEPROM
-// this will change after enough experience is gathered how to use
-
-// write to DAC & EEPROM
-int MCP4725::writePowerDownMode(uint8_t PDM)
+// depending on bool EEPROM the value of PDM is written to
+// (false) DAC or
+// (true) DAC & EEPROM,
+int MCP4725::writePowerDownMode(uint8_t PDM, bool EEPROM)
 {
- _powerDownMode = (PDM & 0x03); // force only pdm bits
- return writeDAC(_lastValue, true);
+ _powerDownMode = (PDM & 0x03); // mask pdm bits only
+ return writeDAC(_lastValue, EEPROM);
 }
 
 uint8_t MCP4725::readPowerDownModeEEPROM()
 {
  while(!RDY());
  uint8_t buffer[4];
  readRegister(buffer, 4);
- // EEPROM
  uint8_t value = (buffer[3] >> 5) & 0x03;
- // DAC
- // uint8_t value = (buffer[0] >> 1) & 0x03;
  return value;
 }
 
@@ -120,21 +125,23 @@ uint8_t MCP4725::readPowerDownModeDAC()
  return value;
 }
 
-// PAGE 22
-// experimental
+// PAGE 22 - experimental
+// DAC value is reset to EEPROM value
+// need to reflect this in cached value
 int MCP4725::powerOnReset()
 {
- int rv = command(MCP4725_GENERAL_RESET);
- // what happens to _lastValue and _powerDownMode...
+ int rv = generalCall(MCP4725_GC_RESET);
+ _lastValue = readDAC(); // update cache to actual value;
  return rv;
 }
 
-// PAGE 22
-// experimental
+// PAGE 22 - experimental
+// _powerDownMode DAC resets to 0 -- pdm EEPROM stays same !!!
+// need to reflect this in cached value
 int MCP4725::powerOnWakeUp()
 {
- int rv = command(MCP4725_GENERAL_WAKEUP);
- // what happens to _lastValue and _powerDownMode...
+ int rv = generalCall(MCP4725_GC_WAKEUP);
+ _powerDownMode = readPowerDownModeDAC(); // update to actual value;
  return rv;
 }
 #endif
@@ -216,13 +223,13 @@ uint8_t MCP4725::readRegister(uint8_t* buffer, uint8_t length)
 #endif
 
 #ifdef MCP4725_POWERDOWNMODE
-int MCP4725::command(uint8_t cmd)
+int MCP4725::generalCall(uint8_t gc)
 {
- Wire.beginTransmission(_deviceAddress);
+ Wire.beginTransmission(0);
 #if defined(ARDUINO) && ARDUINO >= 100
- Wire.write(cmd);
+ Wire.write(gc);
 #else
- Wire.send(cmd);
+ Wire.send(gc);
 #endif
  return Wire.endTransmission();
 }

libraries/MCP4725/MCP4725.h

@@ -4,7 +4,7 @@
 // FILE: MCP4725.h
 // AUTHOR: Rob Tillaart
 // PURPOSE: Simple MCP4725 DAC library for Arduino
-// VERSION: 1.0.03
+// VERSION: 1.0.04
 // HISTORY: See MCP4725.cpp
 // URL:
 //
@@ -21,11 +21,10 @@
 #include "Wiring.h"
 #endif
 
-#define MCP4725_VERSION "1.0.03"
+#define MCP4725_VERSION "1.0.04"
 
 // regisiterMode
 #define MCP4725_DAC 0x40
-#define MCP4725_EEPROM 0x20
 #define MCP4725_DACEEPROM 0x60
 
 // constants
@@ -37,8 +36,8 @@
 #define MCP4725_REG_ERROR -998
 
 // page 22
-#define MCP4725_GENERAL_RESET 0x06
-#define MCP4725_GENERAL_WAKEUP 0x09
+#define MCP4725_GC_RESET  0x06
+#define MCP4725_GC_WAKEUP  0x09
 
 // powerDown Mode - TODO ENUM?
 #define MCP4725_PDMODE_NORMAL 0x00
@@ -47,8 +46,8 @@
 #define MCP4725_PDMODE_500K 0x03
 
 // conditional to minimize footprint.
-#define MCP4725_EXTENDED
-#define MCP4725_POWERDOWNMODE
+//#define MCP4725_EXTENDED
+//#define MCP4725_POWERDOWNMODE
 
 class MCP4725
 {
@@ -70,7 +69,7 @@ class MCP4725
 
 #ifdef MCP4725_POWERDOWNMODE
  // experimental
- int writePowerDownMode(uint8_t PDM);
+ int writePowerDownMode(uint8_t PDM, bool EEPROM = false);
  uint8_t readPowerDownModeEEPROM();
  uint8_t readPowerDownModeDAC();
  int powerOnReset();
@@ -89,7 +88,7 @@ class MCP4725
 #endif
 
 #ifdef MCP4725_POWERDOWNMODE
- int command(uint8_t cmd);
+ int generalCall(uint8_t gc);
 #endif
 
 };

libraries/MCP4725/examples/mcp4725_test/mcp4725_test.ino

@@ -1,7 +1,7 @@
 //
 // FILE: mcp4725_test.ino
 // AUTHOR: Rob Tillaart
-// VERSION: 0.1.02
+// VERSION: 0.1.04
 // PURPOSE: test mcp4725 lib
 // DATE: 2013-11-24
 // URL:
@@ -94,36 +94,62 @@ void setup()
  Serial.println("EXPERIMENTAL");
  Serial.println("DAC.writePowerDownMode(3)");
  DAC.writePowerDownMode(3);
+ DAC.writeDAC(305);
+ Serial.print("Value:\t");
+ Serial.println(DAC.getValue());
  Serial.println("DAC.powerOnReset()");
  Serial.println("Before");
  Serial.print("DAC PDM Value:\t");
  Serial.println(DAC.readPowerDownModeDAC());
  Serial.print("EPR PDM Value:\t");
  Serial.println(DAC.readPowerDownModeEEPROM());
+ Serial.print("DACValue:\t");
+ Serial.println(DAC.readDAC());
+ Serial.print("EEValue:\t");
+ Serial.println(DAC.readEEPROM()); 
  DAC.powerOnReset();
  Serial.println("After");
  Serial.print("DAC PDM Value:\t");
  Serial.println(DAC.readPowerDownModeDAC());
  Serial.print("EPR PDM Value:\t");
  Serial.println(DAC.readPowerDownModeEEPROM());
+ Serial.print("DACValue:\t");
+ Serial.println(DAC.readDAC());
+ Serial.print("EEValue:\t");
+ Serial.println(DAC.readEEPROM()); 
+ Serial.print("Value:\t");
+ Serial.println(DAC.getValue());
  Serial.println();
 
 
  Serial.println("EXPERIMENTAL");
  Serial.println("DAC.writePowerDownMode(2)");
  DAC.writePowerDownMode(2);
+ DAC.writeDAC(405);
+ Serial.print("Value:\t");
+ Serial.println(DAC.getValue());
  Serial.println("DAC.powerOnWakeUp()");
  Serial.println("Before");
  Serial.print("DAC PDM Value:\t");
  Serial.println(DAC.readPowerDownModeDAC());
  Serial.print("EPR PDM Value:\t");
  Serial.println(DAC.readPowerDownModeEEPROM());
+ Serial.print("DACValue:\t");
+ Serial.println(DAC.readDAC());
+ Serial.print("EEValue:\t");
+ Serial.println(DAC.readEEPROM()); 
  DAC.powerOnWakeUp();
  Serial.println("after");
  Serial.print("DAC PDM Value:\t");
  Serial.println(DAC.readPowerDownModeDAC());
  Serial.print("EPR PDM Value:\t");
  Serial.println(DAC.readPowerDownModeEEPROM());
+ Serial.print("DACValue:\t");
+ Serial.println(DAC.readDAC());
+ Serial.print("EEValue:\t");
+ Serial.println(DAC.readEEPROM()); 
+ Serial.print("Value:\t");
+ Serial.println(DAC.getValue());
  Serial.println();
 
 #endif