Backend sprint 2

.gitignore

@@ -133,4 +133,7 @@ env/
 
 .vscode/
 staticfiles/
-db.sqlite3
+db.sqlite3
+
+# Vim temporary files
+*.swp

.travis.yml

@@ -3,9 +3,22 @@ language: python
 python:
 - '3.6'
 
+addons:
+    firefox: latest
+
+dist: xenial
+services:
+    - xvfb
+
 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
+
 install:
 - pip install --upgrade pip
 - pip install -r requirements.txt
@@ -23,7 +36,4 @@ script:
 
 after_script:
 - coveralls
-
-notifications:
-    slack: gcivil-nyu:ahgpmz0a0XgrrUU3E9kPk9kZ
-
+- cat geckodriver.log

hardware/CommunicationsPi/find_port.py

@@ -0,0 +1,130 @@
+#!/usr/bin/env python3
+import sys
+import argparse
+import serial
+import serial.tools.list_ports
+
+def is_usb_serial(port, args):
+    if port.vid is None:
+        return False
+    if not args.vid is None:
+        if port.vid != args.vid:
+            return False
+    if not args.pid is None:
+        if port.pid != args.pid:
+            return False
+    if not args.vendor is None:
+        if not port.manufacturer.startswith(args.vendor):
+            return False
+    if not args.serial is None:
+        if not port.serial_number.startswith(args.serial):
+            return False
+    if not args.intf is None:
+        if port.interface is None or not args.intf in port.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 extra_items:
+        return ' with ' + ' '.join(extra_items)
+    return ''
+
+def getPort():
+    for port in serial.tools.list_ports.comports():
+        if is_usb_serial(port, None):
+            print(port)
+            print(port.device)
+            return
+    return
+
+def main():
+    """The main program."""
+    parser = argparse.ArgumentParser(
+        prog="find-port.py",
+        usage="%(prog)s [options] [command]",
+        description="Find the /dev/tty port for a USB Serial devices",
+    )
+    parser.add_argument(
+        "-l", "--list",
+        dest="list",
+        action="store_true",
+        help="List USB Serial devices currently connected"
+    )
+    parser.add_argument(
+        "-s", "--serial",
+        dest="serial",
+        help="Only show devices with the indicated serial number",
+        default=None,
+    )
+    parser.add_argument(
+        "-n", "--vendor",
+        dest="vendor",
+        help="Only show devices with the indicated vendor name",
+        default=None
+    )
+    parser.add_argument(
+        "--pid",
+        dest="pid",
+        action="store",
+        help="Only show device with indicated PID",
+        default=None
+    )
+    parser.add_argument(
+        "-v", "--verbose",
+        dest="verbose",
+        action="store_true",
+        help="Turn on verbose messages",
+        default=False
+    )
+    parser.add_argument(
+        "--vid",
+        dest="vid",
+        action="store",
+        help="Only show device with indicated VID",
+        default=None
+    )
+    parser.add_argument(
+        '-i', '--intf',
+        dest='intf',
+        action='store',
+        help='Shows devices which conatin the indicated interface string',
+        default=None
+    )
+    args = parser.parse_args(sys.argv[1:])
+
+    if args.verbose:
+        print('pyserial version = {}'.format(serial.__version__))
+        print('   vid =', args.vid)
+        print('   pid =', args.pid)
+        print('serial =', args.serial)
+        print('vendor =', args.vendor)
+
+    if args.list:
+        detected = False
+        for port in serial.tools.list_ports.comports():
+            if is_usb_serial(port, args):
+                print('USB Serial Device {:04x}:{:04x}{} found @{}\r'.format(
+                    port.vid, port.pid,
+                    extra_info(port), port.device))
+                detected = True
+        if not detected:
+            print('No USB Serial devices detected.\r')
+        return
+
+    for port in serial.tools.list_ports.comports():
+        if is_usb_serial(port, args):
+            print(port)
+            print(port.device)
+            return
+    sys.exit(1)
+
+if __name__ == "__main__":
+    main()

hardware/README.md

@@ -0,0 +1,16 @@
+# Hardware Firmware
+
+This directory contains   the firmware for data collection.
+
+Sub-directories and their usage
+
+- `CommunicationsPi`: files related to radio and internet communications
+
+- `SensorPi`: files related to Sensors
+
+- `setup`: files related to initial setup
+
+
+#### Credits
+
+- [Dave Hylands](https://github.com/dhylands/dotfiles/blob/master/bin/find_port.py)

hardware/setup/raspberrypi-common.sh

@@ -1,13 +1,63 @@
+#!/bin/bash
+
 function showStatus() {
 	printf "\n${1}\n"
 }
 
 showStatus 'Running Raspberry Pi Common Setup'
 
+cd ~/Downloads
+
+showStatus 'Updating system...'
+sudo apt-get update -y && sudo apt-get upgrade -y && sudo apt-get autoremove -y
+
 showStatus 'Enabling VNC'
 sudo raspi-config nonint do_vnc 0
 
 showStatus 'Enabling SSH'
 sudo raspi-config nonint do_ssh 0
 
-showStatus 'Completed Raspberry Pi Common Setup'
+showStatus 'Setting screen resolution for remote access'
+sudo raspi-config nonint do_resolution 2 16
+
+showStatus 'Installing essentials'
+
+showStatus 'Installing vim'
+sudo apt-get install vim -y
+
+showStatus 'Installing curl and wget'
+sudo apt-get install curl wget -y
+
+showStatus 'Installing htop'
+sudo apt-get install git htop -y
+
+showStatus 'Installing screen'
+sudo apt-get install screen -y
+
+showStatus 'Installing nmap'
+sudo apt-get install nmap -y
+
+showStatus 'Installing AnyDesk'
+wget https://download.anydesk.com/rpi/anydesk_5.5.4-1_armhf.deb
+sudo dpkg -i anydesk*.deb
+sudo apt-get install -f
+sudo systemctl daemon-reload
+
+cd ~/
+
+echo "Completed Raspberry Pi Common Setup
+
+Your Raspberry Pi is update to date. The following packages were installed and enabled:
+- SSH: remote secure shell
+- VNC: remote access on the same network, works without internet
+- AnyDesk: remote access via internet
+- Vim: file editing in SSH
+- curl and wget: for file downloads and ping, Rasbian comes with these.
+- htop: an interactive process viewer for Unix systems
+- screen: virtual terminals to run tasks in background
+- nmap: for scanning IP of devices connected in the network
+
+
+NOTE!!!
+
+- Changing HOSTNAME of Raspberry Pi from raspberrypi would also change url for communication server. Default URL for communication server is http://raspberrypi.local"

mercury/forms.py

@@ -2,7 +2,7 @@
 engine to accept input for various features of the site"""
 from django import forms
 from mercury.models import (
-    Event,
+    AGEvent,
     TemperatureSensor,
     AccelerationSensor,
     WheelSpeedSensor,
@@ -13,18 +13,22 @@
 
 class EventForm(forms.ModelForm):
     class Meta:
-        model = Event
+        model = AGEvent
         fields = "__all__"
         widgets = {
-            "name": forms.TextInput(attrs={"id": "post-event-name", "required": True}),
-            "location": forms.TextInput(
-                attrs={"id": "post-event-location", "required": True}
+            "event_name": forms.TextInput(
+                attrs={"id": "post-event-name", "required": True}
             ),
-            "date": forms.DateInput(
+            "event_date": forms.DateInput(
                 attrs={"id": "post-event-date", "required": True, "type": "date"}
             ),
             "comments": forms.Textarea(
                 attrs={"id": "post-event-comments", "required": False}
+            "event_description": forms.Textarea(
+                attrs={"id": "post-event-description", "required": False},
+            ),
+            "event_location": forms.TextInput(
+                attrs={"id": "post-event-location", "required": True}
             ),
         }
 

mercury/migrations/0007_event.py

@@ -6,19 +6,26 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('mercury', '0006_delete_simulateddata'),
+        ("mercury", "0006_delete_simulateddata"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Event',
+            name="Event",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True,
-                 serialize=False, verbose_name='ID')),
-                ('event_name', models.CharField(max_length=100, unique=True)),
-                ('event_location', models.CharField(max_length=100, null=True)),
-                ('date', models.DateTimeField()),
-                ('comments', models.TextField(null=True)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("event_name", models.CharField(max_length=100, unique=True)),
+                ("event_location", models.CharField(max_length=100, null=True)),
+                ("date", models.DateTimeField()),
+                ("comments", models.TextField(null=True)),
             ],
         ),
     ]

mercury/migrations/0008_auto_20200225_1553.py

@@ -6,14 +6,14 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('mercury', '0007_event'),
+        ("mercury", "0007_event"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='event',
-            name='event_location',
-            field=models.CharField(default='Mexico', max_length=100),
+            model_name="event",
+            name="event_location",
+            field=models.CharField(default="Mexico", max_length=100),
             preserve_default=False,
         ),
     ]