Subversion Repositories HomeAutomation

Rev

Rev 889 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | SVN | RSS feed

Rev 889 Rev 1266
Line 249... Line 249...
249 
    timeMsg.ExtendedFlag = 1;
 249 
    timeMsg.ExtendedFlag = 1;
250 
    timeMsg.RemoteFlag = 0;
 250 
    timeMsg.RemoteFlag = 0;
251 
    timeMsg.DataLength = 8;
 251 
    timeMsg.DataLength = 8;
252 
#else
 252 
#else
253 
    /* Jag orkar inte fixa in datan i paketen, sätter längd till 0 sålänge */
 253 
    /* Jag orkar inte fixa in datan i paketen, sätter längd till 0 sålänge */
254 
    timeMsg.Length = 0;
 254 
    timeMsg.Length = 4;
255 
#endif
 255 
#endif
256 
    timeMsg.Id = (CAN_NMT << CAN_SHIFT_CLASS) | (CAN_NMT_TIME << CAN_SHIFT_NMT_TYPE);
 256 
    timeMsg.Id = (CAN_NMT << CAN_SHIFT_CLASS) | (CAN_NMT_TIME << CAN_SHIFT_NMT_TYPE);
257 
    //timeMsg.Id = 0; //Same thing, and lib's can.h is not updated.
 257 
    //timeMsg.Id = 0; //Same thing, and lib's can.h is not updated.
258 
#endif
 258 
#endif
259 
   
 259 
   
Line 317... Line 317...
317 
            IncTime();
 317 
            IncTime();
318 
            timeMsg.Data.dwords[1] = date.packed;
 318 
            timeMsg.Data.dwords[1] = date.packed;
319 
            Can_Send(&timeMsg);
 319 
            Can_Send(&timeMsg);
320 
#else
 320 
#else
321 
            /* Jag orkar inte fixa in datan i paketen, sätter längd till 0 sålänge */
 321 
            /* Jag orkar inte fixa in datan i paketen, sätter längd till 0 sålänge */
- 
 
 322 
            unixtime++;
- 
 
 323 
            timeMsg.Data[0] =  unixtime     & 0xFF;
- 
 
 324 
            timeMsg.Data[1] = (unixtime>> 8)& 0xFF;
- 
 
 325 
            timeMsg.Data[2] = (unixtime>>16)& 0xFF;
- 
 
 326 
            timeMsg.Data[3] = (unixtime>>24)& 0xFF;
322 
            StdCan_Put(&timeMsg);
 327 
            StdCan_Put(&timeMsg);
323 
#endif
 328 
#endif
324 
        }
 329 
        }
325 
#endif
 330 
#endif
326 
    }
 331 
    }