lpcmanager

Revamped init of GPIOs and ports that differ per-product.
som6
2019-09-02, Edouard Tisserant
3f2d4d55f1c7
Parents fa6148cecafd
Children 4416b1e76689
Revamped init of GPIOs and ports that differ per-product.
5 files changed, 38 insertions(+), 32 deletions(-)
  • +6 -2
    LPCBus/GOT.h
  • +10 -10
    LPCBus/GOT100.h
  • +12 -8
    LPCBus/MC9.h
  • +1 -1
    LPCBus/SOM_Devices_init.c
  • +9 -11
    LPCBus/SOM_OnBoard_init.c
    • --- a/LPCBus/GOT.h Mon Sep 02 13:05:39 2019 +0200
    +++ b/LPCBus/GOT.h Mon Sep 02 13:11:15 2019 +0200
    @@ -1,3 +1,7 @@
    -#ifndef RUN_LED_GPIO_1_31
    -#define RUN_LED_GPIO_1_31
    +#ifndef GOT_H
    +#define GOT_H
    +
    +// GPIO_1_31 = 32 + 31 = 63
    +#define RUN_LED_GPIO 63
    +
    #endif
    --- a/LPCBus/GOT100.h Mon Sep 02 13:05:39 2019 +0200
    +++ b/LPCBus/GOT100.h Mon Sep 02 13:11:15 2019 +0200
    @@ -1,15 +1,15 @@
    -#ifndef RUN_LED_GPIO_1_31
    -#define RUN_LED_GPIO_1_31
    -#endif
    +#ifndef GOT100_H
    +#define GOT100_H
    -#ifndef CAN0_EN_GPIO_0_21
    -#define CAN0_EN_GPIO_0_21
    -#endif
    +// GPIO_1_31 = 32 + 31 = 63
    +#define RUN_LED_GPIO 63
    -#ifndef CAN1_EN_GPIO_0_17
    -#define CAN1_EN_GPIO_0_17
    -#endif
    +// GPIO_0_21
    +#define CAN0_EN_GPIO 21
    -#ifndef ONBOARD_I2C
    +// GPIO_0_17
    +#define CAN1_EN_GPIO 17
    +
    #define ONBOARD_I2C
    +
    #endif
    --- a/LPCBus/MC9.h Mon Sep 02 13:05:39 2019 +0200
    +++ b/LPCBus/MC9.h Mon Sep 02 13:11:15 2019 +0200
    @@ -1,11 +1,15 @@
    -#ifndef RUN_LED_GPIO_1_13
    -#define RUN_LED_GPIO_1_13
    -#endif
    +#ifndef MC9_H
    +#define MC9_H
    +
    +// GPIO_1_13 = 32 + 13 = 45
    +#define RUN_LED_GPIO 45
    -#ifndef CAN0_EN_GPIO_0_21
    -#define CAN0_EN_GPIO_0_21
    -#endif
    +// GPIO_0_21
    +#define CAN0_EN_GPIO 21
    -#ifndef CAN1_EN_GPIO_0_17
    -#define CAN1_EN_GPIO_0_17
    +// GPIO_0_17
    +#define CAN1_EN_GPIO 17
    +
    +#define LPCBUS_DEVICES_PORT "/dev/ttyAPP1"
    +
    #endif
    --- a/LPCBus/SOM_Devices_init.c Mon Sep 02 13:05:39 2019 +0200
    +++ b/LPCBus/SOM_Devices_init.c Mon Sep 02 13:11:15 2019 +0200
    @@ -1,5 +1,5 @@
    int err;
    -char *serialdev = "/dev/ttyAPP1";
    +char *serialdev = LPCBUS_DEVICES_PORT;
    uartDevWriteBuf_plc_state = EMPTY;
    uartDevReadBuf_plc_state = EMPTY;
    --- a/LPCBus/SOM_OnBoard_init.c Mon Sep 02 13:05:39 2019 +0200
    +++ b/LPCBus/SOM_OnBoard_init.c Mon Sep 02 13:11:15 2019 +0200
    @@ -13,14 +13,14 @@
    %(init_code)s
    -#ifdef CAN0_EN_GPIO_0_21
    -CAN0_EN_dev = gpio_open(21);
    +#ifdef CAN0_EN_GPIO
    +CAN0_EN_dev = gpio_open(CAN0_EN_GPIO);
    gpio_set_pin_value(CAN0_EN_dev, 0);
    -#endif /* CAN0_EN_GPIO_0_21 */
    -#ifdef CAN1_EN_GPIO_0_17
    -CAN1_EN_dev = gpio_open(17);
    +#endif
    +#ifdef CAN1_EN_GPIO
    +CAN1_EN_dev = gpio_open(CAN1_EN_GPIO);
    gpio_set_pin_value(CAN1_EN_dev, 0);
    -#endif /* CAN1_EN_GPIO_0_17 */
    +#endif
    #ifdef ONBOARD_I2C
    unsigned char i;
    @@ -47,9 +47,7 @@
    }
    #endif /* ONBOARD_I2C */
    -#if defined RUN_LED_GPIO_1_13
    -RUN_LED_dev = gpio_open(45);
    -#elif defined RUN_LED_GPIO_1_31
    -RUN_LED_dev = gpio_open(63);
    -#endif /* RUN LED GPIO_1_13/GPIO_1_31 */
    +#if defined RUN_LED_GPIO
    +RUN_LED_dev = gpio_open(RUN_LED_GPIO);
    gpio_set_pin_value(RUN_LED_dev, 0);
    +#endif