Sync frontend team with latest from master

.coveragerc

@@ -0,0 +1,14 @@
+# .coveragerc to control coverage.py
+[run]
+omit = 
+    */site-packages/*
+    */distutils/*
+    */tests/*
+    hardware/setup/*
+source =
+    mysite
+    mercury
+    hardware
+    ag_data
+    hardware/CommunicationsPi
+    hardware/SensorPi

.flake8

@@ -1,5 +1,5 @@
 [flake8]
-max-line-length = 92
+max-line-length = 119
 exclude =
     .git,
     __pycache__,

.travis.yml

@@ -1,40 +1,66 @@
-language: python
+dist: xenial
+os: linux
+language: ruby
 
-python:
-- '3.6'
+jobs:
+  include:
+    # run django tests
+    - language: python
 
-addons:
-    firefox: latest
+      python: '3.6'
 
-dist: xenial
-services:
-    - xvfb
+      addons:
+        firefox: latest
+
+      dist: xenial
+      services:
+        - xvfb
+        - postgresql
 
-services:
-- postgresql
+      before_install:
+        - wget https://github.com/mozilla/geckodriver/releases/download/v0.26.0/geckodriver-v0.26.0-linux64.tar.gz
+        - mkdir geckodriver
+        - tar -xzf geckodriver-v0.26.0-linux64.tar.gz -C geckodriver
+        - export PATH=$PATH:$PWD/geckodriver
 
-before_install:
-    - wget https://github.com/mozilla/geckodriver/releases/download/v0.26.0/geckodriver-v0.26.0-linux64.tar.gz
-    - mkdir geckodriver
-    - tar -xzf geckodriver-v0.26.0-linux64.tar.gz -C geckodriver
-    - export PATH=$PATH:$PWD/geckodriver
+      install:
+        - pip install --upgrade pip
+        - pip install -r requirements.txt
+        - pip install -r test-requirements.txt
 
-install:
-- pip install --upgrade pip
-- pip install -r requirements.txt
-- pip install -r test-requirements.txt
+      before_script:
+        - psql -c 'create database mercury;' -U postgres
+        - python manage.py migrate
+        - python manage.py collectstatic --noinput
 
-before_script:
-- psql -c 'create database mercury;' -U postgres
-- python manage.py migrate
-- python manage.py collectstatic --noinput
+      script:
+        - black --check --diff .
+        # modify .flake8 env file to update flake8 configuration
+        - flake8 .
+        # modify .coveragerc env file to update test configuration
+        - coverage run manage.py test
 
-script:
-- black --check --exclude "migrations/" mysite mercury ag_data
-- flake8 mysite/ mercury/ ag_data/
-- coverage run --source=mysite,mercury,ag_data --omit="migrations/*" manage.py test
+      after_script:
+        - coveralls
+        - cat geckodriver.log
 
-after_script:
-- coveralls
-- cat geckodriver.log
+    # run the hardware tests
+    - language: bash
+
+      # python: '3.6'
+
+      services:
+          - docker
+
+      before_script:
+        # prepare qemu for arm emulation on x64 hardware
+        - docker run --rm --privileged multiarch/qemu-user-static:register --reset
+        # build image
+        - docker build -t gcivil-nyu-org/spring2020-cs-gy-9223-class .
+
+      script:
+        # basic help world test to see if it's working
+        - docker run gcivil-nyu-org/spring2020-cs-gy-9223-class grep -q "Hello, Docker!" hello.txt
+        # - black --check --exclude "migrations/" hardware
 
+

Dockerfile

@@ -0,0 +1,13 @@
+FROM raspbian/stretch
+
+# install common build dependencies
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    raspi-config
+
+# copy setup scripts
+COPY ./hardware .
+
+# run setup
+RUN bash ./setup/raspberrypi-common.sh
+
+RUN echo "Hello, Docker!" > hello.txt

hardware/CommunicationsPi/README.md

@@ -0,0 +1,17 @@
+# CommunicationsPi
+
+### This directory contains all the scripts related to communications via LAN, Radio and internet.
+
+Note: `env` file contains environment variables required to run different services. Please run the following command to
+export variables before running any service.
+
+```
+  cd hardware
+  if [ -f env ]; then export $(cat env | sed 's/#.*//g' | xargs); fi
+```
+
+##### Scripts
+- `lan_client.py`: Sends post data via LAN to Local LAN server
+- `lan_server.py`: Listens to LAN clients
+- `serial_write.py`: Sends data via radio serial
+- `serial_read.py`: Listens to radio serial

hardware/CommunicationsPi/find_port.py

@@ -6,45 +6,45 @@
 
 
 def is_usb_serial(port, args):
-    if port.vid is None:
+    if port["vid"] is None:
         return False
-    if not args.vid is None:
-        if port.vid != args.vid:
+    if not args.get("vid") is None:
+        if port["vid"] != args.get("vid"):
             return False
-    if not args.pid is None:
-        if port.pid != args.pid:
+    if not args.get("pid") is None:
+        if port.get("pid") != args.get("pid"):
             return False
-    if not args.vendor is None:
-        if not port.manufacturer.startswith(args.vendor):
+    if not args.get("vendor") is None:
+        if not port["manufacturer"].startswith(args.get("vendor")):
             return False
-    if not args.serial is None:
-        if not port.serial_number.startswith(args.serial):
+    if not args.get("serial") is None:
+        if not port["serial_number"].startswith(args.get("serial")):
             return False
-    if not args.intf is None:
-        if port.interface is None or not args.intf in port.interface:
+    if not args.get("intf") is None:
+        if port["interface"] is None or not args.get("intf") in port.get("interface"):
             return False
     return True
 
 
 def extra_info(port):
     extra_items = []
-    if port.manufacturer:
-        extra_items.append("vendor '{}'".format(port.manufacturer))
-    if port.serial_number:
-        extra_items.append("serial '{}'".format(port.serial_number))
-    if port.interface:
-        extra_items.append("intf '{}'".format(port.interface))
+    if port.get("manufacturer"):
+        extra_items.append("vendor '{}'".format(port["manufacturer"]))
+    if port.get("serial_number"):
+        extra_items.append("serial '{}'".format(port["serial_number"]))
+    if port.get("interface"):
+        extra_items.append("intf '{}'".format(port["interface"]))
     if extra_items:
         return " with " + " ".join(extra_items)
     return ""
 
 
-def getPort():
+def get_port():
     for port in serial.tools.list_ports.comports():
-        if is_usb_serial(port, None):
+        if is_usb_serial(port, {}):
             print(port)
-            print(port.device)
-            return
+            print(port["device"])
+            return "port found"
     return
 
 

hardware/CommunicationsPi/lan_client.py

@@ -0,0 +1,24 @@
+import os
+import time
+import json
+import requests
+from requests.exceptions import HTTPError
+from utils import get_logger
+
+logging = get_logger("LAN_CLIENT_LOG_FILE")
+
+url = os.environ["LAN_SERVER"]
+
+logging.info("Pinging")
+while True:
+    try:
+        payload = {"key1": "value1", "key2": "value2"}
+        logging.info("data: " + json.dumps(payload))
+        response = requests.post(url, data=payload)
+        response.raise_for_status()
+    except HTTPError as http_err:
+        logging.error("HTTP error occurred: {}".format(str(http_err)))
+    except Exception as err:
+        logging.error("error occurred: {}".format(str(err)))
+    else:
+        time.sleep(1)

hardware/CommunicationsPi/server.py → hardware/CommunicationsPi/lan_server.py

@@ -1,11 +1,11 @@
 #!/usr/bin/env python3
-"""
-Very simple HTTP server in python for logging requests
-Usage::
-    ./server.py [<port>]
-"""
+
 from http.server import BaseHTTPRequestHandler, HTTPServer
 import logging
+from utils import get_logger
+
+# Logs status in a file
+log = get_logger("LAN_SERVER_LOG_FILE")
 
 
 class S(BaseHTTPRequestHandler):
@@ -32,6 +32,7 @@ def do_POST(self):
             str(self.headers),
             post_data.decode("utf-8"),
         )
+        log.info("data: " + str(post_data))
 
         self._set_response()
         self.wfile.write("POST request for {}".format(self.path).encode("utf-8"))

hardware/CommunicationsPi/logger.py

@@ -0,0 +1,51 @@
+# import sys
+import os
+import logging
+
+from logging import INFO
+
+
+class Logger(object):
+    def __init__(
+        self,
+        name,
+        filename,
+        format="%(asctime)s | %(levelname)s | %(message)s",
+        level=INFO,
+    ):
+        # Initial construct.
+        self.format = format
+        self.level = level
+        self.name = name
+
+        # Logger configuration.
+        self.console_formatter = logging.Formatter(self.format)
+        self.console_logger = logging.FileHandler(self.get_logger_file(filename), "w")
+        self.console_logger.setFormatter(self.console_formatter)
+
+        # Complete logging config.
+        self.logger = logging.getLogger(name)
+        self.logger.setLevel(self.level)
+        self.logger.addHandler(self.console_logger)
+
+    def get_logger_file(self, file_name):
+        d = os.environ["LOG_DIRECTORY"]
+        if not os.path.exists(d):
+            os.makedirs(d)
+        return d + "/" + file_name
+
+    def info(self, msg, extra=None):
+        print(msg)
+        self.logger.info(msg, extra=extra)
+
+    def error(self, msg, extra=None):
+        print(msg)
+        self.logger.error(msg, extra=extra)
+
+    def debug(self, msg, extra=None):
+        print(msg)
+        self.logger.debug(msg, extra=extra)
+
+    def warn(self, msg, extra=None):
+        print(msg)
+        self.logger.warn(msg, extra=extra)

hardware/CommunicationsPi/main.py

@@ -1 +1 @@
-print("Hello Comms")
+# print("Hello Comms")

hardware/CommunicationsPi/port.py

@@ -4,10 +4,8 @@
 import glob
 import sys
 import json
-
 import serial
 import serial_asyncio
-from django.utils import dateparse
 
 
 class AsyncSerialProtocol(asyncio.Protocol):
@@ -27,54 +25,19 @@ def data_received(self, data):
         except json.JSONDecodeError:
             print()
 
-        # print(repr(data))
-        # json_to_models(repr(data))
-        # if len(repr(data).split(";")) > 2:
         self.transport.close()
 
     def connection_lost(self, exc):
         print("port closed")
         asyncio.get_event_loop().stop()
 
 
-def json_to_models(json_str, event_id):
-    """
-        Json example:
-        {
-        sensors:{
-            ss_id : “Sensor id”,
-            ss_value : {
-                /*as many values as you wish*/
-                value_a_name : “value_a”,
-                value_b_name : “value_b”,
-                value_c_name : “value_c”
-            }
-            date : “2014-03-12T13:37:27+00:00” /*ISO 8601 dates*/
-        };
-        """
-    res = []
-    sensors = json_str["sensors"]
-    ss_id = int(sensors["ss_id"])
-    ss_value = sensors["ss_value"]
-    date = dateparse.parse_datetime(sensors["date"])
-
-
 ser = serial.Serial()
 ports = glob.glob("/dev/tty.u*")
 print(ports[0])
 ser.port = ports[0]
 ser.timeout = 1
 ser.open()
-# print(ser.port)
-# print(ser.baudrate)
-# print(ser.parity)
-# print(ser.stopbits)
-# print(ser.bytesize)
-# print(ser.timeout)
-# while 1:
-#     x = ser.readline()
-#     if x is not "":
-#         print(x)
 
 loop = asyncio.new_event_loop()
 coro = serial_asyncio.create_serial_connection(loop, AsyncSerialProtocol, ports[0])