From a0a13089d20e96236b9d92ab7a8f2aa9ac868723 Mon Sep 17 00:00:00 2001 From: Michael Buesch Date: Sun, 13 Oct 2013 23:48:58 +0200 Subject: Stop abuse of SUPPORT_... flags Signed-off-by: Michael Buesch --- libtoprammer/chips/microchip16/microchip16_common.py | 8 +++----- libtoprammer/chips/microchip8/microchip8_18_common.py | 8 +++----- libtoprammer/chips/microchip8/microchip8_common.py | 16 +++++----------- libtoprammer/chips/microchip8/microchip8_singlePMarea.py | 9 ++++----- libtoprammer/chips/microchip8/pic12f1822dip8.py | 4 +--- libtoprammer/chips/microchip8/pic12f1822sip6.py | 4 +--- libtoprammer/chips/microchip8/pic12f629dip8.py | 5 ++--- libtoprammer/chips/microchip8/pic12f629sip6.py | 5 ++--- libtoprammer/chips/microchip8/pic16f1823dip14.py | 4 +--- libtoprammer/chips/microchip8/pic16f1824dip14.py | 4 +--- libtoprammer/chips/microchip8/pic16f1824sip6.py | 4 +--- libtoprammer/chips/microchip8/pic16f1825dip14.py | 5 ++--- libtoprammer/chips/microchip8/pic16f1825sip6.py | 5 ++--- libtoprammer/chips/microchip8/pic16f1826dip18.py | 5 ++--- libtoprammer/chips/microchip8/pic16f1826sip6.py | 5 ++--- libtoprammer/chips/microchip8/pic16f1827dip18.py | 5 ++--- libtoprammer/chips/microchip8/pic16f1827sip6.py | 5 ++--- libtoprammer/chips/microchip8/pic16f1828dip20.py | 5 ++--- libtoprammer/chips/microchip8/pic16f1828sip6.py | 5 ++--- libtoprammer/chips/microchip8/pic16f1829dip20.py | 5 ++--- libtoprammer/chips/microchip8/pic16f1829sip6.py | 5 ++--- libtoprammer/chips/microchip8/pic16f1933dip28.py | 3 +-- libtoprammer/chips/microchip8/pic16f1933sip6.py | 3 +-- libtoprammer/chips/microchip8/pic16f1934dip40.py | 3 +-- libtoprammer/chips/microchip8/pic16f1934sip6.py | 3 +-- libtoprammer/chips/microchip8/pic16f1936dip28.py | 3 +-- libtoprammer/chips/microchip8/pic16f1936sip6.py | 3 +-- libtoprammer/chips/microchip8/pic16f1937dip40.py | 3 +-- libtoprammer/chips/microchip8/pic16f1937sip6.py | 3 +-- libtoprammer/chips/microchip8/pic16f1938dip28.py | 3 +-- libtoprammer/chips/microchip8/pic16f1938sip6.py | 3 +-- libtoprammer/chips/microchip8/pic16f1939dip40.py | 3 +-- libtoprammer/chips/microchip8/pic16f1939sip6.py | 3 +-- libtoprammer/chips/microchip8/pic16f630dip14.py | 5 ++--- libtoprammer/chips/microchip8/pic16f630sip6.py | 5 ++--- libtoprammer/chips/microchip8/pic16f84adip18.py | 5 ++--- libtoprammer/chips/microchip8/pic16f84asip6.py | 5 ++--- libtoprammer/chips/microchip8/pic18f1220dip18.py | 5 ++--- libtoprammer/chips/microchip8/pic18f1220sip6.py | 5 ++--- libtoprammer/chips/microchip8/pic18f2320dip28.py | 5 ++--- libtoprammer/chips/microchip8/pic18f2320sip6.py | 5 ++--- libtoprammer/chips/microchip8/pic18f2321dip28.py | 5 ++--- libtoprammer/chips/microchip8/pic18f2321sip6.py | 5 ++--- libtoprammer/chips/microchip8/pic18f67j60sip6.py | 5 ++--- 44 files changed, 78 insertions(+), 134 deletions(-) diff --git a/libtoprammer/chips/microchip16/microchip16_common.py b/libtoprammer/chips/microchip16/microchip16_common.py index 501b22c..46dabd8 100644 --- a/libtoprammer/chips/microchip16/microchip16_common.py +++ b/libtoprammer/chips/microchip16/microchip16_common.py @@ -35,12 +35,10 @@ class Chip_Microchip16_common(Chip): codeExitResetVectorSimple = (0x040200, 0x000000) codeInitializeW7toVISI = (0x207847, 0x000000) codeResetDeviceInternalPC = (0x040200, 0x000000) - - + # EEPROM access: default on, if does not exist override it - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) - + hasEEPROM = True + # default delays - can be overridden delayTdis = 0.0001 delayTprog = 0.001 diff --git a/libtoprammer/chips/microchip8/microchip8_18_common.py b/libtoprammer/chips/microchip8/microchip8_18_common.py index 8510ec9..0ad1264 100644 --- a/libtoprammer/chips/microchip8/microchip8_18_common.py +++ b/libtoprammer/chips/microchip8/microchip8_18_common.py @@ -43,12 +43,10 @@ class Chip_Microchip8_18_common(Chip): CMD_TWII = 0xD CMD_TWDD = 0xE CMD_TW_START_PROG = 0xF - - + # EEPROM access: default on, if does not exist override it - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) - + hasEEPROM = True + # default delays - can be overridden delayP2A = 400e-9 # Serial clock low time delayP5 = 2.2e-6 # Delay between 4-bit command and command operand diff --git a/libtoprammer/chips/microchip8/microchip8_common.py b/libtoprammer/chips/microchip8/microchip8_common.py index 0a53d5a..3496547 100644 --- a/libtoprammer/chips/microchip8/microchip8_common.py +++ b/libtoprammer/chips/microchip8/microchip8_common.py @@ -38,19 +38,17 @@ class Chip_Microchip8_common(Chip): STAT_BUSY = 0x01 STAT_SDIO = 0x02 - + # EEPROM access: default off, if exists override it - SUPPORT_EEPROMREAD = (0 << 4) - SUPPORT_EEPROMWRITE = (0 << 5) - + hasEEPROM = False + # default delays - can be overridden delayTdly5 = 0.00000015 delayTdis = 0.0001 delayTprog = 0.001 delayTdly = 0.000001 delayTera = 0.01 - - + def __init__(self, chipPackage, chipPinVCC, chipPinsVPP, chipPinGND, signature, @@ -72,10 +70,6 @@ class Chip_Microchip8_common(Chip): self.PC = 0 self.isInPmMode = False - # if(eepromPageSize == 0): - # self.SUPPORT_EEPROMREAD = (0 << 4) - # self.SUPPORT_EEPROMWRITE = (0 << 5) - def erase(self): if(hasattr(self, 'osccalAddr')): self.__erase(keepOSCCAL=True) @@ -134,7 +128,7 @@ class Chip_Microchip8_common(Chip): self.progressMeterInit("Writing ConfigWord, value %x" % CW, 0) self.writeConfigWord(CW) self.progressMeterFinish() - if((not keepEEPROM) and self.SUPPORT_EEPROMWRITE): + if((not keepEEPROM) and self.hasEEPROM): self.progressMeterInit("Erasing EEPROM", 0) self.bulkEraseDM() self.progressMeterFinish() diff --git a/libtoprammer/chips/microchip8/microchip8_singlePMarea.py b/libtoprammer/chips/microchip8/microchip8_singlePMarea.py index fbe4f34..049c1b4 100644 --- a/libtoprammer/chips/microchip8/microchip8_singlePMarea.py +++ b/libtoprammer/chips/microchip8/microchip8_singlePMarea.py @@ -22,17 +22,16 @@ from libtoprammer.chips.microchip8.microchip8_common import * -class microchip8_singlePMarea(Chip_Microchip8_common): +class microchip8_singlePMarea(Chip_Microchip8_common): CMD_BEGIN_PROGRAMMING = 0x08 CMD_END_PROGRAMMING = 0x0E - + userIDLocationSize = 4 - SUPPORT_SIGREAD = (0 << 1) - + voltageVDD = 5 voltageVPP = 13 defaultWord = [b'\xFF', b'\x0F'] - + def __init__(self, chipPackage, chipPinVCC, chipPinsVPP, chipPinGND, signature, diff --git a/libtoprammer/chips/microchip8/pic12f1822dip8.py b/libtoprammer/chips/microchip8/pic12f1822dip8.py index a5667bb..649584f 100644 --- a/libtoprammer/chips/microchip8/pic12f1822dip8.py +++ b/libtoprammer/chips/microchip8/pic12f1822dip8.py @@ -26,10 +26,8 @@ class Chip_Pic12F1822dip8(microchip8_splittedPMarea_hasResetPC): rowSize = 16 nLatches = 16 + hasEEPROM = True - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) - def __init__(self): microchip8_splittedPMarea_hasResetPC.__init__(self, chipPackage="DIP8", diff --git a/libtoprammer/chips/microchip8/pic12f1822sip6.py b/libtoprammer/chips/microchip8/pic12f1822sip6.py index 71c83e2..cd06a7d 100644 --- a/libtoprammer/chips/microchip8/pic12f1822sip6.py +++ b/libtoprammer/chips/microchip8/pic12f1822sip6.py @@ -26,10 +26,8 @@ class Chip_Pic12F1822sip6(microchip8_splittedPMarea_hasResetPC): rowSize = 16 nLatches = 16 + hasEEPROM = True - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) - def __init__(self): microchip8_splittedPMarea_hasResetPC.__init__(self, chipPackage = "DIP10", diff --git a/libtoprammer/chips/microchip8/pic12f629dip8.py b/libtoprammer/chips/microchip8/pic12f629dip8.py index bce3939..fae3afa 100644 --- a/libtoprammer/chips/microchip8/pic12f629dip8.py +++ b/libtoprammer/chips/microchip8/pic12f629dip8.py @@ -27,9 +27,8 @@ class Chip_Pic12F629dip8(microchip8_splittedPMarea): voltageVPP = 9 userIDLocationSize = 4 - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) - + hasEEPROM = True + CMD_BEGIN_INTERNALLY_TIMED_PROGRAMMING = 0x08 delayTinternalProgPM = 0.002 delayTinternalProgDM = 0.005 diff --git a/libtoprammer/chips/microchip8/pic12f629sip6.py b/libtoprammer/chips/microchip8/pic12f629sip6.py index 70a1298..9ac3096 100644 --- a/libtoprammer/chips/microchip8/pic12f629sip6.py +++ b/libtoprammer/chips/microchip8/pic12f629sip6.py @@ -27,9 +27,8 @@ class Chip_Pic12F629sip6(microchip8_splittedPMarea): voltageVPP = 9 userIDLocationSize = 4 - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) - + hasEEPROM = True + CMD_BEGIN_INTERNALLY_TIMED_PROGRAMMING = 0x08 delayTinternalProgPM = 0.002 delayTinternalProgDM = 0.005 diff --git a/libtoprammer/chips/microchip8/pic16f1823dip14.py b/libtoprammer/chips/microchip8/pic16f1823dip14.py index c33f4f0..9c1e130 100644 --- a/libtoprammer/chips/microchip8/pic16f1823dip14.py +++ b/libtoprammer/chips/microchip8/pic16f1823dip14.py @@ -26,9 +26,7 @@ class Chip_Pic16F1823dip14(microchip8_splittedPMarea_hasResetPC): rowSize = 32 nLatches = 32 - - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + hasEEPROM = True def __init__(self): microchip8_splittedPMarea_hasResetPC.__init__(self, diff --git a/libtoprammer/chips/microchip8/pic16f1824dip14.py b/libtoprammer/chips/microchip8/pic16f1824dip14.py index 1eac356..d78f757 100644 --- a/libtoprammer/chips/microchip8/pic16f1824dip14.py +++ b/libtoprammer/chips/microchip8/pic16f1824dip14.py @@ -25,9 +25,7 @@ from microchip8_splittedPMarea_hasResetPC import * class Chip_Pic16F1824dip14(microchip8_splittedPMarea_hasResetPC): nLatches = 32 - - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + hasEEPROM = True def __init__(self): microchip8_splittedPMarea_hasResetPC.__init__(self, diff --git a/libtoprammer/chips/microchip8/pic16f1824sip6.py b/libtoprammer/chips/microchip8/pic16f1824sip6.py index 9fa6776..4a2ff84 100644 --- a/libtoprammer/chips/microchip8/pic16f1824sip6.py +++ b/libtoprammer/chips/microchip8/pic16f1824sip6.py @@ -25,9 +25,7 @@ from microchip8_splittedPMarea_hasResetPC import * class Chip_Pic16F1824sip6(microchip8_splittedPMarea_hasResetPC): nLatches = 32 - - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + hasEEPROM = True def __init__(self): microchip8_splittedPMarea_hasResetPC.__init__(self, diff --git a/libtoprammer/chips/microchip8/pic16f1825dip14.py b/libtoprammer/chips/microchip8/pic16f1825dip14.py index 814161e..cf3a752 100644 --- a/libtoprammer/chips/microchip8/pic16f1825dip14.py +++ b/libtoprammer/chips/microchip8/pic16f1825dip14.py @@ -23,9 +23,8 @@ from microchip8_splittedPMarea_hasResetPC import * class Chip_Pic16F1825dip14(microchip8_splittedPMarea_hasResetPC): - - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + + hasEEPROM = True def __init__(self): microchip8_splittedPMarea_hasResetPC.__init__(self, diff --git a/libtoprammer/chips/microchip8/pic16f1825sip6.py b/libtoprammer/chips/microchip8/pic16f1825sip6.py index 97c660c..3f5bb1e 100644 --- a/libtoprammer/chips/microchip8/pic16f1825sip6.py +++ b/libtoprammer/chips/microchip8/pic16f1825sip6.py @@ -23,9 +23,8 @@ from microchip8_splittedPMarea_hasResetPC import * class Chip_Pic16F1825sip6(microchip8_splittedPMarea_hasResetPC): - - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + + hasEEPROM = True def __init__(self): microchip8_splittedPMarea_hasResetPC.__init__(self, diff --git a/libtoprammer/chips/microchip8/pic16f1826dip18.py b/libtoprammer/chips/microchip8/pic16f1826dip18.py index 73a2a5b..eef4411 100644 --- a/libtoprammer/chips/microchip8/pic16f1826dip18.py +++ b/libtoprammer/chips/microchip8/pic16f1826dip18.py @@ -23,9 +23,8 @@ from microchip8_splittedPMarea_hasResetPC import * class Chip_PIC16F1826dip18(microchip8_splittedPMarea_hasResetPC): - - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + + hasEEPROM = True def __init__(self): microchip8_splittedPMarea_hasResetPC.__init__(self, diff --git a/libtoprammer/chips/microchip8/pic16f1826sip6.py b/libtoprammer/chips/microchip8/pic16f1826sip6.py index 6a634a7..326f4c2 100644 --- a/libtoprammer/chips/microchip8/pic16f1826sip6.py +++ b/libtoprammer/chips/microchip8/pic16f1826sip6.py @@ -23,9 +23,8 @@ from microchip8_splittedPMarea_hasResetPC import * class Chip_PIC16F1826sip6(microchip8_splittedPMarea_hasResetPC): - - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + + hasEEPROM = True def __init__(self): microchip8_splittedPMarea_hasResetPC.__init__(self, diff --git a/libtoprammer/chips/microchip8/pic16f1827dip18.py b/libtoprammer/chips/microchip8/pic16f1827dip18.py index 316fafa..e541e99 100644 --- a/libtoprammer/chips/microchip8/pic16f1827dip18.py +++ b/libtoprammer/chips/microchip8/pic16f1827dip18.py @@ -23,9 +23,8 @@ from microchip8_splittedPMarea_hasResetPC import * class Chip_Pic16F1827dip18(microchip8_splittedPMarea_hasResetPC): - - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + + hasEEPROM = True def __init__(self): microchip8_splittedPMarea_hasResetPC.__init__(self, diff --git a/libtoprammer/chips/microchip8/pic16f1827sip6.py b/libtoprammer/chips/microchip8/pic16f1827sip6.py index 86b59e5..1ad1c55 100644 --- a/libtoprammer/chips/microchip8/pic16f1827sip6.py +++ b/libtoprammer/chips/microchip8/pic16f1827sip6.py @@ -23,9 +23,8 @@ from microchip8_splittedPMarea_hasResetPC import * class Chip_Pic16F1827sip6(microchip8_splittedPMarea_hasResetPC): - - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + + hasEEPROM = True def __init__(self): microchip8_splittedPMarea_hasResetPC.__init__(self, diff --git a/libtoprammer/chips/microchip8/pic16f1828dip20.py b/libtoprammer/chips/microchip8/pic16f1828dip20.py index ac061bb..ddd34cd 100644 --- a/libtoprammer/chips/microchip8/pic16f1828dip20.py +++ b/libtoprammer/chips/microchip8/pic16f1828dip20.py @@ -23,9 +23,8 @@ from microchip8_splittedPMarea_hasResetPC import * class Chip_Pic16F1828dip14(microchip8_splittedPMarea_hasResetPC): - - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + + hasEEPROM = True def __init__(self): microchip8_splittedPMarea_hasResetPC.__init__(self, diff --git a/libtoprammer/chips/microchip8/pic16f1828sip6.py b/libtoprammer/chips/microchip8/pic16f1828sip6.py index c274b10..66a99c3 100644 --- a/libtoprammer/chips/microchip8/pic16f1828sip6.py +++ b/libtoprammer/chips/microchip8/pic16f1828sip6.py @@ -23,9 +23,8 @@ from microchip8_splittedPMarea_hasResetPC import * class Chip_Pic16F1828dip14(microchip8_splittedPMarea_hasResetPC): - - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + + hasEEPROM = True def __init__(self): microchip8_splittedPMarea_hasResetPC.__init__(self, diff --git a/libtoprammer/chips/microchip8/pic16f1829dip20.py b/libtoprammer/chips/microchip8/pic16f1829dip20.py index 7bcfd30..4314749 100644 --- a/libtoprammer/chips/microchip8/pic16f1829dip20.py +++ b/libtoprammer/chips/microchip8/pic16f1829dip20.py @@ -23,9 +23,8 @@ from microchip8_splittedPMarea_hasResetPC import * class Chip_Pic16F1829dip14(microchip8_splittedPMarea_hasResetPC): - - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + + hasEEPROM = True def __init__(self): microchip8_splittedPMarea_hasResetPC.__init__(self, diff --git a/libtoprammer/chips/microchip8/pic16f1829sip6.py b/libtoprammer/chips/microchip8/pic16f1829sip6.py index baef69e..22da899 100644 --- a/libtoprammer/chips/microchip8/pic16f1829sip6.py +++ b/libtoprammer/chips/microchip8/pic16f1829sip6.py @@ -23,9 +23,8 @@ from microchip8_splittedPMarea_hasResetPC import * class Chip_Pic16F1829dip14(microchip8_splittedPMarea_hasResetPC): - - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + + hasEEPROM = True def __init__(self): microchip8_splittedPMarea_hasResetPC.__init__(self, diff --git a/libtoprammer/chips/microchip8/pic16f1933dip28.py b/libtoprammer/chips/microchip8/pic16f1933dip28.py index 77dc828..fdb13bb 100644 --- a/libtoprammer/chips/microchip8/pic16f1933dip28.py +++ b/libtoprammer/chips/microchip8/pic16f1933dip28.py @@ -24,8 +24,7 @@ from microchip8_splittedPMarea_hasResetPC import * class Chip_Pic16F1933dip28(microchip8_splittedPMarea_hasResetPC): - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + hasEEPROM = True def __init__(self): microchip8_splittedPMarea_hasResetPC.__init__(self, diff --git a/libtoprammer/chips/microchip8/pic16f1933sip6.py b/libtoprammer/chips/microchip8/pic16f1933sip6.py index afa7f1b..c0bbb38 100644 --- a/libtoprammer/chips/microchip8/pic16f1933sip6.py +++ b/libtoprammer/chips/microchip8/pic16f1933sip6.py @@ -24,8 +24,7 @@ from microchip8_splittedPMarea_hasResetPC import * class Chip_Pic16F1933sip6(microchip8_splittedPMarea_hasResetPC): - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + hasEEPROM = True def __init__(self): microchip8_splittedPMarea_hasResetPC.__init__(self, diff --git a/libtoprammer/chips/microchip8/pic16f1934dip40.py b/libtoprammer/chips/microchip8/pic16f1934dip40.py index 0af8d29..a0e24d4 100644 --- a/libtoprammer/chips/microchip8/pic16f1934dip40.py +++ b/libtoprammer/chips/microchip8/pic16f1934dip40.py @@ -24,8 +24,7 @@ from microchip8_splittedPMarea_hasResetPC import * class Chip_Pic16F1934dip40(microchip8_splittedPMarea_hasResetPC): - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + hasEEPROM = True def __init__(self): microchip8_splittedPMarea_hasResetPC.__init__(self, diff --git a/libtoprammer/chips/microchip8/pic16f1934sip6.py b/libtoprammer/chips/microchip8/pic16f1934sip6.py index b772133..c63b3af 100644 --- a/libtoprammer/chips/microchip8/pic16f1934sip6.py +++ b/libtoprammer/chips/microchip8/pic16f1934sip6.py @@ -24,8 +24,7 @@ from microchip8_splittedPMarea_hasResetPC import * class Chip_Pic16F1934sip6(microchip8_splittedPMarea_hasResetPC): - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + hasEEPROM = True def __init__(self): microchip8_splittedPMarea_hasResetPC.__init__(self, diff --git a/libtoprammer/chips/microchip8/pic16f1936dip28.py b/libtoprammer/chips/microchip8/pic16f1936dip28.py index dee716b..ca36445 100644 --- a/libtoprammer/chips/microchip8/pic16f1936dip28.py +++ b/libtoprammer/chips/microchip8/pic16f1936dip28.py @@ -24,8 +24,7 @@ from microchip8_splittedPMarea_hasResetPC import * class Chip_Pic16F1936dip28(microchip8_splittedPMarea_hasResetPC): - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + hasEEPROM = True def __init__(self): microchip8_splittedPMarea_hasResetPC.__init__(self, diff --git a/libtoprammer/chips/microchip8/pic16f1936sip6.py b/libtoprammer/chips/microchip8/pic16f1936sip6.py index 3301646..1b41750 100644 --- a/libtoprammer/chips/microchip8/pic16f1936sip6.py +++ b/libtoprammer/chips/microchip8/pic16f1936sip6.py @@ -24,8 +24,7 @@ from microchip8_splittedPMarea_hasResetPC import * class Chip_Pic16F1936sip6(microchip8_splittedPMarea_hasResetPC): - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + hasEEPROM = True def __init__(self): microchip8_splittedPMarea_hasResetPC.__init__(self, diff --git a/libtoprammer/chips/microchip8/pic16f1937dip40.py b/libtoprammer/chips/microchip8/pic16f1937dip40.py index fc86ffb..fc66341 100644 --- a/libtoprammer/chips/microchip8/pic16f1937dip40.py +++ b/libtoprammer/chips/microchip8/pic16f1937dip40.py @@ -24,8 +24,7 @@ from microchip8_splittedPMarea_hasResetPC import * class Chip_Pic16F1937dip40(microchip8_splittedPMarea_hasResetPC): - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + hasEEPROM = True def __init__(self): microchip8_splittedPMarea_hasResetPC.__init__(self, diff --git a/libtoprammer/chips/microchip8/pic16f1937sip6.py b/libtoprammer/chips/microchip8/pic16f1937sip6.py index 2ccaa72..a0eee7d 100644 --- a/libtoprammer/chips/microchip8/pic16f1937sip6.py +++ b/libtoprammer/chips/microchip8/pic16f1937sip6.py @@ -24,8 +24,7 @@ from microchip8_splittedPMarea_hasResetPC import * class Chip_Pic16F1937sip6(microchip8_splittedPMarea_hasResetPC): - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + hasEEPROM = True def __init__(self): microchip8_splittedPMarea_hasResetPC.__init__(self, diff --git a/libtoprammer/chips/microchip8/pic16f1938dip28.py b/libtoprammer/chips/microchip8/pic16f1938dip28.py index 9b2af00..ea18683 100644 --- a/libtoprammer/chips/microchip8/pic16f1938dip28.py +++ b/libtoprammer/chips/microchip8/pic16f1938dip28.py @@ -24,8 +24,7 @@ from microchip8_splittedPMarea_hasResetPC import * class Chip_Pic16F1938dip28(microchip8_splittedPMarea_hasResetPC): - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + hasEEPROM = True def __init__(self): microchip8_splittedPMarea_hasResetPC.__init__(self, diff --git a/libtoprammer/chips/microchip8/pic16f1938sip6.py b/libtoprammer/chips/microchip8/pic16f1938sip6.py index 0d689e3..edc27fe 100644 --- a/libtoprammer/chips/microchip8/pic16f1938sip6.py +++ b/libtoprammer/chips/microchip8/pic16f1938sip6.py @@ -24,8 +24,7 @@ from microchip8_splittedPMarea_hasResetPC import * class Chip_Pic16F1938sip6(microchip8_splittedPMarea_hasResetPC): - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + hasEEPROM = True def __init__(self): microchip8_splittedPMarea_hasResetPC.__init__(self, diff --git a/libtoprammer/chips/microchip8/pic16f1939dip40.py b/libtoprammer/chips/microchip8/pic16f1939dip40.py index c94bb65..f698c02 100644 --- a/libtoprammer/chips/microchip8/pic16f1939dip40.py +++ b/libtoprammer/chips/microchip8/pic16f1939dip40.py @@ -24,8 +24,7 @@ from microchip8_splittedPMarea_hasResetPC import * class Chip_Pic16F1939dip40(microchip8_splittedPMarea_hasResetPC): - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + hasEEPROM = True def __init__(self): microchip8_splittedPMarea_hasResetPC.__init__(self, diff --git a/libtoprammer/chips/microchip8/pic16f1939sip6.py b/libtoprammer/chips/microchip8/pic16f1939sip6.py index 60dac02..cf016dc 100644 --- a/libtoprammer/chips/microchip8/pic16f1939sip6.py +++ b/libtoprammer/chips/microchip8/pic16f1939sip6.py @@ -24,8 +24,7 @@ from microchip8_splittedPMarea_hasResetPC import * class Chip_Pic16F1939sip6(microchip8_splittedPMarea_hasResetPC): - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + hasEEPROM = True def __init__(self): microchip8_splittedPMarea_hasResetPC.__init__(self, diff --git a/libtoprammer/chips/microchip8/pic16f630dip14.py b/libtoprammer/chips/microchip8/pic16f630dip14.py index 399b446..98da9de 100644 --- a/libtoprammer/chips/microchip8/pic16f630dip14.py +++ b/libtoprammer/chips/microchip8/pic16f630dip14.py @@ -27,9 +27,8 @@ class Chip_Pic16F630dip14(microchip8_splittedPMarea): voltageVPP = 9 userIDLocationSize = 4 - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) - + hasEEPROM = True + CMD_BEGIN_INTERNALLY_TIMED_PROGRAMMING = 0x08 delayTinternalProgPM = 0.002 delayTinternalProgDM = 0.005 diff --git a/libtoprammer/chips/microchip8/pic16f630sip6.py b/libtoprammer/chips/microchip8/pic16f630sip6.py index 37406f8..e9fe715 100644 --- a/libtoprammer/chips/microchip8/pic16f630sip6.py +++ b/libtoprammer/chips/microchip8/pic16f630sip6.py @@ -27,9 +27,8 @@ class Chip_Pic16F630sip6(microchip8_splittedPMarea): voltageVPP = 9 userIDLocationSize = 4 - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) - + hasEEPROM = True + CMD_BEGIN_INTERNALLY_TIMED_PROGRAMMING = 0x08 delayTinternalProgPM = 0.002 delayTinternalProgDM = 0.005 diff --git a/libtoprammer/chips/microchip8/pic16f84adip18.py b/libtoprammer/chips/microchip8/pic16f84adip18.py index c89b503..e3c4426 100644 --- a/libtoprammer/chips/microchip8/pic16f84adip18.py +++ b/libtoprammer/chips/microchip8/pic16f84adip18.py @@ -32,9 +32,8 @@ class Chip_Pic16F84adip18(microchip8_splittedPMarea): delayTinternalProgPM = 0.004 userIDLocationSize = 4 - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) - + hasEEPROM = True + def __init__(self): microchip8_splittedPMarea.__init__(self, chipPackage="DIP18", diff --git a/libtoprammer/chips/microchip8/pic16f84asip6.py b/libtoprammer/chips/microchip8/pic16f84asip6.py index 902ff67..d472011 100644 --- a/libtoprammer/chips/microchip8/pic16f84asip6.py +++ b/libtoprammer/chips/microchip8/pic16f84asip6.py @@ -32,9 +32,8 @@ class Chip_Pic16F84asip6(microchip8_splittedPMarea): delayTinternalProgPM = 0.004 userIDLocationSize = 4 - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) - + hasEEPROM = True + def __init__(self): microchip8_splittedPMarea.__init__(self, chipPackage = "DIP10", diff --git a/libtoprammer/chips/microchip8/pic18f1220dip18.py b/libtoprammer/chips/microchip8/pic18f1220dip18.py index dff6fe4..06b7f27 100644 --- a/libtoprammer/chips/microchip8/pic18f1220dip18.py +++ b/libtoprammer/chips/microchip8/pic18f1220dip18.py @@ -23,9 +23,8 @@ from microchip8_18f1220family import * class Chip_PIC18F1220dip18(microchip8_18f1220family): - - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + + hasEEPROM = True writeBufferSize = 8 eraseBufferSize = 64 diff --git a/libtoprammer/chips/microchip8/pic18f1220sip6.py b/libtoprammer/chips/microchip8/pic18f1220sip6.py index 8855f61..e4dedde 100644 --- a/libtoprammer/chips/microchip8/pic18f1220sip6.py +++ b/libtoprammer/chips/microchip8/pic18f1220sip6.py @@ -23,9 +23,8 @@ from microchip8_18f1220family import * class Chip_PIC18F1220sip6(microchip8_18f1220family): - - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + + hasEEPROM = True writeBufferSize = 8 eraseBufferSize = 64 diff --git a/libtoprammer/chips/microchip8/pic18f2320dip28.py b/libtoprammer/chips/microchip8/pic18f2320dip28.py index 5314130..a6e5644 100644 --- a/libtoprammer/chips/microchip8/pic18f2320dip28.py +++ b/libtoprammer/chips/microchip8/pic18f2320dip28.py @@ -23,9 +23,8 @@ from microchip8_18f1220family import * class Chip_PIC18F2320dip28(microchip8_18f1220family): - - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + + hasEEPROM = True writeBufferSize = 8 eraseBufferSize = 64 diff --git a/libtoprammer/chips/microchip8/pic18f2320sip6.py b/libtoprammer/chips/microchip8/pic18f2320sip6.py index b38a0b5..189ccd9 100644 --- a/libtoprammer/chips/microchip8/pic18f2320sip6.py +++ b/libtoprammer/chips/microchip8/pic18f2320sip6.py @@ -23,9 +23,8 @@ from microchip8_18f1220family import * class Chip_PIC18F2320sip6(microchip8_18f1220family): - - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + + hasEEPROM = True writeBufferSize = 8 eraseBufferSize = 64 diff --git a/libtoprammer/chips/microchip8/pic18f2321dip28.py b/libtoprammer/chips/microchip8/pic18f2321dip28.py index 2f66b8c..f4669d8 100644 --- a/libtoprammer/chips/microchip8/pic18f2321dip28.py +++ b/libtoprammer/chips/microchip8/pic18f2321dip28.py @@ -23,9 +23,8 @@ from microchip8_18f2221family import * class Chip_PIC18F2321dip28(microchip8_18f2221family): - - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + + hasEEPROM = True writeBufferSize = 8 eraseBufferSize = 64 diff --git a/libtoprammer/chips/microchip8/pic18f2321sip6.py b/libtoprammer/chips/microchip8/pic18f2321sip6.py index 7a4f214..41e2912 100644 --- a/libtoprammer/chips/microchip8/pic18f2321sip6.py +++ b/libtoprammer/chips/microchip8/pic18f2321sip6.py @@ -23,9 +23,8 @@ from microchip8_18f2221family import * class Chip_PIC18F2321sip6(microchip8_18f2221family): - - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + + hasEEPROM = True writeBufferSize = 8 eraseBufferSize = 64 diff --git a/libtoprammer/chips/microchip8/pic18f67j60sip6.py b/libtoprammer/chips/microchip8/pic18f67j60sip6.py index 0c2791a..f377742 100644 --- a/libtoprammer/chips/microchip8/pic18f67j60sip6.py +++ b/libtoprammer/chips/microchip8/pic18f67j60sip6.py @@ -23,9 +23,8 @@ from microchip8_18f97j60family import * class Chip_PIC18F67J60sip6(microchip8_18f97j60family): - - SUPPORT_EEPROMREAD = (1 << 4) - SUPPORT_EEPROMWRITE = (1 << 5) + + hasEEPROM = True writeBufferSize = 8 eraseBufferSize = 64 -- cgit v1.2.3