dimoniche/changer
1
0
Fork 0
mirror of https://github.com/dimoniche/changer.git synced 2026-01-30 01:03:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Защита от зацикливаний.

Browse Source
This commit is contained in:
Dmitriy 2023-11-28 02:47:56 +03:00
parent dfe814fae9
commit cd6bfe7115
8 changed files with 5229 additions and 5149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Flash Central/.ninja_deps
View File

Binary file not shown.

79
Flash Central/.ninja_log
View File

@ -158,3 +158,82 @@
5087 5618 7228170598269561 C:/git_work/changer/Flash Central/List/version0_14.map 9e99cda6790a8ea4
5650 5716 7228170599281005 C:/git_work/changer/Flash Central/Exe/version0_14.out 68c091af4bb16129
5720 5761 7228170599735031 C:/git_work/changer/Flash Central/Exe/changer0_31.hex 838eddf0ca73c802
3 33 7228316755724153 C:/git_work/changer/Flash Central/Obj/OS/bsp/cstartup.o f997b7bc27fd3bc7
12 190 7228316757229126 C:/git_work/changer/Flash Central/Obj/OS/uc/os_ii/port/os_dbg.o 48a09ac2d866a1e6
16 203 7228316757278973 C:/git_work/changer/Flash Central/Obj/OS/uc/os_ii/port/os_dcc.o 53f79a2935c8be7c
34 257 7228316757906850 C:/git_work/changer/Flash Central/Obj/OS/uc/os_ii/port/os_cpu_c.o 4e3840dcda722ebf
7 303 7228316758076281 C:/git_work/changer/Flash Central/Obj/OS/uc/os_ii/source/os_core.o ecd2b5bb394d9db6
311 373 7228316759033084 C:/git_work/changer/Flash Central/Obj/OS/uc/os_ii/source/os_mem.o 9932cd8f76f464bf
210 395 7228316759072982 C:/git_work/changer/Flash Central/Obj/OS/uc/os_ii/source/os_q.o 780297e66479c2df
197 407 7228316759122785 C:/git_work/changer/Flash Central/Obj/OS/uc/os_ii/source/os_flag.o 43355ee506b3e094
265 441 7228316759730772 C:/git_work/changer/Flash Central/Obj/OS/uc/os_ii/source/os_task.o 3b8680b0bc453f39
381 502 7228316760358652 C:/git_work/changer/Flash Central/Obj/OS/uc/os_ii/source/os_sem.o 910b38c5876f6dbd
402 532 7228316760657651 C:/git_work/changer/Flash Central/Obj/OS/uc/os_ii/source/os_mbox.o 30a12fc419963ebf
416 563 7228316760966613 C:/git_work/changer/Flash Central/Obj/OS/uc/os_ii/source/os_mutex.o f0fbe4b4a80e210a
541 629 7228316761634380 C:/git_work/changer/Flash Central/Obj/OS/uc/os_ii/source/os_time.o e33f466d72d824c
510 684 7228316762162615 C:/git_work/changer/Flash Central/Obj/OS/uc/tcpip/IF/net_if_pkt.o fadf1b7a8797ef29
449 734 7228316762621080 C:/git_work/changer/Flash Central/Obj/OS/uc/tcpip/IF/Ether/net_if.o 6f51c9c6c00e011b
637 784 7228316763169247 C:/git_work/changer/Flash Central/Obj/OS/uc/os_ii/source/os_tmr.o f1db4603335720df
570 814 7228316763458280 C:/git_work/changer/Flash Central/Obj/OS/uc/tcpip/NIC/ETHER/LPC2368/net_nic.o ba0492dbecf5f9e6
743 915 7228316764464909 C:/git_work/changer/Flash Central/Obj/OS/uc/tcpip/NIC/ETHER/PHY/KS8721BL/net_phy.o 408c455214e949d8
793 938 7228316764624391 C:/git_work/changer/Flash Central/Obj/OS/uc/tcpip/Source/net.o edf8360310400faf
692 1050 7228316765820402 C:/git_work/changer/Flash Central/Obj/OS/uc/tcpip/OS/net_os.o 80ee4b4b48dc0dc0
924 1083 7228316766159250 C:/git_work/changer/Flash Central/Obj/OS/uc/tcpip/Source/net_ascii.o 2541012a941e11fe
946 1118 7228316766488150 C:/git_work/changer/Flash Central/Obj/OS/uc/tcpip/Source/net_bsd.o 472031e4e720823c
822 1221 7228316767504751 C:/git_work/changer/Flash Central/Obj/OS/uc/tcpip/Source/net_arp.o 2e68203d5e2b1df0
1092 1248 7228316767733981 C:/git_work/changer/Flash Central/Obj/OS/uc/tcpip/Source/net_dbg.o 923173485dfc516d
1126 1268 7228316767913404 C:/git_work/changer/Flash Central/Obj/OS/uc/tcpip/Source/net_err.o fef0b928ece8f5cf
1058 1317 7228316768501416 C:/git_work/changer/Flash Central/Obj/OS/uc/tcpip/Source/net_buf.o c9a7835a43feffe1
1256 1388 7228316769209055 C:/git_work/changer/Flash Central/Obj/OS/uc/tcpip/Source/net_ctr.o 6622540a93213aea
1324 1480 7228316770125974 C:/git_work/changer/Flash Central/Obj/OS/uc/tcpip/Source/net_stat.o 6fc85446e1b3d26f
1276 1597 7228316771262173 C:/git_work/changer/Flash Central/Obj/OS/uc/tcpip/Source/net_icmp.o 344be9d0ee888966
1229 1624 7228316771381775 C:/git_work/changer/Flash Central/Obj/OS/uc/tcpip/Source/net_conn.o bd8fac43dedaa2f5
1607 1836 7228316773674108 C:/git_work/changer/Flash Central/Obj/OS/uc/tcpip/Source/net_udp.o 2b0eb8b3a904d7c9
1846 1992 7228316775228928 C:/git_work/changer/Flash Central/Obj/OS/uc/tcpip/Source/net_tmr.o 23688ad2f7f97304
2001 2169 7228316777012940 C:/git_work/changer/Flash Central/Obj/OS/uc/tcpip/Source/net_util.o 3af1c0506de21cb9
1396 2202 7228316777192342 C:/git_work/changer/Flash Central/Obj/OS/uc/tcpip/Source/net_sock.o dc0ae32596a62d4f
1633 2251 7228316777780375 C:/git_work/changer/Flash Central/Obj/OS/uc/tcpip/Source/net_ip.o f39a0e3335de3693
2179 2410 7228316779394993 C:/git_work/changer/Flash Central/Obj/PROJECT/app/console_cmd.o 998df3e74602ba8b
2212 2464 7228316779923231 C:/git_work/changer/Flash Central/Obj/PROJECT/app/ftp_app.o 64b700bbd2c03951
2417 2601 7228316781318539 C:/git_work/changer/Flash Central/Obj/PROJECT/app/control.o 7ee20ae618f26491
2261 2686 7228316782136545 C:/git_work/changer/Flash Central/Obj/PROJECT/app/app_serv.o 70dfddae0bd81798
2471 2723 7228316782544435 C:/git_work/changer/Flash Central/Obj/PROJECT/app/host_app.o 3971033472d31b2a
2733 2940 7228316784717199 C:/git_work/changer/Flash Central/Obj/PROJECT/drivers/fram/fram.o 113d6eb58e224337
2697 2970 7228316784886603 C:/git_work/changer/Flash Central/Obj/PROJECT/app/journal.o e8e0e240fbbb67cb
2610 3031 7228316785524468 C:/git_work/changer/Flash Central/Obj/PROJECT/data/datadesc.o 9b01176d80d02290
1488 3092 7228316786102537 C:/git_work/changer/Flash Central/Obj/OS/uc/tcpip/Source/net_tcp.o 8a558a1e41409c68
2952 3118 7228316786391571 C:/git_work/changer/Flash Central/Obj/PROJECT/drivers/fram/spi.o 464a1e0d9671d457
2980 3239 7228316787707185 C:/git_work/changer/Flash Central/Obj/PROJECT/drivers/keyboard/keyboard.o 409da500dd14288e
3040 3399 7228316789291869 C:/git_work/changer/Flash Central/Obj/PROJECT/app/modem_task.o f6e1928d889752a8
3101 3429 7228316789531068 C:/git_work/changer/Flash Central/Obj/PROJECT/data/data.o b0165c74cc3d7b7b
3247 3445 7228316789620784 C:/git_work/changer/Flash Central/Obj/PROJECT/drivers/ccnet/uart1.o 57bea9975b94990f
3125 3471 7228316789630743 C:/git_work/changer/Flash Central/Obj/PROJECT/drivers/ccnet/CCRSProtocol.o 5eeb979cb334a809
3478 3494 7228316790348346 C:/git_work/changer/Flash Central/Obj/OS/uc/tcpip/Ports/ARM/IAR/net_util_a.o 5dd9694a91b78f88
3498 3517 7228316790577581 C:/git_work/changer/Flash Central/Obj/OS/uc/os_ii/port/os_cpu_a.o d559803dd97aa27c
3518 3538 7228316790786875 C:/git_work/changer/Flash Central/Obj/OS/uc/cpu/cpu_a.o e0d905f27730677
3409 3690 7228316792202138 C:/git_work/changer/Flash Central/Obj/PROJECT/drivers/fiscal/uart0.o 2bcf1b94d9f0887a
3453 3737 7228316792650644 C:/git_work/changer/Flash Central/Obj/PROJECT/drivers/lcd/lcd.o b7eb8d8f946b05d3
3540 3765 7228316792879869 C:/git_work/changer/Flash Central/Obj/OS/app/app.o c085c6294847b475
3440 3828 7228316793587508 C:/git_work/changer/Flash Central/Obj/PROJECT/drivers/fiscal/fiscal.o 27e694b350969472
3699 3866 7228316793996145 C:/git_work/changer/Flash Central/Obj/OS/uc/lib/lib_str.o a4c1cc64434f61db
3874 3951 7228316794843332 C:/git_work/changer/Flash Central/Obj/OS/uc/lib/lib_mem.o 1f7360034352703a
3775 3994 7228316795232007 C:/git_work/changer/Flash Central/Obj/OS/bsp/net_bsp.o 7e4774cc1738f6
3959 4030 7228316795640638 C:/git_work/changer/Flash Central/Obj/PROJECT/libs/crc16.o 1d489d35f420817f
3836 4059 7228316795810075 C:/git_work/changer/Flash Central/Obj/OS/bsp/net_isr.o 61e29d67d64db210
3748 4070 7228316795839968 C:/git_work/changer/Flash Central/Obj/OS/bsp/bsp.o 8f10f35599fa05f0
4001 4240 7228316797733640 C:/git_work/changer/Flash Central/Obj/PROJECT/libs/lpc23xx-iap.o ff06b897267f6f42
4078 4268 7228316797833313 C:/git_work/changer/Flash Central/Obj/PROJECT/services/mode.o 56b6110f71c09eef
4066 4325 7228316798521028 C:/git_work/changer/Flash Central/Obj/PROJECT/services/ftp_client.o 87c19e1c000e5cf3
4040 4368 7228316798979463 C:/git_work/changer/Flash Central/Obj/PROJECT/drivers/modem/modem.o 4c160b84248089b7
4279 4490 7228316800185429 C:/git_work/changer/Flash Central/Obj/PROJECT/drivers/modem/uart2.o 844912c0c53f754e
4249 4515 7228316800354869 C:/git_work/changer/Flash Central/Obj/PROJECT/services/console.o beb91e6a1e8639c4
4376 4620 7228316801501052 C:/git_work/changer/Flash Central/Obj/PROJECT/services/coin.o d39b383b58e26412
4334 4680 7228316802118969 C:/git_work/changer/Flash Central/Obj/PROJECT/menu/menudesc.o ee271ecfcc1942af
4628 4806 7228316803354834 C:/git_work/changer/Flash Central/Obj/PROJECT/services/time.o 925c9712ad067a2a
4498 4826 7228316803564156 C:/git_work/changer/Flash Central/Obj/PROJECT/services/fr.o 37aedeb60791bc53
4522 4899 7228316804281745 C:/git_work/changer/Flash Central/Obj/PROJECT/menu/menu.o 9bcc3e7a2c485c99
4689 4916 7228316804381418 C:/git_work/changer/Flash Central/Obj/PROJECT/services/validator.o 6f78c2fd9ee6de19
4924 5261 7228316807983112 C:/git_work/changer/Flash Central/Exe/version0_14.out_nochecksum 9e99cda6790a8ea4
4924 5261 7228316807983112 C:/git_work/changer/Flash Central/List/version0_14.map 9e99cda6790a8ea4
5282 5295 7228316808362544 C:/git_work/changer/Flash Central/Exe/version0_14.out 68c091af4bb16129
5298 5341 7228316808824087 C:/git_work/changer/Flash Central/Exe/changer0_31.hex 838eddf0ca73c802

7951
Flash Central/Exe/changer0_31.hex
View File

File diff suppressed because it is too large Load Diff

BIN
Flash Central/Exe/version0_14.out_nochecksum
View File

Binary file not shown.

10
PROJECT/app/app_serv.c
View File

@ -306,14 +306,14 @@ void UserAppTask(void *p_arg)
// если не по кнопке - на каждом внесении проверяем необходимость выдачи жетонов
// тайм аут убрали - выдаем сразу
if(MoneyIn && !hopperStartButton /*&& (labs(OSTimeGet() - coin_out_timestamp) > 1000UL)*/)
{
//if(MoneyIn && !hopperStartButton /*&& (labs(OSTimeGet() - coin_out_timestamp) > 1000UL)*/)
/*{
if(accmoney >= HopperCost) // если конечно набрали денег на жетон
{
PostUserEvent(EVENT_GIVE_COIN);
MoneyIn = 0;
}
}
}*/
}
// принимаем деньги
@ -372,6 +372,8 @@ void UserAppTask(void *p_arg)
money = cpp * GetResetCoinCount();// + testMoney;
if(money == 0) break;
accmoney = GetAcceptedMoney();
accmoney += money;
SetAcceptedMoney(accmoney);
@ -451,6 +453,8 @@ void UserAppTask(void *p_arg)
money = cpp * GetResetbankCount();// + testMoney;
if(money == 0) break;
accmoney = GetAcceptedBankMoney();
accmoney += money;
SetAcceptedBankMoney(accmoney);

4
PROJECT/services/coin.c
View File

@ -209,7 +209,7 @@ void CoinTask(void *p_arg)
if (enable_coin && GetCoinCount())
{
PostUserEvent(EVENT_COIN_INSERTED);
//PostUserEvent(EVENT_COIN_INSERTED);
}
else
{
@ -266,7 +266,7 @@ void CoinTask(void *p_arg)
if (bank_enable && GetbankCount())
{
PostUserEvent(EVENT_BANK_INSERTED);
//PostUserEvent(EVENT_BANK_INSERTED);
}
else
{

40
settings/sk-mlpc2368.wsdt
View File

File diff suppressed because one or more lines are too long

2294
sk-mlpc2368.dep
View File

File diff suppressed because it is too large Load Diff