Closed ny4i closed 8 years ago
n4af
commented
8 years ago Hi Tom -
Can you verify MainUnit invokes Escape_proc and the InitializeQSO is then invoked ?
Tks, Howie
On Thu, Feb 11, 2016 at 4:59 PM, Tom Schaefer notifications@github.com wrote:
When one hits ESC, the icom radio should stop sending the string it is working on. Add code to send a step sending CW message if possible.
— Reply to this email directly or view it on GitHub https://github.com/n4af/TR4W/issues/100.
ny4i
commented
8 years ago You mean verify the change you made? Sure I can. As it works just fine for the K3, I suspect I omitted the message to the Icom to take it out of xmit mode.
Tom Principal Solutions Architect, ITIL®v3 Better Software Solutions, Inc. 727-437-BSS1 (727-437-2771) @BSSI_Consulting
On Feb 11, 2016, at 5:07 PM, Howie Hoyt notifications@github.com wrote:
Hi Tom -
Can you verify MainUnit invokes Escape_proc and the InitializeQSO is then invoked ?
Tks, Howie
On Thu, Feb 11, 2016 at 4:59 PM, Tom Schaefer notifications@github.com wrote:
When one hits ESC, the icom radio should stop sending the string it is working on. Add code to send a step sending CW message if possible.
— Reply to this email directly or view it on GitHub https://github.com/n4af/TR4W/issues/100.
— Reply to this email directly or view it on GitHub https://github.com/n4af/TR4W/issues/100#issuecomment-183079575.
n4af
commented
8 years ago rr 73, h
On Thu, Feb 11, 2016 at 5:08 PM, Tom Schaefer notifications@github.com wrote:
You mean verify the change you made? Sure I can. As it works just fine for the K3, I suspect I omitted the message to the Icom to take it out of xmit mode.
Tom Principal Solutions Architect, ITIL®v3 Better Software Solutions, Inc. 727-437-BSS1 (727-437-2771) @BSSI_Consulting
On Feb 11, 2016, at 5:07 PM, Howie Hoyt notifications@github.com wrote:
Hi Tom -
Can you verify MainUnit invokes Escape_proc and the InitializeQSO is then invoked ?
Tks, Howie
On Thu, Feb 11, 2016 at 4:59 PM, Tom Schaefer notifications@github.com wrote:
When one hits ESC, the icom radio should stop sending the string it is working on. Add code to send a step sending CW message if possible.
— Reply to this email directly or view it on GitHub https://github.com/n4af/TR4W/issues/100.
— Reply to this email directly or view it on GitHub < https://github.com/n4af/TR4W/issues/100#issuecomment-183079575>.
— Reply to this email directly or view it on GitHub https://github.com/n4af/TR4W/issues/100#issuecomment-183079992.
ny4i
commented
8 years ago Howie, Please merge this into Master. it fixes the code so hitting ESC on an Icom radio stops sending CW. -- Thanks. Off to finish packing for Orlando.
n4af
commented
8 years ago Hi Tom -
I do not know how to proceed. It appears you put two branches into the remote ??? It also appears FieldDayChanges may have gone up without pulling down the latest branch (4.45.3) ??
I had to restore my last backup to recover the local repo, but lost my local changes.
I suppose I will explore removing remote branch FieldDayChanges but am having a tough time trying to sort this out and move forward from 4.45.3
73, Howie
On Thu, Feb 11, 2016 at 10:45 PM, Tom Schaefer notifications@github.com wrote:
Howie, Please merge this into Master. it fixes the code so hitting ESC on an Icom radio stops sending CW. -- Thanks. Off to finish packing for Orlando.
— Reply to this email directly or view it on GitHub https://github.com/n4af/TR4W/issues/100#issuecomment-183169653.
ny4i
commented
8 years ago Howie,
Did you not get the part of my email where I said to NOT do anything with FieldDayChanges? We would wait until the dust settles. That is just there for safekeeping?
The only change you needed to incorporate was the CWBYCAT_icom_notstopping.
I always do a fresh pull from origin/master and merge it into my current branch, clean up any conflicts, the re-commit. So I always have the latest changes in master in my branch before I push the changes to origin. After that, my client says they are up to date.
Thanks,
Tom Principal Solutions Architect, ITIL®v3 Better Software Solutions, Inc. 727-437-BSS1 (727-437-2771) @BSSI_Consulting
On Feb 12, 2016, at 8:13 AM, Howie Hoyt notifications@github.com wrote:
Hi Tom -
I do not know how to proceed. It appears you put two branches into the remote ??? It also appears FieldDayChanges may have gone up without pulling down the latest branch (4.45.3) ??
I had to restore my last backup to recover the local repo, but lost my local changes.
I suppose I will explore removing remote branch FieldDayChanges but am having a tough time trying to sort this out and move forward from 4.45.3
73, Howie
On Thu, Feb 11, 2016 at 10:45 PM, Tom Schaefer notifications@github.com wrote:
Howie, Please merge this into Master. it fixes the code so hitting ESC on an Icom radio stops sending CW. -- Thanks. Off to finish packing for Orlando.
— Reply to this email directly or view it on GitHub https://github.com/n4af/TR4W/issues/100#issuecomment-183169653.
— Reply to this email directly or view it on GitHub https://github.com/n4af/TR4W/issues/100#issuecomment-183322584.
n4af
commented
8 years ago Ok, I am not sure I have integrity in my local master. Normally, I do a 'pull origin' but it pulls in any new branches.
Could you check 4.45.4 and see if it is ok ?
73, Howie
On Fri, Feb 12, 2016 at 8:28 AM, Tom Schaefer notifications@github.com wrote:
Howie,
Did you not get the part of my email where I said to NOT do anything with FieldDayChanges? We would wait until the dust settles. That is just there for safekeeping?
The only change you needed to incorporate was the CWBYCAT_icom_notstopping.
I always do a fresh pull from origin/master and merge it into my current branch, clean up any conflicts, the re-commit. So I always have the latest changes in master in my branch before I push the changes to origin. After that, my client says they are up to date.
Thanks,
Tom Principal Solutions Architect, ITIL®v3 Better Software Solutions, Inc. 727-437-BSS1 (727-437-2771) @BSSI_Consulting
On Feb 12, 2016, at 8:13 AM, Howie Hoyt notifications@github.com wrote:
Hi Tom -
I do not know how to proceed. It appears you put two branches into the remote ??? It also appears FieldDayChanges may have gone up without pulling down the latest branch (4.45.3) ??
I had to restore my last backup to recover the local repo, but lost my local changes.
I suppose I will explore removing remote branch FieldDayChanges but am having a tough time trying to sort this out and move forward from 4.45.3
73, Howie
On Thu, Feb 11, 2016 at 10:45 PM, Tom Schaefer <notifications@github.com
wrote:
Howie, Please merge this into Master. it fixes the code so hitting ESC on an Icom radio stops sending CW. -- Thanks. Off to finish packing for Orlando.
— Reply to this email directly or view it on GitHub https://github.com/n4af/TR4W/issues/100#issuecomment-183169653.
— Reply to this email directly or view it on GitHub < https://github.com/n4af/TR4W/issues/100#issuecomment-183322584>.
— Reply to this email directly or view it on GitHub https://github.com/n4af/TR4W/issues/100#issuecomment-183328533.
ny4i
commented
8 years ago Howie,
It looks like this has the Field Day code in it too. If you can wait until Sunday evening, I can make sure it is OK before you go further. Are you sure you do not want to rollback to before you merged these two, get the fresh copy from origin and go from there?
We have to discuss your workflow in Git as you seem to have some issues :) I wonder if you are doing a git fetch before you do a git pull in master?
The Field Day code is fully tested and ready. I just did not want to complicate matters by adding more features before ARRL CW but it can work just fine and no one will end up hitting the code anyway.
Tom Principal Solutions Architect, ITIL®v3 Better Software Solutions, Inc. 727-437-BSS1 (727-437-2771) @BSSI_Consulting
On Feb 12, 2016, at 8:36 AM, Howie Hoyt notifications@github.com wrote:
Ok, I am not sure I have integrity in my local master. Normally, I do a 'pull origin' but it pulls in any new branches.
Could you check 4.45.4 and see if it is ok ?
73, Howie
On Fri, Feb 12, 2016 at 8:28 AM, Tom Schaefer notifications@github.com wrote:
Howie,
Did you not get the part of my email where I said to NOT do anything with FieldDayChanges? We would wait until the dust settles. That is just there for safekeeping?
The only change you needed to incorporate was the CWBYCAT_icom_notstopping.
I always do a fresh pull from origin/master and merge it into my current branch, clean up any conflicts, the re-commit. So I always have the latest changes in master in my branch before I push the changes to origin. After that, my client says they are up to date.
Thanks,
Tom Principal Solutions Architect, ITIL®v3 Better Software Solutions, Inc. 727-437-BSS1 (727-437-2771) @BSSI_Consulting
On Feb 12, 2016, at 8:13 AM, Howie Hoyt notifications@github.com wrote:
Hi Tom -
I do not know how to proceed. It appears you put two branches into the remote ??? It also appears FieldDayChanges may have gone up without pulling down the latest branch (4.45.3) ??
I had to restore my last backup to recover the local repo, but lost my local changes.
I suppose I will explore removing remote branch FieldDayChanges but am having a tough time trying to sort this out and move forward from 4.45.3
73, Howie
On Thu, Feb 11, 2016 at 10:45 PM, Tom Schaefer <notifications@github.com
wrote:
Howie, Please merge this into Master. it fixes the code so hitting ESC on an Icom radio stops sending CW. -- Thanks. Off to finish packing for Orlando.
— Reply to this email directly or view it on GitHub https://github.com/n4af/TR4W/issues/100#issuecomment-183169653.
— Reply to this email directly or view it on GitHub < https://github.com/n4af/TR4W/issues/100#issuecomment-183322584>.
— Reply to this email directly or view it on GitHub https://github.com/n4af/TR4W/issues/100#issuecomment-183328533.
— Reply to this email directly or view it on GitHub https://github.com/n4af/TR4W/issues/100#issuecomment-183332109.
n4af
commented
8 years ago ok, i rebuilt my local and remote.
73, Howie
On Fri, Feb 12, 2016 at 10:05 AM, Tom Schaefer notifications@github.com wrote:
Howie,
It looks like this has the Field Day code in it too. If you can wait until Sunday evening, I can make sure it is OK before you go further. Are you sure you do not want to rollback to before you merged these two, get the fresh copy from origin and go from there?
We have to discuss your workflow in Git as you seem to have some issues :) I wonder if you are doing a git fetch before you do a git pull in master?
The Field Day code is fully tested and ready. I just did not want to complicate matters by adding more features before ARRL CW but it can work just fine and no one will end up hitting the code anyway.
Tom Principal Solutions Architect, ITIL®v3 Better Software Solutions, Inc. 727-437-BSS1 (727-437-2771) @BSSI_Consulting
On Feb 12, 2016, at 8:36 AM, Howie Hoyt notifications@github.com wrote:
Ok, I am not sure I have integrity in my local master. Normally, I do a 'pull origin' but it pulls in any new branches.
Could you check 4.45.4 and see if it is ok ?
73, Howie
On Fri, Feb 12, 2016 at 8:28 AM, Tom Schaefer notifications@github.com wrote:
Howie,
Did you not get the part of my email where I said to NOT do anything with FieldDayChanges? We would wait until the dust settles. That is just there for safekeeping?
The only change you needed to incorporate was the CWBYCAT_icom_notstopping.
I always do a fresh pull from origin/master and merge it into my current branch, clean up any conflicts, the re-commit. So I always have the latest changes in master in my branch before I push the changes to origin. After that, my client says they are up to date.
Thanks,
Tom Principal Solutions Architect, ITIL®v3 Better Software Solutions, Inc. 727-437-BSS1 (727-437-2771) @BSSI_Consulting
On Feb 12, 2016, at 8:13 AM, Howie Hoyt notifications@github.com wrote:
Hi Tom -
I do not know how to proceed. It appears you put two branches into the remote ??? It also appears FieldDayChanges may have gone up without pulling down the latest branch (4.45.3) ??
I had to restore my last backup to recover the local repo, but lost my local changes.
I suppose I will explore removing remote branch FieldDayChanges but am having a tough time trying to sort this out and move forward from 4.45.3
73, Howie
On Thu, Feb 11, 2016 at 10:45 PM, Tom Schaefer < notifications@github.com
wrote:
Howie, Please merge this into Master. it fixes the code so hitting ESC on an Icom radio stops sending CW. -- Thanks. Off to finish packing for Orlando.
— Reply to this email directly or view it on GitHub https://github.com/n4af/TR4W/issues/100#issuecomment-183169653.
— Reply to this email directly or view it on GitHub < https://github.com/n4af/TR4W/issues/100#issuecomment-183322584>.
— Reply to this email directly or view it on GitHub https://github.com/n4af/TR4W/issues/100#issuecomment-183328533.
— Reply to this email directly or view it on GitHub < https://github.com/n4af/TR4W/issues/100#issuecomment-183332109>.
— Reply to this email directly or view it on GitHub https://github.com/n4af/TR4W/issues/100#issuecomment-183364897.
ny4i
commented
8 years ago This code was fixed by adding code to the CWBYCAT to stop sending. This was also fixed on the second radio.
When one hits ESC, the icom radio should stop sending the string it is working on. Add code to send a step sending CW message if possible.