Merge branch 'kamotswind-patch-1'

OtherCrashOverride · Jul 9, 2018 · 329b31c · 329b31c
2 parents 461950a + 544db59
commit 329b31c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/odroid-go-common/components/odroid/odroid_audio.c b/odroid-go-common/components/odroid/odroid_audio.c
@@ -14,7 +14,7 @@
 
 static float Volume = 1.0f;
 static odroid_volume_level volumeLevel = ODROID_VOLUME_LEVEL3;
-static int volumeLevels[] = {0, 150, 500, 1000};
+static int volumeLevels[] = {0, 125, 250, 500, 1000};
 static int audio_sample_rate;
 
 

diff --git a/odroid-go-common/components/odroid/odroid_audio.h b/odroid-go-common/components/odroid/odroid_audio.h
@@ -1,14 +1,15 @@
 #pragma once
 
 
-#define ODROID_VOLUME_LEVEL_COUNT (4)
+#define ODROID_VOLUME_LEVEL_COUNT (5)
 
 typedef enum
 {
     ODROID_VOLUME_LEVEL0 = 0,
     ODROID_VOLUME_LEVEL1 = 1,
     ODROID_VOLUME_LEVEL2 = 2,
     ODROID_VOLUME_LEVEL3 = 3,
+    ODROID_VOLUME_LEVEL4 = 4,
 
     _ODROID_VOLUME_FILLER = 0xffffffff
 } odroid_volume_level;

diff --git a/odroid-go-common/components/odroid/odroid_settings.c b/odroid-go-common/components/odroid/odroid_settings.c
@@ -297,7 +297,7 @@ int32_t odroid_settings_DataSlot_get()
 	err = nvs_get_i32(my_handle, NvsKey_DataSlot, &result);
 	if (err == ESP_OK)
     {
-        printf("odroid_settings_AppSlot_get: value=%d\n", result);
+        printf("odroid_settings_DataSlot_get: value=%d\n", result);
 	}
 
 
@@ -335,7 +335,7 @@ int32_t odroid_settings_Backlight_get()
     err = nvs_get_i32(my_handle, NvsKey_Backlight, &result);
     if (err == ESP_OK)
     {
-        printf("odroid_settings_Volume_get: value=%d\n", result);
+        printf("odroid_settings_Backlight_get: value=%d\n", result);
     }
 
     // Close