Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rewrite Open Trickler w/ Python #51

Merged
merged 160 commits into from
Aug 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
160 commits
Select commit Hold shift + click to select a range
12696c0
Drop JS files
erichiggins Oct 25, 2020
f3d72bf
First commit of python files -- not working
erichiggins Oct 25, 2020
c309c29
Drop more node files
erichiggins Oct 25, 2020
d220e93
Update README with python info
erichiggins Oct 25, 2020
6e087bd
rename scale.py to scales.py
erichiggins Oct 28, 2020
7bdb1a3
Code cleanups
erichiggins Oct 28, 2020
0258006
Drop variables file. Not needed.
erichiggins Oct 28, 2020
e6141b5
More progress. Ready to start testing.
erichiggins Oct 29, 2020
9abb704
Bug fixes, functional changes for logging and executable scripts
erichiggins Oct 30, 2020
9e62756
Break out motor control, add motor tests
erichiggins Oct 30, 2020
c10609d
Set memcache values on script startup to avoid conflicts from prior runs
erichiggins Oct 30, 2020
d5634fa
Move memcache updates into appropriate files, such as scale and motor
erichiggins Oct 30, 2020
c29bf22
Drop test serial file, replaced my scales.py
erichiggins Oct 31, 2020
34bb03b
Make motors.py executable
erichiggins Oct 31, 2020
80aa025
Change motor test script, ramp up then down.
erichiggins Oct 31, 2020
54fb5f8
Fix commands to be sent as bytes. Fix CLI interface to use strings fo…
erichiggins Oct 31, 2020
769a027
Ignore DS_store files
erichiggins Nov 1, 2020
202a942
Add PID tuning output option.
erichiggins Nov 1, 2020
592712d
Update default PID values and new min PWM speed
erichiggins Nov 1, 2020
d881757
Some code cleanups and fixes. Scale reading not working in main loop
erichiggins Nov 7, 2020
13888ad
Refactor loops for simplicity. Moved memcache client to be an arg. Fi…
erichiggins Nov 9, 2020
4aa30d9
More cleanups. Unit changing on scale works. Prevent trickling in mor…
erichiggins Nov 10, 2020
54f126f
Remove TOOD about unit switching, confirmed working
erichiggins Nov 11, 2020
1efa5ff
Add grpcio req
erichiggins Nov 21, 2020
a1784a2
Initial pass at v1 bluetooth module for compatibility. Still needs te…
erichiggins Nov 23, 2020
2610b36
Support config file, version scale status, lint cleanups, add helpers…
erichiggins Jan 30, 2021
7a55714
Use config to enable pid tuner mode
erichiggins Jan 30, 2021
0f589bb
Add OpenAPI definition
erichiggins Jan 31, 2021
fb5edb3
Update memcache for scale stability. Add comments
erichiggins Jan 31, 2021
a1b1349
Add temporary new readme
erichiggins Jan 31, 2021
585d7a3
Update scripts
erichiggins Feb 2, 2021
ff160f7
Fix open file bug in main trickler. Update server script for ini file…
erichiggins Feb 3, 2021
461416f
Add manifest and setup files for proper python packaging
erichiggins Feb 3, 2021
a304e53
Update packaging script for creating local python zip package
erichiggins Feb 3, 2021
765cf3e
use open when reading config files
erichiggins Feb 4, 2021
7faa4d2
Bluetooth bugfix, arg should be a dictionary
erichiggins Feb 4, 2021
276d6a5
Daemonize bluetooth module.
erichiggins Feb 4, 2021
3b37374
Fix reading values over bluetoothe
erichiggins Feb 5, 2021
7c41044
Fix write from bluetooth functions
erichiggins Feb 5, 2021
7d23024
Add status LED control.
erichiggins Feb 7, 2021
30850ba
Define memcache strings in constants.py to avoid bugs and make typos …
erichiggins Feb 8, 2021
f167af4
Update newer ble script, still not ready to use
erichiggins Feb 10, 2021
58b8081
Remove quotes from config file, they get copied in
erichiggins Feb 10, 2021
e7adddb
Make leds.py executable
erichiggins Feb 10, 2021
67ba4da
Comment out led disable command
erichiggins Feb 10, 2021
ce15bf3
Fix bug in leds script
erichiggins Feb 10, 2021
6bdbe3f
Fix bug in bluetooth write request for automode
erichiggins Feb 10, 2021
7ef3e00
Fix reference to scale units in ble module
erichiggins Feb 10, 2021
80332a2
Add reverse unit map to scales module
erichiggins Feb 10, 2021
0479d11
Set better default memcache values
erichiggins Feb 10, 2021
17cec2a
Make trickler unit match correct type in memcache. Add logging
erichiggins Feb 10, 2021
a533f9c
use default values to get values from memcache for leds script.
erichiggins Feb 10, 2021
9997673
Switch gitignore from node to python
erichiggins Feb 10, 2021
7396d17
Reformat large conditional for readability
erichiggins Feb 10, 2021
9ca7795
Add a second of sleep to allow scale to update when changing units
erichiggins Feb 10, 2021
2b47dcf
Reset the input buffer before reading serial device.
erichiggins Feb 13, 2021
e7be10c
improve setup script and requirements file for non-arm machines
erichiggins Feb 13, 2021
98cff34
Lint fixes
erichiggins Feb 13, 2021
b4f166e
Remove node variable from setup script
erichiggins Feb 13, 2021
a319513
Add lint script
erichiggins Feb 13, 2021
18c15a4
Improve bluetooth logging
erichiggins Feb 13, 2021
cf2652b
Use percentages for PID controller
erichiggins Feb 13, 2021
ba0bc7b
Change log setup to accept log level to correct verbosity
erichiggins Feb 13, 2021
906945f
Change LED behavior. Don't change state in every loop cycle
erichiggins Feb 13, 2021
64910e9
Catch error from potential bad state and log. Don't default to False …
erichiggins Feb 26, 2021
40ba128
Upgrade flutter and deps for mobile app. Build iOS app again to resto…
erichiggins Mar 2, 2021
14bc34b
Decrease font size in unit toggle button to avoid text being cut off.…
erichiggins Mar 2, 2021
3166f28
Fix notifications for bluetooth.
erichiggins Mar 6, 2021
100de6a
Set generous timeouts for memcache client
erichiggins Mar 8, 2021
92df558
Refactor for simplicity. Catch memcache exceptions.
erichiggins Mar 9, 2021
e461286
Add sleep delay for led script.
erichiggins Mar 9, 2021
d3a1874
Disable pylint import errors
erichiggins Mar 9, 2021
efef2bd
Check memcache variables before starting LED script loop. Use try cat…
erichiggins Mar 10, 2021
658e267
More logging in ble module. Change function name from update to all_m…
erichiggins Mar 10, 2021
dc64130
Less noisy logging for bluetooth
erichiggins Mar 10, 2021
27452f7
Rename config.ini to opentrickler_config.ini to avoid confusion with …
erichiggins Mar 11, 2021
9ae64f9
Allow verbose logging to be controlled from config file
erichiggins Mar 11, 2021
986870d
No verbose flag for leds.py, copy paste typo
erichiggins Mar 12, 2021
49c71fa
Set BLENO_DEVICE_NAME environment variable to ensure device name is p…
erichiggins Mar 12, 2021
2d33646
Update flutter and mobile package to reup to Apple.
erichiggins Aug 11, 2021
164e33d
Drop JS files
erichiggins Oct 25, 2020
934a6da
First commit of python files -- not working
erichiggins Oct 25, 2020
fc00ed1
Drop more node files
erichiggins Oct 25, 2020
544b452
Update README with python info
erichiggins Oct 25, 2020
8abad1a
rename scale.py to scales.py
erichiggins Oct 28, 2020
0083f7a
Code cleanups
erichiggins Oct 28, 2020
bacf4d9
Drop variables file. Not needed.
erichiggins Oct 28, 2020
100cbe9
More progress. Ready to start testing.
erichiggins Oct 29, 2020
e048b24
Bug fixes, functional changes for logging and executable scripts
erichiggins Oct 30, 2020
19ef84b
Break out motor control, add motor tests
erichiggins Oct 30, 2020
539431f
Set memcache values on script startup to avoid conflicts from prior runs
erichiggins Oct 30, 2020
433a09f
Move memcache updates into appropriate files, such as scale and motor
erichiggins Oct 30, 2020
a3c6682
Drop test serial file, replaced my scales.py
erichiggins Oct 31, 2020
4b338a8
Make motors.py executable
erichiggins Oct 31, 2020
b14dfae
Change motor test script, ramp up then down.
erichiggins Oct 31, 2020
e0bc16f
Fix commands to be sent as bytes. Fix CLI interface to use strings fo…
erichiggins Oct 31, 2020
8552bdc
Ignore DS_store files
erichiggins Nov 1, 2020
ca3b2d1
Add PID tuning output option.
erichiggins Nov 1, 2020
5d4484a
Update default PID values and new min PWM speed
erichiggins Nov 1, 2020
e32272d
Some code cleanups and fixes. Scale reading not working in main loop
erichiggins Nov 7, 2020
e3a36cf
Refactor loops for simplicity. Moved memcache client to be an arg. Fi…
erichiggins Nov 9, 2020
13b45f3
More cleanups. Unit changing on scale works. Prevent trickling in mor…
erichiggins Nov 10, 2020
bdd52e2
Remove TOOD about unit switching, confirmed working
erichiggins Nov 11, 2020
46dba97
Add grpcio req
erichiggins Nov 21, 2020
a119290
Initial pass at v1 bluetooth module for compatibility. Still needs te…
erichiggins Nov 23, 2020
cb62f67
Support config file, version scale status, lint cleanups, add helpers…
erichiggins Jan 30, 2021
eb8a439
Use config to enable pid tuner mode
erichiggins Jan 30, 2021
be6dfbc
Add OpenAPI definition
erichiggins Jan 31, 2021
24f01f3
Update memcache for scale stability. Add comments
erichiggins Jan 31, 2021
a138f78
Add temporary new readme
erichiggins Jan 31, 2021
afa897a
Update scripts
erichiggins Feb 2, 2021
949671f
Fix open file bug in main trickler. Update server script for ini file…
erichiggins Feb 3, 2021
12c412a
Add manifest and setup files for proper python packaging
erichiggins Feb 3, 2021
cab8ba5
Update packaging script for creating local python zip package
erichiggins Feb 3, 2021
1018860
use open when reading config files
erichiggins Feb 4, 2021
6545796
Bluetooth bugfix, arg should be a dictionary
erichiggins Feb 4, 2021
bbfe601
Daemonize bluetooth module.
erichiggins Feb 4, 2021
357a007
Fix reading values over bluetoothe
erichiggins Feb 5, 2021
1e08a2f
Fix write from bluetooth functions
erichiggins Feb 5, 2021
f0cab61
Add status LED control.
erichiggins Feb 7, 2021
58f2db3
Define memcache strings in constants.py to avoid bugs and make typos …
erichiggins Feb 8, 2021
cc3906e
Update newer ble script, still not ready to use
erichiggins Feb 10, 2021
0111c00
Remove quotes from config file, they get copied in
erichiggins Feb 10, 2021
54624c5
Make leds.py executable
erichiggins Feb 10, 2021
3422e8a
Comment out led disable command
erichiggins Feb 10, 2021
3d9a73f
Fix bug in leds script
erichiggins Feb 10, 2021
7d83177
Fix bug in bluetooth write request for automode
erichiggins Feb 10, 2021
f35a628
Fix reference to scale units in ble module
erichiggins Feb 10, 2021
fba4717
Add reverse unit map to scales module
erichiggins Feb 10, 2021
d0e8bb6
Set better default memcache values
erichiggins Feb 10, 2021
2dc1d65
Make trickler unit match correct type in memcache. Add logging
erichiggins Feb 10, 2021
62199c7
use default values to get values from memcache for leds script.
erichiggins Feb 10, 2021
5eca914
Switch gitignore from node to python
erichiggins Feb 10, 2021
60cfb0d
Reformat large conditional for readability
erichiggins Feb 10, 2021
01de9bc
Add a second of sleep to allow scale to update when changing units
erichiggins Feb 10, 2021
25bc144
Reset the input buffer before reading serial device.
erichiggins Feb 13, 2021
3f26c96
improve setup script and requirements file for non-arm machines
erichiggins Feb 13, 2021
e642e24
Lint fixes
erichiggins Feb 13, 2021
cf696e5
Remove node variable from setup script
erichiggins Feb 13, 2021
1779f4a
Add lint script
erichiggins Feb 13, 2021
3b4993c
Improve bluetooth logging
erichiggins Feb 13, 2021
d5e890e
Use percentages for PID controller
erichiggins Feb 13, 2021
6c35c19
Change log setup to accept log level to correct verbosity
erichiggins Feb 13, 2021
8852a0b
Change LED behavior. Don't change state in every loop cycle
erichiggins Feb 13, 2021
5996542
Catch error from potential bad state and log. Don't default to False …
erichiggins Feb 26, 2021
4b95cf1
Fix notifications for bluetooth.
erichiggins Mar 6, 2021
e59d58c
Set generous timeouts for memcache client
erichiggins Mar 8, 2021
88fb9c7
Refactor for simplicity. Catch memcache exceptions.
erichiggins Mar 9, 2021
9756156
Add sleep delay for led script.
erichiggins Mar 9, 2021
de29ea6
Disable pylint import errors
erichiggins Mar 9, 2021
967a386
Check memcache variables before starting LED script loop. Use try cat…
erichiggins Mar 10, 2021
be42227
More logging in ble module. Change function name from update to all_m…
erichiggins Mar 10, 2021
e2081b0
Less noisy logging for bluetooth
erichiggins Mar 10, 2021
3be3746
Rename config.ini to opentrickler_config.ini to avoid confusion with …
erichiggins Mar 11, 2021
cbd9c0d
Allow verbose logging to be controlled from config file
erichiggins Mar 11, 2021
bf1a2e1
No verbose flag for leds.py, copy paste typo
erichiggins Mar 12, 2021
65821d5
Set BLENO_DEVICE_NAME environment variable to ensure device name is p…
erichiggins Mar 12, 2021
d8aa501
Merge branch 'feature/python-trickler-rewrite' of github.com:ammolyti…
erichiggins Aug 11, 2021
37ac8c7
Update READMEs
erichiggins Aug 11, 2021
48b8626
Update SD firmware links and checksums
erichiggins Aug 15, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.DS_Store
4 changes: 2 additions & 2 deletions trickler/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ The Open Trickler is described in greater detail [in this article](https://blog.

## Support

Need help? [Join our Discord Server](https://discord.gg/WqTbyK2) to chat with other folks who are building the Open Trickler and helping each other out.
Need help? [Check the FAQ](https://github.com/ammolytics/projects/tree/develop/trickler#frequently-asked-questions) or [join our Discord Server](https://discord.gg/WqTbyK2) to chat with other folks who are building the Open Trickler and helping each other out.

This is a free, open-source project which does not come with any official support or warranty.

Expand All @@ -13,7 +13,7 @@ This is a free, open-source project which does not come with any official suppor

The Mobile app for this project uses the [Flutter framework](https://flutter.dev/). The code can be found in the [`mobile/`](https://github.com/ammolytics/projects/blob/develop/trickler/mobile/) directory.

The Controller is a [NodeJS (`v12.x`)](https://nodejs.org/docs/latest-v12.x/api/) application which reads from the scale's serial port and controls the trickler. It was designed to be run on a Raspberry Pi Zero W. The code can be found in the [`peripheral/`](https://github.com/ammolytics/projects/blob/develop/trickler/peripheral/) directory.
The Controller is a [Python (`v3.9`)](https://docs.python.org/3.9/) application which reads from the scale's serial port and controls the trickler. It was designed to be run on a Raspberry Pi Zero W. The code can be found in the [`peripheral/`](https://github.com/ammolytics/projects/blob/develop/trickler/peripheral/) directory.

## Hardware

Expand Down
2 changes: 1 addition & 1 deletion trickler/mobile/.flutter-plugins-dependencies
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_blue","path":"/Users/ronin/src/tools/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_blue-0.7.3/","dependencies":[]},{"name":"url_launcher","path":"/Users/ronin/src/tools/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher-5.7.10/","dependencies":[]}],"android":[{"name":"flutter_blue","path":"/Users/ronin/src/tools/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_blue-0.7.3/","dependencies":[]},{"name":"url_launcher","path":"/Users/ronin/src/tools/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher-5.7.10/","dependencies":[]}],"macos":[{"name":"flutter_blue","path":"/Users/ronin/src/tools/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_blue-0.7.3/","dependencies":[]},{"name":"url_launcher_macos","path":"/Users/ronin/src/tools/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_macos-0.0.1+9/","dependencies":[]}],"linux":[{"name":"url_launcher_linux","path":"/Users/ronin/src/tools/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_linux-0.0.1+4/","dependencies":[]}],"windows":[{"name":"url_launcher_windows","path":"/Users/ronin/src/tools/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_windows-0.0.1+3/","dependencies":[]}],"web":[{"name":"url_launcher_web","path":"/Users/ronin/src/tools/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_web-0.1.5+1/","dependencies":[]}]},"dependencyGraph":[{"name":"flutter_blue","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_web","url_launcher_linux","url_launcher_macos","url_launcher_windows"]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"url_launcher_windows","dependencies":[]}],"date_created":"2020-11-21 17:15:23.383998","version":"1.22.4"}
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_blue","path":"/Users/ronin/src/tools/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_blue-0.8.0/","dependencies":[]},{"name":"url_launcher","path":"/Users/ronin/src/tools/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher-6.0.4/","dependencies":[]}],"android":[{"name":"flutter_blue","path":"/Users/ronin/src/tools/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_blue-0.8.0/","dependencies":[]},{"name":"url_launcher","path":"/Users/ronin/src/tools/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher-6.0.4/","dependencies":[]}],"macos":[{"name":"flutter_blue","path":"/Users/ronin/src/tools/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_blue-0.8.0/","dependencies":[]},{"name":"url_launcher_macos","path":"/Users/ronin/src/tools/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_macos-2.0.0/","dependencies":[]}],"linux":[{"name":"url_launcher_linux","path":"/Users/ronin/src/tools/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_linux-2.0.0/","dependencies":[]}],"windows":[{"name":"url_launcher_windows","path":"/Users/ronin/src/tools/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_windows-2.0.0/","dependencies":[]}],"web":[{"name":"url_launcher_web","path":"/Users/ronin/src/tools/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_web-2.0.0/","dependencies":[]}]},"dependencyGraph":[{"name":"flutter_blue","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_linux","url_launcher_macos","url_launcher_windows","url_launcher_web"]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"url_launcher_windows","dependencies":[]}],"date_created":"2021-05-31 01:00:09.779731","version":"2.2.1"}
2 changes: 1 addition & 1 deletion trickler/mobile/ios/Flutter/.last_build_id
Original file line number Diff line number Diff line change
@@ -1 +1 @@
d54f7009a91521b80673390412225c34
47367cc1c2ebe7ca699b81b28f735013
8 changes: 4 additions & 4 deletions trickler/mobile/ios/Flutter/Flutter.podspec
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
#
# NOTE: This podspec is NOT to be published. It is only used as a local source!
# This is a generated file; do not edit or check into version control.
#

Pod::Spec.new do |s|
s.name = 'Flutter'
s.version = '1.0.0'
s.summary = 'High-performance, high-fidelity mobile apps.'
s.description = <<-DESC
Flutter provides an easy and productive way to build and deploy high-performance mobile apps for Android and iOS.
DESC
s.homepage = 'https://flutter.io'
s.license = { :type => 'MIT' }
s.author = { 'Flutter Dev Team' => '[email protected]' }
s.source = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s }
s.ios.deployment_target = '8.0'
s.vendored_frameworks = 'Flutter.framework'
# Framework linking is handled by Flutter tooling, not CocoaPods.
# Add a placeholder to satisfy `s.dependency 'Flutter'` plugin podspecs.
s.vendored_frameworks = 'path/to/nothing'
end
5 changes: 2 additions & 3 deletions trickler/mobile/ios/Flutter/flutter_export_environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@
# This is a generated file; do not edit or check into version control.
export "FLUTTER_ROOT=/Users/ronin/src/tools/flutter"
export "FLUTTER_APPLICATION_PATH=/Users/ronin/src/ammolytics/projects/trickler/mobile"
export "COCOAPODS_PARALLEL_CODE_SIGN=true"
export "FLUTTER_TARGET=lib/main.dart"
export "FLUTTER_BUILD_DIR=build"
export "SYMROOT=${SOURCE_ROOT}/../build/ios"
export "OTHER_LDFLAGS=$(inherited) -framework Flutter"
export "FLUTTER_FRAMEWORK_DIR=/Users/ronin/src/tools/flutter/bin/cache/artifacts/engine/ios-release"
export "FLUTTER_BUILD_NAME=1.1.0"
export "FLUTTER_BUILD_NUMBER=3"
export "DART_OBFUSCATION=false"
export "TRACK_WIDGET_CREATION=false"
export "TREE_SHAKE_ICONS=true"
export "PACKAGE_CONFIG=.packages"
export "PACKAGE_CONFIG=/Users/ronin/src/ammolytics/projects/trickler/mobile/.dart_tool/package_config.json"
4 changes: 2 additions & 2 deletions trickler/mobile/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/url_launcher/ios"

SPEC CHECKSUMS:
Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
flutter_blue: eeb381dc4727a0954dede73515f683865494b370
Protobuf: 176220c526ad8bd09ab1fb40a978eac3fef665f7
url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef

PODFILE CHECKSUM: 8e679eca47255a8ca8067c4c67aab20e64cb974d

COCOAPODS: 1.9.3
COCOAPODS: 1.10.1
31 changes: 6 additions & 25 deletions trickler/mobile/ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@
97C146EC1CF9000F007C117D /* Resources */,
9705A1C41CF9048500538489 /* Embed Frameworks */,
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
700C1880FFC8234A37BA121A /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -247,24 +246,6 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
700C1880FFC8234A37BA121A /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
"${PODS_ROOT}/../Flutter/Flutter.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
9740EEB61CF901F6004384FC /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -371,7 +352,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 5;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = E5QM33XRN6;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -381,7 +362,7 @@
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = "$(inherited)";
MARKETING_VERSION = 1.1.0;
MARKETING_VERSION = 1.2.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -513,7 +494,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 5;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = E5QM33XRN6;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -523,7 +504,7 @@
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = "$(inherited)";
MARKETING_VERSION = 1.1.0;
MARKETING_VERSION = 1.2.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -547,7 +528,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 5;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = E5QM33XRN6;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -557,7 +538,7 @@
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = "$(inherited)";
MARKETING_VERSION = 1.1.0;
MARKETING_VERSION = 1.2.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1220"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
4 changes: 2 additions & 2 deletions trickler/mobile/lib/pages/home.dart
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ class _HomePageState extends State<HomePage> {

Widget _getScaffold() {
return Scaffold(
resizeToAvoidBottomPadding: false,
resizeToAvoidBottomInset: false,
appBar: PreferredSize(
preferredSize: Size.fromHeight(60.0),
child: Header(
Expand Down Expand Up @@ -207,4 +207,4 @@ class _HomePageState extends State<HomePage> {
widget.onDispose();
super.dispose();
}
}
}
4 changes: 2 additions & 2 deletions trickler/mobile/lib/widgets/toggle_unit_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class ToggleUnitButton extends InputDecoration {
unitAbbr,
key: Key('CurrentUnit'),
style: TextStyle(
fontSize: 25,
fontSize: 23,
fontWeight: FontWeight.bold,
color: Colors.blueAccent,
),
Expand All @@ -41,4 +41,4 @@ class ToggleUnitButton extends InputDecoration {
),
),
);
}
}
Loading