diff --git a/PROJECT/app/app_serv.c b/PROJECT/app/app_serv.c
index fa40ec9..c8a9fa7 100644
--- a/PROJECT/app/app_serv.c
+++ b/PROJECT/app/app_serv.c
@@ -447,7 +447,8 @@ void UserAppTask(void *p_arg)
if (accmoney > 0)
{
- wash_State[number_post] = washing;
+ wash_State[number_post] = washing;
+ SaveEventRecord(0, JOURNAL_EVENT_WASHING, number_post);
}
}
break;
diff --git a/PROJECT/app/journal.c b/PROJECT/app/journal.c
index 77e870c..dbdc144 100644
--- a/PROJECT/app/journal.c
+++ b/PROJECT/app/journal.c
@@ -255,18 +255,12 @@ void GetEventStr(char* str, char event)
case JOURNAL_EVENT_CHANGE_MODE:
sprintf(str, "Смена режима");
break;
- case JOURNAL_EVENT_INCASSATION:
- sprintf(str, "Инкассация");
+ case JOURNAL_EVENT_WASHING:
+ sprintf(str, "Мойка");
break;
case JOURNAL_EVENT_PASS_FAIL:
sprintf(str, "Неверный пароль");
break;
- case JOURNAL_EVENT_EMAIL_FAIL:
- sprintf(str, "Ошибка отпр.e-mail");
- break;
- case JOURNAL_EVENT_EMAIL_OK:
- sprintf(str, "E-mail отпр.успешно");
- break;
default:
sprintf(str, "нет");
break;
@@ -367,18 +361,12 @@ void GetEventStrEng(char* str, char event)
case JOURNAL_EVENT_CHANGE_MODE:
sprintf(str, " | Smena rejima ");
break;
- case JOURNAL_EVENT_INCASSATION:
- sprintf(str, " | Incassaciya ");
+ case JOURNAL_EVENT_WASHING:
+ sprintf(str, " | Moyka ");
break;
case JOURNAL_EVENT_PASS_FAIL:
sprintf(str, " | Neverniy parol' ");
- break;
- case JOURNAL_EVENT_EMAIL_FAIL:
- sprintf(str, " | Oshibka otpravki e-mail ");
- break;
- case JOURNAL_EVENT_EMAIL_OK:
- sprintf(str, " | E-mail otpravleno uspeshno ");
- break;
+ break;
default:
sprintf(str, " | Net sobytiya ");
break;
@@ -446,18 +434,15 @@ void PrintEventJournalRecordEng(char* str, TEventRecord *record)
if (record->data == MODE_WORK) sprintf(&str[strlen(str)], "rabota");
else sprintf(&str[strlen(str)], "nastroika");
}
- else if (record->event == JOURNAL_EVENT_INCASSATION)
+ else if (record->event == JOURNAL_EVENT_WASHING)
{
- sprintf(&str[strlen(str)], "%u rub.", record->data);
+ sprintf(&str[strlen(str)], "%u post.", record->data + 1);
}
else if (record->event == JOURNAL_EVENT_PASS_FAIL)
{
sprintf(&str[strlen(str)], "%u", record->data);
}
- else if ((record->event == JOURNAL_EVENT_EMAIL_OK) || (record->event == JOURNAL_EVENT_EMAIL_FAIL))
- {
- sprintf(&str[strlen(str)], "");
- }
+
sprintf(&str[strlen(str)], "\r\n");
}
else
diff --git a/PROJECT/app/journal.h b/PROJECT/app/journal.h
index 6562c18..a129e0f 100644
--- a/PROJECT/app/journal.h
+++ b/PROJECT/app/journal.h
@@ -62,10 +62,10 @@ typedef struct{
#define JOURNAL_EVENT_PRINT_X 40 // печать x-отчета
#define JOURNAL_EVENT_PRINT_BUF 41 // печать x-отчета
#define JOURNAL_EVENT_CHANGE_MODE 42 // смена режима
- #define JOURNAL_EVENT_INCASSATION 43 // инкассация
+ #define JOURNAL_EVENT_WASHING 43 // запуск мойки
#define JOURNAL_EVENT_PASS_FAIL 44 // неверный ввод пароля
- #define JOURNAL_EVENT_EMAIL_OK 45 // правильно отправлен email
- #define JOURNAL_EVENT_EMAIL_FAIL 46 // ошибка при отправке email
+ #define JOURNAL_EVENT_EMPTY1 45 //
+ #define JOURNAL_EVENT_EMPTY2 46 //
// ошибка связи с фискальником
#define ERROR_FR_CONN 47
diff --git a/PROJECT/data/datadesc.c b/PROJECT/data/datadesc.c
index 1e9f9ca..634fc3a 100644
--- a/PROJECT/data/datadesc.c
+++ b/PROJECT/data/datadesc.c
@@ -884,6 +884,31 @@ void OnChangeLevel()
SetLevelParam(level1, level2, level3, level4, post);
}
+
+ #if OS_CRITICAL_METHOD == 3
+ OS_CPU_SR cpu_sr = 0;
+ #endif
+ OS_ENTER_CRITICAL();
+ InitInputPorts();
+ OS_EXIT_CRITICAL();
+}
+
+void OnChangeLevelWithoutInit()
+{
+ CPU_INT32U level1, level2, level3, level4;
+ for(int post = 0; post < COUNT_POST + COUNT_VACUUM; post++)
+ {
+ if(post < COUNT_POST)
+ {
+ GetData(&CashLevelDesc, &level1, post, DATA_FLAG_DIRECT_INDEX);
+ GetData(&BankLevelDesc, &level2, post, DATA_FLAG_DIRECT_INDEX);
+ GetData(&SignalStopMoneyLevelDesc, &level3, post, DATA_FLAG_DIRECT_INDEX);
+ }
+
+ GetData(&CoinLevelDesc, &level4, post, DATA_FLAG_DIRECT_INDEX);
+
+ SetLevelParam(level1, level2, level3, level4, post);
+ }
}
/*************************************
diff --git a/PROJECT/data/datadesc.h b/PROJECT/data/datadesc.h
index e2a5a9c..5aa77ce 100644
--- a/PROJECT/data/datadesc.h
+++ b/PROJECT/data/datadesc.h
@@ -153,6 +153,7 @@ extern TDataDescStruct const CashPauseLenDesc;
extern void OnChangeCashPulseLen();
extern void OnChangeSinalPulseLen();
extern void OnChangeLevel();
+extern void OnChangeLevelWithoutInit();
extern TDataDescStruct const CoinPulseLenDesc;
extern TDataDescStruct const CoinPauseLenDesc;
@@ -187,4 +188,6 @@ extern TDataDescStruct const BankLevelDesc;
extern TDataDescStruct const CoinTimeOutDesc;
+extern void OnChangeBankPulseLen();
+
#endif //#ifndef _DATADESC_H_
diff --git a/PROJECT/menu/menudesc.c b/PROJECT/menu/menudesc.c
index 1eb0cfa..510f9e2 100644
--- a/PROJECT/menu/menudesc.c
+++ b/PROJECT/menu/menudesc.c
@@ -1425,18 +1425,14 @@ void PrintEventJournalRecord(TEventRecord *record)
if (record->data == MODE_WORK) sprintf(str_EventData, "работа");
else sprintf(str_EventData, "настройка");
}
- else if (record->event == JOURNAL_EVENT_INCASSATION)
+ else if (record->event == JOURNAL_EVENT_WASHING)
{
- sprintf(str_EventData, "%u руб.", record->data);
+ sprintf(str_EventData, "Пост %d", record->data + 1);
}
else if (record->event == JOURNAL_EVENT_PASS_FAIL)
{
sprintf(str_EventData, "%u", record->data);
}
- else if ((record->event == JOURNAL_EVENT_EMAIL_OK) || (record->event == JOURNAL_EVENT_EMAIL_FAIL))
- {
- sprintf(str_EventData, "");
- }
else
{
GetDataItem(&JournalErrorNumberDesc0, (CPU_INT08U*)str_EventNumber, record->event);
diff --git a/PROJECT/services/coin.c b/PROJECT/services/coin.c
index ac9ea03..858d6ee 100644
--- a/PROJECT/services/coin.c
+++ b/PROJECT/services/coin.c
@@ -390,13 +390,18 @@ void InitCoin(void)
CashImpCounter[i] = 0;
BankImpCounter[i] = 0;
+ coin_pulse[i] = 50;
+ coin_pause[i] = 20;
+ pend_coin_counter[i] = 0;
+ pend_coin_timestamp[i] = 0;
+
cash_pulse[i] = 50;
- cash_pause[i] = 50;
+ cash_pause[i] = 20;
pend_cash_counter[i] = 0;
pend_cash_timestamp[i] = 0;
bank_pulse[i] = 50;
- bank_pause[i] = 50;
+ bank_pause[i] = 20;
pend_bank_counter[i] = 0;
pend_bank_timestamp[i] = 0;
@@ -1073,6 +1078,192 @@ void InputCapture_ISR(void)
extern CPU_INT32U BSP_CPU_PclkFreq (CPU_INT08U pclk);
+void InitInputPorts()
+{
+ // купюроприемник 1
+ PINSEL3_bit.P1_20 = 0;
+ if(cashLevel[0])PINMODE3_bit.P1_20 = 3;
+ else PINMODE3_bit.P1_20 = 0;
+ FIO1DIR_bit.P1_20 = 0;
+ FIO1MASK_bit.P1_20 = 0;
+
+ // монетоприемник 1
+ PINSEL3_bit.P1_21 = 0;
+ if(coinLevel[0])PINMODE3_bit.P1_21 = 3;
+ else PINMODE3_bit.P1_21 = 0;
+ FIO1DIR_bit.P1_21 = 0;
+ FIO1MASK_bit.P1_21 = 0;
+
+ // сигнал печати чека пост 1
+ PINSEL9_bit.P4_28 = 0;
+ if(SignalLevel[0])PINMODE9_bit.P4_28 = 3;
+ else PINMODE9_bit.P4_28 = 0;
+ FIO4DIR_bit.P4_28 = 0;
+ FIO4MASK_bit.P4_28 = 0;
+
+ // купюроприемник 2
+ PINSEL3_bit.P1_19 = 0;
+ if(cashLevel[1])PINMODE3_bit.P1_19 = 3;
+ else PINMODE3_bit.P1_19 = 0;
+ FIO1DIR_bit.P1_19 = 0;
+ FIO1MASK_bit.P1_19 = 0;
+
+ // монетоприемник 2
+ PINSEL3_bit.P1_18 = 0;
+ if(coinLevel[1])PINMODE3_bit.P1_18 = 3;
+ else PINMODE3_bit.P1_18 = 0;
+ FIO1DIR_bit.P1_18 = 0;
+ FIO1MASK_bit.P1_18 = 0;
+
+ // сигнал печати чека пост 2
+ PINSEL0_bit.P0_4 = 0;
+ if(SignalLevel[1])PINMODE0_bit.P0_4 = 3;
+ else PINMODE0_bit.P0_4 = 0;
+ FIO0DIR_bit.P0_4 = 0;
+ FIO0MASK_bit.P0_4 = 0;
+
+ // купюроприемник 3
+ PINSEL7_bit.P3_25 = 0;
+ if(cashLevel[2])PINMODE7_bit.P3_25 = 3;
+ else PINMODE7_bit.P3_25 = 0;
+ FIO3DIR_bit.P3_25 = 0;
+ FIO3MASK_bit.P3_25 = 0;
+
+ // монетоприемник 3
+ PINSEL7_bit.P3_26 = 0;
+ if(coinLevel[2])PINMODE7_bit.P3_26 = 3;
+ else PINMODE7_bit.P3_26 = 0;
+ FIO3DIR_bit.P3_26 = 0;
+ FIO3MASK_bit.P3_26 = 0;
+
+ // сигнал печати чека пост 3
+ PINSEL3_bit.P1_28 = 0;
+ if(SignalLevel[2])PINMODE3_bit.P1_28 = 3;
+ else PINMODE3_bit.P1_28 = 0;
+ FIO1DIR_bit.P1_28 = 0;
+ FIO1MASK_bit.P1_28 = 0;
+
+ // купюроприемник 4
+ PINSEL1_bit.P0_26 = 0;
+ if(cashLevel[3])PINMODE1_bit.P0_26 = 3;
+ else PINMODE1_bit.P0_26 = 0;
+ FIO0DIR_bit.P0_26 = 0;
+ FIO0MASK_bit.P0_26 = 0;
+
+ // монетоприемник 4
+ PINSEL1_bit.P0_25 = 0;
+ if(coinLevel[3])PINMODE1_bit.P0_25 = 3;
+ else PINMODE1_bit.P0_25 = 0;
+ FIO0DIR_bit.P0_25 = 0;
+ FIO0MASK_bit.P0_25 = 0;
+
+ // сигнал печати чека пост 4
+ PINSEL3_bit.P1_27 = 0;
+ PINMODE3_bit.P1_27 = 0;
+ if(SignalLevel[3])PINMODE3_bit.P1_27 = 3;
+ else PINMODE3_bit.P1_27 = 0;
+ FIO1DIR_bit.P1_27 = 0;
+ FIO1MASK_bit.P1_27 = 0;
+
+ // купюроприемник 5
+ PINSEL0_bit.P0_9 = 0;
+ if(cashLevel[4])PINMODE0_bit.P0_9 = 3;
+ else PINMODE0_bit.P0_9 = 0;
+ FIO0DIR_bit.P0_9 = 0;
+ FIO0MASK_bit.P0_9 = 0;
+
+ // монетоприемник 5
+ PINSEL4_bit.P2_2 = 0;
+ if(coinLevel[4])PINMODE3_bit.P1_21 = 3;
+ else PINMODE4_bit.P2_2 = 0;
+ FIO2DIR_bit.P2_2 = 0;
+ FIO2MASK_bit.P2_2 = 0;
+
+ // сигнал печати чека пост 5
+ PINSEL3_bit.P1_26 = 0;
+ if(SignalLevel[4])PINMODE3_bit.P1_26 = 3;
+ else PINMODE3_bit.P1_26 = 0;
+ FIO1DIR_bit.P1_26 = 0;
+ FIO1MASK_bit.P1_26 = 0;
+
+ // купюроприемник 6
+ PINSEL0_bit.P0_7 = 0;
+ if(cashLevel[5])PINMODE0_bit.P0_7 = 3;
+ else PINMODE0_bit.P0_7 = 0;
+ FIO0DIR_bit.P0_7 = 0;
+ FIO0MASK_bit.P0_7 = 0;
+
+ // монетоприемник 6
+ PINSEL0_bit.P0_8 = 0;
+ if(coinLevel[5])PINMODE0_bit.P0_8 = 3;
+ else PINMODE0_bit.P0_8 = 0;
+ FIO0DIR_bit.P0_8 = 0;
+ FIO0MASK_bit.P0_8 = 0;
+
+ // сигнал печати чека пост 6
+ PINSEL0_bit.P0_0 = 0;
+ if(SignalLevel[5])PINMODE0_bit.P0_0 = 3;
+ else PINMODE0_bit.P0_0 = 0;
+ FIO0DIR_bit.P0_0 = 0;
+ FIO0MASK_bit.P0_0 = 0;
+
+ // монетоприемник пылесос 1
+ PINSEL0_bit.P0_5 = 0;
+ if(coinLevel[6])PINMODE0_bit.P0_5 = 3;
+ else PINMODE0_bit.P0_5 = 0;
+ FIO0DIR_bit.P0_5 = 0;
+ FIO0MASK_bit.P0_5 = 0;
+
+ // монетоприемник пылесос 2
+ PINSEL3_bit.P1_25 = 0;
+ if(coinLevel[7])PINMODE3_bit.P1_25 = 3;
+ else PINMODE3_bit.P1_25 = 0;
+ FIO1DIR_bit.P1_25 = 0;
+ FIO1MASK_bit.P1_25 = 0;
+
+ // банк 1
+ PINSEL1_bit.P0_28 = 0;
+ if(bankLevel[0])PINMODE1_bit.P0_28 = 3;
+ else PINMODE1_bit.P0_28 = 0;
+ FIO0DIR_bit.P0_28 = 0;
+ FIO0MASK_bit.P0_28 = 0;
+
+ // банк 2
+ PINSEL1_bit.P0_27 = 0;
+ if(bankLevel[1])PINMODE1_bit.P0_27 = 3;
+ else PINMODE1_bit.P0_27 = 0;
+ FIO0DIR_bit.P0_27 = 0;
+ FIO0MASK_bit.P0_27 = 0;
+
+ // банк 3
+ PINSEL3_bit.P1_24 = 0;
+ if(bankLevel[2])PINMODE1_bit.P0_24 = 3;
+ else PINMODE1_bit.P0_24 = 0;
+ FIO1DIR_bit.P1_24 = 0;
+ FIO1MASK_bit.P1_24 = 0;
+
+ // банк 4
+ PINSEL3_bit.P1_23 = 0;
+ if(bankLevel[3])PINMODE1_bit.P0_23 = 3;
+ else PINMODE1_bit.P0_23 = 0;
+ FIO1DIR_bit.P1_23 = 0;
+ FIO1MASK_bit.P1_23 = 0;
+
+ // банк 5
+ PINSEL0_bit.P0_6 = 0;
+ if(bankLevel[4])PINMODE0_bit.P0_6 = 3;
+ else PINMODE0_bit.P0_6 = 0;
+ FIO0DIR_bit.P0_6 = 0;
+ FIO0MASK_bit.P0_6 = 0;
+
+ // банк 6
+ PINSEL0_bit.P0_10 = 0;
+ if(bankLevel[5])PINMODE0_bit.P0_10 = 3;
+ else PINMODE0_bit.P0_10 = 0;
+ FIO0DIR_bit.P0_10 = 0;
+ FIO0MASK_bit.P0_10 = 0;
+}
+
// инициализация импульсных входов
void InitImpInput (void)
{
@@ -1085,170 +1276,17 @@ void InitImpInput (void)
OS_CPU_SR cpu_sr = 0;
#endif
+ OnChangeCoinPulseLen();
OnChangeCashPulseLen();
OnChangeSinalPulseLen();
- OnChangeLevel();
+ OnChangeBankPulseLen();
+ OnChangeLevelWithoutInit();
OS_ENTER_CRITICAL();
// назначим все ножки
-
- // купюроприемник 1
- PINSEL3_bit.P1_20 = 0;
- PINMODE3_bit.P1_20 = 0;
- FIO1DIR_bit.P1_20 = 0;
- FIO1MASK_bit.P1_20 = 0;
-
- // монетоприемник 1
- PINSEL3_bit.P1_21 = 0;
- PINMODE3_bit.P1_21 = 0;
- FIO1DIR_bit.P1_21 = 0;
- FIO1MASK_bit.P1_21 = 0;
-
- // сигнал печати чека пост 1
- PINSEL9_bit.P4_28 = 0;
- PINMODE9_bit.P4_28 = 0;
- FIO4DIR_bit.P4_28 = 0;
- FIO4MASK_bit.P4_28 = 0;
-
- // купюроприемник 2
- PINSEL3_bit.P1_19 = 0;
- PINMODE3_bit.P1_19 = 0;
- FIO1DIR_bit.P1_19 = 0;
- FIO1MASK_bit.P1_19 = 0;
-
- // монетоприемник 2
- PINSEL3_bit.P1_18 = 0;
- PINMODE3_bit.P1_18 = 0;
- FIO1DIR_bit.P1_18 = 0;
- FIO1MASK_bit.P1_18 = 0;
-
- // сигнал печати чека пост 2
- PINSEL0_bit.P0_4 = 0;
- PINMODE0_bit.P0_4 = 0;
- FIO0DIR_bit.P0_4 = 0;
- FIO0MASK_bit.P0_4 = 0;
-
- // купюроприемник 3
- PINSEL7_bit.P3_25 = 0;
- PINMODE7_bit.P3_25 = 0;
- FIO3DIR_bit.P3_25 = 0;
- FIO3MASK_bit.P3_25 = 0;
-
- // монетоприемник 3
- PINSEL7_bit.P3_26 = 0;
- PINMODE7_bit.P3_26 = 0;
- FIO3DIR_bit.P3_26 = 0;
- FIO3MASK_bit.P3_26 = 0;
-
- // сигнал печати чека пост 3
- PINSEL3_bit.P1_28 = 0;
- PINMODE3_bit.P1_28 = 0;
- FIO1DIR_bit.P1_28 = 0;
- FIO1MASK_bit.P1_28 = 0;
-
- // купюроприемник 4
- PINSEL1_bit.P0_26 = 0;
- PINMODE1_bit.P0_26 = 0;
- FIO0DIR_bit.P0_26 = 0;
- FIO0MASK_bit.P0_26 = 0;
-
- // монетоприемник 4
- PINSEL1_bit.P0_25 = 0;
- PINMODE1_bit.P0_25 = 0;
- FIO0DIR_bit.P0_25 = 0;
- FIO0MASK_bit.P0_25 = 0;
-
- // сигнал печати чека пост 4
- PINSEL3_bit.P1_27 = 0;
- PINMODE3_bit.P1_27 = 0;
- FIO1DIR_bit.P1_27 = 0;
- FIO1MASK_bit.P1_27 = 0;
-
- // купюроприемник 5
- PINSEL0_bit.P0_9 = 0;
- PINMODE0_bit.P0_9 = 0;
- FIO0DIR_bit.P0_9 = 0;
- FIO0MASK_bit.P0_9 = 0;
-
- // монетоприемник 5
- PINSEL4_bit.P2_2 = 0;
- PINMODE4_bit.P2_2 = 0;
- FIO2DIR_bit.P2_2 = 0;
- FIO2MASK_bit.P2_2 = 0;
-
- // сигнал печати чека пост 5
- PINSEL3_bit.P1_26 = 0;
- PINMODE3_bit.P1_26 = 0;
- FIO1DIR_bit.P1_26 = 0;
- FIO1MASK_bit.P1_26 = 0;
-
- // купюроприемник 6
- PINSEL0_bit.P0_7 = 0;
- PINMODE0_bit.P0_7 = 0;
- FIO0DIR_bit.P0_7 = 0;
- FIO0MASK_bit.P0_7 = 0;
-
- // монетоприемник 6
- PINSEL0_bit.P0_8 = 0;
- PINMODE0_bit.P0_8 = 0;
- FIO0DIR_bit.P0_8 = 0;
- FIO0MASK_bit.P0_8 = 0;
-
- // сигнал печати чека пост 6
- PINSEL0_bit.P0_0 = 0;
- PINMODE0_bit.P0_0 = 0;
- FIO0DIR_bit.P0_0 = 0;
- FIO0MASK_bit.P0_0 = 0;
-
- // монетоприемник пылесос 1
- PINSEL0_bit.P0_5 = 0;
- PINMODE0_bit.P0_5 = 0;
- FIO0DIR_bit.P0_5 = 0;
- FIO0MASK_bit.P0_5 = 0;
-
- // монетоприемник пылесос 2
- PINSEL3_bit.P1_25 = 0;
- PINMODE3_bit.P1_25 = 0;
- FIO1DIR_bit.P1_25 = 0;
- FIO1MASK_bit.P1_25 = 0;
-
- // банк 1
- PINSEL1_bit.P0_28 = 0;
- PINMODE1_bit.P0_28 = 0;
- FIO0DIR_bit.P0_28 = 0;
- FIO0MASK_bit.P0_28 = 0;
-
- // банк 2
- PINSEL1_bit.P0_27 = 0;
- PINMODE1_bit.P0_27 = 0;
- FIO0DIR_bit.P0_27 = 0;
- FIO0MASK_bit.P0_27 = 0;
-
- // банк 3
- PINSEL3_bit.P1_24 = 0;
- PINMODE3_bit.P1_24 = 0;
- FIO1DIR_bit.P1_24 = 0;
- FIO1MASK_bit.P1_24 = 0;
-
- // банк 4
- PINSEL3_bit.P1_23 = 0;
- PINMODE3_bit.P1_23 = 0;
- FIO1DIR_bit.P1_23 = 0;
- FIO1MASK_bit.P1_23 = 0;
-
- // банк 5
- PINSEL0_bit.P0_6 = 0;
- PINMODE0_bit.P0_6 = 0;
- FIO0DIR_bit.P0_6 = 0;
- FIO0MASK_bit.P0_6 = 0;
-
- // банк 6
- PINSEL0_bit.P0_10 = 0;
- PINMODE0_bit.P0_10 = 0;
- FIO0DIR_bit.P0_10 = 0;
- FIO0MASK_bit.P0_10 = 0;
-
+ InitInputPorts();
+
PCONP_bit.PCTIM3 = 1;
PCLKSEL1_bit.PCLK_TIMER3 = 2;
diff --git a/PROJECT/services/coin.h b/PROJECT/services/coin.h
index 1f7bebc..206b2b1 100644
--- a/PROJECT/services/coin.h
+++ b/PROJECT/services/coin.h
@@ -12,6 +12,7 @@ extern CPU_INT32U GetCoinCount(int index);
extern CPU_INT32U GetResetCoinCount(int index);
extern void CoinDisable(void);
extern void CoinEnable(void);
+extern void InitInputPorts();
extern CPU_INT32U GetCashCount(int index);
extern CPU_INT32U GetResetCashCount(int index);
diff --git a/settings/sk-mlpc2368.wsdt b/settings/sk-mlpc2368.wsdt
index b66027c..3606e9f 100644
--- a/settings/sk-mlpc2368.wsdt
+++ b/settings/sk-mlpc2368.wsdt
@@ -34,7 +34,7 @@
TabID-28963-15244Find in FilesFind-in-FilesTabID-3677-8150Debug LogDebug-Log
- 1
+ 0
TabID-1122-24249
@@ -52,7 +52,7 @@
- TextEditor$WS_DIR$\OS\app\app_cfg.h005858TextEditor$WS_DIR$\..\..\8\positive_6_24\OS\app\app.c02614311431TextEditor$WS_DIR$\PROJECT\services\console.c010933323332TextEditor$WS_DIR$\OS\uc\lib\lib_def.h011159735981TextEditor$WS_DIR$\PROJECT\services\time.c081625625TextEditor$WS_DIR$\PROJECT\data\data.c034494269426TextEditor$WS_DIR$\PROJECT\services\mode.c028763763TextEditor$WS_DIR$\PROJECT\drivers\keyboard\keyboard.h00470470TextEditor$WS_DIR$\PROJECT\app\app_serv.h05015361536TextEditor$WS_DIR$\PROJECT\menu\menu.c016245484548TextEditor$WS_DIR$\PROJECT\drivers\lcd\lcd.c028669536953TextEditor$WS_DIR$\PROJECT\menu\menu.h06292292TextEditor$WS_DIR$\OS\uc\os_ii\source\os_q.c04342250222502TextEditor$WS_DIR$\PROJECT\services\coin.c025283268326TextEditor$WS_DIR$\PROJECT\data\data.h04011851185TextEditor$WS_DIR$\PROJECT\data\datadesc.c02582114404114404TextEditor$WS_DIR$\PROJECT\app\journal.h06449534953TextEditor$WS_DIR$\OS\uc\os_ii\source\os_time.c02171031110311TextEditor$WS_DIR$\PROJECT\app\app_serv.c05091737817378TextEditor$WS_DIR$\PROJECT\data\datadesc.h09333873387TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.h03421786617866TextEditor$WS_DIR$\PROJECT\services\fr.h00348348TextEditor$WS_DIR$\OS\uc\os_ii\source\os_core.c013595689856898TextEditor$WS_DIR$\PROJECT\app\journal.c05001564015640TextEditor$WS_DIR$\PROJECT\menu\menudesc.c01097431854318524TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c08712023620391TextEditor$WS_DIR$\OS\uc\os_ii\port\os_cpu_c.c023199829982TextEditor$WS_DIR$\PROJECT\services\fr.c06219721972TextEditor$WS_DIR$\PROJECT\services\coin.h03565565TextEditor$WS_DIR$\PROJECT\data\fram_map.h033285285TextEditor$WS_DIR$\OS\app\app.c014642944294TextEditor$WS_DIR$\PROJECT\menu\menudesc.h026139015320100000010000001
+ TextEditor$WS_DIR$\OS\app\app_cfg.h005858TextEditor$WS_DIR$\..\..\8\positive_6_24\OS\app\app.c02614311431TextEditor$WS_DIR$\PROJECT\services\console.c010933323332TextEditor$WS_DIR$\OS\uc\lib\lib_def.h011159735981TextEditor$WS_DIR$\PROJECT\services\time.c081625625TextEditor$WS_DIR$\PROJECT\data\data.c034494269426TextEditor$WS_DIR$\PROJECT\services\mode.c028763763TextEditor$WS_DIR$\PROJECT\drivers\keyboard\keyboard.h00470470TextEditor$WS_DIR$\PROJECT\app\app_serv.h03515361536TextEditor$WS_DIR$\PROJECT\services\coin.c08392592425924TextEditor$WS_DIR$\PROJECT\data\datadesc.c02374105931105931TextEditor$WS_DIR$\PROJECT\app\journal.h01616761676TextEditor$WS_DIR$\PROJECT\app\app_serv.c04301491014910TextEditor$WS_DIR$\PROJECT\data\datadesc.h014151455169TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.h03421786617866TextEditor$WS_DIR$\PROJECT\services\fr.h00348348TextEditor$WS_DIR$\OS\uc\os_ii\source\os_core.c013595689856898TextEditor$WS_DIR$\PROJECT\app\journal.c04311301813018TextEditor$WS_DIR$\PROJECT\menu\menudesc.c01417569795697918TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c08712023620391TextEditor$WS_DIR$\PROJECT\services\fr.c06219721972TextEditor$WS_DIR$\PROJECT\services\coin.h03390390TextEditor$WS_DIR$\PROJECT\data\fram_map.h033285285TextEditor$WS_DIR$\OS\app\app.c014642944294TextEditor$WS_DIR$\PROJECT\menu\menudesc.h026139015320100000010000001