noisymime
/
Arduino_STM32
mirror of https://github.com/noisymime/Arduino_STM32.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upated EEPROM library with files from Matthias aka @madias

This commit is contained in:
Roger Clark 2015-01-31 09:07:11 +11:00
parent 8c2fa4ce4f
commit a8553ff050
6 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
STM32F1XX/libraries/EEPROM/EEPROM.cpp Normal file → Executable file
View File

0
STM32F1XX/libraries/EEPROM/EEPROM.h Normal file → Executable file
View File

106
STM32F1XX/libraries/EEPROM/examples/EEPROM_example/EEPROM_example.ino Normal file → Executable file
View File

@ -17,7 +17,7 @@ void setup()
{ {
// initialize the digital pin as an output: // initialize the digital pin as an output:
pinMode(ledPin, OUTPUT); pinMode(ledPin, OUTPUT);
SerialUSB.print(HELP_MSG); Serial.print(HELP_MSG);
} }
void loop() void loop()
@ -25,10 +25,10 @@ void loop()
uint16 Status; uint16 Status;
uint16 Data; uint16 Data;
while (SerialUSB.available()) while (Serial.available())
{ {
char cmd = (char)SerialUSB.read(); char cmd = (char)Serial.read();
SerialUSB.println(cmd); Serial.println(cmd);
if (cmd == '0') if (cmd == '0')
{ {
DisplayConfig(); DisplayConfig();
@ -50,20 +50,20 @@ void loop()
else if (cmd == '3') else if (cmd == '3')
{ {
Status = EEPROM.write(AddressWrite, DataWrite); Status = EEPROM.write(AddressWrite, DataWrite);
SerialUSB.print("EEPROM.write(0x"); Serial.print("EEPROM.write(0x");
SerialUSB.print(AddressWrite, HEX); Serial.print(AddressWrite, HEX);
SerialUSB.print(", 0x"); Serial.print(", 0x");
SerialUSB.print(DataWrite, HEX); Serial.print(DataWrite, HEX);
SerialUSB.print(") : Status : "); Serial.print(") : Status : ");
SerialUSB.println(Status, HEX); Serial.println(Status, HEX);
Status = EEPROM.read(AddressWrite, &Data); Status = EEPROM.read(AddressWrite, &Data);
SerialUSB.print("EEPROM.read(0x"); Serial.print("EEPROM.read(0x");
SerialUSB.print(AddressWrite, HEX); Serial.print(AddressWrite, HEX);
SerialUSB.print(", &..) = 0x"); Serial.print(", &..) = 0x");
SerialUSB.print(Data, HEX); Serial.print(Data, HEX);
SerialUSB.print(" : Status : "); Serial.print(" : Status : ");
SerialUSB.println(Status, HEX); Serial.println(Status, HEX);
++DataWrite; ++DataWrite;
} }
@ -79,18 +79,18 @@ void loop()
else if (cmd == '6') else if (cmd == '6')
{ {
Status = EEPROM.init(); Status = EEPROM.init();
SerialUSB.print("EEPROM.init() : "); Serial.print("EEPROM.init() : ");
SerialUSB.println(Status, HEX); Serial.println(Status, HEX);
SerialUSB.println(); Serial.println();
} }
else if (cmd == '7') else if (cmd == '7')
{ {
Status = EEPROM.format(); Status = EEPROM.format();
SerialUSB.print("EEPROM.format() : "); Serial.print("EEPROM.format() : ");
SerialUSB.println(Status, HEX); Serial.println(Status, HEX);
} }
else else
SerialUSB.print(HELP_MSG); Serial.print(HELP_MSG);
} }
digitalWrite(ledPin, HIGH); digitalWrite(ledPin, HIGH);
delay(500); delay(500);
@ -100,66 +100,66 @@ void loop()
void DisplayConfig(void) void DisplayConfig(void)
{ {
SerialUSB.print ("EEPROM.PageBase0 : 0x"); Serial.print ("EEPROM.PageBase0 : 0x");
SerialUSB.println(EEPROM.PageBase0, HEX); Serial.println(EEPROM.PageBase0, HEX);
SerialUSB.print ("EEPROM.PageBase1 : 0x"); Serial.print ("EEPROM.PageBase1 : 0x");
SerialUSB.println(EEPROM.PageBase1, HEX); Serial.println(EEPROM.PageBase1, HEX);
SerialUSB.print ("EEPROM.PageSize : 0x"); Serial.print ("EEPROM.PageSize : 0x");
SerialUSB.print (EEPROM.PageSize, HEX); Serial.print (EEPROM.PageSize, HEX);
SerialUSB.print (" ("); Serial.print (" (");
SerialUSB.print (EEPROM.PageSize, DEC); Serial.print (EEPROM.PageSize, DEC);
SerialUSB.println(")"); Serial.println(")");
} }
void DisplayHex(uint16 value) void DisplayHex(uint16 value)
{ {
if (value <= 0xF) if (value <= 0xF)
SerialUSB.print("000"); Serial.print("000");
else if (value <= 0xFF) else if (value <= 0xFF)
SerialUSB.print("00"); Serial.print("00");
else if (value <= 0xFFF) else if (value <= 0xFFF)
SerialUSB.print("0"); Serial.print("0");
SerialUSB.print(value, HEX); Serial.print(value, HEX);
} }
void DisplayPages(uint32 endIndex) void DisplayPages(uint32 endIndex)
{ {
SerialUSB.println("Page 0 Top Page 1"); Serial.println("Page 0 Top Page 1");
for (uint32 idx = 0; idx < endIndex; idx += 4) for (uint32 idx = 0; idx < endIndex; idx += 4)
{ {
SerialUSB.print (EEPROM.PageBase0 + idx, HEX); Serial.print (EEPROM.PageBase0 + idx, HEX);
SerialUSB.print (" : "); Serial.print (" : ");
DisplayHex(*(uint16*)(EEPROM.PageBase0 + idx)); DisplayHex(*(uint16*)(EEPROM.PageBase0 + idx));
SerialUSB.print (" "); Serial.print (" ");
DisplayHex(*(uint16*)(EEPROM.PageBase0 + idx + 2)); DisplayHex(*(uint16*)(EEPROM.PageBase0 + idx + 2));
SerialUSB.print (" "); Serial.print (" ");
SerialUSB.print (EEPROM.PageBase1 + idx, HEX); Serial.print (EEPROM.PageBase1 + idx, HEX);
SerialUSB.print (" : "); Serial.print (" : ");
DisplayHex(*(uint16*)(EEPROM.PageBase1 + idx)); DisplayHex(*(uint16*)(EEPROM.PageBase1 + idx));
SerialUSB.print (" "); Serial.print (" ");
DisplayHex(*(uint16*)(EEPROM.PageBase1 + idx + 2)); DisplayHex(*(uint16*)(EEPROM.PageBase1 + idx + 2));
SerialUSB.println(); Serial.println();
} }
} }
void DisplayPagesEnd(uint32 endIndex) void DisplayPagesEnd(uint32 endIndex)
{ {
SerialUSB.println("Page 0 Bottom Page 1"); Serial.println("Page 0 Bottom Page 1");
for (uint32 idx = EEPROM.PageSize - endIndex; idx < EEPROM.PageSize; idx += 4) for (uint32 idx = EEPROM.PageSize - endIndex; idx < EEPROM.PageSize; idx += 4)
{ {
SerialUSB.print (EEPROM.PageBase0 + idx, HEX); Serial.print (EEPROM.PageBase0 + idx, HEX);
SerialUSB.print (" : "); Serial.print (" : ");
DisplayHex(*(uint16*)(EEPROM.PageBase0 + idx)); DisplayHex(*(uint16*)(EEPROM.PageBase0 + idx));
SerialUSB.print (" "); Serial.print (" ");
DisplayHex(*(uint16*)(EEPROM.PageBase0 + idx + 2)); DisplayHex(*(uint16*)(EEPROM.PageBase0 + idx + 2));
SerialUSB.print (" "); Serial.print (" ");
SerialUSB.print (EEPROM.PageBase1 + idx, HEX); Serial.print (EEPROM.PageBase1 + idx, HEX);
SerialUSB.print (" : "); Serial.print (" : ");
DisplayHex(*(uint16*)(EEPROM.PageBase1 + idx)); DisplayHex(*(uint16*)(EEPROM.PageBase1 + idx));
SerialUSB.print (" "); Serial.print (" ");
DisplayHex(*(uint16*)(EEPROM.PageBase1 + idx + 2)); DisplayHex(*(uint16*)(EEPROM.PageBase1 + idx + 2));
SerialUSB.println(); Serial.println();
} }
} }

2
STM32F1XX/libraries/EEPROM/flash_stm32.c Normal file → Executable file
View File

@ -1,6 +1,6 @@
//#include "libmaple.h" //#include "libmaple.h"
//#include "util.h" //#include "util.h"
#include "flash.h" #include "libmaple/flash.h"
#include "flash_stm32.h" #include "flash_stm32.h"
#define FLASH_KEY1 ((uint32)0x45670123) #define FLASH_KEY1 ((uint32)0x45670123)

0
STM32F1XX/libraries/EEPROM/flash_stm32.h Normal file → Executable file
View File

0
STM32F1XX/libraries/EEPROM/keywords.txt Normal file → Executable file
View File