sc/828F
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

调整启动逻辑顺序

Browse Source
This commit is contained in:
sc committed 2026-03-04 23:03:59 +08:00
1 parent 5d5b79ed18
commit f904545097
7 files changed
+81 -73
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.settings/language.settings.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1342705500471129435" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1119974426140709532" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>
applications/data/SC828_DATA_table.c
+28 -28
View File
@@ -268,20 +268,20 @@ void DATA_INSTRUCTION_START(IO_STEP_DATA * data){
{ {
step_table[i].RUN = 0; step_table[i].RUN = 0;
rt_snprintf(step_table[i].Dyelot ,1,""); rt_snprintf(step_table[i].Dyelot ,1,"");
step_table[i].ReDye = 0; step_table[i].ReDye = 0;
rt_snprintf(step_table[i].StepID ,1,""); rt_snprintf(step_table[i].StepID ,1,"");
rt_snprintf(step_table[i].StepName ,1,""); rt_snprintf(step_table[i].StepName ,1,"");
rt_snprintf(step_table[i].ParameterName ,1,""); rt_snprintf(step_table[i].ParameterName ,1,"");
step_table[i].Parameter1 = 0; step_table[i].Parameter1 = 0;
step_table[i].Parameter2 = 0; step_table[i].Parameter2 = 0;
step_table[i].Parameter3 = 0; step_table[i].Parameter3 = 0;
step_table[i].Parameter4 = 0; step_table[i].Parameter4 = 0;
step_table[i].Parameter5 = 0; step_table[i].Parameter5 = 0;
step_table[i].P6 = 0; step_table[i].P6 = 0;
step_table[i].P7 = 0; step_table[i].P7 = 0;
step_table[i].P8 = 0; step_table[i].P8 = 0;
step_table[i].P9 = 0; step_table[i].P9 = 0;
step_table[i].P10 = 0; step_table[i].P10 = 0;
step_table[i].Parameter1_S1 = 0; step_table[i].Parameter1_S1 = 0;
step_table[i].Parameter2_S1 = 0; step_table[i].Parameter2_S1 = 0;
step_table[i].Parameter3_S1 = 0; step_table[i].Parameter3_S1 = 0;
@@ -323,20 +323,20 @@ void DATA_INSTRUCTION_STOP(){
{ {
step_table[i].RUN = 0; step_table[i].RUN = 0;
rt_snprintf(step_table[i].Dyelot ,1,""); rt_snprintf(step_table[i].Dyelot ,1,"");
step_table[i].ReDye = 0; step_table[i].ReDye = 0;
rt_snprintf(step_table[i].StepID ,1,""); rt_snprintf(step_table[i].StepID ,1,"");
rt_snprintf(step_table[i].StepName ,1,""); rt_snprintf(step_table[i].StepName ,1,"");
rt_snprintf(step_table[i].ParameterName ,1,""); rt_snprintf(step_table[i].ParameterName ,1,"");
step_table[i].Parameter1 = 0; step_table[i].Parameter1 = 0;
step_table[i].Parameter2 = 0; step_table[i].Parameter2 = 0;
step_table[i].Parameter3 = 0; step_table[i].Parameter3 = 0;
step_table[i].Parameter4 = 0; step_table[i].Parameter4 = 0;
step_table[i].Parameter5 = 0; step_table[i].Parameter5 = 0;
step_table[i].P6 = 0; step_table[i].P6 = 0;
step_table[i].P7 = 0; step_table[i].P7 = 0;
step_table[i].P8 = 0; step_table[i].P8 = 0;
step_table[i].P9 = 0; step_table[i].P9 = 0;
step_table[i].P10 = 0; step_table[i].P10 = 0;
step_table[i].Parameter1_S1 = 0; step_table[i].Parameter1_S1 = 0;
step_table[i].Parameter2_S1 = 0; step_table[i].Parameter2_S1 = 0;
step_table[i].Parameter3_S1 = 0; step_table[i].Parameter3_S1 = 0;
applications/lvgl/guider/generated/events_init.c
+3 -3
View File
@@ -348,7 +348,7 @@ static void screen_stepinf_s1_event_handler (lv_event_t *e)
switch (code) { switch (code) {
case LV_EVENT_CLICKED: case LV_EVENT_CLICKED:
{ {
uint16_t id = lv_dropdown_get_selected(guider_ui.screen_stepinf_s1); //uint16_t id = lv_dropdown_get_selected(guider_ui.screen_stepinf_s1);
lv_obj_clear_flag(guider_ui.screen_stepinf_s1b, LV_OBJ_FLAG_HIDDEN); lv_obj_clear_flag(guider_ui.screen_stepinf_s1b, LV_OBJ_FLAG_HIDDEN);
lv_obj_add_flag(guider_ui.screen_stepinf_s2b, LV_OBJ_FLAG_HIDDEN); lv_obj_add_flag(guider_ui.screen_stepinf_s2b, LV_OBJ_FLAG_HIDDEN);
lv_obj_add_flag(guider_ui.screen_stepinf_s3b, LV_OBJ_FLAG_HIDDEN); lv_obj_add_flag(guider_ui.screen_stepinf_s3b, LV_OBJ_FLAG_HIDDEN);
@@ -365,7 +365,7 @@ static void screen_stepinf_s2_event_handler (lv_event_t *e)
switch (code) { switch (code) {
case LV_EVENT_CLICKED: case LV_EVENT_CLICKED:
{ {
uint16_t id = lv_dropdown_get_selected(guider_ui.screen_stepinf_s2); //uint16_t id = lv_dropdown_get_selected(guider_ui.screen_stepinf_s2);
lv_obj_add_flag(guider_ui.screen_stepinf_s1b, LV_OBJ_FLAG_HIDDEN); lv_obj_add_flag(guider_ui.screen_stepinf_s1b, LV_OBJ_FLAG_HIDDEN);
lv_obj_clear_flag(guider_ui.screen_stepinf_s2b, LV_OBJ_FLAG_HIDDEN); lv_obj_clear_flag(guider_ui.screen_stepinf_s2b, LV_OBJ_FLAG_HIDDEN);
lv_obj_add_flag(guider_ui.screen_stepinf_s3b, LV_OBJ_FLAG_HIDDEN); lv_obj_add_flag(guider_ui.screen_stepinf_s3b, LV_OBJ_FLAG_HIDDEN);
@@ -382,7 +382,7 @@ static void screen_stepinf_s3_event_handler (lv_event_t *e)
switch (code) { switch (code) {
case LV_EVENT_CLICKED: case LV_EVENT_CLICKED:
{ {
uint16_t id = lv_dropdown_get_selected(guider_ui.screen_stepinf_s3); //uint16_t id = lv_dropdown_get_selected(guider_ui.screen_stepinf_s3);
lv_obj_add_flag(guider_ui.screen_stepinf_s1b, LV_OBJ_FLAG_HIDDEN); lv_obj_add_flag(guider_ui.screen_stepinf_s1b, LV_OBJ_FLAG_HIDDEN);
lv_obj_add_flag(guider_ui.screen_stepinf_s2b, LV_OBJ_FLAG_HIDDEN); lv_obj_add_flag(guider_ui.screen_stepinf_s2b, LV_OBJ_FLAG_HIDDEN);
lv_obj_clear_flag(guider_ui.screen_stepinf_s1b, LV_OBJ_FLAG_HIDDEN); lv_obj_clear_flag(guider_ui.screen_stepinf_s1b, LV_OBJ_FLAG_HIDDEN);
applications/lvgl/lv__user_gui.c
+6 -2
View File
@@ -30,8 +30,12 @@
void setup_user_screen(lv_ui *ui) void setup_user_screen(lv_ui *ui)
{ {
lv_textarea_set_text(ui->screen_machine_id_rt, machine_ID);//设备id }
lv_textarea_set_text(ui->screen_machine_name_rt, machine_name);//设备名
void lv_inf_gui_init(void)
{
lv_textarea_set_text(guider_ui.screen_machine_id_rt, machine_ID);//设备id
lv_textarea_set_text(guider_ui.screen_machine_name_rt, machine_name);//设备名
} }
time_t nows; time_t nows;
applications/lvgl/lv__user_gui.h
+1
View File
@@ -11,5 +11,6 @@
#define APPLICATIONS_LV__USER_GUI_H_ #define APPLICATIONS_LV__USER_GUI_H_
extern void lv_user_gui_init(void); extern void lv_user_gui_init(void);
extern void lv_inf_gui_init(void);
#endif /* APPLICATIONS_LV__USER_GUI_H_ */ #endif /* APPLICATIONS_LV__USER_GUI_H_ */
applications/lvgl/ui_data_labels.c
+40 -39
View File
@@ -177,46 +177,47 @@ void ui_init_io(lv_ui *ui) {
do_led_array[63] = ui->screen_do63; do_led_array[63] = ui->screen_do63;
//ai //ai
di_labels[0] = ui->screen_AIO4001; di_labels[0] = ui->screen_AIO4001;
di_labels[1] = ui->screen_AIO4002; di_labels[1] = ui->screen_AIO4002;
di_labels[2] = ui->screen_AIO4003; di_labels[2] = ui->screen_AIO4003;
di_labels[3] = ui->screen_AIO4004; di_labels[3] = ui->screen_AIO4004;
di_labels[4] = ui->screen_AIO4005; di_labels[4] = ui->screen_AIO4005;
di_labels[5] = ui->screen_AIO4006; di_labels[5] = ui->screen_AIO4006;
di_labels[6] = ui->screen_AIO4007; di_labels[6] = ui->screen_AIO4007;
di_labels[7] = ui->screen_AIO4008; di_labels[7] = ui->screen_AIO4008;
di_labels[8] = ui->screen_AIO4009; di_labels[8] = ui->screen_AIO4009;
di_labels[9] = ui->screen_AIO4010; di_labels[9] = ui->screen_AIO4010;
di_labels[10] = ui->screen_AIO4011; di_labels[10] = ui->screen_AIO4011;
di_labels[11] = ui->screen_AIO4012; di_labels[11] = ui->screen_AIO4012;
di_labels[12] = ui->screen_AIO4013; di_labels[12] = ui->screen_AIO4013;
di_labels[13] = ui->screen_AIO4014; di_labels[13] = ui->screen_AIO4014;
di_labels[14] = ui->screen_AIO4015; di_labels[14] = ui->screen_AIO4015;
di_labels[15] = ui->screen_AIO4016; di_labels[15] = ui->screen_AIO4016;
di_labels[16] = ui->screen_AIO4017; di_labels[16] = ui->screen_AIO4017;
di_labels[17] = ui->screen_AIO4018; di_labels[17] = ui->screen_AIO4018;
di_labels[18] = ui->screen_AIO4019; di_labels[18] = ui->screen_AIO4019;
di_labels[19] = ui->screen_AIO4020; di_labels[19] = ui->screen_AIO4020;
di_labels[20] = ui->screen_AIO4021; di_labels[20] = ui->screen_AIO4021;
di_labels[21] = ui->screen_AIO4022; di_labels[21] = ui->screen_AIO4022;
di_labels[22] = ui->screen_AIO4023; di_labels[22] = ui->screen_AIO4023;
di_labels[23] = ui->screen_AIO4024; di_labels[23] = ui->screen_AIO4024;
//ao //ao
do_labels[0] = ui->screen_AIO5001;
do_labels[1] = ui->screen_AIO5002; do_labels[0] = ui->screen_AIO5001;
do_labels[2] = ui->screen_AIO5003; do_labels[1] = ui->screen_AIO5002;
do_labels[3] = ui->screen_AIO5004; do_labels[2] = ui->screen_AIO5003;
do_labels[4] = ui->screen_AIO5005; do_labels[3] = ui->screen_AIO5004;
do_labels[5] = ui->screen_AIO5006; do_labels[4] = ui->screen_AIO5005;
do_labels[6] = ui->screen_AIO5007; do_labels[5] = ui->screen_AIO5006;
do_labels[7] = ui->screen_AIO5008; do_labels[6] = ui->screen_AIO5007;
do_labels[8] = ui->screen_AIO5009; do_labels[7] = ui->screen_AIO5008;
do_labels[9] = ui->screen_AIO5010; do_labels[8] = ui->screen_AIO5009;
do_labels[10] = ui->screen_AIO5011; do_labels[9] = ui->screen_AIO5010;
do_labels[11] = ui->screen_AIO5012; do_labels[10] = ui->screen_AIO5011;
do_labels[12] = ui->screen_AIO5013; do_labels[11] = ui->screen_AIO5012;
do_labels[13] = ui->screen_AIO5014; do_labels[12] = ui->screen_AIO5013;
do_labels[14] = ui->screen_AIO5015; do_labels[13] = ui->screen_AIO5014;
do_labels[15] = ui->screen_AIO5016; do_labels[14] = ui->screen_AIO5015;
do_labels[15] = ui->screen_AIO5016;
} }
void update_io_labels(void) void update_io_labels(void)
applications/main.c
+2
View File
@@ -14,6 +14,7 @@
#include "INI/config.h" #include "INI/config.h"
#include "Variable.h" #include "Variable.h"
#include "ltdc.h" #include "ltdc.h"
#include <lv__user_gui.h>
#define DBG_TAG "main" #define DBG_TAG "main"
#define DBG_LVL DBG_LOG #define DBG_LVL DBG_LOG
@@ -26,6 +27,7 @@ int main(void)
{ {
rt_sem_take(mount_sem, rt_tick_from_millisecond(5000)); // 等待挂载完成，最多等待 5 秒 rt_sem_take(mount_sem, rt_tick_from_millisecond(5000)); // 等待挂载完成，最多等待 5 秒
read_sample();//读配置文件 read_sample();//读配置文件
lv_inf_gui_init();//初始化显示预设信息
thread_DB_SQLite();//启动数据库 thread_DB_SQLite();//启动数据库
thread_RUN_LED();//运行指示灯线程 thread_RUN_LED();//运行指示灯线程