Added Moondrop Free DSP. Fixed wiki link not clickable in xs. Improve…

…d headphone selector sizing and placement in xs and sm. Improved Voicemeeter instructions. Webapp version 1.0.13.
HUYDGD · Dec 10, 2023 · 07154ab · 07154ab
1 parent e93f66c
commit 07154ab
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 12 deletions.
diff --git a/autoeq/constants.py b/autoeq/constants.py
@@ -197,6 +197,20 @@
             'max_fc': 10000.0,
         }] * 8
     },
+    'MOONDROP_FREE_DSP': {
+        'optimizer': {
+            'min_std': 0.008
+        },
+        'filters': [{
+            'type': 'PEAKING',
+            'min_q': 0.5,
+            'max_q': 6.0,
+            'min_fc': 40.0,
+            'max_fc': 10000.0,
+            'min_gain': -12.0,
+            'max_gain': 3.0,
+        }] * 9
+    },
     'NEUTRON_MUSIC_PLAYER': {
         'optimizer': {
             'min_std': 0.008

diff --git a/webapp/ui/package.json b/webapp/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "autoeq",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "private": true,
   "dependencies": {
     "@emotion/react": "^11.10.5",

diff --git a/webapp/ui/src/App.js b/webapp/ui/src/App.js
@@ -485,7 +485,7 @@ const App = (props) => {
   const customPeqConfig = !!customPeq ? customPeq.config : null;
 
   return (
-    <Box sx={{pt: 0, pb: {xs: 10.25, sm: 14}, background: '#2c2424', minHeight: '100vh', boxSizing: 'border-box'}}>
+    <Box sx={{pt: 0, pb: {xs: 15, sm: 14}, background: '#2c2424', minHeight: '100vh', boxSizing: 'border-box'}}>
       <Waves nWaves={10} />
 
       <Box sx={{padding: [1, 1.5]}}>
@@ -499,7 +499,7 @@ const App = (props) => {
           onMeasurementSelected={onMeasurementSelected}
           onMeasurementCreated={onMeasurementCreated}
           onError={onError}
-          showLogo={!showInfo && graphData}
+          showLogo={true}
         />
       </Box>
 

diff --git a/webapp/ui/src/CSVAutocomplete.js b/webapp/ui/src/CSVAutocomplete.js
@@ -122,7 +122,7 @@ const ListboxComponent = forwardRef(function ListboxComponent(props, ref) {
 
 const PopperComponent = (props) => {
   return (
-    <Popper { ...props } style={{ minWidth: 350, width: props.anchorEl.clientWidth }} placement='bottom' />
+    <Popper { ...props } style={{ width: 500, maxWidth: 'calc(100vw - 20px)' }} placement='bottom' />
   );
 };
 

diff --git a/webapp/ui/src/TopBar.js b/webapp/ui/src/TopBar.js
@@ -46,7 +46,7 @@ const TopBar = (props) => {
 
   return (
     <Grid item container direction='row' justifyContent='space-between' alignItems='center'>
-      <Grid item sx={{ width: {xs: '60px', sm: '100px'}}} >
+      <Grid item sx={{ width: {xs: '48px', sm: '88px'}}} >
         <img
           src='autoeq_logo.svg'
           alt='AutoEq logo'
@@ -80,10 +80,12 @@ const TopBar = (props) => {
           )}
         />
       </Grid>
-      <Grid item>
-        <IconButton onClick={(e) => setMenuAnchor(!!menuAnchor ? null : e.currentTarget)}>
-          <MoreVertIcon sx={{color: theme => theme.palette.grey.A200}} />
-        </IconButton>
+      <Grid item sx={{width: {xs: '48px', sm: '88px'}}} container justifyContent='end'>
+        <Grid item>
+          <IconButton onClick={(e) => setMenuAnchor(!!menuAnchor ? null : e.currentTarget)}>
+            <MoreVertIcon sx={{color: theme => theme.palette.grey.A200}} />
+          </IconButton>
+        </Grid>
       </Grid>
       <Menu
         open={isMenuOpen} anchorEl={menuAnchor} onClose={() => setMenuAnchor(null)}

diff --git a/webapp/ui/src/equalizers.js b/webapp/ui/src/equalizers.js
@@ -132,11 +132,20 @@ export default [
   {
     label: 'MiniDSP IL-DSP', type: 'parametric', config: 'MINIDSP_IL_DSP',
     uiConfig: {
-      bw: false, showDownload: false, showPreampControl: true, showFsControl: true,
+      bw: false, showDownload: false, showPreampControl: true, showFsControl: false,
       filterNames: { LOW_SHELF: 'LOW_SHELF', PEAKING: 'PEAK', HIGH_SHELF: 'HIGH_SHELF', PREAMP: 'Preamp' },
       columnNames: { fc: 'Frequency', gain: 'Gain', q: 'Q' },
     },
-    instructions: 'Configure frequency, gain and quality (Q) for each band manually with Parametric EQ. IL-DSP doesn\'t have preamp control and therefore to prevent clipping, you can adjust preamp slider here until the requested preamp at the bottom of the produced settings gives a slightly positive value'
+    instructions: 'Configure frequency, gain and quality (Q) for each band manually with Parametric EQ. IL-DSP doesn\'t have preamp control and therefore to prevent clipping, can adjust preamp slider here until the requested preamp at the bottom of the produced settings gives a slightly positive value.'
+  },
+  {
+    label: 'Moondrop Free DSP', type: 'parametric', config: 'MOONDROP_FREE_DSP',
+    uiConfig: {
+      bw: false, showDownload: false, showPreampControl: true, showFsControl: false,
+      filterNames: { LOW_SHELF: 'Low-shelf', PEAKING: 'Peaking', HIGH_SHELF: 'High-shelf', PREAMP: 'Preamp' },
+      columnNames: { fc: 'Freq', gain: 'Gain', q: 'Q' },
+    },
+    instructions: 'Configure frequency, gain and quality (Q) for each band manually with Parametric EQ, as accurately as the app allows. Free DSP doesn\'t have preamp control and therefore to prevent clipping, can adjust preamp slider here until the requested preamp at the bottom of the produced settings gives a slightly positive value.'
   },
   {
     label: 'Neutron Music Player', type: 'parametric', config: 'NEUTRON_MUSIC_PLAYER',
@@ -251,7 +260,7 @@ export default [
     uiConfig: {
       bw: false, showDownload: true, showFsControl: true,
     },
-    instructions: 'Download the file and import it to Voicemeeter by right clicking the top bar and selecting "Load EQ Settings"',
+    instructions: 'Download the file and import it to Voicemeeter by opening the EQ window for a channel and right clicking the top bar and selecting "Load EQ Settings"',
     fileFormatter: (preamp, filters) => {
       const filterTypes = {
         'LOW_SHELF': '5',