btl143/QDAC-firmware
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

日常更新

Browse Source
This commit is contained in:
Glz
2024-06-16 21:52:42 +08:00
parent 3fe85dc7db
commit b155d3ce14
18 changed files with 205 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/page/page_dparam.c
View File

@@ -49,11 +49,12 @@ static void Loop()
{
// 刷新参数数值
ips200_show_float(90, 18 + 2, *((float *)(Param_Data[delta_x].p_data)), 4, 5);
ips200_show_float(90, 18 + 20, *((float *)(Param_Data[delta_y].p_data)), 4, 5);
ips200_show_float(90, 18 + 20, FIX_BINTHRESHOLD, 4, 5);
ips200_show_int(90, 18 + 38, track_type, 1);
ips200_show_int(90, 18 + 56, garage_type, 1);
ips200_show_int(90, 18 + 74, cross_type, 1);
ips200_show_int(90, 18 + 92, circle_type, 1);
ips200_show_int(90, 18 + 110, s_type, 1);
}
/**
* @brief 页面事件

4
app/page/page_sparam1.c
View File

@@ -83,9 +83,9 @@ static void Event(page_event event)
Curser_Last = Curser;
if (page_event_forward == event) {
Curser++; // 光标上移
Curser--; // 光标上移
} else if (page_event_backward == event) {
Curser--; // 光标下移
Curser++; // 光标下移
} else if (page_event_press_short == event) {
event_flag = 1; // 选中参数
Print_Curser(Curser, Curser_Last, RGB565_RED);

28
app/page/page_sparam2.c
View File

@@ -45,10 +45,18 @@ static void Setup()
Print_Curser(Curser, Curser_Last, RGB565_PURPLE);
for (int16 i = 0; i < palong; i++) {
ips200_show_string(20, i * 18 + 20, Param_Data[i + pafrist].text);
if (Param_Data[i].type == EINT32)
ips200_show_int(60, i * 18 + 20, *((int32 *)(Param_Data[i + pafrist].p_data)), 5);
else if (Param_Data[i].type == EFLOAT)
if (Param_Data[i+ pafrist].type == EINT32)
{
ips200_show_int(60, i * 18 + 20, *((int32_t *)(Param_Data[i + pafrist].p_data)), 5);
}
else if (Param_Data[i+ pafrist].type == EFLOAT)
{
ips200_show_float(60, i * 18 + 20, *((float *)(Param_Data[i + pafrist].p_data)), 4, 5);
}
else if (Param_Data[i+ pafrist].type == EUINT32)
{
ips200_show_uint(60, i * 18 + 20, *((uint32_t *)(Param_Data[i + pafrist].p_data)), 4);
}
}
ips200_show_int(50, palong * 18 + 20, index_power, 5);
}
@@ -83,9 +91,9 @@ static void Event(page_event event)
Curser_Last = Curser;
if (page_event_forward == event) {
Curser++; // 光标上移
Curser--; // 光标上移
} else if (page_event_backward == event) {
Curser--; // 光标下移
Curser++; // 光标下移
} else if (page_event_press_short == event) {
event_flag = 1; // 选中参数
Print_Curser(Curser, Curser_Last, RGB565_RED);
@@ -105,13 +113,13 @@ static void Event(page_event event)
if (page_event_forward == event) {
switch (Param_Data[Curser + pafrist - 1].type) {
case EFLOAT:
*((float *)(Param_Data[Curser + pafrist - 1].p_data)) += powf(10, index_power);
*((float *)(Param_Data[Curser + pafrist - 1].p_data)) += powf(10.0f, (float)index_power);
break;
case EINT32:
*((int32 *)(Param_Data[Curser + pafrist - 1].p_data)) += 1;
break;
case EUINT32:
*((uint32 *)(Param_Data[Curser + pafrist - 1].p_data)) += 1;
*((uint32 *)(Param_Data[Curser + pafrist - 1].p_data)) +=(uint32_t)powf(10, index_power);
break;
default:
break;
@@ -125,14 +133,14 @@ static void Event(page_event event)
*((int32 *)(Param_Data[Curser + pafrist - 1].p_data)) -= 1;
break;
case EUINT32:
*((uint32 *)(Param_Data[Curser + pafrist - 1].p_data)) -= 1;
*((uint32 *)(Param_Data[Curser + pafrist - 1].p_data)) -= (uint32_t)powf(10, index_power);
break;
default:
break;
}
} else if (page_event_press_short == event) {
index_power++;
if (index_power > 2) {
if (index_power > 5) {
index_power = -2;
}
ips200_show_int(50, palong * 18 + 20, index_power, 5);
@@ -143,7 +151,7 @@ static void Event(page_event event)
if (EINT32 == Param_Data[Curser + pafrist - 1].type)
ips200_show_int(60, Curser * 18 + 2, *((int32 *)(Param_Data[Curser + pafrist - 1].p_data)), 5);
else if (EUINT32 == Param_Data[Curser + pafrist - 1].type)
ips200_show_uint(60, Curser * 18 + 2, *((int32 *)(Param_Data[Curser + pafrist - 1].p_data)), 5);
ips200_show_uint(60, Curser * 18 + 2, *((uint32 *)(Param_Data[Curser + pafrist - 1].p_data)), 5);
else if (EFLOAT == Param_Data[Curser + pafrist - 1].type)
ips200_show_float(60, Curser * 18 + 2, *((float *)(Param_Data[Curser + pafrist - 1].p_data)), 4, 5);
}