wn/inverter2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix indentation

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2016-11-13 00:17:12 +01:00
parent be3ad3bc60
commit f12f95c565
2 changed files with 108 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.settings/language.settings.xml
View File

@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="247534021813489542" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1427909152422737123" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>
@ -16,7 +16,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="365171440338633116" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1310271733897593549" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>

208
my_src/inverter.c
View File

@ -30,15 +30,15 @@ uint16_t IV[NUM_OF_SINE_SLOT];
volatile uint32_t timer1Cnt; volatile uint32_t timer1Cnt;
typedef struct { typedef struct {
uint8_t slotCnt; uint8_t slotCnt;
bool running; bool running;
GPIO_TypeDef *bridgePolarityPort; GPIO_TypeDef *bridgePolarityPort;
uint16_t bridgePolarityPin; uint16_t bridgePolarityPin;
GPIO_TypeDef *startMarkPort; GPIO_TypeDef *startMarkPort;
uint16_t startMarkPin; uint16_t startMarkPin;
IRQn_Type irqType; IRQn_Type irqType;
TIM_HandleTypeDef *handle; TIM_HandleTypeDef *handle;
uint32_t channel; uint32_t channel;
} timerSupport_t; } timerSupport_t;
#define NUM_OF_TIMER 3 #define NUM_OF_TIMER 3
@ -48,123 +48,127 @@ volatile uint8_t phaseOrder[NUM_OF_TIMER];
void inverterBegin() { void inverterBegin() {
for (uint8_t i = 0; i < NUM_OF_SINE_SLOT; i++) { for (uint8_t i = 0; i < NUM_OF_SINE_SLOT; i++) {
float angle = i * slotAngle; float angle = i * slotAngle;
sineValues[i] = sinf(angle / 180 * PI); sineValues[i] = sinf(angle / 180 * PI);
} }
timerSupport[0].handle = &htim2; timerSupport[0].handle = &htim2;
timerSupport[0].running = false; timerSupport[0].running = false;
timerSupport[0].slotCnt = 0; timerSupport[0].slotCnt = 0;
timerSupport[0].bridgePolarityPort = BridgePolarity0_GPIO_Port; timerSupport[0].bridgePolarityPort = BridgePolarity0_GPIO_Port;
timerSupport[0].bridgePolarityPin = BridgePolarity0_Pin; timerSupport[0].bridgePolarityPin = BridgePolarity0_Pin;
timerSupport[0].irqType = TIM2_IRQn; timerSupport[0].irqType = TIM2_IRQn;
timerSupport[0].channel = TIM_CHANNEL_1; timerSupport[0].channel = TIM_CHANNEL_1;
timerSupport[0].startMarkPort = LED0_GPIO_Port; timerSupport[0].startMarkPort = LED0_GPIO_Port;
timerSupport[0].startMarkPin = LED0_Pin; timerSupport[0].startMarkPin = LED0_Pin;
timerSupport[1].handle = &htim5; timerSupport[1].handle = &htim5;
timerSupport[1].running = false; timerSupport[1].running = false;
timerSupport[1].slotCnt = 0; timerSupport[1].slotCnt = 0;
timerSupport[1].bridgePolarityPort = BridgePolarity1_GPIO_Port; timerSupport[1].bridgePolarityPort = BridgePolarity1_GPIO_Port;
timerSupport[1].bridgePolarityPin = BridgePolarity1_Pin; timerSupport[1].bridgePolarityPin = BridgePolarity1_Pin;
timerSupport[1].irqType = TIM5_IRQn; timerSupport[1].irqType = TIM5_IRQn;
timerSupport[1].channel = TIM_CHANNEL_2; timerSupport[1].channel = TIM_CHANNEL_2;
timerSupport[1].startMarkPort = LED1_GPIO_Port; timerSupport[1].startMarkPort = LED1_GPIO_Port;
timerSupport[1].startMarkPin = LED1_Pin; timerSupport[1].startMarkPin = LED1_Pin;
timerSupport[2].handle = &htim4; timerSupport[2].handle = &htim4;
timerSupport[2].running = false; timerSupport[2].running = false;
timerSupport[2].slotCnt = 0; timerSupport[2].slotCnt = 0;
timerSupport[2].bridgePolarityPort = BridgePolarity2_GPIO_Port; timerSupport[2].bridgePolarityPort = BridgePolarity2_GPIO_Port;
timerSupport[2].bridgePolarityPin = BridgePolarity2_Pin; timerSupport[2].bridgePolarityPin = BridgePolarity2_Pin;
timerSupport[2].irqType = TIM4_IRQn; timerSupport[2].irqType = TIM4_IRQn;
timerSupport[2].channel = TIM_CHANNEL_1; timerSupport[2].channel = TIM_CHANNEL_1;
timerSupport[2].startMarkPort = LED2_GPIO_Port; timerSupport[2].startMarkPort = LED2_GPIO_Port;
timerSupport[2].startMarkPin = LED2_Pin; timerSupport[2].startMarkPin = LED2_Pin;
} }
void inverterStart(uint8_t freqOut, direction_t direction) { void inverterStart(uint8_t freqOut, direction_t direction) {
inverterStop(); inverterStop();
uint16_t slotWidth = (FREQ_IN / (freqOut * NUM_OF_SINE_SLOT * 4)); uint16_t slotWidth = (FREQ_IN / (freqOut * NUM_OF_SINE_SLOT * 4));
for (uint8_t i = 0; i < NUM_OF_SINE_SLOT; i++) { for (uint8_t i = 0; i < NUM_OF_SINE_SLOT; i++) {
IV[i] = (uint16_t)(sineValues[i] * 0.9 * slotWidth); IV[i] = (uint16_t)(sineValues[i] * 0.9 * slotWidth);
} }
if (direction == CLOCKWISE) { if (direction == CLOCKWISE) {
phaseOrder[0] = 0; phaseOrder[0] = 0;
phaseOrder[1] = 1; phaseOrder[1] = 1;
phaseOrder[2] = 2; phaseOrder[2] = 2;
} else { } else {
phaseOrder[0] = 0; phaseOrder[0] = 0;
phaseOrder[1] = 2; phaseOrder[1] = 2;
phaseOrder[2] = 1; phaseOrder[2] = 1;
} }
for (uint8_t i = 0; i < NUM_OF_TIMER; i++){ for (uint8_t i = 0; i < NUM_OF_TIMER; i++){
timerSupport[i].slotCnt = 0; timerSupport[i].slotCnt = 0;
timerSupport[i].running = false; timerSupport[i].running = false;
HAL_GPIO_WritePin(timerSupport[i].bridgePolarityPort, timerSupport[i].bridgePolarityPin, GPIO_PIN_RESET); HAL_GPIO_WritePin(timerSupport[i].bridgePolarityPort,
__HAL_TIM_SET_AUTORELOAD(timerSupport[i].handle, slotWidth); timerSupport[i].bridgePolarityPin, GPIO_PIN_RESET);
__HAL_TIM_SET_COUNTER(timerSupport[i].handle, 0); __HAL_TIM_SET_AUTORELOAD(timerSupport[i].handle, slotWidth);
} __HAL_TIM_SET_COUNTER(timerSupport[i].handle, 0);
}
timer1Cnt = 0; timer1Cnt = 0;
__HAL_TIM_SET_AUTORELOAD(&htim1, slotWidth); __HAL_TIM_SET_AUTORELOAD(&htim1, slotWidth);
__HAL_TIM_SET_COUNTER(&htim1, 0); __HAL_TIM_SET_COUNTER(&htim1, 0);
HAL_TIM_Base_Start_IT(&htim1); HAL_TIM_Base_Start_IT(&htim1);
__HAL_TIM_ENABLE_IT(&htim1, TIM_IT_UPDATE); __HAL_TIM_ENABLE_IT(&htim1, TIM_IT_UPDATE);
} }
void inverterStop() { void inverterStop() {
HAL_TIM_Base_Stop(&htim1); HAL_TIM_Base_Stop(&htim1);
__HAL_TIM_DISABLE_IT(&htim1, TIM_IT_UPDATE); __HAL_TIM_DISABLE_IT(&htim1, TIM_IT_UPDATE);
for (uint8_t i = 0; i < NUM_OF_TIMER; i++){ for (uint8_t i = 0; i < NUM_OF_TIMER; i++){
HAL_TIM_PWM_Stop_DMA(timerSupport[i].handle, timerSupport[i].channel); HAL_TIM_PWM_Stop_DMA(timerSupport[i].handle, timerSupport[i].channel);
__HAL_TIM_DISABLE_IT(timerSupport[i].handle, TIM_IT_UPDATE); __HAL_TIM_DISABLE_IT(timerSupport[i].handle, TIM_IT_UPDATE);
HAL_GPIO_WritePin(timerSupport[i].startMarkPort, timerSupport[i].startMarkPin, GPIO_PIN_RESET); HAL_GPIO_WritePin(timerSupport[i].startMarkPort,
} timerSupport[i].startMarkPin, GPIO_PIN_RESET);
}
} }
static void startPhase(uint8_t phaseIdx) { static void startPhase(uint8_t phaseIdx) {
uint8_t timerIdx = phaseOrder[phaseIdx]; uint8_t timerIdx = phaseOrder[phaseIdx];
if (! timerSupport[timerIdx].running) { if (! timerSupport[timerIdx].running) {
HAL_GPIO_WritePin(timerSupport[timerIdx].startMarkPort, HAL_GPIO_WritePin(timerSupport[timerIdx].startMarkPort,
timerSupport[timerIdx].startMarkPin, GPIO_PIN_SET); timerSupport[timerIdx].startMarkPin, GPIO_PIN_SET);
HAL_TIM_PWM_Start_DMA(timerSupport[timerIdx].handle, timerSupport[timerIdx].channel, HAL_TIM_PWM_Start_DMA(timerSupport[timerIdx].handle,
(uint32_t*)IV, NUM_OF_SINE_SLOT); timerSupport[timerIdx].channel,
__HAL_TIM_ENABLE_IT(timerSupport[timerIdx].handle, TIM_IT_UPDATE); (uint32_t*)IV, NUM_OF_SINE_SLOT);
timerSupport[timerIdx].running = true; __HAL_TIM_ENABLE_IT(timerSupport[timerIdx].handle, TIM_IT_UPDATE);
} timerSupport[timerIdx].running = true;
}
} }
void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) { void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) {
for (uint8_t i = 0; i < NUM_OF_TIMER; i++) { for (uint8_t i = 0; i < NUM_OF_TIMER; i++) {
if (htim == timerSupport[i].handle) { if (htim == timerSupport[i].handle) {
timerSupport[i].slotCnt++; timerSupport[i].slotCnt++;
if (timerSupport[i].slotCnt == NUM_OF_SINE_SLOT + 2) { if (timerSupport[i].slotCnt == NUM_OF_SINE_SLOT + 2) {
timerSupport[i].slotCnt = 2; timerSupport[i].slotCnt = 2;
HAL_GPIO_TogglePin(timerSupport[i].bridgePolarityPort, timerSupport[i].bridgePolarityPin); HAL_GPIO_TogglePin(timerSupport[i].bridgePolarityPort,
} timerSupport[i].bridgePolarityPin);
} }
} }
}
if (htim == &htim1) { if (htim == &htim1) {
HAL_GPIO_TogglePin(Sync_GPIO_Port, Sync_Pin); HAL_GPIO_TogglePin(Sync_GPIO_Port, Sync_Pin);
if (timer1Cnt == 0) { if (timer1Cnt == 0) {
startPhase(0); startPhase(0);
} else if (timer1Cnt == ((NUM_OF_SINE_SLOT * 2) / 3)) { } else if (timer1Cnt == ((NUM_OF_SINE_SLOT * 2) / 3)) {
startPhase(1); startPhase(1);
} else if (timer1Cnt == ((NUM_OF_SINE_SLOT * 2) * 2 / 3)) { } else if (timer1Cnt == ((NUM_OF_SINE_SLOT * 2) * 2 / 3)) {
startPhase(2); startPhase(2);
} }
timer1Cnt++; timer1Cnt++;
} }
} }