diff --git a/dependencies (deconv-PC15911's conflicted copy 2024-06-28).lock b/dependencies (deconv-PC15911's conflicted copy 2024-06-28).lock new file mode 100644 index 00000000..55623b4e --- /dev/null +++ b/dependencies (deconv-PC15911's conflicted copy 2024-06-28).lock @@ -0,0 +1,9 @@ +dependencies: + idf: + component_hash: null + source: + type: idf + version: 4.4.4 +manifest_hash: 16cf071c7952b6c2989931c93b1897d51a7344454df129a66bd0c084542a2f47 +target: esp32 +version: 1.0.0 diff --git a/dependencies.lock b/dependencies.lock index 8a8a7afd..a5c7cd0e 100644 --- a/dependencies.lock +++ b/dependencies.lock @@ -4,6 +4,6 @@ dependencies: source: type: idf version: 4.4.4 -manifest_hash: 5edadc5a7e062193e616dc77f33b5716948bc38d325a851f72f24bdd70ccd13d -target: esp32 +manifest_hash: 9e9f50b65923a9a1b39b1143d121d880da7dbb172c056d62112123787161d4d8 +target: esp32s3 version: 1.0.0 diff --git a/main/PinConfigESP32S3.h b/main/PinConfigESP32S3.h index 9d61b818..2f318fc4 100644 --- a/main/PinConfigESP32S3.h +++ b/main/PinConfigESP32S3.h @@ -1,7 +1,7 @@ #ifndef PINCONFIGESP32S3_H #define PINCONFIGESP32S3_H -#define ESP32S3_MODEL_XIAO +#ifdef ESP32S3_MODEL_XIAO #define GPIO_NUM_25 GPIO_NUM_0 #define GPIO_NUM_23 GPIO_NUM_1 @@ -17,4 +17,5 @@ // #define D1 2 // GPIO2 */ -#endif // PINCONFIGESP32S3_H \ No newline at end of file +#endif // PINCONFIGESP32S3_H +#endif // ESP32S3_MODEL_XIAO \ No newline at end of file diff --git a/main/json_api_BD.txt b/main/json_api_BD.txt index 87c91d24..79fd8de6 100644 --- a/main/json_api_BD.txt +++ b/main/json_api_BD.txt @@ -91,7 +91,7 @@ "LASERdespeckle": 50, "LASERdespecklePeriod": 30, } -{"task": "/laser_act", "LASERid":1, "LASERval": 1000} +{"task": "/laser_act", "LASERid":1, "LASERval": 224} {"task": "/laser_act", "LASERid":1, "LASERval": 1024} {"task": "/laser_get"} {"task":"/laser_act", "LASERid":1 ,"LASERFreq":50} // for servo