From 07578a095423ddc48a9da3db5bdd421649b68ea8 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Mon, 19 Dec 2016 23:03:24 -0500 Subject: [PATCH] auto-sync --- firmware/controllers/injector_central.cpp | 2 -- firmware/hw_layer/trigger_input.cpp | 2 -- firmware/rusefi.cpp | 2 -- java_console/ui/src/com/rusefi/ui/storage/Node.java | 3 +++ 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/firmware/controllers/injector_central.cpp b/firmware/controllers/injector_central.cpp index 3b2f716d8d..6da67de4a4 100644 --- a/firmware/controllers/injector_central.cpp +++ b/firmware/controllers/injector_central.cpp @@ -216,8 +216,6 @@ static msg_t benchThread(int param) { #endif } -extern engine_configuration_s activeConfiguration; - static void unregister(brain_pin_e currentPin, OutputPin *output) { if (currentPin == GPIO_UNASSIGNED) return; diff --git a/firmware/hw_layer/trigger_input.cpp b/firmware/hw_layer/trigger_input.cpp index 2268928726..4c10b0fbbf 100644 --- a/firmware/hw_layer/trigger_input.cpp +++ b/firmware/hw_layer/trigger_input.cpp @@ -141,8 +141,6 @@ void turnOnTriggerInputPins(Logging *sharedLogger) { applyNewTriggerInputPins(); } -extern engine_configuration_s activeConfiguration; - void stopTriggerInputPins(void) { for (int i = 0; i < TRIGGER_SUPPORTED_CHANNELS; i++) { if (boardConfiguration->triggerInputPins[i] diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 0ec60ab9d5..c3a78ce39c 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -131,8 +131,6 @@ bool hasFirmwareErrorFlag = false; static virtual_timer_t resetTimer; -extern engine_configuration_s activeConfiguration; - EXTERN_ENGINE ; diff --git a/java_console/ui/src/com/rusefi/ui/storage/Node.java b/java_console/ui/src/com/rusefi/ui/storage/Node.java index 39928e58aa..aae70d59f8 100644 --- a/java_console/ui/src/com/rusefi/ui/storage/Node.java +++ b/java_console/ui/src/com/rusefi/ui/storage/Node.java @@ -1,5 +1,7 @@ package com.rusefi.ui.storage; +import org.jetbrains.annotations.NotNull; + import java.util.HashMap; import java.util.Map; @@ -82,6 +84,7 @@ public class Node { return value == null ? defaultValue : value; } + @NotNull public String getProperty(String key) { return getProperty(key, ""); }