diff --git a/F3:F303/NitrogenFlooding/hardware.c b/F3:F303/NitrogenFlooding/hardware.c index d03dc31..fdd6b9f 100644 --- a/F3:F303/NitrogenFlooding/hardware.c +++ b/F3:F303/NitrogenFlooding/hardware.c @@ -28,7 +28,7 @@ TRUE_INLINE void gpio_setup(){ // enable PWM timer TIM3 RCC->APB1ENR |= RCC_APB1ENR_TIM3EN; for(int i = 0; i < 10000; ++i) nop(); - // PORT A + // PORT A (PA13/14 - SWDIO/SWCLK - AF0) GPIOA->ODR = 0; GPIOA->AFR[0] = 0; GPIOA->AFR[1] = AFRf(4, 9) | AFRf(4, 10) | AFRf(14, 11) | AFRf(14,12); @@ -36,7 +36,7 @@ TRUE_INLINE void gpio_setup(){ MODER_AF(9) | MODER_AF(10) | MODER_AF(11) | MODER_AF(12) | MODER_AF(13) | MODER_AF(14); GPIOA->OSPEEDR = OSPEED_HI(9) | OSPEED_HI(10) | OSPEED_HI(11) | OSPEED_HI(12) | OSPEED_HI(13) | OSPEED_HI(14); GPIOA->OTYPER = 0; - GPIOA->PUPDR = 0; + GPIOA->PUPDR = PUPD_PU(13) | PUPD_PD(14); // SWDIO - pullup, SDCLK - pulldown // PORT B GPIOB->ODR = 0; diff --git a/F3:F303/NitrogenFlooding/nitrogen.bin b/F3:F303/NitrogenFlooding/nitrogen.bin index 97fffbb..ec501e0 100755 Binary files a/F3:F303/NitrogenFlooding/nitrogen.bin and b/F3:F303/NitrogenFlooding/nitrogen.bin differ diff --git a/F3:F303/NitrogenFlooding/nitrogen.creator.user b/F3:F303/NitrogenFlooding/nitrogen.creator.user index aa79e75..4a03d2d 100644 --- a/F3:F303/NitrogenFlooding/nitrogen.creator.user +++ b/F3:F303/NitrogenFlooding/nitrogen.creator.user @@ -1,10 +1,10 @@ - + EnvironmentId - {7bd84e39-ca37-46d3-be9d-99ebea85bc0d} + {cf63021e-ef53-49b0-b03b-2f2570cdf3b6} ProjectExplorer.Project.ActiveTarget @@ -38,43 +38,32 @@ true 1 false - true + false false - 0 + 1 true true 0 8 true false - 1 + 2 true - false + true true *.md, *.MD, Makefile - false + true true ProjectExplorer.Project.PluginSettings - - true - false - true - true - true - true - - - 0 - true true true Builtin.DefaultTidyAndClazy - 2 + 4 @@ -88,12 +77,12 @@ Desktop Desktop Desktop - {65a14f9e-e008-4c1b-89df-4eaa4774b6e3} + {91347f2c-5221-46a7-80b1-0a054ca02f79} 0 0 0 - /Big/Data/00__Electronics/STM32/F303-nolib/blink + /home/eddy/Docs/SAO/ELECTRONICS/STM32/F3-srcs/NitrogenFlooding @@ -125,7 +114,7 @@ false - Default + По умолчанию GenericProjectManager.GenericBuildConfiguration 1 diff --git a/F3:F303/NitrogenFlooding/version.inc b/F3:F303/NitrogenFlooding/version.inc index 33f807c..f53810e 100644 --- a/F3:F303/NitrogenFlooding/version.inc +++ b/F3:F303/NitrogenFlooding/version.inc @@ -1,2 +1,2 @@ -#define BUILD_NUMBER "1" -#define BUILD_DATE "2023-03-20" +#define BUILD_NUMBER "2" +#define BUILD_DATE "2023-03-22"