hiro/KSP-30-Hack
1
0
Fork 0
mirror of https://github.com/vale981/KSP-30-Hack synced 2025-03-04 17:01:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

clang format

Browse source
This commit is contained in:
Valentin Boettcher 2021-08-14 11:15:31 +02:00
parent fd760767a6
commit 1019a9da2c
No known key found for this signature in database
GPG key ID: E034E12B7AF56ACE
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
keyboard/keyboard.ino
View file

@ -42,19 +42,19 @@ constexpr int num_half_pins = 4;
constexpr int first_col[] = {KD1, KD2, KD3, KD4}; constexpr int first_col[] = {KD1, KD2, KD3, KD4};
// second hit // second hit
constexpr int second_col[] = { KD5, KD6, KD7, KD8 }; constexpr int second_col[] = {KD5, KD6, KD7, KD8};
constexpr int selector_pins[] = {SA1, SA2, SA3, SA4, SA5}; constexpr int selector_pins[] = {SA1, SA2, SA3, SA4, SA5};
constexpr int num_selector_pins = 5; constexpr int num_selector_pins = 5;
enum Range { LO = 0, MID, HI}; enum Range { LO = 0, MID, HI };
constexpr Range ranges[] = {Range::LO, Range::MID, Range::HI}; constexpr Range ranges[] = {Range::LO, Range::MID, Range::HI};
// rows in range // rows in range
constexpr int rows [] = {8, 8, 6}; constexpr int rows[] = {8, 8, 6};
constexpr int range_offsets [] = {0, constexpr int range_offsets[] = {0, rows[1] * num_half_pins,
rows[1] * num_half_pins, rows[0] * num_half_pins +
rows[0] * num_half_pins + rows[1] * num_half_pins}; rows[1] * num_half_pins};
/*****************************************************************************/ /*****************************************************************************/
/* Keys/Notes */ /* Keys/Notes */
@ -73,7 +73,7 @@ constexpr double max_velocity = 0.00030;
/*****************************************************************************/ /*****************************************************************************/
void select_range(Range range) { void select_range(Range range) {
switch(range) { switch (range) {
case Range::LO: case Range::LO:
digitalWrite(RS1, LOW); digitalWrite(RS1, LOW);
digitalWrite(RS2, LOW); digitalWrite(RS2, LOW);
@ -118,15 +118,15 @@ int get_midi_note(Range range, int row, int col) {
} }
char midi_velocity(double velocity) { char midi_velocity(double velocity) {
return (constrain(velocity, min_velocity, max_velocity) - min_velocity) / max_velocity * 127; return (constrain(velocity, min_velocity, max_velocity) - min_velocity) /
max_velocity * 127;
} }
/*****************************************************************************/ /*****************************************************************************/
/* State */ /* State */
/*****************************************************************************/ /*****************************************************************************/
unsigned long S1[num_keys]; // timer value for first hit or 0 unsigned long S1[num_keys]; // timer value for first hit or 0
bool S2[num_keys]; // whether key is pressed bool S2[num_keys]; // whether key is pressed
bool SSTE_PRESSED = false; bool SSTE_PRESSED = false;
void setup() { void setup() {
@ -190,30 +190,30 @@ void loop() {
select_row(row); select_row(row);
// read rows // read rows
for(int i= 0; i < num_half_pins; i++) { for (int i = 0; i < num_half_pins; i++) {
const bool s1_was_triggered = !(S1[key] == 0); const bool s1_was_triggered = !(S1[key] == 0);
if (!digitalRead(first_col[i])) { // key pressed if (!digitalRead(first_col[i])) { // key pressed
if(!s1_was_triggered) { // has not been depreesed before if (!s1_was_triggered) { // has not been depreesed before
S1[key] = micros(); S1[key] = micros();
} }
// look for second fire // look for second fire
const bool s2_was_triggered = S2[key]; const bool s2_was_triggered = S2[key];
if (!digitalRead(second_col[i])) { // stage 2 pressed if (!digitalRead(second_col[i])) { // stage 2 pressed
if(!s2_was_triggered){ if (!s2_was_triggered) {
S2[key] = true; S2[key] = true;
auto velocity = 1/static_cast<double>(micros() - S1[key]); auto velocity = 1 / static_cast<double>(micros() - S1[key]);
send_note_down(key, velocity); send_note_down(key, velocity);
} }
} else if(s2_was_triggered) { // stage 2 released } else if (s2_was_triggered) { // stage 2 released
S2[key] = false; S2[key] = false;
send_note_up(key); send_note_up(key);
} }
} else if(s1_was_triggered) { // s1 released } else if (s1_was_triggered) { // s1 released
S1[key] = 0; S1[key] = 0;
if(S2[key]) { if (S2[key]) {
S2[key] = false; S2[key] = false;
send_note_up(key); send_note_up(key);
} }

2
shell.nix
View file

@ -1,4 +1,4 @@
{ pkgs ? import <nixos> {} }: { pkgs ? import <nixos> {} }:
pkgs.mkShell { pkgs.mkShell {
nativeBuildInputs = with pkgs; [ arduino git arduino-cli picocom ]; nativeBuildInputs = with pkgs; [ arduino git arduino-cli picocom clang-tools ];
} }