hueso/Sensor-Watch
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Activity

Merge pull request #109 from mkende/otp_label

Browse Source 
Allow to use 3 character long labels in the totp face.
This commit is contained in:
voloved
2026-04-01 16:41:24 -04:00
committed by GitHub
parent 73d1e1d879 faee5bdce1
commit 422c3c2321
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
watch-faces/complication/totp_face.c
+14 -9
View File
@@ -44,7 +44,7 @@
#endif #endif
typedef struct { typedef struct {
unsigned char labels[2]; const char* labels;
hmac_alg algorithm; hmac_alg algorithm;
uint32_t period; uint32_t period;
size_t encoded_key_length; size_t encoded_key_length;
@@ -65,7 +65,7 @@ typedef struct {
static totp_t credentials[] = { static totp_t credentials[] = {
CREDENTIAL(2F, "JBSWY3DPEHPK3PXP", SHA1, 30), CREDENTIAL(2F, "JBSWY3DPEHPK3PXP", SHA1, 30),
CREDENTIAL(AC, "JBSWY3DPEHPK3PXP", SHA1, 30), CREDENTIAL(AAC, "JBSWY3DPEHPK3PXP", SHA1, 30),
}; };
// END OF KEY DATA. // END OF KEY DATA.
@@ -120,15 +120,14 @@ static void totp_generate(totp_state_t *totp_state) {
} }
static void totp_display_error(totp_state_t *totp_state) { static void totp_display_error(totp_state_t *totp_state) {
char buf[10 + 1];
totp_t *totp = totp_current(totp_state); totp_t *totp = totp_current(totp_state);
watch_clear_display();
snprintf(buf, sizeof(buf), "%c%c ERROR ", totp->labels[0], totp->labels[1]); watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, totp->labels, totp->labels);
watch_display_text(0, buf); watch_display_text(WATCH_POSITION_BOTTOM, "ERROR");
} }
static void totp_display_code(totp_state_t *totp_state) { static void totp_display_code(totp_state_t *totp_state) {
char buf[14]; char buf[7];
div_t result; div_t result;
uint8_t valid_for; uint8_t valid_for;
totp_t *totp = totp_current(totp_state); totp_t *totp = totp_current(totp_state);
@@ -139,9 +138,15 @@ static void totp_display_code(totp_state_t *totp_state) {
totp_state->steps = result.quot; totp_state->steps = result.quot;
} }
valid_for = totp->period - result.rem; valid_for = totp->period - result.rem;
sprintf(buf, "%c%c%2d%06lu", totp->labels[0], totp->labels[1], valid_for, totp_state->current_code);
watch_display_text(0, buf); watch_clear_display();
watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, totp->labels, totp->labels);
sprintf(buf, "%2d", valid_for);
watch_display_text(WATCH_POSITION_TOP_RIGHT, buf);
sprintf(buf, "%06u", totp_state->current_code);
watch_display_text(WATCH_POSITION_BOTTOM, buf);
} }
static void totp_display(totp_state_t *totp_state) { static void totp_display(totp_state_t *totp_state) {
watch-faces/complication/totp_face.h
+3 -2
View File
@@ -55,8 +55,9 @@
* TOTP credentials. The file includes two examples that you can use as a * TOTP credentials. The file includes two examples that you can use as a
* reference. Credentials are added with the `CREDENTIAL` macro in the form * reference. Credentials are added with the `CREDENTIAL` macro in the form
* `CREDENTIAL(label, key, algorithm, timestep)` where: * `CREDENTIAL(label, key, algorithm, timestep)` where:
* o `label` is a 2 character label that is displayed in the weekday digits * o `label` is a 2 or 3 character label that is displayed in the weekday
* to identify the TOTP credential. * digits to identify the TOTP credential (only the first 2 characters
* are displayed on the classic LCD).
* o `key` is a string with the base32 encoded secret. * o `key` is a string with the base32 encoded secret.
* o `algorithm` is one of the supported hashing algorithms listed above. * o `algorithm` is one of the supported hashing algorithms listed above.
* o `timestep` is how often the TOTP refreshes in seconds. This is usually * o `timestep` is how often the TOTP refreshes in seconds. This is usually