andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix osx firmware upload - #345

Browse Source
This commit is contained in:
proddy
2022-02-06 15:47:20 +01:00
parent 99743e8e0f
commit ddee63b718
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG_LATEST.md
View File

@@ -35,6 +35,7 @@
- Buderus RC25 - "hc1 mode type" incorrect value [#273](https://github.com/emsesp/EMS-ESP32/issues/273) - Buderus RC25 - "hc1 mode type" incorrect value [#273](https://github.com/emsesp/EMS-ESP32/issues/273)
- Increased number of Mixers and Heating Circuits [#294](https://github.com/emsesp/EMS-ESP32/issues/294) - Increased number of Mixers and Heating Circuits [#294](https://github.com/emsesp/EMS-ESP32/issues/294)
- Check receive status before removing a telegram fetch [#268](https://github.com/emsesp/EMS-ESP32/issues/268), [#282](https://github.com/emsesp/EMS-ESP32/issues/282) - Check receive status before removing a telegram fetch [#268](https://github.com/emsesp/EMS-ESP32/issues/268), [#282](https://github.com/emsesp/EMS-ESP32/issues/282)
- Fix uploading firmware on OSX [#345](https://github.com/emsesp/EMS-ESP32/issues/345)
### Changed ### Changed

14
interface/package-lock.json generated
View File

@@ -28,7 +28,7 @@
"react": "^17.0.2", "react": "^17.0.2",
"react-app-rewired": "^2.1.11", "react-app-rewired": "^2.1.11",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
"react-dropzone": "^11.7.0", "react-dropzone": "^12.0.0",
"react-icons": "^4.3.1", "react-icons": "^4.3.1",
"react-router-dom": "^6.2.1", "react-router-dom": "^6.2.1",
"react-scripts": "5.0.0", "react-scripts": "5.0.0",
@@ -14227,9 +14227,9 @@
} }
}, },
"node_modules/react-dropzone": { "node_modules/react-dropzone": {
"version": "11.7.0", "version": "12.0.0",
"resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-11.7.0.tgz", "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-12.0.0.tgz",
"integrity": "sha512-XTHzXAeOLcTy4wxPv/1HD1XJBzXky67oW5zwKgFs0ulEPqgWC53aGYxxfpID7w5Jas/jwS1tFufBBydT3ItceA==", "integrity": "sha512-xGZr9YFTLqLkYDSx7CMRhjW4rIEqE9w2DhJB0CIEslPzUj3OQQcg7fK8uW85exB+UaJoPfk74lnKi0kv7q6rDw==",
"dependencies": { "dependencies": {
"attr-accept": "^2.2.2", "attr-accept": "^2.2.2",
"file-selector": "^0.4.0", "file-selector": "^0.4.0",
@@ -27560,9 +27560,9 @@
} }
}, },
"react-dropzone": { "react-dropzone": {
"version": "11.7.0", "version": "12.0.0",
"resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-11.7.0.tgz", "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-12.0.0.tgz",
"integrity": "sha512-XTHzXAeOLcTy4wxPv/1HD1XJBzXky67oW5zwKgFs0ulEPqgWC53aGYxxfpID7w5Jas/jwS1tFufBBydT3ItceA==", "integrity": "sha512-xGZr9YFTLqLkYDSx7CMRhjW4rIEqE9w2DhJB0CIEslPzUj3OQQcg7fK8uW85exB+UaJoPfk74lnKi0kv7q6rDw==",
"requires": { "requires": {
"attr-accept": "^2.2.2", "attr-accept": "^2.2.2",
"file-selector": "^0.4.0", "file-selector": "^0.4.0",

2
interface/package.json
View File

@@ -24,7 +24,7 @@
"react": "^17.0.2", "react": "^17.0.2",
"react-app-rewired": "^2.1.11", "react-app-rewired": "^2.1.11",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
"react-dropzone": "^11.7.0", "react-dropzone": "^12.0.0",
"react-icons": "^4.3.1", "react-icons": "^4.3.1",
"react-router-dom": "^6.2.1", "react-router-dom": "^6.2.1",
"react-scripts": "5.0.0", "react-scripts": "5.0.0",

3
interface/src/framework/system/FirmwareFileUpload.tsx
View File

@@ -19,7 +19,8 @@ const FirmwareFileUpload: FC<UploadFirmwareProps> = ({ uploadFirmware }) => {
my={2} my={2}
/> />
<SingleUpload <SingleUpload
accept="application/octet-stream" // accept="application/octet-stream"
accept=".bin"
onDrop={uploadFile} onDrop={uploadFile}
onCancel={cancelUpload} onCancel={cancelUpload}
uploading={uploading} uploading={uploading}

2
src/version.h
View File

@@ -1 +1 @@
#define EMSESP_APP_VERSION "3.4.0b3" #define EMSESP_APP_VERSION "3.4.0b4"