aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/main_clock.cpp154
-rw-r--r--apps/main_clock.hpp16
-rw-r--r--pico-watch.cpp10
3 files changed, 90 insertions, 90 deletions
diff --git a/apps/main_clock.cpp b/apps/main_clock.cpp
index 9dfee0f..326c0f4 100644
--- a/apps/main_clock.cpp
+++ b/apps/main_clock.cpp
@@ -9,89 +9,91 @@ extern "C" {
#include "main_clock.hpp"
#include "../buttons.hpp"
-// Time as string
-// Adapted from pico-sdk/scr/common/pico_util/datetime.c
-void time_as_str(char *buf, uint buf_size, const datetime_t *t) {
- snprintf(buf,
- buf_size,
- "%d:%02d:%02d",
- t->hour,
- t->min,
- t->sec);
-};
-void date_as_str(char *buf, uint buf_size, const datetime_t *t) {
- static const char *DATETIME_DOWS[7] = {
- "Sun",
- "Mon",
- "Tue",
- "Wed",
- "Thu",
- "Fri",
- "Sat",
+namespace app_main_clock {
+ // Time as string
+ // Adapted from pico-sdk/scr/common/pico_util/datetime.c
+ void time_as_str(char *buf, uint buf_size, const datetime_t *t) {
+ snprintf(buf,
+ buf_size,
+ "%d:%02d:%02d",
+ t->hour,
+ t->min,
+ t->sec);
+ };
+ void date_as_str(char *buf, uint buf_size, const datetime_t *t) {
+ static const char *DATETIME_DOWS[7] = {
+ "Sun",
+ "Mon",
+ "Tue",
+ "Wed",
+ "Thu",
+ "Fri",
+ "Sat",
+ };
+ snprintf(buf,
+ buf_size,
+ "%02d-%02d-%02d %s",
+ t->year,
+ t->month,
+ t->day,
+ DATETIME_DOWS[t->dotw - 1]);
};
- snprintf(buf,
- buf_size,
- "%02d-%02d-%02d %s",
- t->year,
- t->month,
- t->day,
- DATETIME_DOWS[t->dotw - 1]);
-};
-void show_datetime(SSOLED *oled) {
- char datetime_buf[256];
- char *datetime_str = &datetime_buf[0];
- datetime_t t;
- rtc_get_datetime(&t);
+ void show_datetime(SSOLED *oled) {
+ char datetime_buf[256];
+ char *datetime_str = &datetime_buf[0];
+ datetime_t t;
+ rtc_get_datetime(&t);
- // time
- time_as_str(datetime_str, sizeof(datetime_buf), &t);
- oledWriteString(oled, 0,10,3, datetime_str, FONT_12x16, 0, 1);
+ // time
+ time_as_str(datetime_str, sizeof(datetime_buf), &t);
+ oledWriteString(oled, 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);
-}
+ // date
+ date_as_str(datetime_str, sizeof(datetime_buf), &t);
+ oledWriteString(oled, 0,0,7, datetime_str, FONT_8x8, 0, 1);
+ }
-// Rendering of the app
-int main_clock_render(SSOLED *oled, char *data, uint data_size) {
- 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);
- return 0;
-}
+ // Rendering of the app
+ int render(SSOLED *oled, char *data, uint data_size) {
+ 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);
+ return 0;
+ }
-// Example of how button inputs could be interpreted.
-// Drawing on screen should be done in the render function.
-int main_clock_btnpressed(SSOLED *oled, char *data, uint data_size, uint gpio) {
- switch (gpio) {
- case BUTTON_HOME: // Apps will generally not receive the Home button press
- data[0] = 'H'; break;
- case BUTTON_SELECT:
- data[0] = 'S'; break;
- case BUTTON_MODE:
- data[0] = 'M'; break;
- case BUTTON_DOWN:
- data[0] = 'D'; break;
- case BUTTON_UP:
- data[0] = 'U'; break;
- default:
- data[0] = '?';
+ // Example of how button inputs could be interpreted.
+ // Drawing on screen should be done in the render function.
+ int btnpressed(SSOLED *oled, char *data, uint data_size, uint gpio) {
+ switch (gpio) {
+ case BUTTON_HOME: // Apps will generally not receive the Home button press
+ data[0] = 'H'; break;
+ case BUTTON_SELECT:
+ data[0] = 'S'; break;
+ case BUTTON_MODE:
+ data[0] = 'M'; break;
+ case BUTTON_DOWN:
+ data[0] = 'D'; break;
+ case BUTTON_UP:
+ data[0] = 'U'; break;
+ default:
+ data[0] = '?';
+ }
+ return 0;
}
- return 0;
-}
-// Initlisation of the app.
-int main_clock_init(SSOLED *oled, char *data, uint data_size) {
- return 1; // return 1 when function not implemented
-}
+ // Initlisation of the app.
+ int init(SSOLED *oled, char *data, uint data_size) {
+ 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 main_clock_bgrefresh(SSOLED *oled, char *data, uint data_size, char in_foreground) {
- return 1;
-}
+ // 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 *data, uint data_size, 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 main_clock_destroy(SSOLED *oled, char *data, uint data_size) {
- 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, char *data, uint data_size) {
+ return 1;
+ }
+} \ No newline at end of file
diff --git a/apps/main_clock.hpp b/apps/main_clock.hpp
index 70d9755..c20af0f 100644
--- a/apps/main_clock.hpp
+++ b/apps/main_clock.hpp
@@ -4,14 +4,12 @@
#include "pico/util/datetime.h"
#include "../oled/ss_oled.h"
-void time_as_str(char *buf, uint buf_size, const datetime_t *t);
-void date_as_str(char *buf, uint buf_size, const datetime_t *t);
-void show_datetime(SSOLED *oled);
-
-int main_clock_init(SSOLED *oled, char *data, uint data_size);
-int main_clock_render(SSOLED *oled, char *data, uint data_size);
-int main_clock_btnpressed(SSOLED *oled, char *data, uint data_size, uint gpio);
-int main_clock_bgrefresh(SSOLED *oled, char *data, uint data_size, char in_foreground);
-int main_clock_destroy(SSOLED *oled, char *data, uint data_size);
+namespace app_main_clock {
+ int init(SSOLED *oled, char *data, uint data_size);
+ int render(SSOLED *oled, char *data, uint data_size);
+ int btnpressed(SSOLED *oled, char *data, uint data_size, uint gpio);
+ int bgrefresh(SSOLED *oled, char *data, uint data_size, char in_foreground);
+ int destroy(SSOLED *oled, char *data, uint data_size);
+}
#endif \ No newline at end of file
diff --git a/pico-watch.cpp b/pico-watch.cpp
index d7b84af..05d94e2 100644
--- a/pico-watch.cpp
+++ b/pico-watch.cpp
@@ -14,11 +14,11 @@ int current_app = 0;
#define NUMBER_OF_APPS 2
#define APP_DATA_BUFFER_LEN 256
-int (*APPS_FUNC_INIT[NUMBER_OF_APPS])(SSOLED *oled, char *data, uint data_size) = {app_home_menu::init, main_clock_init};
-int (*APPS_FUNC_RENDER[NUMBER_OF_APPS])(SSOLED *oled, char *data, uint data_size) = {app_home_menu::render, main_clock_render};
-int (*APPS_FUNC_BTNPRESS[NUMBER_OF_APPS])(SSOLED *oled, char *data, uint data_size, uint gpio) = {app_home_menu::btnpressed, main_clock_btnpressed};
-int (*APPS_FUNC_BGREFRESH[NUMBER_OF_APPS])(SSOLED *oled, char *data, uint data_size, char in_foreground) = {app_home_menu::bgrefresh, main_clock_bgrefresh};
-int (*APPS_FUNC_DESTROY[NUMBER_OF_APPS])(SSOLED *oled, char *data, uint data_size) = {app_home_menu::destroy, main_clock_destroy};
+int (*APPS_FUNC_INIT[NUMBER_OF_APPS])(SSOLED *oled, char *data, uint data_size) = {app_home_menu::init, app_main_clock::init};
+int (*APPS_FUNC_RENDER[NUMBER_OF_APPS])(SSOLED *oled, char *data, uint data_size) = {app_home_menu::render, app_main_clock::render};
+int (*APPS_FUNC_BTNPRESS[NUMBER_OF_APPS])(SSOLED *oled, char *data, uint data_size, uint gpio) = {app_home_menu::btnpressed, app_main_clock::btnpressed};
+int (*APPS_FUNC_BGREFRESH[NUMBER_OF_APPS])(SSOLED *oled, char *data, uint data_size, char in_foreground) = {app_home_menu::bgrefresh, app_main_clock::bgrefresh};
+int (*APPS_FUNC_DESTROY[NUMBER_OF_APPS])(SSOLED *oled, char *data, uint data_size) = {app_home_menu::destroy, app_main_clock::destroy};
char APPS_DATA[NUMBER_OF_APPS][APP_DATA_BUFFER_LEN];
int APPS_DESTROY_ON_EXIT[NUMBER_OF_APPS] = {0, 1};
int APPS_IS_INIT[NUMBER_OF_APPS] = {0, 0}; // Only run in background if init
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-01-10 21:51:47 +0000