From 5723b954059d3dfa138844484a4bcba096bae38f Mon Sep 17 00:00:00 2001
From: Neluji <38362829+Neluji@users.noreply.github.com>
Date: Tue, 24 Nov 2020 08:15:55 +0100
Subject: [PATCH] ajout de seuils sur Duty_Cycle

---
 MDK-ARM/Project.uvoptx | 15 +++++--------
 Services/MyRF.c        | 48 +++++++++++++++++++++++-------------------
 Src/main.c             |  3 +++
 3 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/MDK-ARM/Project.uvoptx b/MDK-ARM/Project.uvoptx
index 1aede9a..da146e5 100644
--- a/MDK-ARM/Project.uvoptx
+++ b/MDK-ARM/Project.uvoptx
@@ -317,7 +317,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>DLGDARM</Key>
-          <Name>(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)</Name>
+          <Name>(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=874,38,1295,465,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=521,17,1115,768,0)(131=150,13,744,764,0)(132=599,17,1193,768,0)(133=-1,-1,-1,-1,0)(160=674,53,1122,467,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)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -362,7 +362,7 @@
         <Mm>
           <WinNumber>1</WinNumber>
           <SubType>0</SubType>
-          <ItemText>porta</ItemText>
+          <ItemText>0x08001778</ItemText>
           <AccSizeX>0</AccSizeX>
         </Mm>
       </MemoryWindow1>
@@ -374,7 +374,7 @@
         <periodic>1</periodic>
         <aLwin>1</aLwin>
         <aCover>0</aCover>
-        <aSer1>0</aSer1>
+        <aSer1>1</aSer1>
         <aSer2>0</aSer2>
         <aPa>0</aPa>
         <viewmode>1</viewmode>
@@ -411,13 +411,8 @@
       <LogicAnalyzers>
         <Wi>
           <IntNumber>0</IntNumber>
-          <FirstString>((portb &amp; 0x00000040) &gt;&gt; 6 &amp; 0x40) &gt;&gt; 6</FirstString>
-          <SecondString>00008000000000000000000000000000E0FFEF400000000000000000000000000000000028706F7274622026203078303030303030343029203E3E2036000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000E03F0D00000000000000000000000000000000000000440E0008</SecondString>
-        </Wi>
-        <Wi>
-          <IntNumber>1</IntNumber>
-          <FirstString>((portb &amp; 0x00000080) &gt;&gt; 7 &amp; 0x80) &gt;&gt; 7</FirstString>
-          <SecondString>00000000000000000000000000000000E0FFEF400000000000000000000000000000000028706F7274622026203078303030303030383029203E3E2037000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000000000000000E03F0D00000000000000000000000000000000000000040E0008</SecondString>
+          <FirstString>((porta &amp; 0x00000200) &gt;&gt; 9 &amp; 0x200) &gt;&gt; 9</FirstString>
+          <SecondString>00008000000000000000000000000000E0FFEF400200000000000000000000000000000028706F7274612026203078303030303032303029203E3E2039000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000900000001000000000000000000F03F17000000000000000000000000000000000000003E160008</SecondString>
         </Wi>
       </LogicAnalyzers>
       <DebugDescription>
diff --git a/Services/MyRF.c b/Services/MyRF.c
index 92c474d..d037b74 100644
--- a/Services/MyRF.c
+++ b/Services/MyRF.c
@@ -48,7 +48,7 @@ void MyRF_Conf(void) {
 	MyUSART_Conf(USARTOut, TransferDirTX);
 	
 	//Configuration Timer (interruption à 3s, callback MyRF_Transmit_3s) et lancement
-	MyTimer_Conf(TimerRF,65633,3290);
+	MyTimer_Conf(TimerRF,65533,3295);
 	MyTimer_IT_Conf(TimerRF,MyRF_Transmit_3s,3);
 	MyTimer_IT_Enable(TimerRF);
 	MyTimer_Start(TimerRF);
@@ -56,21 +56,25 @@ void MyRF_Conf(void) {
 }
 
 int MyRF_Input_Duty_Cycle(void) {
-	
-	return (MyPWM_Duty_Cycle_Permilles(TimerCC, channelCC1, channelCC2) - 75) * 4;
-	
+	int duty_cycle_RC = MyPWM_Duty_Cycle_Permilles(TimerCC, channelCC1, channelCC2);
+	if (74<duty_cycle_RC && duty_cycle_RC<77) {
+		return 0;
+	}
+	else {
+		return (duty_cycle_RC - 75) * 4;
+	}
 }
 
 void MyRF_Transmit_3s(void) {
 	
 	//Récupérer :
-	char bordage[3];
-	char heure[2];
-	char min[2];
-	char sec[2];
-	int allure_ref = 0;
+	char bordage[3] = "";
+	char heure[2] = "xx";
+	char min[2] = "xx";
+	char sec[2] = "xx";
+	int allure_ref = 3;
 	
-	char allure[7][30] = {"pas (ou vent debout).",
+	char allure[7][16]= {"vent debout.",
 		"au plus près.",
 		"au près.",
 		"au bon plein.",
@@ -78,8 +82,8 @@ void MyRF_Transmit_3s(void) {
 		"au grand largue.",
 		"au vent arrière."
 	};
-	char data1[23] = "\" : le voilier navigue ";
-	char data2[15] = " === Bordage : ";
+	char data1[14] = "\" - Bordage : ";
+	char data2[24] = " === Le voilier navigue ";
 	
 	int i;
 	
@@ -94,23 +98,23 @@ void MyRF_Transmit_3s(void) {
 	//Secondes
 	MyUSART_Transmit_Data_8b(USARTOut, sec[0]);
 	MyUSART_Transmit_Data_8b(USARTOut, sec[1]);
-	//Texte 1 (allures)
-	for(i=0; i<23; i++) {
+	//Texte 1 (bordage)
+	for(i=0; i<14; i++) {
 		MyUSART_Transmit_Data_8b(USARTOut, data1[i]);
 	}
-	//Allure
-	for(i=0; i<30; i++) {
-		MyUSART_Transmit_Data_8b(USARTOut, allure[allure_ref][i]);
-	}
-	//Texte 2 (bordage)
-	for(i=0; i<15; i++) {
-		MyUSART_Transmit_Data_8b(USARTOut, data2[i]);
-	}
 	//Bordage
 	for(i=0; i<3; i++) {
 		MyUSART_Transmit_Data_8b(USARTOut, bordage[i]);
 	}
 	MyUSART_Transmit_Data_8b(USARTOut, '%');
+	//Texte 2 (allure)
+	for(i=0; i<24; i++) {
+		MyUSART_Transmit_Data_8b(USARTOut, data2[i]);
+	}
+	//Allure
+	for(i=0; i<16; i++) {
+		MyUSART_Transmit_Data_8b(USARTOut, allure[allure_ref][i]);
+	}
 	//Newline (fin)
 	MyUSART_Transmit_Data_8b(USARTOut, '\n');
 	
diff --git a/Src/main.c b/Src/main.c
index c295b38..7e7006f 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -22,6 +22,7 @@
 #include "stm32f1xx_ll_gpio.h"
 #include "MyTimer.h"
 #include "MyPWM.h"
+#include "MyRF.h"
 
 void  SystemClock_Config(void);
 
@@ -38,6 +39,8 @@ int main(void)
 {
   /* Configure the system clock to 72 MHz */
   SystemClock_Config();
+	
+	MyRF_Conf();
   
   /* Infinite loop */
   while (1)