with 256-levels of grey

This commit is contained in:
Antoine Vignau 2024-08-19 22:19:22 +02:00
parent ca27071da1
commit 7a97eb68cc
20 changed files with 10798 additions and 2576 deletions

15
scsi2/MAKECOLOR.S Normal file
View File

@ -0,0 +1,15 @@
* Expansion linker file
DSK SCANNERSCSI
TYP $B3
AUX $DB00
* Assemble files
ASM SCANNERSCSICOLOR.S
KND $0000
SNA ScannerSCSI
* END

View File

@ -8,7 +8,7 @@
* Assemble files
ASM SCANNERSCSI.S
ASM SCANNERSCSIGREY.S
KND $0000
SNA ScannerSCSI

Binary file not shown.

View File

@ -384,10 +384,10 @@ strDEVMENU
* Color OneScanner (300dpi 24-bit color)
*
*
* Color OneScanner 600/27 (600dpi 27-bit color)
* Color OneScanner 600/27 (600dpi 27-bit color) - CANOSCAN 300 (CS300)
* 06 00 02 02 1F 00 00 10 'CANON IX-03035B 1.01' FF
*
* Color OneScanner 1200/30 (1200dpi 30-bit color)
* Color OneScanner 1200/30 (1200dpi 30-bit color) - CANOSCAN 600 (CS600)
* 06 00 02 02 1F 00 00 10 'CANON IX-06015C 1.07' FF
*
* ---End of list
@ -786,21 +786,41 @@ proSETMODE
setmodeBUFF
dw $0000
hex 15
hex 10 ; PF (bit is 1) for SCSI-2
hex 00,00 ; reserved
dfb 12 ; parameter list length
hex 15 ; 00
hex 10 ; 01 PF (bit is 1) for SCSI-2
hex 00,00 ; 02 reserved
dfb 12 ; 04 parameter list length
hex 00,00,00,00,00,00,00
adrl setmodeDATA
setmodeDATA
hex 00,00,00,00 ; mode parameter header (8.3.3, table 91)
hex 01 ; page code - Apple-specific parameter page
hex 08 ; page length - Apple-specific page
hex 01 ; graymap - 1 = no alteration to data
hex 40 ; auto background adjustment threshold
hex 00 ; lamp - 0 = turn off
hex 00,00,00 ; reserved - 3 bytes
hex 00,00 ; 00 mode parameter header (8.3.3, table 91)
hex 00,00
hex 01 ; 04 page code - Apple-specific parameter page
* hex 08 ; 05 page length - Apple-specific page
hex 06 ; 05 page length - Apple-specific page
dfb 01 ; 06 graymap - 1 = no alteration to data (Apple Scanner)
; 0: dark
; 1: normal
; 2: light
dfb 64 ; 07 auto background adjustment threshold
; Default threshold value is 64 (Apple Scanner)
; bit 0 - 0: do not use custom CCT / 1: use custom CCT (3*3 Color Correction Table)
; bit 1 - 0: do not use custom gamma / 1: use custom gamma
; bit 2 - 0: setting of the ambler LED off / 1: setting on (OneScanner)
* dfb 01 ; 08 lamp - 0 = turn off (during scans)
dfb %00000011 ; bit 0 - 0: turn off / 1: turn on
; bit 1 - power of the CCD array on / 1: power off
; bits 2/3 - 00: normal / 01: fast / 10: high speed (OneScanner)
; bit 2 - 0: do not reverse B&W / 1: reverse B&W (Color OneScanner)
; bit 3 - 0: no ICP / 1: ICP on (Color OneScanner)
; bit 4 - 0: no MTF / 1: MTF on (Color OneScanner)
dfb 00 ; 09 color sensor (color onescanner)
; 0: all
; 1: red
; 2: green
; 3: blue
hex 00,00 ; 10 reserved - 2 bytes
*-----------------------
* SET HALFTONES
@ -851,10 +871,69 @@ sethalftonesBUFF
hex 00,00
adrl sethalftonesDATA
* Halftone patterns
* 0: spiral 4*4
* 1: Bayer 4*4
* 3: spiral 8*8
* 4: Bayer 8*8
sethalftonesDATA
hex 44,F0,40,80,C0,B0,00,10,50
hex 70,30,20,90,E0,A0,60,D0
* 4x4 Bayer ordered dither matrix (ID = 1) (from Dev.CD Mar 92 / Dev.Sample.aii)
hex 44
hex 08,88,28,A8
hex C8,48,E8,68
hex 38,B8,18,98
hex F8,78,D8,58
hex 44
dfb 00,08,02,10
dfb 12,04,14,06
dfb 03,11,01,09
dfb 15,07,13,05
* Weird Apple dither matrix
hex 44 ; 4x4 matrix size + pel 0 to 15
hex F0,40,80,C0
hex B0,00,10,50
hex 70,30,20,90
hex E0,A0,60,D0
hex 44
dfb 15,04,08,12
dfb 11,00,01,05
dfb 07,03,02,09
dfb 14,10,06,13
* Exemple de spirale
* 01,02,03,04
* 12,13,14,05
* 11,16,15,06
* 10,09,08,07
* 8*8 Bayer ordered dither matrix (ID = 4)
hex 88
dfb 00,32,08,40,02,34,10,42
dfb 48,16,56,24,50,18,58,26
dfb 12,44,04,36,14,46,06,38
dfb 60,28,52,20,62,30,54,22
dfb 03,35,11,43,01,33,09,41
dfb 51,19,59,27,49,17,57,25
dfb 15,47,07,39,13,45,05,37
dfb 63,31,55,23,61,29,53,21
* 2x2 Bayer ordered dither matrix
hex 22
hex 08,20
hex 30,10
hex 22
dfb 0,2
dfb 3,1
*-----------------------
* SET THE WINDOW
*-----------------------
@ -893,9 +972,13 @@ proSETWINDOW
dw 5
ds 2
dw $8024
adrl setwindowBUFF
adrl 48
ds 4
* adrl setwindowBUFF ; for Apple Scanner
* adrl 48
adrl onescannerBUFF ; for OneScanner and above
adrl 50
ds 4
*--- For Apple Scanner
setwindowBUFF
dw $0000
@ -903,36 +986,80 @@ setwindowBUFF
hex 00
hex 00,00,00,00
dfb 00,00,48 ; length is 48 bytes
hex 80 ; control
hex 80 ; control (the Apple bit)
hex 00,00
adrl setwindowDATA
setwindowDATA
hex 00,00,00,00,00,00
dfb 00,40 ; window length
hex 00,00,00,00,00,00 ;
dfb 00,40 ; window length (first scanners)
hex 00 ; window identifier
hex 00 ; reserved
dfb 00,75 ; x-axis resolution
dfb 00,75 ; y-axis resolution
hex 00,00,00,00 ; x-upper left
hex 00,00,00,00 ; y-upper left
* hex 00,00,27,D8 ; x-width (10200)
hex 00,00,13,EC ; x-width ( 5100)
* hex 00,00,33,90 ; y-height (13200)
hex 00,00,11,30 ; y-height ( 4400)
hex 00 ; brightness
hex 00 ; threshold
hex 00 ; contrast
hex 05 ; imageComposition (see table 283)
hex 08 ; bitsPerPixel (8)
hex 00,00 ; halftone (2)
hex 03 ; paddingType (byte boundary)
hex 00,00 ; bit ordering
hex 00 ; compression type
hex 00 ; compression argument
hex 00,00,00,00,00,00
hex 00 ; 00 window identifier (perhaps 1)
hex 00 ; 01 reserved
dfb 00,75 ; 02 x-axis resolution
dfb 00,75 ; 04 y-axis resolution
hex 00,00,00,00 ; 06 x-upper left
hex 00,00,00,00 ; 10 y-upper left
* hex 00,00,27,D8 ; 14 x-width (10200)
* hex 00,00,13,EC ; 14 x-width ( 5100)
hex 00,00,12,C0 ; -- 4 pouces
* hex 00,00,33,90 ; 18 y-height (13200)
hex 00,00,11,30 ; 18 y-height ( 4400)
hex 80 ; 22 brightness
hex 80 ; 23 threshold
hex 80 ; 24 contrast
hex 01 ; 25 imageComposition (see table 283)
hex 01 ; 26 bitsPerPixel (8)
hex 00,02 ; 27 halftone (2)
hex 03 ; 29 paddingType (byte boundary)
hex 00,00 ; 30 bit ordering
hex 00 ; 32 compression type
hex 00 ; 33 compression argument
hex 00,00,00,00,00,00 ; 34 reserved
*--- For Apple OneScanner
onescannerBUFF
dw $0000
hex 24
hex 00
hex 00,00,00,00
dfb 00,00,50 ; length is 50 bytes for OneScanner
hex 80 ; control (the Apple bit)
hex 00,00
adrl onescannerDATA
onescannerDATA
hex 00,00,00,00,00,00 ;
dfb 00,42 ; window length (onescanners)
hex 00 ; 00 window identifier (perhaps 1)
hex 00 ; 01 reserved
dfb 00,75 ; 02 x-axis resolution
dfb 00,75 ; 04 y-axis resolution
hex 00,00,00,00 ; 06 x-upper left
hex 00,00,00,00 ; 10 y-upper left
* hex 00,00,27,D8 ; 14 x-width (10200)
* hex 00,00,13,EC ; 14 x-width ( 5100)
hex 00,00,12,C0 ; -- 4 pouces
* hex 00,00,33,90 ; 18 y-height (13200)
hex 00,00,11,30 ; 18 y-height ( 4400)
hex 80 ; 22 brightness
hex 80 ; 23 threshold
hex 80 ; 24 contrast
hex 05 ; 25 imageComposition (see table 283)
hex 08 ; 26 bitsPerPixel (8)
hex 00,00 ; 27 halftone (2)
hex 03 ; 29 paddingType (byte boundary)
hex 00,00 ; 30 bit ordering
hex 00 ; 32 compression type
hex 00 ; 33 compression argument
hex 00,00,00,00,00,00 ; 34
dfb 255 ; 40 OPT_VOLT_REF_TOP = 255
dfb 01 ; 41 OPT_VOLT_REF_BOTTOM = 1
*-----------------------
* ASK FOR MEMORY
*-----------------------
@ -1030,16 +1157,19 @@ proSCAN dw 5
scanBUFF
dw $0000
hex 1b
hex 00
hex 00,00
hex 01 ; length is 1
hex 00
hex 1b ; 0
hex 00 ; 1
hex 00,00 ; 2
hex 01 ; 4 length is 1
hex 00 ; 5 (data?)
; bit 7 - 1: stop wait mode (Apple Scanner)
; bit 5 - 0: no calibrate / 1: calibrate (OneScanner)
hex 00,00,00,00,00,00
adrl scanDATA
scanDATA
hex 00 ; the window identifier we want to scan
* dfb 00 ; the window identifier we want to scan
dfb 01 ; the window identifier we want to scan
*-----------------------
* READ THE PAGE

2282
scsi2/SCANNERSCSICOLOR.S Normal file

File diff suppressed because it is too large Load Diff

2192
scsi2/SCANNERSCSIGREY.S Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

3342
scsi2/_Output.txt Normal file

File diff suppressed because it is too large Load Diff

Binary file not shown.

BIN
scsi2/scans/Scan12.BIN Normal file

Binary file not shown.

BIN
scsi2/scans/Scan12.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 281 KiB

1
scsi2/scans/Scan13.BIN Normal file

File diff suppressed because one or more lines are too long

BIN
scsi2/scans/Scan13.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

BIN
scsi2/scans/Scan14.BIN Normal file

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 213 KiB

BIN
scsi2/scans/Scan15.BIN Normal file

Binary file not shown.

BIN
scsi2/scans/Scan16.BIN Normal file

Binary file not shown.

BIN
scsi2/scans/Scan17.BIN Normal file

Binary file not shown.

BIN
scsi2/scans/Scan17.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 215 KiB

Binary file not shown.