Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TELEX aliases and various TELEX init ops #1

Merged
merged 3 commits into from May 15, 2017
Merged

Conversation

@bpcmusic
Copy link

@bpcmusic bpcmusic commented May 14, 2017

From the changelog:

  • NEW: TELEX Aliases: TO.TR.P for TO.TR.PULSE (plus all sub-commands) and TI.PRM for TI.PARAM (plus all sub-commands)
  • NEW: TELEX initialization commands: TO.TR.INIT n, TO.CV.INIT n, TO.INIT x, TI.PARAM.INIT n, TI.IN.INIT n, and TI.INIT x

Made slight tweak in the readme.md to specify python3 and move the order so that the generator is after the mention of the file it generates from ;)

@samdoshi
Copy link
Owner

@samdoshi samdoshi commented May 14, 2017

Yeah the travis tests are broken because I'm waiting for monome/libavr32#26 to be merged.

However... make test in the tests directory is failing if run locally.

I think the following

// TXo Ailiases
const tele_op_t op_TO_TR_P            = MAKE_ALIAS_OP(TO.TR.P           , op_TO_TR_PULSE_get        , NULL, 1, true);
const tele_op_t op_TO_TR_P_DIV        = MAKE_ALIAS_OP(TO.TR.P.DIV       , op_TO_TR_PULSE_DIV_get    , NULL, 2, true);

needs to be changed to:

// TXo Ailiases
const tele_op_t op_TO_TR_P            = MAKE_ALIAS_OP(TO.TR.P           , op_TO_TR_PULSE_get        , NULL, 1, false);
const tele_op_t op_TO_TR_P_DIV        = MAKE_ALIAS_OP(TO.TR.P.DIV       , op_TO_TR_PULSE_DIV_get    , NULL, 2, false);

(last argument has changed from true to false)

I can make the change if you want. Or you can make the change and rewrite history... (or not if that is easier)

git add src/ops/telex.c
git commit --amend
git push -f
@bpcmusic
Copy link
Author

@bpcmusic bpcmusic commented May 14, 2017

Oops; I had run the tests but must have buggered something before submitting. Apologies to waste your time. Got a little lost in git nonsense trying to upload the changes - but think I got it.

@samdoshi
Copy link
Owner

@samdoshi samdoshi commented May 14, 2017

No worries at all. I'll most likely use the 'squash and merge' option which will handily turn your commits into a single one.

@samdoshi samdoshi merged commit b1817b6 into samdoshi:2.0 May 15, 2017
1 check failed
1 check failed
continuous-integration/travis-ci/pr The Travis CI build could not complete due to an error
Details
@samdoshi
Copy link
Owner

@samdoshi samdoshi commented May 15, 2017

I've squashed and merged the PR.

In case you're not quite sure what that means, don't do anymore work on the telex_aliases branch.

@bpcmusic bpcmusic deleted the bpcmusic:telex_aliases branch Jun 5, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants