Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed internal macro APP_SLEEP to TASMOTA_SLEEP to specify default sleep in ms #21324

Merged
merged 1 commit into from
May 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ All notable changes to this project will be documented in this file.
- HDMI CEC synchronously sends messages
- Zigbee startup event triggered after plugins are loaded
- Reduced safeboot size by 2.9KB
- Changed internal macro `APP_SLEEP` to `TASMOTA_SLEEP` to specify default sleep in ms

### Fixed
- HASPmota `align` attribute and expand PNG cache
Expand Down
3 changes: 0 additions & 3 deletions tasmota/include/tasmota_configurations.h
Original file line number Diff line number Diff line change
Expand Up @@ -694,9 +694,6 @@
#define CODE_IMAGE_STR "lite"
#endif

#undef APP_SLEEP
#define APP_SLEEP 1 // Default to sleep = 1 for FIRMWARE_LITE

#undef USE_ARDUINO_OTA // Disable support for Arduino OTA
#undef USE_DOMOTICZ // Disable Domoticz
#undef USE_HOME_ASSISTANT // Disable Home Assistant
Expand Down
2 changes: 1 addition & 1 deletion tasmota/my_user_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ An online tool to calculate TLS fingerprints is available here at:\n\
#define APP_BISTABLE_PULSE 40 // [SetOption45] Pulse time in ms for two coil bistable latching relays

#define APP_NORMAL_SLEEP false // [SetOption60] Enable normal sleep instead of dynamic sleep
#define APP_SLEEP 0 // [Sleep] Sleep time to lower energy consumption (0 = Off, 1 - 250 mSec),
#define TASMOTA_SLEEP 50 // [Sleep] Sleep time to lower energy consumption (0 = Off, value in milliseconds),
#define PWM_MAX_SLEEP 10 // Sleep will be lowered to this value when light is on, to avoid flickering, and when buzzer is on for better on/off period accuracy

#define KEY_DEBOUNCE_TIME 50 // [ButtonDebounce] Number of mSeconds button press debounce time
Expand Down
5 changes: 1 addition & 4 deletions tasmota/tasmota_support/settings.ino
Original file line number Diff line number Diff line change
Expand Up @@ -995,10 +995,7 @@ void SettingsDefaultSet2(void) {
Settings->param[P_BOOT_LOOP_OFFSET] = BOOT_LOOP_OFFSET; // SetOption36
Settings->param[P_RGB_REMAP] = RGB_REMAP_RGBW;
#endif // FIRMWARE_MINIMAL
Settings->sleep = APP_SLEEP;
if (Settings->sleep < 50) {
Settings->sleep = 50; // Default to 50 for sleep, for now
}
Settings->sleep = TASMOTA_SLEEP;
Settings->battery_level_percent = 101;

// Module
Expand Down