Changeset 12 for ds1624

Timestamp:

10/19/07 01:35:46 (15 months ago)

Author:

mlalondesvn

Message:

DS1624:

ADDED - Support for read/write to the EEPROM
ADDED - DS1624_USE_EEPROM Define in the config to enable eeprom functions
MODIF - Moved the start/stop conversion routine to the start/stopConversion() functions

DS1803 & DS1337:

FIXED - Removed r/w addresses and changed for single address

Location:

ds1624

Files:

• ds1624.cpp (modified) (3 diffs)
• ds1624.h (modified) (2 diffs)

ds1624/ds1624.cpp

@@ -19 +19 @@
 {
     Wire.beginTransmission(DS1624_ADDR);
-    Wire.send(DS1624_CONFIG);
+    Wire.send(DS1624_CONFIG_ADDR);
     Wire.send(DS1624_CONFIGS);
     Wire.endTransmission();
     
-    delay(10);
+    delay(5);
     
-    Wire.beginTransmission(DS1624_ADDR);
-    Wire.send(DS1624_CONFIG);
-    Wire.endTransmission();
-    
-    Wire.requestFrom(DS1624_ADDR, 1);
-    
+    if (DS1624_CONFIGS == DS1624_CONFIG_CONT) {
+        startConversion();
+    }
+}
+
+void DS1624::startConversion(void)
+{
     Wire.beginTransmission(DS1624_ADDR);
     Wire.send(DS1624_SMPL_START);
     Wire.endTransmission();
+    
+#ifdef DS1624_HANDLE_BOOT_DELAY
+    delay(1000);
+#endif
+}
 
-#ifdef DS1624_HANDLE_BOOT_DELAY
-    delay(1500);
-#endif
+void DS1624::stopConversion(void)
+{
+    Wire.beginTransmission(DS1624_ADDR);
+    Wire.send(DS1624_SMPL_STOP);
+    Wire.endTransmission();
 }
 
@@ -46 +54 @@
     Wire.send(DS1624_READ_TEMP);
     Wire.endTransmission();
+    
+    delay(5);
     
     Wire.requestFrom(DS1624_ADDR, 2);
@@ -59 +69 @@
     return res;
 }
+
+#ifdef DS1624_USE_EEPROM
+void DS1624::writeData(uint8_t *data)
+{
+    writeData(data, DS1624_EEPROM_SIZE, 0);
+}
+
+void DS1624::writeData(uint8_t *data, uint8_t dataLength)
+{
+    writeData(data, dataLength, 0);
+}
+
+void DS1624::writeData(uint8_t *data, uint8_t dataLength, uint8_t memoryPosition)
+{
+    // We can only write one page at a time!
+    if (memoryPosition%DS1624_EEPROM_PAGE != 0) return;
+    
+    // Make sure we don't overlap
+    if (dataLength == 0 || dataLength > (DS1624_EEPROM_SIZE - memoryPosition)) return;
+    
+    uint8_t buffer[DS1624_EEPROM_PAGE];
+    uint8_t pagePosition    = 0;
+    uint8_t pageSize        = 0;
+    uint8_t buffLen         = 0;
+    
+    stopConversion();
+    
+    for (uint16_t pageStart = 0; pageStart < dataLength; pageStart+=DS1624_EEPROM_PAGE)
+    {   
+        if (pageStart+DS1624_EEPROM_PAGE < dataLength || dataLength%DS1624_EEPROM_PAGE == 0)
+            pageSize    = DS1624_EEPROM_PAGE;
+        else
+            pageSize    = dataLength%DS1624_EEPROM_PAGE;
+        
+        pagePosition = 0;
+        while (pagePosition < pageSize)
+        {
+            buffer[pagePosition]    = data[pageStart+pagePosition];
+            
+            pagePosition++;
+        }
+        
+        writePage(buffer, pageSize, (memoryPosition + pageStart));
+        
+    }
+    
+    startConversion();
+    
+    return;
+}
+
+void DS1624::writePage(uint8_t *data, uint8_t dataLength, uint8_t pagePosition)
+{
+    if (dataLength == 0 || dataLength > DS1624_EEPROM_PAGE) return;
+    
+    Wire.beginTransmission(DS1624_ADDR);
+    Wire.send(DS1624_ACCESS_MEM);
+    Wire.send(pagePosition);
+    
+    Wire.send(data, dataLength);
+    
+    Wire.endTransmission();
+    
+    // Wait for the DS1624 to finish writing the eeprom
+    delay(50);
+}
+
+void DS1624::readData(uint8_t *data)
+{
+    return readData(data, DS1624_EEPROM_SIZE, 0);
+}
+
+void DS1624::readData(uint8_t *data, uint8_t dataLength)
+{
+    return readData(data, dataLength, 0);
+}
+
+void DS1624::readData(uint8_t *data, uint8_t dataLength, uint8_t memoryPosition)
+{
+    // Make sure we don't overlap
+    if (dataLength == 0 || dataLength > (DS1624_EEPROM_SIZE - memoryPosition)) return;
+    
+    uint8_t pagePosition;
+    for (uint16_t pagePosition = 0; pagePosition < dataLength; pagePosition++)
+    {
+        // Send the access memory command along with the starting position
+        Wire.beginTransmission(DS1624_ADDR);
+        Wire.send(DS1624_ACCESS_MEM);
+        Wire.send((int)(memoryPosition + pagePosition));
+        Wire.endTransmission();
+        
+        // Wait for the DS1624 to set the position pointer
+        delay(5);
+        
+        Wire.requestFrom(DS1624_ADDR, 1);
+        
+        while (!Wire.available());
+        
+        data[pagePosition] = Wire.receive();
+    }
+    
+    return;
+}
+#endif

ds1624/ds1624.h

@@ -9 +9 @@
 
 /**
- * Registers and bit mask definition
+ * Sampling configurations
 **/
-#define DS1624_CONFIG       0xAC
-#define DS1624_CONFIG_DONE  B10000000
 #define DS1624_CONFIG_1SHOT B00000001
 #define DS1624_CONFIG_CONT  B00000000
 
-// Select your config here!
+// Select either 1shot or continous themometer mode
 #define DS1624_CONFIGS      DS1624_CONFIG_CONT
 
+// DS1624 Commands
+#define DS1624_CONFIG_ADDR  0xAC
 #define DS1624_READ_TEMP    0xAA
 #define DS1624_SMPL_START   0xEE
@@ -24 +24 @@
 #define DS1624_ACCESS_MEM   0x17
 
+// Bit masks
+#define DS1624_CONFIG_DONE  B10000000
+
+// Size of the EEPROM memory in bytes
+#define DS1624_EEPROM_SIZE  255 /* There are actually 256 bytes, but the twi functions only support reading 255 at a time!*/
+#define DS1624_EEPROM_PAGE  8
+
 class DS1624
 {
     public:
         DS1624();
+        
+        /**
+         * Init: runs the initializationr outine
+        **/
         void        Init(void);
+        
+        /**
+         * readTemp: reads the temperature and returns
+         * a 16 byte integer in which the 2 highest bytes
+         * are used as (int8_t)degrees and the 2 lowest
+         * are used (uint8_t)decimals
+        **/
         uint16_t    readTemp(void);
+        
+        /**
+         * Start conversion, used at startup in
+         * continous mode, or before a read
+         * in 1shot mode
+        **/
+        void        startConversion(void);
+        
+        /**
+         * stopConversion: stops the temperature acquisition
+        **/
+        void        stopConversion(void);
+    /**
+     * EEPROM Support functions
+    **/
+    #ifdef DS1624_USE_EEPROM
+        /**
+         * writeData: writes data to the eeprom
+         * pass it an array of uint8_t containing the values to write, 
+         * the start position (must be %8 == 0) and the length.
+         * The two last can be omnited.
+        **/
+        void        writeData(uint8_t *, uint8_t, uint8_t);
+        void        writeData(uint8_t *, uint8_t);
+        void        writeData(uint8_t *);
+        
+        /**
+         * writeData: writes data to the eeprom
+         * pass it an array of uint8_t to store the result, 
+         * the start position and the length. The two last can be omnited
+        **/
+        void        readData(uint8_t *, uint8_t, uint8_t);
+        void        readData(uint8_t *, uint8_t);
+        void        readData(uint8_t *);
+    #endif
     private:
+    #ifdef DS1624_USE_EEPROM
+        /**
+         * writePage: writes a single page (or less) to the eeprom
+         * pass it an array of uint8_t to store the result, 
+         * the start position and the length.
+        **/
+        void        writePage(uint8_t *, uint8_t, uint8_t);
+    #endif
         
 };