From 16a9ea2715394ed1efc134459f964d39ec198a5b Mon Sep 17 00:00:00 2001
From: Yohan Boujon <boujon@insa-toulouse.fr>
Date: Tue, 21 Mar 2023 16:45:12 +0100
Subject: [PATCH] Test PWM, non fonctionel

---
 ProjetsKEIL/Drivers/timerdriver.c                        | 5 +++++
 ProjetsKEIL/Drivers/timerdriver.h                        | 1 +
 ProjetsKEIL/timer_interruption/Source/Principale.c       | 9 ++++++++-
 ProjetsKEIL/timer_interruption/timer_interruption.uvoptx | 6 +++---
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/ProjetsKEIL/Drivers/timerdriver.c b/ProjetsKEIL/Drivers/timerdriver.c
index 75a8721..73a377e 100644
--- a/ProjetsKEIL/Drivers/timerdriver.c
+++ b/ProjetsKEIL/Drivers/timerdriver.c
@@ -29,6 +29,11 @@ void MyTimer_ActiveIT(TIM_TypeDef * TimerX, uint8_t Prio)
 	NVIC->ISER[0] |= (0x1<<positionTimerIT);
 }
 
+void MyTimer_PWM(TIM_TypeDef * TimerX, uint8_t channel)
+{
+	//TimerX->CCER
+}
+
 int TimerX2Int(TIM_TypeDef * TimerX)
 {
 	if(TimerX == TIM1)
diff --git a/ProjetsKEIL/Drivers/timerdriver.h b/ProjetsKEIL/Drivers/timerdriver.h
index 1511c61..774ac57 100644
--- a/ProjetsKEIL/Drivers/timerdriver.h
+++ b/ProjetsKEIL/Drivers/timerdriver.h
@@ -17,6 +17,7 @@ int TimerX2Int(TIM_TypeDef * TimerX);
 uint8_t TimerIT2UInt(TIM_TypeDef * TimerX);
 void MyTimer_ActiveIT(TIM_TypeDef * TimerX, uint8_t Prio);
 void Init_Periph (void (* ptrFonction)(void));
+void MyTimer_PWM(TIM_TypeDef * TimerX, uint8_t channel);
 
 #define MyTimer_Base_Start(Timer) (Timer->CR1 |= (0x01<<CEN))
 #define MyTimer_Base_Stop(Timer)	(Timer->CR1 &= ~(0x01<<CEN))
diff --git a/ProjetsKEIL/timer_interruption/Source/Principale.c b/ProjetsKEIL/timer_interruption/Source/Principale.c
index d79ebc1..6636faa 100644
--- a/ProjetsKEIL/timer_interruption/Source/Principale.c
+++ b/ProjetsKEIL/timer_interruption/Source/Principale.c
@@ -10,16 +10,23 @@ void ToggleLed(void)
 int main (void)
 {
 	MyGPIO_Struct_TypeDef led = {GPIOA,5,Out_PullUp};	//led
+	MyGPIO_Struct_TypeDef pwm1timer1 = {GPIOA,1,AltOut_Ppull};
 	MyTimer_Struct_TypeDef timer2 = {TIM2,499,7199};	//timer
 	
-	//init & start LED, Timer
+	//init & start LED, PWM, Timer
 	MyGPIO_Init(&led);
+	MyGPIO_Init(&pwm1timer1);
 	MyTimer_Base_Init(&timer2);
 	MyTimer_Base_Start(TIM2);
 	
 	//Init Interruption & Activate
 	Init_Periph(ToggleLed);
 	MyTimer_ActiveIT(TIM2,2);
+	
+	//PWM enable
+	TIM2->BDTR |= (1<<1); // MOE A FAIRE
+	TIM2->CCR1 = 400;
+	TIM2->CCER |= (1<<0);
 	do{
 	}while(1) ;	
 	
diff --git a/ProjetsKEIL/timer_interruption/timer_interruption.uvoptx b/ProjetsKEIL/timer_interruption/timer_interruption.uvoptx
index f87b095..6c4a8ff 100644
--- a/ProjetsKEIL/timer_interruption/timer_interruption.uvoptx
+++ b/ProjetsKEIL/timer_interruption/timer_interruption.uvoptx
@@ -75,7 +75,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>0</IsCurrentTarget>
+        <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
       <CpuCode>18</CpuCode>
       <DebugOpt>
@@ -257,7 +257,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
+        <IsCurrentTarget>0</IsCurrentTarget>
       </OPTFL>
       <CpuCode>18</CpuCode>
       <DebugOpt>
@@ -422,7 +422,7 @@
       <GroupNumber>1</GroupNumber>
       <FileNumber>2</FileNumber>
       <FileType>1</FileType>
-      <tvExp>0</tvExp>
+      <tvExp>1</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
       <PathWithFileName>..\Drivers\gpiodriver.c</PathWithFileName>