diff --git a/package/STM32F1/STM32F1_ADC.c b/package/STM32F1/STM32F1_ADC.c index 0fa81c775..e7d69ea91 100644 --- a/package/STM32F1/STM32F1_ADC.c +++ b/package/STM32F1/STM32F1_ADC.c @@ -144,4 +144,4 @@ exit: void STM32F1_ADC_platformRead(PikaObj* self) { char *pin = obj_getStr(self, "pin"); obj_setFloat(self, "val", 3.3f * Get_Adc(&pika_hadc1, getChannel(pin)) / 4096.0f); -} \ No newline at end of file +} diff --git a/package/STM32F1/STM32F1_GPIO.c b/package/STM32F1/STM32F1_GPIO.c index 48833fc6e..3ff63c969 100644 --- a/package/STM32F1/STM32F1_GPIO.c +++ b/package/STM32F1/STM32F1_GPIO.c @@ -168,4 +168,4 @@ int STM32F1_lowLevel_readPin(PikaObj *self, char * pin){ obj_setSysOut(self, "[error] not match gpio pin."); } return HAL_GPIO_ReadPin(gpioPort,gpioPin); -} \ No newline at end of file +} diff --git a/package/STM32F1/STM32F1_IIC.c b/package/STM32F1/STM32F1_IIC.c index 5cf02e349..a845c773c 100644 --- a/package/STM32F1/STM32F1_IIC.c +++ b/package/STM32F1/STM32F1_IIC.c @@ -57,7 +57,7 @@ uint8_t READ_SDA(pika_IIC_info* iic) { } void WRITE_SDA(pika_IIC_info* iic, uint8_t data) { - HAL_GPIO_WritePin(iic->SDA_GPIO, iic->SDA_GPIO_Pin, data); + HAL_GPIO_WritePin(iic->SDA_GPIO, iic->SDA_GPIO_Pin, (GPIO_PinState) data); } void IIC_Start(pika_IIC_info* iic) { @@ -253,4 +253,4 @@ void STM32F1_IIC_platformWrite(PikaObj* self) { pika_IIC_info* iic = obj_getPtr(self, "iic"); MPU_Write_Len(iic, iic->deviceAddr, addr, strGetSize(data), (uint8_t*)data); -} \ No newline at end of file +} diff --git a/package/STM32F1/STM32F1_PWM.c b/package/STM32F1/STM32F1_PWM.c index 8d4bddf7f..81911e39c 100644 --- a/package/STM32F1/STM32F1_PWM.c +++ b/package/STM32F1/STM32F1_PWM.c @@ -320,4 +320,4 @@ void STM32F1_PWM_platformSetFrequency(PikaObj* self) { __HAL_TIM_SET_COMPARE(pika_tim, getTimChennel(pin), (uint32_t)(pika_tim->Init.Period * duty)); } -} \ No newline at end of file +} diff --git a/package/STM32F1/STM32F1_Time.c b/package/STM32F1/STM32F1_Time.c index 62baea8c6..41250afec 100644 --- a/package/STM32F1/STM32F1_Time.c +++ b/package/STM32F1/STM32F1_Time.c @@ -10,4 +10,4 @@ void STM32F1_Time_sleep_s(PikaObj* self, int s) { for (int i = 0; i < s; i++) { HAL_Delay(1000); } -} \ No newline at end of file +} diff --git a/package/STM32F1/STM32F1_UART.c b/package/STM32F1/STM32F1_UART.c index 7cf78c630..211571931 100644 --- a/package/STM32F1/STM32F1_UART.c +++ b/package/STM32F1/STM32F1_UART.c @@ -50,14 +50,6 @@ static void setUartObj(uint8_t id, PikaObj* obj) { pika_uart->obj = obj; } -static PikaObj* getUartObj(uint8_t id) { - pika_uart_t* pika_uart = getPikaUart(id); - if (NULL == pika_uart) { - return NULL; - } - return pika_uart->obj; -} - static USART_TypeDef* getUartInstance(uint8_t id) { #ifdef UART1_EXIST if (1 == id) { @@ -310,7 +302,6 @@ void STM32F1_UART_platformRead(PikaObj* self) { UART_Start_Receive_IT( &pika_uart->huart, (uint8_t*)(pika_uart->rxBuff + pika_uart->rxBuffOffset), 1); -exit: args_deinit(buffs); obj_setStr(self,"readData", readBuff); } diff --git a/package/STM32F1/STM32F1_common.c b/package/STM32F1/STM32F1_common.c index d6fc77378..613a1acc1 100644 --- a/package/STM32F1/STM32F1_common.c +++ b/package/STM32F1/STM32F1_common.c @@ -165,4 +165,4 @@ uint8_t enableClk(char* pin) { return 0; } return 1; -} \ No newline at end of file +} diff --git a/package/STM32F1/STM32F1_common.h b/package/STM32F1/STM32F1_common.h index 3332806de..7e129766d 100644 --- a/package/STM32F1/STM32F1_common.h +++ b/package/STM32F1/STM32F1_common.h @@ -86,7 +86,7 @@ void delay_us(uint32_t delay); void delay_unit(uint32_t delay); void STM32_UART_clearRxBuff(pika_uart_t* pika_uart); uint8_t STM32_Code_reciveHandler(char *data, uint32_t rxSize); -void STM32_Code_Init(); -void STM32_Code_flashHandler(); -void HARDWARE_PRINTF_Init(); -#endif \ No newline at end of file +void STM32_Code_Init(void); +void STM32_Code_flashHandler(void); +void HARDWARE_PRINTF_Init(void); +#endif