diff --git a/RpiLedBars/Makefile b/RpiLedBars/Makefile index f5b09f3..e95e946 100644 --- a/RpiLedBars/Makefile +++ b/RpiLedBars/Makefile @@ -9,7 +9,7 @@ BIN := bin/pixled SOURCES := $(shell find $(SRC) -type f -name "*.c") OBJECTS := $(patsubst $(SRC)/%.c, $(OBJ)/%.o, $(SOURCES)) -.PHONY: all clean debug +.PHONY: all clean install all: $(BIN) @@ -30,5 +30,9 @@ $(BIN): $(OBJECTS) .libs/log.la if [ ! -d "$(dir $@)" ]; then mkdir -p "$(dir $@)"; fi $(CC) -o $@ $^ $(LDFLAGS) +install: + $(shell install --backup bin/pixled /usr/local/bin/) + + clean: rm -rf $(OBJ) .libs libs/*/obj \ No newline at end of file diff --git a/RpiLedBars/pixled.service b/RpiLedBars/pixled.service index dc428da..0c8e33c 100644 --- a/RpiLedBars/pixled.service +++ b/RpiLedBars/pixled.service @@ -3,7 +3,7 @@ Description=pixled After=network.target [Service] -ExecStart=/home/pi/LedBars/RpiLedBars/bin/service_pixled -n 60 +ExecStart=pixled -n 180 -d 1 Restart=always User=root Group=root diff --git a/RpiLedBars/res/install_i2s_mems_mic b/RpiLedBars/res/install_i2s_mems_mic index f1b2658..9bfe4e3 100644 --- a/RpiLedBars/res/install_i2s_mems_mic +++ b/RpiLedBars/res/install_i2s_mems_mic @@ -26,4 +26,7 @@ sudo apt install libfftw3-dev libasound2-dev libtool automake ./autogen.sh ./configure make -sudo make install \ No newline at end of file +sudo make install + +# Access point +grep "Access point conf" $(find /etc -type f) \ No newline at end of file diff --git a/RpiLedBars/src/drivers/selector/rpi_selector.c b/RpiLedBars/src/drivers/selector/rpi_selector.c index 24f9378..80c24e8 100644 --- a/RpiLedBars/src/drivers/selector/rpi_selector.c +++ b/RpiLedBars/src/drivers/selector/rpi_selector.c @@ -20,7 +20,7 @@ **************************************************************************************************/ unsigned const selectorPinNumber = 4; /* TODO use GPIO function from ../gpio/gipo.h (same pin number) */ -int selectorPins[4] = {5, 6, 26, 27}; +int selectorPins[4] = {26, 27, 6, 5}; char modeStr[] = "0 | 0 | 0 | 0 \n"; /*************************************************************************************************** diff --git a/RpiLedBars/src/main.c b/RpiLedBars/src/main.c index 8c33bf9..14d2e92 100644 --- a/RpiLedBars/src/main.c +++ b/RpiLedBars/src/main.c @@ -107,10 +107,12 @@ int main(int argc, char const *argv[]) { clock_gettime(CLOCK_MONOTONIC, &loopStart); if (IsTestMode) { - if (mainLoopCycle % 300 < 150) { - mode = 2; - } else { + if (mainLoopCycle % (180 * 3) < 180) { + mode = 0; + } else if (mainLoopCycle % (180 * 3) < 180 * 2) { mode = 1; + } else { + mode = 2; } } else { mode = selector_get_position(); diff --git a/RpiLedBars/src/tasks/cava/rpi_cava.c b/RpiLedBars/src/tasks/cava/rpi_cava.c index f33d107..839612b 100644 --- a/RpiLedBars/src/tasks/cava/rpi_cava.c +++ b/RpiLedBars/src/tasks/cava/rpi_cava.c @@ -186,7 +186,7 @@ static int start_cava_process() { if (cavaPid == 0) { /* Child process*/ - int fdLogOut; + // int fdLogOut; char *args[] = {"cava", "-p", "/home/pi/LedBars/RpiLedBars/cava_config", NULL}; /* Close reading end of the pipe */ @@ -197,9 +197,9 @@ static int start_cava_process() { close(fdCavaPipe[1]); /* Open / create a log file for cava */ - fdLogOut = open("/dev/null", O_WRONLY, NULL); + // fdLogOut = open("/dev/null", O_WRONLY, NULL); /* Dup file in place of stderr */ - dup2(fdLogOut, STDERR_FILENO); + // dup2(fdLogOut, STDERR_FILENO); execvp(args[0], args); log_error("Cava execvp failure or return: %s", strerror(errno));