mirror of
https://github.com/dimoniche/solarium.git
synced 2026-01-30 09:53:30 +03:00
на платах, которые давно в использовании, иногда выгорает нога контроллера MK_P9.
P0.23 MK_P9 IMPULSE OUTPUT (импульсный выход монетоприемника) И надо в программе MK_P9 заменить на P0.25 MK_P7 А мы на плате замкнем эти 2 ноги, одна из которых итак не работает.
This commit is contained in:
parent
067e029937
commit
0879180e90
@ -97,10 +97,10 @@ P1.19 MK_P33
|
|||||||
FIO1MASK_bit.P1_31 = 0;
|
FIO1MASK_bit.P1_31 = 0;
|
||||||
|
|
||||||
// 4
|
// 4
|
||||||
PINSEL1_bit.P0_25 = 0x0;
|
/*PINSEL1_bit.P0_25 = 0x0;
|
||||||
PINMODE1_bit.P0_25 = 0;
|
PINMODE1_bit.P0_25 = 0;
|
||||||
FIO0DIR_bit.P0_25 = 0;
|
FIO0DIR_bit.P0_25 = 0;
|
||||||
FIO0MASK_bit.P0_25 = 0;
|
FIO0MASK_bit.P0_25 = 0;*/
|
||||||
|
|
||||||
// 5
|
// 5
|
||||||
PINSEL3_bit.P1_24 = 0x0;
|
PINSEL3_bit.P1_24 = 0x0;
|
||||||
@ -184,7 +184,7 @@ void KbrdTask(void *p_arg)
|
|||||||
if (!FIO1PIN_bit.P1_25) state |= (1UL << KEY_DEFERRED_CH1);
|
if (!FIO1PIN_bit.P1_25) state |= (1UL << KEY_DEFERRED_CH1);
|
||||||
if (!FIO1PIN_bit.P1_23) state |= (1UL << KEY_DEFERRED_CH2);
|
if (!FIO1PIN_bit.P1_23) state |= (1UL << KEY_DEFERRED_CH2);
|
||||||
if (!FIO1PIN_bit.P1_31) state |= (1UL << KEY_DEFERRED_CH3);
|
if (!FIO1PIN_bit.P1_31) state |= (1UL << KEY_DEFERRED_CH3);
|
||||||
if (!FIO0PIN_bit.P0_25) state |= (1UL << KEY_DEFERRED_CH4);
|
//if (!FIO0PIN_bit.P0_25) state |= (1UL << KEY_DEFERRED_CH4);
|
||||||
if (!FIO1PIN_bit.P1_24) state |= (1UL << KEY_DEFERRED_CH5);
|
if (!FIO1PIN_bit.P1_24) state |= (1UL << KEY_DEFERRED_CH5);
|
||||||
if (!FIO0PIN_bit.P0_26) state |= (1UL << KEY_DEFERRED_CH6);
|
if (!FIO0PIN_bit.P0_26) state |= (1UL << KEY_DEFERRED_CH6);
|
||||||
if (!FIO1PIN_bit.P1_29) state |= (1UL << KEY_DEFERRED_CH7);
|
if (!FIO1PIN_bit.P1_29) state |= (1UL << KEY_DEFERRED_CH7);
|
||||||
|
|||||||
Binary file not shown.
@ -103,7 +103,7 @@ void InputCapture_ISR(void)
|
|||||||
if (ir & 0x10)
|
if (ir & 0x10)
|
||||||
{// CR0 interrupt
|
{// CR0 interrupt
|
||||||
|
|
||||||
if (FIO0PIN_bit.P0_23)
|
if (FIO0PIN_bit.P0_25)
|
||||||
{// ïðèøåë çàäíèé ôðîíò
|
{// ïðèøåë çàäíèé ôðîíò
|
||||||
CPU_INT32U cr=T3CR0;
|
CPU_INT32U cr=T3CR0;
|
||||||
if (((cr-period) > COIN_IMP_MIN_LEN)
|
if (((cr-period) > COIN_IMP_MIN_LEN)
|
||||||
@ -121,7 +121,7 @@ void InputCapture_ISR(void)
|
|||||||
extern CPU_INT32U BSP_CPU_PclkFreq (CPU_INT08U pclk);
|
extern CPU_INT32U BSP_CPU_PclkFreq (CPU_INT08U pclk);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
P0.23 MK_P9 IMPULSE OUTPUT (èìïóëüñíûé âûõîä ìîíåòîïğèåìíèêà)
|
P0.23 MK_P9 IMPULSE OUTPUT (èìïóëüñíûé âûõîä ìîíåòîïğèåìíèêà) -> P0.25 MK_P7
|
||||||
P0.24 MK_P8 INHIBIT (áëîêèðîâêà)
|
P0.24 MK_P8 INHIBIT (áëîêèðîâêà)
|
||||||
*/
|
*/
|
||||||
// èíèöèàëèçàöèÿ èìïóëüñíîãî âõîäà
|
// èíèöèàëèçàöèÿ èìïóëüñíîãî âõîäà
|
||||||
@ -142,10 +142,10 @@ void InitImpInput (void)
|
|||||||
PCONP_bit.PCTIM3 = 1;
|
PCONP_bit.PCTIM3 = 1;
|
||||||
PCLKSEL1_bit.PCLK_TIMER3 = 2;
|
PCLKSEL1_bit.PCLK_TIMER3 = 2;
|
||||||
|
|
||||||
PINSEL1_bit.P0_23 = 0x3;
|
PINSEL1_bit.P0_25 = 0x3;
|
||||||
PINMODE1_bit.P0_23 = 0;
|
PINMODE1_bit.P0_25 = 0;
|
||||||
FIO0DIR_bit.P0_23 = 0;
|
FIO0DIR_bit.P0_25 = 0;
|
||||||
FIO0MASK_bit.P0_23 = 0;
|
FIO0MASK_bit.P0_25 = 0;
|
||||||
|
|
||||||
// inhibit
|
// inhibit
|
||||||
PINSEL1_bit.P0_24 = 0x0;
|
PINSEL1_bit.P0_24 = 0x0;
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
1308
solarium.dep
1308
solarium.dep
File diff suppressed because it is too large
Load Diff
@ -650,7 +650,7 @@
|
|||||||
</option>
|
</option>
|
||||||
<option>
|
<option>
|
||||||
<name>OOCOutputFile</name>
|
<name>OOCOutputFile</name>
|
||||||
<state>solarium_3_45.hex</state>
|
<state>solarium_3_46.hex</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
<option>
|
||||||
<name>OOCCommandLineProducer</name>
|
<name>OOCCommandLineProducer</name>
|
||||||
@ -668,7 +668,7 @@
|
|||||||
<data>
|
<data>
|
||||||
<extensions></extensions>
|
<extensions></extensions>
|
||||||
<cmdline></cmdline>
|
<cmdline></cmdline>
|
||||||
<hasPrio>1</hasPrio>
|
<hasPrio>224</hasPrio>
|
||||||
<buildSequence>inputOutputBased</buildSequence>
|
<buildSequence>inputOutputBased</buildSequence>
|
||||||
</data>
|
</data>
|
||||||
</settings>
|
</settings>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user