lpcmanager

Merge

2016-12-05, dporopat
ab1324096b2e
Parents 8216ba1c4717e66144db95af
Children a65acdffded1
Merge
4 files changed, 11 insertions(+), 0 deletions(-)
  • +3 -0
    LPCBus/GOT.h
  • +2 -0
    LPCBus/MC9_OnBoard_cleanup.c
  • +2 -0
    LPCBus/MC9_OnBoard_decl.c
  • +4 -0
    LPCBus/MC9_OnBoard_init.c
    • --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/LPCBus/GOT.h Mon Dec 05 10:15:01 2016 +0100
    @@ -0,0 +1,3 @@
    +#ifndef GOT
    +#define GOT
    +#endif
    --- a/LPCBus/MC9_OnBoard_cleanup.c Mon Dec 05 10:14:23 2016 +0100
    +++ b/LPCBus/MC9_OnBoard_cleanup.c Mon Dec 05 10:15:01 2016 +0100
    @@ -11,5 +11,7 @@
    gpio_set_pin_value(CAN1_EN_dev, 1);
    gpio_close(CAN1_EN_dev);
    #endif /* MC9 */
    +#if defined MC9 || defined GOT
    gpio_set_pin_value(RUN_LED_dev, 1);
    gpio_close(RUN_LED_dev);
    +#endif /* MC9/GOT */
    --- a/LPCBus/MC9_OnBoard_decl.c Mon Dec 05 10:14:23 2016 +0100
    +++ b/LPCBus/MC9_OnBoard_decl.c Mon Dec 05 10:15:01 2016 +0100
    @@ -22,7 +22,9 @@
    };
    struct gpio_device *RTU_GPIO_dev;
    +#if defined MC9 || defined GOT
    struct gpio_device *RUN_LED_dev;
    +#endif /* MC9/GOT */
    #ifdef MC9
    struct gpio_device *CAN0_EN_dev;
    struct gpio_device *CAN1_EN_dev;
    --- a/LPCBus/MC9_OnBoard_init.c Mon Dec 05 10:14:23 2016 +0100
    +++ b/LPCBus/MC9_OnBoard_init.c Mon Dec 05 10:15:01 2016 +0100
    @@ -36,5 +36,9 @@
    if(rt_task_start(&RTU_task, mbmrtu_BusUpdate_proc, NULL))
    return err;
    +#ifdef MC9
    RUN_LED_dev = gpio_open(45);
    +#elif GOT
    +RUN_LED_dev = gpio_open(63);
    +#endif /* MC9/GOT */
    gpio_set_pin_value(RUN_LED_dev, 0);