Skip to content

Commit

Permalink
SUKU ui library compatibility fixed, AB swich middle position defined…
Browse files Browse the repository at this point in the history
… using pullup
  • Loading branch information
SukuWc committed May 29, 2024
1 parent da2c53e commit 9b7a0a2
Show file tree
Hide file tree
Showing 5 changed files with 78 additions and 2 deletions.
46 changes: 46 additions & 0 deletions Firmware/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Use the base image
FROM docker.io/espressif/idf:v5.1.2

# Install pico sdk required dependencies
RUN apt update && \
apt install -y git python3 cmake gcc-arm-none-eabi libnewlib-arm-none-eabi build-essential xxd && \
mkdir -p pico && \
cd pico && \
git clone https://github.com/raspberrypi/pico-sdk.git --branch master && \
cd pico-sdk/ && \
git submodule update --init && \
cd ../.. && \
\
git clone https://github.com/emscripten-core/emsdk.git && \
cd emsdk && \
git pull && \
./emsdk install latest && \
./emsdk activate latest && \
. ./emsdk_env.sh && \
cd ..

# Set working directory

WORKDIR /

ENV PICO_SDK_PATH=/pico/pico-sdk

ENV EMSDK=/emsdk EM_CONFIG=/emsdk/.emscripten EMSDK_NODE=/emsdk/node/14.18.2_64bit/bin/node PATH=/emsdk:/emsdk/upstream/emscripten:/emsdk/upstream/bin:/emsdk/node/14.18.2_64bit/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
# Set up environment variables
ENV CODEQL_HOME=/opt/codeql
ENV PATH="${CODEQL_HOME}/codeql:${PATH}"

# Install CodeQL CLI tools
RUN mkdir -p ${CODEQL_HOME} && \
curl -L https://github.com/github/codeql-cli-binaries/releases/latest/download/codeql-linux64.zip -o ${CODEQL_HOME}/codeql.zip && \
unzip ${CODEQL_HOME}/codeql.zip -d ${CODEQL_HOME} && \
rm ${CODEQL_HOME}/codeql.zip && \
codeql --version

RUN cd ${CODEQL_HOME} && git clone --recursive https://github.com/github/codeql.git codeql-repo

RUN apt update && \
apt install -y socat

# Define default command
CMD ["bash"]
14 changes: 14 additions & 0 deletions Firmware/docker_build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/bash

# Check if Docker is installed
if command -v docker &> /dev/null; then
CONTAINER_TOOL="docker"
# Check if Podman is installed
elif command -v podman &> /dev/null; then
CONTAINER_TOOL="podman"
else
echo "Neither Docker nor Podman found. Please install one of them to proceed."
exit 1
fi

$CONTAINER_TOOL build -t idf-pico-merged .
14 changes: 14 additions & 0 deletions Firmware/docker_start.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/bash

# Check if Docker is installed
if command -v docker &> /dev/null; then
CONTAINER_TOOL="docker"
# Check if Podman is installed
elif command -v podman &> /dev/null; then
CONTAINER_TOOL="podman"
else
echo "Neither Docker nor Podman found. Please install one of them to proceed."
exit 1
fi

$CONTAINER_TOOL run --privileged --network=host -it -v /dev:/dev -v $PWD:/project -w /project/ idf-pico-merged
2 changes: 1 addition & 1 deletion Firmware/main/idf_component.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
## IDF Component Manager Manifest File
dependencies:
sukuwc/grid_common: "^2024.5.211458"
sukuwc/grid_esp32_led: "*"
sukuwc/grid_esp32_nvm: "*"
sukuwc/grid_common: "*"
joltwallet/littlefs: "*"
## Required IDF version
idf:
Expand Down
4 changes: 3 additions & 1 deletion Firmware/main/midi_host_fw.c
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ uint8_t grid_platform_get_adc_bit_depth(void) { return 12; }
#include "grid_led.h"
#include "grid_lua_api.h"
#include "grid_ui.h"
#include "grid_ui_system.h"

#include "grid_esp32_led.h"
#include "grid_esp32_nvm.h"
Expand All @@ -174,7 +175,7 @@ void knot_module_ui_init(struct grid_ain_model* ain, struct grid_led_model* led,
// grid_ui_element_init(ui, j, GRID_UI_ELEMENT_POTENTIOMETER);
}

grid_ui_element_init(ui, ui->element_list_length - 1, GRID_UI_ELEMENT_SYSTEM);
grid_ui_element_system_init(&ui->element_list[ui->element_list_length - 1]);

// ui->lua_ui_init_callback = grid_lua_ui_init_po16;
}
Expand Down Expand Up @@ -234,6 +235,7 @@ void app_main(void) {

// MIDI A/B SWITCH AND THROUGH BUTTON INTERACTIVITY
gpio_set_direction(SW_AB_PIN, GPIO_MODE_INPUT);
gpio_pullup_en(SW_AB_PIN);
gpio_set_direction(SW_MODE_PIN, GPIO_MODE_INPUT);

SemaphoreHandle_t nvm_or_port = xSemaphoreCreateBinary();
Expand Down

0 comments on commit 9b7a0a2

Please sign in to comment.