diff --git a/MDK-ARM/Project.uvoptx b/MDK-ARM/Project.uvoptx
index dad60dc..f817973 100644
--- a/MDK-ARM/Project.uvoptx
+++ b/MDK-ARM/Project.uvoptx
@@ -300,12 +300,12 @@
1
0
0
- 5
+ 6
-
+ ..\..\inifiles\Simu_Pulse.ini
@@ -317,7 +317,7 @@
0
DLGDARM
- (1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=98,107,519,534,0)(121=-1,-1,-1,-1,0)(122=674,103,1095,530,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(132=-1,-1,-1,-1,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(234=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0)
+ (1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=504,37,1150,710,0)(110=60,88,280,548,0)(111=752,104,972,564,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=533,85,954,512,0)(121=892,96,1313,523,0)(122=674,103,1095,530,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=709,11,1303,762,0)(131=150,13,744,764,0)(132=599,17,1193,768,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(234=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0)
0
@@ -358,6 +358,14 @@
time
+
+
+ 1
+ 0
+ porta
+ 0
+
+
0
@@ -378,7 +386,7 @@
0
0
0
- 0
+ 1
0
0
0
@@ -400,6 +408,18 @@
+
+
+ 0
+ ((portb & 0x00000040) >> 6 & 0x40) >> 6
+ 00008000000000000000000000000000E0FFEF400000000000000000000000000000000028706F7274622026203078303030303030343029203E3E2036000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000E03F0D00000000000000000000000000000000000000440E0008
+
+
+ 1
+ ((portb & 0x00000080) >> 7 & 0x80) >> 7
+ 00000000000000000000000000000000E0FFEF400000000000000000000000000000000028706F7274622026203078303030303030383029203E3E2037000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000000000000000E03F0D00000000000000000000000000000000000000040E0008
+
+
1
0
@@ -420,7 +440,7 @@
1
1
1
- 1
+ 0
0
0
../Src/main.c
@@ -456,6 +476,18 @@
0
0
+
+ 3
+ 3
+ 1
+ 1
+ 0
+ 0
+ ..\MyDrivers\MyPWM.c
+ MyPWM.c
+ 0
+ 0
+
@@ -466,7 +498,7 @@
0
4
- 3
+ 4
1
0
0
@@ -478,7 +510,7 @@
4
- 4
+ 5
1
0
0
@@ -490,7 +522,7 @@
4
- 5
+ 6
1
0
0
@@ -502,7 +534,7 @@
4
- 6
+ 7
1
0
0
@@ -514,7 +546,7 @@
4
- 7
+ 8
1
0
0
@@ -534,7 +566,7 @@
0
5
- 8
+ 9
5
0
0
@@ -554,7 +586,7 @@
0
6
- 9
+ 10
1
0
0
@@ -574,7 +606,7 @@
0
7
- 10
+ 11
2
0
0
diff --git a/MDK-ARM/Project.uvprojx b/MDK-ARM/Project.uvprojx
index cd43e32..8a6b949 100644
--- a/MDK-ARM/Project.uvprojx
+++ b/MDK-ARM/Project.uvprojx
@@ -400,6 +400,11 @@
1
..\MyDrivers\MyTimer.c
+
+ MyPWM.c
+ 1
+ ..\MyDrivers\MyPWM.c
+
@@ -595,11 +600,11 @@
0
1
1
- 4107
+ 4101
1
STLink\ST-LINKIII-KEIL_SWO.dll
-
+ "" ()
@@ -861,6 +866,11 @@
1
..\MyDrivers\MyTimer.c
+
+ MyPWM.c
+ 1
+ ..\MyDrivers\MyPWM.c
+
diff --git a/MyDrivers/MyPWM.c b/MyDrivers/MyPWM.c
new file mode 100644
index 0000000..a59d46a
--- /dev/null
+++ b/MyDrivers/MyPWM.c
@@ -0,0 +1,65 @@
+#include "MyPWM.h"
+#include "stm32f1xx_ll_bus.h" // Pour l'activation des horloges
+#include "stm32f1xx_ll_tim.h"
+
+void MyPWM_Conf_Output(TIM_TypeDef * Timer, int channel)
+{
+ LL_TIM_OC_InitTypeDef My_LL_Tim_OC_Init_Struct;
+
+ //Configuration du output channel en PWM
+ LL_TIM_OC_StructInit(&My_LL_Tim_OC_Init_Struct);
+ //Configure le mode de la PWM : PWM1 = 1 jusqu'à la CompareValue puis 0, PWM2 = l'inverse
+ My_LL_Tim_OC_Init_Struct.OCMode = LL_TIM_OCMODE_PWM1;
+
+ LL_TIM_OC_Init(Timer,channel,&My_LL_Tim_OC_Init_Struct);
+
+ //Activation du channel pour le timer considéré
+ LL_TIM_CC_EnableChannel(Timer, channel);
+}
+
+
+//Configurer obligatoirement les channels 1 et 2 sur IC1 et IC2 ou IC3 et IC4
+void MyPWM_Conf_Input(TIM_TypeDef * Timer, int channel1, int channel2)
+{
+ LL_TIM_IC_InitTypeDef My_LL_Tim_IC_Init_Struct;
+
+ //Configuration du channel1 (front montant, mappé sur TI1 = valeurs par défaut)
+ LL_TIM_IC_StructInit(&My_LL_Tim_IC_Init_Struct);
+ LL_TIM_IC_Init(Timer,channel1,&My_LL_Tim_IC_Init_Struct);
+
+ //Configuration du channel2 (front descendant, mappé sur TI1 = valeurs modifiées)
+ LL_TIM_IC_StructInit(&My_LL_Tim_IC_Init_Struct);
+ //Détection sur front descendant
+ My_LL_Tim_IC_Init_Struct.ICPolarity = LL_TIM_IC_POLARITY_FALLING;
+ //Mappage sur TI1
+ My_LL_Tim_IC_Init_Struct.ICActiveInput = LL_TIM_ACTIVEINPUT_INDIRECTTI;
+ LL_TIM_IC_Init(Timer,channel2,&My_LL_Tim_IC_Init_Struct);
+
+ //Definition du trigger
+ LL_TIM_SetTriggerInput(Timer, LL_TIM_TS_TI1FP1);
+
+ //Configure le mode esclave en mode RESET
+ LL_TIM_SetSlaveMode(Timer, LL_TIM_SLAVEMODE_RESET);
+
+ //Activation des 2 channels pour le timer considéré
+ LL_TIM_CC_EnableChannel(Timer, channel1);
+ LL_TIM_CC_EnableChannel(Timer, channel2);
+}
+
+
+void MyPWM_Set_Impulse_Duration(TIM_TypeDef * Timer, uint32_t CompareValue, int channel)
+{
+ if (channel==LL_TIM_CHANNEL_CH1) LL_TIM_OC_SetCompareCH1(Timer, CompareValue);
+ else if (channel==LL_TIM_CHANNEL_CH2) LL_TIM_OC_SetCompareCH2(Timer, CompareValue);
+ else if (channel==LL_TIM_CHANNEL_CH3) LL_TIM_OC_SetCompareCH3(Timer, CompareValue);
+ else LL_TIM_OC_SetCompareCH4(Timer, CompareValue);
+}
+
+int MyPWM_Duty_Cycle_Permilles(TIM_TypeDef * Timer, int channel1, int channel2) {
+ if(channel1 == LL_TIM_CHANNEL_CH1 && channel2 == LL_TIM_CHANNEL_CH2) {
+ return LL_TIM_IC_GetCaptureCH2(Timer) / LL_TIM_IC_GetCaptureCH1(Timer) * 1000;
+ }
+ else {
+ return -1;
+ }
+}
diff --git a/MyDrivers/MyPWM.h b/MyDrivers/MyPWM.h
new file mode 100644
index 0000000..b3237c2
--- /dev/null
+++ b/MyDrivers/MyPWM.h
@@ -0,0 +1,16 @@
+#ifndef MYPWM_H
+#define MYPWM_H
+
+#include "stm32f1xx_ll_bus.h" // Pour l'activation des horloges
+#include "stm32f1xx_ll_tim.h"
+
+
+void MyPWM_Conf_Output(TIM_TypeDef * Timer, int channel);
+
+void MyPWM_Conf_Input(TIM_TypeDef * Timer, int channel1, int channel2);
+
+void MyPWM_Set_Impulse_Duration(TIM_TypeDef * Timer, uint32_t CompareValue, int channel);
+
+int MyPWM_Duty_Cycle_Permilles(TIM_TypeDef * Timer, int channel1, int channel2);
+
+#endif
diff --git a/MyDrivers/MyTimer.c b/MyDrivers/MyTimer.c
index efd3cd5..6df39fe 100644
--- a/MyDrivers/MyTimer.c
+++ b/MyDrivers/MyTimer.c
@@ -32,7 +32,7 @@ void (*Ptr_ItFct_TIM4)(void);
* int Psc : valeur à placer dans PSC
* @retval None
*/
-void MyTimer_Conf(TIM_TypeDef * Timer, int Period)
+void MyTimer_Conf(TIM_TypeDef * Timer, int Arr, int Psc)
{
LL_TIM_InitTypeDef My_LL_Tim_Init_Struct;
@@ -42,9 +42,6 @@ void MyTimer_Conf(TIM_TypeDef * Timer, int Period)
else if (Timer==TIM3) LL_APB1_GRP1_EnableClock(LL_APB1_GRP1_PERIPH_TIM3);
else LL_APB1_GRP1_EnableClock(LL_APB1_GRP1_PERIPH_TIM4);
- int Psc = (Period*72*1000000)/256 + 2;
- int Arr = (Period*72*1000000)/Psc + 1;
-
// chargement structure Arr, Psc, Up Count
My_LL_Tim_Init_Struct.Autoreload=Arr;
My_LL_Tim_Init_Struct.Prescaler=Psc;
diff --git a/MyDrivers/MyTimer.h b/MyDrivers/MyTimer.h
index 6daa6fc..4be9606 100644
--- a/MyDrivers/MyTimer.h
+++ b/MyDrivers/MyTimer.h
@@ -18,7 +18,7 @@ Driver pour Timer 1
* int Psc : valeur à placer dans PSC
* @retval None
*/
-void MyTimer_Conf(TIM_TypeDef * Timer,int Period);
+void MyTimer_Conf(TIM_TypeDef * Timer, int Arr, int Psc);
/**
diff --git a/Src/main.c b/Src/main.c
index 165d2e7..16ce13c 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -19,6 +19,9 @@
#include "stm32f1xx_ll_rcc.h" // utile dans la fonction SystemClock_Config
#include "stm32f1xx_ll_utils.h" // utile dans la fonction SystemClock_Config
#include "stm32f1xx_ll_system.h" // utile dans la fonction SystemClock_Config
+#include "stm32f1xx_ll_gpio.h"
+#include "MyTimer.h"
+#include "MyPWM.h"
void SystemClock_Config(void);
@@ -35,10 +38,69 @@ int main(void)
{
/* Configure the system clock to 72 MHz */
SystemClock_Config();
+
+
+ LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_GPIOB);
+ LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_GPIOA);
+ LL_GPIO_InitTypeDef My_GPIO_Init_Struct;
+
+ /*===Test Output===*/
+
+// TIM_TypeDef *Timer1 = TIM3;
+// int Channel1 = LL_TIM_CHANNEL_CH2;
+// TIM_TypeDef *Timer2 = TIM4;
+// int Channel2 = LL_TIM_CHANNEL_CH4;
+//
+// MyTimer_Conf(Timer1,0xFFFE, 0x72);
+// MyTimer_Conf(Timer2,0xFFFE, 0x72);
+//
+// MyPWM_Conf_Output(Timer1, Channel1);
+// MyPWM_Conf_Output(Timer2, Channel2);
+//
+// MyPWM_Set_Impulse_Duration(Timer1, 25, Channel1);
+// MyPWM_Set_Impulse_Duration(Timer2, 75, Channel2);
+//
+// My_GPIO_Init_Struct.Pin = LL_GPIO_PIN_7;
+// My_GPIO_Init_Struct.Mode = LL_GPIO_MODE_ALTERNATE;
+// My_GPIO_Init_Struct.OutputType = LL_GPIO_OUTPUT_PUSHPULL;
+// My_GPIO_Init_Struct.Speed = LL_GPIO_MODE_OUTPUT_2MHz;
+// My_GPIO_Init_Struct.Pull = LL_GPIO_PULL_DOWN;
+// LL_GPIO_Init(GPIOA, &My_GPIO_Init_Struct);
+//
+// My_GPIO_Init_Struct.Pin = LL_GPIO_PIN_9;
+// My_GPIO_Init_Struct.Mode = LL_GPIO_MODE_ALTERNATE;
+// My_GPIO_Init_Struct.OutputType = LL_GPIO_OUTPUT_PUSHPULL;
+// My_GPIO_Init_Struct.Speed = LL_GPIO_MODE_OUTPUT_2MHz;
+// My_GPIO_Init_Struct.Pull = LL_GPIO_PULL_DOWN;
+// LL_GPIO_Init(GPIOB, &My_GPIO_Init_Struct);
+//
+// MyTimer_Start(Timer1);
+// MyTimer_Start(Timer2);
+
+ /*===Test Input===*/
+
+ TIM_TypeDef *Timer = TIM4;
+ int channel1 = LL_TIM_CHANNEL_CH1;
+ int channel2 = LL_TIM_CHANNEL_CH2;
+
+ My_GPIO_Init_Struct.Pin = LL_GPIO_PIN_6;
+ My_GPIO_Init_Struct.Mode = LL_GPIO_MODE_FLOATING;
+ My_GPIO_Init_Struct.Pull = LL_GPIO_PULL_DOWN;
+ LL_GPIO_Init(GPIOB, &My_GPIO_Init_Struct);
+
+ My_GPIO_Init_Struct.Pin = LL_GPIO_PIN_7;
+ LL_GPIO_Init(GPIOB, &My_GPIO_Init_Struct);
+
+ MyTimer_Conf(Timer,0xFFAD,0x15);
+
+ MyPWM_Conf_Input(Timer, channel1, channel2);
+
+ int duty_cycle = 0;
/* Infinite loop */
while (1)
{
+ duty_cycle = MyPWM_Duty_Cycle_Permilles(Timer, channel1, channel2);
}
}