This repository has been archived by the owner on Jan 10, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into improvement/106_code-docs-generation
- Loading branch information
Showing
13 changed files
with
3,635 additions
and
35 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
2 changes: 2 additions & 0 deletions
2
Project/DAQ_System/.settings/com.st.stm32cube.ide.mcu.sfrview.prefs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| eclipse.preferences.version=1 | ||
| sfrviewstate={"fFavorites"\:{"fLists"\:{}},"fProperties"\:{"fNodeProperties"\:{}}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| /* USER CODE BEGIN Header */ | ||
| /** | ||
| ****************************************************************************** | ||
| * @file can.h | ||
| * @brief This file contains all the function prototypes for | ||
| * the can.c file | ||
| ****************************************************************************** | ||
| * @attention | ||
| * | ||
| * Copyright (c) 2023 STMicroelectronics. | ||
| * All rights reserved. | ||
| * | ||
| * This software is licensed under terms that can be found in the LICENSE file | ||
| * in the root directory of this software component. | ||
| * If no LICENSE file comes with this software, it is provided AS-IS. | ||
| * | ||
| ****************************************************************************** | ||
| */ | ||
| /* USER CODE END Header */ | ||
| /* Define to prevent recursive inclusion -------------------------------------*/ | ||
| #ifndef __CAN_H__ | ||
| #define __CAN_H__ | ||
|
|
||
| #ifdef __cplusplus | ||
| extern "C" { | ||
| #endif | ||
|
|
||
| /* Includes ------------------------------------------------------------------*/ | ||
| #include "main.h" | ||
|
|
||
| /* USER CODE BEGIN Includes */ | ||
|
|
||
| /* USER CODE END Includes */ | ||
|
|
||
| extern CAN_HandleTypeDef hcan1; | ||
|
|
||
| /* USER CODE BEGIN Private defines */ | ||
|
|
||
| /* USER CODE END Private defines */ | ||
|
|
||
| void MX_CAN1_Init(void); | ||
|
|
||
| /* USER CODE BEGIN Prototypes */ | ||
|
|
||
| /* USER CODE END Prototypes */ | ||
|
|
||
| #ifdef __cplusplus | ||
| } | ||
| #endif | ||
|
|
||
| #endif /* __CAN_H__ */ | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| /* USER CODE BEGIN Header */ | ||
| /** | ||
| ****************************************************************************** | ||
| * @file can.c | ||
| * @brief This file provides code for the configuration | ||
| * of the CAN instances. | ||
| ****************************************************************************** | ||
| * @attention | ||
| * | ||
| * Copyright (c) 2023 STMicroelectronics. | ||
| * All rights reserved. | ||
| * | ||
| * This software is licensed under terms that can be found in the LICENSE file | ||
| * in the root directory of this software component. | ||
| * If no LICENSE file comes with this software, it is provided AS-IS. | ||
| * | ||
| ****************************************************************************** | ||
| */ | ||
| /* USER CODE END Header */ | ||
| /* Includes ------------------------------------------------------------------*/ | ||
| #include "can.h" | ||
|
|
||
| /* USER CODE BEGIN 0 */ | ||
|
|
||
| /* USER CODE END 0 */ | ||
|
|
||
| CAN_HandleTypeDef hcan1; | ||
|
|
||
| /* CAN1 init function */ | ||
| void MX_CAN1_Init(void) | ||
| { | ||
|
|
||
| /* USER CODE BEGIN CAN1_Init 0 */ | ||
|
|
||
| /* USER CODE END CAN1_Init 0 */ | ||
|
|
||
| /* USER CODE BEGIN CAN1_Init 1 */ | ||
|
|
||
| /* USER CODE END CAN1_Init 1 */ | ||
| hcan1.Instance = CAN1; | ||
| hcan1.Init.Prescaler = 24; | ||
| hcan1.Init.Mode = CAN_MODE_NORMAL; | ||
| hcan1.Init.SyncJumpWidth = CAN_SJW_1TQ; | ||
| hcan1.Init.TimeSeg1 = CAN_BS1_3TQ; | ||
| hcan1.Init.TimeSeg2 = CAN_BS2_3TQ; | ||
| hcan1.Init.TimeTriggeredMode = DISABLE; | ||
| hcan1.Init.AutoBusOff = DISABLE; | ||
| hcan1.Init.AutoWakeUp = DISABLE; | ||
| hcan1.Init.AutoRetransmission = DISABLE; | ||
| hcan1.Init.ReceiveFifoLocked = DISABLE; | ||
| hcan1.Init.TransmitFifoPriority = DISABLE; | ||
| if (HAL_CAN_Init(&hcan1) != HAL_OK) | ||
| { | ||
| Error_Handler(); | ||
| } | ||
| /* USER CODE BEGIN CAN1_Init 2 */ | ||
|
|
||
| /* USER CODE END CAN1_Init 2 */ | ||
|
|
||
| } | ||
|
|
||
| void HAL_CAN_MspInit(CAN_HandleTypeDef* canHandle) | ||
| { | ||
|
|
||
| GPIO_InitTypeDef GPIO_InitStruct = {0}; | ||
| if(canHandle->Instance==CAN1) | ||
| { | ||
| /* USER CODE BEGIN CAN1_MspInit 0 */ | ||
|
|
||
| /* USER CODE END CAN1_MspInit 0 */ | ||
| /* CAN1 clock enable */ | ||
| __HAL_RCC_CAN1_CLK_ENABLE(); | ||
|
|
||
| __HAL_RCC_GPIOD_CLK_ENABLE(); | ||
| /**CAN1 GPIO Configuration | ||
| PD0 ------> CAN1_RX | ||
| PD1 ------> CAN1_TX | ||
| */ | ||
| GPIO_InitStruct.Pin = GPIO_PIN_0|GPIO_PIN_1; | ||
| GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; | ||
| GPIO_InitStruct.Pull = GPIO_NOPULL; | ||
| GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH; | ||
| GPIO_InitStruct.Alternate = GPIO_AF9_CAN1; | ||
| HAL_GPIO_Init(GPIOD, &GPIO_InitStruct); | ||
|
|
||
| /* CAN1 interrupt Init */ | ||
| HAL_NVIC_SetPriority(CAN1_RX0_IRQn, 5, 0); | ||
| HAL_NVIC_EnableIRQ(CAN1_RX0_IRQn); | ||
| HAL_NVIC_SetPriority(CAN1_RX1_IRQn, 5, 0); | ||
| HAL_NVIC_EnableIRQ(CAN1_RX1_IRQn); | ||
| /* USER CODE BEGIN CAN1_MspInit 1 */ | ||
|
|
||
| /* USER CODE END CAN1_MspInit 1 */ | ||
| } | ||
| } | ||
|
|
||
| void HAL_CAN_MspDeInit(CAN_HandleTypeDef* canHandle) | ||
| { | ||
|
|
||
| if(canHandle->Instance==CAN1) | ||
| { | ||
| /* USER CODE BEGIN CAN1_MspDeInit 0 */ | ||
|
|
||
| /* USER CODE END CAN1_MspDeInit 0 */ | ||
| /* Peripheral clock disable */ | ||
| __HAL_RCC_CAN1_CLK_DISABLE(); | ||
|
|
||
| /**CAN1 GPIO Configuration | ||
| PD0 ------> CAN1_RX | ||
| PD1 ------> CAN1_TX | ||
| */ | ||
| HAL_GPIO_DeInit(GPIOD, GPIO_PIN_0|GPIO_PIN_1); | ||
|
|
||
| /* CAN1 interrupt Deinit */ | ||
| HAL_NVIC_DisableIRQ(CAN1_RX0_IRQn); | ||
| HAL_NVIC_DisableIRQ(CAN1_RX1_IRQn); | ||
| /* USER CODE BEGIN CAN1_MspDeInit 1 */ | ||
|
|
||
| /* USER CODE END CAN1_MspDeInit 1 */ | ||
| } | ||
| } | ||
|
|
||
| /* USER CODE BEGIN 1 */ | ||
|
|
||
| /* USER CODE END 1 */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.