Skip to content

Commit

Permalink
update webpage
Browse files Browse the repository at this point in the history
  • Loading branch information
@meatpiHQ
meatpiHQ committed Oct 14, 2023
1 parent 7e1092a commit f4f2f86
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 42 deletions.
2 changes: 1 addition & 1 deletion main/config_server.c
View file

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions main/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,14 +221,14 @@ static void can_rx_task(void *pvParameters)
// ESP_LOGI(TAG, "bvoltage: %f", bvoltage);
// }
process_led(0);
// if(esp_timer_get_time() - time_old > 1000*1000)
// {
// uint32_t free_heap = heap_caps_get_free_size(HEAP_CAPS);
// time_old = esp_timer_get_time();
// ESP_LOGI(TAG, "free_heap: %lu", free_heap);
if(esp_timer_get_time() - time_old > 1000*1000)
{
uint32_t free_heap = heap_caps_get_free_size(HEAP_CAPS);
time_old = esp_timer_get_time();
ESP_LOGI(TAG, "free_heap: %lu", free_heap);
// // ESP_LOGI(TAG, "msg %u/sec", num_msg);
// // num_msg = 0;
// }
}
while(can_receive(&rx_msg, 0) == ESP_OK)
{
// num_msg++;
Expand All @@ -240,7 +240,7 @@ static void can_rx_task(void *pvParameters)
ucTCP_TX_Buffer.usLen = slcan_parse_frame(ucTCP_TX_Buffer.ucElement, &rx_msg);
if(config_server_ws_connected())
{
xQueueSend( xmsg_ws_tx_queue, ( void * ) &ucTCP_TX_Buffer, pdMS_TO_TICKS(2000) );
xQueueSend( xmsg_ws_tx_queue, ( void * ) &ucTCP_TX_Buffer, pdMS_TO_TICKS(0) );
}
}
//TODO: optimize, useless ifs
Expand Down Expand Up @@ -274,11 +274,11 @@ static void can_rx_task(void *pvParameters)
{
if(tcp_port_open())
{
xQueueSend( xMsg_Tx_Queue, ( void * ) &ucTCP_TX_Buffer, pdMS_TO_TICKS(2000) );
xQueueSend( xMsg_Tx_Queue, ( void * ) &ucTCP_TX_Buffer, pdMS_TO_TICKS(0) );
}
if(ble_connected())
{
xQueueSend( xmsg_ble_tx_queue, ( void * ) &ucTCP_TX_Buffer, pdMS_TO_TICKS(2000) );
xQueueSend( xmsg_ble_tx_queue, ( void * ) &ucTCP_TX_Buffer, pdMS_TO_TICKS(0) );
}
else if(project_hardware_rev == WICAN_USB_V100)
{
Expand Down Expand Up @@ -503,13 +503,13 @@ void app_main(void)
esp_ota_mark_app_valid_cancel_rollback();
// ftpserver_start("test", "test", "/spiffs");

xEventTask = xEventGroupCreate();
xTaskCreate(ftp_task, "FTP", 1024*6, NULL, 2, NULL);
// xEventTask = xEventGroupCreate();
// xTaskCreate(ftp_task, "FTP", 1024*6, NULL, 2, NULL);
// xEventGroupWaitBits( xEventTask,
// FTP_TASK_FINISH_BIT, /* The bits within the event group to wait for. */
// pdTRUE, /* BIT_0 should be cleared before returning. */
// pdFALSE, /* Don't wait for both bits, either bit will do. */
// portMAX_DELAY);/* Wait forever. */
esp_log_level_set("*", ESP_LOG_NONE);
xEventGroupWaitBits( xEventTask,
FTP_TASK_FINISH_BIT, /* The bits within the event group to wait for. */
pdTRUE, /* BIT_0 should be cleared before returning. */
pdFALSE, /* Don't wait for both bits, either bit will do. */
portMAX_DELAY);/* Wait forever. */
}

6 changes: 3 additions & 3 deletions main/sleep_mode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,9 +334,9 @@ static void adc_task(void *pvParameters)

while(1)
{
uint32_t count;
uint64_t avg;
uint32_t adc_val;
uint32_t count = 0;
uint64_t avg = 0;
uint32_t adc_val = 0;
for(int j = 0; j < 10; j++)
{
ret = adc_digi_read_bytes(result, TIMES, &ret_num, ADC_MAX_DELAY);
Expand Down
13 changes: 6 additions & 7 deletions sdkconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -398,8 +398,8 @@ CONFIG_ESP_WIFI_PASSWORD="mypassword"
#
# Compiler options
#
CONFIG_COMPILER_OPTIMIZATION_DEFAULT=y
# CONFIG_COMPILER_OPTIMIZATION_SIZE is not set
# CONFIG_COMPILER_OPTIMIZATION_DEFAULT is not set
CONFIG_COMPILER_OPTIMIZATION_SIZE=y
# CONFIG_COMPILER_OPTIMIZATION_PERF is not set
# CONFIG_COMPILER_OPTIMIZATION_NONE is not set
CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y
Expand Down Expand Up @@ -1111,7 +1111,6 @@ CONFIG_FREERTOS_TASK_NOTIFICATION_ARRAY_ENTRIES=1
#
# Port
#
CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=y
# CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set
CONFIG_FREERTOS_TLSP_DELETION_CALLBACKS=y
# CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set
Expand Down Expand Up @@ -1715,10 +1714,10 @@ CONFIG_FLASHMODE_QIO=y
# CONFIG_FLASHMODE_DIO is not set
# CONFIG_FLASHMODE_DOUT is not set
CONFIG_MONITOR_BAUD=115200
CONFIG_OPTIMIZATION_LEVEL_DEBUG=y
CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG=y
# CONFIG_OPTIMIZATION_LEVEL_RELEASE is not set
# CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE is not set
# CONFIG_OPTIMIZATION_LEVEL_DEBUG is not set
# CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set
CONFIG_OPTIMIZATION_LEVEL_RELEASE=y
CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y
# CONFIG_OPTIMIZATION_ASSERTIONS_SILENT is not set
# CONFIG_OPTIMIZATION_ASSERTIONS_DISABLED is not set
Expand Down
32 changes: 17 additions & 15 deletions sdkconfig.old
View file
Original file line number Diff line number Diff line change
Expand Up @@ -398,8 +398,8 @@ CONFIG_ESP_WIFI_PASSWORD="mypassword"
#
# Compiler options
#
CONFIG_COMPILER_OPTIMIZATION_DEFAULT=y
# CONFIG_COMPILER_OPTIMIZATION_SIZE is not set
# CONFIG_COMPILER_OPTIMIZATION_DEFAULT is not set
CONFIG_COMPILER_OPTIMIZATION_SIZE=y
# CONFIG_COMPILER_OPTIMIZATION_PERF is not set
# CONFIG_COMPILER_OPTIMIZATION_NONE is not set
CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y
Expand Down Expand Up @@ -1111,7 +1111,6 @@ CONFIG_FREERTOS_TASK_NOTIFICATION_ARRAY_ENTRIES=1
#
# Port
#
CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=y
# CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set
CONFIG_FREERTOS_TLSP_DELETION_CALLBACKS=y
# CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set
Expand Down Expand Up @@ -1165,17 +1164,20 @@ CONFIG_IEEE802154_PENDING_TABLE_SIZE=20
#
# Log output
#
# CONFIG_LOG_DEFAULT_LEVEL_NONE is not set
CONFIG_LOG_DEFAULT_LEVEL_NONE=y
# CONFIG_LOG_DEFAULT_LEVEL_ERROR is not set
# CONFIG_LOG_DEFAULT_LEVEL_WARN is not set
CONFIG_LOG_DEFAULT_LEVEL_INFO=y
# CONFIG_LOG_DEFAULT_LEVEL_INFO is not set
# CONFIG_LOG_DEFAULT_LEVEL_DEBUG is not set
# CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set
CONFIG_LOG_DEFAULT_LEVEL=3
CONFIG_LOG_DEFAULT_LEVEL=0
CONFIG_LOG_MAXIMUM_EQUALS_DEFAULT=y
# CONFIG_LOG_MAXIMUM_LEVEL_ERROR is not set
# CONFIG_LOG_MAXIMUM_LEVEL_WARN is not set
# CONFIG_LOG_MAXIMUM_LEVEL_INFO is not set
# CONFIG_LOG_MAXIMUM_LEVEL_DEBUG is not set
# CONFIG_LOG_MAXIMUM_LEVEL_VERBOSE is not set
CONFIG_LOG_MAXIMUM_LEVEL=3
CONFIG_LOG_MAXIMUM_LEVEL=0
CONFIG_LOG_COLORS=y
CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y
# CONFIG_LOG_TIMESTAMP_SOURCE_SYSTEM is not set
Expand Down Expand Up @@ -1249,8 +1251,8 @@ CONFIG_LWIP_TCP_MSS=1440
CONFIG_LWIP_TCP_TMR_INTERVAL=250
CONFIG_LWIP_TCP_MSL=60000
CONFIG_LWIP_TCP_FIN_WAIT_TIMEOUT=20000
CONFIG_LWIP_TCP_SND_BUF_DEFAULT=40960
CONFIG_LWIP_TCP_WND_DEFAULT=40960
CONFIG_LWIP_TCP_SND_BUF_DEFAULT=20480
CONFIG_LWIP_TCP_WND_DEFAULT=20480
CONFIG_LWIP_TCP_RECVMBOX_SIZE=64
CONFIG_LWIP_TCP_QUEUE_OOSEQ=y
# CONFIG_LWIP_TCP_SACK_OUT is not set
Expand Down Expand Up @@ -1715,10 +1717,10 @@ CONFIG_FLASHMODE_QIO=y
# CONFIG_FLASHMODE_DIO is not set
# CONFIG_FLASHMODE_DOUT is not set
CONFIG_MONITOR_BAUD=115200
CONFIG_OPTIMIZATION_LEVEL_DEBUG=y
CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG=y
# CONFIG_OPTIMIZATION_LEVEL_RELEASE is not set
# CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE is not set
# CONFIG_OPTIMIZATION_LEVEL_DEBUG is not set
# CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set
CONFIG_OPTIMIZATION_LEVEL_RELEASE=y
CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y
# CONFIG_OPTIMIZATION_ASSERTIONS_SILENT is not set
# CONFIG_OPTIMIZATION_ASSERTIONS_DISABLED is not set
Expand Down Expand Up @@ -1863,8 +1865,8 @@ CONFIG_TCP_MAXRTX=12
CONFIG_TCP_SYNMAXRTX=12
CONFIG_TCP_MSS=1440
CONFIG_TCP_MSL=60000
CONFIG_TCP_SND_BUF_DEFAULT=40960
CONFIG_TCP_WND_DEFAULT=40960
CONFIG_TCP_SND_BUF_DEFAULT=20480
CONFIG_TCP_WND_DEFAULT=20480
CONFIG_TCP_RECVMBOX_SIZE=64
CONFIG_TCP_QUEUE_OOSEQ=y
CONFIG_TCP_OVERSIZE_MSS=y
Expand Down

0 comments on commit f4f2f86

Please sign in to comment.