diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 1ea76a2189..ed942b5a9a 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -413,7 +413,7 @@ from calibre.devices.nook.driver import NOOK from calibre.devices.prs500.driver import PRS500 from calibre.devices.prs505.driver import PRS505, PRS700 from calibre.devices.android.driver import ANDROID -from calibre.devices.nokia.driver import N770 +from calibre.devices.nokia.driver import N770, N810 from calibre.devices.eslick.driver import ESLICK from calibre.devices.nuut2.driver import NUUT2 from calibre.devices.iriver.driver import IRIVER_STORY @@ -470,6 +470,7 @@ plugins += [ PRS500, ANDROID, N770, + N810, CYBOOK_OPUS, COOL_ER, ESLICK, diff --git a/src/calibre/devices/eb600/driver.py b/src/calibre/devices/eb600/driver.py index 18e86fb238..07217ac78d 100644 --- a/src/calibre/devices/eb600/driver.py +++ b/src/calibre/devices/eb600/driver.py @@ -104,8 +104,8 @@ class GER2(EB600): FORMATS = ['pdf'] - VENDOR_ID = [0xbda] - PRODUCT_ID = [0x703] + VENDOR_ID = [0x3034] + PRODUCT_ID = [0x1795] BCD = [0x132] VENDOR_NAME = 'GANAXA' diff --git a/src/calibre/devices/nokia/driver.py b/src/calibre/devices/nokia/driver.py index e6944de4d9..7bd1dbb28d 100644 --- a/src/calibre/devices/nokia/driver.py +++ b/src/calibre/devices/nokia/driver.py @@ -22,9 +22,9 @@ class N770(USBMS): FORMATS = ['mobi', 'prc', 'epub', 'html', 'zip', 'fb2', 'chm', 'pdb', 'tcr', 'txt', 'rtf'] - VENDOR_ID = [0x111] - PRODUCT_ID = [0x1af] - BCD = [0x134] + VENDOR_ID = [0x421] + PRODUCT_ID = [0x431] + BCD = [0x308] VENDOR_NAME = 'NOKIA' WINDOWS_MAIN_MEM = '770' @@ -33,3 +33,15 @@ class N770(USBMS): EBOOK_DIR_MAIN = 'My Ebooks' SUPPORTS_SUB_DIRS = True + +class N810(N770): + name = 'Nokia 810 Device Interface' + gui_name = 'Nokia 810' + description = _('Communicate with the Nokia Nokia 810 internet tablet.') + + PRODUCT_ID = [0x96] + BCD = [0x316] + + WINDOWS_MAIN_MEM = 'N810' + + MAIN_MEMORY_VOLUME_LABEL = 'N810 Main Memory'