diff --git a/Ample/Resources/ace100.plist b/Ample/Resources/ace100.plist index 42e06b0..762d819 100644 --- a/Ample/Resources/ace100.plist +++ b/Ample/Resources/ace100.plist @@ -9,74 +9,92 @@ ram - value + intValue 4096 description 4K + value + 4K default - value + intValue 8192 description 8K + value + 8K default - value + intValue 12288 description 12K + value + 12K default - value + intValue 16384 description 16K + value + 16K default - value + intValue 20480 description 20K + value + 20K default - value + intValue 24576 description 24K + value + 24K default - value + intValue 32768 description 32K + value + 32K default - value + intValue 36864 description 36K + value + 36K default - value + intValue 49152 description 48K + value + 48K default diff --git a/Ample/Resources/agat7.plist b/Ample/Resources/agat7.plist index 7e35f89..651dbc3 100644 --- a/Ample/Resources/agat7.plist +++ b/Ample/Resources/agat7.plist @@ -9,10 +9,12 @@ ram - value + intValue 32768 description 32K + value + 32K default diff --git a/Ample/Resources/agat9.plist b/Ample/Resources/agat9.plist index 8f46904..a520de9 100644 --- a/Ample/Resources/agat9.plist +++ b/Ample/Resources/agat9.plist @@ -9,10 +9,12 @@ ram - value + intValue 131072 description 128K + value + 128K default diff --git a/Ample/Resources/albert.plist b/Ample/Resources/albert.plist index 401c340..2da54bd 100644 --- a/Ample/Resources/albert.plist +++ b/Ample/Resources/albert.plist @@ -9,26 +9,32 @@ ram - value + intValue 16384 description 16K + value + 16K default - value + intValue 32768 description 32K + value + 32K default - value + intValue 49152 description 48K + value + 48K default diff --git a/Ample/Resources/am100.plist b/Ample/Resources/am100.plist index cdd5746..6bcd048 100644 --- a/Ample/Resources/am100.plist +++ b/Ample/Resources/am100.plist @@ -9,26 +9,32 @@ ram - value + intValue 16384 description 16K + value + 16K default - value + intValue 32768 description 32K + value + 32K default - value + intValue 49152 description 48K + value + 48K default diff --git a/Ample/Resources/am64.plist b/Ample/Resources/am64.plist index 2b15d49..e48e619 100644 --- a/Ample/Resources/am64.plist +++ b/Ample/Resources/am64.plist @@ -9,26 +9,32 @@ ram - value + intValue 16384 description 16K + value + 16K default - value + intValue 32768 description 32K + value + 32K default - value + intValue 49152 description 48K + value + 48K default diff --git a/Ample/Resources/apple1.plist b/Ample/Resources/apple1.plist index 8de0f83..c6a6c4d 100644 --- a/Ample/Resources/apple1.plist +++ b/Ample/Resources/apple1.plist @@ -9,98 +9,122 @@ ram - value + intValue 4096 description 4K + value + 4K default - value + intValue 8192 description 8K + value + 8K default - value + intValue 12288 description 12K + value + 12K default - value + intValue 16384 description 16K + value + 16K default - value + intValue 20480 description 20K + value + 20K default - value + intValue 24576 description 24K + value + 24K default - value + intValue 28672 description 28K + value + 28K default - value + intValue 32768 description 32K + value + 32K default - value + intValue 36864 description 36K + value + 36K default - value + intValue 40960 description 40K + value + 40K default - value + intValue 45056 description 44K + value + 44K default - value + intValue 49152 description 48K + value + 48K default diff --git a/Ample/Resources/apple2.plist b/Ample/Resources/apple2.plist index c48ce33..5d896bb 100644 --- a/Ample/Resources/apple2.plist +++ b/Ample/Resources/apple2.plist @@ -9,74 +9,92 @@ ram - value + intValue 4096 description 4K + value + 4K default - value + intValue 8192 description 8K + value + 8K default - value + intValue 12288 description 12K + value + 12K default - value + intValue 16384 description 16K + value + 16K default - value + intValue 20480 description 20K + value + 20K default - value + intValue 24576 description 24K + value + 24K default - value + intValue 32768 description 32K + value + 32K default - value + intValue 36864 description 36K + value + 36K default - value + intValue 49152 description 48K + value + 48K default diff --git a/Ample/Resources/apple2c.plist b/Ample/Resources/apple2c.plist index 6b21619..be27ca6 100644 --- a/Ample/Resources/apple2c.plist +++ b/Ample/Resources/apple2c.plist @@ -9,10 +9,12 @@ ram - value + intValue 131072 description 128K + value + 128K default diff --git a/Ample/Resources/apple2cp.plist b/Ample/Resources/apple2cp.plist index 6c478d7..3ca0e98 100644 --- a/Ample/Resources/apple2cp.plist +++ b/Ample/Resources/apple2cp.plist @@ -9,42 +9,52 @@ ram - value + intValue 131072 description 128K + value + 128K default - value + intValue 393216 description 384K + value + 384K default - value + intValue 655360 description 640K + value + 640K default - value + intValue 917504 description 896K + value + 896K default - value + intValue 1179648 description 1152K + value + 1152K default diff --git a/Ample/Resources/apple2e.plist b/Ample/Resources/apple2e.plist index fa4be49..b1c64b2 100644 --- a/Ample/Resources/apple2e.plist +++ b/Ample/Resources/apple2e.plist @@ -9,10 +9,12 @@ ram - value + intValue 65536 description 64K + value + 64K default diff --git a/Ample/Resources/apple2ee.plist b/Ample/Resources/apple2ee.plist index 5c9ee05..2b22c3a 100644 --- a/Ample/Resources/apple2ee.plist +++ b/Ample/Resources/apple2ee.plist @@ -9,10 +9,12 @@ ram - value + intValue 65536 description 64K + value + 64K default diff --git a/Ample/Resources/apple2eefr.plist b/Ample/Resources/apple2eefr.plist index 9f48204..b194d1d 100644 --- a/Ample/Resources/apple2eefr.plist +++ b/Ample/Resources/apple2eefr.plist @@ -9,10 +9,12 @@ ram - value + intValue 65536 description 64K + value + 64K default diff --git a/Ample/Resources/apple2ees.plist b/Ample/Resources/apple2ees.plist index 0c7d6c5..1397742 100644 --- a/Ample/Resources/apple2ees.plist +++ b/Ample/Resources/apple2ees.plist @@ -9,10 +9,12 @@ ram - value + intValue 65536 description 64K + value + 64K default diff --git a/Ample/Resources/apple2eeuk.plist b/Ample/Resources/apple2eeuk.plist index 47890ff..873740a 100644 --- a/Ample/Resources/apple2eeuk.plist +++ b/Ample/Resources/apple2eeuk.plist @@ -9,10 +9,12 @@ ram - value + intValue 65536 description 64K + value + 64K default diff --git a/Ample/Resources/apple2ep.plist b/Ample/Resources/apple2ep.plist index 3664f5f..cb9bfe7 100644 --- a/Ample/Resources/apple2ep.plist +++ b/Ample/Resources/apple2ep.plist @@ -9,10 +9,12 @@ ram - value + intValue 65536 description 64K + value + 64K default diff --git a/Ample/Resources/apple2euk.plist b/Ample/Resources/apple2euk.plist index 8c9f6eb..3ea5476 100644 --- a/Ample/Resources/apple2euk.plist +++ b/Ample/Resources/apple2euk.plist @@ -9,10 +9,12 @@ ram - value + intValue 65536 description 64K + value + 64K default diff --git a/Ample/Resources/apple2gs.plist b/Ample/Resources/apple2gs.plist index b89b586..10a1a29 100644 --- a/Ample/Resources/apple2gs.plist +++ b/Ample/Resources/apple2gs.plist @@ -9,66 +9,82 @@ ram - value + intValue 1048576 description 1M + value + 1M default - value + intValue 2097152 description 2M + value + 2M default - value + intValue 3145728 description 3M + value + 3M default - value + intValue 4194304 description 4M + value + 4M default - value + intValue 5242880 description 5M + value + 5M default - value + intValue 6291456 description 6M + value + 6M default - value + intValue 7340032 description 7M + value + 7M default - value + intValue 8388608 description 8M + value + 8M default diff --git a/Ample/Resources/apple2gsr0.plist b/Ample/Resources/apple2gsr0.plist index 6477393..7b672b4 100644 --- a/Ample/Resources/apple2gsr0.plist +++ b/Ample/Resources/apple2gsr0.plist @@ -9,98 +9,122 @@ ram - value + intValue 262144 description 256K + value + 256K default - value + intValue 524288 description 512K + value + 512K default - value + intValue 786432 description 768K + value + 768K default - value + intValue 1048576 description 1M + value + 1M default - value + intValue 1310720 description 1280K + value + 1280K default - value + intValue 2097152 description 2M + value + 2M default - value + intValue 3145728 description 3M + value + 3M default - value + intValue 4194304 description 4M + value + 4M default - value + intValue 5242880 description 5M + value + 5M default - value + intValue 6291456 description 6M + value + 6M default - value + intValue 7340032 description 7M + value + 7M default - value + intValue 8388608 description 8M + value + 8M default diff --git a/Ample/Resources/apple2gsr1.plist b/Ample/Resources/apple2gsr1.plist index 7f2e95f..342e33b 100644 --- a/Ample/Resources/apple2gsr1.plist +++ b/Ample/Resources/apple2gsr1.plist @@ -9,98 +9,122 @@ ram - value + intValue 262144 description 256K + value + 256K default - value + intValue 524288 description 512K + value + 512K default - value + intValue 786432 description 768K + value + 768K default - value + intValue 1048576 description 1M + value + 1M default - value + intValue 1310720 description 1280K + value + 1280K default - value + intValue 2097152 description 2M + value + 2M default - value + intValue 3145728 description 3M + value + 3M default - value + intValue 4194304 description 4M + value + 4M default - value + intValue 5242880 description 5M + value + 5M default - value + intValue 6291456 description 6M + value + 6M default - value + intValue 7340032 description 7M + value + 7M default - value + intValue 8388608 description 8M + value + 8M default diff --git a/Ample/Resources/apple2jp.plist b/Ample/Resources/apple2jp.plist index a2db7eb..ff23229 100644 --- a/Ample/Resources/apple2jp.plist +++ b/Ample/Resources/apple2jp.plist @@ -9,26 +9,32 @@ ram - value + intValue 16384 description 16K + value + 16K default - value + intValue 32768 description 32K + value + 32K default - value + intValue 49152 description 48K + value + 48K default diff --git a/Ample/Resources/apple2p.plist b/Ample/Resources/apple2p.plist index 4825e23..89a28d4 100644 --- a/Ample/Resources/apple2p.plist +++ b/Ample/Resources/apple2p.plist @@ -9,26 +9,32 @@ ram - value + intValue 16384 description 16K + value + 16K default - value + intValue 32768 description 32K + value + 32K default - value + intValue 49152 description 48K + value + 48K default diff --git a/Ample/Resources/apple3.plist b/Ample/Resources/apple3.plist index d04ac01..6fac23c 100644 --- a/Ample/Resources/apple3.plist +++ b/Ample/Resources/apple3.plist @@ -9,26 +9,32 @@ ram - value + intValue 131072 description 128K + value + 128K default - value + intValue 262144 description 256K + value + 256K default - value + intValue 524288 description 512K + value + 512K default diff --git a/Ample/Resources/basis108.plist b/Ample/Resources/basis108.plist index 1339239..7f3293e 100644 --- a/Ample/Resources/basis108.plist +++ b/Ample/Resources/basis108.plist @@ -9,74 +9,92 @@ ram - value + intValue 4096 description 4K + value + 4K default - value + intValue 8192 description 8K + value + 8K default - value + intValue 12288 description 12K + value + 12K default - value + intValue 16384 description 16K + value + 16K default - value + intValue 20480 description 20K + value + 20K default - value + intValue 24576 description 24K + value + 24K default - value + intValue 32768 description 32K + value + 32K default - value + intValue 36864 description 36K + value + 36K default - value + intValue 49152 description 48K + value + 48K default diff --git a/Ample/Resources/cec2000.plist b/Ample/Resources/cec2000.plist index 7ad7d9d..416eb71 100644 --- a/Ample/Resources/cec2000.plist +++ b/Ample/Resources/cec2000.plist @@ -9,10 +9,12 @@ ram - value + intValue 65536 description 64K + value + 64K default diff --git a/Ample/Resources/cece.plist b/Ample/Resources/cece.plist index d532b38..5816b91 100644 --- a/Ample/Resources/cece.plist +++ b/Ample/Resources/cece.plist @@ -9,10 +9,12 @@ ram - value + intValue 65536 description 64K + value + 64K default diff --git a/Ample/Resources/cecg.plist b/Ample/Resources/cecg.plist index c9a68c9..e592caa 100644 --- a/Ample/Resources/cecg.plist +++ b/Ample/Resources/cecg.plist @@ -9,10 +9,12 @@ ram - value + intValue 65536 description 64K + value + 64K default diff --git a/Ample/Resources/ceci.plist b/Ample/Resources/ceci.plist index ca05556..2487764 100644 --- a/Ample/Resources/ceci.plist +++ b/Ample/Resources/ceci.plist @@ -9,10 +9,12 @@ ram - value + intValue 65536 description 64K + value + 64K default diff --git a/Ample/Resources/cecm.plist b/Ample/Resources/cecm.plist index ce01331..0a0378c 100644 --- a/Ample/Resources/cecm.plist +++ b/Ample/Resources/cecm.plist @@ -9,10 +9,12 @@ ram - value + intValue 65536 description 64K + value + 64K default diff --git a/Ample/Resources/craft2p.plist b/Ample/Resources/craft2p.plist index 6b731b3..6a1375b 100644 --- a/Ample/Resources/craft2p.plist +++ b/Ample/Resources/craft2p.plist @@ -9,26 +9,32 @@ ram - value + intValue 16384 description 16K + value + 16K default - value + intValue 32768 description 32K + value + 32K default - value + intValue 49152 description 48K + value + 48K default diff --git a/Ample/Resources/dodo.plist b/Ample/Resources/dodo.plist index b374f0e..08aea5a 100644 --- a/Ample/Resources/dodo.plist +++ b/Ample/Resources/dodo.plist @@ -9,26 +9,32 @@ ram - value + intValue 16384 description 16K + value + 16K default - value + intValue 32768 description 32K + value + 32K default - value + intValue 49152 description 48K + value + 48K default diff --git a/Ample/Resources/elppa.plist b/Ample/Resources/elppa.plist index 4bf22e2..bfc2a62 100644 --- a/Ample/Resources/elppa.plist +++ b/Ample/Resources/elppa.plist @@ -9,26 +9,32 @@ ram - value + intValue 16384 description 16K + value + 16K default - value + intValue 32768 description 32K + value + 32K default - value + intValue 49152 description 48K + value + 48K default diff --git a/Ample/Resources/hkc8800a.plist b/Ample/Resources/hkc8800a.plist index 2ecf57c..7136eab 100644 --- a/Ample/Resources/hkc8800a.plist +++ b/Ample/Resources/hkc8800a.plist @@ -9,26 +9,32 @@ ram - value + intValue 16384 description 16K + value + 16K default - value + intValue 32768 description 32K + value + 32K default - value + intValue 49152 description 48K + value + 48K default diff --git a/Ample/Resources/ivelultr.plist b/Ample/Resources/ivelultr.plist index 71dbde0..225cba8 100644 --- a/Ample/Resources/ivelultr.plist +++ b/Ample/Resources/ivelultr.plist @@ -9,26 +9,32 @@ ram - value + intValue 16384 description 16K + value + 16K default - value + intValue 32768 description 32K + value + 32K default - value + intValue 49152 description 48K + value + 48K default diff --git a/Ample/Resources/las128e2.plist b/Ample/Resources/las128e2.plist index 65e142d..42ce3e5 100644 --- a/Ample/Resources/las128e2.plist +++ b/Ample/Resources/las128e2.plist @@ -9,42 +9,52 @@ ram - value + intValue 131072 description 128K + value + 128K default - value + intValue 393216 description 384K + value + 384K default - value + intValue 655360 description 640K + value + 640K default - value + intValue 917504 description 896K + value + 896K default - value + intValue 1179648 description 1152K + value + 1152K default diff --git a/Ample/Resources/las128ex.plist b/Ample/Resources/las128ex.plist index 498ecb8..e33241c 100644 --- a/Ample/Resources/las128ex.plist +++ b/Ample/Resources/las128ex.plist @@ -9,42 +9,52 @@ ram - value + intValue 131072 description 128K + value + 128K default - value + intValue 393216 description 384K + value + 384K default - value + intValue 655360 description 640K + value + 640K default - value + intValue 917504 description 896K + value + 896K default - value + intValue 1179648 description 1152K + value + 1152K default diff --git a/Ample/Resources/laser128.plist b/Ample/Resources/laser128.plist index fcdd409..472170e 100644 --- a/Ample/Resources/laser128.plist +++ b/Ample/Resources/laser128.plist @@ -9,42 +9,52 @@ ram - value + intValue 131072 description 128K + value + 128K default - value + intValue 393216 description 384K + value + 384K default - value + intValue 655360 description 640K + value + 640K default - value + intValue 917504 description 896K + value + 896K default - value + intValue 1179648 description 1152K + value + 1152K default diff --git a/Ample/Resources/laser2c.plist b/Ample/Resources/laser2c.plist index df2b5bb..403ee21 100644 --- a/Ample/Resources/laser2c.plist +++ b/Ample/Resources/laser2c.plist @@ -9,26 +9,32 @@ ram - value + intValue 16384 description 16K + value + 16K default - value + intValue 32768 description 32K + value + 32K default - value + intValue 49152 description 48K + value + 48K default diff --git a/Ample/Resources/maxxi.plist b/Ample/Resources/maxxi.plist index e1bcfb2..585b5f7 100644 --- a/Ample/Resources/maxxi.plist +++ b/Ample/Resources/maxxi.plist @@ -9,26 +9,32 @@ ram - value + intValue 16384 description 16K + value + 16K default - value + intValue 32768 description 32K + value + 32K default - value + intValue 49152 description 48K + value + 48K default diff --git a/Ample/Resources/microeng.plist b/Ample/Resources/microeng.plist index f7c3944..431d519 100644 --- a/Ample/Resources/microeng.plist +++ b/Ample/Resources/microeng.plist @@ -9,26 +9,32 @@ ram - value + intValue 16384 description 16K + value + 16K default - value + intValue 32768 description 32K + value + 32K default - value + intValue 49152 description 48K + value + 48K default diff --git a/Ample/Resources/mprof3.plist b/Ample/Resources/mprof3.plist index 354c957..b93d8e9 100644 --- a/Ample/Resources/mprof3.plist +++ b/Ample/Resources/mprof3.plist @@ -9,10 +9,12 @@ ram - value + intValue 131072 description 128K + value + 128K default diff --git a/Ample/Resources/prav82.plist b/Ample/Resources/prav82.plist index 9c20d29..783b1f4 100644 --- a/Ample/Resources/prav82.plist +++ b/Ample/Resources/prav82.plist @@ -9,26 +9,32 @@ ram - value + intValue 16384 description 16K + value + 16K default - value + intValue 32768 description 32K + value + 32K default - value + intValue 49152 description 48K + value + 48K default diff --git a/Ample/Resources/prav8c.plist b/Ample/Resources/prav8c.plist index 1160eeb..010a7dd 100644 --- a/Ample/Resources/prav8c.plist +++ b/Ample/Resources/prav8c.plist @@ -9,10 +9,12 @@ ram - value + intValue 65536 description 64K + value + 64K default diff --git a/Ample/Resources/prav8m.plist b/Ample/Resources/prav8m.plist index de8618d..d41f361 100644 --- a/Ample/Resources/prav8m.plist +++ b/Ample/Resources/prav8m.plist @@ -9,26 +9,32 @@ ram - value + intValue 16384 description 16K + value + 16K default - value + intValue 32768 description 32K + value + 32K default - value + intValue 49152 description 48K + value + 48K default diff --git a/Ample/Resources/space84.plist b/Ample/Resources/space84.plist index 508e18c..5852fe5 100644 --- a/Ample/Resources/space84.plist +++ b/Ample/Resources/space84.plist @@ -9,26 +9,32 @@ ram - value + intValue 16384 description 16K + value + 16K default - value + intValue 32768 description 32K + value + 32K default - value + intValue 49152 description 48K + value + 48K default diff --git a/Ample/Resources/spectred.plist b/Ample/Resources/spectred.plist index 01b1508..baf5107 100644 --- a/Ample/Resources/spectred.plist +++ b/Ample/Resources/spectred.plist @@ -9,10 +9,12 @@ ram - value + intValue 65536 description 64K + value + 64K default diff --git a/Ample/Resources/uniap2en.plist b/Ample/Resources/uniap2en.plist index 9124cc9..02e96eb 100644 --- a/Ample/Resources/uniap2en.plist +++ b/Ample/Resources/uniap2en.plist @@ -9,26 +9,32 @@ ram - value + intValue 16384 description 16K + value + 16K default - value + intValue 32768 description 32K + value + 32K default - value + intValue 49152 description 48K + value + 48K default diff --git a/Ample/Resources/uniap2pt.plist b/Ample/Resources/uniap2pt.plist index f7481a8..0fdaf26 100644 --- a/Ample/Resources/uniap2pt.plist +++ b/Ample/Resources/uniap2pt.plist @@ -9,26 +9,32 @@ ram - value + intValue 16384 description 16K + value + 16K default - value + intValue 32768 description 32K + value + 32K default - value + intValue 49152 description 48K + value + 48K default diff --git a/Ample/Resources/uniap2ti.plist b/Ample/Resources/uniap2ti.plist index 9ee4cef..9c5914c 100644 --- a/Ample/Resources/uniap2ti.plist +++ b/Ample/Resources/uniap2ti.plist @@ -9,26 +9,32 @@ ram - value + intValue 16384 description 16K + value + 16K default - value + intValue 32768 description 32K + value + 32K default - value + intValue 49152 description 48K + value + 48K default diff --git a/Ample/Resources/zijini.plist b/Ample/Resources/zijini.plist index 70f8fb7..9acaed5 100644 --- a/Ample/Resources/zijini.plist +++ b/Ample/Resources/zijini.plist @@ -9,10 +9,12 @@ ram - value + intValue 65536 description 64K + value + 64K default diff --git a/Ample/SlotViewController.m b/Ample/SlotViewController.m index cbb3e2d..5e0da70 100644 --- a/Ample/SlotViewController.m +++ b/Ample/SlotViewController.m @@ -175,10 +175,10 @@ static void DeactivateMenus(NSArray *items, NSPopUpButton *button) { // if ram was explicitly set, try to keep it. for (NSDictionary *d in items) { - unsigned size = [(NSNumber *)[d objectForKey: @"value"] unsignedIntValue]; + unsigned size = [(NSNumber *)[d objectForKey: @"intValue"] unsignedIntValue]; if (size == _memoryBytes) { [_ram_menu selectItemAtIndex: ix]; - [self setMemory: [d objectForKey: @"description"]]; + [self setMemory: [d objectForKey: @"value"]]; return; } ++ix; @@ -190,8 +190,8 @@ static void DeactivateMenus(NSArray *items, NSPopUpButton *button) { NSDictionary *d = [items objectAtIndex: default_index]; [_ram_menu selectItemAtIndex: default_index]; - [self setMemory: [d objectForKey: @"description"]]; - [self setMemoryBytes: [(NSNumber *)[d objectForKey: @"value"] unsignedIntValue]]; + [self setMemory: [d objectForKey: @"value"]]; + [self setMemoryBytes: [(NSNumber *)[d objectForKey: @"intValue"] unsignedIntValue]]; } else { [self setMemoryBytes: 0]; [self setMemory: @""]; diff --git a/python/mkmachines.py b/python/mkmachines.py index daf71df..039058f 100644 --- a/python/mkmachines.py +++ b/python/mkmachines.py @@ -1,4 +1,4 @@ - +import argparse import subprocess from plist import to_plist @@ -145,7 +145,14 @@ def find_media(parent, include_slots=False): devices = {} -for m in MACHINES: +p = argparse.ArgumentParser() +p.add_argument('machine', nargs="*") +args = p.parse_args() + +machines = args.machine +if not machines: machines = MACHINES + +for m in machines: print(m) @@ -167,14 +174,15 @@ for m in MACHINES: data["description"] = machine.find("description").text tmp = [ { - "value": int(x.text), + "intValue": int(x.text), "description": x.get("name"), + "value": x.get("name"), "default": x.get("default") == "yes" } for x in machine.findall('ramoption') ] # sort and add empty starting entry. - tmp.sort(key=lambda x: x["value"]) + tmp.sort(key=lambda x: x["intValue"]) # tmp.insert(0, {"value": 0, "default": False, "description": "" }) data["ram"] = tmp