Kizarm/RISC-V
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

midi melody start on button PD3/GND

Browse source
This commit is contained in:
Kizarm 2024-03-12 13:24:01 +01:00
parent db0af9c275
commit e39352208d
5 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ch32v003/gpio.h
View file

@ -14,6 +14,11 @@ enum GPIO_CNF : uint32_t {
GPIO_UPDI_MPPO = 2u << 2, GPIO_UPDI_MPPO = 2u << 2,
GPIO_none_MPDO = 3u << 2, GPIO_none_MPDO = 3u << 2,
}; };
enum GPIOPuPd_TypeDef {
GPIO_PuPd_NOPULL = 0x00,
GPIO_PuPd_UP = 0x01,
GPIO_PuPd_DOWN = 0x02
};
class GpioClass { class GpioClass {
GPIOA_Type & port; GPIOA_Type & port;
@ -42,6 +47,10 @@ class GpioClass {
operator bool () const { operator bool () const {
return port.INDR.R & (1u << pin); return port.INDR.R & (1u << pin);
} }
void setPuPd (GPIOPuPd_TypeDef p) {
if (p != GPIO_PuPd_UP) return;
port.OUTDR.R |= 1u << pin;
}
}; };
#endif // _GPIO_CLASS_H_ #endif // _GPIO_CLASS_H_

10
midi/midiplayer.cpp
View file

@ -48,11 +48,12 @@ static unsigned pwm_sd (const int input) {
/******************************************************************/ /******************************************************************/
/// Konstruktor /// Konstruktor
MidiPlayer::MidiPlayer() noexcept : OneWay(), led (LED_CFG), passcnt (0u) { MidiPlayer::MidiPlayer() noexcept : OneWay(), led (LED_CFG), but (BUT_CFG), passcnt (0u) {
index = 0; index = 0;
pause = 0; pause = 0;
melody = scores[index++]; melody = scores[index++];
running = true; running = false;
but.setPuPd (GPIO_PuPd_UP);
} }
void MidiPlayer::pass() { void MidiPlayer::pass() {
const bool b = passcnt & 0x10000; const bool b = passcnt & 0x10000;
@ -61,7 +62,8 @@ void MidiPlayer::pass() {
} }
unsigned MidiPlayer::Send (uint16_t * const ptr, const unsigned len) { unsigned MidiPlayer::Send (uint16_t * const ptr, const unsigned len) {
//if (!but.get()) running = true; // případně spouštět tlačítkem, není implementováno const bool b = but;
if (!b and !running) running = true;
if (!running) { if (!running) {
for (unsigned n=0; n<len; n++) ptr [n] = MAXPWM >> 1; for (unsigned n=0; n<len; n++) ptr [n] = MAXPWM >> 1;
@ -75,7 +77,7 @@ unsigned MidiPlayer::Send (uint16_t * const ptr, const unsigned len) {
return len; return len;
} }
void MidiPlayer::stop (void) { void MidiPlayer::stop (void) {
//running = false; // na konci každé melodie stop running = false; // na konci každé melodie stop
melody = scores[index++]; melody = scores[index++];
if (!melody) { if (!melody) {
index = 0; index = 0;

2
midi/midiplayer.h
View file

@ -19,7 +19,7 @@ class MidiPlayer : public OneWay {
/// Obsluha vzorku /// Obsluha vzorku
short nextSample (void); short nextSample (void);
private: private:
GpioClass led; GpioClass led, but;
unsigned passcnt; unsigned passcnt;
volatile bool running; volatile bool running;
unsigned char const * melody; unsigned char const * melody;

4
midi/pwmconfig.h
View file

@ -4,10 +4,12 @@
static constexpr unsigned HALF_LEN = 0x80u; static constexpr unsigned HALF_LEN = 0x80u;
static constexpr unsigned MAXPWM = 2000u; static constexpr unsigned MAXPWM = 2000u;
#ifdef __riscv #if __riscv
#define LED_CFG GPIOD,4 #define LED_CFG GPIOD,4
#define BUT_CFG GPIOD,3,(GPIO_Speed_In | GPIO_UPDI_MPPO)
#elif __arm__ #elif __arm__
#define LED_CFG GpioPortA,0 #define LED_CFG GpioPortA,0
#define BUT_CFG GpioPortA,3,GPIO_Mode_IN
#else #else
#error "bad target" #error "bad target"
#endif #endif

5
stm32f051/gpio.h
View file

@ -91,13 +91,16 @@ class GpioClass {
/// Načti logickou hodnotu na pinu /// Načti logickou hodnotu na pinu
const bool get (void) const { const bool get (void) const {
if (io->IDR.R & pos) return true; if (io->IDR.R & pos) return true;
else return false; else return false;
}; };
/// A to samé jako operátor /// A to samé jako operátor
const GpioClass& operator>> (bool& b) const { const GpioClass& operator>> (bool& b) const {
b = get(); b = get();
return *this; return *this;
} }
operator bool () const {
return get();
}
//![Gpio example] //![Gpio example]
void setMode (GPIOMode_TypeDef p) { void setMode (GPIOMode_TypeDef p) {
uint32_t dno = num * 2; uint32_t dno = num * 2;