examples: Move in RIOT/applications by chrysn · Pull Request #18602 · RIOT-OS/RIOT

chrysn · 2022-09-16T09:49:59Z

Contribution description

The RIOT-OS/applications repository is sitting very unnoticed, with few changes. It would be nice if we could claim that these are because RIOT is so stable, but build failures when updating RIOT show that we do have API changes every now and then.

These would be handled much more easily if we just had the applications here as part of the examples. They fit in nicely -- the applications from there are no more standalone applications than some examples we already have, for example the gnrc_border_router.

Testing procedure

Look at whether the applications make sense (I haven't), and see that they build (CI checks that) and work.

PR creation and evolution

This PR was created by moving around examples in the original repository and then merging with --allow-unrelated-histories. This ensures that git attribution keeps working. It should also allow existing PRs against the applications to just be reapplied (and even merged into) this tree, because git should detect the moves.

Still, given that examples currently fail, rather than relying on that, I'd rather replay the set of commits on a fixed version of the applications, based on RIOT-OS/applications#78. (Until then, this will stay a draft).

Related issues

[edit: added]

[RFC] tests: group applications in subdirectories #15358 -- which becomes just a tad (57 -> 60) more important through this.

Inspired by https://github.com/malvira/libmc1322x/wiki/wireshark

…example add microcoap example application

…ofix sixlowapp: fix small typo

…ll_commands sixlowapp: adapted to new shell handler prototype

ng_sniffer: added ng version of sniffer application

The constants names changed in the past: RIOT-OS@426170b

sixlowapp: rename thread related constants

…gnore git: added .gitignore, copied from RIOT

Provide an application for openwsn

openwsn: fix prototype for putchar

This application was not adapted to RIOT-OS#3162 and RIOT-OS#3188

…etif_default ng_sniffer: added ng_netif_default

Related and dependent on RIOT-OS#3555

…hell_uart ng_sniffer: use uart0 only for none newlib boards

…rm/remove-old-app sniffer: remove old application

…etwork_stack_apps remove apps belonging to the old network stack

Was accidentally removed and is also updated to current gnrc.

sniffer: re-add sniffer

miri64

Trusting your documentation of how you integrated the commits. The code was already reviewed in the applications repo, so I'd say it will look good as well ;-).

miri64 · 2022-09-20T11:14:09Z

Murdock still needs those Makefile.cis :-)

benpicco · 2022-09-20T11:16:46Z

You can use the make create-Makefile.ci target

miri64 · 2022-09-20T11:17:42Z

You can use the make create-Makefile.ci target

See #18602 (comment) ;-)

chrysn · 2022-09-20T11:17:47Z

As my docker setup is still broken, and the script is much more efficient than looking through murdock outputs: could you run create-makefile-ci on your machine?

miri64 · 2022-09-20T11:18:45Z

As my docker setup is still broken, and the script is much more efficient than looking through murdock outputs: could you run create-makefile-ci on your machine?

Perfect opportunity for me to try this.

miri64 · 2022-09-20T11:20:36Z

Mhhh examples/sniffer is throwing Deprecated modules are in use: shell_commands now that #18355 is merged ^^"

miri64 · 2022-09-20T11:35:01Z

Mhh.. can't push to your fork :( here's the patch

From 86cd3f55d6e63a8ba7bc6d31c4557de9f3e2f01c Mon Sep 17 00:00:00 2001
From: Martine Lenders <m.lenders@fu-berlin.de>
Date: Tue, 20 Sep 2022 13:29:39 +0200
Subject: [PATCH] examples: sniffer / spectrum_analyzer: amend Makefile.ci

---
 examples/sniffer/Makefile.ci          | 25 +++++++++++++++++++++++++
 examples/spectrum-scanner/Makefile.ci | 23 +++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 examples/sniffer/Makefile.ci
 create mode 100644 examples/spectrum-scanner/Makefile.ci

diff --git a/examples/sniffer/Makefile.ci b/examples/sniffer/Makefile.ci
new file mode 100644
index 0000000000..4b03fc1ce2
--- /dev/null
+++ b/examples/sniffer/Makefile.ci
@@ -0,0 +1,25 @@
+BOARD_INSUFFICIENT_MEMORY := \
+    arduino-duemilanove \
+    arduino-leonardo \
+    arduino-mega2560 \
+    arduino-nano \
+    arduino-uno \
+    atmega328p-xplained-mini \
+    atmega328p \
+    bluepill-stm32f030c8 \
+    i-nucleo-lrwan1 \
+    nucleo-f030r8 \
+    nucleo-f031k6 \
+    nucleo-f042k6 \
+    nucleo-l011k4 \
+    nucleo-l031k6 \
+    nucleo-l053r8 \
+    samd10-xmini \
+    slstk3400a \
+    stk3200 \
+    stm32f030f4-demo \
+    stm32f0discovery \
+    stm32g0316-disco \
+    stm32l0538-disco \
+    waspmote-pro \
+    #
diff --git a/examples/spectrum-scanner/Makefile.ci b/examples/spectrum-scanner/Makefile.ci
new file mode 100644
index 0000000000..613af759a7
--- /dev/null
+++ b/examples/spectrum-scanner/Makefile.ci
@@ -0,0 +1,23 @@
+BOARD_INSUFFICIENT_MEMORY := \
+    arduino-duemilanove \
+    arduino-leonardo \
+    arduino-nano \
+    arduino-uno \
+    atmega328p-xplained-mini \
+    atmega328p \
+    bluepill-stm32f030c8 \
+    i-nucleo-lrwan1 \
+    nucleo-f030r8 \
+    nucleo-f031k6 \
+    nucleo-f042k6 \
+    nucleo-l011k4 \
+    nucleo-l031k6 \
+    nucleo-l053r8 \
+    samd10-xmini \
+    slstk3400a \
+    stk3200 \
+    stm32f030f4-demo \
+    stm32f0discovery \
+    stm32g0316-disco \
+    stm32l0538-disco \
+    #
-- 
2.37.3

miri64 · 2022-09-20T11:35:59Z

I used my well established vim macro after all, to generate the Makefile.ci from the Murdock output btw. The create-Makefile.ci took a) way too long and b) also showed errors for me.

miri64 · 2022-09-20T11:37:13Z

Ah wait, I forgot to blacklist the pic32 boards. :-/.

miri64 · 2022-09-20T11:41:22Z

+ * @}
+ */
+
+#include <stdint.h>


Oh, it is an actual bug that the PIC32 (and the RISC-V) toolchain found an actual bug.

Suggested change

#include <stdint.h>

#include <stdint.h>

#include <stdio.h>

miri64 · 2022-09-20T11:43:18Z

(updated the patch post to remove the boards that failed due to the bug)

chrysn · 2022-09-20T11:46:42Z

Thanks, all updated. Force-pushing to squash the late blacklist change right away so that we have a chance of getting a usable Murdock result for merging.

chrysn · 2022-09-20T14:08:40Z

All but the false-positive 'Error: Commit needs to be squashed: "53e91a13e3 Update RIOT submodule to 2019.01"' are green now. With the ACKs in and me also stating this is ready: @miri64, could you merge this with administrative powers?

miri64 · 2022-09-20T14:51:55Z

Done.

miri64 · 2022-09-20T14:52:15Z

Should we archive RIOT-OS/applications now that these apps are in?

chrysn · 2022-09-20T14:59:20Z

Yes, but maybe with RIOT-OS/applications#83 on top.

chrysn · 2022-09-20T15:28:05Z

Could you also unpin it? I don't think the pinning is justified any more (not that it'd have helped a lot when it was live.)

miri64 · 2022-09-20T15:29:16Z

Also done! :-)

OlegHahm and others added 30 commits November 6, 2014 22:30

sixlowapp: initial import of a 6LoWPAN example app

0345f28

sixlowapp: fixed typo and complemented usage text

b921f57

sixlowapp: updated README

1744c66

sniffer: initial import

7bc5111

Inspired by https://github.com/malvira/libmc1322x/wiki/wireshark

add microcoap example application

7daa0c0

Merge pull request RIOT-OS/applications#2 from Lotterleben/microcoap_…

db292ba

…example add microcoap example application

sixlowapp: fix small typo

de18e75

Merge pull request RIOT-OS/applications#3 from Lotterleben/sixlow_typ…

4e4305c

…ofix sixlowapp: fix small typo

sixlowapp: adapted to new shell handler prototype

afc9758

Merge pull request RIOT-OS/applications#5 from OlegHahm/sixlowapp_she…

03d2494

…ll_commands sixlowapp: adapted to new shell handler prototype

ng_sniffer: added ng version of sniffer application

47a6057

Merge pull request RIOT-OS/applications#6 from haukepetersen/ng_sniffer

bf11b0f

ng_sniffer: added ng version of sniffer application

sixlowapp: rename thread related constants

e0ef049

The constants names changed in the past: RIOT-OS@426170b

Merge pull request RIOT-OS/applications#8 from booo/renaming

568c26c

sixlowapp: rename thread related constants

git: added .gitignore, copied from RIOT

c42da5e

Merge pull request RIOT-OS/applications#7 from haukepetersen/add_giti…

2dec123

…gnore git: added .gitignore, copied from RIOT

add application for openwsn

3e1346d

Merge pull request RIOT-OS/applications#1 from thomaseichinger/master

ccc4e3f

Provide an application for openwsn

openwsn: fix prototype for putchar

e454242

Merge pull request RIOT-OS/applications#9 from OlegHahm/putchar_fix

ad75cdd

openwsn: fix prototype for putchar

ng_sniffer: added ng_netif_default

367f329

This application was not adapted to RIOT-OS#3162 and RIOT-OS#3188

Merge pull request RIOT-OS/applications#10 from OlegHahm/ng_sniffer_n…

76362f9

…etif_default ng_sniffer: added ng_netif_default

ng_sniffer: use uart0 only for none newlib boards

18965d5

Related and dependent on RIOT-OS#3555

Merge pull request RIOT-OS/applications#11 from OlegHahm/ng_sniffer_s…

66e3cb9

…hell_uart ng_sniffer: use uart0 only for none newlib boards

sniffer: remove old application

bde91e0

Merge pull request RIOT-OS/applications#12 from authmillenon/sniffer/…

10cad08

…rm/remove-old-app sniffer: remove old application

remove apps belonging to the old network stack

017cbf1

Merge pull request RIOT-OS/applications#13 from OlegHahm/remove_old_n…

131b20f

…etwork_stack_apps remove apps belonging to the old network stack

sniffer: re-add sniffer

b425340

Was accidentally removed and is also updated to current gnrc.

Merge pull request RIOT-OS/applications#14 from OlegHahm/sniffer_re-add

094f8a8

sniffer: re-add sniffer

miri64 approved these changes Sep 20, 2022

View reviewed changes

benpicco approved these changes Sep 20, 2022

View reviewed changes

maribu changed the title ~~Move in RIOT/applications~~ examples: Move in RIOT/applications Sep 20, 2022

miri64 added Process: needs >1 ACK Integration Process: This PR requires more than one ACK and removed Process: needs >1 ACK Integration Process: This PR requires more than one ACK labels Sep 20, 2022

miri64 reviewed Sep 20, 2022

View reviewed changes

miri64 and others added 2 commits September 20, 2022 13:46

examples: sniffer / spectrum_analyzer: amend Makefile.ci

13f94cb

examples/spectrum-scanner: Fix building on PIC32 and RISC-V

59d184f

chrysn force-pushed the move-in-riot-applications branch from 8d54b11 to 59d184f Compare September 20, 2022 11:46

miri64 merged commit c107d73 into RIOT-OS:master Sep 20, 2022

chrysn mentioned this pull request Sep 20, 2022

Archival notice RIOT-OS/applications#83

Merged

chrysn deleted the move-in-riot-applications branch September 20, 2022 14:59

maribu added this to the Release 2022.10 milestone Oct 14, 2022

Uh oh!

Conversation

chrysn commented Sep 16, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Contribution description

Testing procedure

PR creation and evolution

Related issues

Uh oh!

miri64 left a comment

Choose a reason for hiding this comment

Uh oh!

miri64 commented Sep 20, 2022

Uh oh!

benpicco commented Sep 20, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

miri64 commented Sep 20, 2022

Uh oh!

chrysn commented Sep 20, 2022 via email

Uh oh!

miri64 commented Sep 20, 2022

Uh oh!

miri64 commented Sep 20, 2022

Uh oh!

miri64 commented Sep 20, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

miri64 commented Sep 20, 2022

Uh oh!

miri64 commented Sep 20, 2022

Uh oh!

miri64 Sep 20, 2022

Choose a reason for hiding this comment

Uh oh!

miri64 commented Sep 20, 2022

Uh oh!

chrysn commented Sep 20, 2022

Uh oh!

chrysn commented Sep 20, 2022

Uh oh!

miri64 commented Sep 20, 2022

Uh oh!

miri64 commented Sep 20, 2022

Uh oh!

chrysn commented Sep 20, 2022

Uh oh!

chrysn commented Sep 20, 2022

Uh oh!

miri64 commented Sep 20, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

18 participants

chrysn commented Sep 16, 2022 •

edited

Loading

benpicco commented Sep 20, 2022 •

edited

Loading

miri64 commented Sep 20, 2022 •

edited

Loading