Thu 14 Nov 2019 08:32:53 EST - backlight fix

Author: 32teeth

Launchers/retro-esp32/components/odroid/odroid_input.c

@@ -27,8 +27,8 @@ static float adc_value = 0.0f;
 static float forced_adc_value = 0.0f;
 static bool battery_monitor_enabled = true;
 
-#define BACKLIGHT_LEVEL_COUNT (4)
-static int BacklightLevels[BACKLIGHT_LEVEL_COUNT] = {10, 33, 66, 100};
+#define BACKLIGHT_LEVEL_COUNT (10)
+static int BacklightLevels[BACKLIGHT_LEVEL_COUNT] = {10,20,30,40,50,60,70,80,90,100};
 static int BacklightLevel = BACKLIGHT_LEVEL_COUNT - 1;
 
 int is_backlight_initialized();

Launchers/retro-esp32/main/includes/core.h

@@ -34,7 +34,10 @@
 /*
   Drivers
 */
+#include "driver/i2c.h"
 #include "driver/gpio.h"
+#include <driver/adc.h>
+#include "esp_adc_cal.h"
 #include "driver/sdmmc_host.h"
 #include "driver/sdspi_host.h"
 #include "driver/ledc.h"

Launchers/retro-esp32/main/main.c

@@ -22,7 +22,7 @@
   int OPTION = 0;
   int PREVIOUS = 0;
   int32_t VOLUME = 0;
-  int32_t BRIGHTNESS = 10;
+  int32_t BRIGHTNESS = 0;
   int32_t BRIGHTNESS_LEVELS[10] = {10,20,30,40,50,60,70,80,90,100};
   int8_t USER;
   int8_t SETTING;
@@ -136,7 +136,7 @@
     ili9341_clear(0);
 
     BRIGHTNESS = odroid_settings_Backlight_get();
-    odroid_settings_Backlight_set(BRIGHTNESS);
+    //odroid_settings_Backlight_set(BRIGHTNESS);
 
     //printf("==============\n%s\n==============\n", "RETRO ESP32");
     switch(esp_reset_reason()) {
@@ -427,8 +427,7 @@
 
 //{#pragma region Brightness
   void draw_brightness() {
-    //int32_t brightness = get_brightness();
-    //printf("\n******\nbrightness:%d\n******\n", brightness);
+    BRIGHTNESS = get_brightness();
     int x = SCREEN.w - 120;
     int y = POS.y + 106;
     int w, h;
@@ -457,36 +456,40 @@
       ili9341_write_frame_rectangleLE(x, y, (10 * BRIGHTNESS)+10, 7, buffer);
     //}
 
-    draw_speaker();
+    //draw_speaker();
   }
   int32_t get_brightness() {
     return odroid_settings_Backlight_get();
   }
   void set_brightness() {
-    printf("\n******\nBRIGHTNESS:%d\nBRIGHTNESS_LEVELS[%d]:%d\n******\n", BRIGHTNESS, BRIGHTNESS,BRIGHTNESS_LEVELS[BRIGHTNESS]);
     odroid_settings_Backlight_set(BRIGHTNESS);
+    usleep(15000);
     apply_brightness();
-    draw_brightness();
+    //draw_brightness();    
   }
   void apply_brightness() {
     const int DUTY_MAX = 0x1fff;
     int duty = DUTY_MAX * (BRIGHTNESS_LEVELS[BRIGHTNESS] * 0.01f);
 
-    printf("\n******\nBRIGHTNESS:%d\nBRIGHTNESS_LEVELS[%d]:%d\nduty:%d\n******\n",
-      BRIGHTNESS,
-      BRIGHTNESS,
-      BRIGHTNESS_LEVELS[BRIGHTNESS],
-      duty);
-
-    if(is_backlight_initialized()) {
+    //if(is_backlight_initialized()) {
       uint32_t currentDuty = ledc_get_duty(LEDC_LOW_SPEED_MODE, LEDC_CHANNEL_0);
+      printf("\n******\nBRIGHTNESS:%d\nBRIGHTNESS_LEVELS[%d]:%d\nduty:%d\ncurrentDuty:%d\n******\n",
+        BRIGHTNESS,
+        BRIGHTNESS,
+        BRIGHTNESS_LEVELS[BRIGHTNESS],
+        duty,
+        currentDuty);      
+      //if (currentDuty != duty) {
+        ledc_set_fade_with_time(LEDC_LOW_SPEED_MODE, LEDC_CHANNEL_0, duty, 1);
+        ledc_fade_start(LEDC_LOW_SPEED_MODE, LEDC_CHANNEL_0, LEDC_FADE_WAIT_DONE);
+        ledc_set_duty(LEDC_LOW_SPEED_MODE, LEDC_CHANNEL_0, duty);
+      //}
+    //}
 
-      ledc_set_fade_with_time(LEDC_LOW_SPEED_MODE, LEDC_CHANNEL_0, duty, 1);
-      ledc_fade_start(LEDC_LOW_SPEED_MODE, LEDC_CHANNEL_0, LEDC_FADE_WAIT_DONE /*LEDC_FADE_NO_WAIT*/);
-    }
-
+    //backlight_percentage_set(BRIGHTNESS_LEVELS[BRIGHTNESS]);
   }
 //}#pragma endregion Brightness
+
 //{#pragma region Theme
   void draw_themes() {
     int x = ORIGIN.x;

Launchers/retro-esp32/sdkconfig

@@ -37,7 +37,7 @@ CONFIG_FLASH_ENCRYPTION_ENABLED=
 #
 # Serial flasher config
 #
-CONFIG_ESPTOOLPY_PORT="/dev/cu.usbserial-A1015RV2"
+CONFIG_ESPTOOLPY_PORT="/dev/cu.SLAB_USBtoUART"
 CONFIG_ESPTOOLPY_BAUD_115200B=
 CONFIG_ESPTOOLPY_BAUD_230400B=
 CONFIG_ESPTOOLPY_BAUD_921600B=y
@@ -82,10 +82,10 @@ CONFIG_MONITOR_BAUD=115200
 #
 # Retro ESP32 Configuration
 #
-CONFIG_LCD_DRIVER_CHIP_ODROID_GO=
-CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=y
-CONFIG_DEFAULT_MENU_KEY=
-CONFIG_COMBO_MENU_KEY=y
+CONFIG_LCD_DRIVER_CHIP_ODROID_GO=y
+CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=
+CONFIG_DEFAULT_MENU_KEY=y
+CONFIG_COMBO_MENU_KEY=
 
 #
 # Partition Table

Launchers/retro-esp32/sdkconfig.old

@@ -82,10 +82,10 @@ CONFIG_MONITOR_BAUD=115200
 #
 # Retro ESP32 Configuration
 #
-CONFIG_LCD_DRIVER_CHIP_ODROID_GO=
-CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=y
-CONFIG_DEFAULT_MENU_KEY=
-CONFIG_COMBO_MENU_KEY=y
+CONFIG_LCD_DRIVER_CHIP_ODROID_GO=y
+CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=
+CONFIG_DEFAULT_MENU_KEY=y
+CONFIG_COMBO_MENU_KEY=
 
 #
 # Partition Table
@@ -170,9 +170,9 @@ CONFIG_SPIRAM_SUPPORT=y
 #
 CONFIG_SPIRAM_BOOT_INIT=y
 CONFIG_SPIRAM_IGNORE_NOTFOUND=
-CONFIG_SPIRAM_USE_MEMMAP=
+CONFIG_SPIRAM_USE_MEMMAP=y
 CONFIG_SPIRAM_USE_CAPS_ALLOC=
-CONFIG_SPIRAM_USE_MALLOC=y
+CONFIG_SPIRAM_USE_MALLOC=
 CONFIG_SPIRAM_TYPE_AUTO=y
 CONFIG_SPIRAM_TYPE_ESPPSRAM32=
 CONFIG_SPIRAM_TYPE_ESPPSRAM64=
@@ -183,10 +183,6 @@ CONFIG_SPIRAM_MEMTEST=y
 CONFIG_SPIRAM_CACHE_WORKAROUND=y
 CONFIG_SPIRAM_BANKSWITCH_ENABLE=y
 CONFIG_SPIRAM_BANKSWITCH_RESERVE=8
-CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=16384
-CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST=
-CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
-CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=
 CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=
 CONFIG_MEMMAP_TRACEMEM=
 CONFIG_MEMMAP_TRACEMEM_TWOBANKS=
@@ -265,6 +261,7 @@ CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
 CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=10
 CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32
 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y
+CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=
 CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0
 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=16
 CONFIG_ESP32_WIFI_CSI_ENABLED=