FaSTTUBe/TTS
51
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed merge conflict

Browse Source
This commit is contained in:
Tim-Erik Düntzsch
2024-03-04 04:18:16 +01:00
parent ad0988d6ef 82d4d1b36c
commit 7f9e1bac35
94 changed files with 165 additions and 13538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Core/Inc/HTPA_32x32d.h
View File

@ -14,6 +14,8 @@
* @version 0.1
*/
#include <stdbool.h>
#ifndef INC_HTPA_32X32D_H_
#define INC_HTPA_32X32D_H_
@ -26,7 +28,6 @@ typedef struct {
} HTPA_Status;
void HTPA_Init(I2C_HandleTypeDef *);
void HTPA_ReadBlock(uint8_t, uint8_t, uint16_t *[128]);
void HTPA_WriteRegister(uint8_t, uint8_t);
HTPA_Status HTPA_GetStatus(void);

2
Core/Inc/stm32f0xx_hal_conf.h
View File

@ -35,7 +35,7 @@
#define HAL_MODULE_ENABLED
/*#define HAL_ADC_MODULE_ENABLED */
/*#define HAL_CRYP_MODULE_ENABLED */
#define HAL_CAN_MODULE_ENABLED
/*#define HAL_CAN_MODULE_ENABLED */
/*#define HAL_CEC_MODULE_ENABLED */
/*#define HAL_COMP_MODULE_ENABLED */
/*#define HAL_CRC_MODULE_ENABLED */