WebSVN – MLAB – /Designs Rev 2826 and /Designs Rev 2827 – Path Comparison

/Designs/Measuring_instruments/AWS01A/SW/PIC16F887/main.c
48,16 → 48,10
if (REV[strlen(REV)-1]=='$') REV[strlen(REV)-1]=0;
printf("\r\n\r\n# AWS01A %s (C) 2013 www.mlab.cz \r\n",VER); // Welcome message
printf("#%s\r\n",&REV[4]);
// printf("#\r\n");
// printf("# commands: h, c, o, l, x, i, r, a, s, u\r\n");
// printf("# h_eat, c_old, o_pen, l_ock, x_open, ");
// printf("i_nfo, r_epeat, a_uto, s_single, u_pdate\r\n");
// printf("#\r\n");
printf("# ver seq temp[K] hum_temp[K] hum[%%] ");
printf("bar_temp[K] pressure[hPa] check\r\n\r\n");

//---WDT
restart_wdt();
restart_wdt(); //---WDT
}

void main()
84,9 → 78,9
sht_init();
MPL_init(); // get correction coefficients from the sensor

// enable_interrupts(INT_TIMER1); // interrupts used for anemometer readings
// enable_interrupts(INT_TIMER0);
// enable_interrupts(GLOBAL);
enable_interrupts(INT_TIMER1); // interrupts used for anemometer readings
enable_interrupts(INT_TIMER0);
enable_interrupts(GLOBAL);

while (TRUE)
{

 /Designs/Measuring_instruments/AWS01A/SW/PIC16F887/main.hex
 ,12 → 82,12
 :100520006430A2003A30A3002030A4006D30A50052
 :100530006130A6006930A7006E30A8002E30A900F7
 :100540006330AA002030AB003230AC003830AD0050
-:100550003230AE003530AF002030B0003230B10064
+:100550003230AE003630AF002030B0003230B10063
 :100560003030B2003130B3003330B4002D30B5003C
 :100570003030B6003330B7002D30B8003130B9001C
-:100580003030BA002030BB003130BC003430BD0008
-:100590003A30BE003530BF003730C0003A30C100BD
-:1005A0003530C2003830C3005A30C4002030C50096
+:100580003030BA002030BB003130BC003530BD0007
+:100590003A30BE003230BF003730C0003A30C100C0
+:1005A0003230C2003130C3005A30C4002030C500A0
 :1005B0006B30C6006130C7006B30C8006C30C900BA
 :1005C0006930CA006B30CB002030CC002430CD0025
 :1005D000CE01D301A030D2008312E921013078028C
 ,7 → 270,7
 :1010E00096019501833094008A11031363208A15B9
 :1010F000A71B8B177A08F0007908EF007808EE003C
 :101100007708ED006D08F7006E08F8006F08F90029
-:101110007008FA008A110A16B72883160814881076
+:101110007008FA008A110A16BD2883160814881070
 :1011200083128810932894288316A101A001210816
 :10113000753C031CB228031DA12820082F3C031C6A
 :10114000B228081483120818A8288316B22883121C
 ,7 → 308,7
 :101340000319C70A080080080319B829E90104082D
 :10135000E8006910831B69140008F50096216808ED
 :101360008400831369188317840A0319850AA32943
-:101370008A110A16292BF0010408EF007010831B54
+:101370008A110A162F2BF0010408EF007010831B4E
 :101380007014690EF038EB00EB07E23EEC00323EE1
 :10139000EE0069080F39EC07EC07EE07E93EED00B7
 :1013A000ED07ED07680E0F39ED07EE07ED0DEE0DB9
 ,7 → 320,7
 :101400006F1B082A6F1A1A2AEF19082A20300B2A94
 :10141000EF156F123030F707E9010408E800691092
 :10142000831B69147708F5009621680884008313EC
-:1014300069188317840A6F1FF8298A110A165C2B12
+:1014300069188317840A6F1FF8298A110A16622B0C
 :10144000F701F801F901FA018316A401A501A6012B
 :10145000A701230822042104200403195F2A203055
 :10146000A8000310FB0DFC0DFD0DFE0DA40DA50D38
 ,7 → 364,7
 :1016C000642B3030F707662B6908F7077708F500B9
 :1016D00096210F30E8050A3068020318712B30306C
 :1016E000732BE9136908E8076808F50096218A1149
-:0416F0000A16EA2CC0
+:0416F0000A16F02CBA
 :10200000840183131F308305713083168F000F08FE
 :10201000031787110C3003139900A23098009030F9
 :1020200083129800C101C001C501C401C301C201EE
 ,151 → 386,152
 :102120003F088316870022308312940040308316C4
 :10213000940083123F113F0883168700831207150E
 :102140006430E8000A12D5210A160A128B2A0A16F0
-:102150000A12D12B0A160A123E2D0A16D301643038
-:10216000E8000A12D5210A160A128A1500280A1652
-:102170008A117708E8007808E9007908EA007A0807
-:10218000EB00ED010408EC006D10831B6D1483104F
-:102190006B088316BD0083126A088316BC00831285
-:1021A00069088316BB00831268088316BA003330AF
-:1021B000C1009330C0000830BF008730BE000A1253
-:1021C0008312F8230A166C08840083136D18831792
-:1021D0007A08DF007908DE007808DD007708DC0087
-:1021E000E901E801DB01DA01D901D8010A12A823CB
-:1021F0000A1603308316A0000A128312B4270A16A7
-:102200007C1078187C147C1817290A128A158D20E6
-:102210000A168A110A128A15B4200A168A11790838
-:10222000FE007808FD007D08F8007E08F9007908B6
-:10223000E9007808E8000A12A8230A160530831678
-:10224000A0000A128312B4270A167C1078187C1496
-:102250007C183C290A128A158D200A168A110A1246
-:102260008A15B4200A168A117908FE007808FD0044
-:102270007D08F8007E08F9007908EB007808EA008C
-:102280006908FD006808FC006B088316A100831232
-:102290006A088316A0008312A7018B1BA7178B1354
-:1022A0007D08031792007C0891000A120313442052
-:1022B0000A16A71B8B1777088316AA007808AB00AD
-:1022C0007908AC007A08AD00C1002C08C0002B08CA
-:1022D000BF002A08BE000A30C500D730C400233032
-:1022E000C3007830C2000A128A1583121F210A1611
-:1022F0008A1177088316AA007808AB007908AC0029
-:102300007A08AD0083142D08BD002C08BC002B08F2
-:10231000BB002A08BA00C101C0012030BF008430D0
-:10232000BE000A128312F8230A167A08D700790829
-:10233000D6007808D5007708D400A7018B1BA71713
-:102340008B1383162108831203179200831603133D
-:1023500020088312031791000A12031344200A165F
-:10236000A71B8B177A088316A9007908A80078089C
-:10237000A7007708A6002908C1002808C000270880
-:10238000BF002608BE005430C500E330C40025302D
-:10239000C3007A30C2000A128A1583121F210A165E
-:1023A0008A1177088316AA007808AB007908AC0078
-:1023B0007A08AD002908C1002808C0002708BF001E
-:1023C0002608BE002908C5002808C4002708C30045
-:1023D0002608C2000A128A1583121F210A168A11C2
-:1023E00077088316AE007808AF007908B0007A0845
-:1023F000B100C1003008C0002F08BF002E08BE0089
-:10240000A230C500E730C4003B30C3006C30C200CE
-:102410000A128A1583121F210A168A118314831641
-:102420002D08BD002C08BC002B08BB002A08BA00F0
-:102430007A08C1007908C0007808BF007708BE009C
-:102440000A128312F8230A1677088316AA0078085E
-:10245000AB007908AC007A08AD0083142D08BD00EC
-:102460002C08BC002B08BB002A08BA00C101C0011F
-:10247000BF018130BE000A128312F8230A167A08BF
-:10248000EF007908EE007808ED007708EC0083147F
-:1024900057088316BD00831256088316BC008312AA
-:1024A00055088316BB00831254088316BA00C10175
-:1024B000C0014830BF008330BE000A128312F823E7
-:1024C0000A1677088316AA007808AB007908AC00D2
-:1024D0007A08AD00AC30C100C530C0002730BF0065
-:1024E0007130BE002908C5002808C4002708C300B1
-:1024F0002608C2000A128A1583121F210A168A11A1
-:1025000083100A308316BD00D730BC002330BB00D7
-:102510007830BA007A08C1007908C0007808BF0096
-:102520007708BE000A128312F8230A1683162D08B4
-:10253000C1002C08C0002B08BF002A08BE007A0882
-:10254000C5007908C4007808C3007708C2000A12E1
-:102550008A1583121F210A168A1177088316AA008A
-:102560007808AB007908AC007A08AD0083102D081C
-:10257000BD002C08BC002B08BB002A08BA0083123F
-:102580006F088316C10083126E088316C000831281
-:102590006D088316BF0083126C088316BE000A12F2
-:1025A0008312F8230A167A08DB007908DA00780823
-:1025B000D9007708D800831057088316BD0083120E
-:1025C00056088316BC00831255088316BB0083127D
-:1025D00054088316BA003330C1009330C00008306D
-:1025E000BF008730BE000A128312F8230A167A0849
-:1025F000D7007908D6007808D5007708D4002130B4
-:10260000F700F70B012B24300C1E042B990021300E
-:10261000F700F70B092BC7014A30C6004130F5001F
-:102620000A128A1596210A168A115730F5000A12E5
-:102630008A1596210A168A115330F5000A128A1556
-:1026400096210A168A112B30840083130A128A15E8
-:10265000A3290A168A112030F5000A128A1596213C
-:102660000A168A11D2014A30520784008313800867
-:102670000319502B2130F700F70B3C2B4A3052073F
-:10268000840083130008E80068080C1E452B99009D
-:102690005208D20A4A3E840083130008D306332B23
-:1026A000C7014A30C600103084004908E9004808D4
-:1026B000E8000A128A15BB290A168A112030F50093
-:1026C0000A128A1596210A168A11D2014A30520737
-:1026D0008400831380080319832B2130F700F70B44
-:1026E0006F2B4A305207840083130008E800680803
-:1026F0000C1E782B99005208D20A4A3E840083139C
-:102700000008D306662BC7014A30C6008930840012
-:102710005F08EB005E08EA005D08E9005C08E8007D
-:102720000230EC000A128A1564220A168A1120303F
-:10273000F5000A128A1596210A168A11D2014A302A
-:1027400052078400831380080319BC2B2130F70043
-:10275000F70BA82B4A305207840083130008E800C7
-:1027600068080C1EB12B99005208D20A4A3E840018
-:1027700083130008D3069F2BC7014A30C600893057
-:1027800084005708EB005608EA005508E900540891
-:10279000E8000230EC000A128A1564220A168A1137
-:1027A0002030F5000A128A1596210A168A11D201E4
-:1027B0004A3052078400831380080319F52B213017
-:1027C000F700F70BE12B4A3052078400831300080F
-:1027D000E80068080C1EEA2B99005208D20A4A3E0B
-:1027E000840083130008D306D82BC7014A30C600E3
-:1027F000023084005B08EB005A08EA005908E9003F
-:102800005808E8000130EC000A128A1564220A1602
-:102810008A112030F5000A128A1596210A168A11AB
-:10282000D2014A30520784008313800803192E2CEA
-:102830002130F700F70B1A2C4A305207840083131B
-:102840000008E80068080C1E232C99005208D20AE0
-:102850004A3E840083130008D306112CC7014A3076
-:10286000C600893084006308EB006208EA00610852
-:10287000E9006008E8000230EC000A128A156422C0
-:102880000A168A112030F5000A128A1596210A16B6
-:102890008A11D2014A305207840083138008031939
-:1028A000672C2130F700F70B532C4A305207840075
-:1028B00083130008E80068080C1E5C2C990052087D
-:1028C000D20A4A3E840083130008D3064A2CC7016B
-:1028D0004A30C600043084006708EB006608EA004E
-:1028E0006508E9006408E8000130EC000A128A1566
-:1028F00064220A168A112030F5000A128A159621E0
-:102900000A168A11D2014A305207840083138008C4
-:102910000319A02C2130F700F70B8C2C4A305207FA
-:10292000840083130008E80068080C1E952C9900A9
-:102930005208D20A4A3E840083130008D306832C2F
-:10294000C7014A30C600023084004508EB00440845
-:10295000EA004308E9004208E8000130EC000A12EE
-:102960008A1564220A168A112030F5000A128A1587
-:1029700096210A168A11D2014A3052078400831325
-:1029800080080319D92C2130F700F70BC52C4A30E9
-:102990005207840083130008E80068080C1ECE2C40
-:1029A00099005208D20A4A3E840083130008D306D5
-:1029B000BC2CC7014A30C6002A30F5000A128A151D
-:1029C00096210A168A115308E8003730E9000A12E6
-:1029D0008A15572B0A168A110D30F5000A128A152E
-:1029E00096210A168A110A30F5000A128A159621D4
-:1029F0000A168A11D2014A305207840083138008D4
-:102A00000319122D2130F700F70B042D5208D20ABA
-:102A10004A3E840083130008E80068080C1E0E2D4F
-:102A20009900FB2C2130F700F70B142D6400C80A25
-:082A30000319C90AAE28630076
+:102150000A12D12B0A160A123E2D0A1683160C14E7
+:1021600083128B16C0308B04D3016430E8000A124E
+:10217000D5210A160A128A1500280A168A1177082C
+:10218000E8007808E9007908EA007A08EB00ED0138
+:102190000408EC006D10831B6D1483106B0883160C
+:1021A000BD0083126A088316BC0083126908831677
+:1021B000BB00831268088316BA003330C100933025
+:1021C000C0000830BF008730BE000A128312F82317
+:1021D0000A166C08840083136D1883177A08DF00D1
+:1021E0007908DE007808DD007708DC00E901E80105
+:1021F000DB01DA01D901D8010A12A8230A1603303B
+:102200008316A0000A128312B4270A167C107818CD
+:102210007C147C181D290A128A158D200A168A1131
+:102220000A128A15B4200A168A117908FE00780865
+:10223000FD007D08F8007E08F9007908E9007808BB
+:10224000E8000A12A8230A1605308316A0000A1215
+:102250008312B4270A167C1078187C147C18422943
+:102260000A128A158D200A168A110A128A15B420BC
+:102270000A168A117908FE007808FD007D08F8002A
+:102280007E08F9007908EB007808EA006908FD008B
+:102290006808FC006B088316A10083126A08831685
+:1022A000A0008312A7018B1BA7178B137D080317B0
+:1022B00092007C0891000A12031344200A16A71BFF
+:1022C0008B1777088316AA007808AB007908AC0052
+:1022D0007A08AD00C1002C08C0002B08BF002A08F6
+:1022E000BE000A30C500D730C4002330C3007830A8
+:1022F000C2000A128A1583121F210A168A11770852
+:102300008316AA007808AB007908AC007A08AD0003
+:1023100083142D08BD002C08BC002B08BB002A0824
+:10232000BA00C101C0012030BF008430BE000A12D3
+:102330008312F8230A167A08D7007908D60078089D
+:10234000D5007708D400A7018B1BA7178B13831622
+:1023500021088312031792008316031320088312A7
+:10236000031791000A12031344200A16A71B8B17A8
+:102370007A088316A9007908A8007808A7007708CA
+:10238000A6002908C1002808C0002708BF002608A9
+:10239000BE005430C500E330C4002530C3007A309D
+:1023A000C2000A128A1583121F210A168A117708A1
+:1023B0008316AA007808AB007908AC007A08AD0053
+:1023C0002908C1002808C0002708BF002608BE0051
+:1023D0002908C5002808C4002708C3002608C20031
+:1023E0000A128A1583121F210A168A11770883168A
+:1023F000AE007808AF007908B0007A08B100C100DB
+:102400003008C0002F08BF002E08BE00A230C50053
+:10241000E730C4003B30C3006C30C2000A128A159A
+:1024200083121F210A168A11831483162D08BD00FA
+:102430002C08BC002B08BB002A08BA007A08C1008F
+:102440007908C0007808BF007708BE000A1283121E
+:10245000F8230A1677088316AA007808AB007908D3
+:10246000AC007A08AD0083142D08BD002C08BC0018
+:102470002B08BB002A08BA00C101C001BF0181308E
+:10248000BE000A128312F8230A167A08EF007908B0
+:10249000EE007808ED007708EC00831457088316E7
+:1024A000BD00831256088316BC008312550883169C
+:1024B000BB00831254088316BA00C101C001483022
+:1024C000BF008330BE000A128312F8230A16770871
+:1024D0008316AA007808AB007908AC007A08AD0032
+:1024E000AC30C100C530C0002730BF007130BE0025
+:1024F0002908C5002808C4002708C3002608C20010
+:102500000A128A1583121F210A168A1183100A30B3
+:102510008316BD00D730BC002330BB007830BA0032
+:102520007A08C1007908C0007808BF007708BE00AB
+:102530000A128312F8230A1683162D08C1002C08EC
+:10254000C0002B08BF002A08BE007A08C500790821
+:10255000C4007808C3007708C2000A128A158312E3
+:102560001F210A168A1177088316AA007808AB0083
+:102570007908AC007A08AD0083102D08BD002C0846
+:10258000BC002B08BB002A08BA0083126F08831610
+:10259000C10083126E088316C00083126D08831673
+:1025A000BF0083126C088316BE000A128312F82340
+:1025B0000A167A08DB007908DA007808D90077086B
+:1025C000D800831057088316BD008312560883165F
+:1025D000BC00831255088316BB008312540883166F
+:1025E000BA003330C1009330C0000830BF008730DC
+:1025F000BE000A128312F8230A167A08D700790857
+:10260000D6007808D5007708D4002130F700F70B02
+:10261000072B24300C1E0A2B99002130F700F70BF2
+:102620000F2BC7014A30C6004130F5000A128A1547
+:1026300096210A168A115730F5000A128A1596213A
+:102640000A168A115330F5000A128A1596210A16C5
+:102650008A112B30840083130A128A15A3290A16C3
+:102660008A112030F5000A128A1596210A168A115D
+:10267000D2014A3052078400831380080319562B75
+:102680002130F700F70B422B4A30520784008313A6
+:102690000008E80068080C1E4B2B99005208D20A6B
+:1026A0004A3E840083130008D306392BC7014A3001
+:1026B000C600103084004908E9004808E8000A1202
+:1026C0008A15BB290A168A112030F5000A128A15CC
+:1026D00096210A168A11D2014A30520784008313C8
+:1026E00080080319892B2130F700F70B752B4A302E
+:1026F0005207840083130008E80068080C1E7E2B34
+:1027000099005208D20A4A3E840083130008D30677
+:102710006C2BC7014A30C600893084005F08EB008B
+:102720005E08EA005D08E9005C08E8000230EC00A1
+:102730000A128A1564220A168A112030F5000A123C
+:102740008A1596210A168A11D2014A30520784004E
+:10275000831380080319C22B2130F700F70BAE2B2F
+:102760004A305207840083130008E80068080C1EF2
+:10277000B72B99005208D20A4A3E840083130008FE
+:10278000D306A52BC7014A30C600893084005708FC
+:10279000EB005608EA005508E9005408E80002304A
+:1027A000EC000A128A1564220A168A112030F500FC
+:1027B0000A128A1596210A168A11D2014A30520746
+:1027C0008400831380080319FB2B2130F700F70BDB
+:1027D000E72B4A305207840083130008E80068089A
+:1027E0000C1EF02B99005208D20A4A3E8400831333
+:1027F0000008D306DE2BC7014A30C6000230840031
+:102800005B08EB005A08EA005908E9005808E8009C
+:102810000130EC000A128A1564220A168A1120304F
+:10282000F5000A128A1596210A168A11D2014A3039
+:1028300052078400831380080319342C2130F700D9
+:10284000F70B202C4A305207840083130008E8005D
+:1028500068080C1E292C99005208D20A4A3E8400AE
+:1028600083130008D306172CC7014A30C6008930ED
+:1028700084006308EB006208EA006108E900600870
+:10288000E8000230EC000A128A1564220A168A1146
+:102890002030F5000A128A1596210A168A11D201F3
+:1028A0004A30520784008313800803196D2C2130AD
+:1028B000F700F70B592C4A305207840083130008A5
+:1028C000E80068080C1E622C99005208D20A4A3EA1
+:1028D000840083130008D306502CC7014A30C60079
+:1028E000043084006708EB006608EA006508E90028
+:1028F0006408E8000130EC000A128A1564220A1606
+:102900008A112030F5000A128A1596210A168A11BA
+:10291000D2014A3052078400831380080319A62C81
+:102920002130F700F70B922C4A30520784008313B2
+:102930000008E80068080C1E9B2C99005208D20A77
+:102940004A3E840083130008D306892CC7014A300D
+:10295000C600023084004508EB004408EA00430842
+:10296000E9004208E8000130EC000A128A156422EE
+:102970000A168A112030F5000A128A1596210A16C5
+:102980008A11D2014A305207840083138008031948
+:10299000DF2C2130F700F70BCB2C4A305207840094
+:1029A00083130008E80068080C1ED42C9900520814
+:1029B000D20A4A3E840083130008D306C22CC70102
+:1029C0004A30C6002A30F5000A128A1596210A16E6
+:1029D0008A115308E8003730E9000A128A15572B8C
+:1029E0000A168A110D30F5000A128A1596210A1668
+:1029F0008A110A30F5000A128A1596210A168A11E0
+:102A0000D2014A3052078400831380080319182D1D
+:102A10002130F700F70B0A2D5208D20A4A3E8400F3
+:102A200083130008E80068080C1E142D9900012D7E
+:102A30002130F700F70B1A2D6400C80A0319C90AE0
+:042A4000B428630053
 :0639E0008A010028080026
 :04400E00FD2CFF3F47
 :00000001FF
 ;PIC16F887
-;CRC=DF2C  CREATED="10-III-13 16:26"
+;CRC=EFA5  CREATED="10-III-13 16:45"

/Designs/Measuring_instruments/AWS01A/SW/PIC16F887/main.pjt
17,7 → 17,7
0=0000 %S 0 0 796 451 3 0
[Opened Files]
1=main.c
2=C:\Program Files\PICC\devices\16F887.h
2=
3=C:\Program Files\PICC\drivers\string.h
4=C:\Program Files\PICC\drivers\stddef.h
5=C:\Program Files\PICC\drivers\ctype.h

Subversion Repositories – MLAB

/Designs @ 2826 → /Designs @ 2827

Compare Path:	Rev
With Path:	Rev