shuvit 6 years ago
parent
commit
d63ae73a21
2 changed files with 170 additions and 47 deletions
  1. 118
    33
      co_ActionState.py
  2. 52
    14
      controller2.py

+ 118
- 33
co_ActionState.py
File diff suppressed because it is too large
View File


+ 52
- 14
controller2.py View File

432
                     own['manual_v2_type'] = 'fak nose manual'
432
                     own['manual_v2_type'] = 'fak nose manual'
433
                 if lAs == 'reg_air_nose to nmanual' and own['manual_v2_type'] == 'fak nose manual':
433
                 if lAs == 'reg_air_nose to nmanual' and own['manual_v2_type'] == 'fak nose manual':
434
                     print('---requesting fak nose manual')
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
     #check manual
454
     #check manual
616
         killact(11)  
632
         killact(11)  
617
         killact(34)      
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
     def reg_stanceinc_on():
646
     def reg_stanceinc_on():
2424
             own['requestAction'] = 'reg_manual_revert_ccw'   
2449
             own['requestAction'] = 'reg_manual_revert_ccw'   
2425
             print("reg")
2450
             print("reg")
2426
         elif own['manual_v2_type'] == 'reg nose manual':
2451
         elif own['manual_v2_type'] == 'reg nose manual':
2427
-            own['requestAction'] = 'fak_manual_revert_ccw'  
2452
+            own['requestAction'] = 'reg_nmanual_revert_ccw'  
2428
             print("reg nose manual revert")             
2453
             print("reg nose manual revert")             
2429
         elif own['manual_v2_type'] == 'fak manual': 
2454
         elif own['manual_v2_type'] == 'fak manual': 
2430
             own['requestAction'] = 'fak_manual_revert_ccw'   
2455
             own['requestAction'] = 'fak_manual_revert_ccw'   
2431
             print("fak manual revert")
2456
             print("fak manual revert")
2432
         elif own['manual_v2_type'] == 'fak nose manual': 
2457
         elif own['manual_v2_type'] == 'fak nose manual': 
2433
-            own['requestAction'] = 'reg_manual_revert_ccw'   
2458
+            own['requestAction'] = 'fak_nmanual_revert_ccw'   
2434
             print("fak")           
2459
             print("fak")           
2435
         else:
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
         own['revert_timer'] = 20 
2466
         own['revert_timer'] = 20 
2438
         cont.activate(own.actuators["revertSound"]) 
2467
         cont.activate(own.actuators["revertSound"]) 
2439
         own['revert_sound'] = 1     
2468
         own['revert_sound'] = 1     
2450
             own['requestAction'] = 'reg_manual_revert_cw'   
2479
             own['requestAction'] = 'reg_manual_revert_cw'   
2451
             print("reg")
2480
             print("reg")
2452
         elif own['manual_v2_type'] == 'reg nose manual':    
2481
         elif own['manual_v2_type'] == 'reg nose manual':    
2453
-            own['requestAction'] = 'fak_manual_revert_cw'
2482
+            own['requestAction'] = 'reg_nmanual_revert_cw'
2454
             print("reg nose manual revert")             
2483
             print("reg nose manual revert")             
2455
         elif own['manual_v2_type'] == 'fak manual':    
2484
         elif own['manual_v2_type'] == 'fak manual':    
2456
             own['requestAction'] = 'fak_manual_revert_cw'
2485
             own['requestAction'] = 'fak_manual_revert_cw'
2457
             print("fak manual revert")
2486
             print("fak manual revert")
2458
         elif own['manual_v2_type'] == 'fak nose manual':    
2487
         elif own['manual_v2_type'] == 'fak nose manual':    
2459
-            own['requestAction'] = 'reg_manual_revert_cw'
2488
+            own['requestAction'] = 'fak_nmanual_revert_cw'
2460
             print("fak")   
2489
             print("fak")   
2461
         else:     
2490
         else:     
2462
-            own['requestAction'] = 'revert2'       
2491
+            if STANCE == 0:
2492
+                own['requestAction'] = 'revert2'       
2493
+            else:
2494
+                own['requestAction'] = 'fak_revert2'                           
2463
         own['revert_timer'] = 20 
2495
         own['revert_timer'] = 20 
2464
         cont.activate(own.actuators["revertSound"])   
2496
         cont.activate(own.actuators["revertSound"])   
2465
         own['revert_sound'] = 1      
2497
         own['revert_sound'] = 1      
2477
             own['requestAction'] = 'reg_manual_revert_ccw'  
2509
             own['requestAction'] = 'reg_manual_revert_ccw'  
2478
             print("reg")
2510
             print("reg")
2479
         elif own['manual_v2_type'] == 'reg nose manual':    
2511
         elif own['manual_v2_type'] == 'reg nose manual':    
2480
-            own['requestAction'] = 'fak_manual_revert_ccw'
2512
+            own['requestAction'] = 'reg_nmanual_revert_ccw'
2481
             print("reg nose manual revert")             
2513
             print("reg nose manual revert")             
2482
         elif own['manual_v2_type'] == 'fak manual': 
2514
         elif own['manual_v2_type'] == 'fak manual': 
2483
             own['requestAction'] = 'fak_manual_revert_ccw'   
2515
             own['requestAction'] = 'fak_manual_revert_ccw'   
2484
             print("fak manual revert")
2516
             print("fak manual revert")
2485
         elif own['manual_v2_type'] == 'fak nose manual':
2517
         elif own['manual_v2_type'] == 'fak nose manual':
2486
-            own['requestAction'] = 'reg_manual_revert_ccw'    
2518
+            own['requestAction'] = 'fak_nmanual_revert_ccw'    
2487
             print("fak")   
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
         own['revert_timer'] = 20 
2525
         own['revert_timer'] = 20 
2491
         cont.activate(own.actuators["revertSound"]) 
2526
         cont.activate(own.actuators["revertSound"]) 
2492
         own['revert_sound'] = 1     
2527
         own['revert_sound'] = 1     
2503
             own['requestAction'] = 'reg_manual_revert_cw'
2538
             own['requestAction'] = 'reg_manual_revert_cw'
2504
             print("reg")
2539
             print("reg")
2505
         elif own['manual_v2_type'] == 'reg nose manual':    
2540
         elif own['manual_v2_type'] == 'reg nose manual':    
2506
-            own['requestAction'] = 'fak_manual_revert_cw'
2541
+            own['requestAction'] = 'reg_nmanual_revert_cw'
2507
             print("reg nose manual revert")             
2542
             print("reg nose manual revert")             
2508
         elif own['manual_v2_type'] == 'fak manual':    
2543
         elif own['manual_v2_type'] == 'fak manual':    
2509
             own['requestAction'] = 'fak_manual_revert_cw'
2544
             own['requestAction'] = 'fak_manual_revert_cw'
2510
             print("fak manual revert")
2545
             print("fak manual revert")
2511
         elif own['manual_v2_type'] == 'fak nose manual':    
2546
         elif own['manual_v2_type'] == 'fak nose manual':    
2512
-            own['requestAction'] = 'reg_manual_revert_cw'
2547
+            own['requestAction'] = 'fak_nmanual_revert_cw'
2513
             print("fak") 
2548
             print("fak") 
2514
         else:
2549
         else:
2515
-            own['requestAction'] = 'revert4'
2550
+            if STANCE == 0:
2551
+                own['requestAction'] = 'revert4'
2552
+            else:
2553
+                own['requestAction'] = 'fak_revert2'     
2516
             print("normal revert")        
2554
             print("normal revert")        
2517
         own['revert_timer'] = 20 
2555
         own['revert_timer'] = 20 
2518
         cont.activate(own.actuators["revertSound"]) 
2556
         cont.activate(own.actuators["revertSound"]) 

Loading…
Cancel
Save