Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: GlasgowEmbedded/glasgow
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6aa032a74bdb
Choose a base ref
...
head repository: GlasgowEmbedded/glasgow
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 509052b0851a
Choose a head ref
  • 2 commits
  • 6 files changed
  • 1 contributor

Commits on Nov 18, 2019

  1. applet.program.{nrf24l→nrf24lx1} 

    It's a bit ambiguous to have both radio.nrf24l and program.nrf24l,
so let's do radio.nrf24l01 and program.nrf24lx1.
    @whitequark
    whitequark committed Nov 18, 2019
    Copy the full SHA
    067723e View commit details

  2. applet.radio.nrf24l01: new applet.

    @whitequark
    whitequark committed Nov 18, 2019
    Copy the full SHA
    509052b View commit details
4 changes: 3 additions & 1 deletion software/glasgow/applet/all.py
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
from .program.ice40_flash import ProgramICE40FlashApplet
from .program.ice40_sram import ProgramICE40SRAMApplet
from .program.mec16xx import ProgramMEC16xxApplet
from .program.nrf24l import ProgramNRF24LApplet
from .program.nrf24lx1 import ProgramNRF24Lx1Applet
from .program.xc6s import ProgramXC6SApplet
from .program.xc9500xl import ProgramXC9500XLApplet

@@ -45,3 +45,5 @@
from .video.vga_output import VGAOutputApplet
from .video.vga_terminal import VGATerminalApplet
from .video.ws2812_output import VideoWS2812OutputApplet

from .radio.nrf24l01 import RadioNRF24L01Applet
2 changes: 1 addition & 1 deletion software/glasgow/applet/audio/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -3,5 +3,5 @@
transfers of 1d arrays of samples of pressure wave properties.
Examples: I²S, sigma-delta audio frequency DAC.
Counterexamples: software-defined radio DAC (use taxon ``stream``).
Counterexamples: software-defined radio DAC (use taxon ``radio``).
"""
98 changes: 49 additions & 49 deletions ...glasgow/applet/program/nrf24l/__init__.py → ...asgow/applet/program/nrf24lx1/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
from ... import *


class ProgramNRF24LError(GlasgowAppletError):
class ProgramNRF24Lx1Error(GlasgowAppletError):
pass


@@ -38,7 +38,7 @@ class ProgramNRF24LError(GlasgowAppletError):
FSR_BIT_RDISMB = 0b00000100


class ProgramNRF24LInterface:
class ProgramNRF24Lx1Interface:
def __init__(self, interface, logger, device, addr_dut_prog, addr_dut_reset):
self.lower = interface
self._logger = logger
@@ -48,7 +48,7 @@ def __init__(self, interface, logger, device, addr_dut_prog, addr_dut_reset):
self._addr_dut_reset = addr_dut_reset

def _log(self, message, *args):
self._logger.log(self._level, "NRF24L: " + message, *args)
self._logger.log(self._level, "nRF24LX1: " + message, *args)

async def _reset(self):
await self._device.write_register(self._addr_dut_reset, 1)
@@ -129,7 +129,7 @@ async def enable_debug(self):
await self._command(0x86)


class ProgramNRF24LApplet(GlasgowApplet, name="program-nrf24l"):
class ProgramNRF24Lx1Applet(GlasgowApplet, name="program-nrf24lx1"):
logger = logging.getLogger(__name__)
help = "program nRF24LE1 RF microcontrollers"
description = """
@@ -184,9 +184,9 @@ def build(self, target, args):
async def run(self, device, args):
iface = await device.demultiplexer.claim_interface(self, self.mux_interface, args)
spi_iface = SPIMasterInterface(iface, self.logger)
nrf24l_iface = ProgramNRF24LInterface(spi_iface, self.logger, device,
self.__addr_dut_prog, self.__addr_dut_reset)
return nrf24l_iface
nrf24lx1_iface = ProgramNRF24Lx1Interface(spi_iface, self.logger, device,
self.__addr_dut_prog, self.__addr_dut_reset)
return nrf24lx1_iface

@classmethod
def add_interact_arguments(cls, parser):
@@ -220,25 +220,25 @@ def add_interact_arguments(cls, parser):
p_enable_debug = p_operation.add_parser(
"enable-debug", help="enable MCU hardare debugging features")

async def interact(self, device, args, nrf24l_iface):
async def interact(self, device, args, nrf24lx1_iface):
memory_map = _nrf24le1_map
page_size = 512

try:
await nrf24l_iface.reset_program()
await nrf24lx1_iface.reset_program()

async def check_info_page(address):
old_status = await nrf24l_iface.read_status()
old_status = await nrf24lx1_iface.read_status()
try:
await nrf24l_iface.write_status(FSR_BIT_INFEN)
fuse, = await nrf24l_iface.read(address, 1)
await nrf24lx1_iface.write_status(FSR_BIT_INFEN)
fuse, = await nrf24lx1_iface.read(address, 1)
return fuse != 0xff
finally:
await nrf24l_iface.write_status(old_status)
await nrf24lx1_iface.write_status(old_status)

async def check_read_protected():
if await check_info_page(0x23):
raise ProgramNRF24LError("MCU is read protected; run `erase --info-page`")
raise ProgramNRF24Lx1Error("MCU is read protected; run `erase --info-page`")

if args.operation == "read":
await check_read_protected()
@@ -247,11 +247,11 @@ async def check_read_protected():
for memory_area in memory_map:
self.logger.info("reading %s memory", memory_area.name)
if memory_area.spi_addr & 0x10000:
await nrf24l_iface.write_status(FSR_BIT_INFEN)
await nrf24lx1_iface.write_status(FSR_BIT_INFEN)
else:
await nrf24l_iface.write_status(0)
area_data = await nrf24l_iface.read(memory_area.spi_addr & 0xffff,
memory_area.size)
await nrf24lx1_iface.write_status(0)
area_data = await nrf24lx1_iface.read(memory_area.spi_addr & 0xffff,
memory_area.size)
chunks.append((memory_area.mem_addr, area_data))
output_data(args.file, chunks, fmt="ihex")

@@ -266,16 +266,16 @@ async def check_read_protected():
if len(chunk_data) == 0:
continue
if chunk_mem_addr < memory_area.mem_addr:
raise ProgramNRF24LError("data outside of memory map at {:#06x}"
raise ProgramNRF24Lx1Error("data outside of memory map at {:#06x}"
.format(chunk_mem_addr))
while chunk_mem_addr >= memory_area.mem_addr + memory_area.size:
area_index += 1
if area_index >= len(memory_area):
raise ProgramNRF24LError("data outside of memory map at {:#06x}"
raise ProgramNRF24Lx1Error("data outside of memory map at {:#06x}"
.format(chunk_mem_addr))
memory_area = memory_map[area_index]
if chunk_mem_addr + len(chunk_data) > memory_area.mem_addr + memory_area.size:
raise ProgramNRF24LError("data outside of memory map at {:#06x}"
raise ProgramNRF24Lx1Error("data outside of memory map at {:#06x}"
.format(memory_area.mem_addr + memory_area.size))
if memory_area.spi_addr & 0x10000 and not args.info_page:
self.logger.warn("data provided for info page, but info page programming "
@@ -287,10 +287,10 @@ async def check_read_protected():
+ memory_area.spi_addr) & 0xffff
if memory_area.spi_addr & 0x10000:
level = logging.WARN
await nrf24l_iface.write_status(FSR_BIT_INFEN)
await nrf24lx1_iface.write_status(FSR_BIT_INFEN)
else:
level = logging.INFO
await nrf24l_iface.write_status(0)
await nrf24lx1_iface.write_status(0)

overwrite_pages = set(range(
(chunk_spi_addr // page_size),
@@ -300,43 +300,43 @@ async def check_read_protected():
self.logger.log(level, "erasing %s memory at %#06x+%#06x",
memory_area.name, chunk_mem_addr, len(chunk_data))
for page in need_erase_pages:
await nrf24l_iface.write_enable()
await nrf24l_iface.erase_page(page)
await nrf24l_iface.wait_status()
await nrf24lx1_iface.write_enable()
await nrf24lx1_iface.erase_page(page)
await nrf24lx1_iface.wait_status()
erased_pages.update(need_erase_pages)

self.logger.log(level, "programming %s memory at %#06x+%#06x",
memory_area.name, chunk_mem_addr, len(chunk_data))
while len(chunk_data) > 0:
await nrf24l_iface.write_enable()
await nrf24l_iface.program(chunk_spi_addr, chunk_data[:page_size])
await nrf24l_iface.wait_status()
await nrf24lx1_iface.write_enable()
await nrf24lx1_iface.program(chunk_spi_addr, chunk_data[:page_size])
await nrf24lx1_iface.wait_status()
chunk_data = chunk_data[page_size:]
chunk_spi_addr += page_size

if args.operation == "erase":
if args.info_page:
await nrf24l_iface.write_status(FSR_BIT_INFEN)
info_page = await nrf24l_iface.read(0x0000, 0x0100)
await nrf24lx1_iface.write_status(FSR_BIT_INFEN)
info_page = await nrf24lx1_iface.read(0x0000, 0x0100)
self.logger.warn("backing up info page to %s", args.info_page)
if os.path.isfile(args.info_page):
raise ProgramNRF24LError("info page backup file already exists")
raise ProgramNRF24Lx1Error("info page backup file already exists")
with open(args.info_page, "wb") as f:
output_data(f, [(0x10000, info_page)])
self.logger.warn("erasing code and data memory, and info page")
else:
await check_read_protected()
await nrf24l_iface.write_status(0)
await nrf24lx1_iface.write_status(0)
self.logger.info("erasing code and data memory")
try:
await nrf24l_iface.write_enable()
await nrf24l_iface.erase_all()
await nrf24l_iface.wait_status()
await nrf24lx1_iface.write_enable()
await nrf24lx1_iface.erase_all()
await nrf24lx1_iface.wait_status()
if args.info_page:
self.logger.info("restoring info page DSYS area")
await nrf24l_iface.write_enable()
await nrf24l_iface.program(0, info_page[:32]) # DSYS only
await nrf24l_iface.wait_status()
await nrf24lx1_iface.write_enable()
await nrf24lx1_iface.program(0, info_page[:32]) # DSYS only
await nrf24lx1_iface.wait_status()
except:
if args.info_page:
self.logger.error("IMPORTANT: programming failed; restore DSYS manually "
@@ -346,28 +346,28 @@ async def check_read_protected():

if args.operation == "protect-read":
if await check_info_page(0x23):
raise ProgramNRF24LError("memory read protection is already enabled")
raise ProgramNRF24Lx1Error("memory read protection is already enabled")

self.logger.warn("protecting code and data memory from reads")
await nrf24l_iface.write_enable()
await nrf24l_iface.disable_read()
await nrf24l_iface.wait_status()
await nrf24lx1_iface.write_enable()
await nrf24lx1_iface.disable_read()
await nrf24lx1_iface.wait_status()

if args.operation == "enable-debug":
if await check_info_page(0x24):
raise ProgramNRF24LError("hardware debugging features already enabled")
raise ProgramNRF24Lx1Error("hardware debugging features already enabled")

self.logger.info("enabling hardware debugging features")
await nrf24l_iface.write_enable()
await nrf24l_iface.enable_debug()
await nrf24l_iface.wait_status()
await nrf24lx1_iface.write_enable()
await nrf24lx1_iface.enable_debug()
await nrf24lx1_iface.wait_status()

finally:
await nrf24l_iface.reset_application()
await nrf24lx1_iface.reset_application()

# -------------------------------------------------------------------------------------------------

class ProgramNRF24LAppletTestCase(GlasgowAppletTestCase, applet=ProgramNRF24LApplet):
class ProgramNRF24Lx1AppletTestCase(GlasgowAppletTestCase, applet=ProgramNRF24Lx1Applet):
@synthesis_test
def test_build(self):
self.assertBuilds()
7 changes: 7 additions & 0 deletions software/glasgow/applet/radio/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
"""
The ``radio`` taxon groups applets implementing radio interfaces, that is, interfaces for
intentional transmitters and receivers in radio-frequency spectrum.
Examples: DAC with a radio frontend, GFSK PHY.
Counterexamples: VGA output (use taxon ``video``).
"""
Loading