From f81b8da4832b39b885f5bd49af94083befc1b3cf Mon Sep 17 00:00:00 2001 From: Anol Paisal Date: Sat, 12 Mar 2022 08:43:42 +0700 Subject: [PATCH] Remove duplicated marco. --- src/boards/SKiM980A/board-config.h | 2 +- src/boards/SKiM980A/board.c | 2 +- src/mac/region/RegionAS923.h | 20 +------------------- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/src/boards/SKiM980A/board-config.h b/src/boards/SKiM980A/board-config.h index 698babcce..b277c18e4 100644 --- a/src/boards/SKiM980A/board-config.h +++ b/src/boards/SKiM980A/board-config.h @@ -111,7 +111,7 @@ extern "C" #define RADIO_DBG_PIN_RX NC #define IO1 PA_8 -#define IO2 PA_3 //NFC:PA_1 //NON-NFC:PA_3 //iMS62F:PB_7 +#define IO2 PA_1 //NFC:PA_1 //NON-NFC:PA_3 //iMS62F:PB_7 #define WKUP PA_0 diff --git a/src/boards/SKiM980A/board.c b/src/boards/SKiM980A/board.c index 28a9b802f..4ebd42542 100644 --- a/src/boards/SKiM980A/board.c +++ b/src/boards/SKiM980A/board.c @@ -276,7 +276,7 @@ uint8_t BoardGetPotiLevel( void ) uint16_t vpoti = 0; // Read the current potentiometer setting - vpoti = AdcReadChannel( &Adc , ADC_CHANNEL_3 ); + vpoti = AdcReadChannel( &Adc , ADC_CHANNEL_1 ); // check the limits if( vpoti >= POTI_MAX_LEVEL ) diff --git a/src/mac/region/RegionAS923.h b/src/mac/region/RegionAS923.h index a3e32e738..9ed267d89 100644 --- a/src/mac/region/RegionAS923.h +++ b/src/mac/region/RegionAS923.h @@ -45,24 +45,6 @@ extern "C" #include "region/Region.h" -/*! - * Channel plan group AS923-1 - * AS923_FREQ_OFFSET = 0 - */ -#define CHANNEL_PLAN_GROUP_AS923_1 1 - -/*! - * Channel plan group AS923-2 - * AS923_FREQ_OFFSET = -1.8MHz - */ -#define CHANNEL_PLAN_GROUP_AS923_2 2 - -/*! - * Channel plan group AS923-3 - * AS923_FREQ_OFFSET = -6.6MHz - */ -#define CHANNEL_PLAN_GROUP_AS923_3 3 - /*! * Channel plan group AS923-1 * AS923_FREQ_OFFSET = 0 @@ -161,7 +143,7 @@ extern "C" /*! * Default uplink dwell time configuration */ -#define AS923_DEFAULT_UPLINK_DWELL_TIME 1 +#define AS923_DEFAULT_UPLINK_DWELL_TIME 0 /*! * Default Max EIRP