Skip to content

Commit 31d4c23

Browse files
committed
Fixed progress bar and fan control
1 parent 13f262f commit 31d4c23

2 files changed

Lines changed: 28 additions & 29 deletions

File tree

src/ui/page_fans.c

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -329,38 +329,36 @@ void fans_auto_ctrl_core(int which, int tempe, bool binit) {
329329
//////////////////////////////////////////////////////////////////////////////////
330330
// reinit auto speed
331331
if (binit) {
332-
memset(speed, 2, sizeof(speed)); // Initial fan speed for auto mode
333-
memset(respeed_cnt, 0, sizeof(respeed_cnt));
334-
memset(respeeding, 0, sizeof(respeeding));
332+
memset(&speed, 2, sizeof(speed)); // Initial fan speed for auto mode
333+
memset(&respeed_cnt, 0, sizeof(respeed_cnt));
334+
memset(&respeeding, 0, sizeof(respeeding));
335335
fans_top_setspeed(speed[0]);
336-
fans_right_setspeed(speed[1]);
337-
fans_left_setspeed(speed[2]);
336+
fans_left_setspeed(speed[1]);
337+
fans_right_setspeed(speed[2]);
338338
}
339339

340-
for (int i = 0; i < FAN_COUNT; ++i) {
341-
if (respeeding[i]) {
342-
respeed_cnt[i]++;
343-
if (respeed_cnt[i] == RESPEED_WAIT_TIME) {
344-
respeeding[i] = false;
345-
respeed_cnt[i] = 0;
346-
}
347-
continue;
340+
if (respeeding[which]) {
341+
respeed_cnt[which]++;
342+
if (respeed_cnt[which] == RESPEED_WAIT_TIME) {
343+
respeeding[which] = false;
344+
respeed_cnt[which] = 0;
348345
}
346+
return;
347+
}
349348

350-
new_spd = adj_speed(i, speed[i], tempe);
351-
if (new_spd != speed[i]) {
352-
speed[i] = new_spd;
353-
switch (i) {
354-
case FAN_TOP:
355-
fans_top_setspeed(speed[i]);
356-
break;
357-
case FAN_LEFT:
358-
fans_left_setspeed(speed[i]);
359-
break;
360-
case FAN_RIGHT:
361-
fans_left_setspeed(speed[i]);
362-
break;
363-
}
349+
new_spd = adj_speed(which, speed[which], tempe);
350+
if (new_spd != speed[which]) {
351+
speed[which] = new_spd;
352+
switch (which) {
353+
case FAN_TOP:
354+
fans_top_setspeed(speed[which]);
355+
break;
356+
case FAN_LEFT:
357+
fans_left_setspeed(speed[which]);
358+
break;
359+
case FAN_RIGHT:
360+
fans_left_setspeed(speed[which]);
361+
break;
364362
}
365363
}
366364
}

src/ui/page_version.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1130,9 +1130,10 @@ void page_version_on_right_button(bool is_short) {
11301130

11311131
void process_bar_update(const int value0,
11321132
const int value1) {
1133-
if (bar_vtx && bar_goggle) {
1134-
// LOGI("v0=%d, v1=%d\n", value0, value1);
1133+
if (bar_vtx) {
11351134
lv_bar_set_value(bar_vtx, value0, LV_ANIM_OFF);
1135+
}
1136+
if (bar_goggle) {
11361137
lv_bar_set_value(bar_goggle, value1, LV_ANIM_OFF);
11371138
}
11381139
}

0 commit comments

Comments
 (0)