Base 4 Scope (4 March 2022)
Dependencies: mbed QEI DmTftLibrary
Diff: Peripherals/Eeprom.cpp
- Revision:
- 21:ab8027016a2c
- Parent:
- 20:626b92b70bf7
diff -r 626b92b70bf7 -r ab8027016a2c Peripherals/Eeprom.cpp --- a/Peripherals/Eeprom.cpp Thu Nov 08 10:14:39 2018 +0000 +++ b/Peripherals/Eeprom.cpp Thu Jan 20 08:15:44 2022 +0000 @@ -16,8 +16,8 @@ #include "string.h" #include "Eeprom.h" #include "Menu.h" -#include "DemoApplication.h" -#include "sx1280.h" +//#include "DemoApplication.h" +//nclude "sx1280.h" #if defined( TARGET_NUCLEO_L476RG ) #include "stm32l4xx_hal_flash.h" #elif defined( TARGET_NUCLEO_L152RE ) @@ -76,15 +76,17 @@ #endif EepromSetDefaultSettings( ); } - EepromLoadSettings( ( RadioPacketTypes_t ) Eeprom.EepromData.DemoSettings.ModulationType ); +// EepromLoadSettings( ( RadioPacketTypes_t ) Eeprom.EepromData.DemoSettings.ModulationType ); } void EepromSaveSettings( EepromDataSet_t dataSet) { MemTestStruct_t memTestStruct; + switch( dataSet ) { +/* case RADIO_LORA_PARAMS: Eeprom.EepromData.ModulationParams.Params.LoRa.SpreadingFactor = ( RadioLoRaSpreadingFactors_t ) Eeprom.EepromData.DemoSettings.ModulationParam1; Eeprom.EepromData.ModulationParams.Params.LoRa.Bandwidth = ( RadioLoRaBandwidths_t ) Eeprom.EepromData.DemoSettings.ModulationParam2; @@ -196,6 +198,7 @@ printf("Saved DEMO_SETTINGS\n\r"); #endif break; +*/ case SCREEN_DATA: memcpy( Eeprom.Buffer + SCR_CAL_FLAG_EEPROM_ADDR, &( Eeprom.EepromData.MenuSettings.ScreenCalibrated ), 1 ); @@ -231,6 +234,7 @@ memcpy( &( Eeprom.EepromData.MenuSettings.Calibration.e ), Eeprom.Buffer + SCR_CAL_POSE_EEPROM_ADDR, 4 ); memcpy( &( Eeprom.EepromData.MenuSettings.Calibration.f ), Eeprom.Buffer + SCR_CAL_POSF_EEPROM_ADDR, 4 ); +/* memcpy( &( Eeprom.EepromData.DemoSettings.Entity ), Eeprom.Buffer + APP_ENTITY_EEPROM_ADDR, 1 ); memcpy( &( Eeprom.EepromData.DemoSettings.AntennaSwitch ), Eeprom.Buffer + APP_ANT_SW_EEPROM_ADDR, 1 ); memcpy( &( Eeprom.EepromData.DemoSettings.Frequency ), Eeprom.Buffer + APP_FREQ_EEPROM_ADDR, 4 ); @@ -283,8 +287,10 @@ memcpy( &( Eeprom.EepromData.DemoSettings.RngAddress ), Eeprom.Buffer + APP_RNG_ADDR_EEPROM_ADDR, 4 ); memcpy( &( Eeprom.EepromData.DemoSettings.RngAntenna ), Eeprom.Buffer + APP_RNG_ANT_EEPROM_ADDR, 1 ); memcpy( &( Eeprom.EepromData.DemoSettings.RngUnit ), Eeprom.Buffer + APP_RNG_UNIT_EEPROM_ADDR, 1 ); +*/ } +/* void EepromLoadSettings( RadioPacketTypes_t modulation ) { if( modulation == PACKET_TYPE_LORA ) @@ -436,6 +442,8 @@ EepromSaveSettings( RADIO_RANGING_PARAMS ); } +*/ + void EepromSetDefaultSettings( void ) { @@ -447,6 +455,7 @@ EepromSaveSettings( SCREEN_DATA ); +/* Eeprom.EepromData.DemoSettings.ModulationType = PACKET_TYPE_RANGING; Eeprom.EepromData.ModulationParams.PacketType = PACKET_TYPE_RANGING; Eeprom.EepromData.PacketParams.PacketType = PACKET_TYPE_RANGING; @@ -529,6 +538,7 @@ Eeprom.EepromData.DemoSettings.ModulationType = PACKET_TYPE_LORA; EepromSaveSettings( DEMO_SETTINGS ); +*/ } /*! @@ -630,6 +640,6 @@ void EepromFactoryReset( void ) { EepromSetDefaultSettings( ); - EepromLoadSettings( ( RadioPacketTypes_t )Eeprom.EepromData.DemoSettings.ModulationType ); +// EepromLoadSettings( ( RadioPacketTypes_t )Eeprom.EepromData.DemoSettings.ModulationType ); }