summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/home_menu/main.cpp (renamed from apps/home_menu.cpp)9
-rw-r--r--apps/home_menu/main.hpp (renamed from apps/home_menu.hpp)8
-rw-r--r--apps/main_clock.cpp96
-rw-r--r--apps/main_clock.hpp17
-rw-r--r--apps/main_clock/main.cpp93
-rw-r--r--apps/main_clock/main.hpp36
-rw-r--r--apps/settings/main.cpp1
7 files changed, 139 insertions, 121 deletions
diff --git a/apps/home_menu.cpp b/apps/home_menu/main.cpp
index 4761c46..02965c3 100644
--- a/apps/home_menu.cpp
+++ b/apps/home_menu/main.cpp
@@ -1,11 +1,10 @@
#include <stdio.h>
#include "pico/stdlib.h"
-#include "home_menu.hpp"
-#include "../api.hpp"
-#include "../buttons.hpp"
+#include "../../globals.hpp"
+#include "../../app_manager.hpp"
+#include "main.hpp"
-extern void app_switch(int old_appid, int new_appid);
extern bool rtc_get_datetime(datetime_t *t);
void app_home_menu::title_str(char *buf, uint buf_size, const datetime_t *t) {
@@ -40,7 +39,7 @@ int app_home_menu::render(Api *app_api) {
int app_home_menu::btnpressed(Api *app_api, uint gpio, unsigned long delta) {
switch (gpio) {
case BUTTON_SELECT:
- app_switch(0, selected_app); // FIXME: Should call app_switch_request instead
+ app_switch_request( selected_app);
return 0;
case BUTTON_DOWN:
selected_app--;
diff --git a/apps/home_menu.hpp b/apps/home_menu/main.hpp
index dce83e4..421789b 100644
--- a/apps/home_menu.hpp
+++ b/apps/home_menu/main.hpp
@@ -1,10 +1,9 @@
#pragma once
#include "pico/util/datetime.h"
-#include "../oled/ss_oled.h"
-#include "../api.hpp"
-#include "../base_app.hpp"
+// Includes also buttons, API and ss_oled
+#include "../../base_app.hpp"
#define NUMBER_OF_APPS 3
#define SIZE_APP_NAME 12
@@ -14,10 +13,13 @@ class app_home_menu : public BaseApp {
const char *APPS_NAME[NUMBER_OF_APPS] = {"Home", "Clock", "Settings"};
int selected_app = 0;
char display_app_name[SIZE_APP_NAME];
+
void title_str(char *buf, uint buf_size, const datetime_t *t);
void show_title(Api *app_api);
public:
uint app_id = 0;
+ bool app_destroy_on_exit = false;
+
app_home_menu(Api *app_api);
int render(Api *app_api);
int btnpressed(Api *app_api, uint gpio, unsigned long delta);
diff --git a/apps/main_clock.cpp b/apps/main_clock.cpp
deleted file mode 100644
index 24a4dfb..0000000
--- a/apps/main_clock.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-#include <stdio.h>
-#include "pico/stdlib.h"
-
-#include "main_clock.hpp"
-#include "../api.hpp"
-#include "../buttons.hpp"
-
-namespace app_main_clock {
- bool *ask_user_choice;
- int *user_choice;
- const char *choices[] = {"One", "Two", "Three!", "This is looong!", "make sure to choose me!:p"};
- // 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]);
- };
-
- void show_datetime(Api *app_api) {
- char datetime_buf[256];
- char *datetime_str = &datetime_buf[0];
- datetime_t t;
- app_api->datetime_get(&t);
-
- // time
- time_as_str(datetime_str, sizeof(datetime_buf), &t);
- app_api->display_write_string(0,10,3, datetime_str, FONT_12x16, 0, 1);
-
- // date
- date_as_str(datetime_str, sizeof(datetime_buf), &t);
- app_api->gui_footer_text((std::string)datetime_str);
- }
-
- // Rendering of the app
- int render(Api *app_api) {
- app_api->gui_header_text("Test clock", 17);
- show_datetime(app_api);
- if (*ask_user_choice) {
- *user_choice = app_api->gui_popup_strchoice("Ohh!", "Make a good choice:", choices, 5, 0, -1, *user_choice);
- *ask_user_choice = false;
- }
- app_api->gui_footer_text(choices[*user_choice],0,1);
- return 0;
- }
-
- // Interpretation of button inputs
- int btnpressed(Api *app_api, uint gpio, unsigned long delta) {
- if (gpio == BUTTON_MODE)
- *ask_user_choice = true;
- return 0;
- }
-
- // Initlisation of the app.
- int init(Api *app_api) {
- app_api->performance_set(Api::perf_modes::LOW_POWER);
- ask_user_choice = new bool; *ask_user_choice = false;
- user_choice = new int; *user_choice = 0;
- if (!(user_choice or ask_user_choice))
- return Api::app_init_return_status::MALLOC_FAILED;
- return Api::app_init_return_status::OK;
- }
-
- // 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(Api *app_api, bool 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(Api *app_api) {
- delete ask_user_choice; ask_user_choice = 0;
- delete user_choice; user_choice = 0;
- return 0;
- }
-}
diff --git a/apps/main_clock.hpp b/apps/main_clock.hpp
deleted file mode 100644
index 72e02a4..0000000
--- a/apps/main_clock.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef __MAIN_CLOCK_H__
-#define __MAIN_CLOCK_H__
-
-#include "pico/util/datetime.h"
-#include "../oled/ss_oled.h"
-
-#include "../api.hpp"
-
-namespace app_main_clock {
- int init(Api *app_api);
- int render(Api *app_api);
- int btnpressed(Api *app_api, uint gpio, unsigned long delta);
- int bgrefresh(Api *app_api, bool in_foreground);
- int destroy(Api *app_api);
-}
-
-#endif \ No newline at end of file
diff --git a/apps/main_clock/main.cpp b/apps/main_clock/main.cpp
new file mode 100644
index 0000000..78be6fd
--- /dev/null
+++ b/apps/main_clock/main.cpp
@@ -0,0 +1,93 @@
+#include <stdio.h>
+#include "pico/stdlib.h"
+
+#include "main.hpp"
+
+// TODO in this app
+// - No need for ask_user_choice and user_choice to be a ptr as the app is now encapsulated in a class.
+
+// Time as string
+// Adapted from pico-sdk/scr/common/pico_util/datetime.c
+void app_main_clock::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 app_main_clock::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]);
+};
+
+void app_main_clock::show_datetime(Api *app_api) {
+ char datetime_buf[256];
+ char *datetime_str = &datetime_buf[0];
+ datetime_t t;
+ app_api->datetime_get(&t);
+
+ // time
+ time_as_str(datetime_str, sizeof(datetime_buf), &t);
+ app_api->display_write_string(0,10,3, datetime_str, FONT_12x16, 0, 1);
+
+ // date
+ date_as_str(datetime_str, sizeof(datetime_buf), &t);
+ app_api->gui_footer_text((std::string)datetime_str);
+}
+
+// Rendering of the app
+int app_main_clock::render(Api *app_api) {
+ app_api->gui_header_text("Test clock", 17);
+ show_datetime(app_api);
+ if (*ask_user_choice) {
+ *user_choice = app_api->gui_popup_strchoice("Ohh!", "Make a good choice:", choices, 5, 0, -1, *user_choice);
+ *ask_user_choice = false;
+ }
+ app_api->gui_footer_text(choices[*user_choice],0,1);
+ return 0;
+}
+
+// Interpretation of button inputs
+int app_main_clock::btnpressed(Api *app_api, uint gpio, unsigned long delta) {
+ if (gpio == BUTTON_MODE)
+ *ask_user_choice = true;
+ return 0;
+}
+
+// Initlisation of the app.
+app_main_clock::app_main_clock(Api *app_api) {
+ app_api->performance_set(Api::perf_modes::LOW_POWER);
+
+ ask_user_choice = new bool; *ask_user_choice = false;
+ user_choice = new int; *user_choice = 0;
+ // if (!(user_choice or ask_user_choice))
+ // return Api::app_init_return_status::MALLOC_FAILED;
+ // return Api::app_init_return_status::OK;
+}
+
+// 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 app_main_clock::bgrefresh(Api *app_api, bool 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.
+app_main_clock::~app_main_clock() {
+ delete ask_user_choice; ask_user_choice = 0;
+ delete user_choice; user_choice = 0;
+}
diff --git a/apps/main_clock/main.hpp b/apps/main_clock/main.hpp
new file mode 100644
index 0000000..37c9075
--- /dev/null
+++ b/apps/main_clock/main.hpp
@@ -0,0 +1,36 @@
+#pragma once
+
+#include "pico/util/datetime.h"
+
+// Includes also buttons, API and ss_oled
+#include "../../base_app.hpp"
+
+class app_main_clock : public BaseApp {
+ private:
+ bool *ask_user_choice;
+ int *user_choice;
+ const char *choices[26] = {"One", "Two", "Three!", "This is looong!", "make sure to choose me!:p"};
+
+ 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(Api *app_api);
+
+ public:
+ uint app_id = 1;
+ bool app_destroy_on_exit = true;
+
+ app_main_clock(Api *app_api);
+ int render(Api *app_api);
+ int btnpressed(Api *app_api, uint gpio, unsigned long delta);
+ int bgrefresh(Api *app_api, bool in_foreground);
+ ~app_main_clock();
+};
+
+
+/* namespace app_main_clock {
+ int init(Api *app_api);
+ int render(Api *app_api);
+ int btnpressed(Api *app_api, uint gpio, unsigned long delta);
+ int bgrefresh(Api *app_api, bool in_foreground);
+ int destroy(Api *app_api);
+} */
diff --git a/apps/settings/main.cpp b/apps/settings/main.cpp
index 5472adf..26c8e25 100644
--- a/apps/settings/main.cpp
+++ b/apps/settings/main.cpp
@@ -3,6 +3,7 @@
#include "main.hpp"
#include "../../api.hpp"
+#include "../../globals.hpp"
extern void app_switch(int old_appid, int new_appid);
extern bool rtc_get_datetime(datetime_t *t);
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-01-16 16:27:25 +0000