diff --git a/PROJECT/app/app_serv.c b/PROJECT/app/app_serv.c index 8580d87..c5eccf3 100644 --- a/PROJECT/app/app_serv.c +++ b/PROJECT/app/app_serv.c @@ -3079,8 +3079,8 @@ void InitPass(void) CPU_INT32U en_pass = 0; #endif CPU_INT32U pass,crc,crct; - GetData(&PassDesc, &pass, 0, DATA_FLAG_SYSTEM_INDEX); - GetData(&PassCRCDesc, &crc, 0, DATA_FLAG_SYSTEM_INDEX); + GetData(&PassDesc, &pass, 0, DATA_FLAG_SYSTEM_INDEX); + GetData(&PassCRCDesc, &crc, 0, DATA_FLAG_SYSTEM_INDEX); crct = crc16((unsigned char*)&pass, sizeof(CPU_INT32U)); diff --git a/PROJECT/app/app_vlad.c b/PROJECT/app/app_vlad.c index 05cad3f..8690c40 100644 --- a/PROJECT/app/app_vlad.c +++ b/PROJECT/app/app_vlad.c @@ -768,10 +768,12 @@ void AppVladEventProcess(CPU_INT32U event) // Look for new cards if (picc_is_new_card_present() ) { - // меню старта чтения карты - PrintStartReadCardMenu(); - RefreshMenu(); - PlayMusicFile(40); + if(app_state.user_menu == USER_MENU_IDLE) { + // меню старта чтения карты + PrintStartReadCardMenu(); + RefreshMenu(); + PlayMusicFile(40); + } // Select one of the cards if (picc_read_card_serial()) { @@ -788,6 +790,12 @@ void AppVladEventProcess(CPU_INT32U event) if(app_state.user_menu == USER_MENU_IDLE) { + // проверим - не надо ли бонусы очистить + if(need_clear_bonus()) { + // нужно - запишем это + write_mifare_card(); + } + // нужно показать баланс app_state.last_card_manipulation_time = OSTimeGet(); @@ -805,9 +813,17 @@ void AppVladEventProcess(CPU_INT32U event) // пополняем карту mifaredata_t* data = get_mifare_data(); - //data->money = - //data->bonus = - //data->best_before = + uint32_t pay = 0, bonus = 0, best_before = 0; + + GetData(&AbonementMoneyDesc, &pay, app_state.current_abonement, DATA_FLAG_DIRECT_INDEX); + GetData(&AbonementBonusDesc, &bonus, app_state.current_abonement, DATA_FLAG_DIRECT_INDEX); + GetData(&AbonementBestBeforeDesc, &best_before, app_state.current_abonement, DATA_FLAG_DIRECT_INDEX); + + uint32_t SystemTime = GetTimeSec() + best_before * 24L * 60L; + + data->money += pay; + data->bonus += bonus; + data->best_before = SystemTime; if(!write_mifare_card()) { @@ -2236,6 +2252,18 @@ void PrintMenuAllPrice(CPU_INT08U blink) uint32_t pay_plat = 0, bonus_plat = 0; uint32_t pay_diamond = 0, bonus_diamond = 0; + GetData(&AbonementMoneyDesc, &pay_silver, 0, DATA_FLAG_DIRECT_INDEX); + GetData(&AbonementBonusDesc, &bonus_silver, 0, DATA_FLAG_DIRECT_INDEX); + + GetData(&AbonementMoneyDesc, &pay_gold, 1, DATA_FLAG_DIRECT_INDEX); + GetData(&AbonementBonusDesc, &bonus_gold, 1, DATA_FLAG_DIRECT_INDEX); + + GetData(&AbonementMoneyDesc, &pay_plat, 2, DATA_FLAG_DIRECT_INDEX); + GetData(&AbonementBonusDesc, &bonus_plat, 2, DATA_FLAG_DIRECT_INDEX); + + GetData(&AbonementMoneyDesc, &pay_diamond, 3, DATA_FLAG_DIRECT_INDEX); + GetData(&AbonementBonusDesc, &bonus_diamond, 3, DATA_FLAG_DIRECT_INDEX); + if(app_state.current_abonement == SILVER_ABONEMENT) { if(blink) { @@ -2331,15 +2359,21 @@ void PrintSilverMenu(void) char str1[16]; uint32_t pay_silver = 0, bonus_silver = 0, best_before = 0; + GetData(&AbonementMoneyDesc, &pay_silver, 0, DATA_FLAG_DIRECT_INDEX); + GetData(&AbonementBonusDesc, &bonus_silver, 0, DATA_FLAG_DIRECT_INDEX); + GetData(&AbonementBestBeforeDesc, &best_before, 0, DATA_FLAG_DIRECT_INDEX); + + uint32_t SystemTime = GetTimeSec() + best_before * 24L * 60L; + PrintUserMenuStr("Серебрянный абонемент", 0); sprintf(str, "Стоимость - %d руб", pay_silver); PrintUserMenuStr(str, 1); - + sprintf(str, "Доп.бонусы- %d руб", bonus_silver); PrintUserMenuStr(str, 2); - PrintTimeString(str1, best_before); + PrintTimeString(str1, SystemTime); sprintf(str, "Бонусы до %s", str1); PrintUserMenuStr(str, 3); } @@ -2350,15 +2384,21 @@ void PrintGoldMenu(void) char str1[16]; uint32_t pay_gold = 0, bonus_gold = 0, best_before = 0; + GetData(&AbonementMoneyDesc, &pay_gold, 1, DATA_FLAG_DIRECT_INDEX); + GetData(&AbonementBonusDesc, &bonus_gold, 1, DATA_FLAG_DIRECT_INDEX); + GetData(&AbonementBestBeforeDesc, &best_before, 1, DATA_FLAG_DIRECT_INDEX); + + uint32_t SystemTime = GetTimeSec() + best_before * 24L * 60L; + PrintUserMenuStr(" Золотой абонемент ", 0); sprintf(str, "Стоимость - %d руб", pay_gold); PrintUserMenuStr(str, 1); - + sprintf(str, "Доп.бонусы- %d руб", bonus_gold); PrintUserMenuStr(str, 2); - PrintTimeString(str1, best_before); + PrintTimeString(str1, SystemTime); sprintf(str, "Бонусы до %s", str1); PrintUserMenuStr(str, 3); } @@ -2369,15 +2409,21 @@ void PrintPlatMenu(void) char str1[16]; uint32_t pay_plat = 0, bonus_plat = 0, best_before = 0; + GetData(&AbonementMoneyDesc, &pay_plat, 2, DATA_FLAG_DIRECT_INDEX); + GetData(&AbonementBonusDesc, &bonus_plat, 2, DATA_FLAG_DIRECT_INDEX); + GetData(&AbonementBestBeforeDesc, &best_before, 2, DATA_FLAG_DIRECT_INDEX); + + uint32_t SystemTime = GetTimeSec() + best_before * 24L * 60L; + PrintUserMenuStr("Платиновый абонемент", 0); sprintf(str, "Стоимость - %d руб", pay_plat); PrintUserMenuStr(str, 1); - + sprintf(str, "Доп.бонусы- %d руб", bonus_plat); PrintUserMenuStr(str, 2); - PrintTimeString(str1, best_before); + PrintTimeString(str1, SystemTime); sprintf(str, "Бонусы до %s", str1); PrintUserMenuStr(str, 3); } @@ -2388,15 +2434,21 @@ void PrintDiamondMenu(void) char str1[16]; uint32_t pay_diamond = 0, bonus_diamond = 0, best_before = 0; + GetData(&AbonementMoneyDesc, &pay_diamond, 3, DATA_FLAG_DIRECT_INDEX); + GetData(&AbonementBonusDesc, &bonus_diamond, 3, DATA_FLAG_DIRECT_INDEX); + GetData(&AbonementBestBeforeDesc, &best_before, 3, DATA_FLAG_DIRECT_INDEX); + + uint32_t SystemTime = GetTimeSec() + best_before * 24L * 60L; + PrintUserMenuStr(" Алмазный абонемент ", 0); sprintf(str, "Стоимость - %d руб", pay_diamond); PrintUserMenuStr(str, 1); - + sprintf(str, "Доп.бонусы- %d руб", bonus_diamond); PrintUserMenuStr(str, 2); - PrintTimeString(str1, best_before); + PrintTimeString(str1, SystemTime); sprintf(str, "Бонусы до %s", str1); PrintUserMenuStr(str, 3); } diff --git a/PROJECT/app/journal.h b/PROJECT/app/journal.h index 7b47ea7..6455ace 100644 --- a/PROJECT/app/journal.h +++ b/PROJECT/app/journal.h @@ -123,6 +123,11 @@ typedef struct{ CPU_INT32U runs; /// количество секунд работы CPU_INT32U worktime; + + // деньги с карт + CPU_INT32U card_money; + // бонуса с карт + CPU_INT32U card_bonus; }SolarCountersRecord; /// структура всех счетчиков для солярия diff --git a/PROJECT/data/datadesc.c b/PROJECT/data/datadesc.c index 4dc8b34..8408354 100644 --- a/PROJECT/data/datadesc.c +++ b/PROJECT/data/datadesc.c @@ -6003,6 +6003,54 @@ TDataDescStruct const CounterSolarMoneyDesc = { }; char const CounterSolarMoneyDescId[] = "CounterSolarMoneyDesc"; +/************************************* + Сумма с карт абонентов денег раздельно по соляриям и режимам +*************************************/ +CPU_INT08U const CounterSolarCardMoneyName[] = "К_Деньги,руб."; + +TDataDescStruct const CounterSolarCardMoneyDesc = { + DATA_DESC_VIEW, // тип дескриптора + DATA_TYPE_RUB_CENT, // тип параметра + DATA_LOC_FRAM, // расположение параметра + DATA_IS_ARRAY, // признак массива + CHANNELS_NUM * SOLAR_MODES_COUNT, // размер массива + &SolariumModesDesc, // указатель на дескриптор индекса массива + (void*)offsetof(TFramMap, solar_counters.solar_chm[0].card_money), // указатель на переменную или адрес FRAM + NULL, // указатель на границы параметра + NULL, // функция по изменению + sizeof(SolarCountersRecord), // смещение между элементами в массиве + CounterSolarCardMoneyName, // указатель на строку названия параметра + DATA_NO_INDEX, // признак индексного параметра (список строк) + NULL, // указатель на список строк для индексного параметра + DATA_INIT_DISABLE, + 0 +}; +char const CounterSolarCardMoneyDescId[] = "CounterSolarCardMoneyDesc"; + +/************************************* + Сумма с карт абонентов бонусов раздельно по соляриям и режимам +*************************************/ +CPU_INT08U const CounterSolarCardBonusName[] = "К_Бонусы,руб."; + +TDataDescStruct const CounterSolarCardBonusDesc = { + DATA_DESC_VIEW, // тип дескриптора + DATA_TYPE_RUB_CENT, // тип параметра + DATA_LOC_FRAM, // расположение параметра + DATA_IS_ARRAY, // признак массива + CHANNELS_NUM * SOLAR_MODES_COUNT, // размер массива + &SolariumModesDesc, // указатель на дескриптор индекса массива + (void*)offsetof(TFramMap, solar_counters.solar_chm[0].card_bonus), // указатель на переменную или адрес FRAM + NULL, // указатель на границы параметра + NULL, // функция по изменению + sizeof(SolarCountersRecord), // смещение между элементами в массиве + CounterSolarCardBonusName, // указатель на строку названия параметра + DATA_NO_INDEX, // признак индексного параметра (список строк) + NULL, // указатель на список строк для индексного параметра + DATA_INIT_DISABLE, + 0 +}; +char const CounterSolarCardBonusDescId[] = "CounterSolarCardBonusDesc"; + /************************************* Количество запусков раздельно по соляриям и режимам *************************************/ @@ -6123,6 +6171,54 @@ TDataDescStruct const CounterModeMoneyDesc = { }; char const CounterModeMoneyDescId[] = "CounterModeMoneyDesc"; +/************************************* + Сумма денег по режимам по абонементам +*************************************/ +CPU_INT08U const CounterModeCardMoneyName[] = "К_Деньги,руб."; + +TDataDescStruct const CounterModeCardMoneyDesc = { + DATA_DESC_VIEW, // тип дескриптора + DATA_TYPE_RUB_CENT, // тип параметра + DATA_LOC_FRAM, // расположение параметра + DATA_IS_ARRAY, // признак массива + SOLAR_MODES_COUNT, // размер массива + &SolariumModeIndexDesc, // указатель на дескриптор индекса массива + (void*)offsetof(TFramMap, solar_counters.solar_m[0].card_money), // указатель на переменную или адрес FRAM + NULL, // указатель на границы параметра + NULL, // функция по изменению + sizeof(SolarCountersRecord), // смещение между элементами в массиве + CounterModeCardMoneyName, // указатель на строку названия параметра + DATA_NO_INDEX, // признак индексного параметра (список строк) + NULL, // указатель на список строк для индексного параметра + DATA_INIT_DISABLE, + 0 +}; +char const CounterModeCardMoneyDescId[] = "CounterModeCardMoneyDesc"; + +/************************************* + Сумма бонусов по режимам по абонементам +*************************************/ +CPU_INT08U const CounterModeCardBonusName[] = "К_Бонусы,руб."; + +TDataDescStruct const CounterModeCardBonusDesc = { + DATA_DESC_VIEW, // тип дескриптора + DATA_TYPE_RUB_CENT, // тип параметра + DATA_LOC_FRAM, // расположение параметра + DATA_IS_ARRAY, // признак массива + SOLAR_MODES_COUNT, // размер массива + &SolariumModeIndexDesc, // указатель на дескриптор индекса массива + (void*)offsetof(TFramMap, solar_counters.solar_m[0].card_bonus), // указатель на переменную или адрес FRAM + NULL, // указатель на границы параметра + NULL, // функция по изменению + sizeof(SolarCountersRecord), // смещение между элементами в массиве + CounterModeCardBonusName, // указатель на строку названия параметра + DATA_NO_INDEX, // признак индексного параметра (список строк) + NULL, // указатель на список строк для индексного параметра + DATA_INIT_DISABLE, + 0 +}; +char const CounterModeCardBonusDescId[] = "CounterModeCardBonusDesc"; + /************************************* Количество запусков по режимам *************************************/ @@ -7037,6 +7133,9 @@ char const CounterLongCardDescArrId[] = "CounterLongCardDesc"; char const PostTimerDescArrId[] = "PostTimerDesc"; char const PostSignalDescArrId[] = "PostSignalDesc"; char const PostPauseLenCostDescId[] = "PostPauseLenCostDesc"; +char const AbonementMoneyDescId[] = "AbonementMoneyDesc"; +char const AbonementBonusDescId[] = "AbonementBonusDesc"; +char const AbonementBestBeforeDescId[] = "AbonementBestBeforeDesc"; #if defined(BOARD_SOLARIUM_WEB) char const SolariumTypeDescId[] = "SolariumTypeDescId"; @@ -7271,6 +7370,10 @@ const TDataDescArrayStruct AllDataArray[] = {&CoinPauseLenDesc, CoinPauseLenDescId}, {&CoinPulseDeltaDesc, CoinPulseDeltaDescId}, + {&AbonementMoneyDesc, AbonementMoneyDescId}, + {&AbonementBonusDesc, AbonementBonusDescId}, + {&AbonementBestBeforeDesc, AbonementBestBeforeDescId}, + {NULL, NULL} }; diff --git a/PROJECT/data/datadesc.h b/PROJECT/data/datadesc.h index 68d3e63..1e0a613 100644 --- a/PROJECT/data/datadesc.h +++ b/PROJECT/data/datadesc.h @@ -308,10 +308,14 @@ extern TDataDescStruct const SolariumTimePayedCrc16Desc; extern TDataDescStruct const SolarTimeoutAfterMinutesDesc; extern TDataDescStruct const SolarControlChannelDesc; extern TDataDescStruct const CounterSolarMoneyDesc; +extern TDataDescStruct const CounterSolarCardMoneyDesc; +extern TDataDescStruct const CounterSolarCardBonusDesc; extern TDataDescStruct const CounterSolarRunsDesc; extern TDataDescStruct const CounterSolarWorkTimeDesc; extern TDataDescStruct const SolariumModeIndexDesc; extern TDataDescStruct const CounterModeMoneyDesc; +extern TDataDescStruct const CounterModeCardMoneyDesc; +extern TDataDescStruct const CounterModeCardBonusDesc; extern TDataDescStruct const CounterModeRunsDesc; extern TDataDescStruct const CounterModeWorkTimeDesc; extern TDataDescStruct const CounterCollatenTimeDesc; diff --git a/PROJECT/drivers/mfrc522/mfrc522data.c b/PROJECT/drivers/mfrc522/mfrc522data.c index 294ac64..be544a2 100644 --- a/PROJECT/drivers/mfrc522/mfrc522data.c +++ b/PROJECT/drivers/mfrc522/mfrc522data.c @@ -96,3 +96,16 @@ bool is_empty_mifare_card() { return mifare_card_data.init != 0xDEADBEEF; } + +bool need_clear_bonus() +{ + uint32_t SystemTime = GetTimeSec(); + + if(SystemTime > mifare_card_data.best_before) + { + mifare_card_data.bonus = 0; + return true; + } + + return false; +} diff --git a/PROJECT/drivers/mfrc522/mfrc522data.h b/PROJECT/drivers/mfrc522/mfrc522data.h index 1290259..892cdfa 100644 --- a/PROJECT/drivers/mfrc522/mfrc522data.h +++ b/PROJECT/drivers/mfrc522/mfrc522data.h @@ -25,5 +25,6 @@ extern mifaredata_t* read_mifare_card(); extern bool write_mifare_card(); extern mifaredata_t* init_mifare_card_data(); extern bool is_empty_mifare_card(); +extern bool need_clear_bonus(); #endif \ No newline at end of file diff --git a/PROJECT/menu/menudesc.c b/PROJECT/menu/menudesc.c index 55e23d0..81829f2 100644 --- a/PROJECT/menu/menudesc.c +++ b/PROJECT/menu/menudesc.c @@ -3158,6 +3158,20 @@ const TMenuLine line_SolarModesCountersMenu_1 = { NULL // панель для перехода }; +const TMenuLine line_SolarModesCountersMenu_6 = { + MENU_LINE_SHOW_DESC, // тип пункта меню + 0, // доп. флаги + (void*)&CounterModeCardMoneyDesc, // указатель на текстовую строку или дескриптор + NULL // панель для перехода +}; + +const TMenuLine line_SolarModesCountersMenu_7 = { + MENU_LINE_SHOW_DESC, // тип пункта меню + 0, // доп. флаги + (void*)&CounterModeCardBonusDesc, // указатель на текстовую строку или дескриптор + NULL // панель для перехода +}; + const TMenuLine line_SolarModesCountersMenu_2 = { MENU_LINE_SHOW_DESC, // тип пункта меню 0, // доп. флаги @@ -3191,8 +3205,8 @@ void OnEnterSolarModesCountersMenu(void) solar_modes_index = 0; } -const TMenuLineArray arr_SolarModesCountersArray[] = {&line_SolarModesCountersMenu_0, &line_SolarModesCountersMenu_1, &line_SolarModesCountersMenu_2, &line_SolarModesCountersMenu_3, &line_SolarModesCountersMenu_4, &line_SolarModesCountersMenu_5, NULL}; -const TMenuPanel SolarModesCountersPanel[] = {arr_SolarModesCountersArray, OnEnterSolarModesCountersMenu, 6, MENU_PANEL_STANDARD}; +const TMenuLineArray arr_SolarModesCountersArray[] = {&line_SolarModesCountersMenu_0, &line_SolarModesCountersMenu_6, &line_SolarModesCountersMenu_7, &line_SolarModesCountersMenu_1, &line_SolarModesCountersMenu_2, &line_SolarModesCountersMenu_3, &line_SolarModesCountersMenu_4, &line_SolarModesCountersMenu_5, NULL}; +const TMenuPanel SolarModesCountersPanel[] = {arr_SolarModesCountersArray, OnEnterSolarModesCountersMenu, 8, MENU_PANEL_STANDARD}; /*********************************** МЕНЮ СЧЕТЧИКОВ ПО СОЛЯРИЯМ И РЕЖИМАМ @@ -3211,6 +3225,20 @@ const TMenuLine line_SolarChannelsCountersMenu_1 = { NULL // панель для перехода }; +const TMenuLine line_SolarChannelsCountersMenu_6 = { + MENU_LINE_SHOW_DESC, // тип пункта меню + 0, // доп. флаги + (void*)&CounterSolarCardMoneyDesc, // указатель на текстовую строку или дескриптор + NULL // панель для перехода +}; + +const TMenuLine line_SolarChannelsCountersMenu_7 = { + MENU_LINE_SHOW_DESC, // тип пункта меню + 0, // доп. флаги + (void*)&CounterSolarCardBonusDesc, // указатель на текстовую строку или дескриптор + NULL // панель для перехода +}; + const TMenuLine line_SolarChannelsCountersMenu_2 = { MENU_LINE_SHOW_DESC, // тип пункта меню 0, // доп. флаги @@ -3245,8 +3273,8 @@ void OnEnterSolarChannelsCountersMenu(void) solar_modes_index = 0; } -const TMenuLineArray arr_SolarChannelsCountersArray[] = {&line_SolarChannelsCountersMenu_0, &line_SolarChannelsCountersMenu_1, &line_SolarChannelsCountersMenu_2, &line_SolarChannelsCountersMenu_3, &line_SolarChannelsCountersMenu_4, &line_SolarChannelsCountersMenu_5, NULL}; -const TMenuPanel SolarChannelsCountersPanel[] = {arr_SolarChannelsCountersArray, OnEnterSolarChannelsCountersMenu, 6, MENU_PANEL_STANDARD}; +const TMenuLineArray arr_SolarChannelsCountersArray[] = {&line_SolarChannelsCountersMenu_0, &line_SolarChannelsCountersMenu_6, &line_SolarChannelsCountersMenu_7, &line_SolarChannelsCountersMenu_1, &line_SolarChannelsCountersMenu_2, &line_SolarChannelsCountersMenu_3, &line_SolarChannelsCountersMenu_4, &line_SolarChannelsCountersMenu_5, NULL}; +const TMenuPanel SolarChannelsCountersPanel[] = {arr_SolarChannelsCountersArray, OnEnterSolarChannelsCountersMenu, 8, MENU_PANEL_STANDARD}; /*********************************** МЕНЮ СЧЕТЧИКОВ ПО ВРЕМЕНИ НАРАБОТКИ ЛАМП diff --git a/settings/sk-mlpc2368.wsdt b/settings/sk-mlpc2368.wsdt index 88c8506..112fab8 100644 --- a/settings/sk-mlpc2368.wsdt +++ b/settings/sk-mlpc2368.wsdt @@ -60,7 +60,7 @@ - 220 + 203 30 30 @@ -121,7 +121,7 @@ 4294967295 000000000702000056050000C5020000 - 000000002803000080070000E6030000 + 000000007602000080070000E6030000 4096 0 0 @@ -134,7 +134,7 @@ 34052 000000001700000022010000C8000000 - 04000000400300007C070000CC030000 + 040000008E0200007C070000CC030000 32768 0 0 @@ -165,7 +165,7 @@ 34048 9A0000004E020000F00500003C030000 - 04000000400300007C070000CC030000 + 040000008E0200007C070000CC030000 32768 0 0 @@ -178,7 +178,7 @@ 34056 9A0000004E020000F00500003C030000 - 040000004003000052050000CC030000 + 040000008E020000520500001A030000 32768 0 0 @@ -200,7 +200,7 @@ 34057 9A0000004E020000F00500003C030000 - 040000004003000052050000CC030000 + 040000008E020000520500001A030000 32768 0 0 @@ -222,7 +222,7 @@ 34058 000000001700000022010000C8000000 - 04000000400300007C070000CC030000 + 040000008E0200007C070000CC030000 32768 0 0 @@ -249,7 +249,7 @@ 34059 9A0000004E020000F00500003C030000 - 04000000400300007C070000CC030000 + 040000008E0200007C070000CC030000 32768 0 0 @@ -271,7 +271,7 @@ 34060 9A0000004E020000F00500003C030000 - 040000004003000052050000CC030000 + 040000008E020000520500001A030000 32768 0 0 @@ -290,7 +290,7 @@ 34062 9A0000004E020000F00500003C030000 - 040000004003000052050000CC030000 + 040000008E020000520500001A030000 32768 0 0 @@ -471,7 +471,7 @@ 34065 00000000170000000601000078010000 - 00000000320000000601000024030000 + 00000000320000000601000072020000 4096 0 0 @@ -482,7 +482,7 @@ 1 - 000000000A000000000000000010000001000000FFFFFFFFFFFFFFFF06010000320000000A01000024030000010000000200001004000000010000000000000000000000118500000000000000000000000000000000000001000000118500000100000011850000000000000080000000000000FFFFFFFFFFFFFFFF000000007D00000056050000810000000000000001000000040000000100000000000000000000000D85000000000000000000000000000000000000010000000D850000010000000D850000000000000080000000000000FFFFFFFFFFFFFFFF00000000C200000056050000C6000000000000000100000004000000010000000000000000000000078500000000000000000000000000000000000001000000078500000100000007850000000000000080000000000000FFFFFFFFFFFFFFFF00000000720000005605000076000000000000000100000004000000010000000000000000000000058500000000000000000000000000000000000001000000058500000100000005850000000000000080000001000000FFFFFFFFFFFFFFFF000000002403000080070000280300000100000001000010040000000100000010FEFFFF41000000FFFFFFFF08000000048500000A8500000085000008850000098500000B8500000C8500000E850000FFFF02000B004354616262656450616E650080000001000000000000000702000056050000C5020000000000002803000080070000E6030000000000004080005608000000FFFEFF054200750069006C006400010000000485000001000000FFFFFFFFFFFFFFFFFFFEFF0D460069006E006400200049006E002000460069006C0065007300010000000A85000001000000FFFFFFFFFFFFFFFFFFFEFF094400650062007500670020004C006F006700010000000085000001000000FFFFFFFFFFFFFFFFFFFEFF0C4400650063006C00610072006100740069006F006E007300000000000885000001000000FFFFFFFFFFFFFFFFFFFEFF0A5200650066006500720065006E00630065007300000000000985000001000000FFFFFFFFFFFFFFFFFFFEFF1541006D0062006900670075006F0075007300200044006500660069006E006900740069006F006E007300010000000B85000001000000FFFFFFFFFFFFFFFFFFFEFF1153006F0075007200630065002000420072006F0077007300650020004C006F006700000000000C85000001000000FFFFFFFFFFFFFFFFFFFEFF0B54006F006F006C0020004F0075007400700075007400000000000E85000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFF0485000001000000FFFFFFFF0485000002000000FFFF02001200434D756C746950616E654672616D65576E6400010084000000001700000022010000C80000000000000000000000020000000000000006850000000000000000000000000000000000000100000006850000038000010084000000001700000022010000C800000000000000000000000200000000000000038500000000000000000000000000000000000001000000038500000000000000000000 + 000000000A000000000000000010000001000000FFFFFFFFFFFFFFFF06010000320000000A01000072020000010000000200001004000000010000000000000000000000118500000000000000000000000000000000000001000000118500000100000011850000000000000080000000000000FFFFFFFFFFFFFFFF000000007D00000056050000810000000000000001000000040000000100000000000000000000000D85000000000000000000000000000000000000010000000D850000010000000D850000000000000080000000000000FFFFFFFFFFFFFFFF00000000C200000056050000C6000000000000000100000004000000010000000000000000000000078500000000000000000000000000000000000001000000078500000100000007850000000000000080000000000000FFFFFFFFFFFFFFFF00000000720000005605000076000000000000000100000004000000010000000000000000000000058500000000000000000000000000000000000001000000058500000100000005850000000000000080000001000000FFFFFFFFFFFFFFFF000000007202000080070000760200000100000001000010040000000100000013FDFFFF7C000000FFFFFFFF08000000048500000A8500000085000008850000098500000B8500000C8500000E850000FFFF02000B004354616262656450616E650080000001000000000000000702000056050000C5020000000000007602000080070000E6030000000000004080005608000000FFFEFF054200750069006C006400010000000485000001000000FFFFFFFFFFFFFFFFFFFEFF0D460069006E006400200049006E002000460069006C0065007300010000000A85000001000000FFFFFFFFFFFFFFFFFFFEFF094400650062007500670020004C006F006700010000000085000001000000FFFFFFFFFFFFFFFFFFFEFF0C4400650063006C00610072006100740069006F006E007300000000000885000001000000FFFFFFFFFFFFFFFFFFFEFF0A5200650066006500720065006E00630065007300000000000985000001000000FFFFFFFFFFFFFFFFFFFEFF1541006D0062006900670075006F0075007300200044006500660069006E006900740069006F006E007300010000000B85000001000000FFFFFFFFFFFFFFFFFFFEFF1153006F0075007200630065002000420072006F0077007300650020004C006F006700000000000C85000001000000FFFFFFFFFFFFFFFFFFFEFF0B54006F006F006C0020004F0075007400700075007400000000000E85000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFF0485000001000000FFFFFFFF0485000002000000FFFF02001200434D756C746950616E654672616D65576E6400010084000000001700000022010000C80000000000000000000000020000000000000006850000000000000000000000000000000000000100000006850000038000010084000000001700000022010000C800000000000000000000000200000000000000038500000000000000000000000000000000000001000000038500000000000000000000 CMSIS-Pack @@ -541,7 +541,7 @@ - 0100000003000000010000000000000000000000010000000100000002000000000000000100000001000000000000002800000028000000010000000B0000000700000001000000FFFEFF232400570053005F0044004900520024005C00500052004F004A004500430054005C0064007200690076006500720073005C006600720061006D005C007300700069002E00630001000000FFFF010014004966436F6E74656E7453746F72616765496D706CFFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0036003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003400350034003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003400350034003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF057300700069002E00630000000000FFFFFFFFFFFFFFFFFFFEFF232400570053005F0044004900520024005C00500052004F004A004500430054005C0064007200690076006500720073005C006600720061006D005C007300700069002E006800010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003400390039003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003400390039003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF057300700069002E00680000000000FFFFFFFFFFFFFFFFFFFEFF2B2400570053005F0044004900520024005C00500052004F004A004500430054005C0064007200690076006500720073005C006D006600720063003500320032005C0072006600690064002D007300700069002E006300010000000180FFFEFF00FFFEFFFF21013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00320031003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A72006600690064002D007300700069002E00630000000000FFFFFFFFFFFFFFFFFFFEFF2B2400570053005F0044004900520024005C00500052004F004A004500430054005C0064007200690076006500720073005C006D006600720063003500320032005C0072006600690064002D007300700069002E006800010000000180FFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100360038003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00310030003700350037003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00310030003700370031003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A72006600690064002D007300700069002E00680000000000FFFFFFFFFFFFFFFFFFFEFF152400570053005F0044004900520024005C004F0053005C006100700070005C006100700070002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00330035003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0031003200310036003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0031003200310036003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF056100700070002E00630000000000FFFFFFFFFFFFFFFFFFFEFF2E2400570053005F0044004900520024005C00500052004F004A004500430054005C0064007200690076006500720073005C006D006600720063003500320032005C006D0066007200630035003200320064006100740061002E006300010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003100320034003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003100330039003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0D6D0066007200630035003200320064006100740061002E00630000000000FFFFFFFFFFFFFFFFFFFEFF2E2400570053005F0044004900520024005C00500052004F004A004500430054005C0064007200690076006500720073005C006D006600720063003500320032005C006D0066007200630035003200320064006100740061002E006800010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003400300033003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003400310034003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0D6D0066007200630035003200320064006100740061002E00680000000000FFFFFFFFFFFFFFFFFFFEFF202400570053005F0044004900520024005C00500052004F004A004500430054005C006D0065006E0075005C006D0065006E00750064006500730063002E006300010000000180FFFEFF00FFFEFFFF2D013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0032003800380033003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003100320030003800300033003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003100320030003800300033003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A6D0065006E00750064006500730063002E00630000000000FFFFFFFFFFFFFFFFFFFEFF202400570053005F0044004900520024005C00500052004F004A004500430054005C0064006100740061005C00640061007400610064006500730063002E006300010000000180FFFEFF00FFFEFFFF23013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0033003300350034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A640061007400610064006500730063002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1F2400570053005F0044004900520024005C00500052004F004A004500430054005C006100700070005C006100700070005F0073006500720076002E006800010000000180FFFEFF00FFFEFFFF21013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00350034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A6100700070005F0073006500720076002E00680000000000FFFFFFFFFFFFFFFFFFFEFF1F2400570053005F0044004900520024005C00500052004F004A004500430054005C006100700070005C006100700070005F0076006C00610064002E006300010000000180FFFEFF00FFFEFFFF23013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0031003400310034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A6100700070005F0076006C00610064002E00630000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000001000000020000000A01000049000000800700003B030000 + 0100000003000000010000000000000000000000010000000100000002000000000000000100000001000000000000002800000028000000010000000B0000000700000001000000FFFEFF232400570053005F0044004900520024005C00500052004F004A004500430054005C0064007200690076006500720073005C006600720061006D005C007300700069002E00630001000000FFFF010014004966436F6E74656E7453746F72616765496D706CFFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0036003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003400350034003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003400350034003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF057300700069002E00630000000000FFFFFFFFFFFFFFFFFFFEFF232400570053005F0044004900520024005C00500052004F004A004500430054005C0064007200690076006500720073005C006600720061006D005C007300700069002E006800010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003400390039003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003400390039003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF057300700069002E00680000000000FFFFFFFFFFFFFFFFFFFEFF2B2400570053005F0044004900520024005C00500052004F004A004500430054005C0064007200690076006500720073005C006D006600720063003500320032005C0072006600690064002D007300700069002E006300010000000180FFFEFF00FFFEFFFF21013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00320031003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A72006600690064002D007300700069002E00630000000000FFFFFFFFFFFFFFFFFFFEFF2B2400570053005F0044004900520024005C00500052004F004A004500430054005C0064007200690076006500720073005C006D006600720063003500320032005C0072006600690064002D007300700069002E006800010000000180FFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100360038003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00310030003700350037003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00310030003700370031003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A72006600690064002D007300700069002E00680000000000FFFFFFFFFFFFFFFFFFFEFF152400570053005F0044004900520024005C004F0053005C006100700070005C006100700070002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00330035003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0031003200310036003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0031003200310036003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF056100700070002E00630000000000FFFFFFFFFFFFFFFFFFFEFF2E2400570053005F0044004900520024005C00500052004F004A004500430054005C0064007200690076006500720073005C006D006600720063003500320032005C006D0066007200630035003200320064006100740061002E006300010000000180FFFEFF00FFFEFFFF20013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0D6D0066007200630035003200320064006100740061002E00630000000000FFFFFFFFFFFFFFFFFFFEFF2E2400570053005F0044004900520024005C00500052004F004A004500430054005C0064007200690076006500720073005C006D006600720063003500320032005C006D0066007200630035003200320064006100740061002E006800010000000180FFFEFF00FFFEFFFF20013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0D6D0066007200630035003200320064006100740061002E00680000000000FFFFFFFFFFFFFFFFFFFEFF202400570053005F0044004900520024005C00500052004F004A004500430054005C006D0065006E0075005C006D0065006E00750064006500730063002E006300010000000180FFFEFF00FFFEFFFF2D013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0033003200300032003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003100330034003300380032003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003100330034003300380032003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A6D0065006E00750064006500730063002E00630000000000FFFFFFFFFFFFFFFFFFFEFF202400570053005F0044004900520024005C00500052004F004A004500430054005C0064006100740061005C00640061007400610064006500730063002E006300010000000180FFFEFF00FFFEFFFF23013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0037003200340032003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A640061007400610064006500730063002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1F2400570053005F0044004900520024005C00500052004F004A004500430054005C006100700070005C006100700070005F0073006500720076002E006800010000000180FFFEFF00FFFEFFFF21013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00350034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A6100700070005F0073006500720076002E00680000000000FFFFFFFFFFFFFFFFFFFEFF1F2400570053005F0044004900520024005C00500052004F004A004500430054005C006100700070005C006100700070005F0076006C00610064002E006300010000000180FFFEFF00FFFEFFFF23013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0031003400340038003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A6100700070005F0076006C00610064002E00630000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000001000000020000000A010000490000008007000089020000 diff --git a/sk-mlpc2368.dep b/sk-mlpc2368.dep index 128c87a..e39b755 100644 --- a/sk-mlpc2368.dep +++ b/sk-mlpc2368.dep @@ -1654,12 +1654,6 @@ $PROJ_DIR$\PROJECT\menu\menudesc.c - - - ICCARM - 52 - - ICCARM