Move led functions to separae module.

.gitignore

@@ -8,3 +8,4 @@ EWSTM8/Release
 EWSTM8/settings
 EWSTM8/*.dep
 *.log
+.vscode/BROWSE.VC*

VAXL.code-workspace

@@ -4,5 +4,9 @@
 			"path": "."
 		}
 	],
-	"settings": {}
+	"settings": {
+		"files.associations": {
+			"led.h": "c"
+		}
+	}
 }

inc/board.h

@@ -6,51 +6,6 @@
 #define GPIO_LOW(a,b)     a->ODR &= ~b
 #define GPIO_TOGGLE(a,b)  a->ODR ^= b
 
-/* LED
- AAA
-F   B
-F   B
- GGG
-E   C
-E   C
- DDD P
-*/
-#define LED_SEG1_PORT   GPIOA
-#define LED_SEG1_PINS   GPIO_PIN_3
-#define LED_SEG_DP      GPIO_PIN_3
-
-#define LED_SEG3_PORT   GPIOC
-#define LED_SEG3_PINS   (GPIO_PIN_4 | GPIO_PIN_6 | GPIO_PIN_7 | GPIO_PIN_3 | GPIO_PIN_5)
-#define LED_SEG_A       GPIO_PIN_3
-#define LED_SEG_F       GPIO_PIN_4
-#define LED_SEG_B       GPIO_PIN_5
-#define LED_SEG_E       GPIO_PIN_6
-#define LED_SEG_G       GPIO_PIN_7
-
-#define LED_SEG2_PORT   GPIOD
-#define LED_SEG2_PINS   (GPIO_PIN_1 | GPIO_PIN_4)
-#define LED_SEG_C       GPIO_PIN_1
-#define LED_SEG_D       GPIO_PIN_4
-
-#define LED_OUT_OFF   {LED_SEG1_PORT->ODR |= LED_SEG1_PINS; LED_SEG2_PORT->ODR |= LED_SEG2_PINS; LED_SEG3_PORT->ODR |= LED_SEG3_PINS;}
-#define LED_OUT_DP    GPIOA->ODR &= ~LED_SEG_DP
-#define LED_OUT_MM    GPIOC->ODR &= ~LED_SEG_G
-#define LED_OUT_0     GPIOC->ODR &= ~(LED_SEG_A|LED_SEG_B|LED_SEG_E|LED_SEG_F); GPIOD->ODR &= ~(LED_SEG2_PINS)
-#define LED_OUT_1     GPIOC->ODR &= ~(LED_SEG_B); GPIOD->ODR &= ~(LED_SEG_C)
-#define LED_OUT_2     GPIOC->ODR &= ~(LED_SEG_A|LED_SEG_B|LED_SEG_E|LED_SEG_G); GPIOD->ODR &= ~(LED_SEG_D)
-#define LED_OUT_3     GPIOC->ODR &= ~(LED_SEG_A|LED_SEG_B|LED_SEG_G); GPIOD->ODR &= ~(LED_SEG2_PINS)
-#define LED_OUT_4     GPIOC->ODR &= ~(LED_SEG_B|LED_SEG_F|LED_SEG_G); GPIOD->ODR &= ~(LED_SEG_C)
-#define LED_OUT_5     GPIOC->ODR &= ~(LED_SEG_A|LED_SEG_F|LED_SEG_G); GPIOD->ODR &= ~(LED_SEG2_PINS)
-#define LED_OUT_6     GPIOC->ODR &= ~(LED_SEG_A|LED_SEG_E|LED_SEG_F|LED_SEG_G); GPIOD->ODR &= ~(LED_SEG2_PINS)
-#define LED_OUT_7     GPIOC->ODR &= ~(LED_SEG_A|LED_SEG_B); GPIOD->ODR &= ~(LED_SEG_C)
-#define LED_OUT_8     GPIOC->ODR &= ~(LED_SEG3_PINS); GPIOD->ODR &= ~(LED_SEG2_PINS)
-#define LED_OUT_9     GPIOC->ODR &= ~(LED_SEG_A|LED_SEG_B|LED_SEG_F|LED_SEG_G); GPIOD->ODR &= ~(LED_SEG2_PINS)
-
-/* shift register control pins */
-#define SPI_PORT      GPIOA
-#define SPI_SCK       GPIO_PIN_1
-#define SPI_DATA      GPIO_PIN_2
-
 /* ADC */
 #define ADC_PORT  GPIOD
 #define ADC_PINU  GPIO_PIN_2

lib/led.c

@@ -0,0 +1,97 @@
+/**
+ * Драйвер модуля LED-индикаторов
+ */
+
+#include "stm8s.h"
+#include "led.h"
+
+#define GPIO_HIGH(a,b)    a->ODR |= b
+#define GPIO_LOW(a,b)     a->ODR &= ~b
+#define GPIO_TOGGLE(a,b)  a->ODR ^= b
+
+uint8_t LedDigits[8] = {1, 2, 3, 4, 5, 6, 7, 8}; // digits to dsplay
+uint8_t LedPoint[8] = {0, 0, 0, 1, 0, 0, 0, 1}; // dots for digits
+
+static const uint16_t led_num[8] = {0x10, 0x20, 0x80, 0x40, 0x01, 0x02, 0x08, 0x04};
+
+static void led_SelectDigit (const uint8_t first);
+
+/*
+ * Output current value to next led
+ */
+void led_OutputValue(void) {
+  static uint8_t ledn = 0;
+
+  /* all off */
+  LED_OUT_OFF;
+
+  /* Fire on nex led */
+  led_SelectDigit(ledn);
+
+  /* out next value */
+  switch (LedDigits[ledn]) {
+    case 0:
+      LED_OUT_0;
+      break;
+    case 1:
+      LED_OUT_1;
+      break;
+    case 2:
+      LED_OUT_2;
+      break;
+    case 3:
+      LED_OUT_3;
+      break;
+    case 4:
+      LED_OUT_4;
+      break;
+    case 5:
+      LED_OUT_5;
+      break;
+    case 6:
+      LED_OUT_6;
+      break;
+    case 7:
+      LED_OUT_7;
+      break;
+    case 8:
+      LED_OUT_8;
+      break;
+    case 9:
+      LED_OUT_9;
+      break;
+    default:
+      LED_OUT_MM;
+  }
+  /*
+  if(LedPoint[ledn] != 0) {
+    LED_OUT_DP;
+  }
+  */
+  ledn ++;
+  if (ledn > 7) {
+    ledn = 0;
+  }
+}
+
+/*
+ * Select LED Digit.
+ * If first != 0 - select next, by shift '1' on outputs,
+ * else select first digit.
+ * led digits sequence (b - bottom, t - top):
+ * b1, b2, b4, b3, t1, t2, t4, t3.
+ */
+static void led_SelectDigit (const uint8_t first) {
+  uint8_t i;
+  uint8_t data = led_num[first];
+  for (i=0; i<8; i++) {
+    GPIO_LOW(SPI_PORT, SPI_SCK); // prepare CLK
+    if (data & 0x80) { // if msb == 1
+      GPIO_HIGH(SPI_PORT, SPI_DATA); // DATA = 1
+    } else {
+      GPIO_LOW(SPI_PORT, SPI_DATA); // DATA = 0
+    }
+    GPIO_HIGH(SPI_PORT, SPI_SCK); // shift bit
+    data <<= 1;
+  }
+}

lib/led.h

@@ -0,0 +1,60 @@
+#pragma once
+#ifndef LED_H
+#define LED_H
+
+// time to show one led digit, ms
+#define LED_ONE_PERIOD  2
+
+/* LED
+ AAA
+F   B
+F   B
+ GGG
+E   C
+E   C
+ DDD P
+*/
+#define LED_SEG1_PORT   GPIOA
+#define LED_SEG1_PINS   GPIO_PIN_3
+#define LED_SEG_DP      GPIO_PIN_3
+
+#define LED_SEG3_PORT   GPIOC
+#define LED_SEG3_PINS   (GPIO_PIN_4 | GPIO_PIN_6 | GPIO_PIN_7 | GPIO_PIN_3 | GPIO_PIN_5)
+#define LED_SEG_A       GPIO_PIN_3
+#define LED_SEG_F       GPIO_PIN_4
+#define LED_SEG_B       GPIO_PIN_5
+#define LED_SEG_E       GPIO_PIN_6
+#define LED_SEG_G       GPIO_PIN_7
+
+#define LED_SEG2_PORT   GPIOD
+#define LED_SEG2_PINS   (GPIO_PIN_1 | GPIO_PIN_4)
+#define LED_SEG_C       GPIO_PIN_1
+#define LED_SEG_D       GPIO_PIN_4
+
+#define LED_OUT_OFF   {LED_SEG1_PORT->ODR |= LED_SEG1_PINS; LED_SEG2_PORT->ODR |= LED_SEG2_PINS; LED_SEG3_PORT->ODR |= LED_SEG3_PINS;}
+#define LED_OUT_DP    GPIOA->ODR &= ~LED_SEG_DP
+#define LED_OUT_MM    GPIOC->ODR &= ~LED_SEG_G
+#define LED_OUT_0     GPIOC->ODR &= ~(LED_SEG_A|LED_SEG_B|LED_SEG_E|LED_SEG_F); GPIOD->ODR &= ~(LED_SEG2_PINS)
+#define LED_OUT_1     GPIOC->ODR &= ~(LED_SEG_B); GPIOD->ODR &= ~(LED_SEG_C)
+#define LED_OUT_2     GPIOC->ODR &= ~(LED_SEG_A|LED_SEG_B|LED_SEG_E|LED_SEG_G); GPIOD->ODR &= ~(LED_SEG_D)
+#define LED_OUT_3     GPIOC->ODR &= ~(LED_SEG_A|LED_SEG_B|LED_SEG_G); GPIOD->ODR &= ~(LED_SEG2_PINS)
+#define LED_OUT_4     GPIOC->ODR &= ~(LED_SEG_B|LED_SEG_F|LED_SEG_G); GPIOD->ODR &= ~(LED_SEG_C)
+#define LED_OUT_5     GPIOC->ODR &= ~(LED_SEG_A|LED_SEG_F|LED_SEG_G); GPIOD->ODR &= ~(LED_SEG2_PINS)
+#define LED_OUT_6     GPIOC->ODR &= ~(LED_SEG_A|LED_SEG_E|LED_SEG_F|LED_SEG_G); GPIOD->ODR &= ~(LED_SEG2_PINS)
+#define LED_OUT_7     GPIOC->ODR &= ~(LED_SEG_A|LED_SEG_B); GPIOD->ODR &= ~(LED_SEG_C)
+#define LED_OUT_8     GPIOC->ODR &= ~(LED_SEG3_PINS); GPIOD->ODR &= ~(LED_SEG2_PINS)
+#define LED_OUT_9     GPIOC->ODR &= ~(LED_SEG_A|LED_SEG_B|LED_SEG_F|LED_SEG_G); GPIOD->ODR &= ~(LED_SEG2_PINS)
+#define LED_OUT_H     GPIOC->ODR &= ~(LED_SEG_B|LED_SEG_E|LED_SEG_F|LED_SEG_G); GPIOD->ODR &= ~(LED_SEG_C)
+#define LED_OUT_PL    GPIOC->ODR &= ~(LED_SEG_B|LED_SEG_G); GPIOD->ODR &= ~(LED_SEG_C)
+
+/* shift register control pins */
+#define SPI_PORT      GPIOA
+#define SPI_SCK       GPIO_PIN_1
+#define SPI_DATA      GPIO_PIN_2
+
+extern uint8_t LedDigits[8];
+extern uint8_t LedPoint[8];
+
+void led_OutputValue(void);
+
+#endif // LED_H

src/main.c

@@ -21,27 +21,19 @@
 #include "stm8s.h"
 #include "board.h"
 #include "i2c.h"
+#include "led.h"
 
 /* Private define ------------------------------------------------------------*/
 #define TIM4_PERIOD  (uint8_t)124
-// time to show one led digit, ms
-#define LED_ONE_PERIOD  2
 
 /* Private typedef -----------------------------------------------------------*/
 /* Private constants ---------------------------------------------------------*/
-static const uint16_t led_num[8] = {0x10, 0x20, 0x80, 0x40, 0x01, 0x02, 0x08, 0x04};
-
 /* Private variables ---------------------------------------------------------*/
 __IO uint16_t ConversionBuffer[ADC_SMPLS];
 __IO uint8_t BufferIndex = 0;
-__IO uint8_t LedCnt = 0;
-static uint8_t LedDigits[8] = {1, 2, 3, 4, 5, 6, 7, 8}; // digits to dsplay
-static uint8_t LedPoint[8] = {0, 0, 0, 1, 0, 0, 0, 1}; // dots for digits
 
 /* Private function prototypes -----------------------------------------------*/
 static void boardInit(void);
-static void led_SelectDigit (uint8_t first);
-static void led_OutputValue(void);
 
 void main(void)
 {
@@ -53,10 +45,6 @@ void main(void)
 
   /* Infinite loop */
   while (1) {
-    if (LedCnt >= LED_ONE_PERIOD) {
-      LedCnt = 0;
-      led_OutputValue();
-    }
 
     wfi();
   }
@@ -64,64 +52,6 @@ void main(void)
 }
 
 /* Private functions ---------------------------------------------------------*/
-/*
- * Output current value to next led
- */
-static void led_OutputValue(void) {
-  static uint8_t ledn = 0;
-
-  /* all off */
-  LED_OUT_OFF;
-
-  /* Fire on nex led */
-  led_SelectDigit(ledn);
-
-  /* out next value */
-  switch (LedDigits[ledn]) {
-    case 0:
-      LED_OUT_0;
-      break;
-    case 1:
-      LED_OUT_1;
-      break;
-    case 2:
-      LED_OUT_2;
-      break;
-    case 3:
-      LED_OUT_3;
-      break;
-    case 4:
-      LED_OUT_4;
-      break;
-    case 5:
-      LED_OUT_5;
-      break;
-    case 6:
-      LED_OUT_6;
-      break;
-    case 7:
-      LED_OUT_7;
-      break;
-    case 8:
-      LED_OUT_8;
-      break;
-    case 9:
-      LED_OUT_9;
-      break;
-    default:
-      LED_OUT_MM;
-  }
-  /*
-  if(LedPoint[ledn] != 0) {
-    LED_OUT_DP;
-  }
-  */
-  ledn ++;
-  if (ledn > 7) {
-    ledn = 0;
-  }
-}
-
 static void boardInit(void) {
   /* Насколько я понял, для частот выше 16МГц нужно вводить задержку при работе с FLASH:
     - Before using the HSE clock make sure that the "Flash_Wait_States" is set to 1.
@@ -225,28 +155,6 @@ static void boardInit(void) {
   TIM4->CR1 |= (uint8_t)TIM4_CR1_CEN;
 }
 
-/*
- * Select LED Digit.
- * If first != 0 - select next, by shift '1' on outputs,
- * else select first digit.
- * led digits sequence (b - bottom, t - top):
- * b1, b2, b4, b3, t1, t2, t4, t3.
- */
-static void led_SelectDigit (const uint8_t first) {
-  uint8_t i;
-  uint8_t data = led_num[first];
-  for (i=0; i<8; i++) {
-    GPIO_LOW(SPI_PORT, SPI_SCK); // prepare CLK
-    if (data & 0x80) { // if msb == 1
-      GPIO_HIGH(SPI_PORT, SPI_DATA); // DATA = 1
-    } else {
-      GPIO_LOW(SPI_PORT, SPI_DATA); // DATA = 0
-    }
-    GPIO_HIGH(SPI_PORT, SPI_SCK); // shift bit
-    data <<= 1;
-  }
-}
-
 #ifdef USE_FULL_ASSERT
 /**
   * @brief  Reports the name of the source file and the source line number

src/stm8s_it.c

@@ -29,6 +29,7 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include "stm8s_it.h"
+#include "led.h"
 
 /** @addtogroup Template_Project
   * @{
@@ -40,7 +41,7 @@
 /* Private variables ---------------------------------------------------------*/
 extern __IO uint16_t ConversionBuffer[64];
 extern __IO uint8_t BufferIndex;
-extern __IO uint8_t LedCnt;
+static uint8_t LedCnt = 0;
 
 /* Private function prototypes -----------------------------------------------*/
 /* Private functions ---------------------------------------------------------*/
@@ -504,13 +505,15 @@ INTERRUPT_HANDLER(TIM6_UPD_OVF_TRG_IRQHandler, 23)
   */
  INTERRUPT_HANDLER(TIM4_UPD_OVF_IRQHandler, 23)
  {
-  /* In order to detect unexpected events during development,
-     it is recommended to set a breakpoint on the following instruction.
-  */
-  /* Cleat Interrupt Pending bit */
-  TIM4->SR1 = (uint8_t)(~(uint8_t)TIM4_IT_UPDATE);
 
-  LedCnt ++;
+   /* Cleat Interrupt Pending bit */
+   TIM4->SR1 = (uint8_t)(~(uint8_t)TIM4_IT_UPDATE);
+
+   LedCnt ++;
+   if (LedCnt >= LED_ONE_PERIOD) {
+      LedCnt = 0;
+      led_OutputValue();
+   }
  }
 #endif /* (STM8S903) || (STM8AF622x)*/