diff --git a/Vinclude/main.h b/Vinclude/main.h index 90afc77..895fb2f 100644 --- a/Vinclude/main.h +++ b/Vinclude/main.h @@ -82,7 +82,6 @@ extern "C" { #include "V_UdControl.h" #include "V_DIO.h" #include "V_fifo.h" -#include "V_usblib.h" #include "V_Fan.h" #include "V_watchdog.h" #include "V_TMU.h" diff --git a/Vsrc/X_CANFlashProgDataM4F_1921VK028.c b/Vsrc/X_CANFlashProgDataM4F_1921VK028.c index 833485d..e90e464 100644 --- a/Vsrc/X_CANFlashProgDataM4F_1921VK028.c +++ b/Vsrc/X_CANFlashProgDataM4F_1921VK028.c @@ -1,20 +1,18 @@ //Файл: X_CANFlashProgDataM4F.c -//Дата созданиЯ: 2019-07-19 15:19:54 +//Дата созданиЯ: 2019-08-01 10:44:55 #include "DSP.h" #include "X_CANFlashProgData.h" //количество адресов в массиве FPAddrs -Uint16 const FPNumOfAddrs = 3; +Uint16 const FPNumOfAddrs = 2; //адреса начала частей прошивальщика Uint32 const FPAddrs[] = { 0x20000000, -0x20000400, -0x20005530 +0x20000400 }; //длина частей прошивальщика Uint16 const FPPartsLength[] = { 0x0032, -0x2896, -0x0582 +0x2F12 }; //данные прошивальщика Uint16 const FPData[] = { @@ -25,9 +23,9 @@ Uint16 const FPData[] = { 0xF383, 0x8808, 0xF246, -0x0434, +0x2424, 0xF245, -0x5130, +0x7120, 0xF2C2, 0x0400, 0xF2C2, @@ -35,7 +33,7 @@ Uint16 const FPData[] = { 0x1A64, 0xBF1E, 0xF245, -0x5030, +0x7020, 0xF2C2, 0x0000, 0x2300, @@ -45,10 +43,10 @@ Uint16 const FPData[] = { 0x3301, 0x429C, 0xD1FA, +0xF646, +0x0144, 0xF246, -0x6154, -0xF246, -0x0334, +0x2324, 0xF2C2, 0x0300, 0xF2C2, @@ -67,20 +65,20 @@ Uint16 const FPData[] = { 0xF3BF, 0x8F6F, 0xF004, -0xB966, +0xBA60, 0x0000, 0x2008, 0x0001, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, 0x0000, 0x0000, @@ -90,401 +88,401 @@ Uint16 const FPData[] = { 0x0000, 0x0000, 0x0000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, 0x0000, 0x0000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x4491, +0x4685, 0x2000, -0x443D, +0x4631, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x30D9, +0x31C1, 0x2000, -0x31A5, +0x328D, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, -0x1631, +0x1719, 0x2000, 0x4401, 0xF5B1, @@ -524,6 +522,108 @@ Uint16 const FPData[] = { 0x4B04, 0x4770, 0xBF00, +0xB470, +0x2400, +0xF2C4, +0x0406, +0x2501, +0xF2CC, +0x05DE, +0x6020, +0xF3C0, +0x0644, +0x6465, +0xBF00, +0xBF00, +0xBF00, +0xBF00, +0xBF00, +0xF249, +0x6381, +0x2500, +0xF2C0, +0x0398, +0xF2C4, +0x0506, +0xE001, +0x3B01, +0xD047, +0x6CAC, +0x07E4, +0xD4FA, +0x2504, +0x0073, +0xF2C4, +0x0506, +0x441D, +0xB2F3, +0xB19A, +0x3D02, +0x460C, +0x3301, +0xF835, +0x1F02, +0x3A01, +0xB2DB, +0x2B1F, +0xB292, +0xBF8C, +0x2600, +0x2601, +0xF824, +0x1B02, +0x2A00, +0xBF08, +0x2600, +0x4621, +0x2E00, +0xD1ED, +0x2300, +0xF2C4, +0x0306, +0x2401, +0x3040, +0xF2CC, +0x04DE, +0x6018, +0x645C, +0xBF00, +0xBF00, +0xBF00, +0xBF00, +0xBF00, +0xF249, +0x6381, +0x2400, +0xF2C0, +0x0398, +0xF2C4, +0x0406, +0xE001, +0x3B01, +0xD011, +0x6CA0, +0x07C0, +0xD4FA, +0x2302, +0xF2C4, +0x0306, +0xB13A, +0x3A01, +0xF833, +0x0F02, +0xB292, +0xF821, +0x0B02, +0x2A00, +0xD1F7, +0x2000, +0xBC70, +0x4770, +0x2005, +0xBC70, +0x4770, +0xBF00, 0x2001, 0x4770, 0x2000, @@ -536,7 +636,7 @@ Uint16 const FPData[] = { 0x4770, 0xB90A, 0x461A, -0xE7CC, +0xE766, 0x2000, 0x4770, 0xBF00, @@ -768,76 +868,86 @@ Uint16 const FPData[] = { 0xF7FF, 0xBF4D, 0xBF00, -0x2300, +0x2200, 0xF2C4, -0x0306, -0x2202, -0xB430, -0x649A, +0x0206, +0xB570, +0x2402, +0x6494, 0xF04F, -0x35FF, -0x2300, -0x009A, -0xF102, -0x4280, -0xF502, -0x22C0, -0x3301, +0x36FF, +0x2200, +0x0094, +0xF104, +0x4480, +0xF504, +0x24C0, +0x3201, +0x2500, +0x2A10, +0x6066, +0xF2C4, +0x0506, +0xD1F3, +0x6028, +0x2200, +0x0090, +0xF100, +0x4080, +0xF851, +0x5022, +0xF500, +0x20C0, +0x3201, 0x2400, -0x2B10, -0x6055, +0x2A10, +0x6045, 0xF2C4, 0x0406, -0xD1F3, -0x6020, -0x2300, -0x009A, -0xF102, -0x4280, -0xF851, -0x4023, -0xF502, -0x22C0, -0x3301, -0x2000, -0x2B10, -0x6054, -0xF2C4, -0x0006, 0xD1F1, -0x2302, +0x2202, 0xF2CC, -0x03DE, -0x6443, +0x02DE, +0x6462, 0xBF00, 0xBF00, 0xBF00, 0xBF00, 0xBF00, 0xF249, -0x6381, -0x2000, +0x6281, +0x2400, 0xF2C0, -0x0398, +0x0298, 0xF2C4, -0x0006, +0x0406, 0xE001, -0x3B01, +0x3A01, 0xD00A, -0x6C81, -0x2200, -0x07C9, +0x6CA0, +0x2100, +0x07C0, 0xF2C4, -0x0206, +0x0106, 0xD4F7, -0x2302, -0x6493, -0x2000, -0xBC30, -0x4770, +0x2202, +0x648A, +0xB11B, +0x201E, +0xBD70, 0x2003, -0xBC30, +0xBD70, +0xF002, +0xFE7D, +0x2800, +0xD1F7, +0xBD70, +0x2A20, +0xD901, +0x2007, 0x4770, +0xE656, +0xBF00, 0xE92D, 0x4FF0, 0xB093, @@ -851,24 +961,82 @@ Uint16 const FPData[] = { 0xF8BD, 0xB070, 0x2D00, -0xD039, -0xF10D, -0x0206, -0x2300, -0xF839, -0x1013, -0x3301, -0x42AB, -0xF822, -0x1F02, -0xD1F8, +0xD137, +0x2C00, +0xD031, 0xF10D, 0x0A08, +0xF10D, +0x0846, +0xF64F, +0x77FF, +0x4633, +0xF10D, +0x0206, +0x2500, +0x2C00, +0xD035, +0x3C01, +0xF833, +0x0B02, +0xF105, +0x0501, +0xBF0C, +0x2100, +0x2101, +0x2D1F, +0xBF8C, +0x2100, +0xF001, +0x0101, +0xF822, +0x0F02, +0x461E, +0x2900, +0xD1ED, +0x2D20, +0xD006, +0x3D01, +0xEB0A, +0x0545, +0xF825, +0x7F02, +0x4545, +0xD1FB, +0x4648, +0x4651, +0x9A01, +0x465B, +0xF7FF, +0xFF73, +0xB920, +0xF109, +0x0940, +0x2C00, +0xD1D3, +0x2000, +0xB013, +0xE8BD, +0x8FF0, +0xF10D, +0x0A08, +0x4651, +0x4648, +0x462A, +0xF7FF, +0xFE09, +0xB128, +0x2028, +0xB013, +0xE8BD, +0x8FF0, +0x4625, +0xE7DB, +0xB1BC, 0x1E6A, 0x4633, 0xEB0A, 0x0242, -0xB19C, 0x3C01, 0xF833, 0x0B02, @@ -905,67 +1073,13 @@ Uint16 const FPData[] = { 0x9A01, 0x465B, 0xF7FF, -0xFF76, +0xFF32, 0xF109, 0x0940, 0x2800, -0xD132, -0xB384, -0xF10D, -0x0A08, -0xF10D, -0x0846, -0xF64F, -0x77FF, -0x4633, -0xF10D, -0x0206, -0x2500, -0xB34C, -0x3C01, -0xF833, -0x0B02, -0xF105, -0x0501, -0xBF0C, -0x2100, -0x2101, -0x2D1F, -0xBF8C, -0x2100, -0xF001, -0x0101, -0xF822, -0x0F02, -0x461E, -0x2900, -0xD1ED, -0x2D20, -0xD006, -0x3D01, -0xEB0A, -0x0545, -0xF825, -0x7F02, -0x4545, -0xD1FB, -0x4648, -0x4651, -0x9A01, -0x465B, -0xF7FF, -0xFF45, -0xB920, -0xF109, -0x0940, -0x2C00, -0xD1D4, -0x2000, -0xB013, -0xE8BD, -0x8FF0, -0x4625, -0xE7E7, +0xD08B, +0xE7BF, +0xBF00, 0x2300, 0xF2C4, 0x0306, @@ -973,6 +1087,7 @@ Uint16 const FPData[] = { 0x2102, 0xF2CC, 0x02DE, +0xB510, 0x6499, 0x645A, 0xBF00, @@ -982,15 +1097,15 @@ Uint16 const FPData[] = { 0xBF00, 0xF249, 0x6381, -0x2000, +0x2400, 0xF2C0, 0x0398, 0xF2C4, -0x0006, +0x0406, 0xE001, 0x3B01, -0xD011, -0x6C81, +0xD00A, +0x6CA1, 0x2200, 0x07C9, 0xF2C4, @@ -998,18 +1113,17 @@ Uint16 const FPData[] = { 0xD4F7, 0x2302, 0x6493, -0x6CD3, -0xF443, -0x7380, -0x64D3, -0x6CD3, -0xF443, -0x7300, -0x64D3, -0x2000, -0x4770, +0xB118, +0x201E, +0xBD10, 0x2006, -0x4770, +0xBD10, +0xF002, +0xFDC8, +0x2800, +0xD1F7, +0xBD10, +0xBF00, 0x2300, 0xF2C4, 0x0306, @@ -1137,7 +1251,7 @@ Uint16 const FPData[] = { 0xFB05, 0xF101, 0xF246, -0x037C, +0x236C, 0xFB04, 0xF101, 0xFB00, @@ -1152,11 +1266,11 @@ Uint16 const FPData[] = { 0xF2C4, 0x0308, 0xF246, -0x0184, +0x2174, 0xF8D3, 0x40C0, 0xF246, -0x0280, +0x2270, 0xF004, 0x0403, 0xF2C2, @@ -1173,7 +1287,7 @@ Uint16 const FPData[] = { 0x2000, 0x4770, 0xF246, -0x037C, +0x236C, 0xF2C2, 0x0300, 0xF44F, @@ -1183,7 +1297,7 @@ Uint16 const FPData[] = { 0x6018, 0xE7DC, 0xF246, -0x037C, +0x236C, 0xF2C2, 0x0300, 0xF44F, @@ -1193,7 +1307,7 @@ Uint16 const FPData[] = { 0x6018, 0xE7D2, 0xF246, -0x037C, +0x236C, 0xF2C2, 0x0300, 0x6818, @@ -2293,7 +2407,7 @@ Uint16 const FPData[] = { 0x66DA, 0x4770, 0xF246, -0x0278, +0x2268, 0xF2C2, 0x0200, 0xF44F, @@ -3938,7 +4052,7 @@ Uint16 const FPData[] = { 0x3044, 0x2302, 0xF245, -0x5268, +0x7258, 0xF8D4, 0x1170, 0xF2C2, @@ -3951,7 +4065,7 @@ Uint16 const FPData[] = { 0x32CF, 0x820A, 0xF245, -0x525C, +0x724C, 0xF8D4, 0x1170, 0xF2C2, @@ -3963,7 +4077,7 @@ Uint16 const FPData[] = { 0x0005, 0x8208, 0xF245, -0x5244, +0x7234, 0xF8D4, 0x1170, 0xF2C2, @@ -3975,7 +4089,7 @@ Uint16 const FPData[] = { 0x200B, 0x8208, 0xF245, -0x5250, +0x7240, 0xF8D4, 0x1170, 0xF2C2, @@ -3987,7 +4101,7 @@ Uint16 const FPData[] = { 0x300E, 0x8208, 0xF645, -0x0250, +0x2240, 0xF8D4, 0x1170, 0xF2C2, @@ -4283,12 +4397,12 @@ Uint16 const FPData[] = { 0xE92D, 0x4FF0, 0xF245, -0x12CE, +0x32C2, 0xF2C2, 0x0200, 0xB087, 0xF245, -0x13D0, +0x33C4, 0x8812, 0xF2C2, 0x0300, @@ -4296,7 +4410,7 @@ Uint16 const FPData[] = { 0x9203, 0x9A04, 0xF245, -0x1BEE, +0x3BE2, 0x8812, 0xF2C2, 0x0B00, @@ -4304,7 +4418,7 @@ Uint16 const FPData[] = { 0xF8BB, 0xB000, 0xF245, -0x2278, +0x426C, 0xF2C2, 0x0200, 0xF8A0, @@ -4312,21 +4426,21 @@ Uint16 const FPData[] = { 0xF8C0, 0x2114, 0xF245, -0x0250, +0x2244, 0xF2C2, 0x0200, 0xF8C0, 0x2118, 0xF245, -0x13BA, +0x33AE, 0xF245, -0x12F4, +0x32E8, 0xF2C2, 0x0200, 0xF245, -0x1AC2, +0x3AB6, 0xF245, -0x2970, +0x4964, 0xF2C2, 0x0300, 0xF8C0, @@ -4336,7 +4450,7 @@ Uint16 const FPData[] = { 0xF2C2, 0x0900, 0xF245, -0x12D8, +0x32CC, 0x881B, 0xF8BA, 0xA000, @@ -4346,11 +4460,11 @@ Uint16 const FPData[] = { 0xF2C2, 0x0200, 0xF245, -0x2864, +0x4858, 0xF245, -0x1CB4, +0x3CA8, 0xF245, -0x14C6, +0x34BA, 0xF8C0, 0x2120, 0xF2C2, @@ -4360,21 +4474,21 @@ Uint16 const FPData[] = { 0xF2C2, 0x0400, 0xF245, -0x022C, +0x2220, 0xF2C2, 0x0200, 0xF245, -0x1EBE, +0x3EB2, 0xF245, -0x17D4, +0x37C8, 0xF245, -0x265C, +0x4650, 0xF245, -0x2566, +0x455A, 0xF245, -0x11CA, +0x31BE, 0xF245, -0x13EC, +0x33E0, 0xF8C0, 0x2124, 0xF8B8, @@ -4400,9 +4514,9 @@ Uint16 const FPData[] = { 0xF2C2, 0x0300, 0xF245, -0x296C, +0x4960, 0xF245, -0x1BF0, +0x3BE4, 0xF2C2, 0x0900, 0xF2C2, @@ -4447,7 +4561,7 @@ Uint16 const FPData[] = { 0xF8A0, 0xB140, 0xF245, -0x2B9E, +0x4B92, 0xF2C2, 0x0B00, 0xF8CD, @@ -4459,7 +4573,7 @@ Uint16 const FPData[] = { 0xF8BB, 0xB000, 0xF245, -0x15C4, +0x35B8, 0xF8CD, 0xB004, 0xF2C2, @@ -4471,11 +4585,11 @@ Uint16 const FPData[] = { 0xB000, 0x9505, 0xF245, -0x276A, +0x475E, 0xF245, -0x2676, +0x466A, 0xF245, -0x2372, +0x4366, 0xF2C2, 0x0300, 0xF2C2, @@ -4483,19 +4597,19 @@ Uint16 const FPData[] = { 0xF2C2, 0x0600, 0xF245, -0x2A62, +0x4A56, 0xF245, -0x296E, +0x4962, 0xF245, -0x2868, +0x485C, 0xF245, -0x2C9C, +0x4C90, 0xF245, -0x1ECC, +0x3EC0, 0xF245, -0x2174, +0x4168, 0xF245, -0x12D2, +0x32C6, 0x881D, 0xF8CD, 0xB000, @@ -4540,13 +4654,13 @@ Uint16 const FPData[] = { 0xF8A0, 0xB146, 0xF245, -0x1BB8, +0x3BAC, 0xF2C2, 0x0B00, 0xF245, -0x17BC, +0x37B0, 0xF245, -0x13B6, +0x33AA, 0xF8A0, 0xA148, 0xF2C2, @@ -4564,7 +4678,7 @@ Uint16 const FPData[] = { 0xF2C2, 0x0300, 0xF245, -0x2860, +0x4854, 0xF8A0, 0xC14E, 0x883F, @@ -4578,13 +4692,13 @@ Uint16 const FPData[] = { 0xF8A0, 0xB154, 0xF245, -0x1CC0, +0x3CB4, 0xF8DD, 0xB014, 0xF245, -0x2E5E, +0x4E52, 0xF245, -0x19C8, +0x39BC, 0xF2C2, 0x0C00, 0xF2C2, @@ -4620,13 +4734,13 @@ Uint16 const FPData[] = { 0xF44F, 0x7100, 0xF241, -0x6B7D, +0x7B65, 0xF241, -0x6535, +0x751D, 0xF241, -0x6685, +0x766D, 0xF245, -0x5274, +0x7264, 0x2301, 0xF2C4, 0x0102, @@ -4677,12 +4791,12 @@ Uint16 const FPData[] = { 0xE92D, 0x4FF0, 0xF245, -0x4274, +0x6268, 0xF2C2, 0x0200, 0xB087, 0xF245, -0x43C6, +0x63BA, 0x8812, 0xF2C2, 0x0300, @@ -4690,7 +4804,7 @@ Uint16 const FPData[] = { 0x9203, 0x9A04, 0xF245, -0x4BBC, +0x6BB0, 0x8812, 0xF2C2, 0x0B00, @@ -4698,7 +4812,7 @@ Uint16 const FPData[] = { 0xF8BB, 0xB000, 0xF245, -0x42F0, +0x62E4, 0xF2C2, 0x0200, 0xF8A0, @@ -4706,21 +4820,21 @@ Uint16 const FPData[] = { 0xF8C0, 0x2114, 0xF245, -0x22A0, +0x4294, 0xF2C2, 0x0200, 0xF8C0, 0x2118, 0xF245, -0x43AE, +0x63A2, 0xF245, -0x4204, +0x52F8, 0xF2C2, 0x0200, 0xF245, -0x4AC0, +0x6AB4, 0xF245, -0x49EA, +0x69DE, 0xF2C2, 0x0300, 0xF8C0, @@ -4730,7 +4844,7 @@ Uint16 const FPData[] = { 0xF2C2, 0x0900, 0xF245, -0x42CC, +0x62C0, 0x881B, 0xF8BA, 0xA000, @@ -4740,11 +4854,11 @@ Uint16 const FPData[] = { 0xF2C2, 0x0200, 0xF245, -0x48B4, +0x68A8, 0xF245, -0x4C78, +0x6C6C, 0xF245, -0x447E, +0x6472, 0xF8C0, 0x2120, 0xF2C2, @@ -4754,21 +4868,21 @@ Uint16 const FPData[] = { 0xF2C2, 0x0400, 0xF245, -0x4284, +0x6278, 0xF2C2, 0x0200, 0xF245, -0x4EE8, +0x6EDC, 0xF245, -0x477A, +0x676E, 0xF245, -0x4676, +0x666A, 0xF245, -0x45B2, +0x65A6, 0xF245, -0x41B8, +0x61AC, 0xF245, -0x43BA, +0x63AE, 0xF8C0, 0x2124, 0xF8B8, @@ -4794,9 +4908,9 @@ Uint16 const FPData[] = { 0xF2C2, 0x0300, 0xF245, -0x49E2, +0x69D6, 0xF245, -0x4BE4, +0x6BD8, 0xF2C2, 0x0900, 0xF2C2, @@ -4841,7 +4955,7 @@ Uint16 const FPData[] = { 0xF8A0, 0xB140, 0xF245, -0x4B80, +0x6B74, 0xF2C2, 0x0B00, 0xF8CD, @@ -4853,7 +4967,7 @@ Uint16 const FPData[] = { 0xF8BB, 0xB000, 0xF245, -0x4570, +0x6564, 0xF8CD, 0xB004, 0xF2C2, @@ -4865,11 +4979,11 @@ Uint16 const FPData[] = { 0xB000, 0x9505, 0xF245, -0x476E, +0x6762, 0xF245, -0x46BE, +0x66B2, 0xF245, -0x43E0, +0x63D4, 0xF2C2, 0x0300, 0xF2C2, @@ -4877,19 +4991,19 @@ Uint16 const FPData[] = { 0xF2C2, 0x0600, 0xF245, -0x4AB0, +0x6AA4, 0xF245, -0x49AC, +0x69A0, 0xF245, -0x4872, +0x6866, 0xF245, -0x4CA8, +0x6C9C, 0xF245, -0x4EAA, +0x6E9E, 0xF245, -0x41EC, +0x61E0, 0xF245, -0x42B6, +0x62AA, 0x881D, 0xF8CD, 0xB000, @@ -4934,13 +5048,13 @@ Uint16 const FPData[] = { 0xF8A0, 0xB146, 0xF245, -0x4BC2, +0x6BB6, 0xF2C2, 0x0B00, 0xF245, -0x47E6, +0x67DA, 0xF245, -0x43C4, +0x63B8, 0xF8A0, 0xA148, 0xF2C2, @@ -4958,7 +5072,7 @@ Uint16 const FPData[] = { 0xF2C2, 0x0300, 0xF245, -0x487C, +0x6870, 0xF8A0, 0xC14E, 0x883F, @@ -4972,13 +5086,13 @@ Uint16 const FPData[] = { 0xF8A0, 0xB154, 0xF245, -0x4CC8, +0x6CBC, 0xF8DD, 0xB014, 0xF245, -0x4E82, +0x6E76, 0xF245, -0x496C, +0x6960, 0xF2C2, 0x0C00, 0xF2C2, @@ -5014,13 +5128,13 @@ Uint16 const FPData[] = { 0xF44F, 0x7140, 0xF241, -0x6B81, +0x7B69, 0xF241, -0x6559, +0x7541, 0xF241, -0x6689, +0x7671, 0xF645, -0x025C, +0x224C, 0x2302, 0xF2C4, 0x0102, @@ -5356,7 +5470,7 @@ Uint16 const FPData[] = { 0xF8B0, 0x1174, 0xF246, -0x023C, +0x222C, 0xF2C2, 0x0200, 0xB289, @@ -5377,7 +5491,7 @@ Uint16 const FPData[] = { 0xBF00, 0xBF00, 0xF246, -0x0356, +0x2346, 0xF2C2, 0x0300, 0x2100, @@ -5390,7 +5504,7 @@ Uint16 const FPData[] = { 0xF8B0, 0x1174, 0xF246, -0x0254, +0x2244, 0xF2C2, 0x0200, 0xB289, @@ -5417,7 +5531,7 @@ Uint16 const FPData[] = { 0xF8B0, 0x1174, 0xF246, -0x023E, +0x222E, 0xF2C2, 0x0200, 0xB289, @@ -5456,7 +5570,7 @@ Uint16 const FPData[] = { 0xF8B0, 0x1174, 0xF246, -0x0250, +0x2240, 0xF2C2, 0x0200, 0xB289, @@ -5466,7 +5580,7 @@ Uint16 const FPData[] = { 0xF8B0, 0x1174, 0xF246, -0x0248, +0x2238, 0xF2C2, 0x0200, 0xB289, @@ -5476,7 +5590,7 @@ Uint16 const FPData[] = { 0xF8B0, 0x1174, 0xF246, -0x024E, +0x223E, 0xF2C2, 0x0200, 0xB289, @@ -5486,7 +5600,7 @@ Uint16 const FPData[] = { 0xF8B0, 0x1174, 0xF246, -0x0246, +0x2236, 0xF2C2, 0x0200, 0xB289, @@ -5496,7 +5610,7 @@ Uint16 const FPData[] = { 0xF8B0, 0x1174, 0xF246, -0x024C, +0x223C, 0xF2C2, 0x0200, 0xB289, @@ -5506,7 +5620,7 @@ Uint16 const FPData[] = { 0xF8B0, 0x1174, 0xF246, -0x0244, +0x2234, 0xF2C2, 0x0200, 0xB289, @@ -5516,7 +5630,7 @@ Uint16 const FPData[] = { 0xF8B0, 0x1174, 0xF246, -0x024A, +0x223A, 0xF2C2, 0x0200, 0xB289, @@ -5526,7 +5640,7 @@ Uint16 const FPData[] = { 0xF8B0, 0x1174, 0xF246, -0x0242, +0x2232, 0xF2C2, 0x0200, 0xB289, @@ -5565,7 +5679,7 @@ Uint16 const FPData[] = { 0xF8B0, 0x1174, 0xF246, -0x0258, +0x2248, 0xF2C2, 0x0200, 0xB289, @@ -5575,7 +5689,7 @@ Uint16 const FPData[] = { 0xF8B0, 0x1174, 0xF246, -0x0238, +0x2228, 0xF2C2, 0x0200, 0xB289, @@ -5602,7 +5716,7 @@ Uint16 const FPData[] = { 0xF8B0, 0x1174, 0xF246, -0x0260, +0x2250, 0xF2C2, 0x0200, 0xB289, @@ -5629,7 +5743,7 @@ Uint16 const FPData[] = { 0xF8B0, 0x1174, 0xF246, -0x0236, +0x2226, 0xF2C2, 0x0200, 0xB289, @@ -5656,7 +5770,7 @@ Uint16 const FPData[] = { 0xF8B0, 0x1174, 0xF246, -0x025E, +0x224E, 0xF2C2, 0x0200, 0xB289, @@ -5683,7 +5797,7 @@ Uint16 const FPData[] = { 0xF8B0, 0x1174, 0xF246, -0x0234, +0x2224, 0xF2C2, 0x0200, 0xB289, @@ -5710,7 +5824,7 @@ Uint16 const FPData[] = { 0xF8B0, 0x1174, 0xF246, -0x025C, +0x224C, 0xF2C2, 0x0200, 0xB289, @@ -5737,7 +5851,7 @@ Uint16 const FPData[] = { 0xF8B0, 0x1174, 0xF246, -0x0262, +0x2252, 0xF2C2, 0x0200, 0xB289, @@ -5764,7 +5878,7 @@ Uint16 const FPData[] = { 0xF8B0, 0x1174, 0xF246, -0x025A, +0x224A, 0xF2C2, 0x0200, 0xB289, @@ -5791,7 +5905,7 @@ Uint16 const FPData[] = { 0xF8B0, 0x3174, 0xF246, -0x0252, +0x2242, 0xFA11, 0xF183, 0xF2C2, @@ -5800,7 +5914,7 @@ Uint16 const FPData[] = { 0x0318, 0xE64A, 0xF246, -0x0340, +0x2330, 0xF2C2, 0x0300, 0x881A, @@ -5851,7 +5965,7 @@ Uint16 const FPData[] = { 0x71FF, 0x3160, 0xF246, -0x40C8, +0x60B8, 0xBFD8, 0xF8C3, 0x214C, @@ -5868,7 +5982,7 @@ Uint16 const FPData[] = { 0x013F, 0x408A, 0xF246, -0x40C8, +0x60B8, 0x3120, 0xF8C3, 0x2144, @@ -5885,7 +5999,7 @@ Uint16 const FPData[] = { 0x013F, 0x408A, 0xF246, -0x40C8, +0x60B8, 0xF8C3, 0x2140, 0xB209, @@ -5901,7 +6015,7 @@ Uint16 const FPData[] = { 0x013F, 0x408A, 0xF246, -0x40C8, +0x60B8, 0x3140, 0xF8C3, 0x2148, @@ -5953,7 +6067,7 @@ Uint16 const FPData[] = { 0x71FF, 0x3160, 0xF246, -0x303C, +0x502C, 0xBFD8, 0xF8C3, 0x215C, @@ -5970,7 +6084,7 @@ Uint16 const FPData[] = { 0x013F, 0x408A, 0xF246, -0x303C, +0x502C, 0x3120, 0xF8C3, 0x2154, @@ -5987,7 +6101,7 @@ Uint16 const FPData[] = { 0x013F, 0x408A, 0xF246, -0x303C, +0x502C, 0xF8C3, 0x2150, 0xB209, @@ -6003,7 +6117,7 @@ Uint16 const FPData[] = { 0x013F, 0x408A, 0xF246, -0x303C, +0x502C, 0x3140, 0xF8C3, 0x2158, @@ -6039,7 +6153,7 @@ Uint16 const FPData[] = { 0xF8D0, 0x2188, 0xF245, -0x5330, +0x7320, 0xF8B2, 0x00D0, 0xF2C2, @@ -6113,7 +6227,7 @@ Uint16 const FPData[] = { 0xF8B3, 0x30D0, 0xF245, -0x5230, +0x7220, 0xF2C2, 0x0200, 0xB29B, @@ -6543,7 +6657,7 @@ Uint16 const FPData[] = { 0xF8D0, 0x10B8, 0xF246, -0x033A, +0x232A, 0xF2C2, 0x0300, 0x3901, @@ -6582,13 +6696,41 @@ Uint16 const FPData[] = { 0x701A, 0xBD38, 0xBF00, +0x2100, +0xF2C4, +0x0106, +0xF249, +0x6381, +0x6CCA, +0xF442, +0x7280, +0x64CA, +0x6CCA, +0xF442, +0x7200, +0x64CA, +0xF2C0, +0x0398, +0xE001, +0x3B01, +0xD007, +0x6D0A, +0x07D2, +0xD4FA, +0x6D48, +0xF010, +0x0001, +0xD1F6, +0x4770, +0x2001, +0x4770, 0xB538, 0x4608, 0x460D, 0x4611, 0x4614, 0xF7FD, -0xF85F, +0xF835, 0xB108, 0x200A, 0xBD38, @@ -6598,13 +6740,13 @@ Uint16 const FPData[] = { 0xD005, 0x4620, 0xF7FD, -0xFA51, +0xFA35, 0xB130, 0x2016, 0xBD38, 0x4628, 0xF7FD, -0xF9F9, +0xF9DD, 0x2800, 0xD1F8, 0x2000, @@ -6629,7 +6771,7 @@ Uint16 const FPData[] = { 0x4631, 0x4628, 0xF7FD, -0xF836, +0xF80C, 0xB180, 0x200A, 0xB003, @@ -6638,7 +6780,7 @@ Uint16 const FPData[] = { 0x4611, 0x4632, 0xF7FC, -0xFFF7, +0xFF67, 0x2800, 0xD0F0, 0x2808, @@ -6654,86 +6796,126 @@ Uint16 const FPData[] = { 0x4642, 0x4623, 0xF7FD, -0xF947, -0xB958, -0x2300, -0xF2C4, -0x0306, -0x6CDA, -0xF442, -0x7280, -0x64DA, -0x6CDA, -0xF442, -0x7200, -0x64DA, -0xE7E8, +0xF927, +0xB108, 0x201E, -0xE7E6, +0xE7E5, +0x2D00, +0xD1FB, +0xF7FF, +0xFF94, +0x2800, +0xD0DF, +0xE7F6, +0xBF00, 0xE92D, -0x43F8, -0xF8BD, -0x4020, -0xF8BD, -0x5024, +0x47F0, +0xB090, 0x460F, +0xF8BD, +0x4060, +0xF8BD, +0x5064, 0x4690, -0x4699, -0x4606, -0xB11C, -0xB16C, +0x469A, +0x4681, +0xB31C, +0xF1B8, +0x0F20, +0xD932, +0x4648, +0x4669, +0x2220, +0xF7FC, +0xFF5E, +0xB9B0, +0x463D, +0x466C, +0xF10D, +0x0C40, +0xE001, +0x4564, +0xD020, +0xF835, +0x7B02, +0x4621, +0xF834, +0x6B02, +0x42BE, +0x462F, +0xD0F5, +0xF8AA, +0x6004, +0xF8B9, +0x3000, +0xF8CA, +0x1000, +0xF8AA, +0x3006, 0x2028, +0xB010, 0xE8BD, -0x83F8, +0x87F0, 0x462A, 0x4641, 0xF7FC, -0xFFC5, +0xFF18, 0xF64F, 0x73F7, 0x4003, -0xB113, 0x200C, +0x2B00, +0xD0D1, +0xB010, 0xE8BD, -0x83F8, +0x87F0, +0xF1A8, +0x0820, +0xF109, +0x0940, +0xE7C9, 0xF1B8, 0x0F00, -0xD014, -0x8838, -0x8833, -0x4283, +0xD01A, +0x4669, +0x4648, +0xFA1F, +0xF288, +0xF7FC, +0xFF27, +0x2800, +0xD1DE, +0xF8BD, +0x3000, +0x883A, +0x4293, 0xBF04, -0x1CB5, -0x2400, +0x4669, +0x4603, 0xD006, -0xE00F, -0xF837, +0xE00B, +0xF831, 0x0F02, -0xF8B6, -0xC000, -0x4584, -0xD109, -0x3401, -0xB2A4, -0x45A0, -0x462E, -0xF105, -0x0502, -0xD8F2, +0xF837, +0x2F02, +0x4290, +0xD105, +0x3301, +0xB29B, +0x4543, +0xD3F5, 0x2000, -0xE8BD, -0x83F8, -0xF8A9, -0x0004, -0x8833, -0xF8C9, -0x6000, -0xF8A9, +0xE7CA, +0xF8AA, +0x2004, +0xF8B9, +0x3000, +0xF8CA, +0x9000, +0xF8AA, 0x3006, 0x2028, -0xE8BD, -0x83F8, -0xBF00, +0xE7C0, 0xB508, 0xF240, 0x0364, @@ -6748,13 +6930,13 @@ Uint16 const FPData[] = { 0x0006, 0xD00D, 0xF246, -0x303C, +0x502C, 0xF2C2, 0x0000, 0xF7FE, -0xFFE1, +0xFF9D, 0xF645, -0x3338, +0x5328, 0xF2C2, 0x0300, 0x4618, @@ -6762,11 +6944,11 @@ Uint16 const FPData[] = { 0x4798, 0xBD08, 0xF246, -0x40C8, +0x60B8, 0xF2C2, 0x0000, 0xF7FE, -0xFE49, +0xFE05, 0xE7F0, 0xF240, 0x0364, @@ -6778,13 +6960,13 @@ Uint16 const FPData[] = { 0x2B01, 0xD015, 0xF246, -0x303C, +0x502C, 0xF2C2, 0x0000, 0xF7FF, -0xF94F, +0xF90B, 0xF645, -0x3038, +0x5028, 0xF44F, 0x5340, 0xF2C2, @@ -6792,7 +6974,7 @@ Uint16 const FPData[] = { 0xF2C4, 0x0309, 0xF246, -0x323C, +0x522C, 0x6D04, 0x6859, 0xF2C2, @@ -6800,13 +6982,13 @@ Uint16 const FPData[] = { 0x47A0, 0xBD10, 0xF246, -0x40C8, +0x60B8, 0xF2C2, 0x0000, 0xF7FF, -0xF939, +0xF8F5, 0xF645, -0x3038, +0x5028, 0xF44F, 0x5340, 0xF2C2, @@ -6814,7 +6996,7 @@ Uint16 const FPData[] = { 0xF2C4, 0x0309, 0xF246, -0x42C8, +0x62B8, 0x6D04, 0x6859, 0xF2C2, @@ -6831,17 +7013,17 @@ Uint16 const FPData[] = { 0x2B01, 0xD005, 0xF246, -0x303C, +0x502C, 0xF2C2, 0x0000, 0xF7FF, -0xBED2, +0xBE8E, 0xF246, -0x40C8, +0x60B8, 0xF2C2, 0x0000, 0xF7FF, -0xBECC, +0xBE88, 0x4770, 0xBF00, 0xE92D, @@ -6884,7 +7066,7 @@ Uint16 const FPData[] = { 0x02FF, 0x400A, 0xF645, -0x3090, +0x5080, 0xF2C2, 0x0000, 0xF042, @@ -7026,7 +7208,7 @@ Uint16 const FPData[] = { 0x8FF0, 0xB508, 0xF645, -0x3390, +0x5380, 0xF2C2, 0x0300, 0x4618, @@ -7036,7 +7218,7 @@ Uint16 const FPData[] = { 0xBF00, 0xB508, 0xF645, -0x3390, +0x5380, 0xF2C2, 0x0300, 0x4618, @@ -7046,7 +7228,7 @@ Uint16 const FPData[] = { 0xBF00, 0xB508, 0xF645, -0x3390, +0x5380, 0xF2C2, 0x0300, 0x4618, @@ -7054,6 +7236,76 @@ Uint16 const FPData[] = { 0x4798, 0xBD08, 0xBF00, +0xE92D, +0x41F0, +0xB090, +0x460F, +0x4680, +0x2100, +0x4668, +0x2240, +0xF001, +0xFA8C, +0x2F1F, +0xF04F, +0x0400, +0xD917, +0xF10D, +0x063E, +0x4640, +0x4669, +0x2220, +0x2300, +0xF7FC, +0xFF54, +0xB998, +0xF1AD, +0x0302, +0xF833, +0x5F02, +0x3501, +0x42B3, +0xFA14, +0xF485, +0xD1F8, +0x3F20, +0xB2BF, +0x2F1F, +0xF108, +0x0840, +0xD8E9, +0xB93F, +0x4620, +0xB010, +0xE8BD, +0x81F0, +0x2000, +0xB010, +0xE8BD, +0x81F0, +0x4640, +0x4669, +0x463A, +0x2300, +0xF7FC, +0xFF35, +0x2800, +0xD1F3, +0x1E79, +0xAB00, +0xB289, +0xEB03, +0x0141, +0xF1AD, +0x0302, +0xF833, +0x2F02, +0x3201, +0x428B, +0xFA14, +0xF482, +0xD1F8, +0xE7E0, 0xF24F, 0x0201, 0x2300, @@ -7063,7 +7315,7 @@ Uint16 const FPData[] = { 0x4770, 0xBF00, 0xF246, -0x0398, +0x2388, 0xF2C2, 0x0300, 0xB410, @@ -7175,7 +7427,7 @@ Uint16 const FPData[] = { 0x4770, 0xBF00, 0xF246, -0x0198, +0x2188, 0xB5F8, 0xF2C2, 0x0100, @@ -7210,7 +7462,7 @@ Uint16 const FPData[] = { 0xFA1F, 0xFE8E, 0xF246, -0x0498, +0x2488, 0xF5B3, 0x7F80, 0xF8A2, @@ -7336,7 +7588,7 @@ Uint16 const FPData[] = { 0xFB01, 0x3212, 0xF246, -0x333C, +0x532C, 0xF2C2, 0x0300, 0x323C, @@ -7345,7 +7597,7 @@ Uint16 const FPData[] = { 0xF8A3, 0x2042, 0xF7FE, -0xFF1A, +0xFE90, 0x2300, 0x8323, 0x8023, @@ -7363,7 +7615,7 @@ Uint16 const FPData[] = { 0x4290, 0xD2BB, 0xF245, -0x5334, +0x7324, 0xF2C2, 0x0300, 0x68DB, @@ -7377,13 +7629,13 @@ Uint16 const FPData[] = { 0xF8B4, 0x2046, 0xF246, -0x209C, +0x408C, 0xB292, 0xF2C2, 0x0000, 0x2100, 0xF7FF, -0xFCDE, +0xFC70, 0x8B23, 0x2800, 0xD140, @@ -7477,7 +7729,7 @@ Uint16 const FPData[] = { 0xFB01, 0x3212, 0xF246, -0x43C8, +0x63B8, 0xF2C2, 0x0300, 0x323C, @@ -7486,7 +7738,7 @@ Uint16 const FPData[] = { 0xF8A3, 0x2042, 0xF7FE, -0xFE8D, +0xFE03, 0xE771, 0x8B23, 0xF443, @@ -7498,11 +7750,11 @@ Uint16 const FPData[] = { 0x4FBD, 0xB280, 0xF001, -0xF8E5, +0xF8E1, 0xF107, 0x0510, 0xF001, -0xF8EB, +0xF8E7, 0xB280, 0xF8AD, 0x0036, @@ -7529,34 +7781,34 @@ Uint16 const FPData[] = { 0x42AF, 0xD1E4, 0xF246, -0x20D4, +0x40C4, 0xF2C2, 0x0000, 0xF246, -0x352C, +0x551C, 0xF2C2, 0x0500, 0xF000, -0xFF48, +0xFF44, 0xF246, -0x20D4, +0x40C4, 0x2210, 0x4629, 0xF2C2, 0x0000, 0xF246, -0x0688, +0x2678, 0xF2C2, 0x0600, 0xF000, -0xFF56, +0xFF52, 0xF246, -0x21D4, +0x41C4, 0x4630, 0xF2C2, 0x0100, 0xF000, -0xFF97, +0xFF93, 0xF896, 0xB00C, 0xF896, @@ -7677,7 +7929,7 @@ Uint16 const FPData[] = { 0x9F0A, 0x7168, 0xF246, -0x20D4, +0x40C4, 0x43DB, 0x43D2, 0x6227, @@ -7698,27 +7950,27 @@ Uint16 const FPData[] = { 0xF885, 0xA00F, 0xF000, -0xFEA7, +0xFEA3, 0xF246, -0x20D4, +0x40C4, 0x2210, 0x4629, 0xF2C2, 0x0000, 0xF000, -0xFEB9, +0xFEB5, 0xF246, -0x20B4, +0x40A4, 0xF246, -0x21D4, +0x41C4, 0xF2C2, 0x0000, 0xF2C2, 0x0100, 0xF000, -0xFEF7, +0xFEF3, 0xF246, -0x22B4, +0x42A4, 0xF2C2, 0x0200, 0x2600, @@ -7728,34 +7980,34 @@ Uint16 const FPData[] = { 0x2E10, 0xD1FA, 0xF246, -0x20D4, +0x40C4, 0xF2C2, 0x0000, 0xF000, -0xFE85, +0xFE81, 0xF246, -0x20D4, +0x40C4, 0xF246, -0x312C, +0x511C, 0x4632, 0xF2C2, 0x0000, 0xF2C2, 0x0100, 0xF000, -0xFE94, +0xFE90, 0xF246, -0x20A4, +0x4094, 0xF246, -0x21D4, +0x41C4, 0xF2C2, 0x0000, 0xF2C2, 0x0100, 0xF000, -0xFED2, +0xFECE, 0xF246, -0x20A4, +0x4094, 0xF2C2, 0x0000, 0xF7FF, @@ -7770,7 +8022,7 @@ Uint16 const FPData[] = { 0x2209, 0x2100, 0xF246, -0x20A4, +0x4094, 0x8322, 0xF2C2, 0x0000, @@ -7780,7 +8032,7 @@ Uint16 const FPData[] = { 0xF7FF, 0xFDA3, 0xF246, -0x23B4, +0x43A4, 0xF2C2, 0x0300, 0x6AE1, @@ -7804,7 +8056,7 @@ Uint16 const FPData[] = { 0xEB02, 0x2505, 0xF246, -0x22C4, +0x42B4, 0xF2C2, 0x0200, 0x4069, @@ -7872,9 +8124,9 @@ Uint16 const FPData[] = { 0x8323, 0x4628, 0xF7FE, -0xFD8F, +0xFD05, 0xE631, -0x632B, +0x651B, 0x2000, 0x2700, 0x899B, @@ -7922,7 +8174,7 @@ Uint16 const FPData[] = { 0xB2B6, 0x2700, 0xF246, -0x239C, +0x438C, 0x9601, 0x31DC, 0x3201, @@ -7930,7 +8182,7 @@ Uint16 const FPData[] = { 0xF2C2, 0x0300, 0xF7FF, -0xFAD7, +0xFA69, 0x464C, 0x4606, 0xB178, @@ -7963,37 +8215,15 @@ Uint16 const FPData[] = { 0xB292, 0xB2BF, 0xF246, -0x239C, +0x438C, 0x31DC, 0x3201, 0x9701, 0xF2C2, 0x0300, 0xF7FF, -0xFAEB, -0xB9A8, -0xF8D5, -0x2188, -0x8992, -0x4603, -0x6C22, -0x6BE1, -0xF831, -0x1013, -0x3101, -0xFA12, -0xF281, -0x6422, -0xF8D5, -0x2188, -0x8992, -0x3301, -0xB29B, -0xB292, -0x429A, -0xDAEF, -0x8B23, -0xE5A0, +0xFA79, +0xB178, 0xF8B9, 0x3018, 0xF443, @@ -8009,7 +8239,25 @@ Uint16 const FPData[] = { 0x3018, 0xF8A9, 0x6000, -0xE533, +0xE549, +0xF8D9, +0x6040, +0xF8D9, +0x003C, +0xF8D5, +0x3188, +0x8999, +0x3101, +0xB289, +0xF7FF, +0xFC09, +0x4430, +0xF8C9, +0x0040, +0xF8B9, +0x3018, +0xE595, +0xBF00, 0xB430, 0xF44F, 0x5380, @@ -8159,13 +8407,13 @@ Uint16 const FPData[] = { 0xB5F8, 0xB672, 0xF7FD, -0xF966, +0xF8E0, 0xF7FC, -0xFC50, +0xFBCA, 0xF240, 0x7044, 0xF640, -0x32DC, +0x42C4, 0xF2C2, 0x0000, 0xF2C2, @@ -8213,12 +8461,12 @@ Uint16 const FPData[] = { 0x8122, 0x8163, 0xF7FD, -0xF948, +0xF8C2, 0xF7FD, -0xF958, +0xF8D2, 0x8863, 0xF246, -0x47C8, +0x67B8, 0xF2C2, 0x0700, 0xB29B, @@ -8230,7 +8478,7 @@ Uint16 const FPData[] = { 0x3044, 0x8923, 0xF246, -0x363C, +0x562C, 0xF2C2, 0x0600, 0xB29B, @@ -8252,7 +8500,7 @@ Uint16 const FPData[] = { 0x80D9, 0x819A, 0xF645, -0x35AC, +0x559C, 0xF2C2, 0x0500, 0x2200, @@ -8265,7 +8513,7 @@ Uint16 const FPData[] = { 0x2200, 0x2301, 0xF246, -0x046A, +0x245A, 0x61F9, 0xF2C2, 0x0400, @@ -8280,7 +8528,7 @@ Uint16 const FPData[] = { 0x692B, 0x3201, 0xF645, -0x30AC, +0x509C, 0x8022, 0xF2C2, 0x0000, @@ -8296,9 +8544,9 @@ Uint16 const FPData[] = { 0xF2C4, 0x0509, 0xF246, -0x0464, +0x2454, 0xF645, -0x30AC, +0x509C, 0x686B, 0xF2C2, 0x0000, @@ -8308,7 +8556,7 @@ Uint16 const FPData[] = { 0x6983, 0x4798, 0xF246, -0x036C, +0x235C, 0xF2C2, 0x0300, 0x6820, @@ -8317,7 +8565,7 @@ Uint16 const FPData[] = { 0x801A, 0x6869, 0xF246, -0x0270, +0x2260, 0xF2C2, 0x0200, 0xF44F, @@ -8338,9 +8586,9 @@ Uint16 const FPData[] = { 0xF2C4, 0x0509, 0xF246, -0x0474, +0x2464, 0xF645, -0x30AC, +0x509C, 0x686B, 0xF2C2, 0x0000, @@ -8350,7 +8598,7 @@ Uint16 const FPData[] = { 0x6943, 0x4798, 0xF246, -0x036E, +0x235E, 0xF2C2, 0x0300, 0x6820, @@ -8359,7 +8607,7 @@ Uint16 const FPData[] = { 0x801A, 0x6869, 0xF246, -0x0268, +0x2258, 0xF2C2, 0x0200, 0xF44F, @@ -9514,7 +9762,7 @@ Uint16 const FPData[] = { 0x02C5, 0x2A37, 0xF645, -0x31C8, +0x51B8, 0xBF94, 0xF1C2, 0x0238, @@ -9784,7 +10032,7 @@ Uint16 const FPData[] = { 0xF8C3, 0x20AC, 0x4770, -0x6030, +0x6220, 0x2000, 0xB410, 0x4B0C, @@ -9812,7 +10060,7 @@ Uint16 const FPData[] = { 0xF85D, 0x4B04, 0x4770, -0x6030, +0x6220, 0x2000, 0xF42D, 0x5851, @@ -10046,57 +10294,57 @@ Uint16 const FPData[] = { 0x0009, 0x0029, 0x0000, -0x64E0, +0x66D0, 0x2000, -0x64E4, +0x66D4, 0x2000, -0x64E8, +0x66D8, 0x2000, -0x64EC, +0x66DC, 0x2000, -0x650A, +0x66FA, 0x2000, -0x650C, +0x66FC, 0x2000, -0x6514, +0x6704, 0x2000, -0x6516, +0x6706, 0x2000, -0x6518, +0x6708, 0x2000, -0x651C, +0x670C, 0x2000, -0x652A, +0x671A, 0x2000, -0x5B38, +0x5D28, 0x2000, -0x5B50, +0x5D40, 0x2000, -0x5B54, +0x5D44, 0x2000, -0x5B58, +0x5D48, 0x2000, -0x5B5C, +0x5D4C, 0x2000, -0x5B60, +0x5D50, 0x2000, -0x5B64, +0x5D54, 0x2000, -0x5B68, +0x5D58, 0x2000, -0x5B6C, +0x5D5C, 0x2000, -0x5B70, +0x5D60, 0x2000, -0x5B74, +0x5D64, 0x2000, -0x5B7C, +0x5D6C, 0x2000, -0x5B7E, +0x5D6E, 0x2000, -0x5B82, +0x5D72, 0x2000, -0x5B78, +0x5D68, 0x2000, 0x0006, 0x0010, @@ -10310,57 +10558,57 @@ Uint16 const FPData[] = { 0x0000, 0x0000, 0x0000, -0x6354, +0x6544, 0x2000, -0x6358, +0x6548, 0x2000, -0x635C, +0x654C, 0x2000, -0x6360, +0x6550, 0x2000, -0x637E, +0x656E, 0x2000, -0x6380, +0x6570, 0x2000, -0x6388, +0x6578, 0x2000, -0x638A, +0x657A, 0x2000, -0x638C, +0x657C, 0x2000, -0x6390, +0x6580, 0x2000, -0x639E, +0x658E, 0x2000, -0x5B38, +0x5D28, 0x2000, -0x5B50, +0x5D40, 0x2000, -0x5B54, +0x5D44, 0x2000, -0x5B58, +0x5D48, 0x2000, -0x5B5C, +0x5D4C, 0x2000, -0x5B60, +0x5D50, 0x2000, -0x5B64, +0x5D54, 0x2000, -0x5B68, +0x5D58, 0x2000, -0x5B6C, +0x5D5C, 0x2000, -0x5B70, +0x5D60, 0x2000, -0x5B74, +0x5D64, 0x2000, -0x5B7C, +0x5D6C, 0x2000, -0x5B7E, +0x5D6E, 0x2000, -0x5B82, +0x5D72, 0x2000, -0x5B78, +0x5D68, 0x2000, 0x0010, 0x002F, @@ -10448,25 +10696,25 @@ Uint16 const FPData[] = { 0x0028, 0x0043, 0x0000, -0x5530, +0x5720, 0x2000, -0x5530, +0x5720, 0x2000, 0x0B04, 0x0000, -0x6034, +0x6224, 0x2000, 0x0620, 0x0000, 0xA001, 0x0000, -0x420D, +0x4401, 0x2000, -0x4275, +0x4469, 0x2000, -0x42A1, +0x4495, 0x2000, -0x42C1, +0x44B5, 0x2000, 0x0006, 0x0006, @@ -10546,11 +10794,11 @@ Uint16 const FPData[] = { 0x0000, 0x0000, 0x0000, -0x2B4D, +0x2C35, 0x2000, -0x2BB1, +0x2C99, 0x2000, -0x2B35, +0x2C1D, 0x2000, 0x0000, 0x0008, @@ -10590,11 +10838,11 @@ Uint16 const FPData[] = { 0x0000, 0x0000, 0x0000, -0x2B4D, +0x2C35, 0x2000, -0x2BB1, +0x2C99, 0x2000, -0x2B35, +0x2C1D, 0x2000, 0x0000, 0x0000, @@ -10918,11 +11166,11 @@ Uint16 const FPData[] = { 0x0000, 0x0000, 0x0000, -0x2B4D, +0x2C35, 0x2000, -0x2BB1, +0x2C99, 0x2000, -0x2B35, +0x2C1D, 0x2000, 0x0000, 0x0008, @@ -10962,11 +11210,11 @@ Uint16 const FPData[] = { 0x0000, 0x0000, 0x0000, -0x2B4D, +0x2C35, 0x2000, -0x2BB1, +0x2C99, 0x2000, -0x2B35, +0x2C1D, 0x2000, 0x0000, 0x0000, @@ -11268,9 +11516,9 @@ Uint16 const FPData[] = { 0x0000, 0x0000, 0x0001, -0x3A95, +0x3C91, 0x2000, -0x3BF9, +0x3DF5, 0x2000, 0x0000, 0x0000, @@ -11280,13 +11528,13 @@ Uint16 const FPData[] = { 0x0000, 0x0000, 0x0000, -0x3815, +0x3985, 0x2000, -0x3859, +0x39C9, 0x2000, -0x38C5, +0x3A35, 0x2000, -0x38ED, +0x3A5D, 0x2000, 0x0000, 0x0000, @@ -11294,13 +11542,13 @@ Uint16 const FPData[] = { 0x0000, 0x0000, 0x0000, -0x38F1, +0x3A61, 0x2000, -0x3A59, +0x3BC9, 0x2000, -0x3A6D, +0x3BDD, 0x2000, -0x3A81, +0x3BF1, 0x2000, 0x0080, 0x0000, @@ -11336,11 +11584,11 @@ Uint16 const FPData[] = { 0x0000, 0x0000, 0x0000, -0x5EF4, +0x60E4, 0x2000, -0x5F5C, +0x614C, 0x2000, -0x5FC4, +0x61B4, 0x2000, 0x0000, 0x0000, @@ -11360,7 +11608,7 @@ Uint16 const FPData[] = { 0x0000, 0x0000, 0x0000, -0x5514, +0x5708, 0x2000, 0x0000, 0x0000, @@ -11866,6 +12114,6 @@ Uint16 const FPData[] = { 0x0000, 0x0000, 0x0000, -0x5C08, +0x5DF8, 0x2000 }; diff --git a/cood.xml b/cood.xml index 1c292ec..c87b3eb 100644 --- a/cood.xml +++ b/cood.xml @@ -5161,6 +5161,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +