diff options
| -rw-r--r-- | api.cpp | 223 | ||||
| -rw-r--r-- | api.hpp | 51 | ||||
| -rw-r--r-- | buttons.hpp | 1 | ||||
| -rw-r--r-- | oled/ss_oled.c | 29 | ||||
| -rw-r--r-- | oled/ss_oled.h | 2 | ||||
| -rw-r--r-- | pico-watch.cpp | 4 |
6 files changed, 269 insertions, 41 deletions
@@ -15,6 +15,7 @@ void Api::init() { } void Api::init_display() { + sleep_ms(500); // Wait for the OLED to settle oledInit(&m_oled, OLED_128x64, 0x3d, 0, 0, 1, SDA_PIN, SCL_PIN, RESET_PIN, 1000000L); oledFill(&m_oled, 0,1); oledSetContrast(&m_oled, OLED_DEFAULT_CONTRAST); @@ -27,7 +28,8 @@ void Api::display_power(bool mode) { } int Api::display_write_string(int iScrollX, int x, int y, char *szMsg, int iSize, int bInvert, int bRender) { - return oledWriteString(&m_oled, iScrollX, x, y, szMsg, iSize, bInvert, bRender); + oledWriteString(&m_oled, iScrollX, x, y, szMsg, iSize, bInvert, 0); + m_writebb_needed = true; } void Api::display_fill(unsigned char ucData, int bRender) { @@ -35,44 +37,50 @@ void Api::display_fill(unsigned char ucData, int bRender) { } void Api::display_draw_line(int x1, int y1, int x2, int y2, int bRender) { - oledDrawLine(&m_oled, x1, y1, x2, y2, bRender); + oledDrawLine(&m_oled, x1, y1, x2, y2, 0); + m_writebb_needed = true; } void Api::display_draw_rectange(int x1, int y1, int x2, int y2, uint8_t ucColor, uint8_t bFilled) { oledRectangle(&m_oled, x1, y1, x2, y2, ucColor, bFilled); - oledDumpBuffer(&m_oled, m_ucBuffer); // Write the back buffer, after experimentation, seems to be required when drawing this shape + m_writebb_needed = true; // Write the back buffer, after experimentation, seems to be required when drawing this shape } void Api::display_draw_ellipse(int iCenterX, int iCenterY, int32_t iRadiusX, int32_t iRadiusY, uint8_t ucColor, uint8_t bFilled) { oledEllipse(&m_oled, iCenterX, iCenterY, iRadiusX, iRadiusY, ucColor, bFilled); - oledDumpBuffer(&m_oled, m_ucBuffer); + m_writebb_needed = true; } void Api::display_write_buffer(uint8_t *pBuffer) { oledDumpBuffer(&m_oled, pBuffer); } +void Api::display_write_backbuffer() { + if (m_writebb_needed) + oledDumpBuffer(&m_oled, m_ucBuffer); + m_writebb_needed = false; +} + int Api::display_write_pixel(int x, int y, unsigned char ucColor, int bRender) { return oledSetPixel(&m_oled, x, y, ucColor, bRender); } -bool Api::gui_popup_text(std::string title, std::string body){ -#define CHARS_PER_LINE 13 - m_button_last_pressed = 0; - m_send_button_press_to_app = false; - +void Api::gui_popup_generic(std::string &title, std::string &body, int max_title_length, int max_body_length) { oledRectangle(&m_oled, 9,7, 119,63, 0, 1); // Background oledRectangle(&m_oled, 9,7, 119,63, 1, 0); // Popup border oledRectangle(&m_oled, 9,7, 119,16, 1, 1); // Title background, FIXME pixel bleeding - oledDumpBuffer(&m_oled, m_ucBuffer); // Display rectangle + m_writebb_needed = true; this->display_write_backbuffer(); // Display rectangle and anything else behind it (drawn before), could be moved after writing strings (but not done for debugging) // Truncate longer strings to avoid wasting time in for loop and drawing on OLED - if (title.size() > 13) + if (max_title_length > 13) max_title_length = 13; + if (max_body_length > 78) max_body_length = 78; + if (title.size() > max_title_length) title.resize(13); - if (body.size() > 78) + if (body.size() > max_body_length) body.resize(78); // Make body fit by adding '\n' at a regular interval + #define CHARS_PER_LINE 13 int since_nl = 0; // Characters since newline for (std::string::size_type i = 0; i < body.size(); ++i) { if (body[i] == '\n') @@ -83,16 +91,177 @@ bool Api::gui_popup_text(std::string title, std::string body){ } } // See https://stackoverflow.com/questions/1986966/does-s0-point-to-contiguous-characters-in-a-stdstring - oledWriteString(&m_oled, 0, 15,1, &title[0], FONT_8x8, 1, 1); // Draw title - oledWriteString(&m_oled, 0, 13,2, &body[0], FONT_8x8, 0, 1); // Draw body + oledWriteString(&m_oled, 0, 15,1, title.c_str(), FONT_8x8, 1, 1); // Draw title + oledWriteString(&m_oled, 0, 13,2, body.c_str(), FONT_8x8, 0, 1); // Draw body +} + +bool Api::gui_popup_text(std::string title, std::string body){ + m_button_last_pressed = BUTTON_NONE; + m_send_button_press_to_app = false; + + gui_popup_generic(title, body); + while (m_button_last_pressed != BUTTON_SELECT) - sleep_ms(50); + sleep_ms(50); // TODO: use _wfi() // Give back control to running app oledFill(&m_oled, 0, 1); m_send_button_press_to_app = true; + return true; } -bool Api::gui_footer_text(std::string text, int offset_x, int offset_row, int invert) { +bool Api::gui_popup_booleanchoice(std::string title, std::string body){ + m_button_last_pressed = BUTTON_NONE; + m_send_button_press_to_app = false; + + title.insert(0, "Choice|"); // TODO: Could be made nicer with a custom char that uses the whole height, this would give a visible separation, with two "text blocks" composing the title + gui_popup_generic(title, body); + + while (m_button_last_pressed != BUTTON_SELECT and m_button_last_pressed != BUTTON_MODE) + sleep_ms(50); // TODO: use _wfi() + + bool choice; + switch (m_button_last_pressed) { + case BUTTON_SELECT: + choice = true; + break; + case BUTTON_MODE: + choice = false; + break; + default: + __breakpoint(); // Impossible to attain (but you never know…) + } + // Give back control to running app + oledFill(&m_oled, 0, 1); + m_send_button_press_to_app = true; + return choice; +} + +void Api::gui_popup_intchoice_footer(int current_num, int min_num, int max_num) { + char buf[30]; + snprintf(&buf[0], sizeof(buf), + "Select: %d (%d/%d)", + current_num, + min_num, + max_num); + oledRectangle(&m_oled, 9,55, 119,63, 1, 1); // Footer background, FIXME pixel bleeding + oledWriteString(&m_oled, 0,10,7, buf, FONT_6x8, 1, 0); + m_writebb_needed = true; display_write_backbuffer(); +} + +int Api::gui_popup_intchoice(std::string title, std::string body, int min_num, int max_num, int default_num, int step){ + m_button_last_pressed = BUTTON_NONE; + m_send_button_press_to_app = false; + + int current_num = default_num; + + title.insert(0, "Number|"); // TODO: Could be made nicer with a custom char instead of pipe char + gui_popup_generic(title, body, 13, 39); // 39: 3 lines of body text, to leave space for number + gui_popup_intchoice_footer(current_num, min_num, max_num); + + do { + m_button_last_pressed = BUTTON_NONE; + sleep_ms(50); // TODO: use _wfi() + switch (m_button_last_pressed) { + case BUTTON_UP: + current_num += step; + if (current_num > max_num) + current_num = max_num; + break; + case BUTTON_DOWN: + current_num -= step; + if (current_num < min_num) + current_num = min_num; + break; + case BUTTON_MODE: + current_num = default_num; + break; + } + if (m_button_last_pressed) + gui_popup_intchoice_footer(current_num, min_num, max_num); + } while (m_button_last_pressed != BUTTON_SELECT); + + // Give back control to running app + oledFill(&m_oled, 0, 1); + m_send_button_press_to_app = true; + return current_num; +} + +void Api::gui_popup_strchoice_footer(const char selection[]) { + std::string buf{selection}; + buf.insert(0, "Select: "); + + if (buf.size() > 36) // 2 lines of 18 chars + buf.resize(36); + + // Choose most adapted font size + int font; + int chars_per_line; + if (buf.size() > 26) { + font = FONT_6x8; + chars_per_line = 18; + } else { + font = FONT_8x8; + chars_per_line = 13; + } + + // Make selection text fit by adding '\n' at a regular interval + // TODO: Make this a private function + int since_nl = 0; // Characters since newline + for (std::string::size_type i = 0; i < buf.size(); ++i) { + if (buf[i] == '\n') + since_nl = 0; + else if (since_nl++ == chars_per_line) { + buf.insert(i, 1, '\n'); + since_nl = 0; // Probably unneeded + } + } + + oledRectangle(&m_oled, 9,47, 119,63, 1, 1); // Footer background, FIXME pixel bleeding + oledWriteString(&m_oled, 0,10,6, buf.c_str(), font, 1, 0); + m_writebb_needed = true; display_write_backbuffer(); +} + +int Api::gui_popup_strchoice(std::string title, std::string body, const char *choices[27], int choices_size, int min_index, int max_index, int default_index){ + m_button_last_pressed = BUTTON_NONE; + m_send_button_press_to_app = false; + if (max_index == -1) + max_index = choices_size-1; + + int current_index = default_index; + + title.insert(0, "Choose|"); // TODO: Could be made nicer with a custom char instead of pipe char + gui_popup_generic(title, body, 13, 39); // 39: 3 lines of body text, to leave space for selection string + gui_popup_strchoice_footer(choices[current_index]); + + do { + m_button_last_pressed = BUTTON_NONE; + sleep_ms(50); // TODO: use _wfi() + switch (m_button_last_pressed) { + case BUTTON_UP: + current_index += 1; + if (current_index > max_index) + current_index = max_index; + break; + case BUTTON_DOWN: + current_index -= 1; + if (current_index < min_index) + current_index = min_index; + break; + case BUTTON_MODE: + current_index = default_index; + break; + } + if (m_button_last_pressed) + gui_popup_strchoice_footer(choices[current_index]); + } while (m_button_last_pressed != BUTTON_SELECT); + + // Give back control to running app + oledFill(&m_oled, 0, 1); + m_send_button_press_to_app = true; + return current_index; +} + +bool Api::gui_footer_text(std::string text, int offset_x, int offset_row, bool invert, bool no_bg) { // Max chars per line for FONT_8x8 is 16 chars // Max chars per line for FONT_6x8 is 21 chars // Truncate longer text @@ -106,12 +275,14 @@ bool Api::gui_footer_text(std::string text, int offset_x, int offset_row, int in else font = FONT_8x8; - oledRectangle(&m_oled, 0,56, 128,64, invert, 1); - oledDumpBuffer(&m_oled, m_ucBuffer); - oledWriteString(&m_oled, 0,offset_x,7-offset_row, &text[0], font, invert, 1); + if (!no_bg) { + oledRectangle(&m_oled, 0,56-offset_row*8, 127,64-offset_row*8, invert, 1); + m_writebb_needed = true; + } + oledWriteString(&m_oled, 0,offset_x,7-offset_row, text.c_str(), font, invert, 0); } -bool Api::gui_header_text(std::string text, int offset_x, int offset_row, int invert) { +bool Api::gui_header_text(std::string text, int offset_x, int offset_row, bool invert, bool no_bg) { // Max chars per line for FONT_8x8 is 16 chars // Max chars per line for FONT_6x8 is 21 chars // Truncate longer text @@ -125,9 +296,11 @@ bool Api::gui_header_text(std::string text, int offset_x, int offset_row, int in else font = FONT_8x8; - oledRectangle(&m_oled, 0,0, 128,8, invert, 1); - oledDumpBuffer(&m_oled, m_ucBuffer); - oledWriteString(&m_oled, 0,offset_x,0+offset_row, &text[0], font, invert, 1); + if (!no_bg) { + oledRectangle(&m_oled, 0,0+offset_row*8, 127,8+offset_row*8, invert, 1); + m_writebb_needed = true; + } + oledWriteString(&m_oled, 0,offset_x,0+offset_row, text.c_str(), font, invert, 0); } bool Api::performance_set(int perf) { @@ -138,6 +311,10 @@ bool Api::datetime_get(datetime_t *t) { return rtc_get_datetime(t); } +bool Api::datetime_set(datetime_t *t) { + return rtc_set_datetime(t); +} + int Api::performance_render_interval_get() { return m_app_render_interval; } @@ -11,10 +11,17 @@ class Api { private: SSOLED m_oled; u_char m_init_done = 0; + bool m_writebb_needed = false; // Do we need to write the internal backbuffer? uint8_t m_ucBuffer[1024] = {0}; uint m_button_last_pressed = 0; int m_app_render_interval = 500; void init_display(); + // Careful of large heap usage with long strings! Heap seems to be fragmented, so shorter strings work best. More details on findings below: + // When the string cannot be created, this comes from the fact that we, on some runs, allocation can be very close to the SRAM's boundry: 0x20041f88 with boundry at 0x20042000. The heap is nearly full. Even just appending to a string moves the allocation lower. I think that the best course of action would be to have more static variables and pull in less things to save SRAM. + // When char* directly passed as parameter: The memory is possibly fragmented as long strings (>215) push the allocation downwards, into lower (higher address) in the heap. title is at 0x20041f90 and body at 0x200045e8, for length of 215 chars. + void gui_popup_generic(std::string &title, std::string &body, int max_title_length = 13, int max_body_length = 78); + void gui_popup_intchoice_footer(int current_num, int min_num, int max_num); + void gui_popup_strchoice_footer(const char selection[]); public: bool m_send_button_press_to_app = true; enum perf_modes { @@ -33,6 +40,8 @@ class Api { void display_draw_rectange(int x1, int y1, int x2, int y2, uint8_t ucColor, uint8_t bFilled); void display_draw_ellipse(int iCenterX, int iCenterY, int32_t iRadiusX, int32_t iRadiusY, uint8_t ucColor, uint8_t bFilled); void display_write_buffer(uint8_t *pBuffer); + // Write the internal backbuffer to the display. Should be called when after all drawing calls. One call is done to avoid flickering of the display. + void display_write_backbuffer(); int display_write_pixel(int x, int y, unsigned char ucColor, int bRender); // Display a popup over the current view and wait for select button to be pressed. // This is a blocking function and should be used only in the app's render method. @@ -40,26 +49,62 @@ class Api { // \param body String containing the popup's body. The zone has a size of 13×6 characters, so body should not be longer than 78 characters. Newline allows going to the next line and the text is automatically wrapped. // \note Strings longer than 13 and 78 respectively will be truncated. bool gui_popup_text(std::string title, std::string body); + // Display a popup over the current view and wait for select or mode (cancel) button to be pressed. The choice done (yes/no) by the user is returned as a bool. + // This is a blocking function and should be used only in the app's render method. + // \param title Popup's title. The title is prefixed with "Choice|", so the `title` argument cannot exceed 6 characters. + // \param body String containing the popup's body. The zone has a size of 13×6 characters, so body should not be longer than 78 characters. Newline allows going to the next line and the text is automatically wrapped. + // \note Strings longer than 13 and 78 respectively will be truncated. + bool gui_popup_booleanchoice(std::string title, std::string body); + // Display a popup over the current view and wait for user to choose (with left and right) a number between min_num and max_num. The default choice is default_num and the user can reset back to it with mode/cancel button. After confirming with select, the choice is returned. + // This is a blocking function and should be used only in the app's render method. + // \param title Popup's title. The title is prefixed with "Number|", so the `title` argument cannot exceed 6 characters. + // \param body String containing the popup's body. The zone has a size of 13×3 characters, so body should not be longer than 39 characters. Newline allows going to the next line and the text is automatically wrapped. Under the body is displayed the current choosen number with the min and max in parenthesis. + // \param min_num The smallest number that can be choosen. + // \param max_num Biggest number that can be choosen. + // \param default_num This should be between min_num and max_num, else user may be able to return a number out of range + // \param step Value to increment/decrement from when user changes number. This cannot result in an out-of-bounds as the number is clipped to the min/max when this happens. This maybe undesirable behaviour. + // \note Strings longer than 13 and 39 respectively will be truncated. + int gui_popup_intchoice(std::string title, std::string body, int min_num = 0, int max_num = 10, int default_num = 5, int step = 1); + // Display a popup over the current view and wait for user to choose (with left and right) a string (char array). The default choice is default_index and the user can reset back to it with mode/cancel button. After confirming with select, the choice's index is returned. + // This is a blocking function and should be used only in the app's render method. + // \param title Popup's title. The title is prefixed with "Choice|", so the `title` argument cannot exceed 6 characters. + // \param body String containing the popup's body. The zone has a size of 13×3 characters, so body should not be longer than 39 characters. Newline allows going to the next line and the text is automatically wrapped. Under the body is displayed the current choosen number with the min and max in parenthesis. + // \param choices List of const char arrays to choose from, each string cannot be longer than 27 chars because of "Select: " text. Font size between 6×8 and 8×8 is choosen automatically. Set the second dimension size of your array of choices to max 27. For example, define: `const char *choices[27] = {…}` than call this function by passing directly `choices`. + // \param choices_size Size of choices array, used for avoiding selection of element that are out of the array's bounds. This is only used for determining max_index when max_index is unset. **Following parameters can be left at their default value:** + // \param min_index Smallest element index that can be choosen. This allows reusing the same choice list for muliple prompts and allows programmatically changing the choices available to the user. + // \param max_index Biggest element index that can be choosen. This defaults to the size of the list (set by `choices_size`) if left at -1. + // \param default_index Default string displayed. + int gui_popup_strchoice(std::string title, std::string body, const char *choices[27], int choices_size, int min_index = 0, int max_index = -1, int default_index = 0); // Display text at the bottom of the screen. // The font size is automatically choosen based on the text lenght. // \param text Text to display. Text longer than 21 will be truncated. // \param offset_x Set a horizental offset, to allow, for example, centering the text // \param offset_row Allow rendering the text higher. For example, one line higher when `offset_row = 1`. - // \param invert allow inverting text and background color. - bool gui_footer_text(std::string text, int offset_x = 0, int offset_row = 0, int invert = 0); + // \param invert Invert text and background color. + // \param no_bg Do not draw background when true. + bool gui_footer_text(std::string text, int offset_x = 0, int offset_row = 0, bool invert = false, bool no_bg = false); // Display text at the top of the screen. // The font size is automatically choosen based on the text lenght. // \param text Text to display. Text longer than 21 will be truncated. // \param offset_x Set a horizental offset, to allow, for example, centering the text // \param offset_row Render text lines lower. For example, one text line lower with `offset_row = 1`. // \param invert Invert text and background color. - bool gui_header_text(std::string text, int offset_x = 0, int offset_row = 0, int invert = 0); + // \param no_bg Do not draw background when true. + bool gui_header_text(std::string text, int offset_x = 0, int offset_row = 0, bool invert = false, bool no_bg = false); // Set performance mode. // FIXME: function currently does nothing! // An app should choose the lowest performance that can make it function. Set in init(). Only when required, higher performance should be used. // \param perf See Api::perf_modes enum for possible values bool performance_set(int perf); + // Get the current datetime + // \param t Pointer to the datetime structure in which the datetime wil be stored + // \return true if the call to the SDK was successful, else false. bool datetime_get(datetime_t *t); + // Set the current datetime + // TODO: Not every app should be allowed to set the datetime. Only app_id<2 (home_screen and settings) should be allowed: return false when setting is blocked. + // \param t Pointer to the datetime structure + // \return true if the call to the SDK was successful, else false. + bool datetime_set(datetime_t *t); // Get app's current render interval // \return Value in millisec int performance_render_interval_get(); diff --git a/buttons.hpp b/buttons.hpp index 3136a26..3899127 100644 --- a/buttons.hpp +++ b/buttons.hpp @@ -5,6 +5,7 @@ // Init buttons used in conjuction with interrupts // All buttons are connected to ground. #define NUMBER_OF_BUTTONS 5 +#define BUTTON_NONE 0 #define BUTTON_HOME 22 #define BUTTON_SELECT 18 #define BUTTON_MODE 19 diff --git a/oled/ss_oled.c b/oled/ss_oled.c index 3375bde..c29171f 100644 --- a/oled/ss_oled.c +++ b/oled/ss_oled.c @@ -1460,7 +1460,7 @@ void oledSetTextWrap(SSOLED *pOLED, int bWrap) // Draw a string of normal (8x8), small (6x8) or large (16x32) characters // At the given col+row // -int oledWriteString(SSOLED *pOLED, int iScroll, int x, int y, char *szMsg, int iSize, int bInvert, int bRender) +int oledWriteString(SSOLED *pOLED, int iScroll, int x, int y, const char *szMsg, int iSize, int bInvert, int bRender) { int i, iFontOff, iLen, iFontSkip; unsigned char c, *s, ucTemp[40]; @@ -1740,20 +1740,23 @@ unsigned char c, *s, ucTemp[40]; if (iScroll < 6) // if characters are visible { c = szMsg[i] - 32; - // we can't directly use the pointer to FLASH memory, so copy to a local buffer - ucTemp[0] = 0; - memcpy(&ucTemp[1], &ucSmallFont[(int)c*5], 5); - if (bInvert) InvertBytes(ucTemp, 6); - iLen = 6 - iFontSkip; - if (pOLED->iCursorX + iLen > pOLED->oled_x) // clip right edge - iLen = pOLED->oled_x - pOLED->iCursorX; - oledWriteDataBlock(pOLED, &ucTemp[iFontSkip], iLen, bRender); // write character pattern - // oledCachedWrite(ucTemp, 6); - pOLED->iCursorX += iLen; + if (szMsg[i] != '\n') { // Do not draw the new line char + // we can't directly use the pointer to FLASH memory, so copy to a local buffer + ucTemp[0] = 0; + memcpy(&ucTemp[1], &ucSmallFont[(int)c*5], 5); + if (bInvert) InvertBytes(ucTemp, 6); + iLen = 6 - iFontSkip; + if (pOLED->iCursorX + iLen > pOLED->oled_x) // clip right edge + iLen = pOLED->oled_x - pOLED->iCursorX; + oledWriteDataBlock(pOLED, &ucTemp[iFontSkip], iLen, bRender); // write character pattern + // oledCachedWrite(ucTemp, 6); + pOLED->iCursorX += iLen; + } iFontSkip = 0; - if (pOLED->iCursorX >= pOLED->oled_x-5 && pOLED->oled_wrap) // word wrap enabled? + + if ((pOLED->iCursorX >= pOLED->oled_x-5 && pOLED->oled_wrap) || szMsg[i] == '\n') // word wrap enabled? or newline char { - pOLED->iCursorX = 0; // start at the beginning of the next line + pOLED->iCursorX = x; // start at the beginning of the next line pOLED->iCursorY++; oledSetPosition(pOLED, pOLED->iCursorX, pOLED->iCursorY, bRender); } diff --git a/oled/ss_oled.h b/oled/ss_oled.h index fe6f399..78b68d4 100644 --- a/oled/ss_oled.h +++ b/oled/ss_oled.h @@ -129,7 +129,7 @@ void oledSetTextWrap(SSOLED *pOLED, int bWrap); // // Returns 0 for success, -1 for invalid parameter // -int oledWriteString(SSOLED *pOLED, int iScrollX, int x, int y, char *szMsg, int iSize, int bInvert, int bRender); +int oledWriteString(SSOLED *pOLED, int iScrollX, int x, int y, const char *szMsg, int iSize, int bInvert, int bRender); // // Fill the frame buffer with a byte pattern // e.g. all off (0x00) or all on (0xff) diff --git a/pico-watch.cpp b/pico-watch.cpp index 9e22687..1dee093 100644 --- a/pico-watch.cpp +++ b/pico-watch.cpp @@ -95,8 +95,10 @@ int main() { app_init(current_app); while (1) { - if (app_ready && !is_sleeping) + if (app_ready && !is_sleeping) { app_render(current_app); // FIXME: This may cause race conditions when switching app + app_api.display_write_backbuffer(); + } sleep_ms(app_api.performance_render_interval_get()); } return 0; |