Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from micknoise:master #12

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
42 changes: 42 additions & 0 deletions .github/workflows/static.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Simple workflow for deploying static content to GitHub Pages
name: Deploy static content to Pages

on:
# Runs on pushes targeting the default branch
push:
branches: ["master"]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

# Allow one concurrent deployment
concurrency:
group: "pages"
cancel-in-progress: true

jobs:
# Single deploy job since we're just deploying
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Setup Pages
uses: actions/configure-pages@v3
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
with:
# Upload entire repository
path: 'docs'
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v1
12 changes: 11 additions & 1 deletion src/libs/maxiPolyBLEP.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,17 @@ class CHEERP_EXPORT maxiPolyBLEP {
blep.setPulseWidth(pw);
}

/* Set sample rate */
void setSampleRate(double sampleRate) {
blep.setSampleRate(sampleRate);
}

/* Sync modulation */
void sync(double phase) {
blep.sync(phase);
}

private:
PolyBLEP blep = PolyBLEP(44100);

};
};
4 changes: 4 additions & 0 deletions src/maximilian.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
#include <fstream>
#include <string.h>
#include <cstdlib>
#include <cstdint>
#include <limits>
#include "math.h"
#include <cmath>
#include <vector>
Expand Down Expand Up @@ -2316,6 +2318,7 @@ class CHEERP_EXPORT maxiEnvGen {
}
if (retrigger) {
if (retriggerDetector.onZX(trigger)) {
nxcHappened = false;
reset();
}
}
Expand All @@ -2336,6 +2339,7 @@ class CHEERP_EXPORT maxiEnvGen {
}
if (retrigger) {
if (retriggerDetector.onZX(trigger)) {
nxcHappened = false;
reset();
}
}
Expand Down