From 122f3c2a48a5be50bf1ff9ab3953db482838d3ff Mon Sep 17 00:00:00 2001
From: Nick Van Doorn <vandoorn.nick@gmail.com>
Date: Wed, 27 Dec 2017 17:01:44 -0800
Subject: Fix progress computation

---
 camera.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/camera.c b/camera.c
index 2b8af64..4092a67 100644
--- a/camera.c
+++ b/camera.c
@@ -445,7 +445,6 @@ bool cam_readImageBlocks (Camera *cam, FILE *filePtr) {
   int jpgLen = cam_frameLength(cam);
   int imgSize = jpgLen;
   int nWrites = 0;
-  int totalDataRead = 0;
   while (jpgLen > 0) {
     uint8_t bytesToRead = cam_getImageBlockSize(jpgLen);
     uint8_t *buff = cam_readPicture(cam, bytesToRead);
@@ -453,10 +452,10 @@ bool cam_readImageBlocks (Camera *cam, FILE *filePtr) {
       LE_ERROR("Failed to read image data");
       return false;
     }
-    totalDataRead += bytesToRead;
     fwrite(buff, sizeof(*buff), bytesToRead, filePtr);
+    // give progress every 30 writes
     if (++nWrites % 30 == 0) {
-      double percentComplete = (double)totalDataRead * 100.0 / (double)imgSize;
+      double percentComplete = (double)imgSize - jpgLen * 100.0 / (double)imgSize;
       LE_INFO("Image write %f%% complete", percentComplete);
     }
     jpgLen -= bytesToRead;
-- 
cgit v1.2.3