Jelajahi Sumber

Изменил порядок последовательность пинов каналов.

unknown 1 bulan lalu
induk
melakukan
e9a91c4cfb
9 mengubah file dengan 536 tambahan dan 541 penghapusan
  1. TEMPAT SAMPAH
      bin/sprut.bin
  2. 1 1
      modules/adc.c
  3. 1 1
      modules/button.c
  4. 5 5
      modules/logic.c
  5. 1 1
      modules/logic.h
  6. 2 1
      modules/tim.c
  7. TEMPAT SAMPAH
      output/sprut.bin
  8. 522 528
      project/ewarm/drone.dep
  9. 4 4
      project/settings/muvie_string_controller.wsdt

TEMPAT SAMPAH
bin/sprut.bin


+ 1 - 1
modules/adc.c

@@ -172,7 +172,7 @@ void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef *AdcHandle)
     // Для получения значения в вольтах
     //freq_voltage = adc_average(&adc_freq, adc_values[1] * FREQ_FACTOR);
     
-    freq_voltage = adc_average_uint(&adc_freq, adc_values[1]);
+    freq_voltage = 4095 - adc_average_uint(&adc_freq, adc_values[1]);
     
     tim_set_string_freq();
 }

+ 1 - 1
modules/button.c

@@ -124,7 +124,7 @@ static void but_start_down_handler(void)
       
     start_pressed = true;
     
-    printf("Button\r\n");
+    //printf("Button\r\n");
 }
 
 

+ 5 - 5
modules/logic.c

@@ -24,11 +24,11 @@ channel_t channels[CH_NUM] = {{GPIOA, GPIO_PIN_9},
                               {GPIOA, GPIO_PIN_11},
                               {GPIOA, GPIO_PIN_12},
                               {GPIOA, GPIO_PIN_15},
-                              {GPIOB, GPIO_PIN_7},
-                              {GPIOB, GPIO_PIN_6},
-                              {GPIOB, GPIO_PIN_5},
+                              {GPIOB, GPIO_PIN_3},
                               {GPIOB, GPIO_PIN_4},
-                              {GPIOB, GPIO_PIN_3}};
+                              {GPIOB, GPIO_PIN_5},
+                              {GPIOB, GPIO_PIN_6},
+                              {GPIOB, GPIO_PIN_7}};
 
 
 //
@@ -87,7 +87,7 @@ void logic_string(void)
 
 
 //
-void ligic_string_next(void)
+void logic_string_next(void)
 {
     HAL_GPIO_WritePin(channels[channel_index].port, channels[channel_index].pin, GPIO_PIN_SET);
     channel_cnt[channel_index].active = true;

+ 1 - 1
modules/logic.h

@@ -32,7 +32,7 @@ void logic_single(void);
 void logic_string(void);
 
 //
-void ligic_string_next(void);
+void logic_string_next(void);
 
 //
 void logic_cnt_task(void);

+ 2 - 1
modules/tim.c

@@ -2,6 +2,7 @@
 #include "tim.h"
 #include "led.h"
 #include "button.h"
+#include "logic.h"
 
 
 TIM_HandleTypeDef    Tim16Handle;
@@ -101,7 +102,7 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
     } 
     else if (htim->Instance == TIM17) 
     {
-        ligic_string_next();
+        logic_string_next();
         //HAL_TIM_Base_Stop_IT(&Tim17Handle);
     }
 }

TEMPAT SAMPAH
output/sprut.bin


File diff ditekan karena terlalu besar
+ 522 - 528
project/ewarm/drone.dep


File diff ditekan karena terlalu besar
+ 4 - 4
project/settings/muvie_string_controller.wsdt


Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini