From 3a66ae51c3f34108428e582ef693866d71496d16 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Fri, 28 Aug 2020 15:25:37 +0200 Subject: Expose configuration via Kconfig --- src/app/aemr/Kconfig | 2 ++ src/app/aemr/Makefile.inc | 4 +++- src/app/blinkencat3/Kconfig | 2 ++ src/app/blinkencat3/Makefile.inc | 6 ++++-- src/app/button-and-motion-logger/Kconfig | 2 ++ src/app/button-and-motion-logger/Makefile.inc | 6 ++++-- src/app/ccs811test/Kconfig | 2 ++ src/app/ccs811test/Makefile.inc | 8 +++++--- src/app/countertest/Kconfig | 2 ++ src/app/countertest/Makefile.inc | 6 ++++-- src/app/donothing/Makefile.inc | 7 ++++--- src/app/i2cbench/Makefile.inc | 4 +++- src/app/i2cdetect/Kconfig | 2 ++ src/app/i2cdetect/Makefile.inc | 7 ++++--- src/app/ledblink/Kconfig | 2 ++ src/app/ledblink/Makefile.inc | 4 +++- src/app/loratest/Makefile.inc | 4 +++- src/app/luxlog/Kconfig | 2 ++ src/app/luxlog/Makefile.inc | 8 +++++--- src/app/mpu9250_motionlog/Kconfig | 2 ++ src/app/mpu9250_motionlog/Makefile.inc | 6 ++++-- src/app/nrf24l01test/Makefile.inc | 8 +++++--- src/app/sharp96test/Kconfig | 2 ++ src/app/sharp96test/Makefile.inc | 6 +++++- src/app/shell/Kconfig | 2 ++ src/app/shell/Makefile.inc | 7 +++++-- src/app/shell/main.cc | 1 - src/app/sysinfo/Makefile.inc | 4 +++- src/app/timertest/Makefile.inc | 8 +++++--- src/app/transactiontest/Makefile.inc | 11 +++++------ src/app/waittest/Makefile.inc | 8 +++++--- src/app/wetterstation/Kconfig | 2 ++ src/app/wetterstation/Makefile.inc | 4 +++- src/app/ws2812b_dmap/Makefile.inc | 6 ++++-- src/app/ws2812b_uart/Kconfig | 2 ++ src/app/ws2812b_uart/Makefile.inc | 6 ++++-- 36 files changed, 116 insertions(+), 49 deletions(-) create mode 100644 src/app/aemr/Kconfig create mode 100644 src/app/blinkencat3/Kconfig create mode 100644 src/app/button-and-motion-logger/Kconfig create mode 100644 src/app/ccs811test/Kconfig create mode 100644 src/app/countertest/Kconfig create mode 100644 src/app/i2cdetect/Kconfig create mode 100644 src/app/ledblink/Kconfig create mode 100644 src/app/luxlog/Kconfig create mode 100644 src/app/mpu9250_motionlog/Kconfig create mode 100644 src/app/sharp96test/Kconfig create mode 100644 src/app/shell/Kconfig create mode 100644 src/app/wetterstation/Kconfig create mode 100644 src/app/ws2812b_uart/Kconfig (limited to 'src/app') diff --git a/src/app/aemr/Kconfig b/src/app/aemr/Kconfig new file mode 100644 index 0000000..9c5fc80 --- /dev/null +++ b/src/app/aemr/Kconfig @@ -0,0 +1,2 @@ +prompt "Automatic Energy Model Refinement" +depends on !loop && !wakeup diff --git a/src/app/aemr/Makefile.inc b/src/app/aemr/Makefile.inc index 6e2dda3..7ed7630 100644 --- a/src/app/aemr/Makefile.inc +++ b/src/app/aemr/Makefile.inc @@ -1 +1,3 @@ -override arch_drivers += ,counter +ifdef app + override arch_drivers += ,counter +endif diff --git a/src/app/blinkencat3/Kconfig b/src/app/blinkencat3/Kconfig new file mode 100644 index 0000000..f9230ea --- /dev/null +++ b/src/app/blinkencat3/Kconfig @@ -0,0 +1,2 @@ +prompt "Blinkencat 3" +depends on (arch_arduino_nano || arch_arduino_nano_168) && meta_driver_neopixel && !loop && !wakeup diff --git a/src/app/blinkencat3/Makefile.inc b/src/app/blinkencat3/Makefile.inc index 1bf2b59..2d2d859 100644 --- a/src/app/blinkencat3/Makefile.inc +++ b/src/app/blinkencat3/Makefile.inc @@ -1,2 +1,4 @@ -override loop = 1 -override arch_drivers += ,neopixel +ifdef app + override loop = 1 + override arch_drivers += ,neopixel +endif diff --git a/src/app/button-and-motion-logger/Kconfig b/src/app/button-and-motion-logger/Kconfig new file mode 100644 index 0000000..fe5d888 --- /dev/null +++ b/src/app/button-and-motion-logger/Kconfig @@ -0,0 +1,2 @@ +prompt "Button and Motion Logger" +depends on meta_driver_adc && driver_mpu9250 && !loop && !wakeup diff --git a/src/app/button-and-motion-logger/Makefile.inc b/src/app/button-and-motion-logger/Makefile.inc index f433287..eff5706 100644 --- a/src/app/button-and-motion-logger/Makefile.inc +++ b/src/app/button-and-motion-logger/Makefile.inc @@ -1,2 +1,4 @@ -arch_drivers += ,adc,i2c -override drivers += ,mpu9250 +ifdef app + override arch_drivers += ,adc,i2c + override drivers += ,mpu9250 +endif diff --git a/src/app/ccs811test/Kconfig b/src/app/ccs811test/Kconfig new file mode 100644 index 0000000..a219a0f --- /dev/null +++ b/src/app/ccs811test/Kconfig @@ -0,0 +1,2 @@ +prompt "CCS811 Logger" +depends on driver_ccs811 && loop && !wakeup diff --git a/src/app/ccs811test/Makefile.inc b/src/app/ccs811test/Makefile.inc index 4889e55..6bc097a 100644 --- a/src/app/ccs811test/Makefile.inc +++ b/src/app/ccs811test/Makefile.inc @@ -1,3 +1,5 @@ -override arch_drivers += ,i2c -override drivers += ,ccs811 -loop ?= 1 +ifdef app + override arch_drivers += ,i2c + override drivers += ,ccs811 + override loop = 1 +endif diff --git a/src/app/countertest/Kconfig b/src/app/countertest/Kconfig new file mode 100644 index 0000000..141c3f6 --- /dev/null +++ b/src/app/countertest/Kconfig @@ -0,0 +1,2 @@ +prompt "Cycle Counter Test" +depends on meta_driver_counter && loop && !wakeup diff --git a/src/app/countertest/Makefile.inc b/src/app/countertest/Makefile.inc index f8a5514..0bf380e 100644 --- a/src/app/countertest/Makefile.inc +++ b/src/app/countertest/Makefile.inc @@ -1,2 +1,4 @@ -loop ?= 1 -override arch_drivers += ,counter +ifdef app + override loop = 1 + override arch_drivers += ,counter +endif diff --git a/src/app/donothing/Makefile.inc b/src/app/donothing/Makefile.inc index 0608a82..bf22978 100644 --- a/src/app/donothing/Makefile.inc +++ b/src/app/donothing/Makefile.inc @@ -1,3 +1,4 @@ -timer_cycles = 0 -timer_s = 0 -loop = 0 +ifdef app + override timer_s = 0 + override loop = 0 +endif diff --git a/src/app/i2cbench/Makefile.inc b/src/app/i2cbench/Makefile.inc index 15ce127..c5241fd 100644 --- a/src/app/i2cbench/Makefile.inc +++ b/src/app/i2cbench/Makefile.inc @@ -1,4 +1,6 @@ -arch_drivers += ,i2c +ifdef app + override arch_drivers += ,i2c +endif ifneq (${i2cbench_setos}, ) COMMON_FLAGS += -DI2CBENCH_SETOS=${i2cbench_setos} diff --git a/src/app/i2cdetect/Kconfig b/src/app/i2cdetect/Kconfig new file mode 100644 index 0000000..d0415f0 --- /dev/null +++ b/src/app/i2cdetect/Kconfig @@ -0,0 +1,2 @@ +prompt "I2C Bus Scanner" +depends on meta_driver_i2c diff --git a/src/app/i2cdetect/Makefile.inc b/src/app/i2cdetect/Makefile.inc index 7620800..c76489c 100644 --- a/src/app/i2cdetect/Makefile.inc +++ b/src/app/i2cdetect/Makefile.inc @@ -1,3 +1,4 @@ -arch_drivers += ,i2c -drivers += ,lm75 -loop ?= 1 +ifdef app + override loop = 1 + override arch_drivers += ,i2c +endif diff --git a/src/app/ledblink/Kconfig b/src/app/ledblink/Kconfig new file mode 100644 index 0000000..0075bf8 --- /dev/null +++ b/src/app/ledblink/Kconfig @@ -0,0 +1,2 @@ +prompt "LED Blink" +depends on loop && !wakeup diff --git a/src/app/ledblink/Makefile.inc b/src/app/ledblink/Makefile.inc index 2cb8a42..ec71d40 100644 --- a/src/app/ledblink/Makefile.inc +++ b/src/app/ledblink/Makefile.inc @@ -1 +1,3 @@ -loop ?= 1 +ifdef app + override loop = 1 +endif diff --git a/src/app/loratest/Makefile.inc b/src/app/loratest/Makefile.inc index 2cb8a42..ec71d40 100644 --- a/src/app/loratest/Makefile.inc +++ b/src/app/loratest/Makefile.inc @@ -1 +1,3 @@ -loop ?= 1 +ifdef app + override loop = 1 +endif diff --git a/src/app/luxlog/Kconfig b/src/app/luxlog/Kconfig new file mode 100644 index 0000000..6e1c6e6 --- /dev/null +++ b/src/app/luxlog/Kconfig @@ -0,0 +1,2 @@ +prompt "Ambient Brightness Logger" +depends on driver_max44009 diff --git a/src/app/luxlog/Makefile.inc b/src/app/luxlog/Makefile.inc index bcee1d0..a0cbcd8 100644 --- a/src/app/luxlog/Makefile.inc +++ b/src/app/luxlog/Makefile.inc @@ -1,3 +1,5 @@ -arch_drivers += ,i2c -drivers += ,max44009 -loop ?= 1 +ifdef app + override loop = 1 + override arch_drivers += ,i2c + override drivers += ,max44009 +endif diff --git a/src/app/mpu9250_motionlog/Kconfig b/src/app/mpu9250_motionlog/Kconfig new file mode 100644 index 0000000..27d605f --- /dev/null +++ b/src/app/mpu9250_motionlog/Kconfig @@ -0,0 +1,2 @@ +prompt "Motion Logger" +depends on driver_mpu9250 diff --git a/src/app/mpu9250_motionlog/Makefile.inc b/src/app/mpu9250_motionlog/Makefile.inc index 5da92be..ed959ca 100644 --- a/src/app/mpu9250_motionlog/Makefile.inc +++ b/src/app/mpu9250_motionlog/Makefile.inc @@ -1,2 +1,4 @@ -arch_drivers += ,i2c -override drivers += ,mpu9250 +ifdef app + override arch_drivers += ,i2c + override drivers += ,mpu9250 +endif diff --git a/src/app/nrf24l01test/Makefile.inc b/src/app/nrf24l01test/Makefile.inc index 6713ddb..f84bcbd 100644 --- a/src/app/nrf24l01test/Makefile.inc +++ b/src/app/nrf24l01test/Makefile.inc @@ -1,6 +1,8 @@ -override drivers += ,nrf24l01 -timer_s ?= 1 -loop ?= 1 +ifdef app + override loop = 1 + override timer_s = 1 + override drivers += ,nrf24l01 +endif ifeq (${tx}, 1) COMMON_FLAGS += -DNRF24L01TEST_TX diff --git a/src/app/sharp96test/Kconfig b/src/app/sharp96test/Kconfig new file mode 100644 index 0000000..30b9ac3 --- /dev/null +++ b/src/app/sharp96test/Kconfig @@ -0,0 +1,2 @@ +prompt "Sharp96 Test" +depends on driver_sharp96 diff --git a/src/app/sharp96test/Makefile.inc b/src/app/sharp96test/Makefile.inc index 4dbcaca..37bb857 100644 --- a/src/app/sharp96test/Makefile.inc +++ b/src/app/sharp96test/Makefile.inc @@ -1 +1,5 @@ -driver_sharp96 ?= 1 +ifdef app + override loop = 1 + override arch_drivers += spi_b + override drivers += sharp96 +endif diff --git a/src/app/shell/Kconfig b/src/app/shell/Kconfig new file mode 100644 index 0000000..a4626d6 --- /dev/null +++ b/src/app/shell/Kconfig @@ -0,0 +1,2 @@ +prompt "Shell / UART Echo" +depends on meta_driver_stdin && wakeup diff --git a/src/app/shell/Makefile.inc b/src/app/shell/Makefile.inc index 66d80ec..3d73351 100644 --- a/src/app/shell/Makefile.inc +++ b/src/app/shell/Makefile.inc @@ -1,2 +1,5 @@ -arch_drivers += ,stdin -wakeup ?= 1 +ifdef app + override loop = 0 + override wakeup = 1 + override arch_drivers += ,stdin +endif diff --git a/src/app/shell/main.cc b/src/app/shell/main.cc index 33896e4..0a7d4ca 100644 --- a/src/app/shell/main.cc +++ b/src/app/shell/main.cc @@ -2,7 +2,6 @@ #include "driver/gpio.h" #include "driver/stdout.h" #include "driver/stdin.h" -#include "driver/uptime.h" /* void check_command(unsigned char argc, char** argv) diff --git a/src/app/sysinfo/Makefile.inc b/src/app/sysinfo/Makefile.inc index 4cc2151..ec71d40 100644 --- a/src/app/sysinfo/Makefile.inc +++ b/src/app/sysinfo/Makefile.inc @@ -1 +1,3 @@ -loop = 1 +ifdef app + override loop = 1 +endif diff --git a/src/app/timertest/Makefile.inc b/src/app/timertest/Makefile.inc index 9d375f1..9754020 100644 --- a/src/app/timertest/Makefile.inc +++ b/src/app/timertest/Makefile.inc @@ -1,3 +1,5 @@ -loop ?= 1 -timer_s ?= 1 -arch_drivers += ,timer +ifdef app + override loop = 1 + override timer_s = 1 + override arch_drivers += ,timer +endif diff --git a/src/app/transactiontest/Makefile.inc b/src/app/transactiontest/Makefile.inc index 63d2323..25d4378 100644 --- a/src/app/transactiontest/Makefile.inc +++ b/src/app/transactiontest/Makefile.inc @@ -1,7 +1,6 @@ -timer_cycles ?= 1 -timer_s ?= 1 -loop ?= 1 +ifdef app + override loop = 1 + override timer_s = 1 +endif -driver_sharp96 ?= 1 - -ASM_TARGETS += src/app/transactiontest/util.S \ No newline at end of file +ASM_TARGETS += src/app/transactiontest/util.S diff --git a/src/app/waittest/Makefile.inc b/src/app/waittest/Makefile.inc index 9d375f1..9754020 100644 --- a/src/app/waittest/Makefile.inc +++ b/src/app/waittest/Makefile.inc @@ -1,3 +1,5 @@ -loop ?= 1 -timer_s ?= 1 -arch_drivers += ,timer +ifdef app + override loop = 1 + override timer_s = 1 + override arch_drivers += ,timer +endif diff --git a/src/app/wetterstation/Kconfig b/src/app/wetterstation/Kconfig new file mode 100644 index 0000000..691784c --- /dev/null +++ b/src/app/wetterstation/Kconfig @@ -0,0 +1,2 @@ +prompt "Wetterstation" +depends on meta_driver_adc && (arch_arduino_nano || arch_arduino_nano_168) diff --git a/src/app/wetterstation/Makefile.inc b/src/app/wetterstation/Makefile.inc index 2cb8a42..ec71d40 100644 --- a/src/app/wetterstation/Makefile.inc +++ b/src/app/wetterstation/Makefile.inc @@ -1 +1,3 @@ -loop ?= 1 +ifdef app + override loop = 1 +endif diff --git a/src/app/ws2812b_dmap/Makefile.inc b/src/app/ws2812b_dmap/Makefile.inc index ce0a386..a515d32 100644 --- a/src/app/ws2812b_dmap/Makefile.inc +++ b/src/app/ws2812b_dmap/Makefile.inc @@ -1,2 +1,4 @@ -loop ?= 1 -arch_drivers += ,stdin,neopixel +ifdef app + override loop = 1 + override arch_drivers += ,stdin,neopixel +endif diff --git a/src/app/ws2812b_uart/Kconfig b/src/app/ws2812b_uart/Kconfig new file mode 100644 index 0000000..7566e4c --- /dev/null +++ b/src/app/ws2812b_uart/Kconfig @@ -0,0 +1,2 @@ +prompt "UART to WS2812b" +depends on (arch_arduino_nano || arch_arduino_nano_168) && meta_driver_neopixel diff --git a/src/app/ws2812b_uart/Makefile.inc b/src/app/ws2812b_uart/Makefile.inc index ce0a386..a515d32 100644 --- a/src/app/ws2812b_uart/Makefile.inc +++ b/src/app/ws2812b_uart/Makefile.inc @@ -1,2 +1,4 @@ -loop ?= 1 -arch_drivers += ,stdin,neopixel +ifdef app + override loop = 1 + override arch_drivers += ,stdin,neopixel +endif -- cgit v1.2.3