From 218cdd0a9c107dfd5598f52e4a7fc8dc27aa33ed Mon Sep 17 00:00:00 2001
From: kjunge <kai.junge@epfl.ch>
Date: Thu, 19 May 2022 16:14:23 +0200
Subject: [PATCH] Fixed bugs and made it work with arduino mega.

---
 .gitignore                   | 161 ++++++++++++++++++++++++++++++++++-
 comms_wrapper.py             |   2 +-
 comms_wrapper_test_ground.py |   2 +-
 pyComms/pyComms.ino          |  11 ++-
 4 files changed, 166 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index f6a0aaa..6769e21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,160 @@
+# Byte-compiled / optimized / DLL files
 __pycache__/
-*.pyc
-*.pyo
\ No newline at end of file
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/
\ No newline at end of file
diff --git a/comms_wrapper.py b/comms_wrapper.py
index a2b6df7..5706251 100644
--- a/comms_wrapper.py
+++ b/comms_wrapper.py
@@ -120,7 +120,7 @@ class Arduino:
         self._startReadingThread()
         
         # Wait for a bit for the arduino to initialise nicely
-        time.sleep(0.5)
+        time.sleep(1)
 
         # Conduct the handshake process
         timeoutTimer = time.time()
diff --git a/comms_wrapper_test_ground.py b/comms_wrapper_test_ground.py
index 32739a7..8d1997f 100644
--- a/comms_wrapper_test_ground.py
+++ b/comms_wrapper_test_ground.py
@@ -21,7 +21,7 @@ def main():
 
     Defining arduinos does not estabilish a connection. 
     '''
-    arduino1 = Arduino(descriptiveDeviceName="myArduino", portName="/dev/ttyACM0", baudrate=1000000)
+    arduino1 = Arduino(descriptiveDeviceName="myArduino", portName="/dev/ttyACM0", baudrate=115200)
 
     # As an example, we have arduino2 defined. All following functions can use this too.
     #arduino2 = Arduino(descriptiveDeviceName="myArduino2", portName="/dev/ttyACM2", baudrate=1000000)
diff --git a/pyComms/pyComms.ino b/pyComms/pyComms.ino
index e221990..0245346 100644
--- a/pyComms/pyComms.ino
+++ b/pyComms/pyComms.ino
@@ -4,7 +4,7 @@
 Define the message names you want send from the Arduino side 
 to the Python side. 
 */
-String msgName[] = {"msgA", "msgB", "msgC"s};
+String msgName[] = {"msgA", "msgB", "msgC"};
 
 
 /*
@@ -15,8 +15,8 @@ String dataCarrier[3];
 
 
 void setup() {
-  // Start the serial communication. The baudrate is arbiturary but higher than 115200 is recommended.
-  Serial.begin(1000000);
+  // Start the serial communication.
+  Serial.begin(115200);
 
   // Connect with the Python side
   init_python_communication();
@@ -38,10 +38,9 @@ void loop() {
   You must ALWAYS send strings and no other variable type. 
   You can convert anything to a string by calling String(); 
   */
-  dataCarrier[0] = "Some message";
+  dataCarrier[0] = String(millis());
   dataCarrier[1] = String(3);
-  dataCarrier[0] = "Another message";
-
+  dataCarrier[2] = "Another message";
 
   /*
    * This command "loads" the message. It doesn't send the message yet.
-- 
GitLab