Some Custom Improvements. #287

crossplatformdev · 2025-12-05T06:53:05Z

This pull request introduces significant improvements to timezone handling and display refresh logic, as well as some refactoring for the display border logic. The main changes include adding support for selecting GMT-based timezones, updating the UI and logic to allow users to set and display the timezone, and ensuring consistent use of full display refreshes. Additionally, the handling of the display border has been clarified and improved with new getter/setter methods.

Timezone support and selection:

Added a new TimezonesGMT.h file, which defines a list of GMT-based timezones, their offsets, and related configuration logic. This enables users to select from a wide range of timezones or specify a location-based override.
Modified the time-setting UI (setTime) to allow users to cycle through and select timezones, display the current GMT offset, and update the environment timezone accordingly. The timezone is now stored and used throughout the system, including for NTP synchronization. [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11]

Display refresh consistency:

Updated multiple UI methods to always use a full refresh (display.display(true)) instead of a partial or conditional refresh. This ensures consistent and correct updates to the e-paper display for all major UI actions, such as menus, about screens, firmware updates, and WiFi configuration. [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12]

Display border logic improvements:

Refactored the display border logic by separating the drawing and setting of the dark border. Added drawDarkBorder, setDarkBorder, and isDarkBorder methods to clarify intent and improve maintainability. The default value for darkBorder was also changed to true. [1] [2] [3]

Other notable changes:

Updated logic to always show the watch face and menus with a full refresh in response to button presses and state changes, ensuring UI consistency. [1] [2] [3] [4] [5]
Improved handling of year values and NTP synchronization to be compatible with the new timezone infrastructure. [1] [2] [3] [4]

These changes together make the system more robust, user-friendly, and maintainable, especially regarding timezone management and display behavior.

…ime.

Update

Copilot

Pull request overview

This pull request introduces comprehensive timezone support with GMT-based timezone selection, refactors display refresh logic for consistency, and improves display border handling. The changes enable users to select from 28 GMT-based timezones or configure location-based timezones with daylight saving time support.

Key changes:

Added new timezone infrastructure with GMT offset arrays and selection UI, allowing users to cycle through timezones during time setup
Standardized all menu and UI operations to use full display refresh (display.display(true)) instead of partial refreshes
Refactored display border logic with new getter/setter methods and changed the default border to dark mode

Reviewed changes

Copilot reviewed 7 out of 7 changed files in this pull request and generated 19 comments.

Show a summary per file

File	Description
src/TimezonesGMT.h	New file defining 28 GMT-based timezones with offsets and configuration for location-based timezone override
src/config.h	Added SET_TZ constant and renumbered time-setting indices to accommodate timezone selection
src/Watchy32KRTC.cpp	Updated RTC initialization to apply timezone settings from TimezonesGMT.h configuration
src/Watchy.h	Changed gmtOffset type from int to long to support larger offset values and included TimezonesGMT.h
src/Watchy.cpp	Added timezone selection UI in setTime(), standardized display refresh calls to full refresh, added forced weather update on WiFi setup, and updated NTP sync to use gmtOffset
src/Display.h	Added drawDarkBorder() and isDarkBorder() methods, changed darkBorder default to true
src/Display.cpp	Separated border drawing from border setting logic with new drawDarkBorder() method and clearer documentation

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2025-12-05T06:58:56Z

src/TimezonesGMT.h

+// This file is used to set up GMT based timezones.
+
+// You don't need to change anything here to be able to set up GMT based time.
+// If you set TIMEZONES_NON_GMT_OVERRIDE to 1 (as for get summer time and leaps),


Typo in comment: "get summer time" should be "to get summer time". The comment should read "If you set TIMEZONES_NON_GMT_OVERRIDE to 1 (as to get summer time and leaps),".

Suggested change

// If you set TIMEZONES_NON_GMT_OVERRIDE to 1 (as for get summer time and leaps),

// If you set TIMEZONES_NON_GMT_OVERRIDE to 1 (as to get summer time and leaps),

Copilot · 2025-12-05T06:58:56Z

src/Watchy.cpp

+  if(TIMEZONES_NON_GMT_OVERRIDE == 0){
+    setenv("TZ", timeZones[tzIndex].timezone, 1);
+  } else{
+    #if TIMEZONES_NON_GMT_OVERRIDE == 1
+    setenv("TZ", tz_override.timezone, 1);
+    #else
+    setenv("TZ", timeZones[TIMEZONES_SELECTED].timezone, 1);
+    #endif
+  }


The logic for applying timezone settings is inconsistent. When TIMEZONES_NON_GMT_OVERRIDE is 1, the code uses tz_override, but when it's any other non-zero value (line 11-12), the code sets "GMT0". However, in the else branch here (line 621-627), when TIMEZONES_NON_GMT_OVERRIDE is not 0, it conditionally checks if it equals 1, otherwise it uses TIMEZONES_SELECTED. This creates inconsistent behavior between initialization and setTime. The init() function should match the logic here for consistency.

Copilot · 2025-12-05T06:58:56Z

src/Watchy.cpp

-    #endif    
-    gmtOffset = settings.gmtOffset;
+    #endif  
+    gmtOffset = settings.gmtOffset;  


[nitpick] Trailing whitespace on this line. Remove the spaces after gmtOffset = settings.gmtOffset;.

Suggested change

gmtOffset = settings.gmtOffset;

gmtOffset = settings.gmtOffset;

Copilot · 2025-12-05T06:58:57Z

src/Watchy.cpp

  RTC.set(tm);
-
-  showMenu(menuIndex, false);
+  


[nitpick] Trailing whitespace on line 632. Remove the spaces after the semicolon.

Suggested change

;

Copilot · 2025-12-05T06:58:57Z

src/TimezonesGMT.h

+};
+
+static long OFFSETS_SEC[] = {
+  0, 3600, 7200, 10800, 14400, 18000, 21600, 25200, 28800, 32400, 36000, 39600, 43200, 0, -3600, -7200, -10800, -14400, -18000, -21600, -25200, -28800, -32400, -36000, -39600, -43200, -46800, -50400


The OFFSETS_SEC array has incorrect signs for all timezone offsets. In POSIX notation, "Etc/GMT+N" represents a timezone N hours behind UTC (i.e., UTC-N), so it needs a negative offset. Conversely, "Etc/GMT-N" is UTC+N and needs a positive offset. Currently, all the signs are inverted. For example, index 1 is "Etc/GMT+1" (UTC-1) but has offset 3600 when it should be -3600. Index 14 is "Etc/GMT-1" (UTC+1) but has offset -3600 when it should be 3600. All non-zero offset values need their signs flipped.

Suggested change

0, 3600, 7200, 10800, 14400, 18000, 21600, 25200, 28800, 32400, 36000, 39600, 43200, 0, -3600, -7200, -10800, -14400, -18000, -21600, -25200, -28800, -32400, -36000, -39600, -43200, -46800, -50400

0, -3600, -7200, -10800, -14400, -18000, -21600, -25200, -28800, -32400, -36000, -39600, -43200, 0, 3600, 7200, 10800, 14400, 18000, 21600, 25200, 28800, 32400, 36000, 39600, 43200, 46800, 50400

Copilot · 2025-12-05T06:59:00Z

src/Watchy.cpp

      display.setTextColor(blink ? GxEPD_WHITE : GxEPD_BLACK);
    }
-    display.print(2000 + year);
+    display.print(year);


The commented-out year conversion functions (tmYearToY2k and y2kYearToTm) suggest uncertainty about the correct year format. The change from 2000 + year (line 580 vs old line) to just year means the display now shows raw year values (0-99) instead of full years (2000-2099). This is likely incorrect and confusing to users. Either uncomment the conversion functions or update the display logic to show 2000 + year for a proper 4-digit year display.

Suggested change

display.print(year);

display.print(2000 + year);

Copilot · 2025-12-05T06:59:01Z

src/Watchy.cpp

    USB_PLUGGED_IN = (digitalRead(USB_DET_PIN) == 1);
-    #endif    
-    gmtOffset = settings.gmtOffset;
+    #endif  


[nitpick] Trailing whitespace on this line. Remove the spaces after #endif.

Suggested change

#endif

#endif

Copilot · 2025-12-05T06:59:01Z

src/Watchy.cpp

    }

+
+    gmt = OFFSETS_SEC[tzIndex] / 3600; 


[nitpick] Trailing whitespace on line 534. Remove the spaces after the semicolon.

Suggested change

gmt = OFFSETS_SEC[tzIndex] / 3600;

gmt = OFFSETS_SEC[tzIndex] / 3600;

Copilot · 2025-12-05T06:59:01Z

src/Watchy.cpp

+  }

+  tzset();
+


[nitpick] Trailing whitespace on line 630. Remove the spaces after tzset();.

Suggested change

Copilot · 2025-12-05T06:59:02Z

src/Watchy32KRTC.cpp

+  } else if (TIMEZONES_NON_GMT_OVERRIDE == 1) {
+    setenv("TZ", tz_override.timezone, 1);
+  } else {
+    setenv("TZ", "GMT0", 1);  


[nitpick] Trailing whitespace on line 12. Remove the spaces after setenv("TZ", "GMT0", 1);.

Suggested change

setenv("TZ", "GMT0", 1);

setenv("TZ", "GMT0", 1);

crossplatformdev and others added 9 commits July 5, 2024 19:21

Just one update on render for everything.

2b16794

Added functions get and is for darkMode

4aecc15

Merge branch 'sqfmi:master' into custom

992df52

Merge branch 'sqfmi:master' into custom

e32eb01

Set GMT timezone in run time and location based timezone in compile t…

a9a7169

…ime.

Formatting and some better management of timezones array

f63f561

Make gmtOffset effectively displayed.

ddf69e7

Merge branch 'sqfmi:master' into custom

4d92e75

Merge pull request #16 from sqfmi/master

6878356

Update

Copilot AI review requested due to automatic review settings December 5, 2025 06:53

Copilot started reviewing on behalf of crossplatformdev December 5, 2025 06:53 View session

crossplatformdev changed the title ~~Custom~~ Some Custom Improvements. Dec 5, 2025

Copilot finished reviewing on behalf of crossplatformdev December 5, 2025 06:56

Copilot AI reviewed Dec 5, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Some Custom Improvements. #287

Some Custom Improvements. #287

Uh oh!

crossplatformdev commented Dec 5, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Dec 5, 2025

Uh oh!

Copilot AI Dec 5, 2025

Uh oh!

Copilot AI Dec 5, 2025

Uh oh!

Copilot AI Dec 5, 2025

Uh oh!

Copilot AI Dec 5, 2025

Uh oh!

Copilot AI Dec 5, 2025

Uh oh!

Copilot AI Dec 5, 2025

Uh oh!

Copilot AI Dec 5, 2025

Uh oh!

Copilot AI Dec 5, 2025

Uh oh!

Copilot AI Dec 5, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

	// If you set TIMEZONES_NON_GMT_OVERRIDE to 1 (as for get summer time and leaps),
	// If you set TIMEZONES_NON_GMT_OVERRIDE to 1 (as to get summer time and leaps),

	gmtOffset = settings.gmtOffset;
	gmtOffset = settings.gmtOffset;

	0, 3600, 7200, 10800, 14400, 18000, 21600, 25200, 28800, 32400, 36000, 39600, 43200, 0, -3600, -7200, -10800, -14400, -18000, -21600, -25200, -28800, -32400, -36000, -39600, -43200, -46800, -50400
	0, -3600, -7200, -10800, -14400, -18000, -21600, -25200, -28800, -32400, -36000, -39600, -43200, 0, 3600, 7200, 10800, 14400, 18000, 21600, 25200, 28800, 32400, 36000, 39600, 43200, 46800, 50400

	gmt = OFFSETS_SEC[tzIndex] / 3600;
	gmt = OFFSETS_SEC[tzIndex] / 3600;

Some Custom Improvements. #287

Are you sure you want to change the base?

Some Custom Improvements. #287

Uh oh!

Conversation

crossplatformdev commented Dec 5, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Dec 5, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 5, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 5, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 5, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 5, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 5, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 5, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 5, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 5, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 5, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant