Skip to content

Commit

Permalink
Adopted for PIC18F26K80
Browse files Browse the repository at this point in the history
  • Loading branch information
grodansparadis committed Mar 30, 2016
1 parent 87c5a57 commit 58427ee
Show file tree
Hide file tree
Showing 13 changed files with 3,024 additions and 184 deletions.
15 changes: 12 additions & 3 deletions HISTORY.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,25 @@
Kelvin NTC
==========

2016-03-23 AKHE - Version 1.2.4 -------------------------------------------------
2016-03-30 AKHE - Made code work for PIC18F26K80
2016-03-29 AKHE - Raw A/D register values was displayed in wrong order. Fixed.
--------------------------------------------------------------------------------

2016-03-23 AKHE - Version 1.2.5 -------------------------------------------------
2016-03-23 AKHE - Adopted for VSCP firmware 1.6.1
--------------------------------------------------------------------------------

2016-03-23 AKHE - Version 1.2.4 -------------------------------------------------
2016-03-08 AKHE - Adopted to 1.6 firmware. Adopted for PIC18F26K80.
2016-03-08 AKHE - Adopted to 1.6.0 firmware. Adopted for PIC18F26K80.
2016-02-04 AKHE - Temperature calibration value calculated wrongly.
2015-11-26 AKHE - Fixed problem with low/high limits with negative values. Also
limits now are in degrees as is hysteresis as well.
2015-11-25 AKHE - Fixed problem with overwritten calibration value on bootload
2015-11-24 AKHE - Moved limit and alarm tests to one second work where they belong.
2015-09-28 AKHE - Temperature register 5 was not read correctly. Temperature register 4 was returned erronius instead.
2015-09-28 AKHE - Temperature register 5 was not read correctly. Temperature
register 4 was returned erronius instead.
--------------------------------------------------------------------------------

----- Version 1.2.2
2015-09-13 AKHE - Sensor zones/subzones was written correctly but not read correctly
2015-09-13 AKHE - Fixed sync command.
Expand Down
Binary file added docs/thermistor.pdf
Binary file not shown.
1,423 changes: 1,423 additions & 0 deletions firmware/kelvin_ntc_2580_1_2_6.hex

Large diffs are not rendered by default.

Binary file added firmware/kelvin_ntc_2580_1_2_6.zip
Binary file not shown.
1,423 changes: 1,423 additions & 0 deletions firmware/kelvin_ntc_26K80_1_2_6.hex

Large diffs are not rendered by default.

Binary file added firmware/kelvin_ntc_26K80_1_2_6.zip
Binary file not shown.
255 changes: 105 additions & 150 deletions kelvin_ntc.X/funclist
Original file line number Diff line number Diff line change
@@ -1,153 +1,108 @@
_vscp_getBootLoaderAlgorithm: CODE, 24732 0 2
PL12: CODE, 14404 0 22
PL50: CODE, 18394 0 20
PL8: CODE, 14364 0 14
___asflsub: CODE, 22542 0 78
_vscp_getZone: CODE, 24658 0 10
PL22: CODE, 14456 0 26
PL60: CODE, 23704 0 16
_vscp_getControlByte: CODE, 24406 0 28
_log: CODE, 17834 0 312
PL32: CODE, 19216 0 18
PL70: CODE, 22130 0 14
_init: CODE, 23384 0 60
_vscp_setManufacturerId: CODE, 24322 0 28
PL42: CODE, 14526 0 20
PL80: CODE, 17128 0 12
_vscp_getBootLoaderAlgorithm: CODE, 25814 0 2
___asflsub: CODE, 23920 0 74
_vscp_getZone: CODE, 25740 0 10
_vscp_getControlByte: CODE, 25488 0 28
_log: CODE, 19310 0 312
_init: CODE, 23538 0 80
_vscp_setManufacturerId: CODE, 25404 0 28
exp@coeff: SMALLCONST, 3872 0 40
___aldiv: CODE, 19912 0 188
PL14: CODE, 14426 0 16
PL52: CODE, 18414 0 18
PL90: CODE, 14626 0 8
_ECANReceiveMessage: CODE, 15732 0 484
_vscp_getEvent: CODE, 23814 0 44
___flmul: CODE, 19516 0 176
_vscp_handleHeartbeat: CODE, 24740 0 2
_vscp_readRegister: CODE, 24508 0 22
PL24: CODE, 19200 0 16
PL62: CODE, 7668 0 16
_vscp_setGUID: CODE, 24094 0 36
_sendTempEvent: CODE, 22028 0 102
PL34: CODE, 13072 0 20
PL72: CODE, 13092 0 14
__RegsToCANID: CODE, 18146 0 196
___aldiv: CODE, 21236 0 188
_ECANReceiveMessage: CODE, 16474 0 512
_vscp_getEvent: CODE, 24212 0 70
___flmul: CODE, 20432 0 222
_vscp_handleHeartbeat: CODE, 25822 0 2
_vscp_readRegister: CODE, 25590 0 22
_vscp_setGUID: CODE, 25170 0 36
_sendTempEvent: CODE, 22870 0 130
__RegsToCANID: CODE, 17914 0 356
_vscp_deviceURL: SMALLCONST, 3840 0 32
_vscp_writeRegister: CODE, 24202 0 30
PL44: CODE, 19234 0 20
PL82: CODE, 20276 0 12
_getVSCPFrame: CODE, 22260 0 116
i1_ConvertADC: CODE, 24724 0 4
_vscp_setControlByte: CODE, 24166 0 36
_vscp_getUserID: CODE, 24572 0 20
PL16: CODE, 19180 0 20
PL54: CODE, 14566 0 18
_setEventData: CODE, 20826 0 176
PL26: CODE, 20448 0 24
PL64: CODE, 19692 0 16
_Celsius2Kelvin: CODE, 23618 0 52
_Busy_eep: CODE, 24706 0 6
PL36: CODE, 14506 0 20
PL74: CODE, 14598 0 14
_vscp_error: CODE, 24712 0 4
_doWork: CODE, 14634 0 1080
_getCalibrationValue: CODE, 23200 0 62
_vscp_init_pstorage: CODE, 24716 0 4
___fltol: CODE, 21336 0 158
_vscp_restoreDefaults: CODE, 24698 0 8
PL46: CODE, 14546 0 20
PL84: CODE, 14612 0 8
___flsub: CODE, 23324 0 60
___flge: CODE, 22620 0 76
PL18: CODE, 18342 0 14
PL56: CODE, 15714 0 18
_vscp_readStdReg: CODE, 16724 0 384
_vscp_readAppReg: CODE, 7684 0 1954
_vscp_getFamilyCode: CODE, 24678 0 10
PL28: CODE, 14482 0 24
PL66: CODE, 14584 0 14
_vscp_setUserID: CODE, 24350 0 28
_getCANFrame: CODE, 24020 0 38
_main: CODE, 18432 0 280
_ldexp: CODE, 21002 0 174
___fldiv: CODE, 20650 0 176
PL38: CODE, 18356 0 18
PL76: CODE, 16216 0 14
_handle_sync: CODE, 21772 0 130
_Read_b_eep: CODE, 24460 0 24
___lwtofl: CODE, 23858 0 42
PL48: CODE, 17108 0 20
PL86: CODE, 14620 0 6
___flneg: CODE, 24058 0 36
_vscp_goActiveState: CODE, 24262 0 30
_vscp_doOneSecondWork: CODE, 22376 0 86
_vscp_getRegisterPagesUsed: CODE, 24728 0 2
PL58: CODE, 17816 0 18
_doOneSecondWork: CODE, 13116 0 1176
PL68: CODE, 19708 0 14
_sendVSCPFrame: CODE, 20472 0 178
_vscp_sendEvent: CODE, 23768 0 46
_vscp_getMDF_URL: CODE, 24378 0 28
_eval_poly: CODE, 20288 0 160
PL78: CODE, 19254 0 10
_init_app_eeprom: CODE, 9638 0 1904
_floor: CODE, 19264 0 252
PL88: CODE, 13106 0 10
_sendCANFrame: CODE, 23066 0 72
_Write_b_eep: CODE, 23502 0 58
_ConvertADC: CODE, 24720 0 4
_vscp_check_pstorage: CODE, 23444 0 58
_vscp_writeStdReg: CODE, 18712 0 276
_WriteTimer0: CODE, 24612 0 18
_vscp_writeAppReg: CODE, 3950 0 3718
_vscp_handleProtocolEvent: CODE, 11542 0 1506
__initialization: CODE, 23138 0 56
__ECANPointBuffer: CODE, 21902 0 126
_vscp_getFamilyType: CODE, 24668 0 10
_vscp_getBufferSize: CODE, 24730 0 2
_vscp_getSubzone: CODE, 24648 0 10
_vscp_getMatrixInfo: CODE, 24434 0 26
_vscp_handleDropNickname: CODE, 23720 0 48
_vscp_handleSetNickname: CODE, 24232 0 30
_frexp: CODE, 21638 0 134
_vscp_handleProbeState: CODE, 19722 0 190
_vscp_goBootloaderMode: CODE, 24130 0 36
___flpack: CODE, 20100 0 176
_exp: CODE, 16230 0 494
_writeCoeffs2Ram: CODE, 21176 0 160
___asfladd: CODE, 22846 0 74
_vscp_readNicknamePermanent: CODE, 24688 0 10
_vscp_sendHeartBeat: CODE, 23982 0 38
_Celsius2Fahrenheit: CODE, 22144 0 116
_ECANInitialize: CODE, 21494 0 144
___fladd: CODE, 17492 0 324
___asfldiv: CODE, 22772 0 74
_OpenTimer0: CODE, 24292 0 30
_interrupt_at_low_vector: CODE, 24 0 674
i1_WriteTimer0: CODE, 24630 0 18
_OpenADC: CODE, 22920 0 74
_vscp_writeRegister: CODE, 25314 0 30
_getVSCPFrame: CODE, 23000 0 128
i1_ConvertADC: CODE, 25806 0 4
_vscp_setControlByte: CODE, 25278 0 36
_vscp_getUserID: CODE, 25654 0 20
_setEventData: CODE, 21784 0 176
_Celsius2Kelvin: CODE, 24820 0 52
_Busy_eep: CODE, 25788 0 6
_vscp_error: CODE, 25794 0 4
_doWork: CODE, 15326 0 1148
_getCalibrationValue: CODE, 24414 0 62
_vscp_init_pstorage: CODE, 25798 0 4
___fltol: CODE, 22134 0 162
_vscp_restoreDefaults: CODE, 25780 0 8
___flsub: CODE, 24476 0 58
___flge: CODE, 23694 0 76
_vscp_readStdReg: CODE, 17482 0 432
_vscp_readAppReg: CODE, 9730 0 1954
_vscp_getFamilyCode: CODE, 25760 0 10
_vscp_setUserID: CODE, 25432 0 28
_getCANFrame: CODE, 24968 0 46
_main: CODE, 19622 0 282
_ldexp: CODE, 21960 0 174
___fldiv: CODE, 21424 0 182
_handle_sync: CODE, 22600 0 136
_Read_b_eep: CODE, 25542 0 24
___lwtofl: CODE, 25014 0 42
___flneg: CODE, 25134 0 36
_vscp_goActiveState: CODE, 25344 0 30
_vscp_doOneSecondWork: CODE, 23458 0 80
_vscp_getRegisterPagesUsed: CODE, 25810 0 2
_doOneSecondWork: CODE, 7696 0 2034
_sendVSCPFrame: CODE, 21606 0 178
_vscp_sendEvent: CODE, 24920 0 48
_vscp_getMDF_URL: CODE, 25460 0 28
_eval_poly: CODE, 20654 0 200
_init_app_eeprom: CODE, 11684 0 1904
_floor: CODE, 20180 0 252
_sendCANFrame: CODE, 24140 0 72
_Write_b_eep: CODE, 24650 0 58
_ConvertADC: CODE, 25802 0 4
_vscp_check_pstorage: CODE, 24592 0 58
_vscp_writeStdReg: CODE, 19904 0 276
_WriteTimer0: CODE, 25694 0 18
_vscp_writeAppReg: CODE, 3950 0 3746
_vscp_handleProtocolEvent: CODE, 13588 0 1738
__initialization: CODE, 24352 0 56
__ECANPointBuffer: CODE, 23128 0 126
_vscp_getFamilyType: CODE, 25750 0 10
_vscp_getBufferSize: CODE, 25812 0 2
_vscp_getSubzone: CODE, 25730 0 10
_vscp_getMatrixInfo: CODE, 25516 0 26
_vscp_handleDropNickname: CODE, 24766 0 54
_vscp_handleSetNickname: CODE, 25206 0 36
_frexp: CODE, 22736 0 134
_vscp_handleProbeState: CODE, 21046 0 190
_vscp_goBootloaderMode: CODE, 25242 0 36
___flpack: CODE, 20854 0 192
_exp: CODE, 16986 0 496
_writeCoeffs2Ram: CODE, 22296 0 160
___asfladd: CODE, 23846 0 74
_vscp_readNicknamePermanent: CODE, 25770 0 10
_vscp_sendHeartBeat: CODE, 25096 0 38
_Celsius2Fahrenheit: CODE, 23254 0 118
_ECANInitialize: CODE, 22456 0 144
___fladd: CODE, 18270 0 352
___asfldiv: CODE, 23618 0 76
_OpenTimer0: CODE, 25374 0 30
_interrupt_at_low_vector: CODE, 2072 0 676
i1_WriteTimer0: CODE, 25712 0 18
_OpenADC: CODE, 23994 0 74
log@coeff: SMALLCONST, 3912 0 36
_vscp_getMajorVersion: CODE, 24738 0 2
_vscp_getMinorVersion: CODE, 24736 0 2
_vscp_writeNicknamePermanent: CODE, 24530 0 22
_vscp_newNodeOnline: CODE, 23900 0 42
__CANIDToRegs: CODE, 18988 0 192
_vscp_init: CODE, 22462 0 80
___awtofl: CODE, 23560 0 58
PL2: CODE, 14292 0 14
_init_app_ram: CODE, 23262 0 62
___asflmul: CODE, 22696 0 76
___wmul: CODE, 23670 0 34
___altofl: CODE, 22994 0 72
PL10: CODE, 14378 0 26
PL4: CODE, 14306 0 30
_vscp_getManufacturerId: CODE, 24552 0 20
___lbmod: CODE, 23942 0 40
PL20: CODE, 14442 0 14
_vscp_getSubMinorVersion: CODE, 24734 0 2
_ECANSetOperationMode: CODE, 24484 0 24
PL30: CODE, 13048 0 24
PL6: CODE, 14336 0 28
PL40: CODE, 18374 0 20
_ECANSendMessage: CODE, 17140 0 352
_vscp_getGUID: CODE, 24592 0 20
Total: 21568
_vscp_getMajorVersion: CODE, 25820 0 2
_vscp_getMinorVersion: CODE, 25818 0 2
_vscp_writeNicknamePermanent: CODE, 25612 0 22
_vscp_newNodeOnline: CODE, 24872 0 48
__CANIDToRegs: CODE, 18974 0 336
_vscp_init: CODE, 23372 0 86
___awtofl: CODE, 24708 0 58
_init_app_ram: CODE, 24282 0 70
___asflmul: CODE, 23770 0 76
___wmul: CODE, 24534 0 58
___altofl: CODE, 24068 0 72
_vscp_getManufacturerId: CODE, 25634 0 20
___lbmod: CODE, 25056 0 40
_vscp_getSubMinorVersion: CODE, 25816 0 2
_ECANSetOperationMode: CODE, 25566 0 24
_ECANSendMessage: CODE, 18622 0 352
_vscp_getGUID: CODE, 25674 0 20
Total: 22652
2 changes: 1 addition & 1 deletion kelvin_ntc.X/nbproject/Makefile-genesis.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
#Tue Mar 29 10:57:40 CEST 2016
#Wed Mar 30 21:12:28 CEST 2016
Debug_26K80.com-microchip-mplab-nbide-toolchainXC8-XC8LanguageToolchain.md5=12edf07df11dc3b48011abb2bbd51a8e
Relocated_2580.languagetoolchain.version=1.21
Debug_2580.languagetoolchain.dir=/opt/microchip/xc8/v1.21/bin
Expand Down
2 changes: 1 addition & 1 deletion kelvin_ntc.X/nbproject/Makefile-impl.mk
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}
PROJECTNAME=kelvin_ntc.X

# Active Configuration
DEFAULTCONF=Debug_26K80
DEFAULTCONF=Relocated_26K80
CONF=${DEFAULTCONF}

# All Configurations
Expand Down
2 changes: 1 addition & 1 deletion kelvin_ntc.X/nbproject/private/configurations.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configurationDescriptor version="62">
<projectmakefile>Makefile</projectmakefile>
<defaultConf>2</defaultConf>
<defaultConf>3</defaultConf>
<confs>
<conf name="Relocated_2580" type="2">
<platformToolSN>:=MPLABComm-USB-Microchip:=&lt;vid>04D8:=&lt;pid>9004:=&lt;rev>0100:=&lt;man>Microchip Technology, Inc. (www.microchip.com):=&lt;prod>MPLAB REAL ICE tm (www.microchip.com):=&lt;sn>JIT113110039:=&lt;drv>x:=&lt;xpt>b:=end</platformToolSN>
Expand Down
Loading

0 comments on commit 58427ee

Please sign in to comment.