HoshinoSuzumi/IntelliChargingPile
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 完成状态机，完成刷卡、数据上报、命令处理

Browse Source
This commit is contained in:
Timothy Yin
2025-05-09 01:07:02 +08:00
parent d96b2070f2
commit ba2ce4e0ce
15 changed files with 1346 additions and 745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Core/Inc/main.h
View File

@ -40,6 +40,8 @@ extern char flag_1s;
extern char flag_2s;
extern char flag_5s;
extern char flag_10s;
extern char IC_CARD_ID[16];
/* USER CODE END ET */
/* Exported constants --------------------------------------------------------*/

87
Core/Inc/oledfont.h
View File

@ -200,32 +200,75 @@ const unsigned char F8X16[] =
//部分汉字
const unsigned char Hzk[][32] =
{
// 你(0) 好(1) 世(2) 界(3) 按(4) 键(5) 次(6) 数(7)
// 你(0) 好(1) 等(2) 待(3) 配(4) 网(5) 连(6) 接(7) 服(8) 务(9) 器(10) 设(11) 备(12) 在(13) 离(14) 上(15)
// 线(16) 卡(17) 号(18) 余(19) 额(20) 正(21) 在(22) 停(23) 止(24) 充(25) 电(26) 消(27) 费(28) 输(29) 出(30) 开(31)
// 关(32)
{0x00, 0x80, 0x60, 0xF8, 0x07, 0x40, 0x20, 0x18, 0x0F, 0x08, 0xC8, 0x08, 0x08, 0x28, 0x18, 0x00},
{0x01, 0x00, 0x00, 0xFF, 0x00, 0x10, 0x0C, 0x03, 0x40, 0x80, 0x7F, 0x00, 0x01, 0x06, 0x18, 0x00}, /*"你",0*/
{0x10, 0x10, 0xF0, 0x1F, 0x10, 0xF0, 0x00, 0x80, 0x82, 0x82, 0xE2, 0x92, 0x8A, 0x86, 0x80, 0x00},
{0x40, 0x22, 0x15, 0x08, 0x16, 0x61, 0x00, 0x00, 0x40, 0x80, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00}, /*"好",1*/
{0x20, 0x20, 0x20, 0xFE, 0x20, 0x20, 0xFF, 0x20, 0x20, 0x20, 0xFF, 0x20, 0x20, 0x20, 0x20, 0x00},
{0x00, 0x00, 0x00, 0x7F, 0x40, 0x40, 0x47, 0x44, 0x44, 0x44, 0x47, 0x40, 0x40, 0x40, 0x00, 0x00}, /*"世",2*/
{0x00, 0x00, 0x00, 0xFE, 0x92, 0x92, 0x92, 0xFE, 0x92, 0x92, 0x92, 0xFE, 0x00, 0x00, 0x00, 0x00},
{0x08, 0x08, 0x04, 0x84, 0x62, 0x1E, 0x01, 0x00, 0x01, 0xFE, 0x02, 0x04, 0x04, 0x08, 0x08, 0x00}, /*"界",3*/
{0x10, 0x10, 0x10, 0xFF, 0x90, 0x20, 0x98, 0x88, 0x88, 0xE9, 0x8E, 0x88, 0x88, 0xA8, 0x98, 0x00},
{0x02, 0x42, 0x81, 0x7F, 0x00, 0x00, 0x80, 0x84, 0x4B, 0x28, 0x10, 0x28, 0x47, 0x80, 0x00, 0x00}, /*"按",4*/
{0x40, 0x30, 0xEF, 0x24, 0x24, 0x80, 0xE4, 0x9C, 0x10, 0x54, 0x54, 0xFF, 0x54, 0x7C, 0x10, 0x00},
{0x01, 0x01, 0x7F, 0x21, 0x51, 0x26, 0x18, 0x27, 0x44, 0x45, 0x45, 0x5F, 0x45, 0x45, 0x44, 0x00}, /*"键",5*/
{0x00, 0x02, 0x0C, 0x80, 0x60, 0x80, 0x40, 0x30, 0x0F, 0xC8, 0x08, 0x08, 0x28, 0x18, 0x00, 0x00},
{0x02, 0x02, 0x7E, 0x01, 0x80, 0x40, 0x20, 0x18, 0x06, 0x01, 0x06, 0x18, 0x20, 0x40, 0x80, 0x00}, /*"次",6*/
{0x90, 0x52, 0x34, 0x10, 0xFF, 0x10, 0x34, 0x52, 0x80, 0x70, 0x8F, 0x08, 0x08, 0xF8, 0x08, 0x00},
{0x82, 0x9A, 0x56, 0x63, 0x22, 0x52, 0x8E, 0x00, 0x80, 0x40, 0x33, 0x0C, 0x33, 0x40, 0x80, 0x00}, /*"数",7*/
{0x08, 0x04, 0x23, 0x22, 0x26, 0x2A, 0x22, 0xFA, 0x24, 0x23, 0x22, 0x26, 0x2A, 0x02, 0x02, 0x00},
{0x01, 0x09, 0x09, 0x09, 0x19, 0x69, 0x09, 0x09, 0x49, 0x89, 0x7D, 0x09, 0x09, 0x09, 0x01, 0x00}, /*"等",2*/
{0x00, 0x10, 0x88, 0xC4, 0x33, 0x40, 0x48, 0x48, 0x48, 0x7F, 0x48, 0xC8, 0x48, 0x48, 0x40, 0x00},
{0x02, 0x01, 0x00, 0xFF, 0x00, 0x02, 0x0A, 0x32, 0x02, 0x42, 0x82, 0x7F, 0x02, 0x02, 0x02, 0x00}, /*"待",3*/
{0xF2, 0x12, 0xFE, 0x12, 0xFE, 0x12, 0xF2, 0x00, 0x84, 0x84, 0x84, 0x84, 0xFC, 0x00, 0x00, 0x00},
{0xFF, 0x4A, 0x49, 0x48, 0x49, 0x49, 0xFF, 0x00, 0x3F, 0x40, 0x40, 0x40, 0x41, 0x40, 0x70, 0x00}, /*"配",4*/
{0x00, 0xFE, 0x02, 0x22, 0x42, 0x82, 0x72, 0x02, 0x22, 0x42, 0x82, 0x72, 0x02, 0xFE, 0x00, 0x00},
{0x00, 0xFF, 0x10, 0x08, 0x06, 0x01, 0x0E, 0x10, 0x08, 0x06, 0x01, 0x4E, 0x80, 0x7F, 0x00, 0x00}, /*"网",5*/
{0x40, 0x40, 0x42, 0xCC, 0x00, 0x04, 0x44, 0x64, 0x5C, 0x47, 0xF4, 0x44, 0x44, 0x44, 0x04, 0x00},
{0x00, 0x40, 0x20, 0x1F, 0x20, 0x44, 0x44, 0x44, 0x44, 0x44, 0x7F, 0x44, 0x44, 0x44, 0x44, 0x00}, /*"连",6*/
{0x10, 0x10, 0x10, 0xFF, 0x10, 0x50, 0x44, 0x54, 0x65, 0xC6, 0x44, 0x64, 0x54, 0x44, 0x40, 0x00},
{0x04, 0x44, 0x82, 0x7F, 0x01, 0x82, 0x82, 0x4A, 0x56, 0x23, 0x22, 0x52, 0x4E, 0x82, 0x02, 0x00}, /*"接",7*/
{0x00, 0x00, 0xFE, 0x22, 0x22, 0x22, 0xFE, 0x00, 0xFE, 0x82, 0x82, 0x92, 0xA2, 0x9E, 0x00, 0x00},
{0x80, 0x60, 0x1F, 0x02, 0x42, 0x82, 0x7F, 0x00, 0xFF, 0x40, 0x2F, 0x10, 0x2C, 0x43, 0x80, 0x00}, /*"服",8*/
{0x00, 0x00, 0x90, 0x88, 0x4C, 0x57, 0xA4, 0x24, 0x54, 0x54, 0x8C, 0x84, 0x00, 0x00, 0x00, 0x00},
{0x01, 0x01, 0x80, 0x42, 0x22, 0x1A, 0x07, 0x02, 0x42, 0x82, 0x42, 0x3E, 0x01, 0x01, 0x01, 0x00}, /*"务",9*/
{0x80, 0x80, 0x9E, 0x92, 0x92, 0x92, 0x9E, 0xE0, 0x80, 0x9E, 0xB2, 0xD2, 0x92, 0x9E, 0x80, 0x00},
{0x08, 0x08, 0xF4, 0x94, 0x92, 0x92, 0xF1, 0x00, 0x01, 0xF2, 0x92, 0x94, 0x94, 0xF8, 0x08, 0x00}, /*"器",10*/
{0x40, 0x40, 0x42, 0xCC, 0x00, 0x40, 0xA0, 0x9E, 0x82, 0x82, 0x82, 0x9E, 0xA0, 0x20, 0x20, 0x00},
{0x00, 0x00, 0x00, 0x3F, 0x90, 0x88, 0x40, 0x43, 0x2C, 0x10, 0x28, 0x46, 0x41, 0x80, 0x80, 0x00}, /*"设",11*/
{0x80, 0x90, 0x90, 0x48, 0x4C, 0x57, 0x24, 0x24, 0x24, 0x54, 0x4C, 0x44, 0x80, 0x80, 0x80, 0x00},
{0x00, 0x00, 0x00, 0xFF, 0x49, 0x49, 0x49, 0x7F, 0x49, 0x49, 0x49, 0xFF, 0x00, 0x00, 0x00, 0x00}, /*"备",12*/
{0x08, 0x08, 0x88, 0xC8, 0x38, 0x0C, 0x0B, 0x08, 0x08, 0xE8, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00},
{0x02, 0x01, 0x00, 0xFF, 0x40, 0x41, 0x41, 0x41, 0x41, 0x7F, 0x41, 0x41, 0x41, 0x41, 0x40, 0x00}, /*"在",13*/
{0x04, 0x04, 0x04, 0xF4, 0x84, 0xD4, 0xA5, 0xA6, 0xA4, 0xD4, 0x84, 0xF4, 0x04, 0x04, 0x04, 0x00},
{0x00, 0xFE, 0x02, 0x02, 0x12, 0x3A, 0x16, 0x13, 0x12, 0x1A, 0x32, 0x42, 0x82, 0x7E, 0x00, 0x00}, /*"离",14*/
{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00, 0x00},
{0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x7F, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00}, /*"上",15*/
{0x20, 0x30, 0xAC, 0x63, 0x20, 0x18, 0x80, 0x90, 0x90, 0xFF, 0x90, 0x49, 0x4A, 0x48, 0x40, 0x00},
{0x22, 0x67, 0x22, 0x12, 0x12, 0x12, 0x40, 0x40, 0x20, 0x13, 0x0C, 0x14, 0x22, 0x41, 0xF8, 0x00}, /*"线",16*/
{0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0xFF, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x40, 0x40, 0x00},
{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x02, 0x04, 0x08, 0x10, 0x00, 0x00, 0x00}, /*"卡",17*/
{0x80, 0x80, 0x80, 0xBE, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xBE, 0x80, 0x80, 0x80, 0x00},
{0x00, 0x00, 0x00, 0x06, 0x05, 0x04, 0x04, 0x04, 0x44, 0x84, 0x44, 0x3C, 0x00, 0x00, 0x00, 0x00}, /*"号",18*/
{0x80, 0x80, 0x40, 0x20, 0x50, 0x48, 0x44, 0xC3, 0x44, 0x48, 0x50, 0x20, 0x40, 0x80, 0x80, 0x00},
{0x00, 0x40, 0x22, 0x1A, 0x02, 0x42, 0x82, 0x7F, 0x02, 0x02, 0x02, 0x0A, 0x12, 0x60, 0x00, 0x00}, /*"余",19*/
{0x00, 0x8C, 0x44, 0xB5, 0x26, 0xA4, 0x64, 0x0C, 0x02, 0xF2, 0x1A, 0xD6, 0x12, 0xF2, 0x02, 0x00},
{0x10, 0x08, 0xFC, 0x4A, 0x49, 0x4A, 0xFC, 0x08, 0x80, 0x4F, 0x30, 0x0F, 0x10, 0x2F, 0xC0, 0x00}, /*"额",20*/
{0x00, 0x02, 0x02, 0xC2, 0x02, 0x02, 0x02, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0x02, 0x00, 0x00},
{0x40, 0x40, 0x40, 0x7F, 0x40, 0x40, 0x40, 0x7F, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00}, /*"正",21*/
{0x08, 0x08, 0x88, 0xC8, 0x38, 0x0C, 0x0B, 0x08, 0x08, 0xE8, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00},
{0x02, 0x01, 0x00, 0xFF, 0x40, 0x41, 0x41, 0x41, 0x41, 0x7F, 0x41, 0x41, 0x41, 0x41, 0x40, 0x00}, /*"在",22*/
{0x80, 0x60, 0xF8, 0x07, 0x00, 0x04, 0x74, 0x54, 0x55, 0x56, 0x54, 0x54, 0x74, 0x04, 0x00, 0x00},
{0x00, 0x00, 0xFF, 0x00, 0x03, 0x01, 0x05, 0x45, 0x85, 0x7D, 0x05, 0x05, 0x05, 0x01, 0x03, 0x00}, /*"停",23*/
{0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0xFF, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00, 0x00},
{0x40, 0x40, 0x40, 0x7F, 0x40, 0x40, 0x40, 0x7F, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00}, /*"止",24*/
{0x04, 0x04, 0x84, 0xC4, 0xA4, 0x9C, 0x85, 0x86, 0x84, 0x84, 0xA4, 0xC4, 0x84, 0x04, 0x04, 0x00},
{0x00, 0x80, 0x80, 0x40, 0x30, 0x0F, 0x00, 0x00, 0x00, 0x7F, 0x80, 0x80, 0x81, 0xF0, 0x00, 0x00}, /*"充",25*/
{0x00, 0x00, 0xF8, 0x88, 0x88, 0x88, 0x88, 0xFF, 0x88, 0x88, 0x88, 0x88, 0xF8, 0x00, 0x00, 0x00},
{0x00, 0x00, 0x1F, 0x08, 0x08, 0x08, 0x08, 0x7F, 0x88, 0x88, 0x88, 0x88, 0x9F, 0x80, 0xF0, 0x00}, /*"电",26*/
{0x10, 0x60, 0x02, 0x0C, 0xC0, 0x00, 0xE2, 0x2C, 0x20, 0x3F, 0x20, 0x28, 0xE6, 0x00, 0x00, 0x00},
{0x04, 0x04, 0x7C, 0x03, 0x00, 0x00, 0xFF, 0x09, 0x09, 0x09, 0x49, 0x89, 0x7F, 0x00, 0x00, 0x00}, /*"消",27*/
{0x00, 0x02, 0x3A, 0xAA, 0x6A, 0x3F, 0x2A, 0x2A, 0x2A, 0xFF, 0x2A, 0xAA, 0x2E, 0xE0, 0x00, 0x00},
{0x00, 0x02, 0x81, 0x9E, 0x42, 0x42, 0x22, 0x1A, 0x22, 0x22, 0x42, 0x5E, 0x81, 0x00, 0x00, 0x00}, /*"费",28*/
{0x88, 0x68, 0x1F, 0xC8, 0x08, 0x10, 0xC8, 0x54, 0x52, 0xD1, 0x12, 0x94, 0x08, 0xD0, 0x10, 0x00},
{0x09, 0x19, 0x09, 0xFF, 0x05, 0x00, 0xFF, 0x12, 0x92, 0xFF, 0x00, 0x5F, 0x80, 0x7F, 0x00, 0x00}, /*"输",29*/
{0x00, 0x00, 0x7C, 0x40, 0x40, 0x40, 0x40, 0xFF, 0x40, 0x40, 0x40, 0x40, 0xFC, 0x00, 0x00, 0x00},
{0x00, 0x7C, 0x40, 0x40, 0x40, 0x40, 0x40, 0x7F, 0x40, 0x40, 0x40, 0x40, 0x40, 0xFC, 0x00, 0x00}, /*"出",30*/
{0x80, 0x82, 0x82, 0x82, 0xFE, 0x82, 0x82, 0x82, 0x82, 0x82, 0xFE, 0x82, 0x82, 0x82, 0x80, 0x00},
{0x00, 0x80, 0x40, 0x30, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00}, /*"开",31*/
{0x00, 0x00, 0x10, 0x11, 0x16, 0x10, 0x10, 0xF0, 0x10, 0x10, 0x14, 0x13, 0x10, 0x00, 0x00, 0x00},
{0x81, 0x81, 0x41, 0x41, 0x21, 0x11, 0x0D, 0x03, 0x0D, 0x11, 0x21, 0x41, 0x41, 0x81, 0x81, 0x00}, /*"关",32*/
};
#endif

28
Core/Inc/rc522.h
View File

@ -174,4 +174,32 @@ char PCD_Halt(void);
void CardCompare(void); //自行定义函数
// 添加状态机的状态定义和接口函数声明
typedef enum
{
RC522_STATE_IDLE,
RC522_STATE_REQUEST,
RC522_STATE_ANTICOLL,
RC522_STATE_SELECT,
RC522_STATE_AUTH,
RC522_STATE_READ,
RC522_STATE_WRITE,
RC522_STATE_HALT
} RC522_State;
typedef struct
{
RC522_State state;
uint8_t cardType[2];
uint8_t cardID[5];
uint8_t blockData[16];
uint8_t blockAddr;
uint8_t keyA[6];
uint8_t keyB[6];
char status;
} RC522_Handle;
void RC522_InitStateMachine(RC522_Handle *handle);
void RC522_ProcessStateMachine(RC522_Handle *handle);
#endif

2
Core/Inc/stm32f1xx_hal_conf.h
View File

@ -42,7 +42,7 @@
/*#define HAL_CORTEX_MODULE_ENABLED */
/*#define HAL_CRC_MODULE_ENABLED */
/*#define HAL_DAC_MODULE_ENABLED */
/*#define HAL_DMA_MODULE_ENABLED */
#define HAL_DMA_MODULE_ENABLED
/*#define HAL_ETH_MODULE_ENABLED */
/*#define HAL_FLASH_MODULE_ENABLED */
#define HAL_GPIO_MODULE_ENABLED

2
Core/Inc/stm32f1xx_it.h
View File

@ -52,6 +52,8 @@ void MemManage_Handler(void);
void BusFault_Handler(void);
void UsageFault_Handler(void);
void DebugMon_Handler(void);
void DMA1_Channel2_IRQHandler(void);
void DMA1_Channel3_IRQHandler(void);
void TIM1_UP_IRQHandler(void);
void TIM3_IRQHandler(void);
void TIM4_IRQHandler(void);