Konstantin Kondrashov
de2b1cb02a
make: Add feature to cmd 'make flash' - reset ota_data partition
...
Add a command `make erase_ota` - erases otadata if it there is in the
partition table otherwise error 'Partition table does not have ota_data partition'.
Closes https://github.com/espressif/esp-idf/issues/1821
2018-07-25 11:22:15 +00:00
Ivan Grokhotkov
9a2583122c
heap/tests: make IRAM allocation size divisible by 4
...
heap_caps_malloc will fail to poison a block in IRAM with size not
divisible by 4. The proper fix will be to make poisoning code
smarter, or to disallow allocations from IRAM with size not aligned
by 4.
2018-07-25 09:45:39 +03:00
Angus Gratton
4f2fe93bc1
Merge branch 'feature/idf-fs-profile-modifications' into 'master'
...
IDF fs profiling tool modifications
See merge request idf/esp-idf!2705
2018-07-25 08:56:04 +08:00
Angus Gratton
21f327060b
Merge branch 'bugfix/host_tools_warnings' into 'master'
...
Fix host tools warnings
See merge request idf/esp-idf!2729
2018-07-25 08:55:29 +08:00
Ivan Grokhotkov
caeab09f65
Merge branch 'bugfix/src_encoding' into 'master'
...
Correct source code encoding
See merge request idf/esp-idf!2820
2018-07-24 22:03:46 +08:00
Ivan Grokhotkov
d50c03cc7d
Merge branch 'bugfix/unit-test-build-fix' into 'master'
...
unit-test-app: don’t include project.mk for ut- targets
See merge request idf/esp-idf!2619
2018-07-24 20:48:12 +08:00
Ivan Grokhotkov
f3260cc30f
test/uart: fix compilation warning
2018-07-24 09:56:40 +03:00
Ivan Grokhotkov
a981e73e22
heap: move get_all_caps to IRAM, used in unit test
2018-07-24 09:56:40 +03:00
Ivan Grokhotkov
964087b7c8
freertos: bump limit for spinlock performance test to 300 cycles
2018-07-24 09:56:40 +03:00
Ivan Grokhotkov
81ce7e4afa
newlib: fix unit test for psram config
2018-07-24 09:56:40 +03:00
Ivan Grokhotkov
7a154d6a4e
heap: fix unit test for the case when less than 10k of IRAM is available
2018-07-24 09:56:40 +03:00
Ivan Grokhotkov
253930acd1
spi_master, ulp: fix aliasing errors in unit tests
2018-07-24 09:54:55 +03:00
Angus Gratton
28787ad392
Merge branch 'bugfix/bootloader_dev_zero_app_count' into 'master'
...
bootloader: Fix issue - bs->app_count is zero but ota_data have valid entry
See merge request idf/esp-idf!2842
2018-07-24 14:41:05 +08:00
Renz Bagaporo
8ce14d0406
console: Suppress unused warning asprintf result
2018-07-24 06:08:48 +00:00
Renz Bagaporo
4355eb1bc2
console: Ignore var cloberred warning for argtable
2018-07-24 06:08:48 +00:00
Renz Bagaporo
d31b31787c
spiffs: Explicitly indicate unused value
2018-07-24 06:08:48 +00:00
Angus Gratton
beb3611ca3
Merge branch 'bugfix/fix_pcnt_isr_service_register_bug' into 'master'
...
driver(pcnt): fix the pcnt isr service can not be re registered bug.
See merge request idf/esp-idf!2439
2018-07-24 13:49:45 +08:00
Angus Gratton
002bf37f14
Merge branch 'bugfix/unit_test_thread_local_storage' into 'master'
...
ci/esp32: Fix race in "TLS Test" where s_task can go out of scope before cleanup finishes
See merge request idf/esp-idf!2794
2018-07-24 13:43:41 +08:00
Konstantin Kondrashov
8c808c2d9a
bootloader: Fix issue - bs->app_count is zero but ota_data have valid entry
...
If we have the partition table without any ota_apps but in ota_data have
valide entry, in this case we get an error(hang). This commit fix this
case. If bs->app_count is zero when selecting the factory app.
Closes https://github.com/espressif/esp-idf/issues/2218
2018-07-24 13:09:32 +08:00
kooho
01516abe5a
Add some comments in pcnt.h.
2018-07-24 10:33:58 +08:00
Ivan Grokhotkov
baa4613fc1
Merge branch 'bugfix/fix_touchpad_wakeup_status' into 'master'
...
fix(sleep): swap touchpad num in wakeup status
See merge request idf/esp-idf!2708
2018-07-24 04:08:43 +08:00
Ivan Grokhotkov
15b22e5aa5
spiffs: add test case for readdir_r with large number of files
...
Ref. https://esp32.com/viewtopic.php?f=13&t=6486
2018-07-23 15:34:18 +03:00
Angus Gratton
0905aa0103
Merge branch 'bugfix/bootloader_include_priv' into 'master'
...
bootloader_support: Rename include_priv directory to include_bootloader
See merge request idf/esp-idf!2686
2018-07-23 18:50:35 +08:00
Angus Gratton
b5db59ec31
Merge branch 'bugfix/http_client_enhanced' into 'master'
...
esp_http_client: Resolve some bugs from the github community
See merge request idf/esp-idf!2831
2018-07-23 17:55:49 +08:00
Angus Gratton
fbec7de7f8
bootloader_support: Rename include_priv directory to include_bootloader
...
Old rationale for "priv" no longer applies.
As reported here: https://esp32.com/viewtopic.php?f=13&t=6155&p=27151#p26601
2018-07-23 15:58:27 +10:00
David Cermak
409c91bcb9
removed possible uint16 access to 32bit register, noted fifo use not recommended
2018-07-23 07:57:18 +02:00
Renz Bagaporo
70e68c99d3
Modifications for fs profiling tool
2018-07-23 05:24:33 +00:00
Tuan PM
6ef558320a
esp_http_client: Resolve some bugs from the github community
...
- Closes https://github.com/espressif/esp-idf/issues/2135
- Closes https://github.com/espressif/esp-idf/issues/2208
- Closes https://github.com/espressif/esp-idf/issues/2213
2018-07-23 12:22:19 +07:00
Angus Gratton
5f2f84c220
Merge branch 'feature/http_server_finalize' into 'master'
...
Feature add HTTP Web Server component
See merge request idf/esp-idf!2606
2018-07-23 13:11:04 +08:00
Angus Gratton
cf614120a5
Merge branch 'bugfix/reclaim_bt_ble_bss' into 'master'
...
components/bt: Reclaim BT/BTDM BSS in bluetooth memory release function
See merge request idf/esp-idf!2750
2018-07-23 12:48:13 +08:00
Angus Gratton
e75a1129e0
Merge branch 'bugfix/bootloader_noreturn_always' into 'master'
...
bootloader: Ensure bootloader never returns to caller
See merge request idf/esp-idf!2815
2018-07-23 11:56:14 +08:00
Angus Gratton
b6a7458e14
esp32 tests: TLS test: use same size stack for static & non-static task
...
Use constant instead of magic number of task priorities.
2018-07-23 03:54:44 +00:00
Angus Gratton
7313f3f925
esp32: Fix race in "TLS Test" where s_task can go out of scope before cleanup finishes
...
Probable cause for CI failures of "LoadStoreError" after this task finishes running.
2018-07-23 03:54:44 +00:00
Angus Gratton
ae24c13da2
Merge branch 'bugfix/secure_boot_padding' into 'master'
...
secure boot: Fix padding issue allowing unverified data to be mapped into the address space
See merge request idf/esp-idf!2778
2018-07-23 11:44:50 +08:00
Anton Maklakov
ea1a99bcb9
Merge branch 'cermak_fuzzer_ci_job' into 'master'
...
added CI job for AFL fuzzer tests
See merge request idf/esp-idf!2537
2018-07-23 09:41:10 +08:00
Deng Xin
faede72435
Wifi: add compatible to ccmp encryption
2018-07-21 14:37:27 +08:00
Jiang Jiang Jian
8892174383
Merge branch 'bugfix/coex_pause' into 'master'
...
fix coex pause cause bluetooth performance decrease
See merge request idf/esp-idf!2741
2018-07-21 14:22:09 +08:00
Konstantin Klitenik
3486b51388
Fix stackoverflow due to recursion in vfs_spiffs_readdir_r
2018-07-20 10:27:53 -04:00
Ivan Grokhotkov
0e3694b542
Merge branch 'feature/freertos_vtasklist_xcoreid' into 'master'
...
freertos: Add option to display xCoreID in vTaskList
See merge request idf/esp-idf!2728
2018-07-20 18:46:41 +08:00
Anurg Kar
656bef7bb7
Http Server : Add a simple light weight HTTP Server Component.
...
Also add examples, docs and test apps for the HTTP Server.
2018-07-20 15:49:17 +05:30
David Cermak
0c147648f7
added CI job for AFL fuzzer tests
2018-07-20 10:28:12 +02:00
Tian Hao
6e4342a877
bt : fix bug that bluetooth controller init/disable/enable/disable may cause exception
...
1. when one task do deinit/init/disable/enable, especially different cpu
core, it may cause controller crash in ISR handler
2. fix while BLE is scanning, bluetooth controller is disabled cause BLE
scan is not abort.
2018-07-20 14:10:55 +08:00
Hrishikesh Dhayagude
f610249bdd
Reclaim BT/BTDM BSS and Data in bluetooth memory release function
...
1. Modify esp_bt_controller_mem_release() to release BTDM BSS and Data to heap if
ESP_BT_MODE_BTDM mode is passed to it
2. Add a new API esp_bt_mem_release() which internally calls
esp_bt_controller_mem_release() with the provided mode and then if mode
is ESP_BT_MODE_BTDM, releases BT BSS and Data to heap.
Background:
For Wi-Fi and BT/BLE applications, for e.g. the usecase is like when
Bluetooth is used for provisioning and once the device is connected to the Wi-Fi
AP, we can turn off Bluetooth completely. In such scenarios, it should be possible to
reclaim all the memory of Bluetooth. Although, currently this does not
happen.
Experiment:
Made the following modifications to examples/bluetooth/gatt_server :
1. Added support of simple_wifi to it
2. Moved all the bluetooth related code under CONFIG_BT_ENABLED config
option
3. Calculated the free heap in 2 similar scenarios:
i. Disabled BT (CONFIG_BT_ENABLED undefined) and checked the free
heap after STA connected
ii. Kept BT enabled and disabled it after STA connected and checked
the free heap
Ideally, the numbers for i., ii. above should have been similar. But
there was a delta of almost 30-31K. (i. > ii.)
4. Through make size-components checked the common BSS for libbta.a and libbtdm_app.a
and found it to be almost 30K. Data is around 1K
Solution:
1. Modified the linker script to mark the BSS and Data for these libraries and
free it when ESP_BT_MODE_BTDM mode is passed to mem release APIs.
2. Verified that the free heap is comparable for i. and ii. above.
Note: It is known that once this is done, Bluetooth can only be used
again post reboot.
Signed-off-by: Hrishikesh Dhayagude <hrishi@espressif.com>
2018-07-20 11:33:26 +05:30
Jiang Jiang Jian
e4fb359c34
Merge branch 'bugfix/btdm_bt_remove_device_fail_when_ble_connected' into 'master'
...
component/bt: Fix bug of remove bond device fail when BLE and BT are connectd at the same time
See merge request idf/esp-idf!2767
2018-07-20 10:46:31 +08:00
Angus Gratton
45275ab189
Merge branch 'feature/nvs_multipage_blob' into 'master'
...
nvs-flash: Support for blobs larger than half of SPI Flash sector size
See merge request idf/esp-idf!2182
2018-07-20 09:13:34 +08:00
Sagar Bijwe
5a27a63541
nvs-flash: Support for blobs larger than half of SPI Flash sector size
...
This change removes the earlier limitation of 1984 bytes for storing data-blobs.
Blobs larger than the sector size are split and stored on multiple sectors.
For this purpose, two new datatypes (multi-page index and multi-page data) are
added for entries stored in the sectors. The underlying read, write, erase and find
operations are modified to support these large blobs. The change is transparent
to users of the library and no special APIs need to be used to store these large
blobs.
2018-07-20 00:13:15 +05:30
Roland Dobai
0efb4a11ec
Correct source code encoding
2018-07-19 14:00:44 +02:00
Ivan Grokhotkov
fec079cd44
Merge branch 'bugfix/rtc_io_hold_regs' into 'master'
...
Fix errors in rtc_gpio_desc values
See merge request idf/esp-idf!2765
2018-07-19 15:04:42 +08:00
Angus Gratton
f0d74b1c64
bootloader: Ensure bootloader never returns to caller
...
* Fixes some "noreturn" functions in bootloader utils which did return (causing fatal CPU
exceptions).
* Marks bootloader entry as "noreturn", preventing "user code done" from stalling boot
Partial fix for https://github.com/espressif/esp-idf/issues/1814 TW20016
(Comprehensive fix for this issue will be enabling WDT during bootloader, coming shortly.)
2018-07-19 16:24:11 +10:00
Wang Jia Lin
de907e8801
Merge branch 'bugfix/rmt_mem_num_maximum_limit_is_not_accurate' into 'master'
...
bugfix(rmt): Modify the rmt_mem_num maximum limit value from 15 to 8.
See merge request idf/esp-idf!2734
2018-07-18 16:15:14 +08:00
Ivan Grokhotkov
c46b8178f2
Merge branch 'bugfix/sdmmc_auto_stop_cmd' into 'master'
...
sdmmc: enable host auto_stop only for certain commands
See merge request idf/esp-idf!2710
2018-07-18 14:55:45 +08:00
Ivan Grokhotkov
0b78959070
Merge branch 'bugfix/deep_sleep_flush_uart' into 'master'
...
sleep: fix flushing UARTs when entering deep sleep
See merge request idf/esp-idf!2698
2018-07-18 14:55:13 +08:00
Jiang Jiang Jian
d62293165b
Merge branch 'bugfix/btdm_using_osi_malloc_instead_of_malloc' into 'master'
...
component/bt: Using osi_malloc instead of malloc
See merge request idf/esp-idf!2748
2018-07-18 11:09:28 +08:00
Angus Gratton
aa4d77467b
Merge branch 'bugfix/esp_err_ignore_dirs' into 'master'
...
esp32: Do not document error codes defined in examples
See merge request idf/esp-idf!2732
2018-07-18 08:29:53 +08:00
Tian Hao
cf14826100
fix coex pause cause bluetooth performance decrease
...
1. it may cause BLE connection unstable
2. it may cause Classic BT connection unstable
3. it may cause BLE/BREDR scan performance decrease
2018-07-17 21:06:57 +08:00
Jiang Jiang Jian
603ce05376
Merge branch 'bugfix/ampdu_duplicate' into 'master'
...
wifi: fix ampdu duplicate issue
See merge request idf/esp-idf!2742
2018-07-17 20:45:45 +08:00
fuzhibo
54a67d92a4
fix(sleep): swap touchpad num in wakeup status
2018-07-17 20:25:06 +08:00
Ivan Grokhotkov
5376a06d7b
Merge branch 'bugfix/range_CONFIG_ESP32_RTC_CLK_CAL_CYCLES' into 'master'
...
soc/clk: Fix range CONFIG_ESP32_RTC_CLK_CAL_CYCLES
See merge request idf/esp-idf!2719
2018-07-17 19:43:11 +08:00
Ivan Grokhotkov
cffaa9f5b5
freertos: add configTASKLIST_INCLUDE_COREID
2018-07-17 10:57:26 +00:00
Dave McNaughton
0fb1945482
Added: display xCoreID in vTaskList
...
Merges https://github.com/espressif/esp-idf/pull/2064
2018-07-17 10:57:26 +00:00
Ivan Grokhotkov
ea452920bb
Merge branch 'bugfix/time_ut_wakeup_from_deep_sleep' into 'master'
...
esp32/test: Reduces a unit test execution time
See merge request idf/esp-idf!2776
2018-07-17 18:39:15 +08:00
zhangyanjiao
d90f8c06c2
changes for timers
2018-07-17 16:46:53 +08:00
Wang Jia Lin
5480a6b6e5
Merge branch 'bugfix/clear_intr_status_when_enable_intr' into 'master'
...
driver(gpio): fix the gpio interrupt false triggering issue
See merge request idf/esp-idf!2498
2018-07-17 15:44:00 +08:00
Wang Jia Lin
e7135c53b5
Merge branch 'bugfix/fix_uart_timeout_bug_when_enable_reftick' into 'master'
...
driver(uart): Fix uart time_out bug when using ref_tick
See merge request idf/esp-idf!2775
2018-07-17 15:43:47 +08:00
XiaXiaotian
85ad8cfcfc
docs: update channel state information document
...
1. Move channel to the first row of the table.
2. Remove the condition of HT20/HT40 for they are determined by
secondary channel.
3. Clean up the CSI table.
2018-07-17 14:50:30 +08:00
Angus Gratton
5cbc4e976b
app_update: Don't double-verify secure boot signature during OTA
...
esp_image_load() already verifies the signature
2018-07-17 15:33:47 +10:00
Angus Gratton
57b601ab7f
secure boot: Pad to avoid data after the signature mapping into the address space
...
Because address space is mapped in 64KB pages, it was possible for unauthenticated data after the
app .bin to become mapped into the flash cache address space.
This problem is solved by 2 changes:
* "esptool elf2image --secure-pad" will pad the image so that the signature block ends close to the
64KB boundary. Due to alignment constraints it will be 12 bytes too short after signing (but
with flash encryption, these 12 bytes are still encrypted as part of the last block and can't be
arbitrarily changed).
* By default, secure boot now requires all app partitions to be a multiple of 64KB in size.
2018-07-17 15:33:47 +10:00
XiongYu
6d57757840
Modify the rmt_mem_num maximum limit value from 15 to 8.
2018-07-16 19:10:42 +08:00
Konstantin Kondrashov
4df7145564
esp32/test: Reduces a unit test execution time
2018-07-16 14:14:40 +05:00
chenyudong
936b8e1967
wifi: fix ampdu duplicate issue
...
fix ampdu duplicate issue
2018-07-16 17:10:58 +08:00
Jiang Jiang Jian
70f3933db1
Merge branch 'bugfix/tw23835_add_source_ip_route_for_unicast' into 'master'
...
lwip: add source ip based route for unicast packet
See merge request idf/esp-idf!2757
2018-07-16 17:01:16 +08:00
hou wen xiang
e2b9b70800
driver(uart): Fix uart time_out bug when using ref_tick
2018-07-16 16:56:14 +08:00
Angus Gratton
e5d2406b1d
Merge branch 'bugfix/spi_cs_setup_fulldup' into 'master'
...
fix(spi_master): allow to use cs_ena_pretrans in full duplex mode without…
See merge request idf/esp-idf!2576
2018-07-16 16:30:36 +08:00
Angus Gratton
fe1ffb3d1c
Merge branch 'bugfix/mdns_remove' into 'master'
...
mdns: Minor fix for mdns_service_remove()
See merge request idf/esp-idf!2760
2018-07-16 16:29:20 +08:00
Angus Gratton
e90a920ea8
Merge branch 'bugfix/add_queueset_critical_sections' into 'master'
...
freertos: Add critical sections to queue sets.
See merge request idf/esp-idf!2761
2018-07-16 15:57:35 +08:00
baohongde
11ca056320
component/bt: Fix bug of remove bond device fail when BLE and BT are connectd at the same time
2018-07-16 15:46:27 +08:00
Jiang Jiang Jian
7f382f461c
Merge branch 'feature/support_for_XM25QU64A' into 'master'
...
feature(flash): set QIO mode for XM25QU64A(1V8_64M_flash)
See merge request idf/esp-idf!2753
2018-07-16 12:16:13 +08:00
Jiang Jiang Jian
8809fabcd5
Merge branch 'bugfix/ledc_duty_and_freq' into 'master'
...
bugfix(ledc): fix bugs reported from unit-test and github.
See merge request idf/esp-idf!2735
2018-07-16 12:12:48 +08:00
Angus Gratton
68e01045f1
Merge branch 'bugfix/secure_boot_regression_partitions' into 'master'
...
Fix secure boot & flash encryption regression, don't verify partitions as part of secure boot
See merge request idf/esp-idf!2764
2018-07-16 12:07:56 +08:00
Jiang Jiang Jian
3b19269fcb
Merge branch 'feature/wifi_check_wifi_lib_git_commit_id' into 'master'
...
check WiFi library git commit id in unit test
See merge request idf/esp-idf!2621
2018-07-16 11:45:59 +08:00
Angus Gratton
cee6d7d5a9
docs: Add more ReST-isms in secure boot & flash encryption docs
...
(Original version of these docs were in Markdown.)
2018-07-16 11:52:52 +10:00
Angus Gratton
2ae758ebcb
Merge branch 'bugfix/spi_sdio_sdkconfig_include' into 'master'
...
sdio_example/spi: fix sdkconfig include issue
See merge request idf/esp-idf!2756
2018-07-16 08:00:15 +08:00
Jiang Jiang Jian
a22d6607f8
Merge branch 'bugfix/autoip_compilation' into 'master'
...
LWIP AutoIP Compilation Fixed by defining IP_IS_V4_VAL()
See merge request idf/esp-idf!2758
2018-07-15 15:19:11 +08:00
He Yin Ling
be81d2c16d
Merge branch 'test/print_debug_info_when_test_failed' into 'master'
...
tiny-test-fw: print debug info when test failed
See merge request idf/esp-idf!2564
2018-07-13 21:22:29 +08:00
Jiang Jiang Jian
6554bdcbb6
Merge branch 'bugfix/btdm_add_profile_descriptor_list_for_spp' into 'master'
...
component/bt: Add profile descriptor list for SPP
See merge request idf/esp-idf!2691
2018-07-13 19:20:03 +08:00
Jiang Jiang Jian
8571170abe
Merge branch 'feature/btdm_bt_ssp' into 'master'
...
component/bt: Add Secure Simple Pairing
See merge request idf/esp-idf!2453
2018-07-13 19:19:53 +08:00
Piyush Shah
fd8a7666c8
LWIP AutoIP Compilation Fixed by defining IP_IS_V4_VAL()
2018-07-13 15:04:39 +05:30
He Yin Ling
f348076920
esp32/test: set 60s timeout for one deep sleep case
2018-07-13 07:04:05 +00:00
Ivan Grokhotkov
b354770f42
Merge branch 'bugfix/fixes_from_github' into 'master'
...
Fixes from Github
See merge request idf/esp-idf!2730
2018-07-13 15:03:50 +08:00
Angus Gratton
8b5a2ccb8d
docs: Update Flash Encryption docs to clarify reflashing options
2018-07-13 16:18:07 +10:00
negativekelvin
8a9e3875ed
Fix errors in rtc_gpio_desc values
2018-07-12 23:16:15 -07:00
Darian Leung
21ccecc802
freertos: Add critical sections to queue sets.
...
Queue sets are not SMP safe. This commit adds
critical sections to queue sets. Unit tests for
queue sets have also been added.
2018-07-13 13:58:54 +08:00
Angus Gratton
6fd6e024fc
bootloader: Fix warning building reflashable Secure Boot image
2018-07-13 15:45:15 +10:00
Angus Gratton
fb439e48f5
bootloader: Don't verify Partition Table as part of Secure Boot
...
Partition Tables are still signed for backwards compatibility, but signature is no longer checked as
part of bootloader.
Closes https://github.com/espressif/esp-idf/issues/1641
2018-07-13 15:45:15 +10:00
Angus Gratton
7b9009ca5c
bootloader: Fix secure boot & flash encryption functionality
...
Fixes regression in 3e0ac4db79
.
2018-07-13 15:26:18 +10:00
Liu Zhi Fu
2e1427a239
lwip: add source ip based route for unicast packet
...
Add source IP based route for unicast packets forwarding.
2018-07-13 12:35:17 +08:00
Ivan Grokhotkov
46639bab85
Merge branch 'bugfix/crlf_auto_conversion' into 'master'
...
Convert CRLF (Windows line endings) to LF (Unix style), add CI check
See merge request idf/esp-idf!2119
2018-07-13 11:44:57 +08:00
Ivan Grokhotkov
6d46eed8e4
sdmmc: enable host auto_stop only for certain commands
...
Perviously host send_auto_stop flag would be set for every data
transfer over 1 block long. This caused stop commands to be sent
after CMD53, which shouldn't be done. Fix by adding an explicit list
of commands for which send_auto_stop should be set.
2018-07-13 03:28:10 +00:00
Angus Gratton
ffaf08e851
Merge branch 'fix/bootloader_typedef_enum' into 'master'
...
bootloader: fix missing typedef on enum defintion
See merge request idf/esp-idf!2718
2018-07-13 08:24:28 +08:00
Piyush Shah
5c7eb7e27b
mdns: Minor fix for mdns_service_remove()
...
Send the Goodbye packet while removing an mDNS service as an "Authoritative" packet so
that the listeners remove the service from their records immediately.
2018-07-12 19:18:54 +05:30