refactoring - reducing API between FW and Java

firmware/console/binary/tooth_logger.h

@@ -9,6 +9,7 @@
 
 #include "rusefi_enums.h"
 #include "expected.h"
+#include "trigger_structure.h"
 
 #if EFI_UNIT_TEST
 #include "logicdata.h"

firmware/controllers/engine_controller.cpp

@@ -267,7 +267,7 @@ static void printAnalogChannelInfoExt(const char *name, adc_channel_e hwChannel,
 	}
 
 	float voltage = adcVoltage * dividerCoeff;
-	efiPrintf("%s ADC%d %s %s adc=%.2f/input=%.2fv/divider=%.2f", name, hwChannel, getAdc_channel_mode_e(getAdcMode(hwChannel)),
+	efiPrintf("%s ADC%d m=%d %s adc=%.2f/input=%.2fv/divider=%.2f", name, hwChannel, getAdcMode(hwChannel),
 			getPinNameByAdcChannel(name, hwChannel, pinNameBuffer), adcVoltage, voltage, dividerCoeff);
 #endif /* HAL_USE_ADC */
 }

firmware/controllers/engine_cycle/rpm_calculator.h

@@ -12,6 +12,7 @@
 #include "stored_value_sensor.h"
 #include "timer.h"
 #include "rpm_calculator_api.h"
+#include "trigger_decoder.h"
 
 // we use this value in case of noise on trigger input lines
 #define NOISY_RPM -1

firmware/controllers/trigger/decoders/trigger_structure.cpp

@@ -267,9 +267,9 @@ void TriggerWaveform::addEvent(angle_t angle, trigger_wheel_e const channelIndex
 	}
 	if (wave.phaseCount > 0) {
 		if (angle <= previousAngle) {
-			warning(CUSTOM_ERR_TRG_ANGLE_ORDER, "invalid angle order %s %s: new=%.2f/%f and prev=%.2f/%f, size=%d",
+			warning(CUSTOM_ERR_TRG_ANGLE_ORDER, "invalid angle order %s %d: new=%.2f/%f and prev=%.2f/%f, size=%d",
 					getTrigger_wheel_e(channelIndex),
-					getTrigger_value_e(state),
+					state,
 					angle, angle * getCycleDuration(),
 					previousAngle, previousAngle * getCycleDuration(),
 					wave.phaseCount);