diff --git a/README.md b/README.md index 28853c7..285f02c 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,7 @@ sudo sensors-detect ### Windows 1. Install and run [ALCPU CoreTemp](https://www.alcpu.com/CoreTemp/). It is important that this application is running otherwise you will not get any data. +1. Install [MSVC Runtime 10](https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist). 1. Run the commands below. ```powershell diff --git a/drivers/coretempsdk/coretempsdk_windows.go b/drivers/coretempsdk/coretempsdk_windows.go index ef1791e..e13e21e 100644 --- a/drivers/coretempsdk/coretempsdk_windows.go +++ b/drivers/coretempsdk/coretempsdk_windows.go @@ -30,7 +30,18 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" ) +var ( + globalFnGetCoreTempInfo *windows.LazyProc + globalLock sync.RWMutex +) + const ( + dllNameGetCoreTempInfoDLL = "GetCoreTempInfo.dll" + dllFuncfnGetCoreTempInfoAlt = "fnGetCoreTempInfoAlt" + dllURIGetCoreTempInfoDLLDownloadPage = "https://www.alcpu.com/CoreTemp/developers.html" + dllURIGetCoreTempInfoDLL = "https://www.alcpu.com/CoreTemp/main_data/CoreTempSDK.zip" + vcRuntimeDownloadPage = "https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist" + enableAutoDownload = false ) @@ -65,18 +76,6 @@ type coreTempSharedDataEx struct { fMultipliers [256]float32 } -var ( - globalFnGetCoreTempInfo *windows.LazyProc - globalLock sync.RWMutex -) - -const ( - dllNameGetCoreTempInfoDLL = "GetCoreTempInfo.dll" - dllFuncfnGetCoreTempInfoAlt = "fnGetCoreTempInfoAlt" - dllURIGetCoreTempInfoDLLDownloadPage = "https://www.alcpu.com/CoreTemp/developers.html" - dllURIGetCoreTempInfoDLL = "https://www.alcpu.com/CoreTemp/main_data/CoreTempSDK.zip" -) - func getCoreTempInfo() (*pb.MachineMetrics, error) { rawInfo, err := getCoreTempInfoAlt() if err != nil { @@ -156,7 +155,7 @@ func wrapDLLError(err error) error { dir = "." } return coreTempSDKError{ - msg: fmt.Sprintf("Make sure that '%s' is in directory '%s'. And the version is at least 1.2.0.0. You can download the DLL from '%s'. Error= %s", dllNameGetCoreTempInfoDLL, dir, dllURIGetCoreTempInfoDLLDownloadPage, err.Error()), + msg: fmt.Sprintf("Make sure that '%s' is in directory '%s'. And the version is at least 1.2.0.0. You can download the DLL from '%s'. You also need VC++ Runtime 10 from '%s'. Error= %s", dllNameGetCoreTempInfoDLL, dir, dllURIGetCoreTempInfoDLLDownloadPage, vcRuntimeDownloadPage, err.Error()), err: err, } } diff --git a/third_party/google_protobuf/include/google/api/client.proto b/third_party/google_protobuf/include/google/api/client.proto index 323846f..227ccf3 100644 --- a/third_party/google_protobuf/include/google/api/client.proto +++ b/third_party/google_protobuf/include/google/api/client.proto @@ -104,7 +104,7 @@ extend google.protobuf.ServiceOptions { message CommonLanguageSettings { // Link to automatically generated reference documentation. Example: // https://cloud.google.com/nodejs/docs/reference/asset/latest - string reference_docs_uri = 1; + string reference_docs_uri = 1 [deprecated = true]; // The destination where API teams want this client library to be published. repeated ClientLibraryDestination destinations = 2; diff --git a/third_party/google_protobuf/include/google/api/expr/v1alpha1/syntax.proto b/third_party/google_protobuf/include/google/api/expr/v1alpha1/syntax.proto index c234a02..8219ba6 100644 --- a/third_party/google_protobuf/include/google/api/expr/v1alpha1/syntax.proto +++ b/third_party/google_protobuf/include/google/api/expr/v1alpha1/syntax.proto @@ -104,6 +104,14 @@ message Expr { message CreateList { // The elements part of the list. repeated Expr elements = 1; + + // The indices within the elements list which are marked as optional + // elements. + // + // When an optional-typed value is present, the value it contains + // is included in the list. If the optional-typed value is absent, the list + // element is omitted from the CreateList result. + repeated int32 optional_indices = 2; } // A map or message creation expression.