X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=Notebook;h=9253da80a486ff670758acfbb9d1af2e304d3718;hb=59c540063fe7410f7934769146c6619ce5fd94c0;hp=f679601e44a3a74c8c81fd3b6821d1f023182cd4;hpb=6dbc9b3b8d59a16c6cbbdf5ae7f47e280c95e92c;p=hw%2Fquantimotor

diff --git a/Notebook b/Notebook
index f679601..9253da8 100644
--- a/Notebook
+++ b/Notebook
@@ -101,3 +101,13 @@
   logo decals vs TeleFireEight being orange with purple decals might make
   sense?
 
+2022.05.22
+- looking at firmware for v4 board.  
+
+	ads131		has driver for ADS131A0X, not quite working?
+	bdale-ui	work on teststand ui
+
+  - created new branch telestatic-v4 from master
+  - merged bdale-ui, resolving conflict in altoslib/AltosCSV.java
+  - merged ads131, resolving conflict in src/kernel/ao_data.h
+