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: 8adef1278133
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: 135643e3a66d
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Mar 1, 2016

  1. bridge: fix ttl o/oe addresses

    @jordens
    jordens committed Mar 1, 2016
    Copy the full SHA
    6f9656d View commit details

  2. coredevice.ttl: fix sensitivity

    @jordens
    jordens committed Mar 1, 2016
    Copy the full SHA
    3aebbbd View commit details

  3. runtime: define constants for ttl addresses

    @jordens
    jordens committed Mar 1, 2016
    Copy the full SHA
    135643e View commit details
Showing with 12 additions and 3 deletions.
  1. +1 −1 artiq/coredevice/ttl.py
  2. +3 −2 artiq/runtime/bridge.c
  3. +8 −0 artiq/runtime/ttl.h
2 changes: 1 addition & 1 deletion artiq/coredevice/ttl.py
View file
Original file line number Diff line number Diff line change
@@ -150,7 +150,7 @@ def pulse(self, duration):

@kernel
def _set_sensitivity(self, value):
rtio_output(now_mu(), self.channel, 2, 1 if value else 0)
rtio_output(now_mu(), self.channel, 2, value)
self.i_previous_timestamp = now_mu()

@kernel
5 changes: 3 additions & 2 deletions artiq/runtime/bridge.c
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "mailbox.h"
#include "messages.h"
#include "rtio.h"
#include "ttl.h"
#include "dds.h"
#include "bridge.h"

@@ -58,15 +59,15 @@ void bridge_main(void)
struct msg_brg_ttl_out *msg;

msg = (struct msg_brg_ttl_out *)umsg;
rtio_output_blind(msg->channel, 0, msg->value);
rtio_output_blind(msg->channel, TTL_O_ADDR, msg->value);
mailbox_acknowledge();
break;
}
case MESSAGE_TYPE_BRG_TTL_O: {
struct msg_brg_ttl_out *msg;

msg = (struct msg_brg_ttl_out *)umsg;
rtio_output_blind(msg->channel, 1, msg->value);
rtio_output_blind(msg->channel, TTL_OE_ADDR, msg->value);
mailbox_acknowledge();
break;
}
8 changes: 8 additions & 0 deletions artiq/runtime/ttl.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#ifndef __TTL_H
#define __TTL_H

#define TTL_O_ADDR 0
#define TTL_OE_ADDR 1
#define TTL_SENSITIVITY_ADDR 2

#endif /* __TTL_H */