z80/bootloader
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added i2c receive mode

Browse Source
This commit is contained in:
Dreaded_X
2021-06-02 22:58:08 +02:00
parent c53656d906
commit 994a7fd526
8 changed files with 248 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Core/Inc/stm32f1xx_hal_conf.h
View File

@@ -45,7 +45,7 @@
/*#define HAL_ETH_MODULE_ENABLED */
/*#define HAL_FLASH_MODULE_ENABLED */
#define HAL_GPIO_MODULE_ENABLED
/*#define HAL_I2C_MODULE_ENABLED */
#define HAL_I2C_MODULE_ENABLED
/*#define HAL_I2S_MODULE_ENABLED */
/*#define HAL_IRDA_MODULE_ENABLED */
/*#define HAL_IWDG_MODULE_ENABLED */

1
Core/Inc/stm32f1xx_it.h
View File

@@ -56,6 +56,7 @@ void SVC_Handler(void);
void DebugMon_Handler(void);
void PendSV_Handler(void);
void SysTick_Handler(void);
void I2C1_EV_IRQHandler(void);
void USART1_IRQHandler(void);
/* USER CODE BEGIN EFP */

144
Core/Src/main.c
View File

@@ -19,10 +19,6 @@
/* USER CODE END Header */
/* Includes ------------------------------------------------------------------*/
#include "main.h"
#include "stm32f103xb.h"
#include "stm32f1xx_hal_dma.h"
#include "stm32f1xx_hal_flash.h"
#include "stm32f1xx_hal_flash_ex.h"
/* Private includes ----------------------------------------------------------*/
/* USER CODE BEGIN Includes */
@@ -51,7 +47,7 @@ typedef enum {
#define STDERR_FILENO 2
#define BOOTLOADER_RCC_CSR_ENTRY_MASK (RCC_CSR_WWDGRSTF | RCC_CSR_IWDGRSTF | RCC_CSR_SFTRSTF | RCC_CSR_PINRSTF)
#define BOOTLOADER_SIZE (16 * 1024)
#define BOOTLOADER_SIZE (20 * 1024)
#define USER_PROGRAM (FLASH_BASE + BOOTLOADER_SIZE)
/* USER CODE END PD */
@@ -61,16 +57,19 @@ typedef enum {
/* USER CODE END PM */
/* Private variables ---------------------------------------------------------*/
I2C_HandleTypeDef hi2c1;
UART_HandleTypeDef huart1;
/* USER CODE BEGIN PV */
uint8_t version_string[16] = "BOOTLOADER V0.1";
/* USER CODE END PV */
/* Private function prototypes -----------------------------------------------*/
void SystemClock_Config(void);
static void MX_GPIO_Init(void);
static void MX_USART1_UART_Init(void);
static void MX_I2C1_Init(void);
/* USER CODE BEGIN PFP */
/* USER CODE END PFP */
@@ -111,6 +110,7 @@ uint8_t should_start_user_program = 0;
void start_user_program() {
// Deinit
HAL_UART_DeInit(&huart1);
HAL_I2C_DeInit(&hi2c1);
HAL_GPIO_DeInit(GPIOC, GPIO_PIN_13);
HAL_DeInit();
@@ -158,14 +158,14 @@ void receive() {
uint32_t error = 0;
FLASH_EraseInitTypeDef erase = {
.TypeErase = FLASH_TYPEERASE_PAGES,
.PageAddress = (uint32_t)0x8004000,
.PageAddress = (uint32_t)0x8005000,
.NbPages = ceil(length/1024.0f),
};
HAL_FLASHEx_Erase(&erase, &error);
// Write to flash
for (int i = 0; i < length/2; ++i) {
if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD, 0x8004000 + i*2, ((uint16_t*)data)[i])) {
if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD, 0x8005000 + i*2, ((uint16_t*)data)[i])) {
return;
}
uint8_t progress[] = {(i*2) & 0xFF, (i*2) >> 8};
@@ -217,6 +217,97 @@ void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart) {
}
}
uint8_t i2c_data;
void HAL_I2C_SlaveRxCpltCallback(I2C_HandleTypeDef *hi2c) {
if (hi2c->Instance == I2C1) {
switch (i2c_data) {
case 0xAF: {
printf("a\n\r");
uint8_t length_buffer[2];
HAL_I2C_Slave_Receive(&hi2c1, length_buffer, sizeof(length_buffer), HAL_MAX_DELAY);
HAL_I2C_Slave_Transmit(&hi2c1, length_buffer, sizeof(length_buffer), HAL_MAX_DELAY);
uint16_t length = length_buffer[0] + (length_buffer[1] << 8);
uint8_t status = 0;
HAL_I2C_Slave_Receive(&hi2c1, &status, 1, HAL_MAX_DELAY);
if (status != 0x01) {
printf("Error occurred!\n\r");
break;
}
printf("Length: %i\n\r", length);
uint8_t* data = malloc(length);
HAL_I2C_Slave_Transmit(&hi2c1, ack, sizeof(ack), HAL_MAX_DELAY);
HAL_I2C_Slave_Receive(&hi2c1, data, length, HAL_MAX_DELAY);
printf("Done receiving\n\r");
uint32_t crc = crc32(data, length);
uint8_t c[] = {crc, crc >> 8, crc >> 16, crc >> 24};
printf("%x %x %x %x\n\r", c[0], c[1], c[2], c[3]);
HAL_I2C_Slave_Transmit(&hi2c1, c, sizeof(c), HAL_MAX_DELAY);
status = 0;
HAL_I2C_Slave_Receive(&hi2c1, &status, 1, HAL_MAX_DELAY);
if (status != 0x01) {
printf("Error occurred!\n\r");
break;
}
printf("Validated!\n\r");
// Unlock flash
HAL_FLASH_Unlock();
printf("Programming...\n\r");
// Erase flash
uint32_t error = 0;
FLASH_EraseInitTypeDef erase = {
.TypeErase = FLASH_TYPEERASE_PAGES,
.PageAddress = (uint32_t)0x8005000,
.NbPages = ceil(length/1024.0f),
};
HAL_FLASHEx_Erase(&erase, &error);
// Write to flash
for (int i = 0; i < length/2; ++i) {
if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD, 0x8005000 + i*2, ((uint16_t*)data)[i])) {
break;
}
}
// Done
HAL_FLASH_Lock();
HAL_I2C_Slave_Transmit(&hi2c1, ack, sizeof(ack), HAL_MAX_DELAY);
should_start_user_program = 1;
printf("Done!\n\r");
break;
}
default:
break;
}
printf("b\n\r");
while (HAL_I2C_GetState(hi2c) != HAL_I2C_STATE_READY);
printf("c\n\r");
HAL_I2C_Slave_Receive_IT(&hi2c1, &i2c_data, 1);
printf("d\n\r");
}
}
void HAL_I2C_ErrorCallback(I2C_HandleTypeDef* hi2c) {
if (hi2c->Instance == I2C1) {
uint8_t err = HAL_I2C_GetError(hi2c);
printf("ERROR: %i\n\r", err);
}
}
int _isatty(int fd) {
if (fd >= STDIN_FILENO && fd <= STDERR_FILENO) {
return 1;
@@ -343,6 +434,7 @@ int main(void)
/* Initialize all configured peripherals */
MX_GPIO_Init();
MX_USART1_UART_Init();
MX_I2C1_Init();
/* USER CODE BEGIN 2 */
setvbuf(stdout, NULL, _IONBF, 0);
@@ -361,6 +453,7 @@ int main(void)
printf("\tAwaiting command\n\r");
HAL_UART_Receive_IT(&huart1, &byte, 1);
HAL_I2C_Slave_Receive_IT(&hi2c1, &i2c_data, 1);
// Run the bootloader
// @todo Start interrupt for HAL_UART
@@ -425,6 +518,40 @@ void SystemClock_Config(void)
}
}
/**
* @brief I2C1 Initialization Function
* @param None
* @retval None
*/
static void MX_I2C1_Init(void)
{
/* USER CODE BEGIN I2C1_Init 0 */
/* USER CODE END I2C1_Init 0 */
/* USER CODE BEGIN I2C1_Init 1 */
/* USER CODE END I2C1_Init 1 */
hi2c1.Instance = I2C1;
hi2c1.Init.ClockSpeed = 100000;
hi2c1.Init.DutyCycle = I2C_DUTYCYCLE_2;
hi2c1.Init.OwnAddress1 = 82;
hi2c1.Init.AddressingMode = I2C_ADDRESSINGMODE_7BIT;
hi2c1.Init.DualAddressMode = I2C_DUALADDRESS_DISABLE;
hi2c1.Init.OwnAddress2 = 0;
hi2c1.Init.GeneralCallMode = I2C_GENERALCALL_DISABLE;
hi2c1.Init.NoStretchMode = I2C_NOSTRETCH_DISABLE;
if (HAL_I2C_Init(&hi2c1) != HAL_OK)
{
Error_Handler();
}
/* USER CODE BEGIN I2C1_Init 2 */
/* USER CODE END I2C1_Init 2 */
}
/**
* @brief USART1 Initialization Function
* @param None
@@ -471,6 +598,7 @@ static void MX_GPIO_Init(void)
__HAL_RCC_GPIOC_CLK_ENABLE();
__HAL_RCC_GPIOD_CLK_ENABLE();
__HAL_RCC_GPIOA_CLK_ENABLE();
__HAL_RCC_GPIOB_CLK_ENABLE();
/*Configure GPIO pin Output Level */
HAL_GPIO_WritePin(GPIOC, GPIO_PIN_13, GPIO_PIN_RESET);

70
Core/Src/stm32f1xx_hal_msp.c
View File

@@ -81,6 +81,76 @@ void HAL_MspInit(void)
/* USER CODE END MspInit 1 */
}
/**
* @brief I2C MSP Initialization
* This function configures the hardware resources used in this example
* @param hi2c: I2C handle pointer
* @retval None
*/
void HAL_I2C_MspInit(I2C_HandleTypeDef* hi2c)
{
GPIO_InitTypeDef GPIO_InitStruct = {0};
if(hi2c->Instance==I2C1)
{
/* USER CODE BEGIN I2C1_MspInit 0 */
/* USER CODE END I2C1_MspInit 0 */
__HAL_RCC_GPIOB_CLK_ENABLE();
/**I2C1 GPIO Configuration
PB6 ------> I2C1_SCL
PB7 ------> I2C1_SDA
*/
GPIO_InitStruct.Pin = GPIO_PIN_6|GPIO_PIN_7;
GPIO_InitStruct.Mode = GPIO_MODE_AF_OD;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
/* Peripheral clock enable */
__HAL_RCC_I2C1_CLK_ENABLE();
/* I2C1 interrupt Init */
HAL_NVIC_SetPriority(I2C1_EV_IRQn, 0, 0);
HAL_NVIC_EnableIRQ(I2C1_EV_IRQn);
/* USER CODE BEGIN I2C1_MspInit 1 */
/* USER CODE END I2C1_MspInit 1 */
}
}
/**
* @brief I2C MSP De-Initialization
* This function freeze the hardware resources used in this example
* @param hi2c: I2C handle pointer
* @retval None
*/
void HAL_I2C_MspDeInit(I2C_HandleTypeDef* hi2c)
{
if(hi2c->Instance==I2C1)
{
/* USER CODE BEGIN I2C1_MspDeInit 0 */
/* USER CODE END I2C1_MspDeInit 0 */
/* Peripheral clock disable */
__HAL_RCC_I2C1_CLK_DISABLE();
/**I2C1 GPIO Configuration
PB6 ------> I2C1_SCL
PB7 ------> I2C1_SDA
*/
HAL_GPIO_DeInit(GPIOB, GPIO_PIN_6);
HAL_GPIO_DeInit(GPIOB, GPIO_PIN_7);
/* I2C1 interrupt DeInit */
HAL_NVIC_DisableIRQ(I2C1_EV_IRQn);
/* USER CODE BEGIN I2C1_MspDeInit 1 */
/* USER CODE END I2C1_MspDeInit 1 */
}
}
/**
* @brief UART MSP Initialization
* This function configures the hardware resources used in this example

15
Core/Src/stm32f1xx_it.c
View File

@@ -56,6 +56,7 @@
/* USER CODE END 0 */
/* External variables --------------------------------------------------------*/
extern I2C_HandleTypeDef hi2c1;
extern UART_HandleTypeDef huart1;
/* USER CODE BEGIN EV */
@@ -199,6 +200,20 @@ void SysTick_Handler(void)
/* please refer to the startup file (startup_stm32f1xx.s). */
/******************************************************************************/
/**
* @brief This function handles I2C1 event interrupt.
*/
void I2C1_EV_IRQHandler(void)
{
/* USER CODE BEGIN I2C1_EV_IRQn 0 */
/* USER CODE END I2C1_EV_IRQn 0 */
HAL_I2C_EV_IRQHandler(&hi2c1);
/* USER CODE BEGIN I2C1_EV_IRQn 1 */
/* USER CODE END I2C1_EV_IRQn 1 */
}
/**
* @brief This function handles USART1 global interrupt.
*/