Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2025-02-04 00:16:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source 
Removed unnecesary Qspi stuff for now. Compiles fine for samd51 and samd21. Have no samd21 platform or tpuart to do thorough testing but nothing fundamental was changed in samd_platform other than the ifdef checks.
This commit is contained in:
OnlineCaveman 2022-10-17 21:10:23 +02:00
parent 598f6bddfd
commit 02565a0ba3
3 changed files with 1 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/knx/platform.h
View File

@ -12,8 +12,7 @@
enum NvMemoryType enum NvMemoryType
{ {
Eeprom, Eeprom,
Flash, Flash
QspiFlash
}; };
class Platform class Platform

32
src/samd51_platform.cpp
View File

@ -3,19 +3,6 @@
#include "samd51_platform.h" #include "samd51_platform.h"
#include <knx/bits.h> #include <knx/bits.h>
#define QSPI_STORAGE
#ifdef QSPI_STORAGE
#include <SPI.h> //QSPI
#include <SdFat.h> //QSPI
#include <Adafruit_SPIFlash.h> //QSPI
//#define FILE_NAME parameters.knx
Adafruit_FlashTransport_QSPI flashTransport;
Adafruit_SPIFlash flash(&flashTransport);
FatVolume fatfs;
File32 saveFile;
#endif
#if KNX_FLASH_SIZE % 1024 #if KNX_FLASH_SIZE % 1024
#error "KNX_FLASH_SIZE must be multiple of 1024" #error "KNX_FLASH_SIZE must be multiple of 1024"
#endif #endif
@ -62,24 +49,6 @@ static const uint32_t pageSizes[] = {8, 16, 32, 64, 128, 256, 512, 1024};
void Samd51Platform::init() void Samd51Platform::init()
{ {
// _memoryType = QspiFlash;
// Initialize flash library and check its chip ID.
// if (!flash.begin()) {
// Serial.println("Error, failed to initialize flash chip!");
// fatalError();
// while(1) delay(1);
// }
// Serial.print("Flash chip JEDEC ID: 0x"); Serial.println(flash.getJEDECID(), HEX);
// if (!fatfs.begin(&flash)) {
// Serial.println("Error, failed to mount newly formatted filesystem!");
// Serial.println("Was the flash chip formatted with the fatfs_format example?");
// fatalError();
// while(1) delay(1);
// }
// Serial.println("Mounted filesystem!");
_memoryType = Flash; _memoryType = Flash;
_pageSize = pageSizes[NVMCTRL->PARAM.bit.PSZ]; _pageSize = pageSizes[NVMCTRL->PARAM.bit.PSZ];
_pageCnt = NVMCTRL->PARAM.bit.NVMP; _pageCnt = NVMCTRL->PARAM.bit.NVMP;
@ -226,7 +195,6 @@ void Samd51Platform::write(const volatile void *flash_ptr, const void *data, uin
// Restore original NVMCTRL cache settings. // Restore original NVMCTRL cache settings.
NVMCTRL->CTRLA.bit.CACHEDIS0 = original_CACHEDIS0; NVMCTRL->CTRLA.bit.CACHEDIS0 = original_CACHEDIS0;
NVMCTRL->CTRLA.bit.CACHEDIS1 = original_CACHEDIS1; NVMCTRL->CTRLA.bit.CACHEDIS1 = original_CACHEDIS1;
} }
} }

5
src/samd51_platform.h
View File

@ -2,11 +2,6 @@
#include "Arduino.h" #include "Arduino.h"
#include "arduino_platform.h" #include "arduino_platform.h"
// #include <SPI.h> //QSPI
// #include <SdFat.h> //QSPI
// #include <Adafruit_SPIFlash.h> //QSPI
// #define FILE_NAME parameters.sav
class Samd51Platform : public ArduinoPlatform class Samd51Platform : public ArduinoPlatform
{ {
public: public: