diff options
| author | Michele Bini <michele.bini@gmail.com> | 2022-04-01 22:09:07 (GMT) |
|---|---|---|
| committer | Michele Bini <michele.bini@gmail.com> | 2022-04-01 22:09:07 (GMT) |
| commit | dc943c9859fca9b7c51ddf448c32d9bf410f4e38 (patch) | |
| tree | 736d3759e5288a473cad032e8e6028c358dda2fe | |
| parent | acc73091e7b66109c4b8cd044bd57794b8ce4310 (diff) | |
more fixes
| -rw-r--r-- | src/displayapp/screens/Motion.cpp | 20 | ||||
| -rw-r--r-- | src/libs/lv_conf.h | 2 |
2 files changed, 12 insertions, 10 deletions
diff --git a/src/displayapp/screens/Motion.cpp b/src/displayapp/screens/Motion.cpp index 3ceac47..2acfbae 100644 --- a/src/displayapp/screens/Motion.cpp +++ b/src/displayapp/screens/Motion.cpp @@ -14,7 +14,7 @@ #define REDRAW_FRAME_HZ 40 #define REDRAW_FRAME_MS (1000 / REDRAW_FRAME_HZ) #define REDRAW_FRAME_TICKS (REDRAW_FRAME_MS / APX_TICK_PERIOD_MS) -#define G_SCALE (9.8*0.001) +#define G_SCALE 0.001 using namespace Pinetime::Applications::Screens; @@ -83,7 +83,7 @@ void Motion::Refresh() { current_jump_length = 0; jumping = true; } - double current_jump_accel = 1 - G_scaled; + double current_jump_accel = (1.0 - G_scaled) * 9.8; double current_frame_s = current_frame_ms * 0.001; current_jump_speed += current_jump_accel * current_frame_s; current_jump_length += current_jump_speed * current_frame_s; @@ -110,13 +110,15 @@ void Motion::Refresh() { started = true; } last_redraw_frame_time = current_time; - uint16_t G_uint16 = G < 0xffff ? G : 0xffff; - lv_chart_set_next(chart, ser1, 1000 - ((int16_t)G_uint16)); - labelText[4] = '0'+(G_uint16%10); G_uint16 /= 10; - labelText[3] = '0'+(G_uint16%10); G_uint16 /= 10; - labelText[2] = '0'+(G_uint16%10); G_uint16 /= 10; - labelText[1] = '0'+(G_uint16%10); G_uint16 /= 10; - labelText[0] = '0'+G_uint16 + { + uint16_t G_uint16 = G < 0xffff ? G : 0xffff; + lv_chart_set_next(chart, ser1, 1000 - ((int16_t)G_uint16)); + labelText[4] = '0'+(G_uint16%10); G_uint16 /= 10; + labelText[3] = '0'+(G_uint16%10); G_uint16 /= 10; + labelText[2] = '0'+(G_uint16%10); G_uint16 /= 10; + labelText[1] = '0'+(G_uint16%10); G_uint16 /= 10; + labelText[0] = '0'+G_uint16; + } lv_label_set_text_static(label, labelText); if (jump_started_or_ended) { if (new_record) { diff --git a/src/libs/lv_conf.h b/src/libs/lv_conf.h index 3a20c5b..6be43a3 100644 --- a/src/libs/lv_conf.h +++ b/src/libs/lv_conf.h @@ -532,7 +532,7 @@ typedef void* lv_font_user_data_t; #define lv_snprintf snprintf #define lv_vsnprintf vsnprintf #else /*!LV_SPRINTF_CUSTOM*/ -#define LV_SPRINTF_DISABLE_FLOAT 1 +#define LV_SPRINTF_DISABLE_FLOAT 0 #endif /*LV_SPRINTF_CUSTOM*/ /*=================== |