The-Homebrew-Cloud/N64FlashcartMenu
2
0
Fork 0
mirror of https://github.com/Polprzewodnikowy/N64FlashcartMenu.git synced 2025-01-11 09:39:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into action-bar-context

Browse Source
This commit is contained in:
Robin Jones 2024-11-24 15:12:21 +00:00 committed by GitHub
commit 0f2298a419
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libdragon

@ -1 +1 @@
Subproject commit 0c4e388851cabab52f421bff5e75e9dc3ab36c72
Subproject commit 23bba79ab570c4504e8707e34ac935c669e57d32

12
src/menu/views/rtc.c
View File

@ -5,8 +5,8 @@
#include "../sound.h"
#include "views.h"
#define MAX(a,b) ({ typeof(a) _a = a; typeof(b) _b = b; _a > _b ? _a : _b; })
#define MIN(a,b) ({ typeof(a) _a = a; typeof(b) _b = b; _a < _b ? _a : _b; })
#define MAX(a,b) (((a) > (b)) ? (a) : (b))
#define MIN(a,b) (((a) < (b)) ? (a) : (b))
#define CLAMP(x, min, max) (MIN(MAX((x), (min)), (max)))
#define YEAR_MIN 1996
@ -27,7 +27,7 @@ static struct tm rtc_tm = {0};
static bool is_editing_mode;
static rtc_field_t editing_field_type;
int wrap( uint16_t val, uint16_t min, uint16_t max ) {
int wrap( int val, uint16_t min, uint16_t max ) {
if( val < min ) return max;
if( val > max ) return min;
return val;
@ -72,8 +72,8 @@ void adjust_rtc_time( struct tm *t, int incr ) {
*t = *gmtime( &timestamp );
}
void component_editdatetime_draw ( struct tm t, rtc_field_t selected_field ) {
// FIXME: move this to components.c once improved.
void rtc_ui_component_editdatetime_draw ( struct tm t, rtc_field_t selected_field ) {
// FIXME: move this to ui_components.c once improved.
/* Format RTC date/time as strings */
char full_dt[30];
char current_selection_chars[30];
@ -239,7 +239,7 @@ static void draw (menu_t *menu, surface_t *d) {
}
if (is_editing_mode) {
component_editdatetime_draw(rtc_tm, editing_field_type);
rtc_ui_component_editdatetime_draw(rtc_tm, editing_field_type);
}
rdpq_detach_show();