Merge branch 'main' into preferences_in_config

diff --cc movement/movement.c
index f7c522e745284e322854d61980d98a41be3508ac,d780a2f3781f43ea9712605ffe31c103a8a48839..50f5f0fe54dcc5d9543d1aab8700ac464af3fea8
--- 1/movement/movement.c
--- 2/movement/movement.c
+++ b/movement/movement.c
@@@ -69,31 -69,6 +69,31 @@@
  #define MOVEMENT_DEFAULT_GREEN_COLOR 0xF
  #endif
  
- // Default to switch to low energy mode after 1 hour
 +// Default to 12h mode
 +#ifndef MOVEMENT_DEFAULT_24H_MODE
 +#define MOVEMENT_DEFAULT_24H_MODE false
 +#endif
 +
 +// Default to mode button sounding on press
 +#ifndef MOVEMENT_DEFAULT_BUTTON_SOUND
 +#define MOVEMENT_DEFAULT_BUTTON_SOUND true
 +#endif
 +
 +// Default to switch back to main watch face after 60 seconds
 +#ifndef MOVEMENT_DEFAULT_TIMEOUT_INTERVAL
 +#define MOVEMENT_DEFAULT_TIMEOUT_INTERVAL 0
 +#endif
 +
- #define MOVEMENT_DEFAULT_LOW_ENERGY_INTERVAL 1
++// Default to switch to low energy mode after 2 hours
 +#ifndef MOVEMENT_DEFAULT_LOW_ENERGY_INTERVAL
++#define MOVEMENT_DEFAULT_LOW_ENERGY_INTERVAL 2
 +#endif
 +
 +// Default to 1 second led duration
 +#ifndef MOVEMENT_DEFAULT_LED_DURATION
 +#define MOVEMENT_DEFAULT_LED_DURATION 1
 +#endif
 +
  #if __EMSCRIPTEN__
  #include <emscripten.h>
  #endif

diff --cc movement/movement_config.h
index 3ce27ea69e7252bbd8fb8d8babb2553dbb7f95b1,067ca44b2ec4adb0f900d425fe32c6147ebf12ca..10a30af77309f73dea3cd43ed8bc2870e2c0b583
--- 1/movement/movement_config.h
--- 2/movement/movement_config.h
+++ b/movement/movement_config.h
@@@ -49,50 -49,7 +49,50 @@@ const watch_face_t watch_faces[] = 
   */
  #define MOVEMENT_SECONDARY_FACE_INDEX (MOVEMENT_NUM_FACES - 2) // or (0)
  
- /* Custom hourly chime tune. Check movement_custom_signal_tunes.h for options */
+ /* Custom hourly chime tune. Check movement_custom_signal_tunes.h for options. */
  #define SIGNAL_TUNE_DEFAULT
  
 +/* Determines the intensity of the led colors
 + * Set a hex value 0-15 with 0x0 being off and 0xF being max intensity
 + */
 +#define MOVEMENT_DEFAULT_GREEN_COLOR 0xF
 +#define MOVEMENT_DEFAULT_RED_COLOR 0x0
 +
 +/* Set to true for 24h mode or false for 12h mode */
 +#define MOVEMENT_DEFAULT_24H_MODE false
 +
 +/* Enable or disable the sound on mode button press */
 +#define MOVEMENT_DEFAULT_BUTTON_SOUND true
 +
 +/* Set the timeout before switching back to the main watch face
 + * Valid values are:
 + * 0: 60 seconds
 + * 1: 2 minutes
 + * 2: 5 minutes
 + * 3: 30 minutes
 + */
 +#define MOVEMENT_DEFAULT_TIMEOUT_INTERVAL 0
 +
 +/* Set the timeout before switching to low energy mode
 + * Valid values are:
 + * 0: Never
 + * 1: 1 hour
 + * 2: 2 hours
 + * 3: 6 hours
 + * 4: 12 hours
 + * 5: 1 day
 + * 6: 2 days
 + * 7: 7 days
 + */
 +#define MOVEMENT_DEFAULT_LOW_ENERGY_INTERVAL 1
 +
 +/* Set the led duration
 + * Valid values are:
 + * 0: No LED
 + * 1: 1 second
 + * 2: 3 seconds
 + * 3: 5 seconds
 + */
 +#define MOVEMENT_DEFAULT_LED_DURATION 1
 +
  #endif // MOVEMENT_CONFIG_H_