Skip to content

Commit

Permalink
Prep for v0.7.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Gadgetoid committed Jan 27, 2022
1 parent 6036361 commit e62c711
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
if: runner.os == 'Linux'
run: |
sudo apt update && sudo apt install ${{matrix.apt-packages}}
- uses: actions/checkout@v2
- name: Grab the SDK
uses: actions/checkout@v2
Expand Down Expand Up @@ -58,4 +58,4 @@ jobs:
run: |
ccache --zero-stats || true
cmake --build . --config $BUILD_TYPE -j 2
ccache --show-stats || true
ccache --show-stats || true
7 changes: 6 additions & 1 deletion src/CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
0.7.2
-----

* Add reloc support for ITCM RAM - thanks @Daft-Freak

0.7.1
-----

Expand All @@ -14,7 +19,7 @@

* Reworked Tiled maps support (requires updated SDK) - thanks @Daft-Freak
* Metadata CMake tool now escapes quotes - thanks @Daft-Freak
* New project setup tool "32blit setup" for downloading/configuring a boilerplate project - thanks @DaftFreak
* New project setup tool "32blit setup" for downloading/configuring a boilerplate project - thanks @Daft-Freak
* Fixed asset builder throwing a cryptic error if no valid input files were found

0.6.1
Expand Down
26 changes: 25 additions & 1 deletion src/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# 32blit Tools

[![Build Status](https://shields.io/github/workflow/status/32blit/32blit-tools/Python%20Tests.svg)](https://github.com/32blit/32blit-tools/actions/workflows/test.yml)
[![Coverage Status](https://coveralls.io/repos/github/pimoroni/32blit-tools/badge.svg?branch=master)](https://coveralls.io/github/pimoroni/32blit-tools?branch=master)
[![Coverage Status](https://coveralls.io/repos/github/32blit/32blit-tools/badge.svg?branch=master)](https://coveralls.io/github/32blit/32blit-tools?branch=master)
[![PyPi Package](https://img.shields.io/pypi/v/32blit.svg)](https://pypi.python.org/pypi/32blit)
[![Python Versions](https://img.shields.io/pypi/pyversions/32blit.svg)](https://pypi.python.org/pypi/32blit)

Expand Down Expand Up @@ -118,6 +118,30 @@ Supported formats:

# Changelog

0.7.2
-----

* Add reloc support for ITCM RAM - thanks @Daft-Freak

0.7.1
-----

* Added DFU tool
* Filename now shown when flashing
* Remove unecessary reset-to-firmware code
* Fixed GIMP palette handling
* Support for more image font layouts (multiple row support)
* Make freetype a soft dependency when processing font data
* Misc small tweaks & tidyup

0.7.0
-----

* Reworked Tiled maps support (requires updated SDK) - thanks @Daft-Freak
* Metadata CMake tool now escapes quotes - thanks @Daft-Freak
* New project setup tool "32blit setup" for downloading/configuring a boilerplate project - thanks @Daft-Freak
* Fixed asset builder throwing a cryptic error if no valid input files were found

0.6.1
-----

Expand Down
2 changes: 1 addition & 1 deletion src/setup.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
[metadata]
name = 32blit
version = 0.7.1
version = 0.7.2
author = Philip Howard
author_email = phil@pimoroni.com
description = 32Blit asset preparation and upload tools
Expand Down
2 changes: 1 addition & 1 deletion src/ttblit/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

__version__ = '0.7.1'
__version__ = '0.7.2'

import logging

Expand Down
2 changes: 1 addition & 1 deletion src/ttblit/tool/relocs.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def relocs_cli(bin_file, elf_file, output):
# check for the address where we expect it
# (ldr.w pc, [pc] followed by the address)
ex_addr, = struct.unpack('<I', itcm_section_data[itcm_offset + 4:itcm_offset + 8])

assert ex_addr == target_addr

reloc_offsets.append(flash_offset + 4)
Expand Down

0 comments on commit e62c711

Please sign in to comment.