From e68288e83e5f49063132942c46cd5ba6654a8386 Mon Sep 17 00:00:00 2001
From: Ake Hedman <akhe@grodansparadis.com>
Date: Wed, 23 Mar 2016 18:44:46 +0100
Subject: [PATCH] Fixed XML build error

---
 kelvin_ntc.X/funclist                         | 361 +++++-------------
 .../nbproject/Makefile-Relocated_2580.mk      |  32 +-
 .../nbproject/Makefile-genesis.properties     |   2 +-
 kelvin_ntc.X/nbproject/Makefile-impl.mk       |   4 -
 .../Makefile-local-Relocated_2580.mk          |  17 +-
 kelvin_ntc.X/nbproject/configurations.xml     | 291 +++-----------
 .../nbproject/private/configurations.xml      |   4 -
 main.c                                        |  16 +-
 8 files changed, 182 insertions(+), 545 deletions(-)

diff --git a/kelvin_ntc.X/funclist b/kelvin_ntc.X/funclist
index f950785..639202c 100644
--- a/kelvin_ntc.X/funclist
+++ b/kelvin_ntc.X/funclist
@@ -1,263 +1,108 @@
-<<<<<<< HEAD
-_vscp_getBootLoaderAlgorithm: CODE, 24720 0 2
-PL12: CODE, 14424 0 22
-PL50: CODE, 14566 0 20
-PL8: CODE, 14384 0 14
-___asflsub: CODE, 22466 0 78
-_vscp_getZone: CODE, 24650 0 10
-PL22: CODE, 14476 0 26
-PL60: CODE, 7678 0 16
-_vscp_getControlByte: CODE, 24398 0 28
-_log: CODE, 17838 0 312
-PL32: CODE, 13068 0 24
-PL70: CODE, 13112 0 14
-_init: CODE, 23380 0 60
-_vscp_setManufacturerId: CODE, 24314 0 28
-PL42: CODE, 14546 0 20
-PL80: CODE, 17132 0 12
-exp@coeff: SMALLCONST, 3872 0 40
-___aldiv: CODE, 19916 0 188
-PL14: CODE, 14446 0 16
-PL52: CODE, 18418 0 18
-PL90: CODE, 13126 0 10
-_ECANReceiveMessage: CODE, 15736 0 484
-_vscp_getEvent: CODE, 23806 0 44
-___flmul: CODE, 19520 0 176
-_vscp_handleHeartbeat: CODE, 24728 0 2
-_vscp_readRegister: CODE, 24500 0 22
-PL24: CODE, 19204 0 16
-PL62: CODE, 19696 0 16
-_vscp_setGUID: CODE, 24086 0 36
-_sendTempEvent: CODE, 22032 0 102
-PL34: CODE, 18360 0 18
-PL72: CODE, 14604 0 14
-__RegsToCANID: CODE, 18150 0 196
-_vscp_deviceURL: SMALLCONST, 3840 0 32
-_vscp_writeRegister: CODE, 24194 0 30
-PL44: CODE, 17112 0 20
-PL82: CODE, 20280 0 12
-_getVSCPFrame: CODE, 22264 0 116
-_vscp_setControlByte: CODE, 24158 0 36
-_vscp_getUserID: CODE, 24564 0 20
-PL16: CODE, 19184 0 20
-PL54: CODE, 14586 0 18
-_setEventData: CODE, 20830 0 176
-PL26: CODE, 19220 0 18
-PL64: CODE, 23696 0 16
-_Celsius2Kelvin: CODE, 23610 0 52
-_Busy_eep: CODE, 24698 0 6
-PL36: CODE, 18378 0 20
-PL74: CODE, 16220 0 14
-_vscp_error: CODE, 24704 0 4
-_doWork: CODE, 14654 0 1064
-_getCalibrationValue: CODE, 23196 0 62
-_vscp_init_pstorage: CODE, 24708 0 4
-___fltol: CODE, 21340 0 158
-_vscp_restoreDefaults: CODE, 24690 0 8
-PL46: CODE, 18398 0 20
-PL84: CODE, 14632 0 8
-___flsub: CODE, 23320 0 60
-___flge: CODE, 22544 0 76
-PL18: CODE, 18346 0 14
-PL56: CODE, 15718 0 18
-_vscp_readStdReg: CODE, 16728 0 384
-_vscp_readAppReg: CODE, 7694 0 1964
-_vscp_getFamilyCode: CODE, 24670 0 10
-PL28: CODE, 20452 0 24
-PL66: CODE, 19712 0 14
-_vscp_setUserID: CODE, 24342 0 28
-_getCANFrame: CODE, 24012 0 38
-_main: CODE, 18436 0 280
-_ldexp: CODE, 21006 0 174
-___fldiv: CODE, 20654 0 176
-PL38: CODE, 14526 0 20
-PL76: CODE, 14618 0 14
-_handle_sync: CODE, 21776 0 130
-_Read_b_eep: CODE, 24452 0 24
-___lwtofl: CODE, 23850 0 42
-PL48: CODE, 13092 0 20
-PL86: CODE, 14640 0 6
-___flneg: CODE, 24050 0 36
-_vscp_goActiveState: CODE, 24254 0 30
-_vscp_doOneSecondWork: CODE, 22380 0 86
-_vscp_getRegisterPagesUsed: CODE, 24716 0 2
-PL58: CODE, 17820 0 18
-_doOneSecondWork: CODE, 13136 0 1176
-PL68: CODE, 22134 0 14
-_sendVSCPFrame: CODE, 20476 0 178
-_vscp_sendEvent: CODE, 23760 0 46
-_vscp_getMDF_URL: CODE, 24370 0 28
-_eval_poly: CODE, 20292 0 160
-PL78: CODE, 19258 0 10
-_init_app_eeprom: CODE, 9658 0 1904
-_floor: CODE, 19268 0 252
-PL88: CODE, 14646 0 8
-_sendCANFrame: CODE, 23062 0 72
-_Write_b_eep: CODE, 23440 0 58
-_ConvertADC: CODE, 24712 0 4
-_vscp_check_pstorage: CODE, 23556 0 54
-_vscp_writeStdReg: CODE, 18716 0 276
-_WriteTimer0: CODE, 24604 0 18
-_vscp_writeAppReg: CODE, 3950 0 3728
-_vscp_handleProtocolEvent: CODE, 11562 0 1506
-__initialization: CODE, 23134 0 56
-__ECANPointBuffer: CODE, 21906 0 126
-_vscp_getFamilyType: CODE, 24660 0 10
-_vscp_getBufferSize: CODE, 24718 0 2
-_vscp_getSubzone: CODE, 24640 0 10
-_vscp_getMatrixInfo: CODE, 24426 0 26
-_vscp_handleDropNickname: CODE, 23712 0 48
-_vscp_handleSetNickname: CODE, 24224 0 30
-_frexp: CODE, 21642 0 134
-_vscp_handleProbeState: CODE, 19726 0 190
-_vscp_goBootloaderMode: CODE, 24122 0 36
-___flpack: CODE, 20104 0 176
-_exp: CODE, 16234 0 494
-_writeCoeffs2Ram: CODE, 21180 0 160
-___asfladd: CODE, 22770 0 74
-_vscp_readNicknamePermanent: CODE, 24680 0 10
-_vscp_sendHeartBeat: CODE, 23974 0 38
-_Celsius2Fahrenheit: CODE, 22148 0 116
-_ECANInitialize: CODE, 21498 0 144
-___fladd: CODE, 17496 0 324
-___asfldiv: CODE, 22696 0 74
-_OpenTimer0: CODE, 24284 0 30
-_interrupt_at_low_vector: CODE, 24 0 670
-i1_WriteTimer0: CODE, 24622 0 18
-_OpenADC: CODE, 22844 0 74
-log@coeff: SMALLCONST, 3912 0 36
-_vscp_getMajorVersion: CODE, 24726 0 2
-_vscp_getMinorVersion: CODE, 24724 0 2
-_vscp_writeNicknamePermanent: CODE, 24522 0 22
-_vscp_newNodeOnline: CODE, 23892 0 42
-__CANIDToRegs: CODE, 18992 0 192
-_vscp_init: CODE, 22990 0 72
-___awtofl: CODE, 23498 0 58
-PL2: CODE, 14312 0 14
-_init_app_ram: CODE, 23258 0 62
-___asflmul: CODE, 22620 0 76
-___wmul: CODE, 23662 0 34
-___altofl: CODE, 22918 0 72
-PL10: CODE, 14398 0 26
-PL4: CODE, 14326 0 30
-_vscp_getManufacturerId: CODE, 24544 0 20
-___lbmod: CODE, 23934 0 40
-PL20: CODE, 14462 0 14
-_vscp_getSubMinorVersion: CODE, 24722 0 2
-_ECANSetOperationMode: CODE, 24476 0 24
-PL30: CODE, 14502 0 24
-PL6: CODE, 14356 0 28
-PL40: CODE, 19238 0 20
-_ECANSendMessage: CODE, 17144 0 352
-_vscp_getGUID: CODE, 24584 0 20
-Total: 21552
-=======
-_vscp_getBootLoaderAlgorithm: CODE, 24774 0 2
-___asflsub: CODE, 22884 0 74
-_vscp_getZone: CODE, 24700 0 10
-_vscp_getControlByte: CODE, 24306 0 32
-_log: CODE, 18298 0 302
-_init: CODE, 23430 0 60
-_vscp_setManufacturerId: CODE, 24398 0 28
+_vscp_getBootLoaderAlgorithm: CODE, 24464 0 2
+___asflsub: CODE, 22318 0 78
+_vscp_getZone: CODE, 24390 0 10
+_vscp_getControlByte: CODE, 23966 0 32
+_log: CODE, 18100 0 290
+_init: CODE, 23162 0 60
+_vscp_setManufacturerId: CODE, 24088 0 28
 exp@coeff: SMALLCONST, 2848 0 40
-___aldiv: CODE, 20198 0 188
-_ECANReceiveMessage: CODE, 15444 0 534
-_vscp_getEvent: CODE, 23172 0 68
-___flmul: CODE, 19410 0 214
-_vscp_handleHeartbeat: CODE, 24782 0 2
-_vscp_readRegister: CODE, 24454 0 26
-_vscp_setGUID: CODE, 24090 0 38
-_sendTempEvent: CODE, 21826 0 132
-__RegsToCANID: CODE, 17254 0 356
+___aldiv: CODE, 19794 0 188
+_ECANReceiveMessage: CODE, 15248 0 526
+_vscp_getEvent: CODE, 23666 0 42
+___flmul: CODE, 19194 0 216
+_vscp_handleHeartbeat: CODE, 24472 0 2
+_vscp_readRegister: CODE, 24144 0 26
+_vscp_setGUID: CODE, 23786 0 38
+_sendTempEvent: CODE, 21458 0 128
+__RegsToCANID: CODE, 17408 0 356
 _vscp_deviceURL: SMALLCONST, 2816 0 32
-_vscp_writeRegister: CODE, 24238 0 34
-_getVSCPFrame: CODE, 21958 0 132
-i1_ConvertADC: CODE, 24766 0 4
-_vscp_setControlByte: CODE, 24128 0 38
-_vscp_getUserID: CODE, 24596 0 20
-_setEventData: CODE, 20744 0 176
-_Celsius2Kelvin: CODE, 23718 0 52
-_Busy_eep: CODE, 24748 0 6
-_vscp_error: CODE, 24754 0 4
-_doWork: CODE, 14332 0 1112
-_getCalibrationValue: CODE, 23306 0 62
-_vscp_init_pstorage: CODE, 24758 0 4
-___fltol: CODE, 21084 0 162
-_vscp_restoreDefaults: CODE, 24740 0 8
-___flsub: CODE, 23490 0 58
-___flge: CODE, 22658 0 76
-_vscp_readStdReg: CODE, 16464 0 432
-_vscp_readAppReg: CODE, 8716 0 1964
-_vscp_getFamilyCode: CODE, 24720 0 10
-_vscp_setUserID: CODE, 24426 0 28
-_getCANFrame: CODE, 23770 0 52
-_main: CODE, 18600 0 282
-_ldexp: CODE, 20920 0 164
-___fldiv: CODE, 20568 0 176
-_handle_sync: CODE, 21556 0 136
-_Read_b_eep: CODE, 24636 0 18
-___lwtofl: CODE, 23970 0 42
-___flneg: CODE, 24166 0 36
-_vscp_goActiveState: CODE, 24338 0 30
-_vscp_doOneSecondWork: CODE, 22504 0 78
-_vscp_getRegisterPagesUsed: CODE, 24770 0 2
-_doOneSecondWork: CODE, 6682 0 2034
-_sendVSCPFrame: CODE, 20386 0 182
-_vscp_sendEvent: CODE, 23922 0 48
-_vscp_getMDF_URL: CODE, 24506 0 24
-_eval_poly: CODE, 19624 0 192
-_init_app_eeprom: CODE, 10680 0 1904
-_floor: CODE, 19158 0 252
-_sendCANFrame: CODE, 23030 0 72
-_Write_b_eep: CODE, 23822 0 52
-_ConvertADC: CODE, 24762 0 4
-_vscp_check_pstorage: CODE, 23368 0 62
-_vscp_writeStdReg: CODE, 18882 0 276
-_WriteTimer0: CODE, 24654 0 18
+_vscp_writeRegister: CODE, 23898 0 34
+_getVSCPFrame: CODE, 21712 0 120
+i1_ConvertADC: CODE, 24456 0 4
+_vscp_setControlByte: CODE, 23824 0 38
+_vscp_getUserID: CODE, 24286 0 20
+_setEventData: CODE, 20350 0 178
+_Celsius2Kelvin: CODE, 23338 0 54
+_Busy_eep: CODE, 24438 0 6
+_vscp_error: CODE, 24444 0 4
+_doWork: CODE, 14144 0 1104
+_getCalibrationValue: CODE, 22978 0 62
+_vscp_init_pstorage: CODE, 24448 0 4
+___fltol: CODE, 21020 0 158
+_vscp_restoreDefaults: CODE, 24430 0 8
+___flsub: CODE, 23102 0 60
+___flge: CODE, 22474 0 76
+_vscp_readStdReg: CODE, 16260 0 432
+_vscp_readAppReg: CODE, 8668 0 1952
+_vscp_getFamilyCode: CODE, 24410 0 10
+_vscp_setUserID: CODE, 24116 0 28
+_getCANFrame: CODE, 23538 0 44
+_main: CODE, 18390 0 278
+_ldexp: CODE, 20696 0 164
+___fldiv: CODE, 20528 0 168
+_handle_sync: CODE, 21328 0 130
+_Read_b_eep: CODE, 24326 0 18
+___lwtofl: CODE, 23582 0 42
+___flneg: CODE, 23862 0 36
+_vscp_goActiveState: CODE, 24028 0 30
+_vscp_doOneSecondWork: CODE, 22396 0 78
+_vscp_getRegisterPagesUsed: CODE, 24460 0 2
+_doOneSecondWork: CODE, 6682 0 1986
+_sendVSCPFrame: CODE, 20168 0 182
+_vscp_sendEvent: CODE, 23492 0 46
+_vscp_getMDF_URL: CODE, 24196 0 24
+_eval_poly: CODE, 19410 0 192
+_init_app_eeprom: CODE, 10620 0 1904
+_floor: CODE, 18944 0 250
+_sendCANFrame: CODE, 22774 0 72
+_Write_b_eep: CODE, 23392 0 52
+_ConvertADC: CODE, 24452 0 4
+_vscp_check_pstorage: CODE, 23040 0 62
+_vscp_writeStdReg: CODE, 18668 0 276
+_WriteTimer0: CODE, 24344 0 18
 _vscp_writeAppReg: CODE, 2926 0 3756
-_vscp_handleProtocolEvent: CODE, 12584 0 1748
-__initialization: CODE, 23240 0 56
-__ECANPointBuffer: CODE, 22208 0 118
-_vscp_getFamilyType: CODE, 24710 0 10
-_vscp_getBufferSize: CODE, 24772 0 2
-_vscp_getSubzone: CODE, 24690 0 10
-_vscp_getMatrixInfo: CODE, 24480 0 26
-_vscp_handleDropNickname: CODE, 23664 0 54
-_vscp_handleSetNickname: CODE, 24202 0 36
-_frexp: CODE, 21692 0 134
-_vscp_handleProbeState: CODE, 20008 0 190
-_vscp_goBootloaderMode: CODE, 24272 0 34
-___flpack: CODE, 19816 0 192
-_exp: CODE, 15978 0 486
-_writeCoeffs2Ram: CODE, 21246 0 160
-___asfladd: CODE, 22810 0 74
-_vscp_readNicknamePermanent: CODE, 24730 0 10
-_vscp_sendHeartBeat: CODE, 24052 0 38
-_Celsius2Fahrenheit: CODE, 22090 0 118
-_ECANInitialize: CODE, 21406 0 150
-___fladd: CODE, 17610 0 352
-___asfldiv: CODE, 22582 0 76
-_OpenTimer0: CODE, 24368 0 30
+_vscp_handleProtocolEvent: CODE, 12524 0 1620
+__initialization: CODE, 22846 0 56
+__ECANPointBuffer: CODE, 21832 0 118
+_vscp_getFamilyType: CODE, 24400 0 10
+_vscp_getBufferSize: CODE, 24462 0 2
+_vscp_getSubzone: CODE, 24380 0 10
+_vscp_getMatrixInfo: CODE, 24170 0 26
+_vscp_handleDropNickname: CODE, 23444 0 48
+_vscp_handleSetNickname: CODE, 23998 0 30
+_frexp: CODE, 21586 0 126
+_vscp_handleProbeState: CODE, 19982 0 186
+_vscp_goBootloaderMode: CODE, 23932 0 34
+___flpack: CODE, 19602 0 192
+_exp: CODE, 15774 0 486
+_writeCoeffs2Ram: CODE, 20860 0 160
+___asfladd: CODE, 22240 0 78
+_vscp_readNicknamePermanent: CODE, 24420 0 10
+_vscp_sendHeartBeat: CODE, 23748 0 38
+_Celsius2Fahrenheit: CODE, 21950 0 116
+_ECANInitialize: CODE, 21178 0 150
+___fladd: CODE, 16692 0 358
+___asfldiv: CODE, 22626 0 74
+_OpenTimer0: CODE, 24058 0 30
 _interrupt_at_low_vector: CODE, 2072 0 676
-i1_WriteTimer0: CODE, 24672 0 18
-_OpenADC: CODE, 22326 0 92
+i1_WriteTimer0: CODE, 24362 0 18
+_OpenADC: CODE, 22066 0 92
 log@coeff: SMALLCONST, 2888 0 36
-_vscp_getMajorVersion: CODE, 24780 0 2
-_vscp_getMinorVersion: CODE, 24778 0 2
-_vscp_writeNicknamePermanent: CODE, 24554 0 22
-_vscp_newNodeOnline: CODE, 23874 0 48
-__CANIDToRegs: CODE, 17962 0 336
-_vscp_init: CODE, 22418 0 86
-___awtofl: CODE, 23606 0 58
-_init_app_ram: CODE, 23102 0 70
-___asflmul: CODE, 22734 0 76
-___wmul: CODE, 23548 0 58
-___altofl: CODE, 22958 0 72
-_vscp_getManufacturerId: CODE, 24576 0 20
-___lbmod: CODE, 24012 0 40
-_vscp_getSubMinorVersion: CODE, 24776 0 2
-_ECANSetOperationMode: CODE, 24530 0 24
-_ECANSendMessage: CODE, 16896 0 358
-_vscp_getGUID: CODE, 24616 0 20
-Total: 22632
->>>>>>> 13e88f7760576942ba7516e8d1d36ec5925eb9f6
+_vscp_getMajorVersion: CODE, 24470 0 2
+_vscp_getMinorVersion: CODE, 24468 0 2
+_vscp_writeNicknamePermanent: CODE, 24244 0 22
+_vscp_newNodeOnline: CODE, 23624 0 42
+__CANIDToRegs: CODE, 17764 0 336
+_vscp_init: CODE, 22158 0 82
+___awtofl: CODE, 23280 0 58
+_init_app_ram: CODE, 22912 0 66
+___asflmul: CODE, 22550 0 76
+___wmul: CODE, 23222 0 58
+___altofl: CODE, 22700 0 74
+_vscp_getManufacturerId: CODE, 24266 0 20
+___lbmod: CODE, 23708 0 40
+_vscp_getSubMinorVersion: CODE, 24466 0 2
+_ECANSetOperationMode: CODE, 24220 0 24
+_ECANSendMessage: CODE, 17050 0 358
+_vscp_getGUID: CODE, 24306 0 20
+Total: 22322
\ No newline at end of file
diff --git a/kelvin_ntc.X/nbproject/Makefile-Relocated_2580.mk b/kelvin_ntc.X/nbproject/Makefile-Relocated_2580.mk
index aeb21af..8f723db 100644
--- a/kelvin_ntc.X/nbproject/Makefile-Relocated_2580.mk
+++ b/kelvin_ntc.X/nbproject/Makefile-Relocated_2580.mk
@@ -19,7 +19,7 @@ endif
 endif
 
 # Environment
-MKDIR=mkdir -p
+MKDIR=gnumkdir -p
 RM=rm -f 
 MV=mv 
 CP=cp 
@@ -45,17 +45,17 @@ OBJECTDIR=build/${CND_CONF}/${IMAGE_TYPE}
 DISTDIR=dist/${CND_CONF}/${IMAGE_TYPE}
 
 # Source Files Quoted if spaced
-SOURCEFILES_QUOTED_IF_SPACED=../main.c ../ntc.c ../ECAN.c ../../vscp_firmware/pic/common/eeprom.c ../../vscp_firmware/common/vscp_firmware.c
+SOURCEFILES_QUOTED_IF_SPACED=../main.c ../ntc.c ../ECAN.c ../../vscp_firmware/common/vscp_firmware.c
 
 # Object Files Quoted if spaced
-OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/_ext/1472/main.p1 ${OBJECTDIR}/_ext/1472/ntc.p1 ${OBJECTDIR}/_ext/1472/ECAN.p1 ${OBJECTDIR}/_ext/1554471087/eeprom.p1 ${OBJECTDIR}/_ext/1935753226/vscp_firmware.p1
-POSSIBLE_DEPFILES=${OBJECTDIR}/_ext/1472/main.p1.d ${OBJECTDIR}/_ext/1472/ntc.p1.d ${OBJECTDIR}/_ext/1472/ECAN.p1.d ${OBJECTDIR}/_ext/1554471087/eeprom.p1.d ${OBJECTDIR}/_ext/1935753226/vscp_firmware.p1.d
+OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/_ext/1472/main.p1 ${OBJECTDIR}/_ext/1472/ntc.p1 ${OBJECTDIR}/_ext/1472/ECAN.p1 ${OBJECTDIR}/_ext/1935753226/vscp_firmware.p1
+POSSIBLE_DEPFILES=${OBJECTDIR}/_ext/1472/main.p1.d ${OBJECTDIR}/_ext/1472/ntc.p1.d ${OBJECTDIR}/_ext/1472/ECAN.p1.d ${OBJECTDIR}/_ext/1935753226/vscp_firmware.p1.d
 
 # Object Files
-OBJECTFILES=${OBJECTDIR}/_ext/1472/main.p1 ${OBJECTDIR}/_ext/1472/ntc.p1 ${OBJECTDIR}/_ext/1472/ECAN.p1 ${OBJECTDIR}/_ext/1554471087/eeprom.p1 ${OBJECTDIR}/_ext/1935753226/vscp_firmware.p1
+OBJECTFILES=${OBJECTDIR}/_ext/1472/main.p1 ${OBJECTDIR}/_ext/1472/ntc.p1 ${OBJECTDIR}/_ext/1472/ECAN.p1 ${OBJECTDIR}/_ext/1935753226/vscp_firmware.p1
 
 # Source Files
-SOURCEFILES=../main.c ../ntc.c ../ECAN.c ../../vscp_firmware/pic/common/eeprom.c ../../vscp_firmware/common/vscp_firmware.c
+SOURCEFILES=../main.c ../ntc.c ../ECAN.c ../../vscp_firmware/common/vscp_firmware.c
 
 
 CFLAGS=
@@ -105,14 +105,6 @@ ${OBJECTDIR}/_ext/1472/ECAN.p1: ../ECAN.c  nbproject/Makefile-${CND_CONF}.mk
 	@-${MV} ${OBJECTDIR}/_ext/1472/ECAN.d ${OBJECTDIR}/_ext/1472/ECAN.p1.d 
 	@${FIXDEPS} ${OBJECTDIR}/_ext/1472/ECAN.p1.d $(SILENT) -rsi ${MP_CC_DIR}../  
 	
-${OBJECTDIR}/_ext/1554471087/eeprom.p1: ../../vscp_firmware/pic/common/eeprom.c  nbproject/Makefile-${CND_CONF}.mk
-	@${MKDIR} "${OBJECTDIR}/_ext/1554471087" 
-	@${RM} ${OBJECTDIR}/_ext/1554471087/eeprom.p1.d 
-	@${RM} ${OBJECTDIR}/_ext/1554471087/eeprom.p1 
-	${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G  -D__DEBUG=1 --debugger=realice  --double=32 --float=24 --emi=wordwrite --opt=default,+asm,-asmfile,+speed,-space,-debug --addrqual=ignore --mode=pro -DRELEASE -P -N255 -I"../" -I"../../vscp_firmware/pic/common" -I"../../vscp_firmware/common" -I"../../vscp_software/src/vscp/common" --warn=0 --asmlist --summary=default,-psect,-class,+mem,-hex,-file --codeoffset=0x800 --output=default,-inhx032 --runtime=default,+clear,+init,-keep,-no_startup,-download,+config,+clib,+plib --output=-mcof,+elf "--errformat=%f:%l: error: (%n) %s" "--warnformat=%f:%l: warning: (%n) %s" "--msgformat=%f:%l: advisory: (%n) %s"    -o${OBJECTDIR}/_ext/1554471087/eeprom.p1  ../../vscp_firmware/pic/common/eeprom.c 
-	@-${MV} ${OBJECTDIR}/_ext/1554471087/eeprom.d ${OBJECTDIR}/_ext/1554471087/eeprom.p1.d 
-	@${FIXDEPS} ${OBJECTDIR}/_ext/1554471087/eeprom.p1.d $(SILENT) -rsi ${MP_CC_DIR}../  
-	
 ${OBJECTDIR}/_ext/1935753226/vscp_firmware.p1: ../../vscp_firmware/common/vscp_firmware.c  nbproject/Makefile-${CND_CONF}.mk
 	@${MKDIR} "${OBJECTDIR}/_ext/1935753226" 
 	@${RM} ${OBJECTDIR}/_ext/1935753226/vscp_firmware.p1.d 
@@ -146,14 +138,6 @@ ${OBJECTDIR}/_ext/1472/ECAN.p1: ../ECAN.c  nbproject/Makefile-${CND_CONF}.mk
 	@-${MV} ${OBJECTDIR}/_ext/1472/ECAN.d ${OBJECTDIR}/_ext/1472/ECAN.p1.d 
 	@${FIXDEPS} ${OBJECTDIR}/_ext/1472/ECAN.p1.d $(SILENT) -rsi ${MP_CC_DIR}../  
 	
-${OBJECTDIR}/_ext/1554471087/eeprom.p1: ../../vscp_firmware/pic/common/eeprom.c  nbproject/Makefile-${CND_CONF}.mk
-	@${MKDIR} "${OBJECTDIR}/_ext/1554471087" 
-	@${RM} ${OBJECTDIR}/_ext/1554471087/eeprom.p1.d 
-	@${RM} ${OBJECTDIR}/_ext/1554471087/eeprom.p1 
-	${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G  --double=32 --float=24 --emi=wordwrite --opt=default,+asm,-asmfile,+speed,-space,-debug --addrqual=ignore --mode=pro -DRELEASE -P -N255 -I"../" -I"../../vscp_firmware/pic/common" -I"../../vscp_firmware/common" -I"../../vscp_software/src/vscp/common" --warn=0 --asmlist --summary=default,-psect,-class,+mem,-hex,-file --codeoffset=0x800 --output=default,-inhx032 --runtime=default,+clear,+init,-keep,-no_startup,-download,+config,+clib,+plib --output=-mcof,+elf "--errformat=%f:%l: error: (%n) %s" "--warnformat=%f:%l: warning: (%n) %s" "--msgformat=%f:%l: advisory: (%n) %s"    -o${OBJECTDIR}/_ext/1554471087/eeprom.p1  ../../vscp_firmware/pic/common/eeprom.c 
-	@-${MV} ${OBJECTDIR}/_ext/1554471087/eeprom.d ${OBJECTDIR}/_ext/1554471087/eeprom.p1.d 
-	@${FIXDEPS} ${OBJECTDIR}/_ext/1554471087/eeprom.p1.d $(SILENT) -rsi ${MP_CC_DIR}../  
-	
 ${OBJECTDIR}/_ext/1935753226/vscp_firmware.p1: ../../vscp_firmware/common/vscp_firmware.c  nbproject/Makefile-${CND_CONF}.mk
 	@${MKDIR} "${OBJECTDIR}/_ext/1935753226" 
 	@${RM} ${OBJECTDIR}/_ext/1935753226/vscp_firmware.p1.d 
@@ -184,7 +168,7 @@ dist/${CND_CONF}/${IMAGE_TYPE}/kelvin_ntc.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OB
 	${MP_CC} $(MP_EXTRA_LD_PRE) --chip=$(MP_PROCESSOR_OPTION) -G -mdist/${CND_CONF}/${IMAGE_TYPE}/kelvin_ntc.X.${IMAGE_TYPE}.map  --double=32 --float=24 --emi=wordwrite --opt=default,+asm,-asmfile,+speed,-space,-debug --addrqual=ignore --mode=pro -DRELEASE -P -N255 -I"../" -I"../../vscp_firmware/pic/common" -I"../../vscp_firmware/common" -I"../../vscp_software/src/vscp/common" --warn=0 --asmlist --summary=default,-psect,-class,+mem,-hex,-file --codeoffset=0x800 --output=default,-inhx032 --runtime=default,+clear,+init,-keep,-no_startup,-download,+config,+clib,+plib --output=-mcof,+elf "--errformat=%f:%l: error: (%n) %s" "--warnformat=%f:%l: warning: (%n) %s" "--msgformat=%f:%l: advisory: (%n) %s"     -odist/${CND_CONF}/${IMAGE_TYPE}/kelvin_ntc.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX}  ${OBJECTFILES_QUOTED_IF_SPACED}     
 	
 	@echo Normalizing hex file
-	@"/opt/microchip/mplabx/v3.20/mplab_ide/mplab_ide/modules/../../bin/hexmate" --edf="/opt/microchip/mplabx/v3.20/mplab_ide/mplab_ide/modules/../../dat/en_msgs.txt" dist/${CND_CONF}/${IMAGE_TYPE}/kelvin_ntc.X.${IMAGE_TYPE}.hex -odist/${CND_CONF}/${IMAGE_TYPE}/kelvin_ntc.X.${IMAGE_TYPE}.hex
+	@"C:/Program Files (x86)/Microchip/MPLABX/v3.26/mplab_ide/mplab_ide/modules/../../bin/hexmate" --edf="C:/Program Files (x86)/Microchip/MPLABX/v3.26/mplab_ide/mplab_ide/modules/../../dat/en_msgs.txt" dist/${CND_CONF}/${IMAGE_TYPE}/kelvin_ntc.X.${IMAGE_TYPE}.hex -odist/${CND_CONF}/${IMAGE_TYPE}/kelvin_ntc.X.${IMAGE_TYPE}.hex
 
 endif
 
@@ -204,7 +188,7 @@ endif
 # Enable dependency checking
 .dep.inc: .depcheck-impl
 
-DEPFILES=$(shell "${PATH_TO_IDE_BIN}"mplabwildcard ${POSSIBLE_DEPFILES})
+DEPFILES=$(shell mplabwildcard ${POSSIBLE_DEPFILES})
 ifneq (${DEPFILES},)
 include ${DEPFILES}
 endif
diff --git a/kelvin_ntc.X/nbproject/Makefile-genesis.properties b/kelvin_ntc.X/nbproject/Makefile-genesis.properties
index d2c9a2b..6888782 100644
--- a/kelvin_ntc.X/nbproject/Makefile-genesis.properties
+++ b/kelvin_ntc.X/nbproject/Makefile-genesis.properties
@@ -1,5 +1,5 @@
 #
-#Wed Mar 23 18:17:35 CET 2016
+#Wed Mar 23 18:43:21 CET 2016
 Debug_26K80.com-microchip-mplab-nbide-toolchainXC8-XC8LanguageToolchain.md5=12edf07df11dc3b48011abb2bbd51a8e
 Relocated_2580.languagetoolchain.version=1.21
 Debug_2580.languagetoolchain.dir=C\:\\Program Files (x86)\\Microchip\\xc8\\v1.21\\bin
diff --git a/kelvin_ntc.X/nbproject/Makefile-impl.mk b/kelvin_ntc.X/nbproject/Makefile-impl.mk
index 9dfe872..3b41ad5 100644
--- a/kelvin_ntc.X/nbproject/Makefile-impl.mk
+++ b/kelvin_ntc.X/nbproject/Makefile-impl.mk
@@ -27,11 +27,7 @@ CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}
 PROJECTNAME=kelvin_ntc.X
 
 # Active Configuration
-<<<<<<< HEAD
-DEFAULTCONF=Debug_26K80
-=======
 DEFAULTCONF=Relocated_2580
->>>>>>> 13e88f7760576942ba7516e8d1d36ec5925eb9f6
 CONF=${DEFAULTCONF}
 
 # All Configurations
diff --git a/kelvin_ntc.X/nbproject/Makefile-local-Relocated_2580.mk b/kelvin_ntc.X/nbproject/Makefile-local-Relocated_2580.mk
index e57b718..ff7af46 100644
--- a/kelvin_ntc.X/nbproject/Makefile-local-Relocated_2580.mk
+++ b/kelvin_ntc.X/nbproject/Makefile-local-Relocated_2580.mk
@@ -14,23 +14,24 @@
 # You can invoke make with the values of the macros:
 # $ makeMP_CC="/opt/microchip/mplabc30/v3.30c/bin/pic30-gcc" ...  
 #
-PATH_TO_IDE_BIN=/opt/microchip/mplabx/v3.20/mplab_ide/mplab_ide/modules/../../bin/
+SHELL=cmd.exe
+PATH_TO_IDE_BIN=C:/Program Files (x86)/Microchip/MPLABX/v3.26/mplab_ide/mplab_ide/modules/../../bin/
 # Adding MPLAB X bin directory to path.
-PATH:=/opt/microchip/mplabx/v3.20/mplab_ide/mplab_ide/modules/../../bin/:$(PATH)
+PATH:=C:/Program Files (x86)/Microchip/MPLABX/v3.26/mplab_ide/mplab_ide/modules/../../bin/:$(PATH)
 # Path to java used to run MPLAB X when this makefile was created
-MP_JAVA_PATH="/opt/microchip/mplabx/v3.20/sys/java/jre1.8.0_65/bin/"
+MP_JAVA_PATH="C:\Program Files (x86)\Microchip\MPLABX\v3.26\sys\java\jre1.8.0_65/bin/"
 OS_CURRENT="$(shell uname -s)"
-MP_CC="/opt/microchip/xc8/v1.21/bin/xc8"
+MP_CC="C:\Program Files (x86)\Microchip\xc8\v1.21\bin\xc8.exe"
 # MP_CPPC is not defined
 # MP_BC is not defined
-MP_AS="/opt/microchip/xc8/v1.21/bin/xc8"
+MP_AS="C:\Program Files (x86)\Microchip\xc8\v1.21\bin\xc8.exe"
 # MP_LD is not defined
 # MP_AR is not defined
-DEP_GEN=${MP_JAVA_PATH}java -jar "/opt/microchip/mplabx/v3.20/mplab_ide/mplab_ide/modules/../../bin/extractobjectdependencies.jar"
-MP_CC_DIR="/opt/microchip/xc8/v1.21/bin"
+DEP_GEN=${MP_JAVA_PATH}java -jar "C:/Program Files (x86)/Microchip/MPLABX/v3.26/mplab_ide/mplab_ide/modules/../../bin/extractobjectdependencies.jar"
+MP_CC_DIR="C:\Program Files (x86)\Microchip\xc8\v1.21\bin"
 # MP_CPPC_DIR is not defined
 # MP_BC_DIR is not defined
-MP_AS_DIR="/opt/microchip/xc8/v1.21/bin"
+MP_AS_DIR="C:\Program Files (x86)\Microchip\xc8\v1.21\bin"
 # MP_LD_DIR is not defined
 # MP_AR_DIR is not defined
 # MP_BC_DIR is not defined
diff --git a/kelvin_ntc.X/nbproject/configurations.xml b/kelvin_ntc.X/nbproject/configurations.xml
index aac23f8..713525c 100644
--- a/kelvin_ntc.X/nbproject/configurations.xml
+++ b/kelvin_ntc.X/nbproject/configurations.xml
@@ -60,7 +60,7 @@
         <targetDevice>PIC18F2580</targetDevice>
         <targetHeader></targetHeader>
         <targetPluginBoard></targetPluginBoard>
-        <platformTool>Simulator</platformTool>
+        <platformTool>RealICEPlatformTool</platformTool>
         <languageToolchain>XC8</languageToolchain>
         <languageToolchainVersion>1.21</languageToolchainVersion>
         <platform>3</platform>
@@ -152,243 +152,66 @@
         <property key="opt-xc8-linker-serial" value=""/>
         <property key="program-the-device-with-default-config-words" value="true"/>
       </HI-TECH-LINK>
-      <Simulator>
-        <property key="codecoverage.enabled" value="Disable"/>
-        <property key="codecoverage.enableoutputtofile" value="false"/>
-        <property key="codecoverage.outputfile" value=""/>
-        <property key="oscillator.auxfrequency" value="120"/>
-        <property key="oscillator.auxfrequencyunit" value="Mega"/>
-        <property key="oscillator.frequency" value="1"/>
-        <property key="oscillator.frequencyunit" value="Mega"/>
-        <property key="oscillator.rcfrequency" value="250"/>
-        <property key="oscillator.rcfrequencyunit" value="Kilo"/>
-        <property key="performancedata.show" value="false"/>
-        <property key="periphADC1.altscl" value="false"/>
-        <property key="periphADC1.minTacq" value=""/>
-        <property key="periphADC1.tacqunits" value="microseconds"/>
-        <property key="periphADC2.altscl" value="false"/>
-        <property key="periphADC2.minTacq" value=""/>
-        <property key="periphADC2.tacqunits" value="microseconds"/>
-        <property key="periphComp1.gte" value="gt"/>
-        <property key="periphComp2.gte" value="gt"/>
-        <property key="periphComp3.gte" value="gt"/>
-        <property key="periphComp4.gte" value="gt"/>
-        <property key="periphComp5.gte" value="gt"/>
-        <property key="periphComp6.gte" value="gt"/>
-        <property key="reset.scl" value="false"/>
-        <property key="reset.type" value="MCLR"/>
+      <RealICEPlatformTool>
+        <property key="AutoSelectMemRanges" value="auto"/>
+        <property key="Freeze Peripherals" value="true"/>
+        <property key="RIExTrigs.Five" value="OFF"/>
+        <property key="RIExTrigs.Four" value="OFF"/>
+        <property key="RIExTrigs.One" value="OFF"/>
+        <property key="RIExTrigs.Seven" value="OFF"/>
+        <property key="RIExTrigs.Six" value="OFF"/>
+        <property key="RIExTrigs.Three" value="OFF"/>
+        <property key="RIExTrigs.Two" value="OFF"/>
+        <property key="RIExTrigs.Zero" value="OFF"/>
+        <property key="SecureSegment.SegmentProgramming" value="FullChipProgramming"/>
+        <property key="ToolFirmwareFilePath"
+                  value="Press to browse for a specific firmware version"/>
+        <property key="ToolFirmwareOption.UseLatestFirmware" value="true"/>
+        <property key="debugoptions.useswbreakpoints" value="false"/>
+        <property key="hwtoolclock.frcindebug" value="false"/>
+        <property key="hwtoolclock.instructionspeed" value="4"/>
+        <property key="hwtoolclock.units" value="mips"/>
+        <property key="memories.aux" value="false"/>
+        <property key="memories.bootflash" value="true"/>
+        <property key="memories.configurationmemory" value="true"/>
+        <property key="memories.configurationmemory2" value="true"/>
+        <property key="memories.dataflash" value="true"/>
+        <property key="memories.eeprom" value="true"/>
+        <property key="memories.flashdata" value="true"/>
+        <property key="memories.id" value="true"/>
+        <property key="memories.programmemory" value="true"/>
+        <property key="memories.programmemory.end" value="0x7fff"/>
+        <property key="memories.programmemory.partition2" value="true"/>
+        <property key="memories.programmemory.partition2.end"
+                  value="${memories.programmemory.partition2.end.value}"/>
+        <property key="memories.programmemory.partition2.start"
+                  value="${memories.programmemory.partition2.start.value}"/>
+        <property key="memories.programmemory.start" value="0x0"/>
+        <property key="poweroptions.powerenable" value="false"/>
+        <property key="programoptions.donoteraseauxmem" value="false"/>
+        <property key="programoptions.eraseb4program" value="true"/>
+        <property key="programoptions.preservedataflash" value="false"/>
+        <property key="programoptions.preserveeeprom" value="false"/>
+        <property key="programoptions.preserveprogramrange" value="false"/>
+        <property key="programoptions.preserveprogramrange.end" value="0x3f"/>
+        <property key="programoptions.preserveprogramrange.start" value="0x0"/>
+        <property key="programoptions.preserveuserid" value="false"/>
+        <property key="programoptions.programcalmem" value="false"/>
+        <property key="programoptions.programuserotp" value="false"/>
+        <property key="programoptions.usehighvoltageonmclr" value="false"/>
+        <property key="programoptions.uselvpprogramming" value="false"/>
+        <property key="tracecontrol.disablemacros" value="false"/>
         <property key="tracecontrol.include.timestamp" value="summarydataenabled"/>
+        <property key="tracecontrol.medium" value="1"/>
+        <property key="tracecontrol.portselect" value="0"/>
         <property key="tracecontrol.select" value="0"/>
+        <property key="tracecontrol.spiselect" value="0"/>
         <property key="tracecontrol.stallontracebufferfull" value="false"/>
-        <property key="tracecontrol.timestamp" value="0"/>
         <property key="tracecontrol.tracebufmax" value="546000"/>
         <property key="tracecontrol.tracefile" value="defmplabxtrace.log"/>
-        <property key="tracecontrol.traceresetonrun" value="false"/>
-        <property key="uart10io.output" value="window"/>
-        <property key="uart10io.outputfile" value=""/>
-        <property key="uart10io.uartioenabled" value="false"/>
-        <property key="uart1io.output" value="window"/>
-        <property key="uart1io.outputfile" value=""/>
-        <property key="uart1io.uartioenabled" value="false"/>
-        <property key="uart2io.output" value="window"/>
-        <property key="uart2io.outputfile" value=""/>
-        <property key="uart2io.uartioenabled" value="false"/>
-        <property key="uart3io.output" value="window"/>
-        <property key="uart3io.outputfile" value=""/>
-        <property key="uart3io.uartioenabled" value="false"/>
-        <property key="uart4io.output" value="window"/>
-        <property key="uart4io.outputfile" value=""/>
-        <property key="uart4io.uartioenabled" value="false"/>
-        <property key="uart5io.output" value="window"/>
-        <property key="uart5io.outputfile" value=""/>
-        <property key="uart5io.uartioenabled" value="false"/>
-        <property key="uart6io.output" value="window"/>
-        <property key="uart6io.outputfile" value=""/>
-        <property key="uart6io.uartioenabled" value="false"/>
-        <property key="uart7io.output" value="window"/>
-        <property key="uart7io.outputfile" value=""/>
-        <property key="uart7io.uartioenabled" value="false"/>
-        <property key="uart8io.output" value="window"/>
-        <property key="uart8io.outputfile" value=""/>
-        <property key="uart8io.uartioenabled" value="false"/>
-        <property key="uart9io.output" value="window"/>
-        <property key="uart9io.outputfile" value=""/>
-        <property key="uart9io.uartioenabled" value="false"/>
-        <property key="warningmessagebreakoptions.W0001_CORE_BITREV_MODULO_EN"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0002_CORE_SECURE_MEMORYACCESS"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0003_CORE_SW_RESET" value="report"/>
-        <property key="warningmessagebreakoptions.W0004_CORE_WDT_RESET" value="report"/>
-        <property key="warningmessagebreakoptions.W0005_CORE_IOPUW_RESET"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0006_CORE_CODE_GUARD_PFC_RESET"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0007_CORE_DO_LOOP_STACK_UNDERFLOW"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0008_CORE_DO_LOOP_STACK_OVERFLOW"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0009_CORE_NESTED_DO_LOOP_RANGE"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0010_CORE_SIM32_ODD_WORDACCESS"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0011_CORE_SIM32_UNIMPLEMENTED_RAMACCESS"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0012_CORE_STACK_OVERFLOW_RESET"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0013_CORE_STACK_UNDERFLOW_RESET"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0014_CORE_INVALID_OPCODE"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0015_CORE_INVALID_ALT_WREG_SET"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0101_SIM_UPDATE_FAILED"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0102_SIM_PERIPH_MISSING"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0103_SIM_PERIPH_FAILED"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0104_SIM_FAILED_TO_INIT_TOOL"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0105_SIM_INVALID_FIELD"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0106_SIM_PERIPH_PARTIAL_SUPPORT"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0201_ADC_NO_STIMULUS_FILE"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0202_ADC_GO_DONE_BIT" value="report"/>
-        <property key="warningmessagebreakoptions.W0203_ADC_MINIMUM_2_TAD"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0204_ADC_TAD_TOO_SMALL"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0205_ADC_UNEXPECTED_TRANSITION"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0206_ADC_SAMP_TIME_TOO_SHORT"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0207_ADC_NO_PINS_SCANNED"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0208_ADC_UNSUPPORTED_CLOCK_SOURCE"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0209_ADC_ANALOG_CHANNEL_DIGITAL"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0210_ADC_ANALOG_CHANNEL_OUTPUT"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0211_ADC_PIN_INVALID_CHANNEL"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0212_ADC_BAND_GAP_NOT_SUPPORTED"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0213_ADC_RESERVED_SSRC"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0214_ADC_POSITIVE_INPUT_DIGITAL"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0215_ADC_POSITIVE_INPUT_OUTPUT"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0216_ADC_NEGATIVE_INPUT_DIGITAL"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0217_ADC_NEGATIVE_INPUT_OUTPUT"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0218_ADC_REFERENCE_HIGH_DIGITAL"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0219_ADC_REFERENCE_HIGH_OUTPUT"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0220_ADC_REFERENCE_LOW_DIGITAL"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0221_ADC_REFERENCE_LOW_OUTPUT"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0222_ADC_OVERFLOW" value="report"/>
-        <property key="warningmessagebreakoptions.W0223_ADC_UNDERFLOW" value="report"/>
-        <property key="warningmessagebreakoptions.W0224_ADC_CTMU_NOT_SUPPORTED"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0225_ADC_INVALID_CH0S"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0226_ADC_VBAT_NOT_SUPPORTED"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0227_ADC_INVALID_ADCS"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0228_ADC_INVALID_ADCS"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0229_ADC_INVALID_ADCS"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0230_ADC_TRIGSEL_NOT_SUPPORTED"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0400_PWM_PWM_FASTER_THAN_FOSC"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0700_CLC_GENERAL_WARNING"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0701_CLC_CLCOUT_AS_INPUT"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W0702_CLC_CIRCULAR_LOOP"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W1201_DATAFLASH_MEM_OUTSIDE_RANGE"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W1202_DATAFLASH_ERASE_WHILE_LOCKED"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W1203_DATAFLASH_WRITE_WHILE_LOCKED"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W1401_DMA_PERIPH_NOT_AVAIL"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W1402_DMA_INVALID_IRQ" value="report"/>
-        <property key="warningmessagebreakoptions.W1403_DMA_INVALID_SFR" value="report"/>
-        <property key="warningmessagebreakoptions.W1404_DMA_INVALID_DMA_ADDR"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W1405_DMA_IRQ_DIR_MISMATCH"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W1600_PPS_INVALID_MAP" value="report"/>
-        <property key="warningmessagebreakoptions.W2001_INPUTCAPTURE_TMR3_UNAVAILABLE"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W2002_INPUTCAPTURE_CAPTURE_EMPTY"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W2003_INPUTCAPTURE_SYNCSEL_NOT_AVIALABLE"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W2004_INPUTCAPTURE_BAD_SYNC_SOURCE"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W2501_OUTPUTCOMPARE_SYNCSEL_NOT_AVIALABLE"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W2502_OUTPUTCOMPARE_BAD_SYNC_SOURCE"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W2503_OUTPUTCOMPARE_BAD_TRIGGER_SOURCE"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W9001_TMR_GATE_AND_EXTCLOCK_ENABLED"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W9002_TMR_NO_PIN_AVAILABLE"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W9003_TMR_INVALID_CLOCK_SOURCE"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W9201_UART_TX_OVERFLOW"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W9202_UART_TX_CAPTUREFILE"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W9203_UART_TX_INVALIDINTERRUPTMODE"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W9204_UART_RX_EMPTY_QUEUE"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W9205_UART_TX_BADFILE" value="report"/>
-        <property key="warningmessagebreakoptions.W9401_CVREF_INVALIDSOURCESELECTION"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W9402_CVREF_INPUT_OUTPUTPINCONFLICT"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W9601_COMP_FVR_SOURCE_UNAVAILABLE"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W9602_COMP_DAC_SOURCE_UNAVAILABLE"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W9603_COMP_CVREF_SOURCE_UNAVAILABLE"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W9801_FVR_INVALID_MODE_SELECTION"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W9801_SCL_BAD_SUBTYPE_INDICATION"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W9802_SCL_FILE_NOT_FOUND"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W9803_SCL_FAILED_TO_READ_FILE"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W9804_SCL_UNRECOGNIZED_LABEL"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.W9805_SCL_UNRECOGNIZED_VAR"
-                  value="report"/>
-        <property key="warningmessagebreakoptions.displaywarningmessagesoption"
-                  value=""/>
-        <property key="warningmessagebreakoptions.warningmessages" value="holdstate"/>
-      </Simulator>
+        <property key="tracecontrol.tracefilemax" value="10000000"/>
+        <property key="voltagevalue" value="5.0"/>
+      </RealICEPlatformTool>
       <XC8-config-global>
         <property key="advanced-elf" value="true"/>
         <property key="output-file-format" value="-mcof,+elf"/>
@@ -568,7 +391,7 @@
     <conf name="Debug_26K80" type="2">
       <toolsSet>
         <developmentServer>localhost</developmentServer>
-        <targetDevice>PIC18F26K80</targetDevice>
+        <targetDevice>PIC18LF26K80</targetDevice>
         <targetHeader></targetHeader>
         <targetPluginBoard></targetPluginBoard>
         <platformTool>RealICEPlatformTool</platformTool>
diff --git a/kelvin_ntc.X/nbproject/private/configurations.xml b/kelvin_ntc.X/nbproject/private/configurations.xml
index 4d598c1..98a60df 100644
--- a/kelvin_ntc.X/nbproject/private/configurations.xml
+++ b/kelvin_ntc.X/nbproject/private/configurations.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configurationDescriptor version="62">
   <projectmakefile>Makefile</projectmakefile>
-<<<<<<< HEAD
-  <defaultConf>2</defaultConf>
-=======
   <defaultConf>0</defaultConf>
->>>>>>> 13e88f7760576942ba7516e8d1d36ec5925eb9f6
   <confs>
     <conf name="Relocated_2580" type="2">
       <platformToolSN></platformToolSN>
diff --git a/main.c b/main.c
index f56c01d..0fc5879 100644
--- a/main.c
+++ b/main.c
@@ -87,10 +87,10 @@
 
 
 // CONFIG1L
-#pragma config SOSCSEL = DIG    // RC0/RC is I/O.
+#pragma config SOSCSEL = DIG    // RC0/RC is I/O
 #pragma config RETEN = OFF      // Ultra low-power regulator is Disabled (Controlled by REGSLP bit).
 #pragma config INTOSCSEL = HIGH // LF-INTOSC in High-power mode during Sleep.
-#pragma config XINST = OFF      // No extended instruction set.
+#pragma config XINST = OFF      // No extended instruction set
 
 // CONFIG1H
 #pragma config FOSC = HS2       // Crystal 10 MHz
@@ -309,7 +309,7 @@ void interrupt low_priority interrupt_at_low_vector( void )
         }
 
         // Start conversion
-        //ConvertADC();
+        ConvertADC();
 
         PIR1bits.ADIF = 0; // Reset interrupt flag
 
@@ -496,11 +496,7 @@ void doWork(void)
                 
                 Rinf = 10000.0 * exp(B / -298.15);
                 //itemp = Rinf * 10000;
-#if defined(_18F2580)                 
                 v = 5.0 * (double) avarage / 1025;
-#else
-                v = 5.0 * (double) avarage / 4097;
-#endif                
                 //itemp = v * 100;
                 resistance = (calVoltage - 10000.0 * v) / v;
                 //itemp = r;
@@ -530,14 +526,10 @@ void doWork(void)
                 // ================
 
                 // Assuming a 10k Thermistor.  Calculation is actually: Resistance = (1024/ADC)
-#if defined(_18F2580) 
                 resistance = ((10240000 / adc[2 * i + 1]) - 10000);
-#else
-                resistance = ((40960000 / adc[2 * i + 1]) - 10000);
-#endif                
 
                 /********************************************************************/
-                /* Utilises the Steinhart-Hart Thermistor Equation:					*/
+                /* Utilizes the Steinhart-Hart Thermistor Equation:					*/
                 /*    Temperature in Kelvin = 1 / {A + B[ln(R)] + C[ln(R)]^3}		*/
                 /********************************************************************/
                 temp = log(resistance);