Quellcode durchsuchen

Systick delay work.

Vladimir N. Shilov vor 3 Jahren
Ursprung
Commit
cff26df2ce
1 geänderte Dateien mit 12 neuen und 12 gelöschten Zeilen
  1. 12 12
      Src/main.c

+ 12 - 12
Src/main.c

@@ -150,7 +150,7 @@ int main(void)
   RTOS_Init();
   // __enable_irq();
   //LL_Init1msTick(rcc_clocks.HCLK_Frequency);
-  //LL_mDelay(1);
+  //tdelay_ms(1);
 
   /* Start RGB PWM */
   LL_TIM_CC_EnableChannel(TIM3, LL_TIM_CHANNEL_CH1);
@@ -188,7 +188,7 @@ int main(void)
   SensorDev.intf = BME280_I2C_INTF;
   SensorDev.read = user_i2c_read;
   SensorDev.write = user_i2c_write;
-  SensorDev.delay_ms = LL_mDelay;
+  SensorDev.delay_ms = tdelay_ms;
   rsltSensor = bme280_init(&SensorDev);
   if (rsltSensor == BME280_OK) {
     Flag.BME280 = 1;
@@ -206,8 +206,8 @@ int main(void)
   SensorDev.settings.osr_t = BME280_OVERSAMPLING_2X;
   SensorDev.settings.filter = BME280_FILTER_COEFF_16;
 
-  rsltSensor = bme280_set_sensor_settings((BME280_OSR_PRESS_SEL | BME280_OSR_TEMP_SEL | BME280_OSR_HUM_SEL | BME280_FILTER_SEL), &SensorDev);
-  rsltSensor = bme280_set_sensor_mode(BME280_NORMAL_MODE, &SensorDev);
+  //rsltSensor = bme280_set_sensor_settings((BME280_OSR_PRESS_SEL | BME280_OSR_TEMP_SEL | BME280_OSR_HUM_SEL | BME280_FILTER_SEL), &SensorDev);
+  //rsltSensor = bme280_set_sensor_mode(BME280_NORMAL_MODE, &SensorDev);
   //SensorDev.delay_ms(50);
   //rsltSensor = bme280_get_sensor_data(BME280_ALL, &SensorData, &SensorDev);
   /* bme280_get_sensor_data(...) returns:
@@ -224,17 +224,17 @@ int main(void)
   {
     IN15_OFF;
     COLOR_RGB(0, 0, 0);
-    LL_mDelay(500);
+    tdelay_ms(500);
 
-    //RTC_ReadAll(&Clock);
-    rsltSensor = bme280_get_sensor_data(BME280_ALL, &SensorData, &SensorDev);
+    RTC_ReadAll(&Clock);
+    //rsltSensor = bme280_get_sensor_data(BME280_ALL, &SensorData, &SensorDev);
 
     if (Flag.RTC_IRQ != 0) {
       Flag.RTC_IRQ = 0;
       IN15_Minus;
     }
     COLOR_RGB(0xFF, 0x12, 0x0); // FF7E00 or FFBF00
-    LL_mDelay(500);
+    tdelay_ms(500);
     /* USER CODE END WHILE */
 
     /* USER CODE BEGIN 3 */
@@ -263,10 +263,10 @@ int main(void)
       showDigit(Tube_D, temp_l >> 4);
       showDigit(Tube_E, temp_l & 0xf);
     } else {
-      showDigit(Tube_A, 7);
-      showDigit(Tube_B, 7);
-      showDigit(Tube_D, 7);
-      showDigit(Tube_E, 7);
+      showDigit(Tube_A, Clock.Min >> 4);
+      showDigit(Tube_B, Clock.Min & 0xf);
+      showDigit(Tube_D, Clock.Sec >> 4);
+      showDigit(Tube_E, Clock.Sec & 0xf);
     }
     SPI_StartTX();