moved a bunch of things and added documentation

.gitmodules

 [submodule "lib/berkeley-db-1.xx"]
-	path = lib/berkeley-db-1.xx
+	path = micropython/lib/berkeley-db-1.xx
 	url = https://github.com/pfalcon/berkeley-db-1.xx
 [submodule "lib/micropython-lib"]
-	path = lib/micropython-lib
+	path = micropython/lib/micropython-lib
 	url = https://github.com/micropython/micropython-lib.git

README.md

-[![CI badge](https://github.com/micropython/micropython/workflows/unix%20port/badge.svg)](https://github.com/micropython/micropython/actions?query=branch%3Amaster+event%3Apush) [![codecov](https://codecov.io/gh/micropython/micropython/branch/master/graph/badge.svg?token=I92PfD05sD)](https://codecov.io/gh/micropython/micropython)
-
-The MicroPython project
-=======================
-<p align="center">
-  <img src="https://raw.githubusercontent.com/micropython/micropython/master/logo/upython-with-micro.jpg" alt="MicroPython Logo"/>
-</p>
-
-This is the MicroPython project, which aims to put an implementation
-of Python 3.x on microcontrollers and small embedded systems.
-You can find the official website at [micropython.org](http://www.micropython.org).
-
-WARNING: this project is in beta stage and is subject to changes of the
-code-base, including project-wide name changes and API changes.
-
-MicroPython implements the entire Python 3.4 syntax (including exceptions,
-`with`, `yield from`, etc., and additionally `async`/`await` keywords from
-Python 3.5 and some select features from later versions). The following core
-datatypes are provided: `str`(including basic Unicode support), `bytes`,
-`bytearray`, `tuple`, `list`, `dict`, `set`, `frozenset`, `array.array`,
-`collections.namedtuple`, classes and instances. Builtin modules include
-`os`, `sys`, `time`, `re`, and `struct`, etc. Select ports have support for
-`_thread` module (multithreading), `socket` and `ssl` for networking, and
-`asyncio`. Note that only a subset of Python 3 functionality is implemented
-for the data types and modules.
-
-MicroPython can execute scripts in textual source form (.py files) or from
-precompiled bytecode (.mpy files), in both cases either from an on-device
-filesystem or "frozen" into the MicroPython executable.
-
-MicroPython also provides a set of MicroPython-specific modules to access
-hardware-specific functionality and peripherals such as GPIO, Timers, ADC,
-DAC, PWM, SPI, I2C, CAN, Bluetooth, and USB.
-
-Getting started
----------------
-
-See the [online documentation](https://docs.micropython.org/) for API
-references and information about using MicroPython and information about how
-it is implemented.
-
-We use [GitHub Discussions](https://github.com/micropython/micropython/discussions)
-as our forum, and [Discord](https://discord.gg/RB8HZSAExQ) for chat. These
-are great places to ask questions and advice from the community or to discuss your
-MicroPython-based projects.
-
-For bugs and feature requests, please [raise an issue](https://github.com/micropython/micropython/issues/new/choose)
-and follow the templates there.
-
-For information about the [MicroPython pyboard](https://store.micropython.org/pyb-features),
-the officially supported board from the
-[original Kickstarter campaign](https://www.kickstarter.com/projects/214379695/micro-python-python-for-microcontrollers),
-see the [schematics and pinouts](http://github.com/micropython/pyboard) and
-[documentation](https://docs.micropython.org/en/latest/pyboard/quickref.html).
-
-Contributing
-------------
-
-MicroPython is an open-source project and welcomes contributions. To be
-productive, please be sure to follow the
-[Contributors' Guidelines](https://github.com/micropython/micropython/wiki/ContributorGuidelines)
-and the [Code Conventions](https://github.com/micropython/micropython/blob/master/CODECONVENTIONS.md).
-Note that MicroPython is licenced under the MIT license, and all contributions
-should follow this license.
-
-About this repository
----------------------
-
-This repository contains the following components:
-- [py/](py/) -- the core Python implementation, including compiler, runtime, and
-  core library.
-- [mpy-cross/](mpy-cross/) -- the MicroPython cross-compiler which is used to turn scripts
-  into precompiled bytecode.
-- [ports/](ports/) -- platform-specific code for the various ports and architectures that MicroPython runs on.
-- [lib/](lib/) -- submodules for external dependencies.
-- [tests/](tests/) -- test framework and test scripts.
-- [docs/](docs/) -- user documentation in Sphinx reStructuredText format. This is used to generate the [online documentation](http://docs.micropython.org).
-- [extmod/](extmod/) -- additional (non-core) modules implemented in C.
-- [tools/](tools/) -- various tools, including the pyboard.py module.
-- [examples/](examples/) -- a few example Python scripts.
-
-"make" is used to build the components, or "gmake" on BSD-based systems.
-You will also need bash, gcc, and Python 3.3+ available as the command `python3`
-(if your system only has Python 2.7 then invoke make with the additional option
-`PYTHON=python2`). Some ports (rp2 and esp32) additionally use CMake.
-
-Supported platforms & architectures
------------------------------------
-
-MicroPython runs on a wide range of microcontrollers, as well as on Unix-like
-(including Linux, BSD, macOS, WSL) and Windows systems.
-
-Microcontroller targets can be as small as 256kiB flash + 16kiB RAM, although
-devices with at least 512kiB flash + 128kiB RAM allow a much more
-full-featured experience.
-
-The [Unix](ports/unix) and [Windows](ports/windows) ports allow both
-development and testing of MicroPython itself, as well as providing
-lightweight alternative to CPython on these platforms (in particular on
-embedded Linux systems).
-
-The ["minimal"](ports/minimal) port provides an example of a very basic
-MicroPython port and can be compiled as both a standalone Linux binary as
-well as for ARM Cortex M4. Start with this if you want to port MicroPython to
-another microcontroller. Additionally the ["bare-arm"](ports/bare-arm) port
-is an example of the absolute minimum configuration, and is used to keep
-track of the code size of the core runtime and VM.
-
-In addition, the following ports are provided in this repository:
- - [cc3200](ports/cc3200) -- Texas Instruments CC3200 (including PyCom WiPy).
- - [esp32](ports/esp32) -- Espressif ESP32 SoC (including ESP32S2, ESP32S3, ESP32C3).
- - [esp8266](ports/esp8266) -- Espressif ESP8266 SoC.
- - [mimxrt](ports/mimxrt) -- NXP m.iMX RT (including Teensy 4.x).
- - [nrf](ports/nrf) -- Nordic Semiconductor nRF51 and nRF52.
- - [pic16bit](ports/pic16bit) -- Microchip PIC 16-bit.
- - [powerpc](ports/powerpc) -- IBM PowerPC (including Microwatt)
- - [qemu-arm](ports/qemu-arm) -- QEMU-based emulated target, for testing)
- - [renesas-ra](ports/renesas-ra) -- Renesas RA family.
- - [rp2](ports/rp2) -- Raspberry Pi RP2040 (including Pico and Pico W).
- - [samd](ports/samd) -- Microchip (formerly Atmel) SAMD21 and SAMD51.
- - [stm32](ports/stm32) -- STMicroelectronics STM32 family (including F0, F4, F7, G0, G4, H7, L0, L4, WB)
- - [teensy](ports/teensy) -- Teensy 3.x.
- - [webassembly](ports/webassembly) -- Emscripten port targeting browsers and NodeJS.
- - [zephyr](ports/zephyr) -- Zephyr RTOS.
-
-The MicroPython cross-compiler, mpy-cross
------------------------------------------
-
-Most ports require the [MicroPython cross-compiler](mpy-cross) to be built
-first.  This program, called mpy-cross, is used to pre-compile Python scripts
-to .mpy files which can then be included (frozen) into the
-firmware/executable for a port.  To build mpy-cross use:
-
-    $ cd mpy-cross
-    $ make
-
-External dependencies
----------------------
-
-The core MicroPython VM and runtime has no external dependencies, but a given
-port might depend on third-party drivers or vendor HALs. This repository
-includes [several submodules](lib/) linking to these external dependencies.
-Before compiling a given port, use
-
-    $ cd ports/name
+## current hw functionality
+plays an infinite scripted note sequence and provides a basic micropython repl
+makes extra noise when Crtl+D'd in the repl (importing py libraries works too)
+
+## how to build
+
+1. install esp-idf v4.4:
+(copied from https://www.wemos.cc/en/latest/tutorials/others/build_micropython_esp32.html)
+```
+$ cd ~
+$ git clone https://github.com/espressif/esp-idf.git
+$ cd esp-idf
+$ git checkout v4.4
+$ git submodule update --init --recursive
+
+$ cd esp-idf
+$ ./install.sh
+$ source export.sh
+```
+best put something like "alias espidf='source ~/esp-idf/export.sh'" in your .bashrc etc,
+you need to run it in every new terminal and adding it to autostart did bother us
+
+2. prepare build
+```
+$ cd micropython/
+$ make -C mpy-cross
+$ cd ports/esp32
 $ make submodules
-
-to ensure that all required submodules are initialised.
+```
+3. build/flash
+make sure esp-idf is sourced as in step 1 and that you are in micropython/ports/esp32
+build:
+```
+$ make
+```
+flash + build: (put badge into bootloader mode*)
+```
+$ make deploy PORT=/dev/ttyACM0
+```
+__*press right shoulder button down during boot (on modified "last gen" prototypes)__
+
+empty build cache (useful when moving files around):
+```
+$ make clean
+```
+
+4. access micropython repl:
+```
+$ picocom -b 115200 /dev/ttyACM0
+```
+
+## how to modify
+
+general info
+global + micropython entry point: app_main() in micropython/ports/esp32/main.c (includes badge23/espan.h)
+c entry point, called by^: os_app_main() in badge23/espan.c
+register new c files for compilation: add to set(BADGE23_LIB) in micropython/ports/esp32/main/CMakelists.txt
+change output volume in the set_global_vol_dB(int8_t) call; -90 for mute
+
+to debug c files: printf broken atm, instead use:
+#include "../../py/mphal.h"
+mp_hal_stdout_tx_str("debug output: string literal here\n\r");
+
+don't expect esp component registry or idf.py menuconfig to work.
+tried adding config items manually to micropython/ports/esp32/boards/sdkconfig.badge23, doesn't work :/
+just put them into header files manually ig;;

ports/esp32/badge23/audio.c → badge23/audio.c

@@ -178,8 +178,21 @@ static void _audio_init(void) {
 }
 
 #define MIN(a,b) ((a > b) ? b : a)
-#define GLOBAL_VOL 3000
 #define LR_PHASE -1
+#define NAT_LOG_DB 0.1151292546497023
+
+static uint16_t _global_vol = 3000;
+
+void set_global_vol_dB(int8_t vol_dB){
+    if(vol_dB < (BADGE_MIN_VOLUME_DB)){
+        _global_vol = 0;
+    } else {
+        if(vol_dB > (BADGE_MAX_VOLUME_DB)) vol_dB = (BADGE_MAX_VOLUME_DB);
+        uint16_t buf =  3000 * exp(vol_dB * NAT_LOG_DB);
+        if(buf > (BADGE_VOLUME_LIMIT)) buf = (BADGE_VOLUME_LIMIT);
+        _global_vol = buf;
+    }
+}
 
 static void audio_player_task(void* arg) {
     int16_t buffer[DMA_BUFFER_SIZE * 2];
@@ -193,7 +206,7 @@ static void audio_player_task(void* arg) {
                 sample += trad_osc(&(synths[j]));
             }
             write_to_scope((int16_t) (1600. * sample));
-            sample = GLOBAL_VOL * sample;
+            sample = _global_vol * sample;
             if(sample > 32767) sample = 32767;
             if(sample < -32767) sample = -32767;
             buffer[i] = (int16_t) sample;

ports/esp32/badge23/audio.h → badge23/audio.h

@@ -2,6 +2,9 @@
 #include <stdint.h>
 
 #define SAMPLE_RATE 16000
+#define BADGE_MAX_VOLUME_DB 20
+#define BADGE_MIN_VOLUME_DB (-80)
+#define BADGE_VOLUME_LIMIT 30000
 
 void audio_init();
 void play_bootsound();
@@ -12,3 +15,6 @@ void synth_start(int i);
 void synth_stop(int i);
 void synth_fullstop(int i);
 float synth_get_env(int i);
+
+void set_global_vol_dB(int8_t vol_dB);
+

ports/esp32/badge23/espan.c → badge23/espan.c

@@ -89,21 +89,21 @@ void espan_handle_captouch(uint16_t pressed_top, uint16_t pressed_bot)
 #define VIOLIN_VOL_BOOST 0.004
 #define VIOLIN_SENS_POW 2
 
-void old_app_main(void)
+void os_app_main(void)
 {
     ESP_ERROR_CHECK(i2c_master_init());
     ESP_LOGI(TAG, "I2C initialized successfully");
 
     vTaskDelay(1000 / portTICK_PERIOD_MS);
-    mp_hal_stdout_tx_str("test\n\r");
+    set_global_vol_dB(0);
 
     audio_init();
     leds_init();
     //display_init();
     captouch_init();
 
-    mp_hal_stdout_tx_str("test2\n\r");
-    play_bootsound();
+    mp_hal_stdout_tx_str("task inits done\n\r");
+    //play_bootsound();
     //not sure how slow captouch_get_cross is so duplicating edge detection here;
     bool prev_petals[10] = {0};
     //pitch bend as movement relative to inital touch pos to make intonation easier