Compare commits
No commits in common. "30422df0da09d2cdfeeb019dd6fce4f93ef9d49e" and "dfa3cc6c5b7e039870b66a86c3a88547b71059b6" have entirely different histories.
30422df0da
...
dfa3cc6c5b
16
Makefile
16
Makefile
|
@ -16,10 +16,7 @@ clean:
|
||||||
|
|
||||||
libs: $(BUILD_DIR)/hid.o $(BUILD_DIR)/libmpdclient.o
|
libs: $(BUILD_DIR)/hid.o $(BUILD_DIR)/libmpdclient.o
|
||||||
|
|
||||||
submodules:
|
.PHONY: clean all run libs
|
||||||
git submodule update --init --recursive
|
|
||||||
|
|
||||||
.PHONY: clean all run libs submodules
|
|
||||||
|
|
||||||
#################################################
|
#################################################
|
||||||
# Flags and autodetection
|
# Flags and autodetection
|
||||||
|
@ -31,14 +28,11 @@ CPPFLAGS := -MMD -MP \
|
||||||
-I libs/hidapi/hidapi \
|
-I libs/hidapi/hidapi \
|
||||||
-I libs/spdlog/include \
|
-I libs/spdlog/include \
|
||||||
-I libs/libmpdclient/include \
|
-I libs/libmpdclient/include \
|
||||||
-I libs/libmpdclient/output \
|
-I libs/libmpdclient/output
|
||||||
$(shell pkg-config --cflags hunspell)
|
|
||||||
|
|
||||||
# udev: required by hidapi
|
# udev: required by hidapi
|
||||||
LDFLAGS := \
|
# TODO: better hunspell link
|
||||||
-l fftw3 \
|
LDFLAGS := -l fftw3 -l udev -l hunspell-1.7
|
||||||
-l udev \
|
|
||||||
$(shell pkg-config --libs hunspell)
|
|
||||||
|
|
||||||
# Find all cpp files in source dirs
|
# Find all cpp files in source dirs
|
||||||
SRCS := $(shell find $(SRC_DIRS) -name '*.cpp')
|
SRCS := $(shell find $(SRC_DIRS) -name '*.cpp')
|
||||||
|
@ -69,8 +63,6 @@ $(BUILD_DIR)/hid.o:
|
||||||
|
|
||||||
# Build libmpdclient
|
# Build libmpdclient
|
||||||
$(BUILD_DIR)/libmpdclient.o:
|
$(BUILD_DIR)/libmpdclient.o:
|
||||||
@mkdir -p $(BUILD_DIR)
|
|
||||||
|
|
||||||
@cd libs/libmpdclient && \
|
@cd libs/libmpdclient && \
|
||||||
meson . output && \
|
meson . output && \
|
||||||
ninja -C output
|
ninja -C output
|
||||||
|
|
25
README.md
25
README.md
|
@ -1,25 +0,0 @@
|
||||||
# Ergodox Host Interface
|
|
||||||
|
|
||||||
Host software for [Betalupi Ergodox](https://git.betalupi.com/Mark/QMK).
|
|
||||||
|
|
||||||
## Features:
|
|
||||||
- Music visualizer ([here](https://git.betalupi.com/Mark/hostdox/src/branch/master/src/signal_processing))
|
|
||||||
- Spell checking with hunspell
|
|
||||||
|
|
||||||
-------------------------------------------------
|
|
||||||
|
|
||||||
## Dependencies:
|
|
||||||
Run:
|
|
||||||
- hunspell
|
|
||||||
|
|
||||||
Build:
|
|
||||||
- meson (for libmpdclient)
|
|
||||||
- ninja (for libmpdclient)
|
|
||||||
- gcc
|
|
||||||
|
|
||||||
-------------------------------------------------
|
|
||||||
|
|
||||||
## Building
|
|
||||||
|
|
||||||
``make submodules`` to initialize git submodules \
|
|
||||||
``make all`` to build, or ``make run`` to build and run.
|
|
|
@ -11,8 +11,10 @@
|
||||||
#include <thread>
|
#include <thread>
|
||||||
// MPD client
|
// MPD client
|
||||||
#include "mpd/client.h"
|
#include "mpd/client.h"
|
||||||
// Spell checking
|
|
||||||
#include "hunspell.hxx"
|
// TODO: Include this properly
|
||||||
|
#include "/usr/include/hunspell/hunspell.hxx"
|
||||||
|
|
||||||
// Local files
|
// Local files
|
||||||
#include "utility/bitmap.hpp"
|
#include "utility/bitmap.hpp"
|
||||||
#include "utility/buffer.hpp"
|
#include "utility/buffer.hpp"
|
||||||
|
|
|
@ -1,9 +1,5 @@
|
||||||
#include "bitmap.hpp"
|
#include "bitmap.hpp"
|
||||||
|
|
||||||
|
|
||||||
// Simple bitmap library.
|
|
||||||
// Used to debug music visualizer.
|
|
||||||
|
|
||||||
Bitmap::Bitmap(size_t w, size_t h) {
|
Bitmap::Bitmap(size_t w, size_t h) {
|
||||||
this->width = w;
|
this->width = w;
|
||||||
this->height = h;
|
this->height = h;
|
||||||
|
|
Loading…
Reference in New Issue