From 2d267dead904eab72f36fa2063b9ae262f301a11 Mon Sep 17 00:00:00 2001
From: Michael Ossmann <mike@ossmann.com>
Date: Wed, 26 Jun 2024 11:42:54 -0400
Subject: [PATCH] Update changelog for release 1.0.4

---
 CHANGELOG.md | 60 +++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 50 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c36b4c2..2891071 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,32 +6,72 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
-## [Unreleased]
+## [1.0.4] - 2024-06-26
+
+### Added
+
+- Show both serial number and flash UID in `apollo info` and `apollo
+  flash-info`.
+- Add changelog.
+- Add command `apollo flash --fast`.
+- Add support for Raspberry Pi Pico RP2040.
+- Add support for hardware revision detection on Cynthion >=r0.6.
+
 ### Changed
-- Hold Sideband PHY RESET low on older Cynthions
-- Bumped USB API to 1.1
+
+- Do not trigger reconfiguration after `apollo flash --fast`.
+- Select USB string descriptors at run time.
+- Avoid automatic FPGA takeover for info commands.
+- Generate rising edges instead of UART output in ApolloAdvertiser.
+- Use weak functions for default firmware behavior.
+
+### Deprecated
+
+- Deprecate command `apollo flash-fast`.
+
 ### Fixed
-- fix `fpga_requesting_port()` glitch
-- Correct Base32 representation of serial number
+
+- Update incorrect or confusing usage of "LUNA".
+
+
+## [1.0.3] - 2024-05-29
+
+### Changed
+
+- Bump USB API to 1.1.
+
+### Fixed
+
+- Hold Sideband PHY RESET low on older Cynthions, fixing Sideband port usage
+  for hardware revision r0.3 through r0.5.
+- Fix `fpga_requesting_port()` indication glitch at start-up.
+- Correct Base32 representation of serial number.
 
 
 ## [1.0.2] - 2024-05-22
+
 ### Changed
-- firmware.fpga_adv: replace UART reception with edge counter
+
+- Replace advertisement UART reception with edge counter in firmware.
 
 
 ## [1.0.1] - 2024-05-21
+
 ### Fixed
-- Fix handing off USB port to Apollo under Windows
-- Allow FPGA USB by default
+
+- Fix handing off USB port to Apollo under Windows.
+- Allow FPGA USB by default.
 
 
 ## [1.0.0] - 2024-05-18
+
 ### Added
-- Initial release
+
+- Initial release.
 
 
-[Unreleased]: https://github.com/greatscottgadgets/apollo/compare/v1.0.2...HEAD
+[1.0.4]: https://github.com/greatscottgadgets/apollo/compare/v1.0.3...v1.0.4
+[1.0.3]: https://github.com/greatscottgadgets/apollo/compare/v1.0.2...v1.0.3
 [1.0.2]: https://github.com/greatscottgadgets/apollo/compare/v1.0.1...v1.0.2
 [1.0.1]: https://github.com/greatscottgadgets/apollo/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/greatscottgadgets/apollo/releases/tag/v1.0.0