From 094ea230af60134abec128a0833f8db0a120f846 Mon Sep 17 00:00:00 2001
From: Stephen Hawes <sphawes@gmail.com>
Date: Mon, 22 Jan 2024 17:12:31 -0500
Subject: [PATCH] adds sent command buffer so up and down arrows work as
 expected in the repl

---
 feederBus.js     | 14 +++++++++-----
 main.js          | 28 +++++++++++++++++++++++++++-
 serialManager.js | 23 ++++++++++++++++-------
 3 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/feederBus.js b/feederBus.js
index 4c0a7b7..99d3f27 100644
--- a/feederBus.js
+++ b/feederBus.js
@@ -203,7 +203,7 @@ export class feederBus {
         
 
         // find response in receiveBuffer
-        let response;
+        let response = "";
         const regex = new RegExp('rs485-reply:');
         for (let i=0, x=this.serial.receiveBuffer.length; i<x; i++) {
             let currLine = this.serial.receiveBuffer[i];
@@ -219,6 +219,11 @@ export class feederBus {
             return false;
         }
 
+        if(response == ""){
+            alert("Your version of Marlin does not support Photon. Please update Marlin to the version in the latest LumenPnP release.");
+            return false;
+        }
+
         //converts response to array
         let responseArray = this.hexStringToIntArray(response);
 
@@ -447,9 +452,10 @@ export class feederBus {
                 return false;
             }
             else{
+                //this line does the programming, but it fails because programming takes too long, rs-485 library has too short a timeout
                 let prgmResponse = await this.sendPacket(commands.PROGRAM_FEEDER_FLOOR, 0xFF, response.slice(6).concat(i));
-                //fails because programming takes too long?
-
+                
+                //instead we confirm by just checking to see if the address has actually been updated
                 let currentAddress = await this.sendPacket(commands.GET_FEEDER_ADDRESS, 0xFF, response.slice(6))
                 
                 if(currentAddress != false && currentAddress[1] == i){
@@ -463,9 +469,7 @@ export class feederBus {
                     }
                 }
             }
-            
         }
     }
-
 }
 
diff --git a/main.js b/main.js
index b7e8089..c47437a 100644
--- a/main.js
+++ b/main.js
@@ -14,10 +14,36 @@ function clearReplInput(){
 
 // clicks the send button if you hit the enter key while repl filed is focused
 document.getElementById("repl-input").addEventListener("keyup", function(event) {
-  if (event.keyCode === 13){
+  if (event.code === "Enter"){
     event.preventDefault();
     document.getElementById("send").click();
   }
+  else if (event.code === "ArrowUp"){
+    event.preventDefault();
+
+    //check to see that our index isnt at the end of commands sent
+    if(serial.sentCommandBufferIndex == serial.sentCommandBuffer.length - 1){
+      return false;
+    }
+    //update the buffer index
+    serial.sentCommandBufferIndex++;
+    //then drop that new element into the field
+    document.getElementById("repl-input").value = serial.sentCommandBuffer[serial.sentCommandBufferIndex];
+
+  }
+  else if (event.code === "ArrowDown"){
+    event.preventDefault();
+
+    //check to see that our index isnt at the end of commands sent
+    if(serial.sentCommandBufferIndex == 0){
+      return false;
+    }
+    //update the buffer index
+    serial.sentCommandBufferIndex--;
+    //then drop that new element into the field
+    document.getElementById("repl-input").value = serial.sentCommandBuffer[serial.sentCommandBufferIndex];
+
+  }
 });
 
 //hide/reveal unicast fields if certain dropdowns are selected
diff --git a/serialManager.js b/serialManager.js
index c53c0d6..e1891bd 100644
--- a/serialManager.js
+++ b/serialManager.js
@@ -7,6 +7,9 @@ export class serialManager {
 
         this.receiveBuffer = [];
 
+        this.sentCommandBuffer = [""];
+        this.sentCommandBufferIndex = 0;
+
     }
 
     appendToConsole(message, direction){
@@ -133,6 +136,13 @@ export class serialManager {
 
     async sendRepl() {
         let command = [document.querySelector("#repl-input").value];
+
+        //adding current command to buffer for uparrow access later, at position 1 to preserve a "" option
+        this.sentCommandBuffer.splice(1, 0, command[0])
+
+        //making sure we reset the index back to 0
+        this.sentCommandBufferIndex = 0;
+        
         this.send(command);
 
     }
@@ -342,11 +352,9 @@ export class serialManager {
         let testDataBuffer = "";
 
         const commandArray = [
-        "M122"
+            "M122"
         ]
 
-        //TODO add motor current to this test
-
         //clean out receive buffer
         await this.clearBuffer();
         
@@ -358,16 +366,17 @@ export class serialManager {
         //check receieve buffer
         console.log(this.receiveBuffer);
 
+        //adding to test buffer
+        for(let i = 0; i<this.receiveBuffer.length; i++){
+            testDataBuffer = testDataBuffer.concat(this.receiveBuffer[i] + "\n");
+        }
+
         alert("Downloading test results.");
 
         //alert user
         let filename = new Date().toISOString();
         filename = filename + "-tmctest.txt"
 
-        for(let i = 0; i<this.receiveBuffer.length; i++){
-        testDataBuffer = testDataBuffer.concat(this.receiveBuffer[i] + "\n");
-        }
-
         this.download(filename, testDataBuffer);