diff --git a/README.md b/README.md index a5a4a618b793787b85c16359319ebec30303fa91..eb44f40e9ffd10129909ab1b0089d3ba5bdc73ee 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,12 @@ WSL (pour pouvoir démarer l'amas) # Random note +Programme de la semaine : + * Surcouche mqtt pour le framework + * décision dela forme du framewor (module python ?) + * Implementation d'un 2nd example + + Start procédure : 1. start broker 2. start scheduler diff --git a/ihm.py b/ihm.py index 83f601ac9e5be42a857a83ea365e047f979c7cc8..cc88f5bced09c5bca8227eb47eacc035674a38a1 100644 --- a/ihm.py +++ b/ihm.py @@ -63,7 +63,7 @@ class Ihm(MqttClient, SSHClient): # automatise la mise a jour de l'exerience sur les raspberry if cmd.lower() == "update": - r = RemoteClient("192.168.105.18", "pi", "raspberry") + r = RemoteClient("192.168.24.18", "pi", "raspberry") updater = VersionManager(r) updater.update() diff --git a/philosophers/amas.py b/philosophers/amas.py index 2e2049a6bc983599326ade45b98fc6b442f9a978..5422fc3beb7998cbc1c5553ffd5956a5903073ff 100644 --- a/philosophers/amas.py +++ b/philosophers/amas.py @@ -33,5 +33,5 @@ class PhiAmas(Amas): # self.run_cmd(1, agents[2:]) if __name__ == '__main__': - s = PhiAmas(100) + s = PhiAmas(3) s.run() \ No newline at end of file diff --git a/philosophers/env.py b/philosophers/env.py index 9f043ce7f1b5b4f264b5e3efc081f765b2e36c70..179ba88d2ab8589d2f7e17e4f3943d1673e0b673 100644 --- a/philosophers/env.py +++ b/philosophers/env.py @@ -65,5 +65,5 @@ class PhiEnv(Environment): if __name__ == '__main__': - s = PhiEnv(100) + s = PhiEnv(3) s.run() \ No newline at end of file diff --git a/tool/mqtt_client.py b/tool/mqtt_client.py index 3c565787f9574bfe06a9afcb608a262426859f2a..ed865d4c78d2686231b541e9852007e00e5dd57f 100644 --- a/tool/mqtt_client.py +++ b/tool/mqtt_client.py @@ -6,7 +6,7 @@ class MqttClient: def __init__(self, client_id: str = None): self.client = Client(client_id=client_id) self.client.username_pw_set(username="goyon", password="mosquitto") - self.client.connect("192.168.105.209", 1883, 60) + self.client.connect("192.168.24.209", 1883, 60) self.client.loop_start() def subscribe(self, topic, fun): diff --git a/tool/ssh_client.py b/tool/ssh_client.py index 47faa58c9d180ff38ea510c60c741ee03c0957f6..4fcc760d0c688fb1801aa13eca908ec197a3d16c 100644 --- a/tool/ssh_client.py +++ b/tool/ssh_client.py @@ -21,7 +21,7 @@ class SSHClient: def __init__(self): self.clients = [ - RemoteClient("192.168.105.18", "pi", "raspberry")# , + RemoteClient("192.168.24.18", "pi", "raspberry")# , # RemoteClient("192.168.199.75", "pi", "raspberry") ]