diff --git a/Software/dashboard/Makefile b/Software/dashboard/Makefile index ac697eb..7cc11cb 100644 --- a/Software/dashboard/Makefile +++ b/Software/dashboard/Makefile @@ -1,11 +1,17 @@ -TARGET_HOST := tritium-h5 +TARGET_USER := a2nr +TARGET_HOST := 192.168.1.3 TARGET_PATH := /home/a2nr/Documents/dashboard -all: build up run +all: comp up run +debug: ddebug up run_debug -build: +ddebug: + flutterpi_tool build --arch=arm64 +comp: flutterpi_tool build --arch=arm64 --release up: - rsync -a --info=progress2 ./build/flutter_assets a2nr@$(TARGET_HOST):$(TARGET_PATH) + rsync -a --info=progress2 ./build/flutter_assets $(TARGET_USER)@$(TARGET_HOST):$(TARGET_PATH) run: - ssh a2nr@$(TARGET_HOST) 'flutter-pi -o landscape_left --release $(TARGET_PATH)/flutter_assets' + ssh $(TARGET_USER)@$(TARGET_HOST) 'flutter-pi -o landscape_left --release $(TARGET_PATH)/flutter_assets' +run_debug: + ssh $(TARGET_USER)@$(TARGET_HOST) 'flutter-pi -o landscape_left $(TARGET_PATH)/flutter_assets' diff --git a/Software/dashboard/lib/interface/adc1256.dart b/Software/dashboard/lib/interface/adc1256.dart new file mode 100644 index 0000000..e69de29 diff --git a/Software/dashboard/lib/interface/gpio.dart b/Software/dashboard/lib/interface/gpio.dart new file mode 100644 index 0000000..e69de29 diff --git a/Software/dashboard/lib/main.dart b/Software/dashboard/lib/main.dart index ae08986..d8958c7 100644 --- a/Software/dashboard/lib/main.dart +++ b/Software/dashboard/lib/main.dart @@ -1,5 +1,7 @@ import 'package:flutter/material.dart'; -import 'mouse_cursor.dart'; +import 'util/mouse_cursor.dart'; +import 'package:dart_periphery/dart_periphery.dart'; +import 'dart:io'; void main() { runApp(const MyApp()); @@ -11,44 +13,22 @@ class MyApp extends StatelessWidget { // This widget is the root of your application. @override Widget build(BuildContext context) { - return SoftwareMouseCursor( child : MaterialApp( - title: 'Flutter Demo', - theme: ThemeData( - // This is the theme of your application. - // - // TRY THIS: Try running your application with "flutter run". You'll see - // the application has a purple toolbar. Then, without quitting the app, - // try changing the seedColor in the colorScheme below to Colors.green - // and then invoke "hot reload" (save your changes or press the "hot - // reload" button in a Flutter-supported IDE, or press "r" if you used - // the command line to start the app). - // - // Notice that the counter didn't reset back to zero; the application - // state is not lost during the reload. To reset the state, use hot - // restart instead. - // - // This works for code too, not just values: Most code changes can be - // tested with just a hot reload. - colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple), - useMaterial3: true, - ), - home: const MyHomePage(title: 'Flutter Demo Home Page'), - )); + return SoftwareMouseCursor( + child : MaterialApp( + title: 'Heart Beat Mice', + theme: ThemeData( + colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple), + useMaterial3: true, + ), + home: const MyHomePage(title: 'Heart Beat Mice'), + ) + ); } } class MyHomePage extends StatefulWidget { const MyHomePage({super.key, required this.title}); - // This widget is the home page of your application. It is stateful, meaning - // that it has a State object (defined below) that contains fields that affect - // how it looks. - - // This class is the configuration for the state. It holds the values (in this - // case the title) provided by the parent (in this case the App widget) and - // used by the build method of the State. Fields in a Widget subclass are - // always marked "final". - final String title; @override @@ -57,71 +37,57 @@ class MyHomePage extends StatefulWidget { class _MyHomePageState extends State { int _counter = 0; + var config, gpio; + + @override + void initState(){ + super.initState(); + config = GPIOconfig.defaultValues(); + config.direction = GPIOdirection.gpioDirOut; + gpio = GPIO(1, GPIOdirection.gpioDirOut, 1); + } + + @override + void dispose(){ + super.dispose(); + gpio.dispose(); + } void _incrementCounter() { setState(() { - // This call to setState tells the Flutter framework that something has - // changed in this State, which causes it to rerun the build method below - // so that the display can reflect the updated values. If we changed - // _counter without calling setState(), then the build method would not be - // called again, and so nothing would appear to happen. - _counter++; - }); + _counter++; + }); + gpio.write(_counter.isOdd); + print("gpio.write : $_counter.isOdd"); } @override - Widget build(BuildContext context) { - // This method is rerun every time setState is called, for instance as done - // by the _incrementCounter method above. - // - // The Flutter framework has been optimized to make rerunning build methods - // fast, so that you can just rebuild anything that needs updating rather - // than having to individually change instances of widgets. - return Scaffold( - appBar: AppBar( - // TRY THIS: Try changing the color here to a specific color (to - // Colors.amber, perhaps?) and trigger a hot reload to see the AppBar - // change color while the other colors stay the same. - backgroundColor: Theme.of(context).colorScheme.inversePrimary, - // Here we take the value from the MyHomePage object that was created by - // the App.build method, and use it to set our appbar title. - title: Text(widget.title), - ), - body: Center( - // Center is a layout widget. It takes a single child and positions it - // in the middle of the parent. - child: Column( - // Column is also a layout widget. It takes a list of children and - // arranges them vertically. By default, it sizes itself to fit its - // children horizontally, and tries to be as tall as its parent. - // - // Column has various properties to control how it sizes itself and - // how it positions its children. Here we use mainAxisAlignment to - // center the children vertically; the main axis here is the vertical - // axis because Columns are vertical (the cross axis would be - // horizontal). - // - // TRY THIS: Invoke "debug painting" (choose the "Toggle Debug Paint" - // action in the IDE, or press "p" in the console), to see the - // wireframe for each widget. - mainAxisAlignment: MainAxisAlignment.center, - children: [ - const Text( - 'You have pushed the button this many times:', + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + backgroundColor: Theme.of(context).colorScheme.inversePrimary, + title: Text(widget.title), ), - Text( - '$_counter', - style: Theme.of(context).textTheme.headlineMedium, + body: Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Text( + 'You have pushed the button this many times:', + ), + Text( + '$_counter', + style: Theme.of(context).textTheme.headlineMedium, + ), + ], + ), ), - ], - ), - ), - floatingActionButton: FloatingActionButton( - onPressed: _incrementCounter, - tooltip: 'Increment', - child: const Icon(Icons.add), - ), // This trailing comma makes auto-formatting nicer for build methods. - ); - } + floatingActionButton: FloatingActionButton( + onPressed: _incrementCounter, + tooltip: 'Increment', + child: const Icon(Icons.add), + ), + ); + } } diff --git a/Software/dashboard/lib/mouse_cursor.dart b/Software/dashboard/lib/util/mouse_cursor.dart similarity index 100% rename from Software/dashboard/lib/mouse_cursor.dart rename to Software/dashboard/lib/util/mouse_cursor.dart diff --git a/Software/dashboard/pubspec.lock b/Software/dashboard/pubspec.lock index d795516..4f8e2ca 100644 --- a/Software/dashboard/pubspec.lock +++ b/Software/dashboard/pubspec.lock @@ -49,6 +49,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.8" + dart_periphery: + dependency: "direct dev" + description: + name: dart_periphery + sha256: "03fef538e07124346ca89e214c34e505e6ff2d2766d7927cac099bae53601113" + url: "https://pub.dev" + source: hosted + version: "0.9.6" fake_async: dependency: transitive description: @@ -57,6 +65,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.1" + ffi: + dependency: transitive + description: + name: ffi + sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" + url: "https://pub.dev" + source: hosted + version: "2.1.3" + file: + dependency: transitive + description: + name: file + sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" + url: "https://pub.dev" + source: hosted + version: "7.0.0" flutter: dependency: "direct main" description: flutter @@ -139,6 +163,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.9.0" + platform: + dependency: transitive + description: + name: platform + sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65" + url: "https://pub.dev" + source: hosted + version: "3.1.5" + process: + dependency: transitive + description: + name: process + sha256: "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32" + url: "https://pub.dev" + source: hosted + version: "5.0.2" sky_engine: dependency: transitive description: flutter diff --git a/Software/dashboard/pubspec.yaml b/Software/dashboard/pubspec.yaml index 9e0d90a..c0bf4f9 100644 --- a/Software/dashboard/pubspec.yaml +++ b/Software/dashboard/pubspec.yaml @@ -31,6 +31,7 @@ dependencies: flutter: sdk: flutter + # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.6 @@ -38,6 +39,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter + dart_periphery: ^0.9.6 # The "flutter_lints" package below contains a set of recommended lints to # encourage good coding practices. The lint set provided by the package is