dead code

firmware/controllers/actuators/alternator_controller.cpp

@@ -22,7 +22,7 @@
 #include "local_version_holder.h"
 #include "periodic_task.h"
 
-#include "pwm_generator.h"
+#include "pwm_generator_logic.h"
 #include "pin_repository.h"
 
 

firmware/controllers/actuators/aux_pid.cpp

@@ -12,7 +12,7 @@
 #include "allsensors.h"
 
 #if EFI_AUX_PID
-#include "pwm_generator.h"
+#include "pwm_generator_logic.h"
 #include "tunerstudio_configuration.h"
 #include "fsio_impl.h"
 #include "engine_math.h"

firmware/controllers/actuators/boost_control.cpp

@@ -22,7 +22,7 @@
 #include "engine_controller.h"
 #include "periodic_task.h"
 #include "pin_repository.h"
-#include "pwm_generator.h"
+#include "pwm_generator_logic.h"
 #include "pid_auto_tune.h"
 #include "local_version_holder.h"
 #define NO_PIN_PERIOD 500

firmware/controllers/actuators/dc_motors.cpp

@@ -15,7 +15,7 @@
 #include "dc_motor.h"
 
 #include "efi_gpio.h"
-#include "pwm_generator.h"
+#include "pwm_generator_logic.h"
 
 EXTERN_ENGINE;
 
@@ -126,4 +126,4 @@ void showDcMotorInfo(Logging* logger) {
 		scheduleMsg(logger, "Motor: dir=%d DC=%f", etb->dcMotor.isOpenDirection(), etb->dcMotor.get());
 	}
 }
-#endif
+#endif

firmware/controllers/actuators/idle_thread.cpp

@@ -32,7 +32,7 @@
 #if EFI_IDLE_CONTROL
 #include "engine_configuration.h"
 #include "rpm_calculator.h"
-#include "pwm_generator.h"
+#include "pwm_generator_logic.h"
 #include "idle_thread.h"
 #include "engine_math.h"
 

firmware/controllers/actuators/pwm_tester.cpp

@@ -14,7 +14,6 @@
 #include "state_requence.h"
 #include "pwm_generator_logic.h"
 #include "engine.h"
-#include "pwm_generator.h"
 
 static LoggingWithStorage logger;
 

firmware/controllers/core/fsio_impl.cpp

@@ -162,7 +162,7 @@ float getEngineValue(le_action_e action DECLARE_ENGINE_PARAMETER_SUFFIX) {
 #if EFI_PROD_CODE
 
 #include "pin_repository.h"
-#include "pwm_generator.h"
+#include "pwm_generator_logic.h"
 // todo: that's about bench test mode, wrong header for sure!
 #include "bench_test.h"
 

firmware/controllers/engine_controller.cpp

@@ -85,12 +85,10 @@
 #endif /* EFI_UNIT_TEST */
 
 #include "adc_inputs.h"
+#include "pwm_generator_logic.h"
 
 #if EFI_PROD_CODE
-#include "pwm_generator.h"
-
 #include "pwm_tester.h"
-#include "pwm_generator.h"
 #include "lcd_controller.h"
 #include "pin_repository.h"
 #endif /* EFI_PROD_CODE */
@@ -635,10 +633,6 @@ void initEngineContoller(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX)
 
 	commonInitEngineController(sharedLogger);
 
-#if EFI_PROD_CODE
-	initPwmGenerator();
-#endif
-
 #if EFI_LOGIC_ANALYZER
 	if (engineConfiguration->isWaveAnalyzerEnabled) {
 		initWaveAnalyzer(sharedLogger);

firmware/controllers/gauges/tachometer.cpp

@@ -12,7 +12,7 @@
 
 #include "tachometer.h"
 #include "trigger_central.h"
-#include "pwm_generator.h"
+#include "pwm_generator_logic.h"
 
 EXTERN_ENGINE;
 

firmware/controllers/system/timer/pwm_generator_logic.cpp

@@ -11,7 +11,6 @@
 #include "global.h"
 #include "os_access.h"
 #include "pwm_generator_logic.h"
-#include "pwm_generator.h"
 #include "perf_trace.h"
 
 /**

firmware/controllers/trigger/trigger_emulator_algo.cpp

@@ -36,15 +36,14 @@ bool needEvent(const int currentIndex, const int size, MultiChannelStateSequence
 #include "trigger_central.h"
 #include "trigger_simulator.h"
 #include "settings.h"
-
-#include "pwm_generator.h"
+#include "pwm_generator_logic.h"
 
 TriggerEmulatorHelper::TriggerEmulatorHelper() {
 }
 
 EXTERN_ENGINE;
 
-static OutputPin emulatorOutputs[3];
+static OutputPin emulatorOutputs[PWM_PHASE_MAX_WAVE_PER_PWM];
 
 void TriggerEmulatorHelper::handleEmulatorCallback(PwmConfig *state, int stateIndex) {
 	efitick_t stamp = getTimeNowNt();

firmware/hw_layer/hw_layer.mk

@@ -24,7 +24,6 @@ HW_LAYER_EMS_CPP = $(HW_LAYER_EGT_CPP) \
 	$(PROJECT_DIR)/hw_layer/lcd/lcd_HD44780.cpp \
 	$(PROJECT_DIR)/hw_layer/adc_inputs.cpp \
 	$(PROJECT_DIR)/hw_layer/adc_subscription.cpp \
-	$(PROJECT_DIR)/hw_layer/pwm_generator.cpp \
 	$(PROJECT_DIR)/hw_layer/trigger_input.cpp \
 	$(PROJECT_DIR)/hw_layer/trigger_input_icu.cpp \
 	$(PROJECT_DIR)/hw_layer/trigger_input_exti.cpp \

firmware/hw_layer/pwm_generator.cpp

@@ -1,25 +0,0 @@
-/**
- * @file    pwm_generator.cpp
- * @brief   software PWM generator
- *
- * Software PWM implementation. Considering how low all frequencies are, we can totally afford a couple of float multiplications.
- * By generating PWM programmatically we are saving the timers for better purposes. This implementation also supports generating
- * synchronized waves as needed for example to emulate dual Hall-effect crankshaft position sensors.
- *
- *
- * @date May 28, 2013
- * @author Andrey Belomutskiy, (c) 2012-2020
- *
- */
-
-#include "global.h"
-
-#if EFI_PROD_CODE || EFI_SIMULATOR
-#include "pwm_generator.h"
-#include "pin_repository.h"
-#include "datalogging.h"
-
-void initPwmGenerator(void) {
-}
-
-#endif

firmware/hw_layer/pwm_generator.h

@@ -1,17 +0,0 @@
-/**
- * @file pwm_generator.h
- *
- * @date May 28, 2013
- * @author Andrey Belomutskiy, (c) 2012-2020
- */
-
-#pragma once
-
-#include "global.h"
-#include "pwm_generator_logic.h"
-
-#define DEBUG_PWM FALSE
-
-#include "efi_gpio.h"
-
-void initPwmGenerator(void);

firmware/hw_layer/sensors/cj125.cpp

@@ -12,7 +12,7 @@
 
 #include "engine.h"
 #include "cj125.h"
-#include "pwm_generator.h"
+#include "pwm_generator_logic.h"
 #include "rpm_calculator.h"
 
 EXTERN_ENGINE;