summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorConfuSomu2021-02-27 13:29:37 -0500
committerConfuSomu2021-02-27 13:29:37 -0500
commit2a0571ba87183023b1073af1badb5fb91da763cf (patch)
treeb73cd5d8d810e398c614611ecd7b602d10d7b58d /apps
parent06d5f492eca8e57bc8ce7479ec6149fbc6a15d08 (diff)
downloadpico-watch-2a0571ba87183023b1073af1badb5fb91da763cf.tar
pico-watch-2a0571ba87183023b1073af1badb5fb91da763cf.tar.gz
pico-watch-2a0571ba87183023b1073af1badb5fb91da763cf.zip
Use an Api class for abstraction
It is currently very basic as functions will be added to it when the time comes. The idea is to have a method to, for example, show notifications (and store them in a list with metadata) to the user or also to easily show a message box overlaying the current display. Private class members will permit encapsulations of variables related to these features and limit the privilage that each app has on the device.
Diffstat (limited to 'apps')
-rw-r--r--apps/home_menu.cpp23
-rw-r--r--apps/home_menu.hpp12
-rw-r--r--apps/main_clock.cpp23
-rw-r--r--apps/main_clock.hpp12
4 files changed, 38 insertions, 32 deletions
diff --git a/apps/home_menu.cpp b/apps/home_menu.cpp
index 7f53447..19458e6 100644
--- a/apps/home_menu.cpp
+++ b/apps/home_menu.cpp
@@ -7,6 +7,7 @@ extern "C" {
#include "../oled/ss_oled.h"
#include "home_menu.hpp"
+#include "../api.hpp"
#include "../buttons.hpp"
extern void app_switch(int old_appid, int new_appid);
@@ -15,7 +16,7 @@ extern bool rtc_get_datetime(datetime_t *t);
#define NUMBER_OF_APPS 2
namespace app_home_menu {
- const char* APPS_NAME[NUMBER_OF_APPS][12] = {"Home", "Clock"};
+ char *APPS_NAME[NUMBER_OF_APPS] = {"Home", "Clock"};
char *pressed_button;
int *selected_app;
@@ -28,7 +29,7 @@ namespace app_home_menu {
t->sec);
};
- void show_title(SSOLED *oled) {
+ void show_title(Api *app_api) {
char datetime_buf[256];
char *datetime_str = &datetime_buf[0];
datetime_t t;
@@ -36,20 +37,20 @@ namespace app_home_menu {
// title with time
title_str(datetime_str, sizeof(datetime_buf), &t);
- oledWriteString(oled, 0,0,0, datetime_str, FONT_8x8, 0, 1);
+ app_api->dispWriteString(0,0,0, datetime_str, FONT_8x8, 0, 1);
}
// Rendering of app
- int render(SSOLED *oled) {
- show_title(oled);
- oledWriteString(oled, 0,0,2, pressed_button, FONT_6x8, 0, 1);
- oledWriteString(oled, 0,5,3, const_cast<char*>(APPS_NAME[0][*selected_app]), FONT_12x16, 0, 1);
+ int render(Api *app_api) {
+ show_title(app_api);
+ app_api->dispWriteString(0,0,2, pressed_button, FONT_6x8, 0, 1);
+ app_api->dispWriteString(0,5,3, APPS_NAME[*selected_app], FONT_12x16, 0, 1);
return 0;
}
// Example of how button inputs could be interpreted.
// Drawing on screen should be done in the render function.
- int btnpressed(SSOLED *oled, uint gpio) {
+ int btnpressed(Api *app_api, uint gpio) {
switch (gpio) {
case BUTTON_HOME:
*pressed_button = 'H'; break;
@@ -79,19 +80,19 @@ namespace app_home_menu {
}
// Initlisation of the app.
- int init(SSOLED *oled) {
+ int init(Api *app_api) {
pressed_button = new char; *pressed_button = '*';
selected_app = new int;
return 0; // return 1 when function not implemented
}
// Processor intensive operations and functions related to drawing to the screen should only be done when the app is in_foreground(=1). This function is only called when the app is init.
- int bgrefresh(SSOLED *oled, char in_foreground) {
+ int bgrefresh(Api *app_api, char in_foreground) {
return 1;
}
// Destruction of app, deinitlisation should be done here. This is only called if the app's APPS_DESTROY_ON_EXIT is set to 1. When it is not a "service" app.
- int destroy(SSOLED *oled) {
+ int destroy(Api *app_api) {
delete pressed_button; pressed_button = nullptr;
delete selected_app; selected_app = nullptr;
return 1;
diff --git a/apps/home_menu.hpp b/apps/home_menu.hpp
index ebcc451..033dc6b 100644
--- a/apps/home_menu.hpp
+++ b/apps/home_menu.hpp
@@ -4,12 +4,14 @@
#include "pico/util/datetime.h"
#include "../oled/ss_oled.h"
+#include "../api.hpp"
+
namespace app_home_menu {
- int init(SSOLED *oled);
- int render(SSOLED *oled);
- int btnpressed(SSOLED *oled, uint gpio);
- int bgrefresh(SSOLED *oled, char in_foreground);
- int destroy(SSOLED *oled);
+ int init(Api *app_api);
+ int render(Api *app_api);
+ int btnpressed(Api *app_api, uint gpio);
+ int bgrefresh(Api *app_api, char in_foreground);
+ int destroy(Api *app_api);
}
#endif
diff --git a/apps/main_clock.cpp b/apps/main_clock.cpp
index f9be3e5..db8e39e 100644
--- a/apps/main_clock.cpp
+++ b/apps/main_clock.cpp
@@ -7,6 +7,7 @@ extern "C" {
#include "../oled/ss_oled.h"
#include "main_clock.hpp"
+#include "../api.hpp"
#include "../buttons.hpp"
namespace app_main_clock {
@@ -39,7 +40,7 @@ namespace app_main_clock {
DATETIME_DOWS[t->dotw - 1]);
};
- void show_datetime(SSOLED *oled) {
+ void show_datetime(Api *app_api) {
char datetime_buf[256];
char *datetime_str = &datetime_buf[0];
datetime_t t;
@@ -47,38 +48,38 @@ namespace app_main_clock {
// time
time_as_str(datetime_str, sizeof(datetime_buf), &t);
- oledWriteString(oled, 0,10,3, datetime_str, FONT_12x16, 0, 1);
+ app_api->dispWriteString(0,10,3, datetime_str, FONT_12x16, 0, 1);
// date
date_as_str(datetime_str, sizeof(datetime_buf), &t);
- oledWriteString(oled, 0,0,7, datetime_str, FONT_8x8, 0, 1);
+ app_api->dispWriteString(0,0,7, datetime_str, FONT_8x8, 0, 1);
}
// Rendering of the app
- int render(SSOLED *oled) {
- oledWriteString(oled, 0,15,0, (char *)"Test clock", FONT_8x8, 0, 1);
- show_datetime(oled);
- //oledWriteString(oled, 0,0,0, &data[0], FONT_6x8, 0, 1);
+ int render(Api *app_api) {
+ app_api->dispWriteString(0,15,0, (char *)"Test clock", FONT_8x8, 0, 1);
+ show_datetime(app_api);
+ //app_api->dispWriteString(0,0,0, &data[0], FONT_6x8, 0, 1);
return 0;
}
// Interpretation of button inputs
- int btnpressed(SSOLED *oled, uint gpio) {
+ int btnpressed(Api *app_api, uint gpio) {
return 0;
}
// Initlisation of the app.
- int init(SSOLED *oled) {
+ int init(Api *app_api) {
return 1; // return 1 when function not implemented
}
// Processor intensive operations and functions related to drawing to the screen should only be done when the app is in_foreground(=1). This function is only called when the app is init.
- int bgrefresh(SSOLED *oled, char in_foreground) {
+ int bgrefresh(Api *app_api, char in_foreground) {
return 1;
}
// Destruction of app, deinitlisation should be done here. This is only called if the app's APPS_DESTROY_ON_EXIT is set to 1. When it is not a "service" app.
- int destroy(SSOLED *oled) {
+ int destroy(Api *app_api) {
return 1;
}
} \ No newline at end of file
diff --git a/apps/main_clock.hpp b/apps/main_clock.hpp
index 887dfa1..5440c1f 100644
--- a/apps/main_clock.hpp
+++ b/apps/main_clock.hpp
@@ -4,12 +4,14 @@
#include "pico/util/datetime.h"
#include "../oled/ss_oled.h"
+#include "../api.hpp"
+
namespace app_main_clock {
- int init(SSOLED *oled);
- int render(SSOLED *oled);
- int btnpressed(SSOLED *oled, uint gpio);
- int bgrefresh(SSOLED *oled, char in_foreground);
- int destroy(SSOLED *oled);
+ int init(Api *app_api);
+ int render(Api *app_api);
+ int btnpressed(Api *app_api, uint gpio);
+ int bgrefresh(Api *app_api, char in_foreground);
+ int destroy(Api *app_api);
}
#endif \ No newline at end of file
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-04-09 06:01:08 +0000