Skip to content

Use print() function in both Python 2 and Python 3 #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 11, 2018
Merged

Use print() function in both Python 2 and Python 3 #82

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions PSL/SENSORS/Sx1276.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#Registers adapted from sample code for SEMTECH SX1276
from __future__ import print_function

import time

def connect(SPI,frq,**kwargs):
Expand Down Expand Up @@ -70,7 +72,7 @@ def __init__(self,SPI,frq,**kwargs):
self.reset()
self.version = self.SPIRead(self.REG_VERSION,1)[0]
if self.version!=0x12:
print 'version error',self.version
print('version error',self.version)
self.sleep()
self.setFrequency(self.frequency)

Expand Down Expand Up @@ -110,7 +112,7 @@ def endPacket(self):
while 1: #Wait for TX done
if self.SPIRead(self.REG_IRQ_FLAGS,1)[0] & self.IRQ_TX_DONE_MASK: break
else:
print ('wait...')
print('wait...')
time.sleep(0.1)
self.SPIWrite(self.REG_IRQ_FLAGS,[self.IRQ_TX_DONE_MASK])

Expand Down Expand Up @@ -210,19 +212,19 @@ def setTxPower(self,level,pin):
elif level>17:
level = 17
if level==17:
print ('max power output')
print('max power output')
self.SPIWrite(self.REG_PA_DAC,[0x87])
else:
self.SPIWrite(self.REG_PA_DAC,[0x84])
self.SPIWrite(self.REG_PA_CONFIG,[self.PA_BOOST|0x70|(level-2)])

print 'power',hex(self.SPIRead(self.REG_PA_CONFIG)[0])
print('power',hex(self.SPIRead(self.REG_PA_CONFIG)[0]))

def setFrequency(self,frq):
self._frequency = frq
frf = (int(frq)<<19)/32000000
print ('frf',frf)
print ('freq',(frf>>16)&0xFF,(frf>>8)&0xFF,(frf)&0xFF)
print('frf',frf)
print('freq',(frf>>16)&0xFF,(frf>>8)&0xFF,(frf)&0xFF)
self.SPIWrite(self.REG_FRF_MSB,[(frf>>16)&0xFF])
self.SPIWrite(self.REG_FRF_MID,[(frf>>8)&0xFF])
self.SPIWrite(self.REG_FRF_LSB,[frf&0xFF])
Expand All @@ -247,7 +249,7 @@ def setSignalBandwidth(self,sbw):
bw = num
break
num+=1
print ('bandwidth: ',bw)
print('bandwidth: ',bw)
self.SPIWrite(self.REG_MODEM_CONFIG_1,[(self.SPIRead(self.REG_MODEM_CONFIG_1)[0]&0x0F)|(bw<<4)])

def setCodingRate4(self,denominator):
Expand Down Expand Up @@ -290,7 +292,7 @@ def handleDio0Rise(self):

self.SPIWrite(self.REG_FIFO_ADDR_PTR,self.SPIRead(self.REG_FIFO_RX_CURRENT_ADDR,1))
if self._onReceive:
print self.packetLength
print(self.packetLength)
#self._onReceive(self.packetLength)

self.SPIWrite(self.REG_FIFO_ADDR_PTR,[0])
Expand Down Expand Up @@ -319,13 +321,12 @@ def getRaw(self):
lora.beginPacket()
lora.write([cntr])
#lora.write([ord(a) for a in ":"]+[cntr])
print (time.ctime(),[ord(a) for a in ":"]+[cntr], hex(lora.SPIRead(lora.REG_OP_MODE)[0]))
print(time.ctime(),[ord(a) for a in ":"]+[cntr], hex(lora.SPIRead(lora.REG_OP_MODE)[0]))
lora.endPacket()
cntr+=1
if cntr==255:cntr=0
elif mode==RX:
packet_size = lora.parsePacket()
if packet_size:
print 'data',lora.readAll()
print ('Rssi',lora.packetRssi(),lora.packetSnr())

print('data',lora.readAll())
print('Rssi',lora.packetRssi(),lora.packetSnr())