diff options
| author | hoekstar <hoekstar@cb376a5e-1013-0410-a455-b6b1f9ac8223> | 2008-10-28 00:32:56 +0000 |
|---|---|---|
| committer | hoekstar <hoekstar@cb376a5e-1013-0410-a455-b6b1f9ac8223> | 2008-10-28 00:32:56 +0000 |
| commit | 664cba53f3f7548cbd2915e5fcec48afcb3f9523 (patch) | |
| tree | 2d2b7281dcc0a5edb15a88b6705309b08192de75 | |
| parent | 049c98b9dbb2c06f8c72b01c187577f0fa2069a5 (diff) | |
| download | reprap-backup-664cba53f3f7548cbd2915e5fcec48afcb3f9523.tar.gz reprap-backup-664cba53f3f7548cbd2915e5fcec48afcb3f9523.zip | |
got card detect and such working. now it wont write :-/
git-svn-id: https://reprap.svn.sourceforge.net/svnroot/reprap@2175 cb376a5e-1013-0410-a455-b6b1f9ac8223
4 files changed, 50 insertions, 22 deletions
diff --git a/trunk/users/hoeken/sanguino-motherboard/RepRapSDCard/RepRapSDCard.cpp b/trunk/users/hoeken/sanguino-motherboard/RepRapSDCard/RepRapSDCard.cpp index 6d73b210..394d404c 100755 --- a/trunk/users/hoeken/sanguino-motherboard/RepRapSDCard/RepRapSDCard.cpp +++ b/trunk/users/hoeken/sanguino-motherboard/RepRapSDCard/RepRapSDCard.cpp @@ -20,6 +20,17 @@ uint8_t RepRapSDCard::init_card(void) return sd_raw_init();
}
+uint8_t RepRapSDCard::isLocked(void)
+{
+ return sd_raw_locked();
+}
+
+uint8_t RepRapSDCard::isAvailable(void)
+{
+ return sd_raw_available();
+}
+
+
uint8_t RepRapSDCard::open_partition(void)
{
/* open first partition */
diff --git a/trunk/users/hoeken/sanguino-motherboard/RepRapSDCard/RepRapSDCard.h b/trunk/users/hoeken/sanguino-motherboard/RepRapSDCard/RepRapSDCard.h index 4522e82b..071dce6e 100755 --- a/trunk/users/hoeken/sanguino-motherboard/RepRapSDCard/RepRapSDCard.h +++ b/trunk/users/hoeken/sanguino-motherboard/RepRapSDCard/RepRapSDCard.h @@ -21,6 +21,8 @@ class RepRapSDCard public:
RepRapSDCard(void);
+ uint8_t isAvailable(void);
+ uint8_t isLocked(void);
uint8_t init_card(void);
uint8_t open_partition(void);
uint8_t open_filesys(void);
diff --git a/trunk/users/hoeken/sanguino-motherboard/RepRapSDCard/sd_raw_config.h b/trunk/users/hoeken/sanguino-motherboard/RepRapSDCard/sd_raw_config.h index 7c54a340..ed5bae32 100755 --- a/trunk/users/hoeken/sanguino-motherboard/RepRapSDCard/sd_raw_config.h +++ b/trunk/users/hoeken/sanguino-motherboard/RepRapSDCard/sd_raw_config.h @@ -89,13 +89,11 @@ #error "no sd/mmc pin mapping available!" #endif -//TODO: update with real values. -#define configure_pin_available() DDRC &= ~(1 << DDC4) -#define configure_pin_locked() DDRC &= ~(1 << DDC5) +#define configure_pin_available() DDRA &= ~(1 << DDA7) +#define configure_pin_locked() DDRA &= ~(1 << DDA3) -//TODO: update with real values. -#define get_pin_available() ((PINC >> PC4) & 0x01) -#define get_pin_locked() ((PINC >> PC5) & 0x01) +#define get_pin_available() ((PINA >> PC7) & 0x01) +#define get_pin_locked() ((~PINA >> PC3) & 0x01) /** * @} diff --git a/trunk/users/hoeken/sanguino-motherboard/sd_card_test/sd_card_test.pde b/trunk/users/hoeken/sanguino-motherboard/sd_card_test/sd_card_test.pde index 89e37f90..804efd24 100755 --- a/trunk/users/hoeken/sanguino-motherboard/sd_card_test/sd_card_test.pde +++ b/trunk/users/hoeken/sanguino-motherboard/sd_card_test/sd_card_test.pde @@ -16,23 +16,36 @@ void setup() if (!card.init_card()) { - Serial.println("Card init failed!"); - error = 1; + if (!card.isAvailable()) + { + Serial.println("No card present"); + error = 1; + } + else + { + Serial.println("Card init failed"); + error = 2; + } } else if (!card.open_partition()) { - Serial.println("No partition!"); - error = 2; + Serial.println("No partition"); + error = 3; } else if (!card.open_filesys()) { Serial.println("Can't open filesys"); - error = 3; + error = 4; } else if (!card.open_dir("/")) { Serial.println("Can't open /"); - error = 4; + error = 5; + } + else if (card.isLocked()) + { + Serial.println("Card is locked"); + error = 6; } } @@ -81,17 +94,21 @@ void open_file() { Serial.println("couldnt create: "); Serial.println(buffer); - error = 5; + error = 7; } - - f = card.open_file(buffer); - if (!f) + else { - Serial.println("error opening: "); - Serial.println(buffer); - error = 6; + f = card.open_file(buffer); + if (!f) + { + Serial.println("error opening: "); + Serial.println(buffer); + error = 8; + } + else + { + Serial.println("writing to: "); + Serial.println(buffer); + } } - - Serial.println("writing to: "); - Serial.println(buffer); } |