diff --git a/firmware/.cproject b/firmware/.cproject
index 93fe4b0e2b..c1e3b3ec83 100644
--- a/firmware/.cproject
+++ b/firmware/.cproject
@@ -294,7 +294,7 @@
-
+
@@ -306,7 +306,7 @@
-
+
@@ -331,7 +331,7 @@
-
+
@@ -394,7 +394,7 @@
-
+
@@ -451,7 +451,7 @@
-
+
@@ -490,7 +490,7 @@
-
+
@@ -498,23 +498,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/firmware/config/stm32f0egt/efifeatures.h b/firmware/config/stm32f0egt/efifeatures.h
index 2f73918903..2b4bc79484 100644
--- a/firmware/config/stm32f0egt/efifeatures.h
+++ b/firmware/config/stm32f0egt/efifeatures.h
@@ -41,7 +41,15 @@
#define CONSOLE_MODE_SWITCH_PORT GPIOB
#define CONSOLE_MODE_SWITCH_PIN 1
+#define CONSOLE_MAX_ACTIONS 32
+
#define CONFIG_RESET_SWITCH_PORT GPIOD
#define CONFIG_RESET_SWITCH_PIN 6
+/**
+ * This is the size of the MemoryStream used by chvprintf
+ */
+#define INTERMEDIATE_LOGGING_BUFFER_SIZE 256
+
+
#endif /* EFIFEATURES_H_ */
diff --git a/firmware/config/stm32f4ems/efifeatures.h b/firmware/config/stm32f4ems/efifeatures.h
index 9d3ad78001..faa8e25123 100644
--- a/firmware/config/stm32f4ems/efifeatures.h
+++ b/firmware/config/stm32f4ems/efifeatures.h
@@ -97,6 +97,8 @@
#define EFI_PWM TRUE
+#define EFI_VEHICLE_SPEED TRUE
+
#define EFI_FUEL_PUMP TRUE
#define EFI_ENGINE_EMULATOR TRUE
@@ -154,6 +156,8 @@
#define EFI_MALFUNCTION_INDICATOR TRUE
//#define EFI_MALFUNCTION_INDICATOR FALSE
+#define CONSOLE_MAX_ACTIONS 196
+
#define EFI_MAP_AVERAGING TRUE
//#define EFI_MAP_AVERAGING FALSE
@@ -298,4 +302,9 @@
#define CONFIG_RESET_SWITCH_PORT GPIOD
#define CONFIG_RESET_SWITCH_PIN 6
+/**
+ * This is the size of the MemoryStream used by chvprintf
+ */
+#define INTERMEDIATE_LOGGING_BUFFER_SIZE 2000
+
#endif /* EFIFEATURES_H_ */
diff --git a/firmware/console_util/datalogging.c b/firmware/console_util/datalogging.c
index 860ee0ae30..61df46e8ba 100644
--- a/firmware/console_util/datalogging.c
+++ b/firmware/console_util/datalogging.c
@@ -38,11 +38,6 @@
#include "memstreams.h"
#include "console_io.h"
-/**
- * This is the size of the MemoryStream used by chvprintf
- */
-#define INTERMEDIATE_LOGGING_BUFFER_SIZE 2000
-
// we use this magic constant to make sure it's not just a random non-zero int in memory
#define MAGIC_LOGGING_FLAG 45234441
diff --git a/firmware/dump_debug_egt.bat b/firmware/dump_debug_egt.bat
index 28fc269679..f7a8378eca 100644
--- a/firmware/dump_debug_egt.bat
+++ b/firmware/dump_debug_egt.bat
@@ -1 +1,5 @@
-arm-none-eabi-objdump -S debug_EGT2CAN/rusefi.elf > debug.dump
\ No newline at end of file
+arm-none-eabi-objdump -S debug_EGT2CAN/rusefi.elf > debug.dump
+
+cd debug_EGT2CAN
+
+java -jar ../../java_tools/gcc_map_reader.jar > ../rusefi_ram_report.txt
\ No newline at end of file
diff --git a/firmware/hw_layer/vehicle_speed.cpp b/firmware/hw_layer/vehicle_speed.cpp
index 9ab69184a6..4669e64721 100644
--- a/firmware/hw_layer/vehicle_speed.cpp
+++ b/firmware/hw_layer/vehicle_speed.cpp
@@ -6,6 +6,9 @@
*/
#include "vehicle_speed.h"
+
+#if EFI_VEHICLE_SPEED || defined(__DOXYGEN__)
+
#include "engine.h"
#include "wave_analyzer_hw.h"
#include "pin_repository.h"
@@ -57,3 +60,5 @@ void initVehicleSpeed(Logging *l) {
registerCallback(&vehicleSpeedInput.widthListeners, (IntListener) vsAnaWidthCallback, NULL);
addConsoleAction("speedinfo", speedInfo);
}
+
+#endif /* EFI_VEHICLE_SPEED */
diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp
index aaefe3ac79..72fe474ec7 100644
--- a/firmware/rusefi.cpp
+++ b/firmware/rusefi.cpp
@@ -265,5 +265,5 @@ int getRusEfiVersion(void) {
return 1; // this is here to make the compiler happy about the unused array
if (UNUSED_CCM_SIZE == 0)
return 1; // this is here to make the compiler happy about the unused array
- return 20141228;
+ return 20141229;
}
diff --git a/firmware/util/cli_registry.h b/firmware/util/cli_registry.h
index debb64ba72..3b1871aad6 100644
--- a/firmware/util/cli_registry.h
+++ b/firmware/util/cli_registry.h
@@ -14,7 +14,7 @@ extern "C"
{
#endif /* __cplusplus */
-#define CONSOLE_MAX_ACTIONS 196
+#include "efifeatures.h"
typedef enum {
NO_PARAMETER,
@@ -42,13 +42,10 @@ typedef struct {
void *param;
} TokenCallback;
-//void addDefaultConsoleActions(void);
-//void handleActionWithParameter(TokenCallback *current, char *parameter);
int tokenLength(const char *msgp);
typedef void (*VoidPtr)(void*);
-
typedef void (*Void)(void);
typedef void (*VoidInt)(int);
typedef void (*VoidIntVoidPtr)(int, void*);
diff --git a/unit_tests/efifeatures.h b/unit_tests/efifeatures.h
index 41f47b244e..2b4a644655 100644
--- a/unit_tests/efifeatures.h
+++ b/unit_tests/efifeatures.h
@@ -16,6 +16,8 @@
#define EFI_HISTOGRAMS TRUE
+#define CONSOLE_MAX_ACTIONS 128
+
#define EFI_CLI_SUPPORT FALSE
#define EFI_SUPPORT_FORD_ASPIRE TRUE