-
Notifications
You must be signed in to change notification settings - Fork 83
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
J & K variables #166
J & K variables #166
Conversation
"reverting previous J/K changes for new implementation" This reverts commit 4ffdd58.
"sync with monome/master"
src/ops/init.c
Outdated
if (v >= 0 && v < TEMP_SCRIPT) ss_clear_script(ss, (size_t)v); | ||
if (v >= 0 && v < TEMP_SCRIPT) { | ||
ss_clear_script(ss, (size_t)v); | ||
ss->variables.j[v] = 0; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe move this and the next line to ss_clear_script
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
will do
should also add other than that looks good, thanks for doing this! |
had a hard time coming up with a good description, let me know what you think. also added |
Don't worry about the formatting for now. I've got a PR that'll drop soon with TravisCI format checking as well as updated guidance (and also addressing the |
ok good to know I'll keep an eye out for updates. it did actually format my last change to |
If you're happy with it, I am. I haven't had much of a chance to look at it. I take it that Also @alpha-cactus, would you be okay with a squash-and-merge? (Or you could do some history rewriting yourself if you wanted to?) |
hmm not sure if I understand. do you mean when calling another script?
squash-and-merge - ya sure, is that something I would do? I'll look into it tonight if so. |
More that
The squash and merge is done by the person that accepts the PR. What it will do, is turn all your commits into a single one. Alternatively you can 'rewrite history' with |
oh not sure about
okay feel free then. I'll have to look into the history thing, but it's not really necessary for this. |
actually maybe I misunderstood you there. if rewrite history would be preferable, then I'd be happy to do it for this merge. |
Nah, some people might prefer to do the history rewrite, so I thought I'd give you the opportunity, that's all I meant. (the history rewriting stuff in @scanner-darkly I'll leave you to hit the merge button when you're ready. |
What does this PR do?
adds
J / K
variables that are local to each script. similar toI
each script gets it's ownJ / K
variable, however it does not inherit the calling script value forJ / K
unlikeI
.Provide links to any related discussion on lines.
https://llllllll.co/t/teletype-3-feature-requests-and-discussion/16219/91?u=alphacactus
How should this be manually tested?
tested by setting
J / K
variable values in all scripts. testing included calling scripts then setting values, incrementing/decrementing on consecutive calls, modifying in delayed commands, using theINIT
script to init values, and calling and returning from other scenes using theSCENE
op.Any background context you want to provide?
If the related Github issues aren't referenced in your commits, please link to them here.
note that
make format
never modified any of the files I changed. unsure if my formatting was sufficient enough, or if there was an issue with the command.I have,
CHANGELOG.md
make format
on each commit