Merge branch 'master' of gitlab:wintermute/hackover2013-badge-firmware

[hackover2013-badge-firmware.git] / drivers / dac / mcp4725 / mcp4725.h

diff --git a/drivers/dac/mcp4725/mcp4725.h b/drivers/dac/mcp4725/mcp4725.h
index 71100cc..42ba362 100644 (file)
--- a/drivers/dac/mcp4725/mcp4725.h
+++ b/drivers/dac/mcp4725/mcp4725.h
@@ -39,13 +39,14 @@
 
 #include "projectconfig.h"
 
 
 #include "projectconfig.h"
 

-#define MCP4725_ADDRESS                 (0xC0)   // 1100000x - Assumes A0 is GND and A2,A1 are 0 (MCP4725A0T-E/CH)
+//#define MCP4725_ADDRESS                 (0xC0)   // 1100000x - Assumes A0 is GND and A2,A1 are 00 (MCP4725A0T-E/CH)
+#define MCP4725_ADDRESS                 (0xC4)   // 1100010x - Assumes A0 is GND and A2,A1 are 01 (MCP4725A1T-E/CH)

 #define MCP4725_READ                    (0x01)
 #define MCP4726_CMD_WRITEDAC            (0x40)  // Writes data to the DAC
 #define MCP4726_CMD_WRITEDACEEPROM      (0x60)  // Writes data to the DAC and the EEPROM (persisting the assigned value after reset)
 
 int  mcp4725Init();
 void mcp4725SetVoltage( uint16_t output, bool writeEEPROM );
 #define MCP4725_READ                    (0x01)
 #define MCP4726_CMD_WRITEDAC            (0x40)  // Writes data to the DAC
 #define MCP4726_CMD_WRITEDACEEPROM      (0x60)  // Writes data to the DAC and the EEPROM (persisting the assigned value after reset)
 
 int  mcp4725Init();
 void mcp4725SetVoltage( uint16_t output, bool writeEEPROM );

-void mcp472ReadConfig( uint8_t *status, uint16_t *value );
+void mcp4725ReadConfig( uint8_t *status, uint16_t *value );

 
 #endif
\ No newline at end of file
 
 #endif
\ No newline at end of file