From 05f1e7c485c344745cba7a0d167d45a75d5d0f69 Mon Sep 17 00:00:00 2001 From: dimoniche Date: Tue, 30 Jul 2019 23:29:13 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROJECT/drivers/fiscal/fiscal.c | 3 +- PROJECT/services/coin.c | 72 ++++++++++++++++----------------- settings/sk-mlpc2368.dni | 2 +- settings/sk-mlpc2368.wsdt | 4 +- 4 files changed, 41 insertions(+), 40 deletions(-) diff --git a/PROJECT/drivers/fiscal/fiscal.c b/PROJECT/drivers/fiscal/fiscal.c index c5ad25c..1feda6c 100644 --- a/PROJECT/drivers/fiscal/fiscal.c +++ b/PROJECT/drivers/fiscal/fiscal.c @@ -891,7 +891,8 @@ int FiscCloseBillV2Online(CPU_INT32U pass, CPU_INT64U *cash, CPU_INT08U taxsys, fisc_buf[0] = 0x45; memcpy(&fisc_buf[1], (CPU_INT08U*)&pass, 4); - memcpy(&fisc_buf[5], 0, 5); + + memset(&fisc_buf[5], 0, 5); memcpy(&fisc_buf[10], cash, 5); // online платеж diff --git a/PROJECT/services/coin.c b/PROJECT/services/coin.c index 858d6ee..9eaf510 100644 --- a/PROJECT/services/coin.c +++ b/PROJECT/services/coin.c @@ -436,11 +436,11 @@ CPU_INT32U input_register() { SETBIT(input, 2); } - if (FIO1PIN_bit.P1_19) + if (FIO1PIN_bit.P1_18) { SETBIT(input, 3); } - if (FIO1PIN_bit.P1_18) + if (FIO1PIN_bit.P1_19) { SETBIT(input, 4); } @@ -448,11 +448,11 @@ CPU_INT32U input_register() { SETBIT(input, 5); } - if (FIO3PIN_bit.P3_25) + if (FIO3PIN_bit.P3_26) { SETBIT(input, 6); } - if (FIO3PIN_bit.P3_26) + if (FIO3PIN_bit.P3_25) { SETBIT(input, 7); } @@ -611,7 +611,7 @@ void InputCapture_ISR(void) // купюроприемник 2 if(TSTBIT(input_event, 3)) { - if ((!FIO1PIN_bit.P1_19 && cashLevel[1]) || (FIO1PIN_bit.P1_19 && !cashLevel[1])) + if ((!FIO1PIN_bit.P1_18 && cashLevel[1]) || (FIO1PIN_bit.P1_18 && !cashLevel[1])) { // пришел задний фронт CPU_INT32U cr=T3CR; cr -= period_cash[1]; @@ -632,7 +632,7 @@ void InputCapture_ISR(void) // монетоприемник 2 if(TSTBIT(input_event, 4)) { - if ((!FIO1PIN_bit.P1_18 && coinLevel[1]) || (FIO1PIN_bit.P1_18 && !coinLevel[1])) + if ((!FIO1PIN_bit.P1_19 && coinLevel[1]) || (FIO1PIN_bit.P1_19 && !coinLevel[1])) { // пришел задний фронт CPU_INT32U cr=T3CR; cr -= period[1]; @@ -671,7 +671,7 @@ void InputCapture_ISR(void) // купюроприемник 3 if(TSTBIT(input_event, 6)) { - if ((!FIO3PIN_bit.P3_25 && cashLevel[2]) || (FIO3PIN_bit.P3_25 && !cashLevel[2])) + if ((!FIO3PIN_bit.P3_26 && cashLevel[2]) || (FIO3PIN_bit.P3_26 && !cashLevel[2])) { // пришел задний фронт CPU_INT32U cr=T3CR; cr -= period_cash[2]; @@ -692,7 +692,7 @@ void InputCapture_ISR(void) // монетоприемник 3 if(TSTBIT(input_event, 7)) { - if ((!FIO3PIN_bit.P3_26 && coinLevel[2]) || (FIO3PIN_bit.P3_26 && !coinLevel[2])) + if ((!FIO3PIN_bit.P3_25 && coinLevel[2]) || (FIO3PIN_bit.P3_25 && !coinLevel[2])) { // пришел задний фронт CPU_INT32U cr=T3CR; cr -= period[2]; @@ -1096,50 +1096,50 @@ void InitInputPorts() // сигнал печати чека пост 1 PINSEL9_bit.P4_28 = 0; - if(SignalLevel[0])PINMODE9_bit.P4_28 = 3; - else PINMODE9_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; + if(cashLevel[1])PINMODE3_bit.P1_18 = 3; else PINMODE3_bit.P1_18 = 0; FIO1DIR_bit.P1_18 = 0; FIO1MASK_bit.P1_18 = 0; + + // монетоприемник 2 + PINSEL3_bit.P1_19 = 0; + if(coinLevel[1])PINMODE3_bit.P1_19 = 3; + else PINMODE3_bit.P1_19 = 0; + FIO1DIR_bit.P1_19 = 0; + FIO1MASK_bit.P1_19 = 0; // сигнал печати чека пост 2 PINSEL0_bit.P0_4 = 0; - if(SignalLevel[1])PINMODE0_bit.P0_4 = 3; - else PINMODE0_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; + if(cashLevel[2])PINMODE7_bit.P3_26 = 3; else PINMODE7_bit.P3_26 = 0; FIO3DIR_bit.P3_26 = 0; FIO3MASK_bit.P3_26 = 0; + + // монетоприемник 3 + PINSEL7_bit.P3_25 = 0; + if(coinLevel[2])PINMODE7_bit.P3_25 = 3; + else PINMODE7_bit.P3_25 = 0; + FIO3DIR_bit.P3_25 = 0; + FIO3MASK_bit.P3_25 = 0; // сигнал печати чека пост 3 PINSEL3_bit.P1_28 = 0; - if(SignalLevel[2])PINMODE3_bit.P1_28 = 3; - else PINMODE3_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; @@ -1160,8 +1160,8 @@ void InitInputPorts() // сигнал печати чека пост 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; + /*if(SignalLevel[3])PINMODE3_bit.P1_27 = 3; + else*/ PINMODE3_bit.P1_27 = 0; FIO1DIR_bit.P1_27 = 0; FIO1MASK_bit.P1_27 = 0; @@ -1181,8 +1181,8 @@ void InitInputPorts() // сигнал печати чека пост 5 PINSEL3_bit.P1_26 = 0; - if(SignalLevel[4])PINMODE3_bit.P1_26 = 3; - else PINMODE3_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; @@ -1202,8 +1202,8 @@ void InitInputPorts() // сигнал печати чека пост 6 PINSEL0_bit.P0_0 = 0; - if(SignalLevel[5])PINMODE0_bit.P0_0 = 3; - else PINMODE0_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; diff --git a/settings/sk-mlpc2368.dni b/settings/sk-mlpc2368.dni index e2a387d..ef95e47 100644 --- a/settings/sk-mlpc2368.dni +++ b/settings/sk-mlpc2368.dni @@ -14,7 +14,7 @@ Count=0 Enabled=0 ShowSource=1 [DebugChecksum] -Checksum=1108304254 +Checksum=782654363 [Exceptions] StopOnUncaught=_ 0 StopOnThrow=_ 0 diff --git a/settings/sk-mlpc2368.wsdt b/settings/sk-mlpc2368.wsdt index 6c67ff9..48dd6bc 100644 --- a/settings/sk-mlpc2368.wsdt +++ b/settings/sk-mlpc2368.wsdt @@ -52,14 +52,14 @@ - 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\drivers\keyboard\keyboard.h00470470TextEditor$WS_DIR$\PROJECT\app\app_serv.h03515361536TextEditor$WS_DIR$\PROJECT\app\journal.h05246250TextEditor$WS_DIR$\PROJECT\data\datadesc.h06635635TextEditor$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.c021260586058TextEditor$WS_DIR$\PROJECT\menu\menudesc.c013245350253502TextEditor$WS_DIR$\PROJECT\app\app_serv.c05622033620336TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c0865229882298816TextEditor$WS_DIR$\PROJECT\services\fr.c08562357723577TextEditor$WS_DIR$\PROJECT\services\coin.h03390390TextEditor$WS_DIR$\PROJECT\data\fram_map.h033285285TextEditor$WS_DIR$\PROJECT\services\coin.c012762337223372TextEditor$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.c0214996367963670100000010000001 + 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\drivers\keyboard\keyboard.h00470470TextEditor$WS_DIR$\PROJECT\app\app_serv.h03515361536TextEditor$WS_DIR$\PROJECT\app\journal.h05246250TextEditor$WS_DIR$\PROJECT\data\datadesc.h06635635TextEditor$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.c021260586058TextEditor$WS_DIR$\PROJECT\menu\menudesc.c013245350253502TextEditor$WS_DIR$\PROJECT\app\app_serv.c05622033620336TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c0872231352313516TextEditor$WS_DIR$\PROJECT\services\fr.c08712358623586TextEditor$WS_DIR$\PROJECT\services\coin.h03390390TextEditor$WS_DIR$\PROJECT\data\fram_map.h033285285TextEditor$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.c021499636796367TextEditor$WS_DIR$\PROJECT\services\coin.c06281593215932TextEditor$WS_DIR$\..\..\Program Files (x86)\IAR Systems\Embedded Workbench 6.0\arm\inc\c\DLib_Product_string.h040144914490100000010000001 - iaridepm.enu1-2-2766237-2-2254205198438215563186719807571-2-21401282-2-212841421003125149317198438215563 + iaridepm.enu1-2-2710237-2-2254205198438215563186719748686-2-21961282-2-212841981003125208202198438215563