Merge branch 'release/0.4.0'

Author: sergey12malyshev

.vscode/tasks.json

@@ -17,6 +17,28 @@
               "color": "terminal.ansiGreen"
             },
 
+            "args": [],
+            "group": "build",
+            "presentation": {
+                "reveal": "always",
+                "clear": true
+            },
+            "problemMatcher": "$gcc"
+        },
+                {
+            "label": "rebuild fast",
+            "type": "shell",
+            "windows": {
+                "command": [
+                  ".//makeProject.bat"
+                ]
+            },
+
+            "icon": {
+              "id": "debug-alt",
+              "color": "terminal.ansiGreen"
+            },
+
             "args": [],
             "group": "build",
             "presentation": {
@@ -108,6 +130,28 @@
               "color": "terminal.ansiGreen"
             },
 
+            "args": [],
+            "group": "build",
+            "presentation": {
+                "reveal": "always",
+                "clear": true
+            },
+            "problemMatcher": "$gcc"
+        },
+                {
+            "label": "program j-link",
+            "type": "shell",
+            "windows": {
+                "command": [
+                    ".//programFlash_Jlink.cmd",
+                ]
+            },
+
+            "icon": {
+              "id": "arrow-down",
+              "color": "terminal.ansiGreen"
+            },
+
             "args": [],
             "group": "build",
             "presentation": {

CHANGELOG.md

@@ -0,0 +1,26 @@
+History of changes
+====
+
+# 0.4.0
+- Add j-link programm script
+- Refactoring CC1101 driver
+- New sound control algorithm
+- Update CLI-Driver
+
+# 0.3.2
+- Updating the FIFO queue library
+- Refactoring the CLI module  
+- Updating the project structure: separation of user files and peripheral files generated by CubeMX
+- Adding C++ files to the project Build
+
+# 0.3.1
+- Changed the software version project
+
+# 0.3.0 
+- Refactoring the project, without changing the functionality
+- Add Vscode tasks
+- Revision of the software release archive generation script
+
+# 0.2.0
+
+# 0.1.0 

CHANGELOG.txt

@@ -67,7 +67,6 @@ extern "C" {
 void Error_Handler(void);
 
 /* USER CODE BEGIN EFP */
-bool CC1101_reinit(void);
 
 void checkResetSourse(void);
 /* USER CODE END EFP */
@@ -107,8 +106,8 @@ void checkResetSourse(void);
 /* USER CODE BEGIN Private defines */
 
 #define SOFTWARE_VERSION_MAJOR  0
-#define SOFTWARE_VERSION_MINOR  3
-#define SOFTWARE_VERSION_PATCH  2
+#define SOFTWARE_VERSION_MINOR  4
+#define SOFTWARE_VERSION_PATCH  0
 
 
 #define quoting(a) prequoting(a)

Core/Inc/main.h

@@ -120,11 +120,6 @@ void checkResetSourse(void)
   __HAL_RCC_CLEAR_RESET_FLAGS();
 }
 
-bool CC1101_reinit(void)
-{
-  return TI_init(&hspi2, NSS_CS_GPIO_Port, NSS_CS_Pin); // CS
-}
-
 static void stm32_cacheEnable(void)
 {
 #if (INSTRUCTION_CACHE_ENABLE != 0U) /* Enable caching instructions */
@@ -181,24 +176,11 @@ int main(void)
   MX_TIM2_Init();
   /* USER CODE BEGIN 2 */
 
-  /* Setting up the display */
-  LCD_SPI_Connected_data spi_con =     
-  { 
-    .spi        = SPI1,
-    .dma_tx     = dma_tx_1,        // data DMA
-    .reset_port = LCD_RESET_GPIO_Port,
-    .reset_pin  = LCD_RESET_Pin,
-    .dc_port    = LCD_DC_GPIO_Port,
-    .dc_pin     = LCD_DC_Pin,
-    .cs_port    = LCD_CS_GPIO_Port,
-    .cs_pin     = LCD_CS_Pin
-  };
-
 #ifndef  LCD_DYNAMIC_MEM
   LCD_Handler lcd1;
 #endif
-   // Creating a display handler ILI9341
-   LCD = LCD_DisplayAdd(LCD,
+
+  LCD = LCD_DisplayAdd(LCD,
 #ifndef  LCD_DYNAMIC_MEM
             &lcd1,
 #endif
@@ -214,64 +196,65 @@ int main(void)
              ILI9341_SetWindow,
              ILI9341_SleepIn,
              ILI9341_SleepOut,
-             &spi_con,
+             displayInit_getSpiPortSettings(),
              LCD_DATA_16BIT_BUS,
              bkl_data);
 
   lcd = LCD;     //Pointer to the first display in the list
   LCD_Init(lcd);
   LCD_Fill(lcd, COLOR_RED);
 
-
   XPT2046_InitTouch(&touch1, 20, &cnt_touch);   //initializing the handler XPT2046
 
 #if !CALIBRATE_EN
-  tCoef coef = {.D   = 0x00022b4253626d37,
-                .Dx1 = 0xffffd9e9e85d81b6,
-                .Dx2 = 0x0000005a555c98ab,
-                .Dx3 = 0x022dd7f0419e66b7,
-                .Dy1 = 0xffffff6065e10c98,
-                .Dy2 = 0x0000343b820dc8bf,
-                .Dy3 = 0xff9cc25725238e55 };
-  touch1.coef = coef;
+  touch1.coef = *displayInit_getCalibrationCoefficient();
 #else
-calibrateTouchEnable();
+  calibrateTouchEnable();
 #endif
 
-#if RUN_DEMO
+#if RUN_LCD_DEMO
   LCD_Fill(lcd, COLOR_WHITE);
   Draw_TouchPenDemo(&touch1, lcd);
   RoadCircleDemo(&touch1, lcd);
 #endif
-
   LCD_Fill(lcd, COLOR_BLACK);
-  
-  // test C++
-  debugPrintf("C++ test: %s"CLI_NEW_LINE, test_cpp_function() ? "true" : "false");
-  
   /* USER CODE END 2 */
 
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
 
+#if CLI_ENABLE
+  cli_init();
+#endif // CLI_ENABLE
+
+  debugPrintf("C++ test: %s"CLI_NEW_LINE, test_cpp_function() ? "true" : "false");
+
   buzzer_init(BUZZER_GPIO_Port, BUZZER_Pin);
-  buzzer_enable();
-  LL_mDelay(9);
-  buzzer_disable();
+  buzzer_soundOn(BUZZ_SOUND_TEST);
   debugPrintf("Buzzer test..."CLI_NEW_LINE);
 
   adc_enable();
 
   debugPrintf("CC1101 init..."CLI_NEW_LINE);
-
   LCD_WriteString(lcd, 5, 25, "CC1101 int...",
             &Font_8x13, COLOR_WHITE, COLOR_BLACK, LCD_SYMBOL_PRINT_FAST);
 
-  CC1101_customSetCSpin(&hspi2, NSS_CS_GPIO_Port, NSS_CS_Pin);
+#if CC1101_CUSTOM_OLD_CONFIG
+  CC1101_setCarrierFreq(CFREQ_433);
+  CC1101_setDevAddress(1); 
+#endif
+
 
-  bool error_state = CC1101_power_up_reset();
+  bool error_state = CC1101_init(&hspi2, 
+                NSS_CS_GPIO_Port, NSS_CS_Pin,      // CS pin
+                GPIOB, LL_GPIO_PIN_14,             // MISO pin
+                GPIOB, LL_GPIO_PIN_12);            // GDO pin
 
-  if (error_state)
+  if (!error_state)
+  {
+    debugPrintf(CLI_OK"CC1101 init pass"CLI_NEW_LINE);
+  }
+  else
   {
     LCD_WriteString(lcd, 5, 55, "CC1101 not found!",
             &Font_8x13, COLOR_WHITE, COLOR_RED, LCD_SYMBOL_PRINT_FAST);
@@ -281,20 +264,13 @@ calibrateTouchEnable();
     }
   }
 
-#if CUSTOM_OLD_CONFIG
-  TI_setCarrierFreq(CFREQ_433);
-  TI_setDevAddress(1); 
-#endif
-  error_state = CC1101_reinit();
-  if (!error_state) debugPrintf(CLI_OK"CC1101 init pass"CLI_NEW_LINE);
-
   encoder_init();
 
     /* USER CODE END WHILE */
 
     /* USER CODE BEGIN 3 */
 
-  scheduler();
+  scheduler_run();
 
   /* USER CODE END 3 */
 }

Core/Src/main.c

@@ -289,10 +289,7 @@ void EXTI15_10_IRQHandler(void)
   {
     LL_EXTI_ClearFlag_0_31(LL_EXTI_LINE_12);
     /* USER CODE BEGIN LL_EXTI_LINE_12 */
-    if (HAL_GPIO_ReadPin(CC_GDO_GPIO_Port, CC_GDO_Pin) == GPIO_PIN_RESET)
-    {
-      CC1101_GDO0_flag_set();
-    }
+    CC1101_IRQHandler();
 
     /* USER CODE END LL_EXTI_LINE_12 */
   }