up

web/src/lib/api.js

@@ -47,7 +47,6 @@ export const api = {
 
   // Tuner
   tuner: {
-<<<<<<< HEAD
     setOperate: (value) => request('/tuner/operate', {
       method: 'POST',
       body: JSON.stringify({ value }),
@@ -57,33 +56,15 @@ export const api = {
       body: JSON.stringify({ value }),
     }),
     autoTune: () => request('/tuner/autotune', { method: 'POST' }),
-=======
-    operate: (operate) => request('/tuner/operate', {
-      method: 'POST',
-      body: JSON.stringify({ operate }),
-    }),
-    tune: () => request('/tuner/tune', { method: 'POST' }),
-    antenna: (antenna) => request('/tuner/antenna', {
-      method: 'POST',
-      body: JSON.stringify({ antenna }),
-    }),
->>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
   },
 
   // Antenna Genius
   antenna: {
-<<<<<<< HEAD
     selectAntenna: (port, antenna) => request('/antenna/select', {
       method: 'POST',
       body: JSON.stringify({ port, antenna }),
     }),
     reboot: () => request('/antenna/reboot', { method: 'POST' }),
-=======
-    set: (radio, antenna) => request('/antenna/set', {
-      method: 'POST',
-      body: JSON.stringify({ radio, antenna }),
-    }),
->>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
   },
 
   // Power Genius
@@ -92,7 +73,6 @@ export const api = {
       method: 'POST',
       body: JSON.stringify({ mode }),
     }),
-<<<<<<< HEAD
     setOperate: (value) => request('/power/operate', {
       method: 'POST',
       body: JSON.stringify({ value }),
@@ -108,7 +88,5 @@ export const api = {
     rotateCW: () => request('/rotator/cw', { method: 'POST' }),
     rotateCCW: () => request('/rotator/ccw', { method: 'POST' }),
     stop: () => request('/rotator/stop', { method: 'POST' }),
-=======
->>>>>>> 4ab192418e21065c68d59777493ea03b76c061e7
   },
 };