From: Tobias Date: Wed, 25 Jan 2017 13:02:38 +0000 (+0100) Subject: Save minor changes befor change the count of the info bytes to 24 X-Git-Url: https://git.smho.de/?a=commitdiff_plain;h=b57c0ca6b523661b0d4e4a0bfb3626df890dfb99;p=owSlave2.git Save minor changes befor change the count of the info bytes to 24 --- diff --git a/DS18B20_MAX44009_DS2438_SHT/DS18B20_DS2438.c b/DS18B20_MAX44009_DS2438_SHT/DS18B20_DS2438.c index e717ac4..e823003 100644 --- a/DS18B20_MAX44009_DS2438_SHT/DS18B20_DS2438.c +++ b/DS18B20_MAX44009_DS2438_SHT/DS18B20_DS2438.c @@ -186,6 +186,7 @@ int main(void){ config_info2[5]=7; } MCUSR=0; + sei(); USI_TWI_Master_Initialise(); if (checkMAX44009(0)) max_adr=0; else max_adr=1 ; SHT2x_SoftReset(); diff --git a/common/OWDS18B20.S b/common/OWDS18B20.S index e9ef6d3..bf9ed7a 100644 --- a/common/OWDS18B20.S +++ b/common/OWDS18B20.S @@ -1,5 +1,5 @@ -// Copyright (c) 2015, Tobias Mueller tm(at)tm3d.de +// Copyright (c) 2017, Tobias Mueller tm(at)tm3d.de // All rights reserved. // // Redistribution and use in source and binary forms, with or without diff --git a/programmer/programmer/programmer.asmproj b/programmer/programmer/programmer.asmproj index 87b98d2..432687f 100644 --- a/programmer/programmer/programmer.asmproj +++ b/programmer/programmer/programmer.asmproj @@ -45,15 +45,13 @@ 100000 0 - - + debugWIRE com.atmel.avrdbg.tool.atmelice J41800000789 Atmel-ICE - - + debugWIRE J41800000789 0x1E930C