6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-08-16 05:27:43 +00:00
Code Issues Projects Releases Wiki Activity

Edging towards functioning automatic tests, fixed right-period adjustment and slightly decreased searching cost while in the process of adding a test.

Browse Source
This commit is contained in:
Thomas Harte
2016-12-20 07:52:14 -05:00
parent ec624eaab1
commit 6bdde542c5
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OSBindings/Mac/Clock SignalTests/PCMPatchedTrackTests.mm
View File

@@ -55,11 +55,24 @@
- (void)testZeroPatch - (void)testZeroPatch
{ {
std::shared_ptr<Storage::Disk::Track> patchableTrack = self.togglingTrack; std::shared_ptr<Storage::Disk::Track> patchableTrack = self.patchableTogglingTrack;
Storage::Disk::PCMPatchedTrack *patchable = dynamic_cast<Storage::Disk::PCMPatchedTrack *>(patchableTrack.get()); Storage::Disk::PCMPatchedTrack *patchable = dynamic_cast<Storage::Disk::PCMPatchedTrack *>(patchableTrack.get());
if(patchable) if(patchable)
{ {
printf("."); // add a single one, at 1/32 length at 3/128. So that should shift the location of the second flux transition
Storage::Disk::PCMSegment zero_segment;
zero_segment.data = {0xff};
zero_segment.number_of_bits = 1;
zero_segment.length_of_a_bit.length = 1;
zero_segment.length_of_a_bit.clock_rate = 32;
patchable->add_segment(Storage::Time(3, 128), zero_segment);
}
std::vector<Storage::Disk::Track::Event> events;
int c = 5;
while(c--)
{
events.push_back(patchableTrack->get_next_event());
} }
} }

10
Storage/Disk/PCMPatchedTrack.cpp
View File

@@ -54,7 +54,7 @@ void PCMPatchedTrack::insert_period(const Period &period)
while(periods_[start_index].start_time >= period.end_time) start_index++; while(periods_[start_index].start_time >= period.end_time) start_index++;
// find the existing period that the new period end in // find the existing period that the new period end in
size_t end_index = 0; size_t end_index = start_index;
while(periods_[end_index].end_time < period.end_time) end_index++; while(periods_[end_index].end_time < period.end_time) end_index++;
// perform a division if called for // perform a division if called for
@@ -62,8 +62,8 @@ void PCMPatchedTrack::insert_period(const Period &period)
{ {
Period right_period = periods_[start_index]; Period right_period = periods_[start_index];
Time adjustment = period.start_time - right_period.start_time; Time adjustment = period.end_time - right_period.start_time;
right_period.end_time += adjustment; right_period.start_time += adjustment;
right_period.segment_start_time += adjustment; right_period.segment_start_time += adjustment;
periods_[start_index].end_time = period.start_time; periods_[start_index].end_time = period.start_time;
@@ -75,8 +75,8 @@ void PCMPatchedTrack::insert_period(const Period &period)
// perform a left chop on the thing at the start and a right chop on the thing at the end // perform a left chop on the thing at the start and a right chop on the thing at the end
periods_[start_index].end_time = period.start_time; periods_[start_index].end_time = period.start_time;
Time adjustment = period.start_time - periods_[end_index].start_time; Time adjustment = period.end_time - periods_[end_index].start_time;
periods_[end_index].end_time += adjustment; periods_[end_index].start_time += adjustment;
periods_[end_index].segment_start_time += adjustment; periods_[end_index].segment_start_time += adjustment;
// remove anything in between // remove anything in between