TelenkovDmitry 1 年之前
父節點
當前提交
2dc9b9612c
共有 5 個文件被更改,包括 3 次插入3 次删除
  1. 1 1
      modules/pwm_in.c
  2. 二進制
      output/lasertag.bin
  3. 1 1
      project/ewarm/drone.dep
  4. 0 0
      project/settings/drone.wsdt
  5. 1 1
      user/main.c

+ 1 - 1
modules/pwm_in.c

@@ -51,7 +51,7 @@ void tim_pwm_in_init(void)
     HAL_TIM_IC_ConfigChannel(&TimHandle, &sConfig, TIM_CHANNEL_2);
     
     sSlaveConfig.SlaveMode        = TIM_SLAVEMODE_RESET;
-    sSlaveConfig.InputTrigger     = TIM_TS_TI2FP2;
+    sSlaveConfig.InputTrigger     = TIM_TS_TI1FP1;
     sSlaveConfig.TriggerPolarity  = TIM_TRIGGERPOLARITY_NONINVERTED;
     sSlaveConfig.TriggerPrescaler = TIM_TRIGGERPRESCALER_DIV1;
     sSlaveConfig.TriggerFilter    = 0;

二進制
output/lasertag.bin


+ 1 - 1
project/ewarm/drone.dep

@@ -952,7 +952,7 @@
             <inputs>
                 <tool>
                     <name>ICCARM</name>
-                    <file> 67 60 72 69 73 192 70 68 71 263 262 130 280 258 265 266 272 197 279 270 284 275 274 271 61 282 269 277 281 257 273 276 66 65 283 256 267 59 260 63 62 64 254 211 255</file>
+                    <file> 67 60 72 69 73 192 70 68 71 263 262 130 280 258 265 266 272 197 279 270 284 275 274 271 61 282 269 277 281 257 273 276 66 65 283 256 267 59 260 63 62 64 254 211 255 285</file>
                 </tool>
             </inputs>
         </file>

File diff suppressed because it is too large
+ 0 - 0
project/settings/drone.wsdt


+ 1 - 1
user/main.c

@@ -26,7 +26,7 @@ int main()
       
     printf("Hello world\r\n");
  
-    tim_pwm_out_init();
+    //tim_pwm_out_init();
     tim_pwm_in_init();
     
 #if 0    

Some files were not shown because too many files changed in this diff