Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c14299dca863
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e5b58b50aa01
Choose a head ref
  • 4 commits
  • 9 files changed
  • 1 contributor

Commits on Nov 24, 2015

  1. Copy the full SHA
    8999d57 View commit details
  2. Copy the full SHA
    91a8acf View commit details
  3. Copy the full SHA
    2503dcd View commit details
  4. Copy the full SHA
    e5b58b5 View commit details
1 change: 0 additions & 1 deletion artiq/devices/thorlabs_tcube/driver.py
Original file line number Diff line number Diff line change
@@ -204,7 +204,6 @@ def data_size(self):

class Tcube:
def __init__(self, serial_dev):
self.serial_dev = serial_dev
self.port = serial.serial_for_url(serial_dev, baudrate=115200,
rtscts=True)
self.status_report_counter = 0
2 changes: 1 addition & 1 deletion artiq/protocols/pc_rpc.py
Original file line number Diff line number Diff line change
@@ -468,7 +468,7 @@ async def _handle_connection_cr(self, reader, writer):
continue
method = getattr(target, name)
argspec = inspect.getfullargspec(method)
doc["methods"][name] = (dict(argspec.__dict__),
doc["methods"][name] = (dict(argspec._asdict()),
inspect.getdoc(method))
if self.builtin_terminate:
doc["methods"]["terminate"] = (
358 changes: 0 additions & 358 deletions artiq/py2llvm_old/fractions.py

This file was deleted.

169 changes: 0 additions & 169 deletions artiq/py2llvm_old/test/py2llvm.py

This file was deleted.

548 changes: 0 additions & 548 deletions artiq/py2llvm_old/transforms/inline.py

This file was deleted.

130 changes: 0 additions & 130 deletions artiq/py2llvm_old/transforms/interleave.py

This file was deleted.

43 changes: 0 additions & 43 deletions artiq/py2llvm_old/transforms/quantize_time.py

This file was deleted.

82 changes: 0 additions & 82 deletions artiq/py2llvm_old/transforms/unroll_loops.py

This file was deleted.

Original file line number Diff line number Diff line change
@@ -32,6 +32,7 @@ def run(self):
c_i = y*yScale/height-yScale/2
z_r = c_r
z_i = c_i
i = 0
for i in range(16):
if z_r*z_r + z_i*z_i > 4:
break