WebSVN – MLAB – /Designs/Measuring_instruments/AWS01A/ Rev 2914 and /Designs/Measuring_instruments/AWS01A/ Rev 2915 – Path Comparison

/Designs/Measuring_instruments/AWS01A/SW/PIC16F887/main.c
18,14 → 18,14
#define sht_clk_pin PIN_D1
#include "..\SHT.c"

#use i2c(master, sda=PIN_C4, scl=PIN_C3)
#use i2c(master, sda=PIN_D6, scl=PIN_D5)
#include "..\SHT25.h"

#define CSN_SPI PIN_C2 // preassure sensor connection
#include "..\MPL115A1.c"

unsigned int16 timer0_overflow_count=0;
float anemo=0;
unsigned int16 timer0_overflow_count;
float anemo;

int1 barometer_present;

91,11 → 91,19

restart_wdt(); //---WDT

// barometer init
barometer_present = MPL_init(); // get correction coefficients from the sensor

sht_init();
barometer_present = MPL_init(); // get correction coefficients from the sensor


SHT25_soft_reset();

// anemometer init
set_timer0(0);
set_timer1(0);
timer0_overflow_count=0;
anemo=0;

restart_wdt(); //---WDT

while (TRUE)
117,7 → 125,8

SHT_temp2 = SHT25_get_temp();
SHT_hum2 = SHT25_get_hum();

SHT_temp2 = (SHT_temp2 + 273.15)*100;

if (barometer_present == TRUE)
{
barometer_temperature = (MPL_get_temperature() + 273.15)*100;

 /Designs/Measuring_instruments/AWS01A/SW/PIC16F887/main.hex
 ,166 → 93,166
 :1005D000B13003178D0001308F00031418308316DB
 :1005E0000313D2008312DE2123300C1EF52A99005A
 :1005F000A4308400831342220D300C1EFD2A990082
-:100600000A300C1E012B99008A110A16BB29831689
-:1006100008148810831288100D2B0E2B8316881057
-:1006200083128814132B142B8316081083120810BE
-:10063000192B1A2B83168810831288100330F700A9
-:10064000F70B202B8316881083128814272B282B56
-:10065000831608142B2B2C2B88108312881008006B
-:10066000AF308400831300080319432B0230F800D5
-:10067000F701F70B392BF80B382B9730F700F70BF6
-:100680003F2B800B362B080083160814881083122A
-:1006900088100330F700F70B4B2BF1017108083C71
-:1006A000031C642B83168810831288140330F70010
-:1006B000F70B582B83168810831288100330F7002D
-:1006C000F70B602BF10A4E2B072314308316AF0073
-:1006D000831230238A110A16C5298030831C732B9C
-:1006E0008316C50683128316CA01CB014108C900CF
-:1006F0004508C90640080319612CC800F7004408E2
-:1007000003196A2CC8020319062C031CC42B4508C4
-:10071000CE00CE174608CD004708CC00CB01031011
-:10072000CE0CCD0CCC0CCB0CC80B8E2BC91F9B2B2D
-:100730004A147E2C4A1048104A16C3308400831392
-:10074000932C4A12C91BAE2B481CB92BCE0CCD0CD6
-:10075000CC0CCB0CF70A0319792CB92BCE1BBC2B74
-:100760000310CB0DCC0DCD0DCE0DF7030319792C55
-:10077000AE2B4A17262C4A134108C900C91FC22BA9
-:10078000CE17722CCE13722C4408C800F700400814
-:10079000C8024108CE00CE174208CD004308CC0065
-:1007A000CB010310CE0CCD0CCC0CCB0CC80BD02B3A
-:1007B000C91FDD2BCA147E2CCA104810CA16C730B8
-:1007C00084008313932CCA12C91BF02B481CFB2BEB
-:1007D000CE0CCD0CCC0CCB0CF70A0319792CFB2BCF
-:1007E000CE1BFE2B0310CB0DCC0DCD0DCE0DF70384
-:1007F0000319792CF02BCA17262CCA134508C900F7
-:10080000C91F042CCE17722CCE13722C4508CE00B3
-:10081000CE174608CD004708CC00C91F132CCE13B5
-:100820004A157E2C4A11CB014810C3308400831333
-:10083000932CC91B3C2C4108C900481C262CCE0C0B
-:10084000CD0CCC0CCB0CF70A0319792CCB1F372C11
-:10085000CC0A031D372CCD0A031D372CCE0A031DED
-:10086000372CCE0CCD0CCC0CF70A0319792C4A1B73
-:10087000BB2BCA1BFD2B5B2C8030CE06CE1F442C1D
-:100880007E2C4508C900512C4108C900CE08031D23
-:10089000512CCD08031D512CCC08031D512CF70100
-:1008A000722CCE1B5B2C0310CB0DCC0DCD0DCE0DC1
-:1008B000F70B512C792CC91F5F2CCE17722CCE133D
-:1008C000722C4408F7004508CE004608CD004708C2
-:1008D000CC00722C4008F7004108CE004208CD0041
-:1008E0004308CC004E08F8004D08F9004C08FA0007
-:1008F000B12CF701F801F901FA01B12CCB01CC09B7
-:10090000CD09CE09CB09CB0A031D8C2CCC0A031DC3
-:100910008C2CCD0A0319CE0A4A189A2BCA18DC2B44
-:100920004A19122C412C0008CC07031C9D2CCD0A1F
-:10093000031D9D2CCE0A0319481484030008CD071B
-:10094000031CA52CCE0A0319481484030008801F39
-:10095000803ACE07031848144A1AA12BCA1AE32B6F
-:10096000192C831208002F112F0883168700831279
-:1009700007111308883093008316140C031CBD2C38
+:100600000A300C1E012B99008A110A16B529803078
+:10061000831C0D2B8316C50683128316CA01CB01DA
+:100620004108C9004508C90640080319FB2BC8004A
+:10063000F70044080319042CC8020319A02B031C5B
+:100640005E2B4508CE00CE174608CD004708CC00EB
+:10065000CB010310CE0CCD0CCC0CCB0CC80B282B33
+:10066000C91F352B4A14182C4A1048104A16C3309B
+:10067000840083132D2C4A12C91B482B481C532B72
+:10068000CE0CCD0CCC0CCB0CF70A0319132C532B2E
+:10069000CE1B562B0310CB0DCC0DCD0DCE0DF7037D
+:1006A0000319132C482B4A17C02B4A134108C900C1
+:1006B000C91F5C2BCE170C2CCE130C2C4408C80081
+:1006C000F7004008C8024108CE00CE174208CD000E
+:1006D0004308CC00CB010310CE0CCD0CCC0CCB0CC2
+:1006E000C80B6A2BC91F772BCA14182CCA104810C4
+:1006F000CA16C730840083132D2CCA12C91B8A2B3B
+:10070000481C952BCE0CCD0CCC0CCB0CF70A031946
+:10071000132C952BCE1B982B0310CB0DCC0DCD0D90
+:10072000CE0DF7030319132C8A2BCA17C02BCA133B
+:100730004508C900C91F9E2BCE170C2CCE130C2CBC
+:100740004508CE00CE174608CD004708CC00C91F8B
+:10075000AD2BCE134A15182C4A11CB014810C330CB
+:10076000840083132D2CC91BD62B4108C900481CBB
+:10077000C02BCE0CCD0CCC0CCB0CF70A0319132CD0
+:10078000CB1FD12BCC0A031DD12BCD0A031DD12B9E
+:10079000CE0A031DD12BCE0CCD0CCC0CF70A0319BD
+:1007A000132C4A1B552BCA1B972BF52B8030CE06DA
+:1007B000CE1FDE2B182C4508C900EB2B4108C900C1
+:1007C000CE08031DEB2BCD08031DEB2BCC08031D1E
+:1007D000EB2BF7010C2CCE1BF52B0310CB0DCC0D06
+:1007E000CD0DCE0DF70BEB2B132CC91FF92BCE170C
+:1007F0000C2CCE130C2C4408F7004508CE004608FC
+:10080000CD004708CC000C2C4008F7004108CE0072
+:100810004208CD004308CC004E08F8004D08F9000E
+:100820004C08FA004B2CF701F801F901FA014B2CA6
+:10083000CB01CC09CD09CE09CB09CB0A031D262C4F
+:10084000CC0A031D262CCD0A0319CE0A4A18342BD4
+:10085000CA18762B4A19AC2BDB2B0008CC07031CDB
+:10086000372CCD0A031D372CCE0A031948148403F4
+:100870000008CD07031C3F2CCE0A0319481484033B
+:100880000008801F803ACE07031848144A1A3B2BF1
+:10089000CA1A7D2BB32B831208003F113F08831621
+:1008A0008700831207111308883093008316140CF5
+:1008B000031C572C8312130893018316140C031C7A
+:1008C0005E2C83121308F10013088A3093008316FC
+:1008D000140C031C682C8312130893018316140C48
+:1008E000031C6F2C83121308F20013088C30930042
+:1008F0008316140C031C792C83121308930183169E
+:10090000140C031C802C83121308F30013088E3080
+:1009100093008316140C031C8A2C83121308930172
+:100920008316140C031C912C83121308F400130873
+:10093000903093008316140C031C9B2C8312130815
+:1009400093018316140C031CA22C83121308F500C8
+:100950001308923093008316140C031CAC2C8312E2
+:10096000130893018316140C031CB32C8312130871
+:10097000F6001308943093008316140C031CBD2C4E
 :100980008312130893018316140C031CC42C8312C6
-:100990001308F10013088A3093008316140C031C0B
+:100990001308FB001308963093008316140C031CF5
 :1009A000CE2C8312130893018316140C031CD52C30
-:1009B00083121308F20013088C3093008316140C72
-:1009C000031CDF2C8312130893018316140C031CE1
-:1009D000E62C83121308F30013088E30930083165D
-:1009E000140C031CF02C8312130893018316140CAF
-:1009F000031CF72C83121308F400130890309300A3
-:100A00008316140C031C012D831213089301831603
-:100A1000140C031C082D83121308F50013089230E0
-:100A200093008316140C031C122D831213089301D8
-:100A30008316140C031C192D83121308F6001308D7
-:100A4000943093008316140C031C232D8312130877
-:100A500093018316140C031C2A2D83121308FB0028
-:100A60001308963093008316140C031C342D831244
-:100A7000130893018316140C031C3B2D83121308D7
-:100A8000FC00130893018316140C031C442D8312DD
-:100A90002F112F0883168700831207158316A101D3
-:100AA0007108A000A00DA10DA00DA10DA00DA10D1C
-:100AB000A00DA10DA00DA10DE030A005720CF70056
-:100AC000F70CF70C1F30F7057708A0070318A10AE9
-:100AD000720807398312A7018B1BA7178B13031703
-:100AE0009A01990003134420A71B8B17A7018B1BA6
-:100AF000A7178B137A0803179C0079089B007808C6
-:100B00009A0077089900A0019F019E0182309D0004
-:100B100003136320A71B8B1777088316A40078089C
-:100B2000A5007908A6007A08A7008312A7018B1BED
-:100B3000A7178B1383162108831203179A008316B5
-:100B40000313200883120317990003134420A71BE3
-:100B50008B1783107A088316C3007908C2007808BF
-:100B6000C1007708C0002708C7002608C60025086E
-:100B7000C5002408C40083126D237A08B3007908E5
-:100B8000B2007808B1007708B00073081F39FA0185
-:100B90008316A100A0017408A0070318A10A8312FC
-:100BA000A7018B1BA7178B1383162108831203172A
-:100BB0009A00831603132008831203179900031366
-:100BC0004420A71B8B17A7018B1BA7178B137A0831
-:100BD00003179C0079089B0078089A007708990011
-:100BE000A0019F019E018C309D0003136320A71B71
-:100BF0008B1777088316A0007808A1007908A20057
-:100C00007A08A30083142308C3002208C200210825
-:100C1000C1002008C000C701C6014030C5008030B7
-:100C2000C40083126D237A08B7007908B6007808EB
-:100C3000B5007708B400803075028316A101A000CA
-:100C4000A100A0017608A0070318A10A8312A7013A
-:100C50008B1BA7178B1383162108831203179A0087
-:100C600083160313200883120317990003134420EB
-:100C7000A71B8B17A7018B1BA7178B137A080317CA
-:100C80009C0079089B0078089A0077089900A001D9
-:100C90009F019E018D309D0003136320A71B8B17BE
-:100CA00077088316A0007808A1007908A2007A08C6
-:100CB000A30083142308C3002208C2002108C10036
-:100CC0002008C000C701C601C5018030C4008312DE
-:100CD0006D237A08BB007908BA007808B900770854
-:100CE000B800FA017B088316A100A0017C08A007C8
-:100CF0000318A10A8312A7018B1BA7178B13831656
-:100D00002108831203179A00831603132008831205
-:100D10000317990003134420A71B8B17A7018B1BF4
-:100D2000A7178B137A0803179C0079089B00780893
-:100D30009A0077089900A0019F019E0197309D00BD
-:100D400003136320A71B8B177A08BF007908BE0026
-:100D50007808BD007708BC0071087204730474043D
-:100D6000750476047B047C04FF3C031DBB2E01301C
-:100D7000F800BE2EBE2E0030F800BE2E8A110A16D4
-:100D8000C8290830F80000008711AF112F0883161A
-:100D900087000000FB0D83120712031CD52E2F16AF
-:100DA0002F0883168700D92E83122F122F0883163F
-:100DB000870000008312AF152F0883168700831267
-:100DC000871DE02EF80BC32E00008711AF112F08EE
-:100DD00083168700000083122F162F0883168700C2
-:100DE000000000008312AF152F08831687008312BE
-:100DF000871DF82EF8010000071A78148711AF112B
-:100E00002F0883168700831207122F122F088316CC
-:100E10008700831208002F162F0883168700000012
-:100E20008312AF152F088316870000008312071264
-:100E30002F122F0883168700000083128711AF112D
-:100E40002F08831687008030FB008312C126FE30F6
-:100E5000FB00C1262F122F08831687000000831283
-:100E6000AF152F08831687008312871D352F0000CA
-:100E7000392F00002F162F088316870000008312D9
-:100E80008A110A16CE2908308316B002031C542F8B
-:100E9000B030840083130310800C00080319542F12
-:100EA000522F0000800B512F8312080083168610EA
-:100EB0008312861002308316AF00F830B000831220
-:100EC00043278316AF0B5D2F86140230AF00F83036
-:100ED000B000831243278316AF0B672F861483124B
-:100EE00008008316B0013008073C031C932F8610BE
-:100EF000831286107B2F7C2F03148316AF0C0318EC
-:100F0000852F83128610872F8316831286148316EB
-:100F100086102730F700F70B8B2F8E2F8614902F1B
-:100F2000912FB00A732F831208008316B101310884
-:100F3000073C031CB62F8610831286109F2FA02F0C
-:100F4000831686140530F700F70BA42F861483123E
-:100F50008618AC2F0310AD2F03148316B20C4F303C
-:100F6000F700F70BB12FB42FB10A972F3208F80012
-:100F70008312080080308316AD000330F700F70BB2
-:100F8000BF2FAC012C08073C031CE02F88108312F4
-:100F9000881083162B082D050319D02F0814D42F81
-:100FA0000810831208108316D52FD62F88108312AD
-:100FB0008814DA2FDB2F03108316AD0CAC0AC22F76
-:100FC000881083128810E42FE52F831608142E1042
-:100FD0008312081CEE2F83162E148312831688109A
-:100FE00083128814F32FF42F83168810831288102D
-:0E0FF000003083162E180130F800831208001E
+:1009B00083121308FC00130893018316140C031C04
+:1009C000DE2C83123F113F08831687008312071520
+:1009D0008316A1017108A000A00DA10DA00DA10D0D
+:1009E000A00DA10DA00DA10DA00DA10DE030A00541
+:1009F000720CF700F70CF70C1F30F7057708A0070B
+:100A00000318A10A720807398312A7018B1BA717C5
+:100A10008B1303179A01990003134420A71B8B170C
+:100A2000A7018B1BA7178B137A0803179C00790863
+:100A30009B0078089A0077089900A0019F019E0109
+:100A400082309D0003136320A71B8B177708831642
+:100A5000A4007808A5007908A6007A08A7008312E8
+:100A6000A7018B1BA7178B1383162108831203176B
+:100A70009A008316031320088312031799000313A7
+:100A80004420A71B8B1783107A088316C3007908AC
+:100A9000C2007808C1007708C0002708C7002608F0
+:100AA000C6002508C5002408C400831207237A085D
+:100AB000B2007908B1007808B0007708AF00730879
+:100AC0001F39FA018316A100A0017408A0070318BA
+:100AD000A10A8312A7018B1BA7178B13831621086A
+:100AE000831203179A008316031320088312031737
+:100AF000990003134420A71B8B17A7018B1BA71773
+:100B00008B137A0803179C0079089B0078089A00D9
+:100B100077089900A0019F019E018C309D0003136E
+:100B20006320A71B8B1777088316A0007808A10005
+:100B30007908A2007A08A30083142308C3002208BE
+:100B4000C2002108C1002008C000C701C601403012
+:100B5000C5008030C400831207237A08B6007908E4
+:100B6000B5007808B4007708B300803075028316AA
+:100B7000A101A000A100A0017608A0070318A10A06
+:100B80008312A7018B1BA7178B13831621088312CF
+:100B900003179A0083160313200883120317990082
+:100BA00003134420A71B8B17A7018B1BA7178B13BD
+:100BB0007A0803179C0079089B0078089A00770848
+:100BC0009900A0019F019E018D309D0003136320B9
+:100BD000A71B8B1777088316A0007808A100790857
+:100BE000A2007A08A30083142308C3002208C200CD
+:100BF0002108C1002008C000C701C601C50180301E
+:100C0000C400831207237A08BA007908B90078086B
+:100C1000B8007708B700FA017B088316A100A0018D
+:100C20007C08A0070318A10A8312A7018B1BA71732
+:100C30008B1383162108831203179A00831603135C
+:100C4000200883120317990003134420A71B8B1756
+:100C5000A7018B1BA7178B137A0803179C00790831
+:100C60009B0078089A0077089900A0019F019E01D7
+:100C700097309D0003136320A71B8B177A08BE00D3
+:100C80007908BD007808BC007708BB0071087204C1
+:100C900073047404750476047B047C04FF3C031D18
+:100CA000552E0130F800582E582E0030F800582EDE
+:100CB0008A110A16BF298316081488108312881017
+:100CC000612E622E8316881083128814672E682E78
+:100CD00083160810831208106D2E6E2E831688104E
+:100CE000831288100330F700F70B742E83168810D8
+:100CF000831288147B2E7C2E831608147F2E802E60
+:100D00008810831288100800AF3084008313000815
+:100D10000319972E0230F800F701F70B8D2EF80B10
+:100D20008C2E9730F700F70B932E800B8A2E08003D
+:100D3000831608148810831288100330F700F70B0D
+:100D40009F2EF1017108083C031CB82E83168810F1
+:100D5000831288140330F700F70BAC2E831688102B
+:100D6000831288100330F700F70BB42EF10AA22E7D
+:100D70005B2614308316AF00831284268A110A166C
+:100D8000C5290830F8000000881283168812000078
+:100D9000FB0D83120813031CD02E83160817831231
+:100DA0000318D52E83160813831283168816831210
+:100DB000881ED82EF80BC32E0000881283168812C6
+:100DC000000008170000000088168312881EE62E17
+:100DD000F8010000081B7814881283168812831209
+:100DE00008138316081383120800831608170000DF
+:100DF000881600008312081383160813000083125C
+:100E00008812831688128030FB008312C126FE30C0
+:100E1000FB00C12683160813000088168312881E63
+:100E20000F2F0000132F00008316081700008312F5
+:100E30008A110A16C82908308316B002031C2C2F09
+:100E4000B030840083130310800C000803192C2F8A
+:100E50002A2F0000800B292F83120800831686108A
+:100E60008312861002308316AF00F830B000831270
+:100E70001B278316AF0B352F86140230AF00F830D6
+:100E8000B00083121B278316AF0B3F2F86148312EB
+:100E900008008316B0013008073C031C6B2F861036
+:100EA00083128610532F542F03148316AF0C03188C
+:100EB0005D2F831286105F2F83168312861483168C
+:100EC00086102730F700F70B632F662F8614682FE4
+:100ED000692FB00A4B2F831208008316B101310825
+:100EE000073C031C8E2F861083128610772F782FD5
+:100EF000831686140530F700F70B7C2F86148312B7
+:100F00008618842F0310852F03148316B20C4F30DC
+:100F1000F700F70B892F8C2FB10A6F2F3208F800DA
+:100F20008312080080308316AD000330F700F70B02
+:100F3000972FAC012C08073C031CB82F8810831294
+:100F4000881083162B082D050319A82F0814AC2F21
+:100F50000810831208108316AD2FAE2F881083124D
+:100F60008814B22FB32F03108316AD0CAC0A9A2F3E
+:100F7000881083128810BC2FBD2F831608142E10E2
+:100F80008312081CC62F83162E1483128316881012
+:100F900083128814CB2FCC2F8316881083128810CD
+:100FA000003083162E180130F800831208008316D3
+:100FB0000814881083128810DD2FDE2F8316AC01F1
+:100FC000AB012C08013C031CFC2F031DEB2F2B084D
+:100FD0005D3C031CFC2F081483120818F22F8316A3
+:100FE000FC2F831201308316AF00831284268316F0
+:0C0FF000AB0A0319AC0AE12F83120800C1
 :101000008316440803197128CC0048080319712875
 :10101000CC07031812287F30CC02031C7128031957
 :10102000712816288130CC07031871284C08F70066
 ,16 → 268,16
 :1010C0006728F80CF90CFA0CF70A0319712845087F
 :1010D000CD004908CD06CD1F6F28F8177528F813E5
 :1010E0007528F701F801F901FA018312080071105F
-:1010F0008A1156278A15CC308316AF008A118312C5
-:1011000071278A1544308316AF008A118312712724
-:101110008A15F2017208C73C031C9F288A11952783
+:1010F0008A112E278A15CC308316AF008A118312ED
+:1011000049278A1544308316AF008A118312492774
+:101110008A15F2017208C73C031C9F288A116D27AB
 :101120008A1571107818711471189F280130831670
-:10113000AF008A11831230238A15F20A8A288A1195
-:1011400056278A15CC308316AF008A118312712777
-:101150008A15BE308316AF008A11831271278A1553
+:10113000AF008A11831284268A15F20A8A288A113E
+:101140002E278A15CC308316AF008A1183124927C7
+:101150008A15BE308316AF008A11831249278A157B
 :10116000F2017208083C031CCB28A0307207F8007B
 :10117000FA010318FA0A7808FB007A08FC008A11C1
-:1011800095278A157B08840083137C1883177808B9
+:101180006D278A157B08840083137C1883177808E1
 :101190008000F20AB12883162708103C031D3B2962
 :1011A0002108FA0020088312A7018B1BA7178B13B5
 :1011B000031799007A089A008A11031344208A15AC
 ,220 → 290,201
 :10122000A0019F019E0181309D008A11031363205C
 :101230008A15A71B8B1783107E088316C3007D08B1
 :10124000C2007C08C1007B08C0007A08C70079088A
-:10125000C6007808C5007708C4008A1183126D2380
+:10125000C6007808C5007708C4008A1183120723E6
 :101260008A157A08F6007908F5007808F4007708FE
 :10127000F30043298316F6016630F500D530F400FB
 :101280008D30F30083127308F7007408F8007508B6
-:10129000F9007608FA008A110A16EF298316081455
-:1012A000881083128810542955298316AC01AB018C
-:1012B0002C08013C031C7529031D62292B085D3C89
-:1012C000031C7529081483120818692983167529C7
-:1012D000831201308316AF008A11831230238A15DE
-:1012E0008316AB0A0319AC0A582983120800831627
-:1012F000AD01AC01AB012B08073C031C992903107D
-:10130000AC0DAD0D881083128814862987298316A9
-:1013100008148312081C902983162C148F29831219
-:101320008316881083128810952996298316AB0A94
-:101330007B290810831208109D299E298316881086
-:10134000831288140330F700F70BA4298316881042
-:1013500083128810AB29AC2983160814AB012B0823
-:10136000073C031CCD290310AC0DAD0D8810831272
-:101370008814BA29BB29831608148312081CC429AF
-:1013800083162C14C32983128316881083128810A5
-:10139000C929CA298316AB0AAF290814CF29D02935
-:1013A0008810831288140330F700F70BD5298316B1
-:1013B00088108312881083162C08F8002D08F90075
-:1013C0008312080083163D08C4004108C406C41FE8
-:1013D000EE2903110310BD1B0314212A3D08C4008C
-:1013E0004008C5003C08C5020319FC29C41F212A76
-:1013F0000308013A8300212A4108C5003D08C502BF
-:101400000319082AC41F212A0308013A8300212A4C
-:101410004208C5003E08C5020319142AC41F212A28
-:101420000308013A8300212A4308C5003F08C5028A
-:101430000319202AC41F212A0308013A8300212A04
-:101440000310831208000830FC007708FD002F16F7
-:101450002F088316870000008312AF152F0883160C
-:1014600087008312871D322A071A0314071E0310F0
-:10147000F80D0000AF112F08831687008312871123
-:10148000FC0B272A2F162F088316870000008312D3
-:1014900007127D080319512A2F122F08831687007F
-:1014A00083120000AF152F08831687008312871D53
-:1014B000572A00008711AF112F08831687000000FC
-:1014C000831207122F122F08831687008312080039
-:1014D0002F162F088316870000008312AF152F08E0
-:1014E0008316870000008312871D742A07122F12AB
-:1014F0002F0883168700000083128711AF112F0871
-:10150000831687008030FB008A118312C1268A155A
-:10151000E330FB008A11C1268A152F122F0883168B
-:10152000870000008312AF152F08831687008312EF
-:10153000871D982A00009C2A00002F162F0883166A
-:10154000870000006430AF008A11831230238A15AF
-:101550002F162F088316870000008312AF152F085F
-:10156000831687000000831207122F122F0883169C
-:101570008700000083128711AF112F0883168700A0
-:101580008130FB008A118312C1268A150130F700D1
-:1015900023227808F1000130F70023227808F200B6
-:1015A000F70123227808F3002F122F0883168700F3
-:1015B00000008312AF152F08831687008312871D42
-:1015C000DF2A0000E32A00002F162F088316870069
-:1015D0000000F20CF20C3F30F205FC017108FB0038
-:1015E000FC00FB01720EF700F030F70577087B076F
-:1015F000F4007C08F5000318F50A8312A7018B1B81
-:10160000A7178B13750803179A00740899008A119D
-:10161000031344208A15A71B8B177708FB00780853
-:10162000FC007908FD007A08FE00A7018B1BA717B4
-:101630008B137A0803179C0079089B0078089A009E
-:1016400077089900A001FF309F007F309E008E3008
-:101650009D008A11031363208A15A71B8B17523034
-:101660008316C700B830C6002F30C5008630C400CE
-:101670007A08CB007908CA007808C9007708C80042
-:1016800083120020831066308316C300C200BB3073
-:10169000C1008430C0007A08C7007908C600780805
-:1016A000C5007708C4008A1183126D238A158A1138
-:1016B0000A16982C2F162F08831687000000831215
-:1016C000AF152F08831687000000831207122F1210
-:1016D0002F0883168700000083128711AF112F088F
-:1016E000831687008030FB008A118312C1268A1579
-:1016F000E530FB008A11C1268A1564308316AF00DD
-:101700008A11831230238A152F162F08831687001B
-:1017100000008312AF152F08831687000000831284
-:10172000871D902B07122F122F08831687000000A9
-:1017300083128711AF112F08831687008130FB00B9
-:101740008A118312C1268A150130F70023227808F6
-:10175000F1000130F70023227808F200F70123227C
-:101760007808F3002F122F088316870000008312D9
-:10177000AF152F08831687008312871DBD2B00002D
-:10178000C12B00002F162F08831687000000F20CD3
-:10179000F20C3F30F205FC017108FB00FC00FB017C
-:1017A000720EF700F030F70577087B07F4007C082D
-:1017B000F5000318F50A8312A7018B1BA7178B13DB
-:1017C000750803179A00740899008A1103134420BE
-:1017D0008A15A71B8B177708FB007808FC0079088F
-:1017E000FD007A08FE00A7018B1BA7178B137A0850
-:1017F00003179C0079089B0078089A0077089900E5
-:10180000A001FF309F007F309E008E309D008A1126
-:10181000031363208A15A71B8B178316C701C60104
-:101820007A30C5008530C4007A08CB007908CA0038
-:101830007808C9007708C800831200208310831637
-:10184000C301C201C030C1008130C0007A08C700A6
-:101850007908C6007808C5007708C4008A11831289
-:101860006D238A158A110A16A52C2F112F088316AD
-:101870008700831207111308223093008316140C7B
-:10188000031C3F2C8312130893018316140C031CB2
-:10189000462C83122F112F088316870083120715F9
-:1018A0000A308316AF008A11831230238A152F1154
-:1018B0002F088316870083120711130884309300C2
-:1018C0008316140C031C612C8312130893018316D6
-:1018D000140C031C682C83121308F20013088630C2
-:1018E00093008316140C031C722C831213089301AB
-:1018F0008316140C031C792C83121308F1001308AF
-:1019000093018316140C031C822C83122F112F08B1
-:101910008316870083120715FC017208FB00FC0088
-:10192000FB017108FB070318FC0A7C0CF4007B0C1C
-:10193000F300F40CF30CF40CF30CF40CF30CF40CB7
-:10194000F30CF40CF30C0330F405A7018B1BA71761
-:101950008B13740803179A00730899008A110313F4
-:1019600044208A15A71B8B177708FB007808FC001A
-:101970007908FD007A08FE0083147A088316C300F4
-:101980007908C2007808C1007708C000C701C60105
-:101990007930C5008730C4008A1183126D238A15FF
-:1019A0007708FB007808FC007908FD007A08FE0043
-:1019B000A7018B1BA7178B137A0803179C007908C4
-:1019C0009B0078089A00770899003330A0009F00A8
-:1019D000AB309E0081309D008A11031363208A156D
-:1019E000A71B8B177708FB007808FC007908FD001F
-:1019F0007A08FE0083107A088316C3007908C200B3
-:101A00007808C1007708C000C701C6015830C5007A
-:101A10008330C4008A1183126D238A158A110A1635
-:101A2000B42C2F112F088316870083120711130877
-:101A3000243093008316140C031C1B2D83121308EF
-:101A400093018316140C031C222D83122F112F08CF
-:101A500083168700831207150A308316AF008A1198
-:101A6000831230238A152F112F08831687008312C3
-:101A700007111308803093008316140C031C3D2DAE
-:101A80008312130893018316140C031C442D831234
-:101A90001308F2001308823093008316140C031C01
-:101AA0004E2D8312130893018316140C031C552D1D
-:101AB00083121308F1002F112F0883168700831259
-:101AC00007158316A1017208A000A100A0017108EA
-:101AD000A0070318A10A210CF400200CF300F40C59
-:101AE000F30CF40CF30CF40CF30CF40CF30CF40CFA
-:101AF000F30C0330F40583122F112F08831687008F
-:101B0000831207111308843093008316140C031CEE
-:101B1000862D8312130893018316140C031C8D2D3C
-:101B200083121308F2001308863093008316140CF6
-:101B3000031C972D8312130893018316140C031CA6
-:101B40009E2D83121308F100130893018316140CC1
-:101B5000031CA72D83122F112F08831687008312D1
-:101B600007158316A1017208A000A100A001710849
-:101B7000A0070318A10A210CF600200CF500F60CB2
-:101B8000F50CF60CF50CF60CF50CF60CF50CF60C49
-:101B9000F50C0330F6058312A7018B1BA7178B13D7
-:101BA000760803179A00750899008A1103134420D8
-:101BB0008A15A71B8B173F088316C70083123E08A0
-:101BC0008316C60083123D088316C50083123C08A5
-:101BD0008316C4007A08CB007908CA007808C900C7
-:101BE0007708C80083120020831037088316C300CB
-:101BF000831236088316C200831235088316C1008B
-:101C0000831234088316C0007A08C7007908C6001A
-:101C10007808C5007708C4008A1183126D238A15DD
-:101C200077088316A0007808A1007908A2007A0836
-:101C3000A3008312A7018B1BA7178B13740803172C
-:101C40009A00730899008A11031344208A15A71B70
-:101C50008B1783162308C7002208C6002108C50079
-:101C60002008C4007A08CB007908CA007808C900A7
-:101C70007708C80083120020831033088316C3003E
-:101C8000831232088316C200831231088316C10002
-:101C9000831230088316C0007A08C7007908C6008E
-:101CA0007808C5007708C4008A1183126D238A154D
-:101CB00077088316A0007808A1007908A2007A08A6
-:101CC000A3008312A7018B1BA7178B13760803179A
-:101CD0009A00750899008A11031344208A15A71BDE
-:101CE0008B173B088316C70083123A088316C60079
-:101CF000831239088316C500831238088316C4007E
-:101D00007A08CB007908CA007808C9007708C800AB
-:101D100083120020831083162308C3002208C20008
-:101D20002108C1002008C0007A08C7007908C60051
-:101D30007808C5007708C4008A1183126D238A15BC
-:101D40007A08FE007908FD007808FC007708FB009F
-:101D50007E088316C7007D08C6007C08C5007B0886
-:101D6000C4008830CB002030CA000230C9007B306C
-:101D7000C8008312002077088316A0007808A1000D
-:101D80007908A2007A08A30083102308C300220860
-:101D9000C2002108C1002008C000C701C6014830A8
-:101DA000C5008430C4008A1183126D238A158A11FC
-:101DB0000A16062D470884008313481883178316D4
-:101DC00028088000840A80018312C70A0319C80A00
-:101DD000080080080319002FF2010408F1007210B6
-:101DE000831B721400088316A8008312DA26710878
-:101DF0008400831372188317840A0319850AE92E55
-:101E00008A110A16652D8316A6010408A50026105E
-:101E1000831B2614720EF038A100A107E23EA20037
-:101E2000323EA40072080F39A207A207A407E93EB8
-:101E3000A300A307A307710E0F39A307A407A30DDF
-:101E4000A40DA409A40D71080F39A407A10D073032
-:101E5000A0000A30A407A303031C2A2FA307A20390
-:101E6000031C2E2FA207A103031C322FA107A003DE
-:101E7000031C362FA030840083130730250525135B
-:101E80008407A4300402031925170008F700031D76
-:101E9000512F251B512F251A652FA519512F2030A1
-:101EA000542FA51525123030F707F2010408F10070
-:101EB0007210831B72147708A8008312DA26710847
-:101EC00084008313721883178316840A251F412FF9
-:101ED00083128A110A169A2DF701F801F901FA0105
-:101EE0008316B001B101B201B3012F082E042D04F5
-:101EF0002C040319AB2F2030B4000310A80DA90D3A
-:101F0000AA0DAB0DB00DB10DB20DB30D2F083302FC
-:101F1000031D942F2E083202031D942F2D08310229
-:101F2000031D942F2C083002031CA52F2C08B0028F
-:101F30002D08031C2D0FB1022E08031C2E0FB20218
-:101F40002F08031C2F0FB3020314F70DF80DF90D22
-:101F5000FA0DB40B7D2FB030840083138312080078
-:101F6000F21BC42F0F30F700710EF7050A3077020D
-:101F70000318BD2F3030F707BF2F7208F707770817
-:101F80008316A8008312DA260F30F1050A30710299
-:101F90000318CC2F3030CE2FF2137208F1077108DE
-:0E1FA0008316A8008312DA268A110A168A2FE9
+:10129000F9007608FA008A110A16F2298316AD01C0
+:1012A000AC01AB012B08073C031C70290310AC0DEB
+:1012B000AD0D8810831288145D295E2983160814E9
+:1012C0008312081C672983162C146629831283163F
+:1012D0008810831288106C296D298316AB0A522955
+:1012E0000810831208107429752983168810831238
+:1012F00088140330F700F70B7B29831688108312BC
+:1013000088108229832983160814AB012B08073C17
+:10131000031CA4290310AC0DAD0D88108312881492
+:1013200091299229831608148312081C9B2983167D
+:101330002C149A2983128316881083128810A029EE
+:10134000A1298316AB0A86290814A629A729881083
+:10135000831288140330F700F70BAC29831688102A
+:101360008312881083162C08F8002D08F9008312C8
+:10137000080083163D08C4004108C406C41FC529DF
+:1013800003110310BD1B0314F8293D08C4004008D5
+:10139000C5003C08C5020319D329C41FF829030856
+:1013A000013A8300F8294108C5003D08C502031928
+:1013B000DF29C41FF8290308013A8300F8294208ED
+:1013C000C5003E08C5020319EB29C41FF82903080C
+:1013D000013A8300F8294308C5003F08C5020319F4
+:1013E000F729C41FF8290308013A8300F8290310DC
+:1013F000831208000830FC007708FD0083160817E8
+:10140000000088168312881E032A081B0314081F75
+:101410000310F80D00008316881283128812FC0B4B
+:10142000FE29831608170000831208137D0803198C
+:101430001C2A831608138312000083168816831251
+:10144000881E202A0000881283168812000083124A
+:101450000813831608138312080083160817000068
+:10146000881600008312881E332A08138316081377
+:10147000000083128812831688128030FB008A11C4
+:101480008312C1268A15E330FB008A11C1268A1512
+:1014900083160813000088168312881E4D2A000048
+:1014A000512A00008316081700006430AF008A112B
+:1014B000831284268A1583160817000088160000F8
+:1014C00083120813831608130000831288128316F0
+:1014D00088128130FB008A118312C1268A150130DF
+:1014E000F700FA217808F1000130F700FA217808B6
+:1014F000F200F701FA217808F300831608130000C0
+:1015000088168312881E822A0000862A000083160D
+:1015100008170000FC30F2057108F5007208F400AD
+:101520008312A7018B1BA7178B13750803179A004B
+:10153000740899008A11031344208A15A71B8B177E
+:101540007708FB007808FC007908FD007A08FE00A7
+:10155000A7018B1BA7178B137A0803179C00790828
+:101560009B0078089A0077089900A001FF309F003F
+:101570007F309E008E309D008A11031363208A15F0
+:10158000A71B8B1752308316C700B830C6002F3008
+:10159000C5008630C4007A08CB007908CA007808F4
+:1015A000C9007708C80083120020831066308316B4
+:1015B000C300C200BB30C1008430C0007A08C7003D
+:1015C0007908C6007808C5007708C4008A1183121C
+:1015D00007238A158A110A16972C8316081700000C
+:1015E0008816000083120813831608130000831264
+:1015F0008812831688128030FB008A118312C1265C
+:101600008A15E530FB008A11C1268A1564308316DD
+:10161000AF008A11831284268A15831608170000EA
+:10162000881600008312881E132B081383160813D4
+:10163000000083128812831688128130FB008A1101
+:101640008312C1268A150130F700FA217808F100CB
+:101650000130F700FA217808F200F701FA21780842
+:10166000F30083160813000088168312881E362B99
+:1016700000003A2B0000831608170000FC30F2052A
+:101680007108F5007208F4008312A7018B1BA717DD
+:101690008B13750803179A00740899008A110313B5
+:1016A00044208A15A71B8B177708FB007808FC00DD
+:1016B0007908FD007A08FE00A7018B1BA7178B1382
+:1016C0007A0803179C0079089B0078089A0077082D
+:1016D0009900A001FF309F007F309E008E309D005A
+:1016E0008A11031363208A15A71B8B178316C70162
+:1016F000C6017A30C5008530C4007A08CB0079086D
+:10170000CA007808C9007708C80083120020831037
+:101710008316C301C201C030C1008130C0007A0805
+:10172000C7007908C6007808C5007708C4008A1188
+:10173000831207238A158A110A16A42C3F113F0829
+:101740008316870083120711130822309300831633
+:10175000140C031CA82B8312130893018316140C7A
+:10176000031CAF2B83123F113F088316870083129F
+:1017700007150A308316AF008A11831284268A1552
+:101780003F113F0883168700831207111308843026
+:1017900093008316140C031CCA2B831213089301A5
+:1017A0008316140C031CD12B83121308F2001308A8
+:1017B000863093008316140C031CDB2B8312130852
+:1017C00093018316140C031CE22B83121308F100FF
+:1017D000130893018316140C031CEB2B83123F1187
+:1017E0003F088316870083120715FC017208FB006F
+:1017F000FC00FB017108FB070318FC0A7C0CF400D9
+:101800007B0CF300F40CF30CF40CF30CF40CF30C61
+:10181000F40CF30CF40CF30C0330F405A7018B1B50
+:10182000A7178B13740803179A00730899008A117D
+:10183000031344208A15A71B8B177708FB00780831
+:10184000FC007908FD007A08FE0083147A088316EC
+:10185000C3007908C2007808C1007708C000C7013A
+:10186000C6017930C5008730C4008A11831207236E
+:101870008A157708FB007808FC007908FD007A08D3
+:10188000FE00A7018B1BA7178B137A0803179C0078
+:1018900079089B0078089A00770899003330A000F7
+:1018A0009F00AB309E0081309D008A11031363209E
+:1018B0008A15A71B8B177708FB007808FC007908AE
+:1018C000FD007A08FE0083107A088316C3007908A9
+:1018D000C2007808C1007708C000C701C6015830AF
+:1018E000C5008330C4008A11831207238A158A1128
+:1018F0000A16F32C3F113F08831687008312071145
+:101900001308243093008316140C031C842C8312B8
+:10191000130893018316140C031C8B2C83123F11A4
+:101920003F0883168700831207150A308316AF001D
+:101930008A11831284268A153F113F088316870077
+:10194000831207111308803093008316140C031CB4
+:10195000A62C8312130893018316140C031CAD2CC0
+:1019600083121308F2001308823093008316140CBC
+:10197000031CB72C8312130893018316140C031C49
+:10198000BE2C83121308F1003F113F088316870015
+:10199000831207158316A1017208A000A100A001FF
+:1019A0007108A0070318A10A210CF400200CF30011
+:1019B000F40CF30CF40CF30CF40CF30CF40CF30C2B
+:1019C000F40CF30C0330F40583123F113F08831627
+:1019D0008700831207111308843093008316140CB8
+:1019E000031CEF2C8312130893018316140C031CA1
+:1019F000F62C83121308F200130886309300831626
+:101A0000140C031C002D8312130893018316140C6D
+:101A1000031C072D83121308F1001308930183168A
+:101A2000140C031C102D83123F113F0883168700EE
+:101A3000831207158316A1017208A000A100A0015E
+:101A40007108A0070318A10A210CF600200CF5006C
+:101A5000F60CF50CF60CF50CF60CF50CF60CF50C7A
+:101A6000F60CF50C0330F6058312A7018B1BA717A4
+:101A70008B13760803179A00750899008A110313CF
+:101A800044208A15A71B8B173E088316C7008312B4
+:101A90003D088316C60083123C088316C5008312D6
+:101AA0003B088316C4007A08CB007908CA0078087E
+:101AB000C9007708C80083120020831036088316F7
+:101AC000C300831235088316C200831234088316BC
+:101AD000C100831233088316C0007A08C700790852
+:101AE000C6007808C5007708C4008A11831207234E
+:101AF0008A1577088316A0007808A1007908A2004B
+:101B00007A08A3008312A7018B1BA7178B137408F5
+:101B100003179A00730899008A11031344208A1549
+:101B2000A71B8B1783162308C7002208C6002108AD
+:101B3000C5002008C4007A08CB007908CA007808DC
+:101B4000C9007708C800831200208310320883166A
+:101B5000C300831231088316C20083123008831633
+:101B6000C10083122F088316C0007A08C7007908C5
+:101B7000C6007808C5007708C4008A1183120723BD
+:101B80008A1577088316A0007808A1007908A200BA
+:101B90007A08A3008312A7018B1BA7178B13760863
+:101BA00003179A00750899008A11031344208A15B7
+:101BB000A71B8B173A088316C700831239088316B0
+:101BC000C600831238088316C500831237088316AF
+:101BD000C4007A08CB007908CA007808C9007708E1
+:101BE000C80083120020831083162308C300220834
+:101BF000C2002108C1002008C0007A08C700790887
+:101C0000C6007808C5007708C4008A11831207232C
+:101C10008A157A08FE007908FD007808FC0077082C
+:101C2000FB007E088316C7007D08C6007C08C5003F
+:101C30007B08C4008830CB002030CA000230C900C5
+:101C40007B30C8008312002077088316A000780834
+:101C5000A1007908A2007A08A30083102308C3001A
+:101C60002208C2002108C1002008C000C701C60127
+:101C70004830C5008430C4008A11831207238A15B6
+:101C80008A110A16452D47088400831348188317C4
+:101C9000831628088000840A80018312C70A03196A
+:101CA000C80A080080080319692EF2010408F1002F
+:101CB0007210831B721400088316A8008312432637
+:101CC00071088400831372188317840A0319850A24
+:101CD000522E8A110A16A42D8316A6010408A50007
+:101CE0002610831B2614720EF038A100A107E23ED5
+:101CF000A200323EA40072080F39A207A207A4076F
+:101D0000E93EA300A307A307710E0F39A307A40799
+:101D1000A30DA40DA409A40D71080F39A407A10DEA
+:101D20000730A0000A30A407A303031C932EA307C7
+:101D3000A203031C972EA207A103031C9B2EA1073D
+:101D4000A003031C9F2EA0308400831307302505B9
+:101D500025138407A4300402031925170008F7008F
+:101D6000031DBA2E251BBA2E251ACE2EA519BA2E62
+:101D70002030BD2EA51525123030F707F2010408DA
+:101D8000F1007210831B72147708A8008312432697
+:101D9000710884008313721883178316840A251F21
+:101DA000AA2E83128A110A16D92DF701F801F9011A
+:101DB000FA018316B001B101B201B3012F082E045C
+:101DC0002D042C040319142F2030B4000310A80D87
+:101DD000A90DAA0DAB0DB00DB10DB20DB30D2F08AD
+:101DE0003302031DFD2E2E083202031DFD2E2D0889
+:101DF0003102031DFD2E2C083002031C0E2F2C086F
+:101E0000B0022D08031C2D0FB1022E08031C2E0F4B
+:101E1000B2022F08031C2F0FB3020314F70DF80DA5
+:101E2000F90DFA0DB40BE62EB03084008313831243
+:101E30000800F21B2D2F0F30F700710EF7050A3046
+:101E400077020318262F3030F707282F7208F7077C
+:101E500077088316A800831243260F30F1050A3055
+:101E600071020318352F3030372FF2137208F10743
+:101E700071088316A800831243268A110A16C92FF7
 :1020000004088316A0007508A20003192628740886
 :10201000C7007308C6007208C5007108C400CB0170
 :10202000CA012030C9008230C8000A128A15831202
 ,7 → 501,7
 :1020D000A500A4010A30A20075080319A00A74081B
 :1020E000AB007308AA007208A9007108A8002708AD
 :1020F000AF002608AE002508AD002408AC000A1287
-:102100008A1583126C270A168A110008F100840AC6
+:102100008A158312D5260A168A110008F100840A5E
 :102110000008F200840A0008F300840A0008F400B2
 :10212000FD308407F708031DAC28750A83162202C8
 :10213000031D9C288312AC2820080319AF280F39EF
 ,231 → 508,239
 :1021400022020319A5280318F728A01BF728201B33
 :10215000AF282030ED28831220308316A005A01E62
 :10216000C328A0127508031DA0037708A0002D3016
-:10217000A8000A128A158312DA260A168A11831613
+:10217000A8000A128A15831243260A168A118316AA
 :102180002008F700A00175082202031DD728770850
-:10219000A0002E30A8000A128A158312DA260A1629
+:10219000A0002E30A8000A128A15831243260A16C0
 :1021A0008A1183162008F7002030A0050030303057
 :1021B000A01EED28A0127508031DA0037708A0003B
-:1021C0002D30A8000A128A158312DA260A168A11FF
+:1021C0002D30A8000A128A15831243260A168A1196
 :1021D00083162008F700A0013030F7077708A80021
-:1021E0000A128A158312DA260A168A11831627081C
+:1021E0000A128A15831243260A168A1183162708B3
 :1021F000AB002608AA002508A9002408A800AF0102
-:10220000AE01AD010A30AC000A128A1583126C27A8
+:10220000AE01AD010A30AC000A128A158312D52640
 :102210000A168A117A088316A7007908A60078089A
 :10222000A5007708A400A20B6F2883120800840180
 :1022300083131F308305713083168F000F08031737
 :1022400087110C3003139900A2309800903083124C
-:102250009800C101C001C501C401C301C2018316B8
-:1022600003170908C039890003131F129F12003099
-:102270000317880083128701880189010313A801CD
-:10228000A901AA013030AB002E30AC003130AD00D6
-:10229000AE01FF30AF00C701C801CA01C9017130EA
-:1022A00083168F000F0809308312031785000F3043
-:1022B000F700031381018130840083130008F03993
-:1022C0000738800064000008F739F719F0397704FF
-:1022D00080006400831603170908C03989000313BE
-:1022E0001F129F12003003178800831203131F135D
-:1022F0009F1383169F1783121F1483160108C73973
-:10230000283881000F30831290000030F8009200CE
-:1023100000308316920083122F152F088316870032
-:102320008312970183169B019C0101309D0083124B
-:10233000031787018801890103139412AF122F0834
-:102340008316870083122F162F08831687008312A7
-:10235000AF112F088316870022308312940040307B
-:102360008316940083122F112F088316870083127F
-:1023700007150A12602A0A1683160C1483128B168C
-:10238000C0308B0464000A12442B0A160A12B32CC4
-:102390000A164610781846140A120B2F0A16640003
-:1023A000D401D801D701D601D501DC01DB01DA0166
-:1023B000D901E001DF01DE01DD01E401E301E20119
-:1023C000E1010430F100FA308316AF000A128312E3
-:1023D00030230A16F10BE3290A128A1577280A1608
-:1023E0008A117708F1007808F2007908F3007A087A
-:1023F000F400F6010408F5007610831B76148310B0
-:1024000074088316C3007308C2007208C100710803
-:10241000C000C7016630C6005530C5008D30C4000D
-:102420000A1283126D230A16750884008313761826
-:1024300083177A08E8007908E7007808E60077084B
-:10244000E500F201F101DC01DB01DA01D9010A1238
-:1024500007230A1603308316AB000A128312BA2729
-:102460000A16831628107818281428184B2A0A12DE
-:102470008A1583124E210A168A110A128A157721AB
-:102480000A168A1179088316AA007808A900290873
-:10249000F8002A08F9007908F2007808F1000A1219
-:1024A000831207230A1605308316AB000A12831223
-:1024B000BA270A1683162810781828142818742AA0
-:1024C0000A128A1583124E210A168A110A128A15D7
-:1024D00077210A168A1179088316AA007808A900BC
-:1024E0002908F8002A08F9007908F4007808F300B0
-:1024F0007208A9007108A8007408AB007308AA004C
-:102500008312A7018B1BA7178B138316290883122D
-:1025100003179A00831603132808831203179900E0
-:102520000A12031344200A16A71B8B177708831679
-:10253000B0007808B1007908B2007A08B300C7008B
-:102540003208C6003108C5003008C4000A30CB008C
-:10255000D730CA002330C9007830C8000A128A1563
-:10256000831200200A168A1177088316B0007808B3
-:10257000B1007908B2007A08B30083143308C300AD
-:102580003208C2003108C1003008C000C701C601CE
-:102590002030C5008430C4000A1283126D230A164D
-:1025A0007A08D8007908D7007808D6007708D500CF
-:1025B000A7018B1BA7178B1383162B0883120317F6
-:1025C0009A00831603132A088312031799000A122C
-:1025D000031344200A16A71B8B177A088316AF0033
-:1025E0007908AE007808AD007708AC002F08C70066
-:1025F0002E08C6002D08C5002C08C400BD30CB0035
-:102600005230CA001630C9007A30C8000A128A1542
-:10261000831200200A168A118310C5308316C30066
-:10262000FE30C2008230C1008030C0007A08C7008E
-:102630007908C6007808C5007708C4000A1283121A
-:102640006D230A1677088316B0007808B100790860
-:10265000B2007A08B3002F08C7002E08C6002D0864
-:10266000C5002C08C4002F08CB002E08CA002D0876
-:10267000C9002C08C8000A128A15831200200A1605
-:102680008A1177088316B4007808B5007908B60077
-:102690007A08B700C7003608C6003508C5003408F8
-:1026A000C400F630CB002430CA00D630C9006B30ED
-:1026B000C8000A128A15831200200A168A11831094
-:1026C00083163308C3003208C2003108C100300845
-:1026D000C0007A08C7007908C6007808C5007708E6
-:1026E000C4000A1283126D230A167A08FE007908C4
-:1026F000FD007808FC007708FB0083145808831657
-:10270000C300831257088316C2008312560883162B
-:10271000C100831255088316C000C701C6014830A6
-:10272000C5008330C4000A1283126D230A1677088D
-:102730008316B0007808B1007908B2007A08B300B7
-:10274000AC30C700C530C6002730C5007130C400AA
-:102750002F08CB002E08CA002D08C9002C08C8007D
-:102760000A128A15831200200A168A1183100A3071
-:102770008316C300D730C2002330C1007830C000B8
-:102780007A08C7007908C6007808C5007708C40031
-:102790000A1283126D230A1683163308C700320803
-:1027A000C6003108C5003008C4007A08CB0079089B
-:1027B000CA007808C9007708C8000A128A1583126F
-:1027C00000200A168A1177088316B0007808B10035
-:1027D0007908B2007A08B30083103308C3003208C6
-:1027E000C2003108C1003008C0007E08C7007D0863
-:1027F000C6007C08C5007B08C4000A1283126D2342
-:102800000A167A08DC007908DB007808DA00770815
-:10281000D9008316BF01BE014630BD008530BC0023
-:1028200083125C088316C30083125B088316C20000
-:1028300083125A088316C100831259088316C000F8
-:102840000A128A158312E2210A168A11031C2E2C01
-:10285000DC01DB014830DA008530D9005C088316E2
-:10286000BF0083125B088316BE0083125A088316CA
-:10287000BD00831259088316BC00CD30C300CC3094
-:10288000C2004C30C1007B30C0000A128A1583128E
-:10289000E2210A168A11031C552CCD30DC00CC3005
-:1028A000DB004C30DA007B30D900831058088316E7
-:1028B000C300831257088316C2008312560883167A
-:1028C000C100831255088316C0003330C70093300F
-:1028D000C6000830C5008730C4000A1283126D2379
-:1028E0000A167708F1007808F2007908F3007A08F0
-:1028F000F4008316C7007308C6007208C50071088B
-:10290000C400CB01CA014830C9008530C8000A1292
-:102910008A15831200200A168A117A08D8007908CD
-:10292000D7007808D6007708D5000A128A15682AD9
-:102930000A168A117A08E0007908DF007808DE00BC
-:102940007708DD000A128A155A2B0A168A117A08AE
-:10295000E4007908E3007808E2007708E100461C0B
-:102960002D2D0A128A15352C0A168A117708F100C6
-:102970007808F2007908F3007A08F400F6010408F8
-:10298000F5007610831B7614831074088316C30039
-:102990007308C2007208C1007108C0003330C7005C
-:1029A0009330C6000830C5008730C4000A12831275
-:1029B0006D230A1675088400831376188317770829
-:1029C000F1007808F2007908F3007A08F400831621
-:1029D000C7007308C6007208C5007108C400CB01A7
-:1029E000CA014830C9008530C8000A128A1583120E
-:1029F00000200A168A117A08EC007908EB007808A2
-:102A0000EA007708E9000A128A15112D0A168A11C0
-:102A10007708F1007808F2007908F3007A08F400EA
-:102A20008316C7007308C6007208C5007108C40089
-:102A3000CB01CA012030C9008230C8000A128A15B1
-:102A4000831200200A168A117A08F0007908EF0034
-:102A50007808EE007708ED00352DEC01EB01EA0176
-:102A6000E901F001EF01EE01ED012130F700F70B74
-:102A7000372D24300C1E3A2D99002130F700F70B2A
-:102A80003F2DC8014B30C70041308316A8000A1201
-:102A90008A158312DA260A168A1157308316A8007F
-:102AA0000A128A158312DA260A168A1153308316FF
-:102AB000A8000A128A158312DA260A168A112B3008
-:102AC000840083130A128A15E92E0A168A1120300F
-:102AD0008316A8000A128A158312DA260A168A11AA
-:102AE000D3014B30530784008313800803198E2DC4
-:102AF0002130F700F70B7A2D4B30530784008313F6
-:102B00000008F10071080C1E832D99005308D30AA8
-:102B10004B3E840083130008D406712DC8014B304E
-:102B2000C700103084004A08F2004908F1000A1278
-:102B30008A15032F0A168A1120308316A8000A125C
-:102B40008A158312DA260A168A11D3014B305307ED
-:102B50008400831380080319C32D2130F700F70B7D
-:102B6000AF2D4B305307840083130008F100710828
-:102B70000C1EB82D99005308D30A4B3E84008313D2
-:102B80000008D406A62DC8014B30C70004308400CD
-:102B90006808F4006708F3006608F2006508F100B1
-:102BA000F501002020308316A8000A128A1583122E
-:102BB000DA260A168A11D3014B3053078400831397
-:102BC00080080319F92D2130F700F70BE52D4B3064
-:102BD0005307840083130008F10071080C1EEE2DCA
-:102BE00099005308D30A4B3E840083130008D4068F
-:102BF000DC2DC8014B30C700043084005808F400B5
-:102C00005708F3005608F2005508F100F5010020BE
-:102C100020308316A8000A128A158312DA260A16B3
-:102C20008A11D3014B3053078400831380080319A2
-:102C30002F2E2130F700F70B1B2E4B30530784004B
-:102C400083130008F10071080C1E242E990053080C
-:102C5000D30A4B3E840083130008D406122EC80109
-:102C60004B30C700023084005C08F4005B08F300BE
-:102C70005A08F2005908F1000130F5000020203018
-:102C80008316A8000A128A158312DA260A168A11F8
-:102C9000D3014B3053078400831380080319662E39
-:102CA0002130F700F70B522E4B305307840083136B
-:102CB0000008F10071080C1E5B2E99005308D30A1E
-:102CC0004B3E840083130008D406492EC8014B30C4
-:102CD000C700043084006008F4005F08F3005E0859
-:102CE000F2005D08F100F501002020308316A800F5
-:102CF0000A128A158312DA260A168A11D3014B307A
-:102D0000530784008313800803199C2E2130F70099
-:102D1000F70B882E4B305307840083130008F10013
-:102D200071080C1E912E99005308D30A4B3E840063
-:102D300083130008D4067F2EC8014B30C700023031
-:102D400084006408F4006308F3006208F20061087C
-:102D5000F1000130F500002020308316A8000A128F
-:102D60008A158312DA260A168A11D3014B305307CB
-:102D70008400831380080319D32E2130F700F70B4A
-:102D8000BF2E4B305307840083130008F1007108F5
-:102D90000C1EC82E99005308D30A4B3E840083139F
-:102DA0000008D406B62EC8014B30C700043084009A
-:102DB0006C08F4006B08F3006A08F2006908F1007F
-:102DC000F501002020308316A8000A128A1583120C
-:102DD000DA260A168A11D3014B3053078400831375
-:102DE00080080319092F2130F700F70BF52E4B301F
-:102DF0005307840083130008F10071080C1EFE2E97
-:102E000099005308D30A4B3E840083130008D4066C
-:102E1000EC2EC8014B30C700043084007008F40069
-:102E20006F08F3006E08F2006D08F1000130F50044
-:102E3000002020308316A8000A128A158312DA2691
-:102E40000A168A11D3014B3053078400831380087C
-:102E50000319402F2130F700F70B2C2F4B3053076D
-:102E6000840083130008F10071080C1E352F9900AF
-:102E70005308D30A4B3E840083130008D406232F43
-:102E8000C8014B30C700023084004508F4004408F4
-:102E9000F3004308F2004208F1000130F500002081
-:102EA00020308316A8000A128A158312DA260A1621
-:102EB0008A11D3014B305307840083138008031910
-:102EC000772F2130F700F70B632F4B305307840027
-:102ED00083130008F10071080C1E6C2F9900530831
-:102EE000D30A4B3E840083130008D4065A2FC8012E
-:102EF0004B30C7002A308316A8000A128A158312A5
-:102F0000DA260A168A115408F1003730F2000A1244
-:102F10008A15B02F0A168A110D308316A8000A12DE
-:102F20008A158312DA260A168A110A308316A80037
-:102F30000A128A158312DA260A168A11D3014B3037
-:102F400053078400831380080319B62F2130F7003C
-:102F5000F70BA82F5308D30A4B3E840083130008B5
-:102F6000F10071080C1EB22F99009F2F2130F7003D
-:102F7000F70BB82F6400C90A0319CA0AD0296300E5
+:102250009800831603170908C039890003131F1259
+:102260009F120030031788008312870188018901BB
+:102270000313A801A901AA013030AB002E30AC0035
+:102280003130AD00AE01FF30BF00C701C801CA0147
+:10229000C901713083168F000F08093083120317AC
+:1022A00085000F30F7000313810181308400831310
+:1022B0000008F0390738800064000008F739F71982
+:1022C000F039770480006400831603170908C039C9
+:1022D000890003131F129F12003003178800831216
+:1022E00003131F139F1383169F1783121F14831644
+:1022F0000108C739283881000F3083129000003060
+:10230000F800920000308316920083123F153F08B8
+:10231000831687008312970183169B019C0101306D
+:102320009D0083120317870188018901031394120A
+:10233000BF123F088316870083123F163F0883169B
+:1023400087008312BF113F08831687002230831253
+:10235000940040308316940083123F113F08831687
+:102360008700831207150A12602A0A1683160C14B6
+:1023700083128B16C0308B0464000A124D2C0A168F
+:102380004610781846140A12982E0A160A12F52ECC
+:102390000A1681018F018E01C101C001C501C4016E
+:1023A000C301C2016400D401D801D701D601D5010F
+:1023B000DC01DB01DA01D901E001DF01DE01DD0131
+:1023C000E401E301E201E1010430F100FA30831697
+:1023D000AF000A12831284260A16F10BE6290A12AC
+:1023E0008A1577280A168A117708F1007808F20012
+:1023F0007908F3007A08F400F6010408F500761075
+:10240000831B7614831074088316C3007308C200FC
+:102410007208C1007108C000C7016630C60055309F
+:10242000C5008D30C4000A12831207230A167508EE
+:1024300084008313761883177A08E8007908E70088
+:102440007808E6007708E500F201F101DC01DB0124
+:10245000DA01D9010A125B260A1603308316AB0093
+:102460000A12831292270A16831628107818281445
+:1024700028184C2A0A128312D7270A160A128A151C
+:102480004E210A168A1179088316AA007808A90035
+:102490002908F8002A08F9007908F2007808F10004
+:1024A0000A1283125B260A1605308316AB000A1245
+:1024B000831292270A1683162810781828142818D1
+:1024C000732A0A128312D7270A160A128A154E2176
+:1024D0000A168A1179088316AA007808A900290823
+:1024E000F8002A08F9007908F4007808F300720867
+:1024F000A9007108A8007408AB007308AA00831231
+:10250000A7018B1BA7178B138316290883120317A8
+:102510009A008316031328088312031799000A12DE
+:10252000031344200A16A71B8B1777088316B000E5
+:102530007808B1007908B2007A08B300C700320801
+:10254000C6003108C5003008C4000A30CB00D730BF
+:10255000CA002330C9007830C8000A128A158312D5
+:1025600000200A168A1177088316B0007808B10097
+:102570007908B2007A08B30083143308C300320824
+:10258000C2003108C1003008C000C701C6012030B8
+:10259000C5008430C4000A12831207230A167A0881
+:1025A000D8007908D7007808D6007708D500A701A9
+:1025B0008B1BA7178B1383162B08831203179A0004
+:1025C000831603132A088312031799000A120313B0
+:1025D00044200A16A71B8B177A088316AF007908C8
+:1025E000AE007808AD007708AC002F08C7002E08B1
+:1025F000C6002D08C5002C08C400BD30CB005230E9
+:10260000CA001630C9007A30C8000A128A1583122F
+:1026100000200A168A118310C5308316C300FE30CD
+:10262000C2008230C1008030C0007A08C70079083B
+:10263000C6007808C5007708C4000A128312072371
+:102640000A1677088316B0007808B1007908B2003E
+:102650007A08B3002F08C7002E08C6002D08C50051
+:102660002C08C4002F08CB002E08CA002D08C90072
+:102670002C08C8000A128A15831200200A168A1133
+:1026800077088316B4007808B5007908B6007A0890
+:10269000B700C7003608C6003508C5003408C400B6
+:1026A000F630CB002430CA00D630C9006B30C800E9
+:1026B0000A128A15831200200A168A1183108316C3
+:1026C0003308C3003208C2003108C1003008C0001E
+:1026D0007A08C7007908C6007808C5007708C400E2
+:1026E0000A12831207230A167A08FE007908FD00F1
+:1026F0007808FC007708FB00831458088316C30091
+:10270000831257088316C200831256088316C1002D
+:10271000831255088316C000C701C6014830C500A2
+:102720008330C4000A12831207230A16770883161F
+:10273000B0007808B1007908B2007A08B300AC3074
+:10274000C700C530C6002730C5007130C4002F084F
+:10275000CB002E08CA002D08C9002C08C8000A1298
+:102760008A15831200200A168A1183100A308316F4
+:10277000C300D730C2002330C1007830C0007A08CF
+:10278000C7007908C6007808C5007708C4000A1297
+:10279000831207230A1683163308C7003208C600BF
+:1027A0003108C5003008C4007A08CB007908CA0097
+:1027B0007808C9007708C8000A128A158312002019
+:1027C0000A168A1177088316B0007808B1007908D4
+:1027D000B2007A08B30083103308C3003208C20085
+:1027E0003108C1003008C0007E08C7007D08C6005F
+:1027F0007C08C5007B08C4000A12831207230A164E
+:102800007A08DC007908DB007808DA007708D9005C
+:102810008316BF01BE014630BD008530BC00831267
+:102820005C088316C30083125B088316C200831200
+:102830005A088316C100831259088316C0000A1271
+:102840008A158312B9210A168A11031C2D2CDC016A
+:10285000DB014830DA008530D9005C088316BF0000
+:1028600083125B088316BE0083125A088316BD00CC
+:10287000831259088316BC00CD30C300CC30C2008F
+:102880004C30C1007B30C0000A128A158312B92176
+:102890000A168A11031C542CCD30DC00CC30DB002E
+:1028A0004C30DA007B30D900831058088316C300FF
+:1028B000831257088316C200831256088316C1007C
+:1028C000831255088316C0003330C7009330C6000A
+:1028D0000830C5008730C4000A12831207230A1685
+:1028E0007708F1007808F2007908F3007A08F4001C
+:1028F0008316C7007308C6007208C5007108C400BB
+:10290000CB01CA014830C9008530C8000A128A15B7
+:10291000831200200A168A117A08D8007908D70095
+:102920007808D6007708D5000A128A152D2A0A16CB
+:102930008A117A08E0007908DF007808DE0077085D
+:10294000DD000A128A15ED2A0A168A117A08E400B7
+:102950007908E3007808E2007708E1008310600856
+:102960008316C30083125F088316C20083125E08B9
+:102970008316C10083125D088316C0003330C70080
+:102980009330C6000830C5008730C4000A12831295
+:1029900007230A167708F1007808F2007908F30097
+:1029A0007A08F4008316C7007308C6007208C500D1
+:1029B0007108C400CB01CA014830C9008530C80085
+:1029C0000A128A15831200200A168A117A08E0007A
+:1029D0007908DF007808DE007708DD00461C6C2DE2
+:1029E0000A128A159E2B0A168A117708F1007808B8
+:1029F000F2007908F3007A08F400F6010408F50003
+:102A00007610831B7614831074088316C300730832
+:102A1000C2007208C1007108C0003330C700933093
+:102A2000C6000830C5008730C4000A12831207238D
+:102A30000A16750884008313761883177708F10047
+:102A40007808F2007908F3007A08F4008316C700CA
+:102A50007308C6007208C5007108C400CB01CA0122
+:102A60004830C9008530C8000A128A158312002038
+:102A70000A168A117A08EC007908EB007808EA0057
+:102A80007708E9000A128A157A2C0A168A11770843
+:102A9000F1007808F2007908F3007A08F400831650
+:102AA000C7007308C6007208C5007108C400CB01D6
+:102AB000CA012030C9008230C8000A128A15831268
+:102AC00000200A168A117A08F0007908EF007808C9
+:102AD000EE007708ED00742DEC01EB01EA01E9014D
+:102AE000F001EF01EE01ED012130F700F70B762D3B
+:102AF00024300C1E792D99002130F700F70B7E2D24
+:102B0000C8014B30C70041308316A8000A128A154D
+:102B1000831243260A168A1157308316A8000A1218
+:102B20008A15831243260A168A1153308316A80089
+:102B30000A128A15831243260A168A112B30840042
+:102B400083130A128A15522E0A168A112030831610
+:102B5000A8000A128A15831243260A168A11D30185
+:102B60004B3053078400831380080319CD2D213087
+:102B7000F700F70BB92D4B3053078400831300087F
+:102B8000F10071080C1EC22D99005308D30A4B3E68
+:102B9000840083130008D406B02DC8014B30C70051
+:102BA000103084004A08F2004908F1000A128A1520
+:102BB0006C2E0A168A1120308316A8000A128A1574
+:102BC000831243260A168A11D3014B30530784001F
+:102BD000831380080319022E2130F700F70BEE2D26
+:102BE0004B305307840083130008F10071080C1E5A
+:102BF000F72D99005308D30A4B3E84008313000835
+:102C0000D406E52DC8014B30C700043084006808A5
+:102C1000F4006708F3006608F2006508F100F501AA
+:102C2000002020308316A8000A128A15831243263A
+:102C30000A168A11D3014B3053078400831380088E
+:102C40000319382E2130F700F70B242E4B30530791
+:102C5000840083130008F10071080C1E2D2E9900CA
+:102C60005308D30A4B3E840083130008D4061B2E5E
+:102C7000C8014B30C700043084005808F4005708DE
+:102C8000F3005608F2005508F100F501002020304D
+:102C90008316A8000A128A15831243260A168A117F
+:102CA000D3014B30530784008313800803196E2E21
+:102CB0002130F700F70B5A2E4B3053078400831353
+:102CC0000008F10071080C1E632E99005308D30A06
+:102CD0004B3E840083130008D406512EC8014B30AC
+:102CE000C700023084005C08F4005B08F3005A0857
+:102CF000F2005908F1000130F50000202030831661
+:102D0000A8000A128A15831243260A168A11D301D3
+:102D10004B3053078400831380080319A52E2130FC
+:102D2000F700F70B912E4B305307840083130008F4
+:102D3000F10071080C1E9A2E99005308D30A4B3EDD
+:102D4000840083130008D406882EC8014B30C700C6
+:102D5000043084006008F4005F08F3005E08F200AD
+:102D60005D08F100F501002020308316A8000A124A
+:102D70008A15831243260A168A11D3014B30530752
+:102D80008400831380080319DB2E2130F700F70B32
+:102D9000C72E4B305307840083130008F1007108DD
+:102DA0000C1ED02E99005308D30A4B3E8400831387
+:102DB0000008D406BE2EC8014B30C7000230840084
+:102DC0006408F4006308F3006208F2006108F1008F
+:102DD0000130F500002020308316A8000A128A1561
+:102DE000831243260A168A11D3014B3053078400FD
+:102DF000831380080319122F2130F700F70BFE2EE2
+:102E00004B305307840083130008F10071080C1E37
+:102E1000072F99005308D30A4B3E84008313000800
+:102E2000D406F52EC8014B30C700043084006C086E
+:102E3000F4006B08F3006A08F2006908F100F5017C
+:102E4000002020308316A8000A128A158312432618
+:102E50000A168A11D3014B3053078400831380086C
+:102E60000319482F2130F700F70B342F4B3053074D
+:102E7000840083130008F10071080C1E3D2F990097
+:102E80005308D30A4B3E840083130008D4062B2F2B
+:102E9000C8014B30C700043084007008F4006F088C
+:102EA000F3006E08F2006D08F1000130F50000201B
+:102EB00020308316A8000A128A15831243260A16A8
+:102EC0008A11D3014B305307840083138008031900
+:102ED0007F2F2130F700F70B6B2F4B305307840007
+:102EE00083130008F10071080C1E742F9900530819
+:102EF000D30A4B3E840083130008D406622FC80116
+:102F00004B30C700023084004508F4004408F30049
+:102F10004308F2004208F1000130F50000202030A3
+:102F20008316A8000A128A15831243260A168A11EC
+:102F3000D3014B3053078400831380080319B62F45
+:102F40002130F700F70BA22F4B3053078400831377
+:102F50000008F10071080C1EAB2F99005308D30A2A
+:102F60004B3E840083130008D406992FC8014B30D0
+:102F7000C7002A308316A8000A128A158312432636
+:102F80000A168A115408F1003730F2000A128A1525
+:102F9000192F0A168A110D308316A8000A128A15F5
+:102FA000831243260A168A110A308316A8000A12D1
+:102FB0008A15831243260A168A11D3014B30530710
+:102FC0008400831380080319F52F2130F700F70BD5
+:102FD000E72F5308D30A4B3E840083130008F10007
+:102FE00071080C1EF12F9900DE2F2130F700F70B2E
+:0E2FF000F72F6400C90A0319CA0AD329630027
 :0639C0008A010028080046
 :1000080000000000000000000000000000000000E8
 :080018000000000000000000E0
 ,4 → 747,4
 :04400E00FD2CFF3F47
 :00000001FF
 ;PIC16F887
-;CRC=1EAE  CREATED="14-IV-13 13:44"
+;CRC=755D  CREATED="14-IV-13 15:44"

 /Designs/Measuring_instruments/AWS01A/SW/PIC16F887/main.pjt
 ,14 → 17,14
 =0000 %S 0 0 796 451 3 0
 [Opened Files]
 =main.c
-=
-=C:\Program Files\PICC\devices\16F887.h
-=common\dbloader.h
-=C:\Program Files\PICC\drivers\string.h
-=C:\Program Files\PICC\drivers\stddef.h
-=..\ds1820.c
-=..\1wire.c
-=..\SHT.c
+=C:\Program Files (x86)\PICC\drivers\ctype.h
+=..\ds1820.c
+=..\1wire.c
+=..\SHT.c
+=..\SHT25.h
+=..\SHT25.c
+=..\MPL115A1.c
+=
 =..\SHT25.h
 =..\SHT25.c
 =..\MPL115A1.c
 ,8 → 34,7
 =
 [Target Data]
 OptionString=-p +FM
-FileList=D:\MLAB\Designs\Measuring_instruments\AWS01A\SW\PIC16F887\main.c
+FileList=Z:\home\kaklik\MLAB\Designs\Measuring_instruments\AWS01A\SW\PIC16F887\main.c
 [Units]
 Count=1
 =main (main)

/Designs/Measuring_instruments/AWS01A/SW/SHT25.c
59,9 → 59,9
Check=i2c_read(0);
i2c_stop();

LSB = LSB >> 2; // trow out status bits
LSB = LSB & 0xFC ; // trow out status bits

data = (((unsigned int16) MSB << 8) + (LSB << 4));
data = make16(MSB,LSB);
return(-46.85 + 175.72*((float)data/0xFFFF));
}

83,9 → 83,9
Check=i2c_read(0);
i2c_stop();

LSB = LSB >> 2; // trow out status bits
LSB = LSB & 0xFC ; // trow out status bits

data = (((unsigned int16) MSB << 8) + (LSB << 4) );
data = make16(MSB,LSB);
return( -6.0 + 125.0*((float)data/0xFFFF));
}

Subversion Repositories – MLAB

/Designs/Measuring_instruments/AWS01A/ @ 2914 → /Designs/Measuring_instruments/AWS01A/ @ 2915

Compare Path:	Rev
With Path:	Rev