From 4d83895007e20a480fffa55df2d5acef7ebb5e49 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 4 Sep 2009 11:51:57 -0600 Subject: [PATCH] Support for the new SONY readers (300/600) --- src/calibre/devices/prs700/driver.py | 6 +++--- src/calibre/manual/faq.rst | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/calibre/devices/prs700/driver.py b/src/calibre/devices/prs700/driver.py index 303beb09b7..804f400c8a 100644 --- a/src/calibre/devices/prs700/driver.py +++ b/src/calibre/devices/prs700/driver.py @@ -21,9 +21,9 @@ class PRS700(PRS505): BCD = [0x31a] - WINDOWS_MAIN_MEM = re.compile('PRS-[67]00') - WINDOWS_CARD_A_MEM = re.compile(r'PRS-[67]00/\S+:MS') - WINDOWS_CARD_B_MEM = re.compile(r'PRS-[67]00/\S+:SD') + WINDOWS_MAIN_MEM = re.compile('PRS-((700/)|(600&))') + WINDOWS_CARD_A_MEM = re.compile(r'PRS-((700/\S+:)|(600_))MS') + WINDOWS_CARD_B_MEM = re.compile(r'PRS-((700/\S+:)|(600_))SD') OSX_MAIN_MEM = re.compile(r'Sony PRS-((700/[^:]+)|(600)) Media') OSX_CARD_A_MEM = re.compile(r'Sony PRS-((700/[^:]+:)|(600 ))MS Media') diff --git a/src/calibre/manual/faq.rst b/src/calibre/manual/faq.rst index ea0241d46e..eff7c2506d 100644 --- a/src/calibre/manual/faq.rst +++ b/src/calibre/manual/faq.rst @@ -78,7 +78,7 @@ Device Integration What devices does |app| support? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -At the moment |app| has full support for the SONY PRS 500/505/700, Cybook Gen 3/Opus, Amazon Kindle 1/2/DX, Netronix EB600, Ectaco Jetbook, BeBook/BeBook Mini, Irex Illiad/DR1000, Adroid phones and the iPhone. In addition, using the :guilabel:`Save to disk` function you can use it with any ebook reader that exports itself as a USB disk. +At the moment |app| has full support for the SONY PRS 300/500/505/600/700, Cybook Gen 3/Opus, Amazon Kindle 1/2/DX, Netronix EB600, Ectaco Jetbook, BeBook/BeBook Mini, Irex Illiad/DR1000, Adroid phones and the iPhone. In addition, using the :guilabel:`Save to disk` function you can use it with any ebook reader that exports itself as a USB disk. I used |app| to transfer some books to my reader, and now the SONY software hangs every time I connect the reader? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~