MASTER branch of github.com/MEGA65/mega65-core

[Ben-401]

Toplevel repository
(also lists other projects that we support)
https://github.com/MEGA65

Main repository for mega65 development of core source-code
https://github.com/MEGA65/mega65-core

Shows how development is going
https://github.com/MEGA65/mega65-core/network

I suggest we bring back the MASTER branch (ie the default checkout following a clone).
I understand that by default every repo on github has a 'master' except for ours.

[Paul Gardner-Stephen]

Hello,

We can make a master branch as soon as we release the next bitstream update. Until then we are correctly on development.  This could will happen during the week.

Paul.

--
You received this message because you are subscribed to the Google Groups "C65GS Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email to c65gs-development+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[Ben-401]

The "development" branch has come a long way since the last update of "master".
I suggest that next week I tidy up the "development" and merge it into "master".
It would be good if we all get onto the same page, so-to-speak.
This may have the implication that people do-away with the "20150716ddr.bit".

Can anyone see an issue with the "development" branch that is not already an "issue".
https://github.com/MEGA65/mega65-core/issues

Please discuss issues in separate threads and leave this one clean for the release(s) of the MASTER-branch.
Please advise if you support the merge of "development" into "master"?

[Paul Gardner-Stephen]

Yes, I think it makes sense to pull development into master.

Paul.

--

[Ben-401]

Master branch has been updated to KSv00.07 then KSv00.08.

The PGS/cursorkeys branch can be deleted as all(*) commits have been copied-in on 22-SEP.
(*)except for the last 'cursorkeys' commit on 22-SEP as I deemed this not necessary as an alternate script is used for colossus.

[Ben-401]

I expect to see a master branch update/release in the next few days.

Thanks to Jeremy, we have now combined the 'development' and 'cursorkeys' branches, as per Pauls request in:
https://groups.google.com/d/msg/c65gs-development/84G_DDVFhqM/h610EVXyAgAJ

My intention is now to cleanup/remove the 'cleaner', 'serialportdelay' and 'spdelay2' branches ready for the merge.

[Ben-401]

the 'development' and 'cursorkeys' have been successfully merged.
the difficulty now is merging 'development' into 'master'. This is underway.

[LGB Gábor Lénárt]

Hi Ben,

Well, I am not so in (unfortunately) in KS/hypervisor development things, but this news reminded me to this issue, I've reported: https://github.com/MEGA65/mega65-core/issues/20

It was some compatibility issues me trying Xemu/mega65 so I went in some debugging and source inspecting and after some study on FAT32 (what I forgot quite a lot since years when I last need these kind of things to know) I found out those, I've written here.

I just ask this here, because Paul seems to fixed problems with some commits by reacting my report/findings, and indeed I have no problems like this since then (at least I haven't met them again) but I am not very sure what branch and what commits are merged into, also the issue is still in open state. Hmm maybe my fault too, and I should comment that at least I haven't seen the problem any more? :(

[Ben-401]

Master branch has been updated, with KSv10.
We have had to draw-a-line-in-the-sand, so-to-speak.
Can everyone please update their local-repo, even if it means deleting local and re-cloning the remote?

I have tried to resolve all conflicts by choosing the best patch,
CAN EVERYONE PLEASE TEST THEIR RELEVANT PARTS?

I confirm that the MASTERv10 boots up, and seems to do everything as expected on the real hardware.

Yes Gabor, the DOS seems to understand the End-Of-Directory marker now, thanks to Paul.

And it seems all other contributions thus far have been incorporated and no problems detected. Well done to all contributors.

It sure was difficult merging all the changes.
Can we all please me more disciplined in our github use/etiquette?

I suggest for developers the following etiquette:
create your own feature branch from the HEAD-of-development,
make just one feature on your feature-branch,
merge any more-recent changes from development into your feature branch, resolving any conflicts,
merge (or pull-request) for your feature-branch to be merged into development.

Please also note that I have updated KS in development to v11 to indicate the next release.
Feel free to increase this number (in your feature branch) but dont decrease it.

Ben.

[LGB Gábor Lénárt]

By the way, just tried the freshest copy of development branch with Xemu. Works fine, but if I enable (ie: "emulate") FPGA board witch 12 ON, then nothing happens, ie not even _any_ text/anything on the emulated M65's screen at all, just black screen (and not serial debug messages either). With older KS (from the spdelay branch etc) works fine with fpga-12 switch enabled (and fast) and also with older KS (just slow with switch-12 because of the serial port delay).

[LGB Gábor Lénárt]

Aaaa ... Okey, I've enabled hypervisor debugging in Xemu, and found this near kickstart.a65 line 2500 where execution loops forever:

cp5:

        ; wait for uart to be not busy
        lda hypervisor_write_char_to_serial_monitor     ; LSB is busy status
        bne cp5         ; branch if busy (LSB=1)

So I need to take care only this, it seems :-)

[Ben-401]

MASTER & DEVELOPMENT branches will undergo a rebase to remove duplicated git-history.
Sorry for the inconvenience.
Please do not bother PULL-ing the repo until further notice.

[Ben-401]

All,
The repo is now updated, again thanks to Jeremy and Paul, the rebase has removed the redundant commit-history that I caused...
So,
The repo is now ready to re-clone. I say re-clone because if you just do a "git pull" it will probably result in a conflict.

=> So you need to "git clone https://github.com/MEGA65/mega65-core.git" again.

Master branch is set to KSv10.
Development branch is set to KSv11, with Paul already off the mark developing the sdcard interface to support SDHC cards, Ya-Hoo!

[Ben-401]

Hi All,

I have spoken to Paul regarding the "master", "development" and "px100mhz" branches.
We would like to promote the "px100mhz" right up to master/development.

Does anyone have a problem with this?

I have some issues that I will discuss in this other thread.
promote branch px100mhz to master - outstanding issues
https://groups.google.com/forum/#!topic/c65gs-development/1SuFEjgBmoc

So, just giving you a heads up about this.
Ben.