summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2016-02-24 17:50:02 +0100
committerDaniel Friesel <derf@finalrewind.org>2016-02-24 17:50:02 +0100
commitb4293fd7aa24bc020f901c7a383f3e87d34a3b76 (patch)
treec07609e11cb0f20831a6d7102320d039e7ab417b /src
parent6cc9c4fa5133e5b2e587735d2cd3cc9272fa7c8a (diff)
add pattern transfer test code to blinkenrocket.py, speed up modem/receive
Diffstat (limited to 'src')
-rw-r--r--src/storage.cc10
-rw-r--r--src/system.cc20
2 files changed, 14 insertions, 16 deletions
diff --git a/src/storage.cc b/src/storage.cc
index 8b725be..b15c55d 100644
--- a/src/storage.cc
+++ b/src/storage.cc
@@ -168,9 +168,9 @@ uint8_t Storage::i2c_write(uint8_t addrhi, uint8_t addrlo, uint8_t len, uint8_t
* All other error conditions (even though they should never happen[tm])
* are handled the same way.
*/
- for (num_tries = 0; num_tries < 16; num_tries++) {
+ for (num_tries = 0; num_tries < 32; num_tries++) {
if (num_tries > 0)
- _delay_ms(1);
+ _delay_us(500);
if (i2c_start_write() != I2C_OK)
continue; // EEPROM is busy writing
@@ -205,9 +205,9 @@ uint8_t Storage::i2c_read(uint8_t addrhi, uint8_t addrlo, uint8_t len, uint8_t *
/*
* See comments in i2c_write.
*/
- for (num_tries = 0; num_tries < 16; num_tries++) {
+ for (num_tries = 0; num_tries < 32; num_tries++) {
if (num_tries > 0)
- _delay_ms(1);
+ _delay_us(500);
if (i2c_start_write() != I2C_OK)
continue; // EEPROM is busy writing
@@ -232,8 +232,6 @@ uint8_t Storage::i2c_read(uint8_t addrhi, uint8_t addrlo, uint8_t len, uint8_t *
void Storage::reset()
{
first_free_page = 0;
- num_anims = 0xff;
- i2c_write(0, 0, 1, &num_anims); // pretend the EEPROM was never written to
num_anims = 0;
}
diff --git a/src/system.cc b/src/system.cc
index aa21b00..5729c57 100644
--- a/src/system.cc
+++ b/src/system.cc
@@ -33,16 +33,16 @@ void System::initialize()
modem.enable();
storage.enable();
- storage.reset();
- storage.save((uint8_t *)"\x10\x0a\x11\x00nootnoot");
- storage.save((uint8_t *)"\x10\x09\x20\x00" "fnordor");
- storage.save((uint8_t *)"\x10\x05\x20\x00 \x01 ");
- storage.save((uint8_t *)"\x20\x22\x08\x02"
- "\x00\x04\x22\x02\x22\x04\x00\x00"
- "\x00\x00\x00\x00\x00\x00\x00\x00"
- "\x00\x04\x22\x02\x22\x04\x00\x00"
- "\x00\x00\x00\x00");
- storage.append((uint8_t *)"\x00\x00\x00\x00");
+ //storage.reset();
+ //storage.save((uint8_t *)"\x10\x0a\x11\x00nootnoot");
+ //storage.save((uint8_t *)"\x10\x09\x20\x00" "fnordor");
+ //storage.save((uint8_t *)"\x10\x05\x20\x00 \x01 ");
+ //storage.save((uint8_t *)"\x20\x22\x08\x02"
+ // "\x00\x04\x22\x02\x22\x04\x00\x00"
+ // "\x00\x00\x00\x00\x00\x00\x00\x00"
+ // "\x00\x04\x22\x02\x22\x04\x00\x00"
+ // "\x00\x00\x00\x00");
+ //storage.append((uint8_t *)"\x00\x00\x00\x00");
sei();