Skip to content

Remove simulated drop and toggle volume/time display #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Gluflex wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove simulated drop and toggle volume/time display #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 5 additions & 43 deletions firmware/dripito-v1/InfusionBA/InfusionBA/Core/Src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ uint8_t Battery_mV_to_percent(uint32_t mv);
void LCD_ShowBatteryPercentage(uint8_t percent);

void Monitor_ADC_Drop_Spikes();
void HandleSimulatedDrop(void);
void HandleModeButton(void);
void HandleTargetAdjustment(void);
void HandleMuteButton(void);

Expand Down Expand Up @@ -191,7 +191,7 @@ int main(void)
while (1)
{
HandleTargetAdjustment();
HandleSimulatedDrop();
HandleModeButton();
HandleMuteButton();
ui_task();
alarm_task();
Expand Down Expand Up @@ -720,24 +720,6 @@ uint32_t Read_Battery_mV(void)
return (adc_val * vdda_mv) / 4095; // Battery voltage at PA4 in mV
}

/* ---------- LCD stats helpers ------------------------------------------ */
void UpdateStatsDisplay(void)
{
/* Elapsed time since power-up */
uint32_t elapsed_ms = HAL_GetTick();
uint32_t hrs = elapsed_ms / 3600000UL;
uint32_t mins = (elapsed_ms / 60000UL) % 60;
uint32_t secs = (elapsed_ms / 1000UL) % 60;

char time_str[17];
snprintf(time_str, sizeof(time_str), "%02lu:%02lu:%02lu", hrs, mins, secs);

/* Total infused volume */
char vol_str[17];
snprintf(vol_str, sizeof(vol_str), "Vol: %4.1f mL", total_volume_ml);
//LCD_Print(2, vol_str); // third line
}

/* ---------- +/- buttons adjust target flow ----------------------------- */
void HandleTargetAdjustment(void)
{
Expand Down Expand Up @@ -767,35 +749,15 @@ void HandleTargetAdjustment(void)
lastMinus = nowMinus;
}

/* ---------- MODE-button drop simulator --------------------------------- */
void HandleSimulatedDrop(void)
/* ---------- MODE-button handler --------------------------------------- */
void HandleModeButton(void)
{
static uint8_t lastBtnMode = GPIO_PIN_SET; // unpressed
uint8_t nowMode = HAL_GPIO_ReadPin(GPIOB, BTN_MODE_Pin);

if (nowMode == GPIO_PIN_RESET && lastBtnMode == GPIO_PIN_SET)
{
/* Simulated drop */
uint32_t now = HAL_GetTick();

if (drop_count > 0) {
dt_ms = now - last_drop_ms;
inst_flow_mlh = (3600.0f * 1000.0f) /
((float)dt_ms * DRIP_FACTOR_GTT_PER_ML);
flow_avg_mlh = MovingAvg_Add(inst_flow_mlh);
flow_mlh = flow_avg_mlh; // update exported flow
}

last_drop_ms = now;
drop_count++;
total_volume_ml = (float)drop_count / DRIP_FACTOR_GTT_PER_ML;

char rate_str[17];
snprintf(rate_str, sizeof(rate_str), "Rate: %4.0f mL/h", inst_flow_mlh);
//LCD_Print(1, rate_str); // middle line

UpdateStatsDisplay(); // update time + volume

ui_on_button(BTN_MODE, false);
Buzzer_PlayFreq(3000, 30); // audible feedback
HAL_Delay(200); // debounce
}
Expand Down
27 changes: 14 additions & 13 deletions firmware/dripito-v1/InfusionBA/InfusionBA/Core/Src/ui.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ static bool blink_phase = false;
static bool alarm_blink = false;
static char lcd_shadow[4][LCD_CHARS+1]; /* hold last text to minimise SPI */
static uint32_t last_hold_ms = 0; /* auto-repeat timer for BTN +/- */
static bool show_time = false; /* false=show infused, true=time */

/*---------------------------------------------------------------------------
* Helpers – format fixed‑width fields as per spec
Expand Down Expand Up @@ -107,17 +108,19 @@ static void ui_render_run(void)
strcat(l1, " mL/h");
}

/* L2: Infused####.# mL (one decimal place) */
char l2[LCD_CHARS+1]="Infused";
sprintf(l2+7, "%5.1f mL", total_volume_ml);

/* L3: Time HH:MM:SS (HAL tick based) */
uint32_t s = HAL_GetTick()/1000;
uint32_t hh=s/3600; uint32_t mm=(s/60)%60; uint32_t ss=s%60;
char l3[LCD_CHARS+1];
sprintf(l3, "Time %02lu:%02lu:%02lu", hh%24, mm, ss);
char l2[LCD_CHARS+1];
if (show_time) {
uint32_t s = HAL_GetTick()/1000;
uint32_t hh=s/3600; uint32_t mm=(s/60)%60; uint32_t ss=s%60;
sprintf(l2, "Time %02lu:%02lu:%02lu", hh%24, mm, ss);
int len = strlen(l2);
while (len < LCD_CHARS) l2[len++] = ' ';
l2[len] = '\0';
} else {
sprintf(l2, "Infused%5.1f mL", total_volume_ml);
}

lcd_line(0,l0); lcd_line(1,l1); lcd_line(2,l2); lcd_line(3,l3);
lcd_line(0,l0); lcd_line(1,l1); lcd_line(2,l2); lcd_line(3," ");
}

/*---------------------------------------------------------------------------
Expand Down Expand Up @@ -248,9 +251,7 @@ void ui_on_button(enum ui_button_e btn, bool long_press)
/*-------------------------------------------------- RUN -------------*/
case UI_RUN:
if (btn == BTN_MODE) {
ui_state = UI_SET;
edit_rate = target_rate_mlh ? target_rate_mlh : 1;
lcd_clear_shadow();
show_time = !show_time;
} else if (btn == BTN_MUTE) {
alarm_mute(); /* silence active alarm */
}
Expand Down