lpcmanager

Merge.

2016-11-14, dporopat
207c82474300
Parents 28fd1ec0f23b8448e1c42556
Children 6ff086a3ba1b
Merge.
1 files changed, 21 insertions(+), 10 deletions(-)
  • +21 -10
    LPCBus/MC9_Devices_decl.c
    • --- a/LPCBus/MC9_Devices_decl.c Mon Nov 14 08:57:37 2016 +0100
    +++ b/LPCBus/MC9_Devices_decl.c Mon Nov 14 08:57:55 2016 +0100
    @@ -225,8 +225,8 @@
    #define UART_BUFSIZE_LONG 48 /* UART bus read & write buffer size - long buffer for LHC-2 */
    #define UART_RETRY_NUM 10
    -char uartBufSize = UART_BUFSIZE_LONG; /* Smarteh uart bus: buffer size */
    -unsigned long uartBaudrate = 115200; /* Smarteh uart bus: baudrate */
    +char uartBufSize = UART_BUFSIZE_SHORT; /* Smarteh uart bus: buffer size */
    +unsigned long uartBaudrate = 19200; /* Smarteh uart bus: baudrate */
    /* Tables containing information about connected devices on UART port
    (initialized by Composer) */
    @@ -626,12 +626,16 @@
    case(164):
    case(166):
    case(168):
    + case(178): /* AQ1, SM1, SM5, SM6, SM7 */
    + case(180):
    + case(182):
    + case(184):
    case(186): /* TH1V */
    case(188):
    case(190):
    case(192):
    uartPortDevices[i] = &UARTDevice;
    - uartPortTim[i].toValue = 20; /* 20 x10ms = 200ms */
    + uartPortTim[i].toValue = msTOns(250); /* 250ms */
    uartPortTim[i].status = TIM_EN_RUNNING;
    break;
    case(146): /* CH1 */
    @@ -639,17 +643,13 @@
    case(150):
    case(152):
    uartPortDevices[i] = &UARTDevice;
    - uartPortTim[i].toValue = 60; /* 60 x10ms = 600ms */
    + uartPortTim[i].toValue = msTOns(650); /* 650ms */
    uartPortTim[i].status = TIM_EN_RUNNING;
    break;
    case(170): /* ID1, ID2, ID3 */
    case(172):
    case(174):
    case(176):
    - uartPortDevices[i] = &UARTDevice;
    - uartPortTim[i].toValue = 40; /* 40 x10ms = 400ms */
    - uartPortTim[i].status = TIM_EN_RUNNING;
    - break;
    case(194): /* DP1V */
    case(196):
    case(198):
    @@ -666,11 +666,22 @@
    case(220):
    case(222):
    case(224):
    + case(226): /* WP1 */
    + case(228):
    + case(230):
    + case(232):
    + case(234): /* WP2 */
    + case(236):
    + case(238):
    + case(240):
    + case(242): /* WT1 */
    + case(244):
    + case(246):
    + case(248):
    uartPortDevices[i] = &UARTDevice;
    - uartPortTim[i].toValue = 40; /* 40 x10ms = 400ms */
    + uartPortTim[i].toValue = msTOns(450); /* 450ms */
    uartPortTim[i].status = TIM_EN_RUNNING;
    break;
    -
    default:
    uartPortDevices[i] = NULL; /* "Empty" or unknown module */
    uartPortTim[i].status = TIM_DISABLED;