assembly output + json testing

This commit is contained in:
2021-10-04 17:07:15 +02:00
parent 584f88dec7
commit 7fada51a42
7 changed files with 1031 additions and 924 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -11,15 +11,15 @@
(page A4)
(layers
(0 F.Cu signal)
(1 In1.Cu signal)
(2 In2.Cu signal)
(31 B.Cu signal)
(0 F.Cu signal hide)
(1 In1.Cu signal hide)
(2 In2.Cu signal hide)
(31 B.Cu signal hide)
(32 B.Adhes user hide)
(33 F.Adhes user hide)
(34 B.Paste user hide)
(35 F.Paste user hide)
(36 B.SilkS user hide)
(36 B.SilkS user)
(37 F.SilkS user hide)
(38 B.Mask user hide)
(39 F.Mask user hide)
@@ -4993,7 +4993,7 @@
(segment (start 76.15 83.134) (end 75.796 82.78) (width 0.3048) (layer F.Cu) (net 109))
(segment (start 76.15 84.3775) (end 76.15 83.134) (width 0.3048) (layer F.Cu) (net 109))
(zone (net 1) (net_name GND) (layer B.Cu) (tstamp 6142D508) (hatch edge 0.508)
(zone (net 1) (net_name GND) (layer B.Cu) (tstamp 614D67E9) (hatch edge 0.508)
(connect_pads yes (clearance 0.1524))
(min_thickness 0.1524)
(fill yes (arc_segments 32) (thermal_gap 0.508) (thermal_bridge_width 0.508))
@@ -5550,7 +5550,7 @@
)
)
)
(zone (net 101) (net_name /CPU/A2) (layer F.Cu) (tstamp 61444C28) (hatch edge 0.508)
(zone (net 101) (net_name /CPU/A2) (layer F.Cu) (tstamp 614D67E6) (hatch edge 0.508)
(connect_pads yes (clearance 0.2032))
(min_thickness 0.1524)
(fill yes (arc_segments 32) (thermal_gap 0.508) (thermal_bridge_width 0.508))
@@ -5570,7 +5570,7 @@
)
)
)
(zone (net 98) (net_name /CPU/WIFI_ANT) (layer F.Cu) (tstamp 0) (hatch full 0.508)
(zone (net 98) (net_name /CPU/WIFI_ANT) (layer F.Cu) (tstamp 614D67E3) (hatch full 0.508)
(connect_pads yes (clearance 0))
(min_thickness 0.0254)
(fill yes (arc_segments 32) (thermal_gap 0.0255) (thermal_bridge_width 0.0255))
@@ -5588,7 +5588,7 @@
)
)
)
(zone (net 1) (net_name GND) (layer F.Cu) (tstamp 61451E36) (hatch edge 0.508)
(zone (net 1) (net_name GND) (layer F.Cu) (tstamp 614D67E0) (hatch edge 0.508)
(connect_pads yes (clearance 0.1524))
(min_thickness 0.254)
(fill yes (arc_segments 32) (thermal_gap 0.508) (thermal_bridge_width 0.508))
@@ -5700,7 +5700,7 @@
)
)
)
(zone (net 1) (net_name GND) (layer In1.Cu) (tstamp 0) (hatch edge 0.508)
(zone (net 1) (net_name GND) (layer In1.Cu) (tstamp 614D67DD) (hatch edge 0.508)
(connect_pads yes (clearance 0.1524))
(min_thickness 0.254)
(fill yes (arc_segments 32) (thermal_gap 0.508) (thermal_bridge_width 0.508))
@@ -5745,7 +5745,7 @@
)
)
)
(zone (net 6) (net_name +3V3) (layer F.Cu) (tstamp 0) (hatch edge 0.508)
(zone (net 6) (net_name +3V3) (layer F.Cu) (tstamp 614D67DA) (hatch edge 0.508)
(connect_pads yes (clearance 0.1524))
(min_thickness 0.1524)
(fill yes (arc_segments 32) (thermal_gap 0.1778) (thermal_bridge_width 0.1778))
@@ -5771,7 +5771,7 @@
)
)
)
(zone (net 109) (net_name /Power/Lx_L1) (layer F.Cu) (tstamp 0) (hatch edge 0.508)
(zone (net 109) (net_name /Power/Lx_L1) (layer F.Cu) (tstamp 614D67D7) (hatch edge 0.508)
(connect_pads yes (clearance 0.1524))
(min_thickness 0.1524)
(fill yes (arc_segments 32) (thermal_gap 0.1778) (thermal_bridge_width 0.1778))
@@ -5789,7 +5789,7 @@
)
)
)
(zone (net 1) (net_name GND) (layer F.Cu) (tstamp 0) (hatch edge 0.508)
(zone (net 1) (net_name GND) (layer F.Cu) (tstamp 614D67D4) (hatch edge 0.508)
(connect_pads yes (clearance 0.1524))
(min_thickness 0.1524)
(fill yes (arc_segments 32) (thermal_gap 0.1778) (thermal_bridge_width 0.1778))
@@ -5816,7 +5816,7 @@
)
)
)
(zone (net 4) (net_name +BATT) (layer F.Cu) (tstamp 0) (hatch edge 0.508)
(zone (net 4) (net_name +BATT) (layer F.Cu) (tstamp 614D67D1) (hatch edge 0.508)
(connect_pads yes (clearance 0.1524))
(min_thickness 0.1524)
(fill yes (arc_segments 32) (thermal_gap 0.1778) (thermal_bridge_width 0.1778))
@@ -5843,7 +5843,7 @@
)
)
)
(zone (net 1) (net_name GND) (layer In1.Cu) (tstamp 0) (hatch edge 0.508)
(zone (net 1) (net_name GND) (layer In1.Cu) (tstamp 614D67CE) (hatch edge 0.508)
(connect_pads yes (clearance 0.1524))
(min_thickness 0.1524)
(fill yes (arc_segments 32) (thermal_gap 0.1778) (thermal_bridge_width 0.1778))
@@ -5939,7 +5939,7 @@
)
)
)
(zone (net 1) (net_name GND) (layer F.Cu) (tstamp 614D1C26) (hatch edge 0.508)
(zone (net 1) (net_name GND) (layer F.Cu) (tstamp 614D67CB) (hatch edge 0.508)
(connect_pads yes (clearance 0.1524))
(min_thickness 0.1524)
(fill yes (arc_segments 32) (thermal_gap 0.508) (thermal_bridge_width 0.508))

Binary file not shown.

View File

@@ -15,6 +15,7 @@ std::vector<tagConfig> tags;
void loadConfig(const char *fname)
{
Serial.println("config: load");
File file = LITTLEFS.open(fname);
StaticJsonDocument<512> doc;
DeserializationError error = deserializeJson(doc, file);
@@ -22,13 +23,21 @@ void loadConfig(const char *fname)
Serial.println(F("Failed to read file, using default configuration"));
JsonArray array = doc.as<JsonArray>();
for(JsonVariant v : array) {
Serial.print("json entry: ");
Serial.println(v.as<String>());
}
serializeJsonPretty(doc, Serial);
Serial.println("config: load done");
}
void initConfig(void)
{
Serial.println("config: init");
loadConfig(tagConfigfile);
Serial.println("config: init done");
}
void handleConfig(void)

View File

@@ -4,6 +4,7 @@
#include "storage.h"
#include "audio.h"
#include "rfid.h"
#include "config.h"
#include "game.h"
@@ -13,9 +14,12 @@ void setup()
delay(2000);
initStorage();
initConfig();
initAudio();
initRfid();
initGame();
}
void loop()

View File

@@ -0,0 +1,85 @@
{
"cod": "200",
"message": 0,
"list": [
{
"dt": 1581498000,
"main": {
"temp": 3.23,
"feels_like": -3.63,
"temp_min": 3.23,
"temp_max": 4.62,
"pressure": 1014,
"sea_level": 1014,
"grnd_level": 1010,
"humidity": 58,
"temp_kf": -1.39
},
"weather": [
{
"id": 800,
"main": "Clear",
"description": "clear sky",
"icon": "01d"
}
],
"clouds": {
"all": 0
},
"wind": {
"speed": 6.19,
"deg": 266
},
"sys": {
"pod": "d"
},
"dt_txt": "2020-02-12 09:00:00"
},
{
"dt": 1581508800,
"main": {
"temp": 6.09,
"feels_like": -1.07,
"temp_min": 6.09,
"temp_max": 7.13,
"pressure": 1015,
"sea_level": 1015,
"grnd_level": 1011,
"humidity": 48,
"temp_kf": -1.04
},
"weather": [
{
"id": 800,
"main": "Clear",
"description": "clear sky",
"icon": "01d"
}
],
"clouds": {
"all": 9
},
"wind": {
"speed": 6.64,
"deg": 268
},
"sys": {
"pod": "d"
},
"dt_txt": "2020-02-12 12:00:00"
}
],
"city": {
"id": 2643743,
"name": "London",
"coord": {
"lat": 51.5085,
"lon": -0.1257
},
"country": "GB",
"population": 1000000,
"timezone": 0,
"sunrise": 1581492085,
"sunset": 1581527294
}
}