working commands. singleton deleted
Diff: OfflineCommand.cpp
- Revision:
- 2:c9e47ac47edb
- Parent:
- 1:fd4c0e2decb8
- Child:
- 3:32afe87d4b62
diff -r fd4c0e2decb8 -r c9e47ac47edb OfflineCommand.cpp --- a/OfflineCommand.cpp Sun Jun 07 14:11:14 2015 +0000 +++ b/OfflineCommand.cpp Sun Jun 07 17:49:23 2015 +0000 @@ -2,10 +2,10 @@ volatile int32_t OfflineCommand::addr = 0; -OfflineCommand::OfflineCommand() +OfflineCommand::OfflineCommand(Sensors* sensors, Storage* storage) { - this->sensors = Sensors::getInstance(); - this->storage = Storage::getInstance(); + this->sensors = sensors; + this->storage = storage; addr = 0x0; this->running = 0; this->state = 0; @@ -69,18 +69,17 @@ void OfflineCommand::writeToMemory() { - sensors->updateIMU(); - sensors->updateAngle(); - if(!storage->isBusy()) { storage->pageProgram(addr); - storage->writeData(sensors->getAngleH()); - storage->writeData(sensors->getAngleL()); - storage->writeData(sensors->getGyroXH()); - storage->writeData(sensors->getGyroXH()); - + /* + storage->writeData() + storage->writeData() + storage->writeData() + storage->writeData() + */ + storage->endAction(); addr = addr + 0x4; @@ -94,28 +93,28 @@ void OfflineCommand::eraseMemory() { __disable_irq(); - Storage::getInstance()->reset(); + storage->reset(); - while(Storage::getInstance()->isBusy()) { + while(storage->isBusy()) { setLed(1); wait(0.1); setLed(0); } - Storage::getInstance()->setWREN(); + storage->setWREN(); wait(0.01); - Storage::getInstance()->bulkErase(); + storage->bulkErase(); wait(0.01); printf("erasing...\n"); - while(Storage::getInstance()->isBusy()) { + while(storage->isBusy()) { wait(0.1); } - printf("succes...%d\n", Storage::getInstance()->getSR1()); + printf("succes...%d\n", storage->getSR1()); __enable_irq(); /*