已合并
fix: use explicit UART and event constants #352
liuhuiyang创建于 7月28日
fix: use explicit UART and event constants #352
已合并
共 2 个文件变更+4-7
| @@ -36,7 +36,7 @@ static void example_event_read(const char *arg) | |||
| 36 | // 超时等待读事件，超时时间为永远等待 | 36 | // 超时等待读事件，超时时间为永远等待 |
| 37 | printf("example_event wait event 0x%x\r\n", TEST_EVENT); | 37 | printf("example_event wait event 0x%x\r\n", TEST_EVENT); |
| 38 | ret = osal_event_read(&g_event_id, TEST_EVENT, OSAL_WAIT_FOREVER, OSAL_WAITMODE_AND); | 38 | ret = osal_event_read(&g_event_id, TEST_EVENT, OSAL_WAIT_FOREVER, OSAL_WAITMODE_AND); |
| 39 | - if (ret == 1) { | 39 | + if (ret == TEST_EVENT) { |
| 40 | printf("example_event read event 0x%x\r\n", TEST_EVENT); | 40 | printf("example_event read event 0x%x\r\n", TEST_EVENT); |
| 41 | } else { | 41 | } else { |
| 42 | printf("example_event read event failed\r\n"); | 42 | printf("example_event read event failed\r\n"); |
| @@ -21,9 +21,6 @@ | |||
| 21 | 21 | ||
| 22 | 22 | ||
| 23 | 23 | ||
| 24 | - | ||
| 25 | - | ||
| 26 | - | ||
| 27 | 24 | ||
| 28 | 25 | ||
| 29 | 26 | ||
| @@ -59,9 +56,9 @@ static void app_uart_init_pin(void) | |||
| 59 | static void app_uart_init_config(void) | 56 | static void app_uart_init_config(void) |
| 60 | { | 57 | { |
| 61 | uart_attr_t attr = {.baud_rate = UART_BAUDRATE, | 58 | uart_attr_t attr = {.baud_rate = UART_BAUDRATE, |
| 62 | - .data_bits = UART_DATA_BITS, | 59 | + .data_bits = UART_DATA_BIT_8, |
| 63 | - .stop_bits = UART_STOP_BITS, | 60 | + .stop_bits = UART_STOP_BIT_1, |
| 64 | - .parity = UART_PARITY_BIT}; | 61 | + .parity = UART_PARITY_NONE}; |
| 65 | 62 | ||
| 66 | uart_pin_config_t pin_config = {.tx_pin = S_MGPIO0, .rx_pin = S_MGPIO1, .cts_pin = PIN_NONE, .rts_pin = PIN_NONE}; | 63 | uart_pin_config_t pin_config = {.tx_pin = S_MGPIO0, .rx_pin = S_MGPIO1, .cts_pin = PIN_NONE, .rts_pin = PIN_NONE}; |
| 67 | uapi_uart_deinit(CONFIG_UART1_BUS_ID); // 重点，UART初始化之前需要去初始化，否则会报0x80001044 | 64 | uapi_uart_deinit(CONFIG_UART1_BUS_ID); // 重点，UART初始化之前需要去初始化，否则会报0x80001044 |