Merge pull request #1224 from kwagyeman/kwabena/add_buzzer_module

Add support for the new buzzer module
This commit is contained in:
Ibrahim Abd Elkader 2021-03-15 20:38:31 +02:00 committed by GitHub
commit b4f747812b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 172 additions and 1 deletions

View File

@ -152,6 +152,11 @@ MPY_CFLAGS += -DMICROPY_PY_TV=1
MICROPY_ARGS += MICROPY_PY_TV=1
endif
ifeq ($(MICROPY_PY_BUZZER), 1)
MPY_CFLAGS += -DMICROPY_PY_BUZZER=1
MICROPY_ARGS += MICROPY_PY_BUZZER=1
endif
# Include the port Makefile.
include $(OMV_DIR)/ports/$(PORT)/omv_portconfig.mk

@ -1 +1 @@
Subproject commit 2d1323048adbbba9d90ec263e463951118c75643
Subproject commit 56358108e100a9a1a16caee3de089bb8bbdb43f7

View File

@ -23,3 +23,4 @@ MICROPY_PY_AUDIO = 0
MICROPY_PY_MICRO_SPEECH = 0
MICROPY_PY_LCD = 1
MICROPY_PY_TV = 1
MICROPY_PY_BUZZER = 0

View File

@ -16,4 +16,5 @@ MICROPY_PY_ULAB=1
MICROPY_PY_AUDIO=1
MICROPY_PY_LCD = 0
MICROPY_PY_TV = 0
MICROPY_PY_BUZZER = 0
MICROPY_PY_SENSOR = 1

View File

@ -16,3 +16,4 @@ MICROPY_PY_SENSOR = 1
MICROPY_PY_WINC1500 = 1
MICROPY_PY_LCD = 1
MICROPY_PY_TV = 1
MICROPY_PY_BUZZER = 0

View File

@ -17,3 +17,4 @@ MICROPY_PY_ULAB = 1
MICROPY_PY_WINC1500 = 1
MICROPY_PY_LCD = 1
MICROPY_PY_TV = 1
MICROPY_PY_BUZZER = 0

View File

@ -18,3 +18,4 @@ MICROPY_PY_WINC1500 = 1
MICROPY_PY_IMU = 1
MICROPY_PY_LCD = 1
MICROPY_PY_TV = 1
MICROPY_PY_BUZZER = 0

View File

@ -17,3 +17,4 @@ MICROPY_PY_ULAB = 1
MICROPY_PY_WINC1500 = 1
MICROPY_PY_LCD = 1
MICROPY_PY_TV = 1
MICROPY_PY_BUZZER = 0

View File

@ -620,6 +620,20 @@
#define OMV_FIR_LEPTON_MCLK_TIM_RELEASE_RESET() __HAL_RCC_TIM15_RELEASE_RESET()
#define OMV_FIR_LEPTON_MCLK_TIM_PCLK_FREQ() HAL_RCC_GetPCLK2Freq()
// Buzzer
#define OMV_BUZZER_PIN (GPIO_PIN_1)
#define OMV_BUZZER_PORT (GPIOA)
#define OMV_BUZZER_ALT (GPIO_AF1_TIM2)
#define OMV_BUZZER_FREQ (4000)
#define OMV_BUZZER_TIM (TIM2)
#define OMV_BUZZER_TIM_CHANNEL (TIM_CHANNEL_2)
#define OMV_BUZZER_TIM_CLK_ENABLE() __HAL_RCC_TIM2_CLK_ENABLE()
#define OMV_BUZZER_TIM_CLK_DISABLE() __HAL_RCC_TIM2_CLK_DISABLE()
#define OMV_BUZZER_TIM_FORCE_RESET() __HAL_RCC_TIM2_FORCE_RESET()
#define OMV_BUZZER_TIM_RELEASE_RESET() __HAL_RCC_TIM2_RELEASE_RESET()
#define OMV_BUZZER_TIM_PCLK_FREQ() HAL_RCC_GetPCLK1Freq()
// Enable additional GPIO banks for DRAM...
#define OMV_ENABLE_GPIO_BANK_F
#define OMV_ENABLE_GPIO_BANK_G

View File

@ -17,3 +17,4 @@ MICROPY_PY_ULAB = 1
MICROPY_PY_WINC1500 = 1
MICROPY_PY_LCD = 1
MICROPY_PY_TV = 1
MICROPY_PY_BUZZER = 1

View File

@ -22,3 +22,4 @@ MICROPY_PY_AUDIO = 1
MICROPY_PY_MICRO_SPEECH = 1
MICROPY_PY_LCD = 1
MICROPY_PY_TV = 1
MICROPY_PY_BUZZER = 0

View File

@ -71,6 +71,7 @@
#include "py_lcd.h"
#include "py_fir.h"
#include "py_tv.h"
#include "py_buzzer.h"
#include "py_imu.h"
#include "py_audio.h"
@ -498,6 +499,9 @@ soft_reset:
py_lcd_init0();
py_fir_init0();
py_tv_init0();
#if MICROPY_PY_BUZZER
py_buzzer_init0();
#endif // MICROPY_PY_BUZZER
imlib_init_all();
readline_init0();
pin_init0();

View File

@ -0,0 +1,112 @@
/*
* This file is part of the OpenMV project.
*
* Copyright (c) 2013-2021 Ibrahim Abdelkader <iabdalkader@openmv.io>
* Copyright (c) 2013-2021 Kwabena W. Agyeman <kwagyeman@openmv.io>
*
* This work is licensed under the MIT license, see the file LICENSE for details.
*
* Buzzer Python module.
*/
#include "py/obj.h"
#include "omv_boardconfig.h"
#include STM32_HAL_H
#if MICROPY_PY_BUZZER
static TIM_HandleTypeDef buzzer_tim_handle = {};
static int buzzer_freq = OMV_BUZZER_FREQ;
static int buzzer_duty = 0;
static void buzzer_setup(int freq, int duty)
{
int tclk = OMV_BUZZER_TIM_PCLK_FREQ() * 2;
int period = (tclk / freq) - 1;
int pulse = (period * duty) / 510;
if (((buzzer_duty <= 0) || (255 < buzzer_duty)) && (0 < duty) && (duty <= 255)) {
GPIO_InitTypeDef GPIO_InitStructure;
GPIO_InitStructure.Pull = GPIO_NOPULL;
GPIO_InitStructure.Mode = GPIO_MODE_AF_PP;
GPIO_InitStructure.Speed = GPIO_SPEED_FREQ_LOW;
GPIO_InitStructure.Alternate = OMV_BUZZER_ALT;
GPIO_InitStructure.Pin = OMV_BUZZER_PIN;
HAL_GPIO_Init(OMV_BUZZER_PORT, &GPIO_InitStructure);
buzzer_tim_handle.Instance = OMV_BUZZER_TIM;
buzzer_tim_handle.Init.Prescaler = 0;
buzzer_tim_handle.Init.CounterMode = TIM_COUNTERMODE_UP;
buzzer_tim_handle.Init.Period = period;
buzzer_tim_handle.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
buzzer_tim_handle.Init.RepetitionCounter = 0;
buzzer_tim_handle.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_ENABLE;
TIM_OC_InitTypeDef buzzer_tim_oc_handle;
buzzer_tim_oc_handle.Pulse = pulse;
buzzer_tim_oc_handle.OCMode = TIM_OCMODE_PWM1;
buzzer_tim_oc_handle.OCPolarity = TIM_OCPOLARITY_HIGH;
buzzer_tim_oc_handle.OCNPolarity = TIM_OCNPOLARITY_HIGH;
buzzer_tim_oc_handle.OCFastMode = TIM_OCFAST_DISABLE;
buzzer_tim_oc_handle.OCIdleState = TIM_OCIDLESTATE_RESET;
buzzer_tim_oc_handle.OCNIdleState = TIM_OCNIDLESTATE_RESET;
HAL_TIM_PWM_Init(&buzzer_tim_handle);
HAL_TIM_PWM_ConfigChannel(&buzzer_tim_handle, &buzzer_tim_oc_handle, OMV_BUZZER_TIM_CHANNEL);
HAL_TIM_PWM_Start(&buzzer_tim_handle, OMV_BUZZER_TIM_CHANNEL);
} else if ((0 < buzzer_duty) && (buzzer_duty <= 255) && ((duty <= 0) || (255 < duty))) {
HAL_TIM_PWM_Stop(&buzzer_tim_handle, OMV_BUZZER_TIM_CHANNEL);
HAL_TIM_PWM_DeInit(&buzzer_tim_handle);
HAL_GPIO_DeInit(OMV_BUZZER_PORT, OMV_BUZZER_PIN);
} else if ((0 < buzzer_duty) && (buzzer_duty <= 255) && (0 < duty) && (duty <= 255)) {
__HAL_TIM_SET_AUTORELOAD(&buzzer_tim_handle, period);
__HAL_TIM_SET_COMPARE(&buzzer_tim_handle, OMV_BUZZER_TIM_CHANNEL, pulse);
}
buzzer_freq = freq;
buzzer_duty = duty;
}
STATIC mp_obj_t py_buzzer_freq(uint n_args, const mp_obj_t *args)
{
if (!n_args) {
return mp_obj_new_int(buzzer_freq);
} else {
buzzer_setup(mp_obj_get_int(*args), buzzer_duty);
return mp_const_none;
}
}
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(py_buzzer_freq_obj, 0, 1, py_buzzer_freq);
STATIC mp_obj_t py_buzzer_duty(uint n_args, const mp_obj_t *args)
{
if (!n_args) {
return mp_obj_new_int(buzzer_duty);
} else {
buzzer_setup(buzzer_freq, mp_obj_get_int(*args));
return mp_const_none;
}
}
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(py_buzzer_duty_obj, 0, 1, py_buzzer_duty);
static const mp_rom_map_elem_t globals_dict_table[] = {
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_buzzer) },
{ MP_ROM_QSTR(MP_QSTR_RESONANT_FREQ), MP_ROM_INT(OMV_BUZZER_FREQ) },
{ MP_ROM_QSTR(MP_QSTR_freq), MP_ROM_PTR(&py_buzzer_freq_obj) },
{ MP_ROM_QSTR(MP_QSTR_duty), MP_ROM_PTR(&py_buzzer_duty_obj) }
};
STATIC MP_DEFINE_CONST_DICT(globals_dict, globals_dict_table);
const mp_obj_module_t buzzer_module = {
.base = { &mp_type_module },
.globals = (mp_obj_t) &globals_dict,
};
void py_buzzer_init0()
{
buzzer_setup(OMV_BUZZER_FREQ, 0);
}
#endif // MICROPY_PY_BUZZER

View File

@ -0,0 +1,14 @@
/*
* This file is part of the OpenMV project.
*
* Copyright (c) 2013-2021 Ibrahim Abdelkader <iabdalkader@openmv.io>
* Copyright (c) 2013-2021 Kwabena W. Agyeman <kwagyeman@openmv.io>
*
* This work is licensed under the MIT license, see the file LICENSE for details.
*
* Buzzer Python module.
*/
#ifndef __PY_BUZZER_H__
#define __PY_BUZZER_H__
void py_buzzer_init0();
#endif // __PY_BUZZER_H__

View File

@ -289,6 +289,12 @@ void HAL_TIM_PWM_MspInit(TIM_HandleTypeDef *htim)
OMV_LCD_BL_TIM_CLK_ENABLE();
}
#endif
#if defined(OMV_BUZZER_TIM)
if (htim->Instance == OMV_BUZZER_TIM) {
OMV_BUZZER_TIM_CLK_ENABLE();
}
#endif
}
void HAL_TIM_PWM_MspDeInit(TIM_HandleTypeDef *htim)
@ -300,6 +306,14 @@ void HAL_TIM_PWM_MspDeInit(TIM_HandleTypeDef *htim)
OMV_LCD_BL_TIM_CLK_DISABLE();
}
#endif
#if defined(OMV_BUZZER_TIM)
if (htim->Instance == OMV_BUZZER_TIM) {
OMV_BUZZER_TIM_FORCE_RESET();
OMV_BUZZER_TIM_RELEASE_RESET();
OMV_BUZZER_TIM_CLK_DISABLE();
}
#endif
}
void HAL_DCMI_MspInit(DCMI_HandleTypeDef* hdcmi)