فهرست منبع

Changes for new hardware.

Vladimir N. Shilov 3 سال پیش
والد
کامیت
64318dc195
4فایلهای تغییر یافته به همراه22 افزوده شده و 18 حذف شده
  1. 6 6
      Inc/main.h
  2. 4 0
      ReadMe.txt
  3. 6 6
      Src/main.c
  4. 6 6
      Src/stm32g0xx_it.c

+ 6 - 6
Inc/main.h

@@ -120,8 +120,8 @@ typedef union {
 
 /* Exported macro ------------------------------------------------------------*/
 /* USER CODE BEGIN EM */
-#define LATCH_DOWN    GPIOA->BRR = 0x8000
-#define LATCH_UP      GPIOA->BSRR = 0x8000
+#define LATCH_DOWN    GPIOC->BRR = 0x40
+#define LATCH_UP      GPIOC->BSRR = 0x40
 
 #define TUBE_PWR_ON   GPIOA->BRR = 0x10
 #define TUBE_PWR_OFF  GPIOA->BSRR = 0x10
@@ -173,10 +173,10 @@ void Error_Handler(void);
 #define BTN3_GPIO_Port GPIOA
 #define BTN4_Pin LL_GPIO_PIN_11
 #define BTN4_GPIO_Port GPIOA
-#define Latch_Pin LL_GPIO_PIN_15
-#define Latch_GPIO_Port GPIOA
-#define IRQ_Pin LL_GPIO_PIN_8
-#define IRQ_GPIO_Port GPIOB
+#define Latch_Pin LL_GPIO_PIN_6
+#define Latch_GPIO_Port GPIOC
+#define IRQ_Pin LL_GPIO_PIN_14
+#define IRQ_GPIO_Port GPIOC
 #define IRQ_EXTI_IRQn EXTI4_15_IRQn
 /* USER CODE BEGIN Private defines */
 #define USE_FULL_LL_DRIVER 1

+ 4 - 0
ReadMe.txt

@@ -16,3 +16,7 @@ MCU - STM32G030K8.
 подтянул резисторами с наружи на +5В. Вывод LATCH придётся переносить на 26-ой 
 вывод -- PA15.
 Исправил схему и плату.
+---
+12.07.2021
+
+Переход на новую версию железа.

+ 6 - 6
Src/main.c

@@ -481,10 +481,10 @@ static void MX_I2C1_Init(void)
 
   LL_IOP_GRP1_EnableClock(LL_IOP_GRP1_PERIPH_GPIOB);
   /**I2C1 GPIO Configuration
-  PB6   ------> I2C1_SCL
-  PB7   ------> I2C1_SDA
+  PB8   ------> I2C1_SCL
+  PB9   ------> I2C1_SDA
   */
-  GPIO_InitStruct.Pin = LL_GPIO_PIN_6;
+  GPIO_InitStruct.Pin = LL_GPIO_PIN_8;
   GPIO_InitStruct.Mode = LL_GPIO_MODE_ALTERNATE;
   GPIO_InitStruct.Speed = LL_GPIO_SPEED_FREQ_HIGH;
   GPIO_InitStruct.OutputType = LL_GPIO_OUTPUT_OPENDRAIN;
@@ -492,7 +492,7 @@ static void MX_I2C1_Init(void)
   GPIO_InitStruct.Alternate = LL_GPIO_AF_6;
   LL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
-  GPIO_InitStruct.Pin = LL_GPIO_PIN_7;
+  GPIO_InitStruct.Pin = LL_GPIO_PIN_9;
   GPIO_InitStruct.Mode = LL_GPIO_MODE_ALTERNATE;
   GPIO_InitStruct.Speed = LL_GPIO_SPEED_FREQ_HIGH;
   GPIO_InitStruct.OutputType = LL_GPIO_OUTPUT_OPENDRAIN;
@@ -1091,10 +1091,10 @@ static void MX_GPIO_Init(void)
   LL_GPIO_Init(Latch_GPIO_Port, &GPIO_InitStruct);
 
   /**/
-  LL_EXTI_SetEXTISource(LL_EXTI_CONFIG_PORTB, LL_EXTI_CONFIG_LINE8);
+  LL_EXTI_SetEXTISource(LL_EXTI_CONFIG_PORTC, LL_EXTI_CONFIG_LINE14);
 
   /**/
-  EXTI_InitStruct.Line_0_31 = LL_EXTI_LINE_8;
+  EXTI_InitStruct.Line_0_31 = LL_EXTI_LINE_14;
   EXTI_InitStruct.LineCommand = ENABLE;
   EXTI_InitStruct.Mode = LL_EXTI_MODE_IT;
   EXTI_InitStruct.Trigger = LL_EXTI_TRIGGER_RISING;

+ 6 - 6
Src/stm32g0xx_it.c

@@ -162,16 +162,16 @@ void RCC_IRQHandler(void)
 void EXTI4_15_IRQHandler(void)
 {
   /* USER CODE BEGIN EXTI4_15_IRQn 0 */
-  //if ((EXTI->RPR1 & 1<<8) != 0)
+  //if ((EXTI->RPR1 & 1<<14) != 0)
   /* USER CODE END EXTI4_15_IRQn 0 */
-  if (LL_EXTI_IsActiveRisingFlag_0_31(LL_EXTI_LINE_8) != RESET)
+  if (LL_EXTI_IsActiveRisingFlag_0_31(LL_EXTI_LINE_14) != RESET)
   {
-    LL_EXTI_ClearRisingFlag_0_31(LL_EXTI_LINE_8);
-    /* USER CODE BEGIN LL_EXTI_LINE_8_RISING */
-    //EXTI->RPR1 = 1<<8;
+    LL_EXTI_ClearRisingFlag_0_31(LL_EXTI_LINE_14);
+    /* USER CODE BEGIN LL_EXTI_LINE_14_RISING */
+    //EXTI->RPR1 = 1<<14;
     Flag.RTC_IRQ = 1;
 
-    /* USER CODE END LL_EXTI_LINE_8_RISING */
+    /* USER CODE END LL_EXTI_LINE_14_RISING */
   }
   /* USER CODE BEGIN EXTI4_15_IRQn 1 */