Skip to content

Commit 01416bb

Browse files
jordensjordens
committedSep 6, 2015
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>
·
8.00.1
1 parent 2bd27a3 commit 01416bb

File tree

20 files changed

+43
-2
lines changed

20 files changed

+43
-2
lines changed
 

Diff for: ‎.travis/get-anaconda.sh

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/sh
2+
# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
23

34
export PATH=$HOME/miniconda/bin:$PATH
45
wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh

Diff for: ‎.travis/get-xilinx.sh

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/bin/sh
2+
# Copyright (C) 2014, 2015 M-Labs Limited
3+
# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
24

35
wget http://sionneau.net/artiq/Xilinx/xilinx_ise_14.7_s3_s6.tar.gz.gpg
46
echo "$secret" | gpg --passphrase-fd 0 xilinx_ise_14.7_s3_s6.tar.gz.gpg

Diff for: ‎artiq/devices/pdq2/driver.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Robert Jordens <jordens@gmail.com>, 2012-2015
1+
# Copyright (C) 2012-2015 Robert Jordens <jordens@gmail.com>
22

33
from math import log, sqrt
44
import logging

Diff for: ‎artiq/frontend/artiq_run.py

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/usr/bin/env python3
2+
# Copyright (C) 2014, 2015 M-Labs Limited
3+
# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
24

35
import argparse
46
import sys

Diff for: ‎artiq/frontend/pdq2_client.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/python
2-
# Robert Jordens <jordens@gmail.com>, 2012-2015
2+
# Copyright (C) 2012-2015 Robert Jordens <jordens@gmail.com>
33

44
import argparse
55
import time

Diff for: ‎artiq/gateware/rtio/phy/ttl_serdes_spartan6.py

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
2+
13
from migen.fhdl.std import *
24

35
from artiq.gateware.rtio.phy import ttl_serdes_generic

Diff for: ‎artiq/language/__init__.py

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
2+
13
from artiq.language import core, environment, units, scan
24
from artiq.language.core import *
35
from artiq.language.environment import *

Diff for: ‎artiq/test/coefficients.py

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
2+
13
import unittest
24

35
import numpy as np

Diff for: ‎artiq/test/coredevice.py

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright (C) 2014, 2015 M-Labs Limited
2+
# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
3+
14
from math import sqrt
25

36
from artiq.language import *

Diff for: ‎artiq/test/hardware_testbench.py

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
2+
13
import os
24
import sys
35
import unittest

Diff for: ‎artiq/test/pdq2.py

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
2+
13
import unittest
24
import os
35
import io

Diff for: ‎artiq/test/wavesynth.py

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
2+
13
import unittest
24

35
from artiq.wavesynth import compute_samples

Diff for: ‎artiq/wavesynth/coefficients.py

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
2+
13
import numpy as np
24
from scipy.interpolate import splrep, splev, spalde
35
from scipy.special import binom

Diff for: ‎artiq/wavesynth/compute_samples.py

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright (C) 2014, 2015 M-Labs Limited
2+
# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
3+
14
from copy import copy
25
from math import cos, pi
36

Diff for: ‎doc/manual/faq.rst

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
2+
13
FAQ
24
###
35

Diff for: ‎doc/slides/taaccs.tex

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
% Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
2+
13
\documentclass[final,presentation,compress]{beamer}
24
\usepackage[mathcal]{euler}
35
\usepackage{amsmath, amssymb, amsopn} %amssymb,amstext

Diff for: ‎examples/master/repository/tdr.py

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
2+
13
from artiq import *
24

35

Diff for: ‎examples/master/repository/transport.py

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
2+
13
import numpy as np
24

35
from artiq import *

Diff for: ‎soc/runtime/test_mode.c

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright (C) 2014, 2015 M-Labs Limited
3+
* Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
4+
*/
5+
16
#include <stdio.h>
27
#include <stdlib.h>
38
#include <string.h>

Diff for: ‎soc/targets/artiq_pipistrello.py

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
2+
# Copyright (C) 2014, 2015 M-Labs Limited
3+
14
from fractions import Fraction
25

36
from migen.fhdl.std import *

0 commit comments

Comments
 (0)
Please sign in to comment.