Skip to content

Commit

Permalink
Move ceccommon to app
Browse files Browse the repository at this point in the history
  • Loading branch information
LolloDev5123 committed Jan 9, 2024
1 parent 5eb3798 commit 0d16f62
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 94 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ endif
ifeq ($(ENABLE_SPECTRUM_NUNU), 1)
OBJS += app/spectrumnunu.o
endif

ifeq ($(ENABLE_UART),1)
OBJS += app/uart.o
endif
Expand Down Expand Up @@ -184,6 +185,9 @@ endif
ifeq ($(ENABLE_MESSENGER),1)
OBJS += ui/messenger.o
endif
ifeq ($(ENABLE_LIVESEEK_MHZ_KEYPAD),1)
OBJS += app/ceccommon.o
endif
OBJS += ui/helper.o
OBJS += ui/inputbox.o
OBJS += ui/lock.o
Expand All @@ -199,10 +203,6 @@ OBJS += apps/scanlist.o
OBJS += version.o
OBJS += main.o

ifeq ($(ENABLE_LIVESEEK_MHZ_KEYPAD),1)
OBJS += ceccommon.o
endif

ifeq ($(OS),Windows_NT)
TOP := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
RM = del /Q
Expand Down
3 changes: 2 additions & 1 deletion ceccommon.c → app/ceccommon.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ TADC_RANGE CW_KEY_ADC[3];

//================================= For Reduce Use Memory ====================
//gMR_ChannelAttributes[207]; -> function
//resize to 7 byte and Move to ceccommon.c
//resize to 7 byte and Move to app/ceccommon.c
uint16_t CEC_GetRssi()
{
int _wait_count = 0;
Expand Down Expand Up @@ -116,6 +116,7 @@ void DrawFrequencySmall(uint32_t _frequency, int _startX, int _Length, int _line
UI_PrintStringSmall(strBuff, _startX, 0, _lineNumber);
}


void DrawCommBuffToSpectrum(void)
{
//Low Value
Expand Down
4 changes: 2 additions & 2 deletions ceccommon.h → app/ceccommon.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

#ifndef CEC_COMMON_H
#define CEC_COMMON_H

#include <stdbool.h>
#include <math.h>
#include <stdio.h>
Expand All @@ -44,7 +43,8 @@
#include "ui/main.h"
#include "font.h"
#include "functions.h"
#include "app/app.h"
#include "app.h"


#define _MAX_READ_CH_ATTRIBUTES 7
#define COMBUFF_USE_SEEK_RSSI 01
Expand Down
3 changes: 1 addition & 2 deletions app/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@
#include "ui/inputbox.h"
#include "ui/ui.h"
#ifdef ENABLE_LIVESEEK_MHZ_KEYPAD
#include "ceccommon.h"
#include "app/chFrScanner.h"
#include "app/ceccommon.h"
#endif

static void SwitchActiveVFO() {
Expand Down
2 changes: 1 addition & 1 deletion app/menu.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#include "ui/menu.h"
#include "ui/ui.h"
#ifdef ENABLE_LIVESEEK_MHZ_KEYPAD
#include "ceccommon.h"
#include "app/ceccommon.h"
#endif

/*#ifndef ARRAY_SIZE
Expand Down
2 changes: 1 addition & 1 deletion board.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#include "sram-overlay.h"
#endif
#ifdef ENABLE_LIVESEEK_MHZ_KEYPAD
#include "ceccommon.h"
#include "app/ceccommon.h"
#endif

static const uint32_t gDefaultFrequencyTable[5] = {
Expand Down
2 changes: 1 addition & 1 deletion compile-with-docker.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/sh
docker build -t uvk5 .
docker run --rm -v ${PWD}/compiled-firmware:/app/compiled-firmware uvk5 /bin/bash -c "cd /app && make && cp firmware* compiled-firmware/"
docker run --rm -v ${PWD}/compiled-firmware:/app/compiled-firmware uvk5 /bin/bash -c "cd /app && make clean && make && cp firmware* compiled-firmware/"
79 changes: 0 additions & 79 deletions compiled-firmware/firmware.ld

This file was deleted.

2 changes: 1 addition & 1 deletion main.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

#include "driver/eeprom.h"
#ifdef ENABLE_LIVESEEK_MHZ_KEYPAD
#include "ceccommon.h"
#include "app/ceccommon.h"
#endif

void _putchar(char c) {
Expand Down
2 changes: 1 addition & 1 deletion settings.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "misc.h"
#include "settings.h"
#ifdef ENABLE_LIVESEEK_MHZ_KEYPAD
#include "ceccommon.h"
#include "app/ceccommon.h"
#endif
EEPROM_Config_t gEeprom;

Expand Down
2 changes: 1 addition & 1 deletion ui/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include "../ui/rssi.h"
#include "../ui/ui.h"
#ifdef ENABLE_LIVESEEK_MHZ_KEYPAD
#include "ceccommon.h"
#include "app/ceccommon.h"
#endif
#include <string.h>

Expand Down

0 comments on commit 0d16f62

Please sign in to comment.