Many changes from 2018

[owSlave2.git] / common / OWDS2438_DS2438.S

diff --git a/common/OWDS2438_DS2438.S b/common/OWDS2438_DS2438.S
index 2d2c891..78b51c1 100644 (file)
--- a/common/OWDS2438_DS2438.S
+++ b/common/OWDS2438_DS2438.S
@@ -31,9 +31,14 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE \r
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \r
 \r
+#ifndef _NOCHANGEABLE_ID_\r
 #define _CHANGEABLE_ID_\r
+#endif\r
 #define _ZERO_POLLING_\r
 #define _HANDLE_CC_COMMAND_\r
+#define _NO_BOOTLOADER_PIN_    \r
+//#define __4MHZ__\r
+\r
 //#define _DB_\r
 \r
 #include "../common/OWConfig.s"\r
@@ -139,9 +144,9 @@ chrc_set_convertV1:
        lds r_temp,pack1\r
        sbrs r_temp,3\r
        rjmp hrc_set_convertVV1\r
-       ldi r_temp,0xF4  //5V\r
+       lds r_temp,DS2438_1_VDD  \r
        sts pack1+3,r_temp\r
-       ldi r_temp,0x01\r
+       lds r_temp,DS2438_1_VDD+1\r
        sts pack1+4,r_temp\r
        rjmp hrc_set_convertend1\r
 hrc_set_convertVV1:\r
@@ -284,9 +289,9 @@ chrc_set_convertV2:
        lds r_temp,pack2\r
        sbrs r_temp,3\r
        rjmp hrc_set_convertVV2\r
-       ldi r_temp,0xF4\r
+       lds r_temp,DS2438_2_VDD  \r
        sts pack2+3,r_temp\r
-       ldi r_temp,0x01\r
+       lds r_temp,DS2438_2_VDD+1\r
        sts pack2+4,r_temp\r
        rjmp hrc_set_convertend2\r
 hrc_set_convertVV2:\r