Merge pull request 'fix: 修复之前提交中的一些问题' (#18) from define/firmware_violet_zf:master into master

Reviewed-on: http://git.isthmus.tk:441/btl143/firmware_violet_zf/pulls/18
This commit is contained in:
2024-01-09 17:20:56 +08:00
6 changed files with 12 additions and 8 deletions

View File

@@ -38,6 +38,7 @@
#include "by_imu.h"
#include "jj_blueteeth.h"
#include "by_buzzer.h"
#include "jj_blueteeth.h"
void NMI_Handler(void) __attribute__((interrupt()));
void HardFault_Handler(void) __attribute__((interrupt()));
@@ -92,8 +93,8 @@ void USART1_IRQHandler(void)
void USART2_IRQHandler(void)
{
if (USART_GetITStatus(USART2, USART_IT_RXNE) != RESET) {
uart_query_byte(UART_2,&bt_buffer);
bt_rx_flag=true;
uart_query_byte(UART_2, &bt_buffer);
bt_rx_flag = true;
USART_ClearITPendingBit(USART2, USART_IT_RXNE);
}
}

View File

@@ -1,6 +1,8 @@
#include "jj_blueteeth.h"
bool bt_rx_flag = false;
uint8 bt_buffer;//接收字符存入
enum bt_order {
Start_work = 0x01,
Turn_Left = 0x02,

View File

@@ -1,7 +1,9 @@
#ifndef _JJ_BLUETEETH_H_
#define _JJ_BLUETEETH_H_
#include "zf_common_headfile.h"
#include "zf_driver_uart.h"
extern bool bt_rx_flag;
extern uint8 bt_buffer;
void jj_bt_init();

View File

@@ -11,6 +11,7 @@
Param_Data[_data_tag_].type = _type_; \
Param_Data[_data_tag_].cmd = _cmd_; \
Param_Data[_data_tag_].text = _text_;
typedef enum {
DATA_HEAD = -1,
DATA0,
@@ -25,10 +26,7 @@ typedef enum {
DATA_IN_FLASH_NUM,
DATA_NUM,
} data_tag_t;
/**
* @brief
*
*/
typedef enum {
EUINT32,
EINT32,

View File

@@ -36,7 +36,7 @@ int main(void)
clock_init(SYSTEM_CLOCK_120M);
system_delay_init();
debug_init();
// mt9v03x_init();
mt9v03x_init();
ips200_init(IPS200_TYPE_SPI);
by_gpio_init();
by_exit_init();

View File

@@ -1,6 +1,7 @@
#include "jj_param.h"
#include "page_ui_widget.h"
#include "page.h"
#define LINE_HEAD 0
#define LINE_END DATA_NUM - 2
static char Text[] = "RealTime Param";
@@ -78,7 +79,7 @@ static void Event(page_event event)
} else if (Curser > LINE_END) {
Curser = LINE_HEAD;
}
Print_Curser(Curser, Curser_Last, RGB565_PURPLE);
Print_Curser(Curser, Curser_Last, RGB565_PURPLE);
} else if (1 == event_flag) {
if (page_event_forward == event) {
if (Param_Data[Curser].type == EFLOAT) {