WebSVN - Projects - Diff - Rev 1537 and 1562 - /dongfang_FC_rewrite


package dongfang.mkt.frames;
 
public abstract class Frame {
        public static final byte FC_ADDRESS = 1;
        public static final byte NC_ADDRESS = 2;
        public static final byte MK3MAG_ADDRESS = 3;
       
        /* General / several targets */
 
        public enum REQUEST_IDS {
                ANALOG_DEBUG_LABEL('a'),
                EXTERNAL_CONTROL('b'),
                DISPLAY1('h'),
                DISPLAY2('l'),
                VERSION('v'),
                ANALOG_DEBUG('d'),
                RESET('R'),
                COMPASSHEADING('K'),
                MOTORTEST('t'),
                READPARAMETERSET('q'),
                WRITEPARAMETERSET('s'),
                RCCHANNELS('p'),
                DDATAINTERVAL('c'),
                READMIXERTABLE('n'),
                WRITEMIXERTABLE('m'),
                CHANGEPARAMETERSET('f'),
                NC_TESTLINK('z'),
                NC_ERRORTEXT('e'),
                NC_SET_WAYPOINT('w'),
                NC_GET_WAYPOINT('x'),
                GET_OSDDATA('o'),
                REDIRECT_UART('u'),
                SET3DDATA_INTERVAL('c'),
                MK3MAGHEADING ('w');
 
                private final char id;
                REQUEST_IDS(char id) { this.id = id; }
                public char getId() {return id;}
        }
 
        public static enum RESPONSE_IDS {
                ANALOG_DEBUG_LABEL('A'),
                EXTERNAL_CONTROL('B'),
                DISPLAY1('H'),
                DISPLAY2('L'),
                VERSION('V'),
                ANALOG_DEBUG('D'),
                /* FC specific */
                COMPASSHEADING('w'),
                MOTORTEST('T'),
                READPARAMETERSET('Q'),
                WRITEPARAMETERSET('S'),
                RCCHANNELS('P'),
                THREEDDATAINTERVAL('C'),
                READMIXERTABLE('N'),
                WRITEMIXERTABLE('M'),
                CHANGEPARAMETERSET('F'),
                REQUEST_SETVARIABLE('y'),
                /* NC specific */
                NC_TESTLINK('Z'),
                NC_ERRORTEXT('E'),
                REQUEST_NC_SET_TARGETPOSITION('s'),
                NC_SET_WAYPOINT('W'),
                NC_GET_WAYPOINT('X'),
                GET_OSDDATA('O'),
                SET3DDATA_INTERVAL('C'),
                /* Mk3Mag specific */
                MK3MAGHEADING('K');
 
                private final char id;
                RESPONSE_IDS(char id) { this.id = id; }
                public char getId() { return id; }
        }
 
 
 
 
 
 
 
 
 
 
 
 
       
        protected final int address;
       
        protected Frame(int address) {
                this.address = address;
        }
       
        public int getAddress() {
                return address;
        }
}
 

Rev 1537	Rev 1562
1	package dongfang.mkt.frames;	1	package dongfang.mkt.frames;
2		2
3	public abstract class Frame {	3	public abstract class Frame {
4	public static final byte FC_ADDRESS = 1;	4	public static final byte FC_ADDRESS = 1;
5	public static final byte NC_ADDRESS = 2;	5	public static final byte NC_ADDRESS = 2;
6	public static final byte MK3MAG_ADDRESS = 3;	6	public static final byte MK3MAG_ADDRESS = 3;
7		7
8	/* General / several targets */	8	/* General / several targets */
9		9
10	public enum REQUEST_IDS {	10	public enum REQUEST_IDS {
11	ANALOG_DEBUG_LABEL('a'),	11	ANALOG_DEBUG_LABEL('a'),
12	EXTERNAL_CONTROL('b'),	12	EXTERNAL_CONTROL('b'),
13	DISPLAY1('h'),	13	DISPLAY1('h'),
14	DISPLAY2('l'),	14	DISPLAY2('l'),
15	VERSION('v'),	15	VERSION('v'),
16	ANALOG_DEBUG('d'),	16	ANALOG_DEBUG('d'),
17	RESET('R'),	17	RESET('R'),
18	COMPASSHEADING('K'),	18	COMPASSHEADING('K'),
19	MOTORTEST('t'),	19	MOTORTEST('t'),
20	READPARAMETERSET('q'),	20	READPARAMETERSET('q'),
21	WRITEPARAMETERSET('s'),	21	WRITEPARAMETERSET('s'),
22	RCCHANNELS('p'),	22	RCCHANNELS('p'),
23	DDATAINTERVAL('c'),	23	DDATAINTERVAL('c'),
24	READMIXERTABLE('n'),	24	READMIXERTABLE('n'),
25	WRITEMIXERTABLE('m'),	25	WRITEMIXERTABLE('m'),
26	CHANGEPARAMETERSET('f'),	26	CHANGEPARAMETERSET('f'),
27	NC_TESTLINK('z'),	27	NC_TESTLINK('z'),
28	NC_ERRORTEXT('e'),	28	NC_ERRORTEXT('e'),
29	NC_SET_WAYPOINT('w'),	29	NC_SET_WAYPOINT('w'),
30	NC_GET_WAYPOINT('x'),	30	NC_GET_WAYPOINT('x'),
31	GET_OSDDATA('o'),	31	GET_OSDDATA('o'),
32	REDIRECT_UART('u'),	32	REDIRECT_UART('u'),
33	SET3DDATA_INTERVAL('c'),	33	SET3DDATA_INTERVAL('c'),
34	MK3MAGHEADING ('w');	34	MK3MAGHEADING ('w');
35		35
36	private final char id;	36	private final char id;
37	REQUEST_IDS(char id) { this.id = id; }	37	REQUEST_IDS(char id) { this.id = id; }
38	public char getId() {return id;}	38	public char getId() {return id;}
39	}	39	}
40		40
41	public static enum RESPONSE_IDS {	41	public static enum RESPONSE_IDS {
42	ANALOG_DEBUG_LABEL('A'),	42	ANALOG_DEBUG_LABEL('A'),
43	EXTERNAL_CONTROL('B'),	43	EXTERNAL_CONTROL('B'),
44	DISPLAY1('H'),	44	DISPLAY1('H'),
45	DISPLAY2('L'),	45	DISPLAY2('L'),
46	VERSION('V'),	46	VERSION('V'),
47	ANALOG_DEBUG('D'),	47	ANALOG_DEBUG('D'),
48	/* FC specific */	48	/* FC specific */
49	COMPASSHEADING('w'),	49	COMPASSHEADING('w'),
50	MOTORTEST('T'),	50	MOTORTEST('T'),
51	READPARAMETERSET('Q'),	51	READPARAMETERSET('Q'),
52	WRITEPARAMETERSET('S'),	52	WRITEPARAMETERSET('S'),
53	RCCHANNELS('P'),	53	RCCHANNELS('P'),
54	THREEDDATAINTERVAL('C'),	54	THREEDDATAINTERVAL('C'),
55	READMIXERTABLE('N'),	55	READMIXERTABLE('N'),
56	WRITEMIXERTABLE('M'),	56	WRITEMIXERTABLE('M'),
57	CHANGEPARAMETERSET('F'),	57	CHANGEPARAMETERSET('F'),
58	REQUEST_SETVARIABLE('y'),	58	REQUEST_SETVARIABLE('y'),
59	/* NC specific */	59	/* NC specific */
60	NC_TESTLINK('Z'),	60	NC_TESTLINK('Z'),
61	NC_ERRORTEXT('E'),	61	NC_ERRORTEXT('E'),
62	REQUEST_NC_SET_TARGETPOSITION('s'),	62	REQUEST_NC_SET_TARGETPOSITION('s'),
63	NC_SET_WAYPOINT('W'),	63	NC_SET_WAYPOINT('W'),
64	NC_GET_WAYPOINT('X'),	64	NC_GET_WAYPOINT('X'),
65	GET_OSDDATA('O'),	65	GET_OSDDATA('O'),
66	SET3DDATA_INTERVAL('C'),	66	SET3DDATA_INTERVAL('C'),
67	/* Mk3Mag specific */	67	/* Mk3Mag specific */
68	MK3MAGHEADING('K');	68	MK3MAGHEADING('K');
69		69
70	private final char id;	70	private final char id;
71	RESPONSE_IDS(char id) { this.id = id; }	71	RESPONSE_IDS(char id) { this.id = id; }
72	public char getId() { return id; }	72	public char getId() { return id; }
73	}	73	}
74		-
75	/*	-
76	public ResponseFrame getResponseFrameInstance(RESPONSE_IDS id) {	-
77	switch (id) {	-
78	case ANALOG_DEBUG_LABEL: return new AnalogDebugLabelResponseFrame();	-
79	case EXTERNAL_CONTROL: return new ExternalControlResponseFrame();	-
80	case DISPLAY1: return new Display1ResponseFrame();	-
81	case DISPLAY2: return new Display2ResponseFrame();	-
82	case VERSION: return new VersionResponseFrame();	-
83	}	-
84	}	-
85	*/	-
86		74
87	protected final int address;	75	protected final int address;
88		76
89	protected Frame(int address) {	77	protected Frame(int address) {
90	this.address = address;	78	this.address = address;
91	}	79	}
92		80
93	public int getAddress() {	81	public int getAddress() {
94	return address;	82	return address;
95	}	83	}
96	}	84	}
97		85

Subversion Repositories Projects

(root)/dongfang_FC_rewrite_tool/src/dongfang/mkt/frames/Frame.java - Rev 1537 → 1562