diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/Global.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/Global.class index d8dd23fd7074141b1163fa4863591d5683cc8a7a..0498bb1327ff971bafc4872e137cf71d56b6e7f0 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/Global.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/Global.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/ReaderClass.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/ReaderClass.class index 4b983a6458f5e9a28bbe40ebbd4fc22b48bf514f..c89f22852ebd703ca583cc80c64e8922d48d3fe8 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/ReaderClass.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/ReaderClass.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$1.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$1.class index 5b6c2a186ec63512f5f794e92d77abdc2ede698e..0e47f6c59cf7a89d5abc1d38a3832c5305506209 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$1.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$1.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$2.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$2.class index a41d4301e11313170b96b3121ee3368e58604ba9..2bb0d4cb4d2c1e9bad06397d75d40fa3c49dcc8c 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$2.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$2.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$3.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$3.class index f0e4be8315ccca3d8a46355119f6b0fc901d30f5..dbcd3c60507a22e9ef839572dd228ae424643e91 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$3.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$3.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$4.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$4.class index f050e766064b067b20865f5b5f4e52136c9140a5..3cbd044ccc8c2cb520e394fdded24264e6e21132 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$4.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$4.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$5.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$5.class index a2893d7e41832626dca89de3c909f66dc95ca1ac..546dec3b7cbc3b0d01c7b6ce1ab2427e1997850c 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$5.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$5.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$6.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$6.class index 6d9c1975dd47073f5d2c271c6724bc174d35d75d..cb97e38ca09ae4588e853c7425c0e2e6b985068c 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$6.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$6.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$7.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$7.class index 414c03555bb6828154bed18dbddae93fa026d3bd..4ef1da1c48244156f4c4aa5e91ff86cdbac91164 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$7.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$7.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$8.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$8.class index 88045a8dc7e3fe532778ae97fc2320e5c9e58a90..842e925a1fc620c6fb573a6f19b8e12c743e179f 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$8.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$8.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$9.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$9.class index 3aa521884e738948e89967d97d0db54beaec0624..e2ddaf409517e28405e20198e2254c33ddaf2795 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$9.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite$9.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite.class index a4ab8f99111a6281a338f0af82a79b71ec5f57ef..abccbdf20c6ac7de81727237ad4e1079fc6be4dc 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockInSectorReadWrite.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$1.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$1.class index 7f04bf6ce8032bab67ed0aa12dae7a8281b7b149..80e3227d36bc5cdead9597572baa19a23a66adee 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$1.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$1.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$10.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$10.class index acbaf5968b269fee96741b9caf2519c3c1a3297c..15f3571b2c0fc82966376250346397e0c4a8327a 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$10.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$10.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$11.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$11.class index a4920c9e91434aa5a82679816402cc694b3e7688..8a20cbbff17ab712d43cac5fbf209aa57484a7aa 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$11.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$11.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$12.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$12.class index 798a8e740291e61e28d31cc73add87e134421526..05b3e861d20a6fef192cf8027e9b574d9ef756c5 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$12.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$12.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$13.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$13.class index 681bd7f8545c96a89139e01e8d44a273c8138c48..aff24b99c9cc5f4ab7ebeabcad148d10aaf831fc 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$13.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$13.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$2.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$2.class index e0b68b9c68098bfd141ebea26142f4781beb87a1..0d8643db4d96f941b63321b14c2f0b1fb16c41c3 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$2.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$2.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$3.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$3.class index 38ead4fabef684d8965f90f25c1648654a169f90..8549ca0eef1e3925a2efaba35160f8b216454091 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$3.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$3.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$4.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$4.class index c671d25cffa881f4eb7ed4b75a5006740320fad5..3ef6619190eec14ea92f2f31d5f65d9c0a443fa6 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$4.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$4.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$5.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$5.class index def6a306c1b492ea8a474b73f89cae0fd11084c0..351d173505bd62cd6de823648f83993185ad4108 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$5.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$5.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$6.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$6.class index 813355aeb2408e9b5e1a490018a6d696862413f6..b9a83e53e0f419b889fe0781cee6c16535912ceb 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$6.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$6.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$7.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$7.class index 176a1335586293f3d7f5a077c27483363ec765fe..7762559b06da5aea72ffe725ca3e35aba240640b 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$7.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$7.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$8.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$8.class index d71eebb11dcdfdb7b3b56d344b3e1f8646157389..1e7d05c680c24d751193b2401fe794ec2c5e8950 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$8.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$8.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$9.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$9.class index dab4d13fb5040ddfa7e623efc143ba850b74b87a..3e5472533a0013e888719d9a893fa1b0a9ced2f8 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$9.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite$9.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite.class index 535af340da0f4b6d768268e42c6ca754f8ad6e8d..7ad70d02b0aa555564fb1f12b136939f085fca9f 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmBlockReadWrite.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard$1.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard$1.class index 242e649dec3f69bbf9383bc9eb6d82a6fdd969dc..17d77fcf07844d6f0285f7d611a6865d1e185e31 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard$1.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard$1.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard$2.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard$2.class index 41bbc8ad9346cc324d687d022d6414efec5b3080..fb76ad5e07995f09b9768b832307b5c0de06c329 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard$2.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard$2.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard$3.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard$3.class index 41908e964e67e51648f4f916ec6ef86fa5b60701..d13c3bdc87c91e3f81641d69a766f6981d6198df 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard$3.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard$3.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard$4.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard$4.class index 2f85edfe8949c6bd30c9a3c94bbb0523c866d1d3..14a48d60d4686cbb895850f7802ae34f3b177186 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard$4.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard$4.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard$5.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard$5.class index b74bdcbd47da5d8fae348bc08b79bde4cf75ebb2..195ce96dbba5e409fa9de80dff867b85fa5694a3 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard$5.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard$5.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard$6.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard$6.class index 491701bb5ecfbd17751f840a12f2c7195fe735fb..45daad08498637079a63830ce200a01205bab610 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard$6.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard$6.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard$7.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard$7.class index a8228b5579f9edb97b64a8b4b766ce2b01b025a6..dc26174b1925b8a35f88e43333bd616396069947 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard$7.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard$7.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard.class index 0ee2cc2a2e52914d49aec291ec0c91b9a6ceae89..5b279dbb84052e6a11631edf47939631cc6c45e6 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearFormatCard.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$1.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$1.class index b20db6af4f3cb228386374405e5eeca73c927976..026696ae7d4d44d95375e2725a91da3a0845f624 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$1.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$1.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$10.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$10.class index e5e59f4b6352011ab8e83c69982594344dbf95ba..e61244c919fdf842c53cb8e78b93cb86e55648da 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$10.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$10.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$11.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$11.class index 9e6498af89dfc874e8cc00bd9fa96f2e754d87e3..84a14374300ce8cd83b06d5fe1691cfc0e696860 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$11.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$11.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$12.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$12.class index 2c718b9d0f58f1d13c97aa8ce0d53834c7af23d1..d06c14b9d82937ed840f05165febc796cc05b50f 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$12.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$12.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$13.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$13.class index a57b0cbb0ae1491b52dd8a2d00dc139d61a9e327..0e427d0038b8959e1f8ffee066af65c63a179658 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$13.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$13.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$14.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$14.class index d51031ee78c7d89a552c1886ceb4db637167c36c..1a6f293c752f527d2693b72a199eee6a046cbdc7 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$14.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$14.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$15.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$15.class index 87dfeeb6fb41b3cc5414216a5f6839fcb630a3f3..7005ce48bcf3a77830edac2bd79d62a46137a752 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$15.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$15.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$16.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$16.class index 29443a50dc185ecc233fd5202deb224af5e3365b..834b1d929c2d172cf250f1c87f0d1791eef182a0 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$16.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$16.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$17.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$17.class index 4170a2dd804366b672bf0395e6ae844222704b6c..a08ada38cae7fec2fd18bd94ba8e8f203fe72344 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$17.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$17.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$18.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$18.class index cd1912e8f0725958759c0d22406f8f8a918925aa..9aed6f92c1b93c97455a7d9c158bd373534a6d8d 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$18.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$18.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$2.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$2.class index b4ccb6012fe4e008a8b905aac3811876f178e155..2def7f523f887b5d577d4da46023b0c5c7998c91 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$2.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$2.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$3.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$3.class index e355544085278d7c8683d8716aa5b85d4a55ef16..2953b00c218f494376d76572da56794b03f0ba2e 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$3.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$3.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$4.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$4.class index 7f9209043025fec7252b6cff0794de74150847f3..640a7df4c952ba344be0c1d0372e2d7f4e3db5c7 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$4.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$4.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$5.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$5.class index 3c45c8e251c94903f4333d9789dc5de26b4da213..7bf770cd0aeb17789b19a3547d647a9d3b45a399 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$5.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$5.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$6.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$6.class index 64f07aa222216f7c16ee045a70307f78116bdddc..59f45d483b4b976ed1566713ecbc509f037379a5 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$6.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$6.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$7.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$7.class index a77201388368c3104f116d4cf7dc2bb4de182928..8d8faee6cf86a00b095d0130a498160941a45711 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$7.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$7.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$8.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$8.class index 1577006de7901bb12693da4083fd7cb57bdb0f4c..a91481b2664a07c12544274f24eab358ab7f102e 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$8.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$8.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$9.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$9.class index c6550b987ee7fd2b42ec09009e18fac37b94874d..06119db3486eb895bbeea6f7ceb6163c947e4d99 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$9.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite$9.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite.class index 2a4cb38739bc4f53d2201cc3198c6edbaf7bf9ef..b300a9653ad11df1fee2378b408646ce134ee73c 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite.form b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite.form index 91de246cf915d76fe1b3708c3ef491e5dc380d91..e7746f46034d496473f786a6ffaf9e14c5b76f8c 100644 --- a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite.form +++ b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmLinearReadWrite.form @@ -342,13 +342,13 @@ - + - + @@ -359,7 +359,7 @@ - + @@ -617,7 +617,7 @@ - + @@ -824,7 +824,7 @@ - + @@ -1005,7 +1005,7 @@ - + @@ -1013,7 +1013,7 @@ - + @@ -1023,8 +1023,8 @@ - - + + @@ -1041,7 +1041,7 @@ - + @@ -1070,7 +1070,7 @@ - + @@ -1218,14 +1218,14 @@ - + - + @@ -1251,7 +1251,7 @@ - + @@ -1265,7 +1265,7 @@ - + @@ -1289,7 +1289,7 @@ - + @@ -1418,7 +1418,7 @@ - + @@ -1485,7 +1485,7 @@ - + @@ -1667,7 +1667,7 @@ - + diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$1.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$1.class index 60c7d65350e58dcd5ed590a6e19d2cb5670d8de4..4ec2786031095b6951aefeb0468f88d14255f759 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$1.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$1.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$10.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$10.class index 1a2546e8f937d83e8da4e6333de705bd5528bc16..58b0a9f25cb3563d3475feb1f926a8a4a761d721 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$10.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$10.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$11.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$11.class index 2096fc31435cf591735157b53ba2a9e12554ce4b..6e0e1fbc4a0cbd7238f330983efac5607488ebe5 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$11.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$11.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$12.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$12.class index 149ff6152eadd38a9073d44c161ff6e2475f3bd0..9566d555094613a0d54ef6dadd3bcd851fac332a 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$12.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$12.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$13.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$13.class index 10a9f8afc0081a3e4f774504b99afcdb81b41401..0366082d2991aa5fd15ea4506d6a13aebb925346 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$13.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$13.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$14.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$14.class index 34f3efe500397d8970580aeed8b8ce906b0af355..da329c704249b8125aab7a40e855f65ff20bd615 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$14.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$14.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$15.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$15.class index 2b5bfbe348c9738bdade37d3ef814f31f0e95c23..e9117bc8bde2f63541100afb93a9c5f15b494633 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$15.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$15.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$16.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$16.class index 4beda607e44cdf3648eed114c1e340587e9a7d07..12a260ed4bc4037e3f5533e62d4cb7713c8a6844 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$16.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$16.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$17.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$17.class index 518513afbcfca9bc0445859c5346e94a9ab875f0..4db7263f0e98ddf67ff19ee0b3e4cc1a7f3fee0f 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$17.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$17.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$18.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$18.class index 07b86c6343519129dd940bec595791536e0088ca..52f3802202a20254e20f866e98993590527f0548 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$18.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$18.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$19.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$19.class index 30b87f5e068cfe3c271f54ea4745fd1f982d4660..42c8a00d16bd62ba9dc8abd4d35e8a58230d7b73 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$19.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$19.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$2.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$2.class index 459520bc6e5c3eadc75cf9e7ef2967cacfa516eb..c141879a2f4db79dbeab883f4c6eec9b8ccc6ac6 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$2.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$2.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$3.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$3.class index c63a77e82d3a38a9beffaa67d1a9d73d3416f4b7..3a6cd1c2d4005c0113e19b7d343f2c7772861094 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$3.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$3.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$4.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$4.class index 1fb2fc42a98ac0f62ab7a8fefa221037c1d384b7..95eb5a45b46b30f6a253cbe63d9f82a271246104 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$4.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$4.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$5.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$5.class index 058e7f39cbef771d7dceb765577986bb99719bc4..95fa24bd189fc30db77b09235e46a46f9466549b 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$5.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$5.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$6.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$6.class index 2b638603d8f8ceae9e3d7dfc11ee76118a3ee8cf..29ffa0edca59ba3a1a7ec95d418ed0df8505caf2 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$6.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$6.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$7.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$7.class index af9314270c994b6a7b77a69dcece7a1f0bf3cab2..7c5fd7c74f4214d593e710738829ff1bf255c041 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$7.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$7.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$8.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$8.class index 18366ba2ac26e70f4a25245d94070808e00a88bd..7be87e3edca63a331702fcf97a047917068da7a6 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$8.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$8.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$9.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$9.class index 7342cdfe352c74289beb343fc5a38a7cd7f68b7a..1a570f3ebcb6a2825380e2469ab591ae521fe8d2 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$9.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$9.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$Main_Thread.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$Main_Thread.class index 85ff8ed83b6d110095e555cb1113a9eb5d94d787..5d8722b08bd66a48f1ae794e2e40e48820987bfa 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$Main_Thread.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain$Main_Thread.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain.class index 861be8dd21df135a18e73e7fbe817c9215c3a604..16ab40de30c6f607bda8aa8465fc0bef9c816535 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmMain.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite$1.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite$1.class index e2224acd27057a2b10e494ae17f3b7601416adf7..7a048012ee4ae49392f9299f2b75adea131af82a 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite$1.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite$1.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite$2.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite$2.class index bf112494c34be0a99ab7bb3b4296759d3115759d..4a3920601070d3848f496a115527f5ad6c56201a 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite$2.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite$2.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite$3.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite$3.class index 18e9ce36fb2c637d8455782ba4b7a7376e30b20b..4dafcedf2c811cd79e0178b51213c090bf3d4afd 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite$3.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite$3.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite$4.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite$4.class index 1bd8e42aafa439c4f9de16ff70b864d393bfaa22..cf3c09f6ba4a6dbd95c63e8542493deb1ab90f05 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite$4.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite$4.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite$5.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite$5.class index 8ec91b5c130b8dcbad77050bd75181da1b837ab6..8254f0218fcd1e79510f40ed5beddaf8e2b13552 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite$5.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite$5.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite$6.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite$6.class index a4c8576f9eeb2df4d0b5deb7e87a56023d11d4c2..abe60498e63bb85b27e6c8b76259348464814af5 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite$6.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite$6.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite$7.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite$7.class index d82705fe0f112dfff873a3cd99552fe813675ce3..3b7af3c299281adf3cd2c1a8edc2c751489cdd57 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite$7.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite$7.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite.class index 8a77228672c9d06edf01ce9da823bbeb01a1400f..4730894d4b5c85a5715119e56d7a8c4e16bc7240 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmSectorTrailerWrite.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$1.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$1.class index 88baf97cb03bd6820295de350debfd50e1c247c2..21c7056044c7540936e4f941611fe7073c3c573e 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$1.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$1.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$2.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$2.class index 72aef5c294b58a0b23a6d0962c5d976704ceb56e..849cf6482a5a4cbda5e9b579510258c0865cd986 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$2.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$2.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$3.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$3.class index 0d239b8de298a84b4662090e886983a09734b82a..eb75e03f346770fb9111efb7998a964fc95e00bd 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$3.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$3.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$4.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$4.class index f0247560c19e78b513eb95322fb7ec697d232e15..081eb696065653bf08f2d5abd2ec463cab6d0155 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$4.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$4.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$5.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$5.class index 6620a92c5d9c0adf50085b987855246c12b2ed85..9f8ef816ed86f52751342873f6527855a82f258c 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$5.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$5.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$6.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$6.class index 78b0560056e7f1d38671a0ddc34ab51c22767dbf..aa712c875f18ff831f9303a18e7426a2cc21eacb 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$6.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$6.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$7.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$7.class index da7b20fed144c1cdcc7b2fb4e46408210602686b..6184cf7c2dd65de5e795906ff3401b7ac2c2d27d 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$7.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$7.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$8.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$8.class index 9125f4ccbb788ccfec1085df0ad29ff76f03f435..6257da520f01074d5e35f8101aa58dbcbd7c0cf3 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$8.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$8.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$9.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$9.class index 7d9c31f93bd95b4d9f2d2bb960b801a5c794d77f..38bbdd3ce2a8b1d5c7b39565fc059414b5250553 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$9.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr$9.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr.class index a6bbe44e0503a03250521226cc27afd05283dca6..020f2d13ad01d4d1dfd73e5f0544921f1e42438b 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr.form b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr.form index bda0ba9ac6f5435282d9396ec17966f9340397a6..393ecdab2aec04d86ca25f955a31fde998f5f697 100644 --- a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr.form +++ b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorIncrDecr.form @@ -1,4 +1,4 @@ - +
@@ -41,7 +41,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -221,15 +221,15 @@ - + - - + + @@ -360,8 +360,8 @@ - - + + @@ -378,7 +378,7 @@ - + @@ -526,8 +526,8 @@ - - + + @@ -544,7 +544,7 @@ - + @@ -692,8 +692,8 @@ - - + + @@ -710,7 +710,7 @@ - + @@ -858,8 +858,8 @@ - - + + @@ -876,7 +876,7 @@ - + @@ -1073,8 +1073,8 @@ - - + + @@ -1239,8 +1239,8 @@ - - + + @@ -1405,8 +1405,8 @@ - - + + @@ -1571,8 +1571,8 @@ - - + + diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$1.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$1.class index ac8927481314891bd1b9cbceeba9be66c3e5ee15..f82f3bb7569e85e832c36182f593cf06ecd55ec7 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$1.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$1.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$2.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$2.class index ba5a883c1ab38666234e47647773bb257c370468..791234edd89c11002106bd020145c992b037d346 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$2.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$2.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$3.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$3.class index c2169db063303aabbc23315794724ccf793dd73e..19b5cd8b5aab1ebe48f8a08f5f871cfb2721e18a 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$3.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$3.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$4.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$4.class index b2e7aa2b7438e1d94daa8c9d55c02891d6a60599..43481d37286dc9615afd9219f88aab5d6e1a1c09 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$4.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$4.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$5.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$5.class index df464244d422e911d63a0c37c70537e0fc665b71..658622b4ebff0686fb6eaf3b836e25c238a7e4d4 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$5.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$5.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$6.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$6.class index fc2b14a1bc4404e767c1d84697a93568ca92e083..7186e330bf4c8530be63bd693df52973cc42b647 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$6.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$6.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$7.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$7.class index baae68280f7e54630215234c4a3874989ef9e876..0e6269706fe9c1cc2ca744cc79854db926764b71 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$7.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$7.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$8.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$8.class index 33eb807f9c08b01f7a3163e3ef9e1c541524a128..1266c8a5ed1b75f6a28cda82fb3daf1918e8f030 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$8.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$8.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$9.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$9.class index 7b21521c49c58d91738d9a9cd0071f332f6fbde8..8e9cdd506c97f4bf69ddac0605896eb4d37c8b21 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$9.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite$9.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite.class index b331898aeac90ca1aca5a50b8d6c3b57ca52aed8..407bd71d44608a3dc0cb3e037d759d1a8b7ceee2 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockInSectorReadWrite.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$1.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$1.class index ab3e334231181dd12ea764856b67b9a189b60741..a16afb7fdd19774e2eb1b0d3b5d4048e5115d98d 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$1.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$1.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$2.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$2.class index 5cede91a43b42c552739f75e1247607033de96f3..4ff85a3e8a94725b33fcc3b330ada05b73b15974 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$2.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$2.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$3.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$3.class index a99342efc1f720bcebdaa01473091602c18f8ce4..9e06adbd2f809216f596eb0451fc9512490e27b1 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$3.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$3.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$4.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$4.class index 54eac9ae59694d71435202b16138add0d23a994a..a1ffc2324e31e5a43ca0f51edba8348228ec6f71 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$4.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$4.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$5.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$5.class index 28934fbcabe010dd3bd27c1641d5b9976d299d9d..62e33e4ea778f29aba357d52d37c0644a074cdc4 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$5.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$5.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$6.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$6.class index 372e8d73607dc6ba1b82be941239c24fe88d7440..d10f91b0a04219a8b9af8f8ade421d58c1bd2e7b 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$6.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$6.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$7.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$7.class index aed4167927e6bec097d14434b011f916767bfde5..51191ebee5b291cbcc9e409b61cf515ee62835e0 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$7.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$7.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$8.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$8.class index 8142a2205f3852300165c0b142b0dc7e9b14885f..a3e85d2e8f590f0f1b4a8b344bb6f654a8b52fff 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$8.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$8.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$9.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$9.class index f271546987d01689609d247003066977834df0aa..d3fd1bf51321e7f11ee1a9020185b5adc2f8be81 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$9.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr$9.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr.class index ddce7d69cc9e58f66a7ded5877b71c370912efb9..3fe3d542ecb0f3bda7fd662e80d0683bb90ee1b5 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr.form b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr.form index e62aa99a0f8243f795ad6ddc2c136659b00ed5e4..62e3f172407fbf7b3bbcb746196464e5801d99ab 100644 --- a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr.form +++ b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockIncrDecr.form @@ -36,7 +36,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$1.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$1.class index 93a86f5cb21c9e59de2b052f0d8ae0f1057181b8..9b316609cf17caf29181bc868a68c6070a82f9e2 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$1.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$1.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$2.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$2.class index 34c5d67b2972738000a0be2e13d72b37b806891a..e9caa914a071d7527a14fd9a7697fc43f14cab67 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$2.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$2.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$3.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$3.class index 4bbd8e3bd6baeb076c95765afaa0cf225da30734..ccdebdba5e1bfecba74beaccc7fe404e3549fcdd 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$3.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$3.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$4.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$4.class index 68b01fe19de6abdb594e9e38797a3ffff8f66a59..def5859cf6d3ca6e0600c8c1e3aef39abb1686c6 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$4.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$4.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$5.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$5.class index 3a8c4e4c9d0ecc82b871fc1af89a7609aac140f2..b76355e58ccbb5c1bd283b6ed82b381ab51909f9 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$5.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$5.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$6.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$6.class index 7df80bd783a080a251c15793d16462a11f584236..440431eb6bf00b9041f4cbc8472906fcc676e8c3 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$6.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$6.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$7.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$7.class index 11abd7a7cd56bea43c906e739825d98708063182..e388b85dd2235d57f6c0630f8794eddc5833fe74 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$7.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$7.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$8.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$8.class index 7b442c54665304c2f055e742e629ba5d744ddd6b..7c1b517a2223ac4ebb9c5d6fe06cc42c639ce895 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$8.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$8.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$9.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$9.class index af258b31b84127078810fdf662b7d5b86611e76d..a884aebdd1a3c2c96660b61d9c408cabe556d03b 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$9.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite$9.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite.class index 4e303394a8d261f4ed1aff63663e0738a4e0eb44..e024ed0e98ce375c6f399f0eb0175de9b6b82f0c 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmValueBlockReadWrite.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmViewAll$1.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmViewAll$1.class index 145205288ab13fc72f20838847a485a6ccdc613a..a722e6d47640799ea776421d5948b5af04ec0c9b 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmViewAll$1.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmViewAll$1.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmViewAll$2.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmViewAll$2.class index b5020900d91aacde6c7ef2a27858409c8cb40727..051165c6384064f2784a03c3934ec164d20b2db1 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmViewAll$2.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmViewAll$2.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmViewAll$3.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmViewAll$3.class index 48491e335901b422f00da9a61f42eed3a216dc96..7f997ac65d750c868496fcb192856e350ef4d7d5 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmViewAll$3.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmViewAll$3.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmViewAll$4.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmViewAll$4.class index 5faff683077d90e8e37fd4ed195d4a64728e9d7f..b680d84518720f6dbdeeb9d44b5302d7414a032a 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmViewAll$4.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmViewAll$4.class differ diff --git a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmViewAll.class b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmViewAll.class index d3f92b642bee8a316b5ff810af3791c56fa43646..ea790ac65da78ebe2911fe85af1610a136c0124c 100644 Binary files a/uFCoderAdvanced/build/classes/ufrcoderadvance/frmViewAll.class and b/uFCoderAdvanced/build/classes/ufrcoderadvance/frmViewAll.class differ diff --git a/uFCoderAdvanced/lib/jna-platform.jar b/uFCoderAdvanced/lib/jna-platform.jar new file mode 100644 index 0000000000000000000000000000000000000000..4b3d567c62096eb7eac47f41c255720f1e7a7588 Binary files /dev/null and b/uFCoderAdvanced/lib/jna-platform.jar differ diff --git a/uFCoderAdvanced/lib/libuFCoder-arm.so b/uFCoderAdvanced/lib/libuFCoder-arm.so new file mode 100644 index 0000000000000000000000000000000000000000..21d997a94e046e6a82866cff5e0d08947d554e0b Binary files /dev/null and b/uFCoderAdvanced/lib/libuFCoder-arm.so differ diff --git a/uFCoderAdvanced/lib/libuFCoder-x86.so b/uFCoderAdvanced/lib/libuFCoder-x86.so new file mode 100644 index 0000000000000000000000000000000000000000..9f8a911e23709374e659e5a33dc5ad716ae39a69 Binary files /dev/null and b/uFCoderAdvanced/lib/libuFCoder-x86.so differ diff --git a/uFCoderAdvanced/lib/libuFCoder-x86_64.so b/uFCoderAdvanced/lib/libuFCoder-x86_64.so new file mode 100644 index 0000000000000000000000000000000000000000..7eee16b6f7054938cf1a09bd86e904ced98260b3 Binary files /dev/null and b/uFCoderAdvanced/lib/libuFCoder-x86_64.so differ diff --git a/uFCoderAdvanced/lib/libuFCoder.dylib b/uFCoderAdvanced/lib/libuFCoder.dylib new file mode 100644 index 0000000000000000000000000000000000000000..15895ee749bd0d3dc7a9c12132e9a49023fa71c6 Binary files /dev/null and b/uFCoderAdvanced/lib/libuFCoder.dylib differ diff --git a/uFCoderAdvanced/lib/uFCoder-x86.dll b/uFCoderAdvanced/lib/uFCoder-x86.dll new file mode 100644 index 0000000000000000000000000000000000000000..9cfd3557545a2f76eef924dfb23b28ea473a9a42 Binary files /dev/null and b/uFCoderAdvanced/lib/uFCoder-x86.dll differ diff --git a/uFCoderAdvanced/lib/uFCoder-x86_64.dll b/uFCoderAdvanced/lib/uFCoder-x86_64.dll new file mode 100644 index 0000000000000000000000000000000000000000..dac4290609d32257ca8a0caf4418d0ab8dcddd26 Binary files /dev/null and b/uFCoderAdvanced/lib/uFCoder-x86_64.dll differ diff --git a/uFCoderAdvanced/nbproject/private/private.properties b/uFCoderAdvanced/nbproject/private/private.properties index a8533f45431a528e6954851d5e86c42b2f9b5285..cfcd557dc3d79a91db3fd407ef8a1426e967eacf 100644 --- a/uFCoderAdvanced/nbproject/private/private.properties +++ b/uFCoderAdvanced/nbproject/private/private.properties @@ -4,4 +4,4 @@ do.jar=true javac.debug=true javadoc.preview=true jaxbwiz.endorsed.dirs=C:\\Program Files (x86)\\NetBeans 6.8\\ide12\\modules\\ext\\jaxb\\api -user.properties.file=C:\\Users\\Vladan\\AppData\\Roaming\\NetBeans\\8.0\\build.properties +user.properties.file=C:\\Users\\Milo\u0161\\AppData\\Roaming\\NetBeans\\8.0.2\\build.properties diff --git a/uFCoderAdvanced/nbproject/project.properties b/uFCoderAdvanced/nbproject/project.properties index 25510c6f6193090fcbabd3eb64d355f29b730140..1d0e90bd7a352793d0cba0d0d087eb6ecf860ae1 100644 --- a/uFCoderAdvanced/nbproject/project.properties +++ b/uFCoderAdvanced/nbproject/project.properties @@ -67,7 +67,7 @@ jnlp.signed=false jnlp.signing= jnlp.signing.alias= jnlp.signing.keystore= -main.class=ufcoderadvanced.frmMain +main.class=ufrcoderadvance.frmMain manifest.file=manifest.mf meta.inf.dir=${src.dir}/META-INF mkdist.disabled=false diff --git a/uFCoderAdvanced/src/ufrcoderadvance/UFRCoderWrapper.java b/uFCoderAdvanced/src/ufrcoderadvance/UFRCoderWrapper.java deleted file mode 100644 index b24296173418b7e9057d57cc905c3a9fffa81ab6..0000000000000000000000000000000000000000 --- a/uFCoderAdvanced/src/ufrcoderadvance/UFRCoderWrapper.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ - -package ufrcoderadvance; -import com.sun.jna.Library; -import com.sun.jna.Native; -import com.sun.jna.ptr.ByteByReference; -import com.sun.jna.ptr.IntByReference; -import com.sun.jna.ptr.ShortByReference; -public class UFRCoderWrapper extends frmMain -{ - static String sDirPath=System.getProperty("user.dir"); - public interface UFRCoderDeclaration extends Library - { - - UFRCoderDeclaration UFRInstance=(UFRCoderDeclaration)Native.loadLibrary(sDirPath+"\\"+PlatformOsType(), UFRCoderDeclaration.class); - int ReaderOpen(); - int ReaderClose(); - int GetReaderType(int[] reader_type); - int GetReaderSerialNumber(int[] reader_serial); - int GetCardId(byte[] card_id,int[] card_serial); - int ReaderUISignal(int light_mode,int sound_mode); - int ReaderSoftRestart(); - int ReaderReset(); - int ReadUserData(byte[] read_user_data); - int WriteUserData(byte[] write_user_data); - int ReaderKeyWrite(byte[]reader_key,byte key_index); - - int LinearRead(byte[] aucdata,int linear_address,int data_length,ShortByReference bytes_ret,byte auth_mode,int key_index); - int LinearRead_AKM1(byte[]aucdata,int linear_address,int data_length,ShortByReference bytes_ret,byte auth_mode); - int LinearRead_AKM2(byte[]aucdata,int linear_address,int data_length,ShortByReference bytes_ret,byte auth_mode); - int LinearRead_PK(byte[]aucdata,int linear_address,int data_length,ShortByReference bytes_ret,byte auth_mode,byte[]pk_key); - - int LinearWrite(byte[] aucdata,int linear_address,int data_length,ShortByReference bytes_written,byte auth_mode,int key_index); - int LinearWrite_AKM1(byte[] aucdata,int linear_address,int data_length,ShortByReference bytes_written,byte auth_mode); - int LinearWrite_AKM2(byte[] aucdata,int linear_address,int data_length,ShortByReference bytes_written,byte auth_mode); - int LinearWrite_PK(byte[]aucdata,int linear_address,int data_length,ShortByReference bytes_written,byte auth_mode,byte[]pk_key); - - int BlockRead(byte[] block_data, byte block_address, byte auth_mode, byte key_index); - int BlockRead_AKM1(byte[] block_data, byte block_address, byte auth_mode); - int BlockRead_AKM2(byte[] block_data, byte block_address, byte auth_mode); - int BlockRead_PK(byte[] block_data, byte block_address, byte auth_mode,byte[]pk_key); - - int BlockWrite(byte[] block_data, byte block_address, byte auth_mode, byte key_index); - int BlockWrite_AKM1(byte[] block_data, byte block_address, byte auth_mode); - int BlockWrite_AKM2(byte[] block_data, byte block_address, byte auth_mode); - int BlockWrite_PK(byte[] block_data, byte block_address, byte auth_mode,byte[]pk_key); - - int BlockInSectorRead(byte[] block_data,byte sector_address, byte block_address, byte auth_mode, byte key_index); - int BlockInSectorRead_AKM1(byte[] block_data,byte sector_address, byte block_address, byte auth_mode); - int BlockInSectorRead_AKM2(byte[] block_data,byte sector_address, byte block_address, byte auth_mode); - int BlockInSectorRead_PK(byte[] block_data,byte sector_address, byte block_address, byte auth_mode,byte[]pk_key); - - int BlockInSectorWrite(byte[] block_data,byte sector_address, byte block_address, byte auth_mode, byte key_index); - int BlockInSectorWrite_AKM1(byte[] block_data,byte sector_address, byte block_address, byte auth_mode); - int BlockInSectorWrite_AKM2(byte[] block_data,byte sector_address, byte block_address, byte auth_mode); - int BlockInSectorWrite_PK(byte[] block_data,byte sector_address, byte block_address, byte auth_mode,byte[]pk_key); - - int ValueBlockRead(IntByReference value_read,ShortByReference value_address,byte block_address,byte auth_mode,byte key_index); - int ValueBlockRead_AKM1(IntByReference value_read,ShortByReference value_address,byte block_address,byte auth_mode); - int ValueBlockRead_AKM2(IntByReference value_read,ShortByReference value_address,byte block_address,byte auth_mode); - int ValueBlockRead_PK(IntByReference value_read,ShortByReference value_address,byte block_address,byte auth_mode,byte[]pk_key); - - int ValueBlockWrite(int value_read,short value_address,byte block_address,byte auth_mode,byte key_index); - int ValueBlockWrite_AKM1(int value_read,short value_address,byte block_address,byte auth_mode); - int ValueBlockWrite_AKM2(int value_read,short value_address,byte block_address,byte auth_mode); - int ValueBlockWrite_PK(int value_read,short value_address,byte block_address,byte auth_mode,byte[]pk_key); - - int ValueBlockIncrement(int incr_value,byte block_address,byte auth_mode,byte key_index); - int ValueBlockIncrement_AKM1(int incr_value,byte block_address,byte auth_mode); - int ValueBlockIncrement_AKM2(int incr_value,byte block_address,byte auth_mode); - int ValueBlockIncrement_PK(int incr_value,byte block_address,byte auth_mode,byte[]pk_key); - - int ValueBlockDecrement(int incr_value,byte block_address,byte auth_mode,byte key_index); - int ValueBlockDecrement_AKM1(int incr_value,byte block_address,byte auth_mode); - int ValueBlockDecrement_AKM2(int incr_value,byte block_address,byte auth_mode); - int ValueBlockDecrement_PK(int incr_value,byte block_address,byte auth_mode,byte[]pk_key); - - int ValueBlockInSectorRead(IntByReference read_data,ShortByReference value_address,byte sector_address,byte block_address,byte auth_mode,byte key_index); - int ValueBlockInSectorRead_AKM1(IntByReference read_data,ShortByReference value_address,byte sector_address,byte block_address,byte auth_mode); - int ValueBlockInSectorRead_AKM2(IntByReference read_data,ShortByReference value_address,byte sector_address,byte block_address,byte auth_mode); - int ValueBlockInSectorRead_PK(IntByReference read_data,ShortByReference value_address,byte sector_address,byte block_address,byte auth_mode,byte[]pk_key); - - int ValueBlockInSectorWrite(int read_data,short value_address,byte sector_address,byte block_address,byte auth_mode,byte key_index); - int ValueBlockInSectorWrite_AKM1(int read_data,short value_address,byte sector_address,byte block_address,byte auth_mode); - int ValueBlockInSectorWrite_AKM2(int read_data,short value_address,byte sector_address,byte block_address,byte auth_mode); - int ValueBlockInSectorWrite_PK(int read_data,short value_address,byte sector_address,byte block_address,byte auth_mode,byte[]pk_key); - - int ValueBlockInSectorIncrement(int read_data,byte sector_address,byte block_address,byte auth_mode,byte key_index); - int ValueBlockInSectorIncrement_AKM1(int read_data,byte sector_address,byte block_address,byte auth_mode); - int ValueBlockInSectorIncrement_AKM2(int read_data,byte sector_address,byte block_address,byte auth_mode); - int ValueBlockInSectorIncrement_PK(int read_data,byte sector_address,byte block_address,byte auth_mode,byte[]pk_key); - - int ValueBlockInSectorDecrement(int read_data,byte sector_address,byte block_address,byte auth_mode,byte key_index); - int ValueBlockInSectorDecrement_AKM1(int read_data,byte sector_address,byte block_address,byte auth_mode); - int ValueBlockInSectorDecrement_AKM2(int read_data,byte sector_address,byte block_address,byte auth_mode); - int ValueBlockInSectorDecrement_PK(int read_data,byte sector_address,byte block_address,byte auth_mode,byte[]pk_key); - - int LinearFormatCard(byte[]key_a,byte block_access_bits,byte sector_access_bits,byte sector_trailers_byte9, - byte[]key_b,ByteByReference sector_formatted,byte auth_mode,byte key_index); - int LinearFormatCard_AKM1(byte[]key_a,byte block_access_bits,byte sector_access_bits,byte sector_trailers_byte9, - byte[]key_b,ByteByReference sector_formatted,byte auth_mode); - int LinearFormatCard_AKM2(byte[]key_a,byte block_access_bits,byte sector_access_bits,byte sector_trailers_byte9, - byte[]key_b,ByteByReference sector_formatted,byte auth_mode); - int LinearFormatCard_PK(byte[]key_a,byte block_access_bits,byte sector_access_bits,byte sector_trailers_byte9, - byte[]key_b,ByteByReference sector_formatted,byte auth_mode,byte[]pk_key); - - int SectorTrailerWrite(byte addressing_mode,byte address,byte[]key_a,byte block_access_bits0, - byte block_access_bits1,byte block_access_bits2,byte sector_trailer_access_bits, - byte sector_trailer_byte9,byte[]key_b,byte auth_mode,byte key_index); - int SectorTrailerWrite_AKM1(byte addressing_mode,byte address,byte[]key_a,byte block_access_bits0, - byte block_access_bits1,byte block_access_bits2,byte sector_trailer_access_bits, - byte sector_trailer_byte9,byte[]key_b,byte auth_mode); - int SectorTrailerWrite_AKM2(byte addressing_mode,byte address,byte[]key_a,byte block_access_bits0, - byte block_access_bits1,byte block_access_bits2,byte sector_trailer_access_bits, - byte sector_trailer_byte9,byte[]key_b,byte auth_mode); - int SectorTrailerWrite_PK(byte addressing_mode,byte address,byte[]key_a,byte block_access_bits0, - byte block_access_bits1,byte block_access_bits2,byte sector_trailer_access_bits, - byte sector_trailer_byte9,byte[]key_b,byte auth_mode,byte[]pk_key); - - } -} diff --git a/uFCoderAdvanced/src/ufrcoderadvance/UfrCoder.java b/uFCoderAdvanced/src/ufrcoderadvance/UfrCoder.java new file mode 100644 index 0000000000000000000000000000000000000000..9d1b851d9376af3ddda443fd4aa49b2e0d7b2810 --- /dev/null +++ b/uFCoderAdvanced/src/ufrcoderadvance/UfrCoder.java @@ -0,0 +1,350 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package ufrcoderadvance; + +import com.sun.jna.Library; +import com.sun.jna.Platform; +import com.sun.jna.ptr.ByteByReference; +import com.sun.jna.ptr.IntByReference; +import com.sun.jna.ptr.ShortByReference; + +public class UfrCoder { + + public enum ERRORCODES { + + DL_OK(0x00), + COMMUNICATION_ERROR(0x01), + CHKSUM_ERROR(0x02), + READING_ERROR(0x03), + WRITING_ERROR(0x04), + BUFFER_OVERFLOW(0x05), + MAX_ADDRESS_EXCEEDED(0x06), + MAX_KEY_INDEX_EXCEEDED(0x07), + NO_CARD(0x08), + COMMAND_NOT_SUPPORTED(0x09), + FORBIDEN_DIRECT_WRITE_IN_SECTOR_TRAILER(0x0A), + ADDRESSED_BLOCK_IS_NOT_SECTOR_TRAILER(0x0B), + WRONG_ADDRESS_MODE(0x0C), + WRONG_ACCESS_BITS_VALUES(0x0D), + AUTH_ERROR(0x0E), + PARAMETERS_ERROR(0x0F), + MAX_SIZE_EXCEEDED(0x10), + UNSUPPORTED_CARD_TYPE(0x11), + COMMUNICATION_BREAK(0x50), + NO_MEMORY_ERROR(0x51), + CAN_NOT_OPEN_READER(0x52), + READER_NOT_SUPPORTED(0x53), + READER_OPENING_ERROR(0x54), + READER_PORT_NOT_OPENED(0x55), + CANT_CLOSE_READER_PORT(0x56), + WRITE_VERIFICATION_ERROR(0x70), + BUFFER_SIZE_EXCEEDED(0x71), + VALUE_BLOCK_INVALID(0x72), + VALUE_BLOCK_ADDR_INVALID(0x73), + VALUE_BLOCK_MANIPULATION_ERROR(0x74), + WRONG_UI_MODE(0x75), + KEYS_LOCKED(0x76), + KEYS_UNLOCKED(0x77), + WRONG_PASSWORD(0x78), + CAN_NOT_LOCK_DEVICE(0x79), + CAN_NOT_UNLOCK_DEVICE(0x7A), + DEVICE_EEPROM_BUSY(0x7B), + RTC_SET_ERROR(0x7C), + ANTICOLLISION_DISABLED(0x7D), + NO_CARDS_ENUMERRATED(0x7E), + CARD_ALREADY_SELECTED(0x7F), + FT_STATUS_ERROR_1(0xA0), + FT_STATUS_ERROR_2(0xA1), + FT_STATUS_ERROR_3(0xA2), + FT_STATUS_ERROR_4(0xA3), + FT_STATUS_ERROR_5(0xA4), + FT_STATUS_ERROR_6(0xA5), + FT_STATUS_ERROR_7(0xA6), + FT_STATUS_ERROR_8(0xA7), + FT_STATUS_ERROR_9(0xA8); + + private int value; + + private ERRORCODES(int value) { + this.value = value; + } + + public int getValue() { + return value; + } + + } + + protected static String sPlatformType = ""; + + /** + * specifies the type of platform 1: isLinux() 2: isWindows() + * + * @return .so or .dll name based on the platform as String type + */ + static public String GetPlatformType() { + int os_type = Platform.getOSType(); + + String lib_name = "uFCoder"; + String prefix = ""; + String postfix = ""; + String extension = ""; + + switch (os_type) { + case Platform.MAC: + prefix = "lib"; + extension = "dylib"; + break; + + case Platform.LINUX: + prefix = "lib"; + extension = "so"; + break; + + case Platform.WINDOWS: + prefix = ""; + extension = "dll"; + break; + } + + if (Platform.isARM()) { + postfix = "arm"; + } else if (Platform.isPPC()) { + postfix = "ppc"; + } else if (Platform.isIntel()) { + postfix = "x86"; + } + + if (Platform.is64Bit()) { + postfix += "_64"; + } + + // patch for OSX + if (os_type == Platform.MAC && Platform.isIntel()) { + postfix = ""; + } + + sPlatformType = prefix + lib_name; + + if (postfix.length() > 0) { + sPlatformType += "-" + postfix; + } + + sPlatformType += "." + extension; + + System.out.println("lib: " + sPlatformType); + + return sPlatformType; + } + + /** + * Returns the full path to the required libraries + * + * @param isApplet + * @return String + */ + static public String GetLibFullPath(boolean isApplet) { + + String lib_path = System.getProperty("user.dir"); + + switch (Platform.getOSType()) { + case Platform.WINDOWS: + lib_path += "\\lib\\"; + break; + + case Platform.LINUX: + default: + lib_path += "/lib/"; + break; + } + + if (isApplet) { + lib_path = ""; // only for applet + } + lib_path += GetPlatformType(); + + System.out.println("GetLibFullPath(): " + lib_path); + + return lib_path; + } + + public interface uFrFunctions extends Library { + + int ReaderOpen(); + + int ReaderClose(); + + int GetReaderType(int[] iaReaderType); + + int GetCardId(ByteByReference bCardType, IntByReference iCardSerial); + + int GetCardIdEx(ByteByReference bCardType, byte[] baCardUID, ByteByReference bUidSize); + + int GetDlogicCardType(ByteByReference bDLCardType); + + int ReaderUISignal(int iLightMode, int iSoundMode); + + int LinearRead(byte[] baReadData, int iLinearAddress, int iDataLength, ShortByReference shBytesRet, byte bAuthMode, byte bKeyIndex); + + int LinearWrite(byte[] baWriteData, int iLinearAddress, int iDataLength, ShortByReference shBytesWritten, byte bAuthMode, byte bKeyIndex); + + int BlockWrite(byte[] saBlockWrite, int iBlockAddress, byte bAuthMode, byte bKeyIndex); + + int GetReaderSerialNumber(int[] reader_serial); + + int GetCardId(byte[] card_id, int[] card_serial); + + int ReaderSoftRestart(); + + int ReaderReset(); + + int ReadUserData(byte[] read_user_data); + + int WriteUserData(byte[] write_user_data); + + int ReaderKeyWrite(byte[] reader_key, byte key_index); + + int LinearRead(byte[] aucdata, int linear_address, int data_length, ShortByReference bytes_ret, byte auth_mode, int key_index); + + int LinearRead_AKM1(byte[] aucdata, int linear_address, int data_length, ShortByReference bytes_ret, byte auth_mode); + + int LinearRead_AKM2(byte[] aucdata, int linear_address, int data_length, ShortByReference bytes_ret, byte auth_mode); + + int LinearRead_PK(byte[] aucdata, int linear_address, int data_length, ShortByReference bytes_ret, byte auth_mode, byte[] pk_key); + + int LinearWrite(byte[] aucdata, int linear_address, int data_length, ShortByReference bytes_written, byte auth_mode, int key_index); + + int LinearWrite_AKM1(byte[] aucdata, int linear_address, int data_length, ShortByReference bytes_written, byte auth_mode); + + int LinearWrite_AKM2(byte[] aucdata, int linear_address, int data_length, ShortByReference bytes_written, byte auth_mode); + + int LinearWrite_PK(byte[] aucdata, int linear_address, int data_length, ShortByReference bytes_written, byte auth_mode, byte[] pk_key); + + int BlockRead(byte[] block_data, byte block_address, byte auth_mode, byte key_index); + + int BlockRead_AKM1(byte[] block_data, byte block_address, byte auth_mode); + + int BlockRead_AKM2(byte[] block_data, byte block_address, byte auth_mode); + + int BlockRead_PK(byte[] block_data, byte block_address, byte auth_mode, byte[] pk_key); + + int BlockWrite(byte[] block_data, byte block_address, byte auth_mode, byte key_index); + + int BlockWrite_AKM1(byte[] block_data, byte block_address, byte auth_mode); + + int BlockWrite_AKM2(byte[] block_data, byte block_address, byte auth_mode); + + int BlockWrite_PK(byte[] block_data, byte block_address, byte auth_mode, byte[] pk_key); + + int BlockInSectorRead(byte[] block_data, byte sector_address, byte block_address, byte auth_mode, byte key_index); + + int BlockInSectorRead_AKM1(byte[] block_data, byte sector_address, byte block_address, byte auth_mode); + + int BlockInSectorRead_AKM2(byte[] block_data, byte sector_address, byte block_address, byte auth_mode); + + int BlockInSectorRead_PK(byte[] block_data, byte sector_address, byte block_address, byte auth_mode, byte[] pk_key); + + int BlockInSectorWrite(byte[] block_data, byte sector_address, byte block_address, byte auth_mode, byte key_index); + + int BlockInSectorWrite_AKM1(byte[] block_data, byte sector_address, byte block_address, byte auth_mode); + + int BlockInSectorWrite_AKM2(byte[] block_data, byte sector_address, byte block_address, byte auth_mode); + + int BlockInSectorWrite_PK(byte[] block_data, byte sector_address, byte block_address, byte auth_mode, byte[] pk_key); + + int ValueBlockRead(IntByReference value_read, ShortByReference value_address, byte block_address, byte auth_mode, byte key_index); + + int ValueBlockRead_AKM1(IntByReference value_read, ShortByReference value_address, byte block_address, byte auth_mode); + + int ValueBlockRead_AKM2(IntByReference value_read, ShortByReference value_address, byte block_address, byte auth_mode); + + int ValueBlockRead_PK(IntByReference value_read, ShortByReference value_address, byte block_address, byte auth_mode, byte[] pk_key); + + int ValueBlockWrite(int value_read, short value_address, byte block_address, byte auth_mode, byte key_index); + + int ValueBlockWrite_AKM1(int value_read, short value_address, byte block_address, byte auth_mode); + + int ValueBlockWrite_AKM2(int value_read, short value_address, byte block_address, byte auth_mode); + + int ValueBlockWrite_PK(int value_read, short value_address, byte block_address, byte auth_mode, byte[] pk_key); + + int ValueBlockIncrement(int incr_value, byte block_address, byte auth_mode, byte key_index); + + int ValueBlockIncrement_AKM1(int incr_value, byte block_address, byte auth_mode); + + int ValueBlockIncrement_AKM2(int incr_value, byte block_address, byte auth_mode); + + int ValueBlockIncrement_PK(int incr_value, byte block_address, byte auth_mode, byte[] pk_key); + + int ValueBlockDecrement(int incr_value, byte block_address, byte auth_mode, byte key_index); + + int ValueBlockDecrement_AKM1(int incr_value, byte block_address, byte auth_mode); + + int ValueBlockDecrement_AKM2(int incr_value, byte block_address, byte auth_mode); + + int ValueBlockDecrement_PK(int incr_value, byte block_address, byte auth_mode, byte[] pk_key); + + int ValueBlockInSectorRead(IntByReference read_data, ShortByReference value_address, byte sector_address, byte block_address, byte auth_mode, byte key_index); + + int ValueBlockInSectorRead_AKM1(IntByReference read_data, ShortByReference value_address, byte sector_address, byte block_address, byte auth_mode); + + int ValueBlockInSectorRead_AKM2(IntByReference read_data, ShortByReference value_address, byte sector_address, byte block_address, byte auth_mode); + + int ValueBlockInSectorRead_PK(IntByReference read_data, ShortByReference value_address, byte sector_address, byte block_address, byte auth_mode, byte[] pk_key); + + int ValueBlockInSectorWrite(int read_data, short value_address, byte sector_address, byte block_address, byte auth_mode, byte key_index); + + int ValueBlockInSectorWrite_AKM1(int read_data, short value_address, byte sector_address, byte block_address, byte auth_mode); + + int ValueBlockInSectorWrite_AKM2(int read_data, short value_address, byte sector_address, byte block_address, byte auth_mode); + + int ValueBlockInSectorWrite_PK(int read_data, short value_address, byte sector_address, byte block_address, byte auth_mode, byte[] pk_key); + + int ValueBlockInSectorIncrement(int read_data, byte sector_address, byte block_address, byte auth_mode, byte key_index); + + int ValueBlockInSectorIncrement_AKM1(int read_data, byte sector_address, byte block_address, byte auth_mode); + + int ValueBlockInSectorIncrement_AKM2(int read_data, byte sector_address, byte block_address, byte auth_mode); + + int ValueBlockInSectorIncrement_PK(int read_data, byte sector_address, byte block_address, byte auth_mode, byte[] pk_key); + + int ValueBlockInSectorDecrement(int read_data, byte sector_address, byte block_address, byte auth_mode, byte key_index); + + int ValueBlockInSectorDecrement_AKM1(int read_data, byte sector_address, byte block_address, byte auth_mode); + + int ValueBlockInSectorDecrement_AKM2(int read_data, byte sector_address, byte block_address, byte auth_mode); + + int ValueBlockInSectorDecrement_PK(int read_data, byte sector_address, byte block_address, byte auth_mode, byte[] pk_key); + + int LinearFormatCard(byte[] key_a, byte block_access_bits, byte sector_access_bits, byte sector_trailers_byte9, + byte[] key_b, ByteByReference sector_formatted, byte auth_mode, byte key_index); + + int LinearFormatCard_AKM1(byte[] key_a, byte block_access_bits, byte sector_access_bits, byte sector_trailers_byte9, + byte[] key_b, ByteByReference sector_formatted, byte auth_mode); + + int LinearFormatCard_AKM2(byte[] key_a, byte block_access_bits, byte sector_access_bits, byte sector_trailers_byte9, + byte[] key_b, ByteByReference sector_formatted, byte auth_mode); + + int LinearFormatCard_PK(byte[] key_a, byte block_access_bits, byte sector_access_bits, byte sector_trailers_byte9, + byte[] key_b, ByteByReference sector_formatted, byte auth_mode, byte[] pk_key); + + int SectorTrailerWrite(byte addressing_mode, byte address, byte[] key_a, byte block_access_bits0, + byte block_access_bits1, byte block_access_bits2, byte sector_trailer_access_bits, + byte sector_trailer_byte9, byte[] key_b, byte auth_mode, byte key_index); + + int SectorTrailerWrite_AKM1(byte addressing_mode, byte address, byte[] key_a, byte block_access_bits0, + byte block_access_bits1, byte block_access_bits2, byte sector_trailer_access_bits, + byte sector_trailer_byte9, byte[] key_b, byte auth_mode); + + int SectorTrailerWrite_AKM2(byte addressing_mode, byte address, byte[] key_a, byte block_access_bits0, + byte block_access_bits1, byte block_access_bits2, byte sector_trailer_access_bits, + byte sector_trailer_byte9, byte[] key_b, byte auth_mode); + + int SectorTrailerWrite_PK(byte addressing_mode, byte address, byte[] key_a, byte block_access_bits0, + byte block_access_bits1, byte block_access_bits2, byte sector_trailer_access_bits, + byte sector_trailer_byte9, byte[] key_b, byte auth_mode, byte[] pk_key); + + } +} diff --git a/uFCoderAdvanced/src/ufrcoderadvance/frmBlockInSectorReadWrite.java b/uFCoderAdvanced/src/ufrcoderadvance/frmBlockInSectorReadWrite.java index 1105fbb95c3f36512c33f02f8736317450b704ba..c2b5f2268fc9bcbbbf51232df3f1597efd0c7ca8 100644 --- a/uFCoderAdvanced/src/ufrcoderadvance/frmBlockInSectorReadWrite.java +++ b/uFCoderAdvanced/src/ufrcoderadvance/frmBlockInSectorReadWrite.java @@ -1182,7 +1182,7 @@ public class frmBlockInSectorReadWrite extends javax.swing.JInternalFrame { sector_address = Byte.parseByte(txtBRSectorAddress.getText()); block_address = Byte.parseByte(txtBRBlockAddress.getText()); txtBlockInSectorRead.setText(""); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.BlockInSectorRead(read_data, sector_address, block_address, auth_mode, key_index); + result = frmMain.UFRInstance.BlockInSectorRead(read_data, sector_address, block_address, auth_mode, key_index); if (result == DL_OK) { if (chkAscii.isSelected()) { @@ -1193,10 +1193,10 @@ public class frmBlockInSectorReadWrite extends javax.swing.JInternalFrame { } } txtBlockInSectorRead.setText(new String(read_data)); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException ex) { @@ -1242,7 +1242,7 @@ public class frmBlockInSectorReadWrite extends javax.swing.JInternalFrame { sector_address = Byte.parseByte(txtBRSectorAddressAKM2.getText()); block_address = Byte.parseByte(txtBRBlockAddressAKM2.getText()); txtBlockInSectorReadAKM2.setText(""); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.BlockInSectorRead_AKM2(read_data, sector_address, block_address, auth_mode); + result = frmMain.UFRInstance.BlockInSectorRead_AKM2(read_data, sector_address, block_address, auth_mode); if (result == DL_OK) { if (chkAscii.isSelected()) { @@ -1253,10 +1253,10 @@ public class frmBlockInSectorReadWrite extends javax.swing.JInternalFrame { } } txtBlockInSectorReadAKM2.setText(new String(read_data)); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException ex) { @@ -1302,7 +1302,7 @@ public class frmBlockInSectorReadWrite extends javax.swing.JInternalFrame { sector_address = Byte.parseByte(txtBRSectorAddressPK.getText()); block_address = Byte.parseByte(txtBRBlockAddressPK.getText()); txtBlockInSectorReadPK.setText(""); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.BlockInSectorRead_PK(read_data, sector_address, block_address, auth_mode, GL.PK_KEY(pnlHeader)); + result = frmMain.UFRInstance.BlockInSectorRead_PK(read_data, sector_address, block_address, auth_mode, GL.PK_KEY(pnlHeader)); if (result == DL_OK) { if (chkAscii.isSelected()) { @@ -1313,10 +1313,10 @@ public class frmBlockInSectorReadWrite extends javax.swing.JInternalFrame { } } txtBlockInSectorReadPK.setText(new String(read_data)); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException ex) { @@ -1363,7 +1363,7 @@ public class frmBlockInSectorReadWrite extends javax.swing.JInternalFrame { sector_address = Byte.parseByte(txtBRSectorAddressAKM1.getText()); block_address = Byte.parseByte(txtBRBlockAddressAKM1.getText()); txtBlockInSectorReadAKM1.setText(""); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.BlockInSectorRead_AKM1(read_data, sector_address, block_address, auth_mode); + result = frmMain.UFRInstance.BlockInSectorRead_AKM1(read_data, sector_address, block_address, auth_mode); if (result == DL_OK) { if (chkAscii.isSelected()) { @@ -1374,10 +1374,10 @@ public class frmBlockInSectorReadWrite extends javax.swing.JInternalFrame { } } txtBlockInSectorReadAKM1.setText(new String(read_data)); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException ex) { @@ -1429,12 +1429,12 @@ public class frmBlockInSectorReadWrite extends javax.swing.JInternalFrame { sector_address = Byte.parseByte(txtBWSectorAddress.getText()); block_address = Byte.parseByte(txtBWBlockAddress.getText()); write_data = txtBlockInSectorWrite.getText().getBytes(); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.BlockInSectorWrite(write_data, sector_address, block_address, auth_mode, key_index); + result = frmMain.UFRInstance.BlockInSectorWrite(write_data, sector_address, block_address, auth_mode, key_index); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { @@ -1485,12 +1485,12 @@ public class frmBlockInSectorReadWrite extends javax.swing.JInternalFrame { sector_address = Byte.parseByte(txtBWSectorAddressAKM1.getText()); block_address = Byte.parseByte(txtBWBlockAddressAKM1.getText()); write_data = txtBlockInSectorWriteAKM1.getText().getBytes(); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.BlockInSectorWrite_AKM1(write_data, sector_address, block_address, auth_mode); + result = frmMain.UFRInstance.BlockInSectorWrite_AKM1(write_data, sector_address, block_address, auth_mode); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { @@ -1541,12 +1541,12 @@ public class frmBlockInSectorReadWrite extends javax.swing.JInternalFrame { sector_address = Byte.parseByte(txtBWSectorAddressAKM2.getText()); block_address = Byte.parseByte(txtBWBlockAddressAKM2.getText()); write_data = txtBlockInSectorWriteAKM2.getText().getBytes(); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.BlockInSectorWrite_AKM2(write_data, sector_address, block_address, auth_mode); + result = frmMain.UFRInstance.BlockInSectorWrite_AKM2(write_data, sector_address, block_address, auth_mode); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { @@ -1597,12 +1597,12 @@ public class frmBlockInSectorReadWrite extends javax.swing.JInternalFrame { sector_address = Byte.parseByte(txtBWSectorAddressPK.getText()); block_address = Byte.parseByte(txtBWBlockAddressPK.getText()); write_data = txtBlockInSectorWritePK.getText().getBytes(); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.BlockInSectorWrite_PK(write_data, sector_address, block_address, auth_mode, GL.PK_KEY(pnlHeader)); + result = frmMain.UFRInstance.BlockInSectorWrite_PK(write_data, sector_address, block_address, auth_mode, GL.PK_KEY(pnlHeader)); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { diff --git a/uFCoderAdvanced/src/ufrcoderadvance/frmBlockReadWrite.java b/uFCoderAdvanced/src/ufrcoderadvance/frmBlockReadWrite.java index c5e612d4ddbd671617e5ffa2fae7481ee63e17a3..0430ffc92163d9747085e3df482cdc40cea042f0 100644 --- a/uFCoderAdvanced/src/ufrcoderadvance/frmBlockReadWrite.java +++ b/uFCoderAdvanced/src/ufrcoderadvance/frmBlockReadWrite.java @@ -1035,15 +1035,15 @@ public class frmBlockReadWrite extends javax.swing.JInternalFrame { } else { auth_mode = AUTH1B; } - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.BlockRead(bBlockData, block_address, auth_mode, key_index); + result = frmMain.UFRInstance.BlockRead(bBlockData, block_address, auth_mode, key_index); if (result == DL_OK) { System.arraycopy(bBlockData,0,bBlockDataBuffer,0,16); txtBlockRead.setText(ConvertToHex(chkBRHex.isSelected())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { @@ -1083,15 +1083,15 @@ public class frmBlockReadWrite extends javax.swing.JInternalFrame { } else { auth_mode = AUTH1B; } - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.BlockRead_AKM1(bBlockData, block_address, auth_mode); + result = frmMain.UFRInstance.BlockRead_AKM1(bBlockData, block_address, auth_mode); if (result == DL_OK) { System.arraycopy(bBlockData,0,bBlockDataBuffer,0,16); txtBlockReadAKM1.setText(ConvertToHex(chkBRHexAKM1.isSelected())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { @@ -1131,15 +1131,15 @@ public class frmBlockReadWrite extends javax.swing.JInternalFrame { } else { auth_mode = AUTH1B; } - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.BlockRead_AKM2(bBlockData, block_address, auth_mode); + result = frmMain.UFRInstance.BlockRead_AKM2(bBlockData, block_address, auth_mode); if (result == DL_OK) { System.arraycopy(bBlockData,0,bBlockDataBuffer,0,16); txtBlockReadAKM2.setText(ConvertToHex(chkBRHexAKM2.isSelected())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { @@ -1179,16 +1179,16 @@ public class frmBlockReadWrite extends javax.swing.JInternalFrame { } else { auth_mode = AUTH1B; } - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.BlockRead_PK(bBlockData, block_address, auth_mode, GL.PK_KEY(pnlHeader)); + result = frmMain.UFRInstance.BlockRead_PK(bBlockData, block_address, auth_mode, GL.PK_KEY(pnlHeader)); if (result == DL_OK) { System.arraycopy(bBlockData,0,bBlockDataBuffer,0,16); txtBlockReadPK.setText(ConvertToHex(chkBRHexPK.isSelected())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { @@ -1248,13 +1248,13 @@ public class frmBlockReadWrite extends javax.swing.JInternalFrame { } - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.BlockWrite(write_data, block_address, auth_mode, key_index); + result = frmMain.UFRInstance.BlockWrite(write_data, block_address, auth_mode, key_index); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } @@ -1307,13 +1307,13 @@ public class frmBlockReadWrite extends javax.swing.JInternalFrame { write_data=txtWriteDataAKM1.getText().getBytes(); } - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.BlockWrite_AKM1(write_data, block_address, auth_mode); + result = frmMain.UFRInstance.BlockWrite_AKM1(write_data, block_address, auth_mode); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } @@ -1367,13 +1367,13 @@ public class frmBlockReadWrite extends javax.swing.JInternalFrame { write_data=txtWriteDataAKM2.getText().getBytes(); } - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.BlockWrite_AKM2(write_data, block_address, auth_mode); + result = frmMain.UFRInstance.BlockWrite_AKM2(write_data, block_address, auth_mode); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } @@ -1425,13 +1425,13 @@ public class frmBlockReadWrite extends javax.swing.JInternalFrame { { write_data=txtWriteDataPK.getText().getBytes(); } - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.BlockWrite_PK(write_data, block_address, auth_mode, GL.PK_KEY(pnlHeader)); + result = frmMain.UFRInstance.BlockWrite_PK(write_data, block_address, auth_mode, GL.PK_KEY(pnlHeader)); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } diff --git a/uFCoderAdvanced/src/ufrcoderadvance/frmLinearFormatCard.java b/uFCoderAdvanced/src/ufrcoderadvance/frmLinearFormatCard.java index c68e34676063c3762235d12e2ac0b2f167150cf1..00afec99ac02c2bf0f02813760baa7452f38fc01 100644 --- a/uFCoderAdvanced/src/ufrcoderadvance/frmLinearFormatCard.java +++ b/uFCoderAdvanced/src/ufrcoderadvance/frmLinearFormatCard.java @@ -740,16 +740,16 @@ public class frmLinearFormatCard extends javax.swing.JInternalFrame { sector_access_bits = (byte) cboSectorTrailerAccessBits.getSelectedIndex(); sector_trailers_byte9 = Byte.parseByte(txtSectorTrailerByte9.getText()); - iResult = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.LinearFormatCard(GL.KEY(pnlKeyA, "txtLinearKeyA", chkHexKeyA), block_access_bits, sector_access_bits, + iResult = frmMain.UFRInstance.LinearFormatCard(GL.KEY(pnlKeyA, "txtLinearKeyA", chkHexKeyA), block_access_bits, sector_access_bits, sector_trailers_byte9, GL.KEY(pnlKeyB, "txtLinearKeyB", chkHexKeyB), sector_formatted, auth_mode, key_index); if (iResult == DL_OK) { txtSectorFormatted.setText(Byte.toString(sector_formatted.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(iResult, lblFunction_code, lblFunction_explain); } else { txtSectorFormatted.setText(Byte.toString(sector_formatted.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(iResult, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { @@ -789,16 +789,16 @@ public class frmLinearFormatCard extends javax.swing.JInternalFrame { sector_access_bits = (byte) cboSectorTrailerAccessBitsAKM1.getSelectedIndex(); sector_trailers_byte9 = Byte.parseByte(txtSectorTrailerByte9AKM1.getText()); - iResult = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.LinearFormatCard_AKM1(GL.KEY(pnlKeyA, "txtLinearKeyA", chkHexKeyA), block_access_bits, sector_access_bits, + iResult = frmMain.UFRInstance.LinearFormatCard_AKM1(GL.KEY(pnlKeyA, "txtLinearKeyA", chkHexKeyA), block_access_bits, sector_access_bits, sector_trailers_byte9, GL.KEY(pnlKeyB, "txtLinearKeyB", chkHexKeyB), sector_formatted, auth_mode); if (iResult == DL_OK) { txtSectorFormattedAKM1.setText(Byte.toString(sector_formatted.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(iResult, lblFunction_code, lblFunction_explain); } else { txtSectorFormattedAKM1.setText(Byte.toString(sector_formatted.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(iResult, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { @@ -838,16 +838,16 @@ public class frmLinearFormatCard extends javax.swing.JInternalFrame { sector_access_bits = (byte) cboSectorTrailerAccessBitsAKM2.getSelectedIndex(); sector_trailers_byte9 = Byte.parseByte(txtSectorTrailerByte9AKM2.getText()); - iResult = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.LinearFormatCard_AKM2(GL.KEY(pnlKeyA, "txtLinearKeyA", chkHexKeyA), block_access_bits, sector_access_bits, + iResult = frmMain.UFRInstance.LinearFormatCard_AKM2(GL.KEY(pnlKeyA, "txtLinearKeyA", chkHexKeyA), block_access_bits, sector_access_bits, sector_trailers_byte9, GL.KEY(pnlKeyB, "txtLinearKeyB", chkHexKeyB), sector_formatted, auth_mode); if (iResult == DL_OK) { txtSectorFormattedAKM2.setText(Byte.toString(sector_formatted.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(iResult, lblFunction_code, lblFunction_explain); } else { txtSectorFormattedAKM2.setText(Byte.toString(sector_formatted.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(iResult, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { @@ -887,16 +887,16 @@ public class frmLinearFormatCard extends javax.swing.JInternalFrame { sector_access_bits = (byte) cboSectorTrailerAccessBitsPK.getSelectedIndex(); sector_trailers_byte9 = Byte.parseByte(txtSectorTrailerByte9PK.getText()); - iResult = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.LinearFormatCard_PK(GL.KEY(pnlKeyA, "txtLinearKeyA", chkHexKeyA), block_access_bits, sector_access_bits, + iResult = frmMain.UFRInstance.LinearFormatCard_PK(GL.KEY(pnlKeyA, "txtLinearKeyA", chkHexKeyA), block_access_bits, sector_access_bits, sector_trailers_byte9, GL.KEY(pnlKeyB, "txtLinearKeyB", chkHexKeyB), sector_formatted, auth_mode, GL.PK_KEY(pnlHeader)); if (iResult == DL_OK) { txtSectorFormattedPK.setText(Byte.toString(sector_formatted.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(iResult, lblFunction_code, lblFunction_explain); } else { txtSectorFormattedPK.setText(Byte.toString(sector_formatted.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(iResult, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { diff --git a/uFCoderAdvanced/src/ufrcoderadvance/frmLinearReadWrite.form b/uFCoderAdvanced/src/ufrcoderadvance/frmLinearReadWrite.form index 91de246cf915d76fe1b3708c3ef491e5dc380d91..e7746f46034d496473f786a6ffaf9e14c5b76f8c 100644 --- a/uFCoderAdvanced/src/ufrcoderadvance/frmLinearReadWrite.form +++ b/uFCoderAdvanced/src/ufrcoderadvance/frmLinearReadWrite.form @@ -342,13 +342,13 @@ - + - + @@ -359,7 +359,7 @@ - + @@ -617,7 +617,7 @@ - + @@ -824,7 +824,7 @@ - + @@ -1005,7 +1005,7 @@ - + @@ -1013,7 +1013,7 @@ - + @@ -1023,8 +1023,8 @@ - - + + @@ -1041,7 +1041,7 @@ - + @@ -1070,7 +1070,7 @@ - + @@ -1218,14 +1218,14 @@ - + - + @@ -1251,7 +1251,7 @@ - + @@ -1265,7 +1265,7 @@ - + @@ -1289,7 +1289,7 @@ - + @@ -1418,7 +1418,7 @@ - + @@ -1485,7 +1485,7 @@ - + @@ -1667,7 +1667,7 @@ - + diff --git a/uFCoderAdvanced/src/ufrcoderadvance/frmLinearReadWrite.java b/uFCoderAdvanced/src/ufrcoderadvance/frmLinearReadWrite.java index 6d3ad5f0099d671d30e3135f075dfaa80cfd3d9b..b9d9222fa416b35d257d157627eb29216605a001 100644 --- a/uFCoderAdvanced/src/ufrcoderadvance/frmLinearReadWrite.java +++ b/uFCoderAdvanced/src/ufrcoderadvance/frmLinearReadWrite.java @@ -2324,7 +2324,7 @@ public class frmLinearReadWrite extends javax.swing.JInternalFrame { linear_address = Short.parseShort(txtLRLinearAddress.getText()); data_length = Short.parseShort(txtLRDataLength.getText()); txtReadBytes.setText(""); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.LinearRead(read_data, linear_address, data_length, bytes_ret, auth_mode, key_index); + result = frmMain.UFRInstance.LinearRead(read_data, linear_address, data_length, bytes_ret, auth_mode, key_index); if (result == DL_OK) { if (chkAscii.isSelected()) { for (int br = 0; br < data_length; br++) { @@ -2335,12 +2335,12 @@ public class frmLinearReadWrite extends javax.swing.JInternalFrame { } txtLinearRead.setText(new String(read_data, 0, data_length)); txtReadBytes.setText(Short.toString(bytes_ret.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { txtLinearRead.setText(new String(read_data, 0, data_length)); txtReadBytes.setText(Short.toString(bytes_ret.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException e) { @@ -2388,7 +2388,7 @@ public class frmLinearReadWrite extends javax.swing.JInternalFrame { linear_address = Short.parseShort(txtLRLinearAddressAKM1.getText()); data_length = Short.parseShort(txtLRDataLengthAKM1.getText()); txtReadBytesAKM1.setText(""); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.LinearRead_AKM1(read_data, linear_address, data_length, bytes_ret, auth_mode); + result = frmMain.UFRInstance.LinearRead_AKM1(read_data, linear_address, data_length, bytes_ret, auth_mode); if (result == DL_OK) { if (chkAsciiAKM1.isSelected()) { for (int br = 0; br < data_length; br++) { @@ -2400,13 +2400,13 @@ public class frmLinearReadWrite extends javax.swing.JInternalFrame { txtLinearReadAKM1.setText(new String(read_data, 0, data_length)); txtReadBytesAKM1.setText(Short.toString(bytes_ret.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { txtLinearReadAKM1.setText(new String(read_data, 0, data_length)); txtReadBytesAKM1.setText(Short.toString(bytes_ret.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException e) { @@ -2461,15 +2461,15 @@ public class frmLinearReadWrite extends javax.swing.JInternalFrame { txtBytesWritten.setText(""); write_data = txtLinearWrite.getText().getBytes(); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.LinearWrite(new Global().WriteArray(write_data, data_length, MAX_BYTES), linear_address, data_length, bytes_written, auth_mode, key_index); + result = frmMain.UFRInstance.LinearWrite(new Global().WriteArray(write_data, data_length, MAX_BYTES), linear_address, data_length, bytes_written, auth_mode, key_index); if (result == DL_OK) { txtBytesWritten.setText(Short.toString(bytes_written.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { txtBytesWritten.setText(Short.toString(bytes_written.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { @@ -2524,15 +2524,15 @@ public class frmLinearReadWrite extends javax.swing.JInternalFrame { txtBytesWrittenAKM1.setText(""); write_data = txtLinearWriteAKM1.getText().getBytes(); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.LinearWrite_AKM1(new Global().WriteArray(write_data, data_length, MAX_BYTES), linear_address, data_length, bytes_written, auth_mode); + result = frmMain.UFRInstance.LinearWrite_AKM1(new Global().WriteArray(write_data, data_length, MAX_BYTES), linear_address, data_length, bytes_written, auth_mode); if (result == DL_OK) { txtBytesWrittenAKM1.setText(Short.toString(bytes_written.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { txtBytesWrittenAKM1.setText(Short.toString(bytes_written.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { @@ -2615,7 +2615,7 @@ public class frmLinearReadWrite extends javax.swing.JInternalFrame { linear_address = Short.parseShort(txtLRLinearAddressAKM2.getText()); data_length = Short.parseShort(txtLRDataLengthAKM2.getText()); txtReadBytesAKM2.setText(""); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.LinearRead_AKM2(read_data, linear_address, data_length, bytes_ret, auth_mode); + result = frmMain.UFRInstance.LinearRead_AKM2(read_data, linear_address, data_length, bytes_ret, auth_mode); if (result == DL_OK) { if (chkAsciiAKM2.isSelected()) { for (int br = 0; br < data_length; br++) { @@ -2626,13 +2626,13 @@ public class frmLinearReadWrite extends javax.swing.JInternalFrame { } txtLinearReadAKM2.setText(new String(read_data, 0, data_length)); txtReadBytesAKM2.setText(Short.toString(bytes_ret.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { txtLinearReadAKM2.setText(new String(read_data, 0, data_length)); txtReadBytesAKM2.setText(Integer.toString(bytes_ret.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException e) { @@ -2679,7 +2679,7 @@ public class frmLinearReadWrite extends javax.swing.JInternalFrame { linear_address = Short.parseShort(txtLRLinearAddressPK.getText()); data_length = Short.parseShort(txtLRDataLengthPK.getText()); txtReadBytesPK.setText(""); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.LinearRead_PK(read_data, linear_address, data_length, bytes_ret, auth_mode, GL.PK_KEY(pnlHeader)); + result = frmMain.UFRInstance.LinearRead_PK(read_data, linear_address, data_length, bytes_ret, auth_mode, GL.PK_KEY(pnlHeader)); if (result == DL_OK) { if (chkAsciiPK.isSelected()) { for (int br = 0; br < data_length; br++) { @@ -2691,13 +2691,13 @@ public class frmLinearReadWrite extends javax.swing.JInternalFrame { txtLinearReadPK.setText(new String(read_data, 0, data_length)); txtReadBytesPK.setText(Short.toString(bytes_ret.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { txtLinearReadPK.setText(new String(read_data, 0, data_length)); txtReadBytesPK.setText(Short.toString(bytes_ret.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException e) { @@ -2751,15 +2751,15 @@ public class frmLinearReadWrite extends javax.swing.JInternalFrame { txtBytesWrittenAKM2.setText(""); write_data = txtLinearWriteAKM2.getText().getBytes(); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.LinearWrite_AKM2(new Global().WriteArray(write_data, data_length, MAX_BYTES), linear_address, data_length, bytes_written, auth_mode); + result = frmMain.UFRInstance.LinearWrite_AKM2(new Global().WriteArray(write_data, data_length, MAX_BYTES), linear_address, data_length, bytes_written, auth_mode); if (result == DL_OK) { txtBytesWrittenAKM2.setText(Short.toString(bytes_written.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { txtBytesWrittenAKM2.setText(Short.toString(bytes_written.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { @@ -2812,14 +2812,14 @@ public class frmLinearReadWrite extends javax.swing.JInternalFrame { data_length = Short.parseShort(txtLWDataLengthPK.getText()); txtBytesWrittenPK.setText(""); write_data = txtLinearWritePK.getText().getBytes(); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.LinearWrite_PK(new Global().WriteArray(write_data, data_length, MAX_BYTES), linear_address, data_length, bytes_written, auth_mode, GL.PK_KEY(pnlHeader)); + result = frmMain.UFRInstance.LinearWrite_PK(new Global().WriteArray(write_data, data_length, MAX_BYTES), linear_address, data_length, bytes_written, auth_mode, GL.PK_KEY(pnlHeader)); if (result == DL_OK) { txtBytesWrittenPK.setText(Short.toString(bytes_written.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { txtBytesWrittenPK.setText(Short.toString(bytes_written.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { diff --git a/uFCoderAdvanced/src/ufrcoderadvance/frmMain.java b/uFCoderAdvanced/src/ufrcoderadvance/frmMain.java index 4db450edfd62afe7d7ea207765d40df032ec50c8..2346477591c326b88646f9ea537f478409465061 100644 --- a/uFCoderAdvanced/src/ufrcoderadvance/frmMain.java +++ b/uFCoderAdvanced/src/ufrcoderadvance/frmMain.java @@ -1,10 +1,13 @@ package ufrcoderadvance; +import com.sun.jna.Native; import com.sun.jna.Platform; import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.*; import java.util.concurrent.*; +import static ufrcoderadvance.UfrCoder.GetLibFullPath; +import ufrcoderadvance.UfrCoder.uFrFunctions; public class frmMain extends javax.swing.JFrame { @@ -27,6 +30,8 @@ public class frmMain extends javax.swing.JFrame { ExecutorService exec = Executors.newCachedThreadPool(); private Global GL = new Global(); + public static uFrFunctions UFRInstance; + public static void ReaderOn() { reader_stop = false; } @@ -34,26 +39,15 @@ public class frmMain extends javax.swing.JFrame { public static void ReaderOff() { reader_stop = true; } - - /************************************* - - * Platform.getOSType() - * const-value: - * Linux=1,Windows=2; - * - **************************************/ - - public static String PlatformOsType(){ - String platform_lib = null; - switch(Platform.getOSType()){ - case 1:platform_lib =(Platform.is64Bit() ? "libuFCoder1x64.so" : "libuFCoder1x86.so"); - break; - case 2:platform_lib="uFCoder1x.dll"; - } - return platform_lib; - } + public frmMain() { initComponents(); + try { + UFRInstance = (uFrFunctions) Native.loadLibrary(GetLibFullPath(false), uFrFunctions.class); + } catch (UnsatisfiedLinkError e) { + JOptionPane.showMessageDialog(null, "Unable to load library for path : " + GetLibFullPath(false)); + } + } @SuppressWarnings("unchecked") @@ -683,11 +677,11 @@ public class frmMain extends javax.swing.JFrame { return; } try { - function_result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(cboLightMode.getSelectedIndex(), cboSoundMode.getSelectedIndex()); + function_result = UFRInstance.ReaderUISignal(cboLightMode.getSelectedIndex(), cboSoundMode.getSelectedIndex()); if (function_result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); } } finally { ReaderOn(); @@ -708,11 +702,11 @@ public class frmMain extends javax.swing.JFrame { return; } try { - function_result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderSoftRestart(); + function_result = UFRInstance.ReaderSoftRestart(); if (function_result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); } } finally { ReaderOn(); @@ -733,11 +727,11 @@ public class frmMain extends javax.swing.JFrame { return; } try { - function_result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderReset(); + function_result = UFRInstance.ReaderReset(); if (function_result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); } } finally { ReaderOn(); @@ -750,7 +744,7 @@ public class frmMain extends javax.swing.JFrame { // frmLinearReadWrite LRW=new frmLinearReadWrite(); // GL.AddFrame(LRW,pnlDesktop,lblHeader,"Linear Read/Write (AKM1,AKM2,PK)"); - // GL.CreateKey(27, 20, 31, 29, "txtReaderKey", pnlReaderKey); + // GL.CreateKey(27, 20, 31, 29, "txtReaderKey", pnlReaderKey); }//GEN-LAST:event_formWindowActivated @@ -813,8 +807,7 @@ public class frmMain extends javax.swing.JFrame { }//GEN-LAST:event_mnuViewAllItemsActionPerformed private void formWindowOpened(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_formWindowOpened - - + frmLinearReadWrite LRW = new frmLinearReadWrite(); GL.AddFrame(LRW, pnlDesktop, lblHeader, "Linear Read/Write (AKM1,AKM2,PK)"); GL.CreateKey(27, 20, 31, 29, "txtReaderKey", pnlReaderKey); @@ -823,10 +816,10 @@ public class frmMain extends javax.swing.JFrame { }//GEN-LAST:event_formWindowOpened private void chkHexItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_chkHexItemStateChanged - GL.Check_box(pnlReaderKey, "txtReaderKey", evt); - GL.HEX_BOX=chkHex; - GL.TEXTFIELD="txtReaderKey"; - + GL.Check_box(pnlReaderKey, "txtReaderKey", evt); + GL.HEX_BOX = chkHex; + GL.TEXTFIELD = "txtReaderKey"; + }//GEN-LAST:event_chkHexItemStateChanged private void btnSaveUserDataActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnSaveUserDataActionPerformed @@ -840,35 +833,31 @@ public class frmMain extends javax.swing.JFrame { ReaderOn(); functionOn = false; return; - } - try - { - if (txtNewUserData.getText().trim().isEmpty()) - { - JOptionPane.showMessageDialog(rootPane,"You must enter any data !", -"Warning !", JOptionPane.WARNING_MESSAGE); - txtNewUserData.requestFocus(); - return; - } - byte[] new_user_data=new byte[16]; - new_user_data=txtNewUserData.getText().getBytes(); - - result=UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.WriteUserData(new_user_data); - if (result==DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK,RES_SOUND_OK); - } - else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT,ERR_SOUND); - } } - finally { + try { + if (txtNewUserData.getText().trim().isEmpty()) { + JOptionPane.showMessageDialog(rootPane, "You must enter any data !", + "Warning !", JOptionPane.WARNING_MESSAGE); + txtNewUserData.requestFocus(); + return; + } + byte[] new_user_data = new byte[16]; + new_user_data = txtNewUserData.getText().getBytes(); + + result = UFRInstance.WriteUserData(new_user_data); + if (result == DL_OK) { + UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + } else { + UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + } + } finally { ReaderOn(); functionOn = false; } }//GEN-LAST:event_btnSaveUserDataActionPerformed private void btnReaderSaveKeyActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnReaderSaveKeyActionPerformed - + if (functionOn) { return; } @@ -879,34 +868,29 @@ public class frmMain extends javax.swing.JFrame { functionOn = false; return; } - - int iFunctionResult=0; - byte bKeyIndex=0; - - try - { - bKeyIndex=(byte)Integer.parseInt(cboKeyIndex.getSelectedItem().toString()); - iFunctionResult=UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderKeyWrite(GL.KEY(pnlReaderKey,"txtReaderKey", chkHex), bKeyIndex); - if (iFunctionResult==DL_OK){ - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK,RES_SOUND_OK); - } - else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT,ERR_SOUND); - } - - } - finally{ - ReaderOn(); - functionOn = false; + + int iFunctionResult = 0; + byte bKeyIndex = 0; + + try { + bKeyIndex = (byte) Integer.parseInt(cboKeyIndex.getSelectedItem().toString()); + iFunctionResult = UFRInstance.ReaderKeyWrite(GL.KEY(pnlReaderKey, "txtReaderKey", chkHex), bKeyIndex); + if (iFunctionResult == DL_OK) { + UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + } else { + UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + } + + } finally { + ReaderOn(); + functionOn = false; } }//GEN-LAST:event_btnReaderSaveKeyActionPerformed - - - private void MainThread() { + private void MainThread() { thread_start = true; if (!CONN) { - if ((result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderOpen()) == DL_OK) { + if ((result = UFRInstance.ReaderOpen()) == DL_OK) { lblConnected.setText("CONNECTED"); GL.ERRORS_CODE(result, lblReader_function_error, lblReader_function_expl); @@ -922,34 +906,33 @@ public class frmMain extends javax.swing.JFrame { } } if (CONN) { - if ((result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.GetReaderType(reader_type)) == DL_OK) { + if ((result = UFRInstance.GetReaderType(reader_type)) == DL_OK) { txtReaderType.setText("0x" + Integer.toHexString(reader_type[0]).toUpperCase()); - if ((result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.GetReaderSerialNumber(reader_serial)) == DL_OK) { - txtReaderSerial.setText("0x" + Integer.toHexString(reader_serial[0]).toUpperCase()); - GL.ERRORS_CODE(result, lblReader_function_error, lblReader_function_expl); - } + if ((result = UFRInstance.GetReaderSerialNumber(reader_serial)) == DL_OK) { + txtReaderSerial.setText("0x" + Integer.toHexString(reader_serial[0]).toUpperCase()); + GL.ERRORS_CODE(result, lblReader_function_error, lblReader_function_expl); + } + + if ((result = UFRInstance.GetCardId(card_id, card_serial)) == DL_OK) { + txtCardType.setText("0x" + Integer.toHexString(card_id[0])); + txtCardSerial.setText("0x" + Integer.toHexString(card_serial[0]).toUpperCase()); + GL.ERRORS_CODE(result, lblCard_funct_error, lblCard_funct_explain); + } else { + txtCardType.setText(null); + txtCardSerial.setText(null); + GL.ERRORS_CODE(result, lblCard_funct_error, lblCard_funct_explain); + } - if ((result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.GetCardId(card_id, card_serial)) == DL_OK) { - txtCardType.setText("0x" + Integer.toHexString(card_id[0])); - txtCardSerial.setText("0x" + Integer.toHexString(card_serial[0]).toUpperCase()); - GL.ERRORS_CODE(result, lblCard_funct_error, lblCard_funct_explain); - } else { - txtCardType.setText(null); - txtCardSerial.setText(null); - GL.ERRORS_CODE(result, lblCard_funct_error, lblCard_funct_explain); - } - } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderClose(); + UFRInstance.ReaderClose(); CONN = false; } - - if ((result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReadUserData(read_user_data)) == DL_OK) - + if ((result = UFRInstance.ReadUserData(read_user_data)) == DL_OK) { txtReadUserData.setText(new String(read_user_data)); - + } + } thread_start = false; } @@ -963,7 +946,7 @@ public class frmMain extends javax.swing.JFrame { if (!reader_stop) { MainThread(); } - TimeUnit.MILLISECONDS.sleep(sleep_value); + TimeUnit.MILLISECONDS.sleep(sleep_value); } } catch (InterruptedException ex) { Logger.getLogger(frmMain.class.getName()).log(Level.SEVERE, null, ex); @@ -1002,7 +985,6 @@ public class frmMain extends javax.swing.JFrame { } }); - } // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton btnReaderReset; diff --git a/uFCoderAdvanced/src/ufrcoderadvance/frmSectorTrailerWrite.java b/uFCoderAdvanced/src/ufrcoderadvance/frmSectorTrailerWrite.java index ceb150b39ade75c7cdd15dabfd4338874c6fe27a..a65a4ae204da21ca43f585b5fbea4e5537c71c53 100644 --- a/uFCoderAdvanced/src/ufrcoderadvance/frmSectorTrailerWrite.java +++ b/uFCoderAdvanced/src/ufrcoderadvance/frmSectorTrailerWrite.java @@ -931,17 +931,17 @@ public class frmSectorTrailerWrite extends javax.swing.JInternalFrame { block_access_bits2 = (byte) cboAccessBits2.getSelectedIndex(); sector_trailer_access_bits = (byte) cboTrailerAccessBits.getSelectedIndex(); sector_trailer_byte9 = Byte.parseByte(txtTrailerByte9.getText()); - iResult = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.SectorTrailerWrite(addressing_mode, address, GL.KEY(pnlKeyA, "txtSectorKeyA", chkHexKeyA), + iResult = frmMain.UFRInstance.SectorTrailerWrite(addressing_mode, address, GL.KEY(pnlKeyA, "txtSectorKeyA", chkHexKeyA), block_access_bits0, block_access_bits1, block_access_bits2, sector_trailer_access_bits, sector_trailer_byte9, GL.KEY(pnlKeyB, "txtSectorKeyB", chkHexKeyB), auth_mode, key_index); if (iResult == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(iResult, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(iResult, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nef) { @@ -996,17 +996,17 @@ public class frmSectorTrailerWrite extends javax.swing.JInternalFrame { block_access_bits2 = (byte) cboAccessBits2AKM1.getSelectedIndex(); sector_trailer_access_bits = (byte) cboTrailerAccessBitsAKM1.getSelectedIndex(); sector_trailer_byte9 = Byte.parseByte(txtTrailerByte9AKM1.getText()); - iResult = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.SectorTrailerWrite_AKM1(addressing_mode, address, GL.KEY(pnlKeyA, "txtSectorKeyA", chkHexKeyA), + iResult = frmMain.UFRInstance.SectorTrailerWrite_AKM1(addressing_mode, address, GL.KEY(pnlKeyA, "txtSectorKeyA", chkHexKeyA), block_access_bits0, block_access_bits1, block_access_bits2, sector_trailer_access_bits, sector_trailer_byte9, GL.KEY(pnlKeyB, "txtSectorKeyB", chkHexKeyB), auth_mode); if (iResult == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(iResult, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(iResult, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nef) { @@ -1060,17 +1060,17 @@ public class frmSectorTrailerWrite extends javax.swing.JInternalFrame { block_access_bits2 = (byte) cboAccessBits2AKM2.getSelectedIndex(); sector_trailer_access_bits = (byte) cboTrailerAccessBitsAKM2.getSelectedIndex(); sector_trailer_byte9 = Byte.parseByte(txtTrailerByte9AKM2.getText()); - iResult = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.SectorTrailerWrite_AKM2(addressing_mode, address, GL.KEY(pnlKeyA, "txtSectorKeyA", chkHexKeyA), + iResult = frmMain.UFRInstance.SectorTrailerWrite_AKM2(addressing_mode, address, GL.KEY(pnlKeyA, "txtSectorKeyA", chkHexKeyA), block_access_bits0, block_access_bits1, block_access_bits2, sector_trailer_access_bits, sector_trailer_byte9, GL.KEY(pnlKeyB, "txtSectorKeyB", chkHexKeyB), auth_mode); if (iResult == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(iResult, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(iResult, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nef) { @@ -1124,17 +1124,17 @@ public class frmSectorTrailerWrite extends javax.swing.JInternalFrame { block_access_bits2 = (byte) cboAccessBits2PK.getSelectedIndex(); sector_trailer_access_bits = (byte) cboTrailerAccessBitsPK.getSelectedIndex(); sector_trailer_byte9 = Byte.parseByte(txtTrailerByte9PK.getText()); - iResult = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.SectorTrailerWrite_PK(addressing_mode, address, GL.KEY(pnlKeyA, "txtSectorKeyA", chkHexKeyA), + iResult = frmMain.UFRInstance.SectorTrailerWrite_PK(addressing_mode, address, GL.KEY(pnlKeyA, "txtSectorKeyA", chkHexKeyA), block_access_bits0, block_access_bits1, block_access_bits2, sector_trailer_access_bits, sector_trailer_byte9, GL.KEY(pnlKeyB, "txtSectorKeyB", chkHexKeyB), auth_mode, GL.PK_KEY(pnlHeader)); if (iResult == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(iResult, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(iResult, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nef) { diff --git a/uFCoderAdvanced/src/ufrcoderadvance/frmValueBlockInSectorIncrDecr.form b/uFCoderAdvanced/src/ufrcoderadvance/frmValueBlockInSectorIncrDecr.form index bda0ba9ac6f5435282d9396ec17966f9340397a6..393ecdab2aec04d86ca25f955a31fde998f5f697 100644 --- a/uFCoderAdvanced/src/ufrcoderadvance/frmValueBlockInSectorIncrDecr.form +++ b/uFCoderAdvanced/src/ufrcoderadvance/frmValueBlockInSectorIncrDecr.form @@ -1,4 +1,4 @@ - + @@ -41,7 +41,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -221,15 +221,15 @@ - + - - + + @@ -360,8 +360,8 @@ - - + + @@ -378,7 +378,7 @@ - + @@ -526,8 +526,8 @@ - - + + @@ -544,7 +544,7 @@ - + @@ -692,8 +692,8 @@ - - + + @@ -710,7 +710,7 @@ - + @@ -858,8 +858,8 @@ - - + + @@ -876,7 +876,7 @@ - + @@ -1073,8 +1073,8 @@ - - + + @@ -1239,8 +1239,8 @@ - - + + @@ -1405,8 +1405,8 @@ - - + + @@ -1571,8 +1571,8 @@ - - + + diff --git a/uFCoderAdvanced/src/ufrcoderadvance/frmValueBlockInSectorIncrDecr.java b/uFCoderAdvanced/src/ufrcoderadvance/frmValueBlockInSectorIncrDecr.java index 59cd8f9cd85f92d2363e52af99364730b8602d83..e67aac4e66e416381aaf9ff6f00b40fb4e2a92f0 100644 --- a/uFCoderAdvanced/src/ufrcoderadvance/frmValueBlockInSectorIncrDecr.java +++ b/uFCoderAdvanced/src/ufrcoderadvance/frmValueBlockInSectorIncrDecr.java @@ -1047,12 +1047,12 @@ public class frmValueBlockInSectorIncrDecr extends javax.swing.JInternalFrame { increment_value = Integer.parseInt(txtVBISIncrementValue.getText()); sector_address = Byte.parseByte(txtVBISIncrSectorAddress.getText()); block_address = Byte.parseByte(txtVBISIncrBlockAddress.getText()); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockInSectorIncrement(increment_value, sector_address, block_address, auth_mode, key_index); + result = frmMain.UFRInstance.ValueBlockInSectorIncrement(increment_value, sector_address, block_address, auth_mode, key_index); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } @@ -1104,12 +1104,12 @@ public class frmValueBlockInSectorIncrDecr extends javax.swing.JInternalFrame { increment_value = Integer.parseInt(txtVBISIncrementValueAKM1.getText()); sector_address = Byte.parseByte(txtVBISIncrSectorAddressAKM1.getText()); block_address = Byte.parseByte(txtVBISIncrBlockAddressAKM1.getText()); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockInSectorIncrement_AKM1(increment_value, sector_address, block_address, auth_mode); + result = frmMain.UFRInstance.ValueBlockInSectorIncrement_AKM1(increment_value, sector_address, block_address, auth_mode); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } @@ -1161,12 +1161,12 @@ public class frmValueBlockInSectorIncrDecr extends javax.swing.JInternalFrame { increment_value = Integer.parseInt(txtVBISIncrementValueAKM2.getText()); sector_address = Byte.parseByte(txtVBISIncrSectorAddressAKM2.getText()); block_address = Byte.parseByte(txtVBISIncrBlockAddressAKM2.getText()); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockInSectorIncrement_AKM2(increment_value, sector_address, block_address, auth_mode); + result = frmMain.UFRInstance.ValueBlockInSectorIncrement_AKM2(increment_value, sector_address, block_address, auth_mode); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } @@ -1218,12 +1218,12 @@ public class frmValueBlockInSectorIncrDecr extends javax.swing.JInternalFrame { increment_value = Integer.parseInt(txtVBISIncrementValuePK.getText()); sector_address = Byte.parseByte(txtVBISIncrSectorAddressPK.getText()); block_address = Byte.parseByte(txtVBISIncrBlockAddressPK.getText()); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockInSectorIncrement_PK(increment_value, sector_address, block_address, auth_mode, GL.PK_KEY(pnlHeader)); + result = frmMain.UFRInstance.ValueBlockInSectorIncrement_PK(increment_value, sector_address, block_address, auth_mode, GL.PK_KEY(pnlHeader)); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } @@ -1276,12 +1276,12 @@ public class frmValueBlockInSectorIncrDecr extends javax.swing.JInternalFrame { decrement_value = Integer.parseInt(txtVBISDecrementValue.getText()); sector_address = Byte.parseByte(txtVBISDecrSectorAddress.getText()); block_address = Byte.parseByte(txtVBISDecrBlockAddress.getText()); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockInSectorDecrement(decrement_value, sector_address, block_address, auth_mode, key_index); + result = frmMain.UFRInstance.ValueBlockInSectorDecrement(decrement_value, sector_address, block_address, auth_mode, key_index); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } @@ -1333,12 +1333,12 @@ public class frmValueBlockInSectorIncrDecr extends javax.swing.JInternalFrame { decrement_value = Integer.parseInt(txtVBISDecrementValueAKM1.getText()); sector_address = Byte.parseByte(txtVBISDecrSectorAddressAKM1.getText()); block_address = Byte.parseByte(txtVBISDecrBlockAddressAKM1.getText()); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockInSectorDecrement_AKM1(decrement_value, sector_address, block_address, auth_mode); + result = frmMain.UFRInstance.ValueBlockInSectorDecrement_AKM1(decrement_value, sector_address, block_address, auth_mode); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { @@ -1388,12 +1388,12 @@ public class frmValueBlockInSectorIncrDecr extends javax.swing.JInternalFrame { decrement_value = Integer.parseInt(txtVBISDecrementValueAKM2.getText()); sector_address = Byte.parseByte(txtVBISDecrSectorAddressAKM2.getText()); block_address = Byte.parseByte(txtVBISDecrBlockAddressAKM2.getText()); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockInSectorDecrement_AKM2(decrement_value, sector_address, block_address, auth_mode); + result = frmMain.UFRInstance.ValueBlockInSectorDecrement_AKM2(decrement_value, sector_address, block_address, auth_mode); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { @@ -1444,12 +1444,12 @@ public class frmValueBlockInSectorIncrDecr extends javax.swing.JInternalFrame { decrement_value = Integer.parseInt(txtVBISDecrementValuePK.getText()); sector_address = Byte.parseByte(txtVBISDecrSectorAddressPK.getText()); block_address = Byte.parseByte(txtVBISDecrBlockAddressPK.getText()); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockInSectorDecrement_PK(decrement_value, sector_address, block_address, auth_mode, GL.PK_KEY(pnlHeader)); + result = frmMain.UFRInstance.ValueBlockInSectorDecrement_PK(decrement_value, sector_address, block_address, auth_mode, GL.PK_KEY(pnlHeader)); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { diff --git a/uFCoderAdvanced/src/ufrcoderadvance/frmValueBlockInSectorReadWrite.java b/uFCoderAdvanced/src/ufrcoderadvance/frmValueBlockInSectorReadWrite.java index 28c2ce7b51550d24ad4d6264c305c16ccef32114..7d7d4b5c527fff0c70e452bae1fca42303c72615 100644 --- a/uFCoderAdvanced/src/ufrcoderadvance/frmValueBlockInSectorReadWrite.java +++ b/uFCoderAdvanced/src/ufrcoderadvance/frmValueBlockInSectorReadWrite.java @@ -1293,14 +1293,14 @@ public class frmValueBlockInSectorReadWrite extends javax.swing.JInternalFrame { sector_address = Byte.parseByte(txtVBISRSectorAddress.getText()); block_address = Byte.parseByte(txtVBISRBlockAddress.getText()); txtValueBlockInSectorRead.setText(""); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockInSectorRead(read_data, value_address, sector_address, block_address, auth_mode, key_index); + result = frmMain.UFRInstance.ValueBlockInSectorRead(read_data, value_address, sector_address, block_address, auth_mode, key_index); if (result == DL_OK) { txtValueBlockInSectorRead.setText(Integer.toString(read_data.getValue())); txtValueAddress.setText(Short.toString(value_address.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException ex) { @@ -1348,14 +1348,14 @@ public class frmValueBlockInSectorReadWrite extends javax.swing.JInternalFrame { sector_address = Byte.parseByte(txtVBISRSectorAddressAKM1.getText()); block_address = Byte.parseByte(txtVBISRBlockAddressAKM1.getText()); txtValueBlockInSectorReadAKM1.setText(""); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockInSectorRead_AKM1(read_data, value_address, sector_address, block_address, auth_mode); + result = frmMain.UFRInstance.ValueBlockInSectorRead_AKM1(read_data, value_address, sector_address, block_address, auth_mode); if (result == DL_OK) { txtValueBlockInSectorReadAKM1.setText(Integer.toString(read_data.getValue())); txtValueAddressAKM1.setText(Short.toString(value_address.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException ex) { @@ -1401,14 +1401,14 @@ public class frmValueBlockInSectorReadWrite extends javax.swing.JInternalFrame { sector_address = Byte.parseByte(txtVBISRSectorAddressAKM2.getText()); block_address = Byte.parseByte(txtVBISRBlockAddressAKM2.getText()); txtValueBlockInSectorReadAKM2.setText(""); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockInSectorRead_AKM2(read_data, value_address, sector_address, block_address, auth_mode); + result = frmMain.UFRInstance.ValueBlockInSectorRead_AKM2(read_data, value_address, sector_address, block_address, auth_mode); if (result == DL_OK) { txtValueBlockInSectorReadAKM2.setText(Integer.toString(read_data.getValue())); txtValueAddressAKM2.setText(Short.toString(value_address.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException ex) { @@ -1464,14 +1464,14 @@ public class frmValueBlockInSectorReadWrite extends javax.swing.JInternalFrame { sector_address = Byte.parseByte(txtVBISRSectorAddressPK.getText()); block_address = Byte.parseByte(txtVBISRBlockAddressPK.getText()); txtValueBlockInSectorReadPK.setText(""); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockInSectorRead_PK(read_data, value_address, sector_address, block_address, auth_mode, pk_key); + result = frmMain.UFRInstance.ValueBlockInSectorRead_PK(read_data, value_address, sector_address, block_address, auth_mode, pk_key); if (result == DL_OK) { txtValueBlockInSectorReadPK.setText(Integer.toString(read_data.getValue())); txtValueAddressPK.setText(Short.toString(value_address.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException ex) { @@ -1532,12 +1532,12 @@ public class frmValueBlockInSectorReadWrite extends javax.swing.JInternalFrame { block_address = Byte.parseByte(txtVBISWBlockAddress.getText()); write_data = Integer.parseInt(txtVBISWValueData.getText()); value_address = Short.parseShort(txtVBISWValueAddress.getText()); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockInSectorWrite(write_data, value_address, sector_address, block_address, auth_mode, key_index); + result = frmMain.UFRInstance.ValueBlockInSectorWrite(write_data, value_address, sector_address, block_address, auth_mode, key_index); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException ex) { @@ -1595,12 +1595,12 @@ public class frmValueBlockInSectorReadWrite extends javax.swing.JInternalFrame { block_address = Byte.parseByte(txtVBISWBlockAddressAKM1.getText()); write_data = Integer.parseInt(txtVBISWValueDataAKM1.getText()); value_address = Short.parseShort(txtVBISWValueAddressAKM1.getText()); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockInSectorWrite_AKM1(write_data, value_address, sector_address, block_address, auth_mode); + result = frmMain.UFRInstance.ValueBlockInSectorWrite_AKM1(write_data, value_address, sector_address, block_address, auth_mode); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException ex) { @@ -1658,12 +1658,12 @@ public class frmValueBlockInSectorReadWrite extends javax.swing.JInternalFrame { block_address = Byte.parseByte(txtVBISWBlockAddressAKM2.getText()); write_data = Integer.parseInt(txtVBISWValueDataAKM2.getText()); value_address = Short.parseShort(txtVBISWValueAddressAKM2.getText()); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockInSectorWrite_AKM2(write_data, value_address, sector_address, block_address, auth_mode); + result = frmMain.UFRInstance.ValueBlockInSectorWrite_AKM2(write_data, value_address, sector_address, block_address, auth_mode); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException ex) { @@ -1721,12 +1721,12 @@ public class frmValueBlockInSectorReadWrite extends javax.swing.JInternalFrame { block_address = Byte.parseByte(txtVBISWBlockAddressPK.getText()); write_data = Integer.parseInt(txtVBISWValueDataPK.getText()); value_address = Short.parseShort(txtVBISWValueAddressPK.getText()); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockInSectorWrite_PK(write_data, value_address, sector_address, block_address, auth_mode, GL.PK_KEY(pnlHeader)); + result = frmMain.UFRInstance.ValueBlockInSectorWrite_PK(write_data, value_address, sector_address, block_address, auth_mode, GL.PK_KEY(pnlHeader)); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException ex) { diff --git a/uFCoderAdvanced/src/ufrcoderadvance/frmValueBlockIncrDecr.form b/uFCoderAdvanced/src/ufrcoderadvance/frmValueBlockIncrDecr.form index e62aa99a0f8243f795ad6ddc2c136659b00ed5e4..62e3f172407fbf7b3bbcb746196464e5801d99ab 100644 --- a/uFCoderAdvanced/src/ufrcoderadvance/frmValueBlockIncrDecr.form +++ b/uFCoderAdvanced/src/ufrcoderadvance/frmValueBlockIncrDecr.form @@ -36,7 +36,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/uFCoderAdvanced/src/ufrcoderadvance/frmValueBlockIncrDecr.java b/uFCoderAdvanced/src/ufrcoderadvance/frmValueBlockIncrDecr.java index fe8972af01dcf090bd6aeaae7789ff6a8ab42a75..38f3ec0595eb0ea0798fed31a92438ba3e9fa3a5 100644 --- a/uFCoderAdvanced/src/ufrcoderadvance/frmValueBlockIncrDecr.java +++ b/uFCoderAdvanced/src/ufrcoderadvance/frmValueBlockIncrDecr.java @@ -880,7 +880,6 @@ public class frmValueBlockIncrDecr extends javax.swing.JInternalFrame { return; } - key_index = (byte) cboKeyIndex.getSelectedIndex(); if (rbAUTH1A.isSelected()) { auth_mode = AUTH1A; @@ -889,12 +888,12 @@ public class frmValueBlockIncrDecr extends javax.swing.JInternalFrame { } value_incr = Integer.parseInt(txtIncrementValue.getText()); block_address = Byte.parseByte(txtVBIncrBlockAddress.getText()); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockIncrement(value_incr, block_address, auth_mode, key_index); + result = frmMain.UFRInstance.ValueBlockIncrement(value_incr, block_address, auth_mode, key_index); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { @@ -938,12 +937,12 @@ public class frmValueBlockIncrDecr extends javax.swing.JInternalFrame { } value_incr = Integer.parseInt(txtIncrementValueAKM1.getText()); block_address = Byte.parseByte(txtVBIncrBlockAddressAKM1.getText()); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockIncrement_AKM1(value_incr, block_address, auth_mode); + result = frmMain.UFRInstance.ValueBlockIncrement_AKM1(value_incr, block_address, auth_mode); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { @@ -987,12 +986,12 @@ public class frmValueBlockIncrDecr extends javax.swing.JInternalFrame { } value_incr = Integer.parseInt(txtIncrementValueAKM2.getText()); block_address = Byte.parseByte(txtVBIncrBlockAddressAKM2.getText()); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockIncrement_AKM2(value_incr, block_address, auth_mode); + result = frmMain.UFRInstance.ValueBlockIncrement_AKM2(value_incr, block_address, auth_mode); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { @@ -1044,12 +1043,12 @@ public class frmValueBlockIncrDecr extends javax.swing.JInternalFrame { } value_incr = Integer.parseInt(txtIncrementValuePK.getText()); block_address = Byte.parseByte(txtVBIncrBlockAddressPK.getText()); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockIncrement_PK(value_incr, block_address, auth_mode, pk_key); + result = frmMain.UFRInstance.ValueBlockIncrement_PK(value_incr, block_address, auth_mode, pk_key); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { @@ -1095,12 +1094,12 @@ public class frmValueBlockIncrDecr extends javax.swing.JInternalFrame { } value_incr = Integer.parseInt(txtDecrementValue.getText()); block_address = Byte.parseByte(txtVBDecrBlockAddress.getText()); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockDecrement(value_incr, block_address, auth_mode, key_index); + result = frmMain.UFRInstance.ValueBlockDecrement(value_incr, block_address, auth_mode, key_index); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { @@ -1145,12 +1144,12 @@ public class frmValueBlockIncrDecr extends javax.swing.JInternalFrame { } value_incr = Integer.parseInt(txtDecrementValueAKM1.getText()); block_address = Byte.parseByte(txtVBDecrBlockAddressAKM1.getText()); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockDecrement_AKM1(value_incr, block_address, auth_mode); + result = frmMain.UFRInstance.ValueBlockDecrement_AKM1(value_incr, block_address, auth_mode); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { @@ -1195,12 +1194,12 @@ public class frmValueBlockIncrDecr extends javax.swing.JInternalFrame { } value_incr = Integer.parseInt(txtDecrementValueAKM2.getText()); block_address = Byte.parseByte(txtVBDecrBlockAddressAKM2.getText()); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockDecrement_AKM2(value_incr, block_address, auth_mode); + result = frmMain.UFRInstance.ValueBlockDecrement_AKM2(value_incr, block_address, auth_mode); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { @@ -1245,12 +1244,12 @@ public class frmValueBlockIncrDecr extends javax.swing.JInternalFrame { } value_incr = Integer.parseInt(txtDecrementValuePK.getText()); block_address = Byte.parseByte(txtVBDecrBlockAddressPK.getText()); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockDecrement_PK(value_incr, block_address, auth_mode, GL.PK_KEY(pnlHeader)); + result = frmMain.UFRInstance.ValueBlockDecrement_PK(value_incr, block_address, auth_mode, GL.PK_KEY(pnlHeader)); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { diff --git a/uFCoderAdvanced/src/ufrcoderadvance/frmValueBlockReadWrite.java b/uFCoderAdvanced/src/ufrcoderadvance/frmValueBlockReadWrite.java index 78b14011e3332bae12273c20bed92cb1ef13a1e1..49f3065525d25e4414a540ffa9888a7d6f17b0e5 100644 --- a/uFCoderAdvanced/src/ufrcoderadvance/frmValueBlockReadWrite.java +++ b/uFCoderAdvanced/src/ufrcoderadvance/frmValueBlockReadWrite.java @@ -1050,16 +1050,16 @@ public class frmValueBlockReadWrite extends javax.swing.JInternalFrame { } block_address = Byte.parseByte(txtVBRBlockAddress.getText()); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockRead(read_value, value_address, block_address, auth_mode, key_index); + result = frmMain.UFRInstance.ValueBlockRead(read_value, value_address, block_address, auth_mode, key_index); if (result == DL_OK) { txtValueBlockRead.setText(Integer.toString(read_value.getValue())); txtValueAddress.setText(Short.toString(value_address.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { txtValueBlockRead.setText(""); txtValueAddress.setText(""); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { @@ -1099,16 +1099,16 @@ public class frmValueBlockReadWrite extends javax.swing.JInternalFrame { } block_address = Byte.parseByte(txtVBRBlockAddressAKM1.getText()); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockRead_AKM1(read_value, value_address, block_address, auth_mode); + result = frmMain.UFRInstance.ValueBlockRead_AKM1(read_value, value_address, block_address, auth_mode); if (result == DL_OK) { txtValueBlockReadAKM1.setText(Integer.toString(read_value.getValue())); txtValueAddressAKM1.setText(Short.toString(value_address.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { txtValueBlockReadAKM1.setText(""); txtValueAddressAKM1.setText(""); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { @@ -1147,16 +1147,16 @@ public class frmValueBlockReadWrite extends javax.swing.JInternalFrame { } block_address = Byte.parseByte(txtVBRBlockAddressAKM2.getText()); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockRead_AKM2(read_value, value_address, block_address, auth_mode); + result = frmMain.UFRInstance.ValueBlockRead_AKM2(read_value, value_address, block_address, auth_mode); if (result == DL_OK) { txtValueBlockReadAKM2.setText(Integer.toString(read_value.getValue())); txtValueAddressAKM2.setText(Short.toString(value_address.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { txtValueBlockReadAKM2.setText(""); txtValueAddressAKM2.setText(""); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { @@ -1195,16 +1195,16 @@ public class frmValueBlockReadWrite extends javax.swing.JInternalFrame { } block_address = Byte.parseByte(txtVBRBlockAddressPK.getText()); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockRead_PK(read_value, value_address, block_address, auth_mode, GL.PK_KEY(pnlHeader)); + result = frmMain.UFRInstance.ValueBlockRead_PK(read_value, value_address, block_address, auth_mode, GL.PK_KEY(pnlHeader)); if (result == DL_OK) { txtValueBlockReadPK.setText(Integer.toString(read_value.getValue())); txtValueAddressPK.setText(Short.toString(value_address.getValue())); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { txtValueBlockReadPK.setText(""); txtValueAddressPK.setText(""); - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { @@ -1256,14 +1256,14 @@ public class frmValueBlockReadWrite extends javax.swing.JInternalFrame { block_address = Byte.parseByte(txtVBWBlockAddress.getText()); value_address = Short.parseShort(txtVBWValueAddress.getText()); write_value = Integer.parseInt(txtWriteValue.getText()); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockWrite(write_value, value_address, block_address, auth_mode, key_index); + result = frmMain.UFRInstance.ValueBlockWrite(write_value, value_address, block_address, auth_mode, key_index); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { @@ -1314,12 +1314,12 @@ public class frmValueBlockReadWrite extends javax.swing.JInternalFrame { block_address = Byte.parseByte(txtVBWBlockAddressAKM1.getText()); value_address = Short.parseShort(txtVBWValueAddressAKM1.getText()); write_value = Integer.parseInt(txtWriteValueAKM1.getText()); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockWrite_AKM1(write_value, value_address, block_address, auth_mode); + result = frmMain.UFRInstance.ValueBlockWrite_AKM1(write_value, value_address, block_address, auth_mode); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { @@ -1370,12 +1370,12 @@ public class frmValueBlockReadWrite extends javax.swing.JInternalFrame { block_address = Byte.parseByte(txtVBWBlockAddressAKM2.getText()); value_address = Short.parseShort(txtVBWValueAddressAKM2.getText()); write_value = Integer.parseInt(txtWriteValueAKM2.getText()); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockWrite_AKM2(write_value, value_address, block_address, auth_mode); + result = frmMain.UFRInstance.ValueBlockWrite_AKM2(write_value, value_address, block_address, auth_mode); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { @@ -1426,12 +1426,12 @@ public class frmValueBlockReadWrite extends javax.swing.JInternalFrame { block_address = Byte.parseByte(txtVBWBlockAddressPK.getText()); value_address = Short.parseShort(txtVBWValueAddressPK.getText()); write_value = Integer.parseInt(txtWriteValuePK.getText()); - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ValueBlockWrite_PK(write_value, value_address, block_address, auth_mode, GL.PK_KEY(pnlHeader)); + result = frmMain.UFRInstance.ValueBlockWrite_PK(write_value, value_address, block_address, auth_mode, GL.PK_KEY(pnlHeader)); if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } catch (NumberFormatException nfe) { diff --git a/uFCoderAdvanced/src/ufrcoderadvance/frmViewAll.java b/uFCoderAdvanced/src/ufrcoderadvance/frmViewAll.java index 9da9d850597e01e6cf224be7c4d1e5a8b10d4327..73869f90f830bb93a0ec9c4c4388c8ed98cb7d36 100644 --- a/uFCoderAdvanced/src/ufrcoderadvance/frmViewAll.java +++ b/uFCoderAdvanced/src/ufrcoderadvance/frmViewAll.java @@ -255,9 +255,8 @@ public class frmViewAll extends javax.swing.JInternalFrame { }// //GEN-END:initComponents private void ReadValue(boolean first_read) { - - TableColumn column = null; + TableColumn column = null; byte block_count = 0; byte sector_count = 0; @@ -287,16 +286,16 @@ public class frmViewAll extends javax.swing.JInternalFrame { tblViewAll.setValueAt(bis_count, block_count, 1); tblViewAll.setValueAt(block_count, block_count, 2); if (first_read) { - result = UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.BlockRead(block_data, block_count, auth_mode, key_index); + result = frmMain.UFRInstance.BlockRead(block_data, block_count, auth_mode, key_index); for (int br = 0; br < 16; br++) { if (chkHex.isSelected()) { - tblViewAll.setValueAt("$" + Integer.toHexString(((char) block_data[br] & 0xFF)), block_count, br+3 ); - + tblViewAll.setValueAt("$" + Integer.toHexString(((char) block_data[br] & 0xFF)), block_count, br + 3); + } else { tblViewAll.setValueAt((char) ((char) block_data[br] & 0xFF), block_count, br + 3); } } - } + } bis_count++; block_count++; } @@ -310,17 +309,17 @@ public class frmViewAll extends javax.swing.JInternalFrame { if (first_read) { if (result == DL_OK) { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); + frmMain.UFRInstance.ReaderUISignal(RES_LIGHT_OK, RES_SOUND_OK); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } else { - UFRCoderWrapper.UFRCoderDeclaration.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); + frmMain.UFRInstance.ReaderUISignal(ERR_LIGHT, ERR_SOUND); GL.ERRORS_CODE(result, lblFunction_code, lblFunction_explain); } } } private void btnReadActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnReadActionPerformed - frmMain M = new frmMain(); + frmMain M = new frmMain(); if (M.functionOn) { return; } @@ -330,9 +329,9 @@ public class frmViewAll extends javax.swing.JInternalFrame { M.functionOn = false; return; } - try{ - ReadValue(true); - } finally { + try { + ReadValue(true); + } finally { M.ReaderOn(); M.functionOn = false; } @@ -340,7 +339,7 @@ public class frmViewAll extends javax.swing.JInternalFrame { }//GEN-LAST:event_btnReadActionPerformed private void formInternalFrameActivated(javax.swing.event.InternalFrameEvent evt) {//GEN-FIRST:event_formInternalFrameActivated - frmMain M = new frmMain(); + frmMain M = new frmMain(); if (M.functionOn) { return; } @@ -350,17 +349,17 @@ public class frmViewAll extends javax.swing.JInternalFrame { M.functionOn = false; return; } - try{ - ReadValue(false); - } finally { + try { + ReadValue(false); + } finally { M.ReaderOn(); M.functionOn = false; } - + }//GEN-LAST:event_formInternalFrameActivated private void formMouseDragged(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_formMouseDragged - + }//GEN-LAST:event_formMouseDragged // Variables declaration - do not modify//GEN-BEGIN:variables