mirror/second-movement
3
0
Fork 0
mirror of https://github.com/joeycastillo/second-movement.git synced 2025-10-29 19:47:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Japanese Era (Wareki) Display Feature (for Custom LCD) (#57)

Browse Source
This commit is contained in:
kbc-yam 2025-08-04 02:09:19 +09:00 committed by GitHub
parent bc02072250
commit 5e0cc98659
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 100 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
movement_faces.h
View File

@ -62,6 +62,7 @@
#include "tally_face.h"
#include "probability_face.h"
#include "ke_decimal_time_face.h"
#include "wareki_face.h"
#include "deadline_face.h"
#include "wordle_face.h"
// New includes go above this line.

1
watch-faces.mk
View File

@ -38,5 +38,6 @@ SRCS += \
./watch-faces/complication/kitchen_conversions_face.c \
./watch-faces/complication/periodic_table_face.c \
./watch-faces/clock/ke_decimal_time_face.c \
./watch-faces/complication/wareki_face.c \
./watch-faces/complication/deadline_face.c \
# New watch faces go above this line.

115
legacy/watch_faces/complication/wareki_face.c → watch-faces/complication/wareki_face.c
View File

@ -1,9 +1,24 @@
/*
The displayed Japanese Era can be changed by the buttons on the watch, making it also usable as a converter between the Gregorian calendar and the Japanese Era.
Light button: Subtract one year from the Japanese Era.
Start/Stop button: Add one year to the Japanese Era.
Button operations support long-press functionality.
Japanese Era Notations:
r : REIWA (令和)
h : HEISEI (平成)
s : SHOWA(昭和)
*/
#include <stdlib.h>
#include <string.h>
#include "wareki_face.h"
#include "filesystem.h"
#include "watch_utility.h"
#include "watch.h"
//Long press status flag
static bool _alarm_button_press;
@ -14,41 +29,102 @@ void wareki_setup(uint8_t watch_face_index, void ** context_ptr) {
(void) watch_face_index;
//printf("wareki_setup() \n");
if (*context_ptr == NULL) {
*context_ptr = malloc(sizeof(wareki_state_t));
memset(*context_ptr, 0, sizeof(wareki_state_t));
// Do any one-time tasks in here; the inside of this conditional happens only at boot.
}
//debug code
// watch_date_time datetime = watch_rtc_get_date_time();
// datetime.unit.year = 2022 - WATCH_RTC_REFERENCE_YEAR;
// datetime.unit.month = 12;
// datetime.unit.day = 31;
// datetime.unit.hour = 23;
// datetime.unit.minute= 59;
// datetime.unit.second= 30;
// watch_rtc_set_date_time(datetime);
// settings->bit.clock_mode_24h = true; //24時間表記
// settings->bit.to_interval = 1;//0=60sec 1=2m 2=5m 3=30m
// watch_store_backup_data(settings->reg, 0);
}
}
// splash view
static void draw_wareki_splash(wareki_state_t *state) {
(void) state;
char buf[11];
watch_clear_colon();
sprintf(buf, "%s","wa ------");
watch_display_string(buf, 0);
watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "WA ", "wa");
watch_display_text(WATCH_POSITION_TOP_RIGHT, " ");
watch_display_text(WATCH_POSITION_BOTTOM, " ");
}
//draw year and Japanese wareki
static void draw_year_and_wareki(wareki_state_t *state) {
char buf[27];
char buf[16];
if(state->disp_year < REIWA_GANNEN){
bool is_custom_lcd = watch_get_lcd_type() == WATCH_LCD_TYPE_CUSTOM;
if(state->disp_year == REIWA_GANNEN){
//The first year of Reiwa (2019) began on May 1. The period before May 1 is Heisei 31.
//In other words, 2019 is Heisei Year 31 and it is possible that it is Reiwa Year 1.
watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "H31", " r");
if (is_custom_lcd)
{
//For custom LCDs, display both Heisei and Reiwa.
watch_display_text(WATCH_POSITION_TOP_RIGHT, "r1");
}
else{
watch_display_text(WATCH_POSITION_TOP_RIGHT, " 1");
}
}
else if(state->disp_year == HEISEI_GANNEN){
//The year 1989 could be Showa 64 or it could be Heisei 1.
watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "S64", " h");
if (is_custom_lcd)
{
//For custom LCDs, display both Showa and Heisei.
watch_display_text(WATCH_POSITION_TOP_RIGHT, "h1");
}
else{
watch_display_text(WATCH_POSITION_TOP_RIGHT, " 1");
}
}
else if(state->disp_year < HEISEI_GANNEN){
//Showa
//sprintf(buf, " h%2d%4d ", (int)state->disp_year - HEISEI_GANNEN + 1, (int)state->disp_year);
watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "Sho", "s ");
sprintf(buf, "%2d", (int)state->disp_year - SHOWA_GANNEN + 1);
watch_display_text(WATCH_POSITION_TOP_RIGHT, buf);
}
else if(state->disp_year < REIWA_GANNEN){
//Heisei
sprintf(buf, " h%2d%4d ", (int)state->disp_year - HEISEI_GANNEN + 1, (int)state->disp_year);
//sprintf(buf, " h%2d%4d ", (int)state->disp_year - HEISEI_GANNEN + 1, (int)state->disp_year);
watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "HEI", "h ");
sprintf(buf, "%2d", (int)state->disp_year - HEISEI_GANNEN + 1);
watch_display_text(WATCH_POSITION_TOP_RIGHT, buf);
}
else{
//Reiwa
sprintf(buf, " r%2d%4d ", (int)state->disp_year - REIWA_GANNEN + 1 , (int)state->disp_year);
//sprintf(buf, " r%2d%4d ", (int)state->disp_year - REIWA_GANNEN + 1 , (int)state->disp_year);
watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "REI", "r ");
sprintf(buf, "%2d", (int)state->disp_year - REIWA_GANNEN + 1);
watch_display_text(WATCH_POSITION_TOP_RIGHT, buf);
}
watch_display_string(buf, 0);
sprintf(buf, "%4d ",(int)state->disp_year);
watch_display_text(WATCH_POSITION_BOTTOM, buf);
}
@ -81,7 +157,6 @@ void addYear(wareki_state_t* state,int count){
state->disp_year = REIWA_LIMIT;
}
else{
//watch_buzzer_play_note(BUZZER_NOTE_C8, 30);
}
}
@ -90,11 +165,10 @@ void subYear(wareki_state_t* state,int count){
state->disp_year = state->disp_year - count;
if(state->disp_year < 1989 ){
state->disp_year = 1989;
if(state->disp_year < SHOWA_GANNEN ){
state->disp_year = SHOWA_GANNEN;
}
else{
//watch_buzzer_play_note(BUZZER_NOTE_C7, 30);
}
}
@ -123,7 +197,7 @@ bool wareki_loop(movement_event_t event, void *context) {
//printf("tick %d\n",state->disp_year );
if (_alarm_button_press && HAL_GPIO_BTN_ALARM_read()){
if (_alarm_button_press && HAL_GPIO_BTN_ALARM_pin() ){
//printf("ALARM ON\n");
}
else{
@ -131,7 +205,8 @@ bool wareki_loop(movement_event_t event, void *context) {
_alarm_button_press = false;
}
if (_light_button_press && HAL_GPIO_BTN_LIGHT_read()){
if (_light_button_press && HAL_GPIO_BTN_LIGHT_pin()){
//printf("LIGHT ON\n");
}
else{
@ -192,13 +267,12 @@ bool wareki_loop(movement_event_t event, void *context) {
//printf("time out ! \n");
movement_move_to_face(0);
break;
//case EVENT_LOW_ENERGY_UPDATE:
// If you did not resign in EVENT_TIMEOUT, you can use this event to update the display once a minute.
// Avoid displaying fast-updating values like seconds, since the display won't update again for 60 seconds.
// You should also consider starting the tick animation, to show the wearer that this is sleep mode:
// watch_start_sleep_animation(500);
// watch_start_tick_animation(500);
//break;
default:
// Movement's default loop handler will step in for any cases you don't handle above:
@ -206,6 +280,7 @@ bool wareki_loop(movement_event_t event, void *context) {
// * EVENT_MODE_BUTTON_UP moves to the next watch face in the list
// * EVENT_MODE_LONG_PRESS returns to the first watch face (or skips to the secondary watch face, if configured)
// You can override any of these behaviors by adding a case for these events to this switch statement.
//return movement_default_loop_handler(event, settings);
return movement_default_loop_handler(event);
}

5
legacy/watch_faces/complication/wareki_face.h → watch-faces/complication/wareki_face.h
View File

@ -3,9 +3,10 @@
#include "movement.h"
#define REIWA_LIMIT 2018 + 31
#define REIWA_LIMIT 2018 + 99
#define REIWA_GANNEN 2019
#define HEISEI_GANNEN 1989
#define SHOWA_GANNEN 1926
typedef struct {
bool active;
@ -14,11 +15,11 @@ typedef struct {
uint32_t real_year; //The actual current year
} wareki_state_t;
void wareki_setup(uint8_t watch_face_index, void ** context_ptr);
void wareki_activate(void *context);
bool wareki_loop(movement_event_t event, void *context);
void wareki_resign(void *context);
void addYear(wareki_state_t* state,int count);
void subYear(wareki_state_t* state,int count);