From 910c33e54b726c29305865c276ffc72f295f7ad1 Mon Sep 17 00:00:00 2001
From: caternuson <caternuson@gmail.com>
Date: Tue, 24 Aug 2021 13:44:10 -0700
Subject: [PATCH] remove chunk, mem alloc tweaks

---
 Adafruit_AMG88xx.cpp | 31 +++++++++----------------------
 Adafruit_AMG88xx.h   |  2 +-
 library.properties   |  2 +-
 3 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/Adafruit_AMG88xx.cpp b/Adafruit_AMG88xx.cpp
index 7bfa579..69c9bce 100644
--- a/Adafruit_AMG88xx.cpp
+++ b/Adafruit_AMG88xx.cpp
@@ -1,5 +1,10 @@
 #include "Adafruit_AMG88xx.h"
 
+Adafruit_AMG88xx::~Adafruit_AMG88xx(void) {
+  if (i2c_dev)
+    delete i2c_dev;
+}
+
 /**************************************************************************/
 /*!
     @brief  Setups the I2C interface and hardware
@@ -10,6 +15,8 @@
 */
 /**************************************************************************/
 bool Adafruit_AMG88xx::begin(uint8_t addr, TwoWire *theWire) {
+  if (i2c_dev)
+    delete i2c_dev;
   i2c_dev = new Adafruit_I2CDevice(addr, theWire);
   if (!i2c_dev->begin())
     return false;
@@ -212,28 +219,8 @@ uint8_t Adafruit_AMG88xx::read8(byte reg) {
 }
 
 void Adafruit_AMG88xx::read(uint8_t reg, uint8_t *buf, uint8_t num) {
-  uint8_t buffer[1];
-  size_t chunkSize = i2c_dev->maxBufferSize();
-  if (chunkSize > num) {
-    // can just read
-    buffer[0] = reg;
-    i2c_dev->write(buffer, 1);
-    i2c_dev->read(buf, num);
-  } else {
-    // must read in chunks
-    uint8_t pos = 0;
-    uint8_t read_buffer[chunkSize];
-    while (pos < num) {
-      buffer[0] = reg + pos;
-      i2c_dev->write(buffer, 1);
-      uint8_t read_now = min(uint8_t(chunkSize), (uint8_t)(num - pos));
-      i2c_dev->read(read_buffer, read_now);
-      for (uint8_t i = 0; i < read_now; i++) {
-        buf[pos] = read_buffer[i];
-        pos++;
-      }
-    }
-  }
+  uint8_t buffer[1] = {reg};
+  i2c_dev->write_then_read(buffer, 1, buf, num);
 }
 
 void Adafruit_AMG88xx::write(uint8_t reg, uint8_t *buf, uint8_t num) {
diff --git a/Adafruit_AMG88xx.h b/Adafruit_AMG88xx.h
index a0a0250..c6b4fb2 100644
--- a/Adafruit_AMG88xx.h
+++ b/Adafruit_AMG88xx.h
@@ -70,7 +70,7 @@ class Adafruit_AMG88xx {
 public:
   // constructors
   Adafruit_AMG88xx(void){};
-  ~Adafruit_AMG88xx(void){};
+  ~Adafruit_AMG88xx(void);
 
   bool begin(uint8_t addr = AMG88xx_ADDRESS, TwoWire *theWire = &Wire);
 
diff --git a/library.properties b/library.properties
index 5d0a711..910f2ac 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=Adafruit AMG88xx Library
-version=1.2.0
+version=1.2.1
 author=Adafruit
 maintainer=Adafruit <info@adafruit.com>
 sentence=Arduino library for AMG88xx 8x8 Thermocouple Sensors.