shuvit hace 6 años
padre
commit
d63ae73a21
Se han modificado 2 ficheros con 170 adiciones y 47 borrados
  1. 118
    33
      co_ActionState.py
  2. 52
    14
      controller2.py

+ 118
- 33
co_ActionState.py
La diferencia del archivo ha sido suprimido porque es demasiado grande
Ver fichero


+ 52
- 14
controller2.py Ver fichero

@@ -432,7 +432,23 @@ def main():
432 432
                     own['manual_v2_type'] = 'fak nose manual'
433 433
                 if lAs == 'reg_air_nose to nmanual' and own['manual_v2_type'] == 'fak nose manual':
434 434
                     print('---requesting fak nose manual')
435
-                    own['manual_v2_type'] = 'fak manual'                    
435
+                    own['manual_v2_type'] = 'fak manual' 
436
+                    
437
+        if STANCE == 0 and own['manual_v2_type'] == 'fak manual':
438
+            print('change manual stance')
439
+            own['manual_v2_type'] = 'reg nose manual' 
440
+        if STANCE == 1 and own['manual_v2_type'] == 'reg manual':
441
+            print('change manual stance')                        
442
+            own['manual_v2_type'] = 'fak nose manual'
443
+
444
+        if STANCE == 0 and own['manual_v2_type'] == 'fak nose manual':
445
+            print('change manual stance')
446
+            own['manual_v2_type'] = 'reg manual' 
447
+        if STANCE == 1 and own['manual_v2_type'] == 'reg nose manual':
448
+            print('change manual stance')                        
449
+            own['manual_v2_type'] = 'fak manual'  
450
+            
451
+                                      
436 452
                   
437 453
  
438 454
     #check manual
@@ -616,6 +632,15 @@ def main():
616 632
         killact(11)  
617 633
         killact(34)      
618 634
         
635
+    
636
+    if own['l_actionState'] == 'reg_manual_revert_ccw':
637
+        own['manual_v2_type'] = 'fak nose manual'
638
+        fak_nmanual_on()  
639
+    if own['l_actionState'] == 'reg_manual_revert_cw':
640
+        own['manual_v2_type'] = 'fak nose manual'
641
+        fak_nmanual_on()          
642
+              
643
+    
619 644
     ###########
620 645
         
621 646
     def reg_stanceinc_on():
@@ -2424,16 +2449,20 @@ def main():
2424 2449
             own['requestAction'] = 'reg_manual_revert_ccw'   
2425 2450
             print("reg")
2426 2451
         elif own['manual_v2_type'] == 'reg nose manual':
2427
-            own['requestAction'] = 'fak_manual_revert_ccw'  
2452
+            own['requestAction'] = 'reg_nmanual_revert_ccw'  
2428 2453
             print("reg nose manual revert")             
2429 2454
         elif own['manual_v2_type'] == 'fak manual': 
2430 2455
             own['requestAction'] = 'fak_manual_revert_ccw'   
2431 2456
             print("fak manual revert")
2432 2457
         elif own['manual_v2_type'] == 'fak nose manual': 
2433
-            own['requestAction'] = 'reg_manual_revert_ccw'   
2458
+            own['requestAction'] = 'fak_nmanual_revert_ccw'   
2434 2459
             print("fak")           
2435 2460
         else:
2436
-            own['requestAction'] = 'revert1'            
2461
+            if STANCE == 0:
2462
+                own['requestAction'] = 'revert1'            
2463
+            else:
2464
+                own['requestAction'] = 'fak_revert1'
2465
+                print('flip rev')            
2437 2466
         own['revert_timer'] = 20 
2438 2467
         cont.activate(own.actuators["revertSound"]) 
2439 2468
         own['revert_sound'] = 1     
@@ -2450,16 +2479,19 @@ def main():
2450 2479
             own['requestAction'] = 'reg_manual_revert_cw'   
2451 2480
             print("reg")
2452 2481
         elif own['manual_v2_type'] == 'reg nose manual':    
2453
-            own['requestAction'] = 'fak_manual_revert_cw'
2482
+            own['requestAction'] = 'reg_nmanual_revert_cw'
2454 2483
             print("reg nose manual revert")             
2455 2484
         elif own['manual_v2_type'] == 'fak manual':    
2456 2485
             own['requestAction'] = 'fak_manual_revert_cw'
2457 2486
             print("fak manual revert")
2458 2487
         elif own['manual_v2_type'] == 'fak nose manual':    
2459
-            own['requestAction'] = 'reg_manual_revert_cw'
2488
+            own['requestAction'] = 'fak_nmanual_revert_cw'
2460 2489
             print("fak")   
2461 2490
         else:     
2462
-            own['requestAction'] = 'revert2'       
2491
+            if STANCE == 0:
2492
+                own['requestAction'] = 'revert2'       
2493
+            else:
2494
+                own['requestAction'] = 'fak_revert2'                           
2463 2495
         own['revert_timer'] = 20 
2464 2496
         cont.activate(own.actuators["revertSound"])   
2465 2497
         own['revert_sound'] = 1      
@@ -2477,16 +2509,19 @@ def main():
2477 2509
             own['requestAction'] = 'reg_manual_revert_ccw'  
2478 2510
             print("reg")
2479 2511
         elif own['manual_v2_type'] == 'reg nose manual':    
2480
-            own['requestAction'] = 'fak_manual_revert_ccw'
2512
+            own['requestAction'] = 'reg_nmanual_revert_ccw'
2481 2513
             print("reg nose manual revert")             
2482 2514
         elif own['manual_v2_type'] == 'fak manual': 
2483 2515
             own['requestAction'] = 'fak_manual_revert_ccw'   
2484 2516
             print("fak manual revert")
2485 2517
         elif own['manual_v2_type'] == 'fak nose manual':
2486
-            own['requestAction'] = 'reg_manual_revert_ccw'    
2518
+            own['requestAction'] = 'fak_nmanual_revert_ccw'    
2487 2519
             print("fak")   
2488
-        else:       
2489
-            own['requestAction'] = 'revert3' 
2520
+        else:  
2521
+            if STANCE == 0:     
2522
+                own['requestAction'] = 'revert3' 
2523
+            else:
2524
+                own['requestAction'] = 'fak_revert1'     
2490 2525
         own['revert_timer'] = 20 
2491 2526
         cont.activate(own.actuators["revertSound"]) 
2492 2527
         own['revert_sound'] = 1     
@@ -2503,16 +2538,19 @@ def main():
2503 2538
             own['requestAction'] = 'reg_manual_revert_cw'
2504 2539
             print("reg")
2505 2540
         elif own['manual_v2_type'] == 'reg nose manual':    
2506
-            own['requestAction'] = 'fak_manual_revert_cw'
2541
+            own['requestAction'] = 'reg_nmanual_revert_cw'
2507 2542
             print("reg nose manual revert")             
2508 2543
         elif own['manual_v2_type'] == 'fak manual':    
2509 2544
             own['requestAction'] = 'fak_manual_revert_cw'
2510 2545
             print("fak manual revert")
2511 2546
         elif own['manual_v2_type'] == 'fak nose manual':    
2512
-            own['requestAction'] = 'reg_manual_revert_cw'
2547
+            own['requestAction'] = 'fak_nmanual_revert_cw'
2513 2548
             print("fak") 
2514 2549
         else:
2515
-            own['requestAction'] = 'revert4'
2550
+            if STANCE == 0:
2551
+                own['requestAction'] = 'revert4'
2552
+            else:
2553
+                own['requestAction'] = 'fak_revert2'     
2516 2554
             print("normal revert")        
2517 2555
         own['revert_timer'] = 20 
2518 2556
         cont.activate(own.actuators["revertSound"]) 

Loading…
Cancelar
Guardar