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: whitequark/glasgow
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a7b44b87b8b0
Choose a base ref
...
head repository: whitequark/glasgow
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 98ec8857a692
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Feb 5, 2019

  1. applet.vga_terminal: mark as preview quality.

    @whitequark
    whitequark committed Feb 5, 2019
    Copy the full SHA
    e7ba354 View commit details

Commits on Feb 6, 2019

  1. applet.spi_flash_25c: add typical pinout.

    @whitequark
    whitequark committed Feb 6, 2019
    Copy the full SHA
    f8e0881 View commit details

  2. applet.spi_flash_25c: fix CLI glitch in read progress meter.

    @whitequark
    whitequark committed Feb 6, 2019
    Copy the full SHA
    98ec885 View commit details
Showing with 7 additions and 0 deletions.
  1. +6 −0 software/glasgow/applet/spi_flash_25c/__init__.py
  2. +1 −0 software/glasgow/applet/vga_terminal/__init__.py
6 changes: 6 additions & 0 deletions software/glasgow/applet/spi_flash_25c/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -82,6 +82,7 @@ async def _read_command(self, address, length, chunk_size, cmd, dummy=0,
data += chunk
address += len(chunk)

callback(len(data), length, None)
return data

async def read(self, address, length, chunk_size=None,
@@ -203,6 +204,11 @@ class SPIFlash25CApplet(SPIMasterApplet, name="spi-flash-25c"):
When using this applet for erasing or programming, it is necessary to look up the page
and sector sizes in the memory datasheet.
The pinout of a typical 25C Flash IC is as follows:
* 8-pin: SS#=1 MISO=2 MOSI=5 SCK=6 HOLD#=7 VCC=8 GND=4
* 16-pin: SS#=7 MISO=8 MOSI=15 SCK=16 HOLD#=1 VCC=2 GND=10
"""

@classmethod
1 change: 1 addition & 0 deletions software/glasgow/applet/vga_terminal/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -202,6 +202,7 @@ def __init__(self, vga, h_active, v_active, font_data, font_width, font_height,


class VGATerminalApplet(VGAOutputApplet, name="vga-terminal"):
preview = True
logger = logging.getLogger(__name__)
help = "emulate a teleprinter using a VGA monitor"
description = """