summaryrefslogtreecommitdiff
path: root/apps (follow)
Commit message (Collapse)AuthorAge
...
* Polish translation update.Szymon Dziok2014-11-10
| | | | Change-Id: Ie1f223a23e2c0b4c4838d0cb146f65ee6b8e5f09
* Pegbox: use the same keymap for Samsung YH820 and YH920.Szymon Dziok2014-10-22
| | | | | | Keymap for the YH820 fits much better for the YH920 anyway. Change-Id: I54d7f3be9dfaf689e76c73d39da4649395e912a1
* YH820/YH92X: Add missing StdMenu action.Szymon Dziok2014-10-22
| | | | Change-Id: Ife5be1b6427724b5c231e0035aca44373adb0e40
* Rockboy plugin: remove second keymap definition for the Iriver H10, added inSzymon Dziok2014-10-22
| | | | | | 594b6e2 (FS#10251). Change-Id: I652545c812a8bd4d5d1be5f200fce9c97733b636
* YH820/YH92X: Improve some keymaps for plugins.Szymon Dziok2014-10-22
| | | | Change-Id: Ib598737327043809f60127f7c538f2d45ddabb87
* Update of the Serbian translationIvan Pesic2014-10-18
| | | | | | Change-Id: If244aabe80414cc0202f3d18c0d0defc6b0c47bf Reviewed-on: http://gerrit.rockbox.org/1016 Reviewed-by: Michael Giacomelli <giac2000@hotmail.com>
* Fixed disktidy bug and added a couple of new features to disktidy.Richard Burke2014-10-09
| | | | | | | | | | | | | | | | | The following updates were made to disktidy: - Fixed bug FS#12825. disktidy now checks subdirectories again for files to delete. - Use iterative rather than recursive method to traverse file system. - Once disktidy finishes a run it now returns to it's main menu rather than exiting. - Added "Last Run Stats" view to disktidy. This shows how many files and directories were deleted in the last run as well as the total size of those files, the length of time the run took and when the run took place (for players with RTC). - Added "Playback Control" option to disktidy main menu. Change-Id: I9b7d6d5d08aef2b5f85fb63fcd2ec60f1c1ec2e0 Reviewed-on: http://gerrit.rockbox.org/808 Reviewed-by: Franklin Wei <frankhwei536@gmail.com> Tested: Franklin Wei <frankhwei536@gmail.com> Reviewed-by: Marcin Bukat <marcin.bukat@gmail.com>
* YH820: Add a forgotten define in aa8ba60.Szymon Dziok2014-10-08
| | | | Change-Id: I89a0c21f2ca09f65a4d0b3e06b4b8fed3c07bef6
* YH820/YH92X: Properly enable morse input.Szymon Dziok2014-10-08
| | | | Change-Id: I6a35d64d0859b7ef429919c260a69974d6fdfafb
* YH820/YH92X: Fix keymap for custom settings.Szymon Dziok2014-10-08
| | | | Change-Id: I8e31b416d2e45d024c304e11318f1de8220c30b2
* Samsung yh820/yh92x: add HID keymaps.Szymon Dziok2014-10-03
| | | | Change-Id: I575e0e858aef0090d6864837d40a7b51e996ab43
* New Rockblox featuresFranklin Wei2014-09-29
| | | | | | | | | | | | - Add "Ghost piece" feature - on 1-bit displays, it's too hard to distinguish from "real" pieces, should it be disabled? - Show what your score is when you get a high score - Indent Change-Id: Ibefe748bca3a84736cf1884cc0872d9c36daa613 Reviewed-on: http://gerrit.rockbox.org/990 Tested: Franklin Wei <frankhwei536@gmail.com> Reviewed-by: Michael Giacomelli <giac2000@hotmail.com>
* Add ptable to SOURCESFranklin Wei2014-09-25
| | | | | | Change-Id: Ie31306210e3cfe78288269574e78976b682eab31 Reviewed-on: http://gerrit.rockbox.org/981 Reviewed-by: Michael Giacomelli <giac2000@hotmail.com>
* Ptable: hopefully fix all the warnings, modify actinide/lanthanide behavior ↵Franklin Wei2014-09-25
| | | | | | | | | | once again ... it's ready! :) Change-Id: Ie6e9de6097bad2d2dcca2b6d927fe748fa69f60d Reviewed-on: http://gerrit.rockbox.org/968 Reviewed-by: Michael Giacomelli <giac2000@hotmail.com>
* YH8xx,YH9xx: Keymap ImprovementSebastian Leonhardt2014-09-21
| | | | | | | | | | | | | | | | | | | | | | Keymaps are still work-in-progress, so wait for more. Changes: * standard: fix REC, so that it can be used in other mappings as 'exit' button * pitchscreen: support button repeat for slow/fast playback * keyboard: - change REW/FFWD mapping to backspace/page flip (more important than cursor imo) - use REC as cancel button - use FFWD as button-combo-meta-key; change cursor left/right to button combos, introduce OK/cancel as combos. * recording: - REC exits recording screen (more consistend and more obvious imo) - REW enters recording menu; long REW exits Change-Id: Ie80c2d122e4a8c6268d0f8c2fc0426cc49276110 Reviewed-on: http://gerrit.rockbox.org/953 Reviewed-by: Szymon Dziok <b0hoon@o2.pl> Tested: Szymon Dziok <b0hoon@o2.pl>
* Introducing Targets iBasso DX50 & iBasso DX90Simon Rothen2014-09-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The port to for this two targets has been entirely developped by Ilia Sergachev (alias Il or xzcc). His source can be found at https://bitbucket.org/isergachev/rockbox . The few necesary modifications for the DX90 port was done by headwhacker form head-fi.org. Unfortunately i could not try out the final state of the DX90 port. The port is hosted on android (without java) as standalone app. The official Firmware is required to run this port. Ilia did modify the source files for the "android" target in the rockbox source to make the DX port work. The work I did was to separate the code for DX50 (&DX90) from the android target. On this Target Ilia used source from tinyalsa from AOSP. I did not touch that part of the code because I do not understand it. What else I changed from Ilias sources besides the separation from the target "android": * removed a dirty hack to keep backlight off * changed value battery meter to voltage battery meter * made all plugins compile (named target as "standalone") and added keymaps * i added the graphics for the manual but did not do anything else for the manual yet * minor optimizations known bugs: * timers are slowed donw when playback is active (tinyalsa related?) * some minor bugs Things to do: * The main prolem will be how to install the app correctly. A guy called DOC2008 added a CWM (by androtab.info) to the official firmware and Ilia made a CWM installation script and a dualboot selector (rbutils/ibassoboot, build with ndk-build). We will have to find a way to install rockbox in a proper way without breaking any copyrights. Maybe ADB is an option but it is not enable with OF by default. Patching the OF is probably the way to go. * All the wiki and manual to build: needed: android ndk installed, android sdk installed with additional build-tools 19.1.0 installed ./tools/configure select iBasso DX50 or iBasso DX90 make -j apk the content of rockbox.zip/.rockbox needs to be copied to /system/rockbox/app_rockbox/rockbox/ (rockbox app not needed) the content of libs/armeabi to /system/rockbox/lib/ (rockbox app needed) The boot selector is needed as /system/bin/MangoPlayer and the iBasso app as /system/bin/MangoPlayer_original. There is also the "vold" file. The one from OF does not work with DX50 rockbox (DX90 works!?), the one from Ilia is necessary. Until we have found a proper way to install it, it can only be installed following the instructions of Ilia on his bitbucket page, using the CWM-OF and his installation script package. Change-Id: Ic4faaf84824c162aabcc08e492cee6e0068719d0 Reviewed-on: http://gerrit.rockbox.org/941 Tested: Chiwen Chang <rock1104.tw@yahoo.com.tw> Reviewed-by: Michael Giacomelli <giac2000@hotmail.com>
* Disable periodic table plugin until all the compilation issues are sorted out.Michael Giacomelli2014-09-15
| | | | Change-Id: Idb93aa9b5ad57ae1d5671ba5f17d0af0f2d201c7
* hopefully fix the warningsFranklin Wei2014-09-15
| | | | | | Change-Id: Id822234afc8906bb7c023810e902e604451ddfda Reviewed-on: http://gerrit.rockbox.org/963 Reviewed-by: Michael Giacomelli <giac2000@hotmail.com>
* ifdef out lcd_set_bg callFranklin Wei2014-09-15
| | | | | | Change-Id: I78112f8099c09cc0993357e0f58a567c43381a50 Reviewed-on: http://gerrit.rockbox.org/962 Reviewed-by: Michael Giacomelli <giac2000@hotmail.com>
* Fix building on clipFranklin Wei2014-09-15
| | | | | | Change-Id: I4218cc9d45b144bfc3e58a44ef532d001d02e9ec Reviewed-on: http://gerrit.rockbox.org/961 Reviewed-by: Michael Giacomelli <giac2000@hotmail.com>
* FS#9583 - periodic tableFranklin Wei2014-09-15
| | | | | | | | | | | | | | | | | - original rockbox port: Yifu Huang - original work: Jonathan Bettencourt - modifications made: - PLA-fied - Add element 117 (ununseptium) - Implemented up/down - Fixed actinide/lanthanide navigation so that they are between scandium and titanium - Added manual entry - Fixed FG/BG colors Change-Id: Ibabfb0d28f794689ffcd8b9c360fb969d118de08 Reviewed-on: http://gerrit.rockbox.org/950 Reviewed-by: Michael Giacomelli <giac2000@hotmail.com>
* Superdom: Silence warning.Michael Giacomelli2014-09-14
| | | | Change-Id: Idec8c1a9defb19ebd753c2609b5d4207581c9248
* Superdom: rewrote help textFranklin Wei2014-09-14
| | | | | | Change-Id: I54d5ee920b03f24faee5a6bf53ca56b27bbdc6c8 Reviewed-on: http://gerrit.rockbox.org/945 Reviewed-by: Michael Giacomelli <giac2000@hotmail.com>
* Superdom: some AI improvements and other minor changesFranklin Wei2014-09-14
| | | | | | Change-Id: Ia2756a7263ec09b78714273af0f604fc9cdb50eb Reviewed-on: http://gerrit.rockbox.org/944 Reviewed-by: Michael Giacomelli <giac2000@hotmail.com>
* Superdom: added option for persistent unitsFranklin Wei2014-09-14
| | | | | | Change-Id: I4c28f3c567ed435ba7aee36c8b54c76fc75e12aa Reviewed-on: http://gerrit.rockbox.org/943 Reviewed-by: Michael Giacomelli <giac2000@hotmail.com>
* [WIP] Superdom: AI can now use nukesFranklin Wei2014-09-14
| | | | | | Change-Id: Iff5093b0edb4c065096d41c36d33bb2126063cf6 Reviewed-on: http://gerrit.rockbox.org/942 Reviewed-by: Michael Giacomelli <giac2000@hotmail.com>
* [WIP] Superdom: game improvementsFranklin Wei2014-09-14
| | | | | | | | | | | | - macro-ify board dimensions, surrender thresholds - make AI skill level adjustable - let AI buy nukes in hard mode (still can't use them yet) - make nukes persistent (stay after an invasion) - make AI treat nukes with priority Change-Id: I1add6250766810787080624bd9e36026df449509 Reviewed-on: http://gerrit.rockbox.org/940 Reviewed-by: Michael Giacomelli <giac2000@hotmail.com>
* Superdom: code cleanupFranklin Wei2014-09-14
| | | | | | Change-Id: I3285238cfc098546307862f7d2e51e3b8e456a98 Reviewed-on: http://gerrit.rockbox.org/931 Reviewed-by: Michael Giacomelli <giac2000@hotmail.com>
* Superdom: whitespace cleanupFranklin Wei2014-09-14
| | | | | | Change-Id: Iab7aa68c4ed34809e1e9200cba9ee5bc0a09be8e Reviewed-on: http://gerrit.rockbox.org/930 Reviewed-by: Michael Giacomelli <giac2000@hotmail.com>
* Correct some file permissions.Szymon Dziok2014-09-08
| | | | Change-Id: I4a092a19d6a9c66dfeb2777c9655aa4b19d11e16
* Correction of the Sliding puzzle on Samsung YH-820.Szymon Dziok2014-09-08
| | | | Change-Id: Iceef613d8f99da75c7861e0ca472bc67e94a51f9
* Bubbles: make it work on Samsung YH-820 and align it on the occasion on ↵Szymon Dziok2014-09-08
| | | | | | Cowon M3. Change-Id: I8d679ccba7f618cee78445b76452c368b00d2b60
* Fuze+: add a configurable deadzone area for touchpad buttonsAmaury Pouly2014-09-08
| | | | | | | | | | | | | | | | | | To stop erroneous button presses, allow users to add a deadzone between the button via the Settings > General > System menu > Touch Dead Zone. The configuration was chosen this way: the touchpad has the same DPI in both direction so the setting applies the same on both the X and Y axis. The setting ranges from 0 to 100 and is internally multiplied by 2 giving a maximum deadzone of 2*100 = 200 around each button, which account for 400 total (once around each button), effectively reducing each virtual button from 1000x600 to 600x200 when using the maximum value. Change-Id: I8683c63d2950200eb32d1dda0a00bbd92d83d5be Reviewed-on: http://gerrit.rockbox.org/677 Reviewed-by: Benjamin Brown <foolshperson@gmail.com> Tested: Benjamin Brown <foolshperson@gmail.com> Reviewed-by: Amaury Pouly <amaury.pouly@gmail.com>
* Remove I/O priority. It is harmful when used with the new file code.Michael Sevakis2014-08-30
| | | | | | | | | | HAVE_IO_PRIORITY was defined for native targets with dircache. It is already effectively disabled for the most part since dircache no longer lowers its thread's I/O priority. It existed primarily for the aforementioned configuration. Change-Id: Ia04935305397ba14df34647c8ea29c2acaea92aa
* Rewrite filesystem code (WIP)Michael Sevakis2014-08-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch redoes the filesystem code from the FAT driver up to the clipboard code in onplay.c. Not every aspect of this is finished therefore it is still "WIP". I don't wish to do too much at once (haha!). What is left to do is get dircache back in the sim and find an implementation for the dircache indicies in the tagcache and playlist code or do something else that has the same benefit. Leaving these out for now does not make anything unusable. All the basics are done. Phone app code should probably get vetted (and app path handling just plain rewritten as environment expansions); the SDL app and Android run well. Main things addressed: 1) Thread safety: There is none right now in the trunk code. Most of what currently works is luck when multiple threads are involved or multiple descriptors to the same file are open. 2) POSIX compliance: Many of the functions behave nothing like their counterparts on a host system. This leads to inconsistent code or very different behavior from native to hosted. One huge offender was rename(). Going point by point would fill a book. 3) Actual running RAM usage: Many targets will use less RAM and less stack space (some more RAM because I upped the number of cache buffers for large memory). There's very little memory lying fallow in rarely-used areas (see 'Key core changes' below). Also, all targets may open the same number of directory streams whereas before those with less than 8MB RAM were limited to 8, not 12 implying those targets will save slightly less. 4) Performance: The test_disk plugin shows markedly improved performance, particularly in the area of (uncached) directory scanning, due partly to more optimal directory reading and to a better sector cache algorithm. Uncached times tend to be better while there is a bit of a slowdown in dircache due to it being a bit heavier of an implementation. It's not noticeable by a human as far as I can say. Key core changes: 1) Files and directories share core code and data structures. 2) The filesystem code knows which descriptors refer to same file. This ensures that changes from one stream are appropriately reflected in every open descriptor for that file (fileobj_mgr.c). 3) File and directory cache buffers are borrowed from the main sector cache. This means that when they are not in use by a file, they are not wasted, but used for the cache. Most of the time, only a few of them are needed. It also means that adding more file and directory handles is less expensive. All one must do in ensure a large enough cache to borrow from. 4) Relative path components are supported and the namespace is unified. It does not support full relative paths to an implied current directory; what is does support is use of "." and "..". Adding the former would not be very difficult. The namespace is unified in the sense that volumes may be specified several times along with relative parts, e.g.: "/<0>/foo/../../<1>/bar" :<=> "/<1>/bar". 5) Stack usage is down due to sharing of data, static allocation and less duplication of strings on the stack. This requires more serialization than I would like but since the number of threads is limited to a low number, the tradoff in favor of the stack seems reasonable. 6) Separates and heirarchicalizes (sic) the SIM and APP filesystem code. SIM path and volume handling is just like the target. Some aspects of the APP file code get more straightforward (e.g. no path hashing is needed). Dircache: Deserves its own section. Dircache is new but pays homage to the old. The old one was not compatible and so it, since it got redone, does all the stuff it always should have done such as: 1) It may be update and used at any time during the build process. No longer has one to wait for it to finish building to do basic file management (create, remove, rename, etc.). 2) It does not need to be either fully scanned or completely disabled; it can be incomplete (i.e. overfilled, missing paths), still be of benefit and be correct. 3) Handles mounting and dismounting of individual volumes which means a full rebuild is not needed just because you pop a new SD card in the slot. Now, because it reuses its freed entry data, may rebuild only that volume. 4) Much more fundamental to the file code. When it is built, it is the keeper of the master file list whether enabled or not ("disabled" is just a state of the cache). Its must always to ready to be started and bind all streams opened prior to being enabled. 5) Maintains any short filenames in OEM format which means that it does not need to be rebuilt when changing the default codepage. Miscellaneous Compatibility: 1) Update any other code that would otherwise not work such as the hotswap mounting code in various card drivers. 2) File management: Clipboard needed updating because of the behavioral changes. Still needs a little more work on some finer points. 3) Remove now-obsolete functionality such as the mutex's "no preempt" flag (which was only for the prior FAT driver). 4) struct dirinfo uses time_t rather than raw FAT directory entry time fields. I plan to follow up on genericizing everything there (i.e. no FAT attributes). 5) unicode.c needed some redoing so that the file code does not try try to load codepages during a scan, which is actually a problem with the current code. The default codepage, if any is required, is now kept in RAM separarately (bufalloced) from codepages specified to iso_decode() (which must not be bufalloced because the conversion may be done by playback threads). Brings with it some additional reusable core code: 1) Revised file functions: Reusable code that does things such as safe path concatenation and parsing without buffer limitations or data duplication. Variants that copy or alter the input path may be based off these. To do: 1) Put dircache functionality back in the sim. Treating it internally as a different kind of file system seems the best approach at this time. 2) Restore use of dircache indexes in the playlist and database or something effectively the same. Since the cache doesn't have to be complete in order to be used, not getting a hit on the cache doesn't unambiguously say if the path exists or not. Change-Id: Ia30f3082a136253e3a0eae0784e3091d138915c8 Reviewed-on: http://gerrit.rockbox.org/566 Reviewed-by: Michael Sevakis <jethead71@rockbox.org> Tested: Michael Sevakis <jethead71@rockbox.org>
* Ukrainian language updateKyryljan_Serhij2014-08-24
| | | | | | Change-Id: Ie06a1a1ecded66d1efb3beeee1aa7b69656715ef Reviewed-on: http://gerrit.rockbox.org/921 Reviewed-by: Michael Giacomelli <giac2000@hotmail.com>
* One last missing !defined(SIMULATOR) for chip8Frank Gevaerts2014-08-23
| | | | Change-Id: Iab2d9150126f6c611604469d105186b936825012
* Hope this works...Franklin Wei2014-08-23
| | | | | | Change-Id: I8a94f0be82f63ed1e81433beb41ff2d60a1e6eef Reviewed-on: http://gerrit.rockbox.org/926 Reviewed-by: Frank Gevaerts <frank@gevaerts.be>
* Yellow go bye-byeFranklin Wei2014-08-22
| | | | | | Change-Id: I12ce8b7781b4b1ce1c47b2973057586177f90157 Reviewed-on: http://gerrit.rockbox.org/923 Reviewed-by: Frank Gevaerts <frank@gevaerts.be>
* Fixed a chip8 bugFranklin Wei2014-08-22
| | | | | | Change-Id: Ia28610713461eb02e8911be7fa0d5ad8ec8ba7fe Reviewed-on: http://gerrit.rockbox.org/919 Reviewed-by: Frank Gevaerts <frank@gevaerts.be>
* Added Clip/+ to 2048 targetsFranklin Wei2014-08-19
| | | | | | Change-Id: I9fb5a50f214e9dd87d1f1f62f4324876bdd94fe8 Reviewed-on: http://gerrit.rockbox.org/918 Reviewed-by: Michael Giacomelli <giac2000@hotmail.com>
* 2048: service pack 1 :)Franklin Wei2014-08-19
| | | | | | | | | - fixed some bugs - added 1-bit LCD support Change-Id: I7bb458d79d799dcd6b11d9d538773404f9a7f97c Reviewed-on: http://gerrit.rockbox.org/917 Reviewed-by: Michael Giacomelli <giac2000@hotmail.com>
* Always unboost at exitAvi Eisenberg2014-08-18
| | | | | | Change-Id: I8b4a2d61a5f4491265888d84c0f2c684bcf38edb Reviewed-on: http://gerrit.rockbox.org/915 Reviewed-by: Jonathan Gordon <rockbox@jdgordon.info>
* Fix warnings from 6ed0087Michael Sevakis2014-08-16
| | | | | | | | | | | | | | Forgot to (void) an unused parameter when priorityless. usb-drv-rl27xx.c was using a compound init to initialize a semaphore but the structure changed so that it is no longer correct. Use designated initializers to avoid having to complete all fields. Forgot to break compatibility on all plugins and codecs since the kernel objects are now different. Take care of that too and do the sort thing. Change-Id: Ie2ab8da152d40be0c69dc573ced8d697d94b0674
* Base scheduler queues off linked lists and do cleanup/consolidationMichael Sevakis2014-08-16
| | | | | | | | | | | | | | | | | | | | | | | | | Abstracts threading from itself a bit, changes the way its queues are handled and does type hiding for that as well. Do alot here due to already required major brain surgery. Threads may now be on a run queue and a wait queue simultaneously so that the expired timer only has to wake the thread but not remove it from the wait queue which simplifies the implicit wake handling. List formats change for wait queues-- doubly-linked, not circular. Timeout queue is now singly-linked. The run queue is still circular as before. Adds a better thread slot allocator that may keep the slot marked as used regardless of the thread state. Assists in dumping special tasks that switch_thread was tasked to perform (blocking tasks). Deletes alot of code yet surprisingly, gets larger than expected. Well, I'm not not minding that for the time being-- omlettes and break a few eggs and all that. Change-Id: I0834d7bb16b2aecb2f63b58886eeda6ae4f29d59
* Added highscore highlight to xobox gameFranklin Wei2014-08-12
| | | | | | Change-Id: Idf6848fc80a56398889d5deeb16bf3707fcd3e30 Reviewed-on: http://gerrit.rockbox.org/893 Reviewed-by: Michael Giacomelli <giac2000@hotmail.com>
* Added 2048 gameFranklin Wei2014-08-12
| | | | | | | Change-Id: I4012dca4f93ca0db386a454635534f648ba906e9 Reviewed-on: http://gerrit.rockbox.org/888 Reviewed-by: Michael Giacomelli <giac2000@hotmail.com> Tested: Michael Giacomelli <giac2000@hotmail.com>
* Do some kernel cleanupMichael Sevakis2014-08-08
| | | | | | | | | | | | | | | | | | | | * Seal away private thread and kernel definitions and declarations into the internal headers in order to better hide internal structure. * Add a thread-common.c file that keeps shared functions together. List functions aren't messed with since that's about to be changed to different ones. * It is necessary to modify some ARM/PP stuff since GCC was complaining about constant pool distance and I would rather not force dump it. Just bl the cache calls in the startup and exit code and let it use veneers if it must. * Clean up redundant #includes in relevant areas and reorganize them. * Expunge useless and dangerous stuff like remove_thread(). Change-Id: I6e22932fad61a9fac30fd1363c071074ee7ab382
* Fix up some more redMichael Sevakis2014-08-05
| | | | | | | find_first_set_bit() becomes a small inline on ARMv5+ and checkwps now gets made with -std=gnu99 (it eats all the GCCOPTS) like the rest of things. Change-Id: Ie6039b17fec057a3dcb0f453d8fd5efac984df89
* Russian language updateKyryljan_Serhij2014-08-05
| | | | | | Change-Id: I78af1702c1f60c2fc66ebeb738aed187f13906f3 Reviewed-on: http://gerrit.rockbox.org/903 Reviewed-by: Marcin Bukat <marcin.bukat@gmail.com>
generated by cgit v1.1 at 2026-04-25 15:02:30 +0000