X-Git-Url: https://git.smho.de/gw/?p=owSlave2.git;a=blobdiff_plain;f=DS18B20_BMP280_DS2438_SHT%2FOWDS18B20_DS2438.S;h=e67690a4d8dcf8495874d7b97724e6344abe6e9f;hp=bf7146e5a7188125a35eac3fd757101e73d32b38;hb=4df4c7ba2c95a48e95873b1f3a93d62ed9727eba;hpb=28c2911a7459ae2977c0cb0228c0ca2af1c345bf diff --git a/DS18B20_BMP280_DS2438_SHT/OWDS18B20_DS2438.S b/DS18B20_BMP280_DS2438_SHT/OWDS18B20_DS2438.S index bf7146e..e67690a 100644 --- a/DS18B20_BMP280_DS2438_SHT/OWDS18B20_DS2438.S +++ b/DS18B20_BMP280_DS2438_SHT/OWDS18B20_DS2438.S @@ -69,6 +69,7 @@ Init_EEPROM_read: .macro COMMAND_TABLE rjmp h_readscratchpad1 rjmp h_writescratchpad1 + rjmp h_convert_run1 rjmp h_readscratchpad_adr2 rjmp h_readscratchpad2 rjmp h_writescratchpad_adr2 @@ -83,10 +84,12 @@ Init_EEPROM_read: ; Ab hier Geraeteabhaenging #define OW_READ_SCRATCHPAD1 OW_FIRST_COMMAND+0 #define OW_WRITE_SCRATCHPAD1 OW_FIRST_COMMAND+1 -#define OW_READ_SCRATCHPAD_ADR2 OW_FIRST_COMMAND+2 -#define OW_READ_SCRATCHPAD2 OW_FIRST_COMMAND+3 -#define OW_WRITE_SCRATCHPAD_ADR2 OW_FIRST_COMMAND+4 -#define OW_WRITE_SCRATCHPAD2 OW_FIRST_COMMAND+5 +#define OW_CONVERT_RUN1 OW_FIRST_COMMAND+2 +#define OW_READ_SCRATCHPAD_ADR2 OW_FIRST_COMMAND+3 +#define OW_READ_SCRATCHPAD2 OW_FIRST_COMMAND+4 +#define OW_WRITE_SCRATCHPAD_ADR2 OW_FIRST_COMMAND+5 +#define OW_WRITE_SCRATCHPAD2 OW_FIRST_COMMAND+6 + ;--------------------------------------------------- @@ -132,7 +135,12 @@ hrc_set_convertT1: ldi r_temp,1 sts gcontrol,r_temp - rjmp handle_end_sleep + ldi r_mode,OW_CONVERT_RUN1 + ldi r_sendflag,3 ;set bit 0 and 1 for no zero polling +h_convert_run1: + ldi r_bcount,0 + ldi r_rwbyte,0 + rjmp handle_end_no_bcount hrc_copy_scratchpad1: