diff --git a/app/gl_cross.c b/app/gl_cross.c index 0b6cbb8..3215737 100644 --- a/app/gl_cross.c +++ b/app/gl_cross.c @@ -6,17 +6,17 @@ bool far_Lpt0_found, far_Lpt1_found; int32_t Both_Boder_None_Cross; int far_Lpt0_rpts0s_id, far_Lpt1_rpts1s_id; int cross_easy = 0; -int cross_open = 1; +float cross_open = 1; void CheckCross() { bool Xfound = Lpt0_found && Lpt1_found; - if (cross_open == 0) { + if ((int)cross_open == 0) { if (cross_type == CROSS_NONE && Xfound) { cross_type = CROSS_BEGIN; } } - if (cross_open == 1) { + if ((int)cross_open == 1) { if (cross_type == CROSS_NONE && Xfound && cross_easy == 0) { cross_type = CROSS_BEGIN; } diff --git a/app/gl_cross.h b/app/gl_cross.h index 288bb05..4356318 100644 --- a/app/gl_cross.h +++ b/app/gl_cross.h @@ -10,7 +10,7 @@ enum cross_type_e { extern enum cross_type_e cross_type; extern int32_t Both_Boder_None_Cross; extern int far_Lpt0_rpts0s_id, far_Lpt1_rpts1s_id; -extern int cross_open; +extern float cross_open; void CheckCross(void); void RunCross(void); diff --git a/app/jj_param.c b/app/jj_param.c index 797dc8c..5be7398 100644 --- a/app/jj_param.c +++ b/app/jj_param.c @@ -31,6 +31,7 @@ void jj_param_eeprom_init(void) PARAM_REG(baoguang, &FIX_BINTHRESHOLD, EFLOAT, 1, "bao:"); PARAM_REG(auto_exp_param, &auto_exp, EFLOAT, 1, "exp:"); PARAM_REG(barr_time, &barrirer_time, EFLOAT, 1, "bar:"); + PARAM_REG(cross_sw, &cross_open, EFLOAT, 1, "cro_sw:"); jj_param_read(); // 注冊 } /** diff --git a/app/jj_param.h b/app/jj_param.h index e36f8d2..781e758 100644 --- a/app/jj_param.h +++ b/app/jj_param.h @@ -31,6 +31,7 @@ typedef enum { baoguang = Page2_head, auto_exp_param, barr_time, + cross_sw, Page3_head, DATA_IN_FLASH_NUM, diff --git a/app/page/page_sparam1.c b/app/page/page_sparam1.c index e369ec3..2f98774 100644 --- a/app/page/page_sparam1.c +++ b/app/page/page_sparam1.c @@ -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); @@ -102,7 +102,7 @@ static void Event(page_event event) } Print_Curser(Curser, Curser_Last, RGB565_PURPLE); } else if (1 == event_flag) { - if (page_event_forward == event) { + if (page_event_backward == event) { switch (Param_Data[Curser + pafrist - 1].type) { case EFLOAT: *((float *)(Param_Data[Curser + pafrist - 1].p_data)) += powf(10, index_power); @@ -116,7 +116,7 @@ static void Event(page_event event) default: break; } - } else if (page_event_backward == event) { + } else if ( page_event_forward== event) { switch (Param_Data[Curser + pafrist - 1].type) { case EFLOAT: *((float *)(Param_Data[Curser + pafrist - 1].p_data)) -= powf(10.0f, (float)index_power); diff --git a/app/page/page_sparam2.c b/app/page/page_sparam2.c index 3edbc87..0414602 100644 --- a/app/page/page_sparam2.c +++ b/app/page/page_sparam2.c @@ -91,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); @@ -111,7 +111,7 @@ static void Event(page_event event) } Print_Curser(Curser, Curser_Last, RGB565_PURPLE); } else if (1 == event_flag) { - if (page_event_forward == event) { + if (page_event_backward == event) { switch (Param_Data[Curser + pafrist - 1].type) { case EFLOAT: *((float *)(Param_Data[Curser + pafrist - 1].p_data)) += powf(10.0f, (float)index_power); @@ -125,7 +125,7 @@ static void Event(page_event event) default: break; } - } else if (page_event_backward == event) { + } else if ( page_event_forward == event) { switch (Param_Data[Curser + pafrist - 1].type) { case EFLOAT: *((float *)(Param_Data[Curser + pafrist - 1].p_data)) -= powf(10.0f, (float)index_power);