From df6a4c2b5711ba7cda3cadd91d4b625c7a06da9d Mon Sep 17 00:00:00 2001
From: Joshua Drake <Joshua.Ellis.Drake@gmail.com>
Date: Thu, 2 May 2024 20:10:00 -0500
Subject: Potentially fixed issues with reading SPI bus, and cleaned up code.

---
 main.c | 49 +++++--------------------------------------------
 1 file changed, 5 insertions(+), 44 deletions(-)

(limited to 'main.c')

diff --git a/main.c b/main.c
index e99c874..77d9b11 100644
--- a/main.c
+++ b/main.c
@@ -53,7 +53,6 @@
 /*
                          Main application
  */
-uint8_t nullarray = {0x00, 0x00, 0x00};
 uint8_t desired150, desired68, current150, current68 = 0;
 bool relay_delay = false;
 
@@ -68,9 +67,7 @@ int main(void)
     _LATA0 = _LATA1 = 0;//_LATA4 = 1; //Activate gate driver chips
     _LATA4 = 1;
     
-    SPI_slaveSelect();
-    Message_HWCR(nullarray);
-    SPI_slaveDeselect();
+    Message_HWCR();
     
     _LATB6 = 0;
     _LATB7 = 1;
@@ -78,9 +75,6 @@ int main(void)
     
     TMR1_SetInterruptHandler(&TMR1_Process);
     
-    //MSSP2_I2C_ReadPointerSet(0b00000011);
-   // MSSP2_I2C_WritePointerSet(0x00);
-    
     while (1)
     {
         desired150 = getI2CArray(1) & 0x0F;
@@ -89,68 +83,35 @@ int main(void)
         //if((relay_delay)&&(getTimeoutCounter() < 2))
         //{
          //relay_delay = false;
-        SPI_slaveSelect();
-        current150 = current150();
-        SPI_slaveDeselect();
-        /*
-        SPI_slaveSelect();
-        current68 = active68();
-        SPI_slaveDeselect();
-        
+        active(&current150,&current68);
+        /*        
             if(desired150 < current150)
             {
-            SPI_slaveSelect();
             Message_OUT(current150-1, current68, 1);
-            SPI_slaveDeselect();
             }
             else if(desired150 > current150)
             {
-            SPI_slaveSelect();
             Message_OUT(current150+1, current68, 1);
-            SPI_slaveDeselect();
             }
             else if(desired68 < current68)
             {
-            SPI_slaveSelect();
             Message_OUT(current150, current68-1, 1);
-            SPI_slaveDeselect();
             }
             else if(desired68 > current68)
             {
-            SPI_slaveSelect();
             Message_OUT(current150, current68+1, 1);
-            SPI_slaveDeselect();
             }
         }
 
         if(getTimeoutCounter() > 2){ //Open contactors if I2C communication is broken.
-            SPI_slaveSelect();
             Message_OUT(0, 0, 0);
-            SPI_slaveDeselect();
 
             _LATB8 = 0;
             _LATB7 = 1;
         }*/
+    Message_OUT(2, 0, relay_delay);
     
-    SPI_slaveSelect();
-    Message_OUT(desired150, 0, relay_delay);
-    SPI_slaveDeselect();
-    /*
-    SPI_slaveSelect();
-    Message_OUT(15, 5, 0);
-    SPI_slaveDeselect();
-    
-    SPI_slaveSelect();
-    Message_OUT(15, 5, 0);
-    SPI_slaveDeselect();
-     * 
-     * 
-*/
-    //SPI_slaveSelect();
-    //Message_OUT(15, i2cArray[1] >> 4, 0);
-    //SPI_slaveDeselect();
-       //if(MSSP2_I2C_WritePointerGet() > 50) {_LATB7 = 0; _LATB6 = 1;}
-       //else {_LATB6 = 0; _LATB7 = 1;}
+    if(current150>0){_LATB8=0; _LATB7=0;}
     }
 
     return 1;
-- 
cgit v1.2.3