From b949734db251ed6b2074193a24b0897ee7ba0c98 Mon Sep 17 00:00:00 2001
From: brentru <robots199@me.com>
Date: Fri, 18 Jan 2019 12:52:12 -0500
Subject: [PATCH] simplify rfm69 example to match rfm9x example,update rfm9x
 example to decode utf8 instead of ascii

---
 pi_radio/radio_rfm69.py | 58 ++++++++++++++++++++---------------------
 pi_radio/radio_rfm9x.py |  2 +-
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/pi_radio/radio_rfm69.py b/pi_radio/radio_rfm69.py
index b9f02b25..8da4e7b6 100644
--- a/pi_radio/radio_rfm69.py
+++ b/pi_radio/radio_rfm69.py
@@ -1,16 +1,19 @@
 """
-Demo of using the RFM69HCW Radio with Raspberry Pi.
+Example for using the RFM69HCW Radio with Raspberry Pi.
 
+Learn Guide: https://learn.adafruit.com/lora-and-lorawan-for-raspberry-pi
 Author: Brent Rubell for Adafruit Industries
 """
+# Import Python System Libraries
 import time
+# Import Blinka Libraries
 import busio
 from digitalio import DigitalInOut, Direction, Pull
 import board
-# Import the RFM69 radio module.
-import adafruit_rfm69
 # Import the SSD1306 module.
 import adafruit_ssd1306
+# Import the RFM69 radio module.
+import adafruit_rfm69
 
 # Button A
 btnA = DigitalInOut(board.D5)
@@ -22,6 +25,11 @@ btnB = DigitalInOut(board.D6)
 btnB.direction = Direction.INPUT
 btnB.pull = Pull.UP
 
+# Button C
+btnC = DigitalInOut(board.D12)
+btnC.direction = Direction.INPUT
+btnC.pull = Pull.UP
+
 # Create the I2C interface.
 i2c = busio.I2C(board.SCL, board.SDA)
 
@@ -38,13 +46,10 @@ CS = DigitalInOut(board.CE1)
 RESET = DigitalInOut(board.D25)
 spi = busio.SPI(board.SCK, MOSI=board.MOSI, MISO=board.MISO)
 rfm69 = adafruit_rfm69.RFM69(spi, CS, RESET, 915.0)
-
+prev_packet = None
 # Optionally set an encryption key (16 byte AES key). MUST match both
 # on the transmitter and receiver (or be set to None to disable/the default).
 rfm69.encryption_key = b'\x01\x02\x03\x04\x05\x06\x07\x08\x01\x02\x03\x04\x05\x06\x07\x08'
-# Data to send
-packet_data = bytes('Hello Feather!\r\n',"utf-8")
-prev_packet = None
 
 while True:
     packet = None
@@ -54,41 +59,36 @@ while True:
 
     # check for packet rx
     packet = rfm69.receive()
-    print(packet)
     if packet is None:
         display.show()
-        display.text('- Waiting for PKT -', 0, 20, 1)
+        display.text('- Waiting for PKT -', 15, 20, 1)
     else:
         # Display the packet text and rssi
         display.fill(0)
         prev_packet = packet
-        packet_text = str(prev_packet, 'ascii')
+        packet_text = str(prev_packet, "utf-8")
         display.text('RX: ', 0, 0, 1)
         display.text(packet_text, 25, 0, 1)
-        display.text('RSSI: ', 0, 20, 1)
-        display.text(str(rfm69.rssi), 35, 20, 1)
-        time.sleep(2)
+        time.sleep(1)
 
     if not btnA.value:
-        # Send Packet
-        rfm69.send(packet_data)
+        # Send Button A
         display.fill(0)
-        display.text('Sent Packet', 0, 25, 1)
-        display.show()
-        time.sleep(0.2)
+        button_a_data = bytes("Button A!\r\n","utf-8")
+        rfm69.send(button_a_data)
+        display.text('Sent Button A!', 25, 15, 1)
     elif not btnB.value:
-        # Display the previous packet text and rssi
+        # Send Button B
         display.fill(0)
-        if prev_packet is not None:
-            packet_text = str(prev_packet, 'ascii')
-            display.text('RX: ', 0, 0, 1)
-            display.text(packet_text, 25, 0, 1)
-            display.text('RSSI: ', 0, 20, 1)
-            display.text(str(rfm69.rssi), 35, 20, 1)
-        else:
-            display.text('No Pkt RCVd', 0, 16, 1)
-        display.show()
-        time.sleep(2)
+        button_b_data = bytes("Button B!\r\n","utf-8")
+        rfm69.send(button_b_data)
+        display.text('Sent Button B!', 25, 15, 1)
+    elif not btnC.value:
+        # Send Button C
+        display.fill(0)
+        button_c_data = bytes("Button C!\r\n","utf-8")
+        rfm69.send(button_c_data)
+        display.text('Sent Button C!', 25, 15, 1)
 
     display.show()
     time.sleep(0.1)
diff --git a/pi_radio/radio_rfm9x.py b/pi_radio/radio_rfm9x.py
index a5262bef..c4918999 100755
--- a/pi_radio/radio_rfm9x.py
+++ b/pi_radio/radio_rfm9x.py
@@ -64,7 +64,7 @@ while True:
         # Display the packet text and rssi
         display.fill(0)
         prev_packet = packet
-        packet_text = str(prev_packet, 'ascii')
+        packet_text = str(prev_packet, "utf-8")
         display.text('RX: ', 0, 0, 1)
         display.text(packet_text, 25, 0, 1)
         time.sleep(1)