From f2c7bb5879ba22df05fd1e39f01ea692313306fd Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Tue, 10 Jan 2017 17:15:24 +0000 Subject: [PATCH] altos/chaoskey: Add a metainfo for the ChaosKey This provides the information necessary to reflash chaoskey using standard Linux device firmware tooling. --- configure.ac | 4 + src/chaoskey-v1.0/.gitignore | 1 + src/chaoskey-v1.0/Makefile | 12 + src/chaoskey-v1.0/chaoskey-connector.svg | 274 ++++++++++++++++++ .../org.altusmetrum.ChaosKey.metainfo.xml.in | 46 +++ 5 files changed, 337 insertions(+) create mode 100644 src/chaoskey-v1.0/chaoskey-connector.svg create mode 100644 src/chaoskey-v1.0/org.altusmetrum.ChaosKey.metainfo.xml.in diff --git a/configure.ac b/configure.ac index 0fc946f2..a125033e 100644 --- a/configure.ac +++ b/configure.ac @@ -24,6 +24,9 @@ AC_CONFIG_SRCDIR([src/kernel/ao.h]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +RELEASE_DATE=2017-01-10 +AC_SUBST(RELEASE_DATE) + VERSION_DASH=`echo $VERSION | sed 's/\./-/g'` AC_SUBST(VERSION_DASH) AC_SUBST(ANDROID_VERSION) @@ -515,6 +518,7 @@ AM_CONDITIONAL([INSTALL_SHARED_MIME_INFO], [test x$INSTALL_SHARED_MIME_INFO = xy AC_OUTPUT([ Makefile src/Makedefs +src/chaoskey-v1.0/org.altusmetrum.ChaosKey.metainfo.xml altoslib/Makefile altoslib/AltosVersion.java icon/Makefile diff --git a/src/chaoskey-v1.0/.gitignore b/src/chaoskey-v1.0/.gitignore index b0adba26..9fd59154 100644 --- a/src/chaoskey-v1.0/.gitignore +++ b/src/chaoskey-v1.0/.gitignore @@ -1,2 +1,3 @@ ao_product.h chaoskey-* +*.cab diff --git a/src/chaoskey-v1.0/Makefile b/src/chaoskey-v1.0/Makefile index d9944a12..f6b78d07 100644 --- a/src/chaoskey-v1.0/Makefile +++ b/src/chaoskey-v1.0/Makefile @@ -38,6 +38,8 @@ ALTOS_SRC = \ ao_gpio.c \ ao_product.c +VENDOR=AltusMetrum +PROJECT_NAME=ChaosKey PRODUCT=ChaosKey-hw-1.0-sw-$(VERSION) PRODUCT_DEF=-DCHAOSKEY_V_1_0 IDVENDOR=0x1d50 @@ -48,6 +50,7 @@ CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) -g -Os PROGNAME=chaoskey-v1.0 PROG=$(PROGNAME)-$(VERSION).elf HEX=$(PROGNAME)-$(VERSION).ihx +METAINFO=org.altusmetrum.ChaosKey.metainfo.xml SRC=$(ALTOS_SRC) ao_chaoskey.c OBJ=$(SRC:.c=.o) @@ -62,11 +65,20 @@ ao_product.h: ao-make-product.5c ../Version $(OBJ): $(INC) +%.cab: $(PROG) $(HEX) $(METAINFO) + gcab --create --nopath $@ $(PROG) $(HEX) $(METAINFO) + +cab: $(VENDOR)-$(PROJECT_NAME)-$(VERSION).cab + +check: $(METAINFO) + appstream-util validate-relax $(METAINFO) + distclean: clean clean: rm -f *.o $(PROGNAME)-*.elf $(PROGNAME)-*.ihx rm -f ao_product.h + rm -f *.cab install: diff --git a/src/chaoskey-v1.0/chaoskey-connector.svg b/src/chaoskey-v1.0/chaoskey-connector.svg new file mode 100644 index 00000000..671a46bd --- /dev/null +++ b/src/chaoskey-v1.0/chaoskey-connector.svg @@ -0,0 +1,274 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/chaoskey-v1.0/org.altusmetrum.ChaosKey.metainfo.xml.in b/src/chaoskey-v1.0/org.altusmetrum.ChaosKey.metainfo.xml.in new file mode 100644 index 00000000..6e391878 --- /dev/null +++ b/src/chaoskey-v1.0/org.altusmetrum.ChaosKey.metainfo.xml.in @@ -0,0 +1,46 @@ + + + + org.altusmetrum.ChaosKey.firmware + ChaosKey + Firmware for the Altus Metrum ChaosKey + +

+ Updating the firmware on your ChaosKey device improves performance and adds + new features. +

+
+ + + b62500d7-c981-595b-a798-eb6cf4d4942b + + https://chaoskey.org/ + CC-BY-4.0 + GPL-2.0 + AltusMetrum + + + + +

+ FIXME before release. +

+
+
+ + + +

+ Change the ADC clock speed to eliminate sampling problems which + cleans up the chaoskey raw data. +

+
+
+
+ + + https://chaoskey.org/chaoskey-connector.svg + Remove the plastic cover, then connect pins 1 and 5 whilst inserting into a USB socket. + + +
-- 2.30.2