Add more menu functions (flash lights and template portions in code) #13
Conversation
|
Overall looks good. Would you mind to squash the first several commits together? I think there should just be two commits, adding the template comments, and then adding flash_lights. I also noticed a couple whitespace errors where things didn't seem to align (could be tabs versus spaces) |
|
I don't have much practice with squashing but will try to figure it out and get that updated, as well as looking for white space errors. |
Test comment in .mc file Fix bad comment test; add template command 1/6 I was wrong, this isn't a configuration file but a my class file, with standard C comments (Monkey C to be exact) https://developer.garmin.com/connect-iq/reference-guides/monkey-c-reference/ add template command 2/6 add template command 3/6 add template command 4/6 add template command 5/6 add template command 6/6
n-gineer
force-pushed
the
add_more_menu_functions
branch
from
7826f25 to
323bf8e
Compare
|
I finally got around to figuring out squashing. However, It is showing this now has conflicts, but I can't even find a way to view the conflicts, much less find a way to resolve them. |
|
Try running this locally: "git fetch origin && git rebase origin/master" |
|
Happy to look at this PR.
P
…On Sat, 30 Oct 2021, 21:09 Steven Walter, ***@***.***> wrote:
Try running this locally: "git fetch origin && git rebase origin/master"
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
<#13 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAVKW4JSA34BIFE4AWQZIGDUJRGHTANCNFSM4ZPLYZ4A>
.
|
resulted in: |
|
It's more complex than that, leave it with me.
P
…On Sat, 30 Oct 2021, 22:36 n-gineer, ***@***.***> wrote:
Try running this locally: "git fetch origin && git rebase origin/master"
resulted in:
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 687048e... Fix bad comment test; add template command 1/6
Auto-merging source/MainDelegate.mc
CONFLICT (content): Merge conflict in source/MainDelegate.mc ````
—
You are receiving this because you commented.
Reply to this email directly, view it on GitHub
<#13 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAVKW4PL55CGXPAQPLMLYVTUJRQPVANCNFSM4ZPLYZ4A>
.
|
will do; sorry! |
source/SecondDelegate.mc
Outdated
| @@ -25,6 +25,8 @@ class SecondDelegate extends Ui.BehaviorDelegate { | |||
| var _unlock; | |||
| var _lock; | |||
| var _settings; | |||
| // Template: // var _%lower_case% dnl | |||
There was a problem hiding this comment.
"dnl" is a mistake from testing and should be deleted when this pull is merged.
|
@paulobrien Any intention to implement this? Anything I can do to make it more useful? |
I wanted to enable adding all the rest of the app functions (or at least the simple commands) via a set of template changes, and started with the "Flash Lights" command. Can you please try it out and let me know if it is good to move on with the rest?
After starting this, I noticed you already have a pull request in place for open port #10 (which is arguably the most important one). I'd be happy to incorporate that pull request into my own development as well.