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 <http://www.gnu.org/licenses/>. Closes #130 Signed-off-by: Robert Jordens <jordens@gmail.com>
m-labs · Sep 6, 2015 · 01416bb · 01416bb
1 parent 2bd27a3
commit 01416bb
Showing 20 changed files with 43 additions and 2 deletions.
diff --git a/.travis/get-anaconda.sh b/.travis/get-anaconda.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
 
 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
@@ -1,4 +1,6 @@
 #!/bin/sh
+# Copyright (C) 2014, 2015 M-Labs Limited
+# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
 
 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
@@ -1,4 +1,4 @@
-# Robert Jordens <jordens@gmail.com>, 2012-2015
+# Copyright (C) 2012-2015 Robert Jordens <jordens@gmail.com>
 
 from math import log, sqrt
 import logging

diff --git 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 <jordens@gmail.com>
 
 import argparse
 import sys

diff --git a/artiq/frontend/pdq2_client.py b/artiq/frontend/pdq2_client.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-# Robert Jordens <jordens@gmail.com>, 2012-2015
+# Copyright (C) 2012-2015 Robert Jordens <jordens@gmail.com>
 
 import argparse
 import time

diff --git 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 <jordens@gmail.com>
+
 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
@@ -1,3 +1,5 @@
+# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
+
 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
@@ -1,3 +1,5 @@
+# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
+
 import unittest
 
 import numpy as np

diff --git 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 <jordens@gmail.com>
+
 from math import sqrt
 
 from artiq.language import *

diff --git a/artiq/test/hardware_testbench.py b/artiq/test/hardware_testbench.py
@@ -1,3 +1,5 @@
+# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
+
 import os
 import sys
 import unittest

diff --git a/artiq/test/pdq2.py b/artiq/test/pdq2.py
@@ -1,3 +1,5 @@
+# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
+
 import unittest
 import os
 import io

diff --git a/artiq/test/wavesynth.py b/artiq/test/wavesynth.py
@@ -1,3 +1,5 @@
+# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
+
 import unittest
 
 from artiq.wavesynth import compute_samples

diff --git a/artiq/wavesynth/coefficients.py b/artiq/wavesynth/coefficients.py
@@ -1,3 +1,5 @@
+# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
+
 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
@@ -1,3 +1,6 @@
+# Copyright (C) 2014, 2015 M-Labs Limited
+# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
+
 from copy import copy
 from math import cos, pi
 

diff --git a/doc/manual/faq.rst b/doc/manual/faq.rst
@@ -1,3 +1,5 @@
+.. Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
+
 FAQ
 ###
 

diff --git a/doc/slides/taaccs.tex b/doc/slides/taaccs.tex
@@ -1,3 +1,5 @@
+% Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
+
 \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
@@ -1,3 +1,5 @@
+# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
+
 from artiq import *
 
 

diff --git a/examples/master/repository/transport.py b/examples/master/repository/transport.py
@@ -1,3 +1,5 @@
+# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
+
 import numpy as np
 
 from artiq import *

diff --git 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 <jordens@gmail.com>
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/soc/targets/artiq_pipistrello.py b/soc/targets/artiq_pipistrello.py
@@ -1,3 +1,6 @@
+# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
+# Copyright (C) 2014, 2015 M-Labs Limited
+
 from fractions import Fraction
 
 from migen.fhdl.std import *
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,5 @@
		# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>

		from artiq import *