WebSVN – HomeAutomation – Diff – /trunk/EmbeddedSoftware/PIC/canTemp/Source/Main.c

+ *
  *                  Main application
+ *
  *********************************************************************
  * FileName:        $HeadURL: https://svn.auml.se/svn/HomeAutomation/trunk/EmbeddedSoftware/PIC/canTemp/Source/Main.c $
- * Last changed:    $LastChangedDate: 2007-02-08 18:24:59 +0100 (Thu, 08 Feb 2007) $
+ * Last changed:    $LastChangedDate: 2007-02-25 20:51:08 +0100 (Sun, 25 Feb 2007) $
  * By:              $LastChangedBy: johboh $
- * Revision:        $Revision: 297 $
+ * Revision:        $Revision: 339 $
  ********************************************************************/
 #include <compiler.h>
 #include <stackTasks.h>
 #include <Tick.h>
 #include <funcdefs.h>
 #include <CAN.h>
+#include "..\canBoot\Include\boot.h"
 #ifdef USE_ADC
     #include <adc.h>
 #endif
 void main()
+{
     static TICK t = 0;
-    CAN_MESSAGE outCm;
+    CAN_PACKET outCp;
     // Inits
     mainInit();
     canInit();
     #ifdef USE_ADC
         adcInit(TRUE,0b1011);
     #endif
     #ifdef USE_BLINDS
         blindsInit();
+        blindsTurn(0);
+    #else
+        BLINDS0P_IO=0;
     #endif
-    BLINDS0P_IO=1;
     while(1)
+    {
         static TICK t = 0;
         static TICK temperature = 0;
+        static BOOL getNewTemperature = TRUE;
         static BYTE lastTemperature = TEMPERATURE_INSIDE;
-        static signed char angle = 70;
         static TICK blinds = 0;
         if ((tickGet()-t)>TICK_SECOND)
+        {
             LED0_IO=~LED0_IO;
             t = tickGet();
         }
         #ifdef USE_BLINDS
-        if ((tickGet()-blinds)>2*TICK_SECOND)
+        if ((tickGet()-blinds)>3*TICK_SECOND)
         {
+            outCp.type=ptPGM;
+            outCp.pgm.class=pcSENSOR;
-            angle = (angle>0?-70:70);
+            outCp.pgm.id=pstBLIND_TR;
-            blindsTurn(angle);
+            outCp.length=1;
+            outCp.data[0]=blindsGetPrecent();
+            while(!canSendMessage(outCp,PRIO_HIGH));
             blinds = tickGet();
+        }
         #endif
         #ifdef USE_ADC
-        if ((tickGet()-temperature)>TICK_SECOND*2) // Each 2 second, read temperature.
+        if ((tickGet()-temperature)>TICK_SECOND*2 && getNewTemperature==TRUE) // Each 2 second, read temperature.
+        {
             if (lastTemperature==TEMPERATURE_INSIDE) lastTemperature=TEMPERATURE_OUTSIDE; else lastTemperature=TEMPERATURE_INSIDE;
             adcConvert(lastTemperature);
             temperature = tickGet();
+            getNewTemperature=FALSE;
         }
         #endif
         #ifdef USE_ADC
         if (adcDone()) // Has temperature, send it to the bus
+        {
             BYTE decimal;
             signed char tenth;
+            unsigned long q;
             temperatureRead(&tenth,&decimal);
+            q = adcGetRaw();
+            getNewTemperature=TRUE;
+            outCp.type=ptPGM;
-            outCm.funct                     = FUNCT_SENSORS;
+            outCp.pgm.class =pcSENSOR;
-            outCm.funcc                     = (lastTemperature==TEMPERATURE_INSIDE?FUNCC_SENSORS_TEMPERATURE_INSIDE:FUNCC_SENSORS_TEMPERATURE_OUTSIDE);
+            outCp.pgm.id    =(lastTemperature==TEMPERATURE_INSIDE?pstTEMP_INSIDE:pstTEMP_OUTSIDE);
-            outCm.data_length               = 2;
+            outCp.length    =2;
-            outCm.data[1]                   = tenth; //  signed 10 an 1 decimal.
+            outCm.data[1]   = tenth; //  signed 10 an 1 decimal.
-            outCm.data[0]                   = decimal; //  Decimal value, 0-9
+            outCm.data[0]   = decimal; //  Decimal value, 0-9
             while(!canSendMessage(outCm,PRIO_HIGH));
         }
         #endif
     }
 }
 #pragma interrupt high_isr
 void high_isr(void)
+{
     canISR();
-    #ifdef USE_BLINDS
-        blindsISR();
-    #endif
+}
 #pragma interrupt low_isr
 void low_isr(void)
 {
     #ifdef USE_ADC
         adcISR();
+    #endif
+    #ifdef USE_BLINDS
+        blindsISR();
     #endif
+}
+*
 *   Input:  none
 *   Output: none
 *   Pre-conditions: none
 *   Affects: Se code
 *   Depends: none.
 */
 void mainInit()
+{
     LED0_TRIS=0;
     BLINDS0_TRIS=0;
     BLINDS0P_TRIS=0;
     // Enable Interrupts
     INTCONbits.GIEH = 1;
     INTCONbits.GIEL = 1;
     // Enable interrupt prirority
     RCONbits.IPEN=1;
 }
 /*
 *   Function: canParse
+*
 *   Input:  Received can message
 *   Pre-conditions: canInit and received packet.
 *   Affects: Sensors/actuators/etc. See code.
 *   Depends: none.
 */
-void canParse(CAN_MESSAGE cm)
+void canParse(CAN_PACKET cp)
+{
-    CAN_MESSAGE outCm;
+    #ifdef USE_BLINDS
+    if (cp.pgm.class==pcACTUATOR && cp.pgm.id==patBLIND_TR)
+    {
+        blindsTurn(cp.data[0]);
+    }
+    #endif
+}
 // Below are mandantory when using bootloader
 // define DEBUG_MODE to use without bootloader.
 #ifndef DEBUG_MODE
 extern void _startup (void);
-#pragma code _RESET_INTERRUPT_VECTOR = 0x001000
+#pragma code _RESET_INTERRUPT_VECTOR = RM_RESET_VECTOR
 void _reset (void)
+{
     _asm goto _startup _endasm
+}
 #pragma code
 #endif
-#pragma code _HIGH_INTERRUPT_VECTOR = 0x001008
+#pragma code _HIGH_INTERRUPT_VECTOR = RM_HIGH_INTERRUPT_VECTOR
 void _high_ISR (void)
+{
     _asm GOTO high_isr _endasm
+}
 #pragma code
-#pragma code _LOW_INTERRUPT_VECTOR = 0x001018
+#pragma code _LOW_INTERRUPT_VECTOR = RM_LOW_INTERRUPT_VECTOR
 void _low_ISR (void)
+{
     _asm GOTO low_isr _endasm
+}
 #pragma code

Subversion Repositories HomeAutomation

(root)/trunk/EmbeddedSoftware/PIC/canTemp/Source/Main.c @ 339 – Rev 297 → 339