diff --git a/PROJECT/services/coin.c b/PROJECT/services/coin.c index 06bdd61..de56f2d 100644 --- a/PROJECT/services/coin.c +++ b/PROJECT/services/coin.c @@ -29,7 +29,7 @@ void SetCashPulseParam(CPU_INT32U pulse, CPU_INT32U pause, CPU_INT32U post) OS_CPU_SR cpu_sr = 0; #endif OS_ENTER_CRITICAL(); - cash_pulse[post] = pulse * 10; + cash_pulse[post] = pulse * 1; cash_pause[post] = pause; OS_EXIT_CRITICAL(); } @@ -40,7 +40,7 @@ void SetSignalPulseParam(CPU_INT32U pulse, CPU_INT32U post) OS_CPU_SR cpu_sr = 0; #endif OS_ENTER_CRITICAL(); - signal_pulse[post] = pulse * 200; + signal_pulse[post] = pulse * 1000; OS_EXIT_CRITICAL(); } @@ -765,7 +765,7 @@ extern CPU_INT32U BSP_CPU_PclkFreq (CPU_INT08U pclk); // инициализация импульсных входов void InitImpInput (void) { - #define INPUT_CAPTURE_FREQ 10000 // частота тактирования частотных входов + #define INPUT_CAPTURE_FREQ 1000 // частота тактирования частотных входов CPU_INT32U pclk_freq; CPU_INT32U rld_cnts; diff --git a/PROJECT/services/coin.h b/PROJECT/services/coin.h index a2a83ff..60a9ba6 100644 --- a/PROJECT/services/coin.h +++ b/PROJECT/services/coin.h @@ -1,11 +1,11 @@ #ifndef _COIN_H_ #define _COIN_H_ -#define COIN_IMP_MIN_LEN 220 // мс/10 -#define COIN_IMP_MAX_LEN 900 // мс/10 +#define COIN_IMP_MIN_LEN 22 // мс/1 +#define COIN_IMP_MAX_LEN 90 // мс/1 // запас измерения периода, плюс-минус -#define COIN_IMP_SPAN 100 // мс/10 +#define COIN_IMP_SPAN 10 // мс/1 extern void InitCoin(void); extern CPU_INT32U GetCoinCount(int index); diff --git a/settings/sk-mlpc2368.wsdt b/settings/sk-mlpc2368.wsdt index f0cd78d..2106c4d 100644 --- a/settings/sk-mlpc2368.wsdt +++ b/settings/sk-mlpc2368.wsdt @@ -52,7 +52,7 @@ - TextEditor$WS_DIR$\PROJECT\menu\menu.h04814241424TextEditor$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\cpu\cpu.h08545784589TextEditor$WS_DIR$\OS\uc\lib\lib_def.h011159735981TextEditor$WS_DIR$\PROJECT\data\fram_map.h020665665TextEditor$WS_DIR$\PROJECT\app\app_serv.h03115361564TextEditor$WS_DIR$\PROJECT\app\journal.c03901170811708TextEditor$WS_DIR$\PROJECT\services\time.c081625625TextEditor$WS_DIR$\PROJECT\data\datadesc.c08283803938039TextEditor$WS_DIR$\PROJECT\app\journal.h03930573070TextEditor$WS_DIR$\PROJECT\menu\menudesc.c015136099960999TextEditor$WS_DIR$\PROJECT\data\data.h07316181618TextEditor$WS_DIR$\PROJECT\data\data.c034494269426TextEditor$WS_DIR$\PROJECT\services\coin.h00800806TextEditor$WS_DIR$\PROJECT\services\coin.c03319440944016TextEditor$WS_DIR$\PROJECT\app\app_serv.c025175117511TextEditor$WS_DIR$\PROJECT\data\datadesc.h012645634563TextEditor$WS_DIR$\OS\app\app.c02811311131TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c015137963796TextEditor$WS_DIR$\PROJECT\services\fr.c010402708627086TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.h012575157517TextEditor$WS_DIR$\OS\bsp\iolpc2368.h078716986169860100000010000001 + TextEditor$WS_DIR$\PROJECT\menu\menu.h04814241424TextEditor$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\cpu\cpu.h08545784589TextEditor$WS_DIR$\OS\uc\lib\lib_def.h011159735981TextEditor$WS_DIR$\PROJECT\data\fram_map.h020665665TextEditor$WS_DIR$\PROJECT\app\app_serv.h03115361564TextEditor$WS_DIR$\PROJECT\app\journal.c03901170811708TextEditor$WS_DIR$\PROJECT\services\time.c081625625TextEditor$WS_DIR$\PROJECT\data\datadesc.c03961602516025TextEditor$WS_DIR$\PROJECT\app\journal.h03930573070TextEditor$WS_DIR$\PROJECT\menu\menudesc.c014136099960999TextEditor$WS_DIR$\PROJECT\data\data.h07316181618TextEditor$WS_DIR$\PROJECT\data\data.c034494269426TextEditor$WS_DIR$\PROJECT\services\coin.h007070TextEditor$WS_DIR$\PROJECT\services\coin.c0421870187016TextEditor$WS_DIR$\PROJECT\app\app_serv.c025175117511TextEditor$WS_DIR$\PROJECT\data\datadesc.h012645634563TextEditor$WS_DIR$\OS\app\app.c02811311131TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c015137963796TextEditor$WS_DIR$\PROJECT\services\fr.c010402708627086TextEditor$WS_DIR$\PROJECT\drivers\fiscal\fiscal.h012575157517TextEditor$WS_DIR$\OS\bsp\iolpc2368.h078716986169860100000010000001