micropython 273 B

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657
  1. commit 52168fc98fd2578b20fb9ed915ea0d3fa1948e20
  2. Author: Oliver Fabel <28701799+ofabel@users.noreply.github.com>
  3. Date: Tue Sep 3 06:54:29 2024 +0200
  4. library update
  5. diff --git a/genhdr/qstrdefs.generated.h b/genhdr/qstrdefs.generated.h
  6. index f72163067..fd176e837 100644
  7. --- a/genhdr/qstrdefs.generated.h
  8. +++ b/genhdr/qstrdefs.generated.h
  9. @@ -303,6 +303,8 @@ QDEF1(MP_QSTR_SPEAKER_NOTE_GS5, 15, 16, "SPEAKER_NOTE_GS5")
  10. QDEF1(MP_QSTR_SPEAKER_NOTE_GS6, 12, 16, "SPEAKER_NOTE_GS6")
  11. QDEF1(MP_QSTR_SPEAKER_NOTE_GS7, 13, 16, "SPEAKER_NOTE_GS7")
  12. QDEF1(MP_QSTR_SPEAKER_NOTE_GS8, 2, 16, "SPEAKER_NOTE_GS8")
  13. +QDEF1(MP_QSTR_SPEAKER_VOLUME_MAX, 66, 18, "SPEAKER_VOLUME_MAX")
  14. +QDEF1(MP_QSTR_SPEAKER_VOLUME_MIN, 92, 18, "SPEAKER_VOLUME_MIN")
  15. QDEF0(MP_QSTR___add__, 196, 7, "__add__")
  16. QDEF0(MP_QSTR___bool__, 43, 8, "__bool__")
  17. QDEF1(MP_QSTR___build_class__, 66, 15, "__build_class__")
  18. diff --git a/mp_flipper_modflipperzero.c b/mp_flipper_modflipperzero.c
  19. index 3cfc81982..2c46dc925 100644
  20. --- a/mp_flipper_modflipperzero.c
  21. +++ b/mp_flipper_modflipperzero.c
  22. @@ -194,6 +194,9 @@ static const struct _mp_obj_float_t flipperzero_speaker_note_a8_obj = {{&mp_type
  23. static const struct _mp_obj_float_t flipperzero_speaker_note_as8_obj = {{&mp_type_float}, (mp_float_t)MP_FLIPPER_SPEAKER_NOTE_AS8};
  24. static const struct _mp_obj_float_t flipperzero_speaker_note_b8_obj = {{&mp_type_float}, (mp_float_t)MP_FLIPPER_SPEAKER_NOTE_B8};
  25. +static const struct _mp_obj_float_t flipperzero_speaker_volume_min_obj = {{&mp_type_float}, (mp_float_t)MP_FLIPPER_SPEAKER_VOLUME_MIN};
  26. +static const struct _mp_obj_float_t flipperzero_speaker_volume_max_obj = {{&mp_type_float}, (mp_float_t)MP_FLIPPER_SPEAKER_VOLUME_MAX};
  27. +
  28. static mp_obj_t flipperzero_speaker_start(mp_obj_t frequency_obj, mp_obj_t volume_obj) {
  29. mp_float_t frequency = mp_obj_get_float(frequency_obj);
  30. mp_float_t volume = mp_obj_get_float(volume_obj);
  31. @@ -607,6 +610,9 @@ for octave in range(9):
  32. {MP_ROM_QSTR(MP_QSTR_SPEAKER_NOTE_AS8), MP_ROM_PTR(&flipperzero_speaker_note_as8_obj)},
  33. {MP_ROM_QSTR(MP_QSTR_SPEAKER_NOTE_B8), MP_ROM_PTR(&flipperzero_speaker_note_b8_obj)},
  34. + {MP_ROM_QSTR(MP_QSTR_SPEAKER_VOLUME_MIN), MP_ROM_PTR(&flipperzero_speaker_volume_min_obj)},
  35. + {MP_ROM_QSTR(MP_QSTR_SPEAKER_VOLUME_MAX), MP_ROM_PTR(&flipperzero_speaker_volume_max_obj)},
  36. +
  37. {MP_ROM_QSTR(MP_QSTR_speaker_start), MP_ROM_PTR(&flipperzero_speaker_start_obj)},
  38. {MP_ROM_QSTR(MP_QSTR_speaker_set_volume), MP_ROM_PTR(&flipperzero_speaker_set_volume_obj)},
  39. {MP_ROM_QSTR(MP_QSTR_speaker_stop), MP_ROM_PTR(&flipperzero_speaker_stop_obj)},
  40. diff --git a/mp_flipper_modflipperzero.h b/mp_flipper_modflipperzero.h
  41. index 3742ad47e..104fe3f33 100644
  42. --- a/mp_flipper_modflipperzero.h
  43. +++ b/mp_flipper_modflipperzero.h
  44. @@ -168,6 +168,9 @@ for octave in range(9):
  45. #define MP_FLIPPER_SPEAKER_NOTE_AS8 MICROPY_FLOAT_CONST(7458.62)
  46. #define MP_FLIPPER_SPEAKER_NOTE_B8 MICROPY_FLOAT_CONST(7902.13)
  47. +#define MP_FLIPPER_SPEAKER_VOLUME_MIN MICROPY_FLOAT_CONST(0.0)
  48. +#define MP_FLIPPER_SPEAKER_VOLUME_MAX MICROPY_FLOAT_CONST(1.0)
  49. +
  50. bool mp_flipper_speaker_start(float frequency, float volume);
  51. bool mp_flipper_speaker_set_volume(float volume);
  52. bool mp_flipper_speaker_stop();