Skip to content

Commit cebef8a

Browse files
committed
update configuration tools to Version 2
1 parent 86d2dc9 commit cebef8a

File tree

6 files changed

+15
-16
lines changed

6 files changed

+15
-16
lines changed

tools/calibrate_receiver.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
set /P comportnum="COM Port: "
2-
python tino2cal_v01.py COM%comportnum% 230400 -pwd
2+
python tino2cal_v02.py COM%comportnum% 230400 -pwd
33
pause

tools/calibrate_sensor.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
set /P comportnum="COM Port: "
2-
python tino2cal_v01.py COM%comportnum% 57600 -pwd
2+
python tino2cal_v02.py COM%comportnum% 57600 -pwd
33
pause

tools/receiver.cfg

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ RXPIN=1
2828
RTDCSPIN=12
2929
ONEWIREPOWERPIN=10
3030
ONEWIREDATAPIN=9
31-
I2CPOWERPIN=8
32-
PCI0PIN=13
31+
I2CPOWERPIN=25
32+
PCI0PIN=11
3333
PCI0CONFIG.TRIGGER=2
3434
PCI0CONFIG.MODE=2
3535
PCI0GATEWAYID=22
36-
PCI1PIN=12
36+
PCI1PIN=-1
3737
PCI1CONFIG.TRIGGER=2
3838
PCI1CONFIG.MODE=2
3939
PCI1GATEWAYID=22
40-
PCI2PIN=11
40+
PCI2PIN=-1
4141
PCI2CONFIG.TRIGGER=3
4242
PCI2CONFIG.MODE=3
4343
PCI2GATEWAYID=22
@@ -56,4 +56,3 @@ SERIAL_ENABLE=1
5656
IS_RFM69HW=1
5757
PABOOST=0
5858
FDEV_STEPS=0
59-
CHECKSUM=4967

tools/tino2.cfg

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ NETWORKID=210
33
GATEWAYID=22
44
VCCATCAL=3330
55
VCCADC_CAL=466
6-
SENDDELAY=2
6+
SENDDELAY=75
77
SENSORCONFIG=0x40
88
SENSORCONFIG.HTU21D=0
99
SENSORCONFIG.DS18B20=0
@@ -25,15 +25,15 @@ LDRPIN=-1
2525
PIRDATAPIN=-1
2626
PIRDEADTIME=24
2727
RXPIN=1
28-
RTDCSPIN=12
28+
RTDCSPIN=15
2929
ONEWIREPOWERPIN=10
3030
ONEWIREDATAPIN=9
31-
I2CPOWERPIN=8
32-
PCI0PIN=13
31+
I2CPOWERPIN=25
32+
PCI0PIN=12
3333
PCI0CONFIG.TRIGGER=2
3434
PCI0CONFIG.MODE=2
3535
PCI0GATEWAYID=22
36-
PCI1PIN=12
36+
PCI1PIN=-1
3737
PCI1CONFIG.TRIGGER=2
3838
PCI1CONFIG.MODE=2
3939
PCI1GATEWAYID=22
@@ -49,8 +49,6 @@ USE_CRYSTAL_RTC=0
4949
ENCRYPTION_ENABLE=1
5050
FEC_ENABLE=1
5151
INTERLEAVER_ENABLE=1
52-
EEPROM_VERSION_NUMBER=9
53-
SOFTWAREVERSION_NUMBER=10
5452
TXGAUSS_SHAPING=0
5553
SERIAL_ENABLE=1
5654
IS_RFM69HW=1

tools/tino2cal_v01.py renamed to tools/tino2cal_v02.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -949,6 +949,7 @@ def file2eeprom(str2parse, serial):
949949
serial.write(outstr)
950950
elif items[0] == pciconfig[1] and 0 <= val and val <= 2: #MODE
951951
print ("PCI%i MODE, value old: %i " % (pcinum, ((pciconfig_val[pcinum]>>3)&0x3) ))
952+
pciconfig_val[pcinum] &= 0x07 # leave trigger bits , all others set to 0
952953
pciconfig_val[pcinum] |= val<<3
953954
#print (pciconfig_val[pcinum])
954955
outstr = b"w,%i,%i\n" % (addr, pciconfig_val[pcinum])
@@ -1284,7 +1285,8 @@ def SerialWaitForResponse(port):
12841285

12851286
# load frequency correction table into EEPROM. Values are calculated by Python from cubic parameters
12861287
elif inputstr == b'ft' or inputstr == b'frequency_table':
1287-
write_eeprom_frequency_correction(port)
1288+
#write_eeprom_frequency_correction(port)
1289+
pass
12881290

12891291
# get eeprom content and save in file
12901292
elif inputstr[:2] == b'g,' or inputstr[:4] == b'get,':

tools/tino_log.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
BAUDRATE= 230400
2727
#SERIAL_PORT = '/dev/ttyAMA0'
28-
SERIAL_PORT = 'COM5'
28+
SERIAL_PORT = 'COM4'
2929

3030

3131
#default filename for valid records

0 commit comments

Comments
 (0)