WebSVN – MLAB – /Designs Rev 2820 and /Designs Rev 2821 – Path Comparison

/Designs/Measuring_instruments/AWS01A/SW/PIC16F887/main.c
64,7 → 64,7
{
unsigned int16 seq=0;

setup_adc_ports(NO_ANALOGS\|VSS_VDD);
/* setup_adc_ports(NO_ANALOGS\|VSS_VDD);
setup_adc(ADC_CLOCK_DIV_2);
setup_timer_0(RTCC_EXT_L_TO_H\|RTCC_DIV_1);
setup_timer_1(T1_EXTERNAL\|T1_DIV_BY_1\|T1_CLK_OUT);
79,7 → 79,7
// enable_interrupts(INT_TIMER0);
// enable_interrupts(GLOBAL);


*/
delay_ms(100);

welcome();

/Designs/Measuring_instruments/AWS01A/SW/PIC16F887/main.h
1,7 → 1,7
#include <16F887.h>
#device adc=10

#FUSES WDT //No Watch Dog Timer
#FUSES WDT // Watch Dog Timer
#FUSES INTRC //Internal RC Osc
#FUSES NOPUT //No Power Up Timer
#FUSES MCLR //Master Clear pin enabled

 /Designs/Measuring_instruments/AWS01A/SW/PIC16F887/main.hex
 ,4 → 1,4
-:0C00000010308A000028000010280800C2
+:0C0000000B308A009B2B00001028080029
 :10002000FF00030E8301A1000A08A0008A01040852
 :10003000A2007708A3007808A4007908A5007A0830
 :10004000A600831383128C308400001C29280C180E
 ,12 → 82,12
 :100520006430A2003A30A3002030A4006D30A50052
 :100530006130A6006930A7006E30A8002E30A900F7
 :100540006330AA002030AB003230AC003830AD0050
-:100550003130AE003830AF002030B0003230B10062
+:100550003230AE003030AF002030B0003230B10069
 :100560003030B2003130B3003330B4002D30B5003C
 :100570003030B6003330B7002D30B8003130B9001C
-:100580003030BA002030BB003130BC003230BD000A
-:100590003A30BE003530BF003930C0003A30C100BB
-:1005A0003030C2003530C3005A30C4002030C5009E
+:100580003030BA002030BB003130BC003430BD0008
+:100590003A30BE003330BF003730C0003A30C100BF
+:1005A0003430C2003730C3005A30C4002030C50098
 :1005B0006B30C6006130C7006B30C8006C30C900BA
 :1005C0006930CA006B30CB002030CC002430CD0025
 :1005D000CE01D301A030D2008312E921013078028C
 ,7 → 113,7
 :10071000D300831203170F0883160313D400520863
 :1007200083120C1E912B9900831653088312031712
 :100730008D00831603135408831203178F008D0A4C
-:1007400003198F0A4C2B640003138A110A16A72879
+:1007400003198F0A4C2B640003138A150A12DA2B43
 :1007500083160814881083128810AE2BAF2B8316D3
 :10076000881083128814B42BB52B831608108312BB
 :100770000810BA2BBB2B8316881083128810033005
 ,7 → 123,7
 :1007B000F70BD82BE8016808083C031CF12B8316C3
 :1007C0008810831288140330F700F70BE52B83168B
 :1007D0008810831288100330F700F70BED2BE80A1E
-:1007E000DB2BA8231430E800D5218A110A16AA2889
+:1007E000DB2BA8231430E800D5218A150A12DD2B53
 :1007F0008030831CFE2B8316BF0683128316C40130
 :10080000C5013B08C3003F08C3063A080319EC2C96
 :10081000C200F7003E080319F52CC2020319912CFF
 ,7 → 229,7
 :100E500003179300790892007808910077089000B2
 :100E60009701960195019730940003136320A71B07
 :100E70008B177A08BF007908BE007808BD00770894
-:100E8000BC008A110A16AD280830F202031C542F48
+:100E8000BC008A150A12E02B0830F202031C542F12
 :100E90007230840083130310800C00080319542F50
 :100EA000522F0000800B512F0800AF132F0883161C
 :100EB0008700831287130230F100F830F2004427D4
 ,7 → 270,7
 :1010E00096019501833094008A11031363208A15B9
 :1010F000A71B8B177A08F0007908EF007808EE003C
 :101100007708ED006D08F7006E08F8006F08F90029
-:101110007008FA008A110A16B72880308316A200D8
+:101110007008FA008A150A12E82B80308316A200A4
 :101120000330F700F70B9228A1012108073C031CAC
 :10113000B32888108312881083162008220503190B
 :10114000A3280814A7280810831208108316A828BB
 ,7 → 310,7
 :10136000F901FA018312080080080319CB29E90169
 :101370000408E8006910831B69140008F5008A114D
 :10138000F1278A1568088400831369188317840A73
-:101390000319850AB4298A110A16232BF0010408BF
+:101390000319850AB4298A150A12282EF0010408B7
 :1013A000EF007010831B7014690EF038EB00EB0730
 :1013B000E23EEC00323EEE0069080F39EC07EC0724
 :1013C000EE07E93EED00ED07ED07680E0F39ED077A
 ,7 → 323,7
 :101430001B2A20301E2AEF156F123030F707E90102
 :101440000408E8006910831B69147708F5008A1105
 :10145000F1278A1568088400831369188317840AA2
-:101460006F1F0B2A8A110A16542BF701F801F90194
+:101460006F1F0B2A8A150A12552EF701F801F90190
 :10147000FA018316A401A501A601A70123082204ED
 :10148000210420040319742A2030A8000310FB0D46
 :10149000FC0DFD0DFE0DA40DA50DA60DA70D230839
 ,169 → 368,146
 :10170000832B6908F7077708F5008A11F1278A15F6
 :101710000F30E8050A3068020318902B3030922B06
 :10172000E9136908E8076808F5008A11F1278A15A6
-:061730008A110A16D22CFA
-:10200000840183131F308305713083168F000F08FE
-:10201000031787110C3003139900A23098009030F9
-:1020200083129800C101C001C501C401C301C201EE
-:10203000831603170908C039890003131F129F1262
-:102040000030031788008312870188018901031378
-:10205000A801A901AA013030AB002E30AC0031300C
-:10206000AD00AE01FF30AF00C601C701C901C80114
-:10207000831603170908C039890003131F129F1222
-:10208000003003178800831203131F139F13831656
-:102090009F1783121F1483160108C739283881003F
-:1020A0000F30831290000030F80092000030831649
-:1020B000920083122F152F08831687008312970131
-:1020C00083169B019C0101309D0083120317870139
-:1020D000880189017130831603138F000F08831262
-:1020E000031785000E30F70003138101813084004F
-:1020F00083130008F0390738800064000008F739BE
-:10210000F719F039770480009412AF122F08831664
-:10211000870083122F162F08831687008312AF11B2
-:102120002F088316870022308312940040308316D4
-:10213000940083122F112F0883168700831207152E
-:102140006430E8000A12D5210A160A128B2A0A16F0
-:102150000A12D12B0A160A123E2D0A16D301643038
-:10216000E8000A12D5210A160A128A1500280A1652
-:102170008A117708E8007808E9007908EA007A0807
-:10218000EB00ED010408EC006D10831B6D1483104F
-:102190006B088316BD0083126A088316BC00831285
-:1021A00069088316BB00831268088316BA003330AF
-:1021B000C1009330C0000830BF008730BE000A1253
-:1021C0008312F8230A166C08840083136D18831792
-:1021D0007A08DF007908DE007808DD007708DC0087
-:1021E000E901E801DB01DA01D901D8010A12A823CB
-:1021F0000A1603308316A0000A128A1583128D2056
-:102200000A168A117C1078187C147C1817290A1277
-:10221000CA270A160A128A15D2200A168A117908C4
-:10222000FE007808FD007D08F8007E08F9007908B6
-:10223000E9007808E8000A12A8230A160530831678
-:10224000A0000A128A1583128D200A168A117C10AA
-:1022500078187C147C183C290A12CA270A160A121C
-:102260008A15D2200A168A117908FE007808FD0026
-:102270007D08F8007E08F9007908EB007808EA008C
-:102280006908FD006808FC006B088316A100831232
-:102290006A088316A0008312A7018B1BA7178B1354
-:1022A0007D08031792007C0891000A120313442052
-:1022B0000A16A71B8B1777088316AA007808AB00AD
-:1022C0007908AC007A08AD00C1002C08C0002B08CA
-:1022D000BF002A08BE000A30C500D730C400233032
-:1022E000C3007830C2000A128A1583123D210A16F3
-:1022F0008A1177088316AA007808AB007908AC0029
-:102300007A08AD0083142D08BD002C08BC002B08F2
-:10231000BB002A08BA00C101C0012030BF008430D0
-:10232000BE000A128312F8230A167A08D700790829
-:10233000D6007808D5007708D400A7018B1BA71713
-:102340008B1383162108831203179200831603133D
-:1023500020088312031791000A12031344200A165F
-:10236000A71B8B177A088316A9007908A80078089C
-:10237000A7007708A6002908C1002808C000270880
-:10238000BF002608BE005430C500E330C40025302D
-:10239000C3007A30C2000A128A1583123D210A1640
-:1023A0008A1177088316AA007808AB007908AC0078
-:1023B0007A08AD002908C1002808C0002708BF001E
-:1023C0002608BE002908C5002808C4002708C30045
-:1023D0002608C2000A128A1583123D210A168A11A4
-:1023E00077088316AE007808AF007908B0007A0845
-:1023F000B100C1003008C0002F08BF002E08BE0089
-:10240000A230C500E730C4003B30C3006C30C200CE
-:102410000A128A1583123D210A168A118314831623
-:102420002D08BD002C08BC002B08BB002A08BA00F0
-:102430007A08C1007908C0007808BF007708BE009C
-:102440000A128312F8230A1677088316AA0078085E
-:10245000AB007908AC007A08AD0083142D08BD00EC
-:102460002C08BC002B08BB002A08BA00C101C0011F
-:10247000BF018130BE000A128312F8230A167A08BF
-:10248000EF007908EE007808ED007708EC0083147F
-:1024900057088316BD00831256088316BC008312AA
-:1024A00055088316BB00831254088316BA00C10175
-:1024B000C0014830BF008330BE000A128312F823E7
-:1024C0000A1677088316AA007808AB007908AC00D2
-:1024D0007A08AD00AC30C100C530C0002730BF0065
-:1024E0007130BE002908C5002808C4002708C300B1
-:1024F0002608C2000A128A1583123D210A168A1183
-:1025000083100A308316BD00D730BC002330BB00D7
-:102510007830BA007A08C1007908C0007808BF0096
-:102520007708BE000A128312F8230A1683162D08B4
-:10253000C1002C08C0002B08BF002A08BE007A0882
-:10254000C5007908C4007808C3007708C2000A12E1
-:102550008A1583123D210A168A1177088316AA006C
-:102560007808AB007908AC007A08AD0083102D081C
-:10257000BD002C08BC002B08BB002A08BA0083123F
-:102580006F088316C10083126E088316C000831281
-:102590006D088316BF0083126C088316BE000A12F2
-:1025A0008312F8230A167A08DB007908DA00780823
-:1025B000D9007708D800831057088316BD0083120E
-:1025C00056088316BC00831255088316BB0083127D
-:1025D00054088316BA003330C1009330C00008306D
-:1025E000BF008730BE000A128312F8230A167A0849
-:1025F000D7007908D6007808D5007708D4002130B4
-:10260000F700F70B012B24300C1E042B990021300E
-:10261000F700F70B092BC7014A30C6004130F5001F
-:102620000A12F1270A165730F5000A12F1270A1686
-:102630005330F5000A12F1270A162B308400831359
-:102640000A128A15B4290A168A112030F5000A12D6
-:10265000F1270A16D2014A305207840083138008FA
-:102660000319482B2130F700F70B342B4A3052075F
-:10267000840083130008E80068080C1E3D2B9900B5
-:102680005208D20A4A3E840083130008D3062B2B3B
-:10269000C7014A30C600103084004908E9004808E4
-:1026A000E8000A128A15CE290A168A112030F50090
-:1026B0000A12F1270A16D2014A3052078400831306
-:1026C00080080319792B2130F700F70B652B4A306E
-:1026D0005207840083130008E80068080C1E6E2B64
-:1026E00099005208D20A4A3E840083130008D30698
-:1026F0005C2BC7014A30C600893084005F08EB00BC
-:102700005E08EA005D08E9005C08E8000230EC00C1
-:102710000A128A1579220A168A112030F5000A1247
-:10272000F1270A16D2014A30520784008313800829
-:102730000319B02B2130F700F70B9C2B4A305207BE
-:10274000840083130008E80068080C1EA52B99007C
-:102750005208D20A4A3E840083130008D306932B02
-:10276000C7014A30C600893084005708EB0056087C
-:10277000EA005508E9005408E8000230EC000A12AB
-:102780008A1579220A168A112030F5000A12F127DB
-:102790000A16D2014A3052078400831380080319B5
-:1027A000E72B2130F700F70BD32B4A305207840078
-:1027B00083130008E80068080C1EDC2B99005208FF
-:1027C000D20A4A3E840083130008D306CA2BC701ED
-:1027D0004A30C600023084005B08EB005A08EA0069
-:1027E0005908E9005808E8000130EC000A128A157F
-:1027F00079220A168A112030F5000A12F1270A16EA
-:10280000D2014A30520784008313800803191E2C1A
-:102810002130F700F70B0A2C4A305207840083134B
-:102820000008E80068080C1E132C99005208D20A10
-:102830004A3E840083130008D306012CC7014A30A6
-:10284000C600893084006308EB006208EA00610872
-:10285000E9006008E8000230EC000A128A157922CB
-:102860000A168A112030F5000A12F1270A16D20141
-:102870004A3052078400831380080319552C2130F5
-:10288000F700F70B412C4A305207840083130008ED
-:10289000E80068080C1E4A2C99005208D20A4A3EE9
-:1028A000840083130008D306382CC7014A30C600C1
-:1028B000043084006708EB006608EA006508E90058
-:1028C0006408E8000130EC000A128A1579220A1621
-:1028D0008A112030F5000A12F1270A16D2014A3077
-:1028E000520784008313800803198C2C2130F700D1
-:1028F000F70B782C4A305207840083130008E80055
-:1029000068080C1E812C99005208D20A4A3E8400A5
-:1029100083130008D3066F2CC7014A30C60002306B
-:1029200084004508EB004408EA004308E900420837
-:10293000E8000130EC000A128A1579220A168A1181
-:102940002030F5000A12F1270A16D2014A30520748
-:102950008400831380080319C32C2130F700F70B80
-:10296000AF2C4A305207840083130008E80068083F
-:102970000C1EB82C99005208D20A4A3E84008313D8
-:102980000008D306A62CC7014A30C6002A30F5003D
-:102990000A12F1270A165308E8003730E9000A1234
-:1029A0008A15742B0A168A110D30F5000A12F127C8
-:1029B0000A160A30F5000A12F1270A16D2014A3027
-:1029C00052078400831380080319F62C2130F70086
-:1029D000F70BE82C5208D20A4A3E84008313000801
-:1029E000E80068080C1EF22C9900DF2C2130F7005B
-:1029F000F70BF82C6400C80A0319C90AAE28630053
+:101730008A150A12B72F840183131F308305713075
+:1017400083168F000F08031787110C3003139900BD
+:10175000A2309800903083129800C101C001C501E9
+:10176000C401C301C201831603170908C0398900E7
+:1017700003131F129F120030031788008312870182
+:10178000880189010313A801A901AA013030AB0027
+:101790002E30AC003130AD00AE01FF30AF00C601DD
+:1017A000C701C901C8016430E8008A11D5218A1532
+:1017B0008A118B2A8A158A11D12B8A158A113E2DFE
+:1017C0008A15D3016430E8008A11D5218A150028D2
+:1017D0007708E8007808E9007908EA007A08EB0061
+:1017E000ED010408EC006D10831B6D1483107A0862
+:1017F0008316BD00831279088316BC008312780813
+:101800008316BB00831277088316BA003330C100F9
+:101810009330C0000830BF008730BE008A118312A9
+:10182000F8238A156C08840083136D1883177A08CF
+:10183000DF007908DE007808DD007708DC00E901C8
+:10184000E801DB01DA01D901D8018A11A8238A1540
+:1018500003308316A00083128D207C1078187C142E
+:101860007C183E2C8A11CA278A15D2207908FE00DE
+:101870007808FD007D08F8007E08F9007908E90085
+:101880007808E8008A11A8238A1505308316A0007D
+:1018900083128D207C1078187C147C185B2C8A11A4
+:1018A000CA278A15D2207908FE007808FD007D0835
+:1018B000F8007E08F9007908EB007808EA0069086A
+:1018C000FD006808FC006B088316A10083126A08FB
+:1018D0008316A0008312A7018B1BA7178B137D080B
+:1018E000031792007C0891008A11031344208A1583
+:1018F000A71B8B1777088316AA007808AB00790816
+:10190000AC007A08AD00C1002C08C0002B08BF0055
+:101910002A08BE000A30C500D730C4002330C300F7
+:101920007830C20083123D2177088316AA00780818
+:10193000AB007908AC007A08AD0083142D08BD0017
+:101940002C08BC002B08BB002A08BA00C101C0014A
+:101950002030BF008430BE008A118312F8238A151C
+:101960007A08D7007908D6007808D5007708D4001F
+:10197000A7018B1BA7178B1383162108831203174C
+:1019800092008316031320088312031791008A1113
+:10199000031344208A15A71B8B177A088316A90006
+:1019A0007908A8007808A7007708A6002908C100D0
+:1019B0002808C0002708BF002608BE005430C50014
+:1019C000E330C4002530C3007A30C20083123D21C9
+:1019D00077088316AA007808AB007908AC007A086B
+:1019E000AD002908C1002808C0002708BF0026084C
+:1019F000BE002908C5002808C4002708C30026081F
+:101A0000C20083123D2177088316AE007808AF002C
+:101A10007908B0007A08B100C1003008C0002F0872
+:101A2000BF002E08BE00A230C500E730C4003B3026
+:101A3000C3006C30C20083123D21831483162D082D
+:101A4000BD002C08BC002B08BB002A08BA007A088D
+:101A5000C1007908C0007808BF007708BE008A116D
+:101A60008312F8238A1577088316AA007808AB003A
+:101A70007908AC007A08AD0083142D08BD002C084D
+:101A8000BC002B08BB002A08BA00C101C001BF017D
+:101A90008130BE008A118312F8238A157A08EF007C
+:101AA0007908EE007808ED007708EC0083145708F9
+:101AB0008316BD00831256088316BC008312550896
+:101AC0008316BB00831254088316BA00C101C001FB
+:101AD0004830BF008330BE008A118312F8238A1574
+:101AE00077088316AA007808AB007908AC007A085A
+:101AF000AD00AC30C100C530C0002730BF00713030
+:101B0000BE002908C5002808C4002708C30026080D
+:101B1000C20083123D2183100A308316BD00D730E6
+:101B2000BC002330BB007830BA007A08C1007908C5
+:101B3000C0007808BF007708BE008A118312F8231E
+:101B40008A1583162D08C1002C08C0002B08BF0081
+:101B50002A08BE007A08C5007908C4007808C300C6
+:101B60007708C20083123D2177088316AA007808FF
+:101B7000AB007908AC007A08AD0083102D08BD00D9
+:101B80002C08BC002B08BB002A08BA0083126F087F
+:101B90008316C10083126E088316C00083126D087D
+:101BA0008316BF0083126C088316BE008A1183124D
+:101BB000F8238A157A08DB007908DA007808D9005A
+:101BC0007708D800831057088316BD008312560883
+:101BD0008316BC00831255088316BB008312540879
+:101BE0008316BA003330C1009330C0000830BF0004
+:101BF0008730BE008A118312F8238A157A08D7002D
+:101C00007908D6007808D5007708D4002130F7008D
+:101C1000F70B082E24300C1E0B2E99002130F700F4
+:101C2000F70B102EC7014A30C6004130F5008A116B
+:101C3000F1278A155730F5008A11F1278A1553309C
+:101C4000F5008A11F1278A152B3084008313B429FB
+:101C50002030F5008A11F1278A15D2014A30520747
+:101C600084008313800803194B2E2130F700F70BF3
+:101C7000372E4A305207840083130008E8006808B2
+:101C80000C1E402E99005208D20A4A3E840083134B
+:101C90000008D3062E2EC7014A30C600103084003B
+:101CA0004908E9004808E800CE292030F5008A11EB
+:101CB000F1278A15D2014A30520784008313800825
+:101CC0000319782E2130F700F70B642E4A305207A3
+:101CD000840083130008E80068080C1E6D2E99002C
+:101CE0005208D20A4A3E840083130008D3065B2EB2
+:101CF000C7014A30C600893084005F08EB005E08E7
+:101D0000EA005D08E9005C08E8000230EC00792296
+:101D10002030F5008A11F1278A15D2014A30520786
+:101D20008400831380080319AB2E2130F700F70BD2
+:101D3000972E4A305207840083130008E800680891
+:101D40000C1EA02E99005208D20A4A3E840083132A
+:101D50000008D3068E2EC7014A30C60089308400A1
+:101D60005708EB005608EA005508E9005408E80057
+:101D70000230EC0079222030F5008A11F1278A1513
+:101D8000D2014A3052078400831380080319DE2EE3
+:101D90002130F700F70BCA2E4A3052078400831314
+:101DA0000008E80068080C1ED32E99005208D20AD9
+:101DB0004A3E840083130008D306C12EC7014A306F
+:101DC000C600023084005B08EB005A08EA0059089C
+:101DD000E9005808E8000130EC0079222030F500D5
+:101DE0008A11F1278A15D2014A30520784008313E1
+:101DF00080080319112F2130F700F70BFD2E4A3010
+:101E00005207840083130008E80068080C1E062FA0
+:101E100099005208D20A4A3E840083130008D30670
+:101E2000F42EC7014A30C600893084006308EB00F5
+:101E30006208EA006108E9006008E8000230EC008E
+:101E400079222030F5008A11F1278A15D2014A3013
+:101E500052078400831380080319442F2130F700B0
+:101E6000F70B302F4A305207840083130008E80034
+:101E700068080C1E392F99005208D20A4A3E840085
+:101E800083130008D306272FC7014A30C600043049
+:101E900084006708EB006608EA006508E90064084A
+:101EA000E8000130EC0079222030F5008A11F1279A
+:101EB0008A15D2014A30520784008313800803191F
+:101EC000772F2130F700F70B632F4A305207840039
+:101ED00083130008E80068080C1E6C2F9900520854
+:101EE000D20A4A3E840083130008D3065A2FC70142
+:101EF0004A30C600023084004508EB004408EA007E
+:101F00004308E9004208E8000130EC007922203063
+:101F1000F5008A11F1278A15D2014A305207840050
+:101F2000831380080319AA2F2130F700F70B962F8F
+:101F30004A305207840083130008E80068080C1E2A
+:101F40009F2F99005208D20A4A3E8400831300084A
+:101F5000D3068D2FC7014A30C6002A30F5008A11FA
+:101F6000F1278A155308E8003730E900742B0D304B
+:101F7000F5008A11F1278A150A30F5008A11F12738
+:101F80008A15D2014A30520784008313800803194E
+:101F9000D92F2130F700F70BCB2F5208D20A4A3E37
+:101FA000840083130008E80068080C1ED52F9900F0
+:101FB000C22F2130F700F70BDB2F6400C80A03198A
+:061FC000C90AE12B6300D9
 :0639E0008A010028080026
 :04400E00FD2CFF3F47
 :00000001FF
 ;PIC16F887
-;CRC=DE7B  CREATED="10-III-13 15:37"
+;CRC=1BCF  CREATED="10-III-13 15:48"

/Designs/Measuring_instruments/AWS01A/SW/PIC16F887/main.pjt
28,7 → 28,8
10=..\MPL115A1.c
11=common\dbloader.h
12=common\bloader_defs.h
13=
13=bootloader887\bloader.h
14=
[Target Data]
OptionString=-p +FM
FileList=D:\MLAB\Designs\Measuring_instruments\AWS01A\SW\PIC16F887\main.c

Subversion Repositories – MLAB

/Designs @ 2820 → /Designs @ 2821

Compare Path:	Rev
With Path:	Rev