Ilgrim/FwLib_STC8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style: replace tab with space; fix:C141 error in keil c51

Browse Source
This commit is contained in:
IOsetting 2022-01-01 14:10:15 +08:00
parent 0f08cb1f41
commit a6243a731b
8 changed files with 68 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/fw_cid_stc8h.h
View File

@ -18,19 +18,19 @@
#include "fw_reg_base.h"
#if (__CONF_MCU_MODEL == MCU_MODEL_STC8H1K08 )
#define __CID_ADDR 0x1FE9
#define __CID_ADDR 0x1FE7
#elif (__CONF_MCU_MODEL == MCU_MODEL_STC8H1K12 )
#define __CID_ADDR 0x2FE9
#define __CID_ADDR 0x2FE7
#elif (__CONF_MCU_MODEL == MCU_MODEL_STC8H1K16 )
#define __CID_ADDR 0x3FE9
#define __CID_ADDR 0x3FE7
#elif (__CONF_MCU_MODEL == MCU_MODEL_STC8H1K17 )
#define __CID_ADDR 0x43E9
#define __CID_ADDR 0x43E7
#elif (__CONF_MCU_MODEL == MCU_MODEL_STC8H1K24 )
#define __CID_ADDR 0x5FE9
#define __CID_ADDR 0x5FE7
#elif (__CONF_MCU_MODEL == MCU_MODEL_STC8H1K28 )
#define __CID_ADDR 0x6FE9
#define __CID_ADDR 0x6FE7
#elif (__CONF_MCU_MODEL == MCU_MODEL_STC8H1K33 )
#define __CID_ADDR 0x83E9
#define __CID_ADDR 0x83E7
#elif (__CONF_MCU_MODEL == MCU_MODEL_STC8H3K32S4 ) || \
(__CONF_MCU_MODEL == MCU_MODEL_STC8H3K32S2 ) || \
(__CONF_MCU_MODEL == MCU_MODEL_STC8H2K32T ) || \
@ -44,21 +44,22 @@
(__CONF_MCU_MODEL == MCU_MODEL_STC8H4K48TLR ) || \
(__CONF_MCU_MODEL == MCU_MODEL_STC8H4K48TLCD ) || \
(__CONF_MCU_MODEL == MCU_MODEL_STC8H4K48LCD )
#define __CID_ADDR 0xBFE9
#define __CID_ADDR 0xBFE7
#elif (__CONF_MCU_MODEL == MCU_MODEL_STC8H3K60S4 ) || \
(__CONF_MCU_MODEL == MCU_MODEL_STC8H3K60S2 ) || \
(__CONF_MCU_MODEL == MCU_MODEL_STC8H2K60T ) || \
(__CONF_MCU_MODEL == MCU_MODEL_STC8H4K60TLR ) || \
(__CONF_MCU_MODEL == MCU_MODEL_STC8H4K60TLCD ) || \
(__CONF_MCU_MODEL == MCU_MODEL_STC8H4K60LCD )
#define __CID_ADDR 0xEFE9
#define __CID_ADDR 0xEFE7
#elif (__CONF_MCU_MODEL == MCU_MODEL_STC8H3K64S4 ) || \
(__CONF_MCU_MODEL == MCU_MODEL_STC8H3K64S2 ) || \
(__CONF_MCU_MODEL == MCU_MODEL_STC8H2K64T ) || \
(__CONF_MCU_MODEL == MCU_MODEL_STC8H4K64TLR ) || \
(__CONF_MCU_MODEL == MCU_MODEL_STC8H4K64TLCD ) || \
(__CONF_MCU_MODEL == MCU_MODEL_STC8H4K64LCD )
#define __CID_ADDR 0xFDE9
(__CONF_MCU_MODEL == MCU_MODEL_STC8H4K64LCD ) || \
(__CONF_MCU_MODEL == MCU_MODEL_STC8H8K64U )
#define __CID_ADDR 0xFDE7
#endif
#define ID_ROMADDR ( (unsigned char __CODE *)(__CID_ADDR + 15)) // MCU ID 7 bytes

17
include/fw_conf.h
View File

@ -63,6 +63,8 @@
#define MCU_MODEL_STC8H4K64TLCD 0x2D
#define MCU_MODEL_STC8H4K64LCD 0x2E
#define MCU_MODEL_STC8H8K64U 0x2F
#ifndef __CONF_FOSC
#define __CONF_FOSC 24000000UL
@ -93,7 +95,7 @@
#endif
#if (__CONF_MCU_MODEL == MCU_MODEL_STC8A8K64D4)
#define __CONF_MCU_TYPE_STC8A8K64D4 1
#define __CONF_MCU_TYPE 1
#elif (__CONF_MCU_MODEL == MCU_MODEL_STC8G1K04 ) || \
(__CONF_MCU_MODEL == MCU_MODEL_STC8G1K08 ) || \
(__CONF_MCU_MODEL == MCU_MODEL_STC8G1K12 ) || \
@ -103,7 +105,7 @@
(__CONF_MCU_MODEL == MCU_MODEL_STC8G2K48 ) || \
(__CONF_MCU_MODEL == MCU_MODEL_STC8G2K60 ) || \
(__CONF_MCU_MODEL == MCU_MODEL_STC8G2K64 )
#define __CONF_MCU_TYPE_STC8G 1
#define __CONF_MCU_TYPE 2
#elif (__CONF_MCU_MODEL == MCU_MODEL_STC8H1K08 ) || \
(__CONF_MCU_MODEL == MCU_MODEL_STC8H1K12 ) || \
@ -135,16 +137,17 @@
(__CONF_MCU_MODEL == MCU_MODEL_STC8H2K64T ) || \
(__CONF_MCU_MODEL == MCU_MODEL_STC8H4K64TLR ) || \
(__CONF_MCU_MODEL == MCU_MODEL_STC8H4K64TLCD ) || \
(__CONF_MCU_MODEL == MCU_MODEL_STC8H4K64LCD )
#define __CONF_MCU_TYPE_STC8H 1
(__CONF_MCU_MODEL == MCU_MODEL_STC8H4K64LCD ) || \
(__CONF_MCU_MODEL == MCU_MODEL_STC8H8K64U )
#define __CONF_MCU_TYPE 3
#endif
#if __CONF_MCU_TYPE_STC8A8K64D4
#if (__CONF_MCU_TYPE == 1 )
#include "fw_reg_stc8a.h"
#elif __CONF_MCU_TYPE_STC8G
#elif (__CONF_MCU_TYPE == 2 )
#include "fw_reg_stc8g.h"
#include "fw_cid_stc8g.h"
#elif __CONF_MCU_TYPE_STC8H
#elif (__CONF_MCU_TYPE == 3 )
#include "fw_reg_stc8h.h"
#include "fw_cid_stc8h.h"
#endif

4
include/fw_exti.h
View File

@ -56,7 +56,7 @@ typedef enum
#define EXTI_VectI2C 24
#define EXTI_VectTKSU 35
#if __CONF_MCU_TYPE_STC8G
#if (__CONF_MCU_TYPE == 2 )
#define EXTI_VectPWM0 22
#define EXTI_VectPWM0FD 23
#define EXTI_VectPWM1 28
@ -67,7 +67,7 @@ typedef enum
#define EXTI_VectPWM2FD 33
#define EXTI_VectPWM4FD 34
#elif __CONF_MCU_TYPE_STC8H
#elif (__CONF_MCU_TYPE == 3 )
#define EXTI_VectUSB 25
#define EXTI_VectPWMA 26
#define EXTI_VectPWMB 27

4
include/fw_gpio.h
View File

@ -34,7 +34,7 @@ typedef enum
GPIO_Port_3 = 3U,
GPIO_Port_4 = 4U,
GPIO_Port_5 = 5U,
#if __CONF_MCU_TYPE_STC8H
#if (__CONF_MCU_TYPE == 3 )
GPIO_Port_6 = 6U,
GPIO_Port_7 = 7U,
#endif
@ -101,7 +101,7 @@ typedef enum
P5M1 = P5M1 & ~(__PINS__) | (((__MODE__) & 0x02)? (__PINS__) : 0x00); \
} while(0)
#if __CONF_MCU_TYPE_STC8H
#if (__CONF_MCU_TYPE == 3 )
#define GPIO_P6_SetMode(__PINS__, __MODE__) do { \
P6M0 = P6M0 & ~(__PINS__) | (((__MODE__) & 0x01)? (__PINS__) : 0x00); \
P6M1 = P6M1 & ~(__PINS__) | (((__MODE__) & 0x02)? (__PINS__) : 0x00); \

12
src/fw_uart.c
View File

@ -160,8 +160,9 @@ void UART2_TxString(uint8_t *str)
void UART3_ConfigOnTimer2(HAL_State_t _1TMode, uint32_t baudrate)
{
uint16_t init;
UART3_SetBaudSource(0x00);
uint16_t init = _UART1_Timer_InitValueCalculate(_1TMode, baudrate);
init = _UART1_Timer_InitValueCalculate(_1TMode, baudrate);
// Timer2: 1T mode and initial value. prescaler is ignored, no interrupt.
TIM_Timer2_Set1TMode(_1TMode);
TIM_Timer2_SetInitValue(init >> 8, init & 0xFF);
@ -170,8 +171,9 @@ void UART3_ConfigOnTimer2(HAL_State_t _1TMode, uint32_t baudrate)
void UART3_ConfigOnTimer3(HAL_State_t _1TMode, uint32_t baudrate)
{
uint16_t init;
UART3_SetBaudSource(0x01);
uint16_t init = _UART1_Timer_InitValueCalculate(_1TMode, baudrate);
init = _UART1_Timer_InitValueCalculate(_1TMode, baudrate);
// Timer3: 1T mode and initial value. prescaler is ignored, no interrupt.
TIM_Timer3_Set1TMode(_1TMode);
TIM_Timer3_SetInitValue(init >> 8, init & 0xFF);
@ -185,8 +187,9 @@ void UART3_ConfigOnTimer3(HAL_State_t _1TMode, uint32_t baudrate)
void UART4_ConfigOnTimer2(HAL_State_t _1TMode, uint32_t baudrate)
{
uint16_t init;
UART4_SetBaudSource(0x00);
uint16_t init = _UART1_Timer_InitValueCalculate(_1TMode, baudrate);
init = _UART1_Timer_InitValueCalculate(_1TMode, baudrate);
TIM_Timer2_Set1TMode(_1TMode);
TIM_Timer2_SetInitValue(init >> 8, init & 0xFF);
TIM_Timer2_SetRunState(HAL_State_ON);
@ -194,8 +197,9 @@ void UART4_ConfigOnTimer2(HAL_State_t _1TMode, uint32_t baudrate)
void UART4_ConfigOnTimer4(HAL_State_t _1TMode, uint32_t baudrate)
{
uint16_t init;
UART4_SetBaudSource(0x01);
uint16_t init = _UART1_Timer_InitValueCalculate(_1TMode, baudrate);
init = _UART1_Timer_InitValueCalculate(_1TMode, baudrate);
TIM_Timer4_Set1TMode(_1TMode);
TIM_Timer4_SetInitValue(init >> 8, init & 0xFF);
TIM_Timer4_SetRunState(HAL_State_ON);