Commit Graph
2134 Commits
Author SHA1 Message Date
J. Nick Koston 7edfdf9e65 Merge branch 'integration' into memory_api 2025-11-16 21:00:29 -06:00
J. Nick Koston bbd12609af Merge remote-tracking branch 'upstream/dev' into integration 2025-11-16 21:00:03 -06:00
J. Nick Koston 96ee38759d [web_server.ota] Merge multiple instances to prevent undefined behavior (#11905) 2025-11-17 13:38:52 +13:00
J. Nick Koston 986d3c8f13 [sntp] Merge multiple instances to fix crash and undefined behavior (#11904) 2025-11-17 13:38:38 +13:00
J. Nick Koston c4c1de915a Merge branch 'integration' into memory_api 2025-11-16 15:55:18 -06:00
J. Nick Koston b8c216c646 Merge branch 'dev' into integration 2025-11-16 15:55:11 -06:00
Clyde Stubbs 320120883c [lvgl] Migrate lv_font creation into Font class and optimise (#11915) 2025-11-17 08:47:54 +11:00
J. Nick Koston af58909bd7 Merge branch 'integration' into memory_api 2025-11-16 12:48:04 -06:00
J. Nick Koston 094ed59230 Merge branch 'de_dupe_lam' into integration 2025-11-16 12:47:44 -06:00
J. Nick Koston fd0d1c41b7 Merge branch 'integration' into memory_api 2025-11-16 09:19:04 -06:00
J. Nick Koston d878e9a8f2 Merge remote-tracking branch 'upstream/web_server_shutdown_race_fix' into integration 2025-11-16 09:18:58 -06:00
J. Nick Koston a913e7df33 handles newlines, add test to prove it 2025-11-16 08:16:41 -06:00
J. Nick Koston 6f4042f401 Add tests for sensor timeout filters (#11923) 2025-11-15 22:21:38 -06:00
J. Nick Koston e8e06db260 Merge branch 'integration' into memory_api 2025-11-15 12:26:53 -06:00
J. Nick Koston 219206057f Merge branch 'de_dupe_lam' into integration 2025-11-15 12:26:47 -06:00
J. Nick Koston f6378990cd add tests for crazy edge cases 2025-11-15 12:19:06 -06:00
J. Nick Koston b7d4e01fa2 Merge branch 'integration' into memory_api 2025-11-15 12:07:02 -06:00
J. Nick Koston 25c7be3970 Merge branch 'de_dupe_lam' into integration 2025-11-15 12:06:57 -06:00
J. Nick Koston e9ff4d3c4e handle static 2025-11-15 11:47:35 -06:00
J. Nick Koston 107a0a23b1 Merge branch 'de_dupe_lam' into integration 2025-11-15 10:43:08 -06:00
J. Nick Koston 4081345013 address bot review 2025-11-15 10:42:57 -06:00
J. Nick Koston 3dd570fdd0 address bot review 2025-11-15 10:42:44 -06:00
J. Nick Koston 04f445dfaf Merge branch 'integration' into memory_api 2025-11-15 10:27:05 -06:00
J. Nick Koston 82d04c1548 Merge branch 'de_dupe_lam' into integration 2025-11-15 10:26:48 -06:00
J. Nick Koston 5989b78e93 preen 2025-11-15 10:25:57 -06:00
J. Nick Koston 5727043cec preen 2025-11-15 10:24:38 -06:00
J. Nick Koston 1441c7fab2 preen 2025-11-15 10:21:58 -06:00
J. Nick Koston 62248b6bba rpeen 2025-11-15 10:20:53 -06:00
J. Nick Koston 86833cbc3c rpeen 2025-11-15 10:20:40 -06:00
J. Nick Koston 6067ca36f7 Merge branch 'integration' into memory_api 2025-11-15 10:15:47 -06:00
J. Nick Koston a98d2fa266 Merge branch 'de_dupe_lam' into integration 2025-11-15 10:15:40 -06:00
J. Nick Koston 6ade327cde update tests 2025-11-15 10:05:27 -06:00
J. Nick Koston b890f097cf Merge branch 'integration' into memory_api 2025-11-14 09:03:31 -06:00
J. Nick Koston 5af5a86970 Merge branch 'sntp_single_instance' into integration 2025-11-14 09:02:00 -06:00
J. Nick Koston 3de847014b Merge branch 'webserver_ota_single_instance' into integration 2025-11-14 09:01:56 -06:00
J. Nick Koston 5f10fbc4f6 [web_server.ota] Merge multiple instances to prevent undefined behavior 2025-11-14 08:59:05 -06:00
J. Nick Koston e8f2e91db3 [sntp] Merge multiple instances to fix crash and undefined behavior 2025-11-14 08:47:15 -06:00
J. Nick Koston 6370132cbb Merge branch 'integration' into memory_api 2025-11-13 12:38:14 -06:00
J. Nick Koston 3c0969d8a4 Merge branch 'template_alarm_control_panel_only_iterates' into integration 2025-11-13 12:38:08 -06:00
J. Nick Koston 1f408ce41c [template.alarm_control_panel] Use FixedVector for iteration-only sensor storage 2025-11-13 12:35:43 -06:00
J. Nick Koston e1ed7f7fd0 Merge branch 'integration' into memory_api 2025-11-13 11:55:47 -06:00
J. Nick Koston 79b97452b7 Merge remote-tracking branch 'upstream/dev' into integration 2025-11-13 11:55:39 -06:00
Clyde StubbsandJonathan Swoboda 0afcf67c32 [esp32] Add sdkconfig flag to make OTA work for 32MB flash (#11883)
Co-authored-by: Jonathan Swoboda <154711427+swoboda1337@users.noreply.github.com>
2025-11-13 10:52:08 -05:00
J. Nick Koston 47a3e5e78b Merge branch 'integration' into memory_api 2025-11-12 20:09:05 -06:00
J. Nick Koston f196b1c867 Merge remote-tracking branch 'upstream/dev' into integration 2025-11-12 20:08:51 -06:00
tomaszduda23 d869108416 [nrf52] add settings for dcdc converter (#11841) 2025-11-12 20:06:20 -06:00
J. Nick KostonandCopilot 769137fc09 [mqtt] Fix crash with empty broker during upload/logs (#11866)
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-11-13 13:40:26 +13:00
J. Nick Koston 3a5b3ad77d [thermostat] Replace std::map with FixedVector, reduce flash usage (#11875) 2025-11-12 17:55:06 -06:00
J. Nick Koston 9a2574a2fe Merge branch 'integration' into memory_api 2025-11-12 14:56:02 -06:00
J. Nick Koston 72513897cc Merge branch 'thermostat_storage' into integration 2025-11-12 14:55:55 -06:00