Skip to content

Commit

Permalink
rename huginn -> packetraven
Browse files Browse the repository at this point in the history
  • Loading branch information
zacharyburnett committed Sep 17, 2020
1 parent 6abaf23 commit 39ae1ca
Show file tree
Hide file tree
Showing 22 changed files with 58 additions and 58 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ jobs:
- name: Install wheel
run: |
python -m pip install --upgrade pip
pip install huginn==$VERSION
pip install packetraven==$VERSION
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@ jobs:
# POSTGRES_DATABASE: test_database
# POSTGRES_USERNAME: test_user
# POSTGRES_PASSWORD: test_password
run: coverage run --source huginn -m nose --nologcapture --verbose --ignore-files="test_connections\.py"
run: coverage run --source packetraven -m nose --nologcapture --verbose --ignore-files="test_connections\.py"
- name: Generate coverage report
run: coverage report -m
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Huginn
PacketRaven

Copyright (c) 2015-2017 University of Maryland Space Systems Lab
NearSpace Balloon Payload Program

Huginn is licensed under the terms of the MIT License:
PacketRaven is licensed under the terms of the MIT License:

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Huginn
# PacketRaven

[![tests](https://github.com/UMDBPP/huginn/workflows/tests/badge.svg)](https://github.com/UMDBPP/huginn/actions?query=workflow%3Atests)
[![build](https://github.com/UMDBPP/huginn/workflows/build/badge.svg)](https://github.com/UMDBPP/huginn/actions?query=workflow%3Abuild)
[![tests](https://github.com/UMDBPP/packetraven/workflows/tests/badge.svg)](https://github.com/UMDBPP/packetraven/actions?query=workflow%3Atests)
[![build](https://github.com/UMDBPP/packetraven/workflows/build/badge.svg)](https://github.com/UMDBPP/packetraven/actions?query=workflow%3Abuild)

### Balloon payload telemetry over APRS
Huginn is a new version of Link-TLM written in Python
PacketRaven is a new version of Link-TLM written in Python

#### Features:
- APRS packet parsing over serial
Expand All @@ -13,17 +13,17 @@ Huginn is a new version of Link-TLM written in Python

#### Installation:
```bash
pip install huginn
pip install packetraven
```

#### Starting GUI:
###### starting CLI:
```bash
huginn
packetraven
```

#### Starting CLI:
###### starting GUI:
```bash
huginn_cli
packetraven_gui
```

#### In-progress Features
Expand Down
12 changes: 6 additions & 6 deletions huginn_cli.py → packetraven.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
import sys
import time

from huginn import connections, tracks
from huginn.utilities import get_logger
from huginn.writer import write_aprs_packet_tracks
from packetraven import connections, tracks
from packetraven.utilities import get_logger
from packetraven.writer import write_aprs_packet_tracks

BALLOON_CALLSIGNS = ['W3EAX-10', 'W3EAX-11', 'W3EAX-14']
INTERVAL_SECONDS = 5
Expand All @@ -27,14 +27,14 @@ def main():
if os.path.isdir(log_filename):
if not os.path.exists(log_filename):
os.mkdir(log_filename)
log_filename = os.path.join(log_filename, f'{datetime.now():%Y%m%dT%H%M%S}_huginn_log.txt')
log_filename = os.path.join(log_filename, f'{datetime.now():%Y%m%dT%H%M%S}_packetraven_log.txt')

if output_filename is not None:
output_directory = os.path.dirname(output_filename)
if not os.path.exists(output_directory):
os.makedirs(output_directory)

logger = get_logger('huginn', log_filename)
logger = get_logger('packetraven', log_filename)

aprs_connections = []
if serial_port is not None and 'txt' in serial_port:
Expand Down Expand Up @@ -99,7 +99,7 @@ def main():

time.sleep(INTERVAL_SECONDS)
else:
print('usage: huginn serial_port [log_path] [output_file]')
print('usage: packetraven serial_port [log_path] [output_file]')


if __name__ == '__main__':
Expand Down
File renamed without changes.
8 changes: 4 additions & 4 deletions huginn/connections.py → packetraven/connections.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
from serial.tools import list_ports
from shapely.geometry import Point

from huginn.database import DatabaseTable
from huginn.packets import APRSLocationPacket, LocationPacket
from huginn.utilities import CREDENTIALS_FILENAME, get_logger
from packetraven.database import DatabaseTable
from packetraven.packets import APRSLocationPacket, LocationPacket
from packetraven.utilities import CREDENTIALS_FILENAME, get_logger

LOGGER = get_logger('huginn.connection')
LOGGER = get_logger('packetraven.connection')


class PacketConnection(ABC):
Expand Down
4 changes: 2 additions & 2 deletions huginn/database.py → packetraven/database.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
from shapely.geometry.base import BaseGeometry
from sshtunnel import SSHTunnelForwarder

from huginn.utilities import get_logger
from packetraven.utilities import get_logger

LOGGER = get_logger('huginn.connection')
LOGGER = get_logger('packetraven.connection')

POSTGRES_DEFAULT_PORT = 5432
SSH_DEFAULT_PORT = 22
Expand Down
2 changes: 1 addition & 1 deletion huginn/packets.py → packetraven/packets.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import numpy
from pyproj import CRS, Geod, Transformer

from huginn.parsing import parse_raw_aprs
from packetraven.parsing import parse_raw_aprs

DEFAULT_CRS = CRS.from_epsg(4326)

Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions huginn/tracks.py → packetraven/tracks.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
import numpy
from pyproj import CRS, Geod

from huginn.packets import APRSLocationPacket, DEFAULT_CRS, LocationPacket
from huginn.structures import DoublyLinkedList
from packetraven.packets import APRSLocationPacket, DEFAULT_CRS, LocationPacket
from packetraven.structures import DoublyLinkedList


class LocationPacketTrack:
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion huginn/writer.py → packetraven/writer.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from geojson import Point
from shapely.geometry import LineString

from huginn.tracks import APRSTrack
from packetraven.tracks import APRSTrack

KML_STANDARD = '{http://www.opengis.net/kml/2.2}'

Expand Down
26 changes: 13 additions & 13 deletions huginn.py → packetraven_gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@
import tkinter
from tkinter import filedialog, messagebox

from huginn import connections, tracks
from huginn.connections import PacketRadio
from huginn.utilities import get_logger
from huginn.writer import write_aprs_packet_tracks
from packetraven import connections, tracks
from packetraven.connections import PacketRadio
from packetraven.utilities import get_logger
from packetraven.writer import write_aprs_packet_tracks

BALLOON_CALLSIGNS = ['W3EAX-10', 'W3EAX-11', 'W3EAX-14']
INTERVAL_SECONDS = 5
DESKTOP_PATH = os.path.join(os.path.expanduser('~'), 'Desktop')

LOGGER = get_logger('huginn')
LOGGER = get_logger('packetraven')


class HuginnGUI:
class PacketRavenGUI:
def __init__(self):
self.main_window = tkinter.Tk()
self.main_window.title('huginn main')
self.main_window.title('packetraven main')

self.connections = []

Expand All @@ -42,12 +42,12 @@ def __init__(self):
self.__add_entry_box(self.frames['top'], 'port')

self.__add_entry_box(self.frames['top'], title='log_file', width=45)
self.elements['log_file'].insert(0, os.path.join(DESKTOP_PATH, f'huginn_log_{datetime.now():%Y%m%dT%H%M%S}.txt'))
self.elements['log_file'].insert(0, os.path.join(DESKTOP_PATH, f'packetraven_log_{datetime.now():%Y%m%dT%H%M%S}.txt'))
log_file_button = tkinter.Button(self.frames['top'], text='...', command=self.__select_log_file)
log_file_button.grid(row=self.last_row, column=2)

self.__add_entry_box(self.frames['top'], title='output_file', width=45)
self.elements['output_file'].insert(0, os.path.join(DESKTOP_PATH, f'huginn_output_{datetime.now():%Y%m%dT%H%M%S}.geojson'))
self.elements['output_file'].insert(0, os.path.join(DESKTOP_PATH, f'packetraven_output_{datetime.now():%Y%m%dT%H%M%S}.geojson'))
output_file_button = tkinter.Button(self.frames['top'], text='...', command=self.__select_output_file)
output_file_button.grid(row=self.last_row, column=2)

Expand Down Expand Up @@ -110,15 +110,15 @@ def __add_entry_box(self, frame: tkinter.Frame, title: str, row: int = None, wid

def __select_log_file(self):
filename = os.path.splitext(self.elements['log_file'].get())[0]
path = filedialog.asksaveasfilename(title='Huginn log location...', initialfile=filename,
path = filedialog.asksaveasfilename(title='PacketRaven log location...', initialfile=filename,
defaultextension='.txt', filetypes=[('Text', '*.txt')])

if path != '':
self.replace_text(self.elements['log_file'], path)

def __select_output_file(self):
filename = os.path.splitext(self.elements['output_file'].get())[0]
path = filedialog.asksaveasfilename(title='Huginn output location...', initialfile=filename,
path = filedialog.asksaveasfilename(title='PacketRaven output location...', initialfile=filename,
defaultextension='.kml', filetypes=[('GeoJSON', '*.geojson'), ('Keyhole Markup Language', '*.kml')])
if path != '':
self.replace_text(self.elements['output_file'], path)
Expand Down Expand Up @@ -189,7 +189,7 @@ def toggle(self):
self.toggle_text.set('Stop')
self.active = True
except Exception as error:
messagebox.showerror('Huginn Error', f'{error.__class__.__name__} - {error}')
messagebox.showerror('PacketRaven Error', f'{error.__class__.__name__} - {error}')
self.active = False

self.run()
Expand Down Expand Up @@ -258,7 +258,7 @@ def replace_text(element, value):


def main():
HuginnGUI()
PacketRavenGUI()


if __name__ == '__main__':
Expand Down
6 changes: 3 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[metadata]
name = huginn
name = packetraven
author = Zach Burnett
author_email = zachary.r.burnett@gmail.com
author_email = zrb@umd.edu
description = Balloon payload telemetry over APRS
long_description = file: README.md
license = MIT
url = https://github.com/UMDBPP/huginn.git
url = https://github.com/UMDBPP/packetraven.git

[nosetests]
exe = True
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
],
extras_require={'dev': ['coverage', 'dunamai', 'flake8', 'nose']},
entry_points={
'console_scripts': ['huginn_cli=huginn_cli:main'],
'gui_scripts' : ['huginn=huginn:main']
'console_scripts': ['packetraven=packetraven:main'],
'gui_scripts' : ['packetraven_gui=packetraven_gui:main']
},
test_suite='nose.collector'
)
8 changes: 4 additions & 4 deletions tests/test_connections.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
import os
import unittest

from huginn.connections import APRSPacketDatabaseTable, APRS_fi
from huginn.database import database_has_table
from huginn.packets import APRSLocationPacket
from huginn.utilities import CREDENTIALS_FILENAME, read_configuration
from packetraven.connections import APRSPacketDatabaseTable, APRS_fi
from packetraven.database import database_has_table
from packetraven.packets import APRSLocationPacket
from packetraven.utilities import CREDENTIALS_FILENAME, read_configuration


class TestConnections(unittest.TestCase):
Expand Down
4 changes: 2 additions & 2 deletions tests/test_packets.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

import numpy

from huginn.packets import APRSLocationPacket
from huginn.tracks import APRSTrack
from packetraven.packets import APRSLocationPacket
from packetraven.tracks import APRSTrack


class TestPackets(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion tests/test_parser.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import unittest

from huginn.parsing import PartialPacketError, parse_raw_aprs
from packetraven.parsing import PartialPacketError, parse_raw_aprs


class TestParser(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion tests/test_structures.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import unittest

from huginn.structures import DoublyLinkedList
from packetraven.structures import DoublyLinkedList


class TestDoublyLinkedList(unittest.TestCase):
Expand Down
6 changes: 3 additions & 3 deletions tests/test_writer.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
from tempfile import TemporaryDirectory
import unittest

from huginn.packets import APRSLocationPacket
from huginn.tracks import APRSTrack
from huginn.writer import write_aprs_packet_tracks
from packetraven.packets import APRSLocationPacket
from packetraven.tracks import APRSTrack
from packetraven.writer import write_aprs_packet_tracks


class TestWriter(unittest.TestCase):
Expand Down

0 comments on commit 39ae1ca

Please sign in to comment.