therm Changeset - 297213e62b1d · protofusion repositories

Changeset - 297213e62b1d

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Ethan Zonca - 11 years ago 2014-08-23 22:21:24
ez@ethanzonca.com

Somehow temp is working

1 file changed with 1 insertions and 1 deletions:

main.c

0 comments (0 inline, 0 general)

main.c

➞

Show inline comments

@@ @@ -146,49 +146,49 @@ int32_t setpoint = 0; @@
 int32_t p = 1;
 int32_t i = 1;
 int32_t d = 1;
 // Process things
 void process()
+{
     // Assert CS
     GPIO_ResetBits(MAX_CS);
     Delay(1);
     // This may not clock at all... might need to send 16 bits first
     SPI_I2S_SendData(SPI2, 0xAAAA); // send dummy data
     //SPI_I2S_SendData(SPI2, 0xAA); // send dummy data
     uint16_t temp_pre = SPI_I2S_ReceiveData(SPI2);
     if(temp_pre & 0b0000000000000010) {
         ssd1306_DrawString("Fatal Error", 3, 35);
+    }
     else if(temp_pre & 0b0000000000000001) {
         ssd1306_DrawString("TC Fault", 3, 35);
+    }
     else {
-        ssd1306_DrawString("OK         ", 3, 35);
+        ssd1306_DrawString("TempSense OK", 3, 35);
+    }
     uint8_t sign = temp >> 15;// top bit is sign
     temp_pre = temp_pre >> 2; // Drop 2 lowest bits
     int16_t temp = 0;
     if(sign) {
         temp = -temp_pre;
+    }
     else {
         temp = temp_pre;
+    }
     // Deassert CS
     Delay(1);
     GPIO_SetBits(MAX_CS);
     //////////////////////////
     // Calc internal temp   //
     //////////////////////////

0 comments (0 inline, 0 general)