diff --git a/py/NSCB.bat b/py/NSCB.bat index e861a876..d88610ec 100644 --- a/py/NSCB.bat +++ b/py/NSCB.bat @@ -1055,7 +1055,7 @@ if /i "%bs%"=="0" goto s_KeyChange_skip :s_KeyChange_wrongchoice echo ******************************************************* -echo SET MAXIMUM KEYGENERATION\RSV ALOWED +echo SET MAXIMUM KEYGENERATION\RSV ALLOWED echo ******************************************************* echo Depending on your choice keygeneration and RSV will be echo lowered to the corresponding keygeneration range in case @@ -1067,7 +1067,7 @@ echo Input "f" to not change the keygeneration echo Input "0" to change top keygeneration to 0 (FW 1.0) echo Input "1" to change top keygeneration to 1 (FW 2.0-2.3) echo Input "2" to change top keygeneration to 2 (FW 3.0) -echo Input "3" to change top keygeneration to 3 (FW 3.0.1-3.02) +echo Input "3" to change top keygeneration to 3 (FW 3.0.1-3.0.2) echo Input "4" to change top keygeneration to 4 (FW 4.0.0-4.1.0) echo Input "5" to change top keygeneration to 5 (FW 5.0.0-5.1.0) echo Input "6" to change top keygeneration to 6 (FW 6.0.0-6.1.0) @@ -1077,7 +1077,11 @@ echo Input "9" to change top keygeneration to 9 (FW 8.1.0) echo Input "10" to change top keygeneration to 10 (FW 9.0.0-9.01) echo Input "11" to change top keygeneration to 11 (FW 9.1.0-11.0.3) echo Input "12" to change top keygeneration to 12 (FW 12.1.0) -echo Input "13" to change top keygeneration to 13 (>FW 13.0.0) +echo Input "13" to change top keygeneration to 13 (FW 13.0.0-13.2.1) +echo Input "14" to change top keygeneration to 14 (FW 14.0.0-14.1.2) +echo Input "15" to change top keygeneration to 15 (FW 15.0.0-15.0.1) +echo Input "16" to change top keygeneration to 16 (FW 16.0.0-16.1.0) +echo Input "17" to change top keygeneration to 17 (>=FW 17.0.0) echo. ECHO ****************************************** echo Or Input "b" to return to the list options @@ -1091,7 +1095,7 @@ if /i "%bs%"=="f" set "vkey=-kp false" if /i "%bs%"=="0" set "vkey=-kp 0" if /i "%bs%"=="0" set "capRSV=--RSVcap 0" if /i "%bs%"=="1" set "vkey=-kp 1" -if /i "%bs%"=="1" set "capRSV=--RSVcap 65796" +if /i "%bs%"=="1" set "capRSV=--RSVcap 65536" if /i "%bs%"=="2" set "vkey=-kp 2" if /i "%bs%"=="2" set "capRSV=--RSVcap 201327002" if /i "%bs%"=="3" set "vkey=-kp 3" @@ -1116,6 +1120,14 @@ if /i "%bs%"=="12" set "vkey=-kp 12" if /i "%bs%"=="12" set "capRSV=--RSVcap 806354944" if /i "%bs%"=="13" set "vkey=-kp 13" if /i "%bs%"=="13" set "capRSV=--RSVcap 872415232" +if /i "%bs%"=="14" set "vkey=-kp 14" +if /i "%bs%"=="14" set "capRSV=--RSVcap 939524096" +if /i "%bs%"=="15" set "vkey=-kp 15" +if /i "%bs%"=="15" set "capRSV=--RSVcap 1006632960" +if /i "%bs%"=="16" set "vkey=-kp 16" +if /i "%bs%"=="16" set "capRSV=--RSVcap 1073741824" +if /i "%bs%"=="17" set "vkey=-kp 17" +if /i "%bs%"=="17" set "capRSV=--RSVcap 1140850688" if /i "%vkey%"=="none" echo WRONG CHOICE if /i "%vkey%"=="none" goto s_KeyChange_wrongchoice goto s_KeyChange_skip @@ -1879,7 +1891,7 @@ if /i "%bs%"=="0" goto m_KeyChange_skip :m_KeyChange_wrongchoice echo ******************************************************* -echo SET MAXIMUM KEYGENERATION\RSV ALOWED +echo SET MAXIMUM KEYGENERATION\RSV ALLOWED echo ******************************************************* echo Depending on your choice keygeneration and RSV will be echo lowered to the corresponding keygeneration range in case @@ -1891,7 +1903,7 @@ echo Input "f" to not change the keygeneration echo Input "0" to change top keygeneration to 0 (FW 1.0) echo Input "1" to change top keygeneration to 1 (FW 2.0-2.3) echo Input "2" to change top keygeneration to 2 (FW 3.0) -echo Input "3" to change top keygeneration to 3 (FW 3.0.1-3.02) +echo Input "3" to change top keygeneration to 3 (FW 3.0.1-3.0.2) echo Input "4" to change top keygeneration to 4 (FW 4.0.0-4.1.0) echo Input "5" to change top keygeneration to 5 (FW 5.0.0-5.1.0) echo Input "6" to change top keygeneration to 6 (FW 6.0.0-6.1.0) @@ -1901,7 +1913,11 @@ echo Input "9" to change top keygeneration to 9 (FW 8.1.0) echo Input "10" to change top keygeneration to 10 (FW 9.0.0-9.01) echo Input "11" to change top keygeneration to 11 (FW 9.1.0-11.0.3) echo Input "12" to change top keygeneration to 12 (FW 12.1.0) -echo Input "13" to change top keygeneration to 13 (>FW 13.0.0) +echo Input "13" to change top keygeneration to 13 (FW 13.0.0-13.2.1) +echo Input "14" to change top keygeneration to 14 (FW 14.0.0-14.1.2) +echo Input "15" to change top keygeneration to 15 (FW 15.0.0-15.0.1) +echo Input "16" to change top keygeneration to 16 (FW 16.0.0-16.1.0) +echo Input "17" to change top keygeneration to 17 (>=FW 17.0.0) echo. ECHO ***************************************** echo Or Input "b" to return to the option list @@ -1915,7 +1931,7 @@ if /i "%bs%"=="f" set "vkey=-kp false" if /i "%bs%"=="0" set "vkey=-kp 0" if /i "%bs%"=="0" set "capRSV=--RSVcap 0" if /i "%bs%"=="1" set "vkey=-kp 1" -if /i "%bs%"=="1" set "capRSV=--RSVcap 65796" +if /i "%bs%"=="1" set "capRSV=--RSVcap 65536" if /i "%bs%"=="2" set "vkey=-kp 2" if /i "%bs%"=="2" set "capRSV=--RSVcap 201327002" if /i "%bs%"=="3" set "vkey=-kp 3" @@ -1940,6 +1956,14 @@ if /i "%bs%"=="12" set "vkey=-kp 12" if /i "%bs%"=="12" set "capRSV=--RSVcap 806354944" if /i "%bs%"=="13" set "vkey=-kp 13" if /i "%bs%"=="13" set "capRSV=--RSVcap 872415232" +if /i "%bs%"=="14" set "vkey=-kp 14" +if /i "%bs%"=="14" set "capRSV=--RSVcap 939524096" +if /i "%bs%"=="15" set "vkey=-kp 15" +if /i "%bs%"=="15" set "capRSV=--RSVcap 1006632960" +if /i "%bs%"=="16" set "vkey=-kp 16" +if /i "%bs%"=="16" set "capRSV=--RSVcap 1073741824" +if /i "%bs%"=="17" set "vkey=-kp 17" +if /i "%bs%"=="17" set "capRSV=--RSVcap 1140850688" if /i "%vkey%"=="none" echo WRONG CHOICE if /i "%vkey%"=="none" goto m_KeyChange_wrongchoice diff --git a/py/zconfig/Regional bat/NSCB_KR.bat b/py/zconfig/Regional bat/NSCB_KR.bat index 952bd45f..ca3358cb 100644 --- a/py/zconfig/Regional bat/NSCB_KR.bat +++ b/py/zconfig/Regional bat/NSCB_KR.bat @@ -911,7 +911,7 @@ echo "f" 키 생성을 변경하지 않음 echo "0" 최상위 키 생성을 0으로 변경 (FW 1.0) echo "1" 최상위 키 생성을 1로 변경 (FW 2.0-2.3) echo "2" 최상위 키 생성을 2로 변경 (FW 3.0) -echo "3" 최상위 키 생성을 3으로 변경 (FW 3.0.1-3.02) +echo "3" 최상위 키 생성을 3으로 변경 (FW 3.0.1-3.0.2) echo "4" 최상위 키 생성을 4로 변경 (FW 4.0.0-4.1.0) echo "5" 최상위 키 생성을 5로 변경 (FW 5.0.0-5.1.0) echo "6" 최상위 키 생성을 6으로 변경 (FW 6.0.0-6.1.0) @@ -931,7 +931,7 @@ if /i "%bs%"=="f" set "vkey=-kp false" if /i "%bs%"=="0" set "vkey=-kp 0" if /i "%bs%"=="0" set "capRSV=--RSVcap 0" if /i "%bs%"=="1" set "vkey=-kp 1" -if /i "%bs%"=="1" set "capRSV=--RSVcap 65796" +if /i "%bs%"=="1" set "capRSV=--RSVcap 65536" if /i "%bs%"=="2" set "vkey=-kp 2" if /i "%bs%"=="2" set "capRSV=--RSVcap 201327002" if /i "%bs%"=="3" set "vkey=-kp 3" @@ -1606,7 +1606,7 @@ echo "f" 키 생성을 변경하지 않음 echo "0" 최상위 키 생성을 0으로 변경 (FW 1.0) echo "1" 최상위 키 생성을 1로 변경 (FW 2.0-2.3) echo "2" 최상위 키 생성을 2로 변경 (FW 3.0) -echo "3" 최상위 키 생성을 3으로 변경 (FW 3.0.1-3.02) +echo "3" 최상위 키 생성을 3으로 변경 (FW 3.0.1-3.0.2) echo "4" 최상위 키 생성을 4으로 변경 (FW 4.0.0-4.1.0) echo "5" 최상위 키 생성을 5로 변경 (FW 5.0.0-5.1.0) echo "6" 최상위 키 생성을 6으로 변경 (FW 6.0.0-6.1.0) @@ -1626,7 +1626,7 @@ if /i "%bs%"=="f" set "vkey=-kp false" if /i "%bs%"=="0" set "vkey=-kp 0" if /i "%bs%"=="0" set "capRSV=--RSVcap 0" if /i "%bs%"=="1" set "vkey=-kp 1" -if /i "%bs%"=="1" set "capRSV=--RSVcap 65796" +if /i "%bs%"=="1" set "capRSV=--RSVcap 65536" if /i "%bs%"=="2" set "vkey=-kp 2" if /i "%bs%"=="2" set "capRSV=--RSVcap 201327002" if /i "%bs%"=="3" set "vkey=-kp 3" diff --git a/py/ztools/LEGACY.bat b/py/ztools/LEGACY.bat index f56897f1..5c40ffa1 100644 --- a/py/ztools/LEGACY.bat +++ b/py/ztools/LEGACY.bat @@ -545,7 +545,7 @@ if /i "%bs%"=="0" goto s_KeyChange_skip :s_KeyChange_wrongchoice echo ******************************************************* -echo SET MAXIMUM KEYGENERATION\RSV ALOWED +echo SET MAXIMUM KEYGENERATION\RSV ALLOWED echo ******************************************************* echo Depending on your choice keygeneration and RSV will be echo lowered to the corresponding keygeneration range in case @@ -557,7 +557,7 @@ echo Input "f" to not change the keygeneration echo Input "0" to change top keygeneration to 0 (FW 1.0) echo Input "1" to change top keygeneration to 1 (FW 2.0-2.3) echo Input "2" to change top keygeneration to 2 (FW 3.0) -echo Input "3" to change top keygeneration to 3 (FW 3.0.1-3.02) +echo Input "3" to change top keygeneration to 3 (FW 3.0.1-3.0.2) echo Input "4" to change top keygeneration to 4 (FW 4.0.0-4.1.0) echo Input "5" to change top keygeneration to 5 (FW 5.0.0-5.1.0) echo Input "6" to change top keygeneration to 6 (FW 6.0.0-6.1.0) @@ -567,7 +567,11 @@ echo Input "9" to change top keygeneration to 9 (FW 8.1.0) echo Input "10" to change top keygeneration to 10 (FW 9.0.0-9.01) echo Input "11" to change top keygeneration to 11 (FW 9.1.0-11.0.3) echo Input "12" to change top keygeneration to 12 (FW 12.1.0) -echo Input "13" to change top keygeneration to 13 (>FW 13.0.0) +echo Input "13" to change top keygeneration to 13 (FW 13.0.0-13.2.1) +echo Input "14" to change top keygeneration to 14 (FW 14.0.0-14.1.2) +echo Input "15" to change top keygeneration to 15 (FW 15.0.0-15.0.1) +echo Input "16" to change top keygeneration to 16 (FW 16.0.0-16.1.0) +echo Input "17" to change top keygeneration to 17 (>=FW 17.0.0) echo. ECHO ****************************************** echo Or Input "b" to return to the list options @@ -581,7 +585,7 @@ if /i "%bs%"=="f" set "vkey=-kp false" if /i "%bs%"=="0" set "vkey=-kp 0" if /i "%bs%"=="0" set "capRSV=--RSVcap 0" if /i "%bs%"=="1" set "vkey=-kp 1" -if /i "%bs%"=="1" set "capRSV=--RSVcap 65796" +if /i "%bs%"=="1" set "capRSV=--RSVcap 65536" if /i "%bs%"=="2" set "vkey=-kp 2" if /i "%bs%"=="2" set "capRSV=--RSVcap 201327002" if /i "%bs%"=="3" set "vkey=-kp 3" @@ -606,6 +610,14 @@ if /i "%bs%"=="12" set "vkey=-kp 12" if /i "%bs%"=="12" set "capRSV=--RSVcap 806354944" if /i "%bs%"=="13" set "vkey=-kp 13" if /i "%bs%"=="13" set "capRSV=--RSVcap 872415232" +if /i "%bs%"=="14" set "vkey=-kp 14" +if /i "%bs%"=="14" set "capRSV=--RSVcap 939524096" +if /i "%bs%"=="15" set "vkey=-kp 15" +if /i "%bs%"=="15" set "capRSV=--RSVcap 1006632960" +if /i "%bs%"=="16" set "vkey=-kp 16" +if /i "%bs%"=="16" set "capRSV=--RSVcap 1073741824" +if /i "%bs%"=="17" set "vkey=-kp 17" +if /i "%bs%"=="17" set "capRSV=--RSVcap 1140850688" if /i "%vkey%"=="none" echo WRONG CHOICE if /i "%vkey%"=="none" goto s_KeyChange_wrongchoice @@ -967,7 +979,7 @@ if /i "%bs%"=="0" goto m_KeyChange_skip :m_KeyChange_wrongchoice echo ******************************************************* -echo SET MAXIMUM KEYGENERATION\RSV ALOWED +echo SET MAXIMUM KEYGENERATION\RSV ALLOWED echo ******************************************************* echo Depending on your choice keygeneration and RSV will be echo lowered to the corresponding keygeneration range in case @@ -979,7 +991,7 @@ echo Input "f" to not change the keygeneration echo Input "0" to change top keygeneration to 0 (FW 1.0) echo Input "1" to change top keygeneration to 1 (FW 2.0-2.3) echo Input "2" to change top keygeneration to 2 (FW 3.0) -echo Input "3" to change top keygeneration to 3 (FW 3.0.1-3.02) +echo Input "3" to change top keygeneration to 3 (FW 3.0.1-3.0.2) echo Input "4" to change top keygeneration to 4 (FW 4.0.0-4.1.0) echo Input "5" to change top keygeneration to 5 (FW 5.0.0-5.1.0) echo Input "6" to change top keygeneration to 6 (FW 6.0.0-6.1.0) @@ -989,7 +1001,11 @@ echo Input "9" to change top keygeneration to 9 (FW 8.1.0) echo Input "10" to change top keygeneration to 10 (FW 9.0.0-9.01) echo Input "11" to change top keygeneration to 11 (FW 9.1.0-11.0.3) echo Input "12" to change top keygeneration to 12 (FW 12.1.0) -echo Input "13" to change top keygeneration to 13 (>FW 13.0.0) +echo Input "13" to change top keygeneration to 13 (FW 13.0.0-13.2.1) +echo Input "14" to change top keygeneration to 14 (FW 14.0.0-14.1.2) +echo Input "15" to change top keygeneration to 15 (FW 15.0.0-15.0.1) +echo Input "16" to change top keygeneration to 16 (FW 16.0.0-16.1.0) +echo Input "17" to change top keygeneration to 17 (>=FW 17.0.0) echo. ECHO ***************************************** echo Or Input "b" to return to the option list @@ -1003,7 +1019,7 @@ if /i "%bs%"=="f" set "vkey=-kp false" if /i "%bs%"=="0" set "vkey=-kp 0" if /i "%bs%"=="0" set "capRSV=--RSVcap 0" if /i "%bs%"=="1" set "vkey=-kp 1" -if /i "%bs%"=="1" set "capRSV=--RSVcap 65796" +if /i "%bs%"=="1" set "capRSV=--RSVcap 65536" if /i "%bs%"=="2" set "vkey=-kp 2" if /i "%bs%"=="2" set "capRSV=--RSVcap 201327002" if /i "%bs%"=="3" set "vkey=-kp 3" @@ -1028,6 +1044,14 @@ if /i "%bs%"=="12" set "vkey=-kp 12" if /i "%bs%"=="12" set "capRSV=--RSVcap 806354944" if /i "%bs%"=="13" set "vkey=-kp 13" if /i "%bs%"=="13" set "capRSV=--RSVcap 872415232" +if /i "%bs%"=="14" set "vkey=-kp 14" +if /i "%bs%"=="14" set "capRSV=--RSVcap 939524096" +if /i "%bs%"=="15" set "vkey=-kp 15" +if /i "%bs%"=="15" set "capRSV=--RSVcap 1006632960" +if /i "%bs%"=="16" set "vkey=-kp 16" +if /i "%bs%"=="16" set "capRSV=--RSVcap 1073741824" +if /i "%bs%"=="17" set "vkey=-kp 17" +if /i "%bs%"=="17" set "capRSV=--RSVcap 1140850688" if /i "%vkey%"=="none" echo WRONG CHOICE if /i "%vkey%"=="none" goto m_KeyChange_wrongchoice @@ -1797,7 +1821,7 @@ if /i "%bs%"=="0" goto upd_KeyChange_skip :upd_KeyChange_wrongchoice echo ******************************************************* -echo SET MAXIMUM KEYGENERATION\RSV ALOWED +echo SET MAXIMUM KEYGENERATION\RSV ALLOWED echo ******************************************************* echo Depending on your choice keygeneration and RSV will be echo lowered to the corresponding keygeneration range in case @@ -1809,7 +1833,7 @@ echo Input "f" to not change the keygeneration echo Input "0" to change top keygeneration to 0 (FW 1.0) echo Input "1" to change top keygeneration to 1 (FW 2.0-2.3) echo Input "2" to change top keygeneration to 2 (FW 3.0) -echo Input "3" to change top keygeneration to 3 (FW 3.0.1-3.02) +echo Input "3" to change top keygeneration to 3 (FW 3.0.1-3.0.2) echo Input "4" to change top keygeneration to 4 (FW 4.0.0-4.1.0) echo Input "5" to change top keygeneration to 5 (FW 5.0.0-5.1.0) echo Input "6" to change top keygeneration to 6 (FW 6.0.0-6.1.0) @@ -1819,7 +1843,11 @@ echo Input "9" to change top keygeneration to 9 (FW 8.1.0) echo Input "10" to change top keygeneration to 10 (FW 9.0.0-9.01) echo Input "11" to change top keygeneration to 11 (FW 9.1.0-11.0.3) echo Input "12" to change top keygeneration to 12 (FW 12.1.0) -echo Input "13" to change top keygeneration to 13 (>FW 13.0.0) +echo Input "13" to change top keygeneration to 13 (FW 13.0.0-13.2.1) +echo Input "14" to change top keygeneration to 14 (FW 14.0.0-14.1.2) +echo Input "15" to change top keygeneration to 15 (FW 15.0.0-15.0.1) +echo Input "16" to change top keygeneration to 16 (FW 16.0.0-16.1.0) +echo Input "17" to change top keygeneration to 17 (>=FW 17.0.0) echo. ECHO ****************************************** echo Or Input "b" to return to the list options @@ -1833,7 +1861,7 @@ if /i "%bs%"=="f" set "vkey=-kp false" if /i "%bs%"=="0" set "vkey=-kp 0" if /i "%bs%"=="0" set "capRSV=--RSVcap 0" if /i "%bs%"=="1" set "vkey=-kp 1" -if /i "%bs%"=="1" set "capRSV=--RSVcap 65796" +if /i "%bs%"=="1" set "capRSV=--RSVcap 65536" if /i "%bs%"=="2" set "vkey=-kp 2" if /i "%bs%"=="2" set "capRSV=--RSVcap 201327002" if /i "%bs%"=="3" set "vkey=-kp 3" @@ -1858,6 +1886,14 @@ if /i "%bs%"=="12" set "vkey=-kp 12" if /i "%bs%"=="12" set "capRSV=--RSVcap 806354944" if /i "%bs%"=="13" set "vkey=-kp 13" if /i "%bs%"=="13" set "capRSV=--RSVcap 872415232" +if /i "%bs%"=="14" set "vkey=-kp 14" +if /i "%bs%"=="14" set "capRSV=--RSVcap 939524096" +if /i "%bs%"=="15" set "vkey=-kp 15" +if /i "%bs%"=="15" set "capRSV=--RSVcap 1006632960" +if /i "%bs%"=="16" set "vkey=-kp 16" +if /i "%bs%"=="16" set "capRSV=--RSVcap 1073741824" +if /i "%bs%"=="17" set "vkey=-kp 17" +if /i "%bs%"=="17" set "capRSV=--RSVcap 1140850688" if /i "%vkey%"=="none" echo WRONG CHOICE if /i "%vkey%"=="none" goto m_KeyChange_wrongchoice diff --git a/py/ztools/NSCB_config.bat b/py/ztools/NSCB_config.bat index b91e6e99..b262726b 100644 --- a/py/ztools/NSCB_config.bat +++ b/py/ztools/NSCB_config.bat @@ -224,7 +224,7 @@ echo Input "f" to not change the keygeneration echo Input "0" to change top keygeneration to 0 (FW 1.0) echo Input "1" to change top keygeneration to 1 (FW 2.0-2.3) echo Input "2" to change top keygeneration to 2 (FW 3.0) -echo Input "3" to change top keygeneration to 3 (FW 3.0.1-3.02) +echo Input "3" to change top keygeneration to 3 (FW 3.0.1-3.0.2) echo Input "4" to change top keygeneration to 4 (FW 4.0.0-4.1.0) echo Input "5" to change top keygeneration to 5 (FW 5.0.0-5.1.0) echo Input "6" to change top keygeneration to 6 (FW 6.0.0-6.1.0) @@ -234,7 +234,11 @@ echo Input "9" to change top keygeneration to 9 (FW 8.1.0) echo Input "10" to change top keygeneration to 10 (FW 9.0.0-9.01) echo Input "11" to change top keygeneration to 11 (FW 9.1.0-11.0.3) echo Input "12" to change top keygeneration to 12 (FW 12.1.0) -echo Input "13" to change top keygeneration to 13 (>FW 13.0.0) +echo Input "13" to change top keygeneration to 13 (FW 13.0.0-13.2.1) +echo Input "14" to change top keygeneration to 14 (FW 14.0.0-14.1.2) +echo Input "15" to change top keygeneration to 15 (FW 15.0.0-15.0.1) +echo Input "16" to change top keygeneration to 16 (FW 16.0.0-16.1.0) +echo Input "17" to change top keygeneration to 17 (>=FW 17.0.0) echo. echo Input "b" to return to AUTO-MODE - CONFIGURATION echo Input "c" to return to CONFIG MENU @@ -248,7 +252,7 @@ if /i "%bs%"=="f" set "v_KGEN=-kp false" if /i "%bs%"=="0" set "v_KGEN=-kp 0" if /i "%bs%"=="0" set "v_CAPRSV=--RSVcap 0" if /i "%bs%"=="1" set "v_KGEN=-kp 1" -if /i "%bs%"=="1" set "v_CAPRSV=--RSVcap 65796" +if /i "%bs%"=="1" set "v_CAPRSV=--RSVcap 65536" if /i "%bs%"=="2" set "v_KGEN=-kp 2" if /i "%bs%"=="2" set "v_CAPRSV=--RSVcap 201327002" if /i "%bs%"=="3" set "v_KGEN=-kp 3" @@ -271,8 +275,16 @@ if /i "%bs%"=="11" set "v_KGEN=-kp 11" if /i "%bs%"=="11" set "v_CAPRSV=--RSVcap 605028352" if /i "%bs%"=="12" set "v_KGEN=-kp 12" if /i "%bs%"=="12" set "v_CAPRSV=--RSVcap 806354944" -if /i "%bs%"=="13" set "vkey=-kp 13" -if /i "%bs%"=="13" set "capRSV=--RSVcap 872415232" +if /i "%bs%"=="13" set "v_KGEN=-kp 13" +if /i "%bs%"=="13" set "v_CAPRSV=--RSVcap 872415232" +if /i "%bs%"=="14" set "v_KGEN=-kp 14" +if /i "%bs%"=="14" set "v_CAPRSV=--RSVcap 939524096" +if /i "%bs%"=="15" set "v_KGEN=-kp 15" +if /i "%bs%"=="15" set "v_CAPRSV=--RSVcap 1006632960" +if /i "%bs%"=="16" set "v_KGEN=-kp 16" +if /i "%bs%"=="16" set "v_CAPRSV=--RSVcap 1073741824" +if /i "%bs%"=="17" set "v_KGEN=-kp 17" +if /i "%bs%"=="17" set "v_CAPRSV=--RSVcap 1140850688" if /i "%bs%"=="b" goto sc2 if /i "%bs%"=="c" goto sc1 diff --git a/py/ztools/_EEL_/__init__.py b/py/ztools/_EEL_/__init__.py index f9731ce8..0a35925f 100644 --- a/py/ztools/_EEL_/__init__.py +++ b/py/ztools/_EEL_/__init__.py @@ -312,7 +312,9 @@ def _process_message(message, ws): error_info['errorText'] = repr(e) error_info['errorTraceback'] = err_traceback _repeated_send(ws, _safe_json({ 'return': message['call'], - 'value': return_val })) + 'status': status, + 'value': return_val, + 'error': error_info,})) elif 'return' in message: call_id = message['return'] if call_id in _call_return_callbacks: diff --git a/py/ztools/bin/nscb_mtp.exe b/py/ztools/bin/nscb_mtp.exe index a24efd85..d1d5b88a 100644 Binary files a/py/ztools/bin/nscb_mtp.exe and b/py/ztools/bin/nscb_mtp.exe differ diff --git a/py/ztools/keys_template.txt b/py/ztools/keys_template.txt index c11a9e9e..8e58a4f1 100644 --- a/py/ztools/keys_template.txt +++ b/py/ztools/keys_template.txt @@ -19,6 +19,10 @@ master_key_09 = master_key_0a = master_key_0b = master_key_0c = +master_key_0d = +master_key_0e = +master_key_0f = +master_key_10 = header_key = diff --git a/py/ztools/lib/nutdb.py b/py/ztools/lib/nutdb.py index b1b81f30..ae8c892d 100644 --- a/py/ztools/lib/nutdb.py +++ b/py/ztools/lib/nutdb.py @@ -581,7 +581,8 @@ def consolidate_versiondb(): tid=str(row[id]).upper() v_=str(row[ver]) if v_=="" and tid.endswith('800'): - v_=65536 + continue + # v_=65536 elif v_=="": v_=0 if tid.endswith('800'): @@ -600,7 +601,8 @@ def consolidate_versiondb(): tid=tid[:-3]+'000' for j in (data[i]).keys(): if j=="" and i.endswith('800'): - j=65536 + continue + # j=65536 elif j=="": j=0 try: @@ -623,13 +625,16 @@ def consolidate_versiondb(): try: j=entry['version'] except: - j=65536 + continue + # j=65536 else: try: j=entry['version'] except: j=0 try: + if j is None: + continue if not tid in ver_txt_dict: ver_txt_dict[tid]=j else: @@ -649,7 +654,8 @@ def consolidate_versiondb(): try: j=version except: - j=65536 + continue + # j=65536 else: try: j=version @@ -674,7 +680,7 @@ def consolidate_versiondb(): if not updid in newdict: newdict[i]='0' newdict[updid]=v_ - ver_txt_dict=newdict + ver_txt_dict=newdict for i in data: tid=i.upper() if i.endswith('000'): diff --git a/py/ztools/lib/sq_tools.py b/py/ztools/lib/sq_tools.py index 66a55fe5..c33173a3 100644 --- a/py/ztools/lib/sq_tools.py +++ b/py/ztools/lib/sq_tools.py @@ -16,71 +16,98 @@ tabs = '\t' * indent ''' versions = - 0: "1.0.0", -> keygeneration = 0 - 450: "1.0.0", -> keygeneration = 0 - 65536: "2.0.0", -> keygeneration = 1 - 131072: "2.1.0", -> keygeneration = 1 - 196608: "2.2.0", -> keygeneration = 1 - 262144: "2.3.0", -> keygeneration = 1 - 201326592: "3.0.0", -> keygeneration = 2 - 201392128: "3.0.1", -> keygeneration = 3 - 201457664: "3.0.2", -> keygeneration = 3 - 268435456: "4.0.0", -> keygeneration = 4 - 268500992: "4.0.1", -> keygeneration = 4 - 269484032: "4.1.0", -> keygeneration = 4 - 335544320: "5.0.0", -> keygeneration = 5 - 335609856: "5.0.1", -> keygeneration = 5 - 335675392: "5.0.2", -> keygeneration = 5 - 336592896: "5.1.0", -> keygeneration = 5 - 402653184: "6.0.0", -> keygeneration = 6 - 402718720: "6.0.1", -> keygeneration = 6 - 403701760: "6.1.0", -> keygeneration = 6 - 404750336: "6.2.0" -> keygeneration = 7 - 469762048: "7.0.0" -> keygeneration = 8 - 469827584: "7.0.1" -> keygeneration = 8 - 536870912: "8.0.0" -> keygeneration = 8 - 536936448: "8.0.1" -> keygeneration = 8 - 537919488: "8.1.0" -> keygeneration = 9 - 603979776: "9.0.0" -> keygeneration = 10 - 604045312: "9.0.1" -> keygeneration = 10 - 605028352: "9.1.0" -> keygeneration = 11 - 606076928: "9.2.0" -> keygeneration = 11 - 671088640: "10.0.0" -> keygeneration = 11 - 671154176: "10.0.1" -> keygeneration = 11 - 671219712: "10.0.2" -> keygeneration = 11 - 671285248: "10.0.3" -> keygeneration = 11 - 671350784: "10.0.4" -> keygeneration = 11 - 672137216: "10.1.0" -> keygeneration = 11 - 672202752: "10.1.1" -> keygeneration = 11 - 673185792: "10.2.0" -> keygeneration = 11 - 738197504: "11.0.0" -> keygeneration = 11 - 738263040: "11.0.1" -> keygeneration = 11 - 805306368: "12.0.0" -> keygeneration = 11 - 805371904: "12.0.1" -> keygeneration = 11 - 805437440: "12.0.2" -> keygeneration = 11 - 805502976: "12.0.3" -> keygeneration = 11 - 806354944: "12.1.0" -> keygeneration = 12 - 872415232: "13.0.0" -> keygeneration = 13 - 873463808: "13.1.0" -> keygeneration = 13 - 874512404: "13.2.0" -> keygeneration = 13 - 874578000: "13.2.1" -> keygeneration = 13 + 0: "1.0.0", -> keygeneration = 0 + 450: "1.0.0", -> keygeneration = 0 + 65536: "2.0.0", -> keygeneration = 1 + 131072: "2.1.0", -> keygeneration = 1 + 196608: "2.2.0", -> keygeneration = 1 + 262144: "2.3.0", -> keygeneration = 1 + 201326592: "3.0.0", -> keygeneration = 2 + 201392128: "3.0.1", -> keygeneration = 3 + 201457664: "3.0.2", -> keygeneration = 3 + 268435456: "4.0.0", -> keygeneration = 4 + 268500992: "4.0.1", -> keygeneration = 4 + 269484032: "4.1.0", -> keygeneration = 4 + 335544320: "5.0.0", -> keygeneration = 5 + 335609856: "5.0.1", -> keygeneration = 5 + 335675392: "5.0.2", -> keygeneration = 5 + 336592896: "5.1.0", -> keygeneration = 5 + 402653184: "6.0.0", -> keygeneration = 6 + 402718720: "6.0.1", -> keygeneration = 6 + 403701760: "6.1.0", -> keygeneration = 6 + 404750336: "6.2.0" -> keygeneration = 7 + 469762048: "7.0.0" -> keygeneration = 8 + 469827584: "7.0.1" -> keygeneration = 8 + 536870912: "8.0.0" -> keygeneration = 8 + 536936448: "8.0.1" -> keygeneration = 8 + 537919488: "8.1.0" -> keygeneration = 9 + 603979776: "9.0.0" -> keygeneration = 10 + 604045312: "9.0.1" -> keygeneration = 10 + 605028352: "9.1.0" -> keygeneration = 11 + 606076928: "9.2.0" -> keygeneration = 11 + 671088640: "10.0.0" -> keygeneration = 11 + 671154176: "10.0.1" -> keygeneration = 11 + 671219712: "10.0.2" -> keygeneration = 11 + 671285248: "10.0.3" -> keygeneration = 11 + 671350784: "10.0.4" -> keygeneration = 11 + 672137216: "10.1.0" -> keygeneration = 11 + 672202752: "10.1.1" -> keygeneration = 11 + 673185792: "10.2.0" -> keygeneration = 11 + 738197504: "11.0.0" -> keygeneration = 11 + 738263040: "11.0.1" -> keygeneration = 11 + 805306368: "12.0.0" -> keygeneration = 11 + 805371904: "12.0.1" -> keygeneration = 11 + 805437440: "12.0.2" -> keygeneration = 11 + 805502976: "12.0.3" -> keygeneration = 11 + 806354944: "12.1.0" -> keygeneration = 12 + 872415232: "13.0.0" -> keygeneration = 13 + 873463808: "13.1.0" -> keygeneration = 13 + 874512404: "13.2.0" -> keygeneration = 13 + 874578000: "13.2.1" -> keygeneration = 13 + 939524096: "14.0.0" -> keygeneration = 14 + 940572672: "14.1.0" -> keygeneration = 14 + 940638208: "14.1.1" -> keygeneration = 14 + 940703744: "14.1.2" -> keygeneration = 14 + 1006632960: "15.0.0" -> keygeneration = 15 + 1006698496: "15.0.1" -> keygeneration = 15 ''' +versions_list=[ + ["17.0.0","17.0.1"], + ["16.0.0","16.0.1","16.0.2","16.0.3","16.1.0"], + ["15.0.0","15.0.1"], + ["14.0.0","14.1.0","14.1.1","14.1.2"], + ["13.0.0","13.1.0","13.2.0","13.2.1"], + ["12.1.0"], + ["9.1.0","9.2.0","10.0.0","10.0.1","10.0.2","10.0.3","10.0.4","10.1.0","10.1.1","10.2.0","11.0.0","11.0.1","12.0.0","12.0.1","12.0.2","12.0.3"], + ["9.0.0","9.0.1"], + ["8.1.0"], + ["7.0.0","7.0.1","8.0.0","8.0.1"], + ["6.2.0"], + ["6.0.0","6.0.1","6.1.0"], + ["5.0.0","5.0.1","5.0.2","5.1.0"], + ["4.0.0","4.0.1","4.1.0"], + ["3.0.1","3.0.2"], + ["3.0.0"], + ["2.0.0","2.1.0","2.2.0","2.3.0"], + ["1.0.0"] +] + +kg_strings= [] + def kgstring(): + global kg_strings + if len(kg_strings) > 0: + return kg_strings kg=list() - kg13=[872415232,873463808,874512404,874578000];kg.append(kg13) - kg12=[806354944];kg.append(kg12) - kg11=[605028352,606076928,671088640,671154176,671219712,671285248,671350784,672137216,672202752,673185792,738197504,738263040,805306368,805371904,805437440,805502976];kg.append(kg11) - kg10=[603979776,604045312];kg.append(kg10) - kg9=[537919488];kg.append(kg9) - kg8=[536936448,536870912,469827584,469762048];kg.append(kg8) - kg7=[404750336];kg.append(kg7) - kg6=[403701760,402718720,402653184];kg.append(kg6) - kg5=[336592896,335675392,335609856,335544320];kg.append(kg5) - kg4=[269484032,268500992,268435456];kg.append(kg4) - kg3=[201457664,201392128];kg.append(kg3) - kg2=[201326592];kg.append(kg2) - kg1=[262144,196608,131072,65536];kg.append(kg1) - kg0=[450,0];kg.append(kg0) + for i in range(len(versions_list)-1): + RSVs=[] + for j in range(len(versions_list[i])): + ver=versions_list[i][j] + RSV,RRSV=transform_fw_string(ver) + RSVs.append(RSV) + kg.append(RSVs) + kg.append([0,450]) # 1.0.0 + kg_strings=kg return kg def kg_by_RSV(RSV): @@ -113,7 +140,7 @@ def transform_fw_string(FW): elif i==1 and int(FW[0])>3: RSV+=1048576*n elif i==1 and int(FW[0])==2: - RSV+=1*n + RSV+=65536*n elif i==2 and int(FW[0])>3: RSV+=65536*n RRSV=RSV+rem @@ -126,109 +153,29 @@ def kg2masterkey(kg): return kg-1 def getTopRSV(keygeneration, RSV): - if keygeneration == 0: - return 450 - if keygeneration == 1: - return 262164 - if keygeneration == 2: - return 201327002 - if keygeneration == 3: - return 201457684 - if keygeneration == 4: - return 269484082 - if keygeneration == 5: - return 336592976 - if keygeneration == 6: - return 403701850 - if keygeneration == 7: - return 404750376 - if keygeneration == 8: - return 536936448 - if keygeneration == 9: - return 537919488 - if keygeneration == 10: - return 603979776 - if keygeneration == 11: - return 605028352 - if keygeneration == 12: - return 806354944 - if keygeneration == 13: - return 872415232 - else: - return RSV + kgs = kgstring() + idx = len(versions_list)-1-keygeneration + if keygeneration < len(kgs): + return kgs[idx][len(kgs[idx])-1] + return RSV def getMinRSV(keygeneration, RSV): - if keygeneration == 0: - return 0 - if keygeneration == 1: - return 65796 - if keygeneration == 2: - RSV=3*67108864 - return RSV - if keygeneration == 3: - RSV=3*67108864+1*65536 - return RSV - if keygeneration == 4: - RSV=4*67108864 - return RSV - if keygeneration == 5: - RSV=5*67108864 - return RSV - if keygeneration == 6: - RSV=6*67108864 - return RSV - if keygeneration == 7: - RSV=6*67108864+2*1048576 - return RSV - if keygeneration == 8: - RSV=7*67108864 - return RSV - if keygeneration == 9: - RSV=8*67108864+1*1048576 - return RSV - if keygeneration == 10: - RSV=9*67108864 - return RSV - if keygeneration == 11: - RSV=9*67108864+2*1048576+0*65796+0*1 - return RSV - if keygeneration == 11: - RSV=12*67108864+1*1048576+0*65796+0*1 - return RSV - else: - return RSV + kgs = kgstring() + idx = len(kgs)-1-keygeneration + if keygeneration < len(kgs): + return kgs[idx][0] + return RSV def getFWRangeKG(keygeneration): - if keygeneration == 0: - return "(1.0.0)" - if keygeneration == 1: - return "(2.0.0 - 2.3.0)" - if keygeneration == 2: - return "(3.0.0)" - if keygeneration == 3: - return "(3.0.1 - 3.0.2)" - if keygeneration == 4: - return "(4.0.0 - 4.1.0)" - if keygeneration == 5: - return "(5.0.0 - 5.1.0)" - if keygeneration == 6: - return "(6.0.0 - 6.1.0)" - if keygeneration == 7: - return "(6.2.0)" - if keygeneration == 8: - return "(7.0.0 - 8.0.1)" - if keygeneration == 9: - return "(8.1.0)" - if keygeneration == 10: - return "(9.0.0 - 9.0.1)" - if keygeneration == 11: - return "(9.1.0 - 12.0.3)" - if keygeneration == 12: - return "(12.1.0)" - if keygeneration == 13: - return "(>= 13.0.0)" - else: - return "UNKNOWN" + idx = len(versions_list)-1-keygeneration + if keygeneration < len(versions_list)-1: + if len(versions_list[idx])>1: + return "("+versions_list[idx][0]+" - "+versions_list[idx][len(versions_list[idx])-1]+")" + else: + return "("+versions_list[idx][0]+")" + if keygeneration == len(versions_list)-1: + return "(>= "+versions_list[idx][0]+")" + return "UNKNOWN" def getmetacontenttype(ncatypenumber): ncatypenumber=int(ncatypenumber) diff --git a/py/ztools/mtp/mtpinstaller.py b/py/ztools/mtp/mtpinstaller.py index 5f5ea63c..b747fef0 100644 --- a/py/ztools/mtp/mtpinstaller.py +++ b/py/ztools/mtp/mtpinstaller.py @@ -12,6 +12,7 @@ from mtp.wpd import is_switch_connected import listmanager import csv +import copy from colorama import Fore, Back, Style from python_pick import pick from python_pick import Picker @@ -80,6 +81,35 @@ def About(): print('Cheats and Eshop information from nutdb and http://tinfoil.io ') print('------------------------------------------------------------------------------------- ') +#One CJK character is 2 English characters wide when printed +def display_len(s:str): + cnt=0 + for c in s: + if len(c.encode('utf-8'))>=3: # CJK character take >=3 bytes in utf-8 + cnt+=2 + else: + cnt+=1 + return cnt + +def pretty_str(name:str,name_length=40): + g0=copy.copy(name) + if display_len(g0)>name_length+3: + cnt=0 + short_g0='' + for i in range(len(g0)): + if cnt+display_len(g0[i])<=name_length: + cnt+=display_len(g0[i]) + short_g0+=g0[i] + else: + break + g0=short_g0 + if cnt33: - g0=g0[0:30]+'...' - else: - g0=g0+((33-len(g0))*' ') + g0=pretty_str(g0) verprint=str(fileversion) if len(verprint)<9: verprint=verprint+((9-len(verprint))*' ') if excludehb==True: if not fileid.startswith('05') and not fileid.startswith('04') and not str(fileid).lower()=='unknown': if g.endswith('.xci') or g.endswith('.xc0'): - print(f"{g0}|{fileid}|{verprint}|XCI|{nG}G|{nU}U|{nD}D") + print(f"{g0} |{fileid}|{verprint}|XCI|{nG}G|{nU}U|{nD}D") else: - print(f"{g0}|{fileid}|{verprint}|{cctag}") + print(f"{g0} |{fileid}|{verprint}|{cctag}") else: if g.endswith('.xci') or g.endswith('.xc0'): - print(f"{g0}|{fileid}|{verprint}|XCI|{nG}G|{nU}U|{nD}D") + print(f"{g0} |{fileid}|{verprint}|XCI|{nG}G|{nU}U|{nD}D") else: - print(f"{g0}|{fileid}|{verprint}|{cctag}") + print(f"{g0} |{fileid}|{verprint}|{cctag}") except:pass if search_new==True: import nutdb @@ -587,10 +613,7 @@ def get_installed_info(tfile=None,search_new=True,excludehb=True,exclude_xci=Fal print("..........................................................") for k in installed.keys(): fileid,fileversion,cctag,nG,nU,nD,baseid,g0,g=installed[k] - if len(g0)>33: - g0=g0[0:30]+'...' - else: - g0=g0+((33-len(g0))*' ') + g0=pretty_str(g0) verprint=str(fileversion) fillver='' if len(verprint)<6: @@ -640,10 +663,7 @@ def get_installed_info(tfile=None,search_new=True,excludehb=True,exclude_xci=Fal entry.append(k) xci_dlcs[baseid]=entry continue - if len(g0)>33: - g0=g0[0:30]+'...' - else: - g0=g0+((33-len(g0))*' ') + g0=pretty_str(g0) print(f"{g0} [{baseid}] -> "+forecombo+ f"[{k}] [v{versiondict[k]}]"+Style.RESET_ALL) t=0 if check_xcis==True: @@ -657,10 +677,7 @@ def get_installed_info(tfile=None,search_new=True,excludehb=True,exclude_xci=Fal print("XCI MAY HAVE NEW DLCS. LISTING AVAILABLE") print("..........................................................") t+=1 - if len(g0)>33: - g0=g0[0:30]+'...' - else: - g0=g0+((33-len(g0))*' ') + g0=pretty_str(g0) for k in xci_dlcs[baseid]: print(f"{g0} [{baseid}] -> "+forecombo+ f"[{k}] [v{versiondict[k]}]"+Style.RESET_ALL) @@ -715,10 +732,9 @@ def get_archived_info(search_new=True,excludehb=True,exclude_xci=False): print("..........................................................") for g in dbi_dict.keys(): if not g in installed.keys(): - tid,version,name=dbi_dict[g] - if len(name)>33: - name=name[0:30]+'...' - print(f"{name} [{tid}][{version}]") + tid,version,g0=dbi_dict[g] + g0=pretty_str(g0) + print(f"{g0} [{tid}][{version}]") if search_new==True: import nutdb nutdb.check_other_file(urlconfig,'versions_txt') @@ -757,10 +773,7 @@ def get_archived_info(search_new=True,excludehb=True,exclude_xci=False): print("..........................................................") for k in dbi_dict.keys(): fileid,fileversion,g0=dbi_dict[k] - if len(g0)>33: - g0=g0[0:30]+'...' - else: - g0=g0+(33-len(g0))*' ' + g0=pretty_str(g0) verprint=str(fileversion) fillver='' if len(verprint)<6: @@ -799,10 +812,7 @@ def get_archived_info(search_new=True,excludehb=True,exclude_xci=False): updid=baseid[:-3]+'800' if baseid in dbi_dict.keys() or updid in dbi_dict.keys(): fileid,fileversion,g0=dbi_dict[baseid] - if len(g0)>33: - g0=g0[0:30]+'...' - else: - g0=g0+((33-len(g0))*' ') + g0=pretty_str(g0) print(f"{g0} [{baseid}] -> "+forecombo+ f"[{k}] [v{versiondict[k]}]"+Style.RESET_ALL)