diff --git a/PROJECT/app/app_serv.c b/PROJECT/app/app_serv.c
index 42c28e6..0b6f426 100644
--- a/PROJECT/app/app_serv.c
+++ b/PROJECT/app/app_serv.c
@@ -106,6 +106,7 @@ CPU_INT32U enable_coin[COUNT_POST + COUNT_VACUUM];
CPU_INT32U cash_enable[COUNT_POST];
CPU_INT32U bank_enable[COUNT_POST];
CPU_INT32U enable_signal[COUNT_POST];
+CPU_INT32U fiscal_enable;
void DrawMenu(void)
{
@@ -144,7 +145,6 @@ void DrawMenu(void)
void UserAppTask(void *p_arg)
{
CPU_INT32U print_timeout;
- CPU_INT32U accmoney;
int event;
#ifdef BOARD_CENTRAL_CFG
@@ -180,12 +180,21 @@ void UserAppTask(void *p_arg)
}
break;
case EVENT_SEC:
+ {
+ CPU_INT32U accmoney = 0;
// рабочий сервер - счетчики, состояния и т.п.
WorkServer();
- // проверим фискальник, если он отвалился
- if ((++fr_conn_ctr % 10) == 0)
+ GetData(&EnableFiscalDesc, &fiscal_enable, 0, DATA_FLAG_SYSTEM_INDEX);
+
+ if(!fiscal_enable)
+ {
+ FiscalConnState = FISCAL_NOCONN;
+ }
+
+ // проверим фискальник, если он отвалился или отключался
+ if ((++fr_conn_ctr % 5) == 0)
{
if ((FiscalConnState == FISCAL_NOCONN) || (TstCriticalFiscalError()))
{
@@ -297,8 +306,8 @@ void UserAppTask(void *p_arg)
was_critical_error = 0;
break;
}
-
- break;
+ }
+ break;
case EVENT_MODE_CHANGE:
ReInitMenu();
@@ -315,7 +324,7 @@ void UserAppTask(void *p_arg)
case EVENT_COIN_INSERTED_VACUUM2:
{
CPU_INT32U cpp = 1;
- CPU_INT32U money, accmoney;
+ CPU_INT32U money, accmoney = 0;
int number_post = event - EVENT_COIN_INSERTED_POST1;
GetData(&CoinPerPulseDesc, &cpp, number_post, DATA_FLAG_DIRECT_INDEX);
@@ -342,7 +351,7 @@ void UserAppTask(void *p_arg)
case EVENT_CASH_INSERTED_POST6:
{
CPU_INT32U cpp = 1;
- CPU_INT32U money, accmoney;
+ CPU_INT32U money, accmoney = 0;
int number_post = event - EVENT_CASH_INSERTED_POST1;
GetData(&CashPerPulseDesc, &cpp, number_post, DATA_FLAG_DIRECT_INDEX);
@@ -368,7 +377,7 @@ void UserAppTask(void *p_arg)
case EVENT_BANK_INSERTED_POST6:
{
CPU_INT32U cpp = 1;
- CPU_INT32U money, accmoney;
+ CPU_INT32U money, accmoney = 0;
int number_post = event - EVENT_BANK_INSERTED_POST1;
GetData(&BankPerPulseDesc, &cpp, number_post, DATA_FLAG_DIRECT_INDEX);
@@ -455,11 +464,12 @@ void UserAppTask(void *p_arg)
if (GetMode() == MODE_WORK) //
{
int number_post = event - EVENT_STOP_MONEY_POST1;
+ CPU_INT32U accmoney = 0;
accmoney = GetAcceptedMoney(number_post);
accmoney += GetAcceptedBankMoney(number_post);
- if (accmoney > 0)
+ if ((accmoney > 0) && (wash_State[number_post] != washing) && (wash_State[number_post] != printCheck))
{
wash_State[number_post] = washing;
SaveEventRecord(number_post, JOURNAL_EVENT_WASHING, number_post);
@@ -477,6 +487,7 @@ void UserAppTask(void *p_arg)
{
int number_post = event - EVENT_WAIT_CASH_PRINT_CHECK_POST1;
int count_delay = 0;
+ CPU_INT32U accmoney = 0;
accmoney = GetAcceptedMoney(number_post);
accmoney += GetAcceptedBankMoney(number_post);
@@ -509,6 +520,7 @@ void UserAppTask(void *p_arg)
if (GetMode() == MODE_WORK) // печатаем только в рабочем режиме
{
int number_post = event - EVENT_CASH_PRINT_CHECK_POST1;
+ CPU_INT32U accmoney = 0;
// здесь событие старта печати чека - включили насос или пылесос
accmoney = GetAcceptedMoney(number_post);
@@ -578,7 +590,7 @@ void UserAppTask(void *p_arg)
case EVENT_KEY_F1:
//testMoney = 100;
- //PostUserEvent(EVENT_BANK_INSERTED_POST4);
+ //PostUserEvent(EVENT_BANK_INSERTED_POST2);
/*FIO4SET_bit.P4_28 = 1;
OSTimeDly(50);
@@ -601,11 +613,11 @@ void UserAppTask(void *p_arg)
FIO4CLR_bit.P4_28 = 1;*/
break;
case EVENT_KEY_F2:
- //PostUserEvent(EVENT_STOP_MONEY_POST4);
+ //PostUserEvent(EVENT_STOP_MONEY_POST2);
break;
case EVENT_KEY_F3:
//testMoney = 100;
- //PostUserEvent(EVENT_WAIT_CASH_PRINT_CHECK_POST4);
+ //PostUserEvent(EVENT_WAIT_CASH_PRINT_CHECK_POST2);
break;
#endif
default:
diff --git a/PROJECT/services/coin.c b/PROJECT/services/coin.c
index dde72f0..b1d8fa2 100644
--- a/PROJECT/services/coin.c
+++ b/PROJECT/services/coin.c
@@ -524,7 +524,7 @@ CPU_INT32U input_register()
{
SETBIT(input, 24);
}
- if (FIO0PIN_bit.P0_10)
+ if (FIO0PIN_bit.P0_1)
{
SETBIT(input, 25);
}
@@ -1057,7 +1057,7 @@ void InputCapture_ISR(void)
// банк 6
if(TSTBIT(input_event, 25))
{
- if ((!FIO0PIN_bit.P0_10 && bankLevel[5]) || (FIO0PIN_bit.P0_10 && !bankLevel[5]))
+ if ((!FIO0PIN_bit.P0_1 && bankLevel[5]) || (FIO0PIN_bit.P0_1 && !bankLevel[5]))
{ // пришел задний фронт
CPU_INT32U cr=T3CR;
cr -= period_bank[5];
@@ -1257,11 +1257,11 @@ void InitInputPorts()
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;
+ PINSEL0_bit.P0_1 = 0;
+ if(bankLevel[5])PINMODE0_bit.P0_1 = 3;
+ else PINMODE0_bit.P0_1 = 0;
+ FIO0DIR_bit.P0_1 = 0;
+ FIO0MASK_bit.P0_1 = 0;
}
// инициализация импульсных входов
diff --git a/settings/sk-mlpc2368.dni b/settings/sk-mlpc2368.dni
index 000a52f..5bac420 100644
--- a/settings/sk-mlpc2368.dni
+++ b/settings/sk-mlpc2368.dni
@@ -14,7 +14,7 @@ Count=0
Enabled=0
ShowSource=1
[DebugChecksum]
-Checksum=-1582667056
+Checksum=-853996095
[Exceptions]
StopOnUncaught=_ 0
StopOnThrow=_ 0
diff --git a/settings/sk-mlpc2368.wsdt b/settings/sk-mlpc2368.wsdt
index 8e2d6e6..140a3fc 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\services\mode.c028763763TextEditor$WS_DIR$\PROJECT\app\app_serv.h05820912091TextEditor$WS_DIR$\PROJECT\app\journal.h03437643785TextEditor$WS_DIR$\PROJECT\data\datadesc.h06399417TextEditor$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\menu\menudesc.c07252875828758TextEditor$WS_DIR$\PROJECT\app\app_serv.c047090179017TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c08722313523135TextEditor$WS_DIR$\PROJECT\services\fr.c03181036210362TextEditor$WS_DIR$\PROJECT\services\coin.h03390390TextEditor$WS_DIR$\OS\app\app.c02711311131TextEditor$WS_DIR$\PROJECT\menu\menudesc.h02613901532TextEditor$WS_DIR$\PROJECT\data\data.c011535403540TextEditor$WS_DIR$\PROJECT\menu\menu.c04911513515135TextEditor$WS_DIR$\PROJECT\data\datadesc.c05712571825732TextEditor$WS_DIR$\PROJECT\services\coin.c01268307133071322TextEditor$WS_DIR$\PROJECT\drivers\keyboard\keyboard.c024463463TextEditor$WS_DIR$\PROJECT\drivers\keyboard\keyboard.h00420429TextEditor$WS_DIR$\PROJECT\app\journal.c0109310231020100000010000001
+ 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\services\mode.c028763763TextEditor$WS_DIR$\PROJECT\app\app_serv.h05820912091TextEditor$WS_DIR$\PROJECT\app\journal.h03437643785TextEditor$WS_DIR$\PROJECT\data\datadesc.h03503526TextEditor$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\menu\menudesc.c011514628046280TextEditor$WS_DIR$\PROJECT\app\app_serv.c03691159311593TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c06951805818058TextEditor$WS_DIR$\PROJECT\services\fr.c03901206712067TextEditor$WS_DIR$\PROJECT\services\coin.h03390390TextEditor$WS_DIR$\OS\app\app.c02711311131TextEditor$WS_DIR$\PROJECT\menu\menudesc.h02613901532TextEditor$WS_DIR$\PROJECT\data\data.c011535403540TextEditor$WS_DIR$\PROJECT\menu\menu.c04911513515135TextEditor$WS_DIR$\PROJECT\data\datadesc.c022149956099560TextEditor$WS_DIR$\PROJECT\services\coin.c0962234112341622TextEditor$WS_DIR$\PROJECT\drivers\keyboard\keyboard.h00420429TextEditor$WS_DIR$\PROJECT\app\journal.c010931023102TextEditor$WS_DIR$\PROJECT\data\fram_map.h062992990100000010000001