Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
ef741d8
Initial commit
deximat Aug 20, 2016
4dd1b84
Merge branch 'master' of https://github.com/Codlex/raspberrypi-thermo…
deximat Aug 20, 2016
6a2958e
Draft rewrite of Arduino-thermocycler.
deximat Aug 20, 2016
b4c323f
Implemented Virtual sensors so testing can be done on PC.
deximat Aug 20, 2016
78c1b69
Implement mocked sensors gui controller.
deximat Aug 20, 2016
d09556b
Changing of scenes created and first scene with fill in baths.
deximat Aug 20, 2016
25155ee
Added level sensor property for testing.
deximat Aug 21, 2016
b79cb0c
Implemented sceens:
deximat Aug 22, 2016
7f31e0b
Implemented CyclesConfiguration and ThermocyclerOverview screen.
deximat Aug 23, 2016
65eb49c
Fixed scaling of UI.
deximat Aug 25, 2016
681bb98
Implemented states of thermocycler on UI.
deximat Aug 25, 2016
5a64a32
Cleanup of some leftover.
deximat Aug 27, 2016
37c67eb
Create RefreshedSensor to offload main thread of measuring.
deximat Aug 27, 2016
130a08f
Added some logging and using sensors with threads on virtual sensors …
deximat Aug 28, 2016
5ba79a7
Created generic back and next button to root scene.
deximat Aug 29, 2016
4cd05cd
Persistance of last cycling state.
deximat Aug 30, 2016
5c1875d
Some stylistic changes.
deximat Sep 13, 2016
4aab6fb
Fixed gui problems.
deximat Sep 13, 2016
a6b2972
Fixed time issues.
deximat Sep 13, 2016
8ed3c8c
Fixed translator stuff.
deximat Sep 13, 2016
710ebc1
Date estimation machine learning.
deximat Sep 13, 2016
9404b26
Created safety checks.
deximat Sep 14, 2016
9680829
Validation of input in model.
deximat Sep 14, 2016
d60f9ee
Safety for levels.
deximat Sep 14, 2016
6032aec
Fixed circulation water pump bug.
deximat Sep 21, 2016
4ad93a7
Created loading from settings file.
deximat Sep 21, 2016
10ddde0
Screen fixes.
deximat Oct 17, 2016
4abfd78
Added some tracking to grafana.
deximat Oct 18, 2016
b6ddd12
Fixed state problems.
deximat Oct 19, 2016
e5e8761
Add percent.
deximat Oct 19, 2016
7e001d4
Screen alarm clock implemented and tracking offloaded to separate thr…
deximat Oct 19, 2016
6e203e4
Cleanup and logs.
deximat Oct 19, 2016
ab87817
Changed pins.
deximat Oct 22, 2016
171e72a
Fixed blink.
deximat Oct 22, 2016
fb7dc56
Fixes for sensors.
deximat Nov 7, 2016
137b16b
Fix pin.
deximat Mar 8, 2017
647d564
Primitive types moved to settings.
deximat Mar 8, 2017
67e73db
Safety switch in properties.
deximat Mar 8, 2017
577b518
Update settings.properties
deximat Mar 8, 2017
a2cbf3a
safety turned on
deximat Mar 8, 2017
861a90f
Pin settings moved to file.
deximat Mar 8, 2017
1c1a47c
Merge branch 'master' of https://github.com/Codlex/raspberrypi-thermo…
deximat Mar 8, 2017
fc12c4b
Moved ranges to file.
deximat Mar 8, 2017
8de443a
Fixed problem with ranges.
deximat Mar 14, 2017
90d0b92
Added configuration for log, and separate error file.
deximat Oct 3, 2017
700d6aa
Added scripts and tweaked cold bath.
deximat Oct 3, 2017
01f45d2
Tweaked translator timing.
deximat Oct 3, 2017
ce56ae1
Turn production by default
deximat Oct 3, 2017
e7158cf
- added to string for pins
deximat Oct 3, 2017
52d8759
Bath epsOn / epsOff to settings file.
deximat Oct 4, 2017
e2b99cd
Added graphs for:
deximat Oct 4, 2017
d9761b0
Don’t commit logs and class files.
deximat Oct 4, 2017
f8e9dc8
Added clear logs.
deximat Oct 4, 2017
fcca365
Track switch, Fix temperature and fix pin for heater.
deximat Oct 5, 2017
d021958
New temperature probes.
deximat Feb 3, 2018
e6155df
Gospodi komituj.
deximat Mar 14, 2019
35b010f
Added build for version 2.0.
deximat Mar 14, 2019
2504497
old builds.
deximat Mar 30, 2019
39bb76d
Fixed pin numbers.
deximat Mar 30, 2019
50658e8
Fixed builds settings and removed unused code.
deximat Mar 30, 2019
a6546b1
Increase max time for immersion.
deximat Apr 12, 2019
308f8a0
New build.
deximat Apr 12, 2019
cb7e917
added pause feature to thermocycler
deximat Apr 14, 2019
3d52005
Update builds
deximat Apr 14, 2019
541cb6c
Update version.
deximat Apr 16, 2019
41b1b90
Update script.
deximat Apr 16, 2019
3b48b02
Update pins.
deximat Apr 16, 2019
932a8af
Added log directory on update.
deximat Apr 16, 2019
0e6ede1
Serialize isLogicOnFlag.
deximat Apr 16, 2019
23f3d70
Use only one sensor in current temperature.
deximat Jul 6, 2019
80ffb7d
Implement middle pause.
deximat Jul 7, 2019
6598fb0
Refactored to getters for sensors and updated lombok.
deximat Feb 5, 2024
03e761f
Read from settings file.
deximat Feb 5, 2024
8495601
Idea files
deximat Feb 5, 2024
0531db1
Add support for strings from settings file.
deximat Feb 5, 2024
91fb7b7
New version of build.
deximat Feb 5, 2024
8292d78
Updated settings.
deximat Feb 5, 2024
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
11 changes: 11 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
*.class

.mtj.tmp/

*.war
*.ear

hs_err_pid*
log/
target/

8 changes: 8 additions & 0 deletions .idea/.gitignore

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

15 changes: 15 additions & 0 deletions .idea/artifacts/Thermocycler_jar.xml

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

14 changes: 14 additions & 0 deletions .idea/compiler.xml

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

7 changes: 7 additions & 0 deletions .idea/encodings.xml

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

15 changes: 15 additions & 0 deletions .idea/git_toolbox_prj.xml

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

30 changes: 30 additions & 0 deletions .idea/jarRepositories.xml

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

6 changes: 6 additions & 0 deletions .idea/jpa-buddy.xml

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

15 changes: 15 additions & 0 deletions .idea/misc.xml

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

8 changes: 8 additions & 0 deletions .idea/modules.xml

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

Empty file.
6 changes: 6 additions & 0 deletions .idea/vcs.xml

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

23 changes: 23 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Thermocycler</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
2 changes: 2 additions & 0 deletions .settings/org.eclipse.core.resources.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
8 changes: 8 additions & 0 deletions .settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.8
59 changes: 59 additions & 0 deletions .settings/org.eclipse.jdt.ui.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
cleanup.add_default_serial_version_id=true
cleanup.add_generated_serial_version_id=false
cleanup.add_missing_annotations=true
cleanup.add_missing_deprecated_annotations=true
cleanup.add_missing_methods=false
cleanup.add_missing_nls_tags=false
cleanup.add_missing_override_annotations=true
cleanup.add_missing_override_annotations_interface_methods=true
cleanup.add_serial_version_id=false
cleanup.always_use_blocks=true
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=true
cleanup.always_use_this_for_non_static_method_access=false
cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
cleanup.correct_indentation=true
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
cleanup.make_type_abstract_if_missing_method=false
cleanup.make_variable_declarations_final=false
cleanup.never_use_blocks=false
cleanup.never_use_parentheses_in_expressions=true
cleanup.organize_imports=true
cleanup.qualify_static_field_accesses_with_declaring_class=false
cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
cleanup.remove_redundant_type_arguments=false
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
cleanup.remove_unnecessary_casts=true
cleanup.remove_unnecessary_nls_tags=true
cleanup.remove_unused_imports=true
cleanup.remove_unused_local_variables=false
cleanup.remove_unused_private_fields=true
cleanup.remove_unused_private_members=false
cleanup.remove_unused_private_methods=true
cleanup.remove_unused_private_types=true
cleanup.sort_members=true
cleanup.sort_members_all=false
cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=false
cleanup.use_blocks_only_for_return_and_throw=false
cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=false
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=false
cleanup.use_this_for_non_static_method_access=false
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
cleanup_profile=_DejanFullCleanup
cleanup_settings_version=2
eclipse.preferences.version=1
4 changes: 4 additions & 0 deletions .settings/org.eclipse.m2e.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
3 changes: 3 additions & 0 deletions META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Manifest-Version: 1.0
Main-Class: com.codlex.thermocycler.view.ThermocyclerGUI

2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# raspberrypi-thermocycler
After working for couple of months on arduino-thermocycler, we turned to Raspberry Pi to have more powerful machine and easier development in Java.
8 changes: 8 additions & 0 deletions Thermocycler.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
</component>
</module>
6 changes: 6 additions & 0 deletions builds/1.0/ThermocyclerState.bin
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
55
30
5
30
24000
15478
5 changes: 5 additions & 0 deletions builds/1.0/deploy.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
./killRemote.sh
scp -r tc.jar pi@pi:~/tc/
scp *.properties pi@pi:~/tc/
scp *.sh pi@pi:~/tc/
./startRemote.sh
2 changes: 2 additions & 0 deletions builds/1.0/killRemote.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ssh pi@pi "sudo killall java"

17 changes: 17 additions & 0 deletions builds/1.0/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
log4j.rootLogger=DEBUG, ConsoleAppender, DebugFileAppender, ErrorFileAppender

log4j.appender.ConsoleAppender=org.apache.log4j.ConsoleAppender
log4j.appender.ConsoleAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.ConsoleAppender.layout.ConversionPattern=%-7p %d [%t] %c %x - %m%n

log4j.appender.DebugFileAppender=org.apache.log4j.FileAppender
log4j.appender.ErrorFileAppender.Threshold=DEBUG
log4j.appender.DebugFileAppender.File=log/debug.log
log4j.appender.DebugFileAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.DebugFileAppender.layout.ConversionPattern=%-7p %d [%t] %c %x - %m%n

log4j.appender.ErrorFileAppender=org.apache.log4j.FileAppender
log4j.appender.ErrorFileAppender.Threshold=ERROR
log4j.appender.ErrorFileAppender.File=log/error.log
log4j.appender.ErrorFileAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.ErrorFileAppender.layout.ConversionPattern=%-7p %d [%t] %c %x - %m%n
44 changes: 44 additions & 0 deletions builds/1.0/settings.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
Production = true
FullScreen = false
TranslationTimeMillis = 1500
DistanceRefreshMillis = 1000
TemperatureRefreshMillis = 1000

# bath
BathMinimumLevel = 60
BathDepth = 20
LevelEpsilon = 1
TemperatureEpsilon = 1

# hot bath
HotBathLevelEchoPin = 4
HotBathLevelTriggerPin = 3
HotBathHeaterPin = 29
HotBathWaterPump = 27
HotBathCirculationWaterPump = 28

# cold bath
ColdBathLevelEchoPin = 1
ColdBathLevelTriggerPin = 0
ColdBathCoolerPin = 21
ColdBathWaterPump = 25
ColdBathEpsOn = 2
ColdBathEpsOff = 5

# translator
TranslatorPowerPin = 24
# indices for one wire
TranslatorPulsePin = 22
TranslatorToColdDirection = 26

# validation
ValidationCyclesRange = 1, 999999
ValidationHotTemperatureRange = 20, 100
ValidationColdTemperatureRange = -6, 20
ValidationTimeRange = 1, 300

# safety
Safety = true
SafetyHotBathTemperatureMax = 120
SafetyLevelMin = 30
SafetyLevelMax = 120
3 changes: 3 additions & 0 deletions builds/1.0/start.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
sudo service lightdm stop &
# sudo java -jar -Dcom.sun.javafx.touch=true -Djavafx.platform=eglfb -Dcom.sun.javafx.isEmbedded=false Test.jar &
sudo java -jar tc.jar &> log/startup.log &
3 changes: 3 additions & 0 deletions builds/1.0/start2.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
sudo service lightdm stop &
# sudo java -jar -Dcom.sun.javafx.touch=true -Djavafx.platform=eglfb -Dcom.sun.javafx.isEmbedded=false Test.jar &
sudo java -jar test.jar &> log/startup.log &
1 change: 1 addition & 0 deletions builds/1.0/startRemote.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ssh pi@pi "cd tc && ./start.sh"
Binary file added builds/1.0/tc.jar
Binary file not shown.
Binary file added builds/1.0/test.jar
Binary file not shown.
Binary file added builds/3.0/Thermocycler.jar
Binary file not shown.
5 changes: 5 additions & 0 deletions builds/3.0/deploy.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
./killRemote.sh
scp *.jar pi@pi:~/tc3/
scp *.properties pi@pi:~/tc3/
scp *.sh pi@pi:~/tc3/
./startRemote.sh
2 changes: 2 additions & 0 deletions builds/3.0/killRemote.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ssh pi@pi "sudo killall java"

17 changes: 17 additions & 0 deletions builds/3.0/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
log4j.rootLogger=DEBUG, ConsoleAppender, DebugFileAppender, ErrorFileAppender

log4j.appender.ConsoleAppender=org.apache.log4j.ConsoleAppender
log4j.appender.ConsoleAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.ConsoleAppender.layout.ConversionPattern=%-7p %d [%t] %c %x - %m%n

log4j.appender.DebugFileAppender=org.apache.log4j.FileAppender
log4j.appender.ErrorFileAppender.Threshold=DEBUG
log4j.appender.DebugFileAppender.File=log/debug.log
log4j.appender.DebugFileAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.DebugFileAppender.layout.ConversionPattern=%-7p %d [%t] %c %x - %m%n

log4j.appender.ErrorFileAppender=org.apache.log4j.FileAppender
log4j.appender.ErrorFileAppender.Threshold=ERROR
log4j.appender.ErrorFileAppender.File=log/error.log
log4j.appender.ErrorFileAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.ErrorFileAppender.layout.ConversionPattern=%-7p %d [%t] %c %x - %m%n
Loading