salfter/fluxengine
1
0
Fork 0
mirror of https://github.com/davidgiven/fluxengine.git synced 2025-10-31 11:17:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge issues.

Browse Source
This commit is contained in:
David Given
2021-08-01 20:46:48 +02:00
parent 4f4ed1307f
commit 2ff50c0c56
4 changed files with 76 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/imagereader/imagereader.proto
View File

@@ -21,7 +21,7 @@ message ImgInputOutputProto {
oneof sectors_oneof {
SectorsProto sectors = 4 [(help) = "use a list of sector IDs"];
SectorRangeProto sector_range = 5 [(help) = "use a range of contiguous IDs"];
SectorRangeProto sector_range = 6 [(help) = "use a range of contiguous IDs"];
}
}

46
scripts/mac400_test.textpb
View File

@@ -4,31 +4,44 @@ image_reader {
sides: 1
trackdata {
sector_size: 524
sector_range {
start_sector: 0
}
}
trackdata {
track: 0
up_to_track: 15
sectors: 12
sector_range {
sector_count: 12
}
}
trackdata {
track: 16
up_to_track: 31
sectors: 11
sector_range {
sector_count: 11
}
}
trackdata {
track: 32
up_to_track: 47
sectors: 10
sector_range {
sector_count: 10
}
}
trackdata {
track: 48
up_to_track: 63
sectors: 9
sector_range {
sector_count: 9
}
}
trackdata {
track: 64
up_to_track: 79
sectors: 8
sector_range {
sector_count: 8
}
}
}
}
@@ -39,31 +52,44 @@ image_writer {
sides: 1
trackdata {
sector_size: 524
sector_range {
start_sector: 0
}
}
trackdata {
track: 0
up_to_track: 15
sectors: 12
sector_range {
sector_count: 12
}
}
trackdata {
track: 16
up_to_track: 31
sectors: 11
sector_range {
sector_count: 11
}
}
trackdata {
track: 32
up_to_track: 47
sectors: 10
sector_range {
sector_count: 10
}
}
trackdata {
track: 48
up_to_track: 63
sectors: 9
sector_range {
sector_count: 9
}
}
trackdata {
track: 64
up_to_track: 79
sectors: 8
sector_range {
sector_count: 8
}
}
}
}

47
scripts/mac800_test.textpb
View File

@@ -4,31 +4,44 @@ image_reader {
sides: 2
trackdata {
sector_size: 524
sector_range {
start_sector: 0
}
}
trackdata {
track: 0
up_to_track: 15
sectors: 12
sector_range {
sector_count: 12
}
}
trackdata {
track: 16
up_to_track: 31
sectors: 11
sector_range {
sector_count: 11
}
}
trackdata {
track: 32
up_to_track: 47
sectors: 10
sector_range {
sector_count: 10
}
}
trackdata {
track: 48
up_to_track: 63
sectors: 9
sector_range {
sector_count: 9
}
}
trackdata {
track: 64
up_to_track: 79
sectors: 8
sector_range {
sector_count: 8
}
}
}
}
@@ -39,32 +52,46 @@ image_writer {
sides: 2
trackdata {
sector_size: 524
sector_range {
start_sector: 0
}
}
trackdata {
track: 0
up_to_track: 15
sectors: 12
sector_range {
sector_count: 12
}
}
trackdata {
track: 16
up_to_track: 31
sectors: 11
sector_range {
sector_count: 11
}
}
trackdata {
track: 32
up_to_track: 47
sectors: 10
sector_range {
sector_count: 10
}
}
trackdata {
track: 48
up_to_track: 63
sectors: 9
sector_range {
sector_count: 9
}
}
trackdata {
track: 64
up_to_track: 79
sectors: 8
sector_range {
sector_count: 8
}
}
}
}

4
src/formats/amiga.textpb
View File

@@ -8,7 +8,7 @@ image_reader {
trackdata {
sector_size: 512
sector_range {
start_sector: 1
start_sector: 0
sector_count: 11
}
}
@@ -23,7 +23,7 @@ image_writer {
trackdata {
sector_size: 512
sector_range {
start_sector: 1
start_sector: 0
sector_count: 11
}
}