11/11/22 21H GPS PPS INT add

myint.h add
.o .out .hex file rm from repo

diff --git a/.gitignore b/.gitignore
new file mode 100755 (executable)
index 0000000..72779a7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*.o\r
+*.out\r
+*.hex\r

diff --git a/build/default/debug/byte2var.o.d b/build/default/debug/byte2var.o.d
new file mode 100644 (file)
index 0000000..bd4c4c5
--- /dev/null
+++ b/build/default/debug/byte2var.o.d
@@ -0,0 +1 @@
+build/default/debug/byte2var.o: byte2var.c

diff --git a/build/default/debug/debug_print.o.d b/build/default/debug/debug_print.o.d
new file mode 100644 (file)
index 0000000..32843de
--- /dev/null
+++ b/build/default/debug/debug_print.o.d
@@ -0,0 +1 @@
+build/default/debug/debug_print.o: debug_print.c myuart.h

diff --git a/build/default/debug/main.o.d b/build/default/debug/main.o.d
new file mode 100644 (file)
index 0000000..77fd474
--- /dev/null
+++ b/build/default/debug/main.o.d
@@ -0,0 +1,2 @@
+build/default/debug/main.o: main.c myuart.h myspi.h debug_print.h ublox.h \
+  myad.h delay.h ring.h byte2var.h

diff --git a/build/default/debug/myad.o.d b/build/default/debug/myad.o.d
new file mode 100644 (file)
index 0000000..b95bf2b
--- /dev/null
+++ b/build/default/debug/myad.o.d
@@ -0,0 +1 @@
+build/default/debug/myad.o: myad.c delay.h myspi.h myad.h

diff --git a/build/default/debug/myspi.o.d b/build/default/debug/myspi.o.d
new file mode 100644 (file)
index 0000000..8a28699
--- /dev/null
+++ b/build/default/debug/myspi.o.d
@@ -0,0 +1 @@
+build/default/debug/myspi.o: myspi.c myspi.h

diff --git a/build/default/debug/myuart.o.d b/build/default/debug/myuart.o.d
new file mode 100644 (file)
index 0000000..720a522
--- /dev/null
+++ b/build/default/debug/myuart.o.d
@@ -0,0 +1 @@
+build/default/debug/myuart.o: myuart.c myuart.h

diff --git a/build/default/debug/ring.o.d b/build/default/debug/ring.o.d
new file mode 100644 (file)
index 0000000..420331e
--- /dev/null
+++ b/build/default/debug/ring.o.d
@@ -0,0 +1 @@
+build/default/debug/ring.o: ring.c ring.h

diff --git a/build/default/debug/ublox.o.d b/build/default/debug/ublox.o.d
new file mode 100644 (file)
index 0000000..828d19c
--- /dev/null
+++ b/build/default/debug/ublox.o.d
@@ -0,0 +1 @@
+build/default/debug/ublox.o: ublox.c ublox.h myuart.h byte2var.h

diff --git a/build/default/production/byte2var.o b/build/default/production/byte2var.o
deleted file mode 100644 (file)
index 1141ebc..0000000
Binary files a/build/default/production/byte2var.o and /dev/null differ

diff --git a/build/default/production/debug_print.o b/build/default/production/debug_print.o
deleted file mode 100644 (file)
index b2a6907..0000000
Binary files a/build/default/production/debug_print.o and /dev/null differ

diff --git a/build/default/production/main.o b/build/default/production/main.o
deleted file mode 100644 (file)
index f6b8df8..0000000
Binary files a/build/default/production/main.o and /dev/null differ

diff --git a/build/default/production/main.o.d b/build/default/production/main.o.d
index d89bbc0..bcecf49 100644 (file)
--- a/build/default/production/main.o.d
+++ b/build/default/production/main.o.d
@@ -1,2 +1,2 @@
 build/default/production/main.o: main.c myuart.h myspi.h debug_print.h \
-  ublox.h myad.h delay.h ring.h byte2var.h
+  ublox.h myad.h delay.h ring.h byte2var.h myint.h

diff --git a/build/default/production/myad.o b/build/default/production/myad.o
deleted file mode 100644 (file)
index affb912..0000000
Binary files a/build/default/production/myad.o and /dev/null differ

diff --git a/build/default/production/myspi.o b/build/default/production/myspi.o
deleted file mode 100644 (file)
index 96f6163..0000000
Binary files a/build/default/production/myspi.o and /dev/null differ

diff --git a/build/default/production/myuart.o b/build/default/production/myuart.o
deleted file mode 100644 (file)
index 0df4aee..0000000
Binary files a/build/default/production/myuart.o and /dev/null differ

diff --git a/build/default/production/ring.o b/build/default/production/ring.o
deleted file mode 100644 (file)
index 6f8f054..0000000
Binary files a/build/default/production/ring.o and /dev/null differ

diff --git a/build/default/production/ublox.o b/build/default/production/ublox.o
deleted file mode 100644 (file)
index cc9b21e..0000000
Binary files a/build/default/production/ublox.o and /dev/null differ

diff --git a/delay.h b/delay.h
index 562da08..8bb2181 100644 (file)
--- a/delay.h
+++ b/delay.h
@@ -6,6 +6,7 @@
 
 #define FOSC    8000000LL   // Clock Freqency Hz
 #define FCY  (FOSC/2)  // FCY 動作周波数[ Hz ]
+
 #define delay_us(x) __delay32(((x*FCY)/1000000L)) // delays x us
 #define delay_ms(x) __delay32(((x*FCY)/1000L))  // delays x ms
 

diff --git a/dist/default/production/ad2010.production.hex b/dist/default/production/ad2010.production.hex
deleted file mode 100644 (file)
index fc0bf5b..0000000
--- a/dist/default/production/ad2010.production.hex
+++ /dev/null
@@ -1,794 +0,0 @@
-:020000040000fa
-:080000000002040000000000f2
-:020000040000fa
-:100400000fff21000e7f22000e0188000000000077
-:100410000c000700a05c2100010020001100070073
-:10042000000020000000e000020032000000020096
-:1004300000000000f60d0200000000000040da009d
-:100440000000fe004440a900000c20000000e00075
-:100450000300320000002000a00188004440a800f2
-:100460000000060091018800800078000000eb0089
-:1004700015003700e280400032a0b4009101ba00bc
-:10048000e280400032a0b4009102ba00e280400055
-:1004900032a0b4000002eb00472bde00f507b200eb
-:1004a000602ce10004003a000059eb008301e900f0
-:1004b000fdff3e00040037006128e100010032002a
-:1004c0000082eb00040007001101ba000200e00006
-:1004d000e8ff3a00000006003159ba008301e90044
-:1004e0000c0032002159ba008301e90008003200f3
-:1004f0000400e00003003a00e280400032a0b400b3
-:10050000f5ff370011d9ba008301e900faff3a007c
-:100510008100e800e180400032a0b4000000060045
-:100520000040da000000fe00839f68000100e00048
-:1005300002003d0060001000e08018000300e000b1
-:1005400002003d0060011100e08119000500070074
-:100550004f00e00002003b0060001000e080180047
-:10056000000006006022b800060220000000d00053
-:100570008180d2000482d2008582d2000000a000d7
-:100580000202520083825a0003003100020242003c
-:1005900083824a000000a1000603e900f3ff3a004d
-:1005a000000006008001eb000200370061f07900d6
-:1005b0008301e800828f5100fcff3a000000060032
-:1005c0008001eb0002003700817178008301e800b0
-:1005d000828f5100fcff3a0000000600889fbe0099
-:1005e0000004be00060037000804e8000000fb001d
-:1005f00089007800de020700e10f400004003200ad
-:10060000184078000004e000f7ff3a000000eb001b
-:100610004f04be0000000600881f780081fa210008
-:10062000eeff07000004780081fa2100a0002000fe
-:10063000cf020700080078004f0478000000060091
-:100640000c00fa00889fbe0000047800cfb097002d
-:10065000f0ff2700d0bf9f008004eb0099bf9f00f0
-:1006600088bf9f00a8bf9f00200c2000b0bf9f0044
-:100670007881570070805700080007000fb8970076
-:10068000094878000fb89700080450000800780067
-:100690004f04be000080fa0000000600fe874700fd
-:1006a000889fbe008a9fbe008c9fbe008e1f780070
-:1006b000f0b79f000107780082bf9f000000eb00a9
-:1006c000a0b79f009f0237008006eb0050c2b30026
-:1006d00080cf5000090032000100fb00ffb09700fe
-:1006e000a3020700e10f400096023200afb097006e
-:1006f0008100e800a1b79f00920237009e40780079
-:10070000d0c2b30080cf50000c00320007003c0084
-:100710006d40500080cf50000a0032006b40400016
-:1007200080cf50000e003a000800370000c3b3002d
-:1007300080cf50000a003a00060037000d30a000bc
-:10074000050037000d00a000030037000d10a000c9
-:10075000010037000d20a0000e07e800e7ff37007a
-:100760000d18a300010032000d00a1000d38a300f8
-:10077000010032000d20a1000100fb0002fd2f004e
-:1007800002004000e90f50000e003e000002eb00a6
-:10079000c4b79f0082017800cfb297006a28b900e1
-:1007a0001e01fb000001410003014100c2b79f0090
-:1007b0005e00fb0003004000e90f50000b003e000c
-:1007c000f5ff37000006eb00ccb79f00a0c2b300d6
-:1007d00080cf500005003a000fb89700c0007800a5
-:1007e00080bf9f00c1b79f000e07e8000001eb002b
-:1007f000b2b79f00e0c2b3009e4f100018003a004d
-:100800000de0a0008e00e80064405000914f100001
-:1008100002003200010778000c0037000fba970081
-:10082000c402780084bf9f00b5b79f000e87e80020
-:100830000b0037003fb697006a60b9000000410026
-:1008400003004000b0b79f000e07e8001e01fb0048
-:1008500003fd2f0003004100e90f5000f5ff3600b3
-:10086000be407800e1d79f00c0c6b30080cf5000e3
-:10087000220032000f003c006940500080cf500041
-:100880007700320004003c000104e0003102320035
-:100890006b4050000f00370040c6b30080cf5000bf
-:1008a000930032006540400080cf50008b003a003a
-:1008b0008f00370030c7b30080cf50001a003200dd
-:1008c00007003c006440500080cf5000110032000f
-:1008d0000040e80080cf500080003a000f00370051
-:1008e00050c7b30080cf500080003200634040000a
-:1008f00080cf500079003a0009003700000028003e
-:100900000d48a30001003a00000120008086760017
-:10091000d3ff37000d60a000750037000d50a00018
-:100920000d70a000720037008fb89700410078006a
-:1009300081bf9f00000478000000e00001003a0041
-:1009400008f721008004eb00010037008104e80073
-:1009500089007800088044001004e000fbff3a00a2
-:100960003fb197000200e00003003200890f510000
-:1009700001003100820478000002eb00e4af9f0028
-:10098000cfb29700898f52000200360009805200d2
-:10099000e0af9f004368de00e10660001b003a0004
-:1009a0000d06780009003700ffb097000002200014
-:1009b000ef010700e10f4000030032002fb0970065
-:1009c0000000e800a0b79f000c06e800efa8970021
-:1009d000810f5600f4ff3a000081eb00e2af9f0068
-:1009e0000a003700880078003100fb00010478001d
-:1009f000ffb09700de010700e10f40000300320066
-:100a00002fb297000402e800a4b79f000900e90094
-:100a100080047800e10f4000f2ff3a000006eb008e
-:100a20000d00e0000a003a00c6013700ffb0970051
-:100a300000022000ce010700e10f40000300320059
-:100a4000afb297008502e800a5b79f000c06e8004a
-:100a50006fa89700800f5600f4ff3a00b9013700e5
-:100a60008fb897004100780081bf9f00cf80de00e3
-:100a700001017800820178000205be000004be007a
-:100a80000203be000002be004822de00482edd0048
-:100a900004027600e4d79f000d48a3000a0032004c
-:100aa0000404e00008003200e14f4200060032007a
-:100ab00071fd2f000180470004487800184098001d
-:100ac0002900200002003700f0d79f001900200005
-:100ad00072fd2f0002844700a1ff370064fd2f0044
-:100ae00004844700190020009dff37000d0cb3005f
-:100af0000d007800000cb20028003a000d00e00064
-:100b000005003d008fba97004505be004504be00b4
-:100b100085bf9f00140037000d48a3000b00320072
-:100b20000fbe97004c00be008cbf9f004f89de00b7
-:100b3000cf91de000002be0002037800820378003d
-:100b40000605be000404be00070037008fb89700fa
-:100b50004100780081bf9f0000047800cfc4de0010
-:100b6000090578008a057800e00f5400e08f5c00ea
-:100b7000e00f5d00e08f5d001f003d003d00b30011
-:100b80006000b8006011b800080450008984580063
-:100b90000a0559008b855900170037000d00e00049
-:100ba00005003d000fb997004205be004204be009b
-:100bb00082bf9f00100037000d48a30007003200dd
-:100bc0000fba97004400be0084bf9f006011b800b8
-:100bd0000205be000004be00070037008fba970070
-:100be0004500780085bf9f000004780009002000c0
-:100bf0000a0020000b0020003fb697000c00e00028
-:100c000007003a00e00f5400e08f5c00e00f5d0049
-:100c1000e08f5d0002003a0010002000b0b79f0096
-:100c20008d007800010cb200e1b79f0000042000a5
-:100c3000808f50003000320003003c000100e000d3
-:100c40000800320040003700000820006fb1970014
-:100c5000800f510014003200000c2000800f510062
-:100c600039003a0014c0b30005ed21000b00370035
-:100c70000400fb004300dd00050040005001be0001
-:100c80004000be000040e10001c8e10002d0e100e8
-:100c900003d8e1002b0039000442e800f44f520071
-:100ca000f3ff3a0027003700000120000100200078
-:100cb0006011b80014c0b3000040e10001c8e100b9
-:100cc00002d0e10003d8e1001e00390045002000f9
-:100cd0000000d0008180d2000281d2008381d20046
-:100ce0008502e900faff3a000442e800f04f5200a2
-:100cf000f1ff3a00130037008000200001002000bf
-:100d00006011b80014c0b3000040e10001c8e10068
-:100d100002d0e10003d8e1000a0039003c002000c5
-:100d20000000d0008180d2000281d2008381d200f5
-:100d30000c06e900faff3a000442e800f54f5200c1
-:100d4000f1ff3a00e4d79f00efd097000100fb00cd
-:100d50003fb19700820f500002003d00e2d79f0094
-:100d6000040037003fb29700800f520001003d00a1
-:100d7000b0b79f00cfb297000500e000040032003a
-:100d800063806600020032008502e900c5b79f005b
-:100d90000de8a3000b0032004fb697003fb097005c
-:100da000800f560003003c008000eb00c1b79f009d
-:100db000040037004fb197003fb297000401510083
-:100dc000c2b79f00efd297000500fb000006eb00c2
-:100dd000dcaf9f00cfb09700808f5000020034003e
-:100de00000805000d0af9f000d28a30037003200d4
-:100df000e18066000d18a3000c003200d002200034
-:100e00000100e00001003a000080e900ffb0970017
-:100e1000d7000700e10f40000e0032002fb197000d
-:100e20000201e800a2b79f000a0037000100e000bd
-:100e300008003200ffb0970000022000cc0007003d
-:100e4000e10f4000030032002fb297000402e800d7
-:100e5000a4b79f00dfaa97000500e0000f00320052
-:100e60000006eb00ffb0970000032000c000070061
-:100e7000e10f4000030032002fb097000000e800af
-:100e8000a0b79f000c06e800dfa89700810f56006e
-:100e9000f4ff3a000001eb00d2af9f003fb2970091
-:100ea000c320dd0080ec21008080400091b79f00ce
-:100eb0004220dd006400500080b79f006320b9002d
-:100ec000f0af9f006306500084003700dfaa970050
-:100ed0000500e00011003200688066000f003a0053
-:100ee00000067800ffb0970000022000a000070075
-:100ef000e10f4000030032002fb097000000e8002f
-:100f0000a0b79f000c06e800dfa89700810f5600ed
-:100f1000f4ff3a000001eb00d2af9f00e1806600d1
-:100f20000d18a3000c003200d00220000100e000e8
-:100f300001003a000080e900ffb097008c00070034
-:100f4000e10f4000d5ff32002fb297000402e80005
-:100f5000a4b79f00d1ff37000100e000cfff3200af
-:100f6000ffb097000002200081000700e10f400061
-:100f7000caff3200afb297008502e800a5b79f0014
-:100f8000c6ff370000042000efb09700808f5000ac
-:100f90003100320003003c000100e0000800320094
-:100fa0003e003700000820006fb19700800f51000d
-:100fb00011003200000c2000800f510037003a0071
-:100fc0001fb097003002be002003be000800be0024
-:100fd0000a01be00d1010700a40020000500200086
-:100fe0006033b800d401070004c3b30004424000da
-:100ff000e4d79f002900370075f72100d5b79f007f
-:101000000d58a30002003a0080f82100d0b79f00dd
-:1010100014002000050020006033b8008fb0970056
-:101020008100e900050033000402d0008582d2006f
-:101030000683d2008783d200f9ff37000800be0084
-:101040000a01be00b50107006f0060005fb19700a4
-:1010500062407800100037001400200005002000d6
-:101060006033b8000c0078000000e9000500330090
-:101070000402d0008582d2000683d2008783d2008a
-:10108000f9ff37000800be000a01be00a3010700f7
-:10109000674060000043b000e0d79f00efd09700aa
-:1010a0000100fb00ffb0970031000700e10f400096
-:1010b000030032002fb197000201e800a2b79f00a1
-:1010c0001fb297006802520094b79f008fb297003a
-:1010d000e482520085b79f0063065600d0ff2f00c0
-:1010e0003fb197000090b9007faa9700000042002e
-:1010f00063005000800f5600a2ff3a000d38a30095
-:1011000010003200dfaa97000500e0000d00340057
-:101110000006eb00ffb0970000022000140007005b
-:10112000e10f4000030032002fb097000000e800fc
-:10113000a0b79f000c06e800dfa89700810f5600bb
-:10114000f4ff3a00be407800e1d79f000104e000c0
-:101150005dfd3a002fb097004f0778004f06be00a4
-:101160004f05be004f04be00ef01b10000000600b5
-:10117000889fbe000001780001047800b100900053
-:101180000118a300400032000198a30003003a00b8
-:10119000180090000000e0003b003a000190a00021
-:1011a0003104980082047800f90fb2001800900012
-:1011b0000000e00002003a0028009000000c7800d7
-:1011c000ea8f540006003a00380090000078a3002f
-:1011d00003003a0088007800d0002000e4ff0700f8
-:1011e000180290006121b90058009000e8009000ba
-:1011f000800f5100818f59000b0032000400e8007d
-:10120000100498001800780009587800000c780045
-:1012100011c0b30040fc210001487800ea8f54005f
-:101220000600320019003700880078000940780075
-:10123000190007008004780014003700380090007f
-:101240000088a3001100320018019000a80090004f
-:10125000480090005300070098009000810f500054
-:1012600004003200380090000003b30030049800fe
-:101270008084eb000000eb00100498002800900030
-:10128000000c7800010037008084eb000900780032
-:101290004f04be00000006000200fa00889fbe0056
-:1012a000a0ff9f0001047800b10090008104780045
-:1012b0000904b200020032000000fb0036003700d3
-:1012c0000118a30005003a000103b300310498009f
-:1012d000190498000080eb002f00370058009000a0
-:1012e0000000e00006003a004800900012002000d4
-:1012f000e68057002b0007001904980024003700ef
-:10130000280090000000e00008003a0000fc2100e6
-:1013100020049800000c7800200020005004980061
-:10132000100498000130a0003104980018019000ca
-:10133000a8009000480090001a00070028009000c4
-:10134000000c78000080eb00100498001800780072
-:10135000aff8970001587800000c78002ff897003c
-:10136000ea4f50000a003a00380090000088a300bd
-:101370000700320018019000a8009000480090007b
-:101380000800070019049800a8009000010c7800dc
-:10139000aff897000100fb004f04be000080fa0088
-:1013a000000006000a00fa0080017800e20f5000f9
-:1013b00028003e0030fe8000e10f5000080032009f
-:1013c000802320000000e0000500320004232000fc
-:1013d00025232000462320008001780004003700e8
-:1013e0000422200025222000462220008322200003
-:1013f000144090000004e000040035008009eb0078
-:10140000144090000074a000104298001540900015
-:101410000028a30003003a00154090000024a0001b
-:10142000904298008001eb000700370015409000c3
-:101430000008a300fdff320063c078000000fb003d
-:10144000000b78008301e800828f5100f7ff3a001b
-:101450000800370030002000b0bf9f00c3bf9f00ce
-:10146000d1bf9f00e2bf9f006a80570000c0da0032
-:101470006fb99700020078000080fa0000000600b3
-:10148000881f7800000478005001be004000be00b4
-:10149000040040008580480006014900878149001a
-:1014a000009cbe000294be000400e1000588e1003b
-:1014b0000690e1000798e100020031006800440056
-:1014c0001008e8004f04780000000600f487470089
-:1014d000889fbe008a9fbe008c9fbe008e1f780032
-:1014e0000205be000004be00d4b79f00e5b79f0010
-:1014f000f6b79f0087bf9f000000eb00c0b79f00ba
-:10150000b0b79f00a0b79f0090b79f0080b79f0023
-:101510000d042000bfb097004fb0970000014000bd
-:101520000000e0000f003d004f08de0000007100e9
-:10153000c0b79f004d00070001003d0012002000d1
-:101540005000070001003d00120020005500070078
-:1015500061000700660007000f004000c8ff070099
-:10156000220037004f08de0000067100ccb79f0054
-:101570003e00070001003d0012002000410007006e
-:1015800001003d0012002000460007005200070045
-:101590000fb297009fb297002fb39700bfb3970089
-:1015a000590007000000520081805a0002015b00d0
-:1015b00083815b0080b79f0091b79f00a2b79f0017
-:1015c000b3b79f000007eb004f0007000020e100c9
-:1015d00001a8e10002b0e10003b8e1000100310020
-:1015e0001e0020000e005600c0b79f004fb29700ab
-:1015f0000400e0000700350010002000010020007a
-:101600006011b80008047000898470000a05710038
-:101610008b8571008d06e900beff3a000400e000f2
-:1016200003003d00320007000f00400094ff070058
-:101630004fa897000000e00004003a000fb49700a4
-:101640009fb497002fb59700bfb597000800be0064
-:101650000a01be004f0778004f06be004f05be00ce
-:101660004f04be004f01b1000000060001804000a1
-:1016700090b79f000001eb008fb097000100e000e1
-:10168000000006000200700090b79f00018040003b
-:1016900080b79f000001eb00ffa897000100e00069
-:1016a000000006000200700080b79f00018040002b
-:1016b0006faa9700cf20de0001007000f0af9f00fe
-:1016c000040242000800be000a01be004f18de00fe
-:1016d0000002720000000600e4af9f00080444000e
-:1016e00089844c000a054d008b854d0000000600e2
-:1016f0003fb29700cfb297005fb39700efb3970068
-:1017000000fe2f00000006003fb09700cfb097000a
-:101710005fb19700efb1970000000600881f7800c6
-:1017200018002000881f780068ff07008f87e900f5
-:101730004f04780000000600801feb0063ff0700e5
-:101740008f87e90000000600889fbe008a9fbe00c8
-:101750008c1f78000205be000004be00e00f5000a0
-:10176000e08f5800e00f5900e08f59000c003d0059
-:101770006000b8006011b800080450008984580067
-:101780000a0559008b8559001c0020001f00070026
-:1017900008003d00180007000006eb0005003700b8
-:1017a0000006eb001900070002003d000f000700d3
-:1017b0001c0020000800be000a01be00d7ff070081
-:1017c0000203be000002be000c00e0000100320077
-:1017d000060007000400be000601be004f067800a8
-:1017e0004f05be004f04be00000006006000b800b8
-:1017f0006011b800000037000402500085825800d4
-:10180000060359008783590000000600e00f5200cc
-:10181000e08f5a00e00f5b00e08f5b0000000600e5
-:10182000889fbe008a9fbe008c1f78000205be0004
-:101830000004be00e00f5000e08f5800e00f590098
-:10184000e08f59000a003d006000b8006011b80048
-:1018500008045000898458000a0559008b855900f6
-:101860001c0020001800070007003d00050037009d
-:101870000006eb001400070003003d006000b80004
-:101880006011b800150007000800be000a01be0084
-:10189000a9ff07000203be000002be000c00e0002a
-:1018a000030032006000b8006011b8000b000700b0
-:1018b0000400be000601be004f0678004f05be00c2
-:1018c0004f04be0000000600e00f5200e08f5a00f7
-:1018d000e00f5b00e08f5b00000006000402500098
-:1018e00085825800060359008783590000000600ce
-:020000040000fa
-:020000040001f9
-:0457fc007f3e0000ec
-:020000040000fa
-:1000080090020000900200009002000090020000a0
-:100018009002000090020000900200009002000090
-:100028009002000090020000900200009002000080
-:100038009002000090020000900200009002000070
-:100048009002000090020000be0f0000a8160000f9
-:100058009002000090020000900200009002000050
-:100068009002000090020000900200009002000040
-:10007800700f000090020000900200009002000043
-:100088009002000090020000900200009002000020
-:100098009002000090020000900200009002000010
-:1000a80090020000ae1000009002000090020000d4
-:1000b80090020000900200009002000090020000f0
-:1000c80090020000900200009002000090020000e0
-:1000d80090020000900200009002000090020000d0
-:1000e80090020000900200009002000090020000c0
-:1000f80090020000900200009002000090020000b0
-:10010800900200009002000090020000900200009f
-:10011800900200009002000090020000900200008f
-:10012800900200009002000090020000900200007f
-:10013800900200009002000090020000900200006f
-:10014800900200009002000090020000900200005f
-:10015800900200009002000090020000900200004f
-:10016800900200009002000090020000900200003f
-:10017800900200009002000090020000900200002f
-:10018800900200009002000090020000900200001f
-:10019800900200009002000090020000900200000f
-:1001a80090020000900200009002000090020000ff
-:1001b80090020000900200009002000090020000ef
-:1001c80090020000900200009002000090020000df
-:1001d80090020000900200009002000090020000cf
-:1001e80090020000900200009002000090020000bf
-:0801f8009002000090020000db
-:020000040000fa
-:10020800900200009002000090020000900200009e
-:10021800900200009002000090020000900200008e
-:10022800900200009002000090020000900200007e
-:10023800900200009002000090020000900200006e
-:100248009002000090020000be0f0000a8160000f7
-:10025800900200009002000090020000900200004e
-:10026800900200009002000090020000900200003e
-:10027800700f000090020000900200009002000041
-:10028800900200009002000090020000900200001e
-:10029800900200009002000090020000900200000e
-:1002a80090020000ae1000009002000090020000d2
-:1002b80090020000900200009002000090020000ee
-:1002c80090020000900200009002000090020000de
-:1002d80090020000900200009002000090020000ce
-:1002e80090020000900200009002000090020000be
-:1002f80090020000900200009002000090020000ae
-:10030800900200009002000090020000900200009d
-:10031800900200009002000090020000900200008d
-:10032800900200009002000090020000900200007d
-:10033800900200009002000090020000900200006d
-:10034800900200009002000090020000900200005d
-:10035800900200009002000090020000900200004d
-:10036800900200009002000090020000900200003d
-:10037800900200009002000090020000900200002d
-:10038800900200009002000090020000900200001d
-:10039800900200009002000090020000900200000d
-:1003a80090020000900200009002000090020000fd
-:1003b80090020000900200009002000090020000ed
-:1003c80090020000900200009002000090020000dd
-:1003d80090020000900200009002000090020000cd
-:1003e80090020000900200009002000090020000bd
-:0803f8009002000090020000d9
-:020000040000fa
-:1018f000434c000041530000533d000025300000e0
-:101900003258000020490000443d0000253000000e
-:1019100032580000204c0000454e00003d250000dc
-:10192000640d00000a00000025300000347500003e
-:101930002f25000030320000642f00002530000009
-:10194000326400002025000030320000643a0000bc
-:1019500025300000326400003a25000030320000db
-:10196000642e000025300000396c00006420000067
-:10197000253600006c7500006d7300002025000006
-:10198000366c0000756e00007320000025300000ea
-:10199000325800000d0a00000053000054410000be
-:1019a000525400000d0a0000005300005441000092
-:1019b000525400002064000065620000756700005a
-:1019c0000d0a000000520000504900004e52000075
-:1019d000323000003d25000030340000580d00007a
-:1019e0000a0000005350000049310000434f00003e
-:1019f0004e3100003d25000030340000580d00003d
-:101a00000a0000005350000049310000434f00001d
-:101a10004e3200003d25000030340000580d00001b
-:101a20000a000000535000004931000053540000e8
-:101a3000415400003d25000030340000580d0000e6
-:101a40000a0000002530000032580000200000008d
-:101a50000d0a000000410000434b00000d0a000089
-:101a6000004e0000414300004b0d00000a00000042
-:020000040000fa
-:101a7000004378006312b9008180fb0060092000f8
-:101a80000088b900840040000682fb004038200036
-:101a900000a2b900848040006080200000804000e7
-:101aa00034c0b300335878000442e900fdff3a0027
-:101ab000000006000000fb007801b900e0d1210021
-:101ac000020040000b000900311878008001b100cd
-:101ad0008101b100000006001801fa00889fbe00d5
-:101ae0008a1f7800e4044700480820000e044400e0
-:101af0004a1020000e054500890178000e81e8009b
-:101b00008e00e8000e0078001a0307001e00900007
-:101b1000801f78001e4090000080fb00801f78002e
-:101b20001e80fb00801f780081c72800811f78007d
-:101b300008007800c2fa0700080078005105070085
-:101b40009e00900009007800f00107008a007800ec
-:101b500009007800ed0207007e5092000080fb0033
-:101b6000801f78004e009100de009100809fbe0033
-:101b70001a00be00809fbe006e009100fe00910022
-:101b8000809fbe006e5092000080fb00801f780096
-:101b90005e5092000080fb00801f78004e50920043
-:101ba0000080fb00801f78003e5092000080fb0008
-:101bb000801f78002e5092000080fb00801f78006c
-:101bc0008e089100811f780040c92800801f78008e
-:101bd000080078009afa0700c0fd2f0080874700b0
-:101be0000800780027050700c3ff37002000fa002f
-:101bf000881f780091028000ff3ffc0003ceb300f5
-:101c0000034078004260b70091028800103a8000db
-:101c1000f00bb20072052000610420002474200043
-:101c2000014a7800024a7800004a7800a4c6bf0042
-:101c3000034060006040b300a4e6b700c5c6bf0023
-:101c4000034060003040b300c5e6b700a6c6bf0041
-:101c5000034060005041b300a6e6b700d4c6bf0001
-:101c6000034060005040b300d4e6b700d9c6bf00bf
-:101c700003406000d9e6b700acc6bf000340600077
-:101c8000d040b300ace6b700adc6bf000340600073
-:101c90007041b300ade6b700aec6bf0003406000c0
-:101ca0008041b300aee6b700d6c6bf000340600077
-:101cb000a040b300d6e6b700a8c6bf00034060004e
-:101cc0002041b300a8e6b700d0c6bf0003406000c3
-:101cd0000034a000d0e6b700d1c6bf0003406000ca
-:101ce0007040b300d1e6b7008000eb000116880019
-:101cf000000c230040168800401a2000801688003f
-:101d0000213a88002ca3ef0081c6bf000340600089
-:101d1000c040b30081e6b700aec0bf0088cfb300bb
-:101d2000084060000024a000aee0b7008220a800b8
-:101d30008000fd0000e8b7008000fd000c030700f4
-:101d40009201200001402000008028004d0407007f
-:101d5000920120000140200000802800500407006c
-:101d60008804070093040700d0cc2800c5040700ae
-:101d700050cd280028fa070040358000801f7800e9
-:101d800034ce2800841f7800a0fd2f000f004000f3
-:101d90002bfa0700a0fd2f000f004000b904070038
-:101da00010128000801f780024cf2800841f780044
-:101db00060fd2f000f00400021fa070060fd2f009a
-:101dc0000f004000af04070020128000801f780041
-:101dd00024d02800841f780020fd2f000f00400031
-:101de00017fa070020fd2f000f004000a504070090
-:101df00000128000801f780024d12800841f780002
-:101e0000e0fc2f000f0040000dfa0700e0fc2f005f
-:101e10000f0040009b0407009560a800a9c0bf0008
-:101e2000f1c8b3000140600001c4b300014070007c
-:101e3000a9e0b70092028000ff3ffc0042c0bf0053
-:101e40007f4060000140700042e0b70092028800cd
-:101e50000904070000582200010020005401070077
-:101e60008e02070004040700ae0107008b02070082
-:101e70009701070089020700cb42a800100020004c
-:101e80000100200071040700cb62a90010002000af
-:101e9000010020006d040700b5020700c102070021
-:101ea00000a82100610020006804070095020700d7
-:101eb000df02070010030700fd0307008540a900ab
-:101ec000a9c0bf00084060000024a000a9e0b7003e
-:101ed0009680a800f0875700fffe0700feff37003e
-:101ee0003600f800809fbe00829fbe00849fbe0027
-:101ef000869fbe008680a900cbc2bf0070406000f4
-:101f000018003a00aefdb70010c0b30001e8b700fa
-:101f10000048e2000c003a00b03def00b23def0097
-:101f2000b43def00b63def00b83def00ba3def0025
-:101f3000bc3def00be3def00c03def00c23def00f5
-:101f4000c43def00c63def00aeddbf0074020700e8
-:101f500040c2a900401280008540a9009540a80019
-:101f60004822ef004f03be004f02be004f01be00eb
-:101f70004f00be003600f900004006003600f800b1
-:101f8000809fbe00829fbe00849fbe00869fbe00d1
-:101f9000889fbe008a9fbe000400fa0041128000a4
-:101fa0000144780040c2a90001c8bf00e24f5000c0
-:101fb0000a003200e34f50000e003200e14f5000a3
-:101fc0005b003a000100780004e8b70020c0b300cd
-:101fd00001e8b7004822ef00570037000100780001
-:101fe00003e8b70030c0b30001e8b7004822ef00b3
-:101ff000510037005e0207000800780002e8b700d1
-:1020000020802000ff030700e0bf9f00f1bf9f007a
-:102010000a8020001a4578000a05fb00e8da210052
-:1020200018447800b50307008040780064815700a9
-:102030006355b9000884fb006009200000c4b900a2
-:102040000a0444008180fb00403820000088b90069
-:1020500000044400608020000000440031c0b30050
-:10206000325878008140e900fdff3a00e1da2100b2
-:10207000914078000100fb004200dd0002db2100fe
-:10208000020040006fba9700ffba970010084200a4
-:1020900050904a000140e800aefdb700e54f500007
-:1020a0001e0034000048ec008040780000e8b700d3
-:1020b00010c3b30080cf5000150034000204780034
-:1020c0000105fb00cfd5de0089dc21000a01be003e
-:1020d0001800be0014f90700009cbe00888f540051
-:1020e000faff3a00850307000000fb007801b90001
-:1020f000e0d121000200400001db21000b000900bb
-:10210000311878008001b1007f0307000068ef00fc
-:102110009540a9000168ef000700370000020700a2
-:102120004822ef0010c0b30001e8b70002003700fa
-:102130009540a9000168ef000080fa004f05be003d
-:102140004f04be004f03be004f02be004f01be0051
-:102150004f00be003600f90000400600809fbe0020
-:10216000829fbe00849fbe0072f6800053802000d4
-:102170009341780044c2b3001200370060c2bf0030
-:1021800005c2b3008540600005003a00401380009e
-:10219000844f500002003a00320020008141780054
-:1021a00060c2bf000018a30006003a000200e00071
-:1021b000040032000380fb00401388008341e800e4
-:1021c0000201e90060c2bf000058a300ebff32002b
-:1021d00072f688000300780005e8b70060c2bf000f
-:1021e0000068a3000100320060c2a9004f02be00d7
-:1021f0004f01be004f00be0000400600881f78005f
-:102200000004eb0000902000d10320008f030700a2
-:1022100008407800c20107000804e800ef0f5400ee
-:10222000f8ff34000004eb00f6ff37004013800095
-:10223000d322a80000a8210061002000830307002a
-:10224000d322a90000e82e00610320007f030700cd
-:10225000f7ff3700000278000040eb0000497800eb
-:1022600080497800e4804000090032008482e80060
-:102270000002eb001243780035404300004978002b
-:10228000934940000402e800810f5200f9ff3a0030
-:10229000000006000200fa00889fbe008204780059
-:1022a0000404780052cbb300024a780022c6b3007f
-:1022b000124298002042980031429800494298000a
-:1022c0004848de005042980066004200090178004c
-:1022d00083007800b3f80700e58157006681570056
-:1022e0000800be00dbff0700090444002ff8970038
-:1022f000604498003ff8970070449800688044005c
-:102300004f04be000080fa00000006001000fa0032
-:10231000889fbe008a1f780000057800810478003d
-:102320000100e0000e0032000004eb006a407c0077
-:102330000080fb00801f780020d22800801f7800da
-:102340007a805700bef807007a8057004d030700d7
-:102350000804e800e4875700890f5400f3ff3900b0
-:1023600080d22800470307004f0578004f04be00c5
-:102370000080fa0000000600800178000100e00003
-:102380000a0032000001eb0023c2bf000018a300c6
-:10239000fdff3a00634079000080fb0020118800b7
-:1023a0000201e800828f5000f7ff3a0000000600ab
-:1023b0002000fa00881f78000003be000f04780098
-:1023c000f68747008801780012c0b300024c7800fd
-:1023d0008040eb001144980021449800314498005b
-:1023e00000cdb3004044980080c0b3005044980032
-:1023f0006144980071449800064c98004838dd000c
-:102400004832de0004027000c83ade00144c980026
-:10241000403ade0005002000244c9800483bde00d6
-:10242000364c9800424c9800514c9800624c9800f1
-:10243000714c980001549800115498002154980050
-:10244000315498000e0278004201200060c0b300b1
-:1024500090ff0700800078000e007800c6ff07009c
-:10246000880778004f0478000080fa00000006001a
-:102470002000fa00881f78000f047800e6874700e4
-:1024800088017800004ceb0030c2b3001044980083
-:1024900000c0eb002044980020c0b30030449800f6
-:1024a0000e0278004200200071c1b30060c0b3008a
-:1024b00078ff0700800078000e007800aeff07006c
-:1024c000880778004f0478000080fa0000000600ba
-:1024d0002000fa00881f78000f047800e487470086
-:1024e0008801780011c0b300014c780010c2b3001d
-:1024f00010449800214498000e0278003200200019
-:1025000060c0b30063ff0700800078000e00780011
-:1025100099ff0700880778004f0478000080fa00d0
-:10252000000006004000fa00889fbe008a1f780065
-:102530000f0578002f02b000090220000901780081
-:102540008000eb000a0078001df8070010c0b300ff
-:10255000004d780020c3b300404598000040eb00d8
-:10256000004d980001c8b300114d980002c7b30098
-:10257000224d9800304d9800404d9800514d9800e4
-:10258000624d9800704d98000055980010559800c5
-:1025900020559800315598004055980050559800a6
-:1025a0006055980071559800f0ceb300405d9800da
-:1025b0000e0278008a0178000901780011c3b30087
-:1025c00060c0b30033ff0700800078000e00780081
-:1025d00069ff07008a0778004f0578004f04be00a6
-:1025e0000080fa00000006004000fa00889fbe004c
-:1025f0008a1f78000f0578002f02b0000902200022
-:10260000090178008000eb000a007800ecf7070071
-:102610008040eb00014d780020c3b3004045980096
-:1026200003c4b300034d980022c4b300124d9800b8
-:10263000f0c0b300204d9800314d9800434d9800f4
-:10264000524d9800604d9800714d980001559800ca
-:1026500011559800215598003155980071559800f2
-:102660004155980050c3b30050559800c0c0b30006
-:102670006055980070cfb300405d98000e0278005e
-:102680008a0178000901780011c3b30060c0b3006b
-:1026900000ff0700800078000e00780036ff07007a
-:1026a0008a0778004f0578004f04be000080fa00ca
-:1026b000000006001000fa00889fbe000004eb0036
-:1026c000793e2000d50107000000e000fdff320048
-:1026d000db010700801f780020d22800801f7800cf
-:1026e00078805700d6f7070078805700650207000a
-:1026f0000804e800e4875700890f5400f1ff360012
-:102700004f04be000080fa00000006001001be0069
-:102710008288be0020019000b0019000a2009800c5
-:10272000b300980040019000d0019000c2009800d2
-:10273000d3009800e0019000e30098006049900009
-:10274000e2489800f0499000f3489800005190004a
-:102750008250980090519000935098002051900022
-:10276000a250980030509000b05098000000eb004c
-:1027700000000600889fbe008a9fbe008c9fbe009e
-:102780000006be0082047800830578000044eb0058
-:102790000100370018c0b300a00107000000e000ee
-:1027a000fdff3200a601070080007800e44f5400ce
-:1027b000260032000b003c00e14f540018003200ac
-:1027c00003003c000804e00010003200f2ff370074
-:1027d000e24f540017003200e34f5400eeff3a007e
-:1027e00017003700e64f5400200032001a00350071
-:1027f000e74f540003003200e84f5400e6ff3a0070
-:102800002100370088c0b300e3ff37000044eb002d
-:10281000500b2000808f5000dfff3a00ddff3700b3
-:1028200028c0b30020062000808f5000daff32005d
-:10283000d8ff3700004e780038c0b300d6ff37000d
-:10284000804e780048c0b300d3ff3700800c78007a
-:1028500058c0b300d0ff37004800dd00990c40009d
-:1028600068c0b3000005eb00cbff370000f57d002a
-:102870000a05e80078c0b300990f5500c6ff310083
-:1028800068c0b300c4ff37000000eb004f06be0075
-:102890004f05be004f04be00000006008400fa0091
-:1028a000c0f72f000f004000e40140000081e80065
-:1028b0008000e800c0f72f000f004000adff0700c8
-:1028c0004ff89600e54f5000f5ff3a005ff896008c
-:1028d000e14f500004003a00b0d22800e90107009f
-:1028e00010002000050037000004e000ecff3a0073
-:1028f00010d32800e30107000000eb000080fa007d
-:102900000000060000000000c2e2a9000000000074
-:10291000c302a90000000000c322a90000000600b5
-:10292000010120000080fb000000e800808f5000c3
-:1029300002003a00c322a90001003700c322a80008
-:1029400000000000c302a800c302a9008100e90042
-:10295000f6ff3a0000000000c2e2a80000000000fc
-:10296000c322a90000000000c2e2a9000000060086
-:10297000c322a80000c1b300c302a800c302a9007b
-:102980000040e900fcff3a0000000000c2e2a8009d
-:1029900000000000c322a90000000000c2e2a9005c
-:1029a00000000600cb42a8004000200001002000eb
-:1029b000a6010700cb42a90000fa20000100200078
-:1029c000a2010700cb42a80000000600cb62a800cd
-:1029d00040002000010020009c010700cb62a900fc
-:1029e000000006008040780040c2bf000018a3002d
-:1029f000fdff3a000180fb00401288000000060045
-:102a000040c2a90040c2bf000018a300fdff3a0069
-:102a1000401280004822ef0040c2bf000008a3001f
-:102a2000fdff3200401280000080fb000000060025
-:102a3000881f78000004eb0008407800b8ff07000a
-:102a400010c1b300e7ff0700c9ff07000840780086
-:102a5000b3ff070000c4b300e2ff070080c0b3006b
-:102a6000e0ff070050c0b300deff070080c0b300e6
-:102a7000dcff070020c2b300daff07000040eb00d4
-:102a8000d8ff07000040eb00d6ff07000040eb0036
-:102a9000d4ff07000040eb00d2ff07000040eb002e
-:102aa000d0ff070000c4b300ceff0700b0ff07004f
-:102ab0000804e800e60f5400dfff3a00cb62a800ec
-:102ac0001000200001002000600107000004eb005e
-:102ad0000840780092ff070000c1b300c1ff070063
-:102ae000a3ff07000804e800e60f5400f8ff3a00cf
-:102af0004f04780000000600889fbe008004eb00b1
-:102b000066c444000840780085ff070010c4b30085
-:102b1000b4ff070010c0b300b2ff070094ff070026
-:102b200000fa20000100200048010700084078005a
-:102b30007bff070000c4b300aaff070080c0b300fa
-:102b4000a8ff07008aff07000840780074ff07000d
-:102b500080c4b300a3ff0700f0c3b300a1ff0700c8
-:102b600083ff0700084078006dff0700c0c4b30072
-:102b70009cff070000c4b3009aff07007cff07001a
-:102b80008904e800e68f5400ddff3a004f04be00e0
-:042b9000000006003b
-:020000040000fa
-:102b940000080000c815000000000000ce1e000060
-:102ba400020000000200000000020000c81d000036
-:102bb4000201000000000000ca1e00000400000022
-:102bc400000000009a1f0000260000000200000020
-:102bd4009c1fc2001f000000c21f0900000000006b
-:102be4000200c0001f000000c01f06000201000018
-:102bf40000000000000000000000060002020000c7
-:102c040000000000c01f00000600000000000000db
-:102c1400d01e0000a000000002000000010000001f
-:102c24000000000000000a00000000000000000096
-:102c3400006400000000000000000000e803000041
-:102c44000000000000001000270000000000000049
-:102c540000a08600010000000000000040420f00b8
-:102c640000000000000080009698000000000000b2
-:102c74000000e100f50500000000000000ca9a0011
-:102c84003b00000000000000e40b540002000000c0
-:102c94000000e80076481700000000000010a500be
-:102ca400d4e8000000000000a0724e0018090000e3
-:102cb400000040007a10f3005a0000000080c600b3
-:102cc400a47e8d000300000000c16f00f286230083
-:102cd400000000008a5d7800456301000000640084
-:102ce400a7b3b600e00d000000e889000423c70084
-:102cf4008a000000701f00002a000000020000008b
-:102d0400286e75006c6c29000030310032333400b9
-:102d14003536370038394100424344004546000007
-:102d240030313200333435003637380039616200cf
-:102d34006364650066000000c61f00000200000016
-:0c2d440002000000010000000000000080
-:020000040000fa
-:102d5000809fbe00829fbe008560a90022c2bf0086
-:102d60000008a3000c00320082dc21001241780030
-:102d7000a3dc2100301180008280fb0080f079000c
-:102d80000241e80022c2bf000008a300f9ff3a0098
-:102d900002007800c8fdb70022c2bf000018a300df
-:102da000010032002222a9004f01be004f00be00e8
-:102db0000040060000017800904078000104e00027
-:102dc0000800320023c2bf000018a300fdff3a0034
-:102dd0000100fb0020118800d24078000104e000cf
-:102de000f8ff3a00000006000001780090407800eb
-:102df0000104e0000800320033c2bf000018a30045
-:102e0000fdff3a000100fb00a0118800d2407800cd
-:102e10000104e000f8ff3a00000006008040eb00eb
-:102e2000c8ddbf00c95de30001003a0011c0b30076
-:102e3000014078000004a2000080fb0000000600b2
-:102e400092dc2100124178008080eb00c8ddbf00d9
-:102e50000014e100060032008280fb00a0dc2100ab
-:102e6000614078008080fb000240e800c9fdb700a7
-:102e70000100780000000600c8ddbf00c9fdb700f2
-:102e8000000006000011880011118800421188001e
-:102e90000040eb00c8fdb700c9fdb7000000060008
-:102ea0008011880091118800c2118800000006007e
-:102eb0000040eb00cafeb700cbfeb70060c0b30015
-:102ec000ccfeb70000000600cbdebf000080fb0098
-:102ed00000000600cbfeb70000000600cb5eec0051
-:102ee000cbfeb700c1ec2100914078000104e10065
-:102ef00001003900cb7eef0000000600cadebf00f3
-:102f00000080fb0000000600ca5eec00cafeb700ad
-:102f1000c1ec2100914078000104e100010039007a
-:102f2000ca7eef0000000600b1ec2100914078005d
-:102f3000a0ec210090c0100002003b00ccdebf00de
-:102f400080c040000180fb0000000600881f780060
-:102f50000004eb00f4ff07000080fb00c1ec21003f
-:102f6000914078008180fb008100e900810f5000d2
-:102f70000100350018002000080078004f04780098
-:102f8000000006004022ef000101200040128000f6
-:102f90008100e900fdff3a008540a900e023200000
-:102fa000101288002112880040c2a90041e2a80046
-:102fb000000006006022ef000201200040138000a4
-:102fc0000201e900fdff3a008820a90060c2bf00ad
-:102fd00031ceb300014060000044a00060e2b700c1
-:102fe0000010200010138800221388006322a9001b
-:102ff00062e2a80060c2a9006402a80061e2a80021
-:10300000000006000400fa00648157008000780088
-:1030100031597800315978001149780020409000ea
-:103020000004e00003003d0000c0eb00f0ff9f0043
-:10303000020037000040eb00f0ff9f006fb89700e0
-:0c304000ffb897000080fa0000000600b6
-:020000040000fa
-:10304c00f03fb1000180b10006003500ee0309002d
-:10305c0000000000403fb1000180b100fbff3d00cb
-:10306c001000b000203fb0000200350000800900c5
-:08307c00000000000000060046
-:020000040000fa
-:0830840058ff070000000600e0
-:00000001FF

diff --git a/dist/default/production/ad2010.production.out b/dist/default/production/ad2010.production.out
deleted file mode 100755 (executable)
index c7b34af..0000000
Binary files a/dist/default/production/ad2010.production.out and /dev/null differ

diff --git a/main.c b/main.c
index 58ee41c..2d54e34 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,5 +1,8 @@
 /*
  * File:   main.c
+ * sciLogger サブCPU
+ * PIC24Fj64GA004
+ * 8MHz
  *
  * Created on February 9, 2010, 10:53 AM
  */
@@ -18,6 +21,7 @@
 #include "delay.h"
 #include "ring.h"
 #include "byte2var.h"
+#include "myint.h"
 
 _CONFIG1( JTAGEN_OFF & GCP_OFF & GWRP_OFF & COE_OFF & FWDTEN_OFF & ICS_PGx2 )
 //_CONFIG2( FCKSM_CSDCMD & OSCIOFNC_ON & POSCMOD_OFF & FNOSC_FRC)
@@ -83,7 +87,31 @@ void test_ublox_rcv_mon(void)
 
     }
 }
+static UbloxNavTimeUtc gpsNow;
+static void ublox_rcv(void)
+{
+    unsigned char class, id;
+    unsigned int    len;
+    unsigned char   payload[128];
+//    char    sz[128];
+    UbloxNavTimeUtc *gps = &gpsNow;
+
+    ublox_rcv_pkt(&class, &id, &len, payload);
+//    sprintf(sz, "CLASS=%02X ID=%02X LEN=%d\r\n", class, id, len);
+//    PDEBUG(sz);
+//    ublox_debug_pkt_out(payload, len);
+    if (class == UBX_CLS_NAV && id == UBX_ID_NAV_TIMEUTC && len == UBX_LEN_NAV_TIMEUTC) {
+        ublox_decode_nav_timeutc(payload, gps);
+/*        sprintf(sz, "%04u/%02d/%02d %02d:%02d:%02d.%09ld %6lums %6luns %02X\r\n",
+            gps->year, gps->month, gps->day, gps->hour, gps->min, gps->sec, gps->nano,
+            gps->tow, gps->tacc, gps->valid
+        );
+        PDEBUG(sz);
+*/
+    }
+}
 
+/**** INT1/SPI1 ***********************************************/
 /*
  * INT1 Int及びSPI1 IntでADのデータを取得する
  */
@@ -98,7 +126,12 @@ static char adint_cnt = 0;  // 0〜AD_SAMPLE-1
 static char adint_sts = ADSTS_IDLE;
 static long adint_add[AD_CHNUM];    // 1秒平均用加算
 
+/**** 1PPS ********************************************/
+static char pps_intf;
 
+#define pps_intf_clear()  pps_intf = 0
+#define pps_intf_set()  pps_intf = 1
+#define pps_is_intf_enable()    (pps_intf != 0)
 
 int main(int argc, char** argv) {
     unsigned int i;
@@ -110,7 +143,8 @@ int main(int argc, char** argv) {
     const double Baudrate1 = ( double )FCY / ( 16 * BAUDRATE1 ) - 1;
     // ボーレートの小数点以下を四捨五入する
     unsigned int baudrate1 = ( unsigned int )( Baudrate1 + 0.5 );
-    char    sz[32];
+    char    sz[128];
+    UbloxNavTimeUtc *gps = &gpsNow;
 
     // 割り込み禁止
     SET_CPU_IPL( 7 );
@@ -142,14 +176,18 @@ int main(int argc, char** argv) {
     CLKDIV = 0;                 // CPU Peripheral Clock Ratio=1:1
     AD1PCFG = 0xFFFF;           // AN1-12input pin = Digital mode
 
-    // INT1(RP12 RB12) AD DRDY0 Int enable
+    // INT1(RP12 RB12) AD -DRDY0 Int enable
     RPINR0bits.INT1R = 12;  // RP12(RB12)
-    IPC5bits.INT1IP = 4;    // Int1 priority
-    INTCON2bits.INT1EP = 1; // Negative Edge
-//    ad_drdy0_intf_clear();
+    int1_level_set(4);    // Int priority
+    int1_edge_neg(); // Negative Edge
+    // INT0(RB7) GPS +PPS Int enable
+    int0_level_set(4);    // INT Priority
+    int0_edge_pos(); // Positive Edge
 
     adint_cnt = 0;
     ad_cs_dis();
+    pps_intf_clear();
+    
     // GPS UART1初期設定　BRGH=Standard mode
     // 9600bps 8bit nonparity 1stop nonflowcnt.
     //                           5432109876543210
@@ -223,11 +261,38 @@ int main(int argc, char** argv) {
     spi1_set_int_level(4);
 
     // INT1割り込み許可
-    IEC1bits.INT1IE = 1;    // Int enable
+    int1_intf_clear();
+    int1_int_enable();    // Int enable
+    // INT0割り込み許可
+    int0_intf_clear();
+    int0_int_enable();    // Int enable
 
     while(1) {
-        test_ublox_rcv_mon();
+        ublox_rcv();
+        if (ring_read_get() != ring_write_get()) {
+            sprintf(sz, "%04u/%02d/%02d %02d:%02d:%02d.%09ld %6lums %6luns %02X\r\n",
+                gps->year, gps->month, gps->day, gps->hour, gps->min, gps->sec, gps->nano,
+                gps->tow, gps->tacc, gps->valid
+            );
+            PDEBUG(sz);
+
+#if 1
+            //
+            char ch;
+            for(ch=0; ch<AD_CHNUM; ch++) {
+                sprintf(sz, "%+7ld,", adbuf_1sec[ring_read_get()][ch]);
+                PDEBUG(sz);
+            }
+            PDEBUG("\r\n");
+#endif
+            ring_read_plus();
+        }
     }
+/*
+        if (pps_is_intf_enable()) {
+            pps_intf_clear();
+            PDEBUG("pps\r\n");
+        }
     i = 0;
     while(1) {
         if (ring_read_get() != ring_write_get()) {
@@ -241,9 +306,29 @@ int main(int argc, char** argv) {
             ring_read_plus();
         }
     }
+*/
     
     return (EXIT_SUCCESS);
 }
+/*
+ * INT0 GPS 1PPS割り込みハンドラ
+ * 
+ *
+ */
+void __attribute__((interrupt, no_auto_psv)) _INT0Interrupt(void)
+{
+    int0_intf_clear();
+    pps_intf_set();
+/****AD同期!!!!!!!!!!!!!!!
+ * とりあえず　要修正
+ */
+// カウンタの同期
+    adint_cnt = 0;
+
+// AD START信号による同期
+
+
+}
 
 /*
  * INT1(RP12) AD DRDY0割り込みハンドラ
@@ -252,8 +337,9 @@ int main(int argc, char** argv) {
  *
  */
 void __attribute__((interrupt, no_auto_psv)) _INT1Interrupt(void)
+//void _ISR _INT1Interrupt(void)
 {
-    IFS1bits.INT1IF = 0;
+    int1_intf_clear();
     if (!ad_is_drdy0_enable()) {
         return;
     }
@@ -282,7 +368,7 @@ void __attribute__((interrupt, no_auto_psv)) _INT1Interrupt(void)
  * 
  */
 //void _ISR _SPI1Interrupt(void)
-void __attribute__((interrupt, no_auto_psv)) _SPI1Interrupt(void)
+void __attribute__((interrupt, auto_psv)) _SPI1Interrupt(void)
 {
     static unsigned char in[3];
     unsigned char c;

diff --git a/myint.h b/myint.h
new file mode 100644 (file)
index 0000000..5341ce9
--- /dev/null
+++ b/myint.h
@@ -0,0 +1,19 @@
+#ifndef __MYINT_H__
+
+#define __MYINT_H__
+
+#include <p24FJ64GA004.h>
+
+#define int0_intf_clear()   IFS0bits.INT0IF = 0
+#define int0_level_set(i)   IPC0bits.INT0IP = i
+#define int0_int_enable()   IEC0bits.INT0IE = 1
+#define int0_edge_pos()     INTCON2bits.INT0EP = 0
+#define int0_edge_neg()     INTCON2bits.INT0EP = 1
+
+#define int1_intf_clear()   IFS1bits.INT1IF = 0
+#define int1_level_set(i)   IPC5bits.INT1IP = i
+#define int1_int_enable()   IEC1bits.INT1IE = 1
+#define int1_edge_pos()     INTCON2bits.INT1EP = 0
+#define int1_edge_neg()     INTCON2bits.INT1EP = 1
+
+#endif

diff --git a/nbproject/Makefile-genesis.properties b/nbproject/Makefile-genesis.properties
index 3d47df6..03b18d0 100644 (file)
--- a/nbproject/Makefile-genesis.properties
+++ b/nbproject/Makefile-genesis.properties
@@ -1,5 +1,5 @@
 #
-#Mon Nov 21 17:20:05 JST 2011
+#Tue Nov 22 21:08:51 JST 2011
 default.languagetoolchain.dir=/opt/microchip/mplabc30/v3.30c/bin
 com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=11bb82e71763925c87fa30f6c65473b1
 default.languagetoolchain.version=3_30

diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index a57487b..e520031 100644 (file)
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -28,6 +28,7 @@
       <itemPath>main.c</itemPath>
       <itemPath>myad.c</itemPath>
       <itemPath>myad.h</itemPath>
+      <itemPath>myint.h</itemPath>
       <itemPath>myspi.c</itemPath>
       <itemPath>myspi.h</itemPath>
       <itemPath>myuart.c</itemPath>
@@ -98,8 +99,8 @@
         <property key="extra-include-directories-for-assembler" value=""/>
         <property key="preprocessor-macros" value=""/>
         <property key="list-file" value=""/>
-        <property key="list-assembly" value="false"/>
         <property key="list-source" value="false"/>
+        <property key="list-assembly" value="false"/>
         <property key="relax" value="false"/>
         <property key="extra-include-directories-for-preprocessor" value=""/>
         <property key="warning-level" value="emit-warnings"/>
@@ -164,7 +165,7 @@
         <property key="programoptions.preserveeeprom" value="false"/>
         <property key="ADC 1" value="true"/>
         <property key="debugoptions.useswbreakpoints" value="false"/>
-        <property key="hwtoolclock.frcindebug" value="false"/>
+        <property key="hwtoolclock.frcindebug" value="true"/>
         <property key="OUTPUT COMPARE 5" value="true"/>
         <property key="OUTPUT COMPARE 4" value="true"/>
         <property key="memories.programmemory" value="true"/>
@@ -174,6 +175,7 @@
         <property key="poweroptions.powerenable" value="false"/>
         <property key="memories.programmemory.start" value="0x0"/>
         <property key="programoptions.preserveprogramrange.start" value="0x0"/>
+        <property key="ToolFirmwareOption.UseLatestFirmware" value="true"/>
         <property key="AutoSelectMemRanges" value="auto"/>
         <property key="voltagevalue" value="3.25"/>
         <property key="memories.programmemory.end" value="0xabfb"/>
@@ -181,16 +183,14 @@
         <property key="TIMER4" value="true"/>
         <property key="TIMER3" value="true"/>
         <property key="SPI 2" value="true"/>
-        <property key="TIMER2" value="true"/>
         <property key="SPI 1" value="true"/>
+        <property key="TIMER2" value="true"/>
         <property key="TIMER1" value="true"/>
-        <property key="hwtoolclock.instructionspeed" value=""/>
         <property key="CRC" value="true"/>
         <property key="I2C2" value="true"/>
         <property key="I2C1" value="true"/>
-        <property key="hwtoolclock.units" value="mips"/>
-        <property key="Freeze All Other Peripherals" value="true"/>
         <property key="programoptions.preserveprogramrange.end" value="0xff"/>
+        <property key="Freeze All Other Peripherals" value="true"/>
       </ICD3PlatformTool>
     </conf>
   </confs>

diff --git a/ublox.h b/ublox.h
index 72b5422..3fa300a 100644 (file)
--- a/ublox.h
+++ b/ublox.h
@@ -15,6 +15,8 @@
 // NAV-
 #define UBX_ID_NAV_TIMEUTC  0x21
 
+#define UBX_LEN_NAV_TIMEUTC 20
+
 // NAV-TIMEUTCパケットのデータ格納
 typedef struct {
     unsigned long   tow;    // ms GPS Millisecond Time of Week