Skip to content

Commit

Permalink
Merge branch 'feature/seib_dev' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
RobertK66 committed Dec 12, 2023
2 parents 04f1941 + 1f626da commit 54f5bba
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 9 deletions.
23 changes: 15 additions & 8 deletions ClimbObc/src/ClimbObc.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ void init_mainlooptimer(LPC_TIMER_T* pTimer, CHIP_SYSCTL_CLOCK_T timBitIdx);
0x20 // SRS slave address.
};

static const mem_init_t MemoryInit = {
PTR_FROM_IDX(PINIDX_SD_VCC_EN) // defines the GPIO pin which enables the Power Supply of the SD-Card
};

#elif BA_BOARD == BA_OM13085_EM2T
// OM13085 * EM2T Test Hardware
//-----------------------------
Expand All @@ -66,6 +70,11 @@ void init_mainlooptimer(LPC_TIMER_T* pTimer, CHIP_SYSCTL_CLOCK_T timBitIdx);
// 0x20 // SRS slave address.
};

static const mem_init_t MemoryInit = {
PTR_FROM_IDX(PINIDX_SD_VCC_EN) // defines the GPIO pin which enables the Power Supply of the SD-Card
};


#else
// pure OM13085
// ------------
Expand All @@ -74,14 +83,15 @@ void init_mainlooptimer(LPC_TIMER_T* pTimer, CHIP_SYSCTL_CLOCK_T timBitIdx);

};

// SRS connected to to I2C0 -> J2-25/26
static const srs_initdata_t SrsInit = {
LPC_I2C0, // I2C bus to use
0x20 // SRS slave address.
};


#endif

// SRS connected to to I2C0 -> J2-25/26
static const srs_initdata_t SrsInit = {
LPC_I2C0 // I2C bus to use
};

static const sdcard_init_array_t Cards = {
(sizeof(SdCards)/sizeof(sdcard_init_t)), SdCards
};
Expand All @@ -98,9 +108,6 @@ static const mram_chipinit_array_t Chips = {
(sizeof(Mrams)/sizeof(mram_chipinit_t)), Mrams
};

static const mem_init_t MemoryInit = {
PTR_FROM_IDX(PINIDX_SD_VCC_EN) // defines the GPIO pin which enables the Power Supply of the SD-Card
};

static const gps_initdata_t GpsInit = {
LPC_UART0,
Expand Down
2 changes: 1 addition & 1 deletion ClimbObc/src/ClimbObc.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include "build.h"
#ifndef BA_BOARD
#define BA_BOARD BA_OM13085_EM2T // BA_CLIMBOBC //BA_OM13085 // BA_OM13085_EM2T
#define BA_BOARD BA_OM13085 // BA_CLIMBOBC //BA_OM13085 // BA_OM13085_EM2T
#endif

#if BA_BOARD == BA_OM13085
Expand Down
2 changes: 2 additions & 0 deletions ClimbObc/src/mod/srs/radsensor.c
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,8 @@ void srs_transfer() {
srsPendingCmdExec = SRS_CMDEXEC_REQDATA;
//i2c_add_job(&srsJob);
break;
default:
break;
}
}

Expand Down

0 comments on commit 54f5bba

Please sign in to comment.