Skip to content

Commit

Permalink
Merge pull request #622 from baaahs/merge-brc-2024
Browse files Browse the repository at this point in the history
Merge changes from BRC 2024
  • Loading branch information
xian authored Sep 25, 2024
2 parents 2b8da6c + 4b1aef3 commit 77ad22b
Show file tree
Hide file tree
Showing 736 changed files with 47,660 additions and 644 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ build
.gradle
node_modules
.DS_Store
.kotlin
.kotlin
.java-version
2 changes: 1 addition & 1 deletion brain/sw/components/sysmon/sysmon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ void SysMon::addMetrics() {
void SysMon::addMemInfo() {
m_tmpHead = m_tmpEnd - m_tmpRemaining;
m_tmpRemaining -= snprintf(m_tmpHead, m_tmpRemaining,
" Memory = bytes free( %6ld ) largest( %6d )\n",
" Memory = bytes free( %6u ) largest( %6u )\n",
xPortGetFreeHeapSize(),
heap_caps_get_largest_free_block(MALLOC_CAP_DEFAULT));

Expand Down
45 changes: 31 additions & 14 deletions brain/sw/playa/dependencies.lock
Original file line number Diff line number Diff line change
@@ -1,57 +1,74 @@
dependencies:
brain-common:
component_hash: null
dependencies: []
source:
path: /System/Volumes/Data/code/github/baaahs/sparklemotion/brain/sw/components/brain-common
type: local
version: 1.0.0
brain-ui:
component_hash: null
dependencies: []
source:
path: /System/Volumes/Data/code/github/baaahs/sparklemotion/brain/sw/components/brain-ui
type: local
version: 1.0.0
espressif/jsmn:
component_hash: d80350c41bbaa827c98a25b6072df00884e72f54885996fab4a4f0aebce6b6c3
dependencies:
- name: idf
require: private
version: '>=4.3'
source:
service_url: https://api.components.espressif.com/
registry_url: https://components.espressif.com/
type: service
version: 1.1.0
espressif/led_strip:
component_hash: 67d2744208e9c12d8b1992d21c979396c1726e57cb7e35e7c171c515be20f8ea
component_hash: 28c6509a727ef74925b372ed404772aeedf11cce10b78c3f69b3c66799095e2d
dependencies:
- name: idf
require: private
version: '>=4.4'
source:
service_url: https://api.components.espressif.com/
registry_url: https://components.espressif.com/
type: service
version: 2.5.3
version: 2.5.5
idf:
component_hash: null
source:
type: idf
version: 5.0.1
version: 5.3.0
iso:
component_hash: null
dependencies: []
source:
path: /System/Volumes/Data/code/github/baaahs/sparklemotion/brain/sw/components/iso
type: local
version: 1.0.0
led-renderer:
component_hash: null
dependencies: []
source:
path: /System/Volumes/Data/code/github/baaahs/sparklemotion/brain/sw/components/led-renderer
type: local
version: 1.0.0
net:
component_hash: null
dependencies: []
source:
path: /System/Volumes/Data/code/github/baaahs/sparklemotion/brain/sw/components/net
type: local
version: 1.0.0
sysmon:
component_hash: null
dependencies: []
source:
path: /System/Volumes/Data/code/github/baaahs/sparklemotion/brain/sw/components/sysmon
type: local
version: 1.0.0
manifest_hash: b785be90b00aebfbe77181aed119ae84dab657def9ce3bcfb35fd6b8fe76fb15
direct_dependencies:
- brain-common
- brain-ui
- espressif/jsmn
- espressif/led_strip
- idf
- iso
- led-renderer
- net
- sysmon
manifest_hash: 292e084fd81612902f1dfbe87181112d689c272fe55869f4cbf692a07545c214
target: esp32
version: 1.0.0
version: 2.0.0
Loading

0 comments on commit 77ad22b

Please sign in to comment.