From 16fe7c2a7cf6c2aaa8c468bf831047bf3177eb9a Mon Sep 17 00:00:00 2001 From: Michael Zillgith Date: Wed, 17 Jun 2015 15:51:27 +0200 Subject: [PATCH] - fixed bug in range of GOOSE APPID --- tools/model_generator/genconfig.jar | Bin 75191 -> 75191 bytes tools/model_generator/genmodel.jar | Bin 74668 -> 75190 bytes .../scl/communication/GSEAddress.java | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/model_generator/genconfig.jar b/tools/model_generator/genconfig.jar index 191c492a89df84495dd94086d3bae03fd02ef437..1c00bf010e1a00dddd8de1820578456497f71d48 100644 GIT binary patch delta 1144 zcmX|9T}V@581~h<&E-tn=G^a@$2BC5 z3VnuJtk?RK=8p{gm8!#JM2m_4(GB^BhpeF2ZNND*6Cy|dDRf=t+8Z65; z1Sx3)9eFaUrf)&UoSVlAQm-BKqG>#her+T|`-#Z}&FfyEMiq%nAJO6@E+t6I9O#MX zX#f>uVCD~14yOg_p+i3P_3XF*qklSNr80SeUKMMhnWPCG@aQx2yas0q(=IOX&9|5!&cDch*tGQ|g# z&_e^suPT*upo#moK~RY^%Qniz`c!s&r2tg8O!~e94j}HbxVE#HASi^;|3pt^X_3jkHNvuC_Vy$u0V}wTJ*Ntpu zQxTlNda4LcAsS4q?l!?ute=^np7Lg>Lp*I}8J?S&zSIKE$X~ZG{=J1|uCcQD!&W$s z{ohtLPtJM>>#z-45La!`f!Jtgd!u%`FU+x+$2c~Af@5usgN^HSKoi;$4#pQ1v-7SL uLj&@&#mra2v-p>Jrc3h7S6Tv{s0)>_dZ~oPsdh3PbTWR;$Rq7>UkG+35x z2vX7tIx;q*rf)$;9h=7rQjZPvqH#Qper+T|`-#Z}&FfmAMiq%nAJyU{E+t6I9Oy~q zQ$H$5|I8n%97+q)BfEU+>)CJrNB^|TN@emQy(;FTnWPCGa!G7HMD5jYzEX58yrLp) zM37o}`9&+=e!!MhUsWpSKoj?Dhkz1imTi=a4XLd7N0|n8rDG-;-U^} z5gmGHN4%|vR>V(wXhWH*!J&>)kDYQ&@lA#Ja*wPa!lRzh1~@ zwiLlhtfz|LG@`-C>Yx#hVg1Yq4U{)QJ>nS?%kbR9^rdDvj{FTXZKAEr^dl>z`^)62RqBV3j+TDgkPLK diff --git a/tools/model_generator/genmodel.jar b/tools/model_generator/genmodel.jar index 594ae74cd4c425b35bc0edb1ae2488539f947dbc..2f84d3f0cf473a060599bd9963ff978e1d3a0646 100644 GIT binary patch delta 6655 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 delta 6216 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 0xfff) + if (appId > 0xffff) throw new SclParserException(addressNode, "APPID value out of range"); } else if (type.equals("MAC-Address")) {