OSDN > Pesquisar Software > System > Embedded systems > ChibiOS > SCM > SVN > Commit

ChibiOS Donation

R/O
SSH
HTTPS

chibios: Commit

Commit MetaInfo

Revisão	2915 (tree)
Hora	2011-05-03 02:52:13
Autor	junior-q

Mensagem de Log

update test 338fx

Mudança Sumário

modified: branches/fujitsu_dev/boards/DEMO_338FX_GEN/board.h (diff)
modified: branches/fujitsu_dev/demos/16FX_MB96F338_FCC907/chdemo/Debug/ABS/chdemo.abs (diff)
modified: branches/fujitsu_dev/demos/16FX_MB96F338_FCC907/chdemo/Debug/ABS/chdemo.mhx (diff)
modified: branches/fujitsu_dev/demos/16FX_MB96F338_FCC907/chdemo/chdemo.wsp (diff)
modified: branches/fujitsu_dev/demos/16FX_MB96F338_FCC907/appboard.c (diff)
modified: branches/fujitsu_dev/demos/16FX_MB96F338_FCC907/demo.PO (diff)
modified: branches/fujitsu_dev/demos/16FX_MB96F338_FCC907/demo.WK3 (diff)
modified: branches/fujitsu_dev/demos/16FX_MB96F338_FCC907/main.c (diff)

Diff

--- branches/fujitsu_dev/boards/DEMO_338FX_GEN/board.h (revision 2914)

+++ branches/fujitsu_dev/boards/DEMO_338FX_GEN/board.h (revision 2915)

		@@ -35,9 +35,9 @@
35	35	#define CRYSTAL_FREQ 4000000.0 // quarzo da 4M
36	36	#define CRYSTAL_SUBFRQ 32768.0 // quarzo subclock da 32768Hz
37	37
38		-#define SYSTEM_FREQ 56000000.0 // frequenza di sistema con PLL=6x
39		-#define CLKP1_FREQ 56000000.0 // frequenza periferal clock CLKP1
40		-#define CLKP2_FREQ 14000000.0 // frequenza periferal clock CLKP2 -> usato per CAN & soundgen
	38	+#define SYSTEM_FREQ 48000000.0 // frequenza di sistema con PLL=6x
	39	+#define CLKP1_FREQ 16000000.0 // frequenza periferal clock CLKP1
	40	+#define CLKP2_FREQ 16000000.0 // frequenza periferal clock CLKP2 -> usato per CAN & soundgen
41	41
42	42
43	43	/*

		@@ -44,9 +44,10 @@
44	44	* Pin definitions for the board.
45	45	*/
46	46
47		-#define PinLED_LIFE PDR00_P0
48		-#define PinLED_SLOW_PLC PDR00_P1
49		-#define PinLED_FAST_PLC PDR00_P2
	47	+#define PinLED_LIFE PDR09_P3
	48	+#define PinLED_SLOW_PLC PDR09_P1
	49	+#define PinLED_FAST_PLC PDR09_P2
	50	+#define PinLED_WDOG PDR09_P7
50	51
51	52
52	53	/*

--- branches/fujitsu_dev/demos/16FX_MB96F338_FCC907/appboard.c (revision 2914)

+++ branches/fujitsu_dev/demos/16FX_MB96F338_FCC907/appboard.c (revision 2915)

		@@ -54,13 +54,13 @@
54	54	TMCSR0 = 0x181b; // seleziona clk = clkp1 / 32
55	55
56	56	irq = 56; /* RLT0 */
57		- ICR = (irq << 8) \| 0x02; // livello irq = 2
	57	+// ICR = (irq << 8) \| 0x02; // livello irq = 2
58	58
59	59	TMRLR1 = uSEC_TO_RELTIM1(20000);
60	60	TMCSR1 = 0x181b; // seleziona clk = clkp1 / 32
61	61
62	62	irq = 57; /* RLT1 */
63		- ICR = (irq << 8) \| 0x02;
	63	+// ICR = (irq << 8) \| 0x02;
64	64
65	65
66	66	/* init reload timer 2 & 3 per treno impulsi stepper

		@@ -69,13 +69,13 @@
69	69	TMCSR2 = 0x041b; // seleziona clk = clkp1 / 16
70	70
71	71	irq = 58; /* RLT2 */
72		- ICR = (irq << 8) \| 0x02; // livello irq = 2
	72	+// ICR = (irq << 8) \| 0x02; // livello irq = 2
73	73
74	74	TMRLR3 = uSEC_TO_RELTIM3(10000);
75	75	TMCSR3 = 0x041b; // seleziona clk = clkp1 / 16
76	76
77	77	irq = 59; /* RLT3 */
78		- ICR = (irq << 8) \| 0x02;
	78	+// ICR = (irq << 8) \| 0x02;
79	79
80	80
81	81	/* init reload timer 6 come tick di sistema

		@@ -89,10 +89,10 @@
89	89	/* init uart1 interrupt levels
90	90	*/
91	91	irq = 96; /* UART1_RX */
92		- ICR = (irq << 8) \| CH_IRQ_PRIORITY; // livello irq = come richiesto
	92	+// ICR = (irq << 8) \| CH_IRQ_PRIORITY; // livello irq = come richiesto
93	93
94	94	irq = 97; /* UART1_TX */
95		- ICR = (irq << 8) \| CH_IRQ_PRIORITY; // livello irq = come richiesto
	95	+// ICR = (irq << 8) \| CH_IRQ_PRIORITY; // livello irq = come richiesto
96	96
97	97
98	98	/*

		@@ -128,10 +128,10 @@
128	128	P07 -> AD7
129	129	*/
130	130	/* Data register (0000-0000) */
131		- PDR00 = 0x00;
	131	+ PDR00 = 0xFF;
132	132
133		- /* Direction register (0000-0000) */
134		- DDR00 = 0x00;
	133	+ /* Direction register (1111-1111) */
	134	+ DDR00 = 0xFF;
135	135
136	136	/* Input enable register (1111-1111) */
137	137	PIER00 = 0xFF;

		@@ -150,10 +150,47 @@
150	150
151	151	/* Pull-up register (0000-0000) */
152	152	PUCR00 = 0x00;
153		-
154		- EBAE0 = 0xFF; // abilita l'uso di P00-P07 come AD00-AD07
	153	+
	154	+//EBAE0 = 0xFF; // abilita l'uso di P00-P07 come AD00-AD07
155	155
	156	+ // ************** PORT 9 *********************
	157	+ // gpio
	158	+ /*
	159	+ P00 -> AD0
	160	+ P01 -> AD1
	161	+ P02 -> AD2
	162	+ P03 -> AD3
	163	+ P04 -> AD4
	164	+ P05 -> AD5
	165	+ P06 -> AD6
	166	+ P07 -> AD7
	167	+ */
	168	+ /* Data register (0000-0000) */
	169	+ PDR09 = 0xFF;
156	170
	171	+ /* Direction register (1111-1111) */
	172	+ DDR09 = 0xFF;
	173	+
	174	+ /* Input enable register (1111-1111) */
	175	+ PIER09 = 0xFF;
	176	+
	177	+ /* Input level register (0000-0000) */
	178	+ PILR09 = 0x00;
	179	+
	180	+ /* Extended Input level register (1111-1111) tutti in pin a livello TTL */
	181	+ EPILR09 = 0xFF;
	182	+
	183	+ /* Output drive register (0000-0000) -> tutti in normal drive */
	184	+ PODR09 = 0x00;
	185	+
	186	+ /* High drive register (0000-0000) -> tutti in no-high drive */
	187	+// PHDR00 = 0x00;
	188	+
	189	+ /* Pull-up register (0000-0000) */
	190	+ PUCR09 = 0x00;
	191	+
	192	+ return;
	193	+
157	194	// ************** PORT 1 *********************
158	195
159	196	// address/data bus

--- branches/fujitsu_dev/demos/16FX_MB96F338_FCC907/main.c (revision 2914)

+++ branches/fujitsu_dev/demos/16FX_MB96F338_FCC907/main.c (revision 2915)

		@@ -30,7 +30,6 @@
30	30
31	31	#include "appboard.h"
32	32
33		-
34	33	/*
35	34	* Red LEDs blinker thread, times are in milliseconds.
36	35	*/

		@@ -51,7 +50,9 @@
51	50
52	51	int delayval;
53	52
	53	+int plcSlowRun;
54	54
	55	+
55	56	static msg_t ThreadSlowPLC(void *arg);
56	57	static msg_t ThreadFastPLC(void *arg);
57	58	static msg_t ThreadWatchdog(void *arg);

		@@ -85,18 +86,18 @@
85	86	* Activates the serial driver 1 using the driver default configuration.
86	87	*/
87	88
88		- sdStart(&SD1, NULL);
	89	+// sdStart(&SD1, NULL);
89	90
90	91	/*
91	92	* Creates the plc thread.
92	93	*/
	94	+
	95	+// TestThread(&SD1);
	96	+
93	97	chThdCreateStatic(waThreadSlowPLC, sizeof(waThreadSlowPLC), NORMALPRIO+4, ThreadSlowPLC, NULL);
94	98	chThdCreateStatic(waThreadFastPLC, sizeof(waThreadFastPLC), NORMALPRIO+10, ThreadFastPLC, NULL);
95	99	chThdCreateStatic(waThreadWatchDog, sizeof(waThreadWatchDog), HIGHPRIO, ThreadWatchdog, NULL);
96	100
97		-
98		- TestThread(&SD1);
99		-
100	101	/*
101	102	* Normal main() thread activity, in this demo it does nothing except
102	103	* sleeping in a loop.

		@@ -103,11 +104,14 @@
103	104	*/
104	105	while (TRUE)
105	106	{
106		- PinLED_LIFE = 1;
	107	+// PinLED_LIFE = 1;
107	108
	109	+ PDR00++;
	110	+
108	111	chThdSleepMilliseconds(250);
109	112
110		- PinLED_LIFE = 0;
	113	+ PDR00++;
	114	+// PinLED_LIFE = 0;
111	115
112	116	chThdSleepMilliseconds(500);
113	117	}

		@@ -116,16 +120,52 @@
116	120	return 0;
117	121	}
118	122
	123	+static msg_t ThreadDigInp(void *arg)
	124	+{
	125	+int exit = 0;
	126	+int blinkDelay = 0;
119	127
	128	+}
	129	+
	130	+
120	131	static msg_t ThreadSlowPLC(void *arg)
121	132	{
122	133	int exit = 0;
	134	+int blinkDelay = 0;
123	135
124	136	while( !exit )
125	137	{
126		- chThdSleepMilliseconds(50);
127	138
128		- totCicliSlow++;
	139	+ if( plcSlowRun == 0x5544 )
	140	+ {
	141	+
	142	+ blinkDelay++;
	143	+
	144	+ if( blinkDelay >= 10 )
	145	+ {
	146	+ blinkDelay = 0;
	147	+ PinLED_SLOW_PLC = !PinLED_SLOW_PLC;
	148	+ }
	149	+
	150	+ chThdSleepMilliseconds(50);
	151	+
	152	+ totCicliSlow++;
	153	+
	154	+ while( totCicliSlow == 200 )
	155	+ {
	156	+ blinkDelay++;
	157	+
	158	+ if( blinkDelay >= 10000 )
	159	+ {
	160	+ blinkDelay = 0;
	161	+ PinLED_SLOW_PLC = !PinLED_SLOW_PLC;
	162	+ }
	163	+ }
	164	+ }
	165	+ else
	166	+ {
	167	+ chThdSleepMilliseconds(1000);
	168	+ }
129	169	}
130	170
131	171	return 0;

		@@ -135,12 +175,33 @@
135	175
136	176	static msg_t ThreadFastPLC(void *arg)
137	177	{
	178	+int blinkDelay = 0;
138	179
139	180	while( TRUE )
140	181	{
	182	+ blinkDelay++;
	183	+
	184	+ if( blinkDelay >= 10 )
	185	+ {
	186	+ blinkDelay = 0;
	187	+ PinLED_FAST_PLC = !PinLED_FAST_PLC;
	188	+ }
	189	+
141	190	chThdSleepMilliseconds(10);
142	191
143	192	totCicliFast++;
	193	+
	194	+ while( totCicliFast == 600 )
	195	+ {
	196	+ blinkDelay++;
	197	+
	198	+ if( blinkDelay >= 10000 )
	199	+ {
	200	+ blinkDelay = 0;
	201	+ PinLED_FAST_PLC = !PinLED_FAST_PLC;
	202	+ }
	203	+ }
	204	+
144	205	}
145	206	return 0;
146	207	}

		@@ -150,11 +211,70 @@
150	211	{
151	212	long WatchTheDog;
152	213
	214	+long precCicliSlow;
	215	+long precCicliFast;
	216	+
	217	+int statoCheck = 0;
	218	+int delayWdt;
	219	+
	220	+ precCicliSlow = totCicliSlow;
	221	+ precCicliFast = totCicliFast;
	222	+
153	223	for(;;)
154	224	{
	225	+
	226	+
	227	+ switch( statoCheck )
	228	+ {
	229	+ case 0:
	230	+ if( (precCicliSlow == totCicliSlow) \|\|
	231	+ (precCicliFast == totCicliFast) )
	232	+ {
	233	+ statoCheck++;
	234	+ }
	235	+ else
	236	+ {
	237	+ precCicliSlow = totCicliSlow;
	238	+ precCicliFast = totCicliFast;
	239	+ }
	240	+ break;
	241	+
	242	+ case 1:
	243	+ if( (precCicliSlow == totCicliSlow) \|\|
	244	+ (precCicliFast == totCicliFast) )
	245	+ {
	246	+ statoCheck++;
	247	+ delayWdt = 0;
	248	+ }
	249	+ else
	250	+ {
	251	+ precCicliSlow = totCicliSlow;
	252	+ precCicliFast = totCicliFast;
	253	+ statoCheck = 0;
	254	+ }
	255	+ break;
	256	+
	257	+ case 2:
	258	+
	259	+ delayWdt++;
	260	+
	261	+ if( delayWdt >= 20 )
	262	+ {
	263	+ totCicliSlow = 1;
	264	+ totCicliFast = 1;
	265	+
	266	+ precCicliSlow = totCicliSlow;
	267	+ precCicliFast = totCicliFast;
	268	+
	269	+ statoCheck = 0;
	270	+ }
	271	+ break;
	272	+ }
	273	+
155	274	/** Trigger the watchdog every 200 msec **/
156	275	// WDTC_WTE = 0;
157	276
	277	+ PinLED_WDOG = !PinLED_WDOG;
158	278	WatchTheDog++;
159	279
160	280	chThdSleepMilliseconds(200);

Show on old repository browser