diff --git a/Logiciel/Firmware_testeur/.cproject b/Logiciel/Firmware_testeur/.cproject
index 838b3f6bf211f052cb41f2975711f56978d80d1e..aca616cf023ef2311c2a859223ddcd8846a7672a 100644
--- a/Logiciel/Firmware_testeur/.cproject
+++ b/Logiciel/Firmware_testeur/.cproject
@@ -38,12 +38,17 @@
<listOptionValue builtIn="false" value="DEBUG"/>
</option>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.170695699" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+ <listOptionValue builtIn="false" value="Drivers/STM32F0xx_HAL_Driver/Inc"/>
<listOptionValue builtIn="false" value="../Inc"/>
<listOptionValue builtIn="false" value="../Drivers/STM32F0xx_HAL_Driver/Inc"/>
<listOptionValue builtIn="false" value="../Drivers/CMSIS/Include"/>
- <listOptionValue builtIn="false" value="../Drivers/CMSIS/Device/ST/STM32F0xx/Include"/>
+ <listOptionValue builtIn="false" value="Drivers/CMSIS/Include"/>
<listOptionValue builtIn="false" value="../Drivers/STM32F0xx_HAL_Driver/Inc/Legacy"/>
<listOptionValue builtIn="false" value="../Drivers"/>
+ <listOptionValue builtIn="false" value="../Drivers/CMSIS/Device/ST/STM32F0xx/Include"/>
+ <listOptionValue builtIn="false" value="Drivers/CMSIS/Device/ST/STM32F0xx/Include"/>
+ <listOptionValue builtIn="false" value="Drivers/STM32F0xx_HAL_Driver/Inc/Legacy"/>
+ <listOptionValue builtIn="false" value="Inc"/>
</option>
<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2008519693" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
</tool>
diff --git a/Logiciel/Firmware_testeur/.log b/Logiciel/Firmware_testeur/.log
index 70c811d83e95c707d617d3a5178ef5210763105a..ac8ac5fe7e9d5d14a2fe993274a767d0af41563f 100644
--- a/Logiciel/Firmware_testeur/.log
+++ b/Logiciel/Firmware_testeur/.log
@@ -1,22 +1,22 @@
-[INFO ] 2020-03-24 23:16:06,191 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Start Cube IDE services
-[INFO ] 2020-03-24 23:16:06,210 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Cube IDE services are relying on '1.1.0.19rc7_generators' product version and '4545_20191011-1318(UTC)' build version
-[INFO ] 2020-03-24 23:16:06,212 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Analyze Cube IDE services command line
-[INFO ] 2020-03-24 23:16:06,222 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Look for Cube IDE service type
-[INFO ] 2020-03-24 23:16:06,276 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Use Cube IDE service: 'Mx generate project service'
-[INFO ] 2020-03-24 23:16:06,276 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Look for Cube IDE service option(s)
-[WARN ] 2020-03-24 23:16:06,276 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Argument '-rmiServerPort' is ignored
-[WARN ] 2020-03-24 23:16:06,276 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Argument '6543' is ignored
-[INFO ] 2020-03-24 23:16:06,276 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Check Cube IDE service option(s)
-[INFO ] 2020-03-24 23:16:06,277 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Run Cube IDE service
-[INFO ] 2020-03-24 23:16:10,313 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - End Cube IDE services
-[INFO ] 2020-03-24 23:21:49,403 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Start Cube IDE services
-[INFO ] 2020-03-24 23:21:49,418 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Cube IDE services are relying on '1.1.0.19rc7_generators' product version and '4545_20191011-1318(UTC)' build version
-[INFO ] 2020-03-24 23:21:49,419 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Analyze Cube IDE services command line
-[INFO ] 2020-03-24 23:21:49,428 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Look for Cube IDE service type
-[INFO ] 2020-03-24 23:21:49,482 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Use Cube IDE service: 'Mx update project service'
-[INFO ] 2020-03-24 23:21:49,483 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Look for Cube IDE service option(s)
-[WARN ] 2020-03-24 23:21:49,483 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Argument '-rmiServerPort' is ignored
-[WARN ] 2020-03-24 23:21:49,483 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Argument '6544' is ignored
-[INFO ] 2020-03-24 23:21:49,483 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Check Cube IDE service option(s)
-[INFO ] 2020-03-24 23:21:49,483 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Run Cube IDE service
-[INFO ] 2020-03-24 23:21:52,168 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - End Cube IDE services
+[INFO ] 2020-04-02 21:03:54,495 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Start Cube IDE services
+[INFO ] 2020-04-02 21:03:54,537 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Cube IDE services are relying on '1.1.0.19rc7_generators' product version and '4545_20191011-1318(UTC)' build version
+[INFO ] 2020-04-02 21:03:54,540 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Analyze Cube IDE services command line
+[INFO ] 2020-04-02 21:03:54,566 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Look for Cube IDE service type
+[INFO ] 2020-04-02 21:03:54,714 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Use Cube IDE service: 'Mx update project service'
+[INFO ] 2020-04-02 21:03:54,715 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Look for Cube IDE service option(s)
+[WARN ] 2020-04-02 21:03:54,715 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Argument '-rmiServerPort' is ignored
+[WARN ] 2020-04-02 21:03:54,716 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Argument '6543' is ignored
+[INFO ] 2020-04-02 21:03:54,716 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Check Cube IDE service option(s)
+[INFO ] 2020-04-02 21:03:54,716 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Run Cube IDE service
+[INFO ] 2020-04-02 21:03:58,210 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - End Cube IDE services
+[INFO ] 2020-04-02 21:05:17,406 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Start Cube IDE services
+[INFO ] 2020-04-02 21:05:17,414 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Cube IDE services are relying on '1.1.0.19rc7_generators' product version and '4545_20191011-1318(UTC)' build version
+[INFO ] 2020-04-02 21:05:17,416 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Analyze Cube IDE services command line
+[INFO ] 2020-04-02 21:05:17,421 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Look for Cube IDE service type
+[INFO ] 2020-04-02 21:05:17,441 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Use Cube IDE service: 'Mx update project service'
+[INFO ] 2020-04-02 21:05:17,441 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Look for Cube IDE service option(s)
+[WARN ] 2020-04-02 21:05:17,441 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Argument '-rmiServerPort' is ignored
+[WARN ] 2020-04-02 21:05:17,441 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Argument '6544' is ignored
+[INFO ] 2020-04-02 21:05:17,441 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Check Cube IDE service option(s)
+[INFO ] 2020-04-02 21:05:17,441 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Run Cube IDE service
+[INFO ] 2020-04-02 21:05:20,203 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - End Cube IDE services
diff --git a/Logiciel/Firmware_testeur/.log-2020-03-24.log b/Logiciel/Firmware_testeur/.log-2020-03-24.log
new file mode 100644
index 0000000000000000000000000000000000000000..70c811d83e95c707d617d3a5178ef5210763105a
--- /dev/null
+++ b/Logiciel/Firmware_testeur/.log-2020-03-24.log
@@ -0,0 +1,22 @@
+[INFO ] 2020-03-24 23:16:06,191 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Start Cube IDE services
+[INFO ] 2020-03-24 23:16:06,210 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Cube IDE services are relying on '1.1.0.19rc7_generators' product version and '4545_20191011-1318(UTC)' build version
+[INFO ] 2020-03-24 23:16:06,212 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Analyze Cube IDE services command line
+[INFO ] 2020-03-24 23:16:06,222 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Look for Cube IDE service type
+[INFO ] 2020-03-24 23:16:06,276 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Use Cube IDE service: 'Mx generate project service'
+[INFO ] 2020-03-24 23:16:06,276 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Look for Cube IDE service option(s)
+[WARN ] 2020-03-24 23:16:06,276 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Argument '-rmiServerPort' is ignored
+[WARN ] 2020-03-24 23:16:06,276 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Argument '6543' is ignored
+[INFO ] 2020-03-24 23:16:06,276 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Check Cube IDE service option(s)
+[INFO ] 2020-03-24 23:16:06,277 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Run Cube IDE service
+[INFO ] 2020-03-24 23:16:10,313 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - End Cube IDE services
+[INFO ] 2020-03-24 23:21:49,403 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Start Cube IDE services
+[INFO ] 2020-03-24 23:21:49,418 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Cube IDE services are relying on '1.1.0.19rc7_generators' product version and '4545_20191011-1318(UTC)' build version
+[INFO ] 2020-03-24 23:21:49,419 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Analyze Cube IDE services command line
+[INFO ] 2020-03-24 23:21:49,428 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Look for Cube IDE service type
+[INFO ] 2020-03-24 23:21:49,482 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Use Cube IDE service: 'Mx update project service'
+[INFO ] 2020-03-24 23:21:49,483 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Look for Cube IDE service option(s)
+[WARN ] 2020-03-24 23:21:49,483 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Argument '-rmiServerPort' is ignored
+[WARN ] 2020-03-24 23:21:49,483 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Argument '6544' is ignored
+[INFO ] 2020-03-24 23:21:49,483 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Check Cube IDE service option(s)
+[INFO ] 2020-03-24 23:21:49,483 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - Run Cube IDE service
+[INFO ] 2020-03-24 23:21:52,168 com.st.stm32cube.ide.common.services.mx.rcp.CubeIdeServices - End Cube IDE services
diff --git a/Logiciel/Firmware_testeur/Drivers/testeur.c b/Logiciel/Firmware_testeur/Drivers/testeur.c
index 268c432c266370b8a023c3d5231ff6d72180da23..eb47aa15501cf0b1629d522c9032035d319a9016 100644
--- a/Logiciel/Firmware_testeur/Drivers/testeur.c
+++ b/Logiciel/Firmware_testeur/Drivers/testeur.c
@@ -7,6 +7,19 @@
#include "testeur.h"
+// Fonctions privées
+void testerBroche(RJ45_Sortie_Port connecteur) {
+ RJ45_Sortie_Port_ecrireBroche1(&connecteur, RJ45_HAUT);
+ RJ45_Sortie_Port_ecrireBroche2(&connecteur, RJ45_HAUT);
+ RJ45_Sortie_Port_ecrireBroche3(&connecteur, RJ45_HAUT);
+ RJ45_Sortie_Port_ecrireBroche4(&connecteur, RJ45_HAUT);
+
+ RJ45_Sortie_Port_ecrireBroche5(&connecteur, RJ45_HAUT);
+ RJ45_Sortie_Port_ecrireBroche6(&connecteur, RJ45_HAUT);
+ RJ45_Sortie_Port_ecrireBroche7(&connecteur, RJ45_HAUT);
+ RJ45_Sortie_Port_ecrireBroche8(&connecteur, RJ45_HAUT);
+}
+
// Fonctions publiques
void Testeur_init (Testeur* testeur) {
RJ45_Sortie_Port connecteurA;
diff --git a/Logiciel/Firmware_testeur/Firmware_testeur.ioc b/Logiciel/Firmware_testeur/Firmware_testeur.ioc
index f3d2d2e030bc2f66e989997e93f84a1162a862c6..6ff56d27cd4de26cbd53e0d2b208089395dcc23b 100644
--- a/Logiciel/Firmware_testeur/Firmware_testeur.ioc
+++ b/Logiciel/Firmware_testeur/Firmware_testeur.ioc
@@ -91,6 +91,7 @@ Mcu.UserConstants=
Mcu.UserName=STM32F071V8Tx
MxCube.Version=5.4.0
MxDb.Version=DB.5.0.40
+NVIC.EXTI4_15_IRQn=true\:0\:0\:false\:false\:true\:true\:true
NVIC.ForceEnableDMAVector=true
NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false\:false
@@ -101,9 +102,10 @@ PA0.GPIOParameters=GPIO_Label
PA0.GPIO_Label=DS1_6
PA0.Locked=true
PA0.Signal=GPIO_Output
-PA1.GPIOParameters=GPIO_Label
+PA1.GPIOParameters=PinState,GPIO_Label
PA1.GPIO_Label=DS1_5
PA1.Locked=true
+PA1.PinState=GPIO_PIN_RESET
PA1.Signal=GPIO_Output
PA10.GPIOParameters=GPIO_Label
PA10.GPIO_Label=DS7_2
@@ -331,7 +333,7 @@ PD8.GPIOParameters=GPIO_PuPd,GPIO_Label
PD8.GPIO_Label=BTN
PD8.GPIO_PuPd=GPIO_PULLDOWN
PD8.Locked=true
-PD8.Signal=GPIO_Input
+PD8.Signal=GPXTI8
PD9.GPIOParameters=GPIO_Label
PD9.GPIO_Label=DS8_7
PD9.Locked=true
@@ -457,6 +459,8 @@ RCC.TimSysFreq_Value=8000000
RCC.USART1Freq_Value=8000000
RCC.USART2Freq_Value=8000000
RCC.VCOOutput2Freq_Value=8000000
+SH.GPXTI8.0=GPIO_EXTI8
+SH.GPXTI8.ConfNb=1
VP_SYS_VS_Systick.Mode=SysTick
VP_SYS_VS_Systick.Signal=SYS_VS_Systick
board=custom
diff --git a/Logiciel/Firmware_testeur/Inc/main.h b/Logiciel/Firmware_testeur/Inc/main.h
index 69a457c8f6bb3e69dc9626806e957b1351a3135b..60ae4315a0434424fb30ecf204994a1e8a621f62 100644
--- a/Logiciel/Firmware_testeur/Inc/main.h
+++ b/Logiciel/Firmware_testeur/Inc/main.h
@@ -132,6 +132,7 @@ void Error_Handler(void);
#define EN_2V_GPIO_Port GPIOB
#define BTN_Pin GPIO_PIN_8
#define BTN_GPIO_Port GPIOD
+#define BTN_EXTI_IRQn EXTI4_15_IRQn
#define DS8_7_Pin GPIO_PIN_9
#define DS8_7_GPIO_Port GPIOD
#define DS8_6_Pin GPIO_PIN_10
diff --git a/Logiciel/Firmware_testeur/Inc/stm32f0xx_it.h b/Logiciel/Firmware_testeur/Inc/stm32f0xx_it.h
index d81917cd871d21496262fadcf983be6b4efbfb1c..95e8d710c750d46ff207fa58f29ea1ccefbd4ffb 100644
--- a/Logiciel/Firmware_testeur/Inc/stm32f0xx_it.h
+++ b/Logiciel/Firmware_testeur/Inc/stm32f0xx_it.h
@@ -52,6 +52,7 @@ void HardFault_Handler(void);
void SVC_Handler(void);
void PendSV_Handler(void);
void SysTick_Handler(void);
+void EXTI4_15_IRQHandler(void);
/* USER CODE BEGIN EFP */
/* USER CODE END EFP */
diff --git a/Logiciel/Firmware_testeur/Src/main.c b/Logiciel/Firmware_testeur/Src/main.c
index 676f8c6bfd46c67537f7dc53ddb57d55c1e9f858..6bee18c88f93c8db8808e4c0e8e34ef678e6ed12 100644
--- a/Logiciel/Firmware_testeur/Src/main.c
+++ b/Logiciel/Firmware_testeur/Src/main.c
@@ -43,7 +43,7 @@
/* Private variables ---------------------------------------------------------*/
/* USER CODE BEGIN PV */
-
+Testeur testeur;
/* USER CODE END PV */
/* Private function prototypes -----------------------------------------------*/
@@ -88,7 +88,6 @@ int main(void)
/* Initialize all configured peripherals */
MX_GPIO_Init();
/* USER CODE BEGIN 2 */
- Testeur testeur;
Testeur_init(&testeur);
/* USER CODE END 2 */
@@ -262,7 +261,7 @@ static void MX_GPIO_Init(void)
/*Configure GPIO pin : BTN_Pin */
GPIO_InitStruct.Pin = BTN_Pin;
- GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+ GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING;
GPIO_InitStruct.Pull = GPIO_PULLDOWN;
HAL_GPIO_Init(BTN_GPIO_Port, &GPIO_InitStruct);
@@ -279,6 +278,10 @@ static void MX_GPIO_Init(void)
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
+ /* EXTI interrupt init*/
+ HAL_NVIC_SetPriority(EXTI4_15_IRQn, 0, 0);
+ HAL_NVIC_EnableIRQ(EXTI4_15_IRQn);
+
}
/* USER CODE BEGIN 4 */
diff --git a/Logiciel/Firmware_testeur/Src/stm32f0xx_it.c b/Logiciel/Firmware_testeur/Src/stm32f0xx_it.c
index 10ad5c7a84cd7e7d580b1ee0744161df95670780..da008b04d017070838d6ca462e3abf87a9cafce6 100644
--- a/Logiciel/Firmware_testeur/Src/stm32f0xx_it.c
+++ b/Logiciel/Firmware_testeur/Src/stm32f0xx_it.c
@@ -42,7 +42,7 @@
/* Private variables ---------------------------------------------------------*/
/* USER CODE BEGIN PV */
-
+extern Testeur testeur;
/* USER CODE END PV */
/* Private function prototypes -----------------------------------------------*/
@@ -139,6 +139,22 @@ void SysTick_Handler(void)
/* please refer to the startup file (startup_stm32f0xx.s). */
/******************************************************************************/
+/**
+ * @brief This function handles EXTI line 4 to 15 interrupts.
+ */
+void EXTI4_15_IRQHandler(void)
+{
+ /* USER CODE BEGIN EXTI4_15_IRQn 0 */
+
+ Testeur_testerCable(&testeur);
+
+ /* USER CODE END EXTI4_15_IRQn 0 */
+ HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_8);
+ /* USER CODE BEGIN EXTI4_15_IRQn 1 */
+
+ /* USER CODE END EXTI4_15_IRQn 1 */
+}
+
/* USER CODE BEGIN 1 */
/* USER CODE END 1 */