therm Changeset - 15c6a608a780 · protofusion repositories

Changeset - 15c6a608a780

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Ethan Zonca - 10 years ago 2014-08-23 21:13:21
ez@ethanzonca.com

Somehow temp is working

1 file changed with 31 insertions and 25 deletions:

main.c

0 comments (0 inline, 0 general)

main.c

➞

Show inline comments

@@ @@ -8,56 +8,56 @@ @@
 #include "usb_desc.h"
 #include "usb_pwr.h"
 #define LED_POWER GPIOB,GPIO_Pin_9
 #define LED_STAT  GPIOA,GPIO_Pin_15
 #define MAX_CS GPIOB,GPIO_Pin_12
 // TODO: Grab buttonpresses with interrupts
 #define SW_BTN  GPIOB, GPIO_Pin_3
 #define SW_UP   GPIOB, GPIO_Pin_7
 #define SW_DOWN GPIOB, GPIO_Pin_6
 #define SW_LEFT GPIOB, GPIO_Pin_5
 #define SW_RIGHT GPIOB, GPIO_Pin_4
 // USB Supporting Vars
 extern __IO uint8_t Receive_Buffer[64];
 extern __IO  uint32_t Receive_length ;
 extern __IO  uint32_t length ;
 uint8_t Send_Buffer[64];
 uint32_t packet_sent=1;
 uint32_t packet_receive=1;
-char* itoa(int32_t i, char b[]){
+char* itoa(int16_t i, char b[]){
     char const digit[] = "0123456789";
     char* p = b;
     if(i<0){
         *p++ = '-';
         i *= -1;
+    }
-    int shifter = i;
+    uint16_t shifter = i;
     do{ //Move to where representation ends
         ++p;
         shifter = shifter/10;
     }while(shifter);
     *p = '\0';
     do{ //Move back, inserting digits as you go
         *--p = digit[i%10];
         i = i/10;
     }while(i);
     return b;
+}
 int32_t round(double x) {
     if (x >= 0)
         return (long) (x+0.5);
     return (long) (x-0.5);
+}
 static __IO uint32_t TimingDelay;
 // Move to header file
 void init_gpio();
 void init_spi();
@@ @@ -126,110 +126,116 @@ int main(void) @@
             GPIO_ToggleBits(LED_STAT);
             if(!toggle) {
                 GPIO_SetBits(GPIOB, GPIO_Pin_13);
                 toggle = ! toggle;
+            }
             else  {
                 GPIO_ResetBits(GPIOB, GPIO_Pin_13);
                 toggle = ! toggle;
+            }
+        }
         GPIO_SetBits(LED_POWER);
         Delay(50);
         GPIO_ResetBits(LED_POWER);
         Delay(50);
+    }
+}
 int32_t temp = 0;
 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, 0xAA); // send dummy data
     SPI_I2S_SendData(SPI2, 0xAA); // send dummy data
     uint16_t temp1 = SPI_I2S_ReceiveData(SPI2);
     SPI_I2S_SendData(SPI2, 0xAAAA); // send dummy data
 //    SPI_I2S_SendData(SPI2, 0xAA); // send dummy data
 //    SPI_I2S_SendData(SPI2, 0xAA); // send dummy data
     uint16_t temp2 = 0;//SPI_I2S_ReceiveData(SPI2);
     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);
+    }
     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);
     int32_t temp = (temp1 << 16) | temp2;
     //////////////////////////
     // Calc internal temp   //
     //////////////////////////
 /*    temp = temp >> 4; // Drop last 4 bits, no need for them
     float internal_temp = temp & 0x7FF // Lower 11bits are internal temp
     // Check internal temp sign
     if(temp & 0x800) {
         // Convert to negative value by extending sign and casting to signed type.
         int16_t tmp = 0xF800 | (temp & 0x7FF);
         internal_temp = tmp;
+    }
     internal_temp *= 0.0625; // LSB = 0.0625 degrees
     // Now we have a good internal temp!
 */
     //////////////////////////
     // Calc external temp   //
     //////////////////////////
     if(temp & 0x7) {
         // Something is wrong...
         ssd1306_DrawString("!TempCOMMS", 3, 35);
+    }
     if(temp & 0x80000000) {
         // Negative value, drop the lower 18 bits and explicitly extend sign bits
         temp = 0xFFFFC000 | ((temp >> 18) & 0x00003FFFF);
+    }
     else {
         // Positive value, just drop lower 18
         temp >>= 18;
+    }
     double temp_centigrade = temp;
     if(temp > 0) {
         GPIO_SetBits(LED_STAT);
+    }
     char tempstr[9];
-    itoa(temp, tempstr);
+    itoa(temp_pre, tempstr);
     ssd1306_DrawString("Temp: ", 1, 40);
     ssd1306_DrawString("    ", 1, 70);
     ssd1306_DrawString(tempstr, 1, 70);
 /*
     if((!retval || (temp & 0x2) != 0))
+    {
         ssd1306_DrawString("!TempCOMMS", 3, 35);
         //return; // Comms error - this is happening right now
+    }
     else if((temp & 0x4)!= 0)
+    {
         ssd1306_DrawString("!OpenThermocouple", 3, 40);
         //return; // Open thermocouple
+    }
     temp = (temp & 0x7FF8) >> 5;
 */
     // TODO: Add calibration offset (linear)
     // Perform PID calculations
     // Write output to SSR

0 comments (0 inline, 0 general)