1
0
Fork 0
Commit graph

42 commits

Author SHA1 Message Date
Francesco Gazzetta
a0a36e9225 Use python -m to run pytest
Not every distro calls it `pytest-3`.
By using `$(PYTHON) -m` we ensure it's coherent with the python install

Signed-off-by: Francesco Gazzetta <fgaz@fgaz.me>
2023-06-21 19:14:46 +01:00
Francesco Gazzetta
4aeebb4071 Makefile: use CURDIR instead of PWD
https://stackoverflow.com/questions/52437728/bash-what-is-the-difference-between-pwd-and-curdir

Signed-off-by: Francesco Gazzetta <fgaz@fgaz.me>
2023-03-23 08:34:00 +00:00
Adam Blair
e494eab608 Wasp A La carte
Configure wasp using a central toml file

Signed-off-by: Adam Blair <adampblair@protonmail.com>
2023-03-19 15:17:18 +00:00
Francesco Gazzetta
01c173927e Add make and CI rules for building apps .mpy files
Signed-off-by: Francesco Gazzetta <fgaz@fgaz.me>
2022-01-10 22:35:04 +00:00
Daniel Thompson
0d385b8dc5 Makefile: Create .zip distributions as well as a tarball
Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>
2021-06-03 19:56:28 +01:00
Daniel Thompson
2bb5ae3a89 Makefile: Allow specific tests to be run
Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>
2020-12-04 20:31:14 +00:00
Daniel Thompson
f1f5cc9e0c simulator: Introduce fully automatic testint
Currently the tests do little more than fire up the simulator and
switch into (and out of) the built in applications. However this is
useful and allows us to fully integrate as a CI job.

Unfortunately the numpy warning from pysdl2 mean we have been forced
to disable all warnings to prevent pytest from collecting and reporting
them.

Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>
2020-12-04 20:11:41 +00:00
Daniel Thompson
12ba849b15 Merge branch 'master' of https://github.com/daniel-thompson/wasp-os 2020-11-07 09:30:20 +00:00
Daniel Thompson
a4e0fdf24e reloader: Add support for newer PineTime factory firmware
Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>
2020-11-07 09:30:15 +00:00
Daniel Thompson
a851015cea Makefile: Avoid grabbing lots of pointless submodules
Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>
2020-11-06 21:38:58 +00:00
Daniel Thompson
01ac0d93c3 Makefile: Remove one of the lists of watch models
Takes us down from three to two... getting better!

Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>
2020-08-21 21:24:42 +01:00
Daniel Thompson
bd806effc3 Makefile: Add a dist rule to generate binary releases
Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>
2020-08-21 21:12:26 +01:00
Daniel Thompson
28961f1a54 Makefile: Fix the BOARDless targets
Currently boardless targets including softdevice, sudmodules and sim
cannot be run unless a dummy value of BOARD is supplied. Fix this by
distinguishing between conditional and unconditional expansions of the
BOARD variable.

Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>
2020-08-15 20:45:18 +01:00
Daniel Thompson
5c30b2e0f0 Makefile: Seperate the builds by board
wasp-os is starting to developer proper support for multiple boards
(currently other boards such as nitrogen and ds-d6 test builds and
proof-of-concept stuff) then we need to start placing binaries for each
device into seperate directories (other wise creating a binary distro
won't work).

Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>
2020-08-02 12:12:37 +01:00
Daniel Thompson
58fb5d630b Makefile: Clean up empty redirected file on failure
If the preprocessor fails for any reason then an empty or partially
processed watch.py file is created which will satisfy the dependency
checks in any later invocation of make which can silently break the
build. Cleaning up on failure prevents this from happening.

Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>
2020-08-02 12:10:47 +01:00
Daniel Thompson
a9ca9cfe13 Makefile: Allow installation via DaFlasher
Generate a .zip file that works with SoftDevice 2.0.1 (still looking
for the recipe that works with 5.0), fix up the bootloader to work with
DaFlasher and add an extra feature in micropython to cope better.

Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>
2020-07-26 21:03:30 +01:00
Daniel Thompson
eac72188cf simulator: Provide a special main.py for the simulator
Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>
2020-07-07 21:22:12 +01:00
Daniel Thompson
adcc67cd61 Makefile: Fix builds when watch.py must be regenerated
The paths passed to the preprocessor are currently wrong. Fix them!

Fixes: 64afca1 ("Makefile: fix make sim (allow BOARD to be unset)")
Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>
2020-06-23 09:43:58 +01:00
Daniel Thompson
64afca1276 Makefile: Fix make sim (allow BOARD to be unset)
Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>
2020-06-20 20:14:56 +01:00
Steveis
9eb9b74d45 Update preprocess to use $(BOARD)
The preprocess to create watch.py was hard coded for PineTime so changed to $(BOARD)
This will be required for other watches like the P8

Signed-off-by: Steve Amor <steveamor@users.noreply.github.com>
2020-06-17 18:56:20 +01:00
Daniel Thompson
7cb9f4f2eb Makefile: Delete stale bootloader binaries
Currently when the the bootloader is modified if fails to build because
the wildcard in the hex merge picks up both the old and new binaries.
Fix this by explicitly deleting the old one.

Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>
2020-06-11 21:46:04 +01:00
Daniel Thompson
ccaf12750b wasp: apps: Step counter application
Currently there's no fancy algorithms to estimate stride length. Just
pure simple step counting directly from the hardware's "intelligence
engine".

Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>
2020-06-09 21:31:55 +01:00
Daniel Thompson
a2fd52ef2b docs: Introduce the Application Writer's Guide. 2020-05-11 21:44:30 +01:00
Daniel Thompson
945546a804 reloader: Integrate into the main build system 2020-05-09 14:09:28 +01:00
Daniel Thompson
59ae03fc67 Makefile: Match command line arguments with latest version of pyOCD 2020-05-09 14:07:32 +01:00
Daniel Thompson
dc4ea4ab62 reloader: OTA flashing tool for wasp-os 2020-04-26 19:21:28 +01:00
Daniel Thompson
50ecff29ef wasp: Automatically generate watch.py for PineTime
This should ensure that main.py is always up to date.
2020-04-11 21:12:18 +01:00
Daniel Thompson
1bfe748505 docs: Add .nojeykyll for better github compatiblity 2020-02-24 08:53:44 +00:00
Daniel Thompson
27e35527ff docs: Use sphinx to gather together all the wasp docs 2020-02-22 21:17:30 +00:00
Daniel Thompson
7734566fbe micropython: Enable filesystem support 2020-02-09 19:47:57 +00:00
Daniel Thompson
a70f82cf74 Makefile: Allow BOARD to come from the environment 2020-02-01 13:40:19 +00:00
Daniel Thompson
262d93c76c wasp: simulator: First steps towards a simulator
Currently this just traces SPI activity from the ST7789 driver but its
a good baseline to start building up test functions from.
2020-01-31 19:36:55 +00:00
Daniel Thompson
0acbcc415b wasp: Reorganise the board support 2020-01-30 22:11:31 +00:00
Daniel Thompson
ef5d805c51 Makefile: Forcible remove frozen content
The micropython build system has incomplete dependancy tracking, especially
with regard to frozen manifests. Work round this by nuking the frozen
content before attempting a build. Sure this is a hack... but much
better than developing a "make clean; make all" habit.
2020-01-30 21:45:35 +00:00
Daniel Thompson
0016ad4be7 Makefile: Shortcut to help update the bootloader using BMP 2020-01-28 21:25:17 +00:00
Daniel Thompson
0917d5135d Makefile: Switch to FROZEN_MANIFEST
This not only avoids the use of a deprecated feature but it also
makes it easier to decouple the wasp/ directory structure from
what actually gets copied to the target.
2020-01-28 18:45:27 +00:00
Daniel Thompson
2805a719f2 wasp: st7789: Add a simple proof-of-concept display driver 2020-01-21 22:10:50 +00:00
Daniel Thompson
cd1063426e Makefile: Switch to pyocd for flashing
Using the mass storage device mode on Nitrogen leaves the board in an
odd state where the bootloader cannot properly load the payload.
2020-01-20 08:09:28 +00:00
Daniel Thompson
64f1015a8d Makefile: Add shortcut to download the softdevice binary 2020-01-20 08:09:28 +00:00
Daniel Thompson
5b016dcb4e Makefile: Try an experimental bootloader dist package
This doesn't work for OTA at present.
2020-01-20 08:09:28 +00:00
Daniel Thompson
6e9cff06d5 Makefile: Get user to supply BOARD= and job count 2020-01-20 08:09:28 +00:00
Daniel Thompson
88e736c9e9 Initial revision
This is a just a rather hacky combined build environment.
2020-01-14 21:32:59 +00:00