Skip to content

Commit

Permalink
Release 0.7 R1
Browse files Browse the repository at this point in the history
  • Loading branch information
@karawin
karawin committed Nov 4, 2017
1 parent aa40286 commit 960658a
Show file tree
Hide file tree
Showing 50 changed files with 13,263 additions and 13,142 deletions.
Binary file modified build/KaRadio32.bin
View file
Binary file not shown.
Binary file modified build/KaRadio32.elf
View file
Binary file not shown.
22,912 changes: 11,464 additions & 11,448 deletions build/KaRadio32.map
View file

Large diffs are not rendered by default.

Binary file modified build/audio_renderer/audio_renderer.o
View file
Binary file not shown.
Binary file modified build/audio_renderer/libaudio_renderer.a
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions build/main/ClickEncoder.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ ClickEncoder.o: C:/msys32/home/jp/esp/Ka-Radio32/main/ClickEncoder.c \
C:/msys32/home/jp/esp/esp-idf/components/newlib/include/limits.h \
C:/msys32/home/jp/esp/esp-idf/components/freertos/include/freertos/list.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/websocket.h \
C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto\sha1_i.h \
C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto/sha1_i.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/interface.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/telnet.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/addon.h \
Expand Down Expand Up @@ -319,7 +319,7 @@ C:/msys32/home/jp/esp/esp-idf/components/freertos/include/freertos/list.h:

C:/msys32/home/jp/esp/Ka-Radio32/main/include/websocket.h:

C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto\sha1_i.h:
C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto/sha1_i.h:

C:/msys32/home/jp/esp/Ka-Radio32/main/include/interface.h:

Expand Down
Binary file modified build/main/ClickEncoder.o
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions build/main/addon.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ addon.o: C:/msys32/home/jp/esp/Ka-Radio32/main/addon.c \
C:/msys32/home/jp/esp/esp-idf/components/newlib/include/limits.h \
C:/msys32/home/jp/esp/esp-idf/components/freertos/include/freertos/list.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/websocket.h \
C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto\sha1_i.h \
C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto/sha1_i.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/interface.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/telnet.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/addon.h \
Expand Down Expand Up @@ -334,7 +334,7 @@ C:/msys32/home/jp/esp/esp-idf/components/freertos/include/freertos/list.h:

C:/msys32/home/jp/esp/Ka-Radio32/main/include/websocket.h:

C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto\sha1_i.h:
C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto/sha1_i.h:

C:/msys32/home/jp/esp/Ka-Radio32/main/include/interface.h:

Expand Down
Binary file modified build/main/addon.o
View file
Binary file not shown.
11 changes: 4 additions & 7 deletions build/main/app_main.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,8 @@ app_main.o: C:/msys32/home/jp/esp/Ka-Radio32/main/app_main.c \
C:/msys32/home/jp/esp/esp-idf/components/freertos/include/freertos/event_groups.h \
C:/msys32/home/jp/esp/esp-idf/components/freertos/include/freertos/timers.h \
C:/msys32/home/jp/esp/esp-idf/components/freertos/include/freertos/task.h \
C:/msys32/home/jp/esp/esp-idf/components/freertos/include/freertos\queue.h \
C:/msys32/home/jp/esp/esp-idf/components/esp32/include/esp_wifi.h \
C:/msys32/home/jp/esp/esp-idf/components/freertos/include/freertos/queue.h \
C:/msys32/home/jp/esp/esp-idf/components/esp32/include/esp_wifi.h \
C:/msys32/home/jp/esp/esp-idf/components/esp32/include/rom/queue.h \
C:/msys32/home/jp/esp/esp-idf/components/esp32/include/esp_wifi_types.h \
C:/msys32/home/jp/esp/esp-idf/components/esp32/include/esp_interface.h \
Expand Down Expand Up @@ -193,7 +192,7 @@ app_main.o: C:/msys32/home/jp/esp/Ka-Radio32/main/app_main.c \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/webclient.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/webserver.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/websocket.h \
C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto\sha1_i.h \
C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto/sha1_i.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/interface.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/telnet.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/addon.h \
Expand Down Expand Up @@ -366,12 +365,10 @@ C:/msys32/home/jp/esp/esp-idf/components/freertos/include/freertos/timers.h:

C:/msys32/home/jp/esp/esp-idf/components/freertos/include/freertos/task.h:

C:/msys32/home/jp/esp/esp-idf/components/freertos/include/freertos\queue.h:
C:/msys32/home/jp/esp/esp-idf/components/freertos/include/freertos/queue.h:

C:/msys32/home/jp/esp/esp-idf/components/esp32/include/esp_wifi.h:

C:/msys32/home/jp/esp/esp-idf/components/freertos/include/freertos/queue.h:

C:/msys32/home/jp/esp/esp-idf/components/esp32/include/rom/queue.h:

C:/msys32/home/jp/esp/esp-idf/components/esp32/include/esp_wifi_types.h:
Expand Down Expand Up @@ -588,7 +585,7 @@ C:/msys32/home/jp/esp/Ka-Radio32/main/include/webserver.h:

C:/msys32/home/jp/esp/Ka-Radio32/main/include/websocket.h:

C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto\sha1_i.h:
C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto/sha1_i.h:

C:/msys32/home/jp/esp/Ka-Radio32/main/include/interface.h:

Expand Down
Binary file modified build/main/app_main.o
View file
Binary file not shown.
Binary file modified build/main/eeprom.o
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions build/main/interface.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ interface.o: C:/msys32/home/jp/esp/Ka-Radio32/main/interface.c \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/webclient.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/webserver.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/websocket.h \
C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto\sha1_i.h \
C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto/sha1_i.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/vs1053.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/gpio.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/ota.h \
Expand Down Expand Up @@ -361,7 +361,7 @@ C:/msys32/home/jp/esp/Ka-Radio32/main/include/webserver.h:

C:/msys32/home/jp/esp/Ka-Radio32/main/include/websocket.h:

C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto\sha1_i.h:
C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto/sha1_i.h:

C:/msys32/home/jp/esp/Ka-Radio32/main/include/vs1053.h:

Expand Down
Binary file modified build/main/interface.o
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions build/main/irnec.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ irnec.o: C:/msys32/home/jp/esp/Ka-Radio32/main/irnec.c \
C:/msys32/home/jp/esp/esp-idf/components/newlib/include/limits.h \
C:/msys32/home/jp/esp/esp-idf/components/freertos/include/freertos/list.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/websocket.h \
C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto\sha1_i.h \
C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto/sha1_i.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/interface.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/telnet.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/addon.h \
Expand Down Expand Up @@ -323,7 +323,7 @@ C:/msys32/home/jp/esp/esp-idf/components/freertos/include/freertos/list.h:

C:/msys32/home/jp/esp/Ka-Radio32/main/include/websocket.h:

C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto\sha1_i.h:
C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto/sha1_i.h:

C:/msys32/home/jp/esp/Ka-Radio32/main/include/interface.h:

Expand Down
Binary file modified build/main/irnec.o
View file
Binary file not shown.
Binary file modified build/main/libmain.a
View file
Binary file not shown.
Binary file modified build/main/ntp.o
View file
Binary file not shown.
Binary file modified build/main/ota.o
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions build/main/servers.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ servers.o: C:/msys32/home/jp/esp/Ka-Radio32/main/servers.c \
C:/msys32/home/jp/esp/esp-idf/components/lwip/include/lwip/lwip/inet.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/telnet.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/websocket.h \
C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto\sha1_i.h \
C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto/sha1_i.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/webserver.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/websocket.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/interface.h \
Expand Down Expand Up @@ -337,7 +337,7 @@ C:/msys32/home/jp/esp/Ka-Radio32/main/include/telnet.h:

C:/msys32/home/jp/esp/Ka-Radio32/main/include/websocket.h:

C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto\sha1_i.h:
C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto/sha1_i.h:

C:/msys32/home/jp/esp/Ka-Radio32/main/include/webserver.h:

Expand Down
Binary file modified build/main/servers.o
View file
Binary file not shown.
Binary file modified build/main/telnet.o
View file
Binary file not shown.
Binary file modified build/main/vs1053.o
View file
Binary file not shown.
Binary file modified build/main/vs1053b-patches.o
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions build/main/webclient.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ webclient.o: C:/msys32/home/jp/esp/Ka-Radio32/main/webclient.c \
C:/msys32/home/jp/esp/esp-idf/components/freertos/include/freertos/semphr.h \
C:/msys32/home/jp/esp/esp-idf/components/freertos/include/freertos/queue.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/websocket.h \
C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto\sha1_i.h \
C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto/sha1_i.h \
C:/msys32/home/jp/esp/esp-idf/components/newlib/include/string.h \
C:/msys32/home/jp/esp/esp-idf/components/newlib/include/sys/string.h \
C:/msys32/home/jp/esp/esp-idf/components/lwip/include/lwip/lwip/sockets.h \
Expand Down Expand Up @@ -311,7 +311,7 @@ C:/msys32/home/jp/esp/esp-idf/components/freertos/include/freertos/queue.h:

C:/msys32/home/jp/esp/Ka-Radio32/main/include/websocket.h:

C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto\sha1_i.h:
C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto/sha1_i.h:

C:/msys32/home/jp/esp/esp-idf/components/newlib/include/string.h:

Expand Down
Binary file modified build/main/webclient.o
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions build/main/webserver.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ webserver.o: C:/msys32/home/jp/esp/Ka-Radio32/main/webserver.c \
C:/msys32/home/jp/esp/esp-idf/components/freertos/include/freertos/semphr.h \
C:/msys32/home/jp/esp/esp-idf/components/freertos/include/freertos/queue.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/websocket.h \
C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto\sha1_i.h \
C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto/sha1_i.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/serv-fs.h \
c:\msys32\home\jp\esp\ka-radio32\webpage\index \
c:\msys32\home\jp\esp\ka-radio32\webpage\style \
Expand Down Expand Up @@ -346,7 +346,7 @@ C:/msys32/home/jp/esp/esp-idf/components/freertos/include/freertos/queue.h:

C:/msys32/home/jp/esp/Ka-Radio32/main/include/websocket.h:

C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto\sha1_i.h:
C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto/sha1_i.h:

C:/msys32/home/jp/esp/Ka-Radio32/main/include/serv-fs.h:

Expand Down
Binary file modified build/main/webserver.o
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions build/main/websocket.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ websocket.o: C:/msys32/home/jp/esp/Ka-Radio32/main/websocket.c \
C:/msys32/home/jp/esp/esp-idf/components/lwip/include/lwip/lwip/inet.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/cencode_inc.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/websocket.h \
C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto\sha1_i.h \
C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto/sha1_i.h \
C:/msys32/home/jp/esp/Ka-Radio32/main/include/interface.h \
C:/msys32/home/jp/esp/esp-idf/components/log/include/esp_log.h \
C:/msys32/home/jp/esp/esp-idf/components/log/include/esp_log_internal.h \
Expand Down Expand Up @@ -349,7 +349,7 @@ C:/msys32/home/jp/esp/Ka-Radio32/main/include/cencode_inc.h:

C:/msys32/home/jp/esp/Ka-Radio32/main/include/websocket.h:

C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto\sha1_i.h:
C:/msys32/home/jp/esp/esp-idf/components/wpa_supplicant/include/crypto/sha1_i.h:

C:/msys32/home/jp/esp/Ka-Radio32/main/include/interface.h:

Expand Down
Binary file modified build/main/websocket.o
View file
Binary file not shown.
68 changes: 53 additions & 15 deletions components/audio_renderer/audio_renderer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,9 @@ void renderer_volume(uint32_t vol)
// log volume (magic)
vol = 256 - vol;
uint32_t value = (log10(255/((float)vol+1)) * 105.54571334);
if (value > 254) value = 256;
if (value >= 254) value = 256;
renderer_instance->volume = value<<8; // *256
ESP_LOGI(TAG, "Rendere volume: %X",renderer_instance->volume );
}
//-----------

Expand All @@ -118,18 +119,34 @@ void render_samples(char *buf, uint32_t buf_len, pcm_format_t *buf_desc)

uint8_t buf_bytes_per_sample = (buf_desc->bit_depth / 8);
uint32_t num_samples = buf_len / buf_bytes_per_sample / buf_desc->num_channels;

//KaraDio32 Volume control
register uint32_t mult = renderer_instance->volume;
if (mult!= 0x10000) // need volume?

if ((mult!= 0x10000) && (renderer_instance->output_mode != DAC_BUILT_IN))// need volume?
{
int16_t *psample;
psample = (int16_t*)buf;
for (int i = 0; i < num_samples*buf_desc->num_channels; i++)
if (buf_bytes_per_sample ==2)
{
int temp = psample[i] * mult;
psample[i] = temp>>16 & 0xFFFF;
}
int16_t *psample;
uint32_t pmax;
psample = (int16_t*)buf;
pmax = num_samples*buf_desc->num_channels;
for (int32_t i = 0; i < pmax; i++)
{
int32_t temp = (int32_t)psample[i] * mult;
psample[i] = (temp>>16) & 0xFFFF;
}
} else
{
int32_t *psample;
uint32_t pmax;
psample = (int32_t*)buf;
pmax = num_samples*buf_desc->num_channels;
for (int32_t i = 0; i < pmax; i++)
{
int64_t temp = psample[i] * mult;
psample[i] = (temp>>16) & 0xFFFFFFFF;
}
}
}
//-------------------------

Expand All @@ -140,7 +157,7 @@ void render_samples(char *buf, uint32_t buf_len, pcm_format_t *buf_desc)
&& renderer_instance->output_mode != DAC_BUILT_IN) {

// do not wait longer than the duration of the buffer
TickType_t max_wait = buf_desc->sample_rate / num_samples / 2;
// TickType_t max_wait = buf_desc->sample_rate / num_samples / 2;

// don't block, rather retry
int bytes_left = buf_len;
Expand Down Expand Up @@ -178,19 +195,40 @@ void render_samples(char *buf, uint32_t buf_len, pcm_format_t *buf_desc)

int bytes_pushed = 0;
TickType_t max_wait = 20 / portTICK_PERIOD_MS; // portMAX_DELAY = bad idea
//mult = mult>>12; // for sample on 8 bits 0 to 16
for (int i = 0; i < num_samples; i++) {
if (renderer_status == STOPPED) break;

if(renderer_instance->output_mode == DAC_BUILT_IN)
{
// assume 16 bit src bit_depth
short left = *(short *) ptr_l;
short right = *(short *) ptr_r;

int16_t left = *(int16_t *) ptr_l;
int16_t right = *(int16_t *) ptr_r;
/* //round the msb
if ((left&0xff) >0x80)
{
lleft = (left < 0)?left-0x100:left+0x100;
}
if ((right&0xff) >0x80)
{
lright = (right < 0)?right-0x100:right+0x100;
}
*/
//volume on msb
if (mult!= 0x10000){

int32_t temp = (left )* mult;
left = ((temp >>16) & 0xFFFF);

temp = (right )* mult;
right = ((temp>>16) & 0xFFFF);

}

// The built-in DAC wants unsigned samples, so we shift the range
// from -32768-32767 to 0-65535.
left = left + 0x8000;
right = right + 0x8000;
left = left + 0x8000;
right = right + 0x8000;

uint32_t sample = (uint16_t) left;
sample = (sample << 16 & 0xffff0000) | ((uint16_t) right);
Expand Down
25 changes: 18 additions & 7 deletions main/addon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,11 +221,11 @@ void drawFrame()
if(mTscreen)
{
u8g2_ClearBuffer(&u8g2);
dt=gmtime(&timestamp);
dt=localtime(&timestamp);
if (x==84)
sprintf(strsec,"%02d-%02d %02d:%02d:%02d",dt->tm_mon,dt->tm_mday, dt->tm_hour, dt->tm_min,dt->tm_sec);
sprintf(strsec,"%02d-%02d %02d:%02d:%02d",dt->tm_mon+1,dt->tm_mday, dt->tm_hour, dt->tm_min,dt->tm_sec);
else
sprintf(strsec,"%02d-%02d-%04d %02d:%02d:%02d",dt->tm_mon,dt->tm_mday,dt->tm_year+1900, dt->tm_hour, dt->tm_min,dt->tm_sec);
sprintf(strsec,"%02d-%02d-%04d %02d:%02d:%02d",dt->tm_mon+1,dt->tm_mday,dt->tm_year+1900, dt->tm_hour, dt->tm_min,dt->tm_sec);
if (u8g2.width == 84)
u8g2_SetFont(&u8g2, u8g2_font_5x8_tf);
else
Expand Down Expand Up @@ -376,15 +376,17 @@ void drawTime()
if (mTscreen)
{
u8g2_ClearBuffer(&u8g2);
dt=gmtime(&timestamp);
sprintf(strdate,"%02d-%02d-%04d", dt->tm_mon, dt->tm_mday, dt->tm_year+1900);
dt=localtime(&timestamp);
sprintf(strdate,"%02d-%02d-%04d", dt->tm_mon+1, dt->tm_mday, dt->tm_year+1900);
sprintf(strtime,"%02d:%02d:%02d", dt->tm_hour, dt->tm_min,dt->tm_sec);
drawTTitle(strdate);
u8g2_SetFont(&u8g2, u8g2_font_9x15_tf);
// u8g2_SetFont(&u8g2, u8g2_font_9x15_tf);
u8g2_SetFont(&u8g2, u8g2_font_ncenR18_tf );
u8g2_DrawUTF8(&u8g2,(x/2)-(u8g2_GetUTF8Width(&u8g2,strtime)/2),yy/3,strtime);
// draw ip
u8g2_SetFont(&u8g2, u8g2_font_5x8_tf);
u8g2_DrawUTF8(&u8g2,4,yy-getFontLineSpacing(),getIp());
if (u8g2.width > 84) u8g2_DrawUTF8(&u8g2,4,yy-getFontLineSpacing(),"IP:");
u8g2_DrawUTF8(&u8g2,20,yy-getFontLineSpacing(),getIp());
u8g2_SendBuffer(&u8g2);
mTscreen = 0;
}
Expand Down Expand Up @@ -457,6 +459,13 @@ void lcd_init(uint8_t Type)
u8g2_esp32_msg_i2c_cb,
u8g2_esp32_msg_i2c_and_delay_cb); // init u8g2 structure
break;
case LCD_I2C_SSD1306NN:
u8g2_Setup_ssd1306_128x64_noname_f(
&u8g2,
U8G2_R0,
u8g2_esp32_msg_i2c_cb,
u8g2_esp32_msg_i2c_and_delay_cb); // init u8g2 structure
break;
case LCD_I2C_SSD1306:
u8g2_Setup_ssd1306_128x64_vcomh0_f(
&u8g2,
Expand Down Expand Up @@ -757,8 +766,10 @@ void task_addon(void *pvParams)
{
if (ntp_get_time(&dt) )
{
//printf("B Month %d\n",dt->tm_mon);
applyTZ(dt);
timestamp = mktime(dt);
//printf("A Month %d\n",dt->tm_mon);
syncTime = true;
}
itAskTime = false;
Expand Down
Loading

0 comments on commit 960658a

Please sign in to comment.