Merge branch 'drhideg-drhideg-patch-compressed'

benzino77 · Dec 16, 2020 · ca135ca · ca135ca
2 parents d693d04 + 0b7bed6
commit ca135ca
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 15 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tasmocompiler",
-  "version": "2.4.19",
+  "version": "3.0.0",
   "private": true,
   "proxy": "http://localhost:3001/",
   "dependencies": {

diff --git a/server/compile/platformio.ini b/server/compile/platformio.ini
@@ -1,9 +1,8 @@
 [platformio]
 src_dir = tasmota
 lib_dir = replace
-build_dir = .pioenvs
 build_cache_dir = .cache
-default_envs = custom
+default_envs = firmware
 extra_configs = tc_cores.ini
 
 [user_defined]
@@ -33,7 +32,7 @@ lib_ldf_mode              = chain+
 shared_libdeps_dir        = lib
 lib_extra_dirs            = lib/lib_basic, lib/lib_i2c, lib/lib_display, lib/lib_ssl, lib/lib_audio, lib/lib_rf, lib/lib_div
 
-[env:custom]
+[env:firmware]
 platform                  = ${common.platform}
 platform_packages         = ${common.platform_packages}
 framework                 = ${common.framework}

diff --git a/server/git/git.js b/server/git/git.js
@@ -35,7 +35,7 @@ const getRepoTags = async () => {
   if (isRepo) {
     try {
       const allTags = await git(tasmotaRepo).tags();
-      const tags = allTags.all.filter(t => t.startsWith('v7') || t.startsWith('v8') || t.startsWith('v9'));
+      const tags = allTags.all.filter(t => t.startsWith('v8.5') || t.startsWith('v9'));
       return [...tags, edgeBranch];
     } catch (e) {
       debug(message);

diff --git a/server/server.js b/server/server.js
@@ -102,11 +102,19 @@ app.post('/api/v1/compile', (req, res) => {
 app.get('/download/firmware.bin', (req, res) => {
   const firmwareFile = path.resolve(
     tasmotaRepo,
-    '.pioenvs/custom/firmware.bin'
+    'build_output/firmware/firmware.bin'
   );
   res.download(firmwareFile);
 });
 
+app.get('/download/firmware.bin.gz', (req, res) => {
+  const firmwareCompressed = path.resolve(
+    tasmotaRepo,
+    'build_output/firmware/firmware.bin.gz'
+  );
+  res.download(firmwareCompressed);
+});
+
 app.get('/download/platformio.ini', (req, res) => {
   res.download(userPlatformioIni);
 });

diff --git a/src/components/AppStepper/VersionStep/Variables/CoreVersions.js b/src/components/AppStepper/VersionStep/Variables/CoreVersions.js
@@ -1,12 +1,12 @@
 const coreVersions = [
-  {
-    name: '2.6.1',
-    value: { platform: 'core_2_6_1', mem_prefix: 'eagle.flash.' },
-  },
-  {
-    name: '2.7.1',
-    value: { platform: 'core_2_7_1', mem_prefix: 'eagle.flash.' },
-  },
+  // {
+  //   name: '2.6.1',
+  //   value: { platform: 'core_2_6_1', mem_prefix: 'eagle.flash.' },
+  // },
+  // {
+  //   name: '2.7.1',
+  //   value: { platform: 'core_2_7_1', mem_prefix: 'eagle.flash.' },
+  // },
   {
     name: '2.7.3',
     value: { platform: 'core_2_7_3', mem_prefix: 'eagle.flash.' },

diff --git a/src/components/AppStepper/VersionStep/VersionStep.js b/src/components/AppStepper/VersionStep/VersionStep.js
@@ -28,7 +28,7 @@ class VersionStep extends Component {
 
     this.state = {
       tasmotaVersion: 'development',
-      coreVersion: coreVersions[3].value,
+      coreVersion: coreVersions[1].value,
       MY_LANGUAGE: languages[languageIndex].value,
       boardVersion: boardVersions[0].value,
       boardSpeed: boardSpeeds[0].value,

diff --git a/src/components/DownloadLinks/DownloadLinks.js b/src/components/DownloadLinks/DownloadLinks.js
@@ -33,6 +33,10 @@ class DownloadLinks extends Component {
               firmware.bin
             <CloudDownloadIcon className={classes.rightIcon} />
           </Button>
+          <Button variant="contained" color="primary" href="/download/firmware.bin.gz" className={classes.downloadButtons}>
+              firmware.bin.gz
+            <CloudDownloadIcon className={classes.rightIcon} />
+          </Button>
           <Button variant="contained" color="primary" href="/download/platformio.ini" className={classes.downloadButtons}>
               platformio.ini
             <CloudDownloadIcon className={classes.rightIcon} />