aboutsummaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rwxr-xr-xsource/controller.cpp55
-rw-r--r--source/rtc.cpp20
-rw-r--r--source/rtc.hpp20
-rw-r--r--source/sharp.cpp59
-rw-r--r--source/sharp.hpp37
-rw-r--r--source/vibrate.hpp42
-rw-r--r--source/widget.cpp24
-rw-r--r--source/widget.hpp35
8 files changed, 277 insertions, 15 deletions
diff --git a/source/controller.cpp b/source/controller.cpp
index d9ac961..defae8a 100755
--- a/source/controller.cpp
+++ b/source/controller.cpp
@@ -1,9 +1,28 @@
-// sharp takes < ~0.05uA
+/**
+ * @file controller.cpp
+ * @brief The main smartwatch code.
+ *
+ * Copyright (C) 2019 Clyne Sullivan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
#include <bluefruit.h>
#include "rtc.hpp"
#include "sharp.hpp"
+#include "vibrate.hpp"
#include "widget.hpp"
BLEUart bleuart;
@@ -22,8 +41,7 @@ void setup(void)
while (!Serial)
delay(10);
- Serial.println(F("Initializing..."));
-
+ Vibrate::begin();
RTC::begin();
Sharp::begin();
@@ -45,16 +63,41 @@ void setup(void)
Bluefruit.Advertising.setFastTimeout(30); // number of seconds in fast mode
Bluefruit.Advertising.start(0); // 0 = Don't stop advertising after n seconds
- Serial.println(F("Ready."));
Sharp::addWidget<TimeWidget>();
Sharp::addWidget<NotificationWidget>("Welcome to smartwatch");
}
+static int touchToCoord(int val)
+{
+ return val / 70 * (SHARP_HEIGHT / 10);
+}
+
void loop(void)
{
if (bleuart.available())
handlePacket();
+ static int last = 0;
+ static bool scrolled = false;
+ int val = analogRead(A5);
+ if (val >= 10) {
+ if (last == 0) {
+ scrolled = false;
+ last = val;
+ }
+
+ auto diff = val - last;
+ if (std::abs(diff) > 50) {
+ Sharp::setScroll(touchToCoord(diff));
+ scrolled = true;
+ }
+ } else {
+ if (last != 0 && !scrolled)
+ Sharp::sendInput(touchToCoord(last));
+ last = 0;
+ Sharp::setScroll();
+ }
+
delay(10);
}
@@ -68,9 +111,11 @@ void handlePacket(void)
switch (buf[0]) {
case 'L':
- //RTC::setMessage(buf + 1);
+ Vibrate::pulse();
+ Sharp::addWidget<NotificationWidget>(buf + 1);
break;
case 'T':
+ Vibrate::pulse();
Sharp::addWidget<NotificationWidget>("Time updated");
RTC::setTicks(std::atoi(buf + 1) * 60);
break;
diff --git a/source/rtc.cpp b/source/rtc.cpp
index c355c90..f28a43d 100644
--- a/source/rtc.cpp
+++ b/source/rtc.cpp
@@ -1,3 +1,23 @@
+/**
+ * @file rtc.cpp
+ * @brief Prepares and uses the RTC to count time.
+ *
+ * Copyright (C) 2019 Clyne Sullivan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
#include "rtc.hpp"
#include <bluefruit.h>
diff --git a/source/rtc.hpp b/source/rtc.hpp
index 09081a0..e4a9938 100644
--- a/source/rtc.hpp
+++ b/source/rtc.hpp
@@ -1,3 +1,23 @@
+/**
+ * @file rtc.hpp
+ * @brief Prepares and uses the RTC to count time.
+ *
+ * Copyright (C) 2019 Clyne Sullivan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
#ifndef RTC_HPP_
#define RTC_HPP_
diff --git a/source/sharp.cpp b/source/sharp.cpp
index 8fa22f9..ab0788b 100644
--- a/source/sharp.cpp
+++ b/source/sharp.cpp
@@ -1,9 +1,26 @@
+/**
+ * @file sharp.cpp
+ * @brief Handles all drawing to the display.
+ *
+ * Copyright (C) 2019 Clyne Sullivan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
#include "sharp.hpp"
#include "rtc.hpp"
-constexpr unsigned int SHARP_WIDTH = 144;
-constexpr unsigned int SHARP_HEIGHT = 168;
-
constexpr unsigned int SHARP_SCK = 12;
constexpr unsigned int SHARP_MOSI = 13;
constexpr unsigned int SHARP_SS = 14;
@@ -13,6 +30,8 @@ Adafruit_SharpMem Sharp::display(SHARP_SCK, SHARP_MOSI, SHARP_SS, SHARP_WIDTH,
TaskHandle_t Sharp::taskHandle;
std::vector<Widget *> Sharp::widgets;
+int Sharp::topY = 0;
+
void Sharp::begin(void)
{
widgets.reserve(10);
@@ -25,10 +44,40 @@ void Sharp::begin(void)
&taskHandle);
}
+void Sharp::sendInput(int ypos)
+{
+ if (ypos < 0 || ypos > SHARP_HEIGHT)
+ return;
+
+ int y = topY;
+ for (unsigned int i = 0; i < widgets.size(); i++) {
+ y += widgets[i]->getHeight();
+ if (ypos < y) {
+ if (widgets[i]->onPress()) {
+ delete widgets[i];
+ widgets.erase(widgets.begin() + i);
+ display.clearDisplay();
+ }
+ break;
+ }
+
+ y += 3;
+ if (y >= SHARP_HEIGHT)
+ break;
+ }
+}
+
void Sharp::updateTask([[maybe_unused]] void *arg)
{
+ static int oldTopY = 0;
+
while (1) {
- unsigned int y = 0;
+ if (oldTopY != topY) {
+ oldTopY = topY;
+ display.clearDisplay();
+ }
+
+ auto y = topY;
for (auto& w : widgets) {
w->render(display, y);
y += w->getHeight();
@@ -39,7 +88,7 @@ void Sharp::updateTask([[maybe_unused]] void *arg)
}
display.refresh();
- delay(300);
+ delay(150);
}
}
diff --git a/source/sharp.hpp b/source/sharp.hpp
index 2775711..155acec 100644
--- a/source/sharp.hpp
+++ b/source/sharp.hpp
@@ -1,3 +1,23 @@
+/**
+ * @file sharp.hpp
+ * @brief Handles all drawing to the display.
+ *
+ * Copyright (C) 2019 Clyne Sullivan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
#ifndef SHARP_HPP_
#define SHARP_HPP_
@@ -9,12 +29,18 @@
#define BLACK 0
#define WHITE 1
+constexpr int SHARP_WIDTH = 144;
+constexpr int SHARP_HEIGHT = 168;
+
class Sharp {
private:
static Adafruit_SharpMem display;
static TaskHandle_t taskHandle;
static std::vector<Widget *> widgets;
+
+ static int topY;
+
public:
static void begin(void);
@@ -23,6 +49,17 @@ public:
widgets.emplace_back(new T(args...));
}
+ inline static void setScroll(int scr = 0) {
+ static int oldTopY = 0;
+ if (scr == 0) {
+ oldTopY = topY;
+ } else {
+ topY = minof(0, oldTopY + scr);
+ }
+ }
+
+ static void sendInput(int ypos);
+
private:
static void updateTask(void *);
};
diff --git a/source/vibrate.hpp b/source/vibrate.hpp
new file mode 100644
index 0000000..55eb511
--- /dev/null
+++ b/source/vibrate.hpp
@@ -0,0 +1,42 @@
+/**
+ * @file vibrate.hpp
+ * @brief Provides access to the vibration motor.
+ *
+ * Copyright (C) 2019 Clyne Sullivan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef VIBRATE_HPP_
+#define VIBRATE_HPP_
+
+class Vibrate {
+private:
+ constexpr static unsigned int motorPin = 27;
+ constexpr static unsigned int pulseDuration = 200;
+
+public:
+ inline static void begin(void) {
+ pinMode(motorPin, OUTPUT);
+ digitalWrite(motorPin, false);
+ }
+
+ inline static void pulse(void) {
+ digitalWrite(motorPin, true);
+ delay(pulseDuration);
+ digitalWrite(motorPin, false);
+ }
+};
+
+#endif // VIBRATE_HPP_
diff --git a/source/widget.cpp b/source/widget.cpp
index 9109185..358de01 100644
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -1,7 +1,27 @@
+/**
+ * @file widget.cpp
+ * @brief Defines widgets that may be put on the display.
+ *
+ * Copyright (C) 2019 Clyne Sullivan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
#include "rtc.hpp"
#include "widget.hpp"
-void TimeWidget::render(Adafruit_GFX& display, unsigned int ypos)
+void TimeWidget::render(Adafruit_GFX& display, int ypos)
{
if (auto t = RTC::ticks(); t != prevTicks) {
prevTicks = t;
@@ -12,7 +32,7 @@ void TimeWidget::render(Adafruit_GFX& display, unsigned int ypos)
}
}
-void NotificationWidget::render(Adafruit_GFX& display, unsigned int ypos)
+void NotificationWidget::render(Adafruit_GFX& display, int ypos)
{
display.setTextSize(2);
display.setCursor(0, ypos);
diff --git a/source/widget.hpp b/source/widget.hpp
index afa9441..32e7009 100644
--- a/source/widget.hpp
+++ b/source/widget.hpp
@@ -1,8 +1,29 @@
+/**
+ * @file widget.hpp
+ * @brief Defines widgets that may be put on the display.
+ *
+ * Copyright (C) 2019 Clyne Sullivan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
#ifndef WIDGET_HPP_
#define WIDGET_HPP_
class Adafruit_GFX;
+#include <bluefruit.h>
#include <cstring>
class Widget {
@@ -16,7 +37,8 @@ public:
return height;
}
- virtual void render(Adafruit_GFX& display, unsigned int ypos) = 0;
+ virtual void render(Adafruit_GFX& display, int ypos) = 0;
+ virtual bool onPress(void) = 0;
protected:
inline void setHeight(unsigned int _height) {
@@ -32,7 +54,10 @@ public:
constexpr TimeWidget(void)
: Widget(30), prevTicks(0) {}
- void render(Adafruit_GFX& display, unsigned int ypos) final;
+ void render(Adafruit_GFX& display, int ypos) final;
+ bool onPress(void) final {
+ return false;
+ }
};
class NotificationWidget : public Widget {
@@ -49,6 +74,10 @@ public:
setHeight(16 * (i / 12 + 1));
}
- void render(Adafruit_GFX& display, unsigned int ypos) final;
+ void render(Adafruit_GFX& display, int ypos) final;
+ bool onPress(void) final {
+ return true;
+ }
};
+
#endif // WIDGET_HPP_
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-04 02:52:08 +0000