Merge branch 'master' of https://github.com/rusefi/rusefi

2017-05-18 08:13:35 -04:00 · 2017-05-18 08:13:35 -04:00 · 903a6c306e
parent a92be9db5b 06a03bef6a
commit 903a6c306e
77 changed files with 14 additions and 3 deletions
--- a/firmware/global.h
+++ b/firmware/global.h
@ -64,6 +64,12 @@ typedef unsigned int time_t;
 #endif


+/**
+ * rusEfi is placing some of data structures into CCM memory simply
+ * in order to use that memory - no magic about which RAM is faster etc.
+ *
+ * Please note that DMA does not work with CCM memory
+ */
 #if EFI_USE_CCM && defined __GNUC__
 #define CCM_OPTIONAL __attribute__((section(".ram4")))
 #elif defined __GNUC__
--- a/firmware/rusefi.cpp
+++ b/firmware/rusefi.cpp
@ -242,9 +242,9 @@ void chDbgStackOverflowPanic(thread_t *otp) {
 	chDbgPanic3(panicMessage, __FILE__, __LINE__);
 }

-static char UNUSED_RAM_SIZE[20100];
+static char UNUSED_RAM_SIZE[14100];

-static char UNUSED_CCM_SIZE[9500] CCM_OPTIONAL;
+static char UNUSED_CCM_SIZE[16000] CCM_OPTIONAL;

 int getRusEfiVersion(void) {
 	if (UNUSED_RAM_SIZE[0] != 0)
--- a/firmware/tunerstudio/docs/0
+++ b/firmware/tunerstudio/docs/0
--- a/firmware/tunerstudio/docs/0
+++ b/firmware/tunerstudio/docs/0
--- a/firmware/tunerstudio/docs/0
+++ b/firmware/tunerstudio/docs/0
--- a/firmware/tunerstudio/docs/0
+++ b/firmware/tunerstudio/docs/0
--- a/firmware/tunerstudio/docs/0
+++ b/firmware/tunerstudio/docs/0
--- a/firmware/tunerstudio/docs/0-1_Engine_Menu_1-25.png
+++ b/firmware/tunerstudio/docs/0-1_Engine_Menu_1-25.png
--- a/firmware/tunerstudio/docs/1
+++ b/firmware/tunerstudio/docs/1
--- a/firmware/tunerstudio/docs/10
+++ b/firmware/tunerstudio/docs/10
--- a/firmware/tunerstudio/docs/11
+++ b/firmware/tunerstudio/docs/11
--- a/firmware/tunerstudio/docs/12
+++ b/firmware/tunerstudio/docs/12
--- a/firmware/tunerstudio/docs/13
+++ b/firmware/tunerstudio/docs/13
--- a/firmware/tunerstudio/docs/14
+++ b/firmware/tunerstudio/docs/14
--- a/firmware/tunerstudio/docs/15
+++ b/firmware/tunerstudio/docs/15
--- a/firmware/tunerstudio/docs/16
+++ b/firmware/tunerstudio/docs/16
--- a/firmware/tunerstudio/docs/17
+++ b/firmware/tunerstudio/docs/17
--- a/firmware/tunerstudio/docs/18
+++ b/firmware/tunerstudio/docs/18
--- a/firmware/tunerstudio/docs/19
+++ b/firmware/tunerstudio/docs/19
--- a/firmware/tunerstudio/docs/2
+++ b/firmware/tunerstudio/docs/2
--- a/firmware/tunerstudio/docs/2
+++ b/firmware/tunerstudio/docs/2
--- a/firmware/tunerstudio/docs/20
+++ b/firmware/tunerstudio/docs/20
--- a/firmware/tunerstudio/docs/21
+++ b/firmware/tunerstudio/docs/21
--- a/firmware/tunerstudio/docs/22
+++ b/firmware/tunerstudio/docs/22
--- a/firmware/tunerstudio/docs/23
+++ b/firmware/tunerstudio/docs/23
--- a/firmware/tunerstudio/docs/24
+++ b/firmware/tunerstudio/docs/24
--- a/firmware/tunerstudio/docs/25
+++ b/firmware/tunerstudio/docs/25
--- a/firmware/tunerstudio/docs/26
+++ b/firmware/tunerstudio/docs/26
--- a/firmware/tunerstudio/docs/27
+++ b/firmware/tunerstudio/docs/27
--- a/firmware/tunerstudio/docs/28
+++ b/firmware/tunerstudio/docs/28
--- a/firmware/tunerstudio/docs/29
+++ b/firmware/tunerstudio/docs/29
--- a/firmware/tunerstudio/docs/3
+++ b/firmware/tunerstudio/docs/3
--- a/firmware/tunerstudio/docs/30
+++ b/firmware/tunerstudio/docs/30
--- a/firmware/tunerstudio/docs/31
+++ b/firmware/tunerstudio/docs/31
--- a/firmware/tunerstudio/docs/31
+++ b/firmware/tunerstudio/docs/31
--- a/firmware/tunerstudio/docs/32
+++ b/firmware/tunerstudio/docs/32
--- a/firmware/tunerstudio/docs/33
+++ b/firmware/tunerstudio/docs/33
--- a/firmware/tunerstudio/docs/34
+++ b/firmware/tunerstudio/docs/34
--- a/firmware/tunerstudio/docs/35
+++ b/firmware/tunerstudio/docs/35
--- a/firmware/tunerstudio/docs/36
+++ b/firmware/tunerstudio/docs/36
--- a/firmware/tunerstudio/docs/37
+++ b/firmware/tunerstudio/docs/37
--- a/firmware/tunerstudio/docs/38
+++ b/firmware/tunerstudio/docs/38
--- a/firmware/tunerstudio/docs/39
+++ b/firmware/tunerstudio/docs/39
--- a/firmware/tunerstudio/docs/4
+++ b/firmware/tunerstudio/docs/4
--- a/firmware/tunerstudio/docs/40
+++ b/firmware/tunerstudio/docs/40
--- a/firmware/tunerstudio/docs/41
+++ b/firmware/tunerstudio/docs/41
--- a/firmware/tunerstudio/docs/42
+++ b/firmware/tunerstudio/docs/42
--- a/firmware/tunerstudio/docs/43
+++ b/firmware/tunerstudio/docs/43
--- a/firmware/tunerstudio/docs/44
+++ b/firmware/tunerstudio/docs/44
--- a/firmware/tunerstudio/docs/45
+++ b/firmware/tunerstudio/docs/45
--- a/firmware/tunerstudio/docs/46
+++ b/firmware/tunerstudio/docs/46
--- a/firmware/tunerstudio/docs/47
+++ b/firmware/tunerstudio/docs/47
--- a/firmware/tunerstudio/docs/48
+++ b/firmware/tunerstudio/docs/48
--- a/firmware/tunerstudio/docs/49
+++ b/firmware/tunerstudio/docs/49
--- a/firmware/tunerstudio/docs/5
+++ b/firmware/tunerstudio/docs/5
--- a/firmware/tunerstudio/docs/50
+++ b/firmware/tunerstudio/docs/50
--- a/firmware/tunerstudio/docs/51
+++ b/firmware/tunerstudio/docs/51
--- a/firmware/tunerstudio/docs/52
+++ b/firmware/tunerstudio/docs/52
--- a/firmware/tunerstudio/docs/53
+++ b/firmware/tunerstudio/docs/53
--- a/firmware/tunerstudio/docs/54
+++ b/firmware/tunerstudio/docs/54
--- a/firmware/tunerstudio/docs/55
+++ b/firmware/tunerstudio/docs/55
--- a/firmware/tunerstudio/docs/56
+++ b/firmware/tunerstudio/docs/56
--- a/firmware/tunerstudio/docs/57
+++ b/firmware/tunerstudio/docs/57
--- a/firmware/tunerstudio/docs/58
+++ b/firmware/tunerstudio/docs/58
--- a/firmware/tunerstudio/docs/59
+++ b/firmware/tunerstudio/docs/59
--- a/firmware/tunerstudio/docs/6
+++ b/firmware/tunerstudio/docs/6
--- a/firmware/tunerstudio/docs/60
+++ b/firmware/tunerstudio/docs/60
--- a/firmware/tunerstudio/docs/61
+++ b/firmware/tunerstudio/docs/61
--- a/firmware/tunerstudio/docs/62
+++ b/firmware/tunerstudio/docs/62
--- a/firmware/tunerstudio/docs/63
+++ b/firmware/tunerstudio/docs/63
--- a/firmware/tunerstudio/docs/64
+++ b/firmware/tunerstudio/docs/64
--- a/firmware/tunerstudio/docs/65
+++ b/firmware/tunerstudio/docs/65
--- a/firmware/tunerstudio/docs/7
+++ b/firmware/tunerstudio/docs/7
--- a/firmware/tunerstudio/docs/8
+++ b/firmware/tunerstudio/docs/8
--- a/firmware/tunerstudio/docs/9
+++ b/firmware/tunerstudio/docs/9
--- a/firmware/tunerstudio/docs/readme.MD
+++ b/firmware/tunerstudio/docs/readme.MD
@ -0,0 +1,5 @@
+Tuner Studio dialogs as of May 2017
+
+![TS](0-1_Engine_Menu_1-25.png)
+
+![TS](0 - 2 Tuning menu (2-47).png)
--- a/firmware/util/loggingcentral.cpp
+++ b/firmware/util/loggingcentral.cpp
@ -23,7 +23,7 @@ typedef char log_buf_t[DL_OUTPUT_BUFFER];
 */
 static char *accumulationBuffer;

-static log_buf_t pendingBuffers0 CCM_OPTIONAL;
+static log_buf_t pendingBuffers0;
 static log_buf_t pendingBuffers1;

 /**