diff --git a/john103C6T6/Core/Inc/main.h b/john103C6T6/Core/Inc/main.h index ecf574a..24c3dd8 100644 --- a/john103C6T6/Core/Inc/main.h +++ b/john103C6T6/Core/Inc/main.h @@ -75,9 +75,9 @@ typedef struct uint16_t count; }TEMP_TypeDef; typedef struct { - uint32_t init_tsens : 1; // Update Interrupt Flag ( 0) / + uint32_t init_tsens : 1; // Update Interrupt Flag (бит 0) — флаг переполнения/обновления - // ... ( ) + // ... (другие биты могут быть зарезервированы или использоваться в расширенных таймерах) } Flags_TypeDef; @@ -101,7 +101,7 @@ extern void handle_command(char* cmd); typedef void (*FunctionPointer)(void); uint16_t handle_valves(TEMP_TypeDef* temp_sense[MAX_SENSE]); -void init_setpoint_all_T_sense(TEMP_TypeDef* temp_sense[MAX_SENSE]); +void init_setpoint_all_T_sense(TEMP_TypeDef* temp_sense, int size_array); void iwdg_refresh(void); void led_blink(GPIO_TypeDef *GPIOx,uint16_t GPIO_Pin,uint8_t iter,uint16_t delay); FuncStat Field_modbus(MB_DataStructureTypeDef* MB_DATA, Flags_TypeDef* flag); diff --git a/john103C6T6/Core/Src/main.c b/john103C6T6/Core/Src/main.c index a552124..3b8087d 100644 --- a/john103C6T6/Core/Src/main.c +++ b/john103C6T6/Core/Src/main.c @@ -43,6 +43,8 @@ #include "modbus.h" #include "eeprom_emul.h" #include "stdio.h" +#include "flash_ring.h" +#include "string.h" @@ -51,43 +53,42 @@ /* Private typedef -----------------------------------------------------------*/ /* USER CODE BEGIN PTD */ -int fputc(int ch, FILE *f) -{ - HAL_UART_Transmit(&huart1, (uint8_t *)&ch, 1, HAL_MAX_DELAY); - return ch; -} + /* USER CODE END PTD */ /* Private define ------------------------------------------------------------*/ /* USER CODE BEGIN PD */ -uint16_t iter,cnt=5; - -uint8_t ralay_5v_on_var=0; +uint16_t iter, cnt = 5; +uint8_t init_retries = 5; +uint8_t ralay_5v_on_var = 0; /* USER CODE END PD */ /* Private macro -------------------------------------------------------------*/ /* USER CODE BEGIN PM */ - float temperature; - uint8_t roms[MAX_DEVICES][8]; - Flags_TypeDef flag; - //extern uint8_t devices_found ; - uint8_t _debug_init=0; - TEMP_TypeDef temp_sense[30]; - float set_temp_old[30]; - char rx_buffer[64]; - uint8_t rx_index = 0; - char command_ready = 0; - uint8_t uart_byte = 0; - uint8_t first_in=1; - DALLAS_SensorHandleTypeDef sens[30]; - int init_sens=0; - +float temperature; +uint8_t roms[MAX_DEVICES][8]; +Flags_TypeDef flag; +//extern uint8_t devices_found ; +uint8_t _debug_init = 0; +TEMP_TypeDef temp_sense[30]; +float set_temp_old[30]; +char rx_buffer[64]; +uint8_t rx_index = 0; +char command_ready = 0; +uint8_t uart_byte = 0; +uint8_t first_in = 1; +DALLAS_SensorHandleTypeDef sens[30]; +int init_sens = 0; +FlashRecord_t* record; +uint8_t flash_buff[RECORD_SIZE - 4]; + /* USER CODE END PM */ /* Private variables ---------------------------------------------------------*/ /* USER CODE BEGIN PV */ +int last_page_addr = LAST_PAGE_ADDR; /* USER CODE END PV */ @@ -109,135 +110,132 @@ void SystemClock_Config(void); int main(void) { - /* USER CODE BEGIN 1 */ + /* USER CODE BEGIN 1 */ - /* USER CODE END 1 */ + /* USER CODE END 1 */ - /* MCU Configuration--------------------------------------------------------*/ + /* MCU Configuration--------------------------------------------------------*/ - /* Reset of all peripherals, Initializes the Flash interface and the Systick. */ - HAL_Init(); + /* Reset of all peripherals, Initializes the Flash interface and the Systick. */ + HAL_Init(); - /* USER CODE BEGIN Init */ - - /* USER CODE END Init */ + /* USER CODE BEGIN Init */ - /* Configure the system clock */ - SystemClock_Config(); + /* USER CODE END Init */ - /* USER CODE BEGIN SysInit */ + /* Configure the system clock */ + SystemClock_Config(); + + /* USER CODE BEGIN SysInit */ - /* USER CODE END SysInit */ + /* USER CODE END SysInit */ - /* Initialize all configured peripherals */ - MX_GPIO_Init(); - MX_TIM1_Init(); - MX_USART1_UART_Init(); - MX_TIM2_Init(); - MX_ADC1_Init(); - MX_CAN_Init(); - MX_I2C1_Init(); - MX_RTC_Init(); - MX_SPI1_Init(); - /* USER CODE BEGIN 2 */ + /* Initialize all configured peripherals */ + MX_GPIO_Init(); + MX_TIM1_Init(); + MX_USART1_UART_Init(); + MX_TIM2_Init(); + MX_ADC1_Init(); + MX_CAN_Init(); + MX_I2C1_Init(); + MX_RTC_Init(); + MX_SPI1_Init(); + /* USER CODE BEGIN 2 */ - led_blink(GPIOC,13,rest_iter,reset_blink_delay); - MODBUS_FirstInit(&hmodbus1, &mb_huart, &mb_htim); + + + led_blink(GPIOC, 13, rest_iter, reset_blink_delay); + MODBUS_FirstInit(&hmodbus1, &mb_huart, &mb_htim); MODBUS_Config(&hmodbus1, MODBUS_DEVICE_ID, MODBUS_TIMEOUT, MODBUS_MODE_SLAVE); - // Запуск приема Modbus MODBUS_SlaveStart(&hmodbus1, NULL); - uint8_t uart_byte = 0; - - Dallas_BusFirstInit(&htim1); - // ������������� �� ������� ��������� �������� - // ������������� �� ������� (����������� ������ ���������� �������) - reinit_t_sens(); - - MB_DATA.InRegs.num_Tsens=hdallas.onewire->RomCnt; - /* USER CODE END 2 */ - - /* Infinite loop */ - /* USER CODE BEGIN WHILE */ - while (1) - { - Field_modbus(&MB_DATA,&flag); - - if( hmodbus1.pMessagePtr->FuncCode&FC_ERR_VALUES_START) - { - static int pause_Alarm_led; - while (1) - { - if (pause_Alarm_led>36000000) - { - GPIOC->ODR^=1<<13; - pause_Alarm_led=0; - - } - pause_Alarm_led++; - } - } - - Check_Tconnect(&MB_DATA,&flag,&hdallas, 0); - value_control(); - handle_valves(temp_sense[]); - - if (_debug_init||MB_DATA.Coils.init_param) - { - _debug_init=0; - - MB_DATA.Coils.init_param=0; - for(int i=0;iRomCnt;i++) - { - sens[i].set_temp=MB_DATA.HoldRegs.set_Temp[i]; - sens[i].hyst=MB_DATA.HoldRegs.set_hyst[i]; - } + uint8_t uart_byte = 0; + Dallas_BusFirstInit(&htim1); + // ������������� �� ������� ��������� �������� + // ������������� �� ������� (����������� ������ ���������� �������) + reinit_t_sens(); + init_setpoint_all_T_sense(temp_sense, hdallas.onewire->RomCnt); - - - } - - - Dallas_StartConvertTAll(&hdallas,DALLAS_WAIT_BUS,0); - - for(int i=0;iRomCnt;i++) - { - if(sens[i].isLost) - { - sens[i].lost_cnt ++; - } - Dallas_ReadTemperature(&sens[i]); - sens[i].set_temp = MB_DATA.HoldRegs.set_Temp[i]; - MB_DATA.InRegs.sens_Temp[i]=sens[i].temperature*10; - - -/////////////////////////заменить на define ralay_5v_on_var GPIOA->ODR|=1<<10; - - ralay_5v_on_var=MB_DATA.Coils.coils[1].state_val_bit.state_val_05; - if (ralay_5v_on_var) - { - GPIOA->ODR|=1<<10; - } - else - { - GPIOA->ODR&=~(1<<10); - } - //value_control(); - - } - - - - - /* USER CODE END WHILE */ - - /* USER CODE BEGIN 3 */ - //iwdg_refresh(); + MB_DATA.InRegs.num_Tsens = hdallas.onewire->RomCnt; + // BufferState_t buffer_state = buffer_init(); +for(int i=0;iODR |= 1 << 13; +// } + +// } + temp_sense[0].t_close = 1; + Field_modbus(&MB_DATA, &flag); + Check_Tconnect(&MB_DATA, &flag, &hdallas, 0); + value_control(); + init_setpoint_all_T_sense(temp_sense, hdallas.onewire->RomCnt); + // handle_valves(temp_sense[]); + Dallas_StartConvertTAll(&hdallas, DALLAS_WAIT_BUS, 0); + for(int i = 0; i < hdallas.onewire->RomCnt; i++) + { + if(sens[i].isLost) + { + sens[i].lost_cnt ++; + } + Dallas_ReadTemperature(&sens[i]); + MB_DATA.InRegs.sens_Temp[i] = sens[i].temperature * 10; +/////////////////////////заменить на define ralay_5v_on_var GPIOA->ODR|=1<<10; + ralay_5v_on_var = MB_DATA.Coils.coils[1].state_val_bit.state_val_05; + if (ralay_5v_on_var) + { + GPIOA->ODR |= 1 << 10; + } + else + { + GPIOA->ODR &= ~(1 << 10); + } + + + } + + + + + /* USER CODE END WHILE */ + + /* USER CODE BEGIN 3 */ + //iwdg_refresh(); + + //HAL_Delay(200); + } + /* USER CODE END 3 */ } /** @@ -246,240 +244,249 @@ int main(void) */ void SystemClock_Config(void) { - RCC_OscInitTypeDef RCC_OscInitStruct = {0}; - RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; - RCC_PeriphCLKInitTypeDef PeriphClkInit = {0}; + RCC_OscInitTypeDef RCC_OscInitStruct = {0}; + RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInit = {0}; - /** Initializes the RCC Oscillators according to the specified parameters - * in the RCC_OscInitTypeDef structure. - */ - RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI|RCC_OSCILLATORTYPE_HSE; - RCC_OscInitStruct.HSEState = RCC_HSE_ON; - RCC_OscInitStruct.HSEPredivValue = RCC_HSE_PREDIV_DIV1; - RCC_OscInitStruct.HSIState = RCC_HSI_ON; - RCC_OscInitStruct.LSIState = RCC_LSI_ON; - RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON; - RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE; - RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL9; - if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) - { - Error_Handler(); - } + /** Initializes the RCC Oscillators according to the specified parameters + * in the RCC_OscInitTypeDef structure. + */ + RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_HSE; + RCC_OscInitStruct.HSEState = RCC_HSE_ON; + RCC_OscInitStruct.HSEPredivValue = RCC_HSE_PREDIV_DIV1; + RCC_OscInitStruct.HSIState = RCC_HSI_ON; + RCC_OscInitStruct.LSIState = RCC_LSI_ON; + RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON; + RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE; + RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL9; + if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) + { + Error_Handler(); + } - /** Initializes the CPU, AHB and APB buses clocks - */ - RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK - |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2; - RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK; - RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1; - RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2; - RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1; + /** Initializes the CPU, AHB and APB buses clocks + */ + RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK + | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2; + RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK; + RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1; + RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2; + RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1; - if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK) - { - Error_Handler(); - } - PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_ADC; - PeriphClkInit.RTCClockSelection = RCC_RTCCLKSOURCE_LSI; - PeriphClkInit.AdcClockSelection = RCC_ADCPCLK2_DIV6; - if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) - { - Error_Handler(); - } + if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK) + { + Error_Handler(); + } + PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_RTC | RCC_PERIPHCLK_ADC; + PeriphClkInit.RTCClockSelection = RCC_RTCCLKSOURCE_LSI; + PeriphClkInit.AdcClockSelection = RCC_ADCPCLK2_DIV6; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) + { + Error_Handler(); + } } /* USER CODE BEGIN 4 */ - void iwdg_refresh(void) - { - IWDG->KR = 0xAAAA; // �������� ������ - } -void led_blink(GPIO_TypeDef *GPIOx,uint16_t GPIO_Pin,uint8_t iter,uint16_t delay) - { - for(int i=0;iODR^=(1<onewire->RomCnt;i++) - { - if(sens[i].isLost) - { - //init_sens=1; - } - - } - if (init_sens||flag->init_tsens) - { - init_sens=0; - flag->init_tsens=0; - //Dallas_BusFirstInit(&htim1); - DS18B20_Search(&DS, &OW) ; - reinit_t_sens(); - MB_DATA->InRegs.num_Tsens = hdallas->onewire->RomCnt; - } -} + IWDG->KR = 0xAAAA; // �������� ������ +} +void led_blink(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin, uint8_t iter, uint16_t delay) +{ + for(int i = 0; i < iter; i++) + { + GPIOx->ODR ^= (1 << GPIO_Pin); + HAL_Delay(delay); + } +} + +void Check_Tconnect(MB_DataStructureTypeDef* MB_DATA, Flags_TypeDef* flag, DALLAS_HandleTypeDef* hdallas, int a[0]) +{ + for(int i = 0; i < hdallas->onewire->RomCnt; i++) + { + if(sens[i].isLost) + { + //init_sens=1; + } + + } + if (init_sens || flag->init_tsens) + { + init_sens = 0; + flag->init_tsens = 0; + //Dallas_BusFirstInit(&htim1); + DS18B20_Search(&DS, &OW) ; + reinit_t_sens(); + MB_DATA->InRegs.num_Tsens = hdallas->onewire->RomCnt; + } +} void reinit_t_sens(void) { - for ( int i=0; iRomCnt;i++) - { - // ������������� �� ROM-������ - //sens[i].Init.init_func = &Dallas_SensorInitByROM; - // sens[i].Init.InitParam.ROM = rom_address; - sens[i].Init.InitParam.Ind = i; - sens[i].Init.init_func = &Dallas_SensorInitByInd; - sens[i].Init.Resolution = DALLAS_CONFIG_9_BITS; - MB_DATA.HoldRegs.set_Temp[i] =sens[i].set_temp =20.; - MB_DATA.HoldRegs.set_hyst[i]=sens[i].hyst =1; - Dallas_AddNewSensors(&hdallas, &sens[i]); - - } - } -FuncStat packStruct(MB_DataStructureTypeDef* MB_DATA,int sizeARR) - { - for(int i=0;iRomCnt;sens_num++) - { - switch(sens_num) - { - case 0: - MB_DATA->Coils.status_tSens[i].state_val_bit.Temp1_isConnected = sens[i*16+sens_num ].isConnected; - break; - case 1: - MB_DATA->Coils.status_tSens[i].state_val_bit.Temp2_isConnected = sens[i*16+sens_num ].isConnected; - break; - case 2: - MB_DATA->Coils.status_tSens[i].state_val_bit.Temp3_isConnected = sens[i*16+sens_num ].isConnected; - break; - case 3: - MB_DATA->Coils.status_tSens[i].state_val_bit.Temp4_isConnected = sens[i*16+sens_num ].isConnected; - break; - case 4: - MB_DATA->Coils.status_tSens[i].state_val_bit.Temp5_isConnected = sens[i*16+sens_num ].isConnected; - break; - case 5: - MB_DATA->Coils.status_tSens[i].state_val_bit.Temp6_isConnected = sens[i*16+sens_num ].isConnected; - break; - case 6: - MB_DATA->Coils.status_tSens[i].state_val_bit.Temp7_isConnected = sens[i*16+sens_num ].isConnected; - break; - case 7: - MB_DATA->Coils.status_tSens[i].state_val_bit.Temp8_isConnected = sens[i*16+sens_num ].isConnected; - break; - case 8: - MB_DATA->Coils.status_tSens[i].state_val_bit.Temp9_isConnected = sens[i*16+sens_num ].isConnected; - break; - case 9: - MB_DATA->Coils.status_tSens[i].state_val_bit.Temp10_isConnected = sens[i*16+sens_num ].isConnected; - break; - case 10: - MB_DATA->Coils.status_tSens[i].state_val_bit.Temp11_isConnected = sens[i*16+sens_num ].isConnected; - break; - case 11: - MB_DATA->Coils.status_tSens[i].state_val_bit.Temp12_isConnected = sens[i*16+sens_num ].isConnected; - break; - case 12: - MB_DATA->Coils.status_tSens[i].state_val_bit.Temp13_isConnected = sens[i*16+sens_num ].isConnected; - break; - case 13: - MB_DATA->Coils.status_tSens[i].state_val_bit.Temp14_isConnected = sens[i*16+sens_num ].isConnected; - break; - case 14: - MB_DATA->Coils.status_tSens[i].state_val_bit.Temp15_isConnected = sens[i*16+sens_num ].isConnected; - break; - case 15: - MB_DATA->Coils.status_tSens[i].state_val_bit.Temp16_isConnected = sens[i*16+sens_num ].isConnected; - break; - } - } - } - return FuncOK; - - } + for ( int i = 0; i < hdallas.onewire->RomCnt; i++) + { + // ������������� �� ROM-������ + //sens[i].Init.init_func = &Dallas_SensorInitByROM; + // sens[i].Init.InitParam.ROM = rom_address; + sens[i].Init.InitParam.Ind = i; + sens[i].Init.init_func = &Dallas_SensorInitByInd; + sens[i].Init.Resolution = DALLAS_CONFIG_9_BITS; + MB_DATA.HoldRegs.set_Temp[i] = sens[i].set_temp = 20.; + MB_DATA.HoldRegs.set_hyst[i] = sens[i].hyst = 1; + Dallas_AddNewSensors(&hdallas, &sens[i]); + + } +} +FuncStat packStruct(MB_DataStructureTypeDef* MB_DATA, int sizeARR) +{ + for(int i = 0; i < sizeARR; i++) + { + for(int sens_num = 0; sens_num < hdallas.onewire->RomCnt; sens_num++) + { + switch(sens_num) + { + case 0: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp1_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 1: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp2_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 2: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp3_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 3: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp4_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 4: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp5_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 5: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp6_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 6: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp7_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 7: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp8_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 8: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp9_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 9: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp10_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 10: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp11_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 11: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp12_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 12: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp13_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 13: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp14_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 14: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp15_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 15: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp16_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + } + } + } + return FuncOK; + +} FuncStat Field_modbus(MB_DataStructureTypeDef* MB_DATA, Flags_TypeDef* flag) - { - - MB_DATA->InRegs.ID= *hdallas.ds_devices; - flag->init_tsens=MB_DATA->Coils.init_Tsens; - packStruct(MB_DATA,MAX_SENSE/16); - - - return FuncOK; - }; - - +{ + + MB_DATA->InRegs.ID = *hdallas.ds_devices; + flag->init_tsens = MB_DATA->Coils.init_Tsens; + packStruct(MB_DATA, MAX_SENSE / 16); + if (_debug_init || MB_DATA->Coils.init_param) + { + _debug_init = 0; + + MB_DATA->Coils.init_param = 0; + for(int i = 0; i < hdallas.onewire->RomCnt; i++) + { + sens[i].set_temp = MB_DATA->HoldRegs.set_Temp[i]; + sens[i].hyst = MB_DATA->HoldRegs.set_hyst[i]; + } + + + + } + + return FuncOK; +}; + + FuncStat value_control(void ) - { - - for(int i=0;i<10;i++) - { - if (sens[i].temperaturesens[i].set_temp+sens[i].hyst) - { - - MB_DATA.Coils.coils[0].all&=~(1<ODR|=1<<11; - } - else - { - GPIOB->ODR&=~(1<<11); - - } - - - } - return FuncOK; - } - +{ + + for(int i = 0; i < hdallas.onewire->RomCnt; i++) + { + if (sens[i].temperature < sens[i].set_temp - sens[i].hyst) + + { + + MB_DATA.Coils.coils[0].all |= 1 << i; + MB_DATA.Coils.coils[1].all &= ~(1 << i); + + + } + + else + + if (sens[i].temperature > sens[i].set_temp + sens[i].hyst) + { + + MB_DATA.Coils.coils[0].all &= ~(1 << i); + MB_DATA.Coils.coils[1].all |= 1 << i; + + } + + + + } + + + return FuncOK; +} + uint16_t handle_valves(TEMP_TypeDef* temp_sense[MAX_SENSE] ) { - - if (temp_sense[0]->state==STATE_OPEN_VALVE) - { - GPIOC->ODR|=1<<14; - } - else - if (temp_sense[0]->state==STATE_CLOSE_VALVE) - { - GPIOC->ODR&=~(1<<14); - } - - return 1; - + + if (temp_sense[0]->state == STATE_OPEN_VALVE) + { + GPIOC->ODR |= 1 << 14; + } + else if (temp_sense[0]->state == STATE_CLOSE_VALVE) + { + GPIOC->ODR &= ~(1 << 14); + } + + return 1; + } -void init_setpoint_all_T_sense(TEMP_TypeDef* temp_sense[MAX_SENSE]) -{ - //ds_search_devices(); - for(int i=0;iRomCnt;i++) -{ - temp_sense[i]->id[0]=roms[i][0]<<0|roms[i][1]<<8|roms[i][2]<<16|roms[i][3]<<24; - temp_sense[i]->id[1]=roms[i][4]<<0|roms[i][5]<<8|roms[i][6]<<16|roms[i][7]<<24; - temp_sense[i]->count =i+1; - temp_sense[i]->location=1; - temp_sense[i]->t_open=22; - temp_sense[i]->t_close=18; - temp_sense[i]->status_T_sense=1; -} +void init_setpoint_all_T_sense(TEMP_TypeDef* temp_sense, int size_array) +{ + //ds_search_devices(); + for(int i = 0; i < size_array ; i++) + { + temp_sense[i].id[0] = roms[i][0] << 0 | roms[i][1] << 8 | roms[i][2] << 16 | roms[i][3] << 24; + temp_sense[i].id[1] = roms[i][4] << 0 | roms[i][5] << 8 | roms[i][6] << 16 | roms[i][7] << 24; + temp_sense[i].count = i + 1; + temp_sense[i].location = 1; + temp_sense[i].t_open = 22; + temp_sense[i].t_close = 18; + temp_sense[i].status_T_sense = 1; + } } /* USER CODE END 4 */ @@ -493,16 +500,16 @@ void init_setpoint_all_T_sense(TEMP_TypeDef* temp_sense[MAX_SENSE]) */ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) { - /* USER CODE BEGIN Callback 0 */ + /* USER CODE BEGIN Callback 0 */ - /* USER CODE END Callback 0 */ - if (htim->Instance == TIM3) - { - HAL_IncTick(); - } - /* USER CODE BEGIN Callback 1 */ + /* USER CODE END Callback 0 */ + if (htim->Instance == TIM3) + { + HAL_IncTick(); + } + /* USER CODE BEGIN Callback 1 */ - /* USER CODE END Callback 1 */ + /* USER CODE END Callback 1 */ } /** @@ -511,13 +518,13 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) */ void Error_Handler(void) { - /* USER CODE BEGIN Error_Handler_Debug */ - /* User can add his own implementation to report the HAL error return state */ - __disable_irq(); - while (1) - { - } - /* USER CODE END Error_Handler_Debug */ + /* USER CODE BEGIN Error_Handler_Debug */ + /* User can add his own implementation to report the HAL error return state */ + __disable_irq(); + while (1) + { + } + /* USER CODE END Error_Handler_Debug */ } #ifdef USE_FULL_ASSERT /** @@ -529,9 +536,9 @@ void Error_Handler(void) */ void assert_failed(uint8_t *file, uint32_t line) { - /* USER CODE BEGIN 6 */ - /* User can add his own implementation to report the file name and line number, - ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */ - /* USER CODE END 6 */ + /* USER CODE BEGIN 6 */ + /* User can add his own implementation to report the file name and line number, + ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */ + /* USER CODE END 6 */ } #endif /* USE_FULL_ASSERT */ diff --git a/john103C6T6/Core/Src/main.c.orig b/john103C6T6/Core/Src/main.c.orig new file mode 100644 index 0000000..07af4fb --- /dev/null +++ b/john103C6T6/Core/Src/main.c.orig @@ -0,0 +1,540 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file : main.c + * @brief : Main program body + ****************************************************************************** + * @attention + * + * Copyright (c) 2025 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ +/* Includes ------------------------------------------------------------------*/ +#include "main.h" +#include "adc.h" +#include "can.h" +#include "i2c.h" +#include "rtc.h" +#include "spi.h" +#include "tim.h" +#include "usart.h" +#include "gpio.h" + + + + + + + + +/* Private includes ----------------------------------------------------------*/ +/* USER CODE BEGIN Includes */ +#include "dallas_tools.h" + +#include "def.h" +#include +#include "modbus.h" +#include "eeprom_emul.h" +#include "stdio.h" +#include "flash_ring.h" +#include "string.h" + + + + +/* USER CODE END Includes */ + +/* Private typedef -----------------------------------------------------------*/ +/* USER CODE BEGIN PTD */ + +/* USER CODE END PTD */ + +/* Private define ------------------------------------------------------------*/ +/* USER CODE BEGIN PD */ +uint16_t iter, cnt = 5; +uint8_t init_retries = 5; +uint8_t ralay_5v_on_var = 0; +/* USER CODE END PD */ + +/* Private macro -------------------------------------------------------------*/ +/* USER CODE BEGIN PM */ +float temperature; +uint8_t roms[MAX_DEVICES][8]; +Flags_TypeDef flag; +//extern uint8_t devices_found ; +uint8_t _debug_init = 0; +TEMP_TypeDef temp_sense[30]; +float set_temp_old[30]; +char rx_buffer[64]; +uint8_t rx_index = 0; +char command_ready = 0; +uint8_t uart_byte = 0; +uint8_t first_in = 1; +DALLAS_SensorHandleTypeDef sens[30]; +int init_sens = 0; +FlashRecord_t* record; +uint8_t flash_buff[RECORD_SIZE-4]; + + +/* USER CODE END PM */ + +/* Private variables ---------------------------------------------------------*/ + +/* USER CODE BEGIN PV */ +int last_page_addr=LAST_PAGE_ADDR; + +/* USER CODE END PV */ + +/* Private function prototypes -----------------------------------------------*/ +void SystemClock_Config(void); +/* USER CODE BEGIN PFP */ + +/* USER CODE END PFP */ + +/* Private user code ---------------------------------------------------------*/ +/* USER CODE BEGIN 0 */ + +/* USER CODE END 0 */ + +/** + * @brief The application entry point. + * @retval int + */ +int main(void) +{ + + /* USER CODE BEGIN 1 */ + + /* USER CODE END 1 */ + + /* MCU Configuration--------------------------------------------------------*/ + + /* Reset of all peripherals, Initializes the Flash interface and the Systick. */ + HAL_Init(); + + /* USER CODE BEGIN Init */ + + /* USER CODE END Init */ + + /* Configure the system clock */ + SystemClock_Config(); + + /* USER CODE BEGIN SysInit */ + + + /* USER CODE END SysInit */ + + /* Initialize all configured peripherals */ + MX_GPIO_Init(); + MX_TIM1_Init(); + MX_USART1_UART_Init(); + MX_TIM2_Init(); + MX_ADC1_Init(); + MX_CAN_Init(); + MX_I2C1_Init(); + MX_RTC_Init(); + MX_SPI1_Init(); + /* USER CODE BEGIN 2 */ + + + + led_blink(GPIOC, 13, rest_iter, reset_blink_delay); + MODBUS_FirstInit(&hmodbus1, &mb_huart, &mb_htim); + MODBUS_Config(&hmodbus1, MODBUS_DEVICE_ID, MODBUS_TIMEOUT, MODBUS_MODE_SLAVE); + // Запуск приема Modbus + MODBUS_SlaveStart(&hmodbus1, NULL); + uint8_t uart_byte = 0; + Dallas_BusFirstInit(&htim1); + // ������������� �� ������� ��������� �������� + // ������������� �� ������� (����������� ������ ���������� �������) + reinit_t_sens(); + init_setpoint_all_T_sense(temp_sense, hdallas.onewire->RomCnt); + + MB_DATA.InRegs.num_Tsens = hdallas.onewire->RomCnt; + BufferState_t buffer_state = buffer_init(); + + /* USER CODE END 2 */ + + /* Infinite loop */ + /* USER CODE BEGIN WHILE */ + while (1) + { + + +if (MB_DATA.Coils.relay_struct[0].state_val_bit.Temp11_relay_isOn) + { + MB_DATA.Coils.relay_struct[0].state_val_bit.Temp11_relay_isOn=0; + BufferState_t state = buffer_init(); + uint32_t idx = (state.write_index ) % RECORDS_PER_PAGE; + FlashRecord_t* record = buffer_read_record(idx); + + } + if (MB_DATA.Coils.relay_struct[0].state_val_bit.Temp10_relay_isOn) + { + MB_DATA.Coils.relay_struct[0].state_val_bit.Temp10_relay_isOn = 0; + FlashRecord_t new_record; + new_record.timestamp = HAL_GetTick(); + memset(new_record.data, (uint8_t)*flash_buff, sizeof(new_record.data)); + + HAL_StatusTypeDef status = buffer_write_record(&new_record, &buffer_state); + + if (status == HAL_OK) + { + // printf("Record written successfully\n"); + GPIOC->ODR|=1<<13; + } + + } + temp_sense[0].t_close = 1; + Field_modbus(&MB_DATA, &flag); + Check_Tconnect(&MB_DATA, &flag, &hdallas, 0); + value_control(); + init_setpoint_all_T_sense(temp_sense, hdallas.onewire->RomCnt); + // handle_valves(temp_sense[]); + Dallas_StartConvertTAll(&hdallas, DALLAS_WAIT_BUS, 0); + for(int i = 0; i < hdallas.onewire->RomCnt; i++) + { + if(sens[i].isLost) + { + sens[i].lost_cnt ++; + } + Dallas_ReadTemperature(&sens[i]); + MB_DATA.InRegs.sens_Temp[i] = sens[i].temperature * 10; +/////////////////////////заменить на define ralay_5v_on_var GPIOA->ODR|=1<<10; + ralay_5v_on_var = MB_DATA.Coils.coils[1].state_val_bit.state_val_05; + if (ralay_5v_on_var) + { + GPIOA->ODR |= 1 << 10; + } + else + { + GPIOA->ODR &= ~(1 << 10); + } + + + } + + + + + /* USER CODE END WHILE */ + + /* USER CODE BEGIN 3 */ + //iwdg_refresh(); + + //HAL_Delay(200); + } + /* USER CODE END 3 */ +} + +/** + * @brief System Clock Configuration + * @retval None + */ +void SystemClock_Config(void) +{ + RCC_OscInitTypeDef RCC_OscInitStruct = {0}; + RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInit = {0}; + + /** Initializes the RCC Oscillators according to the specified parameters + * in the RCC_OscInitTypeDef structure. + */ + RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_HSE; + RCC_OscInitStruct.HSEState = RCC_HSE_ON; + RCC_OscInitStruct.HSEPredivValue = RCC_HSE_PREDIV_DIV1; + RCC_OscInitStruct.HSIState = RCC_HSI_ON; + RCC_OscInitStruct.LSIState = RCC_LSI_ON; + RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON; + RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE; + RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL9; + if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) + { + Error_Handler(); + } + + /** Initializes the CPU, AHB and APB buses clocks + */ + RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK + | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2; + RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK; + RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1; + RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2; + RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1; + + if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK) + { + Error_Handler(); + } + PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_RTC | RCC_PERIPHCLK_ADC; + PeriphClkInit.RTCClockSelection = RCC_RTCCLKSOURCE_LSI; + PeriphClkInit.AdcClockSelection = RCC_ADCPCLK2_DIV6; + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) + { + Error_Handler(); + } +} + +/* USER CODE BEGIN 4 */ +void iwdg_refresh(void) +{ + IWDG->KR = 0xAAAA; // �������� ������ +} +void led_blink(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin, uint8_t iter, uint16_t delay) +{ + for(int i = 0; i < iter; i++) + { + GPIOx->ODR ^= (1 << GPIO_Pin); + HAL_Delay(delay); + } +} + +void Check_Tconnect(MB_DataStructureTypeDef* MB_DATA, Flags_TypeDef* flag, DALLAS_HandleTypeDef* hdallas, int a[0]) +{ + for(int i = 0; i < hdallas->onewire->RomCnt; i++) + { + if(sens[i].isLost) + { + //init_sens=1; + } + + } + if (init_sens || flag->init_tsens) + { + init_sens = 0; + flag->init_tsens = 0; + //Dallas_BusFirstInit(&htim1); + DS18B20_Search(&DS, &OW) ; + reinit_t_sens(); + MB_DATA->InRegs.num_Tsens = hdallas->onewire->RomCnt; + } +} + +void reinit_t_sens(void) +{ + for ( int i = 0; i < hdallas.onewire->RomCnt; i++) + { + // ������������� �� ROM-������ + //sens[i].Init.init_func = &Dallas_SensorInitByROM; + // sens[i].Init.InitParam.ROM = rom_address; + sens[i].Init.InitParam.Ind = i; + sens[i].Init.init_func = &Dallas_SensorInitByInd; + sens[i].Init.Resolution = DALLAS_CONFIG_9_BITS; + MB_DATA.HoldRegs.set_Temp[i] = sens[i].set_temp = 20.; + MB_DATA.HoldRegs.set_hyst[i] = sens[i].hyst = 1; + Dallas_AddNewSensors(&hdallas, &sens[i]); + + } +} +FuncStat packStruct(MB_DataStructureTypeDef* MB_DATA, int sizeARR) +{ + for(int i = 0; i < sizeARR; i++) + { + for(int sens_num = 0; sens_num < hdallas.onewire->RomCnt; sens_num++) + { + switch(sens_num) + { + case 0: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp1_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 1: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp2_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 2: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp3_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 3: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp4_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 4: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp5_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 5: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp6_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 6: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp7_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 7: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp8_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 8: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp9_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 9: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp10_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 10: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp11_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 11: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp12_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 12: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp13_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 13: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp14_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 14: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp15_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + case 15: + MB_DATA->Coils.status_tSens[i].state_val_bit.Temp16_isConnected = sens[i * 16 + sens_num ].isConnected; + break; + } + } + } + return FuncOK; + +} +FuncStat Field_modbus(MB_DataStructureTypeDef* MB_DATA, Flags_TypeDef* flag) +{ + + MB_DATA->InRegs.ID = *hdallas.ds_devices; + flag->init_tsens = MB_DATA->Coils.init_Tsens; + packStruct(MB_DATA, MAX_SENSE / 16); + if (_debug_init || MB_DATA->Coils.init_param) + { + _debug_init = 0; + + MB_DATA->Coils.init_param = 0; + for(int i = 0; i < hdallas.onewire->RomCnt; i++) + { + sens[i].set_temp = MB_DATA->HoldRegs.set_Temp[i]; + sens[i].hyst = MB_DATA->HoldRegs.set_hyst[i]; + } + + + + } + + return FuncOK; +}; + + +FuncStat value_control(void ) +{ + + for(int i = 0; i < hdallas.onewire->RomCnt; i++) + { + if (sens[i].temperature < sens[i].set_temp - sens[i].hyst) + + { + + MB_DATA.Coils.coils[0].all |= 1 << i; + MB_DATA.Coils.coils[1].all &= ~(1 << i); + + + } + + else + + if (sens[i].temperature > sens[i].set_temp + sens[i].hyst) + { + + MB_DATA.Coils.coils[0].all &= ~(1 << i); + MB_DATA.Coils.coils[1].all |= 1 << i; + + } + + + + } + + + return FuncOK; +} + + +uint16_t handle_valves(TEMP_TypeDef* temp_sense[MAX_SENSE] ) +{ + + if (temp_sense[0]->state == STATE_OPEN_VALVE) + { + GPIOC->ODR |= 1 << 14; + } + else if (temp_sense[0]->state == STATE_CLOSE_VALVE) + { + GPIOC->ODR &= ~(1 << 14); + } + + return 1; + +} + +void init_setpoint_all_T_sense(TEMP_TypeDef* temp_sense, int size_array) +{ + //ds_search_devices(); + for(int i = 0; i < size_array ; i++) + { + temp_sense[i].id[0] = roms[i][0] << 0 | roms[i][1] << 8 | roms[i][2] << 16 | roms[i][3] << 24; + temp_sense[i].id[1] = roms[i][4] << 0 | roms[i][5] << 8 | roms[i][6] << 16 | roms[i][7] << 24; + temp_sense[i].count = i + 1; + temp_sense[i].location = 1; + temp_sense[i].t_open = 22; + temp_sense[i].t_close = 18; + temp_sense[i].status_T_sense = 1; + } +} +/* USER CODE END 4 */ + +/** + * @brief Period elapsed callback in non blocking mode + * @note This function is called when TIM3 interrupt took place, inside + * HAL_TIM_IRQHandler(). It makes a direct call to HAL_IncTick() to increment + * a global variable "uwTick" used as application time base. + * @param htim : TIM handle + * @retval None + */ +void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) +{ + /* USER CODE BEGIN Callback 0 */ + + /* USER CODE END Callback 0 */ + if (htim->Instance == TIM3) + { + HAL_IncTick(); + } + /* USER CODE BEGIN Callback 1 */ + + /* USER CODE END Callback 1 */ +} + +/** + * @brief This function is executed in case of error occurrence. + * @retval None + */ +void Error_Handler(void) +{ + /* USER CODE BEGIN Error_Handler_Debug */ + /* User can add his own implementation to report the HAL error return state */ + __disable_irq(); + while (1) + { + } + /* USER CODE END Error_Handler_Debug */ +} +#ifdef USE_FULL_ASSERT +/** + * @brief Reports the name of the source file and the source line number + * where the assert_param error has occurred. + * @param file: pointer to the source file name + * @param line: assert_param error line source number + * @retval None + */ +void assert_failed(uint8_t *file, uint32_t line) +{ + /* USER CODE BEGIN 6 */ + /* User can add his own implementation to report the file name and line number, + ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */ + /* USER CODE END 6 */ +} +#endif /* USE_FULL_ASSERT */ diff --git a/john103C6T6/Core/Src/rtc.c b/john103C6T6/Core/Src/rtc.c index dfa4bb9..3530a91 100644 --- a/john103C6T6/Core/Src/rtc.c +++ b/john103C6T6/Core/Src/rtc.c @@ -119,7 +119,7 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* rtcHandle) /* USER CODE BEGIN RTC_MspDeInit 1 */ /* USER CODE END RTC_MspDeInit 1 */ - } + } } /* USER CODE BEGIN 1 */ diff --git a/john103C6T6/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103x6.h b/john103C6T6/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xb.h similarity index 98% rename from john103C6T6/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103x6.h rename to john103C6T6/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xb.h index 13694b7..82df4b0 100644 --- a/john103C6T6/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103x6.h +++ b/john103C6T6/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xb.h @@ -1,6 +1,6 @@ /** ****************************************************************************** - * @file stm32f103x6.h + * @file stm32f103xb.h * @author MCD Application Team * @brief CMSIS Cortex-M3 Device Peripheral Access Layer Header File. * This file contains all the peripheral register's definitions, bits @@ -29,12 +29,12 @@ * @{ */ -/** @addtogroup stm32f103x6 +/** @addtogroup stm32f103xb * @{ */ -#ifndef __STM32F103x6_H -#define __STM32F103x6_H +#ifndef __STM32F103xB_H +#define __STM32F103xB_H #ifdef __cplusplus extern "C" { @@ -109,11 +109,16 @@ typedef enum TIM1_CC_IRQn = 27, /*!< TIM1 Capture Compare Interrupt */ TIM2_IRQn = 28, /*!< TIM2 global Interrupt */ TIM3_IRQn = 29, /*!< TIM3 global Interrupt */ + TIM4_IRQn = 30, /*!< TIM4 global Interrupt */ I2C1_EV_IRQn = 31, /*!< I2C1 Event Interrupt */ I2C1_ER_IRQn = 32, /*!< I2C1 Error Interrupt */ + I2C2_EV_IRQn = 33, /*!< I2C2 Event Interrupt */ + I2C2_ER_IRQn = 34, /*!< I2C2 Error Interrupt */ SPI1_IRQn = 35, /*!< SPI1 global Interrupt */ + SPI2_IRQn = 36, /*!< SPI2 global Interrupt */ USART1_IRQn = 37, /*!< USART1 global Interrupt */ USART2_IRQn = 38, /*!< USART2 global Interrupt */ + USART3_IRQn = 39, /*!< USART3 global Interrupt */ EXTI15_10_IRQn = 40, /*!< External Line[15:10] Interrupts */ RTC_Alarm_IRQn = 41, /*!< RTC Alarm through EXTI Line Interrupt */ USBWakeUp_IRQn = 42, /*!< USB Device WakeUp from suspend through EXTI Line Interrupt */ @@ -565,7 +570,7 @@ typedef struct #define FLASH_BASE 0x08000000UL /*!< FLASH base address in the alias region */ -#define FLASH_BANK1_END 0x08007FFFUL /*!< FLASH END address of bank1 */ +#define FLASH_BANK1_END 0x0801FFFFUL /*!< FLASH END address of bank1 */ #define SRAM_BASE 0x20000000UL /*!< SRAM base address in the alias region */ #define PERIPH_BASE 0x40000000UL /*!< Peripheral base address in the alias region */ @@ -580,11 +585,15 @@ typedef struct #define TIM2_BASE (APB1PERIPH_BASE + 0x00000000UL) #define TIM3_BASE (APB1PERIPH_BASE + 0x00000400UL) +#define TIM4_BASE (APB1PERIPH_BASE + 0x00000800UL) #define RTC_BASE (APB1PERIPH_BASE + 0x00002800UL) #define WWDG_BASE (APB1PERIPH_BASE + 0x00002C00UL) #define IWDG_BASE (APB1PERIPH_BASE + 0x00003000UL) +#define SPI2_BASE (APB1PERIPH_BASE + 0x00003800UL) #define USART2_BASE (APB1PERIPH_BASE + 0x00004400UL) +#define USART3_BASE (APB1PERIPH_BASE + 0x00004800UL) #define I2C1_BASE (APB1PERIPH_BASE + 0x00005400UL) +#define I2C2_BASE (APB1PERIPH_BASE + 0x00005800UL) #define CAN1_BASE (APB1PERIPH_BASE + 0x00006400UL) #define BKP_BASE (APB1PERIPH_BASE + 0x00006C00UL) #define PWR_BASE (APB1PERIPH_BASE + 0x00007000UL) @@ -594,6 +603,7 @@ typedef struct #define GPIOB_BASE (APB2PERIPH_BASE + 0x00000C00UL) #define GPIOC_BASE (APB2PERIPH_BASE + 0x00001000UL) #define GPIOD_BASE (APB2PERIPH_BASE + 0x00001400UL) +#define GPIOE_BASE (APB2PERIPH_BASE + 0x00001800UL) #define ADC1_BASE (APB2PERIPH_BASE + 0x00002400UL) #define ADC2_BASE (APB2PERIPH_BASE + 0x00002800UL) #define TIM1_BASE (APB2PERIPH_BASE + 0x00002C00UL) @@ -636,11 +646,15 @@ typedef struct #define TIM2 ((TIM_TypeDef *)TIM2_BASE) #define TIM3 ((TIM_TypeDef *)TIM3_BASE) +#define TIM4 ((TIM_TypeDef *)TIM4_BASE) #define RTC ((RTC_TypeDef *)RTC_BASE) #define WWDG ((WWDG_TypeDef *)WWDG_BASE) #define IWDG ((IWDG_TypeDef *)IWDG_BASE) +#define SPI2 ((SPI_TypeDef *)SPI2_BASE) #define USART2 ((USART_TypeDef *)USART2_BASE) +#define USART3 ((USART_TypeDef *)USART3_BASE) #define I2C1 ((I2C_TypeDef *)I2C1_BASE) +#define I2C2 ((I2C_TypeDef *)I2C2_BASE) #define USB ((USB_TypeDef *)USB_BASE) #define CAN1 ((CAN_TypeDef *)CAN1_BASE) #define BKP ((BKP_TypeDef *)BKP_BASE) @@ -651,6 +665,7 @@ typedef struct #define GPIOB ((GPIO_TypeDef *)GPIOB_BASE) #define GPIOC ((GPIO_TypeDef *)GPIOC_BASE) #define GPIOD ((GPIO_TypeDef *)GPIOD_BASE) +#define GPIOE ((GPIO_TypeDef *)GPIOE_BASE) #define ADC1 ((ADC_TypeDef *)ADC1_BASE) #define ADC2 ((ADC_TypeDef *)ADC2_BASE) #define ADC12_COMMON ((ADC_Common_TypeDef *)ADC1_BASE) @@ -1185,6 +1200,9 @@ typedef struct #define RCC_APB2RSTR_USART1RST RCC_APB2RSTR_USART1RST_Msk /*!< USART1 reset */ +#define RCC_APB2RSTR_IOPERST_Pos (6U) +#define RCC_APB2RSTR_IOPERST_Msk (0x1UL << RCC_APB2RSTR_IOPERST_Pos) /*!< 0x00000040 */ +#define RCC_APB2RSTR_IOPERST RCC_APB2RSTR_IOPERST_Msk /*!< I/O port E reset */ @@ -1217,6 +1235,18 @@ typedef struct #define RCC_APB1RSTR_PWRRST_Msk (0x1UL << RCC_APB1RSTR_PWRRST_Pos) /*!< 0x10000000 */ #define RCC_APB1RSTR_PWRRST RCC_APB1RSTR_PWRRST_Msk /*!< Power interface reset */ +#define RCC_APB1RSTR_TIM4RST_Pos (2U) +#define RCC_APB1RSTR_TIM4RST_Msk (0x1UL << RCC_APB1RSTR_TIM4RST_Pos) /*!< 0x00000004 */ +#define RCC_APB1RSTR_TIM4RST RCC_APB1RSTR_TIM4RST_Msk /*!< Timer 4 reset */ +#define RCC_APB1RSTR_SPI2RST_Pos (14U) +#define RCC_APB1RSTR_SPI2RST_Msk (0x1UL << RCC_APB1RSTR_SPI2RST_Pos) /*!< 0x00004000 */ +#define RCC_APB1RSTR_SPI2RST RCC_APB1RSTR_SPI2RST_Msk /*!< SPI 2 reset */ +#define RCC_APB1RSTR_USART3RST_Pos (18U) +#define RCC_APB1RSTR_USART3RST_Msk (0x1UL << RCC_APB1RSTR_USART3RST_Pos) /*!< 0x00040000 */ +#define RCC_APB1RSTR_USART3RST RCC_APB1RSTR_USART3RST_Msk /*!< USART 3 reset */ +#define RCC_APB1RSTR_I2C2RST_Pos (22U) +#define RCC_APB1RSTR_I2C2RST_Msk (0x1UL << RCC_APB1RSTR_I2C2RST_Pos) /*!< 0x00400000 */ +#define RCC_APB1RSTR_I2C2RST RCC_APB1RSTR_I2C2RST_Msk /*!< I2C 2 reset */ #define RCC_APB1RSTR_USBRST_Pos (23U) #define RCC_APB1RSTR_USBRST_Msk (0x1UL << RCC_APB1RSTR_USBRST_Pos) /*!< 0x00800000 */ @@ -1279,6 +1309,9 @@ typedef struct #define RCC_APB2ENR_USART1EN RCC_APB2ENR_USART1EN_Msk /*!< USART1 clock enable */ +#define RCC_APB2ENR_IOPEEN_Pos (6U) +#define RCC_APB2ENR_IOPEEN_Msk (0x1UL << RCC_APB2ENR_IOPEEN_Pos) /*!< 0x00000040 */ +#define RCC_APB2ENR_IOPEEN RCC_APB2ENR_IOPEEN_Msk /*!< I/O port E clock enable */ @@ -1311,6 +1344,18 @@ typedef struct #define RCC_APB1ENR_PWREN_Msk (0x1UL << RCC_APB1ENR_PWREN_Pos) /*!< 0x10000000 */ #define RCC_APB1ENR_PWREN RCC_APB1ENR_PWREN_Msk /*!< Power interface clock enable */ +#define RCC_APB1ENR_TIM4EN_Pos (2U) +#define RCC_APB1ENR_TIM4EN_Msk (0x1UL << RCC_APB1ENR_TIM4EN_Pos) /*!< 0x00000004 */ +#define RCC_APB1ENR_TIM4EN RCC_APB1ENR_TIM4EN_Msk /*!< Timer 4 clock enable */ +#define RCC_APB1ENR_SPI2EN_Pos (14U) +#define RCC_APB1ENR_SPI2EN_Msk (0x1UL << RCC_APB1ENR_SPI2EN_Pos) /*!< 0x00004000 */ +#define RCC_APB1ENR_SPI2EN RCC_APB1ENR_SPI2EN_Msk /*!< SPI 2 clock enable */ +#define RCC_APB1ENR_USART3EN_Pos (18U) +#define RCC_APB1ENR_USART3EN_Msk (0x1UL << RCC_APB1ENR_USART3EN_Pos) /*!< 0x00040000 */ +#define RCC_APB1ENR_USART3EN RCC_APB1ENR_USART3EN_Msk /*!< USART 3 clock enable */ +#define RCC_APB1ENR_I2C2EN_Pos (22U) +#define RCC_APB1ENR_I2C2EN_Msk (0x1UL << RCC_APB1ENR_I2C2EN_Pos) /*!< 0x00400000 */ +#define RCC_APB1ENR_I2C2EN RCC_APB1ENR_I2C2EN_Msk /*!< I2C 2 clock enable */ #define RCC_APB1ENR_USBEN_Pos (23U) #define RCC_APB1ENR_USBEN_Msk (0x1UL << RCC_APB1ENR_USBEN_Pos) /*!< 0x00800000 */ @@ -1999,6 +2044,20 @@ typedef struct #define AFIO_MAPR_USART2_REMAP_Msk (0x1UL << AFIO_MAPR_USART2_REMAP_Pos) /*!< 0x00000008 */ #define AFIO_MAPR_USART2_REMAP AFIO_MAPR_USART2_REMAP_Msk /*!< USART2 remapping */ +#define AFIO_MAPR_USART3_REMAP_Pos (4U) +#define AFIO_MAPR_USART3_REMAP_Msk (0x3UL << AFIO_MAPR_USART3_REMAP_Pos) /*!< 0x00000030 */ +#define AFIO_MAPR_USART3_REMAP AFIO_MAPR_USART3_REMAP_Msk /*!< USART3_REMAP[1:0] bits (USART3 remapping) */ +#define AFIO_MAPR_USART3_REMAP_0 (0x1UL << AFIO_MAPR_USART3_REMAP_Pos) /*!< 0x00000010 */ +#define AFIO_MAPR_USART3_REMAP_1 (0x2UL << AFIO_MAPR_USART3_REMAP_Pos) /*!< 0x00000020 */ + +/* USART3_REMAP configuration */ +#define AFIO_MAPR_USART3_REMAP_NOREMAP 0x00000000U /*!< No remap (TX/PB10, RX/PB11, CK/PB12, CTS/PB13, RTS/PB14) */ +#define AFIO_MAPR_USART3_REMAP_PARTIALREMAP_Pos (4U) +#define AFIO_MAPR_USART3_REMAP_PARTIALREMAP_Msk (0x1UL << AFIO_MAPR_USART3_REMAP_PARTIALREMAP_Pos) /*!< 0x00000010 */ +#define AFIO_MAPR_USART3_REMAP_PARTIALREMAP AFIO_MAPR_USART3_REMAP_PARTIALREMAP_Msk /*!< Partial remap (TX/PC10, RX/PC11, CK/PC12, CTS/PB13, RTS/PB14) */ +#define AFIO_MAPR_USART3_REMAP_FULLREMAP_Pos (4U) +#define AFIO_MAPR_USART3_REMAP_FULLREMAP_Msk (0x3UL << AFIO_MAPR_USART3_REMAP_FULLREMAP_Pos) /*!< 0x00000030 */ +#define AFIO_MAPR_USART3_REMAP_FULLREMAP AFIO_MAPR_USART3_REMAP_FULLREMAP_Msk /*!< Full remap (TX/PD8, RX/PD9, CK/PD10, CTS/PD11, RTS/PD12) */ #define AFIO_MAPR_TIM1_REMAP_Pos (6U) #define AFIO_MAPR_TIM1_REMAP_Msk (0x3UL << AFIO_MAPR_TIM1_REMAP_Pos) /*!< 0x000000C0 */ @@ -2048,6 +2107,9 @@ typedef struct #define AFIO_MAPR_TIM3_REMAP_FULLREMAP_Msk (0x3UL << AFIO_MAPR_TIM3_REMAP_FULLREMAP_Pos) /*!< 0x00000C00 */ #define AFIO_MAPR_TIM3_REMAP_FULLREMAP AFIO_MAPR_TIM3_REMAP_FULLREMAP_Msk /*!< Full remap (CH1/PC6, CH2/PC7, CH3/PC8, CH4/PC9) */ +#define AFIO_MAPR_TIM4_REMAP_Pos (12U) +#define AFIO_MAPR_TIM4_REMAP_Msk (0x1UL << AFIO_MAPR_TIM4_REMAP_Pos) /*!< 0x00001000 */ +#define AFIO_MAPR_TIM4_REMAP AFIO_MAPR_TIM4_REMAP_Msk /*!< TIM4_REMAP bit (TIM4 remapping) */ #define AFIO_MAPR_CAN_REMAP_Pos (13U) #define AFIO_MAPR_CAN_REMAP_Msk (0x3UL << AFIO_MAPR_CAN_REMAP_Pos) /*!< 0x00006000 */ @@ -9600,12 +9662,18 @@ typedef struct #define DBGMCU_CR_DBG_TIM3_STOP_Pos (12U) #define DBGMCU_CR_DBG_TIM3_STOP_Msk (0x1UL << DBGMCU_CR_DBG_TIM3_STOP_Pos) /*!< 0x00001000 */ #define DBGMCU_CR_DBG_TIM3_STOP DBGMCU_CR_DBG_TIM3_STOP_Msk /*!< TIM3 counter stopped when core is halted */ +#define DBGMCU_CR_DBG_TIM4_STOP_Pos (13U) +#define DBGMCU_CR_DBG_TIM4_STOP_Msk (0x1UL << DBGMCU_CR_DBG_TIM4_STOP_Pos) /*!< 0x00002000 */ +#define DBGMCU_CR_DBG_TIM4_STOP DBGMCU_CR_DBG_TIM4_STOP_Msk /*!< TIM4 counter stopped when core is halted */ #define DBGMCU_CR_DBG_CAN1_STOP_Pos (14U) #define DBGMCU_CR_DBG_CAN1_STOP_Msk (0x1UL << DBGMCU_CR_DBG_CAN1_STOP_Pos) /*!< 0x00004000 */ #define DBGMCU_CR_DBG_CAN1_STOP DBGMCU_CR_DBG_CAN1_STOP_Msk /*!< Debug CAN1 stopped when Core is halted */ #define DBGMCU_CR_DBG_I2C1_SMBUS_TIMEOUT_Pos (15U) #define DBGMCU_CR_DBG_I2C1_SMBUS_TIMEOUT_Msk (0x1UL << DBGMCU_CR_DBG_I2C1_SMBUS_TIMEOUT_Pos) /*!< 0x00008000 */ #define DBGMCU_CR_DBG_I2C1_SMBUS_TIMEOUT DBGMCU_CR_DBG_I2C1_SMBUS_TIMEOUT_Msk /*!< SMBUS timeout mode stopped when Core is halted */ +#define DBGMCU_CR_DBG_I2C2_SMBUS_TIMEOUT_Pos (16U) +#define DBGMCU_CR_DBG_I2C2_SMBUS_TIMEOUT_Msk (0x1UL << DBGMCU_CR_DBG_I2C2_SMBUS_TIMEOUT_Pos) /*!< 0x00010000 */ +#define DBGMCU_CR_DBG_I2C2_SMBUS_TIMEOUT DBGMCU_CR_DBG_I2C2_SMBUS_TIMEOUT_Msk /*!< SMBUS timeout mode stopped when Core is halted */ /******************************************************************************/ /* */ @@ -9778,6 +9846,30 @@ typedef struct #define FLASH_WRP0_nWRP0_Msk (0xFFUL << FLASH_WRP0_nWRP0_Pos) /*!< 0x0000FF00 */ #define FLASH_WRP0_nWRP0 FLASH_WRP0_nWRP0_Msk /*!< Flash memory write protection complemented option bytes */ +/****************** Bit definition for FLASH_WRP1 register ******************/ +#define FLASH_WRP1_WRP1_Pos (16U) +#define FLASH_WRP1_WRP1_Msk (0xFFUL << FLASH_WRP1_WRP1_Pos) /*!< 0x00FF0000 */ +#define FLASH_WRP1_WRP1 FLASH_WRP1_WRP1_Msk /*!< Flash memory write protection option bytes */ +#define FLASH_WRP1_nWRP1_Pos (24U) +#define FLASH_WRP1_nWRP1_Msk (0xFFUL << FLASH_WRP1_nWRP1_Pos) /*!< 0xFF000000 */ +#define FLASH_WRP1_nWRP1 FLASH_WRP1_nWRP1_Msk /*!< Flash memory write protection complemented option bytes */ + +/****************** Bit definition for FLASH_WRP2 register ******************/ +#define FLASH_WRP2_WRP2_Pos (0U) +#define FLASH_WRP2_WRP2_Msk (0xFFUL << FLASH_WRP2_WRP2_Pos) /*!< 0x000000FF */ +#define FLASH_WRP2_WRP2 FLASH_WRP2_WRP2_Msk /*!< Flash memory write protection option bytes */ +#define FLASH_WRP2_nWRP2_Pos (8U) +#define FLASH_WRP2_nWRP2_Msk (0xFFUL << FLASH_WRP2_nWRP2_Pos) /*!< 0x0000FF00 */ +#define FLASH_WRP2_nWRP2 FLASH_WRP2_nWRP2_Msk /*!< Flash memory write protection complemented option bytes */ + +/****************** Bit definition for FLASH_WRP3 register ******************/ +#define FLASH_WRP3_WRP3_Pos (16U) +#define FLASH_WRP3_WRP3_Msk (0xFFUL << FLASH_WRP3_WRP3_Pos) /*!< 0x00FF0000 */ +#define FLASH_WRP3_WRP3 FLASH_WRP3_WRP3_Msk /*!< Flash memory write protection option bytes */ +#define FLASH_WRP3_nWRP3_Pos (24U) +#define FLASH_WRP3_nWRP3_Msk (0xFFUL << FLASH_WRP3_nWRP3_Pos) /*!< 0xFF000000 */ +#define FLASH_WRP3_nWRP3 FLASH_WRP3_nWRP3_Msk /*!< Flash memory write protection complemented option bytes */ + /** @@ -9823,7 +9915,8 @@ typedef struct #define IS_GPIO_ALL_INSTANCE(INSTANCE) (((INSTANCE) == GPIOA) || \ ((INSTANCE) == GPIOB) || \ ((INSTANCE) == GPIOC) || \ - ((INSTANCE) == GPIOD)) + ((INSTANCE) == GPIOD) || \ + ((INSTANCE) == GPIOE)) /**************************** GPIO Alternate Function Instances ***************/ #define IS_GPIO_AF_INSTANCE(INSTANCE) IS_GPIO_ALL_INSTANCE(INSTANCE) @@ -9832,7 +9925,8 @@ typedef struct #define IS_GPIO_LOCK_INSTANCE(INSTANCE) IS_GPIO_ALL_INSTANCE(INSTANCE) /******************************** I2C Instances *******************************/ -#define IS_I2C_ALL_INSTANCE(INSTANCE) ((INSTANCE) == I2C1) +#define IS_I2C_ALL_INSTANCE(INSTANCE) (((INSTANCE) == I2C1) || \ + ((INSTANCE) == I2C2)) /******************************* SMBUS Instances ******************************/ #define IS_SMBUS_ALL_INSTANCE IS_I2C_ALL_INSTANCE @@ -9841,86 +9935,102 @@ typedef struct #define IS_IWDG_ALL_INSTANCE(INSTANCE) ((INSTANCE) == IWDG) /******************************** SPI Instances *******************************/ -#define IS_SPI_ALL_INSTANCE(INSTANCE) ((INSTANCE) == SPI1) +#define IS_SPI_ALL_INSTANCE(INSTANCE) (((INSTANCE) == SPI1) || \ + ((INSTANCE) == SPI2)) /****************************** START TIM Instances ***************************/ /****************************** TIM Instances *********************************/ #define IS_TIM_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM1) || \ ((INSTANCE) == TIM2) || \ - ((INSTANCE) == TIM3)) + ((INSTANCE) == TIM3) || \ + ((INSTANCE) == TIM4)) #define IS_TIM_ADVANCED_INSTANCE(INSTANCE) ((INSTANCE) == TIM1) #define IS_TIM_CC1_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM1) || \ ((INSTANCE) == TIM2) || \ - ((INSTANCE) == TIM3)) + ((INSTANCE) == TIM3) || \ + ((INSTANCE) == TIM4)) #define IS_TIM_CC2_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM1) || \ ((INSTANCE) == TIM2) || \ - ((INSTANCE) == TIM3)) + ((INSTANCE) == TIM3) || \ + ((INSTANCE) == TIM4)) #define IS_TIM_CC3_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM1) || \ ((INSTANCE) == TIM2) || \ - ((INSTANCE) == TIM3)) + ((INSTANCE) == TIM3) || \ + ((INSTANCE) == TIM4)) #define IS_TIM_CC4_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM1) || \ ((INSTANCE) == TIM2) || \ - ((INSTANCE) == TIM3)) + ((INSTANCE) == TIM3) || \ + ((INSTANCE) == TIM4)) #define IS_TIM_CLOCKSOURCE_ETRMODE1_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM1) || \ ((INSTANCE) == TIM2) || \ - ((INSTANCE) == TIM3)) + ((INSTANCE) == TIM3) || \ + ((INSTANCE) == TIM4)) #define IS_TIM_CLOCKSOURCE_ETRMODE2_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM1) || \ ((INSTANCE) == TIM2) || \ - ((INSTANCE) == TIM3)) + ((INSTANCE) == TIM3) || \ + ((INSTANCE) == TIM4)) #define IS_TIM_CLOCKSOURCE_TIX_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM1) || \ ((INSTANCE) == TIM2) || \ - ((INSTANCE) == TIM3)) + ((INSTANCE) == TIM3) || \ + ((INSTANCE) == TIM4)) #define IS_TIM_CLOCKSOURCE_ITRX_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM1) || \ ((INSTANCE) == TIM2) || \ - ((INSTANCE) == TIM3)) + ((INSTANCE) == TIM3) || \ + ((INSTANCE) == TIM4)) #define IS_TIM_OCXREF_CLEAR_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM1) || \ ((INSTANCE) == TIM2) || \ - ((INSTANCE) == TIM3)) + ((INSTANCE) == TIM3) || \ + ((INSTANCE) == TIM4)) #define IS_TIM_ENCODER_INTERFACE_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM1) || \ ((INSTANCE) == TIM2) || \ - ((INSTANCE) == TIM3)) + ((INSTANCE) == TIM3) || \ + ((INSTANCE) == TIM4)) #define IS_TIM_XOR_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM1) || \ ((INSTANCE) == TIM2) || \ - ((INSTANCE) == TIM3)) + ((INSTANCE) == TIM3) || \ + ((INSTANCE) == TIM4)) #define IS_TIM_MASTER_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM1) || \ ((INSTANCE) == TIM2) || \ - ((INSTANCE) == TIM3)) + ((INSTANCE) == TIM3) || \ + ((INSTANCE) == TIM4)) #define IS_TIM_SLAVE_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM1) || \ ((INSTANCE) == TIM2) || \ - ((INSTANCE) == TIM3)) + ((INSTANCE) == TIM3) || \ + ((INSTANCE) == TIM4)) #define IS_TIM_DMABURST_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM1) || \ ((INSTANCE) == TIM2) || \ - ((INSTANCE) == TIM3)) + ((INSTANCE) == TIM3) || \ + ((INSTANCE) == TIM4)) #define IS_TIM_BREAK_INSTANCE(INSTANCE)\ ((INSTANCE) == TIM1) @@ -9939,6 +10049,12 @@ typedef struct ((CHANNEL) == TIM_CHANNEL_4))) \ || \ (((INSTANCE) == TIM3) && \ + (((CHANNEL) == TIM_CHANNEL_1) || \ + ((CHANNEL) == TIM_CHANNEL_2) || \ + ((CHANNEL) == TIM_CHANNEL_3) || \ + ((CHANNEL) == TIM_CHANNEL_4))) \ + || \ + (((INSTANCE) == TIM4) && \ (((CHANNEL) == TIM_CHANNEL_1) || \ ((CHANNEL) == TIM_CHANNEL_2) || \ ((CHANNEL) == TIM_CHANNEL_3) || \ @@ -9953,7 +10069,8 @@ typedef struct #define IS_TIM_COUNTER_MODE_SELECT_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM1) || \ ((INSTANCE) == TIM2) || \ - ((INSTANCE) == TIM3)) + ((INSTANCE) == TIM3) || \ + ((INSTANCE) == TIM4)) #define IS_TIM_REPETITION_COUNTER_INSTANCE(INSTANCE)\ ((INSTANCE) == TIM1) @@ -9961,28 +10078,33 @@ typedef struct #define IS_TIM_CLOCK_DIVISION_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM1) || \ ((INSTANCE) == TIM2) || \ - ((INSTANCE) == TIM3)) + ((INSTANCE) == TIM3) || \ + ((INSTANCE) == TIM4)) #define IS_TIM_DMA_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM1) || \ ((INSTANCE) == TIM2) || \ - ((INSTANCE) == TIM3)) + ((INSTANCE) == TIM3) || \ + ((INSTANCE) == TIM4)) #define IS_TIM_DMA_CC_INSTANCE(INSTANCE)\ (((INSTANCE) == TIM1) || \ ((INSTANCE) == TIM2) || \ - ((INSTANCE) == TIM3)) + ((INSTANCE) == TIM3) || \ + ((INSTANCE) == TIM4)) #define IS_TIM_COMMUTATION_EVENT_INSTANCE(INSTANCE)\ ((INSTANCE) == TIM1) #define IS_TIM_ETR_INSTANCE(INSTANCE) (((INSTANCE) == TIM1) || \ ((INSTANCE) == TIM2) || \ - ((INSTANCE) == TIM3)) + ((INSTANCE) == TIM3) || \ + ((INSTANCE) == TIM4)) #define IS_TIM_HALL_SENSOR_INTERFACE_INSTANCE(INSTANCE) (((INSTANCE) == TIM1) || \ ((INSTANCE) == TIM2) || \ - ((INSTANCE) == TIM3)) + ((INSTANCE) == TIM3) || \ + ((INSTANCE) == TIM4)) #define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE) 0U @@ -9991,39 +10113,48 @@ typedef struct /******************** USART Instances : Synchronous mode **********************/ #define IS_USART_INSTANCE(INSTANCE) (((INSTANCE) == USART1) || \ - ((INSTANCE) == USART2)) + ((INSTANCE) == USART2) || \ + ((INSTANCE) == USART3)) /******************** UART Instances : Asynchronous mode **********************/ #define IS_UART_INSTANCE(INSTANCE) (((INSTANCE) == USART1) || \ - ((INSTANCE) == USART2) ) + ((INSTANCE) == USART2) || \ + ((INSTANCE) == USART3)) /******************** UART Instances : Half-Duplex mode **********************/ #define IS_UART_HALFDUPLEX_INSTANCE(INSTANCE) (((INSTANCE) == USART1) || \ - ((INSTANCE) == USART2) ) + ((INSTANCE) == USART2) || \ + ((INSTANCE) == USART3)) /******************** UART Instances : LIN mode **********************/ #define IS_UART_LIN_INSTANCE(INSTANCE) (((INSTANCE) == USART1) || \ - ((INSTANCE) == USART2) ) + ((INSTANCE) == USART2) || \ + ((INSTANCE) == USART3)) /****************** UART Instances : Hardware Flow control ********************/ #define IS_UART_HWFLOW_INSTANCE(INSTANCE) (((INSTANCE) == USART1) || \ - ((INSTANCE) == USART2) ) + ((INSTANCE) == USART2) || \ + ((INSTANCE) == USART3)) /********************* UART Instances : Smard card mode ***********************/ #define IS_SMARTCARD_INSTANCE(INSTANCE) (((INSTANCE) == USART1) || \ - ((INSTANCE) == USART2) ) + ((INSTANCE) == USART2) || \ + ((INSTANCE) == USART3)) /*********************** UART Instances : IRDA mode ***************************/ #define IS_IRDA_INSTANCE(INSTANCE) (((INSTANCE) == USART1) || \ - ((INSTANCE) == USART2) ) + ((INSTANCE) == USART2) || \ + ((INSTANCE) == USART3)) /***************** UART Instances : Multi-Processor mode **********************/ #define IS_UART_MULTIPROCESSOR_INSTANCE(INSTANCE) (((INSTANCE) == USART1) || \ - ((INSTANCE) == USART2) ) + ((INSTANCE) == USART2) || \ + ((INSTANCE) == USART3)) /***************** UART Instances : DMA mode available **********************/ #define IS_UART_DMA_INSTANCE(INSTANCE) (((INSTANCE) == USART1) || \ - ((INSTANCE) == USART2)) + ((INSTANCE) == USART2) || \ + ((INSTANCE) == USART3)) /****************************** RTC Instances *********************************/ #define IS_RTC_ALL_INSTANCE(INSTANCE) ((INSTANCE) == RTC) @@ -10054,40 +10185,40 @@ typedef struct /* Aliases for __IRQn */ #define ADC1_IRQn ADC1_2_IRQn +#define TIM9_IRQn TIM1_BRK_IRQn #define TIM1_BRK_TIM9_IRQn TIM1_BRK_IRQn #define TIM1_BRK_TIM15_IRQn TIM1_BRK_IRQn -#define TIM9_IRQn TIM1_BRK_IRQn -#define TIM1_TRG_COM_TIM11_IRQn TIM1_TRG_COM_IRQn #define TIM1_TRG_COM_TIM17_IRQn TIM1_TRG_COM_IRQn +#define TIM1_TRG_COM_TIM11_IRQn TIM1_TRG_COM_IRQn #define TIM11_IRQn TIM1_TRG_COM_IRQn -#define TIM1_UP_TIM10_IRQn TIM1_UP_IRQn #define TIM10_IRQn TIM1_UP_IRQn +#define TIM1_UP_TIM10_IRQn TIM1_UP_IRQn #define TIM1_UP_TIM16_IRQn TIM1_UP_IRQn -#define CEC_IRQn USBWakeUp_IRQn #define OTG_FS_WKUP_IRQn USBWakeUp_IRQn +#define CEC_IRQn USBWakeUp_IRQn #define USB_HP_IRQn USB_HP_CAN1_TX_IRQn #define CAN1_TX_IRQn USB_HP_CAN1_TX_IRQn -#define USB_LP_IRQn USB_LP_CAN1_RX0_IRQn #define CAN1_RX0_IRQn USB_LP_CAN1_RX0_IRQn +#define USB_LP_IRQn USB_LP_CAN1_RX0_IRQn /* Aliases for __IRQHandler */ #define ADC1_IRQHandler ADC1_2_IRQHandler +#define TIM9_IRQHandler TIM1_BRK_IRQHandler #define TIM1_BRK_TIM9_IRQHandler TIM1_BRK_IRQHandler #define TIM1_BRK_TIM15_IRQHandler TIM1_BRK_IRQHandler -#define TIM9_IRQHandler TIM1_BRK_IRQHandler -#define TIM1_TRG_COM_TIM11_IRQHandler TIM1_TRG_COM_IRQHandler #define TIM1_TRG_COM_TIM17_IRQHandler TIM1_TRG_COM_IRQHandler +#define TIM1_TRG_COM_TIM11_IRQHandler TIM1_TRG_COM_IRQHandler #define TIM11_IRQHandler TIM1_TRG_COM_IRQHandler -#define TIM1_UP_TIM10_IRQHandler TIM1_UP_IRQHandler #define TIM10_IRQHandler TIM1_UP_IRQHandler +#define TIM1_UP_TIM10_IRQHandler TIM1_UP_IRQHandler #define TIM1_UP_TIM16_IRQHandler TIM1_UP_IRQHandler -#define CEC_IRQHandler USBWakeUp_IRQHandler #define OTG_FS_WKUP_IRQHandler USBWakeUp_IRQHandler +#define CEC_IRQHandler USBWakeUp_IRQHandler #define USB_HP_IRQHandler USB_HP_CAN1_TX_IRQHandler #define CAN1_TX_IRQHandler USB_HP_CAN1_TX_IRQHandler -#define USB_LP_IRQHandler USB_LP_CAN1_RX0_IRQHandler #define CAN1_RX0_IRQHandler USB_LP_CAN1_RX0_IRQHandler +#define USB_LP_IRQHandler USB_LP_CAN1_RX0_IRQHandler /** @@ -10103,7 +10234,7 @@ typedef struct } #endif /* __cplusplus */ -#endif /* __STM32F103x6_H */ +#endif /* __STM32F103xB_H */ diff --git a/john103C6T6/EEPROM_Emul/lib/EEPROM_Emul.h b/john103C6T6/EEPROM_Emul/lib/EEPROM_Emul.h index f7c6bd8..8356d4d 100644 --- a/john103C6T6/EEPROM_Emul/lib/EEPROM_Emul.h +++ b/john103C6T6/EEPROM_Emul/lib/EEPROM_Emul.h @@ -28,6 +28,13 @@ typedef struct { } EEPROM_Item; #pragma pack(pop) +typedef struct { + uint8_t data[EEPROM_SIZE]; // Массив для хранения данных + uint16_t head; // Указатель на место записи + uint16_t tail; // Указатель на место чтения +} RingBuffer_t; + + // Инициализация EEPROM EEPROM_Status EEPROM_Init(void); diff --git a/john103C6T6/EEPROM_Emul/lib/flash_ring.h b/john103C6T6/EEPROM_Emul/lib/flash_ring.h new file mode 100644 index 0000000..ed3c45a --- /dev/null +++ b/john103C6T6/EEPROM_Emul/lib/flash_ring.h @@ -0,0 +1,31 @@ +#ifndef FLASH_RING_H +#define FLASH_RING_H +#include "stm32f1xx_hal.h" + +//#define FLASH_PAGE_SIZE 1024 +#define NUM_OF_PAGE_EEPROM 2 +#define FLASH_START_ADDR 0x08000000 +#define FLASH_SIZE (64 * 1024) // для STM32F103C8 +#define LAST_PAGE_ADDR (FLASH_START_ADDR + FLASH_SIZE - NUM_OF_PAGE_EEPROM*FLASH_PAGE_SIZE) +#define RECORD_SIZE 255 +#define RECORDS_PER_PAGE NUM_OF_PAGE_EEPROM*(FLASH_PAGE_SIZE / RECORD_SIZE) // 10 записей + + +#pragma pack(push, 1) +typedef struct { + uint32_t timestamp; + uint8_t data[RECORD_SIZE-4]; // 200 - 4 байта timestamp +} FlashRecord_t; +#pragma pack(pop) + +typedef struct { + uint32_t write_index; // индекс следующей записи (0-9) + uint8_t initialized; // флаг инициализации +} BufferState_t; +BufferState_t buffer_init(void); +HAL_StatusTypeDef buffer_write_record(FlashRecord_t* record, BufferState_t* state); +HAL_StatusTypeDef erase_flash_page(void) ; +HAL_StatusTypeDef write_flash_record(uint32_t address, FlashRecord_t* record); +FlashRecord_t* buffer_read_record(uint32_t index); +void buffer_get_all_records(FlashRecord_t* records[], uint32_t* count); +#endif // FLASH_RING_H \ No newline at end of file diff --git a/john103C6T6/EEPROM_Emul/src/EEPROM_Emul.c b/john103C6T6/EEPROM_Emul/src/EEPROM_Emul.c index 462d6c2..0fea0e7 100644 --- a/john103C6T6/EEPROM_Emul/src/EEPROM_Emul.c +++ b/john103C6T6/EEPROM_Emul/src/EEPROM_Emul.c @@ -14,243 +14,284 @@ static uint8_t EEPROM_IsPageErased(uint32_t address); static uint32_t EEPROM_CalculateCRC(EEPROM_Item* item); // Инициализация EEPROM -EEPROM_Status EEPROM_Init(void) { - if (eeprom_initialized) { +EEPROM_Status EEPROM_Init(void) +{ + if (eeprom_initialized) + { return EEPROM_OK; } - + // Находим следующий адрес для записи eeprom_current_write_address = EEPROM_FindNextWriteAddress(); - + // Если вся память заполнена, выполняем сборку мусора (форматирование) - if (eeprom_current_write_address >= EEPROM_START_ADDRESS + EEPROM_SIZE) { + if (eeprom_current_write_address >= EEPROM_START_ADDRESS + EEPROM_SIZE) + { EEPROM_Format(); - } else { + } + else + { eeprom_initialized = 1; } - + return EEPROM_OK; } // Чтение данных по виртуальному адресу -EEPROM_Status EEPROM_Read(uint16_t virt_address, uint16_t* data) { - if (!eeprom_initialized) { +EEPROM_Status EEPROM_Read(uint16_t virt_address, uint16_t* data) +{ + if (!eeprom_initialized) + { return EEPROM_ERROR; } - - if (virt_address >= EEPROM_MAX_VARIABLES || data == NULL) { + + if (virt_address >= EEPROM_MAX_VARIABLES || data == NULL) + { return EEPROM_INVALID; } - + return EEPROM_FindLatestData(virt_address, data); } // Запись данных по виртуальному адресу -EEPROM_Status EEPROM_Write(uint16_t virt_address, uint16_t data) { +EEPROM_Status EEPROM_Write(uint16_t virt_address, uint16_t data) +{ EEPROM_Item item; - - if (!eeprom_initialized) { + + if (!eeprom_initialized) + { return EEPROM_ERROR; } - - if (virt_address >= EEPROM_MAX_VARIABLES) { + + if (virt_address >= EEPROM_MAX_VARIABLES) + { return EEPROM_INVALID; } - + // Подготавливаем элемент данных item.address = virt_address; item.data = data; item.timestamp = HAL_GetTick(); // Используем системный таймер - + // Записываем элемент return EEPROM_WriteItem(&item); } // Поиск последних данных для виртуального адреса -static EEPROM_Status EEPROM_FindLatestData(uint16_t virt_address, uint16_t* data) { +static EEPROM_Status EEPROM_FindLatestData(uint16_t virt_address, uint16_t* data) +{ uint32_t address = EEPROM_START_ADDRESS; EEPROM_Item current_item; uint32_t latest_timestamp = 0; uint16_t latest_data = 0; uint8_t data_found = 0; - + // Сканируем всю область EEPROM - while (address < EEPROM_START_ADDRESS + EEPROM_SIZE) { + while (address < EEPROM_START_ADDRESS + EEPROM_SIZE) + { // Читаем элемент memcpy(¤t_item, (void*)address, sizeof(EEPROM_Item)); - + // Проверяем, является ли это валидными данными - if (current_item.address == virt_address) { - if (current_item.timestamp >= latest_timestamp) { + if (current_item.address == virt_address) + { + if (current_item.timestamp >= latest_timestamp) + { latest_timestamp = current_item.timestamp; latest_data = current_item.data; data_found = 1; } } - + address += sizeof(EEPROM_Item); - + // Проверяем конец страницы - if ((address - EEPROM_START_ADDRESS) % EEPROM_PAGE_SIZE == 0) { + if ((address - EEPROM_START_ADDRESS) % EEPROM_PAGE_SIZE == 0) + { address += (EEPROM_PAGE_SIZE - (sizeof(EEPROM_Item) * 2)); } } - - if (data_found) { + + if (data_found) + { *data = latest_data; return EEPROM_OK; } - + return EEPROM_INVALID; } // Запись элемента в EEPROM -static EEPROM_Status EEPROM_WriteItem(EEPROM_Item* item) { +static EEPROM_Status EEPROM_WriteItem(EEPROM_Item* item) +{ HAL_StatusTypeDef hal_status; - + // Проверяем, нужно ли стирать страницу - if ((eeprom_current_write_address - EEPROM_START_ADDRESS) % EEPROM_PAGE_SIZE == 0) { - if (!EEPROM_IsPageErased(eeprom_current_write_address)) { - if (EEPROM_ErasePage(eeprom_current_write_address) != EEPROM_OK) { + if ((eeprom_current_write_address - EEPROM_START_ADDRESS) % EEPROM_PAGE_SIZE == 0) + { + if (!EEPROM_IsPageErased(eeprom_current_write_address)) + { + if (EEPROM_ErasePage(eeprom_current_write_address) != EEPROM_OK) + { return EEPROM_ERROR; } } } - + // Разблокируем Flash HAL_FLASH_Unlock(); - + // Записываем данные по словам (32 бита) uint32_t* data_ptr = (uint32_t*)item; - - for (uint8_t i = 0; i < sizeof(EEPROM_Item) / 4; i++) { - hal_status = HAL_FLASH_Program(FLASH_TYPEPROGRAM_WORD, - eeprom_current_write_address + (i * 4), - data_ptr[i]); - - if (hal_status != HAL_OK) { + + for (uint8_t i = 0; i < sizeof(EEPROM_Item) / 4; i++) + { + hal_status = HAL_FLASH_Program(FLASH_TYPEPROGRAM_WORD, + eeprom_current_write_address + (i * 4), + data_ptr[i]); + + if (hal_status != HAL_OK) + { HAL_FLASH_Lock(); return EEPROM_ERROR; } } - + // Блокируем Flash HAL_FLASH_Lock(); - + // Обновляем адрес для следующей записи eeprom_current_write_address += sizeof(EEPROM_Item); - + // Проверяем переполнение - if (eeprom_current_write_address >= EEPROM_START_ADDRESS + EEPROM_SIZE) { + if (eeprom_current_write_address >= EEPROM_START_ADDRESS + EEPROM_SIZE) + { // Выполняем сборку мусора (в данном случае - форматирование) EEPROM_Format(); } - + return EEPROM_OK; } // Стирание страницы Flash -static EEPROM_Status EEPROM_ErasePage(uint32_t address) { +static EEPROM_Status EEPROM_ErasePage(uint32_t address) +{ FLASH_EraseInitTypeDef erase; uint32_t page_error; - + // Определяем номер страницы uint32_t page = (address - FLASH_BASE) / EEPROM_PAGE_SIZE; - + HAL_FLASH_Unlock(); - + erase.TypeErase = FLASH_TYPEERASE_PAGES; erase.PageAddress = address; erase.NbPages = 1; - - if (HAL_FLASHEx_Erase(&erase, &page_error) != HAL_OK) { + + if (HAL_FLASHEx_Erase(&erase, &page_error) != HAL_OK) + { HAL_FLASH_Lock(); return EEPROM_ERROR; } - + HAL_FLASH_Lock(); return EEPROM_OK; } // Поиск следующего адреса для записи -static uint32_t EEPROM_FindNextWriteAddress(void) { +static uint32_t EEPROM_FindNextWriteAddress(void) +{ uint32_t address = EEPROM_START_ADDRESS; EEPROM_Item item; - + // Ищем первую свободную позицию - while (address < EEPROM_START_ADDRESS + EEPROM_SIZE) { + while (address < EEPROM_START_ADDRESS + EEPROM_SIZE) + { memcpy(&item, (void*)address, sizeof(EEPROM_Item)); - + // Если нашли пустой элемент (все FFFF), это свободная позиция - if (item.address == 0xFFFF && item.data == 0xFFFF && item.timestamp == 0xFFFFFFFF) { + if (item.address == 0xFFFF && item.data == 0xFFFF && item.timestamp == 0xFFFFFFFF) + { break; } - + address += sizeof(EEPROM_Item); - + // Проверяем границу страницы - if ((address - EEPROM_START_ADDRESS) % EEPROM_PAGE_SIZE == 0) { + if ((address - EEPROM_START_ADDRESS) % EEPROM_PAGE_SIZE == 0) + { address += (EEPROM_PAGE_SIZE - (sizeof(EEPROM_Item) * 2)); } } - + return address; } // Проверка, стерта ли страница -static uint8_t EEPROM_IsPageErased(uint32_t address) { +static uint8_t EEPROM_IsPageErased(uint32_t address) +{ uint32_t* check_addr = (uint32_t*)address; - + // Проверяем первые несколько слов - for (uint8_t i = 0; i < 8; i++) { - if (check_addr[i] != 0xFFFFFFFF) { + for (uint8_t i = 0; i < 8; i++) + { + if (check_addr[i] != 0xFFFFFFFF) + { return 0; } } - + return 1; } // Полное форматирование EEPROM -EEPROM_Status EEPROM_Format(void) { +EEPROM_Status EEPROM_Format(void) +{ uint32_t address = EEPROM_START_ADDRESS; - + // Стираем все страницы, используемые для EEPROM - while (address < EEPROM_START_ADDRESS + EEPROM_SIZE) { - if (EEPROM_ErasePage(address) != EEPROM_OK) { + while (address < EEPROM_START_ADDRESS + EEPROM_SIZE) + { + if (EEPROM_ErasePage(address) != EEPROM_OK) + { return EEPROM_ERROR; } address += EEPROM_PAGE_SIZE; } - + eeprom_current_write_address = EEPROM_START_ADDRESS; eeprom_initialized = 1; - + return EEPROM_OK; } // Получение информации об использовании EEPROM -void EEPROM_GetInfo(uint32_t* used, uint32_t* total) { +void EEPROM_GetInfo(uint32_t* used, uint32_t* total) +{ uint32_t address = EEPROM_START_ADDRESS; uint32_t used_bytes = 0; - - if (used) { + + if (used) + { // Подсчитываем использованные байты - while (address < EEPROM_START_ADDRESS + EEPROM_SIZE) { + while (address < EEPROM_START_ADDRESS + EEPROM_SIZE) + { EEPROM_Item item; memcpy(&item, (void*)address, sizeof(EEPROM_Item)); - - if (item.address != 0xFFFF || item.data != 0xFFFF || item.timestamp != 0xFFFFFFFF) { + + if (item.address != 0xFFFF || item.data != 0xFFFF || item.timestamp != 0xFFFFFFFF) + { used_bytes += sizeof(EEPROM_Item); } - + address += sizeof(EEPROM_Item); } - + *used = used_bytes; } - - if (total) { + + if (total) + { *total = EEPROM_SIZE; } } \ No newline at end of file diff --git a/john103C6T6/EEPROM_Emul/src/EEPROM_Emul.c.orig b/john103C6T6/EEPROM_Emul/src/EEPROM_Emul.c.orig new file mode 100644 index 0000000..462d6c2 --- /dev/null +++ b/john103C6T6/EEPROM_Emul/src/EEPROM_Emul.c.orig @@ -0,0 +1,256 @@ +#include "eeprom_emul.h" +#include + +// Внутренние переменные +static uint32_t eeprom_current_write_address = EEPROM_START_ADDRESS; +static uint8_t eeprom_initialized = 0; + +// Прототипы внутренних функций +static EEPROM_Status EEPROM_FindLatestData(uint16_t virt_address, uint16_t* data); +static EEPROM_Status EEPROM_WriteItem(EEPROM_Item* item); +static EEPROM_Status EEPROM_ErasePage(uint32_t address); +static uint32_t EEPROM_FindNextWriteAddress(void); +static uint8_t EEPROM_IsPageErased(uint32_t address); +static uint32_t EEPROM_CalculateCRC(EEPROM_Item* item); + +// Инициализация EEPROM +EEPROM_Status EEPROM_Init(void) { + if (eeprom_initialized) { + return EEPROM_OK; + } + + // Находим следующий адрес для записи + eeprom_current_write_address = EEPROM_FindNextWriteAddress(); + + // Если вся память заполнена, выполняем сборку мусора (форматирование) + if (eeprom_current_write_address >= EEPROM_START_ADDRESS + EEPROM_SIZE) { + EEPROM_Format(); + } else { + eeprom_initialized = 1; + } + + return EEPROM_OK; +} + +// Чтение данных по виртуальному адресу +EEPROM_Status EEPROM_Read(uint16_t virt_address, uint16_t* data) { + if (!eeprom_initialized) { + return EEPROM_ERROR; + } + + if (virt_address >= EEPROM_MAX_VARIABLES || data == NULL) { + return EEPROM_INVALID; + } + + return EEPROM_FindLatestData(virt_address, data); +} + +// Запись данных по виртуальному адресу +EEPROM_Status EEPROM_Write(uint16_t virt_address, uint16_t data) { + EEPROM_Item item; + + if (!eeprom_initialized) { + return EEPROM_ERROR; + } + + if (virt_address >= EEPROM_MAX_VARIABLES) { + return EEPROM_INVALID; + } + + // Подготавливаем элемент данных + item.address = virt_address; + item.data = data; + item.timestamp = HAL_GetTick(); // Используем системный таймер + + // Записываем элемент + return EEPROM_WriteItem(&item); +} + +// Поиск последних данных для виртуального адреса +static EEPROM_Status EEPROM_FindLatestData(uint16_t virt_address, uint16_t* data) { + uint32_t address = EEPROM_START_ADDRESS; + EEPROM_Item current_item; + uint32_t latest_timestamp = 0; + uint16_t latest_data = 0; + uint8_t data_found = 0; + + // Сканируем всю область EEPROM + while (address < EEPROM_START_ADDRESS + EEPROM_SIZE) { + // Читаем элемент + memcpy(¤t_item, (void*)address, sizeof(EEPROM_Item)); + + // Проверяем, является ли это валидными данными + if (current_item.address == virt_address) { + if (current_item.timestamp >= latest_timestamp) { + latest_timestamp = current_item.timestamp; + latest_data = current_item.data; + data_found = 1; + } + } + + address += sizeof(EEPROM_Item); + + // Проверяем конец страницы + if ((address - EEPROM_START_ADDRESS) % EEPROM_PAGE_SIZE == 0) { + address += (EEPROM_PAGE_SIZE - (sizeof(EEPROM_Item) * 2)); + } + } + + if (data_found) { + *data = latest_data; + return EEPROM_OK; + } + + return EEPROM_INVALID; +} + +// Запись элемента в EEPROM +static EEPROM_Status EEPROM_WriteItem(EEPROM_Item* item) { + HAL_StatusTypeDef hal_status; + + // Проверяем, нужно ли стирать страницу + if ((eeprom_current_write_address - EEPROM_START_ADDRESS) % EEPROM_PAGE_SIZE == 0) { + if (!EEPROM_IsPageErased(eeprom_current_write_address)) { + if (EEPROM_ErasePage(eeprom_current_write_address) != EEPROM_OK) { + return EEPROM_ERROR; + } + } + } + + // Разблокируем Flash + HAL_FLASH_Unlock(); + + // Записываем данные по словам (32 бита) + uint32_t* data_ptr = (uint32_t*)item; + + for (uint8_t i = 0; i < sizeof(EEPROM_Item) / 4; i++) { + hal_status = HAL_FLASH_Program(FLASH_TYPEPROGRAM_WORD, + eeprom_current_write_address + (i * 4), + data_ptr[i]); + + if (hal_status != HAL_OK) { + HAL_FLASH_Lock(); + return EEPROM_ERROR; + } + } + + // Блокируем Flash + HAL_FLASH_Lock(); + + // Обновляем адрес для следующей записи + eeprom_current_write_address += sizeof(EEPROM_Item); + + // Проверяем переполнение + if (eeprom_current_write_address >= EEPROM_START_ADDRESS + EEPROM_SIZE) { + // Выполняем сборку мусора (в данном случае - форматирование) + EEPROM_Format(); + } + + return EEPROM_OK; +} + +// Стирание страницы Flash +static EEPROM_Status EEPROM_ErasePage(uint32_t address) { + FLASH_EraseInitTypeDef erase; + uint32_t page_error; + + // Определяем номер страницы + uint32_t page = (address - FLASH_BASE) / EEPROM_PAGE_SIZE; + + HAL_FLASH_Unlock(); + + erase.TypeErase = FLASH_TYPEERASE_PAGES; + erase.PageAddress = address; + erase.NbPages = 1; + + if (HAL_FLASHEx_Erase(&erase, &page_error) != HAL_OK) { + HAL_FLASH_Lock(); + return EEPROM_ERROR; + } + + HAL_FLASH_Lock(); + return EEPROM_OK; +} + +// Поиск следующего адреса для записи +static uint32_t EEPROM_FindNextWriteAddress(void) { + uint32_t address = EEPROM_START_ADDRESS; + EEPROM_Item item; + + // Ищем первую свободную позицию + while (address < EEPROM_START_ADDRESS + EEPROM_SIZE) { + memcpy(&item, (void*)address, sizeof(EEPROM_Item)); + + // Если нашли пустой элемент (все FFFF), это свободная позиция + if (item.address == 0xFFFF && item.data == 0xFFFF && item.timestamp == 0xFFFFFFFF) { + break; + } + + address += sizeof(EEPROM_Item); + + // Проверяем границу страницы + if ((address - EEPROM_START_ADDRESS) % EEPROM_PAGE_SIZE == 0) { + address += (EEPROM_PAGE_SIZE - (sizeof(EEPROM_Item) * 2)); + } + } + + return address; +} + +// Проверка, стерта ли страница +static uint8_t EEPROM_IsPageErased(uint32_t address) { + uint32_t* check_addr = (uint32_t*)address; + + // Проверяем первые несколько слов + for (uint8_t i = 0; i < 8; i++) { + if (check_addr[i] != 0xFFFFFFFF) { + return 0; + } + } + + return 1; +} + +// Полное форматирование EEPROM +EEPROM_Status EEPROM_Format(void) { + uint32_t address = EEPROM_START_ADDRESS; + + // Стираем все страницы, используемые для EEPROM + while (address < EEPROM_START_ADDRESS + EEPROM_SIZE) { + if (EEPROM_ErasePage(address) != EEPROM_OK) { + return EEPROM_ERROR; + } + address += EEPROM_PAGE_SIZE; + } + + eeprom_current_write_address = EEPROM_START_ADDRESS; + eeprom_initialized = 1; + + return EEPROM_OK; +} + +// Получение информации об использовании EEPROM +void EEPROM_GetInfo(uint32_t* used, uint32_t* total) { + uint32_t address = EEPROM_START_ADDRESS; + uint32_t used_bytes = 0; + + if (used) { + // Подсчитываем использованные байты + while (address < EEPROM_START_ADDRESS + EEPROM_SIZE) { + EEPROM_Item item; + memcpy(&item, (void*)address, sizeof(EEPROM_Item)); + + if (item.address != 0xFFFF || item.data != 0xFFFF || item.timestamp != 0xFFFFFFFF) { + used_bytes += sizeof(EEPROM_Item); + } + + address += sizeof(EEPROM_Item); + } + + *used = used_bytes; + } + + if (total) { + *total = EEPROM_SIZE; + } +} \ No newline at end of file diff --git a/john103C6T6/EEPROM_Emul/src/flash_ring.c b/john103C6T6/EEPROM_Emul/src/flash_ring.c new file mode 100644 index 0000000..bfa2809 --- /dev/null +++ b/john103C6T6/EEPROM_Emul/src/flash_ring.c @@ -0,0 +1,123 @@ +#include "flash_ring.h" + +extern int last_page_addr; + + + + +BufferState_t buffer_init(void) { + BufferState_t state = {0}; + + // Ищем последнюю записанную запись + for (int i = 0; i < RECORDS_PER_PAGE; i++) { + uint32_t record_addr = LAST_PAGE_ADDR + (i * RECORD_SIZE); + FlashRecord_t* record = (FlashRecord_t*)record_addr; + + // Проверяем валидность записи (не 0xFFFFFFFF) + if (record->timestamp != 0xFFFFFFFF) { + state.write_index = i + 1; + state.initialized = 1; + } else { + break; + } + } + + // Если буфер заполнен, начинаем с начала + if (state.write_index >= RECORDS_PER_PAGE) { + state.write_index = 0; + } + + return state; +} + +HAL_StatusTypeDef buffer_write_record(FlashRecord_t* record, BufferState_t* state) { + HAL_StatusTypeDef status; + + // Если нужно стереть страницу (начало нового цикла) + if (state->write_index == 0 && state->initialized) { + status = erase_flash_page(); + if (status != HAL_OK) return status; + } + + // Записываем данные + uint32_t record_addr = last_page_addr + (state->write_index * RECORD_SIZE); + + status = write_flash_record(record_addr, record); + if (status != HAL_OK) return status; + + // Обновляем индекс + state->write_index++; + if (state->write_index >= RECORDS_PER_PAGE) { + state->write_index = 0; + } + + state->initialized = 1; + return HAL_OK; +} + +HAL_StatusTypeDef erase_flash_page(void) { + HAL_FLASH_Unlock(); + + FLASH_EraseInitTypeDef EraseInit = { + .TypeErase = FLASH_TYPEERASE_PAGES, + .PageAddress = LAST_PAGE_ADDR, + .NbPages = 1 + }; + + uint32_t page_error; + HAL_StatusTypeDef status = HAL_FLASHEx_Erase(&EraseInit, &page_error); + + HAL_FLASH_Lock(); + return status; +} +// Запись одной записи +HAL_StatusTypeDef write_flash_record(uint32_t address, FlashRecord_t* record) { + HAL_FLASH_Unlock(); + HAL_StatusTypeDef status = HAL_OK; + + // Записываем данные по 4 байта (слово) + uint32_t* data_ptr = (uint32_t*)record; + uint32_t words_to_write = (RECORD_SIZE + 3) / 4; // округление вверх + + for (uint32_t i = 0; i < words_to_write; i++) { + status = HAL_FLASH_Program(FLASH_TYPEPROGRAM_WORD, + address + (i * 4), + data_ptr[i]); + if (status != HAL_OK) break; + } + + HAL_FLASH_Lock(); + return status; +} + +// Чтение записи по индексу +FlashRecord_t* buffer_read_record(uint32_t index) { + if (index >= RECORDS_PER_PAGE) return NULL; + + uint32_t record_addr = LAST_PAGE_ADDR + (index * RECORD_SIZE); + FlashRecord_t* record = (FlashRecord_t*)record_addr; + + // Проверяем что запись не пустая + if (record->timestamp == 0xFFFFFFFF) { + return NULL; + } + + return record; +} +// Получение всех записей в порядке от старых к новым +void buffer_get_all_records(FlashRecord_t* records[], uint32_t* count) { + *count = 0; + BufferState_t state = buffer_init(); + + if (!state.initialized) return; + + // Начинаем с текущего write_index (самые старые данные) + for (int i = 0; i < RECORDS_PER_PAGE; i++) { + uint32_t idx = (state.write_index + i) % RECORDS_PER_PAGE; + FlashRecord_t* record = buffer_read_record(idx); + + if (record) { + records[(*count)++] = record; + } + } +} diff --git a/john103C6T6/EEPROM_Emul/src/flash_ring.c.orig b/john103C6T6/EEPROM_Emul/src/flash_ring.c.orig new file mode 100644 index 0000000..bed70cd --- /dev/null +++ b/john103C6T6/EEPROM_Emul/src/flash_ring.c.orig @@ -0,0 +1,154 @@ +#include "flash_ring.h" + + +uint8_t current_page = 0; // текущая страница для записи + + +// Вычисление CRC16 (полином 0x8005) +static uint16_t calc_crc16(const uint8_t *data, uint32_t len) +{ + uint16_t crc = 0xFFFF; + for (uint32_t i = 0; i < len; i++) + { + crc ^= data[i]; + for (int j = 0; j < 8; j++) + { + if (crc & 1) crc = (crc >> 1) ^ 0xA001; + else crc >>= 1; + } + } + return crc; +} + +// Проверка заголовка страницы +static bool is_page_valid(uint32_t addr) +{ + PageHeader_t *hdr = (PageHeader_t *)addr; + return (hdr->valid_marker == 0xDEADBEEF); +} + +// Инициализация: поиск актуальной страницы или очистка +bool FlashRing_Init(void) +{ + for (uint8_t i = 0; i < PAGE_COUNT; i++) + { + uint32_t addr = FLASH_BASE_USER + i * FLASH_PAGE_SIZE_USER; + if (is_page_valid(addr)) + { + current_page = i; + return true; + } + } + // Если ни одна страница не актуальна — стираем обе + if (FlashRing_EraseAll()!= 1) { + return false; // Ошибка стирания + } + + + + current_page = 0; + return true; +} + +uint16_t CalculateCRC16(const uint8_t *data, uint32_t len) { + uint16_t crc = 0xFFFF; // Начальное значение + for (uint32_t i = 0; i < len; i++) { + crc ^= data[i]; + for (int j = 0; j < 8; j++) { + if (crc & 1) { + crc = (crc >> 1) ^ 0xA001; // 0xA001 = обратный полином 0x8005 + } else { + crc >>= 1; + } + } + } + return crc; +} + + +// Стирание всех страниц +int FlashRing_EraseAll(void) +{ + HAL_FLASH_Unlock(); + FLASH_EraseInitTypeDef EraseInit = + { + .TypeErase = FLASH_TYPEERASE_PAGES, + .PageAddress = FLASH_BASE_USER, + .NbPages = PAGE_COUNT + }; + uint32_t page_error; + HAL_FLASHEx_Erase(&EraseInit, &page_error); + // HAL_FLASHLock(); + HAL_FLASH_Lock(); + return 1; +} + +// Запись уставки +bool FlashRing_Write(const Setpoint_t *sp) +{ + uint32_t page_addr = FLASH_BASE_USER + current_page * FLASH_PAGE_SIZE_USER; + PageHeader_t *hdr = (PageHeader_t *)page_addr; + + // Если страница не инициализирована или заполнена — переключаемся + if (!is_page_valid(page_addr) || hdr->count >= (FLASH_PAGE_SIZE_USER - sizeof(PageHeader_t)) / sizeof(Setpoint_t)) + { + // Стираем следующую страницу + uint8_t next_page = (current_page + 1) % PAGE_COUNT; + uint32_t next_addr = FLASH_BASE_USER + next_page * FLASH_PAGE_SIZE_USER; + + HAL_FLASH_Unlock(); + FLASH_EraseInitTypeDef EraseInit = + { + .TypeErase = FLASH_TYPEERASE_PAGES, + .PageAddress = next_addr, + .NbPages = 1 + }; + uint32_t page_error; + HAL_FLASHEx_Erase(&EraseInit, &page_error); + + current_page = next_page; + page_addr = next_addr; + + HAL_FLASH_Program(FLASH_TYPEPROGRAM_WORD, (uint32_t)&hdr->valid_marker, 0xDEADBEEF); +HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD, (uint32_t)&hdr->count, 0); + HAL_FLASH_Lock(); + + } + + // Вычисляем смещение для новой уставки + uint8_t *data_start = (uint8_t *)page_addr + sizeof(PageHeader_t); + uint16_t idx = hdr->count; + Setpoint_t *dst = (Setpoint_t *)(data_start + idx * sizeof(Setpoint_t)); + + *dst = *sp; + hdr->count++; + + // Обновляем CRC + hdr->crc = calc_crc16(data_start, hdr->count * sizeof(Setpoint_t)); + + return true; +} + +// Чтение уставки по индексу +bool FlashRing_Read(uint16_t index, Setpoint_t *sp) +{ + uint32_t page_addr = FLASH_BASE_USER + current_page * FLASH_PAGE_SIZE_USER; + if (!is_page_valid(page_addr)) return false; + + + PageHeader_t *hdr = (PageHeader_t *)page_addr; + if (index >= hdr->count) return false; + + uint8_t *data_start = (uint8_t *)page_addr + sizeof(PageHeader_t); + *sp = *(Setpoint_t *)(data_start + index * sizeof(Setpoint_t)); + return true; +} + +// Получение числа записанных уставок +uint16_t FlashRing_GetCount(void) +{ + uint32_t page_addr = FLASH_BASE_USER + current_page * FLASH_PAGE_SIZE_USER; + if (!is_page_valid(page_addr)) return 0; + PageHeader_t *hdr = (PageHeader_t *)page_addr; + return hdr->count; +} diff --git a/john103C6T6/MDK-ARM/DebugConfig/john103C6T6_STM32F103CB_1.0.0.dbgconf b/john103C6T6/MDK-ARM/DebugConfig/john103C6T6_STM32F103CB_1.0.0.dbgconf new file mode 100644 index 0000000..66e10b6 --- /dev/null +++ b/john103C6T6/MDK-ARM/DebugConfig/john103C6T6_STM32F103CB_1.0.0.dbgconf @@ -0,0 +1,36 @@ +// File: STM32F101_102_103_105_107.dbgconf +// Version: 1.0.0 +// Note: refer to STM32F101xx STM32F102xx STM32F103xx STM32F105xx STM32F107xx Reference manual (RM0008) +// STM32F101xx STM32F102xx STM32F103xx STM32F105xx STM32F107xx datasheets + +// <<< Use Configuration Wizard in Context Menu >>> + +// Debug MCU configuration register (DBGMCU_CR) +// Reserved bits must be kept at reset value +// DBG_TIM11_STOP TIM11 counter stopped when core is halted +// DBG_TIM10_STOP TIM10 counter stopped when core is halted +// DBG_TIM9_STOP TIM9 counter stopped when core is halted +// DBG_TIM14_STOP TIM14 counter stopped when core is halted +// DBG_TIM13_STOP TIM13 counter stopped when core is halted +// DBG_TIM12_STOP TIM12 counter stopped when core is halted +// DBG_CAN2_STOP Debug CAN2 stopped when core is halted +// DBG_TIM7_STOP TIM7 counter stopped when core is halted +// DBG_TIM6_STOP TIM6 counter stopped when core is halted +// DBG_TIM5_STOP TIM5 counter stopped when core is halted +// DBG_TIM8_STOP TIM8 counter stopped when core is halted +// DBG_I2C2_SMBUS_TIMEOUT SMBUS timeout mode stopped when core is halted +// DBG_I2C1_SMBUS_TIMEOUT SMBUS timeout mode stopped when core is halted +// DBG_CAN1_STOP Debug CAN1 stopped when Core is halted +// DBG_TIM4_STOP TIM4 counter stopped when core is halted +// DBG_TIM3_STOP TIM3 counter stopped when core is halted +// DBG_TIM2_STOP TIM2 counter stopped when core is halted +// DBG_TIM1_STOP TIM1 counter stopped when core is halted +// DBG_WWDG_STOP Debug window watchdog stopped when core is halted +// DBG_IWDG_STOP Debug independent watchdog stopped when core is halted +// DBG_STANDBY Debug standby mode +// DBG_STOP Debug stop mode +// DBG_SLEEP Debug sleep mode +// +DbgMCU_CR = 0x00000007; + +// <<< end of configuration section >>> diff --git a/john103C6T6/MDK-ARM/RTE/_john103C6T6/RTE_Components.h b/john103C6T6/MDK-ARM/RTE/_john103C6T6/RTE_Components.h index 6f40b63..f443866 100644 --- a/john103C6T6/MDK-ARM/RTE/_john103C6T6/RTE_Components.h +++ b/john103C6T6/MDK-ARM/RTE/_john103C6T6/RTE_Components.h @@ -1,7 +1,6 @@ - /* - * Auto generated Run-Time-Environment Configuration File - * *** Do not modify ! *** + * UVISION generated file: DO NOT EDIT! + * Generated by: uVision version 5.41.0.0 * * Project: 'john103C6T6' * Target: 'john103C6T6' @@ -16,9 +15,9 @@ */ #define CMSIS_device_header "stm32f10x.h" -/* Keil.ARM Compiler::Compiler:I/O:STDOUT:Breakpoint:1.2.0 */ +/* Keil::Compiler&ARM Compiler:I/O:STDOUT&Breakpoint@1.2.0 */ #define RTE_Compiler_IO_STDOUT /* Compiler I/O: STDOUT */ - #define RTE_Compiler_IO_STDOUT_BKPT /* Compiler I/O: STDOUT Breakpoint */ +#define RTE_Compiler_IO_STDOUT_BKPT /* Compiler I/O: STDOUT Breakpoint */ #endif /* RTE_COMPONENTS_H */ diff --git a/john103C6T6/MDK-ARM/john103C6T6.uvoptx b/john103C6T6/MDK-ARM/john103C6T6.uvoptx index fa79953..59f2f63 100644 --- a/john103C6T6/MDK-ARM/john103C6T6.uvoptx +++ b/john103C6T6/MDK-ARM/john103C6T6.uvoptx @@ -120,12 +120,12 @@ 0 UL2CM3 - UL2CM3(-S0 -C0 -P0 ) -FN1 -FC1000 -FD20000000 -FF0STM32F10x_128 -FL020000 -FS08000000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM) + UL2CM3(-S0 -C0 -P0 ) -FN1 -FC1000 -FD20000000 -FF0STM32F10x_128 -FL020000 -FS08000000 -FP0($$Device:STM32F103CB$Flash\STM32F10x_128.FLM) 0 ST-LINKIII-KEIL_SWO - -U002400343233511639363634 -O206 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(2BA01477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM) -WA0 -WE0 -WVCE4 -WS2710 -WM0 -WP2 + -U002400343233511639363634 -O206 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(1BA01477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103CB$Flash\STM32F10x_128.FLM) -WA0 -WE0 -WVCE4 -WS2710 -WM0 -WP2 -WK0-R0 0 @@ -148,70 +148,77 @@ (105=-1,-1,-1,-1,0) - - - 0 - 0 - 193 - 1 -
134249696
- 0 - 0 - 0 - 0 - 0 - 1 - ../Core/Src/main.c - - \\john103C6T6\../Core/Src/main.c\193 - - - 1 - 0 - 193 - 1 -
134249792
- 0 - 0 - 0 - 0 - 0 - 1 - ../Core/Src/main.c - - \\john103C6T6\../Core/Src/main.c\193 - - + 0 1 - hiwdg + sens 1 1 - DS18B20_DEVICE_AMOUNT + MB_DATA,0x0A 2 1 - set_temp_old + temp_sense 3 1 - sTime + roms 4 1 - sens[sens_num] + state 5 1 - sens + last_page_addr + + + 6 + 1 + \\john103C6T6\../EEPROM_Emul/src/flash_ring.c\buffer_write_record\record_addr + + + 7 + 1 + MB_DATA.Coils.relay_struct[0].state_val_bit.Temp10_relay_isOn,0x0A + + + 8 + 1 + MB_DATA.Coils.relay_struct[0].state_val_bit.Temp11_relay_isOn,0x0A + + + 9 + 1 + record + + + 10 + 1 + flash_buff + + + 11 + 1 + new_record + + + 12 + 1 + state + + + 13 + 1 + htim @@ -230,7 +237,7 @@ 1 0 - 0x08000000 + 0x0800f800 0 @@ -277,6 +284,10 @@ + + System Viewer\FLASH + 35904 + System Viewer\GPIOB 35900 @@ -309,8 +320,8 @@ 0 0 0 - startup_stm32f103x6.s - startup_stm32f103x6.s + .\startup_stm32f10x_md.s + startup_stm32f10x_md.s 0 0 @@ -521,8 +532,8 @@ 0 0 0 - ..\EEPROM_Emul\src\EEPROM_Emul.c - EEPROM_Emul.c + ..\EEPROM_Emul\src\flash_ring.c + flash_ring.c 0 0 @@ -530,7 +541,7 @@ Drivers/STM32F1xx_HAL_Driver - 0 + 1 0 0 0 @@ -550,7 +561,7 @@ 3 20 1 - 0 + 1 0 0 ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c @@ -790,7 +801,7 @@ Drivers/CMSIS - 0 + 1 0 0 0 @@ -810,7 +821,7 @@ modbus - 1 + 0 0 0 0 diff --git a/john103C6T6/MDK-ARM/john103C6T6.uvprojx b/john103C6T6/MDK-ARM/john103C6T6.uvprojx index dbc2d0e..a28413a 100644 --- a/john103C6T6/MDK-ARM/john103C6T6.uvprojx +++ b/john103C6T6/MDK-ARM/john103C6T6.uvprojx @@ -10,21 +10,21 @@ john103C6T6 0x4 ARM-ADS - 6190000::V6.19::ARMCLANG - 6190000::V6.19::ARMCLANG + 6220000::V6.22::ARMCLANG + 6220000::V6.22::ARMCLANG 1 - STM32F103C8 + STM32F103CB STMicroelectronics Keil.STM32F1xx_DFP.2.4.0 http://www.keil.com/pack/ - IRAM(0x20000000,0x00005000) IROM(0x08000000,0x00010000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE + IRAM(0x20000000,0x00005000) IROM(0x08000000,0x00020000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE - UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM)) + UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F103CB$Flash\STM32F10x_128.FLM)) 0 - $$Device:STM32F103C8$Device\Include\stm32f10x.h + $$Device:STM32F103CB$Device\Include\stm32f10x.h @@ -34,7 +34,7 @@ - $$Device:STM32F103C8$SVD\STM32F103xx.svd + $$Device:STM32F103CB$SVD\STM32F103xx.svd 0 0 @@ -139,7 +139,7 @@ 1 BIN\UL2CM3.DLL - "" () + @@ -160,7 +160,7 @@ 1 1 0 - 1 + 0 1 0 0 @@ -253,7 +253,7 @@ 1 0x8000000 - 0x10000 + 0x20000 0 @@ -278,7 +278,7 @@ 1 0x8000000 - 0x10000 + 0x20000 1 @@ -339,9 +339,9 @@ 0 - USE_HAL_DRIVER,STM32F103x6 + USE_HAL_DRIVER,STM32F103xB - ../Core/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include;../Modbus;..\EEPROM_Emul\lib;..\..\core\STM32_Modbus\Inc + ../Core/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include;../Modbus;..\EEPROM_Emul\lib;..\..\core\STM32_Modbus\Inc;..\EEPROM_Emul\lib @@ -386,9 +386,9 @@ Application/MDK-ARM - startup_stm32f103x6.s + startup_stm32f10x_md.s 2 - startup_stm32f103x6.s + .\startup_stm32f10x_md.s @@ -731,9 +731,9 @@ ../Core/Src/stm32f1xx_hal_timebase_tim.c - EEPROM_Emul.c + flash_ring.c 1 - ..\EEPROM_Emul\src\EEPROM_Emul.c + ..\EEPROM_Emul\src\flash_ring.c @@ -1313,8 +1313,8 @@ - - + + diff --git a/john103C6T6/MDK-ARM/john103C6T6.uvprojx.orig b/john103C6T6/MDK-ARM/john103C6T6.uvprojx.orig new file mode 100644 index 0000000..69a1fcc --- /dev/null +++ b/john103C6T6/MDK-ARM/john103C6T6.uvprojx.orig @@ -0,0 +1,1341 @@ + + + + 2.1 + +
### uVision Project, (C) Keil Software
+ + + + john103C6T6 + 0x4 + ARM-ADS + 6220000::V6.22::ARMCLANG + 6220000::V6.22::ARMCLANG + 1 + + + STM32F103C8 + STMicroelectronics + Keil.STM32F1xx_DFP.2.4.0 + http://www.keil.com/pack/ + IRAM(0x20000000,0x00005000) IROM(0x08000000,0x00010000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE + + + UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM)) + 0 + $$Device:STM32F103C8$Device\Include\stm32f10x.h + + + + + + + + + + $$Device:STM32F103C8$SVD\STM32F103xx.svd + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 1 + + john103C6T6\ + john103C6T6 + 1 + 0 + 1 + 1 + 1 + C:\Users\z\Documents\ + 1 + 0 + 0 + + 0 + 0 + + + 0 + 0 + 0 + 0 + + + 0 + 0 + + + 0 + 0 + 0 + 0 + + + 0 + 0 + + + 0 + 0 + 0 + 0 + + 1 + + + + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 0 + + + SARMCM3.DLL + -REMAP + DCM.DLL + -pCM3 + SARMCM3.DLL + + TCM.DLL + -pCM3 + + + + 1 + 0 + 0 + 0 + 16 + + + + + 1 + 0 + 0 + 1 + 1 + 4096 + + 1 + BIN\UL2CM3.DLL + + + + + + 0 + + + + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + "Cortex-M3" + + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 8 + 0 + 0 + 0 + 0 + 3 + 3 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x20000000 + 0x5000 + + + 1 + 0x8000000 + 0x10000 + + + 0 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x8000000 + 0x10000 + + + 1 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x20000000 + 0x5000 + + + 0 + 0x0 + 0x0 + + + + + + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 3 + 0 + 0 + 1 + 0 + 0 + 5 + 5 + 1 + 1 + 0 + 0 + 0 + + + USE_HAL_DRIVER,STM32F103x6 + + ../Core/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include;../Modbus;..\EEPROM_Emul\lib;..\..\core\STM32_Modbus\Inc + + + + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + + + + + + + + + 1 + 0 + 0 + 0 + 1 + 0 + + + + + + + + + + + + + + + Application/MDK-ARM + + + startup_stm32f103x6.s + 2 + startup_stm32f103x6.s + + + + + Application/User/Core + + + dallas_tools.c + 1 + ..\Core\Src\dallas_tools.c + + + ds18b20_driver.c + 1 + ..\Core\Src\ds18b20_driver.c + + + onewire.c + 1 + ..\Core\Src\onewire.c + + + ow_port.c + 1 + ..\Core\Src\ow_port.c + + + main.c + 1 + ../Core/Src/main.c + + + gpio.c + 1 + ../Core/Src/gpio.c + + + adc.c + 1 + ../Core/Src/adc.c + + + 2 + 0 + 0 + 0 + 0 + 1 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + + + + can.c + 1 + ../Core/Src/can.c + + + 2 + 0 + 0 + 0 + 0 + 1 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + + + + i2c.c + 1 + ../Core/Src/i2c.c + + + 2 + 0 + 0 + 0 + 0 + 1 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + + + + rtc.c + 1 + ../Core/Src/rtc.c + + + 2 + 0 + 0 + 0 + 0 + 1 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + + + + spi.c + 1 + ../Core/Src/spi.c + + + 2 + 0 + 0 + 0 + 0 + 1 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + + + + tim.c + 1 + ../Core/Src/tim.c + + + usart.c + 1 + ../Core/Src/usart.c + + + stm32f1xx_it.c + 1 + ../Core/Src/stm32f1xx_it.c + + + stm32f1xx_hal_msp.c + 1 + ../Core/Src/stm32f1xx_hal_msp.c + + + stm32f1xx_hal_timebase_tim.c + 1 + ../Core/Src/stm32f1xx_hal_timebase_tim.c + + + EEPROM_Emul.c + 1 + ..\EEPROM_Emul\src\EEPROM_Emul.c + + + + + Drivers/STM32F1xx_HAL_Driver + + + stm32f1xx_hal_gpio_ex.c + 1 + ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c + + + stm32f1xx_hal_tim.c + 1 + ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c + + + stm32f1xx_hal_tim_ex.c + 1 + ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c + + + stm32f1xx_hal_adc.c + 1 + ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.c + + + 2 + 0 + 0 + 0 + 0 + 1 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + + + + stm32f1xx_hal_adc_ex.c + 1 + ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc_ex.c + + + 2 + 0 + 0 + 0 + 0 + 1 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + + + + stm32f1xx_hal.c + 1 + ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c + + + stm32f1xx_hal_rcc.c + 1 + ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c + + + stm32f1xx_hal_rcc_ex.c + 1 + ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c + + + stm32f1xx_hal_gpio.c + 1 + ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c + + + stm32f1xx_hal_dma.c + 1 + ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c + + + stm32f1xx_hal_cortex.c + 1 + ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c + + + stm32f1xx_hal_pwr.c + 1 + ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c + + + stm32f1xx_hal_flash.c + 1 + ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c + + + stm32f1xx_hal_flash_ex.c + 1 + ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c + + + stm32f1xx_hal_exti.c + 1 + ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c + + + stm32f1xx_hal_can.c + 1 + ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_can.c + + + 2 + 0 + 0 + 0 + 0 + 1 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + + + + stm32f1xx_hal_i2c.c + 1 + ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2c.c + + + 2 + 0 + 0 + 0 + 0 + 1 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + + + + stm32f1xx_hal_rtc.c + 1 + ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc.c + + + 2 + 0 + 0 + 0 + 0 + 1 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + + + + stm32f1xx_hal_rtc_ex.c + 1 + ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc_ex.c + + + 2 + 0 + 0 + 0 + 0 + 1 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + + + + stm32f1xx_hal_spi.c + 1 + ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c + + + 2 + 0 + 0 + 0 + 0 + 1 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + + + + stm32f1xx_hal_uart.c + 1 + ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c + + + + + Drivers/CMSIS + + + system_stm32f1xx.c + 1 + ../Core/Src/system_stm32f1xx.c + + + + + modbus + + + __crc_algs.c + 1 + ..\..\core\STM32_Modbus\Src\__crc_algs.c + + + __modbus_compat.c + 1 + ..\..\core\STM32_Modbus\Src\__modbus_compat.c + + + modbus.c + 1 + ..\..\core\STM32_Modbus\Src\modbus.c + + + modbus_coils.c + 1 + ..\..\core\STM32_Modbus\Src\modbus_coils.c + + + modbus_core.c + 1 + ..\..\core\STM32_Modbus\Src\modbus_core.c + + + modbus_devid.c + 1 + ..\..\core\STM32_Modbus\Src\modbus_devid.c + + + modbus_diag.c + 1 + ..\..\core\STM32_Modbus\Src\modbus_diag.c + + + modbus_holdregs.c + 1 + ..\..\core\STM32_Modbus\Src\modbus_holdregs.c + + + modbus_inputregs.c + 1 + ..\..\core\STM32_Modbus\Src\modbus_inputregs.c + + + modbus_master.c + 1 + ..\..\core\STM32_Modbus\Src\modbus_master.c + + + modbus_slave.c + 1 + ..\..\core\STM32_Modbus\Src\modbus_slave.c + + + rs_message.c + 1 + ..\..\core\STM32_Modbus\Src\rs_message.c + + + modbus_data.c + 1 + ..\Modbus\modbus_data.c + + + + + ::CMSIS + + + ::CMSIS Driver + + + ::Compiler + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + john103C6T6 + 1 + + + + + diff --git a/john103C6T6/MDK-ARM/john103C6T6/john103C6T6.sct b/john103C6T6/MDK-ARM/john103C6T6/john103C6T6.sct index 09aa1bd..bbacbc6 100644 --- a/john103C6T6/MDK-ARM/john103C6T6/john103C6T6.sct +++ b/john103C6T6/MDK-ARM/john103C6T6/john103C6T6.sct @@ -2,8 +2,8 @@ ; *** Scatter-Loading Description File generated by uVision *** ; ************************************************************* -LR_IROM1 0x08000000 0x00010000 { ; load region size_region - ER_IROM1 0x08000000 0x00010000 { ; load address = execution address +LR_IROM1 0x08000000 0x00020000 { ; load region size_region + ER_IROM1 0x08000000 0x00020000 { ; load address = execution address *.o (RESET, +First) *(InRoot$$Sections) .ANY (+RO) diff --git a/john103C6T6/MDK-ARM/startup_stm32f103x6.s b/john103C6T6/MDK-ARM/startup_stm32f10x_md.s similarity index 87% rename from john103C6T6/MDK-ARM/startup_stm32f103x6.s rename to john103C6T6/MDK-ARM/startup_stm32f10x_md.s index 152bc21..1ab7096 100644 --- a/john103C6T6/MDK-ARM/startup_stm32f103x6.s +++ b/john103C6T6/MDK-ARM/startup_stm32f10x_md.s @@ -1,7 +1,10 @@ -;******************** (C) COPYRIGHT 2017 STMicroelectronics ******************** -;* File Name : startup_stm32f103x6.s +;******************** (C) COPYRIGHT 2011 STMicroelectronics ******************** +;* File Name : startup_stm32f10x_md.s ;* Author : MCD Application Team -;* Description : STM32F103x6 Devices vector table for MDK-ARM toolchain. +;* Version : V3.5.1 +;* Date : 08-September-2021 +;* Description : STM32F10x Medium Density Devices vector table for MDK-ARM +;* toolchain. ;* This module performs: ;* - Set the initial SP ;* - Set the initial PC == Reset_Handler @@ -9,19 +12,19 @@ ;* - Configure the clock system ;* - Branches to __main in the C library (which eventually ;* calls main()). -;* After Reset the Cortex-M3 processor is in Thread mode, +;* After Reset the CortexM3 processor is in Thread mode, ;* priority is Privileged, and the Stack is set to Main. -;****************************************************************************** -;* @attention +;* <<< Use Configuration Wizard in Context Menu >>> +;******************************************************************************* ;* -;* Copyright (c) 2017-2021 STMicroelectronics. +;* Copyright (c) 2011 STMicroelectronics. ;* All rights reserved. ;* ;* This software is licensed under terms that can be found in the LICENSE file ;* in the root directory of this software component. ;* If no LICENSE file comes with this software, it is provided AS-IS. -;* -;****************************************************************************** +; +;******************************************************************************* ; Amount of memory (in bytes) allocated for Stack ; Tailor this value to your application needs @@ -29,7 +32,7 @@ ; Stack Size (in Bytes) <0x0-0xFFFFFFFF:8> ; -Stack_Size EQU 0x400 +Stack_Size EQU 0x00000400 AREA STACK, NOINIT, READWRITE, ALIGN=3 Stack_Mem SPACE Stack_Size @@ -40,7 +43,7 @@ __initial_sp ; Heap Size (in Bytes) <0x0-0xFFFFFFFF:8> ; -Heap_Size EQU 0x400 +Heap_Size EQU 0x00000200 AREA HEAP, NOINIT, READWRITE, ALIGN=3 __heap_base @@ -105,18 +108,18 @@ __Vectors DCD __initial_sp ; Top of Stack DCD TIM1_CC_IRQHandler ; TIM1 Capture Compare DCD TIM2_IRQHandler ; TIM2 DCD TIM3_IRQHandler ; TIM3 - DCD 0 ; Reserved + DCD TIM4_IRQHandler ; TIM4 DCD I2C1_EV_IRQHandler ; I2C1 Event DCD I2C1_ER_IRQHandler ; I2C1 Error - DCD 0 ; Reserved - DCD 0 ; Reserved + DCD I2C2_EV_IRQHandler ; I2C2 Event + DCD I2C2_ER_IRQHandler ; I2C2 Error DCD SPI1_IRQHandler ; SPI1 - DCD 0 ; Reserved + DCD SPI2_IRQHandler ; SPI2 DCD USART1_IRQHandler ; USART1 DCD USART2_IRQHandler ; USART2 - DCD 0 ; Reserved + DCD USART3_IRQHandler ; USART3 DCD EXTI15_10_IRQHandler ; EXTI Line 15..10 - DCD RTC_Alarm_IRQHandler ; RTC Alarm through EXTI Line + DCD RTCAlarm_IRQHandler ; RTC Alarm through EXTI Line DCD USBWakeUp_IRQHandler ; USB Wakeup from suspend __Vectors_End @@ -124,7 +127,7 @@ __Vectors_Size EQU __Vectors_End - __Vectors AREA |.text|, CODE, READONLY -; Reset handler routine +; Reset handler Reset_Handler PROC EXPORT Reset_Handler [WEAK] IMPORT __main @@ -211,13 +214,18 @@ Default_Handler PROC EXPORT TIM1_CC_IRQHandler [WEAK] EXPORT TIM2_IRQHandler [WEAK] EXPORT TIM3_IRQHandler [WEAK] + EXPORT TIM4_IRQHandler [WEAK] EXPORT I2C1_EV_IRQHandler [WEAK] EXPORT I2C1_ER_IRQHandler [WEAK] + EXPORT I2C2_EV_IRQHandler [WEAK] + EXPORT I2C2_ER_IRQHandler [WEAK] EXPORT SPI1_IRQHandler [WEAK] + EXPORT SPI2_IRQHandler [WEAK] EXPORT USART1_IRQHandler [WEAK] EXPORT USART2_IRQHandler [WEAK] + EXPORT USART3_IRQHandler [WEAK] EXPORT EXTI15_10_IRQHandler [WEAK] - EXPORT RTC_Alarm_IRQHandler [WEAK] + EXPORT RTCAlarm_IRQHandler [WEAK] EXPORT USBWakeUp_IRQHandler [WEAK] WWDG_IRQHandler @@ -250,13 +258,18 @@ TIM1_TRG_COM_IRQHandler TIM1_CC_IRQHandler TIM2_IRQHandler TIM3_IRQHandler +TIM4_IRQHandler I2C1_EV_IRQHandler I2C1_ER_IRQHandler +I2C2_EV_IRQHandler +I2C2_ER_IRQHandler SPI1_IRQHandler +SPI2_IRQHandler USART1_IRQHandler USART2_IRQHandler +USART3_IRQHandler EXTI15_10_IRQHandler -RTC_Alarm_IRQHandler +RTCAlarm_IRQHandler USBWakeUp_IRQHandler B . @@ -268,7 +281,7 @@ USBWakeUp_IRQHandler ;******************************************************************************* ; User Stack and Heap initialization ;******************************************************************************* - IF :DEF:__MICROLIB + IF :DEF:__MICROLIB EXPORT __initial_sp EXPORT __heap_base diff --git a/john103C6T6/Modbus/modbus_data.h b/john103C6T6/Modbus/modbus_data.h index 7495e5c..8a7a9aa 100644 --- a/john103C6T6/Modbus/modbus_data.h +++ b/john103C6T6/Modbus/modbus_data.h @@ -1,10 +1,10 @@ -/** +/** ************************************************************************** * @file modbus_data.h * @brief Заголовочный файл с описанием даты MODBUS. -* @details Данный файл необходимо подключается в rs_message.h. После rs_message.h +* @details Данный файл необходимо подключается в rs_message.h. После rs_message.h * подключается к основному проекту. -* +* * @defgroup MODBUS_DATA * @ingroup MODBUS * @brief Modbus data description @@ -19,16 +19,16 @@ // DEFINES FOR INPUT REGISTERS ARRAYS -#define R_INPUT_ADDR 0 -#define R_INPUT_QNT 2000 +#define R_INPUT_ADDR 0 +#define R_INPUT_QNT 2000 // DEFINES FOR HOLDING REGISTERS ARRAYS -#define R_HOLDING_ADDR 0 -#define R_HOLDING_QNT 2000 +#define R_HOLDING_ADDR 0 +#define R_HOLDING_QNT 2000 // DEFINES FOR COIL ARRAYS -#define C_CONTROL_ADDR 0 -#define C_CONTROL_QNT 1000 +#define C_CONTROL_ADDR 0 +#define C_CONTROL_QNT 1000 @@ -39,42 +39,42 @@ //--------------DEFINES FOR REGISTERS--------------- // DEFINES FOR ARRAYS -/** +/** * @addtogroup MODBUS_DATA_RERISTERS_DEFINES * @ingroup MODBUS_DATA * @brief Defines for registers Структура дефайна адресов - @verbatim + @verbatim Для массивов регистров: R__ADDR - модбас адресс первого регистра в массиве R__QNT - количество регистров в массиве - + При добавлении новых массивов регистров, необходимо их добавить в функцию MB_DefineRegistersAddress - if(MB_Check_Address_For_Arr(Addr, Qnt, R__ADDR, R__QNT) == NO_ERRORS) - { - *pRegs = MB_Set_Register_Ptr(&, Addr); // начало регистров хранения/входных - } + if(MB_Check_Address_For_Arr(Addr, Qnt, R__ADDR, R__QNT) == NO_ERRORS) + { + *pRegs = MB_Set_Register_Ptr(&, Addr); // начало регистров хранения/входных + } @endverbatim * @{ */ - - -/** + + +/** * @brief Регистры хранения */ - + /** * @brief Определить размер структуры в регистрах модбас (16-бит слова) */ -#define mb_sizeof(_struct_) (sizeof(_struct_)/sizeof(uint16_t)) +#define mb_sizeof(_struct_) (sizeof(_struct_)/sizeof(uint16_t)) /** * @brief Определить количество резервных байт для выравнивания * @details Выравнивает так, чтобы количество регистров в _struct_ и reserved равнялось _align_. - * + * */ -#define mb_fill_rsv(_align_, _struct_) ((_align_ > mb_sizeof(_struct_)) ? (_align_ - mb_sizeof(_struct_)) : 0) +#define mb_fill_rsv(_align_, _struct_) ((_align_ > mb_sizeof(_struct_)) ? (_align_ - mb_sizeof(_struct_)) : 0) @@ -82,46 +82,44 @@ -typedef __PACKED_STRUCT//MB_DataInRegsTypeDef +typedef __PACKED_STRUCT//MB_DataInRegsTypeDef { - - uint16_t sens_Temp[MAX_SENSE]; - - uint16_t reserve[mb_fill_rsv(1000, uint16_t[MAX_SENSE])]; - - DS18B20_Drv_t ID; - uint16_t reserve1[mb_fill_rsv(200, DS18B20_Drv_t)]; - uint16_t num_Tsens; - -}MB_DataInRegsTypeDef; + uint16_t sens_Temp[MAX_SENSE]; + uint16_t reserve[mb_fill_rsv(1000, uint16_t[MAX_SENSE])]; + DS18B20_Drv_t ID; + uint16_t reserve1[mb_fill_rsv(200, DS18B20_Drv_t)]; + uint16_t num_Tsens; -/** - * @brief Входные регистры +} MB_DataInRegsTypeDef; + + +/** + * @brief Входные регистры */ -typedef __PACKED_STRUCT //MB_DataInRegsTypeDef +typedef __PACKED_STRUCT //MB_DataInRegsTypeDef { - uint16_t set_Temp[MAX_SENSE]; - uint16_t reserve[mb_fill_rsv(100, uint16_t[MAX_SENSE])]; - uint16_t set_hyst[MAX_SENSE]; - uint16_t reserve1[mb_fill_rsv(100, uint16_t[MAX_SENSE])]; -}MB_DataHoldRegsTypeDef; + uint16_t set_Temp[MAX_SENSE]; + uint16_t reserve[mb_fill_rsv(100, uint16_t[MAX_SENSE])]; + uint16_t set_hyst[MAX_SENSE]; + uint16_t reserve1[mb_fill_rsv(100, uint16_t[MAX_SENSE])]; +} MB_DataHoldRegsTypeDef; + - /** MODBUS_DATA_RERISTERS_DEFINES - * @} + * @} */ //----------------DEFINES FOR COILS----------------- -/** +/** * @addtogroup MODBUS_DATA_COILS_DEFINES * @ingroup MODBUS_DATA * @brief Defines for coils - @verbatim + @verbatim Структура дефайна Для массивов коилов: C__ADDR - модбас адресс первого коила в массиве @@ -137,144 +135,144 @@ typedef __PACKED_STRUCT //MB_DataInRegsTypeDef @endverbatim * @{ */ - - - -/** + + + +/** * @brief Коилы * @details Желательно с помощью reserved делать стркутуру кратной 16-битам */ typedef union - { - __PACKED_STRUCT - { - unsigned state_val_01:1; - unsigned state_val_02:1; - unsigned state_val_03:1; - unsigned state_val_04:1; - unsigned state_val_05:1; - unsigned state_val_06:1; - unsigned state_val_07:1; - unsigned state_val_08:1; - unsigned state_val_09:1; - unsigned state_val_10:1; - unsigned state_val_11:1; - unsigned state_val_12:1; - unsigned state_val_13:1; - unsigned state_val_14:1; - unsigned state_val_15:1; - unsigned state_val_16:1; - } state_val_bit; - uint16_t all; - - - }word; - typedef union - { - __PACKED_STRUCT - { - unsigned Temp1_relay_isOn :1; - unsigned Temp2_relay_isOn :1; - unsigned Temp3_relay_isOn :1; - unsigned Temp4_relay_isOn :1; - unsigned Temp5_relay_isOn :1; - unsigned Temp6_relay_isOn :1; - unsigned Temp7_relay_isOn :1; - unsigned Temp8_relay_isOn :1; - unsigned Temp9_relay_isOn :1; - unsigned Temp10_relay_isOn :1; - unsigned Temp11_relay_isOn :1; - unsigned Temp12_relay_isOn :1; - unsigned Temp13_relay_isOn :1; - unsigned Temp14_relay_isOn :1; - unsigned Temp15_relay_isOn :1; - unsigned Temp16_relay_isOn :1; - - - } state_val_bit; - uint16_t all; - - - }RELAY_Struct; - - typedef union - { - __PACKED_STRUCT - { - unsigned Temp1_isConnected :1; - unsigned Temp2_isConnected :1; - unsigned Temp3_isConnected :1; - unsigned Temp4_isConnected :1; - unsigned Temp5_isConnected :1; - unsigned Temp6_isConnected :1; - unsigned Temp7_isConnected :1; - unsigned Temp8_isConnected :1; - unsigned Temp9_isConnected :1; - unsigned Temp10_isConnected :1; - unsigned Temp11_isConnected :1; - unsigned Temp12_isConnected :1; - unsigned Temp13_isConnected :1; - unsigned Temp14_isConnected :1; - unsigned Temp15_isConnected :1; - unsigned Temp16_isConnected :1; - - } state_val_bit; - uint16_t all; - - - }STATUS_TSENS; - - -typedef __PACKED_STRUCT - { - int temp ; - unsigned Temp_relay_on :1; - unsigned Temp_relay_off :1; - unsigned is_connect:1; - - }Temp_sens; - extern Temp_sens temp_sens ; - -typedef __PACKED_STRUCT { - - - - word coils[3]; //48 - uint16_t reserve1[mb_fill_rsv(128/16, word[3])]; - STATUS_TSENS status_tSens[MAX_SENSE/16]; //32 - uint16_t reserve2[mb_fill_rsv(128/16, STATUS_TSENS[MAX_SENSE/16])]; - RELAY_Struct relay_struct[MAX_SENSE/16*2];//16 2 реле на 1 датчик - uint16_t reserve3[mb_fill_rsv(128/16, RELAY_Struct[MAX_SENSE/16*2])]; + __PACKED_STRUCT + { + unsigned state_val_01: 1; + unsigned state_val_02: 1; + unsigned state_val_03: 1; + unsigned state_val_04: 1; + unsigned state_val_05: 1; + unsigned state_val_06: 1; + unsigned state_val_07: 1; + unsigned state_val_08: 1; + unsigned state_val_09: 1; + unsigned state_val_10: 1; + unsigned state_val_11: 1; + unsigned state_val_12: 1; + unsigned state_val_13: 1; + unsigned state_val_14: 1; + unsigned state_val_15: 1; + unsigned state_val_16: 1; + } state_val_bit; + uint16_t all; - unsigned init_param:1; //384 - unsigned init_Tsens:1; //385 - unsigned Save_Param_to_Flash:1; //386 - unsigned reserved2:13; - -}MB_DataCoilsTypeDef; + +} word; +typedef union +{ + __PACKED_STRUCT + { + unsigned Temp1_relay_isOn : 1; + unsigned Temp2_relay_isOn : 1; + unsigned Temp3_relay_isOn : 1; + unsigned Temp4_relay_isOn : 1; + unsigned Temp5_relay_isOn : 1; + unsigned Temp6_relay_isOn : 1; + unsigned Temp7_relay_isOn : 1; + unsigned Temp8_relay_isOn : 1; + unsigned Temp9_relay_isOn : 1; + unsigned Temp10_relay_isOn : 1; + unsigned Temp11_relay_isOn : 1; + unsigned Temp12_relay_isOn : 1; + unsigned Temp13_relay_isOn : 1; + unsigned Temp14_relay_isOn : 1; + unsigned Temp15_relay_isOn : 1; + unsigned Temp16_relay_isOn : 1; + + + } state_val_bit; + uint16_t all; + + +} RELAY_Struct; + +typedef union +{ + __PACKED_STRUCT + { + unsigned Temp1_isConnected : 1; + unsigned Temp2_isConnected : 1; + unsigned Temp3_isConnected : 1; + unsigned Temp4_isConnected : 1; + unsigned Temp5_isConnected : 1; + unsigned Temp6_isConnected : 1; + unsigned Temp7_isConnected : 1; + unsigned Temp8_isConnected : 1; + unsigned Temp9_isConnected : 1; + unsigned Temp10_isConnected : 1; + unsigned Temp11_isConnected : 1; + unsigned Temp12_isConnected : 1; + unsigned Temp13_isConnected : 1; + unsigned Temp14_isConnected : 1; + unsigned Temp15_isConnected : 1; + unsigned Temp16_isConnected : 1; + + } state_val_bit; + uint16_t all; + + +} STATUS_TSENS; + + +typedef __PACKED_STRUCT +{ + int temp ; + unsigned Temp_relay_on : 1; + unsigned Temp_relay_off : 1; + unsigned is_connect: 1; + +} Temp_sens; +extern Temp_sens temp_sens ; + +typedef __PACKED_STRUCT +{ + + + + word coils[3]; //48 + uint16_t reserve1[mb_fill_rsv(128 / 16, word[3])]; + STATUS_TSENS status_tSens[MAX_SENSE / 16]; //32 + uint16_t reserve2[mb_fill_rsv(128 / 16, STATUS_TSENS[MAX_SENSE / 16])]; + RELAY_Struct relay_struct[MAX_SENSE / 16 * 2]; //16 2 реле на 1 датчик + uint16_t reserve3[mb_fill_rsv(128 / 16, RELAY_Struct[MAX_SENSE / 16 * 2])]; + + unsigned init_param: 1; //384 + unsigned init_Tsens: 1; //385 + unsigned Save_Param_to_Flash: 1; //386 + unsigned reserved2: 13; + +} MB_DataCoilsTypeDef; /** MODBUS_DATA_COILS_DEFINES - * @} + * @} */ - - + + //-----------MODBUS DEVICE DATA SETTING------------- // MODBUS DATA STRUCTTURE -/** - * @brief Структура со всеми регистрами и коилами модбас +/** + * @brief Структура со всеми регистрами и коилами модбас * @ingroup MODBUS_DATA */ typedef struct // tester modbus data { - MB_DataInRegsTypeDef InRegs; ///< Modbus input registers @ref MB_DataInRegsTypeDef + MB_DataInRegsTypeDef InRegs; ///< Modbus input registers @ref MB_DataInRegsTypeDef - MB_DataCoilsTypeDef Coils; ///< Modbus coils @ref MB_DataCoilsTypeDef - - MB_DataHoldRegsTypeDef HoldRegs; ///< Modbus holding registers @ref MB_DataHoldRegsTypeDef -}MB_DataStructureTypeDef; + MB_DataCoilsTypeDef Coils; ///< Modbus coils @ref MB_DataCoilsTypeDef + + MB_DataHoldRegsTypeDef HoldRegs; ///< Modbus holding registers @ref MB_DataHoldRegsTypeDef +} MB_DataStructureTypeDef; extern MB_DataStructureTypeDef MB_DATA; #endif //_MODBUS_DATA_H_ diff --git a/john103C6T6/Modbus/modbus_data.h.orig b/john103C6T6/Modbus/modbus_data.h.orig new file mode 100644 index 0000000..da7482e --- /dev/null +++ b/john103C6T6/Modbus/modbus_data.h.orig @@ -0,0 +1,283 @@ +/** +************************************************************************** +* @file modbus_data.h +* @brief Заголовочный файл с описанием даты MODBUS. +* @details Данный файл необходимо подключается в rs_message.h. После rs_message.h +* подключается к основному проекту. +* +* @defgroup MODBUS_DATA +* @ingroup MODBUS +* @brief Modbus data description +* +*************************************************************************/ + + + + +#ifndef _MODBUS_DATA_H_ +#define _MODBUS_DATA_H_ + + +// DEFINES FOR INPUT REGISTERS ARRAYS +#define R_INPUT_ADDR 0 +#define R_INPUT_QNT 2000 + +// DEFINES FOR HOLDING REGISTERS ARRAYS +#define R_HOLDING_ADDR 0 +#define R_HOLDING_QNT 2000 + +// DEFINES FOR COIL ARRAYS +#define C_CONTROL_ADDR 0 +#define C_CONTROL_QNT 1000 + + + +#include "stdint.h" +#include "ds18b20_driver.h" +#include "PROJ_setup.h" + + +//--------------DEFINES FOR REGISTERS--------------- +// DEFINES FOR ARRAYS +/** + * @addtogroup MODBUS_DATA_RERISTERS_DEFINES + * @ingroup MODBUS_DATA + * @brief Defines for registers + Структура дефайна адресов + @verbatim + Для массивов регистров: + R__ADDR - модбас адресс первого регистра в массиве + R__QNT - количество регистров в массиве + + При добавлении новых массивов регистров, необходимо их добавить в функцию MB_DefineRegistersAddress + + if(MB_Check_Address_For_Arr(Addr, Qnt, R__ADDR, R__QNT) == NO_ERRORS) + { + *pRegs = MB_Set_Register_Ptr(&, Addr); // начало регистров хранения/входных + } + @endverbatim + * @{ + */ + + +/** + * @brief Регистры хранения + */ + + +/** + * @brief Определить размер структуры в регистрах модбас (16-бит слова) + */ +#define mb_sizeof(_struct_) (sizeof(_struct_)/sizeof(uint16_t)) +/** + * @brief Определить количество резервных байт для выравнивания + * @details Выравнивает так, чтобы количество регистров в _struct_ и reserved равнялось _align_. + * + */ +#define mb_fill_rsv(_align_, _struct_) ((_align_ > mb_sizeof(_struct_)) ? (_align_ - mb_sizeof(_struct_)) : 0) + + + + + + + +typedef __PACKED_STRUCT//MB_DataInRegsTypeDef +{ + + uint16_t sens_Temp[MAX_SENSE]; + + uint16_t reserve[mb_fill_rsv(1000, uint16_t[MAX_SENSE])]; + + DS18B20_Drv_t ID; + uint16_t reserve1[mb_fill_rsv(200, DS18B20_Drv_t)]; + uint16_t num_Tsens; + + +} MB_DataInRegsTypeDef; + + +/** + * @brief Входные регистры + */ +typedef __PACKED_STRUCT //MB_DataInRegsTypeDef +{ + uint16_t set_Temp[MAX_SENSE]; + uint16_t reserve[mb_fill_rsv(100, uint16_t[MAX_SENSE])]; + uint16_t set_hyst[MAX_SENSE]; + uint16_t reserve1[mb_fill_rsv(100, uint16_t[MAX_SENSE])]; +} MB_DataHoldRegsTypeDef; + + + + + +/** MODBUS_DATA_RERISTERS_DEFINES + * @} + */ + +//----------------DEFINES FOR COILS----------------- +/** + * @addtogroup MODBUS_DATA_COILS_DEFINES + * @ingroup MODBUS_DATA + * @brief Defines for coils + @verbatim + Структура дефайна + Для массивов коилов: + C__ADDR - модбас адресс первого коила в массиве + C__QNT - количество коилов в массиве (минимум 16) + + При добавлении новых массивов коилов, необходимо их добавить в функцию MB_DefineCoilsAddress + + if(MB_Check_Address_For_Arr(Addr, Qnt, C__ADDR, C__QNT) == NO_ERRORS) + { + *pCoils = MB_Set_Coil_Reg_Ptr(&, Addr); + } + + @endverbatim + * @{ + */ + + + +/** + * @brief Коилы + * @details Желательно с помощью reserved делать стркутуру кратной 16-битам + */ +typedef union +{ + __PACKED_STRUCT + { + unsigned state_val_01: 1; + unsigned state_val_02: 1; + unsigned state_val_03: 1; + unsigned state_val_04: 1; + unsigned state_val_05: 1; + unsigned state_val_06: 1; + unsigned state_val_07: 1; + unsigned state_val_08: 1; + unsigned state_val_09: 1; + unsigned state_val_10: 1; + unsigned state_val_11: 1; + unsigned state_val_12: 1; + unsigned state_val_13: 1; + unsigned state_val_14: 1; + unsigned state_val_15: 1; + unsigned state_val_16: 1; + } state_val_bit; + uint16_t all; + + +} word; +typedef union +{ + __PACKED_STRUCT + { + unsigned Temp1_relay_isOn : 1; + unsigned Temp2_relay_isOn : 1; + unsigned Temp3_relay_isOn : 1; + unsigned Temp4_relay_isOn : 1; + unsigned Temp5_relay_isOn : 1; + unsigned Temp6_relay_isOn : 1; + unsigned Temp7_relay_isOn : 1; + unsigned Temp8_relay_isOn : 1; + unsigned Temp9_relay_isOn : 1; + unsigned Temp10_relay_isOn : 1; + unsigned Temp11_relay_isOn : 1; + unsigned Temp12_relay_isOn : 1; + unsigned Temp13_relay_isOn : 1; + unsigned Temp14_relay_isOn : 1; + unsigned Temp15_relay_isOn : 1; + unsigned Temp16_relay_isOn : 1; + + + } state_val_bit; + uint16_t all; + + +} RELAY_Struct; + +typedef union +{ + __PACKED_STRUCT + { + unsigned Temp1_isConnected : 1; + unsigned Temp2_isConnected : 1; + unsigned Temp3_isConnected : 1; + unsigned Temp4_isConnected : 1; + unsigned Temp5_isConnected : 1; + unsigned Temp6_isConnected : 1; + unsigned Temp7_isConnected : 1; + unsigned Temp8_isConnected : 1; + unsigned Temp9_isConnected : 1; + unsigned Temp10_isConnected : 1; + unsigned Temp11_isConnected : 1; + unsigned Temp12_isConnected : 1; + unsigned Temp13_isConnected : 1; + unsigned Temp14_isConnected : 1; + unsigned Temp15_isConnected : 1; + unsigned Temp16_isConnected : 1; + + } state_val_bit; + uint16_t all; + + +} STATUS_TSENS; + + +typedef __PACKED_STRUCT +{ + int temp ; + unsigned Temp_relay_on : 1; + unsigned Temp_relay_off : 1; + unsigned is_connect: 1; + +} Temp_sens; +extern Temp_sens temp_sens ; + +typedef __PACKED_STRUCT +{ + + + + word coils[3]; //48 + uint16_t reserve1[mb_fill_rsv(128 / 16, word[3])]; + STATUS_TSENS status_tSens[MAX_SENSE / 16]; //32 + uint16_t reserve2[mb_fill_rsv(128 / 16, STATUS_TSENS[MAX_SENSE / 16])]; + RELAY_Struct relay_struct[MAX_SENSE / 16 * 2]; //16 2 реле на 1 датчик + uint16_t reserve3[mb_fill_rsv(128 / 16, RELAY_Struct[MAX_SENSE / 16 * 2])]; + + unsigned init_param: 1; //384 + unsigned init_Tsens: 1; //385 + unsigned Save_Param_to_Flash: 1; //386 + unsigned reserved2: 13; + +} MB_DataCoilsTypeDef; + + + +/** MODBUS_DATA_COILS_DEFINES + * @} + */ + + +//-----------MODBUS DEVICE DATA SETTING------------- +// MODBUS DATA STRUCTTURE +/** + * @brief Структура со всеми регистрами и коилами модбас + * @ingroup MODBUS_DATA + */ +typedef struct // tester modbus data +{ + MB_DataInRegsTypeDef InRegs; ///< Modbus input registers @ref MB_DataInRegsTypeDef + + MB_DataCoilsTypeDef Coils; ///< Modbus coils @ref MB_DataCoilsTypeDef + + MB_DataHoldRegsTypeDef HoldRegs; ///< Modbus holding registers @ref MB_DataHoldRegsTypeDef +} MB_DataStructureTypeDef; +extern MB_DataStructureTypeDef MB_DATA; + +#endif //_MODBUS_DATA_H_ + +///////////////////////////////////////////////////////////// +///////////////////////TEMP/OUTDATE/OTHER//////////////////// \ No newline at end of file diff --git a/john103C6T6/logs/backup.lvm b/john103C6T6/logs/backup.lvm new file mode 100644 index 0000000..e3f6870 --- /dev/null +++ b/john103C6T6/logs/backup.lvm @@ -0,0 +1,431 @@ +LabVIEW Measurement +Writer_Version 2 +Reader_Version 2 +Separator Tab +Decimal_Separator , +Multi_Headings Yes +X_Columns One +Time_Pref Absolute +Operator z +Date 2025/11/13 +Time 15:16:08,040531158447265625 +***End_of_Header*** + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:08,040531158447265625 +X_Dimension Time +X0 0,0000000000000000E+0 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +0,000000 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:08,151824951171875 +X_Dimension Time +X0 1,1129379272460937E-1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +0,111294 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:09,1365952491760253906 +X_Dimension Time +X0 1,0960640907287598E+0 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +1,096064 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:10,1405615806579589844 +X_Dimension Time +X0 2,1000304222106934E+0 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +2,100030 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:11,1472897529602050781 +X_Dimension Time +X0 3,1067585945129395E+0 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +3,106759 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:12,765697479248046875 +X_Dimension Time +X0 4,7251663208007812E+0 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +4,725166 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:13,140415191650390625 +X_Dimension Time +X0 5,0998840332031250E+0 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +5,099884 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:14,1417174339294433594 +X_Dimension Time +X0 6,1011862754821777E+0 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +6,101186 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:15,1356105804443359375 +X_Dimension Time +X0 7,0950794219970703E+0 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +7,095079 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:16,1398367881774902344 +X_Dimension Time +X0 8,0993056297302246E+0 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +8,099306 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:17,1468534469604492187 +X_Dimension Time +X0 9,1063222885131836E+0 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +9,106322 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:18,1485104560852050781 +X_Dimension Time +X0 1,0107979297637939E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +10,107979 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:19,1396398544311523437 +X_Dimension Time +X0 1,1099108695983887E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +11,099109 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:20,14166259765625 +X_Dimension Time +X0 1,2101131439208984E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +12,101131 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:21,1363024711608886719 +X_Dimension Time +X0 1,3095771312713623E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +13,095771 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:22,1432185173034667969 +X_Dimension Time +X0 1,4102687358856201E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +14,102687 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:23,1432042121887207031 +X_Dimension Time +X0 1,5102673053741455E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +15,102673 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:24,1468262672424316406 +X_Dimension Time +X0 1,6106295108795166E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +16,106295 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:25,1429185867309570312 +X_Dimension Time +X0 1,7102387428283691E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +17,102387 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:26,1594376564025878906 +X_Dimension Time +X0 1,8118906497955322E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +18,118906 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:27,1411752700805664062 +X_Dimension Time +X0 1,9100644111633301E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +19,100644 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:28,1400208473205566406 +X_Dimension Time +X0 2,0099489688873291E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +20,099490 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:29,1346111297607421875 +X_Dimension Time +X0 2,1094079971313477E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +21,094080 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:30,1374959945678710937 +X_Dimension Time +X0 2,2096964836120605E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +22,096965 28,500000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:31,1462650299072265625 +X_Dimension Time +X0 2,3105733871459961E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +23,105734 29,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:32,1459894180297851562 +X_Dimension Time +X0 2,4105458259582520E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +24,105458 29,500000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:33,1347680091857910156 +X_Dimension Time +X0 2,5094236850738525E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +25,094237 30,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:34,1428799629211425781 +X_Dimension Time +X0 2,6102348804473877E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +26,102349 30,500000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:35,142475128173828125 +X_Dimension Time +X0 2,7101943969726562E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +27,101944 31,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:36,1425271034240722656 +X_Dimension Time +X0 2,8101995944976807E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +28,101996 30,500000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:37,1589808464050292969 +X_Dimension Time +X0 2,9118449687957764E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +29,118450 30,500000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:38,1375432014465332031 +X_Dimension Time +X0 3,0097012042999268E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +30,097012 30,500000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:39,5883951187133789063 +X_Dimension Time +X0 3,1547863960266113E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +31,547864 30,500000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:40,1435170173645019531 +X_Dimension Time +X0 3,2102985858917236E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +32,102986 30,500000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:41,1350607872009277344 +X_Dimension Time +X0 3,3094529628753662E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +33,094530 30,500000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:42,1323223114013671875 +X_Dimension Time +X0 3,4091791152954102E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +34,091791 30,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:43,1501688957214355469 +X_Dimension Time +X0 3,5109637737274170E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +35,109638 30,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:16:44,1386942863464355469 +X_Dimension Time +X0 3,6098163127899170E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +36,098163 30,000000 temp1 + diff --git a/john103C6T6/logs/backup.tdms b/john103C6T6/logs/backup.tdms new file mode 100644 index 0000000..bfb3b28 Binary files /dev/null and b/john103C6T6/logs/backup.tdms differ diff --git a/john103C6T6/logs/backup.tdms_index b/john103C6T6/logs/backup.tdms_index new file mode 100644 index 0000000..ff2a845 Binary files /dev/null and b/john103C6T6/logs/backup.tdms_index differ diff --git a/john103C6T6/logs/backup_1.tdms b/john103C6T6/logs/backup_1.tdms new file mode 100644 index 0000000..1f674b7 Binary files /dev/null and b/john103C6T6/logs/backup_1.tdms differ diff --git a/john103C6T6/logs/backup_1.tdms_index b/john103C6T6/logs/backup_1.tdms_index new file mode 100644 index 0000000..ff2a845 Binary files /dev/null and b/john103C6T6/logs/backup_1.tdms_index differ diff --git a/john103C6T6/logs/log.lvm b/john103C6T6/logs/log.lvm new file mode 100644 index 0000000..dd48ed2 --- /dev/null +++ b/john103C6T6/logs/log.lvm @@ -0,0 +1,233 @@ +LabVIEW Measurement +Writer_Version 2 +Reader_Version 2 +Separator Tab +Decimal_Separator , +Multi_Headings Yes +X_Columns One +Time_Pref Absolute +Operator z +Date 2025/11/13 +Time 15:18:42,2196631431579589844 +***End_of_Header*** + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:18:42,2196631431579589844 +X_Dimension Time +X0 0,0000000000000000E+0 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +0,000000 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:18:43,1454310417175292969 +X_Dimension Time +X0 9,2576789855957031E-1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +0,925768 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:18:44,1414446830749511719 +X_Dimension Time +X0 1,9217815399169922E+0 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +1,921782 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:18:45,1437168121337890625 +X_Dimension Time +X0 2,9240536689758301E+0 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +2,924054 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:18:46,1456303596496582031 +X_Dimension Time +X0 3,9259672164916992E+0 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +3,925967 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:18:47,1414666175842285156 +X_Dimension Time +X0 4,9218034744262695E+0 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +4,921803 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:18:48,14643096923828125 +X_Dimension Time +X0 5,9267678260803223E+0 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +5,926768 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:18:49,1424298286437988281 +X_Dimension Time +X0 6,9227666854858398E+0 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +6,922767 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:18:50,1434178352355957031 +X_Dimension Time +X0 7,9237546920776367E+0 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +7,923755 28,500000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:18:51,1381001472473144531 +X_Dimension Time +X0 8,9184370040893555E+0 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +8,918437 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:18:52,1338038444519042969 +X_Dimension Time +X0 9,9141407012939453E+0 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +9,914141 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:18:53,1467270851135253906 +X_Dimension Time +X0 1,0927063941955566E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +10,927064 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:18:54,1358785629272460937 +X_Dimension Time +X0 1,1916215419769287E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +11,916215 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:18:55,14373016357421875 +X_Dimension Time +X0 1,2924067020416260E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +12,924067 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:18:56,1407599449157714844 +X_Dimension Time +X0 1,3921096801757812E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +13,921097 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:18:58,7443718910217285156 +X_Dimension Time +X0 1,6524708747863770E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +16,524709 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:18:58,8754205703735351562 +X_Dimension Time +X0 1,6655757427215576E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +16,655757 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:18:59,1390137672424316406 +X_Dimension Time +X0 1,6919350624084473E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +16,919351 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:19:00,13970947265625 +X_Dimension Time +X0 1,7920046329498291E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +17,920046 28,000000 temp1 + +Channels 1 +Samples 1 +Date 2025/11/13 +Time 15:19:01,1449561119079589844 +X_Dimension Time +X0 1,8925292968750000E+1 +Delta_X 1,000000 +***End_of_Header*** +X_Value Untitled Comment +18,925293 28,000000 temp1 + diff --git a/john103C6T6/logs/log.tdms b/john103C6T6/logs/log.tdms new file mode 100644 index 0000000..f3b775c Binary files /dev/null and b/john103C6T6/logs/log.tdms differ diff --git a/john103C6T6/logs/log.tdms_index b/john103C6T6/logs/log.tdms_index new file mode 100644 index 0000000..ff2a845 Binary files /dev/null and b/john103C6T6/logs/log.tdms_index differ diff --git a/john103C6T6/logs/log_1.tdms b/john103C6T6/logs/log_1.tdms new file mode 100644 index 0000000..b397a67 Binary files /dev/null and b/john103C6T6/logs/log_1.tdms differ diff --git a/john103C6T6/logs/log_1.tdms_index b/john103C6T6/logs/log_1.tdms_index new file mode 100644 index 0000000..3c743a9 Binary files /dev/null and b/john103C6T6/logs/log_1.tdms_index differ diff --git a/john103C6T6/logs/log_2.tdms b/john103C6T6/logs/log_2.tdms new file mode 100644 index 0000000..f114081 Binary files /dev/null and b/john103C6T6/logs/log_2.tdms differ diff --git a/john103C6T6/logs/log_2.tdms_index b/john103C6T6/logs/log_2.tdms_index new file mode 100644 index 0000000..0cb49f9 Binary files /dev/null and b/john103C6T6/logs/log_2.tdms_index differ diff --git a/john103C6T6/logs/log_3.tdms b/john103C6T6/logs/log_3.tdms new file mode 100644 index 0000000..c6b03d7 Binary files /dev/null and b/john103C6T6/logs/log_3.tdms differ diff --git a/john103C6T6/logs/log_3.tdms_index b/john103C6T6/logs/log_3.tdms_index new file mode 100644 index 0000000..7aaab44 Binary files /dev/null and b/john103C6T6/logs/log_3.tdms_index differ diff --git a/john103C6T6/logs/Новый текстовый документ.txt b/john103C6T6/logs/Новый текстовый документ.txt new file mode 100644 index 0000000..e69de29