From 592b4b01b516a591ef36f043848cd477e306581c Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Fri, 20 Sep 2024 21:50:14 -0400 Subject: [PATCH] cleanup --- config-601.cvs | 4 ++-- main/self_test/self_test.c | 4 ++-- merge_bin.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config-601.cvs b/config-601.cvs index 29b5fac..7dfb04a 100644 --- a/config-601.cvs +++ b/config-601.cvs @@ -11,9 +11,9 @@ asicfrequency,data,u16,525 asicvoltage,data,u16,1100 asicmodel,data,string,BM1370 devicemodel,data,string,gamma -boardversion,data,string,600 +boardversion,data,string,601 flipscreen,data,u16,1 invertfanpol,data,u16,1 -autofanspeed,data,u16,0 +autofanspeed,data,u16,1 fanspeed,data,u16,100 selftest,data,u16,1 \ No newline at end of file diff --git a/main/self_test/self_test.c b/main/self_test/self_test.c index 54e4c7b..fca3641 100644 --- a/main/self_test/self_test.c +++ b/main/self_test/self_test.c @@ -274,7 +274,7 @@ void self_test(void * pvParameters) return; } } else { - if (!TPS546_power_consumption_pass(8, 2)) { + if (!TPS546_power_consumption_pass(8, 3)) { ESP_LOGE(TAG, "TPS546 Power Draw Failed, target %f", 8.0); display_msg("POWER: FAIL", GLOBAL_STATE); return; @@ -282,7 +282,7 @@ void self_test(void * pvParameters) } break; case DEVICE_GAMMA: - if (!TPS546_power_consumption_pass(15, 2)) { + if (!TPS546_power_consumption_pass(13, 3)) { ESP_LOGE(TAG, "TPS546 Power Draw Failed, target %f", 15.0); display_msg("POWER: FAIL", GLOBAL_STATE); return; diff --git a/merge_bin.sh b/merge_bin.sh index 5851d65..517fcff 100755 --- a/merge_bin.sh +++ b/merge_bin.sh @@ -96,7 +96,7 @@ fi selected_bins=() selected_bins_and_addrs=() -esptool_leading_args="--chip esp32s3 merge_bin --flash_mode dio --flash_size 8MB --flash_freq 80m" +esptool_leading_args="--chip esp32s3 merge_bin --flash_mode dio --flash_size 16MB --flash_freq 80m" if [ "$update_only" -eq 1 ]; then selected_bins+=(${BINS_UPDATE[@]})