Skip to content

Commit d58f265

Browse files
OpenUASmakeoneupforme
authored andcommitted
RSSI and FlexFreq all updated all works under SDCC 4.5.0
1 parent 50189f2 commit d58f265

36 files changed

+604
-166
lines changed

Firmware/bootloader/flash.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ __at(FLASH_CALIBRATION_AREA_HIGH) uint8_t __code calibration[FLASH_CALIBRATION_A
278278
__at(FLASH_CALIBRATION_CRC_HIGH) uint8_t __code calibration_crc;
279279

280280
void
281-
flash_transfer_calibration()
281+
flash_transfer_calibration(void)
282282
{
283283
uint8_t idx, crc = 0;
284284

@@ -318,7 +318,7 @@ flash_transfer_calibration()
318318
#if defined BOARD_mro900
319319
static __at(FLASH_CALIBRATION_OSC_HIGH) uint8_t __code calibration;
320320

321-
void flash_transfer_calibration()
321+
void flash_transfer_calibration(void)
322322
{
323323
if (flash_read_byte(FLASH_CALIBRATION_OSC) != 0xFF)
324324
{

Firmware/bootloader/flash.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ void flash_write_byte(uint16_t address, uint8_t c);
9292
uint8_t flash_read_byte(uint16_t address);
9393
#endif // FLASH_BANKS
9494
#if defined BOARD_rfd900a || defined BOARD_rfd900p || defined BOARD_mro900
95-
void flash_transfer_calibration();
95+
void flash_transfer_calibration(void);
9696
#endif
9797

9898
#endif // _FLASH_H_

Firmware/include/board.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
#define BOARD_rfd900p
112112
# include "board_rfd900p.h"
113113
#elif defined(BOARD_rfd900ue)
114-
// #define INCLUDE_AES
114+
//#define INCLUDE_AES
115115
#define BOARD_rfd900u
116116
# include "board_rfd900u.h"
117117
#elif defined(BOARD_ism01a)
@@ -126,4 +126,7 @@
126126
# error Must define a BOARD_ value before including this file.
127127
#endif
128128

129+
/// @brief The FLEX_FREQ is an extra unofficial option to set frequency independent of bootloader settings
130+
#define FLEX_FREQ 1
131+
129132
#endif // _BOARD_H_

Firmware/include/board_3dr1060.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,9 @@
2828

2929
///
3030
/// @file board_3dr1060.h
31-
///
32-
///
31+
/// Board-specific definitions for the 3DR1060 board
3332
///
3433

35-
/// @file board.h
36-
/// Board definitions for the 3DR1060 board
37-
3834
#ifndef _BOARD_3DR1060_H
3935
#define _BOARD_3DR1060_H
4036

Firmware/include/board_hb1060.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,9 @@
2929
///
3030
/// @file board_hb1060.h
3131
///
32-
/// Board-specific definitions for the RF50-DEMO board.
32+
/// Board-specific definitions for the HB1060 board.
3333
///
3434

35-
/// @file board.h
36-
/// Board definitions for the HB1060 board
37-
3835
#ifndef _BOARD_HB1060_H
3936
#define _BOARD_HB1060_H
4037

Firmware/include/board_ism01a.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,11 @@
2727
//
2828

2929
///
30-
/// @file board_rf50.h
30+
/// @file board_ism01a.h
3131
///
32-
/// Board-specific definitions for the RF50-DEMO board.
32+
/// Board-specific definitions for the ISM01A board.
3333
///
3434

35-
/// @file board.h
36-
/// Board definitions for the ISM01A board
37-
3835
#ifndef _BOARD_ISM01A_H
3936
#define _BOARD_ISM01A_H
4037

Firmware/include/rules.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#
2828
# Common rules and targets for the HopeRF radio apps
2929
#
30+
PPRZLINK_VERSION ?= PPRZLINK_2
3031

3132
ifeq ($(BOARD),)
3233
$(error Must define BOARD before attempting to build)

Firmware/include/rules_3dr1060.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#
2929
# Configuration options for the 3DR1060 board.
3030
#
31-
FREQUENCIES = 433 915
32-
XRAM_SIZE = 4096
31+
FREQUENCIES = 433 868 915
32+
XRAM_SIZE = 4352
3333
LDFLAGS += --model-large --iram-size 256 --xram-size $(XRAM_SIZE) --code-loc 0x400 --code-size 0x00f400 --stack-size 64
3434
BOOTLDFLAGS = --iram-size 256 --xram-size $(XRAM_SIZE) --stack-size 64 --nostdlib -Wl -bHIGHCSEG=0xf800

Firmware/include/rules_hb1060.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@
2929
# Configuration options for the HB1060 board.
3030
#
3131
FREQUENCIES = 433 868 915
32-
XRAM_SIZE = 4096
32+
XRAM_SIZE = 4352
3333
LDFLAGS += --model-large --iram-size 256 --xram-size $(XRAM_SIZE) --code-loc 0x400 --code-size 0x00f400 --stack-size 64
3434
BOOTLDFLAGS = --iram-size 256 --xram-size $(XRAM_SIZE) --stack-size 64 --nostdlib -Wl -bHIGHCSEG=0xf800

Firmware/include/rules_ism01a.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@
2929
# Configuration options for the ISM01A board.
3030
#
3131
FREQUENCIES = 433 868 915
32-
XRAM_SIZE = 4096
32+
XRAM_SIZE = 4352
3333
LDFLAGS += --model-large --iram-size 256 --xram-size $(XRAM_SIZE) --code-loc 0x400 --code-size 0x00f400 --stack-size 64
3434
BOOTLDFLAGS = --iram-size 256 --xram-size $(XRAM_SIZE) --stack-size 64 --nostdlib -Wl -bHIGHCSEG=0xf800

0 commit comments

Comments
 (0)