From 5282fbec1c20e3cde8377302c3c1e0ad94a0a0fb Mon Sep 17 00:00:00 2001
From: mattmcw <matt@sixteenmillimeter.com>
Date: Sun, 21 Jan 2024 22:27:40 -0500
Subject: [PATCH] Update the esp32 poc to reflect what it is.

---
 .../esp32_dc_motor_poc.ino}                   |  0
 ino/motor_encoder_poc/motor_encoder_poc.ino   | 24 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)
 rename ino/{esp32_dc_motor/esp32_dc_motor.ino => esp32_dc_motor_poc/esp32_dc_motor_poc.ino} (100%)

diff --git a/ino/esp32_dc_motor/esp32_dc_motor.ino b/ino/esp32_dc_motor_poc/esp32_dc_motor_poc.ino
similarity index 100%
rename from ino/esp32_dc_motor/esp32_dc_motor.ino
rename to ino/esp32_dc_motor_poc/esp32_dc_motor_poc.ino
diff --git a/ino/motor_encoder_poc/motor_encoder_poc.ino b/ino/motor_encoder_poc/motor_encoder_poc.ino
index 9bcc2ab..9a23c3b 100644
--- a/ino/motor_encoder_poc/motor_encoder_poc.ino
+++ b/ino/motor_encoder_poc/motor_encoder_poc.ino
@@ -33,7 +33,7 @@ const float ratio = 62.0 / 1.0;
 const int maxPulses = (int) round((float) ppr * ratio);
 const int speed = 230;
 const int framesPerRotation = 18;
-const int pulsesPerFrame = (int) round((float) maxPulses / (float) framesPerRotation);
+const float pulsesPerFrame = (float) maxPulses / (float) framesPerRotation;
 volatile long start = 0;
 volatile bool done  = false;
 volatile bool stop = false;
@@ -84,19 +84,19 @@ void loop() {
     pos = posi;
   }
 
-  if (pos != lastRotationPosition && abs(pos) % maxPulses == 0) {
-    lastRotationPosition = pos;
-    rotations++;
+  rotations = (int) floor((float) pos / (float) maxPulses);
+  if (pos != lastRotationPosition) {
+    lastRotationPosition = rotations;
     frames = rotations * framesPerRotation;
 
   }
-  if (pos != lastFramePosition && abs(pos) % pulsesPerFrame == 0) {
-    lastFramePosition = pos;
-    frames++;
+  frames = (int) floor((float) pos / pulsesPerFrame);
+  if (frames != lastFramePosition) {
+    lastFramePosition = frames;
     Serial.print("Frames:    ");
-    Serial.print(frames);
-    Serial.print("@");
-    Serial.println(String(pos));
+    Serial.println(frames);
+    //Serial.print("@");
+    //Serial.println(pos);
   }
 
   if (abs(pos) >= maxPulses * maxRotations) {
@@ -111,8 +111,8 @@ void loop() {
   } else if ((stop || millis() - start >= maxTime) && !done) {
     digitalWrite(MOTORA, LOW);
     digitalWrite(MOTORB, LOW);
-    Serial.print("Final:  ");
-    Serial.println(pos);
+    //Serial.print("Final:  ");
+    //Serial.println(pos);
     Serial.print("Time:   ");
     Serial.println(millis() - start);
     rpm = calculateRPM(millis() - start) * (float) (rotations + 1);