Commit Graph

2749 Commits

Author SHA1 Message Date
Blaz Kristan
4374930065 npm build 2023-05-30 16:18:11 +02:00
Blaz Kristan
9f3520cba5 Update comments. 2023-05-30 16:09:51 +02:00
Blaz Kristan
d20cdc099d Merge branch 'main' into feature 2023-05-30 15:55:39 +02:00
Blaž Kristan
926e9ff3de
Merge pull request #3171 from Aircoookie/seg-groups
Add support for segment sets (groups of segments)
2023-05-30 15:53:39 +02:00
Frank
70c277d8a1
bugfix: don't hide sound sim options for "double note" effects
There was is a typo in this line - apparently the "\u" was missing, so the search string was interpreted as octal char instead of unicode.
2023-05-30 13:23:26 +02:00
Blaz Kristan
0a5aac724a Merge branch 'main' into seg-groups 2023-05-29 21:35:52 +02:00
Christian Schwinne
bb91d5495f
Merge branch 'main' into feature 2023-05-29 21:31:40 +02:00
Blaz Kristan
995d94c124 Repeat segment button fix 2023-05-29 21:23:11 +02:00
Aircoookie
ee7036f13d CSS tweaks
Fix repeat segment button remaining hidden
Fix third segment row (offset) alignment in 1D mode
Keep disabled sound simulation modes as comment for reference
New local var for 2D seg UI, improves code legibility
2023-05-29 21:06:10 +02:00
Blaz Kristan
5a8a8dc292 Feature implementation
- #2236
  - #1984
Better PSRAM handling
platformio.ini update
On/Off bus handling
2023-05-28 22:50:19 +02:00
coral
7d84de6690
Fix errors in DDP implementation (#3193)
* fix DDP spec

* Adjust DDP type byte to latest spec

Allow receiving of RGBW DDP with either old or new bits per channel value

---------

Co-authored-by: Aircoookie <21045690+Aircoookie@users.noreply.github.com>
2023-05-26 14:58:40 +02:00
Blaz Kristan
56a3bff42e Multi-packet MQTT fix.
Solves #3205
2023-05-23 18:37:24 +02:00
Blaz Kristan
bffeec1615 Remove PSRAM use from global LED buffer. 2023-05-21 18:37:18 +02:00
Frank
e4a9f115cb fx functions: avoid memory corruption
* PSRAM_Allocator was missing the "reallocate" method, which lead to undefined behaviour when dynamic JSON doc needed to grow/shrink
* Segment::setUpLeds() quickfix for length() == 0 (should not happen, but it did happen for me once)
* leds in PSRAM causes major slowdown on wrover boards - disabled.
2023-05-21 14:33:25 +02:00
Frank
a717238f76 espalexa robustness improvements
* prevent string buffer overflows (stack corruption)
* avoid division by zero (program might crash)
* avoid log(0) which is undefined, too
* use faster math routines for float (logf, powf)
2023-05-21 13:21:38 +02:00
Blaz Kristan
4a567ab97c Merge branch 'main' into seg-groups 2023-05-15 17:06:38 +02:00
Blaz Kristan
90431b662b Rename "group" to "set" 2023-05-15 17:06:29 +02:00
Blaz Kristan
1c8f349a62 Bugfix.
- prevent LED flash on realtime end
2023-05-14 20:30:57 +02:00
Blaz Kristan
217004c70c Bugfix.
- disbled transitions/crossfade prevented segment off
2023-05-14 18:18:09 +02:00
Blaž Kristan
a75608628e
Merge pull request #3199 from Aircoookie/serg-eth
Serg74 ethernet board.
2023-05-13 15:29:13 +02:00
Blaž Kristan
33130f39ee
Merge pull request #3190 from Aircoookie/octopus
Octopus & Waving Cell 2D effects
2023-05-13 15:27:16 +02:00
Blaz Kristan
cae43e97cd Corner fix 2023-05-13 15:17:49 +02:00
Blaz Kristan
16b66afa7a Octopus offset 2023-05-10 21:06:48 +02:00
Frank
9e446210fb
refresh build number 2023-05-09 17:57:17 +02:00
Frank
b0118d2d57 use size_t as file index type (might prevent corruption)
* use size_t instead of uint16_t -> prevents random behaviour (corruption) in case that JSON files get larger than 64Kbytes.
* use a constant for max large file space (was UINT16_MAX)
* reduced the scope of some functions and variables to "static" - avoids name clashes and may support better optimization by the compiler
2023-05-09 17:44:26 +02:00
Blaz Kristan
b47c12cbee Serg74 ethernet board. 2023-05-08 08:48:52 +02:00
Blaz Kristan
cd6862b1a7 Merge branch 'main' into octopus 2023-05-06 12:56:35 +02:00
Blaz Kristan
3d9160f2fa Merge branch 'main' into seg-groups 2023-05-05 23:01:17 +02:00
Blaz Kristan
f4972e2be2 Code size reduction.
Save in hex notation.
2023-05-05 22:37:47 +02:00
Blaz Kristan
85c8e6ba42 Merge branch 'main' into cpal 2023-05-05 21:35:18 +02:00
Blaž Kristan
8e79bd8785
Merge pull request #3162 from wled-install/main
Add LAN8720 reset and new ethernet board
2023-05-05 21:32:06 +02:00
Frank
1ace7ce254
Merge pull request #3194 from billythekid/patch-1
Update palettes.h (typo in a comment)
2023-05-05 20:08:09 +02:00
Blaz Kristan
a00be5b60c Improved Tartan FX 2023-05-03 21:43:21 +02:00
Billy
aabe8d1d5e
Update palettes.h
just a typo-fix
2023-05-02 21:52:39 +01:00
Blaz Kristan
3da086438b Add rotating to Octopus
Soap optimization
2023-05-02 11:16:24 +02:00
Blaz Kristan
c257c86387 Fix for mirroring 2023-05-01 20:43:03 +02:00
Blaz Kristan
ff3ae14c29 Merge branch 'main' into octopus 2023-05-01 19:23:12 +02:00
Blaz Kristan
baacd55910 Minor UI fix 2023-05-01 14:17:52 +02:00
Blaž Kristan
511b7c4d92
Merge pull request #3142 from xxv/xxv/dancing-shadows-default-color
Set Dancing Shadows default palette to Party
2023-04-30 18:43:04 +02:00
Blaz Kristan
f38851b7c6 Merge branch 'main' into cpal 2023-04-30 17:52:28 +02:00
Blaz Kristan
432c5837f0 Bugfix
- WiFi power for Lolin S2 & C3 (use -DLOLIN_WIFI_FIX)
- web response buffer size (corruption when websockets not used)
2023-04-30 17:30:36 +02:00
Blaz Kristan
cc599f544a Tweak in Soap. 2023-04-30 13:28:04 +02:00
Blaz Kristan
e886c85134 Tweaks. 2023-04-30 13:25:08 +02:00
Blaz Kristan
05eb716b85 Noise array bugfix.
Fire2012 tweak.
2023-04-30 13:22:42 +02:00
Blaz Kristan
61eb7b0a6a Waving Cell FX 2023-04-29 17:04:16 +02:00
Blaz Kristan
f0dade5856 Uneven matrix fix. 2023-04-29 15:51:25 +02:00
Henrik
8567f6b13c Ability to use static palettes as templates 2023-04-29 13:28:45 +02:00
Blaz Kristan
b740316918 Soap fix 2023-04-29 11:11:03 +02:00
Blaz Kristan
2119d08543 Octopus 2D effect
- by Stepko
2023-04-28 22:00:35 +02:00
wled-install
599ff66522
Add files via upload 2023-04-28 17:15:31 +02:00
wled-install
6d2eb04ada
Add files via upload 2023-04-28 17:13:50 +02:00
Blaz Kristan
0aea75edb7 NeoPixelBus 2.7.5
UI bugfix
2023-04-28 16:52:48 +02:00
Mattstir
2ca8231ab4
Improve indent (#3118)
* Improve indent

Improve indent, so its more allignend and correctly indented according to logic groups

* Spaces to tabs

---------

Co-authored-by: cschwinne <dev.aircoookie@gmail.com>
2023-04-28 01:40:51 +02:00
Blaž Kristan
e00116551c
Add Ucs890x support and swaps NeoPixelBrightnessBus with NeoPixelBusLg (#3091)
* Add UCS890x support.

* Fixes

* Update NeoPixelBus to 2.7.3 for UCS8904 support.
Update ESP8266 core to 4.1.0

* ESP8266 compile fixes.
- use PlatformIO framework and toolchain
- add compiler warning suppression
- remove IRAM_ATTR to fit in IRAM

* Replace NeoPixelBrightnessBus with NeoPixelBusLg
Resolves #3087

* Update to NPB 2.7.4

* Internal NPB color conversions.

* Fix errors due to merge with SPI Hz methods

Regenerate settings page HTML

---------

Co-authored-by: Christian Schwinne <dev.aircoookie@gmail.com>
2023-04-28 01:28:57 +02:00
cschwinne
4d55e05b07 Fix CI properly
Small 2D Soap FX optimizations
2023-04-28 00:51:34 +02:00
Blaž Kristan
9ff3f85432
Allow SPI clock speed selection. (#3173)
* Allow SPI clock speed selection.

* Bump NPB to 2.7.4
2023-04-28 00:27:19 +02:00
Blaz Kristan
65c584aeda 2D enhancement (internal)
- move() wrapping
- dual addPixelColorXY()
2023-04-27 17:31:55 +02:00
Blaž Kristan
2540a2dfd9
Soap, new 2D effect (#3184)
* Soap, new 2D effect

* Fix Soap FX on matrices with edges < 8 LEDs

* Add palette support to Soap FX

---------

Co-authored-by: cschwinne <dev.aircoookie@gmail.com>
2023-04-27 01:22:33 +02:00
Blaz Kristan
70e9187bcb Merge branch 'main' into seg-groups 2023-04-26 19:50:22 +02:00
Blaz Kristan
5e2fa13471 Bugfix.
- allow saving of reboot preset
- return Spread slider
2023-04-26 19:47:12 +02:00
Blaž Kristan
4f8610f895
Merge pull request #3134 from strikeout/DMX_MODE_PRESET_FIX
Fixes DMX_MODE_PRESET preset and brightness selection via DMX controller
2023-04-26 19:30:14 +02:00
Blaz Kristan
95f9e97af8 typeOf bugfix 2023-04-26 14:45:39 +02:00
Marcos Castro
695b073080
Apply correct iOS scroll to all tabcontent (#3182) 2023-04-26 10:53:49 +02:00
Blaz Kristan
a6052d7900 Update info text. 2023-04-25 14:27:33 +02:00
Blaz Kristan
e42836b07f Allow hex strings for palette 2023-04-25 13:02:09 +02:00
Henrik
16373919d4 Removed as requested 2023-04-23 21:36:19 +02:00
Henrik
92f9c908f6 Custom palettes now editable 2023-04-23 21:32:52 +02:00
Henrik
480e1e17c8 Error on missing css file 2023-04-23 11:40:07 +02:00
Blaz Kristan
274f5f2f1f Bugfix. 2023-04-22 16:06:13 +02:00
Blaz Kristan
02d4f9cbba Merge branch 'main' into seg-groups 2023-04-20 17:21:20 +02:00
Blaz Kristan
d10daf0991 Bugfix
- skip regular button handling while waiting for analog read
2023-04-17 16:25:05 +02:00
Blaz Kristan
8c9656b799 Cleanup. Return after upload. 2023-04-14 18:33:03 +02:00
Blaz Kristan
396ea3d0ee Add webserver cpal support 2023-04-14 17:21:07 +02:00
Blaz Kristan
3efee4a855 Merge branch 'main' into cpal 2023-04-14 17:16:20 +02:00
Blaz Kristan
ece6759fa7 UI update. 2023-04-14 17:15:02 +02:00
Frank
246d945f39 another "inner var shadows outer var"
Seems this is not causing bugs, however its still bad style to re-define existing vars in an inner loop. Solved to improve code readability.
2023-04-14 14:13:45 +02:00
Frank
4a3bc486d0 two more "shadowed locals"
In these case, there seem to be no bug, but  simply renaming the "inner" variables improves code readability.
2023-04-14 13:09:25 +02:00
Frank
996d041581 bugfix for art-net transmit
art-net transmit was not sending out LEDs, but only transmitted headers repeatedly (thanks @troyhacks for noticing).

Actually such problems can be found by newer compilers, so i've added the warning option to [esp32_idf_V4].

wled00/udp.cpp: In function 'uint8_t realtimeBroadcast(uint8_t, IPAddress, uint16_t, uint8_t*, uint8_t, bool)':
wled00/udp.cpp:824:40: warning: declaration of 'byte buffer [12]' shadows a parameter [-Wshadow=compatible-local]
         byte buffer[ART_NET_HEADER_SIZE];
                                        ^
wled00/udp.cpp:720:85: note: shadowed declaration is here
 uint8_t realtimeBroadcast(uint8_t type, IPAddress client, uint16_t length, uint8_t *buffer, uint8_t bri, bool isRGBW)  {
2023-04-14 11:39:12 +02:00
Blaz Kristan
7f84b7ab83 Merge branch 'main' into seg-groups 2023-04-12 15:37:56 +02:00
Blaz Kristan
3e26bd6a17 Quick compile fix.
- ESP32 DMA HSPI method in NeoPixelBus requires IDF 4.4.1
2023-04-12 15:35:27 +02:00
Henrik
e964c62907 Fixes 2023-04-12 09:15:38 +02:00
Blaz Kristan
88139d95a7 Build bump. 2023-04-11 21:35:44 +02:00
Blaz Kristan
d77883dd7a Merge branch 'main' into ipad-pcmode 2023-04-11 21:03:09 +02:00
Blaz Kristan
adea7dadec Bugfix.
- top buttons not working on mobile
2023-04-09 23:58:24 +02:00
Blaz Kristan
cf4ce2dc08 Revert float none. 2023-04-09 23:55:53 +02:00
Henrik
e74dfb2ba6 Small adjustments to UI mainly 2023-04-09 16:49:41 +02:00
Henrik
aaea9ff018 Added info on usage of IDs 2023-04-09 14:18:22 +02:00
Blaz Kristan
206b88eba2 Bugfix.
- top buttons not working on mobile
2023-04-09 11:06:42 +02:00
Henrik
8f5373f034 Custom Palette Creator 2023-04-08 20:02:49 +02:00
Blaz Kristan
dfa0a16487 Reduce sound sim options to increase 2D mapping. 2023-04-04 17:16:50 +02:00
Blaz Kristan
8b9f6f49ef Minor CSS tweaks 2023-04-04 15:53:03 +02:00
Blaz Kristan
bcac978810 Merge branch 'main' into seg-groups 2023-04-02 18:17:47 +02:00
Blaz Kristan
503f71f004 Npm run build 2023-04-02 18:07:48 +02:00
Blaz Kristan
4543288ea7 Merge branch 'ipad-pcmode' into seg-groups 2023-04-02 18:05:59 +02:00
Henrik
9307105b3f Redone in Patch-1 2023-04-02 13:52:20 +02:00
Henrik
567daf9946
Merge branch 'Aircoookie:main' into patch-1 2023-04-02 13:35:31 +02:00
Blaz Kristan
558b22c36a POC: Implemented segment groups (4).
Sacrificed 1 bit on sound simulation and 1D to 2D mapping each.
2023-04-01 23:40:43 +02:00
Blaz Kristan
f076dddfe3 Filter updates. 2023-04-01 11:02:49 +02:00
Blaz Kristan
4ec1140cb4 Optimizations & bugfix. 2023-03-31 13:26:03 +02:00
Blaz Kristan
2a5d20058f iPad/tablet with 1024 pixel UI PC mode.
Optimizations.
2023-03-30 21:35:23 +02:00
Blaz Kristan
13678cb8d5 Add adjustable Random Cycle time.
- solves #3147
2023-03-25 21:28:30 +01:00
Christian Schwinne
fb1999c474
Merge pull request #3107 from Aircoookie/onepx-segment
Tweaks & bugfixes.
2023-03-20 23:42:30 +01:00
Steve Pomeroy
2c37961f7b Set Dancing Shadows default palette to Party 2023-03-19 17:37:29 -04:00
Frank
1abc863f82
comment updated
Also "Serial JSON" is not possible when reading from RX pin is disabled.
2023-03-19 15:51:39 +01:00
Frank
c9be03c0bc
typo 2023-03-19 14:48:47 +01:00
Frank
fd89209233 adding WLED_DISABLE_ADALIGHT (issue #3128
This flag disables reading commands from serial interface (RX = gpio 3)

Add -D WLED_DISABLE_ADALIGHT to your custom pio build environment.
2023-03-19 14:42:01 +01:00
Blaz Kristan
11b687cdc2 Float vs. double. 2023-03-19 11:24:59 +01:00
Blaz Kristan
747c920420 Bugfix.
- white overrides & CCT
2023-03-19 11:23:59 +01:00
Blaz Kristan
08e2bfe9a2 Scale 2D peek for large matrices. 2023-03-18 18:22:31 +01:00
strikeout
56a854ec88 limit max. selectable preset ID to 250, according to WLED capabilities 2023-03-17 13:40:21 +01:00
strikeout
de4ff4e58d Fixes preset and brightness selection via DMX controller to DoS WLED, now same packets are discarded 2023-03-16 17:56:29 +01:00
Frank
cded92662f workaround for issue #3128 2023-03-16 13:08:34 +01:00
Blaz Kristan
1bab4d6937 Merge branch 'main' into onepx-segment 2023-03-12 13:14:22 +01:00
Blaz Kristan
d1fed11d0d Fix for #2542.
UI rebuild.
2023-03-12 13:10:40 +01:00
Blaž Kristan
e96053e268
Merge pull request #3121 from troyhacks/2023-03-10-Art-Net_Transmit
Art-Net transmit support for network LEDs
2023-03-11 22:50:07 +01:00
Blaž Kristan
9b98cbb894
PROGMEM for header 2023-03-11 22:35:22 +01:00
Blaž Kristan
349578fb6e
whitespace cleanup 2023-03-11 22:33:06 +01:00
Blaz Kristan
7c186e4fcc Fix for smaller number of pixeld than matrix size. 2023-03-11 15:03:28 +01:00
TroyHacks
a4fcbb9f67 Art-Net transmit support for network LEDs
Like DDP, this allows WLED to address network systems using the Art-Net protocol.

Universe starts at zero, because that's the first universe in Art-Net.

Works with RGB. It's coded to also work with RGBW, but I couldn't find a great place to enable it without mucking with things I don't understand.
2023-03-10 13:29:00 -05:00
Blaz Kristan
763b64cc57 Combat low memory condition on ESP8266. 2023-03-10 15:20:50 +01:00
Blaž Kristan
d57e6c5bf2
Merge pull request #3106 from lost-hope/klipper
Usermod: Klipper percentage
2023-03-10 14:14:31 +01:00
Blaz Kristan
80711cc00a Whitespace. 2023-03-10 14:08:52 +01:00
Blaz Kristan
ddd32bd600 Multiple fixes.
- compiler warning fixes (gcc17)
- revert min heap size to 8k
- fix form submitting in 2D settings
- remove IRAM_ATTR for ESP8266 core 4.1.0
2023-03-05 22:56:14 +01:00
Frank
2713573b9b
Delete wled00.ino.cpp
accident
2023-03-05 22:38:36 +01:00
Frank
cf2e8bbc0b update build nr
and npm run build
2023-03-05 22:35:59 +01:00
Frank
bc56c1a0e1 bugfixes
* xml.cpp: correct type for checkbox global led buffer" (was not shown correctly)
* fx.cpp: 2D floating blobs - correct swapped x/y coordinates (did not render correctly on non-square matrix)
2023-03-05 22:30:08 +01:00
Blaz Kristan
bfbf7af411 Revert palette conditional load.
Playlist load bugfix.
2023-03-03 19:57:09 +01:00
Blaz Kristan
c151221d12 UI fixes & revert forcing ULTRAWHITE for on/off bus
Reduce min heap for 8266
2023-03-02 18:21:55 +01:00
Blaz Kristan
b8489724ef Slider BG fix. 2023-02-28 23:04:12 +01:00
Blaz Kristan
7a2f556682 Bugfix for 1 pixel segment capabilities. 2023-02-28 19:08:41 +01:00
Blaz Kristan
92d883db87 Bugfix for 1D setup.
- incorrcet max segment length calc
2023-02-28 15:25:11 +01:00
lost-hope
cb931d7af0 Merge branch 'main' of https://github.com/Aircoookie/WLED into klipper 2023-02-27 21:21:45 +01:00
Soeren Willrodt
6b54b57cb9
fixing the PR conflict 2023-02-27 21:01:32 +01:00
Blaz Kristan
1ca4348ca0 Add Segment functions hasRGB() and hasWhite()
Makes code cleaner.
2023-02-25 17:58:51 +01:00
Blaz Kristan
3ca7006e3a Tweaks & bugfixes.
One pixel segment handling.
- added 0D FX metadata (1 pixel effects)
- ignore palettes for White only segment
- ignore color for non-RGB & non-White segment (on/off)

Bugfix
- proper auto segment creation
- hide palettes for non RGB segments
- some tweaks for #2984
- force Solid for some FX (causing crash) on 1 pixel segment

UI Optimisations
- slider tooltips
- tiny bit smaller tooltips
- hide segment power if only one segment
- gap between sliders
2023-02-25 09:41:15 +01:00
mx
0d3debf9b9
sACN/E1.31 Port Priority (#3052)
* Added E1.31 port priority handling #768

* Ignore E1.31 data when priority doesn't match #768

* Enable E1.31 priority handling for WLED_ENABLE_DMX

* Only handle e131Priority for P_E131 protocol

* Corrected comments

* Highest priority package first handling

* Removed obsolete code & comments

* Improved comments

* Reduce priority timeout to be uint8_t

* Optimized code & comments

* E1.31: Ignore non-zero start code and preview data
These are not level data, they have other purposes

* Style change cca41508 preview & ignore non-zero start code

---------

Co-authored-by: RichardTea <31507749+RichardTea@users.noreply.github.com>
2023-02-21 17:13:15 +01:00
underritoSR
7f74a4f4b5
removing DLS for CST_TimeZone_GMT-6 (#3082)
* removing DLS for CST_TimeZone_GMT-6

* Adjust Mexico timezone name

---------

Co-authored-by: cschwinne <dev.aircoookie@gmail.com>
2023-02-21 17:09:04 +01:00
Christian Schwinne
220718cb58
Remove Blynk support (#3102)
Change default palette for Railway to Colors 1 and 2
2023-02-21 17:07:32 +01:00
Blaz Kristan
883c0f9dfe Bugfix
- gamma value not showing
2023-02-17 20:36:35 +01:00
Blaz Kristan
3ffc58d442 Bugfix
- segment capabilities on 2D segments and ledmaps
- UI segment update
- auto segment creation 2D + 1D
2023-02-15 20:36:54 +01:00
Blaz Kristan
1bb4b0156f Bugfix 2023-02-14 20:25:26 +01:00
Blaz Kristan
92d2be3f5e Add ledmap names
Bugfix
- reset segments upon 2D ledmap allocation error
- fix invlid 2D segments
2023-02-14 17:11:58 +01:00
Blaž Kristan
a7cded21f7 Merge branch 'main' into led-gaps 2023-02-14 14:28:10 +01:00
Christian Schwinne
74156b7ed8
Support white addressable LED strips (#3073)
* Support white addressable LED strips

* Various white handling tweaks

Allow RGB controls for white-only busses depending on AWM (makes palette-only FX work on non-RGB addressable busses)
Fixed RGB controls hidden if segment contained any non-RGB bus (even though there is also an RGB bus in that segment)
New Max auto white mode
Added hasCCT() bus method
Rename methods to be clearer
WS2811 White getPixelColor fix()

* Fix merge conflict (bus manager cpp)
2023-02-14 01:33:06 +01:00
Blaz Kristan
821f320347 Add user selectable Gamma
Add panel visualisation (@ewoudwijma, #3090)

Bugfix:
- PIR onStateChange() ignored until inited
- remove matrix orientation
- ignore removing ledmap 0 if 2D
- _globalLeds size
2023-02-12 13:18:30 +01:00
Blaz Kristan
eee9274098 Bugfix.
- compiler warnings
- loading nonexistent default ledmap in 2D will revert to built ledmap
- making autosements after 2D set up change
2023-02-11 18:41:30 +01:00
Blaz Kristan
8dd1f89225 Update.
- allow ledmap selection in UI
- upload gap file
- expand matrix generator
2023-02-10 19:49:43 +01:00
Blaž Kristan
f2459ea904 Add ability to use SHT temp. sensor in PWM fan 2023-02-10 09:33:27 +01:00
Blaz Kristan
e51f7bfbff LED matrix gaps. 2023-02-09 20:15:55 +01:00
Blaz Kristan
b14c8e82a0 Bugfix.
- correct WLED_DEBUG_PORT override
2023-02-08 10:25:59 +01:00