-
Notifications
You must be signed in to change notification settings - Fork 6.8k
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
Merge changes with upstream VirtualAGC #38
Comments
Thanks. If you know what is missing, mind submitting a PR? |
I don't know how you want to organize things, but separating the code for Comanche055 and Luminary099 would be a good start. I very much doubt that any of the identically named files of the two AGC versions are completely identical, so I guess you'll want to go through all the files that you didn't copy to this repository because they were already there (from the other AGC version). |
It is crucial to split out the code for the Command Module and the Lunar Module. I have worked closely with Ron Burkey and many others in the world to transcribe the source code for the 40th anniversary of the lunar landing for Apollo 11 over a period of many weeks. Without thinking to much about the source code build names; for the Command Module (CM) the names are starting with a "C" (e.g. Colossus238 and Comanche055 ) and the Lunar Module (LM) started with "L" (e.g. Luminary). There are however many exceptions to this Like Artemis and Sundance, Sundial and Sunburst but having the code split is a must. There are MANY difference crucial for the landing versus the orbit only and reentry for the CM. The original source listings that we made available on sourcecode.google.com and at biblio had these significant distinctions. Combining them in one location does not even make them compile anymore with yaYUL from Ron Burkey. Hope to see this fixed soon. |
For context:
|
For sure I support that setup by original build-name. I worked on the transcription painstakingly with many others to support the 40th anniversary of the Moon Landings. In 2009, the year of the 40th anniversary of Apollo 11, a size-able group of Apollo enthusiast from all across the world transcribed both Comanche055 and Luminary099 from pictures taken of each page. This process started by Ron Burkey, who travelled to make photographs of each page of the code on site since we could not take the actual hardcopy. Then a process started where each individual of this project checked out a block of pages and transcribed the assemble code with comments. The images contained both the binary code and the assembly mnemonics with comments. Once transcribed the process of verification started:
|
Well like I said I have a pr open for exactly this using the described format that's been mentioned several times so everything should be cherry then :). Also the main program loop will still compile you just need to change the file endings in the include list to .s. it will just be boring since all it will do is wait for jobs :P |
Btw why is this re-uploaded on github. It has been placed here by Ron Burkey ever since Google Code went bye bye: https://github.com/rburkey2005/virtualagc |
Huh. I knew of the work but never knew that all the source was available already on GH. This is a good point. Though perhaps the owner wants this to be more of a playground? Either way after seeing that I agree that a fork from Ron would be more appropriate regardless |
@ohommes @corvuscrypto first, thanks for sharing your thoughts and the effort you guys put. Very much appreciated. I created this repo two years ago when I saw the original Apollo 11 source online bundled with Virtual AGC. I wanted the original Apollo 11 source just for viewing, so I extracted it and uploaded it to a repo for myself. Recently, somebody found my repo and shared it online, and here we are. Although Virtual AGC is awesome, I never was and am still not interested in Virtual AGC here in this repo. I am interested in the original Apollo 11 source only. I didn't know about the Virtual AGC repo until the other day when Ron shared the link with me and candidly stated "It probably would have helped if I had actually included this information on my website rather than keeping it to myself. :-)." This repo was meant to be for my own interest, but here we are, and now I am doing my best to maintain it as a repo for simply viewing the code. The community has already cleaned up a bunch of typos from digitization, and I suspect a lot more work in that area. We may get it to the point where it is truly reflective of the hard copies, which is my goal. The rekindled interest is tremendous, and I want to keep that going. Such a historical artifact as this deserves it's own repo without all the extras to build it in a VM, and I'm very appreciative of all the hard work that went into digitization, and is still going into it right now. |
@corvuscrypto thanks a lot! |
@chrislgarry @ohommes It would still be nice to find a way for the corrections against this repo to make their way "upstream" to rburkey2005/virtualagc, or to @rburkey2005 directly per the transcription project's comment proofing instructions.
|
Given that we haven't really edited any of this AGC source in a long Fortunately, we have the touchstone of always being able to assemble the -- Ron Burkey On 07/11/2016 02:13 PM, oznogon wrote:
|
@rburkey2005 sounds good to me. I have a ton of fixes to go through so I can let you know when this reaches a steady state. |
It would be really cool for all of us that know nothing of this style of programming, if there was a basic README or Wiki instructions on how to compile and run and what tools to do so. Thanks for all the effort! Very interesting! 👍 🚀 |
To compile the original code, use the yaYUL compiler see http://www.ibiblio.org/apollo/yaYUL.html If you want a good programmers reference manual then use the book below. It is well written and teaches you the AGC assembler. But for all the detailed stuff, checklists and operations there is really nothing better than what Ron has collected over the years. His continued effort has create the single source for all that is AGC and more. |
@bluengreen if you'd like to compile, I recommend checking out virtual agc. I will add a link to the README so anyone interested in something beyond viewing will know where to look. Thanks. |
Regarding my earlier comment that eventually we'd like to merge the corrections you guys have come up with back into Virtual AGC ... I don't really know what the difficulty level of doing that is, or what the mechanics of it are, but I've glanced over some of your files and no obvious problem with merging it jumped out. I was wondering what your thoughts on the subject were: Is it getting close to being a propitious time, or would it be wiser to give it X amount of extra time (where X is some value TBD)? Not that we'd necessarily merge it right this instant anyway, since I have to consult with my guys about how to go about it, we have to verify that it still assembles properly, and so on, but I'm just trying to get some idea of where we're at with it. I'm also a little concerned with how to credit the folks to have done the work, since the only way to deduce that seems to be from the commit-logs (and not from comments embedded in the code as we have done), and I'm not sure how many of those commit-message can survive the merge process. Of course, not everyone is as fanatical about being credited as I am with crediting people, so perhaps that's not an issue. Thoughts? |
@rburkey2005 This is essentially an open source project now, and therefore accreditation is implicit in their activity in this repo as with most OSS. Perhaps you can simply make a note/link that you have integrated work from this repository. @wopian @oldmud0 thoughts? So far we have closed 41 issues related to enhancements/corrections. |
@chrislgarry @rburkey2005 Well, the fact that the source's license is "public domain" somewhat complicates things. As you know, the phrase "public domain" is legally tricky as some countries do not even recognize that it means "no copyright at all." As we have not taken any CLA from contributors, it is difficult to determine whether or not the contributors wished to ultimately be attributed for their works beyond the Git history, as the entirety of the source is in the public domain. The only copyright that could be claimed is "sweat of the brow" - i.e. credit contributors by their transcription efforts, not by the text itself. However, as the original source code is in the public domain and there are way too many contributors in this transcription effort (past, present, and future), crediting "the efforts made by the contributors of https://github.com/chrislgarry/Apollo-11" would be very nice, but legally speaking not necessary, since the phrase "public domain" means in this case that no one is entitled to receive credit for this work. I believe it's safe to merge, but you should expect another merge every 6 months or so, as we're only done with 27% of Comanche055 (per milestone). (I was wondering how much code Comanche and Luminary shared in common, which would deduplicate the typo fixing efforts, but I haven't come to a conclusive answer yet.) |
If the git trees are merged, all the contributions from either side would remain. |
@wopian are you referring to --allow-unrelated-histories flag? Would that interleave our two histories? If it doesnt interfere with them reviewing their own history and tracking down changes internally within the VirtualAGC project, this is a good idea. Otherwise, it could add noise to their project with little benefit. |
Updated title as original title has long since been addressed (giving the impression we are still lacking Apollo 11 code) and the actual discussion was unrelated and the reason why the issue is open. |
This really has just become a meta issue. Let me know what you think. |
This repository contains both the AGC source code for the Apollo 11 Lunar Module (Luminary099) and Command Module (Comanche055). Both AGC versions have a similar program structure, but the programs are not identical. As an example, the file P20-P25.s in this repository is from Comanche055, but the file P20-P25.s for Luminary099 is missing. If you compare the two files:
Comanche055: http://www.ibiblio.org/apollo/listings/Comanche055/P20-P25.agc.html
Luminary099: http://www.ibiblio.org/apollo/listings/Luminary099/P20-P25.agc.html
you will easily find many differences.
The text was updated successfully, but these errors were encountered: