Code cleanup. Not work...

Inc/board.h

@@ -147,7 +147,7 @@ typedef struct {
 
 /* Exported funcions */
 void SystemClock_Config(void);
-void Board_Init();
+void Board_Init(void);
 void Blink_Start(void);
 void Blink_Stop(void);
 void showDigits(uint8_t * dig);

Inc/main.h

@@ -1,4 +1,3 @@
-/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file           : main.h
@@ -17,7 +16,6 @@
   *
   ******************************************************************************
   */
-/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MAIN_H
@@ -29,26 +27,8 @@ extern "C" {
 
 /* Includes ------------------------------------------------------------------*/
 #include "stm32g0xx.h"
-#include "stm32g0xx_ll_dma.h"
-#include "stm32g0xx_ll_i2c.h"
-#include "stm32g0xx_ll_rcc.h"
-#include "stm32g0xx_ll_bus.h"
-#include "stm32g0xx_ll_system.h"
-#include "stm32g0xx_ll_exti.h"
-#include "stm32g0xx_ll_cortex.h"
-#include "stm32g0xx_ll_utils.h"
-#include "stm32g0xx_ll_pwr.h"
-#include "stm32g0xx_ll_spi.h"
-#include "stm32g0xx_ll_tim.h"
-#include "stm32g0xx_ll_gpio.h"
-#include "stm32g0xx_ll_usart.h"
-
-#if defined(USE_FULL_ASSERT)
-#include "stm32_assert.h"
-#endif /* USE_FULL_ASSERT */
 
 /* Private includes ----------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
 #include "board.h"
 #include "sensor.h"
 #include "i2c.h"
@@ -58,10 +38,7 @@ extern "C" {
 #include "event-system.h"
 #include "list_event.h"
 
-/* USER CODE END Includes */
-
 /* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
 typedef enum {
   DOWN = 0,
   UP = 1
@@ -117,26 +94,12 @@ typedef union {
   } s32;                  // element spec. for acc. struct with low or high u16
 } nt32_t;
 
-/* USER CODE END ET */
-
 /* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-/* USER CODE END EC */
-
 /* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
 /* Exported functions prototypes ---------------------------------------------*/
 void Error_Handler(void);
 
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
 /* Private defines -----------------------------------------------------------*/
-/* USER CODE BEGIN Private defines */
 /* time constant in ms */
 #define BTN_SCAN_PERIOD     10
 #define BTN_SCAN_PAUSE      200
@@ -152,8 +115,6 @@ typedef struct {
   //(GPIO_TypeDef *) GPIOA; // ?->IDR
 } btn_t;
 
-/* USER CODE END Private defines */
-
 #ifdef __cplusplus
 }
 #endif

Inc/stm32g0xx_it.h

@@ -1,4 +1,3 @@
-/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32g0xx_it.h
@@ -16,7 +15,6 @@
   *
  ******************************************************************************
   */
-/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32G0xx_IT_H
@@ -27,25 +25,9 @@
 #endif
 
 /* Private includes ----------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
 /* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
 /* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
 /* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
 /* Exported functions prototypes ---------------------------------------------*/
 void NMI_Handler(void);
 void HardFault_Handler(void);
@@ -61,9 +43,6 @@ void TIM17_IRQHandler(void);
 void I2C1_IRQHandler(void);
 void SPI1_IRQHandler(void);
 void USART1_IRQHandler(void);
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
 
 #ifdef __cplusplus
 }

MDK-ARM/MNC-IN12x5.uvoptx

@@ -135,7 +135,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>DLGUARM</Key>
-          <Name></Name>
+          <Name>ИЪAw</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -159,7 +159,7 @@
           <Type>0</Type>
           <LineNumber>157</LineNumber>
           <EnabledFlag>0</EnabledFlag>
-          <Address>134222080</Address>
+          <Address>134221344</Address>
           <ByteObject>0</ByteObject>
           <HtxType>0</HtxType>
           <ManyObjects>0</ManyObjects>
@@ -170,22 +170,6 @@
           <ExecCommand></ExecCommand>
           <Expression>\\MNC_IN12x5\../Src/rtos.c\157</Expression>
         </Bp>
-        <Bp>
-          <Number>1</Number>
-          <Type>0</Type>
-          <LineNumber>243</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134222374</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>../Src/stm32g0xx_it.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\MNC_IN12x5\../Src/stm32g0xx_it.c\243</Expression>
-        </Bp>
       </Breakpoint>
       <Tracepoint>
         <THDelay>0</THDelay>
@@ -570,7 +554,7 @@
   </Group>
 
   <Group>
-    <GroupName>Drivers/STM32G0xx_HAL_Driver</GroupName>
+    <GroupName>Drivers/CMSIS</GroupName>
     <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
@@ -582,134 +566,6 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_ll_utils.c</PathWithFileName>
-      <FilenameWithoutPath>stm32g0xx_ll_utils.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>25</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_ll_exti.c</PathWithFileName>
-      <FilenameWithoutPath>stm32g0xx_ll_exti.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>26</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_ll_gpio.c</PathWithFileName>
-      <FilenameWithoutPath>stm32g0xx_ll_gpio.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>27</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_ll_dma.c</PathWithFileName>
-      <FilenameWithoutPath>stm32g0xx_ll_dma.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>28</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_ll_i2c.c</PathWithFileName>
-      <FilenameWithoutPath>stm32g0xx_ll_i2c.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>29</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_ll_rcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32g0xx_ll_rcc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>30</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_ll_spi.c</PathWithFileName>
-      <FilenameWithoutPath>stm32g0xx_ll_spi.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>31</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_ll_pwr.c</PathWithFileName>
-      <FilenameWithoutPath>stm32g0xx_ll_pwr.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>32</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_ll_tim.c</PathWithFileName>
-      <FilenameWithoutPath>stm32g0xx_ll_tim.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>33</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\Drivers\STM32G0xx_HAL_Driver\Src\stm32g0xx_ll_usart.c</PathWithFileName>
-      <FilenameWithoutPath>stm32g0xx_ll_usart.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/CMSIS</GroupName>
-    <tvExp>1</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>34</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
       <PathWithFileName>../Src/system_stm32g0xx.c</PathWithFileName>
       <FilenameWithoutPath>system_stm32g0xx.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>

MDK-ARM/MNC-IN12x5.uvprojx

@@ -313,7 +313,7 @@
           </ArmAdsMisc>
           <Cads>
             <interw>1</interw>
-            <Optim>5</Optim>
+            <Optim>1</Optim>
             <oTime>0</oTime>
             <SplitLS>0</SplitLS>
             <OneElfS>1</OneElfS>
@@ -328,7 +328,7 @@
             <uC99>1</uC99>
             <uGnu>1</uGnu>
             <useXO>0</useXO>
-            <v6Lang>6</v6Lang>
+            <v6Lang>3</v6Lang>
             <v6LangP>3</v6LangP>
             <vShortEn>1</vShortEn>
             <vShortWch>1</vShortWch>
@@ -402,6 +402,57 @@
               <FileName>stm32g0xx_it.c</FileName>
               <FileType>1</FileType>
               <FilePath>../Src/stm32g0xx_it.c</FilePath>
+              <FileOption>
+                <CommonProperty>
+                  <UseCPPCompiler>2</UseCPPCompiler>
+                  <RVCTCodeConst>0</RVCTCodeConst>
+                  <RVCTZI>0</RVCTZI>
+                  <RVCTOtherData>0</RVCTOtherData>
+                  <ModuleSelection>0</ModuleSelection>
+                  <IncludeInBuild>2</IncludeInBuild>
+                  <AlwaysBuild>2</AlwaysBuild>
+                  <GenerateAssemblyFile>2</GenerateAssemblyFile>
+                  <AssembleAssemblyFile>2</AssembleAssemblyFile>
+                  <PublicsOnly>2</PublicsOnly>
+                  <StopOnExitCode>11</StopOnExitCode>
+                  <CustomArgument></CustomArgument>
+                  <IncludeLibraryModules></IncludeLibraryModules>
+                  <ComprImg>1</ComprImg>
+                </CommonProperty>
+                <FileArmAds>
+                  <Cads>
+                    <interw>2</interw>
+                    <Optim>1</Optim>
+                    <oTime>2</oTime>
+                    <SplitLS>2</SplitLS>
+                    <OneElfS>2</OneElfS>
+                    <Strict>2</Strict>
+                    <EnumInt>2</EnumInt>
+                    <PlainCh>2</PlainCh>
+                    <Ropi>2</Ropi>
+                    <Rwpi>2</Rwpi>
+                    <wLevel>0</wLevel>
+                    <uThumb>2</uThumb>
+                    <uSurpInc>2</uSurpInc>
+                    <uC99>2</uC99>
+                    <uGnu>2</uGnu>
+                    <useXO>2</useXO>
+                    <v6Lang>0</v6Lang>
+                    <v6LangP>0</v6LangP>
+                    <vShortEn>2</vShortEn>
+                    <vShortWch>2</vShortWch>
+                    <v6Lto>2</v6Lto>
+                    <v6WtE>2</v6WtE>
+                    <v6Rtti>2</v6Rtti>
+                    <VariousControls>
+                      <MiscControls></MiscControls>
+                      <Define></Define>
+                      <Undefine></Undefine>
+                      <IncludePath></IncludePath>
+                    </VariousControls>
+                  </Cads>
+                </FileArmAds>
+              </FileOption>
             </File>
             <File>
               <FileName>gpio.h</FileName>
@@ -505,61 +556,6 @@
             </File>
           </Files>
         </Group>
-        <Group>
-          <GroupName>Drivers/STM32G0xx_HAL_Driver</GroupName>
-          <Files>
-            <File>
-              <FileName>stm32g0xx_ll_utils.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_ll_utils.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32g0xx_ll_exti.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_ll_exti.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32g0xx_ll_gpio.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_ll_gpio.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32g0xx_ll_dma.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_ll_dma.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32g0xx_ll_i2c.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_ll_i2c.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32g0xx_ll_rcc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_ll_rcc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32g0xx_ll_spi.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_ll_spi.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32g0xx_ll_pwr.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_ll_pwr.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32g0xx_ll_tim.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_ll_tim.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32g0xx_ll_usart.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\Drivers\STM32G0xx_HAL_Driver\Src\stm32g0xx_ll_usart.c</FilePath>
-            </File>
-          </Files>
-        </Group>
         <Group>
           <GroupName>Drivers/CMSIS</GroupName>
           <Files>

Makefile

@@ -22,7 +22,7 @@ TARGET = MNC-IN12x5
 # debug build?
 DEBUG = 0
 # optimization
-OPT = -O2
+OPT = -Os
 OPT += -ffunction-sections -fdata-sections
 OPT += -fno-strict-aliasing
 OPT += -ffast-math -msoft-float -mfloat-abi=soft
@@ -49,16 +49,6 @@ Src/bme280.c \
 Src/rtos.c \
 Src/event-system.c \
 Src/system_stm32g0xx.c
-#Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_ll_utils.c \
-#Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_ll_exti.c \
-#Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_ll_gpio.c \
-#Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_ll_i2c.c \
-#Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_ll_dma.c \
-#Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_ll_rcc.c \
-#Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_ll_spi.c \
-#Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_ll_pwr.c \
-#Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_ll_tim.c \
-#Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_ll_usart.c \
 
 # ASM sources
 ASM_SOURCES =  \

Src/event-system.c

@@ -151,8 +151,11 @@ void ES_PlaceEvent(es_event_t event)
     tailBuf = (tailBuf + 1) & (SIZE_BUF - 1);
     countBuf ++;
     /* сигнализация переполнения буфера событий */
-//  } else {
-//      while(1);
+  } else {
+      TIM1->CCR2 = 0x0;
+      TIM1->CCR3 = 0x0;
+      TIM1->CCR4 = 0xff;
+      while(1);
   }
 }
 

Src/main.c

@@ -146,21 +146,7 @@ static void Color_RGB(uint8_t r, uint8_t g, uint8_t b) {
 
 /* cheng led color by time seconds */
 static void ColorCircle(void) {
-  //static
-  int16_t hue = bcd2bin(Clock.Sec) * 6; //0, stage = 0;
-/*
-  if (stage == 0) {
-    hue = (Clock.Sec * 6) - 6;
-    RTOS_SetTask(ColorCircle, 100, 100);
-  } else if (stage > 4) {
-    RTOS_DeleteTask(ColorCircle);
-    stage = 0;
-    hue ++;
-  } else {
-    hue ++;
-    stage ++;
-  }
-*/
+  int16_t hue = bcd2bin(Clock.Sec) * 6;
   HSV2LED(hue, 255, 255);
 }
 
@@ -394,7 +380,8 @@ void showPressure(void) {
 /* Simple function for cyclic show all sensor data */
 void showSensorData(void) {
   ES_SetState(stShowSensorData);
-  RTOS_DeleteTask(in15Off);
+  RTOS_DeleteTask(MinusFadeOut);
+  RTOS_DeleteTask(ColorCircle);
 
   showTemperature();
   tdelay_ms(3000);

Src/rtos.c

@@ -66,6 +66,9 @@ void RTOS_SetTask (void (*taskFunc)(void), uint32_t taskDelay, uint32_t taskPeri
       __enable_irq();
    } else {
      //!!! no left space for new task :-(
+    TIM1->CCR2 = 0xff;
+    TIM1->CCR3 = 0x0;
+    TIM1->CCR4 = 0x0;
      while (1);
    }
 }

Src/stm32g0xx_it.c

@@ -1,4 +1,3 @@
-/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32g0xx_it.c
@@ -16,51 +15,22 @@
   *
   ******************************************************************************
   */
-/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "main.h"
 #include "stm32g0xx_it.h"
-/* Private includes ----------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
-/* USER CODE END Includes */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN TD */
 
-/* USER CODE END TD */
+#pragma GCC optimize ("O0")
 
+/* Private includes ----------------------------------------------------------*/
+/* Private typedef -----------------------------------------------------------*/
 /* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
 /* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
 /* Private variables ---------------------------------------------------------*/
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
 /* Private function prototypes -----------------------------------------------*/
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
 /* Private user code ---------------------------------------------------------*/
-/* USER CODE BEGIN 0 */
-
-/* USER CODE END 0 */
-
 /* External variables --------------------------------------------------------*/
 
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
 /******************************************************************************/
 /*           Cortex-M0+ Processor Interruption and Exception Handlers          */
 /******************************************************************************/
@@ -69,14 +39,9 @@
   */
 void NMI_Handler(void)
 {
-  /* USER CODE BEGIN NonMaskableInt_IRQn 0 */
-
-  /* USER CODE END NonMaskableInt_IRQn 0 */
-  /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
   while (1)
   {
   }
-  /* USER CODE END NonMaskableInt_IRQn 1 */
 }
 
 /**
@@ -84,13 +49,8 @@ void NMI_Handler(void)
   */
 void HardFault_Handler(void)
 {
-  /* USER CODE BEGIN HardFault_IRQn 0 */
-
-  /* USER CODE END HardFault_IRQn 0 */
   while (1)
   {
-    /* USER CODE BEGIN W1_HardFault_IRQn 0 */
-    /* USER CODE END W1_HardFault_IRQn 0 */
   }
 }
 
@@ -99,12 +59,6 @@ void HardFault_Handler(void)
   */
 void SVC_Handler(void)
 {
-  /* USER CODE BEGIN SVC_IRQn 0 */
-
-  /* USER CODE END SVC_IRQn 0 */
-  /* USER CODE BEGIN SVC_IRQn 1 */
-
-  /* USER CODE END SVC_IRQn 1 */
 }
 
 /**
@@ -112,29 +66,7 @@ void SVC_Handler(void)
   */
 void PendSV_Handler(void)
 {
-  /* USER CODE BEGIN PendSV_IRQn 0 */
-
-  /* USER CODE END PendSV_IRQn 0 */
-  /* USER CODE BEGIN PendSV_IRQn 1 */
-
-  /* USER CODE END PendSV_IRQn 1 */
-}
-
-#ifdef DONT_USE_SHED
-/**
-  * @brief This function handles System tick timer.
-  */
-void SysTick_Handler(void)
-{
-  /* USER CODE BEGIN SysTick_IRQn 0 */
-
-  /* USER CODE END SysTick_IRQn 0 */
-
-  /* USER CODE BEGIN SysTick_IRQn 1 */
-
-  /* USER CODE END SysTick_IRQn 1 */
 }
-#endif /* DONT_USE_SHED */
 
 /******************************************************************************/
 /* STM32G0xx Peripheral Interrupt Handlers                                    */
@@ -146,27 +78,15 @@ void SysTick_Handler(void)
 /**
   * @brief This function handles EXTI line 4 to 15 interrupts.
   */
-#ifndef __ARMCC_VERSION
-void __attribute__((optimize("O0"))) EXTI4_15_IRQHandler(void)
-#else
+
 void EXTI4_15_IRQHandler(void)
-#endif
 {
-  /* USER CODE BEGIN EXTI4_15_IRQn 0 */
   if ((EXTI->FPR1 & EXTI_IMR1_IM14) != 0)
   {
-  /* USER CODE END EXTI4_15_IRQn 0 */
-    /* USER CODE BEGIN LL_EXTI_LINE_14_FALING */
     EXTI->FPR1 = EXTI_IMR1_IM14;
     Flag.RTC_IRQ = 1;
-
     ES_PlaceEvent(evNewSecond);
-
-    /* USER CODE END LL_EXTI_LINE_14_RISING */
   }
-  /* USER CODE BEGIN EXTI4_15_IRQn 1 */
-
-  /* USER CODE END EXTI4_15_IRQn 1 */
 }
 
 /**
@@ -174,8 +94,7 @@ void EXTI4_15_IRQHandler(void)
   */
 void DMA1_Channel1_IRQHandler(void)
 {
-  /* USER CODE BEGIN DMA1_Channel1_IRQn 0 */
-  if (LL_DMA_IsActiveFlag_TC1(DMA1) != 0) {
+  if ((DMA1->ISR & DMA_IFCR_CTCIF1) != 0) {
     DMA1->IFCR |= DMA_IFCR_CTCIF1; // reset IRQ flag
 
     Flag.SPI_TX_End = 1;
@@ -189,11 +108,6 @@ void DMA1_Channel1_IRQHandler(void)
     while ((SPI1->SR & SPI_SR_BSY) != 0) {};
     LATCH_UP;
   }
-  /* USER CODE END DMA1_Channel1_IRQn 0 */
-
-  /* USER CODE BEGIN DMA1_Channel1_IRQn 1 */
-
-  /* USER CODE END DMA1_Channel1_IRQn 1 */
 }
 
 /**
@@ -201,23 +115,20 @@ void DMA1_Channel1_IRQHandler(void)
   */
 void DMA1_Channel2_3_IRQHandler(void)
 {
-  /* USER CODE BEGIN DMA1_Channel2_3_IRQn 0 */
-  if (LL_DMA_IsActiveFlag_TC2(DMA1) != 0) {
+  if ((DMA1->ISR & DMA_ISR_TCIF2) != 0) {
     /* reset IRQ flag */
     DMA1->IFCR |= DMA_IFCR_CTCIF2;
     /* Disable DMA channels for I2C RX */
     DMA1_Channel2->CCR &= ~DMA_CCR_EN;
     Flag.I2C_RX_End = 1;
   }
-  if (LL_DMA_IsActiveFlag_TE2(DMA1) != 0) {
+  if ((DMA1->ISR & DMA_ISR_TEIF2) != 0) {
     DMA1->IFCR |= DMA_IFCR_CTEIF2;
     DMA1_Channel2->CCR &= ~DMA_CCR_EN;
     Flag.I2C_RX_End = 1;
     Flag.I2C_RX_Err = 1;
   }
-  /* USER CODE END DMA1_Channel2_3_IRQn 0 */
 
-  /* USER CODE BEGIN DMA1_Channel2_3_IRQn 1 */
   if ((DMA1->ISR & DMA_ISR_TCIF3) != 0) {
     /* reset IRQ flag */
     DMA1->IFCR |= DMA_IFCR_CTCIF3;
@@ -231,7 +142,6 @@ void DMA1_Channel2_3_IRQHandler(void)
     Flag.I2C_TX_End = 1;
     Flag.I2C_TX_Err = 1;
   }
-  /* USER CODE END DMA1_Channel2_3_IRQn 1 */
 }
 
 /**
@@ -239,18 +149,16 @@ void DMA1_Channel2_3_IRQHandler(void)
   */
 void TIM14_IRQHandler(void)
 {
-  /* USER CODE BEGIN TIM14_IRQn 0 */
   if ((TIM14->SR & TIM_SR_UIF) != 0) {
     /* Update interrupt flag */
     TIM14->SR |= TIM_SR_UIF;
   }
-  /* USER CODE END TIM14_IRQn 0 */
-  /* USER CODE BEGIN TIM14_IRQn 1 */
   if ((TIM14->SR & TIM_SR_CC1IF) != 0) {
     /* Capture/Compare Interrupt */
     TIM14->SR |= TIM_SR_CC1IF;
 
     /* disable unneeded channel */
+/*
     if (Flag.Blink_1 != 0) {
       TUBE_A_OFF;
     }
@@ -266,8 +174,8 @@ void TIM14_IRQHandler(void)
     if (Flag.Blink_5 != 0) {
       TUBE_E_OFF;
     }
+*/
   }
-  /* USER CODE END TIM14_IRQn 1 */
 }
 
 /**
@@ -275,15 +183,10 @@ void TIM14_IRQHandler(void)
   */
 void TIM16_IRQHandler(void)
 {
-  /* USER CODE BEGIN TIM16_IRQn 0 */
   if ((TIM16->SR & TIM_SR_UIF) != 0) {
     /* Update interrupt flag */
     TIM16->SR |= TIM_SR_UIF;
   }
-  /* USER CODE END TIM16_IRQn 0 */
-  /* USER CODE BEGIN TIM16_IRQn 1 */
-
-  /* USER CODE END TIM16_IRQn 1 */
 }
 
 /**
@@ -291,15 +194,10 @@ void TIM16_IRQHandler(void)
   */
 void TIM17_IRQHandler(void)
 {
-  /* USER CODE BEGIN TIM17_IRQn 0 */
   if ((TIM17->SR & TIM_SR_UIF) != 0) {
     /* Update interrupt flag */
     TIM17->SR |= TIM_SR_UIF;
   }
-  /* USER CODE END TIM17_IRQn 0 */
-  /* USER CODE BEGIN TIM17_IRQn 1 */
-
-  /* USER CODE END TIM17_IRQn 1 */
 }
 
 /**
@@ -307,12 +205,6 @@ void TIM17_IRQHandler(void)
   */
 void SPI1_IRQHandler(void)
 {
-  /* USER CODE BEGIN SPI1_IRQn 0 */
-
-  /* USER CODE END SPI1_IRQn 0 */
-  /* USER CODE BEGIN SPI1_IRQn 1 */
-
-  /* USER CODE END SPI1_IRQn 1 */
 }
 
 /**
@@ -320,15 +212,6 @@ void SPI1_IRQHandler(void)
   */
 void USART1_IRQHandler(void)
 {
-  /* USER CODE BEGIN USART1_IRQn 0 */
-
-  /* USER CODE END USART1_IRQn 0 */
-  /* USER CODE BEGIN USART1_IRQn 1 */
-
-  /* USER CODE END USART1_IRQn 1 */
 }
 
-/* USER CODE BEGIN 1 */
-
-/* USER CODE END 1 */
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/