rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,404 Commits 1 Branch 0 Tags 1.2 GiB
Commit Graph

6431 Commits

Author SHA1 Message Date
Matthew Kennedy e605b39ab1
const (#1193) 2020-03-18 21:55:46 -04:00
rusefi 0b7a929587 progress towards start/stop 2020-03-18 19:41:12 -04:00
rusEfi d918147ea1 v12 2020-03-18 17:46:46 -04:00
rusefi 1012df4511 progress towards start/stop 2020-03-18 16:32:03 -04:00
rusefi 482967b8db progress towards start/stop 2020-03-18 15:56:17 -04:00
rusefi 09c4def495 proteus-f4 was requested 2020-03-18 11:37:53 -04:00
rusefi 76eedf1e2c proteus-f4 was requested 2020-03-18 10:19:17 -04:00
rusefi 53b43776b8 proteus-f4 was requested 2020-03-18 09:32:46 -04:00
rusEfi 2c7ee709c8 v12 & ETB progress 2020-03-18 00:24:10 -04:00
rusEfi d558b1372e v12 & ETB progress 2020-03-18 00:12:31 -04:00
rusefi 5a6d10c21f hiding SPI from MRE users 2020-03-17 15:50:42 -04:00
rusefi 2dfc039eb9 docs 2020-03-17 13:40:14 -04:00
rusefi 2a0977a1f9 Merge remote-tracking branch 'origin/master' 2020-03-17 10:21:01 -04:00
rusefi a371b32073 cj125 usability 2020-03-17 10:20:29 -04:00
rusEfi 49d5c6497f RemindMe! add 16 cylinder firing order on April 1st 2020-03-16 17:13:27 -04:00
rusEfi 2717fbe18f docs 2020-03-16 16:39:42 -04:00
rusefi 93e77c9ccf fresh config 2020-03-14 09:18:25 -04:00
Matthew Kennedy 43f3ab7624
Multispark configuration (#1190) 
* multispark

* scaling, units

* hide in "broken stuff" menu for now

Co-authored-by: Matthew Kennedy <makenne@microsoft.com>
 2020-03-14 09:13:38 -04:00
Matthew Kennedy a617cb30a5
bootloader ci (#1189) 
* bootloader ci

* trailing slash

* Revert "progress?"

This reverts commit 6085bee005.

Co-authored-by: Matthew Kennedy <makenne@microsoft.com>
 2020-03-13 22:12:52 -04:00
rusefi 6085bee005 progress? 2020-03-13 21:23:58 -04:00
rusefi 1c16038150 progress 2020-03-13 20:36:07 -04:00
rusefi 97ce0eda46 fixing build? 2020-03-13 20:30:07 -04:00
Matthew Kennedy bb9c851a07
Deduplicate mpu_util headers (#1187) 
* this flag did nothing

* header dedupe

* mre fix again

* get all dependencies in mpu_util.h

* guard can/spi

* more dedupe

* pragma once

Co-authored-by: Matthew Kennedy <makenne@microsoft.com>
 2020-03-13 18:48:22 -04:00
Matthew Kennedy fc051fd2ca
remove (#1188) 
Co-authored-by: Matthew Kennedy <makenne@microsoft.com>
 2020-03-13 17:19:29 -04:00
Matthew Kennedy 5fc82e21f8
Move can_hw.cpp in to drivers folder (#1184) 
* relocate

* include path

* simulator makefile

* fix mre while we're at it

* it would help if I fixed it right
 2020-03-13 09:50:43 -04:00
rusefi 84807e8439 docs & wall 2020-03-13 02:27:44 -04:00
rusEfi ecf1e602b0 docs 2020-03-12 00:20:05 -04:00
rusEfi d047340725 v12 2020-03-12 00:16:32 -04:00
rusEfi 620088cdc1 v12 2020-03-11 20:48:09 -04:00
rusEfi e065da52df wall of text 2020-03-11 03:08:20 -04:00
rusEfi cbf45d1df5 TPS#2 gauge 2020-03-11 02:10:57 -04:00
rusefi 70c2f6990f Merge branch 'master' of https://github.com/rusefi/rusefi 2020-03-10 19:12:53 -04:00
rusefi ff7438162b In case of incompatible firmware and console we have a vague error message fix #1180 2020-03-10 19:12:37 -04:00
Matthew Kennedy c19f3e4caa
Control stepper with dual H-bridges (#1121) 
* divorce stepper from hw

* oops

* ptr not ref

* hbridge stepper

* typo

* hook up twin h

* hook up hardware

* use config field

* hook up motor repo

* guard tests

* whoops

* ok fix for real

* ok that's the right thing

* do full stepping

Co-authored-by: Matthew Kennedy <matthew@mck-mbp-15.stagpad.local>
Co-authored-by: Matthew Kennedy <matthew@mck-mbp-15.local>
 2020-03-10 15:18:29 -04:00
rusefi 2a07d4f2e4 H-bridge 2020-03-10 14:32:20 -04:00
Matthew Kennedy 1cdd1b86a9
hbridge idle ui (#1178) 2020-03-10 14:31:00 -04:00
rusEfi ca8a3b1e1f more of the same 2020-03-09 19:29:10 -04:00
rusEfi f62364fe39 stepper in TS should be output not any 2020-03-09 19:15:13 -04:00
rusefi 16930da2d3 hard-coding miata Nb2 VVT Ratio magic 2020-03-09 16:59:19 -04:00
rusefi 9a170bda58 better message 2020-03-08 09:17:55 -04:00
rusefi 7144d8f843 date 2020-03-08 09:17:43 -04:00
rusefi 1892cfe6b7 logicAnalyzerMode was unused, removing for now 2020-03-08 09:14:49 -04:00
Matthew Kennedy 9f26e6d894
fix icu trigger polarity (#1177) 
* fix polarity

* fix confusing names
 2020-03-08 08:57:21 -04:00
rusEfi bd93d9e204 date 2020-03-07 15:55:08 -05:00
Matthew Kennedy 9f27f95d14
ignore vbus (#1175) 2020-03-07 15:53:38 -05:00
Matthew Kennedy c1319342d5
don't use standard sprintf/snprintf (#1174) 2020-03-07 10:28:18 -05:00
Matthew Kennedy e32be1799d
Simplify flash logic (#1154) 
* simplify flash stuff

* put those back for now

* and those

* extra check

* fix

* crc the correct thing

* undo crc changes

* unwind
 2020-03-07 10:23:30 -05:00
rusEfi 9316272f90 slow v12 progress 2020-03-07 00:45:45 -05:00
rusefi a33d479683 CLT stops working when using 2-0 custom trigger wheel #1171 2020-03-06 01:31:04 -05:00
rusefi 0a7356cf39 code style 2020-03-06 01:26:33 -05:00
rusefi f93ac0751d better invalid configuration handling 2020-03-05 21:16:45 -05:00
Matthew Kennedy 40b0783205
Split out EtbHardware (#1168) 
* start tear out motor

* fix

* nuke reconfig

* guard for test

* test fixing

* format, condense headers

* fix todos

* undo todo

* format
 2020-03-03 17:56:50 -05:00
Matthew Kennedy 986b80671b
warnings (#1169) 2020-03-03 08:37:02 -05:00
rusEfi 86c6494ff7 debugFieldF1List great stuff!!! 2020-03-02 21:01:17 -05:00
960 47eeebed05
Update rusefi.input (#1165) 2020-03-02 20:54:47 -05:00
rusefi d09901f5ba proteus 2020-03-02 20:06:52 -05:00
Matthew Kennedy 439b998cd6
proteus prepend (#1166) 2020-03-02 20:02:25 -05:00
rusefi 3bf4219ad6 useHbridges 2020-03-02 19:49:47 -05:00
rusefi 2db8157e44 better setting name and help? 2020-03-01 22:32:09 -05:00
rusefi c553877d3d hiding "Analog divider" from MRE 2020-03-01 09:21:39 -05:00
rusefi 948bb2e70a mapping docs 2020-02-29 23:22:39 -05:00
rusefi f088bcf1f1 MRE PNP 2020-02-29 23:15:04 -05:00
rusefi df993c47f6 PC simulator: TS over HW VSP wants lower blockingFactor fix #794 2020-02-28 18:12:22 -05:00
rusefi 17af8e27f7 todo NB2 2020-02-27 21:28:31 -05:00
rusEfi 8a40c69180 v12 2020-02-27 03:29:03 -05:00
rusEfi 8cd3470caf throttle2Position 2020-02-27 03:28:49 -05:00
rusEfi 95160967dd throttle2Position progress 2020-02-27 03:21:42 -05:00
rusEfi 1acbac9896 we need tpsinfo especially when data is invalid! 2020-02-27 02:21:01 -05:00
rusEfi 8c38bd5ad1 verboseTLE8888 2020-02-27 02:11:20 -05:00
rusefi 877d140ffc fixing build 2020-02-27 01:51:21 -05:00
rusEfi 89e6a33545 giving C code access to CONFIG 2020-02-27 01:32:26 -05:00
rusEfi 3312dd8112 verboseTLE8888 2020-02-27 01:11:44 -05:00
Matthew Kennedy 397907a06f
Support disabling most/all features (#1162) 
* this flag did nothing

* guard features properly
 2020-02-26 18:16:35 -05:00
Matthew Kennedy 6c747ebbbe
this flag did nothing (#1161) 2020-02-26 17:30:02 -05:00
Matthew Kennedy ada5d5fee7
insert dsb on flash write (#1160) 2020-02-25 23:52:11 -05:00
rusEfi c35f4aa2e3 more mc33816 2020-02-25 22:38:08 -05:00
rusEfi 1ce1f43a49 fresh generated 2020-02-25 22:01:13 -05:00
rusefi ce2ec3d544 TEST_33816 2020-02-25 21:35:21 -05:00
Matthew Kennedy 6307a446d3
Omit canned configs from Proteus (#1159) 
* omit presets from proteus

* ifdef guard
 2020-02-25 19:46:22 -05:00
Matthew Kennedy 836aca5426
default to O2 (#1155) 2020-02-24 21:49:04 -05:00
Matthew Kennedy 8647abd22b
Add single flag for omitting PnP configs (#1157) 
* switch to single enable flag

* engine_configuration.cpp
 2020-02-24 19:08:02 -05:00
Matthew Kennedy 0b72db0811
split out scaled channel header (#1156) 
* split out scaled channel header

* update header
 2020-02-24 16:47:10 -05:00
rusefi 9c0bcd4be0 v12 2020-02-24 00:20:36 -05:00
rusefi 9decb79a5e migrate slow ADC to software timer so that TIM8 is also available for input capture #630 2020-02-24 00:12:51 -05:00
rusefi 97d68ccbfa MRE technical info 2020-02-24 00:12:26 -05:00
rusefi b4c371f44d v12 2020-02-23 09:16:11 -05:00
rusefi 04a4e2bca3 ETB: expand automated testing #115 2020-02-22 23:18:02 -05:00
rusEfi 299dd7e836 better trigger LiveDocs 2020-02-22 15:39:00 -05:00
rusEfi 1fd4e01693 better script name 2020-02-22 15:38:21 -05:00
rusefi 40145ab09c minor progress 2020-02-22 13:04:19 -05:00
rusefi 890984214f explicit cross-referencing 2020-02-21 20:08:16 -05:00
rusefi bb25c0a716 poke CI 2020-02-21 19:50:43 -05:00
Matthew Kennedy 6038dc203b
minor simplify spark (#1150) 
* simplify

* rename
 2020-02-21 19:35:11 -05:00
rusefi 59ff1713c2 "so I guess defaults are fine then, maybe add main relay = PB9" 2020-02-21 19:31:36 -05:00
rusefi 2bace565d2 M73 2020-02-19 22:34:51 -05:00
rusefi a7e5e5280b proteus 2020-02-19 22:34:38 -05:00
rusEfi 84995652df reviving FRANKENSO_QA_ENGINE 2020-02-18 17:53:56 -05:00
rusefi 548ecc8cfb bugfix - new option was flipped in TS 2020-02-18 16:38:57 -05:00
rusefi ec5ec558c2 my take on useRunningMathForCranking 2020-02-18 10:47:39 -05:00
rusefi b84971cc6a code style & pleasing LGTM 2020-02-18 08:16:19 -05:00
rusEfi ca1d44ae2c vbatt MRE happiness 2020-02-16 16:59:33 -05:00
rusefi d5faa3b517 making migration seamless on useRunningMathForCranking 2020-02-16 16:13:15 -05:00
rusefi c4e1e1e928 dreams about useFixedMsForCranking 2020-02-15 19:17:42 -05:00
rusefi 64c83fa4cd he owes me one now 2020-02-14 23:03:26 -05:00
rusefi e9a3b218c4 miata vvt trigger decoding is broken #1145 2020-02-14 13:02:27 -05:00
rusefi ed2b7578a5 Merge remote-tracking branch 'remotes/origin/2019.12.25_release_1.19.12_xmas' 2020-02-14 10:50:50 -05:00
rusefi 75d9417131 miata vvt trigger decoding is broken #1145 2020-02-14 00:37:36 -05:00
rusEfi fe063d53cd proper 'f' syntax 2020-02-12 23:16:46 -05:00
rusEfi 67c4fe9f63 catching up 2020-02-12 22:56:31 -05:00
rusEfi aed1152c7a MRE divider 2020-02-12 22:15:36 -05:00
rusefi 333a7a6608 TLE8888 watchdog #917 2020-02-12 19:32:40 -05:00
rusefi deb73f505b #917 progress 2020-02-12 17:37:45 -05:00
rusefi efc8d69085 and fixing build now! 2020-02-12 17:23:22 -05:00
rusefi 6c843e6954 tle8888 refactoring already - extracting method 2020-02-12 17:19:58 -05:00
rusEfi abf0f950e7 Merge branch 'master' of https://github.com/rusefi/rusefi 2020-02-12 08:54:41 -05:00
rusEfi 01855b9c85 more commands 2020-02-12 08:53:50 -05:00
dron0gus 3b61334714
tle8888: disable diagnostic for outputs (#1144) 
DS is not clear, may be tle8888 clears OE bit in case of error on
output.
 2020-02-12 08:53:35 -05:00
rusEfi 74ead04e84 tle8888 dump at init 2020-02-12 08:34:26 -05:00
rusEfi 86b3332cfe have nothing else to do :( 2020-02-12 08:24:24 -05:00
rusEfi 4dbff5ff30 tle8888 output fix 2020-02-12 08:15:55 -05:00
rusefi 5665e43954 tle8888 output fix 2020-02-12 08:04:33 -05:00
rusEfi 2eec13007e FATAL error running MRE blinking test #1137 
typo
 2020-02-11 17:52:01 -05:00
rusEfi 1e010c8e82 Merge branch 'master' of https://github.com/rusefi/rusefi 2020-02-11 17:49:49 -05:00
rusEfi 8c1536dd0e FATAL error running MRE blinking test #1137 
still not the fix?
 2020-02-11 17:49:39 -05:00
dron0gus 82e33e45af
Tle8888 wd (#1143) 
* tle8888: watchdog: debug over TS: remove tailing register address

* tle8888: ann console command to dump all regs
 2020-02-11 17:49:14 -05:00
dron0gus 678c3525b8
tle8888: watchdog: debug using TS (#1142) 2020-02-11 16:56:52 -05:00
dron0gus 95ce978c23
tle8888: watchdog: use FWDRespSyncCmd for last response (#1140) 2020-02-11 15:49:17 -05:00
dron0gus 7bd68beae9
tle8888: watchdog: do not overwrite defaults, response table fix (#1139) 2020-02-11 15:36:53 -05:00
rusEfi 6b874c12c0 TLE8888 watchdog #917 
still no luck. responses 0x85c and 0xa5c
 2020-02-11 00:54:15 -05:00
rusEfi cd9c291e3e WdDiag 2020-02-10 21:28:55 -05:00
rusEfi 41253b88b8 TLE8888 watchdog #917 
time to start working?!
 2020-02-10 18:32:32 -05:00
rusEfi a29d6fc241 TLE8888 watchdog #917 
maybe better start-up sequence
 2020-02-10 17:08:37 -05:00
rusEfi 0b8c1e69dc TLE8888 watchdog #917 2020-02-10 14:37:52 -05:00
rusEfi 59eb424ba0 TLE8888 watchdog #917 
window watchdog progress
 2020-02-10 13:24:09 -05:00
rusefi b3bc3325b9 TLE8888 watchdog #917 
first steps
 2020-02-10 11:11:00 -05:00
rusefi cb8612a15c code style 2020-02-10 09:29:11 -05:00
rusEfi 551273a336 FATAL error running MRE blinking test fix #1137 2020-02-09 21:16:31 -05:00
rusEfi 51cfc6bcf1 tle8888 start-up clean-up 2020-02-09 20:41:25 -05:00
Matthew Kennedy 2add78b242 we already have a timestamp, don't take another one (#1133) 2020-02-08 17:48:15 -05:00
Matthew Kennedy 98e6e4b0eb Fix master (#1134) 
* Revert "something went very wrong."

This reverts commit 53179dfd22.

* Revert "trying to fix build broken by "Sensor reconfiguration while running (#1131)""

This reverts commit 0bf32a7291.

* Revert "partial Revert of "Stricter compile options (#1132)""

This reverts commit a17cc28382.

* temp prometheus fix

* fix bootloader

* fix batch files
 2020-02-08 16:34:29 -05:00
rusefi 53179dfd22 something went very wrong. 
first we have functional defects
that we do not write test to cover newly intdroduced defects
then attempts to fix defects do not compile
 2020-02-08 08:15:46 -05:00
rusefi 0bf32a7291 trying to fix build broken by "Sensor reconfiguration while running (#1131)" 2020-02-08 07:26:54 -05:00
rusefi a17cc28382 partial Revert of "Stricter compile options (#1132)" 2020-02-08 07:08:22 -05:00
Matthew Kennedy 8c118f2fbe
Stricter compile options (#1132) 
* stricter

* don't warn on that one

* this code was dead
 2020-02-08 08:05:40 -03:00
Matthew Kennedy a00c1a5be9 Sensor reconfiguration while running (#1131) 
* reconfigure sensors

* docs

* doc
 2020-02-08 06:22:23 -03:00
Matthew Kennedy 4d1d2672ce
tps header cleanup (#1130) 
* tps header cleanup

* dead code
 2020-02-07 23:20:14 -03:00
Matthew Kennedy f7282966d2
Consume new tps in status_loop.cpp, settings.cpp (#1129) 
* new tps

* more

* settings.cpp too

* more

* comment
 2020-02-07 06:05:15 -03:00
rusefi 0d1f45422e cam/vvt decoder 2020-02-05 01:49:33 -05:00
Matthew Kennedy 52c710bb62
move flash addr in to mpu_util (#1123) 
* move flash addr in to mpu_util

* this _may_ work

* don't use offsetof

* proper header + defines
 2020-02-05 08:06:38 +05:30
Matthew Kennedy 20465107ed
boost format & cleanup (#1126) 2020-02-05 06:47:31 +05:30
rusefi 9517da33c3 sign/unsign 2020-02-04 13:47:43 -05:00
Matthew Kennedy d1c619879c
more signed vs. unsigned ts (#1124) 2020-02-04 11:47:01 -05:00
Matthew Kennedy 6ebc49ce8b
Use new sensors for TPS (#1111) 
* tps init

* fix init

* call init

* use correct sensors, scale using constant

* includes

* handle error
 2020-02-04 01:54:05 -05:00
rusefi 6888b09c53 Three wire idle air valve #1122 
ugly but should work to begin with
 2020-02-04 01:22:04 -05:00
rusefi c4c28431f2 Three wire idle air valve #1122 
ugly but should work to begin with
 2020-02-04 01:06:20 -05:00
rusefi c2e02cc235 fixing build 2020-02-02 13:18:41 -05:00
rusefi 0ea8407097 launch dreams 2020-02-02 12:23:55 -05:00
ola d49e253bff Some initial work at Launch/ALS 
(cherry picked from commit 07b3a0632f6673ad57db5b2d6b8ad21674cf3509)
 2020-02-02 12:17:06 -05:00
rusefi 7a4a4c2c64 more Proteus CI 2020-02-02 08:42:05 -05:00
rusefi c8f130f996 Boost Control is experimental/Alpha Version 2020-02-02 08:38:15 -05:00
960 4b4e683957
Boost pr (#1114) 
* boost control

* cleanup

* Delete rusefi_config.txt

* Add files via upload

* Delete rusefi_config.txt

* Add files via upload

* Update rusefi.input

* Update boost_control.cpp
 2020-02-02 03:56:21 -05:00
Matthew Kennedy 8c3d8d5665
more proteus pins (#1118) 2020-02-02 02:38:15 -05:00
rusefi 6022838656 looking forward 2020-02-01 17:55:58 -05:00
rusefi 6c6cfb5714 Merge branch 'master' of https://github.com/rusefi/rusefi 2020-02-01 17:30:19 -05:00
Matthew Kennedy 7682192c2b
Simplify fuel math again (#1117) 
* return the scheduled time from scheduleByAngle

* simplify fueling math
 2020-02-01 17:29:55 -05:00
rusefi 48ee092ac6 reducing headers 2020-02-01 17:27:24 -05:00
Matthew Kennedy c7dce2e38b
Rescale TPS (#1112) 
* fake adc ticks

* consumers

* fix test 1

* fix tests
 2020-02-01 16:41:07 -05:00
rusefi 5a21964925 Matt does this look right? 2020-02-01 14:45:55 -05:00
rusefi e7deff7a79 proteus build into CI 2020-02-01 14:27:41 -05:00
rusefi 371e1cb7f6 DBG_BOOST 2020-01-31 23:58:15 -05:00
rusefi 7c714e5727 opening the door to boost controller! 2020-01-31 14:29:52 -05:00
rusefi c2f0a30397 opening the door to boost controller! 2020-01-31 14:23:15 -05:00
rusefi f6e7e8871a VVT refactoring & assertions for VVT test 2020-01-31 01:49:10 -05:00
rusefi b6e0bc7ed1 date & VVT test progress 2020-01-31 01:23:01 -05:00
rusefi d48a57d599 refactoring: extracting DEEP_IN_THE_PAST_SECONDS contant 2020-01-31 01:21:56 -05:00
rusefi b6fe6555e0 lovely tiny bug which mostly affects NB2 with an impossible one tooth crank trigger wheel 2020-01-30 01:47:34 -05:00
rusefi cf087218c9 micro refactoring 2020-01-30 01:20:41 -05:00
Matthew Kennedy d004efa844
minor proteus default config & mapping fixes (#1113) 
* vbatt and can

* correct comment

* fix mapping
 2020-01-29 23:32:48 -05:00
Matthew Kennedy ff3329655a
Dont cache dma buffers (#1110) 
* add no_cache

* don't disable cache

* conventions

* formatting
 2020-01-29 00:32:43 -05:00
rusefi 688a85a25d reusing constant 2020-01-28 00:27:30 -05:00
rusefi d9b96fe509 extracting class & codes clean-up 2020-01-28 00:16:33 -05:00
rusefi b637757e57 reducing magic constants 2020-01-27 23:45:46 -05:00
rusefi 282cd8e1ac trigger refactoring 2020-01-26 14:20:55 -05:00
rusefi 6e128a341b code style 2020-01-26 13:58:47 -05:00
rusefi a53d9c587a trigger refactoring 2020-01-26 13:51:35 -05:00
rusefi 241d491625 trigger refactoring 2020-01-26 12:02:54 -05:00
rusefi 67bda5f088 good thing we have CI - fixing build 2020-01-26 09:00:46 -05:00
rusefi 03d2aae681 reducing code duplication 2020-01-26 06:35:51 -05:00
rusefi 51ab9f5b57 reducing code duplication 2020-01-26 06:28:33 -05:00
rusefi 080e7e12db trigger refactoring 2020-01-26 06:12:01 -05:00
rusefi 154b679491 refactoring: de-coupling trigger decoder and engine 2020-01-26 03:48:25 -05:00
rusefi db2ab72d12 refactoring trigger 2020-01-26 03:33:45 -05:00
rusefi 1817b8654e SCB_DisableDCache rollback 2020-01-25 21:30:19 -05:00
rusefi af8383ae3a trigger refactoring 2020-01-25 11:22:25 -05:00
rusefi 0f23faba28 trigger refactoring 2020-01-25 02:00:33 -05:00
rusefi 31a92f1e9d clean-up 2020-01-25 01:42:48 -05:00
rusefi fea2394c7b F7 SPI challenges 2020-01-24 23:52:56 -05:00
rusefi aabc50e7a9 refactoring trigger 2020-01-24 13:42:09 -05:00
rusefi 3056154fe6 refactoring trigger 2020-01-23 13:39:50 -05:00
rusefi cc1c4c9dcb refactoring - de-coupling trigger 2020-01-22 13:25:35 -05:00