ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
9,245 Commits
52 Branches
336 Tags
624 MiB
Commit Graph

804 Commits (ab23c00b086c1afd8d3991646443eb6d5742934d)

Author SHA1 Message Date
Sam Grove d6831b3386 Merge pull request #3063 from theotherjimmy/make-srec-print 
[Exporters] Add quick print to the makefile when srec_cat is required
 2016-10-19 05:51:04 -05:00
Sam Grove 9138f62742 Merge pull request #3052 from theotherjimmy/name-eclipse-exporters 
Exporters - Name the eclipse exporters and remove relpath computations
 2016-10-19 05:49:46 -05:00
Sam Grove 44eca95c3d Merge pull request #3028 from maclobdell/ncs36510_exporter_definitions 
add ncs36510 exporter support for IAR
 2016-10-19 05:47:13 -05:00
Sam Grove 5bcebba71d Merge pull request #3023 from jeromecoutant/PR_digital_loop_tests 
digital_loop tests update for STM32
 2016-10-19 05:46:22 -05:00
Sam Grove 435d5fb3bb Merge pull request #2992 from jeromecoutant/PR_Init_Time_Issue 
Increase serial init timeout value
 2016-10-19 05:42:20 -05:00
Sam Grove 6bd44c59d3 Merge pull request #2990 from bridadan/parallel-test-build 
[tools] Parallel building of tests
 2016-10-19 05:41:24 -05:00
jeromecoutant ae9041b12c i2c_loop tests update for STM32 2016-10-19 11:15:38 +02:00
jeromecoutant 78b4f25b5c analog_loop test - keep mcu list and update with STM32 boards 2016-10-19 09:54:23 +02:00
Jimmy Brisson a9d63b2365 Update the IAR debug template" 2016-10-18 16:00:58 -05:00
Jimmy Brisson 167ed2bc12 check in a copy of the arm-pack-manager index and use it 2016-10-18 13:56:17 -05:00
Jimmy Brisson 18b34794be Add quick print to the makefile when srec_cat is required 2016-10-18 10:58:51 -05:00
Jimmy Brisson 7a8917fcf8 Use correct names for library files 2016-10-18 10:30:46 -05:00
Jimmy Brisson 25ca0e3cfb Fix traceback from incorrect use of core 2016-10-18 10:29:37 -05:00
Russ Butler 23af2421f3 Remove non-code profiles 
Remove profiles which are not suitable for building stand alone. This
leaves just the 3 core profiles.
 2016-10-18 09:23:10 -05:00
Russ Butler 0d51f18f02 New build profile and docs 
Add a small build profile and general docs for build profiles.
 2016-10-18 09:23:01 -05:00
Anna Bridge 36964561b9 Review: Update example_lib.py to use rmtree rather than rm system call. 
Update examples.json to limit TLS examples to a couple of boards and only
GCC_ARM and ARM compilers.
 2016-10-18 12:30:19 +01:00
Martin Kojtal 9976738882 Merge pull request #3047 from sarahmarshy/iar-defines 
Remove k64f defines from IAR templates
 2016-10-18 10:45:14 +01:00
Jimmy Brisson c64446dc39 Remove unneeded relpath calculations 2016-10-17 14:51:28 -05:00
Jimmy Brisson 2912522930 Exporters - Name the eclipse exporters 2016-10-17 14:35:26 -05:00
Anna Bridge bbfa954839 Make update.py test compile examples prior to updating mbed-os version. 
Changes:
Refactor examples.py to add a new command line option to provide an update
tag.
Refactor examples.py to add new functionality to update the version of
mbed-os in the examples to a supplied tag.
Refactor examples.py to make cloning the example repos, updating their
mbed-os version and compiling, into library functions and move to a new
library module.
Refactor the format of the examples.json file to make it compatible with
both examples.py and update.py.
Refactor update.py so that examples are test compiled prior to updating.
Refactor update.py so that only examples tagged as auto-updatable and that
fully compile are automatically updated.
 2016-10-17 16:56:28 +01:00
Sarah Marsh e001dd1080 Removed k64f defines from templates 2016-10-17 10:52:58 -05:00
maclobdell 014df32625 add ncs36510 exporter support 2016-10-14 11:45:24 -05:00
Sam Grove 9f74038036 Merge pull request #2991 from c1728p9/fix_small_default_lib 
Properly set flags for default_lib = small
 2016-10-13 11:13:30 -05:00
Sam Grove 4be4113810 Merge pull request #2985 from sarahmarshy/nrf52-support 
NRF52_DK support for IAR exporter
 2016-10-13 11:12:43 -05:00
Max Vilimpoc 7faee9099e Add .hpp to list of Uvision Exporter extensions 2016-10-13 13:12:18 +02:00
Russ Butler 9f6b346c88 Properly set flags for default_lib = small 
Use newlib nano for targets which have the key "default_lib" set to
"small". Also support the legacy key of "default_build".
 2016-10-12 20:36:09 -05:00
Sam Grove 1ba3499631 Merge pull request #3003 from c1728p9/fix_memory_map 
Revert "Allow max-depth specification in memap"
 2016-10-12 17:25:12 -05:00
Russ Butler 7a50832550 Revert "Allow max-depth specification in memap" 
This reverts commit 8f9f4eefed since
it broke memory map info for IAR, ARMCC and on windows, GCC_ARM.
 2016-10-12 14:49:32 -05:00
jeromecoutant dee753735d analog_loop tests update for STM32 2016-10-12 10:38:03 +02:00
jeromecoutant e0ddd59fdd digital_loop tests update for STM32 2016-10-12 10:07:27 +02:00
Brian Daniels 39086722e8 Removing dependency on StringIO, only change return type of table export 2016-10-11 18:38:52 -05:00
Brian Daniels 0e4b841cb3 Removing need for memap to printed through toolchains 2016-10-11 18:24:01 -05:00
Brian Daniels 655c37715c Handling output of parallelized test building. 
This makes use of the reports generated by the building of tests to
prevent output from interleaving when the build is parallelized. This
required some changes to memap to return a generated string from
the 'generate_output' function. I also had an option to stop the prints
from memap to prevent text from interleaving
 2016-10-11 15:34:20 -05:00
Brian Daniels 14aff069b1 Modifying behavior of 'silent' option in toolchains 
The 'silent' option has always been present in the toolchains API, however
it did not actually stop anything from being printed. Instead, it just
changed what was added to the build log. This make the 'silent' stop all
prints, but ensures that the output for the toolchain is still preserved
and accessible via the 'get_output' function.
 2016-10-11 14:31:06 -05:00
Bartek Szatkowski 3af2c5ae14 Accept profile name as well as file path for tools/make.py --profile 
--profile can be used with just a profile name eg. default, debug as
long as <name>.json file is in default profile directory.
 2016-10-11 13:33:37 -05:00
Brian Daniels 87103abd56 Making building and linking tests fully parallel. 
This uses similar code that is used withing the toolchains to parallelize
the linking process of all the tests accross all the available CPUs. It
also respects the `-j` parameter if you wish to limit the number of cores
used.
 2016-10-11 13:24:50 -05:00
Sarah Marsh 246335af92 NRF52_DK support for IAR exporter 2016-10-11 18:25:07 +01:00
Sam Grove c0c2563580 Merge pull request #2964 from bulislaw/fix_csv_quoting 
Fix file path quoting while constructing CSV file in memmap.py
 2016-10-10 10:35:44 -05:00
jeromecoutant 62160b7685 Increase serial init timeout value 2016-10-10 15:37:54 +02:00
Sam Grove eee4db1fe0 Merge pull request #2896 from geky/restructure-cmsis 
restructure - Restructure cmsis directory
 2016-10-07 11:13:09 -05:00
Bartek Szatkowski a7d9dbec69 Fix file path quoting while constructing CSV file in memmap.py 
Comma is a valid char in file paths for Posix systems.
 2016-10-07 16:33:43 +01:00
Brian Daniels f3d20141a3 Allowing mbed_app.json files to be discovered for tests. 
Before, mbed_app.json files were explicitly ignored when building tests.
This was mostly because you could have multiple mbed_app.json files in the
tree (for instance, in test case folders) and the behavior would be
undefined. Now the tools explicitly ensure that there aren't multiple
mbed_app.json files in your source files. So auto discovery of
mbed_app.json for testing is being reintroduced.
 2016-10-06 17:40:25 -05:00
Sam Grove 41323855ec Merge pull request #2918 from theotherjimmy/memap-improvements 
Allow max-depth specification in memap
 2016-10-06 15:57:39 -05:00
Sam Grove 3a16ca9855 Merge pull request #2911 from theotherjimmy/docs-generation 
[Tools] Add documentation generation script
 2016-10-06 15:57:08 -05:00
Sam Grove 76fb1f8c3f Merge pull request #2708 from sarahmarshy/uvision-and-iar 
[Exporters] Refactor Uvision and IAR and initial support of CMSIS projects
 2016-10-06 15:54:00 -05:00
Michel Jaouen 144e97bf63 [IAR build] fix debug build 
with option  --profile ./tools/profiles/debug.json
 2016-10-06 16:16:14 +02:00
Jimmy Brisson 8f9f4eefed Allow max-depth specification in memap 2016-10-05 12:36:30 -05:00
Christopher Haster 2a58befd15 restructure - Fixed missing include paths in mbed 2 project builds 2016-10-05 11:06:27 -05:00
Sarah Marsh e8b34282cb Minor formatting changes 2016-10-04 19:34:52 -05:00
Christopher Haster 2be7207388 restructure - Fixed missing symbols in generation of mbed 2 cmsis library 2016-10-04 17:51:44 -05:00
Christopher Haster 96b4ff3358 restructure - Updated mbed 2 build to respect the new cmsis directory 2016-10-04 17:51:44 -05:00
Sarah Marsh 51b13c3ca7 -Oh flag removed from IAR. Optimization set in GUI. 2016-10-04 15:07:41 -05:00
Jimmy Brisson 9261ed4161 Remove tag-adding code from script 2016-10-04 15:03:17 -05:00
Jimmy Brisson 2cea844199 Automatically Add group tags to documented code 2016-10-04 15:02:33 -05:00
Jimmy Brisson e19d04ad31 Move docs_gen.py script to tools/misc 2016-10-04 14:41:18 -05:00
Jimmy Brisson 9dffa04894 Add inside namespaces 2016-10-04 14:41:18 -05:00
Jimmy Brisson 51fdce3eff Switch how we do groups 2016-10-04 14:41:17 -05:00
Jimmy Brisson 2959acd94c Automatically add groups from features 2016-10-04 14:41:17 -05:00
Jimmy Brisson 77c7524471 Add simple documentation generation 2016-10-04 14:41:17 -05:00
Sarah Marsh fd86fef205 [uvision] Flash DLL string/debug 
Versioning for arm-pack-manager
 2016-10-04 14:26:45 -05:00
Sarah Marsh 2a907d296d Fix Uvision CPU type error for DP and FPU targets. 2016-10-04 14:13:36 -05:00
Sarah Marsh b861c36e41 Removed IAR export support for invalid IAR targets. 
Fixed naming of one target selection.
 2016-10-04 14:13:36 -05:00
Sarah Marsh 9bec4181d9 Uvision FPU setting added to template 2016-10-04 14:13:36 -05:00
Sarah Marsh 4bc70c0c5f Remove static destruction flag 2016-10-04 14:13:36 -05:00
Sarah Marsh fa148578d2 Uvision5 => Uvision or Uvision5 2016-10-04 14:13:36 -05:00
Sarah Marsh ab050a2319 Cpu type set in uvision template 2016-10-04 14:13:36 -05:00
Sarah Marsh b074ee14c2 IAR debugging and docstrings 2016-10-04 14:13:36 -05:00
Sarah Marsh ce1939b74f Remove : from vendor info in cmsis pdsc 2016-10-04 14:13:36 -05:00
Sarah Marsh 9a02bfb7a3 Additional device names. mbed_targets.md update 2016-10-04 14:13:36 -05:00
Sarah Marsh 8ca7ff2f5b .lst file goes to hidden .build for uvision5 2016-10-04 14:13:36 -05:00
Sarah Marsh 09c5be5921 Buid logs print with no new lines 2016-10-04 14:13:36 -05:00
Sarah Marsh fa13cd2d57 Iar nucleo template referenced correctly 2016-10-04 14:13:36 -05:00
Sarah Marsh a9d1dd005f Build tests clean and logging revision 2016-10-04 14:13:36 -05:00
Jimmy Brisson 072128b29c Integrate arm_pack_manager with exporters 2016-10-04 14:13:36 -05:00
Sarah Marsh bb185476e2 arm_pack_manager - Retrieve debug adapter. Strip URLS 2016-10-04 14:13:36 -05:00
Jimmy Brisson b9cadfb8cd arm_pack_manager - Remove extra print; make url joining work on windows 2016-10-04 14:13:36 -05:00
Jimmy Brisson 3847aaa545 arm_pack_manager - Add alias file 2016-10-04 14:13:36 -05:00
Sarah Marsh a25d453dae arm_pack_manager - Specific device info overrides family/subfamily info 2016-10-04 14:13:36 -05:00
Sarah Marsh 6a4b392de5 arm_pack_manager - Multi-level processor and compile elements search 2016-10-04 14:13:36 -05:00
Sarah Marsh e1f1a5edc6 arm_pack_manager - Added caching target vendor and processor(clock, fpu, endinanness) 2016-10-04 14:13:36 -05:00
Jimmy Brisson 2240a3a019 arm_pack_manager - Try really hard to fill the processor dict 2016-10-04 14:13:36 -05:00
Jimmy Brisson 39c1703c75 arm_pack_manager - [API change] differentiate between pack and pdsc loading from cache 
- pull_from_cache renamed to pdsc_from_cache
 - pack_from_cache added
 - index file member replaced with pdsc_file
 - pack_file member added to cache
 2016-10-04 14:13:36 -05:00
Jimmy Brisson 6b2595af61 arm_pack_manager - Add --and, --or, --intersection, and --union options 
These change the behavior of the search terms.
 2016-10-04 14:13:36 -05:00
Jimmy Brisson b05964abbe arm_pack_manager - Simplify find_device 2016-10-04 14:13:36 -05:00
Jimmy Brisson b840a1b58f arm_pack_manager - Update find parts for new flash alogrithm api 2016-10-04 14:13:36 -05:00
Jimmy Brisson ece1de343b arm_pack_manager - Update docstrings for extra flash algorithm info 2016-10-04 14:13:36 -05:00
Jimmy Brisson 15b7381edd arm_pack_manager - Add more info to flash algorithm 2016-10-04 14:13:36 -05:00
Jimmy Brisson 9cf4f0d074 arm_pack_manager - Add Descritpion of subcommands 2016-10-04 14:13:36 -05:00
Jimmy Brisson 6c13576851 arm_pack_manager - Add Documentation 2016-10-04 14:13:36 -05:00
Jimmy Brisson 02995467a7 arm_pack_manager - Adds an dump parts command 2016-10-04 14:13:36 -05:00
Jimmy Brisson cdc064913a arm_pack_manager - Refactors cli out of __init__.py and adds it as a command 2016-10-04 14:13:36 -05:00
Jimmy Brisson 677b847e2b arm_pack_manager - added a cache by part cammand 2016-10-04 14:13:36 -05:00
Jimmy Brisson efffa2ad79 arm_pack_manager - searching is now indexed and much faster 2016-10-04 14:13:36 -05:00
Jimmy Brisson d3017f4479 arm_pack_manager - commands added. uses fuzzy search to find things 2016-10-04 14:13:36 -05:00
Jimmy Brisson 687a9ba652 arm_pack_manager - refactored Cache into class and downloaded pack files 2016-10-04 14:13:36 -05:00
Jimmy Brisson 44980ab009 arm_pack_manager - caches packs now too. 2016-10-04 14:13:36 -05:00
Jimmy Brisson 0832770159 arm_pack_manager - now we have a cache 2016-10-04 14:13:36 -05:00
Jimmy Brisson 01ee8cbeaf arm_pack_manager - ya gotta start somewhere 2016-10-04 14:13:36 -05:00
Sarah Marsh 45ad394ca6 New build tests. 
*Changes*
- Parallel export
- mbed-os tests added
- specified release version (default to 5)
- default tests AND targets dependent on specified release version
 2016-10-04 14:13:36 -05:00
Sarah Marsh db696f8f4a Remove progen and progen def dependencies. 2016-10-04 14:13:36 -05:00
Sarah Marsh fdd7820832 IAR revision 2016-10-04 14:13:36 -05:00
Sarah Marsh 6fd1c77727 Refactor uvision. Add support for CMSIS project files 2016-10-04 14:13:36 -05:00
Sarah Marsh 448205ac87 device_name in targets.json. Removed progen target 2016-10-04 14:13:01 -05:00
Sam Grove 5713435d02 Merge pull request #2895 from bridadan/build-test-fix 
[Exporters] Resolving Python errors and uVision build issues
 2016-10-03 18:59:36 -05:00
Sam Grove 79fbf94d9c Merge pull request #2893 from theotherjimmy/toolchain-test-cleanup 
[Tests] Prevent garbage generation from toolchain api test
 2016-10-03 17:22:00 -05:00
Jimmy Brisson fe1cd87724 Remove flags safely in uvisions 2016-10-03 16:19:30 -05:00
Brian Daniels 4965e61616 Adding build_profiles to export in build_test.py 2016-10-03 16:02:34 -05:00
Brian Daniels 0c76ba54ff Fixing python import errors 2016-10-03 16:02:33 -05:00
Sarah Marsh 6998524c00 Resolve issues from reorg 2016-10-03 16:02:32 -05:00
Jimmy Brisson 6209aff482 Prevent garbage generation from toolchain api test 2016-10-03 15:15:08 -05:00
Sam Grove 765fbbbc2c Merge pull request #2842 from svastm/sw4stm32_use_targets_json 
SW4STM32 - Use targets.json to find fp config
 2016-10-03 11:11:38 -05:00
Martin Kojtal 6f3c62f3ae Merge pull request #2880 from andreaslarssonublox/change_name_for_ublox_c029_target 
Changed name for the target UBLOX_C029 to UBLOX_EVK_ODIN_W2
 2016-10-03 15:51:55 +01:00
Bartek Szatkowski ea569e8342 Fix json syntax in debug.json profile file 2016-10-03 14:08:29 +01:00
andreas.larsson 1d3c63d9bb Changed name for the target UBLOX_C029 to UBLOX_EVK_ODIN_W2 2016-10-03 12:10:50 +02:00
Sam Grove 646cc89a62 Merge pull request #2878 from geky/restructure 
Restructure directory layout
 2016-10-02 14:04:25 -05:00
Christopher Haster b8fb7a6e3c restructure - Changed legacy build_lib to respect lib name in path 2016-10-01 19:43:22 -05:00
Sam Grove cf60b189b0 Merge pull request #2879 from bridadan/fix-config-tests-ipv6 
Renames IPV6 feature used in config test to STORAGE
 2016-10-01 17:22:38 -05:00
Christopher Haster a7ddc46caf restructure - Added single-nested inc_dir support to legacy build_lib 
Added single-nested include directories to libraries built with the
legacy build_lib function. Unfortunately, to get this working without
a significant rewrite of the legacy build tools, library header files
are just duplicated in the precompile stage.
 2016-10-01 14:58:13 -05:00
Christopher Haster e35050d61b restructure - Reverted move of requirements.txt 
- Reverted requirements.txt for external dependency in mbed CLI
- Fixed MBED_CONFIG_FILE in paths.py
- Fixed MBED_LIBRARIES in paths.py
- Decreased include namespace for rtos.h
 2016-09-30 19:18:09 -05:00
Christopher Haster 03bbc86dd6 restructure - Added FEATURE_LWIP to __allowed_features 2016-09-30 19:18:09 -05:00
Christopher Haster 960d69f081 restructure - Updated tools to point to restructured modules 
MBED_HAL       /hal/hal      x
MBED_API       /hal/api      x
MBED_COMMON    /hal/common   x
MBED_TARGETS   /hal/targets  ->  /targets
MBED_DRIVERS                  +  /drivers
MBED_PLATFORM                 +  /platform
MBED_HEADER                   +  /mbed.h
 2016-09-30 19:18:09 -05:00
Christopher Haster c0ffbc11e2 restructure - Removed misplaced metadata from top-level directory 2016-09-30 19:18:09 -05:00
Sam Grove 23f70906eb Merge pull request #2845 from javier-moreno-tridonic-com/feature-detailed-memap 
[Tools] Added -d (--detailed) paremeter to unfold 'Misc' contents in memap.py table
 2016-09-30 18:54:45 -05:00
Brian Daniels 7a59747974 Renames IPV6 feature used in config test to STORAGE 2016-09-30 18:37:09 -05:00
Sam Grove 872363d809 Merge pull request #2854 from theotherjimmy/find-duplicates 
[Tools] Find and report duplicates
 2016-09-30 18:30:00 -05:00
Brian Daniels 64d09e1879 Adding uARM support default build profiles 2016-09-30 17:24:11 -05:00
Brian Daniels e0b0ad05cb Adding build profiles configuration to build_release.py and singletest.py 2016-09-30 16:54:34 -05:00
Jimmy Brisson 2b36d2de5c Moved detailed memap parameter to consturctor 2016-09-30 15:44:20 -05:00
Sam Grove f738351c61 Merge pull request #2859 from theotherjimmy/print-percent 
Correct percent printing
 2016-09-30 15:38:36 -05:00
Jimmy Brisson 5eed4f29d7 Add a test of find duplicates 2016-09-30 15:24:56 -05:00
Sam Grove 20756cbf77 Merge pull request #2860 from ARMmbed/event_loop_mbed_events_new 
Event loop with mbed-events
 2016-09-30 15:24:24 -05:00
Sam Grove b3522fe9d4 Merge pull request #2855 from bridadan/handle-exceptions-better 
[Tools] Handling Exceptions better when building tests
 2016-09-30 15:23:08 -05:00
Jimmy Brisson 5f8fbac56f Add documentation of exposed functions 2016-09-30 15:14:22 -05:00
Jimmy Brisson e012185602 Use toolchain notify for printing when finding dupes 2016-09-30 15:14:22 -05:00
Jimmy Brisson 9bf20486ec Stop using .Super_Target for detecting duplicates 2016-09-30 15:13:53 -05:00
Jimmy Brisson 9f7c82a37f Deduplicate find-duplicate functionality 2016-09-30 15:13:53 -05:00
Jimmy Brisson a85a384973 Add duplicate detection to project compilation 2016-09-30 15:13:53 -05:00
Jimmy Brisson 0abd5191e8 Treat c, cpp, and assembly as if they are also object files 2016-09-30 15:11:18 -05:00
Jimmy Brisson 9b187dcceb Add SUPERTARGET! Use scan_resources to find duplicates 2016-09-30 15:11:18 -05:00
Jimmy Brisson 685e2c52e2 Add a git hook script that will list all duplicate files within the directories specified 2016-09-30 15:11:18 -05:00
Jimmy Brisson 9d905a2914 Add regression test for correct percent emitting 2016-09-30 15:09:54 -05:00
Jimmy Brisson e2b248a4aa Correct percent printing 2016-09-30 15:09:54 -05:00
Sam Grove dd54f7bf43 Merge pull request #2868 from bridadan/copy-config-json-mbed-lib 
[Tools] Copying main config json file for mbed lib builds
 2016-09-30 15:03:38 -05:00
Sam Grove 761ec4423b Merge pull request #2856 from bridadan/fixing-missed-build-error-prints 
[Tools] Making all toolchains print final compiler message
 2016-09-30 15:01:20 -05:00
Sam Grove 1047ab4562 Merge pull request #2834 from bridadan/memap-consolidate 
[tools] Making memap output consistent across output formats
 2016-09-30 14:59:31 -05:00
Sam Grove 64d9665078 Merge pull request #2833 from sarahmarshy/eclipse-ref 
[Exporters] Add support for Eclipse Export
 2016-09-30 14:58:22 -05:00
Sam Grove ddc823a722 Merge pull request #2802 from theotherjimmy/toolchain-profiles 
[Tools] Add simple build profiles to toolchains
 2016-09-30 14:57:12 -05:00
Christopher Haster b789a6a9db Removed examples tests for BLE 
As mbed-events is being brought into the mbed-os tree, the examples
using the external mbed-events library will fail due to duplicate
definitions.

The tests for BLE examples will be readded after the examples are
updated to only use the mbed-events library in the mbed-os tree.
 2016-09-30 13:38:58 -05:00
Jimmy Brisson 7348b0131b Add Debug or Release to labels depending on flags 
This is a policy decision and it should /really/ be in the config system
ATM it's here for backward compatibility
 2016-09-30 13:01:16 -05:00
Sarah Marsh 3cf4d02293 [Eclipse] pyocd settings renamed 2016-09-30 10:15:26 -05:00