Skip to content

Commit

Permalink
added Sony A6600 and Nikon Z 9
Browse files Browse the repository at this point in the history
  • Loading branch information
@elijahparker
elijahparker committed Mar 29, 2022
1 parent e38f066 commit d3d24f8
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 41 deletions.
83 changes: 42 additions & 41 deletions camera/ptpjs/drivers/nikon.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,47 +47,48 @@ function exposureEvent(camera) {
driver.supportsNativeHDR = true;

driver.supportedCameras = {
'04b0:0420': { name: "Nikon D3x", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Mini-B' },
'04b0:0421': { name: "Nikon D90", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Mini-B' },
'04b0:0422': { name: "Nikon D700", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Mini-B' },
'04b0:0423': { name: "Nikon D5000", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: '8-pin USB' },
'04b0:0424': { name: "Nikon D3000", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Mini-B' },
'04b0:0425': { name: "Nikon D300s", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Mini-B' },
'04b0:0426': { name: "Nikon D3s", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Mini-B' },
'04b0:0427': { name: "Nikon D3100", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Mini-B' },
'04b0:0428': { name: "Nikon D7000", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Mini-B' },
'04b0:0429': { name: "Nikon D5100", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: '8-pin USB' },
'04b0:042a': { name: "Nikon D800", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB 3' },
'04b0:042b': { name: "Nikon D4", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Mini-B' },
'04b0:042c': { name: "Nikon D3200", status: 'tested', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: '8-pin USB' },
'04b0:042d': { name: "Nikon D600", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Mini-B' },
'04b0:042e': { name: "Nikon D800E", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB 3' },
'04b0:042f': { name: "Nikon D5200", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: '8-pin USB' },
'04b0:0430': { name: "Nikon D7100", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: '8-pin USB' },
'04b0:0431': { name: "Nikon D5300", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: '8-pin USB' },
'04b0:0432': { name: "Nikon DF", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: '8-pin USB' },
'04b0:0433': { name: "Nikon D3300", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: '8-pin USB' },
'04b0:0434': { name: "Nikon D610", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Mini-B' },
'04b0:0435': { name: "Nikon D4s", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Mini-B' },
'04b0:0436': { name: "Nikon D810", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB 3' },
'04b0:0437': { name: "Nikon D750", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: '8-pin USB' },
'04b0:0438': { name: "Nikon D5500", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: '8-pin USB' },
'04b0:0439': { name: "Nikon D7200", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: '8-pin USB' },
'04b0:043a': { name: "Nikon D5", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB 3' },
'04b0:043b': { name: "Nikon D810a", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB 3' },
'04b0:043c': { name: "Nikon D500", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB 3' },
'04b0:043d': { name: "Nikon D3400", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Micro-B' },
'04b0:043f': { name: "Nikon D5600", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Micro-B' },
'04b0:0440': { name: "Nikon D7500", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Micro-B' },
'04b0:0441': { name: "Nikon D850", status: 'tested', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB 3' },
'04b0:0442': { name: "Nikon Z 7", status: 'tested', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB C' },
'04b0:0443': { name: "Nikon Z 6", status: 'tested', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB C' },
'04b0:0444': { name: "Nikon Z 50", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB C' },
'04b0:0445': { name: "Nikon D3500", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB C' },
'04b0:0446': { name: "Nikon D780", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB C' },
'04b0:0448': { name: "Nikon Z 5", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB C' },
'04b0:044b': { name: "Nikon Z 7 II", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB C' },
'04b0:044c': { name: "Nikon Z 6 II", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB C' },
'04b0:0420': { name: "Nikon D3x", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Mini-B' },
'04b0:0421': { name: "Nikon D90", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Mini-B' },
'04b0:0422': { name: "Nikon D700", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Mini-B' },
'04b0:0423': { name: "Nikon D5000", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: '8-pin USB' },
'04b0:0424': { name: "Nikon D3000", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Mini-B' },
'04b0:0425': { name: "Nikon D300s", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Mini-B' },
'04b0:0426': { name: "Nikon D3s", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Mini-B' },
'04b0:0427': { name: "Nikon D3100", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Mini-B' },
'04b0:0428': { name: "Nikon D7000", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Mini-B' },
'04b0:0429': { name: "Nikon D5100", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: '8-pin USB' },
'04b0:042a': { name: "Nikon D800", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB 3' },
'04b0:042b': { name: "Nikon D4", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Mini-B' },
'04b0:042c': { name: "Nikon D3200", status: 'tested', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: '8-pin USB' },
'04b0:042d': { name: "Nikon D600", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Mini-B' },
'04b0:042e': { name: "Nikon D800E", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB 3' },
'04b0:042f': { name: "Nikon D5200", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: '8-pin USB' },
'04b0:0430': { name: "Nikon D7100", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: '8-pin USB' },
'04b0:0431': { name: "Nikon D5300", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: '8-pin USB' },
'04b0:0432': { name: "Nikon DF", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: '8-pin USB' },
'04b0:0433': { name: "Nikon D3300", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: '8-pin USB' },
'04b0:0434': { name: "Nikon D610", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Mini-B' },
'04b0:0435': { name: "Nikon D4s", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Mini-B' },
'04b0:0436': { name: "Nikon D810", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB 3' },
'04b0:0437': { name: "Nikon D750", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: '8-pin USB' },
'04b0:0438': { name: "Nikon D5500", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: '8-pin USB' },
'04b0:0439': { name: "Nikon D7200", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: '8-pin USB' },
'04b0:043a': { name: "Nikon D5", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB 3' },
'04b0:043b': { name: "Nikon D810a", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB 3' },
'04b0:043c': { name: "Nikon D500", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB 3' },
'04b0:043d': { name: "Nikon D3400", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Micro-B' },
'04b0:043f': { name: "Nikon D5600", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Micro-B' },
'04b0:0440': { name: "Nikon D7500", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'Micro-B' },
'04b0:0441': { name: "Nikon D850", status: 'tested', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB 3' },
'04b0:0442': { name: "Nikon Z 7", status: 'tested', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB C' },
'04b0:0443': { name: "Nikon Z 6", status: 'tested', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB C' },
'04b0:0444': { name: "Nikon Z 50", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB C' },
'04b0:0445': { name: "Nikon D3500", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB C' },
'04b0:0446': { name: "Nikon D780", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB C' },
'04b0:0448': { name: "Nikon Z 5", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB C' },
'04b0:044b': { name: "Nikon Z 7 II", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB C' },
'04b0:044c': { name: "Nikon Z 6 II", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB C' },
'04b0:0450': { name: "Nikon Z 9", status: 'unknown', supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, }, usb: 'USB C' },
}

var properties = {
Expand Down
1 change: 1 addition & 0 deletions camera/ptpjs/drivers/sony.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ driver.supportedCameras = {
'054c:0c34': { name: "Sony A7 III", supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, _bufTime: 2500, newISO: false } },
'054c:0caa': { name: "Sony A6400", supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, _bufTime: 3000, newISO: false } },
'054c:0ccc': { name: "Sony A7R IV", supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, _bufTime: 2500, newISO: true } },
'054c:0d10': { name: "Sony A6600", supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, _bufTime: 3000, newISO: true } },
'054c:0d18': { name: "Sony A7S III", supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, _bufTime: 2500, newISO: true } },
'054c:0d2b': { name: "Sony A7C", supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, _bufTime: 2500, newISO: true } },
'054c:0d9f': { name: "Sony A7R IV A", supports: { shutter: true, aperture: true, iso: true, liveview: true, destination: true, focus: true, _bufTime: 2500, newISO: true } },
Expand Down

0 comments on commit d3d24f8

Please sign in to comment.