aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--puzzle/vault/main.cpp89
-rw-r--r--puzzle/vault/makefile4
2 files changed, 74 insertions, 19 deletions
diff --git a/puzzle/vault/main.cpp b/puzzle/vault/main.cpp
index a553c97..1a70076 100644
--- a/puzzle/vault/main.cpp
+++ b/puzzle/vault/main.cpp
@@ -18,6 +18,28 @@ const int ROW_PINS[ROWS] = {7, 6, 5, 4};
const int COL_PINS[COLS] = {10, 9, 8};
const char* validButtons[TOTAL_LEVELS] = {"A2", "B1", "D3", "C2", "C3"};
const char bombCode[] = "1234";
+const uint8_t SEGMENT_MAP[] = {
+ 0b00111111, // 0
+ 0b00000110, // 1
+ 0b01011011, // 2
+ 0b01001111, // 3
+ 0b01100110, // 4
+ 0b01101101, // 5
+ 0b01111101, // 6
+ 0b00000111, // 7
+ 0b01111111, // 8
+ 0b01101111, // 9
+ 0b01110111, // A
+ 0b01111100, // B
+ 0b00111001, // C
+ 0b01011110, // D
+ 0b01111001, // E
+ 0b01110001 // F
+ // Add other letters if needed
+};
+
+// This array of level codes matches the codes you might display per level.
+const char* levelCodes[TOTAL_LEVELS] = {"A1", "B2", "D1", "C3", "A2"};
// Puzzle state
@@ -27,15 +49,20 @@ TM1637Display display(CLK, DIO);
int currentLevel = 0;
-void blink_display(char num) {
- while(puzzleState == PB_GS_NOINIT) {
- display.showNumberDecEx(0, 0b11111111, true); // Display "0000" with all digits on
- delay(500);
- display.clear();
- delay(500);
+void blink_display(int num) {
+ if (num == 1) {
+ // Display "1111" with leading zeros shown if necessary
+ display.showNumberDecEx(1111, 0b11111111, true);
+ } else if (num == 0) {
+ // Display "0000" with leading zeros shown if necessary
+ display.showNumberDecEx(0, 0b11111111, true);
}
+ delay(500);
+ display.clear();
+ delay(500);
}
+
void display_final_code(const char* code) {
uint8_t segs[4] = {0, 0, 0, 0};
int numDigits = strlen(code);
@@ -90,6 +117,37 @@ void initialize_system() {
Serial.println("GPIO and display initialized.");
}
+void display_code_for_level(int level) {
+ char code[3] = {0}; // Temp storage for level code
+ strncpy(code, levelCodes[level], 2); // Copy the level-specific code
+
+ uint8_t segs[4] = {0}; // Segments to send to the display
+
+ // Check if the first character is a letter and map it
+ if (isalpha(code[0])) {
+ if (code[0] >= 'A' && code[0] <= 'F') {
+ segs[0] = SEGMENT_MAP[code[0] - 'A' + 10]; // Maps A-F to their segment patterns
+ } else {
+ // Handle unexpected characters or extend SEGMENT_MAP for more letters
+ segs[0] = 0; // Display nothing for undefined letters
+ }
+ } else {
+ // Assume it's a number and map directly
+ segs[0] = SEGMENT_MAP[code[0] - '0'];
+ }
+
+ // Check if the second character is a digit and map it
+ if (isdigit(code[1])) {
+ segs[1] = SEGMENT_MAP[code[1] - '0'];
+ } else {
+ // Handle unexpected characters
+ segs[1] = 0; // Display nothing for undefined digits
+ }
+
+ // Set only the first two segments, leave others blank
+ display.setSegments(segs, 2, 0); // Display on leftmost two digits
+}
+
void setup() {
Serial.begin(115200);
@@ -97,34 +155,31 @@ void setup() {
digitalWrite(SOLVED_PIN, LOW);
display.setBrightness(0x0f);
- //puzzelState = pb_hook_mod_state_read();
+ puzzleState = pb_hook_mod_state_read();
-
- ///// TEST
- puzzleState = PB_GS_IDLE;
initialize_system();
-
- // Initialize display with blinking zeros to indicate no connection or initialization state
- blink_display('0');
}
void loop() {
switch(puzzleState) {
case PB_GS_PLAYING:
+ display_code_for_level(currentLevel);
check_button_press();
delay(100);
break;
case PB_GS_SOLVED:
+ Serial.println("STATE = PB_GS_SOLVED");
display_final_code(bombCode);
digitalWrite(SOLVED_PIN, HIGH);
- Serial.println("Final display shown. Puzzle complete.");
break;
case PB_GS_NOINIT:
- blink_display('0');
+ Serial.println("STATE = PB_GS_NOINIT");
+ blink_display(0);
break;
case PB_GS_IDLE:
- blink_display('1');
+ Serial.println("STATE = PB_GS_IDLE");
+ blink_display(1);
break;
}
- //puzzelState = pb_hook_mod_state_read();
+ puzzleState = pb_hook_mod_state_read();
} \ No newline at end of file
diff --git a/puzzle/vault/makefile b/puzzle/vault/makefile
index e22f546..f33ca7e 100644
--- a/puzzle/vault/makefile
+++ b/puzzle/vault/makefile
@@ -2,7 +2,7 @@ TARGET = $(BUILD_DIR)/main.elf
include ../../lazy.mk
-export SERIAL_PORT ?= /dev/ttyACM0
+export SERIAL_PORT ?= /dev/ttyUSB0
flash: upload;
-upload-main: $(TARGET)
+upload: $(TARGET)