Skip to content

Added battery level indication #5

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
TheBobBot wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added battery level indication #5

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
5 changes: 4 additions & 1 deletion lib/Display/Display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,13 @@ void Display::set_main_menu_screen(int delay, String status)
buffer.setTextSize(1);
buffer.drawString(address, 120 - (buffer.textWidth(address)/2.0), 5);
buffer.drawLine(0, 28, 240, 28, (negatif?TFT_WHITE:TFT_BLACK));
buffer.drawString("Interval (s):", 30, 35);
buffer.drawString(status, 120 - (buffer.textWidth(status)/2.0), 112);
buffer.drawLine(0, 107, 240, 107, (negatif?TFT_WHITE:TFT_BLACK));

buffer.drawString("Interval (secs):", 30, 35);
buffer.setFreeFont(font_text_small);
buffer.drawString("Batt%:",190,73);
buffer.drawFloat(((M5.Axp.GetBatVoltage()-3.27)/(4.2-3.27))*100,1,200,88); // Battery: 120 mAh @ 3.7V (444 mWh), 3.27-4.2V accepted range
buffer.setFreeFont(font_titles);
buffer.drawFloat(float(delay)/1000.0, 1, 30, 60);

Expand Down
23 changes: 15 additions & 8 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
String name_remote = "BR-M5";
CanonBLERemote canon_ble(name_remote);
Display M5_display(&M5.Lcd, name_remote);
String status = "init";

TimeLapse timelapse(400);

Expand Down Expand Up @@ -49,7 +50,8 @@ void setup()
Serial.println("Setup Done");

M5_display.set_address(canon_ble.getPairedAddressString());
M5_display.set_main_menu_screen(timelapse.get_interval(), "Ready for single shot");
status = "Ready for single shot";
M5_display.set_main_menu_screen(timelapse.get_interval(), status);
}


Expand Down Expand Up @@ -83,12 +85,14 @@ void update_shooting()
if (timelapse.Recording_OnOFF())
{
Serial.println("Start timelapse");
M5_display.set_main_menu_screen(timelapse.get_interval(), "Shooting timelapse");
status = "Shooting timelapse";
M5_display.set_main_menu_screen(timelapse.get_interval(), status);
}
else
{
Serial.println("Stop timelapse");
M5_display.set_main_menu_screen(timelapse.get_interval(), "Ready for timelapse");
status = "Ready for timelapse";
M5_display.set_main_menu_screen(timelapse.get_interval(), status);
}
}
}
Expand All @@ -99,12 +103,14 @@ void update_settings()
if (M5.BtnA.wasReleased())
{
timelapse.TimeLapse_decDelay();
M5_display.set_main_menu_screen(timelapse.get_interval(), "Setting interval");
status = "Setting interval";
M5_display.set_main_menu_screen(timelapse.get_interval(), status);
}
if (M5.BtnB.wasReleased())
{
timelapse.TimeLapse_incDelay();
M5_display.set_main_menu_screen(timelapse.get_interval(), "Setting interval");
status = "Setting interval";
M5_display.set_main_menu_screen(timelapse.get_interval(), status);
}
}

Expand All @@ -120,8 +126,7 @@ void loop()
{
// M5.BtnB.reset();
current_mode = Shooting;
String status = (timelapse.get_interval()==0)?"Ready for single shot":"Ready for timelapse";
M5_display.set_main_menu_screen(timelapse.get_interval(), status);
status = (timelapse.get_interval()==0)?"Ready for single shot":"Ready for timelapse";
}
else
{
Expand All @@ -134,7 +139,7 @@ void loop()
{
// M5.BtnB.reset();
current_mode = Settings;
M5_display.set_main_menu_screen(timelapse.get_interval(), "Setting interval");
status = "Setting interval";
}
else
{
Expand All @@ -145,5 +150,7 @@ void loop()
default:
break;
}

M5_display.set_main_menu_screen(timelapse.get_interval(), status);
delay(10);
}