From 814c8e0337c05f8d0e4ae9893c0ca981cb39a42f Mon Sep 17 00:00:00 2001 From: leo Date: Sat, 23 Sep 2023 16:46:40 +0200 Subject: [PATCH] load unit update --- Core/Src/main.c | 3 ++- PSE.ioc | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Core/Src/main.c b/Core/Src/main.c index ac34293..e7d52ec 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -91,6 +91,7 @@ ADS7843_Def Touch_Def = { pse_unit pse_units[PSE_UNITS_NUM]; pse_syringe pse_syringes[PSE_UNITS_NUM]; +pse_stepper_status pse_steppers_status[PSE_UNITS_NUM]; pse_home_display pse_home_displays[PSE_UNITS_NUM]; enum steppers_axis{PSE_X_STEPPER, PSE_Y_STEPPER, PSE_Z_STEPPER, PSE_E_STEPPER, PSE_STEPPER_NUM}; @@ -290,7 +291,7 @@ int main(void) f_mount(&FatFs, SD_disk_path, 0); // Load saved units - load_units(pse_units, pse_syringes, pse_stepper_confs, pse_home_displays, PSE_UNITS_NUM, 0); + load_units(pse_units, pse_syringes, pse_stepper_confs, pse_steppers_status, pse_home_displays, PSE_UNITS_NUM, 0); // Load the home screen Home_Screen_Gen(pse_units, PSE_UNITS_NUM, false); diff --git a/PSE.ioc b/PSE.ioc index 6b57cfc..d92679e 100644 --- a/PSE.ioc +++ b/PSE.ioc @@ -90,8 +90,8 @@ Mcu.PinsNb=51 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32F103VETx -MxCube.Version=6.9.1 -MxDb.Version=DB.6.0.91 +MxCube.Version=6.9.2 +MxDb.Version=DB.6.0.92 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.DMA2_Channel1_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false @@ -291,7 +291,7 @@ ProjectManager.ToolChainLocation= ProjectManager.UAScriptAfterPath= ProjectManager.UAScriptBeforePath= ProjectManager.UnderRoot=true -ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_DMA_Init-DMA-false-HAL-true,4-MX_FSMC_Init-FSMC-false-HAL-true,5-MX_USART1_UART_Init-USART1-false-HAL-true,6-MX_TIM4_Init-TIM4-false-HAL-true,7-MX_FATFS_Init-FATFS-false-HAL-false,8-MX_SDIO_SD_Init-SDIO-false-HAL-true +ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_DMA_Init-DMA-false-HAL-true,4-MX_FSMC_Init-FSMC-false-HAL-true,5-MX_USART1_UART_Init-USART1-false-HAL-true,6-MX_TIM4_Init-TIM4-false-HAL-true,7-MX_FATFS_Init-FATFS-false-HAL-false,8-MX_SDIO_SD_Init-SDIO-false-HAL-true,9-MX_TIM2_Init-TIM2-false-HAL-true,10-MX_TIM3_Init-TIM3-false-HAL-true,11-MX_TIM5_Init-TIM5-false-HAL-true RCC.ADCFreqValue=32000000 RCC.AHBFreq_Value=64000000 RCC.APB1CLKDivider=RCC_HCLK_DIV2 @@ -338,4 +338,4 @@ VP_TIM4_VS_ClockSourceINT.Signal=TIM4_VS_ClockSourceINT VP_TIM5_VS_ClockSourceINT.Mode=Internal VP_TIM5_VS_ClockSourceINT.Signal=TIM5_VS_ClockSourceINT board=custom -isbadioc=false +isbadioc=true