3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-05-24 22:36:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

add spi pins to config container, remove hacks from app code

Browse source
This commit is contained in:
Markus Krause 2023-03-25 20:56:31 +01:00
parent cccbe63f2b
commit 44f602f1a7
4 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app.cpp
View file

@ -30,7 +30,7 @@ void app::setup() {
DBGPRINTLN(F("false"));
mSys.enableDebug();
mSys.setup(mConfig->nrf.amplifierPower, 47, 38, 37, 36, 35, 48);
mSys.setup(mConfig->nrf.amplifierPower, mConfig->nrf.pinIrq, mConfig->nrf.pinCe, mConfig->nrf.pinCs, mConfig->nrf.pinSclk, mConfig->nrf.pinMosi, mConfig->nrf.pinMiso);
#if defined(AP_ONLY)
mInnerLoopCb = std::bind(&app::loopStandard, this);

2
src/app.h
View file

@ -162,7 +162,7 @@ class app : public IApp, public ah::Scheduler {
}
uint8_t getIrqPin(void) {
return 47;
return mConfig->nrf.pinIrq;
}
String getTimeStr(uint32_t offset = 0) {

7
src/config/settings.h
View file

@ -73,6 +73,9 @@ typedef struct {
uint8_t pinCs;
uint8_t pinCe;
uint8_t pinIrq;
uint8_t pinMiso;
uint8_t pinMosi;
uint8_t pinSclk;
uint8_t amplifierPower;
} cfgNrf24_t;
@ -344,6 +347,10 @@ class settings {
mCfg.nrf.pinCs = DEF_CS_PIN;
mCfg.nrf.pinCe = DEF_CE_PIN;
mCfg.nrf.pinIrq = DEF_IRQ_PIN;
mCfg.nrf.pinMiso = DEF_MISO_PIN;
mCfg.nrf.pinMosi = DEF_MOSI_PIN;
mCfg.nrf.pinSclk = DEF_SCLK_PIN;
mCfg.nrf.amplifierPower = DEF_AMPLIFIERPOWER & 0x03;
snprintf(mCfg.ntp.addr, NTP_ADDR_LEN, "%s", DEF_NTP_SERVER_NAME);

1
src/hm/hmSystem.h
View file

@ -23,7 +23,6 @@ class HmSystem {
void setup(uint8_t ampPwr, uint8_t irqPin, uint8_t cePin, uint8_t csPin, uint8_t sclkPin, uint8_t mosiPin, uint8_t misoPin) {
mNumInv = 0;
// Radio.setup(ampPwr, 47, 38, 37, 36, 35, 48);
Radio.setup(ampPwr, irqPin, cePin, csPin, sclkPin, mosiPin, misoPin);
}