Skip to content

Commit

Permalink
Lots of misc in-progress stuff, most of which was abandoned. I need t…
Browse files Browse the repository at this point in the history
…o get this committed so I can start cleaning up.

Added wokwi, added a demo mode for easier screen testing, pulled in all sorts of stuff, left it half way though a big migration of some sort.
  • Loading branch information
Marcus10110 committed Apr 7, 2024
1 parent 5de5b70 commit ca18433
Show file tree
Hide file tree
Showing 42 changed files with 6,292 additions and 202 deletions.
12 changes: 6 additions & 6 deletions .vscode/arduino.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"board": "esp32:esp32:featheresp32",
"configuration": "FlashFreq=80,UploadSpeed=921600,DebugLevel=none,PartitionScheme=default",
"sketch": "DelSolClock.ino",
"port": "COM9",
"output": "../temp/ArduinoBuild/DelSolClock"
}
"board": "esp32:esp32:featheresp32",
"configuration": "FlashFreq=80,UploadSpeed=921600,DebugLevel=none,PartitionScheme=default",
"sketch": "DelSolClock.ino",
"port": "COM9",
"output": "../temp/ArduinoBuild/DelSolClock"
}
467 changes: 349 additions & 118 deletions .vscode/c_cpp_properties.json

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,5 +84,7 @@
"cinttypes": "cpp",
"memory_resource": "cpp"
},
"clang-format.executable": "C:\\Users\\markg\\Software\\clang-format-6923b0a7.exe"
"clang-format.executable": "C:\\Users\\markg\\Software\\clang-format-6923b0a7.exe",
"arduino.useArduinoCli": true

}
4 changes: 2 additions & 2 deletions DelSolClock.ino
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// #define SIMULATION 1
#define SIMULATION 0

#ifdef SIMULATION
#if SIMULATION
// Simulation mode is used to allow simualting the UI with wokwi.
// wokwi seems to only work with the generic esp32 board target.
// The del sol clock hardware uses the Adafruit ESP32 Feather target.
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file added Design/Design2/DS_PCA01.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Design/Design2/DS_PCA01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
45 changes: 45 additions & 0 deletions diagram.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"version": 1,
"author": "Mark Garrison",
"editor": "wokwi",
"parts": [
{
"type": "wokwi-esp32-devkit-v1",
"id": "esp",
"top": 63.35,
"left": -127.33,
"attrs": {}
},
{
"type": "wokwi-ili9341",
"id": "lcd1",
"top": 9.22,
"left": 61.52,
"attrs": {}
},
{
"type": "wokwi-microsd-card",
"id": "sd1",
"top": 353.18,
"left": -254.67,
"attrs": {}
}
],
"connections": [
["lcd1:GND", "esp:GND.1", "black", ["v39.14", "h-100.15", "v-114.89"]],
["lcd1:CS", "esp:D15", "green", ["v28.77", "h-102.34", "v-115.63"]],
["lcd1:RST", "esp:D4", "green", ["v22.09", "h-104.53", "v-114.89"]],
["lcd1:D/C", "esp:D2", "green", ["v16.16", "h-104.49", "v-114.15"]],
["lcd1:SCK", "esp:D18", "green", ["v10.23", "h-117.02", "v-158.63"]],
["lcd1:MISO", "esp:D19", "green", ["v46.55", "h-176.99", "v-212"]],
["lcd1:MOSI", "esp:D23", "green", ["v33.95", "h-159.3", "v-240.16"]],
["esp:VIN", "lcd1:VCC", "red", ["h-10.84", "v133.05", "h247.33"]],
["sd1:CS", "esp:D5", "green", ["h164.09", "v-265.44"]],
["sd1:DI", "esp:D23", "green", ["h191.95", "v-320.28"]],
["sd1:VCC", "esp:VIN", "red", ["h0"]],
["sd1:SCK", "esp:D18", "green", ["h170.79", "v-246.64"]],
["sd1:GND", "esp:GND.2", "black", ["h28.05", "v-159.34"]],
["sd1:DO", "esp:D19", "green", ["h205.65", "v-217.37"]]
],
"dependencies": {}
}
2 changes: 1 addition & 1 deletion display2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ namespace Display
setCursor( 0, 0 );
setTextColor( DefaultTextColor );
setTextWrap( true );
setFont( NormalFont );
setFont( nullptr );
setTextSize( NormalFontSize );
}

Expand Down
Binary file not shown.
7 changes: 7 additions & 0 deletions libraries.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Wokwi Library List
# See https://docs.wokwi.com/guides/libraries

# Automatically added based on includes:
Adafruit GFX Library

Adafruit ILI9341
Loading

0 comments on commit ca18433

Please sign in to comment.