diff --git a/monte_charge/montchg.py b/monte_charge/montchg.py index 4ee9d6c..b8dff61 100644 --- a/monte_charge/montchg.py +++ b/monte_charge/montchg.py @@ -27,25 +27,25 @@ scene = bge.logic.getCurrentScene() # Ce distinguo ne concerne que les entrées, les sorties réelles sont forcées par les sorties numériques et vice-versa. public_vars = { - 't' : [['System','time'], [], []], - 'voy_0' : [['Led niveau 0','activated'], ['pin', 'd','o'], []], - 'voy_1' : [['Led niveau 1','activated'], ['pin', 'd','o'], []], - 'pc_0' : [['Microrupteur niveau 0','activated_real'], [], []], - 'pc_0_r' : [['Microrupteur niveau 0','activated'], ['pin', 'd','i'], []], - 'pc_1' : [['Microrupteur niveau 1','activated'], ['pin', 'd','i'], []], - 'pc_1_r' : [['Microrupteur niveau 1','activated_real'], [], []], - 'ba_0' : [['Bp niveau 0','activated'], ['pin', 'd','i'], []], - 'ba_0_r' : [['Bp niveau 0','activated_real'], [], []], - 'ba_1' : [['Bp niveau 1','activated'], ['pin', 'd','i'], []], - 'ba_1_r' : [['Bp niveau 1','activated_real'], [], []], - 'mot_m' : [['Moteur','up',], ['pin_up', 'd','o'], []], - 'mot_d' : [['Moteur','down'], ['pin_down', 'd','o'], []], - 'mot_angle' : [['Moteur','alpha'], [], []], - 'mot_vitesse' : [['Moteur','speed'], [], []], - 'mot_pas' : [['Moteur','step'], [], []], - 'cabine_z' : [['Cabine','z', 1/0.333], [], []], - 'cabine_vitesse' : [['Cabine','speed', 1/0.333], [], []], - 'cabine_pas' : [['Cabine','step', 1/0.333], [], []]} + 't' : [['System','time','a'], [], []], + 'voy_0' : [['Led niveau 0','activated','d'], ['pin', 'd','o'], []], + 'voy_1' : [['Led niveau 1','activated','d'], ['pin', 'd','o'], []], + 'pc_0' : [['Microrupteur niveau 0','activated_real','d'], [], []], + 'pc_0_r' : [['Microrupteur niveau 0','activated','d'], ['pin', 'd','i'], []], + 'pc_1' : [['Microrupteur niveau 1','activated','d'], ['pin', 'd','i'], []], + 'pc_1_r' : [['Microrupteur niveau 1','activated_real','d'], [], []], + 'ba_0' : [['Bp niveau 0','activated','d'], ['pin', 'd','i'], []], + 'ba_0_r' : [['Bp niveau 0','activated_real','d'], [], []], + 'ba_1' : [['Bp niveau 1','activated','d'], ['pin', 'd','i'], []], + 'ba_1_r' : [['Bp niveau 1','activated_real','d'], [], []], + 'mot_m' : [['Moteur','up','d'], ['pin_up', 'd','o'], []], + 'mot_d' : [['Moteur','down','d'], ['pin_down', 'd','o'], []], + 'mot_angle' : [['Moteur','alpha','a'], [], []], + 'mot_vitesse' : [['Moteur','speed','a'], [], []], + 'mot_pas' : [['Moteur','step','a'], [], []], + 'cabine_z' : [['Cabine','z','a', 1/0.333], [], []], + 'cabine_vitesse' : [['Cabine','speed','a', 1/0.333], [], []], + 'cabine_pas' : [['Cabine','step','a', 1/0.333], [], []]} # Couleurs color_passive = (0.800, 0.005, 0.315,1) # bouton non activable : magenta diff --git a/volet_roulant/volrou.py b/volet_roulant/volrou.py index 68903e5..6566fa0 100644 --- a/volet_roulant/volrou.py +++ b/volet_roulant/volrou.py @@ -27,27 +27,27 @@ scene = bge.logic.getCurrentScene() # Ce distinguo ne concerne que les entrées, les sorties réelles sont forcées par les sorties numériques et vice-versa. public_vars = { - 't' : [['System','time'], [], []], - 'fdc_h' : [['Microrupteur haut','activated'], ['pin', 'd','i'], []], - 'fdc_h_r' : [['Microrupteur haut','activated_real'], [], []], - 'fdc_b' : [['Microrupteur bas','activated'], ['pin', 'd','i'], []], - 'fdc_b_r' : [['Microrupteur bas','activated_real'], [], []], - 'bp_m' : [['Bp monter','activated'], ['pin', 'd','i'], []], - 'bp_m_r' : [['Bp monter','activated_real'], [], []], - 'bp_d' : [['Bp descendre','activated'], ['pin', 'd','i'], []], - 'bp_d_r' : [['Bp descendre','activated_real'], [], []], - 'bp_a' : [['Bp arret','activated'], ['pin', 'd','i'], []], - 'bp_a_r' : [['Bp arret','activated_real'], [], []], - 'mot_m' : [['Moteur','up'], ['pin_up', 'd','o'], []], - 'mot_d' : [['Moteur','down'], ['pin_down', 'd','o'], []], - 'mot_angle' : [['Moteur','alpha'], [], []], - 'mot_vitesse' : [['Moteur','speed'], [], []], - 'mot_pas' : [['Moteur','step'], [], []], - 'bp_auto' : [['Bp auto','activated'], ['pin', 'd','i'], []], - 'bp_auto_r' : [['Bp auto','activated_real'], [], []], - 'voy_auto' : [['Led auto','activated'], ['pin', 'd','o'], []], - 'lum' : [['Recepteur LDR','activated'], ['pin', 'd','i'], []], - 'lum_r' : [['Recepteur LDR','activated_real'], [], []]} + 't' : [['System','time','a'], [], []], + 'fdc_h' : [['Microrupteur haut','activated','d'], ['pin', 'd','i'], []], + 'fdc_h_r' : [['Microrupteur haut','activated_real','d'], [], []], + 'fdc_b' : [['Microrupteur bas','activated','d'], ['pin', 'd','i'], []], + 'fdc_b_r' : [['Microrupteur bas','activated_real','d'], [], []], + 'bp_m' : [['Bp monter','activated','d'], ['pin', 'd','i'], []], + 'bp_m_r' : [['Bp monter','activated_real','d'], [], []], + 'bp_d' : [['Bp descendre','activated','d'], ['pin', 'd','i'], []], + 'bp_d_r' : [['Bp descendre','activated_real','d'], [], []], + 'bp_a' : [['Bp arret','activated','d'], ['pin', 'd','i'], []], + 'bp_a_r' : [['Bp arret','activated_real','d'], [], []], + 'mot_m' : [['Moteur','up','d'], ['pin_up', 'd','o'], []], + 'mot_d' : [['Moteur','down','d'], ['pin_down', 'd','o'], []], + 'mot_angle' : [['Moteur','alpha','a'], [], []], + 'mot_vitesse' : [['Moteur','speed','a'], [], []], + 'mot_pas' : [['Moteur','step','a'], [], []], + 'bp_auto' : [['Bp auto','activated','d'], ['pin', 'd','i'], []], + 'bp_auto_r' : [['Bp auto','activated_real','d'], [], []], + 'voy_auto' : [['Led auto','activated','d'], ['pin', 'd','o'], []], + 'lum' : [['Recepteur LDR','activated','a'], ['pin', 'd','i'], []], # Basculer en analogique + 'lum_r' : [['Recepteur LDR','activated_real','a'], [], []]} # Couleurs color_passive = (0.800, 0.005, 0.315,1) # bouton non activable : magenta