Diff: src/main.cpp

Revision:

9:816b9a4e4f21

Parent:

8:d3d7dca419b3

Child:

10:6c3233b03658

--- a/src/main.cpp	Thu Dec 06 16:22:11 2018 +0000
+++ b/src/main.cpp	Fri Dec 07 00:15:19 2018 +0000
@@ -40,8 +40,8 @@
 
 unsigned int boardsActive;
 unsigned int boardMults;
-unsigned int v48, v24, v12; // Voltage divide ratio is a little low due to substituting 10k resistors in place of the 100k. The 100k caused the opamps to oscillate.
-unsigned int i48, i24, i12;
+unsigned short v48, v24, v12; // Voltage divide ratio is a little low due to substituting 10k resistors in place of the 100k. The 100k caused the opamps to oscillate.
+unsigned short i48, i24, i12;
 unsigned int binCode[6];
 unsigned int en_out_code;
 unsigned int thermCode[17];
@@ -86,7 +86,7 @@
    menuRedraw(WITH_PROMPT);
    
    //masterTimer.start();
-  
+   //int count=0;
    while (1)
    {
       processCommand();
@@ -100,15 +100,16 @@
          updateTerminal();  // May want to gate this call when we run a headless system.
          //loopTime = masterTimer.read_ms();// - loopTime;
          myled = !myled;
+         //sprintf(strbuf, "\r\nupdateControls ran %d times.\r\n", count);
+         //sendSerial(strbuf);
+         //count=0;
       }
       
       if(running){
-          //updateControls();
           updateControls(i12);
+          //count++;
       }else{
-          //wr_out_code = setBoardEnables(ALLOFF);
-          //setBoardEnables((unsigned int *)alloff);
-          updateControls(my12);
+          XupdateControls(my12);
       }
       
       //myled = 1;