tweak dac_controlset timing - release

components/display/core/ifaces/default_if_i2c.c

@@ -35,7 +35,7 @@ static bool I2CDefaultWriteData( struct GDS_Device* Device, const uint8_t* Data,
 bool GDS_I2CInit( int PortNumber, int SDA, int SCL, int Speed ) {
 	I2CPortNumber = PortNumber;
 	
-	I2CWait = pdMS_TO_TICKS( Speed ? Speed / 4000 : 100 );
+	I2CWait = pdMS_TO_TICKS( Speed ? (250 * 250000) / Speed : 250 );
 	
 	if (SDA != -1 && SCL != -1) {
 		i2c_config_t Config = { 0 };

components/services/led.c

@@ -5,6 +5,7 @@
    software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
    CONDITIONS OF ANY KIND, either express or implied.
 */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -83,8 +84,8 @@ static void vCallbackFunction( TimerHandle_t xTimer ) {
  */
 bool led_blink_core(int idx, int ontime, int offtime, bool pushed) {
 	if (!leds[idx].gpio || leds[idx].gpio < 0 ) return false;
-
-	ESP_LOGD(TAG,"led_blink_core led idx %d, ontime %d, offtime %d, pushing %s. Led state: pushedon %d, pushedoff %d, timer %s, pushed %s", idx,ontime,offtime,pushed?"TRUE":"FALSE", leds[idx].pushedon,leds[idx].pushedoff,leds[idx].timer?"TRUE":"FALSE", leds[idx].pushed?"TRUE":"FALSE");
+	
+	ESP_LOGD(TAG,"led_blink_core %d on:%d off:%d, pushed:%u", idx, ontime, offtime, pushed);
 	if (leds[idx].timer) {
 		// normal requests waits if a pop is pending
 		if (!pushed && leds[idx].pushed) {
@@ -97,18 +98,15 @@ bool led_blink_core(int idx, int ontime, int offtime, bool pushed) {
 	
 	// save current state if not already pushed
 	if (!leds[idx].pushed) {
-		ESP_LOGD(TAG,"Pushing state. Ontime %d->%d. Offtime %d->%d",leds[idx].pushedon,leds[idx].ontime, leds[idx].pushedoff,leds[idx].offtime);
 		leds[idx].pushedon = leds[idx].ontime;
 		leds[idx].pushedoff = leds[idx].offtime;	
 		leds[idx].pushed = pushed;
-
 	}	
 	
 	// then set new one
 	leds[idx].ontime = ontime;
 	leds[idx].offtime = offtime;	
-
-
+			
 	if (ontime == 0) {
 		ESP_LOGD(TAG,"led %d, setting reverse level", idx);
 		set_level(leds + idx, false);
@@ -126,8 +124,7 @@ bool led_blink_core(int idx, int ontime, int offtime, bool pushed) {
         ESP_LOGD(TAG,"led %d, Setting gpio %d and starting timer", idx, leds[idx].gpio);
 		if (xTimerStart(leds[idx].timer, BLOCKTIME) == pdFAIL) return false;
 	}
-	ESP_LOGD(TAG,"led_blink_core END led idx %d, ontime %d, offtime %d, pushing %s. Led state: pushedon %d, pushedoff %d, timer %s, pushed %s", idx,ontime,offtime,pushed?"TRUE":"FALSE", leds[idx].pushedon,leds[idx].pushedoff,leds[idx].timer?"TRUE":"FALSE", leds[idx].pushed?"TRUE":"FALSE");
-
+	
 	
 	return true;
 } 
@@ -234,13 +231,16 @@ void led_svc_init(void) {
 #ifndef CONFIG_LED_LOCKED
 	parse_set_GPIO(set_led_gpio);
 #endif
+
 	char *nvs_item = config_alloc_get(NVS_TYPE_STR, "led_brightness"), *p; 
 	if (nvs_item) {
 		if ((p = strcasestr(nvs_item, "green")) != NULL) green.pwm = atoi(strchr(p, '=') + 1);
 		if ((p = strcasestr(nvs_item, "red")) != NULL) red.pwm = atoi(strchr(p, '=') + 1);
 		free(nvs_item);
 	}
-	ESP_LOGI(TAG,"Configuring LEDs green:%d (active:%d %d%%), red:%d (active:%d %d%%)", green.gpio, green.active, green.pwm, red.gpio, red.active, red.pwm );
+
 	led_config(LED_GREEN, green.gpio, green.active, green.pwm);
 	led_config(LED_RED, red.gpio, red.active, red.pwm);
+	
+	ESP_LOGI(TAG,"Configuring LEDs green:%d (active:%d %d%%), red:%d (active:%d %d%%)", green.gpio, green.active, green.pwm, red.gpio, red.active, red.pwm );
 }

components/squeezelite/external/dac_external.c

@@ -133,7 +133,7 @@ static esp_err_t i2c_write_reg(uint8_t reg, uint8_t val) {
 	i2c_master_write_byte(cmd, val, I2C_MASTER_NACK);
 	
 	i2c_master_stop(cmd);
-    ret = i2c_master_cmd_begin(i2c_port, cmd, 1000 / portTICK_RATE_MS);
+    ret = i2c_master_cmd_begin(i2c_port, cmd, 100 / portTICK_RATE_MS);
     i2c_cmd_link_delete(cmd);
 	
 	if (ret != ESP_OK) {
@@ -161,7 +161,7 @@ static uint8_t i2c_read_reg(uint8_t reg) {
 	i2c_master_read_byte(cmd, &data, I2C_MASTER_NACK);
 	
     i2c_master_stop(cmd);
-	ret = i2c_master_cmd_begin(i2c_port, cmd, 1000 / portTICK_RATE_MS);
+	ret = i2c_master_cmd_begin(i2c_port, cmd, 100 / portTICK_RATE_MS);
 	i2c_cmd_link_delete(cmd);
 	
 	if (ret != ESP_OK) {

components/telnet/telnet.c

@@ -253,6 +253,10 @@ void process_received_data(const char * buffer, size_t size){
 		if(bMirrorToUART){
 			write(uart_fd, command, size);
 		}
+		for(int i=strlen(command);i>=0;i--){
+			// strip any cr/lf
+			if(command[i]== '\n' || command[i]== '\r') command[i]= '\0';
+		}
 		run_command((char *)command);
 	}
 	free(command);

components/wifi-manager/wifi_manager.c

@@ -693,8 +693,6 @@ static void event_handler(void* arg, esp_event_base_t event_base, int32_t event_
 				ESP_LOGD(TAG,   "WIFI_EVENT_AP_STACONNECTED. aid: %d, mac: %s",stac->aid,STR_OR_BLANK(mac));
 				FREE_AND_NULL(mac);
 				xEventGroupSetBits(wifi_manager_event_group, WIFI_MANAGER_AP_STA_CONNECTED_BIT);
-				wifi_manager_send_message(EVENT_STA_CONNECTED, NULL);
-
 			}
 				break;
 			case WIFI_EVENT_AP_STADISCONNECTED:
@@ -1482,9 +1480,6 @@ void wifi_manager( void * pvParameters ){
 				/* callback */
 				if(cb_ptr_arr[msg.code]) (*cb_ptr_arr[msg.code])(NULL);
 				break;
-			case EVENT_STA_CONNECTED:
-				if(cb_ptr_arr[msg.code]) (*cb_ptr_arr[msg.code])(NULL);
-				break;
 			case UPDATE_CONNECTION_OK:
 				/* refresh JSON */
 				if(wifi_manager_lock_json_buffer( portMAX_DELAY )){

components/wifi-manager/wifi_manager.h

@@ -191,8 +191,7 @@ typedef enum message_code_t {
 	ORDER_RESTART_RECOVERY = 16,
 	ORDER_RESTART_OTA_URL = 17,
 	ORDER_RESTART = 18,
-	EVENT_STA_CONNECTED = 19,
-	MESSAGE_CODE_COUNT = 20 /* important for the callback array */
+	MESSAGE_CODE_COUNT = 19 /* important for the callback array */
 
 }message_code_t;
 

main/esp_app_main.c

@@ -95,10 +95,6 @@ void cb_connection_sta_disconnected(void *pvParameter){
 	bWifiConnected=false;
 	xEventGroupClearBits(wifi_event_group, CONNECTED_BIT);
 }
-void cb_connection_sta_connected(void *pvParameter){
-
-}
-
 bool wait_for_wifi(){
 	bool connected=(xEventGroupGetBits(wifi_event_group) & CONNECTED_BIT)!=0;
 	if(!connected){
@@ -467,7 +463,6 @@ void app_main()
 		 * This can be either after we're started the AP mode, or after we've started the STA mode  */
 		wifi_manager_set_callback(ORDER_START_AP, &start_telnet);
 		wifi_manager_set_callback(ORDER_CONNECT_STA, &start_telnet);
-		wifi_manager_set_callback(EVENT_STA_CONNECTED, &cb_connection_sta_connected);
 	}
 
 	console_start();