X-Git-Url: https://git.smho.de/gw/?p=owSlave2.git;a=blobdiff_plain;f=common%2FOWDS18B20_DS2438.S;h=a95559e82ffe7429885dff0e861b86a837536344;hp=73fd42ee8340602d24b832dfa5ccaeef02d6eaed;hb=refs%2Fheads%2Fmaster;hpb=6467d8138460abffd9ddabc7b0a9f00c764af19c

diff --git a/common/OWDS18B20_DS2438.S b/common/OWDS18B20_DS2438.S
index 73fd42e..a95559e 100644
--- a/common/OWDS18B20_DS2438.S
+++ b/common/OWDS18B20_DS2438.S
@@ -34,7 +34,8 @@
 #define _CHANGEABLE_ID_
 #define _ZERO_POLLING_
 #define _HANDLE_CC_COMMAND_
-		
+#define _NO_BOOTLOADER_PIN_	
+//#define  __4MHZ__
 //#define _DB_
 
 #include "../common/OWConfig.s"
@@ -42,15 +43,14 @@
 
 .extern pack1,8
 
-//.extern  am2302_temp,2
-
 #if  defined(__AVR_ATtiny25__)
 .extern pack2,16
 #else
 .extern pack2,64
 #endif
-//.extern  am2302_temp,2
-//.extern  am2302_hum,2
+
+
+
 .comm block,1 ; Block der augegeben, geschrieben wird (Parameter von READ/WRITE Scratchpad)
 .comm cpsp,1 ; Copy Scratchpad marker
 
@@ -110,8 +110,9 @@ Init_EEPROM_read:
 h_readcommand12:
 	clr r_bytep
 	cjmp 0x44,hrc_set_convertT12
-	ldi r_mode,OW_SLEEP
-	rjmp handle_end
+	rjmp h_readcccommand  ;fuehre DS2438 commands aus...
+	//ldi r_mode,OW_SLEEP
+	//rjmp handle_end
 #endif
 
 
@@ -120,9 +121,10 @@ h_readcommand1:
 #ifndef _DIS_FLASH_
 	FLASH_COMMANDS ; muss zu erst sein....
 #endif
+	cjmp 0x44,hrc_set_convertT1
+h_readcccommand:
 	cjmp 0xBE,hrc_set_readscratchpad1
 	cjmp 0x4E,hrc_set_writescratchpad1
-	cjmp 0x44,hrc_set_convertT1
 	cjmp 0x48,hrc_copy_scratchpad1
 	cjmp 0xB8,hrc_recall_eeprom1
 	FW_CONFIG_INFO1
@@ -151,9 +153,9 @@ hrc_recall_eeprom1:
 hrc_set_convertT12:
 	ldi r_temp,3
 	sts gcontrol,r_temp
-	lds r_temp,am2302_temp
+	lds r_temp,DS2438_2_TEMP
 	sts pack2+1,r_temp
-	lds r_temp,am2302_temp+1
+	lds r_temp,DS2438_2_TEMP+1
 	sts pack2+2,r_temp
 	rjmp hrc_set_convertT12b
 #endif
@@ -288,26 +290,28 @@ h_readcommand2:
 hrc_set_convertT2:
 	ldi r_temp,2
 	sts gcontrol,r_temp
-	lds r_temp,am2302_temp
+	lds r_temp,DS2438_2_TEMP
 	sts pack2+1,r_temp
-	lds r_temp,am2302_temp+1
+	lds r_temp,DS2438_2_TEMP+1
 	sts pack2+2,r_temp
 	rjmp handle_end_sleep
 hrc_set_convertV2:
+	ldi r_temp,4
+	sts gcontrol,r_temp
 	lds r_temp,pack2
 	sbrs r_temp,3
 	rjmp hrc_set_convertVV2
-	ldi r_temp,0xF4
+	lds r_temp,DS2438_2_VDD
 	sts pack2+3,r_temp
-	ldi r_temp,0x01
+	lds r_temp,DS2438_2_VDD+1
 	sts pack2+4,r_temp
 	rjmp hrc_set_convertend2
 hrc_set_convertVV2:
-	ldi r_temp,3
+	ldi r_temp,8
 	sts gcontrol,r_temp
-	lds r_temp,am2302_hum
+	lds r_temp,DS2438_2_VAD
 	sts pack2+3,r_temp
-	lds r_temp,am2302_hum+1
+	lds r_temp,DS2438_2_VAD+1
 	sts pack2+4,r_temp
 hrc_set_convertend2:
 	rjmp handle_end_sleep