From eaf6440530298c5c2f46fd6433c4e7fba20a10c5 Mon Sep 17 00:00:00 2001
From: rusefi <arro239+rusefi@gmail.com>
Date: Tue, 6 Feb 2018 01:16:16 +0300
Subject: [PATCH] unique name

---
 firmware/controllers/system/pwm_generator_logic.cpp | 10 +++++-----
 firmware/controllers/system/pwm_generator_logic.h   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/firmware/controllers/system/pwm_generator_logic.cpp b/firmware/controllers/system/pwm_generator_logic.cpp
index 7467222ef5..25e9317ac2 100644
--- a/firmware/controllers/system/pwm_generator_logic.cpp
+++ b/firmware/controllers/system/pwm_generator_logic.cpp
@@ -30,7 +30,7 @@ void PwmConfig::baseConstructor() {
 	periodNt = NAN;
 	memset(&outputPins, 0, sizeof(outputPins));
 	phaseCount = 0;
-	cycleCallback = NULL;
+	pwmCycleCallback = NULL;
 	stateChangeCallback = NULL;
 }
 
@@ -93,8 +93,8 @@ void PwmConfig::setFrequency(float frequency) {
 
 void PwmConfig::handleCycleStart() {
 	if (safe.phaseIndex == 0) {
-		if (cycleCallback != NULL) {
-			cycleCallback(this);
+		if (pwmCycleCallback != NULL) {
+			pwmCycleCallback(this);
 		}
 		efiAssertVoid(periodNt != 0, "period not initialized");
 		if (safe.periodNt != periodNt || safe.iteration == ITERATION_LIMIT) {
@@ -194,7 +194,7 @@ void copyPwmParameters(PwmConfig *state, int phaseCount, float *switchTimes, int
 }
 
 void PwmConfig::weComplexInit(const char *msg, int phaseCount, float *switchTimes, int waveCount,
-		pin_state_t **pinStates, pwm_cycle_callback *cycleCallback, pwm_gen_callback *stateChangeCallback) {
+		pin_state_t **pinStates, pwm_cycle_callback *pwmCycleCallback, pwm_gen_callback *stateChangeCallback) {
 
 	efiAssertVoid(periodNt != 0, "period is not initialized");
 	if (phaseCount == 0) {
@@ -208,7 +208,7 @@ void PwmConfig::weComplexInit(const char *msg, int phaseCount, float *switchTime
 	efiAssertVoid(waveCount > 0, "waveCount should be positive");
 	checkSwitchTimes2(phaseCount, switchTimes);
 
-	this->cycleCallback = cycleCallback;
+	this->pwmCycleCallback = pwmCycleCallback;
 	this->stateChangeCallback = stateChangeCallback;
 
 	multiWave.waveCount = waveCount;
diff --git a/firmware/controllers/system/pwm_generator_logic.h b/firmware/controllers/system/pwm_generator_logic.h
index 682164baf7..06f8c65b0e 100644
--- a/firmware/controllers/system/pwm_generator_logic.h
+++ b/firmware/controllers/system/pwm_generator_logic.h
@@ -47,7 +47,7 @@ public:
 
 	void weComplexInit(const char *msg,
 			int phaseCount, float *swithcTimes, int waveCount, pin_state_t **pinStates,
-			pwm_cycle_callback *cycleCallback,
+			pwm_cycle_callback *pwmCycleCallback,
 			pwm_gen_callback *callback);
 
 	/**
@@ -75,7 +75,7 @@ public:
 	/**
 	 * this callback is invoked before each wave generation cycle
 	 */
-	pwm_cycle_callback *cycleCallback;
+	pwm_cycle_callback *pwmCycleCallback;
 
 	/**
 	 * this main callback is invoked when it's time to switch level on any of the output channels