Firenet

Check-in [102039b6fa]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Update for move
Timelines: family | ancestors | descendants | both | NEWNET
Files: files | file ages | folders
SHA1:102039b6fa3c27a80c5f79971b04de29538ac907
User & Date: jim 2013-03-29 12:50:39
Context
2013-12-01
10:43
Update with capacitor added to firing ckt check-in: afc44e73c5 user: jim tags: NEWNET
2013-03-29
12:50
Update for move check-in: 102039b6fa user: jim tags: NEWNET
2013-02-23
19:35
Update shows for available fireworks check-in: 8985af2dfd user: jim tags: NEWNET
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to Network/Real/real_phy.c.

158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
...
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
	buffer[0] = (char)data;
	rtnval = WritePort(buffer,1,ph);
	
	// Did we get something ?
	
	if( rtnval == 1 )
		rtnval = 0;
	
	// If echo eat it


	//if(real_stat_phy(ph) )
	//{
	//	ReadPort(buffer,1,ph);
	//}
	
	return( rtnval );
}

//*************************************************************************
/*
* int real_stat_phy( void *h )	- Is there data to read ?
*
................................................................................
*	31-Dec-2011 Delete this as hardware in the head end controller will do the
*				tx/RX control [55fd308482]
*/
//************************************************************************

void real_phy_tx( int flag,void *h )
{
	//PORT_HANDLE *ph = (PORT_HANDLE *)h;
	
	// Turn DTR on or OFF
	// NOTE: DTR FLAG = 1	=> XMIT ON -> DTR OFF
	//			 FLAG = 0	=> XMIT OFF -> DTR ON
    
#ifdef RS232_COM
    flag = 0;          // TURN DTR OFF ALWAYS
#endif
	
	if( flag )
	{
		//DTRPort(0,ph);
		//usleep(NET_TX_ON_DLY);		// Delay after ON
	}
	else
	{
		//usleep(NET_TX_OFF_DLY);		// Delay before OFF
		//DTRPort(1,ph);
	}
}







|
<
<
<
<
<
<
<
<







 







<
|
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
158
159
160
161
162
163
164
165








166
167
168
169
170
171
172
...
228
229
230
231
232
233
234

235



















	buffer[0] = (char)data;
	rtnval = WritePort(buffer,1,ph);
	
	// Did we get something ?
	
	if( rtnval == 1 )
		rtnval = 0;
		








	return( rtnval );
}

//*************************************************************************
/*
* int real_stat_phy( void *h )	- Is there data to read ?
*
................................................................................
*	31-Dec-2011 Delete this as hardware in the head end controller will do the
*				tx/RX control [55fd308482]
*/
//************************************************************************

void real_phy_tx( int flag,void *h )
{

}



















Changes to Network/mac.c.

366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
...
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
*/
//************************************************************************

int send_packet_byte( char ch,MAC_HANDLE *mh )
{
	int rtnval = -1;		// Set for failure

	
	// (1) Send it out via PHY 
	
	if( put_phy( ch,mh->h ) == 0 )
	{
		rtnval = 0;
	}
	
................................................................................
//************************************************************************

static int packet_engine( int byte,MAC_HANDLE *mh )
{
	int rtnval = 0;		// No packet
	//int fail = 0;		// No fail
	
	// (0) If we have a header then start up a character
	
	if( byte ==  MSG_HDR )
	{
		// We have winner go to to action
		
		mh->state = TO_PACKET_A;
		mh->len = 0;		// Init for packet run
		mh->cksum = 0;
	}
	else
	{
	
		// (1) Use current state and incomming packet to determine if we
		// continue building packet
		
		switch( mh->state )
		{
			case TO_PACKET_A:		// Must be a digit
									if( isdigit( byte ) )







<







 







|











<







366
367
368
369
370
371
372

373
374
375
376
377
378
379
...
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421

422
423
424
425
426
427
428
*/
//************************************************************************

int send_packet_byte( char ch,MAC_HANDLE *mh )
{
	int rtnval = -1;		// Set for failure


	// (1) Send it out via PHY 
	
	if( put_phy( ch,mh->h ) == 0 )
	{
		rtnval = 0;
	}
	
................................................................................
//************************************************************************

static int packet_engine( int byte,MAC_HANDLE *mh )
{
	int rtnval = 0;		// No packet
	//int fail = 0;		// No fail
	
	// (0) If we have a header then start up a packet
	
	if( byte ==  MSG_HDR )
	{
		// We have winner go to to action
		
		mh->state = TO_PACKET_A;
		mh->len = 0;		// Init for packet run
		mh->cksum = 0;
	}
	else
	{

		// (1) Use current state and incomming packet to determine if we
		// continue building packet
		
		switch( mh->state )
		{
			case TO_PACKET_A:		// Must be a digit
									if( isdigit( byte ) )

Changes to Shows/mariseillaise4.json.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
{
	"show"		:	"La Mariseillaise4",
	"music" 	:	"marseillaise.mp3",
	"time"		:	"1:03",
	"nodes"		:	"4",
	"program" : [
			{ "node" : "1", "ch" : "1" , "delay" : "2480" },
			{ "node" : "2", "ch" : "1" , "delay" : "3563" },
			{ "node" : "3", "ch" : "1" , "delay" : "6242" },
			{ "node" : "4", "ch" : "1" , "delay" : "13315" },
			{ "node" : "1", "ch" : "2" , "delay" : "17122" },
			{ "node" : "2", "ch" : "2" , "delay" : "33305" },
			{ "node" : "3", "ch" : "2" , "delay" : "33391" },
			{ "node" : "4", "ch" : "2" , "delay" : "35509" },
			{ "node" : "1", "ch" : "3" , "delay" : "42111" },
			{ "node" : "2", "ch" : "3" , "delay" : "42660" },
			{ "node" : "3", "ch" : "3" , "delay" : "43116" },
			{ "node" : "4", "ch" : "3" , "delay" : "45770" },
			{ "node" : "1", "ch" : "4" , "delay" : "47410" },
			{ "node" : "2", "ch" : "4" , "delay" : "51580" },
			{ "node" : "3", "ch" : "4" , "delay" : "53654" },
			{ "node" : "4", "ch" : "4" , "delay" : "53758" },
			{ "node" : "1", "ch" : "5" , "delay" : "57373" },
			{ "node" : "2", "ch" : "5" , "delay" : "57889" },
			{ "node" : "3", "ch" : "5" , "delay" : "57936" },
			{ "node" : "4", "ch" : "5" , "delay" : "60703" },
			{ "node" : "1", "ch" : "6" , "delay" : "61247" }
		]
}







|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
{
	"show"		:	"La Mariseillaise4",
	"music" 	:	"marseillaise.mp3",
	"time"		:	"1:03",
	"nodes"		:	"4",
	"program" : [
			{ "node" : "1", "ch" : "1" , "delay" : "2480" },
			{ "node" : "1", "ch" : "2" , "delay" : "3563" },
			{ "node" : "1", "ch" : "3" , "delay" : "6242" },
			{ "node" : "1", "ch" : "4" , "delay" : "13315" },
			{ "node" : "1", "ch" : "5" , "delay" : "17122" },
			{ "node" : "1", "ch" : "6" , "delay" : "33305" },
			{ "node" : "2", "ch" : "1" , "delay" : "33391" },
			{ "node" : "2", "ch" : "2" , "delay" : "35509" },
			{ "node" : "2", "ch" : "3" , "delay" : "42111" },
			{ "node" : "2", "ch" : "4" , "delay" : "42660" },
			{ "node" : "2", "ch" : "5" , "delay" : "43116" },
			{ "node" : "2", "ch" : "6" , "delay" : "45770" },
			{ "node" : "3", "ch" : "1" , "delay" : "47410" },
			{ "node" : "3", "ch" : "2" , "delay" : "51580" },
			{ "node" : "3", "ch" : "3" , "delay" : "53654" },
			{ "node" : "3", "ch" : "4" , "delay" : "53758" },
			{ "node" : "3", "ch" : "5" , "delay" : "57373" },
			{ "node" : "3", "ch" : "6" , "delay" : "57889" },
			{ "node" : "4", "ch" : "1" , "delay" : "57936" },
			{ "node" : "4", "ch" : "2" , "delay" : "60703" },
			{ "node" : "4", "ch" : "3" , "delay" : "61247" }
		]
}

Changes to luasupport/HTTP/httplib.c.

585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
			rsrv->lock_addr_flag = 1;	// Set flag
		}

	}
	
	return rtnval;
}



#if 0
	#pragma mark -
	#pragma mark Internal API
#endif

//***************************************************************************







<
<







585
586
587
588
589
590
591


592
593
594
595
596
597
598
			rsrv->lock_addr_flag = 1;	// Set flag
		}

	}
	
	return rtnval;
}



#if 0
	#pragma mark -
	#pragma mark Internal API
#endif

//***************************************************************************

Changes to luasupport/HTTP/rest/rest.c.

328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
...
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
...
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
		if( strcmp(method,methods[i].method_name) == 0 )
			rtn = methods[i].type;
	}
	
	return rtn;
}


//***********************************************************************
/*
*	char *classify_url(const char *url,
*							RSERV_DATA *data,
*							char *lurl_buffer,
*							URL_TYPE *type)		- Vet incomming URL
*
................................................................................
			lurl = (char *)&lurl_buffer[0];
			*type = HTTP_SITE;
		}
	}
	
	return lurl;
}



#if 0
	#pragma mark -
	#pragma mark -- HTTP support ---
#endif

/***********************************************************************
................................................................................
			rtnval = 1;								// SUCCESS
		else
			rtnval = 0;								// Failure
	}
	
	return rtnval;
}


#if 0
	#pragma mark -
	#pragma mark -- RESTful support ---
#endif

/***********************************************************************







<







 







<
<







 







<







328
329
330
331
332
333
334

335
336
337
338
339
340
341
...
414
415
416
417
418
419
420


421
422
423
424
425
426
427
...
608
609
610
611
612
613
614

615
616
617
618
619
620
621
		if( strcmp(method,methods[i].method_name) == 0 )
			rtn = methods[i].type;
	}
	
	return rtn;
}


//***********************************************************************
/*
*	char *classify_url(const char *url,
*							RSERV_DATA *data,
*							char *lurl_buffer,
*							URL_TYPE *type)		- Vet incomming URL
*
................................................................................
			lurl = (char *)&lurl_buffer[0];
			*type = HTTP_SITE;
		}
	}
	
	return lurl;
}



#if 0
	#pragma mark -
	#pragma mark -- HTTP support ---
#endif

/***********************************************************************
................................................................................
			rtnval = 1;								// SUCCESS
		else
			rtnval = 0;								// Failure
	}
	
	return rtnval;
}


#if 0
	#pragma mark -
	#pragma mark -- RESTful support ---
#endif

/***********************************************************************