Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

openairinterface5G
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

ce14050b

Commit ce14050b authored 8 years ago by Cédric Roux

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/calib-LimeSDR' into develop_integration_w06

 Conflicts:
	openair1/PHY/MODULATION/ofdm_mod.c

parents 0ada1e9e 02148c79

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

openair1/PHY/MODULATION/ofdm_mod.c 13 additions, 2 deletions

openair1/PHY/MODULATION/ofdm_mod.c
targets/ARCH/COMMON/common_lib.h 3 additions, 0 deletions

targets/ARCH/COMMON/common_lib.h
targets/ARCH/LMSSDR/LimeSDR_above_1p8GHz.ini 1128 additions, 0 deletions

targets/ARCH/LMSSDR/LimeSDR_above_1p8GHz.ini
targets/ARCH/LMSSDR/LimeSDR_above_1p8GHz_1v4.ini 1128 additions, 0 deletions

targets/ARCH/LMSSDR/LimeSDR_above_1p8GHz_1v4.ini
targets/ARCH/LMSSDR/LimeSDR_below_1p8GHz.ini 1128 additions, 0 deletions

targets/ARCH/LMSSDR/LimeSDR_below_1p8GHz.ini
targets/ARCH/LMSSDR/LimeSDR_below_1p8GHz_1v4.ini 1128 additions, 0 deletions

targets/ARCH/LMSSDR/LimeSDR_below_1p8GHz_1v4.ini
targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp 40 additions, 18 deletions

targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp 44 additions, 4 deletions

targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
targets/RT/USER/lte-ue.c 13 additions, 8 deletions

targets/RT/USER/lte-ue.c

with 4625 additions and 32 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment