diff --git a/Design/TEST ANNA.indd b/Design/TEST ANNA.indd index fa45e19..c39c970 100644 Binary files a/Design/TEST ANNA.indd and b/Design/TEST ANNA.indd differ diff --git a/Design/~test anna~5amhh(.idlk b/Design/~test anna~5amhh(.idlk deleted file mode 100644 index e69de29..0000000 diff --git a/hardware/modules/meergranen/.meergranen-manual.pdf.icloud b/hardware/modules/meergranen/.meergranen-manual.pdf.icloud new file mode 100644 index 0000000..7336bd2 Binary files /dev/null and b/hardware/modules/meergranen/.meergranen-manual.pdf.icloud differ diff --git a/hardware/modules/meergranen/meergranen-manual.pdf b/hardware/modules/meergranen/meergranen-manual.pdf deleted file mode 100644 index 875cdec..0000000 Binary files a/hardware/modules/meergranen/meergranen-manual.pdf and /dev/null differ diff --git a/sketches/anna /BLISSYMBOLS/chars.ai b/sketches/anna /BLISSYMBOLSascii/BLISSYMBOLS/chars.ai similarity index 100% rename from sketches/anna /BLISSYMBOLS/chars.ai rename to sketches/anna /BLISSYMBOLSascii/BLISSYMBOLS/chars.ai diff --git a/sketches/anna /BLISSYMBOLS/chars.psd b/sketches/anna /BLISSYMBOLSascii/BLISSYMBOLS/chars.psd similarity index 100% rename from sketches/anna /BLISSYMBOLS/chars.psd rename to sketches/anna /BLISSYMBOLSascii/BLISSYMBOLS/chars.psd diff --git a/sketches/anna /BLISSYMBOLS/ear.png b/sketches/anna /BLISSYMBOLSascii/BLISSYMBOLS/ear.png similarity index 100% rename from sketches/anna /BLISSYMBOLS/ear.png rename to sketches/anna /BLISSYMBOLSascii/BLISSYMBOLS/ear.png diff --git a/sketches/anna /BLISSYMBOLS/eye.png b/sketches/anna /BLISSYMBOLSascii/BLISSYMBOLS/eye.png similarity index 100% rename from sketches/anna /BLISSYMBOLS/eye.png rename to sketches/anna /BLISSYMBOLSascii/BLISSYMBOLS/eye.png diff --git a/sketches/anna /BLISSYMBOLS/intensity.png b/sketches/anna /BLISSYMBOLSascii/BLISSYMBOLS/intensity.png similarity index 100% rename from sketches/anna /BLISSYMBOLS/intensity.png rename to sketches/anna /BLISSYMBOLSascii/BLISSYMBOLS/intensity.png diff --git a/sketches/anna /BLISSYMBOLS/language.png b/sketches/anna /BLISSYMBOLSascii/BLISSYMBOLS/language.png similarity index 100% rename from sketches/anna /BLISSYMBOLS/language.png rename to sketches/anna /BLISSYMBOLSascii/BLISSYMBOLS/language.png diff --git a/sketches/anna /BLISSYMBOLS/mind.png b/sketches/anna /BLISSYMBOLSascii/BLISSYMBOLS/mind.png similarity index 100% rename from sketches/anna /BLISSYMBOLS/mind.png rename to sketches/anna /BLISSYMBOLSascii/BLISSYMBOLS/mind.png diff --git a/sketches/anna /BLISSYMBOLS/person.png b/sketches/anna /BLISSYMBOLSascii/BLISSYMBOLS/person.png similarity index 100% rename from sketches/anna /BLISSYMBOLS/person.png rename to sketches/anna /BLISSYMBOLSascii/BLISSYMBOLS/person.png diff --git a/sketches/anna /humanReadable_buttons_/humanReadable_buttons_.ino b/sketches/anna /humanReadable_buttons_/humanReadable_buttons_.ino new file mode 100644 index 0000000..d8d2f54 --- /dev/null +++ b/sketches/anna /humanReadable_buttons_/humanReadable_buttons_.ino @@ -0,0 +1,57 @@ + + + #include //libraries fro the TV OUT mode + #include + + //button1=english,button2=HEX,button3=BIN:the buttons control the serial communcation with the other module + const char neighbour [] = "neighbour[ˈneɪbər] says:"; + const int button1Pin = 4; //buttons constants + const int button2Pin = 3; + const int button3Pin = 2; + + int button1State = 0; //buttons variables + int button2State = 0; + int button3State = 0; + + int incomingByte = 0; //for serial communication + + TVout TV; //for the TVOUT mode + +void setup() { + // put your setup code here, to run once: + Serial.begin (9600); + Serial.println(TV.vres()); + Serial.println(TV.hres()); + TV.begin(PAL,120,96); + + pinMode ( button1Pin && button2Pin && button3Pin, INPUT_PULLUP); +} + +void loop() { + // put your main code here, to run repeatedly: + button1State = digitalRead(button1Pin); //read the buttons state + button2State = digitalRead(button2Pin); + button3State = digitalRead(button3Pin); + + if (button1State == LOW && Serial.available() > 0) { //serial communcation english + incomingByte = Serial.read();//read the incoming byte + TV.print (0, 0, neighbour); + delay (500); + TV.println (incomingByte); + } + + else if (button2State == LOW && Serial.available() > 0) { //serial communication HEX + incomingByte = Serial.read(); + TV.print (0, 0, neighbour); + delay (500); + TV.println (incomingByte, HEX); + } + + else if (button3State == LOW && Serial.available() > 0) { //serial communcation BIN + incomingByte = Serial.read(); + TV.print (0, 0, neighbour); + delay (500); + TV.println (incomingByte, BIN); + } + +} diff --git a/sketches/anna /humanReadable_knobs/humanReadable_knobs.ino b/sketches/anna /humanReadable_knobs/humanReadable_knobs.ino new file mode 100644 index 0000000..5076865 --- /dev/null +++ b/sketches/anna /humanReadable_knobs/humanReadable_knobs.ino @@ -0,0 +1,58 @@ + + + #include //libraries fro the TV OUT mode + #include + + //button1=english,button2=HEX,button3=BIN:the buttons control the serial communcation with the other module + const char neighbour [] = "neighbour[ˈneɪbər] says:"; + + int knob1; + int knob2; + + int incomingByte = 0; //for serial communication + + TVout TV; //for the TVOUT mode + +void setup() { + // put your setup code here, to run once: + Serial.begin (9600); + Serial.println(TV.vres()); + Serial.println(TV.hres()); + TV.begin(PAL,120,96); + +} + +void loop() { + // put your main code here, to run repeatedly: + knob1 = analogRead(1); + knob2 = analogRead(2); + + if (knob1>0 && knob1<500 && Serial.available() > 0) { //serial communcation english + incomingByte = Serial.read();//read the incoming byte + TV.print (0, 0, neighbour); + delay (500); + TV.println (incomingByte); + } + + else if (knob1>500 && knob1<1023 && Serial.available() > 0) { //serial communication HEX + incomingByte = Serial.read(); + TV.print (0, 0, neighbour); + delay (500); + TV.println (incomingByte, HEX); + } + + else if (knob2>0 && knob2<500 && Serial.available() > 0) { //serial communcation english + incomingByte = Serial.read(); + TV.print (0, 0, neighbour); + delay (500); + TV.println (incomingByte); + } + + else if (knob2>500 && knob2<1023 && Serial.available() > 0) { //serial communication BIN + incomingByte = Serial.read(); + TV.print (0, 0, neighbour); + delay (500); + TV.println (incomingByte, BIN); + } + +}