X-Git-Url: http://git.smho.de/gw/?p=owSlave2.git;a=blobdiff_plain;f=common%2FOWDS18B20_DS2438.S;fp=common%2FOWDS18B20_DS2438.S;h=73fd42ee8340602d24b832dfa5ccaeef02d6eaed;hp=109891db2d00d562d5b765a427f9b6e048e4cb87;hb=2490e261a78b2a98ee2a9b8fc19cb3f20225926b;hpb=45806622c08cded7d77c9c9735c433de5f7fa027

diff --git a/common/OWDS18B20_DS2438.S b/common/OWDS18B20_DS2438.S
index 109891d..73fd42e 100644
--- a/common/OWDS18B20_DS2438.S
+++ b/common/OWDS18B20_DS2438.S
@@ -34,6 +34,7 @@
 #define _CHANGEABLE_ID_
 #define _ZERO_POLLING_
 #define _HANDLE_CC_COMMAND_
+		
 //#define _DB_
 
 #include "../common/OWConfig.s"
@@ -48,12 +49,15 @@
 #else
 .extern pack2,64
 #endif
-.extern  am2302_temp,2
-.extern  am2302_hum,2
+//.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
 
 
 .macro CHIP_INIT 	;r_temp is pushed other Registers should be saved
+	ldi r_temp,0
+	sts cpsp,r_temp
 Init_EEPROM_read:
 	push r_bytep
 	push r_rwbyte
@@ -79,6 +83,7 @@ Init_EEPROM_read:
 		rjmp h_readscratchpad2
 		rjmp h_writescratchpad_adr2
 		rjmp h_writescratchpad2
+		rjmp h_copyscratchpad_adr2
 .endm
 
 #include "../common/OWRomFunctionsDual.s"
@@ -94,6 +99,7 @@ Init_EEPROM_read:
 #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
+#define OW_COPY_SCRATCHPAD_ADR2 OW_FIRST_COMMAND+7
 
 
 ;---------------------------------------------------
@@ -270,6 +276,7 @@ h_readcommand2:
 	cset 0x4E,OW_WRITE_SCRATCHPAD_ADR2
 	cjmp 0x44,hrc_set_convertT2
 	cjmp 0xB4,hrc_set_convertV2
+	cset 0x48,OW_COPY_SCRATCHPAD_ADR2
 	FW_CONFIG_INFO2
 	//cljmp 0x85,hrc_fw_configinfo2
 #ifdef _CHANGEABLE_ID_
@@ -367,7 +374,10 @@ h_writescratchpad_all2:
 	rjmp handle_end_sleep
 
 
-
+h_copyscratchpad_adr2:
+	ori r_rwbyte,0x80 ;hoechstes bit ist 1 zum Testen
+	sts cpsp,r_rwbyte
+	rjmp handle_end_sleep