removed debug folder
This commit is contained in:
		@ -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   */
 | 
			
		||||
 | 
			
		||||
@ -55,7 +55,7 @@ uint16_t blockData[128];
 | 
			
		||||
void HTPA_Init(I2C_HandleTypeDef *hi2c){
 | 
			
		||||
	i2c_handle = *hi2c;
 | 
			
		||||
	// Berechnung für clk / sample aus I2C parametern?
 | 
			
		||||
	HTPA_WriteRegister(HTPA_SENSOR_CONFIG, 0x01);	// Wakeup
 | 
			
		||||
	HTPA_WriteRegister(HTPA_SENSOR_CONFIG, 0x01);	// wakeup
 | 
			
		||||
	HTPA_WriteRegister(HTPA_SENSOR_TRIM_1, 0x0C);
 | 
			
		||||
	HTPA_WriteRegister(HTPA_SENSOR_TRIM_2, 0x0C);
 | 
			
		||||
	HTPA_WriteRegister(HTPA_SENSOR_TRIM_3, 0x0C);
 | 
			
		||||
@ -63,6 +63,7 @@ void HTPA_Init(I2C_HandleTypeDef *hi2c){
 | 
			
		||||
	HTPA_WriteRegister(HTPA_SENSOR_TRIM_5, 0x0C);
 | 
			
		||||
	HTPA_WriteRegister(HTPA_SENSOR_TRIM_6, 0x0C);
 | 
			
		||||
	HTPA_WriteRegister(HTPA_SENSOR_TRIM_7, 0x88);
 | 
			
		||||
	HTPA_WriteRegister(HTPA_SENSOR_CONFIG, 0x09);	// start sensor
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
@ -110,6 +111,7 @@ void HTPA_WriteRegister(uint8_t register_address, uint8_t byte){
 | 
			
		||||
 * @return HTPA_Status:		status register struct
 | 
			
		||||
*/
 | 
			
		||||
HTPA_Status HTPA_GetStatus(void){
 | 
			
		||||
	HAL_StatusTypeDef i2c_status;
 | 
			
		||||
	HTPA_Status status_return;
 | 
			
		||||
	uint8_t i2c_data = HTPA_SENSOR_STATUS;
 | 
			
		||||
	uint8_t i2c_address = (HTPA_SENSOR_ADDRESS << 1);
 | 
			
		||||
@ -117,7 +119,7 @@ HTPA_Status HTPA_GetStatus(void){
 | 
			
		||||
	i2c_address &= 0xFE;	// set read/write bit 0 to write (0)
 | 
			
		||||
	HAL_I2C_Master_Transmit(&i2c_handle, i2c_address, &i2c_data, 1, I2C_MAX_DELAY);
 | 
			
		||||
	i2c_address |= 0x01;	// set read/write bit 0 to read (1)
 | 
			
		||||
	HAL_I2C_Master_Receive(&i2c_handle, i2c_address, &i2c_readData, 1, I2C_MAX_DELAY);
 | 
			
		||||
	i2c_status = HAL_I2C_Master_Receive(&i2c_handle, i2c_address, &i2c_readData, 1, I2C_MAX_DELAY);
 | 
			
		||||
	status_return.block = (i2c_readData >> 4) && 0xFC;
 | 
			
		||||
	status_return.vdd_meas = (i2c_readData >> 2) && 0xFE;
 | 
			
		||||
	status_return.blind = (i2c_readData >> 1) && 0xFE;
 | 
			
		||||
 | 
			
		||||
@ -21,6 +21,7 @@
 | 
			
		||||
 | 
			
		||||
/* Private includes ----------------------------------------------------------*/
 | 
			
		||||
/* USER CODE BEGIN Includes */
 | 
			
		||||
#include <stdbool.h>
 | 
			
		||||
#include "HTPA_32x32d.h"
 | 
			
		||||
 | 
			
		||||
/* USER CODE END Includes */
 | 
			
		||||
@ -40,18 +41,16 @@
 | 
			
		||||
/* USER CODE END PM */
 | 
			
		||||
 | 
			
		||||
/* Private variables ---------------------------------------------------------*/
 | 
			
		||||
CAN_HandleTypeDef hcan;
 | 
			
		||||
 | 
			
		||||
I2C_HandleTypeDef hi2c1;
 | 
			
		||||
 | 
			
		||||
/* USER CODE BEGIN PV */
 | 
			
		||||
HTPA_Status temp_status;
 | 
			
		||||
 | 
			
		||||
/* USER CODE END PV */
 | 
			
		||||
 | 
			
		||||
/* Private function prototypes -----------------------------------------------*/
 | 
			
		||||
void SystemClock_Config(void);
 | 
			
		||||
static void MX_GPIO_Init(void);
 | 
			
		||||
static void MX_CAN_Init(void);
 | 
			
		||||
static void MX_I2C1_Init(void);
 | 
			
		||||
/* USER CODE BEGIN PFP */
 | 
			
		||||
 | 
			
		||||
@ -90,9 +89,9 @@ int main(void)
 | 
			
		||||
 | 
			
		||||
  /* Initialize all configured peripherals */
 | 
			
		||||
  MX_GPIO_Init();
 | 
			
		||||
  MX_CAN_Init();
 | 
			
		||||
  MX_I2C1_Init();
 | 
			
		||||
  /* USER CODE BEGIN 2 */
 | 
			
		||||
  HTPA_Init(&hi2c1);
 | 
			
		||||
 | 
			
		||||
  /* USER CODE END 2 */
 | 
			
		||||
 | 
			
		||||
@ -100,6 +99,8 @@ int main(void)
 | 
			
		||||
  /* USER CODE BEGIN WHILE */
 | 
			
		||||
  while (1)
 | 
			
		||||
  {
 | 
			
		||||
	  temp_status = HTPA_GetStatus();
 | 
			
		||||
	  HAL_Delay(1000);
 | 
			
		||||
    /* USER CODE END WHILE */
 | 
			
		||||
 | 
			
		||||
    /* USER CODE BEGIN 3 */
 | 
			
		||||
@ -123,7 +124,10 @@ void SystemClock_Config(void)
 | 
			
		||||
  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI;
 | 
			
		||||
  RCC_OscInitStruct.HSIState = RCC_HSI_ON;
 | 
			
		||||
  RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
 | 
			
		||||
  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
 | 
			
		||||
  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
 | 
			
		||||
  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI;
 | 
			
		||||
  RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL2;
 | 
			
		||||
  RCC_OscInitStruct.PLL.PREDIV = RCC_PREDIV_DIV1;
 | 
			
		||||
  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
 | 
			
		||||
  {
 | 
			
		||||
    Error_Handler();
 | 
			
		||||
@ -133,7 +137,7 @@ void SystemClock_Config(void)
 | 
			
		||||
  */
 | 
			
		||||
  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
 | 
			
		||||
                              |RCC_CLOCKTYPE_PCLK1;
 | 
			
		||||
  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_HSI;
 | 
			
		||||
  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
 | 
			
		||||
  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
 | 
			
		||||
  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
 | 
			
		||||
 | 
			
		||||
@ -142,50 +146,13 @@ void SystemClock_Config(void)
 | 
			
		||||
    Error_Handler();
 | 
			
		||||
  }
 | 
			
		||||
  PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_I2C1;
 | 
			
		||||
  PeriphClkInit.I2c1ClockSelection = RCC_I2C1CLKSOURCE_HSI;
 | 
			
		||||
  PeriphClkInit.I2c1ClockSelection = RCC_I2C1CLKSOURCE_SYSCLK;
 | 
			
		||||
  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
 | 
			
		||||
  {
 | 
			
		||||
    Error_Handler();
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
  * @brief CAN Initialization Function
 | 
			
		||||
  * @param None
 | 
			
		||||
  * @retval None
 | 
			
		||||
  */
 | 
			
		||||
static void MX_CAN_Init(void)
 | 
			
		||||
{
 | 
			
		||||
 | 
			
		||||
  /* USER CODE BEGIN CAN_Init 0 */
 | 
			
		||||
 | 
			
		||||
  /* USER CODE END CAN_Init 0 */
 | 
			
		||||
 | 
			
		||||
  /* USER CODE BEGIN CAN_Init 1 */
 | 
			
		||||
 | 
			
		||||
  /* USER CODE END CAN_Init 1 */
 | 
			
		||||
  hcan.Instance = CAN;
 | 
			
		||||
  hcan.Init.Prescaler = 16;
 | 
			
		||||
  hcan.Init.Mode = CAN_MODE_NORMAL;
 | 
			
		||||
  hcan.Init.SyncJumpWidth = CAN_SJW_1TQ;
 | 
			
		||||
  hcan.Init.TimeSeg1 = CAN_BS1_1TQ;
 | 
			
		||||
  hcan.Init.TimeSeg2 = CAN_BS2_1TQ;
 | 
			
		||||
  hcan.Init.TimeTriggeredMode = DISABLE;
 | 
			
		||||
  hcan.Init.AutoBusOff = DISABLE;
 | 
			
		||||
  hcan.Init.AutoWakeUp = DISABLE;
 | 
			
		||||
  hcan.Init.AutoRetransmission = DISABLE;
 | 
			
		||||
  hcan.Init.ReceiveFifoLocked = DISABLE;
 | 
			
		||||
  hcan.Init.TransmitFifoPriority = DISABLE;
 | 
			
		||||
  if (HAL_CAN_Init(&hcan) != HAL_OK)
 | 
			
		||||
  {
 | 
			
		||||
    Error_Handler();
 | 
			
		||||
  }
 | 
			
		||||
  /* USER CODE BEGIN CAN_Init 2 */
 | 
			
		||||
 | 
			
		||||
  /* USER CODE END CAN_Init 2 */
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
  * @brief I2C1 Initialization Function
 | 
			
		||||
  * @param None
 | 
			
		||||
@ -202,7 +169,7 @@ static void MX_I2C1_Init(void)
 | 
			
		||||
 | 
			
		||||
  /* USER CODE END I2C1_Init 1 */
 | 
			
		||||
  hi2c1.Instance = I2C1;
 | 
			
		||||
  hi2c1.Init.Timing = 0x2000090E;
 | 
			
		||||
  hi2c1.Init.Timing = 0x00000107;
 | 
			
		||||
  hi2c1.Init.OwnAddress1 = 0;
 | 
			
		||||
  hi2c1.Init.AddressingMode = I2C_ADDRESSINGMODE_7BIT;
 | 
			
		||||
  hi2c1.Init.DualAddressMode = I2C_DUALADDRESS_DISABLE;
 | 
			
		||||
@ -228,6 +195,10 @@ static void MX_I2C1_Init(void)
 | 
			
		||||
  {
 | 
			
		||||
    Error_Handler();
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  /** I2C Fast mode Plus enable
 | 
			
		||||
  */
 | 
			
		||||
  __HAL_SYSCFG_FASTMODEPLUS_ENABLE(I2C_FASTMODEPLUS_I2C1);
 | 
			
		||||
  /* USER CODE BEGIN I2C1_Init 2 */
 | 
			
		||||
 | 
			
		||||
  /* USER CODE END I2C1_Init 2 */
 | 
			
		||||
@ -241,12 +212,15 @@ static void MX_I2C1_Init(void)
 | 
			
		||||
  */
 | 
			
		||||
static void MX_GPIO_Init(void)
 | 
			
		||||
{
 | 
			
		||||
/* USER CODE BEGIN MX_GPIO_Init_1 */
 | 
			
		||||
/* USER CODE END MX_GPIO_Init_1 */
 | 
			
		||||
 | 
			
		||||
  /* GPIO Ports Clock Enable */
 | 
			
		||||
  __HAL_RCC_GPIOF_CLK_ENABLE();
 | 
			
		||||
  __HAL_RCC_GPIOA_CLK_ENABLE();
 | 
			
		||||
  __HAL_RCC_GPIOB_CLK_ENABLE();
 | 
			
		||||
 | 
			
		||||
/* USER CODE BEGIN MX_GPIO_Init_2 */
 | 
			
		||||
/* USER CODE END MX_GPIO_Init_2 */
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/* USER CODE BEGIN 4 */
 | 
			
		||||
 | 
			
		||||
@ -20,6 +20,7 @@
 | 
			
		||||
 | 
			
		||||
/* Includes ------------------------------------------------------------------*/
 | 
			
		||||
#include "main.h"
 | 
			
		||||
 | 
			
		||||
/* USER CODE BEGIN Includes */
 | 
			
		||||
 | 
			
		||||
/* USER CODE END Includes */
 | 
			
		||||
@ -76,71 +77,6 @@ void HAL_MspInit(void)
 | 
			
		||||
  /* USER CODE END MspInit 1 */
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
* @brief CAN MSP Initialization
 | 
			
		||||
* This function configures the hardware resources used in this example
 | 
			
		||||
* @param hcan: CAN handle pointer
 | 
			
		||||
* @retval None
 | 
			
		||||
*/
 | 
			
		||||
void HAL_CAN_MspInit(CAN_HandleTypeDef* hcan)
 | 
			
		||||
{
 | 
			
		||||
  GPIO_InitTypeDef GPIO_InitStruct = {0};
 | 
			
		||||
  if(hcan->Instance==CAN)
 | 
			
		||||
  {
 | 
			
		||||
  /* USER CODE BEGIN CAN_MspInit 0 */
 | 
			
		||||
 | 
			
		||||
  /* USER CODE END CAN_MspInit 0 */
 | 
			
		||||
    /* Peripheral clock enable */
 | 
			
		||||
    __HAL_RCC_CAN1_CLK_ENABLE();
 | 
			
		||||
 | 
			
		||||
    __HAL_RCC_GPIOA_CLK_ENABLE();
 | 
			
		||||
    /**CAN GPIO Configuration
 | 
			
		||||
    PA11     ------> CAN_RX
 | 
			
		||||
    PA12     ------> CAN_TX
 | 
			
		||||
    */
 | 
			
		||||
    GPIO_InitStruct.Pin = GPIO_PIN_11|GPIO_PIN_12;
 | 
			
		||||
    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
 | 
			
		||||
    GPIO_InitStruct.Pull = GPIO_NOPULL;
 | 
			
		||||
    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
 | 
			
		||||
    GPIO_InitStruct.Alternate = GPIO_AF4_CAN;
 | 
			
		||||
    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 | 
			
		||||
 | 
			
		||||
  /* USER CODE BEGIN CAN_MspInit 1 */
 | 
			
		||||
 | 
			
		||||
  /* USER CODE END CAN_MspInit 1 */
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
* @brief CAN MSP De-Initialization
 | 
			
		||||
* This function freeze the hardware resources used in this example
 | 
			
		||||
* @param hcan: CAN handle pointer
 | 
			
		||||
* @retval None
 | 
			
		||||
*/
 | 
			
		||||
void HAL_CAN_MspDeInit(CAN_HandleTypeDef* hcan)
 | 
			
		||||
{
 | 
			
		||||
  if(hcan->Instance==CAN)
 | 
			
		||||
  {
 | 
			
		||||
  /* USER CODE BEGIN CAN_MspDeInit 0 */
 | 
			
		||||
 | 
			
		||||
  /* USER CODE END CAN_MspDeInit 0 */
 | 
			
		||||
    /* Peripheral clock disable */
 | 
			
		||||
    __HAL_RCC_CAN1_CLK_DISABLE();
 | 
			
		||||
 | 
			
		||||
    /**CAN GPIO Configuration
 | 
			
		||||
    PA11     ------> CAN_RX
 | 
			
		||||
    PA12     ------> CAN_TX
 | 
			
		||||
    */
 | 
			
		||||
    HAL_GPIO_DeInit(GPIOA, GPIO_PIN_11|GPIO_PIN_12);
 | 
			
		||||
 | 
			
		||||
  /* USER CODE BEGIN CAN_MspDeInit 1 */
 | 
			
		||||
 | 
			
		||||
  /* USER CODE END CAN_MspDeInit 1 */
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
* @brief I2C MSP Initialization
 | 
			
		||||
* This function configures the hardware resources used in this example
 | 
			
		||||
@ -156,17 +92,17 @@ void HAL_I2C_MspInit(I2C_HandleTypeDef* hi2c)
 | 
			
		||||
 | 
			
		||||
  /* USER CODE END I2C1_MspInit 0 */
 | 
			
		||||
 | 
			
		||||
    __HAL_RCC_GPIOB_CLK_ENABLE();
 | 
			
		||||
    __HAL_RCC_GPIOF_CLK_ENABLE();
 | 
			
		||||
    /**I2C1 GPIO Configuration
 | 
			
		||||
    PB7     ------> I2C1_SDA
 | 
			
		||||
    PB8     ------> I2C1_SCL
 | 
			
		||||
    PF0-OSC_IN     ------> I2C1_SDA
 | 
			
		||||
    PF1-OSC_OUT     ------> I2C1_SCL
 | 
			
		||||
    */
 | 
			
		||||
    GPIO_InitStruct.Pin = GPIO_PIN_7|GPIO_PIN_8;
 | 
			
		||||
    GPIO_InitStruct.Pin = GPIO_PIN_0|GPIO_PIN_1;
 | 
			
		||||
    GPIO_InitStruct.Mode = GPIO_MODE_AF_OD;
 | 
			
		||||
    GPIO_InitStruct.Pull = GPIO_NOPULL;
 | 
			
		||||
    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
 | 
			
		||||
    GPIO_InitStruct.Alternate = GPIO_AF1_I2C1;
 | 
			
		||||
    HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 | 
			
		||||
    HAL_GPIO_Init(GPIOF, &GPIO_InitStruct);
 | 
			
		||||
 | 
			
		||||
    /* Peripheral clock enable */
 | 
			
		||||
    __HAL_RCC_I2C1_CLK_ENABLE();
 | 
			
		||||
@ -194,12 +130,12 @@ void HAL_I2C_MspDeInit(I2C_HandleTypeDef* hi2c)
 | 
			
		||||
    __HAL_RCC_I2C1_CLK_DISABLE();
 | 
			
		||||
 | 
			
		||||
    /**I2C1 GPIO Configuration
 | 
			
		||||
    PB7     ------> I2C1_SDA
 | 
			
		||||
    PB8     ------> I2C1_SCL
 | 
			
		||||
    PF0-OSC_IN     ------> I2C1_SDA
 | 
			
		||||
    PF1-OSC_OUT     ------> I2C1_SCL
 | 
			
		||||
    */
 | 
			
		||||
    HAL_GPIO_DeInit(GPIOB, GPIO_PIN_7);
 | 
			
		||||
    HAL_GPIO_DeInit(GPIOF, GPIO_PIN_0);
 | 
			
		||||
 | 
			
		||||
    HAL_GPIO_DeInit(GPIOB, GPIO_PIN_8);
 | 
			
		||||
    HAL_GPIO_DeInit(GPIOF, GPIO_PIN_1);
 | 
			
		||||
 | 
			
		||||
  /* USER CODE BEGIN I2C1_MspDeInit 1 */
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user