WebSVN – HomeAutomation – Diff – /trunk/EmbeddedSoftware/AVR/CanRGB/main.c

 /*-----------------------------------------------------------------------------
  * Programs! This will most likely be improooved, but I have to start somewhere.
  *---------------------------------------------------------------------------*/
+//Special combinations that means something special
+//The combinations are useless for lighting anyway
+//So we might as well use them!
-//0x00, 0x00, 0x00, 0x00 means end of program. This combination is useless for lighting anyway.
+//0x00, 0x00, 0x00, 0x00 means end of program, keep looping it
+//0x00, 0x00, 0x00, 0x01 means end of program, halt
 Color pgm1[] PROGMEM = {
 {0xff,0x00,0x00,0x00},
 {0xff,0xff,0x00,0x00},
 {0x00,0xff,0x00,0x00},
 /*-----------------------------------------------------------------------------
  * Variables
  *---------------------------------------------------------------------------*/
 uint32_t timeStamp; //TimeStamp to keep track of time
 uint32_t dimStamp;  //Timestamp to keep track of dimmer changes
-uint32_t tempStamp; //Timestamp to keep track of temp things during development
-uint8_t temp;
 Color currColor;  //Current color
 Color destColor;  //Destination color
 uint16_t fadeSpeed; //Fadingspeed. 16bit for reaaaally slow fading. Sets the speed of colorchange.
 uint8_t dimSpeed;       //Dimmer speed. Sets the speed of intensitychange.
-uint8_t program;        //This variable keeps track of what program is currently running.
+uint8_t currProgram;        //This variable keeps track of what program is currently running.
-uint8_t programstate;   //This variable keeps track of where in a program we currently are. Will probably be removed later on.
 /*----------------------------------------------------------------------------
  * Functions
  * -------------------------------------------------------------------------*/
 void updateLED();
     reformatRGB(0x00,0xff,0x00,1);
     destColor.Intens = 100;
     currColor = destColor;
 //Just temporary for now, they keep track of some kind of demo-program.
-    program = 1;
+    currProgram = 1;
-    temp = 1;
-    uint16_t temp_adress = pgm_read_word(&programs[0]); //Get adress for program 0
+    uint16_t temp_adress = pgm_read_word(&programs[currProgram-1]); //Get adress for program 0
     sei();
     /* main loop */
     while (1) {
         /* service the CAN routines */
         Can_Service();
         /* Time to fade color? */
         if (Timebase_PassedTimeMillis(timeStamp) >= fadeSpeed) {
             fade(&currColor.R, &destColor.R);
             fade(&currColor.G, &destColor.G);
             fade(&currColor.B, &destColor.B);
             updateLED();
+        }
         /* Program management */
-        if (program != 0){ //Check if a program is currently running
+        if (currProgram != 0){ //Check if a program is currently running
+            if ((currColor.R == destColor.R)&(currColor.G == destColor.G)&(currColor.B == destColor.B)&(currColor.Intens == destColor.Intens)){//Is the current sequence finished?
-            //if (currColor == destColor){ //Is the current sequence finished?
+                //Now we have to check if the program is finished and if we should loop
+                if ((pgm_read_byte(temp_adress)==0)&(pgm_read_byte(temp_adress+1)==0)&(pgm_read_byte(temp_adress+2)==0)){
+                    //The program has ended! Shall we loop it?
+                    if (pgm_read_byte(temp_adress+3)==0){
-                //Set next state.
+                        //Yes, let's loop it
+                        temp_adress = pgm_read_word(&programs[currProgram-1]);
-            //}
+                    } else {
+                        //No, halt!
+                        currProgram = 0;
+                    }
-        /* Just a nice fade-demo */
+                } else {
-        if ((Timebase_PassedTimeMillis(tempStamp) >= 2500)&(program == 1)) {
+                    //The program has not ended, let's get the next RGB-triplet!
-            tempStamp = Timebase_CurrentTime();
-            reformatRGB(pgm_read_byte(temp_adress),pgm_read_byte(temp_adress + 1),pgm_read_byte(temp_adress + 2),0);
+                    reformatRGB(pgm_read_byte(temp_adress),pgm_read_byte(temp_adress + 1),pgm_read_byte(temp_adress + 2),0);
-            temp_adress = temp_adress + 4;
+                    temp_adress = temp_adress + 4;
+                }
+            }
+        }
         /* check if any messages have been received */
         /* A lot of remote control crap going on here now for testing */
         while (Can_Receive(&rxMsg) == CAN_OK) {
             if ((rxMsg.Data.bytes[0] == 0x0)&(rxMsg.Data.bytes[3] == 0x20)){
-                program = 1;
+                //program = 1;
-                fadeSpeed = 0;
+                //fadeSpeed = 0;
             }
             if ((rxMsg.Data.bytes[0] == 0x0)&(rxMsg.Data.bytes[3] == 0x21)){
-                program = 2;
+                //program = 2;
-                fadeSpeed = 0;
+                //fadeSpeed = 0;
+            }
+        }
+    }
     //Bara för debugcrap
     Can_Message_t txMsg;
     txMsg.Id = 0x55;
     txMsg.RemoteFlag = 0;
     txMsg.ExtendedFlag = 1;
-    txMsg.DataLength = 4;
+    txMsg.DataLength = 8;
-    txMsg.Data.bytes[0] = currColor.R * currColor.Intens / 255;
+    txMsg.Data.bytes[0] = currColor.R;
-    txMsg.Data.bytes[1] = currColor.G * currColor.Intens / 255;
+    txMsg.Data.bytes[1] = currColor.G;
-    txMsg.Data.bytes[2] = currColor.B * currColor.Intens / 255;
+    txMsg.Data.bytes[2] = currColor.B;
     txMsg.Data.bytes[3] = currColor.Intens;
     Can_Send(&txMsg);
+}

Subversion Repositories HomeAutomation

(root)/trunk/EmbeddedSoftware/AVR/CanRGB/main.c @ 305 – Rev 304 → 305