eduard.dlabal/LightTAM_RFID_Reader
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor code structure for improved readability and maintainability

Browse Source
This commit is contained in:
Dlabal Eduard
2025-05-18 13:07:33 +02:00
parent 95ec6cd0ab
commit b308f80a11
25 changed files with 648 additions and 2647 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/Src/main.c
+129 -45
View File
@@ -1,20 +1,21 @@
/* USER CODE BEGIN Header */
/**
******************************************************************************
* @file : main.c
* @brief : Main program body
******************************************************************************
* @attention
*
* Copyright (c) 2025 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.
*
******************************************************************************
*/
******************************************************************************
* @file : main.c
* @brief : Main program body
******************************************************************************
* @attention
*
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
* All rights reserved.</center></h2>
*
* This software component is licensed by ST under BSD 3-Clause license,
* the "License"; You may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
* opensource.org/licenses/BSD-3-Clause
*
******************************************************************************
*/
/* USER CODE END Header */
/* Includes ------------------------------------------------------------------*/
#include "main.h"
@@ -26,7 +27,6 @@
/* Private includes ----------------------------------------------------------*/
/* USER CODE BEGIN Includes */
#include "pn532_stm32f1.h"
/* USER CODE END Includes */
/* Private typedef -----------------------------------------------------------*/
@@ -47,7 +47,7 @@
/* Private variables ---------------------------------------------------------*/
/* USER CODE BEGIN PV */
PN532 pn532;
/* USER CODE END PV */
/* Private function prototypes -----------------------------------------------*/
@@ -62,14 +62,18 @@ void SystemClock_Config(void);
/* USER CODE END 0 */
/**
* @brief The application entry point.
* @retval int
*/
* @brief The application entry point.
* @retval int
*/
int main(void)
{
/* USER CODE BEGIN 1 */
uint8_t buff[255];
uint8_t uid[MIFARE_UID_MAX_LENGTH];
uint8_t key_a[] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
uint32_t pn532_error = PN532_ERROR_NONE;
int32_t uid_len = 0;
/* USER CODE END 1 */
/* MCU Configuration--------------------------------------------------------*/
@@ -94,7 +98,21 @@ int main(void)
MX_USART1_UART_Init();
MX_SPI1_Init();
/* USER CODE BEGIN 2 */
printf("Hello!\r\n");
PN532 pn532;
// PN532_SPI_Init(&pn532);
PN532_I2C_Init(&pn532);
PN532_GetFirmwareVersion(&pn532, buff);
if (PN532_GetFirmwareVersion(&pn532, buff) == PN532_STATUS_OK)
{
printf("Found PN532 with firmware version: %d.%d\r\n", buff[1], buff[2]);
}
else
{
return -1;
}
PN532_SamConfiguration(&pn532);
printf("Waiting for RFID/NFC card...\r\n");
/* USER CODE END 2 */
/* Infinite loop */
@@ -104,22 +122,73 @@ int main(void)
/* USER CODE END WHILE */
/* USER CODE BEGIN 3 */
// Check if a card is available to read
uid_len = PN532_ReadPassiveTarget(&pn532, uid, PN532_MIFARE_ISO14443A, 1000);
if (uid_len == PN532_STATUS_ERROR)
{
printf(".");
}
else
{
printf("Found card with UID: ");
for (uint8_t i = 0; i < uid_len; i++)
{
printf("%02x ", uid[i]);
}
printf("\r\n");
while (1)
{
printf(" Auth block 6..\r\n");
pn532_error = PN532_MifareClassicAuthenticateBlock(&pn532, uid, uid_len,
6, MIFARE_CMD_AUTH_A, key_a);
for (uint8_t i = 0; i < 16; i++)
{
buff[i] = 0x00;
}
pn532_error = PN532_MifareClassicReadBlock(&pn532, buff, 6);
printf("Data read back: ");
for (uint8_t i = 0; i < 16; i++)
{
printf("%02x ", buff[i]);
}
printf("\r\n");
// Převod načtených 4 bajtů z bloku (např. buff[0]..buff[3]) na 32bitové číslo (big-endian)
uint32_t value = (buff[0] << 24) | (buff[1] << 16) | (buff[2] << 8) | buff[3];
printf("Cislo z bloku (big-endian): %lu\r\n", value);
// Pokud je číslo v little-endian (často u Mifare), použij:
uint32_t value_le = (buff[3] << 24) | (buff[2] << 16) | (buff[1] << 8) | buff[0];
printf("Cislo z bloku (little-endian): %lu\r\n", value_le);
while (PN532_ReadPassiveTarget(&pn532, uid, PN532_MIFARE_ISO14443A, 100) != PN532_STATUS_ERROR)
{
HAL_Delay(100);
}
printf("Card removed. Waiting for next card...\r\n");
break; // Exit the inner while(1) to wait for a new card
if (pn532_error)
{
printf("Error: 0x%02x\r\n", pn532_error);
}
}
}
}
/* USER CODE END 3 */
}
/**
* @brief System Clock Configuration
* @retval None
*/
* @brief System Clock Configuration
* @retval None
*/
void SystemClock_Config(void)
{
RCC_OscInitTypeDef RCC_OscInitStruct = {0};
RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
/** Initializes the RCC Oscillators according to the specified parameters
* in the RCC_OscInitTypeDef structure.
*/
* in the RCC_OscInitTypeDef structure.
*/
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI;
RCC_OscInitStruct.HSIState = RCC_HSI_ON;
RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
@@ -130,9 +199,8 @@ void SystemClock_Config(void)
}
/** Initializes the CPU, AHB and APB buses clocks
*/
RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
|RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
*/
RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2;
RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_HSI;
RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
@@ -145,37 +213,53 @@ void SystemClock_Config(void)
}
/* USER CODE BEGIN 4 */
#ifdef __GNUC__
/* With GCC/RAISONANCE, small printf (option LD Linker->Libraries->Small printf
set to 'Yes') calls __io_putchar() */
#define PUTCHAR_PROTOTYPE int __io_putchar(int ch)
#else
#define PUTCHAR_PROTOTYPE int fputc(int ch, FILE *f)
#endif /* __GNUC__ */
/**
* @brief Retargets the C library printf function to the USART.
* @param None
* @retval None
*/
PUTCHAR_PROTOTYPE
{
/* Place your implementation of fputc here */
/* e.g. write a character to the EVAL_COM1 and Loop until the end of transmission */
HAL_UART_Transmit(&huart1, (uint8_t *)&ch, 1, 0xFFFF);
return ch;
}
/* USER CODE END 4 */
/**
* @brief This function is executed in case of error occurrence.
* @retval None
*/
* @brief This function is executed in case of error occurrence.
* @retval None
*/
void Error_Handler(void)
{
/* USER CODE BEGIN Error_Handler_Debug */
/* User can add his own implementation to report the HAL error return state */
__disable_irq();
while (1)
{
}
/* USER CODE END Error_Handler_Debug */
}
#ifdef USE_FULL_ASSERT
#ifdef USE_FULL_ASSERT
/**
* @brief Reports the name of the source file and the source line number
* where the assert_param error has occurred.
* @param file: pointer to the source file name
* @param line: assert_param error line source number
* @retval None
*/
* @brief Reports the name of the source file and the source line number
* where the assert_param error has occurred.
* @param file: pointer to the source file name
* @param line: assert_param error line source number
* @retval None
*/
void assert_failed(uint8_t *file, uint32_t line)
{
/* USER CODE BEGIN 6 */
/* User can add his own implementation to report the file name and line number,
ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
tex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
/* USER CODE END 6 */
}
#endif /* USE_FULL_ASSERT */
Core/Src/stm32f1xx_hal_msp.c
+2 -2
View File
@@ -72,9 +72,9 @@ void HAL_MspInit(void)
/* System interrupt init*/
/** DISABLE: JTAG-DP Disabled and SW-DP Disabled
/** NOJTAG: JTAG-DP Disabled and SW-DP Enabled
*/
__HAL_AFIO_REMAP_SWJ_DISABLE();
__HAL_AFIO_REMAP_SWJ_NOJTAG();
/* USER CODE BEGIN MspInit 1 */
Core/Src/usart.c
+1 -1
View File
@@ -39,7 +39,7 @@ void MX_USART1_UART_Init(void)
/* USER CODE END USART1_Init 1 */
huart1.Instance = USART1;
huart1.Init.BaudRate = 115200;
huart1.Init.BaudRate = 9600;
huart1.Init.WordLength = UART_WORDLENGTH_8B;
huart1.Init.StopBits = UART_STOPBITS_1;
huart1.Init.Parity = UART_PARITY_NONE;