Commit Graph

3134 Commits

Author SHA1 Message Date
rusefi 1f111240e4 bye-bye eclipse build 2017-04-02 23:13:47 -04:00
rusefi 4eee0b2021 merge did not go well 2017-04-02 22:59:13 -04:00
rusefi b44ce30b50 bye-bye eclipse build 2017-04-02 22:44:01 -04:00
rusefi f668fc2c0c date 2017-04-02 20:57:04 -04:00
rusefi d1b94f1ca3 Merge remote-tracking branch 'origin/master' into fresh_chibios_2nd 2017-04-02 18:25:39 -04:00
rusefi d8a3318dbc nissan 4/360 progress 2017-04-02 18:14:30 -04:00
rusefi 401a0d2ce4 nissan 4/360 progress 2017-04-02 18:12:51 -04:00
rusefi fc91b6a89f nissan 4/360 progress 2017-04-02 17:59:01 -04:00
rusefi dcdafeea68 nissan 4/360 progress 2017-04-02 17:36:59 -04:00
rusefi c95c87b5d6 merging 7 lines at a time 2017-04-02 17:15:05 -04:00
rusefi f4fe723ada Merge remote-tracking branch 'origin/master' into fresh_chibios_2nd 2017-04-02 11:50:58 -04:00
rusefi b9eb26ac16 preparing to live new life 2017-04-02 11:50:05 -04:00
rusefi 4d9cb62fdb preparing to live a new life 2017-04-02 11:34:06 -04:00
rusEfi 7aae3d20ee Merge remote-tracking branch 'origin/master' into fresh_chibios_2nd
Conflicts:
	firmware/Makefile
2017-04-02 01:49:14 -04:00
rusefi 7e57111595 #375 2017-04-02 01:46:27 -04:00
rusEfi 4d49fd0cab #375 - issues with log() 2017-04-02 01:38:52 -04:00
rusEfi fe6581bd8d even better version 2017-04-02 01:15:03 -04:00
rusefi 865ada98b8 Merge remote-tracking branch 'origin/master' into fresh_chibios_2nd 2017-04-02 01:03:57 -04:00
rusefi 92b05f1eda IAR version of the code 2017-04-02 01:02:58 -04:00
rusefi 44f0fa955e refactoring: reducing code duplication / manual sync 2017-04-02 00:48:34 -04:00
rusefi 94794e4f38 Merge branch 'master' of https://github.com/rusefi/rusefi 2017-04-02 00:21:06 -04:00
rusefi b7fbfc698c manual sync 2017-04-02 00:20:47 -04:00
rusEfi 34c87d7f96 Merge branch 'fresh_chibios_2nd' of https://github.com/rusefi/rusefi into fresh_chibios_2nd 2017-04-01 23:03:50 -04:00
rusEfi ec666de5b9 IAR fix 2017-04-01 23:03:34 -04:00
rusefi 5bf5e6ef85 better handling of MMC driver error state 2017-04-01 22:58:15 -04:00
rusefi 3cd017b844 surviving MMC crash 2017-04-01 22:55:39 -04:00
rusefi 06d947a2f2 evil manual sync 2017-04-01 22:49:18 -04:00
rusefi c96fd41206 evil manual sync 2017-04-01 22:48:53 -04:00
rusefi dba5c393a1 happy april 1 2017-04-01 22:46:30 -04:00
rusefi d57c587135 yes, I know this is ridiculous - but I want an easy simple PR. we will remove this folder from master once merged. 2017-04-01 22:41:27 -04:00
rusefi 1f90a67e41 Merge branch 'master' into fresh_chibios_2nd 2017-04-01 22:33:39 -04:00
rusefi 85c63fff07 step towards chibios3 merge 2017-04-01 20:35:01 -04:00
andrey def04123d7 safer folder name 2017-04-01 20:22:40 -04:00
rusefi 8e5959a6ce manual pre-merge - better error message 2017-04-01 16:52:55 -04:00
rusefi 6a98e7a63e manual sync 2017-03-31 18:32:48 -04:00
rusEfi 6d0a4b99d8 refactoring: nicer error message 2017-03-31 15:08:11 -04:00
rusEfi a2869879f5 EOL - you must be kidding me 2017-03-31 13:47:56 -04:00
rusefi 4a1f93ae7f git docs 2017-03-31 13:46:32 -04:00
rusEfi 4a649bb538 KiCad EOL 2017-03-31 13:45:26 -04:00
rusefi 7d416532c8 fresh chibi_rusefi 2017-03-31 13:25:29 -04:00
rusefi 9694a276fa Merge pull request #389 from fpoussin/chibios-update-2
Fixed Posix simulator.
2017-03-31 13:20:40 -04:00
Fabien Poussin 32d74a45f2 Fixes for chprint, updating submodule to use our custom version. 2017-03-31 15:59:10 +02:00
Fabien Poussin bca80a76c1 Fixed Posix simulator. 2017-03-31 10:36:51 +02:00
rusEfi f14ef46370 docs 2017-03-30 22:27:30 -04:00
rusEfi 503023523d IAR progress 2017-03-30 22:26:51 -04:00
rusefi 9bb3f25ece generating IAR project 2017-03-30 20:23:48 -04:00
rusefi 07bf9cea31 same pre-merge 2017-03-30 19:55:45 -04:00
rusefi 92a165d2f9 same pre-merge: random docs 2017-03-30 19:55:26 -04:00
rusefi fbf7a75c42 manual pre-merge - should be safe 2017-03-30 15:06:30 -04:00
rusefi c553004e09 manual pre-merge - should be safe, long EOL story 2017-03-30 15:05:49 -04:00