Skip to content
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

Ohio Scientific 65A Support #57

Merged
merged 16 commits into from
Apr 5, 2023

Conversation

chapmajs
Copy link
Contributor

@chapmajs chapmajs commented Apr 2, 2023

This PR allows SRecord to output data in a format that can be directly input to the Ohio Scientific 65A ROM monitor, which is found on Ohio Scientific 6502 systems with serial console. This is currently output-only, since the dump format for the 65A monitor is substantially different.

Tests are included. The output formatter supports optional execution address.

I can smash this down to a single commit if desired, but left it as multiple commits since one of them does fix a namespace collision with the existing OSI 65V formatter.

@chapmajs
Copy link
Contributor Author

chapmajs commented Apr 2, 2023

Pushed changes to fix up automated test errors (linter stuff).

@chapmajs
Copy link
Contributor Author

chapmajs commented Apr 2, 2023

A friend suggested that it might be beneficial to read in the OSI 65A output using SRecord, in the event that one had SRecord generated output in a file and needed to turn it into something else. I had some free time today, so I wrote a file input for OSI 65A!

@chapmajs chapmajs changed the title Ohio Scientific 65A Output Generator Ohio Scientific 65A Support Apr 3, 2023
@sierrafoxtrot
Copy link
Owner

sierrafoxtrot commented Apr 3, 2023

I want to make sure I acknowledge contributions correctly. No dramas at all with Copyright being held by a company but would you like me to mention you by full-name or first-name as well when I pull together the release notes?

Or it could be "contributed by X from Company". Whatever works best for you.

@chapmajs
Copy link
Contributor Author

chapmajs commented Apr 3, 2023

No big deal, you can leave it as "Glitch Works, LLC" or do "by Jonathan Chapman from Glitch Works, LLC" -- if you want a point of contact I would prefer you use our site URL (http://www.glitchwrks.com) rather than some internal email address just to help cut down on spam :P

@sierrafoxtrot
Copy link
Owner

Planning to start a proper review tonight but given the number of commits I'll probably end up doing a squash merge (which I'm perfect happy with and of course it will still show correct attribution). If you wanted to rebase to tease out the work on the OS65A vs OS65V or better reflect history, go right ahead.

@chapmajs
Copy link
Contributor Author

chapmajs commented Apr 4, 2023

You can smash it or I can smash it, doesn't matter to me!

Copy link
Owner

@sierrafoxtrot sierrafoxtrot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great addition Jonathan! A few minor comments.

Additionally, if you can add to srecord/input/file/guess.cc then the --guess option will work for os65a as well.

doc/man5/srec_os65a.5 Outdated Show resolved Hide resolved
srecord/input/file/os65a.h Outdated Show resolved Hide resolved
srecord/output/file/os65a.h Outdated Show resolved Hide resolved
doc/man1/srec_cat.1 Show resolved Hide resolved
@chapmajs
Copy link
Contributor Author

chapmajs commented Apr 4, 2023

Alright, requested changes made, and fixed up to appease the clang linter!

@sierrafoxtrot sierrafoxtrot merged commit 401ad21 into sierrafoxtrot:master Apr 5, 2023
@chapmajs
Copy link
Contributor Author

chapmajs commented Apr 5, 2023

Thanks!

@sierrafoxtrot
Copy link
Owner

Thanks for your hard work pulling this together!

@marcows marcows mentioned this pull request Apr 14, 2023
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants