Closed neoklis closed 1 year ago
It looks like DRAW_QUIT and PLOT_QUIT are set but never cleared.
Should they ever be cleared, like if the user clicks "Cancel" ?
Hi Neoklis, thanks for the update!
There are a couple of issues to fix before we can merge:
measurements.c
file uses tabs instead of spaces because we want all new code to follow Linux kernel coding style guidelines which standardizes interactions between developers:
measurements.c
use 2x-spaces for indentation which are not only visually confusing for those who use 8-char tab stops, but it can cause merge conflicts when two people collaborate on the same file. There are (at least) two different indentation styles in the xnec2c code. For now please follow whatever indentation exists in the neighboring text:
indent
for consistent formatting, but not yet because I don't want to break other developer merges and there is at least one other developer with a big xnec2c pull request pending.)if
doesn't line up to the else
.vim
then this is probably what you want: set tabstop=2 softtabstop=0 noexpandtab shiftwidth=2
. See this article for more detail.git rebase -i HEAD~10
to re-order commits, reword messages, and squash them to the previous commit (like to merge the two FLAG commits). See this article: The life-changing magic of git rebase -iNote that after doing a rebase
you have to use --force
to push your changes:
git push github master --force
-Eric
Hi Neoklis, thanks for the update!
There are a couple of issues to fix before we can merge: OK, looks like I have some reading to do. Teaching an old dog new tricks ....
-- Best Regards
Neoklis - Ham Radio Call: 5B4AZ http://www.5b4az.org/ https://www.qsl.net/5b4az/index.html
…ion windows