Merge pull request #53 from hfmanson/master

Fix get_sample_byte, int8_t -> uint8_t

Author: renzenicolai

Makefile

@@ -29,6 +29,7 @@ prepare-sha2017: prepare
 
 clean:
 	rm -rf "$(BUILDDIR)"
+	rm components/micropython/mpconfigoverrides.h
 	source "$(IDF_PATH)/export.sh" && idf.py clean
 
 build:

components/driver_sndmixer/snd_source_wav.c

@@ -73,7 +73,7 @@ int IRAM_ATTR wav_init_source(const void *data_start, const void *data_end, int
     chunk_hdr_t *ch = (chunk_hdr_t *)p;
     if (memcmp(ch->magic, "fmt ", 4) == 0) {
       if (ch->fmt.fmtcode != WAVE_FORMAT_PCM) {
-        printf("Unsupported wav format: %d\n", ch->fmt.fmtcode);
+        ESP_LOGW(TAG, "Unsupported wav format: %d\n", ch->fmt.fmtcode);
         goto err;
       }
       wav->rate     = ch->fmt.samplespersec;
@@ -91,10 +91,10 @@ int IRAM_ATTR wav_init_source(const void *data_start, const void *data_end, int
   }
 
   if (wav->bits != 8 && wav->bits != 16) {
-    printf("No fmt chunk or unsupported bits/sample: %d\n", wav->bits);
+    ESP_LOGW(TAG, "No fmt chunk or unsupported bits/sample: %d\n", wav->bits);
     goto err;
   }
-  printf("Wav: %d bit/sample, %d Hz, %d bytes long\n", wav->bits, wav->rate, wav->data_len);
+  ESP_LOGI(TAG, "channels: %d, bits: %d, rate: %d, len: %d", wav->channels, wav->bits, wav->rate, wav->data_len);
   wav->pos = 0;
   *ctx     = (void *)wav;
   *stereo  = (wav->channels >= 2);
@@ -183,8 +183,8 @@ int IRAM_ATTR wav_get_sample_rate(void *ctx) {
   return wav->rate;
 }
 
-int8_t get_sample_byte(wav_ctx_t *wav) {
-  int8_t rv = 0;
+uint8_t get_sample_byte(wav_ctx_t *wav) {
+  uint8_t rv = 0;
   if(wav->stream) {
     int read = wav->stream_read(wav->stream, &rv, 1);
     wav->pos += read;

components/micropython/help.c

@@ -4,4 +4,11 @@ const char esp32_help_text[] =
     "Welcome to BadgePython!\n"
     "\n"
     "Please visit https://docs.badge.team/ for documentation and a getting started guide.\n"
+    "\n"
+    "Control commands:\n"
+    "  CTRL-A        -- on a blank line, enter raw REPL mode\n"
+    "  CTRL-B        -- on a blank line, enter normal REPL mode\n"
+    "  CTRL-C        -- interrupt a running program\n"
+    "  CTRL-D        -- on a blank line, do a soft reset of the board\n"
+    "  CTRL-E        -- on a blank line, enter paste mode\n"
     "\n";

partition_tables/mch2022.csv

@@ -3,7 +3,6 @@
 	nvs,		data,	nvs,		0x9000,		16K,
 	otadata,	data,	ota,		0xD000,		8K,
 	phy_init,	data,	phy,		0xF000,		4K,
-	ota_0,		0,		ota_0,		0x10000,	1600K,
-	ota_1,		0,		ota_1,		0x1A0000,	1600K,
+	ota_0,		0,		ota_0,		0x10000,	3200K,
 	appfs,		0x43,	3,			0x330000,	8000K,
 	locfd,		data,	fat,		0xB00000,	5120K,