From a29ffd361f55a49f4ff287636bfff92a20adeaf3 Mon Sep 17 00:00:00 2001 From: Li Jie <1366947981@qq.com> Date: Thu, 18 Apr 2024 09:44:24 +0800 Subject: [PATCH] =?UTF-8?q?A36=E6=A1=86=E6=9E=B6=E8=A1=A5=E5=85=85config?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MDK-ARM/output/Project.bin | Bin 476244 -> 476244 bytes .../MDK-ARM/output/Project.hex | 2 +- .../MDK-ARM/output/Project.txt | 2 +- .../MDK-ARM/output/Project_burn.bin | Bin 484436 -> 484436 bytes .../MDK-ARM/output/Project_mp_burn.bin | Bin 476248 -> 476248 bytes .../lvgl_Dashboard_8080/Src/app_task.c | 1 + .../lvgl_Dashboard_8080/Src/mx_app/A36_app.c | 7 ++++++ .../lvgl_Dashboard_8080/Src/mx_app/Remind | 9 +++++++ .../Src/mx_app/driver/mx_uart.c | 1 + .../lvgl_Dashboard_8080/Src/mx_app/mx_app.c | 1 + .../Src/mx_app/mx_config.h | 22 ++++++++++++++++++ .../Src/mx_app/store/mx_alternator_data.c | 6 +++++ .../Src/mx_app/store/mx_alternator_data.h | 5 ++++ .../Src/mx_app/store/mx_store.c | 1 + .../Src/mx_app/store/mx_store.h | 6 +---- 15 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/mx_config.h diff --git a/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/MDK-ARM/output/Project.bin b/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/MDK-ARM/output/Project.bin index a6c1e91f48017bce573ce8f3f094efc0ee93968d..5720c4fed37b1ee2ae7ee0b67775f2e38b2ce159 100644 GIT binary patch delta 37 ocmcc8A$z4mwxNY_3zO3=Mxl1+TTDRA48$xz%(~tA7Moxe03%Zl&;S4c delta 37 ocmcc8A$z4mwxNY_3zO3=M!|OHTTDRA48$xz%(~tA7Moxe03$pO&j0`b diff --git a/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/MDK-ARM/output/Project.hex b/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/MDK-ARM/output/Project.hex index e991db6..b116ec8 100644 --- a/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/MDK-ARM/output/Project.hex +++ b/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/MDK-ARM/output/Project.hex @@ -46734,7 +46734,7 @@ BF3AF7FF 000D2E20 47F0E92D F64AB086 -271131E7 +271231E7 F6C0A067 F44F010A 230462FD diff --git a/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/MDK-ARM/output/Project.txt b/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/MDK-ARM/output/Project.txt index f06cd49..84433fe 100644 --- a/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/MDK-ARM/output/Project.txt +++ b/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/MDK-ARM/output/Project.txt @@ -71302,7 +71302,7 @@ 0x0809fa38: e92d47f0 -..G PUSH {r4-r10,lr} 0x0809fa3c: b086 .. SUB sp,sp,#0x18 0x0809fa3e: f64a31e7 J..1 MOV r1,#0xabe7 - 0x0809fa42: 2711 .' MOVS r7,#0x11 + 0x0809fa42: 2712 .' MOVS r7,#0x12 0x0809fa44: a067 g. ADR r0,{pc}+0x1a0 ; 0x809fbe4 0x0809fa46: f6c0010a .... MOVT r1,#0x80a 0x0809fa4a: f44f62fd O..b MOV r2,#0x7e8 diff --git a/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/MDK-ARM/output/Project_burn.bin b/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/MDK-ARM/output/Project_burn.bin index d1d3e5a65e3bb65c26dfb195903a0c4db5339230..4dac7f166e48975c9dc64e240a6f5433676c6b6a 100644 GIT binary patch delta 47 zcmca|LiWlD*$EOX;riEw8)aH$7`MtWsr_OUYIpv{1jNih%mT!$+ns;031$HRyn7O7 delta 47 zcmca|LiWlD*$EOX4-4nqY?Nu0VcaUir1pzZu-*9=6A&{4F$)m0Zg>90CYS{P?JyI) diff --git a/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/MDK-ARM/output/Project_mp_burn.bin b/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/MDK-ARM/output/Project_mp_burn.bin index c2706846ef1402f8d932059e5c50ed903c2af207..5000224c140aa09fecf206591bfe16cf9995e326 100644 GIT binary patch delta 42 tcmcc7A$y}kwxNY_3zO3=Mxl1+TTDRA48$xz%(~tA7Moxe%Q+Lbs{nKG5cvQA delta 42 tcmcc7A$y}kwxNY_3zO3=M!|OHTTDRA48$xz%(~tA7MoxeOGOs1JOFX_59t5^ diff --git a/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/app_task.c b/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/app_task.c index 1faa556..c2ee32d 100644 --- a/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/app_task.c +++ b/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/app_task.c @@ -15,6 +15,7 @@ #include "fr_device_pa.h" #include "fr_device_encode.h" #include "fr_device_vbat.h" +#include "mx_config.h" #if PRJ_NUM == A36 #include "A36_app.h" diff --git a/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/A36_app.c b/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/A36_app.c index dcf0043..5121c8d 100644 --- a/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/A36_app.c +++ b/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/A36_app.c @@ -2,6 +2,8 @@ /* 2024.04.08 by hsp */ /* *********************************************************** */ #include "app_task.h" +#include "mx_config.h" + #if PRJ_NUM == A36 #include @@ -19,8 +21,13 @@ #include "driver_pwm.h" #include "fr_device_rtc.h" + //#include "app_task.h" +#if PRJ_NUM == A36 #include "A36_app.h" +#elif PRJ_NUM == A39 +#include "A39_app.h" +#endif //#include "mycrc.h" #include "app_lvgl.h" #include "app_ble.h" diff --git a/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/Remind b/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/Remind index 9ae5e64..8dfad06 100644 --- a/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/Remind +++ b/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/Remind @@ -6,3 +6,12 @@ driver 封装的通用接口 例如spi 串口 pack 协议封装 parser 协议解析 包括协议解析和封装解析 store 存储 多应用的系统函数(发电机/摩托车仪表) + +2024.04.18 新增补充 + +1.mx_task_run()函数为入口函数 3092系列入口放置再app_task.c中app_task任务中 +2.新增 mx_config.h 作为最大的宏开关配置文件 + FR3092_MXC_A36 作为控制A36项目开关 + FR3092_MXC_A39 作为控制A39项目开关 + 宏当前已做存储结构区分 +3.相关函数中的任务创建等功能文件中有相关注释供参考 \ No newline at end of file diff --git a/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/driver/mx_uart.c b/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/driver/mx_uart.c index d760b5d..8beaca9 100644 --- a/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/driver/mx_uart.c +++ b/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/driver/mx_uart.c @@ -4,6 +4,7 @@ #include "mx_uart.h" #include "mx_map.h" #include "mx_types.h" +#include "mx_config.h" Map myMap = {0}; diff --git a/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/mx_app.c b/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/mx_app.c index 522ae13..59ca123 100644 --- a/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/mx_app.c +++ b/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/mx_app.c @@ -10,6 +10,7 @@ #include "mx_parser.h" #include "mx_store.h" #include "mx_types.h" +#include "mx_config.h" uint8_t uart_id = 1; //串口ID uint32_t uart_baud = 115200; //串口波特率 diff --git a/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/mx_config.h b/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/mx_config.h new file mode 100644 index 0000000..6d7f4bd --- /dev/null +++ b/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/mx_config.h @@ -0,0 +1,22 @@ +#ifndef _MX_CONFIG_H +#define _MX_CONFIG_H + +#define FR3092_MXC_A36 1 +#define FR3092_MXC_A39 0 + +#if FR3092_MXC_A36 +#define PRJ_NUM A36 +//摩托车仪表存储结构体宏 +#define STORE_INSTRUMENT 1 + +#elif FR3092_MXC_A39 +#define PRJ_NUM A39 +//发电机存储结构体宏 +#define STORE_ALTERNATOR 1 + +#else + +#endif + + +#endif // _MX_CONFIG_H diff --git a/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/store/mx_alternator_data.c b/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/store/mx_alternator_data.c index 087c443..51249b8 100644 --- a/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/store/mx_alternator_data.c +++ b/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/store/mx_alternator_data.c @@ -2,6 +2,7 @@ #include #include "mx_store.h" #include "mx_alternator_data.h" +#include "mx_config.h" extern Store_t user_data; @@ -483,5 +484,10 @@ void setStoreOilMalfunction(uint8_t value) user_data.ErrorCode.mOilMalfunction = value; } } + +#elif STORE_INSTRUMENT + +#else + #endif diff --git a/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/store/mx_alternator_data.h b/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/store/mx_alternator_data.h index b646476..ae8142a 100644 --- a/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/store/mx_alternator_data.h +++ b/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/store/mx_alternator_data.h @@ -6,6 +6,7 @@ //#include "uart.h" #include #include +#include "mx_config.h" #if STORE_ALTERNATOR //累计时间 @@ -137,6 +138,10 @@ void setStoreOverVoltProtect(uint8_t value); //机油故障 uint8_t getStoreOilMalfunction(void); void setStoreOilMalfunction(uint8_t value); +#elif STORE_INSTRUMENT + +#else + #endif diff --git a/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/store/mx_store.c b/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/store/mx_store.c index 2cc92ea..663a046 100644 --- a/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/store/mx_store.c +++ b/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/store/mx_store.c @@ -2,6 +2,7 @@ #include #include "mx_store.h" #include "mx_alternator_data.h" +#include "mx_config.h" Store_t user_data; diff --git a/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/store/mx_store.h b/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/store/mx_store.h index f8ebcf3..39fa641 100644 --- a/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/store/mx_store.h +++ b/fr3092_mcu/examples/turnkey/lvgl_Dashboard_8080/Src/mx_app/store/mx_store.h @@ -6,11 +6,7 @@ //#include "uart.h" #include #include - -//发电机存储结构体宏 -#define STORE_ALTERNATOR 0 -//摩托车仪表存储结构体宏 -#define STORE_INSTRUMENT 0 +#include "mx_config.h" #if STORE_ALTERNATOR //存放所有故障代码