From 3dc636ff7a9581e5a8e3c137f39ed6b221919365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jurij=20Podgor=C5=A1ek?= Date: Fri, 27 May 2022 14:56:35 +0200 Subject: [PATCH] Cleanup, dodan wemos prototip --- kbd/kbd/kbd.ino | 23 ----------------- kbdtest/{kbdtest => }/kbdtest.ino | 0 keypadtest/{keypadtest => }/keypadtest.ino | 0 osc32final/osc32final.ino | 29 +++++++++++++++------- 4 files changed, 20 insertions(+), 32 deletions(-) delete mode 100644 kbd/kbd/kbd.ino rename kbdtest/{kbdtest => }/kbdtest.ino (100%) rename keypadtest/{keypadtest => }/keypadtest.ino (100%) diff --git a/kbd/kbd/kbd.ino b/kbd/kbd/kbd.ino deleted file mode 100644 index 34bd5f0..0000000 --- a/kbd/kbd/kbd.ino +++ /dev/null @@ -1,23 +0,0 @@ -// Keyboard Matrix Tutorial Example -// baldengineer.com -// CC BY-SA 4.0 - -// JP1 is an input -byte keys[] = {16, 17, 5, 18}; -byte pressed[] = {0, 0, 0, 0}; -byte KEYLEN = 4; - -void setup() { - Serial.begin(9600); - for(int i = 0; i < KEYLEN; i++) { - pinMode(keys[i], INPUT_PULLUP); - } -} -void loop() { - for(int i = 0; i < KEYLEN; i++) { - pressed[i] = !digitalRead(keys[i]); - Serial.print(String(pressed[i]) + " "); - } - Serial.println(); - delay(50); -} diff --git a/kbdtest/kbdtest/kbdtest.ino b/kbdtest/kbdtest.ino similarity index 100% rename from kbdtest/kbdtest/kbdtest.ino rename to kbdtest/kbdtest.ino diff --git a/keypadtest/keypadtest/keypadtest.ino b/keypadtest/keypadtest.ino similarity index 100% rename from keypadtest/keypadtest/keypadtest.ino rename to keypadtest/keypadtest.ino diff --git a/osc32final/osc32final.ino b/osc32final/osc32final.ino index 99944de..93be945 100644 --- a/osc32final/osc32final.ino +++ b/osc32final/osc32final.ino @@ -16,7 +16,8 @@ using namespace BLA; //#define WIFI_OSC #define BT_OSC -#define OUTPUT_READABLE_WORLDACCEL +//#define OUTPUT_READABLE_WORLDACCEL +#define OUTPUT_READABLE_REALACCEL // SERIAL #ifdef BOARD_HAS_USB_SERIAL @@ -204,13 +205,13 @@ void setup() { // supply your own gyro offsets here, scaled for min sensitivity // !!! Run Zero IMU to get readings (read comments for instructions) - /* First proto (right hand, black&blue)*/ - mpu.setXGyroOffset(76); - mpu.setYGyroOffset(68); - mpu.setZGyroOffset(10); - mpu.setXAccelOffset(-3527); - mpu.setYAccelOffset(-913); - mpu.setZAccelOffset(1027); + /* Kegel */ + mpu.setXAccelOffset(-4011); + mpu.setYAccelOffset(1059); + mpu.setZAccelOffset(4738); + mpu.setXGyroOffset(86); + mpu.setYGyroOffset(69); + mpu.setZGyroOffset(-1); /* Second proto, translucent / white mpu.setXGyroOffset(-3650); @@ -220,6 +221,15 @@ void setup() { mpu.setYAccelOffset(-16); mpu.setZAccelOffset(-12); */ + + /* Third proto, D1 mini + mpu.setXAccelOffset(-1272); + mpu.setYAccelOffset(-700); + mpu.setZAccelOffset(1486); + mpu.setXGyroOffset(60); + mpu.setYGyroOffset(11); + mpu.setZGyroOffset(28); + */ // make sure it worked (returns 0 if so) if (devStatus == 0) { @@ -261,7 +271,8 @@ void setup() { #endif #ifdef BT_OSC - SerialBT.begin("wavey wind"); + //SerialBT.begin("wavey wind"); + SerialBT.begin("wavey wind 2"); #endif }