Skip to content

CPU-DAC and GPIO header SPI control#2

Open
pathfinder49 wants to merge 12 commits intoOxfordIonTrapGroup:current_sensefrom
pathfinder49:current_sense
Open

CPU-DAC and GPIO header SPI control#2
pathfinder49 wants to merge 12 commits intoOxfordIonTrapGroup:current_sensefrom
pathfinder49:current_sense

Conversation

@pathfinder49
Copy link
Copy Markdown
Member

  • Allow remote enabling and setting of the two CPU integrated DACs
  • Allow remote writing of a 16 bit word to the GPIO header SPI

@pathfinder49 pathfinder49 added the enhancement New feature or request label Oct 23, 2019
@pathfinder49 pathfinder49 requested review from cjbe and hartytp October 23, 2019 11:42
@hartytp
Copy link
Copy Markdown

hartytp commented Oct 23, 2019

Marius, can you try not to commit in my name please?

@pathfinder49
Copy link
Copy Markdown
Member Author

pathfinder49 commented Oct 23, 2019

Marius, can you try not to commit in my name please?

Apologies, not sure what's causing the "hartytp committed" bit, I couldn't see it in my commit log. I was using git commit --author="Marius Weber <marius.weber@physics.ox.ac.uk>" for all commits...

@dnadlinger
Copy link
Copy Markdown
Member

Apologies, not sure what's causing the "hartytp committed" bit

Git tracks two separate pieces of information for each commit, author and committer. If they don't agree, GitHub displays the "and … commited" lines.

I'm not sure whether there is a better way of overriding the latter than using the GIT_* environment variables.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants