Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:J-A-A-M/ukraine_alarm_map into d…
Browse files Browse the repository at this point in the history
…evelop
  • Loading branch information
Foroxon committed Dec 24, 2024
2 parents 1eb21e8 + 455754f commit 0f8e880
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 3 deletions.
Binary file added bin_beta/4.0-b80.bin
Binary file not shown.
2 changes: 1 addition & 1 deletion firmware/src/JaamFirmware.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1907,7 +1907,7 @@ void handleBrightness(AsyncWebServerRequest* request) {
if (isServiceStripEnabled()) {
addSlider(response, "brightness_service", "Сервісні LED", settings.brightness_service, 0, 100, 1, "%");
}
addSlider(response, "light_sensor_factor", "Коефіцієнт чутливості сенсора освітлення", settings.light_sensor_factor, 0.1f, 10.0f, 0.1f);
addSlider(response, "light_sensor_factor", "Коефіцієнт чутливості сенсора освітлення", settings.light_sensor_factor, 0.1f, 30.0f, 0.1f);
response->println("<p class='text-info'>Детальніше на <a href='https://github.com/v00g100skr/ukraine_alarm_map/wiki/%D0%A1%D0%B5%D0%BD%D1%81%D0%BE%D1%80-%D0%BE%D1%81%D0%B2%D1%96%D1%82%D0%BB%D0%B5%D0%BD%D0%BD%D1%8F'>Wiki</a>.</p>");
response->println("<button type='submit' class='btn btn-info'>Зберегти налаштування</button>");
response->println("</div>");
Expand Down
Binary file modified flasher/bins/jaam_beta.bin
Binary file not shown.
2 changes: 1 addition & 1 deletion flasher/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ <h2 class='text-center'>JAAM Flasher</h2>
</div>
</esp-web-install-button>
<esp-web-install-button manifest="manifest-beta.json">
<button class='btn btn-info' type='button' aria-expanded='false' slot="activate">Встановити JAAM 4.0 Beta 79</button>
<button class='btn btn-info' type='button' aria-expanded='false' slot="activate">Встановити JAAM 4.0 Beta 80</button>
<span slot="unsupported"></span>
<span slot="not-allowed"></span>
</esp-web-install-button>
Expand Down
2 changes: 1 addition & 1 deletion flasher/manifest-beta.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "JAAM Beta",
"version": "4.0-b79",
"version": "4.0-b80",
"funding_url": "https://send.monobank.ua/jar/7GzS1PhPa2",
"new_install_improv_wait_time": 0,
"new_install_prompt_erase": true,
Expand Down

0 comments on commit 0f8e880

Please sign in to comment.