diff --git a/Flash/Exe/solarium.out b/Flash/Exe/solarium.out index 2706efc..48881ca 100644 Binary files a/Flash/Exe/solarium.out and b/Flash/Exe/solarium.out differ diff --git a/PROJECT/app/app_serv.c b/PROJECT/app/app_serv.c index e175d38..d3e5ad2 100644 --- a/PROJECT/app/app_serv.c +++ b/PROJECT/app/app_serv.c @@ -85,20 +85,27 @@ void UserAppTask(void *p_arg) static CPU_INT32U time_last_insert_coin = 0; { - CPU_INT32U m=0; - GetData(&AcceptedMoneyDesc, &m, 0, DATA_FLAG_SYSTEM_INDEX); - if (m) - { - EnabledChannelsNum = 0; - for (CPU_INT08U i=0; i= mintime*60) + { + LED_on(); + sprintf(buf, "ÍÀÆÌÈÒÅ CTAPT"); + } + else + { + LED_off(); + sprintf(buf, "ÂÍÅÑÈÒÅ ÄÅÍbÃÈ"); + } + + PrintUserMenuStr(buf, 3); + return; + } + sprintf(buf, "Âíåñèòå äåíüãè"); PrintUserMenuStr(buf, 0); accmoney = GetAcceptedMoney() + GetAcceptedBankMoney(); @@ -1024,12 +1074,17 @@ void WorkServer(void) { // çàêîí÷èëè ïàóçó ChannelsState[i] = CHANNEL_STATE_EMPTY; ChannelsPayedTime[i] = 0; + + if (EnabledChannelsNum == 1) + { + UserMenuState = USER_STATE_ACCEPT_MONEY; + UserPrintMoneyMenu(); + CoinEnable(); + } } break; } - } - } diff --git a/PROJECT/version.h b/PROJECT/version.h index 55ec7bc..329ce0e 100644 --- a/PROJECT/version.h +++ b/PROJECT/version.h @@ -1,7 +1,7 @@ #ifndef _VERSION_H_ #define _VERSION_H_ -#define DEVICE_FW_VERSION "03.45" +#define DEVICE_FW_VERSION "03.48" #endif // #ifndef _VERSION_H_ \ No newline at end of file diff --git a/settings/solarium.wsdt b/settings/solarium.wsdt index ffac248..50bf457 100644 --- a/settings/solarium.wsdt +++ b/settings/solarium.wsdt @@ -379,7 +379,7 @@ 20 1867 2 - + 0 -1 @@ -434,6 +434,8 @@ solarium + solarium/DRIVERS + solarium/DRIVERS/ccnet solarium/PROJECT solarium/PROJECT/app solarium/PROJECT/data @@ -443,7 +445,7 @@ 14 - 34 + 38 1 @@ -453,16 +455,16 @@ 1 1 1 - 0F000000040017810000010000001481000001000000008100000C000000E980000001000000 + 3400000018002981000002000000138600000100000010860000020000000F8100000100000020810000010000001D810000010000000D80000001000000568600005D00000028810000020000001781000001000000148100000200000028E100000D00000000810000130000001F810000010000000E810000220200005E86000001000000E9800000010000001486000001000000058100000200000011860000020000004681000001000000218100000D0000005D860000010000000D81000002000000 - 1B000D8400000F84000008840000FFFFFFFF54840000328100001C8100000984000010E1000011E1000012E1000013E1000014E1000015E1000016E1000017E1000018E1000019E100001AE100001BE100001CE100001DE100001EE100001FE10000E88000000E84000030840000 - 1100158100002800000007E100003C00000004E100003A0000000D8000001800000001E1000037000000178100002A0000001481000027000000008100001D00000003E10000390000000B8100001B00000000E100003600000041E10000460000001681000029000000518400005700000005E100003B0000000D8100001D00000002E1000038000000 + 1F000D8400000F84000008840000FFFFFFFF54840000328100001C8100000984000010E1000011E1000012E1000013E1000014E1000015E1000016E1000017E1000018E1000019E100001AE100001BE100001CE100001DE100001EE100001FE10000E880000020F1000010F0000000F0000020F0000030F0000060F00000 + 1300158100002800000007E100003C00000004E100003A0000000D8000001800000001E1000037000000178100002A000000148100002700000030840000530000000E84000051000000008100001D00000003E10000390000000B8100002200000000E100003600000041E10000460000001681000029000000518400005700000005E100003B0000000D8100002400000002E1000038000000 0 0A0000000A0000006E0000006E000000 - 00000000E603000080070000F9030000 + 00000000DD030000BE030000F0030000 4096 0 0 @@ -488,8 +490,8 @@ 4294967295 - 00000000DC02000080070000FD030000 - 000000000703000080070000E6030000 + 000000005D030000BE030000F4030000 + 0000000046030000BE030000DD030000 4096 0 0 @@ -502,7 +504,7 @@ 34052 B7010000BD000000D90200006E010000 - 040000001F0300007C070000CC030000 + 040000005E030000BA030000C3030000 32768 0 0 @@ -520,9 +522,9 @@ _I0 - 610 + 286 40 - 1220 + 581 20 2 @@ -533,8 +535,8 @@ 34048 B7010000BD000000D90200006E010000 - 040000001F0300007C070000CC030000 - 4096 + 040000005E030000BA030000C3030000 + 32768 0 0 32767 @@ -546,8 +548,8 @@ 34056 B7010000BD000000D90200006E010000 - 040000001F0300007C0700000E040000 - 4096 + 040000005E030000BA030000C3030000 + 32768 0 0 32767 @@ -561,15 +563,15 @@ 95 1142 2 - + 0 -1 34057 B7010000BD000000D90200006E010000 - 040000001F0300007C0700000E040000 - 4096 + 040000005E030000BA030000C3030000 + 32768 0 0 32767 @@ -583,15 +585,15 @@ 95 1142 2 - + 0 -1 34058 B7010000BD000000D90200006E010000 - 040000001F0300007C070000CC030000 - 4096 + 040000005E030000BA030000C3030000 + 32768 0 0 32767 @@ -617,8 +619,8 @@ 34059 B7010000BD000000D90200006E010000 - 040000001F0300007C070000CC030000 - 4096 + 040000005E030000BA030000C3030000 + 32768 0 0 32767 @@ -632,15 +634,15 @@ 95 1142 2 - + 0 -1 34060 B7010000BD000000D90200006E010000 - 040000001F0300007C0700000E040000 - 4096 + 040000005E030000BA030000C3030000 + 32768 0 0 32767 @@ -658,8 +660,8 @@ 34062 B7010000BD000000D90200006E010000 - 040000001F0300007C0700000E040000 - 4096 + 040000005E030000BA030000C3030000 + 32768 0 0 32767 @@ -670,7 +672,7 @@ 2 - + 0 -1 @@ -692,16 +694,16 @@ 2 - + - + <Right-click on a symbol in the editor to show a call graph> - + 0 @@ -710,7 +712,7 @@ 0 - + 0 @@ -811,7 +813,7 @@ 34063 B7010000BD000000BD0200001E020000 - 00000000320000000601000003030000 + 00000000320000000601000042030000 4096 0 0 @@ -822,7 +824,7 @@ 1 - 000000000E000000000000000010000001000000FFFFFFFFFFFFFFFF06010000320000000A010000030300000100000002000010040000000100000000000000000000000F85000000000000000000000000000000000000010000000F850000010000000F850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000D85000000000000000000000000000000000000010000000D850000010000000D850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000078500000000000000000000000000000000000001000000078500000100000007850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000068500000000000000000000000000000000000001000000068500000100000006850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000058500000000000000000000000000000000000001000000058500000100000005850000000000000080000001000000FFFFFFFFFFFFFFFF000000000303000080070000070300000100000001000010040000000100000076FDFFFFDF000000FFFFFFFF08000000048500000085000008850000098500000A8500000B8500000C8500000E850000FFFF02000B004354616262656450616E65008000000100000000000000DC02000080070000FD030000000000000703000080070000E6030000000000004080005608000000FFFEFF054200750069006C006400010000000485000001000000FFFFFFFFFFFFFFFFFFFEFF094400650062007500670020004C006F006700010000000085000001000000FFFFFFFFFFFFFFFFFFFEFF0C4400650063006C00610072006100740069006F006E007300000000000885000001000000FFFFFFFFFFFFFFFFFFFEFF0A5200650066006500720065006E00630065007300000000000985000001000000FFFFFFFFFFFFFFFFFFFEFF0D460069006E006400200049006E002000460069006C0065007300010000000A85000001000000FFFFFFFFFFFFFFFFFFFEFF1541006D0062006900670075006F0075007300200044006500660069006E006900740069006F006E007300010000000B85000001000000FFFFFFFFFFFFFFFFFFFEFF1153006F0075007200630065002000420072006F0077007300650020004C006F006700000000000C85000001000000FFFFFFFFFFFFFFFFFFFEFF0B54006F006F006C0020004F0075007400700075007400000000000E85000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFF0485000001000000FFFFFFFF04850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000038500000000000000000000000000000000000001000000038500000100000003850000000000000000000000000000 + 000000000E000000000000000010000001000000FFFFFFFFFFFFFFFF06010000320000000A010000420300000100000002000010040000000100000000000000000000000F85000000000000000000000000000000000000010000000F850000010000000F850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000D85000000000000000000000000000000000000010000000D850000010000000D850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000078500000000000000000000000000000000000001000000078500000100000007850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000068500000000000000000000000000000000000001000000068500000100000006850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000058500000000000000000000000000000000000001000000058500000100000005850000000000000080000001000000FFFFFFFFFFFFFFFF0000000042030000BE03000046030000010000000100001004000000010000003AFEFFFF6B000000FFFFFFFF08000000048500000085000008850000098500000A8500000B8500000C8500000E850000FFFF02000B004354616262656450616E650080000001000000000000005D030000BE030000F40300000000000046030000BE030000DD030000000000004080005608000000FFFEFF054200750069006C006400010000000485000001000000FFFFFFFFFFFFFFFFFFFEFF094400650062007500670020004C006F006700010000000085000001000000FFFFFFFFFFFFFFFFFFFEFF0C4400650063006C00610072006100740069006F006E007300000000000885000001000000FFFFFFFFFFFFFFFFFFFEFF0A5200650066006500720065006E00630065007300000000000985000001000000FFFFFFFFFFFFFFFFFFFEFF0D460069006E006400200049006E002000460069006C0065007300010000000A85000001000000FFFFFFFFFFFFFFFFFFFEFF1541006D0062006900670075006F0075007300200044006500660069006E006900740069006F006E007300010000000B85000001000000FFFFFFFFFFFFFFFFFFFEFF1153006F0075007200630065002000420072006F0077007300650020004C006F006700000000000C85000001000000FFFFFFFFFFFFFFFFFFFEFF0B54006F006F006C0020004F0075007400700075007400000000000E85000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFF0485000001000000FFFFFFFF04850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000038500000000000000000000000000000000000001000000038500000100000003850000000000000000000000000000 CMSIS-Pack @@ -843,7 +845,7 @@ Main - 00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E10000000000002F000000FFFEFF000000000000000000000000000100000001000000018001E100000000000030000000FFFEFF000000000000000000000000000100000001000000018003E100000000000032000000FFFEFF0000000000000000000000000001000000010000000180008100000000000016000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E100000000000035000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E100000000040037000000FFFEFF000000000000000000000000000100000001000000018022E100000000040036000000FFFEFF000000000000000000000000000100000001000000018025E100000000000039000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE10000000000003C000000FFFEFF00000000000000000000000000010000000100000001802CE10000000004003D000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01000D005061737465436F6D626F426F784281000000000000FFFFFFFFFFFEFF000100000000000000010000000000000001000000B400000002002050FFFFFFFFFFFEFF0096000000000000000800FFFEFF063104350437043D0430043B04FFFEFF124300680061006E006E0065006C005300740049006E006400650078004400650073006300FFFEFF1543006F0075006E007400650072004300680061006E006E0065006C00520075006E004400650073006300FFFEFF1443006F0075006E007400650072004D006F006E0065007900420061006E006B004400650073006300FFFEFF1043006F0075006E007400650072004D006F006E00650079004400650073006300FFFEFF0A530079007300740065006D00540069006D006500FFFEFF164700650074004300680061006E006E0065006C007300540069006D00650046006F0072004600720065006500FFFEFF1245006E00610062006C00650064004300680061006E006E0065006C0073004E0075006D0000000000000000000000000000000000000000000000000000000000000000000180218100000000000028000000FFFEFF000000000000000000000000000100000001000000018024E100000000000038000000FFFEFF000000000000000000000000000100000001000000018028E10000000000003A000000FFFEFF000000000000000000000000000100000001000000018029E10000000000003B000000FFFEFF0000000000000000000000000001000000010000000180028100000000000017000000FFFEFF000000000000000000000000000100000001000000018029810000000000002C000000FFFEFF000000000000000000000000000100000001000000018027810000000000002A000000FFFEFF000000000000000000000000000100000001000000018028810000000000002B000000FFFEFF00000000000000000000000000010000000100000001801D8100000000040024000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040025000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000020004001B000000FFFEFF00000000000000000000000000010000000100000001800C810000020000001C000000FFFEFF00000000000000000000000000010000000100000001805F860000000000002E000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E810000020000001E000000FFFEFF00000000000000000000000000010000000100000001800F810000020000001F000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E0024030000 + 00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000036000000FFFEFF000000000000000000000000000100000001000000018001E100000000000037000000FFFEFF000000000000000000000000000100000001000000018003E100000000000039000000FFFEFF000000000000000000000000000100000001000000018000810000000000001D000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000003C000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000000003E000000FFFEFF000000000000000000000000000100000001000000018022E10000000000003D000000FFFEFF000000000000000000000000000100000001000000018025E100000000000040000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040043000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040044000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01000D005061737465436F6D626F426F784281000000000000FFFFFFFFFFFEFF000100000000000000010000000000000001000000B400000002002050FFFFFFFFFFFEFF0096000000000000001200FFFEFF063104350437043D0430043B04FFFEFF124300680061006E006E0065006C005300740049006E006400650078004400650073006300FFFEFF1543006F0075006E007400650072004300680061006E006E0065006C00520075006E004400650073006300FFFEFF1443006F0075006E007400650072004D006F006E0065007900420061006E006B004400650073006300FFFEFF1043006F0075006E007400650072004D006F006E00650079004400650073006300FFFEFF0A530079007300740065006D00540069006D006500FFFEFF164700650074004300680061006E006E0065006C007300540069006D00650046006F0072004600720065006500FFFEFF1245006E00610062006C00650064004300680061006E006E0065006C0073004E0075006D00FFFEFF1255007300650072005000720069006E007400460069007200730074004D0065006E007500FFFEFF0C1D04150414041E04210422042E00140415041D0415041304FFFEFF05460050006F0073007400FFFEFF1255007300650072005000720069006E0074004D006F006E00650079004D0065006E007500FFFEFF04260415041D041004FFFEFF071D04100416041C04180422041504FFFEFF3073007000720069006E007400660028006200750066002C0020002200260415041D0410042000250064004004430431042E002F00250064003C0438043D042E0022002C002000700072006900630065002C002000740069006D00650029003B00FFFEFF071F04200418041D042F0422041E04FFFEFF1955007300650072005000720069006E0074004400650066006500720072006500640057006100690074004D0065006E007500FFFEFF1A4300480041004E004E0045004C005F00530054004100540045005F00500041005500530045005F004200450046004F0052004500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018021810000000004002F000000FFFEFF000000000000000000000000000100000001000000018024E10000000000003F000000FFFEFF000000000000000000000000000100000001000000018028E100000000040041000000FFFEFF000000000000000000000000000100000001000000018029E100000000000042000000FFFEFF000000000000000000000000000100000001000000018002810000000000001E000000FFFEFF0000000000000000000000000001000000010000000180298100000000000033000000FFFEFF0000000000000000000000000001000000010000000180278100000000000031000000FFFEFF0000000000000000000000000001000000010000000180288100000000000032000000FFFEFF00000000000000000000000000010000000100000001801D810000000004002B000000FFFEFF00000000000000000000000000010000000100000001801E810000000004002C000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B8100000200040022000000FFFEFF00000000000000000000000000010000000100000001800C8100000200000023000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000035000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E8100000200000025000000FFFEFF00000000000000000000000000010000000100000001800F8100000200000026000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E0024030000 34050 @@ -879,7 +881,7 @@ - 010000000300000001000000000000000000000001000000010000000200000000000000010000000100000000000000280000002800000001000000070000000000000001000000FFFEFF1F2400570053005F0044004900520024005C00500052004F004A004500430054005C006100700070005C006100700070005F0073006500720076002E00630001000000FFFF010014004966436F6E74656E7453746F72616765496D706CFFFEFF00FFFEFFFF2B013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0031003100310033003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00330038003100380031003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00330038003100380031003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A6100700070005F0073006500720076002E00630000000000FFFFFFFFFFFFFFFFFFFEFF202400570053005F0044004900520024005C00500052004F004A004500430054005C006D0065006E0075005C006D0065006E00750064006500730063002E006300010000000180FFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003300390036003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00310037003300390037003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00310037003300390037003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A6D0065006E00750064006500730063002E00630000000000FFFFFFFFFFFFFFFFFFFEFF202400570053005F0044004900520024005C00500052004F004A004500430054005C0064006100740061005C00640061007400610064006500730063002E006300010000000180FFFEFF00FFFEFFFF2D013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0032003300390038003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003100310035003700300037003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003100310035003700320038003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A640061007400610064006500730063002E00630000000000FFFFFFFFFFFFFFFFFFFEFF202400570053005F0044004900520024005C00500052004F004A004500430054005C0064006100740061005C00640061007400610064006500730063002E006800010000000180FFFEFF00FFFEFFFF28013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100320033003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0034003700390037003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0034003800310037003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A640061007400610064006500730063002E00680000000000FFFFFFFFFFFFFFFFFFFEFF1A2400570053005F0044004900520024005C00500052004F004A004500430054005C00760065007200730069006F006E002E006800010000000180FFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00380030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00380030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF09760065007200730069006F006E002E00680000000000FFFFFFFFFFFFFFFFFFFEFF1F2400570053005F0044004900520024005C00500052004F004A004500430054005C006100700070005C006100700070005F0073006500720076002E006800010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00310036003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0031003500350035003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0031003500350035003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A6100700070005F0073006500720076002E00680000000000FFFFFFFFFFFFFFFFFFFEFF1F2400570053005F0044004900520024005C00500052004F004A004500430054005C0073006500720076006900630065005C00740069006D0065002E006300010000000180FFFEFF00FFFEFFFF28013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100370036003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0034003900310033003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0034003900320039003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF06740069006D0065002E00630000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000001000000020000000A01000049000000800700001A030000 + 0100000003000000010000000000000000000000010000000100000002000000000000000100000001000000000000002800000028000000010000000D0000000C00000001000000FFFEFF1F2400570053005F0044004900520024005C00500052004F004A004500430054005C006100700070005C006100700070005F0073006500720076002E00630001000000FFFF010014004966436F6E74656E7453746F72616765496D706CFFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100380031003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00330038003500380036003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00330038003500380036003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A6100700070005F0073006500720076002E00630000000000FFFFFFFFFFFFFFFFFFFEFF202400570053005F0044004900520024005C00500052004F004A004500430054005C006D0065006E0075005C006D0065006E00750064006500730063002E006300010000000180FFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003500330035003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00320034003000320034003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00320034003000320034003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A6D0065006E00750064006500730063002E00630000000000FFFFFFFFFFFFFFFFFFFEFF202400570053005F0044004900520024005C00500052004F004A004500430054005C0064006100740061005C00640061007400610064006500730063002E006300010000000180FFFEFF00FFFEFFFF2D013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0032003800360035003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003100330036003600350039003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003100330036003600350039003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A640061007400610064006500730063002E00630000000000FFFFFFFFFFFFFFFFFFFEFF202400570053005F0044004900520024005C00500052004F004A004500430054005C0064006100740061005C00640061007400610064006500730063002E006800010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00330032003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0031003500390039003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0031003500390039003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A640061007400610064006500730063002E00680000000000FFFFFFFFFFFFFFFFFFFEFF1F2400570053005F0044004900520024005C00500052004F004A004500430054005C006100700070005C006100700070005F0073006500720076002E006800010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00310036003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0031003500350035003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0031003500350035003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A6100700070005F0073006500720076002E00680000000000FFFFFFFFFFFFFFFFFFFEFF1F2400570053005F0044004900520024005C00500052004F004A004500430054005C0073006500720076006900630065005C00740069006D0065002E006300010000000180FFFEFF00FFFEFFFF28013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100370036003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0034003900310033003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0034003900320039003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF06740069006D0065002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1F2400570053005F0044004900520024005C00500052004F004A004500430054005C0073006500720076006900630065005C0063006F0069006E002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00320033003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0031003000300037003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0031003000310039003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0663006F0069006E002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1D2400570053005F0044004900520024005C0044005200490056004500520053005C006C00630064005C00730079006D007400610062002E006800010000000180FFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003200310033003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00310030003600350033003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00310030003600350033003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF08730079006D007400610062002E00680000000000FFFFFFFFFFFFFFFFFFFEFF202400570053005F0044004900520024005C00500052004F004A004500430054005C0064006100740061005C006600720061006D005F006D00610070002E006800010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003100330030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003100330030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A6600720061006D005F006D00610070002E00680000000000FFFFFFFFFFFFFFFFFFFEFF1A2400570053005F0044004900520024005C00500052004F004A004500430054005C00760065007200730069006F006E002E006800010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003100310036003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003100310036003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF09760065007200730069006F006E002E00680000000000FFFFFFFFFFFFFFFFFFFEFF1D2400570053005F0044004900520024005C00500052004F004A004500430054005C0073006500720076006900630065005C00660072002E006300010000000180FFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003700390030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00320031003800310038003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00320031003800310038003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF04660072002E00630000000000FFFFFFFFFFFFFFFFFFFEFF202400570053005F0044004900520024005C0044005200490056004500520053005C00660069007300630061006C005C00660069007300630061006C002E006300010000000180FFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003700310032003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00310039003200390038003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00310039003200390038003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF08660069007300630061006C002E00630000000000FFFFFFFFFFFFFFFFFFFEFF252400570053005F0044004900520024005C0044005200490056004500520053005C00630063006E00650074005C004300430052005300500072006F0074006F0063006F006C002E006300010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00310039003800360035003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0E4300430052005300500072006F0074006F0063006F006C002E00630000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000100000002000000CB040000510000007F07000061030000 diff --git a/solarium.dep b/solarium.dep index b6b4a38..0a047d3 100644 --- a/solarium.dep +++ b/solarium.dep @@ -1,198 +1,177 @@ 5 - 753062871 + 3546755047 Flash - $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\source\os_sem.o - $PROJ_DIR$\Flash\Obj\DRIVERS\modem\modem.o - $TOOLKIT_DIR$\inc\c\aarch32\iar_intrinsics_common.h - $PROJ_DIR$\Flash\Obj\PROJECT\app\app_serv.o - $TOOLKIT_DIR$\inc\c\yvals.h - $PROJ_DIR$\Flash\Obj\DRIVERS\ccnet\uart1.o + $TOOLKIT_DIR$\inc\c\DLib_Defaults.h + $TOOLKIT_DIR$\inc\c\DLib_Config_Normal.h + $PROJ_DIR$\Flash\Obj\PROJECT\app\control.o + $TOOLKIT_DIR$\inc\c\ycheck.h + $TOOLKIT_DIR$\inc\c\DLib_Product.h + $PROJ_DIR$\Flash\Obj\DRIVERS\fiscal\uart0.o + $PROJ_DIR$\Flash\Obj\PROJECT\service\time.o + $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\port\os_cpu_c.o + $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\port\os_cpu_a.o + $TOOLKIT_DIR$\inc\c\stdarg.h + $TOOLKIT_DIR$\inc\c\ctype.h + $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\port\os_cpu_a.o.rsp + $PROJ_DIR$\Flash\Obj\DRIVERS\fram\fram.o + $TOOLKIT_DIR$\inc\c\aarch32\intrinsics.h + $TOOLKIT_DIR$\inc\c\stdlib.h + $TOOLKIT_DIR$\lib\dl4t_tln.a + $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\source\os_q.o + $PROJ_DIR$\Flash\Exe\solarium.out + $PROJ_DIR$\Flash\Obj\PROJECT\service\mode.o + $PROJ_DIR$\Flash\Obj\PROJECT\service\validator.o + $PROJ_DIR$\Flash\Obj\PROJECT\service\coin.o + $PROJ_DIR$\Flash\Obj\OS\bsp\bsp.o + $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\source\os_mutex.o + $TOOLKIT_DIR$\inc\c\string.h + $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\source\os_mem.o + $TOOLKIT_DIR$\lib\shs_l.a + $PROJ_DIR$\Flash\Obj\PROJECT\data\data.o + $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\source\os_mbox.o $PROJ_DIR$\Flash\Obj\OS\uc\cpu\cpu_a.o.rsp - $TOOLKIT_DIR$\inc\c\aarch32\iccarm_builtin.h - $TOOLKIT_DIR$\lib\rt4t_al.a - $PROJ_DIR$\Flash\Obj\DRIVERS\fiscal\fiscal.o - $TOOLKIT_DIR$\inc\c\stdio.h - $PROJ_DIR$\Flash\Obj\PROJECT\app\modem_task.o - $PROJ_DIR$\PROJECT\data\datadesc.c - $PROJ_DIR$\PROJECT\menu\menu.h - $PROJ_DIR$\PROJECT\service\mode.c + $TOOLKIT_DIR$\lib\m4t_al.a + $TOOLKIT_DIR$\inc\c\limits.h + $TOOLKIT_DIR$\inc\c\yvals.h + $PROJ_DIR$\Flash\Obj\PROJECT\menu\menudesc.o + $TOOLKIT_DIR$\inc\c\stddef.h + $PROJ_DIR$\Flash\Obj\DRIVERS\keyboard\keyboard.o $PROJ_DIR$\PROJECT\service\time.c - $PROJ_DIR$\PROJECT\data\data.h $PROJ_DIR$\PROJECT\service\time.h - $PROJ_DIR$\PROJECT\service\mode.h - $PROJ_DIR$\PROJECT\data\datadesc.h - $PROJ_DIR$\PROJECT\service\coin.h - $PROJ_DIR$\PROJECT\service\fr.h $PROJ_DIR$\PROJECT\service\validator.c - $PROJ_DIR$\PROJECT\data\data.c + $PROJ_DIR$\PROJECT\service\fr.h + $PROJ_DIR$\PROJECT\menu\menu.h + $PROJ_DIR$\PROJECT\menu\menudesc.h + $PROJ_DIR$\PROJECT\service\mode.c + $PROJ_DIR$\PROJECT\service\mode.h $PROJ_DIR$\PROJECT\service\validator.h - $PROJ_DIR$\PROJECT\menu\menudesc.c - $PROJ_DIR$\PROJECT\service\coin.c - $PROJ_DIR$\PROJECT\menu\menu.c $PROJ_DIR$\PROJECT\service\fr.c + $PROJ_DIR$\PROJECT\menu\menudesc.c $PROJ_DIR$\PROJECT\tools\crc16.c + $PROJ_DIR$\PROJECT\service\coin.h $PROJ_DIR$\PROJECT\tools\crc16.h $PROJ_DIR$\PROJECT\version.h $PROJ_DIR$\PROJECT\data\fram_map.h - $PROJ_DIR$\PROJECT\menu\menudesc.h + $PROJ_DIR$\PROJECT\menu\menu.c + $PROJ_DIR$\PROJECT\service\coin.c + $PROJ_DIR$\Flash\Obj\OS\bsp\cstartup.o.rsp + $PROJ_DIR$\Flash\Obj\OS\uc\lib\lib_str.o + $PROJ_DIR$\Flash\Obj\DRIVERS\lcd\lcd.o + $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\source\os_task.o + $TOOLKIT_DIR$\inc\c\math.h + $PROJ_DIR$\Flash\Obj\DRIVERS\ccnet\CCRSProtocol.o + $PROJ_DIR$\Flash\Obj\DRIVERS\fram\spi.o + $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\source\os_tmr.o + $PROJ_DIR$\DRIVERS\lcd\lcd.c + $PROJ_DIR$\DRIVERS\lcd\lcd.h + $PROJ_DIR$\OS\app\app.c + $PROJ_DIR$\OS\app\os_cfg.h + $PROJ_DIR$\OS\bsp\bsp.c + $PROJ_DIR$\OS\bsp\cstartup.s + $PROJ_DIR$\DRIVERS\ccnet\CCRSProtocol.h $PROJ_DIR$\DRIVERS\ccnet\uart1.h - $PROJ_DIR$\DRIVERS\ccnet\VMCConst.h + $PROJ_DIR$\OS\bsp\iolpc2368.h $PROJ_DIR$\DRIVERS\fiscal\fiscal.h + $PROJ_DIR$\DRIVERS\modem\modem.c + $PROJ_DIR$\DRIVERS\modem\uart2.h $PROJ_DIR$\DRIVERS\fram\fram.h $PROJ_DIR$\DRIVERS\ccnet\uart1.c $PROJ_DIR$\DRIVERS\fram\spi.c - $PROJ_DIR$\DRIVERS\modem\modem.c - $PROJ_DIR$\DRIVERS\lcd\lcd.h - $PROJ_DIR$\DRIVERS\fiscal\uart0.h - $PROJ_DIR$\DRIVERS\ccnet\CCRSProtocol.h - $PROJ_DIR$\DRIVERS\fiscal\fiscal.c - $PROJ_DIR$\DRIVERS\keyboard\keyboard.c - $PROJ_DIR$\DRIVERS\keyboard\keyboard.h - $PROJ_DIR$\DRIVERS\fiscal\uart0.c - $PROJ_DIR$\DRIVERS\lcd\lcd.c - $PROJ_DIR$\DRIVERS\fram\spi.h - $PROJ_DIR$\DRIVERS\lcd\symtab.h + $PROJ_DIR$\DRIVERS\modem\uart2.c + $PROJ_DIR$\OS\app\includes.h + $PROJ_DIR$\OS\bsp\bsp.h + $PROJ_DIR$\OS\bsp\LPC2368_Flash.icf $PROJ_DIR$\DRIVERS\ccnet\CCRSProtocol.c - $PROJ_DIR$\DRIVERS\fram\fram.c - $TOOLKIT_DIR$\inc\c\math.h - $PROJ_DIR$\Flash\Obj\DRIVERS\fram\fram.o - $PROJ_DIR$\Flash\Obj\OS\app\app.o - $PROJ_DIR$\Flash\Obj\PROJECT\service\mode.o - $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\source\os_mem.o - $PROJ_DIR$\Flash\Obj\PROJECT\app\control.o - $PROJ_DIR$\Flash\Obj\DRIVERS\lcd\lcd.o - $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\source\os_flag.o - $TOOLKIT_DIR$\inc\c\ycheck.h - $TOOLKIT_DIR$\inc\c\io_macros.h - $TOOLKIT_DIR$\lib\dl4t_tln.a - $PROJ_DIR$\Flash\Obj\PROJECT\service\coin.o - $PROJ_DIR$\Flash\Obj\PROJECT\data\data.o - $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\port\os_cpu_c.o - $TOOLKIT_DIR$\inc\c\limits.h - $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\port\os_dcc.o - $TOOLKIT_DIR$\inc\c\errno.h - $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\port\os_cpu_a.o.rsp - $TOOLKIT_DIR$\inc\c\aarch32\intrinsics.h - $PROJ_DIR$\Flash\Obj\OS\bsp\cstartup.o - $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\source\os_time.o + $PROJ_DIR$\DRIVERS\fiscal\uart0.h + $PROJ_DIR$\DRIVERS\lcd\symtab.h $PROJ_DIR$\DRIVERS\modem\modem.h + $PROJ_DIR$\OS\app\app_cfg.h + $PROJ_DIR$\DRIVERS\fiscal\fiscal.c + $PROJ_DIR$\DRIVERS\fram\spi.h + $PROJ_DIR$\DRIVERS\ccnet\VMCConst.h + $PROJ_DIR$\DRIVERS\fram\fram.c + $PROJ_DIR$\DRIVERS\keyboard\keyboard.c + $PROJ_DIR$\DRIVERS\fiscal\uart0.c + $PROJ_DIR$\DRIVERS\keyboard\keyboard.h + $PROJ_DIR$\OS\uc\os_ii\port\os_cpu_c.c + $PROJ_DIR$\PROJECT\data\datadesc.h + $PROJ_DIR$\OS\uc\os_ii\source\os_q.c + $PROJ_DIR$\PROJECT\app\app_serv.h + $PROJ_DIR$\PROJECT\app\control.h + $PROJ_DIR$\PROJECT\app\journal.c + $PROJ_DIR$\PROJECT\data\datadesc.c + $PROJ_DIR$\OS\uc\cpu\cpu.h + $PROJ_DIR$\OS\uc\os_ii\port\os_cpu_a.asm + $PROJ_DIR$\OS\uc\os_ii\port\os_dbg.c + $PROJ_DIR$\OS\uc\lib\lib_str.h + $PROJ_DIR$\OS\uc\lib\lib_mem.h + $PROJ_DIR$\OS\uc\lib\lib_str.c + $PROJ_DIR$\OS\uc\os_ii\source\os_flag.c + $PROJ_DIR$\OS\uc\os_ii\source\os_mbox.c + $PROJ_DIR$\OS\uc\os_ii\source\os_mem.c + $PROJ_DIR$\OS\uc\os_ii\source\os_mutex.c + $PROJ_DIR$\OS\uc\lib\lib_def.h + $PROJ_DIR$\OS\uc\os_ii\source\os_sem.c + $PROJ_DIR$\OS\uc\os_ii\source\ucos_ii.h + $PROJ_DIR$\OS\uc\os_ii\port\os_cpu.h + $PROJ_DIR$\OS\uc\lib\lib_mem.c + $PROJ_DIR$\OS\uc\os_ii\source\os_task.c $PROJ_DIR$\PROJECT\app\modem_task.c $PROJ_DIR$\PROJECT\app\modem_task.h $PROJ_DIR$\OS\uc\os_ii\source\os_core.c - $PROJ_DIR$\OS\uc\os_ii\source\os_mutex.c - $PROJ_DIR$\OS\uc\os_ii\source\os_mbox.c - $PROJ_DIR$\OS\uc\os_ii\source\os_task.c + $PROJ_DIR$\PROJECT\data\data.c $PROJ_DIR$\OS\uc\os_ii\source\os_time.c $PROJ_DIR$\PROJECT\app\app_serv.c - $PROJ_DIR$\OS\uc\os_ii\source\os_sem.c - $PROJ_DIR$\OS\uc\os_ii\port\os_dcc.c - $PROJ_DIR$\OS\uc\os_ii\source\os_flag.c - $PROJ_DIR$\PROJECT\app\app_serv.h - $PROJ_DIR$\PROJECT\app\control.h - $PROJ_DIR$\OS\uc\os_ii\source\os_tmr.c - $PROJ_DIR$\OS\uc\os_ii\source\os_mem.c - $PROJ_DIR$\PROJECT\app\journal.c - $PROJ_DIR$\PROJECT\app\journal.h - $PROJ_DIR$\OS\uc\os_ii\port\os_cpu_c.c - $PROJ_DIR$\OS\uc\os_ii\port\os_dbg.c - $PROJ_DIR$\OS\uc\os_ii\source\ucos_ii.h - $PROJ_DIR$\OS\uc\os_ii\source\os_q.c $PROJ_DIR$\PROJECT\app\control.c - $PROJ_DIR$\OS\uc\os_ii\port\os_cpu.h - $PROJ_DIR$\OS\uc\os_ii\port\os_cpu_a.asm - $PROJ_DIR$\OS\bsp\LPC2368_Flash.icf - $PROJ_DIR$\OS\uc\cpu\cpu.h - $PROJ_DIR$\DRIVERS\modem\uart2.h - $PROJ_DIR$\OS\app\app.c - $PROJ_DIR$\OS\bsp\cstartup.s - $PROJ_DIR$\OS\app\app_cfg.h - $PROJ_DIR$\OS\bsp\bsp.h - $PROJ_DIR$\OS\bsp\bsp.c + $PROJ_DIR$\PROJECT\app\journal.h $PROJ_DIR$\OS\uc\cpu\cpu_a.s - $PROJ_DIR$\OS\app\includes.h - $PROJ_DIR$\OS\bsp\iolpc2368.h - $PROJ_DIR$\OS\app\os_cfg.h + $PROJ_DIR$\PROJECT\data\data.h + $PROJ_DIR$\OS\uc\os_ii\source\os_tmr.c + $PROJ_DIR$\OS\uc\os_ii\port\os_dcc.c $PROJ_DIR$\OS\uc\cpu\cpu_def.h - $PROJ_DIR$\OS\uc\lib\lib_def.h - $PROJ_DIR$\OS\uc\lib\lib_mem.c - $PROJ_DIR$\OS\uc\lib\lib_mem.h - $PROJ_DIR$\OS\uc\lib\lib_str.c - $PROJ_DIR$\DRIVERS\modem\uart2.c - $PROJ_DIR$\OS\uc\lib\lib_str.h - $TOOLKIT_DIR$\inc\c\DLib_Defaults.h - $PROJ_DIR$\Flash\Obj\PROJECT\tools\crc16.o - $PROJ_DIR$\Flash\Obj\DRIVERS\keyboard\keyboard.o - $PROJ_DIR$\Flash\Obj\OS\uc\lib\lib_mem.o - $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\source\os_q.o - $PROJ_DIR$\Flash\Obj\PROJECT\menu\menu.o - $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\source\os_mbox.o - $PROJ_DIR$\Flash\Obj\PROJECT\app\journal.o - $TOOLKIT_DIR$\inc\c\stddef.h - $PROJ_DIR$\Flash\Obj\PROJECT\service\time.o - $TOOLKIT_DIR$\inc\c\DLib_Product_stdlib.h - $PROJ_DIR$\Flash\Obj\PROJECT\menu\menudesc.o - $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\source\os_task.o - $PROJ_DIR$\Flash\Obj\OS\uc\cpu\cpu_a.o - $PROJ_DIR$\Flash\Obj\PROJECT\service\validator.o - $TOOLKIT_DIR$\lib\shs_l.a - $TOOLKIT_DIR$\inc\c\ctype.h - $PROJ_DIR$\Flash\Obj\DRIVERS\fiscal\uart0.o - $TOOLKIT_DIR$\inc\c\DLib_Product_string.h - $PROJ_DIR$\Flash\Obj\OS\bsp\bsp.o - $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\port\os_cpu_a.o - $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\port\os_dbg.o - $PROJ_DIR$\Flash\Obj\DRIVERS\ccnet\CCRSProtocol.o - $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\source\os_core.o - $PROJ_DIR$\Flash\Obj\DRIVERS\fram\spi.o - $TOOLKIT_DIR$\inc\c\stdlib.h - $TOOLKIT_DIR$\inc\c\DLib_Product.h - $TOOLKIT_DIR$\inc\c\DLib_Config_Normal.h - $TOOLKIT_DIR$\inc\c\ysizet.h + $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\source\os_flag.o $PROJ_DIR$\Flash\Obj\PROJECT\service\fr.o - $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\source\os_tmr.o - $PROJ_DIR$\Flash\Obj\DRIVERS\modem\uart2.o - $PROJ_DIR$\Flash\Obj\OS\uc\lib\lib_str.o - $PROJ_DIR$\Flash\Obj\PROJECT\data\datadesc.o + $TOOLKIT_DIR$\inc\c\stdio.h + $PROJ_DIR$\Flash\Obj\PROJECT\app\journal.o + $PROJ_DIR$\Flash\Obj\DRIVERS\fiscal\fiscal.o + $PROJ_DIR$\Flash\Obj\PROJECT\app\app_serv.o + $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\source\os_core.o + $TOOLKIT_DIR$\inc\c\ysizet.h + $PROJ_DIR$\Flash\Obj\PROJECT\tools\crc16.o + $TOOLKIT_DIR$\inc\c\aarch32\iccarm_builtin.h + $TOOLKIT_DIR$\lib\rt4t_al.a + $PROJ_DIR$\Flash\Obj\DRIVERS\modem\modem.o + $TOOLKIT_DIR$\inc\c\errno.h $TOOLKIT_DIR$\inc\c\DLib_float_setup.h - $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\source\os_mutex.o - $PROJ_DIR$\Flash\Exe\solarium.out - $TOOLKIT_DIR$\inc\c\stdarg.h - $TOOLKIT_DIR$\inc\c\string.h - $PROJ_DIR$\Flash\Obj\OS\bsp\cstartup.o.rsp - $TOOLKIT_DIR$\lib\m4t_al.a - $PROJ_DIR$\Flash\Exe\solarium_3_45.hex + $PROJ_DIR$\Flash\Obj\OS\uc\cpu\cpu_a.o + $TOOLKIT_DIR$\inc\c\io_macros.h + $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\port\os_dbg.o + $PROJ_DIR$\Flash\Obj\PROJECT\menu\menu.o + $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\port\os_dcc.o + $TOOLKIT_DIR$\inc\c\DLib_Product_string.h + $TOOLKIT_DIR$\inc\c\DLib_Product_stdlib.h + $PROJ_DIR$\Flash\Exe\solarium_3_48.hex + $PROJ_DIR$\Flash\Obj\PROJECT\data\datadesc.o + $PROJ_DIR$\Flash\Obj\DRIVERS\modem\uart2.o + $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\source\os_time.o + $PROJ_DIR$\Flash\Obj\OS\uc\lib\lib_mem.o + $PROJ_DIR$\Flash\Obj\OS\uc\os_ii\source\os_sem.o + $PROJ_DIR$\Flash\Obj\DRIVERS\ccnet\uart1.o + $TOOLKIT_DIR$\inc\c\aarch32\iar_intrinsics_common.h + $PROJ_DIR$\Flash\Obj\OS\bsp\cstartup.o + $PROJ_DIR$\Flash\Obj\OS\app\app.o + $PROJ_DIR$\Flash\Obj\PROJECT\app\modem_task.o - $PROJ_DIR$\PROJECT\data\datadesc.c - - - ICCARM - 151 - - + $PROJ_DIR$\Flash\Exe\solarium.out - ICCARM - 145 118 144 128 136 134 69 62 67 155 126 10 143 156 61 146 4 36 74 104 108 110 105 109 100 111 112 114 117 97 94 86 87 91 76 16 19 32 13 33 17 30 - - - - - $PROJ_DIR$\PROJECT\service\mode.c - - - ICCARM - 56 - - - - - ICCARM - 145 118 144 128 136 134 69 62 67 155 10 143 156 61 146 4 104 108 110 105 109 100 111 112 114 117 97 94 86 18 + ILINK + 15 29 138 25 58 155 132 5 12 59 34 55 139 151 158 21 157 142 153 54 8 7 144 146 134 128 27 24 22 16 154 56 152 60 133 2 131 159 26 150 145 32 20 129 18 6 19 136 79 @@ -201,13 +180,13 @@ ICCARM - 127 + 6 ICCARM - 145 118 144 128 136 62 10 143 156 61 146 4 104 110 109 100 111 97 94 86 17 + 1 0 4 148 147 143 130 14 23 3 135 31 84 64 69 99 127 112 111 95 36 @@ -216,33 +195,33 @@ ICCARM - 132 + 19 ICCARM - 145 118 144 128 136 134 69 62 67 155 10 143 156 61 146 4 43 34 36 104 108 110 105 109 100 111 112 114 117 97 94 86 87 91 16 19 24 + 1 0 4 148 147 10 140 143 30 9 130 14 23 3 135 31 67 68 70 84 77 64 78 69 99 127 109 103 102 112 111 95 96 122 124 93 43 - $PROJ_DIR$\PROJECT\data\data.c + $PROJ_DIR$\PROJECT\service\mode.c ICCARM - 65 + 18 ICCARM - 145 118 144 128 136 134 69 62 67 155 126 10 143 156 61 146 4 37 104 108 110 105 109 100 111 112 114 117 97 94 87 16 19 17 + 1 0 4 148 147 10 140 143 30 9 130 14 23 3 135 31 84 77 64 78 69 99 127 109 103 102 112 111 95 42 - $PROJ_DIR$\PROJECT\menu\menudesc.c + $PROJ_DIR$\PROJECT\service\fr.c ICCARM @@ -252,52 +231,22 @@ ICCARM - 145 118 144 128 136 134 69 62 67 155 10 143 156 61 146 4 36 104 108 110 105 109 100 111 112 114 117 97 94 86 87 91 16 19 13 33 18 17 31 + 1 0 4 148 147 10 140 143 30 9 130 14 23 3 135 31 70 81 84 77 64 78 69 99 127 109 103 102 112 111 95 96 122 124 93 38 36 - $PROJ_DIR$\PROJECT\service\coin.c + $PROJ_DIR$\PROJECT\menu\menudesc.c ICCARM - 64 + 32 ICCARM - 62 74 104 110 109 100 111 97 94 86 87 16 19 20 - - - - - $PROJ_DIR$\PROJECT\menu\menu.c - - - ICCARM - 123 - - - - - ICCARM - 145 118 144 128 136 134 69 62 67 155 10 143 156 61 146 4 36 46 41 104 108 110 105 109 100 111 112 114 117 97 94 86 87 91 16 13 33 18 17 - - - - - $PROJ_DIR$\PROJECT\service\fr.c - - - ICCARM - 147 - - - - - ICCARM - 145 118 144 128 136 134 69 62 67 155 10 143 156 61 146 4 36 42 104 108 110 105 109 100 111 112 114 117 97 94 86 87 91 16 19 21 17 + 1 0 4 148 147 10 140 143 30 9 130 14 23 3 135 31 70 84 77 64 78 69 99 127 109 103 102 112 111 95 96 122 124 93 39 40 42 36 49 @@ -306,423 +255,48 @@ ICCARM - 119 + 136 ICCARM - 145 118 144 128 136 134 69 62 67 155 10 143 156 61 146 4 104 108 110 105 109 100 111 112 114 117 97 94 30 + 1 0 4 148 147 10 140 143 30 9 130 14 23 3 135 31 84 77 64 78 69 99 127 109 103 102 112 111 48 - $PROJ_DIR$\DRIVERS\ccnet\uart1.c + $PROJ_DIR$\PROJECT\menu\menu.c ICCARM - 5 + 145 ICCARM - 145 118 144 128 136 134 69 62 67 155 10 143 156 61 146 4 34 104 108 110 105 109 100 111 112 114 117 97 94 + 1 0 4 148 147 10 140 143 30 9 130 14 23 3 135 31 70 91 62 84 77 64 78 69 99 127 109 103 102 112 111 95 96 122 124 39 40 42 36 - $PROJ_DIR$\DRIVERS\fram\spi.c + $PROJ_DIR$\PROJECT\service\coin.c ICCARM - 142 + 20 ICCARM - 145 118 144 128 62 143 61 146 4 49 104 110 109 100 111 97 94 - - - - - $PROJ_DIR$\DRIVERS\modem\modem.c - - - ICCARM - 1 - - - - - ICCARM - 145 118 144 128 136 134 69 62 67 155 10 143 156 61 146 4 74 101 104 108 110 105 109 100 111 112 114 117 97 94 86 87 76 16 19 - - - - - $PROJ_DIR$\DRIVERS\fiscal\fiscal.c - - - ICCARM - 9 - - - - - ICCARM - 145 118 144 128 136 134 69 62 67 155 10 143 156 61 146 4 36 42 104 108 110 105 109 100 111 112 114 117 97 94 21 - - - - - $PROJ_DIR$\DRIVERS\keyboard\keyboard.c - - - ICCARM - 120 - - - - - ICCARM - 145 118 144 128 136 134 69 62 67 155 10 143 156 61 146 4 46 104 108 110 105 109 100 111 112 114 117 97 94 86 - - - - - $PROJ_DIR$\DRIVERS\fiscal\uart0.c - - - ICCARM - 135 - - - - - ICCARM - 145 118 144 128 136 134 69 62 67 155 10 143 156 61 146 4 42 104 108 110 105 109 100 111 112 114 117 97 94 + 143 83 84 64 69 99 127 112 111 95 96 124 93 47 $PROJ_DIR$\DRIVERS\lcd\lcd.c - - - ICCARM - 59 - - - - - ICCARM - 145 118 144 128 136 2 7 71 134 69 62 67 155 10 143 156 61 146 4 41 50 104 108 110 105 109 100 111 112 114 117 97 94 - - - - - $PROJ_DIR$\DRIVERS\ccnet\CCRSProtocol.c - - - ICCARM - 140 - - - - - ICCARM - 145 118 144 128 136 152 134 69 62 67 53 155 10 143 156 61 146 4 43 35 34 104 108 110 105 109 100 111 112 114 117 97 94 24 - - - - - $PROJ_DIR$\DRIVERS\fram\fram.c - - - ICCARM - 54 - - - - - ICCARM - 145 118 144 128 136 134 69 62 67 155 10 143 156 61 146 4 37 49 104 108 110 105 109 100 111 112 114 117 97 94 - - - - - $PROJ_DIR$\PROJECT\app\modem_task.c - - - ICCARM - 11 - - - - - ICCARM - 145 118 144 128 136 134 69 62 67 155 10 143 156 61 146 4 36 74 104 108 110 105 109 100 111 112 114 117 97 94 86 87 91 76 16 19 17 - - - - - $PROJ_DIR$\OS\uc\os_ii\source\os_core.c - - - ICCARM - 141 - - - - - ICCARM - 104 110 97 94 - - - - - $PROJ_DIR$\OS\uc\os_ii\source\os_mutex.c - - - ICCARM - 153 - - - - - ICCARM - 104 110 97 94 - - - - - $PROJ_DIR$\OS\uc\os_ii\source\os_mbox.c - - - ICCARM - 124 - - - - - ICCARM - 104 110 97 94 - - - - - $PROJ_DIR$\OS\uc\os_ii\source\os_task.c - - - ICCARM - 130 - - - - - ICCARM - 104 110 97 94 - - - - - $PROJ_DIR$\OS\uc\os_ii\source\os_time.c - - - ICCARM - 73 - - - - - ICCARM - 104 110 97 94 - - - - - $PROJ_DIR$\PROJECT\app\app_serv.c - - - ICCARM - 3 - - - - - ICCARM - 145 118 144 128 136 134 69 62 67 155 10 143 156 61 146 4 43 36 74 104 108 110 105 109 100 111 112 114 117 97 94 86 87 91 76 16 19 13 33 20 21 18 17 24 30 - - - - - $PROJ_DIR$\OS\uc\os_ii\source\os_sem.c - - - ICCARM - 0 - - - - - ICCARM - 104 110 97 94 - - - - - $PROJ_DIR$\OS\uc\os_ii\port\os_dcc.c - - - ICCARM - 68 - - - - - ICCARM - 104 110 97 94 - - - - - $PROJ_DIR$\OS\uc\os_ii\source\os_flag.c - - - ICCARM - 60 - - - - - ICCARM - 104 110 97 94 - - - - - $PROJ_DIR$\OS\uc\os_ii\source\os_tmr.c - - - ICCARM - 148 - - - - - ICCARM - 104 110 97 94 - - - - - $PROJ_DIR$\OS\uc\os_ii\source\os_mem.c - - - ICCARM - 57 - - - - - ICCARM - 104 110 97 94 - - - - - $PROJ_DIR$\PROJECT\app\journal.c - - - ICCARM - 125 - - - - - ICCARM - 145 118 144 128 136 134 69 62 67 155 126 10 143 156 61 146 4 36 37 104 108 110 105 109 100 111 112 114 117 97 94 87 91 16 19 32 21 18 17 30 - - - - - $PROJ_DIR$\OS\uc\os_ii\port\os_cpu_c.c - - - ICCARM - 66 - - - - - ICCARM - 104 110 97 94 - - - - - $PROJ_DIR$\OS\uc\os_ii\port\os_dbg.c - - - ICCARM - 139 - - - - - ICCARM - 104 110 97 94 - - - - - $PROJ_DIR$\OS\uc\os_ii\source\os_q.c - - - ICCARM - 122 - - - - - ICCARM - 104 110 97 94 - - - - - $PROJ_DIR$\PROJECT\app\control.c - - - ICCARM - 58 - - - - - ICCARM - 145 118 144 128 136 134 69 62 67 155 10 143 156 61 146 4 104 108 110 105 109 100 111 112 114 117 97 94 87 16 19 - - - - - $PROJ_DIR$\OS\uc\os_ii\port\os_cpu_a.asm - - - AARM - 138 - - - - - AARM - 70 - - - - - $PROJ_DIR$\OS\app\app.c ICCARM @@ -732,22 +306,22 @@ ICCARM - 145 118 144 128 136 134 69 62 67 155 10 143 156 61 146 4 49 46 41 104 108 110 105 109 100 111 112 114 117 97 94 86 + 1 0 4 148 147 156 137 13 10 140 143 30 9 130 14 23 3 135 31 62 82 84 77 64 78 69 99 127 109 103 102 112 111 - $PROJ_DIR$\OS\bsp\cstartup.s + $PROJ_DIR$\OS\app\app.c - AARM - 72 + ICCARM + 158 - AARM - 157 + ICCARM + 1 0 4 148 147 10 140 143 30 9 130 14 23 3 135 31 86 91 62 84 77 64 78 69 99 127 109 103 102 112 111 95 @@ -756,48 +330,222 @@ ICCARM - 137 + 21 ICCARM - 145 118 144 128 136 134 69 62 67 155 10 143 156 61 146 4 104 108 110 105 109 100 111 112 114 117 97 94 + 1 0 4 148 147 10 140 143 30 9 130 14 23 3 135 31 84 77 64 78 69 99 127 109 103 102 112 111 - $PROJ_DIR$\OS\uc\cpu\cpu_a.s + $PROJ_DIR$\OS\bsp\cstartup.s AARM + 157 + + + + + AARM + 53 + + + + + $PROJ_DIR$\DRIVERS\modem\modem.c + + + ICCARM + 139 + + + + + ICCARM + 1 0 4 148 147 10 140 143 30 9 130 14 23 3 135 31 83 72 84 77 64 78 69 99 127 109 103 102 112 111 95 96 116 124 93 + + + + + $PROJ_DIR$\DRIVERS\ccnet\uart1.c + + + ICCARM + 155 + + + + + ICCARM + 1 0 4 148 147 10 140 143 30 9 130 14 23 3 135 31 68 84 77 64 78 69 99 127 109 103 102 112 111 + + + + + $PROJ_DIR$\DRIVERS\fram\spi.c + + + ICCARM + 59 + + + + + ICCARM + 1 0 4 148 143 14 3 135 31 86 84 64 69 99 127 112 111 + + + + + $PROJ_DIR$\DRIVERS\modem\uart2.c + + + ICCARM + 151 + + + + + ICCARM + 1 0 4 148 147 10 140 143 30 9 130 14 23 3 135 31 72 84 77 64 78 69 99 127 109 103 102 112 111 + + + + + $PROJ_DIR$\DRIVERS\ccnet\CCRSProtocol.c + + + ICCARM + 58 + + + + + ICCARM + 1 0 4 148 147 141 10 140 143 30 57 9 130 14 23 3 135 31 67 87 68 84 77 64 78 69 99 127 109 103 102 112 111 43 + + + + + $PROJ_DIR$\DRIVERS\fiscal\fiscal.c + + + ICCARM + 132 + + + + + ICCARM + 1 0 4 148 147 10 140 143 30 9 130 14 23 3 135 31 70 81 84 77 64 78 69 99 127 109 103 102 112 111 38 + + + + + $PROJ_DIR$\DRIVERS\fram\fram.c + + + ICCARM + 12 + + + + + ICCARM + 1 0 4 148 147 10 140 143 30 9 130 14 23 3 135 31 73 86 84 77 64 78 69 99 127 109 103 102 112 111 + + + + + $PROJ_DIR$\DRIVERS\keyboard\keyboard.c + + + ICCARM + 34 + + + + + ICCARM + 1 0 4 148 147 10 140 143 30 9 130 14 23 3 135 31 91 84 77 64 78 69 99 127 109 103 102 112 111 95 + + + + + $PROJ_DIR$\DRIVERS\fiscal\uart0.c + + + ICCARM + 5 + + + + + ICCARM + 1 0 4 148 147 10 140 143 30 9 130 14 23 3 135 31 81 84 77 64 78 69 99 127 109 103 102 112 111 + + + + + [ROOT_NODE] + + + ILINK + 17 + + + + + $PROJ_DIR$\OS\uc\os_ii\port\os_cpu_c.c + + + ICCARM + 7 + + + + + ICCARM + 84 64 112 111 + + + + + $PROJ_DIR$\OS\uc\os_ii\source\os_q.c + + + ICCARM + 16 + + + + + ICCARM + 84 64 112 111 + + + + + $PROJ_DIR$\PROJECT\app\journal.c + + + ICCARM 131 - AARM - 6 + ICCARM + 1 0 4 148 147 10 140 143 30 9 33 130 14 23 3 135 31 70 73 84 77 64 78 69 99 127 109 103 102 112 111 96 122 124 93 50 38 42 36 48 - $PROJ_DIR$\OS\uc\lib\lib_mem.c - - - ICCARM - 121 - - - - - ICCARM - 104 100 111 112 114 - - - - - $PROJ_DIR$\OS\uc\lib\lib_str.c + $PROJ_DIR$\PROJECT\data\datadesc.c ICCARM @@ -807,49 +555,301 @@ ICCARM - 145 118 144 128 134 69 67 10 143 61 146 4 104 100 111 112 117 + 1 0 4 148 147 10 140 143 30 9 33 130 14 23 3 135 31 70 83 84 77 64 78 69 99 127 109 103 102 112 111 95 96 122 116 124 93 50 39 40 36 48 - $PROJ_DIR$\DRIVERS\modem\uart2.c + $PROJ_DIR$\OS\uc\os_ii\port\os_cpu_a.asm + + + AARM + 8 + + + + + AARM + 11 + + + + + $PROJ_DIR$\OS\uc\os_ii\port\os_dbg.c ICCARM - 149 + 144 ICCARM - 145 118 144 128 136 134 69 62 67 155 10 143 156 61 146 4 101 104 108 110 105 109 100 111 112 114 117 97 94 + 84 64 112 111 - [ROOT_NODE] + $PROJ_DIR$\OS\uc\lib\lib_str.c - ILINK + ICCARM + 54 + + + + + ICCARM + 1 0 4 148 10 140 30 130 14 3 135 31 84 99 127 109 102 + + + + + $PROJ_DIR$\OS\uc\os_ii\source\os_flag.c + + + ICCARM + 128 + + + + + ICCARM + 84 64 112 111 + + + + + $PROJ_DIR$\OS\uc\os_ii\source\os_mbox.c + + + ICCARM + 27 + + + + + ICCARM + 84 64 112 111 + + + + + $PROJ_DIR$\OS\uc\os_ii\source\os_mem.c + + + ICCARM + 24 + + + + + ICCARM + 84 64 112 111 + + + + + $PROJ_DIR$\OS\uc\os_ii\source\os_mutex.c + + + ICCARM + 22 + + + + + ICCARM + 84 64 112 111 + + + + + $PROJ_DIR$\OS\uc\os_ii\source\os_sem.c + + + ICCARM 154 - - - $PROJ_DIR$\Flash\Exe\solarium.out - ILINK - 63 158 8 133 140 5 9 135 54 142 120 59 1 149 55 137 72 131 121 150 138 66 139 68 141 60 124 57 153 122 0 130 73 148 3 58 125 11 65 151 123 129 64 147 56 127 132 119 99 + ICCARM + 84 64 112 111 - $PROJ_DIR$\Flash\Exe\solarium_3_45.hex + $PROJ_DIR$\OS\uc\lib\lib_mem.c + + + ICCARM + 153 + + + + + ICCARM + 84 99 127 109 103 + + + + + $PROJ_DIR$\OS\uc\os_ii\source\os_task.c + + + ICCARM + 56 + + + + + ICCARM + 84 64 112 111 + + + + + $PROJ_DIR$\PROJECT\app\modem_task.c + + + ICCARM + 159 + + + + + ICCARM + 1 0 4 148 147 10 140 143 30 9 130 14 23 3 135 31 70 83 84 77 64 78 69 99 127 109 103 102 112 111 95 96 122 116 124 93 36 + + + + + $PROJ_DIR$\OS\uc\os_ii\source\os_core.c + + + ICCARM + 134 + + + + + ICCARM + 84 64 112 111 + + + + + $PROJ_DIR$\PROJECT\data\data.c + + + ICCARM + 26 + + + + + ICCARM + 1 0 4 148 147 10 140 143 30 9 33 130 14 23 3 135 31 73 84 77 64 78 69 99 127 109 103 102 112 111 96 124 93 36 + + + + + $PROJ_DIR$\OS\uc\os_ii\source\os_time.c + + + ICCARM + 152 + + + + + ICCARM + 84 64 112 111 + + + + + $PROJ_DIR$\PROJECT\app\app_serv.c + + + ICCARM + 133 + + + + + ICCARM + 1 0 4 148 147 10 140 143 30 9 130 14 23 3 135 31 67 70 83 84 77 64 78 69 99 127 109 103 102 112 111 95 96 122 116 124 93 39 40 47 38 42 36 43 48 + + + + + $PROJ_DIR$\PROJECT\app\control.c + + + ICCARM + 2 + + + + + ICCARM + 1 0 4 148 147 10 140 143 30 9 130 14 23 3 135 31 84 77 64 78 69 99 127 109 103 102 112 111 96 124 93 + + + + + $PROJ_DIR$\OS\uc\cpu\cpu_a.s + + + AARM + 142 + + + + + AARM + 28 + + + + + $PROJ_DIR$\OS\uc\os_ii\source\os_tmr.c + + + ICCARM + 60 + + + + + ICCARM + 84 64 112 111 + + + + + $PROJ_DIR$\OS\uc\os_ii\port\os_dcc.c + + + ICCARM + 146 + + + + + ICCARM + 84 64 112 111 + + + + + $PROJ_DIR$\Flash\Exe\solarium_3_48.hex OBJCOPY - 154 + 17 diff --git a/solarium.ewp b/solarium.ewp index 12ec6b3..e13d4a6 100644 --- a/solarium.ewp +++ b/solarium.ewp @@ -650,7 +650,7 @@