Subversion Repositories HomeAutomation

Rev

Rev 1591 | Rev 1897 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | SVN | RSS feed

Rev 1591 Rev 1710
Line 370... Line 370...
370 
        switch (rxMsg->Header.Command)
 370 
        switch (rxMsg->Header.Command)
371 
        {
 371 
        {
372 
        case CAN_MODULE_CMD_PHYSICAL_PWM:
 372 
        case CAN_MODULE_CMD_PHYSICAL_PWM:
373 
            if (rxMsg->Length == 3) {
 373 
            if (rxMsg->Length == 3) {
374 
                channel = rxMsg->Data[0];
 374 
                channel = rxMsg->Data[0];
375 
                pwmValue[channel-1] = (rxMsg->Data[1]<<8)+(rxMsg->Data[2]);
 375 
                pwmValue[channel] = (rxMsg->Data[1]<<8)+(rxMsg->Data[2]);
376 
            }
 376 
            }
377 
           
 377 
           
378 
        break;
 378 
        break;
379 
#if act_hwPWM_ENABLE_FADE == 1
 379 
#if act_hwPWM_ENABLE_FADE == 1
380 
        case CAN_MODULE_CMD_HWPWM_DEMO:     /* Demo(channel, speed, steps) */
 380 
        case CAN_MODULE_CMD_HWPWM_DEMO:     /* Demo(channel, speed, steps) */
381 
            if (rxMsg->Length == 4) {
 381 
            if (rxMsg->Length == 4) {
382 
                channel = rxMsg->Data[0]-1;
 382 
                channel = rxMsg->Data[0];
383 
                uint8_t speed = rxMsg->Data[1];
 383 
                uint8_t speed = rxMsg->Data[1];
384 
                uint16_t steps = (rxMsg->Data[2]<<8)+(rxMsg->Data[3]);
 384 
                uint16_t steps = (rxMsg->Data[2]<<8)+(rxMsg->Data[3]);
385 
               
 385 
               
386 
                fadeSpeedCnt[channel] = 0;
 386 
                fadeSpeedCnt[channel] = 0;
387 
                fadeSpeed[channel] = 0;
 387 
                fadeSpeed[channel] = 0;
Line 427... Line 427...
427 
        break;
 427 
        break;
428 
       
 428 
       
429 
        case CAN_MODULE_CMD_HWPWM_START_FADE:   /* StartFade(channel, speed, direction) */
 429 
        case CAN_MODULE_CMD_HWPWM_START_FADE:   /* StartFade(channel, speed, direction) */
430 
            if (rxMsg->Length == 3) {
 430 
            if (rxMsg->Length == 3) {
431 
               
 431 
               
432 
                channel = rxMsg->Data[0]-1;
 432 
                channel = rxMsg->Data[0];
433 
                uint8_t speed = rxMsg->Data[1];
 433 
                uint8_t speed = rxMsg->Data[1];
434 
                uint8_t direction = rxMsg->Data[2];
 434 
                uint8_t direction = rxMsg->Data[2];
435 
                demoState[channel] = ACT_HWPWM_DEMO_STATE_NOT_RUNNING;
 435 
                demoState[channel] = ACT_HWPWM_DEMO_STATE_NOT_RUNNING;
436 
                fadeSpeedCnt[channel] = 0;
 436 
                fadeSpeedCnt[channel] = 0;
437 
                fadeSpeed[channel] = 0;
 437 
                fadeSpeed[channel] = 0;
Line 463... Line 463...
463 
            }
 463 
            }
464 
        break;
 464 
        break;
465 
 
 465 
 
466 
        case CAN_MODULE_CMD_HWPWM_STOP_FADE:    /* StopFade(channel) */
 466 
        case CAN_MODULE_CMD_HWPWM_STOP_FADE:    /* StopFade(channel) */
467 
            if (rxMsg->Length == 1) {
 467 
            if (rxMsg->Length == 1) {
468 
                channel = rxMsg->Data[0]-1;
 468 
                channel = rxMsg->Data[0];
469 
                demoState[channel] = ACT_HWPWM_DEMO_STATE_NOT_RUNNING;
 469 
                demoState[channel] = ACT_HWPWM_DEMO_STATE_NOT_RUNNING;
470 
                fadeSpeed[channel] = 0;
 470 
                fadeSpeed[channel] = 0;
471 
                sendInfo[channel] = 1;      /* send netinfo with the current dimmervalue*/
 471 
                sendInfo[channel] = 1;      /* send netinfo with the current dimmervalue*/
472 
            }
 472 
            }
473 
        break;
 473 
        break;
474 
 
 474 
 
475 
        case CAN_MODULE_CMD_HWPWM_ABS_FADE: /* AbsFade(channel, speed, endValue) */
 475 
        case CAN_MODULE_CMD_HWPWM_ABS_FADE: /* AbsFade(channel, speed, endValue) */
476 
            if (rxMsg->Length == 4) {
 476 
            if (rxMsg->Length == 4) {
477 
                channel = rxMsg->Data[0]-1;
 477 
                channel = rxMsg->Data[0];
478 
                uint8_t speed = rxMsg->Data[1];
 478 
                uint8_t speed = rxMsg->Data[1];
479 
                uint16_t endValue = (rxMsg->Data[2]<<8)+(rxMsg->Data[3]);
 479 
                uint16_t endValue = (rxMsg->Data[2]<<8)+(rxMsg->Data[3]);
480 
                demoState[channel] = ACT_HWPWM_DEMO_STATE_NOT_RUNNING;
 480 
                demoState[channel] = ACT_HWPWM_DEMO_STATE_NOT_RUNNING;
481 
                fadeSpeedCnt[channel] = 0;
 481 
                fadeSpeedCnt[channel] = 0;
482 
                fadeSpeed[channel] = 0;
 482 
                fadeSpeed[channel] = 0;
Line 503... Line 503...
503 
        break;
 503 
        break;
504 
 
 504 
 
505 
        case CAN_MODULE_CMD_HWPWM_REL_FADE: /* RelFade(channel, speed, direction, steps) */
 505 
        case CAN_MODULE_CMD_HWPWM_REL_FADE: /* RelFade(channel, speed, direction, steps) */
506 
            if (rxMsg->Length == 5) {
 506 
            if (rxMsg->Length == 5) {
507 
               
 507 
               
508 
                channel = rxMsg->Data[0]-1;
 508 
                channel = rxMsg->Data[0];
509 
                uint8_t speed = rxMsg->Data[1];
 509 
                uint8_t speed = rxMsg->Data[1];
510 
                uint8_t direction = rxMsg->Data[2];
 510 
                uint8_t direction = rxMsg->Data[2];
511 
                uint16_t steps = (rxMsg->Data[3]<<8)+(rxMsg->Data[4]);
 511 
                uint16_t steps = (rxMsg->Data[3]<<8)+(rxMsg->Data[4]);
512 
               
 512 
               
513 
                demoState[channel] = ACT_HWPWM_DEMO_STATE_NOT_RUNNING;
 513 
                demoState[channel] = ACT_HWPWM_DEMO_STATE_NOT_RUNNING;