From 01416bb0be915fa62deec847a9c88ec2a41311e8 Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Sun, 6 Sep 2015 16:08:57 -0600 Subject: [PATCH] copyright: claim contributions These are contributions of >= 30% or >= 20 lines (half-automated). I hereby resubmit all my previous contributions to the ARTIQ project under the following terms: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . Closes #130 Signed-off-by: Robert Jordens --- .travis/get-anaconda.sh | 1 + .travis/get-xilinx.sh | 2 ++ artiq/devices/pdq2/driver.py | 2 +- artiq/frontend/artiq_run.py | 2 ++ artiq/frontend/pdq2_client.py | 2 +- artiq/gateware/rtio/phy/ttl_serdes_spartan6.py | 2 ++ artiq/language/__init__.py | 2 ++ artiq/test/coefficients.py | 2 ++ artiq/test/coredevice.py | 3 +++ artiq/test/hardware_testbench.py | 2 ++ artiq/test/pdq2.py | 2 ++ artiq/test/wavesynth.py | 2 ++ artiq/wavesynth/coefficients.py | 2 ++ artiq/wavesynth/compute_samples.py | 3 +++ doc/manual/faq.rst | 2 ++ doc/slides/taaccs.tex | 2 ++ examples/master/repository/tdr.py | 2 ++ examples/master/repository/transport.py | 2 ++ soc/runtime/test_mode.c | 5 +++++ soc/targets/artiq_pipistrello.py | 3 +++ 20 files changed, 43 insertions(+), 2 deletions(-) diff --git a/.travis/get-anaconda.sh b/.travis/get-anaconda.sh index 146c7b84f..af13fe6e4 100755 --- a/.travis/get-anaconda.sh +++ b/.travis/get-anaconda.sh @@ -1,4 +1,5 @@ #!/bin/sh +# Copyright (C) 2014, 2015 Robert Jordens export PATH=$HOME/miniconda/bin:$PATH wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh diff --git a/.travis/get-xilinx.sh b/.travis/get-xilinx.sh index 95d50e41c..ccb6a5059 100755 --- a/.travis/get-xilinx.sh +++ b/.travis/get-xilinx.sh @@ -1,4 +1,6 @@ #!/bin/sh +# Copyright (C) 2014, 2015 M-Labs Limited +# Copyright (C) 2014, 2015 Robert Jordens wget http://sionneau.net/artiq/Xilinx/xilinx_ise_14.7_s3_s6.tar.gz.gpg echo "$secret" | gpg --passphrase-fd 0 xilinx_ise_14.7_s3_s6.tar.gz.gpg diff --git a/artiq/devices/pdq2/driver.py b/artiq/devices/pdq2/driver.py index b5ecafdf4..a8637cc5b 100644 --- a/artiq/devices/pdq2/driver.py +++ b/artiq/devices/pdq2/driver.py @@ -1,4 +1,4 @@ -# Robert Jordens , 2012-2015 +# Copyright (C) 2012-2015 Robert Jordens from math import log, sqrt import logging diff --git a/artiq/frontend/artiq_run.py b/artiq/frontend/artiq_run.py index 976e3edf6..91636f762 100755 --- a/artiq/frontend/artiq_run.py +++ b/artiq/frontend/artiq_run.py @@ -1,4 +1,6 @@ #!/usr/bin/env python3 +# Copyright (C) 2014, 2015 M-Labs Limited +# Copyright (C) 2014, 2015 Robert Jordens import argparse import sys diff --git a/artiq/frontend/pdq2_client.py b/artiq/frontend/pdq2_client.py index 6a6d68ec1..2f3c3b787 100755 --- a/artiq/frontend/pdq2_client.py +++ b/artiq/frontend/pdq2_client.py @@ -1,5 +1,5 @@ #!/usr/bin/python -# Robert Jordens , 2012-2015 +# Copyright (C) 2012-2015 Robert Jordens import argparse import time diff --git a/artiq/gateware/rtio/phy/ttl_serdes_spartan6.py b/artiq/gateware/rtio/phy/ttl_serdes_spartan6.py index cf31449c1..a1515c8ac 100644 --- a/artiq/gateware/rtio/phy/ttl_serdes_spartan6.py +++ b/artiq/gateware/rtio/phy/ttl_serdes_spartan6.py @@ -1,3 +1,5 @@ +# Copyright (C) 2014, 2015 Robert Jordens + from migen.fhdl.std import * from artiq.gateware.rtio.phy import ttl_serdes_generic diff --git a/artiq/language/__init__.py b/artiq/language/__init__.py index 6497cda47..39edc6164 100644 --- a/artiq/language/__init__.py +++ b/artiq/language/__init__.py @@ -1,3 +1,5 @@ +# Copyright (C) 2014, 2015 Robert Jordens + from artiq.language import core, environment, units, scan from artiq.language.core import * from artiq.language.environment import * diff --git a/artiq/test/coefficients.py b/artiq/test/coefficients.py index 35bb3f35f..4b78cb3de 100644 --- a/artiq/test/coefficients.py +++ b/artiq/test/coefficients.py @@ -1,3 +1,5 @@ +# Copyright (C) 2014, 2015 Robert Jordens + import unittest import numpy as np diff --git a/artiq/test/coredevice.py b/artiq/test/coredevice.py index 530521a60..97347667e 100644 --- a/artiq/test/coredevice.py +++ b/artiq/test/coredevice.py @@ -1,3 +1,6 @@ +# Copyright (C) 2014, 2015 M-Labs Limited +# Copyright (C) 2014, 2015 Robert Jordens + from math import sqrt from artiq.language import * diff --git a/artiq/test/hardware_testbench.py b/artiq/test/hardware_testbench.py index 1734852cc..550e04371 100644 --- a/artiq/test/hardware_testbench.py +++ b/artiq/test/hardware_testbench.py @@ -1,3 +1,5 @@ +# Copyright (C) 2014, 2015 Robert Jordens + import os import sys import unittest diff --git a/artiq/test/pdq2.py b/artiq/test/pdq2.py index 54dbd9b5e..ef2c9bbf4 100644 --- a/artiq/test/pdq2.py +++ b/artiq/test/pdq2.py @@ -1,3 +1,5 @@ +# Copyright (C) 2014, 2015 Robert Jordens + import unittest import os import io diff --git a/artiq/test/wavesynth.py b/artiq/test/wavesynth.py index 8a40cd71b..1413a4a61 100644 --- a/artiq/test/wavesynth.py +++ b/artiq/test/wavesynth.py @@ -1,3 +1,5 @@ +# Copyright (C) 2014, 2015 Robert Jordens + import unittest from artiq.wavesynth import compute_samples diff --git a/artiq/wavesynth/coefficients.py b/artiq/wavesynth/coefficients.py index ee9efb351..b204b2ba0 100644 --- a/artiq/wavesynth/coefficients.py +++ b/artiq/wavesynth/coefficients.py @@ -1,3 +1,5 @@ +# Copyright (C) 2014, 2015 Robert Jordens + import numpy as np from scipy.interpolate import splrep, splev, spalde from scipy.special import binom diff --git a/artiq/wavesynth/compute_samples.py b/artiq/wavesynth/compute_samples.py index 476fb385a..1d48a81f5 100644 --- a/artiq/wavesynth/compute_samples.py +++ b/artiq/wavesynth/compute_samples.py @@ -1,3 +1,6 @@ +# Copyright (C) 2014, 2015 M-Labs Limited +# Copyright (C) 2014, 2015 Robert Jordens + from copy import copy from math import cos, pi diff --git a/doc/manual/faq.rst b/doc/manual/faq.rst index c30912291..54ea2523b 100644 --- a/doc/manual/faq.rst +++ b/doc/manual/faq.rst @@ -1,3 +1,5 @@ +.. Copyright (C) 2014, 2015 Robert Jordens + FAQ ### diff --git a/doc/slides/taaccs.tex b/doc/slides/taaccs.tex index 71c608f26..d9bb6aa93 100644 --- a/doc/slides/taaccs.tex +++ b/doc/slides/taaccs.tex @@ -1,3 +1,5 @@ +% Copyright (C) 2014, 2015 Robert Jordens + \documentclass[final,presentation,compress]{beamer} \usepackage[mathcal]{euler} \usepackage{amsmath, amssymb, amsopn} %amssymb,amstext diff --git a/examples/master/repository/tdr.py b/examples/master/repository/tdr.py index 9a07d5753..9058a06fd 100644 --- a/examples/master/repository/tdr.py +++ b/examples/master/repository/tdr.py @@ -1,3 +1,5 @@ +# Copyright (C) 2014, 2015 Robert Jordens + from artiq import * diff --git a/examples/master/repository/transport.py b/examples/master/repository/transport.py index ed44e0a26..9d5af3d6c 100644 --- a/examples/master/repository/transport.py +++ b/examples/master/repository/transport.py @@ -1,3 +1,5 @@ +# Copyright (C) 2014, 2015 Robert Jordens + import numpy as np from artiq import * diff --git a/soc/runtime/test_mode.c b/soc/runtime/test_mode.c index f402dcfcf..daf822799 100644 --- a/soc/runtime/test_mode.c +++ b/soc/runtime/test_mode.c @@ -1,3 +1,8 @@ +/* + * Copyright (C) 2014, 2015 M-Labs Limited + * Copyright (C) 2014, 2015 Robert Jordens + */ + #include #include #include diff --git a/soc/targets/artiq_pipistrello.py b/soc/targets/artiq_pipistrello.py index 2e0f682e4..044e4d02c 100644 --- a/soc/targets/artiq_pipistrello.py +++ b/soc/targets/artiq_pipistrello.py @@ -1,3 +1,6 @@ +# Copyright (C) 2014, 2015 Robert Jordens +# Copyright (C) 2014, 2015 M-Labs Limited + from fractions import Fraction from migen.fhdl.std import *