Candidate integration task2 - #47

Draft
LokiMetaSmith wants to merge 363 commits into
developfrom
Candidate_Integration_Task2
Draft

Candidate integration task2#47
LokiMetaSmith wants to merge 363 commits into
developfrom
Candidate_Integration_Task2

Conversation

@LokiMetaSmith

@LokiMetaSmithLokiMetaSmith commented Nov 16, 2023

Copy link
Copy Markdown
Contributor

This includes the work done on including logging and the 1 button algorithm.

It's a work in progress, and still has compile time bugs

Geoff Mulliganand others added 30 commits September 19, 2023 16:35
Geoff Mulligan
change generation of max address to set last bit 0 for cfc and 1 for …
17f3733
…stage2
@RobertLRead
intermediate solution, reporting better, but sill a bug in 3-part con…
c71051c
…trol
Geoff Mulligan
revert my last change
61994d8
@RobertLRead
fixing terrible bug#278
2c64ef6
@RobertLRead
Merge pull request#280from PubInv/robWatchDog
bef3698
Rob watch dog
Geoff Mulligan
minor udp fix
658d7c7
Geoff Mulligan
fixed json output and turned on OEDCS and Stage2 API endpoints
c19d512
@RobertLRead
intermediate code, unknown state
c04711d
@RobertLRead
Merge branch 'develop' ofhttps://github.com/PubInv/NASA-COGinto rob…
ad77dd2
…WatchDog
Geoff Mulligan
fix type in name of OEDCS
d25abe9
@ForrestErickson
Update README.md
2927002
Add MAC for OEDCS Serial number 2.
@RobertLRead
Create WattageControlExpreriment
7d69a73
@RobertLRead
Update and rename WattageControlExpreriment to WattageControlExprerim…
c44cf87
…ent.md
@RobertLRead
Update WattageControlExpreriment.md
b8f5c18
@RobertLRead
moving back to 3.11.0 for Dallas OneWire
acb3886
@RobertLRead
removing debugging
ebbca7f
@RobertLRead
reveting to use standard thermocooples for Stage2
de0c514
@RobertLRead
Merge pull request#285from PubInv/robWatchDog
5a8fba7
Rob watch dog
@RobertLRead
majore bug in stage2 heater fixed
6ee9ffe
@RobertLRead
removing stray debugging statements
b90877e
@RobertLRead
Merge pull request#286from PubInv/robTempAndStage2Control
e3ccc46
major bug in stage2 heater fixed
@LokiMetaSmith
added fan enable pwm channel, and ODECS#2 define in platformio.ini
b4787d6
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Merge branch 'fan_enable' of git@github.com:PubInv/NASA-COG.git into …
bd17a89
…HEAD
# Conflicts:
#	firmware/platformio.ini
@RobertLRead
fixing but with temperature jump
ed78c34
@RobertLRead
Merge pull request#287from PubInv/robThermoTest
2372009
fixing but with temperature jump
@RobertLRead
Pathfinder release
1083be4
@RobertLRead
fixing global start temperature bug
7111679
@RobertLRead
Merge pull request#288from PubInv/robThermoTest
8a68cf3
Fixing global start temperature bug
@RobertLRead
Fixing an incorrect variable, passing GLOBAL_RECENT_TEMP when it shou…
abc8a05
…ld have been WARM_UP_BEGIN_TIME, cause ramp up to be too high
@RobertLRead
multiple reads of temperature sensor
1581451
RobertLReadand others added 30 commits October 24, 2023 16:02
@RobertLRead
Merge branch 'log_recorder' ofhttps://github.com/PubInv/NASA-COGint…
0e8a14e
…o log_recorder
@LokiMetaSmith
Signed-off-by: lokimetasmith <lokimail@gmail.com>
7779180
@LokiMetaSmith
reduced the size of buffMax to allow for a larger report log buff size
65ee64a
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
verified log recordings work
dcd7cf2
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Merge pull request#381from LokiMetaSmith/log_recorder
7f24d45
Log recorder added in. Control of log recorder will need to be modified to allow creating and destroying tasks or for tasks to have adjustable periods
@ForrestErickson
Update Zener diode part number from MELF to miniMELF.
eac44bf
@ForrestErickson
Merge branch 'develop' ofhttps://github.com/ForrestErickson/NASA-COG…
0df6ec5
…into develop
@ForrestErickson
Merge pull request#384from ForrestErickson/develop
f53b605
Update Zener diode part number from MELF to miniMELF. D1 and D2
@gmulligan
Update debug.h
b646797
fix hang when building on arm
@gmulligan
Update network_udp.h
2f1454b
reduce udp buffer size
@ForrestErickson
Rearrange heat source and RC elements for clarity.
805d90e
@ForrestErickson
Merge branch 'develop' ofhttps://github.com/ForrestErickson/NASA-COG…
d7dd1de
…into develop
@ForrestErickson
Merge pull request#389from ForrestErickson/develop
3310785
Rearrange heat source and RC elements for clarity.
@LokiMetaSmith
Create README.md
e89f351
adding notes for programmable power supply
@gmulligan
Create SBC setup instructions
f5faec4
@RobertLRead
initial checkin of OneButton algorithm, compiling but completely unte…
c7e1e5c
…sted.
@LokiMetaSmith
initial pcb design for high current, constant current psu
8e74c2c
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Merge branch 'develop' of git@github.com:PubInv/NASA-COG.git into dev…
647286a
…elop
@LokiMetaSmith
added P&ID control diagram and updated dual channel stack psu
d940f22
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
added both proposed and development configuartion
f37fb99
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
moved burst disk to simulated reciever tank
9a170d8
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
updated SBC setup instructions
30379bd
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
finished SBC install script
d141fb8
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Added a set function to change period of a task
4717a87
Fixed a few bugs and typos
Added logRecorderTask pointer to MachineState and added function calls to SetPeriod for
Critical Fault and Emergency Shutdown to increase the periodicity of the reporting.
possibly should add a dedicated function to call the logging function on state transitions.
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@RobertLRead
significant rewrite of the DutyTask class
8d1aca3
@RobertLRead
Merge pull request#395from PubInv/From0.3.7fixIssue393
19a7914
significant rewrite of the DutyTask class
@LokiMetaSmith
Signed-off-by: lokimetasmith <lokimail@gmail.com>
0e84e5d
@LokiMetaSmith
Merge branch 'Task2OneButtonAlgorithm' of git@github.com:PubInv/NASA-…
dd762ee
…COG.git into Candidate_Integration_Task2
# Conflicts:
#	firmware/lib/task/cog_task.h
#	firmware/lib/task/duty_cycle_task.cpp
#	firmware/lib/task/log_recorder_task.cpp
@LokiMetaSmith
Merge branch 'log_recorder_integration' of git@github.com:PubInv/NASA…
bc0df52
…-COG.git into Candidate_Integration_Task2
# Conflicts:
#	firmware/lib/task/state_machine_manager.h
#	firmware/src/main.cpp
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
compiling now
e7ebf7e
Signed-off-by: lokimetasmith <lokimail@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@LokiMetaSmith@RobertLRead@ForrestErickson@gmulligan
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Candidate integration task2 - #47
Draft
LokiMetaSmith wants to merge 363 commits into
developfrom 
Candidate_Integration_Task2
Draft
Candidate integration task2#47
LokiMetaSmith wants to merge 363 commits into
developfrom 
Candidate_Integration_Task2
Conversation
@LokiMetaSmith
@LokiMetaSmithLokiMetaSmith
commented
Nov 16, 2023

Copy link


Copy Markdown

Contributor
This includes the work done on including logging and the 1 button algorithm.
It's a work in progress, and still has compile time bugs
Geoff Mulliganand others
added 30 commits
September 19, 2023 16:35
Geoff Mulligan
change generation of max address to set last bit 0 for cfc and 1 for …
17f3733
…stage2
@RobertLRead
intermediate solution, reporting better, but sill a bug in 3-part con…
c71051c
…trol
Geoff Mulligan
revert my last change
61994d8
@RobertLRead
fixing terrible bug#278
2c64ef6
@RobertLRead
Merge pull request#280from PubInv/robWatchDog
bef3698
Rob watch dog
Geoff Mulligan
minor udp fix
658d7c7
Geoff Mulligan
fixed json output and turned on OEDCS and Stage2 API endpoints
c19d512
@RobertLRead
intermediate code, unknown state
c04711d
@RobertLRead
Merge branch 'develop' ofhttps://github.com/PubInv/NASA-COGinto rob…
ad77dd2
…WatchDog
Geoff Mulligan
fix type in name of OEDCS
d25abe9
@ForrestErickson
Update README.md
2927002
Add MAC for OEDCS Serial number 2.
@RobertLRead
Create WattageControlExpreriment
7d69a73
@RobertLRead
Update and rename WattageControlExpreriment to WattageControlExprerim…
c44cf87
…ent.md
@RobertLRead
Update WattageControlExpreriment.md
b8f5c18
@RobertLRead
moving back to 3.11.0 for Dallas OneWire
acb3886
@RobertLRead
removing debugging
ebbca7f
@RobertLRead
reveting to use standard thermocooples for Stage2
de0c514
@RobertLRead
Merge pull request#285from PubInv/robWatchDog
5a8fba7
Rob watch dog
@RobertLRead
majore bug in stage2 heater fixed
6ee9ffe
@RobertLRead
removing stray debugging statements
b90877e
@RobertLRead
Merge pull request#286from PubInv/robTempAndStage2Control
e3ccc46
major bug in stage2 heater fixed
@LokiMetaSmith
added fan enable pwm channel, and ODECS#2 define in platformio.ini
b4787d6
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Merge branch 'fan_enable' of git@github.com:PubInv/NASA-COG.git into …
bd17a89
…HEAD
# Conflicts:
#	firmware/platformio.ini
@RobertLRead
fixing but with temperature jump
ed78c34
@RobertLRead
Merge pull request#287from PubInv/robThermoTest
2372009
fixing but with temperature jump
@RobertLRead
Pathfinder release
1083be4
@RobertLRead
fixing global start temperature bug
7111679
@RobertLRead
Merge pull request#288from PubInv/robThermoTest
8a68cf3
Fixing global start temperature bug
@RobertLRead
Fixing an incorrect variable, passing GLOBAL_RECENT_TEMP when it shou…
abc8a05
…ld have been WARM_UP_BEGIN_TIME, cause ramp up to be too high
@RobertLRead
multiple reads of temperature sensor
1581451
RobertLReadand others
added 30 commits
October 24, 2023 16:02
@RobertLRead
Merge branch 'log_recorder' ofhttps://github.com/PubInv/NASA-COGint…
0e8a14e
…o log_recorder
@LokiMetaSmith
Signed-off-by: lokimetasmith <lokimail@gmail.com>
7779180
@LokiMetaSmith
reduced the size of buffMax to allow for a larger report log buff size
65ee64a
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
verified log recordings work
dcd7cf2
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Merge pull request#381from LokiMetaSmith/log_recorder
7f24d45
Log recorder added in. Control of log recorder will need to be modified to allow creating and destroying tasks or for tasks to have adjustable periods
@ForrestErickson
Update Zener diode part number from MELF to miniMELF.
eac44bf
@ForrestErickson
Merge branch 'develop' ofhttps://github.com/ForrestErickson/NASA-COG…
0df6ec5
…into develop
@ForrestErickson
Merge pull request#384from ForrestErickson/develop
f53b605
Update Zener diode part number from MELF to miniMELF. D1 and D2
@gmulligan
Update debug.h
b646797
fix hang when building on arm
@gmulligan
Update network_udp.h
2f1454b
reduce udp buffer size
@ForrestErickson
Rearrange heat source and RC elements for clarity.
805d90e
@ForrestErickson
Merge branch 'develop' ofhttps://github.com/ForrestErickson/NASA-COG…
d7dd1de
…into develop
@ForrestErickson
Merge pull request#389from ForrestErickson/develop
3310785
Rearrange heat source and RC elements for clarity.
@LokiMetaSmith
Create README.md
e89f351
adding notes for programmable power supply
@gmulligan
Create SBC setup instructions
f5faec4
@RobertLRead
initial checkin of OneButton algorithm, compiling but completely unte…
c7e1e5c
…sted.
@LokiMetaSmith
initial pcb design for high current, constant current psu
8e74c2c
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Merge branch 'develop' of git@github.com:PubInv/NASA-COG.git into dev…
647286a
…elop
@LokiMetaSmith
added P&ID control diagram and updated dual channel stack psu
d940f22
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
added both proposed and development configuartion
f37fb99
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
moved burst disk to simulated reciever tank
9a170d8
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
updated SBC setup instructions
30379bd
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
finished SBC install script
d141fb8
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Added a set function to change period of a task
4717a87
Fixed a few bugs and typos
Added logRecorderTask pointer to MachineState and added function calls to SetPeriod for
Critical Fault and Emergency Shutdown to increase the periodicity of the reporting.
possibly should add a dedicated function to call the logging function on state transitions.
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@RobertLRead
significant rewrite of the DutyTask class
8d1aca3
@RobertLRead
Merge pull request#395from PubInv/From0.3.7fixIssue393
19a7914
significant rewrite of the DutyTask class
@LokiMetaSmith
Signed-off-by: lokimetasmith <lokimail@gmail.com>
0e84e5d
@LokiMetaSmith
Merge branch 'Task2OneButtonAlgorithm' of git@github.com:PubInv/NASA-…
dd762ee
…COG.git into Candidate_Integration_Task2
# Conflicts:
#	firmware/lib/task/cog_task.h
#	firmware/lib/task/duty_cycle_task.cpp
#	firmware/lib/task/log_recorder_task.cpp
@LokiMetaSmith
Merge branch 'log_recorder_integration' of git@github.com:PubInv/NASA…
bc0df52
…-COG.git into Candidate_Integration_Task2
# Conflicts:
#	firmware/lib/task/state_machine_manager.h
#	firmware/src/main.cpp
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
compiling now
e7ebf7e
Signed-off-by: lokimetasmith <lokimail@gmail.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@LokiMetaSmith@RobertLRead@ForrestErickson@gmulligan

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Candidate integration task2 - #47
Draft
LokiMetaSmith wants to merge 363 commits into
developfrom 
Candidate_Integration_Task2
Draft
Candidate integration task2#47
LokiMetaSmith wants to merge 363 commits into
developfrom 
Candidate_Integration_Task2
Conversation
@LokiMetaSmith
@LokiMetaSmithLokiMetaSmith
commented
Nov 16, 2023

Copy link


Copy Markdown

Contributor
This includes the work done on including logging and the 1 button algorithm.
It's a work in progress, and still has compile time bugs
Geoff Mulliganand others
added 30 commits
September 19, 2023 16:35
Geoff Mulligan
change generation of max address to set last bit 0 for cfc and 1 for …
17f3733
…stage2
@RobertLRead
intermediate solution, reporting better, but sill a bug in 3-part con…
c71051c
…trol
Geoff Mulligan
revert my last change
61994d8
@RobertLRead
fixing terrible bug#278
2c64ef6
@RobertLRead
Merge pull request#280from PubInv/robWatchDog
bef3698
Rob watch dog
Geoff Mulligan
minor udp fix
658d7c7
Geoff Mulligan
fixed json output and turned on OEDCS and Stage2 API endpoints
c19d512
@RobertLRead
intermediate code, unknown state
c04711d
@RobertLRead
Merge branch 'develop' ofhttps://github.com/PubInv/NASA-COGinto rob…
ad77dd2
…WatchDog
Geoff Mulligan
fix type in name of OEDCS
d25abe9
@ForrestErickson
Update README.md
2927002
Add MAC for OEDCS Serial number 2.
@RobertLRead
Create WattageControlExpreriment
7d69a73
@RobertLRead
Update and rename WattageControlExpreriment to WattageControlExprerim…
c44cf87
…ent.md
@RobertLRead
Update WattageControlExpreriment.md
b8f5c18
@RobertLRead
moving back to 3.11.0 for Dallas OneWire
acb3886
@RobertLRead
removing debugging
ebbca7f
@RobertLRead
reveting to use standard thermocooples for Stage2
de0c514
@RobertLRead
Merge pull request#285from PubInv/robWatchDog
5a8fba7
Rob watch dog
@RobertLRead
majore bug in stage2 heater fixed
6ee9ffe
@RobertLRead
removing stray debugging statements
b90877e
@RobertLRead
Merge pull request#286from PubInv/robTempAndStage2Control
e3ccc46
major bug in stage2 heater fixed
@LokiMetaSmith
added fan enable pwm channel, and ODECS#2 define in platformio.ini
b4787d6
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Merge branch 'fan_enable' of git@github.com:PubInv/NASA-COG.git into …
bd17a89
…HEAD
# Conflicts:
#	firmware/platformio.ini
@RobertLRead
fixing but with temperature jump
ed78c34
@RobertLRead
Merge pull request#287from PubInv/robThermoTest
2372009
fixing but with temperature jump
@RobertLRead
Pathfinder release
1083be4
@RobertLRead
fixing global start temperature bug
7111679
@RobertLRead
Merge pull request#288from PubInv/robThermoTest
8a68cf3
Fixing global start temperature bug
@RobertLRead
Fixing an incorrect variable, passing GLOBAL_RECENT_TEMP when it shou…
abc8a05
…ld have been WARM_UP_BEGIN_TIME, cause ramp up to be too high
@RobertLRead
multiple reads of temperature sensor
1581451
RobertLReadand others
added 30 commits
October 24, 2023 16:02
@RobertLRead
Merge branch 'log_recorder' ofhttps://github.com/PubInv/NASA-COGint…
0e8a14e
…o log_recorder
@LokiMetaSmith
Signed-off-by: lokimetasmith <lokimail@gmail.com>
7779180
@LokiMetaSmith
reduced the size of buffMax to allow for a larger report log buff size
65ee64a
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
verified log recordings work
dcd7cf2
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Merge pull request#381from LokiMetaSmith/log_recorder
7f24d45
Log recorder added in. Control of log recorder will need to be modified to allow creating and destroying tasks or for tasks to have adjustable periods
@ForrestErickson
Update Zener diode part number from MELF to miniMELF.
eac44bf
@ForrestErickson
Merge branch 'develop' ofhttps://github.com/ForrestErickson/NASA-COG…
0df6ec5
…into develop
@ForrestErickson
Merge pull request#384from ForrestErickson/develop
f53b605
Update Zener diode part number from MELF to miniMELF. D1 and D2
@gmulligan
Update debug.h
b646797
fix hang when building on arm
@gmulligan
Update network_udp.h
2f1454b
reduce udp buffer size
@ForrestErickson
Rearrange heat source and RC elements for clarity.
805d90e
@ForrestErickson
Merge branch 'develop' ofhttps://github.com/ForrestErickson/NASA-COG…
d7dd1de
…into develop
@ForrestErickson
Merge pull request#389from ForrestErickson/develop
3310785
Rearrange heat source and RC elements for clarity.
@LokiMetaSmith
Create README.md
e89f351
adding notes for programmable power supply
@gmulligan
Create SBC setup instructions
f5faec4
@RobertLRead
initial checkin of OneButton algorithm, compiling but completely unte…
c7e1e5c
…sted.
@LokiMetaSmith
initial pcb design for high current, constant current psu
8e74c2c
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Merge branch 'develop' of git@github.com:PubInv/NASA-COG.git into dev…
647286a
…elop
@LokiMetaSmith
added P&ID control diagram and updated dual channel stack psu
d940f22
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
added both proposed and development configuartion
f37fb99
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
moved burst disk to simulated reciever tank
9a170d8
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
updated SBC setup instructions
30379bd
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
finished SBC install script
d141fb8
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Added a set function to change period of a task
4717a87
Fixed a few bugs and typos
Added logRecorderTask pointer to MachineState and added function calls to SetPeriod for
Critical Fault and Emergency Shutdown to increase the periodicity of the reporting.
possibly should add a dedicated function to call the logging function on state transitions.
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@RobertLRead
significant rewrite of the DutyTask class
8d1aca3
@RobertLRead
Merge pull request#395from PubInv/From0.3.7fixIssue393
19a7914
significant rewrite of the DutyTask class
@LokiMetaSmith
Signed-off-by: lokimetasmith <lokimail@gmail.com>
0e84e5d
@LokiMetaSmith
Merge branch 'Task2OneButtonAlgorithm' of git@github.com:PubInv/NASA-…
dd762ee
…COG.git into Candidate_Integration_Task2
# Conflicts:
#	firmware/lib/task/cog_task.h
#	firmware/lib/task/duty_cycle_task.cpp
#	firmware/lib/task/log_recorder_task.cpp
@LokiMetaSmith
Merge branch 'log_recorder_integration' of git@github.com:PubInv/NASA…
bc0df52
…-COG.git into Candidate_Integration_Task2
# Conflicts:
#	firmware/lib/task/state_machine_manager.h
#	firmware/src/main.cpp
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
compiling now
e7ebf7e
Signed-off-by: lokimetasmith <lokimail@gmail.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@LokiMetaSmith@RobertLRead@ForrestErickson@gmulligan

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Candidate integration task2 - #47
Draft
LokiMetaSmith wants to merge 363 commits into
developfrom 
Candidate_Integration_Task2
Draft
Candidate integration task2#47
LokiMetaSmith wants to merge 363 commits into
developfrom 
Candidate_Integration_Task2
Conversation
@LokiMetaSmith
@LokiMetaSmithLokiMetaSmith
commented
Nov 16, 2023

Copy link


Copy Markdown

Contributor
This includes the work done on including logging and the 1 button algorithm.
It's a work in progress, and still has compile time bugs
Geoff Mulliganand others
added 30 commits
September 19, 2023 16:35
Geoff Mulligan
change generation of max address to set last bit 0 for cfc and 1 for …
17f3733
…stage2
@RobertLRead
intermediate solution, reporting better, but sill a bug in 3-part con…
c71051c
…trol
Geoff Mulligan
revert my last change
61994d8
@RobertLRead
fixing terrible bug#278
2c64ef6
@RobertLRead
Merge pull request#280from PubInv/robWatchDog
bef3698
Rob watch dog
Geoff Mulligan
minor udp fix
658d7c7
Geoff Mulligan
fixed json output and turned on OEDCS and Stage2 API endpoints
c19d512
@RobertLRead
intermediate code, unknown state
c04711d
@RobertLRead
Merge branch 'develop' ofhttps://github.com/PubInv/NASA-COGinto rob…
ad77dd2
…WatchDog
Geoff Mulligan
fix type in name of OEDCS
d25abe9
@ForrestErickson
Update README.md
2927002
Add MAC for OEDCS Serial number 2.
@RobertLRead
Create WattageControlExpreriment
7d69a73
@RobertLRead
Update and rename WattageControlExpreriment to WattageControlExprerim…
c44cf87
…ent.md
@RobertLRead
Update WattageControlExpreriment.md
b8f5c18
@RobertLRead
moving back to 3.11.0 for Dallas OneWire
acb3886
@RobertLRead
removing debugging
ebbca7f
@RobertLRead
reveting to use standard thermocooples for Stage2
de0c514
@RobertLRead
Merge pull request#285from PubInv/robWatchDog
5a8fba7
Rob watch dog
@RobertLRead
majore bug in stage2 heater fixed
6ee9ffe
@RobertLRead
removing stray debugging statements
b90877e
@RobertLRead
Merge pull request#286from PubInv/robTempAndStage2Control
e3ccc46
major bug in stage2 heater fixed
@LokiMetaSmith
added fan enable pwm channel, and ODECS#2 define in platformio.ini
b4787d6
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Merge branch 'fan_enable' of git@github.com:PubInv/NASA-COG.git into …
bd17a89
…HEAD
# Conflicts:
#	firmware/platformio.ini
@RobertLRead
fixing but with temperature jump
ed78c34
@RobertLRead
Merge pull request#287from PubInv/robThermoTest
2372009
fixing but with temperature jump
@RobertLRead
Pathfinder release
1083be4
@RobertLRead
fixing global start temperature bug
7111679
@RobertLRead
Merge pull request#288from PubInv/robThermoTest
8a68cf3
Fixing global start temperature bug
@RobertLRead
Fixing an incorrect variable, passing GLOBAL_RECENT_TEMP when it shou…
abc8a05
…ld have been WARM_UP_BEGIN_TIME, cause ramp up to be too high
@RobertLRead
multiple reads of temperature sensor
1581451
RobertLReadand others
added 30 commits
October 24, 2023 16:02
@RobertLRead
Merge branch 'log_recorder' ofhttps://github.com/PubInv/NASA-COGint…
0e8a14e
…o log_recorder
@LokiMetaSmith
Signed-off-by: lokimetasmith <lokimail@gmail.com>
7779180
@LokiMetaSmith
reduced the size of buffMax to allow for a larger report log buff size
65ee64a
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
verified log recordings work
dcd7cf2
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Merge pull request#381from LokiMetaSmith/log_recorder
7f24d45
Log recorder added in. Control of log recorder will need to be modified to allow creating and destroying tasks or for tasks to have adjustable periods
@ForrestErickson
Update Zener diode part number from MELF to miniMELF.
eac44bf
@ForrestErickson
Merge branch 'develop' ofhttps://github.com/ForrestErickson/NASA-COG…
0df6ec5
…into develop
@ForrestErickson
Merge pull request#384from ForrestErickson/develop
f53b605
Update Zener diode part number from MELF to miniMELF. D1 and D2
@gmulligan
Update debug.h
b646797
fix hang when building on arm
@gmulligan
Update network_udp.h
2f1454b
reduce udp buffer size
@ForrestErickson
Rearrange heat source and RC elements for clarity.
805d90e
@ForrestErickson
Merge branch 'develop' ofhttps://github.com/ForrestErickson/NASA-COG…
d7dd1de
…into develop
@ForrestErickson
Merge pull request#389from ForrestErickson/develop
3310785
Rearrange heat source and RC elements for clarity.
@LokiMetaSmith
Create README.md
e89f351
adding notes for programmable power supply
@gmulligan
Create SBC setup instructions
f5faec4
@RobertLRead
initial checkin of OneButton algorithm, compiling but completely unte…
c7e1e5c
…sted.
@LokiMetaSmith
initial pcb design for high current, constant current psu
8e74c2c
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Merge branch 'develop' of git@github.com:PubInv/NASA-COG.git into dev…
647286a
…elop
@LokiMetaSmith
added P&ID control diagram and updated dual channel stack psu
d940f22
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
added both proposed and development configuartion
f37fb99
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
moved burst disk to simulated reciever tank
9a170d8
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
updated SBC setup instructions
30379bd
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
finished SBC install script
d141fb8
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Added a set function to change period of a task
4717a87
Fixed a few bugs and typos
Added logRecorderTask pointer to MachineState and added function calls to SetPeriod for
Critical Fault and Emergency Shutdown to increase the periodicity of the reporting.
possibly should add a dedicated function to call the logging function on state transitions.
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@RobertLRead
significant rewrite of the DutyTask class
8d1aca3
@RobertLRead
Merge pull request#395from PubInv/From0.3.7fixIssue393
19a7914
significant rewrite of the DutyTask class
@LokiMetaSmith
Signed-off-by: lokimetasmith <lokimail@gmail.com>
0e84e5d
@LokiMetaSmith
Merge branch 'Task2OneButtonAlgorithm' of git@github.com:PubInv/NASA-…
dd762ee
…COG.git into Candidate_Integration_Task2
# Conflicts:
#	firmware/lib/task/cog_task.h
#	firmware/lib/task/duty_cycle_task.cpp
#	firmware/lib/task/log_recorder_task.cpp
@LokiMetaSmith
Merge branch 'log_recorder_integration' of git@github.com:PubInv/NASA…
bc0df52
…-COG.git into Candidate_Integration_Task2
# Conflicts:
#	firmware/lib/task/state_machine_manager.h
#	firmware/src/main.cpp
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
compiling now
e7ebf7e
Signed-off-by: lokimetasmith <lokimail@gmail.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@LokiMetaSmith@RobertLRead@ForrestErickson@gmulligan

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Candidate integration task2 - #47
Draft
LokiMetaSmith wants to merge 363 commits into
developfrom 
Candidate_Integration_Task2
Draft
Candidate integration task2#47
LokiMetaSmith wants to merge 363 commits into
developfrom 
Candidate_Integration_Task2
Conversation
@LokiMetaSmith
@LokiMetaSmithLokiMetaSmith
commented
Nov 16, 2023

Copy link


Copy Markdown

Contributor
This includes the work done on including logging and the 1 button algorithm.
It's a work in progress, and still has compile time bugs
Geoff Mulliganand others
added 30 commits
September 19, 2023 16:35
Geoff Mulligan
change generation of max address to set last bit 0 for cfc and 1 for …
17f3733
…stage2
@RobertLRead
intermediate solution, reporting better, but sill a bug in 3-part con…
c71051c
…trol
Geoff Mulligan
revert my last change
61994d8
@RobertLRead
fixing terrible bug#278
2c64ef6
@RobertLRead
Merge pull request#280from PubInv/robWatchDog
bef3698
Rob watch dog
Geoff Mulligan
minor udp fix
658d7c7
Geoff Mulligan
fixed json output and turned on OEDCS and Stage2 API endpoints
c19d512
@RobertLRead
intermediate code, unknown state
c04711d
@RobertLRead
Merge branch 'develop' ofhttps://github.com/PubInv/NASA-COGinto rob…
ad77dd2
…WatchDog
Geoff Mulligan
fix type in name of OEDCS
d25abe9
@ForrestErickson
Update README.md
2927002
Add MAC for OEDCS Serial number 2.
@RobertLRead
Create WattageControlExpreriment
7d69a73
@RobertLRead
Update and rename WattageControlExpreriment to WattageControlExprerim…
c44cf87
…ent.md
@RobertLRead
Update WattageControlExpreriment.md
b8f5c18
@RobertLRead
moving back to 3.11.0 for Dallas OneWire
acb3886
@RobertLRead
removing debugging
ebbca7f
@RobertLRead
reveting to use standard thermocooples for Stage2
de0c514
@RobertLRead
Merge pull request#285from PubInv/robWatchDog
5a8fba7
Rob watch dog
@RobertLRead
majore bug in stage2 heater fixed
6ee9ffe
@RobertLRead
removing stray debugging statements
b90877e
@RobertLRead
Merge pull request#286from PubInv/robTempAndStage2Control
e3ccc46
major bug in stage2 heater fixed
@LokiMetaSmith
added fan enable pwm channel, and ODECS#2 define in platformio.ini
b4787d6
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Merge branch 'fan_enable' of git@github.com:PubInv/NASA-COG.git into …
bd17a89
…HEAD
# Conflicts:
#	firmware/platformio.ini
@RobertLRead
fixing but with temperature jump
ed78c34
@RobertLRead
Merge pull request#287from PubInv/robThermoTest
2372009
fixing but with temperature jump
@RobertLRead
Pathfinder release
1083be4
@RobertLRead
fixing global start temperature bug
7111679
@RobertLRead
Merge pull request#288from PubInv/robThermoTest
8a68cf3
Fixing global start temperature bug
@RobertLRead
Fixing an incorrect variable, passing GLOBAL_RECENT_TEMP when it shou…
abc8a05
…ld have been WARM_UP_BEGIN_TIME, cause ramp up to be too high
@RobertLRead
multiple reads of temperature sensor
1581451
RobertLReadand others
added 30 commits
October 24, 2023 16:02
@RobertLRead
Merge branch 'log_recorder' ofhttps://github.com/PubInv/NASA-COGint…
0e8a14e
…o log_recorder
@LokiMetaSmith
Signed-off-by: lokimetasmith <lokimail@gmail.com>
7779180
@LokiMetaSmith
reduced the size of buffMax to allow for a larger report log buff size
65ee64a
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
verified log recordings work
dcd7cf2
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Merge pull request#381from LokiMetaSmith/log_recorder
7f24d45
Log recorder added in. Control of log recorder will need to be modified to allow creating and destroying tasks or for tasks to have adjustable periods
@ForrestErickson
Update Zener diode part number from MELF to miniMELF.
eac44bf
@ForrestErickson
Merge branch 'develop' ofhttps://github.com/ForrestErickson/NASA-COG…
0df6ec5
…into develop
@ForrestErickson
Merge pull request#384from ForrestErickson/develop
f53b605
Update Zener diode part number from MELF to miniMELF. D1 and D2
@gmulligan
Update debug.h
b646797
fix hang when building on arm
@gmulligan
Update network_udp.h
2f1454b
reduce udp buffer size
@ForrestErickson
Rearrange heat source and RC elements for clarity.
805d90e
@ForrestErickson
Merge branch 'develop' ofhttps://github.com/ForrestErickson/NASA-COG…
d7dd1de
…into develop
@ForrestErickson
Merge pull request#389from ForrestErickson/develop
3310785
Rearrange heat source and RC elements for clarity.
@LokiMetaSmith
Create README.md
e89f351
adding notes for programmable power supply
@gmulligan
Create SBC setup instructions
f5faec4
@RobertLRead
initial checkin of OneButton algorithm, compiling but completely unte…
c7e1e5c
…sted.
@LokiMetaSmith
initial pcb design for high current, constant current psu
8e74c2c
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Merge branch 'develop' of git@github.com:PubInv/NASA-COG.git into dev…
647286a
…elop
@LokiMetaSmith
added P&ID control diagram and updated dual channel stack psu
d940f22
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
added both proposed and development configuartion
f37fb99
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
moved burst disk to simulated reciever tank
9a170d8
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
updated SBC setup instructions
30379bd
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
finished SBC install script
d141fb8
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Added a set function to change period of a task
4717a87
Fixed a few bugs and typos
Added logRecorderTask pointer to MachineState and added function calls to SetPeriod for
Critical Fault and Emergency Shutdown to increase the periodicity of the reporting.
possibly should add a dedicated function to call the logging function on state transitions.
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@RobertLRead
significant rewrite of the DutyTask class
8d1aca3
@RobertLRead
Merge pull request#395from PubInv/From0.3.7fixIssue393
19a7914
significant rewrite of the DutyTask class
@LokiMetaSmith
Signed-off-by: lokimetasmith <lokimail@gmail.com>
0e84e5d
@LokiMetaSmith
Merge branch 'Task2OneButtonAlgorithm' of git@github.com:PubInv/NASA-…
dd762ee
…COG.git into Candidate_Integration_Task2
# Conflicts:
#	firmware/lib/task/cog_task.h
#	firmware/lib/task/duty_cycle_task.cpp
#	firmware/lib/task/log_recorder_task.cpp
@LokiMetaSmith
Merge branch 'log_recorder_integration' of git@github.com:PubInv/NASA…
bc0df52
…-COG.git into Candidate_Integration_Task2
# Conflicts:
#	firmware/lib/task/state_machine_manager.h
#	firmware/src/main.cpp
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
compiling now
e7ebf7e
Signed-off-by: lokimetasmith <lokimail@gmail.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@LokiMetaSmith@RobertLRead@ForrestErickson@gmulligan

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Candidate integration task2 - #47
Draft
LokiMetaSmith wants to merge 363 commits into
developfrom 
Candidate_Integration_Task2
Draft
Candidate integration task2#47
LokiMetaSmith wants to merge 363 commits into
developfrom 
Candidate_Integration_Task2
Conversation
@LokiMetaSmith
@LokiMetaSmithLokiMetaSmith
commented
Nov 16, 2023

Copy link


Copy Markdown

Contributor
This includes the work done on including logging and the 1 button algorithm.
It's a work in progress, and still has compile time bugs
Geoff Mulliganand others
added 30 commits
September 19, 2023 16:35
Geoff Mulligan
change generation of max address to set last bit 0 for cfc and 1 for …
17f3733
…stage2
@RobertLRead
intermediate solution, reporting better, but sill a bug in 3-part con…
c71051c
…trol
Geoff Mulligan
revert my last change
61994d8
@RobertLRead
fixing terrible bug#278
2c64ef6
@RobertLRead
Merge pull request#280from PubInv/robWatchDog
bef3698
Rob watch dog
Geoff Mulligan
minor udp fix
658d7c7
Geoff Mulligan
fixed json output and turned on OEDCS and Stage2 API endpoints
c19d512
@RobertLRead
intermediate code, unknown state
c04711d
@RobertLRead
Merge branch 'develop' ofhttps://github.com/PubInv/NASA-COGinto rob…
ad77dd2
…WatchDog
Geoff Mulligan
fix type in name of OEDCS
d25abe9
@ForrestErickson
Update README.md
2927002
Add MAC for OEDCS Serial number 2.
@RobertLRead
Create WattageControlExpreriment
7d69a73
@RobertLRead
Update and rename WattageControlExpreriment to WattageControlExprerim…
c44cf87
…ent.md
@RobertLRead
Update WattageControlExpreriment.md
b8f5c18
@RobertLRead
moving back to 3.11.0 for Dallas OneWire
acb3886
@RobertLRead
removing debugging
ebbca7f
@RobertLRead
reveting to use standard thermocooples for Stage2
de0c514
@RobertLRead
Merge pull request#285from PubInv/robWatchDog
5a8fba7
Rob watch dog
@RobertLRead
majore bug in stage2 heater fixed
6ee9ffe
@RobertLRead
removing stray debugging statements
b90877e
@RobertLRead
Merge pull request#286from PubInv/robTempAndStage2Control
e3ccc46
major bug in stage2 heater fixed
@LokiMetaSmith
added fan enable pwm channel, and ODECS#2 define in platformio.ini
b4787d6
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Merge branch 'fan_enable' of git@github.com:PubInv/NASA-COG.git into …
bd17a89
…HEAD
# Conflicts:
#	firmware/platformio.ini
@RobertLRead
fixing but with temperature jump
ed78c34
@RobertLRead
Merge pull request#287from PubInv/robThermoTest
2372009
fixing but with temperature jump
@RobertLRead
Pathfinder release
1083be4
@RobertLRead
fixing global start temperature bug
7111679
@RobertLRead
Merge pull request#288from PubInv/robThermoTest
8a68cf3
Fixing global start temperature bug
@RobertLRead
Fixing an incorrect variable, passing GLOBAL_RECENT_TEMP when it shou…
abc8a05
…ld have been WARM_UP_BEGIN_TIME, cause ramp up to be too high
@RobertLRead
multiple reads of temperature sensor
1581451
RobertLReadand others
added 30 commits
October 24, 2023 16:02
@RobertLRead
Merge branch 'log_recorder' ofhttps://github.com/PubInv/NASA-COGint…
0e8a14e
…o log_recorder
@LokiMetaSmith
Signed-off-by: lokimetasmith <lokimail@gmail.com>
7779180
@LokiMetaSmith
reduced the size of buffMax to allow for a larger report log buff size
65ee64a
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
verified log recordings work
dcd7cf2
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Merge pull request#381from LokiMetaSmith/log_recorder
7f24d45
Log recorder added in. Control of log recorder will need to be modified to allow creating and destroying tasks or for tasks to have adjustable periods
@ForrestErickson
Update Zener diode part number from MELF to miniMELF.
eac44bf
@ForrestErickson
Merge branch 'develop' ofhttps://github.com/ForrestErickson/NASA-COG…
0df6ec5
…into develop
@ForrestErickson
Merge pull request#384from ForrestErickson/develop
f53b605
Update Zener diode part number from MELF to miniMELF. D1 and D2
@gmulligan
Update debug.h
b646797
fix hang when building on arm
@gmulligan
Update network_udp.h
2f1454b
reduce udp buffer size
@ForrestErickson
Rearrange heat source and RC elements for clarity.
805d90e
@ForrestErickson
Merge branch 'develop' ofhttps://github.com/ForrestErickson/NASA-COG…
d7dd1de
…into develop
@ForrestErickson
Merge pull request#389from ForrestErickson/develop
3310785
Rearrange heat source and RC elements for clarity.
@LokiMetaSmith
Create README.md
e89f351
adding notes for programmable power supply
@gmulligan
Create SBC setup instructions
f5faec4
@RobertLRead
initial checkin of OneButton algorithm, compiling but completely unte…
c7e1e5c
…sted.
@LokiMetaSmith
initial pcb design for high current, constant current psu
8e74c2c
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Merge branch 'develop' of git@github.com:PubInv/NASA-COG.git into dev…
647286a
…elop
@LokiMetaSmith
added P&ID control diagram and updated dual channel stack psu
d940f22
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
added both proposed and development configuartion
f37fb99
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
moved burst disk to simulated reciever tank
9a170d8
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
updated SBC setup instructions
30379bd
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
finished SBC install script
d141fb8
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Added a set function to change period of a task
4717a87
Fixed a few bugs and typos
Added logRecorderTask pointer to MachineState and added function calls to SetPeriod for
Critical Fault and Emergency Shutdown to increase the periodicity of the reporting.
possibly should add a dedicated function to call the logging function on state transitions.
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@RobertLRead
significant rewrite of the DutyTask class
8d1aca3
@RobertLRead
Merge pull request#395from PubInv/From0.3.7fixIssue393
19a7914
significant rewrite of the DutyTask class
@LokiMetaSmith
Signed-off-by: lokimetasmith <lokimail@gmail.com>
0e84e5d
@LokiMetaSmith
Merge branch 'Task2OneButtonAlgorithm' of git@github.com:PubInv/NASA-…
dd762ee
…COG.git into Candidate_Integration_Task2
# Conflicts:
#	firmware/lib/task/cog_task.h
#	firmware/lib/task/duty_cycle_task.cpp
#	firmware/lib/task/log_recorder_task.cpp
@LokiMetaSmith
Merge branch 'log_recorder_integration' of git@github.com:PubInv/NASA…
bc0df52
…-COG.git into Candidate_Integration_Task2
# Conflicts:
#	firmware/lib/task/state_machine_manager.h
#	firmware/src/main.cpp
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
compiling now
e7ebf7e
Signed-off-by: lokimetasmith <lokimail@gmail.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@LokiMetaSmith@RobertLRead@ForrestErickson@gmulligan

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Candidate integration task2 - #47
Draft
LokiMetaSmith wants to merge 363 commits into
developfrom 
Candidate_Integration_Task2
Draft
Candidate integration task2#47
LokiMetaSmith wants to merge 363 commits into
developfrom 
Candidate_Integration_Task2
Conversation
@LokiMetaSmith
@LokiMetaSmithLokiMetaSmith
commented
Nov 16, 2023

Copy link


Copy Markdown

Contributor
This includes the work done on including logging and the 1 button algorithm.
It's a work in progress, and still has compile time bugs
Geoff Mulliganand others
added 30 commits
September 19, 2023 16:35
Geoff Mulligan
change generation of max address to set last bit 0 for cfc and 1 for …
17f3733
…stage2
@RobertLRead
intermediate solution, reporting better, but sill a bug in 3-part con…
c71051c
…trol
Geoff Mulligan
revert my last change
61994d8
@RobertLRead
fixing terrible bug#278
2c64ef6
@RobertLRead
Merge pull request#280from PubInv/robWatchDog
bef3698
Rob watch dog
Geoff Mulligan
minor udp fix
658d7c7
Geoff Mulligan
fixed json output and turned on OEDCS and Stage2 API endpoints
c19d512
@RobertLRead
intermediate code, unknown state
c04711d
@RobertLRead
Merge branch 'develop' ofhttps://github.com/PubInv/NASA-COGinto rob…
ad77dd2
…WatchDog
Geoff Mulligan
fix type in name of OEDCS
d25abe9
@ForrestErickson
Update README.md
2927002
Add MAC for OEDCS Serial number 2.
@RobertLRead
Create WattageControlExpreriment
7d69a73
@RobertLRead
Update and rename WattageControlExpreriment to WattageControlExprerim…
c44cf87
…ent.md
@RobertLRead
Update WattageControlExpreriment.md
b8f5c18
@RobertLRead
moving back to 3.11.0 for Dallas OneWire
acb3886
@RobertLRead
removing debugging
ebbca7f
@RobertLRead
reveting to use standard thermocooples for Stage2
de0c514
@RobertLRead
Merge pull request#285from PubInv/robWatchDog
5a8fba7
Rob watch dog
@RobertLRead
majore bug in stage2 heater fixed
6ee9ffe
@RobertLRead
removing stray debugging statements
b90877e
@RobertLRead
Merge pull request#286from PubInv/robTempAndStage2Control
e3ccc46
major bug in stage2 heater fixed
@LokiMetaSmith
added fan enable pwm channel, and ODECS#2 define in platformio.ini
b4787d6
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Merge branch 'fan_enable' of git@github.com:PubInv/NASA-COG.git into …
bd17a89
…HEAD
# Conflicts:
#	firmware/platformio.ini
@RobertLRead
fixing but with temperature jump
ed78c34
@RobertLRead
Merge pull request#287from PubInv/robThermoTest
2372009
fixing but with temperature jump
@RobertLRead
Pathfinder release
1083be4
@RobertLRead
fixing global start temperature bug
7111679
@RobertLRead
Merge pull request#288from PubInv/robThermoTest
8a68cf3
Fixing global start temperature bug
@RobertLRead
Fixing an incorrect variable, passing GLOBAL_RECENT_TEMP when it shou…
abc8a05
…ld have been WARM_UP_BEGIN_TIME, cause ramp up to be too high
@RobertLRead
multiple reads of temperature sensor
1581451
RobertLReadand others
added 30 commits
October 24, 2023 16:02
@RobertLRead
Merge branch 'log_recorder' ofhttps://github.com/PubInv/NASA-COGint…
0e8a14e
…o log_recorder
@LokiMetaSmith
Signed-off-by: lokimetasmith <lokimail@gmail.com>
7779180
@LokiMetaSmith
reduced the size of buffMax to allow for a larger report log buff size
65ee64a
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
verified log recordings work
dcd7cf2
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Merge pull request#381from LokiMetaSmith/log_recorder
7f24d45
Log recorder added in. Control of log recorder will need to be modified to allow creating and destroying tasks or for tasks to have adjustable periods
@ForrestErickson
Update Zener diode part number from MELF to miniMELF.
eac44bf
@ForrestErickson
Merge branch 'develop' ofhttps://github.com/ForrestErickson/NASA-COG…
0df6ec5
…into develop
@ForrestErickson
Merge pull request#384from ForrestErickson/develop
f53b605
Update Zener diode part number from MELF to miniMELF. D1 and D2
@gmulligan
Update debug.h
b646797
fix hang when building on arm
@gmulligan
Update network_udp.h
2f1454b
reduce udp buffer size
@ForrestErickson
Rearrange heat source and RC elements for clarity.
805d90e
@ForrestErickson
Merge branch 'develop' ofhttps://github.com/ForrestErickson/NASA-COG…
d7dd1de
…into develop
@ForrestErickson
Merge pull request#389from ForrestErickson/develop
3310785
Rearrange heat source and RC elements for clarity.
@LokiMetaSmith
Create README.md
e89f351
adding notes for programmable power supply
@gmulligan
Create SBC setup instructions
f5faec4
@RobertLRead
initial checkin of OneButton algorithm, compiling but completely unte…
c7e1e5c
…sted.
@LokiMetaSmith
initial pcb design for high current, constant current psu
8e74c2c
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Merge branch 'develop' of git@github.com:PubInv/NASA-COG.git into dev…
647286a
…elop
@LokiMetaSmith
added P&ID control diagram and updated dual channel stack psu
d940f22
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
added both proposed and development configuartion
f37fb99
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
moved burst disk to simulated reciever tank
9a170d8
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
updated SBC setup instructions
30379bd
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
finished SBC install script
d141fb8
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Added a set function to change period of a task
4717a87
Fixed a few bugs and typos
Added logRecorderTask pointer to MachineState and added function calls to SetPeriod for
Critical Fault and Emergency Shutdown to increase the periodicity of the reporting.
possibly should add a dedicated function to call the logging function on state transitions.
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@RobertLRead
significant rewrite of the DutyTask class
8d1aca3
@RobertLRead
Merge pull request#395from PubInv/From0.3.7fixIssue393
19a7914
significant rewrite of the DutyTask class
@LokiMetaSmith
Signed-off-by: lokimetasmith <lokimail@gmail.com>
0e84e5d
@LokiMetaSmith
Merge branch 'Task2OneButtonAlgorithm' of git@github.com:PubInv/NASA-…
dd762ee
…COG.git into Candidate_Integration_Task2
# Conflicts:
#	firmware/lib/task/cog_task.h
#	firmware/lib/task/duty_cycle_task.cpp
#	firmware/lib/task/log_recorder_task.cpp
@LokiMetaSmith
Merge branch 'log_recorder_integration' of git@github.com:PubInv/NASA…
bc0df52
…-COG.git into Candidate_Integration_Task2
# Conflicts:
#	firmware/lib/task/state_machine_manager.h
#	firmware/src/main.cpp
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
compiling now
e7ebf7e
Signed-off-by: lokimetasmith <lokimail@gmail.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@LokiMetaSmith@RobertLRead@ForrestErickson@gmulligan

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Candidate integration task2 - #47
Draft
LokiMetaSmith wants to merge 363 commits into
developfrom 
Candidate_Integration_Task2
Draft
Candidate integration task2#47
LokiMetaSmith wants to merge 363 commits into
developfrom 
Candidate_Integration_Task2
Conversation
@LokiMetaSmith
@LokiMetaSmithLokiMetaSmith
commented
Nov 16, 2023

Copy link


Copy Markdown

Contributor
This includes the work done on including logging and the 1 button algorithm.
It's a work in progress, and still has compile time bugs
Geoff Mulliganand others
added 30 commits
September 19, 2023 16:35
Geoff Mulligan
change generation of max address to set last bit 0 for cfc and 1 for …
17f3733
…stage2
@RobertLRead
intermediate solution, reporting better, but sill a bug in 3-part con…
c71051c
…trol
Geoff Mulligan
revert my last change
61994d8
@RobertLRead
fixing terrible bug#278
2c64ef6
@RobertLRead
Merge pull request#280from PubInv/robWatchDog
bef3698
Rob watch dog
Geoff Mulligan
minor udp fix
658d7c7
Geoff Mulligan
fixed json output and turned on OEDCS and Stage2 API endpoints
c19d512
@RobertLRead
intermediate code, unknown state
c04711d
@RobertLRead
Merge branch 'develop' ofhttps://github.com/PubInv/NASA-COGinto rob…
ad77dd2
…WatchDog
Geoff Mulligan
fix type in name of OEDCS
d25abe9
@ForrestErickson
Update README.md
2927002
Add MAC for OEDCS Serial number 2.
@RobertLRead
Create WattageControlExpreriment
7d69a73
@RobertLRead
Update and rename WattageControlExpreriment to WattageControlExprerim…
c44cf87
…ent.md
@RobertLRead
Update WattageControlExpreriment.md
b8f5c18
@RobertLRead
moving back to 3.11.0 for Dallas OneWire
acb3886
@RobertLRead
removing debugging
ebbca7f
@RobertLRead
reveting to use standard thermocooples for Stage2
de0c514
@RobertLRead
Merge pull request#285from PubInv/robWatchDog
5a8fba7
Rob watch dog
@RobertLRead
majore bug in stage2 heater fixed
6ee9ffe
@RobertLRead
removing stray debugging statements
b90877e
@RobertLRead
Merge pull request#286from PubInv/robTempAndStage2Control
e3ccc46
major bug in stage2 heater fixed
@LokiMetaSmith
added fan enable pwm channel, and ODECS#2 define in platformio.ini
b4787d6
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Merge branch 'fan_enable' of git@github.com:PubInv/NASA-COG.git into …
bd17a89
…HEAD
# Conflicts:
#	firmware/platformio.ini
@RobertLRead
fixing but with temperature jump
ed78c34
@RobertLRead
Merge pull request#287from PubInv/robThermoTest
2372009
fixing but with temperature jump
@RobertLRead
Pathfinder release
1083be4
@RobertLRead
fixing global start temperature bug
7111679
@RobertLRead
Merge pull request#288from PubInv/robThermoTest
8a68cf3
Fixing global start temperature bug
@RobertLRead
Fixing an incorrect variable, passing GLOBAL_RECENT_TEMP when it shou…
abc8a05
…ld have been WARM_UP_BEGIN_TIME, cause ramp up to be too high
@RobertLRead
multiple reads of temperature sensor
1581451
RobertLReadand others
added 30 commits
October 24, 2023 16:02
@RobertLRead
Merge branch 'log_recorder' ofhttps://github.com/PubInv/NASA-COGint…
0e8a14e
…o log_recorder
@LokiMetaSmith
Signed-off-by: lokimetasmith <lokimail@gmail.com>
7779180
@LokiMetaSmith
reduced the size of buffMax to allow for a larger report log buff size
65ee64a
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
verified log recordings work
dcd7cf2
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Merge pull request#381from LokiMetaSmith/log_recorder
7f24d45
Log recorder added in. Control of log recorder will need to be modified to allow creating and destroying tasks or for tasks to have adjustable periods
@ForrestErickson
Update Zener diode part number from MELF to miniMELF.
eac44bf
@ForrestErickson
Merge branch 'develop' ofhttps://github.com/ForrestErickson/NASA-COG…
0df6ec5
…into develop
@ForrestErickson
Merge pull request#384from ForrestErickson/develop
f53b605
Update Zener diode part number from MELF to miniMELF. D1 and D2
@gmulligan
Update debug.h
b646797
fix hang when building on arm
@gmulligan
Update network_udp.h
2f1454b
reduce udp buffer size
@ForrestErickson
Rearrange heat source and RC elements for clarity.
805d90e
@ForrestErickson
Merge branch 'develop' ofhttps://github.com/ForrestErickson/NASA-COG…
d7dd1de
…into develop
@ForrestErickson
Merge pull request#389from ForrestErickson/develop
3310785
Rearrange heat source and RC elements for clarity.
@LokiMetaSmith
Create README.md
e89f351
adding notes for programmable power supply
@gmulligan
Create SBC setup instructions
f5faec4
@RobertLRead
initial checkin of OneButton algorithm, compiling but completely unte…
c7e1e5c
…sted.
@LokiMetaSmith
initial pcb design for high current, constant current psu
8e74c2c
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Merge branch 'develop' of git@github.com:PubInv/NASA-COG.git into dev…
647286a
…elop
@LokiMetaSmith
added P&ID control diagram and updated dual channel stack psu
d940f22
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
added both proposed and development configuartion
f37fb99
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
moved burst disk to simulated reciever tank
9a170d8
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
updated SBC setup instructions
30379bd
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
finished SBC install script
d141fb8
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
Added a set function to change period of a task
4717a87
Fixed a few bugs and typos
Added logRecorderTask pointer to MachineState and added function calls to SetPeriod for
Critical Fault and Emergency Shutdown to increase the periodicity of the reporting.
possibly should add a dedicated function to call the logging function on state transitions.
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@RobertLRead
significant rewrite of the DutyTask class
8d1aca3
@RobertLRead
Merge pull request#395from PubInv/From0.3.7fixIssue393
19a7914
significant rewrite of the DutyTask class
@LokiMetaSmith
Signed-off-by: lokimetasmith <lokimail@gmail.com>
0e84e5d
@LokiMetaSmith
Merge branch 'Task2OneButtonAlgorithm' of git@github.com:PubInv/NASA-…
dd762ee
…COG.git into Candidate_Integration_Task2
# Conflicts:
#	firmware/lib/task/cog_task.h
#	firmware/lib/task/duty_cycle_task.cpp
#	firmware/lib/task/log_recorder_task.cpp
@LokiMetaSmith
Merge branch 'log_recorder_integration' of git@github.com:PubInv/NASA…
bc0df52
…-COG.git into Candidate_Integration_Task2
# Conflicts:
#	firmware/lib/task/state_machine_manager.h
#	firmware/src/main.cpp
Signed-off-by: lokimetasmith <lokimail@gmail.com>
@LokiMetaSmith
compiling now
e7ebf7e
Signed-off-by: lokimetasmith <lokimail@gmail.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@LokiMetaSmith@RobertLRead@ForrestErickson@gmulligan