changes for new jokes json pysquared

Author: ineskhou

Makefile

@@ -1,4 +1,4 @@
-PYSQUARED_VERSION ?= v2.0.0-alpha-25w40a
+PYSQUARED_VERSION ?= copilot/fix-b200b2ac-fa90-4d1a-baed-082a174c5fb7
 PYSQUARED ?= git+https://github.com/proveskit/pysquared@$(PYSQUARED_VERSION)\#subdirectory=circuitpython-workspaces/flight-software
 BOARD_MOUNT_POINT ?= ""
 BOARD_TTY_PORT ?= ""
@@ -107,7 +107,9 @@ define rsync_to_dest
 		exit 1; \
 	fi
 
-	@rsync -avh ./config.json $(2)/version.py $(1)/*.py $(1)/lib --exclude=".*" --exclude='requirements.txt' --exclude='__pycache__' $(2) --delete --times --checksum
+	@rsync -avh ./config.json ./jokes.json $(2)/version.py $(1)/*.py $(1)/lib 	--exclude=".*" --exclude='requirements.txt' --exclude='__pycache__' $(2) --delete --times --checksum
+
+
 endef
 
 ##@ Build Tools

config.json

@@ -4,57 +4,13 @@
   "cubesat_name": "PROVES-",
   "current_draw": 240.5,
   "debug": true,
-  "degraded_battery_voltage": 6.6,
+  "degraded_battery_voltage": 7.0,
   "detumble_enable_x": true,
   "detumble_enable_y": true,
   "detumble_enable_z": true,
   "heating": false,
-  "joke_reply": [
-    "Your Mom",
-    "Your Mum",
-    "Your Face",
-    "not True lol",
-    "I have brought peace, freedom, justice, and security to my new empire! Your New Empire?"
-  ],
-  "jokes": [
-    "Hey it is pretty cold up here, did someone forget to pay the electric bill?",
-    "sudo rf - rf*",
-    "Why did the astronaut break up with his girlfriend? He needed space.",
-    "Why did the sun go to school? To get a little brighter.",
-    "why is the mall called the mall? because instead of going to one store you go to them all",
-    "Alien detected. Blurring photo...",
-    "Wait it is all open source? Always has been... www.github.com/proveskit",
-    "What did 0 say to 1? You're a bit too much.",
-    "Pleiades - Orpheus has been recently acquired by the Onion News Network",
-    "This jokesat was brought to you by the Bronco Space Ministry of Labor and Job Placement",
-    "Catch you on the next pass!",
-    "Pleiades - Orpheus was not The Impostor",
-    "Sorry for messing with your long-exposure astrophoto!",
-    "Better buy a telescope. Wanna see me. Buy a telescope. Gonna be in space.",
-    "According to all known laws of aviation, there is no way bees should be able to fly...",
-    "You lost the game ",
-    "Bobby Tables is a good friend of mine",
-    "Why did the computer cross the road? To get a byte to eat!",
-    "Why are the astronauts not hungry when they got to space? They had a big launch.",
-    "Why did the computer get glasses? To improve its web sight!",
-    "What are computers favorite snacks? Chips!",
-    "Wait! I think I see a White 2019 Subaru Crosstrek 2.0i Premium",
-    "IS THAT A SUPRA?!",
-    "Finally escpaed the LA Traffic",
-    "My CubeSat is really good at jokes, but its delivery is always delayed.",
-    "exec order 66",
-    "I had a joke about UDP, but I am not sure if you'd get it.",
-    "I am not saying FSK modulation is the best way to send jokes, but at least it is never monotone!",
-    "I am sorry David, I am afrain I can not do that.",
-    "My memory is volatile like RAM, so it only makes sense that I forget things.",
-    "Imagine it gets stuck and just keeps repeating this joke every 2 mins",
-    "Check Engine: Error Code 404: Joke Not Found",
-    "CQ CQ KN6NAQ ... KN6NAT are you out there?",
-    "Woah is that the Launcher Orbiter?????",
-    "Everything in life is a spring if you think hard enough!"
-  ],
   "last_battery_temp": 20.0,
-  "longest_allowable_sleep_time": 360,
+  "longest_allowable_sleep_time": 600,
   "normal_battery_temp": 1,
   "normal_battery_voltage": 6.9,
   "normal_charge_current": 0.5,
@@ -66,7 +22,7 @@
       "modulation_type": 0,
       "node_address": 1
     },
-    "license": "",
+    "license": "heyyy",
     "lora": {
       "ack_delay": 0.2,
       "coding_rate": 8,
@@ -76,8 +32,6 @@
       "transmit_power": 23
     },
     "modulation": "LoRa",
-    "receiver_id": 250,
-    "sender_id": 251,
     "start_time": 80000,
     "transmit_frequency": 437.4
   },

jokes.json

@@ -0,0 +1,37 @@
+[
+  "Hey it is pretty cold up here, did someone forget to pay the electric bill?",
+  "sudo rf - rf*",
+  "Why did the astronaut break up with his girlfriend? He needed space.",
+  "Why did the sun go to school? To get a little brighter.",
+  "why is the mall called the mall? because instead of going to one store you go to them all",
+  "Alien detected. Blurring photo...",
+  "Wait it is all open source? Always has been... www.github.com/proveskit",
+  "What did 0 say to 1? You're a bit too much.",
+  "Pleiades - Orpheus has been recently acquired by the Onion News Network",
+  "This jokesat was brought to you by the Bronco Space Ministry of Labor and Job Placement",
+  "Catch you on the next pass!",
+  "Pleiades - Orpheus was not The Impostor",
+  "Sorry for messing with your long-exposure astrophoto!",
+  "Better buy a telescope. Wanna see me. Buy a telescope. Gonna be in space.",
+  "According to all known laws of aviation, there is no way bees should be able to fly...",
+  "You lost the game ",
+  "Bobby Tables is a good friend of mine",
+  "Why did the computer cross the road? To get a byte to eat!",
+  "Why are the astronauts not hungry when they got to space? They had a big launch.",
+  "Why did the computer get glasses? To improve its web sight!",
+  "What are computers favorite snacks? Chips!",
+  "Wait! I think I see a White 2019 Subaru Crosstrek 2.0i Premium",
+  "IS THAT A SUPRA?!",
+  "Finally escaped the LA Traffic",
+  "My CubeSat is really good at jokes, but its delivery is always delayed.",
+  "exec order 66",
+  "I had a joke about UDP, but I am not sure if you'd get it.",
+  "I am not saying FSK modulation is the best way to send jokes, but at least it is never monotone!",
+  "I am sorry David, I am afrain I can not do that.",
+  "My memory is volatile like RAM, so it only makes sense that I forget things.",
+  "Imagine it gets stuck and just keeps repeating this joke every 2 mins",
+  "Check Engine: Error Code 404: Joke Not Found",
+  "CQ CQ KN6NAQ ... KN6NAT are you out there?",
+  "Woah is that the Launcher Orbiter?????",
+  "Everything in life is a spring if you think hard enough!"
+]